From f9741140e579b74cd66c1ffe84cbf53f4d3b74d1 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Mon, 4 Apr 2022 19:41:41 -0700
Subject: [PATCH 01/73] Compiling but not starting in tomcat

---
 Dockerfile-multistage                         |  4 +-
 pom.xml                                       |  6 +--
 .../service/ACASAuthenticationProvider.java   |  8 +--
 .../DatabaseAuthenticationProvider.java       |  8 +--
 ...plicationConversionServiceFactoryBean.java |  6 ---
 .../labseer/web/AuthorController.java         | 22 +-------
 .../labseer/web/ChangePasswordController.java |  7 ---
 .../labseer/web/ChangePasswordValidator.java  |  1 -
 .../labseer/web/ForgotPasswordController.java |  8 +--
 .../labseer/web/SignUpController.java         |  9 +---
 .../spring/applicationContext-security.xml    |  6 +--
 ...cationContext-security.xml_AUTH_PROPERTIES |  6 +--
 .../applicationContext-security.xml_LDAP      |  5 +-
 .../META-INF/spring/applicationContext.xml    |  2 +-
 .../WEB-INF/spring/webmvc-config-test.xml     |  2 +-
 .../webapp/WEB-INF/spring/webmvc-config.xml   |  2 +-
 .../api/ApiAnalysisGroupControllerTest.java   | 54 +++----------------
 .../api/ApiDDictValueControllerTest.java      | 26 ++-------
 18 files changed, 40 insertions(+), 142 deletions(-)

diff --git a/Dockerfile-multistage b/Dockerfile-multistage
index 6e84a739c..d9aac1539 100644
--- a/Dockerfile-multistage
+++ b/Dockerfile-multistage
@@ -14,6 +14,7 @@ FROM 	dependencies as bbchem
 FROM 	dependencies as indigo
 
 FROM 	${CHEMISTRY_PACKAGE} as compile
+COPY .m2 /root/.m2
 ADD 	pom.xml /src/pom.xml
 WORKDIR /src
 RUN 	mvn dependency:resolve -P ${CHEMISTRY_PACKAGE}
@@ -35,7 +36,8 @@ RUN curl -fsSL https://deb.nodesource.com/setup_$NODE_VERSION | bash - && \
 ENV NODE_PATH /usr/lib/node_modules
 
 # Add runner user so we don't run as root
-RUN	useradd -u 1000 -ms /bin/bash runner
+RUN	useradd -u 1000 -ms /bin/bash runner && \
+  chown -R runner:runner /usr/local/tomcat/
 
 # Allow certificates to be added by runner
 RUN chgrp runner /usr/local/openjdk-8/lib/security/cacerts && \
diff --git a/pom.xml b/pom.xml
index c04def2c5..86f1a3c9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,10 +39,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		<date>${maven.build.timestamp}</date>
 		<roo.version>1.3.2.RELEASE</roo.version>
 		<slf4j.version>1.7.5</slf4j.version>
-		<log4j.version>2.16.0</log4j.version>
-		<spring.version>3.2.11.RELEASE</spring.version>
+		<log4j.version>2.17.2</log4j.version>
+		<spring.version>5.3.18</spring.version>
 		<querydsl.version>3.4.3</querydsl.version>
-		<spring-security.version>3.2.5.RELEASE</spring-security.version>
+		<spring-security.version>5.6.2</spring-security.version>
 		<cdk.version>1.5.13</cdk.version>
 		<jchem.version>16.4.25.0</jchem.version>
 		<rdkit.version>2021.03.5-release</rdkit.version>
diff --git a/src/main/java/com/labsynch/labseer/service/ACASAuthenticationProvider.java b/src/main/java/com/labsynch/labseer/service/ACASAuthenticationProvider.java
index 9c92659a9..516a07113 100755
--- a/src/main/java/com/labsynch/labseer/service/ACASAuthenticationProvider.java
+++ b/src/main/java/com/labsynch/labseer/service/ACASAuthenticationProvider.java
@@ -26,10 +26,10 @@
 import org.springframework.security.authentication.DisabledException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.authentication.dao.AbstractUserDetailsAuthenticationProvider;
-import org.springframework.security.authentication.encoding.MessageDigestPasswordEncoder;
+import org.springframework.security.crypto.password.MessageDigestPasswordEncoder;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -148,7 +148,7 @@ protected UserDetails retrieveUser(String username,
 				throw new BadCredentialsException("Invalid password");
 			}
 			// authorize admin
-			authorities.add(new GrantedAuthorityImpl("ROLE_ADMIN"));
+			authorities.add(new SimpleGrantedAuthority("ROLE_ADMIN"));
 
 		} else {
 
@@ -171,7 +171,7 @@ protected UserDetails retrieveUser(String username,
 					TypedQuery<AuthorRole> roleQuery=AuthorRole.findAuthorRolesByUserEntry(targetUser);
 					List<AuthorRole> userRoles = roleQuery.getResultList();
 					for(AuthorRole userRole:userRoles){
-						authorities.add(new GrantedAuthorityImpl(userRole.getRoleEntry().getRoleName()));
+						authorities.add(new SimpleGrantedAuthority(userRole.getRoleEntry().getRoleName()));
 					}
 					enabled = targetUser.getEnabled();
 					if (!enabled) {
diff --git a/src/main/java/com/labsynch/labseer/service/DatabaseAuthenticationProvider.java b/src/main/java/com/labsynch/labseer/service/DatabaseAuthenticationProvider.java
index ddba40d85..d4de0c4a8 100755
--- a/src/main/java/com/labsynch/labseer/service/DatabaseAuthenticationProvider.java
+++ b/src/main/java/com/labsynch/labseer/service/DatabaseAuthenticationProvider.java
@@ -23,10 +23,10 @@
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.authentication.dao.AbstractUserDetailsAuthenticationProvider;
-import org.springframework.security.authentication.encoding.MessageDigestPasswordEncoder;
+import org.springframework.security.crypto.password.MessageDigestPasswordEncoder;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -123,7 +123,7 @@ protected UserDetails retrieveUser(String username,
 	        throw new BadCredentialsException("Invalid password");
 	      }
 	      // authorize admin
-	      authorities.add(new GrantedAuthorityImpl("ROLE_ADMIN"));
+	      authorities.add(new SimpleGrantedAuthority("ROLE_ADMIN"));
 	    } else {
 	      try {
 	    	TypedQuery<Author> query= Author.findAuthorsByUserName(username);
@@ -161,7 +161,7 @@ protected UserDetails retrieveUser(String username,
 	        TypedQuery<AuthorRole> roleQuery=AuthorRole.findAuthorRolesByUserEntry(targetUser);
 	        List<AuthorRole> userRoles = roleQuery.getResultList();
 	        for(AuthorRole userRole:userRoles){
-	        	authorities.add(new GrantedAuthorityImpl(userRole.getRoleEntry().getRoleName()));
+	        	authorities.add(new SimpleGrantedAuthority(userRole.getRoleEntry().getRoleName()));
 	        }
 	      } catch (EmptyResultDataAccessException e) {
 		        throw new BadCredentialsException("Invalid user");
diff --git a/src/main/java/com/labsynch/labseer/web/ApplicationConversionServiceFactoryBean.java b/src/main/java/com/labsynch/labseer/web/ApplicationConversionServiceFactoryBean.java
index 8272d0189..439baf185 100755
--- a/src/main/java/com/labsynch/labseer/web/ApplicationConversionServiceFactoryBean.java
+++ b/src/main/java/com/labsynch/labseer/web/ApplicationConversionServiceFactoryBean.java
@@ -121,12 +121,6 @@
 @Transactional
 public class ApplicationConversionServiceFactoryBean extends FormattingConversionServiceFactoryBean {
 
-	@Override
-	protected void installFormatters(FormatterRegistry registry) {
-		super.installFormatters(registry);
-		// Register application converters and formatters
-	}
-
 	public Converter<AnalysisGroup, String> getAnalysisGroupToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.AnalysisGroup, java.lang.String>() {
             public String convert(AnalysisGroup analysisGroup) {
diff --git a/src/main/java/com/labsynch/labseer/web/AuthorController.java b/src/main/java/com/labsynch/labseer/web/AuthorController.java
index c68d2c94b..e4bff42d2 100755
--- a/src/main/java/com/labsynch/labseer/web/AuthorController.java
+++ b/src/main/java/com/labsynch/labseer/web/AuthorController.java
@@ -1,32 +1,12 @@
 package com.labsynch.labseer.web;
 
 import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.dto.AuthorNameDTO;
-import com.labsynch.labseer.utils.PropertiesFileService;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import java.util.Date;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+
 import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
 import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
 import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.security.authentication.encoding.MessageDigestPasswordEncoder;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 @RooWebJson(jsonObject = Author.class)
 @Controller
diff --git a/src/main/java/com/labsynch/labseer/web/ChangePasswordController.java b/src/main/java/com/labsynch/labseer/web/ChangePasswordController.java
index 1eb22546b..d7545f907 100755
--- a/src/main/java/com/labsynch/labseer/web/ChangePasswordController.java
+++ b/src/main/java/com/labsynch/labseer/web/ChangePasswordController.java
@@ -8,7 +8,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.encoding.MessageDigestPasswordEncoder;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Controller;
@@ -31,9 +30,6 @@ public class ChangePasswordController {
 	@Autowired
 	private ChangePasswordValidator validator;
 
-	@Autowired
-	private MessageDigestPasswordEncoder messageDigestPasswordEncoder;
-
 	@ModelAttribute("changePasswordForm")
 	public ChangePasswordForm formBackingObject() {
 		return new ChangePasswordForm();
@@ -66,9 +62,6 @@ public String update(
 						.findAuthorsByUserName(userDetails.getUsername());
 				Author person = (Author) query.getSingleResult();
 				
-//			    messageDigestPasswordEncoder.setEncodeHashAsBase64(true);
-//				person.setPassword(messageDigestPasswordEncoder.encodePassword(newPassword, null));
-				
 				
 	    	    String encryptedPassword = null;
 	    		try {
diff --git a/src/main/java/com/labsynch/labseer/web/ChangePasswordValidator.java b/src/main/java/com/labsynch/labseer/web/ChangePasswordValidator.java
index 05a7357be..b150b1538 100755
--- a/src/main/java/com/labsynch/labseer/web/ChangePasswordValidator.java
+++ b/src/main/java/com/labsynch/labseer/web/ChangePasswordValidator.java
@@ -13,7 +13,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.encoding.MessageDigestPasswordEncoder;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/labsynch/labseer/web/ForgotPasswordController.java b/src/main/java/com/labsynch/labseer/web/ForgotPasswordController.java
index 7a80da356..697a81def 100755
--- a/src/main/java/com/labsynch/labseer/web/ForgotPasswordController.java
+++ b/src/main/java/com/labsynch/labseer/web/ForgotPasswordController.java
@@ -9,7 +9,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mail.MailSender;
 import org.springframework.mail.SimpleMailMessage;
-import org.springframework.security.authentication.encoding.MessageDigestPasswordEncoder;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -32,9 +31,6 @@ public class ForgotPasswordController {
     @Autowired
     private PropertiesUtilService propertiesUtilService;
 
-	@Autowired
-	private MessageDigestPasswordEncoder messageDigestPasswordEncoder;
-
     @ModelAttribute("forgotpasswordForm")
     public ForgotPasswordForm formBackingObject() {
         return new ForgotPasswordForm();
@@ -59,9 +55,7 @@ public String update(@ModelAttribute("forgotpasswordForm") ForgotPasswordForm fo
         	if(null!=userQuery && userQuery.getMaxResults()>0){
         		Author User = userQuery.getSingleResult();
         		Random random = new Random(System.currentTimeMillis());
-        		String newPassword = "pass"+random.nextLong();
-//        		User.setPassword(messageDigestPasswordEncoder.encodePassword(newPassword, null));
-        		
+        		String newPassword = "pass"+random.nextLong();        		
         		
 	    	    String encryptedPassword = null;
 	    		try {
diff --git a/src/main/java/com/labsynch/labseer/web/SignUpController.java b/src/main/java/com/labsynch/labseer/web/SignUpController.java
index 0cc40b18e..40af4a7a6 100755
--- a/src/main/java/com/labsynch/labseer/web/SignUpController.java
+++ b/src/main/java/com/labsynch/labseer/web/SignUpController.java
@@ -14,7 +14,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mail.MailSender;
 import org.springframework.mail.SimpleMailMessage;
-import org.springframework.security.authentication.encoding.MessageDigestPasswordEncoder;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
@@ -51,9 +50,6 @@ public class SignUpController {
 
     private transient SimpleMailMessage simpleMailMessage;
 
-	@Autowired
-	private MessageDigestPasswordEncoder messageDigestPasswordEncoder;
-
     @ModelAttribute("Author")
     public UserRegistrationForm formBackingObject() {
         return new UserRegistrationForm();
@@ -102,10 +98,7 @@ public String create(@Valid UserRegistrationForm userRegistration, BindingResult
             author.setFirstName(userRegistration.getFirstName());
             author.setLastName(userRegistration.getLastName());
             author.setUserName(userRegistration.getUserName());
-            
-//    	    messageDigestPasswordEncoder.setEncodeHashAsBase64(true);
-//            author.setPassword(messageDigestPasswordEncoder.encodePassword(userRegistration.getPassword(), null));
-            
+
     	    String encryptedPassword = null;
     		try {
     			encryptedPassword = DatabaseAuthenticationProvider.getBase64ShaHash(userRegistration.getPassword());
diff --git a/src/main/resources/META-INF/spring/applicationContext-security.xml b/src/main/resources/META-INF/spring/applicationContext-security.xml
index 26c63f227..175bb8bea 100755
--- a/src/main/resources/META-INF/spring/applicationContext-security.xml
+++ b/src/main/resources/META-INF/spring/applicationContext-security.xml
@@ -2,8 +2,8 @@
 <beans:beans xmlns="http://www.springframework.org/schema/security" 
     xmlns:beans="http://www.springframework.org/schema/beans" 
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-5.6.xsd">
 
 	<!-- HTTP security configurations -->
 	<http auto-config="true" use-expressions="true">
@@ -46,7 +46,7 @@
 <bean id="cryptoPasswordEncoder" class="org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder" /> -->
 	
 	<beans:bean
-		class="org.springframework.security.authentication.encoding.MessageDigestPasswordEncoder"
+		class="org.springframework.security.crypto.password.MessageDigestPasswordEncoder"
 		id="messageDigestPasswordEncoder">
 		<beans:constructor-arg value="sha-1" />
 	</beans:bean>
diff --git a/src/main/resources/META-INF/spring/applicationContext-security.xml_AUTH_PROPERTIES b/src/main/resources/META-INF/spring/applicationContext-security.xml_AUTH_PROPERTIES
index 861e81223..0732f7320 100755
--- a/src/main/resources/META-INF/spring/applicationContext-security.xml_AUTH_PROPERTIES
+++ b/src/main/resources/META-INF/spring/applicationContext-security.xml_AUTH_PROPERTIES
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/security"
 	xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-5.6.xsd">
 
 
 	<!-- HTTP security configurations -->
@@ -46,7 +46,7 @@
 <bean id="cryptoPasswordEncoder" class="org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder" /> -->
 	
 	<beans:bean
-		class="org.springframework.security.authentication.encoding.MessageDigestPasswordEncoder"
+		class="org.springframework.security.crypto.password.MessageDigestPasswordEncoder"
 		id="messageDigestPasswordEncoder">
 		<beans:constructor-arg value="sha-1" />
 	</beans:bean>
diff --git a/src/main/resources/META-INF/spring/applicationContext-security.xml_LDAP b/src/main/resources/META-INF/spring/applicationContext-security.xml_LDAP
index 16a016b87..29c91cf3c 100755
--- a/src/main/resources/META-INF/spring/applicationContext-security.xml_LDAP
+++ b/src/main/resources/META-INF/spring/applicationContext-security.xml_LDAP
@@ -2,7 +2,7 @@
 <beans:beans xmlns="http://www.springframework.org/schema/security"
 	xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd">
+        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-5.6.xsd">
 
 	<!-- authentication-success-handler-ref="postSuccessAuthHandler" -->
 
@@ -52,11 +52,10 @@
 
 	<!-- Configure Authentication mechanism -->
 	<beans:bean
-		class="org.springframework.security.authentication.encoding.MessageDigestPasswordEncoder"
+		class="org.springframework.security.crypto.password.MessageDigestPasswordEncoder"
 		id="messageDigestPasswordEncoder">
 		<beans:constructor-arg value="sha-1" />
 	</beans:bean>
 
 
 </beans:beans>
-
diff --git a/src/main/resources/META-INF/spring/applicationContext.xml b/src/main/resources/META-INF/spring/applicationContext.xml
index 325c1d58c..49fca0df9 100644
--- a/src/main/resources/META-INF/spring/applicationContext.xml
+++ b/src/main/resources/META-INF/spring/applicationContext.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:context="http://www.springframework.org/schema/context" xmlns:jee="http://www.springframework.org/schema/jee" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:util="http://www.springframework.org/schema/util" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/aop               http://www.springframework.org/schema/aop/spring-aop-3.1.xsd               http://www.springframework.org/schema/beans               http://www.springframework.org/schema/beans/spring-beans-3.1.xsd               http://www.springframework.org/schema/context               http://www.springframework.org/schema/context/spring-context-3.1.xsd                       http://www.springframework.org/schema/jee               http://www.springframework.org/schema/jee/spring-jee-3.1.xsd                       http://www.springframework.org/schema/tx               http://www.springframework.org/schema/tx/spring-tx-3.1.xsd               http://www.springframework.org/schema/util               http://www.springframework.org/schema/util/spring-util-3.1.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:context="http://www.springframework.org/schema/context" xmlns:jee="http://www.springframework.org/schema/jee" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:util="http://www.springframework.org/schema/util" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/aop               https://www.springframework.org/schema/aop/spring-aop.xsd               http://www.springframework.org/schema/beans               http://www.springframework.org/schema/beans/spring-beans.xsd               http://www.springframework.org/schema/context               https://www.springframework.org/schema/context/spring-context.xsd                       http://www.springframework.org/schema/jee               https://www.springframework.org/schema/jee/spring-jee.xsd                       http://www.springframework.org/schema/tx               http://www.springframework.org/schema/tx/spring-tx-3.1.xsd               http://www.springframework.org/schema/util               http://www.springframework.org/schema/util/spring-util-3.1.xsd">
     <!-- This will automatically locate any and all property files you have 
 		within your classpath, provided they fall under the META-INF/spring directory. 
 		The located property files are parsed and their values can then be used within 
diff --git a/src/main/webapp/WEB-INF/spring/webmvc-config-test.xml b/src/main/webapp/WEB-INF/spring/webmvc-config-test.xml
index 3e3f2dfb1..76ab7f2b0 100755
--- a/src/main/webapp/WEB-INF/spring/webmvc-config-test.xml
+++ b/src/main/webapp/WEB-INF/spring/webmvc-config-test.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context" xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd                 http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd                 http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context" xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd                 http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd                 http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc.xsd">
                 
     <!-- The controllers are autodetected POJOs labeled with the @Controller annotation. -->
     <context:component-scan base-package="com.labsynch.labseer" use-default-filters="false">
diff --git a/src/main/webapp/WEB-INF/spring/webmvc-config.xml b/src/main/webapp/WEB-INF/spring/webmvc-config.xml
index c78050480..942a24f90 100755
--- a/src/main/webapp/WEB-INF/spring/webmvc-config.xml
+++ b/src/main/webapp/WEB-INF/spring/webmvc-config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context" xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd                 http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd                 http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context" xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd                 http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd                 http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc.xsd">
                 
     <!-- The controllers are autodetected POJOs labeled with the @Controller annotation. -->
     <context:component-scan base-package="com.labsynch.labseer" use-default-filters="false">
diff --git a/src/test/java/com/labsynch/labseer/api/ApiAnalysisGroupControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiAnalysisGroupControllerTest.java
index 146df08af..cee91b18c 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiAnalysisGroupControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiAnalysisGroupControllerTest.java
@@ -1,71 +1,31 @@
 package com.labsynch.labseer.api;
 
 
-import java.security.InvalidParameterException;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import static org.springframework.test.web.ModelAndViewAssert.*;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import org.junit.Assert;
+import java.util.Collection;
+
+import com.labsynch.labseer.domain.AnalysisGroup;
+import com.labsynch.labseer.service.AnalysisGroupService;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.ui.Model;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.method.HandlerMethod;
-import org.springframework.web.servlet.HandlerExecutionChain;
-import org.springframework.web.servlet.HandlerMapping;
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
-import org.junit.runners.JUnit4;
-import org.springframework.mock.staticmock.MockStaticEntityMethods;
-
-//import com.google.common.collect.Lists;
-//import org.apache.http.HttpHeaders;
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.http.MediaType;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
-import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter;
-
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-//import static org.mockito.Mockito.mock;
-//import static org.mockito.Mockito.when;
-
-
-
-
-
-
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.service.AnalysisGroupService;
+import org.springframework.web.context.WebApplicationContext;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
diff --git a/src/test/java/com/labsynch/labseer/api/ApiDDictValueControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiDDictValueControllerTest.java
index 52296023c..ef3fe9d2a 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiDDictValueControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiDDictValueControllerTest.java
@@ -1,18 +1,15 @@
 package com.labsynch.labseer.api;
 
 
-import java.security.InvalidParameterException;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
-import static org.springframework.test.web.ModelAndViewAssert.*;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import com.labsynch.labseer.dto.CodeTableDTO;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -21,9 +18,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
 import org.springframework.http.MediaType;
-import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -31,18 +26,7 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
 import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.method.HandlerMethod;
-import org.springframework.web.servlet.HandlerExecutionChain;
-import org.springframework.web.servlet.HandlerMapping;
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
-import org.junit.runners.JUnit4;
-import org.springframework.mock.staticmock.MockStaticEntityMethods;
-
-import com.labsynch.labseer.domain.ProtocolValue;
-import com.labsynch.labseer.dto.CodeTableDTO;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration

From 1f385feb837d00cbe70abbb6440264cc2bb41fba Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Mon, 4 Apr 2022 20:45:19 -0700
Subject: [PATCH 02/73] Removing swagger which was brining in old spring-web

---
 pom.xml                                       | 20 ++++-----
 .../labseer/api/ApiContainerController.java   | 10 -----
 .../labseer/api/ApiCurveFitController.java    |  4 --
 .../labseer/config/SwaggerConfig.java         | 44 -------------------
 .../AnalysisGroupController_Roo_Controller.aj |  4 +-
 ...ysisGroupLabelController_Roo_Controller.aj |  4 +-
 ...ysisGroupStateController_Roo_Controller.aj |  4 +-
 .../web/AnalysisGroupValueController.java     |  5 +--
 ...icationSettingController_Roo_Controller.aj |  4 +-
 .../web/AuthorController_Roo_Controller.aj    |  4 +-
 .../AuthorLabelController_Roo_Controller.aj   |  4 +-
 .../AuthorRoleController_Roo_Controller.aj    |  4 +-
 .../AuthorStateController_Roo_Controller.aj   |  4 +-
 .../AuthorValueController_Roo_Controller.aj   |  4 +-
 .../BulkLoadFileController_Roo_Controller.aj  |  4 +-
 ...lkLoadTemplateController_Roo_Controller.aj |  4 +-
 ...dRegAppSettingController_Roo_Controller.aj |  4 +-
 .../web/CodeKindController_Roo_Controller.aj  |  4 +-
 .../CodeOriginController_Roo_Controller.aj    |  4 +-
 .../web/CodeTypeController_Roo_Controller.aj  |  4 +-
 .../web/CompoundController_Roo_Controller.aj  |  4 +-
 .../CompoundTypeController_Roo_Controller.aj  |  4 +-
 .../web/ContainerController_Roo_Controller.aj |  4 +-
 .../ContainerKindController_Roo_Controller.aj |  4 +-
 ...ContainerLabelController_Roo_Controller.aj |  4 +-
 ...ContainerStateController_Roo_Controller.aj |  4 +-
 .../ContainerTypeController_Roo_Controller.aj |  4 +-
 ...ContainerValueController_Roo_Controller.aj |  4 +-
 .../web/CorpNameController_Roo_Controller.aj  |  4 +-
 .../web/CronJobController_Roo_Controller.aj   |  4 +-
 .../web/DDictKindController_Roo_Controller.aj |  4 +-
 .../web/DDictTypeController_Roo_Controller.aj |  4 +-
 .../DDictValueController_Roo_Controller.aj    |  4 +-
 .../ExperimentController_Roo_Controller.aj    |  4 +-
 ...ExperimentKindController_Roo_Controller.aj |  4 +-
 ...xperimentLabelController_Roo_Controller.aj |  4 +-
 ...xperimentStateController_Roo_Controller.aj |  4 +-
 ...ExperimentTypeController_Roo_Controller.aj |  4 +-
 ...xperimentValueController_Roo_Controller.aj |  4 +-
 .../labseer/web/FileListController.java       |  5 +--
 .../labseer/web/FileSaveController.java       |  5 +--
 .../web/FileThingController_Roo_Controller.aj |  4 +-
 .../web/FileTypeController_Roo_Controller.aj  |  4 +-
 ...nteractionKindController_Roo_Controller.aj |  4 +-
 ...nteractionTypeController_Roo_Controller.aj |  4 +-
 .../labseer/web/IsoSaltController.java        |  5 +--
 .../labseer/web/IsotopeController.java        |  5 +--
 ...ainerContainerController_Roo_Controller.aj |  4 +-
 ...ContainerStateController_Roo_Controller.aj |  4 +-
 ...ContainerValueController_Roo_Controller.aj |  4 +-
 ...mentExperimentController_Roo_Controller.aj |  4 +-
 ...xperimentStateController_Roo_Controller.aj |  4 +-
 ...xperimentValueController_Roo_Controller.aj |  4 +-
 ...LsThingLsThingController_Roo_Controller.aj |  4 +-
 ...ngLsThingStateController_Roo_Controller.aj |  4 +-
 ...ngLsThingValueController_Roo_Controller.aj |  4 +-
 ...otocolProtocolController_Roo_Controller.aj |  4 +-
 ...lProtocolStateController_Roo_Controller.aj |  4 +-
 ...lProtocolValueController_Roo_Controller.aj |  4 +-
 ...bjectContainerController_Roo_Controller.aj |  4 +-
 ...ContainerStateController_Roo_Controller.aj |  4 +-
 ...ContainerValueController_Roo_Controller.aj |  4 +-
 .../web/LabelKindController_Roo_Controller.aj |  4 +-
 .../LabelSequenceController_Roo_Controller.aj |  4 +-
 ...elSequenceRoleController_Roo_Controller.aj |  4 +-
 .../web/LabelTypeController_Roo_Controller.aj |  4 +-
 .../web/LotAliasController_Roo_Controller.aj  |  4 +-
 .../LotAliasKindController_Roo_Controller.aj  |  4 +-
 .../LotAliasTypeController_Roo_Controller.aj  |  4 +-
 .../labsynch/labseer/web/LotController.java   |  5 +--
 .../LsInteractionController_Roo_Controller.aj |  4 +-
 .../labseer/web/LsRoleController.java         |  5 +--
 .../LsSeqAnlGrpController_Roo_Controller.aj   |  4 +-
 ...LsSeqContainerController_Roo_Controller.aj |  4 +-
 .../web/LsSeqExptController_Roo_Controller.aj |  4 +-
 ...SeqItxCntrCntrController_Roo_Controller.aj |  4 +-
 ...mentExperimentController_Roo_Controller.aj |  4 +-
 ...LsThingLsThingController_Roo_Controller.aj |  4 +-
 ...otocolProtocolController_Roo_Controller.aj |  4 +-
 ...SeqItxSubjCntrController_Roo_Controller.aj |  4 +-
 .../LsSeqProtocolController_Roo_Controller.aj |  4 +-
 .../LsSeqSubjectController_Roo_Controller.aj  |  4 +-
 .../LsSeqTrtGrpController_Roo_Controller.aj   |  4 +-
 .../web/LsTagController_Roo_Controller.aj     |  4 +-
 .../web/LsThingController_Roo_Controller.aj   |  4 +-
 .../LsThingLabelController_Roo_Controller.aj  |  4 +-
 .../LsThingStateController_Roo_Controller.aj  |  4 +-
 .../LsThingValueController_Roo_Controller.aj  |  4 +-
 .../LsTransactionController_Roo_Controller.aj |  4 +-
 .../labseer/web/MetalotController.java        |  5 +--
 .../web/OperatorController_Roo_Controller.aj  |  4 +-
 .../OperatorKindController_Roo_Controller.aj  |  4 +-
 .../OperatorTypeController_Roo_Controller.aj  |  4 +-
 .../ParentAliasController_Roo_Controller.aj   |  4 +-
 ...arentAliasKindController_Roo_Controller.aj |  4 +-
 ...arentAliasTypeController_Roo_Controller.aj |  4 +-
 ...rentAnnotationController_Roo_Controller.aj |  4 +-
 .../labseer/web/ParentController.java         |  5 +--
 .../labseer/web/PhysicalStateController.java  |  5 +--
 ...reDef_CorpNameController_Roo_Controller.aj |  4 +-
 .../web/ProtocolController_Roo_Controller.aj  |  4 +-
 .../ProtocolKindController_Roo_Controller.aj  |  4 +-
 .../ProtocolLabelController_Roo_Controller.aj |  4 +-
 .../ProtocolStateController_Roo_Controller.aj |  4 +-
 .../ProtocolTypeController_Roo_Controller.aj  |  4 +-
 .../ProtocolValueController_Roo_Controller.aj |  4 +-
 ...rityMeasuredByController_Roo_Controller.aj |  4 +-
 .../labseer/web/RegSearchController.java      |  5 +--
 .../web/RoleKindController_Roo_Controller.aj  |  4 +-
 .../web/RoleTypeController_Roo_Controller.aj  |  4 +-
 .../labsynch/labseer/web/SaltController.java  |  5 +--
 .../SaltFormAliasController_Roo_Controller.aj |  4 +-
 ...tFormAliasKindController_Roo_Controller.aj |  4 +-
 ...tFormAliasTypeController_Roo_Controller.aj |  4 +-
 .../labseer/web/SaltFormController.java       |  5 +--
 .../SaltLoaderController_Roo_Controller.aj    |  4 +-
 .../SolutionUnitController_Roo_Controller.aj  |  4 +-
 .../web/StateKindController_Roo_Controller.aj |  4 +-
 .../web/StateTypeController_Roo_Controller.aj |  4 +-
 ...StereoCategoryController_Roo_Controller.aj |  4 +-
 .../web/SubjectController_Roo_Controller.aj   |  4 +-
 .../SubjectLabelController_Roo_Controller.aj  |  4 +-
 .../SubjectStateController_Roo_Controller.aj  |  4 +-
 .../SubjectValueController_Roo_Controller.aj  |  4 +-
 ...empSelectTableController_Roo_Controller.aj |  4 +-
 .../web/ThingKindController_Roo_Controller.aj |  4 +-
 ...ingPageArchiveController_Roo_Controller.aj |  4 +-
 .../web/ThingPageController_Roo_Controller.aj |  4 +-
 .../web/ThingTypeController_Roo_Controller.aj |  4 +-
 ...TreatmentGroupController_Roo_Controller.aj |  4 +-
 ...mentGroupLabelController_Roo_Controller.aj |  4 +-
 ...mentGroupStateController_Roo_Controller.aj |  4 +-
 ...mentGroupValueController_Roo_Controller.aj |  4 +-
 ...ncertaintyKindController_Roo_Controller.aj |  4 +-
 .../web/UnitController_Roo_Controller.aj      |  4 +-
 .../web/UnitKindController_Roo_Controller.aj  |  4 +-
 .../web/UnitTypeController_Roo_Controller.aj  |  4 +-
 .../web/UpdateLogController_Roo_Controller.aj |  4 +-
 .../web/ValueKindController_Roo_Controller.aj |  4 +-
 .../web/ValueTypeController_Roo_Controller.aj |  4 +-
 .../web/VendorController_Roo_Controller.aj    |  4 +-
 src/main/resources/log4j2.xml                 |  1 -
 .../WEB-INF/spring/webmvc-config-test.xml     |  4 +-
 .../webapp/WEB-INF/spring/webmvc-config.xml   |  5 +--
 144 files changed, 151 insertions(+), 498 deletions(-)
 delete mode 100644 src/main/java/com/labsynch/labseer/config/SwaggerConfig.java

diff --git a/pom.xml b/pom.xml
index 86f1a3c9f..1f68dbf0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,11 +141,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 			<artifactId>license3j</artifactId>
 			<version>1.0.7</version>
 		</dependency>
-		<dependency>
-			<groupId>com.mangofactory</groupId>
-			<artifactId>swagger-springmvc</artifactId>
-			<version>0.9.4</version>
-		</dependency>
 		<dependency>
 			<groupId>com.thetransactioncompany</groupId>
 			<artifactId>cors-filter</artifactId>
@@ -221,7 +216,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.1.0</version>
+			<version>2.13.2.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@@ -257,6 +252,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<version>${spring.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
@@ -331,7 +331,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		<dependency>
 			<groupId>javax.validation</groupId>
 			<artifactId>validation-api</artifactId>
-			<version>1.0.0.GA</version>
+			<version>2.0.1.Final</version>
 		</dependency>
 		<dependency>
 			<groupId>cglib</groupId>
@@ -476,12 +476,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		<dependency>
 			<groupId>org.springframework.ldap</groupId>
 			<artifactId>spring-ldap-core</artifactId>
-			<version>1.3.0.RELEASE</version>
+			<version>2.3.6.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.ldap</groupId>
 			<artifactId>spring-ldap-core-tiger</artifactId>
-			<version>1.3.0.RELEASE</version>
+			<version>2.3.6.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
@@ -785,7 +785,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 			</plugin>
 			<plugin>
                 <groupId>org.apache.tomcat.maven</groupId>
-                <artifactId>tomcat7-maven-plugin</artifactId>
+                <artifactId>tomcat8-maven-plugin</artifactId>
                 <version>2.2</version>
                 <configuration>
                     <excludes>
diff --git a/src/main/java/com/labsynch/labseer/api/ApiContainerController.java b/src/main/java/com/labsynch/labseer/api/ApiContainerController.java
index 31c548bf0..83d940a2b 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiContainerController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiContainerController.java
@@ -54,7 +54,6 @@
 import com.labsynch.labseer.service.ContainerService;
 import com.labsynch.labseer.utils.PropertiesUtilService;
 import com.labsynch.labseer.utils.SimpleUtil;
-import com.wordnik.swagger.annotations.ApiOperation;
 
 import flexjson.JSONSerializer;
 
@@ -369,11 +368,6 @@ public ResponseEntity<java.lang.String> deleteArrayByCodeNames(@RequestBody List
 		}
 	}
 
-	@ApiOperation(value = "Checks for dependent containers that would preclude deletion",
-			notes="A container will fail the dependency check if: \n"
-					+ "A) It has other containers stored in it (added to interaction) \n"
-					+ "B) It has referenced Subjects (Subject-Container interactions) \n"
-					+ "C) Any members (member interaction) have referenced Subjects")
 	@RequestMapping(value = "/checkDependencies/{idOrCodeName}", method = RequestMethod.GET, headers = "Accept=application/json")
 	public ResponseEntity<String> checkDependencies(@PathVariable("idOrCodeName") String idOrCodeName) {
 		HttpHeaders headers = new HttpHeaders();
@@ -421,10 +415,6 @@ public ResponseEntity<java.lang.String> jsonFindContainersByNameGet(@RequestPara
 		return new ResponseEntity<String>(Container.toJsonArray(Container.findContainerByContainerLabel(labelText)), headers, HttpStatus.OK);
 	}
 
-	@ApiOperation(value="Validates container name is unique", notes="Name is determined by label lsType=name."
-			+ "Search is across all containers, for other lsType=name labels, with an exact string match."
-			+ "Successful validation (name is unique) gives HTTP Status 202: Accepted"
-			+ "Failure on validation gives HTTP Status 409: Conflict")
 	@RequestMapping(value = "/validate", method = RequestMethod.POST, headers = "Accept=application/json")
 	public ResponseEntity<String> validateContainer(
 			@RequestBody String json) {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiCurveFitController.java b/src/main/java/com/labsynch/labseer/api/ApiCurveFitController.java
index 53bdb07e7..9fcd7601a 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiCurveFitController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiCurveFitController.java
@@ -21,7 +21,6 @@
 import com.labsynch.labseer.dto.KiCurveFitDTO;
 import com.labsynch.labseer.dto.RawCurveDataDTO;
 import com.labsynch.labseer.dto.TgDataDTO;
-import com.wordnik.swagger.annotations.ApiOperation;
 
 @Controller
 @RequestMapping("api/v1/curvefit")
@@ -31,7 +30,6 @@ public class ApiCurveFitController {
 	private static final Logger logger = LoggerFactory.getLogger(ApiCurveFitController.class);
 	
 	//no longer needed - preparing to deprecate
-	@ApiOperation(value="getFitDataByCurveId")
 	@Transactional
     @RequestMapping(value = "/fitdata", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> getFitDataByCurveId(@RequestBody List<String> curveIds, @RequestParam(value = "format", required = false) String format) {
@@ -74,7 +72,6 @@ else if (renderingHint.equalsIgnoreCase("Ki Fit")){
 		}
     }
 	
-	@ApiOperation(value="getRawCurveDataByCurveId")
 	@Transactional
 	@RequestMapping(value = "/rawdata", method = RequestMethod.POST, headers = "Accept=application/json")
 	public ResponseEntity<String> getRawCurveDataByCurveId(@RequestBody List<String> curveIds, @RequestParam(value = "format", required = false) String format,
@@ -98,7 +95,6 @@ public ResponseEntity<String> getRawCurveDataByCurveId(@RequestBody List<String>
 		}
 	}
 	
-	@ApiOperation(value="getRawAgonistCurveDataByCurveId")
 	@Transactional
 	@RequestMapping(value = "/rawdataagonist", method = RequestMethod.POST, headers = "Accept=application/json")
 	public ResponseEntity<String> getRawCurveDataAgonistByCurveId(@RequestBody List<String> curveIds, @RequestParam(value = "format", required = false) String format,
diff --git a/src/main/java/com/labsynch/labseer/config/SwaggerConfig.java b/src/main/java/com/labsynch/labseer/config/SwaggerConfig.java
deleted file mode 100644
index 8dfeb38d6..000000000
--- a/src/main/java/com/labsynch/labseer/config/SwaggerConfig.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.labsynch.labseer.config;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import com.mangofactory.swagger.configuration.SpringSwaggerConfig;
-import com.mangofactory.swagger.plugin.EnableSwagger;
-import com.mangofactory.swagger.plugin.SwaggerSpringMvcPlugin;
-import com.mangofactory.swagger.models.dto.ApiInfo;
- 
-//@Configuration
-@EnableSwagger
-public class SwaggerConfig {
-	private SpringSwaggerConfig springSwaggerConfig;
-	
-	@Autowired
-	private PropertiesUtilService propertiesUtilService;
-	
-	   @Autowired
-	   public void setSpringSwaggerConfig(SpringSwaggerConfig springSwaggerConfig) {
-	      this.springSwaggerConfig = springSwaggerConfig;
-	   }
-
-	   @Bean //Don't forget the @Bean annotation
-	   public SwaggerSpringMvcPlugin customImplementation(){
-	      return new SwaggerSpringMvcPlugin(this.springSwaggerConfig)
-	            .apiInfo(apiInfo())
-	            .enable(propertiesUtilService.getEnableSwagger())
-	            .includePatterns("/api.*");
-	   }
-
-	    private ApiInfo apiInfo() {
-	      ApiInfo apiInfo = new ApiInfo(
-	              "ACAS API",
-	              "API for ACAS",
-	              "ACAS API terms of service",
-	              "mail2ACAS@gmail.com",
-	              "ACAS API License Type",
-	              "ACAS API License URL"
-	        );
-	      return apiInfo;
-	    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/web/AnalysisGroupController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/AnalysisGroupController_Roo_Controller.aj
index 93bc203d7..c5e40de78 100755
--- a/src/main/java/com/labsynch/labseer/web/AnalysisGroupController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/AnalysisGroupController_Roo_Controller.aj
@@ -113,9 +113,7 @@ privileged aspect AnalysisGroupController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/AnalysisGroupLabelController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/AnalysisGroupLabelController_Roo_Controller.aj
index cd55d4578..b2a7aa756 100755
--- a/src/main/java/com/labsynch/labseer/web/AnalysisGroupLabelController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/AnalysisGroupLabelController_Roo_Controller.aj
@@ -112,9 +112,7 @@ privileged aspect AnalysisGroupLabelController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/AnalysisGroupStateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/AnalysisGroupStateController_Roo_Controller.aj
index ef975c62c..1b127f2db 100644
--- a/src/main/java/com/labsynch/labseer/web/AnalysisGroupStateController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/AnalysisGroupStateController_Roo_Controller.aj
@@ -114,9 +114,7 @@ privileged aspect AnalysisGroupStateController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/AnalysisGroupValueController.java b/src/main/java/com/labsynch/labseer/web/AnalysisGroupValueController.java
index ac56de5de..9ebe6c30f 100755
--- a/src/main/java/com/labsynch/labseer/web/AnalysisGroupValueController.java
+++ b/src/main/java/com/labsynch/labseer/web/AnalysisGroupValueController.java
@@ -149,10 +149,7 @@ String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRe
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {
-        }
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
 
diff --git a/src/main/java/com/labsynch/labseer/web/ApplicationSettingController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ApplicationSettingController_Roo_Controller.aj
index 0046ac3c4..948f8ce10 100755
--- a/src/main/java/com/labsynch/labseer/web/ApplicationSettingController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ApplicationSettingController_Roo_Controller.aj
@@ -102,9 +102,7 @@ privileged aspect ApplicationSettingController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/AuthorController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/AuthorController_Roo_Controller.aj
index 28d7ac15e..23e8110db 100755
--- a/src/main/java/com/labsynch/labseer/web/AuthorController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/AuthorController_Roo_Controller.aj
@@ -112,9 +112,7 @@ privileged aspect AuthorController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/AuthorLabelController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/AuthorLabelController_Roo_Controller.aj
index 3f8c88774..badf255c7 100644
--- a/src/main/java/com/labsynch/labseer/web/AuthorLabelController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/AuthorLabelController_Roo_Controller.aj
@@ -112,9 +112,7 @@ privileged aspect AuthorLabelController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/AuthorRoleController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/AuthorRoleController_Roo_Controller.aj
index f90a80ad5..f9a0599ff 100644
--- a/src/main/java/com/labsynch/labseer/web/AuthorRoleController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/AuthorRoleController_Roo_Controller.aj
@@ -107,9 +107,7 @@ privileged aspect AuthorRoleController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/AuthorStateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/AuthorStateController_Roo_Controller.aj
index 7e0a6fe73..0052b8aee 100644
--- a/src/main/java/com/labsynch/labseer/web/AuthorStateController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/AuthorStateController_Roo_Controller.aj
@@ -114,9 +114,7 @@ privileged aspect AuthorStateController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/AuthorValueController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/AuthorValueController_Roo_Controller.aj
index 0fd859f65..ab17ef64c 100644
--- a/src/main/java/com/labsynch/labseer/web/AuthorValueController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/AuthorValueController_Roo_Controller.aj
@@ -113,9 +113,7 @@ privileged aspect AuthorValueController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/BulkLoadFileController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/BulkLoadFileController_Roo_Controller.aj
index 5d6d6d0d3..257bb37b3 100644
--- a/src/main/java/com/labsynch/labseer/web/BulkLoadFileController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/BulkLoadFileController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect BulkLoadFileController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/BulkLoadTemplateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/BulkLoadTemplateController_Roo_Controller.aj
index f2d0feafd..b816d878b 100644
--- a/src/main/java/com/labsynch/labseer/web/BulkLoadTemplateController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/BulkLoadTemplateController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect BulkLoadTemplateController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/CmpdRegAppSettingController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/CmpdRegAppSettingController_Roo_Controller.aj
index 97ffb5cca..978670286 100644
--- a/src/main/java/com/labsynch/labseer/web/CmpdRegAppSettingController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/CmpdRegAppSettingController_Roo_Controller.aj
@@ -102,9 +102,7 @@ privileged aspect CmpdRegAppSettingController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/CodeKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/CodeKindController_Roo_Controller.aj
index 314981479..f712e4b96 100755
--- a/src/main/java/com/labsynch/labseer/web/CodeKindController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/CodeKindController_Roo_Controller.aj
@@ -102,9 +102,7 @@ privileged aspect CodeKindController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/CodeOriginController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/CodeOriginController_Roo_Controller.aj
index 450cc647d..534c3401e 100644
--- a/src/main/java/com/labsynch/labseer/web/CodeOriginController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/CodeOriginController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect CodeOriginController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/CodeTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/CodeTypeController_Roo_Controller.aj
index 1e69a8918..0ae21a78f 100755
--- a/src/main/java/com/labsynch/labseer/web/CodeTypeController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/CodeTypeController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect CodeTypeController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/CompoundController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/CompoundController_Roo_Controller.aj
index 17cd6430b..998bb8ad3 100644
--- a/src/main/java/com/labsynch/labseer/web/CompoundController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/CompoundController_Roo_Controller.aj
@@ -103,9 +103,7 @@ privileged aspect CompoundController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/CompoundTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/CompoundTypeController_Roo_Controller.aj
index cf85da05e..18b369622 100644
--- a/src/main/java/com/labsynch/labseer/web/CompoundTypeController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/CompoundTypeController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect CompoundTypeController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ContainerController_Roo_Controller.aj
index c690dbecb..733ec9925 100755
--- a/src/main/java/com/labsynch/labseer/web/ContainerController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ContainerController_Roo_Controller.aj
@@ -113,9 +113,7 @@ privileged aspect ContainerController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ContainerKindController_Roo_Controller.aj
index 9f6958a15..4a433861a 100755
--- a/src/main/java/com/labsynch/labseer/web/ContainerKindController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ContainerKindController_Roo_Controller.aj
@@ -102,9 +102,7 @@ privileged aspect ContainerKindController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerLabelController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ContainerLabelController_Roo_Controller.aj
index 4bc306f8e..49be8dc3d 100755
--- a/src/main/java/com/labsynch/labseer/web/ContainerLabelController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ContainerLabelController_Roo_Controller.aj
@@ -112,9 +112,7 @@ privileged aspect ContainerLabelController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerStateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ContainerStateController_Roo_Controller.aj
index 2438c6358..cdda5db2c 100644
--- a/src/main/java/com/labsynch/labseer/web/ContainerStateController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ContainerStateController_Roo_Controller.aj
@@ -114,9 +114,7 @@ privileged aspect ContainerStateController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ContainerTypeController_Roo_Controller.aj
index 3a24ce65e..595b2354e 100755
--- a/src/main/java/com/labsynch/labseer/web/ContainerTypeController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ContainerTypeController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect ContainerTypeController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerValueController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ContainerValueController_Roo_Controller.aj
index 389183a82..8bdcab793 100755
--- a/src/main/java/com/labsynch/labseer/web/ContainerValueController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ContainerValueController_Roo_Controller.aj
@@ -113,9 +113,7 @@ privileged aspect ContainerValueController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/CorpNameController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/CorpNameController_Roo_Controller.aj
index 152041171..c09365527 100644
--- a/src/main/java/com/labsynch/labseer/web/CorpNameController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/CorpNameController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect CorpNameController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/CronJobController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/CronJobController_Roo_Controller.aj
index 0c424db1d..58f4b7a42 100644
--- a/src/main/java/com/labsynch/labseer/web/CronJobController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/CronJobController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect CronJobController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/DDictKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/DDictKindController_Roo_Controller.aj
index 72f202829..a1bfbd7a1 100644
--- a/src/main/java/com/labsynch/labseer/web/DDictKindController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/DDictKindController_Roo_Controller.aj
@@ -89,9 +89,7 @@ privileged aspect DDictKindController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/DDictTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/DDictTypeController_Roo_Controller.aj
index 82abe1da6..8cc846f09 100644
--- a/src/main/java/com/labsynch/labseer/web/DDictTypeController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/DDictTypeController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect DDictTypeController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/DDictValueController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/DDictValueController_Roo_Controller.aj
index cba72f1c4..6c3baf3fb 100644
--- a/src/main/java/com/labsynch/labseer/web/DDictValueController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/DDictValueController_Roo_Controller.aj
@@ -89,9 +89,7 @@ privileged aspect DDictValueController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ExperimentController_Roo_Controller.aj
index f6c21669b..983889a9f 100644
--- a/src/main/java/com/labsynch/labseer/web/ExperimentController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ExperimentController_Roo_Controller.aj
@@ -124,9 +124,7 @@ privileged aspect ExperimentController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ExperimentKindController_Roo_Controller.aj
index 7c10e4ad0..388df21ee 100755
--- a/src/main/java/com/labsynch/labseer/web/ExperimentKindController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ExperimentKindController_Roo_Controller.aj
@@ -102,9 +102,7 @@ privileged aspect ExperimentKindController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentLabelController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ExperimentLabelController_Roo_Controller.aj
index af2a6f95c..95b2d6f52 100755
--- a/src/main/java/com/labsynch/labseer/web/ExperimentLabelController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ExperimentLabelController_Roo_Controller.aj
@@ -112,9 +112,7 @@ privileged aspect ExperimentLabelController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentStateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ExperimentStateController_Roo_Controller.aj
index dbe6a09f3..b019e4ba9 100755
--- a/src/main/java/com/labsynch/labseer/web/ExperimentStateController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ExperimentStateController_Roo_Controller.aj
@@ -114,9 +114,7 @@ privileged aspect ExperimentStateController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ExperimentTypeController_Roo_Controller.aj
index 741010331..c4fb07c50 100755
--- a/src/main/java/com/labsynch/labseer/web/ExperimentTypeController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ExperimentTypeController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect ExperimentTypeController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentValueController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ExperimentValueController_Roo_Controller.aj
index 37c8a450e..a40f62b71 100755
--- a/src/main/java/com/labsynch/labseer/web/ExperimentValueController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ExperimentValueController_Roo_Controller.aj
@@ -113,9 +113,7 @@ privileged aspect ExperimentValueController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/FileListController.java b/src/main/java/com/labsynch/labseer/web/FileListController.java
index 9aba22cd6..e3cc88124 100755
--- a/src/main/java/com/labsynch/labseer/web/FileListController.java
+++ b/src/main/java/com/labsynch/labseer/web/FileListController.java
@@ -225,10 +225,7 @@ String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRe
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {
-        }
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
 
diff --git a/src/main/java/com/labsynch/labseer/web/FileSaveController.java b/src/main/java/com/labsynch/labseer/web/FileSaveController.java
index c75f24821..1ff1b7cd4 100755
--- a/src/main/java/com/labsynch/labseer/web/FileSaveController.java
+++ b/src/main/java/com/labsynch/labseer/web/FileSaveController.java
@@ -188,10 +188,7 @@ String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRe
 		if (enc == null) {
 			enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
 		}
-		try {
-			pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-		}
-		catch (UnsupportedEncodingException uee) {}
+		pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
 		return pathSegment;
 	}
 
diff --git a/src/main/java/com/labsynch/labseer/web/FileThingController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/FileThingController_Roo_Controller.aj
index 89897c0d1..87c8d06d7 100755
--- a/src/main/java/com/labsynch/labseer/web/FileThingController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/FileThingController_Roo_Controller.aj
@@ -105,9 +105,7 @@ privileged aspect FileThingController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/FileTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/FileTypeController_Roo_Controller.aj
index 1123476e8..73bf10b64 100644
--- a/src/main/java/com/labsynch/labseer/web/FileTypeController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/FileTypeController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect FileTypeController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/InteractionKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/InteractionKindController_Roo_Controller.aj
index d654120d2..509747f57 100755
--- a/src/main/java/com/labsynch/labseer/web/InteractionKindController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/InteractionKindController_Roo_Controller.aj
@@ -102,9 +102,7 @@ privileged aspect InteractionKindController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/InteractionTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/InteractionTypeController_Roo_Controller.aj
index 1a4b241d3..d3de69070 100755
--- a/src/main/java/com/labsynch/labseer/web/InteractionTypeController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/InteractionTypeController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect InteractionTypeController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/IsoSaltController.java b/src/main/java/com/labsynch/labseer/web/IsoSaltController.java
index 483c4fd47..4875023ec 100755
--- a/src/main/java/com/labsynch/labseer/web/IsoSaltController.java
+++ b/src/main/java/com/labsynch/labseer/web/IsoSaltController.java
@@ -128,10 +128,7 @@ String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRe
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        }
-        catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
 
diff --git a/src/main/java/com/labsynch/labseer/web/IsotopeController.java b/src/main/java/com/labsynch/labseer/web/IsotopeController.java
index 0b4a7a68e..4792c5177 100755
--- a/src/main/java/com/labsynch/labseer/web/IsotopeController.java
+++ b/src/main/java/com/labsynch/labseer/web/IsotopeController.java
@@ -117,10 +117,7 @@ String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRe
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {
-        }
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
 
diff --git a/src/main/java/com/labsynch/labseer/web/ItxContainerContainerController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxContainerContainerController_Roo_Controller.aj
index 6bf12c8c7..109605dc7 100755
--- a/src/main/java/com/labsynch/labseer/web/ItxContainerContainerController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ItxContainerContainerController_Roo_Controller.aj
@@ -119,9 +119,7 @@ privileged aspect ItxContainerContainerController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ItxContainerContainerStateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxContainerContainerStateController_Roo_Controller.aj
index c3033d136..6fb65582d 100755
--- a/src/main/java/com/labsynch/labseer/web/ItxContainerContainerStateController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ItxContainerContainerStateController_Roo_Controller.aj
@@ -107,9 +107,7 @@ privileged aspect ItxContainerContainerStateController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ItxContainerContainerValueController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxContainerContainerValueController_Roo_Controller.aj
index 62f7bf851..e481d8621 100755
--- a/src/main/java/com/labsynch/labseer/web/ItxContainerContainerValueController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ItxContainerContainerValueController_Roo_Controller.aj
@@ -106,9 +106,7 @@ privileged aspect ItxContainerContainerValueController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentController_Roo_Controller.aj
index 7867e33d3..dc322153a 100644
--- a/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentController_Roo_Controller.aj
@@ -119,9 +119,7 @@ privileged aspect ItxExperimentExperimentController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentStateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentStateController_Roo_Controller.aj
index 4766c288e..7f4ee6107 100644
--- a/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentStateController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentStateController_Roo_Controller.aj
@@ -107,9 +107,7 @@ privileged aspect ItxExperimentExperimentStateController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentValueController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentValueController_Roo_Controller.aj
index f571fcc75..3fc20ba2b 100644
--- a/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentValueController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentValueController_Roo_Controller.aj
@@ -106,9 +106,7 @@ privileged aspect ItxExperimentExperimentValueController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingController_Roo_Controller.aj
index 81da550c2..2357b9644 100644
--- a/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingController_Roo_Controller.aj
@@ -119,9 +119,7 @@ privileged aspect ItxLsThingLsThingController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingStateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingStateController_Roo_Controller.aj
index a0e2b9957..5b95e0e32 100644
--- a/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingStateController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingStateController_Roo_Controller.aj
@@ -107,9 +107,7 @@ privileged aspect ItxLsThingLsThingStateController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingValueController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingValueController_Roo_Controller.aj
index f39495269..d44f23edf 100644
--- a/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingValueController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingValueController_Roo_Controller.aj
@@ -106,9 +106,7 @@ privileged aspect ItxLsThingLsThingValueController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolController_Roo_Controller.aj
index c8fd35710..21028f7ea 100755
--- a/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolController_Roo_Controller.aj
@@ -119,9 +119,7 @@ privileged aspect ItxProtocolProtocolController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolStateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolStateController_Roo_Controller.aj
index 349fbb7a4..1b2d3295b 100755
--- a/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolStateController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolStateController_Roo_Controller.aj
@@ -107,9 +107,7 @@ privileged aspect ItxProtocolProtocolStateController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolValueController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolValueController_Roo_Controller.aj
index fd3fe8917..bd5a9a581 100755
--- a/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolValueController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolValueController_Roo_Controller.aj
@@ -106,9 +106,7 @@ privileged aspect ItxProtocolProtocolValueController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerController_Roo_Controller.aj
index 6565a756f..59bbd398c 100755
--- a/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerController_Roo_Controller.aj
@@ -121,9 +121,7 @@ privileged aspect ItxSubjectContainerController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerStateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerStateController_Roo_Controller.aj
index 9a55f8fad..4995ee155 100755
--- a/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerStateController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerStateController_Roo_Controller.aj
@@ -107,9 +107,7 @@ privileged aspect ItxSubjectContainerStateController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerValueController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerValueController_Roo_Controller.aj
index 74bc2eee6..d2f95ff95 100755
--- a/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerValueController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerValueController_Roo_Controller.aj
@@ -106,9 +106,7 @@ privileged aspect ItxSubjectContainerValueController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/LabelKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LabelKindController_Roo_Controller.aj
index 9d13d6292..34b859f11 100755
--- a/src/main/java/com/labsynch/labseer/web/LabelKindController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/LabelKindController_Roo_Controller.aj
@@ -95,9 +95,7 @@ privileged aspect LabelKindController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/LabelSequenceController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LabelSequenceController_Roo_Controller.aj
index 75648fad4..c6ae9013a 100755
--- a/src/main/java/com/labsynch/labseer/web/LabelSequenceController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/LabelSequenceController_Roo_Controller.aj
@@ -104,9 +104,7 @@ privileged aspect LabelSequenceController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/LabelSequenceRoleController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LabelSequenceRoleController_Roo_Controller.aj
index 8ceb7d922..db3a760ef 100644
--- a/src/main/java/com/labsynch/labseer/web/LabelSequenceRoleController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/LabelSequenceRoleController_Roo_Controller.aj
@@ -107,9 +107,7 @@ privileged aspect LabelSequenceRoleController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/LabelTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LabelTypeController_Roo_Controller.aj
index aa6dc1563..20a0c3792 100755
--- a/src/main/java/com/labsynch/labseer/web/LabelTypeController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/LabelTypeController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect LabelTypeController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/LotAliasController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LotAliasController_Roo_Controller.aj
index dda646cc2..f10783cea 100644
--- a/src/main/java/com/labsynch/labseer/web/LotAliasController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/LotAliasController_Roo_Controller.aj
@@ -95,9 +95,7 @@ privileged aspect LotAliasController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/LotAliasKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LotAliasKindController_Roo_Controller.aj
index 94aeb81c0..e2ade5a79 100644
--- a/src/main/java/com/labsynch/labseer/web/LotAliasKindController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/LotAliasKindController_Roo_Controller.aj
@@ -102,9 +102,7 @@ privileged aspect LotAliasKindController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/LotAliasTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LotAliasTypeController_Roo_Controller.aj
index a208c2dd2..b78c73dcb 100644
--- a/src/main/java/com/labsynch/labseer/web/LotAliasTypeController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/LotAliasTypeController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect LotAliasTypeController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/LotController.java b/src/main/java/com/labsynch/labseer/web/LotController.java
index 38b06e7b3..9abc9ac37 100755
--- a/src/main/java/com/labsynch/labseer/web/LotController.java
+++ b/src/main/java/com/labsynch/labseer/web/LotController.java
@@ -169,10 +169,7 @@ String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRe
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {
-        }
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
 
diff --git a/src/main/java/com/labsynch/labseer/web/LsInteractionController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsInteractionController_Roo_Controller.aj
index 0f7830e60..c44b7aca2 100755
--- a/src/main/java/com/labsynch/labseer/web/LsInteractionController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/LsInteractionController_Roo_Controller.aj
@@ -105,9 +105,7 @@ privileged aspect LsInteractionController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/LsRoleController.java b/src/main/java/com/labsynch/labseer/web/LsRoleController.java
index 5f06c290e..8f30dbae4 100755
--- a/src/main/java/com/labsynch/labseer/web/LsRoleController.java
+++ b/src/main/java/com/labsynch/labseer/web/LsRoleController.java
@@ -117,10 +117,7 @@ String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRe
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {
-        }
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqAnlGrpController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsSeqAnlGrpController_Roo_Controller.aj
index 1e56b7d3e..9aa8ba003 100644
--- a/src/main/java/com/labsynch/labseer/web/LsSeqAnlGrpController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/LsSeqAnlGrpController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect LsSeqAnlGrpController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqContainerController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsSeqContainerController_Roo_Controller.aj
index 04956fbfd..33352ed8d 100644
--- a/src/main/java/com/labsynch/labseer/web/LsSeqContainerController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/LsSeqContainerController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect LsSeqContainerController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqExptController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsSeqExptController_Roo_Controller.aj
index e7d15f7b1..f0f52d852 100644
--- a/src/main/java/com/labsynch/labseer/web/LsSeqExptController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/LsSeqExptController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect LsSeqExptController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqItxCntrCntrController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsSeqItxCntrCntrController_Roo_Controller.aj
index 74ded2998..58a54c0c7 100644
--- a/src/main/java/com/labsynch/labseer/web/LsSeqItxCntrCntrController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/LsSeqItxCntrCntrController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect LsSeqItxCntrCntrController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqItxExperimentExperimentController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsSeqItxExperimentExperimentController_Roo_Controller.aj
index ce6b8d70b..82c3cbe19 100644
--- a/src/main/java/com/labsynch/labseer/web/LsSeqItxExperimentExperimentController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/LsSeqItxExperimentExperimentController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect LsSeqItxExperimentExperimentController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqItxLsThingLsThingController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsSeqItxLsThingLsThingController_Roo_Controller.aj
index fe371e409..71d31c696 100644
--- a/src/main/java/com/labsynch/labseer/web/LsSeqItxLsThingLsThingController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/LsSeqItxLsThingLsThingController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect LsSeqItxLsThingLsThingController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqItxProtocolProtocolController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsSeqItxProtocolProtocolController_Roo_Controller.aj
index 5e594e531..bf9e47cf2 100644
--- a/src/main/java/com/labsynch/labseer/web/LsSeqItxProtocolProtocolController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/LsSeqItxProtocolProtocolController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect LsSeqItxProtocolProtocolController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqItxSubjCntrController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsSeqItxSubjCntrController_Roo_Controller.aj
index 1c61d8e7b..1415386a9 100644
--- a/src/main/java/com/labsynch/labseer/web/LsSeqItxSubjCntrController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/LsSeqItxSubjCntrController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect LsSeqItxSubjCntrController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqProtocolController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsSeqProtocolController_Roo_Controller.aj
index 97c3b599e..29fd96611 100644
--- a/src/main/java/com/labsynch/labseer/web/LsSeqProtocolController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/LsSeqProtocolController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect LsSeqProtocolController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqSubjectController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsSeqSubjectController_Roo_Controller.aj
index 205e414ef..2505ece6b 100644
--- a/src/main/java/com/labsynch/labseer/web/LsSeqSubjectController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/LsSeqSubjectController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect LsSeqSubjectController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqTrtGrpController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsSeqTrtGrpController_Roo_Controller.aj
index bc9c6985d..1e8f0e053 100644
--- a/src/main/java/com/labsynch/labseer/web/LsSeqTrtGrpController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/LsSeqTrtGrpController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect LsSeqTrtGrpController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/LsTagController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsTagController_Roo_Controller.aj
index a20a7e816..f50f68480 100644
--- a/src/main/java/com/labsynch/labseer/web/LsTagController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/LsTagController_Roo_Controller.aj
@@ -108,9 +108,7 @@ privileged aspect LsTagController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/LsThingController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsThingController_Roo_Controller.aj
index 73cb2229d..45e171225 100755
--- a/src/main/java/com/labsynch/labseer/web/LsThingController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/LsThingController_Roo_Controller.aj
@@ -113,9 +113,7 @@ privileged aspect LsThingController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/LsThingLabelController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsThingLabelController_Roo_Controller.aj
index 3b0f941ed..d4efd3fb6 100755
--- a/src/main/java/com/labsynch/labseer/web/LsThingLabelController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/LsThingLabelController_Roo_Controller.aj
@@ -112,9 +112,7 @@ privileged aspect LsThingLabelController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/LsThingStateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsThingStateController_Roo_Controller.aj
index 526d9272d..09ac4443a 100755
--- a/src/main/java/com/labsynch/labseer/web/LsThingStateController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/LsThingStateController_Roo_Controller.aj
@@ -114,9 +114,7 @@ privileged aspect LsThingStateController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/LsThingValueController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsThingValueController_Roo_Controller.aj
index dbf0efb84..55eeb2cd2 100755
--- a/src/main/java/com/labsynch/labseer/web/LsThingValueController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/LsThingValueController_Roo_Controller.aj
@@ -113,9 +113,7 @@ privileged aspect LsThingValueController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/LsTransactionController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsTransactionController_Roo_Controller.aj
index b3033391b..2062e5a59 100755
--- a/src/main/java/com/labsynch/labseer/web/LsTransactionController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/LsTransactionController_Roo_Controller.aj
@@ -107,9 +107,7 @@ privileged aspect LsTransactionController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/MetalotController.java b/src/main/java/com/labsynch/labseer/web/MetalotController.java
index b42ac3644..12c8708cd 100755
--- a/src/main/java/com/labsynch/labseer/web/MetalotController.java
+++ b/src/main/java/com/labsynch/labseer/web/MetalotController.java
@@ -235,10 +235,7 @@ String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRe
 		if (enc == null) {
 			enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
 		}
-		try {
-			pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-		}
-		catch (UnsupportedEncodingException uee) {}
+		pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
 		return pathSegment;
 	}
 
diff --git a/src/main/java/com/labsynch/labseer/web/OperatorController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/OperatorController_Roo_Controller.aj
index dc4589989..2a3b7a6b1 100644
--- a/src/main/java/com/labsynch/labseer/web/OperatorController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/OperatorController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect OperatorController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/OperatorKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/OperatorKindController_Roo_Controller.aj
index c7183495e..c50ed2bba 100755
--- a/src/main/java/com/labsynch/labseer/web/OperatorKindController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/OperatorKindController_Roo_Controller.aj
@@ -102,9 +102,7 @@ privileged aspect OperatorKindController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/OperatorTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/OperatorTypeController_Roo_Controller.aj
index e086b7292..614fa292f 100755
--- a/src/main/java/com/labsynch/labseer/web/OperatorTypeController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/OperatorTypeController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect OperatorTypeController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ParentAliasController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ParentAliasController_Roo_Controller.aj
index 290f25210..a9f463375 100644
--- a/src/main/java/com/labsynch/labseer/web/ParentAliasController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ParentAliasController_Roo_Controller.aj
@@ -95,9 +95,7 @@ privileged aspect ParentAliasController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ParentAliasKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ParentAliasKindController_Roo_Controller.aj
index 3b2466cf6..99fd18a92 100644
--- a/src/main/java/com/labsynch/labseer/web/ParentAliasKindController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ParentAliasKindController_Roo_Controller.aj
@@ -102,9 +102,7 @@ privileged aspect ParentAliasKindController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ParentAliasTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ParentAliasTypeController_Roo_Controller.aj
index b8afe52d9..8923a555b 100644
--- a/src/main/java/com/labsynch/labseer/web/ParentAliasTypeController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ParentAliasTypeController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect ParentAliasTypeController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ParentAnnotationController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ParentAnnotationController_Roo_Controller.aj
index 0d211ee09..38e5f01da 100644
--- a/src/main/java/com/labsynch/labseer/web/ParentAnnotationController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ParentAnnotationController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect ParentAnnotationController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ParentController.java b/src/main/java/com/labsynch/labseer/web/ParentController.java
index 45b43417d..1edda45e6 100755
--- a/src/main/java/com/labsynch/labseer/web/ParentController.java
+++ b/src/main/java/com/labsynch/labseer/web/ParentController.java
@@ -275,10 +275,7 @@ String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRe
 		if (enc == null) {
 			enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
 		}
-		try {
-			pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-		} catch (UnsupportedEncodingException uee) {
-		}
+		pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
 		return pathSegment;
 	}
 
diff --git a/src/main/java/com/labsynch/labseer/web/PhysicalStateController.java b/src/main/java/com/labsynch/labseer/web/PhysicalStateController.java
index c8e46ac89..a761ce754 100755
--- a/src/main/java/com/labsynch/labseer/web/PhysicalStateController.java
+++ b/src/main/java/com/labsynch/labseer/web/PhysicalStateController.java
@@ -113,10 +113,7 @@ String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRe
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {
-        }
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
 
diff --git a/src/main/java/com/labsynch/labseer/web/PreDef_CorpNameController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/PreDef_CorpNameController_Roo_Controller.aj
index d02062978..45dbd1d7e 100644
--- a/src/main/java/com/labsynch/labseer/web/PreDef_CorpNameController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/PreDef_CorpNameController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect PreDef_CorpNameController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ProtocolController_Roo_Controller.aj
index 47953268f..5cc7d6756 100644
--- a/src/main/java/com/labsynch/labseer/web/ProtocolController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ProtocolController_Roo_Controller.aj
@@ -115,9 +115,7 @@ privileged aspect ProtocolController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ProtocolKindController_Roo_Controller.aj
index 39e50b7a0..937a45fec 100755
--- a/src/main/java/com/labsynch/labseer/web/ProtocolKindController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ProtocolKindController_Roo_Controller.aj
@@ -102,9 +102,7 @@ privileged aspect ProtocolKindController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolLabelController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ProtocolLabelController_Roo_Controller.aj
index 56792a8d7..86d0c8aed 100755
--- a/src/main/java/com/labsynch/labseer/web/ProtocolLabelController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ProtocolLabelController_Roo_Controller.aj
@@ -112,9 +112,7 @@ privileged aspect ProtocolLabelController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolStateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ProtocolStateController_Roo_Controller.aj
index f87a5013f..b2b5744f4 100644
--- a/src/main/java/com/labsynch/labseer/web/ProtocolStateController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ProtocolStateController_Roo_Controller.aj
@@ -114,9 +114,7 @@ privileged aspect ProtocolStateController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ProtocolTypeController_Roo_Controller.aj
index 5cbd60672..4df1e40d9 100755
--- a/src/main/java/com/labsynch/labseer/web/ProtocolTypeController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ProtocolTypeController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect ProtocolTypeController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolValueController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ProtocolValueController_Roo_Controller.aj
index d18caedd0..32e03e257 100644
--- a/src/main/java/com/labsynch/labseer/web/ProtocolValueController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ProtocolValueController_Roo_Controller.aj
@@ -113,9 +113,7 @@ privileged aspect ProtocolValueController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/PurityMeasuredByController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/PurityMeasuredByController_Roo_Controller.aj
index 0a4c87e52..c5929897b 100644
--- a/src/main/java/com/labsynch/labseer/web/PurityMeasuredByController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/PurityMeasuredByController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect PurityMeasuredByController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/RegSearchController.java b/src/main/java/com/labsynch/labseer/web/RegSearchController.java
index ec9b11fd4..e6070aad7 100755
--- a/src/main/java/com/labsynch/labseer/web/RegSearchController.java
+++ b/src/main/java/com/labsynch/labseer/web/RegSearchController.java
@@ -40,10 +40,7 @@ String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRe
 		if (enc == null) {
 			enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
 		}
-		try {
-			pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-		}
-		catch (UnsupportedEncodingException uee) {}
+		pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
 		return pathSegment;
 	}
 
diff --git a/src/main/java/com/labsynch/labseer/web/RoleKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/RoleKindController_Roo_Controller.aj
index 2e3122ed6..ea3e9d7b7 100644
--- a/src/main/java/com/labsynch/labseer/web/RoleKindController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/RoleKindController_Roo_Controller.aj
@@ -102,9 +102,7 @@ privileged aspect RoleKindController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/RoleTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/RoleTypeController_Roo_Controller.aj
index deb0e8573..00395a75d 100644
--- a/src/main/java/com/labsynch/labseer/web/RoleTypeController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/RoleTypeController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect RoleTypeController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/SaltController.java b/src/main/java/com/labsynch/labseer/web/SaltController.java
index 4e590c506..f5c39d934 100755
--- a/src/main/java/com/labsynch/labseer/web/SaltController.java
+++ b/src/main/java/com/labsynch/labseer/web/SaltController.java
@@ -83,10 +83,7 @@ String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRe
 		if (enc == null) {
 			enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
 		}
-		try {
-			pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-		} catch (UnsupportedEncodingException uee) {
-		}
+		pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
 		return pathSegment;
 	}
 
diff --git a/src/main/java/com/labsynch/labseer/web/SaltFormAliasController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/SaltFormAliasController_Roo_Controller.aj
index 8ee2b7773..b781d59db 100644
--- a/src/main/java/com/labsynch/labseer/web/SaltFormAliasController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/SaltFormAliasController_Roo_Controller.aj
@@ -95,9 +95,7 @@ privileged aspect SaltFormAliasController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/SaltFormAliasKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/SaltFormAliasKindController_Roo_Controller.aj
index da0199d75..39ca9c1af 100644
--- a/src/main/java/com/labsynch/labseer/web/SaltFormAliasKindController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/SaltFormAliasKindController_Roo_Controller.aj
@@ -102,9 +102,7 @@ privileged aspect SaltFormAliasKindController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/SaltFormAliasTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/SaltFormAliasTypeController_Roo_Controller.aj
index 008139010..008b1b5c8 100644
--- a/src/main/java/com/labsynch/labseer/web/SaltFormAliasTypeController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/SaltFormAliasTypeController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect SaltFormAliasTypeController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/SaltFormController.java b/src/main/java/com/labsynch/labseer/web/SaltFormController.java
index f181759a2..8fb83e215 100755
--- a/src/main/java/com/labsynch/labseer/web/SaltFormController.java
+++ b/src/main/java/com/labsynch/labseer/web/SaltFormController.java
@@ -182,10 +182,7 @@ String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRe
 		if (enc == null) {
 			enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
 		}
-		try {
-			pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-		} catch (UnsupportedEncodingException uee) {
-		}
+		pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
 		return pathSegment;
 	}
 
diff --git a/src/main/java/com/labsynch/labseer/web/SaltLoaderController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/SaltLoaderController_Roo_Controller.aj
index f3c189908..9000136ca 100644
--- a/src/main/java/com/labsynch/labseer/web/SaltLoaderController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/SaltLoaderController_Roo_Controller.aj
@@ -102,9 +102,7 @@ privileged aspect SaltLoaderController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/SolutionUnitController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/SolutionUnitController_Roo_Controller.aj
index d25c883e8..beae8ca47 100644
--- a/src/main/java/com/labsynch/labseer/web/SolutionUnitController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/SolutionUnitController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect SolutionUnitController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/StateKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/StateKindController_Roo_Controller.aj
index aba3a0900..b79f04281 100755
--- a/src/main/java/com/labsynch/labseer/web/StateKindController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/StateKindController_Roo_Controller.aj
@@ -102,9 +102,7 @@ privileged aspect StateKindController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/StateTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/StateTypeController_Roo_Controller.aj
index 774b05b6c..a6cce6f69 100755
--- a/src/main/java/com/labsynch/labseer/web/StateTypeController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/StateTypeController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect StateTypeController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/StereoCategoryController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/StereoCategoryController_Roo_Controller.aj
index 30cfd715d..795184894 100644
--- a/src/main/java/com/labsynch/labseer/web/StereoCategoryController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/StereoCategoryController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect StereoCategoryController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/SubjectController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/SubjectController_Roo_Controller.aj
index 66a30a5a5..23db5ef96 100755
--- a/src/main/java/com/labsynch/labseer/web/SubjectController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/SubjectController_Roo_Controller.aj
@@ -113,9 +113,7 @@ privileged aspect SubjectController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/SubjectLabelController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/SubjectLabelController_Roo_Controller.aj
index 65003bc4a..d285928ad 100755
--- a/src/main/java/com/labsynch/labseer/web/SubjectLabelController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/SubjectLabelController_Roo_Controller.aj
@@ -112,9 +112,7 @@ privileged aspect SubjectLabelController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/SubjectStateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/SubjectStateController_Roo_Controller.aj
index 616fb59d7..f65386ebd 100644
--- a/src/main/java/com/labsynch/labseer/web/SubjectStateController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/SubjectStateController_Roo_Controller.aj
@@ -114,9 +114,7 @@ privileged aspect SubjectStateController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/SubjectValueController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/SubjectValueController_Roo_Controller.aj
index d46925091..2495b0ad1 100644
--- a/src/main/java/com/labsynch/labseer/web/SubjectValueController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/SubjectValueController_Roo_Controller.aj
@@ -113,9 +113,7 @@ privileged aspect SubjectValueController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/TempSelectTableController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/TempSelectTableController_Roo_Controller.aj
index eec7efbe8..456eeb0f8 100644
--- a/src/main/java/com/labsynch/labseer/web/TempSelectTableController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/TempSelectTableController_Roo_Controller.aj
@@ -102,9 +102,7 @@ privileged aspect TempSelectTableController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ThingKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ThingKindController_Roo_Controller.aj
index 42965500f..9122aa7de 100755
--- a/src/main/java/com/labsynch/labseer/web/ThingKindController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ThingKindController_Roo_Controller.aj
@@ -102,9 +102,7 @@ privileged aspect ThingKindController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ThingPageArchiveController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ThingPageArchiveController_Roo_Controller.aj
index 1f6389778..f4a674bb1 100755
--- a/src/main/java/com/labsynch/labseer/web/ThingPageArchiveController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ThingPageArchiveController_Roo_Controller.aj
@@ -103,9 +103,7 @@ privileged aspect ThingPageArchiveController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ThingPageController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ThingPageController_Roo_Controller.aj
index f6c89c700..e38dd87a3 100755
--- a/src/main/java/com/labsynch/labseer/web/ThingPageController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ThingPageController_Roo_Controller.aj
@@ -114,9 +114,7 @@ privileged aspect ThingPageController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ThingTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ThingTypeController_Roo_Controller.aj
index 2e9a80779..5158c77f8 100755
--- a/src/main/java/com/labsynch/labseer/web/ThingTypeController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ThingTypeController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect ThingTypeController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/TreatmentGroupController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/TreatmentGroupController_Roo_Controller.aj
index 85247e73a..68311b2e4 100755
--- a/src/main/java/com/labsynch/labseer/web/TreatmentGroupController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/TreatmentGroupController_Roo_Controller.aj
@@ -113,9 +113,7 @@ privileged aspect TreatmentGroupController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/TreatmentGroupLabelController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/TreatmentGroupLabelController_Roo_Controller.aj
index 922cdb522..6a6110edf 100755
--- a/src/main/java/com/labsynch/labseer/web/TreatmentGroupLabelController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/TreatmentGroupLabelController_Roo_Controller.aj
@@ -112,9 +112,7 @@ privileged aspect TreatmentGroupLabelController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/TreatmentGroupStateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/TreatmentGroupStateController_Roo_Controller.aj
index 69f54225d..481c1b532 100755
--- a/src/main/java/com/labsynch/labseer/web/TreatmentGroupStateController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/TreatmentGroupStateController_Roo_Controller.aj
@@ -114,9 +114,7 @@ privileged aspect TreatmentGroupStateController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/TreatmentGroupValueController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/TreatmentGroupValueController_Roo_Controller.aj
index 31cff272c..642466874 100755
--- a/src/main/java/com/labsynch/labseer/web/TreatmentGroupValueController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/TreatmentGroupValueController_Roo_Controller.aj
@@ -113,9 +113,7 @@ privileged aspect TreatmentGroupValueController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/UncertaintyKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/UncertaintyKindController_Roo_Controller.aj
index ed810331f..4cb4a35ee 100755
--- a/src/main/java/com/labsynch/labseer/web/UncertaintyKindController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/UncertaintyKindController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect UncertaintyKindController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/UnitController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/UnitController_Roo_Controller.aj
index 358271468..72771f1cf 100644
--- a/src/main/java/com/labsynch/labseer/web/UnitController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/UnitController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect UnitController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/UnitKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/UnitKindController_Roo_Controller.aj
index 712bbc862..d3da774e3 100755
--- a/src/main/java/com/labsynch/labseer/web/UnitKindController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/UnitKindController_Roo_Controller.aj
@@ -102,9 +102,7 @@ privileged aspect UnitKindController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/UnitTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/UnitTypeController_Roo_Controller.aj
index 8918435a6..4e3d0f835 100755
--- a/src/main/java/com/labsynch/labseer/web/UnitTypeController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/UnitTypeController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect UnitTypeController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/UpdateLogController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/UpdateLogController_Roo_Controller.aj
index 7a53f6edc..e318ff2a6 100755
--- a/src/main/java/com/labsynch/labseer/web/UpdateLogController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/UpdateLogController_Roo_Controller.aj
@@ -102,9 +102,7 @@ privileged aspect UpdateLogController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ValueKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ValueKindController_Roo_Controller.aj
index 90b9b9857..cd79e3504 100755
--- a/src/main/java/com/labsynch/labseer/web/ValueKindController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ValueKindController_Roo_Controller.aj
@@ -102,9 +102,7 @@ privileged aspect ValueKindController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/ValueTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ValueTypeController_Roo_Controller.aj
index 6a3caaaff..d816d0b83 100755
--- a/src/main/java/com/labsynch/labseer/web/ValueTypeController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/ValueTypeController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect ValueTypeController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/java/com/labsynch/labseer/web/VendorController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/VendorController_Roo_Controller.aj
index e33a0ab90..e4538512c 100644
--- a/src/main/java/com/labsynch/labseer/web/VendorController_Roo_Controller.aj
+++ b/src/main/java/com/labsynch/labseer/web/VendorController_Roo_Controller.aj
@@ -93,9 +93,7 @@ privileged aspect VendorController_Roo_Controller {
         if (enc == null) {
             enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
         }
-        try {
-            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        } catch (UnsupportedEncodingException uee) {}
+        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
         return pathSegment;
     }
     
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index e5da99971..b282fb6bd 100755
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -7,7 +7,6 @@
   </Appenders>
   <Loggers>
     <Logger name="com.labsynch.labseer" level="info"/>
-    <Logger name="com.mangofactory.swagger" level="error"/>
     <Logger name="org.springframework" level="info"/>
     <Logger name="org.springframework.orm" level="info"/>
     <Logger name="org.springframework.security" level="info"/>
diff --git a/src/main/webapp/WEB-INF/spring/webmvc-config-test.xml b/src/main/webapp/WEB-INF/spring/webmvc-config-test.xml
index 76ab7f2b0..0d1d49ae3 100755
--- a/src/main/webapp/WEB-INF/spring/webmvc-config-test.xml
+++ b/src/main/webapp/WEB-INF/spring/webmvc-config-test.xml
@@ -62,9 +62,9 @@
     <!-- Enable this for integration of file upload functionality -->
     <bean class="org.springframework.web.multipart.commons.CommonsMultipartResolver" id="multipartResolver"/>
 <bean class="org.springframework.web.servlet.view.UrlBasedViewResolver" id="tilesViewResolver">
-    <property name="viewClass" value="org.springframework.web.servlet.view.tiles2.TilesView"/>
+    <property name="viewClass" value="org.springframework.web.servlet.view.tiles.TilesView"/>
   </bean>
-     <bean class="org.springframework.web.servlet.view.tiles2.TilesConfigurer" id="tilesConfigurer">
+     <bean class="org.springframework.web.servlet.view.tiles3.TilesConfigurer" id="tilesConfigurer">
     <property name="definitions">
       <list>
         <value>/WEB-INF/layouts/layouts.xml</value>
diff --git a/src/main/webapp/WEB-INF/spring/webmvc-config.xml b/src/main/webapp/WEB-INF/spring/webmvc-config.xml
index 942a24f90..8ae4709b5 100755
--- a/src/main/webapp/WEB-INF/spring/webmvc-config.xml
+++ b/src/main/webapp/WEB-INF/spring/webmvc-config.xml
@@ -14,7 +14,7 @@
 		class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping" />
 	<!-- Configures view for returning JSON to the client -->
 	<bean
-		class="org.springframework.web.servlet.view.json.MappingJacksonJsonView">
+		class="org.springframework.web.servlet.view.json.MappingJackson2JsonView">
 		<property name="contentType" value="text/plain" />
 	</bean>
 
@@ -82,7 +82,7 @@
 <bean class="org.springframework.web.servlet.view.UrlBasedViewResolver" id="tilesViewResolver">
     <property name="viewClass" value="org.springframework.web.servlet.view.tiles2.TilesView"/>
   </bean>
-    <bean class="org.springframework.web.servlet.view.tiles2.TilesConfigurer" id="tilesConfigurer">
+    <bean class="org.springframework.web.servlet.view.tiles3.TilesConfigurer" id="tilesConfigurer">
     <property name="definitions">
       <list>
         <value>/WEB-INF/layouts/layouts.xml</value>
@@ -92,6 +92,5 @@
     </property>
   </bean>
 <bean class="com.labsynch.labseer.web.ApplicationConversionServiceFactoryBean" id="applicationConversionService"/>
-<bean class="com.labsynch.labseer.config.SwaggerConfig" id="swaggerConfig"/>
 
 </beans>

From ddedbe6705093ff4967667576d1b796cb28c9883 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Tue, 5 Apr 2022 13:22:42 -0700
Subject: [PATCH 03/73] Startup + setup scripts working

---
 pom.xml                                       | 35 ++++++++++++-------
 .../labseer/api/ApiContainerController.java   | 10 +++---
 .../labseer/api/ApiExperimentController.java  |  6 ++--
 .../labseer/api/ApiProtocolController.java    |  6 ++--
 .../labseer/api/ApiStructureController.java   | 12 +++----
 .../labseer/api/ApiSubjectController.java     |  6 ++--
 .../labseer/api/ApiValueKindController.java   |  6 ++--
 .../labseer/domain/ContainerKind.java         |  2 ++
 .../labseer/domain/ExperimentKind.java        |  2 ++
 .../labseer/domain/InteractionKind.java       |  2 ++
 .../labseer/domain/ItxLsThingLsThing.java     |  4 +--
 .../labsynch/labseer/domain/LabelKind.java    |  2 ++
 .../java/com/labsynch/labseer/domain/Lot.java | 13 ++-----
 .../labseer/domain/Lot_Roo_JavaBean.aj        |  8 ++---
 .../domain/Lot_Roo_Jpa_ActiveRecord.aj        |  2 +-
 .../com/labsynch/labseer/domain/LsRole.java   |  2 +-
 .../labsynch/labseer/domain/OperatorKind.java |  2 ++
 .../labsynch/labseer/domain/ProtocolKind.java |  2 ++
 .../com/labsynch/labseer/domain/RoleKind.java |  2 ++
 .../labsynch/labseer/domain/StateKind.java    |  2 ++
 .../labsynch/labseer/domain/ThingKind.java    |  2 ++
 .../com/labsynch/labseer/domain/UnitKind.java |  2 ++
 .../labsynch/labseer/domain/ValueKind.java    |  2 ++
 .../labsynch/labseer/domain/ValueType.java    | 12 ++++++-
 .../labseer/domain/ValueType_Roo_Finder.aj    |  9 +----
 .../labseer/dto/BatchCodeDependencyDTO.java   |  2 +-
 .../labseer/dto/BulkLoadPropertiesDTO.java    |  4 +--
 ...oadSDFValidationPropertiesResponseDTO.java |  2 +-
 .../labseer/dto/BulkLoadTemplateDTO.java      |  2 +-
 .../com/labsynch/labseer/dto/CurveFitDTO.java |  6 ++--
 .../com/labsynch/labseer/dto/FlagWellDTO.java | 10 +++---
 .../labsynch/labseer/dto/KiCurveFitDTO.java   |  4 +--
 .../com/labsynch/labseer/dto/LotAliasDTO.java |  4 +--
 .../java/com/labsynch/labseer/dto/LotDTO.java |  2 +-
 .../labseer/dto/LotDTO_Roo_JavaBean.aj        |  8 ++---
 .../labsynch/labseer/dto/ParentAliasDTO.java  |  4 +--
 .../labseer/dto/PreferredNameDTO.java         |  6 ++--
 .../com/labsynch/labseer/dto/TypeDTO.java     | 27 +++++++-------
 .../com/labsynch/labseer/dto/TypeKindDTO.java | 26 +++++++-------
 .../labseer/dto/ValueTypeKindDTO.java         |  6 ++--
 .../service/ACASAuthenticationProvider.java   |  4 +--
 .../service/AuthorRoleServiceImpl.java        |  4 +--
 .../labseer/service/AuthorServiceImpl.java    |  4 +--
 .../labseer/service/BulkLoadServiceImpl.java  | 12 +++----
 .../labseer/service/ContainerServiceImpl.java |  8 ++---
 .../service/DataDictionaryServiceImpl.java    |  4 +--
 .../DatabaseAuthenticationProvider.java       |  4 +--
 .../service/ExperimentServiceImpl.java        |  4 +--
 .../labseer/service/ExportServiceImpl.java    |  2 +-
 .../labseer/service/GeneThingServiceImpl.java |  6 ++--
 .../service/ItxLsThingLsThingServiceImpl.java |  2 +-
 .../service/LabelSequenceServiceImpl.java     |  4 +--
 .../labseer/service/LsThingServiceImpl.java   | 14 ++++----
 .../labseer/service/MetalotServiceImpl.java   |  2 +-
 .../labseer/utils/BitSetUserType.java         |  6 ++--
 .../labseer/utils/LoadCompoundsUtil.java      | 18 +++++-----
 .../labseer/utils/LoadFullCompoundsUtil.java  |  8 ++---
 .../utils/PhysicalNamingStrategyImpl.java     | 27 ++++++++++++++
 .../labsynch/labseer/utils/SecurityUtil.java  |  8 ++---
 src/main/resources/META-INF/persistence.xml   |  4 +--
 .../spring/applicationContext-security.xml    |  2 +-
 src/main/resources/log4j2.xml                 |  1 +
 .../webapp/WEB-INF/spring/webmvc-config.xml   |  2 +-
 .../webapp/WEB-INF/views/lots/create.jspx     |  2 +-
 src/main/webapp/WEB-INF/views/lots/show.jspx  |  2 +-
 .../webapp/WEB-INF/views/lots/update.jspx     |  2 +-
 .../api/ApiContainerControllerTest.java       |  6 ++--
 .../labseer/dto/ValueTypeKindDTOTest.java     |  2 +-
 .../service/ContainerLSServiceTests.java      |  8 ++---
 .../labseer/service/CreateProjectsTests.java  | 20 +++++------
 .../LsThingPreferredIdServiceTests.java       |  2 +-
 .../labseer/service/LsThingServiceTests.java  |  2 +-
 72 files changed, 259 insertions(+), 203 deletions(-)
 create mode 100644 src/main/java/com/labsynch/labseer/utils/PhysicalNamingStrategyImpl.java

diff --git a/pom.xml b/pom.xml
index 1f68dbf0d..95ad7936f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,6 +50,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		<git-sha-1>${buildNumber}</git-sha-1>
 		<BuildScmBranch>${scmBranch}</BuildScmBranch>
 		<tomcat.version>7.0.63</tomcat.version>
+		<hibernate.version>5.6.1.Final</hibernate.version>
     </properties>
 	<scm>
 		<connection>scm:git:git://github.com/mcneilco/acas-roo-server.git</connection>
@@ -62,7 +63,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 			<name>Spring Release</name>
 			<url>https://repo.spring.io/release</url>
 		</repository>
-
+		<repository>
+			<id>MavenCentral</id>
+			<name>Maven repository</name>
+			<url>https://repo1.maven.org/maven2</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
 	</repositories>
 	<pluginRepositories>
 		<pluginRepository>
@@ -281,17 +292,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-core</artifactId>
-			<version>4.3.11.Final</version>
+			<version>${hibernate.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vladmihalcea</groupId>
-			<artifactId>hibernate-types-43</artifactId>
+			<artifactId>hibernate-types-52</artifactId>
 			<version>2.14.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-entitymanager</artifactId>
-			<version>4.3.11.Final</version>
+			<version>${hibernate.version}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>cglib</groupId>
@@ -316,7 +327,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-validator</artifactId>
-			<version>4.3.2.Final</version>
+			<version>6.0.15.Final</version>
 			<exclusions>
 				<exclusion>
 					<groupId>javax.xml.bind</groupId>
@@ -328,11 +339,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
+		<!-- <dependency>
 			<groupId>javax.validation</groupId>
 			<artifactId>validation-api</artifactId>
-			<version>2.0.1.Final</version>
-		</dependency>
+			<version>1.1.0.Final</version>
+		</dependency> -->
 		<dependency>
 			<groupId>cglib</groupId>
 			<artifactId>cglib-nodep</artifactId>
@@ -439,7 +450,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		<dependency>
 			<groupId>org.apache.tiles</groupId>
 			<artifactId>tiles-jsp</artifactId>
-			<version>2.2.2</version>
+			<version>3.0.8</version>
 		</dependency>
 		<dependency>
 			<groupId>com.mysema.querydsl</groupId>
@@ -547,11 +558,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 			<version>1.3.1</version>
 		</dependency>
 		<!-- JCHEM 16 requires dom4j 1.3. This depdendency can be removed when we upgrade jchem to jchem > 17 -->
-		<dependency>
+		<!-- <dependency>
 			<groupId>dom4j</groupId>
 			<artifactId>dom4j</artifactId>
-			<version>1.3</version>
-		</dependency>
+			<version>1.6.1</version>
+		</dependency> -->
 		<dependency>
 			<groupId>com.beust</groupId>
 			<artifactId>jcommander</artifactId>
diff --git a/src/main/java/com/labsynch/labseer/api/ApiContainerController.java b/src/main/java/com/labsynch/labseer/api/ApiContainerController.java
index 83d940a2b..c7b4b1122 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiContainerController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiContainerController.java
@@ -9,7 +9,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -579,7 +579,7 @@ public ResponseEntity<java.lang.String> createPlate(@RequestBody String json) {
 				return new ResponseEntity<String>("Barcode already exists", headers, HttpStatus.BAD_REQUEST);
 			}
 		}
-		catch (EmptyResultDataAccessException e){
+		catch (NoResultException e){
 			//barcode is unique, proceed to plate creation
 		}catch (IncorrectResultSizeDataAccessException e){
 			return new ResponseEntity<String>("More than one of this barcode already exists!!", headers, HttpStatus.BAD_REQUEST);
@@ -609,7 +609,7 @@ public ResponseEntity<java.lang.String> createPlates(@RequestBody String json) {
 				if (dupeContainer != null){
 					return new ResponseEntity<String>("Barcode already exists: "+plateRequest.getBarcode(), headers, HttpStatus.BAD_REQUEST);
 				}
-			}catch (EmptyResultDataAccessException e){
+			}catch (NoResultException e){
 				//barcode is unique, proceed to plate creation
 			}catch (IncorrectResultSizeDataAccessException e){
 				return new ResponseEntity<String>("More than one of this barcode already exists!!: "+plateRequest.getBarcode(), headers, HttpStatus.BAD_REQUEST);
@@ -640,7 +640,7 @@ public ResponseEntity<java.lang.String> createTube(@RequestBody String json) {
 				return new ResponseEntity<String>("Barcode already exists", headers, HttpStatus.BAD_REQUEST);
 			}
 		}
-		catch (EmptyResultDataAccessException e){
+		catch (NoResultException e){
 			//barcode is unique, proceed to plate creation
 		}catch (IncorrectResultSizeDataAccessException e){
 			return new ResponseEntity<String>("More than one of this barcode already exists!!", headers, HttpStatus.BAD_REQUEST);
@@ -670,7 +670,7 @@ public ResponseEntity<java.lang.String> createTubes(@RequestBody String json) {
 				if (dupeContainer != null){
 					return new ResponseEntity<String>("Barcode already exists: "+plateRequest.getBarcode(), headers, HttpStatus.BAD_REQUEST);
 				}
-			}catch (EmptyResultDataAccessException e){
+			}catch (NoResultException e){
 				//barcode is unique, proceed to plate creation
 			}catch (IncorrectResultSizeDataAccessException e){
 				return new ResponseEntity<String>("More than one of this barcode already exists!! "+plateRequest.getBarcode(), headers, HttpStatus.BAD_REQUEST);
diff --git a/src/main/java/com/labsynch/labseer/api/ApiExperimentController.java b/src/main/java/com/labsynch/labseer/api/ApiExperimentController.java
index 5c952fc1e..172a3162d 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiExperimentController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiExperimentController.java
@@ -15,7 +15,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -1383,7 +1383,7 @@ public ResponseEntity<java.lang.String> jsonFindExperimentsByCodeNameEqualsRoute
         Experiment experiment;
         try{
         	experiment = Experiment.findExperimentsByCodeNameEquals(codeName).getSingleResult();
-        } catch (EmptyResultDataAccessException e){
+        } catch (NoResultException e){
         	return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
         }
         if (with != null) {
@@ -1416,7 +1416,7 @@ public ResponseEntity<java.lang.String> findExperimentsByCodeNames(@RequestBody
         Collection<ExperimentErrorMessageDTO> foundExperiments;
         try{
         	foundExperiments = experimentService.findExperimentsByCodeNames(codeNames);
-        } catch (EmptyResultDataAccessException e){
+        } catch (NoResultException e){
         	return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
         }
         if (with != null) {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiProtocolController.java b/src/main/java/com/labsynch/labseer/api/ApiProtocolController.java
index e0bffde7a..ad6daf69e 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiProtocolController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiProtocolController.java
@@ -15,7 +15,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -332,7 +332,7 @@ public ResponseEntity<java.lang.String> jsonFindProtocolsByCodeNameEqualsRoute(@
         Protocol protocol;
         try{
         	protocol = Protocol.findProtocolsByCodeNameEquals(codeName).getSingleResult();
-        } catch (EmptyResultDataAccessException e){
+        } catch (NoResultException e){
         	return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
         }
         return new ResponseEntity<String>(protocol.toJsonStub(), headers, HttpStatus.OK);
@@ -481,7 +481,7 @@ public ResponseEntity<java.lang.String> findProtocolsByCodeNames(@RequestBody Li
         Collection<ProtocolErrorMessageDTO> foundProtocols;
         try{
         	foundProtocols = protocolService.findProtocolsByCodeNames(codeNames);
-        } catch (EmptyResultDataAccessException e){
+        } catch (NoResultException e){
         	return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
         }
         if (with != null) {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiStructureController.java b/src/main/java/com/labsynch/labseer/api/ApiStructureController.java
index 964096a4e..90ec17317 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiStructureController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiStructureController.java
@@ -6,7 +6,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -113,7 +113,7 @@ public ResponseEntity<java.lang.String> getByCodeName(
     	try{
     		ChemStructure structure = ChemStructure.findStructureByCodeName(codeName);
             return new ResponseEntity<String>(structure.toJson(), headers, HttpStatus.OK);
-    	}catch (EmptyResultDataAccessException empty){
+    	}catch (NoResultException empty){
     		return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
     	}catch (Exception e){
     		logger.error("Caught exception saving structure",e);
@@ -139,7 +139,7 @@ public ResponseEntity<byte[]> renderStructureByCodeName(@RequestParam(value="cod
 		try{
 			byte[] image = structureService.renderStructureByCodeName(codeName, height, width, format);  
 			return new ResponseEntity<byte[]>(image, headers, HttpStatus.OK);
-		}catch (EmptyResultDataAccessException empty){
+		}catch (NoResultException empty){
 			return new ResponseEntity<byte[]>(headers, HttpStatus.NOT_FOUND);
 		}catch (Exception e){
 			logger.error("Caught exception in renderStructureByCodeName",e);
@@ -164,7 +164,7 @@ public ResponseEntity<byte[]> renderStructureByLsThingCodeName(@RequestParam(val
 		try{
 			byte[] image = lsThingService.renderStructureByLsThingCodeName(codeName, height, width, format);  
 			return new ResponseEntity<byte[]>(image, headers, HttpStatus.OK);
-		}catch (EmptyResultDataAccessException empty){
+		}catch (NoResultException empty){
 			return new ResponseEntity<byte[]>(headers, HttpStatus.NOT_FOUND);
 		}catch (NotFoundException notFound){
 			return new ResponseEntity<byte[]>(headers, HttpStatus.NOT_FOUND);
@@ -287,7 +287,7 @@ public ResponseEntity<java.lang.String> convertSmilesToMol(
     	try{
     		String molStructure = structureService.convertSmilesToMol(smiles);
             return new ResponseEntity<String>(molStructure, headers, HttpStatus.OK);
-    	}catch (EmptyResultDataAccessException empty){
+    	}catch (NoResultException empty){
     		return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
     	}catch (Exception e){
     		logger.error("Caught exception converting smiles to MOL",e);
@@ -305,7 +305,7 @@ public ResponseEntity<java.lang.String> cleanMolStructure(
     	try{
     		String cleanedMolStructure = structureService.cleanMolStructure(molStructure);
             return new ResponseEntity<String>(cleanedMolStructure, headers, HttpStatus.OK);
-    	}catch (EmptyResultDataAccessException empty){
+    	}catch (NoResultException empty){
     		return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
     	}catch (Exception e){
     		logger.error("Caught exception cleaning MOL structure",e);
diff --git a/src/main/java/com/labsynch/labseer/api/ApiSubjectController.java b/src/main/java/com/labsynch/labseer/api/ApiSubjectController.java
index f13333a5b..00b3cd546 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiSubjectController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSubjectController.java
@@ -11,7 +11,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -199,7 +199,7 @@ public ResponseEntity<String> updateFromJson(@RequestBody String json) {
         Subject subject = Subject.fromJsonToSubject(json);
         try{
         	Subject foundSubject = Subject.findSubject(subject.getId());
-        }catch(EmptyResultDataAccessException e){
+        }catch(NoResultException e){
             return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
         }
         subject = subjectService.updateSubject(subject);
@@ -214,7 +214,7 @@ public ResponseEntity<String> updateFromJsonArray(@RequestBody String json) {
         for (Subject subject: Subject.fromJsonArrayToSubjects(json)) {
         	try{
             	Subject foundSubject = Subject.findSubject(subject.getId());
-            }catch(EmptyResultDataAccessException e){
+            }catch(NoResultException e){
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
             updatedSubjects.add(subjectService.updateSubject(subject));
diff --git a/src/main/java/com/labsynch/labseer/api/ApiValueKindController.java b/src/main/java/com/labsynch/labseer/api/ApiValueKindController.java
index 33775c791..443970edb 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiValueKindController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiValueKindController.java
@@ -6,7 +6,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -38,7 +38,7 @@ public ResponseEntity<String> getOrCreateValueKinds(@RequestBody String json ){
         	ValueType valueType;
         	try{
         		valueType = ValueType.findValueTypesByTypeNameEquals(lsType).getSingleResult();
-        	} catch(EmptyResultDataAccessException e){
+        	} catch(NoResultException e){
         		valueType = new ValueType();
         		valueType.setTypeName(lsType);
         		valueType.persist();
@@ -47,7 +47,7 @@ public ResponseEntity<String> getOrCreateValueKinds(@RequestBody String json ){
         	try{
         		valueKind = ValueKind.findValueKindsByKindNameEqualsAndLsType(lsKind, valueType).getSingleResult();
         		valueKinds.add(valueKind);
-        	} catch(EmptyResultDataAccessException e){
+        	} catch(NoResultException e){
         		valueKind = new ValueKind();
         		valueKind.setKindName(lsKind);
         		valueKind.setLsType(valueType);
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerKind.java b/src/main/java/com/labsynch/labseer/domain/ContainerKind.java
index 634402fff..290b000b6 100755
--- a/src/main/java/com/labsynch/labseer/domain/ContainerKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ContainerKind.java
@@ -2,6 +2,7 @@
 
 import javax.persistence.Column;
 import javax.persistence.EntityManager;
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.PersistenceContext;
 import javax.validation.constraints.NotNull;
@@ -22,6 +23,7 @@ public class ContainerKind {
 	
 	@NotNull
 	@ManyToOne
+	@JoinColumn(name = "ls_type")
 	private ContainerType lsType;
 
 	@NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentKind.java b/src/main/java/com/labsynch/labseer/domain/ExperimentKind.java
index 223682120..f78218bbc 100755
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ExperimentKind.java
@@ -7,6 +7,7 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
@@ -28,6 +29,7 @@ public class ExperimentKind {
 
     @NotNull
     @ManyToOne
+	@JoinColumn(name = "ls_type")
     private ExperimentType lsType;
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/InteractionKind.java b/src/main/java/com/labsynch/labseer/domain/InteractionKind.java
index 121b2805b..709c17fc3 100755
--- a/src/main/java/com/labsynch/labseer/domain/InteractionKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/InteractionKind.java
@@ -7,6 +7,7 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
@@ -33,6 +34,7 @@ public class InteractionKind {
 
     @NotNull
     @ManyToOne
+	@JoinColumn(name = "ls_type")
     private InteractionType lsType;
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing.java b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing.java
index e624137b0..438933142 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing.java
@@ -20,7 +20,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -347,7 +347,7 @@ public int retrieveOrder() {
         int order;
         try {
         	order = q.getSingleResult();
-        } catch (EmptyResultDataAccessException e){
+        } catch (NoResultException e){
         	order = -1;
         }
     	return order;
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelKind.java b/src/main/java/com/labsynch/labseer/domain/LabelKind.java
index 7bb4a1288..aeeb614f1 100755
--- a/src/main/java/com/labsynch/labseer/domain/LabelKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/LabelKind.java
@@ -8,6 +8,7 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
@@ -34,6 +35,7 @@ public class LabelKind {
 
 
     @ManyToOne
+	@JoinColumn(name = "ls_type")
     private LabelType lsType;
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/Lot.java b/src/main/java/com/labsynch/labseer/domain/Lot.java
index 4becb78ea..4e542a07f 100755
--- a/src/main/java/com/labsynch/labseer/domain/Lot.java
+++ b/src/main/java/com/labsynch/labseer/domain/Lot.java
@@ -68,22 +68,18 @@ public class Lot {
     @Column(unique = true)
     @NotNull
     @Size(max = 255)
-    @org.hibernate.annotations.Index(name = "Lot_corpName_IDX")
     private String corpName;
 
-    @org.hibernate.annotations.Index(name = "Lot_lotNumber_IDX")
     private Integer lotNumber;
 
     private Double lotMolWeight;
 
     @Temporal(TemporalType.TIMESTAMP)
     @DateTimeFormat(style = "S-")
-    @org.hibernate.annotations.Index(name = "Lot_SynthDate_IDX")
     private Date synthesisDate;
 
     @Temporal(TemporalType.TIMESTAMP)
     @DateTimeFormat(style = "S-")
-    @org.hibernate.annotations.Index(name = "Lot_RegDate_IDX")
     private Date registrationDate;
     
 	private String registeredBy;
@@ -95,14 +91,12 @@ public class Lot {
 	private String modifiedBy;
 
     @Size(max = 255)
-    @org.hibernate.annotations.Index(name = "Lot_Barcode_IDX")
     private String barcode;
     
     @Size(max = 255)
     private String color;
 
     @Size(max = 255)
-    @org.hibernate.annotations.Index(name = "Lot_Notebook_IDX")
     private String notebookPage;
 
     private Double amount;
@@ -136,25 +130,22 @@ public class Lot {
     @Column(columnDefinition="text")
     private String comments;
 
-    @org.hibernate.annotations.Index(name = "Lot_Virtual_IDX")
     private Boolean isVirtual;
 
     private Boolean ignore;
 
     
     @ManyToOne
-    @org.hibernate.annotations.Index(name = "Lot_PhysicalState_IDX")
     private PhysicalState physicalState;
 
     @ManyToOne
-    @org.hibernate.annotations.Index(name = "Lot_Vendor_IDX")
     private Vendor vendor;
 
     @Size(max = 255)
-    private String vendorID;
+    @Column(name = "vendorid")
+    private String vendorId;
 
     @ManyToOne
-    @org.hibernate.annotations.Index(name = "Lot_SaltForm_IDX")
     private SaltForm saltForm;
 
     @OneToMany(cascade = CascadeType.REMOVE, mappedBy = "lot", fetch = FetchType.LAZY)
diff --git a/src/main/java/com/labsynch/labseer/domain/Lot_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/Lot_Roo_JavaBean.aj
index 0f8d33bfa..128da2cd4 100644
--- a/src/main/java/com/labsynch/labseer/domain/Lot_Roo_JavaBean.aj
+++ b/src/main/java/com/labsynch/labseer/domain/Lot_Roo_JavaBean.aj
@@ -254,12 +254,12 @@ privileged aspect Lot_Roo_JavaBean {
         this.vendor = vendor;
     }
     
-    public String Lot.getVendorID() {
-        return this.vendorID;
+    public String Lot.getVendorId() {
+        return this.vendorId;
     }
     
-    public void Lot.setVendorID(String vendorID) {
-        this.vendorID = vendorID;
+    public void Lot.setVendorId(String vendorId) {
+        this.vendorId = vendorId;
     }
     
     public Set<FileList> Lot.getFileLists() {
diff --git a/src/main/java/com/labsynch/labseer/domain/Lot_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/Lot_Roo_Jpa_ActiveRecord.aj
index e69a89daf..8ca98a622 100644
--- a/src/main/java/com/labsynch/labseer/domain/Lot_Roo_Jpa_ActiveRecord.aj
+++ b/src/main/java/com/labsynch/labseer/domain/Lot_Roo_Jpa_ActiveRecord.aj
@@ -14,7 +14,7 @@ privileged aspect Lot_Roo_Jpa_ActiveRecord {
     @PersistenceContext
     transient EntityManager Lot.entityManager;
     
-    public static final List<String> Lot.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "asDrawnStruct", "lotAsDrawnCdId", "buid", "corpName", "lotNumber", "lotMolWeight", "synthesisDate", "registrationDate", "registeredBy", "modifiedDate", "modifiedBy", "barcode", "color", "notebookPage", "amount", "amountUnits", "solutionAmount", "solutionAmountUnits", "supplier", "supplierID", "purity", "purityOperator", "purityMeasuredBy", "chemist", "percentEE", "comments", "isVirtual", "ignore", "physicalState", "vendor", "vendorID", "saltForm", "fileLists", "retain", "retainUnits", "retainLocation", "meltingPoint", "boilingPoint", "supplierLot", "project", "parent", "bulkLoadFile", "lambda", "absorbance", "stockSolvent", "stockLocation", "observedMassOne", "observedMassTwo", "tareWeight", "tareWeightUnits", "totalAmountStored", "totalAmountStoredUnits", "lotAliases", "storageLocation");
+    public static final List<String> Lot.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "asDrawnStruct", "lotAsDrawnCdId", "buid", "corpName", "lotNumber", "lotMolWeight", "synthesisDate", "registrationDate", "registeredBy", "modifiedDate", "modifiedBy", "barcode", "color", "notebookPage", "amount", "amountUnits", "solutionAmount", "solutionAmountUnits", "supplier", "supplierID", "purity", "purityOperator", "purityMeasuredBy", "chemist", "percentEE", "comments", "isVirtual", "ignore", "physicalState", "vendor", "vendorId", "saltForm", "fileLists", "retain", "retainUnits", "retainLocation", "meltingPoint", "boilingPoint", "supplierLot", "project", "parent", "bulkLoadFile", "lambda", "absorbance", "stockSolvent", "stockLocation", "observedMassOne", "observedMassTwo", "tareWeight", "tareWeightUnits", "totalAmountStored", "totalAmountStoredUnits", "lotAliases", "storageLocation");
     
     public static final EntityManager Lot.entityManager() {
         EntityManager em = new Lot().entityManager;
diff --git a/src/main/java/com/labsynch/labseer/domain/LsRole.java b/src/main/java/com/labsynch/labseer/domain/LsRole.java
index cb82536ef..1a10bf346 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsRole.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsRole.java
@@ -52,7 +52,7 @@ public class LsRole {
     @Size(max = 200)
     private String roleDescription;
     
-    @Column(unique = true)
+    // @Column(unique = true)
     @Size(max = 255)
     private String lsTypeAndKind;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/OperatorKind.java b/src/main/java/com/labsynch/labseer/domain/OperatorKind.java
index 7bb50d7ee..fef7cc6e8 100755
--- a/src/main/java/com/labsynch/labseer/domain/OperatorKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/OperatorKind.java
@@ -8,6 +8,7 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
@@ -30,6 +31,7 @@ public class OperatorKind {
 
     @NotNull
     @ManyToOne
+	@JoinColumn(name = "ls_type")
     private OperatorType lsType;
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolKind.java b/src/main/java/com/labsynch/labseer/domain/ProtocolKind.java
index 41e7b39ee..e5276f596 100755
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ProtocolKind.java
@@ -8,6 +8,7 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
@@ -40,6 +41,7 @@ public class ProtocolKind {
 
     @NotNull
     @ManyToOne
+	@JoinColumn(name = "ls_type")
     private ProtocolType lsType;
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/RoleKind.java b/src/main/java/com/labsynch/labseer/domain/RoleKind.java
index 68e2bb1a7..85627bcdd 100644
--- a/src/main/java/com/labsynch/labseer/domain/RoleKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/RoleKind.java
@@ -1,6 +1,7 @@
 package com.labsynch.labseer.domain;
 
 import javax.persistence.Column;
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
@@ -21,6 +22,7 @@ public class RoleKind {
 	
     @NotNull
     @ManyToOne
+	@JoinColumn(name = "ls_type")
     private RoleType lsType;
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/StateKind.java b/src/main/java/com/labsynch/labseer/domain/StateKind.java
index 8df0094c2..eea686973 100755
--- a/src/main/java/com/labsynch/labseer/domain/StateKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/StateKind.java
@@ -8,6 +8,7 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
@@ -34,6 +35,7 @@ public class StateKind {
 
     @NotNull
     @ManyToOne
+	@JoinColumn(name = "ls_type")
     private StateType lsType;
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingKind.java b/src/main/java/com/labsynch/labseer/domain/ThingKind.java
index 47e6f1577..7c3060909 100755
--- a/src/main/java/com/labsynch/labseer/domain/ThingKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ThingKind.java
@@ -8,6 +8,7 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
@@ -34,6 +35,7 @@ public class ThingKind {
 
     @NotNull
     @ManyToOne
+	@JoinColumn(name = "ls_type")
     private ThingType lsType;
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/UnitKind.java b/src/main/java/com/labsynch/labseer/domain/UnitKind.java
index ca84c52cf..bd737149d 100755
--- a/src/main/java/com/labsynch/labseer/domain/UnitKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/UnitKind.java
@@ -8,6 +8,7 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
@@ -30,6 +31,7 @@ public class UnitKind {
 
     @NotNull
     @ManyToOne
+	@JoinColumn(name = "ls_type")
     private UnitType lsType;
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/ValueKind.java b/src/main/java/com/labsynch/labseer/domain/ValueKind.java
index 3052c7855..2c3e20f05 100755
--- a/src/main/java/com/labsynch/labseer/domain/ValueKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ValueKind.java
@@ -8,6 +8,7 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
@@ -34,6 +35,7 @@ public class ValueKind {
 
     @NotNull
     @ManyToOne
+    @JoinColumn(name = "ls_type")
     private ValueType lsType;
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/ValueType.java b/src/main/java/com/labsynch/labseer/domain/ValueType.java
index c4a4cf85d..3b181f95d 100755
--- a/src/main/java/com/labsynch/labseer/domain/ValueType.java
+++ b/src/main/java/com/labsynch/labseer/domain/ValueType.java
@@ -4,10 +4,12 @@
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.EntityManager;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
@@ -33,9 +35,17 @@ public class ValueType {
     @Size(max = 64)
     private String typeName;
 
+    public static TypedQuery<ValueType> findValueTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = ValueType.entityManager();
+        TypedQuery<ValueType> q = em.createQuery("SELECT o FROM ValueType AS o WHERE o.typeName = :typeName", ValueType.class);
+        q.setParameter("typeName", typeName);
+        return q;
+    }
+    
 	public static ValueType getOrCreate(String name) {
 		ValueType lsType = null;
-        List<ValueType> lsTypes = ValueType.findValueTypesByTypeNameEquals(name).getResultList();
+        List<ValueType> lsTypes = findValueTypesByTypeNameEquals(name).getResultList();
         if (lsTypes.size() == 0) {
             lsType = new ValueType();
             lsType.setTypeName(name);
diff --git a/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_Finder.aj
index 419458901..178503365 100755
--- a/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_Finder.aj
+++ b/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_Finder.aj
@@ -16,14 +16,7 @@ privileged aspect ValueType_Roo_Finder {
         q.setParameter("typeName", typeName);
         return ((Long) q.getSingleResult());
     }
-    
-    public static TypedQuery<ValueType> ValueType.findValueTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = ValueType.entityManager();
-        TypedQuery<ValueType> q = em.createQuery("SELECT o FROM ValueType AS o WHERE o.typeName = :typeName", ValueType.class);
-        q.setParameter("typeName", typeName);
-        return q;
-    }
+
     
     public static TypedQuery<ValueType> ValueType.findValueTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
         if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
diff --git a/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO.java b/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO.java
index 0c83e02ff..f8bd830d9 100644
--- a/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO.java
@@ -13,7 +13,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO.java
index 264cf89a1..99ff97453 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO.java
@@ -13,7 +13,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
@@ -106,7 +106,7 @@ public void applyTemplateMappings(String templateName, String userName) {
 		BulkLoadTemplate foundTemplate = null;
 		try{
 			foundTemplate = BulkLoadTemplate.findBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals(templateName, userName).getSingleResult();
-		}catch (EmptyResultDataAccessException e){
+		}catch (NoResultException e){
 			logger.error("Template name: "+templateName+" with userName: "+userName+" could not be found.");
 			return;
 		}
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO.java
index b091b3c9d..b33a946ff 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO.java
@@ -13,7 +13,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO.java
index 485635325..ca21c7333 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO.java
@@ -13,7 +13,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
diff --git a/src/main/java/com/labsynch/labseer/dto/CurveFitDTO.java b/src/main/java/com/labsynch/labseer/dto/CurveFitDTO.java
index 9fb4b8d2b..1ba1ae7fb 100644
--- a/src/main/java/com/labsynch/labseer/dto/CurveFitDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CurveFitDTO.java
@@ -17,7 +17,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -540,7 +540,7 @@ public static void updateFitData( Collection<CurveFitDTO> curveFitDTOs) {
 				oldState.setIgnored(true);
 				oldState.merge();
 //				oldState.flush();
-			} catch(EmptyResultDataAccessException e) {
+			} catch(NoResultException e) {
 				logger.debug("Old state of typekind data/dose response not found for AG Code " + curveFitDTO.getAnalysisGroupCode() + " , creating new one");
 			}
 			AnalysisGroupState newState = createCurveFitState(analysisGroup.getId(), "data", "dose response", curveFitDTO.getRecordedBy(), curveFitDTO.getLsTransaction());
@@ -945,7 +945,7 @@ public static String findFirstRenderingHint(List<String> curveIds) {
 					if (!newRenderingHint.equals(renderingHint)) logger.debug("Changing rendering hint from: " + renderingHint + " to: " + newRenderingHint);
 					renderingHint = newRenderingHint;
 				}
-			} catch (EmptyResultDataAccessException e){
+			} catch (NoResultException e){
 				logger.warn("No rendering hint found for curve Id: " + curveId);
 			}
 		}
diff --git a/src/main/java/com/labsynch/labseer/dto/FlagWellDTO.java b/src/main/java/com/labsynch/labseer/dto/FlagWellDTO.java
index d7a96ec68..2cf197d90 100644
--- a/src/main/java/com/labsynch/labseer/dto/FlagWellDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/FlagWellDTO.java
@@ -14,7 +14,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -141,7 +141,7 @@ public static void updateWellFlags( Collection<FlagWellDTO> flagWellDTOs) {
 					oldAlgorithmFlagState.merge();
 //					oldAlgorithmFlagState.flush();
 					logger.debug("Old algorithm flag state ignored.");
-				}catch(EmptyResultDataAccessException e) {
+				}catch(NoResultException e) {
 					logger.debug("Old state of typekind data/auto flag not found for Subject " + subject.getCodeName() + " , creating new one");
 				}
 				SubjectState newAlgorithmState = createWellFlagState(subject.getId(), "data", "auto flag", recordedBy, lsTransaction);
@@ -155,7 +155,7 @@ public static void updateWellFlags( Collection<FlagWellDTO> flagWellDTOs) {
 					oldPreprocessFlagState.merge();
 //					oldPreprocessFlagState.flush();
 					logger.debug("Old preprocess flag state ignored.");
-				}catch(EmptyResultDataAccessException e) {
+				}catch(NoResultException e) {
 					logger.debug("Old state of typekind data/preprocess flag not found for Subject " + subject.getCodeName() + " , creating new one");
 				}
 				SubjectState newPreprocessState = createWellFlagState(subject.getId(), "data", "preprocess flag", recordedBy, lsTransaction);
@@ -169,7 +169,7 @@ public static void updateWellFlags( Collection<FlagWellDTO> flagWellDTOs) {
 					oldUserFlagState.merge();
 //					oldUserFlagState.flush();
 					logger.debug("Old user flag state ignored.");
-				}catch(EmptyResultDataAccessException e) {
+				}catch(NoResultException e) {
 					logger.debug("Old state of typekind data/user flag not found for Subject " + subject.getCodeName() + " , creating new one");
 				}
 				SubjectState newUserState = createWellFlagState(subject.getId(), "data", "user flag", recordedBy, lsTransaction);
@@ -197,7 +197,7 @@ public static void updateWellFlags( Collection<FlagWellDTO> flagWellDTOs) {
 					oldState.merge();
 //					oldState.flush();
 					logger.debug("Old TreatmentGroupState ignored.");
-				}catch(EmptyResultDataAccessException e){
+				}catch(NoResultException e){
 					logger.debug("No state data/results found. Creating a new state.");
 				}
 				TreatmentGroupState newState = createResultsTreatmentGroupState(treatmentGroup.getId(), "data", "results", recordedBy, lsTransaction);
diff --git a/src/main/java/com/labsynch/labseer/dto/KiCurveFitDTO.java b/src/main/java/com/labsynch/labseer/dto/KiCurveFitDTO.java
index 9dd643904..f94543333 100644
--- a/src/main/java/com/labsynch/labseer/dto/KiCurveFitDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/KiCurveFitDTO.java
@@ -16,7 +16,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -452,7 +452,7 @@ public static void updateFitData( Collection<KiCurveFitDTO> curveFitDTOs) {
 				oldState.setIgnored(true);
 				oldState.merge();
 //				oldState.flush();
-			} catch(EmptyResultDataAccessException e) {
+			} catch(NoResultException e) {
 				logger.debug("Old state of typekind data/dose response not found for AG Code " + curveFitDTO.getAnalysisGroupCode() + " , creating new one");
 			}
 			AnalysisGroupState newState = createCurveFitState(analysisGroup.getId(), "data", "dose response", curveFitDTO.getRecordedBy(), curveFitDTO.getLsTransaction());
diff --git a/src/main/java/com/labsynch/labseer/dto/LotAliasDTO.java b/src/main/java/com/labsynch/labseer/dto/LotAliasDTO.java
index 402cbd10c..ef7224374 100644
--- a/src/main/java/com/labsynch/labseer/dto/LotAliasDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LotAliasDTO.java
@@ -3,7 +3,7 @@
 import java.util.Collection;
 import java.util.HashSet;
 
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -46,7 +46,7 @@ public static LotAliasDTO getLotByAlias(LotAliasDTO lotAliasDTO) {
 		LotAlias lotAlias;
 		try {
 			lotAlias = LotAlias.findLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(lotAliasDTO.getAliasName(), lotAliasDTO.getLsType(), lotAliasDTO.getLsKind()).getSingleResult();
-		} catch (EmptyResultDataAccessException e){
+		} catch (NoResultException e){
 			lotAlias = null;
 		}
 		return new LotAliasDTO(lotAlias);
diff --git a/src/main/java/com/labsynch/labseer/dto/LotDTO.java b/src/main/java/com/labsynch/labseer/dto/LotDTO.java
index 0acb4d760..f810d1c03 100755
--- a/src/main/java/com/labsynch/labseer/dto/LotDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LotDTO.java
@@ -78,7 +78,7 @@ public class LotDTO {
 	private Double totalAmountStored;
 	private String totalAmountStoredUnitsCode;
 	private String vendorCode;
-	private String vendorID;
+	private String vendorId;
 	private String saltFormCorpName;
 	private String casNumber;
 	private String saltAbbrevs;
diff --git a/src/main/java/com/labsynch/labseer/dto/LotDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/LotDTO_Roo_JavaBean.aj
index 20ab5d48c..1934f9006 100644
--- a/src/main/java/com/labsynch/labseer/dto/LotDTO_Roo_JavaBean.aj
+++ b/src/main/java/com/labsynch/labseer/dto/LotDTO_Roo_JavaBean.aj
@@ -384,12 +384,12 @@ privileged aspect LotDTO_Roo_JavaBean {
         this.vendorCode = vendorCode;
     }
     
-    public String LotDTO.getVendorID() {
-        return this.vendorID;
+    public String LotDTO.getVendorId() {
+        return this.vendorId;
     }
     
-    public void LotDTO.setVendorID(String vendorID) {
-        this.vendorID = vendorID;
+    public void LotDTO.setVendorId(String vendorId) {
+        this.vendorId = vendorId;
     }
     
     public String LotDTO.getSaltFormCorpName() {
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO.java b/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO.java
index 0974fadea..34892e83a 100644
--- a/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO.java
@@ -4,7 +4,7 @@
 import java.util.HashSet;
 import java.util.List;
 
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -59,7 +59,7 @@ public static ParentAliasDTO getParentByAlias(ParentAliasDTO parentAliasDTO) {
 		ParentAlias parentAlias;
 		try {
 			parentAlias = ParentAlias.findParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(parentAliasDTO.getAliasName(), parentAliasDTO.getLsType(), parentAliasDTO.getLsKind()).getSingleResult();
-		} catch (EmptyResultDataAccessException e){
+		} catch (NoResultException e){
 			parentAlias = null;
 		}
 		return new ParentAliasDTO(parentAlias);
diff --git a/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO.java b/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO.java
index 998ce5d52..7c50f855e 100755
--- a/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO.java
@@ -12,7 +12,7 @@
 import javax.persistence.TemporalType;
 import javax.validation.constraints.Size;
 
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -51,7 +51,7 @@ public static Collection<PreferredNameDTO> getPreferredNames(Collection<Preferre
     		String preferredName;
     		try {
     			preferredName = Lot.findLotsByCorpNameEquals(preferredNameDTO.getRequestName()).getSingleResult().getCorpName();
-    		} catch (EmptyResultDataAccessException e){
+    		} catch (NoResultException e){
     			preferredName = "";
     		}
     		preferredNameDTO.setPreferredName(preferredName);
@@ -64,7 +64,7 @@ public static Collection<PreferredNameDTO> getParentPreferredNames(Collection<Pr
     		String preferredName;
     		try {
     			preferredName = Parent.findParentsByCorpNameEquals(preferredNameDTO.getRequestName()).getSingleResult().getCorpName();
-    		} catch (EmptyResultDataAccessException e){
+    		} catch (NoResultException e){
     			preferredName = "";
     		}
     		preferredNameDTO.setPreferredName(preferredName);
diff --git a/src/main/java/com/labsynch/labseer/dto/TypeDTO.java b/src/main/java/com/labsynch/labseer/dto/TypeDTO.java
index 415048fce..bbd1ad886 100644
--- a/src/main/java/com/labsynch/labseer/dto/TypeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TypeDTO.java
@@ -6,7 +6,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -51,7 +51,7 @@ public static Collection<ProtocolType> getOrCreateProtocolTypes(
 			ProtocolType protocolType;
 			try{
 				protocolType = ProtocolType.findProtocolTypesByTypeNameEquals(type.typeName).getSingleResult();
-			} catch(EmptyResultDataAccessException e){
+			} catch(NoResultException e){
 				protocolType = new ProtocolType();
 				protocolType.setTypeName(type.typeName);
 				protocolType.persist();
@@ -68,7 +68,7 @@ public static Collection<ExperimentType> getOrCreateExperimentTypes(
 			ExperimentType experimentType;
 			try{
 				experimentType = ExperimentType.findExperimentTypesByTypeNameEquals(type.typeName).getSingleResult();
-			} catch(EmptyResultDataAccessException e){
+			} catch(NoResultException e){
 				experimentType = new ExperimentType();
 				experimentType.setTypeName(type.typeName);
 				experimentType.persist();
@@ -85,7 +85,7 @@ public static Collection<InteractionType> getOrCreateInteractionTypes(
 			InteractionType interactionType;
 			try{
 				interactionType = InteractionType.findInteractionTypesByTypeNameEquals(type.getTypeName()).getSingleResult();
-			} catch(EmptyResultDataAccessException e){
+			} catch(NoResultException e){
 				interactionType = new InteractionType();
 				interactionType.setTypeName(type.getTypeName());
 				interactionType.setTypeVerb(type.getTypeVerb());
@@ -103,7 +103,7 @@ public static Collection<ContainerType> getOrCreateContainerTypes(
 			ContainerType containerType;
 			try{
 				containerType = ContainerType.findContainerTypesByTypeNameEquals(type.typeName).getSingleResult();
-			} catch(EmptyResultDataAccessException e){
+			} catch(NoResultException e){
 				containerType = new ContainerType();
 				containerType.setTypeName(type.typeName);
 				containerType.persist();
@@ -120,7 +120,7 @@ public static Collection<StateType> getOrCreateStateTypes(
 			StateType stateType;
 			try{
 				stateType = StateType.findStateTypesByTypeNameEquals(type.typeName).getSingleResult();
-			} catch(EmptyResultDataAccessException e){
+			} catch(NoResultException e){
 				stateType = new StateType();
 				stateType.setTypeName(type.typeName);
 				stateType.persist();
@@ -137,10 +137,11 @@ public static Collection<ValueType> getOrCreateValueTypes(
 			ValueType valueType;
 			try{
 				valueType = ValueType.findValueTypesByTypeNameEquals(type.typeName).getSingleResult();
-			} catch(EmptyResultDataAccessException e){
+			} catch(NoResultException e){
 				valueType = new ValueType();
 				valueType.setTypeName(type.typeName);
 				valueType.persist();
+				valueType.flush();
 			}
 			valueTypes.add(valueType);
 		}
@@ -154,7 +155,7 @@ public static Collection<LabelType> getOrCreateLabelTypes(
 			LabelType labelType;
 			try{
 				labelType = LabelType.findLabelTypesByTypeNameEquals(type.typeName).getSingleResult();
-			} catch(EmptyResultDataAccessException e){
+			} catch(NoResultException e){
 				labelType = new LabelType();
 				labelType.setTypeName(type.typeName);
 				labelType.persist();
@@ -171,7 +172,7 @@ public static Collection<ThingType> getOrCreateThingTypes(
 			ThingType thingType;
 			try{
 				thingType = ThingType.findThingTypesByTypeNameEquals(type.typeName).getSingleResult();
-			} catch(EmptyResultDataAccessException e){
+			} catch(NoResultException e){
 				thingType = new ThingType();
 				thingType.setTypeName(type.typeName);
 				thingType.persist();
@@ -188,7 +189,7 @@ public static Collection<OperatorType> getOrCreateOperatorTypes(
 			OperatorType operatorType;
 			try{
 				operatorType = OperatorType.findOperatorTypesByTypeNameEquals(type.typeName).getSingleResult();
-			} catch(EmptyResultDataAccessException e){
+			} catch(NoResultException e){
 				operatorType = new OperatorType();
 				operatorType.setTypeName(type.typeName);
 				operatorType.persist();
@@ -205,7 +206,7 @@ public static Collection<UnitType> getOrCreateUnitTypes(
 			UnitType unitType;
 			try{
 				unitType = UnitType.findUnitTypesByTypeNameEquals(type.typeName).getSingleResult();
-			} catch(EmptyResultDataAccessException e){
+			} catch(NoResultException e){
 				unitType = new UnitType();
 				unitType.setTypeName(type.typeName);
 				unitType.persist();
@@ -222,7 +223,7 @@ public static Collection<DDictType> getOrCreateDDictTypes(
 			DDictType dDictType;
 			try{
 				dDictType = DDictType.findDDictTypesByNameEquals(type.typeName).getSingleResult();
-			} catch(EmptyResultDataAccessException e){
+			} catch(NoResultException e){
 				dDictType = new DDictType();
 				dDictType.setName(type.typeName);
 				dDictType.persist();
@@ -239,7 +240,7 @@ public static Collection<RoleType> getOrCreateRoleTypes(
 			RoleType roleType;
 			try{
 				roleType = RoleType.findRoleTypesByTypeNameEquals(type.typeName).getSingleResult();
-			} catch(EmptyResultDataAccessException e){
+			} catch(NoResultException e){
 				roleType = new RoleType();
 				roleType.setTypeName(type.typeName);
 				roleType.persist();
diff --git a/src/main/java/com/labsynch/labseer/dto/TypeKindDTO.java b/src/main/java/com/labsynch/labseer/dto/TypeKindDTO.java
index 46b780f37..5a21fd85a 100644
--- a/src/main/java/com/labsynch/labseer/dto/TypeKindDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TypeKindDTO.java
@@ -6,7 +6,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -73,7 +73,7 @@ public static Collection<ProtocolKind> getOrCreateProtocolKinds(
 			ProtocolKind protocolKind;
 			try{
 				protocolKind = ProtocolKind.findProtocolKindsByLsTypeEqualsAndKindNameEquals(protocolType, typeKind.kindName).getSingleResult();
-			} catch(EmptyResultDataAccessException e){
+			} catch(NoResultException e){
 				protocolKind = new ProtocolKind();
 				protocolKind.setLsType(protocolType);
 				protocolKind.setKindName(typeKind.kindName);
@@ -98,7 +98,7 @@ public static Collection<ExperimentKind> getOrCreateExperimentKinds(
 			ExperimentKind experimentKind;
 			try{
 				experimentKind = ExperimentKind.findExperimentKindsByLsTypeEqualsAndKindNameEquals(experimentType, typeKind.kindName).getSingleResult();
-			} catch(EmptyResultDataAccessException e){
+			} catch(NoResultException e){
 				experimentKind = new ExperimentKind();
 				experimentKind.setLsType(experimentType);
 				experimentKind.setKindName(typeKind.kindName);
@@ -123,7 +123,7 @@ public static Collection<InteractionKind> getOrCreateInteractionKinds(
 			InteractionKind interactionKind;
 			try{
 				interactionKind = InteractionKind.findInteractionKindsByKindNameEqualsAndLsType(typeKind.kindName, interactionType).getSingleResult();
-			} catch(EmptyResultDataAccessException e){
+			} catch(NoResultException e){
 				interactionKind = new InteractionKind();
 				interactionKind.setLsType(interactionType);
 				interactionKind.setKindName(typeKind.kindName);
@@ -148,7 +148,7 @@ public static Collection<ContainerKind> getOrCreateContainerKinds(
 			ContainerKind containerKind;
 			try{
 				containerKind = ContainerKind.findContainerKindsByKindNameEqualsAndLsType(typeKind.kindName, containerType).getSingleResult();
-			} catch(EmptyResultDataAccessException e){
+			} catch(NoResultException e){
 				containerKind = new ContainerKind();
 				containerKind.setLsType(containerType);
 				containerKind.setKindName(typeKind.kindName);
@@ -173,7 +173,7 @@ public static Collection<StateKind> getOrCreateStateKinds(
 			StateKind stateKind;
 			try{
 				stateKind = StateKind.findStateKindsByKindNameEqualsAndLsType(typeKind.kindName, stateType).getSingleResult();
-			} catch(EmptyResultDataAccessException e){
+			} catch(NoResultException e){
 				stateKind = new StateKind();
 				stateKind.setLsType(stateType);
 				stateKind.setKindName(typeKind.kindName);
@@ -198,7 +198,7 @@ public static Collection<ValueKind> getOrCreateValueKinds(
 			ValueKind valueKind;
 			try{
 				valueKind = ValueKind.findValueKindsByKindNameEqualsAndLsType(typeKind.kindName, valueType).getSingleResult();
-			} catch(EmptyResultDataAccessException e){
+			} catch(NoResultException e){
 				valueKind = new ValueKind();
 				valueKind.setLsType(valueType);
 				valueKind.setKindName(typeKind.kindName);
@@ -223,7 +223,7 @@ public static Collection<LabelKind> getOrCreateLabelKinds(
 			LabelKind labelKind;
 			try{
 				labelKind = LabelKind.findLabelKindsByKindNameEqualsAndLsType(typeKind.kindName, labelType).getSingleResult();
-			} catch(EmptyResultDataAccessException e){
+			} catch(NoResultException e){
 				labelKind = new LabelKind();
 				labelKind.setLsType(labelType);
 				labelKind.setKindName(typeKind.kindName);
@@ -248,7 +248,7 @@ public static Collection<ThingKind> getOrCreateThingKinds(
 			ThingKind thingKind;
 			try{
 				thingKind = ThingKind.findThingKindsByKindNameEqualsAndLsType(typeKind.kindName, thingType).getSingleResult();
-			} catch(EmptyResultDataAccessException e){
+			} catch(NoResultException e){
 				thingKind = new ThingKind();
 				thingKind.setLsType(thingType);
 				thingKind.setKindName(typeKind.kindName);
@@ -273,7 +273,7 @@ public static Collection<OperatorKind> getOrCreateOperatorKinds(
 			OperatorKind operatorKind;
 			try{
 				operatorKind = OperatorKind.findOperatorKindsByKindNameEqualsAndLsType(typeKind.kindName, operatorType).getSingleResult();
-			} catch(EmptyResultDataAccessException e){
+			} catch(NoResultException e){
 				operatorKind = new OperatorKind();
 				operatorKind.setLsType(operatorType);
 				operatorKind.setKindName(typeKind.kindName);
@@ -298,7 +298,7 @@ public static Collection<UnitKind> getOrCreateUnitKinds(
 			UnitKind unitKind;
 			try{
 				unitKind = UnitKind.findUnitKindsByKindNameEqualsAndLsType(typeKind.kindName, unitType).getSingleResult();
-			} catch(EmptyResultDataAccessException e){
+			} catch(NoResultException e){
 				unitKind = new UnitKind();
 				unitKind.setLsType(unitType);
 				unitKind.setKindName(typeKind.kindName);
@@ -323,7 +323,7 @@ public static Collection<DDictKind> getOrCreateDDictKinds(
 			DDictKind dDictKind;
 			try{
 				dDictKind = DDictKind.findDDictKindsByLsTypeEqualsAndNameEquals(dDictType.getName(), typeKind.kindName).getSingleResult();
-			} catch(EmptyResultDataAccessException e){
+			} catch(NoResultException e){
 				dDictKind = new DDictKind();
 				dDictKind.setLsType(dDictType.getName());
 				dDictKind.setName(typeKind.kindName);
@@ -348,7 +348,7 @@ public static Collection<RoleKind> getOrCreateRoleKinds(
 			RoleKind roleKind;
 			try{
 				roleKind = RoleKind.findRoleKindsByKindNameEqualsAndLsType(typeKind.kindName, roleType).getSingleResult();
-			} catch(EmptyResultDataAccessException e){
+			} catch(NoResultException e){
 				roleKind = new RoleKind();
 				roleKind.setLsType(roleType);
 				roleKind.setKindName(typeKind.kindName);
diff --git a/src/main/java/com/labsynch/labseer/dto/ValueTypeKindDTO.java b/src/main/java/com/labsynch/labseer/dto/ValueTypeKindDTO.java
index 2168d3977..b08411885 100755
--- a/src/main/java/com/labsynch/labseer/dto/ValueTypeKindDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ValueTypeKindDTO.java
@@ -1,6 +1,6 @@
 package com.labsynch.labseer.dto;
 
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -39,7 +39,7 @@ public void findValueKind(){
 		ValueType valueType;
     	try{
     		valueType = ValueType.findValueTypesByTypeNameEquals(this.lsType).getSingleResult();
-    	} catch(EmptyResultDataAccessException e){
+    	} catch(NoResultException e){
     		this.valueKind = null;
     		valueType = null;
     	}
@@ -47,7 +47,7 @@ public void findValueKind(){
     	try{
     		valueKind = ValueKind.findValueKindsByKindNameEqualsAndLsType(this.lsKind, valueType).getSingleResult();
     		this.valueKind = valueKind;
-    	} catch(EmptyResultDataAccessException e){
+    	} catch(NoResultException e){
     		this.valueKind = null;
     	}
 	}
diff --git a/src/main/java/com/labsynch/labseer/service/ACASAuthenticationProvider.java b/src/main/java/com/labsynch/labseer/service/ACASAuthenticationProvider.java
index 516a07113..1bfe0fe75 100755
--- a/src/main/java/com/labsynch/labseer/service/ACASAuthenticationProvider.java
+++ b/src/main/java/com/labsynch/labseer/service/ACASAuthenticationProvider.java
@@ -21,7 +21,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.DisabledException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -189,7 +189,7 @@ protected UserDetails retrieveUser(String username,
 					throw new BadCredentialsException("Invalid Password");
 				}
 
-			} catch (EmptyResultDataAccessException e) {
+			} catch (NoResultException e) {
 				throw new BadCredentialsException("Invalid user");
 			} catch (EntityNotFoundException e) {
 				throw new BadCredentialsException("Invalid user");
diff --git a/src/main/java/com/labsynch/labseer/service/AuthorRoleServiceImpl.java b/src/main/java/com/labsynch/labseer/service/AuthorRoleServiceImpl.java
index 78d5e290f..9f4364e3d 100644
--- a/src/main/java/com/labsynch/labseer/service/AuthorRoleServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/AuthorRoleServiceImpl.java
@@ -7,7 +7,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -52,7 +52,7 @@ public Author syncRoles(Author author, Collection<String> grantedRoles) {
 			LsRole role;
 			try{
 				role = LsRole.findLsRolesByLsTypeEqualsAndRoleNameEquals("LDAP",roleName).getSingleResult();
-			}catch (EmptyResultDataAccessException e){
+			}catch (NoResultException e){
 				role = new LsRole();
 				role.setRoleName(roleName);
 				role.setLsType("LDAP");
diff --git a/src/main/java/com/labsynch/labseer/service/AuthorServiceImpl.java b/src/main/java/com/labsynch/labseer/service/AuthorServiceImpl.java
index 2e29b015e..bd64ba0de 100644
--- a/src/main/java/com/labsynch/labseer/service/AuthorServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/AuthorServiceImpl.java
@@ -28,7 +28,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.mail.MailSender;
 import org.springframework.mail.SimpleMailMessage;
 import org.springframework.security.core.AuthenticationException;
@@ -476,7 +476,7 @@ public Author getOrCreateAuthor(Author author) {
 		try{
 			Author foundAuthor = Author.findAuthorsByUserName(userName).getSingleResult();
 			return foundAuthor;
-		}catch(EmptyResultDataAccessException e){
+		}catch(NoResultException e){
 			logger.debug("Author "+userName+" not found. Creating new author");
 			return saveAuthor(author);
 		}
diff --git a/src/main/java/com/labsynch/labseer/service/BulkLoadServiceImpl.java b/src/main/java/com/labsynch/labseer/service/BulkLoadServiceImpl.java
index 2c6f688ee..1e6ae223a 100644
--- a/src/main/java/com/labsynch/labseer/service/BulkLoadServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/BulkLoadServiceImpl.java
@@ -29,7 +29,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.TransactionSystemException;
 import org.springframework.transaction.annotation.Transactional;
@@ -170,7 +170,7 @@ public BulkLoadTemplate saveBulkLoadTemplate(
 			oldTemplate.update(templateToSave);
 			if (logger.isDebugEnabled()) if (logger.isDebugEnabled()) logger.debug("Updated template to: "+oldTemplate.toJson());
 			return oldTemplate;
-		} catch (EmptyResultDataAccessException e){
+		} catch (NoResultException e){
 			if (logger.isDebugEnabled()) logger.debug("Saving new template");
 			templateToSave.persist();
 			return templateToSave;
@@ -572,7 +572,7 @@ public void writeRegisteredMol(int numRecordsRead, CmpdRegMolecule mol, MetalotR
 			mol.setProperty("Registered Lot Amount Units", ((metalotReturn.getMetalot().getLot().getAmountUnits() == null) ? "" : metalotReturn.getMetalot().getLot().getAmountUnits().getCode()));
 			mol.setProperty("Registered Lot Supplier", ((metalotReturn.getMetalot().getLot().getSupplier() == null) ? "" : metalotReturn.getMetalot().getLot().getSupplier()));
 			mol.setProperty("Registered Lot Supplier ID",((metalotReturn.getMetalot().getLot().getSupplierID() == null) ? "" : metalotReturn.getMetalot().getLot().getSupplierID()));
-			mol.setProperty("Registered Lot Vendor ID", ((metalotReturn.getMetalot().getLot().getVendorID() == null) ? "" : metalotReturn.getMetalot().getLot().getVendorID()));
+			mol.setProperty("Registered Lot Vendor ID", ((metalotReturn.getMetalot().getLot().getVendorId() == null) ? "" : metalotReturn.getMetalot().getLot().getVendorId()));
 			if (!parentAliasList.isEmpty()){
 				for (String alias : parentAliasList){
 					if (allParentAliases.length() == 0) allParentAliases += alias;
@@ -761,7 +761,7 @@ public Parent validateParent(Parent parent, Collection<BulkLoadPropertyMappingDT
 				else{
 					parent = foundParent;
 				}
-			}catch (EmptyResultDataAccessException empty){
+			}catch (NoResultException empty){
 				logger.warn("Parent corp name entered that doesn't already exist (sdf corp name: '"+parent.getCorpName()+"'), this compound will be registered with a new parent corp name: ");
 				foundParent = null;
 			}catch (DupeParentException dupe){
@@ -980,7 +980,7 @@ public Lot validateLot(Lot lot, Collection<BulkLoadPropertyMappingDTO> mappings,
 				}else{
 					throw new DupeLotException("Duplicate lot cannot be registered due to previously existing lot in database.", previousLot.getCorpName());
 				}
-			} catch(EmptyResultDataAccessException e){
+			} catch(NoResultException e){
 				logger.debug("Not a duplicate lot corp name");
 			}	
 		}
@@ -1005,7 +1005,7 @@ public Lot createLot(CmpdRegMolecule mol, int recordNumber, Collection<BulkLoadP
 		lot.setColor(getStringValueFromMappings(mol, "Lot Color", mappings, results, recordNumber));
 		lot.setSupplier(getStringValueFromMappings(mol, "Lot Supplier", mappings, results, recordNumber));
 		lot.setSupplierID(getStringValueFromMappings(mol, "Lot Supplier ID", mappings, results, recordNumber));
-		lot.setVendorID(getStringValueFromMappings(mol, "Lot Vendor ID", mappings, results, recordNumber));
+		lot.setVendorId(getStringValueFromMappings(mol, "Lot Vendor ID", mappings, results, recordNumber));
 		lot.setComments(getStringValueFromMappings(mol, "Lot Comments", mappings, results, recordNumber));		
 		lot.setSupplierLot(getStringValueFromMappings(mol, "Lot Supplier Lot", mappings, results, recordNumber));
 		lot.setMeltingPoint(getNumericValueFromMappings(mol, "Lot Melting Point", mappings, results, recordNumber));
diff --git a/src/main/java/com/labsynch/labseer/service/ContainerServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ContainerServiceImpl.java
index 2b17e142e..f06ef8ca2 100755
--- a/src/main/java/com/labsynch/labseer/service/ContainerServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ContainerServiceImpl.java
@@ -36,7 +36,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
@@ -607,7 +607,7 @@ private void checkContainerUniqueName(Container container) throws UniqueNameExce
 							.findContainerLabelsByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot(
 									containerLabel.getLsType(), labelText, true)
 							.getResultList();
-				} catch (EmptyResultDataAccessException e) {
+				} catch (NoResultException e) {
 					// found nothing
 				}
 				if (!foundContainerLabels.isEmpty()) {
@@ -1136,7 +1136,7 @@ public PreferredNameResultsDTO getCodeNameFromName(String containerType, String
 					} else {
 						logger.info("Did not find a Container with the requested name: " + request.getRequestName());
 					}
-				} catch (EmptyResultDataAccessException e) {
+				} catch (NoResultException e) {
 					logger.info("Did not find a Container with the requested name: " + request.getRequestName());
 				}
 			}
@@ -2110,7 +2110,7 @@ public PlateStubDTO getPlateTypeByPlateBarcode(String plateBarcode) {
 		try {
 			PlateStubDTO result = q.getSingleResult();
 			return result;
-		} catch (EmptyResultDataAccessException e) {
+		} catch (NoResultException e) {
 			return null;
 		}
 	}
diff --git a/src/main/java/com/labsynch/labseer/service/DataDictionaryServiceImpl.java b/src/main/java/com/labsynch/labseer/service/DataDictionaryServiceImpl.java
index acf87dcdc..f2c38ee3a 100644
--- a/src/main/java/com/labsynch/labseer/service/DataDictionaryServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/DataDictionaryServiceImpl.java
@@ -9,7 +9,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.supercsv.cellprocessor.ift.CellProcessor;
@@ -187,7 +187,7 @@ public CodeTableDTO getOrCreateCodeTable(CodeTableDTO codeTable, Boolean createT
 			DDictValue dDictValue = DDictValue.findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals(codeTable.getCodeType(), codeTable.getCodeKind(), codeTable.getCode()).getSingleResult();
 			newCodeTable = new CodeTableDTO(dDictValue);
 			logger.debug("Found the codeTable: " + newCodeTable.toJson());
-		}catch (EmptyResultDataAccessException e){
+		}catch (NoResultException e){
 			newCodeTable = saveCodeTableValue(codeTable, createTypeKind);
 		}
 		return newCodeTable;
diff --git a/src/main/java/com/labsynch/labseer/service/DatabaseAuthenticationProvider.java b/src/main/java/com/labsynch/labseer/service/DatabaseAuthenticationProvider.java
index d4de0c4a8..7ad1583cc 100755
--- a/src/main/java/com/labsynch/labseer/service/DatabaseAuthenticationProvider.java
+++ b/src/main/java/com/labsynch/labseer/service/DatabaseAuthenticationProvider.java
@@ -19,7 +19,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.authentication.dao.AbstractUserDetailsAuthenticationProvider;
@@ -163,7 +163,7 @@ protected UserDetails retrieveUser(String username,
 	        for(AuthorRole userRole:userRoles){
 	        	authorities.add(new SimpleGrantedAuthority(userRole.getRoleEntry().getRoleName()));
 	        }
-	      } catch (EmptyResultDataAccessException e) {
+	      } catch (NoResultException e) {
 		        throw new BadCredentialsException("Invalid user");
 	      } catch (EntityNotFoundException e) {
 	        throw new BadCredentialsException("Invalid user");
diff --git a/src/main/java/com/labsynch/labseer/service/ExperimentServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ExperimentServiceImpl.java
index 5245af43c..6d7b2e48a 100755
--- a/src/main/java/com/labsynch/labseer/service/ExperimentServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ExperimentServiceImpl.java
@@ -22,7 +22,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -1647,7 +1647,7 @@ public PreferredNameResultsDTO getCodeNameFromName(String experimentType,
 					}else{
 						logger.info("Did not find an EXPERIMENT WITH THE REQUESTED NAME: " + request.getRequestName());
 					}
-				}catch (EmptyResultDataAccessException e){
+				}catch (NoResultException e){
 					logger.info("Did not find an EXPERIMENT WITH THE REQUESTED NAME: " + request.getRequestName());
 				}
 			}
diff --git a/src/main/java/com/labsynch/labseer/service/ExportServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ExportServiceImpl.java
index a3d6da7fd..40c9e8e9b 100644
--- a/src/main/java/com/labsynch/labseer/service/ExportServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ExportServiceImpl.java
@@ -141,7 +141,7 @@ private int writeLotsToSDF(String exportSDFFileName, Collection<LotDTO> lotDTOs)
 			if (lotDTO.getStockSolvent() != null) mol.setProperty("Stock Solvent", lotDTO.getStockSolvent());
 			if (lotDTO.getSupplier() != null) mol.setProperty("Supplier", lotDTO.getSupplier());
 			if (lotDTO.getSupplierID() != null) mol.setProperty("Supplier ID", lotDTO.getSupplierID());
-			if (lotDTO.getVendorID() != null) mol.setProperty("Vendor ID", lotDTO.getVendorID());
+			if (lotDTO.getVendorId() != null) mol.setProperty("Vendor ID", lotDTO.getVendorId());
 			if (lotDTO.getSupplierLot() != null) mol.setProperty("Supplier Lot", lotDTO.getSupplierLot());
 			if (lotDTO.getSynthesisDate() != null) mol.setProperty("Synthesis Date", dateFormat.format(lotDTO.getSynthesisDate()));
 			if (lotDTO.getTareWeight() != null) mol.setProperty("Tare Weight", lotDTO.getTareWeight().toString());
diff --git a/src/main/java/com/labsynch/labseer/service/GeneThingServiceImpl.java b/src/main/java/com/labsynch/labseer/service/GeneThingServiceImpl.java
index f6fa77dd8..4b3f4154e 100755
--- a/src/main/java/com/labsynch/labseer/service/GeneThingServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/GeneThingServiceImpl.java
@@ -19,7 +19,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.supercsv.cellprocessor.Optional;
@@ -2765,7 +2765,7 @@ public void registerGeneOrthologsFromCSV(String inputFile, String ortCodeName, S
 			try {
 				targetGene = LsThing.findLsThingByLabelText("gene", "entrez gene", "name", "Entrez Gene ID", geneOrthologDTO.getGeneId()).getSingleResult();
 				logger.info("target gene: " + targetGene.getCodeName());				
-			} catch (EmptyResultDataAccessException e) {
+			} catch (NoResultException e) {
 				logger.error("ERROR - did not find a gene with ID: " + geneOrthologDTO.getGeneId());
 				throw new RuntimeException();
 			}
@@ -2774,7 +2774,7 @@ public void registerGeneOrthologsFromCSV(String inputFile, String ortCodeName, S
 			try {
 				orthologGene = LsThing.findLsThingByLabelText("gene", "entrez gene", "name", "Entrez Gene ID", geneOrthologDTO.getMappedGeneId()).getSingleResult();
 				logger.info("mapped ortholog gene: " + orthologGene.getCodeName());			
-			} catch (EmptyResultDataAccessException e) {
+			} catch (NoResultException e) {
 				logger.error("ERROR - did not find a gene with ID: " + geneOrthologDTO.getMappedGeneId());
 				throw new RuntimeException();
 			}
diff --git a/src/main/java/com/labsynch/labseer/service/ItxLsThingLsThingServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ItxLsThingLsThingServiceImpl.java
index ab2acc6bf..30a35e331 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxLsThingLsThingServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxLsThingLsThingServiceImpl.java
@@ -18,7 +18,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/src/main/java/com/labsynch/labseer/service/LabelSequenceServiceImpl.java b/src/main/java/com/labsynch/labseer/service/LabelSequenceServiceImpl.java
index 25c6a673f..56f13721f 100644
--- a/src/main/java/com/labsynch/labseer/service/LabelSequenceServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/LabelSequenceServiceImpl.java
@@ -10,7 +10,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -35,7 +35,7 @@ public Collection<LabelSequence> saveLabelSequenceArray(
 			LabelSequence savedLabelSequence;
 			try{
 				savedLabelSequence = LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(labelSequence.getThingTypeAndKind(), labelSequence.getLabelTypeAndKind()).getSingleResult();
-			}catch(EmptyResultDataAccessException e){
+			}catch(NoResultException e){
 				savedLabelSequence = labelSequence;
 				savedLabelSequence.save();
 			}
diff --git a/src/main/java/com/labsynch/labseer/service/LsThingServiceImpl.java b/src/main/java/com/labsynch/labseer/service/LsThingServiceImpl.java
index 6f88445fe..97a6dedb1 100755
--- a/src/main/java/com/labsynch/labseer/service/LsThingServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/LsThingServiceImpl.java
@@ -39,7 +39,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -1043,7 +1043,7 @@ public Collection<LsThing> findBatchesByParentEquals(LsThing parent) {
 		Collection<LsThing> batches;
 		try{
 			batches = LsThing.findFirstLsThingsByItxTypeKindEqualsAndSecondLsThingEquals("instantiates", "batch_parent", parent).getResultList();
-		} catch (EmptyResultDataAccessException e){
+		} catch (NoResultException e){
 			batches = null;
 		}
 		return batches;
@@ -1054,7 +1054,7 @@ public Collection<LsThing> findCompositesByComponentEquals(LsThing component) {
 		Collection<LsThing> batches;
 		try{
 			batches = LsThing.findFirstLsThingsByItxTypeEqualsAndSecondLsThingEquals("incorporates", component).getResultList();
-		} catch (EmptyResultDataAccessException e){
+		} catch (NoResultException e){
 			batches = null;
 		}
 		return batches;
@@ -1065,7 +1065,7 @@ public LsThing findParentByBatchEquals(LsThing batch) {
 		LsThing parent;
 		try{
 			parent = LsThing.findSecondLsThingsByItxTypeKindEqualsAndFirstLsThingEquals("instantiates", "batch_parent", batch).getSingleResult();
-		} catch (EmptyResultDataAccessException e){
+		} catch (NoResultException e){
 			parent = null;
 		}
 		return parent;
@@ -1328,12 +1328,12 @@ public Collection<LsThing> findLsThingsByLsTypeAndLsKindAndIncludeIgnored(String
 		if (includeIgnored){
 			try{
 				searchResults = LsThing.findLsThingsByLsTypeAndKindEquals(lsType+"_"+lsKind).getResultList();
-			} catch (EmptyResultDataAccessException e){}
+			} catch (NoResultException e){}
 		}
 		else {
 			try{
 				searchResults = LsThing.findLsThing(lsType, lsKind).getResultList();
-			} catch (EmptyResultDataAccessException e){}
+			} catch (NoResultException e){}
 		}
 		return searchResults;
 	}
@@ -1924,7 +1924,7 @@ private void checkLsThingUniqueName(LsThing lsThing) throws UniqueNameException{
 				Collection<LsThing> foundLsThings = new HashSet<LsThing>();
 				try{
 					foundLsThings = LsThing.findLsThingByLabelTextAndLsKind(labelText, lsKind).getResultList();
-				} catch (EmptyResultDataAccessException e){
+				} catch (NoResultException e){
 					//found nothing
 				}
 				if (!foundLsThings.isEmpty()){
diff --git a/src/main/java/com/labsynch/labseer/service/MetalotServiceImpl.java b/src/main/java/com/labsynch/labseer/service/MetalotServiceImpl.java
index 4ba860024..0bb296792 100755
--- a/src/main/java/com/labsynch/labseer/service/MetalotServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/MetalotServiceImpl.java
@@ -583,7 +583,7 @@ public MetalotReturn processAndSave(Metalot metaLot, MetalotReturn mr, ArrayList
 					//
 					oldLot.setObservedMassOne(lot.getObservedMassOne());
 					oldLot.setObservedMassTwo(lot.getObservedMassTwo());
-					oldLot.setVendorID(lot.getVendorID());
+					oldLot.setVendorId(lot.getVendorId());
 					oldLot.setTareWeight(lot.getTareWeight());
 					oldLot.setTareWeightUnits(lot.getTareWeightUnits());
 					oldLot.setTotalAmountStored(lot.getTotalAmountStored());
diff --git a/src/main/java/com/labsynch/labseer/utils/BitSetUserType.java b/src/main/java/com/labsynch/labseer/utils/BitSetUserType.java
index 9ac6eb7f3..8a0ef335d 100644
--- a/src/main/java/com/labsynch/labseer/utils/BitSetUserType.java
+++ b/src/main/java/com/labsynch/labseer/utils/BitSetUserType.java
@@ -3,7 +3,7 @@
 import java.util.BitSet;
 
 import com.vladmihalcea.hibernate.type.ImmutableType;
-import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.postgresql.util.PGobject;
 
 import java.sql.PreparedStatement;
@@ -25,13 +25,13 @@ public int[] sqlTypes() {
     }
 
     @Override
-    public BitSet get(ResultSet rs, String[] names, SessionImplementor session, Object owner) throws SQLException {
+    public BitSet get(ResultSet rs, String[] names, SharedSessionContractImplementor session, Object owner) throws SQLException {
         String stringBits = rs.getString(names[0]);
         return (stringBits != null) ? SimpleUtil.stringToBitSet(stringBits) : null;
     }
 
     @Override
-    public void set(PreparedStatement st, BitSet value, int index, SessionImplementor session) throws SQLException {
+    public void set(PreparedStatement st, BitSet value, int index, SharedSessionContractImplementor session) throws SQLException {
         if (value == null) {
             st.setNull(index, Types.OTHER);
         } else {
diff --git a/src/main/java/com/labsynch/labseer/utils/LoadCompoundsUtil.java b/src/main/java/com/labsynch/labseer/utils/LoadCompoundsUtil.java
index 6552d6d66..f104a1ac7 100755
--- a/src/main/java/com/labsynch/labseer/utils/LoadCompoundsUtil.java
+++ b/src/main/java/com/labsynch/labseer/utils/LoadCompoundsUtil.java
@@ -14,7 +14,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -114,7 +114,7 @@ public void loadCompounds(String inputFileName, String outputFileName){
 					logger.debug("query chemist = " + chemistCodeName);
 					try{
 						chemist = Author.findAuthorsByUserName(chemistCodeName).getSingleResult();
-					} catch (EmptyResultDataAccessException e){
+					} catch (NoResultException e){
 						if (chemistCodeName.trim().equalsIgnoreCase("")){
 							//default set Russell as the chemist
 							chemistCodeName = "rkey";
@@ -138,7 +138,7 @@ public void loadCompounds(String inputFileName, String outputFileName){
 				Parent parent = null;
 				try{
 					parent = Parent.findParentsByCorpNameEquals(parentCorpName).getSingleResult();
-				} catch (EmptyResultDataAccessException e){
+				} catch (NoResultException e){
 					logger.debug("create the new parent");
 					parent = new Parent();
 					parent.setMolStructure(MoleculeUtil.exportMolAsText(mol, "mol"));
@@ -152,7 +152,7 @@ public void loadCompounds(String inputFileName, String outputFileName){
 						String stereoCategoryCode = MoleculeUtil.getMolProperty(mol, "StereoCategory");
 						try{
 							stereoCategory = StereoCategory.findStereoCategorysByCodeEquals(stereoCategoryCode).getSingleResult();			    		
-						} catch (EmptyResultDataAccessException e2){
+						} catch (NoResultException e2){
 							logger.error("Did not find the stereoCategory code" + stereoCategoryCode);
 							stereoCategory = StereoCategory.findStereoCategorysByCodeEquals("unknown").getSingleResult();			    		
 						}
@@ -188,7 +188,7 @@ public void loadCompounds(String inputFileName, String outputFileName){
 						//now cheat to use the code below
 						saltCount = 1;
 						mol.setProperty("RemovedSalts", isotopeAbbrev);
-					} catch (EmptyResultDataAccessException e){
+					} catch (NoResultException e){
 						logger.debug("Did not find the isotope code " + isotopeAbbrev );
 					}
 				}	
@@ -205,7 +205,7 @@ public void loadCompounds(String inputFileName, String outputFileName){
 								isoSalt.setType("salt");
 								isoSalt.setSalt(salt);
 								isoSalt.setEquivalents(saltCount);
-							} catch (EmptyResultDataAccessException e2){
+							} catch (NoResultException e2){
 								logger.debug("Did not find the salt code " + saltAbbrev + "  Check if it is an isotope.");
 								//							    	check that it is not an isotope
 								try {
@@ -213,7 +213,7 @@ public void loadCompounds(String inputFileName, String outputFileName){
 									isoSalt.setType("isotope");
 									isoSalt.setIsotope(isotope);
 									isoSalt.setEquivalents(saltCount);
-								}  catch (EmptyResultDataAccessException e3){
+								}  catch (NoResultException e3){
 									logger.error("Not an isotope either!!. Did not find the isotope code " + saltAbbrev);
 									saltIsotopeError = true;
 									goodMolToProcess = false;
@@ -231,7 +231,7 @@ public void loadCompounds(String inputFileName, String outputFileName){
 				SaltForm saltForm = null;
 				try{
 					saltForm = SaltForm.findSaltFormsByCorpNameEquals(saltFormCorpName).getSingleResult();	    		
-				} catch (EmptyResultDataAccessException e){
+				} catch (NoResultException e){
 					logger.debug("new salForm: " + saltFormCorpName);
 					saltForm = new SaltForm();
 					saltForm.setParent(parent);
@@ -263,7 +263,7 @@ public void loadCompounds(String inputFileName, String outputFileName){
 
 				try{
 					lot = Lot.findLotsByCorpNameEquals(lotCorpName).getSingleResult();	    		
-				} catch (EmptyResultDataAccessException e){
+				} catch (NoResultException e){
 					logger.debug("new lot created: " + lotCorpName);
 					lot = new Lot();
 					lot.setCorpName(lotCorpName);
diff --git a/src/main/java/com/labsynch/labseer/utils/LoadFullCompoundsUtil.java b/src/main/java/com/labsynch/labseer/utils/LoadFullCompoundsUtil.java
index da158d216..5455e4e09 100644
--- a/src/main/java/com/labsynch/labseer/utils/LoadFullCompoundsUtil.java
+++ b/src/main/java/com/labsynch/labseer/utils/LoadFullCompoundsUtil.java
@@ -9,7 +9,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -112,7 +112,7 @@ private void loadCompoundsMol(CmpdRegMolecule mol, String outputFileName, HashMa
 		}
 		try{
 			cmpdChemist = Author.findAuthorsByUserName(chemistCodeName).getSingleResult();
-		} catch (EmptyResultDataAccessException e){
+		} catch (NoResultException e){
 			if (chemistCodeName.trim().equalsIgnoreCase("")){
 				//default set cchemist as the chemist
 				chemistCodeName = "cchemist";
@@ -155,7 +155,7 @@ private void loadCompoundsMol(CmpdRegMolecule mol, String outputFileName, HashMa
 			StereoCategory stereoCategory = StereoCategory.findStereoCategorysByCodeEquals(stereoCategoryCode).getSingleResult();
 			logger.info("found the following stereo category  " + stereoCategory.toJson());
 			parent.setStereoCategory(stereoCategory);
-		} catch (EmptyResultDataAccessException e){
+		} catch (NoResultException e){
 			logger.error("Did not find the query stereoCategoryCode: " + stereoCategoryCode);
 		}
 		
@@ -179,7 +179,7 @@ private void loadCompoundsMol(CmpdRegMolecule mol, String outputFileName, HashMa
 			try {
 				Vendor vendor = Vendor.findVendorsByCodeEquals(supplierCode).getSingleResult();
 				lot.setVendor(vendor);
-			} catch (EmptyResultDataAccessException e){
+			} catch (NoResultException e){
 				logger.error("Did not find the query supplierCode: " + supplierCode);
 			}			
 		}
diff --git a/src/main/java/com/labsynch/labseer/utils/PhysicalNamingStrategyImpl.java b/src/main/java/com/labsynch/labseer/utils/PhysicalNamingStrategyImpl.java
new file mode 100644
index 000000000..c50aacd20
--- /dev/null
+++ b/src/main/java/com/labsynch/labseer/utils/PhysicalNamingStrategyImpl.java
@@ -0,0 +1,27 @@
+package com.labsynch.labseer.utils;
+
+import org.hibernate.boot.model.naming.Identifier;
+import org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl;
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
+import java.util.Locale;
+public class PhysicalNamingStrategyImpl extends PhysicalNamingStrategyStandardImpl {
+    @Override
+    public Identifier toPhysicalTableName(Identifier name, JdbcEnvironment context) {
+        return new Identifier(addUnderscores(name.getText()), name.isQuoted());
+    }
+    @Override
+    public Identifier toPhysicalColumnName(Identifier name, JdbcEnvironment context) {
+        return new Identifier(addUnderscores(name.getText()), name.isQuoted());
+    }
+    protected static String addUnderscores(String name) {
+        final StringBuilder buf = new StringBuilder(name.replace('.', '_'));
+        for (int i = 1; i < buf.length() - 1; i++) {
+            if (Character.isLowerCase(buf.charAt(i - 1)) &&
+                Character.isUpperCase(buf.charAt(i)) &&
+                Character.isLowerCase(buf.charAt(i + 1))) {
+                buf.insert(i++, '_');
+            }
+        }
+        return buf.toString().toLowerCase(Locale.ROOT);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/utils/SecurityUtil.java b/src/main/java/com/labsynch/labseer/utils/SecurityUtil.java
index 832c4c0b4..9ab09870d 100755
--- a/src/main/java/com/labsynch/labseer/utils/SecurityUtil.java
+++ b/src/main/java/com/labsynch/labseer/utils/SecurityUtil.java
@@ -4,7 +4,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -64,7 +64,7 @@ public static Author getLoginUser(){
 			chemist = Author.findAuthorsByUserName(chemistName).getSingleResult();
 			userJson = chemist.toJson();
 
-		} catch (EmptyResultDataAccessException e){
+		} catch (NoResultException e){
 			logger.error("unable to find the user: " + chemistName);
 			chemist = new Author();
 		}
@@ -82,7 +82,7 @@ public static void updateUserInfo(String loginName) {
 			chemist = Author.findAuthorsByUserName(loginName).getSingleResult();
 			userJson = chemist.toJson();
 			logger.debug(userJson);
-		} catch (EmptyResultDataAccessException e){
+		} catch (NoResultException e){
 			logger.debug("did not find the new chemist. create the new entry");
 			chemist = createUser(loginName);
 		}
@@ -97,7 +97,7 @@ public static void updateUserInfo(String loginName, String fullName) {
 			chemist = Author.findAuthorsByUserName(loginName).getSingleResult();
 			userJson = chemist.toJson();
 			logger.debug(userJson);
-		} catch (EmptyResultDataAccessException e){
+		} catch (NoResultException e){
 			logger.debug("did not find the new chemist. create the new entry");
 			chemist = createUser(loginName, fullName);
 		}
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index 16ea4027a..c66a08125 100755
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -15,7 +15,8 @@
  <!--		<property name="hibernate.hbm2ddl.auto" value="${acas.databaseMode}" /> 
  -->
 		    <property name="hibernate.hbm2ddl.auto" value="update" /> 
-			<property name="hibernate.ejb.naming_strategy" value="org.hibernate.cfg.ImprovedNamingStrategy" />
+			<property name="hibernate.physical_naming_strategy" value="com.labsynch.labseer.utils.PhysicalNamingStrategyImpl"/>
+			<property name="hibernate.id.new_generator_mappings" value="false" />
 			<property name="hibernate.connection.charSet" value="UTF-8" />
 			<property name="hibernate.connection.autocommit" value="false" />
 			<property name="hibernate.cache.use_query_cache" value="false" />			
@@ -36,4 +37,3 @@
 		</properties>
 	</persistence-unit>
 </persistence>
-
diff --git a/src/main/resources/META-INF/spring/applicationContext-security.xml b/src/main/resources/META-INF/spring/applicationContext-security.xml
index 175bb8bea..68ad77f28 100755
--- a/src/main/resources/META-INF/spring/applicationContext-security.xml
+++ b/src/main/resources/META-INF/spring/applicationContext-security.xml
@@ -11,7 +11,7 @@
 			login-page="/login" authentication-success-handler-ref="postSuccessAuthHandler"
 			authentication-failure-url="/login?login_error=t" />
 		<logout logout-url="/resources/j_spring_security_logout" />
-
+		<csrf disabled="true"/>
 		<!-- Configure these elements to secure URIs in your application -->
 		<intercept-url pattern="/api/admin/**" access="hasRole('ROLE_ADMIN')" />
 		<intercept-url pattern="/resources/**" access="permitAll" />
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index b282fb6bd..8a56c9981 100755
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -11,6 +11,7 @@
     <Logger name="org.springframework.orm" level="info"/>
     <Logger name="org.springframework.security" level="info"/>
     <Logger name="org.springframework.web" level="info"/>
+    <Logger name="org.apache.catalina.core.ContainerBase.[Catalina].[localhost]" level="info"/>
     <Root level="info">
       <AppenderRef ref="STDOUT"/>
     </Root>
diff --git a/src/main/webapp/WEB-INF/spring/webmvc-config.xml b/src/main/webapp/WEB-INF/spring/webmvc-config.xml
index 8ae4709b5..6c075995b 100755
--- a/src/main/webapp/WEB-INF/spring/webmvc-config.xml
+++ b/src/main/webapp/WEB-INF/spring/webmvc-config.xml
@@ -80,7 +80,7 @@
     <!-- Enable this for integration of file upload functionality -->
     <bean class="org.springframework.web.multipart.commons.CommonsMultipartResolver" id="multipartResolver"/>
 <bean class="org.springframework.web.servlet.view.UrlBasedViewResolver" id="tilesViewResolver">
-    <property name="viewClass" value="org.springframework.web.servlet.view.tiles2.TilesView"/>
+    <property name="viewClass" value="org.springframework.web.servlet.view.tiles3.TilesView"/>
   </bean>
     <bean class="org.springframework.web.servlet.view.tiles3.TilesConfigurer" id="tilesConfigurer">
     <property name="definitions">
diff --git a/src/main/webapp/WEB-INF/views/lots/create.jspx b/src/main/webapp/WEB-INF/views/lots/create.jspx
index 13272e319..4a096dd2a 100644
--- a/src/main/webapp/WEB-INF/views/lots/create.jspx
+++ b/src/main/webapp/WEB-INF/views/lots/create.jspx
@@ -33,7 +33,7 @@
         <field:checkbox field="ignore" id="c_com_labsynch_labseer_domain_Lot_ignore" z="0fu+LuBvYXYF2DJaESteuYimqnk="/>
         <field:select field="physicalState" id="c_com_labsynch_labseer_domain_Lot_physicalState" itemValue="id" items="${physicalstates}" path="/physicalstates" z="ZMnew6SjVYLawxt+xpI1tQJmPW8="/>
         <field:select field="vendor" id="c_com_labsynch_labseer_domain_Lot_vendor" itemValue="id" items="${vendors}" path="/vendors" z="vIMamx8Wh67GL0Au0038GyMnLpM="/>
-        <field:textarea field="vendorID" id="c_com_labsynch_labseer_domain_Lot_vendorID" z="+zerPBbArlXC6nCGa24jTSXI++A="/>
+        <field:textarea field="vendorId" id="c_com_labsynch_labseer_domain_Lot_vendorId" z="+zerPBbArlXC6nCGa24jTSXI++A="/>
         <field:simple field="fileLists" id="c_com_labsynch_labseer_domain_Lot_fileLists" messageCode="entity_reference_not_managed" messageCodeAttribute="File List" z="MnAjUKMFQtLu4/pJ5ILS4uDtGTU="/>
         <field:input field="retain" id="c_com_labsynch_labseer_domain_Lot_retain" validationMessageCode="field_invalid_number" z="Kpkl5aySWjfVrttptW+10sr1wK0="/>
         <field:select field="retainUnits" id="c_com_labsynch_labseer_domain_Lot_retainUnits" itemValue="id" items="${units}" path="/units" z="oSwKg7L+tT0vB/vdJzlOn6CYTyw="/>
diff --git a/src/main/webapp/WEB-INF/views/lots/show.jspx b/src/main/webapp/WEB-INF/views/lots/show.jspx
index e143d08c2..6368f0e3e 100644
--- a/src/main/webapp/WEB-INF/views/lots/show.jspx
+++ b/src/main/webapp/WEB-INF/views/lots/show.jspx
@@ -33,7 +33,7 @@
         <field:display field="ignore" id="s_com_labsynch_labseer_domain_Lot_ignore" object="${lot}" z="Qh7yLCzpODAKnsls0NqCdRYHttY="/>
         <field:display field="physicalState" id="s_com_labsynch_labseer_domain_Lot_physicalState" object="${lot}" z="cwhh+0WbiVcP8O83E3+hUAEnvu4="/>
         <field:display field="vendor" id="s_com_labsynch_labseer_domain_Lot_vendor" object="${lot}" z="jnKMmngcCnjVVZLlGhHBsLr9uRc="/>
-        <field:display field="vendorID" id="s_com_labsynch_labseer_domain_Lot_vendorID" object="${lot}" z="70pfq8uoh1pUHHJLtAe//QgcibM="/>
+        <field:display field="vendorId" id="s_com_labsynch_labseer_domain_Lot_vendorId" object="${lot}" z="70pfq8uoh1pUHHJLtAe//QgcibM="/>
         <field:display field="retain" id="s_com_labsynch_labseer_domain_Lot_retain" object="${lot}" z="UfZVL6I/Z/XShV1JGFzIQZowyOE="/>
         <field:display field="retainUnits" id="s_com_labsynch_labseer_domain_Lot_retainUnits" object="${lot}" z="2XOyXZUN4QyAf74NHN015CI2S5U="/>
         <field:display field="retainLocation" id="s_com_labsynch_labseer_domain_Lot_retainLocation" object="${lot}" z="TQ/vHgGpJbqiGKXgNDANLZVldAU="/>
diff --git a/src/main/webapp/WEB-INF/views/lots/update.jspx b/src/main/webapp/WEB-INF/views/lots/update.jspx
index 733db6b35..12f1d0b7d 100644
--- a/src/main/webapp/WEB-INF/views/lots/update.jspx
+++ b/src/main/webapp/WEB-INF/views/lots/update.jspx
@@ -33,7 +33,7 @@
         <field:checkbox field="ignore" id="c_com_labsynch_labseer_domain_Lot_ignore" z="0fu+LuBvYXYF2DJaESteuYimqnk="/>
         <field:select field="physicalState" id="c_com_labsynch_labseer_domain_Lot_physicalState" itemValue="id" items="${physicalstates}" path="/physicalstates" z="ZMnew6SjVYLawxt+xpI1tQJmPW8="/>
         <field:select field="vendor" id="c_com_labsynch_labseer_domain_Lot_vendor" itemValue="id" items="${vendors}" path="/vendors" z="vIMamx8Wh67GL0Au0038GyMnLpM="/>
-        <field:textarea field="vendorID" id="c_com_labsynch_labseer_domain_Lot_vendorID" z="+zerPBbArlXC6nCGa24jTSXI++A="/>
+        <field:textarea field="vendorId" id="c_com_labsynch_labseer_domain_Lot_vendorId" z="+zerPBbArlXC6nCGa24jTSXI++A="/>
         <field:simple field="fileLists" id="c_com_labsynch_labseer_domain_Lot_fileLists" messageCode="entity_reference_not_managed" messageCodeAttribute="File List" z="MnAjUKMFQtLu4/pJ5ILS4uDtGTU="/>
         <field:input field="retain" id="c_com_labsynch_labseer_domain_Lot_retain" validationMessageCode="field_invalid_number" z="Kpkl5aySWjfVrttptW+10sr1wK0="/>
         <field:select field="retainUnits" id="c_com_labsynch_labseer_domain_Lot_retainUnits" itemValue="id" items="${units}" path="/units" z="oSwKg7L+tT0vB/vdJzlOn6CYTyw="/>
diff --git a/src/test/java/com/labsynch/labseer/api/ApiContainerControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiContainerControllerTest.java
index 1be9631dd..3b55c7b0a 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiContainerControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiContainerControllerTest.java
@@ -24,7 +24,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.test.annotation.Rollback;
@@ -574,7 +574,7 @@ public void createEmptyPlate() throws Exception{
 		query.setMaxResults(1);
 		try{
 			Container definition = query.getSingleResult();
-		}catch (EmptyResultDataAccessException e){
+		}catch (NoResultException e){
 			Container definition = Container.fromJsonToContainer("{\"codeName\":\"special-definition-code\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"plate\",\"lsLabels\":[{\"deleted\":false,\"id\":null,\"ignored\":false,\"labelText\":\"1536\",\"lsKind\":\"common\",\"lsType\":\"name\",\"lsTypeAndKind\":\"name_common\",\"physicallyLabled\":true,\"preferred\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"version\":null}],\"lsStates\":[{\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"format\",\"lsType\":\"constants\",\"lsTypeAndKind\":\"constants_format\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"columns\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_columns\",\"numericValue\":48,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"unitTypeAndKind\":\"null_null\",\"version\":null},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"rows\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_rows\",\"numericValue\":32,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"unitTypeAndKind\":\"null_null\",\"version\":null},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"wells\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_wells\",\"numericValue\":1536,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"unitTypeAndKind\":\"null_null\",\"version\":null},{\"codeTypeAndKind\":\"null_null\",\"codeValue\":\"A001\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"subcontainer naming convention\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_subcontainer naming convention\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"unitTypeAndKind\":\"null_null\",\"version\":null}],\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"version\":null}],\"lsType\":\"definition container\",\"lsTypeAndKind\":\"definition container_plate\",\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"version\":null}");
 			containerService.saveLsContainer(definition);
 		}
@@ -1453,7 +1453,7 @@ public void saveAndSearchContainers() throws Exception{
 			query.setMaxResults(1);
 			try{
 				Container definition = query.getSingleResult();
-			}catch (EmptyResultDataAccessException e){
+			}catch (NoResultException e){
 				Container definition = Container.fromJsonToContainer("{\"codeName\":\"special-definition-code\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"plate\",\"lsLabels\":[{\"deleted\":false,\"id\":null,\"ignored\":false,\"labelText\":\"1536\",\"lsKind\":\"common\",\"lsType\":\"name\",\"lsTypeAndKind\":\"name_common\",\"physicallyLabled\":true,\"preferred\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"version\":null}],\"lsStates\":[{\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"format\",\"lsType\":\"constants\",\"lsTypeAndKind\":\"constants_format\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"columns\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_columns\",\"numericValue\":48,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"unitTypeAndKind\":\"null_null\",\"version\":null},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"rows\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_rows\",\"numericValue\":32,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"unitTypeAndKind\":\"null_null\",\"version\":null},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"wells\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_wells\",\"numericValue\":1536,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"unitTypeAndKind\":\"null_null\",\"version\":null},{\"codeTypeAndKind\":\"null_null\",\"codeValue\":\"A001\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"subcontainer naming convention\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_subcontainer naming convention\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"unitTypeAndKind\":\"null_null\",\"version\":null}],\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"version\":null}],\"lsType\":\"definition container\",\"lsTypeAndKind\":\"definition container_plate\",\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"version\":null}");
 				containerService.saveLsContainer(definition);
 			}
diff --git a/src/test/java/com/labsynch/labseer/dto/ValueTypeKindDTOTest.java b/src/test/java/com/labsynch/labseer/dto/ValueTypeKindDTOTest.java
index 57faddc62..cb06323c7 100644
--- a/src/test/java/com/labsynch/labseer/dto/ValueTypeKindDTOTest.java
+++ b/src/test/java/com/labsynch/labseer/dto/ValueTypeKindDTOTest.java
@@ -10,7 +10,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/test/java/com/labsynch/labseer/service/ContainerLSServiceTests.java b/src/test/java/com/labsynch/labseer/service/ContainerLSServiceTests.java
index ec68e5145..702e746b2 100755
--- a/src/test/java/com/labsynch/labseer/service/ContainerLSServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/ContainerLSServiceTests.java
@@ -36,7 +36,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.ContextConfiguration;
@@ -546,14 +546,14 @@ public void createTestContainers(){
 		//barcode/barcode
 		try{
 			LabelType labelType = LabelType.findLabelTypesByTypeNameEquals("barcode").getSingleResult();
-		}catch (EmptyResultDataAccessException e){
+		}catch (NoResultException e){
 			LabelType labelType = new LabelType();
 			labelType.setTypeName("barcode");
 			labelType.persist();
 		}
 		try{
 			LabelKind labelKind = LabelKind.findLabelKindsByKindNameEqualsAndLsType("barcode", LabelType.findLabelTypesByTypeNameEquals("barcode").getSingleResult()).getSingleResult();
-		}catch (EmptyResultDataAccessException e){
+		}catch (NoResultException e){
 			LabelKind labelKind = new LabelKind();
 			labelKind.setLsType(LabelType.findLabelTypesByTypeNameEquals("barcode").getSingleResult());
 			labelKind.setKindName("barcode");
@@ -578,7 +578,7 @@ public void createTestContainers(){
 		//moved to/plate container
 		try{
 			InteractionKind itxKind = InteractionKind.findInteractionKindsByKindNameEqualsAndLsType("plate container", InteractionType.findInteractionTypesByTypeNameEquals("moved to").getSingleResult()).getSingleResult();
-		}catch (EmptyResultDataAccessException e){
+		}catch (NoResultException e){
 			InteractionKind itxKind = new InteractionKind();
 			itxKind.setLsType(InteractionType.findInteractionTypesByTypeNameEquals("moved to").getSingleResult());
 			itxKind.setKindName("plate container");
diff --git a/src/test/java/com/labsynch/labseer/service/CreateProjectsTests.java b/src/test/java/com/labsynch/labseer/service/CreateProjectsTests.java
index fc0fe5f5b..0a23f8d46 100755
--- a/src/test/java/com/labsynch/labseer/service/CreateProjectsTests.java
+++ b/src/test/java/com/labsynch/labseer/service/CreateProjectsTests.java
@@ -16,7 +16,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -243,7 +243,7 @@ public void createProjectRoles() {
 		Author jappleseed = null;
 		try{
 			jappleseed = Author.findAuthorsByUserName("jappleseed").getSingleResult();
-		}catch (EmptyResultDataAccessException e){
+		}catch (NoResultException e){
 			jappleseed = new Author();
 			jappleseed.setFirstName("Johnny");
 			jappleseed.setLastName("Appleseed");
@@ -256,7 +256,7 @@ public void createProjectRoles() {
 		Author bsplit = null;
 		try{
 			bsplit = Author.findAuthorsByUserName("bsplit").getSingleResult();
-		}catch (EmptyResultDataAccessException e){
+		}catch (NoResultException e){
 			bsplit = new Author();
 			bsplit.setFirstName("Banana");
 			bsplit.setLastName("Split");
@@ -272,7 +272,7 @@ public void createProjectRoles() {
 		LsRole appleUser = null;
 		try{
 			appleUser = LsRole.findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals("Project", appleCodeName, "User").getSingleResult();
-		}catch(EmptyResultDataAccessException e){
+		}catch(NoResultException e){
 			appleUser = new LsRole();
 			appleUser.setLsType("Project");
 			appleUser.setLsKind(appleCodeName);
@@ -282,7 +282,7 @@ public void createProjectRoles() {
 		LsRole appleAdministrator = null;
 		try{
 			appleAdministrator = LsRole.findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals("Project", appleCodeName, "Administrator").getSingleResult();
-		}catch(EmptyResultDataAccessException e){
+		}catch(NoResultException e){
 			appleAdministrator = new LsRole();
 			appleAdministrator.setLsType("Project");
 			appleAdministrator.setLsKind(appleCodeName);
@@ -292,7 +292,7 @@ public void createProjectRoles() {
 		LsRole bananaUser = null;
 		try{
 			bananaUser = LsRole.findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals("Project", bananaCodeName, "User").getSingleResult();
-		}catch(EmptyResultDataAccessException e){
+		}catch(NoResultException e){
 			bananaUser = new LsRole();
 			bananaUser.setLsType("Project");
 			bananaUser.setLsKind(bananaCodeName);
@@ -302,7 +302,7 @@ public void createProjectRoles() {
 		LsRole bananaAdministrator = null;
 		try{
 			bananaAdministrator = LsRole.findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals("Project", bananaCodeName, "Administrator").getSingleResult();
-		}catch(EmptyResultDataAccessException e){
+		}catch(NoResultException e){
 			bananaAdministrator = new LsRole();
 			bananaAdministrator.setLsType("Project");
 			bananaAdministrator.setLsKind(bananaCodeName);
@@ -313,7 +313,7 @@ public void createProjectRoles() {
 		AuthorRole appleUserRole = null;
 		try{
 			appleUserRole = AuthorRole.findAuthorRolesByRoleEntryAndUserEntry(appleUser, jappleseed).getSingleResult();
-		}catch (EmptyResultDataAccessException e){
+		}catch (NoResultException e){
 			appleUserRole = new AuthorRole();
 			appleUserRole.setRoleEntry(appleUser);
 			appleUserRole.setUserEntry(jappleseed);
@@ -322,7 +322,7 @@ public void createProjectRoles() {
 		AuthorRole appleAdministratorRole = null;
 		try{
 			appleAdministratorRole = AuthorRole.findAuthorRolesByRoleEntryAndUserEntry(appleAdministrator, jappleseed).getSingleResult();
-		}catch (EmptyResultDataAccessException e){
+		}catch (NoResultException e){
 			appleAdministratorRole = new AuthorRole();
 			appleAdministratorRole.setRoleEntry(appleAdministrator);
 			appleAdministratorRole.setUserEntry(jappleseed);
@@ -331,7 +331,7 @@ public void createProjectRoles() {
 		AuthorRole bananaUserRole = null;
 		try{
 			bananaUserRole = AuthorRole.findAuthorRolesByRoleEntryAndUserEntry(bananaUser, bsplit).getSingleResult();
-		}catch (EmptyResultDataAccessException e){
+		}catch (NoResultException e){
 			bananaUserRole = new AuthorRole();
 			bananaUserRole.setRoleEntry(bananaUser);
 			bananaUserRole.setUserEntry(bsplit);
diff --git a/src/test/java/com/labsynch/labseer/service/LsThingPreferredIdServiceTests.java b/src/test/java/com/labsynch/labseer/service/LsThingPreferredIdServiceTests.java
index 7f29dab8d..067af79d3 100644
--- a/src/test/java/com/labsynch/labseer/service/LsThingPreferredIdServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/LsThingPreferredIdServiceTests.java
@@ -17,7 +17,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/src/test/java/com/labsynch/labseer/service/LsThingServiceTests.java b/src/test/java/com/labsynch/labseer/service/LsThingServiceTests.java
index 31c498284..79614c112 100755
--- a/src/test/java/com/labsynch/labseer/service/LsThingServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/LsThingServiceTests.java
@@ -17,7 +17,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.dao.EmptyResultDataAccessException;
+import javax.persistence.NoResultException;
 import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

From d23c5a36132368a6efb1f9b1b335c52a241f3a15 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Tue, 5 Apr 2022 15:32:12 -0700
Subject: [PATCH 04/73] additioinal join columns

---
 src/main/java/com/labsynch/labseer/domain/CodeKind.java        | 2 ++
 src/main/java/com/labsynch/labseer/domain/DDictKind.java       | 2 ++
 src/main/java/com/labsynch/labseer/domain/ParentAliasKind.java | 2 ++
 src/main/java/com/labsynch/labseer/domain/UncertaintyKind.java | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/src/main/java/com/labsynch/labseer/domain/CodeKind.java b/src/main/java/com/labsynch/labseer/domain/CodeKind.java
index 4d8f98401..fc7b99e6e 100755
--- a/src/main/java/com/labsynch/labseer/domain/CodeKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/CodeKind.java
@@ -8,6 +8,7 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
@@ -34,6 +35,7 @@ public class CodeKind {
 
     @NotNull
     @ManyToOne
+    @JoinColumn(name = "ls_type")
     private CodeType lsType;
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictKind.java b/src/main/java/com/labsynch/labseer/domain/DDictKind.java
index f1fa6b44d..960700565 100644
--- a/src/main/java/com/labsynch/labseer/domain/DDictKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/DDictKind.java
@@ -8,6 +8,7 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Version;
@@ -32,6 +33,7 @@ public class DDictKind {
     private static final Logger logger = LoggerFactory.getLogger(DDictKind.class);
 
     @Size(max = 255)
+    @JoinColumn(name = "ls_type")
     private String lsType;
     
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAliasKind.java b/src/main/java/com/labsynch/labseer/domain/ParentAliasKind.java
index f84364676..083cd98e1 100644
--- a/src/main/java/com/labsynch/labseer/domain/ParentAliasKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ParentAliasKind.java
@@ -1,5 +1,6 @@
 package com.labsynch.labseer.domain;
 
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
@@ -17,6 +18,7 @@ public class ParentAliasKind {
 	
     @NotNull
     @ManyToOne
+    @JoinColumn(name = "ls_type")
     private ParentAliasType lsType;
 
     @Size(max = 255)
diff --git a/src/main/java/com/labsynch/labseer/domain/UncertaintyKind.java b/src/main/java/com/labsynch/labseer/domain/UncertaintyKind.java
index 6e2d0711a..50316cf9e 100755
--- a/src/main/java/com/labsynch/labseer/domain/UncertaintyKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/UncertaintyKind.java
@@ -1,6 +1,7 @@
 package com.labsynch.labseer.domain;
 
 import javax.persistence.Column;
+import javax.persistence.JoinColumn;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
@@ -18,5 +19,6 @@ public class UncertaintyKind {
     @NotNull
     @Column(unique = true)
     @Size(max = 255)
+    @JoinColumn(name = "ls_type")
     private String kindName;
 }

From 388600c344e2d5ebb239334b15298836fc444bb8 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Tue, 5 Apr 2022 15:32:52 -0700
Subject: [PATCH 05/73] Fix login

---
 .../spring/applicationContext-security.xml         | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/META-INF/spring/applicationContext-security.xml b/src/main/resources/META-INF/spring/applicationContext-security.xml
index 68ad77f28..c98c6798c 100755
--- a/src/main/resources/META-INF/spring/applicationContext-security.xml
+++ b/src/main/resources/META-INF/spring/applicationContext-security.xml
@@ -8,7 +8,10 @@
 	<!-- HTTP security configurations -->
 	<http auto-config="true" use-expressions="true">
 		<form-login login-processing-url="/resources/j_spring_security_check"
-			login-page="/login" authentication-success-handler-ref="postSuccessAuthHandler"
+			login-page="/login" 
+			username-parameter="j_username"
+			password-parameter="j_password" 
+			authentication-success-handler-ref="postSuccessAuthHandler"
 			authentication-failure-url="/login?login_error=t" />
 		<logout logout-url="/resources/j_spring_security_logout" />
 		<csrf disabled="true"/>
@@ -34,6 +37,15 @@
 	<authentication-manager alias="authenticationManager">
 		<authentication-provider ref="acasAuthenticationProvider" />
 	</authentication-manager>
+
+	<!-- Configure firewall -->
+	<!-- Note, we should remove this, this allows // in url and normalizes the url -->
+	<!-- Default is strict matching but there are logs of places in ACAS which sent // in the url -->
+	<beans:bean 
+		id="ACASHttpFirewall" class="com.labsynch.labseer.utils.ACASHttpFirewall">
+	</beans:bean>
+	<http-firewall ref="ACASHttpFirewall"/>
+
 	
 <!-- 	<user-service id="userDetailsService" properties="/WEB-INF/ps-users.properties" />
  -->	

From 68f168cdcbbdf405aa065e984ab5d4936caff92b Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Tue, 5 Apr 2022 15:33:04 -0700
Subject: [PATCH 06/73] Another logger to put into stdout

---
 src/main/resources/log4j2.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 8a56c9981..a72c6e1cc 100755
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -11,6 +11,7 @@
     <Logger name="org.springframework.orm" level="info"/>
     <Logger name="org.springframework.security" level="info"/>
     <Logger name="org.springframework.web" level="info"/>
+    <Logger name="org.apache.catalina.core" level="info"/>
     <Logger name="org.apache.catalina.core.ContainerBase.[Catalina].[localhost]" level="info"/>
     <Root level="info">
       <AppenderRef ref="STDOUT"/>

From 45a7a8d7fb1e4cba0f357758dd219a7da0f4c793 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Tue, 5 Apr 2022 15:33:22 -0700
Subject: [PATCH 07/73] Add firewall rule to allow doubleslash

---
 .../com/labsynch/labseer/utils/ACASHttpFirewall.java  | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 src/main/java/com/labsynch/labseer/utils/ACASHttpFirewall.java

diff --git a/src/main/java/com/labsynch/labseer/utils/ACASHttpFirewall.java b/src/main/java/com/labsynch/labseer/utils/ACASHttpFirewall.java
new file mode 100644
index 000000000..e421d0c65
--- /dev/null
+++ b/src/main/java/com/labsynch/labseer/utils/ACASHttpFirewall.java
@@ -0,0 +1,11 @@
+package com.labsynch.labseer.utils;
+
+
+import org.springframework.security.web.firewall.DefaultHttpFirewall;
+
+public class ACASHttpFirewall extends DefaultHttpFirewall {
+    ACASHttpFirewall() {
+        this.setAllowUrlEncodedSlash(true);
+    }
+    
+}
\ No newline at end of file

From a6ab7ce6c38b9fa53748db9bcaffd0433f66de04 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Tue, 5 Apr 2022 15:33:42 -0700
Subject: [PATCH 08/73] Fix hql to remove extra slash

---
 src/main/java/com/labsynch/labseer/utils/SimpleUtil.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/com/labsynch/labseer/utils/SimpleUtil.java b/src/main/java/com/labsynch/labseer/utils/SimpleUtil.java
index bcc858520..0d94f43a9 100644
--- a/src/main/java/com/labsynch/labseer/utils/SimpleUtil.java
+++ b/src/main/java/com/labsynch/labseer/utils/SimpleUtil.java
@@ -135,7 +135,7 @@ public static Collection<Query> splitHqlInClause(EntityManager em, String queryS
     		startIndex=endIndex;
     	}
     	for (String sqlClause : sqlCurveIdMap.keySet()){
-			String completeQueryString = queryString + sqlClause + " )";
+			String completeQueryString = queryString + sqlClause;
 			Query q = em.createQuery(completeQueryString);
 			String groupName = sqlClause.split(":")[1].replace(")","");
         	q.setParameter(groupName, sqlCurveIdMap.get(sqlClause));
@@ -168,7 +168,6 @@ public static Query addHqlInClause(EntityManager em, String queryString, String
     		}
     		numClause++;
     	}
-    	queryString = queryString + " )";
     	Query q = em.createQuery(queryString);
 		for (String sqlClause : sqlCurveIdMap.keySet()){
         	String groupName = sqlClause.split(":")[1].replace(")","");

From d0cfa7a3c53440c6fd8ac11d31a805e05bca98c6 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Tue, 5 Apr 2022 16:33:33 -0700
Subject: [PATCH 09/73] Remove .m2 addition

---
 Dockerfile-multistage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile-multistage b/Dockerfile-multistage
index d9aac1539..36a2f7df3 100644
--- a/Dockerfile-multistage
+++ b/Dockerfile-multistage
@@ -14,7 +14,7 @@ FROM 	dependencies as bbchem
 FROM 	dependencies as indigo
 
 FROM 	${CHEMISTRY_PACKAGE} as compile
-COPY .m2 /root/.m2
+
 ADD 	pom.xml /src/pom.xml
 WORKDIR /src
 RUN 	mvn dependency:resolve -P ${CHEMISTRY_PACKAGE}

From 51506f8d3a9197e31b94a32e19325d241ddeb9b7 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 6 Apr 2022 07:27:07 -0700
Subject: [PATCH 10/73] Update OperatorKind.java

---
 src/main/java/com/labsynch/labseer/domain/OperatorKind.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/labsynch/labseer/domain/OperatorKind.java b/src/main/java/com/labsynch/labseer/domain/OperatorKind.java
index fef7cc6e8..f5b147a57 100755
--- a/src/main/java/com/labsynch/labseer/domain/OperatorKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/OperatorKind.java
@@ -31,7 +31,7 @@ public class OperatorKind {
 
     @NotNull
     @ManyToOne
-	@JoinColumn(name = "ls_type")
+    @JoinColumn(name = "ls_type")
     private OperatorType lsType;
 
     @NotNull

From 86818a5e2920d3b0103d53041d3f53e764b0b497 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 6 Apr 2022 07:29:37 -0700
Subject: [PATCH 11/73] Update ExperimentKind.java

---
 src/main/java/com/labsynch/labseer/domain/ExperimentKind.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentKind.java b/src/main/java/com/labsynch/labseer/domain/ExperimentKind.java
index f78218bbc..7651011c2 100755
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ExperimentKind.java
@@ -29,7 +29,7 @@ public class ExperimentKind {
 
     @NotNull
     @ManyToOne
-	@JoinColumn(name = "ls_type")
+    @JoinColumn(name = "ls_type")
     private ExperimentType lsType;
 
     @NotNull

From a06f93ba62c8aa8c67968a2e8aa496c40d251229 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 6 Apr 2022 07:29:46 -0700
Subject: [PATCH 12/73] Update InteractionKind.java

---
 src/main/java/com/labsynch/labseer/domain/InteractionKind.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/labsynch/labseer/domain/InteractionKind.java b/src/main/java/com/labsynch/labseer/domain/InteractionKind.java
index 709c17fc3..0de826034 100755
--- a/src/main/java/com/labsynch/labseer/domain/InteractionKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/InteractionKind.java
@@ -34,7 +34,7 @@ public class InteractionKind {
 
     @NotNull
     @ManyToOne
-	@JoinColumn(name = "ls_type")
+    @JoinColumn(name = "ls_type")
     private InteractionType lsType;
 
     @NotNull

From 9265054226448efad252cd421aec1415f036b89a Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 6 Apr 2022 07:30:01 -0700
Subject: [PATCH 13/73] Update LabelKind.java

---
 src/main/java/com/labsynch/labseer/domain/LabelKind.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/labsynch/labseer/domain/LabelKind.java b/src/main/java/com/labsynch/labseer/domain/LabelKind.java
index aeeb614f1..9417f431b 100755
--- a/src/main/java/com/labsynch/labseer/domain/LabelKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/LabelKind.java
@@ -35,7 +35,7 @@ public class LabelKind {
 
 
     @ManyToOne
-	@JoinColumn(name = "ls_type")
+    @JoinColumn(name = "ls_type")
     private LabelType lsType;
 
     @NotNull

From 0fbf1179672b66edb2852719d89ddaaed2f34303 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 6 Apr 2022 07:31:26 -0700
Subject: [PATCH 14/73] Update LsRole.java

---
 src/main/java/com/labsynch/labseer/domain/LsRole.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/labsynch/labseer/domain/LsRole.java b/src/main/java/com/labsynch/labseer/domain/LsRole.java
index 1a10bf346..53fa753c8 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsRole.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsRole.java
@@ -52,7 +52,6 @@ public class LsRole {
     @Size(max = 200)
     private String roleDescription;
     
-    // @Column(unique = true)
     @Size(max = 255)
     private String lsTypeAndKind;
 

From 7b2381fc80053429bba631ac1e5ddc11ad8130c2 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 6 Apr 2022 07:31:47 -0700
Subject: [PATCH 15/73] Update ProtocolKind.java

---
 src/main/java/com/labsynch/labseer/domain/ProtocolKind.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolKind.java b/src/main/java/com/labsynch/labseer/domain/ProtocolKind.java
index e5276f596..8916519b6 100755
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ProtocolKind.java
@@ -41,7 +41,7 @@ public class ProtocolKind {
 
     @NotNull
     @ManyToOne
-	@JoinColumn(name = "ls_type")
+    @JoinColumn(name = "ls_type")
     private ProtocolType lsType;
 
     @NotNull

From 26ddd3b74bd403e54cdb158f7eaee390c5194c54 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 6 Apr 2022 07:32:56 -0700
Subject: [PATCH 16/73] Update RoleKind.java

---
 src/main/java/com/labsynch/labseer/domain/RoleKind.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/labsynch/labseer/domain/RoleKind.java b/src/main/java/com/labsynch/labseer/domain/RoleKind.java
index 85627bcdd..820ce9b65 100644
--- a/src/main/java/com/labsynch/labseer/domain/RoleKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/RoleKind.java
@@ -22,7 +22,7 @@ public class RoleKind {
 	
     @NotNull
     @ManyToOne
-	@JoinColumn(name = "ls_type")
+    @JoinColumn(name = "ls_type")
     private RoleType lsType;
 
     @NotNull

From db591cdeafac8997abf18e0034f51df58bcdb1ab Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 6 Apr 2022 07:33:06 -0700
Subject: [PATCH 17/73] Update StateKind.java

---
 src/main/java/com/labsynch/labseer/domain/StateKind.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/labsynch/labseer/domain/StateKind.java b/src/main/java/com/labsynch/labseer/domain/StateKind.java
index eea686973..f2c5e29d1 100755
--- a/src/main/java/com/labsynch/labseer/domain/StateKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/StateKind.java
@@ -35,7 +35,7 @@ public class StateKind {
 
     @NotNull
     @ManyToOne
-	@JoinColumn(name = "ls_type")
+    @JoinColumn(name = "ls_type")
     private StateType lsType;
 
     @NotNull

From a079be2d311f1f344335b3b9471673ec5bd1aa03 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 6 Apr 2022 07:33:15 -0700
Subject: [PATCH 18/73] Update ThingKind.java

---
 src/main/java/com/labsynch/labseer/domain/ThingKind.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/labsynch/labseer/domain/ThingKind.java b/src/main/java/com/labsynch/labseer/domain/ThingKind.java
index 7c3060909..d115ab164 100755
--- a/src/main/java/com/labsynch/labseer/domain/ThingKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ThingKind.java
@@ -35,7 +35,7 @@ public class ThingKind {
 
     @NotNull
     @ManyToOne
-	@JoinColumn(name = "ls_type")
+    @JoinColumn(name = "ls_type")
     private ThingType lsType;
 
     @NotNull

From d661c0716748f1b60e3072f2e5263e9d02b8d3fd Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 6 Apr 2022 07:33:43 -0700
Subject: [PATCH 19/73] Update UnitKind.java

---
 src/main/java/com/labsynch/labseer/domain/UnitKind.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/labsynch/labseer/domain/UnitKind.java b/src/main/java/com/labsynch/labseer/domain/UnitKind.java
index bd737149d..cb727a3b8 100755
--- a/src/main/java/com/labsynch/labseer/domain/UnitKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/UnitKind.java
@@ -31,7 +31,7 @@ public class UnitKind {
 
     @NotNull
     @ManyToOne
-	@JoinColumn(name = "ls_type")
+    @JoinColumn(name = "ls_type")
     private UnitType lsType;
 
     @NotNull

From 69d6932389b1791100808c853b52291b496c7889 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 6 Apr 2022 08:04:42 -0700
Subject: [PATCH 20/73] Update ValueType_Roo_Finder.aj

---
 .../com/labsynch/labseer/domain/ValueType_Roo_Finder.aj    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_Finder.aj
index 178503365..49f17959c 100755
--- a/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_Finder.aj
+++ b/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_Finder.aj
@@ -17,6 +17,13 @@ privileged aspect ValueType_Roo_Finder {
         return ((Long) q.getSingleResult());
     }
 
+    public static TypedQuery<ValueType> ValueType.findValueTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = ValueType.entityManager();
+        TypedQuery<ValueType> q = em.createQuery("SELECT o FROM ValueType AS o WHERE o.typeName = :typeName", ValueType.class);
+        q.setParameter("typeName", typeName);
+        return q;
+    }
     
     public static TypedQuery<ValueType> ValueType.findValueTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
         if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");

From a56f970f00800ceff233cb3fc732bab980f6670b Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 6 Apr 2022 08:05:17 -0700
Subject: [PATCH 21/73] Update ValueType_Roo_Finder.aj

---
 .../java/com/labsynch/labseer/domain/ValueType_Roo_Finder.aj    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_Finder.aj
index 49f17959c..419458901 100755
--- a/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_Finder.aj
+++ b/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_Finder.aj
@@ -16,7 +16,7 @@ privileged aspect ValueType_Roo_Finder {
         q.setParameter("typeName", typeName);
         return ((Long) q.getSingleResult());
     }
-
+    
     public static TypedQuery<ValueType> ValueType.findValueTypesByTypeNameEquals(String typeName) {
         if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = ValueType.entityManager();

From a0b5d6fd5d74236bc32e55c15c14aae68e9f0f9f Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 6 Apr 2022 08:06:09 -0700
Subject: [PATCH 22/73] Update ValueType.java

---
 .../java/com/labsynch/labseer/domain/ValueType.java    | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/main/java/com/labsynch/labseer/domain/ValueType.java b/src/main/java/com/labsynch/labseer/domain/ValueType.java
index 3b181f95d..99d3e0613 100755
--- a/src/main/java/com/labsynch/labseer/domain/ValueType.java
+++ b/src/main/java/com/labsynch/labseer/domain/ValueType.java
@@ -34,18 +34,10 @@ public class ValueType {
     @Column(unique = true)
     @Size(max = 64)
     private String typeName;
-
-    public static TypedQuery<ValueType> findValueTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = ValueType.entityManager();
-        TypedQuery<ValueType> q = em.createQuery("SELECT o FROM ValueType AS o WHERE o.typeName = :typeName", ValueType.class);
-        q.setParameter("typeName", typeName);
-        return q;
-    }
     
 	public static ValueType getOrCreate(String name) {
 		ValueType lsType = null;
-        List<ValueType> lsTypes = findValueTypesByTypeNameEquals(name).getResultList();
+        List<ValueType> lsTypes = ValueType.findValueTypesByTypeNameEquals(name).getResultList();
         if (lsTypes.size() == 0) {
             lsType = new ValueType();
             lsType.setTypeName(name);

From 45d31623a07e20e739a142adf67754689bcaee10 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 6 Apr 2022 08:07:08 -0700
Subject: [PATCH 23/73] Update ValueType.java

---
 src/main/java/com/labsynch/labseer/domain/ValueType.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/com/labsynch/labseer/domain/ValueType.java b/src/main/java/com/labsynch/labseer/domain/ValueType.java
index 99d3e0613..c4a4cf85d 100755
--- a/src/main/java/com/labsynch/labseer/domain/ValueType.java
+++ b/src/main/java/com/labsynch/labseer/domain/ValueType.java
@@ -4,12 +4,10 @@
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.EntityManager;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.SequenceGenerator;
-import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
@@ -34,7 +32,7 @@ public class ValueType {
     @Column(unique = true)
     @Size(max = 64)
     private String typeName;
-    
+
 	public static ValueType getOrCreate(String name) {
 		ValueType lsType = null;
         List<ValueType> lsTypes = ValueType.findValueTypesByTypeNameEquals(name).getResultList();

From 15378f20b5d8daf5dc216b77c67648391078fe7b Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Tue, 12 Apr 2022 10:31:42 -0700
Subject: [PATCH 24/73] Make sure ACAS connects to the specified acas schema
 rather than relying on search_path

---
 src/main/resources/META-INF/spring/applicationContext.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/resources/META-INF/spring/applicationContext.xml b/src/main/resources/META-INF/spring/applicationContext.xml
index 49fca0df9..7efb1a08f 100644
--- a/src/main/resources/META-INF/spring/applicationContext.xml
+++ b/src/main/resources/META-INF/spring/applicationContext.xml
@@ -42,6 +42,11 @@
         <context:exclude-filter expression="org.springframework.stereotype.Controller" type="annotation"/>
     </context:component-scan>
     <bean class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close" id="dataSource">
+        <property name="connectionInitSqls">
+            <list>
+                <value>SET SCHEMA '${server.database.schema}'</value>
+            </list>
+        </property>
         <property name="driverClassName" value="${server.database.driver}"/>
         <property name="url" value="${server.database.url}"/>
         <property name="username" value="${server.database.username}"/>

From 340734f7585d466cf36405cce37e0a8d32471133 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Tue, 12 Apr 2022 10:32:16 -0700
Subject: [PATCH 25/73] Add back dom4j

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 95ad7936f..f7274925c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -558,11 +558,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 			<version>1.3.1</version>
 		</dependency>
 		<!-- JCHEM 16 requires dom4j 1.3. This depdendency can be removed when we upgrade jchem to jchem > 17 -->
-		<!-- <dependency>
+		<dependency>
 			<groupId>dom4j</groupId>
 			<artifactId>dom4j</artifactId>
-			<version>1.6.1</version>
-		</dependency> -->
+			<version>1.3</version>
+		</dependency>
 		<dependency>
 			<groupId>com.beust</groupId>
 			<artifactId>jcommander</artifactId>

From a22ac22164f344efade74dc62a0de3eff1a311d5 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Tue, 12 Apr 2022 11:06:25 -0700
Subject: [PATCH 26/73] spring-ldap-core  to properties

---
 pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f7274925c..72516bd71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		<BuildScmBranch>${scmBranch}</BuildScmBranch>
 		<tomcat.version>7.0.63</tomcat.version>
 		<hibernate.version>5.6.1.Final</hibernate.version>
+		<spring-ldap-core.version>2.3.6.RELEASE</spring-ldap-core.version>
     </properties>
 	<scm>
 		<connection>scm:git:git://github.com/mcneilco/acas-roo-server.git</connection>
@@ -487,12 +488,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		<dependency>
 			<groupId>org.springframework.ldap</groupId>
 			<artifactId>spring-ldap-core</artifactId>
-			<version>2.3.6.RELEASE</version>
+			<version>${spring-ldap-core.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.ldap</groupId>
 			<artifactId>spring-ldap-core-tiger</artifactId>
-			<version>2.3.6.RELEASE</version>
+			<version>${spring-ldap-core.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>

From 46be83915b735a7db752e903532e15847267fc20 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Tue, 12 Apr 2022 11:35:19 -0700
Subject: [PATCH 27/73] Remove deprecated codehaus.jackson libraries

---
 pom.xml                                       | 10 ----------
 .../bbchem/BBChemStructureService.java        |  2 +-
 .../bbchem/BBChemStructureServiceImpl.java    | 14 +++++++-------
 .../ChemStructureServiceBBChemImpl.java       | 19 ++++++++++---------
 .../bbchem/CmpdRegMoleculeBBChemImpl.java     |  6 +++---
 .../AnalysisGroupValueServiceTest.java        | 17 +++++++++--------
 .../AnalysisGroupValueServiceTest2.java       | 12 ++++++------
 .../service/LsThingValueServiceTest.java      | 12 ++++++------
 .../TreatmentGroupValueServiceTest.java       | 12 ++++++------
 9 files changed, 48 insertions(+), 56 deletions(-)

diff --git a/pom.xml b/pom.xml
index 72516bd71..3f47a60c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -215,16 +215,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 			<artifactId>flexjson</artifactId>
 			<version>3.1</version>
 		</dependency>
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-core-asl</artifactId>
-			<version>1.9.13</version>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-mapper-asl</artifactId>
-			<version>1.9.13</version>
-		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStructureService.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStructureService.java
index 44fc5229c..405946d85 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStructureService.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStructureService.java
@@ -7,7 +7,7 @@
 import com.labsynch.labseer.domain.AbstractBBChemStructure;
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
 
-import org.codehaus.jackson.JsonNode;
+import com.fasterxml.jackson.databind.JsonNode;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStructureServiceImpl.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStructureServiceImpl.java
index 3657bccb7..ce962e64e 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStructureServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStructureServiceImpl.java
@@ -28,10 +28,10 @@
 import com.labsynch.labseer.utils.Response;
 import com.labsynch.labseer.utils.Request;
 
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.node.ArrayNode;
-import org.codehaus.jackson.node.ObjectNode;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -65,7 +65,7 @@ private String getUrlFromPreprocessorSettings(String propertyKey) throws IOExcep
 			logger.error("Missing preprocessorSettings "+propertyKey+"!!");
 			throw new IOException("Missing preprocessorSettings "+propertyKey+"!!");
 		}
-		String url = urlNode.getTextValue();
+		String url = urlNode.asText();
 		return url;
 
 	}
@@ -388,7 +388,7 @@ public HashMap<String, Entry<String, String>> getPreprocessedStructures(HashMap<
 			JsonNode structuresResponseNode = responseNode.get("structures");
 
 			// Add the standardized structures to the hashmap
-			structuresResponseNode.getFieldNames().forEachRemaining(structureId -> {
+			structuresResponseNode.fieldNames().forEachRemaining(structureId -> {
 				JsonNode node = structuresResponseNode.get(structureId);
 				String status = node.get("status").asText();
 				String structure = node.get("structure").asText();
@@ -436,7 +436,7 @@ public HashMap<String, BBChemParentStructure> getProcessedStructures(HashMap<Str
 				// Check if we have an error code
 				if( errorCodeNode != null) {
 					String errorCode = errorCodeNode.asText();
-					String msg = responseJsonNode.get("error_msg").getTextValue();
+					String msg = responseJsonNode.get("error_msg").asText();
 					if(errorCode.equals("4004")) {
 						logger.warn("Processor error code '" + errorCode + "' for '" + structureKey + "': " + msg);
 						bbChemStructure.setReg(EMPTY_STRUCTURE);
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/ChemStructureServiceBBChemImpl.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/ChemStructureServiceBBChemImpl.java
index ccdda77ad..fb0a8b005 100755
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/ChemStructureServiceBBChemImpl.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/ChemStructureServiceBBChemImpl.java
@@ -35,14 +35,15 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import org.codehaus.jackson.JsonFactory;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.JsonToken;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.node.ArrayNode;
-import org.codehaus.jackson.node.ObjectNode;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 import java.util.UUID;
 import java.util.Map.Entry;
 
@@ -749,7 +750,7 @@ public boolean isEmpty(String molFile) throws CmpdRegMolFormatException {
 		try{
 			JsonNode responseNode = bbChemStructureService.postToProcessService(molFile);
 			JsonNode errorCodeNode = responseNode.get(0).get("error_code");
-			if( errorCodeNode != null && errorCodeNode.getTextValue().equals("4004")){
+			if( errorCodeNode != null && errorCodeNode.asText().equals("4004")){
 				return true;
 			} else {
 				return false;
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/CmpdRegMoleculeBBChemImpl.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/CmpdRegMoleculeBBChemImpl.java
index 86df1e495..c1760075d 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/CmpdRegMoleculeBBChemImpl.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/CmpdRegMoleculeBBChemImpl.java
@@ -6,9 +6,9 @@
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
 import com.labsynch.labseer.utils.SimpleUtil;
 
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.node.ObjectNode;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/com/labsynch/labseer/service/AnalysisGroupValueServiceTest.java b/src/test/java/com/labsynch/labseer/service/AnalysisGroupValueServiceTest.java
index 84497c814..f9da979f9 100755
--- a/src/test/java/com/labsynch/labseer/service/AnalysisGroupValueServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/AnalysisGroupValueServiceTest.java
@@ -15,12 +15,13 @@
 
 import javax.persistence.NoResultException;
 
-import org.codehaus.jackson.JsonFactory;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.JsonToken;
-import org.codehaus.jackson.map.ObjectMapper;
+
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -118,8 +119,8 @@ public void SaveAnalysisGroupValuesJackson() throws JsonParseException, IOExcept
 		//		 InputStream stream = new FileInputStream(fileName);
 
 		ObjectMapper mapper = new ObjectMapper();
-		JsonFactory jsonFactory = mapper.getJsonFactory();
-		JsonParser jp = jsonFactory.createJsonParser(br);
+		JsonFactory jsonFactory = mapper.getFactory();
+		JsonParser jp = jsonFactory.createParser(br);
 		JsonToken token;
 		long currentTime = System.currentTimeMillis();
 		while ((token = jp.nextToken()) != null) {
diff --git a/src/test/java/com/labsynch/labseer/service/AnalysisGroupValueServiceTest2.java b/src/test/java/com/labsynch/labseer/service/AnalysisGroupValueServiceTest2.java
index 9d8ef7d1d..770119086 100644
--- a/src/test/java/com/labsynch/labseer/service/AnalysisGroupValueServiceTest2.java
+++ b/src/test/java/com/labsynch/labseer/service/AnalysisGroupValueServiceTest2.java
@@ -15,12 +15,12 @@
 
 import javax.persistence.NoResultException;
 
-import org.codehaus.jackson.JsonFactory;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.JsonToken;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/service/LsThingValueServiceTest.java b/src/test/java/com/labsynch/labseer/service/LsThingValueServiceTest.java
index 8b7ec8519..f73773f6d 100644
--- a/src/test/java/com/labsynch/labseer/service/LsThingValueServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/LsThingValueServiceTest.java
@@ -17,12 +17,12 @@
 
 import junit.framework.Assert;
 
-import org.codehaus.jackson.JsonFactory;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.JsonToken;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
diff --git a/src/test/java/com/labsynch/labseer/service/TreatmentGroupValueServiceTest.java b/src/test/java/com/labsynch/labseer/service/TreatmentGroupValueServiceTest.java
index b66abb0fa..71f51af0c 100644
--- a/src/test/java/com/labsynch/labseer/service/TreatmentGroupValueServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/TreatmentGroupValueServiceTest.java
@@ -17,12 +17,12 @@
 
 import junit.framework.Assert;
 
-import org.codehaus.jackson.JsonFactory;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.JsonToken;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;

From 84a12387836c7e7e3acfa4b26e56628bc8d44122 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Tue, 12 Apr 2022 14:34:16 -0700
Subject: [PATCH 28/73] Add JoinColumn(name="XX") to any columns added by
 hibernate

---
 .../java/com/labsynch/labseer/domain/FileList.java   |  2 ++
 .../java/com/labsynch/labseer/domain/IsoSalt.java    |  4 ++++
 .../labseer/domain/ItxContainerContainerState.java   |  2 ++
 .../labseer/domain/ItxContainerContainerValue.java   |  2 ++
 .../labseer/domain/ItxExperimentExperimentState.java |  2 ++
 .../labseer/domain/ItxExperimentExperimentValue.java |  2 ++
 .../labseer/domain/ItxLsThingLsThingState.java       |  2 ++
 .../labseer/domain/ItxLsThingLsThingValue.java       |  2 ++
 .../labseer/domain/ItxProtocolProtocolState.java     |  2 ++
 .../labseer/domain/ItxProtocolProtocolValue.java     |  2 ++
 .../labseer/domain/ItxSubjectContainerState.java     |  2 ++
 .../labseer/domain/ItxSubjectContainerValue.java     |  2 ++
 src/main/java/com/labsynch/labseer/domain/Lot.java   | 12 ++++++++++++
 .../java/com/labsynch/labseer/domain/LotAlias.java   |  2 ++
 .../com/labsynch/labseer/domain/LotAliasKind.java    |  2 ++
 .../java/com/labsynch/labseer/domain/Parent.java     |  5 +++++
 .../com/labsynch/labseer/domain/ParentAlias.java     |  2 ++
 .../java/com/labsynch/labseer/domain/SaltForm.java   |  3 +++
 .../com/labsynch/labseer/domain/SaltFormAlias.java   |  2 ++
 .../labsynch/labseer/domain/SaltFormAliasKind.java   |  2 ++
 .../com/labsynch/labseer/domain/StructureKind.java   |  2 ++
 .../java/com/labsynch/labseer/domain/ThingPage.java  |  1 +
 22 files changed, 59 insertions(+)

diff --git a/src/main/java/com/labsynch/labseer/domain/FileList.java b/src/main/java/com/labsynch/labseer/domain/FileList.java
index 4254efd7e..572ca0f67 100755
--- a/src/main/java/com/labsynch/labseer/domain/FileList.java
+++ b/src/main/java/com/labsynch/labseer/domain/FileList.java
@@ -8,6 +8,7 @@
 
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Transient;
 import javax.persistence.TypedQuery;
@@ -33,6 +34,7 @@ public class FileList {
     private static final Logger logger = LoggerFactory.getLogger(FileListController.class);
 
     @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "lot")
     private Lot lot;
 
     private String description;
diff --git a/src/main/java/com/labsynch/labseer/domain/IsoSalt.java b/src/main/java/com/labsynch/labseer/domain/IsoSalt.java
index 66b3e79fb..15742f8bf 100755
--- a/src/main/java/com/labsynch/labseer/domain/IsoSalt.java
+++ b/src/main/java/com/labsynch/labseer/domain/IsoSalt.java
@@ -4,6 +4,7 @@
 import java.util.Collection;
 import java.util.List;
 
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.validation.constraints.Size;
 
@@ -28,9 +29,11 @@ public class IsoSalt {
 	private static final Logger logger = LoggerFactory.getLogger(IsoSalt.class);
 
     @ManyToOne
+    @JoinColumn(name = "isotope")
     private Isotope isotope;
 
     @ManyToOne
+    @JoinColumn(name = "salt")
     private Salt salt;
 
     @Size(max = 25)
@@ -41,6 +44,7 @@ public class IsoSalt {
     private Boolean ignore;
 
     @ManyToOne
+    @JoinColumn(name = "salt_form")
     private SaltForm saltForm;
 
     
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState.java b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState.java
index d423a5c0f..38be744dd 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState.java
@@ -11,6 +11,7 @@
 
 import javax.persistence.CascadeType;
 import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 
@@ -53,6 +54,7 @@ public static ItxContainerContainerState update(ItxContainerContainerState objec
     }
 
 	@ManyToOne
+	@JoinColumn(name = "itx_container_container")
     private ItxContainerContainer itxContainerContainer;
 
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "lsState",  fetch =  FetchType.LAZY)
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue.java b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue.java
index 808210125..008e9501b 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue.java
@@ -7,6 +7,7 @@
 import java.util.Date;
 import java.util.List;
 
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 
 import org.springframework.roo.addon.javabean.RooJavaBean;
@@ -28,6 +29,7 @@
 public class ItxContainerContainerValue extends AbstractValue {
 		
     @ManyToOne
+    @JoinColumn(name = "ls_state")
     private ItxContainerContainerState lsState;
     
     public ItxContainerContainerValue(
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState.java b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState.java
index b2786bb80..e4740a5b0 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState.java
@@ -11,6 +11,7 @@
 
 import javax.persistence.CascadeType;
 import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
@@ -53,6 +54,7 @@ public static ItxExperimentExperimentState update(ItxExperimentExperimentState o
     }
 
 	@ManyToOne
+	@JoinColumn(name = "itx_experiment_experiment")
     private ItxExperimentExperiment itxExperimentExperiment;
 
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "lsState",  fetch =  FetchType.LAZY)
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue.java b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue.java
index 683052293..8812fe763 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue.java
@@ -7,6 +7,7 @@
 import java.util.Date;
 import java.util.List;
 
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
@@ -30,6 +31,7 @@
 public class ItxExperimentExperimentValue extends AbstractValue {
 		
     @ManyToOne
+    @JoinColumn(name = "ls_state")
     private ItxExperimentExperimentState lsState;
     
     public static ItxExperimentExperimentValue update(ItxExperimentExperimentValue object) {
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState.java b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState.java
index 72685776e..3f3ef2f27 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState.java
@@ -11,6 +11,7 @@
 
 import javax.persistence.CascadeType;
 import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 
@@ -84,6 +85,7 @@ public static ItxLsThingLsThingState updateNoMerge(
 
 
 	@ManyToOne
+	@JoinColumn(name = "itx_ls_thing_ls_thing")
     private ItxLsThingLsThing itxLsThingLsThing;
 
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "lsState",  fetch =  FetchType.LAZY)
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue.java b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue.java
index 9a098c1c5..f6f277a2e 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue.java
@@ -12,6 +12,7 @@
 import java.util.List;
 
 import javax.persistence.EntityManager;
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.TypedQuery;
 import org.springframework.roo.addon.javabean.RooJavaBean;
@@ -27,6 +28,7 @@
 public class ItxLsThingLsThingValue extends AbstractValue {
 
     @ManyToOne
+    @JoinColumn(name = "ls_state")
     private ItxLsThingLsThingState lsState;
 
     public ItxLsThingLsThingValue(com.labsynch.labseer.domain.ItxLsThingLsThingValue itxLsThingLsThingValue) {
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState.java b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState.java
index dfd1d3c7b..d3a412591 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState.java
@@ -11,6 +11,7 @@
 
 import javax.persistence.CascadeType;
 import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 
@@ -51,6 +52,7 @@ public static ItxProtocolProtocolState update(ItxProtocolProtocolState object) {
     }
 
 	@ManyToOne
+	@JoinColumn(name = "itx_protocol_protocol")
     private ItxProtocolProtocol itxProtocolProtocol;
 
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "lsState",  fetch =  FetchType.LAZY)
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue.java b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue.java
index f00f12437..9d13fd8b7 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue.java
@@ -7,6 +7,7 @@
 import java.util.Date;
 import java.util.List;
 
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 
 import org.springframework.roo.addon.javabean.RooJavaBean;
@@ -28,6 +29,7 @@
 public class ItxProtocolProtocolValue extends AbstractValue {
 		
     @ManyToOne
+    @JoinColumn(name = "ls_state")
     private ItxProtocolProtocolState lsState;
     
     public static ItxProtocolProtocolValue update(ItxProtocolProtocolValue object) {
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState.java b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState.java
index c576c9240..476ec4ca7 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState.java
@@ -11,6 +11,7 @@
 
 import javax.persistence.CascadeType;
 import javax.persistence.EntityManager;
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Query;
@@ -56,6 +57,7 @@ public static ItxSubjectContainerState update(ItxSubjectContainerState object) {
     }
   
 	@ManyToOne
+	@JoinColumn(name = "itx_subject_container")
     private ItxSubjectContainer itxSubjectContainer;
 
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "lsState")
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue.java b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue.java
index f74e71790..6e8eb273b 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue.java
@@ -8,6 +8,7 @@
 import java.util.List;
 
 import javax.persistence.EntityManager;
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Query;
 
@@ -30,6 +31,7 @@
 public class ItxSubjectContainerValue extends AbstractValue {
 
     @ManyToOne
+	@JoinColumn(name = "ls_state")
     private ItxSubjectContainerState lsState;
     
     public static ItxSubjectContainerValue update(ItxSubjectContainerValue object) {
diff --git a/src/main/java/com/labsynch/labseer/domain/Lot.java b/src/main/java/com/labsynch/labseer/domain/Lot.java
index 4e542a07f..4018bca16 100755
--- a/src/main/java/com/labsynch/labseer/domain/Lot.java
+++ b/src/main/java/com/labsynch/labseer/domain/Lot.java
@@ -13,6 +13,7 @@
 import javax.persistence.Column;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Query;
@@ -102,11 +103,13 @@ public class Lot {
     private Double amount;
 
     @ManyToOne
+    @JoinColumn(name = "amount_units")
     private Unit amountUnits;
 
     private Double solutionAmount;
 
     @ManyToOne    
+    @JoinColumn(name = "solution_amount_units")
     private SolutionUnit solutionAmountUnits;
     
     @Size(max = 255)
@@ -118,9 +121,11 @@ public class Lot {
     private Double purity;
 
     @ManyToOne
+    @JoinColumn(name = "purity_operator")
     private Operator purityOperator;
 
     @ManyToOne
+    @JoinColumn(name = "purity_measured_by")
     private PurityMeasuredBy purityMeasuredBy;
 
     private String chemist;
@@ -136,9 +141,11 @@ public class Lot {
 
     
     @ManyToOne
+    @JoinColumn(name = "physical_state")
     private PhysicalState physicalState;
 
     @ManyToOne
+    @JoinColumn(name = "vendor")
     private Vendor vendor;
 
     @Size(max = 255)
@@ -146,6 +153,7 @@ public class Lot {
     private String vendorId;
 
     @ManyToOne
+    @JoinColumn(name = "salt_form")
     private SaltForm saltForm;
 
     @OneToMany(cascade = CascadeType.REMOVE, mappedBy = "lot", fetch = FetchType.LAZY)
@@ -154,6 +162,7 @@ public class Lot {
     private Double retain;
 
     @ManyToOne
+    @JoinColumn(name = "retain_units")
     private Unit retainUnits;
     
     private String retainLocation;
@@ -171,6 +180,7 @@ public class Lot {
     private Parent parent;
     
     @ManyToOne
+    @JoinColumn(name = "bulk_load_file")
     private BulkLoadFile bulkLoadFile;
     
     private Double lambda;
@@ -188,11 +198,13 @@ public class Lot {
     private Double tareWeight;
     
     @ManyToOne
+    @JoinColumn(name = "tare_weight_units")
     private Unit tareWeightUnits;
     
     private Double totalAmountStored;
     
     @ManyToOne
+    @JoinColumn(name = "total_amount_stored_units")
     private Unit totalAmountStoredUnits;
     
     @OneToMany(cascade = CascadeType.MERGE, mappedBy = "lot", fetch = FetchType.LAZY)
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAlias.java b/src/main/java/com/labsynch/labseer/domain/LotAlias.java
index a1fbdffa0..83a2604a0 100644
--- a/src/main/java/com/labsynch/labseer/domain/LotAlias.java
+++ b/src/main/java/com/labsynch/labseer/domain/LotAlias.java
@@ -1,5 +1,6 @@
 package com.labsynch.labseer.domain;
 
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 
 import org.slf4j.Logger;
@@ -24,6 +25,7 @@ public class LotAlias {
 	
 	@ManyToOne
     @org.hibernate.annotations.Index(name="LotAlias_Parent_IDX")
+	@JoinColumn(name = "lot")
 	private Lot lot;
 	
     private String lsType;
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAliasKind.java b/src/main/java/com/labsynch/labseer/domain/LotAliasKind.java
index 81fac2f5b..9164d1ae3 100644
--- a/src/main/java/com/labsynch/labseer/domain/LotAliasKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/LotAliasKind.java
@@ -1,5 +1,6 @@
 package com.labsynch.labseer.domain;
 
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
@@ -17,6 +18,7 @@ public class LotAliasKind {
 	
     @NotNull
     @ManyToOne
+    @JoinColumn(name = "ls_type")
     private LotAliasType lsType;
 
     @Size(max = 255)
diff --git a/src/main/java/com/labsynch/labseer/domain/Parent.java b/src/main/java/com/labsynch/labseer/domain/Parent.java
index 3ff814a78..2d4a6737d 100755
--- a/src/main/java/com/labsynch/labseer/domain/Parent.java
+++ b/src/main/java/com/labsynch/labseer/domain/Parent.java
@@ -10,6 +10,7 @@
 import javax.persistence.Column;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Temporal;
@@ -70,6 +71,7 @@ public class Parent {
 
 	@ManyToOne
 	@org.hibernate.annotations.Index(name="Parent_stereoCategory_IDX")
+	@JoinColumn(name = "stereo_category")
 	private StereoCategory stereoCategory;
 
 	@Size(max = 1000)
@@ -111,12 +113,15 @@ public class Parent {
 	private Set<ParentAlias> parentAliases = new HashSet<ParentAlias>();
 
     @ManyToOne
+	@JoinColumn(name = "bulk_load_file")
     private BulkLoadFile bulkLoadFile;
     
     @ManyToOne
+	@JoinColumn(name = "parent_annotation")
     private ParentAnnotation parentAnnotation;
     
     @ManyToOne
+	@JoinColumn(name = "compound_type")
     private CompoundType compoundType;
     
     @Column(columnDefinition="text")
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAlias.java b/src/main/java/com/labsynch/labseer/domain/ParentAlias.java
index fc55752d7..ab60074a1 100644
--- a/src/main/java/com/labsynch/labseer/domain/ParentAlias.java
+++ b/src/main/java/com/labsynch/labseer/domain/ParentAlias.java
@@ -1,5 +1,6 @@
 package com.labsynch.labseer.domain;
 
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 
 import org.slf4j.Logger;
@@ -25,6 +26,7 @@ public class ParentAlias {
 	
 	@ManyToOne
     @org.hibernate.annotations.Index(name="ParentAlias_Parent_IDX")
+	@JoinColumn(name = "parent")
 	private Parent parent;
 	
     private String lsType;
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltForm.java b/src/main/java/com/labsynch/labseer/domain/SaltForm.java
index 8d0f3ef0c..1f13d4743 100755
--- a/src/main/java/com/labsynch/labseer/domain/SaltForm.java
+++ b/src/main/java/com/labsynch/labseer/domain/SaltForm.java
@@ -11,6 +11,7 @@
 import javax.persistence.Column;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
 import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
@@ -74,6 +75,7 @@ public class SaltForm implements Comparable {
 
 	@ManyToOne
     @org.hibernate.annotations.Index(name="SaltForm_Parent_IDX")
+	@JoinColumn(name = "parent")
 	private Parent parent;
 
 	@OneToMany(cascade = CascadeType.ALL, mappedBy = "saltForm", fetch=FetchType.LAZY)
@@ -83,6 +85,7 @@ public class SaltForm implements Comparable {
 	private Set<IsoSalt> isoSalts = new HashSet<IsoSalt>();
 	
     @ManyToOne
+	@JoinColumn(name = "bulk_load_file")
     private BulkLoadFile bulkLoadFile;
 	
     public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("corpName", "CdId", "parent", "bulkLoadFile");
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAlias.java b/src/main/java/com/labsynch/labseer/domain/SaltFormAlias.java
index b824d237d..4015023e7 100644
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAlias.java
+++ b/src/main/java/com/labsynch/labseer/domain/SaltFormAlias.java
@@ -1,5 +1,6 @@
 package com.labsynch.labseer.domain;
 
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 
 import org.slf4j.Logger;
@@ -23,6 +24,7 @@ public class SaltFormAlias {
 	
 	@ManyToOne
     @org.hibernate.annotations.Index(name="SaltFormAlias_SaltForm_IDX")
+	@JoinColumn(name = "salt_form")
 	private SaltForm saltForm;
 	
     private String lsType;
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind.java b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind.java
index 02760b7c7..4596f12e8 100644
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind.java
@@ -1,5 +1,6 @@
 package com.labsynch.labseer.domain;
 
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
@@ -17,6 +18,7 @@ public class SaltFormAliasKind {
 	
     @NotNull
     @ManyToOne
+    @JoinColumn(name = "ls_type")
     private SaltFormAliasType lsType;
 
     @Size(max = 255)
diff --git a/src/main/java/com/labsynch/labseer/domain/StructureKind.java b/src/main/java/com/labsynch/labseer/domain/StructureKind.java
index b9f08617f..e3a0b7f03 100644
--- a/src/main/java/com/labsynch/labseer/domain/StructureKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/StructureKind.java
@@ -8,6 +8,7 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
@@ -35,6 +36,7 @@ public class StructureKind {
 
     @NotNull
     @ManyToOne
+    @JoinColumn(name = "ls_type")
     private StructureType lsType;
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingPage.java b/src/main/java/com/labsynch/labseer/domain/ThingPage.java
index f28171da4..54e1afee7 100755
--- a/src/main/java/com/labsynch/labseer/domain/ThingPage.java
+++ b/src/main/java/com/labsynch/labseer/domain/ThingPage.java
@@ -60,6 +60,7 @@ public class ThingPage {
     private boolean archived;
 
     @ManyToOne
+    @JoinColumn(name = "ls_transaction")
     private LsTransaction lsTransaction;
 
     @NotNull

From d388f235a4520e45af19865a36d42edac8dfc8b6 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Tue, 12 Apr 2022 14:36:39 -0700
Subject: [PATCH 29/73] Removing setting search path explicitly

---
 src/main/resources/META-INF/spring/applicationContext.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/main/resources/META-INF/spring/applicationContext.xml b/src/main/resources/META-INF/spring/applicationContext.xml
index 7efb1a08f..49fca0df9 100644
--- a/src/main/resources/META-INF/spring/applicationContext.xml
+++ b/src/main/resources/META-INF/spring/applicationContext.xml
@@ -42,11 +42,6 @@
         <context:exclude-filter expression="org.springframework.stereotype.Controller" type="annotation"/>
     </context:component-scan>
     <bean class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close" id="dataSource">
-        <property name="connectionInitSqls">
-            <list>
-                <value>SET SCHEMA '${server.database.schema}'</value>
-            </list>
-        </property>
         <property name="driverClassName" value="${server.database.driver}"/>
         <property name="url" value="${server.database.url}"/>
         <property name="username" value="${server.database.username}"/>

From 43e37e70b030fd797f4f5d7ce96e6ad45c41507d Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 27 Apr 2022 08:32:28 -0700
Subject: [PATCH 30/73] Units controller

---
 .../ApiUnitsController.java}                  |  23 ++--
 .../web/UnitController_Roo_Controller.aj      | 100 ------------------
 .../UnitController_Roo_Controller_Finder.aj   |  72 -------------
 3 files changed, 11 insertions(+), 184 deletions(-)
 rename src/main/java/com/labsynch/labseer/{web/UnitController.java => api/ApiUnitsController.java} (91%)
 mode change 100755 => 100644
 delete mode 100644 src/main/java/com/labsynch/labseer/web/UnitController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/UnitController_Roo_Controller_Finder.aj

diff --git a/src/main/java/com/labsynch/labseer/web/UnitController.java b/src/main/java/com/labsynch/labseer/api/ApiUnitsController.java
old mode 100755
new mode 100644
similarity index 91%
rename from src/main/java/com/labsynch/labseer/web/UnitController.java
rename to src/main/java/com/labsynch/labseer/api/ApiUnitsController.java
index 9658a25c4..39bb98c45
--- a/src/main/java/com/labsynch/labseer/web/UnitController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiUnitsController.java
@@ -1,28 +1,26 @@
-package com.labsynch.labseer.web;
+package com.labsynch.labseer.api;
 
+import com.labsynch.labseer.domain.Unit;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
-import com.labsynch.labseer.domain.Unit;
 
-@RooWebScaffold(path = "units", formBackingObject = Unit.class)
-@RequestMapping("/units")
-@Transactional
+@RequestMapping(value = {"/api/v1/units"})
 @Controller
+public class ApiUnitsController {
+	
+	Logger logger = LoggerFactory.getLogger(ApiUnitsController.class);
 
-@RooWebFinder
-public class UnitController {
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+	@RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
         Unit unit = Unit.findUnit(id);
@@ -125,4 +123,5 @@ public ResponseEntity<String> getIsotopeOptions() {
         headers.setExpires(0); // Expire the cache
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
+
 }
diff --git a/src/main/java/com/labsynch/labseer/web/UnitController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/UnitController_Roo_Controller.aj
deleted file mode 100644
index 72771f1cf..000000000
--- a/src/main/java/com/labsynch/labseer/web/UnitController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Unit;
-import com.labsynch.labseer.web.UnitController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect UnitController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String UnitController.create(@Valid Unit unit, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, unit);
-            return "units/create";
-        }
-        uiModel.asMap().clear();
-        unit.persist();
-        return "redirect:/units/" + encodeUrlPathSegment(unit.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String UnitController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new Unit());
-        return "units/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String UnitController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("unit", Unit.findUnit(id));
-        uiModel.addAttribute("itemId", id);
-        return "units/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String UnitController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("units", Unit.findUnitEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) Unit.countUnits() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("units", Unit.findAllUnits(sortFieldName, sortOrder));
-        }
-        return "units/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String UnitController.update(@Valid Unit unit, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, unit);
-            return "units/update";
-        }
-        uiModel.asMap().clear();
-        unit.merge();
-        return "redirect:/units/" + encodeUrlPathSegment(unit.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String UnitController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, Unit.findUnit(id));
-        return "units/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String UnitController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        Unit unit = Unit.findUnit(id);
-        unit.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/units";
-    }
-    
-    void UnitController.populateEditForm(Model uiModel, Unit unit) {
-        uiModel.addAttribute("unit", unit);
-    }
-    
-    String UnitController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/UnitController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/UnitController_Roo_Controller_Finder.aj
deleted file mode 100644
index 027a5183a..000000000
--- a/src/main/java/com/labsynch/labseer/web/UnitController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,72 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Unit;
-import com.labsynch.labseer.web.UnitController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect UnitController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByCodeEquals", "form" }, method = RequestMethod.GET)
-    public String UnitController.findUnitsByCodeEqualsForm(Model uiModel) {
-        return "units/findUnitsByCodeEquals";
-    }
-    
-    @RequestMapping(params = "find=ByCodeEquals", method = RequestMethod.GET)
-    public String UnitController.findUnitsByCodeEquals(@RequestParam("code") String code, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("units", Unit.findUnitsByCodeEquals(code, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Unit.countFindUnitsByCodeEquals(code) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("units", Unit.findUnitsByCodeEquals(code, sortFieldName, sortOrder).getResultList());
-        }
-        return "units/list";
-    }
-    
-    @RequestMapping(params = { "find=ByCodeLike", "form" }, method = RequestMethod.GET)
-    public String UnitController.findUnitsByCodeLikeForm(Model uiModel) {
-        return "units/findUnitsByCodeLike";
-    }
-    
-    @RequestMapping(params = "find=ByCodeLike", method = RequestMethod.GET)
-    public String UnitController.findUnitsByCodeLike(@RequestParam("code") String code, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("units", Unit.findUnitsByCodeLike(code, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Unit.countFindUnitsByCodeLike(code) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("units", Unit.findUnitsByCodeLike(code, sortFieldName, sortOrder).getResultList());
-        }
-        return "units/list";
-    }
-    
-    @RequestMapping(params = { "find=ByNameEquals", "form" }, method = RequestMethod.GET)
-    public String UnitController.findUnitsByNameEqualsForm(Model uiModel) {
-        return "units/findUnitsByNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByNameEquals", method = RequestMethod.GET)
-    public String UnitController.findUnitsByNameEquals(@RequestParam("name") String name, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("units", Unit.findUnitsByNameEquals(name, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Unit.countFindUnitsByNameEquals(name) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("units", Unit.findUnitsByNameEquals(name, sortFieldName, sortOrder).getResultList());
-        }
-        return "units/list";
-    }
-    
-}

From 7230a7fbb79dbf3d41130d82b5a7170ee1e46753 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 27 Apr 2022 08:34:32 -0700
Subject: [PATCH 31/73] Solution unit controller

---
 .../ApiSolutionUnitController.java}           |  47 ++++----
 .../SolutionUnitController_Roo_Controller.aj  | 100 ------------------
 ...ionUnitController_Roo_Controller_Finder.aj |  72 -------------
 3 files changed, 19 insertions(+), 200 deletions(-)
 rename src/main/java/com/labsynch/labseer/{web/SolutionUnitController.java => api/ApiSolutionUnitController.java} (97%)
 mode change 100755 => 100644
 delete mode 100644 src/main/java/com/labsynch/labseer/web/SolutionUnitController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/SolutionUnitController_Roo_Controller_Finder.aj

diff --git a/src/main/java/com/labsynch/labseer/web/SolutionUnitController.java b/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java
old mode 100755
new mode 100644
similarity index 97%
rename from src/main/java/com/labsynch/labseer/web/SolutionUnitController.java
rename to src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java
index 18349a8f5..651430af6
--- a/src/main/java/com/labsynch/labseer/web/SolutionUnitController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java
@@ -1,6 +1,21 @@
-package com.labsynch.labseer.web;
-import org.apache.commons.collections.CollectionUtils;
+package com.labsynch.labseer.api;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.labsynch.labseer.domain.SolutionUnit;
+import com.mysema.query.BooleanBuilder;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.mysema.query.types.path.PathBuilder;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,40 +29,16 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-import com.labsynch.labseer.domain.SolutionUnit;
-import com.mysema.query.BooleanBuilder;
-import com.mysema.query.jpa.impl.JPAQuery;
-import com.mysema.query.types.path.PathBuilder;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
 
-@RooWebScaffold(path = "solutionunits", formBackingObject = SolutionUnit.class)
-@RequestMapping({ "/solutionunits", "/solutionUnits" })
-@Transactional
+@RequestMapping(value = {"/api/v1/solutionUnits"})
 @Controller
-
-@RooWebFinder
-public class SolutionUnitController {
-
-    public BeanWrapper beanWrapper_dtt;
+public class ApiSolutionUnitController {
 
     @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
diff --git a/src/main/java/com/labsynch/labseer/web/SolutionUnitController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/SolutionUnitController_Roo_Controller.aj
deleted file mode 100644
index beae8ca47..000000000
--- a/src/main/java/com/labsynch/labseer/web/SolutionUnitController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.SolutionUnit;
-import com.labsynch.labseer.web.SolutionUnitController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect SolutionUnitController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String SolutionUnitController.create(@Valid SolutionUnit solutionUnit, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, solutionUnit);
-            return "solutionunits/create";
-        }
-        uiModel.asMap().clear();
-        solutionUnit.persist();
-        return "redirect:/solutionunits/" + encodeUrlPathSegment(solutionUnit.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String SolutionUnitController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new SolutionUnit());
-        return "solutionunits/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String SolutionUnitController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("solutionunit", SolutionUnit.findSolutionUnit(id));
-        uiModel.addAttribute("itemId", id);
-        return "solutionunits/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String SolutionUnitController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("solutionunits", SolutionUnit.findSolutionUnitEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) SolutionUnit.countSolutionUnits() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("solutionunits", SolutionUnit.findAllSolutionUnits(sortFieldName, sortOrder));
-        }
-        return "solutionunits/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String SolutionUnitController.update(@Valid SolutionUnit solutionUnit, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, solutionUnit);
-            return "solutionunits/update";
-        }
-        uiModel.asMap().clear();
-        solutionUnit.merge();
-        return "redirect:/solutionunits/" + encodeUrlPathSegment(solutionUnit.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String SolutionUnitController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, SolutionUnit.findSolutionUnit(id));
-        return "solutionunits/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String SolutionUnitController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        SolutionUnit solutionUnit = SolutionUnit.findSolutionUnit(id);
-        solutionUnit.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/solutionunits";
-    }
-    
-    void SolutionUnitController.populateEditForm(Model uiModel, SolutionUnit solutionUnit) {
-        uiModel.addAttribute("solutionUnit", solutionUnit);
-    }
-    
-    String SolutionUnitController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SolutionUnitController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/SolutionUnitController_Roo_Controller_Finder.aj
deleted file mode 100644
index 8b70df701..000000000
--- a/src/main/java/com/labsynch/labseer/web/SolutionUnitController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,72 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.SolutionUnit;
-import com.labsynch.labseer.web.SolutionUnitController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect SolutionUnitController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByCodeEquals", "form" }, method = RequestMethod.GET)
-    public String SolutionUnitController.findSolutionUnitsByCodeEqualsForm(Model uiModel) {
-        return "solutionunits/findSolutionUnitsByCodeEquals";
-    }
-    
-    @RequestMapping(params = "find=ByCodeEquals", method = RequestMethod.GET)
-    public String SolutionUnitController.findSolutionUnitsByCodeEquals(@RequestParam("code") String code, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("solutionunits", SolutionUnit.findSolutionUnitsByCodeEquals(code, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) SolutionUnit.countFindSolutionUnitsByCodeEquals(code) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("solutionunits", SolutionUnit.findSolutionUnitsByCodeEquals(code, sortFieldName, sortOrder).getResultList());
-        }
-        return "solutionunits/list";
-    }
-    
-    @RequestMapping(params = { "find=ByCodeLike", "form" }, method = RequestMethod.GET)
-    public String SolutionUnitController.findSolutionUnitsByCodeLikeForm(Model uiModel) {
-        return "solutionunits/findSolutionUnitsByCodeLike";
-    }
-    
-    @RequestMapping(params = "find=ByCodeLike", method = RequestMethod.GET)
-    public String SolutionUnitController.findSolutionUnitsByCodeLike(@RequestParam("code") String code, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("solutionunits", SolutionUnit.findSolutionUnitsByCodeLike(code, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) SolutionUnit.countFindSolutionUnitsByCodeLike(code) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("solutionunits", SolutionUnit.findSolutionUnitsByCodeLike(code, sortFieldName, sortOrder).getResultList());
-        }
-        return "solutionunits/list";
-    }
-    
-    @RequestMapping(params = { "find=ByNameEquals", "form" }, method = RequestMethod.GET)
-    public String SolutionUnitController.findSolutionUnitsByNameEqualsForm(Model uiModel) {
-        return "solutionunits/findSolutionUnitsByNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByNameEquals", method = RequestMethod.GET)
-    public String SolutionUnitController.findSolutionUnitsByNameEquals(@RequestParam("name") String name, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("solutionunits", SolutionUnit.findSolutionUnitsByNameEquals(name, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) SolutionUnit.countFindSolutionUnitsByNameEquals(name) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("solutionunits", SolutionUnit.findSolutionUnitsByNameEquals(name, sortFieldName, sortOrder).getResultList());
-        }
-        return "solutionunits/list";
-    }
-    
-}

From d5ef24b4e7cc2c5ae00202d22d4ae81904443317 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 27 Apr 2022 08:41:33 -0700
Subject: [PATCH 32/73] Salt Controller merge

---
 .../labseer/api/ApiSaltController.java        | 231 +++++++++++++++-
 .../labsynch/labseer/web/SaltController.java  | 256 ------------------
 .../web/SaltController_Roo_Controller.aj      |  63 -----
 .../SaltController_Roo_Controller_Finder.aj   | 110 --------
 4 files changed, 221 insertions(+), 439 deletions(-)
 delete mode 100755 src/main/java/com/labsynch/labseer/web/SaltController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/SaltController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/SaltController_Roo_Controller_Finder.aj

diff --git a/src/main/java/com/labsynch/labseer/api/ApiSaltController.java b/src/main/java/com/labsynch/labseer/api/ApiSaltController.java
index 2200c8125..329d40b65 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiSaltController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSaltController.java
@@ -1,5 +1,20 @@
 package com.labsynch.labseer.api;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+
+import com.labsynch.labseer.domain.Salt;
+import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
+import com.labsynch.labseer.exceptions.StructureSaveException;
+import com.labsynch.labseer.service.ChemStructureService;
+import com.labsynch.labseer.service.ErrorMessage;
+import com.labsynch.labseer.service.SaltService;
+import com.labsynch.labseer.service.SaltStructureService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -7,11 +22,17 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
-
-import com.labsynch.labseer.service.SaltService;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.util.UriUtils;
+import org.springframework.web.util.WebUtils;
 
 @RequestMapping(value = {"/api/v1/salts"})
 @Controller
@@ -21,6 +42,12 @@ public class ApiSaltController {
 
 	@Autowired
 	private SaltService saltService;
+
+	@Autowired
+	private SaltStructureService saltStructureService;
+
+	@Autowired
+	private ChemStructureService chemStructureService;
 		
 	@RequestMapping(value = "/load", method = RequestMethod.POST, headers = "Accept=application/json")
 	public ResponseEntity<String> loadSalts(
@@ -44,18 +71,202 @@ public ResponseEntity<String> loadSalts(
 
 	}
 
-	
-		
-	@RequestMapping(method = RequestMethod.OPTIONS)
-	public ResponseEntity<String> getOptions() {
-		HttpHeaders headers= new HttpHeaders();
+	@RequestMapping(method = RequestMethod.POST)
+	public String create(@Valid Salt salt, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) throws CmpdRegMolFormatException {
+		if (bindingResult.hasErrors()) {
+			uiModel.addAttribute("salt", salt);
+			return "salts/create";
+		}
+		uiModel.asMap().clear();
+		salt = saltStructureService.saveStructure(salt);
+		if (salt.getCdId() > 0 && salt.getCdId() != -1) {
+			salt.persist();
+			return "redirect:/salts/" + encodeUrlPathSegment(salt.getId().toString(), httpServletRequest);
+		} else {
+			//remove the salt from the Salt_Structure table??
+			uiModel.addAttribute("salt", salt);
+			return "salts/create";
+		}
+	}
+
+	@ModelAttribute("salts")
+	public Collection<Salt> populateSalts() {
+		return Salt.findAllSalts();
+	}
+
+	String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
+		String enc = httpServletRequest.getCharacterEncoding();
+		if (enc == null) {
+			enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
+		}
+		pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
+		return pathSegment;
+	}
+
+	@RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
+		Salt salt = Salt.findSalt(id);
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/text; charset=utf-8");
+		headers.add("Access-Control-Allow-Origin", "*");
+		headers.add("Access-Control-Allow-Headers", "Content-Type");
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
+		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.setExpires(0); // Expire the cache
+		if (salt == null) {
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		}
+		return new ResponseEntity<String>(salt.toJson(), headers, HttpStatus.OK);
+	}
+
+	@RequestMapping(headers = "Accept=application/json")
+	@ResponseBody
+	public ResponseEntity<String> listJson() {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/text; charset=utf-8");
+		headers.add("Access-Control-Allow-Origin", "*");
+		headers.add("Access-Control-Allow-Headers", "Content-Type");
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
+		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.setExpires(0); // Expire the cache
+		return new ResponseEntity<String>(Salt.toJsonArray(Salt.findAllSalts()), headers, HttpStatus.OK);
+	}
+
+	@RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> createFromJson(@RequestBody String json) throws CmpdRegMolFormatException {
+		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/text");
+		headers.add("Access-Control-Allow-Origin", "*");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
+		Salt salt = Salt.fromJsonToSalt(json);
+		salt.setAbbrev(salt.getAbbrev().trim());
+		salt.setName(salt.getName().trim());
+		ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
+		boolean validSalt = true;
+		List<Salt> saltsByName = Salt.findSaltsByNameEquals(salt.getName()).getResultList();
+		if (saltsByName.size() > 0) {
+			logger.error("Number of salts found: " + saltsByName.size());
+			validSalt = false;
+			ErrorMessage error = new ErrorMessage();
+			error.setLevel("error");
+			error.setMessage("Duplicate salt name. Another salt exist with the same name.");
+			errors.add(error);
+		}
+		List<Salt> saltsByAbbrev = Salt.findSaltsByAbbrevEquals(salt.getAbbrev()).getResultList();
+		if (saltsByAbbrev.size() > 0) {
+			logger.error("Number of salts found: " + saltsByAbbrev.size());
+			validSalt = false;
+			ErrorMessage error = new ErrorMessage();
+			error.setLevel("error");
+			error.setMessage("Duplicate salt abbreviation. Another salt exist with the same abbreviation.");
+			errors.add(error);
+		}
+		if (validSalt) {
+			try{
+				salt = saltStructureService.saveStructure(salt);
+			} catch (CmpdRegMolFormatException e) {
+				logger.error("Error saving salt: " + e.getMessage());
+				validSalt = false;
+				ErrorMessage error = new ErrorMessage();
+				error.setLevel("error");
+				error.setMessage("Error saving salt: " + e.getMessage());
+				errors.add(error);
+				return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.BAD_REQUEST);
+			}
+		}
+		if (salt.getCdId() == -1) {
+			ErrorMessage error = new ErrorMessage();
+			error.setLevel("error");
+			error.setMessage("Bad molformat. Please fix the molfile: " + salt.getMolStructure());
+			errors.add(error);
+			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.BAD_REQUEST);
+		} else if (salt.getCdId() > 0) {
+			salt.persist();
+			return showJson(salt.getId());
+		} else {
+			ErrorMessage error = new ErrorMessage();
+			error.setLevel("warning");
+			error.setMessage("Duplicate salt found. Please select existing salt.");
+			errors.add(error);
+			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.CONFLICT);
+		}
+	}
+
+	// @RequestMapping(method = RequestMethod.OPTIONS)
+	// public ResponseEntity<String> getSaltOptions() {
+	// 	HttpHeaders headers = new HttpHeaders();
+	// 	headers.add("Content-Type", "application/text, text/html");
+	// 	headers.add("Access-Control-Allow-Headers", "Content-Type");
+	// 	headers.add("Access-Control-Allow-Origin", "*");
+	// 	headers.add("Access-Control-Max-Age", "86400");
+	// 	return new ResponseEntity<String>(headers, HttpStatus.OK);
+	// }
+
+	@RequestMapping(method = RequestMethod.PUT)
+	public String update(@Valid Salt salt, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
+		if (bindingResult.hasErrors()) {
+			uiModel.addAttribute("salt", salt);
+			return "salts/update";
+		}
+		uiModel.asMap().clear();
+		try {
+			logger.debug("Salt weight: " + chemStructureService.getMolWeight(salt.getMolStructure()));
+		} catch (CmpdRegMolFormatException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		Salt updatedSalt = null;
+		try{
+			updatedSalt = saltStructureService.update(salt);
+		}catch (CmpdRegMolFormatException e) {
+			logger.error("Bad mol format",e);
+			updatedSalt = null;
+		}
+		ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
+		if (updatedSalt == null) {
+			ErrorMessage error = new ErrorMessage();
+			error.setLevel("error");
+			error.setMessage("Bad molformat. Please fix the molfile: " + salt.getMolStructure());
+			errors.add(error);
+			return "redirect:/salts/";
+		}
+		return "redirect:/salts/" + encodeUrlPathSegment(salt.getId().toString(), httpServletRequest);
+	}
+
+	@RequestMapping(method = RequestMethod.PUT, headers = "Accept=application/json")
+	public ResponseEntity<String> updateFromJson(@RequestBody String json) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/text");
+		try {
+			Salt updatedSalt = saltStructureService.update(Salt.fromJsonToSalt(json));
+			ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
+			if (updatedSalt == null) {
+				return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.CONFLICT);
+			} else {
+				return new ResponseEntity<String>(updatedSalt.toJson(), headers, HttpStatus.OK);
+			}
+		}catch (CmpdRegMolFormatException e) {
+			return new ResponseEntity<String>("ERROR: Bad molfile:"+e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
+		}
+	}
+
+	@RequestMapping(value = "/saveMissingStructures", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> saveMissingStructures() {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/text; charset=utf-8");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
+		headers.add("Access-Control-Allow-Headers", "Content-Type");
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
+		headers.add("Pragma", "no-cache"); //HTTP 1.0
 		headers.setExpires(0); // Expire the cache
-		return new ResponseEntity<String>(headers, HttpStatus.OK);
+		try {
+			Collection<Salt> missingSaltStructures = saltStructureService.saveMissingStructures();
+			return new ResponseEntity<String>(Salt.toJsonArray(missingSaltStructures), headers, HttpStatus.OK);
+		}catch (StructureSaveException e) {
+			return new ResponseEntity<String>("ERROR: Saving missing structures:"+e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
+		}
+
 	}
 
 }
diff --git a/src/main/java/com/labsynch/labseer/web/SaltController.java b/src/main/java/com/labsynch/labseer/web/SaltController.java
deleted file mode 100755
index f5c39d934..000000000
--- a/src/main/java/com/labsynch/labseer/web/SaltController.java
+++ /dev/null
@@ -1,256 +0,0 @@
-package com.labsynch.labseer.web;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-import com.labsynch.labseer.domain.Salt;
-import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
-import com.labsynch.labseer.exceptions.StructureSaveException;
-import com.labsynch.labseer.service.ChemStructureService;
-import com.labsynch.labseer.service.ErrorMessage;
-import com.labsynch.labseer.service.SaltStructureService;
-import com.labsynch.labseer.utils.MoleculeUtil;
-import com.mysema.query.BooleanBuilder;
-import com.mysema.query.types.path.PathBuilder;
-
-@RooWebScaffold(path = "salts", formBackingObject = Salt.class)
-@RequestMapping("/salts")
-@Controller
-@Transactional
-
-@RooWebFinder
-public class SaltController {
-
-	private static final Logger logger = LoggerFactory.getLogger(SaltController.class);
-
-	@Autowired
-	private SaltStructureService saltStructureService;
-
-	@Autowired
-	private ChemStructureService chemStructureService;
-
-	@RequestMapping(method = RequestMethod.POST)
-	public String create(@Valid Salt salt, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) throws CmpdRegMolFormatException {
-		if (bindingResult.hasErrors()) {
-			uiModel.addAttribute("salt", salt);
-			return "salts/create";
-		}
-		uiModel.asMap().clear();
-		salt = saltStructureService.saveStructure(salt);
-		if (salt.getCdId() > 0 && salt.getCdId() != -1) {
-			salt.persist();
-			return "redirect:/salts/" + encodeUrlPathSegment(salt.getId().toString(), httpServletRequest);
-		} else {
-			//remove the salt from the Salt_Structure table??
-			uiModel.addAttribute("salt", salt);
-			return "salts/create";
-		}
-	}
-
-	@ModelAttribute("salts")
-	public Collection<Salt> populateSalts() {
-		return Salt.findAllSalts();
-	}
-
-	String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-		String enc = httpServletRequest.getCharacterEncoding();
-		if (enc == null) {
-			enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-		}
-		pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-		return pathSegment;
-	}
-
-	@RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-	@ResponseBody
-	public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
-		Salt salt = Salt.findSalt(id);
-		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/text; charset=utf-8");
-		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
-		headers.setExpires(0); // Expire the cache
-		if (salt == null) {
-			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-		}
-		return new ResponseEntity<String>(salt.toJson(), headers, HttpStatus.OK);
-	}
-
-	@RequestMapping(headers = "Accept=application/json")
-	@ResponseBody
-	public ResponseEntity<String> listJson() {
-		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/text; charset=utf-8");
-		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
-		headers.setExpires(0); // Expire the cache
-		return new ResponseEntity<String>(Salt.toJsonArray(Salt.findAllSalts()), headers, HttpStatus.OK);
-	}
-
-	@RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-	public ResponseEntity<String> createFromJson(@RequestBody String json) throws CmpdRegMolFormatException {
-		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/text");
-		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		Salt salt = Salt.fromJsonToSalt(json);
-		salt.setAbbrev(salt.getAbbrev().trim());
-		salt.setName(salt.getName().trim());
-		ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
-		boolean validSalt = true;
-		List<Salt> saltsByName = Salt.findSaltsByNameEquals(salt.getName()).getResultList();
-		if (saltsByName.size() > 0) {
-			logger.error("Number of salts found: " + saltsByName.size());
-			validSalt = false;
-			ErrorMessage error = new ErrorMessage();
-			error.setLevel("error");
-			error.setMessage("Duplicate salt name. Another salt exist with the same name.");
-			errors.add(error);
-		}
-		List<Salt> saltsByAbbrev = Salt.findSaltsByAbbrevEquals(salt.getAbbrev()).getResultList();
-		if (saltsByAbbrev.size() > 0) {
-			logger.error("Number of salts found: " + saltsByAbbrev.size());
-			validSalt = false;
-			ErrorMessage error = new ErrorMessage();
-			error.setLevel("error");
-			error.setMessage("Duplicate salt abbreviation. Another salt exist with the same abbreviation.");
-			errors.add(error);
-		}
-		if (validSalt) {
-			try{
-				salt = saltStructureService.saveStructure(salt);
-			} catch (CmpdRegMolFormatException e) {
-				logger.error("Error saving salt: " + e.getMessage());
-				validSalt = false;
-				ErrorMessage error = new ErrorMessage();
-				error.setLevel("error");
-				error.setMessage("Error saving salt: " + e.getMessage());
-				errors.add(error);
-				return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.BAD_REQUEST);
-			}
-		}
-		if (salt.getCdId() == -1) {
-			ErrorMessage error = new ErrorMessage();
-			error.setLevel("error");
-			error.setMessage("Bad molformat. Please fix the molfile: " + salt.getMolStructure());
-			errors.add(error);
-			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.BAD_REQUEST);
-		} else if (salt.getCdId() > 0) {
-			salt.persist();
-			return showJson(salt.getId());
-		} else {
-			ErrorMessage error = new ErrorMessage();
-			error.setLevel("warning");
-			error.setMessage("Duplicate salt found. Please select existing salt.");
-			errors.add(error);
-			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.CONFLICT);
-		}
-	}
-
-	@RequestMapping(method = RequestMethod.OPTIONS)
-	public ResponseEntity<String> getSaltOptions() {
-		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/text, text/html");
-		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Access-Control-Max-Age", "86400");
-		return new ResponseEntity<String>(headers, HttpStatus.OK);
-	}
-
-	@RequestMapping(method = RequestMethod.PUT)
-	public String update(@Valid Salt salt, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-		if (bindingResult.hasErrors()) {
-			uiModel.addAttribute("salt", salt);
-			return "salts/update";
-		}
-		uiModel.asMap().clear();
-		try {
-			logger.debug("Salt weight: " + chemStructureService.getMolWeight(salt.getMolStructure()));
-		} catch (CmpdRegMolFormatException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
-		Salt updatedSalt = null;
-		try{
-			updatedSalt = saltStructureService.update(salt);
-		}catch (CmpdRegMolFormatException e) {
-			logger.error("Bad mol format",e);
-			updatedSalt = null;
-		}
-		ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
-		if (updatedSalt == null) {
-			ErrorMessage error = new ErrorMessage();
-			error.setLevel("error");
-			error.setMessage("Bad molformat. Please fix the molfile: " + salt.getMolStructure());
-			errors.add(error);
-			return "redirect:/salts/";
-		}
-		return "redirect:/salts/" + encodeUrlPathSegment(salt.getId().toString(), httpServletRequest);
-	}
-
-	@RequestMapping(method = RequestMethod.PUT, headers = "Accept=application/json")
-	public ResponseEntity<String> updateFromJson(@RequestBody String json) {
-		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/text");
-		try {
-			Salt updatedSalt = saltStructureService.update(Salt.fromJsonToSalt(json));
-			ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
-			if (updatedSalt == null) {
-				return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.CONFLICT);
-			} else {
-				return new ResponseEntity<String>(updatedSalt.toJson(), headers, HttpStatus.OK);
-			}
-		}catch (CmpdRegMolFormatException e) {
-			return new ResponseEntity<String>("ERROR: Bad molfile:"+e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
-		}
-	}
-
-	@RequestMapping(value = "/saveMissingStructures", method = RequestMethod.POST, headers = "Accept=application/json")
-	public ResponseEntity<String> saveMissingStructures() {
-		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/text; charset=utf-8");
-		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
-		headers.setExpires(0); // Expire the cache
-		try {
-			Collection<Salt> missingSaltStructures = saltStructureService.saveMissingStructures();
-			return new ResponseEntity<String>(Salt.toJsonArray(missingSaltStructures), headers, HttpStatus.OK);
-		}catch (StructureSaveException e) {
-			return new ResponseEntity<String>("ERROR: Saving missing structures:"+e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
-		}
-
-	}
-
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SaltController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/SaltController_Roo_Controller.aj
deleted file mode 100644
index 26acb4d0d..000000000
--- a/src/main/java/com/labsynch/labseer/web/SaltController_Roo_Controller.aj
+++ /dev/null
@@ -1,63 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Salt;
-import com.labsynch.labseer.web.SaltController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect SaltController_Roo_Controller {
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String SaltController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new Salt());
-        return "salts/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String SaltController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("salt", Salt.findSalt(id));
-        uiModel.addAttribute("itemId", id);
-        return "salts/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String SaltController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("salts", Salt.findSaltEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) Salt.countSalts() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("salts", Salt.findAllSalts(sortFieldName, sortOrder));
-        }
-        return "salts/list";
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String SaltController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, Salt.findSalt(id));
-        return "salts/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String SaltController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        Salt salt = Salt.findSalt(id);
-        salt.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/salts";
-    }
-    
-    void SaltController.populateEditForm(Model uiModel, Salt salt) {
-        uiModel.addAttribute("salt", salt);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SaltController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/SaltController_Roo_Controller_Finder.aj
deleted file mode 100644
index 679be0cff..000000000
--- a/src/main/java/com/labsynch/labseer/web/SaltController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,110 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Salt;
-import com.labsynch.labseer.web.SaltController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect SaltController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByAbbrevEquals", "form" }, method = RequestMethod.GET)
-    public String SaltController.findSaltsByAbbrevEqualsForm(Model uiModel) {
-        return "salts/findSaltsByAbbrevEquals";
-    }
-    
-    @RequestMapping(params = "find=ByAbbrevEquals", method = RequestMethod.GET)
-    public String SaltController.findSaltsByAbbrevEquals(@RequestParam("abbrev") String abbrev, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("salts", Salt.findSaltsByAbbrevEquals(abbrev, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Salt.countFindSaltsByAbbrevEquals(abbrev) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("salts", Salt.findSaltsByAbbrevEquals(abbrev, sortFieldName, sortOrder).getResultList());
-        }
-        return "salts/list";
-    }
-    
-    @RequestMapping(params = { "find=ByAbbrevEqualsAndNameEquals", "form" }, method = RequestMethod.GET)
-    public String SaltController.findSaltsByAbbrevEqualsAndNameEqualsForm(Model uiModel) {
-        return "salts/findSaltsByAbbrevEqualsAndNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByAbbrevEqualsAndNameEquals", method = RequestMethod.GET)
-    public String SaltController.findSaltsByAbbrevEqualsAndNameEquals(@RequestParam("abbrev") String abbrev, @RequestParam("name") String name, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("salts", Salt.findSaltsByAbbrevEqualsAndNameEquals(abbrev, name, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Salt.countFindSaltsByAbbrevEqualsAndNameEquals(abbrev, name) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("salts", Salt.findSaltsByAbbrevEqualsAndNameEquals(abbrev, name, sortFieldName, sortOrder).getResultList());
-        }
-        return "salts/list";
-    }
-    
-    @RequestMapping(params = { "find=ByAbbrevLike", "form" }, method = RequestMethod.GET)
-    public String SaltController.findSaltsByAbbrevLikeForm(Model uiModel) {
-        return "salts/findSaltsByAbbrevLike";
-    }
-    
-    @RequestMapping(params = "find=ByAbbrevLike", method = RequestMethod.GET)
-    public String SaltController.findSaltsByAbbrevLike(@RequestParam("abbrev") String abbrev, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("salts", Salt.findSaltsByAbbrevLike(abbrev, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Salt.countFindSaltsByAbbrevLike(abbrev) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("salts", Salt.findSaltsByAbbrevLike(abbrev, sortFieldName, sortOrder).getResultList());
-        }
-        return "salts/list";
-    }
-    
-    @RequestMapping(params = { "find=ByCdId", "form" }, method = RequestMethod.GET)
-    public String SaltController.findSaltsByCdIdForm(Model uiModel) {
-        return "salts/findSaltsByCdId";
-    }
-    
-    @RequestMapping(params = "find=ByCdId", method = RequestMethod.GET)
-    public String SaltController.findSaltsByCdId(@RequestParam("cdId") int cdId, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("salts", Salt.findSaltsByCdId(cdId, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Salt.countFindSaltsByCdId(cdId) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("salts", Salt.findSaltsByCdId(cdId, sortFieldName, sortOrder).getResultList());
-        }
-        return "salts/list";
-    }
-    
-    @RequestMapping(params = { "find=ByNameEquals", "form" }, method = RequestMethod.GET)
-    public String SaltController.findSaltsByNameEqualsForm(Model uiModel) {
-        return "salts/findSaltsByNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByNameEquals", method = RequestMethod.GET)
-    public String SaltController.findSaltsByNameEquals(@RequestParam("name") String name, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("salts", Salt.findSaltsByNameEquals(name, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Salt.countFindSaltsByNameEquals(name) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("salts", Salt.findSaltsByNameEquals(name, sortFieldName, sortOrder).getResultList());
-        }
-        return "salts/list";
-    }
-    
-}

From bab6c19d863cd2e73816d29c5920826bbd6120ff Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 27 Apr 2022 08:46:34 -0700
Subject: [PATCH 33/73] Isotope controller

---
 .../ApiIsotopeController.java}                | 31 +++-----
 .../web/IsotopeController_Roo_Controller.aj   | 16 -----
 ...IsotopeController_Roo_Controller_Finder.aj | 72 -------------------
 3 files changed, 11 insertions(+), 108 deletions(-)
 rename src/main/java/com/labsynch/labseer/{web/IsotopeController.java => api/ApiIsotopeController.java} (95%)
 mode change 100755 => 100644
 delete mode 100644 src/main/java/com/labsynch/labseer/web/IsotopeController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/IsotopeController_Roo_Controller_Finder.aj

diff --git a/src/main/java/com/labsynch/labseer/web/IsotopeController.java b/src/main/java/com/labsynch/labseer/api/ApiIsotopeController.java
old mode 100755
new mode 100644
similarity index 95%
rename from src/main/java/com/labsynch/labseer/web/IsotopeController.java
rename to src/main/java/com/labsynch/labseer/api/ApiIsotopeController.java
index 4792c5177..da6f86221
--- a/src/main/java/com/labsynch/labseer/web/IsotopeController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiIsotopeController.java
@@ -1,21 +1,22 @@
-package com.labsynch.labseer.web;
-import java.io.UnsupportedEncodingException;
+package com.labsynch.labseer.api;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
+import com.labsynch.labseer.domain.Isotope;
+import com.labsynch.labseer.service.ErrorList;
+import com.labsynch.labseer.service.ErrorMessage;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -28,21 +29,11 @@
 import org.springframework.web.util.UriUtils;
 import org.springframework.web.util.WebUtils;
 
-import com.labsynch.labseer.domain.Isotope;
-import com.labsynch.labseer.service.ErrorList;
-import com.labsynch.labseer.service.ErrorMessage;
-import com.mysema.query.BooleanBuilder;
-import com.mysema.query.types.path.PathBuilder;
-
-@RooWebScaffold(path = "isotopes", formBackingObject = Isotope.class)
-@RequestMapping("/isotopes")
-@Transactional
+@RequestMapping(value = {"/api/v1/isotopes"})
 @Controller
-
-@RooWebFinder
-public class IsotopeController {
-
-    private static final Logger logger = LoggerFactory.getLogger(IsotopeController.class);
+public class ApiIsotopeController {
+	
+    private static final Logger logger = LoggerFactory.getLogger(ApiIsotopeController.class);
 
     @RequestMapping(method = RequestMethod.POST)
     public String create(@Valid Isotope isotope, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
diff --git a/src/main/java/com/labsynch/labseer/web/IsotopeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/IsotopeController_Roo_Controller.aj
deleted file mode 100644
index 758aa59e6..000000000
--- a/src/main/java/com/labsynch/labseer/web/IsotopeController_Roo_Controller.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Isotope;
-import com.labsynch.labseer.web.IsotopeController;
-import org.springframework.ui.Model;
-
-privileged aspect IsotopeController_Roo_Controller {
-    
-    void IsotopeController.populateEditForm(Model uiModel, Isotope isotope) {
-        uiModel.addAttribute("isotope", isotope);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/IsotopeController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/IsotopeController_Roo_Controller_Finder.aj
deleted file mode 100644
index 24a04fe4c..000000000
--- a/src/main/java/com/labsynch/labseer/web/IsotopeController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,72 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Isotope;
-import com.labsynch.labseer.web.IsotopeController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect IsotopeController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByAbbrevEquals", "form" }, method = RequestMethod.GET)
-    public String IsotopeController.findIsotopesByAbbrevEqualsForm(Model uiModel) {
-        return "isotopes/findIsotopesByAbbrevEquals";
-    }
-    
-    @RequestMapping(params = "find=ByAbbrevEquals", method = RequestMethod.GET)
-    public String IsotopeController.findIsotopesByAbbrevEquals(@RequestParam("abbrev") String abbrev, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("isotopes", Isotope.findIsotopesByAbbrevEquals(abbrev, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Isotope.countFindIsotopesByAbbrevEquals(abbrev) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("isotopes", Isotope.findIsotopesByAbbrevEquals(abbrev, sortFieldName, sortOrder).getResultList());
-        }
-        return "isotopes/list";
-    }
-    
-    @RequestMapping(params = { "find=ByAbbrevEqualsAndNameEquals", "form" }, method = RequestMethod.GET)
-    public String IsotopeController.findIsotopesByAbbrevEqualsAndNameEqualsForm(Model uiModel) {
-        return "isotopes/findIsotopesByAbbrevEqualsAndNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByAbbrevEqualsAndNameEquals", method = RequestMethod.GET)
-    public String IsotopeController.findIsotopesByAbbrevEqualsAndNameEquals(@RequestParam("abbrev") String abbrev, @RequestParam("name") String name, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("isotopes", Isotope.findIsotopesByAbbrevEqualsAndNameEquals(abbrev, name, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Isotope.countFindIsotopesByAbbrevEqualsAndNameEquals(abbrev, name) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("isotopes", Isotope.findIsotopesByAbbrevEqualsAndNameEquals(abbrev, name, sortFieldName, sortOrder).getResultList());
-        }
-        return "isotopes/list";
-    }
-    
-    @RequestMapping(params = { "find=ByNameEquals", "form" }, method = RequestMethod.GET)
-    public String IsotopeController.findIsotopesByNameEqualsForm(Model uiModel) {
-        return "isotopes/findIsotopesByNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByNameEquals", method = RequestMethod.GET)
-    public String IsotopeController.findIsotopesByNameEquals(@RequestParam("name") String name, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("isotopes", Isotope.findIsotopesByNameEquals(name, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Isotope.countFindIsotopesByNameEquals(name) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("isotopes", Isotope.findIsotopesByNameEquals(name, sortFieldName, sortOrder).getResultList());
-        }
-        return "isotopes/list";
-    }
-    
-}

From d8e744853201d85df212edee71ef0e02ca268e33 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 27 Apr 2022 08:56:40 -0700
Subject: [PATCH 34/73] Remove unused stereocategory controller

---
 .../labseer/web/StereoCategoryController.java | 143 ------------------
 ...StereoCategoryController_Roo_Controller.aj | 100 ------------
 ...ategoryController_Roo_Controller_Finder.aj |  53 -------
 3 files changed, 296 deletions(-)
 delete mode 100755 src/main/java/com/labsynch/labseer/web/StereoCategoryController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/StereoCategoryController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/StereoCategoryController_Roo_Controller_Finder.aj

diff --git a/src/main/java/com/labsynch/labseer/web/StereoCategoryController.java b/src/main/java/com/labsynch/labseer/web/StereoCategoryController.java
deleted file mode 100755
index 7fd9b18b2..000000000
--- a/src/main/java/com/labsynch/labseer/web/StereoCategoryController.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.labsynch.labseer.web;
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.labsynch.labseer.domain.StereoCategory;
-
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-@RooWebScaffold(path = "stereocategorys", formBackingObject = StereoCategory.class)
-@RequestMapping({ "/stereoCategorys", "/stereocategorys", "/stereoCategories" })
-@Transactional
-@Controller
-
-@RooWebFinder
-public class StereoCategoryController {
-
-
-	@Autowired
-	private PropertiesUtilService propertiesUtilService;
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
-        StereoCategory stereocategory = StereoCategory.findStereoCategory(id);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Type");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
-        headers.setExpires(0); // Expire the cache
-        if (stereocategory == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        return new ResponseEntity<String>(stereocategory.toJson(), headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Type");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
-        headers.setExpires(0); // Expire the cache
- 
-        if (propertiesUtilService.getOrderSelectLists()){
-            return new ResponseEntity<String>(StereoCategory.toJsonArray(StereoCategory.findAllStereoCategorys("name","ASC")), headers, HttpStatus.OK);
-        } else {
-            return new ResponseEntity<String>(StereoCategory.toJsonArray(StereoCategory.findAllStereoCategorys()), headers, HttpStatus.OK);
-        }
-    }
-
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> createFromJson(@RequestBody String json) {
-        StereoCategory.fromJsonToStereoCategory(json).persist();
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text");
-        headers.add("Access-Control-Allow-Headers", "Content-Type");
-        headers.add("Access-Control-Allow-Origin", "*");
-        return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-    }
-
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> createFromJsonArray(@RequestBody String json) {
-        for (StereoCategory stereoCategory : StereoCategory.fromJsonArrayToStereoCategorys(json)) {
-            stereoCategory.persist();
-        }
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text");
-        headers.add("Access-Control-Allow-Headers", "Content-Type");
-        headers.add("Access-Control-Allow-Origin", "*");
-        return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-    }
-
-    @RequestMapping(method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> updateFromJson(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text");
-        headers.add("Access-Control-Allow-Headers", "Content-Type");
-        headers.add("Access-Control-Allow-Origin", "*");
-        if (StereoCategory.fromJsonToStereoCategory(json).merge() == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> updateFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text");
-        headers.add("Access-Control-Allow-Headers", "Content-Type");
-        headers.add("Access-Control-Allow-Origin", "*");
-        for (StereoCategory stereoCategory : StereoCategory.fromJsonArrayToStereoCategorys(json)) {
-            if (stereoCategory.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-        }
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
-        StereoCategory stereocategory = StereoCategory.findStereoCategory(id);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text");
-        headers.add("Access-Control-Allow-Headers", "Content-Type");
-        headers.add("Access-Control-Allow-Origin", "*");
-        if (stereocategory == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        stereocategory.remove();
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(method = RequestMethod.OPTIONS)
-    public ResponseEntity<String> getOptions() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text, text/html");
-        headers.add("Access-Control-Allow-Headers", "Content-Type");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Access-Control-Max-Age", "86400");
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/StereoCategoryController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/StereoCategoryController_Roo_Controller.aj
deleted file mode 100644
index 795184894..000000000
--- a/src/main/java/com/labsynch/labseer/web/StereoCategoryController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.StereoCategory;
-import com.labsynch.labseer.web.StereoCategoryController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect StereoCategoryController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String StereoCategoryController.create(@Valid StereoCategory stereoCategory, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, stereoCategory);
-            return "stereocategorys/create";
-        }
-        uiModel.asMap().clear();
-        stereoCategory.persist();
-        return "redirect:/stereocategorys/" + encodeUrlPathSegment(stereoCategory.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String StereoCategoryController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new StereoCategory());
-        return "stereocategorys/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String StereoCategoryController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("stereocategory", StereoCategory.findStereoCategory(id));
-        uiModel.addAttribute("itemId", id);
-        return "stereocategorys/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String StereoCategoryController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("stereocategorys", StereoCategory.findStereoCategoryEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) StereoCategory.countStereoCategorys() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("stereocategorys", StereoCategory.findAllStereoCategorys(sortFieldName, sortOrder));
-        }
-        return "stereocategorys/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String StereoCategoryController.update(@Valid StereoCategory stereoCategory, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, stereoCategory);
-            return "stereocategorys/update";
-        }
-        uiModel.asMap().clear();
-        stereoCategory.merge();
-        return "redirect:/stereocategorys/" + encodeUrlPathSegment(stereoCategory.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String StereoCategoryController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, StereoCategory.findStereoCategory(id));
-        return "stereocategorys/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String StereoCategoryController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        StereoCategory stereoCategory = StereoCategory.findStereoCategory(id);
-        stereoCategory.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/stereocategorys";
-    }
-    
-    void StereoCategoryController.populateEditForm(Model uiModel, StereoCategory stereoCategory) {
-        uiModel.addAttribute("stereoCategory", stereoCategory);
-    }
-    
-    String StereoCategoryController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/StereoCategoryController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/StereoCategoryController_Roo_Controller_Finder.aj
deleted file mode 100644
index 21720359d..000000000
--- a/src/main/java/com/labsynch/labseer/web/StereoCategoryController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,53 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.StereoCategory;
-import com.labsynch.labseer.web.StereoCategoryController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect StereoCategoryController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByCodeEquals", "form" }, method = RequestMethod.GET)
-    public String StereoCategoryController.findStereoCategorysByCodeEqualsForm(Model uiModel) {
-        return "stereocategorys/findStereoCategorysByCodeEquals";
-    }
-    
-    @RequestMapping(params = "find=ByCodeEquals", method = RequestMethod.GET)
-    public String StereoCategoryController.findStereoCategorysByCodeEquals(@RequestParam("code") String code, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("stereocategorys", StereoCategory.findStereoCategorysByCodeEquals(code, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) StereoCategory.countFindStereoCategorysByCodeEquals(code) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("stereocategorys", StereoCategory.findStereoCategorysByCodeEquals(code, sortFieldName, sortOrder).getResultList());
-        }
-        return "stereocategorys/list";
-    }
-    
-    @RequestMapping(params = { "find=ByCodeLike", "form" }, method = RequestMethod.GET)
-    public String StereoCategoryController.findStereoCategorysByCodeLikeForm(Model uiModel) {
-        return "stereocategorys/findStereoCategorysByCodeLike";
-    }
-    
-    @RequestMapping(params = "find=ByCodeLike", method = RequestMethod.GET)
-    public String StereoCategoryController.findStereoCategorysByCodeLike(@RequestParam("code") String code, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("stereocategorys", StereoCategory.findStereoCategorysByCodeLike(code, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) StereoCategory.countFindStereoCategorysByCodeLike(code) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("stereocategorys", StereoCategory.findStereoCategorysByCodeLike(code, sortFieldName, sortOrder).getResultList());
-        }
-        return "stereocategorys/list";
-    }
-    
-}

From b2bd088a8f6ae496a2200a58eba03986bfc61a0f Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 27 Apr 2022 09:04:50 -0700
Subject: [PATCH 35/73] Compound type controller

---
 .../ApiCompoundTypeController.java}           |  19 +---
 .../CompoundTypeController_Roo_Controller.aj  | 100 ------------------
 ...undTypeController_Roo_Controller_Finder.aj |  34 ------
 3 files changed, 4 insertions(+), 149 deletions(-)
 rename src/main/java/com/labsynch/labseer/{web/CompoundTypeController.java => api/ApiCompoundTypeController.java} (90%)
 delete mode 100644 src/main/java/com/labsynch/labseer/web/CompoundTypeController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/CompoundTypeController_Roo_Controller_Finder.aj

diff --git a/src/main/java/com/labsynch/labseer/web/CompoundTypeController.java b/src/main/java/com/labsynch/labseer/api/ApiCompoundTypeController.java
similarity index 90%
rename from src/main/java/com/labsynch/labseer/web/CompoundTypeController.java
rename to src/main/java/com/labsynch/labseer/api/ApiCompoundTypeController.java
index 572d44495..0a46d1df4 100644
--- a/src/main/java/com/labsynch/labseer/web/CompoundTypeController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiCompoundTypeController.java
@@ -1,30 +1,19 @@
-package com.labsynch.labseer.web;
-import javax.servlet.http.HttpServletRequest;
+package com.labsynch.labseer.api;
+import com.labsynch.labseer.domain.CompoundType;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.CompoundType;
-
-@RooWebScaffold(path = "compoundTypes", formBackingObject = CompoundType.class)
-@RequestMapping("/compoundTypes")
-@Transactional
+@RequestMapping(value = {"/api/v1/compoundTypes"})
 @Controller
-
-@RooWebFinder
-public class CompoundTypeController {
+public class ApiCompoundTypeController {
 
 
     @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
diff --git a/src/main/java/com/labsynch/labseer/web/CompoundTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/CompoundTypeController_Roo_Controller.aj
deleted file mode 100644
index 18b369622..000000000
--- a/src/main/java/com/labsynch/labseer/web/CompoundTypeController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.CompoundType;
-import com.labsynch.labseer.web.CompoundTypeController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect CompoundTypeController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String CompoundTypeController.create(@Valid CompoundType compoundType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, compoundType);
-            return "compoundTypes/create";
-        }
-        uiModel.asMap().clear();
-        compoundType.persist();
-        return "redirect:/compoundTypes/" + encodeUrlPathSegment(compoundType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String CompoundTypeController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new CompoundType());
-        return "compoundTypes/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String CompoundTypeController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("compoundtype", CompoundType.findCompoundType(id));
-        uiModel.addAttribute("itemId", id);
-        return "compoundTypes/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String CompoundTypeController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("compoundtypes", CompoundType.findCompoundTypeEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) CompoundType.countCompoundTypes() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("compoundtypes", CompoundType.findAllCompoundTypes(sortFieldName, sortOrder));
-        }
-        return "compoundTypes/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String CompoundTypeController.update(@Valid CompoundType compoundType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, compoundType);
-            return "compoundTypes/update";
-        }
-        uiModel.asMap().clear();
-        compoundType.merge();
-        return "redirect:/compoundTypes/" + encodeUrlPathSegment(compoundType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String CompoundTypeController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, CompoundType.findCompoundType(id));
-        return "compoundTypes/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String CompoundTypeController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        CompoundType compoundType = CompoundType.findCompoundType(id);
-        compoundType.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/compoundTypes";
-    }
-    
-    void CompoundTypeController.populateEditForm(Model uiModel, CompoundType compoundType) {
-        uiModel.addAttribute("compoundType", compoundType);
-    }
-    
-    String CompoundTypeController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/CompoundTypeController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/CompoundTypeController_Roo_Controller_Finder.aj
deleted file mode 100644
index 22b0f2300..000000000
--- a/src/main/java/com/labsynch/labseer/web/CompoundTypeController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.CompoundType;
-import com.labsynch.labseer.web.CompoundTypeController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect CompoundTypeController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByCodeEquals", "form" }, method = RequestMethod.GET)
-    public String CompoundTypeController.findCompoundTypesByCodeEqualsForm(Model uiModel) {
-        return "compoundTypes/findCompoundTypesByCodeEquals";
-    }
-    
-    @RequestMapping(params = "find=ByCodeEquals", method = RequestMethod.GET)
-    public String CompoundTypeController.findCompoundTypesByCodeEquals(@RequestParam("code") String code, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("compoundtypes", CompoundType.findCompoundTypesByCodeEquals(code, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) CompoundType.countFindCompoundTypesByCodeEquals(code) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("compoundtypes", CompoundType.findCompoundTypesByCodeEquals(code, sortFieldName, sortOrder).getResultList());
-        }
-        return "compoundTypes/list";
-    }
-    
-}

From 82595f3f6cbd025a2a826ab6e3bf2955e1b8d8e9 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 27 Apr 2022 09:12:34 -0700
Subject: [PATCH 36/73] Parent annotations controller

---
 .../ApiParentAnnotationController.java}       |   9 +-
 ...rentAnnotationController_Roo_Controller.aj | 100 ------------------
 ...otationController_Roo_Controller_Finder.aj |  34 ------
 3 files changed, 3 insertions(+), 140 deletions(-)
 rename src/main/java/com/labsynch/labseer/{web/ParentAnnotationController.java => api/ApiParentAnnotationController.java} (96%)
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ParentAnnotationController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ParentAnnotationController_Roo_Controller_Finder.aj

diff --git a/src/main/java/com/labsynch/labseer/web/ParentAnnotationController.java b/src/main/java/com/labsynch/labseer/api/ApiParentAnnotationController.java
similarity index 96%
rename from src/main/java/com/labsynch/labseer/web/ParentAnnotationController.java
rename to src/main/java/com/labsynch/labseer/api/ApiParentAnnotationController.java
index fbfe75b50..4d2d16327 100644
--- a/src/main/java/com/labsynch/labseer/web/ParentAnnotationController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiParentAnnotationController.java
@@ -1,4 +1,4 @@
-package com.labsynch.labseer.web;
+package com.labsynch.labseer.api;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.http.HttpHeaders;
@@ -18,13 +18,10 @@
 
 import com.labsynch.labseer.domain.ParentAnnotation;
 
-@RooWebScaffold(path = "parentAnnotations", formBackingObject = ParentAnnotation.class)
-@RequestMapping("/parentAnnotations")
+@RequestMapping(value = {"/api/v1/parentAnnotations"})
 @Transactional
 @Controller
-
-@RooWebFinder
-public class ParentAnnotationController {
+public class ApiParentAnnotationController {
 
     @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
diff --git a/src/main/java/com/labsynch/labseer/web/ParentAnnotationController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ParentAnnotationController_Roo_Controller.aj
deleted file mode 100644
index 38e5f01da..000000000
--- a/src/main/java/com/labsynch/labseer/web/ParentAnnotationController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ParentAnnotation;
-import com.labsynch.labseer.web.ParentAnnotationController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ParentAnnotationController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ParentAnnotationController.create(@Valid ParentAnnotation parentAnnotation, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, parentAnnotation);
-            return "parentAnnotations/create";
-        }
-        uiModel.asMap().clear();
-        parentAnnotation.persist();
-        return "redirect:/parentAnnotations/" + encodeUrlPathSegment(parentAnnotation.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ParentAnnotationController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ParentAnnotation());
-        return "parentAnnotations/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ParentAnnotationController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("parentannotation", ParentAnnotation.findParentAnnotation(id));
-        uiModel.addAttribute("itemId", id);
-        return "parentAnnotations/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ParentAnnotationController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("parentannotations", ParentAnnotation.findParentAnnotationEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ParentAnnotation.countParentAnnotations() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("parentannotations", ParentAnnotation.findAllParentAnnotations(sortFieldName, sortOrder));
-        }
-        return "parentAnnotations/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ParentAnnotationController.update(@Valid ParentAnnotation parentAnnotation, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, parentAnnotation);
-            return "parentAnnotations/update";
-        }
-        uiModel.asMap().clear();
-        parentAnnotation.merge();
-        return "redirect:/parentAnnotations/" + encodeUrlPathSegment(parentAnnotation.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ParentAnnotationController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ParentAnnotation.findParentAnnotation(id));
-        return "parentAnnotations/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ParentAnnotationController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ParentAnnotation parentAnnotation = ParentAnnotation.findParentAnnotation(id);
-        parentAnnotation.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/parentAnnotations";
-    }
-    
-    void ParentAnnotationController.populateEditForm(Model uiModel, ParentAnnotation parentAnnotation) {
-        uiModel.addAttribute("parentAnnotation", parentAnnotation);
-    }
-    
-    String ParentAnnotationController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ParentAnnotationController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/ParentAnnotationController_Roo_Controller_Finder.aj
deleted file mode 100644
index 27c4913e7..000000000
--- a/src/main/java/com/labsynch/labseer/web/ParentAnnotationController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ParentAnnotation;
-import com.labsynch.labseer.web.ParentAnnotationController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect ParentAnnotationController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByCodeEquals", "form" }, method = RequestMethod.GET)
-    public String ParentAnnotationController.findParentAnnotationsByCodeEqualsForm(Model uiModel) {
-        return "parentAnnotations/findParentAnnotationsByCodeEquals";
-    }
-    
-    @RequestMapping(params = "find=ByCodeEquals", method = RequestMethod.GET)
-    public String ParentAnnotationController.findParentAnnotationsByCodeEquals(@RequestParam("code") String code, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("parentannotations", ParentAnnotation.findParentAnnotationsByCodeEquals(code, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ParentAnnotation.countFindParentAnnotationsByCodeEquals(code) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("parentannotations", ParentAnnotation.findParentAnnotationsByCodeEquals(code, sortFieldName, sortOrder).getResultList());
-        }
-        return "parentAnnotations/list";
-    }
-    
-}

From daf5ad41c12e9d0509cd1502c2f7f07294017378 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 27 Apr 2022 09:15:16 -0700
Subject: [PATCH 37/73] Add back transactional

---
 .../com/labsynch/labseer/api/ApiCompoundTypeController.java     | 2 ++
 src/main/java/com/labsynch/labseer/api/ApiSaltController.java   | 2 ++
 .../com/labsynch/labseer/api/ApiSolutionUnitController.java     | 1 +
 3 files changed, 5 insertions(+)

diff --git a/src/main/java/com/labsynch/labseer/api/ApiCompoundTypeController.java b/src/main/java/com/labsynch/labseer/api/ApiCompoundTypeController.java
index 0a46d1df4..386e1f88d 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiCompoundTypeController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiCompoundTypeController.java
@@ -5,6 +5,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -12,6 +13,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 @RequestMapping(value = {"/api/v1/compoundTypes"})
+@Transactional
 @Controller
 public class ApiCompoundTypeController {
 
diff --git a/src/main/java/com/labsynch/labseer/api/ApiSaltController.java b/src/main/java/com/labsynch/labseer/api/ApiSaltController.java
index 329d40b65..16c583d75 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiSaltController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSaltController.java
@@ -22,6 +22,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -35,6 +36,7 @@
 import org.springframework.web.util.WebUtils;
 
 @RequestMapping(value = {"/api/v1/salts"})
+@Transactional
 @Controller
 public class ApiSaltController {
 	
diff --git a/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java b/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java
index 651430af6..77e49bfe2 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java
@@ -37,6 +37,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 @RequestMapping(value = {"/api/v1/solutionUnits"})
+@Transactional
 @Controller
 public class ApiSolutionUnitController {
 

From d94e236e2d61c983629b4b759631ba1677a7b51e Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 27 Apr 2022 09:25:31 -0700
Subject: [PATCH 38/73] Physical state controller

---
 .../ApiPhysicalStateController.java}          |  9 +--
 .../PhysicalStateController_Roo_Controller.aj | 16 -----
 ...alStateController_Roo_Controller_Finder.aj | 72 -------------------
 3 files changed, 3 insertions(+), 94 deletions(-)
 rename src/main/java/com/labsynch/labseer/{web/PhysicalStateController.java => api/ApiPhysicalStateController.java} (97%)
 delete mode 100644 src/main/java/com/labsynch/labseer/web/PhysicalStateController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/PhysicalStateController_Roo_Controller_Finder.aj

diff --git a/src/main/java/com/labsynch/labseer/web/PhysicalStateController.java b/src/main/java/com/labsynch/labseer/api/ApiPhysicalStateController.java
similarity index 97%
rename from src/main/java/com/labsynch/labseer/web/PhysicalStateController.java
rename to src/main/java/com/labsynch/labseer/api/ApiPhysicalStateController.java
index a761ce754..d9a50b706 100755
--- a/src/main/java/com/labsynch/labseer/web/PhysicalStateController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiPhysicalStateController.java
@@ -1,4 +1,4 @@
-package com.labsynch.labseer.web;
+package com.labsynch.labseer.api;
 import java.io.UnsupportedEncodingException;
 import java.util.Collection;
 
@@ -29,13 +29,10 @@
 import com.labsynch.labseer.utils.PropertiesUtilService;
 import org.springframework.beans.factory.annotation.Autowired;
 
-@RooWebScaffold(path = "physicalstates", formBackingObject = PhysicalState.class)
-@RequestMapping({ "/physicalstates", "/physicalStates" })
+@RequestMapping(value = {"/api/v1/physicalStates"})
 @Transactional
 @Controller
-
-@RooWebFinder
-public class PhysicalStateController {
+public class ApiPhysicalStateController {
 	
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
diff --git a/src/main/java/com/labsynch/labseer/web/PhysicalStateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/PhysicalStateController_Roo_Controller.aj
deleted file mode 100644
index 7596b4417..000000000
--- a/src/main/java/com/labsynch/labseer/web/PhysicalStateController_Roo_Controller.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.PhysicalState;
-import com.labsynch.labseer.web.PhysicalStateController;
-import org.springframework.ui.Model;
-
-privileged aspect PhysicalStateController_Roo_Controller {
-    
-    void PhysicalStateController.populateEditForm(Model uiModel, PhysicalState physicalState) {
-        uiModel.addAttribute("physicalState", physicalState);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/PhysicalStateController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/PhysicalStateController_Roo_Controller_Finder.aj
deleted file mode 100644
index fa6b5cc4c..000000000
--- a/src/main/java/com/labsynch/labseer/web/PhysicalStateController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,72 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.PhysicalState;
-import com.labsynch.labseer.web.PhysicalStateController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect PhysicalStateController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByCodeEquals", "form" }, method = RequestMethod.GET)
-    public String PhysicalStateController.findPhysicalStatesByCodeEqualsForm(Model uiModel) {
-        return "physicalstates/findPhysicalStatesByCodeEquals";
-    }
-    
-    @RequestMapping(params = "find=ByCodeEquals", method = RequestMethod.GET)
-    public String PhysicalStateController.findPhysicalStatesByCodeEquals(@RequestParam("code") String code, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("physicalstates", PhysicalState.findPhysicalStatesByCodeEquals(code, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) PhysicalState.countFindPhysicalStatesByCodeEquals(code) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("physicalstates", PhysicalState.findPhysicalStatesByCodeEquals(code, sortFieldName, sortOrder).getResultList());
-        }
-        return "physicalstates/list";
-    }
-    
-    @RequestMapping(params = { "find=ByNameEquals", "form" }, method = RequestMethod.GET)
-    public String PhysicalStateController.findPhysicalStatesByNameEqualsForm(Model uiModel) {
-        return "physicalstates/findPhysicalStatesByNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByNameEquals", method = RequestMethod.GET)
-    public String PhysicalStateController.findPhysicalStatesByNameEquals(@RequestParam("name") String name, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("physicalstates", PhysicalState.findPhysicalStatesByNameEquals(name, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) PhysicalState.countFindPhysicalStatesByNameEquals(name) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("physicalstates", PhysicalState.findPhysicalStatesByNameEquals(name, sortFieldName, sortOrder).getResultList());
-        }
-        return "physicalstates/list";
-    }
-    
-    @RequestMapping(params = { "find=ByNameLike", "form" }, method = RequestMethod.GET)
-    public String PhysicalStateController.findPhysicalStatesByNameLikeForm(Model uiModel) {
-        return "physicalstates/findPhysicalStatesByNameLike";
-    }
-    
-    @RequestMapping(params = "find=ByNameLike", method = RequestMethod.GET)
-    public String PhysicalStateController.findPhysicalStatesByNameLike(@RequestParam("name") String name, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("physicalstates", PhysicalState.findPhysicalStatesByNameLike(name, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) PhysicalState.countFindPhysicalStatesByNameLike(name) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("physicalstates", PhysicalState.findPhysicalStatesByNameLike(name, sortFieldName, sortOrder).getResultList());
-        }
-        return "physicalstates/list";
-    }
-    
-}

From bc6a8a92e54867dfaa6621ec9a401557ec481bd4 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 27 Apr 2022 09:35:02 -0700
Subject: [PATCH 39/73] Operator controller

---
 .../ApiOperatorController.java}               |   9 +-
 .../web/OperatorController_Roo_Controller.aj  | 100 ------------------
 ...peratorController_Roo_Controller_Finder.aj |  53 ----------
 3 files changed, 3 insertions(+), 159 deletions(-)
 rename src/main/java/com/labsynch/labseer/{web/OperatorController.java => api/ApiOperatorController.java} (97%)
 delete mode 100644 src/main/java/com/labsynch/labseer/web/OperatorController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/OperatorController_Roo_Controller_Finder.aj

diff --git a/src/main/java/com/labsynch/labseer/web/OperatorController.java b/src/main/java/com/labsynch/labseer/api/ApiOperatorController.java
similarity index 97%
rename from src/main/java/com/labsynch/labseer/web/OperatorController.java
rename to src/main/java/com/labsynch/labseer/api/ApiOperatorController.java
index 4e34f9e2e..64a4dc22a 100755
--- a/src/main/java/com/labsynch/labseer/web/OperatorController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiOperatorController.java
@@ -1,4 +1,4 @@
-package com.labsynch.labseer.web;
+package com.labsynch.labseer.api;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -14,13 +14,10 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import com.labsynch.labseer.domain.Operator;
 
-@RooWebScaffold(path = "operators", formBackingObject = Operator.class)
-@RequestMapping("/operators")
+@RequestMapping(value = {"/api/v1/operators"})
 @Transactional
 @Controller
-
-@RooWebFinder
-public class OperatorController {
+public class ApiOperatorController {
 
     @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
diff --git a/src/main/java/com/labsynch/labseer/web/OperatorController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/OperatorController_Roo_Controller.aj
deleted file mode 100644
index 2a3b7a6b1..000000000
--- a/src/main/java/com/labsynch/labseer/web/OperatorController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Operator;
-import com.labsynch.labseer.web.OperatorController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect OperatorController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String OperatorController.create(@Valid Operator operator, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, operator);
-            return "operators/create";
-        }
-        uiModel.asMap().clear();
-        operator.persist();
-        return "redirect:/operators/" + encodeUrlPathSegment(operator.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String OperatorController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new Operator());
-        return "operators/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String OperatorController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("operator", Operator.findOperator(id));
-        uiModel.addAttribute("itemId", id);
-        return "operators/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String OperatorController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("operators", Operator.findOperatorEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) Operator.countOperators() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("operators", Operator.findAllOperators(sortFieldName, sortOrder));
-        }
-        return "operators/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String OperatorController.update(@Valid Operator operator, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, operator);
-            return "operators/update";
-        }
-        uiModel.asMap().clear();
-        operator.merge();
-        return "redirect:/operators/" + encodeUrlPathSegment(operator.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String OperatorController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, Operator.findOperator(id));
-        return "operators/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String OperatorController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        Operator operator = Operator.findOperator(id);
-        operator.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/operators";
-    }
-    
-    void OperatorController.populateEditForm(Model uiModel, Operator operator) {
-        uiModel.addAttribute("operator", operator);
-    }
-    
-    String OperatorController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/OperatorController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/OperatorController_Roo_Controller_Finder.aj
deleted file mode 100644
index 416723ae3..000000000
--- a/src/main/java/com/labsynch/labseer/web/OperatorController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,53 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Operator;
-import com.labsynch.labseer.web.OperatorController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect OperatorController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByCodeEquals", "form" }, method = RequestMethod.GET)
-    public String OperatorController.findOperatorsByCodeEqualsForm(Model uiModel) {
-        return "operators/findOperatorsByCodeEquals";
-    }
-    
-    @RequestMapping(params = "find=ByCodeEquals", method = RequestMethod.GET)
-    public String OperatorController.findOperatorsByCodeEquals(@RequestParam("code") String code, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("operators", Operator.findOperatorsByCodeEquals(code, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Operator.countFindOperatorsByCodeEquals(code) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("operators", Operator.findOperatorsByCodeEquals(code, sortFieldName, sortOrder).getResultList());
-        }
-        return "operators/list";
-    }
-    
-    @RequestMapping(params = { "find=ByNameEquals", "form" }, method = RequestMethod.GET)
-    public String OperatorController.findOperatorsByNameEqualsForm(Model uiModel) {
-        return "operators/findOperatorsByNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByNameEquals", method = RequestMethod.GET)
-    public String OperatorController.findOperatorsByNameEquals(@RequestParam("name") String name, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("operators", Operator.findOperatorsByNameEquals(name, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Operator.countFindOperatorsByNameEquals(name) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("operators", Operator.findOperatorsByNameEquals(name, sortFieldName, sortOrder).getResultList());
-        }
-        return "operators/list";
-    }
-    
-}

From dc6b15772f6e01bd52b7872f45a6b8d44e34cb6a Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 27 Apr 2022 09:39:14 -0700
Subject: [PATCH 40/73] Purity measured by controller

---
 .../ApiPurityMeasuredByController.java}       |   7 +-
 ...rityMeasuredByController_Roo_Controller.aj | 100 ------------------
 ...suredByController_Roo_Controller_Finder.aj |  72 -------------
 ...easuredByController_Roo_Controller_Json.aj |  53 ----------
 4 files changed, 2 insertions(+), 230 deletions(-)
 rename src/main/java/com/labsynch/labseer/{web/PurityMeasuredByController.java => api/ApiPurityMeasuredByController.java} (96%)
 delete mode 100644 src/main/java/com/labsynch/labseer/web/PurityMeasuredByController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/PurityMeasuredByController_Roo_Controller_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/PurityMeasuredByController_Roo_Controller_Json.aj

diff --git a/src/main/java/com/labsynch/labseer/web/PurityMeasuredByController.java b/src/main/java/com/labsynch/labseer/api/ApiPurityMeasuredByController.java
similarity index 96%
rename from src/main/java/com/labsynch/labseer/web/PurityMeasuredByController.java
rename to src/main/java/com/labsynch/labseer/api/ApiPurityMeasuredByController.java
index efcdaa486..3731fbb95 100755
--- a/src/main/java/com/labsynch/labseer/web/PurityMeasuredByController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiPurityMeasuredByController.java
@@ -22,13 +22,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 
 
-@RequestMapping({"/puritymeasuredbys","/purityMeasuredBys"})
+@RequestMapping(value = {"/api/v1/purityMeasuredBys"})
 @Controller
 
-@RooWebJson(jsonObject = PurityMeasuredBy.class)
-@RooWebScaffold(path = "puritymeasuredbys", formBackingObject = PurityMeasuredBy.class)
-@RooWebFinder
-public class PurityMeasuredByController {
+public class ApiPurityMeasuredByController {
 
 
 	@Autowired
diff --git a/src/main/java/com/labsynch/labseer/web/PurityMeasuredByController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/PurityMeasuredByController_Roo_Controller.aj
deleted file mode 100644
index c5929897b..000000000
--- a/src/main/java/com/labsynch/labseer/web/PurityMeasuredByController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.PurityMeasuredBy;
-import com.labsynch.labseer.web.PurityMeasuredByController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect PurityMeasuredByController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String PurityMeasuredByController.create(@Valid PurityMeasuredBy purityMeasuredBy, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, purityMeasuredBy);
-            return "puritymeasuredbys/create";
-        }
-        uiModel.asMap().clear();
-        purityMeasuredBy.persist();
-        return "redirect:/puritymeasuredbys/" + encodeUrlPathSegment(purityMeasuredBy.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String PurityMeasuredByController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new PurityMeasuredBy());
-        return "puritymeasuredbys/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String PurityMeasuredByController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("puritymeasuredby", PurityMeasuredBy.findPurityMeasuredBy(id));
-        uiModel.addAttribute("itemId", id);
-        return "puritymeasuredbys/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String PurityMeasuredByController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("puritymeasuredbys", PurityMeasuredBy.findPurityMeasuredByEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) PurityMeasuredBy.countPurityMeasuredBys() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("puritymeasuredbys", PurityMeasuredBy.findAllPurityMeasuredBys(sortFieldName, sortOrder));
-        }
-        return "puritymeasuredbys/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String PurityMeasuredByController.update(@Valid PurityMeasuredBy purityMeasuredBy, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, purityMeasuredBy);
-            return "puritymeasuredbys/update";
-        }
-        uiModel.asMap().clear();
-        purityMeasuredBy.merge();
-        return "redirect:/puritymeasuredbys/" + encodeUrlPathSegment(purityMeasuredBy.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String PurityMeasuredByController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, PurityMeasuredBy.findPurityMeasuredBy(id));
-        return "puritymeasuredbys/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String PurityMeasuredByController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        PurityMeasuredBy purityMeasuredBy = PurityMeasuredBy.findPurityMeasuredBy(id);
-        purityMeasuredBy.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/puritymeasuredbys";
-    }
-    
-    void PurityMeasuredByController.populateEditForm(Model uiModel, PurityMeasuredBy purityMeasuredBy) {
-        uiModel.addAttribute("purityMeasuredBy", purityMeasuredBy);
-    }
-    
-    String PurityMeasuredByController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/PurityMeasuredByController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/PurityMeasuredByController_Roo_Controller_Finder.aj
deleted file mode 100644
index b7a7e6359..000000000
--- a/src/main/java/com/labsynch/labseer/web/PurityMeasuredByController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,72 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.PurityMeasuredBy;
-import com.labsynch.labseer.web.PurityMeasuredByController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect PurityMeasuredByController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByCodeEquals", "form" }, method = RequestMethod.GET)
-    public String PurityMeasuredByController.findPurityMeasuredBysByCodeEqualsForm(Model uiModel) {
-        return "puritymeasuredbys/findPurityMeasuredBysByCodeEquals";
-    }
-    
-    @RequestMapping(params = "find=ByCodeEquals", method = RequestMethod.GET)
-    public String PurityMeasuredByController.findPurityMeasuredBysByCodeEquals(@RequestParam("code") String code, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("puritymeasuredbys", PurityMeasuredBy.findPurityMeasuredBysByCodeEquals(code, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) PurityMeasuredBy.countFindPurityMeasuredBysByCodeEquals(code) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("puritymeasuredbys", PurityMeasuredBy.findPurityMeasuredBysByCodeEquals(code, sortFieldName, sortOrder).getResultList());
-        }
-        return "puritymeasuredbys/list";
-    }
-    
-    @RequestMapping(params = { "find=ByNameEquals", "form" }, method = RequestMethod.GET)
-    public String PurityMeasuredByController.findPurityMeasuredBysByNameEqualsForm(Model uiModel) {
-        return "puritymeasuredbys/findPurityMeasuredBysByNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByNameEquals", method = RequestMethod.GET)
-    public String PurityMeasuredByController.findPurityMeasuredBysByNameEquals(@RequestParam("name") String name, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("puritymeasuredbys", PurityMeasuredBy.findPurityMeasuredBysByNameEquals(name, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) PurityMeasuredBy.countFindPurityMeasuredBysByNameEquals(name) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("puritymeasuredbys", PurityMeasuredBy.findPurityMeasuredBysByNameEquals(name, sortFieldName, sortOrder).getResultList());
-        }
-        return "puritymeasuredbys/list";
-    }
-    
-    @RequestMapping(params = { "find=ByNameLike", "form" }, method = RequestMethod.GET)
-    public String PurityMeasuredByController.findPurityMeasuredBysByNameLikeForm(Model uiModel) {
-        return "puritymeasuredbys/findPurityMeasuredBysByNameLike";
-    }
-    
-    @RequestMapping(params = "find=ByNameLike", method = RequestMethod.GET)
-    public String PurityMeasuredByController.findPurityMeasuredBysByNameLike(@RequestParam("name") String name, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("puritymeasuredbys", PurityMeasuredBy.findPurityMeasuredBysByNameLike(name, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) PurityMeasuredBy.countFindPurityMeasuredBysByNameLike(name) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("puritymeasuredbys", PurityMeasuredBy.findPurityMeasuredBysByNameLike(name, sortFieldName, sortOrder).getResultList());
-        }
-        return "puritymeasuredbys/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/PurityMeasuredByController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/PurityMeasuredByController_Roo_Controller_Json.aj
deleted file mode 100644
index 5d40bedeb..000000000
--- a/src/main/java/com/labsynch/labseer/web/PurityMeasuredByController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,53 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.PurityMeasuredBy;
-import com.labsynch.labseer.web.PurityMeasuredByController;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-privileged aspect PurityMeasuredByController_Roo_Controller_Json {
-    
-    @RequestMapping(params = "find=ByCodeEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> PurityMeasuredByController.jsonFindPurityMeasuredBysByCodeEquals(@RequestParam("code") String code) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(PurityMeasuredBy.toJsonArray(PurityMeasuredBy.findPurityMeasuredBysByCodeEquals(code).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> PurityMeasuredByController.jsonFindPurityMeasuredBysByNameEquals(@RequestParam("name") String name) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(PurityMeasuredBy.toJsonArray(PurityMeasuredBy.findPurityMeasuredBysByNameEquals(name).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByNameLike", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> PurityMeasuredByController.jsonFindPurityMeasuredBysByNameLike(@RequestParam("name") String name) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(PurityMeasuredBy.toJsonArray(PurityMeasuredBy.findPurityMeasuredBysByNameLike(name).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}

From 6aa3875f31e798c9592f4dd234a6967485549f64 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 27 Apr 2022 09:42:13 -0700
Subject: [PATCH 41/73] Remove unused vendor controller

---
 .../labseer/web/VendorController.java         | 152 ------------------
 .../web/VendorController_Roo_Controller.aj    | 100 ------------
 .../VendorController_Roo_Controller_Finder.aj |  91 -----------
 3 files changed, 343 deletions(-)
 delete mode 100755 src/main/java/com/labsynch/labseer/web/VendorController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/VendorController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/VendorController_Roo_Controller_Finder.aj

diff --git a/src/main/java/com/labsynch/labseer/web/VendorController.java b/src/main/java/com/labsynch/labseer/web/VendorController.java
deleted file mode 100755
index 2158c34e8..000000000
--- a/src/main/java/com/labsynch/labseer/web/VendorController.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import com.labsynch.labseer.domain.Vendor;
-
-import com.labsynch.labseer.utils.PropertiesUtilService;
-
-@RooWebScaffold(path = "vendors", formBackingObject = Vendor.class)
-@RequestMapping("/vendors")
-@Transactional
-@Controller
-@RooWebFinder
-public class VendorController {
-
-	@Autowired
-	private PropertiesUtilService propertiesUtilService;
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
-        Vendor vendor = Vendor.findVendor(id);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Type");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
-        headers.setExpires(0); // Expire the cache
-        if (vendor == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        return new ResponseEntity<String>(vendor.toJson(), headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Type");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
-        headers.setExpires(0); // Expire the cache
-        if (propertiesUtilService.getOrderSelectLists()) {
-            return new ResponseEntity<String>(Vendor.toJsonArray(Vendor.findAllVendors("name", "ASC")), headers, HttpStatus.OK);
-        } else {
-            return new ResponseEntity<String>(Vendor.toJsonArray(Vendor.findAllVendors()), headers, HttpStatus.OK);
-        }
-    }
-
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> createFromJson(@RequestBody String json) {
-        Vendor.fromJsonToVendor(json).persist();
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Type");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
-        headers.setExpires(0); // Expire the cache
-        return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-    }
-
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> createFromJsonArray(@RequestBody String json) {
-        for (Vendor vendor : Vendor.fromJsonArrayToVendors(json)) {
-            vendor.persist();
-        }
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Type");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
-        headers.setExpires(0); // Expire the cache
-        return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-    }
-
-    @RequestMapping(method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> updateFromJson(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Type");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
-        headers.setExpires(0); // Expire the cache
-        if (Vendor.fromJsonToVendor(json).merge() == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> updateFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Type");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
-        headers.setExpires(0); // Expire the cache
-        for (Vendor vendor : Vendor.fromJsonArrayToVendors(json)) {
-            if (vendor.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-        }
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
-        Vendor vendor = Vendor.findVendor(id);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Type");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
-        headers.setExpires(0); // Expire the cache
-        if (vendor == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        vendor.remove();
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(method = RequestMethod.OPTIONS)
-    public ResponseEntity<String> getOptions() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text");
-        headers.add("Access-Control-Allow-Headers", "Content-Type");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
-        headers.setExpires(0); // Expire the cache
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-}
diff --git a/src/main/java/com/labsynch/labseer/web/VendorController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/VendorController_Roo_Controller.aj
deleted file mode 100644
index e4538512c..000000000
--- a/src/main/java/com/labsynch/labseer/web/VendorController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Vendor;
-import com.labsynch.labseer.web.VendorController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect VendorController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String VendorController.create(@Valid Vendor vendor, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, vendor);
-            return "vendors/create";
-        }
-        uiModel.asMap().clear();
-        vendor.persist();
-        return "redirect:/vendors/" + encodeUrlPathSegment(vendor.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String VendorController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new Vendor());
-        return "vendors/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String VendorController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("vendor", Vendor.findVendor(id));
-        uiModel.addAttribute("itemId", id);
-        return "vendors/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String VendorController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("vendors", Vendor.findVendorEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) Vendor.countVendors() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("vendors", Vendor.findAllVendors(sortFieldName, sortOrder));
-        }
-        return "vendors/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String VendorController.update(@Valid Vendor vendor, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, vendor);
-            return "vendors/update";
-        }
-        uiModel.asMap().clear();
-        vendor.merge();
-        return "redirect:/vendors/" + encodeUrlPathSegment(vendor.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String VendorController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, Vendor.findVendor(id));
-        return "vendors/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String VendorController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        Vendor vendor = Vendor.findVendor(id);
-        vendor.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/vendors";
-    }
-    
-    void VendorController.populateEditForm(Model uiModel, Vendor vendor) {
-        uiModel.addAttribute("vendor", vendor);
-    }
-    
-    String VendorController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/VendorController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/VendorController_Roo_Controller_Finder.aj
deleted file mode 100644
index dec485713..000000000
--- a/src/main/java/com/labsynch/labseer/web/VendorController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,91 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Vendor;
-import com.labsynch.labseer.web.VendorController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect VendorController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByCodeEquals", "form" }, method = RequestMethod.GET)
-    public String VendorController.findVendorsByCodeEqualsForm(Model uiModel) {
-        return "vendors/findVendorsByCodeEquals";
-    }
-    
-    @RequestMapping(params = "find=ByCodeEquals", method = RequestMethod.GET)
-    public String VendorController.findVendorsByCodeEquals(@RequestParam("code") String code, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("vendors", Vendor.findVendorsByCodeEquals(code, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Vendor.countFindVendorsByCodeEquals(code) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("vendors", Vendor.findVendorsByCodeEquals(code, sortFieldName, sortOrder).getResultList());
-        }
-        return "vendors/list";
-    }
-    
-    @RequestMapping(params = { "find=ByCodeLike", "form" }, method = RequestMethod.GET)
-    public String VendorController.findVendorsByCodeLikeForm(Model uiModel) {
-        return "vendors/findVendorsByCodeLike";
-    }
-    
-    @RequestMapping(params = "find=ByCodeLike", method = RequestMethod.GET)
-    public String VendorController.findVendorsByCodeLike(@RequestParam("code") String code, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("vendors", Vendor.findVendorsByCodeLike(code, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Vendor.countFindVendorsByCodeLike(code) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("vendors", Vendor.findVendorsByCodeLike(code, sortFieldName, sortOrder).getResultList());
-        }
-        return "vendors/list";
-    }
-    
-    @RequestMapping(params = { "find=ByNameEquals", "form" }, method = RequestMethod.GET)
-    public String VendorController.findVendorsByNameEqualsForm(Model uiModel) {
-        return "vendors/findVendorsByNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByNameEquals", method = RequestMethod.GET)
-    public String VendorController.findVendorsByNameEquals(@RequestParam("name") String name, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("vendors", Vendor.findVendorsByNameEquals(name, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Vendor.countFindVendorsByNameEquals(name) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("vendors", Vendor.findVendorsByNameEquals(name, sortFieldName, sortOrder).getResultList());
-        }
-        return "vendors/list";
-    }
-    
-    @RequestMapping(params = { "find=ByNameLike", "form" }, method = RequestMethod.GET)
-    public String VendorController.findVendorsByNameLikeForm(Model uiModel) {
-        return "vendors/findVendorsByNameLike";
-    }
-    
-    @RequestMapping(params = "find=ByNameLike", method = RequestMethod.GET)
-    public String VendorController.findVendorsByNameLike(@RequestParam("name") String name, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("vendors", Vendor.findVendorsByNameLike(name, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Vendor.countFindVendorsByNameLike(name) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("vendors", Vendor.findVendorsByNameLike(name, sortFieldName, sortOrder).getResultList());
-        }
-        return "vendors/list";
-    }
-    
-}

From c3c537a837e9c79c283d1572ad57e6107d5a7fdd Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 27 Apr 2022 09:56:40 -0700
Subject: [PATCH 42/73] File type controller

---
 .../ApiFileTypeController.java}               |  10 +-
 .../web/FileTypeController_Roo_Controller.aj  | 100 ----------------
 ...ileTypeController_Roo_Controller_Finder.aj |  34 ------
 .../FileTypeController_Roo_Controller_Json.aj | 110 ------------------
 4 files changed, 3 insertions(+), 251 deletions(-)
 rename src/main/java/com/labsynch/labseer/{web/FileTypeController.java => api/ApiFileTypeController.java} (91%)
 delete mode 100644 src/main/java/com/labsynch/labseer/web/FileTypeController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/FileTypeController_Roo_Controller_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/FileTypeController_Roo_Controller_Json.aj

diff --git a/src/main/java/com/labsynch/labseer/web/FileTypeController.java b/src/main/java/com/labsynch/labseer/api/ApiFileTypeController.java
similarity index 91%
rename from src/main/java/com/labsynch/labseer/web/FileTypeController.java
rename to src/main/java/com/labsynch/labseer/api/ApiFileTypeController.java
index 978789380..afe2ea868 100755
--- a/src/main/java/com/labsynch/labseer/web/FileTypeController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiFileTypeController.java
@@ -1,4 +1,4 @@
-package com.labsynch.labseer.web;
+package com.labsynch.labseer.api;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.http.HttpHeaders;
@@ -19,13 +19,9 @@
 import com.labsynch.labseer.utils.PropertiesUtilService;
 import org.springframework.beans.factory.annotation.Autowired;
 
-@RequestMapping({"/filetypes", "/fileTypes"})
+@RequestMapping(value = {"/api/v1/fileTypes"})
 @Controller
-
-@RooWebJson(jsonObject = FileType.class)
-@RooWebScaffold(path = "filetypes", formBackingObject = FileType.class)
-@RooWebFinder
-public class FileTypeController {
+public class ApiFileTypeController {
 	
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
diff --git a/src/main/java/com/labsynch/labseer/web/FileTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/FileTypeController_Roo_Controller.aj
deleted file mode 100644
index 73bf10b64..000000000
--- a/src/main/java/com/labsynch/labseer/web/FileTypeController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.FileType;
-import com.labsynch.labseer.web.FileTypeController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect FileTypeController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String FileTypeController.create(@Valid FileType fileType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, fileType);
-            return "filetypes/create";
-        }
-        uiModel.asMap().clear();
-        fileType.persist();
-        return "redirect:/filetypes/" + encodeUrlPathSegment(fileType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String FileTypeController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new FileType());
-        return "filetypes/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String FileTypeController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("filetype", FileType.findFileType(id));
-        uiModel.addAttribute("itemId", id);
-        return "filetypes/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String FileTypeController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("filetypes", FileType.findFileTypeEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) FileType.countFileTypes() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("filetypes", FileType.findAllFileTypes(sortFieldName, sortOrder));
-        }
-        return "filetypes/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String FileTypeController.update(@Valid FileType fileType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, fileType);
-            return "filetypes/update";
-        }
-        uiModel.asMap().clear();
-        fileType.merge();
-        return "redirect:/filetypes/" + encodeUrlPathSegment(fileType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String FileTypeController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, FileType.findFileType(id));
-        return "filetypes/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String FileTypeController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        FileType fileType = FileType.findFileType(id);
-        fileType.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/filetypes";
-    }
-    
-    void FileTypeController.populateEditForm(Model uiModel, FileType fileType) {
-        uiModel.addAttribute("fileType", fileType);
-    }
-    
-    String FileTypeController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/FileTypeController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/FileTypeController_Roo_Controller_Finder.aj
deleted file mode 100644
index 7545d460a..000000000
--- a/src/main/java/com/labsynch/labseer/web/FileTypeController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.FileType;
-import com.labsynch.labseer.web.FileTypeController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect FileTypeController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByCodeEquals", "form" }, method = RequestMethod.GET)
-    public String FileTypeController.findFileTypesByCodeEqualsForm(Model uiModel) {
-        return "filetypes/findFileTypesByCodeEquals";
-    }
-    
-    @RequestMapping(params = "find=ByCodeEquals", method = RequestMethod.GET)
-    public String FileTypeController.findFileTypesByCodeEquals(@RequestParam("code") String code, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("filetypes", FileType.findFileTypesByCodeEquals(code, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) FileType.countFindFileTypesByCodeEquals(code) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("filetypes", FileType.findFileTypesByCodeEquals(code, sortFieldName, sortOrder).getResultList());
-        }
-        return "filetypes/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/FileTypeController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/FileTypeController_Roo_Controller_Json.aj
deleted file mode 100644
index 7eef91541..000000000
--- a/src/main/java/com/labsynch/labseer/web/FileTypeController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,110 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.FileType;
-import com.labsynch.labseer.web.FileTypeController;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect FileTypeController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> FileTypeController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            FileType fileType = FileType.findFileType(id);
-            if (fileType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(fileType.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> FileTypeController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            FileType fileType = FileType.fromJsonToFileType(json);
-            fileType.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+fileType.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> FileTypeController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (FileType fileType: FileType.fromJsonArrayToFileTypes(json)) {
-                fileType.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> FileTypeController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            FileType fileType = FileType.fromJsonToFileType(json);
-            fileType.setId(id);
-            if (fileType.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> FileTypeController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            FileType fileType = FileType.findFileType(id);
-            if (fileType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            fileType.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByCodeEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> FileTypeController.jsonFindFileTypesByCodeEquals(@RequestParam("code") String code) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(FileType.toJsonArray(FileType.findFileTypesByCodeEquals(code).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}

From b45361437d7985f285946b8cec76649a50fb0f12 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 27 Apr 2022 11:25:45 -0700
Subject: [PATCH 43/73] File save controller

---
 .../ApiFileSaveController.java}                          | 9 ++++-----
 .../java/com/labsynch/labseer/utils/MimeTypeUtil.java    | 4 ++--
 .../com/labsynch/labseer/web/ExportSDFController.java    | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)
 rename src/main/java/com/labsynch/labseer/{web/FileSaveController.java => api/ApiFileSaveController.java} (96%)

diff --git a/src/main/java/com/labsynch/labseer/web/FileSaveController.java b/src/main/java/com/labsynch/labseer/api/ApiFileSaveController.java
similarity index 96%
rename from src/main/java/com/labsynch/labseer/web/FileSaveController.java
rename to src/main/java/com/labsynch/labseer/api/ApiFileSaveController.java
index 1ff1b7cd4..593fded22 100755
--- a/src/main/java/com/labsynch/labseer/web/FileSaveController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiFileSaveController.java
@@ -1,4 +1,4 @@
-package com.labsynch.labseer.web;
+package com.labsynch.labseer.api;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -35,15 +35,14 @@
 import com.labsynch.labseer.dto.FileSaveSendDTO;
 import com.labsynch.labseer.utils.MimeTypeUtil;
 
-@RooWebScaffold(path = "filesave", formBackingObject = FileSaveSendDTO.class)
-@RequestMapping({"/filesave", "/MultipleFilePicker"})
+@RequestMapping({"/api/v1/filesave", "/api/v1/MultipleFilePicker"})
 @Controller
-public class FileSaveController {
+public class ApiFileSaveController {
 
 	//simplified controller. This will just save the file to the directory path
 	//does not save the database info
 
-	private static final Logger logger = LoggerFactory.getLogger(FileSaveController.class);
+	private static final Logger logger = LoggerFactory.getLogger(ApiFileSaveController.class);
 
 	@RequestMapping(method = RequestMethod.POST)
 	public HttpEntity<String> create(@RequestParam("description[]") List<String> description,
diff --git a/src/main/java/com/labsynch/labseer/utils/MimeTypeUtil.java b/src/main/java/com/labsynch/labseer/utils/MimeTypeUtil.java
index 0d193ef9e..912bf6e81 100755
--- a/src/main/java/com/labsynch/labseer/utils/MimeTypeUtil.java
+++ b/src/main/java/com/labsynch/labseer/utils/MimeTypeUtil.java
@@ -7,7 +7,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.labsynch.labseer.web.FileSaveController;
+import com.labsynch.labseer.api.ApiFileSaveController;
 
 public class MimeTypeUtil {
 
@@ -23,7 +23,7 @@ public static String getContentTypeFromExtension(String originalFilename) {
 			String fileExtension = getFileExtension(originalFilename);
 			logger.debug("here is the file extension: " + fileExtension);
 			try {
-				mimeTypeStream = FileSaveController.class.getClassLoader().getResourceAsStream(MIME_PROP_FILE);
+				mimeTypeStream = ApiFileSaveController.class.getClassLoader().getResourceAsStream(MIME_PROP_FILE);
 				Properties mimeTypeProps = new Properties();
 				mimeTypeProps.load(mimeTypeStream);
 				contentType = mimeTypeProps.getProperty(fileExtension);
diff --git a/src/main/java/com/labsynch/labseer/web/ExportSDFController.java b/src/main/java/com/labsynch/labseer/web/ExportSDFController.java
index b8c3eb9fd..d28c0828d 100755
--- a/src/main/java/com/labsynch/labseer/web/ExportSDFController.java
+++ b/src/main/java/com/labsynch/labseer/web/ExportSDFController.java
@@ -23,7 +23,7 @@
 @Controller
 public class ExportSDFController {
 
-	private static final Logger logger = LoggerFactory.getLogger(FileSaveController.class);
+	private static final Logger logger = LoggerFactory.getLogger(ExportSDFController.class);
 
 	@Autowired
 	private StructureImageService structureImageService;

From ce239564c519f4f43261979d430a304d05566880 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 27 Apr 2022 11:41:33 -0700
Subject: [PATCH 44/73] Metalot controller

---
 .../ApiMetalotController.java}                           | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
 rename src/main/java/com/labsynch/labseer/{web/MetalotController.java => api/ApiMetalotController.java} (97%)

diff --git a/src/main/java/com/labsynch/labseer/web/MetalotController.java b/src/main/java/com/labsynch/labseer/api/ApiMetalotController.java
similarity index 97%
rename from src/main/java/com/labsynch/labseer/web/MetalotController.java
rename to src/main/java/com/labsynch/labseer/api/ApiMetalotController.java
index 12c8708cd..396806213 100755
--- a/src/main/java/com/labsynch/labseer/web/MetalotController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiMetalotController.java
@@ -1,4 +1,4 @@
-package com.labsynch.labseer.web;
+package com.labsynch.labseer.api;
 
 import java.io.UnsupportedEncodingException;
 import java.util.List;
@@ -36,11 +36,10 @@
 import com.labsynch.labseer.service.ErrorMessage;
 import com.labsynch.labseer.service.MetalotService;
 
-@RooWebScaffold(path = "metalots", formBackingObject = Metalot.class)
-@RequestMapping("/metalots")
+@RequestMapping(value="/api/v1/metalots")
 @Controller
 //@Transactional
-public class MetalotController {
+public class ApiMetalotController {
 		
 	@Autowired
 	private MetalotService metalotService;
@@ -48,7 +47,7 @@ public class MetalotController {
 	@Autowired
 	private ChemStructureService chemStructService;
 	
-	private static final Logger logger = LoggerFactory.getLogger(MetalotController.class);
+	private static final Logger logger = LoggerFactory.getLogger(ApiMetalotController.class);
 
 	@Transactional
 	@RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")

From c23e446539fbdd22e449815b6df2f3bfa3ed998e Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 27 Apr 2022 12:25:09 -0700
Subject: [PATCH 45/73] Search form controller

---
 .../ApiSearchFormController.java}                           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename src/main/java/com/labsynch/labseer/{web/SearchFormController.java => api/ApiSearchFormController.java} (97%)

diff --git a/src/main/java/com/labsynch/labseer/web/SearchFormController.java b/src/main/java/com/labsynch/labseer/api/ApiSearchFormController.java
similarity index 97%
rename from src/main/java/com/labsynch/labseer/web/SearchFormController.java
rename to src/main/java/com/labsynch/labseer/api/ApiSearchFormController.java
index 568bedcbf..8c3cc6d13 100755
--- a/src/main/java/com/labsynch/labseer/web/SearchFormController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSearchFormController.java
@@ -1,4 +1,4 @@
-package com.labsynch.labseer.web;
+package com.labsynch.labseer.api;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -25,9 +25,9 @@
 //@RooWebScaffold(path = "searchforms", formBackingObject = SearchForm.class)
 @RequestMapping(value = {"/searchforms", "/search"})
 @Controller
-public class SearchFormController {
+public class ApiSearchFormController {
 	
-	Logger logger = LoggerFactory.getLogger(SearchFormController.class);
+	Logger logger = LoggerFactory.getLogger(ApiSearchFormController.class);
 
 	
 	

From a6e018d4295feaf8c3a1123b591f6627a8fe0ec2 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 27 Apr 2022 12:31:45 -0700
Subject: [PATCH 46/73] Fix api/v1 path for search form controller

---
 .../java/com/labsynch/labseer/api/ApiSearchFormController.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/labsynch/labseer/api/ApiSearchFormController.java b/src/main/java/com/labsynch/labseer/api/ApiSearchFormController.java
index 8c3cc6d13..67101ade8 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiSearchFormController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSearchFormController.java
@@ -23,7 +23,7 @@
 import com.labsynch.labseer.service.SearchFormService;
 
 //@RooWebScaffold(path = "searchforms", formBackingObject = SearchForm.class)
-@RequestMapping(value = {"/searchforms", "/search"})
+@RequestMapping(value = {"/api/v1/searchforms", "/api/v1/search"})
 @Controller
 public class ApiSearchFormController {
 	

From 592ba7ec1e9970134c4f6894db759ab0cda677b9 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 27 Apr 2022 12:31:56 -0700
Subject: [PATCH 47/73] Reg search controller

---
 .../ApiRegSearchController.java}                          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename src/main/java/com/labsynch/labseer/{web/RegSearchController.java => api/ApiRegSearchController.java} (94%)

diff --git a/src/main/java/com/labsynch/labseer/web/RegSearchController.java b/src/main/java/com/labsynch/labseer/api/ApiRegSearchController.java
similarity index 94%
rename from src/main/java/com/labsynch/labseer/web/RegSearchController.java
rename to src/main/java/com/labsynch/labseer/api/ApiRegSearchController.java
index e6070aad7..a7efc0692 100755
--- a/src/main/java/com/labsynch/labseer/web/RegSearchController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiRegSearchController.java
@@ -1,4 +1,4 @@
-package com.labsynch.labseer.web;
+package com.labsynch.labseer.api;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -25,14 +25,14 @@
 import com.labsynch.labseer.service.RegSearchService;
 
 //@RooWebScaffold(path = "regsearches", formBackingObject = RegSearch.class)
-@RequestMapping(value ={"/regsearches", "/regSearches"})
+@RequestMapping(value ={"/api/v1/regsearches", "/api/v1/regSearches"})
 @Controller
-public class RegSearchController {
+public class ApiRegSearchController {
 	
 	@Autowired
 	private RegSearchService regSearchService;
 	
-	Logger logger = LoggerFactory.getLogger(RegSearchController.class);
+	Logger logger = LoggerFactory.getLogger(ApiRegSearchController.class);
 
 
 	String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {

From 14737154d23886dbb217fc6a028dcba572e09ee6 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 27 Apr 2022 12:39:47 -0700
Subject: [PATCH 48/73] Structure image controller

---
 .../ApiStructureImageController.java}                     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename src/main/java/com/labsynch/labseer/{web/StructureImageController.java => api/ApiStructureImageController.java} (98%)

diff --git a/src/main/java/com/labsynch/labseer/web/StructureImageController.java b/src/main/java/com/labsynch/labseer/api/ApiStructureImageController.java
similarity index 98%
rename from src/main/java/com/labsynch/labseer/web/StructureImageController.java
rename to src/main/java/com/labsynch/labseer/api/ApiStructureImageController.java
index e35c35f23..7ed9fab0f 100755
--- a/src/main/java/com/labsynch/labseer/web/StructureImageController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiStructureImageController.java
@@ -1,4 +1,4 @@
-package com.labsynch.labseer.web;
+package com.labsynch.labseer.api;
 
 import java.util.List;
 
@@ -24,12 +24,12 @@
 import com.labsynch.labseer.domain.StandardizationDryRunCompound;
 import com.labsynch.labseer.service.StructureImageService;
 
-@RequestMapping("/structureimage")
+@RequestMapping("/api/v1/structureimage")
 @Controller
 @Transactional
-public class StructureImageController {
+public class ApiStructureImageController {
 
-    Logger logger = LoggerFactory.getLogger(StructureImageController.class);
+    Logger logger = LoggerFactory.getLogger(ApiStructureImageController.class);
 
     @Autowired
     private StructureImageService structureImageService;

From 3d27c13d37f84c8a49b5733a3488e091eec7c536 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Wed, 27 Apr 2022 13:26:11 -0700
Subject: [PATCH 49/73] Fix package

---
 .../com/labsynch/labseer/api/ApiPurityMeasuredByController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/labsynch/labseer/api/ApiPurityMeasuredByController.java b/src/main/java/com/labsynch/labseer/api/ApiPurityMeasuredByController.java
index 3731fbb95..70ebb58b6 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiPurityMeasuredByController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiPurityMeasuredByController.java
@@ -1,4 +1,4 @@
-package com.labsynch.labseer.web;
+package com.labsynch.labseer.api;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.http.HttpHeaders;

From c8c276ab703216455e0f4136006b5e1ab9a87462 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Thu, 28 Apr 2022 15:50:16 -0700
Subject: [PATCH 50/73] Remove unused web controllers

---
 .../labseer/api/ApiAuthorController.java      |  17 +-
 .../labseer/api/ApiAuthorRoleController.java  |   3 +-
 .../api/ApiTreatmentGroupController.java      |   3 +-
 .../com/labsynch/labseer/domain/FileList.java |   4 +-
 .../labseer/web/AnalysisGroupController.java  |  40 --
 .../AnalysisGroupController_Roo_Controller.aj | 120 -----
 ...isGroupController_Roo_Controller_Finder.aj |  79 ----
 ...ysisGroupController_Roo_Controller_Json.aj | 150 -------
 .../web/AnalysisGroupLabelController.java     |  31 --
 ...ysisGroupLabelController_Roo_Controller.aj | 119 -----
 ...upLabelController_Roo_Controller_Finder.aj |  57 ---
 ...roupLabelController_Roo_Controller_Json.aj | 137 ------
 .../web/AnalysisGroupStateController.java     |  50 ---
 ...ysisGroupStateController_Roo_Controller.aj | 121 -----
 ...upStateController_Roo_Controller_Finder.aj | 118 -----
 ...roupStateController_Roo_Controller_Json.aj | 173 --------
 .../AnalysisGroupValueBaseDTOController.java  |  13 -
 .../web/AnalysisGroupValueController.java     | 278 ------------
 ...upValueController_Roo_Controller_Finder.aj | 137 ------
 .../web/AnalysisGroupValueDTOController.java  |  13 -
 .../labsynch/labseer/web/ApiController.java   |  68 ---
 ...eFactoryBean_Roo_ConversionService.aj.orig | 111 -----
 .../web/ApplicationSettingController.java     | 128 ------
 ...icationSettingController_Roo_Controller.aj | 109 -----
 ...SettingController_Roo_Controller_Finder.aj |  55 ---
 .../labseer/web/AuthorController.java         |  17 -
 .../web/AuthorController_Roo_Controller.aj    | 119 -----
 .../AuthorController_Roo_Controller_Finder.aj |  75 ----
 .../AuthorController_Roo_Controller_Json.aj   | 148 -------
 .../labseer/web/AuthorLabelController.java    |  12 -
 .../AuthorLabelController_Roo_Controller.aj   | 119 -----
 .../labseer/web/AuthorNameDTOController.java  |  13 -
 .../labseer/web/AuthorRoleController.java     |  39 --
 .../AuthorRoleController_Roo_Controller.aj    | 114 -----
 ...horRoleController_Roo_Controller_Finder.aj |  78 ----
 ...uthorRoleController_Roo_Controller_Json.aj | 150 -------
 .../labseer/web/AuthorStateController.java    |  12 -
 .../AuthorStateController_Roo_Controller.aj   | 121 -----
 .../labseer/web/AuthorValueController.java    |  12 -
 .../AuthorValueController_Roo_Controller.aj   | 120 -----
 .../labseer/web/AutoLabelDTOController.java   |  13 -
 .../labseer/web/BatchCodeDTOController.java   |  13 -
 .../labseer/web/BulkLoadFileController.java   |  13 -
 .../BulkLoadFileController_Roo_Controller.aj  | 100 -----
 ...oadFileController_Roo_Controller_Finder.aj |  53 ---
 .../web/BulkLoadTemplateController.java       |  13 -
 ...lkLoadTemplateController_Roo_Controller.aj | 100 -----
 ...emplateController_Roo_Controller_Finder.aj |  72 ---
 .../web/BulkTransferPart1DTOController.java   |  13 -
 .../labseer/web/ChangePasswordController.java |  95 ----
 .../labseer/web/ChangePasswordForm.java       |  40 --
 .../labseer/web/ChangePasswordValidator.java  | 105 -----
 .../web/CmpdRegAppSettingController.java      |  22 -
 ...dRegAppSettingController_Roo_Controller.aj | 109 -----
 .../labseer/web/CodeKindController.java       |  16 -
 .../web/CodeKindController_Roo_Controller.aj  | 109 -----
 ...odeKindController_Roo_Controller_Finder.aj |  75 ----
 .../CodeKindController_Roo_Controller_Json.aj | 149 -------
 .../labseer/web/CodeOriginController.java     |  12 -
 .../CodeOriginController_Roo_Controller.aj    | 100 -----
 .../labseer/web/CodeTableDTOController.java   |  13 -
 .../labseer/web/CodeTypeController.java       |  16 -
 .../web/CodeTypeController_Roo_Controller.aj  | 100 -----
 ...odeTypeController_Roo_Controller_Finder.aj |  34 --
 .../CodeTypeController_Roo_Controller_Json.aj | 124 ------
 .../labseer/web/CompoundController.java       |  13 -
 .../web/CompoundController_Roo_Controller.aj  | 110 -----
 ...ompoundController_Roo_Controller_Finder.aj |  55 ---
 .../labseer/web/ContainerController.java      |  35 --
 .../web/ContainerController_Roo_Controller.aj | 120 -----
 ...ContainerController_Roo_Controller_Json.aj | 148 -------
 .../labseer/web/ContainerKindController.java  |  22 -
 .../ContainerKindController_Roo_Controller.aj | 109 -----
 ...ainerKindController_Roo_Controller_Json.aj | 125 ------
 .../labseer/web/ContainerLabelController.java |  35 --
 ...ContainerLabelController_Roo_Controller.aj | 119 -----
 ...erLabelController_Roo_Controller_Finder.aj |  97 -----
 ...inerLabelController_Roo_Controller_Json.aj | 161 -------
 .../web/ContainerMiniDTOController.java       |  13 -
 .../labseer/web/ContainerStateController.java |  53 ---
 ...ContainerStateController_Roo_Controller.aj | 121 -----
 ...erStateController_Roo_Controller_Finder.aj |  78 ----
 ...inerStateController_Roo_Controller_Json.aj | 149 -------
 .../web/ContainerStateMiniDTOController.java  |  13 -
 .../labseer/web/ContainerTypeController.java  |  24 -
 .../ContainerTypeController_Roo_Controller.aj | 100 -----
 ...nerTypeController_Roo_Controller_Finder.aj |  34 --
 ...ainerTypeController_Roo_Controller_Json.aj | 124 ------
 .../labseer/web/ContainerValueController.java |  37 --
 ...ContainerValueController_Roo_Controller.aj | 120 -----
 ...erValueController_Roo_Controller_Finder.aj |  57 ---
 ...inerValueController_Roo_Controller_Json.aj | 137 ------
 .../labseer/web/CorpNameController.java       |  19 -
 .../web/CorpNameController_Roo_Controller.aj  | 100 -----
 .../labseer/web/CronJobController.java        |  12 -
 .../web/CronJobController_Roo_Controller.aj   | 100 -----
 .../labseer/web/DDictKindController.java      |  23 -
 .../web/DDictKindController_Roo_Controller.aj |  96 ----
 ...ictKindController_Roo_Controller_Finder.aj |  34 --
 ...DDictKindController_Roo_Controller_Json.aj | 124 ------
 .../labseer/web/DDictTypeController.java      |  16 -
 .../web/DDictTypeController_Roo_Controller.aj | 100 -----
 ...ictTypeController_Roo_Controller_Finder.aj |  34 --
 ...DDictTypeController_Roo_Controller_Json.aj | 124 ------
 .../labseer/web/DDictValueController.java     |  37 --
 .../DDictValueController_Roo_Controller.aj    |  96 ----
 ...ctValueController_Roo_Controller_Finder.aj | 148 -------
 ...DictValueController_Roo_Controller_Json.aj | 196 ---------
 .../web/DoseReponseParamsDTOController.java   |  13 -
 .../web/EntrezDbGeneDTOController.java        |  13 -
 .../labseer/web/ErrorMessageController.java   |  13 -
 .../web/ErrorMessageDTOController.java        |  13 -
 .../labseer/web/ExperimentController.java     |  82 ----
 .../ExperimentController_Roo_Controller.aj    | 131 ------
 ...erimentController_Roo_Controller_Finder.aj | 217 ---------
 ...xperimentController_Roo_Controller_Json.aj | 233 ----------
 .../web/ExperimentFilterDTOController.java    |  13 -
 .../ExperimentFilterSearchDTOController.java  |  13 -
 .../web/ExperimentGuiStubDTOController.java   |  12 -
 .../labseer/web/ExperimentKindController.java |  24 -
 ...ExperimentKindController_Roo_Controller.aj | 109 -----
 ...imentKindController_Roo_Controller_Json.aj | 125 ------
 .../web/ExperimentLabelController.java        |  35 --
 ...xperimentLabelController_Roo_Controller.aj | 119 -----
 ...ntLabelController_Roo_Controller_Finder.aj | 118 -----
 ...mentLabelController_Roo_Controller_Json.aj | 173 --------
 .../ExperimentSearchRequestDTOController.java |  13 -
 .../web/ExperimentStateController.java        |  34 --
 ...xperimentStateController_Roo_Controller.aj | 121 -----
 ...ntStateController_Roo_Controller_Finder.aj |  37 --
 ...mentStateController_Roo_Controller_Json.aj | 125 ------
 .../labseer/web/ExperimentTypeController.java |  26 --
 ...ExperimentTypeController_Roo_Controller.aj | 100 -----
 ...entTypeController_Roo_Controller_Finder.aj |  34 --
 ...imentTypeController_Roo_Controller_Json.aj | 124 ------
 .../web/ExperimentValueController.java        |  41 --
 ...xperimentValueController_Roo_Controller.aj | 120 -----
 ...ntValueController_Roo_Controller_Finder.aj |  98 -----
 ...mentValueController_Roo_Controller_Json.aj | 161 -------
 .../labseer/web/ExportSDFController.java      |  61 ---
 .../labseer/web/FileListController.java       | 323 --------------
 .../web/FileListController_Roo_Controller.aj  |  18 -
 ...ileListController_Roo_Controller_Finder.aj |  55 ---
 .../labseer/web/FileThingController.java      |  14 -
 .../web/FileThingController_Roo_Controller.aj | 112 -----
 ...FileThingController_Roo_Controller_Json.aj | 111 -----
 .../labseer/web/ForgotPasswordController.java |  93 ----
 .../labseer/web/ForgotPasswordForm.java       |  28 --
 .../labseer/web/GeneIdDTOController.java      |  13 -
 .../web/IdCollectionDTOController.java        |  13 -
 .../web/InteractionKindController.java        |  22 -
 ...nteractionKindController_Roo_Controller.aj | 109 -----
 ...ctionKindController_Roo_Controller_Json.aj | 137 ------
 .../web/InteractionTypeController.java        |  22 -
 ...nteractionTypeController_Roo_Controller.aj | 100 -----
 ...ctionTypeController_Roo_Controller_Json.aj | 136 ------
 .../labseer/web/IsoSaltController.java        | 223 ----------
 .../web/IsoSaltController_Roo_Controller.aj   |  22 -
 ...IsoSaltController_Roo_Controller_Finder.aj |  44 --
 .../web/ItxContainerContainerController.java  |  37 --
 ...ainerContainerController_Roo_Controller.aj | 126 ------
 ...ntainerController_Roo_Controller_Finder.aj |  78 ----
 ...ContainerController_Roo_Controller_Json.aj | 149 -------
 .../ItxContainerContainerStateController.java |  34 --
 ...ContainerStateController_Roo_Controller.aj | 114 -----
 ...inerStateController_Roo_Controller_Json.aj | 111 -----
 .../ItxContainerContainerValueController.java |  32 --
 ...ContainerValueController_Roo_Controller.aj | 113 -----
 ...inerValueController_Roo_Controller_Json.aj | 111 -----
 .../ItxExperimentExperimentController.java    |  16 -
 ...mentExperimentController_Roo_Controller.aj | 126 ------
 ...erimentController_Roo_Controller_Finder.aj |  78 ----
 ...xperimentController_Roo_Controller_Json.aj | 149 -------
 ...txExperimentExperimentStateController.java |  14 -
 ...xperimentStateController_Roo_Controller.aj | 114 -----
 ...mentStateController_Roo_Controller_Json.aj | 111 -----
 ...txExperimentExperimentValueController.java |  14 -
 ...xperimentValueController_Roo_Controller.aj | 113 -----
 ...mentValueController_Roo_Controller_Json.aj | 111 -----
 .../web/ItxLsThingLsThingController.java      |  16 -
 ...LsThingLsThingController_Roo_Controller.aj | 126 ------
 ...LsThingController_Roo_Controller_Finder.aj |  78 ----
 ...ngLsThingController_Roo_Controller_Json.aj | 149 -------
 .../web/ItxLsThingLsThingStateController.java |  14 -
 ...ngLsThingStateController_Roo_Controller.aj | 114 -----
 ...hingStateController_Roo_Controller_Json.aj | 111 -----
 .../web/ItxLsThingLsThingValueController.java |  14 -
 ...ngLsThingValueController_Roo_Controller.aj | 113 -----
 ...hingValueController_Roo_Controller_Json.aj | 136 ------
 .../web/ItxProtocolProtocolController.java    |  16 -
 ...otocolProtocolController_Roo_Controller.aj | 126 ------
 ...rotocolController_Roo_Controller_Finder.aj |  78 ----
 ...lProtocolController_Roo_Controller_Json.aj | 149 -------
 .../ItxProtocolProtocolStateController.java   |  14 -
 ...lProtocolStateController_Roo_Controller.aj | 114 -----
 ...ocolStateController_Roo_Controller_Json.aj | 111 -----
 .../ItxProtocolProtocolValueController.java   |  14 -
 ...lProtocolValueController_Roo_Controller.aj | 113 -----
 ...ocolValueController_Roo_Controller_Json.aj | 111 -----
 .../web/ItxSubjectContainerController.java    |  35 --
 ...bjectContainerController_Roo_Controller.aj | 128 ------
 ...ntainerController_Roo_Controller_Finder.aj |  99 -----
 ...ContainerController_Roo_Controller_Json.aj | 162 -------
 .../ItxSubjectContainerStateController.java   |  31 --
 ...ContainerStateController_Roo_Controller.aj | 114 -----
 ...inerStateController_Roo_Controller_Json.aj | 111 -----
 .../ItxSubjectContainerValueController.java   |  29 --
 ...ContainerValueController_Roo_Controller.aj | 113 -----
 ...inerValueController_Roo_Controller_Json.aj | 111 -----
 .../labseer/web/JSTreeNodeDTOController.java  |  13 -
 .../labseer/web/KeyValueDTOController.java    |  12 -
 .../labseer/web/LabelKindController.java      |  24 -
 .../web/LabelKindController_Roo_Controller.aj | 102 -----
 ...belKindController_Roo_Controller_Finder.aj |  75 ----
 ...LabelKindController_Roo_Controller_Json.aj | 149 -------
 .../labseer/web/LabelSequenceController.java  |  33 --
 .../LabelSequenceController_Roo_Controller.aj | 111 -----
 ...equenceController_Roo_Controller_Finder.aj |  95 ----
 ...lSequenceController_Roo_Controller_Json.aj | 160 -------
 .../web/LabelSequenceDTOController.java       |  13 -
 .../web/LabelSequenceRoleController.java      |  12 -
 ...elSequenceRoleController_Roo_Controller.aj | 114 -----
 .../labseer/web/LabelTypeController.java      |  24 -
 .../web/LabelTypeController_Roo_Controller.aj | 100 -----
 ...belTypeController_Roo_Controller_Finder.aj |  34 --
 ...LabelTypeController_Roo_Controller_Json.aj | 124 ------
 .../labseer/web/LotAliasController.java       |  23 -
 .../web/LotAliasController_Roo_Controller.aj  | 102 -----
 ...otAliasController_Roo_Controller_Finder.aj |  75 ----
 .../LotAliasController_Roo_Controller_Json.aj | 149 -------
 .../labseer/web/LotAliasKindController.java   | 162 -------
 .../LotAliasKindController_Roo_Controller.aj  | 109 -----
 .../labseer/web/LotAliasTypeController.java   | 163 -------
 .../LotAliasTypeController_Roo_Controller.aj  | 100 -----
 .../labsynch/labseer/web/LotController.java   | 412 ------------------
 .../web/LotController_Roo_Controller.aj       |  37 --
 .../labseer/web/LsInteractionController.java  |  22 -
 .../LsInteractionController_Roo_Controller.aj | 112 -----
 ...teractionController_Roo_Controller_Json.aj | 111 -----
 .../labseer/web/LsRoleController.java         | 123 ------
 .../LsRoleController_Roo_Controller_Finder.aj | 129 ------
 .../LsRoleController_Roo_Controller_Json.aj   | 184 --------
 .../labseer/web/LsSeqAnlGrpController.java    |  12 -
 .../LsSeqAnlGrpController_Roo_Controller.aj   | 100 -----
 .../labseer/web/LsSeqContainerController.java |  12 -
 ...LsSeqContainerController_Roo_Controller.aj | 100 -----
 .../labseer/web/LsSeqExptController.java      |  12 -
 .../web/LsSeqExptController_Roo_Controller.aj | 100 -----
 .../web/LsSeqItxCntrCntrController.java       |  12 -
 ...SeqItxCntrCntrController_Roo_Controller.aj | 100 -----
 ...sSeqItxExperimentExperimentController.java |  12 -
 ...mentExperimentController_Roo_Controller.aj | 100 -----
 .../web/LsSeqItxLsThingLsThingController.java |  12 -
 ...LsThingLsThingController_Roo_Controller.aj | 100 -----
 .../LsSeqItxProtocolProtocolController.java   |  12 -
 ...otocolProtocolController_Roo_Controller.aj | 100 -----
 .../web/LsSeqItxSubjCntrController.java       |  12 -
 ...SeqItxSubjCntrController_Roo_Controller.aj | 100 -----
 .../labseer/web/LsSeqProtocolController.java  |  12 -
 .../LsSeqProtocolController_Roo_Controller.aj | 100 -----
 .../labseer/web/LsSeqSubjectController.java   |  12 -
 .../LsSeqSubjectController_Roo_Controller.aj  | 100 -----
 .../labseer/web/LsSeqTrtGrpController.java    |  12 -
 .../LsSeqTrtGrpController_Roo_Controller.aj   | 100 -----
 .../labsynch/labseer/web/LsTagController.java |  38 --
 .../web/LsTagController_Roo_Controller.aj     | 115 -----
 .../LsTagController_Roo_Controller_Finder.aj  |  55 ---
 .../LsTagController_Roo_Controller_Json.aj    | 136 ------
 .../labseer/web/LsThingController.java        |  35 --
 .../web/LsThingController_Roo_Controller.aj   | 120 -----
 ...LsThingController_Roo_Controller_Finder.aj | 239 ----------
 .../LsThingController_Roo_Controller_Json.aj  | 246 -----------
 .../labseer/web/LsThingLabelController.java   |  16 -
 .../LsThingLabelController_Roo_Controller.aj  | 119 -----
 ...ngLabelController_Roo_Controller_Finder.aj | 117 -----
 ...hingLabelController_Roo_Controller_Json.aj | 173 --------
 .../labseer/web/LsThingStateController.java   |  16 -
 .../LsThingStateController_Roo_Controller.aj  | 121 -----
 ...ngStateController_Roo_Controller_Finder.aj |  57 ---
 ...hingStateController_Roo_Controller_Json.aj | 137 ------
 .../labseer/web/LsThingValueController.java   |  16 -
 .../LsThingValueController_Roo_Controller.aj  | 120 -----
 ...ngValueController_Roo_Controller_Finder.aj | 283 ------------
 ...hingValueController_Roo_Controller_Json.aj | 272 ------------
 .../labseer/web/LsTransactionController.java  |  22 -
 .../LsTransactionController_Roo_Controller.aj | 114 -----
 ...ansactionController_Roo_Controller_Json.aj | 111 -----
 .../labseer/web/OperatorKindController.java   |  22 -
 .../OperatorKindController_Roo_Controller.aj  | 109 -----
 ...ratorKindController_Roo_Controller_Json.aj | 125 ------
 .../labseer/web/OperatorTypeController.java   |  24 -
 .../OperatorTypeController_Roo_Controller.aj  | 100 -----
 ...torTypeController_Roo_Controller_Finder.aj |  34 --
 ...ratorTypeController_Roo_Controller_Json.aj | 124 ------
 .../labseer/web/ParentAliasController.java    |  26 --
 .../ParentAliasController_Roo_Controller.aj   | 102 -----
 ...ntAliasController_Roo_Controller_Finder.aj | 114 -----
 ...rentAliasController_Roo_Controller_Json.aj | 173 --------
 .../web/ParentAliasKindController.java        | 162 -------
 ...arentAliasKindController_Roo_Controller.aj | 109 -----
 .../web/ParentAliasTypeController.java        | 163 -------
 ...arentAliasTypeController_Roo_Controller.aj | 100 -----
 .../labseer/web/ParentController.java         | 298 -------------
 .../web/ParentController_Roo_Controller.aj    |  29 --
 .../ParentController_Roo_Controller_Finder.aj | 140 ------
 .../web/PreDef_CorpNameController.java        |  18 -
 ...reDef_CorpNameController_Roo_Controller.aj | 100 -----
 .../web/PreferredNameDTOController.java       |  13 -
 .../PreferredNameRequestDTOController.java    |  13 -
 .../PreferredNameResultsDTOController.java    |  13 -
 .../PreferredNameWithErrorDTOController.java  |  13 -
 .../labseer/web/ProtocolController.java       |  48 --
 .../web/ProtocolController_Roo_Controller.aj  | 122 ------
 ...rotocolController_Roo_Controller_Finder.aj | 255 -----------
 .../ProtocolController_Roo_Controller_Json.aj | 256 -----------
 .../labseer/web/ProtocolKindController.java   |  26 --
 .../ProtocolKindController_Roo_Controller.aj  | 109 -----
 ...colKindController_Roo_Controller_Finder.aj |  36 --
 ...tocolKindController_Roo_Controller_Json.aj | 125 ------
 .../labseer/web/ProtocolLabelController.java  |  34 --
 .../ProtocolLabelController_Roo_Controller.aj | 119 -----
 ...olLabelController_Roo_Controller_Finder.aj |  97 -----
 ...ocolLabelController_Roo_Controller_Json.aj | 161 -------
 .../labseer/web/ProtocolStateController.java  |  44 --
 .../ProtocolStateController_Roo_Controller.aj | 121 -----
 ...olStateController_Roo_Controller_Finder.aj |  57 ---
 ...ocolStateController_Roo_Controller_Json.aj | 137 ------
 .../labseer/web/ProtocolTypeController.java   |  26 --
 .../ProtocolTypeController_Roo_Controller.aj  | 100 -----
 ...colTypeController_Roo_Controller_Finder.aj |  34 --
 ...tocolTypeController_Roo_Controller_Json.aj | 124 ------
 .../labseer/web/ProtocolValueController.java  |  44 --
 .../ProtocolValueController_Roo_Controller.aj | 120 -----
 ...olValueController_Roo_Controller_Finder.aj |  97 -----
 ...ocolValueController_Roo_Controller_Json.aj | 161 -------
 .../labseer/web/RequestNameDTOController.java |  13 -
 .../labseer/web/RoleKindController.java       |  21 -
 .../web/RoleKindController_Roo_Controller.aj  | 109 -----
 ...oleKindController_Roo_Controller_Finder.aj |  56 ---
 .../RoleKindController_Roo_Controller_Json.aj | 137 ------
 .../labseer/web/RoleTypeController.java       |  21 -
 .../web/RoleTypeController_Roo_Controller.aj  | 100 -----
 ...oleTypeController_Roo_Controller_Finder.aj |  34 --
 .../RoleTypeController_Roo_Controller_Json.aj | 124 ------
 .../labseer/web/SaltFormAliasController.java  |  13 -
 .../SaltFormAliasController_Roo_Controller.aj | 102 -----
 ...rmAliasController_Roo_Controller_Finder.aj |  55 ---
 .../web/SaltFormAliasKindController.java      |  11 -
 ...tFormAliasKindController_Roo_Controller.aj | 109 -----
 .../web/SaltFormAliasTypeController.java      |  11 -
 ...tFormAliasTypeController_Roo_Controller.aj | 100 -----
 .../labseer/web/SaltFormController.java       | 189 --------
 .../web/SaltFormController_Roo_Controller.aj  |  31 --
 ...altFormController_Roo_Controller_Finder.aj | 119 -----
 .../labseer/web/SaltLoaderController.java     |  11 -
 .../SaltLoaderController_Roo_Controller.aj    | 109 -----
 .../labseer/web/SetupDBController.java        | 140 ------
 .../labseer/web/SignUpController.java         | 170 --------
 .../labsynch/labseer/web/SignUpValidator.java |  56 ---
 .../labseer/web/StateKindController.java      |  24 -
 .../web/StateKindController_Roo_Controller.aj | 109 -----
 ...ateKindController_Roo_Controller_Finder.aj |  75 ----
 ...StateKindController_Roo_Controller_Json.aj | 149 -------
 .../labseer/web/StateTypeController.java      |  24 -
 .../web/StateTypeController_Roo_Controller.aj | 100 -----
 ...ateTypeController_Roo_Controller_Finder.aj |  34 --
 ...StateTypeController_Roo_Controller_Json.aj | 124 ------
 .../web/StringCollectionDTOController.java    |  13 -
 .../labseer/web/SubjectController.java        |  39 --
 .../web/SubjectController_Roo_Controller.aj   | 120 -----
 ...SubjectController_Roo_Controller_Finder.aj |  78 ----
 .../SubjectController_Roo_Controller_Json.aj  | 150 -------
 .../labseer/web/SubjectDTOController.java     |  13 -
 .../labseer/web/SubjectLabelController.java   |  31 --
 .../SubjectLabelController_Roo_Controller.aj  | 119 -----
 ...ctLabelController_Roo_Controller_Finder.aj |  37 --
 ...jectLabelController_Roo_Controller_Json.aj | 125 ------
 .../web/SubjectLabelDTOController.java        |  13 -
 .../labseer/web/SubjectMiniDTOController.java |  13 -
 .../labseer/web/SubjectStateController.java   |  46 --
 .../SubjectStateController_Roo_Controller.aj  | 121 -----
 ...ctStateController_Roo_Controller_Finder.aj |  58 ---
 ...jectStateController_Roo_Controller_Json.aj | 137 ------
 .../web/SubjectStateDTOController.java        |  13 -
 .../web/SubjectStateMiniDTOController.java    |  13 -
 .../labseer/web/SubjectValueController.java   |  46 --
 .../SubjectValueController_Roo_Controller.aj  | 120 -----
 ...ctValueController_Roo_Controller_Finder.aj | 118 -----
 ...jectValueController_Roo_Controller_Json.aj | 173 --------
 .../web/SubjectValueDTOController.java        |  13 -
 .../web/TempSelectTableController.java        |  12 -
 ...empSelectTableController_Roo_Controller.aj | 109 -----
 .../labseer/web/ThingKindController.java      |  24 -
 .../web/ThingKindController_Roo_Controller.aj | 109 -----
 ...ingKindController_Roo_Controller_Finder.aj |  75 ----
 ...ThingKindController_Roo_Controller_Json.aj | 149 -------
 .../web/ThingPageArchiveController.java       |  97 -----
 ...ingPageArchiveController_Roo_Controller.aj | 110 -----
 .../labseer/web/ThingPageController.java      | 109 -----
 .../web/ThingPageController_Roo_Controller.aj | 121 -----
 .../labseer/web/ThingTypeController.java      |  24 -
 .../web/ThingTypeController_Roo_Controller.aj | 100 -----
 ...ingTypeController_Roo_Controller_Finder.aj |  34 --
 ...ThingTypeController_Roo_Controller_Json.aj | 124 ------
 .../labseer/web/TreatmentGroupController.java |  37 --
 ...TreatmentGroupController_Roo_Controller.aj | 120 -----
 ...ntGroupController_Roo_Controller_Finder.aj |  78 ----
 ...mentGroupController_Roo_Controller_Json.aj | 150 -------
 .../web/TreatmentGroupLabelController.java    |  31 --
 ...mentGroupLabelController_Roo_Controller.aj | 119 -----
 ...upLabelController_Roo_Controller_Finder.aj |  57 ---
 ...roupLabelController_Roo_Controller_Json.aj | 137 ------
 .../web/TreatmentGroupMiniDTOController.java  |  13 -
 .../web/TreatmentGroupStateController.java    |  34 --
 ...mentGroupStateController_Roo_Controller.aj | 121 -----
 ...upStateController_Roo_Controller_Finder.aj |  77 ----
 ...roupStateController_Roo_Controller_Json.aj | 149 -------
 .../web/TreatmentGroupValueController.java    |  32 --
 ...mentGroupValueController_Roo_Controller.aj | 120 -----
 ...upValueController_Roo_Controller_Finder.aj |  97 -----
 ...roupValueController_Roo_Controller_Json.aj | 161 -------
 .../web/UncertaintyKindController.java        |  14 -
 ...ncertaintyKindController_Roo_Controller.aj | 100 -----
 ...aintyKindController_Roo_Controller_Json.aj | 111 -----
 .../labseer/web/UnitKindController.java       |  22 -
 .../web/UnitKindController_Roo_Controller.aj  | 109 -----
 .../UnitKindController_Roo_Controller_Json.aj | 125 ------
 .../labseer/web/UnitTypeController.java       |  24 -
 .../web/UnitTypeController_Roo_Controller.aj  | 100 -----
 ...nitTypeController_Roo_Controller_Finder.aj |  34 --
 .../UnitTypeController_Roo_Controller_Json.aj | 124 ------
 .../labseer/web/UpdateLogController.java      |  12 -
 .../web/UpdateLogController_Roo_Controller.aj | 109 -----
 .../labseer/web/UserRegistrationForm.java     | 156 -------
 .../labseer/web/ValueKindController.java      |  24 -
 .../web/ValueKindController_Roo_Controller.aj | 109 -----
 ...lueKindController_Roo_Controller_Finder.aj |  56 ---
 ...ValueKindController_Roo_Controller_Json.aj | 137 ------
 .../labseer/web/ValueTypeController.java      |  24 -
 .../web/ValueTypeController_Roo_Controller.aj | 100 -----
 ...lueTypeController_Roo_Controller_Finder.aj |  34 --
 ...ValueTypeController_Roo_Controller_Json.aj | 124 ------
 .../web/ValueTypeKindDTOController.java       |  13 -
 .../web/menu/BaseURLContextMenuStrategy.java  | 239 ----------
 .../labseer/web/menu/ContextMenuStrategy.java |  36 --
 .../com/labsynch/labseer/web/menu/Menu.java   |  73 ----
 .../labsynch/labseer/web/menu/MenuItem.java   | 273 ------------
 .../labsynch/labseer/web/menu/MenuLoader.java | 147 -------
 .../menu/URLBrothersContextMenuStrategy.java  |  52 ---
 .../menu/URLChildrenContextMenuStrategy.java  |  51 ---
 450 files changed, 11 insertions(+), 37842 deletions(-)
 delete mode 100755 src/main/java/com/labsynch/labseer/web/AnalysisGroupController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/AnalysisGroupController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/AnalysisGroupController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/AnalysisGroupController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/AnalysisGroupLabelController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/AnalysisGroupLabelController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/AnalysisGroupLabelController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/AnalysisGroupLabelController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/AnalysisGroupStateController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/AnalysisGroupStateController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/AnalysisGroupStateController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/AnalysisGroupStateController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/AnalysisGroupValueBaseDTOController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/AnalysisGroupValueController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/AnalysisGroupValueController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/AnalysisGroupValueDTOController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ApiController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ApplicationConversionServiceFactoryBean_Roo_ConversionService.aj.orig
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ApplicationSettingController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ApplicationSettingController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ApplicationSettingController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/AuthorController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/AuthorController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/AuthorController_Roo_Controller_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/AuthorController_Roo_Controller_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/AuthorLabelController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/AuthorLabelController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/AuthorNameDTOController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/AuthorRoleController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/AuthorRoleController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/AuthorRoleController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/AuthorRoleController_Roo_Controller_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/AuthorStateController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/AuthorStateController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/AuthorValueController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/AuthorValueController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/AutoLabelDTOController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/BatchCodeDTOController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/BulkLoadFileController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/BulkLoadFileController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/BulkLoadFileController_Roo_Controller_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/BulkLoadTemplateController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/BulkLoadTemplateController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/BulkLoadTemplateController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/BulkTransferPart1DTOController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ChangePasswordController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ChangePasswordForm.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ChangePasswordValidator.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/CmpdRegAppSettingController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/CmpdRegAppSettingController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/CodeKindController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/CodeKindController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/CodeKindController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/CodeKindController_Roo_Controller_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/CodeOriginController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/CodeOriginController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/CodeTableDTOController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/CodeTypeController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/CodeTypeController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/CodeTypeController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/CodeTypeController_Roo_Controller_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/CompoundController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/CompoundController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/CompoundController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ContainerController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ContainerController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ContainerController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ContainerKindController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ContainerKindController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ContainerKindController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ContainerLabelController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ContainerLabelController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ContainerLabelController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ContainerLabelController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ContainerMiniDTOController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ContainerStateController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ContainerStateController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ContainerStateController_Roo_Controller_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ContainerStateController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ContainerStateMiniDTOController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ContainerTypeController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ContainerTypeController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ContainerTypeController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ContainerTypeController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ContainerValueController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ContainerValueController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ContainerValueController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ContainerValueController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/CorpNameController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/CorpNameController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/CronJobController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/CronJobController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/DDictKindController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/DDictKindController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/DDictKindController_Roo_Controller_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/DDictKindController_Roo_Controller_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/DDictTypeController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/DDictTypeController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/DDictTypeController_Roo_Controller_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/DDictTypeController_Roo_Controller_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/DDictValueController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/DDictValueController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/DDictValueController_Roo_Controller_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/DDictValueController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/DoseReponseParamsDTOController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/EntrezDbGeneDTOController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ErrorMessageController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ErrorMessageDTOController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ExperimentController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ExperimentController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ExperimentController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ExperimentController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ExperimentFilterDTOController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ExperimentFilterSearchDTOController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ExperimentGuiStubDTOController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ExperimentKindController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ExperimentKindController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ExperimentKindController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ExperimentLabelController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ExperimentLabelController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ExperimentLabelController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ExperimentLabelController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ExperimentSearchRequestDTOController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ExperimentStateController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ExperimentStateController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ExperimentStateController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ExperimentStateController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ExperimentTypeController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ExperimentTypeController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ExperimentTypeController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ExperimentTypeController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ExperimentValueController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ExperimentValueController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ExperimentValueController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ExperimentValueController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ExportSDFController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/FileListController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/FileListController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/FileListController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/FileThingController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/FileThingController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/FileThingController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ForgotPasswordController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ForgotPasswordForm.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/GeneIdDTOController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/IdCollectionDTOController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/InteractionKindController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/InteractionKindController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/InteractionKindController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/InteractionTypeController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/InteractionTypeController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/InteractionTypeController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/IsoSaltController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/IsoSaltController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/IsoSaltController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ItxContainerContainerController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ItxContainerContainerController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ItxContainerContainerController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ItxContainerContainerController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ItxContainerContainerStateController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ItxContainerContainerStateController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ItxContainerContainerStateController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ItxContainerContainerValueController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ItxContainerContainerValueController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ItxContainerContainerValueController_Roo_Controller_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentController_Roo_Controller_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentController_Roo_Controller_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentStateController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentStateController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentStateController_Roo_Controller_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentValueController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentValueController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentValueController_Roo_Controller_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingController_Roo_Controller_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingController_Roo_Controller_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingStateController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingStateController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingStateController_Roo_Controller_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingValueController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingValueController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingValueController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolStateController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolStateController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolStateController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolValueController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolValueController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolValueController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ItxSubjectContainerController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ItxSubjectContainerController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ItxSubjectContainerController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ItxSubjectContainerController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ItxSubjectContainerStateController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ItxSubjectContainerStateController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ItxSubjectContainerStateController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ItxSubjectContainerValueController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ItxSubjectContainerValueController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ItxSubjectContainerValueController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/JSTreeNodeDTOController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/KeyValueDTOController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LabelKindController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LabelKindController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LabelKindController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LabelKindController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LabelSequenceController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LabelSequenceController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LabelSequenceController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LabelSequenceController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LabelSequenceDTOController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LabelSequenceRoleController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LabelSequenceRoleController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LabelTypeController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LabelTypeController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LabelTypeController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LabelTypeController_Roo_Controller_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LotAliasController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LotAliasController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LotAliasController_Roo_Controller_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LotAliasController_Roo_Controller_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LotAliasKindController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LotAliasKindController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LotAliasTypeController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LotAliasTypeController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LotController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LotController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LsInteractionController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LsInteractionController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LsInteractionController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LsRoleController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LsRoleController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LsRoleController_Roo_Controller_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LsSeqAnlGrpController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LsSeqAnlGrpController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LsSeqContainerController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LsSeqContainerController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LsSeqExptController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LsSeqExptController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LsSeqItxCntrCntrController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LsSeqItxCntrCntrController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LsSeqItxExperimentExperimentController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LsSeqItxExperimentExperimentController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LsSeqItxLsThingLsThingController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LsSeqItxLsThingLsThingController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LsSeqItxProtocolProtocolController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LsSeqItxProtocolProtocolController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LsSeqItxSubjCntrController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LsSeqItxSubjCntrController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LsSeqProtocolController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LsSeqProtocolController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LsSeqSubjectController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LsSeqSubjectController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LsSeqTrtGrpController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LsSeqTrtGrpController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LsTagController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LsTagController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LsTagController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LsTagController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LsThingController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LsThingController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LsThingController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LsThingController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LsThingLabelController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LsThingLabelController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LsThingLabelController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LsThingLabelController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LsThingStateController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LsThingStateController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LsThingStateController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LsThingStateController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LsThingValueController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LsThingValueController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LsThingValueController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LsThingValueController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LsTransactionController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/LsTransactionController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/LsTransactionController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/OperatorKindController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/OperatorKindController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/OperatorKindController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/OperatorTypeController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/OperatorTypeController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/OperatorTypeController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/OperatorTypeController_Roo_Controller_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ParentAliasController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ParentAliasController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ParentAliasController_Roo_Controller_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ParentAliasController_Roo_Controller_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ParentAliasKindController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ParentAliasKindController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ParentAliasTypeController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ParentAliasTypeController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ParentController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ParentController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ParentController_Roo_Controller_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/PreDef_CorpNameController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/PreDef_CorpNameController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/PreferredNameDTOController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/PreferredNameRequestDTOController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/PreferredNameResultsDTOController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/PreferredNameWithErrorDTOController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ProtocolController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ProtocolController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ProtocolController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ProtocolController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ProtocolKindController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ProtocolKindController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ProtocolKindController_Roo_Controller_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ProtocolKindController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ProtocolLabelController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ProtocolLabelController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ProtocolLabelController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ProtocolLabelController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ProtocolStateController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ProtocolStateController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ProtocolStateController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ProtocolStateController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ProtocolTypeController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ProtocolTypeController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ProtocolTypeController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ProtocolTypeController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ProtocolValueController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ProtocolValueController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ProtocolValueController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ProtocolValueController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/RequestNameDTOController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/RoleKindController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/RoleKindController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/RoleKindController_Roo_Controller_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/RoleKindController_Roo_Controller_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/RoleTypeController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/RoleTypeController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/RoleTypeController_Roo_Controller_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/RoleTypeController_Roo_Controller_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/SaltFormAliasController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/SaltFormAliasController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/SaltFormAliasController_Roo_Controller_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/SaltFormAliasKindController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/SaltFormAliasKindController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/SaltFormAliasTypeController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/SaltFormAliasTypeController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/SaltFormController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/SaltFormController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/SaltFormController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/SaltLoaderController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/SaltLoaderController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/SetupDBController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/SignUpController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/SignUpValidator.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/StateKindController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/StateKindController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/StateKindController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/StateKindController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/StateTypeController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/StateTypeController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/StateTypeController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/StateTypeController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/StringCollectionDTOController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/SubjectController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/SubjectController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/SubjectController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/SubjectController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/SubjectDTOController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/SubjectLabelController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/SubjectLabelController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/SubjectLabelController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/SubjectLabelController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/SubjectLabelDTOController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/SubjectMiniDTOController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/SubjectStateController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/SubjectStateController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/SubjectStateController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/SubjectStateController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/SubjectStateDTOController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/SubjectStateMiniDTOController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/SubjectValueController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/SubjectValueController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/SubjectValueController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/SubjectValueController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/SubjectValueDTOController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/TempSelectTableController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/TempSelectTableController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ThingKindController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ThingKindController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ThingKindController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ThingKindController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ThingPageArchiveController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ThingPageArchiveController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ThingPageController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ThingPageController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ThingTypeController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ThingTypeController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ThingTypeController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ThingTypeController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/TreatmentGroupController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/TreatmentGroupController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/TreatmentGroupController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/TreatmentGroupController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/TreatmentGroupLabelController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/TreatmentGroupLabelController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/TreatmentGroupLabelController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/TreatmentGroupLabelController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/TreatmentGroupMiniDTOController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/TreatmentGroupStateController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/TreatmentGroupStateController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/TreatmentGroupStateController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/TreatmentGroupStateController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/TreatmentGroupValueController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/TreatmentGroupValueController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/TreatmentGroupValueController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/TreatmentGroupValueController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/UncertaintyKindController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/UncertaintyKindController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/UncertaintyKindController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/UnitKindController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/UnitKindController_Roo_Controller.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/UnitKindController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/UnitTypeController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/UnitTypeController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/UnitTypeController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/UnitTypeController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/UpdateLogController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/UpdateLogController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/UserRegistrationForm.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ValueKindController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ValueKindController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ValueKindController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ValueKindController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ValueTypeController.java
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ValueTypeController_Roo_Controller.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ValueTypeController_Roo_Controller_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ValueTypeController_Roo_Controller_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/web/ValueTypeKindDTOController.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/menu/BaseURLContextMenuStrategy.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/menu/ContextMenuStrategy.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/menu/Menu.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/menu/MenuItem.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/menu/MenuLoader.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/menu/URLBrothersContextMenuStrategy.java
 delete mode 100644 src/main/java/com/labsynch/labseer/web/menu/URLChildrenContextMenuStrategy.java

diff --git a/src/main/java/com/labsynch/labseer/api/ApiAuthorController.java b/src/main/java/com/labsynch/labseer/api/ApiAuthorController.java
index afffa8e48..15f4db7c9 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiAuthorController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiAuthorController.java
@@ -31,14 +31,21 @@
 import com.labsynch.labseer.service.AuthorService;
 import com.labsynch.labseer.utils.PropertiesFileService;
 import com.labsynch.labseer.utils.PropertiesUtilService;
-import com.labsynch.labseer.web.AuthorController;
 
 @Controller
 @RequestMapping("api/v1/authors")
 public class ApiAuthorController {
 
+	private static final Logger logger = LoggerFactory.getLogger(ApiAuthorController.class);
+
 	@Autowired
 	private AuthorService authorService;
+	
+	@Autowired
+	private PropertiesUtilService propertiesUtilService;
+
+	@Autowired
+	private PropertiesFileService propertiesFileService;
 
 	@RequestMapping(value="/{format}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
@@ -100,14 +107,6 @@ public ResponseEntity<java.lang.String> listAuthorsByRoleTypeAndRoleKindAndRoleN
 		}
 	}
 
-	private static final Logger logger = LoggerFactory.getLogger(AuthorController.class);
-
-	@Autowired
-	private PropertiesUtilService propertiesUtilService;
-
-	@Autowired
-	private PropertiesFileService propertiesFileService;
-
 	@RequestMapping(value = "/findbyname", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
 	public ResponseEntity<java.lang.String> jsonFindAuthorsByName(@RequestBody AuthorNameDTO authorName) {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiAuthorRoleController.java b/src/main/java/com/labsynch/labseer/api/ApiAuthorRoleController.java
index b48ae3d06..baabc1319 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiAuthorRoleController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiAuthorRoleController.java
@@ -21,7 +21,6 @@
 import com.labsynch.labseer.domain.AuthorRole;
 import com.labsynch.labseer.dto.AuthorRoleDTO;
 import com.labsynch.labseer.service.AuthorRoleService;
-import com.labsynch.labseer.web.AuthorRoleController;
 
 @Controller
 @RequestMapping("api/v1/authorroles")
@@ -30,7 +29,7 @@ public class ApiAuthorRoleController {
 	@Autowired
     private AuthorRoleService authorRoleService;
 	
-	private static final Logger logger = LoggerFactory.getLogger(AuthorRoleController.class);
+	private static final Logger logger = LoggerFactory.getLogger(ApiAuthorRoleController.class);
 
 	
     @RequestMapping(value = "/{id}", headers = "Accept=application/json")
diff --git a/src/main/java/com/labsynch/labseer/api/ApiTreatmentGroupController.java b/src/main/java/com/labsynch/labseer/api/ApiTreatmentGroupController.java
index 044405727..b0473bf09 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiTreatmentGroupController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiTreatmentGroupController.java
@@ -29,7 +29,6 @@
 import com.labsynch.labseer.service.SubjectValueService;
 import com.labsynch.labseer.service.TreatmentGroupService;
 import com.labsynch.labseer.utils.PropertiesUtilService;
-import com.labsynch.labseer.web.TreatmentGroupController;
 
 import flexjson.JSONTokener;
 
@@ -38,7 +37,7 @@
 @Transactional
 public class ApiTreatmentGroupController {
 	
-	private static final Logger logger = LoggerFactory.getLogger(TreatmentGroupController.class);
+	private static final Logger logger = LoggerFactory.getLogger(ApiTreatmentGroupController.class);
 
     @Autowired
     private PropertiesUtilService propertiesUtilService;
diff --git a/src/main/java/com/labsynch/labseer/domain/FileList.java b/src/main/java/com/labsynch/labseer/domain/FileList.java
index 572ca0f67..8d1132cd4 100755
--- a/src/main/java/com/labsynch/labseer/domain/FileList.java
+++ b/src/main/java/com/labsynch/labseer/domain/FileList.java
@@ -22,8 +22,6 @@
 import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.labsynch.labseer.web.FileListController;
-
 @RooJavaBean
 @RooToString
 @RooJson
@@ -31,7 +29,7 @@
 public class FileList {
 
 	
-    private static final Logger logger = LoggerFactory.getLogger(FileListController.class);
+    private static final Logger logger = LoggerFactory.getLogger(FileList.class);
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "lot")
diff --git a/src/main/java/com/labsynch/labseer/web/AnalysisGroupController.java b/src/main/java/com/labsynch/labseer/web/AnalysisGroupController.java
deleted file mode 100755
index cf3cd7e08..000000000
--- a/src/main/java/com/labsynch/labseer/web/AnalysisGroupController.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.dto.IdCollectionDTO;
-import com.labsynch.labseer.service.AnalysisGroupService;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import flexjson.JSONTokener;
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = AnalysisGroup.class)
-@Controller
-@RequestMapping("/analysisgroups")
-@RooWebScaffold(path = "analysisgroups", formBackingObject = AnalysisGroup.class)
-@RooWebFinder
-public class AnalysisGroupController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AnalysisGroupController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/AnalysisGroupController_Roo_Controller.aj
deleted file mode 100755
index c5e40de78..000000000
--- a/src/main/java/com/labsynch/labseer/web/AnalysisGroupController_Roo_Controller.aj
+++ /dev/null
@@ -1,120 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.AnalysisGroupLabel;
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ThingPage;
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.web.AnalysisGroupController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect AnalysisGroupController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String AnalysisGroupController.create(@Valid AnalysisGroup analysisGroup, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, analysisGroup);
-            return "analysisgroups/create";
-        }
-        uiModel.asMap().clear();
-        analysisGroup.persist();
-        return "redirect:/analysisgroups/" + encodeUrlPathSegment(analysisGroup.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String AnalysisGroupController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new AnalysisGroup());
-        return "analysisgroups/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String AnalysisGroupController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("analysisgroup", AnalysisGroup.findAnalysisGroup(id));
-        uiModel.addAttribute("itemId", id);
-        return "analysisgroups/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String AnalysisGroupController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("analysisgroups", AnalysisGroup.findAnalysisGroupEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) AnalysisGroup.countAnalysisGroups() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("analysisgroups", AnalysisGroup.findAllAnalysisGroups(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "analysisgroups/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String AnalysisGroupController.update(@Valid AnalysisGroup analysisGroup, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, analysisGroup);
-            return "analysisgroups/update";
-        }
-        uiModel.asMap().clear();
-        analysisGroup.merge();
-        return "redirect:/analysisgroups/" + encodeUrlPathSegment(analysisGroup.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String AnalysisGroupController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, AnalysisGroup.findAnalysisGroup(id));
-        return "analysisgroups/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String AnalysisGroupController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        AnalysisGroup analysisGroup = AnalysisGroup.findAnalysisGroup(id);
-        analysisGroup.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/analysisgroups";
-    }
-    
-    void AnalysisGroupController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("analysisGroup_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("analysisGroup_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void AnalysisGroupController.populateEditForm(Model uiModel, AnalysisGroup analysisGroup) {
-        uiModel.addAttribute("analysisGroup", analysisGroup);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("analysisgrouplabels", AnalysisGroupLabel.findAllAnalysisGroupLabels());
-        uiModel.addAttribute("analysisgroupstates", AnalysisGroupState.findAllAnalysisGroupStates());
-        uiModel.addAttribute("experiments", Experiment.findAllExperiments());
-        uiModel.addAttribute("thingpages", ThingPage.findAllThingPages());
-        uiModel.addAttribute("treatmentgroups", TreatmentGroup.findAllTreatmentGroups());
-    }
-    
-    String AnalysisGroupController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AnalysisGroupController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/AnalysisGroupController_Roo_Controller_Finder.aj
deleted file mode 100755
index d36d7d9af..000000000
--- a/src/main/java/com/labsynch/labseer/web/AnalysisGroupController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,79 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.web.AnalysisGroupController;
-import java.util.Set;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect AnalysisGroupController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByExperiments", "form" }, method = RequestMethod.GET)
-    public String AnalysisGroupController.findAnalysisGroupsByExperimentsForm(Model uiModel) {
-        uiModel.addAttribute("experiments", Experiment.findAllExperiments());
-        return "analysisgroups/findAnalysisGroupsByExperiments";
-    }
-    
-    @RequestMapping(params = "find=ByExperiments", method = RequestMethod.GET)
-    public String AnalysisGroupController.findAnalysisGroupsByExperiments(@RequestParam("experiments") Set<Experiment> experiments, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("analysisgroups", AnalysisGroup.findAnalysisGroupsByExperiments(experiments, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) AnalysisGroup.countFindAnalysisGroupsByExperiments(experiments) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("analysisgroups", AnalysisGroup.findAnalysisGroupsByExperiments(experiments, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "analysisgroups/list";
-    }
-    
-    @RequestMapping(params = { "find=ByExperimentsAndIgnoredNot", "form" }, method = RequestMethod.GET)
-    public String AnalysisGroupController.findAnalysisGroupsByExperimentsAndIgnoredNotForm(Model uiModel) {
-        uiModel.addAttribute("experiments", Experiment.findAllExperiments());
-        return "analysisgroups/findAnalysisGroupsByExperimentsAndIgnoredNot";
-    }
-    
-    @RequestMapping(params = "find=ByExperimentsAndIgnoredNot", method = RequestMethod.GET)
-    public String AnalysisGroupController.findAnalysisGroupsByExperimentsAndIgnoredNot(@RequestParam("experiments") Set<Experiment> experiments, @RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("analysisgroups", AnalysisGroup.findAnalysisGroupsByExperimentsAndIgnoredNot(experiments, ignored, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) AnalysisGroup.countFindAnalysisGroupsByExperimentsAndIgnoredNot(experiments, ignored) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("analysisgroups", AnalysisGroup.findAnalysisGroupsByExperimentsAndIgnoredNot(experiments, ignored, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "analysisgroups/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTransactionEquals", "form" }, method = RequestMethod.GET)
-    public String AnalysisGroupController.findAnalysisGroupsByLsTransactionEqualsForm(Model uiModel) {
-        return "analysisgroups/findAnalysisGroupsByLsTransactionEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", method = RequestMethod.GET)
-    public String AnalysisGroupController.findAnalysisGroupsByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("analysisgroups", AnalysisGroup.findAnalysisGroupsByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) AnalysisGroup.countFindAnalysisGroupsByLsTransactionEquals(lsTransaction) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("analysisgroups", AnalysisGroup.findAnalysisGroupsByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "analysisgroups/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AnalysisGroupController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/AnalysisGroupController_Roo_Controller_Json.aj
deleted file mode 100755
index 4e967cb4c..000000000
--- a/src/main/java/com/labsynch/labseer/web/AnalysisGroupController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,150 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.web.AnalysisGroupController;
-import java.util.List;
-import java.util.Set;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect AnalysisGroupController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> AnalysisGroupController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            AnalysisGroup analysisGroup = AnalysisGroup.findAnalysisGroup(id);
-            if (analysisGroup == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(analysisGroup.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> AnalysisGroupController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<AnalysisGroup> result = AnalysisGroup.findAllAnalysisGroups();
-            return new ResponseEntity<String>(AnalysisGroup.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> AnalysisGroupController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            AnalysisGroup analysisGroup = AnalysisGroup.fromJsonToAnalysisGroup(json);
-            analysisGroup.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+analysisGroup.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> AnalysisGroupController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (AnalysisGroup analysisGroup: AnalysisGroup.fromJsonArrayToAnalysisGroups(json)) {
-                analysisGroup.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> AnalysisGroupController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            AnalysisGroup analysisGroup = AnalysisGroup.fromJsonToAnalysisGroup(json);
-            analysisGroup.setId(id);
-            if (analysisGroup.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> AnalysisGroupController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            AnalysisGroup analysisGroup = AnalysisGroup.findAnalysisGroup(id);
-            if (analysisGroup == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            analysisGroup.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByExperiments", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> AnalysisGroupController.jsonFindAnalysisGroupsByExperiments(@RequestParam("experiments") Set<Experiment> experiments) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(AnalysisGroup.toJsonArray(AnalysisGroup.findAnalysisGroupsByExperiments(experiments).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByExperimentsAndIgnoredNot", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> AnalysisGroupController.jsonFindAnalysisGroupsByExperimentsAndIgnoredNot(@RequestParam("experiments") Set<Experiment> experiments, @RequestParam(value = "ignored", required = false) boolean ignored) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(AnalysisGroup.toJsonArray(AnalysisGroup.findAnalysisGroupsByExperimentsAndIgnoredNot(experiments, ignored).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> AnalysisGroupController.jsonFindAnalysisGroupsByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(AnalysisGroup.toJsonArray(AnalysisGroup.findAnalysisGroupsByLsTransactionEquals(lsTransaction).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AnalysisGroupLabelController.java b/src/main/java/com/labsynch/labseer/web/AnalysisGroupLabelController.java
deleted file mode 100755
index a316ba387..000000000
--- a/src/main/java/com/labsynch/labseer/web/AnalysisGroupLabelController.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.AnalysisGroupLabel;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.apache.commons.io.IOUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = AnalysisGroupLabel.class)
-@Controller
-@RequestMapping("/analysisgrouplabels")
-@RooWebScaffold(path = "analysisgrouplabels", formBackingObject = AnalysisGroupLabel.class)
-@RooWebFinder
-public class AnalysisGroupLabelController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AnalysisGroupLabelController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/AnalysisGroupLabelController_Roo_Controller.aj
deleted file mode 100755
index b2a7aa756..000000000
--- a/src/main/java/com/labsynch/labseer/web/AnalysisGroupLabelController_Roo_Controller.aj
+++ /dev/null
@@ -1,119 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.AnalysisGroupLabel;
-import com.labsynch.labseer.web.AnalysisGroupLabelController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect AnalysisGroupLabelController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String AnalysisGroupLabelController.create(@Valid AnalysisGroupLabel analysisGroupLabel, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, analysisGroupLabel);
-            return "analysisgrouplabels/create";
-        }
-        uiModel.asMap().clear();
-        analysisGroupLabel.persist();
-        return "redirect:/analysisgrouplabels/" + encodeUrlPathSegment(analysisGroupLabel.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String AnalysisGroupLabelController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new AnalysisGroupLabel());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (AnalysisGroup.countAnalysisGroups() == 0) {
-            dependencies.add(new String[] { "analysisGroup", "analysisgroups" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "analysisgrouplabels/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String AnalysisGroupLabelController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("analysisgrouplabel", AnalysisGroupLabel.findAnalysisGroupLabel(id));
-        uiModel.addAttribute("itemId", id);
-        return "analysisgrouplabels/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String AnalysisGroupLabelController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("analysisgrouplabels", AnalysisGroupLabel.findAnalysisGroupLabelEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) AnalysisGroupLabel.countAnalysisGroupLabels() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("analysisgrouplabels", AnalysisGroupLabel.findAllAnalysisGroupLabels(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "analysisgrouplabels/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String AnalysisGroupLabelController.update(@Valid AnalysisGroupLabel analysisGroupLabel, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, analysisGroupLabel);
-            return "analysisgrouplabels/update";
-        }
-        uiModel.asMap().clear();
-        analysisGroupLabel.merge();
-        return "redirect:/analysisgrouplabels/" + encodeUrlPathSegment(analysisGroupLabel.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String AnalysisGroupLabelController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, AnalysisGroupLabel.findAnalysisGroupLabel(id));
-        return "analysisgrouplabels/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String AnalysisGroupLabelController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        AnalysisGroupLabel analysisGroupLabel = AnalysisGroupLabel.findAnalysisGroupLabel(id);
-        analysisGroupLabel.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/analysisgrouplabels";
-    }
-    
-    void AnalysisGroupLabelController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("analysisGroupLabel_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("analysisGroupLabel_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void AnalysisGroupLabelController.populateEditForm(Model uiModel, AnalysisGroupLabel analysisGroupLabel) {
-        uiModel.addAttribute("analysisGroupLabel", analysisGroupLabel);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("analysisgroups", AnalysisGroup.findAllAnalysisGroups());
-    }
-    
-    String AnalysisGroupLabelController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AnalysisGroupLabelController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/AnalysisGroupLabelController_Roo_Controller_Finder.aj
deleted file mode 100755
index 74fd42986..000000000
--- a/src/main/java/com/labsynch/labseer/web/AnalysisGroupLabelController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,57 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.AnalysisGroupLabel;
-import com.labsynch.labseer.web.AnalysisGroupLabelController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect AnalysisGroupLabelController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByAnalysisGroup", "form" }, method = RequestMethod.GET)
-    public String AnalysisGroupLabelController.findAnalysisGroupLabelsByAnalysisGroupForm(Model uiModel) {
-        uiModel.addAttribute("analysisgroups", AnalysisGroup.findAllAnalysisGroups());
-        return "analysisgrouplabels/findAnalysisGroupLabelsByAnalysisGroup";
-    }
-    
-    @RequestMapping(params = "find=ByAnalysisGroup", method = RequestMethod.GET)
-    public String AnalysisGroupLabelController.findAnalysisGroupLabelsByAnalysisGroup(@RequestParam("analysisGroup") AnalysisGroup analysisGroup, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("analysisgrouplabels", AnalysisGroupLabel.findAnalysisGroupLabelsByAnalysisGroup(analysisGroup, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) AnalysisGroupLabel.countFindAnalysisGroupLabelsByAnalysisGroup(analysisGroup) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("analysisgrouplabels", AnalysisGroupLabel.findAnalysisGroupLabelsByAnalysisGroup(analysisGroup, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "analysisgrouplabels/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTransactionEquals", "form" }, method = RequestMethod.GET)
-    public String AnalysisGroupLabelController.findAnalysisGroupLabelsByLsTransactionEqualsForm(Model uiModel) {
-        return "analysisgrouplabels/findAnalysisGroupLabelsByLsTransactionEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", method = RequestMethod.GET)
-    public String AnalysisGroupLabelController.findAnalysisGroupLabelsByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("analysisgrouplabels", AnalysisGroupLabel.findAnalysisGroupLabelsByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) AnalysisGroupLabel.countFindAnalysisGroupLabelsByLsTransactionEquals(lsTransaction) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("analysisgrouplabels", AnalysisGroupLabel.findAnalysisGroupLabelsByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "analysisgrouplabels/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AnalysisGroupLabelController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/AnalysisGroupLabelController_Roo_Controller_Json.aj
deleted file mode 100755
index dc151e9aa..000000000
--- a/src/main/java/com/labsynch/labseer/web/AnalysisGroupLabelController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,137 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.AnalysisGroupLabel;
-import com.labsynch.labseer.web.AnalysisGroupLabelController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect AnalysisGroupLabelController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> AnalysisGroupLabelController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            AnalysisGroupLabel analysisGroupLabel = AnalysisGroupLabel.findAnalysisGroupLabel(id);
-            if (analysisGroupLabel == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(analysisGroupLabel.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> AnalysisGroupLabelController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<AnalysisGroupLabel> result = AnalysisGroupLabel.findAllAnalysisGroupLabels();
-            return new ResponseEntity<String>(AnalysisGroupLabel.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> AnalysisGroupLabelController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            AnalysisGroupLabel analysisGroupLabel = AnalysisGroupLabel.fromJsonToAnalysisGroupLabel(json);
-            analysisGroupLabel.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+analysisGroupLabel.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> AnalysisGroupLabelController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (AnalysisGroupLabel analysisGroupLabel: AnalysisGroupLabel.fromJsonArrayToAnalysisGroupLabels(json)) {
-                analysisGroupLabel.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> AnalysisGroupLabelController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            AnalysisGroupLabel analysisGroupLabel = AnalysisGroupLabel.fromJsonToAnalysisGroupLabel(json);
-            analysisGroupLabel.setId(id);
-            if (analysisGroupLabel.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> AnalysisGroupLabelController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            AnalysisGroupLabel analysisGroupLabel = AnalysisGroupLabel.findAnalysisGroupLabel(id);
-            if (analysisGroupLabel == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            analysisGroupLabel.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByAnalysisGroup", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> AnalysisGroupLabelController.jsonFindAnalysisGroupLabelsByAnalysisGroup(@RequestParam("analysisGroup") AnalysisGroup analysisGroup) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(AnalysisGroupLabel.toJsonArray(AnalysisGroupLabel.findAnalysisGroupLabelsByAnalysisGroup(analysisGroup).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> AnalysisGroupLabelController.jsonFindAnalysisGroupLabelsByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(AnalysisGroupLabel.toJsonArray(AnalysisGroupLabel.findAnalysisGroupLabelsByLsTransactionEquals(lsTransaction).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AnalysisGroupStateController.java b/src/main/java/com/labsynch/labseer/web/AnalysisGroupStateController.java
deleted file mode 100755
index 3561bbb83..000000000
--- a/src/main/java/com/labsynch/labseer/web/AnalysisGroupStateController.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.service.AnalysisGroupStateService;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import flexjson.JSONTokener;
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.apache.commons.io.IOUtils;
-import org.joda.time.format.DateTimeFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-@RooWebJson(jsonObject = AnalysisGroupState.class)
-@Controller
-@RequestMapping("/analysisgroupstates")
-@RooWebScaffold(path = "analysisgroupstates", formBackingObject = AnalysisGroupState.class)
-@RooWebFinder
-@Transactional
-public class AnalysisGroupStateController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AnalysisGroupStateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/AnalysisGroupStateController_Roo_Controller.aj
deleted file mode 100644
index 1b127f2db..000000000
--- a/src/main/java/com/labsynch/labseer/web/AnalysisGroupStateController_Roo_Controller.aj
+++ /dev/null
@@ -1,121 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.web.AnalysisGroupStateController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect AnalysisGroupStateController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String AnalysisGroupStateController.create(@Valid AnalysisGroupState analysisGroupState, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, analysisGroupState);
-            return "analysisgroupstates/create";
-        }
-        uiModel.asMap().clear();
-        analysisGroupState.persist();
-        return "redirect:/analysisgroupstates/" + encodeUrlPathSegment(analysisGroupState.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String AnalysisGroupStateController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new AnalysisGroupState());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (AnalysisGroup.countAnalysisGroups() == 0) {
-            dependencies.add(new String[] { "analysisGroup", "analysisgroups" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "analysisgroupstates/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String AnalysisGroupStateController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("analysisgroupstate", AnalysisGroupState.findAnalysisGroupState(id));
-        uiModel.addAttribute("itemId", id);
-        return "analysisgroupstates/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String AnalysisGroupStateController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("analysisgroupstates", AnalysisGroupState.findAnalysisGroupStateEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) AnalysisGroupState.countAnalysisGroupStates() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("analysisgroupstates", AnalysisGroupState.findAllAnalysisGroupStates(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "analysisgroupstates/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String AnalysisGroupStateController.update(@Valid AnalysisGroupState analysisGroupState, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, analysisGroupState);
-            return "analysisgroupstates/update";
-        }
-        uiModel.asMap().clear();
-        analysisGroupState.merge();
-        return "redirect:/analysisgroupstates/" + encodeUrlPathSegment(analysisGroupState.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String AnalysisGroupStateController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, AnalysisGroupState.findAnalysisGroupState(id));
-        return "analysisgroupstates/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String AnalysisGroupStateController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        AnalysisGroupState analysisGroupState = AnalysisGroupState.findAnalysisGroupState(id);
-        analysisGroupState.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/analysisgroupstates";
-    }
-    
-    void AnalysisGroupStateController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("analysisGroupState_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("analysisGroupState_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void AnalysisGroupStateController.populateEditForm(Model uiModel, AnalysisGroupState analysisGroupState) {
-        uiModel.addAttribute("analysisGroupState", analysisGroupState);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("analysisgroups", AnalysisGroup.findAllAnalysisGroups());
-        uiModel.addAttribute("analysisgroupvalues", AnalysisGroupValue.findAllAnalysisGroupValues());
-    }
-    
-    String AnalysisGroupStateController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AnalysisGroupStateController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/AnalysisGroupStateController_Roo_Controller_Finder.aj
deleted file mode 100755
index 28c0f683c..000000000
--- a/src/main/java/com/labsynch/labseer/web/AnalysisGroupStateController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,118 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import com.labsynch.labseer.web.AnalysisGroupStateController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect AnalysisGroupStateController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByAnalysisGroup", "form" }, method = RequestMethod.GET)
-    public String AnalysisGroupStateController.findAnalysisGroupStatesByAnalysisGroupForm(Model uiModel) {
-        uiModel.addAttribute("analysisgroups", AnalysisGroup.findAllAnalysisGroups());
-        return "analysisgroupstates/findAnalysisGroupStatesByAnalysisGroup";
-    }
-    
-    @RequestMapping(params = "find=ByAnalysisGroup", method = RequestMethod.GET)
-    public String AnalysisGroupStateController.findAnalysisGroupStatesByAnalysisGroup(@RequestParam("analysisGroup") AnalysisGroup analysisGroup, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("analysisgroupstates", AnalysisGroupState.findAnalysisGroupStatesByAnalysisGroup(analysisGroup, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) AnalysisGroupState.countFindAnalysisGroupStatesByAnalysisGroup(analysisGroup) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("analysisgroupstates", AnalysisGroupState.findAnalysisGroupStatesByAnalysisGroup(analysisGroup, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "analysisgroupstates/list";
-    }
-    
-    @RequestMapping(params = { "find=ByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot", "form" }, method = RequestMethod.GET)
-    public String AnalysisGroupStateController.findAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNotForm(Model uiModel) {
-        uiModel.addAttribute("analysisgroups", AnalysisGroup.findAllAnalysisGroups());
-        return "analysisgroupstates/findAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot";
-    }
-    
-    @RequestMapping(params = "find=ByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot", method = RequestMethod.GET)
-    public String AnalysisGroupStateController.findAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(@RequestParam("analysisGroup") AnalysisGroup analysisGroup, @RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind, @RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("analysisgroupstates", AnalysisGroupState.findAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(analysisGroup, lsType, lsKind, ignored, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) AnalysisGroupState.countFindAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(analysisGroup, lsType, lsKind, ignored) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("analysisgroupstates", AnalysisGroupState.findAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(analysisGroup, lsType, lsKind, ignored, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "analysisgroupstates/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTransactionEquals", "form" }, method = RequestMethod.GET)
-    public String AnalysisGroupStateController.findAnalysisGroupStatesByLsTransactionEqualsForm(Model uiModel) {
-        return "analysisgroupstates/findAnalysisGroupStatesByLsTransactionEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", method = RequestMethod.GET)
-    public String AnalysisGroupStateController.findAnalysisGroupStatesByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("analysisgroupstates", AnalysisGroupState.findAnalysisGroupStatesByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) AnalysisGroupState.countFindAnalysisGroupStatesByLsTransactionEquals(lsTransaction) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("analysisgroupstates", AnalysisGroupState.findAnalysisGroupStatesByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "analysisgroupstates/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeAndKindEquals", "form" }, method = RequestMethod.GET)
-    public String AnalysisGroupStateController.findAnalysisGroupStatesByLsTypeAndKindEqualsForm(Model uiModel) {
-        return "analysisgroupstates/findAnalysisGroupStatesByLsTypeAndKindEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeAndKindEquals", method = RequestMethod.GET)
-    public String AnalysisGroupStateController.findAnalysisGroupStatesByLsTypeAndKindEquals(@RequestParam("lsTypeAndKind") String lsTypeAndKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("analysisgroupstates", AnalysisGroupState.findAnalysisGroupStatesByLsTypeAndKindEquals(lsTypeAndKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) AnalysisGroupState.countFindAnalysisGroupStatesByLsTypeAndKindEquals(lsTypeAndKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("analysisgroupstates", AnalysisGroupState.findAnalysisGroupStatesByLsTypeAndKindEquals(lsTypeAndKind, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "analysisgroupstates/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeEqualsAndLsKindEquals", "form" }, method = RequestMethod.GET)
-    public String AnalysisGroupStateController.findAnalysisGroupStatesByLsTypeEqualsAndLsKindEqualsForm(Model uiModel) {
-        return "analysisgroupstates/findAnalysisGroupStatesByLsTypeEqualsAndLsKindEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEquals", method = RequestMethod.GET)
-    public String AnalysisGroupStateController.findAnalysisGroupStatesByLsTypeEqualsAndLsKindEquals(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("analysisgroupstates", AnalysisGroupState.findAnalysisGroupStatesByLsTypeEqualsAndLsKindEquals(lsType, lsKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) AnalysisGroupState.countFindAnalysisGroupStatesByLsTypeEqualsAndLsKindEquals(lsType, lsKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("analysisgroupstates", AnalysisGroupState.findAnalysisGroupStatesByLsTypeEqualsAndLsKindEquals(lsType, lsKind, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "analysisgroupstates/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AnalysisGroupStateController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/AnalysisGroupStateController_Roo_Controller_Json.aj
deleted file mode 100755
index 92451530f..000000000
--- a/src/main/java/com/labsynch/labseer/web/AnalysisGroupStateController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,173 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import com.labsynch.labseer.web.AnalysisGroupStateController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect AnalysisGroupStateController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> AnalysisGroupStateController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            AnalysisGroupState analysisGroupState = AnalysisGroupState.findAnalysisGroupState(id);
-            if (analysisGroupState == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(analysisGroupState.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> AnalysisGroupStateController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<AnalysisGroupState> result = AnalysisGroupState.findAllAnalysisGroupStates();
-            return new ResponseEntity<String>(AnalysisGroupState.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> AnalysisGroupStateController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            AnalysisGroupState analysisGroupState = AnalysisGroupState.fromJsonToAnalysisGroupState(json);
-            analysisGroupState.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+analysisGroupState.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> AnalysisGroupStateController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (AnalysisGroupState analysisGroupState: AnalysisGroupState.fromJsonArrayToAnalysisGroupStates(json)) {
-                analysisGroupState.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> AnalysisGroupStateController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            AnalysisGroupState analysisGroupState = AnalysisGroupState.fromJsonToAnalysisGroupState(json);
-            analysisGroupState.setId(id);
-            if (analysisGroupState.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> AnalysisGroupStateController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            AnalysisGroupState analysisGroupState = AnalysisGroupState.findAnalysisGroupState(id);
-            if (analysisGroupState == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            analysisGroupState.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByAnalysisGroup", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> AnalysisGroupStateController.jsonFindAnalysisGroupStatesByAnalysisGroup(@RequestParam("analysisGroup") AnalysisGroup analysisGroup) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(AnalysisGroupState.toJsonArray(AnalysisGroupState.findAnalysisGroupStatesByAnalysisGroup(analysisGroup).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> AnalysisGroupStateController.jsonFindAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(@RequestParam("analysisGroup") AnalysisGroup analysisGroup, @RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind, @RequestParam(value = "ignored", required = false) boolean ignored) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(AnalysisGroupState.toJsonArray(AnalysisGroupState.findAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(analysisGroup, lsType, lsKind, ignored).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> AnalysisGroupStateController.jsonFindAnalysisGroupStatesByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(AnalysisGroupState.toJsonArray(AnalysisGroupState.findAnalysisGroupStatesByLsTransactionEquals(lsTransaction).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeAndKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> AnalysisGroupStateController.jsonFindAnalysisGroupStatesByLsTypeAndKindEquals(@RequestParam("lsTypeAndKind") String lsTypeAndKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(AnalysisGroupState.toJsonArray(AnalysisGroupState.findAnalysisGroupStatesByLsTypeAndKindEquals(lsTypeAndKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> AnalysisGroupStateController.jsonFindAnalysisGroupStatesByLsTypeEqualsAndLsKindEquals(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(AnalysisGroupState.toJsonArray(AnalysisGroupState.findAnalysisGroupStatesByLsTypeEqualsAndLsKindEquals(lsType, lsKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AnalysisGroupValueBaseDTOController.java b/src/main/java/com/labsynch/labseer/web/AnalysisGroupValueBaseDTOController.java
deleted file mode 100755
index c393c0b19..000000000
--- a/src/main/java/com/labsynch/labseer/web/AnalysisGroupValueBaseDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.AnalysisGroupValueBaseDTO;
-
-@RooWebJson(jsonObject = AnalysisGroupValueBaseDTO.class)
-@Controller
-@RequestMapping("/analysisgroes")
-public class AnalysisGroupValueBaseDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AnalysisGroupValueController.java b/src/main/java/com/labsynch/labseer/web/AnalysisGroupValueController.java
deleted file mode 100755
index 9ebe6c30f..000000000
--- a/src/main/java/com/labsynch/labseer/web/AnalysisGroupValueController.java
+++ /dev/null
@@ -1,278 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.dto.AnalysisGroupValueDTO;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import flexjson.JSONDeserializer;
-import flexjson.JSONTokener;
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.apache.commons.io.IOUtils;
-import org.joda.time.format.DateTimeFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-import org.supercsv.cellprocessor.ift.CellProcessor;
-import org.supercsv.io.CsvBeanWriter;
-import org.supercsv.io.ICsvBeanWriter;
-import org.supercsv.prefs.CsvPreference;
-
-@RooWebJson(jsonObject = AnalysisGroupValue.class)
-@Controller
-@RequestMapping("/analysisgroupvalues")
-@RooWebScaffold(path = "analysisgroupvalues", formBackingObject = AnalysisGroupValue.class)
-@Transactional
-@RooWebFinder
-public class AnalysisGroupValueController {
-
-    private static final Logger logger = LoggerFactory.getLogger(AnalysisGroupValueController.class);
-
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String create(@Valid AnalysisGroupValue analysisGroupValue, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, analysisGroupValue);
-            return "analysisgroupvalues/create";
-        }
-        uiModel.asMap().clear();
-        analysisGroupValue.persist();
-        return "redirect:/analysisgroupvalues/" + encodeUrlPathSegment(analysisGroupValue.getId().toString(), httpServletRequest);
-    }
-
-    @RequestMapping(params = "form", produces = "text/html")
-    public String createForm(Model uiModel) {
-        populateEditForm(uiModel, new AnalysisGroupValue());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (AnalysisGroupState.countAnalysisGroupStates() == 0) {
-            dependencies.add(new String[] { "analysisgroupstate", "analysisgroupstates" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "analysisgroupvalues/create";
-    }
-
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("analysisgroupvalue", AnalysisGroupValue.findAnalysisGroupValue(id));
-        uiModel.addAttribute("itemId", id);
-        return "analysisgroupvalues/show";
-    }
-
-    @RequestMapping(produces = "text/html")
-    public String list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("analysisgroupvalues", AnalysisGroupValue.findAnalysisGroupValueEntries(firstResult, sizeNo));
-            float nrOfPages = (float) AnalysisGroupValue.countAnalysisGroupValues() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("analysisgroupvalues", AnalysisGroupValue.findAllAnalysisGroupValues());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "analysisgroupvalues/list";
-    }
-
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String update(@Valid AnalysisGroupValue analysisGroupValue, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, analysisGroupValue);
-            return "analysisgroupvalues/update";
-        }
-        uiModel.asMap().clear();
-        analysisGroupValue.merge();
-        return "redirect:/analysisgroupvalues/" + encodeUrlPathSegment(analysisGroupValue.getId().toString(), httpServletRequest);
-    }
-
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, AnalysisGroupValue.findAnalysisGroupValue(id));
-        return "analysisgroupvalues/update";
-    }
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        AnalysisGroupValue analysisGroupValue = AnalysisGroupValue.findAnalysisGroupValue(id);
-        analysisGroupValue.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/analysisgroupvalues";
-    }
-
-    void addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("analysisGroupValue_datevalue_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("analysisGroupValue_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("analysisGroupValue_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-
-    void populateEditForm(Model uiModel, AnalysisGroupValue analysisGroupValue) {
-        uiModel.addAttribute("analysisGroupValue", analysisGroupValue);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("analysisgroupstates", AnalysisGroupState.findAllAnalysisGroupStates());
-    }
-
-    String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-
-    @RequestMapping(value = "/{id}", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<java.lang.String> showJson(@PathVariable("id") Long id) {
-        AnalysisGroupValue analysisGroupValue = AnalysisGroupValue.findAnalysisGroupValue(id);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        if (analysisGroupValue == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        return new ResponseEntity<String>(analysisGroupValue.toJson(), headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<java.lang.String> listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        List<AnalysisGroupValue> result = AnalysisGroupValue.findAllAnalysisGroupValues();
-        return new ResponseEntity<String>(AnalysisGroupValue.toJsonArray(result), headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> createFromJson(@RequestBody String json) {
-        AnalysisGroupValue analysisGroupValue = AnalysisGroupValue.fromJsonToAnalysisGroupValue(json);
-        analysisGroupValue.persist();
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-    }
-
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> createFromJsonArray(@RequestBody String json) {
-        for (AnalysisGroupValue analysisGroupValue : AnalysisGroupValue.fromJsonArrayToAnalysisGroupValues(json)) {
-            analysisGroupValue.persist();
-        }
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-    }
-
-    @RequestMapping(method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> updateFromJson(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        AnalysisGroupValue analysisGroupValue = AnalysisGroupValue.fromJsonToAnalysisGroupValue(json);
-        if (analysisGroupValue.merge() == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> updateFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        for (AnalysisGroupValue analysisGroupValue : AnalysisGroupValue.fromJsonArrayToAnalysisGroupValues(json)) {
-            if (analysisGroupValue.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-        }
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> deleteFromJson(@PathVariable("id") Long id) {
-        AnalysisGroupValue analysisGroupValue = AnalysisGroupValue.findAnalysisGroupValue(id);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        if (analysisGroupValue == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        analysisGroupValue.remove();
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(params = "find=ByCodeValueEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<java.lang.String> jsonFindAnalysisGroupValuesByCodeValueEquals(@RequestParam("codeValue") String codeValue) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(AnalysisGroupValue.toJsonArray(AnalysisGroupValue.findAnalysisGroupValuesByCodeValueEquals(codeValue).getResultList()), headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(params = "find=ByIgnoredNotAndCodeValueEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<java.lang.String> jsonFindAnalysisGroupValuesByIgnoredNotAndCodeValueEquals(@RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam("codeValue") String codeValue) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(AnalysisGroupValue.toJsonArray(AnalysisGroupValue.findAnalysisGroupValuesByIgnoredNotAndCodeValueEquals(ignored, codeValue).getResultList()), headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(params = "find=ByLsState", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<java.lang.String> jsonFindAnalysisGroupValuesByLsState(@RequestParam("lsState") AnalysisGroupState lsState) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(AnalysisGroupValue.toJsonArray(AnalysisGroupValue.findAnalysisGroupValuesByLsState(lsState).getResultList()), headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(params = "find=ByLsTransactionEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<java.lang.String> jsonFindAnalysisGroupValuesByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(AnalysisGroupValue.toJsonArray(AnalysisGroupValue.findAnalysisGroupValuesByLsTransactionEquals(lsTransaction).getResultList()), headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<java.lang.String> jsonFindAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(AnalysisGroupValue.toJsonArray(AnalysisGroupValue.findAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals(lsType, lsKind).getResultList()), headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<java.lang.String> jsonFindAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind, @RequestParam("stringValue") String stringValue, @RequestParam(value = "ignored", required = false) boolean ignored) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(AnalysisGroupValue.toJsonArray(AnalysisGroupValue.findAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(lsType, lsKind, stringValue, ignored).getResultList()), headers, HttpStatus.OK);
-    }
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AnalysisGroupValueController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/AnalysisGroupValueController_Roo_Controller_Finder.aj
deleted file mode 100755
index fec5a4148..000000000
--- a/src/main/java/com/labsynch/labseer/web/AnalysisGroupValueController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,137 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.web.AnalysisGroupValueController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect AnalysisGroupValueController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByCodeValueEquals", "form" }, method = RequestMethod.GET)
-    public String AnalysisGroupValueController.findAnalysisGroupValuesByCodeValueEqualsForm(Model uiModel) {
-        return "analysisgroupvalues/findAnalysisGroupValuesByCodeValueEquals";
-    }
-    
-    @RequestMapping(params = "find=ByCodeValueEquals", method = RequestMethod.GET)
-    public String AnalysisGroupValueController.findAnalysisGroupValuesByCodeValueEquals(@RequestParam("codeValue") String codeValue, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("analysisgroupvalues", AnalysisGroupValue.findAnalysisGroupValuesByCodeValueEquals(codeValue, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) AnalysisGroupValue.countFindAnalysisGroupValuesByCodeValueEquals(codeValue) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("analysisgroupvalues", AnalysisGroupValue.findAnalysisGroupValuesByCodeValueEquals(codeValue, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "analysisgroupvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByIgnoredNotAndCodeValueEquals", "form" }, method = RequestMethod.GET)
-    public String AnalysisGroupValueController.findAnalysisGroupValuesByIgnoredNotAndCodeValueEqualsForm(Model uiModel) {
-        return "analysisgroupvalues/findAnalysisGroupValuesByIgnoredNotAndCodeValueEquals";
-    }
-    
-    @RequestMapping(params = "find=ByIgnoredNotAndCodeValueEquals", method = RequestMethod.GET)
-    public String AnalysisGroupValueController.findAnalysisGroupValuesByIgnoredNotAndCodeValueEquals(@RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam("codeValue") String codeValue, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("analysisgroupvalues", AnalysisGroupValue.findAnalysisGroupValuesByIgnoredNotAndCodeValueEquals(ignored, codeValue, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) AnalysisGroupValue.countFindAnalysisGroupValuesByIgnoredNotAndCodeValueEquals(ignored, codeValue) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("analysisgroupvalues", AnalysisGroupValue.findAnalysisGroupValuesByIgnoredNotAndCodeValueEquals(ignored, codeValue, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "analysisgroupvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsState", "form" }, method = RequestMethod.GET)
-    public String AnalysisGroupValueController.findAnalysisGroupValuesByLsStateForm(Model uiModel) {
-        uiModel.addAttribute("analysisgroupstates", AnalysisGroupState.findAllAnalysisGroupStates());
-        return "analysisgroupvalues/findAnalysisGroupValuesByLsState";
-    }
-    
-    @RequestMapping(params = "find=ByLsState", method = RequestMethod.GET)
-    public String AnalysisGroupValueController.findAnalysisGroupValuesByLsState(@RequestParam("lsState") AnalysisGroupState lsState, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("analysisgroupvalues", AnalysisGroupValue.findAnalysisGroupValuesByLsState(lsState, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) AnalysisGroupValue.countFindAnalysisGroupValuesByLsState(lsState) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("analysisgroupvalues", AnalysisGroupValue.findAnalysisGroupValuesByLsState(lsState, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "analysisgroupvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTransactionEquals", "form" }, method = RequestMethod.GET)
-    public String AnalysisGroupValueController.findAnalysisGroupValuesByLsTransactionEqualsForm(Model uiModel) {
-        return "analysisgroupvalues/findAnalysisGroupValuesByLsTransactionEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", method = RequestMethod.GET)
-    public String AnalysisGroupValueController.findAnalysisGroupValuesByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("analysisgroupvalues", AnalysisGroupValue.findAnalysisGroupValuesByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) AnalysisGroupValue.countFindAnalysisGroupValuesByLsTransactionEquals(lsTransaction) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("analysisgroupvalues", AnalysisGroupValue.findAnalysisGroupValuesByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "analysisgroupvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeEqualsAndLsKindEquals", "form" }, method = RequestMethod.GET)
-    public String AnalysisGroupValueController.findAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsForm(Model uiModel) {
-        return "analysisgroupvalues/findAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEquals", method = RequestMethod.GET)
-    public String AnalysisGroupValueController.findAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("analysisgroupvalues", AnalysisGroupValue.findAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals(lsType, lsKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) AnalysisGroupValue.countFindAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals(lsType, lsKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("analysisgroupvalues", AnalysisGroupValue.findAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals(lsType, lsKind, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "analysisgroupvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot", "form" }, method = RequestMethod.GET)
-    public String AnalysisGroupValueController.findAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNotForm(Model uiModel) {
-        return "analysisgroupvalues/findAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot", method = RequestMethod.GET)
-    public String AnalysisGroupValueController.findAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind, @RequestParam("stringValue") String stringValue, @RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("analysisgroupvalues", AnalysisGroupValue.findAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(lsType, lsKind, stringValue, ignored, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) AnalysisGroupValue.countFindAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(lsType, lsKind, stringValue, ignored) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("analysisgroupvalues", AnalysisGroupValue.findAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(lsType, lsKind, stringValue, ignored, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "analysisgroupvalues/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AnalysisGroupValueDTOController.java b/src/main/java/com/labsynch/labseer/web/AnalysisGroupValueDTOController.java
deleted file mode 100755
index 676df3bc1..000000000
--- a/src/main/java/com/labsynch/labseer/web/AnalysisGroupValueDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.AnalysisGroupValueDTO;
-
-@RooWebJson(jsonObject = AnalysisGroupValueDTO.class)
-@Controller
-@RequestMapping("/analysisgroes")
-public class AnalysisGroupValueDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ApiController.java b/src/main/java/com/labsynch/labseer/web/ApiController.java
deleted file mode 100755
index dd090a613..000000000
--- a/src/main/java/com/labsynch/labseer/web/ApiController.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.labsynch.labseer.web;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.labsynch.labseer.service.CorpNameService;
-
-@RequestMapping("/api")
-@Controller
-public class ApiController {
-
-	private static final Logger logger = LoggerFactory.getLogger(ApiController.class);
-
-	@Autowired
-	private CorpNameService corpNameService;
-	
-    @RequestMapping
-    public void get(ModelMap modelMap, HttpServletRequest request, HttpServletResponse response) {
-    }
-   
-		
-    @RequestMapping(value = "/compound/convertBuid/", method = RequestMethod.POST, headers = "Accept=application/text")
-    public ResponseEntity<String> post(@RequestBody String aliasList) {
-		HttpHeaders headers= new HttpHeaders();
-		headers.setContentType(MediaType.TEXT_HTML); 	
-		logger.debug("Input aliasList: " + aliasList);
-		String preferredIds = corpNameService.getPreferredNameFromBuid(aliasList);
-		
-		return new ResponseEntity<String>(preferredIds, headers, HttpStatus.OK);        	
-    }
-    
-    @RequestMapping(value = "/compound/buidLotNumber/", method = RequestMethod.POST, headers = "Accept=application/text")
-    public ResponseEntity<String> buidToLotNumber(@RequestBody String aliasList) {
-		HttpHeaders headers= new HttpHeaders();
-		headers.setContentType(MediaType.TEXT_HTML); 	
-		logger.debug("Input aliasList: " + aliasList);
-		String lotNumbers = corpNameService.getLotNumberFromBuid(aliasList);
-		
-		return new ResponseEntity<String>(lotNumbers, headers, HttpStatus.OK);        	
-    }
-
-    
-	@RequestMapping(method = RequestMethod.OPTIONS)
-	public ResponseEntity<String> getOptions() {
-		HttpHeaders headers= new HttpHeaders();
-		headers.add("Content-Type", "application/text");
-		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
-		headers.setExpires(0); // Expire the cache
-
-		return new ResponseEntity<String>(headers, HttpStatus.OK);
-	}
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ApplicationConversionServiceFactoryBean_Roo_ConversionService.aj.orig b/src/main/java/com/labsynch/labseer/web/ApplicationConversionServiceFactoryBean_Roo_ConversionService.aj.orig
deleted file mode 100644
index 0673636c8..000000000
--- a/src/main/java/com/labsynch/labseer/web/ApplicationConversionServiceFactoryBean_Roo_ConversionService.aj.orig
+++ /dev/null
@@ -1,111 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-<<<<<<< HEAD
-import com.labsynch.labseer.domain.CodeOrigin;
-=======
-import com.labsynch.labseer.domain.ItxExperimentExperiment;
-import com.labsynch.labseer.domain.ItxExperimentExperimentState;
-import com.labsynch.labseer.domain.ItxExperimentExperimentValue;
->>>>>>> many-to-many_gwhite
-import com.labsynch.labseer.web.ApplicationConversionServiceFactoryBean;
-import org.springframework.core.convert.converter.Converter;
-
-privileged aspect ApplicationConversionServiceFactoryBean_Roo_ConversionService {
-    
-<<<<<<< HEAD
-    public Converter<CodeOrigin, String> ApplicationConversionServiceFactoryBean.getCodeOriginToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.CodeOrigin, java.lang.String>() {
-            public String convert(CodeOrigin codeOrigin) {
-                return new StringBuilder().append(codeOrigin.getName()).toString();
-=======
-    public Converter<ItxExperimentExperiment, String> ApplicationConversionServiceFactoryBean.getItxExperimentExperimentToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxExperimentExperiment, java.lang.String>() {
-            public String convert(ItxExperimentExperiment itxExperimentExperiment) {
-                return new StringBuilder().append(itxExperimentExperiment.getLsType()).append(' ').append(itxExperimentExperiment.getLsKind()).append(' ').append(itxExperimentExperiment.getLsTypeAndKind()).append(' ').append(itxExperimentExperiment.getCodeName()).toString();
->>>>>>> many-to-many_gwhite
-            }
-        };
-    }
-    
-<<<<<<< HEAD
-    public Converter<Long, CodeOrigin> ApplicationConversionServiceFactoryBean.getIdToCodeOriginConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.CodeOrigin>() {
-            public com.labsynch.labseer.domain.CodeOrigin convert(java.lang.Long id) {
-                return CodeOrigin.findCodeOrigin(id);
-=======
-    public Converter<Long, ItxExperimentExperiment> ApplicationConversionServiceFactoryBean.getIdToItxExperimentExperimentConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxExperimentExperiment>() {
-            public com.labsynch.labseer.domain.ItxExperimentExperiment convert(java.lang.Long id) {
-                return ItxExperimentExperiment.findItxExperimentExperiment(id);
->>>>>>> many-to-many_gwhite
-            }
-        };
-    }
-    
-<<<<<<< HEAD
-    public Converter<String, CodeOrigin> ApplicationConversionServiceFactoryBean.getStringToCodeOriginConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.CodeOrigin>() {
-            public com.labsynch.labseer.domain.CodeOrigin convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), CodeOrigin.class);
-=======
-    public Converter<String, ItxExperimentExperiment> ApplicationConversionServiceFactoryBean.getStringToItxExperimentExperimentConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxExperimentExperiment>() {
-            public com.labsynch.labseer.domain.ItxExperimentExperiment convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), ItxExperimentExperiment.class);
-            }
-        };
-    }
-    
-    public Converter<ItxExperimentExperimentState, String> ApplicationConversionServiceFactoryBean.getItxExperimentExperimentStateToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxExperimentExperimentState, java.lang.String>() {
-            public String convert(ItxExperimentExperimentState itxExperimentExperimentState) {
-                return new StringBuilder().append(itxExperimentExperimentState.getRecordedBy()).append(' ').append(itxExperimentExperimentState.getRecordedDate()).append(' ').append(itxExperimentExperimentState.getModifiedBy()).append(' ').append(itxExperimentExperimentState.getModifiedDate()).toString();
-            }
-        };
-    }
-    
-    public Converter<Long, ItxExperimentExperimentState> ApplicationConversionServiceFactoryBean.getIdToItxExperimentExperimentStateConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxExperimentExperimentState>() {
-            public com.labsynch.labseer.domain.ItxExperimentExperimentState convert(java.lang.Long id) {
-                return ItxExperimentExperimentState.findItxExperimentExperimentState(id);
-            }
-        };
-    }
-    
-    public Converter<String, ItxExperimentExperimentState> ApplicationConversionServiceFactoryBean.getStringToItxExperimentExperimentStateConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxExperimentExperimentState>() {
-            public com.labsynch.labseer.domain.ItxExperimentExperimentState convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), ItxExperimentExperimentState.class);
-            }
-        };
-    }
-    
-    public Converter<ItxExperimentExperimentValue, String> ApplicationConversionServiceFactoryBean.getItxExperimentExperimentValueToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxExperimentExperimentValue, java.lang.String>() {
-            public String convert(ItxExperimentExperimentValue itxExperimentExperimentValue) {
-                return new StringBuilder().append(itxExperimentExperimentValue.getLsType()).append(' ').append(itxExperimentExperimentValue.getLsKind()).append(' ').append(itxExperimentExperimentValue.getLsTypeAndKind()).append(' ').append(itxExperimentExperimentValue.getCodeType()).toString();
-            }
-        };
-    }
-    
-    public Converter<Long, ItxExperimentExperimentValue> ApplicationConversionServiceFactoryBean.getIdToItxExperimentExperimentValueConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxExperimentExperimentValue>() {
-            public com.labsynch.labseer.domain.ItxExperimentExperimentValue convert(java.lang.Long id) {
-                return ItxExperimentExperimentValue.findItxExperimentExperimentValue(id);
-            }
-        };
-    }
-    
-    public Converter<String, ItxExperimentExperimentValue> ApplicationConversionServiceFactoryBean.getStringToItxExperimentExperimentValueConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxExperimentExperimentValue>() {
-            public com.labsynch.labseer.domain.ItxExperimentExperimentValue convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), ItxExperimentExperimentValue.class);
->>>>>>> many-to-many_gwhite
-            }
-        };
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ApplicationSettingController.java b/src/main/java/com/labsynch/labseer/web/ApplicationSettingController.java
deleted file mode 100755
index 9f55c19b7..000000000
--- a/src/main/java/com/labsynch/labseer/web/ApplicationSettingController.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ApplicationSetting;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RequestMapping("/applicationsettings")
-@Controller
-@RooWebScaffold(path = "applicationsettings", formBackingObject = ApplicationSetting.class)
-@RooWebJson(jsonObject = ApplicationSetting.class)
-@RooWebFinder
-public class ApplicationSettingController {
-
-    @RequestMapping(value = "/{id}", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<java.lang.String> showJson(@PathVariable("id") Long id) {
-        ApplicationSetting applicationSetting = ApplicationSetting.findApplicationSetting(id);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        if (applicationSetting == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        return new ResponseEntity<String>(applicationSetting.toJson(), headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<java.lang.String> listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        List<ApplicationSetting> result = ApplicationSetting.findAllApplicationSettings();
-        return new ResponseEntity<String>(ApplicationSetting.toJsonArray(result), headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(value = "/propname/{propName}", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<java.lang.String> getByPropName(@PathVariable("propName") String propName) {
-        List<ApplicationSetting> applicationSettings = ApplicationSetting.findApplicationSettingsByPropNameEqualsAndIgnoredNot(propName, true).getResultList();
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        if (applicationSettings.size() == 0) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        return new ResponseEntity<String>(ApplicationSetting.toJsonArray(applicationSettings), headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> createFromJson(@RequestBody String json) {
-        ApplicationSetting applicationSetting = ApplicationSetting.fromJsonToApplicationSetting(json);
-        applicationSetting.persist();
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-    }
-
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> createFromJsonArray(@RequestBody String json) {
-        for (ApplicationSetting applicationSetting : ApplicationSetting.fromJsonArrayToApplicationSettings(json)) {
-            applicationSetting.persist();
-        }
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-    }
-
-    @RequestMapping(value = { "/", "/{id}" }, method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> updateFromJson(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        ApplicationSetting applicationSetting = ApplicationSetting.fromJsonToApplicationSetting(json);
-        if (applicationSetting.merge() == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> updateFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        for (ApplicationSetting applicationSetting : ApplicationSetting.fromJsonArrayToApplicationSettings(json)) {
-            if (applicationSetting.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-        }
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> deleteFromJson(@PathVariable("id") Long id) {
-        ApplicationSetting applicationSetting = ApplicationSetting.findApplicationSetting(id);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        if (applicationSetting == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        applicationSetting.remove();
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(params = "find=ByPropNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<java.lang.String> jsonFindApplicationSettingsByPropNameEquals(@RequestParam("propName") String propName) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(ApplicationSetting.toJsonArray(ApplicationSetting.findApplicationSettingsByPropNameEquals(propName).getResultList()), headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(params = "find=ByPropNameEqualsAndIgnoredNot", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<java.lang.String> jsonFindApplicationSettingsByPropNameEqualsAndIgnoredNot(@RequestParam("propName") String propName, @RequestParam(value = "ignored", required = false) boolean ignored) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(ApplicationSetting.toJsonArray(ApplicationSetting.findApplicationSettingsByPropNameEqualsAndIgnoredNot(propName, ignored).getResultList()), headers, HttpStatus.OK);
-    }
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ApplicationSettingController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ApplicationSettingController_Roo_Controller.aj
deleted file mode 100755
index 948f8ce10..000000000
--- a/src/main/java/com/labsynch/labseer/web/ApplicationSettingController_Roo_Controller.aj
+++ /dev/null
@@ -1,109 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ApplicationSetting;
-import com.labsynch.labseer.web.ApplicationSettingController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ApplicationSettingController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ApplicationSettingController.create(@Valid ApplicationSetting applicationSetting, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, applicationSetting);
-            return "applicationsettings/create";
-        }
-        uiModel.asMap().clear();
-        applicationSetting.persist();
-        return "redirect:/applicationsettings/" + encodeUrlPathSegment(applicationSetting.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ApplicationSettingController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ApplicationSetting());
-        return "applicationsettings/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ApplicationSettingController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("applicationsetting", ApplicationSetting.findApplicationSetting(id));
-        uiModel.addAttribute("itemId", id);
-        return "applicationsettings/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ApplicationSettingController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("applicationsettings", ApplicationSetting.findApplicationSettingEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ApplicationSetting.countApplicationSettings() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("applicationsettings", ApplicationSetting.findAllApplicationSettings(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "applicationsettings/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ApplicationSettingController.update(@Valid ApplicationSetting applicationSetting, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, applicationSetting);
-            return "applicationsettings/update";
-        }
-        uiModel.asMap().clear();
-        applicationSetting.merge();
-        return "redirect:/applicationsettings/" + encodeUrlPathSegment(applicationSetting.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ApplicationSettingController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ApplicationSetting.findApplicationSetting(id));
-        return "applicationsettings/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ApplicationSettingController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ApplicationSetting applicationSetting = ApplicationSetting.findApplicationSetting(id);
-        applicationSetting.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/applicationsettings";
-    }
-    
-    void ApplicationSettingController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("applicationSetting_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ApplicationSettingController.populateEditForm(Model uiModel, ApplicationSetting applicationSetting) {
-        uiModel.addAttribute("applicationSetting", applicationSetting);
-        addDateTimeFormatPatterns(uiModel);
-    }
-    
-    String ApplicationSettingController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ApplicationSettingController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/ApplicationSettingController_Roo_Controller_Finder.aj
deleted file mode 100755
index 58d22bf4a..000000000
--- a/src/main/java/com/labsynch/labseer/web/ApplicationSettingController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,55 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ApplicationSetting;
-import com.labsynch.labseer.web.ApplicationSettingController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect ApplicationSettingController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByPropNameEquals", "form" }, method = RequestMethod.GET)
-    public String ApplicationSettingController.findApplicationSettingsByPropNameEqualsForm(Model uiModel) {
-        return "applicationsettings/findApplicationSettingsByPropNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByPropNameEquals", method = RequestMethod.GET)
-    public String ApplicationSettingController.findApplicationSettingsByPropNameEquals(@RequestParam("propName") String propName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("applicationsettings", ApplicationSetting.findApplicationSettingsByPropNameEquals(propName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ApplicationSetting.countFindApplicationSettingsByPropNameEquals(propName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("applicationsettings", ApplicationSetting.findApplicationSettingsByPropNameEquals(propName, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "applicationsettings/list";
-    }
-    
-    @RequestMapping(params = { "find=ByPropNameEqualsAndIgnoredNot", "form" }, method = RequestMethod.GET)
-    public String ApplicationSettingController.findApplicationSettingsByPropNameEqualsAndIgnoredNotForm(Model uiModel) {
-        return "applicationsettings/findApplicationSettingsByPropNameEqualsAndIgnoredNot";
-    }
-    
-    @RequestMapping(params = "find=ByPropNameEqualsAndIgnoredNot", method = RequestMethod.GET)
-    public String ApplicationSettingController.findApplicationSettingsByPropNameEqualsAndIgnoredNot(@RequestParam("propName") String propName, @RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("applicationsettings", ApplicationSetting.findApplicationSettingsByPropNameEqualsAndIgnoredNot(propName, ignored, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ApplicationSetting.countFindApplicationSettingsByPropNameEqualsAndIgnoredNot(propName, ignored) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("applicationsettings", ApplicationSetting.findApplicationSettingsByPropNameEqualsAndIgnoredNot(propName, ignored, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "applicationsettings/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AuthorController.java b/src/main/java/com/labsynch/labseer/web/AuthorController.java
deleted file mode 100755
index e4bff42d2..000000000
--- a/src/main/java/com/labsynch/labseer/web/AuthorController.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Author;
-
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RooWebJson(jsonObject = Author.class)
-@Controller
-@RequestMapping("/authors")
-@RooWebScaffold(path = "authors", formBackingObject = Author.class)
-@RooWebFinder
-public class AuthorController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AuthorController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/AuthorController_Roo_Controller.aj
deleted file mode 100755
index 23e8110db..000000000
--- a/src/main/java/com/labsynch/labseer/web/AuthorController_Roo_Controller.aj
+++ /dev/null
@@ -1,119 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.AuthorLabel;
-import com.labsynch.labseer.domain.AuthorRole;
-import com.labsynch.labseer.domain.AuthorState;
-import com.labsynch.labseer.domain.ThingPage;
-import com.labsynch.labseer.web.AuthorController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect AuthorController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String AuthorController.create(@Valid Author author, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, author);
-            return "authors/create";
-        }
-        uiModel.asMap().clear();
-        author.persist();
-        return "redirect:/authors/" + encodeUrlPathSegment(author.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String AuthorController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new Author());
-        return "authors/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String AuthorController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("author", Author.findAuthor(id));
-        uiModel.addAttribute("itemId", id);
-        return "authors/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String AuthorController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("authors", Author.findAuthorEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) Author.countAuthors() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("authors", Author.findAllAuthors(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "authors/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String AuthorController.update(@Valid Author author, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, author);
-            return "authors/update";
-        }
-        uiModel.asMap().clear();
-        author.merge();
-        return "redirect:/authors/" + encodeUrlPathSegment(author.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String AuthorController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, Author.findAuthor(id));
-        return "authors/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String AuthorController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        Author author = Author.findAuthor(id);
-        author.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/authors";
-    }
-    
-    void AuthorController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("author_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("author_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("author_activationdate_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
-    }
-    
-    void AuthorController.populateEditForm(Model uiModel, Author author) {
-        uiModel.addAttribute("author", author);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("authorlabels", AuthorLabel.findAllAuthorLabels());
-        uiModel.addAttribute("authorroles", AuthorRole.findAllAuthorRoles());
-        uiModel.addAttribute("authorstates", AuthorState.findAllAuthorStates());
-        uiModel.addAttribute("thingpages", ThingPage.findAllThingPages());
-    }
-    
-    String AuthorController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AuthorController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/AuthorController_Roo_Controller_Finder.aj
deleted file mode 100644
index af962f1a3..000000000
--- a/src/main/java/com/labsynch/labseer/web/AuthorController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,75 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.web.AuthorController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect AuthorController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByActivationKeyAndEmailAddress", "form" }, method = RequestMethod.GET)
-    public String AuthorController.findAuthorsByActivationKeyAndEmailAddressForm(Model uiModel) {
-        return "authors/findAuthorsByActivationKeyAndEmailAddress";
-    }
-    
-    @RequestMapping(params = "find=ByActivationKeyAndEmailAddress", method = RequestMethod.GET)
-    public String AuthorController.findAuthorsByActivationKeyAndEmailAddress(@RequestParam("activationKey") String activationKey, @RequestParam("emailAddress") String emailAddress, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("authors", Author.findAuthorsByActivationKeyAndEmailAddress(activationKey, emailAddress, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Author.countFindAuthorsByActivationKeyAndEmailAddress(activationKey, emailAddress) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("authors", Author.findAuthorsByActivationKeyAndEmailAddress(activationKey, emailAddress, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "authors/list";
-    }
-    
-    @RequestMapping(params = { "find=ByEmailAddress", "form" }, method = RequestMethod.GET)
-    public String AuthorController.findAuthorsByEmailAddressForm(Model uiModel) {
-        return "authors/findAuthorsByEmailAddress";
-    }
-    
-    @RequestMapping(params = "find=ByEmailAddress", method = RequestMethod.GET)
-    public String AuthorController.findAuthorsByEmailAddress(@RequestParam("emailAddress") String emailAddress, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("authors", Author.findAuthorsByEmailAddress(emailAddress, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Author.countFindAuthorsByEmailAddress(emailAddress) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("authors", Author.findAuthorsByEmailAddress(emailAddress, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "authors/list";
-    }
-    
-    @RequestMapping(params = { "find=ByUserName", "form" }, method = RequestMethod.GET)
-    public String AuthorController.findAuthorsByUserNameForm(Model uiModel) {
-        return "authors/findAuthorsByUserName";
-    }
-    
-    @RequestMapping(params = "find=ByUserName", method = RequestMethod.GET)
-    public String AuthorController.findAuthorsByUserName(@RequestParam("userName") String userName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("authors", Author.findAuthorsByUserName(userName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Author.countFindAuthorsByUserName(userName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("authors", Author.findAuthorsByUserName(userName, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "authors/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AuthorController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/AuthorController_Roo_Controller_Json.aj
deleted file mode 100644
index 2c8e39f3a..000000000
--- a/src/main/java/com/labsynch/labseer/web/AuthorController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,148 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.web.AuthorController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect AuthorController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> AuthorController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            Author author = Author.findAuthor(id);
-            if (author == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(author.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> AuthorController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<Author> result = Author.findAllAuthors();
-            return new ResponseEntity<String>(Author.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> AuthorController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            Author author = Author.fromJsonToAuthor(json);
-            author.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+author.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> AuthorController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (Author author: Author.fromJsonArrayToAuthors(json)) {
-                author.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> AuthorController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            Author author = Author.fromJsonToAuthor(json);
-            author.setId(id);
-            if (author.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> AuthorController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            Author author = Author.findAuthor(id);
-            if (author == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            author.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByActivationKeyAndEmailAddress", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> AuthorController.jsonFindAuthorsByActivationKeyAndEmailAddress(@RequestParam("activationKey") String activationKey, @RequestParam("emailAddress") String emailAddress) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Author.toJsonArray(Author.findAuthorsByActivationKeyAndEmailAddress(activationKey, emailAddress).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByEmailAddress", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> AuthorController.jsonFindAuthorsByEmailAddress(@RequestParam("emailAddress") String emailAddress) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Author.toJsonArray(Author.findAuthorsByEmailAddress(emailAddress).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByUserName", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> AuthorController.jsonFindAuthorsByUserName(@RequestParam("userName") String userName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Author.toJsonArray(Author.findAuthorsByUserName(userName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AuthorLabelController.java b/src/main/java/com/labsynch/labseer/web/AuthorLabelController.java
deleted file mode 100644
index 1dd984dc7..000000000
--- a/src/main/java/com/labsynch/labseer/web/AuthorLabelController.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.AuthorLabel;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/authorlabels")
-@Controller
-@RooWebScaffold(path = "authorlabels", formBackingObject = AuthorLabel.class)
-public class AuthorLabelController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AuthorLabelController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/AuthorLabelController_Roo_Controller.aj
deleted file mode 100644
index badf255c7..000000000
--- a/src/main/java/com/labsynch/labseer/web/AuthorLabelController_Roo_Controller.aj
+++ /dev/null
@@ -1,119 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.AuthorLabel;
-import com.labsynch.labseer.web.AuthorLabelController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect AuthorLabelController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String AuthorLabelController.create(@Valid AuthorLabel authorLabel, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, authorLabel);
-            return "authorlabels/create";
-        }
-        uiModel.asMap().clear();
-        authorLabel.persist();
-        return "redirect:/authorlabels/" + encodeUrlPathSegment(authorLabel.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String AuthorLabelController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new AuthorLabel());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (Author.countAuthors() == 0) {
-            dependencies.add(new String[] { "author", "authors" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "authorlabels/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String AuthorLabelController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("authorlabel", AuthorLabel.findAuthorLabel(id));
-        uiModel.addAttribute("itemId", id);
-        return "authorlabels/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String AuthorLabelController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("authorlabels", AuthorLabel.findAuthorLabelEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) AuthorLabel.countAuthorLabels() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("authorlabels", AuthorLabel.findAllAuthorLabels(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "authorlabels/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String AuthorLabelController.update(@Valid AuthorLabel authorLabel, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, authorLabel);
-            return "authorlabels/update";
-        }
-        uiModel.asMap().clear();
-        authorLabel.merge();
-        return "redirect:/authorlabels/" + encodeUrlPathSegment(authorLabel.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String AuthorLabelController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, AuthorLabel.findAuthorLabel(id));
-        return "authorlabels/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String AuthorLabelController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        AuthorLabel authorLabel = AuthorLabel.findAuthorLabel(id);
-        authorLabel.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/authorlabels";
-    }
-    
-    void AuthorLabelController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("authorLabel_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("authorLabel_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void AuthorLabelController.populateEditForm(Model uiModel, AuthorLabel authorLabel) {
-        uiModel.addAttribute("authorLabel", authorLabel);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("authors", Author.findAllAuthors());
-    }
-    
-    String AuthorLabelController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AuthorNameDTOController.java b/src/main/java/com/labsynch/labseer/web/AuthorNameDTOController.java
deleted file mode 100755
index 1edc85943..000000000
--- a/src/main/java/com/labsynch/labseer/web/AuthorNameDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.AuthorNameDTO;
-
-@RooWebJson(jsonObject = AuthorNameDTO.class)
-@Controller
-@RequestMapping("/authoes")
-public class AuthorNameDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AuthorRoleController.java b/src/main/java/com/labsynch/labseer/web/AuthorRoleController.java
deleted file mode 100755
index b81af95d6..000000000
--- a/src/main/java/com/labsynch/labseer/web/AuthorRoleController.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.AuthorRole;
-import com.labsynch.labseer.domain.LsRole;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-@RooWebJson(jsonObject = AuthorRole.class)
-@RooWebFinder
-@RequestMapping("/authorroles")
-@Controller
-@RooWebScaffold(path = "authorroles", formBackingObject = AuthorRole.class)
-public class AuthorRoleController {
-
-    private static final Logger logger = LoggerFactory.getLogger(AuthorRoleController.class);
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AuthorRoleController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/AuthorRoleController_Roo_Controller.aj
deleted file mode 100644
index f9a0599ff..000000000
--- a/src/main/java/com/labsynch/labseer/web/AuthorRoleController_Roo_Controller.aj
+++ /dev/null
@@ -1,114 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.AuthorRole;
-import com.labsynch.labseer.domain.LsRole;
-import com.labsynch.labseer.web.AuthorRoleController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect AuthorRoleController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String AuthorRoleController.create(@Valid AuthorRole authorRole, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, authorRole);
-            return "authorroles/create";
-        }
-        uiModel.asMap().clear();
-        authorRole.persist();
-        return "redirect:/authorroles/" + encodeUrlPathSegment(authorRole.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String AuthorRoleController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new AuthorRole());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (Author.countAuthors() == 0) {
-            dependencies.add(new String[] { "userEntry", "authors" });
-        }
-        if (LsRole.countLsRoles() == 0) {
-            dependencies.add(new String[] { "roleEntry", "lsroles" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "authorroles/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String AuthorRoleController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("authorrole", AuthorRole.findAuthorRole(id));
-        uiModel.addAttribute("itemId", id);
-        return "authorroles/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String AuthorRoleController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("authorroles", AuthorRole.findAuthorRoleEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) AuthorRole.countAuthorRoles() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("authorroles", AuthorRole.findAllAuthorRoles(sortFieldName, sortOrder));
-        }
-        return "authorroles/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String AuthorRoleController.update(@Valid AuthorRole authorRole, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, authorRole);
-            return "authorroles/update";
-        }
-        uiModel.asMap().clear();
-        authorRole.merge();
-        return "redirect:/authorroles/" + encodeUrlPathSegment(authorRole.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String AuthorRoleController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, AuthorRole.findAuthorRole(id));
-        return "authorroles/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String AuthorRoleController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        AuthorRole authorRole = AuthorRole.findAuthorRole(id);
-        authorRole.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/authorroles";
-    }
-    
-    void AuthorRoleController.populateEditForm(Model uiModel, AuthorRole authorRole) {
-        uiModel.addAttribute("authorRole", authorRole);
-        uiModel.addAttribute("authors", Author.findAllAuthors());
-        uiModel.addAttribute("lsroles", LsRole.findAllLsRoles());
-    }
-    
-    String AuthorRoleController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AuthorRoleController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/AuthorRoleController_Roo_Controller_Finder.aj
deleted file mode 100755
index a44b6c94a..000000000
--- a/src/main/java/com/labsynch/labseer/web/AuthorRoleController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,78 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.AuthorRole;
-import com.labsynch.labseer.domain.LsRole;
-import com.labsynch.labseer.web.AuthorRoleController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect AuthorRoleController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByRoleEntry", "form" }, method = RequestMethod.GET)
-    public String AuthorRoleController.findAuthorRolesByRoleEntryForm(Model uiModel) {
-        uiModel.addAttribute("lsroles", LsRole.findAllLsRoles());
-        return "authorroles/findAuthorRolesByRoleEntry";
-    }
-    
-    @RequestMapping(params = "find=ByRoleEntry", method = RequestMethod.GET)
-    public String AuthorRoleController.findAuthorRolesByRoleEntry(@RequestParam("roleEntry") LsRole roleEntry, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("authorroles", AuthorRole.findAuthorRolesByRoleEntry(roleEntry, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) AuthorRole.countFindAuthorRolesByRoleEntry(roleEntry) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("authorroles", AuthorRole.findAuthorRolesByRoleEntry(roleEntry, sortFieldName, sortOrder).getResultList());
-        }
-        return "authorroles/list";
-    }
-    
-    @RequestMapping(params = { "find=ByRoleEntryAndUserEntry", "form" }, method = RequestMethod.GET)
-    public String AuthorRoleController.findAuthorRolesByRoleEntryAndUserEntryForm(Model uiModel) {
-        uiModel.addAttribute("lsroles", LsRole.findAllLsRoles());
-        uiModel.addAttribute("authors", Author.findAllAuthors());
-        return "authorroles/findAuthorRolesByRoleEntryAndUserEntry";
-    }
-    
-    @RequestMapping(params = "find=ByRoleEntryAndUserEntry", method = RequestMethod.GET)
-    public String AuthorRoleController.findAuthorRolesByRoleEntryAndUserEntry(@RequestParam("roleEntry") LsRole roleEntry, @RequestParam("userEntry") Author userEntry, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("authorroles", AuthorRole.findAuthorRolesByRoleEntryAndUserEntry(roleEntry, userEntry, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) AuthorRole.countFindAuthorRolesByRoleEntryAndUserEntry(roleEntry, userEntry) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("authorroles", AuthorRole.findAuthorRolesByRoleEntryAndUserEntry(roleEntry, userEntry, sortFieldName, sortOrder).getResultList());
-        }
-        return "authorroles/list";
-    }
-    
-    @RequestMapping(params = { "find=ByUserEntry", "form" }, method = RequestMethod.GET)
-    public String AuthorRoleController.findAuthorRolesByUserEntryForm(Model uiModel) {
-        uiModel.addAttribute("authors", Author.findAllAuthors());
-        return "authorroles/findAuthorRolesByUserEntry";
-    }
-    
-    @RequestMapping(params = "find=ByUserEntry", method = RequestMethod.GET)
-    public String AuthorRoleController.findAuthorRolesByUserEntry(@RequestParam("userEntry") Author userEntry, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("authorroles", AuthorRole.findAuthorRolesByUserEntry(userEntry, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) AuthorRole.countFindAuthorRolesByUserEntry(userEntry) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("authorroles", AuthorRole.findAuthorRolesByUserEntry(userEntry, sortFieldName, sortOrder).getResultList());
-        }
-        return "authorroles/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AuthorRoleController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/AuthorRoleController_Roo_Controller_Json.aj
deleted file mode 100755
index 0fbffeb1f..000000000
--- a/src/main/java/com/labsynch/labseer/web/AuthorRoleController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,150 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.AuthorRole;
-import com.labsynch.labseer.domain.LsRole;
-import com.labsynch.labseer.web.AuthorRoleController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect AuthorRoleController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> AuthorRoleController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            AuthorRole authorRole = AuthorRole.findAuthorRole(id);
-            if (authorRole == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(authorRole.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> AuthorRoleController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<AuthorRole> result = AuthorRole.findAllAuthorRoles();
-            return new ResponseEntity<String>(AuthorRole.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> AuthorRoleController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            AuthorRole authorRole = AuthorRole.fromJsonToAuthorRole(json);
-            authorRole.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+authorRole.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> AuthorRoleController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (AuthorRole authorRole: AuthorRole.fromJsonArrayToAuthorRoles(json)) {
-                authorRole.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> AuthorRoleController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            AuthorRole authorRole = AuthorRole.fromJsonToAuthorRole(json);
-            authorRole.setId(id);
-            if (authorRole.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> AuthorRoleController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            AuthorRole authorRole = AuthorRole.findAuthorRole(id);
-            if (authorRole == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            authorRole.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByRoleEntry", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> AuthorRoleController.jsonFindAuthorRolesByRoleEntry(@RequestParam("roleEntry") LsRole roleEntry) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(AuthorRole.toJsonArray(AuthorRole.findAuthorRolesByRoleEntry(roleEntry).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByRoleEntryAndUserEntry", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> AuthorRoleController.jsonFindAuthorRolesByRoleEntryAndUserEntry(@RequestParam("roleEntry") LsRole roleEntry, @RequestParam("userEntry") Author userEntry) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(AuthorRole.toJsonArray(AuthorRole.findAuthorRolesByRoleEntryAndUserEntry(roleEntry, userEntry).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByUserEntry", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> AuthorRoleController.jsonFindAuthorRolesByUserEntry(@RequestParam("userEntry") Author userEntry) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(AuthorRole.toJsonArray(AuthorRole.findAuthorRolesByUserEntry(userEntry).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AuthorStateController.java b/src/main/java/com/labsynch/labseer/web/AuthorStateController.java
deleted file mode 100644
index 3152903e0..000000000
--- a/src/main/java/com/labsynch/labseer/web/AuthorStateController.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.AuthorState;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/authorstates")
-@Controller
-@RooWebScaffold(path = "authorstates", formBackingObject = AuthorState.class)
-public class AuthorStateController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AuthorStateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/AuthorStateController_Roo_Controller.aj
deleted file mode 100644
index 0052b8aee..000000000
--- a/src/main/java/com/labsynch/labseer/web/AuthorStateController_Roo_Controller.aj
+++ /dev/null
@@ -1,121 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.AuthorState;
-import com.labsynch.labseer.domain.AuthorValue;
-import com.labsynch.labseer.web.AuthorStateController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect AuthorStateController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String AuthorStateController.create(@Valid AuthorState authorState, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, authorState);
-            return "authorstates/create";
-        }
-        uiModel.asMap().clear();
-        authorState.persist();
-        return "redirect:/authorstates/" + encodeUrlPathSegment(authorState.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String AuthorStateController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new AuthorState());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (Author.countAuthors() == 0) {
-            dependencies.add(new String[] { "author", "authors" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "authorstates/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String AuthorStateController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("authorstate", AuthorState.findAuthorState(id));
-        uiModel.addAttribute("itemId", id);
-        return "authorstates/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String AuthorStateController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("authorstates", AuthorState.findAuthorStateEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) AuthorState.countAuthorStates() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("authorstates", AuthorState.findAllAuthorStates(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "authorstates/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String AuthorStateController.update(@Valid AuthorState authorState, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, authorState);
-            return "authorstates/update";
-        }
-        uiModel.asMap().clear();
-        authorState.merge();
-        return "redirect:/authorstates/" + encodeUrlPathSegment(authorState.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String AuthorStateController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, AuthorState.findAuthorState(id));
-        return "authorstates/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String AuthorStateController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        AuthorState authorState = AuthorState.findAuthorState(id);
-        authorState.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/authorstates";
-    }
-    
-    void AuthorStateController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("authorState_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("authorState_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void AuthorStateController.populateEditForm(Model uiModel, AuthorState authorState) {
-        uiModel.addAttribute("authorState", authorState);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("authors", Author.findAllAuthors());
-        uiModel.addAttribute("authorvalues", AuthorValue.findAllAuthorValues());
-    }
-    
-    String AuthorStateController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AuthorValueController.java b/src/main/java/com/labsynch/labseer/web/AuthorValueController.java
deleted file mode 100644
index ac120ebaf..000000000
--- a/src/main/java/com/labsynch/labseer/web/AuthorValueController.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.AuthorValue;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/authorvalues")
-@Controller
-@RooWebScaffold(path = "authorvalues", formBackingObject = AuthorValue.class)
-public class AuthorValueController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AuthorValueController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/AuthorValueController_Roo_Controller.aj
deleted file mode 100644
index ab17ef64c..000000000
--- a/src/main/java/com/labsynch/labseer/web/AuthorValueController_Roo_Controller.aj
+++ /dev/null
@@ -1,120 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.AuthorState;
-import com.labsynch.labseer.domain.AuthorValue;
-import com.labsynch.labseer.web.AuthorValueController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect AuthorValueController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String AuthorValueController.create(@Valid AuthorValue authorValue, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, authorValue);
-            return "authorvalues/create";
-        }
-        uiModel.asMap().clear();
-        authorValue.persist();
-        return "redirect:/authorvalues/" + encodeUrlPathSegment(authorValue.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String AuthorValueController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new AuthorValue());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (AuthorState.countAuthorStates() == 0) {
-            dependencies.add(new String[] { "lsState", "authorstates" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "authorvalues/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String AuthorValueController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("authorvalue", AuthorValue.findAuthorValue(id));
-        uiModel.addAttribute("itemId", id);
-        return "authorvalues/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String AuthorValueController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("authorvalues", AuthorValue.findAuthorValueEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) AuthorValue.countAuthorValues() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("authorvalues", AuthorValue.findAllAuthorValues(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "authorvalues/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String AuthorValueController.update(@Valid AuthorValue authorValue, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, authorValue);
-            return "authorvalues/update";
-        }
-        uiModel.asMap().clear();
-        authorValue.merge();
-        return "redirect:/authorvalues/" + encodeUrlPathSegment(authorValue.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String AuthorValueController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, AuthorValue.findAuthorValue(id));
-        return "authorvalues/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String AuthorValueController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        AuthorValue authorValue = AuthorValue.findAuthorValue(id);
-        authorValue.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/authorvalues";
-    }
-    
-    void AuthorValueController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("authorValue_datevalue_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("authorValue_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("authorValue_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void AuthorValueController.populateEditForm(Model uiModel, AuthorValue authorValue) {
-        uiModel.addAttribute("authorValue", authorValue);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("authorstates", AuthorState.findAllAuthorStates());
-    }
-    
-    String AuthorValueController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/AutoLabelDTOController.java b/src/main/java/com/labsynch/labseer/web/AutoLabelDTOController.java
deleted file mode 100755
index de1117679..000000000
--- a/src/main/java/com/labsynch/labseer/web/AutoLabelDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.AutoLabelDTO;
-
-@RooWebJson(jsonObject = AutoLabelDTO.class)
-@Controller
-@RequestMapping("/autoes")
-public class AutoLabelDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/BatchCodeDTOController.java b/src/main/java/com/labsynch/labseer/web/BatchCodeDTOController.java
deleted file mode 100755
index 9f1fa0ff1..000000000
--- a/src/main/java/com/labsynch/labseer/web/BatchCodeDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.BatchCodeDTO;
-
-@RooWebJson(jsonObject = BatchCodeDTO.class)
-@Controller
-@RequestMapping("/batchcoes")
-public class BatchCodeDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/BulkLoadFileController.java b/src/main/java/com/labsynch/labseer/web/BulkLoadFileController.java
deleted file mode 100644
index 878af6072..000000000
--- a/src/main/java/com/labsynch/labseer/web/BulkLoadFileController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-import com.labsynch.labseer.domain.BulkLoadFile;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-
-@RequestMapping("/bulkloadfiles")
-@Controller
-@RooWebScaffold(path = "bulkloadfiles", formBackingObject = BulkLoadFile.class)
-@RooWebFinder
-public class BulkLoadFileController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/BulkLoadFileController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/BulkLoadFileController_Roo_Controller.aj
deleted file mode 100644
index 257bb37b3..000000000
--- a/src/main/java/com/labsynch/labseer/web/BulkLoadFileController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.BulkLoadFile;
-import com.labsynch.labseer.web.BulkLoadFileController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect BulkLoadFileController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String BulkLoadFileController.create(@Valid BulkLoadFile bulkLoadFile, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, bulkLoadFile);
-            return "bulkloadfiles/create";
-        }
-        uiModel.asMap().clear();
-        bulkLoadFile.persist();
-        return "redirect:/bulkloadfiles/" + encodeUrlPathSegment(bulkLoadFile.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String BulkLoadFileController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new BulkLoadFile());
-        return "bulkloadfiles/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String BulkLoadFileController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("bulkloadfile", BulkLoadFile.findBulkLoadFile(id));
-        uiModel.addAttribute("itemId", id);
-        return "bulkloadfiles/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String BulkLoadFileController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("bulkloadfiles", BulkLoadFile.findBulkLoadFileEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) BulkLoadFile.countBulkLoadFiles() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("bulkloadfiles", BulkLoadFile.findAllBulkLoadFiles(sortFieldName, sortOrder));
-        }
-        return "bulkloadfiles/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String BulkLoadFileController.update(@Valid BulkLoadFile bulkLoadFile, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, bulkLoadFile);
-            return "bulkloadfiles/update";
-        }
-        uiModel.asMap().clear();
-        bulkLoadFile.merge();
-        return "redirect:/bulkloadfiles/" + encodeUrlPathSegment(bulkLoadFile.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String BulkLoadFileController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, BulkLoadFile.findBulkLoadFile(id));
-        return "bulkloadfiles/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String BulkLoadFileController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        BulkLoadFile bulkLoadFile = BulkLoadFile.findBulkLoadFile(id);
-        bulkLoadFile.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/bulkloadfiles";
-    }
-    
-    void BulkLoadFileController.populateEditForm(Model uiModel, BulkLoadFile bulkLoadFile) {
-        uiModel.addAttribute("bulkLoadFile", bulkLoadFile);
-    }
-    
-    String BulkLoadFileController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/BulkLoadFileController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/BulkLoadFileController_Roo_Controller_Finder.aj
deleted file mode 100644
index b9ae03c23..000000000
--- a/src/main/java/com/labsynch/labseer/web/BulkLoadFileController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,53 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.BulkLoadFile;
-import com.labsynch.labseer.web.BulkLoadFileController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect BulkLoadFileController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByFileNameEquals", "form" }, method = RequestMethod.GET)
-    public String BulkLoadFileController.findBulkLoadFilesByFileNameEqualsForm(Model uiModel) {
-        return "bulkloadfiles/findBulkLoadFilesByFileNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByFileNameEquals", method = RequestMethod.GET)
-    public String BulkLoadFileController.findBulkLoadFilesByFileNameEquals(@RequestParam("fileName") String fileName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("bulkloadfiles", BulkLoadFile.findBulkLoadFilesByFileNameEquals(fileName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) BulkLoadFile.countFindBulkLoadFilesByFileNameEquals(fileName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("bulkloadfiles", BulkLoadFile.findBulkLoadFilesByFileNameEquals(fileName, sortFieldName, sortOrder).getResultList());
-        }
-        return "bulkloadfiles/list";
-    }
-    
-    @RequestMapping(params = { "find=ByRecordedByEquals", "form" }, method = RequestMethod.GET)
-    public String BulkLoadFileController.findBulkLoadFilesByRecordedByEqualsForm(Model uiModel) {
-        return "bulkloadfiles/findBulkLoadFilesByRecordedByEquals";
-    }
-    
-    @RequestMapping(params = "find=ByRecordedByEquals", method = RequestMethod.GET)
-    public String BulkLoadFileController.findBulkLoadFilesByRecordedByEquals(@RequestParam("recordedBy") String recordedBy, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("bulkloadfiles", BulkLoadFile.findBulkLoadFilesByRecordedByEquals(recordedBy, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) BulkLoadFile.countFindBulkLoadFilesByRecordedByEquals(recordedBy) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("bulkloadfiles", BulkLoadFile.findBulkLoadFilesByRecordedByEquals(recordedBy, sortFieldName, sortOrder).getResultList());
-        }
-        return "bulkloadfiles/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/BulkLoadTemplateController.java b/src/main/java/com/labsynch/labseer/web/BulkLoadTemplateController.java
deleted file mode 100644
index 067089b60..000000000
--- a/src/main/java/com/labsynch/labseer/web/BulkLoadTemplateController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-import com.labsynch.labseer.domain.BulkLoadTemplate;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-
-@RequestMapping("/bulkloadtemplates")
-@Controller
-@RooWebScaffold(path = "bulkloadtemplates", formBackingObject = BulkLoadTemplate.class)
-@RooWebFinder
-public class BulkLoadTemplateController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/BulkLoadTemplateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/BulkLoadTemplateController_Roo_Controller.aj
deleted file mode 100644
index b816d878b..000000000
--- a/src/main/java/com/labsynch/labseer/web/BulkLoadTemplateController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.BulkLoadTemplate;
-import com.labsynch.labseer.web.BulkLoadTemplateController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect BulkLoadTemplateController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String BulkLoadTemplateController.create(@Valid BulkLoadTemplate bulkLoadTemplate, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, bulkLoadTemplate);
-            return "bulkloadtemplates/create";
-        }
-        uiModel.asMap().clear();
-        bulkLoadTemplate.persist();
-        return "redirect:/bulkloadtemplates/" + encodeUrlPathSegment(bulkLoadTemplate.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String BulkLoadTemplateController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new BulkLoadTemplate());
-        return "bulkloadtemplates/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String BulkLoadTemplateController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("bulkloadtemplate", BulkLoadTemplate.findBulkLoadTemplate(id));
-        uiModel.addAttribute("itemId", id);
-        return "bulkloadtemplates/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String BulkLoadTemplateController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("bulkloadtemplates", BulkLoadTemplate.findBulkLoadTemplateEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) BulkLoadTemplate.countBulkLoadTemplates() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("bulkloadtemplates", BulkLoadTemplate.findAllBulkLoadTemplates(sortFieldName, sortOrder));
-        }
-        return "bulkloadtemplates/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String BulkLoadTemplateController.update(@Valid BulkLoadTemplate bulkLoadTemplate, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, bulkLoadTemplate);
-            return "bulkloadtemplates/update";
-        }
-        uiModel.asMap().clear();
-        bulkLoadTemplate.merge();
-        return "redirect:/bulkloadtemplates/" + encodeUrlPathSegment(bulkLoadTemplate.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String BulkLoadTemplateController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, BulkLoadTemplate.findBulkLoadTemplate(id));
-        return "bulkloadtemplates/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String BulkLoadTemplateController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        BulkLoadTemplate bulkLoadTemplate = BulkLoadTemplate.findBulkLoadTemplate(id);
-        bulkLoadTemplate.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/bulkloadtemplates";
-    }
-    
-    void BulkLoadTemplateController.populateEditForm(Model uiModel, BulkLoadTemplate bulkLoadTemplate) {
-        uiModel.addAttribute("bulkLoadTemplate", bulkLoadTemplate);
-    }
-    
-    String BulkLoadTemplateController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/BulkLoadTemplateController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/BulkLoadTemplateController_Roo_Controller_Finder.aj
deleted file mode 100644
index 47acba28b..000000000
--- a/src/main/java/com/labsynch/labseer/web/BulkLoadTemplateController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,72 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.BulkLoadTemplate;
-import com.labsynch.labseer.web.BulkLoadTemplateController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect BulkLoadTemplateController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByRecordedByEquals", "form" }, method = RequestMethod.GET)
-    public String BulkLoadTemplateController.findBulkLoadTemplatesByRecordedByEqualsForm(Model uiModel) {
-        return "bulkloadtemplates/findBulkLoadTemplatesByRecordedByEquals";
-    }
-    
-    @RequestMapping(params = "find=ByRecordedByEquals", method = RequestMethod.GET)
-    public String BulkLoadTemplateController.findBulkLoadTemplatesByRecordedByEquals(@RequestParam("recordedBy") String recordedBy, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("bulkloadtemplates", BulkLoadTemplate.findBulkLoadTemplatesByRecordedByEquals(recordedBy, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) BulkLoadTemplate.countFindBulkLoadTemplatesByRecordedByEquals(recordedBy) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("bulkloadtemplates", BulkLoadTemplate.findBulkLoadTemplatesByRecordedByEquals(recordedBy, sortFieldName, sortOrder).getResultList());
-        }
-        return "bulkloadtemplates/list";
-    }
-    
-    @RequestMapping(params = { "find=ByTemplateNameEquals", "form" }, method = RequestMethod.GET)
-    public String BulkLoadTemplateController.findBulkLoadTemplatesByTemplateNameEqualsForm(Model uiModel) {
-        return "bulkloadtemplates/findBulkLoadTemplatesByTemplateNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByTemplateNameEquals", method = RequestMethod.GET)
-    public String BulkLoadTemplateController.findBulkLoadTemplatesByTemplateNameEquals(@RequestParam("templateName") String templateName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("bulkloadtemplates", BulkLoadTemplate.findBulkLoadTemplatesByTemplateNameEquals(templateName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) BulkLoadTemplate.countFindBulkLoadTemplatesByTemplateNameEquals(templateName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("bulkloadtemplates", BulkLoadTemplate.findBulkLoadTemplatesByTemplateNameEquals(templateName, sortFieldName, sortOrder).getResultList());
-        }
-        return "bulkloadtemplates/list";
-    }
-    
-    @RequestMapping(params = { "find=ByTemplateNameEqualsAndRecordedByEquals", "form" }, method = RequestMethod.GET)
-    public String BulkLoadTemplateController.findBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEqualsForm(Model uiModel) {
-        return "bulkloadtemplates/findBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals";
-    }
-    
-    @RequestMapping(params = "find=ByTemplateNameEqualsAndRecordedByEquals", method = RequestMethod.GET)
-    public String BulkLoadTemplateController.findBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals(@RequestParam("templateName") String templateName, @RequestParam("recordedBy") String recordedBy, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("bulkloadtemplates", BulkLoadTemplate.findBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals(templateName, recordedBy, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) BulkLoadTemplate.countFindBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals(templateName, recordedBy) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("bulkloadtemplates", BulkLoadTemplate.findBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals(templateName, recordedBy, sortFieldName, sortOrder).getResultList());
-        }
-        return "bulkloadtemplates/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/BulkTransferPart1DTOController.java b/src/main/java/com/labsynch/labseer/web/BulkTransferPart1DTOController.java
deleted file mode 100755
index 206003270..000000000
--- a/src/main/java/com/labsynch/labseer/web/BulkTransferPart1DTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.BulkTransferPart1DTO;
-
-@RooWebJson(jsonObject = BulkTransferPart1DTO.class)
-@Controller
-@RequestMapping("/bulktransferpart1dto")
-public class BulkTransferPart1DTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ChangePasswordController.java b/src/main/java/com/labsynch/labseer/web/ChangePasswordController.java
deleted file mode 100755
index d7545f907..000000000
--- a/src/main/java/com/labsynch/labseer/web/ChangePasswordController.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.labsynch.labseer.web;
-
-import java.io.UnsupportedEncodingException;
-import java.security.NoSuchAlgorithmException;
-
-import javax.persistence.Query;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.stereotype.Controller;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.service.DatabaseAuthenticationProvider;
-
-
-@RequestMapping("/changepassword/**")
-@Controller
-public class ChangePasswordController {
-	
-    private static final Logger logger = LoggerFactory.getLogger(ChangePasswordController.class);
-
-	
-	@Autowired
-	private ChangePasswordValidator validator;
-
-	@ModelAttribute("changePasswordForm")
-	public ChangePasswordForm formBackingObject() {
-		return new ChangePasswordForm();
-	}
-
-	@RequestMapping(value = "/index", produces = "text/html")
-	public String index() {
-		if (SecurityContextHolder.getContext().getAuthentication()
-				.isAuthenticated()) {
-			return "changepassword/index";
-		} else {
-			return "login";
-		}
-	}
-
-	@RequestMapping(value = "/update", method = RequestMethod.POST, produces = "text/html")
-	public String update(
-			@ModelAttribute("changePasswordForm") ChangePasswordForm form,
-			BindingResult result) {
-		validator.validate(form, result);
-		if (result.hasErrors()) {
-			return "changepassword/index"; // back to form
-		} else {
-			if (SecurityContextHolder.getContext().getAuthentication()
-					.isAuthenticated()) {
-				UserDetails userDetails = (UserDetails) SecurityContextHolder
-						.getContext().getAuthentication().getPrincipal();
-				String newPassword = form.getNewPassword();
-				Query query = Author
-						.findAuthorsByUserName(userDetails.getUsername());
-				Author person = (Author) query.getSingleResult();
-				
-				
-	    	    String encryptedPassword = null;
-	    		try {
-	    			encryptedPassword = DatabaseAuthenticationProvider.getBase64ShaHash(newPassword);
-	    		} catch (NoSuchAlgorithmException e1) {
-	    			// TODO Auto-generated catch block
-	    			e1.printStackTrace();
-	    		} catch (UnsupportedEncodingException e1) {
-	    			// TODO Auto-generated catch block
-	    			e1.printStackTrace();
-	    		} catch (Exception e){
-	    			logger.error("general error:" + e.toString());
-	    		}
-	            person.setPassword(encryptedPassword);
-	            logger.debug("changing password");
-	            logger.debug(person.toJson());
-				
-				person.merge();
-				return "changepassword/thanks";
-			} else {
-				return "login";
-			}
-		}
-	}
-
-	@RequestMapping(value = "/thanks", produces = "text/html")
-	public String thanks() {
-		return "changepassword/thanks";
-	}
-
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ChangePasswordForm.java b/src/main/java/com/labsynch/labseer/web/ChangePasswordForm.java
deleted file mode 100755
index 5a540eaad..000000000
--- a/src/main/java/com/labsynch/labseer/web/ChangePasswordForm.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * 
- */
-package com.labsynch.labseer.web;
-
-/**
- * @author rohit
- * 
- */
-public class ChangePasswordForm {
-
-	private String oldPassword;
-	private String newPassword;
-	private String newPasswordAgain;
-
-	public String getOldPassword() {
-		return oldPassword;
-	}
-
-	public void setOldPassword(String oldPassword) {
-		this.oldPassword = oldPassword;
-	}
-
-	public String getNewPassword() {
-		return newPassword;
-	}
-
-	public void setNewPassword(String newPassword) {
-		this.newPassword = newPassword;
-	}
-
-	public String getNewPasswordAgain() {
-		return newPasswordAgain;
-	}
-
-	public void setNewPasswordAgain(String newPasswordAgain) {
-		this.newPasswordAgain = newPasswordAgain;
-	}
-
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ChangePasswordValidator.java b/src/main/java/com/labsynch/labseer/web/ChangePasswordValidator.java
deleted file mode 100755
index b150b1538..000000000
--- a/src/main/java/com/labsynch/labseer/web/ChangePasswordValidator.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * 
- */
-package com.labsynch.labseer.web;
-
-import java.io.UnsupportedEncodingException;
-import java.security.NoSuchAlgorithmException;
-
-import javax.persistence.EntityNotFoundException;
-import javax.persistence.NonUniqueResultException;
-import javax.persistence.Query;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.stereotype.Service;
-import org.springframework.validation.Errors;
-import org.springframework.validation.Validator;
-
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.service.DatabaseAuthenticationProvider;
-
-/**
- * @author rohit
- * 
- */
-@Service("changePasswordValidator")
-public class ChangePasswordValidator implements Validator {
-	
-    private static final Logger logger = LoggerFactory.getLogger(ChangePasswordValidator.class);
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.springframework.validation.Validator#supports(java.lang.Class)
-	 */
-	@Override
-	public boolean supports(Class<?> clazz) {
-		return ChangePasswordForm.class.equals(clazz);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.springframework.validation.Validator#validate(java.lang.Object,
-	 * org.springframework.validation.Errors)
-	 */
-	@Override
-	public void validate(Object target, Errors errors) {
-		ChangePasswordForm form = (ChangePasswordForm) target;
-
-		try {
-			if (SecurityContextHolder.getContext().getAuthentication()
-					.isAuthenticated()) {
-				UserDetails userDetails = (UserDetails) SecurityContextHolder
-						.getContext().getAuthentication().getPrincipal();
-				Query query = Author
-						.findAuthorsByUserName(userDetails.getUsername());
-				if(null!=query){
-					Author person = (Author) query.getSingleResult();
-					String storedPassword = person.getPassword();
-					String currentPassword = form.getOldPassword();
-					
-		    	    String encryptedPassword = null;
-		    		try {
-		    			encryptedPassword = DatabaseAuthenticationProvider.getBase64ShaHash(currentPassword);
-		    		} catch (NoSuchAlgorithmException e1) {
-		    			// TODO Auto-generated catch block
-		    			e1.printStackTrace();
-		    		} catch (UnsupportedEncodingException e1) {
-		    			// TODO Auto-generated catch block
-		    			e1.printStackTrace();
-		    		} catch (Exception e){
-		    			logger.error("general error:" + e.toString());
-		    		}
-					
-		    		logger.debug("stored password: " + storedPassword);
-		    		logger.debug("encryptedPassword password: " + encryptedPassword);
-		    		
-		    		
-					if (!storedPassword.equals(encryptedPassword)) {
-						errors.rejectValue("oldPassword",
-								"changepassword.invalidpassword");
-					}
-					
-					String newPassword = form.getNewPassword();
-					String newPasswordAgain = form.getNewPasswordAgain();
-					if (!newPassword.equals(newPasswordAgain)) {
-						errors.reject("changepassword.passwordsnomatch");
-					}
-				}
-			}
-		} catch (EntityNotFoundException e) {
-			errors.rejectValue("emailAddress",
-					"changepassword.invalidemailaddress");
-		} catch (NonUniqueResultException e) {
-			errors.rejectValue("emailAddress",
-					"changepassword.duplicateemailaddress");
-		}
-	}
-
-}
diff --git a/src/main/java/com/labsynch/labseer/web/CmpdRegAppSettingController.java b/src/main/java/com/labsynch/labseer/web/CmpdRegAppSettingController.java
deleted file mode 100644
index c891db1fc..000000000
--- a/src/main/java/com/labsynch/labseer/web/CmpdRegAppSettingController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.labsynch.labseer.web;
-import javax.servlet.http.HttpServletRequest;
-
-
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.domain.CmpdRegAppSetting;
-
-@RequestMapping("/cmpdregappsettings")
-@Controller
-@RooWebScaffold(path = "cmpdregappsettings", formBackingObject = CmpdRegAppSetting.class)
-@RooWebFinder
-
-public class CmpdRegAppSettingController {
-	
-
-}
diff --git a/src/main/java/com/labsynch/labseer/web/CmpdRegAppSettingController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/CmpdRegAppSettingController_Roo_Controller.aj
deleted file mode 100644
index 978670286..000000000
--- a/src/main/java/com/labsynch/labseer/web/CmpdRegAppSettingController_Roo_Controller.aj
+++ /dev/null
@@ -1,109 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.CmpdRegAppSetting;
-import com.labsynch.labseer.web.CmpdRegAppSettingController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect CmpdRegAppSettingController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String CmpdRegAppSettingController.create(@Valid CmpdRegAppSetting cmpdRegAppSetting, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, cmpdRegAppSetting);
-            return "cmpdregappsettings/create";
-        }
-        uiModel.asMap().clear();
-        cmpdRegAppSetting.persist();
-        return "redirect:/cmpdregappsettings/" + encodeUrlPathSegment(cmpdRegAppSetting.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String CmpdRegAppSettingController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new CmpdRegAppSetting());
-        return "cmpdregappsettings/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String CmpdRegAppSettingController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("cmpdregappsetting", CmpdRegAppSetting.findCmpdRegAppSetting(id));
-        uiModel.addAttribute("itemId", id);
-        return "cmpdregappsettings/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String CmpdRegAppSettingController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("cmpdregappsettings", CmpdRegAppSetting.findCmpdRegAppSettingEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) CmpdRegAppSetting.countCmpdRegAppSettings() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("cmpdregappsettings", CmpdRegAppSetting.findAllCmpdRegAppSettings(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "cmpdregappsettings/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String CmpdRegAppSettingController.update(@Valid CmpdRegAppSetting cmpdRegAppSetting, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, cmpdRegAppSetting);
-            return "cmpdregappsettings/update";
-        }
-        uiModel.asMap().clear();
-        cmpdRegAppSetting.merge();
-        return "redirect:/cmpdregappsettings/" + encodeUrlPathSegment(cmpdRegAppSetting.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String CmpdRegAppSettingController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, CmpdRegAppSetting.findCmpdRegAppSetting(id));
-        return "cmpdregappsettings/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String CmpdRegAppSettingController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        CmpdRegAppSetting cmpdRegAppSetting = CmpdRegAppSetting.findCmpdRegAppSetting(id);
-        cmpdRegAppSetting.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/cmpdregappsettings";
-    }
-    
-    void CmpdRegAppSettingController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("cmpdRegAppSetting_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void CmpdRegAppSettingController.populateEditForm(Model uiModel, CmpdRegAppSetting cmpdRegAppSetting) {
-        uiModel.addAttribute("cmpdRegAppSetting", cmpdRegAppSetting);
-        addDateTimeFormatPatterns(uiModel);
-    }
-    
-    String CmpdRegAppSettingController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/CodeKindController.java b/src/main/java/com/labsynch/labseer/web/CodeKindController.java
deleted file mode 100755
index d83927b32..000000000
--- a/src/main/java/com/labsynch/labseer/web/CodeKindController.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.CodeKind;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/codekinds")
-@Controller
-@RooWebScaffold(path = "codekinds", formBackingObject = CodeKind.class)
-@RooWebFinder
-@RooWebJson(jsonObject = CodeKind.class)
-public class CodeKindController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/CodeKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/CodeKindController_Roo_Controller.aj
deleted file mode 100755
index f712e4b96..000000000
--- a/src/main/java/com/labsynch/labseer/web/CodeKindController_Roo_Controller.aj
+++ /dev/null
@@ -1,109 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.CodeKind;
-import com.labsynch.labseer.domain.CodeType;
-import com.labsynch.labseer.web.CodeKindController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect CodeKindController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String CodeKindController.create(@Valid CodeKind codeKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, codeKind);
-            return "codekinds/create";
-        }
-        uiModel.asMap().clear();
-        codeKind.persist();
-        return "redirect:/codekinds/" + encodeUrlPathSegment(codeKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String CodeKindController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new CodeKind());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (CodeType.countCodeTypes() == 0) {
-            dependencies.add(new String[] { "lsType", "codetypes" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "codekinds/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String CodeKindController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("codekind", CodeKind.findCodeKind(id));
-        uiModel.addAttribute("itemId", id);
-        return "codekinds/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String CodeKindController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("codekinds", CodeKind.findCodeKindEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) CodeKind.countCodeKinds() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("codekinds", CodeKind.findAllCodeKinds(sortFieldName, sortOrder));
-        }
-        return "codekinds/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String CodeKindController.update(@Valid CodeKind codeKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, codeKind);
-            return "codekinds/update";
-        }
-        uiModel.asMap().clear();
-        codeKind.merge();
-        return "redirect:/codekinds/" + encodeUrlPathSegment(codeKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String CodeKindController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, CodeKind.findCodeKind(id));
-        return "codekinds/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String CodeKindController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        CodeKind codeKind = CodeKind.findCodeKind(id);
-        codeKind.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/codekinds";
-    }
-    
-    void CodeKindController.populateEditForm(Model uiModel, CodeKind codeKind) {
-        uiModel.addAttribute("codeKind", codeKind);
-        uiModel.addAttribute("codetypes", CodeType.findAllCodeTypes());
-    }
-    
-    String CodeKindController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/CodeKindController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/CodeKindController_Roo_Controller_Finder.aj
deleted file mode 100755
index 9e33d956b..000000000
--- a/src/main/java/com/labsynch/labseer/web/CodeKindController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,75 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.CodeKind;
-import com.labsynch.labseer.domain.CodeType;
-import com.labsynch.labseer.web.CodeKindController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect CodeKindController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByKindNameEqualsAndLsType", "form" }, method = RequestMethod.GET)
-    public String CodeKindController.findCodeKindsByKindNameEqualsAndLsTypeForm(Model uiModel) {
-        uiModel.addAttribute("codetypes", CodeType.findAllCodeTypes());
-        return "codekinds/findCodeKindsByKindNameEqualsAndLsType";
-    }
-    
-    @RequestMapping(params = "find=ByKindNameEqualsAndLsType", method = RequestMethod.GET)
-    public String CodeKindController.findCodeKindsByKindNameEqualsAndLsType(@RequestParam("kindName") String kindName, @RequestParam("lsType") CodeType lsType, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("codekinds", CodeKind.findCodeKindsByKindNameEqualsAndLsType(kindName, lsType, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) CodeKind.countFindCodeKindsByKindNameEqualsAndLsType(kindName, lsType) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("codekinds", CodeKind.findCodeKindsByKindNameEqualsAndLsType(kindName, lsType, sortFieldName, sortOrder).getResultList());
-        }
-        return "codekinds/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsType", "form" }, method = RequestMethod.GET)
-    public String CodeKindController.findCodeKindsByLsTypeForm(Model uiModel) {
-        uiModel.addAttribute("codetypes", CodeType.findAllCodeTypes());
-        return "codekinds/findCodeKindsByLsType";
-    }
-    
-    @RequestMapping(params = "find=ByLsType", method = RequestMethod.GET)
-    public String CodeKindController.findCodeKindsByLsType(@RequestParam("lsType") CodeType lsType, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("codekinds", CodeKind.findCodeKindsByLsType(lsType, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) CodeKind.countFindCodeKindsByLsType(lsType) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("codekinds", CodeKind.findCodeKindsByLsType(lsType, sortFieldName, sortOrder).getResultList());
-        }
-        return "codekinds/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeAndKindEquals", "form" }, method = RequestMethod.GET)
-    public String CodeKindController.findCodeKindsByLsTypeAndKindEqualsForm(Model uiModel) {
-        return "codekinds/findCodeKindsByLsTypeAndKindEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeAndKindEquals", method = RequestMethod.GET)
-    public String CodeKindController.findCodeKindsByLsTypeAndKindEquals(@RequestParam("lsTypeAndKind") String lsTypeAndKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("codekinds", CodeKind.findCodeKindsByLsTypeAndKindEquals(lsTypeAndKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) CodeKind.countFindCodeKindsByLsTypeAndKindEquals(lsTypeAndKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("codekinds", CodeKind.findCodeKindsByLsTypeAndKindEquals(lsTypeAndKind, sortFieldName, sortOrder).getResultList());
-        }
-        return "codekinds/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/CodeKindController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/CodeKindController_Roo_Controller_Json.aj
deleted file mode 100755
index 51fd8cc27..000000000
--- a/src/main/java/com/labsynch/labseer/web/CodeKindController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,149 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.CodeKind;
-import com.labsynch.labseer.domain.CodeType;
-import com.labsynch.labseer.web.CodeKindController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect CodeKindController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> CodeKindController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            CodeKind codeKind = CodeKind.findCodeKind(id);
-            if (codeKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(codeKind.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> CodeKindController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<CodeKind> result = CodeKind.findAllCodeKinds();
-            return new ResponseEntity<String>(CodeKind.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> CodeKindController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            CodeKind codeKind = CodeKind.fromJsonToCodeKind(json);
-            codeKind.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+codeKind.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> CodeKindController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (CodeKind codeKind: CodeKind.fromJsonArrayToCodeKinds(json)) {
-                codeKind.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> CodeKindController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            CodeKind codeKind = CodeKind.fromJsonToCodeKind(json);
-            codeKind.setId(id);
-            if (codeKind.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> CodeKindController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            CodeKind codeKind = CodeKind.findCodeKind(id);
-            if (codeKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            codeKind.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByKindNameEqualsAndLsType", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> CodeKindController.jsonFindCodeKindsByKindNameEqualsAndLsType(@RequestParam("kindName") String kindName, @RequestParam("lsType") CodeType lsType) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(CodeKind.toJsonArray(CodeKind.findCodeKindsByKindNameEqualsAndLsType(kindName, lsType).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsType", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> CodeKindController.jsonFindCodeKindsByLsType(@RequestParam("lsType") CodeType lsType) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(CodeKind.toJsonArray(CodeKind.findCodeKindsByLsType(lsType).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeAndKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> CodeKindController.jsonFindCodeKindsByLsTypeAndKindEquals(@RequestParam("lsTypeAndKind") String lsTypeAndKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(CodeKind.toJsonArray(CodeKind.findCodeKindsByLsTypeAndKindEquals(lsTypeAndKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/CodeOriginController.java b/src/main/java/com/labsynch/labseer/web/CodeOriginController.java
deleted file mode 100644
index b4a8756a9..000000000
--- a/src/main/java/com/labsynch/labseer/web/CodeOriginController.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.CodeOrigin;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/codeorigins")
-@Controller
-@RooWebScaffold(path = "codeorigins", formBackingObject = CodeOrigin.class)
-public class CodeOriginController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/CodeOriginController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/CodeOriginController_Roo_Controller.aj
deleted file mode 100644
index 534c3401e..000000000
--- a/src/main/java/com/labsynch/labseer/web/CodeOriginController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.CodeOrigin;
-import com.labsynch.labseer.web.CodeOriginController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect CodeOriginController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String CodeOriginController.create(@Valid CodeOrigin codeOrigin, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, codeOrigin);
-            return "codeorigins/create";
-        }
-        uiModel.asMap().clear();
-        codeOrigin.persist();
-        return "redirect:/codeorigins/" + encodeUrlPathSegment(codeOrigin.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String CodeOriginController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new CodeOrigin());
-        return "codeorigins/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String CodeOriginController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("codeorigin", CodeOrigin.findCodeOrigin(id));
-        uiModel.addAttribute("itemId", id);
-        return "codeorigins/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String CodeOriginController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("codeorigins", CodeOrigin.findCodeOriginEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) CodeOrigin.countCodeOrigins() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("codeorigins", CodeOrigin.findAllCodeOrigins(sortFieldName, sortOrder));
-        }
-        return "codeorigins/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String CodeOriginController.update(@Valid CodeOrigin codeOrigin, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, codeOrigin);
-            return "codeorigins/update";
-        }
-        uiModel.asMap().clear();
-        codeOrigin.merge();
-        return "redirect:/codeorigins/" + encodeUrlPathSegment(codeOrigin.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String CodeOriginController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, CodeOrigin.findCodeOrigin(id));
-        return "codeorigins/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String CodeOriginController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        CodeOrigin codeOrigin = CodeOrigin.findCodeOrigin(id);
-        codeOrigin.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/codeorigins";
-    }
-    
-    void CodeOriginController.populateEditForm(Model uiModel, CodeOrigin codeOrigin) {
-        uiModel.addAttribute("codeOrigin", codeOrigin);
-    }
-    
-    String CodeOriginController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/CodeTableDTOController.java b/src/main/java/com/labsynch/labseer/web/CodeTableDTOController.java
deleted file mode 100755
index eb0253d0a..000000000
--- a/src/main/java/com/labsynch/labseer/web/CodeTableDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.CodeTableDTO;
-
-@RooWebJson(jsonObject = CodeTableDTO.class)
-@Controller
-@RequestMapping("/coes")
-public class CodeTableDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/CodeTypeController.java b/src/main/java/com/labsynch/labseer/web/CodeTypeController.java
deleted file mode 100755
index fc5f15bd8..000000000
--- a/src/main/java/com/labsynch/labseer/web/CodeTypeController.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.CodeType;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/codetypes")
-@Controller
-@RooWebScaffold(path = "codetypes", formBackingObject = CodeType.class)
-@RooWebFinder
-@RooWebJson(jsonObject = CodeType.class)
-public class CodeTypeController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/CodeTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/CodeTypeController_Roo_Controller.aj
deleted file mode 100755
index 0ae21a78f..000000000
--- a/src/main/java/com/labsynch/labseer/web/CodeTypeController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.CodeType;
-import com.labsynch.labseer.web.CodeTypeController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect CodeTypeController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String CodeTypeController.create(@Valid CodeType codeType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, codeType);
-            return "codetypes/create";
-        }
-        uiModel.asMap().clear();
-        codeType.persist();
-        return "redirect:/codetypes/" + encodeUrlPathSegment(codeType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String CodeTypeController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new CodeType());
-        return "codetypes/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String CodeTypeController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("codetype", CodeType.findCodeType(id));
-        uiModel.addAttribute("itemId", id);
-        return "codetypes/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String CodeTypeController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("codetypes", CodeType.findCodeTypeEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) CodeType.countCodeTypes() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("codetypes", CodeType.findAllCodeTypes(sortFieldName, sortOrder));
-        }
-        return "codetypes/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String CodeTypeController.update(@Valid CodeType codeType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, codeType);
-            return "codetypes/update";
-        }
-        uiModel.asMap().clear();
-        codeType.merge();
-        return "redirect:/codetypes/" + encodeUrlPathSegment(codeType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String CodeTypeController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, CodeType.findCodeType(id));
-        return "codetypes/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String CodeTypeController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        CodeType codeType = CodeType.findCodeType(id);
-        codeType.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/codetypes";
-    }
-    
-    void CodeTypeController.populateEditForm(Model uiModel, CodeType codeType) {
-        uiModel.addAttribute("codeType", codeType);
-    }
-    
-    String CodeTypeController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/CodeTypeController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/CodeTypeController_Roo_Controller_Finder.aj
deleted file mode 100755
index f6436e236..000000000
--- a/src/main/java/com/labsynch/labseer/web/CodeTypeController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.CodeType;
-import com.labsynch.labseer.web.CodeTypeController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect CodeTypeController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByTypeNameEquals", "form" }, method = RequestMethod.GET)
-    public String CodeTypeController.findCodeTypesByTypeNameEqualsForm(Model uiModel) {
-        return "codetypes/findCodeTypesByTypeNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByTypeNameEquals", method = RequestMethod.GET)
-    public String CodeTypeController.findCodeTypesByTypeNameEquals(@RequestParam("typeName") String typeName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("codetypes", CodeType.findCodeTypesByTypeNameEquals(typeName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) CodeType.countFindCodeTypesByTypeNameEquals(typeName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("codetypes", CodeType.findCodeTypesByTypeNameEquals(typeName, sortFieldName, sortOrder).getResultList());
-        }
-        return "codetypes/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/CodeTypeController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/CodeTypeController_Roo_Controller_Json.aj
deleted file mode 100755
index 7fbb5666a..000000000
--- a/src/main/java/com/labsynch/labseer/web/CodeTypeController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,124 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.CodeType;
-import com.labsynch.labseer.web.CodeTypeController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect CodeTypeController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> CodeTypeController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            CodeType codeType = CodeType.findCodeType(id);
-            if (codeType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(codeType.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> CodeTypeController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<CodeType> result = CodeType.findAllCodeTypes();
-            return new ResponseEntity<String>(CodeType.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> CodeTypeController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            CodeType codeType = CodeType.fromJsonToCodeType(json);
-            codeType.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+codeType.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> CodeTypeController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (CodeType codeType: CodeType.fromJsonArrayToCodeTypes(json)) {
-                codeType.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> CodeTypeController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            CodeType codeType = CodeType.fromJsonToCodeType(json);
-            codeType.setId(id);
-            if (codeType.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> CodeTypeController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            CodeType codeType = CodeType.findCodeType(id);
-            if (codeType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            codeType.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByTypeNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> CodeTypeController.jsonFindCodeTypesByTypeNameEquals(@RequestParam("typeName") String typeName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(CodeType.toJsonArray(CodeType.findCodeTypesByTypeNameEquals(typeName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/CompoundController.java b/src/main/java/com/labsynch/labseer/web/CompoundController.java
deleted file mode 100644
index d44f30932..000000000
--- a/src/main/java/com/labsynch/labseer/web/CompoundController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-import com.labsynch.labseer.domain.Compound;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-
-@RequestMapping("/compounds")
-@Controller
-@RooWebScaffold(path = "compounds", formBackingObject = Compound.class)
-@RooWebFinder
-public class CompoundController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/CompoundController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/CompoundController_Roo_Controller.aj
deleted file mode 100644
index 998bb8ad3..000000000
--- a/src/main/java/com/labsynch/labseer/web/CompoundController_Roo_Controller.aj
+++ /dev/null
@@ -1,110 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Compound;
-import com.labsynch.labseer.web.CompoundController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect CompoundController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String CompoundController.create(@Valid Compound compound, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, compound);
-            return "compounds/create";
-        }
-        uiModel.asMap().clear();
-        compound.persist();
-        return "redirect:/compounds/" + encodeUrlPathSegment(compound.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String CompoundController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new Compound());
-        return "compounds/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String CompoundController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("compound", Compound.findCompound(id));
-        uiModel.addAttribute("itemId", id);
-        return "compounds/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String CompoundController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("compounds", Compound.findCompoundEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) Compound.countCompounds() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("compounds", Compound.findAllCompounds(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "compounds/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String CompoundController.update(@Valid Compound compound, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, compound);
-            return "compounds/update";
-        }
-        uiModel.asMap().clear();
-        compound.merge();
-        return "redirect:/compounds/" + encodeUrlPathSegment(compound.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String CompoundController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, Compound.findCompound(id));
-        return "compounds/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String CompoundController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        Compound compound = Compound.findCompound(id);
-        compound.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/compounds";
-    }
-    
-    void CompoundController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("compound_createddate_date_format", DateTimeFormat.patternForStyle("S-", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("compound_modifieddate_date_format", DateTimeFormat.patternForStyle("S-", LocaleContextHolder.getLocale()));
-    }
-    
-    void CompoundController.populateEditForm(Model uiModel, Compound compound) {
-        uiModel.addAttribute("compound", compound);
-        addDateTimeFormatPatterns(uiModel);
-    }
-    
-    String CompoundController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/CompoundController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/CompoundController_Roo_Controller_Finder.aj
deleted file mode 100644
index a0e02815c..000000000
--- a/src/main/java/com/labsynch/labseer/web/CompoundController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,55 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Compound;
-import com.labsynch.labseer.web.CompoundController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect CompoundController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByCdId", "form" }, method = RequestMethod.GET)
-    public String CompoundController.findCompoundsByCdIdForm(Model uiModel) {
-        return "compounds/findCompoundsByCdId";
-    }
-    
-    @RequestMapping(params = "find=ByCdId", method = RequestMethod.GET)
-    public String CompoundController.findCompoundsByCdId(@RequestParam("cdId") int CdId, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("compounds", Compound.findCompoundsByCdId(CdId, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Compound.countFindCompoundsByCdId(CdId) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("compounds", Compound.findCompoundsByCdId(CdId, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "compounds/list";
-    }
-    
-    @RequestMapping(params = { "find=ByExternal_idEquals", "form" }, method = RequestMethod.GET)
-    public String CompoundController.findCompoundsByExternal_idEqualsForm(Model uiModel) {
-        return "compounds/findCompoundsByExternal_idEquals";
-    }
-    
-    @RequestMapping(params = "find=ByExternal_idEquals", method = RequestMethod.GET)
-    public String CompoundController.findCompoundsByExternal_idEquals(@RequestParam("external_id") String external_id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("compounds", Compound.findCompoundsByExternal_idEquals(external_id, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Compound.countFindCompoundsByExternal_idEquals(external_id) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("compounds", Compound.findCompoundsByExternal_idEquals(external_id, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "compounds/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerController.java b/src/main/java/com/labsynch/labseer/web/ContainerController.java
deleted file mode 100755
index 1175b7cbc..000000000
--- a/src/main/java/com/labsynch/labseer/web/ContainerController.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ContainerLabel;
-import com.labsynch.labseer.dto.IdCollectionDTO;
-import com.labsynch.labseer.service.ContainerService;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.apache.commons.io.IOUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = Container.class)
-@Controller
-@RequestMapping("/containers")
-@RooWebScaffold(path = "containers", formBackingObject = Container.class)
-public class ContainerController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ContainerController_Roo_Controller.aj
deleted file mode 100755
index 733ec9925..000000000
--- a/src/main/java/com/labsynch/labseer/web/ContainerController_Roo_Controller.aj
+++ /dev/null
@@ -1,120 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ContainerLabel;
-import com.labsynch.labseer.domain.ContainerState;
-import com.labsynch.labseer.domain.ItxContainerContainer;
-import com.labsynch.labseer.domain.ItxSubjectContainer;
-import com.labsynch.labseer.domain.ThingPage;
-import com.labsynch.labseer.web.ContainerController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ContainerController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ContainerController.create(@Valid Container container, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, container);
-            return "containers/create";
-        }
-        uiModel.asMap().clear();
-        container.persist();
-        return "redirect:/containers/" + encodeUrlPathSegment(container.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ContainerController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new Container());
-        return "containers/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ContainerController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("container", Container.findContainer(id));
-        uiModel.addAttribute("itemId", id);
-        return "containers/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ContainerController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("containers", Container.findContainerEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) Container.countContainers() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("containers", Container.findAllContainers(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "containers/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ContainerController.update(@Valid Container container, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, container);
-            return "containers/update";
-        }
-        uiModel.asMap().clear();
-        container.merge();
-        return "redirect:/containers/" + encodeUrlPathSegment(container.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ContainerController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, Container.findContainer(id));
-        return "containers/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ContainerController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        Container container = Container.findContainer(id);
-        container.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/containers";
-    }
-    
-    void ContainerController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("container_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("container_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ContainerController.populateEditForm(Model uiModel, Container container) {
-        uiModel.addAttribute("container", container);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("containerlabels", ContainerLabel.findAllContainerLabels());
-        uiModel.addAttribute("containerstates", ContainerState.findAllContainerStates());
-        uiModel.addAttribute("itxcontainercontainers", ItxContainerContainer.findAllItxContainerContainers());
-        uiModel.addAttribute("itxsubjectcontainers", ItxSubjectContainer.findAllItxSubjectContainers());
-        uiModel.addAttribute("thingpages", ThingPage.findAllThingPages());
-    }
-    
-    String ContainerController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ContainerController_Roo_Controller_Json.aj
deleted file mode 100644
index 74f31a59b..000000000
--- a/src/main/java/com/labsynch/labseer/web/ContainerController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,148 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.web.ContainerController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ContainerController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ContainerController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            Container container = Container.findContainer(id);
-            if (container == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(container.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ContainerController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<Container> result = Container.findAllContainers();
-            return new ResponseEntity<String>(Container.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ContainerController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            Container container = Container.fromJsonToContainer(json);
-            container.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+container.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ContainerController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (Container container: Container.fromJsonArrayToContainers(json)) {
-                container.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ContainerController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            Container container = Container.fromJsonToContainer(json);
-            container.setId(id);
-            if (container.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ContainerController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            Container container = Container.findContainer(id);
-            if (container == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            container.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ContainerController.jsonFindContainersByLsKindEquals(@RequestParam("lsKind") String lsKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Container.toJsonArray(Container.findContainersByLsKindEquals(lsKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ContainerController.jsonFindContainersByLsTypeEquals(@RequestParam("lsType") String lsType) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Container.toJsonArray(Container.findContainersByLsTypeEquals(lsType).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ContainerController.jsonFindContainersByLsTypeEqualsAndLsKindEquals(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Container.toJsonArray(Container.findContainersByLsTypeEqualsAndLsKindEquals(lsType, lsKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerKindController.java b/src/main/java/com/labsynch/labseer/web/ContainerKindController.java
deleted file mode 100755
index 6da29b41d..000000000
--- a/src/main/java/com/labsynch/labseer/web/ContainerKindController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ContainerKind;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = ContainerKind.class)
-@Controller
-@RequestMapping("/containerkinds")
-@RooWebScaffold(path = "containerkinds", formBackingObject = ContainerKind.class)
-public class ContainerKindController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ContainerKindController_Roo_Controller.aj
deleted file mode 100755
index 4a433861a..000000000
--- a/src/main/java/com/labsynch/labseer/web/ContainerKindController_Roo_Controller.aj
+++ /dev/null
@@ -1,109 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ContainerKind;
-import com.labsynch.labseer.domain.ContainerType;
-import com.labsynch.labseer.web.ContainerKindController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ContainerKindController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ContainerKindController.create(@Valid ContainerKind containerKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, containerKind);
-            return "containerkinds/create";
-        }
-        uiModel.asMap().clear();
-        containerKind.persist();
-        return "redirect:/containerkinds/" + encodeUrlPathSegment(containerKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ContainerKindController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ContainerKind());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (ContainerType.countContainerTypes() == 0) {
-            dependencies.add(new String[] { "lsType", "containertypes" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "containerkinds/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ContainerKindController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("containerkind", ContainerKind.findContainerKind(id));
-        uiModel.addAttribute("itemId", id);
-        return "containerkinds/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ContainerKindController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("containerkinds", ContainerKind.findContainerKindEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ContainerKind.countContainerKinds() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("containerkinds", ContainerKind.findAllContainerKinds(sortFieldName, sortOrder));
-        }
-        return "containerkinds/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ContainerKindController.update(@Valid ContainerKind containerKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, containerKind);
-            return "containerkinds/update";
-        }
-        uiModel.asMap().clear();
-        containerKind.merge();
-        return "redirect:/containerkinds/" + encodeUrlPathSegment(containerKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ContainerKindController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ContainerKind.findContainerKind(id));
-        return "containerkinds/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ContainerKindController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ContainerKind containerKind = ContainerKind.findContainerKind(id);
-        containerKind.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/containerkinds";
-    }
-    
-    void ContainerKindController.populateEditForm(Model uiModel, ContainerKind containerKind) {
-        uiModel.addAttribute("containerKind", containerKind);
-        uiModel.addAttribute("containertypes", ContainerType.findAllContainerTypes());
-    }
-    
-    String ContainerKindController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerKindController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ContainerKindController_Roo_Controller_Json.aj
deleted file mode 100644
index fc9636064..000000000
--- a/src/main/java/com/labsynch/labseer/web/ContainerKindController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,125 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ContainerKind;
-import com.labsynch.labseer.domain.ContainerType;
-import com.labsynch.labseer.web.ContainerKindController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ContainerKindController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ContainerKindController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ContainerKind containerKind = ContainerKind.findContainerKind(id);
-            if (containerKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(containerKind.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ContainerKindController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ContainerKind> result = ContainerKind.findAllContainerKinds();
-            return new ResponseEntity<String>(ContainerKind.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ContainerKindController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ContainerKind containerKind = ContainerKind.fromJsonToContainerKind(json);
-            containerKind.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+containerKind.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ContainerKindController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ContainerKind containerKind: ContainerKind.fromJsonArrayToContainerKinds(json)) {
-                containerKind.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ContainerKindController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ContainerKind containerKind = ContainerKind.fromJsonToContainerKind(json);
-            containerKind.setId(id);
-            if (containerKind.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ContainerKindController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ContainerKind containerKind = ContainerKind.findContainerKind(id);
-            if (containerKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            containerKind.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByKindNameEqualsAndLsType", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ContainerKindController.jsonFindContainerKindsByKindNameEqualsAndLsType(@RequestParam("kindName") String kindName, @RequestParam("lsType") ContainerType lsType) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ContainerKind.toJsonArray(ContainerKind.findContainerKindsByKindNameEqualsAndLsType(kindName, lsType).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerLabelController.java b/src/main/java/com/labsynch/labseer/web/ContainerLabelController.java
deleted file mode 100755
index e3898d5f2..000000000
--- a/src/main/java/com/labsynch/labseer/web/ContainerLabelController.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ContainerLabel;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = ContainerLabel.class)
-@Controller
-@RequestMapping("/containerlabels")
-@RooWebScaffold(path = "containerlabels", formBackingObject = ContainerLabel.class)
-@RooWebFinder
-public class ContainerLabelController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerLabelController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ContainerLabelController_Roo_Controller.aj
deleted file mode 100755
index 49be8dc3d..000000000
--- a/src/main/java/com/labsynch/labseer/web/ContainerLabelController_Roo_Controller.aj
+++ /dev/null
@@ -1,119 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ContainerLabel;
-import com.labsynch.labseer.web.ContainerLabelController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ContainerLabelController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ContainerLabelController.create(@Valid ContainerLabel containerLabel, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, containerLabel);
-            return "containerlabels/create";
-        }
-        uiModel.asMap().clear();
-        containerLabel.persist();
-        return "redirect:/containerlabels/" + encodeUrlPathSegment(containerLabel.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ContainerLabelController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ContainerLabel());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (Container.countContainers() == 0) {
-            dependencies.add(new String[] { "container", "containers" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "containerlabels/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ContainerLabelController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("containerlabel", ContainerLabel.findContainerLabel(id));
-        uiModel.addAttribute("itemId", id);
-        return "containerlabels/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ContainerLabelController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("containerlabels", ContainerLabel.findContainerLabelEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ContainerLabel.countContainerLabels() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("containerlabels", ContainerLabel.findAllContainerLabels(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "containerlabels/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ContainerLabelController.update(@Valid ContainerLabel containerLabel, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, containerLabel);
-            return "containerlabels/update";
-        }
-        uiModel.asMap().clear();
-        containerLabel.merge();
-        return "redirect:/containerlabels/" + encodeUrlPathSegment(containerLabel.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ContainerLabelController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ContainerLabel.findContainerLabel(id));
-        return "containerlabels/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ContainerLabelController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ContainerLabel containerLabel = ContainerLabel.findContainerLabel(id);
-        containerLabel.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/containerlabels";
-    }
-    
-    void ContainerLabelController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("containerLabel_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("containerLabel_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ContainerLabelController.populateEditForm(Model uiModel, ContainerLabel containerLabel) {
-        uiModel.addAttribute("containerLabel", containerLabel);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("containers", Container.findAllContainers());
-    }
-    
-    String ContainerLabelController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerLabelController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/ContainerLabelController_Roo_Controller_Finder.aj
deleted file mode 100755
index 079e08984..000000000
--- a/src/main/java/com/labsynch/labseer/web/ContainerLabelController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,97 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ContainerLabel;
-import com.labsynch.labseer.web.ContainerLabelController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect ContainerLabelController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByContainerAndIgnoredNot", "form" }, method = RequestMethod.GET)
-    public String ContainerLabelController.findContainerLabelsByContainerAndIgnoredNotForm(Model uiModel) {
-        uiModel.addAttribute("containers", Container.findAllContainers());
-        return "containerlabels/findContainerLabelsByContainerAndIgnoredNot";
-    }
-    
-    @RequestMapping(params = "find=ByContainerAndIgnoredNot", method = RequestMethod.GET)
-    public String ContainerLabelController.findContainerLabelsByContainerAndIgnoredNot(@RequestParam("container") Container container, @RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("containerlabels", ContainerLabel.findContainerLabelsByContainerAndIgnoredNot(container, ignored, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ContainerLabel.countFindContainerLabelsByContainerAndIgnoredNot(container, ignored) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("containerlabels", ContainerLabel.findContainerLabelsByContainerAndIgnoredNot(container, ignored, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "containerlabels/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLabelTextEqualsAndIgnoredNot", "form" }, method = RequestMethod.GET)
-    public String ContainerLabelController.findContainerLabelsByLabelTextEqualsAndIgnoredNotForm(Model uiModel) {
-        return "containerlabels/findContainerLabelsByLabelTextEqualsAndIgnoredNot";
-    }
-    
-    @RequestMapping(params = "find=ByLabelTextEqualsAndIgnoredNot", method = RequestMethod.GET)
-    public String ContainerLabelController.findContainerLabelsByLabelTextEqualsAndIgnoredNot(@RequestParam("labelText") String labelText, @RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("containerlabels", ContainerLabel.findContainerLabelsByLabelTextEqualsAndIgnoredNot(labelText, ignored, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ContainerLabel.countFindContainerLabelsByLabelTextEqualsAndIgnoredNot(labelText, ignored) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("containerlabels", ContainerLabel.findContainerLabelsByLabelTextEqualsAndIgnoredNot(labelText, ignored, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "containerlabels/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTransactionEquals", "form" }, method = RequestMethod.GET)
-    public String ContainerLabelController.findContainerLabelsByLsTransactionEqualsForm(Model uiModel) {
-        return "containerlabels/findContainerLabelsByLsTransactionEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", method = RequestMethod.GET)
-    public String ContainerLabelController.findContainerLabelsByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("containerlabels", ContainerLabel.findContainerLabelsByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ContainerLabel.countFindContainerLabelsByLsTransactionEquals(lsTransaction) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("containerlabels", ContainerLabel.findContainerLabelsByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "containerlabels/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot", "form" }, method = RequestMethod.GET)
-    public String ContainerLabelController.findContainerLabelsByLsTypeEqualsAndLabelTextEqualsAndIgnoredNotForm(Model uiModel) {
-        return "containerlabels/findContainerLabelsByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot", method = RequestMethod.GET)
-    public String ContainerLabelController.findContainerLabelsByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot(@RequestParam("lsType") String lsType, @RequestParam("labelText") String labelText, @RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("containerlabels", ContainerLabel.findContainerLabelsByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot(lsType, labelText, ignored, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ContainerLabel.countFindContainerLabelsByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot(lsType, labelText, ignored) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("containerlabels", ContainerLabel.findContainerLabelsByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot(lsType, labelText, ignored, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "containerlabels/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerLabelController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ContainerLabelController_Roo_Controller_Json.aj
deleted file mode 100755
index 567265c2b..000000000
--- a/src/main/java/com/labsynch/labseer/web/ContainerLabelController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,161 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ContainerLabel;
-import com.labsynch.labseer.web.ContainerLabelController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ContainerLabelController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ContainerLabelController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ContainerLabel containerLabel = ContainerLabel.findContainerLabel(id);
-            if (containerLabel == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(containerLabel.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ContainerLabelController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ContainerLabel> result = ContainerLabel.findAllContainerLabels();
-            return new ResponseEntity<String>(ContainerLabel.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ContainerLabelController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ContainerLabel containerLabel = ContainerLabel.fromJsonToContainerLabel(json);
-            containerLabel.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+containerLabel.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ContainerLabelController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ContainerLabel containerLabel: ContainerLabel.fromJsonArrayToContainerLabels(json)) {
-                containerLabel.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ContainerLabelController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ContainerLabel containerLabel = ContainerLabel.fromJsonToContainerLabel(json);
-            containerLabel.setId(id);
-            if (containerLabel.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ContainerLabelController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ContainerLabel containerLabel = ContainerLabel.findContainerLabel(id);
-            if (containerLabel == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            containerLabel.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByContainerAndIgnoredNot", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ContainerLabelController.jsonFindContainerLabelsByContainerAndIgnoredNot(@RequestParam("container") Container container, @RequestParam(value = "ignored", required = false) boolean ignored) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ContainerLabel.toJsonArray(ContainerLabel.findContainerLabelsByContainerAndIgnoredNot(container, ignored).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLabelTextEqualsAndIgnoredNot", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ContainerLabelController.jsonFindContainerLabelsByLabelTextEqualsAndIgnoredNot(@RequestParam("labelText") String labelText, @RequestParam(value = "ignored", required = false) boolean ignored) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ContainerLabel.toJsonArray(ContainerLabel.findContainerLabelsByLabelTextEqualsAndIgnoredNot(labelText, ignored).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ContainerLabelController.jsonFindContainerLabelsByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ContainerLabel.toJsonArray(ContainerLabel.findContainerLabelsByLsTransactionEquals(lsTransaction).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ContainerLabelController.jsonFindContainerLabelsByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot(@RequestParam("lsType") String lsType, @RequestParam("labelText") String labelText, @RequestParam(value = "ignored", required = false) boolean ignored) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ContainerLabel.toJsonArray(ContainerLabel.findContainerLabelsByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot(lsType, labelText, ignored).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerMiniDTOController.java b/src/main/java/com/labsynch/labseer/web/ContainerMiniDTOController.java
deleted file mode 100755
index d662d1947..000000000
--- a/src/main/java/com/labsynch/labseer/web/ContainerMiniDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.ContainerMiniDTO;
-
-@RooWebJson(jsonObject = ContainerMiniDTO.class)
-@Controller
-@RequestMapping("/coes")
-public class ContainerMiniDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerStateController.java b/src/main/java/com/labsynch/labseer/web/ContainerStateController.java
deleted file mode 100755
index 8a748d963..000000000
--- a/src/main/java/com/labsynch/labseer/web/ContainerStateController.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ContainerState;
-import com.labsynch.labseer.domain.LsTransaction;
-import com.labsynch.labseer.domain.UpdateLog;
-import com.labsynch.labseer.dto.ContainerMiniDTO;
-import com.labsynch.labseer.dto.ContainerStateMiniDTO;
-import com.labsynch.labseer.service.ContainerStateService;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import flexjson.JSONTokener;
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.apache.commons.io.IOUtils;
-import org.joda.time.format.DateTimeFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-@Controller
-@RequestMapping("/containerstates")
-@RooWebScaffold(path = "containerstates", formBackingObject = ContainerState.class)
-@RooWebFinder
-@RooWebJson(jsonObject = ContainerState.class)
-public class ContainerStateController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerStateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ContainerStateController_Roo_Controller.aj
deleted file mode 100644
index cdda5db2c..000000000
--- a/src/main/java/com/labsynch/labseer/web/ContainerStateController_Roo_Controller.aj
+++ /dev/null
@@ -1,121 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ContainerState;
-import com.labsynch.labseer.domain.ContainerValue;
-import com.labsynch.labseer.web.ContainerStateController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ContainerStateController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ContainerStateController.create(@Valid ContainerState containerState, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, containerState);
-            return "containerstates/create";
-        }
-        uiModel.asMap().clear();
-        containerState.persist();
-        return "redirect:/containerstates/" + encodeUrlPathSegment(containerState.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ContainerStateController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ContainerState());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (Container.countContainers() == 0) {
-            dependencies.add(new String[] { "container", "containers" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "containerstates/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ContainerStateController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("containerstate", ContainerState.findContainerState(id));
-        uiModel.addAttribute("itemId", id);
-        return "containerstates/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ContainerStateController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("containerstates", ContainerState.findContainerStateEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ContainerState.countContainerStates() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("containerstates", ContainerState.findAllContainerStates(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "containerstates/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ContainerStateController.update(@Valid ContainerState containerState, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, containerState);
-            return "containerstates/update";
-        }
-        uiModel.asMap().clear();
-        containerState.merge();
-        return "redirect:/containerstates/" + encodeUrlPathSegment(containerState.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ContainerStateController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ContainerState.findContainerState(id));
-        return "containerstates/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ContainerStateController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ContainerState containerState = ContainerState.findContainerState(id);
-        containerState.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/containerstates";
-    }
-    
-    void ContainerStateController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("containerState_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("containerState_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ContainerStateController.populateEditForm(Model uiModel, ContainerState containerState) {
-        uiModel.addAttribute("containerState", containerState);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("containers", Container.findAllContainers());
-        uiModel.addAttribute("containervalues", ContainerValue.findAllContainerValues());
-    }
-    
-    String ContainerStateController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerStateController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/ContainerStateController_Roo_Controller_Finder.aj
deleted file mode 100644
index 1a6f4f633..000000000
--- a/src/main/java/com/labsynch/labseer/web/ContainerStateController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,78 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ContainerState;
-import com.labsynch.labseer.web.ContainerStateController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect ContainerStateController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByContainer", "form" }, method = RequestMethod.GET)
-    public String ContainerStateController.findContainerStatesByContainerForm(Model uiModel) {
-        uiModel.addAttribute("containers", Container.findAllContainers());
-        return "containerstates/findContainerStatesByContainer";
-    }
-    
-    @RequestMapping(params = "find=ByContainer", method = RequestMethod.GET)
-    public String ContainerStateController.findContainerStatesByContainer(@RequestParam("container") Container container, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("containerstates", ContainerState.findContainerStatesByContainer(container, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ContainerState.countFindContainerStatesByContainer(container) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("containerstates", ContainerState.findContainerStatesByContainer(container, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "containerstates/list";
-    }
-    
-    @RequestMapping(params = { "find=ByContainerAndLsKindEqualsAndIgnoredNot", "form" }, method = RequestMethod.GET)
-    public String ContainerStateController.findContainerStatesByContainerAndLsKindEqualsAndIgnoredNotForm(Model uiModel) {
-        uiModel.addAttribute("containers", Container.findAllContainers());
-        return "containerstates/findContainerStatesByContainerAndLsKindEqualsAndIgnoredNot";
-    }
-    
-    @RequestMapping(params = "find=ByContainerAndLsKindEqualsAndIgnoredNot", method = RequestMethod.GET)
-    public String ContainerStateController.findContainerStatesByContainerAndLsKindEqualsAndIgnoredNot(@RequestParam("container") Container container, @RequestParam("lsKind") String lsKind, @RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("containerstates", ContainerState.findContainerStatesByContainerAndLsKindEqualsAndIgnoredNot(container, lsKind, ignored, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ContainerState.countFindContainerStatesByContainerAndLsKindEqualsAndIgnoredNot(container, lsKind, ignored) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("containerstates", ContainerState.findContainerStatesByContainerAndLsKindEqualsAndIgnoredNot(container, lsKind, ignored, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "containerstates/list";
-    }
-    
-    @RequestMapping(params = { "find=ByIgnoredNot", "form" }, method = RequestMethod.GET)
-    public String ContainerStateController.findContainerStatesByIgnoredNotForm(Model uiModel) {
-        return "containerstates/findContainerStatesByIgnoredNot";
-    }
-    
-    @RequestMapping(params = "find=ByIgnoredNot", method = RequestMethod.GET)
-    public String ContainerStateController.findContainerStatesByIgnoredNot(@RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("containerstates", ContainerState.findContainerStatesByIgnoredNot(ignored, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ContainerState.countFindContainerStatesByIgnoredNot(ignored) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("containerstates", ContainerState.findContainerStatesByIgnoredNot(ignored, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "containerstates/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerStateController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ContainerStateController_Roo_Controller_Json.aj
deleted file mode 100644
index 3ab7dba1f..000000000
--- a/src/main/java/com/labsynch/labseer/web/ContainerStateController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,149 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ContainerState;
-import com.labsynch.labseer.web.ContainerStateController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ContainerStateController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ContainerStateController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ContainerState containerState = ContainerState.findContainerState(id);
-            if (containerState == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(containerState.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ContainerStateController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ContainerState> result = ContainerState.findAllContainerStates();
-            return new ResponseEntity<String>(ContainerState.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ContainerStateController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ContainerState containerState = ContainerState.fromJsonToContainerState(json);
-            containerState.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+containerState.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ContainerStateController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ContainerState containerState: ContainerState.fromJsonArrayToContainerStates(json)) {
-                containerState.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ContainerStateController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ContainerState containerState = ContainerState.fromJsonToContainerState(json);
-            containerState.setId(id);
-            if (containerState.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ContainerStateController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ContainerState containerState = ContainerState.findContainerState(id);
-            if (containerState == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            containerState.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByContainer", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ContainerStateController.jsonFindContainerStatesByContainer(@RequestParam("container") Container container) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ContainerState.toJsonArray(ContainerState.findContainerStatesByContainer(container).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByContainerAndLsKindEqualsAndIgnoredNot", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ContainerStateController.jsonFindContainerStatesByContainerAndLsKindEqualsAndIgnoredNot(@RequestParam("container") Container container, @RequestParam("lsKind") String lsKind, @RequestParam(value = "ignored", required = false) boolean ignored) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ContainerState.toJsonArray(ContainerState.findContainerStatesByContainerAndLsKindEqualsAndIgnoredNot(container, lsKind, ignored).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByIgnoredNot", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ContainerStateController.jsonFindContainerStatesByIgnoredNot(@RequestParam(value = "ignored", required = false) boolean ignored) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ContainerState.toJsonArray(ContainerState.findContainerStatesByIgnoredNot(ignored).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerStateMiniDTOController.java b/src/main/java/com/labsynch/labseer/web/ContainerStateMiniDTOController.java
deleted file mode 100755
index fce1108c1..000000000
--- a/src/main/java/com/labsynch/labseer/web/ContainerStateMiniDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.ContainerStateMiniDTO;
-
-@RooWebJson(jsonObject = ContainerStateMiniDTO.class)
-@Controller
-@RequestMapping("/coes")
-public class ContainerStateMiniDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerTypeController.java b/src/main/java/com/labsynch/labseer/web/ContainerTypeController.java
deleted file mode 100755
index a25ee176f..000000000
--- a/src/main/java/com/labsynch/labseer/web/ContainerTypeController.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ContainerType;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = ContainerType.class)
-@Controller
-@RequestMapping("/containertypes")
-@RooWebScaffold(path = "containertypes", formBackingObject = ContainerType.class)
-@RooWebFinder
-public class ContainerTypeController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ContainerTypeController_Roo_Controller.aj
deleted file mode 100755
index 595b2354e..000000000
--- a/src/main/java/com/labsynch/labseer/web/ContainerTypeController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ContainerType;
-import com.labsynch.labseer.web.ContainerTypeController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ContainerTypeController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ContainerTypeController.create(@Valid ContainerType containerType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, containerType);
-            return "containertypes/create";
-        }
-        uiModel.asMap().clear();
-        containerType.persist();
-        return "redirect:/containertypes/" + encodeUrlPathSegment(containerType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ContainerTypeController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ContainerType());
-        return "containertypes/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ContainerTypeController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("containertype", ContainerType.findContainerType(id));
-        uiModel.addAttribute("itemId", id);
-        return "containertypes/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ContainerTypeController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("containertypes", ContainerType.findContainerTypeEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ContainerType.countContainerTypes() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("containertypes", ContainerType.findAllContainerTypes(sortFieldName, sortOrder));
-        }
-        return "containertypes/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ContainerTypeController.update(@Valid ContainerType containerType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, containerType);
-            return "containertypes/update";
-        }
-        uiModel.asMap().clear();
-        containerType.merge();
-        return "redirect:/containertypes/" + encodeUrlPathSegment(containerType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ContainerTypeController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ContainerType.findContainerType(id));
-        return "containertypes/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ContainerTypeController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ContainerType containerType = ContainerType.findContainerType(id);
-        containerType.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/containertypes";
-    }
-    
-    void ContainerTypeController.populateEditForm(Model uiModel, ContainerType containerType) {
-        uiModel.addAttribute("containerType", containerType);
-    }
-    
-    String ContainerTypeController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerTypeController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/ContainerTypeController_Roo_Controller_Finder.aj
deleted file mode 100755
index 95d8b3653..000000000
--- a/src/main/java/com/labsynch/labseer/web/ContainerTypeController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ContainerType;
-import com.labsynch.labseer.web.ContainerTypeController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect ContainerTypeController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByTypeNameEquals", "form" }, method = RequestMethod.GET)
-    public String ContainerTypeController.findContainerTypesByTypeNameEqualsForm(Model uiModel) {
-        return "containertypes/findContainerTypesByTypeNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByTypeNameEquals", method = RequestMethod.GET)
-    public String ContainerTypeController.findContainerTypesByTypeNameEquals(@RequestParam("typeName") String typeName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("containertypes", ContainerType.findContainerTypesByTypeNameEquals(typeName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ContainerType.countFindContainerTypesByTypeNameEquals(typeName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("containertypes", ContainerType.findContainerTypesByTypeNameEquals(typeName, sortFieldName, sortOrder).getResultList());
-        }
-        return "containertypes/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerTypeController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ContainerTypeController_Roo_Controller_Json.aj
deleted file mode 100755
index 9606ade6f..000000000
--- a/src/main/java/com/labsynch/labseer/web/ContainerTypeController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,124 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ContainerType;
-import com.labsynch.labseer.web.ContainerTypeController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ContainerTypeController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ContainerTypeController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ContainerType containerType = ContainerType.findContainerType(id);
-            if (containerType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(containerType.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ContainerTypeController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ContainerType> result = ContainerType.findAllContainerTypes();
-            return new ResponseEntity<String>(ContainerType.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ContainerTypeController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ContainerType containerType = ContainerType.fromJsonToContainerType(json);
-            containerType.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+containerType.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ContainerTypeController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ContainerType containerType: ContainerType.fromJsonArrayToContainerTypes(json)) {
-                containerType.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ContainerTypeController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ContainerType containerType = ContainerType.fromJsonToContainerType(json);
-            containerType.setId(id);
-            if (containerType.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ContainerTypeController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ContainerType containerType = ContainerType.findContainerType(id);
-            if (containerType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            containerType.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByTypeNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ContainerTypeController.jsonFindContainerTypesByTypeNameEquals(@RequestParam("typeName") String typeName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ContainerType.toJsonArray(ContainerType.findContainerTypesByTypeNameEquals(typeName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerValueController.java b/src/main/java/com/labsynch/labseer/web/ContainerValueController.java
deleted file mode 100755
index 6287e05f3..000000000
--- a/src/main/java/com/labsynch/labseer/web/ContainerValueController.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ContainerState;
-import com.labsynch.labseer.domain.ContainerValue;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import flexjson.JSONTokener;
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = ContainerValue.class)
-@Controller
-@RequestMapping("/containervalues")
-@RooWebScaffold(path = "containervalues", formBackingObject = ContainerValue.class)
-@RooWebFinder
-public class ContainerValueController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerValueController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ContainerValueController_Roo_Controller.aj
deleted file mode 100755
index 8bdcab793..000000000
--- a/src/main/java/com/labsynch/labseer/web/ContainerValueController_Roo_Controller.aj
+++ /dev/null
@@ -1,120 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ContainerState;
-import com.labsynch.labseer.domain.ContainerValue;
-import com.labsynch.labseer.web.ContainerValueController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ContainerValueController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ContainerValueController.create(@Valid ContainerValue containerValue, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, containerValue);
-            return "containervalues/create";
-        }
-        uiModel.asMap().clear();
-        containerValue.persist();
-        return "redirect:/containervalues/" + encodeUrlPathSegment(containerValue.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ContainerValueController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ContainerValue());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (ContainerState.countContainerStates() == 0) {
-            dependencies.add(new String[] { "lsState", "containerstates" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "containervalues/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ContainerValueController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("containervalue", ContainerValue.findContainerValue(id));
-        uiModel.addAttribute("itemId", id);
-        return "containervalues/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ContainerValueController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("containervalues", ContainerValue.findContainerValueEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ContainerValue.countContainerValues() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("containervalues", ContainerValue.findAllContainerValues(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "containervalues/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ContainerValueController.update(@Valid ContainerValue containerValue, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, containerValue);
-            return "containervalues/update";
-        }
-        uiModel.asMap().clear();
-        containerValue.merge();
-        return "redirect:/containervalues/" + encodeUrlPathSegment(containerValue.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ContainerValueController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ContainerValue.findContainerValue(id));
-        return "containervalues/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ContainerValueController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ContainerValue containerValue = ContainerValue.findContainerValue(id);
-        containerValue.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/containervalues";
-    }
-    
-    void ContainerValueController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("containerValue_datevalue_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("containerValue_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("containerValue_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ContainerValueController.populateEditForm(Model uiModel, ContainerValue containerValue) {
-        uiModel.addAttribute("containerValue", containerValue);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("containerstates", ContainerState.findAllContainerStates());
-    }
-    
-    String ContainerValueController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerValueController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/ContainerValueController_Roo_Controller_Finder.aj
deleted file mode 100755
index 3ad4a425d..000000000
--- a/src/main/java/com/labsynch/labseer/web/ContainerValueController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,57 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ContainerState;
-import com.labsynch.labseer.domain.ContainerValue;
-import com.labsynch.labseer.web.ContainerValueController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect ContainerValueController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByIgnoredNot", "form" }, method = RequestMethod.GET)
-    public String ContainerValueController.findContainerValuesByIgnoredNotForm(Model uiModel) {
-        return "containervalues/findContainerValuesByIgnoredNot";
-    }
-    
-    @RequestMapping(params = "find=ByIgnoredNot", method = RequestMethod.GET)
-    public String ContainerValueController.findContainerValuesByIgnoredNot(@RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("containervalues", ContainerValue.findContainerValuesByIgnoredNot(ignored, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ContainerValue.countFindContainerValuesByIgnoredNot(ignored) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("containervalues", ContainerValue.findContainerValuesByIgnoredNot(ignored, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "containervalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsState", "form" }, method = RequestMethod.GET)
-    public String ContainerValueController.findContainerValuesByLsStateForm(Model uiModel) {
-        uiModel.addAttribute("containerstates", ContainerState.findAllContainerStates());
-        return "containervalues/findContainerValuesByLsState";
-    }
-    
-    @RequestMapping(params = "find=ByLsState", method = RequestMethod.GET)
-    public String ContainerValueController.findContainerValuesByLsState(@RequestParam("lsState") ContainerState lsState, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("containervalues", ContainerValue.findContainerValuesByLsState(lsState, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ContainerValue.countFindContainerValuesByLsState(lsState) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("containervalues", ContainerValue.findContainerValuesByLsState(lsState, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "containervalues/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ContainerValueController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ContainerValueController_Roo_Controller_Json.aj
deleted file mode 100755
index 967624a9a..000000000
--- a/src/main/java/com/labsynch/labseer/web/ContainerValueController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,137 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ContainerState;
-import com.labsynch.labseer.domain.ContainerValue;
-import com.labsynch.labseer.web.ContainerValueController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ContainerValueController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ContainerValueController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ContainerValue containerValue = ContainerValue.findContainerValue(id);
-            if (containerValue == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(containerValue.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ContainerValueController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ContainerValue> result = ContainerValue.findAllContainerValues();
-            return new ResponseEntity<String>(ContainerValue.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ContainerValueController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ContainerValue containerValue = ContainerValue.fromJsonToContainerValue(json);
-            containerValue.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+containerValue.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ContainerValueController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ContainerValue containerValue: ContainerValue.fromJsonArrayToContainerValues(json)) {
-                containerValue.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ContainerValueController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ContainerValue containerValue = ContainerValue.fromJsonToContainerValue(json);
-            containerValue.setId(id);
-            if (containerValue.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ContainerValueController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ContainerValue containerValue = ContainerValue.findContainerValue(id);
-            if (containerValue == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            containerValue.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByIgnoredNot", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ContainerValueController.jsonFindContainerValuesByIgnoredNot(@RequestParam(value = "ignored", required = false) boolean ignored) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ContainerValue.toJsonArray(ContainerValue.findContainerValuesByIgnoredNot(ignored).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsState", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ContainerValueController.jsonFindContainerValuesByLsState(@RequestParam("lsState") ContainerState lsState) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ContainerValue.toJsonArray(ContainerValue.findContainerValuesByLsState(lsState).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/CorpNameController.java b/src/main/java/com/labsynch/labseer/web/CorpNameController.java
deleted file mode 100755
index 8d300d2ee..000000000
--- a/src/main/java/com/labsynch/labseer/web/CorpNameController.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.labsynch.labseer.web;
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.domain.CorpName;
-
-@RooWebScaffold(path = "corpnames", formBackingObject = CorpName.class)
-@RequestMapping("/corpnames")
-@Controller
-
-public class CorpNameController {
-	
-
-}
diff --git a/src/main/java/com/labsynch/labseer/web/CorpNameController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/CorpNameController_Roo_Controller.aj
deleted file mode 100644
index c09365527..000000000
--- a/src/main/java/com/labsynch/labseer/web/CorpNameController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.CorpName;
-import com.labsynch.labseer.web.CorpNameController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect CorpNameController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String CorpNameController.create(@Valid CorpName corpName, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, corpName);
-            return "corpnames/create";
-        }
-        uiModel.asMap().clear();
-        corpName.persist();
-        return "redirect:/corpnames/" + encodeUrlPathSegment(corpName.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String CorpNameController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new CorpName());
-        return "corpnames/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String CorpNameController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("corpname", CorpName.findCorpName(id));
-        uiModel.addAttribute("itemId", id);
-        return "corpnames/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String CorpNameController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("corpnames", CorpName.findCorpNameEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) CorpName.countCorpNames() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("corpnames", CorpName.findAllCorpNames(sortFieldName, sortOrder));
-        }
-        return "corpnames/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String CorpNameController.update(@Valid CorpName corpName, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, corpName);
-            return "corpnames/update";
-        }
-        uiModel.asMap().clear();
-        corpName.merge();
-        return "redirect:/corpnames/" + encodeUrlPathSegment(corpName.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String CorpNameController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, CorpName.findCorpName(id));
-        return "corpnames/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String CorpNameController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        CorpName corpName = CorpName.findCorpName(id);
-        corpName.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/corpnames";
-    }
-    
-    void CorpNameController.populateEditForm(Model uiModel, CorpName corpName) {
-        uiModel.addAttribute("corpName", corpName);
-    }
-    
-    String CorpNameController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/CronJobController.java b/src/main/java/com/labsynch/labseer/web/CronJobController.java
deleted file mode 100644
index 4a9f18c63..000000000
--- a/src/main/java/com/labsynch/labseer/web/CronJobController.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.CronJob;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/cronjobs")
-@Controller
-@RooWebScaffold(path = "cronjobs", formBackingObject = CronJob.class)
-public class CronJobController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/CronJobController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/CronJobController_Roo_Controller.aj
deleted file mode 100644
index 58f4b7a42..000000000
--- a/src/main/java/com/labsynch/labseer/web/CronJobController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.CronJob;
-import com.labsynch.labseer.web.CronJobController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect CronJobController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String CronJobController.create(@Valid CronJob cronJob, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, cronJob);
-            return "cronjobs/create";
-        }
-        uiModel.asMap().clear();
-        cronJob.persist();
-        return "redirect:/cronjobs/" + encodeUrlPathSegment(cronJob.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String CronJobController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new CronJob());
-        return "cronjobs/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String CronJobController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("cronjob", CronJob.findCronJob(id));
-        uiModel.addAttribute("itemId", id);
-        return "cronjobs/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String CronJobController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("cronjobs", CronJob.findCronJobEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) CronJob.countCronJobs() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("cronjobs", CronJob.findAllCronJobs(sortFieldName, sortOrder));
-        }
-        return "cronjobs/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String CronJobController.update(@Valid CronJob cronJob, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, cronJob);
-            return "cronjobs/update";
-        }
-        uiModel.asMap().clear();
-        cronJob.merge();
-        return "redirect:/cronjobs/" + encodeUrlPathSegment(cronJob.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String CronJobController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, CronJob.findCronJob(id));
-        return "cronjobs/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String CronJobController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        CronJob cronJob = CronJob.findCronJob(id);
-        cronJob.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/cronjobs";
-    }
-    
-    void CronJobController.populateEditForm(Model uiModel, CronJob cronJob) {
-        uiModel.addAttribute("cronJob", cronJob);
-    }
-    
-    String CronJobController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/DDictKindController.java b/src/main/java/com/labsynch/labseer/web/DDictKindController.java
deleted file mode 100644
index 1803ac3f0..000000000
--- a/src/main/java/com/labsynch/labseer/web/DDictKindController.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.DDictKind;
-import com.labsynch.labseer.domain.DDictType;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/ddictkinds")
-@Controller
-@RooWebScaffold(path = "ddictkinds", formBackingObject = DDictKind.class)
-@RooWebFinder
-@RooWebJson(jsonObject = DDictKind.class)
-public class DDictKindController {
-
-    void populateEditForm(Model uiModel, DDictKind DDictKind_) {
-        uiModel.addAttribute("DDictKind_", DDictKind_);
-        uiModel.addAttribute("ddicttypes", DDictType.findAllDDictTypes());
-    }
-}
diff --git a/src/main/java/com/labsynch/labseer/web/DDictKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/DDictKindController_Roo_Controller.aj
deleted file mode 100644
index a1bfbd7a1..000000000
--- a/src/main/java/com/labsynch/labseer/web/DDictKindController_Roo_Controller.aj
+++ /dev/null
@@ -1,96 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.DDictKind;
-import com.labsynch.labseer.web.DDictKindController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect DDictKindController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String DDictKindController.create(@Valid DDictKind DDictKind_, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, DDictKind_);
-            return "ddictkinds/create";
-        }
-        uiModel.asMap().clear();
-        DDictKind_.persist();
-        return "redirect:/ddictkinds/" + encodeUrlPathSegment(DDictKind_.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String DDictKindController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new DDictKind());
-        return "ddictkinds/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String DDictKindController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("ddictkind_", DDictKind.findDDictKind(id));
-        uiModel.addAttribute("itemId", id);
-        return "ddictkinds/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String DDictKindController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("ddictkinds", DDictKind.findDDictKindEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) DDictKind.countDDictKinds() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("ddictkinds", DDictKind.findAllDDictKinds(sortFieldName, sortOrder));
-        }
-        return "ddictkinds/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String DDictKindController.update(@Valid DDictKind DDictKind_, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, DDictKind_);
-            return "ddictkinds/update";
-        }
-        uiModel.asMap().clear();
-        DDictKind_.merge();
-        return "redirect:/ddictkinds/" + encodeUrlPathSegment(DDictKind_.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String DDictKindController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, DDictKind.findDDictKind(id));
-        return "ddictkinds/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String DDictKindController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        DDictKind DDictKind_ = DDictKind.findDDictKind(id);
-        DDictKind_.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/ddictkinds";
-    }
-    
-    String DDictKindController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/DDictKindController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/DDictKindController_Roo_Controller_Finder.aj
deleted file mode 100644
index 3aadb634d..000000000
--- a/src/main/java/com/labsynch/labseer/web/DDictKindController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.DDictKind;
-import com.labsynch.labseer.web.DDictKindController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect DDictKindController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByLsTypeEqualsAndNameEquals", "form" }, method = RequestMethod.GET)
-    public String DDictKindController.findDDictKindsByLsTypeEqualsAndNameEqualsForm(Model uiModel) {
-        return "ddictkinds/findDDictKindsByLsTypeEqualsAndNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndNameEquals", method = RequestMethod.GET)
-    public String DDictKindController.findDDictKindsByLsTypeEqualsAndNameEquals(@RequestParam("lsType") String lsType, @RequestParam("name") String name, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("ddictkinds", DDictKind.findDDictKindsByLsTypeEqualsAndNameEquals(lsType, name, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) DDictKind.countFindDDictKindsByLsTypeEqualsAndNameEquals(lsType, name) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("ddictkinds", DDictKind.findDDictKindsByLsTypeEqualsAndNameEquals(lsType, name, sortFieldName, sortOrder).getResultList());
-        }
-        return "ddictkinds/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/DDictKindController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/DDictKindController_Roo_Controller_Json.aj
deleted file mode 100644
index cf4edf8d7..000000000
--- a/src/main/java/com/labsynch/labseer/web/DDictKindController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,124 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.DDictKind;
-import com.labsynch.labseer.web.DDictKindController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect DDictKindController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> DDictKindController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            DDictKind DDictKind_ = DDictKind.findDDictKind(id);
-            if (DDictKind_ == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(DDictKind_.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> DDictKindController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<DDictKind> result = DDictKind.findAllDDictKinds();
-            return new ResponseEntity<String>(DDictKind.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> DDictKindController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            DDictKind DDictKind_ = DDictKind.fromJsonToDDictKind(json);
-            DDictKind_.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+DDictKind_.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> DDictKindController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (DDictKind DDictKind_: DDictKind.fromJsonArrayToDDictKinds(json)) {
-                DDictKind_.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> DDictKindController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            DDictKind DDictKind_ = DDictKind.fromJsonToDDictKind(json);
-            DDictKind_.setId(id);
-            if (DDictKind_.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> DDictKindController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            DDictKind DDictKind_ = DDictKind.findDDictKind(id);
-            if (DDictKind_ == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            DDictKind_.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> DDictKindController.jsonFindDDictKindsByLsTypeEqualsAndNameEquals(@RequestParam("lsType") String lsType, @RequestParam("name") String name) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(DDictKind.toJsonArray(DDictKind.findDDictKindsByLsTypeEqualsAndNameEquals(lsType, name).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/DDictTypeController.java b/src/main/java/com/labsynch/labseer/web/DDictTypeController.java
deleted file mode 100644
index b32b5016c..000000000
--- a/src/main/java/com/labsynch/labseer/web/DDictTypeController.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.DDictType;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/ddicttypes")
-@Controller
-@RooWebScaffold(path = "ddicttypes", formBackingObject = DDictType.class)
-@RooWebFinder
-@RooWebJson(jsonObject = DDictType.class)
-public class DDictTypeController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/DDictTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/DDictTypeController_Roo_Controller.aj
deleted file mode 100644
index 8cc846f09..000000000
--- a/src/main/java/com/labsynch/labseer/web/DDictTypeController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.DDictType;
-import com.labsynch.labseer.web.DDictTypeController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect DDictTypeController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String DDictTypeController.create(@Valid DDictType DDictType_, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, DDictType_);
-            return "ddicttypes/create";
-        }
-        uiModel.asMap().clear();
-        DDictType_.persist();
-        return "redirect:/ddicttypes/" + encodeUrlPathSegment(DDictType_.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String DDictTypeController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new DDictType());
-        return "ddicttypes/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String DDictTypeController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("ddicttype_", DDictType.findDDictType(id));
-        uiModel.addAttribute("itemId", id);
-        return "ddicttypes/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String DDictTypeController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("ddicttypes", DDictType.findDDictTypeEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) DDictType.countDDictTypes() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("ddicttypes", DDictType.findAllDDictTypes(sortFieldName, sortOrder));
-        }
-        return "ddicttypes/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String DDictTypeController.update(@Valid DDictType DDictType_, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, DDictType_);
-            return "ddicttypes/update";
-        }
-        uiModel.asMap().clear();
-        DDictType_.merge();
-        return "redirect:/ddicttypes/" + encodeUrlPathSegment(DDictType_.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String DDictTypeController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, DDictType.findDDictType(id));
-        return "ddicttypes/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String DDictTypeController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        DDictType DDictType_ = DDictType.findDDictType(id);
-        DDictType_.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/ddicttypes";
-    }
-    
-    void DDictTypeController.populateEditForm(Model uiModel, DDictType DDictType_) {
-        uiModel.addAttribute("DDictType_", DDictType_);
-    }
-    
-    String DDictTypeController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/DDictTypeController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/DDictTypeController_Roo_Controller_Finder.aj
deleted file mode 100644
index 14d947cc5..000000000
--- a/src/main/java/com/labsynch/labseer/web/DDictTypeController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.DDictType;
-import com.labsynch.labseer.web.DDictTypeController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect DDictTypeController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByNameEquals", "form" }, method = RequestMethod.GET)
-    public String DDictTypeController.findDDictTypesByNameEqualsForm(Model uiModel) {
-        return "ddicttypes/findDDictTypesByNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByNameEquals", method = RequestMethod.GET)
-    public String DDictTypeController.findDDictTypesByNameEquals(@RequestParam("name") String name, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("ddicttypes", DDictType.findDDictTypesByNameEquals(name, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) DDictType.countFindDDictTypesByNameEquals(name) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("ddicttypes", DDictType.findDDictTypesByNameEquals(name, sortFieldName, sortOrder).getResultList());
-        }
-        return "ddicttypes/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/DDictTypeController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/DDictTypeController_Roo_Controller_Json.aj
deleted file mode 100644
index 3c44b1a62..000000000
--- a/src/main/java/com/labsynch/labseer/web/DDictTypeController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,124 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.DDictType;
-import com.labsynch.labseer.web.DDictTypeController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect DDictTypeController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> DDictTypeController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            DDictType DDictType_ = DDictType.findDDictType(id);
-            if (DDictType_ == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(DDictType_.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> DDictTypeController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<DDictType> result = DDictType.findAllDDictTypes();
-            return new ResponseEntity<String>(DDictType.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> DDictTypeController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            DDictType DDictType_ = DDictType.fromJsonToDDictType(json);
-            DDictType_.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+DDictType_.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> DDictTypeController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (DDictType DDictType_: DDictType.fromJsonArrayToDDictTypes(json)) {
-                DDictType_.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> DDictTypeController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            DDictType DDictType_ = DDictType.fromJsonToDDictType(json);
-            DDictType_.setId(id);
-            if (DDictType_.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> DDictTypeController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            DDictType DDictType_ = DDictType.findDDictType(id);
-            if (DDictType_ == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            DDictType_.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> DDictTypeController.jsonFindDDictTypesByNameEquals(@RequestParam("name") String name) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(DDictType.toJsonArray(DDictType.findDDictTypesByNameEquals(name).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/DDictValueController.java b/src/main/java/com/labsynch/labseer/web/DDictValueController.java
deleted file mode 100644
index de5fa14f8..000000000
--- a/src/main/java/com/labsynch/labseer/web/DDictValueController.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.DDictKind;
-import com.labsynch.labseer.domain.DDictType;
-import com.labsynch.labseer.domain.DDictValue;
-import com.labsynch.labseer.service.AutoLabelService;
-import com.labsynch.labseer.service.DataDictionaryService;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-@RequestMapping("/ddictvalues")
-@Controller
-@RooWebScaffold(path = "ddictvalues", formBackingObject = DDictValue.class)
-@RooWebFinder
-@RooWebJson(jsonObject = DDictValue.class)
-public class DDictValueController {
-
-    void populateEditForm(Model uiModel, DDictValue DDictValue_) {
-        uiModel.addAttribute("DDictValue_", DDictValue_);
-        uiModel.addAttribute("ddicttypes", DDictType.findAllDDictTypes());
-        uiModel.addAttribute("ddictkinds", DDictKind.findAllDDictKinds());
-    }
-}
diff --git a/src/main/java/com/labsynch/labseer/web/DDictValueController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/DDictValueController_Roo_Controller.aj
deleted file mode 100644
index 6c3baf3fb..000000000
--- a/src/main/java/com/labsynch/labseer/web/DDictValueController_Roo_Controller.aj
+++ /dev/null
@@ -1,96 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.DDictValue;
-import com.labsynch.labseer.web.DDictValueController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect DDictValueController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String DDictValueController.create(@Valid DDictValue DDictValue_, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, DDictValue_);
-            return "ddictvalues/create";
-        }
-        uiModel.asMap().clear();
-        DDictValue_.persist();
-        return "redirect:/ddictvalues/" + encodeUrlPathSegment(DDictValue_.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String DDictValueController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new DDictValue());
-        return "ddictvalues/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String DDictValueController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("ddictvalue_", DDictValue.findDDictValue(id));
-        uiModel.addAttribute("itemId", id);
-        return "ddictvalues/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String DDictValueController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("ddictvalues", DDictValue.findDDictValueEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) DDictValue.countDDictValues() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("ddictvalues", DDictValue.findAllDDictValues(sortFieldName, sortOrder));
-        }
-        return "ddictvalues/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String DDictValueController.update(@Valid DDictValue DDictValue_, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, DDictValue_);
-            return "ddictvalues/update";
-        }
-        uiModel.asMap().clear();
-        DDictValue_.merge();
-        return "redirect:/ddictvalues/" + encodeUrlPathSegment(DDictValue_.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String DDictValueController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, DDictValue.findDDictValue(id));
-        return "ddictvalues/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String DDictValueController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        DDictValue DDictValue_ = DDictValue.findDDictValue(id);
-        DDictValue_.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/ddictvalues";
-    }
-    
-    String DDictValueController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/DDictValueController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/DDictValueController_Roo_Controller_Finder.aj
deleted file mode 100644
index 245269d10..000000000
--- a/src/main/java/com/labsynch/labseer/web/DDictValueController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,148 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.DDictValue;
-import com.labsynch.labseer.web.DDictValueController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect DDictValueController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByCodeNameEquals", "form" }, method = RequestMethod.GET)
-    public String DDictValueController.findDDictValuesByCodeNameEqualsForm(Model uiModel) {
-        return "ddictvalues/findDDictValuesByCodeNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByCodeNameEquals", method = RequestMethod.GET)
-    public String DDictValueController.findDDictValuesByCodeNameEquals(@RequestParam("codeName") String codeName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("ddictvalues", DDictValue.findDDictValuesByCodeNameEquals(codeName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) DDictValue.countFindDDictValuesByCodeNameEquals(codeName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("ddictvalues", DDictValue.findDDictValuesByCodeNameEquals(codeName, sortFieldName, sortOrder).getResultList());
-        }
-        return "ddictvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByIgnoredNot", "form" }, method = RequestMethod.GET)
-    public String DDictValueController.findDDictValuesByIgnoredNotForm(Model uiModel) {
-        return "ddictvalues/findDDictValuesByIgnoredNot";
-    }
-    
-    @RequestMapping(params = "find=ByIgnoredNot", method = RequestMethod.GET)
-    public String DDictValueController.findDDictValuesByIgnoredNot(@RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("ddictvalues", DDictValue.findDDictValuesByIgnoredNot(ignored, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) DDictValue.countFindDDictValuesByIgnoredNot(ignored) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("ddictvalues", DDictValue.findDDictValuesByIgnoredNot(ignored, sortFieldName, sortOrder).getResultList());
-        }
-        return "ddictvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLabelTextLike", "form" }, method = RequestMethod.GET)
-    public String DDictValueController.findDDictValuesByLabelTextLikeForm(Model uiModel) {
-        return "ddictvalues/findDDictValuesByLabelTextLike";
-    }
-    
-    @RequestMapping(params = "find=ByLabelTextLike", method = RequestMethod.GET)
-    public String DDictValueController.findDDictValuesByLabelTextLike(@RequestParam("labelText") String labelText, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("ddictvalues", DDictValue.findDDictValuesByLabelTextLike(labelText, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) DDictValue.countFindDDictValuesByLabelTextLike(labelText) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("ddictvalues", DDictValue.findDDictValuesByLabelTextLike(labelText, sortFieldName, sortOrder).getResultList());
-        }
-        return "ddictvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsKindEquals", "form" }, method = RequestMethod.GET)
-    public String DDictValueController.findDDictValuesByLsKindEqualsForm(Model uiModel) {
-        return "ddictvalues/findDDictValuesByLsKindEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEquals", method = RequestMethod.GET)
-    public String DDictValueController.findDDictValuesByLsKindEquals(@RequestParam("lsKind") String lsKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("ddictvalues", DDictValue.findDDictValuesByLsKindEquals(lsKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) DDictValue.countFindDDictValuesByLsKindEquals(lsKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("ddictvalues", DDictValue.findDDictValuesByLsKindEquals(lsKind, sortFieldName, sortOrder).getResultList());
-        }
-        return "ddictvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeEquals", "form" }, method = RequestMethod.GET)
-    public String DDictValueController.findDDictValuesByLsTypeEqualsForm(Model uiModel) {
-        return "ddictvalues/findDDictValuesByLsTypeEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEquals", method = RequestMethod.GET)
-    public String DDictValueController.findDDictValuesByLsTypeEquals(@RequestParam("lsType") String lsType, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("ddictvalues", DDictValue.findDDictValuesByLsTypeEquals(lsType, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) DDictValue.countFindDDictValuesByLsTypeEquals(lsType) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("ddictvalues", DDictValue.findDDictValuesByLsTypeEquals(lsType, sortFieldName, sortOrder).getResultList());
-        }
-        return "ddictvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeEqualsAndLsKindEquals", "form" }, method = RequestMethod.GET)
-    public String DDictValueController.findDDictValuesByLsTypeEqualsAndLsKindEqualsForm(Model uiModel) {
-        return "ddictvalues/findDDictValuesByLsTypeEqualsAndLsKindEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEquals", method = RequestMethod.GET)
-    public String DDictValueController.findDDictValuesByLsTypeEqualsAndLsKindEquals(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("ddictvalues", DDictValue.findDDictValuesByLsTypeEqualsAndLsKindEquals(lsType, lsKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) DDictValue.countFindDDictValuesByLsTypeEqualsAndLsKindEquals(lsType, lsKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("ddictvalues", DDictValue.findDDictValuesByLsTypeEqualsAndLsKindEquals(lsType, lsKind, sortFieldName, sortOrder).getResultList());
-        }
-        return "ddictvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeEqualsAndLsKindEqualsAndShortNameEquals", "form" }, method = RequestMethod.GET)
-    public String DDictValueController.findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEqualsForm(Model uiModel) {
-        return "ddictvalues/findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEqualsAndShortNameEquals", method = RequestMethod.GET)
-    public String DDictValueController.findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind, @RequestParam("shortName") String shortName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("ddictvalues", DDictValue.findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals(lsType, lsKind, shortName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) DDictValue.countFindDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals(lsType, lsKind, shortName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("ddictvalues", DDictValue.findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals(lsType, lsKind, shortName, sortFieldName, sortOrder).getResultList());
-        }
-        return "ddictvalues/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/DDictValueController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/DDictValueController_Roo_Controller_Json.aj
deleted file mode 100644
index b7edcb984..000000000
--- a/src/main/java/com/labsynch/labseer/web/DDictValueController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,196 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.DDictValue;
-import com.labsynch.labseer.web.DDictValueController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect DDictValueController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> DDictValueController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            DDictValue DDictValue_ = DDictValue.findDDictValue(id);
-            if (DDictValue_ == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(DDictValue_.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> DDictValueController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<DDictValue> result = DDictValue.findAllDDictValues();
-            return new ResponseEntity<String>(DDictValue.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> DDictValueController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            DDictValue DDictValue_ = DDictValue.fromJsonToDDictValue(json);
-            DDictValue_.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+DDictValue_.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> DDictValueController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (DDictValue DDictValue_: DDictValue.fromJsonArrayToDDictValues(json)) {
-                DDictValue_.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> DDictValueController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            DDictValue DDictValue_ = DDictValue.fromJsonToDDictValue(json);
-            DDictValue_.setId(id);
-            if (DDictValue_.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> DDictValueController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            DDictValue DDictValue_ = DDictValue.findDDictValue(id);
-            if (DDictValue_ == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            DDictValue_.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByCodeNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> DDictValueController.jsonFindDDictValuesByCodeNameEquals(@RequestParam("codeName") String codeName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(DDictValue.toJsonArray(DDictValue.findDDictValuesByCodeNameEquals(codeName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByIgnoredNot", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> DDictValueController.jsonFindDDictValuesByIgnoredNot(@RequestParam(value = "ignored", required = false) boolean ignored) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(DDictValue.toJsonArray(DDictValue.findDDictValuesByIgnoredNot(ignored).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLabelTextLike", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> DDictValueController.jsonFindDDictValuesByLabelTextLike(@RequestParam("labelText") String labelText) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(DDictValue.toJsonArray(DDictValue.findDDictValuesByLabelTextLike(labelText).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> DDictValueController.jsonFindDDictValuesByLsKindEquals(@RequestParam("lsKind") String lsKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(DDictValue.toJsonArray(DDictValue.findDDictValuesByLsKindEquals(lsKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> DDictValueController.jsonFindDDictValuesByLsTypeEquals(@RequestParam("lsType") String lsType) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(DDictValue.toJsonArray(DDictValue.findDDictValuesByLsTypeEquals(lsType).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> DDictValueController.jsonFindDDictValuesByLsTypeEqualsAndLsKindEquals(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(DDictValue.toJsonArray(DDictValue.findDDictValuesByLsTypeEqualsAndLsKindEquals(lsType, lsKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEqualsAndShortNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> DDictValueController.jsonFindDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind, @RequestParam("shortName") String shortName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(DDictValue.toJsonArray(DDictValue.findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals(lsType, lsKind, shortName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/DoseReponseParamsDTOController.java b/src/main/java/com/labsynch/labseer/web/DoseReponseParamsDTOController.java
deleted file mode 100755
index f8e723db0..000000000
--- a/src/main/java/com/labsynch/labseer/web/DoseReponseParamsDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.DoseReponseParamsDTO;
-
-@RooWebJson(jsonObject = DoseReponseParamsDTO.class)
-@Controller
-@RequestMapping("/doserepoes")
-public class DoseReponseParamsDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/EntrezDbGeneDTOController.java b/src/main/java/com/labsynch/labseer/web/EntrezDbGeneDTOController.java
deleted file mode 100755
index 682b09868..000000000
--- a/src/main/java/com/labsynch/labseer/web/EntrezDbGeneDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.EntrezDbGeneDTO;
-
-@RooWebJson(jsonObject = EntrezDbGeneDTO.class)
-@Controller
-@RequestMapping("/entrezdbgenedto")
-public class EntrezDbGeneDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ErrorMessageController.java b/src/main/java/com/labsynch/labseer/web/ErrorMessageController.java
deleted file mode 100755
index 3a76cb5d9..000000000
--- a/src/main/java/com/labsynch/labseer/web/ErrorMessageController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.exceptions.ErrorMessage;
-
-@RooWebJson(jsonObject = ErrorMessage.class)
-@Controller
-@RequestMapping("/errormessages")
-public class ErrorMessageController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ErrorMessageDTOController.java b/src/main/java/com/labsynch/labseer/web/ErrorMessageDTOController.java
deleted file mode 100755
index f22e12d0f..000000000
--- a/src/main/java/com/labsynch/labseer/web/ErrorMessageDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.ErrorMessageDTO;
-
-@RooWebJson(jsonObject = ErrorMessageDTO.class)
-@Controller
-@RequestMapping("/erroes")
-public class ErrorMessageDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentController.java b/src/main/java/com/labsynch/labseer/web/ExperimentController.java
deleted file mode 100755
index f04a9fc29..000000000
--- a/src/main/java/com/labsynch/labseer/web/ExperimentController.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.AnalysisGroupLabel;
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ItxSubjectContainer;
-import com.labsynch.labseer.domain.ItxSubjectContainerState;
-import com.labsynch.labseer.domain.ItxSubjectContainerValue;
-import com.labsynch.labseer.domain.LsTag;
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.SubjectLabel;
-import com.labsynch.labseer.domain.SubjectState;
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.domain.TreatmentGroupLabel;
-import com.labsynch.labseer.domain.TreatmentGroupState;
-import com.labsynch.labseer.domain.TreatmentGroupValue;
-import com.labsynch.labseer.dto.AnalysisGroupValueDTO;
-import com.labsynch.labseer.dto.BatchCodeDTO;
-import com.labsynch.labseer.dto.ExperimentFilterDTO;
-import com.labsynch.labseer.dto.ExperimentFilterSearchDTO;
-import com.labsynch.labseer.dto.ExperimentSearchRequestDTO;
-import com.labsynch.labseer.dto.JSTreeNodeDTO;
-import com.labsynch.labseer.exceptions.ErrorMessage;
-import com.labsynch.labseer.exceptions.UniqueNameException;
-import com.labsynch.labseer.service.ExperimentService;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import flexjson.JSONDeserializer;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.io.IOUtils;
-import org.joda.time.format.DateTimeFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.HandlerMapping;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-import org.supercsv.cellprocessor.ift.CellProcessor;
-import org.supercsv.io.CsvBeanWriter;
-import org.supercsv.io.ICsvBeanWriter;
-import org.supercsv.prefs.CsvPreference;
-
-@Controller
-@RequestMapping("/experiments")
-@RooWebScaffold(path = "experiments", formBackingObject = Experiment.class)
-@RooWebFinder
-@Transactional
-@RooWebJson(jsonObject = Experiment.class)
-public class ExperimentController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ExperimentController_Roo_Controller.aj
deleted file mode 100644
index 983889a9f..000000000
--- a/src/main/java/com/labsynch/labseer/web/ExperimentController_Roo_Controller.aj
+++ /dev/null
@@ -1,131 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentLabel;
-import com.labsynch.labseer.domain.ExperimentState;
-import com.labsynch.labseer.domain.ItxExperimentExperiment;
-import com.labsynch.labseer.domain.LsTag;
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ThingPage;
-import com.labsynch.labseer.web.ExperimentController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ExperimentController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ExperimentController.create(@Valid Experiment experiment, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, experiment);
-            return "experiments/create";
-        }
-        uiModel.asMap().clear();
-        experiment.persist();
-        return "redirect:/experiments/" + encodeUrlPathSegment(experiment.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ExperimentController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new Experiment());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (Protocol.countProtocols() == 0) {
-            dependencies.add(new String[] { "protocol", "protocols" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "experiments/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ExperimentController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("experiment", Experiment.findExperiment(id));
-        uiModel.addAttribute("itemId", id);
-        return "experiments/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ExperimentController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("experiments", Experiment.findExperimentEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) Experiment.countExperiments() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("experiments", Experiment.findAllExperiments(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "experiments/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ExperimentController.update(@Valid Experiment experiment, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, experiment);
-            return "experiments/update";
-        }
-        uiModel.asMap().clear();
-        experiment.merge();
-        return "redirect:/experiments/" + encodeUrlPathSegment(experiment.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ExperimentController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, Experiment.findExperiment(id));
-        return "experiments/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ExperimentController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        Experiment experiment = Experiment.findExperiment(id);
-        experiment.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/experiments";
-    }
-    
-    void ExperimentController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("experiment_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("experiment_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ExperimentController.populateEditForm(Model uiModel, Experiment experiment) {
-        uiModel.addAttribute("experiment", experiment);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("analysisgroups", AnalysisGroup.findAllAnalysisGroups());
-        uiModel.addAttribute("experimentlabels", ExperimentLabel.findAllExperimentLabels());
-        uiModel.addAttribute("experimentstates", ExperimentState.findAllExperimentStates());
-        uiModel.addAttribute("itxexperimentexperiments", ItxExperimentExperiment.findAllItxExperimentExperiments());
-        uiModel.addAttribute("lstags", LsTag.findAllLsTags());
-        uiModel.addAttribute("protocols", Protocol.findAllProtocols());
-        uiModel.addAttribute("thingpages", ThingPage.findAllThingPages());
-    }
-    
-    String ExperimentController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/ExperimentController_Roo_Controller_Finder.aj
deleted file mode 100644
index 6ef4c67f5..000000000
--- a/src/main/java/com/labsynch/labseer/web/ExperimentController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,217 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.web.ExperimentController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect ExperimentController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByCodeNameEquals", "form" }, method = RequestMethod.GET)
-    public String ExperimentController.findExperimentsByCodeNameEqualsForm(Model uiModel) {
-        return "experiments/findExperimentsByCodeNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByCodeNameEquals", method = RequestMethod.GET)
-    public String ExperimentController.findExperimentsByCodeNameEquals(@RequestParam("codeName") String codeName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("experiments", Experiment.findExperimentsByCodeNameEquals(codeName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Experiment.countFindExperimentsByCodeNameEquals(codeName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("experiments", Experiment.findExperimentsByCodeNameEquals(codeName, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "experiments/list";
-    }
-    
-    @RequestMapping(params = { "find=ByCodeNameLike", "form" }, method = RequestMethod.GET)
-    public String ExperimentController.findExperimentsByCodeNameLikeForm(Model uiModel) {
-        return "experiments/findExperimentsByCodeNameLike";
-    }
-    
-    @RequestMapping(params = "find=ByCodeNameLike", method = RequestMethod.GET)
-    public String ExperimentController.findExperimentsByCodeNameLike(@RequestParam("codeName") String codeName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("experiments", Experiment.findExperimentsByCodeNameLike(codeName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Experiment.countFindExperimentsByCodeNameLike(codeName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("experiments", Experiment.findExperimentsByCodeNameLike(codeName, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "experiments/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsKindEquals", "form" }, method = RequestMethod.GET)
-    public String ExperimentController.findExperimentsByLsKindEqualsForm(Model uiModel) {
-        return "experiments/findExperimentsByLsKindEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEquals", method = RequestMethod.GET)
-    public String ExperimentController.findExperimentsByLsKindEquals(@RequestParam("lsKind") String lsKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("experiments", Experiment.findExperimentsByLsKindEquals(lsKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Experiment.countFindExperimentsByLsKindEquals(lsKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("experiments", Experiment.findExperimentsByLsKindEquals(lsKind, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "experiments/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsKindLike", "form" }, method = RequestMethod.GET)
-    public String ExperimentController.findExperimentsByLsKindLikeForm(Model uiModel) {
-        return "experiments/findExperimentsByLsKindLike";
-    }
-    
-    @RequestMapping(params = "find=ByLsKindLike", method = RequestMethod.GET)
-    public String ExperimentController.findExperimentsByLsKindLike(@RequestParam("lsKind") String lsKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("experiments", Experiment.findExperimentsByLsKindLike(lsKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Experiment.countFindExperimentsByLsKindLike(lsKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("experiments", Experiment.findExperimentsByLsKindLike(lsKind, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "experiments/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTransaction", "form" }, method = RequestMethod.GET)
-    public String ExperimentController.findExperimentsByLsTransactionForm(Model uiModel) {
-        return "experiments/findExperimentsByLsTransaction";
-    }
-    
-    @RequestMapping(params = "find=ByLsTransaction", method = RequestMethod.GET)
-    public String ExperimentController.findExperimentsByLsTransaction(@RequestParam("lsTransaction") Long lsTransaction, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("experiments", Experiment.findExperimentsByLsTransaction(lsTransaction, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Experiment.countFindExperimentsByLsTransaction(lsTransaction) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("experiments", Experiment.findExperimentsByLsTransaction(lsTransaction, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "experiments/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeEquals", "form" }, method = RequestMethod.GET)
-    public String ExperimentController.findExperimentsByLsTypeEqualsForm(Model uiModel) {
-        return "experiments/findExperimentsByLsTypeEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEquals", method = RequestMethod.GET)
-    public String ExperimentController.findExperimentsByLsTypeEquals(@RequestParam("lsType") String lsType, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("experiments", Experiment.findExperimentsByLsTypeEquals(lsType, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Experiment.countFindExperimentsByLsTypeEquals(lsType) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("experiments", Experiment.findExperimentsByLsTypeEquals(lsType, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "experiments/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeEqualsAndLsKindEquals", "form" }, method = RequestMethod.GET)
-    public String ExperimentController.findExperimentsByLsTypeEqualsAndLsKindEqualsForm(Model uiModel) {
-        return "experiments/findExperimentsByLsTypeEqualsAndLsKindEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEquals", method = RequestMethod.GET)
-    public String ExperimentController.findExperimentsByLsTypeEqualsAndLsKindEquals(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("experiments", Experiment.findExperimentsByLsTypeEqualsAndLsKindEquals(lsType, lsKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Experiment.countFindExperimentsByLsTypeEqualsAndLsKindEquals(lsType, lsKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("experiments", Experiment.findExperimentsByLsTypeEqualsAndLsKindEquals(lsType, lsKind, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "experiments/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeLike", "form" }, method = RequestMethod.GET)
-    public String ExperimentController.findExperimentsByLsTypeLikeForm(Model uiModel) {
-        return "experiments/findExperimentsByLsTypeLike";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeLike", method = RequestMethod.GET)
-    public String ExperimentController.findExperimentsByLsTypeLike(@RequestParam("lsType") String lsType, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("experiments", Experiment.findExperimentsByLsTypeLike(lsType, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Experiment.countFindExperimentsByLsTypeLike(lsType) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("experiments", Experiment.findExperimentsByLsTypeLike(lsType, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "experiments/list";
-    }
-    
-    @RequestMapping(params = { "find=ByProtocol", "form" }, method = RequestMethod.GET)
-    public String ExperimentController.findExperimentsByProtocolForm(Model uiModel) {
-        uiModel.addAttribute("protocols", Protocol.findAllProtocols());
-        return "experiments/findExperimentsByProtocol";
-    }
-    
-    @RequestMapping(params = "find=ByProtocol", method = RequestMethod.GET)
-    public String ExperimentController.findExperimentsByProtocol(@RequestParam("protocol") Protocol protocol, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("experiments", Experiment.findExperimentsByProtocol(protocol, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Experiment.countFindExperimentsByProtocol(protocol) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("experiments", Experiment.findExperimentsByProtocol(protocol, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "experiments/list";
-    }
-    
-    @RequestMapping(params = { "find=ByRecordedByLike", "form" }, method = RequestMethod.GET)
-    public String ExperimentController.findExperimentsByRecordedByLikeForm(Model uiModel) {
-        return "experiments/findExperimentsByRecordedByLike";
-    }
-    
-    @RequestMapping(params = "find=ByRecordedByLike", method = RequestMethod.GET)
-    public String ExperimentController.findExperimentsByRecordedByLike(@RequestParam("recordedBy") String recordedBy, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("experiments", Experiment.findExperimentsByRecordedByLike(recordedBy, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Experiment.countFindExperimentsByRecordedByLike(recordedBy) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("experiments", Experiment.findExperimentsByRecordedByLike(recordedBy, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "experiments/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ExperimentController_Roo_Controller_Json.aj
deleted file mode 100755
index c568e81a8..000000000
--- a/src/main/java/com/labsynch/labseer/web/ExperimentController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,233 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.web.ExperimentController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ExperimentController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            Experiment experiment = Experiment.findExperiment(id);
-            if (experiment == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(experiment.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<Experiment> result = Experiment.findAllExperiments();
-            return new ResponseEntity<String>(Experiment.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ExperimentController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            Experiment experiment = Experiment.fromJsonToExperiment(json);
-            experiment.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+experiment.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ExperimentController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (Experiment experiment: Experiment.fromJsonArrayToExperiments(json)) {
-                experiment.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ExperimentController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            Experiment experiment = Experiment.fromJsonToExperiment(json);
-            experiment.setId(id);
-            if (experiment.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ExperimentController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            Experiment experiment = Experiment.findExperiment(id);
-            if (experiment == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            experiment.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByCodeNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentController.jsonFindExperimentsByCodeNameEquals(@RequestParam("codeName") String codeName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Experiment.toJsonArray(Experiment.findExperimentsByCodeNameEquals(codeName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByCodeNameLike", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentController.jsonFindExperimentsByCodeNameLike(@RequestParam("codeName") String codeName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Experiment.toJsonArray(Experiment.findExperimentsByCodeNameLike(codeName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentController.jsonFindExperimentsByLsKindEquals(@RequestParam("lsKind") String lsKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Experiment.toJsonArray(Experiment.findExperimentsByLsKindEquals(lsKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsKindLike", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentController.jsonFindExperimentsByLsKindLike(@RequestParam("lsKind") String lsKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Experiment.toJsonArray(Experiment.findExperimentsByLsKindLike(lsKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTransaction", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentController.jsonFindExperimentsByLsTransaction(@RequestParam("lsTransaction") Long lsTransaction) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Experiment.toJsonArray(Experiment.findExperimentsByLsTransaction(lsTransaction).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentController.jsonFindExperimentsByLsTypeEquals(@RequestParam("lsType") String lsType) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Experiment.toJsonArray(Experiment.findExperimentsByLsTypeEquals(lsType).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentController.jsonFindExperimentsByLsTypeEqualsAndLsKindEquals(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Experiment.toJsonArray(Experiment.findExperimentsByLsTypeEqualsAndLsKindEquals(lsType, lsKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeLike", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentController.jsonFindExperimentsByLsTypeLike(@RequestParam("lsType") String lsType) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Experiment.toJsonArray(Experiment.findExperimentsByLsTypeLike(lsType).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByProtocol", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentController.jsonFindExperimentsByProtocol(@RequestParam("protocol") Protocol protocol) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Experiment.toJsonArray(Experiment.findExperimentsByProtocol(protocol).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByRecordedByLike", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentController.jsonFindExperimentsByRecordedByLike(@RequestParam("recordedBy") String recordedBy) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Experiment.toJsonArray(Experiment.findExperimentsByRecordedByLike(recordedBy).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentFilterDTOController.java b/src/main/java/com/labsynch/labseer/web/ExperimentFilterDTOController.java
deleted file mode 100755
index 3916c7daa..000000000
--- a/src/main/java/com/labsynch/labseer/web/ExperimentFilterDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.ExperimentFilterDTO;
-
-@RooWebJson(jsonObject = ExperimentFilterDTO.class)
-@Controller
-@RequestMapping("/experimentfilterdto")
-public class ExperimentFilterDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentFilterSearchDTOController.java b/src/main/java/com/labsynch/labseer/web/ExperimentFilterSearchDTOController.java
deleted file mode 100755
index 26d836a72..000000000
--- a/src/main/java/com/labsynch/labseer/web/ExperimentFilterSearchDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.ExperimentFilterSearchDTO;
-
-@RooWebJson(jsonObject = ExperimentFilterSearchDTO.class)
-@Controller
-@RequestMapping("/experimentfiltersearchdto")
-public class ExperimentFilterSearchDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentGuiStubDTOController.java b/src/main/java/com/labsynch/labseer/web/ExperimentGuiStubDTOController.java
deleted file mode 100644
index 21aa6e873..000000000
--- a/src/main/java/com/labsynch/labseer/web/ExperimentGuiStubDTOController.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.dto.ExperimentGuiStubDTO;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RooWebJson(jsonObject = ExperimentGuiStubDTO.class)
-@Controller
-@RequestMapping("/experimentguistubdto")
-public class ExperimentGuiStubDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentKindController.java b/src/main/java/com/labsynch/labseer/web/ExperimentKindController.java
deleted file mode 100755
index 372bcb661..000000000
--- a/src/main/java/com/labsynch/labseer/web/ExperimentKindController.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ExperimentKind;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RequestMapping("/experimentkinds")
-@Controller
-@RooWebScaffold(path = "experimentkinds", formBackingObject = ExperimentKind.class)
-@RooWebJson(jsonObject = ExperimentKind.class)
-public class ExperimentKindController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ExperimentKindController_Roo_Controller.aj
deleted file mode 100755
index 388df21ee..000000000
--- a/src/main/java/com/labsynch/labseer/web/ExperimentKindController_Roo_Controller.aj
+++ /dev/null
@@ -1,109 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ExperimentKind;
-import com.labsynch.labseer.domain.ExperimentType;
-import com.labsynch.labseer.web.ExperimentKindController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ExperimentKindController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ExperimentKindController.create(@Valid ExperimentKind experimentKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, experimentKind);
-            return "experimentkinds/create";
-        }
-        uiModel.asMap().clear();
-        experimentKind.persist();
-        return "redirect:/experimentkinds/" + encodeUrlPathSegment(experimentKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ExperimentKindController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ExperimentKind());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (ExperimentType.countExperimentTypes() == 0) {
-            dependencies.add(new String[] { "lsType", "experimenttypes" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "experimentkinds/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ExperimentKindController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("experimentkind", ExperimentKind.findExperimentKind(id));
-        uiModel.addAttribute("itemId", id);
-        return "experimentkinds/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ExperimentKindController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("experimentkinds", ExperimentKind.findExperimentKindEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ExperimentKind.countExperimentKinds() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("experimentkinds", ExperimentKind.findAllExperimentKinds(sortFieldName, sortOrder));
-        }
-        return "experimentkinds/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ExperimentKindController.update(@Valid ExperimentKind experimentKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, experimentKind);
-            return "experimentkinds/update";
-        }
-        uiModel.asMap().clear();
-        experimentKind.merge();
-        return "redirect:/experimentkinds/" + encodeUrlPathSegment(experimentKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ExperimentKindController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ExperimentKind.findExperimentKind(id));
-        return "experimentkinds/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ExperimentKindController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ExperimentKind experimentKind = ExperimentKind.findExperimentKind(id);
-        experimentKind.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/experimentkinds";
-    }
-    
-    void ExperimentKindController.populateEditForm(Model uiModel, ExperimentKind experimentKind) {
-        uiModel.addAttribute("experimentKind", experimentKind);
-        uiModel.addAttribute("experimenttypes", ExperimentType.findAllExperimentTypes());
-    }
-    
-    String ExperimentKindController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentKindController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ExperimentKindController_Roo_Controller_Json.aj
deleted file mode 100644
index 2e301722a..000000000
--- a/src/main/java/com/labsynch/labseer/web/ExperimentKindController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,125 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ExperimentKind;
-import com.labsynch.labseer.domain.ExperimentType;
-import com.labsynch.labseer.web.ExperimentKindController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ExperimentKindController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentKindController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ExperimentKind experimentKind = ExperimentKind.findExperimentKind(id);
-            if (experimentKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(experimentKind.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentKindController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ExperimentKind> result = ExperimentKind.findAllExperimentKinds();
-            return new ResponseEntity<String>(ExperimentKind.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ExperimentKindController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ExperimentKind experimentKind = ExperimentKind.fromJsonToExperimentKind(json);
-            experimentKind.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+experimentKind.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ExperimentKindController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ExperimentKind experimentKind: ExperimentKind.fromJsonArrayToExperimentKinds(json)) {
-                experimentKind.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ExperimentKindController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ExperimentKind experimentKind = ExperimentKind.fromJsonToExperimentKind(json);
-            experimentKind.setId(id);
-            if (experimentKind.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ExperimentKindController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ExperimentKind experimentKind = ExperimentKind.findExperimentKind(id);
-            if (experimentKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            experimentKind.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndKindNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentKindController.jsonFindExperimentKindsByLsTypeEqualsAndKindNameEquals(@RequestParam("lsType") ExperimentType lsType, @RequestParam("kindName") String kindName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ExperimentKind.toJsonArray(ExperimentKind.findExperimentKindsByLsTypeEqualsAndKindNameEquals(lsType, kindName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentLabelController.java b/src/main/java/com/labsynch/labseer/web/ExperimentLabelController.java
deleted file mode 100755
index 4377ccc62..000000000
--- a/src/main/java/com/labsynch/labseer/web/ExperimentLabelController.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ExperimentLabel;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = ExperimentLabel.class)
-@Controller
-@RequestMapping("/experimentlabels")
-@RooWebScaffold(path = "experimentlabels", formBackingObject = ExperimentLabel.class)
-@RooWebFinder
-public class ExperimentLabelController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentLabelController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ExperimentLabelController_Roo_Controller.aj
deleted file mode 100755
index 95b2d6f52..000000000
--- a/src/main/java/com/labsynch/labseer/web/ExperimentLabelController_Roo_Controller.aj
+++ /dev/null
@@ -1,119 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentLabel;
-import com.labsynch.labseer.web.ExperimentLabelController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ExperimentLabelController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ExperimentLabelController.create(@Valid ExperimentLabel experimentLabel, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, experimentLabel);
-            return "experimentlabels/create";
-        }
-        uiModel.asMap().clear();
-        experimentLabel.persist();
-        return "redirect:/experimentlabels/" + encodeUrlPathSegment(experimentLabel.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ExperimentLabelController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ExperimentLabel());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (Experiment.countExperiments() == 0) {
-            dependencies.add(new String[] { "experiment", "experiments" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "experimentlabels/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ExperimentLabelController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("experimentlabel", ExperimentLabel.findExperimentLabel(id));
-        uiModel.addAttribute("itemId", id);
-        return "experimentlabels/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ExperimentLabelController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("experimentlabels", ExperimentLabel.findExperimentLabelEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ExperimentLabel.countExperimentLabels() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("experimentlabels", ExperimentLabel.findAllExperimentLabels(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "experimentlabels/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ExperimentLabelController.update(@Valid ExperimentLabel experimentLabel, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, experimentLabel);
-            return "experimentlabels/update";
-        }
-        uiModel.asMap().clear();
-        experimentLabel.merge();
-        return "redirect:/experimentlabels/" + encodeUrlPathSegment(experimentLabel.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ExperimentLabelController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ExperimentLabel.findExperimentLabel(id));
-        return "experimentlabels/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ExperimentLabelController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ExperimentLabel experimentLabel = ExperimentLabel.findExperimentLabel(id);
-        experimentLabel.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/experimentlabels";
-    }
-    
-    void ExperimentLabelController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("experimentLabel_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("experimentLabel_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ExperimentLabelController.populateEditForm(Model uiModel, ExperimentLabel experimentLabel) {
-        uiModel.addAttribute("experimentLabel", experimentLabel);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("experiments", Experiment.findAllExperiments());
-    }
-    
-    String ExperimentLabelController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentLabelController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/ExperimentLabelController_Roo_Controller_Finder.aj
deleted file mode 100755
index f91f70bce..000000000
--- a/src/main/java/com/labsynch/labseer/web/ExperimentLabelController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,118 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentLabel;
-import com.labsynch.labseer.web.ExperimentLabelController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect ExperimentLabelController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByExperiment", "form" }, method = RequestMethod.GET)
-    public String ExperimentLabelController.findExperimentLabelsByExperimentForm(Model uiModel) {
-        uiModel.addAttribute("experiments", Experiment.findAllExperiments());
-        return "experimentlabels/findExperimentLabelsByExperiment";
-    }
-    
-    @RequestMapping(params = "find=ByExperiment", method = RequestMethod.GET)
-    public String ExperimentLabelController.findExperimentLabelsByExperiment(@RequestParam("experiment") Experiment experiment, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("experimentlabels", ExperimentLabel.findExperimentLabelsByExperiment(experiment, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ExperimentLabel.countFindExperimentLabelsByExperiment(experiment) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("experimentlabels", ExperimentLabel.findExperimentLabelsByExperiment(experiment, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "experimentlabels/list";
-    }
-    
-    @RequestMapping(params = { "find=ByExperimentAndIgnoredNot", "form" }, method = RequestMethod.GET)
-    public String ExperimentLabelController.findExperimentLabelsByExperimentAndIgnoredNotForm(Model uiModel) {
-        uiModel.addAttribute("experiments", Experiment.findAllExperiments());
-        return "experimentlabels/findExperimentLabelsByExperimentAndIgnoredNot";
-    }
-    
-    @RequestMapping(params = "find=ByExperimentAndIgnoredNot", method = RequestMethod.GET)
-    public String ExperimentLabelController.findExperimentLabelsByExperimentAndIgnoredNot(@RequestParam("experiment") Experiment experiment, @RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("experimentlabels", ExperimentLabel.findExperimentLabelsByExperimentAndIgnoredNot(experiment, ignored, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ExperimentLabel.countFindExperimentLabelsByExperimentAndIgnoredNot(experiment, ignored) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("experimentlabels", ExperimentLabel.findExperimentLabelsByExperimentAndIgnoredNot(experiment, ignored, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "experimentlabels/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLabelTextLike", "form" }, method = RequestMethod.GET)
-    public String ExperimentLabelController.findExperimentLabelsByLabelTextLikeForm(Model uiModel) {
-        return "experimentlabels/findExperimentLabelsByLabelTextLike";
-    }
-    
-    @RequestMapping(params = "find=ByLabelTextLike", method = RequestMethod.GET)
-    public String ExperimentLabelController.findExperimentLabelsByLabelTextLike(@RequestParam("labelText") String labelText, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("experimentlabels", ExperimentLabel.findExperimentLabelsByLabelTextLike(labelText, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ExperimentLabel.countFindExperimentLabelsByLabelTextLike(labelText) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("experimentlabels", ExperimentLabel.findExperimentLabelsByLabelTextLike(labelText, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "experimentlabels/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot", "form" }, method = RequestMethod.GET)
-    public String ExperimentLabelController.findExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNotForm(Model uiModel) {
-        return "experimentlabels/findExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot";
-    }
-    
-    @RequestMapping(params = "find=ByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot", method = RequestMethod.GET)
-    public String ExperimentLabelController.findExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(@RequestParam("labelText") String labelText, @RequestParam("lsTypeAndKind") String lsTypeAndKind, @RequestParam(value = "preferred", required = false) boolean preferred, @RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("experimentlabels", ExperimentLabel.findExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(labelText, lsTypeAndKind, preferred, ignored, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ExperimentLabel.countFindExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(labelText, lsTypeAndKind, preferred, ignored) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("experimentlabels", ExperimentLabel.findExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(labelText, lsTypeAndKind, preferred, ignored, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "experimentlabels/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot", "form" }, method = RequestMethod.GET)
-    public String ExperimentLabelController.findExperimentLabelsByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNotForm(Model uiModel) {
-        return "experimentlabels/findExperimentLabelsByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot", method = RequestMethod.GET)
-    public String ExperimentLabelController.findExperimentLabelsByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(@RequestParam("lsTypeAndKind") String lsTypeAndKind, @RequestParam(value = "preferred", required = false) boolean preferred, @RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("experimentlabels", ExperimentLabel.findExperimentLabelsByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(lsTypeAndKind, preferred, ignored, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ExperimentLabel.countFindExperimentLabelsByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(lsTypeAndKind, preferred, ignored) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("experimentlabels", ExperimentLabel.findExperimentLabelsByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(lsTypeAndKind, preferred, ignored, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "experimentlabels/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentLabelController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ExperimentLabelController_Roo_Controller_Json.aj
deleted file mode 100755
index c85830bf2..000000000
--- a/src/main/java/com/labsynch/labseer/web/ExperimentLabelController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,173 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentLabel;
-import com.labsynch.labseer.web.ExperimentLabelController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ExperimentLabelController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentLabelController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ExperimentLabel experimentLabel = ExperimentLabel.findExperimentLabel(id);
-            if (experimentLabel == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(experimentLabel.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentLabelController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ExperimentLabel> result = ExperimentLabel.findAllExperimentLabels();
-            return new ResponseEntity<String>(ExperimentLabel.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ExperimentLabelController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ExperimentLabel experimentLabel = ExperimentLabel.fromJsonToExperimentLabel(json);
-            experimentLabel.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+experimentLabel.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ExperimentLabelController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ExperimentLabel experimentLabel: ExperimentLabel.fromJsonArrayToExperimentLabels(json)) {
-                experimentLabel.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ExperimentLabelController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ExperimentLabel experimentLabel = ExperimentLabel.fromJsonToExperimentLabel(json);
-            experimentLabel.setId(id);
-            if (experimentLabel.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ExperimentLabelController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ExperimentLabel experimentLabel = ExperimentLabel.findExperimentLabel(id);
-            if (experimentLabel == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            experimentLabel.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByExperiment", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentLabelController.jsonFindExperimentLabelsByExperiment(@RequestParam("experiment") Experiment experiment) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ExperimentLabel.toJsonArray(ExperimentLabel.findExperimentLabelsByExperiment(experiment).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByExperimentAndIgnoredNot", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentLabelController.jsonFindExperimentLabelsByExperimentAndIgnoredNot(@RequestParam("experiment") Experiment experiment, @RequestParam(value = "ignored", required = false) boolean ignored) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ExperimentLabel.toJsonArray(ExperimentLabel.findExperimentLabelsByExperimentAndIgnoredNot(experiment, ignored).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLabelTextLike", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentLabelController.jsonFindExperimentLabelsByLabelTextLike(@RequestParam("labelText") String labelText) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ExperimentLabel.toJsonArray(ExperimentLabel.findExperimentLabelsByLabelTextLike(labelText).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentLabelController.jsonFindExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(@RequestParam("labelText") String labelText, @RequestParam("lsTypeAndKind") String lsTypeAndKind, @RequestParam(value = "preferred", required = false) boolean preferred, @RequestParam(value = "ignored", required = false) boolean ignored) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ExperimentLabel.toJsonArray(ExperimentLabel.findExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(labelText, lsTypeAndKind, preferred, ignored).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentLabelController.jsonFindExperimentLabelsByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(@RequestParam("lsTypeAndKind") String lsTypeAndKind, @RequestParam(value = "preferred", required = false) boolean preferred, @RequestParam(value = "ignored", required = false) boolean ignored) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ExperimentLabel.toJsonArray(ExperimentLabel.findExperimentLabelsByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(lsTypeAndKind, preferred, ignored).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentSearchRequestDTOController.java b/src/main/java/com/labsynch/labseer/web/ExperimentSearchRequestDTOController.java
deleted file mode 100755
index 9431b39b8..000000000
--- a/src/main/java/com/labsynch/labseer/web/ExperimentSearchRequestDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.ExperimentSearchRequestDTO;
-
-@RooWebJson(jsonObject = ExperimentSearchRequestDTO.class)
-@Controller
-@RequestMapping("/experimentsearchrequestdto")
-public class ExperimentSearchRequestDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentStateController.java b/src/main/java/com/labsynch/labseer/web/ExperimentStateController.java
deleted file mode 100755
index e1c81fbd5..000000000
--- a/src/main/java/com/labsynch/labseer/web/ExperimentStateController.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentState;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.apache.commons.io.IOUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = ExperimentState.class)
-@Controller
-@RequestMapping("/experimentstates")
-@RooWebScaffold(path = "experimentstates", formBackingObject = ExperimentState.class)
-@RooWebFinder
-@Transactional
-public class ExperimentStateController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentStateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ExperimentStateController_Roo_Controller.aj
deleted file mode 100755
index b019e4ba9..000000000
--- a/src/main/java/com/labsynch/labseer/web/ExperimentStateController_Roo_Controller.aj
+++ /dev/null
@@ -1,121 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentState;
-import com.labsynch.labseer.domain.ExperimentValue;
-import com.labsynch.labseer.web.ExperimentStateController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ExperimentStateController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ExperimentStateController.create(@Valid ExperimentState experimentState, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, experimentState);
-            return "experimentstates/create";
-        }
-        uiModel.asMap().clear();
-        experimentState.persist();
-        return "redirect:/experimentstates/" + encodeUrlPathSegment(experimentState.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ExperimentStateController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ExperimentState());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (Experiment.countExperiments() == 0) {
-            dependencies.add(new String[] { "experiment", "experiments" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "experimentstates/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ExperimentStateController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("experimentstate", ExperimentState.findExperimentState(id));
-        uiModel.addAttribute("itemId", id);
-        return "experimentstates/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ExperimentStateController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("experimentstates", ExperimentState.findExperimentStateEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ExperimentState.countExperimentStates() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("experimentstates", ExperimentState.findAllExperimentStates(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "experimentstates/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ExperimentStateController.update(@Valid ExperimentState experimentState, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, experimentState);
-            return "experimentstates/update";
-        }
-        uiModel.asMap().clear();
-        experimentState.merge();
-        return "redirect:/experimentstates/" + encodeUrlPathSegment(experimentState.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ExperimentStateController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ExperimentState.findExperimentState(id));
-        return "experimentstates/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ExperimentStateController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ExperimentState experimentState = ExperimentState.findExperimentState(id);
-        experimentState.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/experimentstates";
-    }
-    
-    void ExperimentStateController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("experimentState_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("experimentState_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ExperimentStateController.populateEditForm(Model uiModel, ExperimentState experimentState) {
-        uiModel.addAttribute("experimentState", experimentState);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("experiments", Experiment.findAllExperiments());
-        uiModel.addAttribute("experimentvalues", ExperimentValue.findAllExperimentValues());
-    }
-    
-    String ExperimentStateController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentStateController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/ExperimentStateController_Roo_Controller_Finder.aj
deleted file mode 100755
index 520fed6ea..000000000
--- a/src/main/java/com/labsynch/labseer/web/ExperimentStateController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,37 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentState;
-import com.labsynch.labseer.web.ExperimentStateController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect ExperimentStateController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByExperiment", "form" }, method = RequestMethod.GET)
-    public String ExperimentStateController.findExperimentStatesByExperimentForm(Model uiModel) {
-        uiModel.addAttribute("experiments", Experiment.findAllExperiments());
-        return "experimentstates/findExperimentStatesByExperiment";
-    }
-    
-    @RequestMapping(params = "find=ByExperiment", method = RequestMethod.GET)
-    public String ExperimentStateController.findExperimentStatesByExperiment(@RequestParam("experiment") Experiment experiment, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("experimentstates", ExperimentState.findExperimentStatesByExperiment(experiment, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ExperimentState.countFindExperimentStatesByExperiment(experiment) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("experimentstates", ExperimentState.findExperimentStatesByExperiment(experiment, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "experimentstates/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentStateController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ExperimentStateController_Roo_Controller_Json.aj
deleted file mode 100755
index 286d15d78..000000000
--- a/src/main/java/com/labsynch/labseer/web/ExperimentStateController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,125 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentState;
-import com.labsynch.labseer.web.ExperimentStateController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ExperimentStateController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentStateController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ExperimentState experimentState = ExperimentState.findExperimentState(id);
-            if (experimentState == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(experimentState.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentStateController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ExperimentState> result = ExperimentState.findAllExperimentStates();
-            return new ResponseEntity<String>(ExperimentState.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ExperimentStateController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ExperimentState experimentState = ExperimentState.fromJsonToExperimentState(json);
-            experimentState.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+experimentState.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ExperimentStateController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ExperimentState experimentState: ExperimentState.fromJsonArrayToExperimentStates(json)) {
-                experimentState.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ExperimentStateController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ExperimentState experimentState = ExperimentState.fromJsonToExperimentState(json);
-            experimentState.setId(id);
-            if (experimentState.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ExperimentStateController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ExperimentState experimentState = ExperimentState.findExperimentState(id);
-            if (experimentState == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            experimentState.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByExperiment", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentStateController.jsonFindExperimentStatesByExperiment(@RequestParam("experiment") Experiment experiment) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ExperimentState.toJsonArray(ExperimentState.findExperimentStatesByExperiment(experiment).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentTypeController.java b/src/main/java/com/labsynch/labseer/web/ExperimentTypeController.java
deleted file mode 100755
index 33551ddcc..000000000
--- a/src/main/java/com/labsynch/labseer/web/ExperimentTypeController.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ExperimentType;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RequestMapping("/experimenttypes")
-@Controller
-@RooWebScaffold(path = "experimenttypes", formBackingObject = ExperimentType.class)
-@RooWebJson(jsonObject = ExperimentType.class)
-@RooWebFinder
-public class ExperimentTypeController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ExperimentTypeController_Roo_Controller.aj
deleted file mode 100755
index c4fb07c50..000000000
--- a/src/main/java/com/labsynch/labseer/web/ExperimentTypeController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ExperimentType;
-import com.labsynch.labseer.web.ExperimentTypeController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ExperimentTypeController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ExperimentTypeController.create(@Valid ExperimentType experimentType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, experimentType);
-            return "experimenttypes/create";
-        }
-        uiModel.asMap().clear();
-        experimentType.persist();
-        return "redirect:/experimenttypes/" + encodeUrlPathSegment(experimentType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ExperimentTypeController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ExperimentType());
-        return "experimenttypes/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ExperimentTypeController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("experimenttype", ExperimentType.findExperimentType(id));
-        uiModel.addAttribute("itemId", id);
-        return "experimenttypes/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ExperimentTypeController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("experimenttypes", ExperimentType.findExperimentTypeEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ExperimentType.countExperimentTypes() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("experimenttypes", ExperimentType.findAllExperimentTypes(sortFieldName, sortOrder));
-        }
-        return "experimenttypes/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ExperimentTypeController.update(@Valid ExperimentType experimentType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, experimentType);
-            return "experimenttypes/update";
-        }
-        uiModel.asMap().clear();
-        experimentType.merge();
-        return "redirect:/experimenttypes/" + encodeUrlPathSegment(experimentType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ExperimentTypeController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ExperimentType.findExperimentType(id));
-        return "experimenttypes/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ExperimentTypeController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ExperimentType experimentType = ExperimentType.findExperimentType(id);
-        experimentType.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/experimenttypes";
-    }
-    
-    void ExperimentTypeController.populateEditForm(Model uiModel, ExperimentType experimentType) {
-        uiModel.addAttribute("experimentType", experimentType);
-    }
-    
-    String ExperimentTypeController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentTypeController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/ExperimentTypeController_Roo_Controller_Finder.aj
deleted file mode 100755
index a47b648ff..000000000
--- a/src/main/java/com/labsynch/labseer/web/ExperimentTypeController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ExperimentType;
-import com.labsynch.labseer.web.ExperimentTypeController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect ExperimentTypeController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByTypeNameEquals", "form" }, method = RequestMethod.GET)
-    public String ExperimentTypeController.findExperimentTypesByTypeNameEqualsForm(Model uiModel) {
-        return "experimenttypes/findExperimentTypesByTypeNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByTypeNameEquals", method = RequestMethod.GET)
-    public String ExperimentTypeController.findExperimentTypesByTypeNameEquals(@RequestParam("typeName") String typeName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("experimenttypes", ExperimentType.findExperimentTypesByTypeNameEquals(typeName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ExperimentType.countFindExperimentTypesByTypeNameEquals(typeName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("experimenttypes", ExperimentType.findExperimentTypesByTypeNameEquals(typeName, sortFieldName, sortOrder).getResultList());
-        }
-        return "experimenttypes/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentTypeController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ExperimentTypeController_Roo_Controller_Json.aj
deleted file mode 100755
index eb358d297..000000000
--- a/src/main/java/com/labsynch/labseer/web/ExperimentTypeController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,124 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ExperimentType;
-import com.labsynch.labseer.web.ExperimentTypeController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ExperimentTypeController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentTypeController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ExperimentType experimentType = ExperimentType.findExperimentType(id);
-            if (experimentType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(experimentType.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentTypeController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ExperimentType> result = ExperimentType.findAllExperimentTypes();
-            return new ResponseEntity<String>(ExperimentType.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ExperimentTypeController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ExperimentType experimentType = ExperimentType.fromJsonToExperimentType(json);
-            experimentType.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+experimentType.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ExperimentTypeController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ExperimentType experimentType: ExperimentType.fromJsonArrayToExperimentTypes(json)) {
-                experimentType.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ExperimentTypeController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ExperimentType experimentType = ExperimentType.fromJsonToExperimentType(json);
-            experimentType.setId(id);
-            if (experimentType.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ExperimentTypeController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ExperimentType experimentType = ExperimentType.findExperimentType(id);
-            if (experimentType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            experimentType.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByTypeNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentTypeController.jsonFindExperimentTypesByTypeNameEquals(@RequestParam("typeName") String typeName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ExperimentType.toJsonArray(ExperimentType.findExperimentTypesByTypeNameEquals(typeName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentValueController.java b/src/main/java/com/labsynch/labseer/web/ExperimentValueController.java
deleted file mode 100755
index 579284b24..000000000
--- a/src/main/java/com/labsynch/labseer/web/ExperimentValueController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ExperimentState;
-import com.labsynch.labseer.domain.ExperimentValue;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = ExperimentValue.class)
-@Controller
-@RequestMapping("/experimentvalues")
-@RooWebScaffold(path = "experimentvalues", formBackingObject = ExperimentValue.class)
-@RooWebFinder
-@Transactional
-public class ExperimentValueController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentValueController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ExperimentValueController_Roo_Controller.aj
deleted file mode 100755
index a40f62b71..000000000
--- a/src/main/java/com/labsynch/labseer/web/ExperimentValueController_Roo_Controller.aj
+++ /dev/null
@@ -1,120 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ExperimentState;
-import com.labsynch.labseer.domain.ExperimentValue;
-import com.labsynch.labseer.web.ExperimentValueController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ExperimentValueController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ExperimentValueController.create(@Valid ExperimentValue experimentValue, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, experimentValue);
-            return "experimentvalues/create";
-        }
-        uiModel.asMap().clear();
-        experimentValue.persist();
-        return "redirect:/experimentvalues/" + encodeUrlPathSegment(experimentValue.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ExperimentValueController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ExperimentValue());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (ExperimentState.countExperimentStates() == 0) {
-            dependencies.add(new String[] { "lsState", "experimentstates" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "experimentvalues/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ExperimentValueController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("experimentvalue", ExperimentValue.findExperimentValue(id));
-        uiModel.addAttribute("itemId", id);
-        return "experimentvalues/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ExperimentValueController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("experimentvalues", ExperimentValue.findExperimentValueEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ExperimentValue.countExperimentValues() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("experimentvalues", ExperimentValue.findAllExperimentValues(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "experimentvalues/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ExperimentValueController.update(@Valid ExperimentValue experimentValue, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, experimentValue);
-            return "experimentvalues/update";
-        }
-        uiModel.asMap().clear();
-        experimentValue.merge();
-        return "redirect:/experimentvalues/" + encodeUrlPathSegment(experimentValue.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ExperimentValueController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ExperimentValue.findExperimentValue(id));
-        return "experimentvalues/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ExperimentValueController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ExperimentValue experimentValue = ExperimentValue.findExperimentValue(id);
-        experimentValue.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/experimentvalues";
-    }
-    
-    void ExperimentValueController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("experimentValue_datevalue_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("experimentValue_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("experimentValue_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ExperimentValueController.populateEditForm(Model uiModel, ExperimentValue experimentValue) {
-        uiModel.addAttribute("experimentValue", experimentValue);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("experimentstates", ExperimentState.findAllExperimentStates());
-    }
-    
-    String ExperimentValueController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentValueController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/ExperimentValueController_Roo_Controller_Finder.aj
deleted file mode 100755
index e7277322f..000000000
--- a/src/main/java/com/labsynch/labseer/web/ExperimentValueController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,98 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ExperimentState;
-import com.labsynch.labseer.domain.ExperimentValue;
-import com.labsynch.labseer.web.ExperimentValueController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect ExperimentValueController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByLsKindEqualsAndCodeValueLike", "form" }, method = RequestMethod.GET)
-    public String ExperimentValueController.findExperimentValuesByLsKindEqualsAndCodeValueLikeForm(Model uiModel) {
-        return "experimentvalues/findExperimentValuesByLsKindEqualsAndCodeValueLike";
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEqualsAndCodeValueLike", method = RequestMethod.GET)
-    public String ExperimentValueController.findExperimentValuesByLsKindEqualsAndCodeValueLike(@RequestParam("lsKind") String lsKind, @RequestParam("codeValue") String codeValue, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("experimentvalues", ExperimentValue.findExperimentValuesByLsKindEqualsAndCodeValueLike(lsKind, codeValue, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ExperimentValue.countFindExperimentValuesByLsKindEqualsAndCodeValueLike(lsKind, codeValue) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("experimentvalues", ExperimentValue.findExperimentValuesByLsKindEqualsAndCodeValueLike(lsKind, codeValue, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "experimentvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsKindEqualsAndStringValueLike", "form" }, method = RequestMethod.GET)
-    public String ExperimentValueController.findExperimentValuesByLsKindEqualsAndStringValueLikeForm(Model uiModel) {
-        return "experimentvalues/findExperimentValuesByLsKindEqualsAndStringValueLike";
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEqualsAndStringValueLike", method = RequestMethod.GET)
-    public String ExperimentValueController.findExperimentValuesByLsKindEqualsAndStringValueLike(@RequestParam("lsKind") String lsKind, @RequestParam("stringValue") String stringValue, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("experimentvalues", ExperimentValue.findExperimentValuesByLsKindEqualsAndStringValueLike(lsKind, stringValue, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ExperimentValue.countFindExperimentValuesByLsKindEqualsAndStringValueLike(lsKind, stringValue) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("experimentvalues", ExperimentValue.findExperimentValuesByLsKindEqualsAndStringValueLike(lsKind, stringValue, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "experimentvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsState", "form" }, method = RequestMethod.GET)
-    public String ExperimentValueController.findExperimentValuesByLsStateForm(Model uiModel) {
-        uiModel.addAttribute("experimentstates", ExperimentState.findAllExperimentStates());
-        return "experimentvalues/findExperimentValuesByLsState";
-    }
-    
-    @RequestMapping(params = "find=ByLsState", method = RequestMethod.GET)
-    public String ExperimentValueController.findExperimentValuesByLsState(@RequestParam("lsState") ExperimentState lsState, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("experimentvalues", ExperimentValue.findExperimentValuesByLsState(lsState, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ExperimentValue.countFindExperimentValuesByLsState(lsState) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("experimentvalues", ExperimentValue.findExperimentValuesByLsState(lsState, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "experimentvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals", "form" }, method = RequestMethod.GET)
-    public String ExperimentValueController.findExperimentValuesByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEqualsForm(Model uiModel) {
-        uiModel.addAttribute("experimentstates", ExperimentState.findAllExperimentStates());
-        return "experimentvalues/findExperimentValuesByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals", method = RequestMethod.GET)
-    public String ExperimentValueController.findExperimentValuesByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals(@RequestParam("lsState") ExperimentState lsState, @RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam("lsKind") String lsKind, @RequestParam("lsType") String lsType, @RequestParam("stringValue") String stringValue, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("experimentvalues", ExperimentValue.findExperimentValuesByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals(lsState, ignored, lsKind, lsType, stringValue, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ExperimentValue.countFindExperimentValuesByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals(lsState, ignored, lsKind, lsType, stringValue) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("experimentvalues", ExperimentValue.findExperimentValuesByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals(lsState, ignored, lsKind, lsType, stringValue, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "experimentvalues/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ExperimentValueController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ExperimentValueController_Roo_Controller_Json.aj
deleted file mode 100755
index c0e93c0ea..000000000
--- a/src/main/java/com/labsynch/labseer/web/ExperimentValueController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,161 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ExperimentState;
-import com.labsynch.labseer.domain.ExperimentValue;
-import com.labsynch.labseer.web.ExperimentValueController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ExperimentValueController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentValueController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ExperimentValue experimentValue = ExperimentValue.findExperimentValue(id);
-            if (experimentValue == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(experimentValue.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentValueController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ExperimentValue> result = ExperimentValue.findAllExperimentValues();
-            return new ResponseEntity<String>(ExperimentValue.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ExperimentValueController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ExperimentValue experimentValue = ExperimentValue.fromJsonToExperimentValue(json);
-            experimentValue.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+experimentValue.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ExperimentValueController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ExperimentValue experimentValue: ExperimentValue.fromJsonArrayToExperimentValues(json)) {
-                experimentValue.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ExperimentValueController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ExperimentValue experimentValue = ExperimentValue.fromJsonToExperimentValue(json);
-            experimentValue.setId(id);
-            if (experimentValue.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ExperimentValueController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ExperimentValue experimentValue = ExperimentValue.findExperimentValue(id);
-            if (experimentValue == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            experimentValue.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEqualsAndCodeValueLike", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentValueController.jsonFindExperimentValuesByLsKindEqualsAndCodeValueLike(@RequestParam("lsKind") String lsKind, @RequestParam("codeValue") String codeValue) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ExperimentValue.toJsonArray(ExperimentValue.findExperimentValuesByLsKindEqualsAndCodeValueLike(lsKind, codeValue).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEqualsAndStringValueLike", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentValueController.jsonFindExperimentValuesByLsKindEqualsAndStringValueLike(@RequestParam("lsKind") String lsKind, @RequestParam("stringValue") String stringValue) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ExperimentValue.toJsonArray(ExperimentValue.findExperimentValuesByLsKindEqualsAndStringValueLike(lsKind, stringValue).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsState", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentValueController.jsonFindExperimentValuesByLsState(@RequestParam("lsState") ExperimentState lsState) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ExperimentValue.toJsonArray(ExperimentValue.findExperimentValuesByLsState(lsState).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ExperimentValueController.jsonFindExperimentValuesByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals(@RequestParam("lsState") ExperimentState lsState, @RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam("lsKind") String lsKind, @RequestParam("lsType") String lsType, @RequestParam("stringValue") String stringValue) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ExperimentValue.toJsonArray(ExperimentValue.findExperimentValuesByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals(lsState, ignored, lsKind, lsType, stringValue).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ExportSDFController.java b/src/main/java/com/labsynch/labseer/web/ExportSDFController.java
deleted file mode 100755
index d28c0828d..000000000
--- a/src/main/java/com/labsynch/labseer/web/ExportSDFController.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.labsynch.labseer.web;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import com.labsynch.labseer.service.StructureImageService;
-
-@RequestMapping("/exportSDF")
-@Controller
-public class ExportSDFController {
-
-	private static final Logger logger = LoggerFactory.getLogger(ExportSDFController.class);
-
-	@Autowired
-	private StructureImageService structureImageService;
-
-	@RequestMapping
-	public void get(ModelMap modelMap, HttpServletRequest request, HttpServletResponse response) {
-	}
-
-	@RequestMapping(method = RequestMethod.GET)
-	public ResponseEntity<String> getSDfile( @RequestParam("mols") String mols,
-			HttpServletRequest request,
-			HttpServletResponse response,
-			Model model) {
-
-		String output = structureImageService.convertMolfilesToSDFile(mols);
-
-		logger.debug("output sdfile: " + output);
-
-		HttpHeaders headers= new HttpHeaders();
-		headers.setContentType(MediaType.TEXT_HTML);
-		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		return new ResponseEntity<String>(output, headers, HttpStatus.OK);
-	}
-
-//	@RequestMapping(method = RequestMethod.POST, value = "{id}")
-//	public void post(@PathVariable Long id, ModelMap modelMap, HttpServletRequest request, HttpServletResponse response) {
-//	}
-//
-//	@RequestMapping
-//	public String index() {
-//		return "exportsdf/index";
-//	}
-	
-}
diff --git a/src/main/java/com/labsynch/labseer/web/FileListController.java b/src/main/java/com/labsynch/labseer/web/FileListController.java
deleted file mode 100755
index e3cc88124..000000000
--- a/src/main/java/com/labsynch/labseer/web/FileListController.java
+++ /dev/null
@@ -1,323 +0,0 @@
-package com.labsynch.labseer.web;
-import java.io.BufferedInputStream;
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.Collection;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-import com.labsynch.labseer.domain.FileList;
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.dto.FileSaveReturnDTO;
-
-@RooWebScaffold(path = "filelists", formBackingObject = FileList.class)
-@RequestMapping("/filelists")
-@Controller
-@RooWebFinder
-public class FileListController {
-
-    private static final Logger logger = LoggerFactory.getLogger(FileListController.class);
-
-    @RequestMapping(method = RequestMethod.POST)
-    public String createFile(@Valid FileList fileList, BindingResult bindingResult, Model uiModel, @RequestParam("file") MultipartFile file, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            uiModel.addAttribute("fileList", fileList);
-            return "filelists/create";
-        }
-        uiModel.asMap().clear();
-        fileList.setFile(file);
-        fileList.setType(file.getContentType());
-        fileList.setFileName(file.getOriginalFilename());
-        fileList.setSize(file.getSize());
-        fileList.setName(file.getOriginalFilename());
-        logger.debug("Name: " + file.getOriginalFilename());
-        logger.debug("Description: " + fileList.getDescription());
-        logger.debug("File: " + file.getName());
-        logger.debug("Type: " + file.getContentType());
-        logger.debug("Size: " + fileList.getSize());
-        fileList.saveFile(file);
-        fileList.persist();
-        return "redirect:/filelists/" + encodeUrlPathSegment(fileList.getId().toString(), httpServletRequest);
-    }
-
-    @RequestMapping(value = "/saveFile", method = RequestMethod.POST)
-    public ResponseEntity<String> create(@Valid FileList fileList, BindingResult bindingResult, Model uiModel, @RequestParam("file") MultipartFile file, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            uiModel.addAttribute("fileList", fileList);
-            return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-        logger.debug("receiving the post file");
-        uiModel.asMap().clear();
-        fileList.setFile(file);
-        fileList.setType(file.getContentType());
-        fileList.setFileName(file.getOriginalFilename());
-        fileList.setSize(file.getSize());
-        fileList.setName(file.getOriginalFilename());
-        logger.debug("Name: " + file.getOriginalFilename());
-        logger.debug("Description: " + fileList.getDescription());
-        logger.debug("File: " + file.getName());
-        logger.debug("Type: " + file.getContentType());
-        logger.debug("Size: " + fileList.getSize());
-        fileList.saveFile(file);
-        FileSaveReturnDTO fileSave = new FileSaveReturnDTO();
-        fileSave.setDescription(fileList.getDescription());
-        fileSave.setSubdir(fileList.getSubdir());
-        fileSave.setIe(fileList.getIe());
-        fileSave.setFile(file);
-        fileSave.setType(file.getContentType());
-        fileSave.setSize(file.getSize());
-        fileSave.setName(file.getOriginalFilename());
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text");
-        headers.add("Access-Control-Allow-Origin", "*");
-        return new ResponseEntity<String>(fileSave.toJson(), headers, HttpStatus.CREATED);
-    }
-
-    // 	 @RequestParam("description") String description,
-    // 	 @RequestParam("subdir") String subdir,
-    // 	 @RequestParam("ie") boolean ie,
-    @RequestMapping(value = "/createSaveFile", method = RequestMethod.POST)
-    public ResponseEntity<String> createSaveFile(@Valid FileList fileList, BindingResult bindingResult, Model uiModel, @RequestParam("file") MultipartFile file, HttpServletRequest httpServletRequest) {
-        logger.debug("receiving the post file");
-        logger.debug("Filelist Description: " + fileList.getDescription());
-        fileList.setFile(file);
-        fileList.setType(file.getContentType());
-        fileList.setFileName(file.getOriginalFilename());
-        fileList.setSize(file.getSize());
-        fileList.setName(file.getOriginalFilename());
-        fileList.setFilePath(fileList.getSubdir());
-        logger.debug("Name: " + file.getOriginalFilename());
-        logger.debug("Description: " + fileList.getDescription());
-        logger.debug("File: " + file.getName());
-        logger.debug("Type: " + file.getContentType());
-        logger.debug("Size: " + fileList.getSize());
-        logger.debug("Subdir to save: " + fileList.getSubdir());
-        fileList.saveFile(file);
-        FileSaveReturnDTO fileSave = new FileSaveReturnDTO();
-        fileSave.setDescription(fileList.getDescription());
-        fileSave.setSubdir(fileList.getSubdir());
-        fileSave.setIe(fileList.getIe());
-        fileSave.setFile(file);
-        fileSave.setType(file.getContentType());
-        fileSave.setSize(file.getSize());
-        fileSave.setName(file.getOriginalFilename());
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
-        headers.setExpires(0); // Expire the cache
-        return new ResponseEntity<String>(fileSave.toJson(), headers, HttpStatus.CREATED);
-    }
-
-    @RequestMapping(params = "form", method = RequestMethod.GET)
-    public String createForm(Model uiModel) {
-        uiModel.addAttribute("fileList", new FileList());
-        return "filelists/create";
-    }
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
-    public String show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("filelist", FileList.findFileList(id));
-        uiModel.addAttribute("itemId", id);
-        return "filelists/show";
-    }
-
-    @RequestMapping(value = "/showfile/{id}", method = RequestMethod.GET)
-    public String showdoc(@PathVariable("id") Long id, HttpServletResponse response, Model model) {
-        FileList fileList = FileList.findFileList(id);
-        File readFile = new File(fileList.getFilePath());
-        FileInputStream fis = null;
-        BufferedInputStream bis = null;
-        DataInputStream dis = null;
-        try {
-            response.setHeader("Content-Disposition", "inline;filename=\"" + fileList.getFileName() + "\"");
-            OutputStream out = response.getOutputStream();
-            response.setContentType(fileList.getType());
-            fis = new FileInputStream(readFile);
-            bis = new BufferedInputStream(fis);
-            IOUtils.copy(bis, out);
-            out.flush();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    @RequestMapping(method = RequestMethod.GET)
-    public String list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            uiModel.addAttribute("filelists", FileList.findFileListEntries(page == null ? 0 : (page.intValue() - 1) * sizeNo, sizeNo));
-            float nrOfPages = (float) FileList.countFileLists() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("filelists", FileList.findAllFileLists());
-        }
-        return "filelists/list";
-    }
-
-    @RequestMapping(method = RequestMethod.PUT)
-    public String update(@Valid FileList fileList, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            uiModel.addAttribute("fileList", fileList);
-            return "filelists/update";
-        }
-        uiModel.asMap().clear();
-        fileList.merge();
-        return "redirect:/filelists/" + encodeUrlPathSegment(fileList.getId().toString(), httpServletRequest);
-    }
-
-    @RequestMapping(value = "/{id}", params = "form", method = RequestMethod.GET)
-    public String updateForm(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("fileList", FileList.findFileList(id));
-        return "filelists/update";
-    }
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-    public String delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        FileList.findFileList(id).remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/filelists";
-    }
-
-    @ModelAttribute("filelists")
-    public Collection<FileList> populateFileLists() {
-        return FileList.findAllFileLists();
-    }
-
-    @ModelAttribute("lots")
-    public Collection<Lot> populateLots() {
-        return Lot.findAllLots();
-    }
-
-    String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
-        FileList filelist = FileList.findFileList(id);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text; charset=utf-8");
-        if (filelist == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        return new ResponseEntity<String>(filelist.toJson(), headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text; charset=utf-8");
-        return new ResponseEntity<String>(FileList.toJsonArray(FileList.findAllFileLists()), headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> createFromJson(@RequestBody String json) {
-        FileList.fromJsonToFileList(json).persist();
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text");
-        return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-    }
-
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> createFromJsonArray(@RequestBody String json) {
-        for (FileList fileList : FileList.fromJsonArrayToFileLists(json)) {
-            fileList.persist();
-        }
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text");
-        return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-    }
-
-    @RequestMapping(method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> updateFromJson(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text");
-        if (FileList.fromJsonToFileList(json).merge() == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> updateFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text");
-        for (FileList fileList : FileList.fromJsonArrayToFileLists(json)) {
-            if (fileList.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-        }
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
-        FileList filelist = FileList.findFileList(id);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text");
-        if (filelist == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        filelist.remove();
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(params = "find=ByLot", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> jsonFindFileListsByLot(@RequestParam("lot") Lot lot) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text; charset=utf-8");
-        return new ResponseEntity<String>(FileList.toJsonArray(FileList.findFileListsByLot(lot).getResultList()), headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(method = RequestMethod.OPTIONS)
-    public ResponseEntity<String> getOptions() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text, text/html");
-        headers.add("Access-Control-Allow-Headers", "Content-Type");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
-        headers.setExpires(0); // Expire the cache
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-}
diff --git a/src/main/java/com/labsynch/labseer/web/FileListController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/FileListController_Roo_Controller.aj
deleted file mode 100644
index f4ffff8ea..000000000
--- a/src/main/java/com/labsynch/labseer/web/FileListController_Roo_Controller.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.FileList;
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.web.FileListController;
-import org.springframework.ui.Model;
-
-privileged aspect FileListController_Roo_Controller {
-    
-    void FileListController.populateEditForm(Model uiModel, FileList fileList) {
-        uiModel.addAttribute("fileList", fileList);
-        uiModel.addAttribute("lots", Lot.findAllLots());
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/FileListController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/FileListController_Roo_Controller_Finder.aj
deleted file mode 100644
index b2e803a84..000000000
--- a/src/main/java/com/labsynch/labseer/web/FileListController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,55 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.FileList;
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.web.FileListController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect FileListController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByLot", "form" }, method = RequestMethod.GET)
-    public String FileListController.findFileListsByLotForm(Model uiModel) {
-        uiModel.addAttribute("lots", Lot.findAllLots());
-        return "filelists/findFileListsByLot";
-    }
-    
-    @RequestMapping(params = "find=ByLot", method = RequestMethod.GET)
-    public String FileListController.findFileListsByLot(@RequestParam("lot") Lot lot, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("filelists", FileList.findFileListsByLot(lot, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) FileList.countFindFileListsByLot(lot) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("filelists", FileList.findFileListsByLot(lot, sortFieldName, sortOrder).getResultList());
-        }
-        return "filelists/list";
-    }
-    
-    @RequestMapping(params = { "find=ByUrlEquals", "form" }, method = RequestMethod.GET)
-    public String FileListController.findFileListsByUrlEqualsForm(Model uiModel) {
-        return "filelists/findFileListsByUrlEquals";
-    }
-    
-    @RequestMapping(params = "find=ByUrlEquals", method = RequestMethod.GET)
-    public String FileListController.findFileListsByUrlEquals(@RequestParam("url") String url, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("filelists", FileList.findFileListsByUrlEquals(url, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) FileList.countFindFileListsByUrlEquals(url) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("filelists", FileList.findFileListsByUrlEquals(url, sortFieldName, sortOrder).getResultList());
-        }
-        return "filelists/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/FileThingController.java b/src/main/java/com/labsynch/labseer/web/FileThingController.java
deleted file mode 100755
index 87c6ff2f0..000000000
--- a/src/main/java/com/labsynch/labseer/web/FileThingController.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.FileThing;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/filethings")
-@Controller
-@RooWebScaffold(path = "filethings", formBackingObject = FileThing.class)
-@RooWebJson(jsonObject = FileThing.class)
-public class FileThingController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/FileThingController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/FileThingController_Roo_Controller.aj
deleted file mode 100755
index 87c8d06d7..000000000
--- a/src/main/java/com/labsynch/labseer/web/FileThingController_Roo_Controller.aj
+++ /dev/null
@@ -1,112 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.FileThing;
-import com.labsynch.labseer.domain.ThingPage;
-import com.labsynch.labseer.web.FileThingController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect FileThingController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String FileThingController.create(@Valid FileThing fileThing, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, fileThing);
-            return "filethings/create";
-        }
-        uiModel.asMap().clear();
-        fileThing.persist();
-        return "redirect:/filethings/" + encodeUrlPathSegment(fileThing.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String FileThingController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new FileThing());
-        return "filethings/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String FileThingController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("filething", FileThing.findFileThing(id));
-        uiModel.addAttribute("itemId", id);
-        return "filethings/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String FileThingController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("filethings", FileThing.findFileThingEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) FileThing.countFileThings() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("filethings", FileThing.findAllFileThings(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "filethings/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String FileThingController.update(@Valid FileThing fileThing, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, fileThing);
-            return "filethings/update";
-        }
-        uiModel.asMap().clear();
-        fileThing.merge();
-        return "redirect:/filethings/" + encodeUrlPathSegment(fileThing.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String FileThingController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, FileThing.findFileThing(id));
-        return "filethings/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String FileThingController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        FileThing fileThing = FileThing.findFileThing(id);
-        fileThing.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/filethings";
-    }
-    
-    void FileThingController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("fileThing_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("fileThing_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void FileThingController.populateEditForm(Model uiModel, FileThing fileThing) {
-        uiModel.addAttribute("fileThing", fileThing);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("thingpages", ThingPage.findAllThingPages());
-    }
-    
-    String FileThingController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/FileThingController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/FileThingController_Roo_Controller_Json.aj
deleted file mode 100755
index 342013178..000000000
--- a/src/main/java/com/labsynch/labseer/web/FileThingController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,111 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.FileThing;
-import com.labsynch.labseer.web.FileThingController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect FileThingController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> FileThingController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            FileThing fileThing = FileThing.findFileThing(id);
-            if (fileThing == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(fileThing.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> FileThingController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<FileThing> result = FileThing.findAllFileThings();
-            return new ResponseEntity<String>(FileThing.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> FileThingController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            FileThing fileThing = FileThing.fromJsonToFileThing(json);
-            fileThing.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+fileThing.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> FileThingController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (FileThing fileThing: FileThing.fromJsonArrayToFileThings(json)) {
-                fileThing.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> FileThingController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            FileThing fileThing = FileThing.fromJsonToFileThing(json);
-            fileThing.setId(id);
-            if (fileThing.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> FileThingController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            FileThing fileThing = FileThing.findFileThing(id);
-            if (fileThing == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            fileThing.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ForgotPasswordController.java b/src/main/java/com/labsynch/labseer/web/ForgotPasswordController.java
deleted file mode 100755
index 697a81def..000000000
--- a/src/main/java/com/labsynch/labseer/web/ForgotPasswordController.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.labsynch.labseer.web;
-
-import java.io.UnsupportedEncodingException;
-import java.security.NoSuchAlgorithmException;
-import java.util.Random;
-
-import javax.persistence.TypedQuery;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.mail.MailSender;
-import org.springframework.mail.SimpleMailMessage;
-import org.springframework.stereotype.Controller;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.service.DatabaseAuthenticationProvider;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-
-@RequestMapping("/forgotpassword/**")
-@Controller
-public class ForgotPasswordController {
-
-    @Autowired
-    private transient MailSender mailSender;
-
-    private transient SimpleMailMessage simpleMailMessage;
-    
-    @Autowired
-    private PropertiesUtilService propertiesUtilService;
-
-    @ModelAttribute("forgotpasswordForm")
-    public ForgotPasswordForm formBackingObject() {
-        return new ForgotPasswordForm();
-    }
-
-    @RequestMapping(value = "/index", produces = "text/html")
-    public String index() {
-        return "forgotpassword/index";
-    }
-
-    @RequestMapping(value = "/thanks", produces = "text/html")
-    public String thanks() {
-        return "forgotpassword/thanks";
-    }
-
-    @RequestMapping(value = "/update", method = RequestMethod.POST, produces = "text/html")
-    public String update(@ModelAttribute("forgotpasswordForm") ForgotPasswordForm form, BindingResult result) {
-        if (result.hasErrors()) {
-        	return "forgotpassword/index";
-        } else {
-        	TypedQuery<Author> userQuery=Author.findAuthorsByEmailAddress(form.getEmailAddress());
-        	if(null!=userQuery && userQuery.getMaxResults()>0){
-        		Author User = userQuery.getSingleResult();
-        		Random random = new Random(System.currentTimeMillis());
-        		String newPassword = "pass"+random.nextLong();        		
-        		
-	    	    String encryptedPassword = null;
-	    		try {
-	    			encryptedPassword = DatabaseAuthenticationProvider.getBase64ShaHash(newPassword);
-	    		} catch (NoSuchAlgorithmException e1) {
-	    			// TODO Auto-generated catch block
-	    			e1.printStackTrace();
-	    		} catch (UnsupportedEncodingException e1) {
-	    			// TODO Auto-generated catch block
-	    			e1.printStackTrace();
-	    		} 
-	            User.setPassword(encryptedPassword);
-        		
-        		User.merge();
-        		SimpleMailMessage mail = new SimpleMailMessage();
-        		mail.setTo(form.getEmailAddress());
-        		mail.setSubject("ACAS Password Recovery");
-        		mail.setText("Hi "+User.getFirstName()+",\n"
-        				+ "You recently requested for your password to be reset. Your new password is "+newPassword+"\n"
-        				+ "Please login to ACAS here and remember to change your password. "+ propertiesUtilService.getClientFullPath() + "\n"
-        				+"Thank you, \nAdmin");
-        		mailSender.send(mail);
-        	}
-
-            return "forgotpassword/thanks";
-        }
-    }
-
-    public void sendMessage(String mailTo, String message) {
-        simpleMailMessage.setTo(mailTo);
-        simpleMailMessage.setText(message);
-		if(propertiesUtilService.getEmailFromAddress() != null && !propertiesUtilService.getEmailFromAddress().equals("") ) simpleMailMessage.setFrom(propertiesUtilService.getEmailFromAddress());
-        mailSender.send(simpleMailMessage);
-    }
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ForgotPasswordForm.java b/src/main/java/com/labsynch/labseer/web/ForgotPasswordForm.java
deleted file mode 100755
index 7ca3710b2..000000000
--- a/src/main/java/com/labsynch/labseer/web/ForgotPasswordForm.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * 
- */
-package com.labsynch.labseer.web;
-
-/**
- * 
- */
-public class ForgotPasswordForm {
-
-	private String emailAddress;
-
-	/**
-	 * @return the emailAddress
-	 */
-	public String getEmailAddress() {
-		return emailAddress;
-	}
-
-	/**
-	 * @param emailAddress
-	 *            the emailAddress to set
-	 */
-	public void setEmailAddress(String emailAddress) {
-		this.emailAddress = emailAddress;
-	}
-
-}
diff --git a/src/main/java/com/labsynch/labseer/web/GeneIdDTOController.java b/src/main/java/com/labsynch/labseer/web/GeneIdDTOController.java
deleted file mode 100755
index 082a1b3cf..000000000
--- a/src/main/java/com/labsynch/labseer/web/GeneIdDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.GeneIdDTO;
-
-@RooWebJson(jsonObject = GeneIdDTO.class)
-@Controller
-@RequestMapping("/geneiddto")
-public class GeneIdDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/IdCollectionDTOController.java b/src/main/java/com/labsynch/labseer/web/IdCollectionDTOController.java
deleted file mode 100755
index 888fa214e..000000000
--- a/src/main/java/com/labsynch/labseer/web/IdCollectionDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.IdCollectionDTO;
-
-@RooWebJson(jsonObject = IdCollectionDTO.class)
-@Controller
-@RequestMapping("/idcollectioes")
-public class IdCollectionDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/InteractionKindController.java b/src/main/java/com/labsynch/labseer/web/InteractionKindController.java
deleted file mode 100755
index aad6ac115..000000000
--- a/src/main/java/com/labsynch/labseer/web/InteractionKindController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.InteractionKind;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = InteractionKind.class)
-@Controller
-@RequestMapping("/interactionkinds")
-@RooWebScaffold(path = "interactionkinds", formBackingObject = InteractionKind.class)
-public class InteractionKindController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/InteractionKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/InteractionKindController_Roo_Controller.aj
deleted file mode 100755
index 509747f57..000000000
--- a/src/main/java/com/labsynch/labseer/web/InteractionKindController_Roo_Controller.aj
+++ /dev/null
@@ -1,109 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.InteractionKind;
-import com.labsynch.labseer.domain.InteractionType;
-import com.labsynch.labseer.web.InteractionKindController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect InteractionKindController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String InteractionKindController.create(@Valid InteractionKind interactionKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, interactionKind);
-            return "interactionkinds/create";
-        }
-        uiModel.asMap().clear();
-        interactionKind.persist();
-        return "redirect:/interactionkinds/" + encodeUrlPathSegment(interactionKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String InteractionKindController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new InteractionKind());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (InteractionType.countInteractionTypes() == 0) {
-            dependencies.add(new String[] { "lsType", "interactiontypes" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "interactionkinds/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String InteractionKindController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("interactionkind", InteractionKind.findInteractionKind(id));
-        uiModel.addAttribute("itemId", id);
-        return "interactionkinds/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String InteractionKindController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("interactionkinds", InteractionKind.findInteractionKindEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) InteractionKind.countInteractionKinds() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("interactionkinds", InteractionKind.findAllInteractionKinds(sortFieldName, sortOrder));
-        }
-        return "interactionkinds/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String InteractionKindController.update(@Valid InteractionKind interactionKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, interactionKind);
-            return "interactionkinds/update";
-        }
-        uiModel.asMap().clear();
-        interactionKind.merge();
-        return "redirect:/interactionkinds/" + encodeUrlPathSegment(interactionKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String InteractionKindController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, InteractionKind.findInteractionKind(id));
-        return "interactionkinds/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String InteractionKindController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        InteractionKind interactionKind = InteractionKind.findInteractionKind(id);
-        interactionKind.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/interactionkinds";
-    }
-    
-    void InteractionKindController.populateEditForm(Model uiModel, InteractionKind interactionKind) {
-        uiModel.addAttribute("interactionKind", interactionKind);
-        uiModel.addAttribute("interactiontypes", InteractionType.findAllInteractionTypes());
-    }
-    
-    String InteractionKindController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/InteractionKindController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/InteractionKindController_Roo_Controller_Json.aj
deleted file mode 100644
index ca54b071f..000000000
--- a/src/main/java/com/labsynch/labseer/web/InteractionKindController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,137 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.InteractionKind;
-import com.labsynch.labseer.domain.InteractionType;
-import com.labsynch.labseer.web.InteractionKindController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect InteractionKindController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> InteractionKindController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            InteractionKind interactionKind = InteractionKind.findInteractionKind(id);
-            if (interactionKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(interactionKind.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> InteractionKindController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<InteractionKind> result = InteractionKind.findAllInteractionKinds();
-            return new ResponseEntity<String>(InteractionKind.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> InteractionKindController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            InteractionKind interactionKind = InteractionKind.fromJsonToInteractionKind(json);
-            interactionKind.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+interactionKind.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> InteractionKindController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (InteractionKind interactionKind: InteractionKind.fromJsonArrayToInteractionKinds(json)) {
-                interactionKind.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> InteractionKindController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            InteractionKind interactionKind = InteractionKind.fromJsonToInteractionKind(json);
-            interactionKind.setId(id);
-            if (interactionKind.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> InteractionKindController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            InteractionKind interactionKind = InteractionKind.findInteractionKind(id);
-            if (interactionKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            interactionKind.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByKindNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> InteractionKindController.jsonFindInteractionKindsByKindNameEquals(@RequestParam("kindName") String kindName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(InteractionKind.toJsonArray(InteractionKind.findInteractionKindsByKindNameEquals(kindName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByKindNameEqualsAndLsType", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> InteractionKindController.jsonFindInteractionKindsByKindNameEqualsAndLsType(@RequestParam("kindName") String kindName, @RequestParam("lsType") InteractionType lsType) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(InteractionKind.toJsonArray(InteractionKind.findInteractionKindsByKindNameEqualsAndLsType(kindName, lsType).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/InteractionTypeController.java b/src/main/java/com/labsynch/labseer/web/InteractionTypeController.java
deleted file mode 100755
index d72773c6d..000000000
--- a/src/main/java/com/labsynch/labseer/web/InteractionTypeController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.InteractionType;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = InteractionType.class)
-@Controller
-@RequestMapping("/interactiontypes")
-@RooWebScaffold(path = "interactiontypes", formBackingObject = InteractionType.class)
-public class InteractionTypeController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/InteractionTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/InteractionTypeController_Roo_Controller.aj
deleted file mode 100755
index d3de69070..000000000
--- a/src/main/java/com/labsynch/labseer/web/InteractionTypeController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.InteractionType;
-import com.labsynch.labseer.web.InteractionTypeController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect InteractionTypeController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String InteractionTypeController.create(@Valid InteractionType interactionType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, interactionType);
-            return "interactiontypes/create";
-        }
-        uiModel.asMap().clear();
-        interactionType.persist();
-        return "redirect:/interactiontypes/" + encodeUrlPathSegment(interactionType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String InteractionTypeController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new InteractionType());
-        return "interactiontypes/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String InteractionTypeController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("interactiontype", InteractionType.findInteractionType(id));
-        uiModel.addAttribute("itemId", id);
-        return "interactiontypes/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String InteractionTypeController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("interactiontypes", InteractionType.findInteractionTypeEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) InteractionType.countInteractionTypes() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("interactiontypes", InteractionType.findAllInteractionTypes(sortFieldName, sortOrder));
-        }
-        return "interactiontypes/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String InteractionTypeController.update(@Valid InteractionType interactionType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, interactionType);
-            return "interactiontypes/update";
-        }
-        uiModel.asMap().clear();
-        interactionType.merge();
-        return "redirect:/interactiontypes/" + encodeUrlPathSegment(interactionType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String InteractionTypeController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, InteractionType.findInteractionType(id));
-        return "interactiontypes/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String InteractionTypeController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        InteractionType interactionType = InteractionType.findInteractionType(id);
-        interactionType.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/interactiontypes";
-    }
-    
-    void InteractionTypeController.populateEditForm(Model uiModel, InteractionType interactionType) {
-        uiModel.addAttribute("interactionType", interactionType);
-    }
-    
-    String InteractionTypeController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/InteractionTypeController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/InteractionTypeController_Roo_Controller_Json.aj
deleted file mode 100644
index ff20b6f81..000000000
--- a/src/main/java/com/labsynch/labseer/web/InteractionTypeController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,136 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.InteractionType;
-import com.labsynch.labseer.web.InteractionTypeController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect InteractionTypeController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> InteractionTypeController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            InteractionType interactionType = InteractionType.findInteractionType(id);
-            if (interactionType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(interactionType.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> InteractionTypeController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<InteractionType> result = InteractionType.findAllInteractionTypes();
-            return new ResponseEntity<String>(InteractionType.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> InteractionTypeController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            InteractionType interactionType = InteractionType.fromJsonToInteractionType(json);
-            interactionType.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+interactionType.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> InteractionTypeController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (InteractionType interactionType: InteractionType.fromJsonArrayToInteractionTypes(json)) {
-                interactionType.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> InteractionTypeController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            InteractionType interactionType = InteractionType.fromJsonToInteractionType(json);
-            interactionType.setId(id);
-            if (interactionType.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> InteractionTypeController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            InteractionType interactionType = InteractionType.findInteractionType(id);
-            if (interactionType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            interactionType.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByTypeNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> InteractionTypeController.jsonFindInteractionTypesByTypeNameEquals(@RequestParam("typeName") String typeName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(InteractionType.toJsonArray(InteractionType.findInteractionTypesByTypeNameEquals(typeName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByTypeNameEqualsAndTypeVerbEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> InteractionTypeController.jsonFindInteractionTypesByTypeNameEqualsAndTypeVerbEquals(@RequestParam("typeName") String typeName, @RequestParam("typeVerb") String typeVerb) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(InteractionType.toJsonArray(InteractionType.findInteractionTypesByTypeNameEqualsAndTypeVerbEquals(typeName, typeVerb).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/IsoSaltController.java b/src/main/java/com/labsynch/labseer/web/IsoSaltController.java
deleted file mode 100755
index 4875023ec..000000000
--- a/src/main/java/com/labsynch/labseer/web/IsoSaltController.java
+++ /dev/null
@@ -1,223 +0,0 @@
-package com.labsynch.labseer.web;
-
-import java.io.UnsupportedEncodingException;
-import java.util.Collection;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-import com.labsynch.labseer.domain.IsoSalt;
-import com.labsynch.labseer.domain.Isotope;
-import com.labsynch.labseer.domain.Salt;
-import com.labsynch.labseer.domain.SaltForm;
-
-@RooWebScaffold(path = "isosalts", formBackingObject = IsoSalt.class)
-@RequestMapping("/isosalts")
-@Transactional
-@Controller
-
-@RooWebFinder
-public class IsoSaltController {
-
-	
-	@RequestMapping(method = RequestMethod.POST)
-    public String create(@Valid IsoSalt isoSalt, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            uiModel.addAttribute("isoSalt", isoSalt);
-            return "isosalts/create";
-        }
-        uiModel.asMap().clear();
-        isoSalt.persist();
-        return "redirect:/isosalts/" + encodeUrlPathSegment(isoSalt.getId().toString(), httpServletRequest);
-    }
-
-	@RequestMapping(params = "form", method = RequestMethod.GET)
-    public String createForm(Model uiModel) {
-        uiModel.addAttribute("isoSalt", new IsoSalt());
-        return "isosalts/create";
-    }
-
-	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
-    public String show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("isosalt", IsoSalt.findIsoSalt(id));
-        uiModel.addAttribute("itemId", id);
-        return "isosalts/show";
-    }
-
-	@RequestMapping(method = RequestMethod.GET)
-    public String list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            uiModel.addAttribute("isosalts", IsoSalt.findIsoSaltEntries(page == null ? 0 : (page.intValue() - 1) * sizeNo, sizeNo));
-            float nrOfPages = (float) IsoSalt.countIsoSalts() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("isosalts", IsoSalt.findIsoSaltEntries(0, 100));
-        }
-        return "isosalts/list";
-    }
-
-	@RequestMapping(method = RequestMethod.PUT)
-    public String update(@Valid IsoSalt isoSalt, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            uiModel.addAttribute("isoSalt", isoSalt);
-            return "isosalts/update";
-        }
-        uiModel.asMap().clear();
-        isoSalt.merge();
-        return "redirect:/isosalts/" + encodeUrlPathSegment(isoSalt.getId().toString(), httpServletRequest);
-    }
-
-	@RequestMapping(value = "/{id}", params = "form", method = RequestMethod.GET)
-    public String updateForm(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("isoSalt", IsoSalt.findIsoSalt(id));
-        return "isosalts/update";
-    }
-
-	@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-    public String delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        IsoSalt.findIsoSalt(id).remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/isosalts";
-    }
-
-	
-//	@ModelAttribute("isosalts")
-//    public Collection<IsoSalt> populateIsoSalts() {
-//        return IsoSalt.findAllIsoSalts();
-//    }
-
-	@ModelAttribute("isotopes")
-    public Collection<Isotope> populateIsotopes() {
-        return Isotope.findAllIsotopes();
-    }
-
-	@ModelAttribute("salts")
-    public Collection<Salt> populateSalts() {
-        return Salt.findAllSalts();
-    }
-
-//	@ModelAttribute("saltforms")
-//    public Collection<SaltForm> populateSaltForms() {
-//        return SaltForm.findAllSaltForms();
-//    }
-
-	String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-
-	@RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
-        IsoSalt isosalt = IsoSalt.findIsoSalt(id);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text; charset=utf-8");
-        if (isosalt == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        return new ResponseEntity<String>(isosalt.toJson(), headers, HttpStatus.OK);
-    }
-
-	@RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text; charset=utf-8");
-        return new ResponseEntity<String>(IsoSalt.toJsonArray(IsoSalt.findAllIsoSalts()), headers, HttpStatus.OK);
-    }
-
-	@RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> createFromJson(@RequestBody String json) {
-        IsoSalt.fromJsonToIsoSalt(json).persist();
-        HttpHeaders headers= new HttpHeaders();
-        headers.add("Content-Type", "application/text");
-        return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-    }
-
-	@RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> createFromJsonArray(@RequestBody String json) {
-        for (IsoSalt isoSalt: IsoSalt.fromJsonArrayToIsoSalts(json)) {
-            isoSalt.persist();
-        }
-        HttpHeaders headers= new HttpHeaders();
-        headers.add("Content-Type", "application/text");
-        return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-    }
-
-	@RequestMapping(method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> updateFromJson(@RequestBody String json) {
-        HttpHeaders headers= new HttpHeaders();
-        headers.add("Content-Type", "application/text");
-        if (IsoSalt.fromJsonToIsoSalt(json).merge() == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-
-	@RequestMapping(value = "/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> updateFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers= new HttpHeaders();
-        headers.add("Content-Type", "application/text");
-        for (IsoSalt isoSalt: IsoSalt.fromJsonArrayToIsoSalts(json)) {
-            if (isoSalt.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-        }
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-
-	@RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
-        IsoSalt isosalt = IsoSalt.findIsoSalt(id);
-        HttpHeaders headers= new HttpHeaders();
-        headers.add("Content-Type", "application/text");
-        if (isosalt == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        isosalt.remove();
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-
-
-
-	@RequestMapping(params = { "find=BySaltForm", "form" }, method = RequestMethod.GET)
-    public String findIsoSaltsBySaltFormForm(Model uiModel) {
-        uiModel.addAttribute("saltforms", SaltForm.findAllSaltForms());
-        return "isosalts/findIsoSaltsBySaltForm";
-    }
-
-
-	@RequestMapping(params = { "find=BySaltFormAndType", "form" }, method = RequestMethod.GET)
-    public String findIsoSaltsBySaltFormAndTypeForm(Model uiModel) {
-        uiModel.addAttribute("saltforms", SaltForm.findAllSaltForms());
-        return "isosalts/findIsoSaltsBySaltFormAndType";
-    }
-	
-
-}
diff --git a/src/main/java/com/labsynch/labseer/web/IsoSaltController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/IsoSaltController_Roo_Controller.aj
deleted file mode 100644
index 583832681..000000000
--- a/src/main/java/com/labsynch/labseer/web/IsoSaltController_Roo_Controller.aj
+++ /dev/null
@@ -1,22 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.IsoSalt;
-import com.labsynch.labseer.domain.Isotope;
-import com.labsynch.labseer.domain.Salt;
-import com.labsynch.labseer.domain.SaltForm;
-import com.labsynch.labseer.web.IsoSaltController;
-import org.springframework.ui.Model;
-
-privileged aspect IsoSaltController_Roo_Controller {
-    
-    void IsoSaltController.populateEditForm(Model uiModel, IsoSalt isoSalt) {
-        uiModel.addAttribute("isoSalt", isoSalt);
-        uiModel.addAttribute("isotopes", Isotope.findAllIsotopes());
-        uiModel.addAttribute("salts", Salt.findAllSalts());
-        uiModel.addAttribute("saltforms", SaltForm.findAllSaltForms());
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/IsoSaltController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/IsoSaltController_Roo_Controller_Finder.aj
deleted file mode 100644
index fe4f38d77..000000000
--- a/src/main/java/com/labsynch/labseer/web/IsoSaltController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,44 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.IsoSalt;
-import com.labsynch.labseer.domain.SaltForm;
-import com.labsynch.labseer.web.IsoSaltController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect IsoSaltController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = "find=BySaltForm", method = RequestMethod.GET)
-    public String IsoSaltController.findIsoSaltsBySaltForm(@RequestParam("saltForm") SaltForm saltForm, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("isosalts", IsoSalt.findIsoSaltsBySaltForm(saltForm, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) IsoSalt.countFindIsoSaltsBySaltForm(saltForm) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("isosalts", IsoSalt.findIsoSaltsBySaltForm(saltForm, sortFieldName, sortOrder).getResultList());
-        }
-        return "isosalts/list";
-    }
-    
-    @RequestMapping(params = "find=BySaltFormAndType", method = RequestMethod.GET)
-    public String IsoSaltController.findIsoSaltsBySaltFormAndType(@RequestParam("saltForm") SaltForm saltForm, @RequestParam("type") String type, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("isosalts", IsoSalt.findIsoSaltsBySaltFormAndType(saltForm, type, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) IsoSalt.countFindIsoSaltsBySaltFormAndType(saltForm, type) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("isosalts", IsoSalt.findIsoSaltsBySaltFormAndType(saltForm, type, sortFieldName, sortOrder).getResultList());
-        }
-        return "isosalts/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxContainerContainerController.java b/src/main/java/com/labsynch/labseer/web/ItxContainerContainerController.java
deleted file mode 100755
index 6ee729ac6..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxContainerContainerController.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxContainerContainer;
-import com.labsynch.labseer.service.ItxContainerContainerService;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import flexjson.JSONTokener;
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = ItxContainerContainer.class)
-@Controller
-@RequestMapping("/itxcontainercontainers")
-@RooWebScaffold(path = "itxcontainercontainers", formBackingObject = ItxContainerContainer.class)
-@RooWebFinder
-public class ItxContainerContainerController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxContainerContainerController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxContainerContainerController_Roo_Controller.aj
deleted file mode 100755
index 109605dc7..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxContainerContainerController_Roo_Controller.aj
+++ /dev/null
@@ -1,126 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ItxContainerContainer;
-import com.labsynch.labseer.domain.ItxContainerContainerState;
-import com.labsynch.labseer.domain.ThingPage;
-import com.labsynch.labseer.web.ItxContainerContainerController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ItxContainerContainerController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ItxContainerContainerController.create(@Valid ItxContainerContainer itxContainerContainer, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxContainerContainer);
-            return "itxcontainercontainers/create";
-        }
-        uiModel.asMap().clear();
-        itxContainerContainer.persist();
-        return "redirect:/itxcontainercontainers/" + encodeUrlPathSegment(itxContainerContainer.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ItxContainerContainerController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ItxContainerContainer());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (Container.countContainers() == 0) {
-            dependencies.add(new String[] { "firstContainer", "containers" });
-        }
-        if (Container.countContainers() == 0) {
-            dependencies.add(new String[] { "secondContainer", "containers" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "itxcontainercontainers/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ItxContainerContainerController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxcontainercontainer", ItxContainerContainer.findItxContainerContainer(id));
-        uiModel.addAttribute("itemId", id);
-        return "itxcontainercontainers/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ItxContainerContainerController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxcontainercontainers", ItxContainerContainer.findItxContainerContainerEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ItxContainerContainer.countItxContainerContainers() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxcontainercontainers", ItxContainerContainer.findAllItxContainerContainers(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxcontainercontainers/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ItxContainerContainerController.update(@Valid ItxContainerContainer itxContainerContainer, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxContainerContainer);
-            return "itxcontainercontainers/update";
-        }
-        uiModel.asMap().clear();
-        itxContainerContainer.merge();
-        return "redirect:/itxcontainercontainers/" + encodeUrlPathSegment(itxContainerContainer.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ItxContainerContainerController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ItxContainerContainer.findItxContainerContainer(id));
-        return "itxcontainercontainers/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ItxContainerContainerController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ItxContainerContainer itxContainerContainer = ItxContainerContainer.findItxContainerContainer(id);
-        itxContainerContainer.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/itxcontainercontainers";
-    }
-    
-    void ItxContainerContainerController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("itxContainerContainer_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("itxContainerContainer_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ItxContainerContainerController.populateEditForm(Model uiModel, ItxContainerContainer itxContainerContainer) {
-        uiModel.addAttribute("itxContainerContainer", itxContainerContainer);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("containers", Container.findAllContainers());
-        uiModel.addAttribute("itxcontainercontainerstates", ItxContainerContainerState.findAllItxContainerContainerStates());
-        uiModel.addAttribute("thingpages", ThingPage.findAllThingPages());
-    }
-    
-    String ItxContainerContainerController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxContainerContainerController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/ItxContainerContainerController_Roo_Controller_Finder.aj
deleted file mode 100755
index c2f5efc19..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxContainerContainerController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,78 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ItxContainerContainer;
-import com.labsynch.labseer.web.ItxContainerContainerController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect ItxContainerContainerController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByLsTransactionEquals", "form" }, method = RequestMethod.GET)
-    public String ItxContainerContainerController.findItxContainerContainersByLsTransactionEqualsForm(Model uiModel) {
-        return "itxcontainercontainers/findItxContainerContainersByLsTransactionEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", method = RequestMethod.GET)
-    public String ItxContainerContainerController.findItxContainerContainersByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxcontainercontainers", ItxContainerContainer.findItxContainerContainersByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ItxContainerContainer.countFindItxContainerContainersByLsTransactionEquals(lsTransaction) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxcontainercontainers", ItxContainerContainer.findItxContainerContainersByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxcontainercontainers/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeEqualsAndFirstContainerEquals", "form" }, method = RequestMethod.GET)
-    public String ItxContainerContainerController.findItxContainerContainersByLsTypeEqualsAndFirstContainerEqualsForm(Model uiModel) {
-        uiModel.addAttribute("containers", Container.findAllContainers());
-        return "itxcontainercontainers/findItxContainerContainersByLsTypeEqualsAndFirstContainerEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndFirstContainerEquals", method = RequestMethod.GET)
-    public String ItxContainerContainerController.findItxContainerContainersByLsTypeEqualsAndFirstContainerEquals(@RequestParam("lsType") String lsType, @RequestParam("firstContainer") Container firstContainer, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxcontainercontainers", ItxContainerContainer.findItxContainerContainersByLsTypeEqualsAndFirstContainerEquals(lsType, firstContainer, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ItxContainerContainer.countFindItxContainerContainersByLsTypeEqualsAndFirstContainerEquals(lsType, firstContainer) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxcontainercontainers", ItxContainerContainer.findItxContainerContainersByLsTypeEqualsAndFirstContainerEquals(lsType, firstContainer, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxcontainercontainers/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeEqualsAndSecondContainerEquals", "form" }, method = RequestMethod.GET)
-    public String ItxContainerContainerController.findItxContainerContainersByLsTypeEqualsAndSecondContainerEqualsForm(Model uiModel) {
-        uiModel.addAttribute("containers", Container.findAllContainers());
-        return "itxcontainercontainers/findItxContainerContainersByLsTypeEqualsAndSecondContainerEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndSecondContainerEquals", method = RequestMethod.GET)
-    public String ItxContainerContainerController.findItxContainerContainersByLsTypeEqualsAndSecondContainerEquals(@RequestParam("lsType") String lsType, @RequestParam("secondContainer") Container secondContainer, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxcontainercontainers", ItxContainerContainer.findItxContainerContainersByLsTypeEqualsAndSecondContainerEquals(lsType, secondContainer, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ItxContainerContainer.countFindItxContainerContainersByLsTypeEqualsAndSecondContainerEquals(lsType, secondContainer) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxcontainercontainers", ItxContainerContainer.findItxContainerContainersByLsTypeEqualsAndSecondContainerEquals(lsType, secondContainer, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxcontainercontainers/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxContainerContainerController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ItxContainerContainerController_Roo_Controller_Json.aj
deleted file mode 100755
index 0e6aedee5..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxContainerContainerController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,149 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ItxContainerContainer;
-import com.labsynch.labseer.web.ItxContainerContainerController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ItxContainerContainerController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxContainerContainerController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ItxContainerContainer itxContainerContainer = ItxContainerContainer.findItxContainerContainer(id);
-            if (itxContainerContainer == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(itxContainerContainer.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxContainerContainerController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ItxContainerContainer> result = ItxContainerContainer.findAllItxContainerContainers();
-            return new ResponseEntity<String>(ItxContainerContainer.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxContainerContainerController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxContainerContainer itxContainerContainer = ItxContainerContainer.fromJsonToItxContainerContainer(json);
-            itxContainerContainer.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+itxContainerContainer.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxContainerContainerController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ItxContainerContainer itxContainerContainer: ItxContainerContainer.fromJsonArrayToItxContainerContainers(json)) {
-                itxContainerContainer.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxContainerContainerController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxContainerContainer itxContainerContainer = ItxContainerContainer.fromJsonToItxContainerContainer(json);
-            itxContainerContainer.setId(id);
-            if (itxContainerContainer.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxContainerContainerController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxContainerContainer itxContainerContainer = ItxContainerContainer.findItxContainerContainer(id);
-            if (itxContainerContainer == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            itxContainerContainer.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxContainerContainerController.jsonFindItxContainerContainersByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ItxContainerContainer.toJsonArray(ItxContainerContainer.findItxContainerContainersByLsTransactionEquals(lsTransaction).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndFirstContainerEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxContainerContainerController.jsonFindItxContainerContainersByLsTypeEqualsAndFirstContainerEquals(@RequestParam("lsType") String lsType, @RequestParam("firstContainer") Container firstContainer) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ItxContainerContainer.toJsonArray(ItxContainerContainer.findItxContainerContainersByLsTypeEqualsAndFirstContainerEquals(lsType, firstContainer).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndSecondContainerEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxContainerContainerController.jsonFindItxContainerContainersByLsTypeEqualsAndSecondContainerEquals(@RequestParam("lsType") String lsType, @RequestParam("secondContainer") Container secondContainer) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ItxContainerContainer.toJsonArray(ItxContainerContainer.findItxContainerContainersByLsTypeEqualsAndSecondContainerEquals(lsType, secondContainer).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxContainerContainerStateController.java b/src/main/java/com/labsynch/labseer/web/ItxContainerContainerStateController.java
deleted file mode 100755
index 408e36423..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxContainerContainerStateController.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxContainerContainerState;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import flexjson.JSONTokener;
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = ItxContainerContainerState.class)
-@Controller
-@RequestMapping("/itxcontainercontainerstates")
-@RooWebScaffold(path = "itxcontainercontainerstates", formBackingObject = ItxContainerContainerState.class)
-public class ItxContainerContainerStateController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxContainerContainerStateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxContainerContainerStateController_Roo_Controller.aj
deleted file mode 100755
index 6fb65582d..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxContainerContainerStateController_Roo_Controller.aj
+++ /dev/null
@@ -1,114 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxContainerContainer;
-import com.labsynch.labseer.domain.ItxContainerContainerState;
-import com.labsynch.labseer.domain.ItxContainerContainerValue;
-import com.labsynch.labseer.web.ItxContainerContainerStateController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ItxContainerContainerStateController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ItxContainerContainerStateController.create(@Valid ItxContainerContainerState itxContainerContainerState, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxContainerContainerState);
-            return "itxcontainercontainerstates/create";
-        }
-        uiModel.asMap().clear();
-        itxContainerContainerState.persist();
-        return "redirect:/itxcontainercontainerstates/" + encodeUrlPathSegment(itxContainerContainerState.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ItxContainerContainerStateController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ItxContainerContainerState());
-        return "itxcontainercontainerstates/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ItxContainerContainerStateController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxcontainercontainerstate", ItxContainerContainerState.findItxContainerContainerState(id));
-        uiModel.addAttribute("itemId", id);
-        return "itxcontainercontainerstates/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ItxContainerContainerStateController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxcontainercontainerstates", ItxContainerContainerState.findItxContainerContainerStateEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ItxContainerContainerState.countItxContainerContainerStates() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxcontainercontainerstates", ItxContainerContainerState.findAllItxContainerContainerStates(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxcontainercontainerstates/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ItxContainerContainerStateController.update(@Valid ItxContainerContainerState itxContainerContainerState, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxContainerContainerState);
-            return "itxcontainercontainerstates/update";
-        }
-        uiModel.asMap().clear();
-        itxContainerContainerState.merge();
-        return "redirect:/itxcontainercontainerstates/" + encodeUrlPathSegment(itxContainerContainerState.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ItxContainerContainerStateController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ItxContainerContainerState.findItxContainerContainerState(id));
-        return "itxcontainercontainerstates/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ItxContainerContainerStateController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ItxContainerContainerState itxContainerContainerState = ItxContainerContainerState.findItxContainerContainerState(id);
-        itxContainerContainerState.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/itxcontainercontainerstates";
-    }
-    
-    void ItxContainerContainerStateController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("itxContainerContainerState_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("itxContainerContainerState_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ItxContainerContainerStateController.populateEditForm(Model uiModel, ItxContainerContainerState itxContainerContainerState) {
-        uiModel.addAttribute("itxContainerContainerState", itxContainerContainerState);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxcontainercontainers", ItxContainerContainer.findAllItxContainerContainers());
-        uiModel.addAttribute("itxcontainercontainervalues", ItxContainerContainerValue.findAllItxContainerContainerValues());
-    }
-    
-    String ItxContainerContainerStateController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxContainerContainerStateController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ItxContainerContainerStateController_Roo_Controller_Json.aj
deleted file mode 100644
index e82fc088a..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxContainerContainerStateController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,111 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxContainerContainerState;
-import com.labsynch.labseer.web.ItxContainerContainerStateController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ItxContainerContainerStateController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxContainerContainerStateController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ItxContainerContainerState itxContainerContainerState = ItxContainerContainerState.findItxContainerContainerState(id);
-            if (itxContainerContainerState == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(itxContainerContainerState.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxContainerContainerStateController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ItxContainerContainerState> result = ItxContainerContainerState.findAllItxContainerContainerStates();
-            return new ResponseEntity<String>(ItxContainerContainerState.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxContainerContainerStateController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxContainerContainerState itxContainerContainerState = ItxContainerContainerState.fromJsonToItxContainerContainerState(json);
-            itxContainerContainerState.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+itxContainerContainerState.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxContainerContainerStateController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ItxContainerContainerState itxContainerContainerState: ItxContainerContainerState.fromJsonArrayToItxContainerContainerStates(json)) {
-                itxContainerContainerState.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxContainerContainerStateController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxContainerContainerState itxContainerContainerState = ItxContainerContainerState.fromJsonToItxContainerContainerState(json);
-            itxContainerContainerState.setId(id);
-            if (itxContainerContainerState.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxContainerContainerStateController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxContainerContainerState itxContainerContainerState = ItxContainerContainerState.findItxContainerContainerState(id);
-            if (itxContainerContainerState == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            itxContainerContainerState.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxContainerContainerValueController.java b/src/main/java/com/labsynch/labseer/web/ItxContainerContainerValueController.java
deleted file mode 100755
index 07ffd393e..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxContainerContainerValueController.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxContainerContainerValue;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import flexjson.JSONTokener;
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.StringReader;
-import java.util.List;
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = ItxContainerContainerValue.class)
-@Controller
-@RequestMapping("/itxcontainercontainervalues")
-@RooWebScaffold(path = "itxcontainercontainervalues", formBackingObject = ItxContainerContainerValue.class)
-public class ItxContainerContainerValueController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxContainerContainerValueController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxContainerContainerValueController_Roo_Controller.aj
deleted file mode 100755
index e481d8621..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxContainerContainerValueController_Roo_Controller.aj
+++ /dev/null
@@ -1,113 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxContainerContainerState;
-import com.labsynch.labseer.domain.ItxContainerContainerValue;
-import com.labsynch.labseer.web.ItxContainerContainerValueController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ItxContainerContainerValueController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ItxContainerContainerValueController.create(@Valid ItxContainerContainerValue itxContainerContainerValue, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxContainerContainerValue);
-            return "itxcontainercontainervalues/create";
-        }
-        uiModel.asMap().clear();
-        itxContainerContainerValue.persist();
-        return "redirect:/itxcontainercontainervalues/" + encodeUrlPathSegment(itxContainerContainerValue.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ItxContainerContainerValueController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ItxContainerContainerValue());
-        return "itxcontainercontainervalues/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ItxContainerContainerValueController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxcontainercontainervalue", ItxContainerContainerValue.findItxContainerContainerValue(id));
-        uiModel.addAttribute("itemId", id);
-        return "itxcontainercontainervalues/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ItxContainerContainerValueController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxcontainercontainervalues", ItxContainerContainerValue.findItxContainerContainerValueEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ItxContainerContainerValue.countItxContainerContainerValues() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxcontainercontainervalues", ItxContainerContainerValue.findAllItxContainerContainerValues(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxcontainercontainervalues/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ItxContainerContainerValueController.update(@Valid ItxContainerContainerValue itxContainerContainerValue, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxContainerContainerValue);
-            return "itxcontainercontainervalues/update";
-        }
-        uiModel.asMap().clear();
-        itxContainerContainerValue.merge();
-        return "redirect:/itxcontainercontainervalues/" + encodeUrlPathSegment(itxContainerContainerValue.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ItxContainerContainerValueController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ItxContainerContainerValue.findItxContainerContainerValue(id));
-        return "itxcontainercontainervalues/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ItxContainerContainerValueController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ItxContainerContainerValue itxContainerContainerValue = ItxContainerContainerValue.findItxContainerContainerValue(id);
-        itxContainerContainerValue.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/itxcontainercontainervalues";
-    }
-    
-    void ItxContainerContainerValueController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("itxContainerContainerValue_datevalue_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("itxContainerContainerValue_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("itxContainerContainerValue_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ItxContainerContainerValueController.populateEditForm(Model uiModel, ItxContainerContainerValue itxContainerContainerValue) {
-        uiModel.addAttribute("itxContainerContainerValue", itxContainerContainerValue);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxcontainercontainerstates", ItxContainerContainerState.findAllItxContainerContainerStates());
-    }
-    
-    String ItxContainerContainerValueController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxContainerContainerValueController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ItxContainerContainerValueController_Roo_Controller_Json.aj
deleted file mode 100644
index 83b935cd3..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxContainerContainerValueController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,111 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxContainerContainerValue;
-import com.labsynch.labseer.web.ItxContainerContainerValueController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ItxContainerContainerValueController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxContainerContainerValueController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ItxContainerContainerValue itxContainerContainerValue = ItxContainerContainerValue.findItxContainerContainerValue(id);
-            if (itxContainerContainerValue == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(itxContainerContainerValue.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxContainerContainerValueController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ItxContainerContainerValue> result = ItxContainerContainerValue.findAllItxContainerContainerValues();
-            return new ResponseEntity<String>(ItxContainerContainerValue.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxContainerContainerValueController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxContainerContainerValue itxContainerContainerValue = ItxContainerContainerValue.fromJsonToItxContainerContainerValue(json);
-            itxContainerContainerValue.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+itxContainerContainerValue.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxContainerContainerValueController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ItxContainerContainerValue itxContainerContainerValue: ItxContainerContainerValue.fromJsonArrayToItxContainerContainerValues(json)) {
-                itxContainerContainerValue.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxContainerContainerValueController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxContainerContainerValue itxContainerContainerValue = ItxContainerContainerValue.fromJsonToItxContainerContainerValue(json);
-            itxContainerContainerValue.setId(id);
-            if (itxContainerContainerValue.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxContainerContainerValueController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxContainerContainerValue itxContainerContainerValue = ItxContainerContainerValue.findItxContainerContainerValue(id);
-            if (itxContainerContainerValue == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            itxContainerContainerValue.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentController.java b/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentController.java
deleted file mode 100644
index 263eba090..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentController.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxExperimentExperiment;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RooWebJson(jsonObject = ItxExperimentExperiment.class)
-@Controller
-@RequestMapping("/itxexperimentexperiments")
-@RooWebScaffold(path = "itxexperimentexperiments", formBackingObject = ItxExperimentExperiment.class)
-@RooWebFinder
-public class ItxExperimentExperimentController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentController_Roo_Controller.aj
deleted file mode 100644
index dc322153a..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentController_Roo_Controller.aj
+++ /dev/null
@@ -1,126 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ItxExperimentExperiment;
-import com.labsynch.labseer.domain.ItxExperimentExperimentState;
-import com.labsynch.labseer.domain.ThingPage;
-import com.labsynch.labseer.web.ItxExperimentExperimentController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ItxExperimentExperimentController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ItxExperimentExperimentController.create(@Valid ItxExperimentExperiment itxExperimentExperiment, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxExperimentExperiment);
-            return "itxexperimentexperiments/create";
-        }
-        uiModel.asMap().clear();
-        itxExperimentExperiment.persist();
-        return "redirect:/itxexperimentexperiments/" + encodeUrlPathSegment(itxExperimentExperiment.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ItxExperimentExperimentController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ItxExperimentExperiment());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (Experiment.countExperiments() == 0) {
-            dependencies.add(new String[] { "firstExperiment", "experiments" });
-        }
-        if (Experiment.countExperiments() == 0) {
-            dependencies.add(new String[] { "secondExperiment", "experiments" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "itxexperimentexperiments/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ItxExperimentExperimentController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxexperimentexperiment", ItxExperimentExperiment.findItxExperimentExperiment(id));
-        uiModel.addAttribute("itemId", id);
-        return "itxexperimentexperiments/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ItxExperimentExperimentController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxexperimentexperiments", ItxExperimentExperiment.findItxExperimentExperimentEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ItxExperimentExperiment.countItxExperimentExperiments() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxexperimentexperiments", ItxExperimentExperiment.findAllItxExperimentExperiments(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxexperimentexperiments/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ItxExperimentExperimentController.update(@Valid ItxExperimentExperiment itxExperimentExperiment, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxExperimentExperiment);
-            return "itxexperimentexperiments/update";
-        }
-        uiModel.asMap().clear();
-        itxExperimentExperiment.merge();
-        return "redirect:/itxexperimentexperiments/" + encodeUrlPathSegment(itxExperimentExperiment.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ItxExperimentExperimentController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ItxExperimentExperiment.findItxExperimentExperiment(id));
-        return "itxexperimentexperiments/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ItxExperimentExperimentController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ItxExperimentExperiment itxExperimentExperiment = ItxExperimentExperiment.findItxExperimentExperiment(id);
-        itxExperimentExperiment.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/itxexperimentexperiments";
-    }
-    
-    void ItxExperimentExperimentController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("itxExperimentExperiment_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("itxExperimentExperiment_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ItxExperimentExperimentController.populateEditForm(Model uiModel, ItxExperimentExperiment itxExperimentExperiment) {
-        uiModel.addAttribute("itxExperimentExperiment", itxExperimentExperiment);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("experiments", Experiment.findAllExperiments());
-        uiModel.addAttribute("itxexperimentexperimentstates", ItxExperimentExperimentState.findAllItxExperimentExperimentStates());
-        uiModel.addAttribute("thingpages", ThingPage.findAllThingPages());
-    }
-    
-    String ItxExperimentExperimentController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentController_Roo_Controller_Finder.aj
deleted file mode 100644
index 4c178546d..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,78 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ItxExperimentExperiment;
-import com.labsynch.labseer.web.ItxExperimentExperimentController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect ItxExperimentExperimentController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByFirstExperiment", "form" }, method = RequestMethod.GET)
-    public String ItxExperimentExperimentController.findItxExperimentExperimentsByFirstExperimentForm(Model uiModel) {
-        uiModel.addAttribute("experiments", Experiment.findAllExperiments());
-        return "itxexperimentexperiments/findItxExperimentExperimentsByFirstExperiment";
-    }
-    
-    @RequestMapping(params = "find=ByFirstExperiment", method = RequestMethod.GET)
-    public String ItxExperimentExperimentController.findItxExperimentExperimentsByFirstExperiment(@RequestParam("firstExperiment") Experiment firstExperiment, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxexperimentexperiments", ItxExperimentExperiment.findItxExperimentExperimentsByFirstExperiment(firstExperiment, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ItxExperimentExperiment.countFindItxExperimentExperimentsByFirstExperiment(firstExperiment) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxexperimentexperiments", ItxExperimentExperiment.findItxExperimentExperimentsByFirstExperiment(firstExperiment, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxexperimentexperiments/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTransactionEquals", "form" }, method = RequestMethod.GET)
-    public String ItxExperimentExperimentController.findItxExperimentExperimentsByLsTransactionEqualsForm(Model uiModel) {
-        return "itxexperimentexperiments/findItxExperimentExperimentsByLsTransactionEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", method = RequestMethod.GET)
-    public String ItxExperimentExperimentController.findItxExperimentExperimentsByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxexperimentexperiments", ItxExperimentExperiment.findItxExperimentExperimentsByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ItxExperimentExperiment.countFindItxExperimentExperimentsByLsTransactionEquals(lsTransaction) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxexperimentexperiments", ItxExperimentExperiment.findItxExperimentExperimentsByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxexperimentexperiments/list";
-    }
-    
-    @RequestMapping(params = { "find=BySecondExperiment", "form" }, method = RequestMethod.GET)
-    public String ItxExperimentExperimentController.findItxExperimentExperimentsBySecondExperimentForm(Model uiModel) {
-        uiModel.addAttribute("experiments", Experiment.findAllExperiments());
-        return "itxexperimentexperiments/findItxExperimentExperimentsBySecondExperiment";
-    }
-    
-    @RequestMapping(params = "find=BySecondExperiment", method = RequestMethod.GET)
-    public String ItxExperimentExperimentController.findItxExperimentExperimentsBySecondExperiment(@RequestParam("secondExperiment") Experiment secondExperiment, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxexperimentexperiments", ItxExperimentExperiment.findItxExperimentExperimentsBySecondExperiment(secondExperiment, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ItxExperimentExperiment.countFindItxExperimentExperimentsBySecondExperiment(secondExperiment) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxexperimentexperiments", ItxExperimentExperiment.findItxExperimentExperimentsBySecondExperiment(secondExperiment, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxexperimentexperiments/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentController_Roo_Controller_Json.aj
deleted file mode 100644
index f3b9fd0c1..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,149 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ItxExperimentExperiment;
-import com.labsynch.labseer.web.ItxExperimentExperimentController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ItxExperimentExperimentController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxExperimentExperimentController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ItxExperimentExperiment itxExperimentExperiment = ItxExperimentExperiment.findItxExperimentExperiment(id);
-            if (itxExperimentExperiment == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(itxExperimentExperiment.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxExperimentExperimentController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ItxExperimentExperiment> result = ItxExperimentExperiment.findAllItxExperimentExperiments();
-            return new ResponseEntity<String>(ItxExperimentExperiment.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxExperimentExperimentController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxExperimentExperiment itxExperimentExperiment = ItxExperimentExperiment.fromJsonToItxExperimentExperiment(json);
-            itxExperimentExperiment.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+itxExperimentExperiment.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxExperimentExperimentController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ItxExperimentExperiment itxExperimentExperiment: ItxExperimentExperiment.fromJsonArrayToItxExperimentExperiments(json)) {
-                itxExperimentExperiment.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxExperimentExperimentController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxExperimentExperiment itxExperimentExperiment = ItxExperimentExperiment.fromJsonToItxExperimentExperiment(json);
-            itxExperimentExperiment.setId(id);
-            if (itxExperimentExperiment.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxExperimentExperimentController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxExperimentExperiment itxExperimentExperiment = ItxExperimentExperiment.findItxExperimentExperiment(id);
-            if (itxExperimentExperiment == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            itxExperimentExperiment.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByFirstExperiment", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxExperimentExperimentController.jsonFindItxExperimentExperimentsByFirstExperiment(@RequestParam("firstExperiment") Experiment firstExperiment) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ItxExperimentExperiment.toJsonArray(ItxExperimentExperiment.findItxExperimentExperimentsByFirstExperiment(firstExperiment).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxExperimentExperimentController.jsonFindItxExperimentExperimentsByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ItxExperimentExperiment.toJsonArray(ItxExperimentExperiment.findItxExperimentExperimentsByLsTransactionEquals(lsTransaction).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=BySecondExperiment", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxExperimentExperimentController.jsonFindItxExperimentExperimentsBySecondExperiment(@RequestParam("secondExperiment") Experiment secondExperiment) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ItxExperimentExperiment.toJsonArray(ItxExperimentExperiment.findItxExperimentExperimentsBySecondExperiment(secondExperiment).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentStateController.java b/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentStateController.java
deleted file mode 100644
index 6f74aa5b6..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentStateController.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxExperimentExperimentState;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RooWebJson(jsonObject = ItxExperimentExperimentState.class)
-@Controller
-@RequestMapping("/itxexperimentexperimentstates")
-@RooWebScaffold(path = "itxexperimentexperimentstates", formBackingObject = ItxExperimentExperimentState.class)
-public class ItxExperimentExperimentStateController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentStateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentStateController_Roo_Controller.aj
deleted file mode 100644
index 7f4ee6107..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentStateController_Roo_Controller.aj
+++ /dev/null
@@ -1,114 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxExperimentExperiment;
-import com.labsynch.labseer.domain.ItxExperimentExperimentState;
-import com.labsynch.labseer.domain.ItxExperimentExperimentValue;
-import com.labsynch.labseer.web.ItxExperimentExperimentStateController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ItxExperimentExperimentStateController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ItxExperimentExperimentStateController.create(@Valid ItxExperimentExperimentState itxExperimentExperimentState, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxExperimentExperimentState);
-            return "itxexperimentexperimentstates/create";
-        }
-        uiModel.asMap().clear();
-        itxExperimentExperimentState.persist();
-        return "redirect:/itxexperimentexperimentstates/" + encodeUrlPathSegment(itxExperimentExperimentState.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ItxExperimentExperimentStateController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ItxExperimentExperimentState());
-        return "itxexperimentexperimentstates/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ItxExperimentExperimentStateController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxexperimentexperimentstate", ItxExperimentExperimentState.findItxExperimentExperimentState(id));
-        uiModel.addAttribute("itemId", id);
-        return "itxexperimentexperimentstates/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ItxExperimentExperimentStateController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxexperimentexperimentstates", ItxExperimentExperimentState.findItxExperimentExperimentStateEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ItxExperimentExperimentState.countItxExperimentExperimentStates() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxexperimentexperimentstates", ItxExperimentExperimentState.findAllItxExperimentExperimentStates(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxexperimentexperimentstates/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ItxExperimentExperimentStateController.update(@Valid ItxExperimentExperimentState itxExperimentExperimentState, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxExperimentExperimentState);
-            return "itxexperimentexperimentstates/update";
-        }
-        uiModel.asMap().clear();
-        itxExperimentExperimentState.merge();
-        return "redirect:/itxexperimentexperimentstates/" + encodeUrlPathSegment(itxExperimentExperimentState.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ItxExperimentExperimentStateController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ItxExperimentExperimentState.findItxExperimentExperimentState(id));
-        return "itxexperimentexperimentstates/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ItxExperimentExperimentStateController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ItxExperimentExperimentState itxExperimentExperimentState = ItxExperimentExperimentState.findItxExperimentExperimentState(id);
-        itxExperimentExperimentState.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/itxexperimentexperimentstates";
-    }
-    
-    void ItxExperimentExperimentStateController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("itxExperimentExperimentState_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("itxExperimentExperimentState_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ItxExperimentExperimentStateController.populateEditForm(Model uiModel, ItxExperimentExperimentState itxExperimentExperimentState) {
-        uiModel.addAttribute("itxExperimentExperimentState", itxExperimentExperimentState);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxexperimentexperiments", ItxExperimentExperiment.findAllItxExperimentExperiments());
-        uiModel.addAttribute("itxexperimentexperimentvalues", ItxExperimentExperimentValue.findAllItxExperimentExperimentValues());
-    }
-    
-    String ItxExperimentExperimentStateController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentStateController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentStateController_Roo_Controller_Json.aj
deleted file mode 100644
index 118f97bef..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentStateController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,111 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxExperimentExperimentState;
-import com.labsynch.labseer.web.ItxExperimentExperimentStateController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ItxExperimentExperimentStateController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxExperimentExperimentStateController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ItxExperimentExperimentState itxExperimentExperimentState = ItxExperimentExperimentState.findItxExperimentExperimentState(id);
-            if (itxExperimentExperimentState == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(itxExperimentExperimentState.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxExperimentExperimentStateController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ItxExperimentExperimentState> result = ItxExperimentExperimentState.findAllItxExperimentExperimentStates();
-            return new ResponseEntity<String>(ItxExperimentExperimentState.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxExperimentExperimentStateController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxExperimentExperimentState itxExperimentExperimentState = ItxExperimentExperimentState.fromJsonToItxExperimentExperimentState(json);
-            itxExperimentExperimentState.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+itxExperimentExperimentState.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxExperimentExperimentStateController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ItxExperimentExperimentState itxExperimentExperimentState: ItxExperimentExperimentState.fromJsonArrayToItxExperimentExperimentStates(json)) {
-                itxExperimentExperimentState.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxExperimentExperimentStateController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxExperimentExperimentState itxExperimentExperimentState = ItxExperimentExperimentState.fromJsonToItxExperimentExperimentState(json);
-            itxExperimentExperimentState.setId(id);
-            if (itxExperimentExperimentState.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxExperimentExperimentStateController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxExperimentExperimentState itxExperimentExperimentState = ItxExperimentExperimentState.findItxExperimentExperimentState(id);
-            if (itxExperimentExperimentState == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            itxExperimentExperimentState.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentValueController.java b/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentValueController.java
deleted file mode 100644
index 3a6ef1de1..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentValueController.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxExperimentExperimentValue;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RooWebJson(jsonObject = ItxExperimentExperimentValue.class)
-@Controller
-@RequestMapping("/itxexperimentexperimentvalues")
-@RooWebScaffold(path = "itxexperimentexperimentvalues", formBackingObject = ItxExperimentExperimentValue.class)
-public class ItxExperimentExperimentValueController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentValueController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentValueController_Roo_Controller.aj
deleted file mode 100644
index 3fc20ba2b..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentValueController_Roo_Controller.aj
+++ /dev/null
@@ -1,113 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxExperimentExperimentState;
-import com.labsynch.labseer.domain.ItxExperimentExperimentValue;
-import com.labsynch.labseer.web.ItxExperimentExperimentValueController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ItxExperimentExperimentValueController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ItxExperimentExperimentValueController.create(@Valid ItxExperimentExperimentValue itxExperimentExperimentValue, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxExperimentExperimentValue);
-            return "itxexperimentexperimentvalues/create";
-        }
-        uiModel.asMap().clear();
-        itxExperimentExperimentValue.persist();
-        return "redirect:/itxexperimentexperimentvalues/" + encodeUrlPathSegment(itxExperimentExperimentValue.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ItxExperimentExperimentValueController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ItxExperimentExperimentValue());
-        return "itxexperimentexperimentvalues/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ItxExperimentExperimentValueController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxexperimentexperimentvalue", ItxExperimentExperimentValue.findItxExperimentExperimentValue(id));
-        uiModel.addAttribute("itemId", id);
-        return "itxexperimentexperimentvalues/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ItxExperimentExperimentValueController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxexperimentexperimentvalues", ItxExperimentExperimentValue.findItxExperimentExperimentValueEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ItxExperimentExperimentValue.countItxExperimentExperimentValues() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxexperimentexperimentvalues", ItxExperimentExperimentValue.findAllItxExperimentExperimentValues(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxexperimentexperimentvalues/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ItxExperimentExperimentValueController.update(@Valid ItxExperimentExperimentValue itxExperimentExperimentValue, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxExperimentExperimentValue);
-            return "itxexperimentexperimentvalues/update";
-        }
-        uiModel.asMap().clear();
-        itxExperimentExperimentValue.merge();
-        return "redirect:/itxexperimentexperimentvalues/" + encodeUrlPathSegment(itxExperimentExperimentValue.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ItxExperimentExperimentValueController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ItxExperimentExperimentValue.findItxExperimentExperimentValue(id));
-        return "itxexperimentexperimentvalues/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ItxExperimentExperimentValueController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ItxExperimentExperimentValue itxExperimentExperimentValue = ItxExperimentExperimentValue.findItxExperimentExperimentValue(id);
-        itxExperimentExperimentValue.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/itxexperimentexperimentvalues";
-    }
-    
-    void ItxExperimentExperimentValueController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("itxExperimentExperimentValue_datevalue_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("itxExperimentExperimentValue_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("itxExperimentExperimentValue_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ItxExperimentExperimentValueController.populateEditForm(Model uiModel, ItxExperimentExperimentValue itxExperimentExperimentValue) {
-        uiModel.addAttribute("itxExperimentExperimentValue", itxExperimentExperimentValue);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxexperimentexperimentstates", ItxExperimentExperimentState.findAllItxExperimentExperimentStates());
-    }
-    
-    String ItxExperimentExperimentValueController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentValueController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentValueController_Roo_Controller_Json.aj
deleted file mode 100644
index 32d17401d..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxExperimentExperimentValueController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,111 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxExperimentExperimentValue;
-import com.labsynch.labseer.web.ItxExperimentExperimentValueController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ItxExperimentExperimentValueController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxExperimentExperimentValueController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ItxExperimentExperimentValue itxExperimentExperimentValue = ItxExperimentExperimentValue.findItxExperimentExperimentValue(id);
-            if (itxExperimentExperimentValue == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(itxExperimentExperimentValue.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxExperimentExperimentValueController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ItxExperimentExperimentValue> result = ItxExperimentExperimentValue.findAllItxExperimentExperimentValues();
-            return new ResponseEntity<String>(ItxExperimentExperimentValue.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxExperimentExperimentValueController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxExperimentExperimentValue itxExperimentExperimentValue = ItxExperimentExperimentValue.fromJsonToItxExperimentExperimentValue(json);
-            itxExperimentExperimentValue.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+itxExperimentExperimentValue.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxExperimentExperimentValueController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ItxExperimentExperimentValue itxExperimentExperimentValue: ItxExperimentExperimentValue.fromJsonArrayToItxExperimentExperimentValues(json)) {
-                itxExperimentExperimentValue.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxExperimentExperimentValueController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxExperimentExperimentValue itxExperimentExperimentValue = ItxExperimentExperimentValue.fromJsonToItxExperimentExperimentValue(json);
-            itxExperimentExperimentValue.setId(id);
-            if (itxExperimentExperimentValue.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxExperimentExperimentValueController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxExperimentExperimentValue itxExperimentExperimentValue = ItxExperimentExperimentValue.findItxExperimentExperimentValue(id);
-            if (itxExperimentExperimentValue == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            itxExperimentExperimentValue.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingController.java b/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingController.java
deleted file mode 100644
index 55e38a395..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingController.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThing;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RooWebJson(jsonObject = ItxLsThingLsThing.class)
-@Controller
-@RequestMapping("/itxlsthinglsthings")
-@RooWebScaffold(path = "itxlsthinglsthings", formBackingObject = ItxLsThingLsThing.class)
-@RooWebFinder
-public class ItxLsThingLsThingController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingController_Roo_Controller.aj
deleted file mode 100644
index 2357b9644..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingController_Roo_Controller.aj
+++ /dev/null
@@ -1,126 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThing;
-import com.labsynch.labseer.domain.ItxLsThingLsThingState;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.ThingPage;
-import com.labsynch.labseer.web.ItxLsThingLsThingController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ItxLsThingLsThingController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ItxLsThingLsThingController.create(@Valid ItxLsThingLsThing itxLsThingLsThing, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxLsThingLsThing);
-            return "itxlsthinglsthings/create";
-        }
-        uiModel.asMap().clear();
-        itxLsThingLsThing.persist();
-        return "redirect:/itxlsthinglsthings/" + encodeUrlPathSegment(itxLsThingLsThing.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ItxLsThingLsThingController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ItxLsThingLsThing());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (LsThing.countLsThings() == 0) {
-            dependencies.add(new String[] { "firstLsThing", "lsthings" });
-        }
-        if (LsThing.countLsThings() == 0) {
-            dependencies.add(new String[] { "secondLsThing", "lsthings" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "itxlsthinglsthings/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ItxLsThingLsThingController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxlsthinglsthing", ItxLsThingLsThing.findItxLsThingLsThing(id));
-        uiModel.addAttribute("itemId", id);
-        return "itxlsthinglsthings/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ItxLsThingLsThingController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxlsthinglsthings", ItxLsThingLsThing.findItxLsThingLsThingEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ItxLsThingLsThing.countItxLsThingLsThings() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxlsthinglsthings", ItxLsThingLsThing.findAllItxLsThingLsThings(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxlsthinglsthings/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ItxLsThingLsThingController.update(@Valid ItxLsThingLsThing itxLsThingLsThing, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxLsThingLsThing);
-            return "itxlsthinglsthings/update";
-        }
-        uiModel.asMap().clear();
-        itxLsThingLsThing.merge();
-        return "redirect:/itxlsthinglsthings/" + encodeUrlPathSegment(itxLsThingLsThing.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ItxLsThingLsThingController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ItxLsThingLsThing.findItxLsThingLsThing(id));
-        return "itxlsthinglsthings/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ItxLsThingLsThingController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ItxLsThingLsThing itxLsThingLsThing = ItxLsThingLsThing.findItxLsThingLsThing(id);
-        itxLsThingLsThing.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/itxlsthinglsthings";
-    }
-    
-    void ItxLsThingLsThingController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("itxLsThingLsThing_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("itxLsThingLsThing_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ItxLsThingLsThingController.populateEditForm(Model uiModel, ItxLsThingLsThing itxLsThingLsThing) {
-        uiModel.addAttribute("itxLsThingLsThing", itxLsThingLsThing);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxlsthinglsthingstates", ItxLsThingLsThingState.findAllItxLsThingLsThingStates());
-        uiModel.addAttribute("lsthings", LsThing.findAllLsThings());
-        uiModel.addAttribute("thingpages", ThingPage.findAllThingPages());
-    }
-    
-    String ItxLsThingLsThingController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingController_Roo_Controller_Finder.aj
deleted file mode 100644
index ed865284d..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,78 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThing;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.web.ItxLsThingLsThingController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect ItxLsThingLsThingController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByCodeNameEquals", "form" }, method = RequestMethod.GET)
-    public String ItxLsThingLsThingController.findItxLsThingLsThingsByCodeNameEqualsForm(Model uiModel) {
-        return "itxlsthinglsthings/findItxLsThingLsThingsByCodeNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByCodeNameEquals", method = RequestMethod.GET)
-    public String ItxLsThingLsThingController.findItxLsThingLsThingsByCodeNameEquals(@RequestParam("codeName") String codeName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxlsthinglsthings", ItxLsThingLsThing.findItxLsThingLsThingsByCodeNameEquals(codeName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ItxLsThingLsThing.countFindItxLsThingLsThingsByCodeNameEquals(codeName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxlsthinglsthings", ItxLsThingLsThing.findItxLsThingLsThingsByCodeNameEquals(codeName, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxlsthinglsthings/list";
-    }
-    
-    @RequestMapping(params = { "find=ByFirstLsThing", "form" }, method = RequestMethod.GET)
-    public String ItxLsThingLsThingController.findItxLsThingLsThingsByFirstLsThingForm(Model uiModel) {
-        uiModel.addAttribute("lsthings", LsThing.findAllLsThings());
-        return "itxlsthinglsthings/findItxLsThingLsThingsByFirstLsThing";
-    }
-    
-    @RequestMapping(params = "find=ByFirstLsThing", method = RequestMethod.GET)
-    public String ItxLsThingLsThingController.findItxLsThingLsThingsByFirstLsThing(@RequestParam("firstLsThing") LsThing firstLsThing, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxlsthinglsthings", ItxLsThingLsThing.findItxLsThingLsThingsByFirstLsThing(firstLsThing, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ItxLsThingLsThing.countFindItxLsThingLsThingsByFirstLsThing(firstLsThing) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxlsthinglsthings", ItxLsThingLsThing.findItxLsThingLsThingsByFirstLsThing(firstLsThing, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxlsthinglsthings/list";
-    }
-    
-    @RequestMapping(params = { "find=BySecondLsThing", "form" }, method = RequestMethod.GET)
-    public String ItxLsThingLsThingController.findItxLsThingLsThingsBySecondLsThingForm(Model uiModel) {
-        uiModel.addAttribute("lsthings", LsThing.findAllLsThings());
-        return "itxlsthinglsthings/findItxLsThingLsThingsBySecondLsThing";
-    }
-    
-    @RequestMapping(params = "find=BySecondLsThing", method = RequestMethod.GET)
-    public String ItxLsThingLsThingController.findItxLsThingLsThingsBySecondLsThing(@RequestParam("secondLsThing") LsThing secondLsThing, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxlsthinglsthings", ItxLsThingLsThing.findItxLsThingLsThingsBySecondLsThing(secondLsThing, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ItxLsThingLsThing.countFindItxLsThingLsThingsBySecondLsThing(secondLsThing) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxlsthinglsthings", ItxLsThingLsThing.findItxLsThingLsThingsBySecondLsThing(secondLsThing, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxlsthinglsthings/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingController_Roo_Controller_Json.aj
deleted file mode 100644
index 19a01817c..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,149 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThing;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.web.ItxLsThingLsThingController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ItxLsThingLsThingController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxLsThingLsThingController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ItxLsThingLsThing itxLsThingLsThing = ItxLsThingLsThing.findItxLsThingLsThing(id);
-            if (itxLsThingLsThing == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(itxLsThingLsThing.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxLsThingLsThingController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ItxLsThingLsThing> result = ItxLsThingLsThing.findAllItxLsThingLsThings();
-            return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxLsThingLsThingController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxLsThingLsThing itxLsThingLsThing = ItxLsThingLsThing.fromJsonToItxLsThingLsThing(json);
-            itxLsThingLsThing.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+itxLsThingLsThing.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxLsThingLsThingController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ItxLsThingLsThing itxLsThingLsThing: ItxLsThingLsThing.fromJsonArrayToItxLsThingLsThings(json)) {
-                itxLsThingLsThing.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxLsThingLsThingController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxLsThingLsThing itxLsThingLsThing = ItxLsThingLsThing.fromJsonToItxLsThingLsThing(json);
-            itxLsThingLsThing.setId(id);
-            if (itxLsThingLsThing.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxLsThingLsThingController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxLsThingLsThing itxLsThingLsThing = ItxLsThingLsThing.findItxLsThingLsThing(id);
-            if (itxLsThingLsThing == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            itxLsThingLsThing.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByCodeNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxLsThingLsThingController.jsonFindItxLsThingLsThingsByCodeNameEquals(@RequestParam("codeName") String codeName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArray(ItxLsThingLsThing.findItxLsThingLsThingsByCodeNameEquals(codeName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByFirstLsThing", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxLsThingLsThingController.jsonFindItxLsThingLsThingsByFirstLsThing(@RequestParam("firstLsThing") LsThing firstLsThing) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArray(ItxLsThingLsThing.findItxLsThingLsThingsByFirstLsThing(firstLsThing).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=BySecondLsThing", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxLsThingLsThingController.jsonFindItxLsThingLsThingsBySecondLsThing(@RequestParam("secondLsThing") LsThing secondLsThing) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArray(ItxLsThingLsThing.findItxLsThingLsThingsBySecondLsThing(secondLsThing).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingStateController.java b/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingStateController.java
deleted file mode 100644
index 5c4e313cf..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingStateController.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThingState;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RooWebJson(jsonObject = ItxLsThingLsThingState.class)
-@Controller
-@RequestMapping("/itxlsthinglsthingstates")
-@RooWebScaffold(path = "itxlsthinglsthingstates", formBackingObject = ItxLsThingLsThingState.class)
-public class ItxLsThingLsThingStateController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingStateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingStateController_Roo_Controller.aj
deleted file mode 100644
index 5b95e0e32..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingStateController_Roo_Controller.aj
+++ /dev/null
@@ -1,114 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThing;
-import com.labsynch.labseer.domain.ItxLsThingLsThingState;
-import com.labsynch.labseer.domain.ItxLsThingLsThingValue;
-import com.labsynch.labseer.web.ItxLsThingLsThingStateController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ItxLsThingLsThingStateController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ItxLsThingLsThingStateController.create(@Valid ItxLsThingLsThingState itxLsThingLsThingState, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxLsThingLsThingState);
-            return "itxlsthinglsthingstates/create";
-        }
-        uiModel.asMap().clear();
-        itxLsThingLsThingState.persist();
-        return "redirect:/itxlsthinglsthingstates/" + encodeUrlPathSegment(itxLsThingLsThingState.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ItxLsThingLsThingStateController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ItxLsThingLsThingState());
-        return "itxlsthinglsthingstates/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ItxLsThingLsThingStateController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxlsthinglsthingstate", ItxLsThingLsThingState.findItxLsThingLsThingState(id));
-        uiModel.addAttribute("itemId", id);
-        return "itxlsthinglsthingstates/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ItxLsThingLsThingStateController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxlsthinglsthingstates", ItxLsThingLsThingState.findItxLsThingLsThingStateEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ItxLsThingLsThingState.countItxLsThingLsThingStates() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxlsthinglsthingstates", ItxLsThingLsThingState.findAllItxLsThingLsThingStates(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxlsthinglsthingstates/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ItxLsThingLsThingStateController.update(@Valid ItxLsThingLsThingState itxLsThingLsThingState, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxLsThingLsThingState);
-            return "itxlsthinglsthingstates/update";
-        }
-        uiModel.asMap().clear();
-        itxLsThingLsThingState.merge();
-        return "redirect:/itxlsthinglsthingstates/" + encodeUrlPathSegment(itxLsThingLsThingState.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ItxLsThingLsThingStateController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ItxLsThingLsThingState.findItxLsThingLsThingState(id));
-        return "itxlsthinglsthingstates/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ItxLsThingLsThingStateController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ItxLsThingLsThingState itxLsThingLsThingState = ItxLsThingLsThingState.findItxLsThingLsThingState(id);
-        itxLsThingLsThingState.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/itxlsthinglsthingstates";
-    }
-    
-    void ItxLsThingLsThingStateController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("itxLsThingLsThingState_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("itxLsThingLsThingState_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ItxLsThingLsThingStateController.populateEditForm(Model uiModel, ItxLsThingLsThingState itxLsThingLsThingState) {
-        uiModel.addAttribute("itxLsThingLsThingState", itxLsThingLsThingState);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxlsthinglsthings", ItxLsThingLsThing.findAllItxLsThingLsThings());
-        uiModel.addAttribute("itxlsthinglsthingvalues", ItxLsThingLsThingValue.findAllItxLsThingLsThingValues());
-    }
-    
-    String ItxLsThingLsThingStateController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingStateController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingStateController_Roo_Controller_Json.aj
deleted file mode 100644
index 46945d9e1..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingStateController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,111 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThingState;
-import com.labsynch.labseer.web.ItxLsThingLsThingStateController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ItxLsThingLsThingStateController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxLsThingLsThingStateController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ItxLsThingLsThingState itxLsThingLsThingState = ItxLsThingLsThingState.findItxLsThingLsThingState(id);
-            if (itxLsThingLsThingState == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(itxLsThingLsThingState.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxLsThingLsThingStateController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ItxLsThingLsThingState> result = ItxLsThingLsThingState.findAllItxLsThingLsThingStates();
-            return new ResponseEntity<String>(ItxLsThingLsThingState.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxLsThingLsThingStateController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxLsThingLsThingState itxLsThingLsThingState = ItxLsThingLsThingState.fromJsonToItxLsThingLsThingState(json);
-            itxLsThingLsThingState.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+itxLsThingLsThingState.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxLsThingLsThingStateController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ItxLsThingLsThingState itxLsThingLsThingState: ItxLsThingLsThingState.fromJsonArrayToItxLsThingLsThingStates(json)) {
-                itxLsThingLsThingState.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxLsThingLsThingStateController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxLsThingLsThingState itxLsThingLsThingState = ItxLsThingLsThingState.fromJsonToItxLsThingLsThingState(json);
-            itxLsThingLsThingState.setId(id);
-            if (itxLsThingLsThingState.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxLsThingLsThingStateController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxLsThingLsThingState itxLsThingLsThingState = ItxLsThingLsThingState.findItxLsThingLsThingState(id);
-            if (itxLsThingLsThingState == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            itxLsThingLsThingState.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingValueController.java b/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingValueController.java
deleted file mode 100644
index a4158dd87..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingValueController.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThingValue;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RooWebJson(jsonObject = ItxLsThingLsThingValue.class)
-@Controller
-@RequestMapping("/itxlsthinglsthingvalues")
-@RooWebScaffold(path = "itxlsthinglsthingvalues", formBackingObject = ItxLsThingLsThingValue.class)
-public class ItxLsThingLsThingValueController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingValueController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingValueController_Roo_Controller.aj
deleted file mode 100644
index d44f23edf..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingValueController_Roo_Controller.aj
+++ /dev/null
@@ -1,113 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThingState;
-import com.labsynch.labseer.domain.ItxLsThingLsThingValue;
-import com.labsynch.labseer.web.ItxLsThingLsThingValueController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ItxLsThingLsThingValueController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ItxLsThingLsThingValueController.create(@Valid ItxLsThingLsThingValue itxLsThingLsThingValue, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxLsThingLsThingValue);
-            return "itxlsthinglsthingvalues/create";
-        }
-        uiModel.asMap().clear();
-        itxLsThingLsThingValue.persist();
-        return "redirect:/itxlsthinglsthingvalues/" + encodeUrlPathSegment(itxLsThingLsThingValue.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ItxLsThingLsThingValueController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ItxLsThingLsThingValue());
-        return "itxlsthinglsthingvalues/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ItxLsThingLsThingValueController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxlsthinglsthingvalue", ItxLsThingLsThingValue.findItxLsThingLsThingValue(id));
-        uiModel.addAttribute("itemId", id);
-        return "itxlsthinglsthingvalues/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ItxLsThingLsThingValueController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxlsthinglsthingvalues", ItxLsThingLsThingValue.findItxLsThingLsThingValueEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ItxLsThingLsThingValue.countItxLsThingLsThingValues() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxlsthinglsthingvalues", ItxLsThingLsThingValue.findAllItxLsThingLsThingValues(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxlsthinglsthingvalues/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ItxLsThingLsThingValueController.update(@Valid ItxLsThingLsThingValue itxLsThingLsThingValue, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxLsThingLsThingValue);
-            return "itxlsthinglsthingvalues/update";
-        }
-        uiModel.asMap().clear();
-        itxLsThingLsThingValue.merge();
-        return "redirect:/itxlsthinglsthingvalues/" + encodeUrlPathSegment(itxLsThingLsThingValue.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ItxLsThingLsThingValueController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ItxLsThingLsThingValue.findItxLsThingLsThingValue(id));
-        return "itxlsthinglsthingvalues/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ItxLsThingLsThingValueController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ItxLsThingLsThingValue itxLsThingLsThingValue = ItxLsThingLsThingValue.findItxLsThingLsThingValue(id);
-        itxLsThingLsThingValue.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/itxlsthinglsthingvalues";
-    }
-    
-    void ItxLsThingLsThingValueController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("itxLsThingLsThingValue_datevalue_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("itxLsThingLsThingValue_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("itxLsThingLsThingValue_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ItxLsThingLsThingValueController.populateEditForm(Model uiModel, ItxLsThingLsThingValue itxLsThingLsThingValue) {
-        uiModel.addAttribute("itxLsThingLsThingValue", itxLsThingLsThingValue);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxlsthinglsthingstates", ItxLsThingLsThingState.findAllItxLsThingLsThingStates());
-    }
-    
-    String ItxLsThingLsThingValueController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingValueController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingValueController_Roo_Controller_Json.aj
deleted file mode 100644
index a905faac2..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxLsThingLsThingValueController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,136 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThingValue;
-import com.labsynch.labseer.web.ItxLsThingLsThingValueController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ItxLsThingLsThingValueController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxLsThingLsThingValueController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ItxLsThingLsThingValue itxLsThingLsThingValue = ItxLsThingLsThingValue.findItxLsThingLsThingValue(id);
-            if (itxLsThingLsThingValue == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(itxLsThingLsThingValue.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxLsThingLsThingValueController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ItxLsThingLsThingValue> result = ItxLsThingLsThingValue.findAllItxLsThingLsThingValues();
-            return new ResponseEntity<String>(ItxLsThingLsThingValue.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxLsThingLsThingValueController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxLsThingLsThingValue itxLsThingLsThingValue = ItxLsThingLsThingValue.fromJsonToItxLsThingLsThingValue(json);
-            itxLsThingLsThingValue.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+itxLsThingLsThingValue.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxLsThingLsThingValueController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ItxLsThingLsThingValue itxLsThingLsThingValue: ItxLsThingLsThingValue.fromJsonArrayToItxLsThingLsThingValues(json)) {
-                itxLsThingLsThingValue.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxLsThingLsThingValueController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxLsThingLsThingValue itxLsThingLsThingValue = ItxLsThingLsThingValue.fromJsonToItxLsThingLsThingValue(json);
-            itxLsThingLsThingValue.setId(id);
-            if (itxLsThingLsThingValue.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxLsThingLsThingValueController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxLsThingLsThingValue itxLsThingLsThingValue = ItxLsThingLsThingValue.findItxLsThingLsThingValue(id);
-            if (itxLsThingLsThingValue == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            itxLsThingLsThingValue.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxLsThingLsThingValueController.jsonFindItxLsThingLsThingValuesByLsKindEquals(@RequestParam("lsKind") String lsKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ItxLsThingLsThingValue.toJsonArray(ItxLsThingLsThingValue.findItxLsThingLsThingValuesByLsKindEquals(lsKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxLsThingLsThingValueController.jsonFindItxLsThingLsThingValuesByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ItxLsThingLsThingValue.toJsonArray(ItxLsThingLsThingValue.findItxLsThingLsThingValuesByLsTransactionEquals(lsTransaction).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolController.java b/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolController.java
deleted file mode 100755
index 0a4910fbd..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolController.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxProtocolProtocol;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/itxprotocolprotocols")
-@Controller
-@RooWebScaffold(path = "itxprotocolprotocols", formBackingObject = ItxProtocolProtocol.class)
-@RooWebJson(jsonObject = ItxProtocolProtocol.class)
-@RooWebFinder
-public class ItxProtocolProtocolController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolController_Roo_Controller.aj
deleted file mode 100755
index 21028f7ea..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolController_Roo_Controller.aj
+++ /dev/null
@@ -1,126 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxProtocolProtocol;
-import com.labsynch.labseer.domain.ItxProtocolProtocolState;
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ThingPage;
-import com.labsynch.labseer.web.ItxProtocolProtocolController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ItxProtocolProtocolController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ItxProtocolProtocolController.create(@Valid ItxProtocolProtocol itxProtocolProtocol, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxProtocolProtocol);
-            return "itxprotocolprotocols/create";
-        }
-        uiModel.asMap().clear();
-        itxProtocolProtocol.persist();
-        return "redirect:/itxprotocolprotocols/" + encodeUrlPathSegment(itxProtocolProtocol.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ItxProtocolProtocolController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ItxProtocolProtocol());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (Protocol.countProtocols() == 0) {
-            dependencies.add(new String[] { "firstProtocol", "protocols" });
-        }
-        if (Protocol.countProtocols() == 0) {
-            dependencies.add(new String[] { "secondProtocol", "protocols" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "itxprotocolprotocols/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ItxProtocolProtocolController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxprotocolprotocol", ItxProtocolProtocol.findItxProtocolProtocol(id));
-        uiModel.addAttribute("itemId", id);
-        return "itxprotocolprotocols/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ItxProtocolProtocolController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxprotocolprotocols", ItxProtocolProtocol.findItxProtocolProtocolEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ItxProtocolProtocol.countItxProtocolProtocols() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxprotocolprotocols", ItxProtocolProtocol.findAllItxProtocolProtocols(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxprotocolprotocols/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ItxProtocolProtocolController.update(@Valid ItxProtocolProtocol itxProtocolProtocol, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxProtocolProtocol);
-            return "itxprotocolprotocols/update";
-        }
-        uiModel.asMap().clear();
-        itxProtocolProtocol.merge();
-        return "redirect:/itxprotocolprotocols/" + encodeUrlPathSegment(itxProtocolProtocol.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ItxProtocolProtocolController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ItxProtocolProtocol.findItxProtocolProtocol(id));
-        return "itxprotocolprotocols/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ItxProtocolProtocolController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ItxProtocolProtocol itxProtocolProtocol = ItxProtocolProtocol.findItxProtocolProtocol(id);
-        itxProtocolProtocol.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/itxprotocolprotocols";
-    }
-    
-    void ItxProtocolProtocolController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("itxProtocolProtocol_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("itxProtocolProtocol_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ItxProtocolProtocolController.populateEditForm(Model uiModel, ItxProtocolProtocol itxProtocolProtocol) {
-        uiModel.addAttribute("itxProtocolProtocol", itxProtocolProtocol);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxprotocolprotocolstates", ItxProtocolProtocolState.findAllItxProtocolProtocolStates());
-        uiModel.addAttribute("protocols", Protocol.findAllProtocols());
-        uiModel.addAttribute("thingpages", ThingPage.findAllThingPages());
-    }
-    
-    String ItxProtocolProtocolController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolController_Roo_Controller_Finder.aj
deleted file mode 100644
index f6d74de4b..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,78 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxProtocolProtocol;
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.web.ItxProtocolProtocolController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect ItxProtocolProtocolController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByFirstProtocol", "form" }, method = RequestMethod.GET)
-    public String ItxProtocolProtocolController.findItxProtocolProtocolsByFirstProtocolForm(Model uiModel) {
-        uiModel.addAttribute("protocols", Protocol.findAllProtocols());
-        return "itxprotocolprotocols/findItxProtocolProtocolsByFirstProtocol";
-    }
-    
-    @RequestMapping(params = "find=ByFirstProtocol", method = RequestMethod.GET)
-    public String ItxProtocolProtocolController.findItxProtocolProtocolsByFirstProtocol(@RequestParam("firstProtocol") Protocol firstProtocol, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxprotocolprotocols", ItxProtocolProtocol.findItxProtocolProtocolsByFirstProtocol(firstProtocol, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ItxProtocolProtocol.countFindItxProtocolProtocolsByFirstProtocol(firstProtocol) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxprotocolprotocols", ItxProtocolProtocol.findItxProtocolProtocolsByFirstProtocol(firstProtocol, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxprotocolprotocols/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTransactionEquals", "form" }, method = RequestMethod.GET)
-    public String ItxProtocolProtocolController.findItxProtocolProtocolsByLsTransactionEqualsForm(Model uiModel) {
-        return "itxprotocolprotocols/findItxProtocolProtocolsByLsTransactionEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", method = RequestMethod.GET)
-    public String ItxProtocolProtocolController.findItxProtocolProtocolsByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxprotocolprotocols", ItxProtocolProtocol.findItxProtocolProtocolsByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ItxProtocolProtocol.countFindItxProtocolProtocolsByLsTransactionEquals(lsTransaction) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxprotocolprotocols", ItxProtocolProtocol.findItxProtocolProtocolsByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxprotocolprotocols/list";
-    }
-    
-    @RequestMapping(params = { "find=BySecondProtocol", "form" }, method = RequestMethod.GET)
-    public String ItxProtocolProtocolController.findItxProtocolProtocolsBySecondProtocolForm(Model uiModel) {
-        uiModel.addAttribute("protocols", Protocol.findAllProtocols());
-        return "itxprotocolprotocols/findItxProtocolProtocolsBySecondProtocol";
-    }
-    
-    @RequestMapping(params = "find=BySecondProtocol", method = RequestMethod.GET)
-    public String ItxProtocolProtocolController.findItxProtocolProtocolsBySecondProtocol(@RequestParam("secondProtocol") Protocol secondProtocol, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxprotocolprotocols", ItxProtocolProtocol.findItxProtocolProtocolsBySecondProtocol(secondProtocol, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ItxProtocolProtocol.countFindItxProtocolProtocolsBySecondProtocol(secondProtocol) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxprotocolprotocols", ItxProtocolProtocol.findItxProtocolProtocolsBySecondProtocol(secondProtocol, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxprotocolprotocols/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolController_Roo_Controller_Json.aj
deleted file mode 100755
index ae7bd0e58..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,149 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxProtocolProtocol;
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.web.ItxProtocolProtocolController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ItxProtocolProtocolController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxProtocolProtocolController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ItxProtocolProtocol itxProtocolProtocol = ItxProtocolProtocol.findItxProtocolProtocol(id);
-            if (itxProtocolProtocol == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(itxProtocolProtocol.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxProtocolProtocolController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ItxProtocolProtocol> result = ItxProtocolProtocol.findAllItxProtocolProtocols();
-            return new ResponseEntity<String>(ItxProtocolProtocol.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxProtocolProtocolController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxProtocolProtocol itxProtocolProtocol = ItxProtocolProtocol.fromJsonToItxProtocolProtocol(json);
-            itxProtocolProtocol.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+itxProtocolProtocol.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxProtocolProtocolController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ItxProtocolProtocol itxProtocolProtocol: ItxProtocolProtocol.fromJsonArrayToItxProtocolProtocols(json)) {
-                itxProtocolProtocol.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxProtocolProtocolController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxProtocolProtocol itxProtocolProtocol = ItxProtocolProtocol.fromJsonToItxProtocolProtocol(json);
-            itxProtocolProtocol.setId(id);
-            if (itxProtocolProtocol.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxProtocolProtocolController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxProtocolProtocol itxProtocolProtocol = ItxProtocolProtocol.findItxProtocolProtocol(id);
-            if (itxProtocolProtocol == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            itxProtocolProtocol.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByFirstProtocol", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxProtocolProtocolController.jsonFindItxProtocolProtocolsByFirstProtocol(@RequestParam("firstProtocol") Protocol firstProtocol) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ItxProtocolProtocol.toJsonArray(ItxProtocolProtocol.findItxProtocolProtocolsByFirstProtocol(firstProtocol).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxProtocolProtocolController.jsonFindItxProtocolProtocolsByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ItxProtocolProtocol.toJsonArray(ItxProtocolProtocol.findItxProtocolProtocolsByLsTransactionEquals(lsTransaction).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=BySecondProtocol", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxProtocolProtocolController.jsonFindItxProtocolProtocolsBySecondProtocol(@RequestParam("secondProtocol") Protocol secondProtocol) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ItxProtocolProtocol.toJsonArray(ItxProtocolProtocol.findItxProtocolProtocolsBySecondProtocol(secondProtocol).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolStateController.java b/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolStateController.java
deleted file mode 100755
index 81ec2a44f..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolStateController.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxProtocolProtocolState;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/itxprotocolprotocolstates")
-@Controller
-@RooWebScaffold(path = "itxprotocolprotocolstates", formBackingObject = ItxProtocolProtocolState.class)
-@RooWebJson(jsonObject = ItxProtocolProtocolState.class)
-public class ItxProtocolProtocolStateController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolStateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolStateController_Roo_Controller.aj
deleted file mode 100755
index 1b2d3295b..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolStateController_Roo_Controller.aj
+++ /dev/null
@@ -1,114 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxProtocolProtocol;
-import com.labsynch.labseer.domain.ItxProtocolProtocolState;
-import com.labsynch.labseer.domain.ItxProtocolProtocolValue;
-import com.labsynch.labseer.web.ItxProtocolProtocolStateController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ItxProtocolProtocolStateController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ItxProtocolProtocolStateController.create(@Valid ItxProtocolProtocolState itxProtocolProtocolState, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxProtocolProtocolState);
-            return "itxprotocolprotocolstates/create";
-        }
-        uiModel.asMap().clear();
-        itxProtocolProtocolState.persist();
-        return "redirect:/itxprotocolprotocolstates/" + encodeUrlPathSegment(itxProtocolProtocolState.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ItxProtocolProtocolStateController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ItxProtocolProtocolState());
-        return "itxprotocolprotocolstates/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ItxProtocolProtocolStateController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxprotocolprotocolstate", ItxProtocolProtocolState.findItxProtocolProtocolState(id));
-        uiModel.addAttribute("itemId", id);
-        return "itxprotocolprotocolstates/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ItxProtocolProtocolStateController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxprotocolprotocolstates", ItxProtocolProtocolState.findItxProtocolProtocolStateEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ItxProtocolProtocolState.countItxProtocolProtocolStates() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxprotocolprotocolstates", ItxProtocolProtocolState.findAllItxProtocolProtocolStates(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxprotocolprotocolstates/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ItxProtocolProtocolStateController.update(@Valid ItxProtocolProtocolState itxProtocolProtocolState, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxProtocolProtocolState);
-            return "itxprotocolprotocolstates/update";
-        }
-        uiModel.asMap().clear();
-        itxProtocolProtocolState.merge();
-        return "redirect:/itxprotocolprotocolstates/" + encodeUrlPathSegment(itxProtocolProtocolState.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ItxProtocolProtocolStateController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ItxProtocolProtocolState.findItxProtocolProtocolState(id));
-        return "itxprotocolprotocolstates/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ItxProtocolProtocolStateController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ItxProtocolProtocolState itxProtocolProtocolState = ItxProtocolProtocolState.findItxProtocolProtocolState(id);
-        itxProtocolProtocolState.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/itxprotocolprotocolstates";
-    }
-    
-    void ItxProtocolProtocolStateController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("itxProtocolProtocolState_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("itxProtocolProtocolState_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ItxProtocolProtocolStateController.populateEditForm(Model uiModel, ItxProtocolProtocolState itxProtocolProtocolState) {
-        uiModel.addAttribute("itxProtocolProtocolState", itxProtocolProtocolState);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxprotocolprotocols", ItxProtocolProtocol.findAllItxProtocolProtocols());
-        uiModel.addAttribute("itxprotocolprotocolvalues", ItxProtocolProtocolValue.findAllItxProtocolProtocolValues());
-    }
-    
-    String ItxProtocolProtocolStateController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolStateController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolStateController_Roo_Controller_Json.aj
deleted file mode 100755
index b205535e8..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolStateController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,111 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxProtocolProtocolState;
-import com.labsynch.labseer.web.ItxProtocolProtocolStateController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ItxProtocolProtocolStateController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxProtocolProtocolStateController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ItxProtocolProtocolState itxProtocolProtocolState = ItxProtocolProtocolState.findItxProtocolProtocolState(id);
-            if (itxProtocolProtocolState == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(itxProtocolProtocolState.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxProtocolProtocolStateController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ItxProtocolProtocolState> result = ItxProtocolProtocolState.findAllItxProtocolProtocolStates();
-            return new ResponseEntity<String>(ItxProtocolProtocolState.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxProtocolProtocolStateController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxProtocolProtocolState itxProtocolProtocolState = ItxProtocolProtocolState.fromJsonToItxProtocolProtocolState(json);
-            itxProtocolProtocolState.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+itxProtocolProtocolState.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxProtocolProtocolStateController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ItxProtocolProtocolState itxProtocolProtocolState: ItxProtocolProtocolState.fromJsonArrayToItxProtocolProtocolStates(json)) {
-                itxProtocolProtocolState.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxProtocolProtocolStateController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxProtocolProtocolState itxProtocolProtocolState = ItxProtocolProtocolState.fromJsonToItxProtocolProtocolState(json);
-            itxProtocolProtocolState.setId(id);
-            if (itxProtocolProtocolState.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxProtocolProtocolStateController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxProtocolProtocolState itxProtocolProtocolState = ItxProtocolProtocolState.findItxProtocolProtocolState(id);
-            if (itxProtocolProtocolState == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            itxProtocolProtocolState.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolValueController.java b/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolValueController.java
deleted file mode 100755
index 171710cb7..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolValueController.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxProtocolProtocolValue;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/itxprotocolprotocolvalues")
-@Controller
-@RooWebScaffold(path = "itxprotocolprotocolvalues", formBackingObject = ItxProtocolProtocolValue.class)
-@RooWebJson(jsonObject = ItxProtocolProtocolValue.class)
-public class ItxProtocolProtocolValueController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolValueController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolValueController_Roo_Controller.aj
deleted file mode 100755
index bd5a9a581..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolValueController_Roo_Controller.aj
+++ /dev/null
@@ -1,113 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxProtocolProtocolState;
-import com.labsynch.labseer.domain.ItxProtocolProtocolValue;
-import com.labsynch.labseer.web.ItxProtocolProtocolValueController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ItxProtocolProtocolValueController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ItxProtocolProtocolValueController.create(@Valid ItxProtocolProtocolValue itxProtocolProtocolValue, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxProtocolProtocolValue);
-            return "itxprotocolprotocolvalues/create";
-        }
-        uiModel.asMap().clear();
-        itxProtocolProtocolValue.persist();
-        return "redirect:/itxprotocolprotocolvalues/" + encodeUrlPathSegment(itxProtocolProtocolValue.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ItxProtocolProtocolValueController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ItxProtocolProtocolValue());
-        return "itxprotocolprotocolvalues/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ItxProtocolProtocolValueController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxprotocolprotocolvalue", ItxProtocolProtocolValue.findItxProtocolProtocolValue(id));
-        uiModel.addAttribute("itemId", id);
-        return "itxprotocolprotocolvalues/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ItxProtocolProtocolValueController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxprotocolprotocolvalues", ItxProtocolProtocolValue.findItxProtocolProtocolValueEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ItxProtocolProtocolValue.countItxProtocolProtocolValues() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxprotocolprotocolvalues", ItxProtocolProtocolValue.findAllItxProtocolProtocolValues(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxprotocolprotocolvalues/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ItxProtocolProtocolValueController.update(@Valid ItxProtocolProtocolValue itxProtocolProtocolValue, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxProtocolProtocolValue);
-            return "itxprotocolprotocolvalues/update";
-        }
-        uiModel.asMap().clear();
-        itxProtocolProtocolValue.merge();
-        return "redirect:/itxprotocolprotocolvalues/" + encodeUrlPathSegment(itxProtocolProtocolValue.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ItxProtocolProtocolValueController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ItxProtocolProtocolValue.findItxProtocolProtocolValue(id));
-        return "itxprotocolprotocolvalues/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ItxProtocolProtocolValueController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ItxProtocolProtocolValue itxProtocolProtocolValue = ItxProtocolProtocolValue.findItxProtocolProtocolValue(id);
-        itxProtocolProtocolValue.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/itxprotocolprotocolvalues";
-    }
-    
-    void ItxProtocolProtocolValueController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("itxProtocolProtocolValue_datevalue_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("itxProtocolProtocolValue_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("itxProtocolProtocolValue_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ItxProtocolProtocolValueController.populateEditForm(Model uiModel, ItxProtocolProtocolValue itxProtocolProtocolValue) {
-        uiModel.addAttribute("itxProtocolProtocolValue", itxProtocolProtocolValue);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxprotocolprotocolstates", ItxProtocolProtocolState.findAllItxProtocolProtocolStates());
-    }
-    
-    String ItxProtocolProtocolValueController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolValueController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolValueController_Roo_Controller_Json.aj
deleted file mode 100755
index 24bb8234d..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxProtocolProtocolValueController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,111 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxProtocolProtocolValue;
-import com.labsynch.labseer.web.ItxProtocolProtocolValueController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ItxProtocolProtocolValueController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxProtocolProtocolValueController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ItxProtocolProtocolValue itxProtocolProtocolValue = ItxProtocolProtocolValue.findItxProtocolProtocolValue(id);
-            if (itxProtocolProtocolValue == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(itxProtocolProtocolValue.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxProtocolProtocolValueController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ItxProtocolProtocolValue> result = ItxProtocolProtocolValue.findAllItxProtocolProtocolValues();
-            return new ResponseEntity<String>(ItxProtocolProtocolValue.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxProtocolProtocolValueController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxProtocolProtocolValue itxProtocolProtocolValue = ItxProtocolProtocolValue.fromJsonToItxProtocolProtocolValue(json);
-            itxProtocolProtocolValue.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+itxProtocolProtocolValue.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxProtocolProtocolValueController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ItxProtocolProtocolValue itxProtocolProtocolValue: ItxProtocolProtocolValue.fromJsonArrayToItxProtocolProtocolValues(json)) {
-                itxProtocolProtocolValue.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxProtocolProtocolValueController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxProtocolProtocolValue itxProtocolProtocolValue = ItxProtocolProtocolValue.fromJsonToItxProtocolProtocolValue(json);
-            itxProtocolProtocolValue.setId(id);
-            if (itxProtocolProtocolValue.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxProtocolProtocolValueController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxProtocolProtocolValue itxProtocolProtocolValue = ItxProtocolProtocolValue.findItxProtocolProtocolValue(id);
-            if (itxProtocolProtocolValue == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            itxProtocolProtocolValue.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerController.java b/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerController.java
deleted file mode 100755
index cf7041949..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerController.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxSubjectContainer;
-import com.labsynch.labseer.service.ItxSubjectContainerService;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import flexjson.JSONTokener;
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = ItxSubjectContainer.class)
-@Controller
-@RequestMapping("/itxsubjectcontainers")
-@RooWebScaffold(path = "itxsubjectcontainers", formBackingObject = ItxSubjectContainer.class)
-@RooWebFinder
-public class ItxSubjectContainerController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerController_Roo_Controller.aj
deleted file mode 100755
index 59bbd398c..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerController_Roo_Controller.aj
+++ /dev/null
@@ -1,128 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ItxSubjectContainer;
-import com.labsynch.labseer.domain.ItxSubjectContainerState;
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.ThingPage;
-import com.labsynch.labseer.web.ItxSubjectContainerController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ItxSubjectContainerController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ItxSubjectContainerController.create(@Valid ItxSubjectContainer itxSubjectContainer, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxSubjectContainer);
-            return "itxsubjectcontainers/create";
-        }
-        uiModel.asMap().clear();
-        itxSubjectContainer.persist();
-        return "redirect:/itxsubjectcontainers/" + encodeUrlPathSegment(itxSubjectContainer.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ItxSubjectContainerController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ItxSubjectContainer());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (Subject.countSubjects() == 0) {
-            dependencies.add(new String[] { "subject", "subjects" });
-        }
-        if (Container.countContainers() == 0) {
-            dependencies.add(new String[] { "container", "containers" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "itxsubjectcontainers/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ItxSubjectContainerController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxsubjectcontainer", ItxSubjectContainer.findItxSubjectContainer(id));
-        uiModel.addAttribute("itemId", id);
-        return "itxsubjectcontainers/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ItxSubjectContainerController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxsubjectcontainers", ItxSubjectContainer.findItxSubjectContainerEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ItxSubjectContainer.countItxSubjectContainers() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxsubjectcontainers", ItxSubjectContainer.findAllItxSubjectContainers(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxsubjectcontainers/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ItxSubjectContainerController.update(@Valid ItxSubjectContainer itxSubjectContainer, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxSubjectContainer);
-            return "itxsubjectcontainers/update";
-        }
-        uiModel.asMap().clear();
-        itxSubjectContainer.merge();
-        return "redirect:/itxsubjectcontainers/" + encodeUrlPathSegment(itxSubjectContainer.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ItxSubjectContainerController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ItxSubjectContainer.findItxSubjectContainer(id));
-        return "itxsubjectcontainers/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ItxSubjectContainerController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ItxSubjectContainer itxSubjectContainer = ItxSubjectContainer.findItxSubjectContainer(id);
-        itxSubjectContainer.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/itxsubjectcontainers";
-    }
-    
-    void ItxSubjectContainerController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("itxSubjectContainer_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("itxSubjectContainer_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ItxSubjectContainerController.populateEditForm(Model uiModel, ItxSubjectContainer itxSubjectContainer) {
-        uiModel.addAttribute("itxSubjectContainer", itxSubjectContainer);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("containers", Container.findAllContainers());
-        uiModel.addAttribute("itxsubjectcontainerstates", ItxSubjectContainerState.findAllItxSubjectContainerStates());
-        uiModel.addAttribute("subjects", Subject.findAllSubjects());
-        uiModel.addAttribute("thingpages", ThingPage.findAllThingPages());
-    }
-    
-    String ItxSubjectContainerController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerController_Roo_Controller_Finder.aj
deleted file mode 100755
index 3f2141ac1..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,99 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ItxSubjectContainer;
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.web.ItxSubjectContainerController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect ItxSubjectContainerController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByCodeNameEquals", "form" }, method = RequestMethod.GET)
-    public String ItxSubjectContainerController.findItxSubjectContainersByCodeNameEqualsForm(Model uiModel) {
-        return "itxsubjectcontainers/findItxSubjectContainersByCodeNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByCodeNameEquals", method = RequestMethod.GET)
-    public String ItxSubjectContainerController.findItxSubjectContainersByCodeNameEquals(@RequestParam("codeName") String codeName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxsubjectcontainers", ItxSubjectContainer.findItxSubjectContainersByCodeNameEquals(codeName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ItxSubjectContainer.countFindItxSubjectContainersByCodeNameEquals(codeName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxsubjectcontainers", ItxSubjectContainer.findItxSubjectContainersByCodeNameEquals(codeName, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxsubjectcontainers/list";
-    }
-    
-    @RequestMapping(params = { "find=ByContainer", "form" }, method = RequestMethod.GET)
-    public String ItxSubjectContainerController.findItxSubjectContainersByContainerForm(Model uiModel) {
-        uiModel.addAttribute("containers", Container.findAllContainers());
-        return "itxsubjectcontainers/findItxSubjectContainersByContainer";
-    }
-    
-    @RequestMapping(params = "find=ByContainer", method = RequestMethod.GET)
-    public String ItxSubjectContainerController.findItxSubjectContainersByContainer(@RequestParam("container") Container container, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxsubjectcontainers", ItxSubjectContainer.findItxSubjectContainersByContainer(container, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ItxSubjectContainer.countFindItxSubjectContainersByContainer(container) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxsubjectcontainers", ItxSubjectContainer.findItxSubjectContainersByContainer(container, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxsubjectcontainers/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTransactionEquals", "form" }, method = RequestMethod.GET)
-    public String ItxSubjectContainerController.findItxSubjectContainersByLsTransactionEqualsForm(Model uiModel) {
-        return "itxsubjectcontainers/findItxSubjectContainersByLsTransactionEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", method = RequestMethod.GET)
-    public String ItxSubjectContainerController.findItxSubjectContainersByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxsubjectcontainers", ItxSubjectContainer.findItxSubjectContainersByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ItxSubjectContainer.countFindItxSubjectContainersByLsTransactionEquals(lsTransaction) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxsubjectcontainers", ItxSubjectContainer.findItxSubjectContainersByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxsubjectcontainers/list";
-    }
-    
-    @RequestMapping(params = { "find=BySubject", "form" }, method = RequestMethod.GET)
-    public String ItxSubjectContainerController.findItxSubjectContainersBySubjectForm(Model uiModel) {
-        uiModel.addAttribute("subjects", Subject.findAllSubjects());
-        return "itxsubjectcontainers/findItxSubjectContainersBySubject";
-    }
-    
-    @RequestMapping(params = "find=BySubject", method = RequestMethod.GET)
-    public String ItxSubjectContainerController.findItxSubjectContainersBySubject(@RequestParam("subject") Subject subject, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxsubjectcontainers", ItxSubjectContainer.findItxSubjectContainersBySubject(subject, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ItxSubjectContainer.countFindItxSubjectContainersBySubject(subject) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxsubjectcontainers", ItxSubjectContainer.findItxSubjectContainersBySubject(subject, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxsubjectcontainers/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerController_Roo_Controller_Json.aj
deleted file mode 100755
index a22c3bb3b..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,162 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ItxSubjectContainer;
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.web.ItxSubjectContainerController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ItxSubjectContainerController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxSubjectContainerController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ItxSubjectContainer itxSubjectContainer = ItxSubjectContainer.findItxSubjectContainer(id);
-            if (itxSubjectContainer == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(itxSubjectContainer.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxSubjectContainerController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ItxSubjectContainer> result = ItxSubjectContainer.findAllItxSubjectContainers();
-            return new ResponseEntity<String>(ItxSubjectContainer.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxSubjectContainerController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxSubjectContainer itxSubjectContainer = ItxSubjectContainer.fromJsonToItxSubjectContainer(json);
-            itxSubjectContainer.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+itxSubjectContainer.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxSubjectContainerController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ItxSubjectContainer itxSubjectContainer: ItxSubjectContainer.fromJsonArrayToItxSubjectContainers(json)) {
-                itxSubjectContainer.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxSubjectContainerController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxSubjectContainer itxSubjectContainer = ItxSubjectContainer.fromJsonToItxSubjectContainer(json);
-            itxSubjectContainer.setId(id);
-            if (itxSubjectContainer.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxSubjectContainerController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxSubjectContainer itxSubjectContainer = ItxSubjectContainer.findItxSubjectContainer(id);
-            if (itxSubjectContainer == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            itxSubjectContainer.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByCodeNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxSubjectContainerController.jsonFindItxSubjectContainersByCodeNameEquals(@RequestParam("codeName") String codeName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ItxSubjectContainer.toJsonArray(ItxSubjectContainer.findItxSubjectContainersByCodeNameEquals(codeName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByContainer", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxSubjectContainerController.jsonFindItxSubjectContainersByContainer(@RequestParam("container") Container container) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ItxSubjectContainer.toJsonArray(ItxSubjectContainer.findItxSubjectContainersByContainer(container).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxSubjectContainerController.jsonFindItxSubjectContainersByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ItxSubjectContainer.toJsonArray(ItxSubjectContainer.findItxSubjectContainersByLsTransactionEquals(lsTransaction).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=BySubject", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxSubjectContainerController.jsonFindItxSubjectContainersBySubject(@RequestParam("subject") Subject subject) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ItxSubjectContainer.toJsonArray(ItxSubjectContainer.findItxSubjectContainersBySubject(subject).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerStateController.java b/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerStateController.java
deleted file mode 100755
index e90743817..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerStateController.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxSubjectContainerState;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = ItxSubjectContainerState.class)
-@Controller
-@RequestMapping("/itxsubjectcontainerstates")
-@RooWebScaffold(path = "itxsubjectcontainerstates", formBackingObject = ItxSubjectContainerState.class)
-public class ItxSubjectContainerStateController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerStateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerStateController_Roo_Controller.aj
deleted file mode 100755
index 4995ee155..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerStateController_Roo_Controller.aj
+++ /dev/null
@@ -1,114 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxSubjectContainer;
-import com.labsynch.labseer.domain.ItxSubjectContainerState;
-import com.labsynch.labseer.domain.ItxSubjectContainerValue;
-import com.labsynch.labseer.web.ItxSubjectContainerStateController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ItxSubjectContainerStateController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ItxSubjectContainerStateController.create(@Valid ItxSubjectContainerState itxSubjectContainerState, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxSubjectContainerState);
-            return "itxsubjectcontainerstates/create";
-        }
-        uiModel.asMap().clear();
-        itxSubjectContainerState.persist();
-        return "redirect:/itxsubjectcontainerstates/" + encodeUrlPathSegment(itxSubjectContainerState.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ItxSubjectContainerStateController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ItxSubjectContainerState());
-        return "itxsubjectcontainerstates/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ItxSubjectContainerStateController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxsubjectcontainerstate", ItxSubjectContainerState.findItxSubjectContainerState(id));
-        uiModel.addAttribute("itemId", id);
-        return "itxsubjectcontainerstates/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ItxSubjectContainerStateController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxsubjectcontainerstates", ItxSubjectContainerState.findItxSubjectContainerStateEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ItxSubjectContainerState.countItxSubjectContainerStates() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxsubjectcontainerstates", ItxSubjectContainerState.findAllItxSubjectContainerStates(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxsubjectcontainerstates/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ItxSubjectContainerStateController.update(@Valid ItxSubjectContainerState itxSubjectContainerState, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxSubjectContainerState);
-            return "itxsubjectcontainerstates/update";
-        }
-        uiModel.asMap().clear();
-        itxSubjectContainerState.merge();
-        return "redirect:/itxsubjectcontainerstates/" + encodeUrlPathSegment(itxSubjectContainerState.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ItxSubjectContainerStateController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ItxSubjectContainerState.findItxSubjectContainerState(id));
-        return "itxsubjectcontainerstates/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ItxSubjectContainerStateController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ItxSubjectContainerState itxSubjectContainerState = ItxSubjectContainerState.findItxSubjectContainerState(id);
-        itxSubjectContainerState.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/itxsubjectcontainerstates";
-    }
-    
-    void ItxSubjectContainerStateController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("itxSubjectContainerState_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("itxSubjectContainerState_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ItxSubjectContainerStateController.populateEditForm(Model uiModel, ItxSubjectContainerState itxSubjectContainerState) {
-        uiModel.addAttribute("itxSubjectContainerState", itxSubjectContainerState);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxsubjectcontainers", ItxSubjectContainer.findAllItxSubjectContainers());
-        uiModel.addAttribute("itxsubjectcontainervalues", ItxSubjectContainerValue.findAllItxSubjectContainerValues());
-    }
-    
-    String ItxSubjectContainerStateController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerStateController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerStateController_Roo_Controller_Json.aj
deleted file mode 100644
index 9f2363306..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerStateController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,111 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxSubjectContainerState;
-import com.labsynch.labseer.web.ItxSubjectContainerStateController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ItxSubjectContainerStateController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxSubjectContainerStateController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ItxSubjectContainerState itxSubjectContainerState = ItxSubjectContainerState.findItxSubjectContainerState(id);
-            if (itxSubjectContainerState == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(itxSubjectContainerState.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxSubjectContainerStateController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ItxSubjectContainerState> result = ItxSubjectContainerState.findAllItxSubjectContainerStates();
-            return new ResponseEntity<String>(ItxSubjectContainerState.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxSubjectContainerStateController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxSubjectContainerState itxSubjectContainerState = ItxSubjectContainerState.fromJsonToItxSubjectContainerState(json);
-            itxSubjectContainerState.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+itxSubjectContainerState.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxSubjectContainerStateController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ItxSubjectContainerState itxSubjectContainerState: ItxSubjectContainerState.fromJsonArrayToItxSubjectContainerStates(json)) {
-                itxSubjectContainerState.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxSubjectContainerStateController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxSubjectContainerState itxSubjectContainerState = ItxSubjectContainerState.fromJsonToItxSubjectContainerState(json);
-            itxSubjectContainerState.setId(id);
-            if (itxSubjectContainerState.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxSubjectContainerStateController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxSubjectContainerState itxSubjectContainerState = ItxSubjectContainerState.findItxSubjectContainerState(id);
-            if (itxSubjectContainerState == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            itxSubjectContainerState.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerValueController.java b/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerValueController.java
deleted file mode 100755
index 1b9b5cf76..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerValueController.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxSubjectContainerValue;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.util.List;
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = ItxSubjectContainerValue.class)
-@Controller
-@RequestMapping("/itxsubjectcontainervalues")
-@RooWebScaffold(path = "itxsubjectcontainervalues", formBackingObject = ItxSubjectContainerValue.class)
-public class ItxSubjectContainerValueController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerValueController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerValueController_Roo_Controller.aj
deleted file mode 100755
index d2f95ff95..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerValueController_Roo_Controller.aj
+++ /dev/null
@@ -1,113 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxSubjectContainerState;
-import com.labsynch.labseer.domain.ItxSubjectContainerValue;
-import com.labsynch.labseer.web.ItxSubjectContainerValueController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ItxSubjectContainerValueController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ItxSubjectContainerValueController.create(@Valid ItxSubjectContainerValue itxSubjectContainerValue, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxSubjectContainerValue);
-            return "itxsubjectcontainervalues/create";
-        }
-        uiModel.asMap().clear();
-        itxSubjectContainerValue.persist();
-        return "redirect:/itxsubjectcontainervalues/" + encodeUrlPathSegment(itxSubjectContainerValue.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ItxSubjectContainerValueController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ItxSubjectContainerValue());
-        return "itxsubjectcontainervalues/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ItxSubjectContainerValueController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxsubjectcontainervalue", ItxSubjectContainerValue.findItxSubjectContainerValue(id));
-        uiModel.addAttribute("itemId", id);
-        return "itxsubjectcontainervalues/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ItxSubjectContainerValueController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("itxsubjectcontainervalues", ItxSubjectContainerValue.findItxSubjectContainerValueEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ItxSubjectContainerValue.countItxSubjectContainerValues() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("itxsubjectcontainervalues", ItxSubjectContainerValue.findAllItxSubjectContainerValues(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "itxsubjectcontainervalues/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ItxSubjectContainerValueController.update(@Valid ItxSubjectContainerValue itxSubjectContainerValue, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, itxSubjectContainerValue);
-            return "itxsubjectcontainervalues/update";
-        }
-        uiModel.asMap().clear();
-        itxSubjectContainerValue.merge();
-        return "redirect:/itxsubjectcontainervalues/" + encodeUrlPathSegment(itxSubjectContainerValue.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ItxSubjectContainerValueController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ItxSubjectContainerValue.findItxSubjectContainerValue(id));
-        return "itxsubjectcontainervalues/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ItxSubjectContainerValueController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ItxSubjectContainerValue itxSubjectContainerValue = ItxSubjectContainerValue.findItxSubjectContainerValue(id);
-        itxSubjectContainerValue.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/itxsubjectcontainervalues";
-    }
-    
-    void ItxSubjectContainerValueController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("itxSubjectContainerValue_datevalue_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("itxSubjectContainerValue_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("itxSubjectContainerValue_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ItxSubjectContainerValueController.populateEditForm(Model uiModel, ItxSubjectContainerValue itxSubjectContainerValue) {
-        uiModel.addAttribute("itxSubjectContainerValue", itxSubjectContainerValue);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxsubjectcontainerstates", ItxSubjectContainerState.findAllItxSubjectContainerStates());
-    }
-    
-    String ItxSubjectContainerValueController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerValueController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerValueController_Roo_Controller_Json.aj
deleted file mode 100644
index 29ecfd2d1..000000000
--- a/src/main/java/com/labsynch/labseer/web/ItxSubjectContainerValueController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,111 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxSubjectContainerValue;
-import com.labsynch.labseer.web.ItxSubjectContainerValueController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ItxSubjectContainerValueController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxSubjectContainerValueController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ItxSubjectContainerValue itxSubjectContainerValue = ItxSubjectContainerValue.findItxSubjectContainerValue(id);
-            if (itxSubjectContainerValue == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(itxSubjectContainerValue.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ItxSubjectContainerValueController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ItxSubjectContainerValue> result = ItxSubjectContainerValue.findAllItxSubjectContainerValues();
-            return new ResponseEntity<String>(ItxSubjectContainerValue.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxSubjectContainerValueController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxSubjectContainerValue itxSubjectContainerValue = ItxSubjectContainerValue.fromJsonToItxSubjectContainerValue(json);
-            itxSubjectContainerValue.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+itxSubjectContainerValue.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxSubjectContainerValueController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ItxSubjectContainerValue itxSubjectContainerValue: ItxSubjectContainerValue.fromJsonArrayToItxSubjectContainerValues(json)) {
-                itxSubjectContainerValue.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxSubjectContainerValueController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxSubjectContainerValue itxSubjectContainerValue = ItxSubjectContainerValue.fromJsonToItxSubjectContainerValue(json);
-            itxSubjectContainerValue.setId(id);
-            if (itxSubjectContainerValue.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ItxSubjectContainerValueController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ItxSubjectContainerValue itxSubjectContainerValue = ItxSubjectContainerValue.findItxSubjectContainerValue(id);
-            if (itxSubjectContainerValue == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            itxSubjectContainerValue.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/JSTreeNodeDTOController.java b/src/main/java/com/labsynch/labseer/web/JSTreeNodeDTOController.java
deleted file mode 100755
index 253c73d22..000000000
--- a/src/main/java/com/labsynch/labseer/web/JSTreeNodeDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.JSTreeNodeDTO;
-
-@RooWebJson(jsonObject = JSTreeNodeDTO.class)
-@Controller
-@RequestMapping("/jstreenoes")
-public class JSTreeNodeDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/KeyValueDTOController.java b/src/main/java/com/labsynch/labseer/web/KeyValueDTOController.java
deleted file mode 100644
index b1a4e972d..000000000
--- a/src/main/java/com/labsynch/labseer/web/KeyValueDTOController.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.dto.KeyValueDTO;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RooWebJson(jsonObject = KeyValueDTO.class)
-@Controller
-@RequestMapping("/keyvaluedto")
-public class KeyValueDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LabelKindController.java b/src/main/java/com/labsynch/labseer/web/LabelKindController.java
deleted file mode 100755
index 3dbea847c..000000000
--- a/src/main/java/com/labsynch/labseer/web/LabelKindController.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LabelKind;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = LabelKind.class)
-@Controller
-@RequestMapping("/labelkinds")
-@RooWebScaffold(path = "labelkinds", formBackingObject = LabelKind.class)
-@RooWebFinder
-public class LabelKindController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LabelKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LabelKindController_Roo_Controller.aj
deleted file mode 100755
index 34b859f11..000000000
--- a/src/main/java/com/labsynch/labseer/web/LabelKindController_Roo_Controller.aj
+++ /dev/null
@@ -1,102 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LabelKind;
-import com.labsynch.labseer.domain.LabelType;
-import com.labsynch.labseer.web.LabelKindController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect LabelKindController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String LabelKindController.create(@Valid LabelKind labelKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, labelKind);
-            return "labelkinds/create";
-        }
-        uiModel.asMap().clear();
-        labelKind.persist();
-        return "redirect:/labelkinds/" + encodeUrlPathSegment(labelKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String LabelKindController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new LabelKind());
-        return "labelkinds/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String LabelKindController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("labelkind", LabelKind.findLabelKind(id));
-        uiModel.addAttribute("itemId", id);
-        return "labelkinds/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String LabelKindController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("labelkinds", LabelKind.findLabelKindEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) LabelKind.countLabelKinds() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("labelkinds", LabelKind.findAllLabelKinds(sortFieldName, sortOrder));
-        }
-        return "labelkinds/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String LabelKindController.update(@Valid LabelKind labelKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, labelKind);
-            return "labelkinds/update";
-        }
-        uiModel.asMap().clear();
-        labelKind.merge();
-        return "redirect:/labelkinds/" + encodeUrlPathSegment(labelKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String LabelKindController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, LabelKind.findLabelKind(id));
-        return "labelkinds/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String LabelKindController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        LabelKind labelKind = LabelKind.findLabelKind(id);
-        labelKind.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/labelkinds";
-    }
-    
-    void LabelKindController.populateEditForm(Model uiModel, LabelKind labelKind) {
-        uiModel.addAttribute("labelKind", labelKind);
-        uiModel.addAttribute("labeltypes", LabelType.findAllLabelTypes());
-    }
-    
-    String LabelKindController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LabelKindController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/LabelKindController_Roo_Controller_Finder.aj
deleted file mode 100755
index 63b3abae9..000000000
--- a/src/main/java/com/labsynch/labseer/web/LabelKindController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,75 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LabelKind;
-import com.labsynch.labseer.domain.LabelType;
-import com.labsynch.labseer.web.LabelKindController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect LabelKindController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByKindNameEquals", "form" }, method = RequestMethod.GET)
-    public String LabelKindController.findLabelKindsByKindNameEqualsForm(Model uiModel) {
-        return "labelkinds/findLabelKindsByKindNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByKindNameEquals", method = RequestMethod.GET)
-    public String LabelKindController.findLabelKindsByKindNameEquals(@RequestParam("kindName") String kindName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("labelkinds", LabelKind.findLabelKindsByKindNameEquals(kindName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LabelKind.countFindLabelKindsByKindNameEquals(kindName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("labelkinds", LabelKind.findLabelKindsByKindNameEquals(kindName, sortFieldName, sortOrder).getResultList());
-        }
-        return "labelkinds/list";
-    }
-    
-    @RequestMapping(params = { "find=ByKindNameEqualsAndLsType", "form" }, method = RequestMethod.GET)
-    public String LabelKindController.findLabelKindsByKindNameEqualsAndLsTypeForm(Model uiModel) {
-        uiModel.addAttribute("labeltypes", LabelType.findAllLabelTypes());
-        return "labelkinds/findLabelKindsByKindNameEqualsAndLsType";
-    }
-    
-    @RequestMapping(params = "find=ByKindNameEqualsAndLsType", method = RequestMethod.GET)
-    public String LabelKindController.findLabelKindsByKindNameEqualsAndLsType(@RequestParam("kindName") String kindName, @RequestParam("lsType") LabelType lsType, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("labelkinds", LabelKind.findLabelKindsByKindNameEqualsAndLsType(kindName, lsType, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LabelKind.countFindLabelKindsByKindNameEqualsAndLsType(kindName, lsType) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("labelkinds", LabelKind.findLabelKindsByKindNameEqualsAndLsType(kindName, lsType, sortFieldName, sortOrder).getResultList());
-        }
-        return "labelkinds/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsType", "form" }, method = RequestMethod.GET)
-    public String LabelKindController.findLabelKindsByLsTypeForm(Model uiModel) {
-        uiModel.addAttribute("labeltypes", LabelType.findAllLabelTypes());
-        return "labelkinds/findLabelKindsByLsType";
-    }
-    
-    @RequestMapping(params = "find=ByLsType", method = RequestMethod.GET)
-    public String LabelKindController.findLabelKindsByLsType(@RequestParam("lsType") LabelType lsType, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("labelkinds", LabelKind.findLabelKindsByLsType(lsType, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LabelKind.countFindLabelKindsByLsType(lsType) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("labelkinds", LabelKind.findLabelKindsByLsType(lsType, sortFieldName, sortOrder).getResultList());
-        }
-        return "labelkinds/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LabelKindController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/LabelKindController_Roo_Controller_Json.aj
deleted file mode 100755
index 41f940663..000000000
--- a/src/main/java/com/labsynch/labseer/web/LabelKindController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,149 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LabelKind;
-import com.labsynch.labseer.domain.LabelType;
-import com.labsynch.labseer.web.LabelKindController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect LabelKindController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LabelKindController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            LabelKind labelKind = LabelKind.findLabelKind(id);
-            if (labelKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(labelKind.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LabelKindController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<LabelKind> result = LabelKind.findAllLabelKinds();
-            return new ResponseEntity<String>(LabelKind.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> LabelKindController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LabelKind labelKind = LabelKind.fromJsonToLabelKind(json);
-            labelKind.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+labelKind.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> LabelKindController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (LabelKind labelKind: LabelKind.fromJsonArrayToLabelKinds(json)) {
-                labelKind.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> LabelKindController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LabelKind labelKind = LabelKind.fromJsonToLabelKind(json);
-            labelKind.setId(id);
-            if (labelKind.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> LabelKindController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LabelKind labelKind = LabelKind.findLabelKind(id);
-            if (labelKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            labelKind.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByKindNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LabelKindController.jsonFindLabelKindsByKindNameEquals(@RequestParam("kindName") String kindName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LabelKind.toJsonArray(LabelKind.findLabelKindsByKindNameEquals(kindName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByKindNameEqualsAndLsType", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LabelKindController.jsonFindLabelKindsByKindNameEqualsAndLsType(@RequestParam("kindName") String kindName, @RequestParam("lsType") LabelType lsType) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LabelKind.toJsonArray(LabelKind.findLabelKindsByKindNameEqualsAndLsType(kindName, lsType).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsType", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LabelKindController.jsonFindLabelKindsByLsType(@RequestParam("lsType") LabelType lsType) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LabelKind.toJsonArray(LabelKind.findLabelKindsByLsType(lsType).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LabelSequenceController.java b/src/main/java/com/labsynch/labseer/web/LabelSequenceController.java
deleted file mode 100755
index 70e3255f8..000000000
--- a/src/main/java/com/labsynch/labseer/web/LabelSequenceController.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LabelSequence;
-import com.labsynch.labseer.dto.AutoLabelDTO;
-import com.labsynch.labseer.dto.LabelSequenceDTO;
-import com.labsynch.labseer.service.AutoLabelService;
-import java.util.Date;
-import java.util.List;
-import javax.persistence.NonUniqueResultException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = LabelSequence.class)
-@Controller
-@RequestMapping("/labelsequences")
-@RooWebScaffold(path = "labelsequences", formBackingObject = LabelSequence.class)
-@RooWebFinder
-public class LabelSequenceController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LabelSequenceController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LabelSequenceController_Roo_Controller.aj
deleted file mode 100755
index c6ae9013a..000000000
--- a/src/main/java/com/labsynch/labseer/web/LabelSequenceController_Roo_Controller.aj
+++ /dev/null
@@ -1,111 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LabelSequence;
-import com.labsynch.labseer.domain.LabelSequenceRole;
-import com.labsynch.labseer.web.LabelSequenceController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect LabelSequenceController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String LabelSequenceController.create(@Valid LabelSequence labelSequence, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, labelSequence);
-            return "labelsequences/create";
-        }
-        uiModel.asMap().clear();
-        labelSequence.persist();
-        return "redirect:/labelsequences/" + encodeUrlPathSegment(labelSequence.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String LabelSequenceController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new LabelSequence());
-        return "labelsequences/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String LabelSequenceController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("labelsequence", LabelSequence.findLabelSequence(id));
-        uiModel.addAttribute("itemId", id);
-        return "labelsequences/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String LabelSequenceController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("labelsequences", LabelSequence.findLabelSequenceEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) LabelSequence.countLabelSequences() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("labelsequences", LabelSequence.findAllLabelSequences(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "labelsequences/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String LabelSequenceController.update(@Valid LabelSequence labelSequence, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, labelSequence);
-            return "labelsequences/update";
-        }
-        uiModel.asMap().clear();
-        labelSequence.merge();
-        return "redirect:/labelsequences/" + encodeUrlPathSegment(labelSequence.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String LabelSequenceController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, LabelSequence.findLabelSequence(id));
-        return "labelsequences/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String LabelSequenceController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        LabelSequence labelSequence = LabelSequence.findLabelSequence(id);
-        labelSequence.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/labelsequences";
-    }
-    
-    void LabelSequenceController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("labelSequence_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void LabelSequenceController.populateEditForm(Model uiModel, LabelSequence labelSequence) {
-        uiModel.addAttribute("labelSequence", labelSequence);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("labelsequenceroles", LabelSequenceRole.findAllLabelSequenceRoles());
-    }
-    
-    String LabelSequenceController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LabelSequenceController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/LabelSequenceController_Roo_Controller_Finder.aj
deleted file mode 100755
index 946539f53..000000000
--- a/src/main/java/com/labsynch/labseer/web/LabelSequenceController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,95 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LabelSequence;
-import com.labsynch.labseer.web.LabelSequenceController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect LabelSequenceController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByLabelTypeAndKindEquals", "form" }, method = RequestMethod.GET)
-    public String LabelSequenceController.findLabelSequencesByLabelTypeAndKindEqualsForm(Model uiModel) {
-        return "labelsequences/findLabelSequencesByLabelTypeAndKindEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLabelTypeAndKindEquals", method = RequestMethod.GET)
-    public String LabelSequenceController.findLabelSequencesByLabelTypeAndKindEquals(@RequestParam("labelTypeAndKind") String labelTypeAndKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("labelsequences", LabelSequence.findLabelSequencesByLabelTypeAndKindEquals(labelTypeAndKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LabelSequence.countFindLabelSequencesByLabelTypeAndKindEquals(labelTypeAndKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("labelsequences", LabelSequence.findLabelSequencesByLabelTypeAndKindEquals(labelTypeAndKind, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "labelsequences/list";
-    }
-    
-    @RequestMapping(params = { "find=ByThingTypeAndKindEquals", "form" }, method = RequestMethod.GET)
-    public String LabelSequenceController.findLabelSequencesByThingTypeAndKindEqualsForm(Model uiModel) {
-        return "labelsequences/findLabelSequencesByThingTypeAndKindEquals";
-    }
-    
-    @RequestMapping(params = "find=ByThingTypeAndKindEquals", method = RequestMethod.GET)
-    public String LabelSequenceController.findLabelSequencesByThingTypeAndKindEquals(@RequestParam("thingTypeAndKind") String thingTypeAndKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("labelsequences", LabelSequence.findLabelSequencesByThingTypeAndKindEquals(thingTypeAndKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LabelSequence.countFindLabelSequencesByThingTypeAndKindEquals(thingTypeAndKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("labelsequences", LabelSequence.findLabelSequencesByThingTypeAndKindEquals(thingTypeAndKind, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "labelsequences/list";
-    }
-    
-    @RequestMapping(params = { "find=ByThingTypeAndKindEqualsAndLabelTypeAndKindEquals", "form" }, method = RequestMethod.GET)
-    public String LabelSequenceController.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsForm(Model uiModel) {
-        return "labelsequences/findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals";
-    }
-    
-    @RequestMapping(params = "find=ByThingTypeAndKindEqualsAndLabelTypeAndKindEquals", method = RequestMethod.GET)
-    public String LabelSequenceController.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(@RequestParam("thingTypeAndKind") String thingTypeAndKind, @RequestParam("labelTypeAndKind") String labelTypeAndKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("labelsequences", LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(thingTypeAndKind, labelTypeAndKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LabelSequence.countFindLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(thingTypeAndKind, labelTypeAndKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("labelsequences", LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(thingTypeAndKind, labelTypeAndKind, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "labelsequences/list";
-    }
-    
-    @RequestMapping(params = { "find=ByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals", "form" }, method = RequestMethod.GET)
-    public String LabelSequenceController.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEqualsForm(Model uiModel) {
-        return "labelsequences/findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals";
-    }
-    
-    @RequestMapping(params = "find=ByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals", method = RequestMethod.GET)
-    public String LabelSequenceController.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals(@RequestParam("thingTypeAndKind") String thingTypeAndKind, @RequestParam("labelTypeAndKind") String labelTypeAndKind, @RequestParam("labelPrefix") String labelPrefix, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("labelsequences", LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals(thingTypeAndKind, labelTypeAndKind, labelPrefix, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LabelSequence.countFindLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals(thingTypeAndKind, labelTypeAndKind, labelPrefix) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("labelsequences", LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals(thingTypeAndKind, labelTypeAndKind, labelPrefix, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "labelsequences/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LabelSequenceController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/LabelSequenceController_Roo_Controller_Json.aj
deleted file mode 100755
index f05fd407c..000000000
--- a/src/main/java/com/labsynch/labseer/web/LabelSequenceController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,160 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LabelSequence;
-import com.labsynch.labseer.web.LabelSequenceController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect LabelSequenceController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LabelSequenceController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            LabelSequence labelSequence = LabelSequence.findLabelSequence(id);
-            if (labelSequence == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(labelSequence.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LabelSequenceController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<LabelSequence> result = LabelSequence.findAllLabelSequences();
-            return new ResponseEntity<String>(LabelSequence.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> LabelSequenceController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LabelSequence labelSequence = LabelSequence.fromJsonToLabelSequence(json);
-            labelSequence.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+labelSequence.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> LabelSequenceController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (LabelSequence labelSequence: LabelSequence.fromJsonArrayToLabelSequences(json)) {
-                labelSequence.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> LabelSequenceController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LabelSequence labelSequence = LabelSequence.fromJsonToLabelSequence(json);
-            labelSequence.setId(id);
-            if (labelSequence.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> LabelSequenceController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LabelSequence labelSequence = LabelSequence.findLabelSequence(id);
-            if (labelSequence == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            labelSequence.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLabelTypeAndKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LabelSequenceController.jsonFindLabelSequencesByLabelTypeAndKindEquals(@RequestParam("labelTypeAndKind") String labelTypeAndKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LabelSequence.toJsonArray(LabelSequence.findLabelSequencesByLabelTypeAndKindEquals(labelTypeAndKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByThingTypeAndKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LabelSequenceController.jsonFindLabelSequencesByThingTypeAndKindEquals(@RequestParam("thingTypeAndKind") String thingTypeAndKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LabelSequence.toJsonArray(LabelSequence.findLabelSequencesByThingTypeAndKindEquals(thingTypeAndKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByThingTypeAndKindEqualsAndLabelTypeAndKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LabelSequenceController.jsonFindLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(@RequestParam("thingTypeAndKind") String thingTypeAndKind, @RequestParam("labelTypeAndKind") String labelTypeAndKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LabelSequence.toJsonArray(LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(thingTypeAndKind, labelTypeAndKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LabelSequenceController.jsonFindLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals(@RequestParam("thingTypeAndKind") String thingTypeAndKind, @RequestParam("labelTypeAndKind") String labelTypeAndKind, @RequestParam("labelPrefix") String labelPrefix) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LabelSequence.toJsonArray(LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals(thingTypeAndKind, labelTypeAndKind, labelPrefix).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LabelSequenceDTOController.java b/src/main/java/com/labsynch/labseer/web/LabelSequenceDTOController.java
deleted file mode 100755
index 8fc397bf8..000000000
--- a/src/main/java/com/labsynch/labseer/web/LabelSequenceDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.LabelSequenceDTO;
-
-@RooWebJson(jsonObject = LabelSequenceDTO.class)
-@Controller
-@RequestMapping("/labelsequencedto")
-public class LabelSequenceDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LabelSequenceRoleController.java b/src/main/java/com/labsynch/labseer/web/LabelSequenceRoleController.java
deleted file mode 100644
index 58663020e..000000000
--- a/src/main/java/com/labsynch/labseer/web/LabelSequenceRoleController.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LabelSequenceRole;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/labelsequenceroles")
-@Controller
-@RooWebScaffold(path = "labelsequenceroles", formBackingObject = LabelSequenceRole.class)
-public class LabelSequenceRoleController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LabelSequenceRoleController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LabelSequenceRoleController_Roo_Controller.aj
deleted file mode 100644
index db3a760ef..000000000
--- a/src/main/java/com/labsynch/labseer/web/LabelSequenceRoleController_Roo_Controller.aj
+++ /dev/null
@@ -1,114 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LabelSequence;
-import com.labsynch.labseer.domain.LabelSequenceRole;
-import com.labsynch.labseer.domain.LsRole;
-import com.labsynch.labseer.web.LabelSequenceRoleController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect LabelSequenceRoleController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String LabelSequenceRoleController.create(@Valid LabelSequenceRole labelSequenceRole, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, labelSequenceRole);
-            return "labelsequenceroles/create";
-        }
-        uiModel.asMap().clear();
-        labelSequenceRole.persist();
-        return "redirect:/labelsequenceroles/" + encodeUrlPathSegment(labelSequenceRole.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String LabelSequenceRoleController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new LabelSequenceRole());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (LabelSequence.countLabelSequences() == 0) {
-            dependencies.add(new String[] { "labelSequenceEntry", "labelsequences" });
-        }
-        if (LsRole.countLsRoles() == 0) {
-            dependencies.add(new String[] { "roleEntry", "lsroles" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "labelsequenceroles/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String LabelSequenceRoleController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("labelsequencerole", LabelSequenceRole.findLabelSequenceRole(id));
-        uiModel.addAttribute("itemId", id);
-        return "labelsequenceroles/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String LabelSequenceRoleController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("labelsequenceroles", LabelSequenceRole.findLabelSequenceRoleEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) LabelSequenceRole.countLabelSequenceRoles() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("labelsequenceroles", LabelSequenceRole.findAllLabelSequenceRoles(sortFieldName, sortOrder));
-        }
-        return "labelsequenceroles/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String LabelSequenceRoleController.update(@Valid LabelSequenceRole labelSequenceRole, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, labelSequenceRole);
-            return "labelsequenceroles/update";
-        }
-        uiModel.asMap().clear();
-        labelSequenceRole.merge();
-        return "redirect:/labelsequenceroles/" + encodeUrlPathSegment(labelSequenceRole.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String LabelSequenceRoleController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, LabelSequenceRole.findLabelSequenceRole(id));
-        return "labelsequenceroles/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String LabelSequenceRoleController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        LabelSequenceRole labelSequenceRole = LabelSequenceRole.findLabelSequenceRole(id);
-        labelSequenceRole.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/labelsequenceroles";
-    }
-    
-    void LabelSequenceRoleController.populateEditForm(Model uiModel, LabelSequenceRole labelSequenceRole) {
-        uiModel.addAttribute("labelSequenceRole", labelSequenceRole);
-        uiModel.addAttribute("labelsequences", LabelSequence.findAllLabelSequences());
-        uiModel.addAttribute("lsroles", LsRole.findAllLsRoles());
-    }
-    
-    String LabelSequenceRoleController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LabelTypeController.java b/src/main/java/com/labsynch/labseer/web/LabelTypeController.java
deleted file mode 100755
index e2895dfff..000000000
--- a/src/main/java/com/labsynch/labseer/web/LabelTypeController.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LabelType;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = LabelType.class)
-@Controller
-@RequestMapping("/labeltypes")
-@RooWebScaffold(path = "labeltypes", formBackingObject = LabelType.class)
-@RooWebFinder
-public class LabelTypeController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LabelTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LabelTypeController_Roo_Controller.aj
deleted file mode 100755
index 20a0c3792..000000000
--- a/src/main/java/com/labsynch/labseer/web/LabelTypeController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LabelType;
-import com.labsynch.labseer.web.LabelTypeController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect LabelTypeController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String LabelTypeController.create(@Valid LabelType labelType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, labelType);
-            return "labeltypes/create";
-        }
-        uiModel.asMap().clear();
-        labelType.persist();
-        return "redirect:/labeltypes/" + encodeUrlPathSegment(labelType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String LabelTypeController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new LabelType());
-        return "labeltypes/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String LabelTypeController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("labeltype", LabelType.findLabelType(id));
-        uiModel.addAttribute("itemId", id);
-        return "labeltypes/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String LabelTypeController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("labeltypes", LabelType.findLabelTypeEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) LabelType.countLabelTypes() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("labeltypes", LabelType.findAllLabelTypes(sortFieldName, sortOrder));
-        }
-        return "labeltypes/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String LabelTypeController.update(@Valid LabelType labelType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, labelType);
-            return "labeltypes/update";
-        }
-        uiModel.asMap().clear();
-        labelType.merge();
-        return "redirect:/labeltypes/" + encodeUrlPathSegment(labelType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String LabelTypeController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, LabelType.findLabelType(id));
-        return "labeltypes/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String LabelTypeController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        LabelType labelType = LabelType.findLabelType(id);
-        labelType.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/labeltypes";
-    }
-    
-    void LabelTypeController.populateEditForm(Model uiModel, LabelType labelType) {
-        uiModel.addAttribute("labelType", labelType);
-    }
-    
-    String LabelTypeController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LabelTypeController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/LabelTypeController_Roo_Controller_Finder.aj
deleted file mode 100755
index e7c3aefdb..000000000
--- a/src/main/java/com/labsynch/labseer/web/LabelTypeController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LabelType;
-import com.labsynch.labseer.web.LabelTypeController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect LabelTypeController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByTypeNameEquals", "form" }, method = RequestMethod.GET)
-    public String LabelTypeController.findLabelTypesByTypeNameEqualsForm(Model uiModel) {
-        return "labeltypes/findLabelTypesByTypeNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByTypeNameEquals", method = RequestMethod.GET)
-    public String LabelTypeController.findLabelTypesByTypeNameEquals(@RequestParam("typeName") String typeName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("labeltypes", LabelType.findLabelTypesByTypeNameEquals(typeName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LabelType.countFindLabelTypesByTypeNameEquals(typeName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("labeltypes", LabelType.findLabelTypesByTypeNameEquals(typeName, sortFieldName, sortOrder).getResultList());
-        }
-        return "labeltypes/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LabelTypeController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/LabelTypeController_Roo_Controller_Json.aj
deleted file mode 100755
index 02c0ac381..000000000
--- a/src/main/java/com/labsynch/labseer/web/LabelTypeController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,124 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LabelType;
-import com.labsynch.labseer.web.LabelTypeController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect LabelTypeController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LabelTypeController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            LabelType labelType = LabelType.findLabelType(id);
-            if (labelType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(labelType.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LabelTypeController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<LabelType> result = LabelType.findAllLabelTypes();
-            return new ResponseEntity<String>(LabelType.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> LabelTypeController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LabelType labelType = LabelType.fromJsonToLabelType(json);
-            labelType.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+labelType.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> LabelTypeController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (LabelType labelType: LabelType.fromJsonArrayToLabelTypes(json)) {
-                labelType.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> LabelTypeController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LabelType labelType = LabelType.fromJsonToLabelType(json);
-            labelType.setId(id);
-            if (labelType.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> LabelTypeController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LabelType labelType = LabelType.findLabelType(id);
-            if (labelType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            labelType.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByTypeNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LabelTypeController.jsonFindLabelTypesByTypeNameEquals(@RequestParam("typeName") String typeName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LabelType.toJsonArray(LabelType.findLabelTypesByTypeNameEquals(typeName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LotAliasController.java b/src/main/java/com/labsynch/labseer/web/LotAliasController.java
deleted file mode 100644
index 0a38940d4..000000000
--- a/src/main/java/com/labsynch/labseer/web/LotAliasController.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.labsynch.labseer.web;
-import javax.servlet.http.HttpServletRequest;
-
-
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.domain.LotAlias;
-
-@RequestMapping("/lotaliases")
-@Controller
-@RooWebScaffold(path = "lotaliases", formBackingObject = LotAlias.class)
-
-@RooWebJson(jsonObject = LotAlias.class)
-@RooWebFinder
-public class LotAliasController {
-	
-
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LotAliasController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LotAliasController_Roo_Controller.aj
deleted file mode 100644
index f10783cea..000000000
--- a/src/main/java/com/labsynch/labseer/web/LotAliasController_Roo_Controller.aj
+++ /dev/null
@@ -1,102 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.domain.LotAlias;
-import com.labsynch.labseer.web.LotAliasController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect LotAliasController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String LotAliasController.create(@Valid LotAlias lotAlias, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lotAlias);
-            return "lotaliases/create";
-        }
-        uiModel.asMap().clear();
-        lotAlias.persist();
-        return "redirect:/lotaliases/" + encodeUrlPathSegment(lotAlias.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String LotAliasController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new LotAlias());
-        return "lotaliases/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String LotAliasController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("lotalias", LotAlias.findLotAlias(id));
-        uiModel.addAttribute("itemId", id);
-        return "lotaliases/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String LotAliasController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lotaliases", LotAlias.findLotAliasEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) LotAlias.countLotAliases() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lotaliases", LotAlias.findAllLotAliases(sortFieldName, sortOrder));
-        }
-        return "lotaliases/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String LotAliasController.update(@Valid LotAlias lotAlias, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lotAlias);
-            return "lotaliases/update";
-        }
-        uiModel.asMap().clear();
-        lotAlias.merge();
-        return "redirect:/lotaliases/" + encodeUrlPathSegment(lotAlias.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String LotAliasController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, LotAlias.findLotAlias(id));
-        return "lotaliases/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String LotAliasController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        LotAlias lotAlias = LotAlias.findLotAlias(id);
-        lotAlias.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/lotaliases";
-    }
-    
-    void LotAliasController.populateEditForm(Model uiModel, LotAlias lotAlias) {
-        uiModel.addAttribute("lotAlias", lotAlias);
-        uiModel.addAttribute("lots", Lot.findAllLots());
-    }
-    
-    String LotAliasController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LotAliasController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/LotAliasController_Roo_Controller_Finder.aj
deleted file mode 100644
index a1ba5011f..000000000
--- a/src/main/java/com/labsynch/labseer/web/LotAliasController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,75 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.domain.LotAlias;
-import com.labsynch.labseer.web.LotAliasController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect LotAliasController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals", "form" }, method = RequestMethod.GET)
-    public String LotAliasController.findLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEqualsForm(Model uiModel) {
-        return "lotaliases/findLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals";
-    }
-    
-    @RequestMapping(params = "find=ByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals", method = RequestMethod.GET)
-    public String LotAliasController.findLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(@RequestParam("aliasName") String aliasName, @RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lotaliases", LotAlias.findLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(aliasName, lsType, lsKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LotAlias.countFindLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(aliasName, lsType, lsKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lotaliases", LotAlias.findLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(aliasName, lsType, lsKind, sortFieldName, sortOrder).getResultList());
-        }
-        return "lotaliases/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLot", "form" }, method = RequestMethod.GET)
-    public String LotAliasController.findLotAliasesByLotForm(Model uiModel) {
-        uiModel.addAttribute("lots", Lot.findAllLots());
-        return "lotaliases/findLotAliasesByLot";
-    }
-    
-    @RequestMapping(params = "find=ByLot", method = RequestMethod.GET)
-    public String LotAliasController.findLotAliasesByLot(@RequestParam("lot") Lot lot, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lotaliases", LotAlias.findLotAliasesByLot(lot, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LotAlias.countFindLotAliasesByLot(lot) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lotaliases", LotAlias.findLotAliasesByLot(lot, sortFieldName, sortOrder).getResultList());
-        }
-        return "lotaliases/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLotAndLsTypeEqualsAndLsKindEquals", "form" }, method = RequestMethod.GET)
-    public String LotAliasController.findLotAliasesByLotAndLsTypeEqualsAndLsKindEqualsForm(Model uiModel) {
-        uiModel.addAttribute("lots", Lot.findAllLots());
-        return "lotaliases/findLotAliasesByLotAndLsTypeEqualsAndLsKindEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLotAndLsTypeEqualsAndLsKindEquals", method = RequestMethod.GET)
-    public String LotAliasController.findLotAliasesByLotAndLsTypeEqualsAndLsKindEquals(@RequestParam("lot") Lot lot, @RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lotaliases", LotAlias.findLotAliasesByLotAndLsTypeEqualsAndLsKindEquals(lot, lsType, lsKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LotAlias.countFindLotAliasesByLotAndLsTypeEqualsAndLsKindEquals(lot, lsType, lsKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lotaliases", LotAlias.findLotAliasesByLotAndLsTypeEqualsAndLsKindEquals(lot, lsType, lsKind, sortFieldName, sortOrder).getResultList());
-        }
-        return "lotaliases/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LotAliasController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/LotAliasController_Roo_Controller_Json.aj
deleted file mode 100644
index 30706e114..000000000
--- a/src/main/java/com/labsynch/labseer/web/LotAliasController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,149 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.domain.LotAlias;
-import com.labsynch.labseer.web.LotAliasController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect LotAliasController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LotAliasController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            LotAlias lotAlias = LotAlias.findLotAlias(id);
-            if (lotAlias == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(lotAlias.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LotAliasController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<LotAlias> result = LotAlias.findAllLotAliases();
-            return new ResponseEntity<String>(LotAlias.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> LotAliasController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LotAlias lotAlias = LotAlias.fromJsonToLotAlias(json);
-            lotAlias.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+lotAlias.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> LotAliasController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (LotAlias lotAlias: LotAlias.fromJsonArrayToLotAliases(json)) {
-                lotAlias.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> LotAliasController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LotAlias lotAlias = LotAlias.fromJsonToLotAlias(json);
-            lotAlias.setId(id);
-            if (lotAlias.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> LotAliasController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LotAlias lotAlias = LotAlias.findLotAlias(id);
-            if (lotAlias == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            lotAlias.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LotAliasController.jsonFindLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(@RequestParam("aliasName") String aliasName, @RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LotAlias.toJsonArray(LotAlias.findLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(aliasName, lsType, lsKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLot", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LotAliasController.jsonFindLotAliasesByLot(@RequestParam("lot") Lot lot) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LotAlias.toJsonArray(LotAlias.findLotAliasesByLot(lot).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLotAndLsTypeEqualsAndLsKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LotAliasController.jsonFindLotAliasesByLotAndLsTypeEqualsAndLsKindEquals(@RequestParam("lot") Lot lot, @RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LotAlias.toJsonArray(LotAlias.findLotAliasesByLotAndLsTypeEqualsAndLsKindEquals(lot, lsType, lsKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LotAliasKindController.java b/src/main/java/com/labsynch/labseer/web/LotAliasKindController.java
deleted file mode 100644
index d3fceeaa7..000000000
--- a/src/main/java/com/labsynch/labseer/web/LotAliasKindController.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package com.labsynch.labseer.web;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-import com.labsynch.labseer.domain.LotAliasKind;
-
-@RooWebScaffold(path = "lotaliaskinds", formBackingObject = LotAliasKind.class)
-@RequestMapping("/lotaliaskinds")
-@Controller
-@Transactional
-
-@RooWebFinder
-@RooWebJson(jsonObject = LotAliasKind.class)
-public class LotAliasKindController {
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        headers.add("Content-Kind", "application/json; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Kind");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
-        try {
-            LotAliasKind lotAliasKind = LotAliasKind.findLotAliasKind(id);
-            if (lotAliasKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(lotAliasKind.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":" + e.getMessage() + "\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        headers.add("Content-Kind", "application/json; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Kind");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
-        try {
-            List<LotAliasKind> result = LotAliasKind.findAllLotAliasKinds();
-            return new ResponseEntity<String>(LotAliasKind.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":" + e.getMessage() + "\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        headers.add("Content-Kind", "application/json; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Kind");
-        headers.add("Access-Control-Allow-Origin", "*");
-        try {
-            LotAliasKind lotAliasKind = LotAliasKind.fromJsonToLotAliasKind(json);
-            lotAliasKind.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location", uriBuilder.path(a.value()[0] + "/" + lotAliasKind.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(lotAliasKind.toJson(), headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":" + e.getMessage() + "\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        headers.add("Content-Kind", "application/json; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Kind");
-        headers.add("Access-Control-Allow-Origin", "*");
-        Collection<LotAliasKind> lotAliasKinds = new HashSet<LotAliasKind>();
-        try {
-            for (LotAliasKind lotAliasKind : LotAliasKind.fromJsonArrayToLotAliasKinds(json)) {
-                lotAliasKind.persist();
-                lotAliasKinds.add(lotAliasKind);
-            }
-            return new ResponseEntity<String>(LotAliasKind.toJsonArray(lotAliasKinds), headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":" + e.getMessage() + "\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        headers.add("Content-Kind", "application/json; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Kind");
-        headers.add("Access-Control-Allow-Origin", "*");
-        try {
-            LotAliasKind lotAliasKind = LotAliasKind.fromJsonToLotAliasKind(json);
-            lotAliasKind.setId(id);
-            if (lotAliasKind.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(lotAliasKind.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":" + e.getMessage() + "\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        headers.add("Content-Kind", "application/json; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Kind");
-        headers.add("Access-Control-Allow-Origin", "*");
-        try {
-            LotAliasKind lotAliasKind = LotAliasKind.findLotAliasKind(id);
-            if (lotAliasKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            lotAliasKind.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":" + e.getMessage() + "\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    @RequestMapping(method = RequestMethod.OPTIONS)
-    public ResponseEntity<String> getIsotopeOptions() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Kind", "application/json");
-        headers.add("Access-Control-Allow-Headers", "Content-Kind");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
-        headers.setExpires(0); // Expire the cache
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LotAliasKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LotAliasKindController_Roo_Controller.aj
deleted file mode 100644
index e2ade5a79..000000000
--- a/src/main/java/com/labsynch/labseer/web/LotAliasKindController_Roo_Controller.aj
+++ /dev/null
@@ -1,109 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LotAliasKind;
-import com.labsynch.labseer.domain.LotAliasType;
-import com.labsynch.labseer.web.LotAliasKindController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect LotAliasKindController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String LotAliasKindController.create(@Valid LotAliasKind lotAliasKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lotAliasKind);
-            return "lotaliaskinds/create";
-        }
-        uiModel.asMap().clear();
-        lotAliasKind.persist();
-        return "redirect:/lotaliaskinds/" + encodeUrlPathSegment(lotAliasKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String LotAliasKindController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new LotAliasKind());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (LotAliasType.countLotAliasTypes() == 0) {
-            dependencies.add(new String[] { "lsType", "lotaliastypes" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "lotaliaskinds/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String LotAliasKindController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("lotaliaskind", LotAliasKind.findLotAliasKind(id));
-        uiModel.addAttribute("itemId", id);
-        return "lotaliaskinds/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String LotAliasKindController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lotaliaskinds", LotAliasKind.findLotAliasKindEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) LotAliasKind.countLotAliasKinds() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lotaliaskinds", LotAliasKind.findAllLotAliasKinds(sortFieldName, sortOrder));
-        }
-        return "lotaliaskinds/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String LotAliasKindController.update(@Valid LotAliasKind lotAliasKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lotAliasKind);
-            return "lotaliaskinds/update";
-        }
-        uiModel.asMap().clear();
-        lotAliasKind.merge();
-        return "redirect:/lotaliaskinds/" + encodeUrlPathSegment(lotAliasKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String LotAliasKindController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, LotAliasKind.findLotAliasKind(id));
-        return "lotaliaskinds/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String LotAliasKindController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        LotAliasKind lotAliasKind = LotAliasKind.findLotAliasKind(id);
-        lotAliasKind.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/lotaliaskinds";
-    }
-    
-    void LotAliasKindController.populateEditForm(Model uiModel, LotAliasKind lotAliasKind) {
-        uiModel.addAttribute("lotAliasKind", lotAliasKind);
-        uiModel.addAttribute("lotaliastypes", LotAliasType.findAllLotAliasTypes());
-    }
-    
-    String LotAliasKindController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LotAliasTypeController.java b/src/main/java/com/labsynch/labseer/web/LotAliasTypeController.java
deleted file mode 100644
index 841623bd6..000000000
--- a/src/main/java/com/labsynch/labseer/web/LotAliasTypeController.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package com.labsynch.labseer.web;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-import com.labsynch.labseer.domain.LotAliasType;
-
-@RooWebScaffold(path = "lotaliastypes", formBackingObject = LotAliasType.class)
-@RequestMapping("/lotaliastypes")
-@Controller
-@Transactional
-
-@RooWebFinder
-@RooWebJson(jsonObject = LotAliasType.class)
-public class LotAliasTypeController {
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Kind", "application/json; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Kind");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
-        headers.setExpires(0); // Expire the cache
-        try {
-            LotAliasType lotAliasType = LotAliasType.findLotAliasType(id);
-            if (lotAliasType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(lotAliasType.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":" + e.getMessage() + "\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        headers.add("Content-Kind", "application/json; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Kind");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
-        headers.setExpires(0); // Expire the cache
-        try {
-            List<LotAliasType> result = LotAliasType.findAllLotAliasTypes();
-            return new ResponseEntity<String>(LotAliasType.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":" + e.getMessage() + "\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        headers.add("Content-Kind", "application/json; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Kind");
-        headers.add("Access-Control-Allow-Origin", "*");
-        try {
-            LotAliasType lotAliasType = LotAliasType.fromJsonToLotAliasType(json);
-            lotAliasType.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location", uriBuilder.path(a.value()[0] + "/" + lotAliasType.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(lotAliasType.toJson(), headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":" + e.getMessage() + "\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        headers.add("Content-Kind", "application/json; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Kind");
-        headers.add("Access-Control-Allow-Origin", "*");
-        Collection<LotAliasType> lotAliasTypes = new HashSet<LotAliasType>();
-        try {
-            for (LotAliasType lotAliasType : LotAliasType.fromJsonArrayToLotAliasTypes(json)) {
-                lotAliasType.persist();
-                lotAliasTypes.add(lotAliasType);
-            }
-            return new ResponseEntity<String>(LotAliasType.toJsonArray(lotAliasTypes), headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":" + e.getMessage() + "\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        headers.add("Content-Kind", "application/json; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Kind");
-        headers.add("Access-Control-Allow-Origin", "*");
-        try {
-            LotAliasType lotAliasType = LotAliasType.fromJsonToLotAliasType(json);
-            lotAliasType.setId(id);
-            if (lotAliasType.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(lotAliasType.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":" + e.getMessage() + "\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        headers.add("Content-Kind", "application/json; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Kind");
-        headers.add("Access-Control-Allow-Origin", "*");
-        try {
-            LotAliasType lotAliasType = LotAliasType.findLotAliasType(id);
-            if (lotAliasType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            lotAliasType.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":" + e.getMessage() + "\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    @RequestMapping(method = RequestMethod.OPTIONS)
-    public ResponseEntity<String> getIsotopeOptions() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Kind", "application/json");
-        headers.add("Access-Control-Allow-Headers", "Content-Kind");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
-        headers.setExpires(0); // Expire the cache
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LotAliasTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LotAliasTypeController_Roo_Controller.aj
deleted file mode 100644
index b78c73dcb..000000000
--- a/src/main/java/com/labsynch/labseer/web/LotAliasTypeController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LotAliasType;
-import com.labsynch.labseer.web.LotAliasTypeController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect LotAliasTypeController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String LotAliasTypeController.create(@Valid LotAliasType lotAliasType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lotAliasType);
-            return "lotaliastypes/create";
-        }
-        uiModel.asMap().clear();
-        lotAliasType.persist();
-        return "redirect:/lotaliastypes/" + encodeUrlPathSegment(lotAliasType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String LotAliasTypeController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new LotAliasType());
-        return "lotaliastypes/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String LotAliasTypeController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("lotaliastype", LotAliasType.findLotAliasType(id));
-        uiModel.addAttribute("itemId", id);
-        return "lotaliastypes/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String LotAliasTypeController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lotaliastypes", LotAliasType.findLotAliasTypeEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) LotAliasType.countLotAliasTypes() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lotaliastypes", LotAliasType.findAllLotAliasTypes(sortFieldName, sortOrder));
-        }
-        return "lotaliastypes/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String LotAliasTypeController.update(@Valid LotAliasType lotAliasType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lotAliasType);
-            return "lotaliastypes/update";
-        }
-        uiModel.asMap().clear();
-        lotAliasType.merge();
-        return "redirect:/lotaliastypes/" + encodeUrlPathSegment(lotAliasType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String LotAliasTypeController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, LotAliasType.findLotAliasType(id));
-        return "lotaliastypes/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String LotAliasTypeController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        LotAliasType lotAliasType = LotAliasType.findLotAliasType(id);
-        lotAliasType.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/lotaliastypes";
-    }
-    
-    void LotAliasTypeController.populateEditForm(Model uiModel, LotAliasType lotAliasType) {
-        uiModel.addAttribute("lotAliasType", lotAliasType);
-    }
-    
-    String LotAliasTypeController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LotController.java b/src/main/java/com/labsynch/labseer/web/LotController.java
deleted file mode 100755
index 9abc9ac37..000000000
--- a/src/main/java/com/labsynch/labseer/web/LotController.java
+++ /dev/null
@@ -1,412 +0,0 @@
-package com.labsynch.labseer.web;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-import com.labsynch.labseer.domain.BulkLoadFile;
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.domain.Operator;
-import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.domain.PhysicalState;
-import com.labsynch.labseer.domain.PurityMeasuredBy;
-import com.labsynch.labseer.domain.SaltForm;
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.SolutionUnit;
-import com.labsynch.labseer.domain.Unit;
-import com.labsynch.labseer.domain.Vendor;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-
-//import org.joda.time.DateTime;
-//import org.springframework.format.annotation.DateTimeFormat;
-//@RooWebScaffold(path = "lots", formBackingObject = Lot.class)
-@RequestMapping("/lots")
-@Controller
-@Transactional
-@RooWebScaffold(path = "lots", formBackingObject = Lot.class)
-@RooWebFinder
-//@RooWebFinder
-public class LotController {
-
-    Logger logger = LoggerFactory.getLogger(LotController.class);
-
-    @RequestMapping(method = RequestMethod.POST)
-    public String create(@Valid Lot lot, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            uiModel.addAttribute("lot", lot);
-            addDateTimeFormatPatterns(uiModel);
-            return "lots/create";
-        }
-        uiModel.asMap().clear();
-        lot.persist();
-        return "redirect:/lots/" + encodeUrlPathSegment(lot.getId().toString(), httpServletRequest);
-    }
-
-    @RequestMapping(params = "form", method = RequestMethod.GET)
-    public String createForm(Model uiModel) {
-        uiModel.addAttribute("lot", new Lot());
-        addDateTimeFormatPatterns(uiModel);
-        return "lots/create";
-    }
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
-    public String show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        Lot lot = Lot.findLot(id);
-        uiModel.addAttribute("lot", lot);
-        uiModel.addAttribute("itemId", id);
-        uiModel.addAttribute("parent", lot.getSaltForm().getParent());
-        List<SaltForm> saltForms = new ArrayList<SaltForm>();
-        saltForms.add(lot.getSaltForm());
-        uiModel.addAttribute("saltforms", saltForms);
-        return "lots/show";
-    }
-
-    @Transactional
-    @RequestMapping(method = RequestMethod.GET)
-    public String list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            uiModel.addAttribute("lots", Lot.findLotEntries(page == null ? 0 : (page.intValue() - 1) * sizeNo, sizeNo));
-            float nrOfPages = (float) Lot.countLots() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lots", Lot.findLotEntries(0, 10));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lots/list";
-    }
-
-    @Transactional
-    @RequestMapping(method = RequestMethod.PUT)
-    public String update(@Valid Lot lot, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            uiModel.addAttribute("lot", lot);
-            logger.debug("ERROR lot: " + lot.toJson());
-            SaltForm saltForm = lot.getSaltForm();
-            Parent parent = saltForm.getParent();
-            uiModel.addAttribute("parent", parent);
-            List<SaltForm> saltForms = new ArrayList<SaltForm>();
-            saltForms.add(lot.getSaltForm());
-            uiModel.addAttribute("saltforms", saltForms);
-            addDateTimeFormatPatterns(uiModel);
-            return "lots/update";
-        }
-        uiModel.asMap().clear();
-        logger.debug("before merging the lot data back");
-        lot.merge();
-        return "redirect:/lots/" + encodeUrlPathSegment(lot.getId().toString(), httpServletRequest);
-    }
-
-    @Transactional
-    @RequestMapping(value = "/{id}", params = "form", method = RequestMethod.GET)
-    public String updateForm(@PathVariable("id") Long id, Model uiModel) {
-        Lot lot = Lot.findLot(id);
-        uiModel.addAttribute("lot", lot);
-        SaltForm saltForm = lot.getSaltForm();
-        Parent parent = saltForm.getParent();
-        uiModel.addAttribute("parent", parent);
-        List<SaltForm> saltForms = new ArrayList<SaltForm>();
-        saltForms.add(Lot.findLot(id).getSaltForm());
-        uiModel.addAttribute("saltforms", saltForms);
-        addDateTimeFormatPatterns(uiModel);
-        return "lots/update";
-    }
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-    public String delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        Lot.findLot(id).remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/lots";
-    }
-
-    //	@ModelAttribute("lots")
-    //    public Collection<Lot> populateLots() {
-    //        return Lot.findLotEntries(0, 2);
-    //    }
-    //
-    //    @ModelAttribute("parents")
-    //    public Collection<Parent> populateParents() {
-    //        return Parent.findParentEntries(0, 2);
-    //    }
-    //
-    //    @ModelAttribute("filelists")
-    //    public Collection<FileList> populateFileLists() {
-    //        return FileList.findFileListEntries(0, 2);
-    //    }
-    void addDateTimeFormatPatterns(Model uiModel) {
-        //        uiModel.addAttribute("lot_synthesisdate_date_format", DateTimeFormat.patternForStyle("S-", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("lot_synthesisdate_date_format", DateTimeFormat.patternForStyle("S-", LocaleContextHolder.getLocale()));
-    }
-
-    String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
-        Lot lot = Lot.findLot(id);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text; charset=utf-8");
-        if (lot == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        //        return new ResponseEntity<String>(lot.toJson(), headers, HttpStatus.OK);
-        return showJson(lot.getId());
-    }
-
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text; charset=utf-8");
-        return new ResponseEntity<String>(Lot.toJsonArray(Lot.findAllLots()), headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> createFromJson(@RequestBody String json) {
-        Lot lot = Lot.fromJsonToLot(json);
-        lot.persist();
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Access-Control-Allow-Headers", "Content-Type");
-        return showJson(lot.getId());
-    }
-
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> createFromJsonArray(@RequestBody String json) {
-        for (Lot lot : Lot.fromJsonArrayToLots(json)) {
-            lot.persist();
-        }
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text");
-        return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-    }
-
-    @RequestMapping(method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> updateFromJson(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text");
-        if (Lot.fromJsonToLot(json).merge() == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> updateFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text");
-        for (Lot lot : Lot.fromJsonArrayToLots(json)) {
-            if (lot.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-        }
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
-        Lot lot = Lot.findLot(id);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text");
-        if (lot == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        lot.remove();
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-
-    @ModelAttribute("operators")
-    public Collection<Operator> populateOperators() {
-        return Operator.findAllOperators();
-    }
-
-    @ModelAttribute("physicalstates")
-    public Collection<PhysicalState> populatePhysicalStates() {
-        return PhysicalState.findAllPhysicalStates();
-    }
-
-    @ModelAttribute("puritymeasuredbys")
-    public Collection<PurityMeasuredBy> populatePurityMeasuredBys() {
-        return PurityMeasuredBy.findAllPurityMeasuredBys();
-    }
-
-    @ModelAttribute("solutionunits")
-    public Collection<SolutionUnit> populateSolutionUnits() {
-        return SolutionUnit.findAllSolutionUnits();
-    }
-
-    @ModelAttribute("units")
-    public Collection<Unit> populateUnits() {
-        return Unit.findAllUnits();
-    }
-
-    @ModelAttribute("vendors")
-    public Collection<Vendor> populateVendors() {
-        return Vendor.findAllVendors();
-    }
-
-    @RequestMapping(params = { "find=ByBuid", "form" }, method = RequestMethod.GET)
-    public String findLotsByBuidForm(Model uiModel) {
-        return "lots/findLotsByBuid";
-    }
-
-    @RequestMapping(params = "find=ByBuid", method = RequestMethod.GET)
-    public String findLotsByBuid(@RequestParam("buid") long buid, Model uiModel) {
-        uiModel.addAttribute("lots", Lot.findLotsByBuid(buid).getResultList());
-        return "lots/list";
-    }
-
-    @RequestMapping(params = { "find=ByChemistAndSynthesisDateBetween", "form" }, method = RequestMethod.GET)
-    public String findLotsByChemistAndSynthesisDateBetweenForm(Model uiModel) {
-        uiModel.addAttribute("scientists", Author.findAllAuthors());
-        addDateTimeFormatPatterns(uiModel);
-        return "lots/findLotsByChemistAndSynthesisDateBetween";
-    }
-
-    @RequestMapping(params = "find=ByChemistAndSynthesisDateBetween", method = RequestMethod.GET)
-    public String findLotsByChemistAndSynthesisDateBetween(@RequestParam("chemist") Author chemist, @RequestParam("minSynthesisDate") Date minSynthesisDate, @RequestParam("maxSynthesisDate") Date maxSynthesisDate, Model uiModel) {
-        uiModel.addAttribute("lots", Lot.findLotsByChemistAndSynthesisDateBetween(chemist.getUserName(), minSynthesisDate, maxSynthesisDate).getResultList());
-        addDateTimeFormatPatterns(uiModel);
-        return "lots/list";
-    }
-
-    @RequestMapping(params = { "find=ByCorpNameEquals", "form" }, method = RequestMethod.GET)
-    public String findLotsByCorpNameEqualsForm(Model uiModel) {
-        return "lots/findLotsByCorpNameEquals";
-    }
-
-    @RequestMapping(params = "find=ByCorpNameEquals", method = RequestMethod.GET)
-    public String findLotsByCorpNameEquals(@RequestParam("corpName") String corpName, Model uiModel) {
-        uiModel.addAttribute("lots", Lot.findLotsByCorpNameEquals(corpName).getResultList());
-        return "lots/list";
-    }
-
-    @RequestMapping(params = { "find=ByCorpNameLike", "form" }, method = RequestMethod.GET)
-    public String findLotsByCorpNameLikeForm(Model uiModel) {
-        return "lots/findLotsByCorpNameLike";
-    }
-
-    @RequestMapping(params = "find=ByCorpNameLike", method = RequestMethod.GET)
-    public String findLotsByCorpNameLike(@RequestParam("corpName") String corpName, Model uiModel) {
-        uiModel.addAttribute("lots", Lot.findLotsByCorpNameLike(corpName).getResultList());
-        return "lots/list";
-    }
-
-    @RequestMapping(params = { "find=ByIsVirtualNot", "form" }, method = RequestMethod.GET)
-    public String findLotsByIsVirtualNotForm(Model uiModel) {
-        return "lots/findLotsByIsVirtualNot";
-    }
-
-    @RequestMapping(params = "find=ByIsVirtualNot", method = RequestMethod.GET)
-    public String findLotsByIsVirtualNot(@RequestParam(value = "isVirtual", required = false) Boolean isVirtual, Model uiModel) {
-        uiModel.addAttribute("lots", Lot.findLotsByIsVirtualNot(isVirtual == null ? new Boolean(false) : isVirtual).getResultList());
-        return "lots/list";
-    }
-
-    @RequestMapping(params = { "find=ByNotebookPageEquals", "form" }, method = RequestMethod.GET)
-    public String findLotsByNotebookPageEqualsForm(Model uiModel) {
-        return "lots/findLotsByNotebookPageEquals";
-    }
-
-    @RequestMapping(params = "find=ByNotebookPageEquals", method = RequestMethod.GET)
-    public String findLotsByNotebookPageEquals(@RequestParam("notebookPage") String notebookPage, Model uiModel) {
-        uiModel.addAttribute("lots", Lot.findLotsByNotebookPageEquals(notebookPage).getResultList());
-        return "lots/list";
-    }
-
-    @RequestMapping(params = { "find=ByNotebookPageEqualsAndIgnoreNot", "form" }, method = RequestMethod.GET)
-    public String findLotsByNotebookPageEqualsAndIgnoreNotForm(Model uiModel) {
-        return "lots/findLotsByNotebookPageEqualsAndIgnoreNot";
-    }
-
-    @RequestMapping(params = "find=ByNotebookPageEqualsAndIgnoreNot", method = RequestMethod.GET)
-    public String findLotsByNotebookPageEqualsAndIgnoreNot(@RequestParam("notebookPage") String notebookPage, @RequestParam(value = "ignore", required = false) Boolean ignore, Model uiModel) {
-        uiModel.addAttribute("lots", Lot.findLotsByNotebookPageEqualsAndIgnoreNot(notebookPage, ignore == null ? new Boolean(false) : ignore).getResultList());
-        return "lots/list";
-    }
-
-    @RequestMapping(params = { "find=BySaltForm", "form" }, method = RequestMethod.GET)
-    public String findLotsBySaltFormForm(Model uiModel) {
-        uiModel.addAttribute("saltforms", SaltForm.findAllSaltForms());
-        return "lots/findLotsBySaltForm";
-    }
-
-    @RequestMapping(params = "find=BySaltForm", method = RequestMethod.GET)
-    public String findLotsBySaltForm(@RequestParam("saltForm") SaltForm saltForm, Model uiModel) {
-        uiModel.addAttribute("lots", Lot.findLotsBySaltForm(saltForm).getResultList());
-        return "lots/list";
-    }
-
-    @RequestMapping(params = { "find=BySynthesisDateBetween", "form" }, method = RequestMethod.GET)
-    public String findLotsBySynthesisDateBetweenForm(Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        return "lots/findLotsBySynthesisDateBetween";
-    }
-
-    @RequestMapping(params = "find=BySynthesisDateBetween", method = RequestMethod.GET)
-    public String findLotsBySynthesisDateBetween(@RequestParam("minSynthesisDate") Date minSynthesisDate, @RequestParam("maxSynthesisDate") Date maxSynthesisDate, Model uiModel) {
-        uiModel.addAttribute("lots", Lot.findLotsBySynthesisDateBetween(minSynthesisDate, maxSynthesisDate).getResultList());
-        addDateTimeFormatPatterns(uiModel);
-        return "lots/list";
-    }
-
-    @RequestMapping(params = { "find=BySynthesisDateGreaterThan", "form" }, method = RequestMethod.GET)
-    public String findLotsBySynthesisDateGreaterThanForm(Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        return "lots/findLotsBySynthesisDateGreaterThan";
-    }
-
-    @RequestMapping(params = "find=BySynthesisDateGreaterThan", method = RequestMethod.GET)
-    public String findLotsBySynthesisDateGreaterThan(@RequestParam("synthesisDate") Date synthesisDate, Model uiModel) {
-        uiModel.addAttribute("lots", Lot.findLotsBySynthesisDateGreaterThan(synthesisDate).getResultList());
-        addDateTimeFormatPatterns(uiModel);
-        return "lots/list";
-    }
-
-    @RequestMapping(params = { "find=BySynthesisDateLessThan", "form" }, method = RequestMethod.GET)
-    public String findLotsBySynthesisDateLessThanForm(Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        return "lots/findLotsBySynthesisDateLessThan";
-    }
-
-    @RequestMapping(params = "find=BySynthesisDateLessThan", method = RequestMethod.GET)
-    public String findLotsBySynthesisDateLessThan(@RequestParam("synthesisDate") Date synthesisDate, Model uiModel) {
-        uiModel.addAttribute("lots", Lot.findLotsBySynthesisDateLessThan(synthesisDate).getResultList());
-        addDateTimeFormatPatterns(uiModel);
-        return "lots/list";
-    }
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LotController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LotController_Roo_Controller.aj
deleted file mode 100644
index faf995e65..000000000
--- a/src/main/java/com/labsynch/labseer/web/LotController_Roo_Controller.aj
+++ /dev/null
@@ -1,37 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.BulkLoadFile;
-import com.labsynch.labseer.domain.FileList;
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.domain.LotAlias;
-import com.labsynch.labseer.domain.Operator;
-import com.labsynch.labseer.domain.PhysicalState;
-import com.labsynch.labseer.domain.PurityMeasuredBy;
-import com.labsynch.labseer.domain.SaltForm;
-import com.labsynch.labseer.domain.SolutionUnit;
-import com.labsynch.labseer.domain.Unit;
-import com.labsynch.labseer.domain.Vendor;
-import com.labsynch.labseer.web.LotController;
-import org.springframework.ui.Model;
-
-privileged aspect LotController_Roo_Controller {
-    
-    void LotController.populateEditForm(Model uiModel, Lot lot) {
-        uiModel.addAttribute("lot", lot);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("bulkloadfiles", BulkLoadFile.findAllBulkLoadFiles());
-        uiModel.addAttribute("filelists", FileList.findAllFileLists());
-        uiModel.addAttribute("lotaliases", LotAlias.findAllLotAliases());
-        uiModel.addAttribute("operators", Operator.findAllOperators());
-        uiModel.addAttribute("physicalstates", PhysicalState.findAllPhysicalStates());
-        uiModel.addAttribute("puritymeasuredbys", PurityMeasuredBy.findAllPurityMeasuredBys());
-        uiModel.addAttribute("saltforms", SaltForm.findAllSaltForms());
-        uiModel.addAttribute("solutionunits", SolutionUnit.findAllSolutionUnits());
-        uiModel.addAttribute("units", Unit.findAllUnits());
-        uiModel.addAttribute("vendors", Vendor.findAllVendors());
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsInteractionController.java b/src/main/java/com/labsynch/labseer/web/LsInteractionController.java
deleted file mode 100755
index 0ecf09581..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsInteractionController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsInteraction;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = LsInteraction.class)
-@Controller
-@RequestMapping("/lsinteractions")
-@RooWebScaffold(path = "lsinteractions", formBackingObject = LsInteraction.class)
-public class LsInteractionController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsInteractionController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsInteractionController_Roo_Controller.aj
deleted file mode 100755
index c44b7aca2..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsInteractionController_Roo_Controller.aj
+++ /dev/null
@@ -1,112 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsInteraction;
-import com.labsynch.labseer.domain.ThingPage;
-import com.labsynch.labseer.web.LsInteractionController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect LsInteractionController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String LsInteractionController.create(@Valid LsInteraction lsInteraction, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsInteraction);
-            return "lsinteractions/create";
-        }
-        uiModel.asMap().clear();
-        lsInteraction.persist();
-        return "redirect:/lsinteractions/" + encodeUrlPathSegment(lsInteraction.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String LsInteractionController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new LsInteraction());
-        return "lsinteractions/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String LsInteractionController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("lsinteraction", LsInteraction.findLsInteraction(id));
-        uiModel.addAttribute("itemId", id);
-        return "lsinteractions/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String LsInteractionController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsinteractions", LsInteraction.findLsInteractionEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) LsInteraction.countLsInteractions() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsinteractions", LsInteraction.findAllLsInteractions(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsinteractions/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String LsInteractionController.update(@Valid LsInteraction lsInteraction, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsInteraction);
-            return "lsinteractions/update";
-        }
-        uiModel.asMap().clear();
-        lsInteraction.merge();
-        return "redirect:/lsinteractions/" + encodeUrlPathSegment(lsInteraction.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String LsInteractionController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, LsInteraction.findLsInteraction(id));
-        return "lsinteractions/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String LsInteractionController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        LsInteraction lsInteraction = LsInteraction.findLsInteraction(id);
-        lsInteraction.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/lsinteractions";
-    }
-    
-    void LsInteractionController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("lsInteraction_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("lsInteraction_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void LsInteractionController.populateEditForm(Model uiModel, LsInteraction lsInteraction) {
-        uiModel.addAttribute("lsInteraction", lsInteraction);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("thingpages", ThingPage.findAllThingPages());
-    }
-    
-    String LsInteractionController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsInteractionController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/LsInteractionController_Roo_Controller_Json.aj
deleted file mode 100644
index aa234dfc4..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsInteractionController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,111 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsInteraction;
-import com.labsynch.labseer.web.LsInteractionController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect LsInteractionController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsInteractionController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            LsInteraction lsInteraction = LsInteraction.findLsInteraction(id);
-            if (lsInteraction == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(lsInteraction.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsInteractionController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<LsInteraction> result = LsInteraction.findAllLsInteractions();
-            return new ResponseEntity<String>(LsInteraction.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> LsInteractionController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LsInteraction lsInteraction = LsInteraction.fromJsonToLsInteraction(json);
-            lsInteraction.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+lsInteraction.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> LsInteractionController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (LsInteraction lsInteraction: LsInteraction.fromJsonArrayToLsInteractions(json)) {
-                lsInteraction.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> LsInteractionController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LsInteraction lsInteraction = LsInteraction.fromJsonToLsInteraction(json);
-            lsInteraction.setId(id);
-            if (lsInteraction.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> LsInteractionController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LsInteraction lsInteraction = LsInteraction.findLsInteraction(id);
-            if (lsInteraction == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            lsInteraction.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsRoleController.java b/src/main/java/com/labsynch/labseer/web/LsRoleController.java
deleted file mode 100755
index 8f30dbae4..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsRoleController.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.AuthorRole;
-import com.labsynch.labseer.domain.LsRole;
-import com.labsynch.labseer.domain.RoleKind;
-import com.labsynch.labseer.domain.RoleType;
-import com.labsynch.labseer.service.AnalysisGroupServiceImpl;
-import java.io.UnsupportedEncodingException;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-@RooWebJson(jsonObject = LsRole.class)
-@RequestMapping("/lsroles")
-@Controller
-@RooWebScaffold(path = "lsroles", formBackingObject = LsRole.class)
-@RooWebFinder
-public class LsRoleController {
-
-    private static final Logger logger = LoggerFactory.getLogger(LsRoleController.class);
-
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String create(@Valid LsRole lsRole, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsRole);
-            return "lsroles/create";
-        }
-        uiModel.asMap().clear();
-        lsRole.persist();
-        return "redirect:/lsroles/" + encodeUrlPathSegment(lsRole.getId().toString(), httpServletRequest);
-    }
-
-    @RequestMapping(params = "form", produces = "text/html")
-    public String createForm(Model uiModel) {
-        populateEditForm(uiModel, new LsRole());
-        uiModel.addAttribute("lstypes", RoleType.findAllRoleTypes());
-        uiModel.addAttribute("lskinds", RoleKind.findAllRoleKinds());
-        return "lsroles/create";
-    }
-
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("lsrole", LsRole.findLsRole(id));
-        uiModel.addAttribute("itemId", id);
-        return "lsroles/show";
-    }
-
-    @RequestMapping(produces = "text/html")
-    public String list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsroles", LsRole.findLsRoleEntries(firstResult, sizeNo));
-            float nrOfPages = (float) LsRole.countLsRoles() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsroles", LsRole.findAllLsRoles());
-        }
-        return "lsroles/list";
-    }
-
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String update(@Valid LsRole lsRole, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsRole);
-            return "lsroles/update";
-        }
-        uiModel.asMap().clear();
-        lsRole.merge();
-        return "redirect:/lsroles/" + encodeUrlPathSegment(lsRole.getId().toString(), httpServletRequest);
-    }
-
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, LsRole.findLsRole(id));
-        return "lsroles/update";
-    }
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        LsRole lsRole = LsRole.findLsRole(id);
-        lsRole.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/lsroles";
-    }
-
-    void populateEditForm(Model uiModel, LsRole lsRole) {
-        uiModel.addAttribute("lsRole", lsRole);
-        uiModel.addAttribute("authorroles", AuthorRole.findAllAuthorRoles());
-        uiModel.addAttribute("collectiontypes", RoleType.findAllRoleTypes());
-        uiModel.addAttribute("collectionkinds", RoleKind.findAllRoleKinds());
-    }
-
-    String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsRoleController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/LsRoleController_Roo_Controller_Finder.aj
deleted file mode 100644
index e4a8df209..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsRoleController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,129 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsRole;
-import com.labsynch.labseer.web.LsRoleController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect LsRoleController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByLsKindEquals", "form" }, method = RequestMethod.GET)
-    public String LsRoleController.findLsRolesByLsKindEqualsForm(Model uiModel) {
-        return "lsroles/findLsRolesByLsKindEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEquals", method = RequestMethod.GET)
-    public String LsRoleController.findLsRolesByLsKindEquals(@RequestParam("lsKind") String lsKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsroles", LsRole.findLsRolesByLsKindEquals(lsKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsRole.countFindLsRolesByLsKindEquals(lsKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsroles", LsRole.findLsRolesByLsKindEquals(lsKind, sortFieldName, sortOrder).getResultList());
-        }
-        return "lsroles/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeEquals", "form" }, method = RequestMethod.GET)
-    public String LsRoleController.findLsRolesByLsTypeEqualsForm(Model uiModel) {
-        return "lsroles/findLsRolesByLsTypeEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEquals", method = RequestMethod.GET)
-    public String LsRoleController.findLsRolesByLsTypeEquals(@RequestParam("lsType") String lsType, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsroles", LsRole.findLsRolesByLsTypeEquals(lsType, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsRole.countFindLsRolesByLsTypeEquals(lsType) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsroles", LsRole.findLsRolesByLsTypeEquals(lsType, sortFieldName, sortOrder).getResultList());
-        }
-        return "lsroles/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeEqualsAndLsKindEquals", "form" }, method = RequestMethod.GET)
-    public String LsRoleController.findLsRolesByLsTypeEqualsAndLsKindEqualsForm(Model uiModel) {
-        return "lsroles/findLsRolesByLsTypeEqualsAndLsKindEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEquals", method = RequestMethod.GET)
-    public String LsRoleController.findLsRolesByLsTypeEqualsAndLsKindEquals(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsroles", LsRole.findLsRolesByLsTypeEqualsAndLsKindEquals(lsType, lsKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsRole.countFindLsRolesByLsTypeEqualsAndLsKindEquals(lsType, lsKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsroles", LsRole.findLsRolesByLsTypeEqualsAndLsKindEquals(lsType, lsKind, sortFieldName, sortOrder).getResultList());
-        }
-        return "lsroles/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals", "form" }, method = RequestMethod.GET)
-    public String LsRoleController.findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEqualsForm(Model uiModel) {
-        return "lsroles/findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals", method = RequestMethod.GET)
-    public String LsRoleController.findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind, @RequestParam("roleName") String roleName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsroles", LsRole.findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals(lsType, lsKind, roleName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsRole.countFindLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals(lsType, lsKind, roleName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsroles", LsRole.findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals(lsType, lsKind, roleName, sortFieldName, sortOrder).getResultList());
-        }
-        return "lsroles/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeEqualsAndRoleNameEquals", "form" }, method = RequestMethod.GET)
-    public String LsRoleController.findLsRolesByLsTypeEqualsAndRoleNameEqualsForm(Model uiModel) {
-        return "lsroles/findLsRolesByLsTypeEqualsAndRoleNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndRoleNameEquals", method = RequestMethod.GET)
-    public String LsRoleController.findLsRolesByLsTypeEqualsAndRoleNameEquals(@RequestParam("lsType") String lsType, @RequestParam("roleName") String roleName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsroles", LsRole.findLsRolesByLsTypeEqualsAndRoleNameEquals(lsType, roleName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsRole.countFindLsRolesByLsTypeEqualsAndRoleNameEquals(lsType, roleName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsroles", LsRole.findLsRolesByLsTypeEqualsAndRoleNameEquals(lsType, roleName, sortFieldName, sortOrder).getResultList());
-        }
-        return "lsroles/list";
-    }
-    
-    @RequestMapping(params = { "find=ByRoleNameEquals", "form" }, method = RequestMethod.GET)
-    public String LsRoleController.findLsRolesByRoleNameEqualsForm(Model uiModel) {
-        return "lsroles/findLsRolesByRoleNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByRoleNameEquals", method = RequestMethod.GET)
-    public String LsRoleController.findLsRolesByRoleNameEquals(@RequestParam("roleName") String roleName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsroles", LsRole.findLsRolesByRoleNameEquals(roleName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsRole.countFindLsRolesByRoleNameEquals(roleName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsroles", LsRole.findLsRolesByRoleNameEquals(roleName, sortFieldName, sortOrder).getResultList());
-        }
-        return "lsroles/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsRoleController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/LsRoleController_Roo_Controller_Json.aj
deleted file mode 100755
index a66be980e..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsRoleController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,184 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsRole;
-import com.labsynch.labseer.web.LsRoleController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect LsRoleController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsRoleController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            LsRole lsRole = LsRole.findLsRole(id);
-            if (lsRole == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(lsRole.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsRoleController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<LsRole> result = LsRole.findAllLsRoles();
-            return new ResponseEntity<String>(LsRole.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> LsRoleController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LsRole lsRole = LsRole.fromJsonToLsRole(json);
-            lsRole.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+lsRole.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> LsRoleController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (LsRole lsRole: LsRole.fromJsonArrayToLsRoles(json)) {
-                lsRole.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> LsRoleController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LsRole lsRole = LsRole.fromJsonToLsRole(json);
-            lsRole.setId(id);
-            if (lsRole.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> LsRoleController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LsRole lsRole = LsRole.findLsRole(id);
-            if (lsRole == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            lsRole.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsRoleController.jsonFindLsRolesByLsKindEquals(@RequestParam("lsKind") String lsKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsRole.toJsonArray(LsRole.findLsRolesByLsKindEquals(lsKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsRoleController.jsonFindLsRolesByLsTypeEquals(@RequestParam("lsType") String lsType) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsRole.toJsonArray(LsRole.findLsRolesByLsTypeEquals(lsType).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsRoleController.jsonFindLsRolesByLsTypeEqualsAndLsKindEquals(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsRole.toJsonArray(LsRole.findLsRolesByLsTypeEqualsAndLsKindEquals(lsType, lsKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsRoleController.jsonFindLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind, @RequestParam("roleName") String roleName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsRole.toJsonArray(LsRole.findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals(lsType, lsKind, roleName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndRoleNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsRoleController.jsonFindLsRolesByLsTypeEqualsAndRoleNameEquals(@RequestParam("lsType") String lsType, @RequestParam("roleName") String roleName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsRole.toJsonArray(LsRole.findLsRolesByLsTypeEqualsAndRoleNameEquals(lsType, roleName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByRoleNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsRoleController.jsonFindLsRolesByRoleNameEquals(@RequestParam("roleName") String roleName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsRole.toJsonArray(LsRole.findLsRolesByRoleNameEquals(roleName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqAnlGrpController.java b/src/main/java/com/labsynch/labseer/web/LsSeqAnlGrpController.java
deleted file mode 100644
index d1f7e0b50..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsSeqAnlGrpController.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsSeqAnlGrp;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/lsseqanlgrps")
-@Controller
-@RooWebScaffold(path = "lsseqanlgrps", formBackingObject = LsSeqAnlGrp.class)
-public class LsSeqAnlGrpController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqAnlGrpController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsSeqAnlGrpController_Roo_Controller.aj
deleted file mode 100644
index 9aa8ba003..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsSeqAnlGrpController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsSeqAnlGrp;
-import com.labsynch.labseer.web.LsSeqAnlGrpController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect LsSeqAnlGrpController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String LsSeqAnlGrpController.create(@Valid LsSeqAnlGrp lsSeqAnlGrp, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsSeqAnlGrp);
-            return "lsseqanlgrps/create";
-        }
-        uiModel.asMap().clear();
-        lsSeqAnlGrp.persist();
-        return "redirect:/lsseqanlgrps/" + encodeUrlPathSegment(lsSeqAnlGrp.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String LsSeqAnlGrpController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new LsSeqAnlGrp());
-        return "lsseqanlgrps/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String LsSeqAnlGrpController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("lsseqanlgrp", LsSeqAnlGrp.findLsSeqAnlGrp(id));
-        uiModel.addAttribute("itemId", id);
-        return "lsseqanlgrps/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String LsSeqAnlGrpController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsseqanlgrps", LsSeqAnlGrp.findLsSeqAnlGrpEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) LsSeqAnlGrp.countLsSeqAnlGrps() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsseqanlgrps", LsSeqAnlGrp.findAllLsSeqAnlGrps(sortFieldName, sortOrder));
-        }
-        return "lsseqanlgrps/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String LsSeqAnlGrpController.update(@Valid LsSeqAnlGrp lsSeqAnlGrp, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsSeqAnlGrp);
-            return "lsseqanlgrps/update";
-        }
-        uiModel.asMap().clear();
-        lsSeqAnlGrp.merge();
-        return "redirect:/lsseqanlgrps/" + encodeUrlPathSegment(lsSeqAnlGrp.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String LsSeqAnlGrpController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, LsSeqAnlGrp.findLsSeqAnlGrp(id));
-        return "lsseqanlgrps/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String LsSeqAnlGrpController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        LsSeqAnlGrp lsSeqAnlGrp = LsSeqAnlGrp.findLsSeqAnlGrp(id);
-        lsSeqAnlGrp.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/lsseqanlgrps";
-    }
-    
-    void LsSeqAnlGrpController.populateEditForm(Model uiModel, LsSeqAnlGrp lsSeqAnlGrp) {
-        uiModel.addAttribute("lsSeqAnlGrp", lsSeqAnlGrp);
-    }
-    
-    String LsSeqAnlGrpController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqContainerController.java b/src/main/java/com/labsynch/labseer/web/LsSeqContainerController.java
deleted file mode 100644
index 4894c6ff9..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsSeqContainerController.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsSeqContainer;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/lsseqcontainers")
-@Controller
-@RooWebScaffold(path = "lsseqcontainers", formBackingObject = LsSeqContainer.class)
-public class LsSeqContainerController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqContainerController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsSeqContainerController_Roo_Controller.aj
deleted file mode 100644
index 33352ed8d..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsSeqContainerController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsSeqContainer;
-import com.labsynch.labseer.web.LsSeqContainerController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect LsSeqContainerController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String LsSeqContainerController.create(@Valid LsSeqContainer lsSeqContainer, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsSeqContainer);
-            return "lsseqcontainers/create";
-        }
-        uiModel.asMap().clear();
-        lsSeqContainer.persist();
-        return "redirect:/lsseqcontainers/" + encodeUrlPathSegment(lsSeqContainer.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String LsSeqContainerController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new LsSeqContainer());
-        return "lsseqcontainers/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String LsSeqContainerController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("lsseqcontainer", LsSeqContainer.findLsSeqContainer(id));
-        uiModel.addAttribute("itemId", id);
-        return "lsseqcontainers/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String LsSeqContainerController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsseqcontainers", LsSeqContainer.findLsSeqContainerEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) LsSeqContainer.countLsSeqContainers() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsseqcontainers", LsSeqContainer.findAllLsSeqContainers(sortFieldName, sortOrder));
-        }
-        return "lsseqcontainers/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String LsSeqContainerController.update(@Valid LsSeqContainer lsSeqContainer, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsSeqContainer);
-            return "lsseqcontainers/update";
-        }
-        uiModel.asMap().clear();
-        lsSeqContainer.merge();
-        return "redirect:/lsseqcontainers/" + encodeUrlPathSegment(lsSeqContainer.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String LsSeqContainerController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, LsSeqContainer.findLsSeqContainer(id));
-        return "lsseqcontainers/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String LsSeqContainerController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        LsSeqContainer lsSeqContainer = LsSeqContainer.findLsSeqContainer(id);
-        lsSeqContainer.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/lsseqcontainers";
-    }
-    
-    void LsSeqContainerController.populateEditForm(Model uiModel, LsSeqContainer lsSeqContainer) {
-        uiModel.addAttribute("lsSeqContainer", lsSeqContainer);
-    }
-    
-    String LsSeqContainerController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqExptController.java b/src/main/java/com/labsynch/labseer/web/LsSeqExptController.java
deleted file mode 100644
index 76b3ce92e..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsSeqExptController.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsSeqExpt;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/lsseqexpts")
-@Controller
-@RooWebScaffold(path = "lsseqexpts", formBackingObject = LsSeqExpt.class)
-public class LsSeqExptController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqExptController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsSeqExptController_Roo_Controller.aj
deleted file mode 100644
index f0f52d852..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsSeqExptController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsSeqExpt;
-import com.labsynch.labseer.web.LsSeqExptController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect LsSeqExptController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String LsSeqExptController.create(@Valid LsSeqExpt lsSeqExpt, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsSeqExpt);
-            return "lsseqexpts/create";
-        }
-        uiModel.asMap().clear();
-        lsSeqExpt.persist();
-        return "redirect:/lsseqexpts/" + encodeUrlPathSegment(lsSeqExpt.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String LsSeqExptController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new LsSeqExpt());
-        return "lsseqexpts/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String LsSeqExptController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("lsseqexpt", LsSeqExpt.findLsSeqExpt(id));
-        uiModel.addAttribute("itemId", id);
-        return "lsseqexpts/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String LsSeqExptController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsseqexpts", LsSeqExpt.findLsSeqExptEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) LsSeqExpt.countLsSeqExpts() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsseqexpts", LsSeqExpt.findAllLsSeqExpts(sortFieldName, sortOrder));
-        }
-        return "lsseqexpts/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String LsSeqExptController.update(@Valid LsSeqExpt lsSeqExpt, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsSeqExpt);
-            return "lsseqexpts/update";
-        }
-        uiModel.asMap().clear();
-        lsSeqExpt.merge();
-        return "redirect:/lsseqexpts/" + encodeUrlPathSegment(lsSeqExpt.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String LsSeqExptController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, LsSeqExpt.findLsSeqExpt(id));
-        return "lsseqexpts/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String LsSeqExptController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        LsSeqExpt lsSeqExpt = LsSeqExpt.findLsSeqExpt(id);
-        lsSeqExpt.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/lsseqexpts";
-    }
-    
-    void LsSeqExptController.populateEditForm(Model uiModel, LsSeqExpt lsSeqExpt) {
-        uiModel.addAttribute("lsSeqExpt", lsSeqExpt);
-    }
-    
-    String LsSeqExptController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqItxCntrCntrController.java b/src/main/java/com/labsynch/labseer/web/LsSeqItxCntrCntrController.java
deleted file mode 100644
index acc6c1482..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsSeqItxCntrCntrController.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsSeqItxCntrCntr;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/lsseqitxcntrcntrs")
-@Controller
-@RooWebScaffold(path = "lsseqitxcntrcntrs", formBackingObject = LsSeqItxCntrCntr.class)
-public class LsSeqItxCntrCntrController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqItxCntrCntrController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsSeqItxCntrCntrController_Roo_Controller.aj
deleted file mode 100644
index 58a54c0c7..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsSeqItxCntrCntrController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsSeqItxCntrCntr;
-import com.labsynch.labseer.web.LsSeqItxCntrCntrController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect LsSeqItxCntrCntrController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String LsSeqItxCntrCntrController.create(@Valid LsSeqItxCntrCntr lsSeqItxCntrCntr, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsSeqItxCntrCntr);
-            return "lsseqitxcntrcntrs/create";
-        }
-        uiModel.asMap().clear();
-        lsSeqItxCntrCntr.persist();
-        return "redirect:/lsseqitxcntrcntrs/" + encodeUrlPathSegment(lsSeqItxCntrCntr.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String LsSeqItxCntrCntrController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new LsSeqItxCntrCntr());
-        return "lsseqitxcntrcntrs/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String LsSeqItxCntrCntrController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("lsseqitxcntrcntr", LsSeqItxCntrCntr.findLsSeqItxCntrCntr(id));
-        uiModel.addAttribute("itemId", id);
-        return "lsseqitxcntrcntrs/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String LsSeqItxCntrCntrController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsseqitxcntrcntrs", LsSeqItxCntrCntr.findLsSeqItxCntrCntrEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) LsSeqItxCntrCntr.countLsSeqItxCntrCntrs() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsseqitxcntrcntrs", LsSeqItxCntrCntr.findAllLsSeqItxCntrCntrs(sortFieldName, sortOrder));
-        }
-        return "lsseqitxcntrcntrs/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String LsSeqItxCntrCntrController.update(@Valid LsSeqItxCntrCntr lsSeqItxCntrCntr, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsSeqItxCntrCntr);
-            return "lsseqitxcntrcntrs/update";
-        }
-        uiModel.asMap().clear();
-        lsSeqItxCntrCntr.merge();
-        return "redirect:/lsseqitxcntrcntrs/" + encodeUrlPathSegment(lsSeqItxCntrCntr.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String LsSeqItxCntrCntrController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, LsSeqItxCntrCntr.findLsSeqItxCntrCntr(id));
-        return "lsseqitxcntrcntrs/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String LsSeqItxCntrCntrController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        LsSeqItxCntrCntr lsSeqItxCntrCntr = LsSeqItxCntrCntr.findLsSeqItxCntrCntr(id);
-        lsSeqItxCntrCntr.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/lsseqitxcntrcntrs";
-    }
-    
-    void LsSeqItxCntrCntrController.populateEditForm(Model uiModel, LsSeqItxCntrCntr lsSeqItxCntrCntr) {
-        uiModel.addAttribute("lsSeqItxCntrCntr", lsSeqItxCntrCntr);
-    }
-    
-    String LsSeqItxCntrCntrController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqItxExperimentExperimentController.java b/src/main/java/com/labsynch/labseer/web/LsSeqItxExperimentExperimentController.java
deleted file mode 100644
index f58cfe4f0..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsSeqItxExperimentExperimentController.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsSeqItxExperimentExperiment;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/lsseqitxexperimentexperiments")
-@Controller
-@RooWebScaffold(path = "lsseqitxexperimentexperiments", formBackingObject = LsSeqItxExperimentExperiment.class)
-public class LsSeqItxExperimentExperimentController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqItxExperimentExperimentController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsSeqItxExperimentExperimentController_Roo_Controller.aj
deleted file mode 100644
index 82c3cbe19..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsSeqItxExperimentExperimentController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsSeqItxExperimentExperiment;
-import com.labsynch.labseer.web.LsSeqItxExperimentExperimentController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect LsSeqItxExperimentExperimentController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String LsSeqItxExperimentExperimentController.create(@Valid LsSeqItxExperimentExperiment lsSeqItxExperimentExperiment, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsSeqItxExperimentExperiment);
-            return "lsseqitxexperimentexperiments/create";
-        }
-        uiModel.asMap().clear();
-        lsSeqItxExperimentExperiment.persist();
-        return "redirect:/lsseqitxexperimentexperiments/" + encodeUrlPathSegment(lsSeqItxExperimentExperiment.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String LsSeqItxExperimentExperimentController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new LsSeqItxExperimentExperiment());
-        return "lsseqitxexperimentexperiments/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String LsSeqItxExperimentExperimentController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("lsseqitxexperimentexperiment", LsSeqItxExperimentExperiment.findLsSeqItxExperimentExperiment(id));
-        uiModel.addAttribute("itemId", id);
-        return "lsseqitxexperimentexperiments/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String LsSeqItxExperimentExperimentController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsseqitxexperimentexperiments", LsSeqItxExperimentExperiment.findLsSeqItxExperimentExperimentEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) LsSeqItxExperimentExperiment.countLsSeqItxExperimentExperiments() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsseqitxexperimentexperiments", LsSeqItxExperimentExperiment.findAllLsSeqItxExperimentExperiments(sortFieldName, sortOrder));
-        }
-        return "lsseqitxexperimentexperiments/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String LsSeqItxExperimentExperimentController.update(@Valid LsSeqItxExperimentExperiment lsSeqItxExperimentExperiment, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsSeqItxExperimentExperiment);
-            return "lsseqitxexperimentexperiments/update";
-        }
-        uiModel.asMap().clear();
-        lsSeqItxExperimentExperiment.merge();
-        return "redirect:/lsseqitxexperimentexperiments/" + encodeUrlPathSegment(lsSeqItxExperimentExperiment.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String LsSeqItxExperimentExperimentController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, LsSeqItxExperimentExperiment.findLsSeqItxExperimentExperiment(id));
-        return "lsseqitxexperimentexperiments/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String LsSeqItxExperimentExperimentController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        LsSeqItxExperimentExperiment lsSeqItxExperimentExperiment = LsSeqItxExperimentExperiment.findLsSeqItxExperimentExperiment(id);
-        lsSeqItxExperimentExperiment.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/lsseqitxexperimentexperiments";
-    }
-    
-    void LsSeqItxExperimentExperimentController.populateEditForm(Model uiModel, LsSeqItxExperimentExperiment lsSeqItxExperimentExperiment) {
-        uiModel.addAttribute("lsSeqItxExperimentExperiment", lsSeqItxExperimentExperiment);
-    }
-    
-    String LsSeqItxExperimentExperimentController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqItxLsThingLsThingController.java b/src/main/java/com/labsynch/labseer/web/LsSeqItxLsThingLsThingController.java
deleted file mode 100644
index 9d06de9a4..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsSeqItxLsThingLsThingController.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsSeqItxLsThingLsThing;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/lsseqitxlsthinglsthings")
-@Controller
-@RooWebScaffold(path = "lsseqitxlsthinglsthings", formBackingObject = LsSeqItxLsThingLsThing.class)
-public class LsSeqItxLsThingLsThingController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqItxLsThingLsThingController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsSeqItxLsThingLsThingController_Roo_Controller.aj
deleted file mode 100644
index 71d31c696..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsSeqItxLsThingLsThingController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsSeqItxLsThingLsThing;
-import com.labsynch.labseer.web.LsSeqItxLsThingLsThingController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect LsSeqItxLsThingLsThingController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String LsSeqItxLsThingLsThingController.create(@Valid LsSeqItxLsThingLsThing lsSeqItxLsThingLsThing, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsSeqItxLsThingLsThing);
-            return "lsseqitxlsthinglsthings/create";
-        }
-        uiModel.asMap().clear();
-        lsSeqItxLsThingLsThing.persist();
-        return "redirect:/lsseqitxlsthinglsthings/" + encodeUrlPathSegment(lsSeqItxLsThingLsThing.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String LsSeqItxLsThingLsThingController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new LsSeqItxLsThingLsThing());
-        return "lsseqitxlsthinglsthings/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String LsSeqItxLsThingLsThingController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("lsseqitxlsthinglsthing", LsSeqItxLsThingLsThing.findLsSeqItxLsThingLsThing(id));
-        uiModel.addAttribute("itemId", id);
-        return "lsseqitxlsthinglsthings/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String LsSeqItxLsThingLsThingController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsseqitxlsthinglsthings", LsSeqItxLsThingLsThing.findLsSeqItxLsThingLsThingEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) LsSeqItxLsThingLsThing.countLsSeqItxLsThingLsThings() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsseqitxlsthinglsthings", LsSeqItxLsThingLsThing.findAllLsSeqItxLsThingLsThings(sortFieldName, sortOrder));
-        }
-        return "lsseqitxlsthinglsthings/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String LsSeqItxLsThingLsThingController.update(@Valid LsSeqItxLsThingLsThing lsSeqItxLsThingLsThing, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsSeqItxLsThingLsThing);
-            return "lsseqitxlsthinglsthings/update";
-        }
-        uiModel.asMap().clear();
-        lsSeqItxLsThingLsThing.merge();
-        return "redirect:/lsseqitxlsthinglsthings/" + encodeUrlPathSegment(lsSeqItxLsThingLsThing.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String LsSeqItxLsThingLsThingController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, LsSeqItxLsThingLsThing.findLsSeqItxLsThingLsThing(id));
-        return "lsseqitxlsthinglsthings/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String LsSeqItxLsThingLsThingController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        LsSeqItxLsThingLsThing lsSeqItxLsThingLsThing = LsSeqItxLsThingLsThing.findLsSeqItxLsThingLsThing(id);
-        lsSeqItxLsThingLsThing.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/lsseqitxlsthinglsthings";
-    }
-    
-    void LsSeqItxLsThingLsThingController.populateEditForm(Model uiModel, LsSeqItxLsThingLsThing lsSeqItxLsThingLsThing) {
-        uiModel.addAttribute("lsSeqItxLsThingLsThing", lsSeqItxLsThingLsThing);
-    }
-    
-    String LsSeqItxLsThingLsThingController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqItxProtocolProtocolController.java b/src/main/java/com/labsynch/labseer/web/LsSeqItxProtocolProtocolController.java
deleted file mode 100644
index ad21354a9..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsSeqItxProtocolProtocolController.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsSeqItxProtocolProtocol;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/lsseqitxprotocolprotocols")
-@Controller
-@RooWebScaffold(path = "lsseqitxprotocolprotocols", formBackingObject = LsSeqItxProtocolProtocol.class)
-public class LsSeqItxProtocolProtocolController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqItxProtocolProtocolController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsSeqItxProtocolProtocolController_Roo_Controller.aj
deleted file mode 100644
index bf9e47cf2..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsSeqItxProtocolProtocolController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsSeqItxProtocolProtocol;
-import com.labsynch.labseer.web.LsSeqItxProtocolProtocolController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect LsSeqItxProtocolProtocolController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String LsSeqItxProtocolProtocolController.create(@Valid LsSeqItxProtocolProtocol lsSeqItxProtocolProtocol, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsSeqItxProtocolProtocol);
-            return "lsseqitxprotocolprotocols/create";
-        }
-        uiModel.asMap().clear();
-        lsSeqItxProtocolProtocol.persist();
-        return "redirect:/lsseqitxprotocolprotocols/" + encodeUrlPathSegment(lsSeqItxProtocolProtocol.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String LsSeqItxProtocolProtocolController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new LsSeqItxProtocolProtocol());
-        return "lsseqitxprotocolprotocols/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String LsSeqItxProtocolProtocolController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("lsseqitxprotocolprotocol", LsSeqItxProtocolProtocol.findLsSeqItxProtocolProtocol(id));
-        uiModel.addAttribute("itemId", id);
-        return "lsseqitxprotocolprotocols/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String LsSeqItxProtocolProtocolController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsseqitxprotocolprotocols", LsSeqItxProtocolProtocol.findLsSeqItxProtocolProtocolEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) LsSeqItxProtocolProtocol.countLsSeqItxProtocolProtocols() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsseqitxprotocolprotocols", LsSeqItxProtocolProtocol.findAllLsSeqItxProtocolProtocols(sortFieldName, sortOrder));
-        }
-        return "lsseqitxprotocolprotocols/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String LsSeqItxProtocolProtocolController.update(@Valid LsSeqItxProtocolProtocol lsSeqItxProtocolProtocol, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsSeqItxProtocolProtocol);
-            return "lsseqitxprotocolprotocols/update";
-        }
-        uiModel.asMap().clear();
-        lsSeqItxProtocolProtocol.merge();
-        return "redirect:/lsseqitxprotocolprotocols/" + encodeUrlPathSegment(lsSeqItxProtocolProtocol.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String LsSeqItxProtocolProtocolController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, LsSeqItxProtocolProtocol.findLsSeqItxProtocolProtocol(id));
-        return "lsseqitxprotocolprotocols/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String LsSeqItxProtocolProtocolController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        LsSeqItxProtocolProtocol lsSeqItxProtocolProtocol = LsSeqItxProtocolProtocol.findLsSeqItxProtocolProtocol(id);
-        lsSeqItxProtocolProtocol.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/lsseqitxprotocolprotocols";
-    }
-    
-    void LsSeqItxProtocolProtocolController.populateEditForm(Model uiModel, LsSeqItxProtocolProtocol lsSeqItxProtocolProtocol) {
-        uiModel.addAttribute("lsSeqItxProtocolProtocol", lsSeqItxProtocolProtocol);
-    }
-    
-    String LsSeqItxProtocolProtocolController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqItxSubjCntrController.java b/src/main/java/com/labsynch/labseer/web/LsSeqItxSubjCntrController.java
deleted file mode 100644
index a23914bf0..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsSeqItxSubjCntrController.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsSeqItxSubjCntr;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/lsseqitxsubjcntrs")
-@Controller
-@RooWebScaffold(path = "lsseqitxsubjcntrs", formBackingObject = LsSeqItxSubjCntr.class)
-public class LsSeqItxSubjCntrController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqItxSubjCntrController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsSeqItxSubjCntrController_Roo_Controller.aj
deleted file mode 100644
index 1415386a9..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsSeqItxSubjCntrController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsSeqItxSubjCntr;
-import com.labsynch.labseer.web.LsSeqItxSubjCntrController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect LsSeqItxSubjCntrController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String LsSeqItxSubjCntrController.create(@Valid LsSeqItxSubjCntr lsSeqItxSubjCntr, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsSeqItxSubjCntr);
-            return "lsseqitxsubjcntrs/create";
-        }
-        uiModel.asMap().clear();
-        lsSeqItxSubjCntr.persist();
-        return "redirect:/lsseqitxsubjcntrs/" + encodeUrlPathSegment(lsSeqItxSubjCntr.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String LsSeqItxSubjCntrController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new LsSeqItxSubjCntr());
-        return "lsseqitxsubjcntrs/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String LsSeqItxSubjCntrController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("lsseqitxsubjcntr", LsSeqItxSubjCntr.findLsSeqItxSubjCntr(id));
-        uiModel.addAttribute("itemId", id);
-        return "lsseqitxsubjcntrs/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String LsSeqItxSubjCntrController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsseqitxsubjcntrs", LsSeqItxSubjCntr.findLsSeqItxSubjCntrEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) LsSeqItxSubjCntr.countLsSeqItxSubjCntrs() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsseqitxsubjcntrs", LsSeqItxSubjCntr.findAllLsSeqItxSubjCntrs(sortFieldName, sortOrder));
-        }
-        return "lsseqitxsubjcntrs/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String LsSeqItxSubjCntrController.update(@Valid LsSeqItxSubjCntr lsSeqItxSubjCntr, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsSeqItxSubjCntr);
-            return "lsseqitxsubjcntrs/update";
-        }
-        uiModel.asMap().clear();
-        lsSeqItxSubjCntr.merge();
-        return "redirect:/lsseqitxsubjcntrs/" + encodeUrlPathSegment(lsSeqItxSubjCntr.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String LsSeqItxSubjCntrController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, LsSeqItxSubjCntr.findLsSeqItxSubjCntr(id));
-        return "lsseqitxsubjcntrs/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String LsSeqItxSubjCntrController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        LsSeqItxSubjCntr lsSeqItxSubjCntr = LsSeqItxSubjCntr.findLsSeqItxSubjCntr(id);
-        lsSeqItxSubjCntr.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/lsseqitxsubjcntrs";
-    }
-    
-    void LsSeqItxSubjCntrController.populateEditForm(Model uiModel, LsSeqItxSubjCntr lsSeqItxSubjCntr) {
-        uiModel.addAttribute("lsSeqItxSubjCntr", lsSeqItxSubjCntr);
-    }
-    
-    String LsSeqItxSubjCntrController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqProtocolController.java b/src/main/java/com/labsynch/labseer/web/LsSeqProtocolController.java
deleted file mode 100644
index 9f08a25c3..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsSeqProtocolController.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsSeqProtocol;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/lsseqprotocols")
-@Controller
-@RooWebScaffold(path = "lsseqprotocols", formBackingObject = LsSeqProtocol.class)
-public class LsSeqProtocolController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqProtocolController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsSeqProtocolController_Roo_Controller.aj
deleted file mode 100644
index 29fd96611..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsSeqProtocolController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsSeqProtocol;
-import com.labsynch.labseer.web.LsSeqProtocolController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect LsSeqProtocolController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String LsSeqProtocolController.create(@Valid LsSeqProtocol lsSeqProtocol, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsSeqProtocol);
-            return "lsseqprotocols/create";
-        }
-        uiModel.asMap().clear();
-        lsSeqProtocol.persist();
-        return "redirect:/lsseqprotocols/" + encodeUrlPathSegment(lsSeqProtocol.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String LsSeqProtocolController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new LsSeqProtocol());
-        return "lsseqprotocols/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String LsSeqProtocolController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("lsseqprotocol", LsSeqProtocol.findLsSeqProtocol(id));
-        uiModel.addAttribute("itemId", id);
-        return "lsseqprotocols/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String LsSeqProtocolController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsseqprotocols", LsSeqProtocol.findLsSeqProtocolEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) LsSeqProtocol.countLsSeqProtocols() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsseqprotocols", LsSeqProtocol.findAllLsSeqProtocols(sortFieldName, sortOrder));
-        }
-        return "lsseqprotocols/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String LsSeqProtocolController.update(@Valid LsSeqProtocol lsSeqProtocol, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsSeqProtocol);
-            return "lsseqprotocols/update";
-        }
-        uiModel.asMap().clear();
-        lsSeqProtocol.merge();
-        return "redirect:/lsseqprotocols/" + encodeUrlPathSegment(lsSeqProtocol.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String LsSeqProtocolController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, LsSeqProtocol.findLsSeqProtocol(id));
-        return "lsseqprotocols/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String LsSeqProtocolController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        LsSeqProtocol lsSeqProtocol = LsSeqProtocol.findLsSeqProtocol(id);
-        lsSeqProtocol.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/lsseqprotocols";
-    }
-    
-    void LsSeqProtocolController.populateEditForm(Model uiModel, LsSeqProtocol lsSeqProtocol) {
-        uiModel.addAttribute("lsSeqProtocol", lsSeqProtocol);
-    }
-    
-    String LsSeqProtocolController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqSubjectController.java b/src/main/java/com/labsynch/labseer/web/LsSeqSubjectController.java
deleted file mode 100644
index 7c8b59c9b..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsSeqSubjectController.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsSeqSubject;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/lsseqsubjects")
-@Controller
-@RooWebScaffold(path = "lsseqsubjects", formBackingObject = LsSeqSubject.class)
-public class LsSeqSubjectController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqSubjectController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsSeqSubjectController_Roo_Controller.aj
deleted file mode 100644
index 2505ece6b..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsSeqSubjectController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsSeqSubject;
-import com.labsynch.labseer.web.LsSeqSubjectController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect LsSeqSubjectController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String LsSeqSubjectController.create(@Valid LsSeqSubject lsSeqSubject, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsSeqSubject);
-            return "lsseqsubjects/create";
-        }
-        uiModel.asMap().clear();
-        lsSeqSubject.persist();
-        return "redirect:/lsseqsubjects/" + encodeUrlPathSegment(lsSeqSubject.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String LsSeqSubjectController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new LsSeqSubject());
-        return "lsseqsubjects/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String LsSeqSubjectController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("lsseqsubject", LsSeqSubject.findLsSeqSubject(id));
-        uiModel.addAttribute("itemId", id);
-        return "lsseqsubjects/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String LsSeqSubjectController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsseqsubjects", LsSeqSubject.findLsSeqSubjectEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) LsSeqSubject.countLsSeqSubjects() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsseqsubjects", LsSeqSubject.findAllLsSeqSubjects(sortFieldName, sortOrder));
-        }
-        return "lsseqsubjects/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String LsSeqSubjectController.update(@Valid LsSeqSubject lsSeqSubject, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsSeqSubject);
-            return "lsseqsubjects/update";
-        }
-        uiModel.asMap().clear();
-        lsSeqSubject.merge();
-        return "redirect:/lsseqsubjects/" + encodeUrlPathSegment(lsSeqSubject.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String LsSeqSubjectController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, LsSeqSubject.findLsSeqSubject(id));
-        return "lsseqsubjects/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String LsSeqSubjectController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        LsSeqSubject lsSeqSubject = LsSeqSubject.findLsSeqSubject(id);
-        lsSeqSubject.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/lsseqsubjects";
-    }
-    
-    void LsSeqSubjectController.populateEditForm(Model uiModel, LsSeqSubject lsSeqSubject) {
-        uiModel.addAttribute("lsSeqSubject", lsSeqSubject);
-    }
-    
-    String LsSeqSubjectController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqTrtGrpController.java b/src/main/java/com/labsynch/labseer/web/LsSeqTrtGrpController.java
deleted file mode 100644
index d592f844b..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsSeqTrtGrpController.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsSeqTrtGrp;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/lsseqtrtgrps")
-@Controller
-@RooWebScaffold(path = "lsseqtrtgrps", formBackingObject = LsSeqTrtGrp.class)
-public class LsSeqTrtGrpController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsSeqTrtGrpController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsSeqTrtGrpController_Roo_Controller.aj
deleted file mode 100644
index 1e8f0e053..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsSeqTrtGrpController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsSeqTrtGrp;
-import com.labsynch.labseer.web.LsSeqTrtGrpController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect LsSeqTrtGrpController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String LsSeqTrtGrpController.create(@Valid LsSeqTrtGrp lsSeqTrtGrp, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsSeqTrtGrp);
-            return "lsseqtrtgrps/create";
-        }
-        uiModel.asMap().clear();
-        lsSeqTrtGrp.persist();
-        return "redirect:/lsseqtrtgrps/" + encodeUrlPathSegment(lsSeqTrtGrp.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String LsSeqTrtGrpController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new LsSeqTrtGrp());
-        return "lsseqtrtgrps/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String LsSeqTrtGrpController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("lsseqtrtgrp", LsSeqTrtGrp.findLsSeqTrtGrp(id));
-        uiModel.addAttribute("itemId", id);
-        return "lsseqtrtgrps/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String LsSeqTrtGrpController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsseqtrtgrps", LsSeqTrtGrp.findLsSeqTrtGrpEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) LsSeqTrtGrp.countLsSeqTrtGrps() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsseqtrtgrps", LsSeqTrtGrp.findAllLsSeqTrtGrps(sortFieldName, sortOrder));
-        }
-        return "lsseqtrtgrps/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String LsSeqTrtGrpController.update(@Valid LsSeqTrtGrp lsSeqTrtGrp, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsSeqTrtGrp);
-            return "lsseqtrtgrps/update";
-        }
-        uiModel.asMap().clear();
-        lsSeqTrtGrp.merge();
-        return "redirect:/lsseqtrtgrps/" + encodeUrlPathSegment(lsSeqTrtGrp.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String LsSeqTrtGrpController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, LsSeqTrtGrp.findLsSeqTrtGrp(id));
-        return "lsseqtrtgrps/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String LsSeqTrtGrpController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        LsSeqTrtGrp lsSeqTrtGrp = LsSeqTrtGrp.findLsSeqTrtGrp(id);
-        lsSeqTrtGrp.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/lsseqtrtgrps";
-    }
-    
-    void LsSeqTrtGrpController.populateEditForm(Model uiModel, LsSeqTrtGrp lsSeqTrtGrp) {
-        uiModel.addAttribute("lsSeqTrtGrp", lsSeqTrtGrp);
-    }
-    
-    String LsSeqTrtGrpController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsTagController.java b/src/main/java/com/labsynch/labseer/web/LsTagController.java
deleted file mode 100755
index 4811f8741..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsTagController.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsTag;
-import java.io.UnsupportedEncodingException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-@RooWebJson(jsonObject = LsTag.class)
-@Transactional
-@RooWebFinder
-@RequestMapping("/lstags")
-@Controller
-@RooWebScaffold(path = "lstags", formBackingObject = LsTag.class)
-public class LsTagController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsTagController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsTagController_Roo_Controller.aj
deleted file mode 100644
index f50f68480..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsTagController_Roo_Controller.aj
+++ /dev/null
@@ -1,115 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.LsTag;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.web.LsTagController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect LsTagController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String LsTagController.create(@Valid LsTag lsTag, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsTag);
-            return "lstags/create";
-        }
-        uiModel.asMap().clear();
-        lsTag.persist();
-        return "redirect:/lstags/" + encodeUrlPathSegment(lsTag.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String LsTagController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new LsTag());
-        return "lstags/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String LsTagController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("lstag", LsTag.findLsTag(id));
-        uiModel.addAttribute("itemId", id);
-        return "lstags/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String LsTagController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lstags", LsTag.findLsTagEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) LsTag.countLsTags() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lstags", LsTag.findAllLsTags(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lstags/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String LsTagController.update(@Valid LsTag lsTag, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsTag);
-            return "lstags/update";
-        }
-        uiModel.asMap().clear();
-        lsTag.merge();
-        return "redirect:/lstags/" + encodeUrlPathSegment(lsTag.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String LsTagController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, LsTag.findLsTag(id));
-        return "lstags/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String LsTagController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        LsTag lsTag = LsTag.findLsTag(id);
-        lsTag.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/lstags";
-    }
-    
-    void LsTagController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("lsTag_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void LsTagController.populateEditForm(Model uiModel, LsTag lsTag) {
-        uiModel.addAttribute("lsTag", lsTag);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("experiments", Experiment.findAllExperiments());
-        uiModel.addAttribute("lsthings", LsThing.findAllLsThings());
-        uiModel.addAttribute("protocols", Protocol.findAllProtocols());
-    }
-    
-    String LsTagController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsTagController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/LsTagController_Roo_Controller_Finder.aj
deleted file mode 100755
index 606808682..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsTagController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,55 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsTag;
-import com.labsynch.labseer.web.LsTagController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect LsTagController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByTagTextEquals", "form" }, method = RequestMethod.GET)
-    public String LsTagController.findLsTagsByTagTextEqualsForm(Model uiModel) {
-        return "lstags/findLsTagsByTagTextEquals";
-    }
-    
-    @RequestMapping(params = "find=ByTagTextEquals", method = RequestMethod.GET)
-    public String LsTagController.findLsTagsByTagTextEquals(@RequestParam("tagText") String tagText, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lstags", LsTag.findLsTagsByTagTextEquals(tagText, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsTag.countFindLsTagsByTagTextEquals(tagText) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lstags", LsTag.findLsTagsByTagTextEquals(tagText, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lstags/list";
-    }
-    
-    @RequestMapping(params = { "find=ByTagTextLike", "form" }, method = RequestMethod.GET)
-    public String LsTagController.findLsTagsByTagTextLikeForm(Model uiModel) {
-        return "lstags/findLsTagsByTagTextLike";
-    }
-    
-    @RequestMapping(params = "find=ByTagTextLike", method = RequestMethod.GET)
-    public String LsTagController.findLsTagsByTagTextLike(@RequestParam("tagText") String tagText, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lstags", LsTag.findLsTagsByTagTextLike(tagText, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsTag.countFindLsTagsByTagTextLike(tagText) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lstags", LsTag.findLsTagsByTagTextLike(tagText, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lstags/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsTagController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/LsTagController_Roo_Controller_Json.aj
deleted file mode 100755
index a595d8a9b..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsTagController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,136 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsTag;
-import com.labsynch.labseer.web.LsTagController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect LsTagController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsTagController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            LsTag lsTag = LsTag.findLsTag(id);
-            if (lsTag == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(lsTag.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsTagController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<LsTag> result = LsTag.findAllLsTags();
-            return new ResponseEntity<String>(LsTag.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> LsTagController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LsTag lsTag = LsTag.fromJsonToLsTag(json);
-            lsTag.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+lsTag.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> LsTagController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (LsTag lsTag: LsTag.fromJsonArrayToLsTags(json)) {
-                lsTag.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> LsTagController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LsTag lsTag = LsTag.fromJsonToLsTag(json);
-            lsTag.setId(id);
-            if (lsTag.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> LsTagController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LsTag lsTag = LsTag.findLsTag(id);
-            if (lsTag == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            lsTag.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByTagTextEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsTagController.jsonFindLsTagsByTagTextEquals(@RequestParam("tagText") String tagText) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsTag.toJsonArray(LsTag.findLsTagsByTagTextEquals(tagText).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByTagTextLike", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsTagController.jsonFindLsTagsByTagTextLike(@RequestParam("tagText") String tagText) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsTag.toJsonArray(LsTag.findLsTagsByTagTextLike(tagText).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsThingController.java b/src/main/java/com/labsynch/labseer/web/LsThingController.java
deleted file mode 100755
index a9926df43..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsThingController.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.dto.ErrorMessageDTO;
-import com.labsynch.labseer.dto.PreferredNameResultsDTO;
-import com.labsynch.labseer.dto.PreferredNameWithErrorDTO;
-import com.labsynch.labseer.service.GeneThingService;
-import com.labsynch.labseer.service.LsThingService;
-import java.io.IOException;
-import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = LsThing.class)
-@Controller
-@RequestMapping("/lsthings")
-@RooWebScaffold(path = "lsthings", formBackingObject = LsThing.class)
-@RooWebFinder
-public class LsThingController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsThingController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsThingController_Roo_Controller.aj
deleted file mode 100755
index 45e171225..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsThingController_Roo_Controller.aj
+++ /dev/null
@@ -1,120 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThing;
-import com.labsynch.labseer.domain.LsTag;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.LsThingLabel;
-import com.labsynch.labseer.domain.LsThingState;
-import com.labsynch.labseer.domain.ThingPage;
-import com.labsynch.labseer.web.LsThingController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect LsThingController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String LsThingController.create(@Valid LsThing lsThing, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsThing);
-            return "lsthings/create";
-        }
-        uiModel.asMap().clear();
-        lsThing.persist();
-        return "redirect:/lsthings/" + encodeUrlPathSegment(lsThing.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String LsThingController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new LsThing());
-        return "lsthings/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String LsThingController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("lsthing", LsThing.findLsThing(id));
-        uiModel.addAttribute("itemId", id);
-        return "lsthings/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String LsThingController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthings", LsThing.findLsThingEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) LsThing.countLsThings() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthings", LsThing.findAllLsThings(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthings/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String LsThingController.update(@Valid LsThing lsThing, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsThing);
-            return "lsthings/update";
-        }
-        uiModel.asMap().clear();
-        lsThing.merge();
-        return "redirect:/lsthings/" + encodeUrlPathSegment(lsThing.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String LsThingController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, LsThing.findLsThing(id));
-        return "lsthings/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String LsThingController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        LsThing lsThing = LsThing.findLsThing(id);
-        lsThing.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/lsthings";
-    }
-    
-    void LsThingController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("lsThing_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("lsThing_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void LsThingController.populateEditForm(Model uiModel, LsThing lsThing) {
-        uiModel.addAttribute("lsThing", lsThing);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxlsthinglsthings", ItxLsThingLsThing.findAllItxLsThingLsThings());
-        uiModel.addAttribute("lstags", LsTag.findAllLsTags());
-        uiModel.addAttribute("lsthinglabels", LsThingLabel.findAllLsThingLabels());
-        uiModel.addAttribute("lsthingstates", LsThingState.findAllLsThingStates());
-        uiModel.addAttribute("thingpages", ThingPage.findAllThingPages());
-    }
-    
-    String LsThingController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsThingController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/LsThingController_Roo_Controller_Finder.aj
deleted file mode 100755
index e47ef9c5c..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsThingController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,239 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.web.LsThingController;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect LsThingController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByCodeNameEquals", "form" }, method = RequestMethod.GET)
-    public String LsThingController.findLsThingsByCodeNameEqualsForm(Model uiModel) {
-        return "lsthings/findLsThingsByCodeNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByCodeNameEquals", method = RequestMethod.GET)
-    public String LsThingController.findLsThingsByCodeNameEquals(@RequestParam("codeName") String codeName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthings", LsThing.findLsThingsByCodeNameEquals(codeName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThing.countFindLsThingsByCodeNameEquals(codeName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthings", LsThing.findLsThingsByCodeNameEquals(codeName, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthings/list";
-    }
-    
-    @RequestMapping(params = { "find=ByCodeNameLike", "form" }, method = RequestMethod.GET)
-    public String LsThingController.findLsThingsByCodeNameLikeForm(Model uiModel) {
-        return "lsthings/findLsThingsByCodeNameLike";
-    }
-    
-    @RequestMapping(params = "find=ByCodeNameLike", method = RequestMethod.GET)
-    public String LsThingController.findLsThingsByCodeNameLike(@RequestParam("codeName") String codeName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthings", LsThing.findLsThingsByCodeNameLike(codeName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThing.countFindLsThingsByCodeNameLike(codeName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthings", LsThing.findLsThingsByCodeNameLike(codeName, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthings/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsKindEquals", "form" }, method = RequestMethod.GET)
-    public String LsThingController.findLsThingsByLsKindEqualsForm(Model uiModel) {
-        return "lsthings/findLsThingsByLsKindEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEquals", method = RequestMethod.GET)
-    public String LsThingController.findLsThingsByLsKindEquals(@RequestParam("lsKind") String lsKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthings", LsThing.findLsThingsByLsKindEquals(lsKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThing.countFindLsThingsByLsKindEquals(lsKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthings", LsThing.findLsThingsByLsKindEquals(lsKind, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthings/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsKindLike", "form" }, method = RequestMethod.GET)
-    public String LsThingController.findLsThingsByLsKindLikeForm(Model uiModel) {
-        return "lsthings/findLsThingsByLsKindLike";
-    }
-    
-    @RequestMapping(params = "find=ByLsKindLike", method = RequestMethod.GET)
-    public String LsThingController.findLsThingsByLsKindLike(@RequestParam("lsKind") String lsKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthings", LsThing.findLsThingsByLsKindLike(lsKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThing.countFindLsThingsByLsKindLike(lsKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthings", LsThing.findLsThingsByLsKindLike(lsKind, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthings/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTransactionEquals", "form" }, method = RequestMethod.GET)
-    public String LsThingController.findLsThingsByLsTransactionEqualsForm(Model uiModel) {
-        return "lsthings/findLsThingsByLsTransactionEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", method = RequestMethod.GET)
-    public String LsThingController.findLsThingsByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthings", LsThing.findLsThingsByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThing.countFindLsThingsByLsTransactionEquals(lsTransaction) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthings", LsThing.findLsThingsByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthings/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeAndKindEquals", "form" }, method = RequestMethod.GET)
-    public String LsThingController.findLsThingsByLsTypeAndKindEqualsForm(Model uiModel) {
-        return "lsthings/findLsThingsByLsTypeAndKindEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeAndKindEquals", method = RequestMethod.GET)
-    public String LsThingController.findLsThingsByLsTypeAndKindEquals(@RequestParam("lsTypeAndKind") String lsTypeAndKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthings", LsThing.findLsThingsByLsTypeAndKindEquals(lsTypeAndKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThing.countFindLsThingsByLsTypeAndKindEquals(lsTypeAndKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthings", LsThing.findLsThingsByLsTypeAndKindEquals(lsTypeAndKind, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthings/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeEquals", "form" }, method = RequestMethod.GET)
-    public String LsThingController.findLsThingsByLsTypeEqualsForm(Model uiModel) {
-        return "lsthings/findLsThingsByLsTypeEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEquals", method = RequestMethod.GET)
-    public String LsThingController.findLsThingsByLsTypeEquals(@RequestParam("lsType") String lsType, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthings", LsThing.findLsThingsByLsTypeEquals(lsType, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThing.countFindLsThingsByLsTypeEquals(lsType) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthings", LsThing.findLsThingsByLsTypeEquals(lsType, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthings/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeEqualsAndLsKindEquals", "form" }, method = RequestMethod.GET)
-    public String LsThingController.findLsThingsByLsTypeEqualsAndLsKindEqualsForm(Model uiModel) {
-        return "lsthings/findLsThingsByLsTypeEqualsAndLsKindEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEquals", method = RequestMethod.GET)
-    public String LsThingController.findLsThingsByLsTypeEqualsAndLsKindEquals(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthings", LsThing.findLsThingsByLsTypeEqualsAndLsKindEquals(lsType, lsKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThing.countFindLsThingsByLsTypeEqualsAndLsKindEquals(lsType, lsKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthings", LsThing.findLsThingsByLsTypeEqualsAndLsKindEquals(lsType, lsKind, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthings/list";
-    }
-    
-    @RequestMapping(params = { "find=ByRecordedByLike", "form" }, method = RequestMethod.GET)
-    public String LsThingController.findLsThingsByRecordedByLikeForm(Model uiModel) {
-        return "lsthings/findLsThingsByRecordedByLike";
-    }
-    
-    @RequestMapping(params = "find=ByRecordedByLike", method = RequestMethod.GET)
-    public String LsThingController.findLsThingsByRecordedByLike(@RequestParam("recordedBy") String recordedBy, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthings", LsThing.findLsThingsByRecordedByLike(recordedBy, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThing.countFindLsThingsByRecordedByLike(recordedBy) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthings", LsThing.findLsThingsByRecordedByLike(recordedBy, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthings/list";
-    }
-    
-    @RequestMapping(params = { "find=ByRecordedDateGreaterThan", "form" }, method = RequestMethod.GET)
-    public String LsThingController.findLsThingsByRecordedDateGreaterThanForm(Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthings/findLsThingsByRecordedDateGreaterThan";
-    }
-    
-    @RequestMapping(params = "find=ByRecordedDateGreaterThan", method = RequestMethod.GET)
-    public String LsThingController.findLsThingsByRecordedDateGreaterThan(@RequestParam("recordedDate") @DateTimeFormat(style = "MM") Date recordedDate, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthings", LsThing.findLsThingsByRecordedDateGreaterThan(recordedDate, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThing.countFindLsThingsByRecordedDateGreaterThan(recordedDate) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthings", LsThing.findLsThingsByRecordedDateGreaterThan(recordedDate, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthings/list";
-    }
-    
-    @RequestMapping(params = { "find=ByRecordedDateLessThan", "form" }, method = RequestMethod.GET)
-    public String LsThingController.findLsThingsByRecordedDateLessThanForm(Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthings/findLsThingsByRecordedDateLessThan";
-    }
-    
-    @RequestMapping(params = "find=ByRecordedDateLessThan", method = RequestMethod.GET)
-    public String LsThingController.findLsThingsByRecordedDateLessThan(@RequestParam("recordedDate") @DateTimeFormat(style = "MM") Date recordedDate, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthings", LsThing.findLsThingsByRecordedDateLessThan(recordedDate, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThing.countFindLsThingsByRecordedDateLessThan(recordedDate) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthings", LsThing.findLsThingsByRecordedDateLessThan(recordedDate, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthings/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsThingController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/LsThingController_Roo_Controller_Json.aj
deleted file mode 100755
index 07ada0266..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsThingController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,246 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.web.LsThingController;
-import java.util.Date;
-import java.util.List;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect LsThingController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            LsThing lsThing = LsThing.findLsThing(id);
-            if (lsThing == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(lsThing.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<LsThing> result = LsThing.findAllLsThings();
-            return new ResponseEntity<String>(LsThing.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> LsThingController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LsThing lsThing = LsThing.fromJsonToLsThing(json);
-            lsThing.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+lsThing.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> LsThingController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (LsThing lsThing: LsThing.fromJsonArrayToLsThings(json)) {
-                lsThing.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> LsThingController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LsThing lsThing = LsThing.fromJsonToLsThing(json);
-            lsThing.setId(id);
-            if (lsThing.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> LsThingController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LsThing lsThing = LsThing.findLsThing(id);
-            if (lsThing == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            lsThing.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByCodeNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingController.jsonFindLsThingsByCodeNameEquals(@RequestParam("codeName") String codeName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThing.toJsonArray(LsThing.findLsThingsByCodeNameEquals(codeName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByCodeNameLike", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingController.jsonFindLsThingsByCodeNameLike(@RequestParam("codeName") String codeName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThing.toJsonArray(LsThing.findLsThingsByCodeNameLike(codeName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingController.jsonFindLsThingsByLsKindEquals(@RequestParam("lsKind") String lsKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThing.toJsonArray(LsThing.findLsThingsByLsKindEquals(lsKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsKindLike", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingController.jsonFindLsThingsByLsKindLike(@RequestParam("lsKind") String lsKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThing.toJsonArray(LsThing.findLsThingsByLsKindLike(lsKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingController.jsonFindLsThingsByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThing.toJsonArray(LsThing.findLsThingsByLsTransactionEquals(lsTransaction).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeAndKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingController.jsonFindLsThingsByLsTypeAndKindEquals(@RequestParam("lsTypeAndKind") String lsTypeAndKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThing.toJsonArray(LsThing.findLsThingsByLsTypeAndKindEquals(lsTypeAndKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingController.jsonFindLsThingsByLsTypeEquals(@RequestParam("lsType") String lsType) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThing.toJsonArray(LsThing.findLsThingsByLsTypeEquals(lsType).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingController.jsonFindLsThingsByLsTypeEqualsAndLsKindEquals(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThing.toJsonArray(LsThing.findLsThingsByLsTypeEqualsAndLsKindEquals(lsType, lsKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByRecordedByLike", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingController.jsonFindLsThingsByRecordedByLike(@RequestParam("recordedBy") String recordedBy) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThing.toJsonArray(LsThing.findLsThingsByRecordedByLike(recordedBy).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByRecordedDateGreaterThan", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingController.jsonFindLsThingsByRecordedDateGreaterThan(@RequestParam("recordedDate") @DateTimeFormat(style = "MM") Date recordedDate) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThing.toJsonArray(LsThing.findLsThingsByRecordedDateGreaterThan(recordedDate).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByRecordedDateLessThan", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingController.jsonFindLsThingsByRecordedDateLessThan(@RequestParam("recordedDate") @DateTimeFormat(style = "MM") Date recordedDate) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThing.toJsonArray(LsThing.findLsThingsByRecordedDateLessThan(recordedDate).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsThingLabelController.java b/src/main/java/com/labsynch/labseer/web/LsThingLabelController.java
deleted file mode 100755
index b786e7542..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsThingLabelController.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsThingLabel;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RooWebJson(jsonObject = LsThingLabel.class)
-@Controller
-@RequestMapping("/lsthinglabels")
-@RooWebScaffold(path = "lsthinglabels", formBackingObject = LsThingLabel.class)
-@RooWebFinder
-public class LsThingLabelController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsThingLabelController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsThingLabelController_Roo_Controller.aj
deleted file mode 100755
index d4efd3fb6..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsThingLabelController_Roo_Controller.aj
+++ /dev/null
@@ -1,119 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.LsThingLabel;
-import com.labsynch.labseer.web.LsThingLabelController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect LsThingLabelController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String LsThingLabelController.create(@Valid LsThingLabel lsThingLabel, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsThingLabel);
-            return "lsthinglabels/create";
-        }
-        uiModel.asMap().clear();
-        lsThingLabel.persist();
-        return "redirect:/lsthinglabels/" + encodeUrlPathSegment(lsThingLabel.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String LsThingLabelController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new LsThingLabel());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (LsThing.countLsThings() == 0) {
-            dependencies.add(new String[] { "lsThing", "lsthings" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "lsthinglabels/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String LsThingLabelController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("lsthinglabel", LsThingLabel.findLsThingLabel(id));
-        uiModel.addAttribute("itemId", id);
-        return "lsthinglabels/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String LsThingLabelController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthinglabels", LsThingLabel.findLsThingLabelEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) LsThingLabel.countLsThingLabels() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthinglabels", LsThingLabel.findAllLsThingLabels(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthinglabels/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String LsThingLabelController.update(@Valid LsThingLabel lsThingLabel, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsThingLabel);
-            return "lsthinglabels/update";
-        }
-        uiModel.asMap().clear();
-        lsThingLabel.merge();
-        return "redirect:/lsthinglabels/" + encodeUrlPathSegment(lsThingLabel.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String LsThingLabelController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, LsThingLabel.findLsThingLabel(id));
-        return "lsthinglabels/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String LsThingLabelController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        LsThingLabel lsThingLabel = LsThingLabel.findLsThingLabel(id);
-        lsThingLabel.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/lsthinglabels";
-    }
-    
-    void LsThingLabelController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("lsThingLabel_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("lsThingLabel_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void LsThingLabelController.populateEditForm(Model uiModel, LsThingLabel lsThingLabel) {
-        uiModel.addAttribute("lsThingLabel", lsThingLabel);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("lsthings", LsThing.findAllLsThings());
-    }
-    
-    String LsThingLabelController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsThingLabelController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/LsThingLabelController_Roo_Controller_Finder.aj
deleted file mode 100755
index 260cfed07..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsThingLabelController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,117 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.LsThingLabel;
-import com.labsynch.labseer.web.LsThingLabelController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect LsThingLabelController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByLabelTextEquals", "form" }, method = RequestMethod.GET)
-    public String LsThingLabelController.findLsThingLabelsByLabelTextEqualsForm(Model uiModel) {
-        return "lsthinglabels/findLsThingLabelsByLabelTextEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLabelTextEquals", method = RequestMethod.GET)
-    public String LsThingLabelController.findLsThingLabelsByLabelTextEquals(@RequestParam("labelText") String labelText, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthinglabels", LsThingLabel.findLsThingLabelsByLabelTextEquals(labelText, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThingLabel.countFindLsThingLabelsByLabelTextEquals(labelText) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthinglabels", LsThingLabel.findLsThingLabelsByLabelTextEquals(labelText, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthinglabels/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLabelTextEqualsAndIgnoredNot", "form" }, method = RequestMethod.GET)
-    public String LsThingLabelController.findLsThingLabelsByLabelTextEqualsAndIgnoredNotForm(Model uiModel) {
-        return "lsthinglabels/findLsThingLabelsByLabelTextEqualsAndIgnoredNot";
-    }
-    
-    @RequestMapping(params = "find=ByLabelTextEqualsAndIgnoredNot", method = RequestMethod.GET)
-    public String LsThingLabelController.findLsThingLabelsByLabelTextEqualsAndIgnoredNot(@RequestParam("labelText") String labelText, @RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthinglabels", LsThingLabel.findLsThingLabelsByLabelTextEqualsAndIgnoredNot(labelText, ignored, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThingLabel.countFindLsThingLabelsByLabelTextEqualsAndIgnoredNot(labelText, ignored) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthinglabels", LsThingLabel.findLsThingLabelsByLabelTextEqualsAndIgnoredNot(labelText, ignored, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthinglabels/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLabelTextLike", "form" }, method = RequestMethod.GET)
-    public String LsThingLabelController.findLsThingLabelsByLabelTextLikeForm(Model uiModel) {
-        return "lsthinglabels/findLsThingLabelsByLabelTextLike";
-    }
-    
-    @RequestMapping(params = "find=ByLabelTextLike", method = RequestMethod.GET)
-    public String LsThingLabelController.findLsThingLabelsByLabelTextLike(@RequestParam("labelText") String labelText, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthinglabels", LsThingLabel.findLsThingLabelsByLabelTextLike(labelText, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThingLabel.countFindLsThingLabelsByLabelTextLike(labelText) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthinglabels", LsThingLabel.findLsThingLabelsByLabelTextLike(labelText, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthinglabels/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsThing", "form" }, method = RequestMethod.GET)
-    public String LsThingLabelController.findLsThingLabelsByLsThingForm(Model uiModel) {
-        uiModel.addAttribute("lsthings", LsThing.findAllLsThings());
-        return "lsthinglabels/findLsThingLabelsByLsThing";
-    }
-    
-    @RequestMapping(params = "find=ByLsThing", method = RequestMethod.GET)
-    public String LsThingLabelController.findLsThingLabelsByLsThing(@RequestParam("lsThing") LsThing lsThing, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthinglabels", LsThingLabel.findLsThingLabelsByLsThing(lsThing, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThingLabel.countFindLsThingLabelsByLsThing(lsThing) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthinglabels", LsThingLabel.findLsThingLabelsByLsThing(lsThing, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthinglabels/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTransactionEquals", "form" }, method = RequestMethod.GET)
-    public String LsThingLabelController.findLsThingLabelsByLsTransactionEqualsForm(Model uiModel) {
-        return "lsthinglabels/findLsThingLabelsByLsTransactionEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", method = RequestMethod.GET)
-    public String LsThingLabelController.findLsThingLabelsByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthinglabels", LsThingLabel.findLsThingLabelsByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThingLabel.countFindLsThingLabelsByLsTransactionEquals(lsTransaction) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthinglabels", LsThingLabel.findLsThingLabelsByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthinglabels/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsThingLabelController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/LsThingLabelController_Roo_Controller_Json.aj
deleted file mode 100755
index 09b107417..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsThingLabelController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,173 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.LsThingLabel;
-import com.labsynch.labseer.web.LsThingLabelController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect LsThingLabelController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingLabelController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            LsThingLabel lsThingLabel = LsThingLabel.findLsThingLabel(id);
-            if (lsThingLabel == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(lsThingLabel.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingLabelController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<LsThingLabel> result = LsThingLabel.findAllLsThingLabels();
-            return new ResponseEntity<String>(LsThingLabel.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> LsThingLabelController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LsThingLabel lsThingLabel = LsThingLabel.fromJsonToLsThingLabel(json);
-            lsThingLabel.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+lsThingLabel.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> LsThingLabelController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (LsThingLabel lsThingLabel: LsThingLabel.fromJsonArrayToLsThingLabels(json)) {
-                lsThingLabel.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> LsThingLabelController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LsThingLabel lsThingLabel = LsThingLabel.fromJsonToLsThingLabel(json);
-            lsThingLabel.setId(id);
-            if (lsThingLabel.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> LsThingLabelController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LsThingLabel lsThingLabel = LsThingLabel.findLsThingLabel(id);
-            if (lsThingLabel == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            lsThingLabel.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLabelTextEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingLabelController.jsonFindLsThingLabelsByLabelTextEquals(@RequestParam("labelText") String labelText) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThingLabel.toJsonArray(LsThingLabel.findLsThingLabelsByLabelTextEquals(labelText).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLabelTextEqualsAndIgnoredNot", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingLabelController.jsonFindLsThingLabelsByLabelTextEqualsAndIgnoredNot(@RequestParam("labelText") String labelText, @RequestParam(value = "ignored", required = false) boolean ignored) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThingLabel.toJsonArray(LsThingLabel.findLsThingLabelsByLabelTextEqualsAndIgnoredNot(labelText, ignored).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLabelTextLike", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingLabelController.jsonFindLsThingLabelsByLabelTextLike(@RequestParam("labelText") String labelText) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThingLabel.toJsonArray(LsThingLabel.findLsThingLabelsByLabelTextLike(labelText).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsThing", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingLabelController.jsonFindLsThingLabelsByLsThing(@RequestParam("lsThing") LsThing lsThing) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThingLabel.toJsonArray(LsThingLabel.findLsThingLabelsByLsThing(lsThing).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingLabelController.jsonFindLsThingLabelsByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThingLabel.toJsonArray(LsThingLabel.findLsThingLabelsByLsTransactionEquals(lsTransaction).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsThingStateController.java b/src/main/java/com/labsynch/labseer/web/LsThingStateController.java
deleted file mode 100755
index ec768dae0..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsThingStateController.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsThingState;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RooWebJson(jsonObject = LsThingState.class)
-@Controller
-@RequestMapping("/lsthingstates")
-@RooWebScaffold(path = "lsthingstates", formBackingObject = LsThingState.class)
-@RooWebFinder
-public class LsThingStateController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsThingStateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsThingStateController_Roo_Controller.aj
deleted file mode 100755
index 09ac4443a..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsThingStateController_Roo_Controller.aj
+++ /dev/null
@@ -1,121 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.LsThingState;
-import com.labsynch.labseer.domain.LsThingValue;
-import com.labsynch.labseer.web.LsThingStateController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect LsThingStateController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String LsThingStateController.create(@Valid LsThingState lsThingState, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsThingState);
-            return "lsthingstates/create";
-        }
-        uiModel.asMap().clear();
-        lsThingState.persist();
-        return "redirect:/lsthingstates/" + encodeUrlPathSegment(lsThingState.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String LsThingStateController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new LsThingState());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (LsThing.countLsThings() == 0) {
-            dependencies.add(new String[] { "lsThing", "lsthings" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "lsthingstates/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String LsThingStateController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("lsthingstate", LsThingState.findLsThingState(id));
-        uiModel.addAttribute("itemId", id);
-        return "lsthingstates/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String LsThingStateController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthingstates", LsThingState.findLsThingStateEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) LsThingState.countLsThingStates() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthingstates", LsThingState.findAllLsThingStates(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthingstates/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String LsThingStateController.update(@Valid LsThingState lsThingState, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsThingState);
-            return "lsthingstates/update";
-        }
-        uiModel.asMap().clear();
-        lsThingState.merge();
-        return "redirect:/lsthingstates/" + encodeUrlPathSegment(lsThingState.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String LsThingStateController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, LsThingState.findLsThingState(id));
-        return "lsthingstates/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String LsThingStateController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        LsThingState lsThingState = LsThingState.findLsThingState(id);
-        lsThingState.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/lsthingstates";
-    }
-    
-    void LsThingStateController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("lsThingState_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("lsThingState_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void LsThingStateController.populateEditForm(Model uiModel, LsThingState lsThingState) {
-        uiModel.addAttribute("lsThingState", lsThingState);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("lsthings", LsThing.findAllLsThings());
-        uiModel.addAttribute("lsthingvalues", LsThingValue.findAllLsThingValues());
-    }
-    
-    String LsThingStateController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsThingStateController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/LsThingStateController_Roo_Controller_Finder.aj
deleted file mode 100755
index 98c6f88d9..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsThingStateController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,57 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.LsThingState;
-import com.labsynch.labseer.web.LsThingStateController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect LsThingStateController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByLsThing", "form" }, method = RequestMethod.GET)
-    public String LsThingStateController.findLsThingStatesByLsThingForm(Model uiModel) {
-        uiModel.addAttribute("lsthings", LsThing.findAllLsThings());
-        return "lsthingstates/findLsThingStatesByLsThing";
-    }
-    
-    @RequestMapping(params = "find=ByLsThing", method = RequestMethod.GET)
-    public String LsThingStateController.findLsThingStatesByLsThing(@RequestParam("lsThing") LsThing lsThing, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthingstates", LsThingState.findLsThingStatesByLsThing(lsThing, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThingState.countFindLsThingStatesByLsThing(lsThing) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthingstates", LsThingState.findLsThingStatesByLsThing(lsThing, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthingstates/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTransactionEquals", "form" }, method = RequestMethod.GET)
-    public String LsThingStateController.findLsThingStatesByLsTransactionEqualsForm(Model uiModel) {
-        return "lsthingstates/findLsThingStatesByLsTransactionEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", method = RequestMethod.GET)
-    public String LsThingStateController.findLsThingStatesByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthingstates", LsThingState.findLsThingStatesByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThingState.countFindLsThingStatesByLsTransactionEquals(lsTransaction) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthingstates", LsThingState.findLsThingStatesByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthingstates/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsThingStateController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/LsThingStateController_Roo_Controller_Json.aj
deleted file mode 100755
index c6a97bb39..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsThingStateController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,137 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.LsThingState;
-import com.labsynch.labseer.web.LsThingStateController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect LsThingStateController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingStateController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            LsThingState lsThingState = LsThingState.findLsThingState(id);
-            if (lsThingState == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(lsThingState.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingStateController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<LsThingState> result = LsThingState.findAllLsThingStates();
-            return new ResponseEntity<String>(LsThingState.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> LsThingStateController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LsThingState lsThingState = LsThingState.fromJsonToLsThingState(json);
-            lsThingState.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+lsThingState.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> LsThingStateController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (LsThingState lsThingState: LsThingState.fromJsonArrayToLsThingStates(json)) {
-                lsThingState.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> LsThingStateController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LsThingState lsThingState = LsThingState.fromJsonToLsThingState(json);
-            lsThingState.setId(id);
-            if (lsThingState.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> LsThingStateController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LsThingState lsThingState = LsThingState.findLsThingState(id);
-            if (lsThingState == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            lsThingState.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsThing", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingStateController.jsonFindLsThingStatesByLsThing(@RequestParam("lsThing") LsThing lsThing) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThingState.toJsonArray(LsThingState.findLsThingStatesByLsThing(lsThing).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingStateController.jsonFindLsThingStatesByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThingState.toJsonArray(LsThingState.findLsThingStatesByLsTransactionEquals(lsTransaction).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsThingValueController.java b/src/main/java/com/labsynch/labseer/web/LsThingValueController.java
deleted file mode 100755
index ccf4eab31..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsThingValueController.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsThingValue;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RooWebJson(jsonObject = LsThingValue.class)
-@Controller
-@RequestMapping("/lsthingvalues")
-@RooWebScaffold(path = "lsthingvalues", formBackingObject = LsThingValue.class)
-@RooWebFinder
-public class LsThingValueController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsThingValueController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsThingValueController_Roo_Controller.aj
deleted file mode 100755
index 55eeb2cd2..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsThingValueController_Roo_Controller.aj
+++ /dev/null
@@ -1,120 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsThingState;
-import com.labsynch.labseer.domain.LsThingValue;
-import com.labsynch.labseer.web.LsThingValueController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect LsThingValueController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String LsThingValueController.create(@Valid LsThingValue lsThingValue, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsThingValue);
-            return "lsthingvalues/create";
-        }
-        uiModel.asMap().clear();
-        lsThingValue.persist();
-        return "redirect:/lsthingvalues/" + encodeUrlPathSegment(lsThingValue.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String LsThingValueController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new LsThingValue());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (LsThingState.countLsThingStates() == 0) {
-            dependencies.add(new String[] { "lsState", "lsthingstates" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "lsthingvalues/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String LsThingValueController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("lsthingvalue", LsThingValue.findLsThingValue(id));
-        uiModel.addAttribute("itemId", id);
-        return "lsthingvalues/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String LsThingValueController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthingvalues", LsThingValue.findLsThingValueEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) LsThingValue.countLsThingValues() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthingvalues", LsThingValue.findAllLsThingValues(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthingvalues/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String LsThingValueController.update(@Valid LsThingValue lsThingValue, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsThingValue);
-            return "lsthingvalues/update";
-        }
-        uiModel.asMap().clear();
-        lsThingValue.merge();
-        return "redirect:/lsthingvalues/" + encodeUrlPathSegment(lsThingValue.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String LsThingValueController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, LsThingValue.findLsThingValue(id));
-        return "lsthingvalues/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String LsThingValueController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        LsThingValue lsThingValue = LsThingValue.findLsThingValue(id);
-        lsThingValue.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/lsthingvalues";
-    }
-    
-    void LsThingValueController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("lsThingValue_datevalue_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("lsThingValue_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("lsThingValue_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void LsThingValueController.populateEditForm(Model uiModel, LsThingValue lsThingValue) {
-        uiModel.addAttribute("lsThingValue", lsThingValue);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("lsthingstates", LsThingState.findAllLsThingStates());
-    }
-    
-    String LsThingValueController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsThingValueController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/LsThingValueController_Roo_Controller_Finder.aj
deleted file mode 100755
index c94849824..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsThingValueController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,283 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsThingState;
-import com.labsynch.labseer.domain.LsThingValue;
-import com.labsynch.labseer.web.LsThingValueController;
-import java.math.BigDecimal;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect LsThingValueController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByCodeValueEquals", "form" }, method = RequestMethod.GET)
-    public String LsThingValueController.findLsThingValuesByCodeValueEqualsForm(Model uiModel) {
-        return "lsthingvalues/findLsThingValuesByCodeValueEquals";
-    }
-    
-    @RequestMapping(params = "find=ByCodeValueEquals", method = RequestMethod.GET)
-    public String LsThingValueController.findLsThingValuesByCodeValueEquals(@RequestParam("codeValue") String codeValue, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthingvalues", LsThingValue.findLsThingValuesByCodeValueEquals(codeValue, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThingValue.countFindLsThingValuesByCodeValueEquals(codeValue) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthingvalues", LsThingValue.findLsThingValuesByCodeValueEquals(codeValue, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthingvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByIgnoredNotAndCodeValueEquals", "form" }, method = RequestMethod.GET)
-    public String LsThingValueController.findLsThingValuesByIgnoredNotAndCodeValueEqualsForm(Model uiModel) {
-        return "lsthingvalues/findLsThingValuesByIgnoredNotAndCodeValueEquals";
-    }
-    
-    @RequestMapping(params = "find=ByIgnoredNotAndCodeValueEquals", method = RequestMethod.GET)
-    public String LsThingValueController.findLsThingValuesByIgnoredNotAndCodeValueEquals(@RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam("codeValue") String codeValue, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthingvalues", LsThingValue.findLsThingValuesByIgnoredNotAndCodeValueEquals(ignored, codeValue, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThingValue.countFindLsThingValuesByIgnoredNotAndCodeValueEquals(ignored, codeValue) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthingvalues", LsThingValue.findLsThingValuesByIgnoredNotAndCodeValueEquals(ignored, codeValue, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthingvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsKindEqualsAndCodeValueLike", "form" }, method = RequestMethod.GET)
-    public String LsThingValueController.findLsThingValuesByLsKindEqualsAndCodeValueLikeForm(Model uiModel) {
-        return "lsthingvalues/findLsThingValuesByLsKindEqualsAndCodeValueLike";
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEqualsAndCodeValueLike", method = RequestMethod.GET)
-    public String LsThingValueController.findLsThingValuesByLsKindEqualsAndCodeValueLike(@RequestParam("lsKind") String lsKind, @RequestParam("codeValue") String codeValue, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthingvalues", LsThingValue.findLsThingValuesByLsKindEqualsAndCodeValueLike(lsKind, codeValue, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThingValue.countFindLsThingValuesByLsKindEqualsAndCodeValueLike(lsKind, codeValue) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthingvalues", LsThingValue.findLsThingValuesByLsKindEqualsAndCodeValueLike(lsKind, codeValue, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthingvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsKindEqualsAndDateValueGreaterThanEquals", "form" }, method = RequestMethod.GET)
-    public String LsThingValueController.findLsThingValuesByLsKindEqualsAndDateValueGreaterThanEqualsForm(Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthingvalues/findLsThingValuesByLsKindEqualsAndDateValueGreaterThanEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEqualsAndDateValueGreaterThanEquals", method = RequestMethod.GET)
-    public String LsThingValueController.findLsThingValuesByLsKindEqualsAndDateValueGreaterThanEquals(@RequestParam("lsKind") String lsKind, @RequestParam("dateValue") @DateTimeFormat(style = "MM") Date dateValue, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthingvalues", LsThingValue.findLsThingValuesByLsKindEqualsAndDateValueGreaterThanEquals(lsKind, dateValue, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThingValue.countFindLsThingValuesByLsKindEqualsAndDateValueGreaterThanEquals(lsKind, dateValue) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthingvalues", LsThingValue.findLsThingValuesByLsKindEqualsAndDateValueGreaterThanEquals(lsKind, dateValue, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthingvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsKindEqualsAndDateValueLessThanEquals", "form" }, method = RequestMethod.GET)
-    public String LsThingValueController.findLsThingValuesByLsKindEqualsAndDateValueLessThanEqualsForm(Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthingvalues/findLsThingValuesByLsKindEqualsAndDateValueLessThanEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEqualsAndDateValueLessThanEquals", method = RequestMethod.GET)
-    public String LsThingValueController.findLsThingValuesByLsKindEqualsAndDateValueLessThanEquals(@RequestParam("lsKind") String lsKind, @RequestParam("dateValue") @DateTimeFormat(style = "MM") Date dateValue, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthingvalues", LsThingValue.findLsThingValuesByLsKindEqualsAndDateValueLessThanEquals(lsKind, dateValue, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThingValue.countFindLsThingValuesByLsKindEqualsAndDateValueLessThanEquals(lsKind, dateValue) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthingvalues", LsThingValue.findLsThingValuesByLsKindEqualsAndDateValueLessThanEquals(lsKind, dateValue, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthingvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsKindEqualsAndDateValueLike", "form" }, method = RequestMethod.GET)
-    public String LsThingValueController.findLsThingValuesByLsKindEqualsAndDateValueLikeForm(Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthingvalues/findLsThingValuesByLsKindEqualsAndDateValueLike";
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEqualsAndDateValueLike", method = RequestMethod.GET)
-    public String LsThingValueController.findLsThingValuesByLsKindEqualsAndDateValueLike(@RequestParam("lsKind") String lsKind, @RequestParam("dateValue") @DateTimeFormat(style = "MM") Date dateValue, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthingvalues", LsThingValue.findLsThingValuesByLsKindEqualsAndDateValueLike(lsKind, dateValue, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThingValue.countFindLsThingValuesByLsKindEqualsAndDateValueLike(lsKind, dateValue) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthingvalues", LsThingValue.findLsThingValuesByLsKindEqualsAndDateValueLike(lsKind, dateValue, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthingvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsKindEqualsAndNumericValueEquals", "form" }, method = RequestMethod.GET)
-    public String LsThingValueController.findLsThingValuesByLsKindEqualsAndNumericValueEqualsForm(Model uiModel) {
-        return "lsthingvalues/findLsThingValuesByLsKindEqualsAndNumericValueEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEqualsAndNumericValueEquals", method = RequestMethod.GET)
-    public String LsThingValueController.findLsThingValuesByLsKindEqualsAndNumericValueEquals(@RequestParam("lsKind") String lsKind, @RequestParam("numericValue") BigDecimal numericValue, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthingvalues", LsThingValue.findLsThingValuesByLsKindEqualsAndNumericValueEquals(lsKind, numericValue, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThingValue.countFindLsThingValuesByLsKindEqualsAndNumericValueEquals(lsKind, numericValue) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthingvalues", LsThingValue.findLsThingValuesByLsKindEqualsAndNumericValueEquals(lsKind, numericValue, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthingvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsKindEqualsAndNumericValueGreaterThanEquals", "form" }, method = RequestMethod.GET)
-    public String LsThingValueController.findLsThingValuesByLsKindEqualsAndNumericValueGreaterThanEqualsForm(Model uiModel) {
-        return "lsthingvalues/findLsThingValuesByLsKindEqualsAndNumericValueGreaterThanEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEqualsAndNumericValueGreaterThanEquals", method = RequestMethod.GET)
-    public String LsThingValueController.findLsThingValuesByLsKindEqualsAndNumericValueGreaterThanEquals(@RequestParam("lsKind") String lsKind, @RequestParam("numericValue") BigDecimal numericValue, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthingvalues", LsThingValue.findLsThingValuesByLsKindEqualsAndNumericValueGreaterThanEquals(lsKind, numericValue, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThingValue.countFindLsThingValuesByLsKindEqualsAndNumericValueGreaterThanEquals(lsKind, numericValue) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthingvalues", LsThingValue.findLsThingValuesByLsKindEqualsAndNumericValueGreaterThanEquals(lsKind, numericValue, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthingvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsKindEqualsAndNumericValueLessThanEquals", "form" }, method = RequestMethod.GET)
-    public String LsThingValueController.findLsThingValuesByLsKindEqualsAndNumericValueLessThanEqualsForm(Model uiModel) {
-        return "lsthingvalues/findLsThingValuesByLsKindEqualsAndNumericValueLessThanEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEqualsAndNumericValueLessThanEquals", method = RequestMethod.GET)
-    public String LsThingValueController.findLsThingValuesByLsKindEqualsAndNumericValueLessThanEquals(@RequestParam("lsKind") String lsKind, @RequestParam("numericValue") BigDecimal numericValue, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthingvalues", LsThingValue.findLsThingValuesByLsKindEqualsAndNumericValueLessThanEquals(lsKind, numericValue, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThingValue.countFindLsThingValuesByLsKindEqualsAndNumericValueLessThanEquals(lsKind, numericValue) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthingvalues", LsThingValue.findLsThingValuesByLsKindEqualsAndNumericValueLessThanEquals(lsKind, numericValue, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthingvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsKindEqualsAndStringValueEquals", "form" }, method = RequestMethod.GET)
-    public String LsThingValueController.findLsThingValuesByLsKindEqualsAndStringValueEqualsForm(Model uiModel) {
-        return "lsthingvalues/findLsThingValuesByLsKindEqualsAndStringValueEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEqualsAndStringValueEquals", method = RequestMethod.GET)
-    public String LsThingValueController.findLsThingValuesByLsKindEqualsAndStringValueEquals(@RequestParam("lsKind") String lsKind, @RequestParam("stringValue") String stringValue, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthingvalues", LsThingValue.findLsThingValuesByLsKindEqualsAndStringValueEquals(lsKind, stringValue, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThingValue.countFindLsThingValuesByLsKindEqualsAndStringValueEquals(lsKind, stringValue) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthingvalues", LsThingValue.findLsThingValuesByLsKindEqualsAndStringValueEquals(lsKind, stringValue, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthingvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsKindEqualsAndStringValueLike", "form" }, method = RequestMethod.GET)
-    public String LsThingValueController.findLsThingValuesByLsKindEqualsAndStringValueLikeForm(Model uiModel) {
-        return "lsthingvalues/findLsThingValuesByLsKindEqualsAndStringValueLike";
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEqualsAndStringValueLike", method = RequestMethod.GET)
-    public String LsThingValueController.findLsThingValuesByLsKindEqualsAndStringValueLike(@RequestParam("lsKind") String lsKind, @RequestParam("stringValue") String stringValue, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthingvalues", LsThingValue.findLsThingValuesByLsKindEqualsAndStringValueLike(lsKind, stringValue, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThingValue.countFindLsThingValuesByLsKindEqualsAndStringValueLike(lsKind, stringValue) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthingvalues", LsThingValue.findLsThingValuesByLsKindEqualsAndStringValueLike(lsKind, stringValue, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthingvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsState", "form" }, method = RequestMethod.GET)
-    public String LsThingValueController.findLsThingValuesByLsStateForm(Model uiModel) {
-        uiModel.addAttribute("lsthingstates", LsThingState.findAllLsThingStates());
-        return "lsthingvalues/findLsThingValuesByLsState";
-    }
-    
-    @RequestMapping(params = "find=ByLsState", method = RequestMethod.GET)
-    public String LsThingValueController.findLsThingValuesByLsState(@RequestParam("lsState") LsThingState lsState, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthingvalues", LsThingValue.findLsThingValuesByLsState(lsState, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThingValue.countFindLsThingValuesByLsState(lsState) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthingvalues", LsThingValue.findLsThingValuesByLsState(lsState, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthingvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTransactionEquals", "form" }, method = RequestMethod.GET)
-    public String LsThingValueController.findLsThingValuesByLsTransactionEqualsForm(Model uiModel) {
-        return "lsthingvalues/findLsThingValuesByLsTransactionEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", method = RequestMethod.GET)
-    public String LsThingValueController.findLsThingValuesByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lsthingvalues", LsThingValue.findLsThingValuesByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) LsThingValue.countFindLsThingValuesByLsTransactionEquals(lsTransaction) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lsthingvalues", LsThingValue.findLsThingValuesByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lsthingvalues/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsThingValueController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/LsThingValueController_Roo_Controller_Json.aj
deleted file mode 100755
index d4f10ce30..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsThingValueController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,272 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsThingState;
-import com.labsynch.labseer.domain.LsThingValue;
-import com.labsynch.labseer.web.LsThingValueController;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect LsThingValueController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingValueController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            LsThingValue lsThingValue = LsThingValue.findLsThingValue(id);
-            if (lsThingValue == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(lsThingValue.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingValueController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<LsThingValue> result = LsThingValue.findAllLsThingValues();
-            return new ResponseEntity<String>(LsThingValue.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> LsThingValueController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LsThingValue lsThingValue = LsThingValue.fromJsonToLsThingValue(json);
-            lsThingValue.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+lsThingValue.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> LsThingValueController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (LsThingValue lsThingValue: LsThingValue.fromJsonArrayToLsThingValues(json)) {
-                lsThingValue.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> LsThingValueController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LsThingValue lsThingValue = LsThingValue.fromJsonToLsThingValue(json);
-            lsThingValue.setId(id);
-            if (lsThingValue.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> LsThingValueController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LsThingValue lsThingValue = LsThingValue.findLsThingValue(id);
-            if (lsThingValue == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            lsThingValue.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByCodeValueEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingValueController.jsonFindLsThingValuesByCodeValueEquals(@RequestParam("codeValue") String codeValue) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThingValue.toJsonArray(LsThingValue.findLsThingValuesByCodeValueEquals(codeValue).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByIgnoredNotAndCodeValueEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingValueController.jsonFindLsThingValuesByIgnoredNotAndCodeValueEquals(@RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam("codeValue") String codeValue) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThingValue.toJsonArray(LsThingValue.findLsThingValuesByIgnoredNotAndCodeValueEquals(ignored, codeValue).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEqualsAndCodeValueLike", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingValueController.jsonFindLsThingValuesByLsKindEqualsAndCodeValueLike(@RequestParam("lsKind") String lsKind, @RequestParam("codeValue") String codeValue) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThingValue.toJsonArray(LsThingValue.findLsThingValuesByLsKindEqualsAndCodeValueLike(lsKind, codeValue).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEqualsAndDateValueGreaterThanEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingValueController.jsonFindLsThingValuesByLsKindEqualsAndDateValueGreaterThanEquals(@RequestParam("lsKind") String lsKind, @RequestParam("dateValue") @DateTimeFormat(style = "MM") Date dateValue) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThingValue.toJsonArray(LsThingValue.findLsThingValuesByLsKindEqualsAndDateValueGreaterThanEquals(lsKind, dateValue).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEqualsAndDateValueLessThanEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingValueController.jsonFindLsThingValuesByLsKindEqualsAndDateValueLessThanEquals(@RequestParam("lsKind") String lsKind, @RequestParam("dateValue") @DateTimeFormat(style = "MM") Date dateValue) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThingValue.toJsonArray(LsThingValue.findLsThingValuesByLsKindEqualsAndDateValueLessThanEquals(lsKind, dateValue).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEqualsAndDateValueLike", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingValueController.jsonFindLsThingValuesByLsKindEqualsAndDateValueLike(@RequestParam("lsKind") String lsKind, @RequestParam("dateValue") @DateTimeFormat(style = "MM") Date dateValue) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThingValue.toJsonArray(LsThingValue.findLsThingValuesByLsKindEqualsAndDateValueLike(lsKind, dateValue).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEqualsAndNumericValueEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingValueController.jsonFindLsThingValuesByLsKindEqualsAndNumericValueEquals(@RequestParam("lsKind") String lsKind, @RequestParam("numericValue") BigDecimal numericValue) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThingValue.toJsonArray(LsThingValue.findLsThingValuesByLsKindEqualsAndNumericValueEquals(lsKind, numericValue).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEqualsAndNumericValueGreaterThanEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingValueController.jsonFindLsThingValuesByLsKindEqualsAndNumericValueGreaterThanEquals(@RequestParam("lsKind") String lsKind, @RequestParam("numericValue") BigDecimal numericValue) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThingValue.toJsonArray(LsThingValue.findLsThingValuesByLsKindEqualsAndNumericValueGreaterThanEquals(lsKind, numericValue).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEqualsAndNumericValueLessThanEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingValueController.jsonFindLsThingValuesByLsKindEqualsAndNumericValueLessThanEquals(@RequestParam("lsKind") String lsKind, @RequestParam("numericValue") BigDecimal numericValue) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThingValue.toJsonArray(LsThingValue.findLsThingValuesByLsKindEqualsAndNumericValueLessThanEquals(lsKind, numericValue).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEqualsAndStringValueEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingValueController.jsonFindLsThingValuesByLsKindEqualsAndStringValueEquals(@RequestParam("lsKind") String lsKind, @RequestParam("stringValue") String stringValue) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThingValue.toJsonArray(LsThingValue.findLsThingValuesByLsKindEqualsAndStringValueEquals(lsKind, stringValue).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEqualsAndStringValueLike", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingValueController.jsonFindLsThingValuesByLsKindEqualsAndStringValueLike(@RequestParam("lsKind") String lsKind, @RequestParam("stringValue") String stringValue) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThingValue.toJsonArray(LsThingValue.findLsThingValuesByLsKindEqualsAndStringValueLike(lsKind, stringValue).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsState", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingValueController.jsonFindLsThingValuesByLsState(@RequestParam("lsState") LsThingState lsState) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThingValue.toJsonArray(LsThingValue.findLsThingValuesByLsState(lsState).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsThingValueController.jsonFindLsThingValuesByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(LsThingValue.toJsonArray(LsThingValue.findLsThingValuesByLsTransactionEquals(lsTransaction).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsTransactionController.java b/src/main/java/com/labsynch/labseer/web/LsTransactionController.java
deleted file mode 100755
index 7589eb9b2..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsTransactionController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsTransaction;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = LsTransaction.class)
-@Controller
-@RequestMapping("/lstransactions")
-@RooWebScaffold(path = "lstransactions", formBackingObject = LsTransaction.class)
-public class LsTransactionController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsTransactionController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/LsTransactionController_Roo_Controller.aj
deleted file mode 100755
index 2062e5a59..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsTransactionController_Roo_Controller.aj
+++ /dev/null
@@ -1,114 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsTransaction;
-import com.labsynch.labseer.domain.LsTransactionStatus;
-import com.labsynch.labseer.domain.LsTransactionType;
-import com.labsynch.labseer.web.LsTransactionController;
-import java.io.UnsupportedEncodingException;
-import java.util.Arrays;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect LsTransactionController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String LsTransactionController.create(@Valid LsTransaction lsTransaction, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsTransaction);
-            return "lstransactions/create";
-        }
-        uiModel.asMap().clear();
-        lsTransaction.persist();
-        return "redirect:/lstransactions/" + encodeUrlPathSegment(lsTransaction.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String LsTransactionController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new LsTransaction());
-        return "lstransactions/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String LsTransactionController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("lstransaction", LsTransaction.findLsTransaction(id));
-        uiModel.addAttribute("itemId", id);
-        return "lstransactions/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String LsTransactionController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("lstransactions", LsTransaction.findLsTransactionEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) LsTransaction.countLsTransactions() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("lstransactions", LsTransaction.findAllLsTransactions(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "lstransactions/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String LsTransactionController.update(@Valid LsTransaction lsTransaction, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, lsTransaction);
-            return "lstransactions/update";
-        }
-        uiModel.asMap().clear();
-        lsTransaction.merge();
-        return "redirect:/lstransactions/" + encodeUrlPathSegment(lsTransaction.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String LsTransactionController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, LsTransaction.findLsTransaction(id));
-        return "lstransactions/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String LsTransactionController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        LsTransaction lsTransaction = LsTransaction.findLsTransaction(id);
-        lsTransaction.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/lstransactions";
-    }
-    
-    void LsTransactionController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("lsTransaction_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void LsTransactionController.populateEditForm(Model uiModel, LsTransaction lsTransaction) {
-        uiModel.addAttribute("lsTransaction", lsTransaction);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("lstransactionstatuses", Arrays.asList(LsTransactionStatus.values()));
-        uiModel.addAttribute("lstransactiontypes", Arrays.asList(LsTransactionType.values()));
-    }
-    
-    String LsTransactionController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/LsTransactionController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/LsTransactionController_Roo_Controller_Json.aj
deleted file mode 100644
index 7f8a3b96f..000000000
--- a/src/main/java/com/labsynch/labseer/web/LsTransactionController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,111 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.LsTransaction;
-import com.labsynch.labseer.web.LsTransactionController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect LsTransactionController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsTransactionController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            LsTransaction lsTransaction = LsTransaction.findLsTransaction(id);
-            if (lsTransaction == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(lsTransaction.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> LsTransactionController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<LsTransaction> result = LsTransaction.findAllLsTransactions();
-            return new ResponseEntity<String>(LsTransaction.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> LsTransactionController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LsTransaction lsTransaction = LsTransaction.fromJsonToLsTransaction(json);
-            lsTransaction.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+lsTransaction.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> LsTransactionController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (LsTransaction lsTransaction: LsTransaction.fromJsonArrayToLsTransactions(json)) {
-                lsTransaction.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> LsTransactionController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LsTransaction lsTransaction = LsTransaction.fromJsonToLsTransaction(json);
-            lsTransaction.setId(id);
-            if (lsTransaction.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> LsTransactionController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            LsTransaction lsTransaction = LsTransaction.findLsTransaction(id);
-            if (lsTransaction == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            lsTransaction.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/OperatorKindController.java b/src/main/java/com/labsynch/labseer/web/OperatorKindController.java
deleted file mode 100755
index ad00ac84f..000000000
--- a/src/main/java/com/labsynch/labseer/web/OperatorKindController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.OperatorKind;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RequestMapping("/operatorkinds")
-@Controller
-@RooWebScaffold(path = "operatorkinds", formBackingObject = OperatorKind.class)
-@RooWebJson(jsonObject = OperatorKind.class)
-public class OperatorKindController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/OperatorKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/OperatorKindController_Roo_Controller.aj
deleted file mode 100755
index c50ed2bba..000000000
--- a/src/main/java/com/labsynch/labseer/web/OperatorKindController_Roo_Controller.aj
+++ /dev/null
@@ -1,109 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.OperatorKind;
-import com.labsynch.labseer.domain.OperatorType;
-import com.labsynch.labseer.web.OperatorKindController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect OperatorKindController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String OperatorKindController.create(@Valid OperatorKind operatorKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, operatorKind);
-            return "operatorkinds/create";
-        }
-        uiModel.asMap().clear();
-        operatorKind.persist();
-        return "redirect:/operatorkinds/" + encodeUrlPathSegment(operatorKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String OperatorKindController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new OperatorKind());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (OperatorType.countOperatorTypes() == 0) {
-            dependencies.add(new String[] { "lsType", "operatortypes" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "operatorkinds/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String OperatorKindController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("operatorkind", OperatorKind.findOperatorKind(id));
-        uiModel.addAttribute("itemId", id);
-        return "operatorkinds/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String OperatorKindController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("operatorkinds", OperatorKind.findOperatorKindEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) OperatorKind.countOperatorKinds() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("operatorkinds", OperatorKind.findAllOperatorKinds(sortFieldName, sortOrder));
-        }
-        return "operatorkinds/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String OperatorKindController.update(@Valid OperatorKind operatorKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, operatorKind);
-            return "operatorkinds/update";
-        }
-        uiModel.asMap().clear();
-        operatorKind.merge();
-        return "redirect:/operatorkinds/" + encodeUrlPathSegment(operatorKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String OperatorKindController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, OperatorKind.findOperatorKind(id));
-        return "operatorkinds/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String OperatorKindController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        OperatorKind operatorKind = OperatorKind.findOperatorKind(id);
-        operatorKind.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/operatorkinds";
-    }
-    
-    void OperatorKindController.populateEditForm(Model uiModel, OperatorKind operatorKind) {
-        uiModel.addAttribute("operatorKind", operatorKind);
-        uiModel.addAttribute("operatortypes", OperatorType.findAllOperatorTypes());
-    }
-    
-    String OperatorKindController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/OperatorKindController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/OperatorKindController_Roo_Controller_Json.aj
deleted file mode 100644
index 71f4a62cb..000000000
--- a/src/main/java/com/labsynch/labseer/web/OperatorKindController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,125 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.OperatorKind;
-import com.labsynch.labseer.domain.OperatorType;
-import com.labsynch.labseer.web.OperatorKindController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect OperatorKindController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> OperatorKindController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            OperatorKind operatorKind = OperatorKind.findOperatorKind(id);
-            if (operatorKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(operatorKind.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> OperatorKindController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<OperatorKind> result = OperatorKind.findAllOperatorKinds();
-            return new ResponseEntity<String>(OperatorKind.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> OperatorKindController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            OperatorKind operatorKind = OperatorKind.fromJsonToOperatorKind(json);
-            operatorKind.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+operatorKind.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> OperatorKindController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (OperatorKind operatorKind: OperatorKind.fromJsonArrayToOperatorKinds(json)) {
-                operatorKind.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> OperatorKindController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            OperatorKind operatorKind = OperatorKind.fromJsonToOperatorKind(json);
-            operatorKind.setId(id);
-            if (operatorKind.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> OperatorKindController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            OperatorKind operatorKind = OperatorKind.findOperatorKind(id);
-            if (operatorKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            operatorKind.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByKindNameEqualsAndLsType", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> OperatorKindController.jsonFindOperatorKindsByKindNameEqualsAndLsType(@RequestParam("kindName") String kindName, @RequestParam("lsType") OperatorType lsType) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(OperatorKind.toJsonArray(OperatorKind.findOperatorKindsByKindNameEqualsAndLsType(kindName, lsType).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/OperatorTypeController.java b/src/main/java/com/labsynch/labseer/web/OperatorTypeController.java
deleted file mode 100755
index 0fd69f82d..000000000
--- a/src/main/java/com/labsynch/labseer/web/OperatorTypeController.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.OperatorType;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = OperatorType.class)
-@Controller
-@RequestMapping("/operatortypes")
-@RooWebScaffold(path = "operatortypes", formBackingObject = OperatorType.class)
-@RooWebFinder
-public class OperatorTypeController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/OperatorTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/OperatorTypeController_Roo_Controller.aj
deleted file mode 100755
index 614fa292f..000000000
--- a/src/main/java/com/labsynch/labseer/web/OperatorTypeController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.OperatorType;
-import com.labsynch.labseer.web.OperatorTypeController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect OperatorTypeController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String OperatorTypeController.create(@Valid OperatorType operatorType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, operatorType);
-            return "operatortypes/create";
-        }
-        uiModel.asMap().clear();
-        operatorType.persist();
-        return "redirect:/operatortypes/" + encodeUrlPathSegment(operatorType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String OperatorTypeController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new OperatorType());
-        return "operatortypes/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String OperatorTypeController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("operatortype", OperatorType.findOperatorType(id));
-        uiModel.addAttribute("itemId", id);
-        return "operatortypes/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String OperatorTypeController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("operatortypes", OperatorType.findOperatorTypeEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) OperatorType.countOperatorTypes() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("operatortypes", OperatorType.findAllOperatorTypes(sortFieldName, sortOrder));
-        }
-        return "operatortypes/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String OperatorTypeController.update(@Valid OperatorType operatorType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, operatorType);
-            return "operatortypes/update";
-        }
-        uiModel.asMap().clear();
-        operatorType.merge();
-        return "redirect:/operatortypes/" + encodeUrlPathSegment(operatorType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String OperatorTypeController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, OperatorType.findOperatorType(id));
-        return "operatortypes/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String OperatorTypeController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        OperatorType operatorType = OperatorType.findOperatorType(id);
-        operatorType.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/operatortypes";
-    }
-    
-    void OperatorTypeController.populateEditForm(Model uiModel, OperatorType operatorType) {
-        uiModel.addAttribute("operatorType", operatorType);
-    }
-    
-    String OperatorTypeController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/OperatorTypeController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/OperatorTypeController_Roo_Controller_Finder.aj
deleted file mode 100755
index 0b4d07016..000000000
--- a/src/main/java/com/labsynch/labseer/web/OperatorTypeController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.OperatorType;
-import com.labsynch.labseer.web.OperatorTypeController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect OperatorTypeController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByTypeNameEquals", "form" }, method = RequestMethod.GET)
-    public String OperatorTypeController.findOperatorTypesByTypeNameEqualsForm(Model uiModel) {
-        return "operatortypes/findOperatorTypesByTypeNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByTypeNameEquals", method = RequestMethod.GET)
-    public String OperatorTypeController.findOperatorTypesByTypeNameEquals(@RequestParam("typeName") String typeName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("operatortypes", OperatorType.findOperatorTypesByTypeNameEquals(typeName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) OperatorType.countFindOperatorTypesByTypeNameEquals(typeName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("operatortypes", OperatorType.findOperatorTypesByTypeNameEquals(typeName, sortFieldName, sortOrder).getResultList());
-        }
-        return "operatortypes/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/OperatorTypeController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/OperatorTypeController_Roo_Controller_Json.aj
deleted file mode 100755
index 8d1c440d9..000000000
--- a/src/main/java/com/labsynch/labseer/web/OperatorTypeController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,124 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.OperatorType;
-import com.labsynch.labseer.web.OperatorTypeController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect OperatorTypeController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> OperatorTypeController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            OperatorType operatorType = OperatorType.findOperatorType(id);
-            if (operatorType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(operatorType.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> OperatorTypeController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<OperatorType> result = OperatorType.findAllOperatorTypes();
-            return new ResponseEntity<String>(OperatorType.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> OperatorTypeController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            OperatorType operatorType = OperatorType.fromJsonToOperatorType(json);
-            operatorType.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+operatorType.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> OperatorTypeController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (OperatorType operatorType: OperatorType.fromJsonArrayToOperatorTypes(json)) {
-                operatorType.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> OperatorTypeController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            OperatorType operatorType = OperatorType.fromJsonToOperatorType(json);
-            operatorType.setId(id);
-            if (operatorType.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> OperatorTypeController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            OperatorType operatorType = OperatorType.findOperatorType(id);
-            if (operatorType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            operatorType.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByTypeNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> OperatorTypeController.jsonFindOperatorTypesByTypeNameEquals(@RequestParam("typeName") String typeName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(OperatorType.toJsonArray(OperatorType.findOperatorTypesByTypeNameEquals(typeName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ParentAliasController.java b/src/main/java/com/labsynch/labseer/web/ParentAliasController.java
deleted file mode 100644
index c0da82dd9..000000000
--- a/src/main/java/com/labsynch/labseer/web/ParentAliasController.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.labsynch.labseer.web;
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.domain.ParentAlias;
-
-@RequestMapping("/parentaliases")
-@Controller
-@Transactional
-
-@RooWebJson(jsonObject = ParentAlias.class)
-@RooWebScaffold(path = "parentaliases", formBackingObject = ParentAlias.class)
-@RooWebFinder
-public class ParentAliasController {
-
-    
-	
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ParentAliasController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ParentAliasController_Roo_Controller.aj
deleted file mode 100644
index a9f463375..000000000
--- a/src/main/java/com/labsynch/labseer/web/ParentAliasController_Roo_Controller.aj
+++ /dev/null
@@ -1,102 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.domain.ParentAlias;
-import com.labsynch.labseer.web.ParentAliasController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ParentAliasController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ParentAliasController.create(@Valid ParentAlias parentAlias, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, parentAlias);
-            return "parentaliases/create";
-        }
-        uiModel.asMap().clear();
-        parentAlias.persist();
-        return "redirect:/parentaliases/" + encodeUrlPathSegment(parentAlias.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ParentAliasController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ParentAlias());
-        return "parentaliases/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ParentAliasController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("parentalias", ParentAlias.findParentAlias(id));
-        uiModel.addAttribute("itemId", id);
-        return "parentaliases/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ParentAliasController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("parentaliases", ParentAlias.findParentAliasEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ParentAlias.countParentAliases() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("parentaliases", ParentAlias.findAllParentAliases(sortFieldName, sortOrder));
-        }
-        return "parentaliases/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ParentAliasController.update(@Valid ParentAlias parentAlias, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, parentAlias);
-            return "parentaliases/update";
-        }
-        uiModel.asMap().clear();
-        parentAlias.merge();
-        return "redirect:/parentaliases/" + encodeUrlPathSegment(parentAlias.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ParentAliasController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ParentAlias.findParentAlias(id));
-        return "parentaliases/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ParentAliasController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ParentAlias parentAlias = ParentAlias.findParentAlias(id);
-        parentAlias.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/parentaliases";
-    }
-    
-    void ParentAliasController.populateEditForm(Model uiModel, ParentAlias parentAlias) {
-        uiModel.addAttribute("parentAlias", parentAlias);
-        uiModel.addAttribute("parents", Parent.findAllParents());
-    }
-    
-    String ParentAliasController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ParentAliasController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/ParentAliasController_Roo_Controller_Finder.aj
deleted file mode 100644
index 696d26b6d..000000000
--- a/src/main/java/com/labsynch/labseer/web/ParentAliasController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,114 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.domain.ParentAlias;
-import com.labsynch.labseer.web.ParentAliasController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect ParentAliasController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByAliasNameEquals", "form" }, method = RequestMethod.GET)
-    public String ParentAliasController.findParentAliasesByAliasNameEqualsForm(Model uiModel) {
-        return "parentaliases/findParentAliasesByAliasNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByAliasNameEquals", method = RequestMethod.GET)
-    public String ParentAliasController.findParentAliasesByAliasNameEquals(@RequestParam("aliasName") String aliasName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("parentaliases", ParentAlias.findParentAliasesByAliasNameEquals(aliasName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ParentAlias.countFindParentAliasesByAliasNameEquals(aliasName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("parentaliases", ParentAlias.findParentAliasesByAliasNameEquals(aliasName, sortFieldName, sortOrder).getResultList());
-        }
-        return "parentaliases/list";
-    }
-    
-    @RequestMapping(params = { "find=ByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals", "form" }, method = RequestMethod.GET)
-    public String ParentAliasController.findParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEqualsForm(Model uiModel) {
-        return "parentaliases/findParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals";
-    }
-    
-    @RequestMapping(params = "find=ByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals", method = RequestMethod.GET)
-    public String ParentAliasController.findParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(@RequestParam("aliasName") String aliasName, @RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("parentaliases", ParentAlias.findParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(aliasName, lsType, lsKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ParentAlias.countFindParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(aliasName, lsType, lsKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("parentaliases", ParentAlias.findParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(aliasName, lsType, lsKind, sortFieldName, sortOrder).getResultList());
-        }
-        return "parentaliases/list";
-    }
-    
-    @RequestMapping(params = { "find=ByParent", "form" }, method = RequestMethod.GET)
-    public String ParentAliasController.findParentAliasesByParentForm(Model uiModel) {
-        uiModel.addAttribute("parents", Parent.findAllParents());
-        return "parentaliases/findParentAliasesByParent";
-    }
-    
-    @RequestMapping(params = "find=ByParent", method = RequestMethod.GET)
-    public String ParentAliasController.findParentAliasesByParent(@RequestParam("parent") Parent parent, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("parentaliases", ParentAlias.findParentAliasesByParent(parent, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ParentAlias.countFindParentAliasesByParent(parent) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("parentaliases", ParentAlias.findParentAliasesByParent(parent, sortFieldName, sortOrder).getResultList());
-        }
-        return "parentaliases/list";
-    }
-    
-    @RequestMapping(params = { "find=ByParentAndLsTypeEqualsAndLsKindEquals", "form" }, method = RequestMethod.GET)
-    public String ParentAliasController.findParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsForm(Model uiModel) {
-        uiModel.addAttribute("parents", Parent.findAllParents());
-        return "parentaliases/findParentAliasesByParentAndLsTypeEqualsAndLsKindEquals";
-    }
-    
-    @RequestMapping(params = "find=ByParentAndLsTypeEqualsAndLsKindEquals", method = RequestMethod.GET)
-    public String ParentAliasController.findParentAliasesByParentAndLsTypeEqualsAndLsKindEquals(@RequestParam("parent") Parent parent, @RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("parentaliases", ParentAlias.findParentAliasesByParentAndLsTypeEqualsAndLsKindEquals(parent, lsType, lsKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ParentAlias.countFindParentAliasesByParentAndLsTypeEqualsAndLsKindEquals(parent, lsType, lsKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("parentaliases", ParentAlias.findParentAliasesByParentAndLsTypeEqualsAndLsKindEquals(parent, lsType, lsKind, sortFieldName, sortOrder).getResultList());
-        }
-        return "parentaliases/list";
-    }
-    
-    @RequestMapping(params = { "find=ByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals", "form" }, method = RequestMethod.GET)
-    public String ParentAliasController.findParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEqualsForm(Model uiModel) {
-        uiModel.addAttribute("parents", Parent.findAllParents());
-        return "parentaliases/findParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals", method = RequestMethod.GET)
-    public String ParentAliasController.findParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals(@RequestParam("parent") Parent parent, @RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind, @RequestParam("aliasName") String aliasName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("parentaliases", ParentAlias.findParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals(parent, lsType, lsKind, aliasName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ParentAlias.countFindParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals(parent, lsType, lsKind, aliasName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("parentaliases", ParentAlias.findParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals(parent, lsType, lsKind, aliasName, sortFieldName, sortOrder).getResultList());
-        }
-        return "parentaliases/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ParentAliasController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ParentAliasController_Roo_Controller_Json.aj
deleted file mode 100644
index 9e718ee18..000000000
--- a/src/main/java/com/labsynch/labseer/web/ParentAliasController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,173 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.domain.ParentAlias;
-import com.labsynch.labseer.web.ParentAliasController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ParentAliasController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ParentAliasController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ParentAlias parentAlias = ParentAlias.findParentAlias(id);
-            if (parentAlias == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(parentAlias.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ParentAliasController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ParentAlias> result = ParentAlias.findAllParentAliases();
-            return new ResponseEntity<String>(ParentAlias.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ParentAliasController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ParentAlias parentAlias = ParentAlias.fromJsonToParentAlias(json);
-            parentAlias.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+parentAlias.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ParentAliasController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ParentAlias parentAlias: ParentAlias.fromJsonArrayToParentAliases(json)) {
-                parentAlias.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ParentAliasController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ParentAlias parentAlias = ParentAlias.fromJsonToParentAlias(json);
-            parentAlias.setId(id);
-            if (parentAlias.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ParentAliasController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ParentAlias parentAlias = ParentAlias.findParentAlias(id);
-            if (parentAlias == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            parentAlias.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByAliasNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ParentAliasController.jsonFindParentAliasesByAliasNameEquals(@RequestParam("aliasName") String aliasName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ParentAlias.toJsonArray(ParentAlias.findParentAliasesByAliasNameEquals(aliasName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ParentAliasController.jsonFindParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(@RequestParam("aliasName") String aliasName, @RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ParentAlias.toJsonArray(ParentAlias.findParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(aliasName, lsType, lsKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByParent", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ParentAliasController.jsonFindParentAliasesByParent(@RequestParam("parent") Parent parent) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ParentAlias.toJsonArray(ParentAlias.findParentAliasesByParent(parent).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByParentAndLsTypeEqualsAndLsKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ParentAliasController.jsonFindParentAliasesByParentAndLsTypeEqualsAndLsKindEquals(@RequestParam("parent") Parent parent, @RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ParentAlias.toJsonArray(ParentAlias.findParentAliasesByParentAndLsTypeEqualsAndLsKindEquals(parent, lsType, lsKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ParentAliasController.jsonFindParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals(@RequestParam("parent") Parent parent, @RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind, @RequestParam("aliasName") String aliasName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ParentAlias.toJsonArray(ParentAlias.findParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals(parent, lsType, lsKind, aliasName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ParentAliasKindController.java b/src/main/java/com/labsynch/labseer/web/ParentAliasKindController.java
deleted file mode 100644
index 83e99db6b..000000000
--- a/src/main/java/com/labsynch/labseer/web/ParentAliasKindController.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package com.labsynch.labseer.web;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-import com.labsynch.labseer.domain.ParentAliasKind;
-
-@RooWebScaffold(path = "parentaliaskinds", formBackingObject = ParentAliasKind.class)
-@RequestMapping("/parentaliaskinds")
-@Controller
-@Transactional
-
-@RooWebFinder
-@RooWebJson(jsonObject = ParentAliasKind.class)
-public class ParentAliasKindController {
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        headers.add("Content-Kind", "application/json; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Kind");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
-        try {
-            ParentAliasKind parentAliasKind = ParentAliasKind.findParentAliasKind(id);
-            if (parentAliasKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(parentAliasKind.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":" + e.getMessage() + "\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        headers.add("Content-Kind", "application/json; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Kind");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
-        try {
-            List<ParentAliasKind> result = ParentAliasKind.findAllParentAliasKinds();
-            return new ResponseEntity<String>(ParentAliasKind.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":" + e.getMessage() + "\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        headers.add("Content-Kind", "application/json; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Kind");
-        headers.add("Access-Control-Allow-Origin", "*");
-        try {
-            ParentAliasKind parentAliasKind = ParentAliasKind.fromJsonToParentAliasKind(json);
-            parentAliasKind.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location", uriBuilder.path(a.value()[0] + "/" + parentAliasKind.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(parentAliasKind.toJson(), headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":" + e.getMessage() + "\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        headers.add("Content-Kind", "application/json; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Kind");
-        headers.add("Access-Control-Allow-Origin", "*");
-        Collection<ParentAliasKind> parentAliasKinds = new HashSet<ParentAliasKind>();
-        try {
-            for (ParentAliasKind parentAliasKind : ParentAliasKind.fromJsonArrayToParentAliasKinds(json)) {
-                parentAliasKind.persist();
-                parentAliasKinds.add(parentAliasKind);
-            }
-            return new ResponseEntity<String>(ParentAliasKind.toJsonArray(parentAliasKinds), headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":" + e.getMessage() + "\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        headers.add("Content-Kind", "application/json; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Kind");
-        headers.add("Access-Control-Allow-Origin", "*");
-        try {
-            ParentAliasKind parentAliasKind = ParentAliasKind.fromJsonToParentAliasKind(json);
-            parentAliasKind.setId(id);
-            if (parentAliasKind.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(parentAliasKind.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":" + e.getMessage() + "\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        headers.add("Content-Kind", "application/json; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Kind");
-        headers.add("Access-Control-Allow-Origin", "*");
-        try {
-            ParentAliasKind parentAliasKind = ParentAliasKind.findParentAliasKind(id);
-            if (parentAliasKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            parentAliasKind.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":" + e.getMessage() + "\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    @RequestMapping(method = RequestMethod.OPTIONS)
-    public ResponseEntity<String> getIsotopeOptions() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Kind", "application/json");
-        headers.add("Access-Control-Allow-Headers", "Content-Kind");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
-        headers.setExpires(0); // Expire the cache
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ParentAliasKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ParentAliasKindController_Roo_Controller.aj
deleted file mode 100644
index 99fd18a92..000000000
--- a/src/main/java/com/labsynch/labseer/web/ParentAliasKindController_Roo_Controller.aj
+++ /dev/null
@@ -1,109 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ParentAliasKind;
-import com.labsynch.labseer.domain.ParentAliasType;
-import com.labsynch.labseer.web.ParentAliasKindController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ParentAliasKindController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ParentAliasKindController.create(@Valid ParentAliasKind parentAliasKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, parentAliasKind);
-            return "parentaliaskinds/create";
-        }
-        uiModel.asMap().clear();
-        parentAliasKind.persist();
-        return "redirect:/parentaliaskinds/" + encodeUrlPathSegment(parentAliasKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ParentAliasKindController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ParentAliasKind());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (ParentAliasType.countParentAliasTypes() == 0) {
-            dependencies.add(new String[] { "lsType", "parentaliastypes" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "parentaliaskinds/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ParentAliasKindController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("parentaliaskind", ParentAliasKind.findParentAliasKind(id));
-        uiModel.addAttribute("itemId", id);
-        return "parentaliaskinds/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ParentAliasKindController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("parentaliaskinds", ParentAliasKind.findParentAliasKindEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ParentAliasKind.countParentAliasKinds() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("parentaliaskinds", ParentAliasKind.findAllParentAliasKinds(sortFieldName, sortOrder));
-        }
-        return "parentaliaskinds/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ParentAliasKindController.update(@Valid ParentAliasKind parentAliasKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, parentAliasKind);
-            return "parentaliaskinds/update";
-        }
-        uiModel.asMap().clear();
-        parentAliasKind.merge();
-        return "redirect:/parentaliaskinds/" + encodeUrlPathSegment(parentAliasKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ParentAliasKindController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ParentAliasKind.findParentAliasKind(id));
-        return "parentaliaskinds/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ParentAliasKindController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ParentAliasKind parentAliasKind = ParentAliasKind.findParentAliasKind(id);
-        parentAliasKind.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/parentaliaskinds";
-    }
-    
-    void ParentAliasKindController.populateEditForm(Model uiModel, ParentAliasKind parentAliasKind) {
-        uiModel.addAttribute("parentAliasKind", parentAliasKind);
-        uiModel.addAttribute("parentaliastypes", ParentAliasType.findAllParentAliasTypes());
-    }
-    
-    String ParentAliasKindController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ParentAliasTypeController.java b/src/main/java/com/labsynch/labseer/web/ParentAliasTypeController.java
deleted file mode 100644
index e61851548..000000000
--- a/src/main/java/com/labsynch/labseer/web/ParentAliasTypeController.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package com.labsynch.labseer.web;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-import com.labsynch.labseer.domain.ParentAliasType;
-
-@RooWebScaffold(path = "parentaliastypes", formBackingObject = ParentAliasType.class)
-@RequestMapping("/parentaliastypes")
-@Controller
-@Transactional
-
-@RooWebFinder
-@RooWebJson(jsonObject = ParentAliasType.class)
-public class ParentAliasTypeController {
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Kind", "application/json; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Kind");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
-        headers.setExpires(0); // Expire the cache
-        try {
-            ParentAliasType parentAliasType = ParentAliasType.findParentAliasType(id);
-            if (parentAliasType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(parentAliasType.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":" + e.getMessage() + "\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        headers.add("Content-Kind", "application/json; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Kind");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
-        headers.setExpires(0); // Expire the cache
-        try {
-            List<ParentAliasType> result = ParentAliasType.findAllParentAliasTypes();
-            return new ResponseEntity<String>(ParentAliasType.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":" + e.getMessage() + "\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        headers.add("Content-Kind", "application/json; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Kind");
-        headers.add("Access-Control-Allow-Origin", "*");
-        try {
-            ParentAliasType parentAliasType = ParentAliasType.fromJsonToParentAliasType(json);
-            parentAliasType.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location", uriBuilder.path(a.value()[0] + "/" + parentAliasType.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(parentAliasType.toJson(), headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":" + e.getMessage() + "\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        headers.add("Content-Kind", "application/json; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Kind");
-        headers.add("Access-Control-Allow-Origin", "*");
-        Collection<ParentAliasType> parentAliasTypes = new HashSet<ParentAliasType>();
-        try {
-            for (ParentAliasType parentAliasType : ParentAliasType.fromJsonArrayToParentAliasTypes(json)) {
-                parentAliasType.persist();
-                parentAliasTypes.add(parentAliasType);
-            }
-            return new ResponseEntity<String>(ParentAliasType.toJsonArray(parentAliasTypes), headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":" + e.getMessage() + "\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        headers.add("Content-Kind", "application/json; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Kind");
-        headers.add("Access-Control-Allow-Origin", "*");
-        try {
-            ParentAliasType parentAliasType = ParentAliasType.fromJsonToParentAliasType(json);
-            parentAliasType.setId(id);
-            if (parentAliasType.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(parentAliasType.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":" + e.getMessage() + "\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        headers.add("Content-Kind", "application/json; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Kind");
-        headers.add("Access-Control-Allow-Origin", "*");
-        try {
-            ParentAliasType parentAliasType = ParentAliasType.findParentAliasType(id);
-            if (parentAliasType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            parentAliasType.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":" + e.getMessage() + "\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    @RequestMapping(method = RequestMethod.OPTIONS)
-    public ResponseEntity<String> getIsotopeOptions() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Kind", "application/json");
-        headers.add("Access-Control-Allow-Headers", "Content-Kind");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
-        headers.setExpires(0); // Expire the cache
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ParentAliasTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ParentAliasTypeController_Roo_Controller.aj
deleted file mode 100644
index 8923a555b..000000000
--- a/src/main/java/com/labsynch/labseer/web/ParentAliasTypeController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ParentAliasType;
-import com.labsynch.labseer.web.ParentAliasTypeController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ParentAliasTypeController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ParentAliasTypeController.create(@Valid ParentAliasType parentAliasType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, parentAliasType);
-            return "parentaliastypes/create";
-        }
-        uiModel.asMap().clear();
-        parentAliasType.persist();
-        return "redirect:/parentaliastypes/" + encodeUrlPathSegment(parentAliasType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ParentAliasTypeController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ParentAliasType());
-        return "parentaliastypes/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ParentAliasTypeController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("parentaliastype", ParentAliasType.findParentAliasType(id));
-        uiModel.addAttribute("itemId", id);
-        return "parentaliastypes/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ParentAliasTypeController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("parentaliastypes", ParentAliasType.findParentAliasTypeEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ParentAliasType.countParentAliasTypes() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("parentaliastypes", ParentAliasType.findAllParentAliasTypes(sortFieldName, sortOrder));
-        }
-        return "parentaliastypes/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ParentAliasTypeController.update(@Valid ParentAliasType parentAliasType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, parentAliasType);
-            return "parentaliastypes/update";
-        }
-        uiModel.asMap().clear();
-        parentAliasType.merge();
-        return "redirect:/parentaliastypes/" + encodeUrlPathSegment(parentAliasType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ParentAliasTypeController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ParentAliasType.findParentAliasType(id));
-        return "parentaliastypes/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ParentAliasTypeController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ParentAliasType parentAliasType = ParentAliasType.findParentAliasType(id);
-        parentAliasType.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/parentaliastypes";
-    }
-    
-    void ParentAliasTypeController.populateEditForm(Model uiModel, ParentAliasType parentAliasType) {
-        uiModel.addAttribute("parentAliasType", parentAliasType);
-    }
-    
-    String ParentAliasTypeController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ParentController.java b/src/main/java/com/labsynch/labseer/web/ParentController.java
deleted file mode 100755
index 1edda45e6..000000000
--- a/src/main/java/com/labsynch/labseer/web/ParentController.java
+++ /dev/null
@@ -1,298 +0,0 @@
-package com.labsynch.labseer.web;
-import java.io.UnsupportedEncodingException;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-
-import org.joda.time.format.DateTimeFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.MessageSource;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.domain.SaltForm;
-import com.labsynch.labseer.domain.StereoCategory;
-import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
-import com.labsynch.labseer.service.ChemStructureService;
-import com.labsynch.labseer.service.ErrorMessage;
-import com.labsynch.labseer.service.ParentStructureService;
-import com.labsynch.labseer.service.ChemStructureService.StructureType;
-import com.labsynch.labseer.utils.MoleculeUtil;
-import com.mysema.query.BooleanBuilder;
-import com.mysema.query.types.path.PathBuilder;
-
-@RooWebScaffold(path = "parents", formBackingObject = Parent.class)
-@RequestMapping("/parents")
-@Controller
-@Transactional
-
-@RooWebFinder
-public class ParentController {
-
-	Logger logger = LoggerFactory.getLogger(ParentController.class);
-
-	@Autowired
-	public ConversionService conversionService_dtt;
-
-	@Autowired
-	public MessageSource messageSource_dtt;
-
-	@Autowired
-	private ChemStructureService service;
-
-	@Autowired
-	private ParentStructureService parentService;
-
-	@RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-	@ResponseBody
-	public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
-		Parent parent = Parent.findParent(id);
-		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/text; charset=utf-8");
-		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		if (parent == null) {
-			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-		}
-		return new ResponseEntity<String>(parent.toJson(), headers, HttpStatus.OK);
-	}
-
-	@RequestMapping(headers = "Accept=application/json")
-	@ResponseBody
-	public ResponseEntity<String> listJson() {
-		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/text; charset=utf-8");
-		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		return new ResponseEntity<String>(Parent.toJsonArray(Parent.findAllParents()), headers, HttpStatus.OK);
-	}
-
-	@RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-	public ResponseEntity<String> createFromJson(@RequestBody String json) {
-		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/text");
-		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		Parent parent = Parent.fromJsonToParent(json);
-		parent = this.saveParentStructure(parent);
-		parent.persist();
-		if (parent.getCdId() == -1) {
-			ErrorMessage error = new ErrorMessage();
-			error.setLevel("error");
-			error.setMessage("Bad molformat. Please fix the molfile: " + parent.getMolStructure());
-			return new ResponseEntity<String>(error.toJson(), headers, HttpStatus.BAD_REQUEST);
-		} else if (parent.getCdId() > 0) {
-			try{
-				String molfile = service.toMolfile(parent.getMolStructure());
-				parent.setMolStructure(molfile);
-				parent.persist();
-				return showJson(parent.getId());
-			}catch (CmpdRegMolFormatException e) {
-				return new ResponseEntity<String>("Cannot parse input mol: "+e.toString(), headers, HttpStatus.BAD_REQUEST);
-			}
-		} else {
-			ErrorMessage error = new ErrorMessage();
-			error.setLevel("warning");
-			error.setMessage("Duplicate parent found. Please select existing parent.");
-			return new ResponseEntity<String>(error.toJson(), headers, HttpStatus.CONFLICT);
-		}
-	}
-
-	@RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-	public ResponseEntity<String> createFromJsonArray(@RequestBody String json) {
-		for (Parent parent : Parent.fromJsonArrayToParents(json)) {
-			parent = this.saveParentStructure(parent);
-			parent.persist();
-		}
-		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/text");
-		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-	}
-
-	@RequestMapping(method = RequestMethod.PUT, headers = "Accept=application/json")
-	public ResponseEntity<String> updateFromJson(@RequestBody String json) {
-		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/text");
-		if (Parent.fromJsonToParent(json).merge() == null) {
-			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-		}
-		return new ResponseEntity<String>(headers, HttpStatus.OK);
-	}
-
-	@RequestMapping(value = "/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-	public ResponseEntity<String> updateFromJsonArray(@RequestBody String json) {
-		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/text");
-		for (Parent parent : Parent.fromJsonArrayToParents(json)) {
-			if (parent.merge() == null) {
-				return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-			}
-		}
-		return new ResponseEntity<String>(headers, HttpStatus.OK);
-	}
-
-	@RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-	public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
-		Parent parent = Parent.findParent(id);
-		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/text");
-		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		if (parent == null) {
-			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-		}
-		parent.remove();
-		return new ResponseEntity<String>(headers, HttpStatus.OK);
-	}
-
-	@RequestMapping(method = RequestMethod.POST)
-	public String create(@Valid Parent parent, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-		if (bindingResult.hasErrors()) {
-			uiModel.addAttribute("parent", parent);
-			return "parents/create";
-		}
-		uiModel.asMap().clear();
-		parent = this.saveParentStructure(parent);
-		String molfile;
-		try {
-			molfile = service.toMolfile(parent.getMolStructure());
-			parent.setMolStructure(molfile);
-			parent.persist();
-			return "redirect:/parents/" + encodeUrlPathSegment(parent.getId().toString(), httpServletRequest);
-		} catch (CmpdRegMolFormatException e) {
-			logger.error("Cannot parse input mol: "+e.toString());
-		}
-		return "redirect:/error/";
-	}
-
-	private Parent saveParentStructure(Parent parent) {
-		int parentCdId = service.saveStructure(parent.getMolStructure(), StructureType.PARENT);
-		parent.setCdId(parentCdId);
-		return parent;
-	}
-
-	@RequestMapping(params = "form", method = RequestMethod.GET)
-	public String createForm(Model uiModel) {
-		uiModel.addAttribute("parent", new Parent());
-		return "parents/create";
-	}
-
-	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
-	public String show(@PathVariable("id") Long id, Model uiModel) {
-		uiModel.addAttribute("parent", Parent.findParent(id));
-		uiModel.addAttribute("itemId", id);
-		return "parents/show";
-	}
-
-	@RequestMapping(method = RequestMethod.GET)
-	public String list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-		if (page != null || size != null) {
-			int sizeNo = size == null ? 10 : size.intValue();
-			uiModel.addAttribute("parents", Parent.findParentEntries(page == null ? 0 : (page.intValue() - 1) * sizeNo, sizeNo));
-			float nrOfPages = (float) Parent.countParents() / sizeNo;
-			uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-		} else {
-			uiModel.addAttribute("parents", Parent.findParentEntries(0, 10));
-		}
-		return "parents/list";
-	}
-
-	@Transactional
-	@RequestMapping(method = RequestMethod.PUT)
-	public String update(@Valid Parent parent, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-		if (bindingResult.hasErrors()) {
-			uiModel.addAttribute("parent", parent);
-			return "parents/update";
-		}
-		uiModel.asMap().clear();
-		try {
-			logger.debug("Parent weight: " + service.getMolWeight(parent.getMolStructure()));
-		} catch (CmpdRegMolFormatException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		parentService.update(parent);
-		//		  parent.merge();
-		return "redirect:/parents/" + encodeUrlPathSegment(parent.getId().toString(), httpServletRequest);
-	}
-
-	@RequestMapping(value = "/{id}", params = "form", method = RequestMethod.GET)
-	public String updateForm(@PathVariable("id") Long id, Model uiModel) {
-		uiModel.addAttribute("parent", Parent.findParent(id));
-		return "parents/update";
-	}
-
-	@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-	public String delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-		Parent.findParent(id).remove();
-		uiModel.asMap().clear();
-		uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-		uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-		return "redirect:/parents";
-	}
-
-	@ModelAttribute("parents")
-	public Collection<Parent> populateParents() {
-		return Parent.findParentEntries(0, 2);
-	}
-
-	@ModelAttribute("saltforms")
-	public Collection<SaltForm> populateSaltForms() {
-		return SaltForm.findSaltFormEntries(0, 2);
-	}
-
-	@ModelAttribute("stereocategorys")
-	public Collection<StereoCategory> populateStereoCategorys() {
-		return StereoCategory.findAllStereoCategorys();
-	}
-
-	String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-		String enc = httpServletRequest.getCharacterEncoding();
-		if (enc == null) {
-			enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-		}
-		pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-		return pathSegment;
-	}
-
-	@RequestMapping(method = RequestMethod.OPTIONS)
-	public ResponseEntity<String> getOptions() {
-		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/text, text/html");
-		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
-		headers.setExpires(0); // Expire the cache
-		return new ResponseEntity<String>(headers, HttpStatus.OK);
-	}
-
-	void addDateTimeFormatPatterns(Model uiModel) {
-		uiModel.addAttribute("parent_registrationdate_date_format", DateTimeFormat.patternForStyle("S-", LocaleContextHolder.getLocale()));
-		uiModel.addAttribute("parent_modifieddate_date_format", DateTimeFormat.patternForStyle("S-", LocaleContextHolder.getLocale()));
-	}
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ParentController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ParentController_Roo_Controller.aj
deleted file mode 100644
index 4269ba523..000000000
--- a/src/main/java/com/labsynch/labseer/web/ParentController_Roo_Controller.aj
+++ /dev/null
@@ -1,29 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.BulkLoadFile;
-import com.labsynch.labseer.domain.CompoundType;
-import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.domain.ParentAlias;
-import com.labsynch.labseer.domain.ParentAnnotation;
-import com.labsynch.labseer.domain.SaltForm;
-import com.labsynch.labseer.domain.StereoCategory;
-import com.labsynch.labseer.web.ParentController;
-import org.springframework.ui.Model;
-
-privileged aspect ParentController_Roo_Controller {
-    
-    void ParentController.populateEditForm(Model uiModel, Parent parent) {
-        uiModel.addAttribute("parent", parent);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("bulkloadfiles", BulkLoadFile.findAllBulkLoadFiles());
-        uiModel.addAttribute("compoundtypes", CompoundType.findAllCompoundTypes());
-        uiModel.addAttribute("parentaliases", ParentAlias.findAllParentAliases());
-        uiModel.addAttribute("parentannotations", ParentAnnotation.findAllParentAnnotations());
-        uiModel.addAttribute("saltforms", SaltForm.findAllSaltForms());
-        uiModel.addAttribute("stereocategorys", StereoCategory.findAllStereoCategorys());
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ParentController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/ParentController_Roo_Controller_Finder.aj
deleted file mode 100644
index 2a5de4924..000000000
--- a/src/main/java/com/labsynch/labseer/web/ParentController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,140 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.BulkLoadFile;
-import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.domain.SaltForm;
-import com.labsynch.labseer.web.ParentController;
-import java.util.Set;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect ParentController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByBulkLoadFileEquals", "form" }, method = RequestMethod.GET)
-    public String ParentController.findParentsByBulkLoadFileEqualsForm(Model uiModel) {
-        uiModel.addAttribute("bulkloadfiles", BulkLoadFile.findAllBulkLoadFiles());
-        return "parents/findParentsByBulkLoadFileEquals";
-    }
-    
-    @RequestMapping(params = "find=ByBulkLoadFileEquals", method = RequestMethod.GET)
-    public String ParentController.findParentsByBulkLoadFileEquals(@RequestParam("bulkLoadFile") BulkLoadFile bulkLoadFile, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("parents", Parent.findParentsByBulkLoadFileEquals(bulkLoadFile, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Parent.countFindParentsByBulkLoadFileEquals(bulkLoadFile) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("parents", Parent.findParentsByBulkLoadFileEquals(bulkLoadFile, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "parents/list";
-    }
-    
-    @RequestMapping(params = { "find=ByCdId", "form" }, method = RequestMethod.GET)
-    public String ParentController.findParentsByCdIdForm(Model uiModel) {
-        return "parents/findParentsByCdId";
-    }
-    
-    @RequestMapping(params = "find=ByCdId", method = RequestMethod.GET)
-    public String ParentController.findParentsByCdId(@RequestParam("cdId") int CdId, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("parents", Parent.findParentsByCdId(CdId, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Parent.countFindParentsByCdId(CdId) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("parents", Parent.findParentsByCdId(CdId, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "parents/list";
-    }
-    
-    @RequestMapping(params = { "find=ByCommonNameLike", "form" }, method = RequestMethod.GET)
-    public String ParentController.findParentsByCommonNameLikeForm(Model uiModel) {
-        return "parents/findParentsByCommonNameLike";
-    }
-    
-    @RequestMapping(params = "find=ByCommonNameLike", method = RequestMethod.GET)
-    public String ParentController.findParentsByCommonNameLike(@RequestParam("commonName") String commonName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("parents", Parent.findParentsByCommonNameLike(commonName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Parent.countFindParentsByCommonNameLike(commonName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("parents", Parent.findParentsByCommonNameLike(commonName, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "parents/list";
-    }
-    
-    @RequestMapping(params = { "find=ByCorpNameEquals", "form" }, method = RequestMethod.GET)
-    public String ParentController.findParentsByCorpNameEqualsForm(Model uiModel) {
-        return "parents/findParentsByCorpNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByCorpNameEquals", method = RequestMethod.GET)
-    public String ParentController.findParentsByCorpNameEquals(@RequestParam("corpName") String corpName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("parents", Parent.findParentsByCorpNameEquals(corpName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Parent.countFindParentsByCorpNameEquals(corpName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("parents", Parent.findParentsByCorpNameEquals(corpName, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "parents/list";
-    }
-    
-    @RequestMapping(params = { "find=ByCorpNameLike", "form" }, method = RequestMethod.GET)
-    public String ParentController.findParentsByCorpNameLikeForm(Model uiModel) {
-        return "parents/findParentsByCorpNameLike";
-    }
-    
-    @RequestMapping(params = "find=ByCorpNameLike", method = RequestMethod.GET)
-    public String ParentController.findParentsByCorpNameLike(@RequestParam("corpName") String corpName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("parents", Parent.findParentsByCorpNameLike(corpName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Parent.countFindParentsByCorpNameLike(corpName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("parents", Parent.findParentsByCorpNameLike(corpName, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "parents/list";
-    }
-    
-    @RequestMapping(params = { "find=BySaltForms", "form" }, method = RequestMethod.GET)
-    public String ParentController.findParentsBySaltFormsForm(Model uiModel) {
-        uiModel.addAttribute("saltforms", SaltForm.findAllSaltForms());
-        return "parents/findParentsBySaltForms";
-    }
-    
-    @RequestMapping(params = "find=BySaltForms", method = RequestMethod.GET)
-    public String ParentController.findParentsBySaltForms(@RequestParam("saltForms") Set<SaltForm> saltForms, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("parents", Parent.findParentsBySaltForms(saltForms, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Parent.countFindParentsBySaltForms(saltForms) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("parents", Parent.findParentsBySaltForms(saltForms, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "parents/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/PreDef_CorpNameController.java b/src/main/java/com/labsynch/labseer/web/PreDef_CorpNameController.java
deleted file mode 100644
index 0b2f46022..000000000
--- a/src/main/java/com/labsynch/labseer/web/PreDef_CorpNameController.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.labsynch.labseer.web;
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.domain.PreDef_CorpName;
-
-@RequestMapping("/predef_corpnames")
-@Controller
-@RooWebScaffold(path = "predef_corpnames", formBackingObject = PreDef_CorpName.class)
-
-public class PreDef_CorpNameController {
-
-}
diff --git a/src/main/java/com/labsynch/labseer/web/PreDef_CorpNameController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/PreDef_CorpNameController_Roo_Controller.aj
deleted file mode 100644
index 45dbd1d7e..000000000
--- a/src/main/java/com/labsynch/labseer/web/PreDef_CorpNameController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.PreDef_CorpName;
-import com.labsynch.labseer.web.PreDef_CorpNameController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect PreDef_CorpNameController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String PreDef_CorpNameController.create(@Valid PreDef_CorpName preDef_CorpName, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, preDef_CorpName);
-            return "predef_corpnames/create";
-        }
-        uiModel.asMap().clear();
-        preDef_CorpName.persist();
-        return "redirect:/predef_corpnames/" + encodeUrlPathSegment(preDef_CorpName.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String PreDef_CorpNameController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new PreDef_CorpName());
-        return "predef_corpnames/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String PreDef_CorpNameController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("predef_corpname", PreDef_CorpName.findPreDef_CorpName(id));
-        uiModel.addAttribute("itemId", id);
-        return "predef_corpnames/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String PreDef_CorpNameController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("predef_corpnames", PreDef_CorpName.findPreDef_CorpNameEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) PreDef_CorpName.countPreDef_CorpNames() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("predef_corpnames", PreDef_CorpName.findAllPreDef_CorpNames(sortFieldName, sortOrder));
-        }
-        return "predef_corpnames/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String PreDef_CorpNameController.update(@Valid PreDef_CorpName preDef_CorpName, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, preDef_CorpName);
-            return "predef_corpnames/update";
-        }
-        uiModel.asMap().clear();
-        preDef_CorpName.merge();
-        return "redirect:/predef_corpnames/" + encodeUrlPathSegment(preDef_CorpName.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String PreDef_CorpNameController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, PreDef_CorpName.findPreDef_CorpName(id));
-        return "predef_corpnames/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String PreDef_CorpNameController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        PreDef_CorpName preDef_CorpName = PreDef_CorpName.findPreDef_CorpName(id);
-        preDef_CorpName.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/predef_corpnames";
-    }
-    
-    void PreDef_CorpNameController.populateEditForm(Model uiModel, PreDef_CorpName preDef_CorpName) {
-        uiModel.addAttribute("preDef_CorpName", preDef_CorpName);
-    }
-    
-    String PreDef_CorpNameController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/PreferredNameDTOController.java b/src/main/java/com/labsynch/labseer/web/PreferredNameDTOController.java
deleted file mode 100755
index 859d9000e..000000000
--- a/src/main/java/com/labsynch/labseer/web/PreferredNameDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.PreferredNameDTO;
-
-@RooWebJson(jsonObject = PreferredNameDTO.class)
-@Controller
-@RequestMapping("/preferrednamedto")
-public class PreferredNameDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/PreferredNameRequestDTOController.java b/src/main/java/com/labsynch/labseer/web/PreferredNameRequestDTOController.java
deleted file mode 100755
index e4cdaaa33..000000000
--- a/src/main/java/com/labsynch/labseer/web/PreferredNameRequestDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.PreferredNameRequestDTO;
-
-@RooWebJson(jsonObject = PreferredNameRequestDTO.class)
-@Controller
-@RequestMapping("/preferrednamerequestdto")
-public class PreferredNameRequestDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/PreferredNameResultsDTOController.java b/src/main/java/com/labsynch/labseer/web/PreferredNameResultsDTOController.java
deleted file mode 100755
index 5408f9c04..000000000
--- a/src/main/java/com/labsynch/labseer/web/PreferredNameResultsDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.PreferredNameResultsDTO;
-
-@RooWebJson(jsonObject = PreferredNameResultsDTO.class)
-@Controller
-@RequestMapping("/preferrednameresultsdto")
-public class PreferredNameResultsDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/PreferredNameWithErrorDTOController.java b/src/main/java/com/labsynch/labseer/web/PreferredNameWithErrorDTOController.java
deleted file mode 100755
index efc7e3aa0..000000000
--- a/src/main/java/com/labsynch/labseer/web/PreferredNameWithErrorDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.PreferredNameWithErrorDTO;
-
-@RooWebJson(jsonObject = PreferredNameWithErrorDTO.class)
-@Controller
-@RequestMapping("/preferrednamewitherroes")
-public class PreferredNameWithErrorDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolController.java b/src/main/java/com/labsynch/labseer/web/ProtocolController.java
deleted file mode 100755
index df2a2af1c..000000000
--- a/src/main/java/com/labsynch/labseer/web/ProtocolController.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.dto.CodeTableDTO;
-import com.labsynch.labseer.exceptions.UniqueNameException;
-import com.labsynch.labseer.service.ProtocolService;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.apache.commons.io.IOUtils;
-import org.joda.time.format.DateTimeFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.HandlerMapping;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-@RooWebJson(jsonObject = Protocol.class)
-@Controller
-@RequestMapping("/protocols")
-@RooWebScaffold(path = "protocols", formBackingObject = Protocol.class)
-@RooWebFinder
-public class ProtocolController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ProtocolController_Roo_Controller.aj
deleted file mode 100644
index 5cc7d6756..000000000
--- a/src/main/java/com/labsynch/labseer/web/ProtocolController_Roo_Controller.aj
+++ /dev/null
@@ -1,122 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ItxProtocolProtocol;
-import com.labsynch.labseer.domain.LsTag;
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ProtocolLabel;
-import com.labsynch.labseer.domain.ProtocolState;
-import com.labsynch.labseer.domain.ThingPage;
-import com.labsynch.labseer.web.ProtocolController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ProtocolController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ProtocolController.create(@Valid Protocol protocol, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, protocol);
-            return "protocols/create";
-        }
-        uiModel.asMap().clear();
-        protocol.persist();
-        return "redirect:/protocols/" + encodeUrlPathSegment(protocol.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ProtocolController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new Protocol());
-        return "protocols/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ProtocolController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("protocol", Protocol.findProtocol(id));
-        uiModel.addAttribute("itemId", id);
-        return "protocols/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ProtocolController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocols", Protocol.findProtocolEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) Protocol.countProtocols() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocols", Protocol.findAllProtocols(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "protocols/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ProtocolController.update(@Valid Protocol protocol, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, protocol);
-            return "protocols/update";
-        }
-        uiModel.asMap().clear();
-        protocol.merge();
-        return "redirect:/protocols/" + encodeUrlPathSegment(protocol.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ProtocolController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, Protocol.findProtocol(id));
-        return "protocols/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ProtocolController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        Protocol protocol = Protocol.findProtocol(id);
-        protocol.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/protocols";
-    }
-    
-    void ProtocolController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("protocol_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("protocol_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ProtocolController.populateEditForm(Model uiModel, Protocol protocol) {
-        uiModel.addAttribute("protocol", protocol);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("experiments", Experiment.findAllExperiments());
-        uiModel.addAttribute("itxprotocolprotocols", ItxProtocolProtocol.findAllItxProtocolProtocols());
-        uiModel.addAttribute("lstags", LsTag.findAllLsTags());
-        uiModel.addAttribute("protocollabels", ProtocolLabel.findAllProtocolLabels());
-        uiModel.addAttribute("protocolstates", ProtocolState.findAllProtocolStates());
-        uiModel.addAttribute("thingpages", ThingPage.findAllThingPages());
-    }
-    
-    String ProtocolController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/ProtocolController_Roo_Controller_Finder.aj
deleted file mode 100755
index 916ad9817..000000000
--- a/src/main/java/com/labsynch/labseer/web/ProtocolController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,255 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.web.ProtocolController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect ProtocolController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByCodeNameEquals", "form" }, method = RequestMethod.GET)
-    public String ProtocolController.findProtocolsByCodeNameEqualsForm(Model uiModel) {
-        return "protocols/findProtocolsByCodeNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByCodeNameEquals", method = RequestMethod.GET)
-    public String ProtocolController.findProtocolsByCodeNameEquals(@RequestParam("codeName") String codeName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocols", Protocol.findProtocolsByCodeNameEquals(codeName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Protocol.countFindProtocolsByCodeNameEquals(codeName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocols", Protocol.findProtocolsByCodeNameEquals(codeName, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "protocols/list";
-    }
-    
-    @RequestMapping(params = { "find=ByCodeNameEqualsAndIgnoredNot", "form" }, method = RequestMethod.GET)
-    public String ProtocolController.findProtocolsByCodeNameEqualsAndIgnoredNotForm(Model uiModel) {
-        return "protocols/findProtocolsByCodeNameEqualsAndIgnoredNot";
-    }
-    
-    @RequestMapping(params = "find=ByCodeNameEqualsAndIgnoredNot", method = RequestMethod.GET)
-    public String ProtocolController.findProtocolsByCodeNameEqualsAndIgnoredNot(@RequestParam("codeName") String codeName, @RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocols", Protocol.findProtocolsByCodeNameEqualsAndIgnoredNot(codeName, ignored, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Protocol.countFindProtocolsByCodeNameEqualsAndIgnoredNot(codeName, ignored) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocols", Protocol.findProtocolsByCodeNameEqualsAndIgnoredNot(codeName, ignored, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "protocols/list";
-    }
-    
-    @RequestMapping(params = { "find=ByCodeNameLike", "form" }, method = RequestMethod.GET)
-    public String ProtocolController.findProtocolsByCodeNameLikeForm(Model uiModel) {
-        return "protocols/findProtocolsByCodeNameLike";
-    }
-    
-    @RequestMapping(params = "find=ByCodeNameLike", method = RequestMethod.GET)
-    public String ProtocolController.findProtocolsByCodeNameLike(@RequestParam("codeName") String codeName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocols", Protocol.findProtocolsByCodeNameLike(codeName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Protocol.countFindProtocolsByCodeNameLike(codeName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocols", Protocol.findProtocolsByCodeNameLike(codeName, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "protocols/list";
-    }
-    
-    @RequestMapping(params = { "find=ByIgnoredNot", "form" }, method = RequestMethod.GET)
-    public String ProtocolController.findProtocolsByIgnoredNotForm(Model uiModel) {
-        return "protocols/findProtocolsByIgnoredNot";
-    }
-    
-    @RequestMapping(params = "find=ByIgnoredNot", method = RequestMethod.GET)
-    public String ProtocolController.findProtocolsByIgnoredNot(@RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocols", Protocol.findProtocolsByIgnoredNot(ignored, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Protocol.countFindProtocolsByIgnoredNot(ignored) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocols", Protocol.findProtocolsByIgnoredNot(ignored, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "protocols/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsKindEquals", "form" }, method = RequestMethod.GET)
-    public String ProtocolController.findProtocolsByLsKindEqualsForm(Model uiModel) {
-        return "protocols/findProtocolsByLsKindEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEquals", method = RequestMethod.GET)
-    public String ProtocolController.findProtocolsByLsKindEquals(@RequestParam("lsKind") String lsKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocols", Protocol.findProtocolsByLsKindEquals(lsKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Protocol.countFindProtocolsByLsKindEquals(lsKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocols", Protocol.findProtocolsByLsKindEquals(lsKind, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "protocols/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsKindLike", "form" }, method = RequestMethod.GET)
-    public String ProtocolController.findProtocolsByLsKindLikeForm(Model uiModel) {
-        return "protocols/findProtocolsByLsKindLike";
-    }
-    
-    @RequestMapping(params = "find=ByLsKindLike", method = RequestMethod.GET)
-    public String ProtocolController.findProtocolsByLsKindLike(@RequestParam("lsKind") String lsKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocols", Protocol.findProtocolsByLsKindLike(lsKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Protocol.countFindProtocolsByLsKindLike(lsKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocols", Protocol.findProtocolsByLsKindLike(lsKind, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "protocols/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTransactionEquals", "form" }, method = RequestMethod.GET)
-    public String ProtocolController.findProtocolsByLsTransactionEqualsForm(Model uiModel) {
-        return "protocols/findProtocolsByLsTransactionEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", method = RequestMethod.GET)
-    public String ProtocolController.findProtocolsByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocols", Protocol.findProtocolsByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Protocol.countFindProtocolsByLsTransactionEquals(lsTransaction) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocols", Protocol.findProtocolsByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "protocols/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeAndKindEquals", "form" }, method = RequestMethod.GET)
-    public String ProtocolController.findProtocolsByLsTypeAndKindEqualsForm(Model uiModel) {
-        return "protocols/findProtocolsByLsTypeAndKindEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeAndKindEquals", method = RequestMethod.GET)
-    public String ProtocolController.findProtocolsByLsTypeAndKindEquals(@RequestParam("lsTypeAndKind") String lsTypeAndKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocols", Protocol.findProtocolsByLsTypeAndKindEquals(lsTypeAndKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Protocol.countFindProtocolsByLsTypeAndKindEquals(lsTypeAndKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocols", Protocol.findProtocolsByLsTypeAndKindEquals(lsTypeAndKind, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "protocols/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeEquals", "form" }, method = RequestMethod.GET)
-    public String ProtocolController.findProtocolsByLsTypeEqualsForm(Model uiModel) {
-        return "protocols/findProtocolsByLsTypeEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEquals", method = RequestMethod.GET)
-    public String ProtocolController.findProtocolsByLsTypeEquals(@RequestParam("lsType") String lsType, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocols", Protocol.findProtocolsByLsTypeEquals(lsType, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Protocol.countFindProtocolsByLsTypeEquals(lsType) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocols", Protocol.findProtocolsByLsTypeEquals(lsType, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "protocols/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeEqualsAndLsKindEquals", "form" }, method = RequestMethod.GET)
-    public String ProtocolController.findProtocolsByLsTypeEqualsAndLsKindEqualsForm(Model uiModel) {
-        return "protocols/findProtocolsByLsTypeEqualsAndLsKindEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEquals", method = RequestMethod.GET)
-    public String ProtocolController.findProtocolsByLsTypeEqualsAndLsKindEquals(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocols", Protocol.findProtocolsByLsTypeEqualsAndLsKindEquals(lsType, lsKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Protocol.countFindProtocolsByLsTypeEqualsAndLsKindEquals(lsType, lsKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocols", Protocol.findProtocolsByLsTypeEqualsAndLsKindEquals(lsType, lsKind, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "protocols/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeLike", "form" }, method = RequestMethod.GET)
-    public String ProtocolController.findProtocolsByLsTypeLikeForm(Model uiModel) {
-        return "protocols/findProtocolsByLsTypeLike";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeLike", method = RequestMethod.GET)
-    public String ProtocolController.findProtocolsByLsTypeLike(@RequestParam("lsType") String lsType, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocols", Protocol.findProtocolsByLsTypeLike(lsType, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Protocol.countFindProtocolsByLsTypeLike(lsType) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocols", Protocol.findProtocolsByLsTypeLike(lsType, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "protocols/list";
-    }
-    
-    @RequestMapping(params = { "find=ByRecordedByLike", "form" }, method = RequestMethod.GET)
-    public String ProtocolController.findProtocolsByRecordedByLikeForm(Model uiModel) {
-        return "protocols/findProtocolsByRecordedByLike";
-    }
-    
-    @RequestMapping(params = "find=ByRecordedByLike", method = RequestMethod.GET)
-    public String ProtocolController.findProtocolsByRecordedByLike(@RequestParam("recordedBy") String recordedBy, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocols", Protocol.findProtocolsByRecordedByLike(recordedBy, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Protocol.countFindProtocolsByRecordedByLike(recordedBy) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocols", Protocol.findProtocolsByRecordedByLike(recordedBy, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "protocols/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ProtocolController_Roo_Controller_Json.aj
deleted file mode 100755
index 7d0392a8d..000000000
--- a/src/main/java/com/labsynch/labseer/web/ProtocolController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,256 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.web.ProtocolController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ProtocolController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            Protocol protocol = Protocol.findProtocol(id);
-            if (protocol == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(protocol.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<Protocol> result = Protocol.findAllProtocols();
-            return new ResponseEntity<String>(Protocol.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ProtocolController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            Protocol protocol = Protocol.fromJsonToProtocol(json);
-            protocol.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+protocol.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ProtocolController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (Protocol protocol: Protocol.fromJsonArrayToProtocols(json)) {
-                protocol.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ProtocolController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            Protocol protocol = Protocol.fromJsonToProtocol(json);
-            protocol.setId(id);
-            if (protocol.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ProtocolController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            Protocol protocol = Protocol.findProtocol(id);
-            if (protocol == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            protocol.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByCodeNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolController.jsonFindProtocolsByCodeNameEquals(@RequestParam("codeName") String codeName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Protocol.toJsonArray(Protocol.findProtocolsByCodeNameEquals(codeName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByCodeNameEqualsAndIgnoredNot", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolController.jsonFindProtocolsByCodeNameEqualsAndIgnoredNot(@RequestParam("codeName") String codeName, @RequestParam(value = "ignored", required = false) boolean ignored) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Protocol.toJsonArray(Protocol.findProtocolsByCodeNameEqualsAndIgnoredNot(codeName, ignored).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByCodeNameLike", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolController.jsonFindProtocolsByCodeNameLike(@RequestParam("codeName") String codeName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Protocol.toJsonArray(Protocol.findProtocolsByCodeNameLike(codeName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByIgnoredNot", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolController.jsonFindProtocolsByIgnoredNot(@RequestParam(value = "ignored", required = false) boolean ignored) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Protocol.toJsonArray(Protocol.findProtocolsByIgnoredNot(ignored).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolController.jsonFindProtocolsByLsKindEquals(@RequestParam("lsKind") String lsKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Protocol.toJsonArray(Protocol.findProtocolsByLsKindEquals(lsKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsKindLike", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolController.jsonFindProtocolsByLsKindLike(@RequestParam("lsKind") String lsKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Protocol.toJsonArray(Protocol.findProtocolsByLsKindLike(lsKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolController.jsonFindProtocolsByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Protocol.toJsonArray(Protocol.findProtocolsByLsTransactionEquals(lsTransaction).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeAndKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolController.jsonFindProtocolsByLsTypeAndKindEquals(@RequestParam("lsTypeAndKind") String lsTypeAndKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Protocol.toJsonArray(Protocol.findProtocolsByLsTypeAndKindEquals(lsTypeAndKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolController.jsonFindProtocolsByLsTypeEquals(@RequestParam("lsType") String lsType) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Protocol.toJsonArray(Protocol.findProtocolsByLsTypeEquals(lsType).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolController.jsonFindProtocolsByLsTypeEqualsAndLsKindEquals(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Protocol.toJsonArray(Protocol.findProtocolsByLsTypeEqualsAndLsKindEquals(lsType, lsKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeLike", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolController.jsonFindProtocolsByLsTypeLike(@RequestParam("lsType") String lsType) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Protocol.toJsonArray(Protocol.findProtocolsByLsTypeLike(lsType).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByRecordedByLike", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolController.jsonFindProtocolsByRecordedByLike(@RequestParam("recordedBy") String recordedBy) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Protocol.toJsonArray(Protocol.findProtocolsByRecordedByLike(recordedBy).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolKindController.java b/src/main/java/com/labsynch/labseer/web/ProtocolKindController.java
deleted file mode 100755
index 514c4a439..000000000
--- a/src/main/java/com/labsynch/labseer/web/ProtocolKindController.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ProtocolKind;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = ProtocolKind.class)
-@RequestMapping("/protocolkinds")
-@Controller
-@RooWebScaffold(path = "protocolkinds", formBackingObject = ProtocolKind.class)
-@RooWebFinder
-public class ProtocolKindController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ProtocolKindController_Roo_Controller.aj
deleted file mode 100755
index 937a45fec..000000000
--- a/src/main/java/com/labsynch/labseer/web/ProtocolKindController_Roo_Controller.aj
+++ /dev/null
@@ -1,109 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ProtocolKind;
-import com.labsynch.labseer.domain.ProtocolType;
-import com.labsynch.labseer.web.ProtocolKindController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ProtocolKindController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ProtocolKindController.create(@Valid ProtocolKind protocolKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, protocolKind);
-            return "protocolkinds/create";
-        }
-        uiModel.asMap().clear();
-        protocolKind.persist();
-        return "redirect:/protocolkinds/" + encodeUrlPathSegment(protocolKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ProtocolKindController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ProtocolKind());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (ProtocolType.countProtocolTypes() == 0) {
-            dependencies.add(new String[] { "lsType", "protocoltypes" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "protocolkinds/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ProtocolKindController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("protocolkind", ProtocolKind.findProtocolKind(id));
-        uiModel.addAttribute("itemId", id);
-        return "protocolkinds/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ProtocolKindController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocolkinds", ProtocolKind.findProtocolKindEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ProtocolKind.countProtocolKinds() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocolkinds", ProtocolKind.findAllProtocolKinds(sortFieldName, sortOrder));
-        }
-        return "protocolkinds/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ProtocolKindController.update(@Valid ProtocolKind protocolKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, protocolKind);
-            return "protocolkinds/update";
-        }
-        uiModel.asMap().clear();
-        protocolKind.merge();
-        return "redirect:/protocolkinds/" + encodeUrlPathSegment(protocolKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ProtocolKindController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ProtocolKind.findProtocolKind(id));
-        return "protocolkinds/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ProtocolKindController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ProtocolKind protocolKind = ProtocolKind.findProtocolKind(id);
-        protocolKind.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/protocolkinds";
-    }
-    
-    void ProtocolKindController.populateEditForm(Model uiModel, ProtocolKind protocolKind) {
-        uiModel.addAttribute("protocolKind", protocolKind);
-        uiModel.addAttribute("protocoltypes", ProtocolType.findAllProtocolTypes());
-    }
-    
-    String ProtocolKindController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolKindController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/ProtocolKindController_Roo_Controller_Finder.aj
deleted file mode 100644
index badfd876b..000000000
--- a/src/main/java/com/labsynch/labseer/web/ProtocolKindController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,36 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ProtocolKind;
-import com.labsynch.labseer.domain.ProtocolType;
-import com.labsynch.labseer.web.ProtocolKindController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect ProtocolKindController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByLsTypeEqualsAndKindNameEquals", "form" }, method = RequestMethod.GET)
-    public String ProtocolKindController.findProtocolKindsByLsTypeEqualsAndKindNameEqualsForm(Model uiModel) {
-        uiModel.addAttribute("protocoltypes", ProtocolType.findAllProtocolTypes());
-        return "protocolkinds/findProtocolKindsByLsTypeEqualsAndKindNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndKindNameEquals", method = RequestMethod.GET)
-    public String ProtocolKindController.findProtocolKindsByLsTypeEqualsAndKindNameEquals(@RequestParam("lsType") ProtocolType lsType, @RequestParam("kindName") String kindName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocolkinds", ProtocolKind.findProtocolKindsByLsTypeEqualsAndKindNameEquals(lsType, kindName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ProtocolKind.countFindProtocolKindsByLsTypeEqualsAndKindNameEquals(lsType, kindName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocolkinds", ProtocolKind.findProtocolKindsByLsTypeEqualsAndKindNameEquals(lsType, kindName, sortFieldName, sortOrder).getResultList());
-        }
-        return "protocolkinds/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolKindController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ProtocolKindController_Roo_Controller_Json.aj
deleted file mode 100644
index 9f61d0eac..000000000
--- a/src/main/java/com/labsynch/labseer/web/ProtocolKindController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,125 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ProtocolKind;
-import com.labsynch.labseer.domain.ProtocolType;
-import com.labsynch.labseer.web.ProtocolKindController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ProtocolKindController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolKindController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ProtocolKind protocolKind = ProtocolKind.findProtocolKind(id);
-            if (protocolKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(protocolKind.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolKindController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ProtocolKind> result = ProtocolKind.findAllProtocolKinds();
-            return new ResponseEntity<String>(ProtocolKind.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ProtocolKindController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ProtocolKind protocolKind = ProtocolKind.fromJsonToProtocolKind(json);
-            protocolKind.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+protocolKind.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ProtocolKindController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ProtocolKind protocolKind: ProtocolKind.fromJsonArrayToProtocolKinds(json)) {
-                protocolKind.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ProtocolKindController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ProtocolKind protocolKind = ProtocolKind.fromJsonToProtocolKind(json);
-            protocolKind.setId(id);
-            if (protocolKind.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ProtocolKindController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ProtocolKind protocolKind = ProtocolKind.findProtocolKind(id);
-            if (protocolKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            protocolKind.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndKindNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolKindController.jsonFindProtocolKindsByLsTypeEqualsAndKindNameEquals(@RequestParam("lsType") ProtocolType lsType, @RequestParam("kindName") String kindName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ProtocolKind.toJsonArray(ProtocolKind.findProtocolKindsByLsTypeEqualsAndKindNameEquals(lsType, kindName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolLabelController.java b/src/main/java/com/labsynch/labseer/web/ProtocolLabelController.java
deleted file mode 100755
index c175bd9c1..000000000
--- a/src/main/java/com/labsynch/labseer/web/ProtocolLabelController.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ProtocolLabel;
-import com.labsynch.labseer.dto.CodeTableDTO;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.apache.commons.io.IOUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = ProtocolLabel.class)
-@Controller
-@RequestMapping("/protocollabels")
-@RooWebScaffold(path = "protocollabels", formBackingObject = ProtocolLabel.class)
-@RooWebFinder
-public class ProtocolLabelController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolLabelController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ProtocolLabelController_Roo_Controller.aj
deleted file mode 100755
index 86d0c8aed..000000000
--- a/src/main/java/com/labsynch/labseer/web/ProtocolLabelController_Roo_Controller.aj
+++ /dev/null
@@ -1,119 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ProtocolLabel;
-import com.labsynch.labseer.web.ProtocolLabelController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ProtocolLabelController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ProtocolLabelController.create(@Valid ProtocolLabel protocolLabel, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, protocolLabel);
-            return "protocollabels/create";
-        }
-        uiModel.asMap().clear();
-        protocolLabel.persist();
-        return "redirect:/protocollabels/" + encodeUrlPathSegment(protocolLabel.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ProtocolLabelController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ProtocolLabel());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (Protocol.countProtocols() == 0) {
-            dependencies.add(new String[] { "protocol", "protocols" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "protocollabels/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ProtocolLabelController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("protocollabel", ProtocolLabel.findProtocolLabel(id));
-        uiModel.addAttribute("itemId", id);
-        return "protocollabels/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ProtocolLabelController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocollabels", ProtocolLabel.findProtocolLabelEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ProtocolLabel.countProtocolLabels() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocollabels", ProtocolLabel.findAllProtocolLabels(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "protocollabels/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ProtocolLabelController.update(@Valid ProtocolLabel protocolLabel, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, protocolLabel);
-            return "protocollabels/update";
-        }
-        uiModel.asMap().clear();
-        protocolLabel.merge();
-        return "redirect:/protocollabels/" + encodeUrlPathSegment(protocolLabel.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ProtocolLabelController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ProtocolLabel.findProtocolLabel(id));
-        return "protocollabels/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ProtocolLabelController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ProtocolLabel protocolLabel = ProtocolLabel.findProtocolLabel(id);
-        protocolLabel.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/protocollabels";
-    }
-    
-    void ProtocolLabelController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("protocolLabel_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("protocolLabel_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ProtocolLabelController.populateEditForm(Model uiModel, ProtocolLabel protocolLabel) {
-        uiModel.addAttribute("protocolLabel", protocolLabel);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("protocols", Protocol.findAllProtocols());
-    }
-    
-    String ProtocolLabelController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolLabelController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/ProtocolLabelController_Roo_Controller_Finder.aj
deleted file mode 100755
index c7c741511..000000000
--- a/src/main/java/com/labsynch/labseer/web/ProtocolLabelController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,97 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ProtocolLabel;
-import com.labsynch.labseer.web.ProtocolLabelController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect ProtocolLabelController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByLabelTextEqualsAndIgnoredNot", "form" }, method = RequestMethod.GET)
-    public String ProtocolLabelController.findProtocolLabelsByLabelTextEqualsAndIgnoredNotForm(Model uiModel) {
-        return "protocollabels/findProtocolLabelsByLabelTextEqualsAndIgnoredNot";
-    }
-    
-    @RequestMapping(params = "find=ByLabelTextEqualsAndIgnoredNot", method = RequestMethod.GET)
-    public String ProtocolLabelController.findProtocolLabelsByLabelTextEqualsAndIgnoredNot(@RequestParam("labelText") String labelText, @RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocollabels", ProtocolLabel.findProtocolLabelsByLabelTextEqualsAndIgnoredNot(labelText, ignored, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ProtocolLabel.countFindProtocolLabelsByLabelTextEqualsAndIgnoredNot(labelText, ignored) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocollabels", ProtocolLabel.findProtocolLabelsByLabelTextEqualsAndIgnoredNot(labelText, ignored, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "protocollabels/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLabelTextLike", "form" }, method = RequestMethod.GET)
-    public String ProtocolLabelController.findProtocolLabelsByLabelTextLikeForm(Model uiModel) {
-        return "protocollabels/findProtocolLabelsByLabelTextLike";
-    }
-    
-    @RequestMapping(params = "find=ByLabelTextLike", method = RequestMethod.GET)
-    public String ProtocolLabelController.findProtocolLabelsByLabelTextLike(@RequestParam("labelText") String labelText, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocollabels", ProtocolLabel.findProtocolLabelsByLabelTextLike(labelText, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ProtocolLabel.countFindProtocolLabelsByLabelTextLike(labelText) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocollabels", ProtocolLabel.findProtocolLabelsByLabelTextLike(labelText, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "protocollabels/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTransactionEquals", "form" }, method = RequestMethod.GET)
-    public String ProtocolLabelController.findProtocolLabelsByLsTransactionEqualsForm(Model uiModel) {
-        return "protocollabels/findProtocolLabelsByLsTransactionEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", method = RequestMethod.GET)
-    public String ProtocolLabelController.findProtocolLabelsByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocollabels", ProtocolLabel.findProtocolLabelsByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ProtocolLabel.countFindProtocolLabelsByLsTransactionEquals(lsTransaction) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocollabels", ProtocolLabel.findProtocolLabelsByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "protocollabels/list";
-    }
-    
-    @RequestMapping(params = { "find=ByProtocol", "form" }, method = RequestMethod.GET)
-    public String ProtocolLabelController.findProtocolLabelsByProtocolForm(Model uiModel) {
-        uiModel.addAttribute("protocols", Protocol.findAllProtocols());
-        return "protocollabels/findProtocolLabelsByProtocol";
-    }
-    
-    @RequestMapping(params = "find=ByProtocol", method = RequestMethod.GET)
-    public String ProtocolLabelController.findProtocolLabelsByProtocol(@RequestParam("protocol") Protocol protocol, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocollabels", ProtocolLabel.findProtocolLabelsByProtocol(protocol, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ProtocolLabel.countFindProtocolLabelsByProtocol(protocol) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocollabels", ProtocolLabel.findProtocolLabelsByProtocol(protocol, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "protocollabels/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolLabelController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ProtocolLabelController_Roo_Controller_Json.aj
deleted file mode 100755
index 41c709b05..000000000
--- a/src/main/java/com/labsynch/labseer/web/ProtocolLabelController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,161 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ProtocolLabel;
-import com.labsynch.labseer.web.ProtocolLabelController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ProtocolLabelController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolLabelController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ProtocolLabel protocolLabel = ProtocolLabel.findProtocolLabel(id);
-            if (protocolLabel == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(protocolLabel.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolLabelController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ProtocolLabel> result = ProtocolLabel.findAllProtocolLabels();
-            return new ResponseEntity<String>(ProtocolLabel.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ProtocolLabelController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ProtocolLabel protocolLabel = ProtocolLabel.fromJsonToProtocolLabel(json);
-            protocolLabel.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+protocolLabel.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ProtocolLabelController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ProtocolLabel protocolLabel: ProtocolLabel.fromJsonArrayToProtocolLabels(json)) {
-                protocolLabel.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ProtocolLabelController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ProtocolLabel protocolLabel = ProtocolLabel.fromJsonToProtocolLabel(json);
-            protocolLabel.setId(id);
-            if (protocolLabel.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ProtocolLabelController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ProtocolLabel protocolLabel = ProtocolLabel.findProtocolLabel(id);
-            if (protocolLabel == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            protocolLabel.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLabelTextEqualsAndIgnoredNot", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolLabelController.jsonFindProtocolLabelsByLabelTextEqualsAndIgnoredNot(@RequestParam("labelText") String labelText, @RequestParam(value = "ignored", required = false) boolean ignored) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ProtocolLabel.toJsonArray(ProtocolLabel.findProtocolLabelsByLabelTextEqualsAndIgnoredNot(labelText, ignored).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLabelTextLike", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolLabelController.jsonFindProtocolLabelsByLabelTextLike(@RequestParam("labelText") String labelText) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ProtocolLabel.toJsonArray(ProtocolLabel.findProtocolLabelsByLabelTextLike(labelText).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolLabelController.jsonFindProtocolLabelsByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ProtocolLabel.toJsonArray(ProtocolLabel.findProtocolLabelsByLsTransactionEquals(lsTransaction).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByProtocol", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolLabelController.jsonFindProtocolLabelsByProtocol(@RequestParam("protocol") Protocol protocol) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ProtocolLabel.toJsonArray(ProtocolLabel.findProtocolLabelsByProtocol(protocol).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolStateController.java b/src/main/java/com/labsynch/labseer/web/ProtocolStateController.java
deleted file mode 100755
index 947119412..000000000
--- a/src/main/java/com/labsynch/labseer/web/ProtocolStateController.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ProtocolState;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.apache.commons.io.IOUtils;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-@RooWebJson(jsonObject = ProtocolState.class)
-@Controller
-@RequestMapping("/protocolstates")
-@RooWebScaffold(path = "protocolstates", formBackingObject = ProtocolState.class)
-@RooWebFinder
-@Transactional
-public class ProtocolStateController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolStateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ProtocolStateController_Roo_Controller.aj
deleted file mode 100644
index b2b5744f4..000000000
--- a/src/main/java/com/labsynch/labseer/web/ProtocolStateController_Roo_Controller.aj
+++ /dev/null
@@ -1,121 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ProtocolState;
-import com.labsynch.labseer.domain.ProtocolValue;
-import com.labsynch.labseer.web.ProtocolStateController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ProtocolStateController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ProtocolStateController.create(@Valid ProtocolState protocolState, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, protocolState);
-            return "protocolstates/create";
-        }
-        uiModel.asMap().clear();
-        protocolState.persist();
-        return "redirect:/protocolstates/" + encodeUrlPathSegment(protocolState.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ProtocolStateController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ProtocolState());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (Protocol.countProtocols() == 0) {
-            dependencies.add(new String[] { "protocol", "protocols" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "protocolstates/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ProtocolStateController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("protocolstate", ProtocolState.findProtocolState(id));
-        uiModel.addAttribute("itemId", id);
-        return "protocolstates/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ProtocolStateController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocolstates", ProtocolState.findProtocolStateEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ProtocolState.countProtocolStates() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocolstates", ProtocolState.findAllProtocolStates(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "protocolstates/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ProtocolStateController.update(@Valid ProtocolState protocolState, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, protocolState);
-            return "protocolstates/update";
-        }
-        uiModel.asMap().clear();
-        protocolState.merge();
-        return "redirect:/protocolstates/" + encodeUrlPathSegment(protocolState.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ProtocolStateController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ProtocolState.findProtocolState(id));
-        return "protocolstates/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ProtocolStateController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ProtocolState protocolState = ProtocolState.findProtocolState(id);
-        protocolState.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/protocolstates";
-    }
-    
-    void ProtocolStateController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("protocolState_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("protocolState_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ProtocolStateController.populateEditForm(Model uiModel, ProtocolState protocolState) {
-        uiModel.addAttribute("protocolState", protocolState);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("protocols", Protocol.findAllProtocols());
-        uiModel.addAttribute("protocolvalues", ProtocolValue.findAllProtocolValues());
-    }
-    
-    String ProtocolStateController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolStateController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/ProtocolStateController_Roo_Controller_Finder.aj
deleted file mode 100755
index 37f791bb2..000000000
--- a/src/main/java/com/labsynch/labseer/web/ProtocolStateController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,57 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ProtocolState;
-import com.labsynch.labseer.web.ProtocolStateController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect ProtocolStateController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByLsTransactionEquals", "form" }, method = RequestMethod.GET)
-    public String ProtocolStateController.findProtocolStatesByLsTransactionEqualsForm(Model uiModel) {
-        return "protocolstates/findProtocolStatesByLsTransactionEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", method = RequestMethod.GET)
-    public String ProtocolStateController.findProtocolStatesByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocolstates", ProtocolState.findProtocolStatesByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ProtocolState.countFindProtocolStatesByLsTransactionEquals(lsTransaction) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocolstates", ProtocolState.findProtocolStatesByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "protocolstates/list";
-    }
-    
-    @RequestMapping(params = { "find=ByProtocol", "form" }, method = RequestMethod.GET)
-    public String ProtocolStateController.findProtocolStatesByProtocolForm(Model uiModel) {
-        uiModel.addAttribute("protocols", Protocol.findAllProtocols());
-        return "protocolstates/findProtocolStatesByProtocol";
-    }
-    
-    @RequestMapping(params = "find=ByProtocol", method = RequestMethod.GET)
-    public String ProtocolStateController.findProtocolStatesByProtocol(@RequestParam("protocol") Protocol protocol, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocolstates", ProtocolState.findProtocolStatesByProtocol(protocol, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ProtocolState.countFindProtocolStatesByProtocol(protocol) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocolstates", ProtocolState.findProtocolStatesByProtocol(protocol, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "protocolstates/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolStateController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ProtocolStateController_Roo_Controller_Json.aj
deleted file mode 100755
index 112aef33d..000000000
--- a/src/main/java/com/labsynch/labseer/web/ProtocolStateController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,137 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ProtocolState;
-import com.labsynch.labseer.web.ProtocolStateController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ProtocolStateController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolStateController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ProtocolState protocolState = ProtocolState.findProtocolState(id);
-            if (protocolState == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(protocolState.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolStateController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ProtocolState> result = ProtocolState.findAllProtocolStates();
-            return new ResponseEntity<String>(ProtocolState.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ProtocolStateController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ProtocolState protocolState = ProtocolState.fromJsonToProtocolState(json);
-            protocolState.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+protocolState.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ProtocolStateController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ProtocolState protocolState: ProtocolState.fromJsonArrayToProtocolStates(json)) {
-                protocolState.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ProtocolStateController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ProtocolState protocolState = ProtocolState.fromJsonToProtocolState(json);
-            protocolState.setId(id);
-            if (protocolState.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ProtocolStateController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ProtocolState protocolState = ProtocolState.findProtocolState(id);
-            if (protocolState == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            protocolState.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolStateController.jsonFindProtocolStatesByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ProtocolState.toJsonArray(ProtocolState.findProtocolStatesByLsTransactionEquals(lsTransaction).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByProtocol", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolStateController.jsonFindProtocolStatesByProtocol(@RequestParam("protocol") Protocol protocol) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ProtocolState.toJsonArray(ProtocolState.findProtocolStatesByProtocol(protocol).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolTypeController.java b/src/main/java/com/labsynch/labseer/web/ProtocolTypeController.java
deleted file mode 100755
index 8667eb76e..000000000
--- a/src/main/java/com/labsynch/labseer/web/ProtocolTypeController.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ProtocolType;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RequestMapping("/protocoltypes")
-@Controller
-@RooWebScaffold(path = "protocoltypes", formBackingObject = ProtocolType.class)
-@RooWebJson(jsonObject = ProtocolType.class)
-@RooWebFinder
-public class ProtocolTypeController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ProtocolTypeController_Roo_Controller.aj
deleted file mode 100755
index 4df1e40d9..000000000
--- a/src/main/java/com/labsynch/labseer/web/ProtocolTypeController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ProtocolType;
-import com.labsynch.labseer.web.ProtocolTypeController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ProtocolTypeController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ProtocolTypeController.create(@Valid ProtocolType protocolType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, protocolType);
-            return "protocoltypes/create";
-        }
-        uiModel.asMap().clear();
-        protocolType.persist();
-        return "redirect:/protocoltypes/" + encodeUrlPathSegment(protocolType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ProtocolTypeController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ProtocolType());
-        return "protocoltypes/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ProtocolTypeController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("protocoltype", ProtocolType.findProtocolType(id));
-        uiModel.addAttribute("itemId", id);
-        return "protocoltypes/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ProtocolTypeController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocoltypes", ProtocolType.findProtocolTypeEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ProtocolType.countProtocolTypes() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocoltypes", ProtocolType.findAllProtocolTypes(sortFieldName, sortOrder));
-        }
-        return "protocoltypes/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ProtocolTypeController.update(@Valid ProtocolType protocolType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, protocolType);
-            return "protocoltypes/update";
-        }
-        uiModel.asMap().clear();
-        protocolType.merge();
-        return "redirect:/protocoltypes/" + encodeUrlPathSegment(protocolType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ProtocolTypeController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ProtocolType.findProtocolType(id));
-        return "protocoltypes/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ProtocolTypeController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ProtocolType protocolType = ProtocolType.findProtocolType(id);
-        protocolType.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/protocoltypes";
-    }
-    
-    void ProtocolTypeController.populateEditForm(Model uiModel, ProtocolType protocolType) {
-        uiModel.addAttribute("protocolType", protocolType);
-    }
-    
-    String ProtocolTypeController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolTypeController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/ProtocolTypeController_Roo_Controller_Finder.aj
deleted file mode 100755
index ee99b61f4..000000000
--- a/src/main/java/com/labsynch/labseer/web/ProtocolTypeController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ProtocolType;
-import com.labsynch.labseer.web.ProtocolTypeController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect ProtocolTypeController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByTypeNameEquals", "form" }, method = RequestMethod.GET)
-    public String ProtocolTypeController.findProtocolTypesByTypeNameEqualsForm(Model uiModel) {
-        return "protocoltypes/findProtocolTypesByTypeNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByTypeNameEquals", method = RequestMethod.GET)
-    public String ProtocolTypeController.findProtocolTypesByTypeNameEquals(@RequestParam("typeName") String typeName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocoltypes", ProtocolType.findProtocolTypesByTypeNameEquals(typeName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ProtocolType.countFindProtocolTypesByTypeNameEquals(typeName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocoltypes", ProtocolType.findProtocolTypesByTypeNameEquals(typeName, sortFieldName, sortOrder).getResultList());
-        }
-        return "protocoltypes/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolTypeController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ProtocolTypeController_Roo_Controller_Json.aj
deleted file mode 100755
index 686ed407f..000000000
--- a/src/main/java/com/labsynch/labseer/web/ProtocolTypeController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,124 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ProtocolType;
-import com.labsynch.labseer.web.ProtocolTypeController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ProtocolTypeController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolTypeController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ProtocolType protocolType = ProtocolType.findProtocolType(id);
-            if (protocolType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(protocolType.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolTypeController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ProtocolType> result = ProtocolType.findAllProtocolTypes();
-            return new ResponseEntity<String>(ProtocolType.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ProtocolTypeController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ProtocolType protocolType = ProtocolType.fromJsonToProtocolType(json);
-            protocolType.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+protocolType.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ProtocolTypeController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ProtocolType protocolType: ProtocolType.fromJsonArrayToProtocolTypes(json)) {
-                protocolType.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ProtocolTypeController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ProtocolType protocolType = ProtocolType.fromJsonToProtocolType(json);
-            protocolType.setId(id);
-            if (protocolType.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ProtocolTypeController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ProtocolType protocolType = ProtocolType.findProtocolType(id);
-            if (protocolType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            protocolType.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByTypeNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolTypeController.jsonFindProtocolTypesByTypeNameEquals(@RequestParam("typeName") String typeName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ProtocolType.toJsonArray(ProtocolType.findProtocolTypesByTypeNameEquals(typeName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolValueController.java b/src/main/java/com/labsynch/labseer/web/ProtocolValueController.java
deleted file mode 100755
index 3c1242327..000000000
--- a/src/main/java/com/labsynch/labseer/web/ProtocolValueController.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ProtocolState;
-import com.labsynch.labseer.domain.ProtocolValue;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.apache.commons.io.IOUtils;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-@RooWebJson(jsonObject = ProtocolValue.class)
-@Controller
-@RequestMapping("/protocolvalues")
-@RooWebScaffold(path = "protocolvalues", formBackingObject = ProtocolValue.class)
-@RooWebFinder
-@Transactional
-public class ProtocolValueController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolValueController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ProtocolValueController_Roo_Controller.aj
deleted file mode 100644
index 32e03e257..000000000
--- a/src/main/java/com/labsynch/labseer/web/ProtocolValueController_Roo_Controller.aj
+++ /dev/null
@@ -1,120 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ProtocolState;
-import com.labsynch.labseer.domain.ProtocolValue;
-import com.labsynch.labseer.web.ProtocolValueController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ProtocolValueController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ProtocolValueController.create(@Valid ProtocolValue protocolValue, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, protocolValue);
-            return "protocolvalues/create";
-        }
-        uiModel.asMap().clear();
-        protocolValue.persist();
-        return "redirect:/protocolvalues/" + encodeUrlPathSegment(protocolValue.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ProtocolValueController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ProtocolValue());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (ProtocolState.countProtocolStates() == 0) {
-            dependencies.add(new String[] { "lsState", "protocolstates" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "protocolvalues/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ProtocolValueController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("protocolvalue", ProtocolValue.findProtocolValue(id));
-        uiModel.addAttribute("itemId", id);
-        return "protocolvalues/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ProtocolValueController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocolvalues", ProtocolValue.findProtocolValueEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ProtocolValue.countProtocolValues() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocolvalues", ProtocolValue.findAllProtocolValues(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "protocolvalues/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ProtocolValueController.update(@Valid ProtocolValue protocolValue, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, protocolValue);
-            return "protocolvalues/update";
-        }
-        uiModel.asMap().clear();
-        protocolValue.merge();
-        return "redirect:/protocolvalues/" + encodeUrlPathSegment(protocolValue.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ProtocolValueController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ProtocolValue.findProtocolValue(id));
-        return "protocolvalues/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ProtocolValueController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ProtocolValue protocolValue = ProtocolValue.findProtocolValue(id);
-        protocolValue.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/protocolvalues";
-    }
-    
-    void ProtocolValueController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("protocolValue_datevalue_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("protocolValue_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("protocolValue_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ProtocolValueController.populateEditForm(Model uiModel, ProtocolValue protocolValue) {
-        uiModel.addAttribute("protocolValue", protocolValue);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("protocolstates", ProtocolState.findAllProtocolStates());
-    }
-    
-    String ProtocolValueController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolValueController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/ProtocolValueController_Roo_Controller_Finder.aj
deleted file mode 100755
index 05146a8af..000000000
--- a/src/main/java/com/labsynch/labseer/web/ProtocolValueController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,97 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ProtocolState;
-import com.labsynch.labseer.domain.ProtocolValue;
-import com.labsynch.labseer.web.ProtocolValueController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect ProtocolValueController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByLsKindEqualsAndCodeValueLike", "form" }, method = RequestMethod.GET)
-    public String ProtocolValueController.findProtocolValuesByLsKindEqualsAndCodeValueLikeForm(Model uiModel) {
-        return "protocolvalues/findProtocolValuesByLsKindEqualsAndCodeValueLike";
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEqualsAndCodeValueLike", method = RequestMethod.GET)
-    public String ProtocolValueController.findProtocolValuesByLsKindEqualsAndCodeValueLike(@RequestParam("lsKind") String lsKind, @RequestParam("codeValue") String codeValue, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocolvalues", ProtocolValue.findProtocolValuesByLsKindEqualsAndCodeValueLike(lsKind, codeValue, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ProtocolValue.countFindProtocolValuesByLsKindEqualsAndCodeValueLike(lsKind, codeValue) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocolvalues", ProtocolValue.findProtocolValuesByLsKindEqualsAndCodeValueLike(lsKind, codeValue, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "protocolvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsKindEqualsAndStringValueLike", "form" }, method = RequestMethod.GET)
-    public String ProtocolValueController.findProtocolValuesByLsKindEqualsAndStringValueLikeForm(Model uiModel) {
-        return "protocolvalues/findProtocolValuesByLsKindEqualsAndStringValueLike";
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEqualsAndStringValueLike", method = RequestMethod.GET)
-    public String ProtocolValueController.findProtocolValuesByLsKindEqualsAndStringValueLike(@RequestParam("lsKind") String lsKind, @RequestParam("stringValue") String stringValue, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocolvalues", ProtocolValue.findProtocolValuesByLsKindEqualsAndStringValueLike(lsKind, stringValue, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ProtocolValue.countFindProtocolValuesByLsKindEqualsAndStringValueLike(lsKind, stringValue) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocolvalues", ProtocolValue.findProtocolValuesByLsKindEqualsAndStringValueLike(lsKind, stringValue, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "protocolvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsState", "form" }, method = RequestMethod.GET)
-    public String ProtocolValueController.findProtocolValuesByLsStateForm(Model uiModel) {
-        uiModel.addAttribute("protocolstates", ProtocolState.findAllProtocolStates());
-        return "protocolvalues/findProtocolValuesByLsState";
-    }
-    
-    @RequestMapping(params = "find=ByLsState", method = RequestMethod.GET)
-    public String ProtocolValueController.findProtocolValuesByLsState(@RequestParam("lsState") ProtocolState lsState, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocolvalues", ProtocolValue.findProtocolValuesByLsState(lsState, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ProtocolValue.countFindProtocolValuesByLsState(lsState) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocolvalues", ProtocolValue.findProtocolValuesByLsState(lsState, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "protocolvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTransactionEquals", "form" }, method = RequestMethod.GET)
-    public String ProtocolValueController.findProtocolValuesByLsTransactionEqualsForm(Model uiModel) {
-        return "protocolvalues/findProtocolValuesByLsTransactionEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", method = RequestMethod.GET)
-    public String ProtocolValueController.findProtocolValuesByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("protocolvalues", ProtocolValue.findProtocolValuesByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ProtocolValue.countFindProtocolValuesByLsTransactionEquals(lsTransaction) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("protocolvalues", ProtocolValue.findProtocolValuesByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "protocolvalues/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ProtocolValueController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ProtocolValueController_Roo_Controller_Json.aj
deleted file mode 100755
index e6610cabf..000000000
--- a/src/main/java/com/labsynch/labseer/web/ProtocolValueController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,161 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ProtocolState;
-import com.labsynch.labseer.domain.ProtocolValue;
-import com.labsynch.labseer.web.ProtocolValueController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ProtocolValueController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolValueController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ProtocolValue protocolValue = ProtocolValue.findProtocolValue(id);
-            if (protocolValue == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(protocolValue.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolValueController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ProtocolValue> result = ProtocolValue.findAllProtocolValues();
-            return new ResponseEntity<String>(ProtocolValue.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ProtocolValueController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ProtocolValue protocolValue = ProtocolValue.fromJsonToProtocolValue(json);
-            protocolValue.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+protocolValue.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ProtocolValueController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ProtocolValue protocolValue: ProtocolValue.fromJsonArrayToProtocolValues(json)) {
-                protocolValue.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ProtocolValueController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ProtocolValue protocolValue = ProtocolValue.fromJsonToProtocolValue(json);
-            protocolValue.setId(id);
-            if (protocolValue.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ProtocolValueController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ProtocolValue protocolValue = ProtocolValue.findProtocolValue(id);
-            if (protocolValue == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            protocolValue.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEqualsAndCodeValueLike", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolValueController.jsonFindProtocolValuesByLsKindEqualsAndCodeValueLike(@RequestParam("lsKind") String lsKind, @RequestParam("codeValue") String codeValue) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ProtocolValue.toJsonArray(ProtocolValue.findProtocolValuesByLsKindEqualsAndCodeValueLike(lsKind, codeValue).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsKindEqualsAndStringValueLike", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolValueController.jsonFindProtocolValuesByLsKindEqualsAndStringValueLike(@RequestParam("lsKind") String lsKind, @RequestParam("stringValue") String stringValue) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ProtocolValue.toJsonArray(ProtocolValue.findProtocolValuesByLsKindEqualsAndStringValueLike(lsKind, stringValue).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsState", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolValueController.jsonFindProtocolValuesByLsState(@RequestParam("lsState") ProtocolState lsState) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ProtocolValue.toJsonArray(ProtocolValue.findProtocolValuesByLsState(lsState).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ProtocolValueController.jsonFindProtocolValuesByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ProtocolValue.toJsonArray(ProtocolValue.findProtocolValuesByLsTransactionEquals(lsTransaction).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/RequestNameDTOController.java b/src/main/java/com/labsynch/labseer/web/RequestNameDTOController.java
deleted file mode 100755
index 632ccf4dc..000000000
--- a/src/main/java/com/labsynch/labseer/web/RequestNameDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.RequestNameDTO;
-
-@RooWebJson(jsonObject = RequestNameDTO.class)
-@Controller
-@RequestMapping("/requestnamedto")
-public class RequestNameDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/RoleKindController.java b/src/main/java/com/labsynch/labseer/web/RoleKindController.java
deleted file mode 100644
index 006735ccb..000000000
--- a/src/main/java/com/labsynch/labseer/web/RoleKindController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.RoleKind;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-@RooWebJson(jsonObject = RoleKind.class)
-@Controller
-@RequestMapping("/rolekinds")
-@RooWebScaffold(path = "rolekinds", formBackingObject = RoleKind.class)
-@RooWebFinder
-public class RoleKindController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/RoleKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/RoleKindController_Roo_Controller.aj
deleted file mode 100644
index ea3e9d7b7..000000000
--- a/src/main/java/com/labsynch/labseer/web/RoleKindController_Roo_Controller.aj
+++ /dev/null
@@ -1,109 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.RoleKind;
-import com.labsynch.labseer.domain.RoleType;
-import com.labsynch.labseer.web.RoleKindController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect RoleKindController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String RoleKindController.create(@Valid RoleKind roleKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, roleKind);
-            return "rolekinds/create";
-        }
-        uiModel.asMap().clear();
-        roleKind.persist();
-        return "redirect:/rolekinds/" + encodeUrlPathSegment(roleKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String RoleKindController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new RoleKind());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (RoleType.countRoleTypes() == 0) {
-            dependencies.add(new String[] { "lsType", "roletypes" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "rolekinds/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String RoleKindController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("rolekind", RoleKind.findRoleKind(id));
-        uiModel.addAttribute("itemId", id);
-        return "rolekinds/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String RoleKindController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("rolekinds", RoleKind.findRoleKindEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) RoleKind.countRoleKinds() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("rolekinds", RoleKind.findAllRoleKinds(sortFieldName, sortOrder));
-        }
-        return "rolekinds/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String RoleKindController.update(@Valid RoleKind roleKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, roleKind);
-            return "rolekinds/update";
-        }
-        uiModel.asMap().clear();
-        roleKind.merge();
-        return "redirect:/rolekinds/" + encodeUrlPathSegment(roleKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String RoleKindController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, RoleKind.findRoleKind(id));
-        return "rolekinds/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String RoleKindController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        RoleKind roleKind = RoleKind.findRoleKind(id);
-        roleKind.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/rolekinds";
-    }
-    
-    void RoleKindController.populateEditForm(Model uiModel, RoleKind roleKind) {
-        uiModel.addAttribute("roleKind", roleKind);
-        uiModel.addAttribute("roletypes", RoleType.findAllRoleTypes());
-    }
-    
-    String RoleKindController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/RoleKindController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/RoleKindController_Roo_Controller_Finder.aj
deleted file mode 100644
index a1281b744..000000000
--- a/src/main/java/com/labsynch/labseer/web/RoleKindController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,56 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.RoleKind;
-import com.labsynch.labseer.domain.RoleType;
-import com.labsynch.labseer.web.RoleKindController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect RoleKindController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByKindNameEqualsAndLsType", "form" }, method = RequestMethod.GET)
-    public String RoleKindController.findRoleKindsByKindNameEqualsAndLsTypeForm(Model uiModel) {
-        uiModel.addAttribute("roletypes", RoleType.findAllRoleTypes());
-        return "rolekinds/findRoleKindsByKindNameEqualsAndLsType";
-    }
-    
-    @RequestMapping(params = "find=ByKindNameEqualsAndLsType", method = RequestMethod.GET)
-    public String RoleKindController.findRoleKindsByKindNameEqualsAndLsType(@RequestParam("kindName") String kindName, @RequestParam("lsType") RoleType lsType, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("rolekinds", RoleKind.findRoleKindsByKindNameEqualsAndLsType(kindName, lsType, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) RoleKind.countFindRoleKindsByKindNameEqualsAndLsType(kindName, lsType) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("rolekinds", RoleKind.findRoleKindsByKindNameEqualsAndLsType(kindName, lsType, sortFieldName, sortOrder).getResultList());
-        }
-        return "rolekinds/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsType", "form" }, method = RequestMethod.GET)
-    public String RoleKindController.findRoleKindsByLsTypeForm(Model uiModel) {
-        uiModel.addAttribute("roletypes", RoleType.findAllRoleTypes());
-        return "rolekinds/findRoleKindsByLsType";
-    }
-    
-    @RequestMapping(params = "find=ByLsType", method = RequestMethod.GET)
-    public String RoleKindController.findRoleKindsByLsType(@RequestParam("lsType") RoleType lsType, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("rolekinds", RoleKind.findRoleKindsByLsType(lsType, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) RoleKind.countFindRoleKindsByLsType(lsType) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("rolekinds", RoleKind.findRoleKindsByLsType(lsType, sortFieldName, sortOrder).getResultList());
-        }
-        return "rolekinds/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/RoleKindController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/RoleKindController_Roo_Controller_Json.aj
deleted file mode 100644
index f544f3883..000000000
--- a/src/main/java/com/labsynch/labseer/web/RoleKindController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,137 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.RoleKind;
-import com.labsynch.labseer.domain.RoleType;
-import com.labsynch.labseer.web.RoleKindController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect RoleKindController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> RoleKindController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            RoleKind roleKind = RoleKind.findRoleKind(id);
-            if (roleKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(roleKind.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> RoleKindController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<RoleKind> result = RoleKind.findAllRoleKinds();
-            return new ResponseEntity<String>(RoleKind.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> RoleKindController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            RoleKind roleKind = RoleKind.fromJsonToRoleKind(json);
-            roleKind.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+roleKind.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> RoleKindController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (RoleKind roleKind: RoleKind.fromJsonArrayToRoleKinds(json)) {
-                roleKind.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> RoleKindController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            RoleKind roleKind = RoleKind.fromJsonToRoleKind(json);
-            roleKind.setId(id);
-            if (roleKind.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> RoleKindController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            RoleKind roleKind = RoleKind.findRoleKind(id);
-            if (roleKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            roleKind.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByKindNameEqualsAndLsType", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> RoleKindController.jsonFindRoleKindsByKindNameEqualsAndLsType(@RequestParam("kindName") String kindName, @RequestParam("lsType") RoleType lsType) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(RoleKind.toJsonArray(RoleKind.findRoleKindsByKindNameEqualsAndLsType(kindName, lsType).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsType", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> RoleKindController.jsonFindRoleKindsByLsType(@RequestParam("lsType") RoleType lsType) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(RoleKind.toJsonArray(RoleKind.findRoleKindsByLsType(lsType).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/RoleTypeController.java b/src/main/java/com/labsynch/labseer/web/RoleTypeController.java
deleted file mode 100644
index db24767f8..000000000
--- a/src/main/java/com/labsynch/labseer/web/RoleTypeController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.RoleType;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-@RooWebJson(jsonObject = RoleType.class)
-@Controller
-@RequestMapping("/roletypes")
-@RooWebScaffold(path = "roletypes", formBackingObject = RoleType.class)
-@RooWebFinder
-public class RoleTypeController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/RoleTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/RoleTypeController_Roo_Controller.aj
deleted file mode 100644
index 00395a75d..000000000
--- a/src/main/java/com/labsynch/labseer/web/RoleTypeController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.RoleType;
-import com.labsynch.labseer.web.RoleTypeController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect RoleTypeController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String RoleTypeController.create(@Valid RoleType roleType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, roleType);
-            return "roletypes/create";
-        }
-        uiModel.asMap().clear();
-        roleType.persist();
-        return "redirect:/roletypes/" + encodeUrlPathSegment(roleType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String RoleTypeController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new RoleType());
-        return "roletypes/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String RoleTypeController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("roletype", RoleType.findRoleType(id));
-        uiModel.addAttribute("itemId", id);
-        return "roletypes/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String RoleTypeController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("roletypes", RoleType.findRoleTypeEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) RoleType.countRoleTypes() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("roletypes", RoleType.findAllRoleTypes(sortFieldName, sortOrder));
-        }
-        return "roletypes/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String RoleTypeController.update(@Valid RoleType roleType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, roleType);
-            return "roletypes/update";
-        }
-        uiModel.asMap().clear();
-        roleType.merge();
-        return "redirect:/roletypes/" + encodeUrlPathSegment(roleType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String RoleTypeController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, RoleType.findRoleType(id));
-        return "roletypes/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String RoleTypeController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        RoleType roleType = RoleType.findRoleType(id);
-        roleType.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/roletypes";
-    }
-    
-    void RoleTypeController.populateEditForm(Model uiModel, RoleType roleType) {
-        uiModel.addAttribute("roleType", roleType);
-    }
-    
-    String RoleTypeController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/RoleTypeController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/RoleTypeController_Roo_Controller_Finder.aj
deleted file mode 100644
index 2d8d6f820..000000000
--- a/src/main/java/com/labsynch/labseer/web/RoleTypeController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.RoleType;
-import com.labsynch.labseer.web.RoleTypeController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect RoleTypeController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByTypeNameEquals", "form" }, method = RequestMethod.GET)
-    public String RoleTypeController.findRoleTypesByTypeNameEqualsForm(Model uiModel) {
-        return "roletypes/findRoleTypesByTypeNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByTypeNameEquals", method = RequestMethod.GET)
-    public String RoleTypeController.findRoleTypesByTypeNameEquals(@RequestParam("typeName") String typeName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("roletypes", RoleType.findRoleTypesByTypeNameEquals(typeName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) RoleType.countFindRoleTypesByTypeNameEquals(typeName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("roletypes", RoleType.findRoleTypesByTypeNameEquals(typeName, sortFieldName, sortOrder).getResultList());
-        }
-        return "roletypes/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/RoleTypeController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/RoleTypeController_Roo_Controller_Json.aj
deleted file mode 100644
index 7d44618a7..000000000
--- a/src/main/java/com/labsynch/labseer/web/RoleTypeController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,124 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.RoleType;
-import com.labsynch.labseer.web.RoleTypeController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect RoleTypeController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> RoleTypeController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            RoleType roleType = RoleType.findRoleType(id);
-            if (roleType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(roleType.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> RoleTypeController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<RoleType> result = RoleType.findAllRoleTypes();
-            return new ResponseEntity<String>(RoleType.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> RoleTypeController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            RoleType roleType = RoleType.fromJsonToRoleType(json);
-            roleType.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+roleType.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> RoleTypeController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (RoleType roleType: RoleType.fromJsonArrayToRoleTypes(json)) {
-                roleType.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> RoleTypeController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            RoleType roleType = RoleType.fromJsonToRoleType(json);
-            roleType.setId(id);
-            if (roleType.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> RoleTypeController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            RoleType roleType = RoleType.findRoleType(id);
-            if (roleType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            roleType.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByTypeNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> RoleTypeController.jsonFindRoleTypesByTypeNameEquals(@RequestParam("typeName") String typeName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(RoleType.toJsonArray(RoleType.findRoleTypesByTypeNameEquals(typeName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SaltFormAliasController.java b/src/main/java/com/labsynch/labseer/web/SaltFormAliasController.java
deleted file mode 100644
index e1020c845..000000000
--- a/src/main/java/com/labsynch/labseer/web/SaltFormAliasController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-import com.labsynch.labseer.domain.SaltFormAlias;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-
-@RequestMapping("/saltformaliases")
-@Controller
-@RooWebScaffold(path = "saltformaliases", formBackingObject = SaltFormAlias.class)
-@RooWebFinder
-public class SaltFormAliasController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SaltFormAliasController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/SaltFormAliasController_Roo_Controller.aj
deleted file mode 100644
index b781d59db..000000000
--- a/src/main/java/com/labsynch/labseer/web/SaltFormAliasController_Roo_Controller.aj
+++ /dev/null
@@ -1,102 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.SaltForm;
-import com.labsynch.labseer.domain.SaltFormAlias;
-import com.labsynch.labseer.web.SaltFormAliasController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect SaltFormAliasController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String SaltFormAliasController.create(@Valid SaltFormAlias saltFormAlias, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, saltFormAlias);
-            return "saltformaliases/create";
-        }
-        uiModel.asMap().clear();
-        saltFormAlias.persist();
-        return "redirect:/saltformaliases/" + encodeUrlPathSegment(saltFormAlias.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String SaltFormAliasController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new SaltFormAlias());
-        return "saltformaliases/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String SaltFormAliasController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("saltformalias", SaltFormAlias.findSaltFormAlias(id));
-        uiModel.addAttribute("itemId", id);
-        return "saltformaliases/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String SaltFormAliasController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("saltformaliases", SaltFormAlias.findSaltFormAliasEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) SaltFormAlias.countSaltFormAliases() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("saltformaliases", SaltFormAlias.findAllSaltFormAliases(sortFieldName, sortOrder));
-        }
-        return "saltformaliases/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String SaltFormAliasController.update(@Valid SaltFormAlias saltFormAlias, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, saltFormAlias);
-            return "saltformaliases/update";
-        }
-        uiModel.asMap().clear();
-        saltFormAlias.merge();
-        return "redirect:/saltformaliases/" + encodeUrlPathSegment(saltFormAlias.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String SaltFormAliasController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, SaltFormAlias.findSaltFormAlias(id));
-        return "saltformaliases/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String SaltFormAliasController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        SaltFormAlias saltFormAlias = SaltFormAlias.findSaltFormAlias(id);
-        saltFormAlias.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/saltformaliases";
-    }
-    
-    void SaltFormAliasController.populateEditForm(Model uiModel, SaltFormAlias saltFormAlias) {
-        uiModel.addAttribute("saltFormAlias", saltFormAlias);
-        uiModel.addAttribute("saltforms", SaltForm.findAllSaltForms());
-    }
-    
-    String SaltFormAliasController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SaltFormAliasController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/SaltFormAliasController_Roo_Controller_Finder.aj
deleted file mode 100644
index 77b1749b3..000000000
--- a/src/main/java/com/labsynch/labseer/web/SaltFormAliasController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,55 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.SaltForm;
-import com.labsynch.labseer.domain.SaltFormAlias;
-import com.labsynch.labseer.web.SaltFormAliasController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect SaltFormAliasController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals", "form" }, method = RequestMethod.GET)
-    public String SaltFormAliasController.findSaltFormAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEqualsForm(Model uiModel) {
-        return "saltformaliases/findSaltFormAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals";
-    }
-    
-    @RequestMapping(params = "find=ByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals", method = RequestMethod.GET)
-    public String SaltFormAliasController.findSaltFormAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(@RequestParam("aliasName") String aliasName, @RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("saltformaliases", SaltFormAlias.findSaltFormAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(aliasName, lsType, lsKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) SaltFormAlias.countFindSaltFormAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(aliasName, lsType, lsKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("saltformaliases", SaltFormAlias.findSaltFormAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(aliasName, lsType, lsKind, sortFieldName, sortOrder).getResultList());
-        }
-        return "saltformaliases/list";
-    }
-    
-    @RequestMapping(params = { "find=BySaltForm", "form" }, method = RequestMethod.GET)
-    public String SaltFormAliasController.findSaltFormAliasesBySaltFormForm(Model uiModel) {
-        uiModel.addAttribute("saltforms", SaltForm.findAllSaltForms());
-        return "saltformaliases/findSaltFormAliasesBySaltForm";
-    }
-    
-    @RequestMapping(params = "find=BySaltForm", method = RequestMethod.GET)
-    public String SaltFormAliasController.findSaltFormAliasesBySaltForm(@RequestParam("saltForm") SaltForm saltForm, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("saltformaliases", SaltFormAlias.findSaltFormAliasesBySaltForm(saltForm, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) SaltFormAlias.countFindSaltFormAliasesBySaltForm(saltForm) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("saltformaliases", SaltFormAlias.findSaltFormAliasesBySaltForm(saltForm, sortFieldName, sortOrder).getResultList());
-        }
-        return "saltformaliases/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SaltFormAliasKindController.java b/src/main/java/com/labsynch/labseer/web/SaltFormAliasKindController.java
deleted file mode 100644
index 2a0ff195d..000000000
--- a/src/main/java/com/labsynch/labseer/web/SaltFormAliasKindController.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.labsynch.labseer.web;
-import com.labsynch.labseer.domain.SaltFormAliasKind;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/saltformaliaskinds")
-@Controller
-@RooWebScaffold(path = "saltformaliaskinds", formBackingObject = SaltFormAliasKind.class)
-public class SaltFormAliasKindController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SaltFormAliasKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/SaltFormAliasKindController_Roo_Controller.aj
deleted file mode 100644
index 39ca9c1af..000000000
--- a/src/main/java/com/labsynch/labseer/web/SaltFormAliasKindController_Roo_Controller.aj
+++ /dev/null
@@ -1,109 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.SaltFormAliasKind;
-import com.labsynch.labseer.domain.SaltFormAliasType;
-import com.labsynch.labseer.web.SaltFormAliasKindController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect SaltFormAliasKindController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String SaltFormAliasKindController.create(@Valid SaltFormAliasKind saltFormAliasKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, saltFormAliasKind);
-            return "saltformaliaskinds/create";
-        }
-        uiModel.asMap().clear();
-        saltFormAliasKind.persist();
-        return "redirect:/saltformaliaskinds/" + encodeUrlPathSegment(saltFormAliasKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String SaltFormAliasKindController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new SaltFormAliasKind());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (SaltFormAliasType.countSaltFormAliasTypes() == 0) {
-            dependencies.add(new String[] { "lsType", "saltformaliastypes" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "saltformaliaskinds/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String SaltFormAliasKindController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("saltformaliaskind", SaltFormAliasKind.findSaltFormAliasKind(id));
-        uiModel.addAttribute("itemId", id);
-        return "saltformaliaskinds/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String SaltFormAliasKindController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("saltformaliaskinds", SaltFormAliasKind.findSaltFormAliasKindEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) SaltFormAliasKind.countSaltFormAliasKinds() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("saltformaliaskinds", SaltFormAliasKind.findAllSaltFormAliasKinds(sortFieldName, sortOrder));
-        }
-        return "saltformaliaskinds/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String SaltFormAliasKindController.update(@Valid SaltFormAliasKind saltFormAliasKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, saltFormAliasKind);
-            return "saltformaliaskinds/update";
-        }
-        uiModel.asMap().clear();
-        saltFormAliasKind.merge();
-        return "redirect:/saltformaliaskinds/" + encodeUrlPathSegment(saltFormAliasKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String SaltFormAliasKindController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, SaltFormAliasKind.findSaltFormAliasKind(id));
-        return "saltformaliaskinds/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String SaltFormAliasKindController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        SaltFormAliasKind saltFormAliasKind = SaltFormAliasKind.findSaltFormAliasKind(id);
-        saltFormAliasKind.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/saltformaliaskinds";
-    }
-    
-    void SaltFormAliasKindController.populateEditForm(Model uiModel, SaltFormAliasKind saltFormAliasKind) {
-        uiModel.addAttribute("saltFormAliasKind", saltFormAliasKind);
-        uiModel.addAttribute("saltformaliastypes", SaltFormAliasType.findAllSaltFormAliasTypes());
-    }
-    
-    String SaltFormAliasKindController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SaltFormAliasTypeController.java b/src/main/java/com/labsynch/labseer/web/SaltFormAliasTypeController.java
deleted file mode 100644
index 5cf0bb130..000000000
--- a/src/main/java/com/labsynch/labseer/web/SaltFormAliasTypeController.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.labsynch.labseer.web;
-import com.labsynch.labseer.domain.SaltFormAliasType;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/saltformaliastypes")
-@Controller
-@RooWebScaffold(path = "saltformaliastypes", formBackingObject = SaltFormAliasType.class)
-public class SaltFormAliasTypeController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SaltFormAliasTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/SaltFormAliasTypeController_Roo_Controller.aj
deleted file mode 100644
index 008b1b5c8..000000000
--- a/src/main/java/com/labsynch/labseer/web/SaltFormAliasTypeController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.SaltFormAliasType;
-import com.labsynch.labseer.web.SaltFormAliasTypeController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect SaltFormAliasTypeController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String SaltFormAliasTypeController.create(@Valid SaltFormAliasType saltFormAliasType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, saltFormAliasType);
-            return "saltformaliastypes/create";
-        }
-        uiModel.asMap().clear();
-        saltFormAliasType.persist();
-        return "redirect:/saltformaliastypes/" + encodeUrlPathSegment(saltFormAliasType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String SaltFormAliasTypeController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new SaltFormAliasType());
-        return "saltformaliastypes/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String SaltFormAliasTypeController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("saltformaliastype", SaltFormAliasType.findSaltFormAliasType(id));
-        uiModel.addAttribute("itemId", id);
-        return "saltformaliastypes/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String SaltFormAliasTypeController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("saltformaliastypes", SaltFormAliasType.findSaltFormAliasTypeEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) SaltFormAliasType.countSaltFormAliasTypes() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("saltformaliastypes", SaltFormAliasType.findAllSaltFormAliasTypes(sortFieldName, sortOrder));
-        }
-        return "saltformaliastypes/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String SaltFormAliasTypeController.update(@Valid SaltFormAliasType saltFormAliasType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, saltFormAliasType);
-            return "saltformaliastypes/update";
-        }
-        uiModel.asMap().clear();
-        saltFormAliasType.merge();
-        return "redirect:/saltformaliastypes/" + encodeUrlPathSegment(saltFormAliasType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String SaltFormAliasTypeController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, SaltFormAliasType.findSaltFormAliasType(id));
-        return "saltformaliastypes/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String SaltFormAliasTypeController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        SaltFormAliasType saltFormAliasType = SaltFormAliasType.findSaltFormAliasType(id);
-        saltFormAliasType.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/saltformaliastypes";
-    }
-    
-    void SaltFormAliasTypeController.populateEditForm(Model uiModel, SaltFormAliasType saltFormAliasType) {
-        uiModel.addAttribute("saltFormAliasType", saltFormAliasType);
-    }
-    
-    String SaltFormAliasTypeController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SaltFormController.java b/src/main/java/com/labsynch/labseer/web/SaltFormController.java
deleted file mode 100755
index 8fb83e215..000000000
--- a/src/main/java/com/labsynch/labseer/web/SaltFormController.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package com.labsynch.labseer.web;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-import com.labsynch.labseer.domain.IsoSalt;
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.domain.SaltForm;
-import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
-import com.labsynch.labseer.service.ChemStructureService;
-import com.labsynch.labseer.service.ChemStructureService.StructureType;
-import com.mysema.query.BooleanBuilder;
-import com.mysema.query.types.path.PathBuilder;
-
-@RooWebScaffold(path = "saltforms", formBackingObject = SaltForm.class)
-@RequestMapping("/saltforms")
-@Controller
-@Transactional
-
-@RooWebFinder
-public class SaltFormController {
-
-	private static final Logger logger = LoggerFactory.getLogger(SaltFormController.class);
-
-	@Autowired
-	private ChemStructureService service;
-
-	private SaltForm saveSaltFormStructure(SaltForm saltForm) {
-		int saltFormCdId = service.saveStructure(saltForm.getMolStructure(), StructureType.SALT_FORM);
-		saltForm.setCdId(saltFormCdId);
-		return saltForm;
-	}
-
-	@RequestMapping(method = RequestMethod.POST)
-	public String create(@Valid SaltForm saltForm, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-		if (bindingResult.hasErrors()) {
-			uiModel.addAttribute("saltForm", saltForm);
-			return "saltforms/create";
-		}
-		uiModel.asMap().clear();
-		String molfile;
-		try {
-			molfile = service.toMolfile(saltForm.getMolStructure());
-			saltForm.setMolStructure(molfile);
-			saltForm = this.saveSaltFormStructure(saltForm);
-			saltForm.persist();
-			return "redirect:/saltforms/" + encodeUrlPathSegment(saltForm.getId().toString(), httpServletRequest);
-		} catch (CmpdRegMolFormatException e) {
-			return "redirect:/error";
-		}
-	}
-
-	@RequestMapping(params = "form", method = RequestMethod.GET)
-	public String createForm(Model uiModel) {
-		uiModel.addAttribute("saltForm", new SaltForm());
-		return "saltforms/create";
-	}
-
-	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
-	public String show(@PathVariable("id") Long id, Model uiModel) {
-		uiModel.addAttribute("saltform", SaltForm.findSaltForm(id));
-		uiModel.addAttribute("itemId", id);
-		return "saltforms/show";
-	}
-
-	@RequestMapping(method = RequestMethod.GET)
-	public String list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-		if (page != null || size != null) {
-			int sizeNo = size == null ? 10 : size.intValue();
-			uiModel.addAttribute("saltforms", SaltForm.findSaltFormEntries(page == null ? 0 : (page.intValue() - 1) * sizeNo, sizeNo));
-			float nrOfPages = (float) SaltForm.countSaltForms() / sizeNo;
-			uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-		} else {
-			uiModel.addAttribute("saltforms", SaltForm.findSaltFormEntries(0, 10));
-		}
-		return "saltforms/list";
-	}
-
-	@Transactional
-	@RequestMapping(method = RequestMethod.PUT)
-	public String update(@Valid SaltForm saltForm, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-		if (bindingResult.hasErrors()) {
-			logger.debug("binding error lajolla ");
-			uiModel.addAttribute("saltForm", saltForm);
-			Parent parent = saltForm.getParent();
-			List<Parent> parents = new ArrayList<Parent>();
-			parents.add(parent);
-			uiModel.addAttribute("parents", parents);
-			uiModel.addAttribute("parent", parent);
-			return "saltforms/update";
-		}
-		uiModel.asMap().clear();
-		saltForm.merge();
-		return "redirect:/saltforms/" + encodeUrlPathSegment(saltForm.getId().toString(), httpServletRequest);
-	}
-
-	@Transactional
-	@RequestMapping(value = "/{id}", params = "form", method = RequestMethod.GET)
-	public String updateForm(@PathVariable("id") Long id, Model uiModel) {
-		SaltForm saltForm = SaltForm.findSaltForm(id);
-		uiModel.addAttribute("saltForm", saltForm);
-		uiModel.addAttribute("itemId", id);
-		List<IsoSalt> isoSalts = new ArrayList<IsoSalt>();
-		if (saltForm.getIsoSalts() != null) {
-			for (IsoSalt isoSalt : saltForm.getIsoSalts()) {
-				isoSalts.add(isoSalt);
-			}
-			uiModel.addAttribute("isosalts", isoSalts);
-		}
-		List<Lot> lots = new ArrayList<Lot>();
-		if (saltForm.getLots() != null) {
-			for (Lot lot : saltForm.getLots()) {
-				lots.add(lot);
-			}
-			uiModel.addAttribute("lots", lots);
-		}
-		List<Parent> parents = new ArrayList<Parent>();
-		if (saltForm.getParent() != null) {
-			Parent parent = Parent.findParent(saltForm.getParent().getId());
-			parents.add(parent);
-			uiModel.addAttribute("parents", parents);
-			uiModel.addAttribute("parent", parent);
-		}
-		return "saltforms/update";
-	}
-
-	@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-	public String delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-		SaltForm.findSaltForm(id).remove();
-		uiModel.asMap().clear();
-		uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-		uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-		return "redirect:/saltforms";
-	}
-
-	//	  @ModelAttribute("isosalts")
-	//	  public Collection<IsoSalt> populateIsoSalts() {
-	//		  return IsoSalt.findIsoSaltEntries(0, 2);
-	//	  }
-	//
-	//	  @ModelAttribute("lots")
-	//	  public Collection<Lot> populateLots() {
-	//		  return Lot.findLotEntries(0, 2);
-	//	  }
-	//
-	//	@ModelAttribute("parents")
-	//	  public Collection<Parent> populateParents() {
-	//		  return Parent.findParentEntries(0, 2);
-	//	  }
-	//
-	//	@ModelAttribute("saltforms")
-	//	  public Collection<SaltForm> populateSaltForms() {
-	//		  return SaltForm.findSaltFormEntries(0, 2);
-	//	  }
-	//
-	//	@ModelAttribute("scientists")
-	//	  public Collection<Scientist> populateScientists() {
-	//		  return Scientist.findAllScientists();
-	//	  }
-	String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-		String enc = httpServletRequest.getCharacterEncoding();
-		if (enc == null) {
-			enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-		}
-		pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-		return pathSegment;
-	}
-
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SaltFormController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/SaltFormController_Roo_Controller.aj
deleted file mode 100644
index fe47f3982..000000000
--- a/src/main/java/com/labsynch/labseer/web/SaltFormController_Roo_Controller.aj
+++ /dev/null
@@ -1,31 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.BulkLoadFile;
-import com.labsynch.labseer.domain.IsoSalt;
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.domain.SaltForm;
-import com.labsynch.labseer.web.SaltFormController;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-
-privileged aspect SaltFormController_Roo_Controller {
-    
-    void SaltFormController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("saltForm_registrationdate_date_format", DateTimeFormat.patternForStyle("S-", LocaleContextHolder.getLocale()));
-    }
-    
-    void SaltFormController.populateEditForm(Model uiModel, SaltForm saltForm) {
-        uiModel.addAttribute("saltForm", saltForm);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("bulkloadfiles", BulkLoadFile.findAllBulkLoadFiles());
-        uiModel.addAttribute("isosalts", IsoSalt.findAllIsoSalts());
-        uiModel.addAttribute("lots", Lot.findAllLots());
-        uiModel.addAttribute("parents", Parent.findAllParents());
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SaltFormController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/SaltFormController_Roo_Controller_Finder.aj
deleted file mode 100644
index c96cfe2c3..000000000
--- a/src/main/java/com/labsynch/labseer/web/SaltFormController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,119 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.BulkLoadFile;
-import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.domain.SaltForm;
-import com.labsynch.labseer.web.SaltFormController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect SaltFormController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByBulkLoadFileEquals", "form" }, method = RequestMethod.GET)
-    public String SaltFormController.findSaltFormsByBulkLoadFileEqualsForm(Model uiModel) {
-        uiModel.addAttribute("bulkloadfiles", BulkLoadFile.findAllBulkLoadFiles());
-        return "saltforms/findSaltFormsByBulkLoadFileEquals";
-    }
-    
-    @RequestMapping(params = "find=ByBulkLoadFileEquals", method = RequestMethod.GET)
-    public String SaltFormController.findSaltFormsByBulkLoadFileEquals(@RequestParam("bulkLoadFile") BulkLoadFile bulkLoadFile, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("saltforms", SaltForm.findSaltFormsByBulkLoadFileEquals(bulkLoadFile, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) SaltForm.countFindSaltFormsByBulkLoadFileEquals(bulkLoadFile) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("saltforms", SaltForm.findSaltFormsByBulkLoadFileEquals(bulkLoadFile, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "saltforms/list";
-    }
-    
-    @RequestMapping(params = { "find=ByCdId", "form" }, method = RequestMethod.GET)
-    public String SaltFormController.findSaltFormsByCdIdForm(Model uiModel) {
-        return "saltforms/findSaltFormsByCdId";
-    }
-    
-    @RequestMapping(params = "find=ByCdId", method = RequestMethod.GET)
-    public String SaltFormController.findSaltFormsByCdId(@RequestParam("cdId") int CdId, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("saltforms", SaltForm.findSaltFormsByCdId(CdId, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) SaltForm.countFindSaltFormsByCdId(CdId) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("saltforms", SaltForm.findSaltFormsByCdId(CdId, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "saltforms/list";
-    }
-    
-    @RequestMapping(params = { "find=ByCorpNameEquals", "form" }, method = RequestMethod.GET)
-    public String SaltFormController.findSaltFormsByCorpNameEqualsForm(Model uiModel) {
-        return "saltforms/findSaltFormsByCorpNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByCorpNameEquals", method = RequestMethod.GET)
-    public String SaltFormController.findSaltFormsByCorpNameEquals(@RequestParam("corpName") String corpName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("saltforms", SaltForm.findSaltFormsByCorpNameEquals(corpName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) SaltForm.countFindSaltFormsByCorpNameEquals(corpName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("saltforms", SaltForm.findSaltFormsByCorpNameEquals(corpName, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "saltforms/list";
-    }
-    
-    @RequestMapping(params = { "find=ByCorpNameLike", "form" }, method = RequestMethod.GET)
-    public String SaltFormController.findSaltFormsByCorpNameLikeForm(Model uiModel) {
-        return "saltforms/findSaltFormsByCorpNameLike";
-    }
-    
-    @RequestMapping(params = "find=ByCorpNameLike", method = RequestMethod.GET)
-    public String SaltFormController.findSaltFormsByCorpNameLike(@RequestParam("corpName") String corpName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("saltforms", SaltForm.findSaltFormsByCorpNameLike(corpName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) SaltForm.countFindSaltFormsByCorpNameLike(corpName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("saltforms", SaltForm.findSaltFormsByCorpNameLike(corpName, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "saltforms/list";
-    }
-    
-    @RequestMapping(params = { "find=ByParent", "form" }, method = RequestMethod.GET)
-    public String SaltFormController.findSaltFormsByParentForm(Model uiModel) {
-        uiModel.addAttribute("parents", Parent.findAllParents());
-        return "saltforms/findSaltFormsByParent";
-    }
-    
-    @RequestMapping(params = "find=ByParent", method = RequestMethod.GET)
-    public String SaltFormController.findSaltFormsByParent(@RequestParam("parent") Parent parent, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("saltforms", SaltForm.findSaltFormsByParent(parent, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) SaltForm.countFindSaltFormsByParent(parent) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("saltforms", SaltForm.findSaltFormsByParent(parent, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "saltforms/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SaltLoaderController.java b/src/main/java/com/labsynch/labseer/web/SaltLoaderController.java
deleted file mode 100755
index cb0b93dd6..000000000
--- a/src/main/java/com/labsynch/labseer/web/SaltLoaderController.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.labsynch.labseer.web;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import com.labsynch.labseer.service.SaltLoader;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-
-@RequestMapping("/saltloaders")
-@Controller
-@RooWebScaffold(path = "saltloaders", formBackingObject = SaltLoader.class)
-public class SaltLoaderController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SaltLoaderController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/SaltLoaderController_Roo_Controller.aj
deleted file mode 100644
index 9000136ca..000000000
--- a/src/main/java/com/labsynch/labseer/web/SaltLoaderController_Roo_Controller.aj
+++ /dev/null
@@ -1,109 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.service.SaltLoader;
-import com.labsynch.labseer.web.SaltLoaderController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect SaltLoaderController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String SaltLoaderController.create(@Valid SaltLoader saltLoader, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, saltLoader);
-            return "saltloaders/create";
-        }
-        uiModel.asMap().clear();
-        saltLoader.persist();
-        return "redirect:/saltloaders/" + encodeUrlPathSegment(saltLoader.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String SaltLoaderController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new SaltLoader());
-        return "saltloaders/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String SaltLoaderController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("saltloader", SaltLoader.findSaltLoader(id));
-        uiModel.addAttribute("itemId", id);
-        return "saltloaders/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String SaltLoaderController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("saltloaders", SaltLoader.findSaltLoaderEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) SaltLoader.countSaltLoaders() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("saltloaders", SaltLoader.findAllSaltLoaders(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "saltloaders/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String SaltLoaderController.update(@Valid SaltLoader saltLoader, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, saltLoader);
-            return "saltloaders/update";
-        }
-        uiModel.asMap().clear();
-        saltLoader.merge();
-        return "redirect:/saltloaders/" + encodeUrlPathSegment(saltLoader.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String SaltLoaderController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, SaltLoader.findSaltLoader(id));
-        return "saltloaders/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String SaltLoaderController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        SaltLoader saltLoader = SaltLoader.findSaltLoader(id);
-        saltLoader.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/saltloaders";
-    }
-    
-    void SaltLoaderController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("saltLoader_loadeddate_date_format", DateTimeFormat.patternForStyle("S-", LocaleContextHolder.getLocale()));
-    }
-    
-    void SaltLoaderController.populateEditForm(Model uiModel, SaltLoader saltLoader) {
-        uiModel.addAttribute("saltLoader", saltLoader);
-        addDateTimeFormatPatterns(uiModel);
-    }
-    
-    String SaltLoaderController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SetupDBController.java b/src/main/java/com/labsynch/labseer/web/SetupDBController.java
deleted file mode 100755
index 881f8f5d2..000000000
--- a/src/main/java/com/labsynch/labseer/web/SetupDBController.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.labsynch.labseer.web;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Date;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
-import com.labsynch.labseer.chemclasses.CmpdRegMoleculeFactory;
-import com.labsynch.labseer.chemclasses.CmpdRegSDFReader;
-import com.labsynch.labseer.chemclasses.CmpdRegSDFReaderFactory;
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.domain.SaltForm;
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.StereoCategory;
-import com.labsynch.labseer.dto.Metalot;
-import com.labsynch.labseer.dto.MetalotReturn;
-import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
-import com.labsynch.labseer.service.MetalotService;
-import com.labsynch.labseer.service.SetupService;
-
-@RequestMapping("/adminsetup")
-@Controller
-public class SetupDBController {
-
-	private static final Logger logger = LoggerFactory.getLogger(SetupDBController.class);
-
-	@Autowired
-	private MetalotService metalotServ;
-	
-	@Autowired
-	private SetupService setupServ;
-	
-	@Autowired
-	CmpdRegMoleculeFactory cmpdRegMoleculeFactory;
-
-	@Autowired
-	CmpdRegSDFReaderFactory sdfReaderFactory;
-	
-//	@RequestMapping(value = "loadplainsdf", method = RequestMethod.POST, headers = "Accept=application/json")
-//    public ResponseEntity<String> loadCorpNames(@RequestBody String fileNamePath) {
-//		HttpHeaders headers= new HttpHeaders();
-//        headers.add("Content-Type", "application/text");
-//        
-//        try {
-//			setupServ.loadCorpNames();
-//		} catch (FileNotFoundException e) {
-//			// TODO Auto-generated catch block
-//			e.printStackTrace();
-//	        return new ResponseEntity<String>("error saving new corpNames. File not found.", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-//		}
-//        
-//        return new ResponseEntity<String>("saved new corpNames", headers, HttpStatus.OK);
-//
-//	}
-//	
-	@RequestMapping(value = "loadplainsdf", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> loadCmpdsFromSDF(@RequestBody String fileNamePath) {
-		
-    	//simple utility to load compounds without any properties
-
-    	String fileName = fileNamePath;
-    	
-	    int molCount = 0;
-	    
-		    // Open an input stream
-		    try {
-			    CmpdRegSDFReader mi = sdfReaderFactory.getCmpdRegSDFReader(fileName);
-			    CmpdRegMolecule mol = null;
-
-			    while ((mol = mi.readNextMol()) != null) {
-			    	
-			    	Metalot metaLot = new Metalot();
-			    	Lot lot = new Lot();
-			    	SaltForm saltForm = new SaltForm();
-			    	Parent parent = new Parent();		
-			    	
-			    	lot.setAsDrawnStruct(mol.getMolStructure());
-
-//			    	mol.clearExtraLabels();
-			    	parent.setMolStructure(mol.getMolStructure());
-			    	Author chemist = Author.findAuthorsByUserName("cchemist").getSingleResult();
-			    	String noteBookInfo = "1234-123";
-			    	StereoCategory stereoCategory = StereoCategory.findStereoCategorysByCodeEquals("achiral").getSingleResult();
-			    	
-			    	parent.setChemist(chemist.getUserName());
-			    	parent.setStereoCategory(stereoCategory);
-			    	
-			    	saltForm.setParent(parent);
-			    	saltForm.setChemist(chemist.getUserName());
-			    	saltForm.setMolStructure("");
-
-			    	lot.setSynthesisDate(new Date());
-			    	lot.setChemist(chemist.getUserName());
-			    	lot.setNotebookPage(noteBookInfo);
-			    	lot.setSaltForm(saltForm);
-			    	lot.setLotMolWeight(mol.getMass());
-			    	lot.setLotMolWeight(mol.getMass());
-			    	lot.setIsVirtual(false);
-
-			    	metaLot.setLot(lot);
-			    	
-			    	MetalotReturn results = metalotServ.save(metaLot);
-			    	logger.debug("lot saved: " + results.toJson());
-			    	
-			    	molCount++;
-			    }	
-			    
-			    mi.close();
-				
-			} catch (FileNotFoundException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			} catch (CmpdRegMolFormatException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			} 
-		
-		HttpHeaders headers= new HttpHeaders();
-        headers.add("Content-Type", "application/text");
-
-        return new ResponseEntity<String>("saved " + molCount + " new structures", headers, HttpStatus.CREATED);
-    }
-
-
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SignUpController.java b/src/main/java/com/labsynch/labseer/web/SignUpController.java
deleted file mode 100755
index 40af4a7a6..000000000
--- a/src/main/java/com/labsynch/labseer/web/SignUpController.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package com.labsynch.labseer.web;
-
-import java.io.UnsupportedEncodingException;
-import java.security.NoSuchAlgorithmException;
-import java.util.Date;
-import java.util.Random;
-
-import javax.persistence.TypedQuery;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.mail.MailSender;
-import org.springframework.mail.SimpleMailMessage;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.AuthorRole;
-import com.labsynch.labseer.domain.LsRole;
-import com.labsynch.labseer.service.AuthorService;
-import com.labsynch.labseer.service.DatabaseAuthenticationProvider;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-
-
-@RequestMapping("/signup/**")
-@Controller
-public class SignUpController {
-	
-    private static final Logger logger = LoggerFactory.getLogger(SignUpController.class);
-
-	@Autowired
-	private PropertiesUtilService propertiesUtilService;
-	
-	@Autowired
-	private AuthorService authorService;
-
-    @Autowired
-    private SignUpValidator validator;
-
-    @Autowired
-    private transient MailSender mailSender;
-
-    private transient SimpleMailMessage simpleMailMessage;
-
-    @ModelAttribute("Author")
-    public UserRegistrationForm formBackingObject() {
-        return new UserRegistrationForm();
-    }
-
-    @RequestMapping(params = "form", method = RequestMethod.GET, produces = "text/html")
-    public String createForm(Model model) {
-    	UserRegistrationForm form = new UserRegistrationForm();
-        model.addAttribute("Author", form);
-        model.addAttribute("captcha_form",form.getReCaptchaHtml());
-        return "signup/index";
-    }
-    
-    @RequestMapping(params = "activate", method = RequestMethod.GET, produces = "text/html")
-    public String activateUser(@RequestParam(value = "activate", required = true) String activationKey, @RequestParam(value = "emailAddress", required = true) String emailAddress,Model model) {
-        TypedQuery<Author> query = Author.findAuthorsByActivationKeyAndEmailAddress(activationKey, emailAddress);
-        Author User=query.getSingleResult();
-        if(null!=User){
-        	User.setActivationDate(new Date());
-        	User.setEnabled(true);
-        	User.merge();
-        	String redirectUrl=propertiesUtilService.getClientPath();
-        	return "redirect:"+redirectUrl;
-        }
-        else{
-        	return "signup/error";
-        }
-
-    }
-
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String create(@Valid UserRegistrationForm userRegistration, BindingResult result, Model model, HttpServletRequest request) {
-        validator.validate(userRegistration, result);
-        if (result.hasErrors()) {
-        	logger.error("validation errors " + result.toString());
-            return createForm(model);
-        } else {
-            Random random = new Random(System.currentTimeMillis());
-            String activationKey = "activationKey:" + random.nextInt();
-            logger.info("activation key is :" + activationKey);
-
-            Author author = new Author();
-            author.setActivationDate(null);
-            author.setRecordedDate(new Date());
-            author.setEmailAddress(userRegistration.getEmailAddress());
-            author.setFirstName(userRegistration.getFirstName());
-            author.setLastName(userRegistration.getLastName());
-            author.setUserName(userRegistration.getUserName());
-
-    	    String encryptedPassword = null;
-    		try {
-    			encryptedPassword = DatabaseAuthenticationProvider.getBase64ShaHash(userRegistration.getPassword());
-    		} catch (NoSuchAlgorithmException e1) {
-    			// TODO Auto-generated catch block
-    			e1.printStackTrace();
-    		} catch (UnsupportedEncodingException e1) {
-    			// TODO Auto-generated catch block
-    			e1.printStackTrace();
-    		} 
-            author.setPassword(encryptedPassword);
-
-            author.setActivationKey(activationKey);
-            author.setEnabled(false);
-            author.setLocked(false);
-            if (author.getRecordedBy() == null) author.setRecordedBy("acas");
-            if (author.getRecordedDate() == null) author.setRecordedDate(new Date());
-            
-            logger.info("about to save author: " + author.toJson());
-            try{
-            	author = authorService.saveAuthor(author);
-            }catch (Exception e){
-            	logger.error("Caught error saving author from signup form",e);
-            	return "signup/error";
-            }
-            
-//            addAuthorToUserRole(author);
-            
-            
-            SimpleMailMessage mail = new SimpleMailMessage();
-    		mail.setTo(author.getEmailAddress());
-    		mail.setSubject("User Activation");
-            if(propertiesUtilService.getEmailFromAddress() != null && !propertiesUtilService.getEmailFromAddress().equals("") ) mail.setFrom(propertiesUtilService.getEmailFromAddress());
-            
-//    		mail.setText("Hi "+ author.getFirstName() + ",\n. You just registered with us. Please click on this link to activate your account - <a href=\"" + propertiesUtilService.getHostPath() +  "signup?emailAddress="+author.getEmailAddress()+"&activate="+activationKey+"\">Activate Link</a>. \n Thanks Typical Security Admin");
-    		mail.setText("Hi "+ author.getFirstName() + ",\nPlease click on the following link to activate your account: " + propertiesUtilService.getClientPath()+"/activateUser?emailAddress="+author.getEmailAddress()+"&activate="+activationKey +  "\nThank you, \nACAS Admin");
-            mailSender.send(mail);
-            return "signup/thanks";
-        }
-    }
-
-    private void addAuthorToUserRole(Author author) {
-    	LsRole userRole = LsRole.getOrCreateRole("user");
-    	AuthorRole authorRole = AuthorRole.getOrCreateAuthorRole(author, userRole);
-    	logger.debug("author added to the user role " + authorRole.toJson());
-    	
-	}
-
-	@RequestMapping(value = "/index", produces = "text/html")
-    public String index() {
-        return "signup/index";
-    }
-
-    @RequestMapping(value = "/thanks", produces = "text/html")
-    public String thanks() {
-        return "signup/thanks";
-    }
-    @RequestMapping(value = "/error", produces = "text/html")
-    public String error() {
-        return "signup/error";
-    }
-
-    public void sendMessage(String mailTo, String message) {
-        simpleMailMessage.setTo(mailTo);
-        simpleMailMessage.setText(message);
-		if(propertiesUtilService.getEmailFromAddress() != null && !propertiesUtilService.getEmailFromAddress().equals("") ) simpleMailMessage.setFrom(propertiesUtilService.getEmailFromAddress());
-        mailSender.send(simpleMailMessage);
-    }
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SignUpValidator.java b/src/main/java/com/labsynch/labseer/web/SignUpValidator.java
deleted file mode 100755
index 8031244f6..000000000
--- a/src/main/java/com/labsynch/labseer/web/SignUpValidator.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * 
- */
-package com.labsynch.labseer.web;
-
-import org.springframework.stereotype.Service;
-import org.springframework.validation.Errors;
-import org.springframework.validation.Validator;
-
-/**
- * 
- * 
- */
-@Service("signupValidator")
-public class SignUpValidator implements Validator {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.springframework.validation.Validator#supports(java.lang.Class)
-	 */
-	@Override
-	public boolean supports(Class<?> clazz) {
-		return UserRegistrationForm.class.equals(clazz);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.springframework.validation.Validator#validate(java.lang.Object,
-	 * org.springframework.validation.Errors)
-	 */
-	@Override
-	public void validate(Object target, Errors errors) {
-		UserRegistrationForm form = (UserRegistrationForm) target;
-
-		String newPassword = form.getPassword();
-		String newPasswordAgain = form.getRepeatPassword();
-		if (!newPassword.equals(newPasswordAgain)) {
-			errors.reject("changepassword.passwordsnomatch");
-		}
-		
-//		ReCaptchaImpl reCaptcha = new ReCaptchaImpl();
-//        reCaptcha.setPrivateKey("6LdfmL8SAAAAAHKPqUQV5SxrRX9Id6a8cQo-mgpE");
-//
-//        String challenge = form.getRecaptcha_challenge_field();
-//        String uresponse = form.getRecaptcha_response_field();
-//        ReCaptchaResponse reCaptchaResponse = reCaptcha.checkAnswer("localhost", challenge, uresponse);
-//        if (!reCaptchaResponse.isValid()) {
-//        	errors.reject("recaptcha.mismatch");
-//        }
-
-
-	}
-
-}
diff --git a/src/main/java/com/labsynch/labseer/web/StateKindController.java b/src/main/java/com/labsynch/labseer/web/StateKindController.java
deleted file mode 100755
index 624ab2ebb..000000000
--- a/src/main/java/com/labsynch/labseer/web/StateKindController.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.StateKind;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = StateKind.class)
-@Controller
-@RequestMapping("/statekinds")
-@RooWebScaffold(path = "statekinds", formBackingObject = StateKind.class)
-@RooWebFinder
-public class StateKindController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/StateKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/StateKindController_Roo_Controller.aj
deleted file mode 100755
index b79f04281..000000000
--- a/src/main/java/com/labsynch/labseer/web/StateKindController_Roo_Controller.aj
+++ /dev/null
@@ -1,109 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.StateKind;
-import com.labsynch.labseer.domain.StateType;
-import com.labsynch.labseer.web.StateKindController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect StateKindController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String StateKindController.create(@Valid StateKind stateKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, stateKind);
-            return "statekinds/create";
-        }
-        uiModel.asMap().clear();
-        stateKind.persist();
-        return "redirect:/statekinds/" + encodeUrlPathSegment(stateKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String StateKindController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new StateKind());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (StateType.countStateTypes() == 0) {
-            dependencies.add(new String[] { "lsType", "statetypes" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "statekinds/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String StateKindController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("statekind", StateKind.findStateKind(id));
-        uiModel.addAttribute("itemId", id);
-        return "statekinds/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String StateKindController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("statekinds", StateKind.findStateKindEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) StateKind.countStateKinds() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("statekinds", StateKind.findAllStateKinds(sortFieldName, sortOrder));
-        }
-        return "statekinds/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String StateKindController.update(@Valid StateKind stateKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, stateKind);
-            return "statekinds/update";
-        }
-        uiModel.asMap().clear();
-        stateKind.merge();
-        return "redirect:/statekinds/" + encodeUrlPathSegment(stateKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String StateKindController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, StateKind.findStateKind(id));
-        return "statekinds/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String StateKindController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        StateKind stateKind = StateKind.findStateKind(id);
-        stateKind.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/statekinds";
-    }
-    
-    void StateKindController.populateEditForm(Model uiModel, StateKind stateKind) {
-        uiModel.addAttribute("stateKind", stateKind);
-        uiModel.addAttribute("statetypes", StateType.findAllStateTypes());
-    }
-    
-    String StateKindController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/StateKindController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/StateKindController_Roo_Controller_Finder.aj
deleted file mode 100755
index 4d0cd13b0..000000000
--- a/src/main/java/com/labsynch/labseer/web/StateKindController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,75 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.StateKind;
-import com.labsynch.labseer.domain.StateType;
-import com.labsynch.labseer.web.StateKindController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect StateKindController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByKindNameEquals", "form" }, method = RequestMethod.GET)
-    public String StateKindController.findStateKindsByKindNameEqualsForm(Model uiModel) {
-        return "statekinds/findStateKindsByKindNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByKindNameEquals", method = RequestMethod.GET)
-    public String StateKindController.findStateKindsByKindNameEquals(@RequestParam("kindName") String kindName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("statekinds", StateKind.findStateKindsByKindNameEquals(kindName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) StateKind.countFindStateKindsByKindNameEquals(kindName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("statekinds", StateKind.findStateKindsByKindNameEquals(kindName, sortFieldName, sortOrder).getResultList());
-        }
-        return "statekinds/list";
-    }
-    
-    @RequestMapping(params = { "find=ByKindNameEqualsAndLsType", "form" }, method = RequestMethod.GET)
-    public String StateKindController.findStateKindsByKindNameEqualsAndLsTypeForm(Model uiModel) {
-        uiModel.addAttribute("statetypes", StateType.findAllStateTypes());
-        return "statekinds/findStateKindsByKindNameEqualsAndLsType";
-    }
-    
-    @RequestMapping(params = "find=ByKindNameEqualsAndLsType", method = RequestMethod.GET)
-    public String StateKindController.findStateKindsByKindNameEqualsAndLsType(@RequestParam("kindName") String kindName, @RequestParam("lsType") StateType lsType, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("statekinds", StateKind.findStateKindsByKindNameEqualsAndLsType(kindName, lsType, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) StateKind.countFindStateKindsByKindNameEqualsAndLsType(kindName, lsType) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("statekinds", StateKind.findStateKindsByKindNameEqualsAndLsType(kindName, lsType, sortFieldName, sortOrder).getResultList());
-        }
-        return "statekinds/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsType", "form" }, method = RequestMethod.GET)
-    public String StateKindController.findStateKindsByLsTypeForm(Model uiModel) {
-        uiModel.addAttribute("statetypes", StateType.findAllStateTypes());
-        return "statekinds/findStateKindsByLsType";
-    }
-    
-    @RequestMapping(params = "find=ByLsType", method = RequestMethod.GET)
-    public String StateKindController.findStateKindsByLsType(@RequestParam("lsType") StateType lsType, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("statekinds", StateKind.findStateKindsByLsType(lsType, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) StateKind.countFindStateKindsByLsType(lsType) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("statekinds", StateKind.findStateKindsByLsType(lsType, sortFieldName, sortOrder).getResultList());
-        }
-        return "statekinds/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/StateKindController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/StateKindController_Roo_Controller_Json.aj
deleted file mode 100755
index ba83a8614..000000000
--- a/src/main/java/com/labsynch/labseer/web/StateKindController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,149 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.StateKind;
-import com.labsynch.labseer.domain.StateType;
-import com.labsynch.labseer.web.StateKindController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect StateKindController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> StateKindController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            StateKind stateKind = StateKind.findStateKind(id);
-            if (stateKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(stateKind.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> StateKindController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<StateKind> result = StateKind.findAllStateKinds();
-            return new ResponseEntity<String>(StateKind.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> StateKindController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            StateKind stateKind = StateKind.fromJsonToStateKind(json);
-            stateKind.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+stateKind.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> StateKindController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (StateKind stateKind: StateKind.fromJsonArrayToStateKinds(json)) {
-                stateKind.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> StateKindController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            StateKind stateKind = StateKind.fromJsonToStateKind(json);
-            stateKind.setId(id);
-            if (stateKind.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> StateKindController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            StateKind stateKind = StateKind.findStateKind(id);
-            if (stateKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            stateKind.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByKindNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> StateKindController.jsonFindStateKindsByKindNameEquals(@RequestParam("kindName") String kindName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(StateKind.toJsonArray(StateKind.findStateKindsByKindNameEquals(kindName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByKindNameEqualsAndLsType", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> StateKindController.jsonFindStateKindsByKindNameEqualsAndLsType(@RequestParam("kindName") String kindName, @RequestParam("lsType") StateType lsType) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(StateKind.toJsonArray(StateKind.findStateKindsByKindNameEqualsAndLsType(kindName, lsType).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsType", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> StateKindController.jsonFindStateKindsByLsType(@RequestParam("lsType") StateType lsType) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(StateKind.toJsonArray(StateKind.findStateKindsByLsType(lsType).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/StateTypeController.java b/src/main/java/com/labsynch/labseer/web/StateTypeController.java
deleted file mode 100755
index c8c937307..000000000
--- a/src/main/java/com/labsynch/labseer/web/StateTypeController.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.StateType;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = StateType.class)
-@Controller
-@RequestMapping("/statetypes")
-@RooWebScaffold(path = "statetypes", formBackingObject = StateType.class)
-@RooWebFinder
-public class StateTypeController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/StateTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/StateTypeController_Roo_Controller.aj
deleted file mode 100755
index a6cce6f69..000000000
--- a/src/main/java/com/labsynch/labseer/web/StateTypeController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.StateType;
-import com.labsynch.labseer.web.StateTypeController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect StateTypeController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String StateTypeController.create(@Valid StateType stateType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, stateType);
-            return "statetypes/create";
-        }
-        uiModel.asMap().clear();
-        stateType.persist();
-        return "redirect:/statetypes/" + encodeUrlPathSegment(stateType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String StateTypeController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new StateType());
-        return "statetypes/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String StateTypeController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("statetype", StateType.findStateType(id));
-        uiModel.addAttribute("itemId", id);
-        return "statetypes/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String StateTypeController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("statetypes", StateType.findStateTypeEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) StateType.countStateTypes() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("statetypes", StateType.findAllStateTypes(sortFieldName, sortOrder));
-        }
-        return "statetypes/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String StateTypeController.update(@Valid StateType stateType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, stateType);
-            return "statetypes/update";
-        }
-        uiModel.asMap().clear();
-        stateType.merge();
-        return "redirect:/statetypes/" + encodeUrlPathSegment(stateType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String StateTypeController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, StateType.findStateType(id));
-        return "statetypes/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String StateTypeController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        StateType stateType = StateType.findStateType(id);
-        stateType.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/statetypes";
-    }
-    
-    void StateTypeController.populateEditForm(Model uiModel, StateType stateType) {
-        uiModel.addAttribute("stateType", stateType);
-    }
-    
-    String StateTypeController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/StateTypeController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/StateTypeController_Roo_Controller_Finder.aj
deleted file mode 100755
index bf4203322..000000000
--- a/src/main/java/com/labsynch/labseer/web/StateTypeController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.StateType;
-import com.labsynch.labseer.web.StateTypeController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect StateTypeController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByTypeNameEquals", "form" }, method = RequestMethod.GET)
-    public String StateTypeController.findStateTypesByTypeNameEqualsForm(Model uiModel) {
-        return "statetypes/findStateTypesByTypeNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByTypeNameEquals", method = RequestMethod.GET)
-    public String StateTypeController.findStateTypesByTypeNameEquals(@RequestParam("typeName") String typeName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("statetypes", StateType.findStateTypesByTypeNameEquals(typeName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) StateType.countFindStateTypesByTypeNameEquals(typeName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("statetypes", StateType.findStateTypesByTypeNameEquals(typeName, sortFieldName, sortOrder).getResultList());
-        }
-        return "statetypes/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/StateTypeController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/StateTypeController_Roo_Controller_Json.aj
deleted file mode 100755
index 12c6f696d..000000000
--- a/src/main/java/com/labsynch/labseer/web/StateTypeController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,124 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.StateType;
-import com.labsynch.labseer.web.StateTypeController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect StateTypeController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> StateTypeController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            StateType stateType = StateType.findStateType(id);
-            if (stateType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(stateType.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> StateTypeController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<StateType> result = StateType.findAllStateTypes();
-            return new ResponseEntity<String>(StateType.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> StateTypeController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            StateType stateType = StateType.fromJsonToStateType(json);
-            stateType.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+stateType.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> StateTypeController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (StateType stateType: StateType.fromJsonArrayToStateTypes(json)) {
-                stateType.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> StateTypeController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            StateType stateType = StateType.fromJsonToStateType(json);
-            stateType.setId(id);
-            if (stateType.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> StateTypeController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            StateType stateType = StateType.findStateType(id);
-            if (stateType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            stateType.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByTypeNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> StateTypeController.jsonFindStateTypesByTypeNameEquals(@RequestParam("typeName") String typeName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(StateType.toJsonArray(StateType.findStateTypesByTypeNameEquals(typeName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/StringCollectionDTOController.java b/src/main/java/com/labsynch/labseer/web/StringCollectionDTOController.java
deleted file mode 100755
index 9a3d24cde..000000000
--- a/src/main/java/com/labsynch/labseer/web/StringCollectionDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.StringCollectionDTO;
-
-@RooWebJson(jsonObject = StringCollectionDTO.class)
-@Controller
-@RequestMapping("/stringcollectioes")
-public class StringCollectionDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SubjectController.java b/src/main/java/com/labsynch/labseer/web/SubjectController.java
deleted file mode 100755
index 546c440ba..000000000
--- a/src/main/java/com/labsynch/labseer/web/SubjectController.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.dto.SubjectDTO;
-import com.labsynch.labseer.service.SubjectService;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import flexjson.JSONTokener;
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = Subject.class)
-@Controller
-@RequestMapping("/subjects")
-@RooWebScaffold(path = "subjects", formBackingObject = Subject.class)
-@RooWebFinder
-public class SubjectController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SubjectController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/SubjectController_Roo_Controller.aj
deleted file mode 100755
index 23db5ef96..000000000
--- a/src/main/java/com/labsynch/labseer/web/SubjectController_Roo_Controller.aj
+++ /dev/null
@@ -1,120 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ItxSubjectContainer;
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.SubjectLabel;
-import com.labsynch.labseer.domain.SubjectState;
-import com.labsynch.labseer.domain.ThingPage;
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.web.SubjectController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect SubjectController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String SubjectController.create(@Valid Subject subject, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, subject);
-            return "subjects/create";
-        }
-        uiModel.asMap().clear();
-        subject.persist();
-        return "redirect:/subjects/" + encodeUrlPathSegment(subject.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String SubjectController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new Subject());
-        return "subjects/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String SubjectController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("subject", Subject.findSubject(id));
-        uiModel.addAttribute("itemId", id);
-        return "subjects/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String SubjectController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("subjects", Subject.findSubjectEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) Subject.countSubjects() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("subjects", Subject.findAllSubjects(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "subjects/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String SubjectController.update(@Valid Subject subject, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, subject);
-            return "subjects/update";
-        }
-        uiModel.asMap().clear();
-        subject.merge();
-        return "redirect:/subjects/" + encodeUrlPathSegment(subject.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String SubjectController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, Subject.findSubject(id));
-        return "subjects/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String SubjectController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        Subject subject = Subject.findSubject(id);
-        subject.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/subjects";
-    }
-    
-    void SubjectController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("subject_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("subject_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void SubjectController.populateEditForm(Model uiModel, Subject subject) {
-        uiModel.addAttribute("subject", subject);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("itxsubjectcontainers", ItxSubjectContainer.findAllItxSubjectContainers());
-        uiModel.addAttribute("subjectlabels", SubjectLabel.findAllSubjectLabels());
-        uiModel.addAttribute("subjectstates", SubjectState.findAllSubjectStates());
-        uiModel.addAttribute("thingpages", ThingPage.findAllThingPages());
-        uiModel.addAttribute("treatmentgroups", TreatmentGroup.findAllTreatmentGroups());
-    }
-    
-    String SubjectController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SubjectController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/SubjectController_Roo_Controller_Finder.aj
deleted file mode 100755
index cc9917e74..000000000
--- a/src/main/java/com/labsynch/labseer/web/SubjectController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,78 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.web.SubjectController;
-import java.util.Set;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect SubjectController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByCodeNameEquals", "form" }, method = RequestMethod.GET)
-    public String SubjectController.findSubjectsByCodeNameEqualsForm(Model uiModel) {
-        return "subjects/findSubjectsByCodeNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByCodeNameEquals", method = RequestMethod.GET)
-    public String SubjectController.findSubjectsByCodeNameEquals(@RequestParam("codeName") String codeName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("subjects", Subject.findSubjectsByCodeNameEquals(codeName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Subject.countFindSubjectsByCodeNameEquals(codeName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("subjects", Subject.findSubjectsByCodeNameEquals(codeName, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "subjects/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTransactionEquals", "form" }, method = RequestMethod.GET)
-    public String SubjectController.findSubjectsByLsTransactionEqualsForm(Model uiModel) {
-        return "subjects/findSubjectsByLsTransactionEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", method = RequestMethod.GET)
-    public String SubjectController.findSubjectsByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("subjects", Subject.findSubjectsByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Subject.countFindSubjectsByLsTransactionEquals(lsTransaction) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("subjects", Subject.findSubjectsByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "subjects/list";
-    }
-    
-    @RequestMapping(params = { "find=ByTreatmentGroups", "form" }, method = RequestMethod.GET)
-    public String SubjectController.findSubjectsByTreatmentGroupsForm(Model uiModel) {
-        uiModel.addAttribute("treatmentgroups", TreatmentGroup.findAllTreatmentGroups());
-        return "subjects/findSubjectsByTreatmentGroups";
-    }
-    
-    @RequestMapping(params = "find=ByTreatmentGroups", method = RequestMethod.GET)
-    public String SubjectController.findSubjectsByTreatmentGroups(@RequestParam("treatmentGroups") Set<TreatmentGroup> treatmentGroups, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("subjects", Subject.findSubjectsByTreatmentGroups(treatmentGroups, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) Subject.countFindSubjectsByTreatmentGroups(treatmentGroups) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("subjects", Subject.findSubjectsByTreatmentGroups(treatmentGroups, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "subjects/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SubjectController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/SubjectController_Roo_Controller_Json.aj
deleted file mode 100755
index 52942ab83..000000000
--- a/src/main/java/com/labsynch/labseer/web/SubjectController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,150 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.web.SubjectController;
-import java.util.List;
-import java.util.Set;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect SubjectController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> SubjectController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            Subject subject = Subject.findSubject(id);
-            if (subject == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(subject.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> SubjectController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<Subject> result = Subject.findAllSubjects();
-            return new ResponseEntity<String>(Subject.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> SubjectController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            Subject subject = Subject.fromJsonToSubject(json);
-            subject.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+subject.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> SubjectController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (Subject subject: Subject.fromJsonArrayToSubjects(json)) {
-                subject.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> SubjectController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            Subject subject = Subject.fromJsonToSubject(json);
-            subject.setId(id);
-            if (subject.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> SubjectController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            Subject subject = Subject.findSubject(id);
-            if (subject == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            subject.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByCodeNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> SubjectController.jsonFindSubjectsByCodeNameEquals(@RequestParam("codeName") String codeName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Subject.toJsonArray(Subject.findSubjectsByCodeNameEquals(codeName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> SubjectController.jsonFindSubjectsByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Subject.toJsonArray(Subject.findSubjectsByLsTransactionEquals(lsTransaction).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByTreatmentGroups", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> SubjectController.jsonFindSubjectsByTreatmentGroups(@RequestParam("treatmentGroups") Set<TreatmentGroup> treatmentGroups) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(Subject.toJsonArray(Subject.findSubjectsByTreatmentGroups(treatmentGroups).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SubjectDTOController.java b/src/main/java/com/labsynch/labseer/web/SubjectDTOController.java
deleted file mode 100755
index e64c86d21..000000000
--- a/src/main/java/com/labsynch/labseer/web/SubjectDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.SubjectDTO;
-
-@RooWebJson(jsonObject = SubjectDTO.class)
-@Controller
-@RequestMapping("/subjectdto")
-public class SubjectDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SubjectLabelController.java b/src/main/java/com/labsynch/labseer/web/SubjectLabelController.java
deleted file mode 100755
index 7c1661b43..000000000
--- a/src/main/java/com/labsynch/labseer/web/SubjectLabelController.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.SubjectLabel;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.apache.commons.io.IOUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RequestMapping("/subjectlabels")
-@Controller
-@RooWebScaffold(path = "subjectlabels", formBackingObject = SubjectLabel.class)
-@RooWebJson(jsonObject = SubjectLabel.class)
-@RooWebFinder
-public class SubjectLabelController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SubjectLabelController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/SubjectLabelController_Roo_Controller.aj
deleted file mode 100755
index d285928ad..000000000
--- a/src/main/java/com/labsynch/labseer/web/SubjectLabelController_Roo_Controller.aj
+++ /dev/null
@@ -1,119 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.SubjectLabel;
-import com.labsynch.labseer.web.SubjectLabelController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect SubjectLabelController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String SubjectLabelController.create(@Valid SubjectLabel subjectLabel, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, subjectLabel);
-            return "subjectlabels/create";
-        }
-        uiModel.asMap().clear();
-        subjectLabel.persist();
-        return "redirect:/subjectlabels/" + encodeUrlPathSegment(subjectLabel.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String SubjectLabelController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new SubjectLabel());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (Subject.countSubjects() == 0) {
-            dependencies.add(new String[] { "subject", "subjects" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "subjectlabels/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String SubjectLabelController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("subjectlabel", SubjectLabel.findSubjectLabel(id));
-        uiModel.addAttribute("itemId", id);
-        return "subjectlabels/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String SubjectLabelController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("subjectlabels", SubjectLabel.findSubjectLabelEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) SubjectLabel.countSubjectLabels() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("subjectlabels", SubjectLabel.findAllSubjectLabels(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "subjectlabels/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String SubjectLabelController.update(@Valid SubjectLabel subjectLabel, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, subjectLabel);
-            return "subjectlabels/update";
-        }
-        uiModel.asMap().clear();
-        subjectLabel.merge();
-        return "redirect:/subjectlabels/" + encodeUrlPathSegment(subjectLabel.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String SubjectLabelController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, SubjectLabel.findSubjectLabel(id));
-        return "subjectlabels/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String SubjectLabelController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        SubjectLabel subjectLabel = SubjectLabel.findSubjectLabel(id);
-        subjectLabel.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/subjectlabels";
-    }
-    
-    void SubjectLabelController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("subjectLabel_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("subjectLabel_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void SubjectLabelController.populateEditForm(Model uiModel, SubjectLabel subjectLabel) {
-        uiModel.addAttribute("subjectLabel", subjectLabel);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("subjects", Subject.findAllSubjects());
-    }
-    
-    String SubjectLabelController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SubjectLabelController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/SubjectLabelController_Roo_Controller_Finder.aj
deleted file mode 100755
index f4dde6fcd..000000000
--- a/src/main/java/com/labsynch/labseer/web/SubjectLabelController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,37 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.SubjectLabel;
-import com.labsynch.labseer.web.SubjectLabelController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect SubjectLabelController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=BySubject", "form" }, method = RequestMethod.GET)
-    public String SubjectLabelController.findSubjectLabelsBySubjectForm(Model uiModel) {
-        uiModel.addAttribute("subjects", Subject.findAllSubjects());
-        return "subjectlabels/findSubjectLabelsBySubject";
-    }
-    
-    @RequestMapping(params = "find=BySubject", method = RequestMethod.GET)
-    public String SubjectLabelController.findSubjectLabelsBySubject(@RequestParam("subject") Subject subject, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("subjectlabels", SubjectLabel.findSubjectLabelsBySubject(subject, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) SubjectLabel.countFindSubjectLabelsBySubject(subject) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("subjectlabels", SubjectLabel.findSubjectLabelsBySubject(subject, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "subjectlabels/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SubjectLabelController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/SubjectLabelController_Roo_Controller_Json.aj
deleted file mode 100755
index 288212565..000000000
--- a/src/main/java/com/labsynch/labseer/web/SubjectLabelController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,125 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.SubjectLabel;
-import com.labsynch.labseer.web.SubjectLabelController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect SubjectLabelController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> SubjectLabelController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            SubjectLabel subjectLabel = SubjectLabel.findSubjectLabel(id);
-            if (subjectLabel == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(subjectLabel.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> SubjectLabelController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<SubjectLabel> result = SubjectLabel.findAllSubjectLabels();
-            return new ResponseEntity<String>(SubjectLabel.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> SubjectLabelController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            SubjectLabel subjectLabel = SubjectLabel.fromJsonToSubjectLabel(json);
-            subjectLabel.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+subjectLabel.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> SubjectLabelController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (SubjectLabel subjectLabel: SubjectLabel.fromJsonArrayToSubjectLabels(json)) {
-                subjectLabel.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> SubjectLabelController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            SubjectLabel subjectLabel = SubjectLabel.fromJsonToSubjectLabel(json);
-            subjectLabel.setId(id);
-            if (subjectLabel.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> SubjectLabelController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            SubjectLabel subjectLabel = SubjectLabel.findSubjectLabel(id);
-            if (subjectLabel == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            subjectLabel.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=BySubject", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> SubjectLabelController.jsonFindSubjectLabelsBySubject(@RequestParam("subject") Subject subject) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(SubjectLabel.toJsonArray(SubjectLabel.findSubjectLabelsBySubject(subject).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SubjectLabelDTOController.java b/src/main/java/com/labsynch/labseer/web/SubjectLabelDTOController.java
deleted file mode 100755
index 01af86088..000000000
--- a/src/main/java/com/labsynch/labseer/web/SubjectLabelDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.SubjectLabelDTO;
-
-@RooWebJson(jsonObject = SubjectLabelDTO.class)
-@Controller
-@RequestMapping("/subjectlabeldto")
-public class SubjectLabelDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SubjectMiniDTOController.java b/src/main/java/com/labsynch/labseer/web/SubjectMiniDTOController.java
deleted file mode 100755
index ba821aa42..000000000
--- a/src/main/java/com/labsynch/labseer/web/SubjectMiniDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.SubjectMiniDTO;
-
-@RooWebJson(jsonObject = SubjectMiniDTO.class)
-@Controller
-@RequestMapping("/subjectminidto")
-public class SubjectMiniDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SubjectStateController.java b/src/main/java/com/labsynch/labseer/web/SubjectStateController.java
deleted file mode 100755
index fdd28b4ef..000000000
--- a/src/main/java/com/labsynch/labseer/web/SubjectStateController.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.SubjectState;
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import flexjson.JSONTokener;
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.apache.commons.io.IOUtils;
-import org.joda.time.format.DateTimeFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-@RooWebJson(jsonObject = SubjectState.class)
-@Controller
-@RequestMapping("/subjectstates")
-@RooWebScaffold(path = "subjectstates", formBackingObject = SubjectState.class)
-@RooWebFinder
-public class SubjectStateController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SubjectStateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/SubjectStateController_Roo_Controller.aj
deleted file mode 100644
index f65386ebd..000000000
--- a/src/main/java/com/labsynch/labseer/web/SubjectStateController_Roo_Controller.aj
+++ /dev/null
@@ -1,121 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.SubjectState;
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.web.SubjectStateController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect SubjectStateController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String SubjectStateController.create(@Valid SubjectState subjectState, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, subjectState);
-            return "subjectstates/create";
-        }
-        uiModel.asMap().clear();
-        subjectState.persist();
-        return "redirect:/subjectstates/" + encodeUrlPathSegment(subjectState.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String SubjectStateController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new SubjectState());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (Subject.countSubjects() == 0) {
-            dependencies.add(new String[] { "subject", "subjects" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "subjectstates/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String SubjectStateController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("subjectstate", SubjectState.findSubjectState(id));
-        uiModel.addAttribute("itemId", id);
-        return "subjectstates/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String SubjectStateController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("subjectstates", SubjectState.findSubjectStateEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) SubjectState.countSubjectStates() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("subjectstates", SubjectState.findAllSubjectStates(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "subjectstates/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String SubjectStateController.update(@Valid SubjectState subjectState, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, subjectState);
-            return "subjectstates/update";
-        }
-        uiModel.asMap().clear();
-        subjectState.merge();
-        return "redirect:/subjectstates/" + encodeUrlPathSegment(subjectState.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String SubjectStateController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, SubjectState.findSubjectState(id));
-        return "subjectstates/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String SubjectStateController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        SubjectState subjectState = SubjectState.findSubjectState(id);
-        subjectState.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/subjectstates";
-    }
-    
-    void SubjectStateController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("subjectState_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("subjectState_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void SubjectStateController.populateEditForm(Model uiModel, SubjectState subjectState) {
-        uiModel.addAttribute("subjectState", subjectState);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("subjects", Subject.findAllSubjects());
-        uiModel.addAttribute("subjectvalues", SubjectValue.findAllSubjectValues());
-    }
-    
-    String SubjectStateController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SubjectStateController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/SubjectStateController_Roo_Controller_Finder.aj
deleted file mode 100755
index bd4db4003..000000000
--- a/src/main/java/com/labsynch/labseer/web/SubjectStateController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,58 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.SubjectState;
-import com.labsynch.labseer.web.SubjectStateController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect SubjectStateController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByLsTypeEqualsAndLsKindEqualsAndSubject", "form" }, method = RequestMethod.GET)
-    public String SubjectStateController.findSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubjectForm(Model uiModel) {
-        uiModel.addAttribute("subjects", Subject.findAllSubjects());
-        return "subjectstates/findSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEqualsAndSubject", method = RequestMethod.GET)
-    public String SubjectStateController.findSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind, @RequestParam("subject") Subject subject, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("subjectstates", SubjectState.findSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject(lsType, lsKind, subject, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) SubjectState.countFindSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject(lsType, lsKind, subject) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("subjectstates", SubjectState.findSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject(lsType, lsKind, subject, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "subjectstates/list";
-    }
-    
-    @RequestMapping(params = { "find=BySubject", "form" }, method = RequestMethod.GET)
-    public String SubjectStateController.findSubjectStatesBySubjectForm(Model uiModel) {
-        uiModel.addAttribute("subjects", Subject.findAllSubjects());
-        return "subjectstates/findSubjectStatesBySubject";
-    }
-    
-    @RequestMapping(params = "find=BySubject", method = RequestMethod.GET)
-    public String SubjectStateController.findSubjectStatesBySubject(@RequestParam("subject") Subject subject, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("subjectstates", SubjectState.findSubjectStatesBySubject(subject, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) SubjectState.countFindSubjectStatesBySubject(subject) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("subjectstates", SubjectState.findSubjectStatesBySubject(subject, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "subjectstates/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SubjectStateController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/SubjectStateController_Roo_Controller_Json.aj
deleted file mode 100755
index 4cd8d3891..000000000
--- a/src/main/java/com/labsynch/labseer/web/SubjectStateController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,137 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.SubjectState;
-import com.labsynch.labseer.web.SubjectStateController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect SubjectStateController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> SubjectStateController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            SubjectState subjectState = SubjectState.findSubjectState(id);
-            if (subjectState == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(subjectState.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> SubjectStateController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<SubjectState> result = SubjectState.findAllSubjectStates();
-            return new ResponseEntity<String>(SubjectState.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> SubjectStateController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            SubjectState subjectState = SubjectState.fromJsonToSubjectState(json);
-            subjectState.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+subjectState.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> SubjectStateController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (SubjectState subjectState: SubjectState.fromJsonArrayToSubjectStates(json)) {
-                subjectState.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> SubjectStateController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            SubjectState subjectState = SubjectState.fromJsonToSubjectState(json);
-            subjectState.setId(id);
-            if (subjectState.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> SubjectStateController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            SubjectState subjectState = SubjectState.findSubjectState(id);
-            if (subjectState == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            subjectState.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEqualsAndSubject", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> SubjectStateController.jsonFindSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind, @RequestParam("subject") Subject subject) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(SubjectState.toJsonArray(SubjectState.findSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject(lsType, lsKind, subject).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=BySubject", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> SubjectStateController.jsonFindSubjectStatesBySubject(@RequestParam("subject") Subject subject) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(SubjectState.toJsonArray(SubjectState.findSubjectStatesBySubject(subject).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SubjectStateDTOController.java b/src/main/java/com/labsynch/labseer/web/SubjectStateDTOController.java
deleted file mode 100755
index 0d578773f..000000000
--- a/src/main/java/com/labsynch/labseer/web/SubjectStateDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.SubjectStateDTO;
-
-@RooWebJson(jsonObject = SubjectStateDTO.class)
-@Controller
-@RequestMapping("/subjectstatedto")
-public class SubjectStateDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SubjectStateMiniDTOController.java b/src/main/java/com/labsynch/labseer/web/SubjectStateMiniDTOController.java
deleted file mode 100755
index e2012928e..000000000
--- a/src/main/java/com/labsynch/labseer/web/SubjectStateMiniDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.SubjectStateMiniDTO;
-
-@RooWebJson(jsonObject = SubjectStateMiniDTO.class)
-@Controller
-@RequestMapping("/subjectstateminidto")
-public class SubjectStateMiniDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SubjectValueController.java b/src/main/java/com/labsynch/labseer/web/SubjectValueController.java
deleted file mode 100755
index d65013259..000000000
--- a/src/main/java/com/labsynch/labseer/web/SubjectValueController.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.SubjectState;
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import flexjson.JSONTokener;
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.apache.commons.io.IOUtils;
-import org.joda.time.format.DateTimeFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-@RooWebJson(jsonObject = SubjectValue.class)
-@Controller
-@RequestMapping("/subjectvalues")
-@RooWebScaffold(path = "subjectvalues", formBackingObject = SubjectValue.class)
-@RooWebFinder
-public class SubjectValueController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SubjectValueController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/SubjectValueController_Roo_Controller.aj
deleted file mode 100644
index 2495b0ad1..000000000
--- a/src/main/java/com/labsynch/labseer/web/SubjectValueController_Roo_Controller.aj
+++ /dev/null
@@ -1,120 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.SubjectState;
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.web.SubjectValueController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect SubjectValueController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String SubjectValueController.create(@Valid SubjectValue subjectValue, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, subjectValue);
-            return "subjectvalues/create";
-        }
-        uiModel.asMap().clear();
-        subjectValue.persist();
-        return "redirect:/subjectvalues/" + encodeUrlPathSegment(subjectValue.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String SubjectValueController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new SubjectValue());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (SubjectState.countSubjectStates() == 0) {
-            dependencies.add(new String[] { "lsState", "subjectstates" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "subjectvalues/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String SubjectValueController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("subjectvalue", SubjectValue.findSubjectValue(id));
-        uiModel.addAttribute("itemId", id);
-        return "subjectvalues/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String SubjectValueController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("subjectvalues", SubjectValue.findSubjectValueEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) SubjectValue.countSubjectValues() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("subjectvalues", SubjectValue.findAllSubjectValues(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "subjectvalues/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String SubjectValueController.update(@Valid SubjectValue subjectValue, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, subjectValue);
-            return "subjectvalues/update";
-        }
-        uiModel.asMap().clear();
-        subjectValue.merge();
-        return "redirect:/subjectvalues/" + encodeUrlPathSegment(subjectValue.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String SubjectValueController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, SubjectValue.findSubjectValue(id));
-        return "subjectvalues/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String SubjectValueController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        SubjectValue subjectValue = SubjectValue.findSubjectValue(id);
-        subjectValue.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/subjectvalues";
-    }
-    
-    void SubjectValueController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("subjectValue_datevalue_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("subjectValue_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("subjectValue_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void SubjectValueController.populateEditForm(Model uiModel, SubjectValue subjectValue) {
-        uiModel.addAttribute("subjectValue", subjectValue);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("subjectstates", SubjectState.findAllSubjectStates());
-    }
-    
-    String SubjectValueController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SubjectValueController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/SubjectValueController_Roo_Controller_Finder.aj
deleted file mode 100755
index 908bcbe5c..000000000
--- a/src/main/java/com/labsynch/labseer/web/SubjectValueController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,118 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.SubjectState;
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.web.SubjectValueController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect SubjectValueController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByCodeValueEquals", "form" }, method = RequestMethod.GET)
-    public String SubjectValueController.findSubjectValuesByCodeValueEqualsForm(Model uiModel) {
-        return "subjectvalues/findSubjectValuesByCodeValueEquals";
-    }
-    
-    @RequestMapping(params = "find=ByCodeValueEquals", method = RequestMethod.GET)
-    public String SubjectValueController.findSubjectValuesByCodeValueEquals(@RequestParam("codeValue") String codeValue, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("subjectvalues", SubjectValue.findSubjectValuesByCodeValueEquals(codeValue, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) SubjectValue.countFindSubjectValuesByCodeValueEquals(codeValue) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("subjectvalues", SubjectValue.findSubjectValuesByCodeValueEquals(codeValue, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "subjectvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByIgnoredNotAndCodeValueEquals", "form" }, method = RequestMethod.GET)
-    public String SubjectValueController.findSubjectValuesByIgnoredNotAndCodeValueEqualsForm(Model uiModel) {
-        return "subjectvalues/findSubjectValuesByIgnoredNotAndCodeValueEquals";
-    }
-    
-    @RequestMapping(params = "find=ByIgnoredNotAndCodeValueEquals", method = RequestMethod.GET)
-    public String SubjectValueController.findSubjectValuesByIgnoredNotAndCodeValueEquals(@RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam("codeValue") String codeValue, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("subjectvalues", SubjectValue.findSubjectValuesByIgnoredNotAndCodeValueEquals(ignored, codeValue, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) SubjectValue.countFindSubjectValuesByIgnoredNotAndCodeValueEquals(ignored, codeValue) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("subjectvalues", SubjectValue.findSubjectValuesByIgnoredNotAndCodeValueEquals(ignored, codeValue, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "subjectvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsState", "form" }, method = RequestMethod.GET)
-    public String SubjectValueController.findSubjectValuesByLsStateForm(Model uiModel) {
-        uiModel.addAttribute("subjectstates", SubjectState.findAllSubjectStates());
-        return "subjectvalues/findSubjectValuesByLsState";
-    }
-    
-    @RequestMapping(params = "find=ByLsState", method = RequestMethod.GET)
-    public String SubjectValueController.findSubjectValuesByLsState(@RequestParam("lsState") SubjectState lsState, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("subjectvalues", SubjectValue.findSubjectValuesByLsState(lsState, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) SubjectValue.countFindSubjectValuesByLsState(lsState) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("subjectvalues", SubjectValue.findSubjectValuesByLsState(lsState, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "subjectvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsStateAndLsTypeEqualsAndLsKindEquals", "form" }, method = RequestMethod.GET)
-    public String SubjectValueController.findSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEqualsForm(Model uiModel) {
-        uiModel.addAttribute("subjectstates", SubjectState.findAllSubjectStates());
-        return "subjectvalues/findSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsStateAndLsTypeEqualsAndLsKindEquals", method = RequestMethod.GET)
-    public String SubjectValueController.findSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals(@RequestParam("lsState") SubjectState lsState, @RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("subjectvalues", SubjectValue.findSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals(lsState, lsType, lsKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) SubjectValue.countFindSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals(lsState, lsType, lsKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("subjectvalues", SubjectValue.findSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals(lsState, lsType, lsKind, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "subjectvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeEqualsAndLsKindEquals", "form" }, method = RequestMethod.GET)
-    public String SubjectValueController.findSubjectValuesByLsTypeEqualsAndLsKindEqualsForm(Model uiModel) {
-        return "subjectvalues/findSubjectValuesByLsTypeEqualsAndLsKindEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEquals", method = RequestMethod.GET)
-    public String SubjectValueController.findSubjectValuesByLsTypeEqualsAndLsKindEquals(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("subjectvalues", SubjectValue.findSubjectValuesByLsTypeEqualsAndLsKindEquals(lsType, lsKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) SubjectValue.countFindSubjectValuesByLsTypeEqualsAndLsKindEquals(lsType, lsKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("subjectvalues", SubjectValue.findSubjectValuesByLsTypeEqualsAndLsKindEquals(lsType, lsKind, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "subjectvalues/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SubjectValueController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/SubjectValueController_Roo_Controller_Json.aj
deleted file mode 100755
index f23469d1c..000000000
--- a/src/main/java/com/labsynch/labseer/web/SubjectValueController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,173 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.SubjectState;
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.web.SubjectValueController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect SubjectValueController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> SubjectValueController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            SubjectValue subjectValue = SubjectValue.findSubjectValue(id);
-            if (subjectValue == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(subjectValue.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> SubjectValueController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<SubjectValue> result = SubjectValue.findAllSubjectValues();
-            return new ResponseEntity<String>(SubjectValue.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> SubjectValueController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            SubjectValue subjectValue = SubjectValue.fromJsonToSubjectValue(json);
-            subjectValue.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+subjectValue.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> SubjectValueController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (SubjectValue subjectValue: SubjectValue.fromJsonArrayToSubjectValues(json)) {
-                subjectValue.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> SubjectValueController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            SubjectValue subjectValue = SubjectValue.fromJsonToSubjectValue(json);
-            subjectValue.setId(id);
-            if (subjectValue.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> SubjectValueController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            SubjectValue subjectValue = SubjectValue.findSubjectValue(id);
-            if (subjectValue == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            subjectValue.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByCodeValueEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> SubjectValueController.jsonFindSubjectValuesByCodeValueEquals(@RequestParam("codeValue") String codeValue) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(SubjectValue.toJsonArray(SubjectValue.findSubjectValuesByCodeValueEquals(codeValue).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByIgnoredNotAndCodeValueEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> SubjectValueController.jsonFindSubjectValuesByIgnoredNotAndCodeValueEquals(@RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam("codeValue") String codeValue) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(SubjectValue.toJsonArray(SubjectValue.findSubjectValuesByIgnoredNotAndCodeValueEquals(ignored, codeValue).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsState", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> SubjectValueController.jsonFindSubjectValuesByLsState(@RequestParam("lsState") SubjectState lsState) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(SubjectValue.toJsonArray(SubjectValue.findSubjectValuesByLsState(lsState).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsStateAndLsTypeEqualsAndLsKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> SubjectValueController.jsonFindSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals(@RequestParam("lsState") SubjectState lsState, @RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(SubjectValue.toJsonArray(SubjectValue.findSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals(lsState, lsType, lsKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> SubjectValueController.jsonFindSubjectValuesByLsTypeEqualsAndLsKindEquals(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(SubjectValue.toJsonArray(SubjectValue.findSubjectValuesByLsTypeEqualsAndLsKindEquals(lsType, lsKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/SubjectValueDTOController.java b/src/main/java/com/labsynch/labseer/web/SubjectValueDTOController.java
deleted file mode 100755
index 5fea6ee15..000000000
--- a/src/main/java/com/labsynch/labseer/web/SubjectValueDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.SubjectValueDTO;
-
-@RooWebJson(jsonObject = SubjectValueDTO.class)
-@Controller
-@RequestMapping("/subjectvaluedto")
-public class SubjectValueDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/TempSelectTableController.java b/src/main/java/com/labsynch/labseer/web/TempSelectTableController.java
deleted file mode 100644
index 8909ad4f1..000000000
--- a/src/main/java/com/labsynch/labseer/web/TempSelectTableController.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.TempSelectTable;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/tempselecttables")
-@Controller
-@RooWebScaffold(path = "tempselecttables", formBackingObject = TempSelectTable.class)
-public class TempSelectTableController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/TempSelectTableController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/TempSelectTableController_Roo_Controller.aj
deleted file mode 100644
index 456eeb0f8..000000000
--- a/src/main/java/com/labsynch/labseer/web/TempSelectTableController_Roo_Controller.aj
+++ /dev/null
@@ -1,109 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.TempSelectTable;
-import com.labsynch.labseer.web.TempSelectTableController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect TempSelectTableController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String TempSelectTableController.create(@Valid TempSelectTable tempSelectTable, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, tempSelectTable);
-            return "tempselecttables/create";
-        }
-        uiModel.asMap().clear();
-        tempSelectTable.persist();
-        return "redirect:/tempselecttables/" + encodeUrlPathSegment(tempSelectTable.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String TempSelectTableController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new TempSelectTable());
-        return "tempselecttables/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String TempSelectTableController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("tempselecttable", TempSelectTable.findTempSelectTable(id));
-        uiModel.addAttribute("itemId", id);
-        return "tempselecttables/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String TempSelectTableController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("tempselecttables", TempSelectTable.findTempSelectTableEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) TempSelectTable.countTempSelectTables() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("tempselecttables", TempSelectTable.findAllTempSelectTables(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "tempselecttables/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String TempSelectTableController.update(@Valid TempSelectTable tempSelectTable, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, tempSelectTable);
-            return "tempselecttables/update";
-        }
-        uiModel.asMap().clear();
-        tempSelectTable.merge();
-        return "redirect:/tempselecttables/" + encodeUrlPathSegment(tempSelectTable.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String TempSelectTableController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, TempSelectTable.findTempSelectTable(id));
-        return "tempselecttables/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String TempSelectTableController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        TempSelectTable tempSelectTable = TempSelectTable.findTempSelectTable(id);
-        tempSelectTable.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/tempselecttables";
-    }
-    
-    void TempSelectTableController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("tempSelectTable_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void TempSelectTableController.populateEditForm(Model uiModel, TempSelectTable tempSelectTable) {
-        uiModel.addAttribute("tempSelectTable", tempSelectTable);
-        addDateTimeFormatPatterns(uiModel);
-    }
-    
-    String TempSelectTableController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ThingKindController.java b/src/main/java/com/labsynch/labseer/web/ThingKindController.java
deleted file mode 100755
index 096926bf1..000000000
--- a/src/main/java/com/labsynch/labseer/web/ThingKindController.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ThingKind;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = ThingKind.class)
-@Controller
-@RequestMapping("/thingkinds")
-@RooWebScaffold(path = "thingkinds", formBackingObject = ThingKind.class)
-@RooWebFinder
-public class ThingKindController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ThingKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ThingKindController_Roo_Controller.aj
deleted file mode 100755
index 9122aa7de..000000000
--- a/src/main/java/com/labsynch/labseer/web/ThingKindController_Roo_Controller.aj
+++ /dev/null
@@ -1,109 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ThingKind;
-import com.labsynch.labseer.domain.ThingType;
-import com.labsynch.labseer.web.ThingKindController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ThingKindController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ThingKindController.create(@Valid ThingKind thingKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, thingKind);
-            return "thingkinds/create";
-        }
-        uiModel.asMap().clear();
-        thingKind.persist();
-        return "redirect:/thingkinds/" + encodeUrlPathSegment(thingKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ThingKindController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ThingKind());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (ThingType.countThingTypes() == 0) {
-            dependencies.add(new String[] { "lsType", "thingtypes" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "thingkinds/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ThingKindController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("thingkind", ThingKind.findThingKind(id));
-        uiModel.addAttribute("itemId", id);
-        return "thingkinds/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ThingKindController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("thingkinds", ThingKind.findThingKindEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ThingKind.countThingKinds() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("thingkinds", ThingKind.findAllThingKinds(sortFieldName, sortOrder));
-        }
-        return "thingkinds/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ThingKindController.update(@Valid ThingKind thingKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, thingKind);
-            return "thingkinds/update";
-        }
-        uiModel.asMap().clear();
-        thingKind.merge();
-        return "redirect:/thingkinds/" + encodeUrlPathSegment(thingKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ThingKindController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ThingKind.findThingKind(id));
-        return "thingkinds/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ThingKindController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ThingKind thingKind = ThingKind.findThingKind(id);
-        thingKind.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/thingkinds";
-    }
-    
-    void ThingKindController.populateEditForm(Model uiModel, ThingKind thingKind) {
-        uiModel.addAttribute("thingKind", thingKind);
-        uiModel.addAttribute("thingtypes", ThingType.findAllThingTypes());
-    }
-    
-    String ThingKindController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ThingKindController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/ThingKindController_Roo_Controller_Finder.aj
deleted file mode 100755
index 8abfe53f7..000000000
--- a/src/main/java/com/labsynch/labseer/web/ThingKindController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,75 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ThingKind;
-import com.labsynch.labseer.domain.ThingType;
-import com.labsynch.labseer.web.ThingKindController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect ThingKindController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByKindNameEqualsAndLsType", "form" }, method = RequestMethod.GET)
-    public String ThingKindController.findThingKindsByKindNameEqualsAndLsTypeForm(Model uiModel) {
-        uiModel.addAttribute("thingtypes", ThingType.findAllThingTypes());
-        return "thingkinds/findThingKindsByKindNameEqualsAndLsType";
-    }
-    
-    @RequestMapping(params = "find=ByKindNameEqualsAndLsType", method = RequestMethod.GET)
-    public String ThingKindController.findThingKindsByKindNameEqualsAndLsType(@RequestParam("kindName") String kindName, @RequestParam("lsType") ThingType lsType, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("thingkinds", ThingKind.findThingKindsByKindNameEqualsAndLsType(kindName, lsType, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ThingKind.countFindThingKindsByKindNameEqualsAndLsType(kindName, lsType) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("thingkinds", ThingKind.findThingKindsByKindNameEqualsAndLsType(kindName, lsType, sortFieldName, sortOrder).getResultList());
-        }
-        return "thingkinds/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsType", "form" }, method = RequestMethod.GET)
-    public String ThingKindController.findThingKindsByLsTypeForm(Model uiModel) {
-        uiModel.addAttribute("thingtypes", ThingType.findAllThingTypes());
-        return "thingkinds/findThingKindsByLsType";
-    }
-    
-    @RequestMapping(params = "find=ByLsType", method = RequestMethod.GET)
-    public String ThingKindController.findThingKindsByLsType(@RequestParam("lsType") ThingType lsType, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("thingkinds", ThingKind.findThingKindsByLsType(lsType, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ThingKind.countFindThingKindsByLsType(lsType) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("thingkinds", ThingKind.findThingKindsByLsType(lsType, sortFieldName, sortOrder).getResultList());
-        }
-        return "thingkinds/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeAndKindEquals", "form" }, method = RequestMethod.GET)
-    public String ThingKindController.findThingKindsByLsTypeAndKindEqualsForm(Model uiModel) {
-        return "thingkinds/findThingKindsByLsTypeAndKindEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeAndKindEquals", method = RequestMethod.GET)
-    public String ThingKindController.findThingKindsByLsTypeAndKindEquals(@RequestParam("lsTypeAndKind") String lsTypeAndKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("thingkinds", ThingKind.findThingKindsByLsTypeAndKindEquals(lsTypeAndKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ThingKind.countFindThingKindsByLsTypeAndKindEquals(lsTypeAndKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("thingkinds", ThingKind.findThingKindsByLsTypeAndKindEquals(lsTypeAndKind, sortFieldName, sortOrder).getResultList());
-        }
-        return "thingkinds/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ThingKindController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ThingKindController_Roo_Controller_Json.aj
deleted file mode 100755
index f61bf21ea..000000000
--- a/src/main/java/com/labsynch/labseer/web/ThingKindController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,149 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ThingKind;
-import com.labsynch.labseer.domain.ThingType;
-import com.labsynch.labseer.web.ThingKindController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ThingKindController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ThingKindController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ThingKind thingKind = ThingKind.findThingKind(id);
-            if (thingKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(thingKind.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ThingKindController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ThingKind> result = ThingKind.findAllThingKinds();
-            return new ResponseEntity<String>(ThingKind.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ThingKindController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ThingKind thingKind = ThingKind.fromJsonToThingKind(json);
-            thingKind.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+thingKind.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ThingKindController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ThingKind thingKind: ThingKind.fromJsonArrayToThingKinds(json)) {
-                thingKind.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ThingKindController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ThingKind thingKind = ThingKind.fromJsonToThingKind(json);
-            thingKind.setId(id);
-            if (thingKind.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ThingKindController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ThingKind thingKind = ThingKind.findThingKind(id);
-            if (thingKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            thingKind.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByKindNameEqualsAndLsType", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ThingKindController.jsonFindThingKindsByKindNameEqualsAndLsType(@RequestParam("kindName") String kindName, @RequestParam("lsType") ThingType lsType) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ThingKind.toJsonArray(ThingKind.findThingKindsByKindNameEqualsAndLsType(kindName, lsType).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsType", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ThingKindController.jsonFindThingKindsByLsType(@RequestParam("lsType") ThingType lsType) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ThingKind.toJsonArray(ThingKind.findThingKindsByLsType(lsType).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeAndKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ThingKindController.jsonFindThingKindsByLsTypeAndKindEquals(@RequestParam("lsTypeAndKind") String lsTypeAndKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ThingKind.toJsonArray(ThingKind.findThingKindsByLsTypeAndKindEquals(lsTypeAndKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ThingPageArchiveController.java b/src/main/java/com/labsynch/labseer/web/ThingPageArchiveController.java
deleted file mode 100755
index 743d34b02..000000000
--- a/src/main/java/com/labsynch/labseer/web/ThingPageArchiveController.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ThingPageArchive;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = ThingPageArchive.class)
-@Controller
-@RequestMapping("/thingpagearchives")
-@RooWebScaffold(path = "thingpagearchives", formBackingObject = ThingPageArchive.class)
-public class ThingPageArchiveController {
-
-    @RequestMapping(value = "/{id}", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<java.lang.String> showJson(@PathVariable("id") Long id) {
-        ThingPageArchive thingPageArchive = ThingPageArchive.findThingPageArchive(id);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        if (thingPageArchive == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        return new ResponseEntity<String>(thingPageArchive.toJson(), headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<java.lang.String> listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        List<ThingPageArchive> result = ThingPageArchive.findAllThingPageArchives();
-        return new ResponseEntity<String>(ThingPageArchive.toJsonArray(result), headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> createFromJson(@RequestBody String json) {
-        ThingPageArchive thingPageArchive = ThingPageArchive.fromJsonToThingPageArchive(json);
-        thingPageArchive.persist();
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-    }
-
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> createFromJsonArray(@RequestBody String json) {
-        for (ThingPageArchive thingPageArchive : ThingPageArchive.fromJsonArrayToThingPageArchives(json)) {
-            thingPageArchive.persist();
-        }
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-    }
-
-    @RequestMapping(value = { "/", "/{id}" }, method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> updateFromJson(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        ThingPageArchive thingPageArchive = ThingPageArchive.fromJsonToThingPageArchive(json);
-        if (thingPageArchive.merge() == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> updateFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        for (ThingPageArchive thingPageArchive : ThingPageArchive.fromJsonArrayToThingPageArchives(json)) {
-            if (thingPageArchive.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-        }
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> deleteFromJson(@PathVariable("id") Long id) {
-        ThingPageArchive thingPageArchive = ThingPageArchive.findThingPageArchive(id);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        if (thingPageArchive == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        thingPageArchive.remove();
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ThingPageArchiveController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ThingPageArchiveController_Roo_Controller.aj
deleted file mode 100755
index f4a674bb1..000000000
--- a/src/main/java/com/labsynch/labseer/web/ThingPageArchiveController_Roo_Controller.aj
+++ /dev/null
@@ -1,110 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ThingPageArchive;
-import com.labsynch.labseer.web.ThingPageArchiveController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ThingPageArchiveController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ThingPageArchiveController.create(@Valid ThingPageArchive thingPageArchive, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, thingPageArchive);
-            return "thingpagearchives/create";
-        }
-        uiModel.asMap().clear();
-        thingPageArchive.persist();
-        return "redirect:/thingpagearchives/" + encodeUrlPathSegment(thingPageArchive.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ThingPageArchiveController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ThingPageArchive());
-        return "thingpagearchives/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ThingPageArchiveController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("thingpagearchive", ThingPageArchive.findThingPageArchive(id));
-        uiModel.addAttribute("itemId", id);
-        return "thingpagearchives/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ThingPageArchiveController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("thingpagearchives", ThingPageArchive.findThingPageArchiveEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ThingPageArchive.countThingPageArchives() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("thingpagearchives", ThingPageArchive.findAllThingPageArchives(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "thingpagearchives/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ThingPageArchiveController.update(@Valid ThingPageArchive thingPageArchive, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, thingPageArchive);
-            return "thingpagearchives/update";
-        }
-        uiModel.asMap().clear();
-        thingPageArchive.merge();
-        return "redirect:/thingpagearchives/" + encodeUrlPathSegment(thingPageArchive.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ThingPageArchiveController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ThingPageArchive.findThingPageArchive(id));
-        return "thingpagearchives/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ThingPageArchiveController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ThingPageArchive thingPageArchive = ThingPageArchive.findThingPageArchive(id);
-        thingPageArchive.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/thingpagearchives";
-    }
-    
-    void ThingPageArchiveController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("thingPageArchive_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("thingPageArchive_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ThingPageArchiveController.populateEditForm(Model uiModel, ThingPageArchive thingPageArchive) {
-        uiModel.addAttribute("thingPageArchive", thingPageArchive);
-        addDateTimeFormatPatterns(uiModel);
-    }
-    
-    String ThingPageArchiveController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ThingPageController.java b/src/main/java/com/labsynch/labseer/web/ThingPageController.java
deleted file mode 100755
index 487fd0eb9..000000000
--- a/src/main/java/com/labsynch/labseer/web/ThingPageController.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ThingPage;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = ThingPage.class)
-@Controller
-@RequestMapping("/thingpages")
-@RooWebScaffold(path = "thingpages", formBackingObject = ThingPage.class)
-public class ThingPageController {
-
-    @Autowired
-    private PropertiesUtilService propertiesUtilService;
-
-    @RequestMapping(value = "/{id}", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<java.lang.String> showJson(@PathVariable("id") Long id) {
-        ThingPage thingPage = ThingPage.findThingPage(id);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        if (thingPage == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        return new ResponseEntity<String>(thingPage.toJson(), headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<java.lang.String> listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        List<ThingPage> result = ThingPage.findAllThingPages();
-        return new ResponseEntity<String>(ThingPage.toJsonArray(result), headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> createFromJson(@RequestBody String json) {
-        ThingPage thingPage = ThingPage.fromJsonToThingPage(json);
-        thingPage.persist();
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-    }
-
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> createFromJsonArray(@RequestBody String json) {
-        int batchSize = propertiesUtilService.getBatchSize();
-        int i = 0;
-        for (ThingPage thingPage : ThingPage.fromJsonArrayToThingPages(json)) {
-            thingPage.persist();
-            if (i % batchSize == 0) {
-                thingPage.flush();
-                thingPage.clear();
-            }
-            i++;
-        }
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-    }
-
-    @RequestMapping(value = { "/", "/{id}" }, method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> updateFromJson(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        ThingPage thingPage = ThingPage.fromJsonToThingPage(json);
-        if (thingPage.merge() == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> updateFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        for (ThingPage thingPage : ThingPage.fromJsonArrayToThingPages(json)) {
-            if (thingPage.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-        }
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> deleteFromJson(@PathVariable("id") Long id) {
-        ThingPage thingPage = ThingPage.findThingPage(id);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        if (thingPage == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        thingPage.remove();
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ThingPageController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ThingPageController_Roo_Controller.aj
deleted file mode 100755
index e38dd87a3..000000000
--- a/src/main/java/com/labsynch/labseer/web/ThingPageController_Roo_Controller.aj
+++ /dev/null
@@ -1,121 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.AbstractThing;
-import com.labsynch.labseer.domain.LsTransaction;
-import com.labsynch.labseer.domain.ThingPage;
-import com.labsynch.labseer.web.ThingPageController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ThingPageController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ThingPageController.create(@Valid ThingPage thingPage, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, thingPage);
-            return "thingpages/create";
-        }
-        uiModel.asMap().clear();
-        thingPage.persist();
-        return "redirect:/thingpages/" + encodeUrlPathSegment(thingPage.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ThingPageController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ThingPage());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (AbstractThing.countAbstractThings() == 0) {
-            dependencies.add(new String[] { "lsTransaction", "abstractthings" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "thingpages/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ThingPageController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("thingpage", ThingPage.findThingPage(id));
-        uiModel.addAttribute("itemId", id);
-        return "thingpages/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ThingPageController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("thingpages", ThingPage.findThingPageEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ThingPage.countThingPages() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("thingpages", ThingPage.findAllThingPages(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "thingpages/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ThingPageController.update(@Valid ThingPage thingPage, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, thingPage);
-            return "thingpages/update";
-        }
-        uiModel.asMap().clear();
-        thingPage.merge();
-        return "redirect:/thingpages/" + encodeUrlPathSegment(thingPage.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ThingPageController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ThingPage.findThingPage(id));
-        return "thingpages/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ThingPageController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ThingPage thingPage = ThingPage.findThingPage(id);
-        thingPage.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/thingpages";
-    }
-    
-    void ThingPageController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("thingPage_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("thingPage_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void ThingPageController.populateEditForm(Model uiModel, ThingPage thingPage) {
-        uiModel.addAttribute("thingPage", thingPage);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("abstractthings", AbstractThing.findAllAbstractThings());
-        uiModel.addAttribute("lstransactions", LsTransaction.findAllLsTransactions());
-    }
-    
-    String ThingPageController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ThingTypeController.java b/src/main/java/com/labsynch/labseer/web/ThingTypeController.java
deleted file mode 100755
index a59f74e14..000000000
--- a/src/main/java/com/labsynch/labseer/web/ThingTypeController.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ThingType;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = ThingType.class)
-@Controller
-@RequestMapping("/thingtypes")
-@RooWebScaffold(path = "thingtypes", formBackingObject = ThingType.class)
-@RooWebFinder
-public class ThingTypeController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ThingTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ThingTypeController_Roo_Controller.aj
deleted file mode 100755
index 5158c77f8..000000000
--- a/src/main/java/com/labsynch/labseer/web/ThingTypeController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ThingType;
-import com.labsynch.labseer.web.ThingTypeController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ThingTypeController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ThingTypeController.create(@Valid ThingType thingType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, thingType);
-            return "thingtypes/create";
-        }
-        uiModel.asMap().clear();
-        thingType.persist();
-        return "redirect:/thingtypes/" + encodeUrlPathSegment(thingType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ThingTypeController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ThingType());
-        return "thingtypes/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ThingTypeController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("thingtype", ThingType.findThingType(id));
-        uiModel.addAttribute("itemId", id);
-        return "thingtypes/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ThingTypeController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("thingtypes", ThingType.findThingTypeEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ThingType.countThingTypes() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("thingtypes", ThingType.findAllThingTypes(sortFieldName, sortOrder));
-        }
-        return "thingtypes/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ThingTypeController.update(@Valid ThingType thingType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, thingType);
-            return "thingtypes/update";
-        }
-        uiModel.asMap().clear();
-        thingType.merge();
-        return "redirect:/thingtypes/" + encodeUrlPathSegment(thingType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ThingTypeController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ThingType.findThingType(id));
-        return "thingtypes/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ThingTypeController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ThingType thingType = ThingType.findThingType(id);
-        thingType.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/thingtypes";
-    }
-    
-    void ThingTypeController.populateEditForm(Model uiModel, ThingType thingType) {
-        uiModel.addAttribute("thingType", thingType);
-    }
-    
-    String ThingTypeController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ThingTypeController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/ThingTypeController_Roo_Controller_Finder.aj
deleted file mode 100755
index b070bd75c..000000000
--- a/src/main/java/com/labsynch/labseer/web/ThingTypeController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ThingType;
-import com.labsynch.labseer.web.ThingTypeController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect ThingTypeController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByTypeNameEquals", "form" }, method = RequestMethod.GET)
-    public String ThingTypeController.findThingTypesByTypeNameEqualsForm(Model uiModel) {
-        return "thingtypes/findThingTypesByTypeNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByTypeNameEquals", method = RequestMethod.GET)
-    public String ThingTypeController.findThingTypesByTypeNameEquals(@RequestParam("typeName") String typeName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("thingtypes", ThingType.findThingTypesByTypeNameEquals(typeName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ThingType.countFindThingTypesByTypeNameEquals(typeName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("thingtypes", ThingType.findThingTypesByTypeNameEquals(typeName, sortFieldName, sortOrder).getResultList());
-        }
-        return "thingtypes/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ThingTypeController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ThingTypeController_Roo_Controller_Json.aj
deleted file mode 100755
index 2deb6186d..000000000
--- a/src/main/java/com/labsynch/labseer/web/ThingTypeController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,124 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ThingType;
-import com.labsynch.labseer.web.ThingTypeController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ThingTypeController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ThingTypeController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ThingType thingType = ThingType.findThingType(id);
-            if (thingType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(thingType.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ThingTypeController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ThingType> result = ThingType.findAllThingTypes();
-            return new ResponseEntity<String>(ThingType.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ThingTypeController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ThingType thingType = ThingType.fromJsonToThingType(json);
-            thingType.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+thingType.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ThingTypeController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ThingType thingType: ThingType.fromJsonArrayToThingTypes(json)) {
-                thingType.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ThingTypeController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ThingType thingType = ThingType.fromJsonToThingType(json);
-            thingType.setId(id);
-            if (thingType.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ThingTypeController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ThingType thingType = ThingType.findThingType(id);
-            if (thingType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            thingType.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByTypeNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ThingTypeController.jsonFindThingTypesByTypeNameEquals(@RequestParam("typeName") String typeName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ThingType.toJsonArray(ThingType.findThingTypesByTypeNameEquals(typeName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/TreatmentGroupController.java b/src/main/java/com/labsynch/labseer/web/TreatmentGroupController.java
deleted file mode 100755
index 9dfe39b7e..000000000
--- a/src/main/java/com/labsynch/labseer/web/TreatmentGroupController.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.service.TreatmentGroupService;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import flexjson.JSONTokener;
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = TreatmentGroup.class)
-@Controller
-@RequestMapping("/treatmentgroups")
-@RooWebScaffold(path = "treatmentgroups", formBackingObject = TreatmentGroup.class)
-@RooWebFinder
-@Transactional
-public class TreatmentGroupController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/TreatmentGroupController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/TreatmentGroupController_Roo_Controller.aj
deleted file mode 100755
index 68311b2e4..000000000
--- a/src/main/java/com/labsynch/labseer/web/TreatmentGroupController_Roo_Controller.aj
+++ /dev/null
@@ -1,120 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.ThingPage;
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.domain.TreatmentGroupLabel;
-import com.labsynch.labseer.domain.TreatmentGroupState;
-import com.labsynch.labseer.web.TreatmentGroupController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect TreatmentGroupController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String TreatmentGroupController.create(@Valid TreatmentGroup treatmentGroup, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, treatmentGroup);
-            return "treatmentgroups/create";
-        }
-        uiModel.asMap().clear();
-        treatmentGroup.persist();
-        return "redirect:/treatmentgroups/" + encodeUrlPathSegment(treatmentGroup.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String TreatmentGroupController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new TreatmentGroup());
-        return "treatmentgroups/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String TreatmentGroupController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("treatmentgroup", TreatmentGroup.findTreatmentGroup(id));
-        uiModel.addAttribute("itemId", id);
-        return "treatmentgroups/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String TreatmentGroupController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("treatmentgroups", TreatmentGroup.findTreatmentGroupEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) TreatmentGroup.countTreatmentGroups() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("treatmentgroups", TreatmentGroup.findAllTreatmentGroups(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "treatmentgroups/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String TreatmentGroupController.update(@Valid TreatmentGroup treatmentGroup, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, treatmentGroup);
-            return "treatmentgroups/update";
-        }
-        uiModel.asMap().clear();
-        treatmentGroup.merge();
-        return "redirect:/treatmentgroups/" + encodeUrlPathSegment(treatmentGroup.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String TreatmentGroupController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, TreatmentGroup.findTreatmentGroup(id));
-        return "treatmentgroups/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String TreatmentGroupController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        TreatmentGroup treatmentGroup = TreatmentGroup.findTreatmentGroup(id);
-        treatmentGroup.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/treatmentgroups";
-    }
-    
-    void TreatmentGroupController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("treatmentGroup_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("treatmentGroup_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void TreatmentGroupController.populateEditForm(Model uiModel, TreatmentGroup treatmentGroup) {
-        uiModel.addAttribute("treatmentGroup", treatmentGroup);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("analysisgroups", AnalysisGroup.findAllAnalysisGroups());
-        uiModel.addAttribute("subjects", Subject.findAllSubjects());
-        uiModel.addAttribute("thingpages", ThingPage.findAllThingPages());
-        uiModel.addAttribute("treatmentgrouplabels", TreatmentGroupLabel.findAllTreatmentGroupLabels());
-        uiModel.addAttribute("treatmentgroupstates", TreatmentGroupState.findAllTreatmentGroupStates());
-    }
-    
-    String TreatmentGroupController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/TreatmentGroupController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/TreatmentGroupController_Roo_Controller_Finder.aj
deleted file mode 100755
index db57e62f4..000000000
--- a/src/main/java/com/labsynch/labseer/web/TreatmentGroupController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,78 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.web.TreatmentGroupController;
-import java.util.Set;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect TreatmentGroupController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByAnalysisGroups", "form" }, method = RequestMethod.GET)
-    public String TreatmentGroupController.findTreatmentGroupsByAnalysisGroupsForm(Model uiModel) {
-        uiModel.addAttribute("analysisgroups", AnalysisGroup.findAllAnalysisGroups());
-        return "treatmentgroups/findTreatmentGroupsByAnalysisGroups";
-    }
-    
-    @RequestMapping(params = "find=ByAnalysisGroups", method = RequestMethod.GET)
-    public String TreatmentGroupController.findTreatmentGroupsByAnalysisGroups(@RequestParam("analysisGroups") Set<AnalysisGroup> analysisGroups, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("treatmentgroups", TreatmentGroup.findTreatmentGroupsByAnalysisGroups(analysisGroups, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) TreatmentGroup.countFindTreatmentGroupsByAnalysisGroups(analysisGroups) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("treatmentgroups", TreatmentGroup.findTreatmentGroupsByAnalysisGroups(analysisGroups, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "treatmentgroups/list";
-    }
-    
-    @RequestMapping(params = { "find=ByCodeNameEquals", "form" }, method = RequestMethod.GET)
-    public String TreatmentGroupController.findTreatmentGroupsByCodeNameEqualsForm(Model uiModel) {
-        return "treatmentgroups/findTreatmentGroupsByCodeNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByCodeNameEquals", method = RequestMethod.GET)
-    public String TreatmentGroupController.findTreatmentGroupsByCodeNameEquals(@RequestParam("codeName") String codeName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("treatmentgroups", TreatmentGroup.findTreatmentGroupsByCodeNameEquals(codeName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) TreatmentGroup.countFindTreatmentGroupsByCodeNameEquals(codeName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("treatmentgroups", TreatmentGroup.findTreatmentGroupsByCodeNameEquals(codeName, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "treatmentgroups/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTransactionEquals", "form" }, method = RequestMethod.GET)
-    public String TreatmentGroupController.findTreatmentGroupsByLsTransactionEqualsForm(Model uiModel) {
-        return "treatmentgroups/findTreatmentGroupsByLsTransactionEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", method = RequestMethod.GET)
-    public String TreatmentGroupController.findTreatmentGroupsByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("treatmentgroups", TreatmentGroup.findTreatmentGroupsByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) TreatmentGroup.countFindTreatmentGroupsByLsTransactionEquals(lsTransaction) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("treatmentgroups", TreatmentGroup.findTreatmentGroupsByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "treatmentgroups/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/TreatmentGroupController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/TreatmentGroupController_Roo_Controller_Json.aj
deleted file mode 100755
index 8a693e189..000000000
--- a/src/main/java/com/labsynch/labseer/web/TreatmentGroupController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,150 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.web.TreatmentGroupController;
-import java.util.List;
-import java.util.Set;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect TreatmentGroupController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> TreatmentGroupController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            TreatmentGroup treatmentGroup = TreatmentGroup.findTreatmentGroup(id);
-            if (treatmentGroup == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(treatmentGroup.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> TreatmentGroupController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<TreatmentGroup> result = TreatmentGroup.findAllTreatmentGroups();
-            return new ResponseEntity<String>(TreatmentGroup.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> TreatmentGroupController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            TreatmentGroup treatmentGroup = TreatmentGroup.fromJsonToTreatmentGroup(json);
-            treatmentGroup.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+treatmentGroup.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> TreatmentGroupController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (TreatmentGroup treatmentGroup: TreatmentGroup.fromJsonArrayToTreatmentGroups(json)) {
-                treatmentGroup.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> TreatmentGroupController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            TreatmentGroup treatmentGroup = TreatmentGroup.fromJsonToTreatmentGroup(json);
-            treatmentGroup.setId(id);
-            if (treatmentGroup.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> TreatmentGroupController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            TreatmentGroup treatmentGroup = TreatmentGroup.findTreatmentGroup(id);
-            if (treatmentGroup == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            treatmentGroup.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByAnalysisGroups", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> TreatmentGroupController.jsonFindTreatmentGroupsByAnalysisGroups(@RequestParam("analysisGroups") Set<AnalysisGroup> analysisGroups) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(TreatmentGroup.toJsonArray(TreatmentGroup.findTreatmentGroupsByAnalysisGroups(analysisGroups).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByCodeNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> TreatmentGroupController.jsonFindTreatmentGroupsByCodeNameEquals(@RequestParam("codeName") String codeName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(TreatmentGroup.toJsonArray(TreatmentGroup.findTreatmentGroupsByCodeNameEquals(codeName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> TreatmentGroupController.jsonFindTreatmentGroupsByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(TreatmentGroup.toJsonArray(TreatmentGroup.findTreatmentGroupsByLsTransactionEquals(lsTransaction).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/TreatmentGroupLabelController.java b/src/main/java/com/labsynch/labseer/web/TreatmentGroupLabelController.java
deleted file mode 100755
index 6b58a5045..000000000
--- a/src/main/java/com/labsynch/labseer/web/TreatmentGroupLabelController.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.TreatmentGroupLabel;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.apache.commons.io.IOUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RequestMapping("/treatmentgrouplabels")
-@Controller
-@RooWebScaffold(path = "treatmentgrouplabels", formBackingObject = TreatmentGroupLabel.class)
-@RooWebJson(jsonObject = TreatmentGroupLabel.class)
-@RooWebFinder
-public class TreatmentGroupLabelController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/TreatmentGroupLabelController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/TreatmentGroupLabelController_Roo_Controller.aj
deleted file mode 100755
index 6a6110edf..000000000
--- a/src/main/java/com/labsynch/labseer/web/TreatmentGroupLabelController_Roo_Controller.aj
+++ /dev/null
@@ -1,119 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.domain.TreatmentGroupLabel;
-import com.labsynch.labseer.web.TreatmentGroupLabelController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect TreatmentGroupLabelController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String TreatmentGroupLabelController.create(@Valid TreatmentGroupLabel treatmentGroupLabel, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, treatmentGroupLabel);
-            return "treatmentgrouplabels/create";
-        }
-        uiModel.asMap().clear();
-        treatmentGroupLabel.persist();
-        return "redirect:/treatmentgrouplabels/" + encodeUrlPathSegment(treatmentGroupLabel.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String TreatmentGroupLabelController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new TreatmentGroupLabel());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (TreatmentGroup.countTreatmentGroups() == 0) {
-            dependencies.add(new String[] { "treatmentGroup", "treatmentgroups" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "treatmentgrouplabels/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String TreatmentGroupLabelController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("treatmentgrouplabel", TreatmentGroupLabel.findTreatmentGroupLabel(id));
-        uiModel.addAttribute("itemId", id);
-        return "treatmentgrouplabels/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String TreatmentGroupLabelController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("treatmentgrouplabels", TreatmentGroupLabel.findTreatmentGroupLabelEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) TreatmentGroupLabel.countTreatmentGroupLabels() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("treatmentgrouplabels", TreatmentGroupLabel.findAllTreatmentGroupLabels(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "treatmentgrouplabels/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String TreatmentGroupLabelController.update(@Valid TreatmentGroupLabel treatmentGroupLabel, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, treatmentGroupLabel);
-            return "treatmentgrouplabels/update";
-        }
-        uiModel.asMap().clear();
-        treatmentGroupLabel.merge();
-        return "redirect:/treatmentgrouplabels/" + encodeUrlPathSegment(treatmentGroupLabel.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String TreatmentGroupLabelController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, TreatmentGroupLabel.findTreatmentGroupLabel(id));
-        return "treatmentgrouplabels/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String TreatmentGroupLabelController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        TreatmentGroupLabel treatmentGroupLabel = TreatmentGroupLabel.findTreatmentGroupLabel(id);
-        treatmentGroupLabel.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/treatmentgrouplabels";
-    }
-    
-    void TreatmentGroupLabelController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("treatmentGroupLabel_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("treatmentGroupLabel_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void TreatmentGroupLabelController.populateEditForm(Model uiModel, TreatmentGroupLabel treatmentGroupLabel) {
-        uiModel.addAttribute("treatmentGroupLabel", treatmentGroupLabel);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("treatmentgroups", TreatmentGroup.findAllTreatmentGroups());
-    }
-    
-    String TreatmentGroupLabelController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/TreatmentGroupLabelController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/TreatmentGroupLabelController_Roo_Controller_Finder.aj
deleted file mode 100755
index ea08d9b2d..000000000
--- a/src/main/java/com/labsynch/labseer/web/TreatmentGroupLabelController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,57 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.domain.TreatmentGroupLabel;
-import com.labsynch.labseer.web.TreatmentGroupLabelController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect TreatmentGroupLabelController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByLsTransactionEquals", "form" }, method = RequestMethod.GET)
-    public String TreatmentGroupLabelController.findTreatmentGroupLabelsByLsTransactionEqualsForm(Model uiModel) {
-        return "treatmentgrouplabels/findTreatmentGroupLabelsByLsTransactionEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", method = RequestMethod.GET)
-    public String TreatmentGroupLabelController.findTreatmentGroupLabelsByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("treatmentgrouplabels", TreatmentGroupLabel.findTreatmentGroupLabelsByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) TreatmentGroupLabel.countFindTreatmentGroupLabelsByLsTransactionEquals(lsTransaction) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("treatmentgrouplabels", TreatmentGroupLabel.findTreatmentGroupLabelsByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "treatmentgrouplabels/list";
-    }
-    
-    @RequestMapping(params = { "find=ByTreatmentGroup", "form" }, method = RequestMethod.GET)
-    public String TreatmentGroupLabelController.findTreatmentGroupLabelsByTreatmentGroupForm(Model uiModel) {
-        uiModel.addAttribute("treatmentgroups", TreatmentGroup.findAllTreatmentGroups());
-        return "treatmentgrouplabels/findTreatmentGroupLabelsByTreatmentGroup";
-    }
-    
-    @RequestMapping(params = "find=ByTreatmentGroup", method = RequestMethod.GET)
-    public String TreatmentGroupLabelController.findTreatmentGroupLabelsByTreatmentGroup(@RequestParam("treatmentGroup") TreatmentGroup treatmentGroup, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("treatmentgrouplabels", TreatmentGroupLabel.findTreatmentGroupLabelsByTreatmentGroup(treatmentGroup, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) TreatmentGroupLabel.countFindTreatmentGroupLabelsByTreatmentGroup(treatmentGroup) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("treatmentgrouplabels", TreatmentGroupLabel.findTreatmentGroupLabelsByTreatmentGroup(treatmentGroup, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "treatmentgrouplabels/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/TreatmentGroupLabelController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/TreatmentGroupLabelController_Roo_Controller_Json.aj
deleted file mode 100755
index 06d2e6f09..000000000
--- a/src/main/java/com/labsynch/labseer/web/TreatmentGroupLabelController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,137 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.domain.TreatmentGroupLabel;
-import com.labsynch.labseer.web.TreatmentGroupLabelController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect TreatmentGroupLabelController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> TreatmentGroupLabelController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            TreatmentGroupLabel treatmentGroupLabel = TreatmentGroupLabel.findTreatmentGroupLabel(id);
-            if (treatmentGroupLabel == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(treatmentGroupLabel.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> TreatmentGroupLabelController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<TreatmentGroupLabel> result = TreatmentGroupLabel.findAllTreatmentGroupLabels();
-            return new ResponseEntity<String>(TreatmentGroupLabel.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> TreatmentGroupLabelController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            TreatmentGroupLabel treatmentGroupLabel = TreatmentGroupLabel.fromJsonToTreatmentGroupLabel(json);
-            treatmentGroupLabel.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+treatmentGroupLabel.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> TreatmentGroupLabelController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (TreatmentGroupLabel treatmentGroupLabel: TreatmentGroupLabel.fromJsonArrayToTreatmentGroupLabels(json)) {
-                treatmentGroupLabel.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> TreatmentGroupLabelController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            TreatmentGroupLabel treatmentGroupLabel = TreatmentGroupLabel.fromJsonToTreatmentGroupLabel(json);
-            treatmentGroupLabel.setId(id);
-            if (treatmentGroupLabel.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> TreatmentGroupLabelController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            TreatmentGroupLabel treatmentGroupLabel = TreatmentGroupLabel.findTreatmentGroupLabel(id);
-            if (treatmentGroupLabel == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            treatmentGroupLabel.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> TreatmentGroupLabelController.jsonFindTreatmentGroupLabelsByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(TreatmentGroupLabel.toJsonArray(TreatmentGroupLabel.findTreatmentGroupLabelsByLsTransactionEquals(lsTransaction).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByTreatmentGroup", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> TreatmentGroupLabelController.jsonFindTreatmentGroupLabelsByTreatmentGroup(@RequestParam("treatmentGroup") TreatmentGroup treatmentGroup) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(TreatmentGroupLabel.toJsonArray(TreatmentGroupLabel.findTreatmentGroupLabelsByTreatmentGroup(treatmentGroup).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/TreatmentGroupMiniDTOController.java b/src/main/java/com/labsynch/labseer/web/TreatmentGroupMiniDTOController.java
deleted file mode 100755
index bbbb6beda..000000000
--- a/src/main/java/com/labsynch/labseer/web/TreatmentGroupMiniDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.TreatmentGroupMiniDTO;
-
-@RooWebJson(jsonObject = TreatmentGroupMiniDTO.class)
-@Controller
-@RequestMapping("/treatmentgroes")
-public class TreatmentGroupMiniDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/TreatmentGroupStateController.java b/src/main/java/com/labsynch/labseer/web/TreatmentGroupStateController.java
deleted file mode 100755
index 097a72fac..000000000
--- a/src/main/java/com/labsynch/labseer/web/TreatmentGroupStateController.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.TreatmentGroupState;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import flexjson.JSONTokener;
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = TreatmentGroupState.class)
-@Controller
-@RequestMapping("/treatmentgroupstates")
-@RooWebScaffold(path = "treatmentgroupstates", formBackingObject = TreatmentGroupState.class)
-@RooWebFinder
-public class TreatmentGroupStateController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/TreatmentGroupStateController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/TreatmentGroupStateController_Roo_Controller.aj
deleted file mode 100755
index 481c1b532..000000000
--- a/src/main/java/com/labsynch/labseer/web/TreatmentGroupStateController_Roo_Controller.aj
+++ /dev/null
@@ -1,121 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.domain.TreatmentGroupState;
-import com.labsynch.labseer.domain.TreatmentGroupValue;
-import com.labsynch.labseer.web.TreatmentGroupStateController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect TreatmentGroupStateController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String TreatmentGroupStateController.create(@Valid TreatmentGroupState treatmentGroupState, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, treatmentGroupState);
-            return "treatmentgroupstates/create";
-        }
-        uiModel.asMap().clear();
-        treatmentGroupState.persist();
-        return "redirect:/treatmentgroupstates/" + encodeUrlPathSegment(treatmentGroupState.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String TreatmentGroupStateController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new TreatmentGroupState());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (TreatmentGroup.countTreatmentGroups() == 0) {
-            dependencies.add(new String[] { "treatmentGroup", "treatmentgroups" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "treatmentgroupstates/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String TreatmentGroupStateController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("treatmentgroupstate", TreatmentGroupState.findTreatmentGroupState(id));
-        uiModel.addAttribute("itemId", id);
-        return "treatmentgroupstates/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String TreatmentGroupStateController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("treatmentgroupstates", TreatmentGroupState.findTreatmentGroupStateEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) TreatmentGroupState.countTreatmentGroupStates() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("treatmentgroupstates", TreatmentGroupState.findAllTreatmentGroupStates(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "treatmentgroupstates/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String TreatmentGroupStateController.update(@Valid TreatmentGroupState treatmentGroupState, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, treatmentGroupState);
-            return "treatmentgroupstates/update";
-        }
-        uiModel.asMap().clear();
-        treatmentGroupState.merge();
-        return "redirect:/treatmentgroupstates/" + encodeUrlPathSegment(treatmentGroupState.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String TreatmentGroupStateController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, TreatmentGroupState.findTreatmentGroupState(id));
-        return "treatmentgroupstates/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String TreatmentGroupStateController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        TreatmentGroupState treatmentGroupState = TreatmentGroupState.findTreatmentGroupState(id);
-        treatmentGroupState.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/treatmentgroupstates";
-    }
-    
-    void TreatmentGroupStateController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("treatmentGroupState_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("treatmentGroupState_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void TreatmentGroupStateController.populateEditForm(Model uiModel, TreatmentGroupState treatmentGroupState) {
-        uiModel.addAttribute("treatmentGroupState", treatmentGroupState);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("treatmentgroups", TreatmentGroup.findAllTreatmentGroups());
-        uiModel.addAttribute("treatmentgroupvalues", TreatmentGroupValue.findAllTreatmentGroupValues());
-    }
-    
-    String TreatmentGroupStateController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/TreatmentGroupStateController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/TreatmentGroupStateController_Roo_Controller_Finder.aj
deleted file mode 100755
index 97635b61a..000000000
--- a/src/main/java/com/labsynch/labseer/web/TreatmentGroupStateController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,77 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.domain.TreatmentGroupState;
-import com.labsynch.labseer.web.TreatmentGroupStateController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect TreatmentGroupStateController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByLsTransactionEquals", "form" }, method = RequestMethod.GET)
-    public String TreatmentGroupStateController.findTreatmentGroupStatesByLsTransactionEqualsForm(Model uiModel) {
-        return "treatmentgroupstates/findTreatmentGroupStatesByLsTransactionEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", method = RequestMethod.GET)
-    public String TreatmentGroupStateController.findTreatmentGroupStatesByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("treatmentgroupstates", TreatmentGroupState.findTreatmentGroupStatesByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) TreatmentGroupState.countFindTreatmentGroupStatesByLsTransactionEquals(lsTransaction) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("treatmentgroupstates", TreatmentGroupState.findTreatmentGroupStatesByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "treatmentgroupstates/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTypeAndKindEquals", "form" }, method = RequestMethod.GET)
-    public String TreatmentGroupStateController.findTreatmentGroupStatesByLsTypeAndKindEqualsForm(Model uiModel) {
-        return "treatmentgroupstates/findTreatmentGroupStatesByLsTypeAndKindEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeAndKindEquals", method = RequestMethod.GET)
-    public String TreatmentGroupStateController.findTreatmentGroupStatesByLsTypeAndKindEquals(@RequestParam("lsTypeAndKind") String lsTypeAndKind, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("treatmentgroupstates", TreatmentGroupState.findTreatmentGroupStatesByLsTypeAndKindEquals(lsTypeAndKind, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) TreatmentGroupState.countFindTreatmentGroupStatesByLsTypeAndKindEquals(lsTypeAndKind) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("treatmentgroupstates", TreatmentGroupState.findTreatmentGroupStatesByLsTypeAndKindEquals(lsTypeAndKind, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "treatmentgroupstates/list";
-    }
-    
-    @RequestMapping(params = { "find=ByTreatmentGroup", "form" }, method = RequestMethod.GET)
-    public String TreatmentGroupStateController.findTreatmentGroupStatesByTreatmentGroupForm(Model uiModel) {
-        uiModel.addAttribute("treatmentgroups", TreatmentGroup.findAllTreatmentGroups());
-        return "treatmentgroupstates/findTreatmentGroupStatesByTreatmentGroup";
-    }
-    
-    @RequestMapping(params = "find=ByTreatmentGroup", method = RequestMethod.GET)
-    public String TreatmentGroupStateController.findTreatmentGroupStatesByTreatmentGroup(@RequestParam("treatmentGroup") TreatmentGroup treatmentGroup, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("treatmentgroupstates", TreatmentGroupState.findTreatmentGroupStatesByTreatmentGroup(treatmentGroup, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) TreatmentGroupState.countFindTreatmentGroupStatesByTreatmentGroup(treatmentGroup) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("treatmentgroupstates", TreatmentGroupState.findTreatmentGroupStatesByTreatmentGroup(treatmentGroup, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "treatmentgroupstates/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/TreatmentGroupStateController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/TreatmentGroupStateController_Roo_Controller_Json.aj
deleted file mode 100755
index 66f6e5d6b..000000000
--- a/src/main/java/com/labsynch/labseer/web/TreatmentGroupStateController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,149 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.domain.TreatmentGroupState;
-import com.labsynch.labseer.web.TreatmentGroupStateController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect TreatmentGroupStateController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> TreatmentGroupStateController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            TreatmentGroupState treatmentGroupState = TreatmentGroupState.findTreatmentGroupState(id);
-            if (treatmentGroupState == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(treatmentGroupState.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> TreatmentGroupStateController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<TreatmentGroupState> result = TreatmentGroupState.findAllTreatmentGroupStates();
-            return new ResponseEntity<String>(TreatmentGroupState.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> TreatmentGroupStateController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            TreatmentGroupState treatmentGroupState = TreatmentGroupState.fromJsonToTreatmentGroupState(json);
-            treatmentGroupState.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+treatmentGroupState.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> TreatmentGroupStateController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (TreatmentGroupState treatmentGroupState: TreatmentGroupState.fromJsonArrayToTreatmentGroupStates(json)) {
-                treatmentGroupState.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> TreatmentGroupStateController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            TreatmentGroupState treatmentGroupState = TreatmentGroupState.fromJsonToTreatmentGroupState(json);
-            treatmentGroupState.setId(id);
-            if (treatmentGroupState.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> TreatmentGroupStateController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            TreatmentGroupState treatmentGroupState = TreatmentGroupState.findTreatmentGroupState(id);
-            if (treatmentGroupState == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            treatmentGroupState.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> TreatmentGroupStateController.jsonFindTreatmentGroupStatesByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(TreatmentGroupState.toJsonArray(TreatmentGroupState.findTreatmentGroupStatesByLsTransactionEquals(lsTransaction).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTypeAndKindEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> TreatmentGroupStateController.jsonFindTreatmentGroupStatesByLsTypeAndKindEquals(@RequestParam("lsTypeAndKind") String lsTypeAndKind) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(TreatmentGroupState.toJsonArray(TreatmentGroupState.findTreatmentGroupStatesByLsTypeAndKindEquals(lsTypeAndKind).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByTreatmentGroup", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> TreatmentGroupStateController.jsonFindTreatmentGroupStatesByTreatmentGroup(@RequestParam("treatmentGroup") TreatmentGroup treatmentGroup) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(TreatmentGroupState.toJsonArray(TreatmentGroupState.findTreatmentGroupStatesByTreatmentGroup(treatmentGroup).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/TreatmentGroupValueController.java b/src/main/java/com/labsynch/labseer/web/TreatmentGroupValueController.java
deleted file mode 100755
index 8d5451ca5..000000000
--- a/src/main/java/com/labsynch/labseer/web/TreatmentGroupValueController.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.TreatmentGroupValue;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import flexjson.JSONTokener;
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.util.List;
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = TreatmentGroupValue.class)
-@Controller
-@RequestMapping("/treatmentgroupvalues")
-@RooWebScaffold(path = "treatmentgroupvalues", formBackingObject = TreatmentGroupValue.class)
-@RooWebFinder
-public class TreatmentGroupValueController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/TreatmentGroupValueController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/TreatmentGroupValueController_Roo_Controller.aj
deleted file mode 100755
index 642466874..000000000
--- a/src/main/java/com/labsynch/labseer/web/TreatmentGroupValueController_Roo_Controller.aj
+++ /dev/null
@@ -1,120 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.TreatmentGroupState;
-import com.labsynch.labseer.domain.TreatmentGroupValue;
-import com.labsynch.labseer.web.TreatmentGroupValueController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect TreatmentGroupValueController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String TreatmentGroupValueController.create(@Valid TreatmentGroupValue treatmentGroupValue, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, treatmentGroupValue);
-            return "treatmentgroupvalues/create";
-        }
-        uiModel.asMap().clear();
-        treatmentGroupValue.persist();
-        return "redirect:/treatmentgroupvalues/" + encodeUrlPathSegment(treatmentGroupValue.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String TreatmentGroupValueController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new TreatmentGroupValue());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (TreatmentGroupState.countTreatmentGroupStates() == 0) {
-            dependencies.add(new String[] { "lsState", "treatmentgroupstates" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "treatmentgroupvalues/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String TreatmentGroupValueController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("treatmentgroupvalue", TreatmentGroupValue.findTreatmentGroupValue(id));
-        uiModel.addAttribute("itemId", id);
-        return "treatmentgroupvalues/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String TreatmentGroupValueController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("treatmentgroupvalues", TreatmentGroupValue.findTreatmentGroupValueEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) TreatmentGroupValue.countTreatmentGroupValues() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("treatmentgroupvalues", TreatmentGroupValue.findAllTreatmentGroupValues(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "treatmentgroupvalues/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String TreatmentGroupValueController.update(@Valid TreatmentGroupValue treatmentGroupValue, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, treatmentGroupValue);
-            return "treatmentgroupvalues/update";
-        }
-        uiModel.asMap().clear();
-        treatmentGroupValue.merge();
-        return "redirect:/treatmentgroupvalues/" + encodeUrlPathSegment(treatmentGroupValue.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String TreatmentGroupValueController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, TreatmentGroupValue.findTreatmentGroupValue(id));
-        return "treatmentgroupvalues/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String TreatmentGroupValueController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        TreatmentGroupValue treatmentGroupValue = TreatmentGroupValue.findTreatmentGroupValue(id);
-        treatmentGroupValue.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/treatmentgroupvalues";
-    }
-    
-    void TreatmentGroupValueController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("treatmentGroupValue_datevalue_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("treatmentGroupValue_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("treatmentGroupValue_modifieddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void TreatmentGroupValueController.populateEditForm(Model uiModel, TreatmentGroupValue treatmentGroupValue) {
-        uiModel.addAttribute("treatmentGroupValue", treatmentGroupValue);
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("treatmentgroupstates", TreatmentGroupState.findAllTreatmentGroupStates());
-    }
-    
-    String TreatmentGroupValueController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/TreatmentGroupValueController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/TreatmentGroupValueController_Roo_Controller_Finder.aj
deleted file mode 100755
index b93102396..000000000
--- a/src/main/java/com/labsynch/labseer/web/TreatmentGroupValueController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,97 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.TreatmentGroupState;
-import com.labsynch.labseer.domain.TreatmentGroupValue;
-import com.labsynch.labseer.web.TreatmentGroupValueController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect TreatmentGroupValueController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByCodeValueEquals", "form" }, method = RequestMethod.GET)
-    public String TreatmentGroupValueController.findTreatmentGroupValuesByCodeValueEqualsForm(Model uiModel) {
-        return "treatmentgroupvalues/findTreatmentGroupValuesByCodeValueEquals";
-    }
-    
-    @RequestMapping(params = "find=ByCodeValueEquals", method = RequestMethod.GET)
-    public String TreatmentGroupValueController.findTreatmentGroupValuesByCodeValueEquals(@RequestParam("codeValue") String codeValue, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("treatmentgroupvalues", TreatmentGroupValue.findTreatmentGroupValuesByCodeValueEquals(codeValue, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) TreatmentGroupValue.countFindTreatmentGroupValuesByCodeValueEquals(codeValue) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("treatmentgroupvalues", TreatmentGroupValue.findTreatmentGroupValuesByCodeValueEquals(codeValue, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "treatmentgroupvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByIgnoredNotAndCodeValueEquals", "form" }, method = RequestMethod.GET)
-    public String TreatmentGroupValueController.findTreatmentGroupValuesByIgnoredNotAndCodeValueEqualsForm(Model uiModel) {
-        return "treatmentgroupvalues/findTreatmentGroupValuesByIgnoredNotAndCodeValueEquals";
-    }
-    
-    @RequestMapping(params = "find=ByIgnoredNotAndCodeValueEquals", method = RequestMethod.GET)
-    public String TreatmentGroupValueController.findTreatmentGroupValuesByIgnoredNotAndCodeValueEquals(@RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam("codeValue") String codeValue, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("treatmentgroupvalues", TreatmentGroupValue.findTreatmentGroupValuesByIgnoredNotAndCodeValueEquals(ignored, codeValue, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) TreatmentGroupValue.countFindTreatmentGroupValuesByIgnoredNotAndCodeValueEquals(ignored, codeValue) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("treatmentgroupvalues", TreatmentGroupValue.findTreatmentGroupValuesByIgnoredNotAndCodeValueEquals(ignored, codeValue, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "treatmentgroupvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsState", "form" }, method = RequestMethod.GET)
-    public String TreatmentGroupValueController.findTreatmentGroupValuesByLsStateForm(Model uiModel) {
-        uiModel.addAttribute("treatmentgroupstates", TreatmentGroupState.findAllTreatmentGroupStates());
-        return "treatmentgroupvalues/findTreatmentGroupValuesByLsState";
-    }
-    
-    @RequestMapping(params = "find=ByLsState", method = RequestMethod.GET)
-    public String TreatmentGroupValueController.findTreatmentGroupValuesByLsState(@RequestParam("lsState") TreatmentGroupState lsState, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("treatmentgroupvalues", TreatmentGroupValue.findTreatmentGroupValuesByLsState(lsState, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) TreatmentGroupValue.countFindTreatmentGroupValuesByLsState(lsState) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("treatmentgroupvalues", TreatmentGroupValue.findTreatmentGroupValuesByLsState(lsState, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "treatmentgroupvalues/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsTransactionEquals", "form" }, method = RequestMethod.GET)
-    public String TreatmentGroupValueController.findTreatmentGroupValuesByLsTransactionEqualsForm(Model uiModel) {
-        return "treatmentgroupvalues/findTreatmentGroupValuesByLsTransactionEquals";
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", method = RequestMethod.GET)
-    public String TreatmentGroupValueController.findTreatmentGroupValuesByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("treatmentgroupvalues", TreatmentGroupValue.findTreatmentGroupValuesByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) TreatmentGroupValue.countFindTreatmentGroupValuesByLsTransactionEquals(lsTransaction) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("treatmentgroupvalues", TreatmentGroupValue.findTreatmentGroupValuesByLsTransactionEquals(lsTransaction, sortFieldName, sortOrder).getResultList());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "treatmentgroupvalues/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/TreatmentGroupValueController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/TreatmentGroupValueController_Roo_Controller_Json.aj
deleted file mode 100755
index 5de0001c4..000000000
--- a/src/main/java/com/labsynch/labseer/web/TreatmentGroupValueController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,161 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.TreatmentGroupState;
-import com.labsynch.labseer.domain.TreatmentGroupValue;
-import com.labsynch.labseer.web.TreatmentGroupValueController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect TreatmentGroupValueController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> TreatmentGroupValueController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            TreatmentGroupValue treatmentGroupValue = TreatmentGroupValue.findTreatmentGroupValue(id);
-            if (treatmentGroupValue == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(treatmentGroupValue.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> TreatmentGroupValueController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<TreatmentGroupValue> result = TreatmentGroupValue.findAllTreatmentGroupValues();
-            return new ResponseEntity<String>(TreatmentGroupValue.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> TreatmentGroupValueController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            TreatmentGroupValue treatmentGroupValue = TreatmentGroupValue.fromJsonToTreatmentGroupValue(json);
-            treatmentGroupValue.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+treatmentGroupValue.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> TreatmentGroupValueController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (TreatmentGroupValue treatmentGroupValue: TreatmentGroupValue.fromJsonArrayToTreatmentGroupValues(json)) {
-                treatmentGroupValue.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> TreatmentGroupValueController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            TreatmentGroupValue treatmentGroupValue = TreatmentGroupValue.fromJsonToTreatmentGroupValue(json);
-            treatmentGroupValue.setId(id);
-            if (treatmentGroupValue.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> TreatmentGroupValueController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            TreatmentGroupValue treatmentGroupValue = TreatmentGroupValue.findTreatmentGroupValue(id);
-            if (treatmentGroupValue == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            treatmentGroupValue.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByCodeValueEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> TreatmentGroupValueController.jsonFindTreatmentGroupValuesByCodeValueEquals(@RequestParam("codeValue") String codeValue) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(TreatmentGroupValue.toJsonArray(TreatmentGroupValue.findTreatmentGroupValuesByCodeValueEquals(codeValue).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByIgnoredNotAndCodeValueEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> TreatmentGroupValueController.jsonFindTreatmentGroupValuesByIgnoredNotAndCodeValueEquals(@RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam("codeValue") String codeValue) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(TreatmentGroupValue.toJsonArray(TreatmentGroupValue.findTreatmentGroupValuesByIgnoredNotAndCodeValueEquals(ignored, codeValue).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsState", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> TreatmentGroupValueController.jsonFindTreatmentGroupValuesByLsState(@RequestParam("lsState") TreatmentGroupState lsState) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(TreatmentGroupValue.toJsonArray(TreatmentGroupValue.findTreatmentGroupValuesByLsState(lsState).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsTransactionEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> TreatmentGroupValueController.jsonFindTreatmentGroupValuesByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(TreatmentGroupValue.toJsonArray(TreatmentGroupValue.findTreatmentGroupValuesByLsTransactionEquals(lsTransaction).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/UncertaintyKindController.java b/src/main/java/com/labsynch/labseer/web/UncertaintyKindController.java
deleted file mode 100755
index 77b152dcc..000000000
--- a/src/main/java/com/labsynch/labseer/web/UncertaintyKindController.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.UncertaintyKind;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/uncertaintykinds")
-@Controller
-@RooWebScaffold(path = "uncertaintykinds", formBackingObject = UncertaintyKind.class)
-@RooWebJson(jsonObject = UncertaintyKind.class)
-public class UncertaintyKindController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/UncertaintyKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/UncertaintyKindController_Roo_Controller.aj
deleted file mode 100755
index 4cb4a35ee..000000000
--- a/src/main/java/com/labsynch/labseer/web/UncertaintyKindController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.UncertaintyKind;
-import com.labsynch.labseer.web.UncertaintyKindController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect UncertaintyKindController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String UncertaintyKindController.create(@Valid UncertaintyKind uncertaintyKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, uncertaintyKind);
-            return "uncertaintykinds/create";
-        }
-        uiModel.asMap().clear();
-        uncertaintyKind.persist();
-        return "redirect:/uncertaintykinds/" + encodeUrlPathSegment(uncertaintyKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String UncertaintyKindController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new UncertaintyKind());
-        return "uncertaintykinds/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String UncertaintyKindController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("uncertaintykind", UncertaintyKind.findUncertaintyKind(id));
-        uiModel.addAttribute("itemId", id);
-        return "uncertaintykinds/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String UncertaintyKindController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("uncertaintykinds", UncertaintyKind.findUncertaintyKindEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) UncertaintyKind.countUncertaintyKinds() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("uncertaintykinds", UncertaintyKind.findAllUncertaintyKinds(sortFieldName, sortOrder));
-        }
-        return "uncertaintykinds/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String UncertaintyKindController.update(@Valid UncertaintyKind uncertaintyKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, uncertaintyKind);
-            return "uncertaintykinds/update";
-        }
-        uiModel.asMap().clear();
-        uncertaintyKind.merge();
-        return "redirect:/uncertaintykinds/" + encodeUrlPathSegment(uncertaintyKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String UncertaintyKindController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, UncertaintyKind.findUncertaintyKind(id));
-        return "uncertaintykinds/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String UncertaintyKindController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        UncertaintyKind uncertaintyKind = UncertaintyKind.findUncertaintyKind(id);
-        uncertaintyKind.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/uncertaintykinds";
-    }
-    
-    void UncertaintyKindController.populateEditForm(Model uiModel, UncertaintyKind uncertaintyKind) {
-        uiModel.addAttribute("uncertaintyKind", uncertaintyKind);
-    }
-    
-    String UncertaintyKindController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/UncertaintyKindController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/UncertaintyKindController_Roo_Controller_Json.aj
deleted file mode 100755
index cf9d2866d..000000000
--- a/src/main/java/com/labsynch/labseer/web/UncertaintyKindController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,111 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.UncertaintyKind;
-import com.labsynch.labseer.web.UncertaintyKindController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect UncertaintyKindController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> UncertaintyKindController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            UncertaintyKind uncertaintyKind = UncertaintyKind.findUncertaintyKind(id);
-            if (uncertaintyKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(uncertaintyKind.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> UncertaintyKindController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<UncertaintyKind> result = UncertaintyKind.findAllUncertaintyKinds();
-            return new ResponseEntity<String>(UncertaintyKind.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> UncertaintyKindController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            UncertaintyKind uncertaintyKind = UncertaintyKind.fromJsonToUncertaintyKind(json);
-            uncertaintyKind.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+uncertaintyKind.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> UncertaintyKindController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (UncertaintyKind uncertaintyKind: UncertaintyKind.fromJsonArrayToUncertaintyKinds(json)) {
-                uncertaintyKind.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> UncertaintyKindController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            UncertaintyKind uncertaintyKind = UncertaintyKind.fromJsonToUncertaintyKind(json);
-            uncertaintyKind.setId(id);
-            if (uncertaintyKind.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> UncertaintyKindController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            UncertaintyKind uncertaintyKind = UncertaintyKind.findUncertaintyKind(id);
-            if (uncertaintyKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            uncertaintyKind.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/UnitKindController.java b/src/main/java/com/labsynch/labseer/web/UnitKindController.java
deleted file mode 100755
index 72a9ac2af..000000000
--- a/src/main/java/com/labsynch/labseer/web/UnitKindController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.UnitKind;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = UnitKind.class)
-@Controller
-@RequestMapping("/unitkinds")
-@RooWebScaffold(path = "unitkinds", formBackingObject = UnitKind.class)
-public class UnitKindController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/UnitKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/UnitKindController_Roo_Controller.aj
deleted file mode 100755
index d3da774e3..000000000
--- a/src/main/java/com/labsynch/labseer/web/UnitKindController_Roo_Controller.aj
+++ /dev/null
@@ -1,109 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.UnitKind;
-import com.labsynch.labseer.domain.UnitType;
-import com.labsynch.labseer.web.UnitKindController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect UnitKindController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String UnitKindController.create(@Valid UnitKind unitKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, unitKind);
-            return "unitkinds/create";
-        }
-        uiModel.asMap().clear();
-        unitKind.persist();
-        return "redirect:/unitkinds/" + encodeUrlPathSegment(unitKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String UnitKindController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new UnitKind());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (UnitType.countUnitTypes() == 0) {
-            dependencies.add(new String[] { "lsType", "unittypes" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "unitkinds/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String UnitKindController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("unitkind", UnitKind.findUnitKind(id));
-        uiModel.addAttribute("itemId", id);
-        return "unitkinds/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String UnitKindController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("unitkinds", UnitKind.findUnitKindEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) UnitKind.countUnitKinds() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("unitkinds", UnitKind.findAllUnitKinds(sortFieldName, sortOrder));
-        }
-        return "unitkinds/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String UnitKindController.update(@Valid UnitKind unitKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, unitKind);
-            return "unitkinds/update";
-        }
-        uiModel.asMap().clear();
-        unitKind.merge();
-        return "redirect:/unitkinds/" + encodeUrlPathSegment(unitKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String UnitKindController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, UnitKind.findUnitKind(id));
-        return "unitkinds/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String UnitKindController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        UnitKind unitKind = UnitKind.findUnitKind(id);
-        unitKind.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/unitkinds";
-    }
-    
-    void UnitKindController.populateEditForm(Model uiModel, UnitKind unitKind) {
-        uiModel.addAttribute("unitKind", unitKind);
-        uiModel.addAttribute("unittypes", UnitType.findAllUnitTypes());
-    }
-    
-    String UnitKindController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/UnitKindController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/UnitKindController_Roo_Controller_Json.aj
deleted file mode 100644
index 190770d5e..000000000
--- a/src/main/java/com/labsynch/labseer/web/UnitKindController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,125 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.UnitKind;
-import com.labsynch.labseer.domain.UnitType;
-import com.labsynch.labseer.web.UnitKindController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect UnitKindController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> UnitKindController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            UnitKind unitKind = UnitKind.findUnitKind(id);
-            if (unitKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(unitKind.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> UnitKindController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<UnitKind> result = UnitKind.findAllUnitKinds();
-            return new ResponseEntity<String>(UnitKind.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> UnitKindController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            UnitKind unitKind = UnitKind.fromJsonToUnitKind(json);
-            unitKind.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+unitKind.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> UnitKindController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (UnitKind unitKind: UnitKind.fromJsonArrayToUnitKinds(json)) {
-                unitKind.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> UnitKindController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            UnitKind unitKind = UnitKind.fromJsonToUnitKind(json);
-            unitKind.setId(id);
-            if (unitKind.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> UnitKindController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            UnitKind unitKind = UnitKind.findUnitKind(id);
-            if (unitKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            unitKind.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByKindNameEqualsAndLsType", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> UnitKindController.jsonFindUnitKindsByKindNameEqualsAndLsType(@RequestParam("kindName") String kindName, @RequestParam("lsType") UnitType lsType) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(UnitKind.toJsonArray(UnitKind.findUnitKindsByKindNameEqualsAndLsType(kindName, lsType).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/UnitTypeController.java b/src/main/java/com/labsynch/labseer/web/UnitTypeController.java
deleted file mode 100755
index 68e0ce60b..000000000
--- a/src/main/java/com/labsynch/labseer/web/UnitTypeController.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.UnitType;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = UnitType.class)
-@Controller
-@RequestMapping("/unittypes")
-@RooWebScaffold(path = "unittypes", formBackingObject = UnitType.class)
-@RooWebFinder
-public class UnitTypeController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/UnitTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/UnitTypeController_Roo_Controller.aj
deleted file mode 100755
index 4e3d0f835..000000000
--- a/src/main/java/com/labsynch/labseer/web/UnitTypeController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.UnitType;
-import com.labsynch.labseer.web.UnitTypeController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect UnitTypeController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String UnitTypeController.create(@Valid UnitType unitType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, unitType);
-            return "unittypes/create";
-        }
-        uiModel.asMap().clear();
-        unitType.persist();
-        return "redirect:/unittypes/" + encodeUrlPathSegment(unitType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String UnitTypeController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new UnitType());
-        return "unittypes/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String UnitTypeController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("unittype", UnitType.findUnitType(id));
-        uiModel.addAttribute("itemId", id);
-        return "unittypes/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String UnitTypeController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("unittypes", UnitType.findUnitTypeEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) UnitType.countUnitTypes() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("unittypes", UnitType.findAllUnitTypes(sortFieldName, sortOrder));
-        }
-        return "unittypes/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String UnitTypeController.update(@Valid UnitType unitType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, unitType);
-            return "unittypes/update";
-        }
-        uiModel.asMap().clear();
-        unitType.merge();
-        return "redirect:/unittypes/" + encodeUrlPathSegment(unitType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String UnitTypeController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, UnitType.findUnitType(id));
-        return "unittypes/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String UnitTypeController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        UnitType unitType = UnitType.findUnitType(id);
-        unitType.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/unittypes";
-    }
-    
-    void UnitTypeController.populateEditForm(Model uiModel, UnitType unitType) {
-        uiModel.addAttribute("unitType", unitType);
-    }
-    
-    String UnitTypeController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/UnitTypeController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/UnitTypeController_Roo_Controller_Finder.aj
deleted file mode 100755
index ddfbd7329..000000000
--- a/src/main/java/com/labsynch/labseer/web/UnitTypeController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.UnitType;
-import com.labsynch.labseer.web.UnitTypeController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect UnitTypeController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByTypeNameEquals", "form" }, method = RequestMethod.GET)
-    public String UnitTypeController.findUnitTypesByTypeNameEqualsForm(Model uiModel) {
-        return "unittypes/findUnitTypesByTypeNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByTypeNameEquals", method = RequestMethod.GET)
-    public String UnitTypeController.findUnitTypesByTypeNameEquals(@RequestParam("typeName") String typeName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("unittypes", UnitType.findUnitTypesByTypeNameEquals(typeName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) UnitType.countFindUnitTypesByTypeNameEquals(typeName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("unittypes", UnitType.findUnitTypesByTypeNameEquals(typeName, sortFieldName, sortOrder).getResultList());
-        }
-        return "unittypes/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/UnitTypeController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/UnitTypeController_Roo_Controller_Json.aj
deleted file mode 100755
index 34496cbed..000000000
--- a/src/main/java/com/labsynch/labseer/web/UnitTypeController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,124 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.UnitType;
-import com.labsynch.labseer.web.UnitTypeController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect UnitTypeController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> UnitTypeController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            UnitType unitType = UnitType.findUnitType(id);
-            if (unitType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(unitType.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> UnitTypeController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<UnitType> result = UnitType.findAllUnitTypes();
-            return new ResponseEntity<String>(UnitType.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> UnitTypeController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            UnitType unitType = UnitType.fromJsonToUnitType(json);
-            unitType.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+unitType.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> UnitTypeController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (UnitType unitType: UnitType.fromJsonArrayToUnitTypes(json)) {
-                unitType.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> UnitTypeController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            UnitType unitType = UnitType.fromJsonToUnitType(json);
-            unitType.setId(id);
-            if (unitType.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> UnitTypeController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            UnitType unitType = UnitType.findUnitType(id);
-            if (unitType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            unitType.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByTypeNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> UnitTypeController.jsonFindUnitTypesByTypeNameEquals(@RequestParam("typeName") String typeName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(UnitType.toJsonArray(UnitType.findUnitTypesByTypeNameEquals(typeName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/UpdateLogController.java b/src/main/java/com/labsynch/labseer/web/UpdateLogController.java
deleted file mode 100755
index d70e36741..000000000
--- a/src/main/java/com/labsynch/labseer/web/UpdateLogController.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.UpdateLog;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@RequestMapping("/updatelogs")
-@Controller
-@RooWebScaffold(path = "updatelogs", formBackingObject = UpdateLog.class)
-public class UpdateLogController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/UpdateLogController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/UpdateLogController_Roo_Controller.aj
deleted file mode 100755
index e318ff2a6..000000000
--- a/src/main/java/com/labsynch/labseer/web/UpdateLogController_Roo_Controller.aj
+++ /dev/null
@@ -1,109 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.UpdateLog;
-import com.labsynch.labseer.web.UpdateLogController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect UpdateLogController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String UpdateLogController.create(@Valid UpdateLog updateLog, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, updateLog);
-            return "updatelogs/create";
-        }
-        uiModel.asMap().clear();
-        updateLog.persist();
-        return "redirect:/updatelogs/" + encodeUrlPathSegment(updateLog.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String UpdateLogController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new UpdateLog());
-        return "updatelogs/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String UpdateLogController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("updatelog", UpdateLog.findUpdateLog(id));
-        uiModel.addAttribute("itemId", id);
-        return "updatelogs/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String UpdateLogController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("updatelogs", UpdateLog.findUpdateLogEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) UpdateLog.countUpdateLogs() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("updatelogs", UpdateLog.findAllUpdateLogs(sortFieldName, sortOrder));
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "updatelogs/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String UpdateLogController.update(@Valid UpdateLog updateLog, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, updateLog);
-            return "updatelogs/update";
-        }
-        uiModel.asMap().clear();
-        updateLog.merge();
-        return "redirect:/updatelogs/" + encodeUrlPathSegment(updateLog.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String UpdateLogController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, UpdateLog.findUpdateLog(id));
-        return "updatelogs/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String UpdateLogController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        UpdateLog updateLog = UpdateLog.findUpdateLog(id);
-        updateLog.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/updatelogs";
-    }
-    
-    void UpdateLogController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("updateLog_recordeddate_date_format", DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-    }
-    
-    void UpdateLogController.populateEditForm(Model uiModel, UpdateLog updateLog) {
-        uiModel.addAttribute("updateLog", updateLog);
-        addDateTimeFormatPatterns(uiModel);
-    }
-    
-    String UpdateLogController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/UserRegistrationForm.java b/src/main/java/com/labsynch/labseer/web/UserRegistrationForm.java
deleted file mode 100755
index 239aedb8c..000000000
--- a/src/main/java/com/labsynch/labseer/web/UserRegistrationForm.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/**
- * 
- */
-package com.labsynch.labseer.web;
-
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-
-import net.tanesha.recaptcha.ReCaptcha;
-import net.tanesha.recaptcha.ReCaptchaFactory;
-import net.tanesha.recaptcha.ReCaptchaResponse;
-
-/**
- * 
- */
-public class UserRegistrationForm {
-
-	@NotNull
-	@Size(min = 1)
-	private String firstName;
-	@NotNull
-	@Size(min = 1)
-	private String lastName;
-
-	@NotNull
-	@Size(min = 1)
-	private String userName;
-	
-	@NotNull
-	@Size(min = 1)
-	private String emailAddress;
-	@NotNull
-	@Size(min = 1)
-	private String password;
-	@NotNull
-	@Size(min = 1)
-	private String repeatPassword;
-
-	private String recaptcha_challenge_field;
-
-	private String recaptcha_response_field;
-	
-	private ReCaptcha reCatcpha = ReCaptchaFactory.newReCaptcha("6LdfmL8SAAAAAFnT0l3UNPOV8mkpHIown-ysSR1g", "6LdfmL8SAAAAAHKPqUQV5SxrRX9Id6a8cQo-mgpE", false);
-	/**
-	 * @return the emailAddress
-	 */
-	public String getEmailAddress() {
-		return emailAddress;
-	}
-
-	/**
-	 * @param emailAddress
-	 *            the emailAddress to set
-	 */
-	public void setEmailAddress(String emailAddress) {
-		this.emailAddress = emailAddress;
-	}
-
-	/**
-	 * @return the firstName
-	 */
-	public String getFirstName() {
-		return firstName;
-	}
-
-	/**
-	 * @param firstName the firstName to set
-	 */
-	public void setFirstName(String firstName) {
-		this.firstName = firstName;
-	}
-
-	/**
-	 * @return the lastName
-	 */
-	public String getLastName() {
-		return lastName;
-	}
-
-	/**
-	 * @param lastName the lastName to set
-	 */
-	public void setLastName(String lastName) {
-		this.lastName = lastName;
-	}
-
-	/**
-	 * @return the password
-	 */
-	public String getPassword() {
-		return password;
-	}
-
-	/**
-	 * @param password the password to set
-	 */
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-	/**
-	 * @return the repeatPassword
-	 */
-	public String getRepeatPassword() {
-		return repeatPassword;
-	}
-
-	/**
-	 * @param repeatPassword the repeatPassword to set
-	 */
-	public void setRepeatPassword(String repeatPassword) {
-		this.repeatPassword = repeatPassword;
-	}
-	
-	public String getRecaptcha_challenge_field() {
-
-		return recaptcha_challenge_field;
-
-	}
-
-	public void setRecaptcha_challenge_field(String recaptcha_challenge_field) {
-
-		this.recaptcha_challenge_field = recaptcha_challenge_field;
-
-	}
-
-	public String getRecaptcha_response_field() {
-
-		return recaptcha_response_field;
-
-	}
-
-	public void setRecaptcha_response_field(String recaptcha_response_field) {
-
-		this.recaptcha_response_field = recaptcha_response_field;
-
-	}
-	
-	public String getReCaptchaHtml(){
-		
-		return reCatcpha.createRecaptchaHtml(null, null);
-	}
-	
-	public boolean isValidCaptcha(){
-        ReCaptchaResponse reCaptchaResponse = reCatcpha.checkAnswer("localhost", getRecaptcha_challenge_field(), getRecaptcha_response_field());
-        return reCaptchaResponse.isValid();
-	}
-
-	public String getUserName() {
-		return userName;
-	}
-
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ValueKindController.java b/src/main/java/com/labsynch/labseer/web/ValueKindController.java
deleted file mode 100755
index b6731e81f..000000000
--- a/src/main/java/com/labsynch/labseer/web/ValueKindController.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ValueKind;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = ValueKind.class)
-@Controller
-@RequestMapping("/valuekinds")
-@RooWebScaffold(path = "valuekinds", formBackingObject = ValueKind.class)
-@RooWebFinder
-public class ValueKindController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ValueKindController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ValueKindController_Roo_Controller.aj
deleted file mode 100755
index cd79e3504..000000000
--- a/src/main/java/com/labsynch/labseer/web/ValueKindController_Roo_Controller.aj
+++ /dev/null
@@ -1,109 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ValueKind;
-import com.labsynch.labseer.domain.ValueType;
-import com.labsynch.labseer.web.ValueKindController;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ValueKindController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ValueKindController.create(@Valid ValueKind valueKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, valueKind);
-            return "valuekinds/create";
-        }
-        uiModel.asMap().clear();
-        valueKind.persist();
-        return "redirect:/valuekinds/" + encodeUrlPathSegment(valueKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ValueKindController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ValueKind());
-        List<String[]> dependencies = new ArrayList<String[]>();
-        if (ValueType.countValueTypes() == 0) {
-            dependencies.add(new String[] { "lsType", "valuetypes" });
-        }
-        uiModel.addAttribute("dependencies", dependencies);
-        return "valuekinds/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ValueKindController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("valuekind", ValueKind.findValueKind(id));
-        uiModel.addAttribute("itemId", id);
-        return "valuekinds/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ValueKindController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("valuekinds", ValueKind.findValueKindEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ValueKind.countValueKinds() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("valuekinds", ValueKind.findAllValueKinds(sortFieldName, sortOrder));
-        }
-        return "valuekinds/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ValueKindController.update(@Valid ValueKind valueKind, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, valueKind);
-            return "valuekinds/update";
-        }
-        uiModel.asMap().clear();
-        valueKind.merge();
-        return "redirect:/valuekinds/" + encodeUrlPathSegment(valueKind.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ValueKindController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ValueKind.findValueKind(id));
-        return "valuekinds/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ValueKindController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ValueKind valueKind = ValueKind.findValueKind(id);
-        valueKind.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/valuekinds";
-    }
-    
-    void ValueKindController.populateEditForm(Model uiModel, ValueKind valueKind) {
-        uiModel.addAttribute("valueKind", valueKind);
-        uiModel.addAttribute("valuetypes", ValueType.findAllValueTypes());
-    }
-    
-    String ValueKindController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ValueKindController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/ValueKindController_Roo_Controller_Finder.aj
deleted file mode 100755
index 9768b0175..000000000
--- a/src/main/java/com/labsynch/labseer/web/ValueKindController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,56 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ValueKind;
-import com.labsynch.labseer.domain.ValueType;
-import com.labsynch.labseer.web.ValueKindController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect ValueKindController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByKindNameEqualsAndLsType", "form" }, method = RequestMethod.GET)
-    public String ValueKindController.findValueKindsByKindNameEqualsAndLsTypeForm(Model uiModel) {
-        uiModel.addAttribute("valuetypes", ValueType.findAllValueTypes());
-        return "valuekinds/findValueKindsByKindNameEqualsAndLsType";
-    }
-    
-    @RequestMapping(params = "find=ByKindNameEqualsAndLsType", method = RequestMethod.GET)
-    public String ValueKindController.findValueKindsByKindNameEqualsAndLsType(@RequestParam("kindName") String kindName, @RequestParam("lsType") ValueType lsType, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("valuekinds", ValueKind.findValueKindsByKindNameEqualsAndLsType(kindName, lsType, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ValueKind.countFindValueKindsByKindNameEqualsAndLsType(kindName, lsType) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("valuekinds", ValueKind.findValueKindsByKindNameEqualsAndLsType(kindName, lsType, sortFieldName, sortOrder).getResultList());
-        }
-        return "valuekinds/list";
-    }
-    
-    @RequestMapping(params = { "find=ByLsType", "form" }, method = RequestMethod.GET)
-    public String ValueKindController.findValueKindsByLsTypeForm(Model uiModel) {
-        uiModel.addAttribute("valuetypes", ValueType.findAllValueTypes());
-        return "valuekinds/findValueKindsByLsType";
-    }
-    
-    @RequestMapping(params = "find=ByLsType", method = RequestMethod.GET)
-    public String ValueKindController.findValueKindsByLsType(@RequestParam("lsType") ValueType lsType, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("valuekinds", ValueKind.findValueKindsByLsType(lsType, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ValueKind.countFindValueKindsByLsType(lsType) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("valuekinds", ValueKind.findValueKindsByLsType(lsType, sortFieldName, sortOrder).getResultList());
-        }
-        return "valuekinds/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ValueKindController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ValueKindController_Roo_Controller_Json.aj
deleted file mode 100755
index ae1f3938e..000000000
--- a/src/main/java/com/labsynch/labseer/web/ValueKindController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,137 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ValueKind;
-import com.labsynch.labseer.domain.ValueType;
-import com.labsynch.labseer.web.ValueKindController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ValueKindController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ValueKindController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ValueKind valueKind = ValueKind.findValueKind(id);
-            if (valueKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(valueKind.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ValueKindController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ValueKind> result = ValueKind.findAllValueKinds();
-            return new ResponseEntity<String>(ValueKind.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ValueKindController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ValueKind valueKind = ValueKind.fromJsonToValueKind(json);
-            valueKind.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+valueKind.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ValueKindController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ValueKind valueKind: ValueKind.fromJsonArrayToValueKinds(json)) {
-                valueKind.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ValueKindController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ValueKind valueKind = ValueKind.fromJsonToValueKind(json);
-            valueKind.setId(id);
-            if (valueKind.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ValueKindController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ValueKind valueKind = ValueKind.findValueKind(id);
-            if (valueKind == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            valueKind.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByKindNameEqualsAndLsType", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ValueKindController.jsonFindValueKindsByKindNameEqualsAndLsType(@RequestParam("kindName") String kindName, @RequestParam("lsType") ValueType lsType) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ValueKind.toJsonArray(ValueKind.findValueKindsByKindNameEqualsAndLsType(kindName, lsType).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByLsType", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ValueKindController.jsonFindValueKindsByLsType(@RequestParam("lsType") ValueType lsType) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ValueKind.toJsonArray(ValueKind.findValueKindsByLsType(lsType).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ValueTypeController.java b/src/main/java/com/labsynch/labseer/web/ValueTypeController.java
deleted file mode 100755
index e79c61890..000000000
--- a/src/main/java/com/labsynch/labseer/web/ValueTypeController.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ValueType;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@RooWebJson(jsonObject = ValueType.class)
-@Controller
-@RequestMapping("/valuetypes")
-@RooWebScaffold(path = "valuetypes", formBackingObject = ValueType.class)
-@RooWebFinder
-public class ValueTypeController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ValueTypeController_Roo_Controller.aj b/src/main/java/com/labsynch/labseer/web/ValueTypeController_Roo_Controller.aj
deleted file mode 100755
index d816d0b83..000000000
--- a/src/main/java/com/labsynch/labseer/web/ValueTypeController_Roo_Controller.aj
+++ /dev/null
@@ -1,100 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ValueType;
-import com.labsynch.labseer.web.ValueTypeController;
-import java.io.UnsupportedEncodingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-privileged aspect ValueTypeController_Roo_Controller {
-    
-    @RequestMapping(method = RequestMethod.POST, produces = "text/html")
-    public String ValueTypeController.create(@Valid ValueType valueType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, valueType);
-            return "valuetypes/create";
-        }
-        uiModel.asMap().clear();
-        valueType.persist();
-        return "redirect:/valuetypes/" + encodeUrlPathSegment(valueType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(params = "form", produces = "text/html")
-    public String ValueTypeController.createForm(Model uiModel) {
-        populateEditForm(uiModel, new ValueType());
-        return "valuetypes/create";
-    }
-    
-    @RequestMapping(value = "/{id}", produces = "text/html")
-    public String ValueTypeController.show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("valuetype", ValueType.findValueType(id));
-        uiModel.addAttribute("itemId", id);
-        return "valuetypes/show";
-    }
-    
-    @RequestMapping(produces = "text/html")
-    public String ValueTypeController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("valuetypes", ValueType.findValueTypeEntries(firstResult, sizeNo, sortFieldName, sortOrder));
-            float nrOfPages = (float) ValueType.countValueTypes() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("valuetypes", ValueType.findAllValueTypes(sortFieldName, sortOrder));
-        }
-        return "valuetypes/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
-    public String ValueTypeController.update(@Valid ValueType valueType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            populateEditForm(uiModel, valueType);
-            return "valuetypes/update";
-        }
-        uiModel.asMap().clear();
-        valueType.merge();
-        return "redirect:/valuetypes/" + encodeUrlPathSegment(valueType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", produces = "text/html")
-    public String ValueTypeController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        populateEditForm(uiModel, ValueType.findValueType(id));
-        return "valuetypes/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
-    public String ValueTypeController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        ValueType valueType = ValueType.findValueType(id);
-        valueType.remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/valuetypes";
-    }
-    
-    void ValueTypeController.populateEditForm(Model uiModel, ValueType valueType) {
-        uiModel.addAttribute("valueType", valueType);
-    }
-    
-    String ValueTypeController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ValueTypeController_Roo_Controller_Finder.aj b/src/main/java/com/labsynch/labseer/web/ValueTypeController_Roo_Controller_Finder.aj
deleted file mode 100755
index 503f34eee..000000000
--- a/src/main/java/com/labsynch/labseer/web/ValueTypeController_Roo_Controller_Finder.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ValueType;
-import com.labsynch.labseer.web.ValueTypeController;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-privileged aspect ValueTypeController_Roo_Controller_Finder {
-    
-    @RequestMapping(params = { "find=ByTypeNameEquals", "form" }, method = RequestMethod.GET)
-    public String ValueTypeController.findValueTypesByTypeNameEqualsForm(Model uiModel) {
-        return "valuetypes/findValueTypesByTypeNameEquals";
-    }
-    
-    @RequestMapping(params = "find=ByTypeNameEquals", method = RequestMethod.GET)
-    public String ValueTypeController.findValueTypesByTypeNameEquals(@RequestParam("typeName") String typeName, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sortFieldName", required = false) String sortFieldName, @RequestParam(value = "sortOrder", required = false) String sortOrder, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
-            uiModel.addAttribute("valuetypes", ValueType.findValueTypesByTypeNameEquals(typeName, sortFieldName, sortOrder).setFirstResult(firstResult).setMaxResults(sizeNo).getResultList());
-            float nrOfPages = (float) ValueType.countFindValueTypesByTypeNameEquals(typeName) / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("valuetypes", ValueType.findValueTypesByTypeNameEquals(typeName, sortFieldName, sortOrder).getResultList());
-        }
-        return "valuetypes/list";
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ValueTypeController_Roo_Controller_Json.aj b/src/main/java/com/labsynch/labseer/web/ValueTypeController_Roo_Controller_Json.aj
deleted file mode 100755
index 889741ec9..000000000
--- a/src/main/java/com/labsynch/labseer/web/ValueTypeController_Roo_Controller_Json.aj
+++ /dev/null
@@ -1,124 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.ValueType;
-import com.labsynch.labseer.web.ValueTypeController;
-import java.util.List;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriComponentsBuilder;
-
-privileged aspect ValueTypeController_Roo_Controller_Json {
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ValueTypeController.showJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            ValueType valueType = ValueType.findValueType(id);
-            if (valueType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(valueType.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ValueTypeController.listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try {
-            List<ValueType> result = ValueType.findAllValueTypes();
-            return new ResponseEntity<String>(ValueType.toJsonArray(result), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ValueTypeController.createFromJson(@RequestBody String json, UriComponentsBuilder uriBuilder) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ValueType valueType = ValueType.fromJsonToValueType(json);
-            valueType.persist();
-            RequestMapping a = (RequestMapping) getClass().getAnnotation(RequestMapping.class);
-            headers.add("Location",uriBuilder.path(a.value()[0]+"/"+valueType.getId().toString()).build().toUriString());
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> ValueTypeController.createFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            for (ValueType valueType: ValueType.fromJsonArrayToValueTypes(json)) {
-                valueType.persist();
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> ValueTypeController.updateFromJson(@RequestBody String json, @PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ValueType valueType = ValueType.fromJsonToValueType(json);
-            valueType.setId(id);
-            if (valueType.merge() == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> ValueTypeController.deleteFromJson(@PathVariable("id") Long id) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try {
-            ValueType valueType = ValueType.findValueType(id);
-            if (valueType == null) {
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            valueType.remove();
-            return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @RequestMapping(params = "find=ByTypeNameEquals", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> ValueTypeController.jsonFindValueTypesByTypeNameEquals(@RequestParam("typeName") String typeName) {
-        HttpHeaders headers = new HttpHeaders();
-        try {
-            headers.add("Content-Type", "application/json; charset=utf-8");
-            return new ResponseEntity<String>(ValueType.toJsonArray(ValueType.findValueTypesByTypeNameEquals(typeName).getResultList()), headers, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<String>("{\"ERROR\":"+e.getMessage()+"\"}", headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ValueTypeKindDTOController.java b/src/main/java/com/labsynch/labseer/web/ValueTypeKindDTOController.java
deleted file mode 100755
index 061559b57..000000000
--- a/src/main/java/com/labsynch/labseer/web/ValueTypeKindDTOController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.labsynch.labseer.web;
-
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.labsynch.labseer.dto.ValueTypeKindDTO;
-
-@RooWebJson(jsonObject = ValueTypeKindDTO.class)
-@Controller
-@RequestMapping("/valuetypekinddto")
-public class ValueTypeKindDTOController {
-}
diff --git a/src/main/java/com/labsynch/labseer/web/menu/BaseURLContextMenuStrategy.java b/src/main/java/com/labsynch/labseer/web/menu/BaseURLContextMenuStrategy.java
deleted file mode 100644
index 2de82bf4e..000000000
--- a/src/main/java/com/labsynch/labseer/web/menu/BaseURLContextMenuStrategy.java
+++ /dev/null
@@ -1,239 +0,0 @@
-package com.labsynch.labseer.web.menu;
-
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.Stack;
-import java.util.TreeSet;
-import java.util.regex.Pattern;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * Base class for gvNIX Context menu Strategy based on URL matching.
- * <p>
- * This Abstract class provides the way to locate the menu item by comparing
- * current request URL with menu items.
- * <p>
- * This takes care if current URL if from internal forwarding. This method could be
- * used by layouts libraries (like apache Tiles).
- * <p>
- * If a item has a URL based in an <i>EL</i> Expression this will be evaluated
- * before compare it.
- */
-public abstract class BaseURLContextMenuStrategy implements ContextMenuStrategy {
-
-  private static final Pattern EL_PATTERN = Pattern.compile(".*[$][{].*[}]");
-
-  /**
-   * Get current {@link MenuItem} based on the <code>request</code> URL
-   * 
-   * @param request
-   * @param jspContext
-   * @param menu
-   * @return current {@link MenuItem} or <code>null</code> if not match found.
-   */
-  protected MenuItem getItemFromCurrentURL(HttpServletRequest request,
-                                           ServletContext jspContext, Menu menu) {
-
-    // If request comes from a internal server forward we'll need original
-    // request URI
-    // See Servlert 2.4 specification, section SRV.8.4.2 for more
-    // information
-    String path = (String) request
-        .getAttribute("javax.servlet.forward.request_uri");
-
-    String contextPath;
-    if (path == null) {
-      // If isn't a forwarded request so we'll use the original URI
-      path = request.getRequestURI();
-      contextPath = request.getContextPath();
-    }
-    else {
-      contextPath = (String) request
-          .getAttribute("javax.servlet.forward.context_path");
-    }
-
-    if (path.startsWith(contextPath)) {
-      path = path.substring(contextPath.length());
-    }
-
-    Enumeration<String> paramNamesEnum = request.getParameterNames();
-    TreeSet<String> paramNames = new TreeSet<String>();
-
-    // We create a new Map because request.getParameterMap() is a map of
-    // String[].
-    // In java 1.5 application will throw a ClassCastException if you try
-    // set
-    // ParameterMap's value into a String variable.
-    // In java 1.6 works fine.
-    Map<String, String> paramValues = new HashMap<String, String>(request
-        .getParameterMap().size());
-    String paramName;
-
-    while (paramNamesEnum.hasMoreElements()) {
-      paramName = paramNamesEnum.nextElement();
-      paramNames.add(paramName);
-      paramValues.put(paramName, request.getParameter(paramName));
-    }
-
-    class StackItem {
-
-      Iterator<MenuItem> iterator;
-
-      public StackItem(Iterator<MenuItem> childIterator) {
-        this.iterator = childIterator;
-      }
-    }
-
-    Stack<StackItem> stack = new Stack<StackItem>();
-
-    stack.push(new StackItem(menu.getChildren().iterator()));
-    StackItem curStackItem;
-    MenuItem curItem;
-    while (!stack.isEmpty()) {
-      curStackItem = stack.pop();
-      while (curStackItem.iterator.hasNext()) {
-        curItem = curStackItem.iterator.next();
-        if (isSameDestination(request, jspContext, path, paramNames,
-            paramValues, curItem.getUrl())) {
-          return curItem;
-        }
-        if (curItem.hasChildren()) {
-          stack.push(curStackItem);
-          stack.push(new StackItem(curItem.getChildren().iterator()));
-          break;
-        }
-      }
-    }
-
-    return null;
-
-  }
-
-  /**
-   * Compares request URL with {@link MenuItem}'s destination. This will ignore
-   * parameters values if {@link MenuItem}'s destination if based on <i>EL</i>
-   * expression. Inherit class could override this method to change compare
-   * behavior.
-   * 
-   * @param request
-   * @param jspContext
-   * @param path1
-   * @param paramNames
-   * @param paramValues
-   * @param destination2 {@link MenuItem}'s destination
-   * @return <code>true</code> if match
-   */
-  protected boolean isSameDestination(HttpServletRequest request,
-                                      ServletContext jspContext, String path1,
-                                      Set<String> paramNames,
-                                      Map<String, String> paramValues,
-                                      String destination2) {
-
-    if (destination2 == null || destination2.isEmpty()) {
-      return false;
-    }
-
-    int questionCharIndes2 = destination2.indexOf('?');
-
-    // Url's files have the same size.
-    String path2;
-    String query2;
-    if (questionCharIndes2 < 0) {
-      path2 = destination2;
-      query2 = null;
-    }
-    else {
-      path2 = destination2.substring(0, questionCharIndes2);
-      query2 = destination2.substring(questionCharIndes2 + 1);
-    }
-
-    if (path1.length() != path2.length()) {
-      return false;
-    }
-
-    if (!path1.equalsIgnoreCase(path2)) {
-      // Url's files are different
-      return false;
-    }
-
-    // Compare parameters without values
-    if (paramNames.isEmpty() && query2 != null) {
-      return false;
-    }
-    else if (query2 == null && !paramNames.isEmpty()) {
-      return false;
-    }
-
-    String[] paramTokens2 = new String[] {};
-    if (query2 != null) {
-    	paramTokens2 = query2.split("[&]");
-    }
-
-    Set<String> paramNames2 = new TreeSet<String>();
-    Map<String, String> paramValues2 = new HashMap<String, String>();
-
-    String paramName;
-    String paramValue;
-    int equalCharIndex;
-    for (String paramToken : paramTokens2) {
-      equalCharIndex = paramToken.indexOf('=');
-      if (equalCharIndex < 0) {
-        paramName = paramToken;
-        paramValue = null;
-      }
-      else {
-        paramName = paramToken.substring(0, equalCharIndex);
-        paramValue = paramToken.substring(equalCharIndex + 1,
-            paramToken.length());
-      }
-      // TODO case insensitive compare: check servlet specification
-      paramNames2.add(paramName.toLowerCase());
-      paramValues2.put(paramName, paramValue);
-    }
-
-    // check for duplicated parameters
-    if (paramNames.size() != paramNames2.size()) {
-      return false;
-    }
-
-    Iterator<String> iterParamNames1 = paramNames.iterator();
-    Iterator<String> iterParamNames2 = paramNames2.iterator();
-
-    String paramName2;
-    String paramValue2;
-    while (iterParamNames1.hasNext()) {
-      paramName = iterParamNames1.next();
-      paramName2 = iterParamNames2.next();
-      if (!paramName.equals(paramName2)) {
-        return false;
-      }
-      paramValue = paramValues.get(paramName);
-      paramValue2 = paramValues2.get(paramName2);
-      if (paramValue2 != null && EL_PATTERN.matcher(paramValue2).matches()) {
-        continue;
-      }
-      if (!hasText(paramValue)) {
-        if (hasText(paramValue2)) {
-          return false;
-        }
-        continue;
-      }
-      if (!paramValue.equals(paramValue2)) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  private boolean hasText(String var) {
-    if (var == null) {
-      return false;
-    }
-    return var.trim().isEmpty();
-  }
-}
diff --git a/src/main/java/com/labsynch/labseer/web/menu/ContextMenuStrategy.java b/src/main/java/com/labsynch/labseer/web/menu/ContextMenuStrategy.java
deleted file mode 100644
index 340f928b2..000000000
--- a/src/main/java/com/labsynch/labseer/web/menu/ContextMenuStrategy.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.labsynch.labseer.web.menu;
-
-import java.util.List;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * gvNIX menu render strategy.
- * <p>
- * Defines how to render the items of one menu depending on current context,
- * i.e. context could be the current page, or press mouse right button.
- * <p>
- * The basic idea is that the menu structure is unique for one application,
- * but you can decide which part must be shown depending on the given context.
- */
-public interface ContextMenuStrategy {
-
-    /**
-     * Strategy's Name. Should be bean's id (or name).
-     *
-     * @return
-     */
-    public String getName();
-
-    /**
-     * Query for {@link MenuItem} to show in a context menu
-     *
-     *
-     * @param request Current request
-     * @param jspContext  Current jspContext
-     * @param menu  {@link Menu} instance to use
-     * @return {@link List} of {@link MenuItem} to show or <code>null</code> if no match found
-     */
-    public List<MenuItem> query(HttpServletRequest request, ServletContext jspContext, Menu menu);
-}
diff --git a/src/main/java/com/labsynch/labseer/web/menu/Menu.java b/src/main/java/com/labsynch/labseer/web/menu/Menu.java
deleted file mode 100644
index b67d3de8e..000000000
--- a/src/main/java/com/labsynch/labseer/web/menu/Menu.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.labsynch.labseer.web.menu;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Menu Model Root class
- */
-public class Menu {
-
-  /**
-   * Menu identifier.
-   */
-  private String id;
-
-  /***
-   * First level menu items.
-   */
-  private List<MenuItem> children = new ArrayList<MenuItem>();
-
-  protected Menu(String id) {
-    if (id == null) {
-    	this.id = "_menu";
-    }
-    else {
-    	this.id = id;
-    }
-  }
-  
-  /**
-   * Gets menu id
-   * @return
-   */
-  public String getId(){
-	  return this.id;
-  }
-
-  /**
-   * id mutator
-   * 
-   * @param id
-   */
-  void setId(String id) {
-    this.id = id;
-  }
-
-  /**
-   * add a child
-   * 
-   * @param child
-   */
-  void addChild(MenuItem child) {
-    this.children.add(child);
-  }
-
-  /**
-   * Gets children.
-   * 
-   * @return List
-   */
-  public List<MenuItem> getChildren() {
-    return this.children;
-  }
-
-  /**
-   * Set root menu items.
-   * 
-   * @param children
-   */
-  public void setChildren(List<MenuItem> children) {
-    this.children = children;
-  }
-}
diff --git a/src/main/java/com/labsynch/labseer/web/menu/MenuItem.java b/src/main/java/com/labsynch/labseer/web/menu/MenuItem.java
deleted file mode 100644
index 887227e98..000000000
--- a/src/main/java/com/labsynch/labseer/web/menu/MenuItem.java
+++ /dev/null
@@ -1,273 +0,0 @@
-package com.labsynch.labseer.web.menu;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.w3c.dom.Element;
-
-/**
- * Menu model item.
- * <p>
- * This has all information about a menu's item.
- */
-public class MenuItem {
-
-  private static final String DELIMITER = "/";
-
-  private MenuItem parent;
-
-  private final String url;
-  private final String id;
-  private final String messageCode;
-  private final String roles;
-  private final boolean hidden;
-  private List<MenuItem> children = null;
-
-  /** If label is null, menu will use labelCode to load the label from I18N properties */
-  private String labelCode;
-
-  /**
-   * Load Item values from XML Element. This doesn't load children nodes.
-   * 
-   * @param parent
-   * @param element
-   */
-  MenuItem(Element element) {
-    this.id = element.getAttribute("id");
-    this.labelCode = element.getAttribute("labelCode");
-    this.messageCode = element.getAttribute("messageCode");
-    this.url = element.getAttribute("url");
-    this.roles = element.getAttribute("roles");
-    if (element.hasAttribute("hidden")) {
-      this.hidden = Boolean.parseBoolean(element.getAttribute("hidden"));
-    } else {
-      this.hidden = false; 
-    }
-  }
-
-  /**
-   * Add a new child menu item. Child item parent is set to <code>this</code>.
-   * 
-   * @param child
-   */
-  void addChild(MenuItem child) {
-    if (children == null) {
-      children = new ArrayList<MenuItem>();
-    }
-    children.add(child);
-    child.parent = this;
-  }
-
-  /**
-   * Informs if this item has any children.
-   * 
-   * @return
-   */
-  public boolean hasChildren() {
-    return children != null && children.size() > 0;
-  }
-
-  /**
-   * Children list accessor.
-   * 
-   * @return List
-   */
-  public List<MenuItem> getChildren() {
-    return this.children;
-  }
-
-  /**
-   * Children list mutator
-   * @param children
-   */
-  public void setChildren(List<MenuItem> children) {
-    this.children = children;
-  }
-
-  /**
-   * roles string accessor.
-   * 
-   * @return comma list
-   */
-  public String getRoles() {
-    return this.roles;
-  }
-
-  /**
-   * URL accessor
-   * 
-   * @return
-   */
-  public String getUrl() {
-    return this.url;
-  }
-
-  /**
-   * Parent accessor
-   * 
-   * @return
-   */
-  public MenuItem getParent() {
-    return this.parent;
-  }
-
-  /**
-   * ID accessor
-   * 
-   * @return
-   */
-  public String getId() {
-    return id;
-  }
-
-  /**
-   * messageCode accessor
-   * 
-   * @return
-   */
-  public String getMessageCode() {
-    return messageCode;
-  }
-
-  
-  /**
-   * hidden accessor
-   * 
-   * @return
-   */
-  public boolean isHidden() {
-    return hidden;
-  }
-
-  
-  /**
-   * labelCode accessor
-   * 
-   * @return
-   */
-  public String getLabelCode() {
-    return labelCode;
-  }
-
-  /**
-   * Convert MenuItem ID to path format.
-   * <p>
-   * The ID will be transformed as follows:
-   * <ul>
-   * <li>The id prefix, "c_" of "i_", will be removed</li>
-   * <li>Append root path, "/" at the begining</li>
-   * <li>Replace "_" by "/"</li>
-   * </ul>
-   * This method doesn't modify the current ID.
-   * 
-   * @return
-   */
-  protected String getIdAsPath() {
-    StringBuilder path = new StringBuilder();
-
-    path.append(DELIMITER);
-
-    String idWithoutPrefix = this.id.substring(2); // current prefixes have length = 2
-
-    path.append(idWithoutPrefix.replace("_", DELIMITER));
-    
-    return path.toString();
-  }
-
-  /* (non-Javadoc)
-   * @see java.lang.Object#equals(java.lang.Object)
-   */
-  @Override
-  public int hashCode() {
-    final int prime = 31;
-    int result = 1;
-    result = prime * result
-        + ((url == null) ? 0 : url.hashCode());
-    result = prime * result + (hidden ? 1231 : 1237);
-    result = prime * result + ((parent == null) ? 0 : parent.hashCode());
-    result = prime * result + ((roles == null) ? 0 : roles.hashCode());
-    result = prime * result + ((id == null) ? 0 : id.hashCode());
-    result = prime * result + ((labelCode == null) ? 0 : labelCode.hashCode());
-    result = prime * result
-        + ((messageCode == null) ? 0 : messageCode.hashCode());
-    return result;
-  }
-
-  /* (non-Javadoc)
-   * @see java.lang.Object#equals(java.lang.Object)
-   */
-  @Override
-  public boolean equals(Object obj) {
-    if (this == obj) {
-    	return true;
-    }
-    if (obj == null){
-    	return false;
-    }
-    if (getClass() != obj.getClass()) {
-    	return false;
-    }
-    MenuItem other = (MenuItem) obj;
-    if (url == null) {
-      if (other.url != null) {
-    	  return false;
-      }
-    }
-    else if (!url.equals(other.url)) {
-    	return false;
-    }
-    if (hidden != other.hidden) {
-    	return false;
-    }
-    if (parent == null) {
-      if (other.parent != null) {
-    	  return false;
-      }
-    }
-    else if (!parent.equals(other.parent)) {
-    	return false;
-    }
-    if (roles == null) {
-      if (other.roles != null) {
-    	  return false;
-      }
-    }
-    else if (!roles.equals(other.roles)) {
-    	return false;
-    }
-    if (id == null) {
-      if (other.id != null) {
-    	  return false;
-      }
-    }
-    else if (!id.equals(other.id)) {
-    	return false;
-    }
-    if (labelCode == null) {
-      if (other.labelCode != null) {
-    	  return false;
-      }
-    }
-    else if (!labelCode.equals(other.labelCode)) {
-    	return false;
-    }
-    if (messageCode == null) {
-      if (other.messageCode != null) {
-    	  return false;
-      }
-    }
-    else if (!messageCode.equals(other.messageCode)) {
-    	return false;
-    }
-    return true;
-  }
-
-  /* (non-Javadoc)
-   * @see java.lang.Object#toString()
-   */
-  @Override
-  public String toString() {
-    return "MenuItem [".concat("ID=").concat(id).concat(", link=")
-      .concat(url).concat("]");
-  }
-}
diff --git a/src/main/java/com/labsynch/labseer/web/menu/MenuLoader.java b/src/main/java/com/labsynch/labseer/web/menu/MenuLoader.java
deleted file mode 100644
index c4f731df3..000000000
--- a/src/main/java/com/labsynch/labseer/web/menu/MenuLoader.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.labsynch.labseer.web.menu;
-
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.ServletContext;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.context.ApplicationContextException;
-import org.springframework.stereotype.Component;
-import org.springframework.util.Assert;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.WebApplicationObjectSupport;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * Menu model loader and publisher.
- * <p>
- * This class automatically is loaded by Spring ({@link Component} and
- * {@link Configurable}).
- * <p>
- * In application initialization ({@link WebApplicationObjectSupport}) loads
- * the menu structure and put it in the application context ready for 
- * rendering. Then {@link ContextMenuStrategy} and security will decide which
- * section and items have to be shown.
- */
-@Component
-@Configurable
-public class MenuLoader extends WebApplicationObjectSupport {
-
-  /** Configuration file for menus */
-  public static final String MENU_CONFIG_FILE = "/WEB-INF/views/menu.xml";
-
-  /** Key to store Menu in application context */
-  public static final String MENU_SERVLET_CONTEXT_KEY = "gvnixMenu";
-
-  public static final String MENU_ITEM_ELEMENT = "menu-item";
-
-  /**
-   * Calls to {@link #loadMenu()} and set the menu to the {@link ServletContext}
-   */
-  protected void initApplicationContext() throws ApplicationContextException {
-    if (!(getApplicationContext() instanceof WebApplicationContext)) {
-      return;
-    }
-    Menu menu;
-    try {
-      menu = loadMenu();
-    }
-    catch (Exception e) {
-      throw new ApplicationContextException("Error loading gvNIX web menu", e);
-    }
-    getServletContext().setAttribute(MENU_SERVLET_CONTEXT_KEY, menu);
-  }
-
-  /**
-   * Loads menu model from XML file {@link #MENU_CONFIG_FILE}. This method loads
-   * menu using recursivity. Override this
-   * method to change menu's source. Remember to set to <code>null</code>
-   * {@link #MENU_CONFIG_FILE}.
-   * 
-   * @return
-   * @throws Exception
-   */
-  protected Menu loadMenu() throws Exception {
-
-    // load and parse menu.xml
-    DocumentBuilder db = DocumentBuilderFactory.newInstance()
-        .newDocumentBuilder();
-    Document xml = null;
-
-    InputStream input = getServletContext().getResourceAsStream(MENU_CONFIG_FILE);
-    Assert.notNull(input, "gvNIX menu configuration not found '"
-        .concat(MENU_CONFIG_FILE).concat("'"));
-    try {
-      xml = db.parse(input);
-    }
-    catch (Exception e) {
-      throw e;
-    }
-    finally {
-      input.close();
-    }
-
-    // create menu root
-    Element root = xml.getDocumentElement();
-    String menuId = root.getAttribute("id");
-    Menu menu = new Menu(menuId);
-
-    // parse children
-    NodeList childNodes = root.getChildNodes();
-
-    // return empty menu if there are no children 
-    if(childNodes.getLength() == 0) {
-      return menu;
-    }
-
-    // load root menu items and their children
-    List<MenuItem> childItems = loadMenuItems(childNodes);
-    menu.setChildren(childItems);
-
-    return menu;
-  }
-
-  /**
-   * Transform a list of {@code <menu-item>} elements into {@code MenuItem} 
-   * objects.
-   * <p>
-   * This method loads the children recursively.
-   * 
-   * @param nodes List of XML elements
-   * @return List of MenuItem, note that MenuItem is complete, that is
-   * each MenuItem will contain their children List
-   */
-  public List<MenuItem> loadMenuItems(NodeList nodes) {
-    List<MenuItem> items = new ArrayList<MenuItem>();
-
-    for(int i = 0; i < nodes.getLength(); i++) {
-      Node node = nodes.item(i);
-      if (node.getNodeType() != Node.ELEMENT_NODE
-          || !MENU_ITEM_ELEMENT.equals(node.getNodeName())) {
-        continue;
-      }
-
-      // create the MenuItem object 
-      MenuItem item = new MenuItem((Element) node);
-
-      // recursively load children
-      NodeList childNodes = node.getChildNodes();
-
-      if(childNodes.getLength() > 0) {
-        List<MenuItem> childItems = loadMenuItems(childNodes);
-        item.setChildren(childItems);
-      }
-
-      // add MenuItem to result list 
-      items.add(item);
-    }
-    return items;
-  }
-}
diff --git a/src/main/java/com/labsynch/labseer/web/menu/URLBrothersContextMenuStrategy.java b/src/main/java/com/labsynch/labseer/web/menu/URLBrothersContextMenuStrategy.java
deleted file mode 100644
index 1cfb3896e..000000000
--- a/src/main/java/com/labsynch/labseer/web/menu/URLBrothersContextMenuStrategy.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.labsynch.labseer.web.menu;
-
-
-import java.util.List;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.stereotype.Component;
-
-/**
- * gvNIX Context menu Strategy (URL match, return brothers).
- * This strategy decides which menu item (root, subcategory, etc) should act 
- * as root by matching current request URL with all menu entries target URLs.
- * <p>
- * If a match item is found ({@link #query(HttpServletRequest, ServletContext, Menu)})
- * the menu will render the children of the match menu entry parent, that is,
- * it will render its brothers.
- */
-@Component(URLBrothersContextMenuStrategy.NAME)
-@Configurable
-public class URLBrothersContextMenuStrategy extends BaseURLContextMenuStrategy {
-
-  public static final String NAME = "URLBrothersContextMenuStrategy";
-
-  public String getName() {
-    return NAME;
-  }
-
-  /**
-   * {@inheritDoc}
-   * <p>
-   * Locates current menu position by matching current request URL with all
-   * {@link MenuItem}.
-   * <p>
-   * If a match item is found
-   * {@link #query(HttpServletRequest, ServletContext, Menu)} method will return
-   * all the {@link MenuItem} from its parent (including itself).
-   * <p>
-   * If no match item found it will return <code>null</code>.
-   */
-  public List<MenuItem> query(HttpServletRequest request,
-                              ServletContext jspContext, Menu menu) {
-    MenuItem currentItem = getItemFromCurrentURL(request, jspContext, menu);
-    if (currentItem == null) {
-      return null;
-    }
-    return currentItem.getParent().getChildren();
-  }
-
-}
diff --git a/src/main/java/com/labsynch/labseer/web/menu/URLChildrenContextMenuStrategy.java b/src/main/java/com/labsynch/labseer/web/menu/URLChildrenContextMenuStrategy.java
deleted file mode 100644
index c84c5ab04..000000000
--- a/src/main/java/com/labsynch/labseer/web/menu/URLChildrenContextMenuStrategy.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.labsynch.labseer.web.menu;
-
-
-import java.util.List;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.stereotype.Component;
-
-/**
- * gvNIX Context menu Strategy (URL match, return children).
- * <p>
- * This strategy decides which menu item (root, subcategory, etc) should act 
- * as root by matching current request URL with all menu entries target URLs.
- * <p>
- * If a match item is found ({@link #query(HttpServletRequest, ServletContext, Menu)})
- * the menu will render the children of the match menu entry.
- */
-@Component(URLChildrenContextMenuStrategy.NAME)
-@Configurable
-public class URLChildrenContextMenuStrategy extends BaseURLContextMenuStrategy {
-
-  public static final String NAME = "URLChildrenContextMenuStrategy";
-
-  public String getName() {
-    return NAME;
-  }
-
-  /**
-   * {@inheritDoc}
-   * <p>
-   * Locates current menu position by matching current request URL with all
-   * {@link MenuItem}.
-   * <p>
-   * If a match item is found
-   * {@link #query(HttpServletRequest, ServletContext, Menu)} method will return
-   * {@link MenuItem}'s children.
-   * <p>
-   * If no match item found it will return <code>null</code>.
-   */
-  public List<MenuItem> query(HttpServletRequest request,
-                              ServletContext jspContext, Menu menu) {
-    MenuItem currentItem = getItemFromCurrentURL(request, jspContext, menu);
-    if (currentItem == null) {
-      return null;
-    }
-    return currentItem.getChildren();
-  }
-}

From 499aa4d6f6146013cbf5e378f9e8b4d506948d8a Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Thu, 28 Apr 2022 16:47:57 -0700
Subject: [PATCH 51/73] Remove roo generate web interface

---
 .../WEB-INF/i18n/application.properties       | 2975 -----------------
 .../webapp/WEB-INF/i18n/messages.properties   |  107 -
 src/main/webapp/WEB-INF/layouts/default.jspx  |   28 -
 src/main/webapp/WEB-INF/tags/form/create.tagx |   61 -
 .../webapp/WEB-INF/tags/form/dependency.tagx  |   25 -
 .../WEB-INF/tags/form/fields/checkbox.tagx    |   38 -
 .../WEB-INF/tags/form/fields/column.tagx      |   63 -
 .../WEB-INF/tags/form/fields/datetime.tagx    |   75 -
 .../WEB-INF/tags/form/fields/display.tagx     |   48 -
 .../WEB-INF/tags/form/fields/editor.tagx      |   60 -
 .../WEB-INF/tags/form/fields/input.tagx       |  108 -
 .../WEB-INF/tags/form/fields/reference.tagx   |   41 -
 .../WEB-INF/tags/form/fields/select.tagx      |  199 --
 .../WEB-INF/tags/form/fields/simple.tagx      |   35 -
 .../WEB-INF/tags/form/fields/table.tagx       |  162 -
 .../WEB-INF/tags/form/fields/textarea.tagx    |   47 -
 src/main/webapp/WEB-INF/tags/form/find.tagx   |   31 -
 src/main/webapp/WEB-INF/tags/form/list.tagx   |   31 -
 src/main/webapp/WEB-INF/tags/form/show.tagx   |  103 -
 src/main/webapp/WEB-INF/tags/form/update.tagx |   47 -
 .../webapp/WEB-INF/tags/menu/category.tagx    |   25 -
 .../webapp/WEB-INF/tags/menu/gvnixitem.tagx   |  149 -
 .../webapp/WEB-INF/tags/menu/gvnixmenu.tagx   |   70 -
 src/main/webapp/WEB-INF/tags/menu/item.tagx   |   29 -
 src/main/webapp/WEB-INF/tags/menu/menu.tagx   |   13 -
 .../webapp/WEB-INF/tags/util/language.tagx    |   31 -
 .../WEB-INF/tags/util/load-scripts.tagx       |   29 -
 .../webapp/WEB-INF/tags/util/pagination.tagx  |   87 -
 src/main/webapp/WEB-INF/tags/util/panel.tagx  |   33 -
 .../webapp/WEB-INF/tags/util/placeholder.tagx |    5 -
 src/main/webapp/WEB-INF/tags/util/theme.tagx  |   36 -
 .../views/analysisgrouplabels/create.jspx     |   22 -
 ...indAnalysisGroupLabelsByAnalysisGroup.jspx |    8 -
 ...lysisGroupLabelsByLsTransactionEquals.jspx |    8 -
 .../views/analysisgrouplabels/list.jspx       |   15 -
 .../views/analysisgrouplabels/show.jspx       |   21 -
 .../views/analysisgrouplabels/update.jspx     |   21 -
 .../views/analysisgrouplabels/views.xml       |   22 -
 .../WEB-INF/views/analysisgroups/create.jspx  |   24 -
 .../findAnalysisGroupsByExperiment.jspx       |    8 -
 .../findAnalysisGroupsByExperiments.jspx      |    8 -
 ...lysisGroupsByExperimentsAndIgnoredNot.jspx |    9 -
 ...ndAnalysisGroupsByLsTransactionEquals.jspx |    8 -
 .../WEB-INF/views/analysisgroups/list.jspx    |   15 -
 .../WEB-INF/views/analysisgroups/show.jspx    |   20 -
 .../WEB-INF/views/analysisgroups/update.jspx  |   23 -
 .../WEB-INF/views/analysisgroups/views.xml    |   28 -
 .../views/analysisgroupstates/create.jspx     |   21 -
 ...indAnalysisGroupStatesByAnalysisGroup.jspx |    8 -
 ...ypeEqualsAndLsKindEqualsAndIgnoredNot.jspx |   11 -
 ...lysisGroupStatesByLsTransactionEquals.jspx |    8 -
 ...lysisGroupStatesByLsTypeAndKindEquals.jspx |    8 -
 ...upStatesByLsTypeEqualsAndLsKindEquals.jspx |    9 -
 .../views/analysisgroupstates/list.jspx       |   15 -
 .../views/analysisgroupstates/show.jspx       |   19 -
 .../views/analysisgroupstates/update.jspx     |   20 -
 .../views/analysisgroupstates/views.xml       |   31 -
 .../views/analysisgroupvalues/create.jspx     |   45 -
 ...dAnalysisGroupValuesByCodeValueEquals.jspx |    8 -
 ...pValuesByIgnoredNotAndCodeValueEquals.jspx |    9 -
 .../findAnalysisGroupValuesByLsState.jspx     |    8 -
 ...lysisGroupValuesByLsTransactionEquals.jspx |    8 -
 ...upValuesByLsTypeEqualsAndLsKindEquals.jspx |    9 -
 ...EqualsAndStringValueLikeAndIgnoredNot.jspx |   11 -
 .../views/analysisgroupvalues/list.jspx       |   15 -
 .../views/analysisgroupvalues/show.jspx       |   44 -
 .../views/analysisgroupvalues/update.jspx     |   44 -
 .../views/analysisgroupvalues/views.xml       |   34 -
 .../views/applicationsettings/create.jspx     |   13 -
 ...ndApplicationSettingsByPropNameEquals.jspx |    8 -
 ...SettingsByPropNameEqualsAndIgnoredNot.jspx |    9 -
 .../views/applicationsettings/list.jspx       |   14 -
 .../views/applicationsettings/show.jspx       |   12 -
 .../views/applicationsettings/update.jspx     |   12 -
 .../views/applicationsettings/views.xml       |   22 -
 .../WEB-INF/views/authorlabels/create.jspx    |   22 -
 .../WEB-INF/views/authorlabels/list.jspx      |   15 -
 .../WEB-INF/views/authorlabels/show.jspx      |   21 -
 .../WEB-INF/views/authorlabels/update.jspx    |   21 -
 .../WEB-INF/views/authorlabels/views.xml      |   16 -
 .../WEB-INF/views/authorroles/create.jspx     |   10 -
 .../findAuthorRolesByRoleEntry.jspx           |    8 -
 ...indAuthorRolesByRoleEntryAndUserEntry.jspx |    9 -
 .../findAuthorRolesByUserEntry.jspx           |    8 -
 .../WEB-INF/views/authorroles/list.jspx       |   11 -
 .../WEB-INF/views/authorroles/show.jspx       |    9 -
 .../WEB-INF/views/authorroles/update.jspx     |    9 -
 .../WEB-INF/views/authorroles/views.xml       |   25 -
 .../webapp/WEB-INF/views/authors/create.jspx  |   32 -
 ...AuthorsByActivationKeyAndEmailAddress.jspx |    9 -
 .../authors/findAuthorsByEmailAddress.jspx    |    8 -
 .../views/authors/findAuthorsByUserName.jspx  |    8 -
 .../webapp/WEB-INF/views/authors/list.jspx    |   16 -
 .../webapp/WEB-INF/views/authors/show.jspx    |   27 -
 .../webapp/WEB-INF/views/authors/update.jspx  |   31 -
 .../webapp/WEB-INF/views/authors/views.xml    |   25 -
 .../WEB-INF/views/authorstates/create.jspx    |   21 -
 .../WEB-INF/views/authorstates/list.jspx      |   15 -
 .../WEB-INF/views/authorstates/show.jspx      |   19 -
 .../WEB-INF/views/authorstates/update.jspx    |   20 -
 .../WEB-INF/views/authorstates/views.xml      |   16 -
 .../WEB-INF/views/authorvalues/create.jspx    |   45 -
 .../WEB-INF/views/authorvalues/list.jspx      |   15 -
 .../WEB-INF/views/authorvalues/show.jspx      |   44 -
 .../WEB-INF/views/authorvalues/update.jspx    |   44 -
 .../WEB-INF/views/authorvalues/views.xml      |   16 -
 .../WEB-INF/views/bulkloadfiles/create.jspx   |   15 -
 .../findBulkLoadFilesByFileNameEquals.jspx    |    8 -
 .../findBulkLoadFilesByRecordedByEquals.jspx  |    8 -
 .../WEB-INF/views/bulkloadfiles/list.jspx     |   15 -
 .../WEB-INF/views/bulkloadfiles/show.jspx     |   14 -
 .../WEB-INF/views/bulkloadfiles/update.jspx   |   14 -
 .../WEB-INF/views/bulkloadfiles/views.xml     |   22 -
 .../views/bulkloadtemplates/create.jspx       |   12 -
 ...ndBulkLoadTemplatesByRecordedByEquals.jspx |    8 -
 ...BulkLoadTemplatesByTemplateNameEquals.jspx |    8 -
 ...TemplateNameEqualsAndRecordedByEquals.jspx |    9 -
 .../WEB-INF/views/bulkloadtemplates/list.jspx |   13 -
 .../WEB-INF/views/bulkloadtemplates/show.jspx |   11 -
 .../views/bulkloadtemplates/update.jspx       |   11 -
 .../WEB-INF/views/bulkloadtemplates/views.xml |   25 -
 .../WEB-INF/views/changepassword/index.jspx   |   47 -
 .../WEB-INF/views/changepassword/thanks.jspx  |   16 -
 .../WEB-INF/views/changepassword/views.xml    |   11 -
 .../WEB-INF/views/chemstructures/create.jspx  |   21 -
 .../WEB-INF/views/chemstructures/list.jspx    |   15 -
 .../WEB-INF/views/chemstructures/show.jspx    |   20 -
 .../WEB-INF/views/chemstructures/update.jspx  |   20 -
 .../WEB-INF/views/chemstructures/views.xml    |   16 -
 .../views/cmpdregappsettings/create.jspx      |   13 -
 .../views/cmpdregappsettings/list.jspx        |   14 -
 .../views/cmpdregappsettings/show.jspx        |   12 -
 .../views/cmpdregappsettings/update.jspx      |   12 -
 .../views/cmpdregappsettings/views.xml        |   16 -
 .../WEB-INF/views/codekinds/create.jspx       |   11 -
 ...indCodeKindsByKindNameEqualsAndLsType.jspx |    9 -
 .../codekinds/findCodeKindsByLsType.jspx      |    8 -
 .../findCodeKindsByLsTypeAndKindEquals.jspx   |    8 -
 .../webapp/WEB-INF/views/codekinds/list.jspx  |   12 -
 .../webapp/WEB-INF/views/codekinds/show.jspx  |   10 -
 .../WEB-INF/views/codekinds/update.jspx       |   10 -
 .../webapp/WEB-INF/views/codekinds/views.xml  |   25 -
 .../WEB-INF/views/codeorigins/create.jspx     |    9 -
 .../WEB-INF/views/codeorigins/list.jspx       |   10 -
 .../WEB-INF/views/codeorigins/show.jspx       |    8 -
 .../WEB-INF/views/codeorigins/update.jspx     |    8 -
 .../WEB-INF/views/codeorigins/views.xml       |   16 -
 .../WEB-INF/views/codetypes/create.jspx       |    9 -
 .../findCodeTypesByTypeNameEquals.jspx        |    8 -
 .../webapp/WEB-INF/views/codetypes/list.jspx  |   10 -
 .../webapp/WEB-INF/views/codetypes/show.jspx  |    8 -
 .../WEB-INF/views/codetypes/update.jspx       |    8 -
 .../webapp/WEB-INF/views/codetypes/views.xml  |   19 -
 .../WEB-INF/views/compoundTypes/create.jspx   |   12 -
 .../findCompoundTypesByCodeEquals.jspx        |    8 -
 .../WEB-INF/views/compoundTypes/list.jspx     |   13 -
 .../WEB-INF/views/compoundTypes/show.jspx     |   11 -
 .../WEB-INF/views/compoundTypes/update.jspx   |   11 -
 .../WEB-INF/views/compoundTypes/views.xml     |   19 -
 .../WEB-INF/views/compounds/create.jspx       |   15 -
 .../views/compounds/findCompoundsByCdId.jspx  |    8 -
 .../findCompoundsByExternal_idEquals.jspx     |    8 -
 .../webapp/WEB-INF/views/compounds/list.jspx  |   15 -
 .../webapp/WEB-INF/views/compounds/show.jspx  |   14 -
 .../WEB-INF/views/compounds/update.jspx       |   14 -
 .../webapp/WEB-INF/views/compounds/views.xml  |   22 -
 .../WEB-INF/views/containerkinds/create.jspx  |   11 -
 .../WEB-INF/views/containerkinds/list.jspx    |   12 -
 .../WEB-INF/views/containerkinds/show.jspx    |   10 -
 .../WEB-INF/views/containerkinds/update.jspx  |   10 -
 .../WEB-INF/views/containerkinds/views.xml    |   16 -
 .../WEB-INF/views/containerlabels/create.jspx |   22 -
 ...ntainerLabelsByContainerAndIgnoredNot.jspx |    9 -
 ...rLabelsByLabelTextEqualsAndIgnoredNot.jspx |    9 -
 ...dContainerLabelsByLsTransactionEquals.jspx |    8 -
 ...EqualsAndLabelTextEqualsAndIgnoredNot.jspx |   10 -
 .../WEB-INF/views/containerlabels/list.jspx   |   15 -
 .../WEB-INF/views/containerlabels/show.jspx   |   21 -
 .../WEB-INF/views/containerlabels/update.jspx |   21 -
 .../WEB-INF/views/containerlabels/views.xml   |   28 -
 .../WEB-INF/views/containers/create.jspx      |   28 -
 .../webapp/WEB-INF/views/containers/list.jspx |   15 -
 .../webapp/WEB-INF/views/containers/show.jspx |   21 -
 .../WEB-INF/views/containers/update.jspx      |   27 -
 .../webapp/WEB-INF/views/containers/views.xml |   16 -
 .../WEB-INF/views/containerstates/create.jspx |   21 -
 .../findContainerStatesByContainer.jspx       |    8 -
 ...ContainerAndLsKindEqualsAndIgnoredNot.jspx |   10 -
 .../findContainerStatesByIgnoredNot.jspx      |    8 -
 .../WEB-INF/views/containerstates/list.jspx   |   15 -
 .../WEB-INF/views/containerstates/show.jspx   |   19 -
 .../WEB-INF/views/containerstates/update.jspx |   20 -
 .../WEB-INF/views/containerstates/views.xml   |   25 -
 .../WEB-INF/views/containertypes/create.jspx  |    9 -
 .../findContainerTypesByTypeNameEquals.jspx   |    8 -
 .../WEB-INF/views/containertypes/list.jspx    |   10 -
 .../WEB-INF/views/containertypes/show.jspx    |    8 -
 .../WEB-INF/views/containertypes/update.jspx  |    8 -
 .../WEB-INF/views/containertypes/views.xml    |   19 -
 .../WEB-INF/views/containervalues/create.jspx |   45 -
 .../findContainerValuesByIgnoredNot.jspx      |    8 -
 .../findContainerValuesByLsState.jspx         |    8 -
 .../WEB-INF/views/containervalues/list.jspx   |   15 -
 .../WEB-INF/views/containervalues/show.jspx   |   44 -
 .../WEB-INF/views/containervalues/update.jspx |   44 -
 .../WEB-INF/views/containervalues/views.xml   |   22 -
 .../WEB-INF/views/corpnames/create.jspx       |   11 -
 .../webapp/WEB-INF/views/corpnames/list.jspx  |   12 -
 .../webapp/WEB-INF/views/corpnames/show.jspx  |   10 -
 .../WEB-INF/views/corpnames/update.jspx       |   10 -
 .../webapp/WEB-INF/views/corpnames/views.xml  |   16 -
 .../webapp/WEB-INF/views/cronjobs/create.jspx |   21 -
 .../webapp/WEB-INF/views/cronjobs/list.jspx   |   15 -
 .../webapp/WEB-INF/views/cronjobs/show.jspx   |   20 -
 .../webapp/WEB-INF/views/cronjobs/update.jspx |   20 -
 .../webapp/WEB-INF/views/cronjobs/views.xml   |   16 -
 .../WEB-INF/views/dataAccessFailure.jspx      |   30 -
 .../WEB-INF/views/ddictkinds/create.jspx      |   15 -
 ...DDictKindsByLsTypeEqualsAndNameEquals.jspx |    9 -
 .../webapp/WEB-INF/views/ddictkinds/list.jspx |   15 -
 .../webapp/WEB-INF/views/ddictkinds/show.jspx |   14 -
 .../WEB-INF/views/ddictkinds/update.jspx      |   14 -
 .../webapp/WEB-INF/views/ddictkinds/views.xml |   19 -
 .../WEB-INF/views/ddicttypes/create.jspx      |   13 -
 .../findDDictTypesByNameEquals.jspx           |    8 -
 .../webapp/WEB-INF/views/ddicttypes/list.jspx |   14 -
 .../webapp/WEB-INF/views/ddicttypes/show.jspx |   12 -
 .../WEB-INF/views/ddicttypes/update.jspx      |   12 -
 .../webapp/WEB-INF/views/ddicttypes/views.xml |   19 -
 .../WEB-INF/views/ddictvalues/create.jspx     |   18 -
 .../findDDictValuesByCodeNameEquals.jspx      |    8 -
 .../findDDictValuesByIgnoredNot.jspx          |    8 -
 .../findDDictValuesByLabelTextLike.jspx       |    8 -
 .../findDDictValuesByLsKindEquals.jspx        |    8 -
 .../findDDictValuesByLsTypeEquals.jspx        |    8 -
 ...ctValuesByLsTypeEqualsAndLsKindEquals.jspx |    9 -
 ...ualsAndLsKindEqualsAndShortNameEquals.jspx |   10 -
 .../WEB-INF/views/ddictvalues/list.jspx       |   15 -
 .../WEB-INF/views/ddictvalues/show.jspx       |   17 -
 .../WEB-INF/views/ddictvalues/update.jspx     |   17 -
 .../WEB-INF/views/ddictvalues/views.xml       |   37 -
 .../WEB-INF/views/experimentkinds/create.jspx |   11 -
 .../WEB-INF/views/experimentkinds/list.jspx   |   12 -
 .../WEB-INF/views/experimentkinds/show.jspx   |   10 -
 .../WEB-INF/views/experimentkinds/update.jspx |   10 -
 .../WEB-INF/views/experimentkinds/views.xml   |   16 -
 .../views/experimentlabels/create.jspx        |   22 -
 .../findExperimentLabelsByExperiment.jspx     |    8 -
 ...rimentLabelsByExperimentAndIgnoredNot.jspx |    9 -
 .../findExperimentLabelsByLabelTextLike.jspx  |    8 -
 ...indEqualsAndPreferredNotAndIgnoredNot.jspx |   11 -
 ...indEqualsAndPreferredNotAndIgnoredNot.jspx |   11 -
 ...indEqualsAndPreferredNotAndIgnoredNot.jspx |   10 -
 .../WEB-INF/views/experimentlabels/list.jspx  |   15 -
 .../WEB-INF/views/experimentlabels/show.jspx  |   21 -
 .../views/experimentlabels/update.jspx        |   21 -
 .../WEB-INF/views/experimentlabels/views.xml  |   34 -
 .../WEB-INF/views/experiments/create.jspx     |   28 -
 .../findExperimentsByCodeNameEquals.jspx      |    8 -
 .../findExperimentsByCodeNameLike.jspx        |    8 -
 .../findExperimentsByLsKindEquals.jspx        |    8 -
 .../findExperimentsByLsKindLike.jspx          |    8 -
 .../findExperimentsByLsTransaction.jspx       |    8 -
 .../findExperimentsByLsTypeEquals.jspx        |    8 -
 ...erimentsByLsTypeEqualsAndLsKindEquals.jspx |    9 -
 .../findExperimentsByLsTypeLike.jspx          |    8 -
 .../findExperimentsByProtocol.jspx            |    8 -
 .../findExperimentsByRecordedByLike.jspx      |    8 -
 .../WEB-INF/views/experiments/list.jspx       |   15 -
 .../WEB-INF/views/experiments/show.jspx       |   22 -
 .../WEB-INF/views/experiments/update.jspx     |   27 -
 .../WEB-INF/views/experiments/views.xml       |   46 -
 .../views/experimentstates/create.jspx        |   21 -
 .../findExperimentStatesByExperiment.jspx     |    8 -
 .../WEB-INF/views/experimentstates/list.jspx  |   15 -
 .../WEB-INF/views/experimentstates/show.jspx  |   19 -
 .../views/experimentstates/update.jspx        |   20 -
 .../WEB-INF/views/experimentstates/views.xml  |   19 -
 .../WEB-INF/views/experimenttypes/create.jspx |    9 -
 .../findExperimentTypesByTypeNameEquals.jspx  |    8 -
 .../WEB-INF/views/experimenttypes/list.jspx   |   10 -
 .../WEB-INF/views/experimenttypes/show.jspx   |    8 -
 .../WEB-INF/views/experimenttypes/update.jspx |    8 -
 .../WEB-INF/views/experimenttypes/views.xml   |   19 -
 .../views/experimentvalues/create.jspx        |   45 -
 ...tValuesByLsKindEqualsAndCodeValueLike.jspx |    9 -
 ...aluesByLsKindEqualsAndDateValueEquals.jspx |    9 -
 ...tValuesByLsKindEqualsAndDateValueLike.jspx |    9 -
 ...aluesByLsKindEqualsAndStringValueLike.jspx |    9 -
 .../findExperimentValuesByLsState.jspx        |    8 -
 ...lsAndLsTypeEqualsAndStringValueEquals.jspx |   12 -
 .../WEB-INF/views/experimentvalues/list.jspx  |   15 -
 .../WEB-INF/views/experimentvalues/show.jspx  |   44 -
 .../views/experimentvalues/update.jspx        |   44 -
 .../WEB-INF/views/experimentvalues/views.xml  |   34 -
 .../WEB-INF/views/filelists/create.jspx       |   20 -
 .../views/filelists/findFileListsByLot.jspx   |    8 -
 .../filelists/findFileListsByUrlEquals.jspx   |    8 -
 .../webapp/WEB-INF/views/filelists/list.jspx  |   15 -
 .../webapp/WEB-INF/views/filelists/show.jspx  |   19 -
 .../WEB-INF/views/filelists/update.jspx       |   19 -
 .../webapp/WEB-INF/views/filelists/views.xml  |   22 -
 .../WEB-INF/views/filethings/create.jspx      |   27 -
 .../webapp/WEB-INF/views/filethings/list.jspx |   15 -
 .../webapp/WEB-INF/views/filethings/show.jspx |   25 -
 .../WEB-INF/views/filethings/update.jspx      |   26 -
 .../webapp/WEB-INF/views/filethings/views.xml |   16 -
 .../WEB-INF/views/filetypes/create.jspx       |   10 -
 .../filetypes/findFileTypesByCodeEquals.jspx  |    8 -
 .../webapp/WEB-INF/views/filetypes/list.jspx  |   11 -
 .../webapp/WEB-INF/views/filetypes/show.jspx  |    9 -
 .../WEB-INF/views/filetypes/update.jspx       |    9 -
 .../webapp/WEB-INF/views/filetypes/views.xml  |   19 -
 src/main/webapp/WEB-INF/views/footer.jspx     |   43 -
 .../WEB-INF/views/forgotpassword/index.jspx   |   34 -
 .../WEB-INF/views/forgotpassword/thanks.jspx  |   16 -
 .../WEB-INF/views/forgotpassword/views.xml    |   15 -
 src/main/webapp/WEB-INF/views/header.jspx     |   11 -
 .../webapp/WEB-INF/views/index-template.jspx  |   11 -
 src/main/webapp/WEB-INF/views/index.jspx      |   14 -
 .../views/interactionkinds/create.jspx        |   11 -
 .../WEB-INF/views/interactionkinds/list.jspx  |   12 -
 .../WEB-INF/views/interactionkinds/show.jspx  |   10 -
 .../views/interactionkinds/update.jspx        |   10 -
 .../WEB-INF/views/interactionkinds/views.xml  |   16 -
 .../views/interactiontypes/create.jspx        |   10 -
 .../WEB-INF/views/interactiontypes/list.jspx  |   11 -
 .../WEB-INF/views/interactiontypes/show.jspx  |    9 -
 .../views/interactiontypes/update.jspx        |    9 -
 .../WEB-INF/views/interactiontypes/views.xml  |   16 -
 .../webapp/WEB-INF/views/isosalts/create.jspx |   14 -
 .../isosalts/findIsoSaltsBySaltForm.jspx      |    8 -
 .../findIsoSaltsBySaltFormAndType.jspx        |    9 -
 .../webapp/WEB-INF/views/isosalts/list.jspx   |   15 -
 .../webapp/WEB-INF/views/isosalts/show.jspx   |   13 -
 .../webapp/WEB-INF/views/isosalts/update.jspx |   13 -
 .../webapp/WEB-INF/views/isosalts/views.xml   |   22 -
 .../webapp/WEB-INF/views/isotopes/create.jspx |   12 -
 .../isotopes/findIsotopesByAbbrevEquals.jspx  |    8 -
 ...ndIsotopesByAbbrevEqualsAndNameEquals.jspx |    9 -
 .../isotopes/findIsotopesByNameEquals.jspx    |    8 -
 .../webapp/WEB-INF/views/isotopes/list.jspx   |   13 -
 .../webapp/WEB-INF/views/isotopes/show.jspx   |   11 -
 .../webapp/WEB-INF/views/isotopes/update.jspx |   11 -
 .../webapp/WEB-INF/views/isotopes/views.xml   |   25 -
 .../views/itxcontainercontainers/create.jspx  |   23 -
 ...tainerContainersByLsTransactionEquals.jspx |    8 -
 ...ByLsTypeEqualsAndFirstContainerEquals.jspx |    9 -
 ...yLsTypeEqualsAndSecondContainerEquals.jspx |    9 -
 .../views/itxcontainercontainers/list.jspx    |   15 -
 .../views/itxcontainercontainers/show.jspx    |   20 -
 .../views/itxcontainercontainers/update.jspx  |   22 -
 .../views/itxcontainercontainers/views.xml    |   25 -
 .../itxcontainercontainerstates/create.jspx   |   21 -
 .../itxcontainercontainerstates/list.jspx     |   15 -
 .../itxcontainercontainerstates/show.jspx     |   19 -
 .../itxcontainercontainerstates/update.jspx   |   20 -
 .../itxcontainercontainerstates/views.xml     |   16 -
 .../itxcontainercontainervalues/create.jspx   |   45 -
 .../itxcontainercontainervalues/list.jspx     |   15 -
 .../itxcontainercontainervalues/show.jspx     |   44 -
 .../itxcontainercontainervalues/update.jspx   |   44 -
 .../itxcontainercontainervalues/views.xml     |   16 -
 .../itxexperimentexperiments/create.jspx      |   23 -
 ...xperimentExperimentsByFirstExperiment.jspx |    8 -
 ...imentExperimentsByLsTransactionEquals.jspx |    8 -
 ...perimentExperimentsBySecondExperiment.jspx |    8 -
 .../views/itxexperimentexperiments/list.jspx  |   15 -
 .../views/itxexperimentexperiments/show.jspx  |   20 -
 .../itxexperimentexperiments/update.jspx      |   22 -
 .../views/itxexperimentexperiments/views.xml  |   25 -
 .../itxexperimentexperimentstates/create.jspx |   21 -
 .../itxexperimentexperimentstates/list.jspx   |   15 -
 .../itxexperimentexperimentstates/show.jspx   |   19 -
 .../itxexperimentexperimentstates/update.jspx |   20 -
 .../itxexperimentexperimentstates/views.xml   |   16 -
 .../itxexperimentexperimentvalues/create.jspx |   45 -
 .../itxexperimentexperimentvalues/list.jspx   |   15 -
 .../itxexperimentexperimentvalues/show.jspx   |   44 -
 .../itxexperimentexperimentvalues/update.jspx |   44 -
 .../itxexperimentexperimentvalues/views.xml   |   16 -
 .../views/itxlsthinglsthings/create.jspx      |   23 -
 ...indItxLsThingLsThingsByCodeNameEquals.jspx |    8 -
 .../findItxLsThingLsThingsByFirstLsThing.jspx |    8 -
 ...findItxLsThingLsThingsBySecondLsThing.jspx |    8 -
 .../views/itxlsthinglsthings/list.jspx        |   15 -
 .../views/itxlsthinglsthings/show.jspx        |   20 -
 .../views/itxlsthinglsthings/update.jspx      |   22 -
 .../views/itxlsthinglsthings/views.xml        |   25 -
 .../views/itxlsthinglsthingstates/create.jspx |   21 -
 .../views/itxlsthinglsthingstates/list.jspx   |   15 -
 .../views/itxlsthinglsthingstates/show.jspx   |   19 -
 .../views/itxlsthinglsthingstates/update.jspx |   20 -
 .../views/itxlsthinglsthingstates/views.xml   |   16 -
 .../views/itxlsthinglsthingvalues/create.jspx |   45 -
 .../views/itxlsthinglsthingvalues/list.jspx   |   15 -
 .../views/itxlsthinglsthingvalues/show.jspx   |   44 -
 .../views/itxlsthinglsthingvalues/update.jspx |   44 -
 .../views/itxlsthinglsthingvalues/views.xml   |   16 -
 .../views/itxprotocolprotocols/create.jspx    |   23 -
 ...ndItxProtocolProtocolsByFirstProtocol.jspx |    8 -
 ...rotocolProtocolsByLsTransactionEquals.jspx |    8 -
 ...dItxProtocolProtocolsBySecondProtocol.jspx |    8 -
 .../views/itxprotocolprotocols/list.jspx      |   15 -
 .../views/itxprotocolprotocols/show.jspx      |   20 -
 .../views/itxprotocolprotocols/update.jspx    |   22 -
 .../views/itxprotocolprotocols/views.xml      |   25 -
 .../itxprotocolprotocolstates/create.jspx     |   21 -
 .../views/itxprotocolprotocolstates/list.jspx |   15 -
 .../views/itxprotocolprotocolstates/show.jspx |   19 -
 .../itxprotocolprotocolstates/update.jspx     |   20 -
 .../views/itxprotocolprotocolstates/views.xml |   16 -
 .../itxprotocolprotocolvalues/create.jspx     |   45 -
 .../views/itxprotocolprotocolvalues/list.jspx |   15 -
 .../views/itxprotocolprotocolvalues/show.jspx |   44 -
 .../itxprotocolprotocolvalues/update.jspx     |   44 -
 .../views/itxprotocolprotocolvalues/views.xml |   16 -
 .../views/itxsubjectcontainers/create.jspx    |   23 -
 ...dItxSubjectContainersByCodeNameEquals.jspx |    8 -
 .../findItxSubjectContainersByContainer.jspx  |    8 -
 ...ubjectContainersByLsTransactionEquals.jspx |    8 -
 .../findItxSubjectContainersBySubject.jspx    |    8 -
 .../views/itxsubjectcontainers/list.jspx      |   15 -
 .../views/itxsubjectcontainers/show.jspx      |   20 -
 .../views/itxsubjectcontainers/update.jspx    |   22 -
 .../views/itxsubjectcontainers/views.xml      |   28 -
 .../itxsubjectcontainerstates/create.jspx     |   21 -
 .../views/itxsubjectcontainerstates/list.jspx |   15 -
 .../views/itxsubjectcontainerstates/show.jspx |   19 -
 .../itxsubjectcontainerstates/update.jspx     |   20 -
 .../views/itxsubjectcontainerstates/views.xml |   16 -
 .../itxsubjectcontainervalues/create.jspx     |   45 -
 .../views/itxsubjectcontainervalues/list.jspx |   15 -
 .../views/itxsubjectcontainervalues/show.jspx |   44 -
 .../itxsubjectcontainervalues/update.jspx     |   44 -
 .../views/itxsubjectcontainervalues/views.xml |   16 -
 .../WEB-INF/views/labelkinds/create.jspx      |   11 -
 .../findLabelKindsByKindNameEquals.jspx       |    8 -
 ...ndLabelKindsByKindNameEqualsAndLsType.jspx |    9 -
 .../labelkinds/findLabelKindsByLsType.jspx    |    8 -
 .../webapp/WEB-INF/views/labelkinds/list.jspx |   12 -
 .../webapp/WEB-INF/views/labelkinds/show.jspx |   10 -
 .../WEB-INF/views/labelkinds/update.jspx      |   10 -
 .../webapp/WEB-INF/views/labelkinds/views.xml |   25 -
 .../views/labelsequenceroles/create.jspx      |   10 -
 .../views/labelsequenceroles/list.jspx        |   11 -
 .../views/labelsequenceroles/show.jspx        |    9 -
 .../views/labelsequenceroles/update.jspx      |    9 -
 .../views/labelsequenceroles/views.xml        |   16 -
 .../WEB-INF/views/labelsequences/create.jspx  |   19 -
 ...abelSequencesByLabelTypeAndKindEquals.jspx |    8 -
 ...abelSequencesByThingTypeAndKindEquals.jspx |    8 -
 ...ndKindEqualsAndLabelTypeAndKindEquals.jspx |    9 -
 ...TypeAndKindEqualsAndLabelPrefixEquals.jspx |   10 -
 ...sAndLabelTypeEqualsAndLabelKindEquals.jspx |   11 -
 .../WEB-INF/views/labelsequences/list.jspx    |   15 -
 .../WEB-INF/views/labelsequences/show.jspx    |   17 -
 .../WEB-INF/views/labelsequences/update.jspx  |   18 -
 .../WEB-INF/views/labelsequences/views.xml    |   31 -
 .../WEB-INF/views/labeltypes/create.jspx      |    9 -
 .../findLabelTypesByTypeNameEquals.jspx       |    8 -
 .../webapp/WEB-INF/views/labeltypes/list.jspx |   10 -
 .../webapp/WEB-INF/views/labeltypes/show.jspx |    8 -
 .../WEB-INF/views/labeltypes/update.jspx      |    8 -
 .../webapp/WEB-INF/views/labeltypes/views.xml |   19 -
 src/main/webapp/WEB-INF/views/login.jspx      |   61 -
 src/main/webapp/WEB-INF/views/lot/index.jspx  |   12 -
 src/main/webapp/WEB-INF/views/lot/views.xml   |    7 -
 .../WEB-INF/views/lotaliases/create.jspx      |   15 -
 ...eEqualsAndLsTypeEqualsAndLsKindEquals.jspx |   10 -
 .../views/lotaliases/findLotAliasesByLot.jspx |    8 -
 ...esByLotAndLsTypeEqualsAndLsKindEquals.jspx |   10 -
 .../webapp/WEB-INF/views/lotaliases/list.jspx |   15 -
 .../webapp/WEB-INF/views/lotaliases/show.jspx |   14 -
 .../WEB-INF/views/lotaliases/update.jspx      |   14 -
 .../webapp/WEB-INF/views/lotaliases/views.xml |   25 -
 .../WEB-INF/views/lotaliaskinds/create.jspx   |   10 -
 .../WEB-INF/views/lotaliaskinds/list.jspx     |   11 -
 .../WEB-INF/views/lotaliaskinds/show.jspx     |    9 -
 .../WEB-INF/views/lotaliaskinds/update.jspx   |    9 -
 .../WEB-INF/views/lotaliaskinds/views.xml     |   16 -
 .../WEB-INF/views/lotaliastypes/create.jspx   |    9 -
 .../WEB-INF/views/lotaliastypes/list.jspx     |   10 -
 .../WEB-INF/views/lotaliastypes/show.jspx     |    8 -
 .../WEB-INF/views/lotaliastypes/update.jspx   |    8 -
 .../WEB-INF/views/lotaliastypes/views.xml     |   16 -
 .../webapp/WEB-INF/views/lots/create.jspx     |   62 -
 .../WEB-INF/views/lots/findLotsByBuid.jspx    |    8 -
 .../lots/findLotsByBulkLoadFileEquals.jspx    |    8 -
 ...dLotsByChemistAndSynthesisDateBetween.jspx |   10 -
 .../views/lots/findLotsByCorpNameEquals.jspx  |    8 -
 .../views/lots/findLotsByCorpNameLike.jspx    |    8 -
 .../views/lots/findLotsByIsVirtualNot.jspx    |    8 -
 .../lots/findLotsByNotebookPageEquals.jspx    |    8 -
 ...dLotsByNotebookPageEqualsAndIgnoreNot.jspx |    9 -
 .../views/lots/findLotsBySaltForm.jspx        |    8 -
 .../lots/findLotsBySynthesisDateBetween.jspx  |    9 -
 .../findLotsBySynthesisDateGreaterThan.jspx   |    8 -
 .../lots/findLotsBySynthesisDateLessThan.jspx |    8 -
 src/main/webapp/WEB-INF/views/lots/list.jspx  |   15 -
 src/main/webapp/WEB-INF/views/lots/show.jspx  |   59 -
 .../webapp/WEB-INF/views/lots/update.jspx     |   61 -
 src/main/webapp/WEB-INF/views/lots/views.xml  |   52 -
 .../WEB-INF/views/lsinteractions/create.jspx  |   22 -
 .../WEB-INF/views/lsinteractions/list.jspx    |   15 -
 .../WEB-INF/views/lsinteractions/show.jspx    |   20 -
 .../WEB-INF/views/lsinteractions/update.jspx  |   21 -
 .../WEB-INF/views/lsinteractions/views.xml    |   16 -
 .../webapp/WEB-INF/views/lsroles/create.jspx  |   14 -
 .../lsroles/findLsRolesByLsKindEquals.jspx    |    8 -
 .../lsroles/findLsRolesByLsTypeEquals.jspx    |    8 -
 ...dLsRolesByLsTypeEqualsAndLsKindEquals.jspx |    9 -
 ...qualsAndLsKindEqualsAndRoleNameEquals.jspx |   10 -
 ...sRolesByLsTypeEqualsAndRoleNameEquals.jspx |    9 -
 .../lsroles/findLsRolesByRoleNameEquals.jspx  |    8 -
 .../webapp/WEB-INF/views/lsroles/list.jspx    |   14 -
 .../webapp/WEB-INF/views/lsroles/show.jspx    |   12 -
 .../webapp/WEB-INF/views/lsroles/update.jspx  |   13 -
 .../webapp/WEB-INF/views/lsroles/views.xml    |   34 -
 .../webapp/WEB-INF/views/lstags/create.jspx   |   13 -
 .../lstags/findLsTagsByTagTextEquals.jspx     |    8 -
 .../views/lstags/findLsTagsByTagTextLike.jspx |    8 -
 .../webapp/WEB-INF/views/lstags/list.jspx     |   14 -
 .../webapp/WEB-INF/views/lstags/show.jspx     |   12 -
 .../webapp/WEB-INF/views/lstags/update.jspx   |   12 -
 .../webapp/WEB-INF/views/lstags/views.xml     |   22 -
 .../WEB-INF/views/lsthinglabels/create.jspx   |   23 -
 .../findLsThingLabelsByLabelTextEquals.jspx   |    8 -
 ...gLabelsByLabelTextEqualsAndIgnoredNot.jspx |    9 -
 .../findLsThingLabelsByLabelTextLike.jspx     |    8 -
 .../findLsThingLabelsByLsThing.jspx           |    8 -
 ...indLsThingLabelsByLsTransactionEquals.jspx |    8 -
 .../WEB-INF/views/lsthinglabels/list.jspx     |   15 -
 .../WEB-INF/views/lsthinglabels/show.jspx     |   22 -
 .../WEB-INF/views/lsthinglabels/update.jspx   |   22 -
 .../WEB-INF/views/lsthinglabels/views.xml     |   31 -
 .../webapp/WEB-INF/views/lsthings/create.jspx |   25 -
 .../findLsThingsByCodeNameEquals.jspx         |    8 -
 .../lsthings/findLsThingsByCodeNameLike.jspx  |    8 -
 .../lsthings/findLsThingsByLsKindEquals.jspx  |    8 -
 .../lsthings/findLsThingsByLsKindLike.jspx    |    8 -
 .../findLsThingsByLsTransactionEquals.jspx    |    8 -
 .../findLsThingsByLsTypeAndKindEquals.jspx    |    8 -
 .../lsthings/findLsThingsByLsTypeEquals.jspx  |    8 -
 ...LsThingsByLsTypeEqualsAndLsKindEquals.jspx |    9 -
 .../findLsThingsByRecordedByLike.jspx         |    8 -
 ...findLsThingsByRecordedDateGreaterThan.jspx |    8 -
 .../findLsThingsByRecordedDateLessThan.jspx   |    8 -
 .../webapp/WEB-INF/views/lsthings/list.jspx   |   15 -
 .../webapp/WEB-INF/views/lsthings/show.jspx   |   19 -
 .../webapp/WEB-INF/views/lsthings/update.jspx |   24 -
 .../webapp/WEB-INF/views/lsthings/views.xml   |   49 -
 .../WEB-INF/views/lsthingstates/create.jspx   |   21 -
 .../findLsThingStatesByLsThing.jspx           |    8 -
 ...indLsThingStatesByLsTransactionEquals.jspx |    8 -
 .../WEB-INF/views/lsthingstates/list.jspx     |   15 -
 .../WEB-INF/views/lsthingstates/show.jspx     |   19 -
 .../WEB-INF/views/lsthingstates/update.jspx   |   20 -
 .../WEB-INF/views/lsthingstates/views.xml     |   22 -
 .../WEB-INF/views/lsthingvalues/create.jspx   |   45 -
 .../findLsThingValuesByCodeValueEquals.jspx   |    8 -
 ...gValuesByIgnoredNotAndCodeValueEquals.jspx |    9 -
 ...gValuesByLsKindEqualsAndCodeValueLike.jspx |    9 -
 ...ndEqualsAndDateValueGreaterThanEquals.jspx |    9 -
 ...sKindEqualsAndDateValueLessThanEquals.jspx |    9 -
 ...gValuesByLsKindEqualsAndDateValueLike.jspx |    9 -
 ...esByLsKindEqualsAndNumericValueEquals.jspx |    9 -
 ...qualsAndNumericValueGreaterThanEquals.jspx |    9 -
 ...ndEqualsAndNumericValueLessThanEquals.jspx |    9 -
 ...uesByLsKindEqualsAndStringValueEquals.jspx |    9 -
 ...aluesByLsKindEqualsAndStringValueLike.jspx |    9 -
 .../findLsThingValuesByLsState.jspx           |    8 -
 ...indLsThingValuesByLsTransactionEquals.jspx |    8 -
 .../WEB-INF/views/lsthingvalues/list.jspx     |   15 -
 .../WEB-INF/views/lsthingvalues/show.jspx     |   44 -
 .../WEB-INF/views/lsthingvalues/update.jspx   |   44 -
 .../WEB-INF/views/lsthingvalues/views.xml     |   55 -
 .../WEB-INF/views/lstransactions/create.jspx  |   13 -
 .../WEB-INF/views/lstransactions/list.jspx    |   14 -
 .../WEB-INF/views/lstransactions/show.jspx    |   12 -
 .../WEB-INF/views/lstransactions/update.jspx  |   12 -
 .../WEB-INF/views/lstransactions/views.xml    |   16 -
 src/main/webapp/WEB-INF/views/menu.jspx       |  773 -----
 src/main/webapp/WEB-INF/views/menu.xml        |  784 -----
 .../WEB-INF/views/operatorkinds/create.jspx   |   11 -
 .../WEB-INF/views/operatorkinds/list.jspx     |   12 -
 .../WEB-INF/views/operatorkinds/show.jspx     |   10 -
 .../WEB-INF/views/operatorkinds/update.jspx   |   10 -
 .../WEB-INF/views/operatorkinds/views.xml     |   16 -
 .../WEB-INF/views/operators/create.jspx       |   10 -
 .../operators/findOperatorsByCodeEquals.jspx  |    8 -
 .../operators/findOperatorsByNameEquals.jspx  |    8 -
 .../webapp/WEB-INF/views/operators/list.jspx  |   11 -
 .../webapp/WEB-INF/views/operators/show.jspx  |    9 -
 .../WEB-INF/views/operators/update.jspx       |    9 -
 .../webapp/WEB-INF/views/operators/views.xml  |   22 -
 .../WEB-INF/views/operatortypes/create.jspx   |    9 -
 .../findOperatorTypesByTypeNameEquals.jspx    |    8 -
 .../WEB-INF/views/operatortypes/list.jspx     |   10 -
 .../WEB-INF/views/operatortypes/show.jspx     |    8 -
 .../WEB-INF/views/operatortypes/update.jspx   |    8 -
 .../WEB-INF/views/operatortypes/views.xml     |   19 -
 .../views/parentAnnotations/create.jspx       |   12 -
 .../findParentAnnotationsByCodeEquals.jspx    |    8 -
 .../WEB-INF/views/parentAnnotations/list.jspx |   13 -
 .../WEB-INF/views/parentAnnotations/show.jspx |   11 -
 .../views/parentAnnotations/update.jspx       |   11 -
 .../WEB-INF/views/parentAnnotations/views.xml |   19 -
 .../WEB-INF/views/parentaliases/create.jspx   |   16 -
 .../findParentAliasesByAliasNameEquals.jspx   |    8 -
 ...eEqualsAndLsTypeEqualsAndLsKindEquals.jspx |   10 -
 .../findParentAliasesByParent.jspx            |    8 -
 ...yParentAndLsTypeEqualsAndLsKindEquals.jspx |   10 -
 ...ualsAndLsKindEqualsAndAliasNameEquals.jspx |   11 -
 .../WEB-INF/views/parentaliases/list.jspx     |   15 -
 .../WEB-INF/views/parentaliases/show.jspx     |   15 -
 .../WEB-INF/views/parentaliases/update.jspx   |   15 -
 .../WEB-INF/views/parentaliases/views.xml     |   31 -
 .../views/parentaliaskinds/create.jspx        |   10 -
 .../WEB-INF/views/parentaliaskinds/list.jspx  |   11 -
 .../WEB-INF/views/parentaliaskinds/show.jspx  |    9 -
 .../views/parentaliaskinds/update.jspx        |    9 -
 .../WEB-INF/views/parentaliaskinds/views.xml  |   16 -
 .../views/parentaliastypes/create.jspx        |    9 -
 .../WEB-INF/views/parentaliastypes/list.jspx  |   10 -
 .../WEB-INF/views/parentaliastypes/show.jspx  |    8 -
 .../views/parentaliastypes/update.jspx        |    8 -
 .../WEB-INF/views/parentaliastypes/views.xml  |   16 -
 .../webapp/WEB-INF/views/parents/create.jspx  |   32 -
 .../findParentsByBulkLoadFileEquals.jspx      |    8 -
 .../views/parents/findParentsByCdId.jspx      |    8 -
 .../parents/findParentsByCommonNameLike.jspx  |    8 -
 .../parents/findParentsByCorpNameEquals.jspx  |    8 -
 .../parents/findParentsByCorpNameLike.jspx    |    8 -
 .../views/parents/findParentsBySaltForms.jspx |    8 -
 .../webapp/WEB-INF/views/parents/list.jspx    |   15 -
 .../webapp/WEB-INF/views/parents/show.jspx    |   29 -
 .../webapp/WEB-INF/views/parents/update.jspx  |   31 -
 .../webapp/WEB-INF/views/parents/views.xml    |   34 -
 .../WEB-INF/views/physicalstates/create.jspx  |   10 -
 .../findPhysicalStatesByCodeEquals.jspx       |    8 -
 .../findPhysicalStatesByNameEquals.jspx       |    8 -
 .../findPhysicalStatesByNameLike.jspx         |    8 -
 .../WEB-INF/views/physicalstates/list.jspx    |   11 -
 .../WEB-INF/views/physicalstates/show.jspx    |    9 -
 .../WEB-INF/views/physicalstates/update.jspx  |    9 -
 .../WEB-INF/views/physicalstates/views.xml    |   25 -
 .../views/predef_corpnames/create.jspx        |   13 -
 .../WEB-INF/views/predef_corpnames/list.jspx  |   14 -
 .../WEB-INF/views/predef_corpnames/show.jspx  |   12 -
 .../views/predef_corpnames/update.jspx        |   12 -
 .../WEB-INF/views/predef_corpnames/views.xml  |   16 -
 .../webapp/WEB-INF/views/projects/create.jspx |   10 -
 .../projects/findProjectsByCodeEquals.jspx    |    8 -
 .../projects/findProjectsByNameEquals.jspx    |    8 -
 .../webapp/WEB-INF/views/projects/list.jspx   |   11 -
 .../webapp/WEB-INF/views/projects/show.jspx   |    9 -
 .../webapp/WEB-INF/views/projects/update.jspx |    9 -
 .../webapp/WEB-INF/views/projects/views.xml   |   22 -
 .../WEB-INF/views/protocolkinds/create.jspx   |   11 -
 ...lKindsByLsTypeEqualsAndKindNameEquals.jspx |    9 -
 .../WEB-INF/views/protocolkinds/list.jspx     |   12 -
 .../WEB-INF/views/protocolkinds/show.jspx     |   10 -
 .../WEB-INF/views/protocolkinds/update.jspx   |   10 -
 .../WEB-INF/views/protocolkinds/views.xml     |   19 -
 .../WEB-INF/views/protocollabels/create.jspx  |   22 -
 ...lLabelsByLabelTextEqualsAndIgnoredNot.jspx |    9 -
 .../findProtocolLabelsByLabelTextLike.jspx    |    8 -
 ...ndProtocolLabelsByLsTransactionEquals.jspx |    8 -
 .../findProtocolLabelsByProtocol.jspx         |    8 -
 .../WEB-INF/views/protocollabels/list.jspx    |   15 -
 .../WEB-INF/views/protocollabels/show.jspx    |   21 -
 .../WEB-INF/views/protocollabels/update.jspx  |   21 -
 .../WEB-INF/views/protocollabels/views.xml    |   28 -
 .../WEB-INF/views/protocols/create.jspx       |   27 -
 .../findProtocolsByCodeNameEquals.jspx        |    8 -
 ...rotocolsByCodeNameEqualsAndIgnoredNot.jspx |    9 -
 .../findProtocolsByCodeNameLike.jspx          |    8 -
 .../protocols/findProtocolsByIgnoredNot.jspx  |    8 -
 .../findProtocolsByLsKindEquals.jspx          |    8 -
 .../protocols/findProtocolsByLsKindLike.jspx  |    8 -
 .../findProtocolsByLsTransactionEquals.jspx   |    8 -
 .../findProtocolsByLsTypeAndKindEquals.jspx   |    8 -
 .../findProtocolsByLsTypeEquals.jspx          |    8 -
 ...rotocolsByLsTypeEqualsAndLsKindEquals.jspx |    9 -
 .../protocols/findProtocolsByLsTypeLike.jspx  |    8 -
 .../findProtocolsByRecordedByLike.jspx        |    8 -
 .../webapp/WEB-INF/views/protocols/list.jspx  |   15 -
 .../webapp/WEB-INF/views/protocols/show.jspx  |   20 -
 .../WEB-INF/views/protocols/update.jspx       |   26 -
 .../webapp/WEB-INF/views/protocols/views.xml  |   52 -
 .../WEB-INF/views/protocolstates/create.jspx  |   21 -
 ...ndProtocolStatesByLsTransactionEquals.jspx |    8 -
 .../findProtocolStatesByProtocol.jspx         |    8 -
 .../WEB-INF/views/protocolstates/list.jspx    |   15 -
 .../WEB-INF/views/protocolstates/show.jspx    |   19 -
 .../WEB-INF/views/protocolstates/update.jspx  |   20 -
 .../WEB-INF/views/protocolstates/views.xml    |   22 -
 .../WEB-INF/views/protocoltypes/create.jspx   |    9 -
 .../findProtocolTypesByTypeNameEquals.jspx    |    8 -
 .../WEB-INF/views/protocoltypes/list.jspx     |   10 -
 .../WEB-INF/views/protocoltypes/show.jspx     |    8 -
 .../WEB-INF/views/protocoltypes/update.jspx   |    8 -
 .../WEB-INF/views/protocoltypes/views.xml     |   19 -
 .../WEB-INF/views/protocolvalues/create.jspx  |   45 -
 ...lValuesByLsKindEqualsAndCodeValueLike.jspx |    9 -
 ...lValuesByLsKindEqualsAndDateValueLike.jspx |    9 -
 ...aluesByLsKindEqualsAndStringValueLike.jspx |    9 -
 .../findProtocolValuesByLsState.jspx          |    8 -
 ...ndProtocolValuesByLsTransactionEquals.jspx |    8 -
 .../WEB-INF/views/protocolvalues/list.jspx    |   15 -
 .../WEB-INF/views/protocolvalues/show.jspx    |   44 -
 .../WEB-INF/views/protocolvalues/update.jspx  |   44 -
 .../WEB-INF/views/protocolvalues/views.xml    |   34 -
 .../views/puritymeasuredbys/create.jspx       |   10 -
 .../findPurityMeasuredBysByCodeEquals.jspx    |    8 -
 .../findPurityMeasuredBysByNameEquals.jspx    |    8 -
 .../findPurityMeasuredBysByNameLike.jspx      |    8 -
 .../WEB-INF/views/puritymeasuredbys/list.jspx |   11 -
 .../WEB-INF/views/puritymeasuredbys/show.jspx |    9 -
 .../views/puritymeasuredbys/update.jspx       |    9 -
 .../WEB-INF/views/puritymeasuredbys/views.xml |   25 -
 .../WEB-INF/views/resourceNotFound.jspx       |   29 -
 .../WEB-INF/views/rolekinds/create.jspx       |   11 -
 ...indRoleKindsByKindNameEqualsAndLsType.jspx |    9 -
 .../rolekinds/findRoleKindsByLsType.jspx      |    8 -
 .../webapp/WEB-INF/views/rolekinds/list.jspx  |   12 -
 .../webapp/WEB-INF/views/rolekinds/show.jspx  |   10 -
 .../WEB-INF/views/rolekinds/update.jspx       |   10 -
 .../webapp/WEB-INF/views/rolekinds/views.xml  |   22 -
 .../WEB-INF/views/roletypes/create.jspx       |    9 -
 .../findRoleTypesByTypeNameEquals.jspx        |    8 -
 .../webapp/WEB-INF/views/roletypes/list.jspx  |   10 -
 .../webapp/WEB-INF/views/roletypes/show.jspx  |    8 -
 .../WEB-INF/views/roletypes/update.jspx       |    8 -
 .../webapp/WEB-INF/views/roletypes/views.xml  |   19 -
 .../WEB-INF/views/saltformaliases/create.jspx |   15 -
 ...eEqualsAndLsTypeEqualsAndLsKindEquals.jspx |   10 -
 .../findSaltFormAliasesBySaltForm.jspx        |    8 -
 .../WEB-INF/views/saltformaliases/list.jspx   |   15 -
 .../WEB-INF/views/saltformaliases/show.jspx   |   14 -
 .../WEB-INF/views/saltformaliases/update.jspx |   14 -
 .../WEB-INF/views/saltformaliases/views.xml   |   22 -
 .../views/saltformaliaskinds/create.jspx      |   10 -
 .../views/saltformaliaskinds/list.jspx        |   11 -
 .../views/saltformaliaskinds/show.jspx        |    9 -
 .../views/saltformaliaskinds/update.jspx      |    9 -
 .../views/saltformaliaskinds/views.xml        |   16 -
 .../views/saltformaliastypes/create.jspx      |    9 -
 .../views/saltformaliastypes/list.jspx        |   10 -
 .../views/saltformaliastypes/show.jspx        |    8 -
 .../views/saltformaliastypes/update.jspx      |    8 -
 .../views/saltformaliastypes/views.xml        |   16 -
 .../WEB-INF/views/saltforms/create.jspx       |   20 -
 .../findSaltFormsByBulkLoadFileEquals.jspx    |    8 -
 .../views/saltforms/findSaltFormsByCdId.jspx  |    8 -
 .../findSaltFormsByCorpNameEquals.jspx        |    8 -
 .../findSaltFormsByCorpNameLike.jspx          |    8 -
 .../saltforms/findSaltFormsByParent.jspx      |    8 -
 .../webapp/WEB-INF/views/saltforms/list.jspx  |   15 -
 .../webapp/WEB-INF/views/saltforms/show.jspx  |   17 -
 .../WEB-INF/views/saltforms/update.jspx       |   19 -
 .../webapp/WEB-INF/views/saltforms/views.xml  |   31 -
 .../WEB-INF/views/saltloaders/create.jspx     |   16 -
 .../WEB-INF/views/saltloaders/list.jspx       |   15 -
 .../WEB-INF/views/saltloaders/show.jspx       |   15 -
 .../WEB-INF/views/saltloaders/update.jspx     |   15 -
 .../WEB-INF/views/saltloaders/views.xml       |   16 -
 .../webapp/WEB-INF/views/salts/create.jspx    |   17 -
 .../views/salts/findSaltsByAbbrevEquals.jspx  |    8 -
 .../findSaltsByAbbrevEqualsAndNameEquals.jspx |    9 -
 .../views/salts/findSaltsByAbbrevLike.jspx    |    8 -
 .../WEB-INF/views/salts/findSaltsByCdId.jspx  |    8 -
 .../views/salts/findSaltsByNameEquals.jspx    |    8 -
 src/main/webapp/WEB-INF/views/salts/list.jspx |   15 -
 src/main/webapp/WEB-INF/views/salts/show.jspx |   16 -
 .../webapp/WEB-INF/views/salts/update.jspx    |   16 -
 src/main/webapp/WEB-INF/views/salts/views.xml |   31 -
 .../WEB-INF/views/scientists/create.jspx      |   13 -
 .../findScientistsByCodeEquals.jspx           |    8 -
 .../scientists/findScientistsByCodeLike.jspx  |    8 -
 .../webapp/WEB-INF/views/scientists/list.jspx |   14 -
 .../webapp/WEB-INF/views/scientists/show.jspx |   12 -
 .../WEB-INF/views/scientists/update.jspx      |   12 -
 .../webapp/WEB-INF/views/scientists/views.xml |   22 -
 .../webapp/WEB-INF/views/signup/error.jspx    |   16 -
 .../webapp/WEB-INF/views/signup/index.jspx    |   19 -
 .../webapp/WEB-INF/views/signup/thanks.jspx   |   16 -
 .../webapp/WEB-INF/views/signup/views.xml     |   18 -
 .../WEB-INF/views/solutionunits/create.jspx   |   10 -
 .../findSolutionUnitsByCodeEquals.jspx        |    8 -
 .../findSolutionUnitsByCodeLike.jspx          |    8 -
 .../findSolutionUnitsByNameEquals.jspx        |    8 -
 .../WEB-INF/views/solutionunits/list.jspx     |   11 -
 .../WEB-INF/views/solutionunits/show.jspx     |    9 -
 .../WEB-INF/views/solutionunits/update.jspx   |    9 -
 .../WEB-INF/views/solutionunits/views.xml     |   25 -
 .../WEB-INF/views/statekinds/create.jspx      |   11 -
 .../findStateKindsByKindNameEquals.jspx       |    8 -
 ...ndStateKindsByKindNameEqualsAndLsType.jspx |    9 -
 .../statekinds/findStateKindsByLsType.jspx    |    8 -
 .../webapp/WEB-INF/views/statekinds/list.jspx |   12 -
 .../webapp/WEB-INF/views/statekinds/show.jspx |   10 -
 .../WEB-INF/views/statekinds/update.jspx      |   10 -
 .../webapp/WEB-INF/views/statekinds/views.xml |   25 -
 .../WEB-INF/views/statetypes/create.jspx      |    9 -
 .../findStateTypesByTypeNameEquals.jspx       |    8 -
 .../webapp/WEB-INF/views/statetypes/list.jspx |   10 -
 .../webapp/WEB-INF/views/statetypes/show.jspx |    8 -
 .../WEB-INF/views/statetypes/update.jspx      |    8 -
 .../webapp/WEB-INF/views/statetypes/views.xml |   19 -
 .../WEB-INF/views/stereocategorys/create.jspx |   10 -
 .../findStereoCategorysByCodeEquals.jspx      |    8 -
 .../findStereoCategorysByCodeLike.jspx        |    8 -
 .../WEB-INF/views/stereocategorys/list.jspx   |   11 -
 .../WEB-INF/views/stereocategorys/show.jspx   |    9 -
 .../WEB-INF/views/stereocategorys/update.jspx |    9 -
 .../WEB-INF/views/stereocategorys/views.xml   |   22 -
 .../WEB-INF/views/structurekinds/create.jspx  |   11 -
 .../WEB-INF/views/structurekinds/list.jspx    |   12 -
 .../WEB-INF/views/structurekinds/show.jspx    |   10 -
 .../WEB-INF/views/structurekinds/update.jspx  |   10 -
 .../WEB-INF/views/structurekinds/views.xml    |   16 -
 .../WEB-INF/views/structuretypes/create.jspx  |    9 -
 .../WEB-INF/views/structuretypes/list.jspx    |   10 -
 .../WEB-INF/views/structuretypes/show.jspx    |    8 -
 .../WEB-INF/views/structuretypes/update.jspx  |    8 -
 .../WEB-INF/views/structuretypes/views.xml    |   16 -
 .../WEB-INF/views/subjectlabels/create.jspx   |   22 -
 .../findSubjectLabelsBySubject.jspx           |    8 -
 .../WEB-INF/views/subjectlabels/list.jspx     |   15 -
 .../WEB-INF/views/subjectlabels/show.jspx     |   21 -
 .../WEB-INF/views/subjectlabels/update.jspx   |   21 -
 .../WEB-INF/views/subjectlabels/views.xml     |   19 -
 .../webapp/WEB-INF/views/subjects/create.jspx |   24 -
 .../findSubjectsByCodeNameEquals.jspx         |    8 -
 .../findSubjectsByLsTransactionEquals.jspx    |    8 -
 .../findSubjectsByTreatmentGroup.jspx         |    8 -
 .../findSubjectsByTreatmentGroups.jspx        |    8 -
 .../webapp/WEB-INF/views/subjects/list.jspx   |   15 -
 .../webapp/WEB-INF/views/subjects/show.jspx   |   19 -
 .../webapp/WEB-INF/views/subjects/update.jspx |   23 -
 .../webapp/WEB-INF/views/subjects/views.xml   |   28 -
 .../WEB-INF/views/subjectstates/create.jspx   |   21 -
 ...LsTypeEqualsAndLsKindEqualsAndSubject.jspx |   10 -
 .../findSubjectStatesBySubject.jspx           |    8 -
 .../WEB-INF/views/subjectstates/list.jspx     |   15 -
 .../WEB-INF/views/subjectstates/show.jspx     |   19 -
 .../WEB-INF/views/subjectstates/update.jspx   |   20 -
 .../WEB-INF/views/subjectstates/views.xml     |   22 -
 .../WEB-INF/views/subjectvalues/create.jspx   |   45 -
 .../findSubjectValuesByCodeValueEquals.jspx   |    8 -
 ...tValuesByIgnoredNotAndCodeValueEquals.jspx |    9 -
 .../findSubjectValuesByLsState.jspx           |    8 -
 ...LsStateAndLsTypeEqualsAndLsKindEquals.jspx |   10 -
 ...ctValuesByLsTypeEqualsAndLsKindEquals.jspx |    9 -
 .../WEB-INF/views/subjectvalues/list.jspx     |   15 -
 .../WEB-INF/views/subjectvalues/show.jspx     |   44 -
 .../WEB-INF/views/subjectvalues/update.jspx   |   44 -
 .../WEB-INF/views/subjectvalues/views.xml     |   31 -
 .../views/tempselecttables/create.jspx        |   13 -
 .../WEB-INF/views/tempselecttables/list.jspx  |   14 -
 .../WEB-INF/views/tempselecttables/show.jspx  |   12 -
 .../views/tempselecttables/update.jspx        |   12 -
 .../WEB-INF/views/tempselecttables/views.xml  |   16 -
 .../WEB-INF/views/thingkinds/create.jspx      |   11 -
 ...ndThingKindsByKindNameEqualsAndLsType.jspx |    9 -
 .../thingkinds/findThingKindsByLsType.jspx    |    8 -
 .../findThingKindsByLsTypeAndKindEquals.jspx  |    8 -
 .../webapp/WEB-INF/views/thingkinds/list.jspx |   12 -
 .../webapp/WEB-INF/views/thingkinds/show.jspx |   10 -
 .../WEB-INF/views/thingkinds/update.jspx      |   10 -
 .../webapp/WEB-INF/views/thingkinds/views.xml |   25 -
 .../views/thingpagearchives/create.jspx       |   20 -
 .../WEB-INF/views/thingpagearchives/list.jspx |   15 -
 .../WEB-INF/views/thingpagearchives/show.jspx |   19 -
 .../views/thingpagearchives/update.jspx       |   19 -
 .../WEB-INF/views/thingpagearchives/views.xml |   16 -
 .../WEB-INF/views/thingpages/create.jspx      |   19 -
 .../webapp/WEB-INF/views/thingpages/list.jspx |   15 -
 .../webapp/WEB-INF/views/thingpages/show.jspx |   18 -
 .../WEB-INF/views/thingpages/update.jspx      |   18 -
 .../webapp/WEB-INF/views/thingpages/views.xml |   16 -
 .../WEB-INF/views/thingtypes/create.jspx      |    9 -
 .../findThingTypesByTypeNameEquals.jspx       |    8 -
 .../webapp/WEB-INF/views/thingtypes/list.jspx |   10 -
 .../webapp/WEB-INF/views/thingtypes/show.jspx |    8 -
 .../WEB-INF/views/thingtypes/update.jspx      |    8 -
 .../webapp/WEB-INF/views/thingtypes/views.xml |   19 -
 .../views/treatmentgrouplabels/create.jspx    |   22 -
 ...tmentGroupLabelsByLsTransactionEquals.jspx |    8 -
 ...dTreatmentGroupLabelsByTreatmentGroup.jspx |    8 -
 .../views/treatmentgrouplabels/list.jspx      |   15 -
 .../views/treatmentgrouplabels/show.jspx      |   21 -
 .../views/treatmentgrouplabels/update.jspx    |   21 -
 .../views/treatmentgrouplabels/views.xml      |   22 -
 .../WEB-INF/views/treatmentgroups/create.jspx |   24 -
 .../findTreatmentGroupsByAnalysisGroup.jspx   |    8 -
 .../findTreatmentGroupsByAnalysisGroups.jspx  |    8 -
 .../findTreatmentGroupsByCodeNameEquals.jspx  |    8 -
 ...dTreatmentGroupsByLsTransactionEquals.jspx |    8 -
 .../WEB-INF/views/treatmentgroups/list.jspx   |   15 -
 .../WEB-INF/views/treatmentgroups/show.jspx   |   20 -
 .../WEB-INF/views/treatmentgroups/update.jspx |   23 -
 .../WEB-INF/views/treatmentgroups/views.xml   |   28 -
 .../views/treatmentgroupstates/create.jspx    |   21 -
 ...tmentGroupStatesByLsTransactionEquals.jspx |    8 -
 ...tmentGroupStatesByLsTypeAndKindEquals.jspx |    8 -
 ...dTreatmentGroupStatesByTreatmentGroup.jspx |    8 -
 .../views/treatmentgroupstates/list.jspx      |   15 -
 .../views/treatmentgroupstates/show.jspx      |   19 -
 .../views/treatmentgroupstates/update.jspx    |   20 -
 .../views/treatmentgroupstates/views.xml      |   25 -
 .../views/treatmentgroupvalues/create.jspx    |   45 -
 ...TreatmentGroupValuesByCodeValueEquals.jspx |    8 -
 ...pValuesByIgnoredNotAndCodeValueEquals.jspx |    9 -
 .../findTreatmentGroupValuesByLsState.jspx    |    8 -
 ...tmentGroupValuesByLsTransactionEquals.jspx |    8 -
 .../views/treatmentgroupvalues/list.jspx      |   15 -
 .../views/treatmentgroupvalues/show.jspx      |   44 -
 .../views/treatmentgroupvalues/update.jspx    |   44 -
 .../views/treatmentgroupvalues/views.xml      |   28 -
 .../WEB-INF/views/uncaughtException.jspx      |   29 -
 .../views/uncertaintykinds/create.jspx        |    9 -
 .../WEB-INF/views/uncertaintykinds/list.jspx  |   10 -
 .../WEB-INF/views/uncertaintykinds/show.jspx  |    8 -
 .../views/uncertaintykinds/update.jspx        |    8 -
 .../WEB-INF/views/uncertaintykinds/views.xml  |   16 -
 .../WEB-INF/views/unitkinds/create.jspx       |   11 -
 .../webapp/WEB-INF/views/unitkinds/list.jspx  |   12 -
 .../webapp/WEB-INF/views/unitkinds/show.jspx  |   10 -
 .../WEB-INF/views/unitkinds/update.jspx       |   10 -
 .../webapp/WEB-INF/views/unitkinds/views.xml  |   16 -
 .../webapp/WEB-INF/views/units/create.jspx    |   10 -
 .../views/units/findUnitsByCodeEquals.jspx    |    8 -
 .../views/units/findUnitsByCodeLike.jspx      |    8 -
 .../views/units/findUnitsByNameEquals.jspx    |    8 -
 src/main/webapp/WEB-INF/views/units/list.jspx |   11 -
 src/main/webapp/WEB-INF/views/units/show.jspx |    9 -
 .../webapp/WEB-INF/views/units/update.jspx    |    9 -
 src/main/webapp/WEB-INF/views/units/views.xml |   25 -
 .../WEB-INF/views/unittypes/create.jspx       |    9 -
 .../findUnitTypesByTypeNameEquals.jspx        |    8 -
 .../webapp/WEB-INF/views/unittypes/list.jspx  |   10 -
 .../webapp/WEB-INF/views/unittypes/show.jspx  |    8 -
 .../WEB-INF/views/unittypes/update.jspx       |    8 -
 .../webapp/WEB-INF/views/unittypes/views.xml  |   19 -
 .../WEB-INF/views/updatelogs/create.jspx      |   14 -
 .../webapp/WEB-INF/views/updatelogs/list.jspx |   15 -
 .../webapp/WEB-INF/views/updatelogs/show.jspx |   13 -
 .../WEB-INF/views/updatelogs/update.jspx      |   13 -
 .../webapp/WEB-INF/views/updatelogs/views.xml |   16 -
 .../WEB-INF/views/userroles/create.jspx       |    9 -
 .../userroles/findAuthorRolesByUserEntry.jspx |    8 -
 .../webapp/WEB-INF/views/userroles/list.jspx  |   10 -
 .../webapp/WEB-INF/views/userroles/show.jspx  |    8 -
 .../WEB-INF/views/userroles/update.jspx       |    8 -
 .../webapp/WEB-INF/views/userroles/views.xml  |   19 -
 .../webapp/WEB-INF/views/users/create.jspx    |   20 -
 src/main/webapp/WEB-INF/views/users/list.jspx |   15 -
 src/main/webapp/WEB-INF/views/users/show.jspx |   19 -
 .../webapp/WEB-INF/views/users/update.jspx    |   19 -
 src/main/webapp/WEB-INF/views/users/views.xml |   16 -
 .../WEB-INF/views/valuekinds/create.jspx      |   11 -
 ...ndValueKindsByKindNameEqualsAndLsType.jspx |    9 -
 .../valuekinds/findValueKindsByLsType.jspx    |    8 -
 .../webapp/WEB-INF/views/valuekinds/list.jspx |   12 -
 .../webapp/WEB-INF/views/valuekinds/show.jspx |   10 -
 .../WEB-INF/views/valuekinds/update.jspx      |   10 -
 .../webapp/WEB-INF/views/valuekinds/views.xml |   22 -
 .../WEB-INF/views/valuetypes/create.jspx      |    9 -
 .../findValueTypesByTypeNameEquals.jspx       |    8 -
 .../webapp/WEB-INF/views/valuetypes/list.jspx |   10 -
 .../webapp/WEB-INF/views/valuetypes/show.jspx |    8 -
 .../WEB-INF/views/valuetypes/update.jspx      |    8 -
 .../webapp/WEB-INF/views/valuetypes/views.xml |   19 -
 .../webapp/WEB-INF/views/vendors/create.jspx  |   10 -
 .../vendors/findVendorsByCodeEquals.jspx      |    8 -
 .../views/vendors/findVendorsByCodeLike.jspx  |    8 -
 .../vendors/findVendorsByNameEquals.jspx      |    8 -
 .../views/vendors/findVendorsByNameLike.jspx  |    8 -
 .../webapp/WEB-INF/views/vendors/list.jspx    |   11 -
 .../webapp/WEB-INF/views/vendors/show.jspx    |    9 -
 .../webapp/WEB-INF/views/vendors/update.jspx  |    9 -
 .../webapp/WEB-INF/views/vendors/views.xml    |   28 -
 src/main/webapp/WEB-INF/views/views.xml       |   24 -
 src/main/webapp/WEB-INF/web.xml               |    2 +-
 src/main/webapp/images/add.png                |  Bin 739 -> 0 bytes
 src/main/webapp/images/banner-graphic.png     |  Bin 13194 -> 0 bytes
 src/main/webapp/images/create.png             |  Bin 739 -> 0 bytes
 src/main/webapp/images/delete.png             |  Bin 740 -> 0 bytes
 src/main/webapp/images/en.png                 |  Bin 599 -> 0 bytes
 src/main/webapp/images/favicon.ico            |  Bin 1406 -> 0 bytes
 src/main/webapp/images/list.png               |  Bin 473 -> 0 bytes
 src/main/webapp/images/resultset_first.png    |  Bin 522 -> 0 bytes
 src/main/webapp/images/resultset_last.png     |  Bin 524 -> 0 bytes
 src/main/webapp/images/resultset_next.png     |  Bin 395 -> 0 bytes
 src/main/webapp/images/resultset_previous.png |  Bin 389 -> 0 bytes
 src/main/webapp/images/show.png               |  Bin 879 -> 0 bytes
 src/main/webapp/images/springsource-logo.png  |  Bin 4974 -> 0 bytes
 src/main/webapp/images/update.png             |  Bin 807 -> 0 bytes
 src/main/webapp/public/docs/css/reset.css     |  125 -
 src/main/webapp/public/docs/css/screen.css    | 1224 -------
 .../public/docs/images/explorer_icons.png     |  Bin 5763 -> 0 bytes
 .../webapp/public/docs/images/logo_small.png  |  Bin 770 -> 0 bytes
 .../public/docs/images/pet_store_api.png      |  Bin 824 -> 0 bytes
 .../webapp/public/docs/images/throbber.gif    |  Bin 9257 -> 0 bytes
 .../webapp/public/docs/images/wordnik_api.png |  Bin 980 -> 0 bytes
 src/main/webapp/public/docs/index.html        |  106 -
 .../webapp/public/docs/lib/backbone-min.js    |   38 -
 .../public/docs/lib/handlebars-1.0.0.js       | 2278 -------------
 .../public/docs/lib/highlight.7.3.pack.js     |    1 -
 .../public/docs/lib/jquery-1.8.0.min.js       |    2 -
 .../public/docs/lib/jquery.ba-bbq.min.js      |   18 -
 .../public/docs/lib/jquery.slideto.min.js     |    1 -
 .../public/docs/lib/jquery.wiggle.min.js      |    8 -
 .../webapp/public/docs/lib/shred.bundle.js    | 2765 ---------------
 .../webapp/public/docs/lib/shred/content.js   |  193 --
 .../webapp/public/docs/lib/swagger-client.js  | 1483 --------
 .../webapp/public/docs/lib/swagger-oauth.js   |  211 --
 src/main/webapp/public/docs/lib/swagger.js    | 1678 ----------
 .../webapp/public/docs/lib/underscore-min.js  |   32 -
 src/main/webapp/public/docs/o2c.html          |   15 -
 src/main/webapp/public/docs/swagger-ui.js     | 2670 ---------------
 src/main/webapp/public/docs/swagger-ui.min.js |    1 -
 src/main/webapp/styles/alt.css                |  369 --
 src/main/webapp/styles/standard.css           |  373 ---
 1027 files changed, 1 insertion(+), 34524 deletions(-)
 delete mode 100755 src/main/webapp/WEB-INF/i18n/application.properties
 delete mode 100755 src/main/webapp/WEB-INF/i18n/messages.properties
 delete mode 100755 src/main/webapp/WEB-INF/layouts/default.jspx
 delete mode 100755 src/main/webapp/WEB-INF/tags/form/create.tagx
 delete mode 100755 src/main/webapp/WEB-INF/tags/form/dependency.tagx
 delete mode 100755 src/main/webapp/WEB-INF/tags/form/fields/checkbox.tagx
 delete mode 100755 src/main/webapp/WEB-INF/tags/form/fields/column.tagx
 delete mode 100755 src/main/webapp/WEB-INF/tags/form/fields/datetime.tagx
 delete mode 100755 src/main/webapp/WEB-INF/tags/form/fields/display.tagx
 delete mode 100755 src/main/webapp/WEB-INF/tags/form/fields/editor.tagx
 delete mode 100755 src/main/webapp/WEB-INF/tags/form/fields/input.tagx
 delete mode 100755 src/main/webapp/WEB-INF/tags/form/fields/reference.tagx
 delete mode 100755 src/main/webapp/WEB-INF/tags/form/fields/select.tagx
 delete mode 100755 src/main/webapp/WEB-INF/tags/form/fields/simple.tagx
 delete mode 100755 src/main/webapp/WEB-INF/tags/form/fields/table.tagx
 delete mode 100755 src/main/webapp/WEB-INF/tags/form/fields/textarea.tagx
 delete mode 100755 src/main/webapp/WEB-INF/tags/form/find.tagx
 delete mode 100755 src/main/webapp/WEB-INF/tags/form/list.tagx
 delete mode 100755 src/main/webapp/WEB-INF/tags/form/show.tagx
 delete mode 100755 src/main/webapp/WEB-INF/tags/form/update.tagx
 delete mode 100755 src/main/webapp/WEB-INF/tags/menu/category.tagx
 delete mode 100644 src/main/webapp/WEB-INF/tags/menu/gvnixitem.tagx
 delete mode 100644 src/main/webapp/WEB-INF/tags/menu/gvnixmenu.tagx
 delete mode 100755 src/main/webapp/WEB-INF/tags/menu/item.tagx
 delete mode 100755 src/main/webapp/WEB-INF/tags/menu/menu.tagx
 delete mode 100755 src/main/webapp/WEB-INF/tags/util/language.tagx
 delete mode 100755 src/main/webapp/WEB-INF/tags/util/load-scripts.tagx
 delete mode 100755 src/main/webapp/WEB-INF/tags/util/pagination.tagx
 delete mode 100755 src/main/webapp/WEB-INF/tags/util/panel.tagx
 delete mode 100755 src/main/webapp/WEB-INF/tags/util/placeholder.tagx
 delete mode 100755 src/main/webapp/WEB-INF/tags/util/theme.tagx
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgrouplabels/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgrouplabels/findAnalysisGroupLabelsByAnalysisGroup.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgrouplabels/findAnalysisGroupLabelsByLsTransactionEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgrouplabels/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgrouplabels/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgrouplabels/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgrouplabels/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgroups/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgroups/findAnalysisGroupsByExperiment.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/analysisgroups/findAnalysisGroupsByExperiments.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/analysisgroups/findAnalysisGroupsByExperimentsAndIgnoredNot.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgroups/findAnalysisGroupsByLsTransactionEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgroups/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgroups/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgroups/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgroups/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgroupstates/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgroupstates/findAnalysisGroupStatesByAnalysisGroup.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/analysisgroupstates/findAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgroupstates/findAnalysisGroupStatesByLsTransactionEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgroupstates/findAnalysisGroupStatesByLsTypeAndKindEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/analysisgroupstates/findAnalysisGroupStatesByLsTypeEqualsAndLsKindEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgroupstates/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgroupstates/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgroupstates/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgroupstates/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgroupvalues/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByCodeValueEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByIgnoredNotAndCodeValueEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByLsState.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByLsTransactionEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgroupvalues/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgroupvalues/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgroupvalues/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/analysisgroupvalues/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/applicationsettings/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/applicationsettings/findApplicationSettingsByPropNameEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/applicationsettings/findApplicationSettingsByPropNameEqualsAndIgnoredNot.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/applicationsettings/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/applicationsettings/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/applicationsettings/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/applicationsettings/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/authorlabels/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/authorlabels/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/authorlabels/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/authorlabels/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/authorlabels/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/authorroles/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/authorroles/findAuthorRolesByRoleEntry.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/authorroles/findAuthorRolesByRoleEntryAndUserEntry.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/authorroles/findAuthorRolesByUserEntry.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/authorroles/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/authorroles/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/authorroles/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/authorroles/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/authors/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/authors/findAuthorsByActivationKeyAndEmailAddress.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/authors/findAuthorsByEmailAddress.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/authors/findAuthorsByUserName.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/authors/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/authors/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/authors/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/authors/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/authorstates/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/authorstates/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/authorstates/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/authorstates/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/authorstates/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/authorvalues/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/authorvalues/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/authorvalues/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/authorvalues/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/authorvalues/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/bulkloadfiles/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/bulkloadfiles/findBulkLoadFilesByFileNameEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/bulkloadfiles/findBulkLoadFilesByRecordedByEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/bulkloadfiles/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/bulkloadfiles/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/bulkloadfiles/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/bulkloadfiles/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/bulkloadtemplates/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/bulkloadtemplates/findBulkLoadTemplatesByRecordedByEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/bulkloadtemplates/findBulkLoadTemplatesByTemplateNameEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/bulkloadtemplates/findBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/bulkloadtemplates/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/bulkloadtemplates/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/bulkloadtemplates/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/bulkloadtemplates/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/changepassword/index.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/changepassword/thanks.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/changepassword/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/chemstructures/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/chemstructures/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/chemstructures/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/chemstructures/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/chemstructures/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/cmpdregappsettings/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/cmpdregappsettings/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/cmpdregappsettings/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/cmpdregappsettings/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/cmpdregappsettings/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/codekinds/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/codekinds/findCodeKindsByKindNameEqualsAndLsType.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/codekinds/findCodeKindsByLsType.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/codekinds/findCodeKindsByLsTypeAndKindEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/codekinds/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/codekinds/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/codekinds/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/codekinds/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/codeorigins/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/codeorigins/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/codeorigins/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/codeorigins/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/codeorigins/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/codetypes/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/codetypes/findCodeTypesByTypeNameEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/codetypes/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/codetypes/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/codetypes/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/codetypes/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/compoundTypes/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/compoundTypes/findCompoundTypesByCodeEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/compoundTypes/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/compoundTypes/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/compoundTypes/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/compoundTypes/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/compounds/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/compounds/findCompoundsByCdId.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/compounds/findCompoundsByExternal_idEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/compounds/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/compounds/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/compounds/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/compounds/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/containerkinds/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containerkinds/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containerkinds/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containerkinds/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containerkinds/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/containerlabels/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containerlabels/findContainerLabelsByContainerAndIgnoredNot.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containerlabels/findContainerLabelsByLabelTextEqualsAndIgnoredNot.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containerlabels/findContainerLabelsByLsTransactionEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/containerlabels/findContainerLabelsByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containerlabels/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containerlabels/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containerlabels/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containerlabels/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/containers/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containers/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containers/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containers/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containers/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/containerstates/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containerstates/findContainerStatesByContainer.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containerstates/findContainerStatesByContainerAndLsKindEqualsAndIgnoredNot.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containerstates/findContainerStatesByIgnoredNot.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containerstates/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containerstates/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containerstates/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containerstates/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/containertypes/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containertypes/findContainerTypesByTypeNameEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containertypes/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containertypes/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containertypes/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containertypes/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/containervalues/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containervalues/findContainerValuesByIgnoredNot.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containervalues/findContainerValuesByLsState.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containervalues/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containervalues/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containervalues/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/containervalues/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/corpnames/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/corpnames/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/corpnames/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/corpnames/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/corpnames/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/cronjobs/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/cronjobs/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/cronjobs/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/cronjobs/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/cronjobs/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/dataAccessFailure.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/ddictkinds/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/ddictkinds/findDDictKindsByLsTypeEqualsAndNameEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/ddictkinds/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/ddictkinds/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/ddictkinds/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/ddictkinds/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/ddicttypes/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/ddicttypes/findDDictTypesByNameEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/ddicttypes/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/ddicttypes/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/ddicttypes/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/ddicttypes/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/ddictvalues/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/ddictvalues/findDDictValuesByCodeNameEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/ddictvalues/findDDictValuesByIgnoredNot.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/ddictvalues/findDDictValuesByLabelTextLike.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/ddictvalues/findDDictValuesByLsKindEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/ddictvalues/findDDictValuesByLsTypeEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/ddictvalues/findDDictValuesByLsTypeEqualsAndLsKindEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/ddictvalues/findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/ddictvalues/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/ddictvalues/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/ddictvalues/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/ddictvalues/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/experimentkinds/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experimentkinds/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experimentkinds/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experimentkinds/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experimentkinds/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/experimentlabels/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experimentlabels/findExperimentLabelsByExperiment.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/experimentlabels/findExperimentLabelsByExperimentAndIgnoredNot.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/experimentlabels/findExperimentLabelsByLabelTextLike.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experimentlabels/findExperimentLabelsByLabelTextLikeAndLabelTypeAndKindEqualsAndPreferredNotAndIgnoredNot.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experimentlabels/findExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experimentlabels/findExperimentLabelsByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experimentlabels/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experimentlabels/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experimentlabels/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experimentlabels/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/experiments/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experiments/findExperimentsByCodeNameEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/experiments/findExperimentsByCodeNameLike.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/experiments/findExperimentsByLsKindEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/experiments/findExperimentsByLsKindLike.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experiments/findExperimentsByLsTransaction.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/experiments/findExperimentsByLsTypeEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/experiments/findExperimentsByLsTypeEqualsAndLsKindEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/experiments/findExperimentsByLsTypeLike.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experiments/findExperimentsByProtocol.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/experiments/findExperimentsByRecordedByLike.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experiments/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experiments/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experiments/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experiments/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/experimentstates/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experimentstates/findExperimentStatesByExperiment.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experimentstates/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experimentstates/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experimentstates/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experimentstates/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/experimenttypes/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experimenttypes/findExperimentTypesByTypeNameEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experimenttypes/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experimenttypes/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experimenttypes/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experimenttypes/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/experimentvalues/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/experimentvalues/findExperimentValuesByLsKindEqualsAndCodeValueLike.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/experimentvalues/findExperimentValuesByLsKindEqualsAndDateValueEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/experimentvalues/findExperimentValuesByLsKindEqualsAndDateValueLike.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/experimentvalues/findExperimentValuesByLsKindEqualsAndStringValueLike.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experimentvalues/findExperimentValuesByLsState.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experimentvalues/findExperimentValuesByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experimentvalues/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experimentvalues/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experimentvalues/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/experimentvalues/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/filelists/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/filelists/findFileListsByLot.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/filelists/findFileListsByUrlEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/filelists/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/filelists/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/filelists/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/filelists/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/filethings/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/filethings/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/filethings/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/filethings/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/filethings/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/filetypes/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/filetypes/findFileTypesByCodeEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/filetypes/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/filetypes/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/filetypes/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/filetypes/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/footer.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/forgotpassword/index.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/forgotpassword/thanks.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/forgotpassword/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/header.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/index-template.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/index.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/interactionkinds/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/interactionkinds/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/interactionkinds/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/interactionkinds/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/interactionkinds/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/interactiontypes/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/interactiontypes/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/interactiontypes/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/interactiontypes/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/interactiontypes/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/isosalts/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/isosalts/findIsoSaltsBySaltForm.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/isosalts/findIsoSaltsBySaltFormAndType.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/isosalts/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/isosalts/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/isosalts/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/isosalts/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/isotopes/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/isotopes/findIsotopesByAbbrevEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/isotopes/findIsotopesByAbbrevEqualsAndNameEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/isotopes/findIsotopesByNameEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/isotopes/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/isotopes/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/isotopes/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/isotopes/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/itxcontainercontainers/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxcontainercontainers/findItxContainerContainersByLsTransactionEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxcontainercontainers/findItxContainerContainersByLsTypeEqualsAndFirstContainerEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxcontainercontainers/findItxContainerContainersByLsTypeEqualsAndSecondContainerEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxcontainercontainers/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxcontainercontainers/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxcontainercontainers/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxcontainercontainers/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/itxcontainercontainerstates/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxcontainercontainerstates/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxcontainercontainerstates/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxcontainercontainerstates/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxcontainercontainerstates/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/itxcontainercontainervalues/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxcontainercontainervalues/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxcontainercontainervalues/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxcontainercontainervalues/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxcontainercontainervalues/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/itxexperimentexperiments/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxexperimentexperiments/findItxExperimentExperimentsByFirstExperiment.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxexperimentexperiments/findItxExperimentExperimentsByLsTransactionEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxexperimentexperiments/findItxExperimentExperimentsBySecondExperiment.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxexperimentexperiments/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxexperimentexperiments/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxexperimentexperiments/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxexperimentexperiments/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/itxexperimentexperimentstates/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxexperimentexperimentstates/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxexperimentexperimentstates/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxexperimentexperimentstates/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxexperimentexperimentstates/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/itxexperimentexperimentvalues/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxexperimentexperimentvalues/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxexperimentexperimentvalues/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxexperimentexperimentvalues/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxexperimentexperimentvalues/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/itxlsthinglsthings/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxlsthinglsthings/findItxLsThingLsThingsByCodeNameEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxlsthinglsthings/findItxLsThingLsThingsByFirstLsThing.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxlsthinglsthings/findItxLsThingLsThingsBySecondLsThing.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxlsthinglsthings/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxlsthinglsthings/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxlsthinglsthings/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxlsthinglsthings/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/itxlsthinglsthingstates/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxlsthinglsthingstates/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxlsthinglsthingstates/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxlsthinglsthingstates/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxlsthinglsthingstates/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/itxlsthinglsthingvalues/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxlsthinglsthingvalues/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxlsthinglsthingvalues/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxlsthinglsthingvalues/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxlsthinglsthingvalues/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/itxprotocolprotocols/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxprotocolprotocols/findItxProtocolProtocolsByFirstProtocol.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxprotocolprotocols/findItxProtocolProtocolsByLsTransactionEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/itxprotocolprotocols/findItxProtocolProtocolsBySecondProtocol.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxprotocolprotocols/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxprotocolprotocols/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxprotocolprotocols/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxprotocolprotocols/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/itxprotocolprotocolstates/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxprotocolprotocolstates/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxprotocolprotocolstates/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxprotocolprotocolstates/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxprotocolprotocolstates/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/itxprotocolprotocolvalues/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxprotocolprotocolvalues/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxprotocolprotocolvalues/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxprotocolprotocolvalues/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxprotocolprotocolvalues/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/itxsubjectcontainers/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxsubjectcontainers/findItxSubjectContainersByCodeNameEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxsubjectcontainers/findItxSubjectContainersByContainer.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxsubjectcontainers/findItxSubjectContainersByLsTransactionEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxsubjectcontainers/findItxSubjectContainersBySubject.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxsubjectcontainers/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxsubjectcontainers/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxsubjectcontainers/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxsubjectcontainers/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/itxsubjectcontainerstates/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxsubjectcontainerstates/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxsubjectcontainerstates/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxsubjectcontainerstates/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxsubjectcontainerstates/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/itxsubjectcontainervalues/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxsubjectcontainervalues/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxsubjectcontainervalues/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxsubjectcontainervalues/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/itxsubjectcontainervalues/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/labelkinds/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/labelkinds/findLabelKindsByKindNameEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/labelkinds/findLabelKindsByKindNameEqualsAndLsType.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/labelkinds/findLabelKindsByLsType.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/labelkinds/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/labelkinds/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/labelkinds/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/labelkinds/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/labelsequenceroles/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/labelsequenceroles/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/labelsequenceroles/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/labelsequenceroles/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/labelsequenceroles/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/labelsequences/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/labelsequences/findLabelSequencesByLabelTypeAndKindEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/labelsequences/findLabelSequencesByThingTypeAndKindEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/labelsequences/findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/labelsequences/findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/labelsequences/findLabelSequencesByThingTypeEqualsAndThingKindEqualsAndLabelTypeEqualsAndLabelKindEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/labelsequences/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/labelsequences/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/labelsequences/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/labelsequences/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/labeltypes/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/labeltypes/findLabelTypesByTypeNameEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/labeltypes/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/labeltypes/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/labeltypes/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/labeltypes/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/login.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lot/index.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lot/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/lotaliases/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lotaliases/findLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lotaliases/findLotAliasesByLot.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lotaliases/findLotAliasesByLotAndLsTypeEqualsAndLsKindEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lotaliases/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lotaliases/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lotaliases/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lotaliases/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/lotaliaskinds/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lotaliaskinds/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lotaliaskinds/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lotaliaskinds/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lotaliaskinds/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/lotaliastypes/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lotaliastypes/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lotaliastypes/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lotaliastypes/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lotaliastypes/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/lots/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lots/findLotsByBuid.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lots/findLotsByBulkLoadFileEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lots/findLotsByChemistAndSynthesisDateBetween.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lots/findLotsByCorpNameEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lots/findLotsByCorpNameLike.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lots/findLotsByIsVirtualNot.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lots/findLotsByNotebookPageEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lots/findLotsByNotebookPageEqualsAndIgnoreNot.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lots/findLotsBySaltForm.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lots/findLotsBySynthesisDateBetween.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lots/findLotsBySynthesisDateGreaterThan.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lots/findLotsBySynthesisDateLessThan.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lots/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lots/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lots/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lots/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/lsinteractions/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsinteractions/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsinteractions/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsinteractions/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsinteractions/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/lsroles/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lsroles/findLsRolesByLsKindEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lsroles/findLsRolesByLsTypeEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lsroles/findLsRolesByLsTypeEqualsAndLsKindEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lsroles/findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lsroles/findLsRolesByLsTypeEqualsAndRoleNameEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsroles/findLsRolesByRoleNameEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsroles/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsroles/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsroles/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsroles/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/lstags/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lstags/findLsTagsByTagTextEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lstags/findLsTagsByTagTextLike.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lstags/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lstags/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lstags/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lstags/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthinglabels/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthinglabels/findLsThingLabelsByLabelTextEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthinglabels/findLsThingLabelsByLabelTextEqualsAndIgnoredNot.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthinglabels/findLsThingLabelsByLabelTextLike.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthinglabels/findLsThingLabelsByLsThing.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthinglabels/findLsThingLabelsByLsTransactionEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthinglabels/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthinglabels/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthinglabels/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthinglabels/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthings/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthings/findLsThingsByCodeNameEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lsthings/findLsThingsByCodeNameLike.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lsthings/findLsThingsByLsKindEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lsthings/findLsThingsByLsKindLike.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthings/findLsThingsByLsTransactionEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthings/findLsThingsByLsTypeAndKindEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lsthings/findLsThingsByLsTypeEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lsthings/findLsThingsByLsTypeEqualsAndLsKindEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lsthings/findLsThingsByRecordedByLike.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lsthings/findLsThingsByRecordedDateGreaterThan.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lsthings/findLsThingsByRecordedDateLessThan.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthings/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthings/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthings/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthings/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthingstates/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthingstates/findLsThingStatesByLsThing.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthingstates/findLsThingStatesByLsTransactionEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthingstates/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthingstates/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthingstates/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthingstates/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthingvalues/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByCodeValueEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByIgnoredNotAndCodeValueEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndCodeValueLike.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndDateValueGreaterThanEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndDateValueLessThanEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndDateValueLike.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndNumericValueEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndNumericValueGreaterThanEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndNumericValueLessThanEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndStringValueEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndStringValueLike.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsState.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsTransactionEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthingvalues/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthingvalues/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthingvalues/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lsthingvalues/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/lstransactions/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lstransactions/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lstransactions/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lstransactions/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/lstransactions/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/menu.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/menu.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/operatorkinds/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/operatorkinds/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/operatorkinds/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/operatorkinds/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/operatorkinds/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/operators/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/operators/findOperatorsByCodeEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/operators/findOperatorsByNameEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/operators/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/operators/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/operators/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/operators/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/operatortypes/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/operatortypes/findOperatorTypesByTypeNameEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/operatortypes/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/operatortypes/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/operatortypes/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/operatortypes/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/parentAnnotations/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parentAnnotations/findParentAnnotationsByCodeEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parentAnnotations/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parentAnnotations/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parentAnnotations/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parentAnnotations/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/parentaliases/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parentaliases/findParentAliasesByAliasNameEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parentaliases/findParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parentaliases/findParentAliasesByParent.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parentaliases/findParentAliasesByParentAndLsTypeEqualsAndLsKindEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parentaliases/findParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parentaliases/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parentaliases/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parentaliases/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parentaliases/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/parentaliaskinds/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parentaliaskinds/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parentaliaskinds/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parentaliaskinds/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parentaliaskinds/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/parentaliastypes/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parentaliastypes/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parentaliastypes/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parentaliastypes/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parentaliastypes/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/parents/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parents/findParentsByBulkLoadFileEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parents/findParentsByCdId.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parents/findParentsByCommonNameLike.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parents/findParentsByCorpNameEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parents/findParentsByCorpNameLike.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parents/findParentsBySaltForms.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parents/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parents/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parents/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/parents/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/physicalstates/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/physicalstates/findPhysicalStatesByCodeEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/physicalstates/findPhysicalStatesByNameEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/physicalstates/findPhysicalStatesByNameLike.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/physicalstates/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/physicalstates/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/physicalstates/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/physicalstates/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/predef_corpnames/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/predef_corpnames/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/predef_corpnames/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/predef_corpnames/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/predef_corpnames/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/projects/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/projects/findProjectsByCodeEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/projects/findProjectsByNameEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/projects/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/projects/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/projects/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/projects/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/protocolkinds/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/protocolkinds/findProtocolKindsByLsTypeEqualsAndKindNameEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocolkinds/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocolkinds/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocolkinds/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocolkinds/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/protocollabels/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocollabels/findProtocolLabelsByLabelTextEqualsAndIgnoredNot.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocollabels/findProtocolLabelsByLabelTextLike.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocollabels/findProtocolLabelsByLsTransactionEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocollabels/findProtocolLabelsByProtocol.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocollabels/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocollabels/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocollabels/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocollabels/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/protocols/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocols/findProtocolsByCodeNameEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/protocols/findProtocolsByCodeNameEqualsAndIgnoredNot.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/protocols/findProtocolsByCodeNameLike.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocols/findProtocolsByIgnoredNot.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocols/findProtocolsByLsKindEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/protocols/findProtocolsByLsKindLike.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocols/findProtocolsByLsTransactionEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocols/findProtocolsByLsTypeAndKindEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocols/findProtocolsByLsTypeEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocols/findProtocolsByLsTypeEqualsAndLsKindEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/protocols/findProtocolsByLsTypeLike.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/protocols/findProtocolsByRecordedByLike.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocols/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocols/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocols/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocols/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/protocolstates/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocolstates/findProtocolStatesByLsTransactionEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocolstates/findProtocolStatesByProtocol.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocolstates/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocolstates/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocolstates/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocolstates/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/protocoltypes/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocoltypes/findProtocolTypesByTypeNameEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocoltypes/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocoltypes/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocoltypes/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocoltypes/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/protocolvalues/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/protocolvalues/findProtocolValuesByLsKindEqualsAndCodeValueLike.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/protocolvalues/findProtocolValuesByLsKindEqualsAndDateValueLike.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/protocolvalues/findProtocolValuesByLsKindEqualsAndStringValueLike.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocolvalues/findProtocolValuesByLsState.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocolvalues/findProtocolValuesByLsTransactionEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocolvalues/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocolvalues/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocolvalues/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/protocolvalues/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/puritymeasuredbys/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/puritymeasuredbys/findPurityMeasuredBysByCodeEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/puritymeasuredbys/findPurityMeasuredBysByNameEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/puritymeasuredbys/findPurityMeasuredBysByNameLike.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/puritymeasuredbys/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/puritymeasuredbys/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/puritymeasuredbys/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/puritymeasuredbys/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/resourceNotFound.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/rolekinds/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/rolekinds/findRoleKindsByKindNameEqualsAndLsType.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/rolekinds/findRoleKindsByLsType.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/rolekinds/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/rolekinds/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/rolekinds/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/rolekinds/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/roletypes/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/roletypes/findRoleTypesByTypeNameEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/roletypes/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/roletypes/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/roletypes/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/roletypes/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/saltformaliases/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/saltformaliases/findSaltFormAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/saltformaliases/findSaltFormAliasesBySaltForm.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/saltformaliases/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/saltformaliases/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/saltformaliases/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/saltformaliases/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/saltformaliaskinds/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/saltformaliaskinds/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/saltformaliaskinds/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/saltformaliaskinds/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/saltformaliaskinds/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/saltformaliastypes/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/saltformaliastypes/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/saltformaliastypes/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/saltformaliastypes/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/saltformaliastypes/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/saltforms/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/saltforms/findSaltFormsByBulkLoadFileEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/saltforms/findSaltFormsByCdId.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/saltforms/findSaltFormsByCorpNameEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/saltforms/findSaltFormsByCorpNameLike.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/saltforms/findSaltFormsByParent.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/saltforms/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/saltforms/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/saltforms/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/saltforms/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/saltloaders/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/saltloaders/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/saltloaders/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/saltloaders/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/saltloaders/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/salts/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/salts/findSaltsByAbbrevEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/salts/findSaltsByAbbrevEqualsAndNameEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/salts/findSaltsByAbbrevLike.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/salts/findSaltsByCdId.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/salts/findSaltsByNameEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/salts/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/salts/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/salts/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/salts/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/scientists/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/scientists/findScientistsByCodeEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/scientists/findScientistsByCodeLike.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/scientists/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/scientists/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/scientists/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/scientists/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/signup/error.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/signup/index.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/signup/thanks.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/signup/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/solutionunits/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/solutionunits/findSolutionUnitsByCodeEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/solutionunits/findSolutionUnitsByCodeLike.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/solutionunits/findSolutionUnitsByNameEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/solutionunits/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/solutionunits/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/solutionunits/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/solutionunits/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/statekinds/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/statekinds/findStateKindsByKindNameEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/statekinds/findStateKindsByKindNameEqualsAndLsType.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/statekinds/findStateKindsByLsType.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/statekinds/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/statekinds/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/statekinds/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/statekinds/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/statetypes/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/statetypes/findStateTypesByTypeNameEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/statetypes/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/statetypes/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/statetypes/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/statetypes/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/stereocategorys/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/stereocategorys/findStereoCategorysByCodeEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/stereocategorys/findStereoCategorysByCodeLike.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/stereocategorys/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/stereocategorys/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/stereocategorys/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/stereocategorys/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/structurekinds/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/structurekinds/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/structurekinds/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/structurekinds/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/structurekinds/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/structuretypes/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/structuretypes/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/structuretypes/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/structuretypes/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/structuretypes/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/subjectlabels/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/subjectlabels/findSubjectLabelsBySubject.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/subjectlabels/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/subjectlabels/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/subjectlabels/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/subjectlabels/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/subjects/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/subjects/findSubjectsByCodeNameEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/subjects/findSubjectsByLsTransactionEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/subjects/findSubjectsByTreatmentGroup.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/subjects/findSubjectsByTreatmentGroups.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/subjects/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/subjects/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/subjects/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/subjects/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/subjectstates/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/subjectstates/findSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/subjectstates/findSubjectStatesBySubject.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/subjectstates/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/subjectstates/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/subjectstates/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/subjectstates/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/subjectvalues/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/subjectvalues/findSubjectValuesByCodeValueEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/subjectvalues/findSubjectValuesByIgnoredNotAndCodeValueEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/subjectvalues/findSubjectValuesByLsState.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/subjectvalues/findSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/subjectvalues/findSubjectValuesByLsTypeEqualsAndLsKindEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/subjectvalues/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/subjectvalues/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/subjectvalues/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/subjectvalues/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/tempselecttables/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/tempselecttables/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/tempselecttables/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/tempselecttables/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/tempselecttables/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/thingkinds/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/thingkinds/findThingKindsByKindNameEqualsAndLsType.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/thingkinds/findThingKindsByLsType.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/thingkinds/findThingKindsByLsTypeAndKindEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/thingkinds/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/thingkinds/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/thingkinds/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/thingkinds/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/thingpagearchives/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/thingpagearchives/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/thingpagearchives/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/thingpagearchives/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/thingpagearchives/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/thingpages/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/thingpages/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/thingpages/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/thingpages/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/thingpages/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/thingtypes/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/thingtypes/findThingTypesByTypeNameEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/thingtypes/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/thingtypes/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/thingtypes/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/thingtypes/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgrouplabels/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgrouplabels/findTreatmentGroupLabelsByLsTransactionEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgrouplabels/findTreatmentGroupLabelsByTreatmentGroup.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgrouplabels/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgrouplabels/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgrouplabels/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgrouplabels/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgroups/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgroups/findTreatmentGroupsByAnalysisGroup.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/treatmentgroups/findTreatmentGroupsByAnalysisGroups.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/treatmentgroups/findTreatmentGroupsByCodeNameEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgroups/findTreatmentGroupsByLsTransactionEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgroups/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgroups/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgroups/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgroups/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgroupstates/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgroupstates/findTreatmentGroupStatesByLsTransactionEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgroupstates/findTreatmentGroupStatesByLsTypeAndKindEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgroupstates/findTreatmentGroupStatesByTreatmentGroup.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgroupstates/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgroupstates/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgroupstates/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgroupstates/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgroupvalues/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgroupvalues/findTreatmentGroupValuesByCodeValueEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgroupvalues/findTreatmentGroupValuesByIgnoredNotAndCodeValueEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgroupvalues/findTreatmentGroupValuesByLsState.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgroupvalues/findTreatmentGroupValuesByLsTransactionEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgroupvalues/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgroupvalues/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgroupvalues/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/treatmentgroupvalues/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/uncaughtException.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/uncertaintykinds/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/uncertaintykinds/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/uncertaintykinds/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/uncertaintykinds/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/uncertaintykinds/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/unitkinds/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/unitkinds/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/unitkinds/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/unitkinds/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/unitkinds/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/units/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/units/findUnitsByCodeEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/units/findUnitsByCodeLike.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/units/findUnitsByNameEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/units/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/units/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/units/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/units/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/unittypes/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/unittypes/findUnitTypesByTypeNameEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/unittypes/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/unittypes/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/unittypes/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/unittypes/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/updatelogs/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/updatelogs/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/updatelogs/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/updatelogs/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/updatelogs/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/userroles/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/userroles/findAuthorRolesByUserEntry.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/userroles/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/userroles/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/userroles/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/userroles/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/users/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/users/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/users/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/users/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/users/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/valuekinds/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/valuekinds/findValueKindsByKindNameEqualsAndLsType.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/valuekinds/findValueKindsByLsType.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/valuekinds/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/valuekinds/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/valuekinds/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/valuekinds/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/valuetypes/create.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/valuetypes/findValueTypesByTypeNameEquals.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/valuetypes/list.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/valuetypes/show.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/valuetypes/update.jspx
 delete mode 100755 src/main/webapp/WEB-INF/views/valuetypes/views.xml
 delete mode 100644 src/main/webapp/WEB-INF/views/vendors/create.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/vendors/findVendorsByCodeEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/vendors/findVendorsByCodeLike.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/vendors/findVendorsByNameEquals.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/vendors/findVendorsByNameLike.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/vendors/list.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/vendors/show.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/vendors/update.jspx
 delete mode 100644 src/main/webapp/WEB-INF/views/vendors/views.xml
 delete mode 100755 src/main/webapp/WEB-INF/views/views.xml
 delete mode 100755 src/main/webapp/images/add.png
 delete mode 100755 src/main/webapp/images/banner-graphic.png
 delete mode 100755 src/main/webapp/images/create.png
 delete mode 100755 src/main/webapp/images/delete.png
 delete mode 100755 src/main/webapp/images/en.png
 delete mode 100755 src/main/webapp/images/favicon.ico
 delete mode 100755 src/main/webapp/images/list.png
 delete mode 100755 src/main/webapp/images/resultset_first.png
 delete mode 100755 src/main/webapp/images/resultset_last.png
 delete mode 100755 src/main/webapp/images/resultset_next.png
 delete mode 100755 src/main/webapp/images/resultset_previous.png
 delete mode 100755 src/main/webapp/images/show.png
 delete mode 100755 src/main/webapp/images/springsource-logo.png
 delete mode 100755 src/main/webapp/images/update.png
 delete mode 100644 src/main/webapp/public/docs/css/reset.css
 delete mode 100644 src/main/webapp/public/docs/css/screen.css
 delete mode 100644 src/main/webapp/public/docs/images/explorer_icons.png
 delete mode 100644 src/main/webapp/public/docs/images/logo_small.png
 delete mode 100644 src/main/webapp/public/docs/images/pet_store_api.png
 delete mode 100644 src/main/webapp/public/docs/images/throbber.gif
 delete mode 100644 src/main/webapp/public/docs/images/wordnik_api.png
 delete mode 100644 src/main/webapp/public/docs/index.html
 delete mode 100644 src/main/webapp/public/docs/lib/backbone-min.js
 delete mode 100644 src/main/webapp/public/docs/lib/handlebars-1.0.0.js
 delete mode 100644 src/main/webapp/public/docs/lib/highlight.7.3.pack.js
 delete mode 100644 src/main/webapp/public/docs/lib/jquery-1.8.0.min.js
 delete mode 100644 src/main/webapp/public/docs/lib/jquery.ba-bbq.min.js
 delete mode 100644 src/main/webapp/public/docs/lib/jquery.slideto.min.js
 delete mode 100644 src/main/webapp/public/docs/lib/jquery.wiggle.min.js
 delete mode 100644 src/main/webapp/public/docs/lib/shred.bundle.js
 delete mode 100644 src/main/webapp/public/docs/lib/shred/content.js
 delete mode 100644 src/main/webapp/public/docs/lib/swagger-client.js
 delete mode 100644 src/main/webapp/public/docs/lib/swagger-oauth.js
 delete mode 100644 src/main/webapp/public/docs/lib/swagger.js
 delete mode 100644 src/main/webapp/public/docs/lib/underscore-min.js
 delete mode 100644 src/main/webapp/public/docs/o2c.html
 delete mode 100644 src/main/webapp/public/docs/swagger-ui.js
 delete mode 100644 src/main/webapp/public/docs/swagger-ui.min.js
 delete mode 100755 src/main/webapp/styles/alt.css
 delete mode 100755 src/main/webapp/styles/standard.css

diff --git a/src/main/webapp/WEB-INF/i18n/application.properties b/src/main/webapp/WEB-INF/i18n/application.properties
deleted file mode 100755
index 690606f15..000000000
--- a/src/main/webapp/WEB-INF/i18n/application.properties
+++ /dev/null
@@ -1,2975 +0,0 @@
-#Updated at Wed Feb 05 15:34:03 PST 2020
-#Wed Feb 05 15:34:03 PST 2020
-application_name=ACAS
-label_com_labsynch_labseer_domain_analysisgroup=Analysis Group
-label_com_labsynch_labseer_domain_analysisgroup_analysisgrouplabels=Analysis Group Labels
-label_com_labsynch_labseer_domain_analysisgroup_analysisgroups=Analysis Groups
-label_com_labsynch_labseer_domain_analysisgroup_analysisgroupstates=Analysis Group States
-label_com_labsynch_labseer_domain_analysisgroup_codename=Code Name
-label_com_labsynch_labseer_domain_analysisgroup_deleted=Deleted
-label_com_labsynch_labseer_domain_analysisgroup_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_analysisgroup_experiment=Experiment
-label_com_labsynch_labseer_domain_analysisgroup_experiments=Experiments
-label_com_labsynch_labseer_domain_analysisgroup_id=Id
-label_com_labsynch_labseer_domain_analysisgroup_ignored=Ignored
-label_com_labsynch_labseer_domain_analysisgroup_includeignored=Include Ignored
-label_com_labsynch_labseer_domain_analysisgroup_kind=Kind
-label_com_labsynch_labseer_domain_analysisgroup_lskind=Ls Kind
-label_com_labsynch_labseer_domain_analysisgroup_lslabels=Ls Labels
-label_com_labsynch_labseer_domain_analysisgroup_lsstates=Ls States
-label_com_labsynch_labseer_domain_analysisgroup_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_analysisgroup_lstype=Ls Type
-label_com_labsynch_labseer_domain_analysisgroup_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_analysisgroup_modifiedby=Modified By
-label_com_labsynch_labseer_domain_analysisgroup_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_analysisgroup_plural=Analysis Groups
-label_com_labsynch_labseer_domain_analysisgroup_recordedby=Recorded By
-label_com_labsynch_labseer_domain_analysisgroup_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_analysisgroup_thingpage=Thing Page
-label_com_labsynch_labseer_domain_analysisgroup_treatmentgroups=Treatment Groups
-label_com_labsynch_labseer_domain_analysisgroup_version=Version
-label_com_labsynch_labseer_domain_analysisgrouplabel=Analysis Group Label
-label_com_labsynch_labseer_domain_analysisgrouplabel_analysisgroup=Analysis Group
-label_com_labsynch_labseer_domain_analysisgrouplabel_deleted=Deleted
-label_com_labsynch_labseer_domain_analysisgrouplabel_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_analysisgrouplabel_experiment=Experiment
-label_com_labsynch_labseer_domain_analysisgrouplabel_id=Id
-label_com_labsynch_labseer_domain_analysisgrouplabel_ignored=Ignored
-label_com_labsynch_labseer_domain_analysisgrouplabel_imagefile=Image File
-label_com_labsynch_labseer_domain_analysisgrouplabel_imgagefile=Imgage File
-label_com_labsynch_labseer_domain_analysisgrouplabel_labelkind=Label Kind
-label_com_labsynch_labseer_domain_analysisgrouplabel_labeltext=Label Text
-label_com_labsynch_labseer_domain_analysisgrouplabel_labeltype=Label Type
-label_com_labsynch_labseer_domain_analysisgrouplabel_labeltypeandkind=Label Type And Kind
-label_com_labsynch_labseer_domain_analysisgrouplabel_labelvalue=Label Value
-label_com_labsynch_labseer_domain_analysisgrouplabel_lskind=Ls Kind
-label_com_labsynch_labseer_domain_analysisgrouplabel_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_analysisgrouplabel_lstype=Ls Type
-label_com_labsynch_labseer_domain_analysisgrouplabel_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_analysisgrouplabel_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_analysisgrouplabel_physicallylabled=Physically Labled
-label_com_labsynch_labseer_domain_analysisgrouplabel_plural=Analysis Group Labels
-label_com_labsynch_labseer_domain_analysisgrouplabel_preferred=Preferred
-label_com_labsynch_labseer_domain_analysisgrouplabel_recordedby=Recorded By
-label_com_labsynch_labseer_domain_analysisgrouplabel_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_analysisgrouplabel_version=Version
-label_com_labsynch_labseer_domain_analysisgroupstate=Analysis Group State
-label_com_labsynch_labseer_domain_analysisgroupstate_analysisgroup=Analysis Group
-label_com_labsynch_labseer_domain_analysisgroupstate_analysisgroupvalues=Analysis Group Values
-label_com_labsynch_labseer_domain_analysisgroupstate_blah=Blah
-label_com_labsynch_labseer_domain_analysisgroupstate_comments=Comments
-label_com_labsynch_labseer_domain_analysisgroupstate_deleted=Deleted
-label_com_labsynch_labseer_domain_analysisgroupstate_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_analysisgroupstate_id=Id
-label_com_labsynch_labseer_domain_analysisgroupstate_ignored=Ignored
-label_com_labsynch_labseer_domain_analysisgroupstate_lskind=Ls Kind
-label_com_labsynch_labseer_domain_analysisgroupstate_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_analysisgroupstate_lstype=Ls Type
-label_com_labsynch_labseer_domain_analysisgroupstate_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_analysisgroupstate_lsvalues=Ls Values
-label_com_labsynch_labseer_domain_analysisgroupstate_modifiedby=Modified By
-label_com_labsynch_labseer_domain_analysisgroupstate_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_analysisgroupstate_plural=Analysis Group States
-label_com_labsynch_labseer_domain_analysisgroupstate_recordedby=Recorded By
-label_com_labsynch_labseer_domain_analysisgroupstate_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_analysisgroupstate_statekind=State Kind
-label_com_labsynch_labseer_domain_analysisgroupstate_statetype=State Type
-label_com_labsynch_labseer_domain_analysisgroupstate_statetypeandkind=State Type And Kind
-label_com_labsynch_labseer_domain_analysisgroupstate_version=Version
-label_com_labsynch_labseer_domain_analysisgroupvalue=Analysis Group Value
-label_com_labsynch_labseer_domain_analysisgroupvalue_analysisgroupstate=Analysis Group State
-label_com_labsynch_labseer_domain_analysisgroupvalue_batchcode=Batch Code
-label_com_labsynch_labseer_domain_analysisgroupvalue_blobvalue=Blob Value
-label_com_labsynch_labseer_domain_analysisgroupvalue_clobvalue=Clob Value
-label_com_labsynch_labseer_domain_analysisgroupvalue_codekind=Code Kind
-label_com_labsynch_labseer_domain_analysisgroupvalue_codeorigin=Code Origin
-label_com_labsynch_labseer_domain_analysisgroupvalue_codetype=Code Type
-label_com_labsynch_labseer_domain_analysisgroupvalue_codetypeandkind=Code Type And Kind
-label_com_labsynch_labseer_domain_analysisgroupvalue_codevalue=Code Value
-label_com_labsynch_labseer_domain_analysisgroupvalue_comments=Comments
-label_com_labsynch_labseer_domain_analysisgroupvalue_concentration=Concentration
-label_com_labsynch_labseer_domain_analysisgroupvalue_concunit=Conc Unit
-label_com_labsynch_labseer_domain_analysisgroupvalue_concvalue=Conc Value
-label_com_labsynch_labseer_domain_analysisgroupvalue_datevalue=Date Value
-label_com_labsynch_labseer_domain_analysisgroupvalue_deleted=Deleted
-label_com_labsynch_labseer_domain_analysisgroupvalue_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_analysisgroupvalue_filevalue=File Value
-label_com_labsynch_labseer_domain_analysisgroupvalue_id=Id
-label_com_labsynch_labseer_domain_analysisgroupvalue_ignored=Ignored
-label_com_labsynch_labseer_domain_analysisgroupvalue_lskind=Ls Kind
-label_com_labsynch_labseer_domain_analysisgroupvalue_lsstate=Ls State
-label_com_labsynch_labseer_domain_analysisgroupvalue_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_analysisgroupvalue_lstype=Ls Type
-label_com_labsynch_labseer_domain_analysisgroupvalue_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_analysisgroupvalue_modifiedby=Modified By
-label_com_labsynch_labseer_domain_analysisgroupvalue_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_analysisgroupvalue_numberofreplicates=Number Of Replicates
-label_com_labsynch_labseer_domain_analysisgroupvalue_numericvalue=Numeric Value
-label_com_labsynch_labseer_domain_analysisgroupvalue_operatorkind=Operator Kind
-label_com_labsynch_labseer_domain_analysisgroupvalue_operatortype=Operator Type
-label_com_labsynch_labseer_domain_analysisgroupvalue_operatortypeandkind=Operator Type And Kind
-label_com_labsynch_labseer_domain_analysisgroupvalue_plural=Analysis Group Values
-label_com_labsynch_labseer_domain_analysisgroupvalue_propertiesutilservice=Properties Util Service
-label_com_labsynch_labseer_domain_analysisgroupvalue_publicdata=Public Data
-label_com_labsynch_labseer_domain_analysisgroupvalue_recordedby=Recorded By
-label_com_labsynch_labseer_domain_analysisgroupvalue_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_analysisgroupvalue_sigfigs=Sig Figs
-label_com_labsynch_labseer_domain_analysisgroupvalue_stringvalue=String Value
-label_com_labsynch_labseer_domain_analysisgroupvalue_uncertainty=Uncertainty
-label_com_labsynch_labseer_domain_analysisgroupvalue_uncertaintytype=Uncertainty Type
-label_com_labsynch_labseer_domain_analysisgroupvalue_unitkind=Unit Kind
-label_com_labsynch_labseer_domain_analysisgroupvalue_unittype=Unit Type
-label_com_labsynch_labseer_domain_analysisgroupvalue_unittypeandkind=Unit Type And Kind
-label_com_labsynch_labseer_domain_analysisgroupvalue_urlvalue=Url Value
-label_com_labsynch_labseer_domain_analysisgroupvalue_valuekind=Value Kind
-label_com_labsynch_labseer_domain_analysisgroupvalue_valueoperator=Value Operator
-label_com_labsynch_labseer_domain_analysisgroupvalue_valuetype=Value Type
-label_com_labsynch_labseer_domain_analysisgroupvalue_valuetypeandkind=Value Type And Kind
-label_com_labsynch_labseer_domain_analysisgroupvalue_valueunit=Value Unit
-label_com_labsynch_labseer_domain_analysisgroupvalue_version=Version
-label_com_labsynch_labseer_domain_applicationsetting=Application Setting
-label_com_labsynch_labseer_domain_applicationsetting_comments=Comments
-label_com_labsynch_labseer_domain_applicationsetting_id=Id
-label_com_labsynch_labseer_domain_applicationsetting_ignored=Ignored
-label_com_labsynch_labseer_domain_applicationsetting_plural=Application Settings
-label_com_labsynch_labseer_domain_applicationsetting_propname=Prop Name
-label_com_labsynch_labseer_domain_applicationsetting_propvalue=Prop Value
-label_com_labsynch_labseer_domain_applicationsetting_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_applicationsetting_version=Version
-label_com_labsynch_labseer_domain_author=Author
-label_com_labsynch_labseer_domain_author_activationdate=Activation Date
-label_com_labsynch_labseer_domain_author_activationkey=Activation Key
-label_com_labsynch_labseer_domain_author_authorroles=Author Roles
-label_com_labsynch_labseer_domain_author_codename=Code Name
-label_com_labsynch_labseer_domain_author_deleted=Deleted
-label_com_labsynch_labseer_domain_author_email=Email
-label_com_labsynch_labseer_domain_author_emailaddress=Email Address
-label_com_labsynch_labseer_domain_author_enabled=Enabled
-label_com_labsynch_labseer_domain_author_firstname=First Name
-label_com_labsynch_labseer_domain_author_id=Id
-label_com_labsynch_labseer_domain_author_ignored=Ignored
-label_com_labsynch_labseer_domain_author_isadmin=Is Admin
-label_com_labsynch_labseer_domain_author_lastname=Last Name
-label_com_labsynch_labseer_domain_author_locked=Locked
-label_com_labsynch_labseer_domain_author_lskind=Ls Kind
-label_com_labsynch_labseer_domain_author_lslabels=Ls Labels
-label_com_labsynch_labseer_domain_author_lsstates=Ls States
-label_com_labsynch_labseer_domain_author_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_author_lstype=Ls Type
-label_com_labsynch_labseer_domain_author_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_author_middlename=Middle Name
-label_com_labsynch_labseer_domain_author_modifiedby=Modified By
-label_com_labsynch_labseer_domain_author_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_author_password=Password
-label_com_labsynch_labseer_domain_author_plural=Authors
-label_com_labsynch_labseer_domain_author_recordedby=Recorded By
-label_com_labsynch_labseer_domain_author_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_author_thingpage=Thing Page
-label_com_labsynch_labseer_domain_author_username=User Name
-label_com_labsynch_labseer_domain_author_version=Version
-label_com_labsynch_labseer_domain_authorlabel=Author Label
-label_com_labsynch_labseer_domain_authorlabel_author=Author
-label_com_labsynch_labseer_domain_authorlabel_deleted=Deleted
-label_com_labsynch_labseer_domain_authorlabel_id=Id
-label_com_labsynch_labseer_domain_authorlabel_ignored=Ignored
-label_com_labsynch_labseer_domain_authorlabel_imagefile=Image File
-label_com_labsynch_labseer_domain_authorlabel_labeltext=Label Text
-label_com_labsynch_labseer_domain_authorlabel_lskind=Ls Kind
-label_com_labsynch_labseer_domain_authorlabel_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_authorlabel_lstype=Ls Type
-label_com_labsynch_labseer_domain_authorlabel_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_authorlabel_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_authorlabel_physicallylabled=Physically Labled
-label_com_labsynch_labseer_domain_authorlabel_plural=Author Labels
-label_com_labsynch_labseer_domain_authorlabel_preferred=Preferred
-label_com_labsynch_labseer_domain_authorlabel_recordedby=Recorded By
-label_com_labsynch_labseer_domain_authorlabel_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_authorlabel_version=Version
-label_com_labsynch_labseer_domain_authorold=Author Old
-label_com_labsynch_labseer_domain_authorold_email=Email
-label_com_labsynch_labseer_domain_authorold_firstname=First Name
-label_com_labsynch_labseer_domain_authorold_id=Id
-label_com_labsynch_labseer_domain_authorold_ignored=Ignored
-label_com_labsynch_labseer_domain_authorold_lastname=Last Name
-label_com_labsynch_labseer_domain_authorold_middlename=Middle Name
-label_com_labsynch_labseer_domain_authorold_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_authorold_password=Password
-label_com_labsynch_labseer_domain_authorold_plural=Author Olds
-label_com_labsynch_labseer_domain_authorold_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_authorold_username=User Name
-label_com_labsynch_labseer_domain_authorold_version=Version
-label_com_labsynch_labseer_domain_authorrole=Author Role
-label_com_labsynch_labseer_domain_authorrole_author=Author
-label_com_labsynch_labseer_domain_authorrole_comments=Comments
-label_com_labsynch_labseer_domain_authorrole_description=Description
-label_com_labsynch_labseer_domain_authorrole_id=Id
-label_com_labsynch_labseer_domain_authorrole_plural=Author Roles
-label_com_labsynch_labseer_domain_authorrole_roleentry=Role Entry
-label_com_labsynch_labseer_domain_authorrole_userentry=User Entry
-label_com_labsynch_labseer_domain_authorrole_username=User Name
-label_com_labsynch_labseer_domain_authorrole_userrole=User Role
-label_com_labsynch_labseer_domain_authorrole_version=Version
-label_com_labsynch_labseer_domain_authorstate=Author State
-label_com_labsynch_labseer_domain_authorstate_author=Author
-label_com_labsynch_labseer_domain_authorstate_comments=Comments
-label_com_labsynch_labseer_domain_authorstate_deleted=Deleted
-label_com_labsynch_labseer_domain_authorstate_id=Id
-label_com_labsynch_labseer_domain_authorstate_ignored=Ignored
-label_com_labsynch_labseer_domain_authorstate_lskind=Ls Kind
-label_com_labsynch_labseer_domain_authorstate_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_authorstate_lstype=Ls Type
-label_com_labsynch_labseer_domain_authorstate_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_authorstate_lsvalues=Ls Values
-label_com_labsynch_labseer_domain_authorstate_modifiedby=Modified By
-label_com_labsynch_labseer_domain_authorstate_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_authorstate_plural=Author States
-label_com_labsynch_labseer_domain_authorstate_recordedby=Recorded By
-label_com_labsynch_labseer_domain_authorstate_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_authorstate_version=Version
-label_com_labsynch_labseer_domain_authorvalue=Author Value
-label_com_labsynch_labseer_domain_authorvalue_blobvalue=Blob Value
-label_com_labsynch_labseer_domain_authorvalue_clobvalue=Clob Value
-label_com_labsynch_labseer_domain_authorvalue_codekind=Code Kind
-label_com_labsynch_labseer_domain_authorvalue_codeorigin=Code Origin
-label_com_labsynch_labseer_domain_authorvalue_codetype=Code Type
-label_com_labsynch_labseer_domain_authorvalue_codetypeandkind=Code Type And Kind
-label_com_labsynch_labseer_domain_authorvalue_codevalue=Code Value
-label_com_labsynch_labseer_domain_authorvalue_comments=Comments
-label_com_labsynch_labseer_domain_authorvalue_concentration=Concentration
-label_com_labsynch_labseer_domain_authorvalue_concunit=Conc Unit
-label_com_labsynch_labseer_domain_authorvalue_datevalue=Date Value
-label_com_labsynch_labseer_domain_authorvalue_deleted=Deleted
-label_com_labsynch_labseer_domain_authorvalue_filevalue=File Value
-label_com_labsynch_labseer_domain_authorvalue_id=Id
-label_com_labsynch_labseer_domain_authorvalue_ignored=Ignored
-label_com_labsynch_labseer_domain_authorvalue_lskind=Ls Kind
-label_com_labsynch_labseer_domain_authorvalue_lsstate=Ls State
-label_com_labsynch_labseer_domain_authorvalue_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_authorvalue_lstype=Ls Type
-label_com_labsynch_labseer_domain_authorvalue_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_authorvalue_modifiedby=Modified By
-label_com_labsynch_labseer_domain_authorvalue_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_authorvalue_numberofreplicates=Number Of Replicates
-label_com_labsynch_labseer_domain_authorvalue_numericvalue=Numeric Value
-label_com_labsynch_labseer_domain_authorvalue_operatorkind=Operator Kind
-label_com_labsynch_labseer_domain_authorvalue_operatortype=Operator Type
-label_com_labsynch_labseer_domain_authorvalue_operatortypeandkind=Operator Type And Kind
-label_com_labsynch_labseer_domain_authorvalue_plural=Author Values
-label_com_labsynch_labseer_domain_authorvalue_publicdata=Public Data
-label_com_labsynch_labseer_domain_authorvalue_recordedby=Recorded By
-label_com_labsynch_labseer_domain_authorvalue_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_authorvalue_sigfigs=Sig Figs
-label_com_labsynch_labseer_domain_authorvalue_stringvalue=String Value
-label_com_labsynch_labseer_domain_authorvalue_uncertainty=Uncertainty
-label_com_labsynch_labseer_domain_authorvalue_uncertaintytype=Uncertainty Type
-label_com_labsynch_labseer_domain_authorvalue_unitkind=Unit Kind
-label_com_labsynch_labseer_domain_authorvalue_unittype=Unit Type
-label_com_labsynch_labseer_domain_authorvalue_unittypeandkind=Unit Type And Kind
-label_com_labsynch_labseer_domain_authorvalue_urlvalue=Url Value
-label_com_labsynch_labseer_domain_authorvalue_version=Version
-label_com_labsynch_labseer_domain_bulkloadfile=Bulk Load File
-label_com_labsynch_labseer_domain_bulkloadfile_filedate=File Date
-label_com_labsynch_labseer_domain_bulkloadfile_filename=File Name
-label_com_labsynch_labseer_domain_bulkloadfile_filesize=File Size
-label_com_labsynch_labseer_domain_bulkloadfile_id=Id
-label_com_labsynch_labseer_domain_bulkloadfile_jsontemplate=Json Template
-label_com_labsynch_labseer_domain_bulkloadfile_numberofmols=Number Of Mols
-label_com_labsynch_labseer_domain_bulkloadfile_plural=Bulk Load Files
-label_com_labsynch_labseer_domain_bulkloadfile_recordedby=Recorded By
-label_com_labsynch_labseer_domain_bulkloadfile_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_bulkloadfile_version=Version
-label_com_labsynch_labseer_domain_bulkloadtemplate=Bulk Load Template
-label_com_labsynch_labseer_domain_bulkloadtemplate_id=Id
-label_com_labsynch_labseer_domain_bulkloadtemplate_ignored=Ignored
-label_com_labsynch_labseer_domain_bulkloadtemplate_jsontemplate=Json Template
-label_com_labsynch_labseer_domain_bulkloadtemplate_plural=Bulk Load Templates
-label_com_labsynch_labseer_domain_bulkloadtemplate_recordedby=Recorded By
-label_com_labsynch_labseer_domain_bulkloadtemplate_templatename=Template Name
-label_com_labsynch_labseer_domain_bulkloadtemplate_version=Version
-label_com_labsynch_labseer_domain_chemstructure=Chem Structure
-label_com_labsynch_labseer_domain_chemstructure_codename=Code Name
-label_com_labsynch_labseer_domain_chemstructure_deleted=Deleted
-label_com_labsynch_labseer_domain_chemstructure_id=Id
-label_com_labsynch_labseer_domain_chemstructure_ignored=Ignored
-label_com_labsynch_labseer_domain_chemstructure_lskind=Ls Kind
-label_com_labsynch_labseer_domain_chemstructure_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_chemstructure_lstype=Ls Type
-label_com_labsynch_labseer_domain_chemstructure_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_chemstructure_modifiedby=Modified By
-label_com_labsynch_labseer_domain_chemstructure_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_chemstructure_molstructure=Mol Structure
-label_com_labsynch_labseer_domain_chemstructure_plural=Chem Structures
-label_com_labsynch_labseer_domain_chemstructure_recordedby=Recorded By
-label_com_labsynch_labseer_domain_chemstructure_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_chemstructure_smiles=Smiles
-label_com_labsynch_labseer_domain_chemstructure_version=Version
-label_com_labsynch_labseer_domain_cmpdregappsetting=Cmpd Reg App Setting
-label_com_labsynch_labseer_domain_cmpdregappsetting_comments=Comments
-label_com_labsynch_labseer_domain_cmpdregappsetting_id=Id
-label_com_labsynch_labseer_domain_cmpdregappsetting_ignored=Ignored
-label_com_labsynch_labseer_domain_cmpdregappsetting_plural=Cmpd Reg App Settings
-label_com_labsynch_labseer_domain_cmpdregappsetting_propname=Prop Name
-label_com_labsynch_labseer_domain_cmpdregappsetting_propvalue=Prop Value
-label_com_labsynch_labseer_domain_cmpdregappsetting_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_cmpdregappsetting_version=Version
-label_com_labsynch_labseer_domain_codekind=Code Kind
-label_com_labsynch_labseer_domain_codekind_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_codekind_id=Id
-label_com_labsynch_labseer_domain_codekind_kindname=Kind Name
-label_com_labsynch_labseer_domain_codekind_lstype=Ls Type
-label_com_labsynch_labseer_domain_codekind_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_codekind_plural=Code Kinds
-label_com_labsynch_labseer_domain_codekind_version=Version
-label_com_labsynch_labseer_domain_codeorigin=Code Origin
-label_com_labsynch_labseer_domain_codeorigin_id=Id
-label_com_labsynch_labseer_domain_codeorigin_name=Name
-label_com_labsynch_labseer_domain_codeorigin_plural=Code Origins
-label_com_labsynch_labseer_domain_codeorigin_version=Version
-label_com_labsynch_labseer_domain_codetype=Code Type
-label_com_labsynch_labseer_domain_codetype_id=Id
-label_com_labsynch_labseer_domain_codetype_plural=Code Types
-label_com_labsynch_labseer_domain_codetype_typename=Type Name
-label_com_labsynch_labseer_domain_codetype_version=Version
-label_com_labsynch_labseer_domain_compound=Compound
-label_com_labsynch_labseer_domain_compound_cdid=Cd Id
-label_com_labsynch_labseer_domain_compound_corpname=Corp Name
-label_com_labsynch_labseer_domain_compound_createddate=Created Date
-label_com_labsynch_labseer_domain_compound_deleted=Deleted
-label_com_labsynch_labseer_domain_compound_external_id=External_id
-label_com_labsynch_labseer_domain_compound_id=Id
-label_com_labsynch_labseer_domain_compound_ignored=Ignored
-label_com_labsynch_labseer_domain_compound_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_compound_plural=Compounds
-label_com_labsynch_labseer_domain_compound_version=Version
-label_com_labsynch_labseer_domain_compoundtype=Compound Type
-label_com_labsynch_labseer_domain_compoundtype_code=Code
-label_com_labsynch_labseer_domain_compoundtype_comment=Comment
-label_com_labsynch_labseer_domain_compoundtype_displayorder=Display Order
-label_com_labsynch_labseer_domain_compoundtype_id=Id
-label_com_labsynch_labseer_domain_compoundtype_name=Name
-label_com_labsynch_labseer_domain_compoundtype_plural=Compound Types
-label_com_labsynch_labseer_domain_compoundtype_version=Version
-label_com_labsynch_labseer_domain_container=Container
-label_com_labsynch_labseer_domain_container_codename=Code Name
-label_com_labsynch_labseer_domain_container_columnindex=Column Index
-label_com_labsynch_labseer_domain_container_containerkind=Container Kind
-label_com_labsynch_labseer_domain_container_containerlabels=Container Labels
-label_com_labsynch_labseer_domain_container_containerstates=Container States
-label_com_labsynch_labseer_domain_container_containertype=Container Type
-label_com_labsynch_labseer_domain_container_containertypeandkind=Container Type And Kind
-label_com_labsynch_labseer_domain_container_containtertype=Containter Type
-label_com_labsynch_labseer_domain_container_deleted=Deleted
-label_com_labsynch_labseer_domain_container_description=Description
-label_com_labsynch_labseer_domain_container_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_container_firstcontainers=First Containers
-label_com_labsynch_labseer_domain_container_id=Id
-label_com_labsynch_labseer_domain_container_ignored=Ignored
-label_com_labsynch_labseer_domain_container_kind=Kind
-label_com_labsynch_labseer_domain_container_location=Location
-label_com_labsynch_labseer_domain_container_locationid=Location Id
-label_com_labsynch_labseer_domain_container_lskind=Ls Kind
-label_com_labsynch_labseer_domain_container_lslabels=Ls Labels
-label_com_labsynch_labseer_domain_container_lsstates=Ls States
-label_com_labsynch_labseer_domain_container_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_container_lstype=Ls Type
-label_com_labsynch_labseer_domain_container_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_container_modifiedby=Modified By
-label_com_labsynch_labseer_domain_container_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_container_name=Name
-label_com_labsynch_labseer_domain_container_plural=Containers
-label_com_labsynch_labseer_domain_container_recordedby=Recorded By
-label_com_labsynch_labseer_domain_container_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_container_rowindex=Row Index
-label_com_labsynch_labseer_domain_container_secondcontainers=Second Containers
-label_com_labsynch_labseer_domain_container_subjects=Subjects
-label_com_labsynch_labseer_domain_container_thingpage=Thing Page
-label_com_labsynch_labseer_domain_container_version=Version
-label_com_labsynch_labseer_domain_containerkind=Container Kind
-label_com_labsynch_labseer_domain_containerkind_containertype=Container Type
-label_com_labsynch_labseer_domain_containerkind_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_containerkind_id=Id
-label_com_labsynch_labseer_domain_containerkind_kindname=Kind Name
-label_com_labsynch_labseer_domain_containerkind_lstype=Ls Type
-label_com_labsynch_labseer_domain_containerkind_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_containerkind_plural=Container Kinds
-label_com_labsynch_labseer_domain_containerkind_typeandkind=Type And Kind
-label_com_labsynch_labseer_domain_containerkind_version=Version
-label_com_labsynch_labseer_domain_containerlabel=Container Label
-label_com_labsynch_labseer_domain_containerlabel_container=Container
-label_com_labsynch_labseer_domain_containerlabel_deleted=Deleted
-label_com_labsynch_labseer_domain_containerlabel_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_containerlabel_id=Id
-label_com_labsynch_labseer_domain_containerlabel_ignored=Ignored
-label_com_labsynch_labseer_domain_containerlabel_imagefile=Image File
-label_com_labsynch_labseer_domain_containerlabel_imgagefile=Imgage File
-label_com_labsynch_labseer_domain_containerlabel_labelkind=Label Kind
-label_com_labsynch_labseer_domain_containerlabel_labeltext=Label Text
-label_com_labsynch_labseer_domain_containerlabel_labeltype=Label Type
-label_com_labsynch_labseer_domain_containerlabel_labeltypeandkind=Label Type And Kind
-label_com_labsynch_labseer_domain_containerlabel_labelvalue=Label Value
-label_com_labsynch_labseer_domain_containerlabel_lskind=Ls Kind
-label_com_labsynch_labseer_domain_containerlabel_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_containerlabel_lstype=Ls Type
-label_com_labsynch_labseer_domain_containerlabel_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_containerlabel_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_containerlabel_physicallylabled=Physically Labled
-label_com_labsynch_labseer_domain_containerlabel_plural=Container Labels
-label_com_labsynch_labseer_domain_containerlabel_preferred=Preferred
-label_com_labsynch_labseer_domain_containerlabel_recordedby=Recorded By
-label_com_labsynch_labseer_domain_containerlabel_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_containerlabel_version=Version
-label_com_labsynch_labseer_domain_containerstate=Container State
-label_com_labsynch_labseer_domain_containerstate_comments=Comments
-label_com_labsynch_labseer_domain_containerstate_container=Container
-label_com_labsynch_labseer_domain_containerstate_containervalues=Container Values
-label_com_labsynch_labseer_domain_containerstate_deleted=Deleted
-label_com_labsynch_labseer_domain_containerstate_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_containerstate_id=Id
-label_com_labsynch_labseer_domain_containerstate_ignored=Ignored
-label_com_labsynch_labseer_domain_containerstate_lskind=Ls Kind
-label_com_labsynch_labseer_domain_containerstate_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_containerstate_lstype=Ls Type
-label_com_labsynch_labseer_domain_containerstate_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_containerstate_lsvalues=Ls Values
-label_com_labsynch_labseer_domain_containerstate_modifiedby=Modified By
-label_com_labsynch_labseer_domain_containerstate_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_containerstate_plural=Container States
-label_com_labsynch_labseer_domain_containerstate_recordedby=Recorded By
-label_com_labsynch_labseer_domain_containerstate_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_containerstate_statekind=State Kind
-label_com_labsynch_labseer_domain_containerstate_statetype=State Type
-label_com_labsynch_labseer_domain_containerstate_statetypeandkind=State Type And Kind
-label_com_labsynch_labseer_domain_containerstate_version=Version
-label_com_labsynch_labseer_domain_containertype=Container Type
-label_com_labsynch_labseer_domain_containertype_id=Id
-label_com_labsynch_labseer_domain_containertype_plural=Container Types
-label_com_labsynch_labseer_domain_containertype_typename=Type Name
-label_com_labsynch_labseer_domain_containertype_version=Version
-label_com_labsynch_labseer_domain_containervalue=Container Value
-label_com_labsynch_labseer_domain_containervalue_batchcode=Batch Code
-label_com_labsynch_labseer_domain_containervalue_blobvalue=Blob Value
-label_com_labsynch_labseer_domain_containervalue_clobvalue=Clob Value
-label_com_labsynch_labseer_domain_containervalue_codekind=Code Kind
-label_com_labsynch_labseer_domain_containervalue_codeorigin=Code Origin
-label_com_labsynch_labseer_domain_containervalue_codetype=Code Type
-label_com_labsynch_labseer_domain_containervalue_codetypeandkind=Code Type And Kind
-label_com_labsynch_labseer_domain_containervalue_codevalue=Code Value
-label_com_labsynch_labseer_domain_containervalue_comments=Comments
-label_com_labsynch_labseer_domain_containervalue_concentration=Concentration
-label_com_labsynch_labseer_domain_containervalue_concunit=Conc Unit
-label_com_labsynch_labseer_domain_containervalue_concvalue=Conc Value
-label_com_labsynch_labseer_domain_containervalue_containerstate=Container State
-label_com_labsynch_labseer_domain_containervalue_datevalue=Date Value
-label_com_labsynch_labseer_domain_containervalue_deleted=Deleted
-label_com_labsynch_labseer_domain_containervalue_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_containervalue_filevalue=File Value
-label_com_labsynch_labseer_domain_containervalue_id=Id
-label_com_labsynch_labseer_domain_containervalue_ignored=Ignored
-label_com_labsynch_labseer_domain_containervalue_lskind=Ls Kind
-label_com_labsynch_labseer_domain_containervalue_lsstate=Ls State
-label_com_labsynch_labseer_domain_containervalue_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_containervalue_lstype=Ls Type
-label_com_labsynch_labseer_domain_containervalue_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_containervalue_maxresults=Max Results
-label_com_labsynch_labseer_domain_containervalue_modifiedby=Modified By
-label_com_labsynch_labseer_domain_containervalue_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_containervalue_numberofreplicates=Number Of Replicates
-label_com_labsynch_labseer_domain_containervalue_numericvalue=Numeric Value
-label_com_labsynch_labseer_domain_containervalue_operatorkind=Operator Kind
-label_com_labsynch_labseer_domain_containervalue_operatortype=Operator Type
-label_com_labsynch_labseer_domain_containervalue_operatortypeandkind=Operator Type And Kind
-label_com_labsynch_labseer_domain_containervalue_plural=Container Values
-label_com_labsynch_labseer_domain_containervalue_propertiesutilservice=Properties Util Service
-label_com_labsynch_labseer_domain_containervalue_publicdata=Public Data
-label_com_labsynch_labseer_domain_containervalue_recordedby=Recorded By
-label_com_labsynch_labseer_domain_containervalue_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_containervalue_sigfigs=Sig Figs
-label_com_labsynch_labseer_domain_containervalue_stringvalue=String Value
-label_com_labsynch_labseer_domain_containervalue_uncertainty=Uncertainty
-label_com_labsynch_labseer_domain_containervalue_uncertaintytype=Uncertainty Type
-label_com_labsynch_labseer_domain_containervalue_unitkind=Unit Kind
-label_com_labsynch_labseer_domain_containervalue_unittype=Unit Type
-label_com_labsynch_labseer_domain_containervalue_unittypeandkind=Unit Type And Kind
-label_com_labsynch_labseer_domain_containervalue_urlvalue=Url Value
-label_com_labsynch_labseer_domain_containervalue_valuekind=Value Kind
-label_com_labsynch_labseer_domain_containervalue_valueoperator=Value Operator
-label_com_labsynch_labseer_domain_containervalue_valuetype=Value Type
-label_com_labsynch_labseer_domain_containervalue_valuetypeandkind=Value Type And Kind
-label_com_labsynch_labseer_domain_containervalue_valueunit=Value Unit
-label_com_labsynch_labseer_domain_containervalue_version=Version
-label_com_labsynch_labseer_domain_corpname=Corp Name
-label_com_labsynch_labseer_domain_corpname_comment=Comment
-label_com_labsynch_labseer_domain_corpname_id=Id
-label_com_labsynch_labseer_domain_corpname_ignore=Ignore
-label_com_labsynch_labseer_domain_corpname_parentcorpname=Parent Corp Name
-label_com_labsynch_labseer_domain_corpname_plural=Corp Names
-label_com_labsynch_labseer_domain_corpname_version=Version
-label_com_labsynch_labseer_domain_cronjob=Cron Job
-label_com_labsynch_labseer_domain_cronjob_active=Active
-label_com_labsynch_labseer_domain_cronjob_codename=Code Name
-label_com_labsynch_labseer_domain_cronjob_functionname=Function Name
-label_com_labsynch_labseer_domain_cronjob_id=Id
-label_com_labsynch_labseer_domain_cronjob_ignored=Ignored
-label_com_labsynch_labseer_domain_cronjob_lastduration=Last Duration
-label_com_labsynch_labseer_domain_cronjob_lastresultjson=Last Result J S O N
-label_com_labsynch_labseer_domain_cronjob_laststarttime=Last Start Time
-label_com_labsynch_labseer_domain_cronjob_numberofexecutions=Number Of Executions
-label_com_labsynch_labseer_domain_cronjob_plural=Cron Jobs
-label_com_labsynch_labseer_domain_cronjob_runuser=Run User
-label_com_labsynch_labseer_domain_cronjob_schedule=Schedule
-label_com_labsynch_labseer_domain_cronjob_scriptfile=Script File
-label_com_labsynch_labseer_domain_cronjob_scriptjsondata=Script J S O N Data
-label_com_labsynch_labseer_domain_cronjob_scripttype=Script Type
-label_com_labsynch_labseer_domain_cronjob_version=Version
-label_com_labsynch_labseer_domain_ddictkind=D Dict Kind
-label_com_labsynch_labseer_domain_ddictkind_comments=Comments
-label_com_labsynch_labseer_domain_ddictkind_description=Description
-label_com_labsynch_labseer_domain_ddictkind_displayorder=Display Order
-label_com_labsynch_labseer_domain_ddictkind_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_ddictkind_id=Id
-label_com_labsynch_labseer_domain_ddictkind_ignored=Ignored
-label_com_labsynch_labseer_domain_ddictkind_lstype=Ls Type
-label_com_labsynch_labseer_domain_ddictkind_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_ddictkind_name=Name
-label_com_labsynch_labseer_domain_ddictkind_plural=D Dict Kinds
-label_com_labsynch_labseer_domain_ddictkind_version=Version
-label_com_labsynch_labseer_domain_ddicttype=D Dict Type
-label_com_labsynch_labseer_domain_ddicttype_comments=Comments
-label_com_labsynch_labseer_domain_ddicttype_description=Description
-label_com_labsynch_labseer_domain_ddicttype_displayorder=Display Order
-label_com_labsynch_labseer_domain_ddicttype_id=Id
-label_com_labsynch_labseer_domain_ddicttype_ignored=Ignored
-label_com_labsynch_labseer_domain_ddicttype_name=Name
-label_com_labsynch_labseer_domain_ddicttype_plural=D Dict Types
-label_com_labsynch_labseer_domain_ddicttype_version=Version
-label_com_labsynch_labseer_domain_ddictvalue=D Dict Value
-label_com_labsynch_labseer_domain_ddictvalue_codename=Code Name
-label_com_labsynch_labseer_domain_ddictvalue_comments=Comments
-label_com_labsynch_labseer_domain_ddictvalue_description=Description
-label_com_labsynch_labseer_domain_ddictvalue_displayorder=Display Order
-label_com_labsynch_labseer_domain_ddictvalue_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_ddictvalue_id=Id
-label_com_labsynch_labseer_domain_ddictvalue_ignored=Ignored
-label_com_labsynch_labseer_domain_ddictvalue_labeltext=Label Text
-label_com_labsynch_labseer_domain_ddictvalue_lskind=Ls Kind
-label_com_labsynch_labseer_domain_ddictvalue_lstype=Ls Type
-label_com_labsynch_labseer_domain_ddictvalue_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_ddictvalue_lsvalue=Ls Value
-label_com_labsynch_labseer_domain_ddictvalue_plural=D Dict Values
-label_com_labsynch_labseer_domain_ddictvalue_shortname=Short Name
-label_com_labsynch_labseer_domain_ddictvalue_version=Version
-label_com_labsynch_labseer_domain_experiment=Experiment
-label_com_labsynch_labseer_domain_experiment_analysisgroups=Analysis Groups
-label_com_labsynch_labseer_domain_experiment_codename=Code Name
-label_com_labsynch_labseer_domain_experiment_deleted=Deleted
-label_com_labsynch_labseer_domain_experiment_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_experiment_experimentkind=Experiment Kind
-label_com_labsynch_labseer_domain_experiment_experimentlabels=Experiment Labels
-label_com_labsynch_labseer_domain_experiment_experimentstates=Experiment States
-label_com_labsynch_labseer_domain_experiment_experimenttype=Experiment Type
-label_com_labsynch_labseer_domain_experiment_experimenttypeandkind=Experiment Type And Kind
-label_com_labsynch_labseer_domain_experiment_firstexperiments=First Experiments
-label_com_labsynch_labseer_domain_experiment_id=Id
-label_com_labsynch_labseer_domain_experiment_ignored=Ignored
-label_com_labsynch_labseer_domain_experiment_kind=Kind
-label_com_labsynch_labseer_domain_experiment_lskind=Ls Kind
-label_com_labsynch_labseer_domain_experiment_lslabels=Ls Labels
-label_com_labsynch_labseer_domain_experiment_lsstates=Ls States
-label_com_labsynch_labseer_domain_experiment_lstags=Ls Tags
-label_com_labsynch_labseer_domain_experiment_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_experiment_lstype=Ls Type
-label_com_labsynch_labseer_domain_experiment_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_experiment_modifiedby=Modified By
-label_com_labsynch_labseer_domain_experiment_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_experiment_plural=Experiments
-label_com_labsynch_labseer_domain_experiment_protocol=Protocol
-label_com_labsynch_labseer_domain_experiment_protocolkind=Protocol Kind
-label_com_labsynch_labseer_domain_experiment_protocoltype=Protocol Type
-label_com_labsynch_labseer_domain_experiment_protocoltypeandkind=Protocol Type And Kind
-label_com_labsynch_labseer_domain_experiment_recordedby=Recorded By
-label_com_labsynch_labseer_domain_experiment_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_experiment_secondexperiments=Second Experiments
-label_com_labsynch_labseer_domain_experiment_shortdescription=Short Description
-label_com_labsynch_labseer_domain_experiment_thingpage=Thing Page
-label_com_labsynch_labseer_domain_experiment_version=Version
-label_com_labsynch_labseer_domain_experimentkind=Experiment Kind
-label_com_labsynch_labseer_domain_experimentkind_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_experimentkind_id=Id
-label_com_labsynch_labseer_domain_experimentkind_kindname=Kind Name
-label_com_labsynch_labseer_domain_experimentkind_lstype=Ls Type
-label_com_labsynch_labseer_domain_experimentkind_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_experimentkind_plural=Experiment Kinds
-label_com_labsynch_labseer_domain_experimentkind_version=Version
-label_com_labsynch_labseer_domain_experimentlabel=Experiment Label
-label_com_labsynch_labseer_domain_experimentlabel_deleted=Deleted
-label_com_labsynch_labseer_domain_experimentlabel_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_experimentlabel_experiment=Experiment
-label_com_labsynch_labseer_domain_experimentlabel_id=Id
-label_com_labsynch_labseer_domain_experimentlabel_ignored=Ignored
-label_com_labsynch_labseer_domain_experimentlabel_imagefile=Image File
-label_com_labsynch_labseer_domain_experimentlabel_imgagefile=Imgage File
-label_com_labsynch_labseer_domain_experimentlabel_labelkind=Label Kind
-label_com_labsynch_labseer_domain_experimentlabel_labeltext=Label Text
-label_com_labsynch_labseer_domain_experimentlabel_labeltype=Label Type
-label_com_labsynch_labseer_domain_experimentlabel_labeltypeandkind=Label Type And Kind
-label_com_labsynch_labseer_domain_experimentlabel_labelvalue=Label Value
-label_com_labsynch_labseer_domain_experimentlabel_lskind=Ls Kind
-label_com_labsynch_labseer_domain_experimentlabel_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_experimentlabel_lstype=Ls Type
-label_com_labsynch_labseer_domain_experimentlabel_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_experimentlabel_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_experimentlabel_physicallylabled=Physically Labled
-label_com_labsynch_labseer_domain_experimentlabel_plural=Experiment Labels
-label_com_labsynch_labseer_domain_experimentlabel_preferred=Preferred
-label_com_labsynch_labseer_domain_experimentlabel_protocol=Protocol
-label_com_labsynch_labseer_domain_experimentlabel_recordedby=Recorded By
-label_com_labsynch_labseer_domain_experimentlabel_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_experimentlabel_version=Version
-label_com_labsynch_labseer_domain_experimentstate=Experiment State
-label_com_labsynch_labseer_domain_experimentstate_comments=Comments
-label_com_labsynch_labseer_domain_experimentstate_deleted=Deleted
-label_com_labsynch_labseer_domain_experimentstate_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_experimentstate_experiment=Experiment
-label_com_labsynch_labseer_domain_experimentstate_experimentvalues=Experiment Values
-label_com_labsynch_labseer_domain_experimentstate_id=Id
-label_com_labsynch_labseer_domain_experimentstate_ignored=Ignored
-label_com_labsynch_labseer_domain_experimentstate_lskind=Ls Kind
-label_com_labsynch_labseer_domain_experimentstate_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_experimentstate_lstype=Ls Type
-label_com_labsynch_labseer_domain_experimentstate_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_experimentstate_lsvalues=Ls Values
-label_com_labsynch_labseer_domain_experimentstate_modifiedby=Modified By
-label_com_labsynch_labseer_domain_experimentstate_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_experimentstate_plural=Experiment States
-label_com_labsynch_labseer_domain_experimentstate_recordedby=Recorded By
-label_com_labsynch_labseer_domain_experimentstate_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_experimentstate_statekind=State Kind
-label_com_labsynch_labseer_domain_experimentstate_statetype=State Type
-label_com_labsynch_labseer_domain_experimentstate_statetypeandkind=State Type And Kind
-label_com_labsynch_labseer_domain_experimentstate_version=Version
-label_com_labsynch_labseer_domain_experimenttype=Experiment Type
-label_com_labsynch_labseer_domain_experimenttype_id=Id
-label_com_labsynch_labseer_domain_experimenttype_plural=Experiment Types
-label_com_labsynch_labseer_domain_experimenttype_typename=Type Name
-label_com_labsynch_labseer_domain_experimenttype_version=Version
-label_com_labsynch_labseer_domain_experimentvalue=Experiment Value
-label_com_labsynch_labseer_domain_experimentvalue_batchcode=Batch Code
-label_com_labsynch_labseer_domain_experimentvalue_blobvalue=Blob Value
-label_com_labsynch_labseer_domain_experimentvalue_clobvalue=Clob Value
-label_com_labsynch_labseer_domain_experimentvalue_codekind=Code Kind
-label_com_labsynch_labseer_domain_experimentvalue_codeorigin=Code Origin
-label_com_labsynch_labseer_domain_experimentvalue_codetype=Code Type
-label_com_labsynch_labseer_domain_experimentvalue_codetypeandkind=Code Type And Kind
-label_com_labsynch_labseer_domain_experimentvalue_codevalue=Code Value
-label_com_labsynch_labseer_domain_experimentvalue_comments=Comments
-label_com_labsynch_labseer_domain_experimentvalue_concentration=Concentration
-label_com_labsynch_labseer_domain_experimentvalue_concunit=Conc Unit
-label_com_labsynch_labseer_domain_experimentvalue_concvalue=Conc Value
-label_com_labsynch_labseer_domain_experimentvalue_datevalue=Date Value
-label_com_labsynch_labseer_domain_experimentvalue_deleted=Deleted
-label_com_labsynch_labseer_domain_experimentvalue_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_experimentvalue_experimentstate=Experiment State
-label_com_labsynch_labseer_domain_experimentvalue_filevalue=File Value
-label_com_labsynch_labseer_domain_experimentvalue_id=Id
-label_com_labsynch_labseer_domain_experimentvalue_ignored=Ignored
-label_com_labsynch_labseer_domain_experimentvalue_lskind=Ls Kind
-label_com_labsynch_labseer_domain_experimentvalue_lsstate=Ls State
-label_com_labsynch_labseer_domain_experimentvalue_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_experimentvalue_lstype=Ls Type
-label_com_labsynch_labseer_domain_experimentvalue_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_experimentvalue_modifiedby=Modified By
-label_com_labsynch_labseer_domain_experimentvalue_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_experimentvalue_numberofreplicates=Number Of Replicates
-label_com_labsynch_labseer_domain_experimentvalue_numericvalue=Numeric Value
-label_com_labsynch_labseer_domain_experimentvalue_operatorkind=Operator Kind
-label_com_labsynch_labseer_domain_experimentvalue_operatortype=Operator Type
-label_com_labsynch_labseer_domain_experimentvalue_operatortypeandkind=Operator Type And Kind
-label_com_labsynch_labseer_domain_experimentvalue_plural=Experiment Values
-label_com_labsynch_labseer_domain_experimentvalue_publicdata=Public Data
-label_com_labsynch_labseer_domain_experimentvalue_recordedby=Recorded By
-label_com_labsynch_labseer_domain_experimentvalue_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_experimentvalue_sigfigs=Sig Figs
-label_com_labsynch_labseer_domain_experimentvalue_stringvalue=String Value
-label_com_labsynch_labseer_domain_experimentvalue_uncertainty=Uncertainty
-label_com_labsynch_labseer_domain_experimentvalue_uncertaintytype=Uncertainty Type
-label_com_labsynch_labseer_domain_experimentvalue_unitkind=Unit Kind
-label_com_labsynch_labseer_domain_experimentvalue_unittype=Unit Type
-label_com_labsynch_labseer_domain_experimentvalue_unittypeandkind=Unit Type And Kind
-label_com_labsynch_labseer_domain_experimentvalue_urlvalue=Url Value
-label_com_labsynch_labseer_domain_experimentvalue_valuekind=Value Kind
-label_com_labsynch_labseer_domain_experimentvalue_valueoperator=Value Operator
-label_com_labsynch_labseer_domain_experimentvalue_valuetype=Value Type
-label_com_labsynch_labseer_domain_experimentvalue_valuetypeandkind=Value Type And Kind
-label_com_labsynch_labseer_domain_experimentvalue_valueunit=Value Unit
-label_com_labsynch_labseer_domain_experimentvalue_version=Version
-label_com_labsynch_labseer_domain_filelist=File List
-label_com_labsynch_labseer_domain_filelist_description=Description
-label_com_labsynch_labseer_domain_filelist_file=File
-label_com_labsynch_labseer_domain_filelist_filename=File Name
-label_com_labsynch_labseer_domain_filelist_filepath=File Path
-label_com_labsynch_labseer_domain_filelist_id=Id
-label_com_labsynch_labseer_domain_filelist_ie=Ie
-label_com_labsynch_labseer_domain_filelist_lot=Lot
-label_com_labsynch_labseer_domain_filelist_name=Name
-label_com_labsynch_labseer_domain_filelist_plural=File Lists
-label_com_labsynch_labseer_domain_filelist_size=Size
-label_com_labsynch_labseer_domain_filelist_subdir=Subdir
-label_com_labsynch_labseer_domain_filelist_type=Type
-label_com_labsynch_labseer_domain_filelist_uploaded=Uploaded
-label_com_labsynch_labseer_domain_filelist_url=Url
-label_com_labsynch_labseer_domain_filelist_version=Version
-label_com_labsynch_labseer_domain_filething=File Thing
-label_com_labsynch_labseer_domain_filething_applicationtype=Application Type
-label_com_labsynch_labseer_domain_filething_codename=Code Name
-label_com_labsynch_labseer_domain_filething_deleted=Deleted
-label_com_labsynch_labseer_domain_filething_description=Description
-label_com_labsynch_labseer_domain_filething_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_filething_fileextension=File Extension
-label_com_labsynch_labseer_domain_filething_filesize=File Size
-label_com_labsynch_labseer_domain_filething_fileurl=File U R L
-label_com_labsynch_labseer_domain_filething_id=Id
-label_com_labsynch_labseer_domain_filething_ignored=Ignored
-label_com_labsynch_labseer_domain_filething_kind=Kind
-label_com_labsynch_labseer_domain_filething_lskind=Ls Kind
-label_com_labsynch_labseer_domain_filething_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_filething_lstype=Ls Type
-label_com_labsynch_labseer_domain_filething_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_filething_mimetype=Mime Type
-label_com_labsynch_labseer_domain_filething_modifiedby=Modified By
-label_com_labsynch_labseer_domain_filething_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_filething_name=Name
-label_com_labsynch_labseer_domain_filething_plural=File Things
-label_com_labsynch_labseer_domain_filething_recordedby=Recorded By
-label_com_labsynch_labseer_domain_filething_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_filething_thingpage=Thing Page
-label_com_labsynch_labseer_domain_filething_version=Version
-label_com_labsynch_labseer_domain_filetype=File Type
-label_com_labsynch_labseer_domain_filetype_code=Code
-label_com_labsynch_labseer_domain_filetype_id=Id
-label_com_labsynch_labseer_domain_filetype_name=Name
-label_com_labsynch_labseer_domain_filetype_plural=File Types
-label_com_labsynch_labseer_domain_filetype_version=Version
-label_com_labsynch_labseer_domain_interactionkind=Interaction Kind
-label_com_labsynch_labseer_domain_interactionkind_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_interactionkind_id=Id
-label_com_labsynch_labseer_domain_interactionkind_id_=Id_
-label_com_labsynch_labseer_domain_interactionkind_interactiontype=Interaction Type
-label_com_labsynch_labseer_domain_interactionkind_kindname=Kind Name
-label_com_labsynch_labseer_domain_interactionkind_lstype=Ls Type
-label_com_labsynch_labseer_domain_interactionkind_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_interactionkind_plural=Interaction Kinds
-label_com_labsynch_labseer_domain_interactionkind_typeandkind=Type And Kind
-label_com_labsynch_labseer_domain_interactionkind_version=Version
-label_com_labsynch_labseer_domain_interactionkind_version_=Version_
-label_com_labsynch_labseer_domain_interactiontype=Interaction Type
-label_com_labsynch_labseer_domain_interactiontype_id=Id
-label_com_labsynch_labseer_domain_interactiontype_plural=Interaction Types
-label_com_labsynch_labseer_domain_interactiontype_typename=Type Name
-label_com_labsynch_labseer_domain_interactiontype_typeverb=Type Verb
-label_com_labsynch_labseer_domain_interactiontype_version=Version
-label_com_labsynch_labseer_domain_isosalt=Iso Salt
-label_com_labsynch_labseer_domain_isosalt_equivalents=Equivalents
-label_com_labsynch_labseer_domain_isosalt_id=Id
-label_com_labsynch_labseer_domain_isosalt_ignore=Ignore
-label_com_labsynch_labseer_domain_isosalt_isotope=Isotope
-label_com_labsynch_labseer_domain_isosalt_plural=Iso Salts
-label_com_labsynch_labseer_domain_isosalt_salt=Salt
-label_com_labsynch_labseer_domain_isosalt_saltform=Salt Form
-label_com_labsynch_labseer_domain_isosalt_type=Type
-label_com_labsynch_labseer_domain_isosalt_version=Version
-label_com_labsynch_labseer_domain_isotope=Isotope
-label_com_labsynch_labseer_domain_isotope_abbrev=Abbrev
-label_com_labsynch_labseer_domain_isotope_id=Id
-label_com_labsynch_labseer_domain_isotope_ignore=Ignore
-label_com_labsynch_labseer_domain_isotope_masschange=Mass Change
-label_com_labsynch_labseer_domain_isotope_name=Name
-label_com_labsynch_labseer_domain_isotope_plural=Isotopes
-label_com_labsynch_labseer_domain_isotope_version=Version
-label_com_labsynch_labseer_domain_itxcontainercontainer=Itx Container Container
-label_com_labsynch_labseer_domain_itxcontainercontainer_codename=Code Name
-label_com_labsynch_labseer_domain_itxcontainercontainer_deleted=Deleted
-label_com_labsynch_labseer_domain_itxcontainercontainer_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_itxcontainercontainer_firstcontainer=First Container
-label_com_labsynch_labseer_domain_itxcontainercontainer_id=Id
-label_com_labsynch_labseer_domain_itxcontainercontainer_ignored=Ignored
-label_com_labsynch_labseer_domain_itxcontainercontainer_interactionkind=Interaction Kind
-label_com_labsynch_labseer_domain_itxcontainercontainer_interactiontype=Interaction Type
-label_com_labsynch_labseer_domain_itxcontainercontainer_interactiontypeandkind=Interaction Type And Kind
-label_com_labsynch_labseer_domain_itxcontainercontainer_itxcontainercontainerstates=Itx Container Container States
-label_com_labsynch_labseer_domain_itxcontainercontainer_kind=Kind
-label_com_labsynch_labseer_domain_itxcontainercontainer_lskind=Ls Kind
-label_com_labsynch_labseer_domain_itxcontainercontainer_lsstates=Ls States
-label_com_labsynch_labseer_domain_itxcontainercontainer_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_itxcontainercontainer_lstype=Ls Type
-label_com_labsynch_labseer_domain_itxcontainercontainer_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_itxcontainercontainer_modifiedby=Modified By
-label_com_labsynch_labseer_domain_itxcontainercontainer_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_itxcontainercontainer_plural=Itx Container Containers
-label_com_labsynch_labseer_domain_itxcontainercontainer_recordedby=Recorded By
-label_com_labsynch_labseer_domain_itxcontainercontainer_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_itxcontainercontainer_secondcontainer=Second Container
-label_com_labsynch_labseer_domain_itxcontainercontainer_thingpage=Thing Page
-label_com_labsynch_labseer_domain_itxcontainercontainer_version=Version
-label_com_labsynch_labseer_domain_itxcontainercontainerstate=Itx Container Container State
-label_com_labsynch_labseer_domain_itxcontainercontainerstate_comments=Comments
-label_com_labsynch_labseer_domain_itxcontainercontainerstate_deleted=Deleted
-label_com_labsynch_labseer_domain_itxcontainercontainerstate_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_itxcontainercontainerstate_id=Id
-label_com_labsynch_labseer_domain_itxcontainercontainerstate_ignored=Ignored
-label_com_labsynch_labseer_domain_itxcontainercontainerstate_itxcontainercontainer=Itx Container Container
-label_com_labsynch_labseer_domain_itxcontainercontainerstate_itxcontainercontainervalues=Itx Container Container Values
-label_com_labsynch_labseer_domain_itxcontainercontainerstate_lskind=Ls Kind
-label_com_labsynch_labseer_domain_itxcontainercontainerstate_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_itxcontainercontainerstate_lstype=Ls Type
-label_com_labsynch_labseer_domain_itxcontainercontainerstate_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_itxcontainercontainerstate_lsvalues=Ls Values
-label_com_labsynch_labseer_domain_itxcontainercontainerstate_modifiedby=Modified By
-label_com_labsynch_labseer_domain_itxcontainercontainerstate_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_itxcontainercontainerstate_plural=Itx Container Container States
-label_com_labsynch_labseer_domain_itxcontainercontainerstate_recordedby=Recorded By
-label_com_labsynch_labseer_domain_itxcontainercontainerstate_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_itxcontainercontainerstate_statekind=State Kind
-label_com_labsynch_labseer_domain_itxcontainercontainerstate_statetype=State Type
-label_com_labsynch_labseer_domain_itxcontainercontainerstate_statetypeandkind=State Type And Kind
-label_com_labsynch_labseer_domain_itxcontainercontainerstate_version=Version
-label_com_labsynch_labseer_domain_itxcontainercontainervalue=Itx Container Container Value
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_batchcode=Batch Code
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_blobvalue=Blob Value
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_clobvalue=Clob Value
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_codekind=Code Kind
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_codeorigin=Code Origin
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_codetype=Code Type
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_codetypeandkind=Code Type And Kind
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_codevalue=Code Value
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_comments=Comments
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_concentration=Concentration
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_concunit=Conc Unit
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_concvalue=Conc Value
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_datevalue=Date Value
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_deleted=Deleted
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_filevalue=File Value
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_id=Id
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_ignored=Ignored
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_itxcontainercontainerstate=Itx Container Container State
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_lskind=Ls Kind
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_lsstate=Ls State
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_lstype=Ls Type
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_modifiedby=Modified By
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_numberofreplicates=Number Of Replicates
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_numericvalue=Numeric Value
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_operatorkind=Operator Kind
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_operatortype=Operator Type
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_operatortypeandkind=Operator Type And Kind
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_plural=Itx Container Container Values
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_publicdata=Public Data
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_recordedby=Recorded By
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_sigfigs=Sig Figs
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_stringvalue=String Value
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_uncertainty=Uncertainty
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_uncertaintytype=Uncertainty Type
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_unitkind=Unit Kind
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_unittype=Unit Type
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_unittypeandkind=Unit Type And Kind
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_urlvalue=Url Value
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_valuekind=Value Kind
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_valueoperator=Value Operator
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_valuetype=Value Type
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_valuetypeandkind=Value Type And Kind
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_valueunit=Value Unit
-label_com_labsynch_labseer_domain_itxcontainercontainervalue_version=Version
-label_com_labsynch_labseer_domain_itxexperimentexperiment=Itx Experiment Experiment
-label_com_labsynch_labseer_domain_itxexperimentexperiment_codename=Code Name
-label_com_labsynch_labseer_domain_itxexperimentexperiment_deleted=Deleted
-label_com_labsynch_labseer_domain_itxexperimentexperiment_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_itxexperimentexperiment_firstexperiment=First Experiment
-label_com_labsynch_labseer_domain_itxexperimentexperiment_id=Id
-label_com_labsynch_labseer_domain_itxexperimentexperiment_ignored=Ignored
-label_com_labsynch_labseer_domain_itxexperimentexperiment_lskind=Ls Kind
-label_com_labsynch_labseer_domain_itxexperimentexperiment_lsstates=Ls States
-label_com_labsynch_labseer_domain_itxexperimentexperiment_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_itxexperimentexperiment_lstype=Ls Type
-label_com_labsynch_labseer_domain_itxexperimentexperiment_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_itxexperimentexperiment_modifiedby=Modified By
-label_com_labsynch_labseer_domain_itxexperimentexperiment_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_itxexperimentexperiment_plural=Itx Experiment Experiments
-label_com_labsynch_labseer_domain_itxexperimentexperiment_recordedby=Recorded By
-label_com_labsynch_labseer_domain_itxexperimentexperiment_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_itxexperimentexperiment_secondexperiment=Second Experiment
-label_com_labsynch_labseer_domain_itxexperimentexperiment_thingpage=Thing Page
-label_com_labsynch_labseer_domain_itxexperimentexperiment_version=Version
-label_com_labsynch_labseer_domain_itxexperimentexperimentstate=Itx Experiment Experiment State
-label_com_labsynch_labseer_domain_itxexperimentexperimentstate_comments=Comments
-label_com_labsynch_labseer_domain_itxexperimentexperimentstate_deleted=Deleted
-label_com_labsynch_labseer_domain_itxexperimentexperimentstate_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_itxexperimentexperimentstate_id=Id
-label_com_labsynch_labseer_domain_itxexperimentexperimentstate_ignored=Ignored
-label_com_labsynch_labseer_domain_itxexperimentexperimentstate_itxexperimentexperiment=Itx Experiment Experiment
-label_com_labsynch_labseer_domain_itxexperimentexperimentstate_lskind=Ls Kind
-label_com_labsynch_labseer_domain_itxexperimentexperimentstate_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_itxexperimentexperimentstate_lstype=Ls Type
-label_com_labsynch_labseer_domain_itxexperimentexperimentstate_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_itxexperimentexperimentstate_lsvalues=Ls Values
-label_com_labsynch_labseer_domain_itxexperimentexperimentstate_modifiedby=Modified By
-label_com_labsynch_labseer_domain_itxexperimentexperimentstate_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_itxexperimentexperimentstate_plural=Itx Experiment Experiment States
-label_com_labsynch_labseer_domain_itxexperimentexperimentstate_recordedby=Recorded By
-label_com_labsynch_labseer_domain_itxexperimentexperimentstate_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_itxexperimentexperimentstate_version=Version
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue=Itx Experiment Experiment Value
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_blobvalue=Blob Value
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_clobvalue=Clob Value
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_codekind=Code Kind
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_codeorigin=Code Origin
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_codetype=Code Type
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_codetypeandkind=Code Type And Kind
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_codevalue=Code Value
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_comments=Comments
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_concentration=Concentration
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_concunit=Conc Unit
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_datevalue=Date Value
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_deleted=Deleted
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_filevalue=File Value
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_id=Id
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_ignored=Ignored
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_lskind=Ls Kind
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_lsstate=Ls State
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_lstype=Ls Type
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_modifiedby=Modified By
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_numberofreplicates=Number Of Replicates
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_numericvalue=Numeric Value
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_operatorkind=Operator Kind
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_operatortype=Operator Type
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_operatortypeandkind=Operator Type And Kind
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_plural=Itx Experiment Experiment Values
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_publicdata=Public Data
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_recordedby=Recorded By
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_sigfigs=Sig Figs
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_stringvalue=String Value
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_uncertainty=Uncertainty
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_uncertaintytype=Uncertainty Type
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_unitkind=Unit Kind
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_unittype=Unit Type
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_unittypeandkind=Unit Type And Kind
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_urlvalue=Url Value
-label_com_labsynch_labseer_domain_itxexperimentexperimentvalue_version=Version
-label_com_labsynch_labseer_domain_itxlsthinglsthing=Itx Ls Thing Ls Thing
-label_com_labsynch_labseer_domain_itxlsthinglsthing_codename=Code Name
-label_com_labsynch_labseer_domain_itxlsthinglsthing_deleted=Deleted
-label_com_labsynch_labseer_domain_itxlsthinglsthing_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_itxlsthinglsthing_firstlsthing=First Ls Thing
-label_com_labsynch_labseer_domain_itxlsthinglsthing_id=Id
-label_com_labsynch_labseer_domain_itxlsthinglsthing_ignored=Ignored
-label_com_labsynch_labseer_domain_itxlsthinglsthing_lskind=Ls Kind
-label_com_labsynch_labseer_domain_itxlsthinglsthing_lsstates=Ls States
-label_com_labsynch_labseer_domain_itxlsthinglsthing_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_itxlsthinglsthing_lstype=Ls Type
-label_com_labsynch_labseer_domain_itxlsthinglsthing_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_itxlsthinglsthing_modifiedby=Modified By
-label_com_labsynch_labseer_domain_itxlsthinglsthing_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_itxlsthinglsthing_plural=Itx Ls Thing Ls Things
-label_com_labsynch_labseer_domain_itxlsthinglsthing_recordedby=Recorded By
-label_com_labsynch_labseer_domain_itxlsthinglsthing_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_itxlsthinglsthing_secondlsthing=Second Ls Thing
-label_com_labsynch_labseer_domain_itxlsthinglsthing_thingpage=Thing Page
-label_com_labsynch_labseer_domain_itxlsthinglsthing_version=Version
-label_com_labsynch_labseer_domain_itxlsthinglsthingstate=Itx Ls Thing Ls Thing State
-label_com_labsynch_labseer_domain_itxlsthinglsthingstate_comments=Comments
-label_com_labsynch_labseer_domain_itxlsthinglsthingstate_deleted=Deleted
-label_com_labsynch_labseer_domain_itxlsthinglsthingstate_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_itxlsthinglsthingstate_id=Id
-label_com_labsynch_labseer_domain_itxlsthinglsthingstate_ignored=Ignored
-label_com_labsynch_labseer_domain_itxlsthinglsthingstate_itxlsthinglsthing=Itx Ls Thing Ls Thing
-label_com_labsynch_labseer_domain_itxlsthinglsthingstate_lskind=Ls Kind
-label_com_labsynch_labseer_domain_itxlsthinglsthingstate_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_itxlsthinglsthingstate_lstype=Ls Type
-label_com_labsynch_labseer_domain_itxlsthinglsthingstate_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_itxlsthinglsthingstate_lsvalues=Ls Values
-label_com_labsynch_labseer_domain_itxlsthinglsthingstate_modifiedby=Modified By
-label_com_labsynch_labseer_domain_itxlsthinglsthingstate_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_itxlsthinglsthingstate_plural=Itx Ls Thing Ls Thing States
-label_com_labsynch_labseer_domain_itxlsthinglsthingstate_recordedby=Recorded By
-label_com_labsynch_labseer_domain_itxlsthinglsthingstate_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_itxlsthinglsthingstate_version=Version
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue=Itx Ls Thing Ls Thing Value
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_blobvalue=Blob Value
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_clobvalue=Clob Value
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_codekind=Code Kind
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_codeorigin=Code Origin
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_codetype=Code Type
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_codetypeandkind=Code Type And Kind
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_codevalue=Code Value
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_comments=Comments
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_concentration=Concentration
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_concunit=Conc Unit
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_datevalue=Date Value
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_deleted=Deleted
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_filevalue=File Value
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_id=Id
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_ignored=Ignored
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_lskind=Ls Kind
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_lsstate=Ls State
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_lstype=Ls Type
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_modifiedby=Modified By
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_numberofreplicates=Number Of Replicates
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_numericvalue=Numeric Value
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_operatorkind=Operator Kind
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_operatortype=Operator Type
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_operatortypeandkind=Operator Type And Kind
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_plural=Itx Ls Thing Ls Thing Values
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_publicdata=Public Data
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_recordedby=Recorded By
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_sigfigs=Sig Figs
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_stringvalue=String Value
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_uncertainty=Uncertainty
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_uncertaintytype=Uncertainty Type
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_unitkind=Unit Kind
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_unittype=Unit Type
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_unittypeandkind=Unit Type And Kind
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_urlvalue=Url Value
-label_com_labsynch_labseer_domain_itxlsthinglsthingvalue_version=Version
-label_com_labsynch_labseer_domain_itxprotocolprotocol=Itx Protocol Protocol
-label_com_labsynch_labseer_domain_itxprotocolprotocol_codename=Code Name
-label_com_labsynch_labseer_domain_itxprotocolprotocol_deleted=Deleted
-label_com_labsynch_labseer_domain_itxprotocolprotocol_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_itxprotocolprotocol_firstprotocol=First Protocol
-label_com_labsynch_labseer_domain_itxprotocolprotocol_id=Id
-label_com_labsynch_labseer_domain_itxprotocolprotocol_ignored=Ignored
-label_com_labsynch_labseer_domain_itxprotocolprotocol_lskind=Ls Kind
-label_com_labsynch_labseer_domain_itxprotocolprotocol_lsstates=Ls States
-label_com_labsynch_labseer_domain_itxprotocolprotocol_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_itxprotocolprotocol_lstype=Ls Type
-label_com_labsynch_labseer_domain_itxprotocolprotocol_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_itxprotocolprotocol_modifiedby=Modified By
-label_com_labsynch_labseer_domain_itxprotocolprotocol_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_itxprotocolprotocol_plural=Itx Protocol Protocols
-label_com_labsynch_labseer_domain_itxprotocolprotocol_protocol=Protocol
-label_com_labsynch_labseer_domain_itxprotocolprotocol_recordedby=Recorded By
-label_com_labsynch_labseer_domain_itxprotocolprotocol_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_itxprotocolprotocol_secondprotocol=Second Protocol
-label_com_labsynch_labseer_domain_itxprotocolprotocol_thingpage=Thing Page
-label_com_labsynch_labseer_domain_itxprotocolprotocol_version=Version
-label_com_labsynch_labseer_domain_itxprotocolprotocolstate=Itx Protocol Protocol State
-label_com_labsynch_labseer_domain_itxprotocolprotocolstate_comments=Comments
-label_com_labsynch_labseer_domain_itxprotocolprotocolstate_deleted=Deleted
-label_com_labsynch_labseer_domain_itxprotocolprotocolstate_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_itxprotocolprotocolstate_id=Id
-label_com_labsynch_labseer_domain_itxprotocolprotocolstate_ignored=Ignored
-label_com_labsynch_labseer_domain_itxprotocolprotocolstate_itxprotocolprotocol=Itx Protocol Protocol
-label_com_labsynch_labseer_domain_itxprotocolprotocolstate_lskind=Ls Kind
-label_com_labsynch_labseer_domain_itxprotocolprotocolstate_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_itxprotocolprotocolstate_lstype=Ls Type
-label_com_labsynch_labseer_domain_itxprotocolprotocolstate_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_itxprotocolprotocolstate_lsvalues=Ls Values
-label_com_labsynch_labseer_domain_itxprotocolprotocolstate_modifiedby=Modified By
-label_com_labsynch_labseer_domain_itxprotocolprotocolstate_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_itxprotocolprotocolstate_plural=Itx Protocol Protocol States
-label_com_labsynch_labseer_domain_itxprotocolprotocolstate_recordedby=Recorded By
-label_com_labsynch_labseer_domain_itxprotocolprotocolstate_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_itxprotocolprotocolstate_version=Version
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue=Itx Protocol Protocol Value
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_blobvalue=Blob Value
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_clobvalue=Clob Value
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_codekind=Code Kind
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_codeorigin=Code Origin
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_codetype=Code Type
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_codetypeandkind=Code Type And Kind
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_codevalue=Code Value
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_comments=Comments
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_concentration=Concentration
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_concunit=Conc Unit
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_datevalue=Date Value
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_deleted=Deleted
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_filevalue=File Value
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_id=Id
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_ignored=Ignored
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_lskind=Ls Kind
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_lsstate=Ls State
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_lstype=Ls Type
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_modifiedby=Modified By
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_numberofreplicates=Number Of Replicates
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_numericvalue=Numeric Value
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_operatorkind=Operator Kind
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_operatortype=Operator Type
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_operatortypeandkind=Operator Type And Kind
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_plural=Itx Protocol Protocol Values
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_publicdata=Public Data
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_recordedby=Recorded By
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_sigfigs=Sig Figs
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_stringvalue=String Value
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_uncertainty=Uncertainty
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_uncertaintytype=Uncertainty Type
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_unitkind=Unit Kind
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_unittype=Unit Type
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_unittypeandkind=Unit Type And Kind
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_urlvalue=Url Value
-label_com_labsynch_labseer_domain_itxprotocolprotocolvalue_version=Version
-label_com_labsynch_labseer_domain_itxsubjectcontainer=Itx Subject Container
-label_com_labsynch_labseer_domain_itxsubjectcontainer_codename=Code Name
-label_com_labsynch_labseer_domain_itxsubjectcontainer_container=Container
-label_com_labsynch_labseer_domain_itxsubjectcontainer_deleted=Deleted
-label_com_labsynch_labseer_domain_itxsubjectcontainer_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_itxsubjectcontainer_id=Id
-label_com_labsynch_labseer_domain_itxsubjectcontainer_ignored=Ignored
-label_com_labsynch_labseer_domain_itxsubjectcontainer_interactionkind=Interaction Kind
-label_com_labsynch_labseer_domain_itxsubjectcontainer_interactiontype=Interaction Type
-label_com_labsynch_labseer_domain_itxsubjectcontainer_interactiontypeandkind=Interaction Type And Kind
-label_com_labsynch_labseer_domain_itxsubjectcontainer_itxsubjectcontainerstates=Itx Subject Container States
-label_com_labsynch_labseer_domain_itxsubjectcontainer_kind=Kind
-label_com_labsynch_labseer_domain_itxsubjectcontainer_lskind=Ls Kind
-label_com_labsynch_labseer_domain_itxsubjectcontainer_lsstates=Ls States
-label_com_labsynch_labseer_domain_itxsubjectcontainer_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_itxsubjectcontainer_lstype=Ls Type
-label_com_labsynch_labseer_domain_itxsubjectcontainer_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_itxsubjectcontainer_modifiedby=Modified By
-label_com_labsynch_labseer_domain_itxsubjectcontainer_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_itxsubjectcontainer_plural=Itx Subject Containers
-label_com_labsynch_labseer_domain_itxsubjectcontainer_recordedby=Recorded By
-label_com_labsynch_labseer_domain_itxsubjectcontainer_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_itxsubjectcontainer_subject=Subject
-label_com_labsynch_labseer_domain_itxsubjectcontainer_thingpage=Thing Page
-label_com_labsynch_labseer_domain_itxsubjectcontainer_version=Version
-label_com_labsynch_labseer_domain_itxsubjectcontainerstate=Itx Subject Container State
-label_com_labsynch_labseer_domain_itxsubjectcontainerstate_comments=Comments
-label_com_labsynch_labseer_domain_itxsubjectcontainerstate_deleted=Deleted
-label_com_labsynch_labseer_domain_itxsubjectcontainerstate_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_itxsubjectcontainerstate_id=Id
-label_com_labsynch_labseer_domain_itxsubjectcontainerstate_ignored=Ignored
-label_com_labsynch_labseer_domain_itxsubjectcontainerstate_itxsubjectcontainer=Itx Subject Container
-label_com_labsynch_labseer_domain_itxsubjectcontainerstate_itxsubjectcontainervalues=Itx Subject Container Values
-label_com_labsynch_labseer_domain_itxsubjectcontainerstate_lskind=Ls Kind
-label_com_labsynch_labseer_domain_itxsubjectcontainerstate_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_itxsubjectcontainerstate_lstype=Ls Type
-label_com_labsynch_labseer_domain_itxsubjectcontainerstate_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_itxsubjectcontainerstate_lsvalues=Ls Values
-label_com_labsynch_labseer_domain_itxsubjectcontainerstate_modifiedby=Modified By
-label_com_labsynch_labseer_domain_itxsubjectcontainerstate_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_itxsubjectcontainerstate_plural=Itx Subject Container States
-label_com_labsynch_labseer_domain_itxsubjectcontainerstate_recordedby=Recorded By
-label_com_labsynch_labseer_domain_itxsubjectcontainerstate_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_itxsubjectcontainerstate_statekind=State Kind
-label_com_labsynch_labseer_domain_itxsubjectcontainerstate_statetype=State Type
-label_com_labsynch_labseer_domain_itxsubjectcontainerstate_statetypeandkind=State Type And Kind
-label_com_labsynch_labseer_domain_itxsubjectcontainerstate_version=Version
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue=Itx Subject Container Value
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_batchcode=Batch Code
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_blobvalue=Blob Value
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_clobvalue=Clob Value
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_codekind=Code Kind
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_codeorigin=Code Origin
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_codetype=Code Type
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_codetypeandkind=Code Type And Kind
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_codevalue=Code Value
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_comments=Comments
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_concentration=Concentration
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_concunit=Conc Unit
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_concvalue=Conc Value
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_datevalue=Date Value
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_deleted=Deleted
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_filevalue=File Value
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_id=Id
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_ignored=Ignored
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_itxsubjectcontainerstate=Itx Subject Container State
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_lskind=Ls Kind
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_lsstate=Ls State
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_lstype=Ls Type
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_modifiedby=Modified By
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_numberofreplicates=Number Of Replicates
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_numericvalue=Numeric Value
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_operatorkind=Operator Kind
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_operatortype=Operator Type
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_operatortypeandkind=Operator Type And Kind
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_plural=Itx Subject Container Values
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_publicdata=Public Data
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_recordedby=Recorded By
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_sigfigs=Sig Figs
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_stringvalue=String Value
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_uncertainty=Uncertainty
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_uncertaintytype=Uncertainty Type
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_unitkind=Unit Kind
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_unittype=Unit Type
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_unittypeandkind=Unit Type And Kind
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_urlvalue=Url Value
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_valuekind=Value Kind
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_valueoperator=Value Operator
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_valuetype=Value Type
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_valuetypeandkind=Value Type And Kind
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_valueunit=Value Unit
-label_com_labsynch_labseer_domain_itxsubjectcontainervalue_version=Version
-label_com_labsynch_labseer_domain_labelkind=Label Kind
-label_com_labsynch_labseer_domain_labelkind_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_labelkind_id=Id
-label_com_labsynch_labseer_domain_labelkind_kindname=Kind Name
-label_com_labsynch_labseer_domain_labelkind_labeltype=Label Type
-label_com_labsynch_labseer_domain_labelkind_lstype=Ls Type
-label_com_labsynch_labseer_domain_labelkind_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_labelkind_plural=Label Kinds
-label_com_labsynch_labseer_domain_labelkind_typeandkind=Type And Kind
-label_com_labsynch_labseer_domain_labelkind_version=Version
-label_com_labsynch_labseer_domain_labelsequence=Label Sequence
-label_com_labsynch_labseer_domain_labelsequence_db_sequence=Db_sequence
-label_com_labsynch_labseer_domain_labelsequence_dbsequence=Db Sequence
-label_com_labsynch_labseer_domain_labelsequence_digits=Digits
-label_com_labsynch_labseer_domain_labelsequence_groupdigits=Group Digits
-label_com_labsynch_labseer_domain_labelsequence_id=Id
-label_com_labsynch_labseer_domain_labelsequence_ignored=Ignored
-label_com_labsynch_labseer_domain_labelsequence_labelkind=Label Kind
-label_com_labsynch_labseer_domain_labelsequence_labelprefix=Label Prefix
-label_com_labsynch_labseer_domain_labelsequence_labelseparator=Label Separator
-label_com_labsynch_labseer_domain_labelsequence_labelsequenceroles=Label Sequence Roles
-label_com_labsynch_labseer_domain_labelsequence_labeltype=Label Type
-label_com_labsynch_labseer_domain_labelsequence_labeltypeandkind=Label Type And Kind
-label_com_labsynch_labseer_domain_labelsequence_latestnumber=Latest Number
-label_com_labsynch_labseer_domain_labelsequence_lsroles=Ls Roles
-label_com_labsynch_labseer_domain_labelsequence_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_labelsequence_plural=Label Sequences
-label_com_labsynch_labseer_domain_labelsequence_startingnumber=Starting Number
-label_com_labsynch_labseer_domain_labelsequence_thingkind=Thing Kind
-label_com_labsynch_labseer_domain_labelsequence_thingtype=Thing Type
-label_com_labsynch_labseer_domain_labelsequence_thingtypeandkind=Thing Type And Kind
-label_com_labsynch_labseer_domain_labelsequence_version=Version
-label_com_labsynch_labseer_domain_labelsequencerole=Label Sequence Role
-label_com_labsynch_labseer_domain_labelsequencerole_id=Id
-label_com_labsynch_labseer_domain_labelsequencerole_labelsequenceentry=Label Sequence Entry
-label_com_labsynch_labseer_domain_labelsequencerole_plural=Label Sequence Roles
-label_com_labsynch_labseer_domain_labelsequencerole_roleentry=Role Entry
-label_com_labsynch_labseer_domain_labelsequencerole_version=Version
-label_com_labsynch_labseer_domain_labeltype=Label Type
-label_com_labsynch_labseer_domain_labeltype_id=Id
-label_com_labsynch_labseer_domain_labeltype_plural=Label Types
-label_com_labsynch_labseer_domain_labeltype_typename=Type Name
-label_com_labsynch_labseer_domain_labeltype_version=Version
-label_com_labsynch_labseer_domain_lot=Lot
-label_com_labsynch_labseer_domain_lot_absorbance=Absorbance
-label_com_labsynch_labseer_domain_lot_amount=Amount
-label_com_labsynch_labseer_domain_lot_amountunits=Amount Units
-label_com_labsynch_labseer_domain_lot_asdrawnstruct=As Drawn Struct
-label_com_labsynch_labseer_domain_lot_author=Author
-label_com_labsynch_labseer_domain_lot_barcode=Barcode
-label_com_labsynch_labseer_domain_lot_boilingpoint=Boiling Point
-label_com_labsynch_labseer_domain_lot_buid=Buid
-label_com_labsynch_labseer_domain_lot_bulkloadfile=Bulk Load File
-label_com_labsynch_labseer_domain_lot_chemist=Chemist
-label_com_labsynch_labseer_domain_lot_color=Color
-label_com_labsynch_labseer_domain_lot_comments=Comments
-label_com_labsynch_labseer_domain_lot_corpname=Corp Name
-label_com_labsynch_labseer_domain_lot_filelists=File Lists
-label_com_labsynch_labseer_domain_lot_id=Id
-label_com_labsynch_labseer_domain_lot_ignore=Ignore
-label_com_labsynch_labseer_domain_lot_isvirtual=Is Virtual
-label_com_labsynch_labseer_domain_lot_lambda=Lambda
-label_com_labsynch_labseer_domain_lot_lotaliases=Lot Aliases
-label_com_labsynch_labseer_domain_lot_lotasdrawncdid=Lot As Drawn Cd Id
-label_com_labsynch_labseer_domain_lot_lotmolweight=Lot Mol Weight
-label_com_labsynch_labseer_domain_lot_lotnumber=Lot Number
-label_com_labsynch_labseer_domain_lot_maxsynthesisdate=Max Synthesis Date
-label_com_labsynch_labseer_domain_lot_meltingpoint=Melting Point
-label_com_labsynch_labseer_domain_lot_minsynthesisdate=Min Synthesis Date
-label_com_labsynch_labseer_domain_lot_modifiedby=Modified By
-label_com_labsynch_labseer_domain_lot_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_lot_notebookpage=Notebook Page
-label_com_labsynch_labseer_domain_lot_observedmassone=Observed Mass One
-label_com_labsynch_labseer_domain_lot_observedmasstwo=Observed Mass Two
-label_com_labsynch_labseer_domain_lot_parent=Parent
-label_com_labsynch_labseer_domain_lot_percentee=Percent E E
-label_com_labsynch_labseer_domain_lot_physicalstate=Physical State
-label_com_labsynch_labseer_domain_lot_plural=Lots
-label_com_labsynch_labseer_domain_lot_project=Project
-label_com_labsynch_labseer_domain_lot_purity=Purity
-label_com_labsynch_labseer_domain_lot_puritymeasuredby=Purity Measured By
-label_com_labsynch_labseer_domain_lot_purityoperator=Purity Operator
-label_com_labsynch_labseer_domain_lot_registeredby=Registered By
-label_com_labsynch_labseer_domain_lot_registrationdate=Registration Date
-label_com_labsynch_labseer_domain_lot_retain=Retain
-label_com_labsynch_labseer_domain_lot_retainlocation=Retain Location
-label_com_labsynch_labseer_domain_lot_retainunits=Retain Units
-label_com_labsynch_labseer_domain_lot_saltform=Salt Form
-label_com_labsynch_labseer_domain_lot_solutionamount=Solution Amount
-label_com_labsynch_labseer_domain_lot_solutionamountunits=Solution Amount Units
-label_com_labsynch_labseer_domain_lot_stocklocation=Stock Location
-label_com_labsynch_labseer_domain_lot_stocksolvent=Stock Solvent
-label_com_labsynch_labseer_domain_lot_storagelocation=Storage Location
-label_com_labsynch_labseer_domain_lot_supplier=Supplier
-label_com_labsynch_labseer_domain_lot_supplierid=Supplier I D
-label_com_labsynch_labseer_domain_lot_supplierlot=Supplier Lot
-label_com_labsynch_labseer_domain_lot_synthesisdate=Synthesis Date
-label_com_labsynch_labseer_domain_lot_tareweight=Tare Weight
-label_com_labsynch_labseer_domain_lot_tareweightunits=Tare Weight Units
-label_com_labsynch_labseer_domain_lot_totalamountstored=Total Amount Stored
-label_com_labsynch_labseer_domain_lot_totalamountstoredunits=Total Amount Stored Units
-label_com_labsynch_labseer_domain_lot_vendor=Vendor
-label_com_labsynch_labseer_domain_lot_vendorid=Vendor I D
-label_com_labsynch_labseer_domain_lot_version=Version
-label_com_labsynch_labseer_domain_lotalias=Lot Alias
-label_com_labsynch_labseer_domain_lotalias_aliasname=Alias Name
-label_com_labsynch_labseer_domain_lotalias_deleted=Deleted
-label_com_labsynch_labseer_domain_lotalias_id=Id
-label_com_labsynch_labseer_domain_lotalias_ignored=Ignored
-label_com_labsynch_labseer_domain_lotalias_lot=Lot
-label_com_labsynch_labseer_domain_lotalias_lskind=Ls Kind
-label_com_labsynch_labseer_domain_lotalias_lstype=Ls Type
-label_com_labsynch_labseer_domain_lotalias_plural=Lot Aliases
-label_com_labsynch_labseer_domain_lotalias_preferred=Preferred
-label_com_labsynch_labseer_domain_lotalias_version=Version
-label_com_labsynch_labseer_domain_lotaliaskind=Lot Alias Kind
-label_com_labsynch_labseer_domain_lotaliaskind_id=Id
-label_com_labsynch_labseer_domain_lotaliaskind_kindname=Kind Name
-label_com_labsynch_labseer_domain_lotaliaskind_lstype=Ls Type
-label_com_labsynch_labseer_domain_lotaliaskind_plural=Lot Alias Kinds
-label_com_labsynch_labseer_domain_lotaliaskind_version=Version
-label_com_labsynch_labseer_domain_lotaliastype=Lot Alias Type
-label_com_labsynch_labseer_domain_lotaliastype_id=Id
-label_com_labsynch_labseer_domain_lotaliastype_plural=Lot Alias Types
-label_com_labsynch_labseer_domain_lotaliastype_typename=Type Name
-label_com_labsynch_labseer_domain_lotaliastype_version=Version
-label_com_labsynch_labseer_domain_lsinteraction=Ls Interaction
-label_com_labsynch_labseer_domain_lsinteraction_codename=Code Name
-label_com_labsynch_labseer_domain_lsinteraction_deleted=Deleted
-label_com_labsynch_labseer_domain_lsinteraction_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_lsinteraction_firstthing=First Thing
-label_com_labsynch_labseer_domain_lsinteraction_id=Id
-label_com_labsynch_labseer_domain_lsinteraction_ignored=Ignored
-label_com_labsynch_labseer_domain_lsinteraction_interactionkind=Interaction Kind
-label_com_labsynch_labseer_domain_lsinteraction_interactiontype=Interaction Type
-label_com_labsynch_labseer_domain_lsinteraction_interactiontypeandkind=Interaction Type And Kind
-label_com_labsynch_labseer_domain_lsinteraction_itxkind=Itx Kind
-label_com_labsynch_labseer_domain_lsinteraction_itxtype=Itx Type
-label_com_labsynch_labseer_domain_lsinteraction_itxtypeandkind=Itx Type And Kind
-label_com_labsynch_labseer_domain_lsinteraction_kind=Kind
-label_com_labsynch_labseer_domain_lsinteraction_lskind=Ls Kind
-label_com_labsynch_labseer_domain_lsinteraction_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_lsinteraction_lstype=Ls Type
-label_com_labsynch_labseer_domain_lsinteraction_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_lsinteraction_modifiedby=Modified By
-label_com_labsynch_labseer_domain_lsinteraction_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_lsinteraction_plural=Ls Interactions
-label_com_labsynch_labseer_domain_lsinteraction_recordedby=Recorded By
-label_com_labsynch_labseer_domain_lsinteraction_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_lsinteraction_secondthing=Second Thing
-label_com_labsynch_labseer_domain_lsinteraction_thingpage=Thing Page
-label_com_labsynch_labseer_domain_lsinteraction_version=Version
-label_com_labsynch_labseer_domain_lsrole=Ls Role
-label_com_labsynch_labseer_domain_lsrole_authorroles=Author Roles
-label_com_labsynch_labseer_domain_lsrole_id=Id
-label_com_labsynch_labseer_domain_lsrole_lskind=Ls Kind
-label_com_labsynch_labseer_domain_lsrole_lstype=Ls Type
-label_com_labsynch_labseer_domain_lsrole_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_lsrole_plural=Ls Roles
-label_com_labsynch_labseer_domain_lsrole_roledescription=Role Description
-label_com_labsynch_labseer_domain_lsrole_rolename=Role Name
-label_com_labsynch_labseer_domain_lsrole_version=Version
-label_com_labsynch_labseer_domain_lstag=Ls Tag
-label_com_labsynch_labseer_domain_lstag_experiments=Experiments
-label_com_labsynch_labseer_domain_lstag_id=Id
-label_com_labsynch_labseer_domain_lstag_lsthings=Ls Things
-label_com_labsynch_labseer_domain_lstag_plural=Ls Tags
-label_com_labsynch_labseer_domain_lstag_protocols=Protocols
-label_com_labsynch_labseer_domain_lstag_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_lstag_tagtext=Tag Text
-label_com_labsynch_labseer_domain_lstag_version=Version
-label_com_labsynch_labseer_domain_lsthing=Ls Thing
-label_com_labsynch_labseer_domain_lsthing_codename=Code Name
-label_com_labsynch_labseer_domain_lsthing_deleted=Deleted
-label_com_labsynch_labseer_domain_lsthing_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_lsthing_firstlsthings=First Ls Things
-label_com_labsynch_labseer_domain_lsthing_id=Id
-label_com_labsynch_labseer_domain_lsthing_ignored=Ignored
-label_com_labsynch_labseer_domain_lsthing_lskind=Ls Kind
-label_com_labsynch_labseer_domain_lsthing_lslabels=Ls Labels
-label_com_labsynch_labseer_domain_lsthing_lsstates=Ls States
-label_com_labsynch_labseer_domain_lsthing_lstags=Ls Tags
-label_com_labsynch_labseer_domain_lsthing_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_lsthing_lstype=Ls Type
-label_com_labsynch_labseer_domain_lsthing_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_lsthing_modifiedby=Modified By
-label_com_labsynch_labseer_domain_lsthing_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_lsthing_plural=Ls Things
-label_com_labsynch_labseer_domain_lsthing_recordedby=Recorded By
-label_com_labsynch_labseer_domain_lsthing_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_lsthing_secondlsthings=Second Ls Things
-label_com_labsynch_labseer_domain_lsthing_thingpage=Thing Page
-label_com_labsynch_labseer_domain_lsthing_version=Version
-label_com_labsynch_labseer_domain_lsthinglabel=Ls Thing Label
-label_com_labsynch_labseer_domain_lsthinglabel_deleted=Deleted
-label_com_labsynch_labseer_domain_lsthinglabel_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_lsthinglabel_id=Id
-label_com_labsynch_labseer_domain_lsthinglabel_ignored=Ignored
-label_com_labsynch_labseer_domain_lsthinglabel_imagefile=Image File
-label_com_labsynch_labseer_domain_lsthinglabel_labeltext=Label Text
-label_com_labsynch_labseer_domain_lsthinglabel_lskind=Ls Kind
-label_com_labsynch_labseer_domain_lsthinglabel_lsthing=Ls Thing
-label_com_labsynch_labseer_domain_lsthinglabel_lsthingtypeandkind=Ls Thing Type And Kind
-label_com_labsynch_labseer_domain_lsthinglabel_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_lsthinglabel_lstype=Ls Type
-label_com_labsynch_labseer_domain_lsthinglabel_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_lsthinglabel_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_lsthinglabel_physicallylabled=Physically Labled
-label_com_labsynch_labseer_domain_lsthinglabel_plural=Ls Thing Labels
-label_com_labsynch_labseer_domain_lsthinglabel_preferred=Preferred
-label_com_labsynch_labseer_domain_lsthinglabel_recordedby=Recorded By
-label_com_labsynch_labseer_domain_lsthinglabel_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_lsthinglabel_version=Version
-label_com_labsynch_labseer_domain_lsthingstate=Ls Thing State
-label_com_labsynch_labseer_domain_lsthingstate_comments=Comments
-label_com_labsynch_labseer_domain_lsthingstate_deleted=Deleted
-label_com_labsynch_labseer_domain_lsthingstate_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_lsthingstate_id=Id
-label_com_labsynch_labseer_domain_lsthingstate_ignored=Ignored
-label_com_labsynch_labseer_domain_lsthingstate_lskind=Ls Kind
-label_com_labsynch_labseer_domain_lsthingstate_lsthing=Ls Thing
-label_com_labsynch_labseer_domain_lsthingstate_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_lsthingstate_lstype=Ls Type
-label_com_labsynch_labseer_domain_lsthingstate_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_lsthingstate_lsvalues=Ls Values
-label_com_labsynch_labseer_domain_lsthingstate_modifiedby=Modified By
-label_com_labsynch_labseer_domain_lsthingstate_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_lsthingstate_plural=Ls Thing States
-label_com_labsynch_labseer_domain_lsthingstate_recordedby=Recorded By
-label_com_labsynch_labseer_domain_lsthingstate_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_lsthingstate_version=Version
-label_com_labsynch_labseer_domain_lsthingvalue=Ls Thing Value
-label_com_labsynch_labseer_domain_lsthingvalue_blobvalue=Blob Value
-label_com_labsynch_labseer_domain_lsthingvalue_clobvalue=Clob Value
-label_com_labsynch_labseer_domain_lsthingvalue_codekind=Code Kind
-label_com_labsynch_labseer_domain_lsthingvalue_codeorigin=Code Origin
-label_com_labsynch_labseer_domain_lsthingvalue_codetype=Code Type
-label_com_labsynch_labseer_domain_lsthingvalue_codetypeandkind=Code Type And Kind
-label_com_labsynch_labseer_domain_lsthingvalue_codevalue=Code Value
-label_com_labsynch_labseer_domain_lsthingvalue_comments=Comments
-label_com_labsynch_labseer_domain_lsthingvalue_concentration=Concentration
-label_com_labsynch_labseer_domain_lsthingvalue_concunit=Conc Unit
-label_com_labsynch_labseer_domain_lsthingvalue_datevalue=Date Value
-label_com_labsynch_labseer_domain_lsthingvalue_deleted=Deleted
-label_com_labsynch_labseer_domain_lsthingvalue_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_lsthingvalue_filevalue=File Value
-label_com_labsynch_labseer_domain_lsthingvalue_id=Id
-label_com_labsynch_labseer_domain_lsthingvalue_ignored=Ignored
-label_com_labsynch_labseer_domain_lsthingvalue_lskind=Ls Kind
-label_com_labsynch_labseer_domain_lsthingvalue_lsstate=Ls State
-label_com_labsynch_labseer_domain_lsthingvalue_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_lsthingvalue_lstype=Ls Type
-label_com_labsynch_labseer_domain_lsthingvalue_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_lsthingvalue_modifiedby=Modified By
-label_com_labsynch_labseer_domain_lsthingvalue_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_lsthingvalue_numberofreplicates=Number Of Replicates
-label_com_labsynch_labseer_domain_lsthingvalue_numericvalue=Numeric Value
-label_com_labsynch_labseer_domain_lsthingvalue_operatorkind=Operator Kind
-label_com_labsynch_labseer_domain_lsthingvalue_operatortype=Operator Type
-label_com_labsynch_labseer_domain_lsthingvalue_operatortypeandkind=Operator Type And Kind
-label_com_labsynch_labseer_domain_lsthingvalue_plural=Ls Thing Values
-label_com_labsynch_labseer_domain_lsthingvalue_publicdata=Public Data
-label_com_labsynch_labseer_domain_lsthingvalue_recordedby=Recorded By
-label_com_labsynch_labseer_domain_lsthingvalue_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_lsthingvalue_sigfigs=Sig Figs
-label_com_labsynch_labseer_domain_lsthingvalue_stringvalue=String Value
-label_com_labsynch_labseer_domain_lsthingvalue_uncertainty=Uncertainty
-label_com_labsynch_labseer_domain_lsthingvalue_uncertaintytype=Uncertainty Type
-label_com_labsynch_labseer_domain_lsthingvalue_unitkind=Unit Kind
-label_com_labsynch_labseer_domain_lsthingvalue_unittype=Unit Type
-label_com_labsynch_labseer_domain_lsthingvalue_unittypeandkind=Unit Type And Kind
-label_com_labsynch_labseer_domain_lsthingvalue_urlvalue=Url Value
-label_com_labsynch_labseer_domain_lsthingvalue_version=Version
-label_com_labsynch_labseer_domain_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_lstransaction_comments=Comments
-label_com_labsynch_labseer_domain_lstransaction_id=Id
-label_com_labsynch_labseer_domain_lstransaction_plural=Ls Transactions
-label_com_labsynch_labseer_domain_lstransaction_recordedby=Recorded By
-label_com_labsynch_labseer_domain_lstransaction_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_lstransaction_status=Status
-label_com_labsynch_labseer_domain_lstransaction_type=Type
-label_com_labsynch_labseer_domain_lstransaction_version=Version
-label_com_labsynch_labseer_domain_operator=Operator
-label_com_labsynch_labseer_domain_operator_code=Code
-label_com_labsynch_labseer_domain_operator_id=Id
-label_com_labsynch_labseer_domain_operator_name=Name
-label_com_labsynch_labseer_domain_operator_plural=Operators
-label_com_labsynch_labseer_domain_operator_version=Version
-label_com_labsynch_labseer_domain_operatorkind=Operator Kind
-label_com_labsynch_labseer_domain_operatorkind_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_operatorkind_id=Id
-label_com_labsynch_labseer_domain_operatorkind_kindname=Kind Name
-label_com_labsynch_labseer_domain_operatorkind_lstype=Ls Type
-label_com_labsynch_labseer_domain_operatorkind_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_operatorkind_plural=Operator Kinds
-label_com_labsynch_labseer_domain_operatorkind_version=Version
-label_com_labsynch_labseer_domain_operatortype=Operator Type
-label_com_labsynch_labseer_domain_operatortype_id=Id
-label_com_labsynch_labseer_domain_operatortype_plural=Operator Types
-label_com_labsynch_labseer_domain_operatortype_typename=Type Name
-label_com_labsynch_labseer_domain_operatortype_version=Version
-label_com_labsynch_labseer_domain_parent=Parent
-label_com_labsynch_labseer_domain_parent_bulkloadfile=Bulk Load File
-label_com_labsynch_labseer_domain_parent_cdid=Cd Id
-label_com_labsynch_labseer_domain_parent_chemist=Chemist
-label_com_labsynch_labseer_domain_parent_comment=Comment
-label_com_labsynch_labseer_domain_parent_commonname=Common Name
-label_com_labsynch_labseer_domain_parent_compoundtype=Compound Type
-label_com_labsynch_labseer_domain_parent_corpname=Corp Name
-label_com_labsynch_labseer_domain_parent_exactmass=Exact Mass
-label_com_labsynch_labseer_domain_parent_id=Id
-label_com_labsynch_labseer_domain_parent_ignore=Ignore
-label_com_labsynch_labseer_domain_parent_ismixture=Is Mixture
-label_com_labsynch_labseer_domain_parent_labelprefix=Label Prefix
-label_com_labsynch_labseer_domain_parent_modifiedby=Modified By
-label_com_labsynch_labseer_domain_parent_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_parent_molformula=Mol Formula
-label_com_labsynch_labseer_domain_parent_molstructure=Mol Structure
-label_com_labsynch_labseer_domain_parent_molweight=Mol Weight
-label_com_labsynch_labseer_domain_parent_parentaliases=Parent Aliases
-label_com_labsynch_labseer_domain_parent_parentannotation=Parent Annotation
-label_com_labsynch_labseer_domain_parent_parentnumber=Parent Number
-label_com_labsynch_labseer_domain_parent_plural=Parents
-label_com_labsynch_labseer_domain_parent_registeredby=Registered By
-label_com_labsynch_labseer_domain_parent_registrationdate=Registration Date
-label_com_labsynch_labseer_domain_parent_saltforms=Salt Forms
-label_com_labsynch_labseer_domain_parent_stereocategory=Stereo Category
-label_com_labsynch_labseer_domain_parent_stereocomment=Stereo Comment
-label_com_labsynch_labseer_domain_parent_version=Version
-label_com_labsynch_labseer_domain_parentalias=Parent Alias
-label_com_labsynch_labseer_domain_parentalias_aliasname=Alias Name
-label_com_labsynch_labseer_domain_parentalias_deleted=Deleted
-label_com_labsynch_labseer_domain_parentalias_id=Id
-label_com_labsynch_labseer_domain_parentalias_ignored=Ignored
-label_com_labsynch_labseer_domain_parentalias_lskind=Ls Kind
-label_com_labsynch_labseer_domain_parentalias_lstype=Ls Type
-label_com_labsynch_labseer_domain_parentalias_parent=Parent
-label_com_labsynch_labseer_domain_parentalias_plural=Parent Aliases
-label_com_labsynch_labseer_domain_parentalias_preferred=Preferred
-label_com_labsynch_labseer_domain_parentalias_sortid=Sort Id
-label_com_labsynch_labseer_domain_parentalias_version=Version
-label_com_labsynch_labseer_domain_parentaliaskind=Parent Alias Kind
-label_com_labsynch_labseer_domain_parentaliaskind_id=Id
-label_com_labsynch_labseer_domain_parentaliaskind_kindname=Kind Name
-label_com_labsynch_labseer_domain_parentaliaskind_lstype=Ls Type
-label_com_labsynch_labseer_domain_parentaliaskind_plural=Parent Alias Kinds
-label_com_labsynch_labseer_domain_parentaliaskind_version=Version
-label_com_labsynch_labseer_domain_parentaliastype=Parent Alias Type
-label_com_labsynch_labseer_domain_parentaliastype_id=Id
-label_com_labsynch_labseer_domain_parentaliastype_plural=Parent Alias Types
-label_com_labsynch_labseer_domain_parentaliastype_typename=Type Name
-label_com_labsynch_labseer_domain_parentaliastype_version=Version
-label_com_labsynch_labseer_domain_parentannotation=Parent Annotation
-label_com_labsynch_labseer_domain_parentannotation_code=Code
-label_com_labsynch_labseer_domain_parentannotation_comment=Comment
-label_com_labsynch_labseer_domain_parentannotation_displayorder=Display Order
-label_com_labsynch_labseer_domain_parentannotation_id=Id
-label_com_labsynch_labseer_domain_parentannotation_name=Name
-label_com_labsynch_labseer_domain_parentannotation_plural=Parent Annotations
-label_com_labsynch_labseer_domain_parentannotation_version=Version
-label_com_labsynch_labseer_domain_physicalstate=Physical State
-label_com_labsynch_labseer_domain_physicalstate_code=Code
-label_com_labsynch_labseer_domain_physicalstate_id=Id
-label_com_labsynch_labseer_domain_physicalstate_name=Name
-label_com_labsynch_labseer_domain_physicalstate_plural=Physical States
-label_com_labsynch_labseer_domain_physicalstate_version=Version
-label_com_labsynch_labseer_domain_predef_corpname=Pre Def_ Corp Name
-label_com_labsynch_labseer_domain_predef_corpname_comment=Comment
-label_com_labsynch_labseer_domain_predef_corpname_corpname=Corp Name
-label_com_labsynch_labseer_domain_predef_corpname_corpnumber=Corp Number
-label_com_labsynch_labseer_domain_predef_corpname_id=Id
-label_com_labsynch_labseer_domain_predef_corpname_plural=Pre Def_ Corp Names
-label_com_labsynch_labseer_domain_predef_corpname_skip=Skip
-label_com_labsynch_labseer_domain_predef_corpname_used=Used
-label_com_labsynch_labseer_domain_predef_corpname_version=Version
-label_com_labsynch_labseer_domain_project=Project
-label_com_labsynch_labseer_domain_project_code=Code
-label_com_labsynch_labseer_domain_project_id=Id
-label_com_labsynch_labseer_domain_project_name=Name
-label_com_labsynch_labseer_domain_project_plural=Projects
-label_com_labsynch_labseer_domain_project_version=Version
-label_com_labsynch_labseer_domain_protocol=Protocol
-label_com_labsynch_labseer_domain_protocol_codename=Code Name
-label_com_labsynch_labseer_domain_protocol_deleted=Deleted
-label_com_labsynch_labseer_domain_protocol_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_protocol_experiments=Experiments
-label_com_labsynch_labseer_domain_protocol_firstprotocols=First Protocols
-label_com_labsynch_labseer_domain_protocol_id=Id
-label_com_labsynch_labseer_domain_protocol_ignored=Ignored
-label_com_labsynch_labseer_domain_protocol_kind=Kind
-label_com_labsynch_labseer_domain_protocol_lskind=Ls Kind
-label_com_labsynch_labseer_domain_protocol_lslabels=Ls Labels
-label_com_labsynch_labseer_domain_protocol_lsstates=Ls States
-label_com_labsynch_labseer_domain_protocol_lstags=Ls Tags
-label_com_labsynch_labseer_domain_protocol_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_protocol_lstype=Ls Type
-label_com_labsynch_labseer_domain_protocol_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_protocol_modifiedby=Modified By
-label_com_labsynch_labseer_domain_protocol_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_protocol_plural=Protocols
-label_com_labsynch_labseer_domain_protocol_protocol=Protocol
-label_com_labsynch_labseer_domain_protocol_protocolkind=Protocol Kind
-label_com_labsynch_labseer_domain_protocol_protocollabels=Protocol Labels
-label_com_labsynch_labseer_domain_protocol_protocolstates=Protocol States
-label_com_labsynch_labseer_domain_protocol_protocoltags=Protocol Tags
-label_com_labsynch_labseer_domain_protocol_protocoltype=Protocol Type
-label_com_labsynch_labseer_domain_protocol_protocoltypeandkind=Protocol Type And Kind
-label_com_labsynch_labseer_domain_protocol_recordedby=Recorded By
-label_com_labsynch_labseer_domain_protocol_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_protocol_secondprotocols=Second Protocols
-label_com_labsynch_labseer_domain_protocol_shortdescription=Short Description
-label_com_labsynch_labseer_domain_protocol_thingpage=Thing Page
-label_com_labsynch_labseer_domain_protocol_version=Version
-label_com_labsynch_labseer_domain_protocolkind=Protocol Kind
-label_com_labsynch_labseer_domain_protocolkind_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_protocolkind_id=Id
-label_com_labsynch_labseer_domain_protocolkind_kindname=Kind Name
-label_com_labsynch_labseer_domain_protocolkind_lstype=Ls Type
-label_com_labsynch_labseer_domain_protocolkind_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_protocolkind_plural=Protocol Kinds
-label_com_labsynch_labseer_domain_protocolkind_version=Version
-label_com_labsynch_labseer_domain_protocollabel=Protocol Label
-label_com_labsynch_labseer_domain_protocollabel_deleted=Deleted
-label_com_labsynch_labseer_domain_protocollabel_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_protocollabel_id=Id
-label_com_labsynch_labseer_domain_protocollabel_ignored=Ignored
-label_com_labsynch_labseer_domain_protocollabel_imagefile=Image File
-label_com_labsynch_labseer_domain_protocollabel_imgagefile=Imgage File
-label_com_labsynch_labseer_domain_protocollabel_labelkind=Label Kind
-label_com_labsynch_labseer_domain_protocollabel_labeltext=Label Text
-label_com_labsynch_labseer_domain_protocollabel_labeltype=Label Type
-label_com_labsynch_labseer_domain_protocollabel_labeltypeandkind=Label Type And Kind
-label_com_labsynch_labseer_domain_protocollabel_labelvalue=Label Value
-label_com_labsynch_labseer_domain_protocollabel_lskind=Ls Kind
-label_com_labsynch_labseer_domain_protocollabel_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_protocollabel_lstype=Ls Type
-label_com_labsynch_labseer_domain_protocollabel_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_protocollabel_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_protocollabel_physicallylabled=Physically Labled
-label_com_labsynch_labseer_domain_protocollabel_plural=Protocol Labels
-label_com_labsynch_labseer_domain_protocollabel_preferred=Preferred
-label_com_labsynch_labseer_domain_protocollabel_protocol=Protocol
-label_com_labsynch_labseer_domain_protocollabel_recordedby=Recorded By
-label_com_labsynch_labseer_domain_protocollabel_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_protocollabel_version=Version
-label_com_labsynch_labseer_domain_protocolstate=Protocol State
-label_com_labsynch_labseer_domain_protocolstate_comments=Comments
-label_com_labsynch_labseer_domain_protocolstate_deleted=Deleted
-label_com_labsynch_labseer_domain_protocolstate_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_protocolstate_id=Id
-label_com_labsynch_labseer_domain_protocolstate_ignored=Ignored
-label_com_labsynch_labseer_domain_protocolstate_lskind=Ls Kind
-label_com_labsynch_labseer_domain_protocolstate_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_protocolstate_lstype=Ls Type
-label_com_labsynch_labseer_domain_protocolstate_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_protocolstate_lsvalues=Ls Values
-label_com_labsynch_labseer_domain_protocolstate_modifiedby=Modified By
-label_com_labsynch_labseer_domain_protocolstate_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_protocolstate_plural=Protocol States
-label_com_labsynch_labseer_domain_protocolstate_protocol=Protocol
-label_com_labsynch_labseer_domain_protocolstate_protocolvalues=Protocol Values
-label_com_labsynch_labseer_domain_protocolstate_recordedby=Recorded By
-label_com_labsynch_labseer_domain_protocolstate_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_protocolstate_statekind=State Kind
-label_com_labsynch_labseer_domain_protocolstate_statetype=State Type
-label_com_labsynch_labseer_domain_protocolstate_statetypeandkind=State Type And Kind
-label_com_labsynch_labseer_domain_protocolstate_version=Version
-label_com_labsynch_labseer_domain_protocoltype=Protocol Type
-label_com_labsynch_labseer_domain_protocoltype_id=Id
-label_com_labsynch_labseer_domain_protocoltype_plural=Protocol Types
-label_com_labsynch_labseer_domain_protocoltype_typename=Type Name
-label_com_labsynch_labseer_domain_protocoltype_version=Version
-label_com_labsynch_labseer_domain_protocolvalue=Protocol Value
-label_com_labsynch_labseer_domain_protocolvalue_batchcode=Batch Code
-label_com_labsynch_labseer_domain_protocolvalue_blobvalue=Blob Value
-label_com_labsynch_labseer_domain_protocolvalue_clobvalue=Clob Value
-label_com_labsynch_labseer_domain_protocolvalue_codekind=Code Kind
-label_com_labsynch_labseer_domain_protocolvalue_codeorigin=Code Origin
-label_com_labsynch_labseer_domain_protocolvalue_codetype=Code Type
-label_com_labsynch_labseer_domain_protocolvalue_codetypeandkind=Code Type And Kind
-label_com_labsynch_labseer_domain_protocolvalue_codevalue=Code Value
-label_com_labsynch_labseer_domain_protocolvalue_comments=Comments
-label_com_labsynch_labseer_domain_protocolvalue_concentration=Concentration
-label_com_labsynch_labseer_domain_protocolvalue_concunit=Conc Unit
-label_com_labsynch_labseer_domain_protocolvalue_concvalue=Conc Value
-label_com_labsynch_labseer_domain_protocolvalue_datevalue=Date Value
-label_com_labsynch_labseer_domain_protocolvalue_deleted=Deleted
-label_com_labsynch_labseer_domain_protocolvalue_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_protocolvalue_filevalue=File Value
-label_com_labsynch_labseer_domain_protocolvalue_id=Id
-label_com_labsynch_labseer_domain_protocolvalue_ignored=Ignored
-label_com_labsynch_labseer_domain_protocolvalue_lskind=Ls Kind
-label_com_labsynch_labseer_domain_protocolvalue_lsstate=Ls State
-label_com_labsynch_labseer_domain_protocolvalue_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_protocolvalue_lstype=Ls Type
-label_com_labsynch_labseer_domain_protocolvalue_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_protocolvalue_modifiedby=Modified By
-label_com_labsynch_labseer_domain_protocolvalue_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_protocolvalue_numberofreplicates=Number Of Replicates
-label_com_labsynch_labseer_domain_protocolvalue_numericvalue=Numeric Value
-label_com_labsynch_labseer_domain_protocolvalue_operatorkind=Operator Kind
-label_com_labsynch_labseer_domain_protocolvalue_operatortype=Operator Type
-label_com_labsynch_labseer_domain_protocolvalue_operatortypeandkind=Operator Type And Kind
-label_com_labsynch_labseer_domain_protocolvalue_plural=Protocol Values
-label_com_labsynch_labseer_domain_protocolvalue_protocolstate=Protocol State
-label_com_labsynch_labseer_domain_protocolvalue_publicdata=Public Data
-label_com_labsynch_labseer_domain_protocolvalue_recordedby=Recorded By
-label_com_labsynch_labseer_domain_protocolvalue_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_protocolvalue_sigfigs=Sig Figs
-label_com_labsynch_labseer_domain_protocolvalue_stringvalue=String Value
-label_com_labsynch_labseer_domain_protocolvalue_temp=Temp
-label_com_labsynch_labseer_domain_protocolvalue_uncertainty=Uncertainty
-label_com_labsynch_labseer_domain_protocolvalue_uncertaintytype=Uncertainty Type
-label_com_labsynch_labseer_domain_protocolvalue_unitkind=Unit Kind
-label_com_labsynch_labseer_domain_protocolvalue_unittype=Unit Type
-label_com_labsynch_labseer_domain_protocolvalue_unittypeandkind=Unit Type And Kind
-label_com_labsynch_labseer_domain_protocolvalue_urlvalue=Url Value
-label_com_labsynch_labseer_domain_protocolvalue_valuekind=Value Kind
-label_com_labsynch_labseer_domain_protocolvalue_valueoperator=Value Operator
-label_com_labsynch_labseer_domain_protocolvalue_valuetype=Value Type
-label_com_labsynch_labseer_domain_protocolvalue_valuetypeandkind=Value Type And Kind
-label_com_labsynch_labseer_domain_protocolvalue_valueunit=Value Unit
-label_com_labsynch_labseer_domain_protocolvalue_version=Version
-label_com_labsynch_labseer_domain_puritymeasuredby=Purity Measured By
-label_com_labsynch_labseer_domain_puritymeasuredby_code=Code
-label_com_labsynch_labseer_domain_puritymeasuredby_id=Id
-label_com_labsynch_labseer_domain_puritymeasuredby_name=Name
-label_com_labsynch_labseer_domain_puritymeasuredby_plural=Purity Measured Bys
-label_com_labsynch_labseer_domain_puritymeasuredby_version=Version
-label_com_labsynch_labseer_domain_qccompound=Qc Compound
-label_com_labsynch_labseer_domain_qccompound_alias=Alias
-label_com_labsynch_labseer_domain_qccompound_cdid=Cd Id
-label_com_labsynch_labseer_domain_qccompound_comment=Comment
-label_com_labsynch_labseer_domain_qccompound_corpname=Corp Name
-label_com_labsynch_labseer_domain_qccompound_displaychange=Display Change
-label_com_labsynch_labseer_domain_qccompound_dupecorpname=Dupe Corp Name
-label_com_labsynch_labseer_domain_qccompound_dupecount=Dupe Count
-label_com_labsynch_labseer_domain_qccompound_id=Id
-label_com_labsynch_labseer_domain_qccompound_ignore=Ignore
-label_com_labsynch_labseer_domain_qccompound_molstructure=Mol Structure
-label_com_labsynch_labseer_domain_qccompound_parentid=Parent Id
-label_com_labsynch_labseer_domain_qccompound_plural=Qc Compounds
-label_com_labsynch_labseer_domain_qccompound_qcdate=Qc Date
-label_com_labsynch_labseer_domain_qccompound_runnumber=Run Number
-label_com_labsynch_labseer_domain_qccompound_stereocategory=Stereo Category
-label_com_labsynch_labseer_domain_qccompound_stereocomment=Stereo Comment
-label_com_labsynch_labseer_domain_qccompound_version=Version
-label_com_labsynch_labseer_domain_role=Role
-label_com_labsynch_labseer_domain_role_id=Id
-label_com_labsynch_labseer_domain_role_plural=Roles
-label_com_labsynch_labseer_domain_role_roledescription=Role Description
-label_com_labsynch_labseer_domain_role_rolename=Role Name
-label_com_labsynch_labseer_domain_role_version=Version
-label_com_labsynch_labseer_domain_rolekind=Role Kind
-label_com_labsynch_labseer_domain_rolekind_id=Id
-label_com_labsynch_labseer_domain_rolekind_kindname=Kind Name
-label_com_labsynch_labseer_domain_rolekind_lstype=Ls Type
-label_com_labsynch_labseer_domain_rolekind_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_rolekind_plural=Role Kinds
-label_com_labsynch_labseer_domain_rolekind_version=Version
-label_com_labsynch_labseer_domain_roletype=Role Type
-label_com_labsynch_labseer_domain_roletype_id=Id
-label_com_labsynch_labseer_domain_roletype_plural=Role Types
-label_com_labsynch_labseer_domain_roletype_typename=Type Name
-label_com_labsynch_labseer_domain_roletype_version=Version
-label_com_labsynch_labseer_domain_salt=Salt
-label_com_labsynch_labseer_domain_salt_abbrev=Abbrev
-label_com_labsynch_labseer_domain_salt_cdid=Cd Id
-label_com_labsynch_labseer_domain_salt_charge=Charge
-label_com_labsynch_labseer_domain_salt_formula=Formula
-label_com_labsynch_labseer_domain_salt_id=Id
-label_com_labsynch_labseer_domain_salt_ignore=Ignore
-label_com_labsynch_labseer_domain_salt_molstructure=Mol Structure
-label_com_labsynch_labseer_domain_salt_molweight=Mol Weight
-label_com_labsynch_labseer_domain_salt_name=Name
-label_com_labsynch_labseer_domain_salt_originalstructure=Original Structure
-label_com_labsynch_labseer_domain_salt_plural=Salts
-label_com_labsynch_labseer_domain_salt_version=Version
-label_com_labsynch_labseer_domain_saltform=Salt Form
-label_com_labsynch_labseer_domain_saltform_author=Author
-label_com_labsynch_labseer_domain_saltform_bulkloadfile=Bulk Load File
-label_com_labsynch_labseer_domain_saltform_casnumber=Cas Number
-label_com_labsynch_labseer_domain_saltform_cdid=Cd Id
-label_com_labsynch_labseer_domain_saltform_chemist=Chemist
-label_com_labsynch_labseer_domain_saltform_corpname=Corp Name
-label_com_labsynch_labseer_domain_saltform_id=Id
-label_com_labsynch_labseer_domain_saltform_ignore=Ignore
-label_com_labsynch_labseer_domain_saltform_isosalts=Iso Salts
-label_com_labsynch_labseer_domain_saltform_lots=Lots
-label_com_labsynch_labseer_domain_saltform_molstructure=Mol Structure
-label_com_labsynch_labseer_domain_saltform_parent=Parent
-label_com_labsynch_labseer_domain_saltform_plural=Salt Forms
-label_com_labsynch_labseer_domain_saltform_registrationdate=Registration Date
-label_com_labsynch_labseer_domain_saltform_saltweight=Salt Weight
-label_com_labsynch_labseer_domain_saltform_version=Version
-label_com_labsynch_labseer_domain_saltformalias=Salt Form Alias
-label_com_labsynch_labseer_domain_saltformalias_aliasname=Alias Name
-label_com_labsynch_labseer_domain_saltformalias_deleted=Deleted
-label_com_labsynch_labseer_domain_saltformalias_id=Id
-label_com_labsynch_labseer_domain_saltformalias_ignored=Ignored
-label_com_labsynch_labseer_domain_saltformalias_lskind=Ls Kind
-label_com_labsynch_labseer_domain_saltformalias_lstype=Ls Type
-label_com_labsynch_labseer_domain_saltformalias_plural=Salt Form Aliases
-label_com_labsynch_labseer_domain_saltformalias_preferred=Preferred
-label_com_labsynch_labseer_domain_saltformalias_saltform=Salt Form
-label_com_labsynch_labseer_domain_saltformalias_version=Version
-label_com_labsynch_labseer_domain_saltformaliaskind=Salt Form Alias Kind
-label_com_labsynch_labseer_domain_saltformaliaskind_id=Id
-label_com_labsynch_labseer_domain_saltformaliaskind_kindname=Kind Name
-label_com_labsynch_labseer_domain_saltformaliaskind_lstype=Ls Type
-label_com_labsynch_labseer_domain_saltformaliaskind_plural=Salt Form Alias Kinds
-label_com_labsynch_labseer_domain_saltformaliaskind_version=Version
-label_com_labsynch_labseer_domain_saltformaliastype=Salt Form Alias Type
-label_com_labsynch_labseer_domain_saltformaliastype_id=Id
-label_com_labsynch_labseer_domain_saltformaliastype_plural=Salt Form Alias Types
-label_com_labsynch_labseer_domain_saltformaliastype_typename=Type Name
-label_com_labsynch_labseer_domain_saltformaliastype_version=Version
-label_com_labsynch_labseer_domain_scientist=Scientist
-label_com_labsynch_labseer_domain_scientist_code=Code
-label_com_labsynch_labseer_domain_scientist_id=Id
-label_com_labsynch_labseer_domain_scientist_ignore=Ignore
-label_com_labsynch_labseer_domain_scientist_isadmin=Is Admin
-label_com_labsynch_labseer_domain_scientist_ischemist=Is Chemist
-label_com_labsynch_labseer_domain_scientist_name=Name
-label_com_labsynch_labseer_domain_scientist_plural=Scientists
-label_com_labsynch_labseer_domain_scientist_version=Version
-label_com_labsynch_labseer_domain_solutionunit=Solution Unit
-label_com_labsynch_labseer_domain_solutionunit_code=Code
-label_com_labsynch_labseer_domain_solutionunit_id=Id
-label_com_labsynch_labseer_domain_solutionunit_name=Name
-label_com_labsynch_labseer_domain_solutionunit_plural=Solution Units
-label_com_labsynch_labseer_domain_solutionunit_version=Version
-label_com_labsynch_labseer_domain_statekind=State Kind
-label_com_labsynch_labseer_domain_statekind_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_statekind_id=Id
-label_com_labsynch_labseer_domain_statekind_kindname=Kind Name
-label_com_labsynch_labseer_domain_statekind_lstype=Ls Type
-label_com_labsynch_labseer_domain_statekind_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_statekind_plural=State Kinds
-label_com_labsynch_labseer_domain_statekind_statetype=State Type
-label_com_labsynch_labseer_domain_statekind_typeandkind=Type And Kind
-label_com_labsynch_labseer_domain_statekind_version=Version
-label_com_labsynch_labseer_domain_statetype=State Type
-label_com_labsynch_labseer_domain_statetype_id=Id
-label_com_labsynch_labseer_domain_statetype_plural=State Types
-label_com_labsynch_labseer_domain_statetype_typename=Type Name
-label_com_labsynch_labseer_domain_statetype_version=Version
-label_com_labsynch_labseer_domain_stereocategory=Stereo Category
-label_com_labsynch_labseer_domain_stereocategory_code=Code
-label_com_labsynch_labseer_domain_stereocategory_id=Id
-label_com_labsynch_labseer_domain_stereocategory_name=Name
-label_com_labsynch_labseer_domain_stereocategory_plural=Stereo Categorys
-label_com_labsynch_labseer_domain_stereocategory_version=Version
-label_com_labsynch_labseer_domain_structurekind=Structure Kind
-label_com_labsynch_labseer_domain_structurekind_id=Id
-label_com_labsynch_labseer_domain_structurekind_kindname=Kind Name
-label_com_labsynch_labseer_domain_structurekind_lstype=Ls Type
-label_com_labsynch_labseer_domain_structurekind_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_structurekind_plural=Structure Kinds
-label_com_labsynch_labseer_domain_structurekind_version=Version
-label_com_labsynch_labseer_domain_structuretype=Structure Type
-label_com_labsynch_labseer_domain_structuretype_id=Id
-label_com_labsynch_labseer_domain_structuretype_plural=Structure Types
-label_com_labsynch_labseer_domain_structuretype_typename=Type Name
-label_com_labsynch_labseer_domain_structuretype_version=Version
-label_com_labsynch_labseer_domain_subject=Subject
-label_com_labsynch_labseer_domain_subject_codename=Code Name
-label_com_labsynch_labseer_domain_subject_containers=Containers
-label_com_labsynch_labseer_domain_subject_deleted=Deleted
-label_com_labsynch_labseer_domain_subject_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_subject_id=Id
-label_com_labsynch_labseer_domain_subject_ignored=Ignored
-label_com_labsynch_labseer_domain_subject_kind=Kind
-label_com_labsynch_labseer_domain_subject_lskind=Ls Kind
-label_com_labsynch_labseer_domain_subject_lslabels=Ls Labels
-label_com_labsynch_labseer_domain_subject_lsstates=Ls States
-label_com_labsynch_labseer_domain_subject_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_subject_lstype=Ls Type
-label_com_labsynch_labseer_domain_subject_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_subject_modifiedby=Modified By
-label_com_labsynch_labseer_domain_subject_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_subject_plural=Subjects
-label_com_labsynch_labseer_domain_subject_recordedby=Recorded By
-label_com_labsynch_labseer_domain_subject_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_subject_subjectlabels=Subject Labels
-label_com_labsynch_labseer_domain_subject_subjectstates=Subject States
-label_com_labsynch_labseer_domain_subject_thingpage=Thing Page
-label_com_labsynch_labseer_domain_subject_treatmentgroup=Treatment Group
-label_com_labsynch_labseer_domain_subject_treatmentgroups=Treatment Groups
-label_com_labsynch_labseer_domain_subject_version=Version
-label_com_labsynch_labseer_domain_subjectlabel=Subject Label
-label_com_labsynch_labseer_domain_subjectlabel_deleted=Deleted
-label_com_labsynch_labseer_domain_subjectlabel_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_subjectlabel_id=Id
-label_com_labsynch_labseer_domain_subjectlabel_ignored=Ignored
-label_com_labsynch_labseer_domain_subjectlabel_imagefile=Image File
-label_com_labsynch_labseer_domain_subjectlabel_labelkind=Label Kind
-label_com_labsynch_labseer_domain_subjectlabel_labeltext=Label Text
-label_com_labsynch_labseer_domain_subjectlabel_labeltype=Label Type
-label_com_labsynch_labseer_domain_subjectlabel_labeltypeandkind=Label Type And Kind
-label_com_labsynch_labseer_domain_subjectlabel_lskind=Ls Kind
-label_com_labsynch_labseer_domain_subjectlabel_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_subjectlabel_lstype=Ls Type
-label_com_labsynch_labseer_domain_subjectlabel_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_subjectlabel_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_subjectlabel_physicallylabled=Physically Labled
-label_com_labsynch_labseer_domain_subjectlabel_plural=Subject Labels
-label_com_labsynch_labseer_domain_subjectlabel_preferred=Preferred
-label_com_labsynch_labseer_domain_subjectlabel_recordedby=Recorded By
-label_com_labsynch_labseer_domain_subjectlabel_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_subjectlabel_subject=Subject
-label_com_labsynch_labseer_domain_subjectlabel_version=Version
-label_com_labsynch_labseer_domain_subjectstate=Subject State
-label_com_labsynch_labseer_domain_subjectstate_comments=Comments
-label_com_labsynch_labseer_domain_subjectstate_deleted=Deleted
-label_com_labsynch_labseer_domain_subjectstate_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_subjectstate_id=Id
-label_com_labsynch_labseer_domain_subjectstate_ignored=Ignored
-label_com_labsynch_labseer_domain_subjectstate_lskind=Ls Kind
-label_com_labsynch_labseer_domain_subjectstate_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_subjectstate_lstype=Ls Type
-label_com_labsynch_labseer_domain_subjectstate_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_subjectstate_lsvalues=Ls Values
-label_com_labsynch_labseer_domain_subjectstate_modifiedby=Modified By
-label_com_labsynch_labseer_domain_subjectstate_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_subjectstate_plural=Subject States
-label_com_labsynch_labseer_domain_subjectstate_propertiesutilservice=Properties Util Service
-label_com_labsynch_labseer_domain_subjectstate_recordedby=Recorded By
-label_com_labsynch_labseer_domain_subjectstate_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_subjectstate_statekind=State Kind
-label_com_labsynch_labseer_domain_subjectstate_statetype=State Type
-label_com_labsynch_labseer_domain_subjectstate_statetypeandkind=State Type And Kind
-label_com_labsynch_labseer_domain_subjectstate_subject=Subject
-label_com_labsynch_labseer_domain_subjectstate_subjectvalues=Subject Values
-label_com_labsynch_labseer_domain_subjectstate_version=Version
-label_com_labsynch_labseer_domain_subjectvalue=Subject Value
-label_com_labsynch_labseer_domain_subjectvalue_batchcode=Batch Code
-label_com_labsynch_labseer_domain_subjectvalue_blobvalue=Blob Value
-label_com_labsynch_labseer_domain_subjectvalue_clobvalue=Clob Value
-label_com_labsynch_labseer_domain_subjectvalue_codekind=Code Kind
-label_com_labsynch_labseer_domain_subjectvalue_codeorigin=Code Origin
-label_com_labsynch_labseer_domain_subjectvalue_codetype=Code Type
-label_com_labsynch_labseer_domain_subjectvalue_codetypeandkind=Code Type And Kind
-label_com_labsynch_labseer_domain_subjectvalue_codevalue=Code Value
-label_com_labsynch_labseer_domain_subjectvalue_comments=Comments
-label_com_labsynch_labseer_domain_subjectvalue_concentration=Concentration
-label_com_labsynch_labseer_domain_subjectvalue_concunit=Conc Unit
-label_com_labsynch_labseer_domain_subjectvalue_concvalue=Conc Value
-label_com_labsynch_labseer_domain_subjectvalue_datevalue=Date Value
-label_com_labsynch_labseer_domain_subjectvalue_deleted=Deleted
-label_com_labsynch_labseer_domain_subjectvalue_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_subjectvalue_filevalue=File Value
-label_com_labsynch_labseer_domain_subjectvalue_id=Id
-label_com_labsynch_labseer_domain_subjectvalue_ignored=Ignored
-label_com_labsynch_labseer_domain_subjectvalue_lskind=Ls Kind
-label_com_labsynch_labseer_domain_subjectvalue_lsstate=Ls State
-label_com_labsynch_labseer_domain_subjectvalue_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_subjectvalue_lstype=Ls Type
-label_com_labsynch_labseer_domain_subjectvalue_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_subjectvalue_modifiedby=Modified By
-label_com_labsynch_labseer_domain_subjectvalue_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_subjectvalue_numberofreplicates=Number Of Replicates
-label_com_labsynch_labseer_domain_subjectvalue_numericvalue=Numeric Value
-label_com_labsynch_labseer_domain_subjectvalue_operatorkind=Operator Kind
-label_com_labsynch_labseer_domain_subjectvalue_operatortype=Operator Type
-label_com_labsynch_labseer_domain_subjectvalue_operatortypeandkind=Operator Type And Kind
-label_com_labsynch_labseer_domain_subjectvalue_plural=Subject Values
-label_com_labsynch_labseer_domain_subjectvalue_propertiesutilservice=Properties Util Service
-label_com_labsynch_labseer_domain_subjectvalue_publicdata=Public Data
-label_com_labsynch_labseer_domain_subjectvalue_recordedby=Recorded By
-label_com_labsynch_labseer_domain_subjectvalue_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_subjectvalue_sigfigs=Sig Figs
-label_com_labsynch_labseer_domain_subjectvalue_stringvalue=String Value
-label_com_labsynch_labseer_domain_subjectvalue_subjectstate=Subject State
-label_com_labsynch_labseer_domain_subjectvalue_uncertainty=Uncertainty
-label_com_labsynch_labseer_domain_subjectvalue_uncertaintytype=Uncertainty Type
-label_com_labsynch_labseer_domain_subjectvalue_unitkind=Unit Kind
-label_com_labsynch_labseer_domain_subjectvalue_unittype=Unit Type
-label_com_labsynch_labseer_domain_subjectvalue_unittypeandkind=Unit Type And Kind
-label_com_labsynch_labseer_domain_subjectvalue_urlvalue=Url Value
-label_com_labsynch_labseer_domain_subjectvalue_valuekind=Value Kind
-label_com_labsynch_labseer_domain_subjectvalue_valueoperator=Value Operator
-label_com_labsynch_labseer_domain_subjectvalue_valuetype=Value Type
-label_com_labsynch_labseer_domain_subjectvalue_valuetypeandkind=Value Type And Kind
-label_com_labsynch_labseer_domain_subjectvalue_valueunit=Value Unit
-label_com_labsynch_labseer_domain_subjectvalue_version=Version
-label_com_labsynch_labseer_domain_tempselecttable=Temp Select Table
-label_com_labsynch_labseer_domain_tempselecttable_id=Id
-label_com_labsynch_labseer_domain_tempselecttable_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_tempselecttable_numbervar=Number Var
-label_com_labsynch_labseer_domain_tempselecttable_plural=Temp Select Tables
-label_com_labsynch_labseer_domain_tempselecttable_recordedby=Recorded By
-label_com_labsynch_labseer_domain_tempselecttable_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_tempselecttable_stringvar=String Var
-label_com_labsynch_labseer_domain_tempselecttable_version=Version
-label_com_labsynch_labseer_domain_thingkind=Thing Kind
-label_com_labsynch_labseer_domain_thingkind_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_thingkind_id=Id
-label_com_labsynch_labseer_domain_thingkind_kindname=Kind Name
-label_com_labsynch_labseer_domain_thingkind_lstype=Ls Type
-label_com_labsynch_labseer_domain_thingkind_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_thingkind_plural=Thing Kinds
-label_com_labsynch_labseer_domain_thingkind_thingtype=Thing Type
-label_com_labsynch_labseer_domain_thingkind_typeandkind=Type And Kind
-label_com_labsynch_labseer_domain_thingkind_version=Version
-label_com_labsynch_labseer_domain_thingpage=Thing Page
-label_com_labsynch_labseer_domain_thingpage_archived=Archived
-label_com_labsynch_labseer_domain_thingpage_currenteditor=Current Editor
-label_com_labsynch_labseer_domain_thingpage_id=Id
-label_com_labsynch_labseer_domain_thingpage_ignored=Ignored
-label_com_labsynch_labseer_domain_thingpage_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_thingpage_modifiedby=Modified By
-label_com_labsynch_labseer_domain_thingpage_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_thingpage_pagecontent=Page Content
-label_com_labsynch_labseer_domain_thingpage_pagename=Page Name
-label_com_labsynch_labseer_domain_thingpage_plural=Thing Pages
-label_com_labsynch_labseer_domain_thingpage_recordedby=Recorded By
-label_com_labsynch_labseer_domain_thingpage_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_thingpage_thing=Thing
-label_com_labsynch_labseer_domain_thingpage_version=Version
-label_com_labsynch_labseer_domain_thingpagearchive=Thing Page Archive
-label_com_labsynch_labseer_domain_thingpagearchive_archived=Archived
-label_com_labsynch_labseer_domain_thingpagearchive_currenteditor=Current Editor
-label_com_labsynch_labseer_domain_thingpagearchive_id=Id
-label_com_labsynch_labseer_domain_thingpagearchive_ignored=Ignored
-label_com_labsynch_labseer_domain_thingpagearchive_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_thingpagearchive_modifiedby=Modified By
-label_com_labsynch_labseer_domain_thingpagearchive_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_thingpagearchive_pagecontent=Page Content
-label_com_labsynch_labseer_domain_thingpagearchive_pagename=Page Name
-label_com_labsynch_labseer_domain_thingpagearchive_pageversion=Page Version
-label_com_labsynch_labseer_domain_thingpagearchive_plural=Thing Page Archives
-label_com_labsynch_labseer_domain_thingpagearchive_recordedby=Recorded By
-label_com_labsynch_labseer_domain_thingpagearchive_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_thingpagearchive_thing=Thing
-label_com_labsynch_labseer_domain_thingpagearchive_version=Version
-label_com_labsynch_labseer_domain_thingtype=Thing Type
-label_com_labsynch_labseer_domain_thingtype_id=Id
-label_com_labsynch_labseer_domain_thingtype_plural=Thing Types
-label_com_labsynch_labseer_domain_thingtype_typename=Type Name
-label_com_labsynch_labseer_domain_thingtype_version=Version
-label_com_labsynch_labseer_domain_treatmentgroup=Treatment Group
-label_com_labsynch_labseer_domain_treatmentgroup_analysisgroup=Analysis Group
-label_com_labsynch_labseer_domain_treatmentgroup_analysisgroups=Analysis Groups
-label_com_labsynch_labseer_domain_treatmentgroup_codename=Code Name
-label_com_labsynch_labseer_domain_treatmentgroup_deleted=Deleted
-label_com_labsynch_labseer_domain_treatmentgroup_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_treatmentgroup_id=Id
-label_com_labsynch_labseer_domain_treatmentgroup_ignored=Ignored
-label_com_labsynch_labseer_domain_treatmentgroup_kind=Kind
-label_com_labsynch_labseer_domain_treatmentgroup_lskind=Ls Kind
-label_com_labsynch_labseer_domain_treatmentgroup_lslabels=Ls Labels
-label_com_labsynch_labseer_domain_treatmentgroup_lsstates=Ls States
-label_com_labsynch_labseer_domain_treatmentgroup_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_treatmentgroup_lstype=Ls Type
-label_com_labsynch_labseer_domain_treatmentgroup_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_treatmentgroup_modifiedby=Modified By
-label_com_labsynch_labseer_domain_treatmentgroup_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_treatmentgroup_plural=Treatment Groups
-label_com_labsynch_labseer_domain_treatmentgroup_recordedby=Recorded By
-label_com_labsynch_labseer_domain_treatmentgroup_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_treatmentgroup_subjects=Subjects
-label_com_labsynch_labseer_domain_treatmentgroup_thingpage=Thing Page
-label_com_labsynch_labseer_domain_treatmentgroup_treatmentgrouplabels=Treatment Group Labels
-label_com_labsynch_labseer_domain_treatmentgroup_treatmentgroups=Treatment Groups
-label_com_labsynch_labseer_domain_treatmentgroup_treatmentgroupstates=Treatment Group States
-label_com_labsynch_labseer_domain_treatmentgroup_version=Version
-label_com_labsynch_labseer_domain_treatmentgrouplabel=Treatment Group Label
-label_com_labsynch_labseer_domain_treatmentgrouplabel_deleted=Deleted
-label_com_labsynch_labseer_domain_treatmentgrouplabel_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_treatmentgrouplabel_id=Id
-label_com_labsynch_labseer_domain_treatmentgrouplabel_ignored=Ignored
-label_com_labsynch_labseer_domain_treatmentgrouplabel_imagefile=Image File
-label_com_labsynch_labseer_domain_treatmentgrouplabel_labelkind=Label Kind
-label_com_labsynch_labseer_domain_treatmentgrouplabel_labeltext=Label Text
-label_com_labsynch_labseer_domain_treatmentgrouplabel_labeltype=Label Type
-label_com_labsynch_labseer_domain_treatmentgrouplabel_labeltypeandkind=Label Type And Kind
-label_com_labsynch_labseer_domain_treatmentgrouplabel_lskind=Ls Kind
-label_com_labsynch_labseer_domain_treatmentgrouplabel_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_treatmentgrouplabel_lstype=Ls Type
-label_com_labsynch_labseer_domain_treatmentgrouplabel_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_treatmentgrouplabel_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_treatmentgrouplabel_physicallylabled=Physically Labled
-label_com_labsynch_labseer_domain_treatmentgrouplabel_plural=Treatment Group Labels
-label_com_labsynch_labseer_domain_treatmentgrouplabel_preferred=Preferred
-label_com_labsynch_labseer_domain_treatmentgrouplabel_recordedby=Recorded By
-label_com_labsynch_labseer_domain_treatmentgrouplabel_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_treatmentgrouplabel_treatmentgroup=Treatment Group
-label_com_labsynch_labseer_domain_treatmentgrouplabel_version=Version
-label_com_labsynch_labseer_domain_treatmentgroupstate=Treatment Group State
-label_com_labsynch_labseer_domain_treatmentgroupstate_batchsize=Batch Size
-label_com_labsynch_labseer_domain_treatmentgroupstate_comments=Comments
-label_com_labsynch_labseer_domain_treatmentgroupstate_deleted=Deleted
-label_com_labsynch_labseer_domain_treatmentgroupstate_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_treatmentgroupstate_id=Id
-label_com_labsynch_labseer_domain_treatmentgroupstate_ignored=Ignored
-label_com_labsynch_labseer_domain_treatmentgroupstate_lskind=Ls Kind
-label_com_labsynch_labseer_domain_treatmentgroupstate_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_treatmentgroupstate_lstype=Ls Type
-label_com_labsynch_labseer_domain_treatmentgroupstate_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_treatmentgroupstate_lsvalues=Ls Values
-label_com_labsynch_labseer_domain_treatmentgroupstate_modifiedby=Modified By
-label_com_labsynch_labseer_domain_treatmentgroupstate_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_treatmentgroupstate_plural=Treatment Group States
-label_com_labsynch_labseer_domain_treatmentgroupstate_propertiesutilservice=Properties Util Service
-label_com_labsynch_labseer_domain_treatmentgroupstate_recordedby=Recorded By
-label_com_labsynch_labseer_domain_treatmentgroupstate_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_treatmentgroupstate_statekind=State Kind
-label_com_labsynch_labseer_domain_treatmentgroupstate_statetype=State Type
-label_com_labsynch_labseer_domain_treatmentgroupstate_statetypeandkind=State Type And Kind
-label_com_labsynch_labseer_domain_treatmentgroupstate_treatmentgroup=Treatment Group
-label_com_labsynch_labseer_domain_treatmentgroupstate_treatmentgroupvalues=Treatment Group Values
-label_com_labsynch_labseer_domain_treatmentgroupstate_version=Version
-label_com_labsynch_labseer_domain_treatmentgroupvalue=Treatment Group Value
-label_com_labsynch_labseer_domain_treatmentgroupvalue_batchcode=Batch Code
-label_com_labsynch_labseer_domain_treatmentgroupvalue_blobvalue=Blob Value
-label_com_labsynch_labseer_domain_treatmentgroupvalue_clobvalue=Clob Value
-label_com_labsynch_labseer_domain_treatmentgroupvalue_codekind=Code Kind
-label_com_labsynch_labseer_domain_treatmentgroupvalue_codeorigin=Code Origin
-label_com_labsynch_labseer_domain_treatmentgroupvalue_codetype=Code Type
-label_com_labsynch_labseer_domain_treatmentgroupvalue_codetypeandkind=Code Type And Kind
-label_com_labsynch_labseer_domain_treatmentgroupvalue_codevalue=Code Value
-label_com_labsynch_labseer_domain_treatmentgroupvalue_comments=Comments
-label_com_labsynch_labseer_domain_treatmentgroupvalue_concentration=Concentration
-label_com_labsynch_labseer_domain_treatmentgroupvalue_concunit=Conc Unit
-label_com_labsynch_labseer_domain_treatmentgroupvalue_concvalue=Conc Value
-label_com_labsynch_labseer_domain_treatmentgroupvalue_datevalue=Date Value
-label_com_labsynch_labseer_domain_treatmentgroupvalue_deleted=Deleted
-label_com_labsynch_labseer_domain_treatmentgroupvalue_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_treatmentgroupvalue_filevalue=File Value
-label_com_labsynch_labseer_domain_treatmentgroupvalue_id=Id
-label_com_labsynch_labseer_domain_treatmentgroupvalue_ignored=Ignored
-label_com_labsynch_labseer_domain_treatmentgroupvalue_lskind=Ls Kind
-label_com_labsynch_labseer_domain_treatmentgroupvalue_lsstate=Ls State
-label_com_labsynch_labseer_domain_treatmentgroupvalue_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_treatmentgroupvalue_lstype=Ls Type
-label_com_labsynch_labseer_domain_treatmentgroupvalue_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_treatmentgroupvalue_modifiedby=Modified By
-label_com_labsynch_labseer_domain_treatmentgroupvalue_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_treatmentgroupvalue_numberofreplicates=Number Of Replicates
-label_com_labsynch_labseer_domain_treatmentgroupvalue_numericvalue=Numeric Value
-label_com_labsynch_labseer_domain_treatmentgroupvalue_operatorkind=Operator Kind
-label_com_labsynch_labseer_domain_treatmentgroupvalue_operatortype=Operator Type
-label_com_labsynch_labseer_domain_treatmentgroupvalue_operatortypeandkind=Operator Type And Kind
-label_com_labsynch_labseer_domain_treatmentgroupvalue_plural=Treatment Group Values
-label_com_labsynch_labseer_domain_treatmentgroupvalue_propertiesutilservice=Properties Util Service
-label_com_labsynch_labseer_domain_treatmentgroupvalue_publicdata=Public Data
-label_com_labsynch_labseer_domain_treatmentgroupvalue_recordedby=Recorded By
-label_com_labsynch_labseer_domain_treatmentgroupvalue_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_treatmentgroupvalue_sigfigs=Sig Figs
-label_com_labsynch_labseer_domain_treatmentgroupvalue_stringvalue=String Value
-label_com_labsynch_labseer_domain_treatmentgroupvalue_treatmentgroupstate=Treatment Group State
-label_com_labsynch_labseer_domain_treatmentgroupvalue_uncertainty=Uncertainty
-label_com_labsynch_labseer_domain_treatmentgroupvalue_uncertaintytype=Uncertainty Type
-label_com_labsynch_labseer_domain_treatmentgroupvalue_unitkind=Unit Kind
-label_com_labsynch_labseer_domain_treatmentgroupvalue_unittype=Unit Type
-label_com_labsynch_labseer_domain_treatmentgroupvalue_unittypeandkind=Unit Type And Kind
-label_com_labsynch_labseer_domain_treatmentgroupvalue_urlvalue=Url Value
-label_com_labsynch_labseer_domain_treatmentgroupvalue_valuekind=Value Kind
-label_com_labsynch_labseer_domain_treatmentgroupvalue_valueoperator=Value Operator
-label_com_labsynch_labseer_domain_treatmentgroupvalue_valuetype=Value Type
-label_com_labsynch_labseer_domain_treatmentgroupvalue_valuetypeandkind=Value Type And Kind
-label_com_labsynch_labseer_domain_treatmentgroupvalue_valueunit=Value Unit
-label_com_labsynch_labseer_domain_treatmentgroupvalue_version=Version
-label_com_labsynch_labseer_domain_uncertaintykind=Uncertainty Kind
-label_com_labsynch_labseer_domain_uncertaintykind_id=Id
-label_com_labsynch_labseer_domain_uncertaintykind_kindname=Kind Name
-label_com_labsynch_labseer_domain_uncertaintykind_plural=Uncertainty Kinds
-label_com_labsynch_labseer_domain_uncertaintykind_typename=Type Name
-label_com_labsynch_labseer_domain_uncertaintykind_version=Version
-label_com_labsynch_labseer_domain_uncertaintytype=Uncertainty Type
-label_com_labsynch_labseer_domain_uncertaintytype_id=Id
-label_com_labsynch_labseer_domain_uncertaintytype_plural=Uncertainty Types
-label_com_labsynch_labseer_domain_uncertaintytype_typename=Type Name
-label_com_labsynch_labseer_domain_uncertaintytype_version=Version
-label_com_labsynch_labseer_domain_unit=Unit
-label_com_labsynch_labseer_domain_unit_code=Code
-label_com_labsynch_labseer_domain_unit_id=Id
-label_com_labsynch_labseer_domain_unit_name=Name
-label_com_labsynch_labseer_domain_unit_plural=Units
-label_com_labsynch_labseer_domain_unit_version=Version
-label_com_labsynch_labseer_domain_unitkind=Unit Kind
-label_com_labsynch_labseer_domain_unitkind_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_unitkind_id=Id
-label_com_labsynch_labseer_domain_unitkind_kindname=Kind Name
-label_com_labsynch_labseer_domain_unitkind_lstype=Ls Type
-label_com_labsynch_labseer_domain_unitkind_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_unitkind_plural=Unit Kinds
-label_com_labsynch_labseer_domain_unitkind_typeandkind=Type And Kind
-label_com_labsynch_labseer_domain_unitkind_unittype=Unit Type
-label_com_labsynch_labseer_domain_unitkind_version=Version
-label_com_labsynch_labseer_domain_unittype=Unit Type
-label_com_labsynch_labseer_domain_unittype_id=Id
-label_com_labsynch_labseer_domain_unittype_plural=Unit Types
-label_com_labsynch_labseer_domain_unittype_typename=Type Name
-label_com_labsynch_labseer_domain_unittype_version=Version
-label_com_labsynch_labseer_domain_updatelog=Update Log
-label_com_labsynch_labseer_domain_updatelog_comments=Comments
-label_com_labsynch_labseer_domain_updatelog_id=Id
-label_com_labsynch_labseer_domain_updatelog_lstransaction=Ls Transaction
-label_com_labsynch_labseer_domain_updatelog_plural=Update Logs
-label_com_labsynch_labseer_domain_updatelog_recordedby=Recorded By
-label_com_labsynch_labseer_domain_updatelog_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_updatelog_thing=Thing
-label_com_labsynch_labseer_domain_updatelog_updateaction=Update Action
-label_com_labsynch_labseer_domain_updatelog_version=Version
-label_com_labsynch_labseer_domain_user=User
-label_com_labsynch_labseer_domain_user_activationdate=Activation Date
-label_com_labsynch_labseer_domain_user_activationkey=Activation Key
-label_com_labsynch_labseer_domain_user_email=Email
-label_com_labsynch_labseer_domain_user_emailaddress=Email Address
-label_com_labsynch_labseer_domain_user_enabled=Enabled
-label_com_labsynch_labseer_domain_user_firstname=First Name
-label_com_labsynch_labseer_domain_user_id=Id
-label_com_labsynch_labseer_domain_user_lastname=Last Name
-label_com_labsynch_labseer_domain_user_locked=Locked
-label_com_labsynch_labseer_domain_user_modifieddate=Modified Date
-label_com_labsynch_labseer_domain_user_password=Password
-label_com_labsynch_labseer_domain_user_plural=Users
-label_com_labsynch_labseer_domain_user_recordeddate=Recorded Date
-label_com_labsynch_labseer_domain_user_username=User Name
-label_com_labsynch_labseer_domain_user_version=Version
-label_com_labsynch_labseer_domain_userrole=User Role
-label_com_labsynch_labseer_domain_userrole_id=Id
-label_com_labsynch_labseer_domain_userrole_plural=User Roles
-label_com_labsynch_labseer_domain_userrole_roleentry=Role Entry
-label_com_labsynch_labseer_domain_userrole_userentry=User Entry
-label_com_labsynch_labseer_domain_userrole_version=Version
-label_com_labsynch_labseer_domain_valuekind=Value Kind
-label_com_labsynch_labseer_domain_valuekind_entitymanager=Entity Manager
-label_com_labsynch_labseer_domain_valuekind_id=Id
-label_com_labsynch_labseer_domain_valuekind_kindname=Kind Name
-label_com_labsynch_labseer_domain_valuekind_lstype=Ls Type
-label_com_labsynch_labseer_domain_valuekind_lstypeandkind=Ls Type And Kind
-label_com_labsynch_labseer_domain_valuekind_plural=Value Kinds
-label_com_labsynch_labseer_domain_valuekind_typeandkind=Type And Kind
-label_com_labsynch_labseer_domain_valuekind_valuetype=Value Type
-label_com_labsynch_labseer_domain_valuekind_version=Version
-label_com_labsynch_labseer_domain_valuetype=Value Type
-label_com_labsynch_labseer_domain_valuetype_id=Id
-label_com_labsynch_labseer_domain_valuetype_plural=Value Types
-label_com_labsynch_labseer_domain_valuetype_typename=Type Name
-label_com_labsynch_labseer_domain_valuetype_version=Version
-label_com_labsynch_labseer_domain_vendor=Vendor
-label_com_labsynch_labseer_domain_vendor_code=Code
-label_com_labsynch_labseer_domain_vendor_id=Id
-label_com_labsynch_labseer_domain_vendor_name=Name
-label_com_labsynch_labseer_domain_vendor_plural=Vendors
-label_com_labsynch_labseer_domain_vendor_version=Version
-label_com_labsynch_labseer_service_saltloader=Salt Loader
-label_com_labsynch_labseer_service_saltloader_description=Description
-label_com_labsynch_labseer_service_saltloader_file=File
-label_com_labsynch_labseer_service_saltloader_filename=File Name
-label_com_labsynch_labseer_service_saltloader_id=Id
-label_com_labsynch_labseer_service_saltloader_loadeddate=Loaded Date
-label_com_labsynch_labseer_service_saltloader_name=Name
-label_com_labsynch_labseer_service_saltloader_numberofsalts=Number Of Salts
-label_com_labsynch_labseer_service_saltloader_plural=Salt Loaders
-label_com_labsynch_labseer_service_saltloader_size=Size
-label_com_labsynch_labseer_service_saltloader_uploaded=Uploaded
-label_com_labsynch_labseer_service_saltloader_version=Version
-label_lot_index=Lot Controller View
-label_rolekind_index=Role Kind Controller View
-label_roletype_index=Role Type Controller View
-menu_category_analysisgroup_label=Analysis Group
-menu_category_analysisgrouplabel_label=Analysis Group Label
-menu_category_analysisgroupstate_label=Analysis Group State
-menu_category_analysisgroupvalue_label=Analysis Group Value
-menu_category_applicationsetting_label=Application Setting
-menu_category_author_label=Author
-menu_category_authorlabel_label=Author Label
-menu_category_authorold_label=Author Old
-menu_category_authorrole_label=Author Role
-menu_category_authorstate_label=Author State
-menu_category_authorvalue_label=Author Value
-menu_category_bulkloadfile_label=Bulk Load File
-menu_category_bulkloadtemplate_label=Bulk Load Template
-menu_category_chemstructure_label=Chem Structure
-menu_category_cmpdregappsetting_label=Cmpd Reg App Setting
-menu_category_codekind_label=Code Kind
-menu_category_codeorigin_label=Code Origin
-menu_category_codetype_label=Code Type
-menu_category_compound_label=Compound
-menu_category_compoundtype_label=Compound Type
-menu_category_container_label=Container
-menu_category_containerkind_label=Container Kind
-menu_category_containerlabel_label=Container Label
-menu_category_containerstate_label=Container State
-menu_category_containertype_label=Container Type
-menu_category_containervalue_label=Container Value
-menu_category_controller_label=Controller
-menu_category_corpname_label=Corp Name
-menu_category_cronjob_label=Cron Job
-menu_category_ddictkind_label=D Dict Kind
-menu_category_ddicttype_label=D Dict Type
-menu_category_ddictvalue_label=D Dict Value
-menu_category_experiment_label=Experiment
-menu_category_experimentkind_label=Experiment Kind
-menu_category_experimentlabel_label=Experiment Label
-menu_category_experimentstate_label=Experiment State
-menu_category_experimenttype_label=Experiment Type
-menu_category_experimentvalue_label=Experiment Value
-menu_category_filelist_label=File List
-menu_category_filething_label=File Thing
-menu_category_filetype_label=File Type
-menu_category_interactionkind_label=Interaction Kind
-menu_category_interactiontype_label=Interaction Type
-menu_category_isosalt_label=Iso Salt
-menu_category_isotope_label=Isotope
-menu_category_itxcontainercontainer_label=Itx Container Container
-menu_category_itxcontainercontainerstate_label=Itx Container Container State
-menu_category_itxcontainercontainervalue_label=Itx Container Container Value
-menu_category_itxexperimentexperiment_label=Itx Experiment Experiment
-menu_category_itxexperimentexperimentstate_label=Itx Experiment Experiment State
-menu_category_itxexperimentexperimentvalue_label=Itx Experiment Experiment Value
-menu_category_itxlsthinglsthing_label=Itx Ls Thing Ls Thing
-menu_category_itxlsthinglsthingstate_label=Itx Ls Thing Ls Thing State
-menu_category_itxlsthinglsthingvalue_label=Itx Ls Thing Ls Thing Value
-menu_category_itxprotocolprotocol_label=Itx Protocol Protocol
-menu_category_itxprotocolprotocolstate_label=Itx Protocol Protocol State
-menu_category_itxprotocolprotocolvalue_label=Itx Protocol Protocol Value
-menu_category_itxsubjectcontainer_label=Itx Subject Container
-menu_category_itxsubjectcontainerstate_label=Itx Subject Container State
-menu_category_itxsubjectcontainervalue_label=Itx Subject Container Value
-menu_category_labelkind_label=Label Kind
-menu_category_labelsequence_label=Label Sequence
-menu_category_labelsequencerole_label=Label Sequence Role
-menu_category_labeltype_label=Label Type
-menu_category_lot_label=Lot
-menu_category_lotalias_label=Lot Alias
-menu_category_lotaliaskind_label=Lot Alias Kind
-menu_category_lotaliastype_label=Lot Alias Type
-menu_category_lsinteraction_label=Ls Interaction
-menu_category_lsrole_label=Ls Role
-menu_category_lstag_label=Ls Tag
-menu_category_lsthing_label=Ls Thing
-menu_category_lsthinglabel_label=Ls Thing Label
-menu_category_lsthingstate_label=Ls Thing State
-menu_category_lsthingvalue_label=Ls Thing Value
-menu_category_lstransaction_label=Ls Transaction
-menu_category_operator_label=Operator
-menu_category_operatorkind_label=Operator Kind
-menu_category_operatortype_label=Operator Type
-menu_category_parent_label=Parent
-menu_category_parentalias_label=Parent Alias
-menu_category_parentaliaskind_label=Parent Alias Kind
-menu_category_parentaliastype_label=Parent Alias Type
-menu_category_parentannotation_label=Parent Annotation
-menu_category_physicalstate_label=Physical State
-menu_category_predef_corpname_label=Pre Def_ Corp Name
-menu_category_project_label=Project
-menu_category_protocol_label=Protocol
-menu_category_protocolkind_label=Protocol Kind
-menu_category_protocollabel_label=Protocol Label
-menu_category_protocolstate_label=Protocol State
-menu_category_protocoltype_label=Protocol Type
-menu_category_protocolvalue_label=Protocol Value
-menu_category_puritymeasuredby_label=Purity Measured By
-menu_category_qccompound_label=Qc Compound
-menu_category_role_label=Role
-menu_category_rolekind_label=Role Kinds
-menu_category_roletype_label=Role Type
-menu_category_salt_label=Salt
-menu_category_saltform_label=Salt Form
-menu_category_saltformalias_label=Salt Form Alias
-menu_category_saltformaliaskind_label=Salt Form Alias Kind
-menu_category_saltformaliastype_label=Salt Form Alias Type
-menu_category_saltloader_label=Salt Loader
-menu_category_scientist_label=Scientist
-menu_category_solutionunit_label=Solution Unit
-menu_category_statekind_label=State Kind
-menu_category_statetype_label=State Type
-menu_category_stereocategory_label=Stereo Category
-menu_category_structurekind_label=Structure Kind
-menu_category_structuretype_label=Structure Type
-menu_category_subject_label=Subject
-menu_category_subjectlabel_label=Subject Label
-menu_category_subjectstate_label=Subject State
-menu_category_subjectvalue_label=Subject Value
-menu_category_tempselecttable_label=Temp Select Table
-menu_category_thingkind_label=Thing Kind
-menu_category_thingpage_label=Thing Page
-menu_category_thingpagearchive_label=Thing Page Archive
-menu_category_thingtype_label=Thing Type
-menu_category_treatmentgroup_label=Treatment Group
-menu_category_treatmentgrouplabel_label=Treatment Group Label
-menu_category_treatmentgroupstate_label=Treatment Group State
-menu_category_treatmentgroupvalue_label=Treatment Group Value
-menu_category_uncertaintykind_label=Uncertainty Kind
-menu_category_uncertaintytype_label=Uncertainty Type
-menu_category_unit_label=Unit
-menu_category_unitkind_label=Unit Kind
-menu_category_unittype_label=Unit Type
-menu_category_updatelog_label=Update Log
-menu_category_user_label=User
-menu_category_userrole_label=User Role
-menu_category_valuekind_label=Value Kind
-menu_category_valuetype_label=Value Type
-menu_category_vendor_label=Vendor
-menu_item_analysisgroup_experiment_label=Experiment
-menu_item_analysisgroup_experiments_label=Experiments
-menu_item_analysisgroup_experimentsandignorednot_label=Experiments And Ignored Not
-menu_item_analysisgroup_list_label=Analysis Groups
-menu_item_analysisgroup_lstransactionequals_label=Ls Transaction Equals
-menu_item_analysisgroup_new_label=Analysis Group
-menu_item_analysisgrouplabel_analysisgroup_label=Analysis Group
-menu_item_analysisgrouplabel_list_label=Analysis Group Labels
-menu_item_analysisgrouplabel_lstransactionequals_label=Ls Transaction Equals
-menu_item_analysisgrouplabel_new_label=Analysis Group Label
-menu_item_analysisgroupstate_analysisgroup_label=Analysis Group
-menu_item_analysisgroupstate_analysisgroupandlstypeequalsandlskindequalsandignorednot_label=Analysis Group And Ls Type Equals And Ls Kind Equals And Ignored Not
-menu_item_analysisgroupstate_list_label=Analysis Group States
-menu_item_analysisgroupstate_lstransactionequals_label=Ls Transaction Equals
-menu_item_analysisgroupstate_lstypeandkindequals_label=Ls Type And Kind Equals
-menu_item_analysisgroupstate_lstypeequalsandlskindequals_label=Ls Type Equals And Ls Kind Equals
-menu_item_analysisgroupstate_new_label=Analysis Group State
-menu_item_analysisgroupvalue_codevalueequals_label=Code Value Equals
-menu_item_analysisgroupvalue_ignorednotandcodevalueequals_label=Ignored Not And Code Value Equals
-menu_item_analysisgroupvalue_list_label=Analysis Group Values
-menu_item_analysisgroupvalue_lsstate_label=Ls State
-menu_item_analysisgroupvalue_lstransactionequals_label=Ls Transaction Equals
-menu_item_analysisgroupvalue_lstypeequalsandlskindequals_label=Ls Type Equals And Ls Kind Equals
-menu_item_analysisgroupvalue_lstypeequalsandlskindequalsandstringvaluelikeandignorednot_label=Ls Type Equals And Ls Kind Equals And String Value Like And Ignored Not
-menu_item_analysisgroupvalue_new_label=Analysis Group Value
-menu_item_applicationsetting_list_label=Application Settings
-menu_item_applicationsetting_new_label=Application Setting
-menu_item_applicationsetting_propnameequals_label=Prop Name Equals
-menu_item_applicationsetting_propnameequalsandignorednot_label=Prop Name Equals And Ignored Not
-menu_item_author_activationkeyandemailaddress_label=Activation Key And Email Address
-menu_item_author_emailaddress_label=Email Address
-menu_item_author_list_label=Authors
-menu_item_author_new_label=Author
-menu_item_author_username_label=User Name
-menu_item_authorlabel_list_label=Author Labels
-menu_item_authorlabel_new_label=Author Label
-menu_item_authorold_list_label=Author Olds
-menu_item_authorold_new_label=Author Old
-menu_item_authorrole_list_label=Author Roles
-menu_item_authorrole_new_label=Author Role
-menu_item_authorrole_roleentry_label=Role Entry
-menu_item_authorrole_roleentryanduserentry_label=Role Entry And User Entry
-menu_item_authorrole_userentry_label=User Entry
-menu_item_authorstate_list_label=Author States
-menu_item_authorstate_new_label=Author State
-menu_item_authorvalue_list_label=Author Values
-menu_item_authorvalue_new_label=Author Value
-menu_item_bulkloadfile_filenameequals_label=File Name Equals
-menu_item_bulkloadfile_list_label=Bulk Load Files
-menu_item_bulkloadfile_new_label=Bulk Load File
-menu_item_bulkloadfile_recordedbyequals_label=Recorded By Equals
-menu_item_bulkloadtemplate_list_label=Bulk Load Templates
-menu_item_bulkloadtemplate_new_label=Bulk Load Template
-menu_item_bulkloadtemplate_recordedbyequals_label=Recorded By Equals
-menu_item_bulkloadtemplate_templatenameequals_label=Template Name Equals
-menu_item_bulkloadtemplate_templatenameequalsandrecordedbyequals_label=Template Name Equals And Recorded By Equals
-menu_item_chemstructure_list_label=Chem Structures
-menu_item_chemstructure_new_label=Chem Structure
-menu_item_cmpdregappsetting_list_label=Cmpd Reg App Settings
-menu_item_cmpdregappsetting_new_label=Cmpd Reg App Setting
-menu_item_codekind_kindnameequalsandlstype_label=Kind Name Equals And Ls Type
-menu_item_codekind_list_label=Code Kinds
-menu_item_codekind_lstype_label=Ls Type
-menu_item_codekind_lstypeandkindequals_label=Ls Type And Kind Equals
-menu_item_codekind_new_label=Code Kind
-menu_item_codeorigin_list_label=Code Origins
-menu_item_codeorigin_new_label=Code Origin
-menu_item_codetype_list_label=Code Types
-menu_item_codetype_new_label=Code Type
-menu_item_codetype_typenameequals_label=Type Name Equals
-menu_item_compound_cdid_label=Cd Id
-menu_item_compound_external_idequals_label=External_id Equals
-menu_item_compound_list_label=Compounds
-menu_item_compound_new_label=Compound
-menu_item_compoundtype_codeequals_label=Code Equals
-menu_item_compoundtype_list_label=Compound Types
-menu_item_compoundtype_new_label=Compound Type
-menu_item_container_list_label=Containers
-menu_item_container_new_label=Container
-menu_item_containerkind_list_label=Container Kinds
-menu_item_containerkind_new_label=Container Kind
-menu_item_containerlabel_containerandignorednot_label=Container And Ignored Not
-menu_item_containerlabel_labeltextequalsandignorednot_label=Label Text Equals And Ignored Not
-menu_item_containerlabel_list_label=Container Labels
-menu_item_containerlabel_lstransactionequals_label=Ls Transaction Equals
-menu_item_containerlabel_lstypeequalsandlabeltextequalsandignorednot_label=Ls Type Equals And Label Text Equals And Ignored Not
-menu_item_containerlabel_new_label=Container Label
-menu_item_containerstate_container_label=Container
-menu_item_containerstate_containerandlskindequalsandignorednot_label=Container And Ls Kind Equals And Ignored Not
-menu_item_containerstate_ignorednot_label=Ignored Not
-menu_item_containerstate_list_label=Container States
-menu_item_containerstate_new_label=Container State
-menu_item_containertype_list_label=Container Types
-menu_item_containertype_new_label=Container Type
-menu_item_containertype_typenameequals_label=Type Name Equals
-menu_item_containervalue_ignorednot_label=Ignored Not
-menu_item_containervalue_list_label=Container Values
-menu_item_containervalue_lsstate_label=Ls State
-menu_item_containervalue_new_label=Container Value
-menu_item_controller__lotindex_id_label=Lot Controller View
-menu_item_controller__rolekindindex_id_label=Role Kind Controller View
-menu_item_controller__roletypeindex_id_label=Role Type Controller View
-menu_item_corpname_list_label=Corp Names
-menu_item_corpname_new_label=Corp Name
-menu_item_cronjob_list_label=Cron Jobs
-menu_item_cronjob_new_label=Cron Job
-menu_item_ddictkind_list_label=D Dict Kinds
-menu_item_ddictkind_lstypeequalsandnameequals_label=Ls Type Equals And Name Equals
-menu_item_ddictkind_new_label=D Dict Kind
-menu_item_ddicttype_list_label=D Dict Types
-menu_item_ddicttype_nameequals_label=Name Equals
-menu_item_ddicttype_new_label=D Dict Type
-menu_item_ddictvalue_codenameequals_label=Code Name Equals
-menu_item_ddictvalue_ignorednot_label=Ignored Not
-menu_item_ddictvalue_labeltextlike_label=Label Text Like
-menu_item_ddictvalue_list_label=D Dict Values
-menu_item_ddictvalue_lskindequals_label=Ls Kind Equals
-menu_item_ddictvalue_lstypeequals_label=Ls Type Equals
-menu_item_ddictvalue_lstypeequalsandlskindequals_label=Ls Type Equals And Ls Kind Equals
-menu_item_ddictvalue_lstypeequalsandlskindequalsandshortnameequals_label=Ls Type Equals And Ls Kind Equals And Short Name Equals
-menu_item_ddictvalue_new_label=D Dict Value
-menu_item_experiment_codenameequals_label=Code Name Equals
-menu_item_experiment_codenamelike_label=Code Name Like
-menu_item_experiment_list_label=Experiments
-menu_item_experiment_lskindequals_label=Ls Kind Equals
-menu_item_experiment_lskindlike_label=Ls Kind Like
-menu_item_experiment_lstransaction_label=Ls Transaction
-menu_item_experiment_lstypeequals_label=Ls Type Equals
-menu_item_experiment_lstypeequalsandlskindequals_label=Ls Type Equals And Ls Kind Equals
-menu_item_experiment_lstypelike_label=Ls Type Like
-menu_item_experiment_new_label=Experiment
-menu_item_experiment_protocol_label=Protocol
-menu_item_experiment_recordedbylike_label=Recorded By Like
-menu_item_experimentkind_list_label=Experiment Kinds
-menu_item_experimentkind_new_label=Experiment Kind
-menu_item_experimentlabel_experiment_label=Experiment
-menu_item_experimentlabel_experimentandignorednot_label=Experiment And Ignored Not
-menu_item_experimentlabel_labeltextlike_label=Label Text Like
-menu_item_experimentlabel_labeltextlikeandlabeltypeandkindequalsandpreferrednotandignorednot_label=Label Text Like And Label Type And Kind Equals And Preferred Not And Ignored Not
-menu_item_experimentlabel_labeltextlikeandlstypeandkindequalsandpreferrednotandignorednot_label=Label Text Like And Ls Type And Kind Equals And Preferred Not And Ignored Not
-menu_item_experimentlabel_list_label=Experiment Labels
-menu_item_experimentlabel_lstypeandkindequalsandpreferrednotandignorednot_label=Ls Type And Kind Equals And Preferred Not And Ignored Not
-menu_item_experimentlabel_new_label=Experiment Label
-menu_item_experimentstate_experiment_label=Experiment
-menu_item_experimentstate_list_label=Experiment States
-menu_item_experimentstate_new_label=Experiment State
-menu_item_experimenttype_list_label=Experiment Types
-menu_item_experimenttype_new_label=Experiment Type
-menu_item_experimenttype_typenameequals_label=Type Name Equals
-menu_item_experimentvalue_list_label=Experiment Values
-menu_item_experimentvalue_lskindequalsandcodevaluelike_label=Ls Kind Equals And Code Value Like
-menu_item_experimentvalue_lskindequalsanddatevalueequals_label=Ls Kind Equals And Date Value Equals
-menu_item_experimentvalue_lskindequalsanddatevaluelike_label=Ls Kind Equals And Date Value Like
-menu_item_experimentvalue_lskindequalsandstringvaluelike_label=Ls Kind Equals And String Value Like
-menu_item_experimentvalue_lsstate_label=Ls State
-menu_item_experimentvalue_lsstateandignorednotandlskindequalsandlstypeequalsandstringvalueequals_label=Ls State And Ignored Not And Ls Kind Equals And Ls Type Equals And String Value Equals
-menu_item_experimentvalue_new_label=Experiment Value
-menu_item_filelist_list_label=File Lists
-menu_item_filelist_lot_label=Lot
-menu_item_filelist_new_label=File List
-menu_item_filelist_urlequals_label=Url Equals
-menu_item_filething_list_label=File Things
-menu_item_filething_new_label=File Thing
-menu_item_filetype_codeequals_label=Code Equals
-menu_item_filetype_list_label=File Types
-menu_item_filetype_new_label=File Type
-menu_item_interactionkind_list_label=Interaction Kinds
-menu_item_interactionkind_new_label=Interaction Kind
-menu_item_interactiontype_list_label=Interaction Types
-menu_item_interactiontype_new_label=Interaction Type
-menu_item_isosalt_list_label=Iso Salts
-menu_item_isosalt_new_label=Iso Salt
-menu_item_isosalt_saltform_label=Salt Form
-menu_item_isosalt_saltformandtype_label=Salt Form And Type
-menu_item_isotope_abbrevequals_label=Abbrev Equals
-menu_item_isotope_abbrevequalsandnameequals_label=Abbrev Equals And Name Equals
-menu_item_isotope_list_label=Isotopes
-menu_item_isotope_nameequals_label=Name Equals
-menu_item_isotope_new_label=Isotope
-menu_item_itxcontainercontainer_list_label=Itx Container Containers
-menu_item_itxcontainercontainer_lstransactionequals_label=Ls Transaction Equals
-menu_item_itxcontainercontainer_lstypeequalsandfirstcontainerequals_label=Ls Type Equals And First Container Equals
-menu_item_itxcontainercontainer_lstypeequalsandsecondcontainerequals_label=Ls Type Equals And Second Container Equals
-menu_item_itxcontainercontainer_new_label=Itx Container Container
-menu_item_itxcontainercontainerstate_list_label=Itx Container Container States
-menu_item_itxcontainercontainerstate_new_label=Itx Container Container State
-menu_item_itxcontainercontainervalue_list_label=Itx Container Container Values
-menu_item_itxcontainercontainervalue_new_label=Itx Container Container Value
-menu_item_itxexperimentexperiment_firstexperiment_label=First Experiment
-menu_item_itxexperimentexperiment_list_label=Itx Experiment Experiments
-menu_item_itxexperimentexperiment_lstransactionequals_label=Ls Transaction Equals
-menu_item_itxexperimentexperiment_new_label=Itx Experiment Experiment
-menu_item_itxexperimentexperiment_secondexperiment_label=Second Experiment
-menu_item_itxexperimentexperimentstate_list_label=Itx Experiment Experiment States
-menu_item_itxexperimentexperimentstate_new_label=Itx Experiment Experiment State
-menu_item_itxexperimentexperimentvalue_list_label=Itx Experiment Experiment Values
-menu_item_itxexperimentexperimentvalue_new_label=Itx Experiment Experiment Value
-menu_item_itxlsthinglsthing_codenameequals_label=Code Name Equals
-menu_item_itxlsthinglsthing_firstlsthing_label=First Ls Thing
-menu_item_itxlsthinglsthing_list_label=Itx Ls Thing Ls Things
-menu_item_itxlsthinglsthing_new_label=Itx Ls Thing Ls Thing
-menu_item_itxlsthinglsthing_secondlsthing_label=Second Ls Thing
-menu_item_itxlsthinglsthingstate_list_label=Itx Ls Thing Ls Thing States
-menu_item_itxlsthinglsthingstate_new_label=Itx Ls Thing Ls Thing State
-menu_item_itxlsthinglsthingvalue_list_label=Itx Ls Thing Ls Thing Values
-menu_item_itxlsthinglsthingvalue_new_label=Itx Ls Thing Ls Thing Value
-menu_item_itxprotocolprotocol_firstprotocol_label=First Protocol
-menu_item_itxprotocolprotocol_list_label=Itx Protocol Protocols
-menu_item_itxprotocolprotocol_lstransactionequals_label=Ls Transaction Equals
-menu_item_itxprotocolprotocol_new_label=Itx Protocol Protocol
-menu_item_itxprotocolprotocol_secondprotocol_label=Second Protocol
-menu_item_itxprotocolprotocolstate_list_label=Itx Protocol Protocol States
-menu_item_itxprotocolprotocolstate_new_label=Itx Protocol Protocol State
-menu_item_itxprotocolprotocolvalue_list_label=Itx Protocol Protocol Values
-menu_item_itxprotocolprotocolvalue_new_label=Itx Protocol Protocol Value
-menu_item_itxsubjectcontainer_codenameequals_label=Code Name Equals
-menu_item_itxsubjectcontainer_container_label=Container
-menu_item_itxsubjectcontainer_list_label=Itx Subject Containers
-menu_item_itxsubjectcontainer_lstransactionequals_label=Ls Transaction Equals
-menu_item_itxsubjectcontainer_new_label=Itx Subject Container
-menu_item_itxsubjectcontainer_subject_label=Subject
-menu_item_itxsubjectcontainerstate_list_label=Itx Subject Container States
-menu_item_itxsubjectcontainerstate_new_label=Itx Subject Container State
-menu_item_itxsubjectcontainervalue_list_label=Itx Subject Container Values
-menu_item_itxsubjectcontainervalue_new_label=Itx Subject Container Value
-menu_item_labelkind_kindnameequals_label=Kind Name Equals
-menu_item_labelkind_kindnameequalsandlstype_label=Kind Name Equals And Ls Type
-menu_item_labelkind_list_label=Label Kinds
-menu_item_labelkind_lstype_label=Ls Type
-menu_item_labelkind_new_label=Label Kind
-menu_item_labelsequence_labeltypeandkindequals_label=Label Type And Kind Equals
-menu_item_labelsequence_list_label=Label Sequences
-menu_item_labelsequence_new_label=Label Sequence
-menu_item_labelsequence_thingtypeandkindequals_label=Thing Type And Kind Equals
-menu_item_labelsequence_thingtypeandkindequalsandlabeltypeandkindequals_label=Thing Type And Kind Equals And Label Type And Kind Equals
-menu_item_labelsequence_thingtypeandkindequalsandlabeltypeandkindequalsandlabelprefixequals_label=Thing Type And Kind Equals And Label Type And Kind Equals And Label Prefix Equals
-menu_item_labelsequence_thingtypeequalsandthingkindequalsandlabeltypeequalsandlabelkindequals_label=Thing Type Equals And Thing Kind Equals And Label Type Equals And Label Kind Equals
-menu_item_labelsequencerole_list_label=Label Sequence Roles
-menu_item_labelsequencerole_new_label=Label Sequence Role
-menu_item_labeltype_list_label=Label Types
-menu_item_labeltype_new_label=Label Type
-menu_item_labeltype_typenameequals_label=Type Name Equals
-menu_item_lot_buid_label=Buid
-menu_item_lot_bulkloadfileequals_label=Bulk Load File Equals
-menu_item_lot_chemistandsynthesisdatebetween_label=Chemist And Synthesis Date Between
-menu_item_lot_corpnameequals_label=Corp Name Equals
-menu_item_lot_corpnamelike_label=Corp Name Like
-menu_item_lot_isvirtualnot_label=Is Virtual Not
-menu_item_lot_list_label=Lots
-menu_item_lot_new_label=Lot
-menu_item_lot_notebookpageequals_label=Notebook Page Equals
-menu_item_lot_notebookpageequalsandignorenot_label=Notebook Page Equals And Ignore Not
-menu_item_lot_saltform_label=Salt Form
-menu_item_lot_synthesisdatebetween_label=Synthesis Date Between
-menu_item_lot_synthesisdategreaterthan_label=Synthesis Date Greater Than
-menu_item_lot_synthesisdatelessthan_label=Synthesis Date Less Than
-menu_item_lotalias_aliasnameequalsandlstypeequalsandlskindequals_label=Alias Name Equals And Ls Type Equals And Ls Kind Equals
-menu_item_lotalias_list_label=Lot Aliases
-menu_item_lotalias_lot_label=Lot
-menu_item_lotalias_lotandlstypeequalsandlskindequals_label=Lot And Ls Type Equals And Ls Kind Equals
-menu_item_lotalias_new_label=Lot Alias
-menu_item_lotaliaskind_list_label=Lot Alias Kinds
-menu_item_lotaliaskind_new_label=Lot Alias Kind
-menu_item_lotaliastype_list_label=Lot Alias Types
-menu_item_lotaliastype_new_label=Lot Alias Type
-menu_item_lsinteraction_list_label=Ls Interactions
-menu_item_lsinteraction_new_label=Ls Interaction
-menu_item_lsrole_list_label=Ls Roles
-menu_item_lsrole_lskindequals_label=Ls Kind Equals
-menu_item_lsrole_lstypeequals_label=Ls Type Equals
-menu_item_lsrole_lstypeequalsandlskindequals_label=Ls Type Equals And Ls Kind Equals
-menu_item_lsrole_lstypeequalsandlskindequalsandrolenameequals_label=Ls Type Equals And Ls Kind Equals And Role Name Equals
-menu_item_lsrole_lstypeequalsandrolenameequals_label=Ls Type Equals And Role Name Equals
-menu_item_lsrole_new_label=Ls Role
-menu_item_lsrole_rolenameequals_label=Role Name Equals
-menu_item_lstag_list_label=Ls Tags
-menu_item_lstag_new_label=Ls Tag
-menu_item_lstag_tagtextequals_label=Tag Text Equals
-menu_item_lstag_tagtextlike_label=Tag Text Like
-menu_item_lsthing_codenameequals_label=Code Name Equals
-menu_item_lsthing_codenamelike_label=Code Name Like
-menu_item_lsthing_list_label=Ls Things
-menu_item_lsthing_lskindequals_label=Ls Kind Equals
-menu_item_lsthing_lskindlike_label=Ls Kind Like
-menu_item_lsthing_lstransactionequals_label=Ls Transaction Equals
-menu_item_lsthing_lstypeandkindequals_label=Ls Type And Kind Equals
-menu_item_lsthing_lstypeequals_label=Ls Type Equals
-menu_item_lsthing_lstypeequalsandlskindequals_label=Ls Type Equals And Ls Kind Equals
-menu_item_lsthing_new_label=Ls Thing
-menu_item_lsthing_recordedbylike_label=Recorded By Like
-menu_item_lsthing_recordeddategreaterthan_label=Recorded Date Greater Than
-menu_item_lsthing_recordeddatelessthan_label=Recorded Date Less Than
-menu_item_lsthinglabel_labeltextequals_label=Label Text Equals
-menu_item_lsthinglabel_labeltextequalsandignorednot_label=Label Text Equals And Ignored Not
-menu_item_lsthinglabel_labeltextlike_label=Label Text Like
-menu_item_lsthinglabel_list_label=Ls Thing Labels
-menu_item_lsthinglabel_lsthing_label=Ls Thing
-menu_item_lsthinglabel_lstransactionequals_label=Ls Transaction Equals
-menu_item_lsthinglabel_new_label=Ls Thing Label
-menu_item_lsthingstate_list_label=Ls Thing States
-menu_item_lsthingstate_lsthing_label=Ls Thing
-menu_item_lsthingstate_lstransactionequals_label=Ls Transaction Equals
-menu_item_lsthingstate_new_label=Ls Thing State
-menu_item_lsthingvalue_codevalueequals_label=Code Value Equals
-menu_item_lsthingvalue_ignorednotandcodevalueequals_label=Ignored Not And Code Value Equals
-menu_item_lsthingvalue_list_label=Ls Thing Values
-menu_item_lsthingvalue_lskindequalsandcodevaluelike_label=Ls Kind Equals And Code Value Like
-menu_item_lsthingvalue_lskindequalsanddatevaluegreaterthanequals_label=Ls Kind Equals And Date Value Greater Than Equals
-menu_item_lsthingvalue_lskindequalsanddatevaluelessthanequals_label=Ls Kind Equals And Date Value Less Than Equals
-menu_item_lsthingvalue_lskindequalsanddatevaluelike_label=Ls Kind Equals And Date Value Like
-menu_item_lsthingvalue_lskindequalsandnumericvalueequals_label=Ls Kind Equals And Numeric Value Equals
-menu_item_lsthingvalue_lskindequalsandnumericvaluegreaterthanequals_label=Ls Kind Equals And Numeric Value Greater Than Equals
-menu_item_lsthingvalue_lskindequalsandnumericvaluelessthanequals_label=Ls Kind Equals And Numeric Value Less Than Equals
-menu_item_lsthingvalue_lskindequalsandstringvalueequals_label=Ls Kind Equals And String Value Equals
-menu_item_lsthingvalue_lskindequalsandstringvaluelike_label=Ls Kind Equals And String Value Like
-menu_item_lsthingvalue_lsstate_label=Ls State
-menu_item_lsthingvalue_lstransactionequals_label=Ls Transaction Equals
-menu_item_lsthingvalue_new_label=Ls Thing Value
-menu_item_lstransaction_list_label=Ls Transactions
-menu_item_lstransaction_new_label=Ls Transaction
-menu_item_operator_codeequals_label=Code Equals
-menu_item_operator_list_label=Operators
-menu_item_operator_nameequals_label=Name Equals
-menu_item_operator_new_label=Operator
-menu_item_operatorkind_list_label=Operator Kinds
-menu_item_operatorkind_new_label=Operator Kind
-menu_item_operatortype_list_label=Operator Types
-menu_item_operatortype_new_label=Operator Type
-menu_item_operatortype_typenameequals_label=Type Name Equals
-menu_item_parent_bulkloadfileequals_label=Bulk Load File Equals
-menu_item_parent_cdid_label=Cd Id
-menu_item_parent_commonnamelike_label=Common Name Like
-menu_item_parent_corpnameequals_label=Corp Name Equals
-menu_item_parent_corpnamelike_label=Corp Name Like
-menu_item_parent_list_label=Parents
-menu_item_parent_new_label=Parent
-menu_item_parent_saltforms_label=Salt Forms
-menu_item_parentalias_aliasnameequals_label=Alias Name Equals
-menu_item_parentalias_aliasnameequalsandlstypeequalsandlskindequals_label=Alias Name Equals And Ls Type Equals And Ls Kind Equals
-menu_item_parentalias_list_label=Parent Aliases
-menu_item_parentalias_new_label=Parent Alias
-menu_item_parentalias_parent_label=Parent
-menu_item_parentalias_parentandlstypeequalsandlskindequals_label=Parent And Ls Type Equals And Ls Kind Equals
-menu_item_parentalias_parentandlstypeequalsandlskindequalsandaliasnameequals_label=Parent And Ls Type Equals And Ls Kind Equals And Alias Name Equals
-menu_item_parentaliaskind_list_label=Parent Alias Kinds
-menu_item_parentaliaskind_new_label=Parent Alias Kind
-menu_item_parentaliastype_list_label=Parent Alias Types
-menu_item_parentaliastype_new_label=Parent Alias Type
-menu_item_parentannotation_codeequals_label=Code Equals
-menu_item_parentannotation_list_label=Parent Annotations
-menu_item_parentannotation_new_label=Parent Annotation
-menu_item_physicalstate_codeequals_label=Code Equals
-menu_item_physicalstate_list_label=Physical States
-menu_item_physicalstate_nameequals_label=Name Equals
-menu_item_physicalstate_namelike_label=Name Like
-menu_item_physicalstate_new_label=Physical State
-menu_item_predef_corpname_list_label=Pre Def_ Corp Names
-menu_item_predef_corpname_new_label=Pre Def_ Corp Name
-menu_item_project_codeequals_label=Code Equals
-menu_item_project_list_label=Projects
-menu_item_project_nameequals_label=Name Equals
-menu_item_project_new_label=Project
-menu_item_protocol_codenameequals_label=Code Name Equals
-menu_item_protocol_codenameequalsandignorednot_label=Code Name Equals And Ignored Not
-menu_item_protocol_codenamelike_label=Code Name Like
-menu_item_protocol_ignorednot_label=Ignored Not
-menu_item_protocol_list_label=Protocols
-menu_item_protocol_lskindequals_label=Ls Kind Equals
-menu_item_protocol_lskindlike_label=Ls Kind Like
-menu_item_protocol_lstransactionequals_label=Ls Transaction Equals
-menu_item_protocol_lstypeandkindequals_label=Ls Type And Kind Equals
-menu_item_protocol_lstypeequals_label=Ls Type Equals
-menu_item_protocol_lstypeequalsandlskindequals_label=Ls Type Equals And Ls Kind Equals
-menu_item_protocol_lstypelike_label=Ls Type Like
-menu_item_protocol_new_label=Protocol
-menu_item_protocol_recordedbylike_label=Recorded By Like
-menu_item_protocolkind_list_label=Protocol Kinds
-menu_item_protocolkind_lstypeequalsandkindnameequals_label=Ls Type Equals And Kind Name Equals
-menu_item_protocolkind_new_label=Protocol Kind
-menu_item_protocollabel_labeltextequalsandignorednot_label=Label Text Equals And Ignored Not
-menu_item_protocollabel_labeltextlike_label=Label Text Like
-menu_item_protocollabel_list_label=Protocol Labels
-menu_item_protocollabel_lstransactionequals_label=Ls Transaction Equals
-menu_item_protocollabel_new_label=Protocol Label
-menu_item_protocollabel_protocol_label=Protocol
-menu_item_protocolstate_list_label=Protocol States
-menu_item_protocolstate_lstransactionequals_label=Ls Transaction Equals
-menu_item_protocolstate_new_label=Protocol State
-menu_item_protocolstate_protocol_label=Protocol
-menu_item_protocoltype_list_label=Protocol Types
-menu_item_protocoltype_new_label=Protocol Type
-menu_item_protocoltype_typenameequals_label=Type Name Equals
-menu_item_protocolvalue_list_label=Protocol Values
-menu_item_protocolvalue_lskindequalsandcodevaluelike_label=Ls Kind Equals And Code Value Like
-menu_item_protocolvalue_lskindequalsanddatevalueequals_label=Ls Kind Equals And Date Value Equals
-menu_item_protocolvalue_lskindequalsanddatevaluelike_label=Ls Kind Equals And Date Value Like
-menu_item_protocolvalue_lskindequalsandstringvaluelike_label=Ls Kind Equals And String Value Like
-menu_item_protocolvalue_lsstate_label=Ls State
-menu_item_protocolvalue_lstransactionequals_label=Ls Transaction Equals
-menu_item_protocolvalue_new_label=Protocol Value
-menu_item_puritymeasuredby_codeequals_label=Code Equals
-menu_item_puritymeasuredby_list_label=Purity Measured Bys
-menu_item_puritymeasuredby_nameequals_label=Name Equals
-menu_item_puritymeasuredby_namelike_label=Name Like
-menu_item_puritymeasuredby_new_label=Purity Measured By
-menu_item_qccompound_cdid_label=Cd Id
-menu_item_qccompound_list_label=Qc Compounds
-menu_item_qccompound_new_label=Qc Compound
-menu_item_role_list_label=Roles
-menu_item_role_new_label=Role
-menu_item_rolekind_kindnameequalsandlstype_label=Kind Name Equals And Ls Type
-menu_item_rolekind_list_label=Role Kinds
-menu_item_rolekind_lstype_label=Ls Type
-menu_item_rolekind_new_label=Role Kind
-menu_item_roletype_list_label=Role Types
-menu_item_roletype_new_label=Role Type
-menu_item_roletype_typenameequals_label=Type Name Equals
-menu_item_salt_abbrevequals_label=Abbrev Equals
-menu_item_salt_abbrevequalsandnameequals_label=Abbrev Equals And Name Equals
-menu_item_salt_abbrevlike_label=Abbrev Like
-menu_item_salt_cdid_label=Cd Id
-menu_item_salt_list_label=Salts
-menu_item_salt_nameequals_label=Name Equals
-menu_item_salt_new_label=Salt
-menu_item_saltform_bulkloadfileequals_label=Bulk Load File Equals
-menu_item_saltform_cdid_label=Cd Id
-menu_item_saltform_corpnameequals_label=Corp Name Equals
-menu_item_saltform_corpnamelike_label=Corp Name Like
-menu_item_saltform_list_label=Salt Forms
-menu_item_saltform_new_label=Salt Form
-menu_item_saltform_parent_label=Parent
-menu_item_saltformalias_aliasnameequalsandlstypeequalsandlskindequals_label=Alias Name Equals And Ls Type Equals And Ls Kind Equals
-menu_item_saltformalias_list_label=Salt Form Aliases
-menu_item_saltformalias_new_label=Salt Form Alias
-menu_item_saltformalias_saltform_label=Salt Form
-menu_item_saltformaliaskind_list_label=Salt Form Alias Kinds
-menu_item_saltformaliaskind_new_label=Salt Form Alias Kind
-menu_item_saltformaliastype_list_label=Salt Form Alias Types
-menu_item_saltformaliastype_new_label=Salt Form Alias Type
-menu_item_saltloader_list_label=Salt Loaders
-menu_item_saltloader_new_label=Salt Loader
-menu_item_scientist_codeequals_label=Code Equals
-menu_item_scientist_codelike_label=Code Like
-menu_item_scientist_list_label=Scientists
-menu_item_scientist_new_label=Scientist
-menu_item_solutionunit_codeequals_label=Code Equals
-menu_item_solutionunit_codelike_label=Code Like
-menu_item_solutionunit_list_label=Solution Units
-menu_item_solutionunit_nameequals_label=Name Equals
-menu_item_solutionunit_new_label=Solution Unit
-menu_item_statekind_kindnameequals_label=Kind Name Equals
-menu_item_statekind_kindnameequalsandlstype_label=Kind Name Equals And Ls Type
-menu_item_statekind_list_label=State Kinds
-menu_item_statekind_lstype_label=Ls Type
-menu_item_statekind_new_label=State Kind
-menu_item_statetype_list_label=State Types
-menu_item_statetype_new_label=State Type
-menu_item_statetype_typenameequals_label=Type Name Equals
-menu_item_stereocategory_codeequals_label=Code Equals
-menu_item_stereocategory_codelike_label=Code Like
-menu_item_stereocategory_list_label=Stereo Categorys
-menu_item_stereocategory_new_label=Stereo Category
-menu_item_structurekind_list_label=Structure Kinds
-menu_item_structurekind_new_label=Structure Kind
-menu_item_structuretype_list_label=Structure Types
-menu_item_structuretype_new_label=Structure Type
-menu_item_subject_codenameequals_label=Code Name Equals
-menu_item_subject_list_label=Subjects
-menu_item_subject_lstransactionequals_label=Ls Transaction Equals
-menu_item_subject_new_label=Subject
-menu_item_subject_treatmentgroup_label=Treatment Group
-menu_item_subject_treatmentgroups_label=Treatment Groups
-menu_item_subjectlabel_list_label=Subject Labels
-menu_item_subjectlabel_new_label=Subject Label
-menu_item_subjectlabel_subject_label=Subject
-menu_item_subjectstate_list_label=Subject States
-menu_item_subjectstate_lstypeequalsandlskindequalsandsubject_label=Ls Type Equals And Ls Kind Equals And Subject
-menu_item_subjectstate_new_label=Subject State
-menu_item_subjectstate_subject_label=Subject
-menu_item_subjectvalue_codevalueequals_label=Code Value Equals
-menu_item_subjectvalue_ignorednotandcodevalueequals_label=Ignored Not And Code Value Equals
-menu_item_subjectvalue_list_label=Subject Values
-menu_item_subjectvalue_lsstate_label=Ls State
-menu_item_subjectvalue_lsstateandlstypeequalsandlskindequals_label=Ls State And Ls Type Equals And Ls Kind Equals
-menu_item_subjectvalue_lstypeequalsandlskindequals_label=Ls Type Equals And Ls Kind Equals
-menu_item_subjectvalue_new_label=Subject Value
-menu_item_tempselecttable_list_label=Temp Select Tables
-menu_item_tempselecttable_new_label=Temp Select Table
-menu_item_thingkind_kindnameequalsandlstype_label=Kind Name Equals And Ls Type
-menu_item_thingkind_list_label=Thing Kinds
-menu_item_thingkind_lstype_label=Ls Type
-menu_item_thingkind_lstypeandkindequals_label=Ls Type And Kind Equals
-menu_item_thingkind_new_label=Thing Kind
-menu_item_thingpage_list_label=Thing Pages
-menu_item_thingpage_new_label=Thing Page
-menu_item_thingpagearchive_list_label=Thing Page Archives
-menu_item_thingpagearchive_new_label=Thing Page Archive
-menu_item_thingtype_list_label=Thing Types
-menu_item_thingtype_new_label=Thing Type
-menu_item_thingtype_typenameequals_label=Type Name Equals
-menu_item_treatmentgroup_analysisgroup_label=Analysis Group
-menu_item_treatmentgroup_analysisgroups_label=Analysis Groups
-menu_item_treatmentgroup_codenameequals_label=Code Name Equals
-menu_item_treatmentgroup_list_label=Treatment Groups
-menu_item_treatmentgroup_lstransactionequals_label=Ls Transaction Equals
-menu_item_treatmentgroup_new_label=Treatment Group
-menu_item_treatmentgrouplabel_list_label=Treatment Group Labels
-menu_item_treatmentgrouplabel_lstransactionequals_label=Ls Transaction Equals
-menu_item_treatmentgrouplabel_new_label=Treatment Group Label
-menu_item_treatmentgrouplabel_treatmentgroup_label=Treatment Group
-menu_item_treatmentgroupstate_list_label=Treatment Group States
-menu_item_treatmentgroupstate_lstransactionequals_label=Ls Transaction Equals
-menu_item_treatmentgroupstate_lstypeandkindequals_label=Ls Type And Kind Equals
-menu_item_treatmentgroupstate_new_label=Treatment Group State
-menu_item_treatmentgroupstate_treatmentgroup_label=Treatment Group
-menu_item_treatmentgroupvalue_codevalueequals_label=Code Value Equals
-menu_item_treatmentgroupvalue_ignorednotandcodevalueequals_label=Ignored Not And Code Value Equals
-menu_item_treatmentgroupvalue_list_label=Treatment Group Values
-menu_item_treatmentgroupvalue_lsstate_label=Ls State
-menu_item_treatmentgroupvalue_lstransactionequals_label=Ls Transaction Equals
-menu_item_treatmentgroupvalue_new_label=Treatment Group Value
-menu_item_uncertaintykind_list_label=Uncertainty Kinds
-menu_item_uncertaintykind_new_label=Uncertainty Kind
-menu_item_uncertaintytype_list_label=Uncertainty Types
-menu_item_uncertaintytype_new_label=Uncertainty Type
-menu_item_unit_codeequals_label=Code Equals
-menu_item_unit_codelike_label=Code Like
-menu_item_unit_list_label=Units
-menu_item_unit_nameequals_label=Name Equals
-menu_item_unit_new_label=Unit
-menu_item_unitkind_list_label=Unit Kinds
-menu_item_unitkind_new_label=Unit Kind
-menu_item_unittype_list_label=Unit Types
-menu_item_unittype_new_label=Unit Type
-menu_item_unittype_typenameequals_label=Type Name Equals
-menu_item_updatelog_list_label=Update Logs
-menu_item_updatelog_new_label=Update Log
-menu_item_user_list_label=Users
-menu_item_user_new_label=User
-menu_item_userrole_list_label=User Roles
-menu_item_userrole_new_label=User Role
-menu_item_valuekind_kindnameequalsandlstype_label=Kind Name Equals And Ls Type
-menu_item_valuekind_list_label=Value Kinds
-menu_item_valuekind_lstype_label=Ls Type
-menu_item_valuekind_new_label=Value Kind
-menu_item_valuetype_list_label=Value Types
-menu_item_valuetype_new_label=Value Type
-menu_item_valuetype_typenameequals_label=Type Name Equals
-menu_item_vendor_codeequals_label=Code Equals
-menu_item_vendor_codelike_label=Code Like
-menu_item_vendor_list_label=Vendors
-menu_item_vendor_nameequals_label=Name Equals
-menu_item_vendor_namelike_label=Name Like
-menu_item_vendor_new_label=Vendor
diff --git a/src/main/webapp/WEB-INF/i18n/messages.properties b/src/main/webapp/WEB-INF/i18n/messages.properties
deleted file mode 100755
index 2b97bfe95..000000000
--- a/src/main/webapp/WEB-INF/i18n/messages.properties
+++ /dev/null
@@ -1,107 +0,0 @@
-#menu
-global_menu_new=Create new {0}
-global_menu_list=List all {0}
-global_menu_find=Find by {0}
-global_language_switch=Switch language to {0}
-global_language=Language
-global_sponsored=Sponsored by SpringSource
-global_theme=Theme
-global_theme_alt=alt
-global_theme_standard=standard
-global_generic={0}
-
-#welcome page
-welcome_titlepane=Welcome to {0}
-welcome_h3=Welcome to {0}
-welcome_text=Spring Roo provides interactive, lightweight and user customizable tooling that enables rapid delivery of high performance enterprise Java applications.
-
-#entity labels
-entity_list_all=List all {0}
-entity_show=Show {0}
-entity_create=Create new {0}
-entity_update=Update {0}
-entity_delete=Delete {0}
-entity_delete_confirm=Are you sure want to delete this item?
-entity_find=Find {0}
-entity_not_found=No {0} found.
-entity_not_found_single=No {0} found with this id.
-entity_dependency_required=The following dependencies need to be created first:
-entity_reference_not_managed=This relationship is managed from the {0} side.
-
-#button labels
-button_home=Home
-button_save=Save
-button_update=Update
-button_find=Find
-button_cancel=Cancel
-button_proceed=Proceed
-button_submit=Submit
-button_reset=Reset
-button_end=End
-button_showmessage=Show Message
-button_showstacktrace=Show Stack Trace
-button_showcookie=Show Cookie
-
-#field labels
-field_simple_validation=Enter {0} {1}
-field_invalid_email=Please enter a valid email
-field_invalid_number=Number with \\'-\\' or \\'.\\' allowed
-field_invalid_integer=Integer numbers only
-field_invalid=Please enter valid {0}
-field_required=required
-
-#list labels
-list_first=First Page
-list_next=Next Page
-list_previous=Previous Page
-list_last=Last Page
-list_page=Page {0} of {1}
-list_size=List results per page:
-
-#selenium
-selenium_menu_test_suite=Test Suite
-
-#exception
-exception_message=Exception Message
-exception_stacktrace=Exception Stack Trace
-exception_cookie=Cookies
-exception_details=Details
-
-#dataAccessFailure_jspx
-title=Data access failure
-error_dataaccessfailure_title=Data access failure
-error_dataaccessfailure_problemdescription=Sorry, a problem occurred while accessing the database.
-
-#resourceNotFound_jspx
-error_resourcenotfound_title=Requested Resource Not Found
-error_resourcenotfound_problemdescription=Sorry, we did not find the resource you were looking for.
-
-#uncaughtException_jspx
-error_uncaughtexception_title=Internal Error
-error_uncaughtexception_problemdescription=Sorry, we encountered an internal error.
-
-#webflow
-webflow_menu_enter=Enter {0} flow
-webflow_state1_title=Spring Web Flow - View State One
-webflow_state1_message=This is a simple example to get started with Spring Web Flow. The buttons below lead you to another view state (Proceed) or to an end state.
-webflow_state2_title=Spring Web Flow - View State Two
-webflow_state2_message=This is a simple example to get started with Spring Web Flow. The buttons below lead you to another view state (Proceed) or to an end state.
-webflow_endstate_title=Spring Web Flow - End State
-webflow_endstate_message=You have now reached the end of this flow.
-
-#security
-security_login_title=Spring Security Login
-security_login_message=You have tried to access a protected area of this application. By default you can login as "admin", with a password of "admin".
-security_login_form_name=Name
-security_login_form_name_message=Enter your name
-security_login_form_password=Password
-security_login_form_password_message=Enter your password
-security_login_unsuccessful=Your login attempt was not successful, try again. Reason: 
-security_logout=Logout
-
-#changepassword
-changepassword.invalidpassword=Invalid Current Password
-changepassword.passwordsnomatch=Passwords do not match
-changepassword.invalidemailaddress=Invalid Email Address
-changepassword.duplicateemailaddress=Duplicate Email Address, contact administrator
-changepassword.thankyoumessage=Your password has been changed.
diff --git a/src/main/webapp/WEB-INF/layouts/default.jspx b/src/main/webapp/WEB-INF/layouts/default.jspx
deleted file mode 100755
index b045bc0f3..000000000
--- a/src/main/webapp/WEB-INF/layouts/default.jspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<html xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tiles="http://tiles.apache.org/tags-tiles" xmlns:spring="http://www.springframework.org/tags" xmlns:util="urn:jsptagdir:/WEB-INF/tags/util" >  
-	
-	<jsp:output doctype-root-element="HTML" doctype-system="about:legacy-compat" />
-	
-	<jsp:directive.page contentType="text/html;charset=UTF-8" />  
-	<jsp:directive.page pageEncoding="UTF-8" /> 
-			
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-		<meta http-equiv="X-UA-Compatible" content="IE=8" />	
-			
-		<util:load-scripts />
-		
-		<spring:message code="application_name" var="app_name" htmlEscape="false"/>
-		<title><spring:message code="welcome_h3" arguments="${app_name}" /></title>
-	</head>
-	
-  	<body class="tundra spring">
-   		<div id="wrapper">
-		    <tiles:insertAttribute name="header" ignore="true" />
-		    <tiles:insertAttribute name="menu" ignore="true" />   
-		    <div id="main">
-	    		<tiles:insertAttribute name="body"/> 
-		    	<tiles:insertAttribute name="footer" ignore="true"/>
-		    </div>
-		</div>
-	</body>
-</html>
diff --git a/src/main/webapp/WEB-INF/tags/form/create.tagx b/src/main/webapp/WEB-INF/tags/form/create.tagx
deleted file mode 100755
index f8d78e791..000000000
--- a/src/main/webapp/WEB-INF/tags/form/create.tagx
+++ /dev/null
@@ -1,61 +0,0 @@
-<jsp:root xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:util="urn:jsptagdir:/WEB-INF/tags/util" xmlns:form="http://www.springframework.org/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-  <jsp:output omit-xml-declaration="yes"/>
-  
-  <jsp:directive.attribute name="id" type="java.lang.String" required="true" rtexprvalue="true" description="The identifier for this tag (do not change!)"/>
-  <jsp:directive.attribute name="modelAttribute" type="java.lang.String" required="true" rtexprvalue="true" description="The name of the model attribute for form binding"/>
-  <jsp:directive.attribute name="path" type="java.lang.String" required="true" rtexprvalue="true" description="Specify the relative URL path (wit leading /)" />
-  <jsp:directive.attribute name="compositePkField" type="java.lang.String" required="false" rtexprvalue="true" description="The field name of the composite primary key (only used if a composite PK is present in the form backing object)" />
-  <jsp:directive.attribute name="multipart" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if this is a multipart form (default: false)" />
-  <jsp:directive.attribute name="label" type="java.lang.String" required="false" rtexprvalue="true" description="The label used for this object, will default to a message bundle if not supplied"/>
-  <jsp:directive.attribute name="render" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" />
-  <jsp:directive.attribute name="openPane" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Control if the title pane is opened or closed by default (default: true)"/>
-  <jsp:directive.attribute name="z" type="java.lang.String" required="false" description="Used for checking if element has been modified (to recalculate simply provide empty string value)"/>
-	
-  <c:if test="${empty render or render}">
-    <c:if test="${empty label}">
-      <spring:message code="label_${fn:toLowerCase(fn:substringAfter(id,'_'))}" var="label" htmlEscape="false" />
-    </c:if>
-    <c:set var="enctype" value="application/x-www-form-urlencoded"/>
-    <c:if test="${multipart}">
-      <c:set var="enctype" value="multipart/form-data"/>
-    </c:if>
-    <spring:message arguments="${label}" code="entity_create" var="title_msg" htmlEscape="false" />
-    <util:panel id="${id}" title="${title_msg}" openPane="${openPane}">
-      <spring:url value="${path}" var="form_url"/>
-      <c:set var="jsCall" value=""/>
-      <c:if test="${not empty compositePkField}">
-      	<c:set var="jsCall" value="encodePk()" />
-      </c:if>
-      <form:form action="${form_url}" method="POST" modelAttribute="${modelAttribute}" enctype="${enctype}" onsubmit="${jsCall}">
-        <form:errors cssClass="errors" delimiter="&lt;p/&gt;"/>
-        <c:if test="${not empty compositePkField}">
-          <form:hidden id="_${fn:escapeXml(compositePkField)}_id" path="${fn:escapeXml(compositePkField)}" />
-          <script type="text/javascript">
-          <![CDATA[
-            dojo.require("dojox.encoding.base64");
-            function encodePk() {
-              var obj = new Object();
-              dojo.query("input[name^=\"${compositePkField}.\"]").forEach(function(node, index, nodelist){
-                obj[node.name.substring('${compositePkField}'.length + 1)] = node.value;
-              });
-              var json = dojo.toJson(obj);
-              var tokArr = [];
-              for (var i = 0; i < json.length; i++) {
-                tokArr.push(json.charCodeAt(i));
-              }
-              var encoded = dojox.encoding.base64.encode(tokArr);
-              dojo.byId('_${fn:escapeXml(compositePkField)}_id').value = encoded;
-            }
-          ]]>
-          </script>
-        </c:if>
-        <jsp:doBody />
-        <div class="submit" id="${fn:escapeXml(id)}_submit">
-          <spring:message code="button_save" var="save_button" htmlEscape="false" />
-          <script type="text/javascript">Spring.addDecoration(new Spring.ValidateAllDecoration({elementId:'proceed', event:'onclick'}));</script>
-          <input id="proceed" type="submit" value="${fn:escapeXml(save_button)}"/>
-        </div>
-      </form:form>
-    </util:panel>
-  </c:if>
-</jsp:root>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/form/dependency.tagx b/src/main/webapp/WEB-INF/tags/form/dependency.tagx
deleted file mode 100755
index 4888a1283..000000000
--- a/src/main/webapp/WEB-INF/tags/form/dependency.tagx
+++ /dev/null
@@ -1,25 +0,0 @@
-<jsp:root xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:util="urn:jsptagdir:/WEB-INF/tags/util" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="http://www.springframework.org/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-  <jsp:output omit-xml-declaration="yes"/>
-
-  <jsp:directive.attribute name="id" type="java.lang.String" required="true" rtexprvalue="true" description="The identifier for this tag (do not change!)"/>
-  <jsp:directive.attribute name="dependencies" type="java.util.Collection" required="true" rtexprvalue="true" description="The collection of dependencies which need to be listed"/>
-  <jsp:directive.attribute name="label" type="java.lang.String" required="false" rtexprvalue="true" description="The label used for this object, will default to a message bundle if not supplied"/>
-  <jsp:directive.attribute name="render" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" />
-  <jsp:directive.attribute name="openPane" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Control if the title pane is opened or closed by default (default: true)"/>
-  <jsp:directive.attribute name="z" type="java.lang.String" required="false" description="Used for checking if element has been modified (to recalculate simply provide empty string value)"/>
-
-  <c:if test="${empty render or render}">
-    <c:if test="${empty label}">
-      <spring:message code="label_${fn:toLowerCase(fn:substringAfter(id,'_'))}" var="label" htmlEscape="false"/>
-    </c:if>
-    <spring:message arguments="${label}" code="entity_create" var="title_msg" htmlEscape="false" />
-    <util:panel id="${fn:escapeXml(id)}" title="${fn:escapeXml(title_msg)}" openPane="${openPane}">
-    <spring:message code="entity_dependency_required"/>
-    <c:forEach items="${dependencies}" var="dependency" >
-      <p>
-        <field:reference field="${dependency[0]}" id="${fn:escapeXml(id)}_${dependency[0]}" path="/${dependency[1]}"/>
-      </p>
-	</c:forEach>
-    </util:panel>
-  </c:if>
-</jsp:root>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/form/fields/checkbox.tagx b/src/main/webapp/WEB-INF/tags/form/fields/checkbox.tagx
deleted file mode 100755
index 1804424d2..000000000
--- a/src/main/webapp/WEB-INF/tags/form/fields/checkbox.tagx
+++ /dev/null
@@ -1,38 +0,0 @@
-<jsp:root xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:spring="http://www.springframework.org/tags" xmlns:form="http://www.springframework.org/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-  <jsp:output omit-xml-declaration="yes" />
-
-  <jsp:directive.attribute name="id" type="java.lang.String" required="true" rtexprvalue="true" description="The identifier for this tag (do not change!)" />
-  <jsp:directive.attribute name="field" type="java.lang.String" required="true" rtexprvalue="true" description="The field exposed from the form backing object" />
-  <jsp:directive.attribute name="label" type="java.lang.String" required="false" rtexprvalue="true" description="The label used for this field, will default to a message bundle if not supplied" />
-  <jsp:directive.attribute name="disableFormBinding" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Set to true to disable Spring form binding" />
-  <jsp:directive.attribute name="render" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" />
-  <jsp:directive.attribute name="z" type="java.lang.String" required="false" description="Used for checking if element has been modified (to recalculate simply provide empty string value)" />
-
-  <c:if test="${empty render or render}">
-    <c:if test="${empty label}">
-      <spring:message code="label_${fn:toLowerCase(fn:substringAfter(id,'_'))}" var="label" htmlEscape="false" />
-    </c:if>
-    <c:set var="sec_field">
-      <spring:escapeBody javaScriptEscape="true">${field}</spring:escapeBody>
-    </c:set>
-   
-    <script type="text/javascript">dojo.require("dijit.form.CheckBox");</script>
-    <div id="_${sec_id}_id">
-      <label for="_${sec_field}_id">
-        <c:out value="${fn:escapeXml(label)}" />:
-      </label>
-      <c:choose>
-        <c:when test="${disableFormBinding}">
-          <input id="_${sec_field}_id" name="${sec_field}" type="checkbox"/>
-        </c:when>
-        <c:otherwise>
-          <form:checkbox id="_${sec_field}_id" path="${sec_field}"/>
-        </c:otherwise>
-      </c:choose>
-      <script type="text/javascript">
-      	Spring.addDecoration(new Spring.ElementDecoration({elementId : '_${sec_field}_id', widgetType : 'dijit.form.CheckBox', widgetAttrs : {}}));
-      </script>
-    </div>
-    <br />
-  </c:if>
-</jsp:root>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/form/fields/column.tagx b/src/main/webapp/WEB-INF/tags/form/fields/column.tagx
deleted file mode 100755
index cfaddabd0..000000000
--- a/src/main/webapp/WEB-INF/tags/form/fields/column.tagx
+++ /dev/null
@@ -1,63 +0,0 @@
-<jsp:root xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:util="urn:jsptagdir:/WEB-INF/tags/util" xmlns:spring="http://www.springframework.org/tags" xmlns:form="http://www.springframework.org/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-  <jsp:output omit-xml-declaration="yes" />
-
-  <jsp:directive.attribute name="id" type="java.lang.String" required="true" rtexprvalue="true" description="The identifier for this tag (do not change!)" />
-  <jsp:directive.attribute name="property" type="java.lang.String" required="true" rtexprvalue="true" description="The property (field name) of the dataset to be displayed in a column (required)." />
-  <jsp:directive.attribute name="maxLength" type="java.lang.Integer" required="false" rtexprvalue="true" description="Max displayed text length (default '10'). Unlimited if negative" />
-  <jsp:directive.attribute name="label" type="java.lang.String" required="false" rtexprvalue="true" description="The column label to be used in the table (optional)." />
-  <jsp:directive.attribute name="date" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate that this field is of type java.util.Date" />
-  <jsp:directive.attribute name="calendar" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate that this field is of type java.util.Calendar" />
-  <jsp:directive.attribute name="dateTimePattern" type="java.lang.String" required="false" rtexprvalue="true" description="The date / time pattern to use if the field is a date or calendar type" />
-  <jsp:directive.attribute name="render" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" />
-  <jsp:directive.attribute name="z" type="java.lang.String" required="false" description="Used for checking if element has been modified (to recalculate simply provide empty string value)" />
-
-  <c:if test="${empty render or render}">
-    <c:if test="${empty label}">
-      <spring:message code="label_${fn:toLowerCase(fn:substringAfter(id,'_'))}" var="label" htmlEscape="false" />
-    </c:if>
-
-    <c:if test="${empty dateTimePattern}">
-      <c:set value="MM/dd/yyyy" var="dateTimePattern" />
-    </c:if>
-      
-    <c:choose>
-      <c:when test="${date and empty columnTypes}">
-        <c:set var="columnTypes" value="date" scope="request" />
-        <c:set var="columnDatePatterns" value="${dateTimePattern}" scope="request" />
-      </c:when>
-      <c:when test="${date and not empty columnTypes}">
-        <c:set var="columnTypes" value="${columnTypes}&#9999;date" scope="request" />
-        <c:set var="columnDatePatterns" value="${columnDatePatterns}&#9999;${dateTimePattern}" scope="request" />
-      </c:when>
-      <c:when test="${calendar and empty columnTypes}">
-        <c:set var="columnTypes" value="calendar" scope="request" />
-        <c:set var="columnDatePatterns" value="${dateTimePattern}" scope="request" />
-      </c:when>
-      <c:when test="${calendar and not empty columnTypes}">
-        <c:set var="columnTypes" value="${columnTypes}&#9999;calendar" scope="request" />
-        <c:set var="columnDatePatterns" value="${columnDatePatterns}&#9999;${dateTimePattern}" scope="request" />
-      </c:when>
-      <c:when test="${empty columnTypes}">
-        <c:set var="columnTypes" value="default" scope="request" />
-        <c:set var="columnDatePatterns" value="none" scope="request" />
-      </c:when>
-      <c:otherwise>
-        <c:set var="columnTypes" value="${columnTypes}&#9999;default" scope="request" />
-        <c:set var="columnDatePatterns" value="${columnDatePatterns}&#9999;none" scope="request" />
-      </c:otherwise>
-    </c:choose>
-
-    <c:choose>
-      <c:when test="${empty columnProperties and empty columnLabels}">
-        <c:set var="columnProperties" value="${property}" scope="request" />
-        <c:set var="columnLabels" value="${label}" scope="request" />
-        <c:set var="columnMaxLengths" value="${empty maxLength ? 128 : maxLength}" scope="request" />
-      </c:when>
-      <c:otherwise>
-        <c:set var="columnProperties" value="${columnProperties}&#9999;${property}" scope="request" />
-        <c:set var="columnLabels" value="${columnLabels}&#9999;${label}" scope="request" />
-        <c:set var="columnMaxLengths" value="${columnMaxLengths}&#9999;${empty maxLength ? 128 : maxLength}" scope="request" />
-      </c:otherwise>
-    </c:choose>
-  </c:if>
-</jsp:root>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/form/fields/datetime.tagx b/src/main/webapp/WEB-INF/tags/form/fields/datetime.tagx
deleted file mode 100755
index 934661283..000000000
--- a/src/main/webapp/WEB-INF/tags/form/fields/datetime.tagx
+++ /dev/null
@@ -1,75 +0,0 @@
-<jsp:root xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:spring="http://www.springframework.org/tags" xmlns:form="http://www.springframework.org/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-  <jsp:output omit-xml-declaration="yes" />
-
-  <jsp:directive.attribute name="id" type="java.lang.String" required="true" rtexprvalue="true" description="The identifier for this tag (do not change!)" />
-  <jsp:directive.attribute name="field" type="java.lang.String" required="true" rtexprvalue="true" description="The field exposed from the form backing object" />
-  <jsp:directive.attribute name="dateTimePattern" type="java.lang.String" required="true" rtexprvalue="true" description="The format accepted in this field" />
-  <jsp:directive.attribute name="label" type="java.lang.String" required="false" rtexprvalue="true" description="The label used for this field, will default to a message bundle if not supplied" />
-  <jsp:directive.attribute name="required" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicates if this field is required (default false)" />
-  <jsp:directive.attribute name="disabled" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Specify if this field should be enabled" />
-  <jsp:directive.attribute name="validationRegex" type="java.lang.String" required="false" rtexprvalue="true" description="Specify regular expression to be used for the validation of the input contents" />
-  <jsp:directive.attribute name="validationMessageCode" type="java.lang.String" required="false" rtexprvalue="true" description="Specify the message (message property code) to be displayed if the regular expression validation fails" />
-  <jsp:directive.attribute name="validationMessage" type="java.lang.String" required="false" rtexprvalue="true" description="Specify the message to be displayed if the regular expression validation fails" />
-  <jsp:directive.attribute name="future" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Specify if the date / time should be in the future" />
-  <jsp:directive.attribute name="past" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Specify if the date / time should be in the past" />
-  <jsp:directive.attribute name="disableFormBinding" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Set to true to disable Spring form binding" />
-  <jsp:directive.attribute name="render" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" />
-  <jsp:directive.attribute name="z" type="java.lang.String" required="false" description="Used for checking if element has been modified (to recalculate simply provide empty string value)" />
-
-  <c:if test="${empty render or render}">
-
-    <c:if test="${empty disabled}">
-      <c:set value="false" var="disabled" />
-    </c:if>
-    <c:if test="${empty label}">
-      <spring:message code="label_${fn:toLowerCase(fn:substringAfter(id,'_'))}" var="label" htmlEscape="false" />
-    </c:if>
-    <c:set var="sec_field">
-      <spring:escapeBody javaScriptEscape="true" >${field}</spring:escapeBody>
-    </c:set>
-    
-    <c:if test="${empty required}">
-      <c:set value="false" var="required" />
-    </c:if>
-
-    <script type="text/javascript">dojo.require('dijit.form.DateTextBox')</script>
-    <div id="_${sec_id}_id">
-      <label for="_${sec_field}_id">
-        <c:out value="${label}" />
-        :
-      </label>
-      <c:choose>
-        <c:when test="${disableFormBinding}">
-          <input id="_${sec_field}_id" name="${sec_field}" />
-        </c:when>
-        <c:otherwise>
-          <form:input id="_${sec_field}_id" path="${sec_field}" disabled="${disabled}" />
-          <br />
-          <form:errors cssClass="errors" id="_${sec_field}_error_id" path="${sec_field}" />
-        </c:otherwise>
-      </c:choose>
-      <spring:message arguments="${fn:escapeXml(label)}" code="field_invalid" var="field_invalid" htmlEscape="false" />
-      <c:choose>
-        <c:when test="${required}">
-          <spring:message code="field_required" var="field_required" htmlEscape="false" />
-          <spring:message argumentSeparator="," arguments="${label},(${field_required})" code="field_simple_validation" var="field_validation" htmlEscape="false" />
-        </c:when>
-        <c:otherwise>
-          <spring:message argumentSeparator="," arguments="${label}, " code="field_simple_validation" var="field_validation" htmlEscape="false" />
-        </c:otherwise>
-      </c:choose>
-      <script type="text/javascript">
-        <c:set var="sec_field_validation">
-          <spring:escapeBody javaScriptEscape="true">${field_validation}</spring:escapeBody>
-        </c:set>
-        <c:set var="sec_field_invalid">
-          <spring:escapeBody javaScriptEscape="true">${field_invalid}</spring:escapeBody>
-        </c:set>
-        <c:set var="sec_dateTimePattern">
-          <spring:escapeBody javaScriptEscape="true">${dateTimePattern}</spring:escapeBody>
-        </c:set>
-        Spring.addDecoration(new Spring.ElementDecoration({elementId : '_${sec_field}_id', widgetType : 'dijit.form.DateTextBox', widgetAttrs : {promptMessage: '${sec_field_validation}', invalidMessage: '${sec_field_invalid}', required: ${required}, constraints: {datePattern : '${sec_dateTimePattern}', required : ${required}}, datePattern : '${sec_dateTimePattern}'}})); </script>
-    </div>
-    <br />
-  </c:if>
-</jsp:root>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/form/fields/display.tagx b/src/main/webapp/WEB-INF/tags/form/fields/display.tagx
deleted file mode 100755
index a6e8f43c4..000000000
--- a/src/main/webapp/WEB-INF/tags/form/fields/display.tagx
+++ /dev/null
@@ -1,48 +0,0 @@
-<jsp:root xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:spring="http://www.springframework.org/tags" xmlns:form="http://www.springframework.org/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-  <jsp:output omit-xml-declaration="yes" />
-
-  <jsp:directive.attribute name="id" type="java.lang.String" required="true" rtexprvalue="true" description="The identifier for this tag (do not change!)" />
-  <jsp:directive.attribute name="object" type="java.lang.Object" required="true" rtexprvalue="true" description="The form backing object" />
-  <jsp:directive.attribute name="field" type="java.lang.String" required="true" rtexprvalue="true" description="The field name" />
-  <jsp:directive.attribute name="label" type="java.lang.String" required="false" rtexprvalue="true" description="The label used for this field, will default to a message bundle if not supplied" />
-  <jsp:directive.attribute name="date" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate that this field is of type java.util.Date" />
-  <jsp:directive.attribute name="calendar" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate that this field is of type java.util.Calendar" />
-  <jsp:directive.attribute name="dateTimePattern" type="java.lang.String" required="false" rtexprvalue="true" description="The date / time pattern to use if the field is a date or calendar type" />
-  <jsp:directive.attribute name="render" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" />
-  <jsp:directive.attribute name="z" type="java.lang.String" required="false" description="Used for checking if element has been modified (to recalculate simply provide empty string value)" />
-
-  <c:if test="${empty render or render}">
-    <c:if test="${not empty object and empty label}">
-      <spring:message code="label_${fn:toLowerCase(fn:substringAfter(id,'_'))}" var="label" htmlEscape="false" />
-    </c:if>
-
-    <c:if test="${empty dateTimePattern}">
-      <c:set value="MM/dd/yyyy" var="dateTimePattern" />
-    </c:if>
-
-    <div id="_${fn:escapeXml(id)}_id">
-      <label for="_${fn:escapeXml(field)}_id">
-        <c:out value="${label}" />
-        :
-      </label>
-      <div class="box" id="_${fn:escapeXml(id)}_${fn:escapeXml(field)}_id">
-        <c:choose>
-          <c:when test="${date}">
-            <spring:escapeBody>
-              <fmt:formatDate value="${object[field]}" pattern="${fn:escapeXml(dateTimePattern)}" />
-            </spring:escapeBody>
-          </c:when>
-          <c:when test="${calendar}">
-            <spring:escapeBody>
-              <fmt:formatDate value="${object[field].time}" pattern="${fn:escapeXml(dateTimePattern)}" />
-            </spring:escapeBody>
-          </c:when>
-          <c:otherwise>
-            <spring:eval expression="object[field]" />
-          </c:otherwise>
-        </c:choose>
-      </div>
-    </div>
-    <br />
-  </c:if>
-</jsp:root>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/form/fields/editor.tagx b/src/main/webapp/WEB-INF/tags/form/fields/editor.tagx
deleted file mode 100755
index c4c619285..000000000
--- a/src/main/webapp/WEB-INF/tags/form/fields/editor.tagx
+++ /dev/null
@@ -1,60 +0,0 @@
-<jsp:root xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:spring="http://www.springframework.org/tags" xmlns:form="http://www.springframework.org/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-  <jsp:output omit-xml-declaration="yes" />
-
-  <jsp:directive.attribute name="id" type="java.lang.String" required="true" rtexprvalue="true" description="The identifier for this tag (do not change!)" />
-  <jsp:directive.attribute name="field" type="java.lang.String" required="true" rtexprvalue="true" description="The field exposed from the form backing object" />
-  <jsp:directive.attribute name="label" type="java.lang.String" required="false" rtexprvalue="true" description="The label used for this field, will default to a message bundle if not supplied" />
-  <jsp:directive.attribute name="required" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicates if this field is required (default false)" />
-  <jsp:directive.attribute name="disabled" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Specify if this field should be enabled" />
-  <jsp:directive.attribute name="validationRegex" type="java.lang.String" required="false" rtexprvalue="true" description="Specify regular expression to be used for the validation of the input contents" />
-  <jsp:directive.attribute name="validationMessageCode" type="java.lang.String" required="false" rtexprvalue="true" description="Specify the message (message property code) to be displayed if the regular expression validation fails" />
-  <jsp:directive.attribute name="validationMessage" type="java.lang.String" required="false" rtexprvalue="true" description="Specify the message to be displayed if the regular expression validation fails" />
-  <jsp:directive.attribute name="render" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" />
-  <jsp:directive.attribute name="z" type="java.lang.String" required="false" description="Used for checking if element has been modified (to recalculate simply provide empty string value)" />
-
-  <c:if test="${empty render or render}">
-
-    <c:if test="${empty disabled}">
-      <c:set value="false" var="disabled" />
-    </c:if>
-
-    <c:if test="${empty label}">
-      <spring:message code="label_${fn:toLowerCase(fn:substringAfter(id,'_'))}" var="label" htmlEscape="false" />
-    </c:if>
-
-    <c:if test="${empty required}">
-      <c:set value="false" var="required" />
-    </c:if>
-    
-    <c:set var="sec_field">
-      <spring:escapeBody javaScriptEscape="true" >${field}</spring:escapeBody>
-    </c:set>
-
-    <script type="text/javascript">dojo.require("dijit.Editor");</script>
-    <div id="_${fn:escapeXml(id)}_id">
-      <label for="_${sec_field}_id">
-        <c:out value="${fn:escapeXml(label)}" />
-        :
-      </label>
-      <form:hidden id="_${sec_field}_id" path="${sec_field}" />
-      <div>
-        <div id="_${sec_field}_id_"></div>
-        <script type="text/javascript">
-           Spring.addDecoration(new Spring.ElementDecoration({elementId : '_${sec_field}_id_', widgetType : 'dijit.Editor', widgetAttrs : {disabled: ${disabled}}}));
-           dojo.addOnLoad(function () {
-              var src = dojo.byId('_${sec_field}_id');
-              var rte = dijit.byId('_${sec_field}_id_');
-              rte.disabled = ${disabled};
-              rte.onLoadDeferred.addCallback(function(){
-                rte.setValue(src.value);
-                dojo.connect(rte, 'onBlur', function(){src.value = rte.getValue();});
-              });
-            });
-        </script>
-      </div>
-      <br />
-      <form:errors cssClass="errors" id="_${sec_field}_error_id" path="${sec_field}" />
-    </div>
-    <br />
-  </c:if>
-</jsp:root>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/form/fields/input.tagx b/src/main/webapp/WEB-INF/tags/form/fields/input.tagx
deleted file mode 100755
index aff5ea181..000000000
--- a/src/main/webapp/WEB-INF/tags/form/fields/input.tagx
+++ /dev/null
@@ -1,108 +0,0 @@
-<jsp:root xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:spring="http://www.springframework.org/tags" xmlns:form="http://www.springframework.org/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-  <jsp:output omit-xml-declaration="yes" />
-
-  <jsp:directive.attribute name="id" type="java.lang.String" required="true" rtexprvalue="true" description="The identifier for this tag (do not change!)" />
-  <jsp:directive.attribute name="field" type="java.lang.String" required="true" rtexprvalue="true" description="The field exposed from the form backing object" />
-  <jsp:directive.attribute name="label" type="java.lang.String" required="false" rtexprvalue="true" description="The label used for this field, will default to a message bundle if not supplied" />
-  <jsp:directive.attribute name="labelCode" type="java.lang.String" required="false" rtexprvalue="true" description="Key for label message bundle if label is not supplied" />
-  <jsp:directive.attribute name="required" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicates if this field is required (default false)" />
-  <jsp:directive.attribute name="disabled" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Specify if this field should be enabled" />
-  <jsp:directive.attribute name="validationRegex" type="java.lang.String" required="false" rtexprvalue="true" description="Specify regular expression to be used for the validation of the input contents" />
-  <jsp:directive.attribute name="validationMessageCode" type="java.lang.String" required="false" rtexprvalue="true" description="Specify the message (message property code) to be displayed if the regular expression validation fails" />
-  <jsp:directive.attribute name="validationMessage" type="java.lang.String" required="false" rtexprvalue="true" description="Specify the message to be displayed if the regular expression validation fails" />
-  <jsp:directive.attribute name="min" type="java.lang.String" required="false" rtexprvalue="true" description="Specify the minimum length of the input contents" />
-  <jsp:directive.attribute name="max" type="java.lang.String" required="false" rtexprvalue="true" description="Specify the maximum length of the input contents" />
-  <jsp:directive.attribute name="decimalMin" type="java.lang.String" required="false" rtexprvalue="true" description="Specify the minimum size of the input contents" />
-  <jsp:directive.attribute name="decimalMax" type="java.lang.String" required="false" rtexprvalue="true" description="Specify the maximum size of the input contents" />
-  <jsp:directive.attribute name="disableFormBinding" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Set to true to disable Spring form binding" />
-  <jsp:directive.attribute name="type" type="java.lang.String" required="false" rtexprvalue="true" description="Set field type (default 'text', or 'password')" />
-  <jsp:directive.attribute name="render" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" />
-  <jsp:directive.attribute name="z" type="java.lang.String" required="false" description="Used for checking if element has been modified (to recalculate simply provide empty string value)" />
-  
-  <c:if test="${empty render or render}">
-  
-    <c:if test="${empty type}">
-      <c:set value="text" var="type" />
-    </c:if>
-    
-    <c:if test="${empty disabled}">
-      <c:set value="false" var="disabled" />
-    </c:if>
-    
-    <c:if test="${empty label}">
-      <c:if test="${empty labelCode}">
-        <c:set var="labelCode" value="${fn:substringAfter(id,'_')}" />
-      </c:if>
-      <spring:message code="label_${fn:toLowerCase(labelCode)}" var="label" htmlEscape="false" />
-    </c:if>
-    
-    <c:if test="${empty validationMessage}">
-      <c:choose>
-        <c:when test="${empty validationMessageCode}">
-          <spring:message arguments="${fn:escapeXml(label)}" code="field_invalid" var="field_invalid" htmlEscape="false" />
-        </c:when>
-        <c:otherwise>
-          <spring:message arguments="${fn:escapeXml(label)}" code="${validationMessageCode}" var="field_invalid" htmlEscape="false" />
-        </c:otherwise>
-      </c:choose>
-    </c:if>
-    
-    <c:if test="${empty required}">
-      <c:set value="false" var="required" />
-    </c:if>
-    
-    <c:set var="sec_field">
-      <spring:escapeBody javaScriptEscape="true" >${field}</spring:escapeBody>
-    </c:set>
-    
-    <div id="_${fn:escapeXml(id)}_id">
-      <label for="_${sec_field}_id">
-        <c:out value="${fn:escapeXml(label)}" />
-        :
-      </label>
-      <c:choose>
-        <c:when test="${disableFormBinding}">
-          <input id="_${sec_field}_id" name="${sec_field}" type="${fn:escapeXml(type)}" />
-        </c:when>
-        <c:otherwise>
-          <c:choose>
-            <c:when test="${type eq 'password'}">
-              <form:password id="_${sec_field}_id" path="${sec_field}" disabled="${disabled}" />
-            </c:when>
-            <c:otherwise>
-              <form:input id="_${sec_field}_id" path="${sec_field}" disabled="${disabled}" />
-            </c:otherwise>
-          </c:choose>
-          <br />
-          <form:errors cssClass="errors" id="_${sec_field}_error_id" path="${sec_field}" />
-        </c:otherwise>
-      </c:choose>
-      <c:choose>
-        <c:when test="${required}">
-          <spring:message code="field_required" var="field_required" htmlEscape="false" />
-          <spring:message argumentSeparator="," arguments="${label},(${field_required})" code="field_simple_validation" var="field_validation" htmlEscape="false" />
-        </c:when>
-        <c:otherwise>
-          <spring:message argumentSeparator="," arguments="${label}, " code="field_simple_validation" var="field_validation" htmlEscape="false" />
-        </c:otherwise>
-      </c:choose>
-      <c:set var="sec_field_validation">
-        <spring:escapeBody javaScriptEscape="true">${field_validation}</spring:escapeBody>
-      </c:set>
-      <c:set var="sec_field_invalid">
-        <spring:escapeBody javaScriptEscape="true" htmlEscape="true">${field_invalid}</spring:escapeBody>
-      </c:set>
-      <c:set var="sec_field_required">
-        <spring:escapeBody javaScriptEscape="true">${field_required}</spring:escapeBody>
-      </c:set>
-      <c:set var="sec_validation_regex" value="" />
-      <c:if test="${!empty validationRegex}">
-        <c:set var="sec_validation_regex" value="regExp : '${validationRegex}', " />
-      </c:if>
-      <script type="text/javascript">
-        Spring.addDecoration(new Spring.ElementDecoration({elementId : '_${sec_field}_id', widgetType : 'dijit.form.ValidationTextBox', widgetAttrs : {promptMessage: '${sec_field_validation}', invalidMessage: '${sec_field_invalid}', required : ${required}, ${sec_validation_regex} missingMessage : '${sec_field_required}' }})); 
-      </script>
-    </div>
-    <br />
-  </c:if>
-</jsp:root>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/form/fields/reference.tagx b/src/main/webapp/WEB-INF/tags/form/fields/reference.tagx
deleted file mode 100755
index a99eb1ca3..000000000
--- a/src/main/webapp/WEB-INF/tags/form/fields/reference.tagx
+++ /dev/null
@@ -1,41 +0,0 @@
-<jsp:root xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:spring="http://www.springframework.org/tags" xmlns:form="http://www.springframework.org/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-  <jsp:output omit-xml-declaration="yes" />
-
-  <jsp:directive.attribute name="id" type="java.lang.String" required="true" rtexprvalue="true" description="The identifier for this tag (do not change!)" />
-  <jsp:directive.attribute name="path" type="java.lang.String" required="true" rtexprvalue="true" description="The relative path to the respource" />
-  <jsp:directive.attribute name="field" type="java.lang.String" required="true" rtexprvalue="true" description="The field exposed from the form backing object" />
-  <jsp:directive.attribute name="required" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicates if this field is required (default false)" />
-  <jsp:directive.attribute name="label" type="java.lang.String" required="false" rtexprvalue="true" description="The label used for this field, will default to a message bundle if not supplied" />
-  <jsp:directive.attribute name="render" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" />
-  <jsp:directive.attribute name="z" type="java.lang.String" required="false" description="Used for checking if element has been modified (to recalculate simply provide empty string value)" />
-
-  <c:if test="${empty render or render}">
-
-    <c:if test="${empty label}">
-      <spring:message code="label_${fn:toLowerCase(fn:substringAfter(id,'_'))}" var="label" htmlEscape="false" />
-    </c:if>
-
-    <div id="_${fn:escapeXml(id)}_id">
-      <label for="_${fn:escapeXml(field)}_id">
-        <c:out value="${fn:escapeXml(label)}" />
-        :
-      </label>
-      <spring:url value="${path}" var="create_url">
-        <spring:param name="form" />
-      </spring:url>
-      <a href="${create_url}">
-        <spring:url value="/resources/images/add.png" var="create_img_url" />
-        <spring:message arguments="${field}" code="global_menu_new" var="add_message" htmlEscape="false" />
-        <img alt="${fn:escapeXml(add_message)}" src="${create_img_url}" title="${fn:escapeXml(add_message)}" />
-      </a>
-      <c:out value=" " />
-      <spring:message arguments="${label}" code="entity_not_found" />
-      <c:if test="${not empty required and required eq 'true'}">
-        (
-        <spring:message code="field_required" />
-        )
-      </c:if>
-    </div>
-    <br />
-  </c:if>
-</jsp:root>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/form/fields/select.tagx b/src/main/webapp/WEB-INF/tags/form/fields/select.tagx
deleted file mode 100755
index e454985b2..000000000
--- a/src/main/webapp/WEB-INF/tags/form/fields/select.tagx
+++ /dev/null
@@ -1,199 +0,0 @@
-<jsp:root xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:spring="http://www.springframework.org/tags" xmlns:form="http://www.springframework.org/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-  <jsp:output omit-xml-declaration="yes" />
-
-  <jsp:directive.attribute name="id" type="java.lang.String" required="true" rtexprvalue="true" description="The identifier for this tag (do not change!)" />
-  <jsp:directive.attribute name="field" type="java.lang.String" required="true" rtexprvalue="true" description="The field exposed from the form backing object" />
-  <jsp:directive.attribute name="path" type="java.lang.String" required="true" rtexprvalue="true" description="The relative path to the referenced resource" />
-  <jsp:directive.attribute name="items" type="java.util.Collection" required="true" rtexprvalue="true" description="The name of the collection displayed in the select box" />
-  <jsp:directive.attribute name="label" type="java.lang.String" required="false" rtexprvalue="true" description="The label used for this field, will default to a message bundle if not supplied" />
-  <jsp:directive.attribute name="itemLabel" type="java.lang.String" required="false" rtexprvalue="true" description="Name of the property mapped to the inner text of the 'option' tag (will override the configured converter)" />
-  <jsp:directive.attribute name="itemValue" type="java.lang.String" required="false" rtexprvalue="true" description="The identifier used as value in the select box (defaults to 'id' for non enum types)" />
-  <jsp:directive.attribute name="required" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicates if this field is required (default false)" />
-  <jsp:directive.attribute name="disabled" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Specify if this field should be enabled" />
-  <jsp:directive.attribute name="multiple" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Specify if the select box should allow multiple selections" />
-  <jsp:directive.attribute name="disableFormBinding" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Set to true to disable Spring form binding" />
-  <jsp:directive.attribute name="render" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" />
-  <jsp:directive.attribute name="z" type="java.lang.String" required="false" description="Used for checking if element has been modified (to recalculate simply provide empty string value)" />
-
-  <c:if test="${empty render or render}">
-
-    <c:if test="${empty disabled}">
-      <c:set value="false" var="disabled" />
-    </c:if>
-
-    <c:if test="${empty label}">
-      <spring:message code="label_${fn:toLowerCase(fn:substringAfter(id,'_'))}" var="label" htmlEscape="false" />
-    </c:if>
-
-    <c:if test="${empty required}">
-      <c:set value="false" var="required" />
-    </c:if>
-
-    <c:if test="${empty multiple}">
-      <c:set value="false" var="multiple" />
-    </c:if>
-    
-    <c:set var="sec_field">
-      <spring:escapeBody javaScriptEscape="true" >${field}</spring:escapeBody>
-    </c:set>
-
-    <c:set var="sec_itemLabel">
-      <spring:escapeBody htmlEscape="true" >${itemLabel}</spring:escapeBody>
-    </c:set>
-
-    <div id="_${fn:escapeXml(id)}_id">
-      <c:choose>
-        <c:when test="${not empty items}">
-          <label for="_${sec_field}_id">
-            <c:out value="${fn:escapeXml(label)}" />
-            :
-          </label>
-          <c:choose>
-            <c:when test="${empty itemValue}">
-              <c:choose>
-                <c:when test="${disableFormBinding}">
-                  <c:choose>
-                    <c:when test="${multiple}">
-                      <select id="_${sec_field}_id" name="${sec_field}" multiple="${multiple}">
-                      <c:forEach items="${items}" var="item">
-                        <option value="${item}">
-                        <c:choose>
-                          <c:when test="${empty itemLabel}">
-                            <spring:eval expression="item" />
-                          </c:when>
-                          <c:otherwise>
-                            <spring:eval expression="item[sec_itemLabel]"/>
-                          </c:otherwise>
-                        </c:choose>
-                        </option>
-                      </c:forEach>
-                      </select>
-                    </c:when>
-                    <c:otherwise>
-                      <select id="_${sec_field}_id" name="${sec_field}">
-                      <c:forEach items="${items}" var="item">
-                        <option value="${item}">
-                        <c:choose>
-                          <c:when test="${empty itemLabel}">
-                            <spring:eval expression="item" />
-                          </c:when>
-                          <c:otherwise>
-                            <spring:eval expression="item[sec_itemLabel]"/>
-                          </c:otherwise>
-                        </c:choose>
-                        </option>
-                      </c:forEach>
-                      </select>
-                    </c:otherwise>
-                  </c:choose>
-                </c:when>
-                <c:otherwise>
-                  <c:choose>
-                    <c:when test="${empty itemLabel}">
-                      <c:choose>
-                        <c:when test="${multiple}">
-                          <form:select id="_${sec_field}_id" items="${items}" path="${sec_field}" disabled="${disabled}" multiple="${multiple}" />
-                        </c:when>
-                        <c:otherwise>
-                          <form:select id="_${sec_field}_id" items="${items}" path="${sec_field}" disabled="${disabled}" />
-                        </c:otherwise>
-                     </c:choose>
-                    </c:when>
-                    <c:otherwise>
-                      <c:choose>
-                        <c:when test="${multiple}">
-                          <form:select id="_${sec_field}_id" items="${items}" path="${sec_field}" disabled="${disabled}" multiple="${multiple}" itemLabel="${sec_itemLabel}"/>
-                        </c:when>
-                        <c:otherwise>
-                          <form:select id="_${sec_field}_id" items="${items}" path="${sec_field}" disabled="${disabled}" itemLabel="${sec_itemLabel}"/>
-                        </c:otherwise>
-                      </c:choose>
-                    </c:otherwise>
-                  </c:choose>
-                  <br />
-                  <form:errors cssClass="errors" id="_${sec_field}_error_id" path="${sec_field}" />
-                </c:otherwise>
-              </c:choose>
-            </c:when>
-            <c:otherwise>
-              <c:choose>
-                <c:when test="${disableFormBinding}">
-                  <c:choose>
-                    <c:when test="${multiple}">
-                      <select id="_${sec_field}_id" name="${sec_field}" multiple="${multiple}">
-                        <c:forEach items="${items}" var="item">
-                          <option value="${item[fn:escapeXml(itemValue)]}">
-                            <c:choose>
-                              <c:when test="${empty itemLabel}">
-                                <spring:eval expression="item" />
-                              </c:when>
-                              <c:otherwise>
-                                <spring:eval expression="item[sec_itemLabel]"/>
-                              </c:otherwise>
-                            </c:choose>
-                          </option>
-                        </c:forEach>
-                      </select>
-                    </c:when>
-                    <c:otherwise>
-                      <select id="_${sec_field}_id" name="${sec_field}" multiple="${multiple}">
-                        <c:forEach items="${items}" var="item">
-                          <option value="${item[fn:escapeXml(itemValue)]}">
-                            <c:choose>
-                              <c:when test="${empty itemLabel}">
-                                <spring:eval expression="item" />
-                              </c:when>
-                              <c:otherwise>
-                                <spring:eval expression="item[sec_itemLabel]"/>
-                              </c:otherwise>
-                            </c:choose>
-                          </option>
-                        </c:forEach>
-                      </select>
-                    </c:otherwise>
-                  </c:choose>
-                </c:when>
-                <c:otherwise>
-                  <c:choose>
-                    <c:when test="${empty itemLabel}">
-                      <c:choose>
-                        <c:when test="${multiple}">
-                          <form:select id="_${sec_field}_id" items="${items}" path="${sec_field}" disabled="${disabled}" multiple="${multiple}" itemValue="${fn:escapeXml(itemValue)}" />
-                        </c:when>
-                        <c:otherwise>
-                          <form:select id="_${sec_field}_id" items="${items}" path="${sec_field}" disabled="${disabled}" itemValue="${fn:escapeXml(itemValue)}" />
-                        </c:otherwise>
-                      </c:choose>
-                    </c:when>
-                    <c:otherwise>
-                      <c:choose>
-                        <c:when test="${multiple}">
-                          <form:select id="_${sec_field}_id" items="${items}" path="${sec_field}" disabled="${disabled}" multiple="${multiple}" itemValue="${fn:escapeXml(itemValue)}" itemLabel="${sec_itemLabel}"/>
-                        </c:when>
-                        <c:otherwise>
-                          <form:select id="_${sec_field}_id" items="${items}" path="${sec_field}" disabled="${disabled}" itemValue="${fn:escapeXml(itemValue)}" itemLabel="${sec_itemLabel}"/>
-                        </c:otherwise>
-                      </c:choose>
-                    </c:otherwise>
-                  </c:choose>
-                  <br />
-                  <form:errors cssClass="errors" id="_${sec_field}_error_id" path="${sec_field}" />
-                </c:otherwise>
-              </c:choose>
-            </c:otherwise>
-          </c:choose>
-          <c:choose>
-            <c:when test="${multiple == false}">
-              <script type="text/javascript">Spring.addDecoration(new Spring.ElementDecoration({elementId : '_${sec_field}_id', widgetType: 'dijit.form.FilteringSelect', widgetAttrs : {hasDownArrow : true}})); </script>
-            </c:when>
-            <!-- disabled due to http://jira.springframework.org/browse/ROO-909 <c:otherwise> <script type="text/javascript">Spring.addDecoration(new Spring.ElementDecoration({elementId : '_${field}_id', widgetType: 'dijit.form.MultiSelect', widgetAttrs : {}})); </script> </c:otherwise> -->
-          </c:choose>
-        </c:when>
-        <c:otherwise>
-          <field:reference field="${label}" id="${id}" path="${path}" required="${required}" />
-        </c:otherwise>
-      </c:choose>
-    </div>
-    <br />
-  </c:if>
-</jsp:root>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/form/fields/simple.tagx b/src/main/webapp/WEB-INF/tags/form/fields/simple.tagx
deleted file mode 100755
index f8a86f328..000000000
--- a/src/main/webapp/WEB-INF/tags/form/fields/simple.tagx
+++ /dev/null
@@ -1,35 +0,0 @@
-<jsp:root xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:spring="http://www.springframework.org/tags" xmlns:form="http://www.springframework.org/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-  <jsp:output omit-xml-declaration="yes" />
-
-  <jsp:directive.attribute name="id" type="java.lang.String" required="true" rtexprvalue="true" description="The identifier for this tag (do not change!)" />
-  <jsp:directive.attribute name="field" type="java.lang.String" required="true" rtexprvalue="true" description="The field exposed from the form backing object" />
-  <jsp:directive.attribute name="text" type="java.lang.String" required="false" rtexprvalue="true" description="The text to be presented" />
-  <jsp:directive.attribute name="messageCode" type="java.lang.String" required="false" rtexprvalue="true" description="The code for the message to be presented" />
-  <jsp:directive.attribute name="messageCodeAttribute" type="java.lang.String" required="false" rtexprvalue="true" description="The attribute for the message code sto be presented" />
-  <jsp:directive.attribute name="label" type="java.lang.String" required="false" rtexprvalue="true" description="The label used for this field, will default to a message bundle if not supplied" />
-  <jsp:directive.attribute name="render" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" />
-  <jsp:directive.attribute name="z" type="java.lang.String" required="false" description="Used for checking if element has been modified (to recalculate simply provide empty string value)" />
-
-  <c:if test="${empty render or render}">
-
-    <c:if test="${empty label}">
-      <spring:message code="label_${fn:toLowerCase(fn:substringAfter(id,'_'))}" var="label" htmlEscape="false" />
-    </c:if>
-
-    <div id="_${fn:escapeXml(id)}_id">
-      <label for="_${fn:escapeXml(field)}_id">
-        <c:out value="${label}" />
-        :
-      </label>
-      <c:choose>
-        <c:when test="${not empty messageCode}">
-          <spring:message code="${messageCode}" arguments="${messageCodeAttribute}" />
-        </c:when>
-        <c:otherwise>
-          <spring:eval expression="text" />
-        </c:otherwise>
-      </c:choose>
-    </div>
-    <br />
-  </c:if>
-</jsp:root>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/form/fields/table.tagx b/src/main/webapp/WEB-INF/tags/form/fields/table.tagx
deleted file mode 100755
index 80962b33a..000000000
--- a/src/main/webapp/WEB-INF/tags/form/fields/table.tagx
+++ /dev/null
@@ -1,162 +0,0 @@
-<jsp:root xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:util="urn:jsptagdir:/WEB-INF/tags/util" xmlns:spring="http://www.springframework.org/tags" xmlns:form="http://www.springframework.org/tags/form" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-  <jsp:directive.tag import="java.util.ArrayList" />
-  <jsp:output omit-xml-declaration="yes" />
-
-  <jsp:directive.attribute name="id" type="java.lang.String" required="true" rtexprvalue="true" description="The identifier for this tag (do not change!)" />
-  <jsp:directive.attribute name="data" type="java.util.Collection" required="true" rtexprvalue="true" description="The collection to be displayed in the table" />
-  <jsp:directive.attribute name="path" type="java.lang.String" required="true" rtexprvalue="true" description="Specify the URL path" />
-  <jsp:directive.attribute name="typeIdFieldName" type="java.lang.String" required="false" rtexprvalue="true" description="The identifier field name for the type (defaults to 'id')" />
-  <jsp:directive.attribute name="create" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Include 'create' link into table (default true)" />
-  <jsp:directive.attribute name="update" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Include 'update' link into table (default true)" />
-  <jsp:directive.attribute name="delete" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Include 'delete' link into table (default true)" />
-  <jsp:directive.attribute name="render" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" />
-  <jsp:directive.attribute name="z" type="java.lang.String" required="false" description="Used for checking if element has been modified (to recalculate simply provide empty string value)" />
-
-  <c:if test="${empty render or render}">
-
-    <c:set var="columnProperties" scope="request" />
-    <c:set var="columnLabels" scope="request" />
-    <c:set var="columnMaxLengths" scope="request" />
-    <c:set var="columnTypes" scope="request" />
-    <c:set var="columnDatePatterns" scope="request" />
-
-    <jsp:doBody />
-
-    <c:if test="${empty typeIdFieldName}">
-      <c:set var="typeIdFieldName" value="id" />
-    </c:if>
-
-    <c:if test="${empty update}">
-      <c:set var="update" value="true" />
-    </c:if>
-
-    <c:if test="${empty delete}">
-      <c:set var="delete" value="true" />
-    </c:if>
-
-    <spring:message var="typeName" code="menu_item_${fn:toLowerCase(fn:split(id,'_')[fn:length(fn:split(id,'_')) - 1])}_new_label" htmlEscape="false" />
-    <c:set var="lengths" value="${fn:split(columnMaxLengths, '&#9999;')}" scope="request" />
-    <c:set var="types" value="${fn:split(columnTypes, '&#9999;')}" scope="request" />
-    <c:set var="patterns" value="${fn:split(columnDatePatterns, '&#9999;')}" scope="request" />
-
-    <spring:eval var="colCounter" expression="1" />
-
-    <table>
-      <thead>
-        <tr>
-          <c:forTokens items="${columnLabels}" delims="${'&#9999;'}" var="columnHeading">
-            <th>
-              <c:out value="${columnHeading}" />
-              <spring:eval var="colCounter" expression="colCounter  + 1" />
-            </th>
-          </c:forTokens>
-          <th></th>
-          <c:if test="${update}">
-            <th></th>
-            <spring:eval var="colCounter" expression="colCounter  + 1" />
-          </c:if>
-          <c:if test="${delete}">
-            <th></th>
-            <spring:eval var="colCounter" expression="colCounter  + 1" />
-          </c:if>
-        </tr>
-      </thead>
-      <c:forEach items="${data}" var="item">
-        <tr>
-          <c:forTokens items="${columnProperties}" delims="${'&#9999;'}" var="column" varStatus="num">
-            <c:set var="columnMaxLength" value="${lengths[num.count-1]}" />
-            <c:set var="columnType" value="${types[num.count-1]}" />
-            <c:set var="columnDatePattern" value="${patterns[num.count-1]}" />
-            <td>
-              <c:choose>
-                <c:when test="${columnType eq 'date'}">
-                  <spring:escapeBody>
-                    <fmt:formatDate value="${item[column]}" pattern="${fn:escapeXml(columnDatePattern)}" var="colTxt" />
-                  </spring:escapeBody>
-                </c:when>
-                <c:when test="${columnType eq 'calendar'}">
-                  <spring:escapeBody>
-                    <fmt:formatDate value="${item[column].time}" pattern="${fn:escapeXml(columnDatePattern)}" var="colTxt"/>
-                  </spring:escapeBody>
-                </c:when>
-                <c:otherwise>
-                  <c:set var="colTxt">
-                    <spring:eval expression="item[column]" htmlEscape="false" />
-                  </c:set>
-                </c:otherwise>
-              </c:choose>
-              <c:if test="${columnMaxLength ge 0}">
-                <c:set value="${fn:substring(colTxt, 0, columnMaxLength)}" var="colTxt" />
-              </c:if>
-              <c:out value="${colTxt}" />
-            </td>
-          </c:forTokens>
-          <c:set var="itemId"><spring:eval expression="item[typeIdFieldName]"/></c:set>
-          <td class="utilbox">
-            <spring:url value="${path}/${itemId}" var="show_form_url" />
-            <spring:url value="/resources/images/show.png" var="show_image_url" />
-            <spring:message arguments="${typeName}" code="entity_show" var="show_label" htmlEscape="false" />
-            <a href="${show_form_url}" alt="${fn:escapeXml(show_label)}" title="${fn:escapeXml(show_label)}">
-              <img alt="${fn:escapeXml(show_label)}" class="image" src="${show_image_url}" title="${fn:escapeXml(show_label)}" />
-            </a>
-          </td>
-          <c:if test="${update}">
-            <td class="utilbox">
-              <spring:url value="${path}/${itemId}" var="update_form_url">
-                <spring:param name="form" />
-              </spring:url>
-              <spring:url value="/resources/images/update.png" var="update_image_url" />
-              <spring:message arguments="${typeName}" code="entity_update" var="update_label" htmlEscape="false" />
-              <a href="${update_form_url}" alt="${fn:escapeXml(update_label)}" title="${fn:escapeXml(update_label)}">
-                <img alt="${fn:escapeXml(update_label)}" class="image" src="${update_image_url}" title="${fn:escapeXml(update_label)}" />
-              </a>
-            </td>
-          </c:if>
-          <c:if test="${delete}">
-            <td class="utilbox">
-              <spring:url value="${path}/${itemId}" var="delete_form_url" />
-              <spring:url value="/resources/images/delete.png" var="delete_image_url" />
-              <form:form action="${delete_form_url}" method="DELETE">
-                <spring:message arguments="${typeName}" code="entity_delete" var="delete_label" htmlEscape="false" />
-                <c:set var="delete_confirm_msg">
-                  <spring:escapeBody javaScriptEscape="true">
-                    <spring:message code="entity_delete_confirm" />
-                  </spring:escapeBody>
-                </c:set>
-                <input alt="${fn:escapeXml(delete_label)}" class="image" src="${delete_image_url}" title="${fn:escapeXml(delete_label)}" type="image" value="${fn:escapeXml(delete_label)}" onclick="return confirm('${delete_confirm_msg}');" />
-                <c:if test="${not empty param.page}">
-                  <input name="page" type="hidden" value="1" />
-                </c:if>
-                <c:if test="${not empty param.size}">
-                  <input name="size" type="hidden" value="${fn:escapeXml(param.size)}" />
-                </c:if>
-              </form:form>
-            </td>
-          </c:if>
-        </tr>
-      </c:forEach>
-      <tr class="footer">
-        <td colspan="${colCounter}">
-          <c:if test="${empty create or create}">
-            <span class="new">
-              <spring:url value="${path}" var="create_url">
-                <spring:param name="form" />
-              </spring:url>
-              <a href="${create_url}">
-                <spring:url value="/resources/images/add.png" var="create_img_url" />
-                <spring:message arguments="${typeName}" code="global_menu_new" var="add_message" htmlEscape="false" />
-                <img alt="${fn:escapeXml(add_message)}" src="${create_img_url}" title="${fn:escapeXml(add_message)}" />
-              </a>
-            </span>
-            <c:out value=" " />
-          </c:if>
-          <c:if test="${not empty maxPages}">
-            <util:pagination maxPages="${maxPages}" page="${param.page}" size="${param.size}" />
-          </c:if>
-        </td>
-      </tr>
-    </table>
-
-  </c:if>
-
-</jsp:root>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/form/fields/textarea.tagx b/src/main/webapp/WEB-INF/tags/form/fields/textarea.tagx
deleted file mode 100755
index 1b5ba2384..000000000
--- a/src/main/webapp/WEB-INF/tags/form/fields/textarea.tagx
+++ /dev/null
@@ -1,47 +0,0 @@
-<jsp:root xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:spring="http://www.springframework.org/tags" xmlns:form="http://www.springframework.org/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-  <jsp:output omit-xml-declaration="yes" />
-
-  <jsp:directive.attribute name="id" type="java.lang.String" required="true" rtexprvalue="true" description="The identifier for this tag (do not change!)" />
-  <jsp:directive.attribute name="field" type="java.lang.String" required="true" rtexprvalue="true" description="The field exposed from the form backing object" />
-  <jsp:directive.attribute name="label" type="java.lang.String" required="false" rtexprvalue="true" description="The label used for this field, will default to a message bundle if not supplied" />
-  <jsp:directive.attribute name="required" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicates if this field is required (default false)" />
-  <jsp:directive.attribute name="disabled" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Specify if this field should be enabled" />
-  <jsp:directive.attribute name="validationRegex" type="java.lang.String" required="false" rtexprvalue="true" description="Specify regular expression to be used for the validation of the input contents" />
-  <jsp:directive.attribute name="validationMessageCode" type="java.lang.String" required="false" rtexprvalue="true" description="Specify the message (message property code) to be displayed if the regular expression validation fails" />
-  <jsp:directive.attribute name="validationMessage" type="java.lang.String" required="false" rtexprvalue="true" description="Specify the message to be displayed if the regular expression validation fails" />
-  <jsp:directive.attribute name="render" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" />
-  <jsp:directive.attribute name="z" type="java.lang.String" required="false" description="Used for checking if element has been modified (to recalculate simply provide empty string value)" />
-
-  <c:if test="${empty render or render}">
-
-    <c:if test="${empty disabled}">
-      <c:set value="false" var="disabled" />
-    </c:if>
-
-    <c:if test="${empty label}">
-      <spring:message code="label_${fn:toLowerCase(fn:substringAfter(id,'_'))}" var="label" htmlEscape="false" />
-    </c:if>
-
-    <c:if test="${empty required}">
-      <c:set value="false" var="required" />
-    </c:if>
-    
-    <c:set var="sec_field">
-      <spring:escapeBody javaScriptEscape="true" >${field}</spring:escapeBody>
-    </c:set>
-
-    <script type="text/javascript">dojo.require("dijit.form.SimpleTextarea");</script>
-    <div id="_${fn:escapeXml(id)}_id">
-      <label for="_${sec_field}_id">
-        <c:out value="${fn:escapeXml(label)}" />
-        :
-      </label>
-      <form:textarea id="_${sec_field}_id" path="${sec_field}" disabled="${disabled}" />
-      <br />
-      <form:errors cssClass="errors" id="_${sec_field}_error_id" path="${sec_field}" />
-      <script type="text/javascript">Spring.addDecoration(new Spring.ElementDecoration({elementId : '_${sec_field}_id', widgetType : 'dijit.form.SimpleTextarea', widgetAttrs : {disabled : ${disabled}}})); </script>
-    </div>
-    <br />
-
-  </c:if>
-</jsp:root>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/form/find.tagx b/src/main/webapp/WEB-INF/tags/form/find.tagx
deleted file mode 100755
index 095f20fdf..000000000
--- a/src/main/webapp/WEB-INF/tags/form/find.tagx
+++ /dev/null
@@ -1,31 +0,0 @@
-<jsp:root xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:util="urn:jsptagdir:/WEB-INF/tags/util" xmlns:form="http://www.springframework.org/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-  <jsp:output omit-xml-declaration="yes"/>
-
-  <jsp:directive.attribute name="id" type="java.lang.String" required="true" rtexprvalue="true" description="The identifier for this tag (do not change!)"/>
-  <jsp:directive.attribute name="finderName" type="java.lang.String" required="true" rtexprvalue="true" description="The finder name"/>
-  <jsp:directive.attribute name="path" type="java.lang.String" required="true" rtexprvalue="true" description="Specify the relative URL path (with leading /)" />
-  <jsp:directive.attribute name="label" type="java.lang.String" required="false" rtexprvalue="true" description="The label used for this field, will default to a message bundle if not supplied" />
-  <jsp:directive.attribute name="render" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" />
-  <jsp:directive.attribute name="openPane" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Control if the title pane is opened or closed by default (default: true)"/>
-  <jsp:directive.attribute name="z" type="java.lang.String" required="false" description="Used for checking if element has been modified (to recalculate simply provide empty string value)"/>
-
-  <c:if test="${empty render or render}">
-    <c:if test="${empty label}">
-      <c:set var="entityClass" value="${fn:substringAfter(id,'ff_')}" />
-      <spring:message code="label_${fn:toLowerCase(entityClass)}_plural" var="label" htmlEscape="false" />
-    </c:if>
-    <spring:message arguments="${fn:escapeXml(label)}" code="entity_find" var="title_msg" htmlEscape="false" />
-    <util:panel id="${id}" title="${title_msg}" openPane="${openPane}">
-      <spring:url value="${path}" var="form_url" />
-      <form:form action="${form_url}" method="GET">
-        <input type="hidden" name="find" value="${fn:escapeXml(finderName)}" />
-        <jsp:doBody />
-        <div class="submit" id="${fn:escapeXml(id)}_${fn:escapeXml(finderName)}_submit">
-          <spring:message code="button_find" var="find_button" htmlEscape="false" />
-          <script type="text/javascript">Spring.addDecoration(new Spring.ValidateAllDecoration({elementId:'proceed', event:'onclick'}));</script>
-          <input id="proceed" type="submit" value="${fn:escapeXml(find_button)}"/>
-        </div>
-      </form:form>
-    </util:panel>
-  </c:if>
-</jsp:root>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/form/list.tagx b/src/main/webapp/WEB-INF/tags/form/list.tagx
deleted file mode 100755
index b81d25669..000000000
--- a/src/main/webapp/WEB-INF/tags/form/list.tagx
+++ /dev/null
@@ -1,31 +0,0 @@
-<jsp:root xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:util="urn:jsptagdir:/WEB-INF/tags/util" xmlns:form="http://www.springframework.org/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-  <jsp:output omit-xml-declaration="yes" />
-
-  <jsp:directive.attribute name="id" type="java.lang.String" required="true" rtexprvalue="true" description="The identifier for this tag (do not change!)" />
-  <jsp:directive.attribute name="items" type="java.util.Collection" required="true" rtexprvalue="true" description="The form backing object name" />
-  <jsp:directive.attribute name="label" type="java.lang.String" required="false" rtexprvalue="true" description="The label used for this object, will default to a message bundle if not supplied" />
-  <jsp:directive.attribute name="labelPlural" type="java.lang.String" required="false" rtexprvalue="true" description="The label used for this object, will default to a message bundle if not supplied" />
-  <jsp:directive.attribute name="render" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" />
-  <jsp:directive.attribute name="openPane" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Control if the title pane is opened or closed by default (default: true)" />
-  <jsp:directive.attribute name="z" type="java.lang.String" required="false" description="Used for checking if element has been modified (to recalculate simply provide empty string value)" />
-
-  <c:if test="${empty render or render}">
-    <c:if test="${empty label}">
-      <spring:message code="label_${fn:toLowerCase(fn:substringAfter(id,'_'))}" var="label" htmlEscape="false" />
-    </c:if>
-    <c:if test="${empty labelPlural}">
-      <spring:message code="label_${fn:toLowerCase(fn:substringAfter(id,'_'))}_plural" var="labelPlural" htmlEscape="false" />
-    </c:if>
-    <spring:message arguments="${labelPlural}" code="entity_list_all" var="title_msg" htmlEscape="false" />
-    <util:panel id="${id}" title="${title_msg}" openPane="${openPane}">
-      <c:choose>
-        <c:when test="${not empty items}">
-          <jsp:doBody />
-        </c:when>
-        <c:otherwise>
-          <spring:message arguments="${label}" code="entity_not_found" />
-        </c:otherwise>
-      </c:choose>
-    </util:panel>
-  </c:if>
-</jsp:root>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/form/show.tagx b/src/main/webapp/WEB-INF/tags/form/show.tagx
deleted file mode 100755
index 47cc06aa5..000000000
--- a/src/main/webapp/WEB-INF/tags/form/show.tagx
+++ /dev/null
@@ -1,103 +0,0 @@
-<jsp:root xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:util="urn:jsptagdir:/WEB-INF/tags/util" xmlns:form="http://www.springframework.org/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-  <jsp:output omit-xml-declaration="yes" />
-
-  <jsp:directive.attribute name="id" type="java.lang.String" required="true" rtexprvalue="true" description="The identifier for this tag (do not change!)" />
-  <jsp:directive.attribute name="object" type="java.lang.Object" required="true" rtexprvalue="true" description="The form backing object" />
-  <jsp:directive.attribute name="path" type="java.lang.String" required="true" rtexprvalue="true" description="Specify the URL path" />
-  <jsp:directive.attribute name="list" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Include 'list' link into table (default true)" />
-  <jsp:directive.attribute name="create" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Include 'create' link into table (default true)" />
-  <jsp:directive.attribute name="update" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Include 'update' link into table (default true)" />
-  <jsp:directive.attribute name="delete" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Include 'delete' link into table (default true)" />
-  <jsp:directive.attribute name="label" type="java.lang.String" required="false" rtexprvalue="true" description="The label used for this object, will default to a message bundle if not supplied" />
-  <jsp:directive.attribute name="render" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" />
-  <jsp:directive.attribute name="openPane" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Control if the title pane is opened or closed by default (default: true)" />
-  <jsp:directive.attribute name="z" type="java.lang.String" required="false" description="Used for checking if element has been modified (to recalculate simply provide empty string value)" />
-
-  <c:if test="${empty render or render}">
-    <c:if test="${empty label}">
-      <spring:message code="label_${fn:toLowerCase(fn:substringAfter(id,'_'))}" var="label" htmlEscape="false" />
-    </c:if>
-
-    <c:if test="${empty list}">
-      <c:set var="list" value="true" />
-    </c:if>
-
-    <c:if test="${empty create}">
-      <c:set var="create" value="true" />
-    </c:if>
-
-    <c:if test="${empty update}">
-      <c:set var="update" value="true" />
-    </c:if>
-
-    <c:if test="${empty delete}">
-      <c:set var="delete" value="true" />
-    </c:if>
-
-    <spring:message var="typeName" code="menu_item_${fn:toLowerCase(fn:split(id,'_')[fn:length(fn:split(id,'_')) - 1])}_new_label" htmlEscape="false" />
-    <spring:message var="typeNamePlural" code="menu_item_${fn:toLowerCase(fn:split(id,'_')[fn:length(fn:split(id,'_')) - 1])}_list_label" htmlEscape="false" />
-
-    <spring:message arguments="${label}" code="entity_show" var="title_msg" htmlEscape="false" />
-    <util:panel id="${id}" title="${title_msg}" openPane="${openPane}">
-      <c:choose>
-        <c:when test="${not empty object}">
-          <jsp:doBody />
-          <div class="quicklinks">
-            <span>
-              <c:if test="${delete}">
-                <spring:url value="${path}/${itemId}" var="delete_form_url" />
-                <spring:url value="/resources/images/delete.png" var="delete_image_url" />
-                <form:form action="${delete_form_url}" method="DELETE">
-                  <spring:message arguments="${typeName}" code="entity_delete" var="delete_label" htmlEscape="false" />
-                  <c:set var="delete_confirm_msg">
-                    <spring:escapeBody javaScriptEscape="true">
-                      <spring:message code="entity_delete_confirm" />
-                    </spring:escapeBody>
-                  </c:set>
-                  <input alt="${fn:escapeXml(delete_label)}" class="image" src="${delete_image_url}" title="${fn:escapeXml(delete_label)}" type="image" value="${fn:escapeXml(delete_label)}" onclick="return confirm('${fn:escapeXml(delete_confirm_msg)}');" />
-                </form:form>
-              </c:if>
-            </span>
-            <span>
-              <c:if test="${update}">
-                <spring:url value="${path}/${itemId}" var="update_form_url">
-                  <spring:param name="form" />
-                </spring:url>
-                <spring:url value="/resources/images/update.png" var="update_image_url" />
-                <spring:message arguments="${typeName}" code="entity_update" var="update_label" htmlEscape="false" />
-                <a href="${update_form_url}" alt="${fn:escapeXml(update_label)}" title="${fn:escapeXml(update_label)}">
-                  <img alt="${fn:escapeXml(update_label)}" class="image" src="${update_image_url}" title="${fn:escapeXml(update_label)}" />
-                </a>
-              </c:if>
-            </span>
-            <span>
-              <c:if test="${create}">
-                <spring:url value="${path}" var="create_form_url">
-                  <spring:param name="form" />
-                </spring:url>
-                <spring:url value="/resources/images/create.png" var="create_image_url" />
-                <spring:message arguments="${typeName}" code="entity_create" var="create_label" htmlEscape="false" />
-                <a href="${create_form_url}" alt="${fn:escapeXml(create_label)}" title="${fn:escapeXml(create_label)}">
-                  <img alt="${fn:escapeXml(create_label)}" class="image" src="${create_image_url}" title="${fn:escapeXml(create_label)}" />
-                </a>
-              </c:if>
-            </span>
-            <span>
-              <c:if test="${list}">
-                <spring:url value="${path}" var="list_form_url" />
-                <spring:url value="/resources/images/list.png" var="list_image_url" />
-                <spring:message arguments="${typeNamePlural}" code="entity_list_all" var="list_label" htmlEscape="false" />
-                <a href="${list_form_url}" alt="${fn:escapeXml(list_label)}" title="${fn:escapeXml(list_label)}">
-                  <img alt="${fn:escapeXml(list_label)}" class="image" src="${list_image_url}" title="${fn:escapeXml(list_label)}" />
-                </a>
-              </c:if>
-            </span>
-          </div>
-        </c:when>
-        <c:otherwise>
-          <spring:message arguments="${label}" code="entity_not_found_single" />
-        </c:otherwise>
-      </c:choose>
-    </util:panel>
-  </c:if>
-</jsp:root>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/form/update.tagx b/src/main/webapp/WEB-INF/tags/form/update.tagx
deleted file mode 100755
index 01217c518..000000000
--- a/src/main/webapp/WEB-INF/tags/form/update.tagx
+++ /dev/null
@@ -1,47 +0,0 @@
-<jsp:root xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:util="urn:jsptagdir:/WEB-INF/tags/util" xmlns:form="http://www.springframework.org/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-  <jsp:output omit-xml-declaration="yes" />
-
-  <jsp:directive.attribute name="id" type="java.lang.String" required="true" rtexprvalue="true" description="The identifier for this tag (do not change!)" />
-  <jsp:directive.attribute name="modelAttribute" type="java.lang.String" required="true" rtexprvalue="true" description="The name of the model attribute for form binding" />
-  <jsp:directive.attribute name="path" type="java.lang.String" required="true" rtexprvalue="true" description="Specify the relative URL path (with leading /)" />
-  <jsp:directive.attribute name="multipart" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if this is a multipart form (default: false)" />
-  <jsp:directive.attribute name="label" type="java.lang.String" required="false" rtexprvalue="true" description="The label used for this object, will default to a message bundle if not supplied" />
-  <jsp:directive.attribute name="idField" type="java.lang.String" required="false" rtexprvalue="true" description="Specify the field name of the id field (default 'id')" />
-  <jsp:directive.attribute name="versionField" type="java.lang.String" required="false" rtexprvalue="true" description="Specify the field name of the version field (default 'version'). If specified 'none' the version field will not be inlcuded (versionField='none')." />
-  <jsp:directive.attribute name="render" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" />
-  <jsp:directive.attribute name="openPane" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Control if the title pane is opened or closed by default (default: true)" />
-  <jsp:directive.attribute name="z" type="java.lang.String" required="false" description="Used for checking if element has been modified (to recalculate simply provide empty string value)" />
-
-  <c:if test="${empty render or render}">
-    <c:if test="${empty label}">
-      <spring:message code="label_${fn:toLowerCase(fn:substringAfter(id,'_'))}" var="label" htmlEscape="false" />
-    </c:if>
-    <c:if test="${empty idField}">
-      <c:set value="id" var="idField" />
-    </c:if>
-    <c:if test="${empty versionField}">
-      <c:set value="version" var="versionField" />
-    </c:if>
-    <c:set var="enctype" value="application/x-www-form-urlencoded"/>
-    <c:if test="${multipart}">
-      <c:set var="enctype" value="multipart/form-data"/>
-    </c:if>
-    <spring:message arguments="${label}" code="entity_update" var="title_msg" htmlEscape="false" />
-    <util:panel id="${id}" title="${title_msg}" openPane="${openPane}">
-      <spring:url value="${path}" var="form_url" />
-      <form:form action="${form_url}" method="PUT" modelAttribute="${modelAttribute}" enctype="${enctype}">
-        <form:errors cssClass="errors" delimiter="&lt;p/&gt;" />
-        <jsp:doBody />
-        <div class="submit" id="${fn:escapeXml(id)}_submit">
-          <spring:message code="button_save" var="save_button" htmlEscape="false" />
-          <script type="text/javascript">Spring.addDecoration(new Spring.ValidateAllDecoration({elementId:'proceed', event:'onclick'}));</script>
-          <input id="proceed" type="submit" value="${fn:escapeXml(save_button)}" />
-        </div>
-        <form:hidden id="_${fn:escapeXml(idField)}_id" path="${fn:escapeXml(idField)}" />
-        <c:if test="${versionField ne 'none'}">
-          <form:hidden id="_${fn:escapeXml(versionField)}_id" path="${fn:escapeXml(versionField)}" />
-        </c:if>
-      </form:form>
-    </util:panel>
-  </c:if>
-</jsp:root>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/menu/category.tagx b/src/main/webapp/WEB-INF/tags/menu/category.tagx
deleted file mode 100755
index f78f81f39..000000000
--- a/src/main/webapp/WEB-INF/tags/menu/category.tagx
+++ /dev/null
@@ -1,25 +0,0 @@
-<jsp:root xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-	<jsp:output omit-xml-declaration="yes"/>
-	
-	<jsp:directive.attribute name="id" type="java.lang.String" required="true" rtexprvalue="true" description="The identifier for this tag (do not change!)"/>
-	<jsp:directive.attribute name="label" type="java.lang.String" required="false" rtexprvalue="true" description="The label for this category (if not set the resource bundle is used)"/>
-	<jsp:directive.attribute name="render" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" />
-	<jsp:directive.attribute name="z" type="java.lang.String" required="false" description="Used for checking if element has been modified (to recalculate simply provide empty string value)"/>
-	
-	<c:if test="${empty render or render}">
-
-		<c:if test="${empty label}">
-			<spring:message code="menu_category_${fn:toLowerCase(fn:substringAfter(id,'_'))}_label" var="label" htmlEscape="false"/>
-		</c:if>
-		
-		<li id="${fn:escapeXml(id)}">
-			<h2>
-				<c:out value="${label}" />
-			</h2>
-			<ul>
-				<jsp:doBody />
-			</ul>
-		</li>
-	
-	</c:if>
-</jsp:root>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/menu/gvnixitem.tagx b/src/main/webapp/WEB-INF/tags/menu/gvnixitem.tagx
deleted file mode 100644
index c58b9c6ff..000000000
--- a/src/main/webapp/WEB-INF/tags/menu/gvnixitem.tagx
+++ /dev/null
@@ -1,149 +0,0 @@
-<jsp:root xmlns:menu="urn:jsptagdir:/WEB-INF/tags/menu"
-  xmlns:c="http://java.sun.com/jsp/jstl/core"
-  xmlns:fn="http://java.sun.com/jsp/jstl/functions"
-  xmlns:jsp="http://java.sun.com/JSP/Page"
-  xmlns:spring="http://www.springframework.org/tags"
-  xmlns:sec="http://www.springframework.org/security/tags" 
-  version="2.0">
-  <!-- gvNIX menu item renderer -->
-
-  <jsp:output omit-xml-declaration="yes" />
-
-  <jsp:directive.attribute name="id" type="java.lang.String" required="true" 
-    description="The menu item identifier" />
-  <jsp:directive.attribute name="url" type="java.lang.String" required="false"
-    description="Destination of the item (usually a url)" />
-  <jsp:directive.attribute name="labelCode" type="java.lang.String" required="false"
-    description="The label code to get text from I18N properties that will be used as message arguments." />
-  <jsp:directive.attribute name="messageCode" type="java.lang.String" required="false"
-    description="The message code for the label of this item" />
-  <jsp:directive.attribute name="roles" type="java.lang.String" required="false"
-    description="Roles allowed to see this item (empty allows all)" />
-  <jsp:directive.attribute name="children" type="java.util.Collection" required="false" description="Item's Children" />
-  <jsp:directive.attribute name="hidden" type="java.lang.Boolean" required="false"
-    description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" />
-  <jsp:directive.attribute name="ignoreHidden" type="java.lang.Boolean" required="false"
-    description="Ignore hidden menu item value (show all)" />
-
-  <!-- default values -->
-  <c:set var="authorizedUrl" value="${false}" />
-  <c:set var="authorizedRole" value="${false}" />
-
-  <!-- Execute expression evaluator to resolve in-line expressions -->
-  <c:if test="${not empty url}">
-    <!-- Try to identify an EL expression and evaluate it -->
-    <jsp:useBean id="url" type="java.lang.String" />
-    <jsp:scriptlet><![CDATA[
-      if (url.matches(".*[$][{].*[}].*")) {
-          try {
-            Object destinationEvaluated = jspContext.getExpressionEvaluator()
-                .evaluate(url, java.lang.String.class,
-                    jspContext.getVariableResolver(), null);
-            jspContext.setAttribute("url", destinationEvaluated);
-          }
-          catch (Exception ex) {
-            //Don't set attribute
-          }
-      }
-    //]]></jsp:scriptlet>
-
-    <spring:url value="${url}" var="targetUrl" />
-  </c:if>
-
-  <!-- 
-  Check the user is granted to access to target URL, otherwise menu entry
-  is not shown 
-  -->
-  <c:choose>
-    <c:when test="${not empty targetUrl}">
-      <sec:authorize url="${targetUrl}">
-        <c:set var="authorizedUrl" value="${true}" />
-      </sec:authorize>
-    </c:when>
-    <c:otherwise>
-      <c:set var="authorizedUrl" value="${true}" />
-    </c:otherwise>
-  </c:choose>
-
-  <!-- 
-  Check the user has the roles defined in menu entry, if the user doesn't have
-  them the entry won't be shown.
-  -->
-  <c:choose>
-    <c:when test="${not empty roles}">
-      <sec:authorize ifAnyGranted="${roles}">
-        <c:set var="authorizedRole" value="${true}" />
-      </sec:authorize>
-    </c:when>
-    <c:otherwise>
-      <!-- no roles: authorized all -->
-      <c:set var="authorizedRole" value="${true}" />
-    </c:otherwise>
-  </c:choose>
-
-  <!-- Load the label -->
-  <c:if test="${not empty labelCode}">
-    <spring:message code="${labelCode}" var="label" htmlEscape="false" />
-  </c:if>
-
-  <!-- draw if not hidden -->
-  <c:choose>
-    <c:when test="${hidden}">
-      <c:choose>
-        <c:when test="${empty ignoreHidden or not ignoreHidden}">
-          <c:set var="showItem" value="${false}" />
-        </c:when>
-        <c:otherwise>
-          <c:set var="showItem" value="${true}" />
-        </c:otherwise>
-      </c:choose>
-    </c:when>
-    <c:otherwise>
-      <c:set var="showItem" value="${true}" />
-    </c:otherwise>
-  </c:choose>
-
-  <!-- 
-  draw if not hidden and menu entry authorized the user role and user can
-  access the url (if it was set, otherwise the user can access)  
-  -->
-  <c:if test="${showItem and authorizedRole and authorizedUrl}">
-    <c:choose>
-      <!-- single item -->
-      <c:when test="${empty children}">
-        <menu:item url="${url}" id="${id}" label="${label}"
-          messageCode="${messageCode}" />
-      </c:when>
-      <c:otherwise>
-        <!--  item with children -->
-        <c:if test="${not empty messageCode}">
-          <spring:message code="${messageCode}" arguments="${label}"
-            var="label" htmlEscape="false" />
-        </c:if>
-        <!-- menu:category doesn't support url attribute. We need to add  url="${targetUrl} -->
-        <menu:category id="${id}" label="${label}">
-          <c:if test="${menuItem.hidden}">
-            <c:choose>
-              <c:when test="${empty ignoreHidden or not ignoreHidden}">
-                <c:set var="itemHidden" value="${true}" />
-              </c:when>
-              <c:otherwise>
-                <c:set var="itemHidden" value="${false}" />
-              </c:otherwise>
-            </c:choose>
-          </c:if>
-
-          <!-- iterate over all children -->
-          <c:forEach items="${children}" var="menuItem">
-            <menu:gvnixitem id="${menuItem.id}" url="${menuItem.url}"
-              labelCode="${menuItem.labelCode}"
-              messageCode="${menuItem.messageCode}"
-              hidden="${menuItem.hidden}" ignoreHidden="${itemHidden}"
-              roles="${menuItem.roles}" children="${menuItem.children}" />
-          </c:forEach>
-        </menu:category>
-      </c:otherwise>
-    </c:choose>
-
-  </c:if>
-</jsp:root>
diff --git a/src/main/webapp/WEB-INF/tags/menu/gvnixmenu.tagx b/src/main/webapp/WEB-INF/tags/menu/gvnixmenu.tagx
deleted file mode 100644
index 581fb1f71..000000000
--- a/src/main/webapp/WEB-INF/tags/menu/gvnixmenu.tagx
+++ /dev/null
@@ -1,70 +0,0 @@
-<jsp:root xmlns:menu="urn:jsptagdir:/WEB-INF/tags/menu"
-  xmlns:c="http://java.sun.com/jsp/jstl/core"
-  xmlns:fn="http://java.sun.com/jsp/jstl/functions"
-  xmlns:jsp="http://java.sun.com/JSP/Page"
-  xmlns:spring="http://www.springframework.org/tags"
-  xmlns:sec="http://www.springframework.org/security/tags" version="2.0">
-
-  <jsp:directive.tag import="java.util.List" />
-  <jsp:directive.tag import="com.labsynch.labseer.web.menu.ContextMenuStrategy" />
-  <jsp:directive.tag import="org.springframework.context.ApplicationContext" />
-  <jsp:directive.tag import="org.springframework.web.servlet.support.RequestContextUtils" />
-
-  <!-- gvNIX menu item renderer -->
-
-  <jsp:output omit-xml-declaration="yes" />
-
-  <!-- TODO <jsp:directive.attribute name="menuName" type="java.lang.String" required="false" description="The identifier of menu to use"/> -->
-  <jsp:directive.attribute name="contextMenuStrategy" type="java.lang.String" required="false"
-    description="If is set this menu will use Context Menu Behavior. The value is the ContextMenuStrategy bean id of strategy to use (this bean must be registered and must implement ContextMenuStrategy interface)" />
-  <jsp:directive.attribute name="emptyIfContextNotFound" type="java.lang.Boolean" required="false"
-    description="Indicate behavior when no context found in menu for current page. If it's false all menu is rendered" />
-  <jsp:directive.attribute name="ignoreHidden" type="java.lang.Boolean" required="false"
-    description="Ignore hidden menu item value (show all)" />
-
-  <c:choose>
-    <c:when test="${empty menuName}">
-      <c:set value="${gvnixMenu}" var="currentMenu" />
-    </c:when>
-    <c:otherwise>
-      <!-- TODO -->
-    </c:otherwise>
-  </c:choose>
-
-  <c:choose>
-    <c:when test="${not empty contextMenuStrategy}">
-      <jsp:useBean id="contextMenuStrategy" type="java.lang.String" />
-      <jsp:useBean id="currentMenu" type="com.labsynch.labseer.web.menu.Menu" />
-      <jsp:scriptlet><![CDATA[
-          // Lock for strategy and perform query
-          ApplicationContext context = RequestContextUtils.getWebApplicationContext(request);
-          ContextMenuStrategy strategy = context.getBean(contextMenuStrategy, ContextMenuStrategy.class);
-          if (strategy == null) {
-            throw new IllegalArgumentException(
-                "Context menu strategy bean doesn't found: "
-                    .concat(contextMenuStrategy));
-          }
-          List menuItems = strategy.query(request, application, currentMenu);
-          jspContext.setAttribute("menuItems", menuItems);
-      //]]></jsp:scriptlet>
-
-      <c:if
-        test="${empty menuItems and (not empty emptyIfContextNotFound or not emptyIfContextNotFound)}">
-        <c:set var="menuItems" value="${currentMenu.children}" />
-      </c:if>
-    </c:when>
-    <c:otherwise>
-      <c:set var="menuItems" value="${currentMenu.children}" />
-    </c:otherwise>
-  </c:choose>
-
-  <c:if test="${not empty menuItems}">
-    <c:forEach items="${menuItems}" var="menuItem">
-      <menu:gvnixitem id="${menuItem.id}" url="${menuItem.url}"
-        labelCode="${menuItem.labelCode}"
-        messageCode="${menuItem.messageCode}"
-        hidden="${menuItem.hidden}" roles="${menuItem.roles}"
-        children="${menuItem.children}" />
-    </c:forEach>
-  </c:if>
-</jsp:root>
diff --git a/src/main/webapp/WEB-INF/tags/menu/item.tagx b/src/main/webapp/WEB-INF/tags/menu/item.tagx
deleted file mode 100755
index b1768a11a..000000000
--- a/src/main/webapp/WEB-INF/tags/menu/item.tagx
+++ /dev/null
@@ -1,29 +0,0 @@
-<jsp:root xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-  <jsp:output omit-xml-declaration="yes" />
-
-  <jsp:directive.attribute name="id" type="java.lang.String" required="true" rtexprvalue="true" description="The identifier for this tag (do not change!)" />
-  <jsp:directive.attribute name="url" type="java.lang.String" required="true" rtexprvalue="true" description="The link URL" />
-  <jsp:directive.attribute name="label" type="java.lang.String" required="false" rtexprvalue="true" description="The label used for this menu item" />
-  <jsp:directive.attribute name="messageCode" type="java.lang.String" required="false" rtexprvalue="true" description="The global message code to be used (works in conjunction with label)" />
-  <jsp:directive.attribute name="render" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" />
-  <jsp:directive.attribute name="z" type="java.lang.String" required="false" description="Used for checking if element has been modified (to recalculate simply provide empty string value)" />
-
-  <c:if test="${empty render or render}">
-
-    <c:if test="${empty label}">
-      <spring:message code="menu_item_${fn:toLowerCase(fn:substringAfter(id,'_'))}_label" var="label" htmlEscape="false" />
-    </c:if>
-
-    <c:if test="${not empty messageCode}">
-      <spring:message code="${messageCode}" var="label" arguments="${label}" htmlEscape="false" />
-    </c:if>
-
-    <li id="${fn:escapeXml(id)}">
-      <spring:url value="${url}" var="menu_item_url"/>
-      <a href="${menu_item_url}" title="${fn:escapeXml(label)}">
-        <c:out value="${label}"/>
-      </a>
-    </li>
-
-  </c:if>
-</jsp:root>
diff --git a/src/main/webapp/WEB-INF/tags/menu/menu.tagx b/src/main/webapp/WEB-INF/tags/menu/menu.tagx
deleted file mode 100755
index f16269aa7..000000000
--- a/src/main/webapp/WEB-INF/tags/menu/menu.tagx
+++ /dev/null
@@ -1,13 +0,0 @@
-<jsp:root xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-	<jsp:output omit-xml-declaration="yes"/>
-	
-	<jsp:directive.attribute name="id" type="java.lang.String" required="true" rtexprvalue="true" description="The identifier for this tag (do not change!)"/>
-	<jsp:directive.attribute name="render" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" />
-	<jsp:directive.attribute name="z" type="java.lang.String" required="false" description="Used for checking if element has been modified (to recalculate simply provide empty string value)"/>
-	
-	<c:if test="${empty render or render}">
-		<ul id="${fn:escapeXml(id)}">
-			<jsp:doBody />
-		</ul>
-	</c:if>
-</jsp:root>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/util/language.tagx b/src/main/webapp/WEB-INF/tags/util/language.tagx
deleted file mode 100755
index c894b75d6..000000000
--- a/src/main/webapp/WEB-INF/tags/util/language.tagx
+++ /dev/null
@@ -1,31 +0,0 @@
-<jsp:root xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:spring="http://www.springframework.org/tags" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-  <jsp:output omit-xml-declaration="yes" />
-
-  <jsp:directive.attribute name="locale" type="java.lang.String" required="true" rtexprvalue="true" description="The locale for the language to be added." />
-  <jsp:directive.attribute name="label" type="java.lang.String" required="true" rtexprvalue="true" description="The country label for the language to be added." />
-  <jsp:directive.attribute name="render" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" />
-
-  <c:if test="${empty render or render}">
-    <spring:url var="img" value="/resources/images/${locale}.png" />
-    <spring:url var="url" value="">
-      <c:if test="${null ne param.form}">
-        <spring:param name="form" />
-      </c:if>
-      <c:if test="${not empty param.find}">
-        <spring:param name="find" value="${param.find}" />
-      </c:if>
-      <spring:param name="lang" value="${locale}" />
-      <c:if test="${not empty param.page}">
-        <spring:param name="page" value="${param.page}" />
-      </c:if>
-      <c:if test="${not empty param.size}">
-        <spring:param name="size" value="${param.size}" />
-      </c:if>
-    </spring:url>
-    <spring:message code="global_language_switch" arguments="${label}" var="lang_label" htmlEscape="false" />
-    <a href="${url}" title="${fn:escapeXml(lang_label)}">
-      <img class="flag" src="${img}" alt="${fn:escapeXml(lang_label)}" />
-    </a>
-    <c:out value=" " />
-  </c:if>
-</jsp:root>
diff --git a/src/main/webapp/WEB-INF/tags/util/load-scripts.tagx b/src/main/webapp/WEB-INF/tags/util/load-scripts.tagx
deleted file mode 100755
index 3aa5ace4b..000000000
--- a/src/main/webapp/WEB-INF/tags/util/load-scripts.tagx
+++ /dev/null
@@ -1,29 +0,0 @@
-<jsp:root xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-
-  <jsp:output omit-xml-declaration="yes" />
-
-  <spring:theme code="styleSheet" var="roo_css" />
-  <spring:url value="/${roo_css}" var="roo_css_url" />
-  <spring:url value="/resources/dojo/dojo.js" var="dojo_url" />
-  <spring:url value="/resources/dijit/themes/tundra/tundra.css" var="tundra_url" />
-  <spring:url value="/resources/spring/Spring.js" var="spring_url" />
-  <spring:url value="/resources/spring/Spring-Dojo.js" var="spring_dojo_url" />
-  <spring:url value="/resources/images/favicon.ico" var="favicon" />
-  <link rel="stylesheet" type="text/css" href="${tundra_url}" />
-  <link rel="stylesheet" type="text/css" media="screen" href="${roo_css_url}" />
-  <link rel="SHORTCUT ICON" href="${favicon}" />
-
-  <!-- Get the user local from the page context (it was set by Spring MVC's locale resolver) -->
-  <c:set var="userLocale">
-    <c:set var="plocale">${pageContext.response.locale}</c:set>
-    <c:out value="${fn:replace(plocale, '_', '-')}" default="en" />
-  </c:set>
-
-  <script type="text/javascript">var djConfig = {parseOnLoad: false, isDebug: false, locale: '${fn:toLowerCase(userLocale)}'};</script>
-
-  <script src="${dojo_url}" type="text/javascript"><!-- required for FF3 and Opera --></script>
-  <script src="${spring_url}" type="text/javascript"><!-- /required for FF3 and Opera --></script>
-  <script src="${spring_dojo_url}" type="text/javascript"><!-- required for FF3 and Opera --></script>
-  <script language="JavaScript" type="text/javascript">dojo.require("dojo.parser");</script>
-
-</jsp:root>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/util/pagination.tagx b/src/main/webapp/WEB-INF/tags/util/pagination.tagx
deleted file mode 100755
index 5c6a3ddfe..000000000
--- a/src/main/webapp/WEB-INF/tags/util/pagination.tagx
+++ /dev/null
@@ -1,87 +0,0 @@
-<jsp:root xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:spring="http://www.springframework.org/tags" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-  <jsp:output omit-xml-declaration="yes" />
-
-  <jsp:directive.attribute name="maxPages" type="java.lang.Integer" required="true" rtexprvalue="true" description="The maximum number of pages available (ie tableRecordCount / size)" />
-  <jsp:directive.attribute name="page" type="java.lang.Integer" required="false" rtexprvalue="true" description="The current page (not required, defaults to 1)" />
-  <jsp:directive.attribute name="size" type="java.lang.Integer" required="false" rtexprvalue="true" description="The number of records per page (not required, defaults to 10)" />
-  <jsp:directive.attribute name="render" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" />
-
-  <c:if test="${empty render or render}">
-
-    <c:if test="${empty page || page lt 1}">
-      <c:set var="page" value="1" />
-    </c:if>
-
-    <c:if test="${empty size || size lt 1}">
-      <c:set var="size" value="10" />
-    </c:if>
-
-    <spring:message code="list_size" var="list_size" htmlEscape="false" />
-    <c:out value="${list_size} " />
-
-    <c:forEach var="i" begin="5" end="25" step="5">
-      <c:choose>
-        <c:when test="${size == i}">
-          <c:out value="${i}" />
-        </c:when>
-        <c:otherwise>
-          <spring:url value="" var="sizeUrl">
-            <spring:param name="page" value="1" />
-            <spring:param name="size" value="${i}" />
-          </spring:url>
-          <a href="${sizeUrl}">${i}</a>
-        </c:otherwise>
-      </c:choose>
-      <c:out value=" " />
-    </c:forEach>
-    <c:out value="| " />
-
-    <c:if test="${page ne 1}">
-      <spring:url value="" var="first">
-        <spring:param name="page" value="1" />
-        <spring:param name="size" value="${size}" />
-      </spring:url>
-      <spring:url value="/resources/images/resultset_first.png" var="first_image_url" />
-      <spring:message code="list_first" var="first_label" htmlEscape="false" />
-      <a class="image" href="${first}" title="${fn:escapeXml(first_label)}">
-        <img alt="${fn:escapeXml(first_label)}" src="${first_image_url}" />
-      </a>
-    </c:if>
-    <c:if test="${page gt 1}">
-      <spring:url value="" var="previous">
-        <spring:param name="page" value="${page - 1}" />
-        <spring:param name="size" value="${size}" />
-      </spring:url>
-      <spring:url value="/resources/images/resultset_previous.png" var="previous_image_url" />
-      <spring:message code="list_previous" var="previous_label" htmlEscape="false" />
-      <a class="image" href="${previous}" title="${fn:escapeXml(previous_label)}">
-        <img alt="${fn:escapeXml(previous_label)}" src="${previous_image_url}" />
-      </a>
-    </c:if>
-    <c:out value=" " />
-    <spring:message code="list_page" arguments="${page},${maxPages}" argumentSeparator="," />
-    <c:out value=" " />
-    <c:if test="${page lt maxPages}">
-      <spring:url value="" var="next">
-        <spring:param name="page" value="${page + 1}" />
-        <spring:param name="size" value="${size}" />
-      </spring:url>
-      <spring:url value="/resources/images/resultset_next.png" var="next_image_url" />
-      <spring:message code="list_next" var="next_label" htmlEscape="false" />
-      <a class="image" href="${next}" title="${fn:escapeXml(next_label)}">
-        <img alt="${fn:escapeXml(next_label)}" src="${next_image_url}" />
-      </a>
-    </c:if>
-    <c:if test="${page ne maxPages}">
-      <spring:url value="" var="last">
-        <spring:param name="page" value="${maxPages}" />
-        <spring:param name="size" value="${size}" />
-      </spring:url>
-      <spring:url value="/resources/images/resultset_last.png" var="last_image_url" />
-      <spring:message code="list_last" var="last_label" htmlEscape="false" />
-      <a class="image" href="${last}" title="${fn:escapeXml(last_label)}">
-        <img alt="${fn:escapeXml(last_label)}" src="${last_image_url}" />
-      </a>
-    </c:if>
-  </c:if>
-</jsp:root>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/util/panel.tagx b/src/main/webapp/WEB-INF/tags/util/panel.tagx
deleted file mode 100755
index a1d58257a..000000000
--- a/src/main/webapp/WEB-INF/tags/util/panel.tagx
+++ /dev/null
@@ -1,33 +0,0 @@
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core" version="2.0">
-  <jsp:output omit-xml-declaration="yes" />
-  
-  <jsp:directive.attribute name="id" type="java.lang.String" required="true" rtexprvalue="true" description="The identifier for this tag (do not change!)" />
-  <jsp:directive.attribute name="title" type="java.lang.String" required="true" rtexprvalue="true" description="The page title (required)" />
-  <jsp:directive.attribute name="render" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" />
-  <jsp:directive.attribute name="openPane" type="java.lang.String" required="false" rtexprvalue="true" description="Control if the title pane is opened or closed by default (default: true)" />
-  <jsp:directive.attribute name="z" type="java.lang.String" required="false" description="Used for checking if element has been modified (to recalculate simply provide empty string value)" />
-  
-  <c:if test="${empty render or render}">
-    <c:if test="${empty openPane}">
-      <c:set value="true" var="openPane" />
-    </c:if>
-  
-    <c:set var="sec_id">
-      <spring:escapeBody javaScriptEscape="true" >${id}</spring:escapeBody>
-    </c:set>
-    
-    <c:set var="sec_openPane">
-      <spring:escapeBody javaScriptEscape="true" >${openPane}</spring:escapeBody>
-    </c:set>
-    
-    <c:set var="sec_title">
-      <spring:escapeBody javaScriptEscape="true" >${title}</spring:escapeBody>
-    </c:set>
-    
-    <script type="text/javascript">dojo.require('dijit.TitlePane');</script>
-    <div id="_title_${sec_id}_id">
-      <script type="text/javascript">Spring.addDecoration(new Spring.ElementDecoration({elementId : '_title_${sec_id}_id', widgetType : 'dijit.TitlePane', widgetAttrs : {title: '${sec_title}', open: ${sec_openPane}}})); </script>
-      <jsp:doBody />
-    </div>
-  </c:if>
-</jsp:root>
diff --git a/src/main/webapp/WEB-INF/tags/util/placeholder.tagx b/src/main/webapp/WEB-INF/tags/util/placeholder.tagx
deleted file mode 100755
index 0ff9617d9..000000000
--- a/src/main/webapp/WEB-INF/tags/util/placeholder.tagx
+++ /dev/null
@@ -1,5 +0,0 @@
-<jsp:root xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:util="urn:jsptagdir:/WEB-INF/tags/util" xmlns:spring="http://www.springframework.org/tags" xmlns:form="http://www.springframework.org/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-  <jsp:output omit-xml-declaration="yes" />
-  
-  <jsp:directive.attribute name="description" type="java.lang.String" required="false" rtexprvalue="true" description="Can be used to describe the purpose of this element" />
-</jsp:root>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/util/theme.tagx b/src/main/webapp/WEB-INF/tags/util/theme.tagx
deleted file mode 100755
index 6fe7723fe..000000000
--- a/src/main/webapp/WEB-INF/tags/util/theme.tagx
+++ /dev/null
@@ -1,36 +0,0 @@
-<jsp:root xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:spring="http://www.springframework.org/tags" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-  <jsp:output omit-xml-declaration="yes" />
-
-  <jsp:directive.attribute name="render" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" />
-
-  <c:if test="${empty render or render}">
-    <span>
-      <c:out value=" | " />
-      <spring:message code="global_theme" />
-      <c:out value=": " />
-      <spring:url var="url_theme1" value="">
-        <spring:param name="theme" value="standard" />
-        <c:if test="${not empty param.page}">
-          <spring:param name="page" value="${param.page}" />
-        </c:if>
-        <c:if test="${not empty param.size}">
-          <spring:param name="size" value="${param.size}" />
-        </c:if>
-      </spring:url>
-      <spring:message code="global_theme_standard" var="theme_standard" htmlEscape="false" />
-      <a href="${url_theme1}" title="${fn:escapeXml(theme_standard)}">${fn:escapeXml(theme_standard)}</a>
-      <c:out value=" | " />
-      <spring:url var="url_theme2" value="">
-        <spring:param name="theme" value="alt" />
-        <c:if test="${not empty param.page}">
-          <spring:param name="page" value="${param.page}" />
-        </c:if>
-        <c:if test="${not empty param.size}">
-          <spring:param name="size" value="${param.size}" />
-        </c:if>
-      </spring:url>
-      <spring:message code="global_theme_alt" var="theme_alt" htmlEscape="false" />
-      <a href="${url_theme2}" title="${fn:escapeXml(theme_alt)}">${fn:escapeXml(theme_alt)}</a>
-    </span>
-  </c:if>
-</jsp:root>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/analysisgrouplabels/create.jspx b/src/main/webapp/WEB-INF/views/analysisgrouplabels/create.jspx
deleted file mode 100755
index 36b2ccf78..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgrouplabels/create.jspx
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_AnalysisGroupLabel" modelAttribute="analysisGroupLabel" path="/analysisgrouplabels" render="${empty dependencies}" z="/XSRQb823/YSRjwh5G6oMSP7Jko=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_recordedBy" required="true" z="UMLfTyjUrEH5Xyab9XoPYmBc0bY="/>
-        <field:datetime dateTimePattern="${analysisGroupLabel_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_recordedDate" required="true" z="yGNZNRlCaUQEx3dqYdTHq807haY="/>
-        <field:datetime dateTimePattern="${analysisGroupLabel_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_modifiedDate" z="Wlpcj1aUZ/F7JEPe95IU/71g6fA="/>
-        <field:checkbox field="physicallyLabled" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_physicallyLabled" z="23B/55WQdjwWu59BqnH4wrCeoiU="/>
-        <field:checkbox field="preferred" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_preferred" z="KsVZ6JtShTBS10e2ZfOXugHbkPM="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_ignored" z="BUbs0SfJaNcZ9unFX4wJbhRmSQQ="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_lsTransaction" validationMessageCode="field_invalid_integer" z="XgkPpacsQo9dqKXppVFPk+KCRYQ="/>
-        <field:select field="analysisGroup" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_analysisGroup" itemValue="id" items="${analysisgroups}" path="/analysisgroups" required="true" z="kjutJeaSPZa26NFC/He4x7ae990="/>
-        <field:textarea field="labelText" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_labelText" required="true" z="XzIIsO1RqI3gotNilLghsJCgEe8="/>
-        <field:textarea field="imageFile" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_imageFile" z="7SMeSFaaHmoWLD9fBBCcc07MYpw="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_lsType" required="true" z="2dyTmWumneOEcjHVYexSad39Wz4="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_lsKind" required="true" z="Nvlwuv2pfF/abZQMIZn8lnKCemk="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_lsTypeAndKind" z="6XYoTD5pjTsgCFTXxWxiIgnEe+U="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_deleted" z="v/fBWI1BjrVEWDjkQy6yTJ7/GaY="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_AnalysisGroupLabel" render="${not empty dependencies}" z="HuEUTkT5SdjAzmDZ41iguvfpED4="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgrouplabels/findAnalysisGroupLabelsByAnalysisGroup.jspx b/src/main/webapp/WEB-INF/views/analysisgrouplabels/findAnalysisGroupLabelsByAnalysisGroup.jspx
deleted file mode 100755
index e16c5332b..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgrouplabels/findAnalysisGroupLabelsByAnalysisGroup.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByAnalysisGroup" id="ff_com_labsynch_labseer_domain_AnalysisGroupLabel" path="/analysisgrouplabels" z="FUh4XpeE7yZ+l9tenGYKIOEwAEY=">
-        <field:select disableFormBinding="true" field="analysisGroup" id="f_com_labsynch_labseer_domain_AnalysisGroupLabel_analysisGroup" itemValue="id" items="${analysisgroups}" path="/analysisgroups" required="true" z="EoZAWD7Ovu5tpjzyX9xsmUQBOuM="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgrouplabels/findAnalysisGroupLabelsByLsTransactionEquals.jspx b/src/main/webapp/WEB-INF/views/analysisgrouplabels/findAnalysisGroupLabelsByLsTransactionEquals.jspx
deleted file mode 100755
index 7fd1b4a7e..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgrouplabels/findAnalysisGroupLabelsByLsTransactionEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTransactionEquals" id="ff_com_labsynch_labseer_domain_AnalysisGroupLabel" path="/analysisgrouplabels" z="80EQSwj70DgJI/u4ReAL+aX0dW4=">
-        <field:input disableFormBinding="true" field="lsTransaction" id="f_com_labsynch_labseer_domain_AnalysisGroupLabel_lsTransaction" required="true" validationMessageCode="field_invalid_integer" z="Vr8iwgPmS3I8POZ/cBQFs3AmoVk="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgrouplabels/list.jspx b/src/main/webapp/WEB-INF/views/analysisgrouplabels/list.jspx
deleted file mode 100755
index b4bbeb9ec..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgrouplabels/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_AnalysisGroupLabel" items="${analysisgrouplabels}" z="sgodlzwyy5gbxRc47qMYxUhSOec=">
-        <table:table data="${analysisgrouplabels}" id="l_com_labsynch_labseer_domain_AnalysisGroupLabel" path="/analysisgrouplabels" z="ljsFrRgJnEPMvqcHLAZbLzy5qPc=">
-            <table:column id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_recordedBy" property="recordedBy" z="DzWe/qwScE9Vqy1YYSgB0uqFj3E="/>
-            <table:column date="true" dateTimePattern="${analysisGroupLabel_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_recordedDate" property="recordedDate" z="J5IIss5Jc1Ir/TDngvBcQ9vuSWc="/>
-            <table:column date="true" dateTimePattern="${analysisGroupLabel_modifieddate_date_format}" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_modifiedDate" property="modifiedDate" z="S8X5Heea4TO9n6jFh7RmIkxr5B0="/>
-            <table:column id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_physicallyLabled" property="physicallyLabled" z="Db9ngcLkXBvZ5EXuukW2nhcmKDs="/>
-            <table:column id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_labelText" property="labelText" z="hrZDt41uTZLvXoeu2LYEdgwpU64="/>
-            <table:column id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_imageFile" property="imageFile" z="Z4Q+kSzrJFm1IYzxlXXEVc3fpB8="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgrouplabels/show.jspx b/src/main/webapp/WEB-INF/views/analysisgrouplabels/show.jspx
deleted file mode 100755
index 2380811b7..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgrouplabels/show.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_AnalysisGroupLabel" object="${analysisgrouplabel}" path="/analysisgrouplabels" z="tS/qUvujDZV0Dij+i0x89LC5R0w=">
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_AnalysisGroupLabel_recordedBy" object="${analysisgrouplabel}" z="2nvkBE5PrlEbLQhwRjEaeLWdlhI="/>
-        <field:display date="true" dateTimePattern="${analysisGroupLabel_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_AnalysisGroupLabel_recordedDate" object="${analysisgrouplabel}" z="Kwq6p27ZkhGGNSDDfipysKwqytY="/>
-        <field:display date="true" dateTimePattern="${analysisGroupLabel_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_AnalysisGroupLabel_modifiedDate" object="${analysisgrouplabel}" z="jGKnAq8kT4Xq7o3IzQWQChR8W8M="/>
-        <field:display field="physicallyLabled" id="s_com_labsynch_labseer_domain_AnalysisGroupLabel_physicallyLabled" object="${analysisgrouplabel}" z="w/4Azl58giCQlXfdyOz/yEKZotY="/>
-        <field:display field="preferred" id="s_com_labsynch_labseer_domain_AnalysisGroupLabel_preferred" object="${analysisgrouplabel}" z="r/rOV5fzsh+bqsZfG1rNV7Nx+1w="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_AnalysisGroupLabel_ignored" object="${analysisgrouplabel}" z="Ky5Cob7T7BOWb4fVAGxmuZLw848="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_AnalysisGroupLabel_lsTransaction" object="${analysisgrouplabel}" z="pTSc3AFYj1UTqgDZ55owTRDdv7w="/>
-        <field:display field="analysisGroup" id="s_com_labsynch_labseer_domain_AnalysisGroupLabel_analysisGroup" object="${analysisgrouplabel}" z="XIfBtjwjUsrnkwTvIrwx+89jNag="/>
-        <field:display field="labelText" id="s_com_labsynch_labseer_domain_AnalysisGroupLabel_labelText" object="${analysisgrouplabel}" z="v4U27xB1uqja9L45hzcw9r40sLE="/>
-        <field:display field="imageFile" id="s_com_labsynch_labseer_domain_AnalysisGroupLabel_imageFile" object="${analysisgrouplabel}" z="9ujjZlwI6YrzB6v0T0ihuMVZ5PY="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_AnalysisGroupLabel_lsType" object="${analysisgrouplabel}" z="a4JBQ3+SKT9ok4EQqM1d95DsdjM="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_AnalysisGroupLabel_lsKind" object="${analysisgrouplabel}" z="In9y7R+PWhigICrzkLrQ6DAoGe0="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_AnalysisGroupLabel_lsTypeAndKind" object="${analysisgrouplabel}" z="VOQjYzyk1+NoWUU8BjwfHhOGCDA="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_AnalysisGroupLabel_deleted" object="${analysisgrouplabel}" z="HMTN3vdKhp3/SVoBA/KTtxw0jpk="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgrouplabels/update.jspx b/src/main/webapp/WEB-INF/views/analysisgrouplabels/update.jspx
deleted file mode 100755
index c330828e9..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgrouplabels/update.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_AnalysisGroupLabel" modelAttribute="analysisGroupLabel" path="/analysisgrouplabels" versionField="Version" z="5vhXieQE3puPVVlQVBWsSZzB0wI=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_recordedBy" required="true" z="UMLfTyjUrEH5Xyab9XoPYmBc0bY="/>
-        <field:datetime dateTimePattern="${analysisGroupLabel_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_recordedDate" required="true" z="yGNZNRlCaUQEx3dqYdTHq807haY="/>
-        <field:datetime dateTimePattern="${analysisGroupLabel_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_modifiedDate" z="Wlpcj1aUZ/F7JEPe95IU/71g6fA="/>
-        <field:checkbox field="physicallyLabled" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_physicallyLabled" z="23B/55WQdjwWu59BqnH4wrCeoiU="/>
-        <field:checkbox field="preferred" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_preferred" z="KsVZ6JtShTBS10e2ZfOXugHbkPM="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_ignored" z="BUbs0SfJaNcZ9unFX4wJbhRmSQQ="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_lsTransaction" validationMessageCode="field_invalid_integer" z="XgkPpacsQo9dqKXppVFPk+KCRYQ="/>
-        <field:select field="analysisGroup" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_analysisGroup" itemValue="id" items="${analysisgroups}" path="/analysisgroups" required="true" z="kjutJeaSPZa26NFC/He4x7ae990="/>
-        <field:textarea field="labelText" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_labelText" required="true" z="XzIIsO1RqI3gotNilLghsJCgEe8="/>
-        <field:textarea field="imageFile" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_imageFile" z="7SMeSFaaHmoWLD9fBBCcc07MYpw="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_lsType" required="true" z="2dyTmWumneOEcjHVYexSad39Wz4="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_lsKind" required="true" z="Nvlwuv2pfF/abZQMIZn8lnKCemk="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_lsTypeAndKind" z="6XYoTD5pjTsgCFTXxWxiIgnEe+U="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_AnalysisGroupLabel_deleted" z="v/fBWI1BjrVEWDjkQy6yTJ7/GaY="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgrouplabels/views.xml b/src/main/webapp/WEB-INF/views/analysisgrouplabels/views.xml
deleted file mode 100755
index cc312f314..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgrouplabels/views.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="analysisgrouplabels/list">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgrouplabels/list.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgrouplabels/show">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgrouplabels/show.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgrouplabels/create">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgrouplabels/create.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgrouplabels/update">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgrouplabels/update.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgrouplabels/findAnalysisGroupLabelsByAnalysisGroup">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgrouplabels/findAnalysisGroupLabelsByAnalysisGroup.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgrouplabels/findAnalysisGroupLabelsByLsTransactionEquals">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgrouplabels/findAnalysisGroupLabelsByLsTransactionEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroups/create.jspx b/src/main/webapp/WEB-INF/views/analysisgroups/create.jspx
deleted file mode 100755
index b0afde45e..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroups/create.jspx
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_AnalysisGroup" modelAttribute="analysisGroup" path="/analysisgroups" render="${empty dependencies}" z="VMZpGaz2S2+NfU3AMMiqAad6Tyc=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_AnalysisGroup_recordedBy" required="true" z="m91ZJK+ACRZenaBMMHPPkKhJ7To="/>
-        <field:datetime dateTimePattern="${analysisGroup_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_AnalysisGroup_recordedDate" required="true" z="iVQaHem1fjw1WIQefj3FoQiAiX0="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_AnalysisGroup_modifiedBy" z="B4SOMuJ67cz0LZkbtO5vtf1lCYg="/>
-        <field:datetime dateTimePattern="${analysisGroup_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_AnalysisGroup_modifiedDate" z="KU3sm+ZnayA6idrGNoS5Xk0mzwA="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_AnalysisGroup_ignored" z="VUdbUDxP8WNfHfSGYQoCCZMHRvo="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_AnalysisGroup_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="3VtCBUbDpcw8Io+zh2BCVjov7lk="/>
-        <field:select field="treatmentGroups" id="c_com_labsynch_labseer_domain_AnalysisGroup_treatmentGroups" itemValue="id" items="${treatmentgroups}" multiple="true" path="/treatmentgroups" z="46EOqaVUM6Y2GIm7V0pjbpj4zsk="/>
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_AnalysisGroup_codeName" z="NU7XVuMUu/5RhUGPDOUJjN27Ws4="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_AnalysisGroup_lsType" required="true" z="ahMbfkQ6/2CZLD/qwygLqYq4CYE="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_AnalysisGroup_lsKind" required="true" z="k/VjFlxH1EU5eqoTZruWYqhj/u4="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_AnalysisGroup_lsTypeAndKind" z="DUaAfJuj3wsDJ/kcL+gLQkWc6kA="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_AnalysisGroup_lsTransaction" validationMessageCode="field_invalid_integer" z="BIRWeOS9FMkxaBe6HMRedFXWJWQ="/>
-        <field:simple field="lsLabels" id="c_com_labsynch_labseer_domain_AnalysisGroup_lsLabels" messageCode="entity_reference_not_managed" messageCodeAttribute="Analysis Group Label" z="a8+acJib/Xn7ZfL0Hmx+Pl56+sc="/>
-        <field:simple field="lsStates" id="c_com_labsynch_labseer_domain_AnalysisGroup_lsStates" messageCode="entity_reference_not_managed" messageCodeAttribute="Analysis Group State" z="9YhCzAVknbXzGB7J7bbEsqizuvk="/>
-        <field:select field="experiments" id="c_com_labsynch_labseer_domain_AnalysisGroup_experiments" itemValue="id" items="${experiments}" multiple="true" path="/experiments" z="XpN9vbeApCeaPGPPUYCRrXGtTds="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_AnalysisGroup_deleted" z="nuGzypv5y4z6wWgwoZ5c5xyUvUQ="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_AnalysisGroup" render="${not empty dependencies}" z="z3b4JVn/POf7dI5IrDBeZ4QBsoE="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroups/findAnalysisGroupsByExperiment.jspx b/src/main/webapp/WEB-INF/views/analysisgroups/findAnalysisGroupsByExperiment.jspx
deleted file mode 100755
index ef85611fe..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroups/findAnalysisGroupsByExperiment.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByExperiment" id="ff_com_labsynch_labseer_domain_AnalysisGroup" path="/analysisgroups" z="ue2IpUflBSK9wH5JkFD7As948lY=">
-        <field:select disableFormBinding="true" field="experiment" id="f_com_labsynch_labseer_domain_AnalysisGroup_experiment" itemValue="id" items="${experiments}" path="/experiments" required="true" z="iXm2N4W03rBPOyQb3+MRHga4Ruk="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroups/findAnalysisGroupsByExperiments.jspx b/src/main/webapp/WEB-INF/views/analysisgroups/findAnalysisGroupsByExperiments.jspx
deleted file mode 100644
index 3169bba2b..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroups/findAnalysisGroupsByExperiments.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByExperiments" id="ff_com_labsynch_labseer_domain_AnalysisGroup" path="/analysisgroups" z="r8o0zEfIzE2fO2ei36H8g4TyV7c=">
-        <field:select disableFormBinding="true" field="experiments" id="f_com_labsynch_labseer_domain_AnalysisGroup_experiments" itemValue="id" items="${experiments}" multiple="true" path="/experiments" required="true" z="U/LaoBWAnC8wbiE0NVNEP4f4ujE="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroups/findAnalysisGroupsByExperimentsAndIgnoredNot.jspx b/src/main/webapp/WEB-INF/views/analysisgroups/findAnalysisGroupsByExperimentsAndIgnoredNot.jspx
deleted file mode 100644
index e1d6e5b60..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroups/findAnalysisGroupsByExperimentsAndIgnoredNot.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByExperimentsAndIgnoredNot" id="ff_com_labsynch_labseer_domain_AnalysisGroup" path="/analysisgroups" z="vtlsCgYei3U4QRz/GwYOpO54XQU=">
-        <field:select disableFormBinding="true" field="experiments" id="f_com_labsynch_labseer_domain_AnalysisGroup_experiments" itemValue="id" items="${experiments}" multiple="true" path="/experiments" required="true" z="U/LaoBWAnC8wbiE0NVNEP4f4ujE="/>
-        <field:checkbox disableFormBinding="true" field="ignored" id="f_com_labsynch_labseer_domain_AnalysisGroup_ignored" z="VgJzH2WuK/FPyhvUKJPcgZdCBhE="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroups/findAnalysisGroupsByLsTransactionEquals.jspx b/src/main/webapp/WEB-INF/views/analysisgroups/findAnalysisGroupsByLsTransactionEquals.jspx
deleted file mode 100755
index 9298c3692..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroups/findAnalysisGroupsByLsTransactionEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTransactionEquals" id="ff_com_labsynch_labseer_domain_AnalysisGroup" path="/analysisgroups" z="UBGcBlS4g51pSsQHGLtyGtG+rWk=">
-        <field:input disableFormBinding="true" field="lsTransaction" id="f_com_labsynch_labseer_domain_AnalysisGroup_lsTransaction" required="true" validationMessageCode="field_invalid_integer" z="eRluPdorbHEGeQPjML9gKH24eqw="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroups/list.jspx b/src/main/webapp/WEB-INF/views/analysisgroups/list.jspx
deleted file mode 100755
index 8aca0a319..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroups/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_AnalysisGroup" items="${analysisgroups}" z="AMaGgIvy7iGHUqOy2qIa4Dv+y1E=">
-        <table:table data="${analysisgroups}" id="l_com_labsynch_labseer_domain_AnalysisGroup" path="/analysisgroups" z="bJenq3Q0hdUIAoaH7svRzpJ0XwA=">
-            <table:column id="c_com_labsynch_labseer_domain_AnalysisGroup_recordedBy" property="recordedBy" z="MANAKhSlKiEN0qMOvevYUT9lByE="/>
-            <table:column date="true" dateTimePattern="${analysisGroup_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_AnalysisGroup_recordedDate" property="recordedDate" z="VrPwwMQWuWeW4YdA7iz8us7I8C4="/>
-            <table:column id="c_com_labsynch_labseer_domain_AnalysisGroup_codeName" property="codeName" z="lmhx2BC2PpoAzi1f8eJGDM7dJa0="/>
-            <table:column id="c_com_labsynch_labseer_domain_AnalysisGroup_lsType" property="lsType" z="8RknbySJcpd4thgjiulCsUGxMvA="/>
-            <table:column id="c_com_labsynch_labseer_domain_AnalysisGroup_lsKind" property="lsKind" z="eZU81IE/deBpu/pL5EMYlpPScVk="/>
-            <table:column id="c_com_labsynch_labseer_domain_AnalysisGroup_lsTypeAndKind" property="lsTypeAndKind" z="d7ozxv0j1fzkeepVmoDrjYsQ9Is="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroups/show.jspx b/src/main/webapp/WEB-INF/views/analysisgroups/show.jspx
deleted file mode 100755
index 3b4b025c8..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroups/show.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_AnalysisGroup" object="${analysisgroup}" path="/analysisgroups" z="w07mdkXAzctEvkL1G0N55634gCQ=">
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_AnalysisGroup_recordedBy" object="${analysisgroup}" z="GGAIKZzAB0z5bcDj05EP2Bkkyto="/>
-        <field:display date="true" dateTimePattern="${analysisGroup_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_AnalysisGroup_recordedDate" object="${analysisgroup}" z="DrrIg9S/nHLDDOVa1+bbd7I+Wss="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_AnalysisGroup_modifiedBy" object="${analysisgroup}" z="uyoWLEz8Z/89FVk5PUxDdYcA+FI="/>
-        <field:display date="true" dateTimePattern="${analysisGroup_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_AnalysisGroup_modifiedDate" object="${analysisgroup}" z="iXaAebGqDyJXPkUXyOPEnhugVIg="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_AnalysisGroup_ignored" object="${analysisgroup}" z="3lo+mpxyCi33dYm1HsqZaA/9OLI="/>
-        <field:display field="codeName" id="s_com_labsynch_labseer_domain_AnalysisGroup_codeName" object="${analysisgroup}" z="2aaY8CvBda8C2+T94kLhA6PixBE="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_AnalysisGroup_lsType" object="${analysisgroup}" z="/i7aeATa+NKtox5+4hLEfY/oEJk="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_AnalysisGroup_lsKind" object="${analysisgroup}" z="VmTBnqre15rKuvcHs6c9nubD9cA="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_AnalysisGroup_lsTypeAndKind" object="${analysisgroup}" z="j8Tw4Fu0CM+HSHAzPkEmvWoK0A8="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_AnalysisGroup_lsTransaction" object="${analysisgroup}" z="6Z3urlqQKUj/lCOGN2NC3FySrbI="/>
-        <field:display field="treatmentGroups" id="s_com_labsynch_labseer_domain_AnalysisGroup_treatmentGroups" object="${analysisgroup}" z="Woiamlogadxm7jW2UUswlePA0Oc="/>
-        <field:display field="experiments" id="s_com_labsynch_labseer_domain_AnalysisGroup_experiments" object="${analysisgroup}" z="9AAm36oPQ66p5PXd7rSBLZd57uw="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_AnalysisGroup_deleted" object="${analysisgroup}" z="PSXJK10GX01Xh/3h8ZlfX6/6Z9I="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroups/update.jspx b/src/main/webapp/WEB-INF/views/analysisgroups/update.jspx
deleted file mode 100755
index 70badae12..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroups/update.jspx
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_AnalysisGroup" modelAttribute="analysisGroup" path="/analysisgroups" versionField="Version" z="d58uIrSkjjzhuoWsZFMNLs1Nk6Y=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_AnalysisGroup_recordedBy" required="true" z="m91ZJK+ACRZenaBMMHPPkKhJ7To="/>
-        <field:datetime dateTimePattern="${analysisGroup_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_AnalysisGroup_recordedDate" required="true" z="iVQaHem1fjw1WIQefj3FoQiAiX0="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_AnalysisGroup_modifiedBy" z="B4SOMuJ67cz0LZkbtO5vtf1lCYg="/>
-        <field:datetime dateTimePattern="${analysisGroup_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_AnalysisGroup_modifiedDate" z="KU3sm+ZnayA6idrGNoS5Xk0mzwA="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_AnalysisGroup_ignored" z="VUdbUDxP8WNfHfSGYQoCCZMHRvo="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_AnalysisGroup_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="3VtCBUbDpcw8Io+zh2BCVjov7lk="/>
-        <field:select field="treatmentGroups" id="c_com_labsynch_labseer_domain_AnalysisGroup_treatmentGroups" itemValue="id" items="${treatmentgroups}" multiple="true" path="/treatmentgroups" z="46EOqaVUM6Y2GIm7V0pjbpj4zsk="/>
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_AnalysisGroup_codeName" z="NU7XVuMUu/5RhUGPDOUJjN27Ws4="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_AnalysisGroup_lsType" required="true" z="ahMbfkQ6/2CZLD/qwygLqYq4CYE="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_AnalysisGroup_lsKind" required="true" z="k/VjFlxH1EU5eqoTZruWYqhj/u4="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_AnalysisGroup_lsTypeAndKind" z="DUaAfJuj3wsDJ/kcL+gLQkWc6kA="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_AnalysisGroup_lsTransaction" validationMessageCode="field_invalid_integer" z="BIRWeOS9FMkxaBe6HMRedFXWJWQ="/>
-        <field:simple field="lsLabels" id="c_com_labsynch_labseer_domain_AnalysisGroup_lsLabels" messageCode="entity_reference_not_managed" messageCodeAttribute="Analysis Group Label" z="a8+acJib/Xn7ZfL0Hmx+Pl56+sc="/>
-        <field:simple field="lsStates" id="c_com_labsynch_labseer_domain_AnalysisGroup_lsStates" messageCode="entity_reference_not_managed" messageCodeAttribute="Analysis Group State" z="9YhCzAVknbXzGB7J7bbEsqizuvk="/>
-        <field:select field="experiments" id="c_com_labsynch_labseer_domain_AnalysisGroup_experiments" itemValue="id" items="${experiments}" multiple="true" path="/experiments" z="XpN9vbeApCeaPGPPUYCRrXGtTds="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_AnalysisGroup_deleted" z="nuGzypv5y4z6wWgwoZ5c5xyUvUQ="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroups/views.xml b/src/main/webapp/WEB-INF/views/analysisgroups/views.xml
deleted file mode 100755
index 552c1562f..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroups/views.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="analysisgroups/list">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgroups/list.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgroups/show">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgroups/show.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgroups/create">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgroups/create.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgroups/update">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgroups/update.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgroups/findAnalysisGroupsByExperiment">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgroups/findAnalysisGroupsByExperiment.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgroups/findAnalysisGroupsByLsTransactionEquals">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgroups/findAnalysisGroupsByLsTransactionEquals.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgroups/findAnalysisGroupsByExperiments">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgroups/findAnalysisGroupsByExperiments.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgroups/findAnalysisGroupsByExperimentsAndIgnoredNot">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgroups/findAnalysisGroupsByExperimentsAndIgnoredNot.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroupstates/create.jspx b/src/main/webapp/WEB-INF/views/analysisgroupstates/create.jspx
deleted file mode 100755
index 4410fc7c7..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroupstates/create.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_AnalysisGroupState" modelAttribute="analysisGroupState" path="/analysisgroupstates" render="${empty dependencies}" z="a0xIgV2v6ZA2lci+rqae/ck+gFw=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_AnalysisGroupState_recordedBy" required="true" z="piCd1HaQDd55bxyg1qQbP5kmHOg="/>
-        <field:datetime dateTimePattern="${analysisGroupState_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_AnalysisGroupState_recordedDate" required="true" z="cBgPeduxNqttSFSKDfiL1dpztgg="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_AnalysisGroupState_modifiedBy" z="9RikD57KBrNPXl25oKn8BfDWui4="/>
-        <field:datetime dateTimePattern="${analysisGroupState_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_AnalysisGroupState_modifiedDate" z="DZydELOCWDRaNUk+sA723/jLKBw="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_AnalysisGroupState_comments" z="vU0smmngkOx7tZu7nR+caqzA3Qk="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_AnalysisGroupState_ignored" z="wm1VrEvOzO9dbgeyYzz4Y0GEK7U="/>
-        <field:select field="analysisGroup" id="c_com_labsynch_labseer_domain_AnalysisGroupState_analysisGroup" itemValue="id" items="${analysisgroups}" path="/analysisgroups" required="true" z="5zr5vvi+xwyA3xE+zKQAAtyDnoY="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_AnalysisGroupState_lsTransaction" validationMessageCode="field_invalid_integer" z="TKqf5VT2iBKs2wtnugxsE/4B7VU="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_AnalysisGroupState_lsType" required="true" z="3MakiE+KNA13EdikB+O2JC3yiGg="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_AnalysisGroupState_lsKind" required="true" z="u32S/fhAjky8VYpowYL14b+rE78="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_AnalysisGroupState_lsTypeAndKind" z="WhY6bbeBrYiXg/SdO2t4iRBz36Q="/>
-        <field:simple field="lsValues" id="c_com_labsynch_labseer_domain_AnalysisGroupState_lsValues" messageCode="entity_reference_not_managed" messageCodeAttribute="Analysis Group Value" z="jA9escvYy0O8QrJAdhwHzimOKIk="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_AnalysisGroupState_deleted" z="OhJn8SouPkVxgMncXUIqzBGdBT0="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_AnalysisGroupState" render="${not empty dependencies}" z="LrwMycfoug6TfltxrNZd7J03wVM="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroupstates/findAnalysisGroupStatesByAnalysisGroup.jspx b/src/main/webapp/WEB-INF/views/analysisgroupstates/findAnalysisGroupStatesByAnalysisGroup.jspx
deleted file mode 100755
index 52f7f12c2..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroupstates/findAnalysisGroupStatesByAnalysisGroup.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByAnalysisGroup" id="ff_com_labsynch_labseer_domain_AnalysisGroupState" path="/analysisgroupstates" z="WF3B0wo5lMs2T9itF2RBbbuwE1M=">
-        <field:select disableFormBinding="true" field="analysisGroup" id="f_com_labsynch_labseer_domain_AnalysisGroupState_analysisGroup" itemValue="id" items="${analysisgroups}" path="/analysisgroups" required="true" z="JUuH9iF+GSyBTgSh025VEDDDRMY="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroupstates/findAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot.jspx b/src/main/webapp/WEB-INF/views/analysisgroupstates/findAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot.jspx
deleted file mode 100644
index 431096a43..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroupstates/findAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot" id="ff_com_labsynch_labseer_domain_AnalysisGroupState" path="/analysisgroupstates" z="6EF45saTwFd3F52r4YNBZSDXtp0=">
-        <field:select disableFormBinding="true" field="analysisGroup" id="f_com_labsynch_labseer_domain_AnalysisGroupState_analysisGroup" itemValue="id" items="${analysisgroups}" path="/analysisgroups" required="true" z="JUuH9iF+GSyBTgSh025VEDDDRMY="/>
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_AnalysisGroupState_lsType" max="64" required="true" z="lJ+ZKz3klbEx6y/AX1skCVrNsYA="/>
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_AnalysisGroupState_lsKind" max="255" required="true" z="zNskr/J20u+DnJDwzFB82ZC4Trw="/>
-        <field:checkbox disableFormBinding="true" field="ignored" id="f_com_labsynch_labseer_domain_AnalysisGroupState_ignored" z="8Iqctl8L7AgJhNTeXQxCnotCD3A="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroupstates/findAnalysisGroupStatesByLsTransactionEquals.jspx b/src/main/webapp/WEB-INF/views/analysisgroupstates/findAnalysisGroupStatesByLsTransactionEquals.jspx
deleted file mode 100755
index ed28c7295..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroupstates/findAnalysisGroupStatesByLsTransactionEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTransactionEquals" id="ff_com_labsynch_labseer_domain_AnalysisGroupState" path="/analysisgroupstates" z="gbfNgxTgJ1+bf6OlYzaZ5aaUX6w=">
-        <field:input disableFormBinding="true" field="lsTransaction" id="f_com_labsynch_labseer_domain_AnalysisGroupState_lsTransaction" required="true" validationMessageCode="field_invalid_integer" z="7NR6g7LPaLHg44P9AWp6zONph5w="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroupstates/findAnalysisGroupStatesByLsTypeAndKindEquals.jspx b/src/main/webapp/WEB-INF/views/analysisgroupstates/findAnalysisGroupStatesByLsTypeAndKindEquals.jspx
deleted file mode 100755
index c2ba62e5f..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroupstates/findAnalysisGroupStatesByLsTypeAndKindEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeAndKindEquals" id="ff_com_labsynch_labseer_domain_AnalysisGroupState" path="/analysisgroupstates" z="/U6KpuspBvGyM2+HEZxzlF7sYbk=">
-        <field:input disableFormBinding="true" field="lsTypeAndKind" id="f_com_labsynch_labseer_domain_AnalysisGroupState_lsTypeAndKind" max="255" required="true" z="ZiWDpmsWn27+p3RkLeEH9kBuM9s="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroupstates/findAnalysisGroupStatesByLsTypeEqualsAndLsKindEquals.jspx b/src/main/webapp/WEB-INF/views/analysisgroupstates/findAnalysisGroupStatesByLsTypeEqualsAndLsKindEquals.jspx
deleted file mode 100644
index 9544dadc0..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroupstates/findAnalysisGroupStatesByLsTypeEqualsAndLsKindEquals.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeEqualsAndLsKindEquals" id="ff_com_labsynch_labseer_domain_AnalysisGroupState" path="/analysisgroupstates" z="PE4+CUmk+n/oj3RwPMcEoelsQf8=">
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_AnalysisGroupState_lsType" max="64" required="true" z="lJ+ZKz3klbEx6y/AX1skCVrNsYA="/>
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_AnalysisGroupState_lsKind" max="255" required="true" z="zNskr/J20u+DnJDwzFB82ZC4Trw="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroupstates/list.jspx b/src/main/webapp/WEB-INF/views/analysisgroupstates/list.jspx
deleted file mode 100755
index 8128e6bb1..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroupstates/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_AnalysisGroupState" items="${analysisgroupstates}" z="iweacQK0nHVN/xqYrCAtlsbv0Eo=">
-        <table:table data="${analysisgroupstates}" id="l_com_labsynch_labseer_domain_AnalysisGroupState" path="/analysisgroupstates" z="pNkIoozc029+38wfeoycMGs3Vl8=">
-            <table:column id="c_com_labsynch_labseer_domain_AnalysisGroupState_recordedBy" property="recordedBy" z="Wx/JEFKOA5rNZftKwnSy3LiIVbM="/>
-            <table:column date="true" dateTimePattern="${analysisGroupState_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_AnalysisGroupState_recordedDate" property="recordedDate" z="myRUOTxeXBeLiIFb8auzp6iImoI="/>
-            <table:column id="c_com_labsynch_labseer_domain_AnalysisGroupState_modifiedBy" property="modifiedBy" z="YsI9LjbihTOvVohZlCBsomOCGiA="/>
-            <table:column date="true" dateTimePattern="${analysisGroupState_modifieddate_date_format}" id="c_com_labsynch_labseer_domain_AnalysisGroupState_modifiedDate" property="modifiedDate" z="/6KQi3Prjox5fy2zYmB37gf3BvY="/>
-            <table:column id="c_com_labsynch_labseer_domain_AnalysisGroupState_lsType" property="lsType" z="wpMtRwIxnejpWDOErSVNo/N45XA="/>
-            <table:column id="c_com_labsynch_labseer_domain_AnalysisGroupState_lsKind" property="lsKind" z="FJpwPtIYVheKQ9CGy4/6p/JQX3g="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroupstates/show.jspx b/src/main/webapp/WEB-INF/views/analysisgroupstates/show.jspx
deleted file mode 100755
index 41db4baab..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroupstates/show.jspx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_AnalysisGroupState" object="${analysisgroupstate}" path="/analysisgroupstates" z="V3LcGD3ZnDfMLP2d+/zeX9ueSwQ=">
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_AnalysisGroupState_recordedBy" object="${analysisgroupstate}" z="5e76UnfQqSacLCAVBTaQyGje7r0="/>
-        <field:display date="true" dateTimePattern="${analysisGroupState_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_AnalysisGroupState_recordedDate" object="${analysisgroupstate}" z="3rRWOjMBpr01eVx41lNMqKL22jY="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_AnalysisGroupState_modifiedBy" object="${analysisgroupstate}" z="p3hs6sYKl95w+KscdCH82mfiY7Y="/>
-        <field:display date="true" dateTimePattern="${analysisGroupState_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_AnalysisGroupState_modifiedDate" object="${analysisgroupstate}" z="7uyPEt6FI03nnVj0Ng/jx8qb3L4="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_AnalysisGroupState_comments" object="${analysisgroupstate}" z="lugpHfTHZzfhu2tMNfz6me57O7M="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_AnalysisGroupState_ignored" object="${analysisgroupstate}" z="uci4SUH7BcyVRUWCZuLoRGvmwmg="/>
-        <field:display field="analysisGroup" id="s_com_labsynch_labseer_domain_AnalysisGroupState_analysisGroup" object="${analysisgroupstate}" z="dsl4LG9tKV0ejyuY/GTLKiUtCV4="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_AnalysisGroupState_lsTransaction" object="${analysisgroupstate}" z="9y6dJGxrGLioZDnMw31wWG4SZi8="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_AnalysisGroupState_lsType" object="${analysisgroupstate}" z="xtartZGrYJ0XNcsF3jRye++txFc="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_AnalysisGroupState_lsKind" object="${analysisgroupstate}" z="11PDGL6Zs/vFc3gM2GuPqT3hwqg="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_AnalysisGroupState_lsTypeAndKind" object="${analysisgroupstate}" z="JYcX7dzk8Bl6YMmuZTkJpwgp7PA="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_AnalysisGroupState_deleted" object="${analysisgroupstate}" z="i1Sr5XoJu2Pf9sSrYyP1z0Zl6sI="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroupstates/update.jspx b/src/main/webapp/WEB-INF/views/analysisgroupstates/update.jspx
deleted file mode 100755
index 3d4f1238a..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroupstates/update.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_AnalysisGroupState" modelAttribute="analysisGroupState" path="/analysisgroupstates" versionField="Version" z="GfD8RCVuhLKxohb3roy7PAr7MWo=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_AnalysisGroupState_recordedBy" required="true" z="piCd1HaQDd55bxyg1qQbP5kmHOg="/>
-        <field:datetime dateTimePattern="${analysisGroupState_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_AnalysisGroupState_recordedDate" required="true" z="cBgPeduxNqttSFSKDfiL1dpztgg="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_AnalysisGroupState_modifiedBy" z="9RikD57KBrNPXl25oKn8BfDWui4="/>
-        <field:datetime dateTimePattern="${analysisGroupState_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_AnalysisGroupState_modifiedDate" z="DZydELOCWDRaNUk+sA723/jLKBw="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_AnalysisGroupState_comments" z="vU0smmngkOx7tZu7nR+caqzA3Qk="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_AnalysisGroupState_ignored" z="wm1VrEvOzO9dbgeyYzz4Y0GEK7U="/>
-        <field:select field="analysisGroup" id="c_com_labsynch_labseer_domain_AnalysisGroupState_analysisGroup" itemValue="id" items="${analysisgroups}" path="/analysisgroups" required="true" z="5zr5vvi+xwyA3xE+zKQAAtyDnoY="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_AnalysisGroupState_lsTransaction" validationMessageCode="field_invalid_integer" z="TKqf5VT2iBKs2wtnugxsE/4B7VU="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_AnalysisGroupState_lsType" required="true" z="3MakiE+KNA13EdikB+O2JC3yiGg="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_AnalysisGroupState_lsKind" required="true" z="u32S/fhAjky8VYpowYL14b+rE78="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_AnalysisGroupState_lsTypeAndKind" z="WhY6bbeBrYiXg/SdO2t4iRBz36Q="/>
-        <field:simple field="lsValues" id="c_com_labsynch_labseer_domain_AnalysisGroupState_lsValues" messageCode="entity_reference_not_managed" messageCodeAttribute="Analysis Group Value" z="jA9escvYy0O8QrJAdhwHzimOKIk="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_AnalysisGroupState_deleted" z="OhJn8SouPkVxgMncXUIqzBGdBT0="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroupstates/views.xml b/src/main/webapp/WEB-INF/views/analysisgroupstates/views.xml
deleted file mode 100755
index b8ecb9789..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroupstates/views.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="analysisgroupstates/list">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgroupstates/list.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgroupstates/show">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgroupstates/show.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgroupstates/create">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgroupstates/create.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgroupstates/update">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgroupstates/update.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgroupstates/findAnalysisGroupStatesByAnalysisGroup">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgroupstates/findAnalysisGroupStatesByAnalysisGroup.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgroupstates/findAnalysisGroupStatesByLsTransactionEquals">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgroupstates/findAnalysisGroupStatesByLsTransactionEquals.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgroupstates/findAnalysisGroupStatesByLsTypeAndKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgroupstates/findAnalysisGroupStatesByLsTypeAndKindEquals.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgroupstates/findAnalysisGroupStatesByLsTypeEqualsAndLsKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgroupstates/findAnalysisGroupStatesByLsTypeEqualsAndLsKindEquals.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgroupstates/findAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgroupstates/findAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroupvalues/create.jspx b/src/main/webapp/WEB-INF/views/analysisgroupvalues/create.jspx
deleted file mode 100755
index 01692edcf..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroupvalues/create.jspx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_AnalysisGroupValue" modelAttribute="analysisGroupValue" path="/analysisgroupvalues" render="${empty dependencies}" z="yjldf/03uDDE3CCuUA/fX7O8VAg=">
-        <field:textarea field="stringValue" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_stringValue" z="pyBGoJcpt6Cj8v5VkXqySGpxv8E="/>
-        <field:textarea field="fileValue" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_fileValue" z="3Xe0YhHS0IjQEbq2nmI1xq5PyCM="/>
-        <field:textarea field="urlValue" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_urlValue" z="+raBkOSoeUbWtlgOhBTPh8J/kvo="/>
-        <field:datetime dateTimePattern="${analysisGroupValue_datevalue_date_format}" field="dateValue" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_dateValue" z="LxtW7MrvzqarfxHCrn9VuUE6Dxs="/>
-        <field:input field="clobValue" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_clobValue" z="JX5jsICbYykkRHrVv89uNvHty4Q="/>
-        <field:input field="blobValue" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_blobValue" z="BRk/kPvNptkdePEBGVBJr/Wzt+I="/>
-        <field:input field="sigFigs" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_sigFigs" validationMessageCode="field_invalid_integer" z="RIQv+viYR+0DDqOxwwKr7OY7Go4="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_comments" z="c4IOFGrBmnKeN5OPZ87SikJyrQ4="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_ignored" z="pllxg0/rMiQ+braQ3UH5gSqNDFQ="/>
-        <field:datetime dateTimePattern="${analysisGroupValue_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_recordedDate" required="true" z="z8Sx6soZpxWTkMURl41ZHWP3ru8="/>
-        <field:datetime dateTimePattern="${analysisGroupValue_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_modifiedDate" z="DAgrSQD3/7AVcco2RECJcGHRInU="/>
-        <field:checkbox field="publicData" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_publicData" z="HleeFwduSmvEDE7Z1p1xd7SPQwo="/>
-        <field:textarea field="codeValue" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_codeValue" z="rxY47UlW+VT9pOx3c4u/IEJYAI0="/>
-        <field:input field="numberOfReplicates" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_numberOfReplicates" validationMessageCode="field_invalid_integer" z="J3JEWFSPkKoua7pKiCwIigcvw0g="/>
-        <field:textarea field="uncertaintyType" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_uncertaintyType" z="tAfpCmj0Zduk/0Ej3lFQQdmMdy8="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_lsTransaction" validationMessageCode="field_invalid_integer" z="reJsVtZWkBotMHRJIAnbXkIOhOA="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_lsType" required="true" z="LZgMFuBVKzTILBuvPNEjalyLBkU="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_lsKind" required="true" z="xjPOCIbdmeXQh0GX8YjkHxkq1M0="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_lsTypeAndKind" z="tqlVZK38SMD1tmYqbomULBxbKps="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_recordedBy" required="true" z="tDh35KsLGkeWGAHG8MRDlcXd7o8="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_modifiedBy" z="bePCSY/W9b19+kFiZ+af5so/A/g="/>
-        <field:select field="lsState" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_lsState" itemValue="id" items="${analysisgroupstates}" path="/analysisgroupstates" required="true" z="iNnrOx48it6hPxXaFT3MH1kImrk="/>
-        <field:input field="operatorType" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_operatorType" max="25" z="Od+TSXE0jgGpkokdjuBpboDVBNU="/>
-        <field:input field="operatorKind" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_operatorKind" max="10" z="CABftgO2Gzh/ltTZSyzLW9vK3VM="/>
-        <field:textarea field="operatorTypeAndKind" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_operatorTypeAndKind" z="+c9zOJJsw5bfL5ptnB5b34sRxtA="/>
-        <field:input field="unitType" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_unitType" max="25" z="caUAWHs0D2ZcrrFxE2MK0fC1yQs="/>
-        <field:input field="unitKind" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_unitKind" max="25" z="Tl3LSQs3UuZMWXUT96Sq4/XACgE="/>
-        <field:textarea field="unitTypeAndKind" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_unitTypeAndKind" z="Zu9usgvfbovwB76niTWvqP/eNLw="/>
-        <field:input field="numericValue" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_numericValue" validationMessageCode="field_invalid_number" z="nqOFc5O0GNf+AWwP1zV34rhUsBw="/>
-        <field:textarea field="codeType" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_codeType" z="BF5q6xKCMfri4JNVTCQltklwVY4="/>
-        <field:textarea field="codeKind" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_codeKind" z="Npgfy74AczcWUMmx/pONuGA1xHY="/>
-        <field:textarea field="codeTypeAndKind" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_codeTypeAndKind" z="jcOpH3kP9NDsaaSiM5LCo0NMz7c="/>
-        <field:input field="uncertainty" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_uncertainty" validationMessageCode="field_invalid_number" z="72F5Bi7YBE0BtQnwvroisXLL+3o="/>
-        <field:textarea field="codeOrigin" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_codeOrigin" z="9krbrScFVRxSrikIC02jr3tUJg4="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_deleted" z="ASB66qbqoo8GJhWMNYw8Tvrwjb0="/>
-        <field:input field="concentration" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_concentration" validationMessageCode="field_invalid_number" z="zGQj3HWfYemHqp9kPEZb2cm2Xw8="/>
-        <field:input field="concUnit" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_concUnit" max="25" z="vr4SHF951GgBvbgwp9sIURQqKHg="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_AnalysisGroupValue" render="${not empty dependencies}" z="XXdqE8fvtZ+eKAoxMJDmDMAyIgg="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByCodeValueEquals.jspx b/src/main/webapp/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByCodeValueEquals.jspx
deleted file mode 100755
index 650a56cf3..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByCodeValueEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeValueEquals" id="ff_com_labsynch_labseer_domain_AnalysisGroupValue" path="/analysisgroupvalues" z="52M/HeCyYPqnJPAoh/UVZDxBSWY=">
-        <field:input disableFormBinding="true" field="codeValue" id="f_com_labsynch_labseer_domain_AnalysisGroupValue_codeValue" max="255" required="true" z="6VDbuGqryfiZgm3mzFJeLTSHST0="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByIgnoredNotAndCodeValueEquals.jspx b/src/main/webapp/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByIgnoredNotAndCodeValueEquals.jspx
deleted file mode 100755
index b160b283f..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByIgnoredNotAndCodeValueEquals.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByIgnoredNotAndCodeValueEquals" id="ff_com_labsynch_labseer_domain_AnalysisGroupValue" path="/analysisgroupvalues" z="hH9dHgurbMoEJMnBH+vnDcnoeZo=">
-        <field:checkbox disableFormBinding="true" field="ignored" id="f_com_labsynch_labseer_domain_AnalysisGroupValue_ignored" z="8PKwF5VCYiHBjCMjbhZBGmMoIjA="/>
-        <field:input disableFormBinding="true" field="codeValue" id="f_com_labsynch_labseer_domain_AnalysisGroupValue_codeValue" max="255" required="true" z="6VDbuGqryfiZgm3mzFJeLTSHST0="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByLsState.jspx b/src/main/webapp/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByLsState.jspx
deleted file mode 100755
index 15e69ef43..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByLsState.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsState" id="ff_com_labsynch_labseer_domain_AnalysisGroupValue" path="/analysisgroupvalues" z="bELUbx8OxjkR017onO4XPQVKjuU=">
-        <field:select disableFormBinding="true" field="lsState" id="f_com_labsynch_labseer_domain_AnalysisGroupValue_lsState" itemValue="id" items="${analysisgroupstates}" path="/analysisgroupstates" required="true" z="8EC91SBqqNqJKQVh2CZwkoUKASA="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByLsTransactionEquals.jspx b/src/main/webapp/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByLsTransactionEquals.jspx
deleted file mode 100755
index 9648520d9..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByLsTransactionEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTransactionEquals" id="ff_com_labsynch_labseer_domain_AnalysisGroupValue" path="/analysisgroupvalues" z="4mBTmJT/C/crT+HeWHzseezwWqM=">
-        <field:input disableFormBinding="true" field="lsTransaction" id="f_com_labsynch_labseer_domain_AnalysisGroupValue_lsTransaction" required="true" validationMessageCode="field_invalid_integer" z="qwBZyc4JbT1hv6Z2z8Q2hZNzhcw="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals.jspx b/src/main/webapp/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals.jspx
deleted file mode 100644
index 66f019c16..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeEqualsAndLsKindEquals" id="ff_com_labsynch_labseer_domain_AnalysisGroupValue" path="/analysisgroupvalues" z="PKl1P6a7pY3jkDjDTH0YueIb31o=">
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_AnalysisGroupValue_lsType" max="64" required="true" z="M6FFrCJQh//B1SlIxZMhRClJGzA="/>
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_AnalysisGroupValue_lsKind" max="255" required="true" z="QCLfDG8IJMbg28L1tVf6BsynRCk="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot.jspx b/src/main/webapp/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot.jspx
deleted file mode 100644
index dfc69b671..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot" id="ff_com_labsynch_labseer_domain_AnalysisGroupValue" path="/analysisgroupvalues" z="RyzxPGBnAKfHPO5KxT6wK4kLlWs=">
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_AnalysisGroupValue_lsType" max="64" required="true" z="M6FFrCJQh//B1SlIxZMhRClJGzA="/>
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_AnalysisGroupValue_lsKind" max="255" required="true" z="QCLfDG8IJMbg28L1tVf6BsynRCk="/>
-        <field:input disableFormBinding="true" field="stringValue" id="f_com_labsynch_labseer_domain_AnalysisGroupValue_stringValue" max="255" required="true" z="ZnlGz5iY7M9l6WFX7u8wj55bzgQ="/>
-        <field:checkbox disableFormBinding="true" field="ignored" id="f_com_labsynch_labseer_domain_AnalysisGroupValue_ignored" z="8PKwF5VCYiHBjCMjbhZBGmMoIjA="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroupvalues/list.jspx b/src/main/webapp/WEB-INF/views/analysisgroupvalues/list.jspx
deleted file mode 100755
index fa70553ee..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroupvalues/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_AnalysisGroupValue" items="${analysisgroupvalues}" z="3+uAL3ysQ+4dVgu+RvJHag+E65w=">
-        <table:table data="${analysisgroupvalues}" id="l_com_labsynch_labseer_domain_AnalysisGroupValue" path="/analysisgroupvalues" z="B4S5XcT0OPFgyZE5VKxbwIfqQys=">
-            <table:column id="c_com_labsynch_labseer_domain_AnalysisGroupValue_lsType" property="lsType" z="dLiu23RtzPNIoGTGais0Pw8JIZU="/>
-            <table:column id="c_com_labsynch_labseer_domain_AnalysisGroupValue_lsKind" property="lsKind" z="HwCAzOhnuCEo1toap8hpPDs1b64="/>
-            <table:column id="c_com_labsynch_labseer_domain_AnalysisGroupValue_lsTypeAndKind" property="lsTypeAndKind" z="vTQEiEgt7C//u3k9eNjyHmLY+ds="/>
-            <table:column id="c_com_labsynch_labseer_domain_AnalysisGroupValue_ignored" property="ignored" z="8g6+W7HEOeBlkQp1xUXKZoYuYw0="/>
-            <table:column id="c_com_labsynch_labseer_domain_AnalysisGroupValue_publicData" property="publicData" z="srtHgGNEoakzpP4vSLY2ArmSeII="/>
-            <table:column id="c_com_labsynch_labseer_domain_AnalysisGroupValue_deleted" property="deleted" z="s/epX1BospH8T/+2KU+gu7dBNlA="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroupvalues/show.jspx b/src/main/webapp/WEB-INF/views/analysisgroupvalues/show.jspx
deleted file mode 100755
index 7b7b6840f..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroupvalues/show.jspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_AnalysisGroupValue" object="${analysisgroupvalue}" path="/analysisgroupvalues" z="Awl3ZzqTP3KhHmBFD8ZSovk3mtc=">
-        <field:display field="stringValue" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_stringValue" object="${analysisgroupvalue}" z="qGPvlf7D+OE6sWGsOU8EfvRn2lU="/>
-        <field:display field="fileValue" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_fileValue" object="${analysisgroupvalue}" z="qj331AEOolrGlzA1h03T/8M63PA="/>
-        <field:display field="urlValue" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_urlValue" object="${analysisgroupvalue}" z="egaeqaSpznylwv223vkmZ7WXCLk="/>
-        <field:display date="true" dateTimePattern="${analysisGroupValue_datevalue_date_format}" field="dateValue" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_dateValue" object="${analysisgroupvalue}" z="Rt6F4tt3FEKnGOdQUYvJp3Ew3b8="/>
-        <field:display field="clobValue" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_clobValue" object="${analysisgroupvalue}" z="GWtLsh2dwnlMQTvp13GW83+g8aU="/>
-        <field:display field="blobValue" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_blobValue" object="${analysisgroupvalue}" z="G6hER4XpX49TnCfSrAT3VZskng0="/>
-        <field:display field="sigFigs" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_sigFigs" object="${analysisgroupvalue}" z="yqhedKenljBstcMmCrz7RCIyRVw="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_comments" object="${analysisgroupvalue}" z="D8TU3+XxIkyft9wO5LFN8McGxbM="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_ignored" object="${analysisgroupvalue}" z="NCoqKlWmbJwtxd1UhhLBrEB4wp8="/>
-        <field:display date="true" dateTimePattern="${analysisGroupValue_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_recordedDate" object="${analysisgroupvalue}" z="+gRgU5z66bF1XrevyOgO/R4kI3w="/>
-        <field:display date="true" dateTimePattern="${analysisGroupValue_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_modifiedDate" object="${analysisgroupvalue}" z="i8OyEqP5F88zxdlrzMxZXUzHel8="/>
-        <field:display field="publicData" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_publicData" object="${analysisgroupvalue}" z="Iw4vm4K6+LZ7hPxLdzi2oPRHLhM="/>
-        <field:display field="codeValue" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_codeValue" object="${analysisgroupvalue}" z="7ilQpAJkCAVpjuiT9nSXw988HzA="/>
-        <field:display field="numberOfReplicates" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_numberOfReplicates" object="${analysisgroupvalue}" z="ipRQvJ8aqP6Os4UuGW/84ABZGmE="/>
-        <field:display field="uncertaintyType" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_uncertaintyType" object="${analysisgroupvalue}" z="OwCGbJEom4T23UV9rEPKkO8KD5k="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_lsTransaction" object="${analysisgroupvalue}" z="9McRbENAsYR/nPiULlDG1rDDQ44="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_lsType" object="${analysisgroupvalue}" z="AMEGPtqPo/mEX1qDMoPcAB/rwmU="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_lsKind" object="${analysisgroupvalue}" z="cld+h5J6P1uG0zJgdLXaovtuI/Y="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_lsTypeAndKind" object="${analysisgroupvalue}" z="5eLKR7y7eiBbpveSX25np3yKazE="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_recordedBy" object="${analysisgroupvalue}" z="omD9oQCDUfj1xS+ukztrt9bg9ko="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_modifiedBy" object="${analysisgroupvalue}" z="SKngGisUYvrqMd2XqJn17UFEs2Y="/>
-        <field:display field="lsState" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_lsState" object="${analysisgroupvalue}" z="7a6GvIJiQO3DXIN2kM3hsQt7Mio="/>
-        <field:display field="operatorType" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_operatorType" object="${analysisgroupvalue}" z="aZn3C/+SBF3JRF/aMSLGW/7K37o="/>
-        <field:display field="operatorKind" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_operatorKind" object="${analysisgroupvalue}" z="YEtKQv4lKx5eX3YVqRlDtHQ2qeo="/>
-        <field:display field="operatorTypeAndKind" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_operatorTypeAndKind" object="${analysisgroupvalue}" z="ZbGeQMd+emqMa3a+gbqE8aeZ2pM="/>
-        <field:display field="unitType" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_unitType" object="${analysisgroupvalue}" z="CWCJqmCFs2T5goOLQgaGgdUdmIQ="/>
-        <field:display field="unitKind" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_unitKind" object="${analysisgroupvalue}" z="90G+nEUigpa+m/lZmTjtBbzuSio="/>
-        <field:display field="unitTypeAndKind" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_unitTypeAndKind" object="${analysisgroupvalue}" z="mb8wJspCOBANYa7R2nPpPKwxpBw="/>
-        <field:display field="numericValue" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_numericValue" object="${analysisgroupvalue}" z="Z61kSuUoGVHukOM+jUmoU6KoGgg="/>
-        <field:display field="codeType" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_codeType" object="${analysisgroupvalue}" z="0ZqEEklI/x6qVvLTesFn7A4UXlA="/>
-        <field:display field="codeKind" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_codeKind" object="${analysisgroupvalue}" z="qskR5iqYxljY0DQ51LAGfxvyBnU="/>
-        <field:display field="codeTypeAndKind" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_codeTypeAndKind" object="${analysisgroupvalue}" z="NbSj8E0YZJOOtDy/gDXzm7Shr38="/>
-        <field:display field="uncertainty" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_uncertainty" object="${analysisgroupvalue}" z="saMYP48Gt064d72lrj2f2ihhy5g="/>
-        <field:display field="codeOrigin" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_codeOrigin" object="${analysisgroupvalue}" z="+CuEl6nOTkVlK8M+4T9aWo7/R+g="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_deleted" object="${analysisgroupvalue}" z="xE/V6oMOPqbnYKFw83WFxaWNiiQ="/>
-        <field:display field="concentration" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_concentration" object="${analysisgroupvalue}" z="QnNjDkc8MHcQOw3OyHrdMpZFcos="/>
-        <field:display field="concUnit" id="s_com_labsynch_labseer_domain_AnalysisGroupValue_concUnit" object="${analysisgroupvalue}" z="8fSqOsPkGGuV2bQvidpxeyfgOBg="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroupvalues/update.jspx b/src/main/webapp/WEB-INF/views/analysisgroupvalues/update.jspx
deleted file mode 100755
index 8803722c4..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroupvalues/update.jspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_AnalysisGroupValue" modelAttribute="analysisGroupValue" path="/analysisgroupvalues" versionField="Version" z="/TCd50bsarUVAM6Znaupmg34qDo=">
-        <field:textarea field="stringValue" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_stringValue" z="pyBGoJcpt6Cj8v5VkXqySGpxv8E="/>
-        <field:textarea field="fileValue" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_fileValue" z="3Xe0YhHS0IjQEbq2nmI1xq5PyCM="/>
-        <field:textarea field="urlValue" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_urlValue" z="+raBkOSoeUbWtlgOhBTPh8J/kvo="/>
-        <field:datetime dateTimePattern="${analysisGroupValue_datevalue_date_format}" field="dateValue" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_dateValue" z="LxtW7MrvzqarfxHCrn9VuUE6Dxs="/>
-        <field:input field="clobValue" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_clobValue" z="JX5jsICbYykkRHrVv89uNvHty4Q="/>
-        <field:input field="blobValue" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_blobValue" z="BRk/kPvNptkdePEBGVBJr/Wzt+I="/>
-        <field:input field="sigFigs" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_sigFigs" validationMessageCode="field_invalid_integer" z="RIQv+viYR+0DDqOxwwKr7OY7Go4="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_comments" z="c4IOFGrBmnKeN5OPZ87SikJyrQ4="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_ignored" z="pllxg0/rMiQ+braQ3UH5gSqNDFQ="/>
-        <field:datetime dateTimePattern="${analysisGroupValue_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_recordedDate" required="true" z="z8Sx6soZpxWTkMURl41ZHWP3ru8="/>
-        <field:datetime dateTimePattern="${analysisGroupValue_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_modifiedDate" z="DAgrSQD3/7AVcco2RECJcGHRInU="/>
-        <field:checkbox field="publicData" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_publicData" z="HleeFwduSmvEDE7Z1p1xd7SPQwo="/>
-        <field:textarea field="codeValue" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_codeValue" z="rxY47UlW+VT9pOx3c4u/IEJYAI0="/>
-        <field:input field="numberOfReplicates" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_numberOfReplicates" validationMessageCode="field_invalid_integer" z="J3JEWFSPkKoua7pKiCwIigcvw0g="/>
-        <field:textarea field="uncertaintyType" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_uncertaintyType" z="tAfpCmj0Zduk/0Ej3lFQQdmMdy8="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_lsTransaction" validationMessageCode="field_invalid_integer" z="reJsVtZWkBotMHRJIAnbXkIOhOA="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_lsType" required="true" z="LZgMFuBVKzTILBuvPNEjalyLBkU="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_lsKind" required="true" z="xjPOCIbdmeXQh0GX8YjkHxkq1M0="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_lsTypeAndKind" z="tqlVZK38SMD1tmYqbomULBxbKps="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_recordedBy" required="true" z="tDh35KsLGkeWGAHG8MRDlcXd7o8="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_modifiedBy" z="bePCSY/W9b19+kFiZ+af5so/A/g="/>
-        <field:select field="lsState" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_lsState" itemValue="id" items="${analysisgroupstates}" path="/analysisgroupstates" required="true" z="iNnrOx48it6hPxXaFT3MH1kImrk="/>
-        <field:input field="operatorType" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_operatorType" max="25" z="Od+TSXE0jgGpkokdjuBpboDVBNU="/>
-        <field:input field="operatorKind" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_operatorKind" max="10" z="CABftgO2Gzh/ltTZSyzLW9vK3VM="/>
-        <field:textarea field="operatorTypeAndKind" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_operatorTypeAndKind" z="+c9zOJJsw5bfL5ptnB5b34sRxtA="/>
-        <field:input field="unitType" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_unitType" max="25" z="caUAWHs0D2ZcrrFxE2MK0fC1yQs="/>
-        <field:input field="unitKind" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_unitKind" max="25" z="Tl3LSQs3UuZMWXUT96Sq4/XACgE="/>
-        <field:textarea field="unitTypeAndKind" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_unitTypeAndKind" z="Zu9usgvfbovwB76niTWvqP/eNLw="/>
-        <field:input field="numericValue" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_numericValue" validationMessageCode="field_invalid_number" z="nqOFc5O0GNf+AWwP1zV34rhUsBw="/>
-        <field:textarea field="codeType" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_codeType" z="BF5q6xKCMfri4JNVTCQltklwVY4="/>
-        <field:textarea field="codeKind" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_codeKind" z="Npgfy74AczcWUMmx/pONuGA1xHY="/>
-        <field:textarea field="codeTypeAndKind" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_codeTypeAndKind" z="jcOpH3kP9NDsaaSiM5LCo0NMz7c="/>
-        <field:input field="uncertainty" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_uncertainty" validationMessageCode="field_invalid_number" z="72F5Bi7YBE0BtQnwvroisXLL+3o="/>
-        <field:textarea field="codeOrigin" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_codeOrigin" z="9krbrScFVRxSrikIC02jr3tUJg4="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_deleted" z="ASB66qbqoo8GJhWMNYw8Tvrwjb0="/>
-        <field:input field="concentration" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_concentration" validationMessageCode="field_invalid_number" z="zGQj3HWfYemHqp9kPEZb2cm2Xw8="/>
-        <field:input field="concUnit" id="c_com_labsynch_labseer_domain_AnalysisGroupValue_concUnit" max="25" z="vr4SHF951GgBvbgwp9sIURQqKHg="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/analysisgroupvalues/views.xml b/src/main/webapp/WEB-INF/views/analysisgroupvalues/views.xml
deleted file mode 100755
index 7ba04a9f3..000000000
--- a/src/main/webapp/WEB-INF/views/analysisgroupvalues/views.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="analysisgroupvalues/list">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgroupvalues/list.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgroupvalues/show">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgroupvalues/show.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgroupvalues/create">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgroupvalues/create.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgroupvalues/update">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgroupvalues/update.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgroupvalues/findAnalysisGroupValuesByLsState">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByLsState.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgroupvalues/findAnalysisGroupValuesByLsTransactionEquals">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByLsTransactionEquals.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgroupvalues/findAnalysisGroupValuesByCodeValueEquals">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByCodeValueEquals.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgroupvalues/findAnalysisGroupValuesByIgnoredNotAndCodeValueEquals">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByIgnoredNotAndCodeValueEquals.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgroupvalues/findAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals.jspx"/>
-    </definition>
-<definition extends="default" name="analysisgroupvalues/findAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot">
-        <put-attribute name="body" value="/WEB-INF/views/analysisgroupvalues/findAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/applicationsettings/create.jspx b/src/main/webapp/WEB-INF/views/applicationsettings/create.jspx
deleted file mode 100755
index a8898920f..000000000
--- a/src/main/webapp/WEB-INF/views/applicationsettings/create.jspx
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ApplicationSetting" modelAttribute="applicationSetting" path="/applicationsettings" render="${empty dependencies}" z="WVElRONvbZTsmSyxmXTvbLi1Z0c=">
-        <field:textarea field="propName" id="c_com_labsynch_labseer_domain_ApplicationSetting_propName" z="H0JqNdAZpSm+GEGgxq6vNiBw7B8="/>
-        <field:textarea field="propValue" id="c_com_labsynch_labseer_domain_ApplicationSetting_propValue" z="RQFKGH6UUgTDK4JlCHhgUHv7PjQ="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ApplicationSetting_comments" z="/T77ya1fV6PX6shVwsidU1Y5OWI="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ApplicationSetting_ignored" z="G+Anm3BJjLqVu54jg2HtNSbTaQw="/>
-        <field:datetime dateTimePattern="${applicationSetting_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ApplicationSetting_recordedDate" z="D5KD/SpcQe1ujrI5/u9+5GSoUpU="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ApplicationSetting" render="${not empty dependencies}" z="S9yXWY00QISky1sCynxr5Cj7Tm8="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/applicationsettings/findApplicationSettingsByPropNameEquals.jspx b/src/main/webapp/WEB-INF/views/applicationsettings/findApplicationSettingsByPropNameEquals.jspx
deleted file mode 100755
index 5e713c082..000000000
--- a/src/main/webapp/WEB-INF/views/applicationsettings/findApplicationSettingsByPropNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByPropNameEquals" id="ff_com_labsynch_labseer_domain_ApplicationSetting" path="/applicationsettings" z="AGYOBcCEC+NTGxLKpMoqTIM4Dc0=">
-        <field:input disableFormBinding="true" field="propName" id="f_com_labsynch_labseer_domain_ApplicationSetting_propName" max="255" required="true" z="b4l+U8VuH7HXm2SMyVnc9iP0r7s="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/applicationsettings/findApplicationSettingsByPropNameEqualsAndIgnoredNot.jspx b/src/main/webapp/WEB-INF/views/applicationsettings/findApplicationSettingsByPropNameEqualsAndIgnoredNot.jspx
deleted file mode 100755
index fbc2de3c5..000000000
--- a/src/main/webapp/WEB-INF/views/applicationsettings/findApplicationSettingsByPropNameEqualsAndIgnoredNot.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByPropNameEqualsAndIgnoredNot" id="ff_com_labsynch_labseer_domain_ApplicationSetting" path="/applicationsettings" z="64sOW2q7wudLcaLREODcEPTAAtk=">
-        <field:input disableFormBinding="true" field="propName" id="f_com_labsynch_labseer_domain_ApplicationSetting_propName" max="255" required="true" z="b4l+U8VuH7HXm2SMyVnc9iP0r7s="/>
-        <field:checkbox disableFormBinding="true" field="ignored" id="f_com_labsynch_labseer_domain_ApplicationSetting_ignored" z="xzPKSwfkCduUt8kuD+jW5jwMqAw="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/applicationsettings/list.jspx b/src/main/webapp/WEB-INF/views/applicationsettings/list.jspx
deleted file mode 100755
index a933930bf..000000000
--- a/src/main/webapp/WEB-INF/views/applicationsettings/list.jspx
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ApplicationSetting" items="${applicationsettings}" z="rapYuOev8T7CAXAbc26ojZJEzmI=">
-        <table:table data="${applicationsettings}" id="l_com_labsynch_labseer_domain_ApplicationSetting" path="/applicationsettings" z="OTF2wQRI3q1qZdppxRBz0gTPtfY=">
-            <table:column id="c_com_labsynch_labseer_domain_ApplicationSetting_propName" property="propName" z="76nji8VuhHvEK8w/54P3WBjM5CY="/>
-            <table:column id="c_com_labsynch_labseer_domain_ApplicationSetting_propValue" property="propValue" z="ayQhV5KxEWwH/1n8v47HAU4QVt4="/>
-            <table:column id="c_com_labsynch_labseer_domain_ApplicationSetting_comments" property="comments" z="zeFWGDp6/Ize709icDrbj9AHyzo="/>
-            <table:column id="c_com_labsynch_labseer_domain_ApplicationSetting_ignored" property="ignored" z="m9qBLfx+pV3piXT4lT6F87cRFWg="/>
-            <table:column date="true" dateTimePattern="${applicationSetting_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_ApplicationSetting_recordedDate" property="recordedDate" z="f6maheAzL2BYJ3PlZqMZ3U+E3DA="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/applicationsettings/show.jspx b/src/main/webapp/WEB-INF/views/applicationsettings/show.jspx
deleted file mode 100755
index df9426c23..000000000
--- a/src/main/webapp/WEB-INF/views/applicationsettings/show.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ApplicationSetting" object="${applicationsetting}" path="/applicationsettings" z="/GEXC5bsAZ90nFCzg7vLjblhLlQ=">
-        <field:display field="propName" id="s_com_labsynch_labseer_domain_ApplicationSetting_propName" object="${applicationsetting}" z="0AicWGsQAMAXE1/72HX0h4NGrIk="/>
-        <field:display field="propValue" id="s_com_labsynch_labseer_domain_ApplicationSetting_propValue" object="${applicationsetting}" z="F3+JAcvft+9qAOtmprhThsMnnwA="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_ApplicationSetting_comments" object="${applicationsetting}" z="o6+DxFkuHe2LNWvpU8U3QnDpcN8="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ApplicationSetting_ignored" object="${applicationsetting}" z="ByK61ePbonlSFIvtS6I7VScJCTM="/>
-        <field:display date="true" dateTimePattern="${applicationSetting_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_ApplicationSetting_recordedDate" object="${applicationsetting}" z="FZfkZDCAK2N0zICbGou1/qjknoE="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/applicationsettings/update.jspx b/src/main/webapp/WEB-INF/views/applicationsettings/update.jspx
deleted file mode 100755
index 24465eb72..000000000
--- a/src/main/webapp/WEB-INF/views/applicationsettings/update.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ApplicationSetting" modelAttribute="applicationSetting" path="/applicationsettings" versionField="Version" z="LbdlTWeUXuSHIKkUIA/rmzk6KyY=">
-        <field:textarea field="propName" id="c_com_labsynch_labseer_domain_ApplicationSetting_propName" z="H0JqNdAZpSm+GEGgxq6vNiBw7B8="/>
-        <field:textarea field="propValue" id="c_com_labsynch_labseer_domain_ApplicationSetting_propValue" z="RQFKGH6UUgTDK4JlCHhgUHv7PjQ="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ApplicationSetting_comments" z="/T77ya1fV6PX6shVwsidU1Y5OWI="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ApplicationSetting_ignored" z="G+Anm3BJjLqVu54jg2HtNSbTaQw="/>
-        <field:datetime dateTimePattern="${applicationSetting_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ApplicationSetting_recordedDate" z="D5KD/SpcQe1ujrI5/u9+5GSoUpU="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/applicationsettings/views.xml b/src/main/webapp/WEB-INF/views/applicationsettings/views.xml
deleted file mode 100755
index 63a59995d..000000000
--- a/src/main/webapp/WEB-INF/views/applicationsettings/views.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="applicationsettings/list">
-        <put-attribute name="body" value="/WEB-INF/views/applicationsettings/list.jspx"/>
-    </definition>
-<definition extends="default" name="applicationsettings/show">
-        <put-attribute name="body" value="/WEB-INF/views/applicationsettings/show.jspx"/>
-    </definition>
-<definition extends="default" name="applicationsettings/create">
-        <put-attribute name="body" value="/WEB-INF/views/applicationsettings/create.jspx"/>
-    </definition>
-<definition extends="default" name="applicationsettings/update">
-        <put-attribute name="body" value="/WEB-INF/views/applicationsettings/update.jspx"/>
-    </definition>
-<definition extends="default" name="applicationsettings/findApplicationSettingsByPropNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/applicationsettings/findApplicationSettingsByPropNameEquals.jspx"/>
-    </definition>
-<definition extends="default" name="applicationsettings/findApplicationSettingsByPropNameEqualsAndIgnoredNot">
-        <put-attribute name="body" value="/WEB-INF/views/applicationsettings/findApplicationSettingsByPropNameEqualsAndIgnoredNot.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/authorlabels/create.jspx b/src/main/webapp/WEB-INF/views/authorlabels/create.jspx
deleted file mode 100644
index 53990426c..000000000
--- a/src/main/webapp/WEB-INF/views/authorlabels/create.jspx
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_AuthorLabel" modelAttribute="authorLabel" path="/authorlabels" render="${empty dependencies}" z="IhyUf3jLiauzhMpd0K3uaHU4waA=">
-        <field:textarea field="labelText" id="c_com_labsynch_labseer_domain_AuthorLabel_labelText" required="true" z="Uf+gsA5TzJLu4B+j2bO5rUolywY="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_AuthorLabel_recordedBy" required="true" z="LbZ8sEqyDKF7nlRpo9szrpiaE6E="/>
-        <field:datetime dateTimePattern="${authorLabel_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_AuthorLabel_recordedDate" required="true" z="THMxYM/fnaYB1SI8QsaqR7VYYXg="/>
-        <field:datetime dateTimePattern="${authorLabel_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_AuthorLabel_modifiedDate" z="DRT8HXFJO4qjaNMY+nH4coGVz8E="/>
-        <field:checkbox field="physicallyLabled" id="c_com_labsynch_labseer_domain_AuthorLabel_physicallyLabled" z="o77qcoslKQz2Ad5ei1AXmlh5PGE="/>
-        <field:textarea field="imageFile" id="c_com_labsynch_labseer_domain_AuthorLabel_imageFile" z="keMte2Yv34d2FPpIlnqGDkpY8DQ="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_AuthorLabel_lsType" required="true" z="/PxskxK7JWCeIdLQFdHiwM/WQKU="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_AuthorLabel_lsKind" required="true" z="v3l9TMHh8eHH470nANXRXKhPDvw="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_AuthorLabel_lsTypeAndKind" z="toZ8oLgHk9e7oO0wCg4fYYYbJeI="/>
-        <field:checkbox field="preferred" id="c_com_labsynch_labseer_domain_AuthorLabel_preferred" z="r2ef0p0UXva53YHmbv/huRWzG78="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_AuthorLabel_ignored" z="LPtznewGfpg+6aWrHUj8jkdKHEc="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_AuthorLabel_deleted" z="G6avbERFsaIaFRlzkJWXzL20b78="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_AuthorLabel_lsTransaction" validationMessageCode="field_invalid_integer" z="G/lR9Z5p2l9v421S0HVC/RPigVM="/>
-        <field:select field="author" id="c_com_labsynch_labseer_domain_AuthorLabel_author" itemValue="id" items="${authors}" path="/authors" required="true" z="zzgAwraHqpHE3IaQrp75ukhnDFY="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_AuthorLabel" render="${not empty dependencies}" z="5Q6rseMDWlxepBTg0W1x+3i5sqo="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/authorlabels/list.jspx b/src/main/webapp/WEB-INF/views/authorlabels/list.jspx
deleted file mode 100644
index 7970e43f9..000000000
--- a/src/main/webapp/WEB-INF/views/authorlabels/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_AuthorLabel" items="${authorlabels}" z="iBV/f9ClgCBcnyI7NQxXkW+HyDo=">
-        <table:table data="${authorlabels}" id="l_com_labsynch_labseer_domain_AuthorLabel" path="/authorlabels" z="pXAFvWaaH3Tciltm2GeKY/gyo2M=">
-            <table:column id="c_com_labsynch_labseer_domain_AuthorLabel_labelText" property="labelText" z="cT8JS3T9pz93egZ1Qkx/7RSPxa8="/>
-            <table:column id="c_com_labsynch_labseer_domain_AuthorLabel_recordedBy" property="recordedBy" z="adXKy1SZI/AVZ/Von6BzKoBGcFk="/>
-            <table:column date="true" dateTimePattern="${authorLabel_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_AuthorLabel_recordedDate" property="recordedDate" z="cXCXs7VkDJMdNMsA+IZPln26QRI="/>
-            <table:column date="true" dateTimePattern="${authorLabel_modifieddate_date_format}" id="c_com_labsynch_labseer_domain_AuthorLabel_modifiedDate" property="modifiedDate" z="lu8eFupYBET/M7349gmNBPpP1Uo="/>
-            <table:column id="c_com_labsynch_labseer_domain_AuthorLabel_physicallyLabled" property="physicallyLabled" z="KurA3iWyNcGgsNhblaELKJoRn2k="/>
-            <table:column id="c_com_labsynch_labseer_domain_AuthorLabel_imageFile" property="imageFile" z="+1H1kzfxfIE5LwpZyGsd2ruZ1/U="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/authorlabels/show.jspx b/src/main/webapp/WEB-INF/views/authorlabels/show.jspx
deleted file mode 100644
index 098447c5d..000000000
--- a/src/main/webapp/WEB-INF/views/authorlabels/show.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_AuthorLabel" object="${authorlabel}" path="/authorlabels" z="BLgHxAfp8gfu/3+kF7jhmSnfU60=">
-        <field:display field="labelText" id="s_com_labsynch_labseer_domain_AuthorLabel_labelText" object="${authorlabel}" z="OwDxtlJ9elrke+3W5TSyOr9Uafk="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_AuthorLabel_recordedBy" object="${authorlabel}" z="Ej8E2mDsUajq92AzLpSXM2Rwf6A="/>
-        <field:display date="true" dateTimePattern="${authorLabel_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_AuthorLabel_recordedDate" object="${authorlabel}" z="5/pAjOM8faZ+6kEZzmEUNJ2KmcQ="/>
-        <field:display date="true" dateTimePattern="${authorLabel_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_AuthorLabel_modifiedDate" object="${authorlabel}" z="wLEkeRx7R70zTclNXG2T3rQS2iU="/>
-        <field:display field="physicallyLabled" id="s_com_labsynch_labseer_domain_AuthorLabel_physicallyLabled" object="${authorlabel}" z="ZjlVozOlUvetIcPZF9ffDfR0qE0="/>
-        <field:display field="imageFile" id="s_com_labsynch_labseer_domain_AuthorLabel_imageFile" object="${authorlabel}" z="HxOV2nYtRmgwcd8FFhyFpZL7I9E="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_AuthorLabel_lsType" object="${authorlabel}" z="wiP33nM0jKF80KLWylkNyB749WA="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_AuthorLabel_lsKind" object="${authorlabel}" z="2gJ2vaoJEcAu3Zc3ru4cDKCgYMo="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_AuthorLabel_lsTypeAndKind" object="${authorlabel}" z="D3WOWCuPxKMy+6FoOHg2Nitgti4="/>
-        <field:display field="preferred" id="s_com_labsynch_labseer_domain_AuthorLabel_preferred" object="${authorlabel}" z="lyZLU04k77gjKDTSReBSjImIlL8="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_AuthorLabel_ignored" object="${authorlabel}" z="tbXNz/kkYrlIIbAck0tfheXBFbQ="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_AuthorLabel_deleted" object="${authorlabel}" z="Q8oXGz0TpPhnIaonTH87Z0rC4I0="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_AuthorLabel_lsTransaction" object="${authorlabel}" z="o947vsv1teITSvDWYKN/qbrvNDY="/>
-        <field:display field="author" id="s_com_labsynch_labseer_domain_AuthorLabel_author" object="${authorlabel}" z="IqtEeoHhAAaKA5K9Pd2YUrUHhag="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/authorlabels/update.jspx b/src/main/webapp/WEB-INF/views/authorlabels/update.jspx
deleted file mode 100644
index 39c4693bc..000000000
--- a/src/main/webapp/WEB-INF/views/authorlabels/update.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_AuthorLabel" modelAttribute="authorLabel" path="/authorlabels" versionField="Version" z="J0vIjvZOPud3cgc4qSeBDgutdBg=">
-        <field:textarea field="labelText" id="c_com_labsynch_labseer_domain_AuthorLabel_labelText" required="true" z="Uf+gsA5TzJLu4B+j2bO5rUolywY="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_AuthorLabel_recordedBy" required="true" z="LbZ8sEqyDKF7nlRpo9szrpiaE6E="/>
-        <field:datetime dateTimePattern="${authorLabel_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_AuthorLabel_recordedDate" required="true" z="THMxYM/fnaYB1SI8QsaqR7VYYXg="/>
-        <field:datetime dateTimePattern="${authorLabel_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_AuthorLabel_modifiedDate" z="DRT8HXFJO4qjaNMY+nH4coGVz8E="/>
-        <field:checkbox field="physicallyLabled" id="c_com_labsynch_labseer_domain_AuthorLabel_physicallyLabled" z="o77qcoslKQz2Ad5ei1AXmlh5PGE="/>
-        <field:textarea field="imageFile" id="c_com_labsynch_labseer_domain_AuthorLabel_imageFile" z="keMte2Yv34d2FPpIlnqGDkpY8DQ="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_AuthorLabel_lsType" required="true" z="/PxskxK7JWCeIdLQFdHiwM/WQKU="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_AuthorLabel_lsKind" required="true" z="v3l9TMHh8eHH470nANXRXKhPDvw="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_AuthorLabel_lsTypeAndKind" z="toZ8oLgHk9e7oO0wCg4fYYYbJeI="/>
-        <field:checkbox field="preferred" id="c_com_labsynch_labseer_domain_AuthorLabel_preferred" z="r2ef0p0UXva53YHmbv/huRWzG78="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_AuthorLabel_ignored" z="LPtznewGfpg+6aWrHUj8jkdKHEc="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_AuthorLabel_deleted" z="G6avbERFsaIaFRlzkJWXzL20b78="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_AuthorLabel_lsTransaction" validationMessageCode="field_invalid_integer" z="G/lR9Z5p2l9v421S0HVC/RPigVM="/>
-        <field:select field="author" id="c_com_labsynch_labseer_domain_AuthorLabel_author" itemValue="id" items="${authors}" path="/authors" required="true" z="zzgAwraHqpHE3IaQrp75ukhnDFY="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/authorlabels/views.xml b/src/main/webapp/WEB-INF/views/authorlabels/views.xml
deleted file mode 100644
index d4affa633..000000000
--- a/src/main/webapp/WEB-INF/views/authorlabels/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="authorlabels/list">
-        <put-attribute name="body" value="/WEB-INF/views/authorlabels/list.jspx"/>
-    </definition>
-<definition extends="default" name="authorlabels/show">
-        <put-attribute name="body" value="/WEB-INF/views/authorlabels/show.jspx"/>
-    </definition>
-<definition extends="default" name="authorlabels/create">
-        <put-attribute name="body" value="/WEB-INF/views/authorlabels/create.jspx"/>
-    </definition>
-<definition extends="default" name="authorlabels/update">
-        <put-attribute name="body" value="/WEB-INF/views/authorlabels/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/authorroles/create.jspx b/src/main/webapp/WEB-INF/views/authorroles/create.jspx
deleted file mode 100755
index 4c8d9228d..000000000
--- a/src/main/webapp/WEB-INF/views/authorroles/create.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_AuthorRole" modelAttribute="authorRole" path="/authorroles" render="${empty dependencies}" z="aDe16pyTNAjMSL/lt8EqN/tyYic=">
-        <field:select field="userEntry" id="c_com_labsynch_labseer_domain_AuthorRole_userEntry" itemValue="id" items="${authors}" path="/authors" required="true" z="3E6WWfXLD6xF+pf2cSh6rBje/Z0="/>
-        <field:select field="roleEntry" id="c_com_labsynch_labseer_domain_AuthorRole_roleEntry" itemValue="id" items="${lsroles}" path="/lsroles" required="true" z="duYyLZczWM3CPazDe0TMXBSPKWE="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_AuthorRole" render="${not empty dependencies}" z="rTGhOufJFt9L4fqCpmWSpwLfXVY="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/authorroles/findAuthorRolesByRoleEntry.jspx b/src/main/webapp/WEB-INF/views/authorroles/findAuthorRolesByRoleEntry.jspx
deleted file mode 100755
index 12d53efdc..000000000
--- a/src/main/webapp/WEB-INF/views/authorroles/findAuthorRolesByRoleEntry.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByRoleEntry" id="ff_com_labsynch_labseer_domain_AuthorRole" path="/authorroles" z="fKoDYvET0nbi3heXjt51Cgts67k=">
-        <field:select disableFormBinding="true" field="roleEntry" id="f_com_labsynch_labseer_domain_AuthorRole_roleEntry" itemValue="id" items="${lsroles}" path="/lsroles" required="true" z="Dr+3je18+C+Mk146UU1JX4pr+uM="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/authorroles/findAuthorRolesByRoleEntryAndUserEntry.jspx b/src/main/webapp/WEB-INF/views/authorroles/findAuthorRolesByRoleEntryAndUserEntry.jspx
deleted file mode 100755
index db086484f..000000000
--- a/src/main/webapp/WEB-INF/views/authorroles/findAuthorRolesByRoleEntryAndUserEntry.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByRoleEntryAndUserEntry" id="ff_com_labsynch_labseer_domain_AuthorRole" path="/authorroles" z="VM38XoVxYeR5Hxlri3EOvHRRfVc=">
-        <field:select disableFormBinding="true" field="roleEntry" id="f_com_labsynch_labseer_domain_AuthorRole_roleEntry" itemValue="id" items="${lsroles}" path="/lsroles" required="true" z="Dr+3je18+C+Mk146UU1JX4pr+uM="/>
-        <field:select disableFormBinding="true" field="userEntry" id="f_com_labsynch_labseer_domain_AuthorRole_userEntry" itemValue="id" items="${authors}" path="/authors" required="true" z="KhMPlRBE6JD3bMaxJadGwpTABbs="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/authorroles/findAuthorRolesByUserEntry.jspx b/src/main/webapp/WEB-INF/views/authorroles/findAuthorRolesByUserEntry.jspx
deleted file mode 100755
index 00d38af2b..000000000
--- a/src/main/webapp/WEB-INF/views/authorroles/findAuthorRolesByUserEntry.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByUserEntry" id="ff_com_labsynch_labseer_domain_AuthorRole" path="/authorroles" z="aRhRmpGcgig3jMKKGCWSyWMNiHI=">
-        <field:select disableFormBinding="true" field="userEntry" id="f_com_labsynch_labseer_domain_AuthorRole_userEntry" itemValue="id" items="${authors}" path="/authors" required="true" z="KhMPlRBE6JD3bMaxJadGwpTABbs="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/authorroles/list.jspx b/src/main/webapp/WEB-INF/views/authorroles/list.jspx
deleted file mode 100755
index d715c6fe9..000000000
--- a/src/main/webapp/WEB-INF/views/authorroles/list.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_AuthorRole" items="${authorroles}" z="fCVQ63fzju16Q+Mb7fMn+qVawU0=">
-        <table:table data="${authorroles}" id="l_com_labsynch_labseer_domain_AuthorRole" path="/authorroles" z="nBWBQeUPZCX2xTPQup0JyMGnA4I=">
-            <table:column id="c_com_labsynch_labseer_domain_AuthorRole_userEntry" property="userEntry" z="M7ra2LYyt6dJ3v9by40+ofmB/nw="/>
-            <table:column id="c_com_labsynch_labseer_domain_AuthorRole_roleEntry" property="roleEntry" z="VZb3eJETjBkIRkUqbrDu1RWZl7Q="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/authorroles/show.jspx b/src/main/webapp/WEB-INF/views/authorroles/show.jspx
deleted file mode 100755
index 3e5aa3f47..000000000
--- a/src/main/webapp/WEB-INF/views/authorroles/show.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_AuthorRole" object="${authorrole}" path="/authorroles" z="cRsi40R8n2vslfArS2FOYkHRuBY=">
-        <field:display field="userEntry" id="s_com_labsynch_labseer_domain_AuthorRole_userEntry" object="${authorrole}" z="dzfFNUlgTYHgXza2Azqw/+2Tqao="/>
-        <field:display field="roleEntry" id="s_com_labsynch_labseer_domain_AuthorRole_roleEntry" object="${authorrole}" z="6+In3bo86BRNUgFvts1MkuQ5HwE="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/authorroles/update.jspx b/src/main/webapp/WEB-INF/views/authorroles/update.jspx
deleted file mode 100755
index fcf6a1166..000000000
--- a/src/main/webapp/WEB-INF/views/authorroles/update.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_AuthorRole" modelAttribute="authorRole" path="/authorroles" versionField="Version" z="Q6L4ebw6ojfD8XPGEyC4HWXBsDQ=">
-        <field:select field="userEntry" id="c_com_labsynch_labseer_domain_AuthorRole_userEntry" itemValue="id" items="${authors}" path="/authors" required="true" z="3E6WWfXLD6xF+pf2cSh6rBje/Z0="/>
-        <field:select field="roleEntry" id="c_com_labsynch_labseer_domain_AuthorRole_roleEntry" itemValue="id" items="${lsroles}" path="/lsroles" required="true" z="duYyLZczWM3CPazDe0TMXBSPKWE="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/authorroles/views.xml b/src/main/webapp/WEB-INF/views/authorroles/views.xml
deleted file mode 100755
index 61bdb8b21..000000000
--- a/src/main/webapp/WEB-INF/views/authorroles/views.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="authorroles/list">
-        <put-attribute name="body" value="/WEB-INF/views/authorroles/list.jspx"/>
-    </definition>
-<definition extends="default" name="authorroles/show">
-        <put-attribute name="body" value="/WEB-INF/views/authorroles/show.jspx"/>
-    </definition>
-<definition extends="default" name="authorroles/create">
-        <put-attribute name="body" value="/WEB-INF/views/authorroles/create.jspx"/>
-    </definition>
-<definition extends="default" name="authorroles/update">
-        <put-attribute name="body" value="/WEB-INF/views/authorroles/update.jspx"/>
-    </definition>
-<definition extends="default" name="authorroles/findAuthorRolesByUserEntry">
-        <put-attribute name="body" value="/WEB-INF/views/authorroles/findAuthorRolesByUserEntry.jspx"/>
-    </definition>
-<definition extends="default" name="authorroles/findAuthorRolesByRoleEntry">
-        <put-attribute name="body" value="/WEB-INF/views/authorroles/findAuthorRolesByRoleEntry.jspx"/>
-    </definition>
-<definition extends="default" name="authorroles/findAuthorRolesByRoleEntryAndUserEntry">
-        <put-attribute name="body" value="/WEB-INF/views/authorroles/findAuthorRolesByRoleEntryAndUserEntry.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/authors/create.jspx b/src/main/webapp/WEB-INF/views/authors/create.jspx
deleted file mode 100755
index 91fba7ec0..000000000
--- a/src/main/webapp/WEB-INF/views/authors/create.jspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_Author" modelAttribute="author" path="/authors" render="${empty dependencies}" z="6wZT9xaoKuEYOZ0zljnLzuafx4o=">
-        <field:textarea field="firstName" id="c_com_labsynch_labseer_domain_Author_firstName" required="true" z="+CweY3nOz9RsK9se5yCsbdaFsa4="/>
-        <field:textarea field="lastName" id="c_com_labsynch_labseer_domain_Author_lastName" required="true" z="LN9JI6g+rvU3ip6ug3rG5N6PtW0="/>
-        <field:textarea field="userName" id="c_com_labsynch_labseer_domain_Author_userName" required="true" z="NGyLkXmGZf6sexoin1eSzcne7S0="/>
-        <field:textarea field="password" id="c_com_labsynch_labseer_domain_Author_password" z="hEJTRUrwrqM6ZpjdYZaSiGj8aEU="/>
-        <field:datetime dateTimePattern="${author_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_Author_recordedDate" required="true" z="w2ud4TcqYghbHGu11BcyNEW4zBQ="/>
-        <field:datetime dateTimePattern="${author_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_Author_modifiedDate" z="jGtFRtJnX81sCSAwqLrY8AaDzZ4="/>
-        <field:datetime dateTimePattern="${author_activationdate_date_format}" field="activationDate" id="c_com_labsynch_labseer_domain_Author_activationDate" z="mabBBC1VTUilgd/wmGXPtZzIqnY="/>
-        <field:input field="activationKey" id="c_com_labsynch_labseer_domain_Author_activationKey" z="uJ0/CjefPXN2tn1QJlNm+0JAp6o="/>
-        <field:checkbox field="enabled" id="c_com_labsynch_labseer_domain_Author_enabled" z="9XoGY/bER5TmgKOE7gZ6PR/OeUc="/>
-        <field:checkbox field="locked" id="c_com_labsynch_labseer_domain_Author_locked" z="8M0Ii2lZeU9ruuceiDa7ltfCnf4="/>
-        <field:simple field="authorRoles" id="c_com_labsynch_labseer_domain_Author_authorRoles" messageCode="entity_reference_not_managed" messageCodeAttribute="Author Role" z="zKF3psWZovIyMG/OUzFKOo+DroE="/>
-        <field:textarea field="emailAddress" id="c_com_labsynch_labseer_domain_Author_emailAddress" required="true" validationMessageCode="field_invalid_email" z="4vf7NdUlhFgYUCJdCnwAmc1tr2c="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_Author_lsType" required="true" z="G73YIpg5SYNvr4p16aTJ5KxDLzc="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_Author_lsKind" required="true" z="RjFHi52naLc0tnhOKtVLZDteSpY="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_Author_lsTypeAndKind" z="QoUzRGCfCLz+L+qE5bupunFN1ag="/>
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_Author_codeName" z="p6lKn1DiZtq9OPgLnVNuEOLW73g="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_Author_recordedBy" required="true" z="cHiGaCdzR1VIJiL7rwSe/CKAflw="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_Author_modifiedBy" z="PGov3CnwxuYfQUpO2aea5AcoavQ="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_Author_ignored" z="g0UrRbrTiXYOuPOu5GonQaB7NiI="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_Author_deleted" z="4p4nr9sv+Tiad6hqEbi84KcVGw4="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_Author_lsTransaction" validationMessageCode="field_invalid_integer" z="rFJw8hnMH62K5846nuolmglUUbk="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_Author_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="X1Xh6o5jO6I3rpNn+v01DYQbnjU="/>
-        <field:simple field="lsStates" id="c_com_labsynch_labseer_domain_Author_lsStates" messageCode="entity_reference_not_managed" messageCodeAttribute="Author State" z="Oo/9YCDp2ZqgPR6urCnwtEqr6+Y="/>
-        <field:simple field="lsLabels" id="c_com_labsynch_labseer_domain_Author_lsLabels" messageCode="entity_reference_not_managed" messageCodeAttribute="Author Label" z="JFe5EmVXw1We53osmQ6FfJgrJso="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_Author" render="${not empty dependencies}" z="Wyt/QjLdKUJcE+ifOgXMERYhr1c="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/authors/findAuthorsByActivationKeyAndEmailAddress.jspx b/src/main/webapp/WEB-INF/views/authors/findAuthorsByActivationKeyAndEmailAddress.jspx
deleted file mode 100755
index 864bedc30..000000000
--- a/src/main/webapp/WEB-INF/views/authors/findAuthorsByActivationKeyAndEmailAddress.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByActivationKeyAndEmailAddress" id="ff_com_labsynch_labseer_domain_Author" path="/authors" z="kl89+XgKwRUoYg1LExJqUmax9h0=">
-        <field:input disableFormBinding="true" field="activationKey" id="f_com_labsynch_labseer_domain_Author_activationKey" required="true" z="4Wb7pL/dTnxKxUohFkOZP37ZG6M="/>
-        <field:input disableFormBinding="true" field="emailAddress" id="f_com_labsynch_labseer_domain_Author_emailAddress" max="255" required="true" validationMessageCode="field_invalid_email" z="BXaYJT0clSzyWLSNrAgmnFNc6Og="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/authors/findAuthorsByEmailAddress.jspx b/src/main/webapp/WEB-INF/views/authors/findAuthorsByEmailAddress.jspx
deleted file mode 100755
index 36159823d..000000000
--- a/src/main/webapp/WEB-INF/views/authors/findAuthorsByEmailAddress.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByEmailAddress" id="ff_com_labsynch_labseer_domain_Author" path="/authors" z="RMWPHCFL7nbENM/6wXNwA8A+ItM=">
-        <field:input disableFormBinding="true" field="emailAddress" id="f_com_labsynch_labseer_domain_Author_emailAddress" max="255" required="true" validationMessageCode="field_invalid_email" z="BXaYJT0clSzyWLSNrAgmnFNc6Og="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/authors/findAuthorsByUserName.jspx b/src/main/webapp/WEB-INF/views/authors/findAuthorsByUserName.jspx
deleted file mode 100755
index a55a3e380..000000000
--- a/src/main/webapp/WEB-INF/views/authors/findAuthorsByUserName.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByUserName" id="ff_com_labsynch_labseer_domain_Author" path="/authors" z="+WQsBM6LIK7FAjID2UPCOgYn6h8=">
-        <field:input disableFormBinding="true" field="userName" id="f_com_labsynch_labseer_domain_Author_userName" max="255" required="true" z="EpmqVZ2viyCKj7FG/iNsM8jVE+4="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/authors/list.jspx b/src/main/webapp/WEB-INF/views/authors/list.jspx
deleted file mode 100755
index 35be68df4..000000000
--- a/src/main/webapp/WEB-INF/views/authors/list.jspx
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_Author" items="${authors}" z="K1IwmrSxJvtea7+DRiZDJKtwtco=">
-        <table:table data="${authors}" id="l_com_labsynch_labseer_domain_Author" path="/authors" z="inDUknSGrR5cGC+IbUlGIsZqAiY=">
-            <table:column date="true" dateTimePattern="${author_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_Author_recordedDate" property="recordedDate" z="HPZ+hViCfn1Lksb5MDsfFyHl+N4="/>
-            <table:column id="c_com_labsynch_labseer_domain_Author_password" property="password" render="false" z="user-managed"/>
-            <table:column id="c_com_labsynch_labseer_domain_Author_lsType" property="lsType" z="lCjawcymBZ/JxUDVz9fSYmT91Q0="/>
-            <table:column id="c_com_labsynch_labseer_domain_Author_lsKind" property="lsKind" z="irscVv0E9EMOy39OO14eaZTcRCM="/>
-            <table:column id="c_com_labsynch_labseer_domain_Author_lsTypeAndKind" property="lsTypeAndKind" z="mKAoLXkwtyjvRaSLLi6au/rra9Y="/>
-            <table:column id="c_com_labsynch_labseer_domain_Author_codeName" property="codeName" z="vqV/PZud+ZWjeTD22i3tAGDtv5M="/>
-            <table:column id="c_com_labsynch_labseer_domain_Author_recordedBy" property="recordedBy" z="YTstwZiGsBlI1Vo7SOaktUK6DoA="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/authors/show.jspx b/src/main/webapp/WEB-INF/views/authors/show.jspx
deleted file mode 100755
index 132946e42..000000000
--- a/src/main/webapp/WEB-INF/views/authors/show.jspx
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_Author" object="${author}" path="/authors" z="L6lWnBwSi2bzpRRjk6YDceDEiWo=">
-        <field:display field="firstName" id="s_com_labsynch_labseer_domain_Author_firstName" object="${author}" z="7N1LvD24O4jOsYpWL45tAurW9XM="/>
-        <field:display field="lastName" id="s_com_labsynch_labseer_domain_Author_lastName" object="${author}" z="WgjH/CDul1jYm9phQ7TViXpwKf4="/>
-        <field:display field="userName" id="s_com_labsynch_labseer_domain_Author_userName" object="${author}" z="MrnWu5l6/D4RaRYky8Cf0mOAZkU="/>
-        <field:display field="password" id="s_com_labsynch_labseer_domain_Author_password" object="${author}" render="false" z="user-managed"/>
-        <field:display date="true" dateTimePattern="${author_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_Author_recordedDate" object="${author}" z="G3am9PHb6hSyyJ1w7Y4pRx/3wXk="/>
-        <field:display date="true" dateTimePattern="${author_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_Author_modifiedDate" object="${author}" z="dF8ktY+b3rIITma5qUr4PQXiWRw="/>
-        <field:display date="true" dateTimePattern="${author_activationdate_date_format}" field="activationDate" id="s_com_labsynch_labseer_domain_Author_activationDate" object="${author}" z="o1NALZdtl9bpD3QC96YMt3Z5NlA="/>
-        <field:display field="activationKey" id="s_com_labsynch_labseer_domain_Author_activationKey" object="${author}" render="false" z="user-managed"/>
-        <field:display field="enabled" id="s_com_labsynch_labseer_domain_Author_enabled" object="${author}" z="j+62edaaHq32iJBk8T/XzIQf25k="/>
-        <field:display field="locked" id="s_com_labsynch_labseer_domain_Author_locked" object="${author}" z="mukjkMKfXtQdWpAThQT+gHJjy00="/>
-        <field:display field="emailAddress" id="s_com_labsynch_labseer_domain_Author_emailAddress" object="${author}" z="b3w5VZzB/poqDY09MMLAYwhfSgw="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_Author_lsType" object="${author}" z="w9COGhkmAHZchoyhWG2FOzBbRmw="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_Author_lsKind" object="${author}" z="s1d0lueIwdTc8rruGEYgSpeXcFY="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_Author_lsTypeAndKind" object="${author}" z="CXEQKObJfg6ZfWhVqOaFzQxhTVs="/>
-        <field:display field="codeName" id="s_com_labsynch_labseer_domain_Author_codeName" object="${author}" z="qGqhgC/sgHBdxWCkzV/P4yb1tpo="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_Author_recordedBy" object="${author}" z="y6zQ8qZGcAvC5bYfdO03piR/LEY="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_Author_modifiedBy" object="${author}" z="oMQeBSWQmIKMxzdYkZi5rxXj98k="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_Author_ignored" object="${author}" z="gNCRL9EJms4T7gaNLQMQqcOIAwI="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_Author_deleted" object="${author}" z="1GXUTTbA7Iu48S78m0UXScXuTMg="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_Author_lsTransaction" object="${author}" z="OhaQu+ThdCnjaoMSunKNMcikOgM="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/authors/update.jspx b/src/main/webapp/WEB-INF/views/authors/update.jspx
deleted file mode 100755
index f14430f9d..000000000
--- a/src/main/webapp/WEB-INF/views/authors/update.jspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_Author" modelAttribute="author" path="/authors" versionField="Version" z="74SATn4hjSB9Z+IbmAN1ILKXZT0=">
-        <field:textarea field="firstName" id="c_com_labsynch_labseer_domain_Author_firstName" required="true" z="+CweY3nOz9RsK9se5yCsbdaFsa4="/>
-        <field:textarea field="lastName" id="c_com_labsynch_labseer_domain_Author_lastName" required="true" z="LN9JI6g+rvU3ip6ug3rG5N6PtW0="/>
-        <field:textarea field="userName" id="c_com_labsynch_labseer_domain_Author_userName" required="true" z="NGyLkXmGZf6sexoin1eSzcne7S0="/>
-        <field:textarea field="password" id="c_com_labsynch_labseer_domain_Author_password" z="hEJTRUrwrqM6ZpjdYZaSiGj8aEU="/>
-        <field:datetime dateTimePattern="${author_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_Author_recordedDate" required="true" z="w2ud4TcqYghbHGu11BcyNEW4zBQ="/>
-        <field:datetime dateTimePattern="${author_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_Author_modifiedDate" z="jGtFRtJnX81sCSAwqLrY8AaDzZ4="/>
-        <field:datetime dateTimePattern="${author_activationdate_date_format}" field="activationDate" id="c_com_labsynch_labseer_domain_Author_activationDate" z="mabBBC1VTUilgd/wmGXPtZzIqnY="/>
-        <field:input field="activationKey" id="c_com_labsynch_labseer_domain_Author_activationKey" z="uJ0/CjefPXN2tn1QJlNm+0JAp6o="/>
-        <field:checkbox field="enabled" id="c_com_labsynch_labseer_domain_Author_enabled" z="9XoGY/bER5TmgKOE7gZ6PR/OeUc="/>
-        <field:checkbox field="locked" id="c_com_labsynch_labseer_domain_Author_locked" z="8M0Ii2lZeU9ruuceiDa7ltfCnf4="/>
-        <field:simple field="authorRoles" id="c_com_labsynch_labseer_domain_Author_authorRoles" messageCode="entity_reference_not_managed" messageCodeAttribute="Author Role" z="zKF3psWZovIyMG/OUzFKOo+DroE="/>
-        <field:textarea field="emailAddress" id="c_com_labsynch_labseer_domain_Author_emailAddress" required="true" validationMessageCode="field_invalid_email" z="4vf7NdUlhFgYUCJdCnwAmc1tr2c="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_Author_lsType" required="true" z="G73YIpg5SYNvr4p16aTJ5KxDLzc="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_Author_lsKind" required="true" z="RjFHi52naLc0tnhOKtVLZDteSpY="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_Author_lsTypeAndKind" z="QoUzRGCfCLz+L+qE5bupunFN1ag="/>
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_Author_codeName" z="p6lKn1DiZtq9OPgLnVNuEOLW73g="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_Author_recordedBy" required="true" z="cHiGaCdzR1VIJiL7rwSe/CKAflw="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_Author_modifiedBy" z="PGov3CnwxuYfQUpO2aea5AcoavQ="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_Author_ignored" z="g0UrRbrTiXYOuPOu5GonQaB7NiI="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_Author_deleted" z="4p4nr9sv+Tiad6hqEbi84KcVGw4="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_Author_lsTransaction" validationMessageCode="field_invalid_integer" z="rFJw8hnMH62K5846nuolmglUUbk="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_Author_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="X1Xh6o5jO6I3rpNn+v01DYQbnjU="/>
-        <field:simple field="lsStates" id="c_com_labsynch_labseer_domain_Author_lsStates" messageCode="entity_reference_not_managed" messageCodeAttribute="Author State" z="Oo/9YCDp2ZqgPR6urCnwtEqr6+Y="/>
-        <field:simple field="lsLabels" id="c_com_labsynch_labseer_domain_Author_lsLabels" messageCode="entity_reference_not_managed" messageCodeAttribute="Author Label" z="JFe5EmVXw1We53osmQ6FfJgrJso="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/authors/views.xml b/src/main/webapp/WEB-INF/views/authors/views.xml
deleted file mode 100755
index da0d7a23b..000000000
--- a/src/main/webapp/WEB-INF/views/authors/views.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="authors/list">
-        <put-attribute name="body" value="/WEB-INF/views/authors/list.jspx"/>
-    </definition>
-<definition extends="default" name="authors/show">
-        <put-attribute name="body" value="/WEB-INF/views/authors/show.jspx"/>
-    </definition>
-<definition extends="default" name="authors/create">
-        <put-attribute name="body" value="/WEB-INF/views/authors/create.jspx"/>
-    </definition>
-<definition extends="default" name="authors/update">
-        <put-attribute name="body" value="/WEB-INF/views/authors/update.jspx"/>
-    </definition>
-<definition extends="default" name="authors/findAuthorsByActivationKeyAndEmailAddress">
-        <put-attribute name="body" value="/WEB-INF/views/authors/findAuthorsByActivationKeyAndEmailAddress.jspx"/>
-    </definition>
-<definition extends="default" name="authors/findAuthorsByEmailAddress">
-        <put-attribute name="body" value="/WEB-INF/views/authors/findAuthorsByEmailAddress.jspx"/>
-    </definition>
-<definition extends="default" name="authors/findAuthorsByUserName">
-        <put-attribute name="body" value="/WEB-INF/views/authors/findAuthorsByUserName.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/authorstates/create.jspx b/src/main/webapp/WEB-INF/views/authorstates/create.jspx
deleted file mode 100644
index 48988120f..000000000
--- a/src/main/webapp/WEB-INF/views/authorstates/create.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_AuthorState" modelAttribute="authorState" path="/authorstates" render="${empty dependencies}" z="HXVfBMFJJSxBWhbcvio2f0ywKHk=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_AuthorState_recordedBy" required="true" z="lcCEc07HW+9roHBGx/2H/fv7z58="/>
-        <field:datetime dateTimePattern="${authorState_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_AuthorState_recordedDate" required="true" z="tKwuNyWHyU8O9ffqF/xSG8M2OnM="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_AuthorState_modifiedBy" z="x3LMGYyhivg2kpB2E9bTEo+10xM="/>
-        <field:datetime dateTimePattern="${authorState_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_AuthorState_modifiedDate" z="8LsV20ftpCZ8aYYM9hduk0H2Onk="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_AuthorState_lsType" required="true" z="YcTMUw2UPPnP08Aw7K7MJyTX2BY="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_AuthorState_lsKind" required="true" z="TGH5/0usv58/PdiDopbdwHlHwKs="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_AuthorState_lsTypeAndKind" z="o+NXCBhVJ76ccAxSIM75cIUCAJs="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_AuthorState_comments" z="7tCpVkjlE6W9VhHwHCHKHgWo+YI="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_AuthorState_ignored" z="N/bhix0G/HSf6s7at1myZVo/DpQ="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_AuthorState_deleted" z="AmXh5kPL/BM3EysUumbEgG5kDKQ="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_AuthorState_lsTransaction" validationMessageCode="field_invalid_integer" z="a+wUfvefrIRfRiylU9X/00/eqQ0="/>
-        <field:select field="author" id="c_com_labsynch_labseer_domain_AuthorState_author" itemValue="id" items="${authors}" path="/authors" required="true" z="U4MkuRsj+MY0U4Z2xYPBlwIW2Qk="/>
-        <field:simple field="lsValues" id="c_com_labsynch_labseer_domain_AuthorState_lsValues" messageCode="entity_reference_not_managed" messageCodeAttribute="Author Value" z="B47iiRjcjNBpRELaTRTj92cFNlM="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_AuthorState" render="${not empty dependencies}" z="RXso3h9yzmVom610WpZxe/B1tsQ="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/authorstates/list.jspx b/src/main/webapp/WEB-INF/views/authorstates/list.jspx
deleted file mode 100644
index a3a079f04..000000000
--- a/src/main/webapp/WEB-INF/views/authorstates/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_AuthorState" items="${authorstates}" z="DoVtWKUw2W615UtxkJ7tD9+vxsQ=">
-        <table:table data="${authorstates}" id="l_com_labsynch_labseer_domain_AuthorState" path="/authorstates" z="MjCB6cwKNPK047Y60zpGAEXVI54=">
-            <table:column id="c_com_labsynch_labseer_domain_AuthorState_recordedBy" property="recordedBy" z="c8ZqM6Ww6ZnvJhmoodo83fc8ZxE="/>
-            <table:column date="true" dateTimePattern="${authorState_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_AuthorState_recordedDate" property="recordedDate" z="8h36d+Ahy82SzCEIxzasXzUyaUg="/>
-            <table:column id="c_com_labsynch_labseer_domain_AuthorState_modifiedBy" property="modifiedBy" z="NYYO12pYQJGzD7JF8P2+WmN1JUE="/>
-            <table:column date="true" dateTimePattern="${authorState_modifieddate_date_format}" id="c_com_labsynch_labseer_domain_AuthorState_modifiedDate" property="modifiedDate" z="OUv7/3pg2FwCEVfsHmcYp52vMIM="/>
-            <table:column id="c_com_labsynch_labseer_domain_AuthorState_lsType" property="lsType" z="xFRHqRLgUSJ6tB+8Yo4NwtBw1aI="/>
-            <table:column id="c_com_labsynch_labseer_domain_AuthorState_lsKind" property="lsKind" z="Tffd7oCRXmfbusrBoIUYmx76XXU="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/authorstates/show.jspx b/src/main/webapp/WEB-INF/views/authorstates/show.jspx
deleted file mode 100644
index 365e6d8ec..000000000
--- a/src/main/webapp/WEB-INF/views/authorstates/show.jspx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_AuthorState" object="${authorstate}" path="/authorstates" z="VZtzXzkHLi9le9VR6TZ4OGS3BSw=">
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_AuthorState_recordedBy" object="${authorstate}" z="GXPBiGBeTEWB9FCGXW3Gk7TpcB8="/>
-        <field:display date="true" dateTimePattern="${authorState_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_AuthorState_recordedDate" object="${authorstate}" z="jxANhcbqQZ31H+8pTuW9viRVlHo="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_AuthorState_modifiedBy" object="${authorstate}" z="6FaXIS14f+BLS9PW4ZNjteHLwCY="/>
-        <field:display date="true" dateTimePattern="${authorState_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_AuthorState_modifiedDate" object="${authorstate}" z="kgKj5nlOttTx/gdFXYkFzYr8cjQ="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_AuthorState_lsType" object="${authorstate}" z="og542Mysa5Vwsf8RQfWYw9/L1pg="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_AuthorState_lsKind" object="${authorstate}" z="fI+BBQvC/sT0xOwe4gqcFagbJ+0="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_AuthorState_lsTypeAndKind" object="${authorstate}" z="gwQdGv5ZzzeN4W9mOvwgm4ekHDg="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_AuthorState_comments" object="${authorstate}" z="Ne2cTkf7H+qDkZnrXS6/DaZWV4E="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_AuthorState_ignored" object="${authorstate}" z="UC/KavtQsC9cJ8TCg1zyZM6QWnI="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_AuthorState_deleted" object="${authorstate}" z="9N38ngcy+ZlPzUPddHwdpiHnqeM="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_AuthorState_lsTransaction" object="${authorstate}" z="BWx+H+WgcSLL6suWARPO9DPSUAU="/>
-        <field:display field="author" id="s_com_labsynch_labseer_domain_AuthorState_author" object="${authorstate}" z="gt60dSO3Rz6IVWQEw/Edh6qn4UY="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/authorstates/update.jspx b/src/main/webapp/WEB-INF/views/authorstates/update.jspx
deleted file mode 100644
index 0761d0315..000000000
--- a/src/main/webapp/WEB-INF/views/authorstates/update.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_AuthorState" modelAttribute="authorState" path="/authorstates" versionField="Version" z="TWpSPIsRXJgwYLaq59hTY9PXGI8=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_AuthorState_recordedBy" required="true" z="lcCEc07HW+9roHBGx/2H/fv7z58="/>
-        <field:datetime dateTimePattern="${authorState_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_AuthorState_recordedDate" required="true" z="tKwuNyWHyU8O9ffqF/xSG8M2OnM="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_AuthorState_modifiedBy" z="x3LMGYyhivg2kpB2E9bTEo+10xM="/>
-        <field:datetime dateTimePattern="${authorState_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_AuthorState_modifiedDate" z="8LsV20ftpCZ8aYYM9hduk0H2Onk="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_AuthorState_lsType" required="true" z="YcTMUw2UPPnP08Aw7K7MJyTX2BY="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_AuthorState_lsKind" required="true" z="TGH5/0usv58/PdiDopbdwHlHwKs="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_AuthorState_lsTypeAndKind" z="o+NXCBhVJ76ccAxSIM75cIUCAJs="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_AuthorState_comments" z="7tCpVkjlE6W9VhHwHCHKHgWo+YI="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_AuthorState_ignored" z="N/bhix0G/HSf6s7at1myZVo/DpQ="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_AuthorState_deleted" z="AmXh5kPL/BM3EysUumbEgG5kDKQ="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_AuthorState_lsTransaction" validationMessageCode="field_invalid_integer" z="a+wUfvefrIRfRiylU9X/00/eqQ0="/>
-        <field:select field="author" id="c_com_labsynch_labseer_domain_AuthorState_author" itemValue="id" items="${authors}" path="/authors" required="true" z="U4MkuRsj+MY0U4Z2xYPBlwIW2Qk="/>
-        <field:simple field="lsValues" id="c_com_labsynch_labseer_domain_AuthorState_lsValues" messageCode="entity_reference_not_managed" messageCodeAttribute="Author Value" z="B47iiRjcjNBpRELaTRTj92cFNlM="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/authorstates/views.xml b/src/main/webapp/WEB-INF/views/authorstates/views.xml
deleted file mode 100644
index 8f6395d77..000000000
--- a/src/main/webapp/WEB-INF/views/authorstates/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="authorstates/list">
-        <put-attribute name="body" value="/WEB-INF/views/authorstates/list.jspx"/>
-    </definition>
-<definition extends="default" name="authorstates/show">
-        <put-attribute name="body" value="/WEB-INF/views/authorstates/show.jspx"/>
-    </definition>
-<definition extends="default" name="authorstates/create">
-        <put-attribute name="body" value="/WEB-INF/views/authorstates/create.jspx"/>
-    </definition>
-<definition extends="default" name="authorstates/update">
-        <put-attribute name="body" value="/WEB-INF/views/authorstates/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/authorvalues/create.jspx b/src/main/webapp/WEB-INF/views/authorvalues/create.jspx
deleted file mode 100644
index b8dfa946b..000000000
--- a/src/main/webapp/WEB-INF/views/authorvalues/create.jspx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_AuthorValue" modelAttribute="authorValue" path="/authorvalues" render="${empty dependencies}" z="FjvctyJhD4GLi0RW8haaOPjnjTE=">
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_AuthorValue_ignored" z="LGBb4sV9pnlq9IxdibVVtpd+oqM="/>
-        <field:checkbox field="publicData" id="c_com_labsynch_labseer_domain_AuthorValue_publicData" z="EvqSXq1/2Ys/7YWYaeRuB1bWb+Q="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_AuthorValue_deleted" z="oE0fAKbdRM+Krx6h3dV+KmLyGwM="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_AuthorValue_lsType" required="true" z="HNuEJAtZWLystOWROZrJgABEpNw="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_AuthorValue_lsKind" required="true" z="7ZN4uxdb8aCA/7T4W98bWYoTILU="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_AuthorValue_lsTypeAndKind" z="pu7DZPax8u0RW1h8h6ghtahpObg="/>
-        <field:textarea field="codeOrigin" id="c_com_labsynch_labseer_domain_AuthorValue_codeOrigin" z="4t8kD7kNGkcFhhyNZqH8Oe8HK3c="/>
-        <field:textarea field="codeType" id="c_com_labsynch_labseer_domain_AuthorValue_codeType" z="GR21aE2oDyrTfOcF6oqcqcpCL10="/>
-        <field:textarea field="codeKind" id="c_com_labsynch_labseer_domain_AuthorValue_codeKind" z="gks95wy9pE8Vu1zHxulhjtkcfPw="/>
-        <field:textarea field="codeTypeAndKind" id="c_com_labsynch_labseer_domain_AuthorValue_codeTypeAndKind" z="dZW7FoiNv1B3xjwqWKQVzUhuOBc="/>
-        <field:textarea field="stringValue" id="c_com_labsynch_labseer_domain_AuthorValue_stringValue" z="zqhxThOVSeQ9a/pbNRh8ykxwrBQ="/>
-        <field:textarea field="codeValue" id="c_com_labsynch_labseer_domain_AuthorValue_codeValue" z="RUQfrC5+mZnn8XAt8vvfayK/19E="/>
-        <field:textarea field="fileValue" id="c_com_labsynch_labseer_domain_AuthorValue_fileValue" z="8CC79WXCK/l/FrpSXMwKua3fmOw="/>
-        <field:textarea field="urlValue" id="c_com_labsynch_labseer_domain_AuthorValue_urlValue" z="dN+6sbRR985BdFDnUHJD3+BJEHs="/>
-        <field:datetime dateTimePattern="${authorValue_datevalue_date_format}" field="dateValue" id="c_com_labsynch_labseer_domain_AuthorValue_dateValue" z="3aLPRlxusuXVY9j07iGoijrUiYs="/>
-        <field:input field="clobValue" id="c_com_labsynch_labseer_domain_AuthorValue_clobValue" z="KH0lmhf5RKrA21Uxu4Mlo6Yh60k="/>
-        <field:input field="blobValue" id="c_com_labsynch_labseer_domain_AuthorValue_blobValue" z="FXkMkevjsvJVzbRfX/xbLoadmFI="/>
-        <field:input field="operatorType" id="c_com_labsynch_labseer_domain_AuthorValue_operatorType" max="25" z="NRTzy2MfeAbgO79oyrRUpx622eI="/>
-        <field:input field="operatorKind" id="c_com_labsynch_labseer_domain_AuthorValue_operatorKind" max="10" z="WAZYnlcs2FtO6A88/Q5nIfSq+wQ="/>
-        <field:textarea field="operatorTypeAndKind" id="c_com_labsynch_labseer_domain_AuthorValue_operatorTypeAndKind" z="Flr5KEn/Efz002Gy0uc5ilUXmFc="/>
-        <field:input field="numericValue" id="c_com_labsynch_labseer_domain_AuthorValue_numericValue" validationMessageCode="field_invalid_number" z="eR+o77jxKXD3N2wQsHBw1qgAhyw="/>
-        <field:input field="sigFigs" id="c_com_labsynch_labseer_domain_AuthorValue_sigFigs" validationMessageCode="field_invalid_integer" z="Ol03BLacS9rMEbArQyM3rwTvBlo="/>
-        <field:input field="uncertainty" id="c_com_labsynch_labseer_domain_AuthorValue_uncertainty" validationMessageCode="field_invalid_number" z="2LM1yGBVnBTLgh4hS82DlpzIrSo="/>
-        <field:input field="numberOfReplicates" id="c_com_labsynch_labseer_domain_AuthorValue_numberOfReplicates" validationMessageCode="field_invalid_integer" z="QAh3Px0sySEQCtx6m6DdQoBJ24U="/>
-        <field:textarea field="uncertaintyType" id="c_com_labsynch_labseer_domain_AuthorValue_uncertaintyType" z="80qc4UqH1v2ULuGoSKJAhI8U2Ps="/>
-        <field:input field="unitType" id="c_com_labsynch_labseer_domain_AuthorValue_unitType" max="25" z="UU2XXPdrq8VpPBo/voYqWcng0yQ="/>
-        <field:input field="unitKind" id="c_com_labsynch_labseer_domain_AuthorValue_unitKind" max="25" z="3Sc9KjA23snbPEJR7VaUlFm1zqA="/>
-        <field:textarea field="unitTypeAndKind" id="c_com_labsynch_labseer_domain_AuthorValue_unitTypeAndKind" z="ZgQFePZaCB2VSoynynjvMEZFZKI="/>
-        <field:input field="concentration" id="c_com_labsynch_labseer_domain_AuthorValue_concentration" validationMessageCode="field_invalid_number" z="3F8rjdn19h/EaoEs6wHmCZyVVy4="/>
-        <field:input field="concUnit" id="c_com_labsynch_labseer_domain_AuthorValue_concUnit" max="25" z="2lFT4UcVlKVOygfuJ0YbFaLmlpA="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_AuthorValue_comments" z="7uUBfyJkYXs0Iun/eaFFm+tOi+U="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_AuthorValue_lsTransaction" validationMessageCode="field_invalid_integer" z="xEQvoKejtbNIQ3ULDOCMNlmLv6M="/>
-        <field:datetime dateTimePattern="${authorValue_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_AuthorValue_recordedDate" required="true" z="nEp0U9al4f16sw4BwWewn7Snj1Y="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_AuthorValue_recordedBy" required="true" z="uGCO5iULPWv2h2dT2ZkG+7W3tOs="/>
-        <field:datetime dateTimePattern="${authorValue_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_AuthorValue_modifiedDate" z="vlW/cKaeyM8TPtycn+XVQIkGqZ0="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_AuthorValue_modifiedBy" z="MRXVOZSlgOBhpXceX2xUOCZtelg="/>
-        <field:select field="lsState" id="c_com_labsynch_labseer_domain_AuthorValue_lsState" itemValue="id" items="${authorstates}" path="/authorstates" required="true" z="JcF7DIJ+wE0LQfhL7bE+Vgc6VuU="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_AuthorValue" render="${not empty dependencies}" z="82D5LIecDkAZhtaa9eu8Mnlztuc="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/authorvalues/list.jspx b/src/main/webapp/WEB-INF/views/authorvalues/list.jspx
deleted file mode 100644
index 03f261714..000000000
--- a/src/main/webapp/WEB-INF/views/authorvalues/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_AuthorValue" items="${authorvalues}" z="XXkFXvCMusIc9XSsoIQXDz/qkao=">
-        <table:table data="${authorvalues}" id="l_com_labsynch_labseer_domain_AuthorValue" path="/authorvalues" z="8CCxtAAMihssDYiFMgpIbjVfQT4=">
-            <table:column id="c_com_labsynch_labseer_domain_AuthorValue_ignored" property="ignored" z="DKSh35V54+CBvap+d/fOlxQMqhs="/>
-            <table:column id="c_com_labsynch_labseer_domain_AuthorValue_publicData" property="publicData" z="VyfZ9OZeek0EAmwrsfPJrXqfVOw="/>
-            <table:column id="c_com_labsynch_labseer_domain_AuthorValue_deleted" property="deleted" z="J0eqMol2YG5GX1A6R/EY3UVaYeI="/>
-            <table:column id="c_com_labsynch_labseer_domain_AuthorValue_lsType" property="lsType" z="h9nDiuLwdQZkQeOk5xTAlFrBSsU="/>
-            <table:column id="c_com_labsynch_labseer_domain_AuthorValue_lsKind" property="lsKind" z="QhQzD/6hDWV0cLhsFaPAPNiwkTE="/>
-            <table:column id="c_com_labsynch_labseer_domain_AuthorValue_lsTypeAndKind" property="lsTypeAndKind" z="Gv8hUXe1p43wVHJ9gIM/z8Vo4Wo="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/authorvalues/show.jspx b/src/main/webapp/WEB-INF/views/authorvalues/show.jspx
deleted file mode 100644
index c050945c7..000000000
--- a/src/main/webapp/WEB-INF/views/authorvalues/show.jspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_AuthorValue" object="${authorvalue}" path="/authorvalues" z="2jFHxDhDWUM4mS9f2VGhD2V2RCY=">
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_AuthorValue_ignored" object="${authorvalue}" z="IBr/RurOWZ2cdyJo3HLDWPR9XZE="/>
-        <field:display field="publicData" id="s_com_labsynch_labseer_domain_AuthorValue_publicData" object="${authorvalue}" z="2lfJKxFRUwWt6urGmBWWtiCWSqs="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_AuthorValue_deleted" object="${authorvalue}" z="1O9rkk+Qs80bwD9KmHUc6yhHQo4="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_AuthorValue_lsType" object="${authorvalue}" z="zSflTWLtfsbPkkQxkayRxg6NCoM="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_AuthorValue_lsKind" object="${authorvalue}" z="xRk1eSNf/qeoK/5BHUKdl+YvEBw="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_AuthorValue_lsTypeAndKind" object="${authorvalue}" z="OunyRpcEuN6kGnIbiLGFLbwc7hQ="/>
-        <field:display field="codeOrigin" id="s_com_labsynch_labseer_domain_AuthorValue_codeOrigin" object="${authorvalue}" z="vyK06IHVsMn9J9bbUBVx4TBO5BM="/>
-        <field:display field="codeType" id="s_com_labsynch_labseer_domain_AuthorValue_codeType" object="${authorvalue}" z="5oRMD7tg5rgFb7hhRY2vdDF1VQk="/>
-        <field:display field="codeKind" id="s_com_labsynch_labseer_domain_AuthorValue_codeKind" object="${authorvalue}" z="cumsxWdo8KzshnbYMFRlnGoYmTI="/>
-        <field:display field="codeTypeAndKind" id="s_com_labsynch_labseer_domain_AuthorValue_codeTypeAndKind" object="${authorvalue}" z="envnDFAzf6uNg4c16X+mCQU4LQQ="/>
-        <field:display field="stringValue" id="s_com_labsynch_labseer_domain_AuthorValue_stringValue" object="${authorvalue}" z="ESIMd40+f++LnZEXHd28OETndno="/>
-        <field:display field="codeValue" id="s_com_labsynch_labseer_domain_AuthorValue_codeValue" object="${authorvalue}" z="TNtb+CI3f8qs6MG6cFiru5HWmOs="/>
-        <field:display field="fileValue" id="s_com_labsynch_labseer_domain_AuthorValue_fileValue" object="${authorvalue}" z="lNwu8kWe7xDdWvVwnf7sJO2VBTM="/>
-        <field:display field="urlValue" id="s_com_labsynch_labseer_domain_AuthorValue_urlValue" object="${authorvalue}" z="S52JMVtHBAq58PQJP806hwu+Xes="/>
-        <field:display date="true" dateTimePattern="${authorValue_datevalue_date_format}" field="dateValue" id="s_com_labsynch_labseer_domain_AuthorValue_dateValue" object="${authorvalue}" z="W2thSOlFqkoyw1DveBK+6N4vzQ4="/>
-        <field:display field="clobValue" id="s_com_labsynch_labseer_domain_AuthorValue_clobValue" object="${authorvalue}" z="NvoEpdVqCD8DXsmYZf2N2bbb2/4="/>
-        <field:display field="blobValue" id="s_com_labsynch_labseer_domain_AuthorValue_blobValue" object="${authorvalue}" z="pEytTF2qICAqMVLxpeM/SbKe+/w="/>
-        <field:display field="operatorType" id="s_com_labsynch_labseer_domain_AuthorValue_operatorType" object="${authorvalue}" z="MfgSKp+lvExzO5csv+cS5xZjLEs="/>
-        <field:display field="operatorKind" id="s_com_labsynch_labseer_domain_AuthorValue_operatorKind" object="${authorvalue}" z="zFDzYs8c0c+BL4+UoOTV4tys3Co="/>
-        <field:display field="operatorTypeAndKind" id="s_com_labsynch_labseer_domain_AuthorValue_operatorTypeAndKind" object="${authorvalue}" z="v8srmvT7YLd+yLWpzHBjgkso4Ws="/>
-        <field:display field="numericValue" id="s_com_labsynch_labseer_domain_AuthorValue_numericValue" object="${authorvalue}" z="4U7GSmlsVI13/NCyj8TyvAF1fko="/>
-        <field:display field="sigFigs" id="s_com_labsynch_labseer_domain_AuthorValue_sigFigs" object="${authorvalue}" z="nuv0FgtvP53ig87j722UIGmgF7U="/>
-        <field:display field="uncertainty" id="s_com_labsynch_labseer_domain_AuthorValue_uncertainty" object="${authorvalue}" z="1JbU3elDM17/NJgKR2Dhw6aHAyc="/>
-        <field:display field="numberOfReplicates" id="s_com_labsynch_labseer_domain_AuthorValue_numberOfReplicates" object="${authorvalue}" z="A9WWvq1+m5citNgtiiX7ZkNIETU="/>
-        <field:display field="uncertaintyType" id="s_com_labsynch_labseer_domain_AuthorValue_uncertaintyType" object="${authorvalue}" z="0xsHoIZRUQsEbTPr0xud3I3qJ10="/>
-        <field:display field="unitType" id="s_com_labsynch_labseer_domain_AuthorValue_unitType" object="${authorvalue}" z="QYnb+oSQBV9BdA1NS7zY8JAx0Pc="/>
-        <field:display field="unitKind" id="s_com_labsynch_labseer_domain_AuthorValue_unitKind" object="${authorvalue}" z="b9IcU4qOwpyKXurhwAGN+DR4OsE="/>
-        <field:display field="unitTypeAndKind" id="s_com_labsynch_labseer_domain_AuthorValue_unitTypeAndKind" object="${authorvalue}" z="ByWHIss6rl1QK9EZFhFsujvRSQ8="/>
-        <field:display field="concentration" id="s_com_labsynch_labseer_domain_AuthorValue_concentration" object="${authorvalue}" z="yriJXzNY18oppWRG1/pQWg6sV5o="/>
-        <field:display field="concUnit" id="s_com_labsynch_labseer_domain_AuthorValue_concUnit" object="${authorvalue}" z="cYkSDhqE0csUYjZ/T4YCQvjBHIg="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_AuthorValue_comments" object="${authorvalue}" z="OXkmyzhmag/qRGUvlwW9Gm55SVw="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_AuthorValue_lsTransaction" object="${authorvalue}" z="tjAS3GmnxdmJJcaAoyJ9nTh4dzw="/>
-        <field:display date="true" dateTimePattern="${authorValue_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_AuthorValue_recordedDate" object="${authorvalue}" z="Xo/ocxgkreYmOaV+BVf2CLzonY0="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_AuthorValue_recordedBy" object="${authorvalue}" z="Ki5F6D3xFh445/RP3bLz01f1Pz4="/>
-        <field:display date="true" dateTimePattern="${authorValue_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_AuthorValue_modifiedDate" object="${authorvalue}" z="2GWYIuPaIBphLiPuuPO2Ut7xHgE="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_AuthorValue_modifiedBy" object="${authorvalue}" z="Du1X5vkGuinHgBepB4aGIjpqnFA="/>
-        <field:display field="lsState" id="s_com_labsynch_labseer_domain_AuthorValue_lsState" object="${authorvalue}" z="hH3BFGcjDokmlkbIMfz1jWVu1Bc="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/authorvalues/update.jspx b/src/main/webapp/WEB-INF/views/authorvalues/update.jspx
deleted file mode 100644
index 55b4fa6ae..000000000
--- a/src/main/webapp/WEB-INF/views/authorvalues/update.jspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_AuthorValue" modelAttribute="authorValue" path="/authorvalues" versionField="Version" z="SQEnwm/3+/6ct0bncreFInUBXd4=">
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_AuthorValue_ignored" z="LGBb4sV9pnlq9IxdibVVtpd+oqM="/>
-        <field:checkbox field="publicData" id="c_com_labsynch_labseer_domain_AuthorValue_publicData" z="EvqSXq1/2Ys/7YWYaeRuB1bWb+Q="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_AuthorValue_deleted" z="oE0fAKbdRM+Krx6h3dV+KmLyGwM="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_AuthorValue_lsType" required="true" z="HNuEJAtZWLystOWROZrJgABEpNw="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_AuthorValue_lsKind" required="true" z="7ZN4uxdb8aCA/7T4W98bWYoTILU="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_AuthorValue_lsTypeAndKind" z="pu7DZPax8u0RW1h8h6ghtahpObg="/>
-        <field:textarea field="codeOrigin" id="c_com_labsynch_labseer_domain_AuthorValue_codeOrigin" z="4t8kD7kNGkcFhhyNZqH8Oe8HK3c="/>
-        <field:textarea field="codeType" id="c_com_labsynch_labseer_domain_AuthorValue_codeType" z="GR21aE2oDyrTfOcF6oqcqcpCL10="/>
-        <field:textarea field="codeKind" id="c_com_labsynch_labseer_domain_AuthorValue_codeKind" z="gks95wy9pE8Vu1zHxulhjtkcfPw="/>
-        <field:textarea field="codeTypeAndKind" id="c_com_labsynch_labseer_domain_AuthorValue_codeTypeAndKind" z="dZW7FoiNv1B3xjwqWKQVzUhuOBc="/>
-        <field:textarea field="stringValue" id="c_com_labsynch_labseer_domain_AuthorValue_stringValue" z="zqhxThOVSeQ9a/pbNRh8ykxwrBQ="/>
-        <field:textarea field="codeValue" id="c_com_labsynch_labseer_domain_AuthorValue_codeValue" z="RUQfrC5+mZnn8XAt8vvfayK/19E="/>
-        <field:textarea field="fileValue" id="c_com_labsynch_labseer_domain_AuthorValue_fileValue" z="8CC79WXCK/l/FrpSXMwKua3fmOw="/>
-        <field:textarea field="urlValue" id="c_com_labsynch_labseer_domain_AuthorValue_urlValue" z="dN+6sbRR985BdFDnUHJD3+BJEHs="/>
-        <field:datetime dateTimePattern="${authorValue_datevalue_date_format}" field="dateValue" id="c_com_labsynch_labseer_domain_AuthorValue_dateValue" z="3aLPRlxusuXVY9j07iGoijrUiYs="/>
-        <field:input field="clobValue" id="c_com_labsynch_labseer_domain_AuthorValue_clobValue" z="KH0lmhf5RKrA21Uxu4Mlo6Yh60k="/>
-        <field:input field="blobValue" id="c_com_labsynch_labseer_domain_AuthorValue_blobValue" z="FXkMkevjsvJVzbRfX/xbLoadmFI="/>
-        <field:input field="operatorType" id="c_com_labsynch_labseer_domain_AuthorValue_operatorType" max="25" z="NRTzy2MfeAbgO79oyrRUpx622eI="/>
-        <field:input field="operatorKind" id="c_com_labsynch_labseer_domain_AuthorValue_operatorKind" max="10" z="WAZYnlcs2FtO6A88/Q5nIfSq+wQ="/>
-        <field:textarea field="operatorTypeAndKind" id="c_com_labsynch_labseer_domain_AuthorValue_operatorTypeAndKind" z="Flr5KEn/Efz002Gy0uc5ilUXmFc="/>
-        <field:input field="numericValue" id="c_com_labsynch_labseer_domain_AuthorValue_numericValue" validationMessageCode="field_invalid_number" z="eR+o77jxKXD3N2wQsHBw1qgAhyw="/>
-        <field:input field="sigFigs" id="c_com_labsynch_labseer_domain_AuthorValue_sigFigs" validationMessageCode="field_invalid_integer" z="Ol03BLacS9rMEbArQyM3rwTvBlo="/>
-        <field:input field="uncertainty" id="c_com_labsynch_labseer_domain_AuthorValue_uncertainty" validationMessageCode="field_invalid_number" z="2LM1yGBVnBTLgh4hS82DlpzIrSo="/>
-        <field:input field="numberOfReplicates" id="c_com_labsynch_labseer_domain_AuthorValue_numberOfReplicates" validationMessageCode="field_invalid_integer" z="QAh3Px0sySEQCtx6m6DdQoBJ24U="/>
-        <field:textarea field="uncertaintyType" id="c_com_labsynch_labseer_domain_AuthorValue_uncertaintyType" z="80qc4UqH1v2ULuGoSKJAhI8U2Ps="/>
-        <field:input field="unitType" id="c_com_labsynch_labseer_domain_AuthorValue_unitType" max="25" z="UU2XXPdrq8VpPBo/voYqWcng0yQ="/>
-        <field:input field="unitKind" id="c_com_labsynch_labseer_domain_AuthorValue_unitKind" max="25" z="3Sc9KjA23snbPEJR7VaUlFm1zqA="/>
-        <field:textarea field="unitTypeAndKind" id="c_com_labsynch_labseer_domain_AuthorValue_unitTypeAndKind" z="ZgQFePZaCB2VSoynynjvMEZFZKI="/>
-        <field:input field="concentration" id="c_com_labsynch_labseer_domain_AuthorValue_concentration" validationMessageCode="field_invalid_number" z="3F8rjdn19h/EaoEs6wHmCZyVVy4="/>
-        <field:input field="concUnit" id="c_com_labsynch_labseer_domain_AuthorValue_concUnit" max="25" z="2lFT4UcVlKVOygfuJ0YbFaLmlpA="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_AuthorValue_comments" z="7uUBfyJkYXs0Iun/eaFFm+tOi+U="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_AuthorValue_lsTransaction" validationMessageCode="field_invalid_integer" z="xEQvoKejtbNIQ3ULDOCMNlmLv6M="/>
-        <field:datetime dateTimePattern="${authorValue_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_AuthorValue_recordedDate" required="true" z="nEp0U9al4f16sw4BwWewn7Snj1Y="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_AuthorValue_recordedBy" required="true" z="uGCO5iULPWv2h2dT2ZkG+7W3tOs="/>
-        <field:datetime dateTimePattern="${authorValue_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_AuthorValue_modifiedDate" z="vlW/cKaeyM8TPtycn+XVQIkGqZ0="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_AuthorValue_modifiedBy" z="MRXVOZSlgOBhpXceX2xUOCZtelg="/>
-        <field:select field="lsState" id="c_com_labsynch_labseer_domain_AuthorValue_lsState" itemValue="id" items="${authorstates}" path="/authorstates" required="true" z="JcF7DIJ+wE0LQfhL7bE+Vgc6VuU="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/authorvalues/views.xml b/src/main/webapp/WEB-INF/views/authorvalues/views.xml
deleted file mode 100644
index ea838f290..000000000
--- a/src/main/webapp/WEB-INF/views/authorvalues/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="authorvalues/list">
-        <put-attribute name="body" value="/WEB-INF/views/authorvalues/list.jspx"/>
-    </definition>
-<definition extends="default" name="authorvalues/show">
-        <put-attribute name="body" value="/WEB-INF/views/authorvalues/show.jspx"/>
-    </definition>
-<definition extends="default" name="authorvalues/create">
-        <put-attribute name="body" value="/WEB-INF/views/authorvalues/create.jspx"/>
-    </definition>
-<definition extends="default" name="authorvalues/update">
-        <put-attribute name="body" value="/WEB-INF/views/authorvalues/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/bulkloadfiles/create.jspx b/src/main/webapp/WEB-INF/views/bulkloadfiles/create.jspx
deleted file mode 100644
index 4c00694ef..000000000
--- a/src/main/webapp/WEB-INF/views/bulkloadfiles/create.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_BulkLoadFile" modelAttribute="bulkLoadFile" path="/bulkloadfiles" render="${empty dependencies}" z="XHEDWzlduLn50cY4kIkAApS74/w=">
-        <field:textarea field="fileName" id="c_com_labsynch_labseer_domain_BulkLoadFile_fileName" z="gqRhmmUhl5RnN5l3lKE7qyuCFoA="/>
-        <field:input field="numberOfMols" id="c_com_labsynch_labseer_domain_BulkLoadFile_numberOfMols" z="4zIOBMSZxGCzd9sZTO6FVca8peU="/>
-        <field:input field="fileSize" id="c_com_labsynch_labseer_domain_BulkLoadFile_fileSize" z="lspiCE1vWXHBqz/Dhvb8MNyl6iI="/>
-        <field:input field="jsonTemplate" id="c_com_labsynch_labseer_domain_BulkLoadFile_jsonTemplate" z="q8TVW1USpNr3AbKIDUqbC8eBWBo="/>
-        <field:input field="recordedBy" id="c_com_labsynch_labseer_domain_BulkLoadFile_recordedBy" required="true" z="HQmKkTpt4ugjzHY6OIOTkugKJ2o="/>
-        <field:datetime dateTimePattern="${bulkLoadFile_filedate_date_format}" field="fileDate" id="c_com_labsynch_labseer_domain_BulkLoadFile_fileDate" z="g8ujZdN0jGea2Ef0R2pJ+WL2uPs="/>
-        <field:datetime dateTimePattern="${bulkLoadFile_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_BulkLoadFile_recordedDate" required="true" z="IA/AyJswfzxG9xRccWhK0/O/P/8="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_BulkLoadFile" render="${not empty dependencies}" z="YYkEY7WPpV70GAjPnAL49zqrppM="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/bulkloadfiles/findBulkLoadFilesByFileNameEquals.jspx b/src/main/webapp/WEB-INF/views/bulkloadfiles/findBulkLoadFilesByFileNameEquals.jspx
deleted file mode 100644
index 434c18c82..000000000
--- a/src/main/webapp/WEB-INF/views/bulkloadfiles/findBulkLoadFilesByFileNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByFileNameEquals" id="ff_com_labsynch_labseer_domain_BulkLoadFile" path="/bulkloadfiles" z="krojFcTGfdi+WFPBm8G1tCcpLwE=">
-        <field:input disableFormBinding="true" field="fileName" id="f_com_labsynch_labseer_domain_BulkLoadFile_fileName" max="1000" required="true" z="1dgzkIqofnaJfu/qgOnslEysrhg="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/bulkloadfiles/findBulkLoadFilesByRecordedByEquals.jspx b/src/main/webapp/WEB-INF/views/bulkloadfiles/findBulkLoadFilesByRecordedByEquals.jspx
deleted file mode 100644
index a4233f663..000000000
--- a/src/main/webapp/WEB-INF/views/bulkloadfiles/findBulkLoadFilesByRecordedByEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByRecordedByEquals" id="ff_com_labsynch_labseer_domain_BulkLoadFile" path="/bulkloadfiles" z="Mn76W++jLr40y6xM+mx78NJ+7D4=">
-        <field:input disableFormBinding="true" field="recordedBy" id="f_com_labsynch_labseer_domain_BulkLoadFile_recordedBy" required="true" z="HxLoROGRnmcai+N6gFOat6N6ogo="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/bulkloadfiles/list.jspx b/src/main/webapp/WEB-INF/views/bulkloadfiles/list.jspx
deleted file mode 100644
index bcf375217..000000000
--- a/src/main/webapp/WEB-INF/views/bulkloadfiles/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_BulkLoadFile" items="${bulkloadfiles}" z="Ri+hrxwsAoGj3oYDSD7PQA1uJ58=">
-        <table:table data="${bulkloadfiles}" id="l_com_labsynch_labseer_domain_BulkLoadFile" path="/bulkloadfiles" z="2q4st0/s7fZmkQQzp+FaOvIgO4U=">
-            <table:column id="c_com_labsynch_labseer_domain_BulkLoadFile_fileName" property="fileName" z="R3oMxQpuaaRvcJfwxZ2Zscrf8OE="/>
-            <table:column id="c_com_labsynch_labseer_domain_BulkLoadFile_numberOfMols" property="numberOfMols" z="GupYPkzJn7SBHOHPTWS0qOU5NCs="/>
-            <table:column id="c_com_labsynch_labseer_domain_BulkLoadFile_fileSize" property="fileSize" z="CpDIS2p9ulUWY92kNmlY3BeKSDg="/>
-            <table:column id="c_com_labsynch_labseer_domain_BulkLoadFile_jsonTemplate" property="jsonTemplate" z="DrPMX21zlLwGhqSNJBDWHeRq86E="/>
-            <table:column id="c_com_labsynch_labseer_domain_BulkLoadFile_recordedBy" property="recordedBy" z="nmZEU9wg0ymzRnUsgQLPPAnpK68="/>
-            <table:column date="true" dateTimePattern="${bulkLoadFile_filedate_date_format}" id="c_com_labsynch_labseer_domain_BulkLoadFile_fileDate" property="fileDate" z="TK8dOgJRBjx0OgXuWLlryGPjuBU="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/bulkloadfiles/show.jspx b/src/main/webapp/WEB-INF/views/bulkloadfiles/show.jspx
deleted file mode 100644
index c6fff5eea..000000000
--- a/src/main/webapp/WEB-INF/views/bulkloadfiles/show.jspx
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_BulkLoadFile" object="${bulkloadfile}" path="/bulkloadfiles" z="M9ndI3lBxT8nephZfey4XVOXKA8=">
-        <field:display field="fileName" id="s_com_labsynch_labseer_domain_BulkLoadFile_fileName" object="${bulkloadfile}" z="woj6BpKsOPq8QGpNpTIkgInH0dA="/>
-        <field:display field="numberOfMols" id="s_com_labsynch_labseer_domain_BulkLoadFile_numberOfMols" object="${bulkloadfile}" z="ZLQ/PWCUGYIcUCaDNtnZ66VriB4="/>
-        <field:display field="fileSize" id="s_com_labsynch_labseer_domain_BulkLoadFile_fileSize" object="${bulkloadfile}" z="1N+bpuZUnauGu47FnXzCRrmhTko="/>
-        <field:display field="jsonTemplate" id="s_com_labsynch_labseer_domain_BulkLoadFile_jsonTemplate" object="${bulkloadfile}" z="u1T2ETz3tLoj7EvHOqPcXZdOpao="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_BulkLoadFile_recordedBy" object="${bulkloadfile}" z="M/FQX2yptGWgXW+VYb4Ss6q+1wE="/>
-        <field:display date="true" dateTimePattern="${bulkLoadFile_filedate_date_format}" field="fileDate" id="s_com_labsynch_labseer_domain_BulkLoadFile_fileDate" object="${bulkloadfile}" z="/pTkXkdfMhBsW14aPraF3kcJIrI="/>
-        <field:display date="true" dateTimePattern="${bulkLoadFile_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_BulkLoadFile_recordedDate" object="${bulkloadfile}" z="H2C/EqjHhObvtnZq69sUcuJNn/s="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/bulkloadfiles/update.jspx b/src/main/webapp/WEB-INF/views/bulkloadfiles/update.jspx
deleted file mode 100644
index addc93b1d..000000000
--- a/src/main/webapp/WEB-INF/views/bulkloadfiles/update.jspx
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_BulkLoadFile" modelAttribute="bulkLoadFile" path="/bulkloadfiles" versionField="Version" z="amRjeQfJvkc1daIviS9Cxy7KxGQ=">
-        <field:textarea field="fileName" id="c_com_labsynch_labseer_domain_BulkLoadFile_fileName" z="gqRhmmUhl5RnN5l3lKE7qyuCFoA="/>
-        <field:input field="numberOfMols" id="c_com_labsynch_labseer_domain_BulkLoadFile_numberOfMols" z="4zIOBMSZxGCzd9sZTO6FVca8peU="/>
-        <field:input field="fileSize" id="c_com_labsynch_labseer_domain_BulkLoadFile_fileSize" z="lspiCE1vWXHBqz/Dhvb8MNyl6iI="/>
-        <field:input field="jsonTemplate" id="c_com_labsynch_labseer_domain_BulkLoadFile_jsonTemplate" z="q8TVW1USpNr3AbKIDUqbC8eBWBo="/>
-        <field:input field="recordedBy" id="c_com_labsynch_labseer_domain_BulkLoadFile_recordedBy" required="true" z="HQmKkTpt4ugjzHY6OIOTkugKJ2o="/>
-        <field:datetime dateTimePattern="${bulkLoadFile_filedate_date_format}" field="fileDate" id="c_com_labsynch_labseer_domain_BulkLoadFile_fileDate" z="g8ujZdN0jGea2Ef0R2pJ+WL2uPs="/>
-        <field:datetime dateTimePattern="${bulkLoadFile_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_BulkLoadFile_recordedDate" required="true" z="IA/AyJswfzxG9xRccWhK0/O/P/8="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/bulkloadfiles/views.xml b/src/main/webapp/WEB-INF/views/bulkloadfiles/views.xml
deleted file mode 100644
index f0b611628..000000000
--- a/src/main/webapp/WEB-INF/views/bulkloadfiles/views.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="bulkloadfiles/list">
-        <put-attribute name="body" value="/WEB-INF/views/bulkloadfiles/list.jspx"/>
-    </definition>
-<definition extends="default" name="bulkloadfiles/show">
-        <put-attribute name="body" value="/WEB-INF/views/bulkloadfiles/show.jspx"/>
-    </definition>
-<definition extends="default" name="bulkloadfiles/create">
-        <put-attribute name="body" value="/WEB-INF/views/bulkloadfiles/create.jspx"/>
-    </definition>
-<definition extends="default" name="bulkloadfiles/update">
-        <put-attribute name="body" value="/WEB-INF/views/bulkloadfiles/update.jspx"/>
-    </definition>
-<definition extends="default" name="bulkloadfiles/findBulkLoadFilesByFileNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/bulkloadfiles/findBulkLoadFilesByFileNameEquals.jspx"/>
-    </definition>
-<definition extends="default" name="bulkloadfiles/findBulkLoadFilesByRecordedByEquals">
-        <put-attribute name="body" value="/WEB-INF/views/bulkloadfiles/findBulkLoadFilesByRecordedByEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/bulkloadtemplates/create.jspx b/src/main/webapp/WEB-INF/views/bulkloadtemplates/create.jspx
deleted file mode 100644
index 3fd05cf0e..000000000
--- a/src/main/webapp/WEB-INF/views/bulkloadtemplates/create.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_BulkLoadTemplate" modelAttribute="bulkLoadTemplate" path="/bulkloadtemplates" render="${empty dependencies}" z="4OqkVfj+FwfTCrmfFhdj4v4tZpI=">
-        <field:textarea field="templateName" id="c_com_labsynch_labseer_domain_BulkLoadTemplate_templateName" z="Uo2Irhvre70ww4E2QJg0VlH07fs="/>
-        <field:input field="jsonTemplate" id="c_com_labsynch_labseer_domain_BulkLoadTemplate_jsonTemplate" z="aj05rGw4F9+g4FaksLfe7iVTM3w="/>
-        <field:input field="recordedBy" id="c_com_labsynch_labseer_domain_BulkLoadTemplate_recordedBy" required="true" z="9LBJhnqsFdh0QRy4t+9CbQBZmMQ="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_BulkLoadTemplate_ignored" z="GhUQCMl6LLOw7vDQa+TThn7zy7M="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_BulkLoadTemplate" render="${not empty dependencies}" z="ikCBzjdVif++50+G6ttmvOzbwAQ="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/bulkloadtemplates/findBulkLoadTemplatesByRecordedByEquals.jspx b/src/main/webapp/WEB-INF/views/bulkloadtemplates/findBulkLoadTemplatesByRecordedByEquals.jspx
deleted file mode 100644
index ba4de7683..000000000
--- a/src/main/webapp/WEB-INF/views/bulkloadtemplates/findBulkLoadTemplatesByRecordedByEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByRecordedByEquals" id="ff_com_labsynch_labseer_domain_BulkLoadTemplate" path="/bulkloadtemplates" z="UxTMBtzWO7ry7KW0KmsmUrjiTsY=">
-        <field:input disableFormBinding="true" field="recordedBy" id="f_com_labsynch_labseer_domain_BulkLoadTemplate_recordedBy" required="true" z="dg+YrMnR2mHicJjuDiS7XPzNObY="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/bulkloadtemplates/findBulkLoadTemplatesByTemplateNameEquals.jspx b/src/main/webapp/WEB-INF/views/bulkloadtemplates/findBulkLoadTemplatesByTemplateNameEquals.jspx
deleted file mode 100644
index 165f4c0a5..000000000
--- a/src/main/webapp/WEB-INF/views/bulkloadtemplates/findBulkLoadTemplatesByTemplateNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByTemplateNameEquals" id="ff_com_labsynch_labseer_domain_BulkLoadTemplate" path="/bulkloadtemplates" z="bU5eOl0TlLac3p5RBfmaQcFP1pg=">
-        <field:input disableFormBinding="true" field="templateName" id="f_com_labsynch_labseer_domain_BulkLoadTemplate_templateName" max="255" required="true" z="PiuVi4i3zlg/KBD7GcSzXjpiVqU="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/bulkloadtemplates/findBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals.jspx b/src/main/webapp/WEB-INF/views/bulkloadtemplates/findBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals.jspx
deleted file mode 100644
index b7b8bcc12..000000000
--- a/src/main/webapp/WEB-INF/views/bulkloadtemplates/findBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByTemplateNameEqualsAndRecordedByEquals" id="ff_com_labsynch_labseer_domain_BulkLoadTemplate" path="/bulkloadtemplates" z="eI5Gic6x0ZtIH+7OTL4/41rdvko=">
-        <field:input disableFormBinding="true" field="templateName" id="f_com_labsynch_labseer_domain_BulkLoadTemplate_templateName" max="255" required="true" z="PiuVi4i3zlg/KBD7GcSzXjpiVqU="/>
-        <field:input disableFormBinding="true" field="recordedBy" id="f_com_labsynch_labseer_domain_BulkLoadTemplate_recordedBy" required="true" z="dg+YrMnR2mHicJjuDiS7XPzNObY="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/bulkloadtemplates/list.jspx b/src/main/webapp/WEB-INF/views/bulkloadtemplates/list.jspx
deleted file mode 100644
index 877c34f5a..000000000
--- a/src/main/webapp/WEB-INF/views/bulkloadtemplates/list.jspx
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_BulkLoadTemplate" items="${bulkloadtemplates}" z="7/U9G2M00iXjg6j2v8mLSBcqiC8=">
-        <table:table data="${bulkloadtemplates}" id="l_com_labsynch_labseer_domain_BulkLoadTemplate" path="/bulkloadtemplates" z="5fl0eh8mKFXgIfWd0G0H2eoWPtI=">
-            <table:column id="c_com_labsynch_labseer_domain_BulkLoadTemplate_templateName" property="templateName" z="sDuUpq8SiVwSB/HcRGUYHM2Z/Cw="/>
-            <table:column id="c_com_labsynch_labseer_domain_BulkLoadTemplate_jsonTemplate" property="jsonTemplate" z="ghmwnOrjvkEC9f6qHrlE2rIg4As="/>
-            <table:column id="c_com_labsynch_labseer_domain_BulkLoadTemplate_recordedBy" property="recordedBy" z="sjdiCbNt+ezar5Q3a9GmMWCxJcY="/>
-            <table:column id="c_com_labsynch_labseer_domain_BulkLoadTemplate_ignored" property="ignored" z="101rZ886FIjlStq8jgG6f+bJRaU="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/bulkloadtemplates/show.jspx b/src/main/webapp/WEB-INF/views/bulkloadtemplates/show.jspx
deleted file mode 100644
index 41628aadd..000000000
--- a/src/main/webapp/WEB-INF/views/bulkloadtemplates/show.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_BulkLoadTemplate" object="${bulkloadtemplate}" path="/bulkloadtemplates" z="nb1hCMwu5/C7KNxTfUfMxvVFEhI=">
-        <field:display field="templateName" id="s_com_labsynch_labseer_domain_BulkLoadTemplate_templateName" object="${bulkloadtemplate}" z="QMQvGYfHosOIQ7MFCm0yhsryCtg="/>
-        <field:display field="jsonTemplate" id="s_com_labsynch_labseer_domain_BulkLoadTemplate_jsonTemplate" object="${bulkloadtemplate}" z="03b7ii+x3ZNtJwow3YGIWvz+jrg="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_BulkLoadTemplate_recordedBy" object="${bulkloadtemplate}" z="pXGytVWmjBCzHi5p0qhpMG4LsiU="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_BulkLoadTemplate_ignored" object="${bulkloadtemplate}" z="lZDyZFaJq6aUM50BTi1TihuBtVs="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/bulkloadtemplates/update.jspx b/src/main/webapp/WEB-INF/views/bulkloadtemplates/update.jspx
deleted file mode 100644
index ab8034e2a..000000000
--- a/src/main/webapp/WEB-INF/views/bulkloadtemplates/update.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_BulkLoadTemplate" modelAttribute="bulkLoadTemplate" path="/bulkloadtemplates" versionField="Version" z="zLAEXuK2YZy1+DRcRWwi0eJh2Sg=">
-        <field:textarea field="templateName" id="c_com_labsynch_labseer_domain_BulkLoadTemplate_templateName" z="Uo2Irhvre70ww4E2QJg0VlH07fs="/>
-        <field:input field="jsonTemplate" id="c_com_labsynch_labseer_domain_BulkLoadTemplate_jsonTemplate" z="aj05rGw4F9+g4FaksLfe7iVTM3w="/>
-        <field:input field="recordedBy" id="c_com_labsynch_labseer_domain_BulkLoadTemplate_recordedBy" required="true" z="9LBJhnqsFdh0QRy4t+9CbQBZmMQ="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_BulkLoadTemplate_ignored" z="GhUQCMl6LLOw7vDQa+TThn7zy7M="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/bulkloadtemplates/views.xml b/src/main/webapp/WEB-INF/views/bulkloadtemplates/views.xml
deleted file mode 100644
index 197bef9a5..000000000
--- a/src/main/webapp/WEB-INF/views/bulkloadtemplates/views.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="bulkloadtemplates/list">
-        <put-attribute name="body" value="/WEB-INF/views/bulkloadtemplates/list.jspx"/>
-    </definition>
-<definition extends="default" name="bulkloadtemplates/show">
-        <put-attribute name="body" value="/WEB-INF/views/bulkloadtemplates/show.jspx"/>
-    </definition>
-<definition extends="default" name="bulkloadtemplates/create">
-        <put-attribute name="body" value="/WEB-INF/views/bulkloadtemplates/create.jspx"/>
-    </definition>
-<definition extends="default" name="bulkloadtemplates/update">
-        <put-attribute name="body" value="/WEB-INF/views/bulkloadtemplates/update.jspx"/>
-    </definition>
-<definition extends="default" name="bulkloadtemplates/findBulkLoadTemplatesByRecordedByEquals">
-        <put-attribute name="body" value="/WEB-INF/views/bulkloadtemplates/findBulkLoadTemplatesByRecordedByEquals.jspx"/>
-    </definition>
-<definition extends="default" name="bulkloadtemplates/findBulkLoadTemplatesByTemplateNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/bulkloadtemplates/findBulkLoadTemplatesByTemplateNameEquals.jspx"/>
-    </definition>
-<definition extends="default" name="bulkloadtemplates/findBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals">
-        <put-attribute name="body" value="/WEB-INF/views/bulkloadtemplates/findBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/changepassword/index.jspx b/src/main/webapp/WEB-INF/views/changepassword/index.jspx
deleted file mode 100755
index 9c19304f6..000000000
--- a/src/main/webapp/WEB-INF/views/changepassword/index.jspx
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" 
-    xmlns:form="http://www.springframework.org/tags/form" 
-    xmlns:jsp="http://java.sun.com/JSP/Page" 
-    xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    
-  <jsp:output omit-xml-declaration="yes"/>
-  <script type="text/javascript">dojo.require('dijit.TitlePane');dojo.require('dijit.form.SimpleTextarea');dojo.require('dijit.form.FilteringSelect');</script>
-  <div id="_title_div">
-    Change Password
-    <script type="text/javascript">Spring.addDecoration(new Spring.ElementDecoration({elementId : '_title_div', widgetType : 'dijit.TitlePane', widgetAttrs : {title: '${title_msg}'}})); </script>
-    <spring:url value="/changepassword" var="form_url"/>
-    Change Password
-    <script type="text/javascript">Spring.addDecoration(new Spring.ElementDecoration({elementId : '_title_div', widgetType : 'dijit.TitlePane', widgetAttrs : {title: '${title_msg}'}})); </script>
-    <form:form action="update" method="POST" commandName="changePasswordForm">
-      <br/>
-      <div id="changepassword_oldpassword">
-        <label for="_oldpassword_id">Current Password:</label>
-        <form:password cssStyle="width:250px" id="_changepassword_oldpassword" maxlength="30" path="oldPassword"/>
-        <br/>
-        <form:errors cssClass="errors" path="oldPassword"/>
-      </div>
-      <br/>
-      <div id="changepassword_newpassword">
-        <label for="_newpassword_id">New Password:</label>
-        <form:password cssStyle="width:250px" id="_changepassword_newpassword" maxlength="30" path="newPassword"/>
-        <br/>
-        <form:errors cssClass="errors" path="newPassword"/>
-      </div>
-      <br/>
-      <div id="changepassword_newpasswordagain">
-        <label for="_newpasswordagain_id">New Password (again):</label>
-        <form:password cssStyle="width:250px" id="_changepassword_newpasswordagain" maxlength="30" path="newPasswordAgain"/>
-        <br/>
-        <form:errors cssClass="errors" path="newPasswordAgain"/>
-      </div>
-      <br/><br/>
-      <div class="submit" id="changepassword_submit">
-        
-        <script type="text/javascript">Spring.addDecoration(new Spring.ValidateAllDecoration({elementId: 'proceed', event : 'onclick'}));</script>
-        <input id="proceed" type="submit" value="Save"/>
-      </div>
-      <br/>
-      <form:errors cssClass="errors" delimiter="&lt;p/&gt;"/>
-    </form:form>
-  </div>
-</div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/changepassword/thanks.jspx b/src/main/webapp/WEB-INF/views/changepassword/thanks.jspx
deleted file mode 100755
index 4513f674c..000000000
--- a/src/main/webapp/WEB-INF/views/changepassword/thanks.jspx
+++ /dev/null
@@ -1,16 +0,0 @@
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" 
-    xmlns:form="http://www.springframework.org/tags/form" 
-    xmlns:jsp="http://java.sun.com/JSP/Page" 
-    xmlns:spring="http://www.springframework.org/tags" version="2.0">
-  <jsp:output omit-xml-declaration="yes"/>
-  <script type="text/javascript">dojo.require('dijit.TitlePane');dojo.require('dijit.form.SimpleTextarea');dojo.require('dijit.form.FilteringSelect');</script>
-  <div id="_title_div">
-    Change Password
-    <script type="text/javascript">Spring.addDecoration(new Spring.ElementDecoration({elementId : '_title_div', widgetType : 'dijit.TitlePane', widgetAttrs : {title: '${title_msg}'}})); </script>
-    <spring:url value="/changepassword" var="form_url"/>
-    Change Password
-    <script type="text/javascript">Spring.addDecoration(new Spring.ElementDecoration({elementId : '_title_div', widgetType : 'dijit.TitlePane', widgetAttrs : {title: '${title_msg}'}})); </script>
-    
-    <h3>You password has been successfully been changed.</h3>
-  </div>
-</div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/changepassword/views.xml b/src/main/webapp/WEB-INF/views/changepassword/views.xml
deleted file mode 100755
index 8c084df24..000000000
--- a/src/main/webapp/WEB-INF/views/changepassword/views.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="changepassword/index">
-        <put-attribute name="body" value="/WEB-INF/views/changepassword/index.jspx"/>
-    </definition>
-    <definition extends="default" name="changepassword/thanks">
-        <put-attribute name="body" value="/WEB-INF/views/changepassword/thanks.jspx"/>
-    </definition>
-    
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/chemstructures/create.jspx b/src/main/webapp/WEB-INF/views/chemstructures/create.jspx
deleted file mode 100644
index 920acd02c..000000000
--- a/src/main/webapp/WEB-INF/views/chemstructures/create.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ChemStructure" modelAttribute="chemStructure" path="/chemstructures" render="${empty dependencies}" z="gQIGjXBYfu0iCGp/pkjUwEodog4=">
-        <field:input field="codeName" id="c_com_labsynch_labseer_domain_ChemStructure_codeName" required="true" z="NXh9HzWv5rKPvQ0tNbnjehHfxSE="/>
-        <field:input field="molStructure" id="c_com_labsynch_labseer_domain_ChemStructure_molStructure" required="true" z="pBygbPlu2YATbACUxzAfEHqeYXQ="/>
-        <field:textarea field="smiles" id="c_com_labsynch_labseer_domain_ChemStructure_smiles" z="50g34TCo6JENRW/48lvtgeWTc9w="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ChemStructure_lsType" z="UvsudpjmUkmfb4+zB7Rf9WOz2fE="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ChemStructure_lsKind" z="Pi8QV13Ri3FTuPZJ70EWMsx63TU="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ChemStructure_lsTypeAndKind" z="u04hhvTHF1UvCQG+ioi/VVE09zQ="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ChemStructure_ignored" z="kN8P2+Hh8zcfBQcOsaJnmiX9bME="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ChemStructure_deleted" z="LyWxboeXEpaYrd/lY8oxGsRDA8Q="/>
-        <field:input field="recordedBy" id="c_com_labsynch_labseer_domain_ChemStructure_recordedBy" required="true" z="AyzRaxNDk9dXRsasEj8LW6FkjjI="/>
-        <field:datetime dateTimePattern="${chemStructure_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ChemStructure_recordedDate" required="true" z="iuahsVDfgJ0hpLhlnAxJiTbR6NM="/>
-        <field:input field="modifiedBy" id="c_com_labsynch_labseer_domain_ChemStructure_modifiedBy" z="/nLAXrVjDjaY+h4sZsBJl6EtHBk="/>
-        <field:datetime dateTimePattern="${chemStructure_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ChemStructure_modifiedDate" z="Vc+mNQSg3fhsvGOMPNTh3vPF7yo="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ChemStructure_lsTransaction" validationMessageCode="field_invalid_integer" z="p7K2jvYeb7K74Qdc+rZbSHGQ2JY="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ChemStructure" render="${not empty dependencies}" z="Qen/t/ncSop9ZOTfokYNpDwjySE="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/chemstructures/list.jspx b/src/main/webapp/WEB-INF/views/chemstructures/list.jspx
deleted file mode 100644
index d4726915c..000000000
--- a/src/main/webapp/WEB-INF/views/chemstructures/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ChemStructure" items="${chemstructures}" z="AH4BAlv2J0K8KoU+Yq9adO4xCuE=">
-        <table:table data="${chemstructures}" id="l_com_labsynch_labseer_domain_ChemStructure" path="/chemstructures" z="Nsggz88tdiB8FCRv46HdojZ0zOw=">
-            <table:column id="c_com_labsynch_labseer_domain_ChemStructure_codeName" property="codeName" z="/ZKBjTRDU7UCTY0+Ts1I8bA6xlo="/>
-            <table:column id="c_com_labsynch_labseer_domain_ChemStructure_molStructure" property="molStructure" z="+xOayoaUPrtzDctvPf95lAC5cOo="/>
-            <table:column id="c_com_labsynch_labseer_domain_ChemStructure_smiles" property="smiles" z="7uv2K/6DtPeZdZunIaebzaX0OCY="/>
-            <table:column id="c_com_labsynch_labseer_domain_ChemStructure_lsType" property="lsType" z="sDHT0JR+h2K8sXNvg4ak9h+5Gzk="/>
-            <table:column id="c_com_labsynch_labseer_domain_ChemStructure_lsKind" property="lsKind" z="9oE9CU8DOWd7wYt5YCi4Wwch9E8="/>
-            <table:column id="c_com_labsynch_labseer_domain_ChemStructure_lsTypeAndKind" property="lsTypeAndKind" z="7ZtgopP4d8/cQ/iF/CsKRu/6IVk="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/chemstructures/show.jspx b/src/main/webapp/WEB-INF/views/chemstructures/show.jspx
deleted file mode 100644
index 41499321e..000000000
--- a/src/main/webapp/WEB-INF/views/chemstructures/show.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ChemStructure" object="${chemstructure}" path="/chemstructures" z="1tRhSu2I5MaSQsR2DFU5IKuVUlc=">
-        <field:display field="codeName" id="s_com_labsynch_labseer_domain_ChemStructure_codeName" object="${chemstructure}" z="jEmvhsykPTADTPO8Zm3ADQsHBWs="/>
-        <field:display field="molStructure" id="s_com_labsynch_labseer_domain_ChemStructure_molStructure" object="${chemstructure}" z="tONaWpOkZjonJi/rfmuigvuNNgs="/>
-        <field:display field="smiles" id="s_com_labsynch_labseer_domain_ChemStructure_smiles" object="${chemstructure}" z="vRJ2MoFa5H6t8+3bDW31hjYYL9I="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ChemStructure_lsType" object="${chemstructure}" z="9FFLldAdtsZovn/DvLq1fg3gZ8I="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_ChemStructure_lsKind" object="${chemstructure}" z="wYkOOtDntl5haFCgJrYbgYNx9aA="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ChemStructure_lsTypeAndKind" object="${chemstructure}" z="B8XqbVMpQj2U0UJ1x0LiQQ4EV2E="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ChemStructure_ignored" object="${chemstructure}" z="xdIvfjG7wWnmnlwlcq983kv+N94="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_ChemStructure_deleted" object="${chemstructure}" z="PAPkUrPbXKj6+9rn/+RfS9/RAeE="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_ChemStructure_recordedBy" object="${chemstructure}" z="tAscYU6KmaNcca6+Df30Tmbi5wc="/>
-        <field:display date="true" dateTimePattern="${chemStructure_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_ChemStructure_recordedDate" object="${chemstructure}" z="mAr3RyPUbra8mkr4zEaD6Y7zjic="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_ChemStructure_modifiedBy" object="${chemstructure}" z="A44SRWYpYwvaX9PHMvr/cuq980I="/>
-        <field:display date="true" dateTimePattern="${chemStructure_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_ChemStructure_modifiedDate" object="${chemstructure}" z="8LO6BG0Blr6zv2wZZ048LxIOnVE="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_ChemStructure_lsTransaction" object="${chemstructure}" z="zmDPctA4yf2uHUgHZsgmQyr9hWs="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/chemstructures/update.jspx b/src/main/webapp/WEB-INF/views/chemstructures/update.jspx
deleted file mode 100644
index 963131496..000000000
--- a/src/main/webapp/WEB-INF/views/chemstructures/update.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ChemStructure" modelAttribute="chemStructure" path="/chemstructures" versionField="Version" z="XK6u8Cev4hLXDwk4YHQV3mybdYY=">
-        <field:input field="codeName" id="c_com_labsynch_labseer_domain_ChemStructure_codeName" required="true" z="NXh9HzWv5rKPvQ0tNbnjehHfxSE="/>
-        <field:input field="molStructure" id="c_com_labsynch_labseer_domain_ChemStructure_molStructure" required="true" z="pBygbPlu2YATbACUxzAfEHqeYXQ="/>
-        <field:textarea field="smiles" id="c_com_labsynch_labseer_domain_ChemStructure_smiles" z="50g34TCo6JENRW/48lvtgeWTc9w="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ChemStructure_lsType" z="UvsudpjmUkmfb4+zB7Rf9WOz2fE="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ChemStructure_lsKind" z="Pi8QV13Ri3FTuPZJ70EWMsx63TU="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ChemStructure_lsTypeAndKind" z="u04hhvTHF1UvCQG+ioi/VVE09zQ="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ChemStructure_ignored" z="kN8P2+Hh8zcfBQcOsaJnmiX9bME="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ChemStructure_deleted" z="LyWxboeXEpaYrd/lY8oxGsRDA8Q="/>
-        <field:input field="recordedBy" id="c_com_labsynch_labseer_domain_ChemStructure_recordedBy" required="true" z="AyzRaxNDk9dXRsasEj8LW6FkjjI="/>
-        <field:datetime dateTimePattern="${chemStructure_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ChemStructure_recordedDate" required="true" z="iuahsVDfgJ0hpLhlnAxJiTbR6NM="/>
-        <field:input field="modifiedBy" id="c_com_labsynch_labseer_domain_ChemStructure_modifiedBy" z="/nLAXrVjDjaY+h4sZsBJl6EtHBk="/>
-        <field:datetime dateTimePattern="${chemStructure_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ChemStructure_modifiedDate" z="Vc+mNQSg3fhsvGOMPNTh3vPF7yo="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ChemStructure_lsTransaction" validationMessageCode="field_invalid_integer" z="p7K2jvYeb7K74Qdc+rZbSHGQ2JY="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/chemstructures/views.xml b/src/main/webapp/WEB-INF/views/chemstructures/views.xml
deleted file mode 100644
index 38df60497..000000000
--- a/src/main/webapp/WEB-INF/views/chemstructures/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="chemstructures/list">
-        <put-attribute name="body" value="/WEB-INF/views/chemstructures/list.jspx"/>
-    </definition>
-<definition extends="default" name="chemstructures/show">
-        <put-attribute name="body" value="/WEB-INF/views/chemstructures/show.jspx"/>
-    </definition>
-<definition extends="default" name="chemstructures/create">
-        <put-attribute name="body" value="/WEB-INF/views/chemstructures/create.jspx"/>
-    </definition>
-<definition extends="default" name="chemstructures/update">
-        <put-attribute name="body" value="/WEB-INF/views/chemstructures/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/cmpdregappsettings/create.jspx b/src/main/webapp/WEB-INF/views/cmpdregappsettings/create.jspx
deleted file mode 100644
index abafafaf3..000000000
--- a/src/main/webapp/WEB-INF/views/cmpdregappsettings/create.jspx
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_CmpdRegAppSetting" modelAttribute="cmpdRegAppSetting" path="/cmpdregappsettings" render="${empty dependencies}" z="CpKo83B8fdofjk+blqPREU0Q0DU=">
-        <field:textarea field="propName" id="c_com_labsynch_labseer_domain_CmpdRegAppSetting_propName" z="C57qlYstPqgp7id8pbxWheasnmQ="/>
-        <field:textarea field="propValue" id="c_com_labsynch_labseer_domain_CmpdRegAppSetting_propValue" z="IIxsyEitSKLhxg1PqT3jvtt74S8="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_CmpdRegAppSetting_comments" z="PucCP+IpUGO9YHFZBWZqnpiXIfg="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_CmpdRegAppSetting_ignored" z="Sk2+X1mqYtZtftsmFUZKIPr3kNw="/>
-        <field:datetime dateTimePattern="${cmpdRegAppSetting_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_CmpdRegAppSetting_recordedDate" z="N0zBZAarseGXkn65Jsu/C9FKTWA="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_CmpdRegAppSetting" render="${not empty dependencies}" z="w2Hdl2dQZsQ49If+Hn+NWRSzV+k="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/cmpdregappsettings/list.jspx b/src/main/webapp/WEB-INF/views/cmpdregappsettings/list.jspx
deleted file mode 100644
index 18fd141ce..000000000
--- a/src/main/webapp/WEB-INF/views/cmpdregappsettings/list.jspx
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_CmpdRegAppSetting" items="${cmpdregappsettings}" z="5lWNPYV/FwNd0OOksWi7wyTA+XE=">
-        <table:table data="${cmpdregappsettings}" id="l_com_labsynch_labseer_domain_CmpdRegAppSetting" path="/cmpdregappsettings" z="AHLAV1bO9gqy7tcKLP8+b4vFvLk=">
-            <table:column id="c_com_labsynch_labseer_domain_CmpdRegAppSetting_propName" property="propName" z="NLyy6160lArQ/xpi1+pWI1McTLQ="/>
-            <table:column id="c_com_labsynch_labseer_domain_CmpdRegAppSetting_propValue" property="propValue" z="7L2Jzv3okbqUOpT1iMoBsDNUvWU="/>
-            <table:column id="c_com_labsynch_labseer_domain_CmpdRegAppSetting_comments" property="comments" z="/dFDbuOmK0XAL4KLuH2hN+01fjs="/>
-            <table:column id="c_com_labsynch_labseer_domain_CmpdRegAppSetting_ignored" property="ignored" z="TXTxcEOXQPPvxQ4sp/An5Rlih5E="/>
-            <table:column date="true" dateTimePattern="${cmpdRegAppSetting_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_CmpdRegAppSetting_recordedDate" property="recordedDate" z="Tw1vR3mwPt/93TL2RKsrafMrQ8o="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/cmpdregappsettings/show.jspx b/src/main/webapp/WEB-INF/views/cmpdregappsettings/show.jspx
deleted file mode 100644
index 76f3348e3..000000000
--- a/src/main/webapp/WEB-INF/views/cmpdregappsettings/show.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_CmpdRegAppSetting" object="${cmpdregappsetting}" path="/cmpdregappsettings" z="VPBBvUAiCTctCKGc0r6NXMCH1F0=">
-        <field:display field="propName" id="s_com_labsynch_labseer_domain_CmpdRegAppSetting_propName" object="${cmpdregappsetting}" z="dja6huQlSz5tt16HzdZLgsk+4QQ="/>
-        <field:display field="propValue" id="s_com_labsynch_labseer_domain_CmpdRegAppSetting_propValue" object="${cmpdregappsetting}" z="SZQii8HOcOeX1DYG+6UHsTgiOjw="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_CmpdRegAppSetting_comments" object="${cmpdregappsetting}" z="ebPsqrjwpBYJUK1jXrjc6N46+wg="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_CmpdRegAppSetting_ignored" object="${cmpdregappsetting}" z="pata3RRdv/EjaNN5Llt2E9WkTao="/>
-        <field:display date="true" dateTimePattern="${cmpdRegAppSetting_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_CmpdRegAppSetting_recordedDate" object="${cmpdregappsetting}" z="SRC5bG83xGRkEouZyRBvCu9dWng="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/cmpdregappsettings/update.jspx b/src/main/webapp/WEB-INF/views/cmpdregappsettings/update.jspx
deleted file mode 100644
index 2aa3d38cd..000000000
--- a/src/main/webapp/WEB-INF/views/cmpdregappsettings/update.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_CmpdRegAppSetting" modelAttribute="cmpdRegAppSetting" path="/cmpdregappsettings" versionField="Version" z="O8oQsr7ftB4pV3QHayebNKt0KDs=">
-        <field:textarea field="propName" id="c_com_labsynch_labseer_domain_CmpdRegAppSetting_propName" z="C57qlYstPqgp7id8pbxWheasnmQ="/>
-        <field:textarea field="propValue" id="c_com_labsynch_labseer_domain_CmpdRegAppSetting_propValue" z="IIxsyEitSKLhxg1PqT3jvtt74S8="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_CmpdRegAppSetting_comments" z="PucCP+IpUGO9YHFZBWZqnpiXIfg="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_CmpdRegAppSetting_ignored" z="Sk2+X1mqYtZtftsmFUZKIPr3kNw="/>
-        <field:datetime dateTimePattern="${cmpdRegAppSetting_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_CmpdRegAppSetting_recordedDate" z="N0zBZAarseGXkn65Jsu/C9FKTWA="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/cmpdregappsettings/views.xml b/src/main/webapp/WEB-INF/views/cmpdregappsettings/views.xml
deleted file mode 100644
index c10329b8c..000000000
--- a/src/main/webapp/WEB-INF/views/cmpdregappsettings/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="cmpdregappsettings/list">
-        <put-attribute name="body" value="/WEB-INF/views/cmpdregappsettings/list.jspx"/>
-    </definition>
-<definition extends="default" name="cmpdregappsettings/show">
-        <put-attribute name="body" value="/WEB-INF/views/cmpdregappsettings/show.jspx"/>
-    </definition>
-<definition extends="default" name="cmpdregappsettings/create">
-        <put-attribute name="body" value="/WEB-INF/views/cmpdregappsettings/create.jspx"/>
-    </definition>
-<definition extends="default" name="cmpdregappsettings/update">
-        <put-attribute name="body" value="/WEB-INF/views/cmpdregappsettings/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/codekinds/create.jspx b/src/main/webapp/WEB-INF/views/codekinds/create.jspx
deleted file mode 100755
index 056aea04b..000000000
--- a/src/main/webapp/WEB-INF/views/codekinds/create.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_CodeKind" modelAttribute="codeKind" path="/codekinds" render="${empty dependencies}" z="NT9n4dgFznOjNv8LMI3U6lOYCwA=">
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_CodeKind_lsType" itemValue="id" items="${codetypes}" path="/codetypes" required="true" z="6hYYwyPL/hwHH3Z2a/oTiLOGr9s="/>
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_CodeKind_kindName" required="true" z="LKit7fGfwotgV2Ar12ZxmXliEQ4="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_CodeKind_lsTypeAndKind" z="J+zo6OFbdr2aHAX670DgBuD6RUE="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_CodeKind" render="${not empty dependencies}" z="yzIqX0IeucTQ0elh/BITJCsKzd0="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/codekinds/findCodeKindsByKindNameEqualsAndLsType.jspx b/src/main/webapp/WEB-INF/views/codekinds/findCodeKindsByKindNameEqualsAndLsType.jspx
deleted file mode 100755
index 197ff8900..000000000
--- a/src/main/webapp/WEB-INF/views/codekinds/findCodeKindsByKindNameEqualsAndLsType.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByKindNameEqualsAndLsType" id="ff_com_labsynch_labseer_domain_CodeKind" path="/codekinds" z="iCV4ehbHD0w0smfJPO/kU02OY5A=">
-        <field:input disableFormBinding="true" field="kindName" id="f_com_labsynch_labseer_domain_CodeKind_kindName" max="255" required="true" z="MJ9hU3bw2hDFVu95Ngz6rpPL70k="/>
-        <field:select disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_CodeKind_lsType" itemValue="id" items="${codetypes}" path="/codetypes" required="true" z="vEZvoUchFPDxtN0I4v8n9kaFyU4="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/codekinds/findCodeKindsByLsType.jspx b/src/main/webapp/WEB-INF/views/codekinds/findCodeKindsByLsType.jspx
deleted file mode 100755
index 357d850e3..000000000
--- a/src/main/webapp/WEB-INF/views/codekinds/findCodeKindsByLsType.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsType" id="ff_com_labsynch_labseer_domain_CodeKind" path="/codekinds" z="pMvFYNk06J3eiAtI2H15x90MRR0=">
-        <field:select disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_CodeKind_lsType" itemValue="id" items="${codetypes}" path="/codetypes" required="true" z="vEZvoUchFPDxtN0I4v8n9kaFyU4="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/codekinds/findCodeKindsByLsTypeAndKindEquals.jspx b/src/main/webapp/WEB-INF/views/codekinds/findCodeKindsByLsTypeAndKindEquals.jspx
deleted file mode 100755
index f9ff2342d..000000000
--- a/src/main/webapp/WEB-INF/views/codekinds/findCodeKindsByLsTypeAndKindEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeAndKindEquals" id="ff_com_labsynch_labseer_domain_CodeKind" path="/codekinds" z="DJktBDr3Zc0Sxo4B+ESXN7Es0UQ=">
-        <field:input disableFormBinding="true" field="lsTypeAndKind" id="f_com_labsynch_labseer_domain_CodeKind_lsTypeAndKind" max="255" required="true" z="JQSzIHfJL1tpEyLHatvb++XFnxk="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/codekinds/list.jspx b/src/main/webapp/WEB-INF/views/codekinds/list.jspx
deleted file mode 100755
index c9fee15bf..000000000
--- a/src/main/webapp/WEB-INF/views/codekinds/list.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_CodeKind" items="${codekinds}" z="tA/VUsW4J5eh2ecVCngo4labZVs=">
-        <table:table data="${codekinds}" id="l_com_labsynch_labseer_domain_CodeKind" path="/codekinds" z="Xln+Q7qThr8N37qLQwZU6pC9fTI=">
-            <table:column id="c_com_labsynch_labseer_domain_CodeKind_lsType" property="lsType" z="lsoUabxdF0fGUaiVztfdnOGMo1M="/>
-            <table:column id="c_com_labsynch_labseer_domain_CodeKind_kindName" property="kindName" z="GsbbnfHw5GP/cTodoi5xFzpQZTE="/>
-            <table:column id="c_com_labsynch_labseer_domain_CodeKind_lsTypeAndKind" property="lsTypeAndKind" z="2nekCFjflfEZ0PFzanSgSkhBUZ8="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/codekinds/show.jspx b/src/main/webapp/WEB-INF/views/codekinds/show.jspx
deleted file mode 100755
index 7af7b3f9c..000000000
--- a/src/main/webapp/WEB-INF/views/codekinds/show.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_CodeKind" object="${codekind}" path="/codekinds" z="uajcykYw8fieX1087NT1q6RTKpg=">
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_CodeKind_lsType" object="${codekind}" z="eS8zeiJc2miwHn5D5zi814e2vgc="/>
-        <field:display field="kindName" id="s_com_labsynch_labseer_domain_CodeKind_kindName" object="${codekind}" z="Lkk47uSuV5voicxTh3y70PI7Cj4="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_CodeKind_lsTypeAndKind" object="${codekind}" z="uf6Vl19pGtUzggxyp3BFGkCcB/I="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/codekinds/update.jspx b/src/main/webapp/WEB-INF/views/codekinds/update.jspx
deleted file mode 100755
index 78b7555e4..000000000
--- a/src/main/webapp/WEB-INF/views/codekinds/update.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_CodeKind" modelAttribute="codeKind" path="/codekinds" versionField="Version" z="uH09Rz6Qs6u96QVuFA3N6/DslNA=">
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_CodeKind_lsType" itemValue="id" items="${codetypes}" path="/codetypes" required="true" z="6hYYwyPL/hwHH3Z2a/oTiLOGr9s="/>
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_CodeKind_kindName" required="true" z="LKit7fGfwotgV2Ar12ZxmXliEQ4="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_CodeKind_lsTypeAndKind" z="J+zo6OFbdr2aHAX670DgBuD6RUE="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/codekinds/views.xml b/src/main/webapp/WEB-INF/views/codekinds/views.xml
deleted file mode 100755
index 70f0ce5be..000000000
--- a/src/main/webapp/WEB-INF/views/codekinds/views.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="codekinds/list">
-        <put-attribute name="body" value="/WEB-INF/views/codekinds/list.jspx"/>
-    </definition>
-<definition extends="default" name="codekinds/show">
-        <put-attribute name="body" value="/WEB-INF/views/codekinds/show.jspx"/>
-    </definition>
-<definition extends="default" name="codekinds/create">
-        <put-attribute name="body" value="/WEB-INF/views/codekinds/create.jspx"/>
-    </definition>
-<definition extends="default" name="codekinds/update">
-        <put-attribute name="body" value="/WEB-INF/views/codekinds/update.jspx"/>
-    </definition>
-<definition extends="default" name="codekinds/findCodeKindsByKindNameEqualsAndLsType">
-        <put-attribute name="body" value="/WEB-INF/views/codekinds/findCodeKindsByKindNameEqualsAndLsType.jspx"/>
-    </definition>
-<definition extends="default" name="codekinds/findCodeKindsByLsType">
-        <put-attribute name="body" value="/WEB-INF/views/codekinds/findCodeKindsByLsType.jspx"/>
-    </definition>
-<definition extends="default" name="codekinds/findCodeKindsByLsTypeAndKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/codekinds/findCodeKindsByLsTypeAndKindEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/codeorigins/create.jspx b/src/main/webapp/WEB-INF/views/codeorigins/create.jspx
deleted file mode 100644
index 9146b5f5d..000000000
--- a/src/main/webapp/WEB-INF/views/codeorigins/create.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_CodeOrigin" modelAttribute="codeOrigin" path="/codeorigins" render="${empty dependencies}" z="kbDnY4t8nN+0pS1EPHaHSan/B/I=">
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_CodeOrigin_name" required="true" z="B3pBZYBw/i5PJrJyyRbzvUPzFFc="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_CodeOrigin" render="${not empty dependencies}" z="YsQ/nEMcQcFyahP1LcT/KC+Z/J8="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/codeorigins/list.jspx b/src/main/webapp/WEB-INF/views/codeorigins/list.jspx
deleted file mode 100644
index 3e80976ed..000000000
--- a/src/main/webapp/WEB-INF/views/codeorigins/list.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_CodeOrigin" items="${codeorigins}" z="PXYhhewZSSwENP0soz48n7zeHyU=">
-        <table:table data="${codeorigins}" id="l_com_labsynch_labseer_domain_CodeOrigin" path="/codeorigins" z="09GDOHkk82oJrefHRtXEmxyFKHA=">
-            <table:column id="c_com_labsynch_labseer_domain_CodeOrigin_name" property="name" z="rGu4Op0ZiGeGLf8ONm6gK8GBFN4="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/codeorigins/show.jspx b/src/main/webapp/WEB-INF/views/codeorigins/show.jspx
deleted file mode 100644
index 9a5d8693b..000000000
--- a/src/main/webapp/WEB-INF/views/codeorigins/show.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_CodeOrigin" object="${codeorigin}" path="/codeorigins" z="rAeP/s6e+a8+E49L0PEblZmFyJ4=">
-        <field:display field="name" id="s_com_labsynch_labseer_domain_CodeOrigin_name" object="${codeorigin}" z="1LgRv9vR14GvM1/BBNROIReGZ8g="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/codeorigins/update.jspx b/src/main/webapp/WEB-INF/views/codeorigins/update.jspx
deleted file mode 100644
index 96b6eb722..000000000
--- a/src/main/webapp/WEB-INF/views/codeorigins/update.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_CodeOrigin" modelAttribute="codeOrigin" path="/codeorigins" versionField="Version" z="QnJ6r3ixgbEV8Bcb62qp31AwvAc=">
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_CodeOrigin_name" required="true" z="B3pBZYBw/i5PJrJyyRbzvUPzFFc="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/codeorigins/views.xml b/src/main/webapp/WEB-INF/views/codeorigins/views.xml
deleted file mode 100644
index 6eaaf6723..000000000
--- a/src/main/webapp/WEB-INF/views/codeorigins/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="codeorigins/list">
-        <put-attribute name="body" value="/WEB-INF/views/codeorigins/list.jspx"/>
-    </definition>
-<definition extends="default" name="codeorigins/show">
-        <put-attribute name="body" value="/WEB-INF/views/codeorigins/show.jspx"/>
-    </definition>
-<definition extends="default" name="codeorigins/create">
-        <put-attribute name="body" value="/WEB-INF/views/codeorigins/create.jspx"/>
-    </definition>
-<definition extends="default" name="codeorigins/update">
-        <put-attribute name="body" value="/WEB-INF/views/codeorigins/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/codetypes/create.jspx b/src/main/webapp/WEB-INF/views/codetypes/create.jspx
deleted file mode 100755
index d58ace408..000000000
--- a/src/main/webapp/WEB-INF/views/codetypes/create.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_CodeType" modelAttribute="codeType" path="/codetypes" render="${empty dependencies}" z="RkFJVCo2wQvtRiBWJjhWkowgngw=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_CodeType_typeName" required="true" z="vb18MtO7s5jnKAFhPfqTXtc1TwI="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_CodeType" render="${not empty dependencies}" z="5kG0SQQ3H44xvvQ2t22cz7RrkjE="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/codetypes/findCodeTypesByTypeNameEquals.jspx b/src/main/webapp/WEB-INF/views/codetypes/findCodeTypesByTypeNameEquals.jspx
deleted file mode 100755
index 932678189..000000000
--- a/src/main/webapp/WEB-INF/views/codetypes/findCodeTypesByTypeNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByTypeNameEquals" id="ff_com_labsynch_labseer_domain_CodeType" path="/codetypes" z="IqWwsRa+5/vgHhCFo18klmP82Xk=">
-        <field:input disableFormBinding="true" field="typeName" id="f_com_labsynch_labseer_domain_CodeType_typeName" max="128" required="true" z="95+tS8nMvvqvzjRx4QfQP2Ewh3k="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/codetypes/list.jspx b/src/main/webapp/WEB-INF/views/codetypes/list.jspx
deleted file mode 100755
index 562c72c75..000000000
--- a/src/main/webapp/WEB-INF/views/codetypes/list.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_CodeType" items="${codetypes}" z="PoxG3/wbOniEklcF6rmq0fRia4o=">
-        <table:table data="${codetypes}" id="l_com_labsynch_labseer_domain_CodeType" path="/codetypes" z="fFXgeZaDdjspvw52j6jOWC4a9+Q=">
-            <table:column id="c_com_labsynch_labseer_domain_CodeType_typeName" property="typeName" z="IVVGLRA6Wvb4/fPQbAsBB1mjfoA="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/codetypes/show.jspx b/src/main/webapp/WEB-INF/views/codetypes/show.jspx
deleted file mode 100755
index 07f092023..000000000
--- a/src/main/webapp/WEB-INF/views/codetypes/show.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_CodeType" object="${codetype}" path="/codetypes" z="JYIc3/t+9kSHSs96QKnS/gFrkqE=">
-        <field:display field="typeName" id="s_com_labsynch_labseer_domain_CodeType_typeName" object="${codetype}" z="n48y9YBmIvUm1Ls4uOm3YauQGxA="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/codetypes/update.jspx b/src/main/webapp/WEB-INF/views/codetypes/update.jspx
deleted file mode 100755
index b8ec2402c..000000000
--- a/src/main/webapp/WEB-INF/views/codetypes/update.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_CodeType" modelAttribute="codeType" path="/codetypes" versionField="Version" z="DJJW/qLZlpRjhmiJMB4D0tkUibI=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_CodeType_typeName" required="true" z="vb18MtO7s5jnKAFhPfqTXtc1TwI="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/codetypes/views.xml b/src/main/webapp/WEB-INF/views/codetypes/views.xml
deleted file mode 100755
index 298e22d17..000000000
--- a/src/main/webapp/WEB-INF/views/codetypes/views.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="codetypes/list">
-        <put-attribute name="body" value="/WEB-INF/views/codetypes/list.jspx"/>
-    </definition>
-<definition extends="default" name="codetypes/show">
-        <put-attribute name="body" value="/WEB-INF/views/codetypes/show.jspx"/>
-    </definition>
-<definition extends="default" name="codetypes/create">
-        <put-attribute name="body" value="/WEB-INF/views/codetypes/create.jspx"/>
-    </definition>
-<definition extends="default" name="codetypes/update">
-        <put-attribute name="body" value="/WEB-INF/views/codetypes/update.jspx"/>
-    </definition>
-<definition extends="default" name="codetypes/findCodeTypesByTypeNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/codetypes/findCodeTypesByTypeNameEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/compoundTypes/create.jspx b/src/main/webapp/WEB-INF/views/compoundTypes/create.jspx
deleted file mode 100644
index e68b95d74..000000000
--- a/src/main/webapp/WEB-INF/views/compoundTypes/create.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_CompoundType" modelAttribute="compoundType" path="/compoundTypes" render="${empty dependencies}" z="LbukSMhVlsTkMCnwLrH6x/f/jUA=">
-        <field:input field="code" id="c_com_labsynch_labseer_domain_CompoundType_code" required="true" z="3eyAgPUbZv3kukrWkOoWfCnhgn8="/>
-        <field:input field="name" id="c_com_labsynch_labseer_domain_CompoundType_name" required="true" z="mSb2c8AVg7ctofUi53isGxP1QAI="/>
-        <field:input field="displayOrder" id="c_com_labsynch_labseer_domain_CompoundType_displayOrder" validationMessageCode="field_invalid_integer" z="LYPdd7YyEoO1UQdLWsm6op5zo6A="/>
-        <field:input field="comment" id="c_com_labsynch_labseer_domain_CompoundType_comment" z="2DpOfadAZBtG1OVLG5mWbZDmc+4="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_CompoundType" render="${not empty dependencies}" z="D8A0x+s2x4eKLUYHx7+lg0Ngv94="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/compoundTypes/findCompoundTypesByCodeEquals.jspx b/src/main/webapp/WEB-INF/views/compoundTypes/findCompoundTypesByCodeEquals.jspx
deleted file mode 100644
index 27b4f929c..000000000
--- a/src/main/webapp/WEB-INF/views/compoundTypes/findCompoundTypesByCodeEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeEquals" id="ff_com_labsynch_labseer_domain_CompoundType" path="/compoundTypes" z="phAlMgTD11sblQt+nGufh4YjUqI=">
-        <field:input disableFormBinding="true" field="code" id="f_com_labsynch_labseer_domain_CompoundType_code" required="true" z="5gtiIa826RQLnodFNLek8xy3teE="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/compoundTypes/list.jspx b/src/main/webapp/WEB-INF/views/compoundTypes/list.jspx
deleted file mode 100644
index a4007ffbb..000000000
--- a/src/main/webapp/WEB-INF/views/compoundTypes/list.jspx
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_CompoundType" items="${compoundtypes}" z="q/AYJwxzQb5t6RQ0GeqiloIVoz0=">
-        <table:table data="${compoundtypes}" id="l_com_labsynch_labseer_domain_CompoundType" path="/compoundTypes" z="vSFaCJrypI/b6XEJXOD/JTKgEfQ=">
-            <table:column id="c_com_labsynch_labseer_domain_CompoundType_code" property="code" z="dd0Tj6jbE6Z6VCT3gXfHYSUBLyM="/>
-            <table:column id="c_com_labsynch_labseer_domain_CompoundType_name" property="name" z="CduMKHez1ZtETMV/BDBwv9Adjl4="/>
-            <table:column id="c_com_labsynch_labseer_domain_CompoundType_displayOrder" property="displayOrder" z="uzyZpVizpS5c42UnWbH1KLKkW0M="/>
-            <table:column id="c_com_labsynch_labseer_domain_CompoundType_comment" property="comment" z="g+9PkxfpBaKYl7+aWAUCQ7lcP/0="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/compoundTypes/show.jspx b/src/main/webapp/WEB-INF/views/compoundTypes/show.jspx
deleted file mode 100644
index bdb8fb2ce..000000000
--- a/src/main/webapp/WEB-INF/views/compoundTypes/show.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_CompoundType" object="${compoundtype}" path="/compoundTypes" z="XcF0W51CJA59WA7owrqCqAUPmUQ=">
-        <field:display field="code" id="s_com_labsynch_labseer_domain_CompoundType_code" object="${compoundtype}" z="fLgoD126223+1JmWZ5NJq+ANksI="/>
-        <field:display field="name" id="s_com_labsynch_labseer_domain_CompoundType_name" object="${compoundtype}" z="RH/dgPRmD4xyuW5MFWvYXsOwxcM="/>
-        <field:display field="displayOrder" id="s_com_labsynch_labseer_domain_CompoundType_displayOrder" object="${compoundtype}" z="u8Sknrq+RzM3Us4q5VbOJnLwoYc="/>
-        <field:display field="comment" id="s_com_labsynch_labseer_domain_CompoundType_comment" object="${compoundtype}" z="N2Gq7Km8BLmfk9Hm18Gjg5O1ngw="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/compoundTypes/update.jspx b/src/main/webapp/WEB-INF/views/compoundTypes/update.jspx
deleted file mode 100644
index db6eb3077..000000000
--- a/src/main/webapp/WEB-INF/views/compoundTypes/update.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_CompoundType" modelAttribute="compoundType" path="/compoundTypes" versionField="Version" z="bahwwsrwTjgde91aARwBB9NuQ3U=">
-        <field:input field="code" id="c_com_labsynch_labseer_domain_CompoundType_code" required="true" z="3eyAgPUbZv3kukrWkOoWfCnhgn8="/>
-        <field:input field="name" id="c_com_labsynch_labseer_domain_CompoundType_name" required="true" z="mSb2c8AVg7ctofUi53isGxP1QAI="/>
-        <field:input field="displayOrder" id="c_com_labsynch_labseer_domain_CompoundType_displayOrder" validationMessageCode="field_invalid_integer" z="LYPdd7YyEoO1UQdLWsm6op5zo6A="/>
-        <field:input field="comment" id="c_com_labsynch_labseer_domain_CompoundType_comment" z="2DpOfadAZBtG1OVLG5mWbZDmc+4="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/compoundTypes/views.xml b/src/main/webapp/WEB-INF/views/compoundTypes/views.xml
deleted file mode 100644
index b17381a93..000000000
--- a/src/main/webapp/WEB-INF/views/compoundTypes/views.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="compoundTypes/list">
-        <put-attribute name="body" value="/WEB-INF/views/compoundTypes/list.jspx"/>
-    </definition>
-<definition extends="default" name="compoundTypes/show">
-        <put-attribute name="body" value="/WEB-INF/views/compoundTypes/show.jspx"/>
-    </definition>
-<definition extends="default" name="compoundTypes/create">
-        <put-attribute name="body" value="/WEB-INF/views/compoundTypes/create.jspx"/>
-    </definition>
-<definition extends="default" name="compoundTypes/update">
-        <put-attribute name="body" value="/WEB-INF/views/compoundTypes/update.jspx"/>
-    </definition>
-<definition extends="default" name="compoundTypes/findCompoundTypesByCodeEquals">
-        <put-attribute name="body" value="/WEB-INF/views/compoundTypes/findCompoundTypesByCodeEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/compounds/create.jspx b/src/main/webapp/WEB-INF/views/compounds/create.jspx
deleted file mode 100644
index 5da82d9e6..000000000
--- a/src/main/webapp/WEB-INF/views/compounds/create.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_Compound" modelAttribute="compound" path="/compounds" render="${empty dependencies}" z="09QWPMQNwA42IythGHdIZWTjxH8=">
-        <field:textarea field="corpName" id="c_com_labsynch_labseer_domain_Compound_corpName" z="rQpXYWoeKJqAQUx2zpHFR+y/vAE="/>
-        <field:textarea field="external_id" id="c_com_labsynch_labseer_domain_Compound_external_id" z="lzja2KCUVL0t7SS1OPBeRs/Fsz0="/>
-        <field:input field="CdId" id="c_com_labsynch_labseer_domain_Compound_CdId" z="1fT1cIH/aXxs2JLPtxS0nAtD8vM="/>
-        <field:datetime dateTimePattern="${compound_createddate_date_format}" field="createdDate" id="c_com_labsynch_labseer_domain_Compound_createdDate" z="gyEqJsplKJXZdykZ4ZCY4c01xHM="/>
-        <field:datetime dateTimePattern="${compound_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_Compound_modifiedDate" z="xP7Ag70iDV8BaxKrrJtOmcO7YIc="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_Compound_ignored" z="oOwvPDFCW04P0TCwtpy3wIlRjKE="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_Compound_deleted" z="jOZ/B8kDjLKqHITfI7fzCJxFQi4="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_Compound" render="${not empty dependencies}" z="Q+erFdndvvCgCC6K7zNKyHWsRr0="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/compounds/findCompoundsByCdId.jspx b/src/main/webapp/WEB-INF/views/compounds/findCompoundsByCdId.jspx
deleted file mode 100644
index df3d47bed..000000000
--- a/src/main/webapp/WEB-INF/views/compounds/findCompoundsByCdId.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCdId" id="ff_com_labsynch_labseer_domain_Compound" path="/compounds" z="dbLyXgnfGN11BwQ02+1NDL6+eNE=">
-        <field:input disableFormBinding="true" field="CdId" id="f_com_labsynch_labseer_domain_Compound_CdId" required="true" z="wilxWO4dHb6YSuWAHeIGGO3JYiM="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/compounds/findCompoundsByExternal_idEquals.jspx b/src/main/webapp/WEB-INF/views/compounds/findCompoundsByExternal_idEquals.jspx
deleted file mode 100644
index 5cdb5ab90..000000000
--- a/src/main/webapp/WEB-INF/views/compounds/findCompoundsByExternal_idEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByExternal_idEquals" id="ff_com_labsynch_labseer_domain_Compound" path="/compounds" z="aXJ3RJk0sBBAVNV4r8JACEzi82g=">
-        <field:input disableFormBinding="true" field="external_id" id="f_com_labsynch_labseer_domain_Compound_external_id" max="255" required="true" z="COWboKiP09evulUcekUEgvpKPpo="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/compounds/list.jspx b/src/main/webapp/WEB-INF/views/compounds/list.jspx
deleted file mode 100644
index 82a60aeca..000000000
--- a/src/main/webapp/WEB-INF/views/compounds/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_Compound" items="${compounds}" z="5sWHRSVZbp+m+Fw6HLn3eAv7vlo=">
-        <table:table data="${compounds}" id="l_com_labsynch_labseer_domain_Compound" path="/compounds" z="IfBHCh4pSJC5b0W6SMCRHsxeKYI=">
-            <table:column id="c_com_labsynch_labseer_domain_Compound_corpName" property="corpName" z="KaTQDL52ZXPttENF8JhnV1EJZwI="/>
-            <table:column id="c_com_labsynch_labseer_domain_Compound_external_id" property="external_id" z="r7VDy+zhWAByodG6bEB0bvCMEAY="/>
-            <table:column id="c_com_labsynch_labseer_domain_Compound_CdId" property="cdId" z="+sIOQ/z7vvQs/e4Mv9q1YoYqeW4="/>
-            <table:column date="true" dateTimePattern="${compound_createddate_date_format}" id="c_com_labsynch_labseer_domain_Compound_createdDate" property="createdDate" z="zbM/lt5tSaexXT4/BLd2fQHPLUk="/>
-            <table:column date="true" dateTimePattern="${compound_modifieddate_date_format}" id="c_com_labsynch_labseer_domain_Compound_modifiedDate" property="modifiedDate" z="z1LCDbqaQHvfIRdbZsFwFhaMNFc="/>
-            <table:column id="c_com_labsynch_labseer_domain_Compound_ignored" property="ignored" z="QHQN96w/S8Ii7xAWdcJunbnoHUE="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/compounds/show.jspx b/src/main/webapp/WEB-INF/views/compounds/show.jspx
deleted file mode 100644
index 0730a34d7..000000000
--- a/src/main/webapp/WEB-INF/views/compounds/show.jspx
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_Compound" object="${compound}" path="/compounds" z="r7uhqn2TKnaeazWqmbml1Opguqg=">
-        <field:display field="corpName" id="s_com_labsynch_labseer_domain_Compound_corpName" object="${compound}" z="Su9+wRn0HRkt7pKVDGGPJqPPZq4="/>
-        <field:display field="external_id" id="s_com_labsynch_labseer_domain_Compound_external_id" object="${compound}" z="DVux4p1bjN5j+lOBYdEhUsxpAAI="/>
-        <field:display field="cdId" id="s_com_labsynch_labseer_domain_Compound_CdId" object="${compound}" z="h8cPVflLuX/nBs5wUzmvJdEZMEg="/>
-        <field:display date="true" dateTimePattern="${compound_createddate_date_format}" field="createdDate" id="s_com_labsynch_labseer_domain_Compound_createdDate" object="${compound}" z="ZU8P3LV3axU1YLGm436R4nkmzBA="/>
-        <field:display date="true" dateTimePattern="${compound_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_Compound_modifiedDate" object="${compound}" z="LsLO2fmTA8POBZ0qooWWxiSpeiE="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_Compound_ignored" object="${compound}" z="f8nG+YrMHrABTNn8Mg2ZhtQYbo4="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_Compound_deleted" object="${compound}" z="/Pa/gUJdbjTwhYofOrthgupoDH4="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/compounds/update.jspx b/src/main/webapp/WEB-INF/views/compounds/update.jspx
deleted file mode 100644
index 9a6e8e67b..000000000
--- a/src/main/webapp/WEB-INF/views/compounds/update.jspx
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_Compound" modelAttribute="compound" path="/compounds" versionField="Version" z="T/9sTfBSCSlv+JxqvDu9HDUjlBc=">
-        <field:textarea field="corpName" id="c_com_labsynch_labseer_domain_Compound_corpName" z="rQpXYWoeKJqAQUx2zpHFR+y/vAE="/>
-        <field:textarea field="external_id" id="c_com_labsynch_labseer_domain_Compound_external_id" z="lzja2KCUVL0t7SS1OPBeRs/Fsz0="/>
-        <field:input field="CdId" id="c_com_labsynch_labseer_domain_Compound_CdId" z="1fT1cIH/aXxs2JLPtxS0nAtD8vM="/>
-        <field:datetime dateTimePattern="${compound_createddate_date_format}" field="createdDate" id="c_com_labsynch_labseer_domain_Compound_createdDate" z="gyEqJsplKJXZdykZ4ZCY4c01xHM="/>
-        <field:datetime dateTimePattern="${compound_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_Compound_modifiedDate" z="xP7Ag70iDV8BaxKrrJtOmcO7YIc="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_Compound_ignored" z="oOwvPDFCW04P0TCwtpy3wIlRjKE="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_Compound_deleted" z="jOZ/B8kDjLKqHITfI7fzCJxFQi4="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/compounds/views.xml b/src/main/webapp/WEB-INF/views/compounds/views.xml
deleted file mode 100644
index c4f863fd0..000000000
--- a/src/main/webapp/WEB-INF/views/compounds/views.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="compounds/list">
-        <put-attribute name="body" value="/WEB-INF/views/compounds/list.jspx"/>
-    </definition>
-<definition extends="default" name="compounds/show">
-        <put-attribute name="body" value="/WEB-INF/views/compounds/show.jspx"/>
-    </definition>
-<definition extends="default" name="compounds/create">
-        <put-attribute name="body" value="/WEB-INF/views/compounds/create.jspx"/>
-    </definition>
-<definition extends="default" name="compounds/update">
-        <put-attribute name="body" value="/WEB-INF/views/compounds/update.jspx"/>
-    </definition>
-<definition extends="default" name="compounds/findCompoundsByCdId">
-        <put-attribute name="body" value="/WEB-INF/views/compounds/findCompoundsByCdId.jspx"/>
-    </definition>
-<definition extends="default" name="compounds/findCompoundsByExternal_idEquals">
-        <put-attribute name="body" value="/WEB-INF/views/compounds/findCompoundsByExternal_idEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/containerkinds/create.jspx b/src/main/webapp/WEB-INF/views/containerkinds/create.jspx
deleted file mode 100755
index f2f6697e5..000000000
--- a/src/main/webapp/WEB-INF/views/containerkinds/create.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ContainerKind" modelAttribute="containerKind" path="/containerkinds" render="${empty dependencies}" z="9zT2GzU+H8nVsDhE+0c3eiQLLpM=">
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_ContainerKind_kindName" required="true" z="b2RaAWoXg64dHFWjNe3vNwigFms="/>
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_ContainerKind_lsType" itemValue="id" items="${containertypes}" path="/containertypes" required="true" z="Up5eLkMGeXqU/Ntvo9zy61CIHbg="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ContainerKind_lsTypeAndKind" z="h/iHbrFiZc9pl7HMFc2DJiEjnlA="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ContainerKind" render="${not empty dependencies}" z="X6kHsUQLGmWHWnWT/LJwlhEdKyo="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containerkinds/list.jspx b/src/main/webapp/WEB-INF/views/containerkinds/list.jspx
deleted file mode 100755
index 56c6d4130..000000000
--- a/src/main/webapp/WEB-INF/views/containerkinds/list.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ContainerKind" items="${containerkinds}" z="6wCbxd4SavZygRY5THIbH5pCqA8=">
-        <table:table data="${containerkinds}" id="l_com_labsynch_labseer_domain_ContainerKind" path="/containerkinds" z="ywrGi0+mDQ/8SojcxEyYt/n0+VU=">
-            <table:column id="c_com_labsynch_labseer_domain_ContainerKind_kindName" property="kindName" z="Y/ons3G3wWU2KD1jIMY0tmVB3Iw="/>
-            <table:column id="c_com_labsynch_labseer_domain_ContainerKind_lsType" property="lsType" z="919GBiQkO1IT9vgLD0nDwBUPKtU="/>
-            <table:column id="c_com_labsynch_labseer_domain_ContainerKind_lsTypeAndKind" property="lsTypeAndKind" z="Rdqk8hw67CEkkQbt3fKTRSOUn5M="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containerkinds/show.jspx b/src/main/webapp/WEB-INF/views/containerkinds/show.jspx
deleted file mode 100755
index ea10e8ba9..000000000
--- a/src/main/webapp/WEB-INF/views/containerkinds/show.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ContainerKind" object="${containerkind}" path="/containerkinds" z="dgelvO+Qiluq2SNa1+iXp88XAJQ=">
-        <field:display field="kindName" id="s_com_labsynch_labseer_domain_ContainerKind_kindName" object="${containerkind}" z="Vtc8RncNqBiDbwUCa2fycC2Netk="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ContainerKind_lsType" object="${containerkind}" z="xXCcFS8uxjyLalpw01faNkH4bSo="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ContainerKind_lsTypeAndKind" object="${containerkind}" z="ILM5XaNl7/1mgqxye+CQfwAbAhU="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containerkinds/update.jspx b/src/main/webapp/WEB-INF/views/containerkinds/update.jspx
deleted file mode 100755
index 773a6962b..000000000
--- a/src/main/webapp/WEB-INF/views/containerkinds/update.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ContainerKind" modelAttribute="containerKind" path="/containerkinds" versionField="Version" z="gi7enphBp5ARWCa4+scEZSvdUik=">
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_ContainerKind_kindName" required="true" z="b2RaAWoXg64dHFWjNe3vNwigFms="/>
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_ContainerKind_lsType" itemValue="id" items="${containertypes}" path="/containertypes" required="true" z="Up5eLkMGeXqU/Ntvo9zy61CIHbg="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ContainerKind_lsTypeAndKind" z="h/iHbrFiZc9pl7HMFc2DJiEjnlA="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containerkinds/views.xml b/src/main/webapp/WEB-INF/views/containerkinds/views.xml
deleted file mode 100755
index 396342472..000000000
--- a/src/main/webapp/WEB-INF/views/containerkinds/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="containerkinds/list">
-        <put-attribute name="body" value="/WEB-INF/views/containerkinds/list.jspx"/>
-    </definition>
-<definition extends="default" name="containerkinds/show">
-        <put-attribute name="body" value="/WEB-INF/views/containerkinds/show.jspx"/>
-    </definition>
-<definition extends="default" name="containerkinds/create">
-        <put-attribute name="body" value="/WEB-INF/views/containerkinds/create.jspx"/>
-    </definition>
-<definition extends="default" name="containerkinds/update">
-        <put-attribute name="body" value="/WEB-INF/views/containerkinds/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/containerlabels/create.jspx b/src/main/webapp/WEB-INF/views/containerlabels/create.jspx
deleted file mode 100755
index cff961ee4..000000000
--- a/src/main/webapp/WEB-INF/views/containerlabels/create.jspx
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ContainerLabel" modelAttribute="containerLabel" path="/containerlabels" render="${empty dependencies}" z="OiGH6xsODjpLOSQXs2TkEdm4q5w=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ContainerLabel_recordedBy" required="true" z="KtLz3W5Kn+TB3TgX0PZzZsj1AD0="/>
-        <field:datetime dateTimePattern="${containerLabel_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ContainerLabel_recordedDate" required="true" z="WXnCoL140gw/ArKRXq/0o81R1vU="/>
-        <field:datetime dateTimePattern="${containerLabel_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ContainerLabel_modifiedDate" z="obJ5PvQQeGVp+VHF6OPZ2/M7gvo="/>
-        <field:checkbox field="physicallyLabled" id="c_com_labsynch_labseer_domain_ContainerLabel_physicallyLabled" z="N3twxXV8eGbK6/xq+xwu3hiXFic="/>
-        <field:checkbox field="preferred" id="c_com_labsynch_labseer_domain_ContainerLabel_preferred" z="bxcGp+sXtoilpQW0dryoJuqds/M="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ContainerLabel_ignored" z="LiI4MIJKuXp1Ty0TxfFHc+9Jj94="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ContainerLabel_lsTransaction" validationMessageCode="field_invalid_integer" z="Ch8npPpTXXyvYeGnTKsyM5qQqew="/>
-        <field:select field="container" id="c_com_labsynch_labseer_domain_ContainerLabel_container" itemValue="id" items="${containers}" path="/containers" required="true" z="6HVhHyYrB4U1R5Dhlyi79eLpsAs="/>
-        <field:textarea field="labelText" id="c_com_labsynch_labseer_domain_ContainerLabel_labelText" required="true" z="H6yR7aZCF31FUDyr4fY5JaGyW9w="/>
-        <field:textarea field="imageFile" id="c_com_labsynch_labseer_domain_ContainerLabel_imageFile" z="+ggoe2QZNTwIC1pWCOSuNl3g1dA="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ContainerLabel_lsType" required="true" z="genskoYJkdRfFO3OtP+49s0aSaQ="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ContainerLabel_lsKind" required="true" z="JyMw4SAxOkxVljnJHC6pDh5T/As="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ContainerLabel_lsTypeAndKind" z="UP98gA7obQTnMa1RLu32zk7Dp1g="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ContainerLabel_deleted" z="Ef7DKeAFzlgBlvI27qQEhEOzIao="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ContainerLabel" render="${not empty dependencies}" z="ZIWJCFQgEInrf5WiIi8VORNONtc="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containerlabels/findContainerLabelsByContainerAndIgnoredNot.jspx b/src/main/webapp/WEB-INF/views/containerlabels/findContainerLabelsByContainerAndIgnoredNot.jspx
deleted file mode 100755
index 59aa8004f..000000000
--- a/src/main/webapp/WEB-INF/views/containerlabels/findContainerLabelsByContainerAndIgnoredNot.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByContainerAndIgnoredNot" id="ff_com_labsynch_labseer_domain_ContainerLabel" path="/containerlabels" z="U1VxdB6Z8n6S9RQOCtVXm0SeJ24=">
-        <field:select disableFormBinding="true" field="container" id="f_com_labsynch_labseer_domain_ContainerLabel_container" itemValue="id" items="${containers}" path="/containers" required="true" z="XA0Z/36HqUP9V9PME9Fxlpmzq+c="/>
-        <field:checkbox disableFormBinding="true" field="ignored" id="f_com_labsynch_labseer_domain_ContainerLabel_ignored" z="hSD5gv93gTG5MF4GsFYp6xOZ9uQ="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containerlabels/findContainerLabelsByLabelTextEqualsAndIgnoredNot.jspx b/src/main/webapp/WEB-INF/views/containerlabels/findContainerLabelsByLabelTextEqualsAndIgnoredNot.jspx
deleted file mode 100755
index fb58d8d43..000000000
--- a/src/main/webapp/WEB-INF/views/containerlabels/findContainerLabelsByLabelTextEqualsAndIgnoredNot.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLabelTextEqualsAndIgnoredNot" id="ff_com_labsynch_labseer_domain_ContainerLabel" path="/containerlabels" z="D7o3sGIMsstN+JlYKIxMnUJCNoI=">
-        <field:input disableFormBinding="true" field="labelText" id="f_com_labsynch_labseer_domain_ContainerLabel_labelText" max="255" required="true" z="lyHS8OZqNr1ynVBAzqKlEG21YSM="/>
-        <field:checkbox disableFormBinding="true" field="ignored" id="f_com_labsynch_labseer_domain_ContainerLabel_ignored" z="hSD5gv93gTG5MF4GsFYp6xOZ9uQ="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containerlabels/findContainerLabelsByLsTransactionEquals.jspx b/src/main/webapp/WEB-INF/views/containerlabels/findContainerLabelsByLsTransactionEquals.jspx
deleted file mode 100755
index 070f1c359..000000000
--- a/src/main/webapp/WEB-INF/views/containerlabels/findContainerLabelsByLsTransactionEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTransactionEquals" id="ff_com_labsynch_labseer_domain_ContainerLabel" path="/containerlabels" z="ir8pEMAlJ4RObEHfzP9irNXB3R8=">
-        <field:input disableFormBinding="true" field="lsTransaction" id="f_com_labsynch_labseer_domain_ContainerLabel_lsTransaction" required="true" validationMessageCode="field_invalid_integer" z="NdEgqIKfiWv7GTlaqSsRYu1MHVI="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containerlabels/findContainerLabelsByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot.jspx b/src/main/webapp/WEB-INF/views/containerlabels/findContainerLabelsByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot.jspx
deleted file mode 100644
index d02977040..000000000
--- a/src/main/webapp/WEB-INF/views/containerlabels/findContainerLabelsByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot" id="ff_com_labsynch_labseer_domain_ContainerLabel" path="/containerlabels" z="HxlPfMEdFdcWFe3vTHBI5etgdOs=">
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_ContainerLabel_lsType" max="64" required="true" z="DmHECOvfljPRhk2Wl1SyCzha6LQ="/>
-        <field:input disableFormBinding="true" field="labelText" id="f_com_labsynch_labseer_domain_ContainerLabel_labelText" max="255" required="true" z="lyHS8OZqNr1ynVBAzqKlEG21YSM="/>
-        <field:checkbox disableFormBinding="true" field="ignored" id="f_com_labsynch_labseer_domain_ContainerLabel_ignored" z="hSD5gv93gTG5MF4GsFYp6xOZ9uQ="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containerlabels/list.jspx b/src/main/webapp/WEB-INF/views/containerlabels/list.jspx
deleted file mode 100755
index d2eca46d0..000000000
--- a/src/main/webapp/WEB-INF/views/containerlabels/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ContainerLabel" items="${containerlabels}" z="jNuAJSQmaEuKbcxrqJc9UTHyPTM=">
-        <table:table data="${containerlabels}" id="l_com_labsynch_labseer_domain_ContainerLabel" path="/containerlabels" z="xJTSqhXPsANEL5iYDVrgpC4XRZ4=">
-            <table:column id="c_com_labsynch_labseer_domain_ContainerLabel_recordedBy" property="recordedBy" z="1EcH/fAaVeWP5ilZYZqCh1AOoAg="/>
-            <table:column date="true" dateTimePattern="${containerLabel_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_ContainerLabel_recordedDate" property="recordedDate" z="7nAJFU+WVIgw1mkyF4mxFKbkeIo="/>
-            <table:column date="true" dateTimePattern="${containerLabel_modifieddate_date_format}" id="c_com_labsynch_labseer_domain_ContainerLabel_modifiedDate" property="modifiedDate" z="5nQpQVezHzZpVu7EGSyE36dCi7Q="/>
-            <table:column id="c_com_labsynch_labseer_domain_ContainerLabel_physicallyLabled" property="physicallyLabled" z="Ux4AqnK0FqgQpc2TVqN6URdCElA="/>
-            <table:column id="c_com_labsynch_labseer_domain_ContainerLabel_labelText" property="labelText" z="5fJsRXV0UVEczB+kMkubFwDLiCw="/>
-            <table:column id="c_com_labsynch_labseer_domain_ContainerLabel_imageFile" property="imageFile" z="T9xJaJ21r1IgAgtcDtn3ryu9G0Q="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containerlabels/show.jspx b/src/main/webapp/WEB-INF/views/containerlabels/show.jspx
deleted file mode 100755
index 5bba35844..000000000
--- a/src/main/webapp/WEB-INF/views/containerlabels/show.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ContainerLabel" object="${containerlabel}" path="/containerlabels" z="7Qa+uZhRoYMHg8YOdtiXemWgEic=">
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_ContainerLabel_recordedBy" object="${containerlabel}" z="4nfSKK0Th0EWEzjCn/F17+TXzjo="/>
-        <field:display date="true" dateTimePattern="${containerLabel_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_ContainerLabel_recordedDate" object="${containerlabel}" z="JSq/O3oDiZJEeRI4u/V17JEcqFs="/>
-        <field:display date="true" dateTimePattern="${containerLabel_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_ContainerLabel_modifiedDate" object="${containerlabel}" z="s/05u8d+Caepr5L1Vvb8ibMtVSo="/>
-        <field:display field="physicallyLabled" id="s_com_labsynch_labseer_domain_ContainerLabel_physicallyLabled" object="${containerlabel}" z="BcS7Vp7TA3x6oRPN/a/e72iHSMM="/>
-        <field:display field="preferred" id="s_com_labsynch_labseer_domain_ContainerLabel_preferred" object="${containerlabel}" z="M0qmC6xtqhSukMSWJFkPGph0ZzA="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ContainerLabel_ignored" object="${containerlabel}" z="FI+39QikF3O8dUApE/CeDFsoDzM="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_ContainerLabel_lsTransaction" object="${containerlabel}" z="9pUNV3KHziV3RX+NeEV6wstgheQ="/>
-        <field:display field="container" id="s_com_labsynch_labseer_domain_ContainerLabel_container" object="${containerlabel}" z="eR7te8tXyTdUplzppWbkzviWcgY="/>
-        <field:display field="labelText" id="s_com_labsynch_labseer_domain_ContainerLabel_labelText" object="${containerlabel}" z="6sxvYPjHUGHVvuJtHJ5NE3oEaw4="/>
-        <field:display field="imageFile" id="s_com_labsynch_labseer_domain_ContainerLabel_imageFile" object="${containerlabel}" z="OAvbBteqBO4OA3wXuk8c/TD+BlY="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ContainerLabel_lsType" object="${containerlabel}" z="iwL06/mSF/PTx0q059qeBnQlxYs="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_ContainerLabel_lsKind" object="${containerlabel}" z="JObYeF9uP6zPyfyoCzQewM8ijDA="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ContainerLabel_lsTypeAndKind" object="${containerlabel}" z="ilHw6U3dmv0SIPX4GBr8tVxjPco="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_ContainerLabel_deleted" object="${containerlabel}" z="uKdNVHRQv81U6PQCKU3R13BPiKM="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containerlabels/update.jspx b/src/main/webapp/WEB-INF/views/containerlabels/update.jspx
deleted file mode 100755
index f9d4f7d1d..000000000
--- a/src/main/webapp/WEB-INF/views/containerlabels/update.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ContainerLabel" modelAttribute="containerLabel" path="/containerlabels" versionField="Version" z="LsP48ypKWc4a+oiHLPdT3gWNqc0=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ContainerLabel_recordedBy" required="true" z="KtLz3W5Kn+TB3TgX0PZzZsj1AD0="/>
-        <field:datetime dateTimePattern="${containerLabel_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ContainerLabel_recordedDate" required="true" z="WXnCoL140gw/ArKRXq/0o81R1vU="/>
-        <field:datetime dateTimePattern="${containerLabel_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ContainerLabel_modifiedDate" z="obJ5PvQQeGVp+VHF6OPZ2/M7gvo="/>
-        <field:checkbox field="physicallyLabled" id="c_com_labsynch_labseer_domain_ContainerLabel_physicallyLabled" z="N3twxXV8eGbK6/xq+xwu3hiXFic="/>
-        <field:checkbox field="preferred" id="c_com_labsynch_labseer_domain_ContainerLabel_preferred" z="bxcGp+sXtoilpQW0dryoJuqds/M="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ContainerLabel_ignored" z="LiI4MIJKuXp1Ty0TxfFHc+9Jj94="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ContainerLabel_lsTransaction" validationMessageCode="field_invalid_integer" z="Ch8npPpTXXyvYeGnTKsyM5qQqew="/>
-        <field:select field="container" id="c_com_labsynch_labseer_domain_ContainerLabel_container" itemValue="id" items="${containers}" path="/containers" required="true" z=""/>
-        <field:textarea field="labelText" id="c_com_labsynch_labseer_domain_ContainerLabel_labelText" required="true" z="H6yR7aZCF31FUDyr4fY5JaGyW9w="/>
-        <field:textarea field="imageFile" id="c_com_labsynch_labseer_domain_ContainerLabel_imageFile" z="+ggoe2QZNTwIC1pWCOSuNl3g1dA="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ContainerLabel_lsType" required="true" z="genskoYJkdRfFO3OtP+49s0aSaQ="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ContainerLabel_lsKind" required="true" z="JyMw4SAxOkxVljnJHC6pDh5T/As="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ContainerLabel_lsTypeAndKind" z="UP98gA7obQTnMa1RLu32zk7Dp1g="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ContainerLabel_deleted" z="Ef7DKeAFzlgBlvI27qQEhEOzIao="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containerlabels/views.xml b/src/main/webapp/WEB-INF/views/containerlabels/views.xml
deleted file mode 100755
index 70b226f23..000000000
--- a/src/main/webapp/WEB-INF/views/containerlabels/views.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="containerlabels/list">
-        <put-attribute name="body" value="/WEB-INF/views/containerlabels/list.jspx"/>
-    </definition>
-<definition extends="default" name="containerlabels/show">
-        <put-attribute name="body" value="/WEB-INF/views/containerlabels/show.jspx"/>
-    </definition>
-<definition extends="default" name="containerlabels/create">
-        <put-attribute name="body" value="/WEB-INF/views/containerlabels/create.jspx"/>
-    </definition>
-<definition extends="default" name="containerlabels/update">
-        <put-attribute name="body" value="/WEB-INF/views/containerlabels/update.jspx"/>
-    </definition>
-<definition extends="default" name="containerlabels/findContainerLabelsByContainerAndIgnoredNot">
-        <put-attribute name="body" value="/WEB-INF/views/containerlabels/findContainerLabelsByContainerAndIgnoredNot.jspx"/>
-    </definition>
-<definition extends="default" name="containerlabels/findContainerLabelsByLabelTextEqualsAndIgnoredNot">
-        <put-attribute name="body" value="/WEB-INF/views/containerlabels/findContainerLabelsByLabelTextEqualsAndIgnoredNot.jspx"/>
-    </definition>
-<definition extends="default" name="containerlabels/findContainerLabelsByLsTransactionEquals">
-        <put-attribute name="body" value="/WEB-INF/views/containerlabels/findContainerLabelsByLsTransactionEquals.jspx"/>
-    </definition>
-<definition extends="default" name="containerlabels/findContainerLabelsByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot">
-        <put-attribute name="body" value="/WEB-INF/views/containerlabels/findContainerLabelsByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/containers/create.jspx b/src/main/webapp/WEB-INF/views/containers/create.jspx
deleted file mode 100755
index 1b34032e8..000000000
--- a/src/main/webapp/WEB-INF/views/containers/create.jspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_Container" modelAttribute="container" path="/containers" render="${empty dependencies}" z="8JwxM95pnOJlbR9By6AW6uCGm3M=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_Container_recordedBy" required="true" z="X1xaSOyGDisGAoiUA/RJbeSeNB4="/>
-        <field:datetime dateTimePattern="${container_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_Container_recordedDate" required="true" z="XzjxC19XBYTOwWU6zpoPnWX0iJI="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_Container_modifiedBy" z="K7GmiAWvuvO0jgFg7o9WcsJffV0="/>
-        <field:datetime dateTimePattern="${container_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_Container_modifiedDate" z="NOdp8IwrxLGjsxuUD9TbZKdm7zA="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_Container_ignored" z="kOxFAmlil4MwsUe22uH4JMchlRE="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_Container_lsTransaction" validationMessageCode="field_invalid_integer" z="OnXJYgnk/OQKc8ePSsybcn0pRwk="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_Container_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="f1DiEkSbo+ZVimQYQe8aqXmM024="/>
-        <field:simple field="firstContainers" id="c_com_labsynch_labseer_domain_Container_firstContainers" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Container Container" z="yr/p/r//9SqIH/K28DLFfWIwNoQ="/>
-        <field:simple field="secondContainers" id="c_com_labsynch_labseer_domain_Container_secondContainers" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Container Container" z="Y/47T3s9AAVy+ARlkpQptZ+2yeI="/>
-        <field:simple field="subjects" id="c_com_labsynch_labseer_domain_Container_subjects" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Subject Container" z="22TUubRsSROM8ng8WAfuVsx+yrw="/>
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_Container_codeName" z="zENhmeRHk2iYsH0Vh9qEfeviVUc="/>
-        <field:input field="locationId" id="c_com_labsynch_labseer_domain_Container_locationId" validationMessageCode="field_invalid_integer" z="VjV3uTVQTJErO5YIICm6qKzhaf0="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_Container_lsType" required="true" z="RNtdQRkj6QbHC4uCxo+8sJ4aQvM="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_Container_lsKind" required="true" z="LT1Vo+w3tdVfazcN5YB+jZakGzQ="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_Container_lsTypeAndKind" z="MGvjNmahzJ/Nizz6MNMI7zjSZvY="/>
-        <field:simple field="lsLabels" id="c_com_labsynch_labseer_domain_Container_lsLabels" messageCode="entity_reference_not_managed" messageCodeAttribute="Container Label" z="8BA/p4Fv+3O3Umgi2tImlZOGQbU="/>
-        <field:simple field="lsStates" id="c_com_labsynch_labseer_domain_Container_lsStates" messageCode="entity_reference_not_managed" messageCodeAttribute="Container State" z="XW2jhs1bOB1sJ5KGUM8eBtk6zXI="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_Container_deleted" z="psP5+0SByLLdDw3of8Y2Z8uRP5M="/>
-        <field:input field="rowIndex" id="c_com_labsynch_labseer_domain_Container_rowIndex" validationMessageCode="field_invalid_integer" z="QcMNiazsI3hyy9/kK1Mpu+hmkCQ="/>
-        <field:input field="columnIndex" id="c_com_labsynch_labseer_domain_Container_columnIndex" validationMessageCode="field_invalid_integer" z="0eW3rqVqcpjJykmcaSe4fi/5y1I="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_Container" render="${not empty dependencies}" z="UHqqXpIMg44YLc9d81IEjjgkEXw="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containers/list.jspx b/src/main/webapp/WEB-INF/views/containers/list.jspx
deleted file mode 100755
index 1fd2927f0..000000000
--- a/src/main/webapp/WEB-INF/views/containers/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_Container" items="${containers}" z="FztgjP7lECoyXKt8DcZ2J/exI6A=">
-        <table:table data="${containers}" id="l_com_labsynch_labseer_domain_Container" path="/containers" z="dKaljnQmLB1XFHSA7ecF+Hldnfc=">
-            <table:column id="c_com_labsynch_labseer_domain_Container_recordedBy" property="recordedBy" z="993XIZBMhd5nV0WtK73T9rYDOds="/>
-            <table:column date="true" dateTimePattern="${container_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_Container_recordedDate" property="recordedDate" z="s5UEFtXt1epLjdef6fQL1UzpgfY="/>
-            <table:column id="c_com_labsynch_labseer_domain_Container_codeName" property="codeName" z="dURDa8o4QadiNO96tCcw5AxEJDM="/>
-            <table:column id="c_com_labsynch_labseer_domain_Container_lsType" property="lsType" z="6LzbWe1JLJlrJkzuIsyutZQZyvo="/>
-            <table:column id="c_com_labsynch_labseer_domain_Container_lsKind" property="lsKind" z="JlWAKHEM8QyarYLTACAa/JscC+o="/>
-            <table:column id="c_com_labsynch_labseer_domain_Container_lsTypeAndKind" property="lsTypeAndKind" z="lxseR0tqME2Ln4wrMDRcK2yFe2E="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containers/show.jspx b/src/main/webapp/WEB-INF/views/containers/show.jspx
deleted file mode 100755
index 767cf3c7b..000000000
--- a/src/main/webapp/WEB-INF/views/containers/show.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_Container" object="${container}" path="/containers" z="qpkzbT0ru8cJUy/AFooy2KmUJzY=">
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_Container_recordedBy" object="${container}" z="p5tU3tcCPYQwbOz5jOU9bkwQIsw="/>
-        <field:display date="true" dateTimePattern="${container_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_Container_recordedDate" object="${container}" z="0mNbTHydbhqselIf84GHmPKbnhw="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_Container_modifiedBy" object="${container}" z="/lDtWXhfaQeIFonkof71vxETSs0="/>
-        <field:display date="true" dateTimePattern="${container_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_Container_modifiedDate" object="${container}" z="9JWmEByiwzIR0i7nD3i7pCypNWo="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_Container_ignored" object="${container}" z="9TDfOmuywDyzVEQHCSGu/f3DKok="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_Container_lsTransaction" object="${container}" z="NizVo98S5YFLMcu/dy63MwgHBVE="/>
-        <field:display field="codeName" id="s_com_labsynch_labseer_domain_Container_codeName" object="${container}" z="MgVZ79tyeEdb/13Glu1Q1iGGo/g="/>
-        <field:display field="locationId" id="s_com_labsynch_labseer_domain_Container_locationId" object="${container}" z="6WQV/L2YopMnzBlDJG+SLp0sx9k="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_Container_lsType" object="${container}" z="mGvzP9GX44Uu3FomheRUNzGnNOg="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_Container_lsKind" object="${container}" z="vqIl/qsV9rr+MyUy3fdu4Q0nJzA="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_Container_lsTypeAndKind" object="${container}" z="LUYZ4fbo+fT9fnINnAcXH9Qd1WQ="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_Container_deleted" object="${container}" z="XQIXupMmxITtE6b2iVQcpXy+TGg="/>
-        <field:display field="rowIndex" id="s_com_labsynch_labseer_domain_Container_rowIndex" object="${container}" z="fNyG0W7Nn65MNVQ/I9cMCOo1W/0="/>
-        <field:display field="columnIndex" id="s_com_labsynch_labseer_domain_Container_columnIndex" object="${container}" z="b1c847AU3KpGwCyR3XQ+DDu8ypo="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containers/update.jspx b/src/main/webapp/WEB-INF/views/containers/update.jspx
deleted file mode 100755
index 0163d148c..000000000
--- a/src/main/webapp/WEB-INF/views/containers/update.jspx
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_Container" modelAttribute="container" path="/containers" versionField="Version" z="usMZde8eFQalo67JsVfOTu6EFsc=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_Container_recordedBy" required="true" z="X1xaSOyGDisGAoiUA/RJbeSeNB4="/>
-        <field:datetime dateTimePattern="${container_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_Container_recordedDate" required="true" z="XzjxC19XBYTOwWU6zpoPnWX0iJI="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_Container_modifiedBy" z="K7GmiAWvuvO0jgFg7o9WcsJffV0="/>
-        <field:datetime dateTimePattern="${container_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_Container_modifiedDate" z="NOdp8IwrxLGjsxuUD9TbZKdm7zA="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_Container_ignored" z="kOxFAmlil4MwsUe22uH4JMchlRE="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_Container_lsTransaction" validationMessageCode="field_invalid_integer" z="OnXJYgnk/OQKc8ePSsybcn0pRwk="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_Container_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="f1DiEkSbo+ZVimQYQe8aqXmM024="/>
-        <field:simple field="firstContainers" id="c_com_labsynch_labseer_domain_Container_firstContainers" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Container Container" z="yr/p/r//9SqIH/K28DLFfWIwNoQ="/>
-        <field:simple field="secondContainers" id="c_com_labsynch_labseer_domain_Container_secondContainers" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Container Container" z="Y/47T3s9AAVy+ARlkpQptZ+2yeI="/>
-        <field:simple field="subjects" id="c_com_labsynch_labseer_domain_Container_subjects" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Subject Container" z="22TUubRsSROM8ng8WAfuVsx+yrw="/>
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_Container_codeName" z="zENhmeRHk2iYsH0Vh9qEfeviVUc="/>
-        <field:input field="locationId" id="c_com_labsynch_labseer_domain_Container_locationId" validationMessageCode="field_invalid_integer" z="VjV3uTVQTJErO5YIICm6qKzhaf0="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_Container_lsType" required="true" z="RNtdQRkj6QbHC4uCxo+8sJ4aQvM="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_Container_lsKind" required="true" z="LT1Vo+w3tdVfazcN5YB+jZakGzQ="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_Container_lsTypeAndKind" z="MGvjNmahzJ/Nizz6MNMI7zjSZvY="/>
-        <field:simple field="lsLabels" id="c_com_labsynch_labseer_domain_Container_lsLabels" messageCode="entity_reference_not_managed" messageCodeAttribute="Container Label" z="8BA/p4Fv+3O3Umgi2tImlZOGQbU="/>
-        <field:simple field="lsStates" id="c_com_labsynch_labseer_domain_Container_lsStates" messageCode="entity_reference_not_managed" messageCodeAttribute="Container State" z="XW2jhs1bOB1sJ5KGUM8eBtk6zXI="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_Container_deleted" z="psP5+0SByLLdDw3of8Y2Z8uRP5M="/>
-        <field:input field="rowIndex" id="c_com_labsynch_labseer_domain_Container_rowIndex" validationMessageCode="field_invalid_integer" z="QcMNiazsI3hyy9/kK1Mpu+hmkCQ="/>
-        <field:input field="columnIndex" id="c_com_labsynch_labseer_domain_Container_columnIndex" validationMessageCode="field_invalid_integer" z="0eW3rqVqcpjJykmcaSe4fi/5y1I="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containers/views.xml b/src/main/webapp/WEB-INF/views/containers/views.xml
deleted file mode 100755
index a3125c8cd..000000000
--- a/src/main/webapp/WEB-INF/views/containers/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="containers/list">
-        <put-attribute name="body" value="/WEB-INF/views/containers/list.jspx"/>
-    </definition>
-<definition extends="default" name="containers/show">
-        <put-attribute name="body" value="/WEB-INF/views/containers/show.jspx"/>
-    </definition>
-<definition extends="default" name="containers/create">
-        <put-attribute name="body" value="/WEB-INF/views/containers/create.jspx"/>
-    </definition>
-<definition extends="default" name="containers/update">
-        <put-attribute name="body" value="/WEB-INF/views/containers/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/containerstates/create.jspx b/src/main/webapp/WEB-INF/views/containerstates/create.jspx
deleted file mode 100755
index 65c0482b9..000000000
--- a/src/main/webapp/WEB-INF/views/containerstates/create.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ContainerState" modelAttribute="containerState" path="/containerstates" render="${empty dependencies}" z="QBynb75fnW71PZRDKB1VBHEKxNY=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ContainerState_recordedBy" required="true" z="bJiCBaDGGMzFfynSiVKPFLRwhkk="/>
-        <field:datetime dateTimePattern="${containerState_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ContainerState_recordedDate" required="true" z="FulWGwsT4Lkg7FWMaj4lVmnQp7E="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ContainerState_modifiedBy" z="qTmAQUtRIyezkoLVRZzVJksYVmo="/>
-        <field:datetime dateTimePattern="${containerState_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ContainerState_modifiedDate" z="7UWlSYNAyMK13ofrtWkr/L1J21Y="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ContainerState_comments" z="Id//FKt4/o372mVOxf3MRjGexQo="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ContainerState_ignored" z="h+TVeO8SY/IaCR2kB1kk0cAsrnY="/>
-        <field:input field="container" id="c_com_labsynch_labseer_domain_ContainerState_container" z="user-managed"/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ContainerState_lsTransaction" validationMessageCode="field_invalid_integer" z="qNhl2wR31bu7o5mO/4fkj82YZo4="/>
-        <field:simple field="lsValues" id="c_com_labsynch_labseer_domain_ContainerState_lsValues" messageCode="entity_reference_not_managed" messageCodeAttribute="Container Value" z="F5CYxxWBNvSQ5JZTw4M+ha9GG4A="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ContainerState_lsType" required="true" z="29IYUZ+JdwzId9rPXPOxlZZz8H0="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ContainerState_lsKind" required="true" z="Ub51DOnL5uwdZ34NTBB0MntBDEY="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ContainerState_lsTypeAndKind" z="99FEt+ddKaZd8zm5QTcoB2ypjDI="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ContainerState_deleted" z="+mBtj6auW5K8ZU9wG6GtYA+kwp8="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ContainerState" render="${not empty dependencies}" z="Z/A0noTzQ5md4QumuHtRf6Jsn9E="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containerstates/findContainerStatesByContainer.jspx b/src/main/webapp/WEB-INF/views/containerstates/findContainerStatesByContainer.jspx
deleted file mode 100755
index a3cbe11dd..000000000
--- a/src/main/webapp/WEB-INF/views/containerstates/findContainerStatesByContainer.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByContainer" id="ff_com_labsynch_labseer_domain_ContainerState" path="/containerstates" z="V0M2lShwik2FUsrH1GIEd3og5PM=">
-        <field:select disableFormBinding="true" field="container" id="f_com_labsynch_labseer_domain_ContainerState_container" itemValue="id" items="${containers}" path="/containers" required="true" z="HmAx32LsqecCAoxQ4qRpmhOS7p4="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containerstates/findContainerStatesByContainerAndLsKindEqualsAndIgnoredNot.jspx b/src/main/webapp/WEB-INF/views/containerstates/findContainerStatesByContainerAndLsKindEqualsAndIgnoredNot.jspx
deleted file mode 100755
index 7279c6c0d..000000000
--- a/src/main/webapp/WEB-INF/views/containerstates/findContainerStatesByContainerAndLsKindEqualsAndIgnoredNot.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByContainerAndLsKindEqualsAndIgnoredNot" id="ff_com_labsynch_labseer_domain_ContainerState" path="/containerstates" z="34yL8Tfp3GuzO4Xsjq0z5A681eo=">
-        <field:select disableFormBinding="true" field="container" id="f_com_labsynch_labseer_domain_ContainerState_container" itemValue="id" items="${containers}" path="/containers" required="true" z="HmAx32LsqecCAoxQ4qRpmhOS7p4="/>
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_ContainerState_lsKind" max="255" required="true" z="npmmlfdxCvgBdA29gFEZPB6p/WI="/>
-        <field:checkbox disableFormBinding="true" field="ignored" id="f_com_labsynch_labseer_domain_ContainerState_ignored" z="2nwWIV6Hi/biDC6cOIuf+Nsx3LQ="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containerstates/findContainerStatesByIgnoredNot.jspx b/src/main/webapp/WEB-INF/views/containerstates/findContainerStatesByIgnoredNot.jspx
deleted file mode 100755
index f2032308f..000000000
--- a/src/main/webapp/WEB-INF/views/containerstates/findContainerStatesByIgnoredNot.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByIgnoredNot" id="ff_com_labsynch_labseer_domain_ContainerState" path="/containerstates" z="wXfAi1S+BuF+o1u6ncuDzVnY9y0=">
-        <field:checkbox disableFormBinding="true" field="ignored" id="f_com_labsynch_labseer_domain_ContainerState_ignored" z="2nwWIV6Hi/biDC6cOIuf+Nsx3LQ="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containerstates/list.jspx b/src/main/webapp/WEB-INF/views/containerstates/list.jspx
deleted file mode 100755
index 8e11eac91..000000000
--- a/src/main/webapp/WEB-INF/views/containerstates/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ContainerState" items="${containerstates}" z="CxiruFFpbhl/avU9ZM+5K/jSPzo=">
-        <table:table data="${containerstates}" id="l_com_labsynch_labseer_domain_ContainerState" path="/containerstates" z="bZqv0RMYNwDrjX5fRqRe4E/YzKA=">
-            <table:column id="c_com_labsynch_labseer_domain_ContainerState_recordedBy" property="recordedBy" z="N7ftWInZ5nr3/nd1uGvveH8lpRU="/>
-            <table:column date="true" dateTimePattern="${containerState_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_ContainerState_recordedDate" property="recordedDate" z="mgwIosNlycmcnq0QztwncbQrNmI="/>
-            <table:column id="c_com_labsynch_labseer_domain_ContainerState_modifiedBy" property="modifiedBy" z="eWyoCeHC7xd4cK2gCiDmMbRHoeA="/>
-            <table:column date="true" dateTimePattern="${containerState_modifieddate_date_format}" id="c_com_labsynch_labseer_domain_ContainerState_modifiedDate" property="modifiedDate" z="BWrE/RQNNYpcfsP+lWZfPe6xvAw="/>
-            <table:column id="c_com_labsynch_labseer_domain_ContainerState_lsType" property="lsType" z="9kFhEzBDqqwHvQr3airZrm1r4FI="/>
-            <table:column id="c_com_labsynch_labseer_domain_ContainerState_lsKind" property="lsKind" z="ssgw565CrKXFc4gvozBVIvALSns="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containerstates/show.jspx b/src/main/webapp/WEB-INF/views/containerstates/show.jspx
deleted file mode 100755
index 9a6423278..000000000
--- a/src/main/webapp/WEB-INF/views/containerstates/show.jspx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ContainerState" object="${containerstate}" path="/containerstates" z="2SpdIda3pjjuMovje70ozlZdHd8=">
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_ContainerState_recordedBy" object="${containerstate}" z="MpzsbqfSUsxHjY9NgEclyeqznio="/>
-        <field:display date="true" dateTimePattern="${containerState_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_ContainerState_recordedDate" object="${containerstate}" z="zgMGJ9DVJMH1yFUal5ZPTnbpCTA="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_ContainerState_modifiedBy" object="${containerstate}" z="/VlLB7C7SBiufCNeiJLv50y3X0c="/>
-        <field:display date="true" dateTimePattern="${containerState_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_ContainerState_modifiedDate" object="${containerstate}" z="+th2clsAFuP1nlrXjofUmRU4A4Y="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_ContainerState_comments" object="${containerstate}" z="Va/d0Y3qNM0VcjC61FJBfDahaBs="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ContainerState_ignored" object="${containerstate}" z="ieHUyUCWXpMkFVbHfo0d/DiwsQM="/>
-        <field:display field="container" id="s_com_labsynch_labseer_domain_ContainerState_container" object="${containerstate}" z="wMm99VD/YpT2GIPMFbabPBMDJFA="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_ContainerState_lsTransaction" object="${containerstate}" z="mzL04gM8IKcWWu+eSjx8nFFz4uU="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ContainerState_lsType" object="${containerstate}" z="vAH9X0jnoFknnyr7zTxqIrqwhKA="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_ContainerState_lsKind" object="${containerstate}" z="RTihzKk6gJn5rgLIdVfygMRK5t0="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ContainerState_lsTypeAndKind" object="${containerstate}" z="8PbCo0pz1z/liLv3EwSmT7yjT1c="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_ContainerState_deleted" object="${containerstate}" z="OdSlksS7DmOQz6ksXBDJPw72Ozc="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containerstates/update.jspx b/src/main/webapp/WEB-INF/views/containerstates/update.jspx
deleted file mode 100755
index f36ba2feb..000000000
--- a/src/main/webapp/WEB-INF/views/containerstates/update.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ContainerState" modelAttribute="containerState" path="/containerstates" versionField="Version" z="dP81hDf+b8iVVkAbq8fKgr5ynAw=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ContainerState_recordedBy" required="true" z="bJiCBaDGGMzFfynSiVKPFLRwhkk="/>
-        <field:datetime dateTimePattern="${containerState_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ContainerState_recordedDate" required="true" z="FulWGwsT4Lkg7FWMaj4lVmnQp7E="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ContainerState_modifiedBy" z="qTmAQUtRIyezkoLVRZzVJksYVmo="/>
-        <field:datetime dateTimePattern="${containerState_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ContainerState_modifiedDate" z="7UWlSYNAyMK13ofrtWkr/L1J21Y="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ContainerState_lsType" required="true" z="29IYUZ+JdwzId9rPXPOxlZZz8H0="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ContainerState_lsKind" required="true" z="Ub51DOnL5uwdZ34NTBB0MntBDEY="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ContainerState_lsTypeAndKind" z="99FEt+ddKaZd8zm5QTcoB2ypjDI="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ContainerState_comments" z="Id//FKt4/o372mVOxf3MRjGexQo="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ContainerState_ignored" z="h+TVeO8SY/IaCR2kB1kk0cAsrnY="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ContainerState_lsTransaction" validationMessageCode="field_invalid_integer" z="qNhl2wR31bu7o5mO/4fkj82YZo4="/>
-        <field:simple field="lsValues" id="c_com_labsynch_labseer_domain_ContainerState_lsValues" messageCode="entity_reference_not_managed" messageCodeAttribute="Container Value" z="F5CYxxWBNvSQ5JZTw4M+ha9GG4A="/>
-        <field:input field="container" id="c_com_labsynch_labseer_domain_ContainerState_container" z="user-managed"/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ContainerState_deleted" z="+mBtj6auW5K8ZU9wG6GtYA+kwp8="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containerstates/views.xml b/src/main/webapp/WEB-INF/views/containerstates/views.xml
deleted file mode 100755
index 1b4f4d5fb..000000000
--- a/src/main/webapp/WEB-INF/views/containerstates/views.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="containerstates/list">
-        <put-attribute name="body" value="/WEB-INF/views/containerstates/list.jspx"/>
-    </definition>
-<definition extends="default" name="containerstates/show">
-        <put-attribute name="body" value="/WEB-INF/views/containerstates/show.jspx"/>
-    </definition>
-<definition extends="default" name="containerstates/create">
-        <put-attribute name="body" value="/WEB-INF/views/containerstates/create.jspx"/>
-    </definition>
-<definition extends="default" name="containerstates/update">
-        <put-attribute name="body" value="/WEB-INF/views/containerstates/update.jspx"/>
-    </definition>
-<definition extends="default" name="containerstates/findContainerStatesByContainer">
-        <put-attribute name="body" value="/WEB-INF/views/containerstates/findContainerStatesByContainer.jspx"/>
-    </definition>
-<definition extends="default" name="containerstates/findContainerStatesByIgnoredNot">
-        <put-attribute name="body" value="/WEB-INF/views/containerstates/findContainerStatesByIgnoredNot.jspx"/>
-    </definition>
-<definition extends="default" name="containerstates/findContainerStatesByContainerAndLsKindEqualsAndIgnoredNot">
-        <put-attribute name="body" value="/WEB-INF/views/containerstates/findContainerStatesByContainerAndLsKindEqualsAndIgnoredNot.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/containertypes/create.jspx b/src/main/webapp/WEB-INF/views/containertypes/create.jspx
deleted file mode 100755
index f58b91a53..000000000
--- a/src/main/webapp/WEB-INF/views/containertypes/create.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ContainerType" modelAttribute="containerType" path="/containertypes" render="${empty dependencies}" z="Rj7HaJCzOCApRQuS12EsS0wx5UE=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_ContainerType_typeName" required="true" z="FM2YcF3Z4WGG/W1cq3q3ZLkI3xw="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ContainerType" render="${not empty dependencies}" z="hhwrW2mE0m8OTBfpjT8S9XH43tc="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containertypes/findContainerTypesByTypeNameEquals.jspx b/src/main/webapp/WEB-INF/views/containertypes/findContainerTypesByTypeNameEquals.jspx
deleted file mode 100755
index 4a9da3cde..000000000
--- a/src/main/webapp/WEB-INF/views/containertypes/findContainerTypesByTypeNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByTypeNameEquals" id="ff_com_labsynch_labseer_domain_ContainerType" path="/containertypes" z="Gub0knLrGnPSd7r2kbPziPww/fg=">
-        <field:input disableFormBinding="true" field="typeName" id="f_com_labsynch_labseer_domain_ContainerType_typeName" max="128" required="true" z="KdvSHU+kUk2+duNakFV0/9NbmBw="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containertypes/list.jspx b/src/main/webapp/WEB-INF/views/containertypes/list.jspx
deleted file mode 100755
index 9c0099535..000000000
--- a/src/main/webapp/WEB-INF/views/containertypes/list.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ContainerType" items="${containertypes}" z="zFkwRC5J5HLody0zpjtqqK1AddQ=">
-        <table:table data="${containertypes}" id="l_com_labsynch_labseer_domain_ContainerType" path="/containertypes" z="KxMXuJgn9eZxgc2QQKRxkLTaEyI=">
-            <table:column id="c_com_labsynch_labseer_domain_ContainerType_typeName" property="typeName" z="252qbdHzFCBznzzutU2xfeLdQ7U="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containertypes/show.jspx b/src/main/webapp/WEB-INF/views/containertypes/show.jspx
deleted file mode 100755
index 2244b4ece..000000000
--- a/src/main/webapp/WEB-INF/views/containertypes/show.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ContainerType" object="${containertype}" path="/containertypes" z="yV2u7JkSKByR95DEhYfEy0dhgoI=">
-        <field:display field="typeName" id="s_com_labsynch_labseer_domain_ContainerType_typeName" object="${containertype}" z="jZaE8O7DxmPfKa4BTWqW1zaocaw="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containertypes/update.jspx b/src/main/webapp/WEB-INF/views/containertypes/update.jspx
deleted file mode 100755
index 4fff6b5b0..000000000
--- a/src/main/webapp/WEB-INF/views/containertypes/update.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ContainerType" modelAttribute="containerType" path="/containertypes" versionField="Version" z="/ScWemZ9JqjXXUkKHxakI8Qh2bw=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_ContainerType_typeName" required="true" z="FM2YcF3Z4WGG/W1cq3q3ZLkI3xw="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containertypes/views.xml b/src/main/webapp/WEB-INF/views/containertypes/views.xml
deleted file mode 100755
index 4fac2e49f..000000000
--- a/src/main/webapp/WEB-INF/views/containertypes/views.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="containertypes/list">
-        <put-attribute name="body" value="/WEB-INF/views/containertypes/list.jspx"/>
-    </definition>
-<definition extends="default" name="containertypes/show">
-        <put-attribute name="body" value="/WEB-INF/views/containertypes/show.jspx"/>
-    </definition>
-<definition extends="default" name="containertypes/create">
-        <put-attribute name="body" value="/WEB-INF/views/containertypes/create.jspx"/>
-    </definition>
-<definition extends="default" name="containertypes/update">
-        <put-attribute name="body" value="/WEB-INF/views/containertypes/update.jspx"/>
-    </definition>
-<definition extends="default" name="containertypes/findContainerTypesByTypeNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/containertypes/findContainerTypesByTypeNameEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/containervalues/create.jspx b/src/main/webapp/WEB-INF/views/containervalues/create.jspx
deleted file mode 100755
index 4f50b6b3f..000000000
--- a/src/main/webapp/WEB-INF/views/containervalues/create.jspx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ContainerValue" modelAttribute="containerValue" path="/containervalues" render="${empty dependencies}" z="djl9nMTVLd19EoHf4im61VFQ3oQ=">
-        <field:textarea field="stringValue" id="c_com_labsynch_labseer_domain_ContainerValue_stringValue" z="2mkDuvFWK/EZ80LURQ96UH8/0wA="/>
-        <field:textarea field="fileValue" id="c_com_labsynch_labseer_domain_ContainerValue_fileValue" z="D63bZ1ob3065JAvbuMOrk+4RhTU="/>
-        <field:textarea field="urlValue" id="c_com_labsynch_labseer_domain_ContainerValue_urlValue" z="dqI/UPBjt5pMj65QUeGo1pF3Au8="/>
-        <field:datetime dateTimePattern="${containerValue_datevalue_date_format}" field="dateValue" id="c_com_labsynch_labseer_domain_ContainerValue_dateValue" z="GrFsjWEhAsfEG5OIOsczT7uE9b4="/>
-        <field:input field="clobValue" id="c_com_labsynch_labseer_domain_ContainerValue_clobValue" z="Mt43bPqAswOztbYejyWEqcMmVUU="/>
-        <field:input field="blobValue" id="c_com_labsynch_labseer_domain_ContainerValue_blobValue" z="Bt88wI8sowyBantneInwaudZpXI="/>
-        <field:input field="sigFigs" id="c_com_labsynch_labseer_domain_ContainerValue_sigFigs" validationMessageCode="field_invalid_integer" z="WUOjTHtrOfOS3+KZ7nJm2g7E5GE="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ContainerValue_comments" z="iBIj2BSTzZ2SzNZvCGsDogjA2X4="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ContainerValue_ignored" z="eDPkGeBz6SAnYjTtsAanlyGxseY="/>
-        <field:datetime dateTimePattern="${containerValue_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ContainerValue_recordedDate" required="true" z="knPKwQ/MZLZ5LSFsJSXdcIeocg0="/>
-        <field:datetime dateTimePattern="${containerValue_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ContainerValue_modifiedDate" z="Z8peTNzagHJ1xzqET6QxYy+9hwQ="/>
-        <field:checkbox field="publicData" id="c_com_labsynch_labseer_domain_ContainerValue_publicData" z="QkODD8W2eA6Sq8PcbzQtXVmn2jI="/>
-        <field:textarea field="codeValue" id="c_com_labsynch_labseer_domain_ContainerValue_codeValue" z="hu70GAdGOCBGKk+iaKzczuzb120="/>
-        <field:input field="numberOfReplicates" id="c_com_labsynch_labseer_domain_ContainerValue_numberOfReplicates" validationMessageCode="field_invalid_integer" z="aMzNOM4ATdgPUUSrMKVXqesJBFA="/>
-        <field:textarea field="uncertaintyType" id="c_com_labsynch_labseer_domain_ContainerValue_uncertaintyType" z="vjMfcFgeOQWnhWIPg09O0mdutEg="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ContainerValue_lsTransaction" validationMessageCode="field_invalid_integer" z="DlP3AWhzKTuZqiq0vCv0AWWKhIc="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ContainerValue_lsType" required="true" z="iRyMRe4/8MIW6AI8o8iPQgxgOLI="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ContainerValue_lsKind" required="true" z="eIRYbJ3npOkWOflZVPJ3cu9KyH4="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ContainerValue_lsTypeAndKind" z="BXib2mmGtERqrEEozYHkf47RBpk="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ContainerValue_recordedBy" required="true" z="C/4gLZo1txrW2YZdfXDsg0dW2mY="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ContainerValue_modifiedBy" z="V11MB5dtMdP7dl8jcU/sshNi0Sc="/>
-        <field:select field="lsState" id="c_com_labsynch_labseer_domain_ContainerValue_lsState" itemValue="id" items="${containerstates}" path="/containerstates" required="true" z="l8MmuTuhOIzeECphucZ1+Z1pOHg="/>
-        <field:input field="operatorType" id="c_com_labsynch_labseer_domain_ContainerValue_operatorType" max="25" z="bkWP20OsH/r4WCa6SeNpmyXM/Ck="/>
-        <field:input field="operatorKind" id="c_com_labsynch_labseer_domain_ContainerValue_operatorKind" max="10" z="RFtKVEfUGcYd3IPo5LArDM9VosM="/>
-        <field:textarea field="operatorTypeAndKind" id="c_com_labsynch_labseer_domain_ContainerValue_operatorTypeAndKind" z="tz6+iM8xjD347nh1MLRWIukOR60="/>
-        <field:input field="unitType" id="c_com_labsynch_labseer_domain_ContainerValue_unitType" max="25" z="oFkX8FE2NoSCAux5cEE1wcaqxpI="/>
-        <field:input field="unitKind" id="c_com_labsynch_labseer_domain_ContainerValue_unitKind" max="25" z="wrGWYlObNi1ltOwXzeZSKIOb0FM="/>
-        <field:textarea field="unitTypeAndKind" id="c_com_labsynch_labseer_domain_ContainerValue_unitTypeAndKind" z="y/AKuq4S+1P2xEtcWVnMCIIld2Y="/>
-        <field:input field="numericValue" id="c_com_labsynch_labseer_domain_ContainerValue_numericValue" validationMessageCode="field_invalid_number" z="snadMd2pTdMP6gla/fbugxMNvE4="/>
-        <field:textarea field="codeType" id="c_com_labsynch_labseer_domain_ContainerValue_codeType" z="mFqoJlfGJIOJLbB+hJCZyUeuqKQ="/>
-        <field:textarea field="codeKind" id="c_com_labsynch_labseer_domain_ContainerValue_codeKind" z="nyFYWxKpHjJBhnpAgTaDwmf7zFk="/>
-        <field:textarea field="codeTypeAndKind" id="c_com_labsynch_labseer_domain_ContainerValue_codeTypeAndKind" z="uJvU4jB5wlmx8zZ7PqNZfunCrFI="/>
-        <field:input field="uncertainty" id="c_com_labsynch_labseer_domain_ContainerValue_uncertainty" validationMessageCode="field_invalid_number" z="2PdWF/ueQt7rqlJh8VjbnLvumNA="/>
-        <field:textarea field="codeOrigin" id="c_com_labsynch_labseer_domain_ContainerValue_codeOrigin" z="t8yzIb8o44xK5M/qdNF9Rt0XTE4="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ContainerValue_deleted" z="WbJaG6nMNCBEH/cqawWOyCDDVVs="/>
-        <field:input field="concentration" id="c_com_labsynch_labseer_domain_ContainerValue_concentration" validationMessageCode="field_invalid_number" z="QkMFj6bFX84hXASFl4b93ZFKHGA="/>
-        <field:input field="concUnit" id="c_com_labsynch_labseer_domain_ContainerValue_concUnit" max="25" z="7xTZHRzvq2ky8+V/SRJdEKWG+4M="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ContainerValue" render="${not empty dependencies}" z="W+kJEqw/WhhBpGxnxg2BoJWHsSI="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containervalues/findContainerValuesByIgnoredNot.jspx b/src/main/webapp/WEB-INF/views/containervalues/findContainerValuesByIgnoredNot.jspx
deleted file mode 100755
index d0324e183..000000000
--- a/src/main/webapp/WEB-INF/views/containervalues/findContainerValuesByIgnoredNot.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByIgnoredNot" id="ff_com_labsynch_labseer_domain_ContainerValue" path="/containervalues" z="HBg14KrnSlv5owcqSZxQCxkfRLE=">
-        <field:checkbox disableFormBinding="true" field="ignored" id="f_com_labsynch_labseer_domain_ContainerValue_ignored" z="eoZwjaongF71NUkI+kIENSvP/d8="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containervalues/findContainerValuesByLsState.jspx b/src/main/webapp/WEB-INF/views/containervalues/findContainerValuesByLsState.jspx
deleted file mode 100755
index a338e3696..000000000
--- a/src/main/webapp/WEB-INF/views/containervalues/findContainerValuesByLsState.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsState" id="ff_com_labsynch_labseer_domain_ContainerValue" path="/containervalues" z="E1RkO/9Jx8Pmy1t9hGWOSrdgicY=">
-        <field:select disableFormBinding="true" field="lsState" id="f_com_labsynch_labseer_domain_ContainerValue_lsState" itemValue="id" items="${containerstates}" path="/containerstates" required="true" z="Ts9R8RfcJCJ6pvdMRBNAb5Jbc6Q="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containervalues/list.jspx b/src/main/webapp/WEB-INF/views/containervalues/list.jspx
deleted file mode 100755
index f102901ee..000000000
--- a/src/main/webapp/WEB-INF/views/containervalues/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ContainerValue" items="${containervalues}" z="X5Et5zs+TDIRXDc+UUszzpVyQTM=">
-        <table:table data="${containervalues}" id="l_com_labsynch_labseer_domain_ContainerValue" path="/containervalues" z="yb9xNtCM1Zs/7hgHVvO0333xBg0=">
-            <table:column id="c_com_labsynch_labseer_domain_ContainerValue_lsType" property="lsType" z="3n59HUKIPH2o9If8KhsyvNDrV+U="/>
-            <table:column id="c_com_labsynch_labseer_domain_ContainerValue_lsKind" property="lsKind" z="aAaYLsDxgisjWhmpmn9RJN33tC4="/>
-            <table:column id="c_com_labsynch_labseer_domain_ContainerValue_lsTypeAndKind" property="lsTypeAndKind" z="QcYyxuEzXiAbmLb5OhrXEzWAMiQ="/>
-            <table:column id="c_com_labsynch_labseer_domain_ContainerValue_ignored" property="ignored" z="FAK9+/uALMVpQJV0XDoj31lAB1E="/>
-            <table:column id="c_com_labsynch_labseer_domain_ContainerValue_publicData" property="publicData" z="ybM1X5GlS8MHw01xlIis0bkb7Zg="/>
-            <table:column id="c_com_labsynch_labseer_domain_ContainerValue_deleted" property="deleted" z="7a+4bSbCEiHPWPnUNBPDAojpu8E="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containervalues/show.jspx b/src/main/webapp/WEB-INF/views/containervalues/show.jspx
deleted file mode 100755
index 9ade2ad58..000000000
--- a/src/main/webapp/WEB-INF/views/containervalues/show.jspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ContainerValue" object="${containervalue}" path="/containervalues" z="ck1Ca7uYifBJaxlPoEoVeKOFQ5s=">
-        <field:display field="stringValue" id="s_com_labsynch_labseer_domain_ContainerValue_stringValue" object="${containervalue}" z="MblWVpckz29CERqrd2pZoFUZSLk="/>
-        <field:display field="fileValue" id="s_com_labsynch_labseer_domain_ContainerValue_fileValue" object="${containervalue}" z="8dGIEedj4mFf/Jr+uq9XO60NCm8="/>
-        <field:display field="urlValue" id="s_com_labsynch_labseer_domain_ContainerValue_urlValue" object="${containervalue}" z="B2bxdioDXWqDzHzub/4ZyguL1II="/>
-        <field:display date="true" dateTimePattern="${containerValue_datevalue_date_format}" field="dateValue" id="s_com_labsynch_labseer_domain_ContainerValue_dateValue" object="${containervalue}" z="nFx8uUfpy/b1ncDp2ckOBvtMVkA="/>
-        <field:display field="clobValue" id="s_com_labsynch_labseer_domain_ContainerValue_clobValue" object="${containervalue}" z="CcicUAfpXsnyFcVTAl+bNUhi5+c="/>
-        <field:display field="blobValue" id="s_com_labsynch_labseer_domain_ContainerValue_blobValue" object="${containervalue}" z="i11cCASC0/gdJOLWkCCTFwyHOaU="/>
-        <field:display field="sigFigs" id="s_com_labsynch_labseer_domain_ContainerValue_sigFigs" object="${containervalue}" z="ljfxts2igiuIqdprjn4IBvomssM="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_ContainerValue_comments" object="${containervalue}" z="z3fOgciFv7bgE/hj1sw5/w9ov0Q="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ContainerValue_ignored" object="${containervalue}" z="CxuyhuhQla409fj4dDWK1pCokY8="/>
-        <field:display date="true" dateTimePattern="${containerValue_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_ContainerValue_recordedDate" object="${containervalue}" z="xsXm64dUxnd+PkuUbe+ZARUMAn0="/>
-        <field:display date="true" dateTimePattern="${containerValue_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_ContainerValue_modifiedDate" object="${containervalue}" z="UVbn8MJaSghuJMyJ2+rNKgAqfKw="/>
-        <field:display field="publicData" id="s_com_labsynch_labseer_domain_ContainerValue_publicData" object="${containervalue}" z="P2dC4ihyr4wftSC0f+9ay8JpXn8="/>
-        <field:display field="codeValue" id="s_com_labsynch_labseer_domain_ContainerValue_codeValue" object="${containervalue}" z="PfQRA+jNOfcgpWWGNx1CUfhb6B8="/>
-        <field:display field="numberOfReplicates" id="s_com_labsynch_labseer_domain_ContainerValue_numberOfReplicates" object="${containervalue}" z="cV6C2QeEex8lgU3h776bnW3G3Tw="/>
-        <field:display field="uncertaintyType" id="s_com_labsynch_labseer_domain_ContainerValue_uncertaintyType" object="${containervalue}" z="bJWTlcyjd/FM1ii417TbvBky8kM="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_ContainerValue_lsTransaction" object="${containervalue}" z="eI8oEDgnPwnlrUIXjsIIZ40rfcg="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ContainerValue_lsType" object="${containervalue}" z="y9snYGYsL8N4fbO3L0TFSxQTuJ8="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_ContainerValue_lsKind" object="${containervalue}" z="wJM15KbOwDNcPXexQuCLueyZ9V8="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ContainerValue_lsTypeAndKind" object="${containervalue}" z="YjRyMmrhnA+EnuX8AYrnA3isbs4="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_ContainerValue_recordedBy" object="${containervalue}" z="AfBrUo9yd+0z73R72QatklQJiVg="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_ContainerValue_modifiedBy" object="${containervalue}" z="TDggthK5X35ksFKXwyefKSNLUWs="/>
-        <field:display field="lsState" id="s_com_labsynch_labseer_domain_ContainerValue_lsState" object="${containervalue}" z="5L8XjUlALssxgy47PzLolQKI7Ws="/>
-        <field:display field="operatorType" id="s_com_labsynch_labseer_domain_ContainerValue_operatorType" object="${containervalue}" z="tqyH5BLoUjmiV72tCIBBZ8BB2Lk="/>
-        <field:display field="operatorKind" id="s_com_labsynch_labseer_domain_ContainerValue_operatorKind" object="${containervalue}" z="ySvqgFGOO8or26weJk6PPx1ZQlU="/>
-        <field:display field="operatorTypeAndKind" id="s_com_labsynch_labseer_domain_ContainerValue_operatorTypeAndKind" object="${containervalue}" z="/x5+tDsaahBSIBlBTTKWgTsVjSY="/>
-        <field:display field="unitType" id="s_com_labsynch_labseer_domain_ContainerValue_unitType" object="${containervalue}" z="uSaGocB2By7rX/rHU7WroKMx5HU="/>
-        <field:display field="unitKind" id="s_com_labsynch_labseer_domain_ContainerValue_unitKind" object="${containervalue}" z="OE8yhbZe/nP2ie1Z+40XrwhAXTE="/>
-        <field:display field="unitTypeAndKind" id="s_com_labsynch_labseer_domain_ContainerValue_unitTypeAndKind" object="${containervalue}" z="A/icmczkFnAg5pRGXTCvO2Z5zKE="/>
-        <field:display field="numericValue" id="s_com_labsynch_labseer_domain_ContainerValue_numericValue" object="${containervalue}" z="JxeD2jIV70Sa7PwqlozgUePqYTs="/>
-        <field:display field="codeType" id="s_com_labsynch_labseer_domain_ContainerValue_codeType" object="${containervalue}" z="5itYL4t51jwsan0GDZ1blshKyGY="/>
-        <field:display field="codeKind" id="s_com_labsynch_labseer_domain_ContainerValue_codeKind" object="${containervalue}" z="e2nWCOzRtW/9XUs603VA8as27B0="/>
-        <field:display field="codeTypeAndKind" id="s_com_labsynch_labseer_domain_ContainerValue_codeTypeAndKind" object="${containervalue}" z="gM+Li55FsYwEX8QzPB7fynQhcOU="/>
-        <field:display field="uncertainty" id="s_com_labsynch_labseer_domain_ContainerValue_uncertainty" object="${containervalue}" z="FWph93ptV34iEYuTIkFrweUMgUE="/>
-        <field:display field="codeOrigin" id="s_com_labsynch_labseer_domain_ContainerValue_codeOrigin" object="${containervalue}" z="v3PRZZeocEF4lxWCTJOtXsOX3jM="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_ContainerValue_deleted" object="${containervalue}" z="qgTdwKtKxXRwkPdnQUDacw4C5N4="/>
-        <field:display field="concentration" id="s_com_labsynch_labseer_domain_ContainerValue_concentration" object="${containervalue}" z="sDeQv5bAIFlnGerBkc66d2K2BsA="/>
-        <field:display field="concUnit" id="s_com_labsynch_labseer_domain_ContainerValue_concUnit" object="${containervalue}" z="B3aHLBFWBYbZVKxDxUbg9OCj56g="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containervalues/update.jspx b/src/main/webapp/WEB-INF/views/containervalues/update.jspx
deleted file mode 100755
index 7358873d3..000000000
--- a/src/main/webapp/WEB-INF/views/containervalues/update.jspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ContainerValue" modelAttribute="containerValue" path="/containervalues" versionField="Version" z="BKBLaI4H4Bs0Xbu2HzqwMvGOx58=">
-        <field:textarea field="stringValue" id="c_com_labsynch_labseer_domain_ContainerValue_stringValue" z="2mkDuvFWK/EZ80LURQ96UH8/0wA="/>
-        <field:textarea field="fileValue" id="c_com_labsynch_labseer_domain_ContainerValue_fileValue" z="D63bZ1ob3065JAvbuMOrk+4RhTU="/>
-        <field:textarea field="urlValue" id="c_com_labsynch_labseer_domain_ContainerValue_urlValue" z="dqI/UPBjt5pMj65QUeGo1pF3Au8="/>
-        <field:datetime dateTimePattern="${containerValue_datevalue_date_format}" field="dateValue" id="c_com_labsynch_labseer_domain_ContainerValue_dateValue" z="GrFsjWEhAsfEG5OIOsczT7uE9b4="/>
-        <field:input field="clobValue" id="c_com_labsynch_labseer_domain_ContainerValue_clobValue" z="Mt43bPqAswOztbYejyWEqcMmVUU="/>
-        <field:input field="blobValue" id="c_com_labsynch_labseer_domain_ContainerValue_blobValue" z="Bt88wI8sowyBantneInwaudZpXI="/>
-        <field:input field="sigFigs" id="c_com_labsynch_labseer_domain_ContainerValue_sigFigs" validationMessageCode="field_invalid_integer" z="WUOjTHtrOfOS3+KZ7nJm2g7E5GE="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ContainerValue_comments" z="iBIj2BSTzZ2SzNZvCGsDogjA2X4="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ContainerValue_ignored" z="eDPkGeBz6SAnYjTtsAanlyGxseY="/>
-        <field:datetime dateTimePattern="${containerValue_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ContainerValue_recordedDate" required="true" z="knPKwQ/MZLZ5LSFsJSXdcIeocg0="/>
-        <field:datetime dateTimePattern="${containerValue_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ContainerValue_modifiedDate" z="Z8peTNzagHJ1xzqET6QxYy+9hwQ="/>
-        <field:checkbox field="publicData" id="c_com_labsynch_labseer_domain_ContainerValue_publicData" z="QkODD8W2eA6Sq8PcbzQtXVmn2jI="/>
-        <field:textarea field="codeValue" id="c_com_labsynch_labseer_domain_ContainerValue_codeValue" z="hu70GAdGOCBGKk+iaKzczuzb120="/>
-        <field:input field="numberOfReplicates" id="c_com_labsynch_labseer_domain_ContainerValue_numberOfReplicates" validationMessageCode="field_invalid_integer" z="aMzNOM4ATdgPUUSrMKVXqesJBFA="/>
-        <field:textarea field="uncertaintyType" id="c_com_labsynch_labseer_domain_ContainerValue_uncertaintyType" z="vjMfcFgeOQWnhWIPg09O0mdutEg="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ContainerValue_lsTransaction" validationMessageCode="field_invalid_integer" z="DlP3AWhzKTuZqiq0vCv0AWWKhIc="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ContainerValue_lsType" required="true" z="iRyMRe4/8MIW6AI8o8iPQgxgOLI="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ContainerValue_lsKind" required="true" z="eIRYbJ3npOkWOflZVPJ3cu9KyH4="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ContainerValue_lsTypeAndKind" z="BXib2mmGtERqrEEozYHkf47RBpk="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ContainerValue_recordedBy" required="true" z="C/4gLZo1txrW2YZdfXDsg0dW2mY="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ContainerValue_modifiedBy" z="V11MB5dtMdP7dl8jcU/sshNi0Sc="/>
-        <field:select field="lsState" id="c_com_labsynch_labseer_domain_ContainerValue_lsState" itemValue="id" items="${containerstates}" path="/containerstates" required="true" z="l8MmuTuhOIzeECphucZ1+Z1pOHg="/>
-        <field:input field="operatorType" id="c_com_labsynch_labseer_domain_ContainerValue_operatorType" max="25" z="bkWP20OsH/r4WCa6SeNpmyXM/Ck="/>
-        <field:input field="operatorKind" id="c_com_labsynch_labseer_domain_ContainerValue_operatorKind" max="10" z="RFtKVEfUGcYd3IPo5LArDM9VosM="/>
-        <field:textarea field="operatorTypeAndKind" id="c_com_labsynch_labseer_domain_ContainerValue_operatorTypeAndKind" z="tz6+iM8xjD347nh1MLRWIukOR60="/>
-        <field:input field="unitType" id="c_com_labsynch_labseer_domain_ContainerValue_unitType" max="25" z="oFkX8FE2NoSCAux5cEE1wcaqxpI="/>
-        <field:input field="unitKind" id="c_com_labsynch_labseer_domain_ContainerValue_unitKind" max="25" z="wrGWYlObNi1ltOwXzeZSKIOb0FM="/>
-        <field:textarea field="unitTypeAndKind" id="c_com_labsynch_labseer_domain_ContainerValue_unitTypeAndKind" z="y/AKuq4S+1P2xEtcWVnMCIIld2Y="/>
-        <field:input field="numericValue" id="c_com_labsynch_labseer_domain_ContainerValue_numericValue" validationMessageCode="field_invalid_number" z="snadMd2pTdMP6gla/fbugxMNvE4="/>
-        <field:textarea field="codeType" id="c_com_labsynch_labseer_domain_ContainerValue_codeType" z="mFqoJlfGJIOJLbB+hJCZyUeuqKQ="/>
-        <field:textarea field="codeKind" id="c_com_labsynch_labseer_domain_ContainerValue_codeKind" z="nyFYWxKpHjJBhnpAgTaDwmf7zFk="/>
-        <field:textarea field="codeTypeAndKind" id="c_com_labsynch_labseer_domain_ContainerValue_codeTypeAndKind" z="uJvU4jB5wlmx8zZ7PqNZfunCrFI="/>
-        <field:input field="uncertainty" id="c_com_labsynch_labseer_domain_ContainerValue_uncertainty" validationMessageCode="field_invalid_number" z="2PdWF/ueQt7rqlJh8VjbnLvumNA="/>
-        <field:textarea field="codeOrigin" id="c_com_labsynch_labseer_domain_ContainerValue_codeOrigin" z="t8yzIb8o44xK5M/qdNF9Rt0XTE4="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ContainerValue_deleted" z="WbJaG6nMNCBEH/cqawWOyCDDVVs="/>
-        <field:input field="concentration" id="c_com_labsynch_labseer_domain_ContainerValue_concentration" validationMessageCode="field_invalid_number" z="QkMFj6bFX84hXASFl4b93ZFKHGA="/>
-        <field:input field="concUnit" id="c_com_labsynch_labseer_domain_ContainerValue_concUnit" max="25" z="7xTZHRzvq2ky8+V/SRJdEKWG+4M="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/containervalues/views.xml b/src/main/webapp/WEB-INF/views/containervalues/views.xml
deleted file mode 100755
index c9e311821..000000000
--- a/src/main/webapp/WEB-INF/views/containervalues/views.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="containervalues/list">
-        <put-attribute name="body" value="/WEB-INF/views/containervalues/list.jspx"/>
-    </definition>
-<definition extends="default" name="containervalues/show">
-        <put-attribute name="body" value="/WEB-INF/views/containervalues/show.jspx"/>
-    </definition>
-<definition extends="default" name="containervalues/create">
-        <put-attribute name="body" value="/WEB-INF/views/containervalues/create.jspx"/>
-    </definition>
-<definition extends="default" name="containervalues/update">
-        <put-attribute name="body" value="/WEB-INF/views/containervalues/update.jspx"/>
-    </definition>
-<definition extends="default" name="containervalues/findContainerValuesByLsState">
-        <put-attribute name="body" value="/WEB-INF/views/containervalues/findContainerValuesByLsState.jspx"/>
-    </definition>
-<definition extends="default" name="containervalues/findContainerValuesByIgnoredNot">
-        <put-attribute name="body" value="/WEB-INF/views/containervalues/findContainerValuesByIgnoredNot.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/corpnames/create.jspx b/src/main/webapp/WEB-INF/views/corpnames/create.jspx
deleted file mode 100644
index 82da7919b..000000000
--- a/src/main/webapp/WEB-INF/views/corpnames/create.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_CorpName" modelAttribute="corpName" path="/corpnames" render="${empty dependencies}" z="zv9jWVMYUyjB13bKoa+qRrWV0bs=">
-        <field:textarea field="parentCorpName" id="c_com_labsynch_labseer_domain_CorpName_parentCorpName" z="RrHXancdms4ti9b/4nrHT7IKiQM="/>
-        <field:textarea field="comment" id="c_com_labsynch_labseer_domain_CorpName_comment" z="oGSVawHKRQhvvSuy52WGjGKYZxg="/>
-        <field:checkbox field="ignore" id="c_com_labsynch_labseer_domain_CorpName_ignore" z="tr4g+usdGNBf71O8fGQ+9hsAh2o="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_CorpName" render="${not empty dependencies}" z="iLByhQDtcA7bp9ATR61SgxfUfv0="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/corpnames/list.jspx b/src/main/webapp/WEB-INF/views/corpnames/list.jspx
deleted file mode 100644
index f5488669b..000000000
--- a/src/main/webapp/WEB-INF/views/corpnames/list.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_CorpName" items="${corpnames}" z="/Tk11SZCbhB8+9jzwing1UvF6r4=">
-        <table:table data="${corpnames}" id="l_com_labsynch_labseer_domain_CorpName" path="/corpnames" z="IVflt2YNVLyZ/5vyAbPzln1KrQE=">
-            <table:column id="c_com_labsynch_labseer_domain_CorpName_parentCorpName" property="parentCorpName" z="nnuEmktlp+3YHatjExrctyvBJxM="/>
-            <table:column id="c_com_labsynch_labseer_domain_CorpName_comment" property="comment" z="U5GwRum/Vd4EfYqtjxsfy5PayRk="/>
-            <table:column id="c_com_labsynch_labseer_domain_CorpName_ignore" property="ignore" z="oaMOesbod9SmTU1WT/wmbtLsf4A="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/corpnames/show.jspx b/src/main/webapp/WEB-INF/views/corpnames/show.jspx
deleted file mode 100644
index d22a7b7f5..000000000
--- a/src/main/webapp/WEB-INF/views/corpnames/show.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_CorpName" object="${corpname}" path="/corpnames" z="pAk/YLpCdbX2bTKgsNXdQcK8coM=">
-        <field:display field="parentCorpName" id="s_com_labsynch_labseer_domain_CorpName_parentCorpName" object="${corpname}" z="g3NMMGsHFC4+qj+WT/ycFwjX9ZE="/>
-        <field:display field="comment" id="s_com_labsynch_labseer_domain_CorpName_comment" object="${corpname}" z="RkfBxu1rNGtiYS3Nwo9eET5vHO0="/>
-        <field:display field="ignore" id="s_com_labsynch_labseer_domain_CorpName_ignore" object="${corpname}" z="vD3kj3Pjs9dqwKMxWFg1X2KFrMw="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/corpnames/update.jspx b/src/main/webapp/WEB-INF/views/corpnames/update.jspx
deleted file mode 100644
index f60f22073..000000000
--- a/src/main/webapp/WEB-INF/views/corpnames/update.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_CorpName" modelAttribute="corpName" path="/corpnames" versionField="Version" z="toITymODXjtfkXJcfyVMwkXMFac=">
-        <field:textarea field="parentCorpName" id="c_com_labsynch_labseer_domain_CorpName_parentCorpName" z="RrHXancdms4ti9b/4nrHT7IKiQM="/>
-        <field:textarea field="comment" id="c_com_labsynch_labseer_domain_CorpName_comment" z="oGSVawHKRQhvvSuy52WGjGKYZxg="/>
-        <field:checkbox field="ignore" id="c_com_labsynch_labseer_domain_CorpName_ignore" z="tr4g+usdGNBf71O8fGQ+9hsAh2o="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/corpnames/views.xml b/src/main/webapp/WEB-INF/views/corpnames/views.xml
deleted file mode 100644
index beb5e0e8e..000000000
--- a/src/main/webapp/WEB-INF/views/corpnames/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="corpnames/list">
-        <put-attribute name="body" value="/WEB-INF/views/corpnames/list.jspx"/>
-    </definition>
-<definition extends="default" name="corpnames/show">
-        <put-attribute name="body" value="/WEB-INF/views/corpnames/show.jspx"/>
-    </definition>
-<definition extends="default" name="corpnames/create">
-        <put-attribute name="body" value="/WEB-INF/views/corpnames/create.jspx"/>
-    </definition>
-<definition extends="default" name="corpnames/update">
-        <put-attribute name="body" value="/WEB-INF/views/corpnames/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/cronjobs/create.jspx b/src/main/webapp/WEB-INF/views/cronjobs/create.jspx
deleted file mode 100644
index 6c6a39055..000000000
--- a/src/main/webapp/WEB-INF/views/cronjobs/create.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_CronJob" modelAttribute="cronJob" path="/cronjobs" render="${empty dependencies}" z="3atomRHNU5ZByRezvCeMC4OFvpY=">
-        <field:input field="schedule" id="c_com_labsynch_labseer_domain_CronJob_schedule" required="true" z="wJWTw20HYAVgNkXRxNCxSFbVFew="/>
-        <field:input field="scriptType" id="c_com_labsynch_labseer_domain_CronJob_scriptType" required="true" z="Ge9TVG/a0Ztkr+/9EjSyrIU7okU="/>
-        <field:input field="scriptFile" id="c_com_labsynch_labseer_domain_CronJob_scriptFile" required="true" z="04K/g24xYPv4f7syC9bpzqagYmY="/>
-        <field:input field="functionName" id="c_com_labsynch_labseer_domain_CronJob_functionName" z="gTApCtg/Wp6ipzd+fnZOxeGjNFc="/>
-        <field:input field="scriptJSONData" id="c_com_labsynch_labseer_domain_CronJob_scriptJSONData" z="LOo5yGmemCt/AWGtKnFFs58KZHc="/>
-        <field:checkbox field="active" id="c_com_labsynch_labseer_domain_CronJob_active" z="SwvajfHbJeKH9Z7qhnveZqbfeJg="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_CronJob_ignored" z="WVdeH1CQxtCdETnFx/RkddnA/p8="/>
-        <field:input field="runUser" id="c_com_labsynch_labseer_domain_CronJob_runUser" required="true" z="QbEDk4FevCZKcfpE4vL0inoJ3AA="/>
-        <field:input field="codeName" id="c_com_labsynch_labseer_domain_CronJob_codeName" required="true" z="BNh4sWEbUwF7G8YWzMPV4D/x9ds="/>
-        <field:datetime dateTimePattern="${cronJob_laststarttime_date_format}" field="lastStartTime" id="c_com_labsynch_labseer_domain_CronJob_lastStartTime" z="QK/VW62OaKMjeVwgi4QAw8JDKWA="/>
-        <field:input field="lastDuration" id="c_com_labsynch_labseer_domain_CronJob_lastDuration" validationMessageCode="field_invalid_integer" z="mS7RP3puD6UltDRd8H2D55TU7gI="/>
-        <field:input field="lastResultJSON" id="c_com_labsynch_labseer_domain_CronJob_lastResultJSON" z="AFbUe93iWsJMttzQ+ukZV5xcqbA="/>
-        <field:input field="numberOfExecutions" id="c_com_labsynch_labseer_domain_CronJob_numberOfExecutions" validationMessageCode="field_invalid_integer" z="UaXwdsb1YlRs+uyKGmMs/AIItF8="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_CronJob" render="${not empty dependencies}" z="h8gyNnk5OBh2JB1U7V1v2u2kthI="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/cronjobs/list.jspx b/src/main/webapp/WEB-INF/views/cronjobs/list.jspx
deleted file mode 100644
index ad6bd2446..000000000
--- a/src/main/webapp/WEB-INF/views/cronjobs/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_CronJob" items="${cronjobs}" z="cFbEXsC/Zht35DAYq1XQzgjI4E8=">
-        <table:table data="${cronjobs}" id="l_com_labsynch_labseer_domain_CronJob" path="/cronjobs" z="sjBBGarow9ojbEeMydeJ42qbMGE=">
-            <table:column id="c_com_labsynch_labseer_domain_CronJob_schedule" property="schedule" z="r6j51dcww6d2WWMUQZszlN7Kn0M="/>
-            <table:column id="c_com_labsynch_labseer_domain_CronJob_scriptType" property="scriptType" z="bjQIST0edZ6LPNqXS3vNzzuPTno="/>
-            <table:column id="c_com_labsynch_labseer_domain_CronJob_scriptFile" property="scriptFile" z="PIQnm6cdD8ET9a+MkKfusyf31rY="/>
-            <table:column id="c_com_labsynch_labseer_domain_CronJob_functionName" property="functionName" z="Lil2m4Jtctn738MVagD2NaD+Izk="/>
-            <table:column id="c_com_labsynch_labseer_domain_CronJob_scriptJSONData" property="scriptJSONData" z="1boWl8n/hSA0vyq0gATMAHo5YcU="/>
-            <table:column id="c_com_labsynch_labseer_domain_CronJob_active" property="active" z="7oUpaFfmMUKLhsRgWWZXlK6b7BU="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/cronjobs/show.jspx b/src/main/webapp/WEB-INF/views/cronjobs/show.jspx
deleted file mode 100644
index 9fad14b44..000000000
--- a/src/main/webapp/WEB-INF/views/cronjobs/show.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_CronJob" object="${cronjob}" path="/cronjobs" z="+J9+8JuSytQcKT8KNKmoch9c70o=">
-        <field:display field="schedule" id="s_com_labsynch_labseer_domain_CronJob_schedule" object="${cronjob}" z="UZikf/i6FoIxr4JSatG5ZY2XkEE="/>
-        <field:display field="scriptType" id="s_com_labsynch_labseer_domain_CronJob_scriptType" object="${cronjob}" z="RXJiMl78i6aHqWEkNegf/0OzvvA="/>
-        <field:display field="scriptFile" id="s_com_labsynch_labseer_domain_CronJob_scriptFile" object="${cronjob}" z="vjQjoN8lGmEOKeZblMpGkQ8aGpA="/>
-        <field:display field="functionName" id="s_com_labsynch_labseer_domain_CronJob_functionName" object="${cronjob}" z="Rbc1qXdqiB9wYVv4Tvo/iiTihQc="/>
-        <field:display field="scriptJSONData" id="s_com_labsynch_labseer_domain_CronJob_scriptJSONData" object="${cronjob}" z="lNPfS5PFRahdNppUWyGpPM4PJjc="/>
-        <field:display field="active" id="s_com_labsynch_labseer_domain_CronJob_active" object="${cronjob}" z="jtDyHaE6wqEo5Br48OVcJRkse6I="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_CronJob_ignored" object="${cronjob}" z="u40M8knV7mRJsLPLjj0osPLt+qY="/>
-        <field:display field="runUser" id="s_com_labsynch_labseer_domain_CronJob_runUser" object="${cronjob}" z="NUn/vo3SYCL0SmfVwznddDc2p5o="/>
-        <field:display field="codeName" id="s_com_labsynch_labseer_domain_CronJob_codeName" object="${cronjob}" z="zrLbnG9Emom/fWM9kFtkEDKLy9c="/>
-        <field:display date="true" dateTimePattern="${cronJob_laststarttime_date_format}" field="lastStartTime" id="s_com_labsynch_labseer_domain_CronJob_lastStartTime" object="${cronjob}" z="QpiNM6WdApfVb7IjyaxjZTsSgJs="/>
-        <field:display field="lastDuration" id="s_com_labsynch_labseer_domain_CronJob_lastDuration" object="${cronjob}" z="dSaBRTMXEAaFxjr1SZPUtHg3CKg="/>
-        <field:display field="lastResultJSON" id="s_com_labsynch_labseer_domain_CronJob_lastResultJSON" object="${cronjob}" z="VAMXFEEtF0hlZAte7JbANcMGjic="/>
-        <field:display field="numberOfExecutions" id="s_com_labsynch_labseer_domain_CronJob_numberOfExecutions" object="${cronjob}" z="RNwskjMHhblnlTfIpvyE7Y4KBi0="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/cronjobs/update.jspx b/src/main/webapp/WEB-INF/views/cronjobs/update.jspx
deleted file mode 100644
index 01ef5b03f..000000000
--- a/src/main/webapp/WEB-INF/views/cronjobs/update.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_CronJob" modelAttribute="cronJob" path="/cronjobs" versionField="Version" z="8VwOoBSpI2uUboXdiFCdSRTsqd4=">
-        <field:input field="schedule" id="c_com_labsynch_labseer_domain_CronJob_schedule" required="true" z="wJWTw20HYAVgNkXRxNCxSFbVFew="/>
-        <field:input field="scriptType" id="c_com_labsynch_labseer_domain_CronJob_scriptType" required="true" z="Ge9TVG/a0Ztkr+/9EjSyrIU7okU="/>
-        <field:input field="scriptFile" id="c_com_labsynch_labseer_domain_CronJob_scriptFile" required="true" z="04K/g24xYPv4f7syC9bpzqagYmY="/>
-        <field:input field="functionName" id="c_com_labsynch_labseer_domain_CronJob_functionName" z="gTApCtg/Wp6ipzd+fnZOxeGjNFc="/>
-        <field:input field="scriptJSONData" id="c_com_labsynch_labseer_domain_CronJob_scriptJSONData" z="LOo5yGmemCt/AWGtKnFFs58KZHc="/>
-        <field:checkbox field="active" id="c_com_labsynch_labseer_domain_CronJob_active" z="SwvajfHbJeKH9Z7qhnveZqbfeJg="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_CronJob_ignored" z="WVdeH1CQxtCdETnFx/RkddnA/p8="/>
-        <field:input field="runUser" id="c_com_labsynch_labseer_domain_CronJob_runUser" required="true" z="QbEDk4FevCZKcfpE4vL0inoJ3AA="/>
-        <field:input field="codeName" id="c_com_labsynch_labseer_domain_CronJob_codeName" required="true" z="BNh4sWEbUwF7G8YWzMPV4D/x9ds="/>
-        <field:datetime dateTimePattern="${cronJob_laststarttime_date_format}" field="lastStartTime" id="c_com_labsynch_labseer_domain_CronJob_lastStartTime" z="QK/VW62OaKMjeVwgi4QAw8JDKWA="/>
-        <field:input field="lastDuration" id="c_com_labsynch_labseer_domain_CronJob_lastDuration" validationMessageCode="field_invalid_integer" z="mS7RP3puD6UltDRd8H2D55TU7gI="/>
-        <field:input field="lastResultJSON" id="c_com_labsynch_labseer_domain_CronJob_lastResultJSON" z="AFbUe93iWsJMttzQ+ukZV5xcqbA="/>
-        <field:input field="numberOfExecutions" id="c_com_labsynch_labseer_domain_CronJob_numberOfExecutions" validationMessageCode="field_invalid_integer" z="UaXwdsb1YlRs+uyKGmMs/AIItF8="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/cronjobs/views.xml b/src/main/webapp/WEB-INF/views/cronjobs/views.xml
deleted file mode 100644
index 62a9a57a6..000000000
--- a/src/main/webapp/WEB-INF/views/cronjobs/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="cronjobs/list">
-        <put-attribute name="body" value="/WEB-INF/views/cronjobs/list.jspx"/>
-    </definition>
-<definition extends="default" name="cronjobs/show">
-        <put-attribute name="body" value="/WEB-INF/views/cronjobs/show.jspx"/>
-    </definition>
-<definition extends="default" name="cronjobs/create">
-        <put-attribute name="body" value="/WEB-INF/views/cronjobs/create.jspx"/>
-    </definition>
-<definition extends="default" name="cronjobs/update">
-        <put-attribute name="body" value="/WEB-INF/views/cronjobs/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/dataAccessFailure.jspx b/src/main/webapp/WEB-INF/views/dataAccessFailure.jspx
deleted file mode 100755
index 15d9b23ee..000000000
--- a/src/main/webapp/WEB-INF/views/dataAccessFailure.jspx
+++ /dev/null
@@ -1,30 +0,0 @@
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:util="urn:jsptagdir:/WEB-INF/tags/util" xmlns:fn="http://java.sun.com/jsp/jstl/functions"  xmlns:spring="http://www.springframework.org/tags" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-  <jsp:directive.page contentType="text/html;charset=UTF-8" />
-  <jsp:output omit-xml-declaration="yes" />
-  <spring:message var="title" code="error_dataaccessfailure_title" htmlEscape="false" />
-  <util:panel id="title" title="${title}">
-    <h2>${fn:escapeXml(title)}</h2>
-    <p>
-      <spring:message code="error_dataaccessfailure_problemdescription" />
-    </p>
-    <c:if test="${not empty exception}">
-      <p>
-        <h4>
-          <spring:message code="exception_details" />
-        </h4>
-        <spring:message var="message" code="exception_message" />
-        <util:panel id="_message" title="${message}" openPane="false">
-          <c:out value="${exception.localizedMessage}" />
-        </util:panel>
-        <spring:message var="stacktrace" code="exception_stacktrace" />
-        <util:panel id="_exception" title="${stacktrace}" openPane="false">
-          <c:forEach items="${exception.stackTrace}" var="trace">
-            <c:out value="${trace}" />
-            <br />
-          </c:forEach>
-        </util:panel>
-      </p>
-    </c:if>
-  </util:panel>
-</div>
-
diff --git a/src/main/webapp/WEB-INF/views/ddictkinds/create.jspx b/src/main/webapp/WEB-INF/views/ddictkinds/create.jspx
deleted file mode 100644
index 356cfc7bf..000000000
--- a/src/main/webapp/WEB-INF/views/ddictkinds/create.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_DDictKind" modelAttribute="DDictKind_" path="/ddictkinds" render="${empty dependencies}" z="Aw9iQs8xobxBnpdl7a5Ci2sM8BI=">
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_DDictKind_lsType" itemValue="name" items="${ddicttypes}" path="/ddicttypes" required="true" z="user-managed"/>
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_DDictKind_name" required="true" z="Xv3LdM0FH8/YFXkOSB8Uy/EHP6w="/>
-        <field:textarea field="description" id="c_com_labsynch_labseer_domain_DDictKind_description" z="pbJS3hAnn6nYA90kGmSUZHg01Rs="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_DDictKind_comments" z="O2jso579VxLeVjAS2LsVnHykq8s="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_DDictKind_ignored" z="GWZIit4ndSmpqwj8KCV48sMbNDw="/>
-        <field:input field="displayOrder" id="c_com_labsynch_labseer_domain_DDictKind_displayOrder" validationMessageCode="field_invalid_integer" z="ED1xh+ObN5fnetyoDDTCB8/eOQU="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_DDictKind_lsTypeAndKind" render="false" z="user-managed"/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_DDictKind" render="${not empty dependencies}" z="hm600ehLKDnuDqygaZkBXjjS3xQ="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/ddictkinds/findDDictKindsByLsTypeEqualsAndNameEquals.jspx b/src/main/webapp/WEB-INF/views/ddictkinds/findDDictKindsByLsTypeEqualsAndNameEquals.jspx
deleted file mode 100644
index 467f432a4..000000000
--- a/src/main/webapp/WEB-INF/views/ddictkinds/findDDictKindsByLsTypeEqualsAndNameEquals.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeEqualsAndNameEquals" id="ff_com_labsynch_labseer_domain_DDictKind" path="/ddictkinds" z="mJ5Whlk/w7kYZwry6S0h5+WIOYo=">
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_DDictKind_lsType" max="255" required="true" z="dWReVsVm3zNXYqWjg2xPkhajlyU="/>
-        <field:input disableFormBinding="true" field="name" id="f_com_labsynch_labseer_domain_DDictKind_name" max="255" required="true" z="Zc9q60RoeqX99ga/boS1fht38l8="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/ddictkinds/list.jspx b/src/main/webapp/WEB-INF/views/ddictkinds/list.jspx
deleted file mode 100644
index 75f6c1e29..000000000
--- a/src/main/webapp/WEB-INF/views/ddictkinds/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_DDictKind" items="${ddictkinds}" z="NBWhpJ5I+ieLqTpUiR7/DTkYk0o=">
-        <table:table data="${ddictkinds}" id="l_com_labsynch_labseer_domain_DDictKind" path="/ddictkinds" z="pHDVcoFiuKO0i7T/hU10XvUjrsY=">
-            <table:column id="c_com_labsynch_labseer_domain_DDictKind_lsType" property="lsType" z="ei/smWmEp/Xh9u/O91zdyttJ4T4="/>
-            <table:column id="c_com_labsynch_labseer_domain_DDictKind_name" property="name" z="53kDF3iGVuOVWn82RKLvojpuP70="/>
-            <table:column id="c_com_labsynch_labseer_domain_DDictKind_description" property="description" z="B/wAQpJXhiawCJo2g3J9AUjY00c="/>
-            <table:column id="c_com_labsynch_labseer_domain_DDictKind_comments" property="comments" z="YcRegK4NxlyjznYTxZhhDesHW8Y="/>
-            <table:column id="c_com_labsynch_labseer_domain_DDictKind_ignored" property="ignored" z="UlVXGObtzdpufBiGg9Ri6+uG550="/>
-            <table:column id="c_com_labsynch_labseer_domain_DDictKind_lsTypeAndKind" property="lsTypeAndKind" z="UrR43vza3IWvr7y650X4ZBAOZmI="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/ddictkinds/show.jspx b/src/main/webapp/WEB-INF/views/ddictkinds/show.jspx
deleted file mode 100644
index f04bdcd76..000000000
--- a/src/main/webapp/WEB-INF/views/ddictkinds/show.jspx
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_DDictKind" object="${ddictkind_}" path="/ddictkinds" z="p33daw8pmmAqQUXNnPCRPXrmXQc=">
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_DDictKind_lsType" object="${ddictkind_}" z="hb0onjlIEwfDeIzy7TLerOE1sHM="/>
-        <field:display field="name" id="s_com_labsynch_labseer_domain_DDictKind_name" object="${ddictkind_}" z="GR4b9QoaLoARXmHaMST8kqhOLTc="/>
-        <field:display field="description" id="s_com_labsynch_labseer_domain_DDictKind_description" object="${ddictkind_}" z="7ZLNHW4flE1Vs/g4rrynvnSMyxA="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_DDictKind_comments" object="${ddictkind_}" z="3OdRb8/jXnqeyiChyK2yP0Mbb2E="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_DDictKind_ignored" object="${ddictkind_}" z="TszIEdrMycQ2gKq7cGWHaxkDfbc="/>
-        <field:display field="displayOrder" id="s_com_labsynch_labseer_domain_DDictKind_displayOrder" object="${ddictkind_}" z="IOYwxPFQpuipgB7hN9/vhdgmu4Y="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_DDictKind_lsTypeAndKind" object="${ddictkind_}" z="JgnYImsVHOsUWn/YMUuelf8t3b8="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/ddictkinds/update.jspx b/src/main/webapp/WEB-INF/views/ddictkinds/update.jspx
deleted file mode 100644
index 31a4db149..000000000
--- a/src/main/webapp/WEB-INF/views/ddictkinds/update.jspx
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_DDictKind" modelAttribute="DDictKind_" path="/ddictkinds" versionField="Version" z="wjQ8DRTAhx31DR3J+kkJmnN92XQ=">
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_DDictKind_lsType" itemValue="name" items="${ddicttypes}" path="/ddicttypes" required="true" z="user-managed"/>
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_DDictKind_name" required="true" z="Xv3LdM0FH8/YFXkOSB8Uy/EHP6w="/>
-        <field:textarea field="description" id="c_com_labsynch_labseer_domain_DDictKind_description" z="pbJS3hAnn6nYA90kGmSUZHg01Rs="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_DDictKind_comments" z="O2jso579VxLeVjAS2LsVnHykq8s="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_DDictKind_ignored" z="GWZIit4ndSmpqwj8KCV48sMbNDw="/>
-        <field:input field="displayOrder" id="c_com_labsynch_labseer_domain_DDictKind_displayOrder" validationMessageCode="field_invalid_integer" z="ED1xh+ObN5fnetyoDDTCB8/eOQU="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_DDictKind_lsTypeAndKind" render="false" z="user-managed"/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/ddictkinds/views.xml b/src/main/webapp/WEB-INF/views/ddictkinds/views.xml
deleted file mode 100644
index 7e6bb7ad0..000000000
--- a/src/main/webapp/WEB-INF/views/ddictkinds/views.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="ddictkinds/list">
-        <put-attribute name="body" value="/WEB-INF/views/ddictkinds/list.jspx"/>
-    </definition>
-<definition extends="default" name="ddictkinds/show">
-        <put-attribute name="body" value="/WEB-INF/views/ddictkinds/show.jspx"/>
-    </definition>
-<definition extends="default" name="ddictkinds/create">
-        <put-attribute name="body" value="/WEB-INF/views/ddictkinds/create.jspx"/>
-    </definition>
-<definition extends="default" name="ddictkinds/update">
-        <put-attribute name="body" value="/WEB-INF/views/ddictkinds/update.jspx"/>
-    </definition>
-<definition extends="default" name="ddictkinds/findDDictKindsByLsTypeEqualsAndNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/ddictkinds/findDDictKindsByLsTypeEqualsAndNameEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/ddicttypes/create.jspx b/src/main/webapp/WEB-INF/views/ddicttypes/create.jspx
deleted file mode 100644
index bdfb621a0..000000000
--- a/src/main/webapp/WEB-INF/views/ddicttypes/create.jspx
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_DDictType" modelAttribute="DDictType_" path="/ddicttypes" render="${empty dependencies}" z="Ns8x3LZBN++NNpa/5PUSxyaKCe4=">
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_DDictType_name" required="true" z="DrK1byapliUHjwa96JT+xGA5B0s="/>
-        <field:textarea field="description" id="c_com_labsynch_labseer_domain_DDictType_description" z="ldX0bOmx1THgdBLA7jRWE3rVP3c="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_DDictType_comments" z="M48jAzziHzXAvsCNO1cEl6kqouk="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_DDictType_ignored" z="7+pI84sx5AYic6yURZ8T+QPP5Cc="/>
-        <field:input field="displayOrder" id="c_com_labsynch_labseer_domain_DDictType_displayOrder" validationMessageCode="field_invalid_integer" z="nE1OhnBII6RSiAhQLYkSWKqJ7VY="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_DDictType" render="${not empty dependencies}" z="GmuEOMl+dVLkeIkKQXhEktnwA8I="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/ddicttypes/findDDictTypesByNameEquals.jspx b/src/main/webapp/WEB-INF/views/ddicttypes/findDDictTypesByNameEquals.jspx
deleted file mode 100644
index 1ff93cb13..000000000
--- a/src/main/webapp/WEB-INF/views/ddicttypes/findDDictTypesByNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByNameEquals" id="ff_com_labsynch_labseer_domain_DDictType" path="/ddicttypes" z="3uozf0E3p9auI4HUthnRDxa3xj0=">
-        <field:input disableFormBinding="true" field="name" id="f_com_labsynch_labseer_domain_DDictType_name" max="255" required="true" z="bjL6qcURAwKL2wg2CYcDQzeia/U="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/ddicttypes/list.jspx b/src/main/webapp/WEB-INF/views/ddicttypes/list.jspx
deleted file mode 100644
index bc3b96a12..000000000
--- a/src/main/webapp/WEB-INF/views/ddicttypes/list.jspx
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_DDictType" items="${ddicttypes}" z="aEkUmBV9V5hDlfbt+kxycmlgRtc=">
-        <table:table data="${ddicttypes}" id="l_com_labsynch_labseer_domain_DDictType" path="/ddicttypes" z="wgl/RiTJ9b/SsLArv9NWESTjKcM=">
-            <table:column id="c_com_labsynch_labseer_domain_DDictType_name" property="name" z="4sVq62Z1aq7mGWTHaTTpepnByg8="/>
-            <table:column id="c_com_labsynch_labseer_domain_DDictType_description" property="description" z="qxw4X1IAr2dIKPCXkpoVBQvCZJ8="/>
-            <table:column id="c_com_labsynch_labseer_domain_DDictType_comments" property="comments" z="YB35GSK5PJYYko8XF3ZDkuKGJ6o="/>
-            <table:column id="c_com_labsynch_labseer_domain_DDictType_ignored" property="ignored" z="Txcto+rr26ljrPxiGGnd6NAlTPw="/>
-            <table:column id="c_com_labsynch_labseer_domain_DDictType_displayOrder" property="displayOrder" z="a1/qA2FnaOUtKbwnYGYTmk8BU+0="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/ddicttypes/show.jspx b/src/main/webapp/WEB-INF/views/ddicttypes/show.jspx
deleted file mode 100644
index f24084947..000000000
--- a/src/main/webapp/WEB-INF/views/ddicttypes/show.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_DDictType" object="${ddicttype_}" path="/ddicttypes" z="bvrxwanRmR3VoyqrgoXKkb/rYas=">
-        <field:display field="name" id="s_com_labsynch_labseer_domain_DDictType_name" object="${ddicttype_}" z="VRM0NJejcLH4PBv4NadZXsrJnUA="/>
-        <field:display field="description" id="s_com_labsynch_labseer_domain_DDictType_description" object="${ddicttype_}" z="71pciaPUqA654VG+Jz/FwFWAv9Q="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_DDictType_comments" object="${ddicttype_}" z="JmTbVnKN3zieK1iWmJR8LDjiqGw="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_DDictType_ignored" object="${ddicttype_}" z="fOYe7weiOxg0zvG7mUdB9pEOJQI="/>
-        <field:display field="displayOrder" id="s_com_labsynch_labseer_domain_DDictType_displayOrder" object="${ddicttype_}" z="IUBBDxj71YOyAJ98jGpTqbTMk1w="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/ddicttypes/update.jspx b/src/main/webapp/WEB-INF/views/ddicttypes/update.jspx
deleted file mode 100644
index f0c0a0456..000000000
--- a/src/main/webapp/WEB-INF/views/ddicttypes/update.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_DDictType" modelAttribute="DDictType_" path="/ddicttypes" versionField="Version" z="UHPVPAP5k/7mJaJGmytoEq4jcCk=">
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_DDictType_name" required="true" z="DrK1byapliUHjwa96JT+xGA5B0s="/>
-        <field:textarea field="description" id="c_com_labsynch_labseer_domain_DDictType_description" z="ldX0bOmx1THgdBLA7jRWE3rVP3c="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_DDictType_comments" z="M48jAzziHzXAvsCNO1cEl6kqouk="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_DDictType_ignored" z="7+pI84sx5AYic6yURZ8T+QPP5Cc="/>
-        <field:input field="displayOrder" id="c_com_labsynch_labseer_domain_DDictType_displayOrder" validationMessageCode="field_invalid_integer" z="nE1OhnBII6RSiAhQLYkSWKqJ7VY="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/ddicttypes/views.xml b/src/main/webapp/WEB-INF/views/ddicttypes/views.xml
deleted file mode 100644
index eae1320bf..000000000
--- a/src/main/webapp/WEB-INF/views/ddicttypes/views.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="ddicttypes/list">
-        <put-attribute name="body" value="/WEB-INF/views/ddicttypes/list.jspx"/>
-    </definition>
-<definition extends="default" name="ddicttypes/show">
-        <put-attribute name="body" value="/WEB-INF/views/ddicttypes/show.jspx"/>
-    </definition>
-<definition extends="default" name="ddicttypes/create">
-        <put-attribute name="body" value="/WEB-INF/views/ddicttypes/create.jspx"/>
-    </definition>
-<definition extends="default" name="ddicttypes/update">
-        <put-attribute name="body" value="/WEB-INF/views/ddicttypes/update.jspx"/>
-    </definition>
-<definition extends="default" name="ddicttypes/findDDictTypesByNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/ddicttypes/findDDictTypesByNameEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/ddictvalues/create.jspx b/src/main/webapp/WEB-INF/views/ddictvalues/create.jspx
deleted file mode 100644
index 18883cd79..000000000
--- a/src/main/webapp/WEB-INF/views/ddictvalues/create.jspx
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_DDictValue" modelAttribute="DDictValue_" path="/ddictvalues" render="${empty dependencies}" z="YboVSdK7JNAh0jbYe6SznQIU+Yo=">
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_DDictValue_lsType" itemValue="name" items="${ddicttypes}" path="/ddicttypes" required="true" z="user-managed"/>
-        <field:select field="lsKind" id="c_com_labsynch_labseer_domain_DDictValue_lsKind" itemValue="name" items="${ddictkinds}" path="/ddictkinds" required="true" z="user-managed"/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_DDictValue_lsTypeAndKind" render="false" z="user-managed"/>
-        <field:textarea field="description" id="c_com_labsynch_labseer_domain_DDictValue_description" z="bbVpvASJMAaac7CNtESA1fiufVY="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_DDictValue_comments" z="L1JfXOP8q4cdLMlmSqZGEDGtGFA="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_DDictValue_ignored" z="yIh3YJLyTDoSo4TClFz8QropN40="/>
-        <field:input field="displayOrder" id="c_com_labsynch_labseer_domain_DDictValue_displayOrder" validationMessageCode="field_invalid_integer" z="3NnpasRDp/fR4HOzA5LHrwwWcaA="/>
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_DDictValue_codeName" required="true" z="J6C9qHhHy59OhXZSbfpZEwJ4/s8="/>
-        <field:textarea field="labelText" id="c_com_labsynch_labseer_domain_DDictValue_labelText" required="true" z="Ud8FS/iMv/QdGIhOX5zKz7jmV6c="/>
-        <field:textarea field="shortName" id="c_com_labsynch_labseer_domain_DDictValue_shortName" z="b0x/gU9maIH2JyrHyrnYy014VwU="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_DDictValue" render="${not empty dependencies}" z="DsenGFy0fIo9nPsRNPGSc6LplZ4="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/ddictvalues/findDDictValuesByCodeNameEquals.jspx b/src/main/webapp/WEB-INF/views/ddictvalues/findDDictValuesByCodeNameEquals.jspx
deleted file mode 100644
index d44a9cdb6..000000000
--- a/src/main/webapp/WEB-INF/views/ddictvalues/findDDictValuesByCodeNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeNameEquals" id="ff_com_labsynch_labseer_domain_DDictValue" path="/ddictvalues" z="rJq3wQggK/D4SBYf/tNJ1+Hwaw8=">
-        <field:input disableFormBinding="true" field="codeName" id="f_com_labsynch_labseer_domain_DDictValue_codeName" max="255" required="true" z="v0BNfJYogWYFJi9IVMQP1pPSCvs="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/ddictvalues/findDDictValuesByIgnoredNot.jspx b/src/main/webapp/WEB-INF/views/ddictvalues/findDDictValuesByIgnoredNot.jspx
deleted file mode 100644
index 9264c5263..000000000
--- a/src/main/webapp/WEB-INF/views/ddictvalues/findDDictValuesByIgnoredNot.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByIgnoredNot" id="ff_com_labsynch_labseer_domain_DDictValue" path="/ddictvalues" z="F6/VZ20NFnkcIIzMdUoPWH9CDr4=">
-        <field:checkbox disableFormBinding="true" field="ignored" id="f_com_labsynch_labseer_domain_DDictValue_ignored" z="smggG0Ej/to1pKrrzVAP7zVbv/Y="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/ddictvalues/findDDictValuesByLabelTextLike.jspx b/src/main/webapp/WEB-INF/views/ddictvalues/findDDictValuesByLabelTextLike.jspx
deleted file mode 100644
index bb378e65e..000000000
--- a/src/main/webapp/WEB-INF/views/ddictvalues/findDDictValuesByLabelTextLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLabelTextLike" id="ff_com_labsynch_labseer_domain_DDictValue" path="/ddictvalues" z="Uwy83CfYu5bID+2D/brs5f6blLw=">
-        <field:input disableFormBinding="true" field="labelText" id="f_com_labsynch_labseer_domain_DDictValue_labelText" max="512" required="true" z="nI4PXzOhvxdfNRNEvdQlIjt3AvE="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/ddictvalues/findDDictValuesByLsKindEquals.jspx b/src/main/webapp/WEB-INF/views/ddictvalues/findDDictValuesByLsKindEquals.jspx
deleted file mode 100644
index 861663c75..000000000
--- a/src/main/webapp/WEB-INF/views/ddictvalues/findDDictValuesByLsKindEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsKindEquals" id="ff_com_labsynch_labseer_domain_DDictValue" path="/ddictvalues" z="POVzQTgY6FqjumkV8DpZ3sJ2QE8=">
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_DDictValue_lsKind" max="255" required="true" z="St2zY3zhZ7BFecEfl9eHVA/SA7o="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/ddictvalues/findDDictValuesByLsTypeEquals.jspx b/src/main/webapp/WEB-INF/views/ddictvalues/findDDictValuesByLsTypeEquals.jspx
deleted file mode 100644
index 0ad4ac73e..000000000
--- a/src/main/webapp/WEB-INF/views/ddictvalues/findDDictValuesByLsTypeEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeEquals" id="ff_com_labsynch_labseer_domain_DDictValue" path="/ddictvalues" z="4Ap1UrYTwCrAg7lAJU9vXh0CsMc=">
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_DDictValue_lsType" max="255" required="true" z="OJwrEHISZL4/ekm7Tt1CIEqb+80="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/ddictvalues/findDDictValuesByLsTypeEqualsAndLsKindEquals.jspx b/src/main/webapp/WEB-INF/views/ddictvalues/findDDictValuesByLsTypeEqualsAndLsKindEquals.jspx
deleted file mode 100644
index 2d34bc52d..000000000
--- a/src/main/webapp/WEB-INF/views/ddictvalues/findDDictValuesByLsTypeEqualsAndLsKindEquals.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeEqualsAndLsKindEquals" id="ff_com_labsynch_labseer_domain_DDictValue" path="/ddictvalues" z="s/IvgKCXr7N4BRXUFUZhBDuzi1Y=">
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_DDictValue_lsType" max="255" required="true" z="OJwrEHISZL4/ekm7Tt1CIEqb+80="/>
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_DDictValue_lsKind" max="255" required="true" z="St2zY3zhZ7BFecEfl9eHVA/SA7o="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/ddictvalues/findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals.jspx b/src/main/webapp/WEB-INF/views/ddictvalues/findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals.jspx
deleted file mode 100644
index 87902df6f..000000000
--- a/src/main/webapp/WEB-INF/views/ddictvalues/findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeEqualsAndLsKindEqualsAndShortNameEquals" id="ff_com_labsynch_labseer_domain_DDictValue" path="/ddictvalues" z="j00BBfA/G3a/xHprE9PcAuy8RV8=">
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_DDictValue_lsType" max="255" required="true" z="OJwrEHISZL4/ekm7Tt1CIEqb+80="/>
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_DDictValue_lsKind" max="255" required="true" z="St2zY3zhZ7BFecEfl9eHVA/SA7o="/>
-        <field:input disableFormBinding="true" field="shortName" id="f_com_labsynch_labseer_domain_DDictValue_shortName" max="256" required="true" z="LaXRevKMG6pUUl0M0D2NcOZzcQc="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/ddictvalues/list.jspx b/src/main/webapp/WEB-INF/views/ddictvalues/list.jspx
deleted file mode 100644
index 7768b3671..000000000
--- a/src/main/webapp/WEB-INF/views/ddictvalues/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_DDictValue" items="${ddictvalues}" z="tvM83ACibEmJRQ6TV3GVxV0K6no=">
-        <table:table data="${ddictvalues}" id="l_com_labsynch_labseer_domain_DDictValue" path="/ddictvalues" z="bzPBVcgPdiZMsJ3mPfJEor75gBA=">
-            <table:column id="c_com_labsynch_labseer_domain_DDictValue_lsType" property="lsType" z="tfCLvvQrdhf8UC898UnbecwDhig="/>
-            <table:column id="c_com_labsynch_labseer_domain_DDictValue_lsKind" property="lsKind" z="D9PMKO3J96C9Vx+yqSmVkNVjZ3Y="/>
-            <table:column id="c_com_labsynch_labseer_domain_DDictValue_lsTypeAndKind" property="lsTypeAndKind" z="tlx1AqrCBajH2tbD251HtqbzoXw="/>
-            <table:column id="c_com_labsynch_labseer_domain_DDictValue_codeName" property="codeName" z="0aobSj08SthypIZC9bHHUQNpigk="/>
-            <table:column id="c_com_labsynch_labseer_domain_DDictValue_ignored" property="ignored" z="5UDmkpJYCILGQ+cpnsLDMC8I2/I="/>
-            <table:column id="c_com_labsynch_labseer_domain_DDictValue_shortName" property="shortName" z="tQre0xQpFrJVoTFZ37sm9Wv/h0Y="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/ddictvalues/show.jspx b/src/main/webapp/WEB-INF/views/ddictvalues/show.jspx
deleted file mode 100644
index 12814d7e5..000000000
--- a/src/main/webapp/WEB-INF/views/ddictvalues/show.jspx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_DDictValue" object="${ddictvalue_}" path="/ddictvalues" z="BDmO4zHyRZcalMTLHH391sw+EcA=">
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_DDictValue_lsType" object="${ddictvalue_}" z="Yp9m849TKxMg4z85sxyGjUY/IWM="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_DDictValue_lsKind" object="${ddictvalue_}" z="hjojTJAAM7wXw1qygj6BZJnXG+k="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_DDictValue_lsTypeAndKind" object="${ddictvalue_}" z="OFF1gC9Xers6A5gO8//rnwbM7E8="/>
-        <field:display field="description" id="s_com_labsynch_labseer_domain_DDictValue_description" object="${ddictvalue_}" z="ojk0LGHRiyNBl14Os/A2aPJ0HIk="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_DDictValue_comments" object="${ddictvalue_}" z="bE2FiySeZ7jkjBQXF9ckcuNyiE8="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_DDictValue_ignored" object="${ddictvalue_}" z="VCANm1Bfp7rwc6cGfmILAYg4lN0="/>
-        <field:display field="displayOrder" id="s_com_labsynch_labseer_domain_DDictValue_displayOrder" object="${ddictvalue_}" z="Dx6uXEX3ynILGGn24WlVcQp67A8="/>
-        <field:display field="codeName" id="s_com_labsynch_labseer_domain_DDictValue_codeName" object="${ddictvalue_}" z="JH/mZzPNX+ywC+xXsbtUoRQaf7Q="/>
-        <field:display field="labelText" id="s_com_labsynch_labseer_domain_DDictValue_labelText" object="${ddictvalue_}" z="C5cnYcXFdwzP+e5vuiJ6acnsFew="/>
-        <field:display field="shortName" id="s_com_labsynch_labseer_domain_DDictValue_shortName" object="${ddictvalue_}" z="jRNCP4TD/UEG9ei5Faz+Ya3aHDk="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/ddictvalues/update.jspx b/src/main/webapp/WEB-INF/views/ddictvalues/update.jspx
deleted file mode 100644
index 384de61b0..000000000
--- a/src/main/webapp/WEB-INF/views/ddictvalues/update.jspx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_DDictValue" modelAttribute="DDictValue_" path="/ddictvalues" versionField="Version" z="M17LB48LGDFuK1CnylKG8YaxKFA=">
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_DDictValue_lsType" itemValue="name" items="${ddicttypes}" path="/ddicttypes" required="true" z="user-managed"/>
-        <field:select field="lsKind" id="c_com_labsynch_labseer_domain_DDictValue_lsKind" itemValue="name" items="${ddictkinds}" path="/ddictkinds" required="true" z="user-managed"/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_DDictValue_lsTypeAndKind" render="false" z="user-managed"/>
-        <field:textarea field="description" id="c_com_labsynch_labseer_domain_DDictValue_description" z="bbVpvASJMAaac7CNtESA1fiufVY="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_DDictValue_comments" z="L1JfXOP8q4cdLMlmSqZGEDGtGFA="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_DDictValue_ignored" z="yIh3YJLyTDoSo4TClFz8QropN40="/>
-        <field:input field="displayOrder" id="c_com_labsynch_labseer_domain_DDictValue_displayOrder" validationMessageCode="field_invalid_integer" z="3NnpasRDp/fR4HOzA5LHrwwWcaA="/>
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_DDictValue_codeName" required="true" z="J6C9qHhHy59OhXZSbfpZEwJ4/s8="/>
-        <field:textarea field="labelText" id="c_com_labsynch_labseer_domain_DDictValue_labelText" required="true" z="Ud8FS/iMv/QdGIhOX5zKz7jmV6c="/>
-        <field:textarea field="shortName" id="c_com_labsynch_labseer_domain_DDictValue_shortName" z="b0x/gU9maIH2JyrHyrnYy014VwU="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/ddictvalues/views.xml b/src/main/webapp/WEB-INF/views/ddictvalues/views.xml
deleted file mode 100644
index 5dc1b5914..000000000
--- a/src/main/webapp/WEB-INF/views/ddictvalues/views.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="ddictvalues/list">
-        <put-attribute name="body" value="/WEB-INF/views/ddictvalues/list.jspx"/>
-    </definition>
-<definition extends="default" name="ddictvalues/show">
-        <put-attribute name="body" value="/WEB-INF/views/ddictvalues/show.jspx"/>
-    </definition>
-<definition extends="default" name="ddictvalues/create">
-        <put-attribute name="body" value="/WEB-INF/views/ddictvalues/create.jspx"/>
-    </definition>
-<definition extends="default" name="ddictvalues/update">
-        <put-attribute name="body" value="/WEB-INF/views/ddictvalues/update.jspx"/>
-    </definition>
-<definition extends="default" name="ddictvalues/findDDictValuesByLsTypeEqualsAndLsKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/ddictvalues/findDDictValuesByLsTypeEqualsAndLsKindEquals.jspx"/>
-    </definition>
-<definition extends="default" name="ddictvalues/findDDictValuesByLsKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/ddictvalues/findDDictValuesByLsKindEquals.jspx"/>
-    </definition>
-<definition extends="default" name="ddictvalues/findDDictValuesByLsTypeEquals">
-        <put-attribute name="body" value="/WEB-INF/views/ddictvalues/findDDictValuesByLsTypeEquals.jspx"/>
-    </definition>
-<definition extends="default" name="ddictvalues/findDDictValuesByIgnoredNot">
-        <put-attribute name="body" value="/WEB-INF/views/ddictvalues/findDDictValuesByIgnoredNot.jspx"/>
-    </definition>
-<definition extends="default" name="ddictvalues/findDDictValuesByCodeNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/ddictvalues/findDDictValuesByCodeNameEquals.jspx"/>
-    </definition>
-<definition extends="default" name="ddictvalues/findDDictValuesByLabelTextLike">
-        <put-attribute name="body" value="/WEB-INF/views/ddictvalues/findDDictValuesByLabelTextLike.jspx"/>
-    </definition>
-<definition extends="default" name="ddictvalues/findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/ddictvalues/findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/experimentkinds/create.jspx b/src/main/webapp/WEB-INF/views/experimentkinds/create.jspx
deleted file mode 100755
index ac4acc7b7..000000000
--- a/src/main/webapp/WEB-INF/views/experimentkinds/create.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ExperimentKind" modelAttribute="experimentKind" path="/experimentkinds" render="${empty dependencies}" z="Iy3XPNpOK6MNp3/8WsFMkcDw5ng=">
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_ExperimentKind_lsType" itemValue="id" items="${experimenttypes}" path="/experimenttypes" required="true" z="l6CYDSyNVegK7Aj9tRX/j0xkTkQ="/>
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_ExperimentKind_kindName" required="true" z="VqKOXBguyNRG/D17VbQizy0P6FE="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ExperimentKind_lsTypeAndKind" z="nItoiV1TZee/Kg9bR70shniV/f8="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ExperimentKind" render="${not empty dependencies}" z="RVq20tjCsw0dY8V/UIopfM87wIg="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentkinds/list.jspx b/src/main/webapp/WEB-INF/views/experimentkinds/list.jspx
deleted file mode 100755
index 50824161e..000000000
--- a/src/main/webapp/WEB-INF/views/experimentkinds/list.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ExperimentKind" items="${experimentkinds}" z="wvxRsiUsgkaSsGhWio1hmaeDiXE=">
-        <table:table data="${experimentkinds}" id="l_com_labsynch_labseer_domain_ExperimentKind" path="/experimentkinds" z="euvaQpKvmhf+ZcZ9mVSYdFfmetY=">
-            <table:column id="c_com_labsynch_labseer_domain_ExperimentKind_lsType" property="lsType" z="6xApuq3a/Dwb9KNaJr59tFLdKeg="/>
-            <table:column id="c_com_labsynch_labseer_domain_ExperimentKind_kindName" property="kindName" z="jn7IM79MqNjuMIB5NKKV8MQsGFE="/>
-            <table:column id="c_com_labsynch_labseer_domain_ExperimentKind_lsTypeAndKind" property="lsTypeAndKind" z="p8t5eWjkB8FPt75x0DSiV5wpeVA="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentkinds/show.jspx b/src/main/webapp/WEB-INF/views/experimentkinds/show.jspx
deleted file mode 100755
index 6704f47a4..000000000
--- a/src/main/webapp/WEB-INF/views/experimentkinds/show.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ExperimentKind" object="${experimentkind}" path="/experimentkinds" z="bOay1iEonjk7w/JI5d9eADC3bao=">
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ExperimentKind_lsType" object="${experimentkind}" z="WsQ6lyf6wemaVTa+sG0qoAQedfI="/>
-        <field:display field="kindName" id="s_com_labsynch_labseer_domain_ExperimentKind_kindName" object="${experimentkind}" z="YHLRF7361afVnhCml4QSUQCr7XA="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ExperimentKind_lsTypeAndKind" object="${experimentkind}" z="tc/40yyd5xCjSC7ASnoA2fHQwBQ="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentkinds/update.jspx b/src/main/webapp/WEB-INF/views/experimentkinds/update.jspx
deleted file mode 100755
index 703ba5b76..000000000
--- a/src/main/webapp/WEB-INF/views/experimentkinds/update.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ExperimentKind" modelAttribute="experimentKind" path="/experimentkinds" versionField="Version" z="lAVpZxsiE+zlOAiHhbYLT8+XFPs=">
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_ExperimentKind_lsType" itemValue="id" items="${experimenttypes}" path="/experimenttypes" required="true" z="l6CYDSyNVegK7Aj9tRX/j0xkTkQ="/>
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_ExperimentKind_kindName" required="true" z="VqKOXBguyNRG/D17VbQizy0P6FE="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ExperimentKind_lsTypeAndKind" z="nItoiV1TZee/Kg9bR70shniV/f8="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentkinds/views.xml b/src/main/webapp/WEB-INF/views/experimentkinds/views.xml
deleted file mode 100755
index 5efdfcb30..000000000
--- a/src/main/webapp/WEB-INF/views/experimentkinds/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="experimentkinds/list">
-        <put-attribute name="body" value="/WEB-INF/views/experimentkinds/list.jspx"/>
-    </definition>
-<definition extends="default" name="experimentkinds/show">
-        <put-attribute name="body" value="/WEB-INF/views/experimentkinds/show.jspx"/>
-    </definition>
-<definition extends="default" name="experimentkinds/create">
-        <put-attribute name="body" value="/WEB-INF/views/experimentkinds/create.jspx"/>
-    </definition>
-<definition extends="default" name="experimentkinds/update">
-        <put-attribute name="body" value="/WEB-INF/views/experimentkinds/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/experimentlabels/create.jspx b/src/main/webapp/WEB-INF/views/experimentlabels/create.jspx
deleted file mode 100755
index 8eedb01b1..000000000
--- a/src/main/webapp/WEB-INF/views/experimentlabels/create.jspx
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ExperimentLabel" modelAttribute="experimentLabel" path="/experimentlabels" render="${empty dependencies}" z="89U6/SBEjwAIzlmzNphJf2xoVwA=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ExperimentLabel_recordedBy" required="true" z="zZNzCyLDZY6uUSf1GSq6YqmkOaQ="/>
-        <field:datetime dateTimePattern="${experimentLabel_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ExperimentLabel_recordedDate" required="true" z="RiIae8+p8EWorFS435sqb9hkGbE="/>
-        <field:datetime dateTimePattern="${experimentLabel_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ExperimentLabel_modifiedDate" z="dC+syfh516vh80L9s8qpGhw+GoA="/>
-        <field:checkbox field="physicallyLabled" id="c_com_labsynch_labseer_domain_ExperimentLabel_physicallyLabled" z="idVNkDrvgFx7Y2ilM0MvCXdmuDA="/>
-        <field:checkbox field="preferred" id="c_com_labsynch_labseer_domain_ExperimentLabel_preferred" z="tl5foj+ryLQxdGHrHWl8G7FgjMg="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ExperimentLabel_ignored" z="vp/XfCZilOJkvpMBNTLes4fjzfA="/>
-        <field:select field="experiment" id="c_com_labsynch_labseer_domain_ExperimentLabel_experiment" itemValue="id" items="${experiments}" path="/experiments" required="true" z="s26dHvSDNffowEkRPbG3DlMtGrY="/>
-        <field:textarea field="labelText" id="c_com_labsynch_labseer_domain_ExperimentLabel_labelText" required="true" z="0DcFmUm3JzOGgxPukEvqsvtV1/U="/>
-        <field:textarea field="imageFile" id="c_com_labsynch_labseer_domain_ExperimentLabel_imageFile" z="geJLknx14SnXNeVip1dn+TV9vzQ="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ExperimentLabel_lsTransaction" validationMessageCode="field_invalid_integer" z="N6fDNr8ED6hNJKQndcHxIVxStqM="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ExperimentLabel_lsType" required="true" z="11hmXcLqzUyCX9Bvxyvo9k9AIyw="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ExperimentLabel_lsKind" required="true" z="59/ktBitG3L71j7/bMgoKPXpjNI="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ExperimentLabel_lsTypeAndKind" z="KbU8sYHEGdDIhfVGVR9pVa++NKQ="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ExperimentLabel_deleted" z="5b68EWE6Nw1Rnk8xtgVsEqTLe04="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ExperimentLabel" render="${not empty dependencies}" z="6BIEPS6ERSk/Fegk0JRIvHIiiBQ="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentlabels/findExperimentLabelsByExperiment.jspx b/src/main/webapp/WEB-INF/views/experimentlabels/findExperimentLabelsByExperiment.jspx
deleted file mode 100755
index aeb6ffae4..000000000
--- a/src/main/webapp/WEB-INF/views/experimentlabels/findExperimentLabelsByExperiment.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByExperiment" id="ff_com_labsynch_labseer_domain_ExperimentLabel" path="/experimentlabels" z="d9bPN/NXovckrW+r26QML6TmrG0=">
-        <field:select disableFormBinding="true" field="experiment" id="f_com_labsynch_labseer_domain_ExperimentLabel_experiment" itemValue="id" items="${experiments}" path="/experiments" required="true" z="6WrZoog1n+mSDJKeKkIH12UYYYw="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentlabels/findExperimentLabelsByExperimentAndIgnoredNot.jspx b/src/main/webapp/WEB-INF/views/experimentlabels/findExperimentLabelsByExperimentAndIgnoredNot.jspx
deleted file mode 100644
index 1970c53de..000000000
--- a/src/main/webapp/WEB-INF/views/experimentlabels/findExperimentLabelsByExperimentAndIgnoredNot.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByExperimentAndIgnoredNot" id="ff_com_labsynch_labseer_domain_ExperimentLabel" path="/experimentlabels" z="ERHx+DxZ0yjpD0VStTj+xhfz5PU=">
-        <field:select disableFormBinding="true" field="experiment" id="f_com_labsynch_labseer_domain_ExperimentLabel_experiment" itemValue="id" items="${experiments}" path="/experiments" required="true" z="6WrZoog1n+mSDJKeKkIH12UYYYw="/>
-        <field:checkbox disableFormBinding="true" field="ignored" id="f_com_labsynch_labseer_domain_ExperimentLabel_ignored" z="9Ci7hbFFlcIuWfLX3ODO5JB2KGA="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentlabels/findExperimentLabelsByLabelTextLike.jspx b/src/main/webapp/WEB-INF/views/experimentlabels/findExperimentLabelsByLabelTextLike.jspx
deleted file mode 100644
index 29c288a46..000000000
--- a/src/main/webapp/WEB-INF/views/experimentlabels/findExperimentLabelsByLabelTextLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLabelTextLike" id="ff_com_labsynch_labseer_domain_ExperimentLabel" path="/experimentlabels" z="j6ZkKX2sVoT5Su7X08dC5EivDQw=">
-        <field:input disableFormBinding="true" field="labelText" id="f_com_labsynch_labseer_domain_ExperimentLabel_labelText" max="255" required="true" z="5s6ro/ekChPzkZp/0ou72BA+CF4="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentlabels/findExperimentLabelsByLabelTextLikeAndLabelTypeAndKindEqualsAndPreferredNotAndIgnoredNot.jspx b/src/main/webapp/WEB-INF/views/experimentlabels/findExperimentLabelsByLabelTextLikeAndLabelTypeAndKindEqualsAndPreferredNotAndIgnoredNot.jspx
deleted file mode 100755
index b1ac7c4a9..000000000
--- a/src/main/webapp/WEB-INF/views/experimentlabels/findExperimentLabelsByLabelTextLikeAndLabelTypeAndKindEqualsAndPreferredNotAndIgnoredNot.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLabelTextLikeAndLabelTypeAndKindEqualsAndPreferredNotAndIgnoredNot" id="ff_com_labsynch_labseer_domain_ExperimentLabel" path="/experimentlabels" z="d8qyfP/BN2cFR+xbQ7kTbLc1r98=">
-        <field:input disableFormBinding="true" field="labelText" id="f_com_labsynch_labseer_domain_ExperimentLabel_labelText" max="255" required="true" z="5s6ro/ekChPzkZp/0ou72BA+CF4="/>
-        <field:input disableFormBinding="true" field="labelTypeAndKind" id="f_com_labsynch_labseer_domain_ExperimentLabel_labelTypeAndKind" max="255" required="true" z="Js5fW4pwhV0DG44GiEE+R7icQNI="/>
-        <field:checkbox disableFormBinding="true" field="preferred" id="f_com_labsynch_labseer_domain_ExperimentLabel_preferred" z="QFi0R9JNfi2IjQdGS5XlmhhswSk="/>
-        <field:checkbox disableFormBinding="true" field="ignored" id="f_com_labsynch_labseer_domain_ExperimentLabel_ignored" z="9Ci7hbFFlcIuWfLX3ODO5JB2KGA="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentlabels/findExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot.jspx b/src/main/webapp/WEB-INF/views/experimentlabels/findExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot.jspx
deleted file mode 100755
index 300a311f5..000000000
--- a/src/main/webapp/WEB-INF/views/experimentlabels/findExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot" id="ff_com_labsynch_labseer_domain_ExperimentLabel" path="/experimentlabels" z="zowmPkOVkC+9xx6cIm0gluNBONs=">
-        <field:input disableFormBinding="true" field="labelText" id="f_com_labsynch_labseer_domain_ExperimentLabel_labelText" max="255" required="true" z="5s6ro/ekChPzkZp/0ou72BA+CF4="/>
-        <field:input disableFormBinding="true" field="lsTypeAndKind" id="f_com_labsynch_labseer_domain_ExperimentLabel_lsTypeAndKind" max="255" required="true" z="wIrn5n9E/2y4nx6JB0V45+tvdkE="/>
-        <field:checkbox disableFormBinding="true" field="preferred" id="f_com_labsynch_labseer_domain_ExperimentLabel_preferred" z="QFi0R9JNfi2IjQdGS5XlmhhswSk="/>
-        <field:checkbox disableFormBinding="true" field="ignored" id="f_com_labsynch_labseer_domain_ExperimentLabel_ignored" z="9Ci7hbFFlcIuWfLX3ODO5JB2KGA="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentlabels/findExperimentLabelsByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot.jspx b/src/main/webapp/WEB-INF/views/experimentlabels/findExperimentLabelsByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot.jspx
deleted file mode 100755
index 19ff735b5..000000000
--- a/src/main/webapp/WEB-INF/views/experimentlabels/findExperimentLabelsByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot" id="ff_com_labsynch_labseer_domain_ExperimentLabel" path="/experimentlabels" z="Nmk3l+wjaSLnPLWLmTeoQZAhLys=">
-        <field:input disableFormBinding="true" field="lsTypeAndKind" id="f_com_labsynch_labseer_domain_ExperimentLabel_lsTypeAndKind" max="255" required="true" z="wIrn5n9E/2y4nx6JB0V45+tvdkE="/>
-        <field:checkbox disableFormBinding="true" field="preferred" id="f_com_labsynch_labseer_domain_ExperimentLabel_preferred" z="QFi0R9JNfi2IjQdGS5XlmhhswSk="/>
-        <field:checkbox disableFormBinding="true" field="ignored" id="f_com_labsynch_labseer_domain_ExperimentLabel_ignored" z="9Ci7hbFFlcIuWfLX3ODO5JB2KGA="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentlabels/list.jspx b/src/main/webapp/WEB-INF/views/experimentlabels/list.jspx
deleted file mode 100755
index f29ef3bec..000000000
--- a/src/main/webapp/WEB-INF/views/experimentlabels/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ExperimentLabel" items="${experimentlabels}" z="foOA89E3Pa+ctNihfYf37be/DWw=">
-        <table:table data="${experimentlabels}" id="l_com_labsynch_labseer_domain_ExperimentLabel" path="/experimentlabels" z="4/fD5/RVxBVuTB2jyRftO8Bg1Qo=">
-            <table:column id="c_com_labsynch_labseer_domain_ExperimentLabel_recordedBy" property="recordedBy" z="10p20GLPaM+O6iaWACQWodwJOJE="/>
-            <table:column date="true" dateTimePattern="${experimentLabel_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_ExperimentLabel_recordedDate" property="recordedDate" z="HC99tG3ONc9GKDzK41XS8oRiOqc="/>
-            <table:column date="true" dateTimePattern="${experimentLabel_modifieddate_date_format}" id="c_com_labsynch_labseer_domain_ExperimentLabel_modifiedDate" property="modifiedDate" z="AvjdqotbzefiDaCqDOYG3DIRpIE="/>
-            <table:column id="c_com_labsynch_labseer_domain_ExperimentLabel_physicallyLabled" property="physicallyLabled" z="DZEAgJgM6ehqzlJHJXMmxfntnYs="/>
-            <table:column id="c_com_labsynch_labseer_domain_ExperimentLabel_labelText" property="labelText" z="iUDrtMOSXuyh4VprQAu+fpi5gvY="/>
-            <table:column id="c_com_labsynch_labseer_domain_ExperimentLabel_imageFile" property="imageFile" z="2WHRyt7+78BBlmERauPAUD0zPjI="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentlabels/show.jspx b/src/main/webapp/WEB-INF/views/experimentlabels/show.jspx
deleted file mode 100755
index 3946f1a8c..000000000
--- a/src/main/webapp/WEB-INF/views/experimentlabels/show.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ExperimentLabel" object="${experimentlabel}" path="/experimentlabels" z="6GbCqGpM5omtBwO8e+2v3OMlYtc=">
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_ExperimentLabel_recordedBy" object="${experimentlabel}" z="l/jNXBxiAEGn7RnVQvobeMxvhnM="/>
-        <field:display date="true" dateTimePattern="${experimentLabel_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_ExperimentLabel_recordedDate" object="${experimentlabel}" z="GJV66bOYfkzwhel9J5aSfkoCgZ8="/>
-        <field:display date="true" dateTimePattern="${experimentLabel_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_ExperimentLabel_modifiedDate" object="${experimentlabel}" z="CJZkT3C/7GOP8bmRblbtECRCbOY="/>
-        <field:display field="physicallyLabled" id="s_com_labsynch_labseer_domain_ExperimentLabel_physicallyLabled" object="${experimentlabel}" z="aj4B0ca3YbsSyQlNRqOCf8ahVE0="/>
-        <field:display field="preferred" id="s_com_labsynch_labseer_domain_ExperimentLabel_preferred" object="${experimentlabel}" z="jWoVqtxtUfS6NO3bmX5pm0++cpA="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ExperimentLabel_ignored" object="${experimentlabel}" z="sHLOx0oxG0+abP2CE4prZZOwQIY="/>
-        <field:display field="experiment" id="s_com_labsynch_labseer_domain_ExperimentLabel_experiment" object="${experimentlabel}" z="TZkMbcG599CzuhPobn6QvgO+1SM="/>
-        <field:display field="labelText" id="s_com_labsynch_labseer_domain_ExperimentLabel_labelText" object="${experimentlabel}" z="pSJVH8Sta4L5IWJO7Fjeg5CFHoo="/>
-        <field:display field="imageFile" id="s_com_labsynch_labseer_domain_ExperimentLabel_imageFile" object="${experimentlabel}" z="QLZKPARXQKVYcJdIE+MR+2DmpDA="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_ExperimentLabel_lsTransaction" object="${experimentlabel}" z="7AP+iSvExQT7TysPTFj0t1zMw7U="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ExperimentLabel_lsType" object="${experimentlabel}" z="Ii8XIUMSo45SHFgZbancdurq/00="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_ExperimentLabel_lsKind" object="${experimentlabel}" z="H4SFBqUy0tWbiSYIHgx4efmiWW4="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ExperimentLabel_lsTypeAndKind" object="${experimentlabel}" z="i2ENJ6NoTLXPpDxD2pOK1Q3bOXk="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_ExperimentLabel_deleted" object="${experimentlabel}" z="yuuC5n/g7ZbYwOsgmCrBJzyv1IU="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentlabels/update.jspx b/src/main/webapp/WEB-INF/views/experimentlabels/update.jspx
deleted file mode 100755
index acedaf056..000000000
--- a/src/main/webapp/WEB-INF/views/experimentlabels/update.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ExperimentLabel" modelAttribute="experimentLabel" path="/experimentlabels" versionField="Version" z="zdH7DtJJTbRX9Q7TK6pium0j1Rw=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ExperimentLabel_recordedBy" required="true" z="zZNzCyLDZY6uUSf1GSq6YqmkOaQ="/>
-        <field:datetime dateTimePattern="${experimentLabel_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ExperimentLabel_recordedDate" required="true" z="RiIae8+p8EWorFS435sqb9hkGbE="/>
-        <field:datetime dateTimePattern="${experimentLabel_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ExperimentLabel_modifiedDate" z="dC+syfh516vh80L9s8qpGhw+GoA="/>
-        <field:checkbox field="physicallyLabled" id="c_com_labsynch_labseer_domain_ExperimentLabel_physicallyLabled" z="idVNkDrvgFx7Y2ilM0MvCXdmuDA="/>
-        <field:checkbox field="preferred" id="c_com_labsynch_labseer_domain_ExperimentLabel_preferred" z="tl5foj+ryLQxdGHrHWl8G7FgjMg="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ExperimentLabel_ignored" z="vp/XfCZilOJkvpMBNTLes4fjzfA="/>
-        <field:select field="experiment" id="c_com_labsynch_labseer_domain_ExperimentLabel_experiment" itemValue="id" items="${experiments}" path="/experiments" required="true" z="s26dHvSDNffowEkRPbG3DlMtGrY="/>
-        <field:textarea field="labelText" id="c_com_labsynch_labseer_domain_ExperimentLabel_labelText" required="true" z="0DcFmUm3JzOGgxPukEvqsvtV1/U="/>
-        <field:textarea field="imageFile" id="c_com_labsynch_labseer_domain_ExperimentLabel_imageFile" z="geJLknx14SnXNeVip1dn+TV9vzQ="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ExperimentLabel_lsTransaction" validationMessageCode="field_invalid_integer" z="N6fDNr8ED6hNJKQndcHxIVxStqM="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ExperimentLabel_lsType" required="true" z="11hmXcLqzUyCX9Bvxyvo9k9AIyw="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ExperimentLabel_lsKind" required="true" z="59/ktBitG3L71j7/bMgoKPXpjNI="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ExperimentLabel_lsTypeAndKind" z="KbU8sYHEGdDIhfVGVR9pVa++NKQ="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ExperimentLabel_deleted" z="5b68EWE6Nw1Rnk8xtgVsEqTLe04="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentlabels/views.xml b/src/main/webapp/WEB-INF/views/experimentlabels/views.xml
deleted file mode 100755
index d928d7b8a..000000000
--- a/src/main/webapp/WEB-INF/views/experimentlabels/views.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="experimentlabels/list">
-        <put-attribute name="body" value="/WEB-INF/views/experimentlabels/list.jspx"/>
-    </definition>
-<definition extends="default" name="experimentlabels/show">
-        <put-attribute name="body" value="/WEB-INF/views/experimentlabels/show.jspx"/>
-    </definition>
-<definition extends="default" name="experimentlabels/create">
-        <put-attribute name="body" value="/WEB-INF/views/experimentlabels/create.jspx"/>
-    </definition>
-<definition extends="default" name="experimentlabels/update">
-        <put-attribute name="body" value="/WEB-INF/views/experimentlabels/update.jspx"/>
-    </definition>
-<definition extends="default" name="experimentlabels/findExperimentLabelsByLabelTextLikeAndLabelTypeAndKindEqualsAndPreferredNotAndIgnoredNot">
-        <put-attribute name="body" value="/WEB-INF/views/experimentlabels/findExperimentLabelsByLabelTextLikeAndLabelTypeAndKindEqualsAndPreferredNotAndIgnoredNot.jspx"/>
-    </definition>
-<definition extends="default" name="experimentlabels/findExperimentLabelsByExperiment">
-        <put-attribute name="body" value="/WEB-INF/views/experimentlabels/findExperimentLabelsByExperiment.jspx"/>
-    </definition>
-<definition extends="default" name="experimentlabels/findExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot">
-        <put-attribute name="body" value="/WEB-INF/views/experimentlabels/findExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot.jspx"/>
-    </definition>
-<definition extends="default" name="experimentlabels/findExperimentLabelsByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot">
-        <put-attribute name="body" value="/WEB-INF/views/experimentlabels/findExperimentLabelsByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot.jspx"/>
-    </definition>
-<definition extends="default" name="experimentlabels/findExperimentLabelsByLabelTextLike">
-        <put-attribute name="body" value="/WEB-INF/views/experimentlabels/findExperimentLabelsByLabelTextLike.jspx"/>
-    </definition>
-<definition extends="default" name="experimentlabels/findExperimentLabelsByExperimentAndIgnoredNot">
-        <put-attribute name="body" value="/WEB-INF/views/experimentlabels/findExperimentLabelsByExperimentAndIgnoredNot.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/experiments/create.jspx b/src/main/webapp/WEB-INF/views/experiments/create.jspx
deleted file mode 100755
index a0253a333..000000000
--- a/src/main/webapp/WEB-INF/views/experiments/create.jspx
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_Experiment" modelAttribute="experiment" path="/experiments" render="${empty dependencies}" z="FNe/f3p/JD6zDscdHnrx227mz9Y=">
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_Experiment_codeName" z="TB+sSauZFq5z5oIZInJ9rNrb70w="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_Experiment_recordedBy" required="true" z="YzFFtYMykCIPN4TuTcq7/9CCh5g="/>
-        <field:datetime dateTimePattern="${experiment_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_Experiment_recordedDate" required="true" z="QX1QBdL9hq6N9TPkOwxyOD0XuSQ="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_Experiment_modifiedBy" z="OhEignBY6jdLvKW+LHGowpVY+qM="/>
-        <field:datetime dateTimePattern="${experiment_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_Experiment_modifiedDate" z="4ZcUYSryt0YDgTIOKUAYaJu8VME="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_Experiment_ignored" z="3xN87qCyv7O+ZICNzLiURQFkHwQ="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_Experiment_lsTransaction" validationMessageCode="field_invalid_integer" z="3bxKbqnom0WB8Ah+BJA+PnAbxEs="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_Experiment_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="SWClQdSAmR5CmuDeR59xz4XrFTA="/>
-        <field:textarea field="shortDescription" id="c_com_labsynch_labseer_domain_Experiment_shortDescription" z="XEEHBSCgMx7+9JamxsybESjdDy4="/>
-        <field:select field="analysisGroups" id="c_com_labsynch_labseer_domain_Experiment_analysisGroups" itemValue="id" items="${analysisgroups}" multiple="true" path="/analysisgroups" z="FTshVE+Y/GBBaJMOh/2HWm2PJ6s="/>
-        <field:select field="protocol" id="c_com_labsynch_labseer_domain_Experiment_protocol" itemValue="id" items="${protocols}" path="/protocols" required="true" z="lcMTCLeLJDlRKVtFo+K/fhFmJbk="/>
-        <field:simple field="lsStates" id="c_com_labsynch_labseer_domain_Experiment_lsStates" messageCode="entity_reference_not_managed" messageCodeAttribute="Experiment State" z="dZbxv88VJ0W26zIITLfcqqiYDuY="/>
-        <field:simple field="lsLabels" id="c_com_labsynch_labseer_domain_Experiment_lsLabels" messageCode="entity_reference_not_managed" messageCodeAttribute="Experiment Label" z="+1eSxIqLj79+ert3NhBtKQNnzXw="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_Experiment_lsType" required="true" z="10CUpn1G5U16Qq8a2nD1seHEyQI="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_Experiment_lsKind" required="true" z="LJF1kR7Ozy3Cymor7VOam+O2suo="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_Experiment_lsTypeAndKind" z="AjF4xMOv0aSVdfIcJK5CgHEXOKI="/>
-        <field:select field="lsTags" id="c_com_labsynch_labseer_domain_Experiment_lsTags" itemValue="id" items="${lstags}" multiple="true" path="/lstags" z="7ZO2doMe33rF0pY2EgkqT/HwGLw="/>
-        <field:simple field="firstExperiments" id="c_com_labsynch_labseer_domain_Experiment_firstExperiments" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Experiment Experiment" z="+TTuc3LQS6zadOjHQBZ2Bl6/BRM="/>
-        <field:simple field="secondExperiments" id="c_com_labsynch_labseer_domain_Experiment_secondExperiments" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Experiment Experiment" z="LN4kQJEqSoQT/iQ5phpXyTVkJA4="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_Experiment_deleted" z="C5cl8nux+hX9Rj4tUg6cr+JQTc8="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_Experiment" render="${not empty dependencies}" z="UK7CzvIawZohR+xMT8cRdGDIknQ="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experiments/findExperimentsByCodeNameEquals.jspx b/src/main/webapp/WEB-INF/views/experiments/findExperimentsByCodeNameEquals.jspx
deleted file mode 100755
index 1e499347a..000000000
--- a/src/main/webapp/WEB-INF/views/experiments/findExperimentsByCodeNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeNameEquals" id="ff_com_labsynch_labseer_domain_Experiment" path="/experiments" z="kjHYbJLV2JqlrA7HD+F1AUh0gew=">
-        <field:input disableFormBinding="true" field="codeName" id="f_com_labsynch_labseer_domain_Experiment_codeName" max="255" required="true" z="Fnb0ywAT9uzx/LO34crnAJcKtvY="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experiments/findExperimentsByCodeNameLike.jspx b/src/main/webapp/WEB-INF/views/experiments/findExperimentsByCodeNameLike.jspx
deleted file mode 100644
index 179692233..000000000
--- a/src/main/webapp/WEB-INF/views/experiments/findExperimentsByCodeNameLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeNameLike" id="ff_com_labsynch_labseer_domain_Experiment" path="/experiments" z="aUamHGYSNKJc7S6jMsbzF2T0Uz8=">
-        <field:input disableFormBinding="true" field="codeName" id="f_com_labsynch_labseer_domain_Experiment_codeName" max="255" required="true" z="Fnb0ywAT9uzx/LO34crnAJcKtvY="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experiments/findExperimentsByLsKindEquals.jspx b/src/main/webapp/WEB-INF/views/experiments/findExperimentsByLsKindEquals.jspx
deleted file mode 100644
index 665f7333c..000000000
--- a/src/main/webapp/WEB-INF/views/experiments/findExperimentsByLsKindEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsKindEquals" id="ff_com_labsynch_labseer_domain_Experiment" path="/experiments" z="emcnFzkdASm3luaKsz63jRuOz4I=">
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_Experiment_lsKind" max="255" required="true" z="ZH3XHyovgF63THUWnI2zceRXlOg="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experiments/findExperimentsByLsKindLike.jspx b/src/main/webapp/WEB-INF/views/experiments/findExperimentsByLsKindLike.jspx
deleted file mode 100644
index 4cae68c24..000000000
--- a/src/main/webapp/WEB-INF/views/experiments/findExperimentsByLsKindLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsKindLike" id="ff_com_labsynch_labseer_domain_Experiment" path="/experiments" z="DuiFfCiBUh/X8ODvCvXaqIR3d2w=">
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_Experiment_lsKind" max="255" required="true" z="ZH3XHyovgF63THUWnI2zceRXlOg="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experiments/findExperimentsByLsTransaction.jspx b/src/main/webapp/WEB-INF/views/experiments/findExperimentsByLsTransaction.jspx
deleted file mode 100755
index 3eb08a537..000000000
--- a/src/main/webapp/WEB-INF/views/experiments/findExperimentsByLsTransaction.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTransaction" id="ff_com_labsynch_labseer_domain_Experiment" path="/experiments" z="0sbSJvJ0PYaZJ86YtT1cv/5y678=">
-        <field:input disableFormBinding="true" field="lsTransaction" id="f_com_labsynch_labseer_domain_Experiment_lsTransaction" required="true" validationMessageCode="field_invalid_integer" z="2ZSlAzDJMQQdxIo4GXJ4b0wySpo="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experiments/findExperimentsByLsTypeEquals.jspx b/src/main/webapp/WEB-INF/views/experiments/findExperimentsByLsTypeEquals.jspx
deleted file mode 100644
index 759ab9e01..000000000
--- a/src/main/webapp/WEB-INF/views/experiments/findExperimentsByLsTypeEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeEquals" id="ff_com_labsynch_labseer_domain_Experiment" path="/experiments" z="fI5D9jHUsCUsf71paN+8qve91gs=">
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_Experiment_lsType" max="255" required="true" z="ItW4gjwqWEcGgzABa30B6LDAmfc="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experiments/findExperimentsByLsTypeEqualsAndLsKindEquals.jspx b/src/main/webapp/WEB-INF/views/experiments/findExperimentsByLsTypeEqualsAndLsKindEquals.jspx
deleted file mode 100644
index 362a6bd6a..000000000
--- a/src/main/webapp/WEB-INF/views/experiments/findExperimentsByLsTypeEqualsAndLsKindEquals.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeEqualsAndLsKindEquals" id="ff_com_labsynch_labseer_domain_Experiment" path="/experiments" z="F6gPynoCzAwQlCrOe9HbeZO2ux8=">
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_Experiment_lsType" max="255" required="true" z="ItW4gjwqWEcGgzABa30B6LDAmfc="/>
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_Experiment_lsKind" max="255" required="true" z="ZH3XHyovgF63THUWnI2zceRXlOg="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experiments/findExperimentsByLsTypeLike.jspx b/src/main/webapp/WEB-INF/views/experiments/findExperimentsByLsTypeLike.jspx
deleted file mode 100644
index ed4d2ce32..000000000
--- a/src/main/webapp/WEB-INF/views/experiments/findExperimentsByLsTypeLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeLike" id="ff_com_labsynch_labseer_domain_Experiment" path="/experiments" z="sa9m5k8UTl79gjA+dxL7/1c1mcI=">
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_Experiment_lsType" max="255" required="true" z="ItW4gjwqWEcGgzABa30B6LDAmfc="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experiments/findExperimentsByProtocol.jspx b/src/main/webapp/WEB-INF/views/experiments/findExperimentsByProtocol.jspx
deleted file mode 100755
index e656d280a..000000000
--- a/src/main/webapp/WEB-INF/views/experiments/findExperimentsByProtocol.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByProtocol" id="ff_com_labsynch_labseer_domain_Experiment" path="/experiments" z="nscewnSgfrypSJbhF4gS0FVR6pg=">
-        <field:select disableFormBinding="true" field="protocol" id="f_com_labsynch_labseer_domain_Experiment_protocol" itemValue="id" items="${protocols}" path="/protocols" required="true" z="d0xbeqv5MA6i2SS4FUTZwgu38ms="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experiments/findExperimentsByRecordedByLike.jspx b/src/main/webapp/WEB-INF/views/experiments/findExperimentsByRecordedByLike.jspx
deleted file mode 100644
index 79c33afd1..000000000
--- a/src/main/webapp/WEB-INF/views/experiments/findExperimentsByRecordedByLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByRecordedByLike" id="ff_com_labsynch_labseer_domain_Experiment" path="/experiments" z="mOh5+A+lYYGAUoBRbipGCiIywRQ=">
-        <field:input disableFormBinding="true" field="recordedBy" id="f_com_labsynch_labseer_domain_Experiment_recordedBy" max="255" required="true" z="AlPYGQvlg+/HvIhDJRlZfQoYVZI="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experiments/list.jspx b/src/main/webapp/WEB-INF/views/experiments/list.jspx
deleted file mode 100755
index 78b0d40f5..000000000
--- a/src/main/webapp/WEB-INF/views/experiments/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_Experiment" items="${experiments}" z="x02pQGfL10RXGI0440vYu0YeLyg=">
-        <table:table data="${experiments}" id="l_com_labsynch_labseer_domain_Experiment" path="/experiments" z="z64inBqQ9Z73K1z7OXmtfNiJYWI=">
-            <table:column id="c_com_labsynch_labseer_domain_Experiment_recordedBy" property="recordedBy" z="bxLtHEpSq5Nogoux5lA5ZxnhKoc="/>
-            <table:column date="true" dateTimePattern="${experiment_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_Experiment_recordedDate" property="recordedDate" z="aRco8nzVw9qMuK02byJlP0AJlKg="/>
-            <table:column id="c_com_labsynch_labseer_domain_Experiment_codeName" property="codeName" z="b2PYQFSe9gZn0j3rQC+JR8tTVJk="/>
-            <table:column id="c_com_labsynch_labseer_domain_Experiment_lsType" property="lsType" z="TNMwatOMpk1Nko5mgjtFrWDBjII="/>
-            <table:column id="c_com_labsynch_labseer_domain_Experiment_lsKind" property="lsKind" z="/0lbVjzUWCp3B/PJ73pu1btN+2c="/>
-            <table:column id="c_com_labsynch_labseer_domain_Experiment_lsTypeAndKind" property="lsTypeAndKind" z="ROrfBTjLIz4oNzuR7cEWlT9pQi4="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experiments/show.jspx b/src/main/webapp/WEB-INF/views/experiments/show.jspx
deleted file mode 100755
index 17792274b..000000000
--- a/src/main/webapp/WEB-INF/views/experiments/show.jspx
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_Experiment" object="${experiment}" path="/experiments" z="UWFdyTVLVxvYyhcFZYIV5Ys+TxY=">
-        <field:display field="codeName" id="s_com_labsynch_labseer_domain_Experiment_codeName" object="${experiment}" z="k4TTU5LWkN5xqEmmQWAgaAYOlfM="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_Experiment_recordedBy" object="${experiment}" z="ZPCLAyv91t8FKp5tTAUJgahrsNc="/>
-        <field:display date="true" dateTimePattern="${experiment_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_Experiment_recordedDate" object="${experiment}" z="8y8M7FEMwq2pAguossQfMpZ7XBQ="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_Experiment_modifiedBy" object="${experiment}" z="rrHlSKsARQGCb9qw94C/GMpeM2c="/>
-        <field:display date="true" dateTimePattern="${experiment_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_Experiment_modifiedDate" object="${experiment}" z="GrvTU6KlDf4PIsJWPaIMvs1nj2M="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_Experiment_ignored" object="${experiment}" z="B8bQ24qmIISd+xXD0UqkM6VLZuE="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_Experiment_lsTransaction" object="${experiment}" z="/Mp6XAnxMaMNU9CD2yhGrz8IBAk="/>
-        <field:display field="shortDescription" id="s_com_labsynch_labseer_domain_Experiment_shortDescription" object="${experiment}" z="U6TBxgA2W5GXJoxPVZn0FBwlSfU="/>
-        <field:display field="protocol" id="s_com_labsynch_labseer_domain_Experiment_protocol" object="${experiment}" z="kaT4DCZGSLfA1LS66cup/3suNnY="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_Experiment_lsType" object="${experiment}" z="kuZkikefGNT2xE3MLOqur2a3Yf0="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_Experiment_lsKind" object="${experiment}" z="Q1CiDgGAik8fdn3X1Bfqe/UYuWo="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_Experiment_lsTypeAndKind" object="${experiment}" z="D5Rndcz0rTKL6y6RCt5pRaz0ySw="/>
-        <field:display field="lsTags" id="s_com_labsynch_labseer_domain_Experiment_lsTags" object="${experiment}" z="SMrJnEQHbmrJzKRwXIQLUnpIsXw="/>
-        <field:display field="analysisGroups" id="s_com_labsynch_labseer_domain_Experiment_analysisGroups" object="${experiment}" z="nNrjflAcL4GD02X0eTNQeBhe40A="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_Experiment_deleted" object="${experiment}" z="nS5o/Ih2zgJnRCPzNIXi6uW1GfI="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experiments/update.jspx b/src/main/webapp/WEB-INF/views/experiments/update.jspx
deleted file mode 100755
index f6f53d178..000000000
--- a/src/main/webapp/WEB-INF/views/experiments/update.jspx
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_Experiment" modelAttribute="experiment" path="/experiments" versionField="Version" z="r8hkUx8LBQJ9nwiRZeWExnc0OoQ=">
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_Experiment_codeName" z="TB+sSauZFq5z5oIZInJ9rNrb70w="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_Experiment_recordedBy" required="true" z="YzFFtYMykCIPN4TuTcq7/9CCh5g="/>
-        <field:datetime dateTimePattern="${experiment_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_Experiment_recordedDate" required="true" z="QX1QBdL9hq6N9TPkOwxyOD0XuSQ="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_Experiment_modifiedBy" z="OhEignBY6jdLvKW+LHGowpVY+qM="/>
-        <field:datetime dateTimePattern="${experiment_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_Experiment_modifiedDate" z="4ZcUYSryt0YDgTIOKUAYaJu8VME="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_Experiment_ignored" z="3xN87qCyv7O+ZICNzLiURQFkHwQ="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_Experiment_lsTransaction" validationMessageCode="field_invalid_integer" z="3bxKbqnom0WB8Ah+BJA+PnAbxEs="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_Experiment_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="SWClQdSAmR5CmuDeR59xz4XrFTA="/>
-        <field:textarea field="shortDescription" id="c_com_labsynch_labseer_domain_Experiment_shortDescription" z="XEEHBSCgMx7+9JamxsybESjdDy4="/>
-        <field:select field="analysisGroups" id="c_com_labsynch_labseer_domain_Experiment_analysisGroups" itemValue="id" items="${analysisgroups}" multiple="true" path="/analysisgroups" z="FTshVE+Y/GBBaJMOh/2HWm2PJ6s="/>
-        <field:select field="protocol" id="c_com_labsynch_labseer_domain_Experiment_protocol" itemValue="id" items="${protocols}" path="/protocols" required="true" z="lcMTCLeLJDlRKVtFo+K/fhFmJbk="/>
-        <field:simple field="lsStates" id="c_com_labsynch_labseer_domain_Experiment_lsStates" messageCode="entity_reference_not_managed" messageCodeAttribute="Experiment State" z="dZbxv88VJ0W26zIITLfcqqiYDuY="/>
-        <field:simple field="lsLabels" id="c_com_labsynch_labseer_domain_Experiment_lsLabels" messageCode="entity_reference_not_managed" messageCodeAttribute="Experiment Label" z="+1eSxIqLj79+ert3NhBtKQNnzXw="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_Experiment_lsType" required="true" z="10CUpn1G5U16Qq8a2nD1seHEyQI="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_Experiment_lsKind" required="true" z="LJF1kR7Ozy3Cymor7VOam+O2suo="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_Experiment_lsTypeAndKind" z="AjF4xMOv0aSVdfIcJK5CgHEXOKI="/>
-        <field:select field="lsTags" id="c_com_labsynch_labseer_domain_Experiment_lsTags" itemValue="id" items="${lstags}" multiple="true" path="/lstags" z="7ZO2doMe33rF0pY2EgkqT/HwGLw="/>
-        <field:simple field="firstExperiments" id="c_com_labsynch_labseer_domain_Experiment_firstExperiments" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Experiment Experiment" z="+TTuc3LQS6zadOjHQBZ2Bl6/BRM="/>
-        <field:simple field="secondExperiments" id="c_com_labsynch_labseer_domain_Experiment_secondExperiments" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Experiment Experiment" z="LN4kQJEqSoQT/iQ5phpXyTVkJA4="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_Experiment_deleted" z="C5cl8nux+hX9Rj4tUg6cr+JQTc8="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experiments/views.xml b/src/main/webapp/WEB-INF/views/experiments/views.xml
deleted file mode 100755
index 7da32edb3..000000000
--- a/src/main/webapp/WEB-INF/views/experiments/views.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="experiments/list">
-        <put-attribute name="body" value="/WEB-INF/views/experiments/list.jspx"/>
-    </definition>
-<definition extends="default" name="experiments/show">
-        <put-attribute name="body" value="/WEB-INF/views/experiments/show.jspx"/>
-    </definition>
-<definition extends="default" name="experiments/create">
-        <put-attribute name="body" value="/WEB-INF/views/experiments/create.jspx"/>
-    </definition>
-<definition extends="default" name="experiments/update">
-        <put-attribute name="body" value="/WEB-INF/views/experiments/update.jspx"/>
-    </definition>
-<definition extends="default" name="experiments/findExperimentsByCodeNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/experiments/findExperimentsByCodeNameEquals.jspx"/>
-    </definition>
-<definition extends="default" name="experiments/findExperimentsByLsTransaction">
-        <put-attribute name="body" value="/WEB-INF/views/experiments/findExperimentsByLsTransaction.jspx"/>
-    </definition>
-<definition extends="default" name="experiments/findExperimentsByProtocol">
-        <put-attribute name="body" value="/WEB-INF/views/experiments/findExperimentsByProtocol.jspx"/>
-    </definition>
-<definition extends="default" name="experiments/findExperimentsByLsTypeEqualsAndLsKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/experiments/findExperimentsByLsTypeEqualsAndLsKindEquals.jspx"/>
-    </definition>
-<definition extends="default" name="experiments/findExperimentsByCodeNameLike">
-        <put-attribute name="body" value="/WEB-INF/views/experiments/findExperimentsByCodeNameLike.jspx"/>
-    </definition>
-<definition extends="default" name="experiments/findExperimentsByLsKindLike">
-        <put-attribute name="body" value="/WEB-INF/views/experiments/findExperimentsByLsKindLike.jspx"/>
-    </definition>
-<definition extends="default" name="experiments/findExperimentsByLsTypeLike">
-        <put-attribute name="body" value="/WEB-INF/views/experiments/findExperimentsByLsTypeLike.jspx"/>
-    </definition>
-<definition extends="default" name="experiments/findExperimentsByRecordedByLike">
-        <put-attribute name="body" value="/WEB-INF/views/experiments/findExperimentsByRecordedByLike.jspx"/>
-    </definition>
-<definition extends="default" name="experiments/findExperimentsByLsKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/experiments/findExperimentsByLsKindEquals.jspx"/>
-    </definition>
-<definition extends="default" name="experiments/findExperimentsByLsTypeEquals">
-        <put-attribute name="body" value="/WEB-INF/views/experiments/findExperimentsByLsTypeEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/experimentstates/create.jspx b/src/main/webapp/WEB-INF/views/experimentstates/create.jspx
deleted file mode 100755
index 3cb8d8bca..000000000
--- a/src/main/webapp/WEB-INF/views/experimentstates/create.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ExperimentState" modelAttribute="experimentState" path="/experimentstates" render="${empty dependencies}" z="yhH2uyhBeEWS0Cagk9BeDV78NXM=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ExperimentState_recordedBy" required="true" z="YGf8DoU4JyHry7xItaWaEYbPMtI="/>
-        <field:datetime dateTimePattern="${experimentState_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ExperimentState_recordedDate" required="true" z="PCzgZOIf8cmUCeC3RJ1RHlHNA9w="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ExperimentState_modifiedBy" z="XJCF09msfD0kFwZSGUJtegTedNs="/>
-        <field:datetime dateTimePattern="${experimentState_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ExperimentState_modifiedDate" z="W03yx0JDVWwcIbubWuK6gvGU6as="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ExperimentState_comments" z="EHQ7W6+FuxotcKjQ2hWCXyaGZQI="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ExperimentState_ignored" z="btjh2IsSOiVVprhh5kc1vlgoRR8="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ExperimentState_lsTransaction" validationMessageCode="field_invalid_integer" z="d5Nj2rSI2SrL7ry7QQvpgbzKhbo="/>
-        <field:select field="experiment" id="c_com_labsynch_labseer_domain_ExperimentState_experiment" itemValue="id" items="${experiments}" path="/experiments" required="true" z="cUQ4yEvnzG6xlYvgN/uOk31iy/o="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ExperimentState_lsType" required="true" z="bol8Dj6NAUPUH+If+0axEWPoRs8="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ExperimentState_lsKind" required="true" z="TUKuQ6caRos6XGHyJ+PGxI4F5W0="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ExperimentState_lsTypeAndKind" z="pND/258gKTxi7W4kcZcp232jblM="/>
-        <field:simple field="lsValues" id="c_com_labsynch_labseer_domain_ExperimentState_lsValues" messageCode="entity_reference_not_managed" messageCodeAttribute="Experiment Value" z="9UEKBr+HDkURwU/+WSJep3ZiQPo="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ExperimentState_deleted" z="3qTAbIIsoLM8ra0Mhy8Sh7LrXY8="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ExperimentState" render="${not empty dependencies}" z="azFopPX/w1L771KECpGE0uqu8vE="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentstates/findExperimentStatesByExperiment.jspx b/src/main/webapp/WEB-INF/views/experimentstates/findExperimentStatesByExperiment.jspx
deleted file mode 100755
index 688b27256..000000000
--- a/src/main/webapp/WEB-INF/views/experimentstates/findExperimentStatesByExperiment.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByExperiment" id="ff_com_labsynch_labseer_domain_ExperimentState" path="/experimentstates" z="2Le1BKOCvnHlYABKnRshJrqzZVE=">
-        <field:select disableFormBinding="true" field="experiment" id="f_com_labsynch_labseer_domain_ExperimentState_experiment" itemValue="id" items="${experiments}" path="/experiments" required="true" z="YsV0vf7h0uRMdYSUdaMIkIXJI4c="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentstates/list.jspx b/src/main/webapp/WEB-INF/views/experimentstates/list.jspx
deleted file mode 100755
index e6fe5846e..000000000
--- a/src/main/webapp/WEB-INF/views/experimentstates/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ExperimentState" items="${experimentstates}" z="+7QmTzgaGLDcqUe5ffWIUzA8V+o=">
-        <table:table data="${experimentstates}" id="l_com_labsynch_labseer_domain_ExperimentState" path="/experimentstates" z="yl3kjfOzces5i7FJLLXQIx4atgs=">
-            <table:column id="c_com_labsynch_labseer_domain_ExperimentState_recordedBy" property="recordedBy" z="oVxMyowO+d86zT4HzprAfj/ax3k="/>
-            <table:column date="true" dateTimePattern="${experimentState_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_ExperimentState_recordedDate" property="recordedDate" z="FopSZbN8rYx5GiNRvMqnaHc4D4w="/>
-            <table:column id="c_com_labsynch_labseer_domain_ExperimentState_modifiedBy" property="modifiedBy" z="cRizwrwrlu0Ssl9hvIMbnSOMjrk="/>
-            <table:column date="true" dateTimePattern="${experimentState_modifieddate_date_format}" id="c_com_labsynch_labseer_domain_ExperimentState_modifiedDate" property="modifiedDate" z="E/v2dBmD/trA7TeS2WFe6vNND04="/>
-            <table:column id="c_com_labsynch_labseer_domain_ExperimentState_lsType" property="lsType" z="tZznlkj96VVyqHsxSfRYNjclEq0="/>
-            <table:column id="c_com_labsynch_labseer_domain_ExperimentState_lsKind" property="lsKind" z="S2ciTYr2fLma2UA88NUFXzQa3ng="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentstates/show.jspx b/src/main/webapp/WEB-INF/views/experimentstates/show.jspx
deleted file mode 100755
index a29beff39..000000000
--- a/src/main/webapp/WEB-INF/views/experimentstates/show.jspx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ExperimentState" object="${experimentstate}" path="/experimentstates" z="fdJRslHl4RuQ/yepgC3hBVLSvGM=">
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_ExperimentState_recordedBy" object="${experimentstate}" z="z7ZzIAj+gV8/mVFl9ksIO2AbRNY="/>
-        <field:display date="true" dateTimePattern="${experimentState_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_ExperimentState_recordedDate" object="${experimentstate}" z="nDNPe6oo/gY70L28TG76FUv4V18="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_ExperimentState_modifiedBy" object="${experimentstate}" z="fb0SPTMDxaxxGr9aNp2jwEj5d14="/>
-        <field:display date="true" dateTimePattern="${experimentState_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_ExperimentState_modifiedDate" object="${experimentstate}" z="LFmxJDzvprwcTVmzeiL1x2HWVnw="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_ExperimentState_comments" object="${experimentstate}" z="apCfrD8FJW2qMYBh6x/NjDSzZlM="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ExperimentState_ignored" object="${experimentstate}" z="zIunQcmQFH+P3VLSVmYYEhQ7Hko="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_ExperimentState_lsTransaction" object="${experimentstate}" z="W35iT/FRTCNgVuuW6FqLRtdy7XU="/>
-        <field:display field="experiment" id="s_com_labsynch_labseer_domain_ExperimentState_experiment" object="${experimentstate}" z="UfwwJDGtQtkQ5HjVbk2H6+0MFhk="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ExperimentState_lsType" object="${experimentstate}" z="YhwZwnDz/xP6JBIpuJtKLo+n0GU="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_ExperimentState_lsKind" object="${experimentstate}" z="Fp2IrJvJkIen7n0LPTVclSjIZns="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ExperimentState_lsTypeAndKind" object="${experimentstate}" z="bq+r5VJkqcRB4BVqEb17uVit8/M="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_ExperimentState_deleted" object="${experimentstate}" z="hf0f1GOOL6ts2LutvRWJmagVfB8="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentstates/update.jspx b/src/main/webapp/WEB-INF/views/experimentstates/update.jspx
deleted file mode 100755
index 6c8ea48e0..000000000
--- a/src/main/webapp/WEB-INF/views/experimentstates/update.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ExperimentState" modelAttribute="experimentState" path="/experimentstates" versionField="Version" z="wc1YSkKgn5NRPaIeyofjDxLdrn4=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ExperimentState_recordedBy" required="true" z="YGf8DoU4JyHry7xItaWaEYbPMtI="/>
-        <field:datetime dateTimePattern="${experimentState_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ExperimentState_recordedDate" required="true" z="PCzgZOIf8cmUCeC3RJ1RHlHNA9w="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ExperimentState_modifiedBy" z="XJCF09msfD0kFwZSGUJtegTedNs="/>
-        <field:datetime dateTimePattern="${experimentState_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ExperimentState_modifiedDate" z="W03yx0JDVWwcIbubWuK6gvGU6as="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ExperimentState_comments" z="EHQ7W6+FuxotcKjQ2hWCXyaGZQI="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ExperimentState_ignored" z="btjh2IsSOiVVprhh5kc1vlgoRR8="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ExperimentState_lsTransaction" validationMessageCode="field_invalid_integer" z="d5Nj2rSI2SrL7ry7QQvpgbzKhbo="/>
-        <field:select field="experiment" id="c_com_labsynch_labseer_domain_ExperimentState_experiment" itemValue="id" items="${experiments}" path="/experiments" required="true" z="cUQ4yEvnzG6xlYvgN/uOk31iy/o="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ExperimentState_lsType" required="true" z="bol8Dj6NAUPUH+If+0axEWPoRs8="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ExperimentState_lsKind" required="true" z="TUKuQ6caRos6XGHyJ+PGxI4F5W0="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ExperimentState_lsTypeAndKind" z="pND/258gKTxi7W4kcZcp232jblM="/>
-        <field:simple field="lsValues" id="c_com_labsynch_labseer_domain_ExperimentState_lsValues" messageCode="entity_reference_not_managed" messageCodeAttribute="Experiment Value" z="9UEKBr+HDkURwU/+WSJep3ZiQPo="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ExperimentState_deleted" z="3qTAbIIsoLM8ra0Mhy8Sh7LrXY8="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentstates/views.xml b/src/main/webapp/WEB-INF/views/experimentstates/views.xml
deleted file mode 100755
index 80e536607..000000000
--- a/src/main/webapp/WEB-INF/views/experimentstates/views.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="experimentstates/list">
-        <put-attribute name="body" value="/WEB-INF/views/experimentstates/list.jspx"/>
-    </definition>
-<definition extends="default" name="experimentstates/show">
-        <put-attribute name="body" value="/WEB-INF/views/experimentstates/show.jspx"/>
-    </definition>
-<definition extends="default" name="experimentstates/create">
-        <put-attribute name="body" value="/WEB-INF/views/experimentstates/create.jspx"/>
-    </definition>
-<definition extends="default" name="experimentstates/update">
-        <put-attribute name="body" value="/WEB-INF/views/experimentstates/update.jspx"/>
-    </definition>
-<definition extends="default" name="experimentstates/findExperimentStatesByExperiment">
-        <put-attribute name="body" value="/WEB-INF/views/experimentstates/findExperimentStatesByExperiment.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/experimenttypes/create.jspx b/src/main/webapp/WEB-INF/views/experimenttypes/create.jspx
deleted file mode 100755
index 78fcf445a..000000000
--- a/src/main/webapp/WEB-INF/views/experimenttypes/create.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ExperimentType" modelAttribute="experimentType" path="/experimenttypes" render="${empty dependencies}" z="yBjf4XPk4rcUEkFgezij5KuOUk4=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_ExperimentType_typeName" required="true" z="D+VVgL9i/KgOlBGwYunR3dWVEyM="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ExperimentType" render="${not empty dependencies}" z="hxSlfurFAV317w+loQitwBaSaK8="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimenttypes/findExperimentTypesByTypeNameEquals.jspx b/src/main/webapp/WEB-INF/views/experimenttypes/findExperimentTypesByTypeNameEquals.jspx
deleted file mode 100755
index b87471f2e..000000000
--- a/src/main/webapp/WEB-INF/views/experimenttypes/findExperimentTypesByTypeNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByTypeNameEquals" id="ff_com_labsynch_labseer_domain_ExperimentType" path="/experimenttypes" z="3Z+ESa6tDlwWPX5s9e3DWA203hs=">
-        <field:input disableFormBinding="true" field="typeName" id="f_com_labsynch_labseer_domain_ExperimentType_typeName" max="128" required="true" z="U6/K/SN1s2p0HJ4T2F8GuhrOG7g="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimenttypes/list.jspx b/src/main/webapp/WEB-INF/views/experimenttypes/list.jspx
deleted file mode 100755
index 31b7d9650..000000000
--- a/src/main/webapp/WEB-INF/views/experimenttypes/list.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ExperimentType" items="${experimenttypes}" z="C7p1OL2ZalaldMWLF3DchOlabSo=">
-        <table:table data="${experimenttypes}" id="l_com_labsynch_labseer_domain_ExperimentType" path="/experimenttypes" z="5YgXh7X2YYFsB3TLavop7ghNIro=">
-            <table:column id="c_com_labsynch_labseer_domain_ExperimentType_typeName" property="typeName" z="2Al6cT4mvFZEboQdw7DhOWEDv3c="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimenttypes/show.jspx b/src/main/webapp/WEB-INF/views/experimenttypes/show.jspx
deleted file mode 100755
index 9c0f992be..000000000
--- a/src/main/webapp/WEB-INF/views/experimenttypes/show.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ExperimentType" object="${experimenttype}" path="/experimenttypes" z="FqUyhCwbdxjbpaxPn7mRxBXrS9k=">
-        <field:display field="typeName" id="s_com_labsynch_labseer_domain_ExperimentType_typeName" object="${experimenttype}" z="HcL8rIHcSBWFqC5R/AflGvQRwaU="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimenttypes/update.jspx b/src/main/webapp/WEB-INF/views/experimenttypes/update.jspx
deleted file mode 100755
index e6ca1cfd1..000000000
--- a/src/main/webapp/WEB-INF/views/experimenttypes/update.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ExperimentType" modelAttribute="experimentType" path="/experimenttypes" versionField="Version" z="dLZop+uQqBAIxLZseMt8LHUgnRY=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_ExperimentType_typeName" required="true" z="D+VVgL9i/KgOlBGwYunR3dWVEyM="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimenttypes/views.xml b/src/main/webapp/WEB-INF/views/experimenttypes/views.xml
deleted file mode 100755
index be2bc5817..000000000
--- a/src/main/webapp/WEB-INF/views/experimenttypes/views.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="experimenttypes/list">
-        <put-attribute name="body" value="/WEB-INF/views/experimenttypes/list.jspx"/>
-    </definition>
-<definition extends="default" name="experimenttypes/show">
-        <put-attribute name="body" value="/WEB-INF/views/experimenttypes/show.jspx"/>
-    </definition>
-<definition extends="default" name="experimenttypes/create">
-        <put-attribute name="body" value="/WEB-INF/views/experimenttypes/create.jspx"/>
-    </definition>
-<definition extends="default" name="experimenttypes/update">
-        <put-attribute name="body" value="/WEB-INF/views/experimenttypes/update.jspx"/>
-    </definition>
-<definition extends="default" name="experimenttypes/findExperimentTypesByTypeNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/experimenttypes/findExperimentTypesByTypeNameEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/experimentvalues/create.jspx b/src/main/webapp/WEB-INF/views/experimentvalues/create.jspx
deleted file mode 100755
index 2eee90cef..000000000
--- a/src/main/webapp/WEB-INF/views/experimentvalues/create.jspx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ExperimentValue" modelAttribute="experimentValue" path="/experimentvalues" render="${empty dependencies}" z="za/JDkU0cPfLBkxlchMoWCTZT0g=">
-        <field:textarea field="stringValue" id="c_com_labsynch_labseer_domain_ExperimentValue_stringValue" z="X9mkBm46IY3qdv5IXFc8qgcCa2A="/>
-        <field:textarea field="fileValue" id="c_com_labsynch_labseer_domain_ExperimentValue_fileValue" z="l24QKTNYJxcivqBMAmEJMSK77wc="/>
-        <field:textarea field="urlValue" id="c_com_labsynch_labseer_domain_ExperimentValue_urlValue" z="KN6d3wJC9dtH56NHKYV3TGSdoeg="/>
-        <field:datetime dateTimePattern="${experimentValue_datevalue_date_format}" field="dateValue" id="c_com_labsynch_labseer_domain_ExperimentValue_dateValue" z="1AwngP0rZed8sVy3iGpZRxhHfus="/>
-        <field:input field="clobValue" id="c_com_labsynch_labseer_domain_ExperimentValue_clobValue" z="ZxoNBSHqP+irUBcXSX+sVi2xX/c="/>
-        <field:input field="blobValue" id="c_com_labsynch_labseer_domain_ExperimentValue_blobValue" z="HbMhl5vnn0wxjUEmbNy0HNA4p0s="/>
-        <field:input field="sigFigs" id="c_com_labsynch_labseer_domain_ExperimentValue_sigFigs" validationMessageCode="field_invalid_integer" z="BczkNOc/G09wAQ1gEZpVF41efFA="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ExperimentValue_comments" z="O17SSG4Rx2QzLCqdX0ghAsXlmWU="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ExperimentValue_ignored" z="phfAMT26Sc2tUkQbrgjGhRHpQCM="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ExperimentValue_lsTransaction" validationMessageCode="field_invalid_integer" z="Z9mu9HoScdmEgp2rkwAe2dhMM/Y="/>
-        <field:datetime dateTimePattern="${experimentValue_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ExperimentValue_recordedDate" required="true" z="/U7zFEgxEosNeJOlR9uA0WfhxDQ="/>
-        <field:datetime dateTimePattern="${experimentValue_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ExperimentValue_modifiedDate" z="s2ehJkTOHGfmIs+SY/jTxuZKoPw="/>
-        <field:checkbox field="publicData" id="c_com_labsynch_labseer_domain_ExperimentValue_publicData" z="fZ1YprPLFetxY48CSQ/jQObxQZc="/>
-        <field:textarea field="codeValue" id="c_com_labsynch_labseer_domain_ExperimentValue_codeValue" z="o9qQKL66Tem9ClsU2e7Bkx36lkA="/>
-        <field:input field="numberOfReplicates" id="c_com_labsynch_labseer_domain_ExperimentValue_numberOfReplicates" validationMessageCode="field_invalid_integer" z="JGvqLvT5qAmRjL00ifnVOsGnk9o="/>
-        <field:textarea field="uncertaintyType" id="c_com_labsynch_labseer_domain_ExperimentValue_uncertaintyType" z="nxXRGUufApt02BMvHCf2MfzedJk="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ExperimentValue_lsType" required="true" z="rrGLzYrftXeebkl8iXtMfmVj+b8="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ExperimentValue_lsKind" required="true" z="+MDILnDqJ7IVImbrQallHsO0pYs="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ExperimentValue_lsTypeAndKind" z="FMAkHTZS9NSCHPOFs/RffwlXGrE="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ExperimentValue_recordedBy" required="true" z="hMzV+7I3lH7utYJFE17zfVUZWbk="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ExperimentValue_modifiedBy" z="4IjSb/TpHqXu/L3gNgpyH/5XXeQ="/>
-        <field:select field="lsState" id="c_com_labsynch_labseer_domain_ExperimentValue_lsState" itemValue="id" items="${experimentstates}" path="/experimentstates" required="true" z="1RfwUxAd4CnawWlcN+A/XDkok4A="/>
-        <field:input field="operatorType" id="c_com_labsynch_labseer_domain_ExperimentValue_operatorType" max="25" z="O3xUGlxOnqZWZduLHQ/lODUcE9w="/>
-        <field:input field="operatorKind" id="c_com_labsynch_labseer_domain_ExperimentValue_operatorKind" max="10" z="Rhlb/oXnC4B4w2uXA/JtFB8X1JY="/>
-        <field:textarea field="operatorTypeAndKind" id="c_com_labsynch_labseer_domain_ExperimentValue_operatorTypeAndKind" z="4dyIqwsBe35666lgoiBEGEgZxMc="/>
-        <field:input field="unitType" id="c_com_labsynch_labseer_domain_ExperimentValue_unitType" max="25" z="J0xI2Y3GdqUH+jnWBKKGg2bL0ow="/>
-        <field:input field="unitKind" id="c_com_labsynch_labseer_domain_ExperimentValue_unitKind" max="25" z="W4TYP4Y5YK+wsPL+VWjsfcbsRW8="/>
-        <field:textarea field="unitTypeAndKind" id="c_com_labsynch_labseer_domain_ExperimentValue_unitTypeAndKind" z="Fz4Vx4ojtesNBI0hqsnnQB5l4sw="/>
-        <field:input field="numericValue" id="c_com_labsynch_labseer_domain_ExperimentValue_numericValue" validationMessageCode="field_invalid_number" z="u/+jVrzi/Oe4zb34vHctaUtrIFw="/>
-        <field:textarea field="codeType" id="c_com_labsynch_labseer_domain_ExperimentValue_codeType" z="aKuabOzszFynE/AAvEcoEV5P08o="/>
-        <field:textarea field="codeKind" id="c_com_labsynch_labseer_domain_ExperimentValue_codeKind" z="Nx+7K7pnwdCjl7ukMdKFNNCgQCM="/>
-        <field:textarea field="codeTypeAndKind" id="c_com_labsynch_labseer_domain_ExperimentValue_codeTypeAndKind" z="6qaFuVxLXzIgAaMzdrGm+LFhygw="/>
-        <field:input field="uncertainty" id="c_com_labsynch_labseer_domain_ExperimentValue_uncertainty" validationMessageCode="field_invalid_number" z="yPCo9AKL5gFq5dbgbs7Yr16U3jM="/>
-        <field:textarea field="codeOrigin" id="c_com_labsynch_labseer_domain_ExperimentValue_codeOrigin" z="Tp5iOW3kt1mM+10DciGyouAk17o="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ExperimentValue_deleted" z="vEiyg6QNLkiLVnBq27Q9uMDFqk8="/>
-        <field:input field="concentration" id="c_com_labsynch_labseer_domain_ExperimentValue_concentration" validationMessageCode="field_invalid_number" z="e7TP+sWL4YCOJ3agckjNG7KqSMk="/>
-        <field:input field="concUnit" id="c_com_labsynch_labseer_domain_ExperimentValue_concUnit" max="25" z="CH6llA7sY1eIFALSVBGda8znbCQ="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ExperimentValue" render="${not empty dependencies}" z="dZg/3hMIQvSCl7gQjiWTZDENU0w="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentvalues/findExperimentValuesByLsKindEqualsAndCodeValueLike.jspx b/src/main/webapp/WEB-INF/views/experimentvalues/findExperimentValuesByLsKindEqualsAndCodeValueLike.jspx
deleted file mode 100644
index b287e726a..000000000
--- a/src/main/webapp/WEB-INF/views/experimentvalues/findExperimentValuesByLsKindEqualsAndCodeValueLike.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsKindEqualsAndCodeValueLike" id="ff_com_labsynch_labseer_domain_ExperimentValue" path="/experimentvalues" z="tmPNWMUqdVmONPFAWi/JsiLtsqo=">
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_ExperimentValue_lsKind" max="255" required="true" z="V8lIQUII0b/RUkVuO+KVi8Wfj9w="/>
-        <field:input disableFormBinding="true" field="codeValue" id="f_com_labsynch_labseer_domain_ExperimentValue_codeValue" max="255" required="true" z="xFDtzLFHKXJQ3KI6V1bsAuBuW2w="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentvalues/findExperimentValuesByLsKindEqualsAndDateValueEquals.jspx b/src/main/webapp/WEB-INF/views/experimentvalues/findExperimentValuesByLsKindEqualsAndDateValueEquals.jspx
deleted file mode 100644
index 618c09ce8..000000000
--- a/src/main/webapp/WEB-INF/views/experimentvalues/findExperimentValuesByLsKindEqualsAndDateValueEquals.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsKindEqualsAndDateValueEquals" id="ff_com_labsynch_labseer_domain_ExperimentValue" path="/experimentvalues" z="MW+dMkvdBomf4R1aJPuFgUYXdvs=">
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_ExperimentValue_lsKind" max="255" required="true" z="V8lIQUII0b/RUkVuO+KVi8Wfj9w="/>
-        <field:datetime dateTimePattern="${experimentValue_datevalue_date_format}" disableFormBinding="true" field="dateValue" id="f_com_labsynch_labseer_domain_ExperimentValue_dateValue" required="true" z="5HhngK8oc/FZcHo2NuhqMwqKOzc="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentvalues/findExperimentValuesByLsKindEqualsAndDateValueLike.jspx b/src/main/webapp/WEB-INF/views/experimentvalues/findExperimentValuesByLsKindEqualsAndDateValueLike.jspx
deleted file mode 100644
index 7b229b4ef..000000000
--- a/src/main/webapp/WEB-INF/views/experimentvalues/findExperimentValuesByLsKindEqualsAndDateValueLike.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsKindEqualsAndDateValueLike" id="ff_com_labsynch_labseer_domain_ExperimentValue" path="/experimentvalues" z="/h0DhlaWk26ifEiej1zF103YWrs=">
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_ExperimentValue_lsKind" max="255" required="true" z="V8lIQUII0b/RUkVuO+KVi8Wfj9w="/>
-        <field:datetime dateTimePattern="${experimentValue_datevalue_date_format}" disableFormBinding="true" field="dateValue" id="f_com_labsynch_labseer_domain_ExperimentValue_dateValue" required="true" z="5HhngK8oc/FZcHo2NuhqMwqKOzc="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentvalues/findExperimentValuesByLsKindEqualsAndStringValueLike.jspx b/src/main/webapp/WEB-INF/views/experimentvalues/findExperimentValuesByLsKindEqualsAndStringValueLike.jspx
deleted file mode 100644
index bd25b34d0..000000000
--- a/src/main/webapp/WEB-INF/views/experimentvalues/findExperimentValuesByLsKindEqualsAndStringValueLike.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsKindEqualsAndStringValueLike" id="ff_com_labsynch_labseer_domain_ExperimentValue" path="/experimentvalues" z="V0KOneEHeIXk4dFSfbYNCuopy+A=">
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_ExperimentValue_lsKind" max="255" required="true" z="V8lIQUII0b/RUkVuO+KVi8Wfj9w="/>
-        <field:input disableFormBinding="true" field="stringValue" id="f_com_labsynch_labseer_domain_ExperimentValue_stringValue" max="255" required="true" z="5pxSL8jGGP9zCZ2RK0dnTGYpQwQ="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentvalues/findExperimentValuesByLsState.jspx b/src/main/webapp/WEB-INF/views/experimentvalues/findExperimentValuesByLsState.jspx
deleted file mode 100755
index 95f638cf7..000000000
--- a/src/main/webapp/WEB-INF/views/experimentvalues/findExperimentValuesByLsState.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsState" id="ff_com_labsynch_labseer_domain_ExperimentValue" path="/experimentvalues" z="q/zebjWptMOK1v493yk+Er0vdQA=">
-        <field:select disableFormBinding="true" field="lsState" id="f_com_labsynch_labseer_domain_ExperimentValue_lsState" itemValue="id" items="${experimentstates}" path="/experimentstates" required="true" z="bOse0NG3ElzBSOw3Y1c3r+QWyWw="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentvalues/findExperimentValuesByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals.jspx b/src/main/webapp/WEB-INF/views/experimentvalues/findExperimentValuesByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals.jspx
deleted file mode 100755
index ccdcdba18..000000000
--- a/src/main/webapp/WEB-INF/views/experimentvalues/findExperimentValuesByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals" id="ff_com_labsynch_labseer_domain_ExperimentValue" path="/experimentvalues" z="e7WdW1caIYNtdNekHYrCaGJIspM=">
-        <field:select disableFormBinding="true" field="lsState" id="f_com_labsynch_labseer_domain_ExperimentValue_lsState" itemValue="id" items="${experimentstates}" path="/experimentstates" required="true" z="bOse0NG3ElzBSOw3Y1c3r+QWyWw="/>
-        <field:checkbox disableFormBinding="true" field="ignored" id="f_com_labsynch_labseer_domain_ExperimentValue_ignored" z="huspuyrr8QsuXhLOC7JlIfCJuNI="/>
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_ExperimentValue_lsKind" max="255" required="true" z="V8lIQUII0b/RUkVuO+KVi8Wfj9w="/>
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_ExperimentValue_lsType" max="64" required="true" z="c33q/Bpa1NRAW6UwQgyjIqi/3dw="/>
-        <field:input disableFormBinding="true" field="stringValue" id="f_com_labsynch_labseer_domain_ExperimentValue_stringValue" max="255" required="true" z="5pxSL8jGGP9zCZ2RK0dnTGYpQwQ="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentvalues/list.jspx b/src/main/webapp/WEB-INF/views/experimentvalues/list.jspx
deleted file mode 100755
index 1b813b417..000000000
--- a/src/main/webapp/WEB-INF/views/experimentvalues/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ExperimentValue" items="${experimentvalues}" z="0IjXasd0D4fNdNFzOXZ2Mpcf6U4=">
-        <table:table data="${experimentvalues}" id="l_com_labsynch_labseer_domain_ExperimentValue" path="/experimentvalues" z="AFvuw2aiahRgt8mffFfnb3njh7Q=">
-            <table:column id="c_com_labsynch_labseer_domain_ExperimentValue_lsType" property="lsType" z="q/h3wUMmUn1T6N14PnR4hmf3xu8="/>
-            <table:column id="c_com_labsynch_labseer_domain_ExperimentValue_lsKind" property="lsKind" z="etQTM2Mz3U1XPlbTPwkLkcg0yKA="/>
-            <table:column id="c_com_labsynch_labseer_domain_ExperimentValue_lsTypeAndKind" property="lsTypeAndKind" z="Dn5fA5plZ015EOXDct//Ev80O/s="/>
-            <table:column id="c_com_labsynch_labseer_domain_ExperimentValue_ignored" property="ignored" z="gs6AM5blLcIxrwtGKEz6hFVdslI="/>
-            <table:column id="c_com_labsynch_labseer_domain_ExperimentValue_publicData" property="publicData" z="hB4NvS2XRomLLHVEhATJtLPTv5Y="/>
-            <table:column id="c_com_labsynch_labseer_domain_ExperimentValue_deleted" property="deleted" z="hZ+U/JsetWa9g+YtC6obTQFDrZE="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentvalues/show.jspx b/src/main/webapp/WEB-INF/views/experimentvalues/show.jspx
deleted file mode 100755
index 6d5c44e55..000000000
--- a/src/main/webapp/WEB-INF/views/experimentvalues/show.jspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ExperimentValue" object="${experimentvalue}" path="/experimentvalues" z="Si5wuJly1iCEXndpjKRpzaiQDQc=">
-        <field:display field="stringValue" id="s_com_labsynch_labseer_domain_ExperimentValue_stringValue" object="${experimentvalue}" z="SRSZY0EjXAxenSB1dGrK//+XYG0="/>
-        <field:display field="fileValue" id="s_com_labsynch_labseer_domain_ExperimentValue_fileValue" object="${experimentvalue}" z="S1N71+1W91sTi+V3FXV3he1bXdM="/>
-        <field:display field="urlValue" id="s_com_labsynch_labseer_domain_ExperimentValue_urlValue" object="${experimentvalue}" z="AtqCDPaP30BQwluyOrYqOCASvaQ="/>
-        <field:display date="true" dateTimePattern="${experimentValue_datevalue_date_format}" field="dateValue" id="s_com_labsynch_labseer_domain_ExperimentValue_dateValue" object="${experimentvalue}" z="g+KsFlaBz9iFVhJ7S9A3gwdnImI="/>
-        <field:display field="clobValue" id="s_com_labsynch_labseer_domain_ExperimentValue_clobValue" object="${experimentvalue}" z="Ld+biMNYhWvgdetYGHZMg49D1wQ="/>
-        <field:display field="blobValue" id="s_com_labsynch_labseer_domain_ExperimentValue_blobValue" object="${experimentvalue}" z="t6Sy3EmAxAfYP2IUYW7LgehSKP0="/>
-        <field:display field="sigFigs" id="s_com_labsynch_labseer_domain_ExperimentValue_sigFigs" object="${experimentvalue}" z="jOw9aawIJSfyvR7OcoiZvhR2TdM="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_ExperimentValue_comments" object="${experimentvalue}" z="W6jmJBEqXjuY5mb/qvYeb4I6eYc="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ExperimentValue_ignored" object="${experimentvalue}" z="hpILxE3OUYq9hFUGMltUJn8eHpA="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_ExperimentValue_lsTransaction" object="${experimentvalue}" z="FbbiiSHM9BSqx8W23/7jbSt+JpQ="/>
-        <field:display date="true" dateTimePattern="${experimentValue_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_ExperimentValue_recordedDate" object="${experimentvalue}" z="2MVYgHlrWZRL4urEutLNXu5GTZI="/>
-        <field:display date="true" dateTimePattern="${experimentValue_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_ExperimentValue_modifiedDate" object="${experimentvalue}" z="ag2zXD7bNfKFYoGK8UoiGhBkuY8="/>
-        <field:display field="publicData" id="s_com_labsynch_labseer_domain_ExperimentValue_publicData" object="${experimentvalue}" z="VU/PcHWM8MgGTDU46of/JB4cGzI="/>
-        <field:display field="codeValue" id="s_com_labsynch_labseer_domain_ExperimentValue_codeValue" object="${experimentvalue}" z="SD3d43+m8AH4EAgZpZji2Ilu5nI="/>
-        <field:display field="numberOfReplicates" id="s_com_labsynch_labseer_domain_ExperimentValue_numberOfReplicates" object="${experimentvalue}" z="Zj78mT17fseH6a1lqB2poMePrJo="/>
-        <field:display field="uncertaintyType" id="s_com_labsynch_labseer_domain_ExperimentValue_uncertaintyType" object="${experimentvalue}" z="CpwKhaeMzTlv+FjB7jxELrbAg7o="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ExperimentValue_lsType" object="${experimentvalue}" z="W4p6QRoVrgJwZWfuTfPTm8XO370="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_ExperimentValue_lsKind" object="${experimentvalue}" z="4QE5aD6ylOXX3nSfMdb6a0JDu/A="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ExperimentValue_lsTypeAndKind" object="${experimentvalue}" z="zFDXpHvK0rBMguF3nd/7S7yZUTo="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_ExperimentValue_recordedBy" object="${experimentvalue}" z="p8qv2VxmE+NR67asERlrIOU1w/s="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_ExperimentValue_modifiedBy" object="${experimentvalue}" z="fSnarOMuo5qNj5VtJN0Hph4LdO4="/>
-        <field:display field="lsState" id="s_com_labsynch_labseer_domain_ExperimentValue_lsState" object="${experimentvalue}" z="w63hiA1olGsw7D6Nx61W5gnl/FA="/>
-        <field:display field="operatorType" id="s_com_labsynch_labseer_domain_ExperimentValue_operatorType" object="${experimentvalue}" z="O53KUCxBcfix2RgU9canxFCO8QY="/>
-        <field:display field="operatorKind" id="s_com_labsynch_labseer_domain_ExperimentValue_operatorKind" object="${experimentvalue}" z="U7hAht46Q5t2iKcdqVrg/0MHBS0="/>
-        <field:display field="operatorTypeAndKind" id="s_com_labsynch_labseer_domain_ExperimentValue_operatorTypeAndKind" object="${experimentvalue}" z="T601cjjKGhxtwO5o8eNOWcwukXI="/>
-        <field:display field="unitType" id="s_com_labsynch_labseer_domain_ExperimentValue_unitType" object="${experimentvalue}" z="b3o6OE0+01BRROycM1KRweYTh8Q="/>
-        <field:display field="unitKind" id="s_com_labsynch_labseer_domain_ExperimentValue_unitKind" object="${experimentvalue}" z="pbkX3nAe+yCNkQ24DCqDSbL0FPQ="/>
-        <field:display field="unitTypeAndKind" id="s_com_labsynch_labseer_domain_ExperimentValue_unitTypeAndKind" object="${experimentvalue}" z="YGFES0o4+TXgQVK9T98PRCW1d48="/>
-        <field:display field="numericValue" id="s_com_labsynch_labseer_domain_ExperimentValue_numericValue" object="${experimentvalue}" z="Bi3CNAOmKOIbFSJEAM3qsmuwAz8="/>
-        <field:display field="codeType" id="s_com_labsynch_labseer_domain_ExperimentValue_codeType" object="${experimentvalue}" z="FD/HQIOmoJCH7F9FNW2rxPuxaQ4="/>
-        <field:display field="codeKind" id="s_com_labsynch_labseer_domain_ExperimentValue_codeKind" object="${experimentvalue}" z="4nZPLy56IsY+xa/+3y4gm00eeJU="/>
-        <field:display field="codeTypeAndKind" id="s_com_labsynch_labseer_domain_ExperimentValue_codeTypeAndKind" object="${experimentvalue}" z="YqDHbfw5RxafSSL/i6XBcgufcyg="/>
-        <field:display field="uncertainty" id="s_com_labsynch_labseer_domain_ExperimentValue_uncertainty" object="${experimentvalue}" z="+Aq/V4YJZo/EE8USi22FuFhL6H0="/>
-        <field:display field="codeOrigin" id="s_com_labsynch_labseer_domain_ExperimentValue_codeOrigin" object="${experimentvalue}" z="ifrboUs1bYBVSIuJjw+xz+4lf3U="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_ExperimentValue_deleted" object="${experimentvalue}" z="KPhCF0E6WW/BWD2ZtnthWUf2wKQ="/>
-        <field:display field="concentration" id="s_com_labsynch_labseer_domain_ExperimentValue_concentration" object="${experimentvalue}" z="RqRvDyd5IgO3Yg2GFSnVsCxusUo="/>
-        <field:display field="concUnit" id="s_com_labsynch_labseer_domain_ExperimentValue_concUnit" object="${experimentvalue}" z="cor9tgEnciE89blHbV/7+mBxBk4="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentvalues/update.jspx b/src/main/webapp/WEB-INF/views/experimentvalues/update.jspx
deleted file mode 100755
index e6f02b1c2..000000000
--- a/src/main/webapp/WEB-INF/views/experimentvalues/update.jspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ExperimentValue" modelAttribute="experimentValue" path="/experimentvalues" versionField="Version" z="MVhZCY0c9xd424+ngt/kovgRmJw=">
-        <field:textarea field="stringValue" id="c_com_labsynch_labseer_domain_ExperimentValue_stringValue" z="X9mkBm46IY3qdv5IXFc8qgcCa2A="/>
-        <field:textarea field="fileValue" id="c_com_labsynch_labseer_domain_ExperimentValue_fileValue" z="l24QKTNYJxcivqBMAmEJMSK77wc="/>
-        <field:textarea field="urlValue" id="c_com_labsynch_labseer_domain_ExperimentValue_urlValue" z="KN6d3wJC9dtH56NHKYV3TGSdoeg="/>
-        <field:datetime dateTimePattern="${experimentValue_datevalue_date_format}" field="dateValue" id="c_com_labsynch_labseer_domain_ExperimentValue_dateValue" z="1AwngP0rZed8sVy3iGpZRxhHfus="/>
-        <field:input field="clobValue" id="c_com_labsynch_labseer_domain_ExperimentValue_clobValue" z="ZxoNBSHqP+irUBcXSX+sVi2xX/c="/>
-        <field:input field="blobValue" id="c_com_labsynch_labseer_domain_ExperimentValue_blobValue" z="HbMhl5vnn0wxjUEmbNy0HNA4p0s="/>
-        <field:input field="sigFigs" id="c_com_labsynch_labseer_domain_ExperimentValue_sigFigs" validationMessageCode="field_invalid_integer" z="BczkNOc/G09wAQ1gEZpVF41efFA="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ExperimentValue_comments" z="O17SSG4Rx2QzLCqdX0ghAsXlmWU="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ExperimentValue_ignored" z="phfAMT26Sc2tUkQbrgjGhRHpQCM="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ExperimentValue_lsTransaction" validationMessageCode="field_invalid_integer" z="Z9mu9HoScdmEgp2rkwAe2dhMM/Y="/>
-        <field:datetime dateTimePattern="${experimentValue_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ExperimentValue_recordedDate" required="true" z="/U7zFEgxEosNeJOlR9uA0WfhxDQ="/>
-        <field:datetime dateTimePattern="${experimentValue_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ExperimentValue_modifiedDate" z="s2ehJkTOHGfmIs+SY/jTxuZKoPw="/>
-        <field:checkbox field="publicData" id="c_com_labsynch_labseer_domain_ExperimentValue_publicData" z="fZ1YprPLFetxY48CSQ/jQObxQZc="/>
-        <field:textarea field="codeValue" id="c_com_labsynch_labseer_domain_ExperimentValue_codeValue" z="o9qQKL66Tem9ClsU2e7Bkx36lkA="/>
-        <field:input field="numberOfReplicates" id="c_com_labsynch_labseer_domain_ExperimentValue_numberOfReplicates" validationMessageCode="field_invalid_integer" z="JGvqLvT5qAmRjL00ifnVOsGnk9o="/>
-        <field:textarea field="uncertaintyType" id="c_com_labsynch_labseer_domain_ExperimentValue_uncertaintyType" z="nxXRGUufApt02BMvHCf2MfzedJk="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ExperimentValue_lsType" required="true" z="rrGLzYrftXeebkl8iXtMfmVj+b8="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ExperimentValue_lsKind" required="true" z="+MDILnDqJ7IVImbrQallHsO0pYs="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ExperimentValue_lsTypeAndKind" z="FMAkHTZS9NSCHPOFs/RffwlXGrE="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ExperimentValue_recordedBy" required="true" z="hMzV+7I3lH7utYJFE17zfVUZWbk="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ExperimentValue_modifiedBy" z="4IjSb/TpHqXu/L3gNgpyH/5XXeQ="/>
-        <field:select field="lsState" id="c_com_labsynch_labseer_domain_ExperimentValue_lsState" itemValue="id" items="${experimentstates}" path="/experimentstates" required="true" z="1RfwUxAd4CnawWlcN+A/XDkok4A="/>
-        <field:input field="operatorType" id="c_com_labsynch_labseer_domain_ExperimentValue_operatorType" max="25" z="O3xUGlxOnqZWZduLHQ/lODUcE9w="/>
-        <field:input field="operatorKind" id="c_com_labsynch_labseer_domain_ExperimentValue_operatorKind" max="10" z="Rhlb/oXnC4B4w2uXA/JtFB8X1JY="/>
-        <field:textarea field="operatorTypeAndKind" id="c_com_labsynch_labseer_domain_ExperimentValue_operatorTypeAndKind" z="4dyIqwsBe35666lgoiBEGEgZxMc="/>
-        <field:input field="unitType" id="c_com_labsynch_labseer_domain_ExperimentValue_unitType" max="25" z="J0xI2Y3GdqUH+jnWBKKGg2bL0ow="/>
-        <field:input field="unitKind" id="c_com_labsynch_labseer_domain_ExperimentValue_unitKind" max="25" z="W4TYP4Y5YK+wsPL+VWjsfcbsRW8="/>
-        <field:textarea field="unitTypeAndKind" id="c_com_labsynch_labseer_domain_ExperimentValue_unitTypeAndKind" z="Fz4Vx4ojtesNBI0hqsnnQB5l4sw="/>
-        <field:input field="numericValue" id="c_com_labsynch_labseer_domain_ExperimentValue_numericValue" validationMessageCode="field_invalid_number" z="u/+jVrzi/Oe4zb34vHctaUtrIFw="/>
-        <field:textarea field="codeType" id="c_com_labsynch_labseer_domain_ExperimentValue_codeType" z="aKuabOzszFynE/AAvEcoEV5P08o="/>
-        <field:textarea field="codeKind" id="c_com_labsynch_labseer_domain_ExperimentValue_codeKind" z="Nx+7K7pnwdCjl7ukMdKFNNCgQCM="/>
-        <field:textarea field="codeTypeAndKind" id="c_com_labsynch_labseer_domain_ExperimentValue_codeTypeAndKind" z="6qaFuVxLXzIgAaMzdrGm+LFhygw="/>
-        <field:input field="uncertainty" id="c_com_labsynch_labseer_domain_ExperimentValue_uncertainty" validationMessageCode="field_invalid_number" z="yPCo9AKL5gFq5dbgbs7Yr16U3jM="/>
-        <field:textarea field="codeOrigin" id="c_com_labsynch_labseer_domain_ExperimentValue_codeOrigin" z="Tp5iOW3kt1mM+10DciGyouAk17o="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ExperimentValue_deleted" z="vEiyg6QNLkiLVnBq27Q9uMDFqk8="/>
-        <field:input field="concentration" id="c_com_labsynch_labseer_domain_ExperimentValue_concentration" validationMessageCode="field_invalid_number" z="e7TP+sWL4YCOJ3agckjNG7KqSMk="/>
-        <field:input field="concUnit" id="c_com_labsynch_labseer_domain_ExperimentValue_concUnit" max="25" z="CH6llA7sY1eIFALSVBGda8znbCQ="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/experimentvalues/views.xml b/src/main/webapp/WEB-INF/views/experimentvalues/views.xml
deleted file mode 100755
index 649b6c148..000000000
--- a/src/main/webapp/WEB-INF/views/experimentvalues/views.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="experimentvalues/list">
-        <put-attribute name="body" value="/WEB-INF/views/experimentvalues/list.jspx"/>
-    </definition>
-<definition extends="default" name="experimentvalues/show">
-        <put-attribute name="body" value="/WEB-INF/views/experimentvalues/show.jspx"/>
-    </definition>
-<definition extends="default" name="experimentvalues/create">
-        <put-attribute name="body" value="/WEB-INF/views/experimentvalues/create.jspx"/>
-    </definition>
-<definition extends="default" name="experimentvalues/update">
-        <put-attribute name="body" value="/WEB-INF/views/experimentvalues/update.jspx"/>
-    </definition>
-<definition extends="default" name="experimentvalues/findExperimentValuesByLsState">
-        <put-attribute name="body" value="/WEB-INF/views/experimentvalues/findExperimentValuesByLsState.jspx"/>
-    </definition>
-<definition extends="default" name="experimentvalues/findExperimentValuesByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals">
-        <put-attribute name="body" value="/WEB-INF/views/experimentvalues/findExperimentValuesByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals.jspx"/>
-    </definition>
-<definition extends="default" name="experimentvalues/findExperimentValuesByLsKindEqualsAndCodeValueLike">
-        <put-attribute name="body" value="/WEB-INF/views/experimentvalues/findExperimentValuesByLsKindEqualsAndCodeValueLike.jspx"/>
-    </definition>
-<definition extends="default" name="experimentvalues/findExperimentValuesByLsKindEqualsAndDateValueLike">
-        <put-attribute name="body" value="/WEB-INF/views/experimentvalues/findExperimentValuesByLsKindEqualsAndDateValueLike.jspx"/>
-    </definition>
-<definition extends="default" name="experimentvalues/findExperimentValuesByLsKindEqualsAndStringValueLike">
-        <put-attribute name="body" value="/WEB-INF/views/experimentvalues/findExperimentValuesByLsKindEqualsAndStringValueLike.jspx"/>
-    </definition>
-<definition extends="default" name="experimentvalues/findExperimentValuesByLsKindEqualsAndDateValueEquals">
-        <put-attribute name="body" value="/WEB-INF/views/experimentvalues/findExperimentValuesByLsKindEqualsAndDateValueEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/filelists/create.jspx b/src/main/webapp/WEB-INF/views/filelists/create.jspx
deleted file mode 100644
index 8111e1297..000000000
--- a/src/main/webapp/WEB-INF/views/filelists/create.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_FileList" modelAttribute="fileList" path="/filelists" render="${empty dependencies}" z="rnPCThK1Kyytce4bCHYjcguKr9A=">
-        <field:input field="file" id="c_com_labsynch_labseer_domain_FileList_file" z="NuuoZddQOhEB2DqvSOTaTvGYFdA="/>
-        <field:select field="lot" id="c_com_labsynch_labseer_domain_FileList_lot" itemValue="id" items="${lots}" path="/lots" z="+G0SLPkkBxQVhCvJqPm1MuAtvnY="/>
-        <field:input field="description" id="c_com_labsynch_labseer_domain_FileList_description" z="v8AlfKIgG8PRjJwWGuHZd7Xndw0="/>
-        <field:input field="name" id="c_com_labsynch_labseer_domain_FileList_name" z="v986TfjH1baphcFUq18pf8XE51I="/>
-        <field:textarea field="type" id="c_com_labsynch_labseer_domain_FileList_type" z="3fYH9v1Et78+2D7qn3nCPt+6UDk="/>
-        <field:input field="size" id="c_com_labsynch_labseer_domain_FileList_size" z="tCLeceje0AmwsqiMovL1dMQi3Bs="/>
-        <field:input field="url" id="c_com_labsynch_labseer_domain_FileList_url" z="0HN4ZaiNUCW8lTOwcwP3oE6v0to="/>
-        <field:checkbox field="ie" id="c_com_labsynch_labseer_domain_FileList_ie" z="zDIH3VJW8UEiPO3W0aHYST+0sAY="/>
-        <field:checkbox field="uploaded" id="c_com_labsynch_labseer_domain_FileList_uploaded" z="5zIbD8kAqPq7R/1JWQO8z5k90zc="/>
-        <field:input field="fileName" id="c_com_labsynch_labseer_domain_FileList_fileName" z="UvddFj9jx5kNC244QDs6+SKh+Hc="/>
-        <field:input field="subdir" id="c_com_labsynch_labseer_domain_FileList_subdir" z="qrixSlsZoOKPqkaqJXrqIFi8rjc="/>
-        <field:input field="filePath" id="c_com_labsynch_labseer_domain_FileList_filePath" z="hovAA2LZzrxjYAhhjHFHKYJBdFY="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_FileList" render="${not empty dependencies}" z="8rt/ZDvjbMlXl3Jka97siHRFufA="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/filelists/findFileListsByLot.jspx b/src/main/webapp/WEB-INF/views/filelists/findFileListsByLot.jspx
deleted file mode 100644
index b52de3ced..000000000
--- a/src/main/webapp/WEB-INF/views/filelists/findFileListsByLot.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLot" id="ff_com_labsynch_labseer_domain_FileList" path="/filelists" z="mSXtwn9a23XM1ROW4qJpU48dd1k=">
-        <field:select disableFormBinding="true" field="lot" id="f_com_labsynch_labseer_domain_FileList_lot" itemValue="id" items="${lots}" path="/lots" required="true" z="I6IYUS2GhwCxn+rzc3veMY8Db/M="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/filelists/findFileListsByUrlEquals.jspx b/src/main/webapp/WEB-INF/views/filelists/findFileListsByUrlEquals.jspx
deleted file mode 100644
index f6932cf29..000000000
--- a/src/main/webapp/WEB-INF/views/filelists/findFileListsByUrlEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByUrlEquals" id="ff_com_labsynch_labseer_domain_FileList" path="/filelists" z="A6vqfnP04k2Ju/i7FXM8XYn5umw=">
-        <field:input disableFormBinding="true" field="url" id="f_com_labsynch_labseer_domain_FileList_url" required="true" z="kkCrDycpA5xLBan1xlyggzoURts="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/filelists/list.jspx b/src/main/webapp/WEB-INF/views/filelists/list.jspx
deleted file mode 100644
index 64355ba90..000000000
--- a/src/main/webapp/WEB-INF/views/filelists/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_FileList" items="${filelists}" z="s5fARp+59ZaSlePmvw0f27cpDmg=">
-        <table:table data="${filelists}" id="l_com_labsynch_labseer_domain_FileList" path="/filelists" z="2YeXt8sdVbkpi2get00eE29z1xw=">
-            <table:column id="c_com_labsynch_labseer_domain_FileList_file" property="file" z="I81ZetTMxxQuRLxdNvjDPDrnm9A="/>
-            <table:column id="c_com_labsynch_labseer_domain_FileList_lot" property="lot" z="sYT6FauVX5w74F5fE0BEdo1d9to="/>
-            <table:column id="c_com_labsynch_labseer_domain_FileList_description" property="description" z="iEEP9uh8KY0EV2BfeUOuAjPSNpw="/>
-            <table:column id="c_com_labsynch_labseer_domain_FileList_name" property="name" z="FNZjiA3wIKwQKabohWWe1Wj0zzc="/>
-            <table:column id="c_com_labsynch_labseer_domain_FileList_type" property="type" z="oCFgpuyB31VYDVyPZki1DNwnnD0="/>
-            <table:column id="c_com_labsynch_labseer_domain_FileList_size" property="size" z="KuPM0JZhGrjksvbixFQHtyYh8X0="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/filelists/show.jspx b/src/main/webapp/WEB-INF/views/filelists/show.jspx
deleted file mode 100644
index ff7ff83db..000000000
--- a/src/main/webapp/WEB-INF/views/filelists/show.jspx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_FileList" object="${filelist}" path="/filelists" z="YQCtXMZUmySsplG9zDvtyWhdi+k=">
-        <field:display field="file" id="s_com_labsynch_labseer_domain_FileList_file" object="${filelist}" z="hfx/pjDhlV9R3ca3ic8lxqnWU1s="/>
-        <field:display field="lot" id="s_com_labsynch_labseer_domain_FileList_lot" object="${filelist}" z="ysxDigAvjRtgGjJgYU6bGUfFV3c="/>
-        <field:display field="description" id="s_com_labsynch_labseer_domain_FileList_description" object="${filelist}" z="ylnk6CH784lw1Q0sFpirwaX1I2I="/>
-        <field:display field="name" id="s_com_labsynch_labseer_domain_FileList_name" object="${filelist}" z="X29svql3R1usw4RucNG87Zee6oE="/>
-        <field:display field="type" id="s_com_labsynch_labseer_domain_FileList_type" object="${filelist}" z="7DnFcnDh8jB2xkkVgaIErstiisM="/>
-        <field:display field="size" id="s_com_labsynch_labseer_domain_FileList_size" object="${filelist}" z="1gi9H1ba0as+hVyrcqJtaWXwIUY="/>
-        <field:display field="url" id="s_com_labsynch_labseer_domain_FileList_url" object="${filelist}" z="s0/jqeQew8DuTCxh3hyMZkpdGzE="/>
-        <field:display field="ie" id="s_com_labsynch_labseer_domain_FileList_ie" object="${filelist}" z="ihryhVKp6Yp8TCxpLc4GTPQmQ5o="/>
-        <field:display field="uploaded" id="s_com_labsynch_labseer_domain_FileList_uploaded" object="${filelist}" z="4nwU6Ijjp1d5PKtoW9XUcd7OrEs="/>
-        <field:display field="fileName" id="s_com_labsynch_labseer_domain_FileList_fileName" object="${filelist}" z="wj6FgxrxFf6A8Wbgc9VvtB9tvp4="/>
-        <field:display field="subdir" id="s_com_labsynch_labseer_domain_FileList_subdir" object="${filelist}" z="SAkwCzGloCV5BANV12KqX7Vmr2c="/>
-        <field:display field="filePath" id="s_com_labsynch_labseer_domain_FileList_filePath" object="${filelist}" z="BBWGQtHiZ8uV74HRpk4v/JorCd8="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/filelists/update.jspx b/src/main/webapp/WEB-INF/views/filelists/update.jspx
deleted file mode 100644
index 1dc564828..000000000
--- a/src/main/webapp/WEB-INF/views/filelists/update.jspx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_FileList" modelAttribute="fileList" path="/filelists" versionField="Version" z="/bXdHryYDkrR4Pg8kyoCBzuUaWY=">
-        <field:input field="file" id="c_com_labsynch_labseer_domain_FileList_file" z="NuuoZddQOhEB2DqvSOTaTvGYFdA="/>
-        <field:select field="lot" id="c_com_labsynch_labseer_domain_FileList_lot" itemValue="id" items="${lots}" path="/lots" z="+G0SLPkkBxQVhCvJqPm1MuAtvnY="/>
-        <field:input field="description" id="c_com_labsynch_labseer_domain_FileList_description" z="v8AlfKIgG8PRjJwWGuHZd7Xndw0="/>
-        <field:input field="name" id="c_com_labsynch_labseer_domain_FileList_name" z="v986TfjH1baphcFUq18pf8XE51I="/>
-        <field:textarea field="type" id="c_com_labsynch_labseer_domain_FileList_type" z="3fYH9v1Et78+2D7qn3nCPt+6UDk="/>
-        <field:input field="size" id="c_com_labsynch_labseer_domain_FileList_size" z="tCLeceje0AmwsqiMovL1dMQi3Bs="/>
-        <field:input field="url" id="c_com_labsynch_labseer_domain_FileList_url" z="0HN4ZaiNUCW8lTOwcwP3oE6v0to="/>
-        <field:checkbox field="ie" id="c_com_labsynch_labseer_domain_FileList_ie" z="zDIH3VJW8UEiPO3W0aHYST+0sAY="/>
-        <field:checkbox field="uploaded" id="c_com_labsynch_labseer_domain_FileList_uploaded" z="5zIbD8kAqPq7R/1JWQO8z5k90zc="/>
-        <field:input field="fileName" id="c_com_labsynch_labseer_domain_FileList_fileName" z="UvddFj9jx5kNC244QDs6+SKh+Hc="/>
-        <field:input field="subdir" id="c_com_labsynch_labseer_domain_FileList_subdir" z="qrixSlsZoOKPqkaqJXrqIFi8rjc="/>
-        <field:input field="filePath" id="c_com_labsynch_labseer_domain_FileList_filePath" z="hovAA2LZzrxjYAhhjHFHKYJBdFY="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/filelists/views.xml b/src/main/webapp/WEB-INF/views/filelists/views.xml
deleted file mode 100644
index 8d1198822..000000000
--- a/src/main/webapp/WEB-INF/views/filelists/views.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="filelists/list">
-        <put-attribute name="body" value="/WEB-INF/views/filelists/list.jspx"/>
-    </definition>
-<definition extends="default" name="filelists/show">
-        <put-attribute name="body" value="/WEB-INF/views/filelists/show.jspx"/>
-    </definition>
-<definition extends="default" name="filelists/create">
-        <put-attribute name="body" value="/WEB-INF/views/filelists/create.jspx"/>
-    </definition>
-<definition extends="default" name="filelists/update">
-        <put-attribute name="body" value="/WEB-INF/views/filelists/update.jspx"/>
-    </definition>
-<definition extends="default" name="filelists/findFileListsByLot">
-        <put-attribute name="body" value="/WEB-INF/views/filelists/findFileListsByLot.jspx"/>
-    </definition>
-<definition extends="default" name="filelists/findFileListsByUrlEquals">
-        <put-attribute name="body" value="/WEB-INF/views/filelists/findFileListsByUrlEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/filethings/create.jspx b/src/main/webapp/WEB-INF/views/filethings/create.jspx
deleted file mode 100755
index 81a7c460a..000000000
--- a/src/main/webapp/WEB-INF/views/filethings/create.jspx
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_FileThing" modelAttribute="fileThing" path="/filethings" render="${empty dependencies}" z="8yCONRCodqNhnc+gjgglqwJBeCc=">
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_FileThing_codeName" z="yXgLneWs4EAB0boisxmgPX6OcPw="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_FileThing_recordedBy" required="true" z="8hCdMtwuj18qP1bcs3B1P/plTVQ="/>
-        <field:datetime dateTimePattern="${fileThing_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_FileThing_recordedDate" required="true" z="jfI4pGgjElRU4B3PSaacn2BaeiM="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_FileThing_modifiedBy" z="/U9qokZDWy01EvIU03XAE+p/p6I="/>
-        <field:datetime dateTimePattern="${fileThing_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_FileThing_modifiedDate" z="RG0BU4duxwrpmO9uT+mrTx56WSE="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_FileThing_ignored" z="mWAXftUVrZM2oKwY/TxQOEI2iM0="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_FileThing_lsTransaction" validationMessageCode="field_invalid_integer" z="3upV0Vj7wM5ZOLF9Cr85DeTVHAg="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_FileThing_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="Y86zbf+onqbYzjZy2qkVVvzrtV8="/>
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_FileThing_name" z="7i4Bxp4vTtHlYP37nv6SUmIy6UY="/>
-        <field:textarea field="description" id="c_com_labsynch_labseer_domain_FileThing_description" z="d2maFhGiHjX+MhGk+7tigMyrUUg="/>
-        <field:textarea field="fileExtension" id="c_com_labsynch_labseer_domain_FileThing_fileExtension" z="WFZ39nISxMPpJKfg9qs/X7cSOVw="/>
-        <field:textarea field="applicationType" id="c_com_labsynch_labseer_domain_FileThing_applicationType" z="RrScxGpNAzCHJzRJHY8s5zNSdPQ="/>
-        <field:textarea field="mimeType" id="c_com_labsynch_labseer_domain_FileThing_mimeType" z="dveepHxYXinbBh2/7zOg2ebMIQo="/>
-        <field:textarea field="fileURL" id="c_com_labsynch_labseer_domain_FileThing_fileURL" z="XUSwRFzDzyoy8dDz+cwk93IJA/8="/>
-        <field:input field="fileSize" id="c_com_labsynch_labseer_domain_FileThing_fileSize" validationMessageCode="field_invalid_integer" z="3dgvXd7lvet0AgV9INFntq+Z7mY="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_FileThing_lsType" required="true" z="rY4gxNaLXzD7msJ/H4oDSSg/hEE="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_FileThing_lsKind" required="true" z="KlfnNHq/eB/X9tziQveisyNaT0M="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_FileThing_lsTypeAndKind" z="4mauWsBl4QDaW/kaJqRideq00i0="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_FileThing_deleted" z="vZutKiB7aGabgP7028BEh8g4Ito="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_FileThing" render="${not empty dependencies}" z="macjLR9HXp6+IzoGF4cWRBLjEGo="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/filethings/list.jspx b/src/main/webapp/WEB-INF/views/filethings/list.jspx
deleted file mode 100755
index e88856f23..000000000
--- a/src/main/webapp/WEB-INF/views/filethings/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_FileThing" items="${filethings}" z="Vw96tjGfGThzqlUH8fVkulBF8rM=">
-        <table:table data="${filethings}" id="l_com_labsynch_labseer_domain_FileThing" path="/filethings" z="y6P7Li4BqJDV7RsTu2kBoRubIQM=">
-            <table:column id="c_com_labsynch_labseer_domain_FileThing_codeName" property="codeName" z="HMSbNKvmfACGtyAceLqlqO8WTgM="/>
-            <table:column id="c_com_labsynch_labseer_domain_FileThing_recordedBy" property="recordedBy" z="oAkOQSYKPEbk4C+0yP9wmOyfDIw="/>
-            <table:column date="true" dateTimePattern="${fileThing_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_FileThing_recordedDate" property="recordedDate" z="alf47xF3AnoXwbHfnuUrvtukKns="/>
-            <table:column id="c_com_labsynch_labseer_domain_FileThing_lsType" property="lsType" z="4pBOzWj6S53uYwNgA4B2soPZ7K8="/>
-            <table:column id="c_com_labsynch_labseer_domain_FileThing_lsKind" property="lsKind" z="juN8467M1/AZ1pkui7NZlaUknls="/>
-            <table:column id="c_com_labsynch_labseer_domain_FileThing_lsTypeAndKind" property="lsTypeAndKind" z="YfFEqZkBxvhiY8lCkSGPJXUnaFk="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/filethings/show.jspx b/src/main/webapp/WEB-INF/views/filethings/show.jspx
deleted file mode 100755
index 67d4694bb..000000000
--- a/src/main/webapp/WEB-INF/views/filethings/show.jspx
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_FileThing" object="${filething}" path="/filethings" z="+6AaLrIFJ45O/8nUWYeJfK8Fhcw=">
-        <field:display field="codeName" id="s_com_labsynch_labseer_domain_FileThing_codeName" object="${filething}" z="+5SH/yLLtG/07/afgTOjuYOVgyg="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_FileThing_recordedBy" object="${filething}" z="WIZVbDDZrPd8zVifYqVgAgO2QIY="/>
-        <field:display date="true" dateTimePattern="${fileThing_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_FileThing_recordedDate" object="${filething}" z="Ag5YdDBD6MEGoqr4Z6CrgRbxNZ8="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_FileThing_modifiedBy" object="${filething}" z="75SlOg4Wozjm4hXdpTsxFYg5qks="/>
-        <field:display date="true" dateTimePattern="${fileThing_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_FileThing_modifiedDate" object="${filething}" z="vI4dgU9RlB7NZYDlbArn8DwjqAk="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_FileThing_ignored" object="${filething}" z="l44EY3YebKR2FpPZppK5L4Mw1IU="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_FileThing_lsTransaction" object="${filething}" z="LXeuUBcZRfXTyDGQQsK+BYzDdR4="/>
-        <field:display field="name" id="s_com_labsynch_labseer_domain_FileThing_name" object="${filething}" z="F0MmvBctFoTcgonUDMORAZrZ09Y="/>
-        <field:display field="description" id="s_com_labsynch_labseer_domain_FileThing_description" object="${filething}" z="JNy9J8b5YY7pFlJDnIl1xFokhSU="/>
-        <field:display field="fileExtension" id="s_com_labsynch_labseer_domain_FileThing_fileExtension" object="${filething}" z="wfYIMp8ZKatxmGuPirlgrSwV94M="/>
-        <field:display field="applicationType" id="s_com_labsynch_labseer_domain_FileThing_applicationType" object="${filething}" z="3M48oXDvL7ENNuPU2PlNH95ppDA="/>
-        <field:display field="mimeType" id="s_com_labsynch_labseer_domain_FileThing_mimeType" object="${filething}" z="HYO+r4O3pwAdr4VMXF9+plYkbCw="/>
-        <field:display field="fileURL" id="s_com_labsynch_labseer_domain_FileThing_fileURL" object="${filething}" z="7hdJE/f+CaD0mrch70/NPNpJaqc="/>
-        <field:display field="fileSize" id="s_com_labsynch_labseer_domain_FileThing_fileSize" object="${filething}" z="heH31TEbKSvTeoWZX55Bj5MPZBw="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_FileThing_lsType" object="${filething}" z="FyGhcjqelgqBakZOaWwTeWk01OY="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_FileThing_lsKind" object="${filething}" z="Fw34k8V5oJHGZPjGsIZLhUYLMzA="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_FileThing_lsTypeAndKind" object="${filething}" z="sRARN0MbueNn4w09bNVkad+DFY8="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_FileThing_deleted" object="${filething}" z="4AW8vD1UuzZ2o4DDgC0zwmbRwJQ="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/filethings/update.jspx b/src/main/webapp/WEB-INF/views/filethings/update.jspx
deleted file mode 100755
index dce93a1c2..000000000
--- a/src/main/webapp/WEB-INF/views/filethings/update.jspx
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_FileThing" modelAttribute="fileThing" path="/filethings" versionField="Version" z="chlfd5tUAu8L4Jsac7GZ0ygpZOc=">
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_FileThing_codeName" z="yXgLneWs4EAB0boisxmgPX6OcPw="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_FileThing_recordedBy" required="true" z="8hCdMtwuj18qP1bcs3B1P/plTVQ="/>
-        <field:datetime dateTimePattern="${fileThing_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_FileThing_recordedDate" required="true" z="jfI4pGgjElRU4B3PSaacn2BaeiM="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_FileThing_modifiedBy" z="/U9qokZDWy01EvIU03XAE+p/p6I="/>
-        <field:datetime dateTimePattern="${fileThing_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_FileThing_modifiedDate" z="RG0BU4duxwrpmO9uT+mrTx56WSE="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_FileThing_ignored" z="mWAXftUVrZM2oKwY/TxQOEI2iM0="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_FileThing_lsTransaction" validationMessageCode="field_invalid_integer" z="3upV0Vj7wM5ZOLF9Cr85DeTVHAg="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_FileThing_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="Y86zbf+onqbYzjZy2qkVVvzrtV8="/>
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_FileThing_name" z="7i4Bxp4vTtHlYP37nv6SUmIy6UY="/>
-        <field:textarea field="description" id="c_com_labsynch_labseer_domain_FileThing_description" z="d2maFhGiHjX+MhGk+7tigMyrUUg="/>
-        <field:textarea field="fileExtension" id="c_com_labsynch_labseer_domain_FileThing_fileExtension" z="WFZ39nISxMPpJKfg9qs/X7cSOVw="/>
-        <field:textarea field="applicationType" id="c_com_labsynch_labseer_domain_FileThing_applicationType" z="RrScxGpNAzCHJzRJHY8s5zNSdPQ="/>
-        <field:textarea field="mimeType" id="c_com_labsynch_labseer_domain_FileThing_mimeType" z="dveepHxYXinbBh2/7zOg2ebMIQo="/>
-        <field:textarea field="fileURL" id="c_com_labsynch_labseer_domain_FileThing_fileURL" z="XUSwRFzDzyoy8dDz+cwk93IJA/8="/>
-        <field:input field="fileSize" id="c_com_labsynch_labseer_domain_FileThing_fileSize" validationMessageCode="field_invalid_integer" z="3dgvXd7lvet0AgV9INFntq+Z7mY="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_FileThing_lsType" required="true" z="rY4gxNaLXzD7msJ/H4oDSSg/hEE="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_FileThing_lsKind" required="true" z="KlfnNHq/eB/X9tziQveisyNaT0M="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_FileThing_lsTypeAndKind" z="4mauWsBl4QDaW/kaJqRideq00i0="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_FileThing_deleted" z="vZutKiB7aGabgP7028BEh8g4Ito="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/filethings/views.xml b/src/main/webapp/WEB-INF/views/filethings/views.xml
deleted file mode 100755
index ef318ae2d..000000000
--- a/src/main/webapp/WEB-INF/views/filethings/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="filethings/list">
-        <put-attribute name="body" value="/WEB-INF/views/filethings/list.jspx"/>
-    </definition>
-<definition extends="default" name="filethings/show">
-        <put-attribute name="body" value="/WEB-INF/views/filethings/show.jspx"/>
-    </definition>
-<definition extends="default" name="filethings/create">
-        <put-attribute name="body" value="/WEB-INF/views/filethings/create.jspx"/>
-    </definition>
-<definition extends="default" name="filethings/update">
-        <put-attribute name="body" value="/WEB-INF/views/filethings/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/filetypes/create.jspx b/src/main/webapp/WEB-INF/views/filetypes/create.jspx
deleted file mode 100644
index d8208d0c5..000000000
--- a/src/main/webapp/WEB-INF/views/filetypes/create.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_FileType" modelAttribute="fileType" path="/filetypes" render="${empty dependencies}" z="eTZKveJo+2VD21G7EJ39vBwMWPw=">
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_FileType_name" z="LjH8xEH5i9z+Yc4/8i+UKell/jA="/>
-        <field:textarea field="code" id="c_com_labsynch_labseer_domain_FileType_code" z="wojVmNciGeo04DQ+Eu1lKUOibAE="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_FileType" render="${not empty dependencies}" z="PgBg/2tUjc4AOY3bhRwOHXNa67c="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/filetypes/findFileTypesByCodeEquals.jspx b/src/main/webapp/WEB-INF/views/filetypes/findFileTypesByCodeEquals.jspx
deleted file mode 100644
index b65a3db53..000000000
--- a/src/main/webapp/WEB-INF/views/filetypes/findFileTypesByCodeEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeEquals" id="ff_com_labsynch_labseer_domain_FileType" path="/filetypes" z="C0F9LRGv+3LLoNe1h+xXJG/807Y=">
-        <field:input disableFormBinding="true" field="code" id="f_com_labsynch_labseer_domain_FileType_code" max="255" required="true" z="AlX5Oipk+XrUdSOztT9WHQzwMGE="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/filetypes/list.jspx b/src/main/webapp/WEB-INF/views/filetypes/list.jspx
deleted file mode 100644
index 18e496083..000000000
--- a/src/main/webapp/WEB-INF/views/filetypes/list.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_FileType" items="${filetypes}" z="5uRWluHUYWqtdllPOZxYf4qy/m8=">
-        <table:table data="${filetypes}" id="l_com_labsynch_labseer_domain_FileType" path="/filetypes" z="/gpmlfLlv8esuixYWLGNdilfHTk=">
-            <table:column id="c_com_labsynch_labseer_domain_FileType_name" property="name" z="d3wF8l/Fu8XfJwdnAqfMn9yKINw="/>
-            <table:column id="c_com_labsynch_labseer_domain_FileType_code" property="code" z="3a3GU0O7U7P5AaJ1jc+TC239ohc="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/filetypes/show.jspx b/src/main/webapp/WEB-INF/views/filetypes/show.jspx
deleted file mode 100644
index 50f834552..000000000
--- a/src/main/webapp/WEB-INF/views/filetypes/show.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_FileType" object="${filetype}" path="/filetypes" z="elWah2aUioV7RJVut72uqQ0vWq0=">
-        <field:display field="name" id="s_com_labsynch_labseer_domain_FileType_name" object="${filetype}" z="yXtoTk9YN5ioxvCHJCt7OEz6OFs="/>
-        <field:display field="code" id="s_com_labsynch_labseer_domain_FileType_code" object="${filetype}" z="3Om/U7SGDJVIWE9hRfPetVfUqRI="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/filetypes/update.jspx b/src/main/webapp/WEB-INF/views/filetypes/update.jspx
deleted file mode 100644
index 9bfdcd606..000000000
--- a/src/main/webapp/WEB-INF/views/filetypes/update.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_FileType" modelAttribute="fileType" path="/filetypes" versionField="Version" z="ikwl2IqyTRRkhyoVIUdGYjJ/IM4=">
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_FileType_name" z="LjH8xEH5i9z+Yc4/8i+UKell/jA="/>
-        <field:textarea field="code" id="c_com_labsynch_labseer_domain_FileType_code" z="wojVmNciGeo04DQ+Eu1lKUOibAE="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/filetypes/views.xml b/src/main/webapp/WEB-INF/views/filetypes/views.xml
deleted file mode 100644
index 3ac4516ec..000000000
--- a/src/main/webapp/WEB-INF/views/filetypes/views.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="filetypes/list">
-        <put-attribute name="body" value="/WEB-INF/views/filetypes/list.jspx"/>
-    </definition>
-<definition extends="default" name="filetypes/show">
-        <put-attribute name="body" value="/WEB-INF/views/filetypes/show.jspx"/>
-    </definition>
-<definition extends="default" name="filetypes/create">
-        <put-attribute name="body" value="/WEB-INF/views/filetypes/create.jspx"/>
-    </definition>
-<definition extends="default" name="filetypes/update">
-        <put-attribute name="body" value="/WEB-INF/views/filetypes/update.jspx"/>
-    </definition>
-<definition extends="default" name="filetypes/findFileTypesByCodeEquals">
-        <put-attribute name="body" value="/WEB-INF/views/filetypes/findFileTypesByCodeEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/footer.jspx b/src/main/webapp/WEB-INF/views/footer.jspx
deleted file mode 100755
index 7540acf5b..000000000
--- a/src/main/webapp/WEB-INF/views/footer.jspx
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" xmlns:util="urn:jsptagdir:/WEB-INF/tags/util" id="footer" version="2.0">
-  <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-  <jsp:output omit-xml-declaration="yes"/>
-
-  <spring:url value="/" var="home"/>
-  <span>
-    <a href="${home}">
-      <spring:message code="button_home"/>
-    </a>
-  </span>
-  <c:if test="${pageContext['request'].userPrincipal != null}">
-    <c:out value=" | "/>
-    <span>
-      <spring:url value="/resources/j_spring_security_logout" var="logout"/>
-      <a href="${logout}">
-        <spring:message code="security_logout"/>
-      </a>
-    <div>|</div>
-            <a href="/acas/changepassword/index">password</a>
-        <div>|</div>
-            <a href="/acas/changepassword/index">password</a>
-        <div>|</div>
-            <a href="/acas/changepassword/index">password</a>
-        </span>
-  </c:if>
-
-  <span id="language">
-    <c:out value=" | "/>
-    <spring:message code="global_language"/>
-    <c:out value=": "/>
-  <util:language label="English" locale="en"/>
-    </span>
-  <util:theme/>
-
-  <spring:url value="/resources/images/springsource-logo.png" var="logo"/>
-  <spring:message code="global_sponsored" htmlEscape="false" var="sponsored"/>
-  <span>
-    <a href="http://springsource.com" title="${fn:escapeXml(sponsored)}">
-      <img align="right" alt="${fn:escapeXml(sponsored)}" src="${logo}"/>
-    </a>
-  </span>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/forgotpassword/index.jspx b/src/main/webapp/WEB-INF/views/forgotpassword/index.jspx
deleted file mode 100755
index 480737175..000000000
--- a/src/main/webapp/WEB-INF/views/forgotpassword/index.jspx
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" 
-    xmlns:form="http://www.springframework.org/tags/form" 
-    xmlns:jsp="http://java.sun.com/JSP/Page" 
-    xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    
-  <jsp:output omit-xml-declaration="yes"/>
-  <script type="text/javascript">dojo.require('dijit.TitlePane');dojo.require('dijit.form.SimpleTextarea');dojo.require('dijit.form.FilteringSelect');</script>
-  
-  <div id="_title_div">
-    Forgot Password
-    <script type="text/javascript">Spring.addDecoration(new Spring.ElementDecoration({elementId : '_title_div', widgetType : 'dijit.TitlePane', widgetAttrs : {title: '${title_msg}'}})); </script>
-    <spring:url value="/forgotpassword" var="form_url"/>
-    Forgot Password
-    <script type="text/javascript">Spring.addDecoration(new Spring.ElementDecoration({elementId : '_title_div', widgetType : 'dijit.TitlePane', widgetAttrs : {title: '${title_msg}'}})); </script>
-    <form:form action="update" method="POST" commandName="forgotpasswordForm">
-      <br/>
-      <div id="forgotpassword_emailaddress">
-        <label for="_emailaddress_id">Provide Email Address:</label>
-        <form:input cssStyle="width:250px" id="_forgotpassword_emailaddress" maxlength="30" path="emailAddress"/>
-        <br/>
-        <form:errors cssClass="errors" path="emailAddress"/>
-      </div>
-      <br/>
-      <div class="submit" id="changepassword_submit">
-        <script type="text/javascript">Spring.addDecoration(new Spring.ValidateAllDecoration({elementId: 'proceed', event : 'onclick'}));</script>
-        <input id="proceed" type="submit" value="Submit"/>
-      </div>
-      <br/>
-      <br/>
-      <form:errors cssClass="errors" delimiter="&lt;p/&gt;"/>
-    </form:form>
-  </div>
-</div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/forgotpassword/thanks.jspx b/src/main/webapp/WEB-INF/views/forgotpassword/thanks.jspx
deleted file mode 100755
index 8b3ca3f74..000000000
--- a/src/main/webapp/WEB-INF/views/forgotpassword/thanks.jspx
+++ /dev/null
@@ -1,16 +0,0 @@
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" 
-    xmlns:form="http://www.springframework.org/tags/form" 
-    xmlns:jsp="http://java.sun.com/JSP/Page" 
-    xmlns:spring="http://www.springframework.org/tags" version="2.0">
-  <jsp:output omit-xml-declaration="yes"/>
-  <script type="text/javascript">dojo.require('dijit.TitlePane');dojo.require('dijit.form.SimpleTextarea');dojo.require('dijit.form.FilteringSelect');</script>
-  <div id="_title_div">
-    
-    <script type="text/javascript">Spring.addDecoration(new Spring.ElementDecoration({elementId : '_title_div', widgetType : 'dijit.TitlePane', widgetAttrs : {title: '${title_msg}'}})); </script>
-    <spring:url value="/forgotpassword" var="form_url"/>
-    Forgot Password
-    <script type="text/javascript">Spring.addDecoration(new Spring.ElementDecoration({elementId : '_title_div', widgetType : 'dijit.TitlePane', widgetAttrs : {title: '${title_msg}'}})); </script>
-    
-    <h3>Your new password has been sent to your email address.</h3>
-  </div>
-</div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/forgotpassword/views.xml b/src/main/webapp/WEB-INF/views/forgotpassword/views.xml
deleted file mode 100755
index 083b5ddeb..000000000
--- a/src/main/webapp/WEB-INF/views/forgotpassword/views.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-	<definition extends="default" name="forgotpassword/index">
-		<put-attribute name="menu" value="" />
-		<put-attribute name="body"
-			value="/WEB-INF/views/forgotpassword/index.jspx" />
-	</definition>
-	<definition extends="default" name="forgotpassword/thanks">
-		<put-attribute name="menu" value="" />
-		<put-attribute name="body"
-			value="/WEB-INF/views/forgotpassword/thanks.jspx" />
-	</definition>
-
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/header.jspx b/src/main/webapp/WEB-INF/views/header.jspx
deleted file mode 100755
index dbcf95042..000000000
--- a/src/main/webapp/WEB-INF/views/header.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<div id="header" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-  <jsp:directive.page contentType="text/html;charset=UTF-8" />
-  <jsp:output omit-xml-declaration="yes" />
-
-  <spring:url var="banner" value="/resources/images/banner-graphic.png" />
-  <spring:url var="home" value="/" />
-  <spring:message code="button_home" var="home_label" htmlEscape="false" />
-  <a href="${home}" name="${fn:escapeXml(home_label)}" title="${fn:escapeXml(home_label)}">
-    <img src="${banner}" />
-  </a>
-</div> 
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/index-template.jspx b/src/main/webapp/WEB-INF/views/index-template.jspx
deleted file mode 100755
index 07000646a..000000000
--- a/src/main/webapp/WEB-INF/views/index-template.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<div xmlns:spring="http://www.springframework.org/tags" xmlns:util="urn:jsptagdir:/WEB-INF/tags/util" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-  <jsp:directive.page contentType="text/html;charset=UTF-8" />
-  <jsp:output omit-xml-declaration="yes" />
-  <spring:message var="title" htmlEscape="false" />
-  <util:panel id="title" title="${title}">
-    <spring:message code="application_name" var="app_name" htmlEscape="false" />
-    <h3>
-      <spring:message code="welcome_titlepane" arguments="${app_name}" />
-    </h3>
-  </util:panel>
-</div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/index.jspx b/src/main/webapp/WEB-INF/views/index.jspx
deleted file mode 100755
index 12b501465..000000000
--- a/src/main/webapp/WEB-INF/views/index.jspx
+++ /dev/null
@@ -1,14 +0,0 @@
-<div xmlns:spring="http://www.springframework.org/tags" xmlns:util="urn:jsptagdir:/WEB-INF/tags/util" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-  <jsp:directive.page contentType="text/html;charset=UTF-8" />
-  <jsp:output omit-xml-declaration="yes" />
-  <spring:message var="app_name" code="application_name" htmlEscape="false" />
-  <spring:message var="title" code="welcome_titlepane" arguments="${app_name}" htmlEscape="false" />
-  <util:panel id="title" title="${title}">
-    <h3>
-      <spring:message code="welcome_h3" arguments="${app_name}" />
-    </h3>
-    <p>
-      <spring:message code="welcome_text" />
-    </p>
-  </util:panel>
-</div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/interactionkinds/create.jspx b/src/main/webapp/WEB-INF/views/interactionkinds/create.jspx
deleted file mode 100755
index 78d578c6e..000000000
--- a/src/main/webapp/WEB-INF/views/interactionkinds/create.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_InteractionKind" modelAttribute="interactionKind" path="/interactionkinds" render="${empty dependencies}" z="S2orsPvLvdUoL48NQZV+UBJWJho=">
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_InteractionKind_kindName" required="true" z="YNeMYurrd/mXivnJ4cgak49EjYc="/>
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_InteractionKind_lsType" itemValue="id" items="${interactiontypes}" path="/interactiontypes" required="true" z="6+HHGKJK0X+Dntp2DVUu2P+gWLA="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_InteractionKind_lsTypeAndKind" z="6mf/DAd/IEmKJK5w27miMqX8u+U="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_InteractionKind" render="${not empty dependencies}" z="wsmaUi48dgKmQyiqMBcJOTZx+DI="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/interactionkinds/list.jspx b/src/main/webapp/WEB-INF/views/interactionkinds/list.jspx
deleted file mode 100755
index ce30e11d9..000000000
--- a/src/main/webapp/WEB-INF/views/interactionkinds/list.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_InteractionKind" items="${interactionkinds}" z="ZVTMd7dLsXw1OQXfYxiCMjGe5tc=">
-        <table:table data="${interactionkinds}" id="l_com_labsynch_labseer_domain_InteractionKind" path="/interactionkinds" z="Nkd3exIdYlQCyrVHUqVohGH4qQU=">
-            <table:column id="c_com_labsynch_labseer_domain_InteractionKind_lsType" property="lsType" z="nDX30QB7JjYmFJn32NhoVp21Q/s="/>
-            <table:column id="c_com_labsynch_labseer_domain_InteractionKind_kindName" property="kindName" z="Wps+Y1IiD7e7FTeaTdriltPxOmo="/>
-            <table:column id="c_com_labsynch_labseer_domain_InteractionKind_lsTypeAndKind" property="lsTypeAndKind" z="xvR/MiWCd83Vpu5N9I9TqDBJpew="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/interactionkinds/show.jspx b/src/main/webapp/WEB-INF/views/interactionkinds/show.jspx
deleted file mode 100755
index fb8f89307..000000000
--- a/src/main/webapp/WEB-INF/views/interactionkinds/show.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_InteractionKind" object="${interactionkind}" path="/interactionkinds" z="c7sP3zOEDfsixUpVXrJHFngd50g=">
-        <field:display field="kindName" id="s_com_labsynch_labseer_domain_InteractionKind_kindName" object="${interactionkind}" z="ti0qROeHJ+u5z3B06PhzgjnWvyI="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_InteractionKind_lsType" object="${interactionkind}" z="l//sA82QV7DP+9M/jFz7hYnbD68="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_InteractionKind_lsTypeAndKind" object="${interactionkind}" z="iEEhxQox7s4rYQd0BvRj1SdWrOk="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/interactionkinds/update.jspx b/src/main/webapp/WEB-INF/views/interactionkinds/update.jspx
deleted file mode 100755
index 8798001bb..000000000
--- a/src/main/webapp/WEB-INF/views/interactionkinds/update.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_InteractionKind" modelAttribute="interactionKind" path="/interactionkinds" versionField="Version" z="/38MVjMWKHaMowxVeP2KHswRcVw=">
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_InteractionKind_lsType" itemValue="id" items="${interactiontypes}" path="/interactiontypes" required="true" z="6+HHGKJK0X+Dntp2DVUu2P+gWLA="/>
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_InteractionKind_kindName" required="true" z="YNeMYurrd/mXivnJ4cgak49EjYc="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_InteractionKind_lsTypeAndKind" z="6mf/DAd/IEmKJK5w27miMqX8u+U="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/interactionkinds/views.xml b/src/main/webapp/WEB-INF/views/interactionkinds/views.xml
deleted file mode 100755
index 1964c7b44..000000000
--- a/src/main/webapp/WEB-INF/views/interactionkinds/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="interactionkinds/list">
-        <put-attribute name="body" value="/WEB-INF/views/interactionkinds/list.jspx"/>
-    </definition>
-<definition extends="default" name="interactionkinds/show">
-        <put-attribute name="body" value="/WEB-INF/views/interactionkinds/show.jspx"/>
-    </definition>
-<definition extends="default" name="interactionkinds/create">
-        <put-attribute name="body" value="/WEB-INF/views/interactionkinds/create.jspx"/>
-    </definition>
-<definition extends="default" name="interactionkinds/update">
-        <put-attribute name="body" value="/WEB-INF/views/interactionkinds/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/interactiontypes/create.jspx b/src/main/webapp/WEB-INF/views/interactiontypes/create.jspx
deleted file mode 100755
index fa7effe3b..000000000
--- a/src/main/webapp/WEB-INF/views/interactiontypes/create.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_InteractionType" modelAttribute="interactionType" path="/interactiontypes" render="${empty dependencies}" z="fGkmNzk/HTD8qqeJ4KHTqNZTPmA=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_InteractionType_typeName" required="true" z="meDezLNrDVc27yfHrkZQdB1sCdk="/>
-        <field:textarea field="typeVerb" id="c_com_labsynch_labseer_domain_InteractionType_typeVerb" required="true" z="5ApA9/VrROVtDVoZP4fBN/XwcjY="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_InteractionType" render="${not empty dependencies}" z="8SfRtd/Eq8ZBewZhRFHDpWpXFS8="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/interactiontypes/list.jspx b/src/main/webapp/WEB-INF/views/interactiontypes/list.jspx
deleted file mode 100755
index c7199c705..000000000
--- a/src/main/webapp/WEB-INF/views/interactiontypes/list.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_InteractionType" items="${interactiontypes}" z="6v7c9hAntP26U6kOq1/94QQw+c4=">
-        <table:table data="${interactiontypes}" id="l_com_labsynch_labseer_domain_InteractionType" path="/interactiontypes" z="eZkvEzpKhI2p4WwVSTaV5NU/AjA=">
-            <table:column id="c_com_labsynch_labseer_domain_InteractionType_typeName" property="typeName" z="gwvIZmuClE+KHtiFw3sS6Qtwa/g="/>
-            <table:column id="c_com_labsynch_labseer_domain_InteractionType_typeVerb" property="typeVerb" z="6I5leDCRUBo7ZilSV5TC3IrVK2E="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/interactiontypes/show.jspx b/src/main/webapp/WEB-INF/views/interactiontypes/show.jspx
deleted file mode 100755
index dc9094d4c..000000000
--- a/src/main/webapp/WEB-INF/views/interactiontypes/show.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_InteractionType" object="${interactiontype}" path="/interactiontypes" z="l8w6ghqxy3brWKgAaQPM4RlPtlk=">
-        <field:display field="typeName" id="s_com_labsynch_labseer_domain_InteractionType_typeName" object="${interactiontype}" z="wUkmgXSWDhuPVATmahDCSXSjC6g="/>
-        <field:display field="typeVerb" id="s_com_labsynch_labseer_domain_InteractionType_typeVerb" object="${interactiontype}" z="vMYCxRzkM9bWUz/F2JZfUe6alTE="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/interactiontypes/update.jspx b/src/main/webapp/WEB-INF/views/interactiontypes/update.jspx
deleted file mode 100755
index 0d574af86..000000000
--- a/src/main/webapp/WEB-INF/views/interactiontypes/update.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_InteractionType" modelAttribute="interactionType" path="/interactiontypes" versionField="Version" z="BYYUAGFcZ+LGLMVQO2+ggj/oFBQ=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_InteractionType_typeName" required="true" z="meDezLNrDVc27yfHrkZQdB1sCdk="/>
-        <field:textarea field="typeVerb" id="c_com_labsynch_labseer_domain_InteractionType_typeVerb" required="true" z="5ApA9/VrROVtDVoZP4fBN/XwcjY="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/interactiontypes/views.xml b/src/main/webapp/WEB-INF/views/interactiontypes/views.xml
deleted file mode 100755
index 8e7c93f7e..000000000
--- a/src/main/webapp/WEB-INF/views/interactiontypes/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="interactiontypes/list">
-        <put-attribute name="body" value="/WEB-INF/views/interactiontypes/list.jspx"/>
-    </definition>
-<definition extends="default" name="interactiontypes/show">
-        <put-attribute name="body" value="/WEB-INF/views/interactiontypes/show.jspx"/>
-    </definition>
-<definition extends="default" name="interactiontypes/create">
-        <put-attribute name="body" value="/WEB-INF/views/interactiontypes/create.jspx"/>
-    </definition>
-<definition extends="default" name="interactiontypes/update">
-        <put-attribute name="body" value="/WEB-INF/views/interactiontypes/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/isosalts/create.jspx b/src/main/webapp/WEB-INF/views/isosalts/create.jspx
deleted file mode 100644
index 9f7936446..000000000
--- a/src/main/webapp/WEB-INF/views/isosalts/create.jspx
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_IsoSalt" modelAttribute="isoSalt" path="/isosalts" render="${empty dependencies}" z="gIYTrmDVQf9c1UI0w2Sod3a0KTM=">
-        <field:select field="isotope" id="c_com_labsynch_labseer_domain_IsoSalt_isotope" itemValue="id" items="${isotopes}" path="/isotopes" z="ev+D3WWx2gpc5AmNnM8VT+xI8dg="/>
-        <field:select field="salt" id="c_com_labsynch_labseer_domain_IsoSalt_salt" itemValue="id" items="${salts}" path="/salts" z="3bskW87y2QIpRR7guOAMr+v3r2I="/>
-        <field:input field="type" id="c_com_labsynch_labseer_domain_IsoSalt_type" max="25" z="WHmgCsGD162A5/KH/wixjLQ20II="/>
-        <field:input field="equivalents" id="c_com_labsynch_labseer_domain_IsoSalt_equivalents" validationMessageCode="field_invalid_number" z="njQUKeHJknJA1DWm+eTvyxZ0t0o="/>
-        <field:checkbox field="ignore" id="c_com_labsynch_labseer_domain_IsoSalt_ignore" z="/0RAmNGIIphWMSfEVLbiBMCd8mk="/>
-        <field:select field="saltForm" id="c_com_labsynch_labseer_domain_IsoSalt_saltForm" itemValue="id" items="${saltforms}" path="/saltforms" z="mWnfD21/7RVOaH0Be/dqg2+sGcI="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_IsoSalt" render="${not empty dependencies}" z="NSVyJ+TT/gRQD4LwCe/I5Cm/R9M="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/isosalts/findIsoSaltsBySaltForm.jspx b/src/main/webapp/WEB-INF/views/isosalts/findIsoSaltsBySaltForm.jspx
deleted file mode 100644
index d1e9830a9..000000000
--- a/src/main/webapp/WEB-INF/views/isosalts/findIsoSaltsBySaltForm.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="BySaltForm" id="ff_com_labsynch_labseer_domain_IsoSalt" path="/isosalts" z="ZzSFoN6c8Ty2wYT9ShLBVhAEDH8=">
-        <field:select disableFormBinding="true" field="saltForm" id="f_com_labsynch_labseer_domain_IsoSalt_saltForm" itemValue="id" items="${saltforms}" path="/saltforms" required="true" z="TfBj5S8RNpPaOMCzdmNlL4S+ZhQ="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/isosalts/findIsoSaltsBySaltFormAndType.jspx b/src/main/webapp/WEB-INF/views/isosalts/findIsoSaltsBySaltFormAndType.jspx
deleted file mode 100644
index 9ca581390..000000000
--- a/src/main/webapp/WEB-INF/views/isosalts/findIsoSaltsBySaltFormAndType.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="BySaltFormAndType" id="ff_com_labsynch_labseer_domain_IsoSalt" path="/isosalts" z="VTNJcx7d8I8gt6T10RN5IbVonig=">
-        <field:select disableFormBinding="true" field="saltForm" id="f_com_labsynch_labseer_domain_IsoSalt_saltForm" itemValue="id" items="${saltforms}" path="/saltforms" required="true" z="TfBj5S8RNpPaOMCzdmNlL4S+ZhQ="/>
-        <field:input disableFormBinding="true" field="type" id="f_com_labsynch_labseer_domain_IsoSalt_type" max="25" required="true" z="Bw0rlK3ijRyvPS3HmdqOwbT8tbM="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/isosalts/list.jspx b/src/main/webapp/WEB-INF/views/isosalts/list.jspx
deleted file mode 100644
index af7cdefa2..000000000
--- a/src/main/webapp/WEB-INF/views/isosalts/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_IsoSalt" items="${isosalts}" z="PRKLYBe5zxlQWHAyL2dL2hWzQh8=">
-        <table:table data="${isosalts}" id="l_com_labsynch_labseer_domain_IsoSalt" path="/isosalts" z="9Tdt0dhRNYHmVL8vxBFHd2HL+j0=">
-            <table:column id="c_com_labsynch_labseer_domain_IsoSalt_isotope" property="isotope" z="mYveYYFRXEMqhR114JPdWhk8mXE="/>
-            <table:column id="c_com_labsynch_labseer_domain_IsoSalt_salt" property="salt" z="7DS0qIuHz5jvka4IkM9XNMko4UA="/>
-            <table:column id="c_com_labsynch_labseer_domain_IsoSalt_type" property="type" z="so0aedUJRCYfZnsCV6cjIpJk1tw="/>
-            <table:column id="c_com_labsynch_labseer_domain_IsoSalt_equivalents" property="equivalents" z="X7YFwYYsUzQLcs6ZEMOOtRh3CsI="/>
-            <table:column id="c_com_labsynch_labseer_domain_IsoSalt_ignore" property="ignore" z="hAF8Va/tpVOPLB2LjMYAA5hXO1w="/>
-            <table:column id="c_com_labsynch_labseer_domain_IsoSalt_saltForm" property="saltForm" z="tHzxPbfPN6nlPRhVOH53o4YYwGw="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/isosalts/show.jspx b/src/main/webapp/WEB-INF/views/isosalts/show.jspx
deleted file mode 100644
index e23019994..000000000
--- a/src/main/webapp/WEB-INF/views/isosalts/show.jspx
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_IsoSalt" object="${isosalt}" path="/isosalts" z="CmimEQw9Ehx13MKxn/cPjQSy8kc=">
-        <field:display field="isotope" id="s_com_labsynch_labseer_domain_IsoSalt_isotope" object="${isosalt}" z="ylmnP0b+gj5z7TexLdQByHZB/mk="/>
-        <field:display field="salt" id="s_com_labsynch_labseer_domain_IsoSalt_salt" object="${isosalt}" z="jWhcGI+vEm6pf4PCr3F1tgejJNc="/>
-        <field:display field="type" id="s_com_labsynch_labseer_domain_IsoSalt_type" object="${isosalt}" z="nu8edr3/WHV5m9057D9MAqdz8To="/>
-        <field:display field="equivalents" id="s_com_labsynch_labseer_domain_IsoSalt_equivalents" object="${isosalt}" z="dufiSl0KQ/TBBU0ReQQQbXrEQkc="/>
-        <field:display field="ignore" id="s_com_labsynch_labseer_domain_IsoSalt_ignore" object="${isosalt}" z="yh2spjJQd+9xhHF2NOlyLb0PzYA="/>
-        <field:display field="saltForm" id="s_com_labsynch_labseer_domain_IsoSalt_saltForm" object="${isosalt}" z="Rnky6j7hu3QzPC4hAzaoGb1fQ8M="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/isosalts/update.jspx b/src/main/webapp/WEB-INF/views/isosalts/update.jspx
deleted file mode 100644
index 6b8231cba..000000000
--- a/src/main/webapp/WEB-INF/views/isosalts/update.jspx
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_IsoSalt" modelAttribute="isoSalt" path="/isosalts" versionField="Version" z="EAkXi/GVY509aXMMcLI4s22Re4E=">
-        <field:select field="isotope" id="c_com_labsynch_labseer_domain_IsoSalt_isotope" itemValue="id" items="${isotopes}" path="/isotopes" z="ev+D3WWx2gpc5AmNnM8VT+xI8dg="/>
-        <field:select field="salt" id="c_com_labsynch_labseer_domain_IsoSalt_salt" itemValue="id" items="${salts}" path="/salts" z="3bskW87y2QIpRR7guOAMr+v3r2I="/>
-        <field:input field="type" id="c_com_labsynch_labseer_domain_IsoSalt_type" max="25" z="WHmgCsGD162A5/KH/wixjLQ20II="/>
-        <field:input field="equivalents" id="c_com_labsynch_labseer_domain_IsoSalt_equivalents" validationMessageCode="field_invalid_number" z="njQUKeHJknJA1DWm+eTvyxZ0t0o="/>
-        <field:checkbox field="ignore" id="c_com_labsynch_labseer_domain_IsoSalt_ignore" z="/0RAmNGIIphWMSfEVLbiBMCd8mk="/>
-        <field:select field="saltForm" id="c_com_labsynch_labseer_domain_IsoSalt_saltForm" itemValue="id" items="${saltforms}" path="/saltforms" z="mWnfD21/7RVOaH0Be/dqg2+sGcI="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/isosalts/views.xml b/src/main/webapp/WEB-INF/views/isosalts/views.xml
deleted file mode 100644
index 04f9aa9b1..000000000
--- a/src/main/webapp/WEB-INF/views/isosalts/views.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="isosalts/list">
-        <put-attribute name="body" value="/WEB-INF/views/isosalts/list.jspx"/>
-    </definition>
-<definition extends="default" name="isosalts/show">
-        <put-attribute name="body" value="/WEB-INF/views/isosalts/show.jspx"/>
-    </definition>
-<definition extends="default" name="isosalts/create">
-        <put-attribute name="body" value="/WEB-INF/views/isosalts/create.jspx"/>
-    </definition>
-<definition extends="default" name="isosalts/update">
-        <put-attribute name="body" value="/WEB-INF/views/isosalts/update.jspx"/>
-    </definition>
-<definition extends="default" name="isosalts/findIsoSaltsBySaltForm">
-        <put-attribute name="body" value="/WEB-INF/views/isosalts/findIsoSaltsBySaltForm.jspx"/>
-    </definition>
-<definition extends="default" name="isosalts/findIsoSaltsBySaltFormAndType">
-        <put-attribute name="body" value="/WEB-INF/views/isosalts/findIsoSaltsBySaltFormAndType.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/isotopes/create.jspx b/src/main/webapp/WEB-INF/views/isotopes/create.jspx
deleted file mode 100644
index 4c5096488..000000000
--- a/src/main/webapp/WEB-INF/views/isotopes/create.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_Isotope" modelAttribute="isotope" path="/isotopes" render="${empty dependencies}" z="cQyzq8mwY1M0JGXqwO/TSQ+PzH0=">
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_Isotope_name" z="DxWWduZqV4xKeveXH+dNOqjjRZ8="/>
-        <field:textarea field="abbrev" id="c_com_labsynch_labseer_domain_Isotope_abbrev" z="bzsBDh6LzkhZfHD9IVpWfvc2k+c="/>
-        <field:input field="massChange" id="c_com_labsynch_labseer_domain_Isotope_massChange" validationMessageCode="field_invalid_number" z="ponDkHS6fxPiMbUelPapDeAHPTI="/>
-        <field:checkbox field="ignore" id="c_com_labsynch_labseer_domain_Isotope_ignore" z="d1TKAWbdHe1LTcNpUwLYVTRsmH4="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_Isotope" render="${not empty dependencies}" z="0jioDd+gRHXkRdctSKLMq8W3NF0="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/isotopes/findIsotopesByAbbrevEquals.jspx b/src/main/webapp/WEB-INF/views/isotopes/findIsotopesByAbbrevEquals.jspx
deleted file mode 100644
index 1112e4a8a..000000000
--- a/src/main/webapp/WEB-INF/views/isotopes/findIsotopesByAbbrevEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByAbbrevEquals" id="ff_com_labsynch_labseer_domain_Isotope" path="/isotopes" z="I8yi4PVUYhxSpKgwMEQ1h5CPlV4=">
-        <field:input disableFormBinding="true" field="abbrev" id="f_com_labsynch_labseer_domain_Isotope_abbrev" max="100" required="true" z="7nTaJD3f5HJTylqoOE8KBK7Whds="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/isotopes/findIsotopesByAbbrevEqualsAndNameEquals.jspx b/src/main/webapp/WEB-INF/views/isotopes/findIsotopesByAbbrevEqualsAndNameEquals.jspx
deleted file mode 100644
index fc449cd3c..000000000
--- a/src/main/webapp/WEB-INF/views/isotopes/findIsotopesByAbbrevEqualsAndNameEquals.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByAbbrevEqualsAndNameEquals" id="ff_com_labsynch_labseer_domain_Isotope" path="/isotopes" z="gBPyf4S5hZm47EAnsFbw54jzPuo=">
-        <field:input disableFormBinding="true" field="abbrev" id="f_com_labsynch_labseer_domain_Isotope_abbrev" max="100" required="true" z="7nTaJD3f5HJTylqoOE8KBK7Whds="/>
-        <field:input disableFormBinding="true" field="name" id="f_com_labsynch_labseer_domain_Isotope_name" max="255" required="true" z="DoWoA4xMQUzxKewiphTEgQxnRwk="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/isotopes/findIsotopesByNameEquals.jspx b/src/main/webapp/WEB-INF/views/isotopes/findIsotopesByNameEquals.jspx
deleted file mode 100644
index bebd972e3..000000000
--- a/src/main/webapp/WEB-INF/views/isotopes/findIsotopesByNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByNameEquals" id="ff_com_labsynch_labseer_domain_Isotope" path="/isotopes" z="9BVQh7v8CLdv7n34FQmCsARuk6M=">
-        <field:input disableFormBinding="true" field="name" id="f_com_labsynch_labseer_domain_Isotope_name" max="255" required="true" z="DoWoA4xMQUzxKewiphTEgQxnRwk="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/isotopes/list.jspx b/src/main/webapp/WEB-INF/views/isotopes/list.jspx
deleted file mode 100644
index f68aebe72..000000000
--- a/src/main/webapp/WEB-INF/views/isotopes/list.jspx
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_Isotope" items="${isotopes}" z="jzjcnqrj3byWLyWMANxW9vzpOxs=">
-        <table:table data="${isotopes}" id="l_com_labsynch_labseer_domain_Isotope" path="/isotopes" z="XvtvaUZUeX1z6woBM4szdc8Mf+o=">
-            <table:column id="c_com_labsynch_labseer_domain_Isotope_name" property="name" z="eT9LibVBMHPQOsLJDtSquXWg5o0="/>
-            <table:column id="c_com_labsynch_labseer_domain_Isotope_abbrev" property="abbrev" z="shDiLB8ttXvYFCr9UBK2Y5aCSCw="/>
-            <table:column id="c_com_labsynch_labseer_domain_Isotope_massChange" property="massChange" z="KvMN8hcYX+cPma4jyh+hdLIQmk8="/>
-            <table:column id="c_com_labsynch_labseer_domain_Isotope_ignore" property="ignore" z="3/n4dl7tvmKMud1iuqZkDXImh7k="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/isotopes/show.jspx b/src/main/webapp/WEB-INF/views/isotopes/show.jspx
deleted file mode 100644
index b3a298d08..000000000
--- a/src/main/webapp/WEB-INF/views/isotopes/show.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_Isotope" object="${isotope}" path="/isotopes" z="eOFJWbdR3VhRIcjAP3IVVbmmJE8=">
-        <field:display field="name" id="s_com_labsynch_labseer_domain_Isotope_name" object="${isotope}" z="oTps15vqOnAUGy00nAkxHF4Zr7s="/>
-        <field:display field="abbrev" id="s_com_labsynch_labseer_domain_Isotope_abbrev" object="${isotope}" z="ZM84eTJCAIn1YcKZdJ+piLZM6XM="/>
-        <field:display field="massChange" id="s_com_labsynch_labseer_domain_Isotope_massChange" object="${isotope}" z="4kitx/q0OP9+a8aZ4BxMajKzHII="/>
-        <field:display field="ignore" id="s_com_labsynch_labseer_domain_Isotope_ignore" object="${isotope}" z="53ZO8E3E+hONu63PdaNhojPwvN4="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/isotopes/update.jspx b/src/main/webapp/WEB-INF/views/isotopes/update.jspx
deleted file mode 100644
index be9b4d905..000000000
--- a/src/main/webapp/WEB-INF/views/isotopes/update.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_Isotope" modelAttribute="isotope" path="/isotopes" versionField="Version" z="xp5a9RbRuRsgnl5dPxoryCBDTD4=">
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_Isotope_name" z="DxWWduZqV4xKeveXH+dNOqjjRZ8="/>
-        <field:textarea field="abbrev" id="c_com_labsynch_labseer_domain_Isotope_abbrev" z="bzsBDh6LzkhZfHD9IVpWfvc2k+c="/>
-        <field:input field="massChange" id="c_com_labsynch_labseer_domain_Isotope_massChange" validationMessageCode="field_invalid_number" z="ponDkHS6fxPiMbUelPapDeAHPTI="/>
-        <field:checkbox field="ignore" id="c_com_labsynch_labseer_domain_Isotope_ignore" z="d1TKAWbdHe1LTcNpUwLYVTRsmH4="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/isotopes/views.xml b/src/main/webapp/WEB-INF/views/isotopes/views.xml
deleted file mode 100644
index c4fb100c5..000000000
--- a/src/main/webapp/WEB-INF/views/isotopes/views.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="isotopes/list">
-        <put-attribute name="body" value="/WEB-INF/views/isotopes/list.jspx"/>
-    </definition>
-<definition extends="default" name="isotopes/show">
-        <put-attribute name="body" value="/WEB-INF/views/isotopes/show.jspx"/>
-    </definition>
-<definition extends="default" name="isotopes/create">
-        <put-attribute name="body" value="/WEB-INF/views/isotopes/create.jspx"/>
-    </definition>
-<definition extends="default" name="isotopes/update">
-        <put-attribute name="body" value="/WEB-INF/views/isotopes/update.jspx"/>
-    </definition>
-<definition extends="default" name="isotopes/findIsotopesByAbbrevEquals">
-        <put-attribute name="body" value="/WEB-INF/views/isotopes/findIsotopesByAbbrevEquals.jspx"/>
-    </definition>
-<definition extends="default" name="isotopes/findIsotopesByAbbrevEqualsAndNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/isotopes/findIsotopesByAbbrevEqualsAndNameEquals.jspx"/>
-    </definition>
-<definition extends="default" name="isotopes/findIsotopesByNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/isotopes/findIsotopesByNameEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/itxcontainercontainers/create.jspx b/src/main/webapp/WEB-INF/views/itxcontainercontainers/create.jspx
deleted file mode 100755
index 561af363c..000000000
--- a/src/main/webapp/WEB-INF/views/itxcontainercontainers/create.jspx
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ItxContainerContainer" modelAttribute="itxContainerContainer" path="/itxcontainercontainers" render="${empty dependencies}" z="xCY0Ra8fL/mo8X/uGbdZbEGRZ7w=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxContainerContainer_recordedBy" required="true" z="8JLib9/WNQiKFCOp9zFvKnf7cTk="/>
-        <field:datetime dateTimePattern="${itxContainerContainer_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxContainerContainer_recordedDate" required="true" z="yIhUA/oEpinvGUsBwVDfR9zVRLY="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxContainerContainer_modifiedBy" z="hLIWyQNtwnOW0UV0lFxnjC7i/xk="/>
-        <field:datetime dateTimePattern="${itxContainerContainer_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxContainerContainer_modifiedDate" z="0x/U3xaJVH88mdpazmU7qMUzV7U="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxContainerContainer_ignored" z="WVb0pylg+aMM4RGdaWV8x6sEfUo="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxContainerContainer_lsTransaction" validationMessageCode="field_invalid_integer" z="0SVu+SZKsq6GY90LBw2tqM5WalQ="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_ItxContainerContainer_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="LuqdDmzDSR1WZuFM4zHdkZtn0p8="/>
-        <field:select field="firstContainer" id="c_com_labsynch_labseer_domain_ItxContainerContainer_firstContainer" itemValue="id" items="${containers}" path="/containers" required="true" z="R9AhGS73XpHhEZHjvPsKo1JEV7w="/>
-        <field:select field="secondContainer" id="c_com_labsynch_labseer_domain_ItxContainerContainer_secondContainer" itemValue="id" items="${containers}" path="/containers" required="true" z="IDy95o60GIjPquhzn8SIXgR9IbE="/>
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_ItxContainerContainer_codeName" z="y1NqCVuyrS7ciqorIyzyXa23LeE="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxContainerContainer_lsType" required="true" z="CNLeTOklOPYz3gZwps/LadorHic="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxContainerContainer_lsKind" required="true" z="9wDaOZigYfKRtZLIR69LPKBv+x8="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxContainerContainer_lsTypeAndKind" z="pPEEbSAraZ77nd7mpOzZQ/Y3wuI="/>
-        <field:simple field="lsStates" id="c_com_labsynch_labseer_domain_ItxContainerContainer_lsStates" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Container Container State" z="TLS5Je6L4Nuc5CdWbH3rb/NNFcs="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxContainerContainer_deleted" z="Edt9FbhcXmnpgWQ0gjpQm4rMjHM="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ItxContainerContainer" render="${not empty dependencies}" z="eN+8EEzswUnSnXjzSuebfEw7bQg="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxcontainercontainers/findItxContainerContainersByLsTransactionEquals.jspx b/src/main/webapp/WEB-INF/views/itxcontainercontainers/findItxContainerContainersByLsTransactionEquals.jspx
deleted file mode 100755
index f55d14e11..000000000
--- a/src/main/webapp/WEB-INF/views/itxcontainercontainers/findItxContainerContainersByLsTransactionEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTransactionEquals" id="ff_com_labsynch_labseer_domain_ItxContainerContainer" path="/itxcontainercontainers" z="qJFlSkWDQaffhCfLb6QwA3Najn8=">
-        <field:input disableFormBinding="true" field="lsTransaction" id="f_com_labsynch_labseer_domain_ItxContainerContainer_lsTransaction" required="true" validationMessageCode="field_invalid_integer" z="Al8CT1tr7koAo0gYzzZm8h3YhU8="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxcontainercontainers/findItxContainerContainersByLsTypeEqualsAndFirstContainerEquals.jspx b/src/main/webapp/WEB-INF/views/itxcontainercontainers/findItxContainerContainersByLsTypeEqualsAndFirstContainerEquals.jspx
deleted file mode 100644
index f0f454c45..000000000
--- a/src/main/webapp/WEB-INF/views/itxcontainercontainers/findItxContainerContainersByLsTypeEqualsAndFirstContainerEquals.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeEqualsAndFirstContainerEquals" id="ff_com_labsynch_labseer_domain_ItxContainerContainer" path="/itxcontainercontainers" z="YI8tBJi2UevYqE+RNYEA0mglvDk=">
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_ItxContainerContainer_lsType" max="255" required="true" z="vrNjVjELvkahgbde7YszSQxqmow="/>
-        <field:select disableFormBinding="true" field="firstContainer" id="f_com_labsynch_labseer_domain_ItxContainerContainer_firstContainer" itemValue="id" items="${containers}" path="/containers" required="true" z="lhRRFDtu6kCjvGsPZUufrRSFs5o="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxcontainercontainers/findItxContainerContainersByLsTypeEqualsAndSecondContainerEquals.jspx b/src/main/webapp/WEB-INF/views/itxcontainercontainers/findItxContainerContainersByLsTypeEqualsAndSecondContainerEquals.jspx
deleted file mode 100644
index 2dc78b5a3..000000000
--- a/src/main/webapp/WEB-INF/views/itxcontainercontainers/findItxContainerContainersByLsTypeEqualsAndSecondContainerEquals.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeEqualsAndSecondContainerEquals" id="ff_com_labsynch_labseer_domain_ItxContainerContainer" path="/itxcontainercontainers" z="z89SU652U8CuJE9nC0SMMQiiD6g=">
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_ItxContainerContainer_lsType" max="255" required="true" z="vrNjVjELvkahgbde7YszSQxqmow="/>
-        <field:select disableFormBinding="true" field="secondContainer" id="f_com_labsynch_labseer_domain_ItxContainerContainer_secondContainer" itemValue="id" items="${containers}" path="/containers" required="true" z="z1D7DpWhV/j6LHJD2eWl/1QqNtw="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxcontainercontainers/list.jspx b/src/main/webapp/WEB-INF/views/itxcontainercontainers/list.jspx
deleted file mode 100755
index d66b23d53..000000000
--- a/src/main/webapp/WEB-INF/views/itxcontainercontainers/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ItxContainerContainer" items="${itxcontainercontainers}" z="o8QjkfYZCMmW2g3/pL9CALhGSMU=">
-        <table:table data="${itxcontainercontainers}" id="l_com_labsynch_labseer_domain_ItxContainerContainer" path="/itxcontainercontainers" z="9Frx5gL3wQap0RArYZv3hKZub+s=">
-            <table:column id="c_com_labsynch_labseer_domain_ItxContainerContainer_recordedBy" property="recordedBy" z="1Ubu+MBiFlVy3VuY5aphvE0Pr1s="/>
-            <table:column date="true" dateTimePattern="${itxContainerContainer_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_ItxContainerContainer_recordedDate" property="recordedDate" z="tObL4qnnMW9aeDH2DMtrfD90734="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxContainerContainer_codeName" property="codeName" z="cESWuUFWc2VXPysgIPARof9lWq8="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxContainerContainer_lsType" property="lsType" z="svl6YumLkay/Akm0lyItcw1K3OI="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxContainerContainer_lsKind" property="lsKind" z="MR7YJ+Vlu6haVHszFpgtsgGcjvk="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxContainerContainer_lsTypeAndKind" property="lsTypeAndKind" z="EW0vIpwRA5vFfvrBhIC9kZ2MJ54="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxcontainercontainers/show.jspx b/src/main/webapp/WEB-INF/views/itxcontainercontainers/show.jspx
deleted file mode 100755
index f968355b4..000000000
--- a/src/main/webapp/WEB-INF/views/itxcontainercontainers/show.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ItxContainerContainer" object="${itxcontainercontainer}" path="/itxcontainercontainers" z="g7kZfMJq9ICYsA+58mRU5pMbDec=">
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_ItxContainerContainer_recordedBy" object="${itxcontainercontainer}" z="UIsyp1Yt/Vl7n74pjXDSXAi1Aa8="/>
-        <field:display date="true" dateTimePattern="${itxContainerContainer_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_ItxContainerContainer_recordedDate" object="${itxcontainercontainer}" z="RIUKmFHY9+HvhAUhkaW2o8XJMjg="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_ItxContainerContainer_modifiedBy" object="${itxcontainercontainer}" z="LYYeY6kJHCYdFuOyR2pe2YDrh0c="/>
-        <field:display date="true" dateTimePattern="${itxContainerContainer_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_ItxContainerContainer_modifiedDate" object="${itxcontainercontainer}" z="6yOFVgcBo183RzfrUEK/yu/KgbU="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ItxContainerContainer_ignored" object="${itxcontainercontainer}" z="h9xbC3WRzEjN5fR0I1rr+W1cGHs="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_ItxContainerContainer_lsTransaction" object="${itxcontainercontainer}" z="oqeFw+dBFEQ9Tf5QMH2FfeXMMUA="/>
-        <field:display field="firstContainer" id="s_com_labsynch_labseer_domain_ItxContainerContainer_firstContainer" object="${itxcontainercontainer}" z="jTx5QmAkCDz3e/U3//Pz52dlluU="/>
-        <field:display field="secondContainer" id="s_com_labsynch_labseer_domain_ItxContainerContainer_secondContainer" object="${itxcontainercontainer}" z="asQG9Qhmx4bPpbg9OZOLYw6FcDE="/>
-        <field:display field="codeName" id="s_com_labsynch_labseer_domain_ItxContainerContainer_codeName" object="${itxcontainercontainer}" z="IjHxpgjGk5ZHw/rSdnSW1ImfXq4="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ItxContainerContainer_lsType" object="${itxcontainercontainer}" z="phgOTgZhbgiKyDxrF2r70Obaasc="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_ItxContainerContainer_lsKind" object="${itxcontainercontainer}" z="x/zHJaFf5N11Kh5Tnse3eBO3+Z8="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ItxContainerContainer_lsTypeAndKind" object="${itxcontainercontainer}" z="2N2/CKKopNMlrJ9pUGvswCB3OLY="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_ItxContainerContainer_deleted" object="${itxcontainercontainer}" z="0JL3fuvIQ7xcf5ZJ90GUUhN5vC8="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxcontainercontainers/update.jspx b/src/main/webapp/WEB-INF/views/itxcontainercontainers/update.jspx
deleted file mode 100755
index a6afb84f3..000000000
--- a/src/main/webapp/WEB-INF/views/itxcontainercontainers/update.jspx
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ItxContainerContainer" modelAttribute="itxContainerContainer" path="/itxcontainercontainers" versionField="Version" z="1sStRN0L8/xxfIH6ZhkFeScg7yc=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxContainerContainer_recordedBy" required="true" z="8JLib9/WNQiKFCOp9zFvKnf7cTk="/>
-        <field:datetime dateTimePattern="${itxContainerContainer_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxContainerContainer_recordedDate" required="true" z="yIhUA/oEpinvGUsBwVDfR9zVRLY="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxContainerContainer_modifiedBy" z="hLIWyQNtwnOW0UV0lFxnjC7i/xk="/>
-        <field:datetime dateTimePattern="${itxContainerContainer_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxContainerContainer_modifiedDate" z="0x/U3xaJVH88mdpazmU7qMUzV7U="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxContainerContainer_ignored" z="WVb0pylg+aMM4RGdaWV8x6sEfUo="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxContainerContainer_lsTransaction" validationMessageCode="field_invalid_integer" z="0SVu+SZKsq6GY90LBw2tqM5WalQ="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_ItxContainerContainer_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="LuqdDmzDSR1WZuFM4zHdkZtn0p8="/>
-        <field:select field="firstContainer" id="c_com_labsynch_labseer_domain_ItxContainerContainer_firstContainer" itemValue="id" items="${containers}" path="/containers" required="true" z="R9AhGS73XpHhEZHjvPsKo1JEV7w="/>
-        <field:select field="secondContainer" id="c_com_labsynch_labseer_domain_ItxContainerContainer_secondContainer" itemValue="id" items="${containers}" path="/containers" required="true" z="IDy95o60GIjPquhzn8SIXgR9IbE="/>
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_ItxContainerContainer_codeName" z="y1NqCVuyrS7ciqorIyzyXa23LeE="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxContainerContainer_lsType" required="true" z="CNLeTOklOPYz3gZwps/LadorHic="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxContainerContainer_lsKind" required="true" z="9wDaOZigYfKRtZLIR69LPKBv+x8="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxContainerContainer_lsTypeAndKind" z="pPEEbSAraZ77nd7mpOzZQ/Y3wuI="/>
-        <field:simple field="lsStates" id="c_com_labsynch_labseer_domain_ItxContainerContainer_lsStates" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Container Container State" z="TLS5Je6L4Nuc5CdWbH3rb/NNFcs="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxContainerContainer_deleted" z="Edt9FbhcXmnpgWQ0gjpQm4rMjHM="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxcontainercontainers/views.xml b/src/main/webapp/WEB-INF/views/itxcontainercontainers/views.xml
deleted file mode 100755
index 4160de3c3..000000000
--- a/src/main/webapp/WEB-INF/views/itxcontainercontainers/views.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="itxcontainercontainers/list">
-        <put-attribute name="body" value="/WEB-INF/views/itxcontainercontainers/list.jspx"/>
-    </definition>
-<definition extends="default" name="itxcontainercontainers/show">
-        <put-attribute name="body" value="/WEB-INF/views/itxcontainercontainers/show.jspx"/>
-    </definition>
-<definition extends="default" name="itxcontainercontainers/create">
-        <put-attribute name="body" value="/WEB-INF/views/itxcontainercontainers/create.jspx"/>
-    </definition>
-<definition extends="default" name="itxcontainercontainers/update">
-        <put-attribute name="body" value="/WEB-INF/views/itxcontainercontainers/update.jspx"/>
-    </definition>
-<definition extends="default" name="itxcontainercontainers/findItxContainerContainersByLsTransactionEquals">
-        <put-attribute name="body" value="/WEB-INF/views/itxcontainercontainers/findItxContainerContainersByLsTransactionEquals.jspx"/>
-    </definition>
-<definition extends="default" name="itxcontainercontainers/findItxContainerContainersByLsTypeEqualsAndFirstContainerEquals">
-        <put-attribute name="body" value="/WEB-INF/views/itxcontainercontainers/findItxContainerContainersByLsTypeEqualsAndFirstContainerEquals.jspx"/>
-    </definition>
-<definition extends="default" name="itxcontainercontainers/findItxContainerContainersByLsTypeEqualsAndSecondContainerEquals">
-        <put-attribute name="body" value="/WEB-INF/views/itxcontainercontainers/findItxContainerContainersByLsTypeEqualsAndSecondContainerEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/itxcontainercontainerstates/create.jspx b/src/main/webapp/WEB-INF/views/itxcontainercontainerstates/create.jspx
deleted file mode 100755
index 0ad6af0b0..000000000
--- a/src/main/webapp/WEB-INF/views/itxcontainercontainerstates/create.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ItxContainerContainerState" modelAttribute="itxContainerContainerState" path="/itxcontainercontainerstates" render="${empty dependencies}" z="OX6aMpu9xBh/c4YbqrUoIAcFMbw=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxContainerContainerState_recordedBy" required="true" z="hkB9wC967Yr8m3YLPR5+XUlBLEY="/>
-        <field:datetime dateTimePattern="${itxContainerContainerState_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxContainerContainerState_recordedDate" required="true" z="/32OQp5VEvU8HwB8iFYyQLdrKn4="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxContainerContainerState_modifiedBy" z="p0wX66Cs2itq0K7ImvVkV8MXkSQ="/>
-        <field:datetime dateTimePattern="${itxContainerContainerState_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxContainerContainerState_modifiedDate" z="7l8sbbKEFvwg4IlQITa+2ABpyfQ="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ItxContainerContainerState_comments" z="PTkC3E5eE1SjhaQ13+rYBghnGTI="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxContainerContainerState_ignored" z="4h9HOII6/qRBcr9eX1jC12Kf7VM="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxContainerContainerState_lsTransaction" validationMessageCode="field_invalid_integer" z="ZEf9dXtDm9N0iaMT/1iUw0t4lYU="/>
-        <field:select field="itxContainerContainer" id="c_com_labsynch_labseer_domain_ItxContainerContainerState_itxContainerContainer" itemValue="id" items="${itxcontainercontainers}" path="/itxcontainercontainers" z="88SgJ1qrAanste1GM9jW/+IPHAA="/>
-        <field:simple field="lsValues" id="c_com_labsynch_labseer_domain_ItxContainerContainerState_lsValues" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Container Container Value" z="spfhecKhQhzXU0bozEt9z2SN9c8="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxContainerContainerState_lsType" required="true" z="6IdC82kMfgNWRpDHtTjw9jN5wDY="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxContainerContainerState_lsKind" required="true" z="hcmhFzn3wm9ahBGrQxFj1vQ2jlY="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxContainerContainerState_lsTypeAndKind" z="iEebeoWlUPjmSPA06rfhfp8jsrw="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxContainerContainerState_deleted" z="lNX/XtBFaEer2bSIDqPMjpil2pI="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ItxContainerContainerState" render="${not empty dependencies}" z="SR5bB37Hxbzo+aXDCnb1SS+H/S8="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxcontainercontainerstates/list.jspx b/src/main/webapp/WEB-INF/views/itxcontainercontainerstates/list.jspx
deleted file mode 100755
index ea53b2e13..000000000
--- a/src/main/webapp/WEB-INF/views/itxcontainercontainerstates/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ItxContainerContainerState" items="${itxcontainercontainerstates}" z="m8efRj71Z6qTTVYyLICURXki/Zs=">
-        <table:table data="${itxcontainercontainerstates}" id="l_com_labsynch_labseer_domain_ItxContainerContainerState" path="/itxcontainercontainerstates" z="L8tabeWKNHWMDg2idKeqFIOgjLU=">
-            <table:column id="c_com_labsynch_labseer_domain_ItxContainerContainerState_recordedBy" property="recordedBy" z="ITB1touFWnBC5PU+BUrfkBrQaig="/>
-            <table:column date="true" dateTimePattern="${itxContainerContainerState_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_ItxContainerContainerState_recordedDate" property="recordedDate" z="ZK2GT7h407GDm0FKgOMGDo1tWQ0="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxContainerContainerState_modifiedBy" property="modifiedBy" z="lL/bd0ddJ+JZTceyNIY8tmpMsS8="/>
-            <table:column date="true" dateTimePattern="${itxContainerContainerState_modifieddate_date_format}" id="c_com_labsynch_labseer_domain_ItxContainerContainerState_modifiedDate" property="modifiedDate" z="UBH6pTH+c9eesiz/etkrrwAgyZY="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxContainerContainerState_lsType" property="lsType" z="bYDSgqyEn87KksH+5jhrTClkODQ="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxContainerContainerState_lsKind" property="lsKind" z="7cO2C14pqEeFChMK7toLCI79knc="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxcontainercontainerstates/show.jspx b/src/main/webapp/WEB-INF/views/itxcontainercontainerstates/show.jspx
deleted file mode 100755
index e92514634..000000000
--- a/src/main/webapp/WEB-INF/views/itxcontainercontainerstates/show.jspx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ItxContainerContainerState" object="${itxcontainercontainerstate}" path="/itxcontainercontainerstates" z="nVrixWyWOmvdnxr2TAfSdPOXqyA=">
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_ItxContainerContainerState_recordedBy" object="${itxcontainercontainerstate}" z="kX8h06LyOZKKP/ZC9Pi6atksFZ4="/>
-        <field:display date="true" dateTimePattern="${itxContainerContainerState_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_ItxContainerContainerState_recordedDate" object="${itxcontainercontainerstate}" z="a/lGtO735At/dvDvoPGbS9iMs50="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_ItxContainerContainerState_modifiedBy" object="${itxcontainercontainerstate}" z="59rlURubtDaEHyG6F+BPoMvQ9Dc="/>
-        <field:display date="true" dateTimePattern="${itxContainerContainerState_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_ItxContainerContainerState_modifiedDate" object="${itxcontainercontainerstate}" z="gUJwvF8hKmNLDkWvGuFlSQKElSY="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_ItxContainerContainerState_comments" object="${itxcontainercontainerstate}" z="HEgMtZEptu74InNsbIg3dwG0qEE="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ItxContainerContainerState_ignored" object="${itxcontainercontainerstate}" z="wix+GvKzdAT2tctNPqB0GDslB0c="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_ItxContainerContainerState_lsTransaction" object="${itxcontainercontainerstate}" z="dlvModaJVFWTgflz4i5ChgLIT5Q="/>
-        <field:display field="itxContainerContainer" id="s_com_labsynch_labseer_domain_ItxContainerContainerState_itxContainerContainer" object="${itxcontainercontainerstate}" z="DfW0ajkOxV92Dv6mnZHF54XGens="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ItxContainerContainerState_lsType" object="${itxcontainercontainerstate}" z="ZIGjuyhOttuoeZNh8tgiTF0Jp50="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_ItxContainerContainerState_lsKind" object="${itxcontainercontainerstate}" z="z5YDBEBT5eHza0j3jc8dofm1Jss="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ItxContainerContainerState_lsTypeAndKind" object="${itxcontainercontainerstate}" z="3UQ2XnfWv4xRu0u4Q8O1QDbtyUA="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_ItxContainerContainerState_deleted" object="${itxcontainercontainerstate}" z="1fNCn6T/3xyFZ3m3x0LHt8cSV0Q="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxcontainercontainerstates/update.jspx b/src/main/webapp/WEB-INF/views/itxcontainercontainerstates/update.jspx
deleted file mode 100755
index 26de29086..000000000
--- a/src/main/webapp/WEB-INF/views/itxcontainercontainerstates/update.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ItxContainerContainerState" modelAttribute="itxContainerContainerState" path="/itxcontainercontainerstates" versionField="Version" z="/gCZG5Z6MNebJ85pXUE2yKNpoc8=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxContainerContainerState_recordedBy" required="true" z="hkB9wC967Yr8m3YLPR5+XUlBLEY="/>
-        <field:datetime dateTimePattern="${itxContainerContainerState_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxContainerContainerState_recordedDate" required="true" z="/32OQp5VEvU8HwB8iFYyQLdrKn4="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxContainerContainerState_modifiedBy" z="p0wX66Cs2itq0K7ImvVkV8MXkSQ="/>
-        <field:datetime dateTimePattern="${itxContainerContainerState_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxContainerContainerState_modifiedDate" z="7l8sbbKEFvwg4IlQITa+2ABpyfQ="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ItxContainerContainerState_comments" z="PTkC3E5eE1SjhaQ13+rYBghnGTI="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxContainerContainerState_ignored" z="4h9HOII6/qRBcr9eX1jC12Kf7VM="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxContainerContainerState_lsTransaction" validationMessageCode="field_invalid_integer" z="ZEf9dXtDm9N0iaMT/1iUw0t4lYU="/>
-        <field:select field="itxContainerContainer" id="c_com_labsynch_labseer_domain_ItxContainerContainerState_itxContainerContainer" itemValue="id" items="${itxcontainercontainers}" path="/itxcontainercontainers" z="88SgJ1qrAanste1GM9jW/+IPHAA="/>
-        <field:simple field="lsValues" id="c_com_labsynch_labseer_domain_ItxContainerContainerState_lsValues" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Container Container Value" z="spfhecKhQhzXU0bozEt9z2SN9c8="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxContainerContainerState_lsType" required="true" z="6IdC82kMfgNWRpDHtTjw9jN5wDY="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxContainerContainerState_lsKind" required="true" z="hcmhFzn3wm9ahBGrQxFj1vQ2jlY="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxContainerContainerState_lsTypeAndKind" z="iEebeoWlUPjmSPA06rfhfp8jsrw="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxContainerContainerState_deleted" z="lNX/XtBFaEer2bSIDqPMjpil2pI="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxcontainercontainerstates/views.xml b/src/main/webapp/WEB-INF/views/itxcontainercontainerstates/views.xml
deleted file mode 100755
index f34237617..000000000
--- a/src/main/webapp/WEB-INF/views/itxcontainercontainerstates/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="itxcontainercontainerstates/list">
-        <put-attribute name="body" value="/WEB-INF/views/itxcontainercontainerstates/list.jspx"/>
-    </definition>
-<definition extends="default" name="itxcontainercontainerstates/show">
-        <put-attribute name="body" value="/WEB-INF/views/itxcontainercontainerstates/show.jspx"/>
-    </definition>
-<definition extends="default" name="itxcontainercontainerstates/create">
-        <put-attribute name="body" value="/WEB-INF/views/itxcontainercontainerstates/create.jspx"/>
-    </definition>
-<definition extends="default" name="itxcontainercontainerstates/update">
-        <put-attribute name="body" value="/WEB-INF/views/itxcontainercontainerstates/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/itxcontainercontainervalues/create.jspx b/src/main/webapp/WEB-INF/views/itxcontainercontainervalues/create.jspx
deleted file mode 100755
index 0cfed2972..000000000
--- a/src/main/webapp/WEB-INF/views/itxcontainercontainervalues/create.jspx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ItxContainerContainerValue" modelAttribute="itxContainerContainerValue" path="/itxcontainercontainervalues" render="${empty dependencies}" z="4PYKb2bakDWDdNmpx/W1wU4OpHM=">
-        <field:textarea field="stringValue" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_stringValue" z="jUBDpNX9p/zAtOh3waFyGejRo0g="/>
-        <field:textarea field="fileValue" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_fileValue" z="H7xFvTrIGGFxWnyYVm/TAGiEYMo="/>
-        <field:textarea field="urlValue" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_urlValue" z="HrFhJVmpMw9rFIhMOzdDs+zd028="/>
-        <field:datetime dateTimePattern="${itxContainerContainerValue_datevalue_date_format}" field="dateValue" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_dateValue" z="AtAWjHKktfFYuSrz3E4X2SuGnZA="/>
-        <field:input field="clobValue" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_clobValue" z="PvfRCR9ouT81Ss4acRgII7vfwqs="/>
-        <field:input field="blobValue" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_blobValue" z="8eTmrWHrkejjugHislzDo6tqdMs="/>
-        <field:input field="numericValue" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_numericValue" validationMessageCode="field_invalid_number" z="eCZ4LIUn/9zgTE+7mbnsWQG0XFE="/>
-        <field:input field="sigFigs" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_sigFigs" validationMessageCode="field_invalid_integer" z="yuugS44rK1mRqfzGzzGhfDTqW/s="/>
-        <field:input field="uncertainty" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_uncertainty" validationMessageCode="field_invalid_number" z="ZkuKbm/btkUli7A2c6CdfwYzuU4="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_comments" z="2ItJAYTVJ0nNy0L9MnUrOndd0es="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_ignored" z="+WHadPg1So8EOeM+y3lp64fqff0="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_lsTransaction" validationMessageCode="field_invalid_integer" z="tpihT58DorcD1lEq5ddTm47ou9k="/>
-        <field:datetime dateTimePattern="${itxContainerContainerValue_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_recordedDate" required="true" z="6zs+PWVWNjZf/pqJ+4Oq2p4iZvc="/>
-        <field:datetime dateTimePattern="${itxContainerContainerValue_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_modifiedDate" z="EI+sAhVi/RjXbOw9W74V11BM8SA="/>
-        <field:checkbox field="publicData" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_publicData" z="lqBtPQtdIjMCzZAolera2WVbWpA="/>
-        <field:textarea field="codeValue" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_codeValue" z="/lLfQq9ZkoFouKN4SICdkYP9wAE="/>
-        <field:input field="numberOfReplicates" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_numberOfReplicates" validationMessageCode="field_invalid_integer" z="o0lFOybrt8ZBAnQaR7cEbFyhwJA="/>
-        <field:textarea field="uncertaintyType" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_uncertaintyType" z="yP5xMetfukEEul9rmBGcyKVqNeU="/>
-        <field:select field="lsState" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_lsState" itemValue="id" items="${itxcontainercontainerstates}" path="/itxcontainercontainerstates" z="bD2zFlurHSqAy1XGBCU1DYffPOw="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_lsType" required="true" z="z+fEs1YgvfnVGmsnDW5oCeCm3HM="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_lsKind" required="true" z="jWHM64pIZgS9VR5t35eKTH/M+3Q="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_lsTypeAndKind" z="F/aC9WPpRCwxc9nhlsU/3z0DvRA="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_recordedBy" required="true" z="np1TPE2HBRKyGWPqFP1HkIeS498="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_modifiedBy" z="Mc1gmBthZEzS345M7ZgQ0axPDgU="/>
-        <field:input field="operatorType" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_operatorType" max="25" z="4MTb0IDsWdyf3AhMkcSxxe4foB8="/>
-        <field:input field="operatorKind" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_operatorKind" max="10" z="gsBAcL1V8osdgPUbSZ5MtCEeD1o="/>
-        <field:textarea field="operatorTypeAndKind" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_operatorTypeAndKind" z="rcrLAW7t89+Wvilr8+SedUyRRGs="/>
-        <field:input field="unitType" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_unitType" max="25" z="626jx6wU+sREgonMPQSGA3K1unU="/>
-        <field:input field="unitKind" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_unitKind" max="25" z="jk/htOJG79pd4NzT1CyyiVOeQhU="/>
-        <field:textarea field="unitTypeAndKind" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_unitTypeAndKind" z="tMWfbZ4Ay5SygkQ8FIhpRuF5huE="/>
-        <field:textarea field="codeType" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_codeType" z="eJLeyghb+5CCMe0fD0+dGjldr/w="/>
-        <field:textarea field="codeKind" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_codeKind" z="ubIR/r7WazpiH56kDSRuiuqFYA8="/>
-        <field:textarea field="codeTypeAndKind" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_codeTypeAndKind" z="scAwejhZP9MH1TnTKV/HSi7iICI="/>
-        <field:textarea field="codeOrigin" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_codeOrigin" z="Qn/HexCmrvOML1tNr/HTnn5AFdQ="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_deleted" z="bdzTIJFN82iNcr8GD0TjqPMHlqY="/>
-        <field:input field="concentration" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_concentration" validationMessageCode="field_invalid_number" z="oggPsNaDoJ0TQDWTTSjXVm2IRYg="/>
-        <field:input field="concUnit" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_concUnit" max="25" z="nePKKERT8yZ3Rx9zmCHJyCuPV9E="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ItxContainerContainerValue" render="${not empty dependencies}" z="mJpRKaNtVbIqcjNyrB8Yy9sKRoQ="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxcontainercontainervalues/list.jspx b/src/main/webapp/WEB-INF/views/itxcontainercontainervalues/list.jspx
deleted file mode 100755
index 223dd9b7b..000000000
--- a/src/main/webapp/WEB-INF/views/itxcontainercontainervalues/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ItxContainerContainerValue" items="${itxcontainercontainervalues}" z="pRigLD2fZPjRFdEFixRQL2/j178=">
-        <table:table data="${itxcontainercontainervalues}" id="l_com_labsynch_labseer_domain_ItxContainerContainerValue" path="/itxcontainercontainervalues" z="0wQVO4YzoWLGFw+E8hJ19is/cHA=">
-            <table:column id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_lsType" property="lsType" z="K8uNgTuHb6tn7P/KA/iTPYjwQdM="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_lsKind" property="lsKind" z="jdPDWj9+Wx0DbN0MUK904XALu8c="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_lsTypeAndKind" property="lsTypeAndKind" z="pTM89VyW2Kih7312pa/w9bwLpX8="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_ignored" property="ignored" z="TSECezyLXBNcnrLQdCDFnK3AEHM="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_publicData" property="publicData" z="mg8pl37gd7fWjt1YT7gBZk65XaY="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_deleted" property="deleted" z="365sKXYJd9qVxb/Zqqp+jA3C/og="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxcontainercontainervalues/show.jspx b/src/main/webapp/WEB-INF/views/itxcontainercontainervalues/show.jspx
deleted file mode 100755
index d2fbfee96..000000000
--- a/src/main/webapp/WEB-INF/views/itxcontainercontainervalues/show.jspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ItxContainerContainerValue" object="${itxcontainercontainervalue}" path="/itxcontainercontainervalues" z="MWui7A292Rs5incYUb9rVdaFn0c=">
-        <field:display field="stringValue" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_stringValue" object="${itxcontainercontainervalue}" z="bljY59smYHWMFFcxYK5Opz8/68Y="/>
-        <field:display field="fileValue" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_fileValue" object="${itxcontainercontainervalue}" z="qVhDgjfNuqoHdMgY+FSjbL1NFT0="/>
-        <field:display field="urlValue" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_urlValue" object="${itxcontainercontainervalue}" z="SlnVEIgedM+ff22GR8k1FvH69yI="/>
-        <field:display date="true" dateTimePattern="${itxContainerContainerValue_datevalue_date_format}" field="dateValue" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_dateValue" object="${itxcontainercontainervalue}" z="7vqd2dURabNlhNgdHz67H8s5XlA="/>
-        <field:display field="clobValue" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_clobValue" object="${itxcontainercontainervalue}" z="ppj7KKXsh46gcYvUBI7PjttRzZM="/>
-        <field:display field="blobValue" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_blobValue" object="${itxcontainercontainervalue}" z="e2VFYTbTykVNbPD03Ym1eAn8YE8="/>
-        <field:display field="numericValue" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_numericValue" object="${itxcontainercontainervalue}" z="56mZ+rC4sALXvkDRzLCV1qexeBo="/>
-        <field:display field="sigFigs" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_sigFigs" object="${itxcontainercontainervalue}" z="5B9KjsskraM2sWxv8PugvPQse6A="/>
-        <field:display field="uncertainty" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_uncertainty" object="${itxcontainercontainervalue}" z="+LBBVVK8QTLMCU4Co4M3QiMuXv8="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_comments" object="${itxcontainercontainervalue}" z="kL25pHdFqN62GEdgUSdiQegxrcU="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_ignored" object="${itxcontainercontainervalue}" z="5EfmNJgFvBrMQ5DPuqfaC03Wf4g="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_lsTransaction" object="${itxcontainercontainervalue}" z="oOTlCwDp5El0pHNBZlzGLIYuSzo="/>
-        <field:display date="true" dateTimePattern="${itxContainerContainerValue_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_recordedDate" object="${itxcontainercontainervalue}" z="wxkZwQYoaskZAnFgOwIKusg4oH4="/>
-        <field:display date="true" dateTimePattern="${itxContainerContainerValue_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_modifiedDate" object="${itxcontainercontainervalue}" z="acnhmlURHZ4fnxNLO4BdHuaRKAk="/>
-        <field:display field="publicData" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_publicData" object="${itxcontainercontainervalue}" z="O4e5osh8hVq+q4SWH7hL+MnQbKg="/>
-        <field:display field="codeValue" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_codeValue" object="${itxcontainercontainervalue}" z="lXso8Tr4O+HKn6vn+n85g/aQnq8="/>
-        <field:display field="numberOfReplicates" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_numberOfReplicates" object="${itxcontainercontainervalue}" z="gzArPZ78Qr1HfvaoXCl0lBwSjRw="/>
-        <field:display field="uncertaintyType" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_uncertaintyType" object="${itxcontainercontainervalue}" z="pvEybq2mE0ElwMLBfybqMtYu0Ws="/>
-        <field:display field="lsState" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_lsState" object="${itxcontainercontainervalue}" z="KxStsK7QZ6F6V50XEOQ3kPHumRI="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_lsType" object="${itxcontainercontainervalue}" z="cf6KCh3upsX7H6UHq6PhagEjFYw="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_lsKind" object="${itxcontainercontainervalue}" z="bZOrfoihc6KMQ2OPgTyHRYaSpmw="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_lsTypeAndKind" object="${itxcontainercontainervalue}" z="E9EI/E5N8s4buh0DpXyBvGBFpxY="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_recordedBy" object="${itxcontainercontainervalue}" z="HbNCEjRZNGv8R/dGWVbOHeOacto="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_modifiedBy" object="${itxcontainercontainervalue}" z="WEo03IuzpmRgZszKmwXBHKg5hAw="/>
-        <field:display field="operatorType" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_operatorType" object="${itxcontainercontainervalue}" z="7nBIQbmUHlTiyrcJcc1QnTOYRds="/>
-        <field:display field="operatorKind" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_operatorKind" object="${itxcontainercontainervalue}" z="gnKejR7zLOPIzZfN272S1phWdwo="/>
-        <field:display field="operatorTypeAndKind" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_operatorTypeAndKind" object="${itxcontainercontainervalue}" z="AZ63ObW7RSqOGfSzTjnuGWiiIcY="/>
-        <field:display field="unitType" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_unitType" object="${itxcontainercontainervalue}" z="eAGTR+RoVesHQg4gdCEbcgSvCB4="/>
-        <field:display field="unitKind" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_unitKind" object="${itxcontainercontainervalue}" z="fNBEv3R88CfAGnluQVvH+koZRzA="/>
-        <field:display field="unitTypeAndKind" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_unitTypeAndKind" object="${itxcontainercontainervalue}" z="h9Cpth4i8PYiJ/eIK/I4NX5wFIw="/>
-        <field:display field="codeType" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_codeType" object="${itxcontainercontainervalue}" z="8PygU8hKyuKkopc6Z6vc9qntLhw="/>
-        <field:display field="codeKind" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_codeKind" object="${itxcontainercontainervalue}" z="d80Db2vIjK/KVhTd33fvooH7aQo="/>
-        <field:display field="codeTypeAndKind" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_codeTypeAndKind" object="${itxcontainercontainervalue}" z="M8VC1GtGWvWQh5ruEsLdpN+kHxI="/>
-        <field:display field="codeOrigin" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_codeOrigin" object="${itxcontainercontainervalue}" z="tIDFM9LUNHPiAgZEb5amSvXcMFI="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_deleted" object="${itxcontainercontainervalue}" z="cKcuC+8706eKShfYq90GRiYkfoI="/>
-        <field:display field="concentration" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_concentration" object="${itxcontainercontainervalue}" z="3mUSm/qiuhiIdzh1So9BYTF6v8o="/>
-        <field:display field="concUnit" id="s_com_labsynch_labseer_domain_ItxContainerContainerValue_concUnit" object="${itxcontainercontainervalue}" z="w3ayii4+fqVWnHAeB1UdLJ7gZ7M="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxcontainercontainervalues/update.jspx b/src/main/webapp/WEB-INF/views/itxcontainercontainervalues/update.jspx
deleted file mode 100755
index 65e4709c4..000000000
--- a/src/main/webapp/WEB-INF/views/itxcontainercontainervalues/update.jspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ItxContainerContainerValue" modelAttribute="itxContainerContainerValue" path="/itxcontainercontainervalues" versionField="Version" z="eCLVC+yDLhoy+XT3pZpuRLRQ+9Y=">
-        <field:textarea field="stringValue" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_stringValue" z="jUBDpNX9p/zAtOh3waFyGejRo0g="/>
-        <field:textarea field="fileValue" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_fileValue" z="H7xFvTrIGGFxWnyYVm/TAGiEYMo="/>
-        <field:textarea field="urlValue" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_urlValue" z="HrFhJVmpMw9rFIhMOzdDs+zd028="/>
-        <field:datetime dateTimePattern="${itxContainerContainerValue_datevalue_date_format}" field="dateValue" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_dateValue" z="AtAWjHKktfFYuSrz3E4X2SuGnZA="/>
-        <field:input field="clobValue" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_clobValue" z="PvfRCR9ouT81Ss4acRgII7vfwqs="/>
-        <field:input field="blobValue" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_blobValue" z="8eTmrWHrkejjugHislzDo6tqdMs="/>
-        <field:input field="numericValue" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_numericValue" validationMessageCode="field_invalid_number" z="eCZ4LIUn/9zgTE+7mbnsWQG0XFE="/>
-        <field:input field="sigFigs" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_sigFigs" validationMessageCode="field_invalid_integer" z="yuugS44rK1mRqfzGzzGhfDTqW/s="/>
-        <field:input field="uncertainty" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_uncertainty" validationMessageCode="field_invalid_number" z="ZkuKbm/btkUli7A2c6CdfwYzuU4="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_comments" z="2ItJAYTVJ0nNy0L9MnUrOndd0es="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_ignored" z="+WHadPg1So8EOeM+y3lp64fqff0="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_lsTransaction" validationMessageCode="field_invalid_integer" z="tpihT58DorcD1lEq5ddTm47ou9k="/>
-        <field:datetime dateTimePattern="${itxContainerContainerValue_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_recordedDate" required="true" z="6zs+PWVWNjZf/pqJ+4Oq2p4iZvc="/>
-        <field:datetime dateTimePattern="${itxContainerContainerValue_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_modifiedDate" z="EI+sAhVi/RjXbOw9W74V11BM8SA="/>
-        <field:checkbox field="publicData" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_publicData" z="lqBtPQtdIjMCzZAolera2WVbWpA="/>
-        <field:textarea field="codeValue" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_codeValue" z="/lLfQq9ZkoFouKN4SICdkYP9wAE="/>
-        <field:input field="numberOfReplicates" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_numberOfReplicates" validationMessageCode="field_invalid_integer" z="o0lFOybrt8ZBAnQaR7cEbFyhwJA="/>
-        <field:textarea field="uncertaintyType" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_uncertaintyType" z="yP5xMetfukEEul9rmBGcyKVqNeU="/>
-        <field:select field="lsState" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_lsState" itemValue="id" items="${itxcontainercontainerstates}" path="/itxcontainercontainerstates" z="bD2zFlurHSqAy1XGBCU1DYffPOw="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_lsType" required="true" z="z+fEs1YgvfnVGmsnDW5oCeCm3HM="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_lsKind" required="true" z="jWHM64pIZgS9VR5t35eKTH/M+3Q="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_lsTypeAndKind" z="F/aC9WPpRCwxc9nhlsU/3z0DvRA="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_recordedBy" required="true" z="np1TPE2HBRKyGWPqFP1HkIeS498="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_modifiedBy" z="Mc1gmBthZEzS345M7ZgQ0axPDgU="/>
-        <field:input field="operatorType" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_operatorType" max="25" z="4MTb0IDsWdyf3AhMkcSxxe4foB8="/>
-        <field:input field="operatorKind" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_operatorKind" max="10" z="gsBAcL1V8osdgPUbSZ5MtCEeD1o="/>
-        <field:textarea field="operatorTypeAndKind" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_operatorTypeAndKind" z="rcrLAW7t89+Wvilr8+SedUyRRGs="/>
-        <field:input field="unitType" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_unitType" max="25" z="626jx6wU+sREgonMPQSGA3K1unU="/>
-        <field:input field="unitKind" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_unitKind" max="25" z="jk/htOJG79pd4NzT1CyyiVOeQhU="/>
-        <field:textarea field="unitTypeAndKind" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_unitTypeAndKind" z="tMWfbZ4Ay5SygkQ8FIhpRuF5huE="/>
-        <field:textarea field="codeType" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_codeType" z="eJLeyghb+5CCMe0fD0+dGjldr/w="/>
-        <field:textarea field="codeKind" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_codeKind" z="ubIR/r7WazpiH56kDSRuiuqFYA8="/>
-        <field:textarea field="codeTypeAndKind" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_codeTypeAndKind" z="scAwejhZP9MH1TnTKV/HSi7iICI="/>
-        <field:textarea field="codeOrigin" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_codeOrigin" z="Qn/HexCmrvOML1tNr/HTnn5AFdQ="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_deleted" z="bdzTIJFN82iNcr8GD0TjqPMHlqY="/>
-        <field:input field="concentration" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_concentration" validationMessageCode="field_invalid_number" z="oggPsNaDoJ0TQDWTTSjXVm2IRYg="/>
-        <field:input field="concUnit" id="c_com_labsynch_labseer_domain_ItxContainerContainerValue_concUnit" max="25" z="nePKKERT8yZ3Rx9zmCHJyCuPV9E="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxcontainercontainervalues/views.xml b/src/main/webapp/WEB-INF/views/itxcontainercontainervalues/views.xml
deleted file mode 100755
index 17103ed1f..000000000
--- a/src/main/webapp/WEB-INF/views/itxcontainercontainervalues/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="itxcontainercontainervalues/list">
-        <put-attribute name="body" value="/WEB-INF/views/itxcontainercontainervalues/list.jspx"/>
-    </definition>
-<definition extends="default" name="itxcontainercontainervalues/show">
-        <put-attribute name="body" value="/WEB-INF/views/itxcontainercontainervalues/show.jspx"/>
-    </definition>
-<definition extends="default" name="itxcontainercontainervalues/create">
-        <put-attribute name="body" value="/WEB-INF/views/itxcontainercontainervalues/create.jspx"/>
-    </definition>
-<definition extends="default" name="itxcontainercontainervalues/update">
-        <put-attribute name="body" value="/WEB-INF/views/itxcontainercontainervalues/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/itxexperimentexperiments/create.jspx b/src/main/webapp/WEB-INF/views/itxexperimentexperiments/create.jspx
deleted file mode 100644
index 6cfe0435a..000000000
--- a/src/main/webapp/WEB-INF/views/itxexperimentexperiments/create.jspx
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ItxExperimentExperiment" modelAttribute="itxExperimentExperiment" path="/itxexperimentexperiments" render="${empty dependencies}" z="Cr/ISNHQTj2rk3LqVzOYwxXRyB8=">
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_lsType" required="true" z="1SsaQGSqcQ3vPe2DOES0+sMn6pM="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_lsKind" required="true" z="wQF3iQ39dJHkHsEq6xuqbAfGfVk="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_lsTypeAndKind" z="yY1XqDUNc75qZH6a66cG/letayU="/>
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_codeName" z="sGGBqvoDZuUykFs/qePwodL9H1I="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_recordedBy" required="true" z="W1op9vqIv8U7r4q2V0xoMpTj3gE="/>
-        <field:datetime dateTimePattern="${itxExperimentExperiment_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_recordedDate" required="true" z="VptWeqkGZtvCB15prNQH/8gdbCE="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_modifiedBy" z="zHUshyv2WmBXmkceMZ4sd43+wbM="/>
-        <field:datetime dateTimePattern="${itxExperimentExperiment_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_modifiedDate" z="guMyfo+VopG9lP1au+jqA6ViHEY="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_ignored" z="v4aAsKH5Q6uXwqe29pTzbcICzk8="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_lsTransaction" validationMessageCode="field_invalid_integer" z="q+4Z2jAl6kW/Pl5l4ZdBcgkutCc="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="vGOp1USusLLoJEvfWYdW7AZ603s="/>
-        <field:select field="firstExperiment" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_firstExperiment" itemValue="id" items="${experiments}" path="/experiments" required="true" z="NywBRbZu8ZDVlvdNSHqZoTgfhPY="/>
-        <field:select field="secondExperiment" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_secondExperiment" itemValue="id" items="${experiments}" path="/experiments" required="true" z="XgtOPfdt25SbfgSN4BWERVo9laE="/>
-        <field:simple field="lsStates" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_lsStates" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Experiment Experiment State" z="EEV9/f5KgerjltG5g1Mmxbvobn4="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_deleted" z="DQgwSjC7GazTctTEXJheWm0k7Ro="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ItxExperimentExperiment" render="${not empty dependencies}" z="t4FujWWWZWSWZC+4dFFzzSMSX6o="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxexperimentexperiments/findItxExperimentExperimentsByFirstExperiment.jspx b/src/main/webapp/WEB-INF/views/itxexperimentexperiments/findItxExperimentExperimentsByFirstExperiment.jspx
deleted file mode 100644
index 170529d04..000000000
--- a/src/main/webapp/WEB-INF/views/itxexperimentexperiments/findItxExperimentExperimentsByFirstExperiment.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByFirstExperiment" id="ff_com_labsynch_labseer_domain_ItxExperimentExperiment" path="/itxexperimentexperiments" z="Cy9ceFupkM9w0cn0FYwv7En34Ro=">
-        <field:select disableFormBinding="true" field="firstExperiment" id="f_com_labsynch_labseer_domain_ItxExperimentExperiment_firstExperiment" itemValue="id" items="${experiments}" path="/experiments" required="true" z="jM6oeW+KsMynRUtyq1kvy/C5yrM="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxexperimentexperiments/findItxExperimentExperimentsByLsTransactionEquals.jspx b/src/main/webapp/WEB-INF/views/itxexperimentexperiments/findItxExperimentExperimentsByLsTransactionEquals.jspx
deleted file mode 100644
index fffaeecfb..000000000
--- a/src/main/webapp/WEB-INF/views/itxexperimentexperiments/findItxExperimentExperimentsByLsTransactionEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTransactionEquals" id="ff_com_labsynch_labseer_domain_ItxExperimentExperiment" path="/itxexperimentexperiments" z="MMIiA5vFF/dN9UXIQ4kJwuntQUE=">
-        <field:input disableFormBinding="true" field="lsTransaction" id="f_com_labsynch_labseer_domain_ItxExperimentExperiment_lsTransaction" required="true" validationMessageCode="field_invalid_integer" z="xLwBungrCgeSGd8tKhJNGFC5vRQ="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxexperimentexperiments/findItxExperimentExperimentsBySecondExperiment.jspx b/src/main/webapp/WEB-INF/views/itxexperimentexperiments/findItxExperimentExperimentsBySecondExperiment.jspx
deleted file mode 100644
index e5d25885e..000000000
--- a/src/main/webapp/WEB-INF/views/itxexperimentexperiments/findItxExperimentExperimentsBySecondExperiment.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="BySecondExperiment" id="ff_com_labsynch_labseer_domain_ItxExperimentExperiment" path="/itxexperimentexperiments" z="7ABuvnKIeA4FuTWsgPfH03p+9Mc=">
-        <field:select disableFormBinding="true" field="secondExperiment" id="f_com_labsynch_labseer_domain_ItxExperimentExperiment_secondExperiment" itemValue="id" items="${experiments}" path="/experiments" required="true" z="uBSAZ2T5sIZocah2Cs79KOMvPRg="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxexperimentexperiments/list.jspx b/src/main/webapp/WEB-INF/views/itxexperimentexperiments/list.jspx
deleted file mode 100644
index e9b5fb447..000000000
--- a/src/main/webapp/WEB-INF/views/itxexperimentexperiments/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ItxExperimentExperiment" items="${itxexperimentexperiments}" z="u2T0ceQmQQ5Z6clOGeBgod/v83s=">
-        <table:table data="${itxexperimentexperiments}" id="l_com_labsynch_labseer_domain_ItxExperimentExperiment" path="/itxexperimentexperiments" z="yrAhm0qp6AGmQbXM9k2hZbtOUY0=">
-            <table:column id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_lsType" property="lsType" z="bbITyGAuRUfxdYFOsRRks5ecF88="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_lsKind" property="lsKind" z="vn3hqYbpjbiYE9tQy2ADMLUdUnM="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_lsTypeAndKind" property="lsTypeAndKind" z="FaqI1Kk8r5kaUETojHig8rrYYgw="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_codeName" property="codeName" z="Iiq4gd+nbAjAwVelt9+HUgENFbo="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_recordedBy" property="recordedBy" z="65v2Gc4I+Tsx9LKzH5kiAuV7sck="/>
-            <table:column date="true" dateTimePattern="${itxExperimentExperiment_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_recordedDate" property="recordedDate" z="DsF/YFTNSb2HwsG3BMle7Dnolwk="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxexperimentexperiments/show.jspx b/src/main/webapp/WEB-INF/views/itxexperimentexperiments/show.jspx
deleted file mode 100644
index 8a210251c..000000000
--- a/src/main/webapp/WEB-INF/views/itxexperimentexperiments/show.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ItxExperimentExperiment" object="${itxexperimentexperiment}" path="/itxexperimentexperiments" z="9bhrYkr9ZeQOnk0sn/M4IF35WEM=">
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ItxExperimentExperiment_lsType" object="${itxexperimentexperiment}" z="LGewuUfq/PijhDFt30Sb2EQQA3g="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_ItxExperimentExperiment_lsKind" object="${itxexperimentexperiment}" z="X7bm0bGqvCtjP7iiaFAw1SkN87M="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ItxExperimentExperiment_lsTypeAndKind" object="${itxexperimentexperiment}" z="pC5nZ0iRNsXeByj0Qmzzj9V3dTs="/>
-        <field:display field="codeName" id="s_com_labsynch_labseer_domain_ItxExperimentExperiment_codeName" object="${itxexperimentexperiment}" z="kCRRDs3v7XJ437w4oyjaiF0GUG4="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_ItxExperimentExperiment_recordedBy" object="${itxexperimentexperiment}" z="+Kfrrp2PDRnBfvn5xuQut+HROnM="/>
-        <field:display date="true" dateTimePattern="${itxExperimentExperiment_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_ItxExperimentExperiment_recordedDate" object="${itxexperimentexperiment}" z="2UCHIF63ywFwiwIhL3n7Nf6ZQ0Y="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_ItxExperimentExperiment_modifiedBy" object="${itxexperimentexperiment}" z="B+1kej/6u9UcKws3QRlEsyWpLyU="/>
-        <field:display date="true" dateTimePattern="${itxExperimentExperiment_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_ItxExperimentExperiment_modifiedDate" object="${itxexperimentexperiment}" z="JXwViX9B7z53G/0HQx4GxPNLeLs="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ItxExperimentExperiment_ignored" object="${itxexperimentexperiment}" z="F/m6HWHWoRtdMG0TaqZEzLoFDOk="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_ItxExperimentExperiment_lsTransaction" object="${itxexperimentexperiment}" z="vYJ29UGkbCrCVHy6J/eYMD6Hx1Q="/>
-        <field:display field="firstExperiment" id="s_com_labsynch_labseer_domain_ItxExperimentExperiment_firstExperiment" object="${itxexperimentexperiment}" z="Gaaj4fsOYfSEDAlyPKeaSEy3Zgg="/>
-        <field:display field="secondExperiment" id="s_com_labsynch_labseer_domain_ItxExperimentExperiment_secondExperiment" object="${itxexperimentexperiment}" z="QZkBUNYfVTjQGKiYOfyC17xuZJk="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_ItxExperimentExperiment_deleted" object="${itxexperimentexperiment}" z="MelKTo/oIqPk799M4diXIhlpeNg="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxexperimentexperiments/update.jspx b/src/main/webapp/WEB-INF/views/itxexperimentexperiments/update.jspx
deleted file mode 100644
index 273cfc8bf..000000000
--- a/src/main/webapp/WEB-INF/views/itxexperimentexperiments/update.jspx
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ItxExperimentExperiment" modelAttribute="itxExperimentExperiment" path="/itxexperimentexperiments" versionField="Version" z="PON6j2UTWxi3eweL/GfZXsD5OvA=">
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_lsType" required="true" z="1SsaQGSqcQ3vPe2DOES0+sMn6pM="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_lsKind" required="true" z="wQF3iQ39dJHkHsEq6xuqbAfGfVk="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_lsTypeAndKind" z="yY1XqDUNc75qZH6a66cG/letayU="/>
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_codeName" z="sGGBqvoDZuUykFs/qePwodL9H1I="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_recordedBy" required="true" z="W1op9vqIv8U7r4q2V0xoMpTj3gE="/>
-        <field:datetime dateTimePattern="${itxExperimentExperiment_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_recordedDate" required="true" z="VptWeqkGZtvCB15prNQH/8gdbCE="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_modifiedBy" z="zHUshyv2WmBXmkceMZ4sd43+wbM="/>
-        <field:datetime dateTimePattern="${itxExperimentExperiment_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_modifiedDate" z="guMyfo+VopG9lP1au+jqA6ViHEY="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_ignored" z="v4aAsKH5Q6uXwqe29pTzbcICzk8="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_lsTransaction" validationMessageCode="field_invalid_integer" z="q+4Z2jAl6kW/Pl5l4ZdBcgkutCc="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="vGOp1USusLLoJEvfWYdW7AZ603s="/>
-        <field:select field="firstExperiment" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_firstExperiment" itemValue="id" items="${experiments}" path="/experiments" required="true" z="NywBRbZu8ZDVlvdNSHqZoTgfhPY="/>
-        <field:select field="secondExperiment" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_secondExperiment" itemValue="id" items="${experiments}" path="/experiments" required="true" z="XgtOPfdt25SbfgSN4BWERVo9laE="/>
-        <field:simple field="lsStates" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_lsStates" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Experiment Experiment State" z="EEV9/f5KgerjltG5g1Mmxbvobn4="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxExperimentExperiment_deleted" z="DQgwSjC7GazTctTEXJheWm0k7Ro="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxexperimentexperiments/views.xml b/src/main/webapp/WEB-INF/views/itxexperimentexperiments/views.xml
deleted file mode 100644
index 8e03d8561..000000000
--- a/src/main/webapp/WEB-INF/views/itxexperimentexperiments/views.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="itxexperimentexperiments/list">
-        <put-attribute name="body" value="/WEB-INF/views/itxexperimentexperiments/list.jspx"/>
-    </definition>
-<definition extends="default" name="itxexperimentexperiments/show">
-        <put-attribute name="body" value="/WEB-INF/views/itxexperimentexperiments/show.jspx"/>
-    </definition>
-<definition extends="default" name="itxexperimentexperiments/create">
-        <put-attribute name="body" value="/WEB-INF/views/itxexperimentexperiments/create.jspx"/>
-    </definition>
-<definition extends="default" name="itxexperimentexperiments/update">
-        <put-attribute name="body" value="/WEB-INF/views/itxexperimentexperiments/update.jspx"/>
-    </definition>
-<definition extends="default" name="itxexperimentexperiments/findItxExperimentExperimentsByFirstExperiment">
-        <put-attribute name="body" value="/WEB-INF/views/itxexperimentexperiments/findItxExperimentExperimentsByFirstExperiment.jspx"/>
-    </definition>
-<definition extends="default" name="itxexperimentexperiments/findItxExperimentExperimentsByLsTransactionEquals">
-        <put-attribute name="body" value="/WEB-INF/views/itxexperimentexperiments/findItxExperimentExperimentsByLsTransactionEquals.jspx"/>
-    </definition>
-<definition extends="default" name="itxexperimentexperiments/findItxExperimentExperimentsBySecondExperiment">
-        <put-attribute name="body" value="/WEB-INF/views/itxexperimentexperiments/findItxExperimentExperimentsBySecondExperiment.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/itxexperimentexperimentstates/create.jspx b/src/main/webapp/WEB-INF/views/itxexperimentexperimentstates/create.jspx
deleted file mode 100644
index 916e3b921..000000000
--- a/src/main/webapp/WEB-INF/views/itxexperimentexperimentstates/create.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ItxExperimentExperimentState" modelAttribute="itxExperimentExperimentState" path="/itxexperimentexperimentstates" render="${empty dependencies}" z="6m1pawXANMBO9qIO90zABTSsvhA=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_recordedBy" required="true" z="kNUSCR6nyqWwYQiEz+vzFPCxhcc="/>
-        <field:datetime dateTimePattern="${itxExperimentExperimentState_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_recordedDate" required="true" z="chmS56pfSCWoyEWOJyMLUfsGgs8="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_modifiedBy" z="xTNW0C/Ml+yu6qWSA2nnsXg+mCE="/>
-        <field:datetime dateTimePattern="${itxExperimentExperimentState_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_modifiedDate" z="KWXbD7dH3WaMl3f04P7QtkFuD5Q="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_lsType" required="true" z="3tVJSwvYyMErRnLK5EbGUXYJLPY="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_lsKind" required="true" z="Y3Wu8oQyRLEE1wuuicnTIZ7POHU="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_lsTypeAndKind" z="nQ+UXndlcROD3BsJV1xtxDw/uGM="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_comments" z="cjqwQ4EngtM/02BK/5KxgG/9WRU="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_ignored" z="D70TYmT9U9dPsNwyrWYTBy5vAVA="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_lsTransaction" validationMessageCode="field_invalid_integer" z="ae2TBUExEJh/FAyEEmz0FsEGHq4="/>
-        <field:select field="itxExperimentExperiment" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_itxExperimentExperiment" itemValue="id" items="${itxexperimentexperiments}" path="/itxexperimentexperiments" z="5u+qWhNaT7fYU7hAvLPAsdr9Tao="/>
-        <field:simple field="lsValues" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_lsValues" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Experiment Experiment Value" z="oGMxTG25WPCFJokq5TOBJV9QoAQ="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_deleted" z="isuDaElFLpDcUAbT7Tcs2819NM8="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ItxExperimentExperimentState" render="${not empty dependencies}" z="KvqmNFvkU3ipnxcxsWiMXB2DgXc="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxexperimentexperimentstates/list.jspx b/src/main/webapp/WEB-INF/views/itxexperimentexperimentstates/list.jspx
deleted file mode 100644
index cc6bc1e32..000000000
--- a/src/main/webapp/WEB-INF/views/itxexperimentexperimentstates/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ItxExperimentExperimentState" items="${itxexperimentexperimentstates}" z="4aC5DJEoutlushqWbCFvVtPOASY=">
-        <table:table data="${itxexperimentexperimentstates}" id="l_com_labsynch_labseer_domain_ItxExperimentExperimentState" path="/itxexperimentexperimentstates" z="iNXmdYTM8k20qZW8tE/XzTpOnVw=">
-            <table:column id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_recordedBy" property="recordedBy" z="roNEiFkgEeTZu+twHnvZGI6zRc0="/>
-            <table:column date="true" dateTimePattern="${itxExperimentExperimentState_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_recordedDate" property="recordedDate" z="aqr2IXdSVX736t/xrms/InaZqg8="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_modifiedBy" property="modifiedBy" z="tsn9H0NTjCQaikv3CQ4EatnBzJI="/>
-            <table:column date="true" dateTimePattern="${itxExperimentExperimentState_modifieddate_date_format}" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_modifiedDate" property="modifiedDate" z="2oQa/u1EYQ+vCJelfoGwXMLw/9E="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_lsType" property="lsType" z="oZYttgqwxJjDc0hZMOugwo2wfKE="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_lsKind" property="lsKind" z="dLOUUFM/RqQxTDA/P0rvsbIRKA0="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxexperimentexperimentstates/show.jspx b/src/main/webapp/WEB-INF/views/itxexperimentexperimentstates/show.jspx
deleted file mode 100644
index 9b2efd1fa..000000000
--- a/src/main/webapp/WEB-INF/views/itxexperimentexperimentstates/show.jspx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ItxExperimentExperimentState" object="${itxexperimentexperimentstate}" path="/itxexperimentexperimentstates" z="LX3MHulWTRVynwZkxkHZSu1CTjc=">
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentState_recordedBy" object="${itxexperimentexperimentstate}" z="T/SkhQD/CSQSHoVw8J2SFY3vA/w="/>
-        <field:display date="true" dateTimePattern="${itxExperimentExperimentState_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentState_recordedDate" object="${itxexperimentexperimentstate}" z="XKrD5sQH3xIfc6lHTsmT07Y566w="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentState_modifiedBy" object="${itxexperimentexperimentstate}" z="IL3R4x1doiWccxUvDIJiNzjZTuc="/>
-        <field:display date="true" dateTimePattern="${itxExperimentExperimentState_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentState_modifiedDate" object="${itxexperimentexperimentstate}" z="x54NlRh2nmB2mO8Cfi4m7xom3u8="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentState_lsType" object="${itxexperimentexperimentstate}" z="Keu3bgo1E7ML3dxN5/HIAQgqVLk="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentState_lsKind" object="${itxexperimentexperimentstate}" z="YJR6NDCe09VsEo7Od/CqMdH3/kI="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentState_lsTypeAndKind" object="${itxexperimentexperimentstate}" z="cNUOXiIP6Yw0ksIOPQkd+cgX9q0="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentState_comments" object="${itxexperimentexperimentstate}" z="fClsHPBcleDEYZkxWy1roh+OW4g="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentState_ignored" object="${itxexperimentexperimentstate}" z="ZzJcVZVNIkhppMUvtCULrZwHgKw="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentState_lsTransaction" object="${itxexperimentexperimentstate}" z="iDCsk13OQNZWCGGm6aW9Rtj/UvY="/>
-        <field:display field="itxExperimentExperiment" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentState_itxExperimentExperiment" object="${itxexperimentexperimentstate}" z="HfsQlrOxLniRIJOPa/lmk+cpEi0="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentState_deleted" object="${itxexperimentexperimentstate}" z="AFrrvsrrCulq9FeV2FwHeRFj0sk="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxexperimentexperimentstates/update.jspx b/src/main/webapp/WEB-INF/views/itxexperimentexperimentstates/update.jspx
deleted file mode 100644
index 4b702c6cc..000000000
--- a/src/main/webapp/WEB-INF/views/itxexperimentexperimentstates/update.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ItxExperimentExperimentState" modelAttribute="itxExperimentExperimentState" path="/itxexperimentexperimentstates" versionField="Version" z="hIv8p7sQOm/CihtLr5+GlynqrFU=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_recordedBy" required="true" z="kNUSCR6nyqWwYQiEz+vzFPCxhcc="/>
-        <field:datetime dateTimePattern="${itxExperimentExperimentState_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_recordedDate" required="true" z="chmS56pfSCWoyEWOJyMLUfsGgs8="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_modifiedBy" z="xTNW0C/Ml+yu6qWSA2nnsXg+mCE="/>
-        <field:datetime dateTimePattern="${itxExperimentExperimentState_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_modifiedDate" z="KWXbD7dH3WaMl3f04P7QtkFuD5Q="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_lsType" required="true" z="3tVJSwvYyMErRnLK5EbGUXYJLPY="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_lsKind" required="true" z="Y3Wu8oQyRLEE1wuuicnTIZ7POHU="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_lsTypeAndKind" z="nQ+UXndlcROD3BsJV1xtxDw/uGM="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_comments" z="cjqwQ4EngtM/02BK/5KxgG/9WRU="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_ignored" z="D70TYmT9U9dPsNwyrWYTBy5vAVA="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_lsTransaction" validationMessageCode="field_invalid_integer" z="ae2TBUExEJh/FAyEEmz0FsEGHq4="/>
-        <field:select field="itxExperimentExperiment" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_itxExperimentExperiment" itemValue="id" items="${itxexperimentexperiments}" path="/itxexperimentexperiments" z="5u+qWhNaT7fYU7hAvLPAsdr9Tao="/>
-        <field:simple field="lsValues" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_lsValues" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Experiment Experiment Value" z="oGMxTG25WPCFJokq5TOBJV9QoAQ="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentState_deleted" z="isuDaElFLpDcUAbT7Tcs2819NM8="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxexperimentexperimentstates/views.xml b/src/main/webapp/WEB-INF/views/itxexperimentexperimentstates/views.xml
deleted file mode 100644
index fb1159847..000000000
--- a/src/main/webapp/WEB-INF/views/itxexperimentexperimentstates/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="itxexperimentexperimentstates/list">
-        <put-attribute name="body" value="/WEB-INF/views/itxexperimentexperimentstates/list.jspx"/>
-    </definition>
-<definition extends="default" name="itxexperimentexperimentstates/show">
-        <put-attribute name="body" value="/WEB-INF/views/itxexperimentexperimentstates/show.jspx"/>
-    </definition>
-<definition extends="default" name="itxexperimentexperimentstates/create">
-        <put-attribute name="body" value="/WEB-INF/views/itxexperimentexperimentstates/create.jspx"/>
-    </definition>
-<definition extends="default" name="itxexperimentexperimentstates/update">
-        <put-attribute name="body" value="/WEB-INF/views/itxexperimentexperimentstates/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/itxexperimentexperimentvalues/create.jspx b/src/main/webapp/WEB-INF/views/itxexperimentexperimentvalues/create.jspx
deleted file mode 100644
index 324860871..000000000
--- a/src/main/webapp/WEB-INF/views/itxexperimentexperimentvalues/create.jspx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ItxExperimentExperimentValue" modelAttribute="itxExperimentExperimentValue" path="/itxexperimentexperimentvalues" render="${empty dependencies}" z="qDhvJB2pu3tHi+iK4W0brLIqY1Q=">
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_lsType" required="true" z="R+9Njrt4Bpo7Szev7eQuRvuKa48="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_lsKind" required="true" z="8Y9fRppgpTQqZHFZN7HnZ+cQKTA="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_lsTypeAndKind" z="mNKLgO42wt3W4hHWPFKgMN8Q3P0="/>
-        <field:textarea field="codeType" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_codeType" z="R5zg7/V30p7Mpk7gQ6dtyNT8grs="/>
-        <field:textarea field="codeKind" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_codeKind" z="q5gybKZep5bnnV8Pou+hbiRZbps="/>
-        <field:textarea field="codeTypeAndKind" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_codeTypeAndKind" z="vEki0yWAj2mL0jyh5RwokrHpd/8="/>
-        <field:textarea field="stringValue" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_stringValue" z="qYak38rf4UfvnLN5K8CVH03h+D4="/>
-        <field:textarea field="codeValue" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_codeValue" z="3c062EMdbt6CSaOUUmrwjaYhQXg="/>
-        <field:textarea field="fileValue" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_fileValue" z="Pggu7ihc3SordK9cYlGRCeN+HN0="/>
-        <field:textarea field="urlValue" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_urlValue" z="aZp+gDRenuTJcgAdS4NqpsRZBDM="/>
-        <field:datetime dateTimePattern="${itxExperimentExperimentValue_datevalue_date_format}" field="dateValue" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_dateValue" z="MxRse18fRkHxFDh3wO/Sp/sJrK8="/>
-        <field:input field="clobValue" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_clobValue" z="iNvGaVd+x9Ckqsn684xQo1JRNEg="/>
-        <field:input field="blobValue" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_blobValue" z="KD0pGZKFSaDqmNHYDW9QcrJGdUE="/>
-        <field:input field="operatorType" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_operatorType" max="25" z="V8dBiy1snq0PvE23i/1Sta4gnt4="/>
-        <field:input field="operatorKind" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_operatorKind" max="10" z="Opsv3s7O6MeAmcSViuEaoD2jGds="/>
-        <field:textarea field="operatorTypeAndKind" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_operatorTypeAndKind" z="IRHSDMNwkRbqdf/NGVUsLIKwICs="/>
-        <field:input field="numericValue" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_numericValue" validationMessageCode="field_invalid_number" z="uLVc/oRpSxhrFgVDm4c1IEvrptQ="/>
-        <field:input field="sigFigs" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_sigFigs" validationMessageCode="field_invalid_integer" z="cV2p5Z5s95R0U5Hqv+5a5ohAGGg="/>
-        <field:input field="uncertainty" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_uncertainty" validationMessageCode="field_invalid_number" z="4Q6E/0/lNE8+IyjmlZkJs7UG9w8="/>
-        <field:input field="numberOfReplicates" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_numberOfReplicates" validationMessageCode="field_invalid_integer" z="EyWZduQQfGflwiaJezkTiiSTyGs="/>
-        <field:textarea field="uncertaintyType" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_uncertaintyType" z="nEiC+n6MjO1S4iCKqPMtouN4WLI="/>
-        <field:input field="unitType" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_unitType" max="25" z="b2i8oiV+6NamqixENGghg/WLb1E="/>
-        <field:input field="unitKind" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_unitKind" max="25" z="xDFDlmAN5CM+IindHd9uJq0X8e4="/>
-        <field:textarea field="unitTypeAndKind" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_unitTypeAndKind" z="ftoOVPxtTvWpJhIBVCl+8kT374g="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_comments" z="8MhY1KTYugza1BdEChrXB8dwuRY="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_ignored" z="CLbVy+bbBJGxEYQzXeb3BGK2haM="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_lsTransaction" validationMessageCode="field_invalid_integer" z="6z/nrqqykFudl4unSerXDUSTi6k="/>
-        <field:datetime dateTimePattern="${itxExperimentExperimentValue_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_recordedDate" required="true" z="WCyWYm1lG2dEUCQrXdRayf+uOyM="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_recordedBy" required="true" z="B3xhdQgN9qcbXPp55rzC/hXVf6U="/>
-        <field:datetime dateTimePattern="${itxExperimentExperimentValue_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_modifiedDate" z="uq+ge1YmMj0o7/9g6rRvhdptNIQ="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_modifiedBy" z="DMxM1o1FPSJW6nMQ493zB10g0Fc="/>
-        <field:checkbox field="publicData" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_publicData" z="4DADOkzJ90mz7hLqgpL285/gU40="/>
-        <field:select field="lsState" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_lsState" itemValue="id" items="${itxexperimentexperimentstates}" path="/itxexperimentexperimentstates" z="55wyUN9XXMp6l1qcuIKnMp2Qb2g="/>
-        <field:textarea field="codeOrigin" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_codeOrigin" z="3f7CGOC29tNVPrH/9Cu4ny3qUGQ="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_deleted" z="MQmcQKivUcIztFVfTGz4juRfYpo="/>
-        <field:input field="concentration" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_concentration" validationMessageCode="field_invalid_number" z="/XVbj2k/bPYOH/o0BS52BGI0nUk="/>
-        <field:input field="concUnit" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_concUnit" max="25" z="B4D4SpQTYxJ4CvBjj640Yl6je0o="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ItxExperimentExperimentValue" render="${not empty dependencies}" z="Dfd+Ji4CtffUu/2VedX9xofwoYU="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxexperimentexperimentvalues/list.jspx b/src/main/webapp/WEB-INF/views/itxexperimentexperimentvalues/list.jspx
deleted file mode 100644
index 2cd613308..000000000
--- a/src/main/webapp/WEB-INF/views/itxexperimentexperimentvalues/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ItxExperimentExperimentValue" items="${itxexperimentexperimentvalues}" z="30KNecZWiIcryvSYGMaGZ8b7EF4=">
-        <table:table data="${itxexperimentexperimentvalues}" id="l_com_labsynch_labseer_domain_ItxExperimentExperimentValue" path="/itxexperimentexperimentvalues" z="hoJ40WQRBKK5wzz/XnshiWGZkv0=">
-            <table:column id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_lsType" property="lsType" z="pkmx2snY/NuAWWWRLTPpxErDC8U="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_lsKind" property="lsKind" z="I4nSEEqTTZzP0LuSuNBLhOoYrQ0="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_lsTypeAndKind" property="lsTypeAndKind" z="rxvmMOKTDGJHiCf+P11ppq1GB/w="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_ignored" property="ignored" z="Cvq4jeSUhS9iRxP3APrcipTJniU="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_publicData" property="publicData" z="y2IyegHYZ8MuH5JhTqW4fVhCU08="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_deleted" property="deleted" z="HHuDIrVSDIBRI7/OTI6r6qSeBD0="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxexperimentexperimentvalues/show.jspx b/src/main/webapp/WEB-INF/views/itxexperimentexperimentvalues/show.jspx
deleted file mode 100644
index f67b81bd0..000000000
--- a/src/main/webapp/WEB-INF/views/itxexperimentexperimentvalues/show.jspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ItxExperimentExperimentValue" object="${itxexperimentexperimentvalue}" path="/itxexperimentexperimentvalues" z="rW685OoIS6YhW7isPbEPY+8Lmdk=">
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_lsType" object="${itxexperimentexperimentvalue}" z="rLOcoFp0/f1fiCS6lyJIsb0Gl4g="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_lsKind" object="${itxexperimentexperimentvalue}" z="XKTYLr59n1Io0D3y2zPj08pi3U0="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_lsTypeAndKind" object="${itxexperimentexperimentvalue}" z="RdCq8elqPbD9IpMBbsxDFMF1yN8="/>
-        <field:display field="codeType" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_codeType" object="${itxexperimentexperimentvalue}" z="E0A7tdqb2M0LshElBP/0qX/DUqo="/>
-        <field:display field="codeKind" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_codeKind" object="${itxexperimentexperimentvalue}" z="wTlnkUrZzSYI4HAoJhDRDGhkKKk="/>
-        <field:display field="codeTypeAndKind" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_codeTypeAndKind" object="${itxexperimentexperimentvalue}" z="rNd0aDrOrT+3bsILWTTiFPMEr+8="/>
-        <field:display field="stringValue" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_stringValue" object="${itxexperimentexperimentvalue}" z="l1TQLaSWUXzR0mJwovFE4XM6lsI="/>
-        <field:display field="codeValue" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_codeValue" object="${itxexperimentexperimentvalue}" z="gTMKoh9xKPnWZHwL0EaAKw0YvhQ="/>
-        <field:display field="fileValue" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_fileValue" object="${itxexperimentexperimentvalue}" z="+DqemURz/tu7xP6vSG0TgJTPS8w="/>
-        <field:display field="urlValue" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_urlValue" object="${itxexperimentexperimentvalue}" z="EIEB6jll+cQVT+Uo9StA5G9s6oE="/>
-        <field:display date="true" dateTimePattern="${itxExperimentExperimentValue_datevalue_date_format}" field="dateValue" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_dateValue" object="${itxexperimentexperimentvalue}" z="uBqclmR8vB9Z3x5xpg54iil8RgA="/>
-        <field:display field="clobValue" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_clobValue" object="${itxexperimentexperimentvalue}" z="UW9IhRXKdXDD6moKghPqGR6k92s="/>
-        <field:display field="blobValue" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_blobValue" object="${itxexperimentexperimentvalue}" z="mqkchjgjICx2zBpjac8iHSGS9kk="/>
-        <field:display field="operatorType" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_operatorType" object="${itxexperimentexperimentvalue}" z="EXNn3hS+9dLvctDerRbi4cP/17g="/>
-        <field:display field="operatorKind" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_operatorKind" object="${itxexperimentexperimentvalue}" z="WkINtNxpkPDx8gdlk3fVz092Ib4="/>
-        <field:display field="operatorTypeAndKind" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_operatorTypeAndKind" object="${itxexperimentexperimentvalue}" z="kPz/SVR6gVNY3hP/ZfBrfozOLdc="/>
-        <field:display field="numericValue" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_numericValue" object="${itxexperimentexperimentvalue}" z="lA81gwe1eTUqSZr1PXWXUYYm0F0="/>
-        <field:display field="sigFigs" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_sigFigs" object="${itxexperimentexperimentvalue}" z="UDgPG5pnYDjLYlzkd9GR3uBzhHI="/>
-        <field:display field="uncertainty" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_uncertainty" object="${itxexperimentexperimentvalue}" z="jZYbu9d1AQUXp2RIA6jOjK3a2WY="/>
-        <field:display field="numberOfReplicates" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_numberOfReplicates" object="${itxexperimentexperimentvalue}" z="54gZu/lruXSwALk8wxU7GtfEqMA="/>
-        <field:display field="uncertaintyType" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_uncertaintyType" object="${itxexperimentexperimentvalue}" z="YLLgO9vG4yMQoiPQ7NA68ek92wA="/>
-        <field:display field="unitType" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_unitType" object="${itxexperimentexperimentvalue}" z="vqzAPpt6qmBIW+fw3MXFw1PXlS4="/>
-        <field:display field="unitKind" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_unitKind" object="${itxexperimentexperimentvalue}" z="Omj/e++nnCc5iDzm2BYCizuV5eU="/>
-        <field:display field="unitTypeAndKind" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_unitTypeAndKind" object="${itxexperimentexperimentvalue}" z="wJ3H8E7t8Ownm6KqI682Cug6t2k="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_comments" object="${itxexperimentexperimentvalue}" z="SL23fUuBxLu9upFjccXf58sM1qo="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_ignored" object="${itxexperimentexperimentvalue}" z="zcK7npu8/r4urmC1jZB3WtdRm+4="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_lsTransaction" object="${itxexperimentexperimentvalue}" z="Jv14+ZZaosktmXM6Vpkk8wz5EoQ="/>
-        <field:display date="true" dateTimePattern="${itxExperimentExperimentValue_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_recordedDate" object="${itxexperimentexperimentvalue}" z="PBaeZJpH/gFA+YHXV/Km12ctnA8="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_recordedBy" object="${itxexperimentexperimentvalue}" z="8xSVxS3BE7Kb/fhnchb+OjNO8PE="/>
-        <field:display date="true" dateTimePattern="${itxExperimentExperimentValue_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_modifiedDate" object="${itxexperimentexperimentvalue}" z="woGB09Gl/pGXoxn8sZQ/nChaTqI="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_modifiedBy" object="${itxexperimentexperimentvalue}" z="7ntlX5ToExSRtfmmIhzL/LKH0CQ="/>
-        <field:display field="publicData" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_publicData" object="${itxexperimentexperimentvalue}" z="6VAe94mlixss75yaITi2Dvf77Uk="/>
-        <field:display field="lsState" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_lsState" object="${itxexperimentexperimentvalue}" z="1NJva1y12fOcG6UNmu5UqnskcCU="/>
-        <field:display field="codeOrigin" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_codeOrigin" object="${itxexperimentexperimentvalue}" z="oPJBAZ155HvoZnS8ns/WgTcU9oQ="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_deleted" object="${itxexperimentexperimentvalue}" z="N6u8A4OdAUW/Fa1+RSZPRW58xcg="/>
-        <field:display field="concentration" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_concentration" object="${itxexperimentexperimentvalue}" z="7jzw+hGuUzypCmH11wXO6DM0uWg="/>
-        <field:display field="concUnit" id="s_com_labsynch_labseer_domain_ItxExperimentExperimentValue_concUnit" object="${itxexperimentexperimentvalue}" z="XhSzfxm+qZdyPUzAL6tQ5lt4hw8="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxexperimentexperimentvalues/update.jspx b/src/main/webapp/WEB-INF/views/itxexperimentexperimentvalues/update.jspx
deleted file mode 100644
index f57412e0c..000000000
--- a/src/main/webapp/WEB-INF/views/itxexperimentexperimentvalues/update.jspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ItxExperimentExperimentValue" modelAttribute="itxExperimentExperimentValue" path="/itxexperimentexperimentvalues" versionField="Version" z="s8xsxzjbXUj1BNDg6xz2rWPhpzI=">
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_lsType" required="true" z="R+9Njrt4Bpo7Szev7eQuRvuKa48="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_lsKind" required="true" z="8Y9fRppgpTQqZHFZN7HnZ+cQKTA="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_lsTypeAndKind" z="mNKLgO42wt3W4hHWPFKgMN8Q3P0="/>
-        <field:textarea field="codeType" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_codeType" z="R5zg7/V30p7Mpk7gQ6dtyNT8grs="/>
-        <field:textarea field="codeKind" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_codeKind" z="q5gybKZep5bnnV8Pou+hbiRZbps="/>
-        <field:textarea field="codeTypeAndKind" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_codeTypeAndKind" z="vEki0yWAj2mL0jyh5RwokrHpd/8="/>
-        <field:textarea field="stringValue" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_stringValue" z="qYak38rf4UfvnLN5K8CVH03h+D4="/>
-        <field:textarea field="codeValue" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_codeValue" z="3c062EMdbt6CSaOUUmrwjaYhQXg="/>
-        <field:textarea field="fileValue" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_fileValue" z="Pggu7ihc3SordK9cYlGRCeN+HN0="/>
-        <field:textarea field="urlValue" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_urlValue" z="aZp+gDRenuTJcgAdS4NqpsRZBDM="/>
-        <field:datetime dateTimePattern="${itxExperimentExperimentValue_datevalue_date_format}" field="dateValue" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_dateValue" z="MxRse18fRkHxFDh3wO/Sp/sJrK8="/>
-        <field:input field="clobValue" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_clobValue" z="iNvGaVd+x9Ckqsn684xQo1JRNEg="/>
-        <field:input field="blobValue" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_blobValue" z="KD0pGZKFSaDqmNHYDW9QcrJGdUE="/>
-        <field:input field="operatorType" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_operatorType" max="25" z="V8dBiy1snq0PvE23i/1Sta4gnt4="/>
-        <field:input field="operatorKind" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_operatorKind" max="10" z="Opsv3s7O6MeAmcSViuEaoD2jGds="/>
-        <field:textarea field="operatorTypeAndKind" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_operatorTypeAndKind" z="IRHSDMNwkRbqdf/NGVUsLIKwICs="/>
-        <field:input field="numericValue" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_numericValue" validationMessageCode="field_invalid_number" z="uLVc/oRpSxhrFgVDm4c1IEvrptQ="/>
-        <field:input field="sigFigs" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_sigFigs" validationMessageCode="field_invalid_integer" z="cV2p5Z5s95R0U5Hqv+5a5ohAGGg="/>
-        <field:input field="uncertainty" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_uncertainty" validationMessageCode="field_invalid_number" z="4Q6E/0/lNE8+IyjmlZkJs7UG9w8="/>
-        <field:input field="numberOfReplicates" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_numberOfReplicates" validationMessageCode="field_invalid_integer" z="EyWZduQQfGflwiaJezkTiiSTyGs="/>
-        <field:textarea field="uncertaintyType" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_uncertaintyType" z="nEiC+n6MjO1S4iCKqPMtouN4WLI="/>
-        <field:input field="unitType" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_unitType" max="25" z="b2i8oiV+6NamqixENGghg/WLb1E="/>
-        <field:input field="unitKind" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_unitKind" max="25" z="xDFDlmAN5CM+IindHd9uJq0X8e4="/>
-        <field:textarea field="unitTypeAndKind" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_unitTypeAndKind" z="ftoOVPxtTvWpJhIBVCl+8kT374g="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_comments" z="8MhY1KTYugza1BdEChrXB8dwuRY="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_ignored" z="CLbVy+bbBJGxEYQzXeb3BGK2haM="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_lsTransaction" validationMessageCode="field_invalid_integer" z="6z/nrqqykFudl4unSerXDUSTi6k="/>
-        <field:datetime dateTimePattern="${itxExperimentExperimentValue_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_recordedDate" required="true" z="WCyWYm1lG2dEUCQrXdRayf+uOyM="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_recordedBy" required="true" z="B3xhdQgN9qcbXPp55rzC/hXVf6U="/>
-        <field:datetime dateTimePattern="${itxExperimentExperimentValue_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_modifiedDate" z="uq+ge1YmMj0o7/9g6rRvhdptNIQ="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_modifiedBy" z="DMxM1o1FPSJW6nMQ493zB10g0Fc="/>
-        <field:checkbox field="publicData" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_publicData" z="4DADOkzJ90mz7hLqgpL285/gU40="/>
-        <field:select field="lsState" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_lsState" itemValue="id" items="${itxexperimentexperimentstates}" path="/itxexperimentexperimentstates" z="55wyUN9XXMp6l1qcuIKnMp2Qb2g="/>
-        <field:textarea field="codeOrigin" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_codeOrigin" z="3f7CGOC29tNVPrH/9Cu4ny3qUGQ="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_deleted" z="MQmcQKivUcIztFVfTGz4juRfYpo="/>
-        <field:input field="concentration" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_concentration" validationMessageCode="field_invalid_number" z="/XVbj2k/bPYOH/o0BS52BGI0nUk="/>
-        <field:input field="concUnit" id="c_com_labsynch_labseer_domain_ItxExperimentExperimentValue_concUnit" max="25" z="B4D4SpQTYxJ4CvBjj640Yl6je0o="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxexperimentexperimentvalues/views.xml b/src/main/webapp/WEB-INF/views/itxexperimentexperimentvalues/views.xml
deleted file mode 100644
index ba1b8b0d3..000000000
--- a/src/main/webapp/WEB-INF/views/itxexperimentexperimentvalues/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="itxexperimentexperimentvalues/list">
-        <put-attribute name="body" value="/WEB-INF/views/itxexperimentexperimentvalues/list.jspx"/>
-    </definition>
-<definition extends="default" name="itxexperimentexperimentvalues/show">
-        <put-attribute name="body" value="/WEB-INF/views/itxexperimentexperimentvalues/show.jspx"/>
-    </definition>
-<definition extends="default" name="itxexperimentexperimentvalues/create">
-        <put-attribute name="body" value="/WEB-INF/views/itxexperimentexperimentvalues/create.jspx"/>
-    </definition>
-<definition extends="default" name="itxexperimentexperimentvalues/update">
-        <put-attribute name="body" value="/WEB-INF/views/itxexperimentexperimentvalues/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/itxlsthinglsthings/create.jspx b/src/main/webapp/WEB-INF/views/itxlsthinglsthings/create.jspx
deleted file mode 100644
index 4a02368a4..000000000
--- a/src/main/webapp/WEB-INF/views/itxlsthinglsthings/create.jspx
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ItxLsThingLsThing" modelAttribute="itxLsThingLsThing" path="/itxlsthinglsthings" render="${empty dependencies}" z="DqOrKgCoBat6HiUL3RHMHmrqwTE=">
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_lsType" required="true" z="4U3vuV2q/yUXkkFjxt7OAobRxTc="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_lsKind" required="true" z="NrGgGzkEHk5J+1mc0L0jVY7OxsE="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_lsTypeAndKind" z="5/o6klaH3M1m3MyUaYI2VIpPu7g="/>
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_codeName" z="AlaOCVFpe9t20JFrk65vHwE3GD8="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_recordedBy" required="true" z="1rdJKaWcrrxbdpik9DToGZmJi60="/>
-        <field:datetime dateTimePattern="${itxLsThingLsThing_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_recordedDate" required="true" z="nhfPkPjt1A1QGpZxAROaz314xuI="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_modifiedBy" z="SenoHO2qKNnHYmsZ1PmXee2vb9Q="/>
-        <field:datetime dateTimePattern="${itxLsThingLsThing_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_modifiedDate" z="fLzW2BFAE+IHHL8ppwcYxaX/vKw="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_ignored" z="j3MUGZ3E5rWhBsEQmVzgh2/Ux1s="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_deleted" z="HkcOCTiwZpYVgY7CaYbTcJVLIvo="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_lsTransaction" validationMessageCode="field_invalid_integer" z="YZZKdl9y9fdezDV69u1UHeQiSPA="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="N/6hHU+iPjNFuBUJrwLH3d/8yJ0="/>
-        <field:select field="firstLsThing" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_firstLsThing" itemValue="id" items="${lsthings}" path="/lsthings" required="true" z="6K9K5QB1vF1P1pk7eWJm9VUSSbE="/>
-        <field:select field="secondLsThing" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_secondLsThing" itemValue="id" items="${lsthings}" path="/lsthings" required="true" z="TGrYJE6vmL0mloX5NjJKwuppwTY="/>
-        <field:simple field="lsStates" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_lsStates" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Ls Thing Ls Thing State" z="luJPTJ/sUzEFADNbCz2AOvcm40A="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ItxLsThingLsThing" render="${not empty dependencies}" z="DVKTz2OS/Qbx7rqKaMI4whbRrTI="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxlsthinglsthings/findItxLsThingLsThingsByCodeNameEquals.jspx b/src/main/webapp/WEB-INF/views/itxlsthinglsthings/findItxLsThingLsThingsByCodeNameEquals.jspx
deleted file mode 100644
index 05032ab7b..000000000
--- a/src/main/webapp/WEB-INF/views/itxlsthinglsthings/findItxLsThingLsThingsByCodeNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeNameEquals" id="ff_com_labsynch_labseer_domain_ItxLsThingLsThing" path="/itxlsthinglsthings" z="O+8KAY9OigugXtuy8shKbGt0OSg=">
-        <field:input disableFormBinding="true" field="codeName" id="f_com_labsynch_labseer_domain_ItxLsThingLsThing_codeName" max="255" required="true" z="3kTARu9OpaiREh6yiQWU3hS6jM8="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxlsthinglsthings/findItxLsThingLsThingsByFirstLsThing.jspx b/src/main/webapp/WEB-INF/views/itxlsthinglsthings/findItxLsThingLsThingsByFirstLsThing.jspx
deleted file mode 100644
index baf5c61d8..000000000
--- a/src/main/webapp/WEB-INF/views/itxlsthinglsthings/findItxLsThingLsThingsByFirstLsThing.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByFirstLsThing" id="ff_com_labsynch_labseer_domain_ItxLsThingLsThing" path="/itxlsthinglsthings" z="pO+GAICvWoijJhlwermBuasqcV4=">
-        <field:select disableFormBinding="true" field="firstLsThing" id="f_com_labsynch_labseer_domain_ItxLsThingLsThing_firstLsThing" itemValue="id" items="${lsthings}" path="/lsthings" required="true" z="7crCh4hezv/BRtQ/CJfKz4oiVdE="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxlsthinglsthings/findItxLsThingLsThingsBySecondLsThing.jspx b/src/main/webapp/WEB-INF/views/itxlsthinglsthings/findItxLsThingLsThingsBySecondLsThing.jspx
deleted file mode 100644
index 5a2737507..000000000
--- a/src/main/webapp/WEB-INF/views/itxlsthinglsthings/findItxLsThingLsThingsBySecondLsThing.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="BySecondLsThing" id="ff_com_labsynch_labseer_domain_ItxLsThingLsThing" path="/itxlsthinglsthings" z="o9Pj3kIw6tUgKN6p0Y3sGQbXVAI=">
-        <field:select disableFormBinding="true" field="secondLsThing" id="f_com_labsynch_labseer_domain_ItxLsThingLsThing_secondLsThing" itemValue="id" items="${lsthings}" path="/lsthings" required="true" z="nuvVM/R0fp9bFxzMLi7xGud+52Y="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxlsthinglsthings/list.jspx b/src/main/webapp/WEB-INF/views/itxlsthinglsthings/list.jspx
deleted file mode 100644
index 8fd1764c7..000000000
--- a/src/main/webapp/WEB-INF/views/itxlsthinglsthings/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ItxLsThingLsThing" items="${itxlsthinglsthings}" z="erTQKxCP/jkDeNCnqaT0+p9PVjU=">
-        <table:table data="${itxlsthinglsthings}" id="l_com_labsynch_labseer_domain_ItxLsThingLsThing" path="/itxlsthinglsthings" z="4t1hvhVUlE7+CqC6yaBxKM12Yi8=">
-            <table:column id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_lsType" property="lsType" z="gYM8IBHlGk5NBtuKko3QEemW/k4="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_lsKind" property="lsKind" z="VFq6nI5yt8V+pocOE1rI0Ujd3sw="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_lsTypeAndKind" property="lsTypeAndKind" z="wgsNDyNGcCa79U33k03FnMXXAv8="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_codeName" property="codeName" z="FX38s7aDBksIfxhQ8vCRnVPiH7A="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_recordedBy" property="recordedBy" z="BZxQYeVQYTrtBqMMZaFLPaD1Bfo="/>
-            <table:column date="true" dateTimePattern="${itxLsThingLsThing_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_recordedDate" property="recordedDate" z="MagXlVIo985koyxnnFRm8dux9gM="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxlsthinglsthings/show.jspx b/src/main/webapp/WEB-INF/views/itxlsthinglsthings/show.jspx
deleted file mode 100644
index c02262c7e..000000000
--- a/src/main/webapp/WEB-INF/views/itxlsthinglsthings/show.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ItxLsThingLsThing" object="${itxlsthinglsthing}" path="/itxlsthinglsthings" z="kpzUO3v1VpwvTutco2dW0XLft3k=">
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ItxLsThingLsThing_lsType" object="${itxlsthinglsthing}" z="NaEFqI1XMiy8GIk2Y5bUmSi97ag="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_ItxLsThingLsThing_lsKind" object="${itxlsthinglsthing}" z="vBNht2+AJc295heNIQgqYIyJlxA="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ItxLsThingLsThing_lsTypeAndKind" object="${itxlsthinglsthing}" z="lRpAGVkkvTI83YEuI4qXiXkgKgw="/>
-        <field:display field="codeName" id="s_com_labsynch_labseer_domain_ItxLsThingLsThing_codeName" object="${itxlsthinglsthing}" z="i/lpThjVDnGY1AwoOqO0g9TAN+8="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_ItxLsThingLsThing_recordedBy" object="${itxlsthinglsthing}" z="XByIQXVYvorT3Pr/fX1feRpmrQA="/>
-        <field:display date="true" dateTimePattern="${itxLsThingLsThing_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_ItxLsThingLsThing_recordedDate" object="${itxlsthinglsthing}" z="QaAsyEdDYNC0/DtYSY2Yi8xd2W0="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_ItxLsThingLsThing_modifiedBy" object="${itxlsthinglsthing}" z="J3t7aUWis0xnBfvj1EKqAo1x94g="/>
-        <field:display date="true" dateTimePattern="${itxLsThingLsThing_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_ItxLsThingLsThing_modifiedDate" object="${itxlsthinglsthing}" z="8uSeuTBvykYHBJPpPvGxz3BIMpA="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ItxLsThingLsThing_ignored" object="${itxlsthinglsthing}" z="8rvp1goqMVtp/5M6MHKnUdrLsNc="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_ItxLsThingLsThing_deleted" object="${itxlsthinglsthing}" z="amQtnNh7FUrkzDPGevpBUOXpUUo="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_ItxLsThingLsThing_lsTransaction" object="${itxlsthinglsthing}" z="Y8bdBtWzsRaxYhyP7knuKtjgtFs="/>
-        <field:display field="firstLsThing" id="s_com_labsynch_labseer_domain_ItxLsThingLsThing_firstLsThing" object="${itxlsthinglsthing}" z="LaCw/DitQrI0xhoxwDoCOokRH/I="/>
-        <field:display field="secondLsThing" id="s_com_labsynch_labseer_domain_ItxLsThingLsThing_secondLsThing" object="${itxlsthinglsthing}" z="zCjjvEO+lUuTq1W6KZXyEZh59TY="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxlsthinglsthings/update.jspx b/src/main/webapp/WEB-INF/views/itxlsthinglsthings/update.jspx
deleted file mode 100644
index 0e33e8fe1..000000000
--- a/src/main/webapp/WEB-INF/views/itxlsthinglsthings/update.jspx
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ItxLsThingLsThing" modelAttribute="itxLsThingLsThing" path="/itxlsthinglsthings" versionField="Version" z="LpmCE4KGe8z6OrVmxup9lOp4y8c=">
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_lsType" required="true" z="4U3vuV2q/yUXkkFjxt7OAobRxTc="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_lsKind" required="true" z="NrGgGzkEHk5J+1mc0L0jVY7OxsE="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_lsTypeAndKind" z="5/o6klaH3M1m3MyUaYI2VIpPu7g="/>
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_codeName" z="AlaOCVFpe9t20JFrk65vHwE3GD8="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_recordedBy" required="true" z="1rdJKaWcrrxbdpik9DToGZmJi60="/>
-        <field:datetime dateTimePattern="${itxLsThingLsThing_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_recordedDate" required="true" z="nhfPkPjt1A1QGpZxAROaz314xuI="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_modifiedBy" z="SenoHO2qKNnHYmsZ1PmXee2vb9Q="/>
-        <field:datetime dateTimePattern="${itxLsThingLsThing_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_modifiedDate" z="fLzW2BFAE+IHHL8ppwcYxaX/vKw="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_ignored" z="j3MUGZ3E5rWhBsEQmVzgh2/Ux1s="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_deleted" z="HkcOCTiwZpYVgY7CaYbTcJVLIvo="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_lsTransaction" validationMessageCode="field_invalid_integer" z="YZZKdl9y9fdezDV69u1UHeQiSPA="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="N/6hHU+iPjNFuBUJrwLH3d/8yJ0="/>
-        <field:select field="firstLsThing" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_firstLsThing" itemValue="id" items="${lsthings}" path="/lsthings" required="true" z="6K9K5QB1vF1P1pk7eWJm9VUSSbE="/>
-        <field:select field="secondLsThing" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_secondLsThing" itemValue="id" items="${lsthings}" path="/lsthings" required="true" z="TGrYJE6vmL0mloX5NjJKwuppwTY="/>
-        <field:simple field="lsStates" id="c_com_labsynch_labseer_domain_ItxLsThingLsThing_lsStates" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Ls Thing Ls Thing State" z="luJPTJ/sUzEFADNbCz2AOvcm40A="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxlsthinglsthings/views.xml b/src/main/webapp/WEB-INF/views/itxlsthinglsthings/views.xml
deleted file mode 100644
index 941e8a19d..000000000
--- a/src/main/webapp/WEB-INF/views/itxlsthinglsthings/views.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="itxlsthinglsthings/list">
-        <put-attribute name="body" value="/WEB-INF/views/itxlsthinglsthings/list.jspx"/>
-    </definition>
-<definition extends="default" name="itxlsthinglsthings/show">
-        <put-attribute name="body" value="/WEB-INF/views/itxlsthinglsthings/show.jspx"/>
-    </definition>
-<definition extends="default" name="itxlsthinglsthings/create">
-        <put-attribute name="body" value="/WEB-INF/views/itxlsthinglsthings/create.jspx"/>
-    </definition>
-<definition extends="default" name="itxlsthinglsthings/update">
-        <put-attribute name="body" value="/WEB-INF/views/itxlsthinglsthings/update.jspx"/>
-    </definition>
-<definition extends="default" name="itxlsthinglsthings/findItxLsThingLsThingsByCodeNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/itxlsthinglsthings/findItxLsThingLsThingsByCodeNameEquals.jspx"/>
-    </definition>
-<definition extends="default" name="itxlsthinglsthings/findItxLsThingLsThingsByFirstLsThing">
-        <put-attribute name="body" value="/WEB-INF/views/itxlsthinglsthings/findItxLsThingLsThingsByFirstLsThing.jspx"/>
-    </definition>
-<definition extends="default" name="itxlsthinglsthings/findItxLsThingLsThingsBySecondLsThing">
-        <put-attribute name="body" value="/WEB-INF/views/itxlsthinglsthings/findItxLsThingLsThingsBySecondLsThing.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/itxlsthinglsthingstates/create.jspx b/src/main/webapp/WEB-INF/views/itxlsthinglsthingstates/create.jspx
deleted file mode 100644
index a61683d40..000000000
--- a/src/main/webapp/WEB-INF/views/itxlsthinglsthingstates/create.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ItxLsThingLsThingState" modelAttribute="itxLsThingLsThingState" path="/itxlsthinglsthingstates" render="${empty dependencies}" z="dCC8UZpXoxK9oKcEerWAjTMqEdA=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_recordedBy" required="true" z="bvykM8bKAipWDwxNp+RwzbNimEw="/>
-        <field:datetime dateTimePattern="${itxLsThingLsThingState_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_recordedDate" required="true" z="ODRvvT2Q6iH0N9BmhV2tZGxyAag="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_modifiedBy" z="we9kCSTesC1RaYxSFhgRj2AwXHE="/>
-        <field:datetime dateTimePattern="${itxLsThingLsThingState_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_modifiedDate" z="IVkQl5dLbQHi8jcCgsXUtl9Irww="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_lsType" required="true" z="N0Nw4THyRFqjKAh4gPhqThT9F4Y="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_lsKind" required="true" z="xR3M9wsN1BG2Pdw2i/WJDrAGpS4="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_lsTypeAndKind" z="kBJpfO6QR2xswCxMGIMdR8Xusfc="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_comments" z="JLXy9eShNKAX7nuvY97Sy+zgMEo="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_ignored" z="KwUjVciaSTdiJfWXyPWJCx3AJsg="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_deleted" z="INM1fEFOo/JkIyAcDrdreBluHSg="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_lsTransaction" validationMessageCode="field_invalid_integer" z="3qUGNzD3znGN7EeF0rtO544ygs0="/>
-        <field:select field="itxLsThingLsThing" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_itxLsThingLsThing" itemValue="id" items="${itxlsthinglsthings}" path="/itxlsthinglsthings" z="py2ii3y3q8E4VK0owG1E4FvBf/4="/>
-        <field:simple field="lsValues" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_lsValues" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Ls Thing Ls Thing Value" z="GhgenqQ69nrlzQZteXQLJgfF9P0="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ItxLsThingLsThingState" render="${not empty dependencies}" z="AGnyzfTJV8fvRtPu78IaHWVJJ24="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxlsthinglsthingstates/list.jspx b/src/main/webapp/WEB-INF/views/itxlsthinglsthingstates/list.jspx
deleted file mode 100644
index e4fc9e4ea..000000000
--- a/src/main/webapp/WEB-INF/views/itxlsthinglsthingstates/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ItxLsThingLsThingState" items="${itxlsthinglsthingstates}" z="haT/TW79hhQcxy3kjFN6jJ+vLdw=">
-        <table:table data="${itxlsthinglsthingstates}" id="l_com_labsynch_labseer_domain_ItxLsThingLsThingState" path="/itxlsthinglsthingstates" z="t9TlNGY+sE0kd1TT3PpyG4clGHM=">
-            <table:column id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_recordedBy" property="recordedBy" z="mpOViqe4N88wGQceIWwj7F5/es4="/>
-            <table:column date="true" dateTimePattern="${itxLsThingLsThingState_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_recordedDate" property="recordedDate" z="9AqihQbpeG3SUTsWu64E3XatwAA="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_modifiedBy" property="modifiedBy" z="Pubr8rTEJCxDQgeNq6xpZwBzqhc="/>
-            <table:column date="true" dateTimePattern="${itxLsThingLsThingState_modifieddate_date_format}" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_modifiedDate" property="modifiedDate" z="f30EIicDqsM4isJowKz7p1e2iEg="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_lsType" property="lsType" z="Bpj88RdPq3b30LJ2dGhGXOBA20k="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_lsKind" property="lsKind" z="QPhSukWIUVqZO4Te60ksoykssZg="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxlsthinglsthingstates/show.jspx b/src/main/webapp/WEB-INF/views/itxlsthinglsthingstates/show.jspx
deleted file mode 100644
index 72ce36a06..000000000
--- a/src/main/webapp/WEB-INF/views/itxlsthinglsthingstates/show.jspx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ItxLsThingLsThingState" object="${itxlsthinglsthingstate}" path="/itxlsthinglsthingstates" z="6KqYv+caA3M5CFSgq4RVg3na60Q=">
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingState_recordedBy" object="${itxlsthinglsthingstate}" z="OPwqVD1gJWHyxvlwtni17KFn/gQ="/>
-        <field:display date="true" dateTimePattern="${itxLsThingLsThingState_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingState_recordedDate" object="${itxlsthinglsthingstate}" z="i252zznos+969thW+PNTzylT5Ks="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingState_modifiedBy" object="${itxlsthinglsthingstate}" z="WWgVEa1dpaodfMYuxT2ay60/AVw="/>
-        <field:display date="true" dateTimePattern="${itxLsThingLsThingState_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingState_modifiedDate" object="${itxlsthinglsthingstate}" z="aRsIfS+uCNawmXLc78UmsINcn08="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingState_lsType" object="${itxlsthinglsthingstate}" z="CIs6Ja0i4i5g41l152xW2A8yhSg="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingState_lsKind" object="${itxlsthinglsthingstate}" z="RWnSLDJt6UsLQe6KQQmCfl6aSbU="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingState_lsTypeAndKind" object="${itxlsthinglsthingstate}" z="qIsmYZ6lZe2bOuSKIIFj2dDVTSI="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingState_comments" object="${itxlsthinglsthingstate}" z="PK1oSjcxBd3uEVMOhV5wpIl1Y+A="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingState_ignored" object="${itxlsthinglsthingstate}" z="kFRPY+srB/cCeohWEnnawXgv110="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingState_deleted" object="${itxlsthinglsthingstate}" z="zLSQ2HL1T/LO96LaGd0cRyFrep8="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingState_lsTransaction" object="${itxlsthinglsthingstate}" z="wWAYBapJUjakfbMkRZav055heJE="/>
-        <field:display field="itxLsThingLsThing" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingState_itxLsThingLsThing" object="${itxlsthinglsthingstate}" z="QWw0qLcqpgn6lV2C7luXiBlv5IE="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxlsthinglsthingstates/update.jspx b/src/main/webapp/WEB-INF/views/itxlsthinglsthingstates/update.jspx
deleted file mode 100644
index 11be18dd0..000000000
--- a/src/main/webapp/WEB-INF/views/itxlsthinglsthingstates/update.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ItxLsThingLsThingState" modelAttribute="itxLsThingLsThingState" path="/itxlsthinglsthingstates" versionField="Version" z="I2JfXAROlUHNMNlJhzKJYyBi4Jk=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_recordedBy" required="true" z="bvykM8bKAipWDwxNp+RwzbNimEw="/>
-        <field:datetime dateTimePattern="${itxLsThingLsThingState_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_recordedDate" required="true" z="ODRvvT2Q6iH0N9BmhV2tZGxyAag="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_modifiedBy" z="we9kCSTesC1RaYxSFhgRj2AwXHE="/>
-        <field:datetime dateTimePattern="${itxLsThingLsThingState_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_modifiedDate" z="IVkQl5dLbQHi8jcCgsXUtl9Irww="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_lsType" required="true" z="N0Nw4THyRFqjKAh4gPhqThT9F4Y="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_lsKind" required="true" z="xR3M9wsN1BG2Pdw2i/WJDrAGpS4="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_lsTypeAndKind" z="kBJpfO6QR2xswCxMGIMdR8Xusfc="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_comments" z="JLXy9eShNKAX7nuvY97Sy+zgMEo="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_ignored" z="KwUjVciaSTdiJfWXyPWJCx3AJsg="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_deleted" z="INM1fEFOo/JkIyAcDrdreBluHSg="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_lsTransaction" validationMessageCode="field_invalid_integer" z="3qUGNzD3znGN7EeF0rtO544ygs0="/>
-        <field:select field="itxLsThingLsThing" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_itxLsThingLsThing" itemValue="id" items="${itxlsthinglsthings}" path="/itxlsthinglsthings" z="py2ii3y3q8E4VK0owG1E4FvBf/4="/>
-        <field:simple field="lsValues" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingState_lsValues" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Ls Thing Ls Thing Value" z="GhgenqQ69nrlzQZteXQLJgfF9P0="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxlsthinglsthingstates/views.xml b/src/main/webapp/WEB-INF/views/itxlsthinglsthingstates/views.xml
deleted file mode 100644
index 10d8a61b8..000000000
--- a/src/main/webapp/WEB-INF/views/itxlsthinglsthingstates/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="itxlsthinglsthingstates/list">
-        <put-attribute name="body" value="/WEB-INF/views/itxlsthinglsthingstates/list.jspx"/>
-    </definition>
-<definition extends="default" name="itxlsthinglsthingstates/show">
-        <put-attribute name="body" value="/WEB-INF/views/itxlsthinglsthingstates/show.jspx"/>
-    </definition>
-<definition extends="default" name="itxlsthinglsthingstates/create">
-        <put-attribute name="body" value="/WEB-INF/views/itxlsthinglsthingstates/create.jspx"/>
-    </definition>
-<definition extends="default" name="itxlsthinglsthingstates/update">
-        <put-attribute name="body" value="/WEB-INF/views/itxlsthinglsthingstates/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/itxlsthinglsthingvalues/create.jspx b/src/main/webapp/WEB-INF/views/itxlsthinglsthingvalues/create.jspx
deleted file mode 100644
index c17db6956..000000000
--- a/src/main/webapp/WEB-INF/views/itxlsthinglsthingvalues/create.jspx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ItxLsThingLsThingValue" modelAttribute="itxLsThingLsThingValue" path="/itxlsthinglsthingvalues" render="${empty dependencies}" z="Em83rA2guuMjdGr4laA6GP7WoPM=">
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_ignored" z="UMVF2MzhO3d55TlgWv0zwDrGsfE="/>
-        <field:checkbox field="publicData" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_publicData" z="gJ6RQJo8fOpjWprupQAKB1PVpKc="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_deleted" z="HnCTuvHxloDw3dV2o0UPF+/MKZY="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_lsType" required="true" z="DJStLSSZQZctEcJrtQ51OtY6/k0="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_lsKind" required="true" z="dngToT5VNzjpApF4M4UgSJA+D5I="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_lsTypeAndKind" z="4sLl66tSBE8QyT/MNxUo6tR/JFo="/>
-        <field:textarea field="codeOrigin" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_codeOrigin" z="G+Re2OsiDlXNJPNAMhfABLI38QU="/>
-        <field:textarea field="codeType" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_codeType" z="TrbmL+4YC8DaDhmExEZAqpTYfeE="/>
-        <field:textarea field="codeKind" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_codeKind" z="si/TdJcbQBHTPBanrlTZ2s8qUEQ="/>
-        <field:textarea field="codeTypeAndKind" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_codeTypeAndKind" z="hysxfO+knaIbBHge2FN1UzYxcoI="/>
-        <field:textarea field="stringValue" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_stringValue" z="Zw9TB8SRJz0ttPjtaU5WdMUVLEk="/>
-        <field:textarea field="codeValue" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_codeValue" z="u93U57xov8u/17yI4hcX9EH7nwc="/>
-        <field:textarea field="fileValue" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_fileValue" z="Ndf/UZeHwfRIaGoRbdpG536Scnk="/>
-        <field:textarea field="urlValue" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_urlValue" z="fcANIAyLGtwMIOe8rp2JO6A1RoU="/>
-        <field:datetime dateTimePattern="${itxLsThingLsThingValue_datevalue_date_format}" field="dateValue" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_dateValue" z="pB8M1glw6TPhHWNDYugbdddTH30="/>
-        <field:input field="clobValue" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_clobValue" z="T9xLE8ISHuSeIpI7NXcre58sSFE="/>
-        <field:input field="blobValue" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_blobValue" z="R6UiMT+6GkG3jd+0NWcN9xNk03A="/>
-        <field:input field="operatorType" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_operatorType" max="25" z="Dl6Fd2ZY5KKsvEbDdDc7eSJgiuM="/>
-        <field:input field="operatorKind" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_operatorKind" max="10" z="RHnbZtm/U79EG+6qNKqiVxhgjjk="/>
-        <field:textarea field="operatorTypeAndKind" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_operatorTypeAndKind" z="nc+pgtlNFzvhQ3ifOXGoWhG4P1s="/>
-        <field:input field="numericValue" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_numericValue" validationMessageCode="field_invalid_number" z="/dyI1l71bmqkr5fYiDry4ZmZvEs="/>
-        <field:input field="sigFigs" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_sigFigs" validationMessageCode="field_invalid_integer" z="UE7X7U/tScOLf6RgTqIaUG2MoAE="/>
-        <field:input field="uncertainty" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_uncertainty" validationMessageCode="field_invalid_number" z="BJ8mRiWwxsM9oetbue+s62C44XQ="/>
-        <field:input field="numberOfReplicates" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_numberOfReplicates" validationMessageCode="field_invalid_integer" z="ZlSHAA2S9Vo0uiVVDGaq4DE4OEI="/>
-        <field:textarea field="uncertaintyType" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_uncertaintyType" z="WIXXN1p0F1edUdCQRtLMM5c7C2s="/>
-        <field:input field="unitType" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_unitType" max="25" z="7Ics8lv1p6mgb5bO4yC/uzKgs6I="/>
-        <field:input field="unitKind" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_unitKind" max="25" z="ujlJ9LYUDIn7qwgey6zzfW/GCVE="/>
-        <field:textarea field="unitTypeAndKind" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_unitTypeAndKind" z="TWWV1aaiRnn7D8NWOl2qNq80kWw="/>
-        <field:input field="concentration" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_concentration" validationMessageCode="field_invalid_number" z="988UFYWf9VnD6CjMZz3/5vBSDHY="/>
-        <field:input field="concUnit" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_concUnit" max="25" z="QGSzaD/jNso1FD2yZZA44eiIgC8="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_comments" z="ia5/fevISYgqtVj44CyaSZ4b++w="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_lsTransaction" validationMessageCode="field_invalid_integer" z="mKU+zBQp9aq50VGYpF0yzF5YOsE="/>
-        <field:datetime dateTimePattern="${itxLsThingLsThingValue_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_recordedDate" required="true" z="p1jX7Q/A7wMgKMOOGDC9VBn+m10="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_recordedBy" required="true" z="Vf+m48CWgLs9TC5jbHT6hox4IYc="/>
-        <field:datetime dateTimePattern="${itxLsThingLsThingValue_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_modifiedDate" z="Cr+vParNPF5fBvJeVWBZ+9093zs="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_modifiedBy" z="YCTS8NmCeFRK8MpgICYdmZkrSYk="/>
-        <field:select field="lsState" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_lsState" itemValue="id" items="${itxlsthinglsthingstates}" path="/itxlsthinglsthingstates" z="RL7GDuRMw/pCZy7aKRc8OG4nDwI="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ItxLsThingLsThingValue" render="${not empty dependencies}" z="5UmcxFOO1+bAxDzUyg79yRpTbjM="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxlsthinglsthingvalues/list.jspx b/src/main/webapp/WEB-INF/views/itxlsthinglsthingvalues/list.jspx
deleted file mode 100644
index 5fc0a0b56..000000000
--- a/src/main/webapp/WEB-INF/views/itxlsthinglsthingvalues/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ItxLsThingLsThingValue" items="${itxlsthinglsthingvalues}" z="zKmJOAX+3d2ghvNhCK7+lhySnBM=">
-        <table:table data="${itxlsthinglsthingvalues}" id="l_com_labsynch_labseer_domain_ItxLsThingLsThingValue" path="/itxlsthinglsthingvalues" z="csGOCPuMOpi741Ea+hynbhJ32Z8=">
-            <table:column id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_ignored" property="ignored" z="EKQi2OcpInWPKDo88h7ria/P32c="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_publicData" property="publicData" z="RJpD7wWgHr2Rcd/KjvJbrDgDULA="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_deleted" property="deleted" z="zme42lWY13sSg1qioZ3/woQg8V0="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_lsType" property="lsType" z="NQJRxDkmcOfPcwWmnmIWIDo83dw="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_lsKind" property="lsKind" z="Y9uKGVXoHtA9L8yccBGxh2/St0Y="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_lsTypeAndKind" property="lsTypeAndKind" z="i9NDGX6aGFpgt9/e8CqumAPPoak="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxlsthinglsthingvalues/show.jspx b/src/main/webapp/WEB-INF/views/itxlsthinglsthingvalues/show.jspx
deleted file mode 100644
index 1aa92a525..000000000
--- a/src/main/webapp/WEB-INF/views/itxlsthinglsthingvalues/show.jspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ItxLsThingLsThingValue" object="${itxlsthinglsthingvalue}" path="/itxlsthinglsthingvalues" z="xkOqDVoesqxzadZZeCF645IsQ/s=">
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_ignored" object="${itxlsthinglsthingvalue}" z="QA3MsUs4McsMR9wV9hxz6FlN2T0="/>
-        <field:display field="publicData" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_publicData" object="${itxlsthinglsthingvalue}" z="cemKZZlSWwUzj95Azb7HJr4gy8A="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_deleted" object="${itxlsthinglsthingvalue}" z="GLWVq4NFBSTzcMdSswpsLFfLmfM="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_lsType" object="${itxlsthinglsthingvalue}" z="wyPyzMD1K1tm+f20BUClduWf1DI="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_lsKind" object="${itxlsthinglsthingvalue}" z="LyAJFahrgElElww+onfkj/D1bII="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_lsTypeAndKind" object="${itxlsthinglsthingvalue}" z="mq+BnvJLYccZC4PHuM8fmyofFeA="/>
-        <field:display field="codeOrigin" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_codeOrigin" object="${itxlsthinglsthingvalue}" z="ebvy9eQ7P9a+gyqrIrbPXrgMiu4="/>
-        <field:display field="codeType" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_codeType" object="${itxlsthinglsthingvalue}" z="fwHMLn+sjvyxhvcJj8/nXPx6m2w="/>
-        <field:display field="codeKind" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_codeKind" object="${itxlsthinglsthingvalue}" z="YQcDo+lXGHA8G5wrhUEz2qOXDbg="/>
-        <field:display field="codeTypeAndKind" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_codeTypeAndKind" object="${itxlsthinglsthingvalue}" z="Cbifzd/zUoqxpBrAQmaUj73QFJ4="/>
-        <field:display field="stringValue" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_stringValue" object="${itxlsthinglsthingvalue}" z="wBZdf9JFjLClDu9IanyPW3NTwFI="/>
-        <field:display field="codeValue" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_codeValue" object="${itxlsthinglsthingvalue}" z="xM+eDdqyR0MRRiRnDBIHAicHvVg="/>
-        <field:display field="fileValue" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_fileValue" object="${itxlsthinglsthingvalue}" z="ou2XPbrp5ZRz4UlHKn2hQmNx+S8="/>
-        <field:display field="urlValue" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_urlValue" object="${itxlsthinglsthingvalue}" z="vYqQy8msPcQbv1ZfkgxDEO+D7H8="/>
-        <field:display date="true" dateTimePattern="${itxLsThingLsThingValue_datevalue_date_format}" field="dateValue" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_dateValue" object="${itxlsthinglsthingvalue}" z="QIJwOyp8NWU85ZFrD5hFC+4ydPY="/>
-        <field:display field="clobValue" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_clobValue" object="${itxlsthinglsthingvalue}" z="9CT7R33NWMLUbOFyv6SRDk+JtUc="/>
-        <field:display field="blobValue" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_blobValue" object="${itxlsthinglsthingvalue}" z="dWtZv+Q3v1VFsqCngeRfn9Ng+IQ="/>
-        <field:display field="operatorType" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_operatorType" object="${itxlsthinglsthingvalue}" z="tWsieabk+ZcR3RwBN0kmYUoGe+A="/>
-        <field:display field="operatorKind" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_operatorKind" object="${itxlsthinglsthingvalue}" z="s3jlBqhuabMXjUb5g0t5R0+QaP0="/>
-        <field:display field="operatorTypeAndKind" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_operatorTypeAndKind" object="${itxlsthinglsthingvalue}" z="HMp96Kz7g74IeKgphDCma5iF+G8="/>
-        <field:display field="numericValue" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_numericValue" object="${itxlsthinglsthingvalue}" z="NZHNeEv1BkoqKwPTLIJRks/P/Vs="/>
-        <field:display field="sigFigs" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_sigFigs" object="${itxlsthinglsthingvalue}" z="1U0DJNNwFVu7ROrDp2UbLsRauZk="/>
-        <field:display field="uncertainty" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_uncertainty" object="${itxlsthinglsthingvalue}" z="PdW7h8HhQ2jObXF844AMbdhNx+A="/>
-        <field:display field="numberOfReplicates" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_numberOfReplicates" object="${itxlsthinglsthingvalue}" z="hj0IY7biW0uES/Ze8wmeoRnbnN0="/>
-        <field:display field="uncertaintyType" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_uncertaintyType" object="${itxlsthinglsthingvalue}" z="QwIKv6Mw+r4w4v6R4gWsO/vzkpY="/>
-        <field:display field="unitType" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_unitType" object="${itxlsthinglsthingvalue}" z="gN2I0ZhFyl1erHlUuVTzK+cPGOQ="/>
-        <field:display field="unitKind" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_unitKind" object="${itxlsthinglsthingvalue}" z="jq+F1sCsFpgmdYiXP+0eMQ/z8ZM="/>
-        <field:display field="unitTypeAndKind" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_unitTypeAndKind" object="${itxlsthinglsthingvalue}" z="3BDo6cppGY5g7gYqeOzVkl8wOso="/>
-        <field:display field="concentration" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_concentration" object="${itxlsthinglsthingvalue}" z="sk0jzJDft3FhyO0nqWBWmR7t4NY="/>
-        <field:display field="concUnit" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_concUnit" object="${itxlsthinglsthingvalue}" z="4qUtrJ4w0GkvkTXzm8svjF7qp64="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_comments" object="${itxlsthinglsthingvalue}" z="Q1eyBzkZEWlPJPrKEz3863N/HWA="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_lsTransaction" object="${itxlsthinglsthingvalue}" z="oJqb8ulGQEcCVxYvLtJVLshVWNI="/>
-        <field:display date="true" dateTimePattern="${itxLsThingLsThingValue_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_recordedDate" object="${itxlsthinglsthingvalue}" z="8DNwZy8dJZK+kfpFzcCZ0qJ6Gko="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_recordedBy" object="${itxlsthinglsthingvalue}" z="3CQuh3bIiWkUtpnnSmg6VGoxtf4="/>
-        <field:display date="true" dateTimePattern="${itxLsThingLsThingValue_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_modifiedDate" object="${itxlsthinglsthingvalue}" z="ELEsfKNAWwqogRufSZ0orH2ZMMY="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_modifiedBy" object="${itxlsthinglsthingvalue}" z="eWVksBtdkVvKKBC829rbKet/BBs="/>
-        <field:display field="lsState" id="s_com_labsynch_labseer_domain_ItxLsThingLsThingValue_lsState" object="${itxlsthinglsthingvalue}" z="uFr5Rk7xo1+yRBPkUz46fOqQIWg="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxlsthinglsthingvalues/update.jspx b/src/main/webapp/WEB-INF/views/itxlsthinglsthingvalues/update.jspx
deleted file mode 100644
index f2f9165dc..000000000
--- a/src/main/webapp/WEB-INF/views/itxlsthinglsthingvalues/update.jspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ItxLsThingLsThingValue" modelAttribute="itxLsThingLsThingValue" path="/itxlsthinglsthingvalues" versionField="Version" z="B+rZlMqVDpag7cwz9hF4eApEpdM=">
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_ignored" z="UMVF2MzhO3d55TlgWv0zwDrGsfE="/>
-        <field:checkbox field="publicData" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_publicData" z="gJ6RQJo8fOpjWprupQAKB1PVpKc="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_deleted" z="HnCTuvHxloDw3dV2o0UPF+/MKZY="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_lsType" required="true" z="DJStLSSZQZctEcJrtQ51OtY6/k0="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_lsKind" required="true" z="dngToT5VNzjpApF4M4UgSJA+D5I="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_lsTypeAndKind" z="4sLl66tSBE8QyT/MNxUo6tR/JFo="/>
-        <field:textarea field="codeOrigin" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_codeOrigin" z="G+Re2OsiDlXNJPNAMhfABLI38QU="/>
-        <field:textarea field="codeType" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_codeType" z="TrbmL+4YC8DaDhmExEZAqpTYfeE="/>
-        <field:textarea field="codeKind" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_codeKind" z="si/TdJcbQBHTPBanrlTZ2s8qUEQ="/>
-        <field:textarea field="codeTypeAndKind" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_codeTypeAndKind" z="hysxfO+knaIbBHge2FN1UzYxcoI="/>
-        <field:textarea field="stringValue" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_stringValue" z="Zw9TB8SRJz0ttPjtaU5WdMUVLEk="/>
-        <field:textarea field="codeValue" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_codeValue" z="u93U57xov8u/17yI4hcX9EH7nwc="/>
-        <field:textarea field="fileValue" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_fileValue" z="Ndf/UZeHwfRIaGoRbdpG536Scnk="/>
-        <field:textarea field="urlValue" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_urlValue" z="fcANIAyLGtwMIOe8rp2JO6A1RoU="/>
-        <field:datetime dateTimePattern="${itxLsThingLsThingValue_datevalue_date_format}" field="dateValue" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_dateValue" z="pB8M1glw6TPhHWNDYugbdddTH30="/>
-        <field:input field="clobValue" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_clobValue" z="T9xLE8ISHuSeIpI7NXcre58sSFE="/>
-        <field:input field="blobValue" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_blobValue" z="R6UiMT+6GkG3jd+0NWcN9xNk03A="/>
-        <field:input field="operatorType" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_operatorType" max="25" z="Dl6Fd2ZY5KKsvEbDdDc7eSJgiuM="/>
-        <field:input field="operatorKind" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_operatorKind" max="10" z="RHnbZtm/U79EG+6qNKqiVxhgjjk="/>
-        <field:textarea field="operatorTypeAndKind" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_operatorTypeAndKind" z="nc+pgtlNFzvhQ3ifOXGoWhG4P1s="/>
-        <field:input field="numericValue" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_numericValue" validationMessageCode="field_invalid_number" z="/dyI1l71bmqkr5fYiDry4ZmZvEs="/>
-        <field:input field="sigFigs" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_sigFigs" validationMessageCode="field_invalid_integer" z="UE7X7U/tScOLf6RgTqIaUG2MoAE="/>
-        <field:input field="uncertainty" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_uncertainty" validationMessageCode="field_invalid_number" z="BJ8mRiWwxsM9oetbue+s62C44XQ="/>
-        <field:input field="numberOfReplicates" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_numberOfReplicates" validationMessageCode="field_invalid_integer" z="ZlSHAA2S9Vo0uiVVDGaq4DE4OEI="/>
-        <field:textarea field="uncertaintyType" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_uncertaintyType" z="WIXXN1p0F1edUdCQRtLMM5c7C2s="/>
-        <field:input field="unitType" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_unitType" max="25" z="7Ics8lv1p6mgb5bO4yC/uzKgs6I="/>
-        <field:input field="unitKind" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_unitKind" max="25" z="ujlJ9LYUDIn7qwgey6zzfW/GCVE="/>
-        <field:textarea field="unitTypeAndKind" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_unitTypeAndKind" z="TWWV1aaiRnn7D8NWOl2qNq80kWw="/>
-        <field:input field="concentration" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_concentration" validationMessageCode="field_invalid_number" z="988UFYWf9VnD6CjMZz3/5vBSDHY="/>
-        <field:input field="concUnit" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_concUnit" max="25" z="QGSzaD/jNso1FD2yZZA44eiIgC8="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_comments" z="ia5/fevISYgqtVj44CyaSZ4b++w="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_lsTransaction" validationMessageCode="field_invalid_integer" z="mKU+zBQp9aq50VGYpF0yzF5YOsE="/>
-        <field:datetime dateTimePattern="${itxLsThingLsThingValue_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_recordedDate" required="true" z="p1jX7Q/A7wMgKMOOGDC9VBn+m10="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_recordedBy" required="true" z="Vf+m48CWgLs9TC5jbHT6hox4IYc="/>
-        <field:datetime dateTimePattern="${itxLsThingLsThingValue_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_modifiedDate" z="Cr+vParNPF5fBvJeVWBZ+9093zs="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_modifiedBy" z="YCTS8NmCeFRK8MpgICYdmZkrSYk="/>
-        <field:select field="lsState" id="c_com_labsynch_labseer_domain_ItxLsThingLsThingValue_lsState" itemValue="id" items="${itxlsthinglsthingstates}" path="/itxlsthinglsthingstates" z="RL7GDuRMw/pCZy7aKRc8OG4nDwI="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxlsthinglsthingvalues/views.xml b/src/main/webapp/WEB-INF/views/itxlsthinglsthingvalues/views.xml
deleted file mode 100644
index 64232a470..000000000
--- a/src/main/webapp/WEB-INF/views/itxlsthinglsthingvalues/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="itxlsthinglsthingvalues/list">
-        <put-attribute name="body" value="/WEB-INF/views/itxlsthinglsthingvalues/list.jspx"/>
-    </definition>
-<definition extends="default" name="itxlsthinglsthingvalues/show">
-        <put-attribute name="body" value="/WEB-INF/views/itxlsthinglsthingvalues/show.jspx"/>
-    </definition>
-<definition extends="default" name="itxlsthinglsthingvalues/create">
-        <put-attribute name="body" value="/WEB-INF/views/itxlsthinglsthingvalues/create.jspx"/>
-    </definition>
-<definition extends="default" name="itxlsthinglsthingvalues/update">
-        <put-attribute name="body" value="/WEB-INF/views/itxlsthinglsthingvalues/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/itxprotocolprotocols/create.jspx b/src/main/webapp/WEB-INF/views/itxprotocolprotocols/create.jspx
deleted file mode 100755
index 5ac273de8..000000000
--- a/src/main/webapp/WEB-INF/views/itxprotocolprotocols/create.jspx
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ItxProtocolProtocol" modelAttribute="itxProtocolProtocol" path="/itxprotocolprotocols" render="${empty dependencies}" z="uYcasg3M7fGU896+rS/ZniVkNog=">
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_lsType" itemValue="typeName" items="${interactiontypes}" path="/interactiontypes" required="true" z="user-managed"/>
-        <field:select field="lsKind" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_lsKind" itemValue="kindName" items="${interactionkinds}" path="/interactionkinds" required="true" z="user-managed"/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_lsTypeAndKind" z="/4DpmECQ8AnGnQ1FMngyQhAIDDY="/>
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_codeName" z="1P8n/1ZkhUbFO4LHM78sQgl0eGc="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_recordedBy" required="true" z="TrL0qTW5fc70lX0cMUSlryYiQNI="/>
-        <field:datetime dateTimePattern="${itxProtocolProtocol_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_recordedDate" required="true" z="vGBf1UQjTPc0Z6SYyYs2B/L8JgA="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_modifiedBy" z="JDv1Wl9Olms8z1kv2UCMOeZWb20="/>
-        <field:datetime dateTimePattern="${itxProtocolProtocol_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_modifiedDate" z="GMriluzYXIjMMYbT2zA6dPoN9SI="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_ignored" z="pf3OJqAyANe9QFkOOK4tmKcrsds="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_lsTransaction" validationMessageCode="field_invalid_integer" z="1m1rWLPwYk6COiHWoccJdHPLPDM="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="bOcEa9FmBJ6mfrTtK1645vYm6tI="/>
-        <field:select field="firstProtocol" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_firstProtocol" itemValue="id" items="${protocols}" path="/protocols" required="true" z="FFEiXTlu00RT/Z+b8OgfTLLoWhw="/>
-        <field:select field="secondProtocol" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_secondProtocol" itemValue="id" items="${protocols}" path="/protocols" required="true" z="dHkpNO0sMrV76sF5XE9GnrMu3xo="/>
-        <field:simple field="lsStates" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_lsStates" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Protocol Protocol State" z="Oy7KAGSqy24DOiyJlJ/TBU9u88I="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_deleted" z="4FH7vwehZ5SUxG9RImVflDHDkQE="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ItxProtocolProtocol" render="${not empty dependencies}" z="9eMx7FB2r56fbx2tc8jXxGjRlUc="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxprotocolprotocols/findItxProtocolProtocolsByFirstProtocol.jspx b/src/main/webapp/WEB-INF/views/itxprotocolprotocols/findItxProtocolProtocolsByFirstProtocol.jspx
deleted file mode 100644
index bcae457ec..000000000
--- a/src/main/webapp/WEB-INF/views/itxprotocolprotocols/findItxProtocolProtocolsByFirstProtocol.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByFirstProtocol" id="ff_com_labsynch_labseer_domain_ItxProtocolProtocol" path="/itxprotocolprotocols" z="ptN8K2cS24iT9NNSnZHiIm5q7cU=">
-        <field:select disableFormBinding="true" field="firstProtocol" id="f_com_labsynch_labseer_domain_ItxProtocolProtocol_firstProtocol" itemValue="id" items="${protocols}" path="/protocols" required="true" z="4GwA1a14Cr+GC1GYqkO1M+SBmuw="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxprotocolprotocols/findItxProtocolProtocolsByLsTransactionEquals.jspx b/src/main/webapp/WEB-INF/views/itxprotocolprotocols/findItxProtocolProtocolsByLsTransactionEquals.jspx
deleted file mode 100644
index c9c64fff7..000000000
--- a/src/main/webapp/WEB-INF/views/itxprotocolprotocols/findItxProtocolProtocolsByLsTransactionEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTransactionEquals" id="ff_com_labsynch_labseer_domain_ItxProtocolProtocol" path="/itxprotocolprotocols" z="UCz+sn6a/laDE6QKYB7xZq4XFvs=">
-        <field:input disableFormBinding="true" field="lsTransaction" id="f_com_labsynch_labseer_domain_ItxProtocolProtocol_lsTransaction" required="true" validationMessageCode="field_invalid_integer" z="LYdzWDgZFkYcBTio8TT8VU3BozI="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxprotocolprotocols/findItxProtocolProtocolsBySecondProtocol.jspx b/src/main/webapp/WEB-INF/views/itxprotocolprotocols/findItxProtocolProtocolsBySecondProtocol.jspx
deleted file mode 100644
index 51f0731c3..000000000
--- a/src/main/webapp/WEB-INF/views/itxprotocolprotocols/findItxProtocolProtocolsBySecondProtocol.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="BySecondProtocol" id="ff_com_labsynch_labseer_domain_ItxProtocolProtocol" path="/itxprotocolprotocols" z="q/LAfmFMyaLIm4CodOEmayosfjg=">
-        <field:select disableFormBinding="true" field="secondProtocol" id="f_com_labsynch_labseer_domain_ItxProtocolProtocol_secondProtocol" itemValue="id" items="${protocols}" path="/protocols" required="true" z="VSIOQGNmtgBlNcUeDPyFX/Gz3LU="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxprotocolprotocols/list.jspx b/src/main/webapp/WEB-INF/views/itxprotocolprotocols/list.jspx
deleted file mode 100755
index c798ca6ee..000000000
--- a/src/main/webapp/WEB-INF/views/itxprotocolprotocols/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ItxProtocolProtocol" items="${itxprotocolprotocols}" z="DLoTSbkH9gY1iUtl3M7toNHhVmY=">
-        <table:table data="${itxprotocolprotocols}" id="l_com_labsynch_labseer_domain_ItxProtocolProtocol" path="/itxprotocolprotocols" z="rVKDStHP4zNWCgBD2FVL/AjGLKA=">
-            <table:column id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_lsType" property="lsType" z="ZdqRAzhzHTVR72hWX6b9Z3+d/GE="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_lsKind" property="lsKind" z="Jr58+48nguZ6PJFrO2Bj6oFFhE0="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_lsTypeAndKind" property="lsTypeAndKind" z="swvXxhxzB1eCFJr+p9McaNBuGOo="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_codeName" property="codeName" z="JTQWrqn2ypu+h32nVtSXMnoIPSE="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_recordedBy" property="recordedBy" z="oF1Gv/CwRXeDydf3aems1kT8Z9g="/>
-            <table:column date="true" dateTimePattern="${itxProtocolProtocol_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_recordedDate" property="recordedDate" z="wxGjvT9QfuxW7m2q4smVPjeGwVw="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxprotocolprotocols/show.jspx b/src/main/webapp/WEB-INF/views/itxprotocolprotocols/show.jspx
deleted file mode 100755
index 3c3c2b47c..000000000
--- a/src/main/webapp/WEB-INF/views/itxprotocolprotocols/show.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ItxProtocolProtocol" object="${itxprotocolprotocol}" path="/itxprotocolprotocols" z="ozUJM61nWXBzZslVRiLvbViSPn0=">
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ItxProtocolProtocol_lsType" object="${itxprotocolprotocol}" z="MbyDKDywdYZu/gWHCql1OPd356Y="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_ItxProtocolProtocol_lsKind" object="${itxprotocolprotocol}" z="ggtTwQV3PjSF+qJjsmnB1MMipcw="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ItxProtocolProtocol_lsTypeAndKind" object="${itxprotocolprotocol}" z="hCcHrutsYfbSk+4R41dLPr/xZJo="/>
-        <field:display field="codeName" id="s_com_labsynch_labseer_domain_ItxProtocolProtocol_codeName" object="${itxprotocolprotocol}" z="k7++mSQ35kh9+ADwJIM+mgNWLiw="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_ItxProtocolProtocol_recordedBy" object="${itxprotocolprotocol}" z="den003kMaZqhQE6c2TmLxyVsPdA="/>
-        <field:display date="true" dateTimePattern="${itxProtocolProtocol_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_ItxProtocolProtocol_recordedDate" object="${itxprotocolprotocol}" z="uPj2PTHTNmhG+9qNw2f2jtI4twA="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_ItxProtocolProtocol_modifiedBy" object="${itxprotocolprotocol}" z="Fh2sEzB7Z53Fg3gy2cFydTUhOq8="/>
-        <field:display date="true" dateTimePattern="${itxProtocolProtocol_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_ItxProtocolProtocol_modifiedDate" object="${itxprotocolprotocol}" z="1n1piNuHmJZ/leChoKngO+R6lnM="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ItxProtocolProtocol_ignored" object="${itxprotocolprotocol}" z="h7pfVaj4GBXHg7AhkSBg9JM2JJM="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_ItxProtocolProtocol_lsTransaction" object="${itxprotocolprotocol}" z="zwI8JyknW5+YHSbDVvRakW1e/Co="/>
-        <field:display field="firstProtocol" id="s_com_labsynch_labseer_domain_ItxProtocolProtocol_firstProtocol" object="${itxprotocolprotocol}" z="Lk9aogaC06bGPrYoPSI5jQHhmSA="/>
-        <field:display field="secondProtocol" id="s_com_labsynch_labseer_domain_ItxProtocolProtocol_secondProtocol" object="${itxprotocolprotocol}" z="PsCcn6isUimL3gUqN0bp27sku1c="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_ItxProtocolProtocol_deleted" object="${itxprotocolprotocol}" z="XLh7C0GjTUTDW8uVHsRtX7ofcps="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxprotocolprotocols/update.jspx b/src/main/webapp/WEB-INF/views/itxprotocolprotocols/update.jspx
deleted file mode 100755
index d6d62d56a..000000000
--- a/src/main/webapp/WEB-INF/views/itxprotocolprotocols/update.jspx
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ItxProtocolProtocol" modelAttribute="itxProtocolProtocol" path="/itxprotocolprotocols" versionField="Version" z="uKuulCSGVV11kNCxoRsYPWt0JZA=">
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_lsType" required="true" z="Ge0KG6nf4PkJMg/mKwoj+HqjcxQ="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_lsKind" required="true" z="R7p8pQm1j+N+Bbnlzdofwqbo+Mk="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_lsTypeAndKind" z="/4DpmECQ8AnGnQ1FMngyQhAIDDY="/>
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_codeName" z="1P8n/1ZkhUbFO4LHM78sQgl0eGc="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_recordedBy" required="true" z="TrL0qTW5fc70lX0cMUSlryYiQNI="/>
-        <field:datetime dateTimePattern="${itxProtocolProtocol_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_recordedDate" required="true" z="vGBf1UQjTPc0Z6SYyYs2B/L8JgA="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_modifiedBy" z="JDv1Wl9Olms8z1kv2UCMOeZWb20="/>
-        <field:datetime dateTimePattern="${itxProtocolProtocol_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_modifiedDate" z="GMriluzYXIjMMYbT2zA6dPoN9SI="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_ignored" z="pf3OJqAyANe9QFkOOK4tmKcrsds="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_lsTransaction" validationMessageCode="field_invalid_integer" z="1m1rWLPwYk6COiHWoccJdHPLPDM="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="bOcEa9FmBJ6mfrTtK1645vYm6tI="/>
-        <field:select field="firstProtocol" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_firstProtocol" itemValue="id" items="${protocols}" path="/protocols" required="true" z="FFEiXTlu00RT/Z+b8OgfTLLoWhw="/>
-        <field:select field="secondProtocol" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_secondProtocol" itemValue="id" items="${protocols}" path="/protocols" required="true" z="dHkpNO0sMrV76sF5XE9GnrMu3xo="/>
-        <field:simple field="lsStates" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_lsStates" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Protocol Protocol State" z="Oy7KAGSqy24DOiyJlJ/TBU9u88I="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxProtocolProtocol_deleted" z="4FH7vwehZ5SUxG9RImVflDHDkQE="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxprotocolprotocols/views.xml b/src/main/webapp/WEB-INF/views/itxprotocolprotocols/views.xml
deleted file mode 100755
index 692d09ddb..000000000
--- a/src/main/webapp/WEB-INF/views/itxprotocolprotocols/views.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="itxprotocolprotocols/list">
-        <put-attribute name="body" value="/WEB-INF/views/itxprotocolprotocols/list.jspx"/>
-    </definition>
-<definition extends="default" name="itxprotocolprotocols/show">
-        <put-attribute name="body" value="/WEB-INF/views/itxprotocolprotocols/show.jspx"/>
-    </definition>
-<definition extends="default" name="itxprotocolprotocols/create">
-        <put-attribute name="body" value="/WEB-INF/views/itxprotocolprotocols/create.jspx"/>
-    </definition>
-<definition extends="default" name="itxprotocolprotocols/update">
-        <put-attribute name="body" value="/WEB-INF/views/itxprotocolprotocols/update.jspx"/>
-    </definition>
-<definition extends="default" name="itxprotocolprotocols/findItxProtocolProtocolsByFirstProtocol">
-        <put-attribute name="body" value="/WEB-INF/views/itxprotocolprotocols/findItxProtocolProtocolsByFirstProtocol.jspx"/>
-    </definition>
-<definition extends="default" name="itxprotocolprotocols/findItxProtocolProtocolsByLsTransactionEquals">
-        <put-attribute name="body" value="/WEB-INF/views/itxprotocolprotocols/findItxProtocolProtocolsByLsTransactionEquals.jspx"/>
-    </definition>
-<definition extends="default" name="itxprotocolprotocols/findItxProtocolProtocolsBySecondProtocol">
-        <put-attribute name="body" value="/WEB-INF/views/itxprotocolprotocols/findItxProtocolProtocolsBySecondProtocol.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/itxprotocolprotocolstates/create.jspx b/src/main/webapp/WEB-INF/views/itxprotocolprotocolstates/create.jspx
deleted file mode 100755
index c5abea473..000000000
--- a/src/main/webapp/WEB-INF/views/itxprotocolprotocolstates/create.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ItxProtocolProtocolState" modelAttribute="itxProtocolProtocolState" path="/itxprotocolprotocolstates" render="${empty dependencies}" z="Axiobrw3MZdFwo05obW/jAay8hk=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_recordedBy" required="true" z="xUla7xKZhWkqp7NuY9oz/svL4PM="/>
-        <field:datetime dateTimePattern="${itxProtocolProtocolState_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_recordedDate" required="true" z="XPxTGWE262v0Dx/j3YENvXssFZk="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_modifiedBy" z="0m0fXwFKO+F/lNwRALcDKHoHpsk="/>
-        <field:datetime dateTimePattern="${itxProtocolProtocolState_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_modifiedDate" z="xv+91JRzeX9984/k2ukRqM3YT+U="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_lsType" required="true" z="auUWO4gBOqSkK0qn/I0OVxB3pIs="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_lsKind" required="true" z="VgfDmg8+oRG6kSLp2htyqDg/DC0="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_lsTypeAndKind" z="sJrh70OshEY9MNPK8bFsP8s2Qvw="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_comments" z="ZxBO7SJ78Qfw3ZATSQsutMcMYM4="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_ignored" z="VyBNn0PVWTUC0I/q7yXW4o5wyDc="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_lsTransaction" validationMessageCode="field_invalid_integer" z="cFArUcG8dxFJyTMFeknRKv1HZ2A="/>
-        <field:select field="itxProtocolProtocol" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_itxProtocolProtocol" itemValue="id" items="${itxprotocolprotocols}" path="/itxprotocolprotocols" z="9VmWmChTBsIrVcQKXsJSL6vYRsw="/>
-        <field:simple field="lsValues" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_lsValues" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Protocol Protocol Value" z="nSZxMTwEOt6f8qkB0RlvhAr3NOI="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_deleted" z="myZEp+ZzD2exHiY/We3P8nLAQ8w="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ItxProtocolProtocolState" render="${not empty dependencies}" z="rFZXwo82tejLZRQpsKULN7cjAV8="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxprotocolprotocolstates/list.jspx b/src/main/webapp/WEB-INF/views/itxprotocolprotocolstates/list.jspx
deleted file mode 100755
index 3d8d44209..000000000
--- a/src/main/webapp/WEB-INF/views/itxprotocolprotocolstates/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ItxProtocolProtocolState" items="${itxprotocolprotocolstates}" z="q+lCqBzVmsicKAYP4DyNWGjVulg=">
-        <table:table data="${itxprotocolprotocolstates}" id="l_com_labsynch_labseer_domain_ItxProtocolProtocolState" path="/itxprotocolprotocolstates" z="kCMMA+J48Ql8e65XiPzbhgPlzqo=">
-            <table:column id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_recordedBy" property="recordedBy" z="/pStcjWVAi+Rw6OxvCc5QR5EHvc="/>
-            <table:column date="true" dateTimePattern="${itxProtocolProtocolState_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_recordedDate" property="recordedDate" z="6pyfvXjUfV6Sz3gHHmzLl9+m3O0="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_modifiedBy" property="modifiedBy" z="oOjCBrRWrByxyWSZV2SM8BX3tQg="/>
-            <table:column date="true" dateTimePattern="${itxProtocolProtocolState_modifieddate_date_format}" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_modifiedDate" property="modifiedDate" z="dwlAVkdTGg/hAwbUDpabWI6kGD4="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_lsType" property="lsType" z="xr9UeykemeiQGIEb2yl7VrdXH4s="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_lsKind" property="lsKind" z="UCx4y4y8f5hqJGK8s6YdmEYqKs0="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxprotocolprotocolstates/show.jspx b/src/main/webapp/WEB-INF/views/itxprotocolprotocolstates/show.jspx
deleted file mode 100755
index d784ee6a3..000000000
--- a/src/main/webapp/WEB-INF/views/itxprotocolprotocolstates/show.jspx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ItxProtocolProtocolState" object="${itxprotocolprotocolstate}" path="/itxprotocolprotocolstates" z="12TAAgMr5QrUOgOx1IsIw7bXIo4=">
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolState_recordedBy" object="${itxprotocolprotocolstate}" z="iwLSmtvawQQtnoXao8VydbsYvW4="/>
-        <field:display date="true" dateTimePattern="${itxProtocolProtocolState_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolState_recordedDate" object="${itxprotocolprotocolstate}" z="hnDw3lZNJu8d5l/b53o3W9O2Mbs="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolState_modifiedBy" object="${itxprotocolprotocolstate}" z="P5VZZ4mlESMMslUhfHyQ/piJOUA="/>
-        <field:display date="true" dateTimePattern="${itxProtocolProtocolState_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolState_modifiedDate" object="${itxprotocolprotocolstate}" z="RMFzq90Fk6t+akF95AaNoj2vcqI="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolState_lsType" object="${itxprotocolprotocolstate}" z="MACFksNpsOCpyle7HJpZ7g595Zc="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolState_lsKind" object="${itxprotocolprotocolstate}" z="aoNYAD0wfVzfEo7ElIKnrYK/0/8="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolState_lsTypeAndKind" object="${itxprotocolprotocolstate}" z="qNzNT/WW7/1AJLh2P6GvYniZP+g="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolState_comments" object="${itxprotocolprotocolstate}" z="9juhc4KVegClSRBz7WCgtqQcauM="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolState_ignored" object="${itxprotocolprotocolstate}" z="1jKj2AjPnaA11e5S7jYLQbPn6F0="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolState_lsTransaction" object="${itxprotocolprotocolstate}" z="nERqJh48UvzmlZ+d65+RMAER5E4="/>
-        <field:display field="itxProtocolProtocol" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolState_itxProtocolProtocol" object="${itxprotocolprotocolstate}" z="Lp2sLgPTM60W6gjPXg3f/kyvj3s="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolState_deleted" object="${itxprotocolprotocolstate}" z="Axh+OsNI5pn9cRnG6tHDoOnEv1E="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxprotocolprotocolstates/update.jspx b/src/main/webapp/WEB-INF/views/itxprotocolprotocolstates/update.jspx
deleted file mode 100755
index ba29249b3..000000000
--- a/src/main/webapp/WEB-INF/views/itxprotocolprotocolstates/update.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ItxProtocolProtocolState" modelAttribute="itxProtocolProtocolState" path="/itxprotocolprotocolstates" versionField="Version" z="yAU629vgo2ZFAz4vIjUMKUKJA3Q=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_recordedBy" required="true" z="xUla7xKZhWkqp7NuY9oz/svL4PM="/>
-        <field:datetime dateTimePattern="${itxProtocolProtocolState_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_recordedDate" required="true" z="XPxTGWE262v0Dx/j3YENvXssFZk="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_modifiedBy" z="0m0fXwFKO+F/lNwRALcDKHoHpsk="/>
-        <field:datetime dateTimePattern="${itxProtocolProtocolState_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_modifiedDate" z="xv+91JRzeX9984/k2ukRqM3YT+U="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_lsType" required="true" z="auUWO4gBOqSkK0qn/I0OVxB3pIs="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_lsKind" required="true" z="VgfDmg8+oRG6kSLp2htyqDg/DC0="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_lsTypeAndKind" z="sJrh70OshEY9MNPK8bFsP8s2Qvw="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_comments" z="ZxBO7SJ78Qfw3ZATSQsutMcMYM4="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_ignored" z="VyBNn0PVWTUC0I/q7yXW4o5wyDc="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_lsTransaction" validationMessageCode="field_invalid_integer" z="cFArUcG8dxFJyTMFeknRKv1HZ2A="/>
-        <field:select field="itxProtocolProtocol" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_itxProtocolProtocol" itemValue="id" items="${itxprotocolprotocols}" path="/itxprotocolprotocols" z="9VmWmChTBsIrVcQKXsJSL6vYRsw="/>
-        <field:simple field="lsValues" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_lsValues" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Protocol Protocol Value" z="nSZxMTwEOt6f8qkB0RlvhAr3NOI="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolState_deleted" z="myZEp+ZzD2exHiY/We3P8nLAQ8w="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxprotocolprotocolstates/views.xml b/src/main/webapp/WEB-INF/views/itxprotocolprotocolstates/views.xml
deleted file mode 100755
index 85ad9c049..000000000
--- a/src/main/webapp/WEB-INF/views/itxprotocolprotocolstates/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="itxprotocolprotocolstates/list">
-        <put-attribute name="body" value="/WEB-INF/views/itxprotocolprotocolstates/list.jspx"/>
-    </definition>
-<definition extends="default" name="itxprotocolprotocolstates/show">
-        <put-attribute name="body" value="/WEB-INF/views/itxprotocolprotocolstates/show.jspx"/>
-    </definition>
-<definition extends="default" name="itxprotocolprotocolstates/create">
-        <put-attribute name="body" value="/WEB-INF/views/itxprotocolprotocolstates/create.jspx"/>
-    </definition>
-<definition extends="default" name="itxprotocolprotocolstates/update">
-        <put-attribute name="body" value="/WEB-INF/views/itxprotocolprotocolstates/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/itxprotocolprotocolvalues/create.jspx b/src/main/webapp/WEB-INF/views/itxprotocolprotocolvalues/create.jspx
deleted file mode 100755
index 44cc85834..000000000
--- a/src/main/webapp/WEB-INF/views/itxprotocolprotocolvalues/create.jspx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ItxProtocolProtocolValue" modelAttribute="itxProtocolProtocolValue" path="/itxprotocolprotocolvalues" render="${empty dependencies}" z="4hSTq+wEKbuSKywbB/rxQIP12kk=">
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_lsType" required="true" z="VWxPmjwMwR3Sf9z2ZnCcN/VbaVA="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_lsKind" required="true" z="8KEKTxEklXzI5kayTjqYkDDE3Jw="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_lsTypeAndKind" z="ZF9UeT2dJ05+aBDvcucpuTpGgvE="/>
-        <field:textarea field="codeType" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_codeType" z="o5lpBfmC1TbF1iUHw53MsEKxxvE="/>
-        <field:textarea field="codeKind" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_codeKind" z="OwY1J3zcaFQB6vnc2S9NYWjz8y8="/>
-        <field:textarea field="codeTypeAndKind" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_codeTypeAndKind" z="Xj0iGoSaeD1oxPD/aYojZSm8VA8="/>
-        <field:textarea field="stringValue" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_stringValue" z="ni/Ez7J/IdAqAO8lq7B4Zd/7uzQ="/>
-        <field:textarea field="codeValue" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_codeValue" z="Dw8Yr1fkBYacbY37HX/TNTW6tJQ="/>
-        <field:textarea field="fileValue" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_fileValue" z="lqGV+lxyZbgeGY5RAMVCJfhsVTg="/>
-        <field:textarea field="urlValue" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_urlValue" z="ERJrR6GEyAJUT4+txaXc0ys+3/0="/>
-        <field:datetime dateTimePattern="${itxProtocolProtocolValue_datevalue_date_format}" field="dateValue" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_dateValue" z="Y/USjKslSzVgbwBSBotOaTw48DI="/>
-        <field:input field="clobValue" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_clobValue" z="IbEDghhLOLGc7Zy/Wg1yfPiXZJQ="/>
-        <field:input field="blobValue" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_blobValue" z="hKMNdZpMfYAUgsUfdNJHZ2t2dg4="/>
-        <field:input field="operatorType" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_operatorType" max="25" z="8ZeFZrnKCM/kKtG9jdDkpQAVcpk="/>
-        <field:input field="operatorKind" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_operatorKind" max="10" z="/trl/Zx5+FGZ3rtuMZxC764EFiU="/>
-        <field:textarea field="operatorTypeAndKind" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_operatorTypeAndKind" z="0nvj2q2OrGJxprVBalcK7o439Fw="/>
-        <field:input field="numericValue" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_numericValue" validationMessageCode="field_invalid_number" z="cw+UmhcrnqBC2MS6q8I3XDqSWbA="/>
-        <field:input field="sigFigs" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_sigFigs" validationMessageCode="field_invalid_integer" z="6rDPmhbpXoP/yWI8edQk5xSCDG4="/>
-        <field:input field="uncertainty" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_uncertainty" validationMessageCode="field_invalid_number" z="jIOAy1QqIcjZg82e8US931MTIVc="/>
-        <field:input field="numberOfReplicates" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_numberOfReplicates" validationMessageCode="field_invalid_integer" z="+Y/ASebM1ASMebJcUWHHDCSs10k="/>
-        <field:textarea field="uncertaintyType" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_uncertaintyType" z="ST5fhZXURRHIcIYtNKkQjENdYAk="/>
-        <field:input field="unitType" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_unitType" max="25" z="TO7gyOh0+MHvL21bFymDZbjK34Y="/>
-        <field:input field="unitKind" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_unitKind" max="25" z="z/C9biRDTmTCqWZ9bxaH/xsJXBw="/>
-        <field:textarea field="unitTypeAndKind" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_unitTypeAndKind" z="I0E7g50dcTy267FOlxER8A4TEk0="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_comments" z="jTEqwILBz0AjOmbdR+r0TDq0WAQ="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_ignored" z="KJ36opPu9AKWYKx1CAqsfOiK/oo="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_lsTransaction" validationMessageCode="field_invalid_integer" z="usJpOspRL+SpnOERvqJhNyC4PTQ="/>
-        <field:datetime dateTimePattern="${itxProtocolProtocolValue_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_recordedDate" required="true" z="wUaSn4B7Ale+H2R1ZXjJxuHuSdk="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_recordedBy" required="true" z="o8ZzVJlRaQFtVJD/pKjZCaDSsMU="/>
-        <field:datetime dateTimePattern="${itxProtocolProtocolValue_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_modifiedDate" z="kl9z1Irc+YeWR4EBIY/0ZQy8F6w="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_modifiedBy" z="iGdYYqa4zqejLhZHySIXKD21i9k="/>
-        <field:checkbox field="publicData" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_publicData" z="2fbsJalx+OfFEMzkI5rBONf+JEg="/>
-        <field:select field="lsState" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_lsState" itemValue="id" items="${itxprotocolprotocolstates}" path="/itxprotocolprotocolstates" z="M0aSthrtqJ9HgxgfWG3lriJBKts="/>
-        <field:textarea field="codeOrigin" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_codeOrigin" z="iZvDzl/XDTDJIAJ7KHuyQ15Ek34="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_deleted" z="ozl0WQiUv60vKpMbKqXWJWKiy1w="/>
-        <field:input field="concentration" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_concentration" validationMessageCode="field_invalid_number" z="LDj0kbUppkynLc+7wfeasRxZosw="/>
-        <field:input field="concUnit" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_concUnit" max="25" z="qL4Ojt83GBqAVoiroVytHznJDwA="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ItxProtocolProtocolValue" render="${not empty dependencies}" z="y+gEPrQYpDT1KPq2gSzYBKoSrNc="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxprotocolprotocolvalues/list.jspx b/src/main/webapp/WEB-INF/views/itxprotocolprotocolvalues/list.jspx
deleted file mode 100755
index 1f3a0b8ae..000000000
--- a/src/main/webapp/WEB-INF/views/itxprotocolprotocolvalues/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ItxProtocolProtocolValue" items="${itxprotocolprotocolvalues}" z="OWA5doi56meQTMHqlQdFjCuu1Kw=">
-        <table:table data="${itxprotocolprotocolvalues}" id="l_com_labsynch_labseer_domain_ItxProtocolProtocolValue" path="/itxprotocolprotocolvalues" z="TRWZ1nKNDjZCwRupRoHSqBw1cFk=">
-            <table:column id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_lsType" property="lsType" z="dPae/rLss2zkw9NFGlnv0E4skAU="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_lsKind" property="lsKind" z="36Ad7SueV9CHCNnJF3v8OWRYk7c="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_lsTypeAndKind" property="lsTypeAndKind" z="88JkjA8VlVbMGAhO+2MfyA3iTDI="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_ignored" property="ignored" z="YL5KWmVcMjIaCggK4aBKt8ZJGKw="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_publicData" property="publicData" z="ELvRW2n/VClNMhgV7r1uBamsK/Y="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_deleted" property="deleted" z="u0HmpOgCa0/rlqne3c+SxXNjbFo="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxprotocolprotocolvalues/show.jspx b/src/main/webapp/WEB-INF/views/itxprotocolprotocolvalues/show.jspx
deleted file mode 100755
index 2ffcb676c..000000000
--- a/src/main/webapp/WEB-INF/views/itxprotocolprotocolvalues/show.jspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ItxProtocolProtocolValue" object="${itxprotocolprotocolvalue}" path="/itxprotocolprotocolvalues" z="gnH/Monj+Oldu/suNWmQHPtxqOM=">
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_lsType" object="${itxprotocolprotocolvalue}" z="nJRoXKySGrHEDy10e3H/kJUJf+s="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_lsKind" object="${itxprotocolprotocolvalue}" z="RCQLh5yaf2XkKUAIH8eHWM6g8T0="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_lsTypeAndKind" object="${itxprotocolprotocolvalue}" z="Pt+gaKJhG+0ouocEVAmQvpUsQp8="/>
-        <field:display field="codeType" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_codeType" object="${itxprotocolprotocolvalue}" z="5lGeoxpbp2qMdtyhqpdoq6zTMcU="/>
-        <field:display field="codeKind" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_codeKind" object="${itxprotocolprotocolvalue}" z="wszgmuuPPPR3/31m0il831MkGt4="/>
-        <field:display field="codeTypeAndKind" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_codeTypeAndKind" object="${itxprotocolprotocolvalue}" z="CQwkRDpYBtBBB9K2sQEYLm+yKhw="/>
-        <field:display field="stringValue" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_stringValue" object="${itxprotocolprotocolvalue}" z="r50amY6uQ3cjuS9huqbCMimhLy8="/>
-        <field:display field="codeValue" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_codeValue" object="${itxprotocolprotocolvalue}" z="1XNWKP21LZbbW40kirZigPso2OQ="/>
-        <field:display field="fileValue" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_fileValue" object="${itxprotocolprotocolvalue}" z="kT5YEnFM6KquckBXszrj9DrrdRE="/>
-        <field:display field="urlValue" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_urlValue" object="${itxprotocolprotocolvalue}" z="rCjCUX7e6c78oNW8Vu+NMaJZvz8="/>
-        <field:display date="true" dateTimePattern="${itxProtocolProtocolValue_datevalue_date_format}" field="dateValue" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_dateValue" object="${itxprotocolprotocolvalue}" z="9Gufcl9W42l5FE6FBNNAQe/1q+A="/>
-        <field:display field="clobValue" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_clobValue" object="${itxprotocolprotocolvalue}" z="rg6rp7vVy4tiYReo8tV0orc7o0Q="/>
-        <field:display field="blobValue" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_blobValue" object="${itxprotocolprotocolvalue}" z="37vSieIx4HRE49+lxw5HhZWseog="/>
-        <field:display field="operatorType" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_operatorType" object="${itxprotocolprotocolvalue}" z="t9FcBARquf6Uj7mimxYkLuzdCXA="/>
-        <field:display field="operatorKind" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_operatorKind" object="${itxprotocolprotocolvalue}" z="817zC6ZoVnRcFNUxuBrysTEkxC4="/>
-        <field:display field="operatorTypeAndKind" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_operatorTypeAndKind" object="${itxprotocolprotocolvalue}" z="3Otvd8xJCdsGpynPXBUp/AGH1Ik="/>
-        <field:display field="numericValue" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_numericValue" object="${itxprotocolprotocolvalue}" z="MOs8ZesKkNQ4TtwwQdSTJauG68s="/>
-        <field:display field="sigFigs" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_sigFigs" object="${itxprotocolprotocolvalue}" z="cw8gRwVM8sYxQ4qXuywA5/ltctM="/>
-        <field:display field="uncertainty" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_uncertainty" object="${itxprotocolprotocolvalue}" z="w49J+w9/nYc3aw1LbBoWu84v540="/>
-        <field:display field="numberOfReplicates" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_numberOfReplicates" object="${itxprotocolprotocolvalue}" z="3s55gpMK0TAtmscXbMwTuzz817I="/>
-        <field:display field="uncertaintyType" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_uncertaintyType" object="${itxprotocolprotocolvalue}" z="zrf22rN+qNIyRPqP87unYcqQsJA="/>
-        <field:display field="unitType" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_unitType" object="${itxprotocolprotocolvalue}" z="+1LJ5GIK+wOH/++H5KG7W7TKIa8="/>
-        <field:display field="unitKind" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_unitKind" object="${itxprotocolprotocolvalue}" z="HjWV+uaxfeUfo9E8nqhOOS3jUbU="/>
-        <field:display field="unitTypeAndKind" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_unitTypeAndKind" object="${itxprotocolprotocolvalue}" z="TQ+fnlRHN/HoSWIpZkVMbJ2REFo="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_comments" object="${itxprotocolprotocolvalue}" z="3UOL+9k3RQ4Lk8hqCzFx1w3HI5w="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_ignored" object="${itxprotocolprotocolvalue}" z="h5q2VY7dP7n20r3wUhfHE2T8gpk="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_lsTransaction" object="${itxprotocolprotocolvalue}" z="i5VbRO5N+Lfhb1FYvwit6wAfycs="/>
-        <field:display date="true" dateTimePattern="${itxProtocolProtocolValue_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_recordedDate" object="${itxprotocolprotocolvalue}" z="GYKUd2cNnjf4HjOutaDJ6wdcsa4="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_recordedBy" object="${itxprotocolprotocolvalue}" z="r+SHmRlckxyGg5eafYZJ6Sz/Xts="/>
-        <field:display date="true" dateTimePattern="${itxProtocolProtocolValue_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_modifiedDate" object="${itxprotocolprotocolvalue}" z="5m1R+g4sSROoImWT6kKPXMYQsnk="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_modifiedBy" object="${itxprotocolprotocolvalue}" z="bqLkrB0sWfM/jDrkEhTmDv+iGlU="/>
-        <field:display field="publicData" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_publicData" object="${itxprotocolprotocolvalue}" z="VOvOQ4jfJha7y4lbog1ES5Hbq/A="/>
-        <field:display field="lsState" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_lsState" object="${itxprotocolprotocolvalue}" z="PBESXVzZED5KCvDOHDiixBpbjkA="/>
-        <field:display field="codeOrigin" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_codeOrigin" object="${itxprotocolprotocolvalue}" z="MlrLYf9zMROO9xCJkpNPOzX5Kz4="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_deleted" object="${itxprotocolprotocolvalue}" z="krY/P2Vx3qAsjGd117PE3HrBYa0="/>
-        <field:display field="concentration" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_concentration" object="${itxprotocolprotocolvalue}" z="SWamLrz4AtBffflaQLfCUNlGtvI="/>
-        <field:display field="concUnit" id="s_com_labsynch_labseer_domain_ItxProtocolProtocolValue_concUnit" object="${itxprotocolprotocolvalue}" z="qP26AyhMOIieGO1OBe79v8zPibM="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxprotocolprotocolvalues/update.jspx b/src/main/webapp/WEB-INF/views/itxprotocolprotocolvalues/update.jspx
deleted file mode 100755
index 85f189fe2..000000000
--- a/src/main/webapp/WEB-INF/views/itxprotocolprotocolvalues/update.jspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ItxProtocolProtocolValue" modelAttribute="itxProtocolProtocolValue" path="/itxprotocolprotocolvalues" versionField="Version" z="OWZYnwXkI1S+TDI+jS/Sb4wonhk=">
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_lsType" required="true" z="VWxPmjwMwR3Sf9z2ZnCcN/VbaVA="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_lsKind" required="true" z="8KEKTxEklXzI5kayTjqYkDDE3Jw="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_lsTypeAndKind" z="ZF9UeT2dJ05+aBDvcucpuTpGgvE="/>
-        <field:textarea field="codeType" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_codeType" z="o5lpBfmC1TbF1iUHw53MsEKxxvE="/>
-        <field:textarea field="codeKind" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_codeKind" z="OwY1J3zcaFQB6vnc2S9NYWjz8y8="/>
-        <field:textarea field="codeTypeAndKind" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_codeTypeAndKind" z="Xj0iGoSaeD1oxPD/aYojZSm8VA8="/>
-        <field:textarea field="stringValue" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_stringValue" z="ni/Ez7J/IdAqAO8lq7B4Zd/7uzQ="/>
-        <field:textarea field="codeValue" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_codeValue" z="Dw8Yr1fkBYacbY37HX/TNTW6tJQ="/>
-        <field:textarea field="fileValue" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_fileValue" z="lqGV+lxyZbgeGY5RAMVCJfhsVTg="/>
-        <field:textarea field="urlValue" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_urlValue" z="ERJrR6GEyAJUT4+txaXc0ys+3/0="/>
-        <field:datetime dateTimePattern="${itxProtocolProtocolValue_datevalue_date_format}" field="dateValue" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_dateValue" z="Y/USjKslSzVgbwBSBotOaTw48DI="/>
-        <field:input field="clobValue" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_clobValue" z="IbEDghhLOLGc7Zy/Wg1yfPiXZJQ="/>
-        <field:input field="blobValue" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_blobValue" z="hKMNdZpMfYAUgsUfdNJHZ2t2dg4="/>
-        <field:input field="operatorType" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_operatorType" max="25" z="8ZeFZrnKCM/kKtG9jdDkpQAVcpk="/>
-        <field:input field="operatorKind" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_operatorKind" max="10" z="/trl/Zx5+FGZ3rtuMZxC764EFiU="/>
-        <field:textarea field="operatorTypeAndKind" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_operatorTypeAndKind" z="0nvj2q2OrGJxprVBalcK7o439Fw="/>
-        <field:input field="numericValue" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_numericValue" validationMessageCode="field_invalid_number" z="cw+UmhcrnqBC2MS6q8I3XDqSWbA="/>
-        <field:input field="sigFigs" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_sigFigs" validationMessageCode="field_invalid_integer" z="6rDPmhbpXoP/yWI8edQk5xSCDG4="/>
-        <field:input field="uncertainty" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_uncertainty" validationMessageCode="field_invalid_number" z="jIOAy1QqIcjZg82e8US931MTIVc="/>
-        <field:input field="numberOfReplicates" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_numberOfReplicates" validationMessageCode="field_invalid_integer" z="+Y/ASebM1ASMebJcUWHHDCSs10k="/>
-        <field:textarea field="uncertaintyType" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_uncertaintyType" z="ST5fhZXURRHIcIYtNKkQjENdYAk="/>
-        <field:input field="unitType" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_unitType" max="25" z="TO7gyOh0+MHvL21bFymDZbjK34Y="/>
-        <field:input field="unitKind" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_unitKind" max="25" z="z/C9biRDTmTCqWZ9bxaH/xsJXBw="/>
-        <field:textarea field="unitTypeAndKind" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_unitTypeAndKind" z="I0E7g50dcTy267FOlxER8A4TEk0="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_comments" z="jTEqwILBz0AjOmbdR+r0TDq0WAQ="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_ignored" z="KJ36opPu9AKWYKx1CAqsfOiK/oo="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_lsTransaction" validationMessageCode="field_invalid_integer" z="usJpOspRL+SpnOERvqJhNyC4PTQ="/>
-        <field:datetime dateTimePattern="${itxProtocolProtocolValue_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_recordedDate" required="true" z="wUaSn4B7Ale+H2R1ZXjJxuHuSdk="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_recordedBy" required="true" z="o8ZzVJlRaQFtVJD/pKjZCaDSsMU="/>
-        <field:datetime dateTimePattern="${itxProtocolProtocolValue_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_modifiedDate" z="kl9z1Irc+YeWR4EBIY/0ZQy8F6w="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_modifiedBy" z="iGdYYqa4zqejLhZHySIXKD21i9k="/>
-        <field:checkbox field="publicData" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_publicData" z="2fbsJalx+OfFEMzkI5rBONf+JEg="/>
-        <field:select field="lsState" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_lsState" itemValue="id" items="${itxprotocolprotocolstates}" path="/itxprotocolprotocolstates" z="M0aSthrtqJ9HgxgfWG3lriJBKts="/>
-        <field:textarea field="codeOrigin" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_codeOrigin" z="iZvDzl/XDTDJIAJ7KHuyQ15Ek34="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_deleted" z="ozl0WQiUv60vKpMbKqXWJWKiy1w="/>
-        <field:input field="concentration" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_concentration" validationMessageCode="field_invalid_number" z="LDj0kbUppkynLc+7wfeasRxZosw="/>
-        <field:input field="concUnit" id="c_com_labsynch_labseer_domain_ItxProtocolProtocolValue_concUnit" max="25" z="qL4Ojt83GBqAVoiroVytHznJDwA="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxprotocolprotocolvalues/views.xml b/src/main/webapp/WEB-INF/views/itxprotocolprotocolvalues/views.xml
deleted file mode 100755
index 4b4cefa8a..000000000
--- a/src/main/webapp/WEB-INF/views/itxprotocolprotocolvalues/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="itxprotocolprotocolvalues/list">
-        <put-attribute name="body" value="/WEB-INF/views/itxprotocolprotocolvalues/list.jspx"/>
-    </definition>
-<definition extends="default" name="itxprotocolprotocolvalues/show">
-        <put-attribute name="body" value="/WEB-INF/views/itxprotocolprotocolvalues/show.jspx"/>
-    </definition>
-<definition extends="default" name="itxprotocolprotocolvalues/create">
-        <put-attribute name="body" value="/WEB-INF/views/itxprotocolprotocolvalues/create.jspx"/>
-    </definition>
-<definition extends="default" name="itxprotocolprotocolvalues/update">
-        <put-attribute name="body" value="/WEB-INF/views/itxprotocolprotocolvalues/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/itxsubjectcontainers/create.jspx b/src/main/webapp/WEB-INF/views/itxsubjectcontainers/create.jspx
deleted file mode 100755
index a477e9feb..000000000
--- a/src/main/webapp/WEB-INF/views/itxsubjectcontainers/create.jspx
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ItxSubjectContainer" modelAttribute="itxSubjectContainer" path="/itxsubjectcontainers" render="${empty dependencies}" z="zxCrUcbpz0FNhidIWeZE4ar9+co=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_recordedBy" required="true" z="sot7UHNpY+CbUOODfDWo/iPi7Zc="/>
-        <field:datetime dateTimePattern="${itxSubjectContainer_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_recordedDate" required="true" z="/e3jvmJvzZO+sFDi7RBI1V2+/Zg="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_modifiedBy" z="gFBVm8EV1Eo6cG22K1yNQKwZys0="/>
-        <field:datetime dateTimePattern="${itxSubjectContainer_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_modifiedDate" z="SdAHWdKoE8YSvCRx9k0a3hI6Vsw="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_ignored" z="05fRQrETLHfNG7pm3ag0ixmWUA8="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_lsTransaction" validationMessageCode="field_invalid_integer" z="NwcS4EteDUWWmF6IEd9rt803XA0="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="aEhMPL/Vy5GaT70rOeLgqwKcBNM="/>
-        <field:select field="subject" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_subject" itemValue="id" items="${subjects}" path="/subjects" required="true" z="/Ng9SUpU4O3BOJASXk8ZOSJE/gg="/>
-        <field:select field="container" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_container" itemValue="id" items="${containers}" path="/containers" required="true" z="B2hP9oRtxm49/a00YzosFqMX1U8="/>
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_codeName" z="FQmt7xHJJEW0NtDFeu4YPiEIQ9k="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_lsType" required="true" z="1EDUb7chOfWkDgMKNBU+UUC7/AI="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_lsKind" required="true" z="gkCYoBpjzoajK/tVoiMtEdiF7rI="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_lsTypeAndKind" z="ok0NHPvMgzlg2ukKH8/Bk+s8TaA="/>
-        <field:simple field="lsStates" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_lsStates" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Subject Container State" z="1pzwm0tUohhW0psdDUJbXPGCXlk="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_deleted" z="XGquMMW6jQKopgRcJxFL2BQAQoU="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ItxSubjectContainer" render="${not empty dependencies}" z="308W862JPLq+kRLIg+EZo+tpPlo="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxsubjectcontainers/findItxSubjectContainersByCodeNameEquals.jspx b/src/main/webapp/WEB-INF/views/itxsubjectcontainers/findItxSubjectContainersByCodeNameEquals.jspx
deleted file mode 100755
index 6e4d66ffe..000000000
--- a/src/main/webapp/WEB-INF/views/itxsubjectcontainers/findItxSubjectContainersByCodeNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeNameEquals" id="ff_com_labsynch_labseer_domain_ItxSubjectContainer" path="/itxsubjectcontainers" z="kVWt0K9OBcdvqlJynCBs5udd36Q=">
-        <field:input disableFormBinding="true" field="codeName" id="f_com_labsynch_labseer_domain_ItxSubjectContainer_codeName" max="255" required="true" z="wyXR0eJDb5mZ9ZCtoLIzZMrAvSs="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxsubjectcontainers/findItxSubjectContainersByContainer.jspx b/src/main/webapp/WEB-INF/views/itxsubjectcontainers/findItxSubjectContainersByContainer.jspx
deleted file mode 100755
index 97e67bb29..000000000
--- a/src/main/webapp/WEB-INF/views/itxsubjectcontainers/findItxSubjectContainersByContainer.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByContainer" id="ff_com_labsynch_labseer_domain_ItxSubjectContainer" path="/itxsubjectcontainers" z="aZ8tpHWE/wgaIWlWS183HAe/Dmk=">
-        <field:select disableFormBinding="true" field="container" id="f_com_labsynch_labseer_domain_ItxSubjectContainer_container" itemValue="id" items="${containers}" path="/containers" required="true" z="YYAZ3exScLs3ELTe7cKYviOjPRA="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxsubjectcontainers/findItxSubjectContainersByLsTransactionEquals.jspx b/src/main/webapp/WEB-INF/views/itxsubjectcontainers/findItxSubjectContainersByLsTransactionEquals.jspx
deleted file mode 100755
index 169758fd6..000000000
--- a/src/main/webapp/WEB-INF/views/itxsubjectcontainers/findItxSubjectContainersByLsTransactionEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTransactionEquals" id="ff_com_labsynch_labseer_domain_ItxSubjectContainer" path="/itxsubjectcontainers" z="kecEgYzE/UFkEbu2iTu94fj+qpg=">
-        <field:input disableFormBinding="true" field="lsTransaction" id="f_com_labsynch_labseer_domain_ItxSubjectContainer_lsTransaction" required="true" validationMessageCode="field_invalid_integer" z="zqeQbuopTWWkzuahy/O7hqKij9k="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxsubjectcontainers/findItxSubjectContainersBySubject.jspx b/src/main/webapp/WEB-INF/views/itxsubjectcontainers/findItxSubjectContainersBySubject.jspx
deleted file mode 100755
index 4256ad18d..000000000
--- a/src/main/webapp/WEB-INF/views/itxsubjectcontainers/findItxSubjectContainersBySubject.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="BySubject" id="ff_com_labsynch_labseer_domain_ItxSubjectContainer" path="/itxsubjectcontainers" z="tIWWrKKwu2X4mBMqFBipQ2dM7HM=">
-        <field:select disableFormBinding="true" field="subject" id="f_com_labsynch_labseer_domain_ItxSubjectContainer_subject" itemValue="id" items="${subjects}" path="/subjects" required="true" z="8ZHBC4OL+W/vM2C3oK992tzhFwA="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxsubjectcontainers/list.jspx b/src/main/webapp/WEB-INF/views/itxsubjectcontainers/list.jspx
deleted file mode 100755
index 836ee2ae9..000000000
--- a/src/main/webapp/WEB-INF/views/itxsubjectcontainers/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ItxSubjectContainer" items="${itxsubjectcontainers}" z="vhpI+6/a3K+GSIwy802+r3Fft/g=">
-        <table:table data="${itxsubjectcontainers}" id="l_com_labsynch_labseer_domain_ItxSubjectContainer" path="/itxsubjectcontainers" z="Lkt3MEjgXQC530GUZEVUvjb/OyY=">
-            <table:column id="c_com_labsynch_labseer_domain_ItxSubjectContainer_recordedBy" property="recordedBy" z="ffDk0Chx7zqWCRzmsI8brujA6iQ="/>
-            <table:column date="true" dateTimePattern="${itxSubjectContainer_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_recordedDate" property="recordedDate" z="vbsQXNP8xIhR1pEBji5PoL1rlN8="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxSubjectContainer_codeName" property="codeName" z="EoPnjXnbae7nvX6y2FYfLFmHf3M="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxSubjectContainer_lsType" property="lsType" z="2o9NpUUW0RjcEtmOQ8qg8b0Y3Eo="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxSubjectContainer_lsKind" property="lsKind" z="pGlClS5WbDuYLGWoLG72rkU2Q9M="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxSubjectContainer_lsTypeAndKind" property="lsTypeAndKind" z="7wbWMiy4MKAjFcHO+VRsroSsOls="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxsubjectcontainers/show.jspx b/src/main/webapp/WEB-INF/views/itxsubjectcontainers/show.jspx
deleted file mode 100755
index 8a91b25af..000000000
--- a/src/main/webapp/WEB-INF/views/itxsubjectcontainers/show.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ItxSubjectContainer" object="${itxsubjectcontainer}" path="/itxsubjectcontainers" z="LmnxpcGNNvuCgKuQqM1BoD5aZJE=">
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_ItxSubjectContainer_recordedBy" object="${itxsubjectcontainer}" z="Cl+eJ5W76OHOdu+kQ57Tg3UohMQ="/>
-        <field:display date="true" dateTimePattern="${itxSubjectContainer_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_ItxSubjectContainer_recordedDate" object="${itxsubjectcontainer}" z="nJlrpsXoLzJvJ5h/tBs2TLR7UDw="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_ItxSubjectContainer_modifiedBy" object="${itxsubjectcontainer}" z="o5/9PjIXjQUG9vRjrUxFYjjdjmk="/>
-        <field:display date="true" dateTimePattern="${itxSubjectContainer_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_ItxSubjectContainer_modifiedDate" object="${itxsubjectcontainer}" z="NUzKdUP1JORQVSBhF4uQh2AEfdQ="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ItxSubjectContainer_ignored" object="${itxsubjectcontainer}" z="ez337IPYm2HWW7IFgL8LNWgedaQ="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_ItxSubjectContainer_lsTransaction" object="${itxsubjectcontainer}" z="843Gz/dzGDGEj5hBBb2QLG0iZfQ="/>
-        <field:display field="subject" id="s_com_labsynch_labseer_domain_ItxSubjectContainer_subject" object="${itxsubjectcontainer}" z="em2mduttuKFbE+xXLzaEUpYmk44="/>
-        <field:display field="container" id="s_com_labsynch_labseer_domain_ItxSubjectContainer_container" object="${itxsubjectcontainer}" z="yxZF6j13BGzgK/64uYZDE2oG1Vw="/>
-        <field:display field="codeName" id="s_com_labsynch_labseer_domain_ItxSubjectContainer_codeName" object="${itxsubjectcontainer}" z="f65nUT5f34UYnhT/W3HkFRa5FWQ="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ItxSubjectContainer_lsType" object="${itxsubjectcontainer}" z="+OmHafQn4Um8TIV7lb3rvaPTl+U="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_ItxSubjectContainer_lsKind" object="${itxsubjectcontainer}" z="96xX2B+WqIdbP2w8gdFrU5ZmNXg="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ItxSubjectContainer_lsTypeAndKind" object="${itxsubjectcontainer}" z="PusbmRqSJBZdG/xgAmSK9UEAD0o="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_ItxSubjectContainer_deleted" object="${itxsubjectcontainer}" z="wRauzHuFEmqhRjF8JEaeC32nGnc="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxsubjectcontainers/update.jspx b/src/main/webapp/WEB-INF/views/itxsubjectcontainers/update.jspx
deleted file mode 100755
index ee27d8e96..000000000
--- a/src/main/webapp/WEB-INF/views/itxsubjectcontainers/update.jspx
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ItxSubjectContainer" modelAttribute="itxSubjectContainer" path="/itxsubjectcontainers" versionField="Version" z="kTcI8rjqXV7IbWHJ8eJAXRgUT8c=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_recordedBy" required="true" z="sot7UHNpY+CbUOODfDWo/iPi7Zc="/>
-        <field:datetime dateTimePattern="${itxSubjectContainer_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_recordedDate" required="true" z="/e3jvmJvzZO+sFDi7RBI1V2+/Zg="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_modifiedBy" z="gFBVm8EV1Eo6cG22K1yNQKwZys0="/>
-        <field:datetime dateTimePattern="${itxSubjectContainer_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_modifiedDate" z="SdAHWdKoE8YSvCRx9k0a3hI6Vsw="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_ignored" z="05fRQrETLHfNG7pm3ag0ixmWUA8="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_lsTransaction" validationMessageCode="field_invalid_integer" z="NwcS4EteDUWWmF6IEd9rt803XA0="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="aEhMPL/Vy5GaT70rOeLgqwKcBNM="/>
-        <field:select field="subject" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_subject" itemValue="id" items="${subjects}" path="/subjects" required="true" z="/Ng9SUpU4O3BOJASXk8ZOSJE/gg="/>
-        <field:select field="container" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_container" itemValue="id" items="${containers}" path="/containers" required="true" z="B2hP9oRtxm49/a00YzosFqMX1U8="/>
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_codeName" z="FQmt7xHJJEW0NtDFeu4YPiEIQ9k="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_lsType" required="true" z="1EDUb7chOfWkDgMKNBU+UUC7/AI="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_lsKind" required="true" z="gkCYoBpjzoajK/tVoiMtEdiF7rI="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_lsTypeAndKind" z="ok0NHPvMgzlg2ukKH8/Bk+s8TaA="/>
-        <field:simple field="lsStates" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_lsStates" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Subject Container State" z="1pzwm0tUohhW0psdDUJbXPGCXlk="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxSubjectContainer_deleted" z="XGquMMW6jQKopgRcJxFL2BQAQoU="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxsubjectcontainers/views.xml b/src/main/webapp/WEB-INF/views/itxsubjectcontainers/views.xml
deleted file mode 100755
index 7e052afd8..000000000
--- a/src/main/webapp/WEB-INF/views/itxsubjectcontainers/views.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="itxsubjectcontainers/list">
-        <put-attribute name="body" value="/WEB-INF/views/itxsubjectcontainers/list.jspx"/>
-    </definition>
-<definition extends="default" name="itxsubjectcontainers/show">
-        <put-attribute name="body" value="/WEB-INF/views/itxsubjectcontainers/show.jspx"/>
-    </definition>
-<definition extends="default" name="itxsubjectcontainers/create">
-        <put-attribute name="body" value="/WEB-INF/views/itxsubjectcontainers/create.jspx"/>
-    </definition>
-<definition extends="default" name="itxsubjectcontainers/update">
-        <put-attribute name="body" value="/WEB-INF/views/itxsubjectcontainers/update.jspx"/>
-    </definition>
-<definition extends="default" name="itxsubjectcontainers/findItxSubjectContainersByCodeNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/itxsubjectcontainers/findItxSubjectContainersByCodeNameEquals.jspx"/>
-    </definition>
-<definition extends="default" name="itxsubjectcontainers/findItxSubjectContainersByContainer">
-        <put-attribute name="body" value="/WEB-INF/views/itxsubjectcontainers/findItxSubjectContainersByContainer.jspx"/>
-    </definition>
-<definition extends="default" name="itxsubjectcontainers/findItxSubjectContainersByLsTransactionEquals">
-        <put-attribute name="body" value="/WEB-INF/views/itxsubjectcontainers/findItxSubjectContainersByLsTransactionEquals.jspx"/>
-    </definition>
-<definition extends="default" name="itxsubjectcontainers/findItxSubjectContainersBySubject">
-        <put-attribute name="body" value="/WEB-INF/views/itxsubjectcontainers/findItxSubjectContainersBySubject.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/itxsubjectcontainerstates/create.jspx b/src/main/webapp/WEB-INF/views/itxsubjectcontainerstates/create.jspx
deleted file mode 100755
index 094bed1e8..000000000
--- a/src/main/webapp/WEB-INF/views/itxsubjectcontainerstates/create.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ItxSubjectContainerState" modelAttribute="itxSubjectContainerState" path="/itxsubjectcontainerstates" render="${empty dependencies}" z="stHXhG+tsw1+N7XD9M2LIB17fA8=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_recordedBy" required="true" z="OE9nY3YAjIqAMQFoyOCFuMEpZJ8="/>
-        <field:datetime dateTimePattern="${itxSubjectContainerState_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_recordedDate" required="true" z="I375Iav8klqWzyPcqyokQ+0xPxs="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_modifiedBy" z="cN6ykgGIFd+yQY5Zg5pVKOlz+us="/>
-        <field:datetime dateTimePattern="${itxSubjectContainerState_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_modifiedDate" z="Eq1r7pcM2Jc53XyrufSk2nikMbo="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_comments" z="hniAlPwlYHEjelW/o2/HlQr583c="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_ignored" z="2sqJRAPTot8kCs03vBEbiVRbc54="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_lsTransaction" validationMessageCode="field_invalid_integer" z="FpNYT+mFNxCljWr6J6LnwXu+4+k="/>
-        <field:select field="itxSubjectContainer" id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_itxSubjectContainer" itemValue="id" items="${itxsubjectcontainers}" path="/itxsubjectcontainers" z="c4m/9lmhyYxWlOns2Ev200IhT6I="/>
-        <field:simple field="lsValues" id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_lsValues" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Subject Container Value" z="n+MnJXTkXJoxVls6DHf8VBscuOI="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_lsType" required="true" z="iB2gG4uZ1TDGsjLduCHoWSYEoik="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_lsKind" required="true" z="ANY0vYGvQNhcSg3/9JnyAlU8z+0="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_lsTypeAndKind" z="GQxbB6Ucpbaod6S+MAIlVGosfgk="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_deleted" z="xAGR/G0xEiYRUiB3HnyySrg6GWc="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ItxSubjectContainerState" render="${not empty dependencies}" z="SkbyymLcXMImd+uS+Wq3xw+1Iuc="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxsubjectcontainerstates/list.jspx b/src/main/webapp/WEB-INF/views/itxsubjectcontainerstates/list.jspx
deleted file mode 100755
index ccd0faf82..000000000
--- a/src/main/webapp/WEB-INF/views/itxsubjectcontainerstates/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ItxSubjectContainerState" items="${itxsubjectcontainerstates}" z="deiacjsVRft21nUBVfUnUxeoCy8=">
-        <table:table data="${itxsubjectcontainerstates}" id="l_com_labsynch_labseer_domain_ItxSubjectContainerState" path="/itxsubjectcontainerstates" z="s17jjgukYPAzcX3g+8HOKseZBUg=">
-            <table:column id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_recordedBy" property="recordedBy" z="CWuZD+iAGMGC+/iuv6Kq2vsS0Gs="/>
-            <table:column date="true" dateTimePattern="${itxSubjectContainerState_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_recordedDate" property="recordedDate" z="SbCEPFi6grdi2whZvMdIuF2Jlks="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_modifiedBy" property="modifiedBy" z="QT/yhaQaKZfH7sPYn0WpxNCGlAY="/>
-            <table:column date="true" dateTimePattern="${itxSubjectContainerState_modifieddate_date_format}" id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_modifiedDate" property="modifiedDate" z="MMrF6nKCWXbSGKrg6SmeD0Z9HgI="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_lsType" property="lsType" z="k4rLU2QafOg9Fcj9Qz6vq8FhmxY="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_lsKind" property="lsKind" z="0I14xj9tquegQvsPdVK4u45DHRk="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxsubjectcontainerstates/show.jspx b/src/main/webapp/WEB-INF/views/itxsubjectcontainerstates/show.jspx
deleted file mode 100755
index 162457f28..000000000
--- a/src/main/webapp/WEB-INF/views/itxsubjectcontainerstates/show.jspx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ItxSubjectContainerState" object="${itxsubjectcontainerstate}" path="/itxsubjectcontainerstates" z="px4CspXBKbiSovHHe7IfT862FY8=">
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_ItxSubjectContainerState_recordedBy" object="${itxsubjectcontainerstate}" z="3+WwLsZmWgiiG8izaqLQ3fBEHoU="/>
-        <field:display date="true" dateTimePattern="${itxSubjectContainerState_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_ItxSubjectContainerState_recordedDate" object="${itxsubjectcontainerstate}" z="/gcpTHSF/loExWjDnhOymvwO74g="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_ItxSubjectContainerState_modifiedBy" object="${itxsubjectcontainerstate}" z="r4B+l9gEqL0U4GFWLWqDqucMmf0="/>
-        <field:display date="true" dateTimePattern="${itxSubjectContainerState_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_ItxSubjectContainerState_modifiedDate" object="${itxsubjectcontainerstate}" z="x/8xyh0bDGsaUMTOSWL8MlFDhkA="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_ItxSubjectContainerState_comments" object="${itxsubjectcontainerstate}" z="BbBrY7NwKbmO+N7cCXvsgfVn9U8="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ItxSubjectContainerState_ignored" object="${itxsubjectcontainerstate}" z="PyrMESwHwJnMShYpwO+8DqW0Kek="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_ItxSubjectContainerState_lsTransaction" object="${itxsubjectcontainerstate}" z="RDfJMGBKcPX6GDEu0BeE7hBEqOg="/>
-        <field:display field="itxSubjectContainer" id="s_com_labsynch_labseer_domain_ItxSubjectContainerState_itxSubjectContainer" object="${itxsubjectcontainerstate}" z="nuvf9wIZDXmGCDZo55y3e2Frdpk="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ItxSubjectContainerState_lsType" object="${itxsubjectcontainerstate}" z="SPuptQqui3HSWQbo+Z2VGiw1SG4="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_ItxSubjectContainerState_lsKind" object="${itxsubjectcontainerstate}" z="RkWM8OTFlt0u7JMGrMUxGNStpLI="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ItxSubjectContainerState_lsTypeAndKind" object="${itxsubjectcontainerstate}" z="uZTFKGwv2i2euC9/lRRCFPNNBwM="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_ItxSubjectContainerState_deleted" object="${itxsubjectcontainerstate}" z="9OTJQ6aldgqRcHHq3pYEcyCLsl8="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxsubjectcontainerstates/update.jspx b/src/main/webapp/WEB-INF/views/itxsubjectcontainerstates/update.jspx
deleted file mode 100755
index 61b984bfb..000000000
--- a/src/main/webapp/WEB-INF/views/itxsubjectcontainerstates/update.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ItxSubjectContainerState" modelAttribute="itxSubjectContainerState" path="/itxsubjectcontainerstates" versionField="Version" z="vCByr3BPwibbBTqSpy+h2dlxtiw=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_recordedBy" required="true" z="OE9nY3YAjIqAMQFoyOCFuMEpZJ8="/>
-        <field:datetime dateTimePattern="${itxSubjectContainerState_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_recordedDate" required="true" z="I375Iav8klqWzyPcqyokQ+0xPxs="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_modifiedBy" z="cN6ykgGIFd+yQY5Zg5pVKOlz+us="/>
-        <field:datetime dateTimePattern="${itxSubjectContainerState_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_modifiedDate" z="Eq1r7pcM2Jc53XyrufSk2nikMbo="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_comments" z="hniAlPwlYHEjelW/o2/HlQr583c="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_ignored" z="2sqJRAPTot8kCs03vBEbiVRbc54="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_lsTransaction" validationMessageCode="field_invalid_integer" z="FpNYT+mFNxCljWr6J6LnwXu+4+k="/>
-        <field:select field="itxSubjectContainer" id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_itxSubjectContainer" itemValue="id" items="${itxsubjectcontainers}" path="/itxsubjectcontainers" z="c4m/9lmhyYxWlOns2Ev200IhT6I="/>
-        <field:simple field="lsValues" id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_lsValues" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Subject Container Value" z="n+MnJXTkXJoxVls6DHf8VBscuOI="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_lsType" required="true" z="iB2gG4uZ1TDGsjLduCHoWSYEoik="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_lsKind" required="true" z="ANY0vYGvQNhcSg3/9JnyAlU8z+0="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_lsTypeAndKind" z="GQxbB6Ucpbaod6S+MAIlVGosfgk="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxSubjectContainerState_deleted" z="xAGR/G0xEiYRUiB3HnyySrg6GWc="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxsubjectcontainerstates/views.xml b/src/main/webapp/WEB-INF/views/itxsubjectcontainerstates/views.xml
deleted file mode 100755
index 170a7b90c..000000000
--- a/src/main/webapp/WEB-INF/views/itxsubjectcontainerstates/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="itxsubjectcontainerstates/list">
-        <put-attribute name="body" value="/WEB-INF/views/itxsubjectcontainerstates/list.jspx"/>
-    </definition>
-<definition extends="default" name="itxsubjectcontainerstates/show">
-        <put-attribute name="body" value="/WEB-INF/views/itxsubjectcontainerstates/show.jspx"/>
-    </definition>
-<definition extends="default" name="itxsubjectcontainerstates/create">
-        <put-attribute name="body" value="/WEB-INF/views/itxsubjectcontainerstates/create.jspx"/>
-    </definition>
-<definition extends="default" name="itxsubjectcontainerstates/update">
-        <put-attribute name="body" value="/WEB-INF/views/itxsubjectcontainerstates/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/itxsubjectcontainervalues/create.jspx b/src/main/webapp/WEB-INF/views/itxsubjectcontainervalues/create.jspx
deleted file mode 100755
index 4b2956e6f..000000000
--- a/src/main/webapp/WEB-INF/views/itxsubjectcontainervalues/create.jspx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ItxSubjectContainerValue" modelAttribute="itxSubjectContainerValue" path="/itxsubjectcontainervalues" render="${empty dependencies}" z="HBl/Do+RJ4rWJgnkWyJthoHgvzo=">
-        <field:textarea field="stringValue" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_stringValue" z="wkroXgER0xsrhSb5ZACVlK36u/I="/>
-        <field:textarea field="fileValue" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_fileValue" z="tWG+uq8BGxRrSJYOzYoMUZK0M2o="/>
-        <field:textarea field="urlValue" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_urlValue" z="4wWcgpZF6zLppX3JO3e0VjKhR3w="/>
-        <field:datetime dateTimePattern="${itxSubjectContainerValue_datevalue_date_format}" field="dateValue" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_dateValue" z="5MuAnSC+CJvbx/SBes5irxvh5lw="/>
-        <field:input field="clobValue" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_clobValue" z="UcFlRaW76t/4RGz4XSWDyMN9M7Y="/>
-        <field:input field="blobValue" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_blobValue" z="aKTDK2MP8sNEiFqQuksFKL1BzGg="/>
-        <field:input field="numericValue" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_numericValue" validationMessageCode="field_invalid_number" z="qJdmHe4ZqFctQLClXv5NJaqp1c0="/>
-        <field:input field="sigFigs" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_sigFigs" validationMessageCode="field_invalid_integer" z="JFWnqOXyV3oacPpqVgk6tmXik78="/>
-        <field:input field="uncertainty" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_uncertainty" validationMessageCode="field_invalid_number" z="ZvpzpOQAFQ5Cx68DEg88Z3n13k4="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_comments" z="KbQFWBVJHTFOOH7+7bk5/o/Ovqk="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_ignored" z="QL6chWhT1DbzPDgDVLzioOQJSHI="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_lsTransaction" validationMessageCode="field_invalid_integer" z="jwRTdYQ6380xxvvahxgQJB+srzg="/>
-        <field:datetime dateTimePattern="${itxSubjectContainerValue_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_recordedDate" required="true" z="B0DR7ybzyX19b8RYW3L+2y1vHsc="/>
-        <field:datetime dateTimePattern="${itxSubjectContainerValue_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_modifiedDate" z="unm0yPUs/YYTXp2bvvkin/zVQhI="/>
-        <field:checkbox field="publicData" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_publicData" z="jPTHIZYzHyuCepb40QEQDjXHumk="/>
-        <field:textarea field="codeValue" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_codeValue" z="tckSs16PtHisbGNgUvdkGAY1G/A="/>
-        <field:input field="numberOfReplicates" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_numberOfReplicates" validationMessageCode="field_invalid_integer" z="eFoiFEfvg3vxJwd/Nso3nh+qqhg="/>
-        <field:textarea field="uncertaintyType" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_uncertaintyType" z="caugNVGKDIU7k79wRpLPrz6PUHc="/>
-        <field:select field="lsState" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_lsState" itemValue="id" items="${itxsubjectcontainerstates}" path="/itxsubjectcontainerstates" z="BiCmmzKVEsDlDQwj30Fhxsf6CBk="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_lsType" required="true" z="Quq1jjpfvsWP98dTund/d7uiS+s="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_lsKind" required="true" z="rRVPXbQTpu2G6lLjg4tuqlQEUOU="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_lsTypeAndKind" z="MXbcg+LpvvTDEaJ1D4Wa0Lq0GIM="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_recordedBy" required="true" z="PlMrubDov/xYl6C701XYBw7Y7Zk="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_modifiedBy" z="TU9S8NoY/z5yOa3ycB2zFuuOX0o="/>
-        <field:input field="operatorType" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_operatorType" max="25" z="23e3Mz0KAlkn2prvdmiEIBnI0Ko="/>
-        <field:input field="operatorKind" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_operatorKind" max="10" z="Q7mSZTTYP1n4OgEGcu/WUUQufXc="/>
-        <field:textarea field="operatorTypeAndKind" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_operatorTypeAndKind" z="7iPoMrNhbTHIUJUXCWmfZe7WySo="/>
-        <field:input field="unitType" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_unitType" max="25" z="kaIBDJhWJRS3wNr4Hv0AH2HDpCM="/>
-        <field:input field="unitKind" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_unitKind" max="25" z="TgWQQdpywaIE7fkkyeHBl3VxAdM="/>
-        <field:textarea field="unitTypeAndKind" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_unitTypeAndKind" z="5SgfEgBJsRfEws/pYzWklkq52+Y="/>
-        <field:textarea field="codeType" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_codeType" z="NhSke8iEg3nHPzDmQ3Oin4lTQ24="/>
-        <field:textarea field="codeKind" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_codeKind" z="jVMNtTlRAWHTNyUnTPZc+pyKcc8="/>
-        <field:textarea field="codeTypeAndKind" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_codeTypeAndKind" z="zmn0zYrta6oT79M2daU71tAcn1Y="/>
-        <field:textarea field="codeOrigin" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_codeOrigin" z="CeWGgurnczFuH5/Io+uVlstm2KQ="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_deleted" z="tfrE5qHEbBglFaX3f1hk1Yk9m8Q="/>
-        <field:input field="concentration" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_concentration" validationMessageCode="field_invalid_number" z="HB4DCiT0RBqMb+BgPF9jyh8XTH4="/>
-        <field:input field="concUnit" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_concUnit" max="25" z="pp3s3b7ewMoX4U66EZPq+0aEnzw="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ItxSubjectContainerValue" render="${not empty dependencies}" z="9xH/6rM+75uh0zpd160sR2M7jOg="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxsubjectcontainervalues/list.jspx b/src/main/webapp/WEB-INF/views/itxsubjectcontainervalues/list.jspx
deleted file mode 100755
index 8cd6f3eea..000000000
--- a/src/main/webapp/WEB-INF/views/itxsubjectcontainervalues/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ItxSubjectContainerValue" items="${itxsubjectcontainervalues}" z="sXCxFt5F7pYudJlS9PnQPw7U3hE=">
-        <table:table data="${itxsubjectcontainervalues}" id="l_com_labsynch_labseer_domain_ItxSubjectContainerValue" path="/itxsubjectcontainervalues" z="EbS9qKDuhjE2a7sxe7O31quF6bA=">
-            <table:column id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_lsType" property="lsType" z="bHBDZAl3CckP0MxTvrUrjtqO9p0="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_lsKind" property="lsKind" z="moc/GrHbF7sWq19ZzZv8QqXJr9Q="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_lsTypeAndKind" property="lsTypeAndKind" z="e2BSLt1InI23OyufVnUZ38ESxO8="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_ignored" property="ignored" z="K2Ao9/Mq3vOGj1qBiYPI0hpwPEs="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_publicData" property="publicData" z="wgjoSURXitdBzv/l0+nyEj3D1UI="/>
-            <table:column id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_deleted" property="deleted" z="nji7dbRfT2WPVahpW6h9ZF8wfi4="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxsubjectcontainervalues/show.jspx b/src/main/webapp/WEB-INF/views/itxsubjectcontainervalues/show.jspx
deleted file mode 100755
index 646f112ed..000000000
--- a/src/main/webapp/WEB-INF/views/itxsubjectcontainervalues/show.jspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ItxSubjectContainerValue" object="${itxsubjectcontainervalue}" path="/itxsubjectcontainervalues" z="/WJJtx2STY/8AhdPqAi3ckij8hs=">
-        <field:display field="stringValue" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_stringValue" object="${itxsubjectcontainervalue}" z="IFWjzhNdmcybpPo7vXZvtLExjR8="/>
-        <field:display field="fileValue" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_fileValue" object="${itxsubjectcontainervalue}" z="Ny7pxpqqop/tV+RY5DErTMV2dkw="/>
-        <field:display field="urlValue" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_urlValue" object="${itxsubjectcontainervalue}" z="d/inp3dhIWSGwucMJjhLTGA57NI="/>
-        <field:display date="true" dateTimePattern="${itxSubjectContainerValue_datevalue_date_format}" field="dateValue" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_dateValue" object="${itxsubjectcontainervalue}" z="jgc6SVolPVSCA0TnITK5o4C0wNg="/>
-        <field:display field="clobValue" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_clobValue" object="${itxsubjectcontainervalue}" z="LMfEgf+/wjMuNbCxzMYg7NZs6bQ="/>
-        <field:display field="blobValue" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_blobValue" object="${itxsubjectcontainervalue}" z="xPlTTEIiD+GGUhzsZstouRsa0d4="/>
-        <field:display field="numericValue" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_numericValue" object="${itxsubjectcontainervalue}" z="oZmhS+2zqt8YXeIDTVVPyR3TRqg="/>
-        <field:display field="sigFigs" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_sigFigs" object="${itxsubjectcontainervalue}" z="bm0JGIGYJM0qa8jey8M52KnGRRo="/>
-        <field:display field="uncertainty" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_uncertainty" object="${itxsubjectcontainervalue}" z="ekA3djLo+Hllrq5rp7xd2cKXGw4="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_comments" object="${itxsubjectcontainervalue}" z="uiWthQZTTxdjAQ6T5DL+x1mu2ws="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_ignored" object="${itxsubjectcontainervalue}" z="ZpsWYywUy4vZA352+VF8PZtlJ0o="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_lsTransaction" object="${itxsubjectcontainervalue}" z="Zyg6+9rCeqfjjpR5WwPn+pt2tmE="/>
-        <field:display date="true" dateTimePattern="${itxSubjectContainerValue_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_recordedDate" object="${itxsubjectcontainervalue}" z="7r/l5RxxklnADxn3gmF5wP1/j+8="/>
-        <field:display date="true" dateTimePattern="${itxSubjectContainerValue_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_modifiedDate" object="${itxsubjectcontainervalue}" z="AUwEd6DjXLFiiK6qOBidef5ZKRQ="/>
-        <field:display field="publicData" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_publicData" object="${itxsubjectcontainervalue}" z="JStWAS1xNVEoA05iCjUs3h4FqIY="/>
-        <field:display field="codeValue" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_codeValue" object="${itxsubjectcontainervalue}" z="Bac9azdp2Epo7eC7OBxPstcCFY8="/>
-        <field:display field="numberOfReplicates" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_numberOfReplicates" object="${itxsubjectcontainervalue}" z="8XvVcvWMDg4yqlZQ1ksOH5FaSo8="/>
-        <field:display field="uncertaintyType" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_uncertaintyType" object="${itxsubjectcontainervalue}" z="/U6c2xf/Pu4W1VyKh03m0IqZP0g="/>
-        <field:display field="lsState" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_lsState" object="${itxsubjectcontainervalue}" z="1edqCBKrNAXOexNtamYet4fBD9M="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_lsType" object="${itxsubjectcontainervalue}" z="SPnAxiLUoRpZ0zKrHQQvrimtA/M="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_lsKind" object="${itxsubjectcontainervalue}" z="2sq9NRKh3VvjaCGm/LrdOhaQAcw="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_lsTypeAndKind" object="${itxsubjectcontainervalue}" z="8qo9pSK0g1dCpTaTx+D38uQBtx4="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_recordedBy" object="${itxsubjectcontainervalue}" z="yXXJOQtCHAChK03kKvgJb9Tu9d8="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_modifiedBy" object="${itxsubjectcontainervalue}" z="CNLYelokXPNHX/qYucl4aOvyueE="/>
-        <field:display field="operatorType" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_operatorType" object="${itxsubjectcontainervalue}" z="qMcGkn8WjYsfgt59C7FQSf+iUvw="/>
-        <field:display field="operatorKind" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_operatorKind" object="${itxsubjectcontainervalue}" z="DOF7RS/KTF1MYyMixPSXhpmKw8c="/>
-        <field:display field="operatorTypeAndKind" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_operatorTypeAndKind" object="${itxsubjectcontainervalue}" z="bN4Yi8fmV+e41Rruy0a8K/IlLV0="/>
-        <field:display field="unitType" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_unitType" object="${itxsubjectcontainervalue}" z="vV1unLm0rTps29HDqA9neIq3420="/>
-        <field:display field="unitKind" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_unitKind" object="${itxsubjectcontainervalue}" z="ZeDC2aRwUR79L4EQm2+uGVitIG0="/>
-        <field:display field="unitTypeAndKind" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_unitTypeAndKind" object="${itxsubjectcontainervalue}" z="LjPAen8xs+jkc7f6Ut7NvJTOVy4="/>
-        <field:display field="codeType" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_codeType" object="${itxsubjectcontainervalue}" z="3LfTX8NJ5tFM/Xa6nFCK75N5Xh8="/>
-        <field:display field="codeKind" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_codeKind" object="${itxsubjectcontainervalue}" z="GULvvRS0s6D5wzyGeOwRyDqNGq4="/>
-        <field:display field="codeTypeAndKind" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_codeTypeAndKind" object="${itxsubjectcontainervalue}" z="q2JzdED0hnFsW7v2D+uG681IPL4="/>
-        <field:display field="codeOrigin" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_codeOrigin" object="${itxsubjectcontainervalue}" z="vtCqjGAggDSkaXol0axaAeef3Uk="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_deleted" object="${itxsubjectcontainervalue}" z="iwXbhXSXzwt4qFnclUAjqcHZ7DE="/>
-        <field:display field="concentration" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_concentration" object="${itxsubjectcontainervalue}" z="paKLJ+Op4nrWc6XFSj6F9xNpK8M="/>
-        <field:display field="concUnit" id="s_com_labsynch_labseer_domain_ItxSubjectContainerValue_concUnit" object="${itxsubjectcontainervalue}" z="IFBmhSZtVHuqJPK702nljxQuv0E="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxsubjectcontainervalues/update.jspx b/src/main/webapp/WEB-INF/views/itxsubjectcontainervalues/update.jspx
deleted file mode 100755
index eef671f35..000000000
--- a/src/main/webapp/WEB-INF/views/itxsubjectcontainervalues/update.jspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ItxSubjectContainerValue" modelAttribute="itxSubjectContainerValue" path="/itxsubjectcontainervalues" versionField="Version" z="zGnuzpe4qdwdsQB1UUJ8eHhlNDc=">
-        <field:textarea field="stringValue" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_stringValue" z="wkroXgER0xsrhSb5ZACVlK36u/I="/>
-        <field:textarea field="fileValue" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_fileValue" z="tWG+uq8BGxRrSJYOzYoMUZK0M2o="/>
-        <field:textarea field="urlValue" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_urlValue" z="4wWcgpZF6zLppX3JO3e0VjKhR3w="/>
-        <field:datetime dateTimePattern="${itxSubjectContainerValue_datevalue_date_format}" field="dateValue" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_dateValue" z="5MuAnSC+CJvbx/SBes5irxvh5lw="/>
-        <field:input field="clobValue" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_clobValue" z="UcFlRaW76t/4RGz4XSWDyMN9M7Y="/>
-        <field:input field="blobValue" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_blobValue" z="aKTDK2MP8sNEiFqQuksFKL1BzGg="/>
-        <field:input field="numericValue" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_numericValue" validationMessageCode="field_invalid_number" z="qJdmHe4ZqFctQLClXv5NJaqp1c0="/>
-        <field:input field="sigFigs" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_sigFigs" validationMessageCode="field_invalid_integer" z="JFWnqOXyV3oacPpqVgk6tmXik78="/>
-        <field:input field="uncertainty" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_uncertainty" validationMessageCode="field_invalid_number" z="ZvpzpOQAFQ5Cx68DEg88Z3n13k4="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_comments" z="KbQFWBVJHTFOOH7+7bk5/o/Ovqk="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_ignored" z="QL6chWhT1DbzPDgDVLzioOQJSHI="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_lsTransaction" validationMessageCode="field_invalid_integer" z="jwRTdYQ6380xxvvahxgQJB+srzg="/>
-        <field:datetime dateTimePattern="${itxSubjectContainerValue_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_recordedDate" required="true" z="B0DR7ybzyX19b8RYW3L+2y1vHsc="/>
-        <field:datetime dateTimePattern="${itxSubjectContainerValue_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_modifiedDate" z="unm0yPUs/YYTXp2bvvkin/zVQhI="/>
-        <field:checkbox field="publicData" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_publicData" z="jPTHIZYzHyuCepb40QEQDjXHumk="/>
-        <field:textarea field="codeValue" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_codeValue" z="tckSs16PtHisbGNgUvdkGAY1G/A="/>
-        <field:input field="numberOfReplicates" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_numberOfReplicates" validationMessageCode="field_invalid_integer" z="eFoiFEfvg3vxJwd/Nso3nh+qqhg="/>
-        <field:textarea field="uncertaintyType" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_uncertaintyType" z="caugNVGKDIU7k79wRpLPrz6PUHc="/>
-        <field:select field="lsState" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_lsState" itemValue="id" items="${itxsubjectcontainerstates}" path="/itxsubjectcontainerstates" z="BiCmmzKVEsDlDQwj30Fhxsf6CBk="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_lsType" required="true" z="Quq1jjpfvsWP98dTund/d7uiS+s="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_lsKind" required="true" z="rRVPXbQTpu2G6lLjg4tuqlQEUOU="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_lsTypeAndKind" z="MXbcg+LpvvTDEaJ1D4Wa0Lq0GIM="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_recordedBy" required="true" z="PlMrubDov/xYl6C701XYBw7Y7Zk="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_modifiedBy" z="TU9S8NoY/z5yOa3ycB2zFuuOX0o="/>
-        <field:input field="operatorType" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_operatorType" max="25" z="23e3Mz0KAlkn2prvdmiEIBnI0Ko="/>
-        <field:input field="operatorKind" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_operatorKind" max="10" z="Q7mSZTTYP1n4OgEGcu/WUUQufXc="/>
-        <field:textarea field="operatorTypeAndKind" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_operatorTypeAndKind" z="7iPoMrNhbTHIUJUXCWmfZe7WySo="/>
-        <field:input field="unitType" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_unitType" max="25" z="kaIBDJhWJRS3wNr4Hv0AH2HDpCM="/>
-        <field:input field="unitKind" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_unitKind" max="25" z="TgWQQdpywaIE7fkkyeHBl3VxAdM="/>
-        <field:textarea field="unitTypeAndKind" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_unitTypeAndKind" z="5SgfEgBJsRfEws/pYzWklkq52+Y="/>
-        <field:textarea field="codeType" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_codeType" z="NhSke8iEg3nHPzDmQ3Oin4lTQ24="/>
-        <field:textarea field="codeKind" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_codeKind" z="jVMNtTlRAWHTNyUnTPZc+pyKcc8="/>
-        <field:textarea field="codeTypeAndKind" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_codeTypeAndKind" z="zmn0zYrta6oT79M2daU71tAcn1Y="/>
-        <field:textarea field="codeOrigin" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_codeOrigin" z="CeWGgurnczFuH5/Io+uVlstm2KQ="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_deleted" z="tfrE5qHEbBglFaX3f1hk1Yk9m8Q="/>
-        <field:input field="concentration" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_concentration" validationMessageCode="field_invalid_number" z="HB4DCiT0RBqMb+BgPF9jyh8XTH4="/>
-        <field:input field="concUnit" id="c_com_labsynch_labseer_domain_ItxSubjectContainerValue_concUnit" max="25" z="pp3s3b7ewMoX4U66EZPq+0aEnzw="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/itxsubjectcontainervalues/views.xml b/src/main/webapp/WEB-INF/views/itxsubjectcontainervalues/views.xml
deleted file mode 100755
index b645a446e..000000000
--- a/src/main/webapp/WEB-INF/views/itxsubjectcontainervalues/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="itxsubjectcontainervalues/list">
-        <put-attribute name="body" value="/WEB-INF/views/itxsubjectcontainervalues/list.jspx"/>
-    </definition>
-<definition extends="default" name="itxsubjectcontainervalues/show">
-        <put-attribute name="body" value="/WEB-INF/views/itxsubjectcontainervalues/show.jspx"/>
-    </definition>
-<definition extends="default" name="itxsubjectcontainervalues/create">
-        <put-attribute name="body" value="/WEB-INF/views/itxsubjectcontainervalues/create.jspx"/>
-    </definition>
-<definition extends="default" name="itxsubjectcontainervalues/update">
-        <put-attribute name="body" value="/WEB-INF/views/itxsubjectcontainervalues/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/labelkinds/create.jspx b/src/main/webapp/WEB-INF/views/labelkinds/create.jspx
deleted file mode 100755
index d7270f5de..000000000
--- a/src/main/webapp/WEB-INF/views/labelkinds/create.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_LabelKind" modelAttribute="labelKind" path="/labelkinds" render="${empty dependencies}" z="yik9d9orjq7CFe98O5YEyFlse90=">
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_LabelKind_kindName" required="true" z="+fiESZoba1cgA2dajrKpOhqmVLY="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_LabelKind_lsTypeAndKind" z="uWxr21cGuPuyU4abrrnOVqk7ryE="/>
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_LabelKind_lsType" itemValue="id" items="${labeltypes}" path="/labeltypes" z="mzDwYRLE4f96CuPfRG21zbgejDw="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_LabelKind" render="${not empty dependencies}" z="sINZVjTwcL9Cbs9jlDLNglresQg="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/labelkinds/findLabelKindsByKindNameEquals.jspx b/src/main/webapp/WEB-INF/views/labelkinds/findLabelKindsByKindNameEquals.jspx
deleted file mode 100755
index 32fea6dff..000000000
--- a/src/main/webapp/WEB-INF/views/labelkinds/findLabelKindsByKindNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByKindNameEquals" id="ff_com_labsynch_labseer_domain_LabelKind" path="/labelkinds" z="VdjycahIVuKzLhadW5DOPpJGvqE=">
-        <field:input disableFormBinding="true" field="kindName" id="f_com_labsynch_labseer_domain_LabelKind_kindName" max="255" required="true" z="s4B/bSqmZw+EuYRo6Y+QrfsOWtY="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/labelkinds/findLabelKindsByKindNameEqualsAndLsType.jspx b/src/main/webapp/WEB-INF/views/labelkinds/findLabelKindsByKindNameEqualsAndLsType.jspx
deleted file mode 100755
index 54d782f1c..000000000
--- a/src/main/webapp/WEB-INF/views/labelkinds/findLabelKindsByKindNameEqualsAndLsType.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByKindNameEqualsAndLsType" id="ff_com_labsynch_labseer_domain_LabelKind" path="/labelkinds" z="grVFZ2ftfc9Wukq0jEwTr53eRHU=">
-        <field:input disableFormBinding="true" field="kindName" id="f_com_labsynch_labseer_domain_LabelKind_kindName" max="255" required="true" z="s4B/bSqmZw+EuYRo6Y+QrfsOWtY="/>
-        <field:select disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_LabelKind_lsType" itemValue="id" items="${labeltypes}" path="/labeltypes" required="true" z="VFT/EWn/+TThqveYvgYefvQRG4Y="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/labelkinds/findLabelKindsByLsType.jspx b/src/main/webapp/WEB-INF/views/labelkinds/findLabelKindsByLsType.jspx
deleted file mode 100755
index b65aae7f3..000000000
--- a/src/main/webapp/WEB-INF/views/labelkinds/findLabelKindsByLsType.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsType" id="ff_com_labsynch_labseer_domain_LabelKind" path="/labelkinds" z="tX12q+lgp5nj0WR4zK6SjGSiyX0=">
-        <field:select disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_LabelKind_lsType" itemValue="id" items="${labeltypes}" path="/labeltypes" required="true" z="VFT/EWn/+TThqveYvgYefvQRG4Y="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/labelkinds/list.jspx b/src/main/webapp/WEB-INF/views/labelkinds/list.jspx
deleted file mode 100755
index 2329de320..000000000
--- a/src/main/webapp/WEB-INF/views/labelkinds/list.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_LabelKind" items="${labelkinds}" z="ULidVTcbebOP3LYXoPe3g5F6MZQ=">
-        <table:table data="${labelkinds}" id="l_com_labsynch_labseer_domain_LabelKind" path="/labelkinds" z="BPNTYlsnJe6qpp7su4TmEyxYOPI=">
-            <table:column id="c_com_labsynch_labseer_domain_LabelKind_kindName" property="kindName" z="+uNFhbc7RZKInSKV7gCx20qYYrU="/>
-            <table:column id="c_com_labsynch_labseer_domain_LabelKind_lsTypeAndKind" property="lsTypeAndKind" z="M+t8vSCvI+ZyPtXc6aLjcWPn39M="/>
-            <table:column id="c_com_labsynch_labseer_domain_LabelKind_lsType" property="lsType" z="hGAN82hMfTbBk0mXsZGpwvnEDEQ="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/labelkinds/show.jspx b/src/main/webapp/WEB-INF/views/labelkinds/show.jspx
deleted file mode 100755
index 9fdc9b666..000000000
--- a/src/main/webapp/WEB-INF/views/labelkinds/show.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_LabelKind" object="${labelkind}" path="/labelkinds" z="vhNkY8HgHBDi1q3jvJlwkijBGW4=">
-        <field:display field="kindName" id="s_com_labsynch_labseer_domain_LabelKind_kindName" object="${labelkind}" z="SPLKckDz2MiatPrc/2Tubna9OEw="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_LabelKind_lsTypeAndKind" object="${labelkind}" z="JUeoSCbfruNwjA4G7zqFMxrF6/s="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_LabelKind_lsType" object="${labelkind}" z="5njQITQOIJ9tObo9KcZZOCd9V/4="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/labelkinds/update.jspx b/src/main/webapp/WEB-INF/views/labelkinds/update.jspx
deleted file mode 100755
index 098a299f2..000000000
--- a/src/main/webapp/WEB-INF/views/labelkinds/update.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_LabelKind" modelAttribute="labelKind" path="/labelkinds" versionField="Version" z="cAWJMyt1+26hS1pRp/qnJ8pDmhs=">
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_LabelKind_kindName" required="true" z="+fiESZoba1cgA2dajrKpOhqmVLY="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_LabelKind_lsTypeAndKind" z="uWxr21cGuPuyU4abrrnOVqk7ryE="/>
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_LabelKind_lsType" itemValue="id" items="${labeltypes}" path="/labeltypes" z="mzDwYRLE4f96CuPfRG21zbgejDw="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/labelkinds/views.xml b/src/main/webapp/WEB-INF/views/labelkinds/views.xml
deleted file mode 100755
index 0a8d9e6e3..000000000
--- a/src/main/webapp/WEB-INF/views/labelkinds/views.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="labelkinds/list">
-        <put-attribute name="body" value="/WEB-INF/views/labelkinds/list.jspx"/>
-    </definition>
-<definition extends="default" name="labelkinds/show">
-        <put-attribute name="body" value="/WEB-INF/views/labelkinds/show.jspx"/>
-    </definition>
-<definition extends="default" name="labelkinds/create">
-        <put-attribute name="body" value="/WEB-INF/views/labelkinds/create.jspx"/>
-    </definition>
-<definition extends="default" name="labelkinds/update">
-        <put-attribute name="body" value="/WEB-INF/views/labelkinds/update.jspx"/>
-    </definition>
-<definition extends="default" name="labelkinds/findLabelKindsByKindNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/labelkinds/findLabelKindsByKindNameEquals.jspx"/>
-    </definition>
-<definition extends="default" name="labelkinds/findLabelKindsByKindNameEqualsAndLsType">
-        <put-attribute name="body" value="/WEB-INF/views/labelkinds/findLabelKindsByKindNameEqualsAndLsType.jspx"/>
-    </definition>
-<definition extends="default" name="labelkinds/findLabelKindsByLsType">
-        <put-attribute name="body" value="/WEB-INF/views/labelkinds/findLabelKindsByLsType.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/labelsequenceroles/create.jspx b/src/main/webapp/WEB-INF/views/labelsequenceroles/create.jspx
deleted file mode 100644
index 4fbe541ef..000000000
--- a/src/main/webapp/WEB-INF/views/labelsequenceroles/create.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_LabelSequenceRole" modelAttribute="labelSequenceRole" path="/labelsequenceroles" render="${empty dependencies}" z="Uj3Ir66J5XTZy1cZn1j/wJ3Zio4=">
-        <field:select field="labelSequenceEntry" id="c_com_labsynch_labseer_domain_LabelSequenceRole_labelSequenceEntry" itemValue="id" items="${labelsequences}" path="/labelsequences" required="true" z="V6XqUTfhjT4+KA0bgkGBUDrD4wc="/>
-        <field:select field="roleEntry" id="c_com_labsynch_labseer_domain_LabelSequenceRole_roleEntry" itemValue="id" items="${lsroles}" path="/lsroles" required="true" z="NkCRiM0R86WotzkWDjVRFmtTaIs="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_LabelSequenceRole" render="${not empty dependencies}" z="33vwAsVKW3JfKjNnkoT8FVDCN9A="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/labelsequenceroles/list.jspx b/src/main/webapp/WEB-INF/views/labelsequenceroles/list.jspx
deleted file mode 100644
index ff3a573dc..000000000
--- a/src/main/webapp/WEB-INF/views/labelsequenceroles/list.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_LabelSequenceRole" items="${labelsequenceroles}" z="XbGaAl0Oo3Y+S6N2kjSusb/SWDY=">
-        <table:table data="${labelsequenceroles}" id="l_com_labsynch_labseer_domain_LabelSequenceRole" path="/labelsequenceroles" z="myFO9+g7bPFvR57dBTJZAUXsRdA=">
-            <table:column id="c_com_labsynch_labseer_domain_LabelSequenceRole_labelSequenceEntry" property="labelSequenceEntry" z="48BXDBXp89bUkqW+XIHXWNWR7YI="/>
-            <table:column id="c_com_labsynch_labseer_domain_LabelSequenceRole_roleEntry" property="roleEntry" z="AbLMCVRRafCkMyAa2h6hpxbror8="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/labelsequenceroles/show.jspx b/src/main/webapp/WEB-INF/views/labelsequenceroles/show.jspx
deleted file mode 100644
index 63322743a..000000000
--- a/src/main/webapp/WEB-INF/views/labelsequenceroles/show.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_LabelSequenceRole" object="${labelsequencerole}" path="/labelsequenceroles" z="qjpv3uCFFpC7cSLjBPIr4oJB6nU=">
-        <field:display field="labelSequenceEntry" id="s_com_labsynch_labseer_domain_LabelSequenceRole_labelSequenceEntry" object="${labelsequencerole}" z="W+4CaTospvfN13kCz5jg7EpeyfA="/>
-        <field:display field="roleEntry" id="s_com_labsynch_labseer_domain_LabelSequenceRole_roleEntry" object="${labelsequencerole}" z="dX5oYSXMRM5DrlcBMimTPYBs3sI="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/labelsequenceroles/update.jspx b/src/main/webapp/WEB-INF/views/labelsequenceroles/update.jspx
deleted file mode 100644
index 25e805118..000000000
--- a/src/main/webapp/WEB-INF/views/labelsequenceroles/update.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_LabelSequenceRole" modelAttribute="labelSequenceRole" path="/labelsequenceroles" versionField="Version" z="/cqsr7SFqUAI36oePhoVBvePOpc=">
-        <field:select field="labelSequenceEntry" id="c_com_labsynch_labseer_domain_LabelSequenceRole_labelSequenceEntry" itemValue="id" items="${labelsequences}" path="/labelsequences" required="true" z="V6XqUTfhjT4+KA0bgkGBUDrD4wc="/>
-        <field:select field="roleEntry" id="c_com_labsynch_labseer_domain_LabelSequenceRole_roleEntry" itemValue="id" items="${lsroles}" path="/lsroles" required="true" z="NkCRiM0R86WotzkWDjVRFmtTaIs="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/labelsequenceroles/views.xml b/src/main/webapp/WEB-INF/views/labelsequenceroles/views.xml
deleted file mode 100644
index 6d0c52c0e..000000000
--- a/src/main/webapp/WEB-INF/views/labelsequenceroles/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="labelsequenceroles/list">
-        <put-attribute name="body" value="/WEB-INF/views/labelsequenceroles/list.jspx"/>
-    </definition>
-<definition extends="default" name="labelsequenceroles/show">
-        <put-attribute name="body" value="/WEB-INF/views/labelsequenceroles/show.jspx"/>
-    </definition>
-<definition extends="default" name="labelsequenceroles/create">
-        <put-attribute name="body" value="/WEB-INF/views/labelsequenceroles/create.jspx"/>
-    </definition>
-<definition extends="default" name="labelsequenceroles/update">
-        <put-attribute name="body" value="/WEB-INF/views/labelsequenceroles/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/labelsequences/create.jspx b/src/main/webapp/WEB-INF/views/labelsequences/create.jspx
deleted file mode 100755
index f3d6f58c5..000000000
--- a/src/main/webapp/WEB-INF/views/labelsequences/create.jspx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_LabelSequence" modelAttribute="labelSequence" path="/labelsequences" render="${empty dependencies}" z="4fKMQgRCI1WKmUc6KNSRUGQ2rg4=">
-        <field:textarea field="labelPrefix" id="c_com_labsynch_labseer_domain_LabelSequence_labelPrefix" required="true" z="TmreX6TcnlIGBfvvPFR5UJFrMes="/>
-        <field:input field="labelSeparator" id="c_com_labsynch_labseer_domain_LabelSequence_labelSeparator" max="10" z="Lp403JlrZDjlKU/iTzIuHtGAquM="/>
-        <field:checkbox field="groupDigits" id="c_com_labsynch_labseer_domain_LabelSequence_groupDigits" z="96F2mfaMeqM4oEh6g48PKUTKMsc="/>
-        <field:input field="digits" id="c_com_labsynch_labseer_domain_LabelSequence_digits" validationMessageCode="field_invalid_integer" z="Yz1rm659ksOPpq1ddG3sLu659Rs="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_LabelSequence_ignored" z="xaS2k9WqBVipQT6+hYtju7nE/fY="/>
-        <field:datetime dateTimePattern="${labelSequence_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_LabelSequence_modifiedDate" z="Q53n+HbfaSSw3WZSp3t4lJPVwI8="/>
-        <field:textarea field="thingTypeAndKind" id="c_com_labsynch_labseer_domain_LabelSequence_thingTypeAndKind" required="true" z="dwWiDrt2I3tzeELKCTUQG5ke8yc="/>
-        <field:textarea field="labelTypeAndKind" id="c_com_labsynch_labseer_domain_LabelSequence_labelTypeAndKind" required="true" z="NR9F/oL7qaHzIIpRbuTe25F5Z9I="/>
-        <field:input field="dbSequence" id="c_com_labsynch_labseer_domain_LabelSequence_dbSequence" required="true" z="12z8WwsVPmIPKoLue5Xk9sJuAcw="/>
-        <field:simple field="labelSequenceRoles" id="c_com_labsynch_labseer_domain_LabelSequence_labelSequenceRoles" messageCode="entity_reference_not_managed" messageCodeAttribute="Label Sequence Role" z="66tmAYAJcHt2mVIzWD6pcnD4Bk8="/>
-        <field:input field="startingNumber" id="c_com_labsynch_labseer_domain_LabelSequence_startingNumber" required="true" validationMessageCode="field_invalid_integer" z="m1M0kFLYt//wHdYxsogUKh1A3K4="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_LabelSequence" render="${not empty dependencies}" z="/LrSJfkT9qIcG0KvZgkOnhTTnq0="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/labelsequences/findLabelSequencesByLabelTypeAndKindEquals.jspx b/src/main/webapp/WEB-INF/views/labelsequences/findLabelSequencesByLabelTypeAndKindEquals.jspx
deleted file mode 100644
index 22d891ec9..000000000
--- a/src/main/webapp/WEB-INF/views/labelsequences/findLabelSequencesByLabelTypeAndKindEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLabelTypeAndKindEquals" id="ff_com_labsynch_labseer_domain_LabelSequence" path="/labelsequences" z="3V1lcynh9TM8VHltZ6vrM19VHho=">
-        <field:input disableFormBinding="true" field="labelTypeAndKind" id="f_com_labsynch_labseer_domain_LabelSequence_labelTypeAndKind" max="255" required="true" z="FCdW1i5KrMUh2uuzgTeFjc6m7QI="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/labelsequences/findLabelSequencesByThingTypeAndKindEquals.jspx b/src/main/webapp/WEB-INF/views/labelsequences/findLabelSequencesByThingTypeAndKindEquals.jspx
deleted file mode 100644
index c2ffda3de..000000000
--- a/src/main/webapp/WEB-INF/views/labelsequences/findLabelSequencesByThingTypeAndKindEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByThingTypeAndKindEquals" id="ff_com_labsynch_labseer_domain_LabelSequence" path="/labelsequences" z="gkbIdRoV++6djOW8F3Ixx/CvayE=">
-        <field:input disableFormBinding="true" field="thingTypeAndKind" id="f_com_labsynch_labseer_domain_LabelSequence_thingTypeAndKind" max="255" required="true" z="H/v1CBQ3OIrHX7XLLIUZEguOc8I="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/labelsequences/findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals.jspx b/src/main/webapp/WEB-INF/views/labelsequences/findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals.jspx
deleted file mode 100755
index 2c94a45e2..000000000
--- a/src/main/webapp/WEB-INF/views/labelsequences/findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByThingTypeAndKindEqualsAndLabelTypeAndKindEquals" id="ff_com_labsynch_labseer_domain_LabelSequence" path="/labelsequences" z="iPwwLPO/bmcZLGeNpA5u7LwWIAg=">
-        <field:input disableFormBinding="true" field="thingTypeAndKind" id="f_com_labsynch_labseer_domain_LabelSequence_thingTypeAndKind" max="255" required="true" z="H/v1CBQ3OIrHX7XLLIUZEguOc8I="/>
-        <field:input disableFormBinding="true" field="labelTypeAndKind" id="f_com_labsynch_labseer_domain_LabelSequence_labelTypeAndKind" max="255" required="true" z="FCdW1i5KrMUh2uuzgTeFjc6m7QI="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/labelsequences/findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals.jspx b/src/main/webapp/WEB-INF/views/labelsequences/findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals.jspx
deleted file mode 100644
index 1a322d7a5..000000000
--- a/src/main/webapp/WEB-INF/views/labelsequences/findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals" id="ff_com_labsynch_labseer_domain_LabelSequence" path="/labelsequences" z="fVTMBHd1R/MkcZJ5Vruw+rB4Yos=">
-        <field:input disableFormBinding="true" field="thingTypeAndKind" id="f_com_labsynch_labseer_domain_LabelSequence_thingTypeAndKind" max="255" required="true" z="H/v1CBQ3OIrHX7XLLIUZEguOc8I="/>
-        <field:input disableFormBinding="true" field="labelTypeAndKind" id="f_com_labsynch_labseer_domain_LabelSequence_labelTypeAndKind" max="255" required="true" z="FCdW1i5KrMUh2uuzgTeFjc6m7QI="/>
-        <field:input disableFormBinding="true" field="labelPrefix" id="f_com_labsynch_labseer_domain_LabelSequence_labelPrefix" max="50" required="true" z="QSE3gcgP3EGXn6rg9qe3Mv8iYdw="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/labelsequences/findLabelSequencesByThingTypeEqualsAndThingKindEqualsAndLabelTypeEqualsAndLabelKindEquals.jspx b/src/main/webapp/WEB-INF/views/labelsequences/findLabelSequencesByThingTypeEqualsAndThingKindEqualsAndLabelTypeEqualsAndLabelKindEquals.jspx
deleted file mode 100755
index 5fae9bbc7..000000000
--- a/src/main/webapp/WEB-INF/views/labelsequences/findLabelSequencesByThingTypeEqualsAndThingKindEqualsAndLabelTypeEqualsAndLabelKindEquals.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByThingTypeEqualsAndThingKindEqualsAndLabelTypeEqualsAndLabelKindEquals" id="ff_com_labsynch_labseer_domain_LabelSequence" path="/labelsequences" z="52FNJnhOVnYgrJhkS1fry8ggv88=">
-        <field:input disableFormBinding="true" field="thingType" id="f_com_labsynch_labseer_domain_LabelSequence_thingType" max="255" required="true" z="5tIc1ERsc3qadtfry5JwmT+t6hA="/>
-        <field:input disableFormBinding="true" field="thingKind" id="f_com_labsynch_labseer_domain_LabelSequence_thingKind" max="255" required="true" z="024i/Qinn78cc07WemyEsdZWycw="/>
-        <field:input disableFormBinding="true" field="labelType" id="f_com_labsynch_labseer_domain_LabelSequence_labelType" max="255" required="true" z="mEfj5pl3CRRCOFLCCkLA95wiDmE="/>
-        <field:input disableFormBinding="true" field="labelKind" id="f_com_labsynch_labseer_domain_LabelSequence_labelKind" max="255" required="true" z="5O4nLwf1QmmFwvKwdYVyYaSWg+I="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/labelsequences/list.jspx b/src/main/webapp/WEB-INF/views/labelsequences/list.jspx
deleted file mode 100755
index e7b19d429..000000000
--- a/src/main/webapp/WEB-INF/views/labelsequences/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_LabelSequence" items="${labelsequences}" z="0AOtVYpVIC65B9VOrDH21Q3F4Rw=">
-        <table:table data="${labelsequences}" id="l_com_labsynch_labseer_domain_LabelSequence" path="/labelsequences" z="hsG6M1LRFBV3qCFCXGzrQnWZbdc=">
-            <table:column id="c_com_labsynch_labseer_domain_LabelSequence_labelPrefix" property="labelPrefix" z="lzCJrbk+SFgEG6gh6WUssxxlbEg="/>
-            <table:column id="c_com_labsynch_labseer_domain_LabelSequence_labelSeparator" property="labelSeparator" z="8EDSsGAs//zuAk0V1mHor3S4bVc="/>
-            <table:column id="c_com_labsynch_labseer_domain_LabelSequence_groupDigits" property="groupDigits" z="D8l1AwDQQiEUP2wLjcdoDdutgiE="/>
-            <table:column id="c_com_labsynch_labseer_domain_LabelSequence_digits" property="digits" z="TqGLa8G5xfeNbD4BTb63wwx/Iy4="/>
-            <table:column id="c_com_labsynch_labseer_domain_LabelSequence_thingTypeAndKind" property="thingTypeAndKind" z="0fEnT9dbBxPfVxFSciv8DU7eWiY="/>
-            <table:column id="c_com_labsynch_labseer_domain_LabelSequence_labelTypeAndKind" property="labelTypeAndKind" z="q2M3L4WvoS83ze+T4Wd8F+AED7M="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/labelsequences/show.jspx b/src/main/webapp/WEB-INF/views/labelsequences/show.jspx
deleted file mode 100755
index 3bf467ab5..000000000
--- a/src/main/webapp/WEB-INF/views/labelsequences/show.jspx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_LabelSequence" object="${labelsequence}" path="/labelsequences" z="ZChqUVWwV99OZxnMiTMwftQiIhA=">
-        <field:display field="labelPrefix" id="s_com_labsynch_labseer_domain_LabelSequence_labelPrefix" object="${labelsequence}" z="VlzHOG8vRs0CS6aa6+lE0Xt0Cs8="/>
-        <field:display field="labelSeparator" id="s_com_labsynch_labseer_domain_LabelSequence_labelSeparator" object="${labelsequence}" z="7ZLArn2sKOtTJ3lePQO1dLktGfU="/>
-        <field:display field="groupDigits" id="s_com_labsynch_labseer_domain_LabelSequence_groupDigits" object="${labelsequence}" z="ESepVZ5TuVC8X8kECey1Ir109Ec="/>
-        <field:display field="digits" id="s_com_labsynch_labseer_domain_LabelSequence_digits" object="${labelsequence}" z="qahXAm8NE4rblryYanVwJg/Sarg="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_LabelSequence_ignored" object="${labelsequence}" z="utr0ryzTkBHuXlQBF9ObwOxLY4E="/>
-        <field:display date="true" dateTimePattern="${labelSequence_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_LabelSequence_modifiedDate" object="${labelsequence}" z="7+8zlKtMYFAwxls+1Q3Qj7q00z4="/>
-        <field:display field="thingTypeAndKind" id="s_com_labsynch_labseer_domain_LabelSequence_thingTypeAndKind" object="${labelsequence}" z="+6pCbCSk25bdZFf+0KzMyUV6UmQ="/>
-        <field:display field="labelTypeAndKind" id="s_com_labsynch_labseer_domain_LabelSequence_labelTypeAndKind" object="${labelsequence}" z="pqTXUfJSAsrStcp1Hz00vCtsuWo="/>
-        <field:display field="dbSequence" id="s_com_labsynch_labseer_domain_LabelSequence_dbSequence" object="${labelsequence}" z="cALGZLtsOiAb2D6mes5U2P+ZifY="/>
-        <field:display field="startingNumber" id="s_com_labsynch_labseer_domain_LabelSequence_startingNumber" object="${labelsequence}" z="HF3edMlamBOMLWpv8aj8mrBgsFQ="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/labelsequences/update.jspx b/src/main/webapp/WEB-INF/views/labelsequences/update.jspx
deleted file mode 100755
index 341e051af..000000000
--- a/src/main/webapp/WEB-INF/views/labelsequences/update.jspx
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_LabelSequence" modelAttribute="labelSequence" path="/labelsequences" versionField="Version" z="EYqGXp82GbZWOi4pZeUnaPLM2x4=">
-        <field:textarea field="labelPrefix" id="c_com_labsynch_labseer_domain_LabelSequence_labelPrefix" required="true" z="TmreX6TcnlIGBfvvPFR5UJFrMes="/>
-        <field:input field="labelSeparator" id="c_com_labsynch_labseer_domain_LabelSequence_labelSeparator" max="10" z="Lp403JlrZDjlKU/iTzIuHtGAquM="/>
-        <field:checkbox field="groupDigits" id="c_com_labsynch_labseer_domain_LabelSequence_groupDigits" z="96F2mfaMeqM4oEh6g48PKUTKMsc="/>
-        <field:input field="digits" id="c_com_labsynch_labseer_domain_LabelSequence_digits" validationMessageCode="field_invalid_integer" z="Yz1rm659ksOPpq1ddG3sLu659Rs="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_LabelSequence_ignored" z="xaS2k9WqBVipQT6+hYtju7nE/fY="/>
-        <field:datetime dateTimePattern="${labelSequence_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_LabelSequence_modifiedDate" z="Q53n+HbfaSSw3WZSp3t4lJPVwI8="/>
-        <field:textarea field="thingTypeAndKind" id="c_com_labsynch_labseer_domain_LabelSequence_thingTypeAndKind" required="true" z="dwWiDrt2I3tzeELKCTUQG5ke8yc="/>
-        <field:textarea field="labelTypeAndKind" id="c_com_labsynch_labseer_domain_LabelSequence_labelTypeAndKind" required="true" z="NR9F/oL7qaHzIIpRbuTe25F5Z9I="/>
-        <field:input field="dbSequence" id="c_com_labsynch_labseer_domain_LabelSequence_dbSequence" required="true" z="12z8WwsVPmIPKoLue5Xk9sJuAcw="/>
-        <field:simple field="labelSequenceRoles" id="c_com_labsynch_labseer_domain_LabelSequence_labelSequenceRoles" messageCode="entity_reference_not_managed" messageCodeAttribute="Label Sequence Role" z="66tmAYAJcHt2mVIzWD6pcnD4Bk8="/>
-        <field:input field="startingNumber" id="c_com_labsynch_labseer_domain_LabelSequence_startingNumber" required="true" validationMessageCode="field_invalid_integer" z="m1M0kFLYt//wHdYxsogUKh1A3K4="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/labelsequences/views.xml b/src/main/webapp/WEB-INF/views/labelsequences/views.xml
deleted file mode 100755
index c932a3377..000000000
--- a/src/main/webapp/WEB-INF/views/labelsequences/views.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="labelsequences/list">
-        <put-attribute name="body" value="/WEB-INF/views/labelsequences/list.jspx"/>
-    </definition>
-<definition extends="default" name="labelsequences/show">
-        <put-attribute name="body" value="/WEB-INF/views/labelsequences/show.jspx"/>
-    </definition>
-<definition extends="default" name="labelsequences/create">
-        <put-attribute name="body" value="/WEB-INF/views/labelsequences/create.jspx"/>
-    </definition>
-<definition extends="default" name="labelsequences/update">
-        <put-attribute name="body" value="/WEB-INF/views/labelsequences/update.jspx"/>
-    </definition>
-<definition extends="default" name="labelsequences/findLabelSequencesByThingTypeEqualsAndThingKindEqualsAndLabelTypeEqualsAndLabelKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/labelsequences/findLabelSequencesByThingTypeEqualsAndThingKindEqualsAndLabelTypeEqualsAndLabelKindEquals.jspx"/>
-    </definition>
-<definition extends="default" name="labelsequences/findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/labelsequences/findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals.jspx"/>
-    </definition>
-<definition extends="default" name="labelsequences/findLabelSequencesByLabelTypeAndKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/labelsequences/findLabelSequencesByLabelTypeAndKindEquals.jspx"/>
-    </definition>
-<definition extends="default" name="labelsequences/findLabelSequencesByThingTypeAndKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/labelsequences/findLabelSequencesByThingTypeAndKindEquals.jspx"/>
-    </definition>
-<definition extends="default" name="labelsequences/findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals">
-        <put-attribute name="body" value="/WEB-INF/views/labelsequences/findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/labeltypes/create.jspx b/src/main/webapp/WEB-INF/views/labeltypes/create.jspx
deleted file mode 100755
index dc9897688..000000000
--- a/src/main/webapp/WEB-INF/views/labeltypes/create.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_LabelType" modelAttribute="labelType" path="/labeltypes" render="${empty dependencies}" z="lELk7mCbAKBUBKhnX2mh9sZtOsI=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_LabelType_typeName" required="true" z="TY+KAxo0dYjf9AJueFbPiX4lqIo="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_LabelType" render="${not empty dependencies}" z="hTHbAUtjaAMbPkZHMQcuHLIppfg="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/labeltypes/findLabelTypesByTypeNameEquals.jspx b/src/main/webapp/WEB-INF/views/labeltypes/findLabelTypesByTypeNameEquals.jspx
deleted file mode 100755
index 85f099a85..000000000
--- a/src/main/webapp/WEB-INF/views/labeltypes/findLabelTypesByTypeNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByTypeNameEquals" id="ff_com_labsynch_labseer_domain_LabelType" path="/labeltypes" z="lLzkpMa0rlW6DcCQuJ34MF8EBJ0=">
-        <field:input disableFormBinding="true" field="typeName" id="f_com_labsynch_labseer_domain_LabelType_typeName" max="255" required="true" z="hgmgAnhlMjfkgv4ZYtOAFakAQFk="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/labeltypes/list.jspx b/src/main/webapp/WEB-INF/views/labeltypes/list.jspx
deleted file mode 100755
index 06c3fdbcd..000000000
--- a/src/main/webapp/WEB-INF/views/labeltypes/list.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_LabelType" items="${labeltypes}" z="4nLsiIgEoJUgA/NDRoXG0KcEdFI=">
-        <table:table data="${labeltypes}" id="l_com_labsynch_labseer_domain_LabelType" path="/labeltypes" z="fFUeZ9+7FMt7Z3nxmbkxIX6BfWg=">
-            <table:column id="c_com_labsynch_labseer_domain_LabelType_typeName" property="typeName" z="S7OVyJGaruOZyF1zBPEPYo1R1rA="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/labeltypes/show.jspx b/src/main/webapp/WEB-INF/views/labeltypes/show.jspx
deleted file mode 100755
index 58fbf7a4d..000000000
--- a/src/main/webapp/WEB-INF/views/labeltypes/show.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_LabelType" object="${labeltype}" path="/labeltypes" z="v4L95wdS2KlExOGXepdL34WDpXg=">
-        <field:display field="typeName" id="s_com_labsynch_labseer_domain_LabelType_typeName" object="${labeltype}" z="53KOSAlnlaM2z+9a0wSNlUYBISc="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/labeltypes/update.jspx b/src/main/webapp/WEB-INF/views/labeltypes/update.jspx
deleted file mode 100755
index ba3b46aa1..000000000
--- a/src/main/webapp/WEB-INF/views/labeltypes/update.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_LabelType" modelAttribute="labelType" path="/labeltypes" versionField="Version" z="ps6CxWBuQbNfglImZII23iyfj1Y=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_LabelType_typeName" required="true" z="TY+KAxo0dYjf9AJueFbPiX4lqIo="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/labeltypes/views.xml b/src/main/webapp/WEB-INF/views/labeltypes/views.xml
deleted file mode 100755
index 64734bb25..000000000
--- a/src/main/webapp/WEB-INF/views/labeltypes/views.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="labeltypes/list">
-        <put-attribute name="body" value="/WEB-INF/views/labeltypes/list.jspx"/>
-    </definition>
-<definition extends="default" name="labeltypes/show">
-        <put-attribute name="body" value="/WEB-INF/views/labeltypes/show.jspx"/>
-    </definition>
-<definition extends="default" name="labeltypes/create">
-        <put-attribute name="body" value="/WEB-INF/views/labeltypes/create.jspx"/>
-    </definition>
-<definition extends="default" name="labeltypes/update">
-        <put-attribute name="body" value="/WEB-INF/views/labeltypes/update.jspx"/>
-    </definition>
-<definition extends="default" name="labeltypes/findLabelTypesByTypeNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/labeltypes/findLabelTypesByTypeNameEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/login.jspx b/src/main/webapp/WEB-INF/views/login.jspx
deleted file mode 100755
index b2c0ebb5c..000000000
--- a/src/main/webapp/WEB-INF/views/login.jspx
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" xmlns:util="urn:jsptagdir:/WEB-INF/tags/util" version="2.0">
-  <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-  <jsp:output omit-xml-declaration="yes"/>
-  <spring:message code="security_login_title" htmlEscape="false" var="title"/>
-  <util:panel id="title" title="${title}">
-    <c:if test="${not empty param.login_error}">
-      <div class="errors">
-        <p>
-          <spring:message code="security_login_unsuccessful"/>
-          <c:out value="${SPRING_SECURITY_LAST_EXCEPTION.message}"/>
-          .
-        </p>
-      </div>
-    </c:if>
-    <c:if test="${empty param.login_error}">
-      <p>
-        <spring:message code="security_login_message"/>
-      </p>
-    </c:if>
-    <spring:url value="/resources/j_spring_security_check" var="form_url"/>
-    <form action="${fn:escapeXml(form_url)}" method="POST" name="f">
-      <div>
-        <label for="j_username">
-          <spring:message code="security_login_form_name"/>
-        </label>
-        <input id="j_username" name="j_username" style="width:150px" type="text"/>
-        <spring:message code="security_login_form_name_message" htmlEscape="false" var="name_msg"/>
-        <script type="text/javascript">
-          <c:set var="sec_name_msg">
-            <spring:escapeBody javaScriptEscape="true">${name_msg}</spring:escapeBody>
-          </c:set>
-          Spring.addDecoration(new Spring.ElementDecoration({elementId : "j_username", widgetType : "dijit.form.ValidationTextBox", widgetAttrs : {promptMessage: "${sec_name_msg}", required : true}})); 
-        </script>
-      </div>
-      <br/>
-      <div>
-        <label for="j_password">
-          <spring:message code="security_login_form_password"/>
-        </label>
-        <input id="j_password" name="j_password" style="width:150px" type="password"/>
-        <spring:message code="security_login_form_password_message" htmlEscape="false" var="pwd_msg"/>
-        <script type="text/javascript">
-          <c:set var="sec_pwd_msg">
-            <spring:escapeBody javaScriptEscape="true">${pwd_msg}</spring:escapeBody>
-          </c:set>
-          Spring.addDecoration(new Spring.ElementDecoration({elementId : "j_password", widgetType : "dijit.form.ValidationTextBox", widgetAttrs : {promptMessage: "${sec_pwd_msg}", required : true}})); 
-        </script>
-      </div>
-      <br/>
-      <div class="submit">
-        <script type="text/javascript">Spring.addDecoration(new Spring.ValidateAllDecoration({elementId:'proceed', event:'onclick'}));</script>
-        <spring:message code="button_submit" htmlEscape="false" var="submit_label"/>
-        <input id="proceed" type="submit" value="${fn:escapeXml(submit_label)}"/>
-        <spring:message code="button_reset" htmlEscape="false" var="reset_label"/>
-        <input id="reset" type="reset" value="${fn:escapeXml(reset_label)}"/>
-      </div>
-        <div>&lt;br/&gt;&lt;a href ="/acas/forgotpassword/index"&gt;Forgot Password&lt;/a&gt; | Not a User Yet? &lt;a href ="/acas/signup?form"&gt;Sign Up&lt;/a&gt;</div>
-        </form>
-  </util:panel>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lot/index.jspx b/src/main/webapp/WEB-INF/views/lot/index.jspx
deleted file mode 100644
index 2ad2c2c7b..000000000
--- a/src/main/webapp/WEB-INF/views/lot/index.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" xmlns:util="urn:jsptagdir:/WEB-INF/tags/util" version="2.0">
-  <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-  <jsp:output omit-xml-declaration="yes"/>
-  <spring:message code="label_lot_index" htmlEscape="false" var="title"/>
-  <util:panel id="title" title="${title}">
-    <spring:message code="application_name" htmlEscape="false" var="app_name"/>
-    <h3>
-      <spring:message arguments="${app_name}" code="welcome_titlepane"/>
-    </h3>
-  </util:panel>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lot/views.xml b/src/main/webapp/WEB-INF/views/lot/views.xml
deleted file mode 100644
index 546fedd39..000000000
--- a/src/main/webapp/WEB-INF/views/lot/views.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="lot/index">
-        <put-attribute name="body" value="/WEB-INF/views/lot/index.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/lotaliases/create.jspx b/src/main/webapp/WEB-INF/views/lotaliases/create.jspx
deleted file mode 100644
index b7d74427b..000000000
--- a/src/main/webapp/WEB-INF/views/lotaliases/create.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_LotAlias" modelAttribute="lotAlias" path="/lotaliases" render="${empty dependencies}" z="biz07WxpjZ/M2+njOj1Ne/JnN8o=">
-        <field:select field="lot" id="c_com_labsynch_labseer_domain_LotAlias_lot" itemValue="id" items="${lots}" path="/lots" z="K7AAJBnJoCAfe+E/NLzuQI0dLbE="/>
-        <field:input field="lsType" id="c_com_labsynch_labseer_domain_LotAlias_lsType" z="srOlvFyy00pw+PZAe1NglRnX4Q0="/>
-        <field:input field="lsKind" id="c_com_labsynch_labseer_domain_LotAlias_lsKind" z="IyJfbEZlU4RSuEuTI0EjtQWZHLA="/>
-        <field:input field="aliasName" id="c_com_labsynch_labseer_domain_LotAlias_aliasName" z="NPREZ9enSYROWozLwMQeaTl4hiY="/>
-        <field:checkbox field="preferred" id="c_com_labsynch_labseer_domain_LotAlias_preferred" z="Mqc+LTFyPokjm3J2+DnOTrNaVsQ="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_LotAlias_ignored" z="ooG+0DXq3vM8y/Ozu/S0meCiDoI="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_LotAlias_deleted" z="ae5zCiYwR9D3KGVgs4teorpLKks="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_LotAlias" render="${not empty dependencies}" z="n4v5NpJC9JyIuvfwCwIIlfSbpcA="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lotaliases/findLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals.jspx b/src/main/webapp/WEB-INF/views/lotaliases/findLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals.jspx
deleted file mode 100644
index f1c905da9..000000000
--- a/src/main/webapp/WEB-INF/views/lotaliases/findLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals" id="ff_com_labsynch_labseer_domain_LotAlias" path="/lotaliases" z="+hrwC4Tx0pnxOaQ5kIsYB922viA=">
-        <field:input disableFormBinding="true" field="aliasName" id="f_com_labsynch_labseer_domain_LotAlias_aliasName" required="true" z="x7m3xYK1gSQYv7YDp9mKuuArKes="/>
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_LotAlias_lsType" required="true" z="d9nl4vF9x1WVZKW1+LHWOy/Wuyc="/>
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_LotAlias_lsKind" required="true" z="7JXLpcy9ilr2GkcQgqWCox7+Umo="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lotaliases/findLotAliasesByLot.jspx b/src/main/webapp/WEB-INF/views/lotaliases/findLotAliasesByLot.jspx
deleted file mode 100644
index 3cb4c8ee8..000000000
--- a/src/main/webapp/WEB-INF/views/lotaliases/findLotAliasesByLot.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLot" id="ff_com_labsynch_labseer_domain_LotAlias" path="/lotaliases" z="XAIaq5R4BoxCXXktqVevzbAr3l0=">
-        <field:select disableFormBinding="true" field="lot" id="f_com_labsynch_labseer_domain_LotAlias_lot" itemValue="id" items="${lots}" path="/lots" required="true" z="sP0473skAPLN2822VCVAIdZ1B40="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lotaliases/findLotAliasesByLotAndLsTypeEqualsAndLsKindEquals.jspx b/src/main/webapp/WEB-INF/views/lotaliases/findLotAliasesByLotAndLsTypeEqualsAndLsKindEquals.jspx
deleted file mode 100644
index c5c5b9121..000000000
--- a/src/main/webapp/WEB-INF/views/lotaliases/findLotAliasesByLotAndLsTypeEqualsAndLsKindEquals.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLotAndLsTypeEqualsAndLsKindEquals" id="ff_com_labsynch_labseer_domain_LotAlias" path="/lotaliases" z="UYIc5eiurD7Nk8JxzS603wvlt4E=">
-        <field:select disableFormBinding="true" field="lot" id="f_com_labsynch_labseer_domain_LotAlias_lot" itemValue="id" items="${lots}" path="/lots" required="true" z="sP0473skAPLN2822VCVAIdZ1B40="/>
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_LotAlias_lsType" required="true" z="d9nl4vF9x1WVZKW1+LHWOy/Wuyc="/>
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_LotAlias_lsKind" required="true" z="7JXLpcy9ilr2GkcQgqWCox7+Umo="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lotaliases/list.jspx b/src/main/webapp/WEB-INF/views/lotaliases/list.jspx
deleted file mode 100644
index 9c3152c44..000000000
--- a/src/main/webapp/WEB-INF/views/lotaliases/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_LotAlias" items="${lotaliases}" z="OxO2I3zOjhXg42cF/bMLUi09tdU=">
-        <table:table data="${lotaliases}" id="l_com_labsynch_labseer_domain_LotAlias" path="/lotaliases" z="U/t1TesatV5ZkJzfAefeXcP3a5E=">
-            <table:column id="c_com_labsynch_labseer_domain_LotAlias_lot" property="lot" z="zk3ylaJhNv8Z3iYz7oJd9hCfEew="/>
-            <table:column id="c_com_labsynch_labseer_domain_LotAlias_lsType" property="lsType" z="1OKXMYV+0lQrs1Mt5faiC+EL0aY="/>
-            <table:column id="c_com_labsynch_labseer_domain_LotAlias_lsKind" property="lsKind" z="AF4EEUu/p7yKkELtiHAI91pW0FA="/>
-            <table:column id="c_com_labsynch_labseer_domain_LotAlias_aliasName" property="aliasName" z="tBSeC8EiZgMQ/DtXob83qFvST/8="/>
-            <table:column id="c_com_labsynch_labseer_domain_LotAlias_preferred" property="preferred" z="nHlIYCkjXSZVQMml8Vlz7LkxBjA="/>
-            <table:column id="c_com_labsynch_labseer_domain_LotAlias_ignored" property="ignored" z="5DgAMap6TvZmVA89W7z+H7G2Tig="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lotaliases/show.jspx b/src/main/webapp/WEB-INF/views/lotaliases/show.jspx
deleted file mode 100644
index 57358beed..000000000
--- a/src/main/webapp/WEB-INF/views/lotaliases/show.jspx
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_LotAlias" object="${lotalias}" path="/lotaliases" z="INTyEGtyugXsW0cmxahobb2zlEI=">
-        <field:display field="lot" id="s_com_labsynch_labseer_domain_LotAlias_lot" object="${lotalias}" z="GRKUTLD+6VEEGMlJlNoePFwevt0="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_LotAlias_lsType" object="${lotalias}" z="mJlgxOOYcSgUKzYlZI5yyFkmgfI="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_LotAlias_lsKind" object="${lotalias}" z="FleRfGVWSe5SiMsvFrMIua48StQ="/>
-        <field:display field="aliasName" id="s_com_labsynch_labseer_domain_LotAlias_aliasName" object="${lotalias}" z="CyfzA85VylkNbWe/qzLCja4zKkg="/>
-        <field:display field="preferred" id="s_com_labsynch_labseer_domain_LotAlias_preferred" object="${lotalias}" z="F8E00hiQgIEQ6FqnbiM0CdbbyEY="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_LotAlias_ignored" object="${lotalias}" z="MB3nv7qwDsLPp0mb5bc9OU7fbLk="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_LotAlias_deleted" object="${lotalias}" z="xgJgm/CFh8J+tLLclVfK9xBqnBc="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lotaliases/update.jspx b/src/main/webapp/WEB-INF/views/lotaliases/update.jspx
deleted file mode 100644
index b6affb7c3..000000000
--- a/src/main/webapp/WEB-INF/views/lotaliases/update.jspx
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_LotAlias" modelAttribute="lotAlias" path="/lotaliases" versionField="Version" z="jsfiBDR12lv42NGGU06if8PrdzI=">
-        <field:select field="lot" id="c_com_labsynch_labseer_domain_LotAlias_lot" itemValue="id" items="${lots}" path="/lots" z="K7AAJBnJoCAfe+E/NLzuQI0dLbE="/>
-        <field:input field="lsType" id="c_com_labsynch_labseer_domain_LotAlias_lsType" z="srOlvFyy00pw+PZAe1NglRnX4Q0="/>
-        <field:input field="lsKind" id="c_com_labsynch_labseer_domain_LotAlias_lsKind" z="IyJfbEZlU4RSuEuTI0EjtQWZHLA="/>
-        <field:input field="aliasName" id="c_com_labsynch_labseer_domain_LotAlias_aliasName" z="NPREZ9enSYROWozLwMQeaTl4hiY="/>
-        <field:checkbox field="preferred" id="c_com_labsynch_labseer_domain_LotAlias_preferred" z="Mqc+LTFyPokjm3J2+DnOTrNaVsQ="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_LotAlias_ignored" z="ooG+0DXq3vM8y/Ozu/S0meCiDoI="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_LotAlias_deleted" z="ae5zCiYwR9D3KGVgs4teorpLKks="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lotaliases/views.xml b/src/main/webapp/WEB-INF/views/lotaliases/views.xml
deleted file mode 100644
index 7e60492e6..000000000
--- a/src/main/webapp/WEB-INF/views/lotaliases/views.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="lotaliases/list">
-        <put-attribute name="body" value="/WEB-INF/views/lotaliases/list.jspx"/>
-    </definition>
-<definition extends="default" name="lotaliases/show">
-        <put-attribute name="body" value="/WEB-INF/views/lotaliases/show.jspx"/>
-    </definition>
-<definition extends="default" name="lotaliases/create">
-        <put-attribute name="body" value="/WEB-INF/views/lotaliases/create.jspx"/>
-    </definition>
-<definition extends="default" name="lotaliases/update">
-        <put-attribute name="body" value="/WEB-INF/views/lotaliases/update.jspx"/>
-    </definition>
-<definition extends="default" name="lotaliases/findLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lotaliases/findLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals.jspx"/>
-    </definition>
-<definition extends="default" name="lotaliases/findLotAliasesByLot">
-        <put-attribute name="body" value="/WEB-INF/views/lotaliases/findLotAliasesByLot.jspx"/>
-    </definition>
-<definition extends="default" name="lotaliases/findLotAliasesByLotAndLsTypeEqualsAndLsKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lotaliases/findLotAliasesByLotAndLsTypeEqualsAndLsKindEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/lotaliaskinds/create.jspx b/src/main/webapp/WEB-INF/views/lotaliaskinds/create.jspx
deleted file mode 100644
index f0ef86a55..000000000
--- a/src/main/webapp/WEB-INF/views/lotaliaskinds/create.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_LotAliasKind" modelAttribute="lotAliasKind" path="/lotaliaskinds" render="${empty dependencies}" z="8gSaSSTKxNIlwjDcu84QJ6bc1a8=">
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_LotAliasKind_lsType" itemValue="id" items="${lotaliastypes}" path="/lotaliastypes" required="true" z="5YozRYBwMVXsMPjjmRtMI9mxl/4="/>
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_LotAliasKind_kindName" z="VcIV/5s9vCKpUPmo9Lncj5ThOF4="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_LotAliasKind" render="${not empty dependencies}" z="TEx1HPUnFvJbO/5CGmIPYouLI0o="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lotaliaskinds/list.jspx b/src/main/webapp/WEB-INF/views/lotaliaskinds/list.jspx
deleted file mode 100644
index b82364ad6..000000000
--- a/src/main/webapp/WEB-INF/views/lotaliaskinds/list.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_LotAliasKind" items="${lotaliaskinds}" z="22MyIyvfP4Xan380zZdsVamEp64=">
-        <table:table data="${lotaliaskinds}" id="l_com_labsynch_labseer_domain_LotAliasKind" path="/lotaliaskinds" z="KH50VatoNKcNUSVE16r0pAsrCM0=">
-            <table:column id="c_com_labsynch_labseer_domain_LotAliasKind_lsType" property="lsType" z="xv3fgNhsRNJJlrKdBJKLLNrhCZA="/>
-            <table:column id="c_com_labsynch_labseer_domain_LotAliasKind_kindName" property="kindName" z="BBWGeMRxXV+63m0PkdrdOAwwvyw="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lotaliaskinds/show.jspx b/src/main/webapp/WEB-INF/views/lotaliaskinds/show.jspx
deleted file mode 100644
index 627849bc9..000000000
--- a/src/main/webapp/WEB-INF/views/lotaliaskinds/show.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_LotAliasKind" object="${lotaliaskind}" path="/lotaliaskinds" z="MC7ceIbSjcsOEb9Kzv2dHRjPyz0=">
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_LotAliasKind_lsType" object="${lotaliaskind}" z="hwqlfwIKoR9b3Z6kmKUpdxgMYlg="/>
-        <field:display field="kindName" id="s_com_labsynch_labseer_domain_LotAliasKind_kindName" object="${lotaliaskind}" z="qj6iRT6xEd7/cGNsrhTiFSuvbfE="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lotaliaskinds/update.jspx b/src/main/webapp/WEB-INF/views/lotaliaskinds/update.jspx
deleted file mode 100644
index e1b38cebd..000000000
--- a/src/main/webapp/WEB-INF/views/lotaliaskinds/update.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_LotAliasKind" modelAttribute="lotAliasKind" path="/lotaliaskinds" versionField="Version" z="UmTMFKyIVg6JHxVs+tv9VSNbTjo=">
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_LotAliasKind_lsType" itemValue="id" items="${lotaliastypes}" path="/lotaliastypes" required="true" z="5YozRYBwMVXsMPjjmRtMI9mxl/4="/>
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_LotAliasKind_kindName" z="VcIV/5s9vCKpUPmo9Lncj5ThOF4="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lotaliaskinds/views.xml b/src/main/webapp/WEB-INF/views/lotaliaskinds/views.xml
deleted file mode 100644
index 83f120cf3..000000000
--- a/src/main/webapp/WEB-INF/views/lotaliaskinds/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="lotaliaskinds/list">
-        <put-attribute name="body" value="/WEB-INF/views/lotaliaskinds/list.jspx"/>
-    </definition>
-<definition extends="default" name="lotaliaskinds/show">
-        <put-attribute name="body" value="/WEB-INF/views/lotaliaskinds/show.jspx"/>
-    </definition>
-<definition extends="default" name="lotaliaskinds/create">
-        <put-attribute name="body" value="/WEB-INF/views/lotaliaskinds/create.jspx"/>
-    </definition>
-<definition extends="default" name="lotaliaskinds/update">
-        <put-attribute name="body" value="/WEB-INF/views/lotaliaskinds/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/lotaliastypes/create.jspx b/src/main/webapp/WEB-INF/views/lotaliastypes/create.jspx
deleted file mode 100644
index 6d1d4c108..000000000
--- a/src/main/webapp/WEB-INF/views/lotaliastypes/create.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_LotAliasType" modelAttribute="lotAliasType" path="/lotaliastypes" render="${empty dependencies}" z="93PB61Dhze0mb6AAKg5NO0jafSU=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_LotAliasType_typeName" z="zwAi0pSUyMX4j6ToDYuUEHjdiIg="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_LotAliasType" render="${not empty dependencies}" z="HCoE+qeNLHae4X3lWIVs1THgVdU="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lotaliastypes/list.jspx b/src/main/webapp/WEB-INF/views/lotaliastypes/list.jspx
deleted file mode 100644
index 7e0dc1806..000000000
--- a/src/main/webapp/WEB-INF/views/lotaliastypes/list.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_LotAliasType" items="${lotaliastypes}" z="1PuSRtBrEvedWb5ZC6T67KXv8Ck=">
-        <table:table data="${lotaliastypes}" id="l_com_labsynch_labseer_domain_LotAliasType" path="/lotaliastypes" z="YKedQnXhBWjpVJTouZAMq4S5Wuk=">
-            <table:column id="c_com_labsynch_labseer_domain_LotAliasType_typeName" property="typeName" z="AGcBa5NYLx+NtswCUX/oN0183Qc="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lotaliastypes/show.jspx b/src/main/webapp/WEB-INF/views/lotaliastypes/show.jspx
deleted file mode 100644
index 2d457c7d2..000000000
--- a/src/main/webapp/WEB-INF/views/lotaliastypes/show.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_LotAliasType" object="${lotaliastype}" path="/lotaliastypes" z="F6JQ9HrCHR9KgO659q6Ah86h/Ac=">
-        <field:display field="typeName" id="s_com_labsynch_labseer_domain_LotAliasType_typeName" object="${lotaliastype}" z="0Lg0ns173OryKV+IvKH2V0YJRFE="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lotaliastypes/update.jspx b/src/main/webapp/WEB-INF/views/lotaliastypes/update.jspx
deleted file mode 100644
index 46f8a4010..000000000
--- a/src/main/webapp/WEB-INF/views/lotaliastypes/update.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_LotAliasType" modelAttribute="lotAliasType" path="/lotaliastypes" versionField="Version" z="qZ4y2gG/xzMHdnjYm7KZ6awtV3E=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_LotAliasType_typeName" z="zwAi0pSUyMX4j6ToDYuUEHjdiIg="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lotaliastypes/views.xml b/src/main/webapp/WEB-INF/views/lotaliastypes/views.xml
deleted file mode 100644
index bb6e3080f..000000000
--- a/src/main/webapp/WEB-INF/views/lotaliastypes/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="lotaliastypes/list">
-        <put-attribute name="body" value="/WEB-INF/views/lotaliastypes/list.jspx"/>
-    </definition>
-<definition extends="default" name="lotaliastypes/show">
-        <put-attribute name="body" value="/WEB-INF/views/lotaliastypes/show.jspx"/>
-    </definition>
-<definition extends="default" name="lotaliastypes/create">
-        <put-attribute name="body" value="/WEB-INF/views/lotaliastypes/create.jspx"/>
-    </definition>
-<definition extends="default" name="lotaliastypes/update">
-        <put-attribute name="body" value="/WEB-INF/views/lotaliastypes/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/lots/create.jspx b/src/main/webapp/WEB-INF/views/lots/create.jspx
deleted file mode 100644
index 4a096dd2a..000000000
--- a/src/main/webapp/WEB-INF/views/lots/create.jspx
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_Lot" modelAttribute="lot" path="/lots" render="${empty dependencies}" z="79bM/QnRUJz4va7dx9V/QONFKbs=">
-        <field:input field="storageLocation" id="c_com_labsynch_labseer_domain_Lot_storageLocation" z="2NUQXJHfhMxlD8buWNwbx5wJhwI="/>
-        <field:input field="buid" id="c_com_labsynch_labseer_domain_Lot_buid" validationMessageCode="field_invalid_integer" z="p9eXXfif+QBpkGoMBt3+WQkP2iw="/>
-        <field:input field="parent" id="c_com_labsynch_labseer_domain_Lot_parent" z="2AIbaiujxIzVWkQq403XDhu8k3Q="/>
-        <field:select field="saltForm" id="c_com_labsynch_labseer_domain_Lot_saltForm" itemValue="id" items="${saltforms}" path="/saltforms" z="OgSmRNRQK73MrIBFXJXT5IAvLYE="/>
-        <field:input field="asDrawnStruct" id="c_com_labsynch_labseer_domain_Lot_asDrawnStruct" z="j6Ll9A1amZ6uuTAVCx38NgXo1os="/>
-        <field:input field="lotAsDrawnCdId" id="c_com_labsynch_labseer_domain_Lot_lotAsDrawnCdId" z="8WPLQxHy7xNMVmhBFKxrrfl1oRs="/>
-        <field:textarea field="corpName" id="c_com_labsynch_labseer_domain_Lot_corpName" required="true" z="81cryE8n9FzsyKsmYAYt8jvei4Q="/>
-        <field:input field="lotNumber" id="c_com_labsynch_labseer_domain_Lot_lotNumber" validationMessageCode="field_invalid_integer" z="0grswgd6fzbbGmgSXtJw2Pyabsg="/>
-        <field:input field="lotMolWeight" id="c_com_labsynch_labseer_domain_Lot_lotMolWeight" validationMessageCode="field_invalid_number" z="pLfwU6E3LQ/AlaU+DFnrb6Cq57k="/>
-        <field:datetime dateTimePattern="${lot_synthesisdate_date_format}" field="synthesisDate" id="c_com_labsynch_labseer_domain_Lot_synthesisDate" z="Q1zsFcWQHvIY03gjSvFMYv6R8XE="/>
-        <field:datetime dateTimePattern="${lot_registrationdate_date_format}" field="registrationDate" id="c_com_labsynch_labseer_domain_Lot_registrationDate" z="Q/c9LxEDOhPxW8RuL9K8DC6SyTU="/>
-        <field:datetime dateTimePattern="${lot_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_Lot_modifiedDate" z="OpzbrcY0fLbfLYogv6N6NGKQlwQ="/>
-        <field:textarea field="barcode" id="c_com_labsynch_labseer_domain_Lot_barcode" z="pToUW00CZAsg3nYhIcb/UUsHsoA="/>
-        <field:textarea field="color" id="c_com_labsynch_labseer_domain_Lot_color" z="E4ogXGwPdFoWC4hCBP8hrOn1oF0="/>
-        <field:textarea field="notebookPage" id="c_com_labsynch_labseer_domain_Lot_notebookPage" z="xSEby3jF/ppiGNp9ZsFVla+DL9Q="/>
-        <field:input field="amount" id="c_com_labsynch_labseer_domain_Lot_amount" validationMessageCode="field_invalid_number" z="mmqr3SOtzlgb65FhRsrW7xbe27g="/>
-        <field:select field="amountUnits" id="c_com_labsynch_labseer_domain_Lot_amountUnits" itemValue="id" items="${units}" path="/units" z="76Shp+nj0VrQAdFkZtmCFuSxDuQ="/>
-        <field:input field="solutionAmount" id="c_com_labsynch_labseer_domain_Lot_solutionAmount" validationMessageCode="field_invalid_number" z="fqnt6jgkND0sjgKJwiba8FcQaJ0="/>
-        <field:select field="solutionAmountUnits" id="c_com_labsynch_labseer_domain_Lot_solutionAmountUnits" itemValue="id" items="${solutionunits}" path="/solutionunits" z="pEnCgB1IOInBOLQJDW3Bg2FdpY4="/>
-        <field:textarea field="supplier" id="c_com_labsynch_labseer_domain_Lot_supplier" z="NMX/p9Oyq1BLRpKEbqBPKBwOSks="/>
-        <field:textarea field="supplierID" id="c_com_labsynch_labseer_domain_Lot_supplierID" z="xaDqV1wcOVwBLDriq5x41WB04kM="/>
-        <field:input field="purity" id="c_com_labsynch_labseer_domain_Lot_purity" validationMessageCode="field_invalid_number" z="BP8ScRMCwv15O0HjL68VFTorGGY="/>
-        <field:select field="purityOperator" id="c_com_labsynch_labseer_domain_Lot_purityOperator" itemValue="id" items="${operators}" path="/operators" z="3ChI0quzzW1rm4YSPDg2XOoIOqo="/>
-        <field:select field="purityMeasuredBy" id="c_com_labsynch_labseer_domain_Lot_purityMeasuredBy" itemValue="id" items="${puritymeasuredbys}" path="/puritymeasuredbys" z="5fSUFFHjfIM23yR50PXcM4XpMBM="/>
-        <field:input field="percentEE" id="c_com_labsynch_labseer_domain_Lot_percentEE" validationMessageCode="field_invalid_number" z="EfE4ltNOYoNSfOlVMLv4XiQTe7U="/>
-        <field:input field="comments" id="c_com_labsynch_labseer_domain_Lot_comments" z="clsmBilQ6yPwTkJzR/WlUwZnwtA="/>
-        <field:checkbox field="isVirtual" id="c_com_labsynch_labseer_domain_Lot_isVirtual" z="FDKWBuReksLrqk0C+pfSXVohZ/M="/>
-        <field:checkbox field="ignore" id="c_com_labsynch_labseer_domain_Lot_ignore" z="0fu+LuBvYXYF2DJaESteuYimqnk="/>
-        <field:select field="physicalState" id="c_com_labsynch_labseer_domain_Lot_physicalState" itemValue="id" items="${physicalstates}" path="/physicalstates" z="ZMnew6SjVYLawxt+xpI1tQJmPW8="/>
-        <field:select field="vendor" id="c_com_labsynch_labseer_domain_Lot_vendor" itemValue="id" items="${vendors}" path="/vendors" z="vIMamx8Wh67GL0Au0038GyMnLpM="/>
-        <field:textarea field="vendorId" id="c_com_labsynch_labseer_domain_Lot_vendorId" z="+zerPBbArlXC6nCGa24jTSXI++A="/>
-        <field:simple field="fileLists" id="c_com_labsynch_labseer_domain_Lot_fileLists" messageCode="entity_reference_not_managed" messageCodeAttribute="File List" z="MnAjUKMFQtLu4/pJ5ILS4uDtGTU="/>
-        <field:input field="retain" id="c_com_labsynch_labseer_domain_Lot_retain" validationMessageCode="field_invalid_number" z="Kpkl5aySWjfVrttptW+10sr1wK0="/>
-        <field:select field="retainUnits" id="c_com_labsynch_labseer_domain_Lot_retainUnits" itemValue="id" items="${units}" path="/units" z="oSwKg7L+tT0vB/vdJzlOn6CYTyw="/>
-        <field:input field="retainLocation" id="c_com_labsynch_labseer_domain_Lot_retainLocation" z="kPEkyN3+Xh09TcuyHf2RpP6TAs0="/>
-        <field:input field="meltingPoint" id="c_com_labsynch_labseer_domain_Lot_meltingPoint" validationMessageCode="field_invalid_number" z="F9815rzNwrC+D2CCypvEBDzy1TQ="/>
-        <field:input field="boilingPoint" id="c_com_labsynch_labseer_domain_Lot_boilingPoint" validationMessageCode="field_invalid_number" z="cp6fBNW/8scF+kTxbZRryup2Fwo="/>
-        <field:textarea field="supplierLot" id="c_com_labsynch_labseer_domain_Lot_supplierLot" z="mQJLXraY+BBe+JIGsNx8jGzKqgs="/>
-        <field:select field="bulkLoadFile" id="c_com_labsynch_labseer_domain_Lot_bulkLoadFile" itemValue="id" items="${bulkloadfiles}" path="/bulkloadfiles" z="UIQ5kQSA1VWE47dwdGQyOCg/+8s="/>
-        <field:input field="lambda" id="c_com_labsynch_labseer_domain_Lot_lambda" validationMessageCode="field_invalid_number" z="L85qXflCaFfLBV1xaHcJqvsfBjE="/>
-        <field:input field="absorbance" id="c_com_labsynch_labseer_domain_Lot_absorbance" validationMessageCode="field_invalid_number" z="9bnlxv/1NROkvWY9wX1QLb3dnlA="/>
-        <field:input field="stockSolvent" id="c_com_labsynch_labseer_domain_Lot_stockSolvent" z="Woo4YugeGjqVs+2ZoVWl7ly5zV4="/>
-        <field:input field="stockLocation" id="c_com_labsynch_labseer_domain_Lot_stockLocation" z="XOrVHa4VIxLSIfuOHjhGAaT4DcY="/>
-        <field:input field="observedMassOne" id="c_com_labsynch_labseer_domain_Lot_observedMassOne" validationMessageCode="field_invalid_number" z="po7kJQEk06sLeomFx8emz0GZxSs="/>
-        <field:input field="observedMassTwo" id="c_com_labsynch_labseer_domain_Lot_observedMassTwo" validationMessageCode="field_invalid_number" z="ukfUP1nTm8j+SyopMFkfy3oW7as="/>
-        <field:input field="tareWeight" id="c_com_labsynch_labseer_domain_Lot_tareWeight" validationMessageCode="field_invalid_number" z="S2AsZ3WvPeWVD6Ssn9chsm3gUm4="/>
-        <field:select field="tareWeightUnits" id="c_com_labsynch_labseer_domain_Lot_tareWeightUnits" itemValue="id" items="${units}" path="/units" z="PqZ1vLnQ+kv/YnyLYZqCDHXErKs="/>
-        <field:input field="totalAmountStored" id="c_com_labsynch_labseer_domain_Lot_totalAmountStored" validationMessageCode="field_invalid_number" z="Abd56w6gu6LyAR6/VXCP8Duaxno="/>
-        <field:select field="totalAmountStoredUnits" id="c_com_labsynch_labseer_domain_Lot_totalAmountStoredUnits" itemValue="id" items="${units}" path="/units" z="bOLONKdTS9SbC07iksiipbES/3Y="/>
-        <field:simple field="lotAliases" id="c_com_labsynch_labseer_domain_Lot_lotAliases" messageCode="entity_reference_not_managed" messageCodeAttribute="Lot Alias" z="MLByumWqoN/kW/W+xBh1K7jgTzs="/>
-        <field:input field="registeredBy" id="c_com_labsynch_labseer_domain_Lot_registeredBy" z="f5OMuER31yhh1y56+8lmaCDuZlw="/>
-        <field:input field="chemist" id="c_com_labsynch_labseer_domain_Lot_chemist" z="DRAQZMcV0UaOYgEDGEN2k4FQEj4="/>
-        <field:input field="modifiedBy" id="c_com_labsynch_labseer_domain_Lot_modifiedBy" z="PWV7CSEQO0gy8QCQQqG3Eklh1O8="/>
-        <field:input field="project" id="c_com_labsynch_labseer_domain_Lot_project" z="Gjddcra97cmk2zI9lbzA3Am2YoU="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_Lot" render="${not empty dependencies}" z="qji9jvSHTBAX3dmGV+UFKk3uci0="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lots/findLotsByBuid.jspx b/src/main/webapp/WEB-INF/views/lots/findLotsByBuid.jspx
deleted file mode 100644
index 52147b14c..000000000
--- a/src/main/webapp/WEB-INF/views/lots/findLotsByBuid.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByBuid" id="ff_com_labsynch_labseer_domain_Lot" path="/lots" z="X8T3kg4VYXf1N45KZRTOOleoEkE=">
-        <field:input disableFormBinding="true" field="buid" id="f_com_labsynch_labseer_domain_Lot_buid" required="true" validationMessageCode="field_invalid_integer" z="Fe0EzgpqAn/aS0eZs+iSv6/3wmA="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lots/findLotsByBulkLoadFileEquals.jspx b/src/main/webapp/WEB-INF/views/lots/findLotsByBulkLoadFileEquals.jspx
deleted file mode 100644
index 58cd9657d..000000000
--- a/src/main/webapp/WEB-INF/views/lots/findLotsByBulkLoadFileEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByBulkLoadFileEquals" id="ff_com_labsynch_labseer_domain_Lot" path="/lots" z="cYkaLFQJw3RDSebjQnzK6oZZx0w=">
-        <field:select disableFormBinding="true" field="bulkLoadFile" id="f_com_labsynch_labseer_domain_Lot_bulkLoadFile" itemValue="id" items="${bulkloadfiles}" path="/bulkloadfiles" required="true" z="n3z3XCqo/NTLJQXraA3SbOWwEqg="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lots/findLotsByChemistAndSynthesisDateBetween.jspx b/src/main/webapp/WEB-INF/views/lots/findLotsByChemistAndSynthesisDateBetween.jspx
deleted file mode 100644
index e101cb017..000000000
--- a/src/main/webapp/WEB-INF/views/lots/findLotsByChemistAndSynthesisDateBetween.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByChemistAndSynthesisDateBetween" id="ff_com_labsynch_labseer_domain_Lot" path="/lots" z="Gyeovs42OhJqAtFXBVB21Mdp8kk=">
-        <field:input disableFormBinding="true" field="chemist" id="f_com_labsynch_labseer_domain_Lot_chemist" required="true" z="TKqyksr0GRE68NgHvStmYd9E/X8="/>
-        <field:datetime dateTimePattern="${lot_synthesisdate_date_format}" disableFormBinding="true" field="minSynthesisDate" id="f_com_labsynch_labseer_domain_Lot_minSynthesisDate" required="true" z="eDV73R7dqMTv3PWz0ZEdDvAGESw="/>
-        <field:datetime dateTimePattern="${lot_synthesisdate_date_format}" disableFormBinding="true" field="maxSynthesisDate" id="f_com_labsynch_labseer_domain_Lot_maxSynthesisDate" required="true" z="apqj4kku9BTKsgHMzbk3zewhINI="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lots/findLotsByCorpNameEquals.jspx b/src/main/webapp/WEB-INF/views/lots/findLotsByCorpNameEquals.jspx
deleted file mode 100644
index e98105962..000000000
--- a/src/main/webapp/WEB-INF/views/lots/findLotsByCorpNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCorpNameEquals" id="ff_com_labsynch_labseer_domain_Lot" path="/lots" z="t8t714NcOZi1ZwiNZ3u65WivhGk=">
-        <field:input disableFormBinding="true" field="corpName" id="f_com_labsynch_labseer_domain_Lot_corpName" max="255" required="true" z="4Suugw2NdzEPVdhZk7+JD+ELQAQ="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lots/findLotsByCorpNameLike.jspx b/src/main/webapp/WEB-INF/views/lots/findLotsByCorpNameLike.jspx
deleted file mode 100644
index 5356caa85..000000000
--- a/src/main/webapp/WEB-INF/views/lots/findLotsByCorpNameLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCorpNameLike" id="ff_com_labsynch_labseer_domain_Lot" path="/lots" z="MD1r9pZpR2jf3acC1FwCc8EVkpY=">
-        <field:input disableFormBinding="true" field="corpName" id="f_com_labsynch_labseer_domain_Lot_corpName" max="255" required="true" z="4Suugw2NdzEPVdhZk7+JD+ELQAQ="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lots/findLotsByIsVirtualNot.jspx b/src/main/webapp/WEB-INF/views/lots/findLotsByIsVirtualNot.jspx
deleted file mode 100644
index 5d66bc300..000000000
--- a/src/main/webapp/WEB-INF/views/lots/findLotsByIsVirtualNot.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByIsVirtualNot" id="ff_com_labsynch_labseer_domain_Lot" path="/lots" z="L5mVDJPYbaurL2kZijx2w6+NiuE=">
-        <field:checkbox disableFormBinding="true" field="isVirtual" id="f_com_labsynch_labseer_domain_Lot_isVirtual" z="9vvZIzfqZ5Cyo0AHV8uT0/56cjI="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lots/findLotsByNotebookPageEquals.jspx b/src/main/webapp/WEB-INF/views/lots/findLotsByNotebookPageEquals.jspx
deleted file mode 100644
index 60436ca24..000000000
--- a/src/main/webapp/WEB-INF/views/lots/findLotsByNotebookPageEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByNotebookPageEquals" id="ff_com_labsynch_labseer_domain_Lot" path="/lots" z="Y9QzZMR9Ml6EHnc3U5tBgIBAzAA=">
-        <field:input disableFormBinding="true" field="notebookPage" id="f_com_labsynch_labseer_domain_Lot_notebookPage" max="255" required="true" z="HN1oaAqKFsHLWQ+xBZ0mjKoWTiU="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lots/findLotsByNotebookPageEqualsAndIgnoreNot.jspx b/src/main/webapp/WEB-INF/views/lots/findLotsByNotebookPageEqualsAndIgnoreNot.jspx
deleted file mode 100644
index c685b1fd6..000000000
--- a/src/main/webapp/WEB-INF/views/lots/findLotsByNotebookPageEqualsAndIgnoreNot.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByNotebookPageEqualsAndIgnoreNot" id="ff_com_labsynch_labseer_domain_Lot" path="/lots" z="Kctpt2WxtYwde6lDKRo/VI73Pls=">
-        <field:input disableFormBinding="true" field="notebookPage" id="f_com_labsynch_labseer_domain_Lot_notebookPage" max="255" required="true" z="HN1oaAqKFsHLWQ+xBZ0mjKoWTiU="/>
-        <field:checkbox disableFormBinding="true" field="ignore" id="f_com_labsynch_labseer_domain_Lot_ignore" z="U4Q4ZiVeA4uBOFtIqW1K3dltWRA="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lots/findLotsBySaltForm.jspx b/src/main/webapp/WEB-INF/views/lots/findLotsBySaltForm.jspx
deleted file mode 100644
index 451b67e5b..000000000
--- a/src/main/webapp/WEB-INF/views/lots/findLotsBySaltForm.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="BySaltForm" id="ff_com_labsynch_labseer_domain_Lot" path="/lots" z="kd5NhMvLoeGEn6JiRKHLiQFJ5jU=">
-        <field:select disableFormBinding="true" field="saltForm" id="f_com_labsynch_labseer_domain_Lot_saltForm" itemValue="id" items="${saltforms}" path="/saltforms" required="true" z="59gTJeKFYyCPGgA85NlZLOK3FPE="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lots/findLotsBySynthesisDateBetween.jspx b/src/main/webapp/WEB-INF/views/lots/findLotsBySynthesisDateBetween.jspx
deleted file mode 100644
index 7c4a56c50..000000000
--- a/src/main/webapp/WEB-INF/views/lots/findLotsBySynthesisDateBetween.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="BySynthesisDateBetween" id="ff_com_labsynch_labseer_domain_Lot" path="/lots" z="5jsCPWpJJDDF6g/CmPFw1v5WItM=">
-        <field:datetime dateTimePattern="${lot_synthesisdate_date_format}" disableFormBinding="true" field="minSynthesisDate" id="f_com_labsynch_labseer_domain_Lot_minSynthesisDate" required="true" z="eDV73R7dqMTv3PWz0ZEdDvAGESw="/>
-        <field:datetime dateTimePattern="${lot_synthesisdate_date_format}" disableFormBinding="true" field="maxSynthesisDate" id="f_com_labsynch_labseer_domain_Lot_maxSynthesisDate" required="true" z="apqj4kku9BTKsgHMzbk3zewhINI="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lots/findLotsBySynthesisDateGreaterThan.jspx b/src/main/webapp/WEB-INF/views/lots/findLotsBySynthesisDateGreaterThan.jspx
deleted file mode 100644
index 407e9d9af..000000000
--- a/src/main/webapp/WEB-INF/views/lots/findLotsBySynthesisDateGreaterThan.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="BySynthesisDateGreaterThan" id="ff_com_labsynch_labseer_domain_Lot" path="/lots" z="2ASHfsMBf/uWl1uKyk1jDcj832w=">
-        <field:datetime dateTimePattern="${lot_synthesisdate_date_format}" disableFormBinding="true" field="synthesisDate" id="f_com_labsynch_labseer_domain_Lot_synthesisDate" required="true" z="M4YhJdC5YZBafcBf/PiiloroUgc="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lots/findLotsBySynthesisDateLessThan.jspx b/src/main/webapp/WEB-INF/views/lots/findLotsBySynthesisDateLessThan.jspx
deleted file mode 100644
index 19e617c3c..000000000
--- a/src/main/webapp/WEB-INF/views/lots/findLotsBySynthesisDateLessThan.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="BySynthesisDateLessThan" id="ff_com_labsynch_labseer_domain_Lot" path="/lots" z="pYyaKfDMwskFewQBQe9xDZtM8cU=">
-        <field:datetime dateTimePattern="${lot_synthesisdate_date_format}" disableFormBinding="true" field="synthesisDate" id="f_com_labsynch_labseer_domain_Lot_synthesisDate" required="true" z="M4YhJdC5YZBafcBf/PiiloroUgc="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lots/list.jspx b/src/main/webapp/WEB-INF/views/lots/list.jspx
deleted file mode 100644
index e8a792a2c..000000000
--- a/src/main/webapp/WEB-INF/views/lots/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_Lot" items="${lots}" z="L97cYm6DsOfgYw6KtLXFZwrIPoM=">
-        <table:table data="${lots}" id="l_com_labsynch_labseer_domain_Lot" path="/lots" z="47wbE71LaSnjHHNxohixXpt4aq8=">
-            <table:column id="c_com_labsynch_labseer_domain_Lot_storageLocation" property="storageLocation" z="H+zcEkEfhh4TfmmeuUkRh2/9EAk="/>
-            <table:column id="c_com_labsynch_labseer_domain_Lot_buid" property="buid" z="nbEIjDAeh6wSW2jy/c0n4fa8Y3U="/>
-            <table:column id="c_com_labsynch_labseer_domain_Lot_parent" property="parent" z="du6zSjOnwo028Uldfa8v25JTin4="/>
-            <table:column id="c_com_labsynch_labseer_domain_Lot_saltForm" property="saltForm" z="SSyvp5rTU61lX5mJnhq6hGOjJzA="/>
-            <table:column id="c_com_labsynch_labseer_domain_Lot_asDrawnStruct" property="asDrawnStruct" z="3q3Bh4OJfbd/vD02yhJXfUpobaI="/>
-            <table:column id="c_com_labsynch_labseer_domain_Lot_lotAsDrawnCdId" property="lotAsDrawnCdId" z="4b1tF8n/oUEsZ3Fqsn+Cc6RP9DA="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lots/show.jspx b/src/main/webapp/WEB-INF/views/lots/show.jspx
deleted file mode 100644
index 6368f0e3e..000000000
--- a/src/main/webapp/WEB-INF/views/lots/show.jspx
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_Lot" object="${lot}" path="/lots" z="FzMXfFVoDkhhoZElkdp5wERMFng=">
-        <field:display field="storageLocation" id="s_com_labsynch_labseer_domain_Lot_storageLocation" object="${lot}" z="7cs2kTPMHYobUX0e0JpKgHg3+m8="/>
-        <field:display field="buid" id="s_com_labsynch_labseer_domain_Lot_buid" object="${lot}" z="SIHApvurhVDjjrnZsiAGSWgosvw="/>
-        <field:display field="parent" id="s_com_labsynch_labseer_domain_Lot_parent" object="${lot}" z="5YsNTE7mMqR3gtZztT+7bQf163U="/>
-        <field:display field="saltForm" id="s_com_labsynch_labseer_domain_Lot_saltForm" object="${lot}" z="5iTG3Vk0YeS5dlQMhOOFTgTpen8="/>
-        <field:display field="asDrawnStruct" id="s_com_labsynch_labseer_domain_Lot_asDrawnStruct" object="${lot}" z="MmbRBClqOEz4dfysh6oVK8xtRYE="/>
-        <field:display field="lotAsDrawnCdId" id="s_com_labsynch_labseer_domain_Lot_lotAsDrawnCdId" object="${lot}" z="N/pOaHt1FICIAM4MTzRIBokSa1I="/>
-        <field:display field="corpName" id="s_com_labsynch_labseer_domain_Lot_corpName" object="${lot}" z="1nd5lVZoOAPWvN9X7eDMzV7X6tY="/>
-        <field:display field="lotNumber" id="s_com_labsynch_labseer_domain_Lot_lotNumber" object="${lot}" z="j144BQy1++EaSVAjKeWIzmZcIsQ="/>
-        <field:display field="lotMolWeight" id="s_com_labsynch_labseer_domain_Lot_lotMolWeight" object="${lot}" z="O98tEB9F0SXl47x6IveLxsejR9w="/>
-        <field:display date="true" dateTimePattern="${lot_synthesisdate_date_format}" field="synthesisDate" id="s_com_labsynch_labseer_domain_Lot_synthesisDate" object="${lot}" z="rcUdcHHWTQNyHdP6IPZ/pjSOpOo="/>
-        <field:display date="true" dateTimePattern="${lot_registrationdate_date_format}" field="registrationDate" id="s_com_labsynch_labseer_domain_Lot_registrationDate" object="${lot}" z="ziKcgGaWE8Se5oPhXWqOUxH7M/o="/>
-        <field:display date="true" dateTimePattern="${lot_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_Lot_modifiedDate" object="${lot}" z="1OF3uQakxe6enRECGJBDbyPF6mQ="/>
-        <field:display field="barcode" id="s_com_labsynch_labseer_domain_Lot_barcode" object="${lot}" z="qnYciG8pm8BVVP1d1Wthr92ju6E="/>
-        <field:display field="color" id="s_com_labsynch_labseer_domain_Lot_color" object="${lot}" z="yAAddsYfaShSY5k9upKJ5D8e3jc="/>
-        <field:display field="notebookPage" id="s_com_labsynch_labseer_domain_Lot_notebookPage" object="${lot}" z="GJqmlxJB2wvCwR0kpzu7lu+BfSc="/>
-        <field:display field="amount" id="s_com_labsynch_labseer_domain_Lot_amount" object="${lot}" z="3JmLQyoQTSNFTgWQ+VMQcJPSnmo="/>
-        <field:display field="amountUnits" id="s_com_labsynch_labseer_domain_Lot_amountUnits" object="${lot}" z="EQcfKiZbB2qH5nIOCa5Kg5WTx5c="/>
-        <field:display field="solutionAmount" id="s_com_labsynch_labseer_domain_Lot_solutionAmount" object="${lot}" z="wLiS7MkvqyeVcrxpkbUpgy5wQjI="/>
-        <field:display field="solutionAmountUnits" id="s_com_labsynch_labseer_domain_Lot_solutionAmountUnits" object="${lot}" z="QTw9KgmKiOQdowO8qAwBgXA2fVc="/>
-        <field:display field="supplier" id="s_com_labsynch_labseer_domain_Lot_supplier" object="${lot}" z="FMbwV3iLA5bZzajxA7n1VoVUzhk="/>
-        <field:display field="supplierID" id="s_com_labsynch_labseer_domain_Lot_supplierID" object="${lot}" z="NlM2/drR1dkWhjHQesx2xhkbRwQ="/>
-        <field:display field="purity" id="s_com_labsynch_labseer_domain_Lot_purity" object="${lot}" z="Qq6Ff6Hc+0yHqHsIuMNyX9N36qE="/>
-        <field:display field="purityOperator" id="s_com_labsynch_labseer_domain_Lot_purityOperator" object="${lot}" z="035H18r5s6w3IYeqBBmMD7dq4AY="/>
-        <field:display field="purityMeasuredBy" id="s_com_labsynch_labseer_domain_Lot_purityMeasuredBy" object="${lot}" z="EUkDiWwj71uCRsisB4nBJSTgIok="/>
-        <field:display field="percentEE" id="s_com_labsynch_labseer_domain_Lot_percentEE" object="${lot}" z="VMUTwuA4EH1Rz/Ui66nXItiIyPM="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_Lot_comments" object="${lot}" z="oE5YA/kPRGujfAXBJKz1LMdCFko="/>
-        <field:display field="isVirtual" id="s_com_labsynch_labseer_domain_Lot_isVirtual" object="${lot}" z="XLxmw5E3L0DOIwoz+Hoj/GpBIkY="/>
-        <field:display field="ignore" id="s_com_labsynch_labseer_domain_Lot_ignore" object="${lot}" z="Qh7yLCzpODAKnsls0NqCdRYHttY="/>
-        <field:display field="physicalState" id="s_com_labsynch_labseer_domain_Lot_physicalState" object="${lot}" z="cwhh+0WbiVcP8O83E3+hUAEnvu4="/>
-        <field:display field="vendor" id="s_com_labsynch_labseer_domain_Lot_vendor" object="${lot}" z="jnKMmngcCnjVVZLlGhHBsLr9uRc="/>
-        <field:display field="vendorId" id="s_com_labsynch_labseer_domain_Lot_vendorId" object="${lot}" z="70pfq8uoh1pUHHJLtAe//QgcibM="/>
-        <field:display field="retain" id="s_com_labsynch_labseer_domain_Lot_retain" object="${lot}" z="UfZVL6I/Z/XShV1JGFzIQZowyOE="/>
-        <field:display field="retainUnits" id="s_com_labsynch_labseer_domain_Lot_retainUnits" object="${lot}" z="2XOyXZUN4QyAf74NHN015CI2S5U="/>
-        <field:display field="retainLocation" id="s_com_labsynch_labseer_domain_Lot_retainLocation" object="${lot}" z="TQ/vHgGpJbqiGKXgNDANLZVldAU="/>
-        <field:display field="meltingPoint" id="s_com_labsynch_labseer_domain_Lot_meltingPoint" object="${lot}" z="4NLRlyCjB6DRRryGCe31YGU5h3E="/>
-        <field:display field="boilingPoint" id="s_com_labsynch_labseer_domain_Lot_boilingPoint" object="${lot}" z="vA5+sg3lPt8wC+DbQNR1nv7B6FI="/>
-        <field:display field="supplierLot" id="s_com_labsynch_labseer_domain_Lot_supplierLot" object="${lot}" z="svhCxo4RhEY2lrWdkrULS2eUgwI="/>
-        <field:display field="bulkLoadFile" id="s_com_labsynch_labseer_domain_Lot_bulkLoadFile" object="${lot}" z="YX0Oy+DB466vLcxWrnSEYnyqdcA="/>
-        <field:display field="lambda" id="s_com_labsynch_labseer_domain_Lot_lambda" object="${lot}" z="KWp3N16L1XA4cpk4Y136sVnW78I="/>
-        <field:display field="absorbance" id="s_com_labsynch_labseer_domain_Lot_absorbance" object="${lot}" z="vhD/1Ok8Rs+y/D7Giwr9sZeoCj0="/>
-        <field:display field="stockSolvent" id="s_com_labsynch_labseer_domain_Lot_stockSolvent" object="${lot}" z="hBSKb3Kh/hGMBP91uc0wYqcnR/4="/>
-        <field:display field="stockLocation" id="s_com_labsynch_labseer_domain_Lot_stockLocation" object="${lot}" z="F9RnKqmx/OPAkLNBXxnYkAryss0="/>
-        <field:display field="observedMassOne" id="s_com_labsynch_labseer_domain_Lot_observedMassOne" object="${lot}" z="xJyVemxQ2441CilHgjiK5TpPF9g="/>
-        <field:display field="observedMassTwo" id="s_com_labsynch_labseer_domain_Lot_observedMassTwo" object="${lot}" z="zn9FKSn6zol3m9qH+3ye8TkZd74="/>
-        <field:display field="tareWeight" id="s_com_labsynch_labseer_domain_Lot_tareWeight" object="${lot}" z="ZpknzRB7M2zX8LJUK+4jItjSLlc="/>
-        <field:display field="tareWeightUnits" id="s_com_labsynch_labseer_domain_Lot_tareWeightUnits" object="${lot}" z="3MmsWnT8T9PnrxEyVWAzxeLSMjk="/>
-        <field:display field="totalAmountStored" id="s_com_labsynch_labseer_domain_Lot_totalAmountStored" object="${lot}" z="6ZYR5XFR6s30m5iy6ywgQRqGQ4I="/>
-        <field:display field="totalAmountStoredUnits" id="s_com_labsynch_labseer_domain_Lot_totalAmountStoredUnits" object="${lot}" z="2N+sWafKzI5ORTxSYeBoeSOCjPQ="/>
-        <field:display field="registeredBy" id="s_com_labsynch_labseer_domain_Lot_registeredBy" object="${lot}" z="+qAwMR7/j/Bu38nCQlpSlLxvI24="/>
-        <field:display field="chemist" id="s_com_labsynch_labseer_domain_Lot_chemist" object="${lot}" z="a7zh9XLADb9UuLZ56uCg1KcP/PA="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_Lot_modifiedBy" object="${lot}" z="vHQ8qgwX/YHox07aCzSSohvFfWo="/>
-        <field:display field="project" id="s_com_labsynch_labseer_domain_Lot_project" object="${lot}" z="m87eZPEgA3XdD5KQGFnMrBAhd7k="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lots/update.jspx b/src/main/webapp/WEB-INF/views/lots/update.jspx
deleted file mode 100644
index 12f1d0b7d..000000000
--- a/src/main/webapp/WEB-INF/views/lots/update.jspx
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_Lot" modelAttribute="lot" path="/lots" versionField="Version" z="dN5HNPC0FYi6DSAcTvaybMyFiBM=">
-        <field:input field="storageLocation" id="c_com_labsynch_labseer_domain_Lot_storageLocation" z="2NUQXJHfhMxlD8buWNwbx5wJhwI="/>
-        <field:input field="buid" id="c_com_labsynch_labseer_domain_Lot_buid" validationMessageCode="field_invalid_integer" z="p9eXXfif+QBpkGoMBt3+WQkP2iw="/>
-        <field:input field="parent" id="c_com_labsynch_labseer_domain_Lot_parent" z="2AIbaiujxIzVWkQq403XDhu8k3Q="/>
-        <field:select field="saltForm" id="c_com_labsynch_labseer_domain_Lot_saltForm" itemValue="id" items="${saltforms}" path="/saltforms" z="OgSmRNRQK73MrIBFXJXT5IAvLYE="/>
-        <field:input field="asDrawnStruct" id="c_com_labsynch_labseer_domain_Lot_asDrawnStruct" z="j6Ll9A1amZ6uuTAVCx38NgXo1os="/>
-        <field:input field="lotAsDrawnCdId" id="c_com_labsynch_labseer_domain_Lot_lotAsDrawnCdId" z="8WPLQxHy7xNMVmhBFKxrrfl1oRs="/>
-        <field:textarea field="corpName" id="c_com_labsynch_labseer_domain_Lot_corpName" required="true" z="81cryE8n9FzsyKsmYAYt8jvei4Q="/>
-        <field:input field="lotNumber" id="c_com_labsynch_labseer_domain_Lot_lotNumber" validationMessageCode="field_invalid_integer" z="0grswgd6fzbbGmgSXtJw2Pyabsg="/>
-        <field:input field="lotMolWeight" id="c_com_labsynch_labseer_domain_Lot_lotMolWeight" validationMessageCode="field_invalid_number" z="pLfwU6E3LQ/AlaU+DFnrb6Cq57k="/>
-        <field:datetime dateTimePattern="${lot_synthesisdate_date_format}" field="synthesisDate" id="c_com_labsynch_labseer_domain_Lot_synthesisDate" z="Q1zsFcWQHvIY03gjSvFMYv6R8XE="/>
-        <field:datetime dateTimePattern="${lot_registrationdate_date_format}" field="registrationDate" id="c_com_labsynch_labseer_domain_Lot_registrationDate" z="Q/c9LxEDOhPxW8RuL9K8DC6SyTU="/>
-        <field:datetime dateTimePattern="${lot_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_Lot_modifiedDate" z="OpzbrcY0fLbfLYogv6N6NGKQlwQ="/>
-        <field:textarea field="barcode" id="c_com_labsynch_labseer_domain_Lot_barcode" z="pToUW00CZAsg3nYhIcb/UUsHsoA="/>
-        <field:textarea field="color" id="c_com_labsynch_labseer_domain_Lot_color" z="E4ogXGwPdFoWC4hCBP8hrOn1oF0="/>
-        <field:textarea field="notebookPage" id="c_com_labsynch_labseer_domain_Lot_notebookPage" z="xSEby3jF/ppiGNp9ZsFVla+DL9Q="/>
-        <field:input field="amount" id="c_com_labsynch_labseer_domain_Lot_amount" validationMessageCode="field_invalid_number" z="mmqr3SOtzlgb65FhRsrW7xbe27g="/>
-        <field:select field="amountUnits" id="c_com_labsynch_labseer_domain_Lot_amountUnits" itemValue="id" items="${units}" path="/units" z="76Shp+nj0VrQAdFkZtmCFuSxDuQ="/>
-        <field:input field="solutionAmount" id="c_com_labsynch_labseer_domain_Lot_solutionAmount" validationMessageCode="field_invalid_number" z="fqnt6jgkND0sjgKJwiba8FcQaJ0="/>
-        <field:select field="solutionAmountUnits" id="c_com_labsynch_labseer_domain_Lot_solutionAmountUnits" itemValue="id" items="${solutionunits}" path="/solutionunits" z="pEnCgB1IOInBOLQJDW3Bg2FdpY4="/>
-        <field:textarea field="supplier" id="c_com_labsynch_labseer_domain_Lot_supplier" z="NMX/p9Oyq1BLRpKEbqBPKBwOSks="/>
-        <field:textarea field="supplierID" id="c_com_labsynch_labseer_domain_Lot_supplierID" z="xaDqV1wcOVwBLDriq5x41WB04kM="/>
-        <field:input field="purity" id="c_com_labsynch_labseer_domain_Lot_purity" validationMessageCode="field_invalid_number" z="BP8ScRMCwv15O0HjL68VFTorGGY="/>
-        <field:select field="purityOperator" id="c_com_labsynch_labseer_domain_Lot_purityOperator" itemValue="id" items="${operators}" path="/operators" z="3ChI0quzzW1rm4YSPDg2XOoIOqo="/>
-        <field:select field="purityMeasuredBy" id="c_com_labsynch_labseer_domain_Lot_purityMeasuredBy" itemValue="id" items="${puritymeasuredbys}" path="/puritymeasuredbys" z="5fSUFFHjfIM23yR50PXcM4XpMBM="/>
-        <field:input field="percentEE" id="c_com_labsynch_labseer_domain_Lot_percentEE" validationMessageCode="field_invalid_number" z="EfE4ltNOYoNSfOlVMLv4XiQTe7U="/>
-        <field:input field="comments" id="c_com_labsynch_labseer_domain_Lot_comments" z="clsmBilQ6yPwTkJzR/WlUwZnwtA="/>
-        <field:checkbox field="isVirtual" id="c_com_labsynch_labseer_domain_Lot_isVirtual" z="FDKWBuReksLrqk0C+pfSXVohZ/M="/>
-        <field:checkbox field="ignore" id="c_com_labsynch_labseer_domain_Lot_ignore" z="0fu+LuBvYXYF2DJaESteuYimqnk="/>
-        <field:select field="physicalState" id="c_com_labsynch_labseer_domain_Lot_physicalState" itemValue="id" items="${physicalstates}" path="/physicalstates" z="ZMnew6SjVYLawxt+xpI1tQJmPW8="/>
-        <field:select field="vendor" id="c_com_labsynch_labseer_domain_Lot_vendor" itemValue="id" items="${vendors}" path="/vendors" z="vIMamx8Wh67GL0Au0038GyMnLpM="/>
-        <field:textarea field="vendorId" id="c_com_labsynch_labseer_domain_Lot_vendorId" z="+zerPBbArlXC6nCGa24jTSXI++A="/>
-        <field:simple field="fileLists" id="c_com_labsynch_labseer_domain_Lot_fileLists" messageCode="entity_reference_not_managed" messageCodeAttribute="File List" z="MnAjUKMFQtLu4/pJ5ILS4uDtGTU="/>
-        <field:input field="retain" id="c_com_labsynch_labseer_domain_Lot_retain" validationMessageCode="field_invalid_number" z="Kpkl5aySWjfVrttptW+10sr1wK0="/>
-        <field:select field="retainUnits" id="c_com_labsynch_labseer_domain_Lot_retainUnits" itemValue="id" items="${units}" path="/units" z="oSwKg7L+tT0vB/vdJzlOn6CYTyw="/>
-        <field:input field="retainLocation" id="c_com_labsynch_labseer_domain_Lot_retainLocation" z="kPEkyN3+Xh09TcuyHf2RpP6TAs0="/>
-        <field:input field="meltingPoint" id="c_com_labsynch_labseer_domain_Lot_meltingPoint" validationMessageCode="field_invalid_number" z="F9815rzNwrC+D2CCypvEBDzy1TQ="/>
-        <field:input field="boilingPoint" id="c_com_labsynch_labseer_domain_Lot_boilingPoint" validationMessageCode="field_invalid_number" z="cp6fBNW/8scF+kTxbZRryup2Fwo="/>
-        <field:textarea field="supplierLot" id="c_com_labsynch_labseer_domain_Lot_supplierLot" z="mQJLXraY+BBe+JIGsNx8jGzKqgs="/>
-        <field:select field="bulkLoadFile" id="c_com_labsynch_labseer_domain_Lot_bulkLoadFile" itemValue="id" items="${bulkloadfiles}" path="/bulkloadfiles" z="UIQ5kQSA1VWE47dwdGQyOCg/+8s="/>
-        <field:input field="lambda" id="c_com_labsynch_labseer_domain_Lot_lambda" validationMessageCode="field_invalid_number" z="L85qXflCaFfLBV1xaHcJqvsfBjE="/>
-        <field:input field="absorbance" id="c_com_labsynch_labseer_domain_Lot_absorbance" validationMessageCode="field_invalid_number" z="9bnlxv/1NROkvWY9wX1QLb3dnlA="/>
-        <field:input field="stockSolvent" id="c_com_labsynch_labseer_domain_Lot_stockSolvent" z="Woo4YugeGjqVs+2ZoVWl7ly5zV4="/>
-        <field:input field="stockLocation" id="c_com_labsynch_labseer_domain_Lot_stockLocation" z="XOrVHa4VIxLSIfuOHjhGAaT4DcY="/>
-        <field:input field="observedMassOne" id="c_com_labsynch_labseer_domain_Lot_observedMassOne" validationMessageCode="field_invalid_number" z="po7kJQEk06sLeomFx8emz0GZxSs="/>
-        <field:input field="observedMassTwo" id="c_com_labsynch_labseer_domain_Lot_observedMassTwo" validationMessageCode="field_invalid_number" z="ukfUP1nTm8j+SyopMFkfy3oW7as="/>
-        <field:input field="tareWeight" id="c_com_labsynch_labseer_domain_Lot_tareWeight" validationMessageCode="field_invalid_number" z="S2AsZ3WvPeWVD6Ssn9chsm3gUm4="/>
-        <field:select field="tareWeightUnits" id="c_com_labsynch_labseer_domain_Lot_tareWeightUnits" itemValue="id" items="${units}" path="/units" z="PqZ1vLnQ+kv/YnyLYZqCDHXErKs="/>
-        <field:input field="totalAmountStored" id="c_com_labsynch_labseer_domain_Lot_totalAmountStored" validationMessageCode="field_invalid_number" z="Abd56w6gu6LyAR6/VXCP8Duaxno="/>
-        <field:select field="totalAmountStoredUnits" id="c_com_labsynch_labseer_domain_Lot_totalAmountStoredUnits" itemValue="id" items="${units}" path="/units" z="bOLONKdTS9SbC07iksiipbES/3Y="/>
-        <field:simple field="lotAliases" id="c_com_labsynch_labseer_domain_Lot_lotAliases" messageCode="entity_reference_not_managed" messageCodeAttribute="Lot Alias" z="MLByumWqoN/kW/W+xBh1K7jgTzs="/>
-        <field:input field="registeredBy" id="c_com_labsynch_labseer_domain_Lot_registeredBy" z="f5OMuER31yhh1y56+8lmaCDuZlw="/>
-        <field:input field="chemist" id="c_com_labsynch_labseer_domain_Lot_chemist" z="DRAQZMcV0UaOYgEDGEN2k4FQEj4="/>
-        <field:input field="modifiedBy" id="c_com_labsynch_labseer_domain_Lot_modifiedBy" z="PWV7CSEQO0gy8QCQQqG3Eklh1O8="/>
-        <field:input field="project" id="c_com_labsynch_labseer_domain_Lot_project" z="Gjddcra97cmk2zI9lbzA3Am2YoU="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lots/views.xml b/src/main/webapp/WEB-INF/views/lots/views.xml
deleted file mode 100644
index 5c795d489..000000000
--- a/src/main/webapp/WEB-INF/views/lots/views.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="lots/list">
-        <put-attribute name="body" value="/WEB-INF/views/lots/list.jspx"/>
-    </definition>
-<definition extends="default" name="lots/show">
-        <put-attribute name="body" value="/WEB-INF/views/lots/show.jspx"/>
-    </definition>
-<definition extends="default" name="lots/create">
-        <put-attribute name="body" value="/WEB-INF/views/lots/create.jspx"/>
-    </definition>
-<definition extends="default" name="lots/update">
-        <put-attribute name="body" value="/WEB-INF/views/lots/update.jspx"/>
-    </definition>
-<definition extends="default" name="lots/findLotsByBuid">
-        <put-attribute name="body" value="/WEB-INF/views/lots/findLotsByBuid.jspx"/>
-    </definition>
-<definition extends="default" name="lots/findLotsByBulkLoadFileEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lots/findLotsByBulkLoadFileEquals.jspx"/>
-    </definition>
-<definition extends="default" name="lots/findLotsByChemistAndSynthesisDateBetween">
-        <put-attribute name="body" value="/WEB-INF/views/lots/findLotsByChemistAndSynthesisDateBetween.jspx"/>
-    </definition>
-<definition extends="default" name="lots/findLotsByCorpNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lots/findLotsByCorpNameEquals.jspx"/>
-    </definition>
-<definition extends="default" name="lots/findLotsByCorpNameLike">
-        <put-attribute name="body" value="/WEB-INF/views/lots/findLotsByCorpNameLike.jspx"/>
-    </definition>
-<definition extends="default" name="lots/findLotsByIsVirtualNot">
-        <put-attribute name="body" value="/WEB-INF/views/lots/findLotsByIsVirtualNot.jspx"/>
-    </definition>
-<definition extends="default" name="lots/findLotsByNotebookPageEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lots/findLotsByNotebookPageEquals.jspx"/>
-    </definition>
-<definition extends="default" name="lots/findLotsByNotebookPageEqualsAndIgnoreNot">
-        <put-attribute name="body" value="/WEB-INF/views/lots/findLotsByNotebookPageEqualsAndIgnoreNot.jspx"/>
-    </definition>
-<definition extends="default" name="lots/findLotsBySaltForm">
-        <put-attribute name="body" value="/WEB-INF/views/lots/findLotsBySaltForm.jspx"/>
-    </definition>
-<definition extends="default" name="lots/findLotsBySynthesisDateBetween">
-        <put-attribute name="body" value="/WEB-INF/views/lots/findLotsBySynthesisDateBetween.jspx"/>
-    </definition>
-<definition extends="default" name="lots/findLotsBySynthesisDateGreaterThan">
-        <put-attribute name="body" value="/WEB-INF/views/lots/findLotsBySynthesisDateGreaterThan.jspx"/>
-    </definition>
-<definition extends="default" name="lots/findLotsBySynthesisDateLessThan">
-        <put-attribute name="body" value="/WEB-INF/views/lots/findLotsBySynthesisDateLessThan.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/lsinteractions/create.jspx b/src/main/webapp/WEB-INF/views/lsinteractions/create.jspx
deleted file mode 100755
index 65997d0a8..000000000
--- a/src/main/webapp/WEB-INF/views/lsinteractions/create.jspx
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_LsInteraction" modelAttribute="lsInteraction" path="/lsinteractions" render="${empty dependencies}" z="yfJ3G5TM/4PGm5Zhl9/lVIaG+a0=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_LsInteraction_recordedBy" required="true" z="UwCZ/xTShbTEWlA7Hl2i9RoVtIY="/>
-        <field:datetime dateTimePattern="${lsInteraction_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_LsInteraction_recordedDate" required="true" z="PpBT0u2ZQaUYppu63J1FQQXyAYM="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_LsInteraction_modifiedBy" z="NSHYwl7xvQtz9cJ+N0DiWXG+O4Y="/>
-        <field:datetime dateTimePattern="${lsInteraction_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_LsInteraction_modifiedDate" z="Rk9RLDqPIT69W4agsb6r9S6ZDxE="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_LsInteraction_ignored" z="uPWceMPcAyZAcgQF6/WoNsPeLuw="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_LsInteraction_lsTransaction" validationMessageCode="field_invalid_integer" z="9Eb8tDb+EIJT508S5uj5h60rJYQ="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_LsInteraction_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="7sHOF20BEj4IONsXS7Lsl8/Alzw="/>
-        <field:input field="firstThing" id="c_com_labsynch_labseer_domain_LsInteraction_firstThing" required="true" validationMessageCode="field_invalid_integer" z="VrIkdO3bPXSjtRvAp2TWVlqibaU="/>
-        <field:input field="secondThing" id="c_com_labsynch_labseer_domain_LsInteraction_secondThing" required="true" validationMessageCode="field_invalid_integer" z="jAlq9hsRo6KNQpuIClWR6gHyadg="/>
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_LsInteraction_codeName" z="b9dOdC/Hv0ex2idF4XNiJOOoivI="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_LsInteraction_lsType" required="true" z="NyaPKffwuYcLFs6osAZT20vRygE="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_LsInteraction_lsKind" required="true" z="AT6P1BGsNv7UhQDngRQQNrFWwA4="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_LsInteraction_lsTypeAndKind" z="L0iaLCpMlK0ticTRK02gp3NUyuY="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_LsInteraction_deleted" z="xIwDgRBGI8bxsckasLUihyKgZ0A="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_LsInteraction" render="${not empty dependencies}" z="ec/XZWPL9aEJXNxQzFAAs8KbXis="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsinteractions/list.jspx b/src/main/webapp/WEB-INF/views/lsinteractions/list.jspx
deleted file mode 100755
index 36ba92e94..000000000
--- a/src/main/webapp/WEB-INF/views/lsinteractions/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_LsInteraction" items="${lsinteractions}" z="wIqc15XfD7nJ979c84XB3/r7P5c=">
-        <table:table data="${lsinteractions}" id="l_com_labsynch_labseer_domain_LsInteraction" path="/lsinteractions" z="zuxhIT8i0TOjx6ZE8vm993NY5k4=">
-            <table:column id="c_com_labsynch_labseer_domain_LsInteraction_recordedBy" property="recordedBy" z="0vrSRL1YA9C4woPAQAlIsLIg9WM="/>
-            <table:column date="true" dateTimePattern="${lsInteraction_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_LsInteraction_recordedDate" property="recordedDate" z="5pmsdXpAW6uUYcLAes8PSPEbELw="/>
-            <table:column id="c_com_labsynch_labseer_domain_LsInteraction_codeName" property="codeName" z="0mUimT5eqC3GRdyHpOGXtm6Iq1E="/>
-            <table:column id="c_com_labsynch_labseer_domain_LsInteraction_lsType" property="lsType" z="/K502445D3lera734ILaawRoi50="/>
-            <table:column id="c_com_labsynch_labseer_domain_LsInteraction_lsKind" property="lsKind" z="4exulWNk9OEvKfMSzYO6qKO4F14="/>
-            <table:column id="c_com_labsynch_labseer_domain_LsInteraction_lsTypeAndKind" property="lsTypeAndKind" z="RW1BfI4vFNSObHuVilpQQcu4IHs="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsinteractions/show.jspx b/src/main/webapp/WEB-INF/views/lsinteractions/show.jspx
deleted file mode 100755
index 29b865910..000000000
--- a/src/main/webapp/WEB-INF/views/lsinteractions/show.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_LsInteraction" object="${lsinteraction}" path="/lsinteractions" z="FnzJXIuI8Hn/jXNtPYNhvd+XPEc=">
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_LsInteraction_recordedBy" object="${lsinteraction}" z="BxMDeNAl5jtMKJzxhY804XNqqQ4="/>
-        <field:display date="true" dateTimePattern="${lsInteraction_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_LsInteraction_recordedDate" object="${lsinteraction}" z="fgV2IBPQRKr6UdtMPtg9qxqoLFM="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_LsInteraction_modifiedBy" object="${lsinteraction}" z="Gr9AeR6Ygd5lmae8deogUBjF61Y="/>
-        <field:display date="true" dateTimePattern="${lsInteraction_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_LsInteraction_modifiedDate" object="${lsinteraction}" z="5pThp4rqWi1kWq0feZacVL6kXbs="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_LsInteraction_ignored" object="${lsinteraction}" z="dXPi+yO6rGBI04ejG3yh8QEpGOg="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_LsInteraction_lsTransaction" object="${lsinteraction}" z="12uXbMt5suM8yUALjVNhZ5n2PZY="/>
-        <field:display field="firstThing" id="s_com_labsynch_labseer_domain_LsInteraction_firstThing" object="${lsinteraction}" z="cOLz1IZb/m2DXyF+xoUP2TKDCUc="/>
-        <field:display field="secondThing" id="s_com_labsynch_labseer_domain_LsInteraction_secondThing" object="${lsinteraction}" z="AqWzz5/D+7UGHX22PazRLBd0nYE="/>
-        <field:display field="codeName" id="s_com_labsynch_labseer_domain_LsInteraction_codeName" object="${lsinteraction}" z="jviv6bIv7mkchWIpQRrS/wz78N8="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_LsInteraction_lsType" object="${lsinteraction}" z="08yJimhGDOWO94FEjtzNNHmDKEE="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_LsInteraction_lsKind" object="${lsinteraction}" z="6CkOwmLkTWN/38VJaDOtqGKymIQ="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_LsInteraction_lsTypeAndKind" object="${lsinteraction}" z="ImJfx8TaDZU1kiJOHkzybrSOpz8="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_LsInteraction_deleted" object="${lsinteraction}" z="vIVs4lHDjTJqA2RnQ9dUa184mUc="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsinteractions/update.jspx b/src/main/webapp/WEB-INF/views/lsinteractions/update.jspx
deleted file mode 100755
index 5e6d29c3e..000000000
--- a/src/main/webapp/WEB-INF/views/lsinteractions/update.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_LsInteraction" modelAttribute="lsInteraction" path="/lsinteractions" versionField="Version" z="n2YEBFl4rLUuSkPkwDRF5EPjryw=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_LsInteraction_recordedBy" required="true" z="UwCZ/xTShbTEWlA7Hl2i9RoVtIY="/>
-        <field:datetime dateTimePattern="${lsInteraction_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_LsInteraction_recordedDate" required="true" z="PpBT0u2ZQaUYppu63J1FQQXyAYM="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_LsInteraction_modifiedBy" z="NSHYwl7xvQtz9cJ+N0DiWXG+O4Y="/>
-        <field:datetime dateTimePattern="${lsInteraction_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_LsInteraction_modifiedDate" z="Rk9RLDqPIT69W4agsb6r9S6ZDxE="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_LsInteraction_ignored" z="uPWceMPcAyZAcgQF6/WoNsPeLuw="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_LsInteraction_lsTransaction" validationMessageCode="field_invalid_integer" z="9Eb8tDb+EIJT508S5uj5h60rJYQ="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_LsInteraction_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="7sHOF20BEj4IONsXS7Lsl8/Alzw="/>
-        <field:input field="firstThing" id="c_com_labsynch_labseer_domain_LsInteraction_firstThing" required="true" validationMessageCode="field_invalid_integer" z="VrIkdO3bPXSjtRvAp2TWVlqibaU="/>
-        <field:input field="secondThing" id="c_com_labsynch_labseer_domain_LsInteraction_secondThing" required="true" validationMessageCode="field_invalid_integer" z="jAlq9hsRo6KNQpuIClWR6gHyadg="/>
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_LsInteraction_codeName" z="b9dOdC/Hv0ex2idF4XNiJOOoivI="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_LsInteraction_lsType" required="true" z="NyaPKffwuYcLFs6osAZT20vRygE="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_LsInteraction_lsKind" required="true" z="AT6P1BGsNv7UhQDngRQQNrFWwA4="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_LsInteraction_lsTypeAndKind" z="L0iaLCpMlK0ticTRK02gp3NUyuY="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_LsInteraction_deleted" z="xIwDgRBGI8bxsckasLUihyKgZ0A="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsinteractions/views.xml b/src/main/webapp/WEB-INF/views/lsinteractions/views.xml
deleted file mode 100755
index 56002d07c..000000000
--- a/src/main/webapp/WEB-INF/views/lsinteractions/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="lsinteractions/list">
-        <put-attribute name="body" value="/WEB-INF/views/lsinteractions/list.jspx"/>
-    </definition>
-<definition extends="default" name="lsinteractions/show">
-        <put-attribute name="body" value="/WEB-INF/views/lsinteractions/show.jspx"/>
-    </definition>
-<definition extends="default" name="lsinteractions/create">
-        <put-attribute name="body" value="/WEB-INF/views/lsinteractions/create.jspx"/>
-    </definition>
-<definition extends="default" name="lsinteractions/update">
-        <put-attribute name="body" value="/WEB-INF/views/lsinteractions/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/lsroles/create.jspx b/src/main/webapp/WEB-INF/views/lsroles/create.jspx
deleted file mode 100755
index e5648e0ed..000000000
--- a/src/main/webapp/WEB-INF/views/lsroles/create.jspx
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_LsRole" modelAttribute="lsRole" path="/lsroles" render="${empty dependencies}" z="ZRpqinU6SDc+8LXSWM8hmEdYWHE=">
-        <field:input field="roleName" id="c_com_labsynch_labseer_domain_LsRole_roleName" min="1" required="true" z="QdQpVTw5MvkEog65cob+4TS/KDo="/>
-        <field:textarea field="roleDescription" id="c_com_labsynch_labseer_domain_LsRole_roleDescription" z="X6Ua5aln4PWWg1nRI43kjCcl6os="/>
-        <field:simple field="authorRoles" id="c_com_labsynch_labseer_domain_LsRole_authorRoles" messageCode="entity_reference_not_managed" messageCodeAttribute="Author Role" z="TjEJUhNHtQ7b726dUyHLP/alA0o="/>
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_LsRole_lsType" itemValue="typeName" items="${collectiontypes}" path="/roletypes" required="true" z="user-managed"/>
-        <field:select field="lsKind" id="c_com_labsynch_labseer_domain_LsRole_lsKind" itemValue="kindName" items="${collectionkinds}" path="/rolekinds" required="true" z="user-managed"/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_LsRole_lsTypeAndKind" z="wsQeGNRBsghc14ccSlV9qLRA1HI="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_LsRole" render="${not empty dependencies}" z="TykgQ91lls/cNe5dvXiA1QiL+9M="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsroles/findLsRolesByLsKindEquals.jspx b/src/main/webapp/WEB-INF/views/lsroles/findLsRolesByLsKindEquals.jspx
deleted file mode 100644
index 9e7df738f..000000000
--- a/src/main/webapp/WEB-INF/views/lsroles/findLsRolesByLsKindEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsKindEquals" id="ff_com_labsynch_labseer_domain_LsRole" path="/lsroles" z="i6LAjFgPLIx5mEdPmkPKJrQ4tFI=">
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_LsRole_lsKind" max="255" required="true" z="l+K2IyWvVRwRxyFJJYDIwTrE9lY="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsroles/findLsRolesByLsTypeEquals.jspx b/src/main/webapp/WEB-INF/views/lsroles/findLsRolesByLsTypeEquals.jspx
deleted file mode 100644
index d55e54102..000000000
--- a/src/main/webapp/WEB-INF/views/lsroles/findLsRolesByLsTypeEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeEquals" id="ff_com_labsynch_labseer_domain_LsRole" path="/lsroles" z="lprTVaFrZVHvQuf5Yjgx51RkErI=">
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_LsRole_lsType" max="255" required="true" z="LmcMKcjsySyK3ITQKCVQthVgFnY="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsroles/findLsRolesByLsTypeEqualsAndLsKindEquals.jspx b/src/main/webapp/WEB-INF/views/lsroles/findLsRolesByLsTypeEqualsAndLsKindEquals.jspx
deleted file mode 100644
index f6e3f2210..000000000
--- a/src/main/webapp/WEB-INF/views/lsroles/findLsRolesByLsTypeEqualsAndLsKindEquals.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeEqualsAndLsKindEquals" id="ff_com_labsynch_labseer_domain_LsRole" path="/lsroles" z="hE3CIwkChsUr12bCcoOv2x7gUcE=">
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_LsRole_lsType" max="255" required="true" z="LmcMKcjsySyK3ITQKCVQthVgFnY="/>
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_LsRole_lsKind" max="255" required="true" z="l+K2IyWvVRwRxyFJJYDIwTrE9lY="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsroles/findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals.jspx b/src/main/webapp/WEB-INF/views/lsroles/findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals.jspx
deleted file mode 100644
index 08f6e3270..000000000
--- a/src/main/webapp/WEB-INF/views/lsroles/findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals" id="ff_com_labsynch_labseer_domain_LsRole" path="/lsroles" z="L2A8pzMqU7SQMaMUVRxJtItRePY=">
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_LsRole_lsType" max="255" required="true" z="LmcMKcjsySyK3ITQKCVQthVgFnY="/>
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_LsRole_lsKind" max="255" required="true" z="l+K2IyWvVRwRxyFJJYDIwTrE9lY="/>
-        <field:input disableFormBinding="true" field="roleName" id="f_com_labsynch_labseer_domain_LsRole_roleName" min="1" required="true" z="zTQToBRFGWO6B3H8nkA0SAHLf+Q="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsroles/findLsRolesByLsTypeEqualsAndRoleNameEquals.jspx b/src/main/webapp/WEB-INF/views/lsroles/findLsRolesByLsTypeEqualsAndRoleNameEquals.jspx
deleted file mode 100644
index babc21a10..000000000
--- a/src/main/webapp/WEB-INF/views/lsroles/findLsRolesByLsTypeEqualsAndRoleNameEquals.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeEqualsAndRoleNameEquals" id="ff_com_labsynch_labseer_domain_LsRole" path="/lsroles" z="NPNpdjAJfZWnu20XzP56T5qppcs=">
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_LsRole_lsType" max="255" required="true" z="LmcMKcjsySyK3ITQKCVQthVgFnY="/>
-        <field:input disableFormBinding="true" field="roleName" id="f_com_labsynch_labseer_domain_LsRole_roleName" min="1" required="true" z="zTQToBRFGWO6B3H8nkA0SAHLf+Q="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsroles/findLsRolesByRoleNameEquals.jspx b/src/main/webapp/WEB-INF/views/lsroles/findLsRolesByRoleNameEquals.jspx
deleted file mode 100755
index 8fb285b96..000000000
--- a/src/main/webapp/WEB-INF/views/lsroles/findLsRolesByRoleNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByRoleNameEquals" id="ff_com_labsynch_labseer_domain_LsRole" path="/lsroles" z="BTZD27eagECoWFZhkasZurBEr5w=">
-        <field:input disableFormBinding="true" field="roleName" id="f_com_labsynch_labseer_domain_LsRole_roleName" min="1" required="true" z="zTQToBRFGWO6B3H8nkA0SAHLf+Q="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsroles/list.jspx b/src/main/webapp/WEB-INF/views/lsroles/list.jspx
deleted file mode 100755
index 77435df4f..000000000
--- a/src/main/webapp/WEB-INF/views/lsroles/list.jspx
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_LsRole" items="${lsroles}" z="e47X/i2mnk1/P9z8L0652YusYRI=">
-        <table:table data="${lsroles}" id="l_com_labsynch_labseer_domain_LsRole" path="/lsroles" z="JdYf+Om0AZ3cHkW/BRneGy2Tf8M=">
-            <table:column id="c_com_labsynch_labseer_domain_LsRole_roleName" property="roleName" z="Cuo4q/8Lf+78St/h8inssrkwLPc="/>
-            <table:column id="c_com_labsynch_labseer_domain_LsRole_roleDescription" property="roleDescription" z="s1Cv9+B32EFTUVIFI901VvOHk1s="/>
-            <table:column id="c_com_labsynch_labseer_domain_LsRole_lsType" property="lsType" z="VzlkpffJ1fOmxDVc/1CgZC38cQY="/>
-            <table:column id="c_com_labsynch_labseer_domain_LsRole_lsKind" property="lsKind" z="sAzrh8Wd3tBbTo4wM4KxKtFNFqI="/>
-            <table:column id="c_com_labsynch_labseer_domain_LsRole_lsTypeAndKind" property="lsTypeAndKind" z="9NVOKBKo9fN/6uahBI4XJWqAaTo="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsroles/show.jspx b/src/main/webapp/WEB-INF/views/lsroles/show.jspx
deleted file mode 100755
index de00f0d39..000000000
--- a/src/main/webapp/WEB-INF/views/lsroles/show.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_LsRole" object="${lsrole}" path="/lsroles" z="MYX0UIPYJNeAexok15e4WgiXogw=">
-        <field:display field="roleName" id="s_com_labsynch_labseer_domain_LsRole_roleName" object="${lsrole}" z="uL3l7e20dbjKTOTYFDVgF17/gKI="/>
-        <field:display field="roleDescription" id="s_com_labsynch_labseer_domain_LsRole_roleDescription" object="${lsrole}" z="AnKuIYuaLnJna/2fsGP3XABBm7U="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_LsRole_lsType" object="${lsrole}" z="Gx2HA0yQRUR7UAGvJmT9vUD1bSM="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_LsRole_lsKind" object="${lsrole}" z="qOhPcpVMA9KpuGshNe0bhe+irO8="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_LsRole_lsTypeAndKind" object="${lsrole}" z="6iBOndIWTuhQUCXCZEVcR7ZdrJY="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsroles/update.jspx b/src/main/webapp/WEB-INF/views/lsroles/update.jspx
deleted file mode 100755
index 1a623f36e..000000000
--- a/src/main/webapp/WEB-INF/views/lsroles/update.jspx
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_LsRole" modelAttribute="lsRole" path="/lsroles" versionField="Version" z="3pp6Sbj3GgDaoC7lqe+Gb2XMpSA=">
-        <field:input field="roleName" id="c_com_labsynch_labseer_domain_LsRole_roleName" min="1" required="true" z="QdQpVTw5MvkEog65cob+4TS/KDo="/>
-        <field:textarea field="roleDescription" id="c_com_labsynch_labseer_domain_LsRole_roleDescription" z="X6Ua5aln4PWWg1nRI43kjCcl6os="/>
-        <field:simple field="authorRoles" id="c_com_labsynch_labseer_domain_LsRole_authorRoles" messageCode="entity_reference_not_managed" messageCodeAttribute="Author Role" z="TjEJUhNHtQ7b726dUyHLP/alA0o="/>
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_LsRole_lsType" itemValue="typeName" items="${collectiontypes}" path="/roletypes" required="true" z="user-managed"/>
-        <field:select field="lsKind" id="c_com_labsynch_labseer_domain_LsRole_lsKind" itemValue="kindName" items="${collectionkinds}" path="/rolekinds" required="true" z="user-managed"/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_LsRole_lsTypeAndKind" z="wsQeGNRBsghc14ccSlV9qLRA1HI="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsroles/views.xml b/src/main/webapp/WEB-INF/views/lsroles/views.xml
deleted file mode 100755
index 9c08416b1..000000000
--- a/src/main/webapp/WEB-INF/views/lsroles/views.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="lsroles/list">
-        <put-attribute name="body" value="/WEB-INF/views/lsroles/list.jspx"/>
-    </definition>
-<definition extends="default" name="lsroles/show">
-        <put-attribute name="body" value="/WEB-INF/views/lsroles/show.jspx"/>
-    </definition>
-<definition extends="default" name="lsroles/create">
-        <put-attribute name="body" value="/WEB-INF/views/lsroles/create.jspx"/>
-    </definition>
-<definition extends="default" name="lsroles/update">
-        <put-attribute name="body" value="/WEB-INF/views/lsroles/update.jspx"/>
-    </definition>
-<definition extends="default" name="lsroles/findLsRolesByRoleNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lsroles/findLsRolesByRoleNameEquals.jspx"/>
-    </definition>
-<definition extends="default" name="lsroles/findLsRolesByLsTypeEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lsroles/findLsRolesByLsTypeEquals.jspx"/>
-    </definition>
-<definition extends="default" name="lsroles/findLsRolesByLsTypeEqualsAndLsKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lsroles/findLsRolesByLsTypeEqualsAndLsKindEquals.jspx"/>
-    </definition>
-<definition extends="default" name="lsroles/findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lsroles/findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals.jspx"/>
-    </definition>
-<definition extends="default" name="lsroles/findLsRolesByLsTypeEqualsAndRoleNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lsroles/findLsRolesByLsTypeEqualsAndRoleNameEquals.jspx"/>
-    </definition>
-<definition extends="default" name="lsroles/findLsRolesByLsKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lsroles/findLsRolesByLsKindEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/lstags/create.jspx b/src/main/webapp/WEB-INF/views/lstags/create.jspx
deleted file mode 100755
index 11d34decf..000000000
--- a/src/main/webapp/WEB-INF/views/lstags/create.jspx
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_LsTag" modelAttribute="lsTag" path="/lstags" render="${empty dependencies}" z="npy5Eq6Xs3P9BRmLh/Y+nNPoSlA=">
-        <field:textarea field="tagText" id="c_com_labsynch_labseer_domain_LsTag_tagText" z="MZeKJlPvYkcoXfy+/afWDtJ7WRs="/>
-        <field:datetime dateTimePattern="${lsTag_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_LsTag_recordedDate" z="93cAGQgqUoQKjx85Qfv/joMb+Bk="/>
-        <field:select field="experiments" id="c_com_labsynch_labseer_domain_LsTag_experiments" itemValue="id" items="${experiments}" multiple="true" path="/experiments" render="false" z="user-managed"/>
-        <field:select field="protocols" id="c_com_labsynch_labseer_domain_LsTag_protocols" itemValue="id" items="${protocols}" multiple="true" path="/protocols" render="false" z="user-managed"/>
-        <field:select field="lsThings" id="c_com_labsynch_labseer_domain_LsTag_lsThings" itemValue="id" items="${lsthings}" multiple="true" path="/lsthings" z="9SG+xaH41Ph9hVVgt52S9KGrUSo="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_LsTag" render="${not empty dependencies}" z="Pv56T+PmXsUDFR28z6K+DGNVaBQ="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lstags/findLsTagsByTagTextEquals.jspx b/src/main/webapp/WEB-INF/views/lstags/findLsTagsByTagTextEquals.jspx
deleted file mode 100755
index 787862d9f..000000000
--- a/src/main/webapp/WEB-INF/views/lstags/findLsTagsByTagTextEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByTagTextEquals" id="ff_com_labsynch_labseer_domain_LsTag" path="/lstags" z="Zm1/FIcAqAi+ae5C6IUL//Qsrsg=">
-        <field:input disableFormBinding="true" field="tagText" id="f_com_labsynch_labseer_domain_LsTag_tagText" max="255" required="true" z="4VdMb44ynge2RS/76ySMkdX/YeA="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lstags/findLsTagsByTagTextLike.jspx b/src/main/webapp/WEB-INF/views/lstags/findLsTagsByTagTextLike.jspx
deleted file mode 100755
index 107ba1939..000000000
--- a/src/main/webapp/WEB-INF/views/lstags/findLsTagsByTagTextLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByTagTextLike" id="ff_com_labsynch_labseer_domain_LsTag" path="/lstags" z="Qgu68Ts8u1uGw/BEyTeKvJWeIQ8=">
-        <field:input disableFormBinding="true" field="tagText" id="f_com_labsynch_labseer_domain_LsTag_tagText" max="255" required="true" z="4VdMb44ynge2RS/76ySMkdX/YeA="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lstags/list.jspx b/src/main/webapp/WEB-INF/views/lstags/list.jspx
deleted file mode 100755
index 94a4d5c6e..000000000
--- a/src/main/webapp/WEB-INF/views/lstags/list.jspx
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_LsTag" items="${lstags}" z="NklSrNI0VgFcU7xX1N+xH0urcdc=">
-        <table:table data="${lstags}" id="l_com_labsynch_labseer_domain_LsTag" path="/lstags" z="an7R2ORHJds9L84hoAej1yDC8nY=">
-            <table:column id="c_com_labsynch_labseer_domain_LsTag_tagText" property="tagText" z="D8R7FAKds+QjIWoYLkZHZ35tieA="/>
-            <table:column date="true" dateTimePattern="${lsTag_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_LsTag_recordedDate" property="recordedDate" z="ZV5sxBc2aNXwcbMsldJ1TSS/0bU="/>
-            <table:column id="c_com_labsynch_labseer_domain_LsTag_experiments" property="experiments" render="false" z="user-managed"/>
-            <table:column id="c_com_labsynch_labseer_domain_LsTag_protocols" property="protocols" render="false" z="user-managed"/>
-            <table:column id="c_com_labsynch_labseer_domain_LsTag_lsThings" property="lsThings" z="NlDMp5eecKiAaQULU/Ps+bn3HR4="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lstags/show.jspx b/src/main/webapp/WEB-INF/views/lstags/show.jspx
deleted file mode 100755
index 2135b8aa2..000000000
--- a/src/main/webapp/WEB-INF/views/lstags/show.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_LsTag" object="${lstag}" path="/lstags" z="Drzrvypu/Mst5PGXXpfRbTUVoV4=">
-        <field:display field="tagText" id="s_com_labsynch_labseer_domain_LsTag_tagText" object="${lstag}" z="OEUD1MbcuT9JWfoqXOtTTxRqaj0="/>
-        <field:display date="true" dateTimePattern="${lsTag_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_LsTag_recordedDate" object="${lstag}" z="Yy5et9Zrnl8V90W0EYpr5S6O+Pg="/>
-        <field:display field="experiments" id="s_com_labsynch_labseer_domain_LsTag_experiments" object="${lstag}" render="false" z="user-managed"/>
-        <field:display field="protocols" id="s_com_labsynch_labseer_domain_LsTag_protocols" object="${lstag}" render="false" z="user-managed"/>
-        <field:display field="lsThings" id="s_com_labsynch_labseer_domain_LsTag_lsThings" object="${lstag}" z="c0HsxBssjmKqVxMwM8euiydnflU="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lstags/update.jspx b/src/main/webapp/WEB-INF/views/lstags/update.jspx
deleted file mode 100755
index 9f5d4a09e..000000000
--- a/src/main/webapp/WEB-INF/views/lstags/update.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_LsTag" modelAttribute="lsTag" path="/lstags" versionField="Version" z="HVjD/fVf+AQJBKel0rcoBmS7OII=">
-        <field:textarea field="tagText" id="c_com_labsynch_labseer_domain_LsTag_tagText" z="MZeKJlPvYkcoXfy+/afWDtJ7WRs="/>
-        <field:datetime dateTimePattern="${lsTag_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_LsTag_recordedDate" z="93cAGQgqUoQKjx85Qfv/joMb+Bk="/>
-        <field:select field="experiments" id="c_com_labsynch_labseer_domain_LsTag_experiments" itemValue="id" items="${experiments}" multiple="true" path="/experiments" render="false" z="user-managed"/>
-        <field:select field="protocols" id="c_com_labsynch_labseer_domain_LsTag_protocols" itemValue="id" items="${protocols}" multiple="true" path="/protocols" render="false" z="user-managed"/>
-        <field:select field="lsThings" id="c_com_labsynch_labseer_domain_LsTag_lsThings" itemValue="id" items="${lsthings}" multiple="true" path="/lsthings" z="9SG+xaH41Ph9hVVgt52S9KGrUSo="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lstags/views.xml b/src/main/webapp/WEB-INF/views/lstags/views.xml
deleted file mode 100755
index 16e196fda..000000000
--- a/src/main/webapp/WEB-INF/views/lstags/views.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="lstags/list">
-        <put-attribute name="body" value="/WEB-INF/views/lstags/list.jspx"/>
-    </definition>
-<definition extends="default" name="lstags/show">
-        <put-attribute name="body" value="/WEB-INF/views/lstags/show.jspx"/>
-    </definition>
-<definition extends="default" name="lstags/create">
-        <put-attribute name="body" value="/WEB-INF/views/lstags/create.jspx"/>
-    </definition>
-<definition extends="default" name="lstags/update">
-        <put-attribute name="body" value="/WEB-INF/views/lstags/update.jspx"/>
-    </definition>
-<definition extends="default" name="lstags/findLsTagsByTagTextEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lstags/findLsTagsByTagTextEquals.jspx"/>
-    </definition>
-<definition extends="default" name="lstags/findLsTagsByTagTextLike">
-        <put-attribute name="body" value="/WEB-INF/views/lstags/findLsTagsByTagTextLike.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/lsthinglabels/create.jspx b/src/main/webapp/WEB-INF/views/lsthinglabels/create.jspx
deleted file mode 100755
index 2f9c359f1..000000000
--- a/src/main/webapp/WEB-INF/views/lsthinglabels/create.jspx
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_LsThingLabel" modelAttribute="lsThingLabel" path="/lsthinglabels" render="${empty dependencies}" z="pz0ClZGs0tocRFSPfhqE4Il1SmQ=">
-        <field:textarea field="labelText" id="c_com_labsynch_labseer_domain_LsThingLabel_labelText" required="true" z="sCNy2Oxvrn/t98wZYZzXpafoKxo="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_LsThingLabel_recordedBy" required="true" z="jbYFgGOMUTLaaZE/itsLnm2qDhE="/>
-        <field:datetime dateTimePattern="${lsThingLabel_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_LsThingLabel_recordedDate" required="true" z="SxwvETX9xcR1Ej4IIguNymULDkI="/>
-        <field:datetime dateTimePattern="${lsThingLabel_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_LsThingLabel_modifiedDate" z="kCAbzLWPlC2V4Skr4W1AHHJ6/vc="/>
-        <field:checkbox field="physicallyLabled" id="c_com_labsynch_labseer_domain_LsThingLabel_physicallyLabled" z="1Voz/3/Pt2FMIhjv9RuPxTMRosc="/>
-        <field:textarea field="imageFile" id="c_com_labsynch_labseer_domain_LsThingLabel_imageFile" z="WIaCPiniaFGnpQ/BS+6h6leWFO0="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_LsThingLabel_lsType" required="true" z="xtadEGgUTN0mjcdHDSc2hs6p8wU="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_LsThingLabel_lsKind" required="true" z="6u0rYh5xBoZ72NFjTstzvxdg2Uc="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_LsThingLabel_lsTypeAndKind" z="H1pr3VmN6MzovR1d66CMrb5Es9g="/>
-        <field:checkbox field="preferred" id="c_com_labsynch_labseer_domain_LsThingLabel_preferred" z="ZOzH5it+L1vnuqkVq82dsxk9DvQ="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_LsThingLabel_ignored" z="3+n8s89OHFpoU6BZ/iG5yvTp4Cg="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_LsThingLabel_lsTransaction" validationMessageCode="field_invalid_integer" z="urYqPF7SOktgZSh6GmrAPj2oP3U="/>
-        <field:select field="lsThing" id="c_com_labsynch_labseer_domain_LsThingLabel_lsThing" itemValue="id" items="${lsthings}" path="/lsthings" required="true" z="Dxf9PsLVhsMeWT2eE6lJG7p7Iuc="/>
-        <field:input field="lsThingTypeAndKind" id="c_com_labsynch_labseer_domain_LsThingLabel_lsThingTypeAndKind" z="sux6eKdSGI4jlKjI0WzrKjslCTI="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_LsThingLabel_deleted" z="75GZwRi/sAj6OmuusBNj5pwGYEI="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_LsThingLabel" render="${not empty dependencies}" z="pZtwQmOLr/B0tR5KT/dDPDuoWew="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthinglabels/findLsThingLabelsByLabelTextEquals.jspx b/src/main/webapp/WEB-INF/views/lsthinglabels/findLsThingLabelsByLabelTextEquals.jspx
deleted file mode 100755
index 487b60bff..000000000
--- a/src/main/webapp/WEB-INF/views/lsthinglabels/findLsThingLabelsByLabelTextEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLabelTextEquals" id="ff_com_labsynch_labseer_domain_LsThingLabel" path="/lsthinglabels" z="5fFLlw8mPqWxSOusFjNcm7/c5v8=">
-        <field:input disableFormBinding="true" field="labelText" id="f_com_labsynch_labseer_domain_LsThingLabel_labelText" max="255" required="true" z="QT0AwsbydgzOwv8FREabDQh0mN4="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthinglabels/findLsThingLabelsByLabelTextEqualsAndIgnoredNot.jspx b/src/main/webapp/WEB-INF/views/lsthinglabels/findLsThingLabelsByLabelTextEqualsAndIgnoredNot.jspx
deleted file mode 100755
index 5d154d5f5..000000000
--- a/src/main/webapp/WEB-INF/views/lsthinglabels/findLsThingLabelsByLabelTextEqualsAndIgnoredNot.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLabelTextEqualsAndIgnoredNot" id="ff_com_labsynch_labseer_domain_LsThingLabel" path="/lsthinglabels" z="dyVU1QiEB3bTd+GtsVl40urNK+c=">
-        <field:input disableFormBinding="true" field="labelText" id="f_com_labsynch_labseer_domain_LsThingLabel_labelText" max="255" required="true" z="QT0AwsbydgzOwv8FREabDQh0mN4="/>
-        <field:checkbox disableFormBinding="true" field="ignored" id="f_com_labsynch_labseer_domain_LsThingLabel_ignored" z="iwNmLzukBY0Jl7kb1LXbj5VhUmY="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthinglabels/findLsThingLabelsByLabelTextLike.jspx b/src/main/webapp/WEB-INF/views/lsthinglabels/findLsThingLabelsByLabelTextLike.jspx
deleted file mode 100755
index 386a179cc..000000000
--- a/src/main/webapp/WEB-INF/views/lsthinglabels/findLsThingLabelsByLabelTextLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLabelTextLike" id="ff_com_labsynch_labseer_domain_LsThingLabel" path="/lsthinglabels" z="Vnp554RT+LCQnkufknjtrFOFFCU=">
-        <field:input disableFormBinding="true" field="labelText" id="f_com_labsynch_labseer_domain_LsThingLabel_labelText" max="255" required="true" z="QT0AwsbydgzOwv8FREabDQh0mN4="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthinglabels/findLsThingLabelsByLsThing.jspx b/src/main/webapp/WEB-INF/views/lsthinglabels/findLsThingLabelsByLsThing.jspx
deleted file mode 100755
index e6d9d827e..000000000
--- a/src/main/webapp/WEB-INF/views/lsthinglabels/findLsThingLabelsByLsThing.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsThing" id="ff_com_labsynch_labseer_domain_LsThingLabel" path="/lsthinglabels" z="rasb74c+/AFIJ6GFgYclqVCLpYg=">
-        <field:select disableFormBinding="true" field="lsThing" id="f_com_labsynch_labseer_domain_LsThingLabel_lsThing" itemValue="id" items="${lsthings}" path="/lsthings" required="true" z="y9O7EvUhup0bu36cwHlGl9LOAtE="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthinglabels/findLsThingLabelsByLsTransactionEquals.jspx b/src/main/webapp/WEB-INF/views/lsthinglabels/findLsThingLabelsByLsTransactionEquals.jspx
deleted file mode 100755
index 7a0b919c4..000000000
--- a/src/main/webapp/WEB-INF/views/lsthinglabels/findLsThingLabelsByLsTransactionEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTransactionEquals" id="ff_com_labsynch_labseer_domain_LsThingLabel" path="/lsthinglabels" z="ZKleOXOVytUF5JjpxZX6YPux7A4=">
-        <field:input disableFormBinding="true" field="lsTransaction" id="f_com_labsynch_labseer_domain_LsThingLabel_lsTransaction" required="true" validationMessageCode="field_invalid_integer" z="Itl+Zg+F8oLH7RVdBehAatl5LR4="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthinglabels/list.jspx b/src/main/webapp/WEB-INF/views/lsthinglabels/list.jspx
deleted file mode 100755
index 9b212bb75..000000000
--- a/src/main/webapp/WEB-INF/views/lsthinglabels/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_LsThingLabel" items="${lsthinglabels}" z="ciSyHBBqSpzqEGtI8BAuF5oTyOc=">
-        <table:table data="${lsthinglabels}" id="l_com_labsynch_labseer_domain_LsThingLabel" path="/lsthinglabels" z="lHnh7qkWSlvpUnYCI/Tk8BO2amU=">
-            <table:column id="c_com_labsynch_labseer_domain_LsThingLabel_labelText" property="labelText" z="5UYxm3hh4flExNSp/A0RA8Y5imU="/>
-            <table:column id="c_com_labsynch_labseer_domain_LsThingLabel_recordedBy" property="recordedBy" z="z78WOqVFZPA3Hn0cAC2UBrCfkOw="/>
-            <table:column date="true" dateTimePattern="${lsThingLabel_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_LsThingLabel_recordedDate" property="recordedDate" z="1tFH20H/BZrh+OlfivLUdF+xRXE="/>
-            <table:column date="true" dateTimePattern="${lsThingLabel_modifieddate_date_format}" id="c_com_labsynch_labseer_domain_LsThingLabel_modifiedDate" property="modifiedDate" z="wHdqz3cdeduaXBNYe8il7moFY7s="/>
-            <table:column id="c_com_labsynch_labseer_domain_LsThingLabel_physicallyLabled" property="physicallyLabled" z="R4CrFyBhbEvTeU+UFxrjAwUIU1o="/>
-            <table:column id="c_com_labsynch_labseer_domain_LsThingLabel_imageFile" property="imageFile" z="9o5NHSUXQeEoS94ECYAflrBaLpk="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthinglabels/show.jspx b/src/main/webapp/WEB-INF/views/lsthinglabels/show.jspx
deleted file mode 100755
index 8c4778059..000000000
--- a/src/main/webapp/WEB-INF/views/lsthinglabels/show.jspx
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_LsThingLabel" object="${lsthinglabel}" path="/lsthinglabels" z="8TIvtPAc3K5EuEkRCuCO7K+yyK0=">
-        <field:display field="labelText" id="s_com_labsynch_labseer_domain_LsThingLabel_labelText" object="${lsthinglabel}" z="7HLRcY4tMKh/IKoU1csmzncS1tc="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_LsThingLabel_recordedBy" object="${lsthinglabel}" z="i5SQHcpLMj3vrblnZgxn410z3sc="/>
-        <field:display date="true" dateTimePattern="${lsThingLabel_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_LsThingLabel_recordedDate" object="${lsthinglabel}" z="wklutn/Zt4H9t1TEDACGsx4DqG0="/>
-        <field:display date="true" dateTimePattern="${lsThingLabel_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_LsThingLabel_modifiedDate" object="${lsthinglabel}" z="lN17OQVv+SjjHaON7O2ZeBaVJBU="/>
-        <field:display field="physicallyLabled" id="s_com_labsynch_labseer_domain_LsThingLabel_physicallyLabled" object="${lsthinglabel}" z="N4ceg7vbX3cN6FXT+ScBzfYglog="/>
-        <field:display field="imageFile" id="s_com_labsynch_labseer_domain_LsThingLabel_imageFile" object="${lsthinglabel}" z="E/hl/jWixUGViSBtJGLBoSOfiUo="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_LsThingLabel_lsType" object="${lsthinglabel}" z="hfmQ19MqEajMFDaYNABMCBB7Zsc="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_LsThingLabel_lsKind" object="${lsthinglabel}" z="k8hvUVUfxMyPoVagAhBBmAI1zM4="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_LsThingLabel_lsTypeAndKind" object="${lsthinglabel}" z="w7AEJ+CVKLKAh682ui4nA6pQimw="/>
-        <field:display field="preferred" id="s_com_labsynch_labseer_domain_LsThingLabel_preferred" object="${lsthinglabel}" z="WlofUNdRD/mQooIZZFLPtaSlZ5k="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_LsThingLabel_ignored" object="${lsthinglabel}" z="QMWXk043EJoAKauz+aHBVnPnT/E="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_LsThingLabel_lsTransaction" object="${lsthinglabel}" z="DDengMOrttYGzgXn//RVwht3/8M="/>
-        <field:display field="lsThing" id="s_com_labsynch_labseer_domain_LsThingLabel_lsThing" object="${lsthinglabel}" z="VV5Oox++WGgETXgGqoJuUQHUpxQ="/>
-        <field:display field="lsThingTypeAndKind" id="s_com_labsynch_labseer_domain_LsThingLabel_lsThingTypeAndKind" object="${lsthinglabel}" z="5ESHSg57kcwt8p9BqwgIkE1x3gg="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_LsThingLabel_deleted" object="${lsthinglabel}" z="HN+Ub4EM2pdWrwGKbD5/jWgKhzM="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthinglabels/update.jspx b/src/main/webapp/WEB-INF/views/lsthinglabels/update.jspx
deleted file mode 100755
index 124e44804..000000000
--- a/src/main/webapp/WEB-INF/views/lsthinglabels/update.jspx
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_LsThingLabel" modelAttribute="lsThingLabel" path="/lsthinglabels" versionField="Version" z="vdbZrGYBPbizoG39LOooBHvGuXg=">
-        <field:textarea field="labelText" id="c_com_labsynch_labseer_domain_LsThingLabel_labelText" required="true" z="sCNy2Oxvrn/t98wZYZzXpafoKxo="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_LsThingLabel_recordedBy" required="true" z="jbYFgGOMUTLaaZE/itsLnm2qDhE="/>
-        <field:datetime dateTimePattern="${lsThingLabel_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_LsThingLabel_recordedDate" required="true" z="SxwvETX9xcR1Ej4IIguNymULDkI="/>
-        <field:datetime dateTimePattern="${lsThingLabel_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_LsThingLabel_modifiedDate" z="kCAbzLWPlC2V4Skr4W1AHHJ6/vc="/>
-        <field:checkbox field="physicallyLabled" id="c_com_labsynch_labseer_domain_LsThingLabel_physicallyLabled" z="1Voz/3/Pt2FMIhjv9RuPxTMRosc="/>
-        <field:textarea field="imageFile" id="c_com_labsynch_labseer_domain_LsThingLabel_imageFile" z="WIaCPiniaFGnpQ/BS+6h6leWFO0="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_LsThingLabel_lsType" required="true" z="xtadEGgUTN0mjcdHDSc2hs6p8wU="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_LsThingLabel_lsKind" required="true" z="6u0rYh5xBoZ72NFjTstzvxdg2Uc="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_LsThingLabel_lsTypeAndKind" z="H1pr3VmN6MzovR1d66CMrb5Es9g="/>
-        <field:checkbox field="preferred" id="c_com_labsynch_labseer_domain_LsThingLabel_preferred" z="ZOzH5it+L1vnuqkVq82dsxk9DvQ="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_LsThingLabel_ignored" z="3+n8s89OHFpoU6BZ/iG5yvTp4Cg="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_LsThingLabel_lsTransaction" validationMessageCode="field_invalid_integer" z="urYqPF7SOktgZSh6GmrAPj2oP3U="/>
-        <field:select field="lsThing" id="c_com_labsynch_labseer_domain_LsThingLabel_lsThing" itemValue="id" items="${lsthings}" path="/lsthings" required="true" z="Dxf9PsLVhsMeWT2eE6lJG7p7Iuc="/>
-        <field:input field="lsThingTypeAndKind" id="c_com_labsynch_labseer_domain_LsThingLabel_lsThingTypeAndKind" z="sux6eKdSGI4jlKjI0WzrKjslCTI="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_LsThingLabel_deleted" z="75GZwRi/sAj6OmuusBNj5pwGYEI="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthinglabels/views.xml b/src/main/webapp/WEB-INF/views/lsthinglabels/views.xml
deleted file mode 100755
index 3aa0a969a..000000000
--- a/src/main/webapp/WEB-INF/views/lsthinglabels/views.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="lsthinglabels/list">
-        <put-attribute name="body" value="/WEB-INF/views/lsthinglabels/list.jspx"/>
-    </definition>
-<definition extends="default" name="lsthinglabels/show">
-        <put-attribute name="body" value="/WEB-INF/views/lsthinglabels/show.jspx"/>
-    </definition>
-<definition extends="default" name="lsthinglabels/create">
-        <put-attribute name="body" value="/WEB-INF/views/lsthinglabels/create.jspx"/>
-    </definition>
-<definition extends="default" name="lsthinglabels/update">
-        <put-attribute name="body" value="/WEB-INF/views/lsthinglabels/update.jspx"/>
-    </definition>
-<definition extends="default" name="lsthinglabels/findLsThingLabelsByLabelTextEqualsAndIgnoredNot">
-        <put-attribute name="body" value="/WEB-INF/views/lsthinglabels/findLsThingLabelsByLabelTextEqualsAndIgnoredNot.jspx"/>
-    </definition>
-<definition extends="default" name="lsthinglabels/findLsThingLabelsByLabelTextLike">
-        <put-attribute name="body" value="/WEB-INF/views/lsthinglabels/findLsThingLabelsByLabelTextLike.jspx"/>
-    </definition>
-<definition extends="default" name="lsthinglabels/findLsThingLabelsByLsThing">
-        <put-attribute name="body" value="/WEB-INF/views/lsthinglabels/findLsThingLabelsByLsThing.jspx"/>
-    </definition>
-<definition extends="default" name="lsthinglabels/findLsThingLabelsByLsTransactionEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lsthinglabels/findLsThingLabelsByLsTransactionEquals.jspx"/>
-    </definition>
-<definition extends="default" name="lsthinglabels/findLsThingLabelsByLabelTextEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lsthinglabels/findLsThingLabelsByLabelTextEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/lsthings/create.jspx b/src/main/webapp/WEB-INF/views/lsthings/create.jspx
deleted file mode 100755
index 599bfbb6a..000000000
--- a/src/main/webapp/WEB-INF/views/lsthings/create.jspx
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_LsThing" modelAttribute="lsThing" path="/lsthings" render="${empty dependencies}" z="pWNH8ebe5HXIg+mGv3lGdwAMkg8=">
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_LsThing_lsType" required="true" z="YNSdSfmqcm6Szq03kl+nUb42OBc="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_LsThing_lsKind" required="true" z="dCPvPtIfimiE4xxSew280U4uLcg="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_LsThing_lsTypeAndKind" z="Js1Q3lFQAjm4IMvr6oLKZ7XYUOU="/>
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_LsThing_codeName" z="Ijf8s2XwXku+hUSSAE+w/s0rauw="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_LsThing_recordedBy" required="true" z="CHYswJSaGYqYGBFtWTuqCS6jwJU="/>
-        <field:datetime dateTimePattern="${lsThing_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_LsThing_recordedDate" required="true" z="0ZwZdiBUiY0ZXfudgwcTNcswUgs="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_LsThing_modifiedBy" z="f8YavGkF5JDVA7jbndndsO82Om8="/>
-        <field:datetime dateTimePattern="${lsThing_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_LsThing_modifiedDate" z="9D2HYqLp3m3z3Y7i16twRGgbLFI="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_LsThing_ignored" z="NgUD7XF8BvTQaK3Ukf05TQn9SXE="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_LsThing_lsTransaction" validationMessageCode="field_invalid_integer" z="DH8Oe/DikCl++DXjk5RCWBZqDBs="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_LsThing_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="Wi4/9lI7UQpqqxEyJuzst06V/MI="/>
-        <field:simple field="lsStates" id="c_com_labsynch_labseer_domain_LsThing_lsStates" messageCode="entity_reference_not_managed" messageCodeAttribute="Ls Thing State" z="ehURGh+FqXqRYzykLz+8deDOqRc="/>
-        <field:simple field="lsLabels" id="c_com_labsynch_labseer_domain_LsThing_lsLabels" messageCode="entity_reference_not_managed" messageCodeAttribute="Ls Thing Label" z="12n5xnQh5N/ofjPDgywS8liGMVA="/>
-        <field:select field="lsTags" id="c_com_labsynch_labseer_domain_LsThing_lsTags" itemValue="id" items="${lstags}" multiple="true" path="/lstags" z="eztFr5sG4edc+Mim6wGOz68bpxo="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_LsThing_deleted" z="4sKan8d5186dc0o3uLFmCptKhbY="/>
-        <field:simple field="firstLsThings" id="c_com_labsynch_labseer_domain_LsThing_firstLsThings" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Ls Thing Ls Thing" z="Mr1ShR75eeGppaFIvHAdy1r7bi8="/>
-        <field:simple field="secondLsThings" id="c_com_labsynch_labseer_domain_LsThing_secondLsThings" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Ls Thing Ls Thing" z="6dATK+tAVf9wQq2OKwDioFPHWDs="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_LsThing" render="${not empty dependencies}" z="emouCZdnltGsWrcbHnVLP8bvdbo="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByCodeNameEquals.jspx b/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByCodeNameEquals.jspx
deleted file mode 100755
index 40138db50..000000000
--- a/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByCodeNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeNameEquals" id="ff_com_labsynch_labseer_domain_LsThing" path="/lsthings" z="UzdZwNxykwHPb3TLwP4WvMexKcc=">
-        <field:input disableFormBinding="true" field="codeName" id="f_com_labsynch_labseer_domain_LsThing_codeName" max="255" required="true" z="BgS6YIcuPgFzx8vwadHSilZR/PE="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByCodeNameLike.jspx b/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByCodeNameLike.jspx
deleted file mode 100644
index 32e66b575..000000000
--- a/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByCodeNameLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeNameLike" id="ff_com_labsynch_labseer_domain_LsThing" path="/lsthings" z="NanaRh9V2JvBS56R8a7aeS9sSa4=">
-        <field:input disableFormBinding="true" field="codeName" id="f_com_labsynch_labseer_domain_LsThing_codeName" max="255" required="true" z="BgS6YIcuPgFzx8vwadHSilZR/PE="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByLsKindEquals.jspx b/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByLsKindEquals.jspx
deleted file mode 100644
index 6816ef718..000000000
--- a/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByLsKindEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsKindEquals" id="ff_com_labsynch_labseer_domain_LsThing" path="/lsthings" z="55P5XylG6Zc/s7Kh1trcVEEuv64=">
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_LsThing_lsKind" max="255" required="true" z="UUwSSgTz0dOQZFN3KHA2xDOK2pU="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByLsKindLike.jspx b/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByLsKindLike.jspx
deleted file mode 100644
index 1dcec45b6..000000000
--- a/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByLsKindLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsKindLike" id="ff_com_labsynch_labseer_domain_LsThing" path="/lsthings" z="OAxC9YSjBLDT4myfD9dtgdDSHh4=">
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_LsThing_lsKind" max="255" required="true" z="UUwSSgTz0dOQZFN3KHA2xDOK2pU="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByLsTransactionEquals.jspx b/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByLsTransactionEquals.jspx
deleted file mode 100755
index 77d02b7b8..000000000
--- a/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByLsTransactionEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTransactionEquals" id="ff_com_labsynch_labseer_domain_LsThing" path="/lsthings" z="O1HDHapPbziaNPmbuz6jr3JSJe8=">
-        <field:input disableFormBinding="true" field="lsTransaction" id="f_com_labsynch_labseer_domain_LsThing_lsTransaction" required="true" validationMessageCode="field_invalid_integer" z="9TE0XMqA/vV3R7cTqTp8c+CMHiE="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByLsTypeAndKindEquals.jspx b/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByLsTypeAndKindEquals.jspx
deleted file mode 100755
index e97f500c7..000000000
--- a/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByLsTypeAndKindEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeAndKindEquals" id="ff_com_labsynch_labseer_domain_LsThing" path="/lsthings" z="zCE0otnwQZ6meWqMCqZG20R2JLs=">
-        <field:input disableFormBinding="true" field="lsTypeAndKind" id="f_com_labsynch_labseer_domain_LsThing_lsTypeAndKind" max="255" required="true" z="EH3S/V6BXqwyON1Zd369x1Giyfk="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByLsTypeEquals.jspx b/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByLsTypeEquals.jspx
deleted file mode 100644
index 1029447f7..000000000
--- a/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByLsTypeEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeEquals" id="ff_com_labsynch_labseer_domain_LsThing" path="/lsthings" z="MvG0pknTKxL1+frihsmvorchfHc=">
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_LsThing_lsType" max="255" required="true" z="ceZMvEYH0230im4Z6leTOagbTyk="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByLsTypeEqualsAndLsKindEquals.jspx b/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByLsTypeEqualsAndLsKindEquals.jspx
deleted file mode 100644
index 844a48b63..000000000
--- a/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByLsTypeEqualsAndLsKindEquals.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeEqualsAndLsKindEquals" id="ff_com_labsynch_labseer_domain_LsThing" path="/lsthings" z="PAdsM10hvYM26Fhne08aNd2Oeds=">
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_LsThing_lsType" max="255" required="true" z="ceZMvEYH0230im4Z6leTOagbTyk="/>
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_LsThing_lsKind" max="255" required="true" z="UUwSSgTz0dOQZFN3KHA2xDOK2pU="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByRecordedByLike.jspx b/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByRecordedByLike.jspx
deleted file mode 100644
index e29de485a..000000000
--- a/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByRecordedByLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByRecordedByLike" id="ff_com_labsynch_labseer_domain_LsThing" path="/lsthings" z="1t8jwwhJNiXhiLBPDuGdwIt4k3U=">
-        <field:input disableFormBinding="true" field="recordedBy" id="f_com_labsynch_labseer_domain_LsThing_recordedBy" max="255" required="true" z="X9cj+Ww2UhkMZ7nrlLD8SZJQ6M8="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByRecordedDateGreaterThan.jspx b/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByRecordedDateGreaterThan.jspx
deleted file mode 100644
index 2324edb81..000000000
--- a/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByRecordedDateGreaterThan.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByRecordedDateGreaterThan" id="ff_com_labsynch_labseer_domain_LsThing" path="/lsthings" z="uAjSoiIL9pHuxISEtQlCtztGmwk=">
-        <field:datetime dateTimePattern="${lsThing_recordeddate_date_format}" disableFormBinding="true" field="recordedDate" id="f_com_labsynch_labseer_domain_LsThing_recordedDate" required="true" z="eHoIdLF0FJDKdNrBm7ci5RJ+kyA="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByRecordedDateLessThan.jspx b/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByRecordedDateLessThan.jspx
deleted file mode 100644
index 3aeda1d24..000000000
--- a/src/main/webapp/WEB-INF/views/lsthings/findLsThingsByRecordedDateLessThan.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByRecordedDateLessThan" id="ff_com_labsynch_labseer_domain_LsThing" path="/lsthings" z="pUGkL4UtVobKlzuz/pdnQUoVDtw=">
-        <field:datetime dateTimePattern="${lsThing_recordeddate_date_format}" disableFormBinding="true" field="recordedDate" id="f_com_labsynch_labseer_domain_LsThing_recordedDate" required="true" z="eHoIdLF0FJDKdNrBm7ci5RJ+kyA="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthings/list.jspx b/src/main/webapp/WEB-INF/views/lsthings/list.jspx
deleted file mode 100755
index bb31e3ce9..000000000
--- a/src/main/webapp/WEB-INF/views/lsthings/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_LsThing" items="${lsthings}" z="s7Hzo8aFYYDBn6r5IbBGK4x+Ae0=">
-        <table:table data="${lsthings}" id="l_com_labsynch_labseer_domain_LsThing" path="/lsthings" z="QV8Mg7bPCPFMG57r2hyZUYJNso0=">
-            <table:column id="c_com_labsynch_labseer_domain_LsThing_lsType" property="lsType" z="66B3TQrQ5Nv+Z1d8/E/3Ltk8+os="/>
-            <table:column id="c_com_labsynch_labseer_domain_LsThing_lsKind" property="lsKind" z="Qb7Pqh9FiEfsK7SQdaYs5ldk7tQ="/>
-            <table:column id="c_com_labsynch_labseer_domain_LsThing_lsTypeAndKind" property="lsTypeAndKind" z="j4fQ88+asIUXbpfAWQ2psq1Rkuw="/>
-            <table:column id="c_com_labsynch_labseer_domain_LsThing_codeName" property="codeName" z="O9jCmZFucmKunPPhcXf4SvLA3NM="/>
-            <table:column id="c_com_labsynch_labseer_domain_LsThing_recordedBy" property="recordedBy" z="JYLny5O82LYx3aHXZh+fhf+mbSM="/>
-            <table:column date="true" dateTimePattern="${lsThing_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_LsThing_recordedDate" property="recordedDate" z="+8xY7XPcLuu04mdhjAk6VepUszg="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthings/show.jspx b/src/main/webapp/WEB-INF/views/lsthings/show.jspx
deleted file mode 100755
index f69ab4434..000000000
--- a/src/main/webapp/WEB-INF/views/lsthings/show.jspx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_LsThing" object="${lsthing}" path="/lsthings" z="fOOo73GPl6AtwWvVFteeEjO/I04=">
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_LsThing_lsType" object="${lsthing}" z="IgRmyO2utEb4wtk/H/D9+cyO+3o="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_LsThing_lsKind" object="${lsthing}" z="V5xexGCF4flslKJW52q3I3aml+M="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_LsThing_lsTypeAndKind" object="${lsthing}" z="nRxwNOBTLj4JEGdi7QlI8h1wMmU="/>
-        <field:display field="codeName" id="s_com_labsynch_labseer_domain_LsThing_codeName" object="${lsthing}" z="K1ClFtZ7QSfYz06dE7jEZ2509fg="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_LsThing_recordedBy" object="${lsthing}" z="njSFF8oGf3CQYqesgjrpiBngRhc="/>
-        <field:display date="true" dateTimePattern="${lsThing_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_LsThing_recordedDate" object="${lsthing}" z="ZO3x27FoSxMl+vgS3xV18wNeQ1Q="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_LsThing_modifiedBy" object="${lsthing}" z="bQAeC86SI8tjS2khtZFwvxt++tA="/>
-        <field:display date="true" dateTimePattern="${lsThing_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_LsThing_modifiedDate" object="${lsthing}" z="PaTLyktPYCj464Cvs2ZLUj9wPe0="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_LsThing_ignored" object="${lsthing}" z="urFNF2tGmw/0j99uxETtlZJuYJo="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_LsThing_lsTransaction" object="${lsthing}" z="NlQL9XnCSzcJYMMC3r9JnerQswo="/>
-        <field:display field="lsTags" id="s_com_labsynch_labseer_domain_LsThing_lsTags" object="${lsthing}" z="nVOJfjwMzcHl7uj7Obtyjw7mtpU="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_LsThing_deleted" object="${lsthing}" z="5UAGPOMMNEVGkouWXstNus91Nxk="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthings/update.jspx b/src/main/webapp/WEB-INF/views/lsthings/update.jspx
deleted file mode 100755
index 48011ac9b..000000000
--- a/src/main/webapp/WEB-INF/views/lsthings/update.jspx
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_LsThing" modelAttribute="lsThing" path="/lsthings" versionField="Version" z="t59RoTcmDy57ecHrk9++t5aRfnQ=">
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_LsThing_lsType" required="true" z="YNSdSfmqcm6Szq03kl+nUb42OBc="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_LsThing_lsKind" required="true" z="dCPvPtIfimiE4xxSew280U4uLcg="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_LsThing_lsTypeAndKind" z="Js1Q3lFQAjm4IMvr6oLKZ7XYUOU="/>
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_LsThing_codeName" z="Ijf8s2XwXku+hUSSAE+w/s0rauw="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_LsThing_recordedBy" required="true" z="CHYswJSaGYqYGBFtWTuqCS6jwJU="/>
-        <field:datetime dateTimePattern="${lsThing_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_LsThing_recordedDate" required="true" z="0ZwZdiBUiY0ZXfudgwcTNcswUgs="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_LsThing_modifiedBy" z="f8YavGkF5JDVA7jbndndsO82Om8="/>
-        <field:datetime dateTimePattern="${lsThing_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_LsThing_modifiedDate" z="9D2HYqLp3m3z3Y7i16twRGgbLFI="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_LsThing_ignored" z="NgUD7XF8BvTQaK3Ukf05TQn9SXE="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_LsThing_lsTransaction" validationMessageCode="field_invalid_integer" z="DH8Oe/DikCl++DXjk5RCWBZqDBs="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_LsThing_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="Wi4/9lI7UQpqqxEyJuzst06V/MI="/>
-        <field:simple field="lsStates" id="c_com_labsynch_labseer_domain_LsThing_lsStates" messageCode="entity_reference_not_managed" messageCodeAttribute="Ls Thing State" z="ehURGh+FqXqRYzykLz+8deDOqRc="/>
-        <field:simple field="lsLabels" id="c_com_labsynch_labseer_domain_LsThing_lsLabels" messageCode="entity_reference_not_managed" messageCodeAttribute="Ls Thing Label" z="12n5xnQh5N/ofjPDgywS8liGMVA="/>
-        <field:select field="lsTags" id="c_com_labsynch_labseer_domain_LsThing_lsTags" itemValue="id" items="${lstags}" multiple="true" path="/lstags" z="eztFr5sG4edc+Mim6wGOz68bpxo="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_LsThing_deleted" z="4sKan8d5186dc0o3uLFmCptKhbY="/>
-        <field:simple field="firstLsThings" id="c_com_labsynch_labseer_domain_LsThing_firstLsThings" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Ls Thing Ls Thing" z="Mr1ShR75eeGppaFIvHAdy1r7bi8="/>
-        <field:simple field="secondLsThings" id="c_com_labsynch_labseer_domain_LsThing_secondLsThings" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Ls Thing Ls Thing" z="6dATK+tAVf9wQq2OKwDioFPHWDs="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthings/views.xml b/src/main/webapp/WEB-INF/views/lsthings/views.xml
deleted file mode 100755
index 7520fccc2..000000000
--- a/src/main/webapp/WEB-INF/views/lsthings/views.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="lsthings/list">
-        <put-attribute name="body" value="/WEB-INF/views/lsthings/list.jspx"/>
-    </definition>
-<definition extends="default" name="lsthings/show">
-        <put-attribute name="body" value="/WEB-INF/views/lsthings/show.jspx"/>
-    </definition>
-<definition extends="default" name="lsthings/create">
-        <put-attribute name="body" value="/WEB-INF/views/lsthings/create.jspx"/>
-    </definition>
-<definition extends="default" name="lsthings/update">
-        <put-attribute name="body" value="/WEB-INF/views/lsthings/update.jspx"/>
-    </definition>
-<definition extends="default" name="lsthings/findLsThingsByCodeNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lsthings/findLsThingsByCodeNameEquals.jspx"/>
-    </definition>
-<definition extends="default" name="lsthings/findLsThingsByLsTransactionEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lsthings/findLsThingsByLsTransactionEquals.jspx"/>
-    </definition>
-<definition extends="default" name="lsthings/findLsThingsByLsTypeAndKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lsthings/findLsThingsByLsTypeAndKindEquals.jspx"/>
-    </definition>
-<definition extends="default" name="lsthings/findLsThingsByCodeNameLike">
-        <put-attribute name="body" value="/WEB-INF/views/lsthings/findLsThingsByCodeNameLike.jspx"/>
-    </definition>
-<definition extends="default" name="lsthings/findLsThingsByLsKindLike">
-        <put-attribute name="body" value="/WEB-INF/views/lsthings/findLsThingsByLsKindLike.jspx"/>
-    </definition>
-<definition extends="default" name="lsthings/findLsThingsByRecordedByLike">
-        <put-attribute name="body" value="/WEB-INF/views/lsthings/findLsThingsByRecordedByLike.jspx"/>
-    </definition>
-<definition extends="default" name="lsthings/findLsThingsByLsTypeEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lsthings/findLsThingsByLsTypeEquals.jspx"/>
-    </definition>
-<definition extends="default" name="lsthings/findLsThingsByRecordedDateGreaterThan">
-        <put-attribute name="body" value="/WEB-INF/views/lsthings/findLsThingsByRecordedDateGreaterThan.jspx"/>
-    </definition>
-<definition extends="default" name="lsthings/findLsThingsByRecordedDateLessThan">
-        <put-attribute name="body" value="/WEB-INF/views/lsthings/findLsThingsByRecordedDateLessThan.jspx"/>
-    </definition>
-<definition extends="default" name="lsthings/findLsThingsByLsKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lsthings/findLsThingsByLsKindEquals.jspx"/>
-    </definition>
-<definition extends="default" name="lsthings/findLsThingsByLsTypeEqualsAndLsKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lsthings/findLsThingsByLsTypeEqualsAndLsKindEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/lsthingstates/create.jspx b/src/main/webapp/WEB-INF/views/lsthingstates/create.jspx
deleted file mode 100755
index 7cc1c0446..000000000
--- a/src/main/webapp/WEB-INF/views/lsthingstates/create.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_LsThingState" modelAttribute="lsThingState" path="/lsthingstates" render="${empty dependencies}" z="HuDCpsDC8xcF607Iz6xi2Pv/NZ0=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_LsThingState_recordedBy" required="true" z="Gw8LH3mC7mbT1DZMCg+6lbjOu8E="/>
-        <field:datetime dateTimePattern="${lsThingState_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_LsThingState_recordedDate" required="true" z="ctyC3Dmhti6KolyKNQ3idGADzgY="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_LsThingState_modifiedBy" z="bLfIeNLPQxX/qZ2oSO10cuDVILQ="/>
-        <field:datetime dateTimePattern="${lsThingState_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_LsThingState_modifiedDate" z="laJGoUxWPJmU6tqAxECcA3PxpqM="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_LsThingState_lsType" required="true" z="Ci2dsv2QOb2TwU3W2mR7HDkilas="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_LsThingState_lsKind" required="true" z="vQUkcAi+gP7KpyBXXGv7uoWecVA="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_LsThingState_lsTypeAndKind" z="TEo+lDZVjCcXWkL6ZsflBFb7cnM="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_LsThingState_comments" z="RDfHsiBiEAAEJTgROuyLi3g/X7w="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_LsThingState_ignored" z="w59R0C/dGe+79ZJoXRzwRjW+jZ8="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_LsThingState_lsTransaction" validationMessageCode="field_invalid_integer" z="D5Dso8de+cbpZ7zfwEj3cvV7/m4="/>
-        <field:select field="lsThing" id="c_com_labsynch_labseer_domain_LsThingState_lsThing" itemValue="id" items="${lsthings}" path="/lsthings" required="true" z="ljNAsKgt9URFGGzp2f7UBZVb3n8="/>
-        <field:simple field="lsValues" id="c_com_labsynch_labseer_domain_LsThingState_lsValues" messageCode="entity_reference_not_managed" messageCodeAttribute="Ls Thing Value" z="KhJzwxSLdNhw+/q9KkHOn/jqWoY="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_LsThingState_deleted" z="UFUqA49t+abjmrqcu8F1lkaf4ic="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_LsThingState" render="${not empty dependencies}" z="nl8E8t9xoFUZfmzstwxmLUMFIo4="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthingstates/findLsThingStatesByLsThing.jspx b/src/main/webapp/WEB-INF/views/lsthingstates/findLsThingStatesByLsThing.jspx
deleted file mode 100755
index 20060565b..000000000
--- a/src/main/webapp/WEB-INF/views/lsthingstates/findLsThingStatesByLsThing.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsThing" id="ff_com_labsynch_labseer_domain_LsThingState" path="/lsthingstates" z="bRFBdg0Ss4ffBDccqXYFyTBMaF0=">
-        <field:select disableFormBinding="true" field="lsThing" id="f_com_labsynch_labseer_domain_LsThingState_lsThing" itemValue="id" items="${lsthings}" path="/lsthings" required="true" z="X6MTjPWeTEUs34SW9i9yv0Y5fm8="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthingstates/findLsThingStatesByLsTransactionEquals.jspx b/src/main/webapp/WEB-INF/views/lsthingstates/findLsThingStatesByLsTransactionEquals.jspx
deleted file mode 100755
index 2f50827cb..000000000
--- a/src/main/webapp/WEB-INF/views/lsthingstates/findLsThingStatesByLsTransactionEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTransactionEquals" id="ff_com_labsynch_labseer_domain_LsThingState" path="/lsthingstates" z="MoH30GHL/qPnQP24zrit1j85E+U=">
-        <field:input disableFormBinding="true" field="lsTransaction" id="f_com_labsynch_labseer_domain_LsThingState_lsTransaction" required="true" validationMessageCode="field_invalid_integer" z="YAbC9dKMBEmP3xImfE3A/J12K+E="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthingstates/list.jspx b/src/main/webapp/WEB-INF/views/lsthingstates/list.jspx
deleted file mode 100755
index 5761336d5..000000000
--- a/src/main/webapp/WEB-INF/views/lsthingstates/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_LsThingState" items="${lsthingstates}" z="6p/ZC7psr1ptvn3PlhV6lt6fep0=">
-        <table:table data="${lsthingstates}" id="l_com_labsynch_labseer_domain_LsThingState" path="/lsthingstates" z="FBgqoSC7xbW/uHgxnkRK7j0YZ8c=">
-            <table:column id="c_com_labsynch_labseer_domain_LsThingState_recordedBy" property="recordedBy" z="iOtPL+r6bRCEvCRQ6+HLr3ZNQ94="/>
-            <table:column date="true" dateTimePattern="${lsThingState_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_LsThingState_recordedDate" property="recordedDate" z="uYlx2wXk9BKVTT0gIGFrOK+n2W4="/>
-            <table:column id="c_com_labsynch_labseer_domain_LsThingState_modifiedBy" property="modifiedBy" z="fvj+CepXuNyLFSqgbSPyIiQMv70="/>
-            <table:column date="true" dateTimePattern="${lsThingState_modifieddate_date_format}" id="c_com_labsynch_labseer_domain_LsThingState_modifiedDate" property="modifiedDate" z="E1Qjn1GkeradeEvVlgscC2TeZOQ="/>
-            <table:column id="c_com_labsynch_labseer_domain_LsThingState_lsType" property="lsType" z="TCuJQtLiR4Uzqw/Qbf959GUloQo="/>
-            <table:column id="c_com_labsynch_labseer_domain_LsThingState_lsKind" property="lsKind" z="z/+bfpXzClRe+2DBF51z5TN7ECg="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthingstates/show.jspx b/src/main/webapp/WEB-INF/views/lsthingstates/show.jspx
deleted file mode 100755
index 54fad082e..000000000
--- a/src/main/webapp/WEB-INF/views/lsthingstates/show.jspx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_LsThingState" object="${lsthingstate}" path="/lsthingstates" z="UEkHS3GWd21bpQ/RPDLPI2SUy6M=">
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_LsThingState_recordedBy" object="${lsthingstate}" z="fapeI5coiFfCf/vIDVHj/1n1Spc="/>
-        <field:display date="true" dateTimePattern="${lsThingState_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_LsThingState_recordedDate" object="${lsthingstate}" z="F3lyWvy9I+vHZo83TzCvrbIQ2AQ="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_LsThingState_modifiedBy" object="${lsthingstate}" z="r4t6FqD/Kcjp8vKihNyWQB4Fm0Q="/>
-        <field:display date="true" dateTimePattern="${lsThingState_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_LsThingState_modifiedDate" object="${lsthingstate}" z="8cjQUjJOWog5S9MVpHeP9xCkD5o="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_LsThingState_lsType" object="${lsthingstate}" z="zOZzYnhtgUXBYvP6y/NfwNX6FRM="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_LsThingState_lsKind" object="${lsthingstate}" z="ct3H6AGvYP+iqTxXJuoZ+KujA4s="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_LsThingState_lsTypeAndKind" object="${lsthingstate}" z="y3ZHmrPu5X8fF5LEWdBQ0tvSgWA="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_LsThingState_comments" object="${lsthingstate}" z="xbeeRmyGsT6oosXF8V1+bG+pX3M="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_LsThingState_ignored" object="${lsthingstate}" z="8UDn3guRxfdF+m8w2kBTDXetKug="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_LsThingState_lsTransaction" object="${lsthingstate}" z="fQOh/hs4CXpLsmV4iG9ONYpvGFM="/>
-        <field:display field="lsThing" id="s_com_labsynch_labseer_domain_LsThingState_lsThing" object="${lsthingstate}" z="jWGVt/ARj10P88vS8RW5ctGzoE8="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_LsThingState_deleted" object="${lsthingstate}" z="RyrcGPbIaTCfyI4voFd+u6o279g="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthingstates/update.jspx b/src/main/webapp/WEB-INF/views/lsthingstates/update.jspx
deleted file mode 100755
index 1673b7852..000000000
--- a/src/main/webapp/WEB-INF/views/lsthingstates/update.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_LsThingState" modelAttribute="lsThingState" path="/lsthingstates" versionField="Version" z="YaHGBS7979OPo+9Ff1cCz7CPk+Q=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_LsThingState_recordedBy" required="true" z="Gw8LH3mC7mbT1DZMCg+6lbjOu8E="/>
-        <field:datetime dateTimePattern="${lsThingState_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_LsThingState_recordedDate" required="true" z="ctyC3Dmhti6KolyKNQ3idGADzgY="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_LsThingState_modifiedBy" z="bLfIeNLPQxX/qZ2oSO10cuDVILQ="/>
-        <field:datetime dateTimePattern="${lsThingState_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_LsThingState_modifiedDate" z="laJGoUxWPJmU6tqAxECcA3PxpqM="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_LsThingState_lsType" required="true" z="Ci2dsv2QOb2TwU3W2mR7HDkilas="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_LsThingState_lsKind" required="true" z="vQUkcAi+gP7KpyBXXGv7uoWecVA="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_LsThingState_lsTypeAndKind" z="TEo+lDZVjCcXWkL6ZsflBFb7cnM="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_LsThingState_comments" z="RDfHsiBiEAAEJTgROuyLi3g/X7w="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_LsThingState_ignored" z="w59R0C/dGe+79ZJoXRzwRjW+jZ8="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_LsThingState_lsTransaction" validationMessageCode="field_invalid_integer" z="D5Dso8de+cbpZ7zfwEj3cvV7/m4="/>
-        <field:select field="lsThing" id="c_com_labsynch_labseer_domain_LsThingState_lsThing" itemValue="id" items="${lsthings}" path="/lsthings" required="true" z="ljNAsKgt9URFGGzp2f7UBZVb3n8="/>
-        <field:simple field="lsValues" id="c_com_labsynch_labseer_domain_LsThingState_lsValues" messageCode="entity_reference_not_managed" messageCodeAttribute="Ls Thing Value" z="KhJzwxSLdNhw+/q9KkHOn/jqWoY="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_LsThingState_deleted" z="UFUqA49t+abjmrqcu8F1lkaf4ic="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthingstates/views.xml b/src/main/webapp/WEB-INF/views/lsthingstates/views.xml
deleted file mode 100755
index 7036dbfef..000000000
--- a/src/main/webapp/WEB-INF/views/lsthingstates/views.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="lsthingstates/list">
-        <put-attribute name="body" value="/WEB-INF/views/lsthingstates/list.jspx"/>
-    </definition>
-<definition extends="default" name="lsthingstates/show">
-        <put-attribute name="body" value="/WEB-INF/views/lsthingstates/show.jspx"/>
-    </definition>
-<definition extends="default" name="lsthingstates/create">
-        <put-attribute name="body" value="/WEB-INF/views/lsthingstates/create.jspx"/>
-    </definition>
-<definition extends="default" name="lsthingstates/update">
-        <put-attribute name="body" value="/WEB-INF/views/lsthingstates/update.jspx"/>
-    </definition>
-<definition extends="default" name="lsthingstates/findLsThingStatesByLsTransactionEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lsthingstates/findLsThingStatesByLsTransactionEquals.jspx"/>
-    </definition>
-<definition extends="default" name="lsthingstates/findLsThingStatesByLsThing">
-        <put-attribute name="body" value="/WEB-INF/views/lsthingstates/findLsThingStatesByLsThing.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/lsthingvalues/create.jspx b/src/main/webapp/WEB-INF/views/lsthingvalues/create.jspx
deleted file mode 100755
index 652ea49bc..000000000
--- a/src/main/webapp/WEB-INF/views/lsthingvalues/create.jspx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_LsThingValue" modelAttribute="lsThingValue" path="/lsthingvalues" render="${empty dependencies}" z="n9izk3mIgrR/QEpnAiYn20s7GQI=">
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_LsThingValue_lsType" required="true" z="MUn8dbVoEjr+vNSyE9Hm5oE9E38="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_LsThingValue_lsKind" required="true" z="rTSnhdMhIt3KN7MsK3/tBEgTXXw="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_LsThingValue_lsTypeAndKind" z="ri41UhF5m3toWTR+APcafPljzn4="/>
-        <field:textarea field="stringValue" id="c_com_labsynch_labseer_domain_LsThingValue_stringValue" z="p07BFGbouPgSIhMnNifu5c86xBU="/>
-        <field:textarea field="codeValue" id="c_com_labsynch_labseer_domain_LsThingValue_codeValue" z="0xka5DPtXF5ieIITtRzZ/bz1xnk="/>
-        <field:textarea field="fileValue" id="c_com_labsynch_labseer_domain_LsThingValue_fileValue" z="VpNajBX4h5tgbIpJJIS3dryu1o8="/>
-        <field:textarea field="urlValue" id="c_com_labsynch_labseer_domain_LsThingValue_urlValue" z="HhzwdGrgbjg48oeGg8pL269DH7o="/>
-        <field:datetime dateTimePattern="${lsThingValue_datevalue_date_format}" field="dateValue" id="c_com_labsynch_labseer_domain_LsThingValue_dateValue" z="bjSqxXdoCfQtA8/P4Doi+OIaU9o="/>
-        <field:input field="clobValue" id="c_com_labsynch_labseer_domain_LsThingValue_clobValue" z="IPfDyQzjEtyKbGmr1B23nXxjA+Q="/>
-        <field:input field="blobValue" id="c_com_labsynch_labseer_domain_LsThingValue_blobValue" z="Fz/zUl13KO5D0b5LMgiWzS3X+Uo="/>
-        <field:input field="operatorType" id="c_com_labsynch_labseer_domain_LsThingValue_operatorType" max="25" z="RiLzE6xK5l0lWAD4CNNasZ/VDJk="/>
-        <field:input field="operatorKind" id="c_com_labsynch_labseer_domain_LsThingValue_operatorKind" max="10" z="vrkR35rEdfwTeC9gXigqTYuHvVc="/>
-        <field:textarea field="operatorTypeAndKind" id="c_com_labsynch_labseer_domain_LsThingValue_operatorTypeAndKind" z="J0IfnBw0ovAqhAusQnMUFcKvosE="/>
-        <field:input field="numericValue" id="c_com_labsynch_labseer_domain_LsThingValue_numericValue" validationMessageCode="field_invalid_number" z="rS+DTjinRmPs6uUztd5TyvJyO0I="/>
-        <field:input field="sigFigs" id="c_com_labsynch_labseer_domain_LsThingValue_sigFigs" validationMessageCode="field_invalid_integer" z="XgzXORwFCVLbTW5jIgJJBwpU+AQ="/>
-        <field:input field="numberOfReplicates" id="c_com_labsynch_labseer_domain_LsThingValue_numberOfReplicates" validationMessageCode="field_invalid_integer" z="A0ef0hbrk8LxnVd0kvPUXPwEC4E="/>
-        <field:textarea field="uncertaintyType" id="c_com_labsynch_labseer_domain_LsThingValue_uncertaintyType" z="S0lhgHVq1+Vc1DiM1yOXV2K01sM="/>
-        <field:input field="unitType" id="c_com_labsynch_labseer_domain_LsThingValue_unitType" max="25" z="5z0SrZAa6jCntrOKUTn0beVhth4="/>
-        <field:input field="unitKind" id="c_com_labsynch_labseer_domain_LsThingValue_unitKind" max="25" z="XZ39O6BBuevS4oB8KqSDlloBmlQ="/>
-        <field:textarea field="unitTypeAndKind" id="c_com_labsynch_labseer_domain_LsThingValue_unitTypeAndKind" z="5BB5pnKsxe8C5qh9+bIFqXbIIPw="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_LsThingValue_comments" z="T6j9AkKtDMYFnkSjYeH0BJ9DqAk="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_LsThingValue_ignored" z="EKKAURJraCf1KkNtXJC4d1KD+SY="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_LsThingValue_lsTransaction" validationMessageCode="field_invalid_integer" z="LnXuEfm0YwXBbkK0Mlvf+kdeRjQ="/>
-        <field:datetime dateTimePattern="${lsThingValue_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_LsThingValue_recordedDate" required="true" z="UYWfwBXZLfArFBnVz2HVUjNPVn8="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_LsThingValue_recordedBy" required="true" z="/g5dMa0/FBg6z8q+8oB8w5Cjnxc="/>
-        <field:datetime dateTimePattern="${lsThingValue_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_LsThingValue_modifiedDate" z="WsylVte1wwHOLKiYAJW005CoB/A="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_LsThingValue_modifiedBy" z="AMC6Sr5z2WnPN7XIBKA0H4pJST8="/>
-        <field:checkbox field="publicData" id="c_com_labsynch_labseer_domain_LsThingValue_publicData" z="LrzH0UhtBof4+LA3u+dT0UMDWF0="/>
-        <field:select field="lsState" id="c_com_labsynch_labseer_domain_LsThingValue_lsState" itemValue="id" items="${lsthingstates}" path="/lsthingstates" required="true" z="flrHYfm2Ouu+SXcrloQgaJxLT64="/>
-        <field:textarea field="codeType" id="c_com_labsynch_labseer_domain_LsThingValue_codeType" z="nhUhFKV24mv4Ks0umV4GGpLCa5w="/>
-        <field:textarea field="codeKind" id="c_com_labsynch_labseer_domain_LsThingValue_codeKind" z="Z1+YEqCTOU5cjTc1J5QHiAqEkuY="/>
-        <field:textarea field="codeTypeAndKind" id="c_com_labsynch_labseer_domain_LsThingValue_codeTypeAndKind" z="64yDBrEf9AnzRAK0BIDQiP8YSkw="/>
-        <field:input field="uncertainty" id="c_com_labsynch_labseer_domain_LsThingValue_uncertainty" validationMessageCode="field_invalid_number" z="lEN56U1k4rMbfgPhe5Qkdg8BH0I="/>
-        <field:textarea field="codeOrigin" id="c_com_labsynch_labseer_domain_LsThingValue_codeOrigin" z="RZ1oQDIViL60GSjYSXWaTGJ8YXA="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_LsThingValue_deleted" z="YXijKzOUoJfyfuflGMRmKNyNOaM="/>
-        <field:input field="concentration" id="c_com_labsynch_labseer_domain_LsThingValue_concentration" validationMessageCode="field_invalid_number" z="TaYCkR/8IbJhOV0o/BCaBoEzJI4="/>
-        <field:input field="concUnit" id="c_com_labsynch_labseer_domain_LsThingValue_concUnit" max="25" z="fdwd4T/1xymdod/Z0nHrfg+RjYI="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_LsThingValue" render="${not empty dependencies}" z="MObDxUKDpRTMdIPH4rh4TpxPfv0="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByCodeValueEquals.jspx b/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByCodeValueEquals.jspx
deleted file mode 100755
index 55722e8ff..000000000
--- a/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByCodeValueEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeValueEquals" id="ff_com_labsynch_labseer_domain_LsThingValue" path="/lsthingvalues" z="req2SzAKSN/09nlfMQG/G2iE2rM=">
-        <field:input disableFormBinding="true" field="codeValue" id="f_com_labsynch_labseer_domain_LsThingValue_codeValue" max="255" required="true" z="M1PgByN/Lmhv2RyO963D2HKS9Ys="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByIgnoredNotAndCodeValueEquals.jspx b/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByIgnoredNotAndCodeValueEquals.jspx
deleted file mode 100755
index 89de364f0..000000000
--- a/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByIgnoredNotAndCodeValueEquals.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByIgnoredNotAndCodeValueEquals" id="ff_com_labsynch_labseer_domain_LsThingValue" path="/lsthingvalues" z="ETataa6b5Oj8XWYy1uiB8CQrLB0=">
-        <field:checkbox disableFormBinding="true" field="ignored" id="f_com_labsynch_labseer_domain_LsThingValue_ignored" z="Fp7apWlT/lw7zFmnDunKtgx/dQs="/>
-        <field:input disableFormBinding="true" field="codeValue" id="f_com_labsynch_labseer_domain_LsThingValue_codeValue" max="255" required="true" z="M1PgByN/Lmhv2RyO963D2HKS9Ys="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndCodeValueLike.jspx b/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndCodeValueLike.jspx
deleted file mode 100644
index 830e383d9..000000000
--- a/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndCodeValueLike.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsKindEqualsAndCodeValueLike" id="ff_com_labsynch_labseer_domain_LsThingValue" path="/lsthingvalues" z="7sf8WRdinIwCuiaO0EFGyU561sg=">
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_LsThingValue_lsKind" max="255" required="true" z="B4DM1eNLzDzK3lvRqycWBRieoHY="/>
-        <field:input disableFormBinding="true" field="codeValue" id="f_com_labsynch_labseer_domain_LsThingValue_codeValue" max="255" required="true" z="M1PgByN/Lmhv2RyO963D2HKS9Ys="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndDateValueGreaterThanEquals.jspx b/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndDateValueGreaterThanEquals.jspx
deleted file mode 100644
index 16b7de66a..000000000
--- a/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndDateValueGreaterThanEquals.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsKindEqualsAndDateValueGreaterThanEquals" id="ff_com_labsynch_labseer_domain_LsThingValue" path="/lsthingvalues" z="D3MYyixJLidbEe9onEuyTfQ7VqE=">
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_LsThingValue_lsKind" max="255" required="true" z="B4DM1eNLzDzK3lvRqycWBRieoHY="/>
-        <field:datetime dateTimePattern="${lsThingValue_datevalue_date_format}" disableFormBinding="true" field="dateValue" id="f_com_labsynch_labseer_domain_LsThingValue_dateValue" required="true" z="CXjgEelksMuNTFDZYGfIMa/rRiM="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndDateValueLessThanEquals.jspx b/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndDateValueLessThanEquals.jspx
deleted file mode 100644
index 991ed6b36..000000000
--- a/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndDateValueLessThanEquals.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsKindEqualsAndDateValueLessThanEquals" id="ff_com_labsynch_labseer_domain_LsThingValue" path="/lsthingvalues" z="wMt70A8TWwmk7oz1qsU7a5hfNs8=">
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_LsThingValue_lsKind" max="255" required="true" z="B4DM1eNLzDzK3lvRqycWBRieoHY="/>
-        <field:datetime dateTimePattern="${lsThingValue_datevalue_date_format}" disableFormBinding="true" field="dateValue" id="f_com_labsynch_labseer_domain_LsThingValue_dateValue" required="true" z="CXjgEelksMuNTFDZYGfIMa/rRiM="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndDateValueLike.jspx b/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndDateValueLike.jspx
deleted file mode 100644
index a48ad3d60..000000000
--- a/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndDateValueLike.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsKindEqualsAndDateValueLike" id="ff_com_labsynch_labseer_domain_LsThingValue" path="/lsthingvalues" z="m48CEuG8bNC4OsgOotyZ/zTqeJ0=">
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_LsThingValue_lsKind" max="255" required="true" z="B4DM1eNLzDzK3lvRqycWBRieoHY="/>
-        <field:datetime dateTimePattern="${lsThingValue_datevalue_date_format}" disableFormBinding="true" field="dateValue" id="f_com_labsynch_labseer_domain_LsThingValue_dateValue" required="true" z="CXjgEelksMuNTFDZYGfIMa/rRiM="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndNumericValueEquals.jspx b/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndNumericValueEquals.jspx
deleted file mode 100644
index a5ee5f308..000000000
--- a/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndNumericValueEquals.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsKindEqualsAndNumericValueEquals" id="ff_com_labsynch_labseer_domain_LsThingValue" path="/lsthingvalues" z="4z/W45LK3o2Pu7lCUjYYaSPqODs=">
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_LsThingValue_lsKind" max="255" required="true" z="B4DM1eNLzDzK3lvRqycWBRieoHY="/>
-        <field:input disableFormBinding="true" field="numericValue" id="f_com_labsynch_labseer_domain_LsThingValue_numericValue" required="true" validationMessageCode="field_invalid_number" z="feFD+tbL6crNCVcNkrfruXxwjKY="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndNumericValueGreaterThanEquals.jspx b/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndNumericValueGreaterThanEquals.jspx
deleted file mode 100644
index 1f61cf906..000000000
--- a/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndNumericValueGreaterThanEquals.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsKindEqualsAndNumericValueGreaterThanEquals" id="ff_com_labsynch_labseer_domain_LsThingValue" path="/lsthingvalues" z="OcLrDauWxQwyt5qPtqWqezBuozQ=">
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_LsThingValue_lsKind" max="255" required="true" z="B4DM1eNLzDzK3lvRqycWBRieoHY="/>
-        <field:input disableFormBinding="true" field="numericValue" id="f_com_labsynch_labseer_domain_LsThingValue_numericValue" required="true" validationMessageCode="field_invalid_number" z="feFD+tbL6crNCVcNkrfruXxwjKY="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndNumericValueLessThanEquals.jspx b/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndNumericValueLessThanEquals.jspx
deleted file mode 100644
index d3714db4b..000000000
--- a/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndNumericValueLessThanEquals.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsKindEqualsAndNumericValueLessThanEquals" id="ff_com_labsynch_labseer_domain_LsThingValue" path="/lsthingvalues" z="mp8Gw49YtnMrLnGtWkZ9ZGgEqE8=">
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_LsThingValue_lsKind" max="255" required="true" z="B4DM1eNLzDzK3lvRqycWBRieoHY="/>
-        <field:input disableFormBinding="true" field="numericValue" id="f_com_labsynch_labseer_domain_LsThingValue_numericValue" required="true" validationMessageCode="field_invalid_number" z="feFD+tbL6crNCVcNkrfruXxwjKY="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndStringValueEquals.jspx b/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndStringValueEquals.jspx
deleted file mode 100644
index 7265e7b5e..000000000
--- a/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndStringValueEquals.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsKindEqualsAndStringValueEquals" id="ff_com_labsynch_labseer_domain_LsThingValue" path="/lsthingvalues" z="xOg9VqQ/7iRaz0bs4bBimZUButc=">
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_LsThingValue_lsKind" max="255" required="true" z="B4DM1eNLzDzK3lvRqycWBRieoHY="/>
-        <field:input disableFormBinding="true" field="stringValue" id="f_com_labsynch_labseer_domain_LsThingValue_stringValue" max="255" required="true" z="C1IugWPMh1jHCCED/uPG3B/X9fM="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndStringValueLike.jspx b/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndStringValueLike.jspx
deleted file mode 100644
index 7b830c5d6..000000000
--- a/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndStringValueLike.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsKindEqualsAndStringValueLike" id="ff_com_labsynch_labseer_domain_LsThingValue" path="/lsthingvalues" z="PKNIZ6Sp3j7iRN27oVaZouqJNbo=">
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_LsThingValue_lsKind" max="255" required="true" z="B4DM1eNLzDzK3lvRqycWBRieoHY="/>
-        <field:input disableFormBinding="true" field="stringValue" id="f_com_labsynch_labseer_domain_LsThingValue_stringValue" max="255" required="true" z="C1IugWPMh1jHCCED/uPG3B/X9fM="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsState.jspx b/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsState.jspx
deleted file mode 100755
index ee2e91d87..000000000
--- a/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsState.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsState" id="ff_com_labsynch_labseer_domain_LsThingValue" path="/lsthingvalues" z="0eWq8jHlcf8dmy8qoYaReiqrEnU=">
-        <field:select disableFormBinding="true" field="lsState" id="f_com_labsynch_labseer_domain_LsThingValue_lsState" itemValue="id" items="${lsthingstates}" path="/lsthingstates" required="true" z="nz9eEWyEfoI/XTPZnZ1e6IrcHV8="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsTransactionEquals.jspx b/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsTransactionEquals.jspx
deleted file mode 100755
index f96b9e993..000000000
--- a/src/main/webapp/WEB-INF/views/lsthingvalues/findLsThingValuesByLsTransactionEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTransactionEquals" id="ff_com_labsynch_labseer_domain_LsThingValue" path="/lsthingvalues" z="pK4ML9yAFvx8Z7Y5/YIOwxBhJOk=">
-        <field:input disableFormBinding="true" field="lsTransaction" id="f_com_labsynch_labseer_domain_LsThingValue_lsTransaction" required="true" validationMessageCode="field_invalid_integer" z="PaDBN6rZAYaI/XCKuO6a12BQQmI="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthingvalues/list.jspx b/src/main/webapp/WEB-INF/views/lsthingvalues/list.jspx
deleted file mode 100755
index 2da81d7d9..000000000
--- a/src/main/webapp/WEB-INF/views/lsthingvalues/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_LsThingValue" items="${lsthingvalues}" z="L9PEZ1MCx3gpLrZUnqTd80EwejY=">
-        <table:table data="${lsthingvalues}" id="l_com_labsynch_labseer_domain_LsThingValue" path="/lsthingvalues" z="SSMI3B1i5Zd/2OO5iFdUauKL51Q=">
-            <table:column id="c_com_labsynch_labseer_domain_LsThingValue_lsType" property="lsType" z="wklR1Dspd1egHEhMAT+yx/ApQ/A="/>
-            <table:column id="c_com_labsynch_labseer_domain_LsThingValue_lsKind" property="lsKind" z="wERTeHRZ6TFyo2DYip5kbzz1JQw="/>
-            <table:column id="c_com_labsynch_labseer_domain_LsThingValue_lsTypeAndKind" property="lsTypeAndKind" z="v3fjpr9HVBAsCtPTdVIOc+xH4Uw="/>
-            <table:column id="c_com_labsynch_labseer_domain_LsThingValue_ignored" property="ignored" z="4EoI9A8xqgrmaVEP1LYpnOE1Gj0="/>
-            <table:column id="c_com_labsynch_labseer_domain_LsThingValue_publicData" property="publicData" z="JZ2+zQ2d069Su0/96cg9G4LZaYM="/>
-            <table:column id="c_com_labsynch_labseer_domain_LsThingValue_deleted" property="deleted" z="GZi0Cs4c0QmpSA8lNGyikx2KRu0="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthingvalues/show.jspx b/src/main/webapp/WEB-INF/views/lsthingvalues/show.jspx
deleted file mode 100755
index a1872718d..000000000
--- a/src/main/webapp/WEB-INF/views/lsthingvalues/show.jspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_LsThingValue" object="${lsthingvalue}" path="/lsthingvalues" z="kDda0kYIHmidGvmFXWPMkx3U2V0=">
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_LsThingValue_lsType" object="${lsthingvalue}" z="ObQJHglQKxb59yMkvx4ipBsuDVk="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_LsThingValue_lsKind" object="${lsthingvalue}" z="veeev2HT1NxOcmwI8zpJS8YQScQ="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_LsThingValue_lsTypeAndKind" object="${lsthingvalue}" z="8i4AgXg1j+4Y1IIUe6ZXey+RuU0="/>
-        <field:display field="stringValue" id="s_com_labsynch_labseer_domain_LsThingValue_stringValue" object="${lsthingvalue}" z="fEoOyWwxF15+j/CbODVnqW93ujI="/>
-        <field:display field="codeValue" id="s_com_labsynch_labseer_domain_LsThingValue_codeValue" object="${lsthingvalue}" z="CutopnMF4hZMK8BmMgqSv02ai/Q="/>
-        <field:display field="fileValue" id="s_com_labsynch_labseer_domain_LsThingValue_fileValue" object="${lsthingvalue}" z="I7uIVOCWYUhhtXbsXzEpmR2cwoM="/>
-        <field:display field="urlValue" id="s_com_labsynch_labseer_domain_LsThingValue_urlValue" object="${lsthingvalue}" z="CTzKXcVus6/+XjD4Y2rNCpfMSkA="/>
-        <field:display date="true" dateTimePattern="${lsThingValue_datevalue_date_format}" field="dateValue" id="s_com_labsynch_labseer_domain_LsThingValue_dateValue" object="${lsthingvalue}" z="9P5LZLRdodz28drV60hZp9uyR58="/>
-        <field:display field="clobValue" id="s_com_labsynch_labseer_domain_LsThingValue_clobValue" object="${lsthingvalue}" z="V8NR0MF4AzRQGAR0Sc/8HvdgYsc="/>
-        <field:display field="blobValue" id="s_com_labsynch_labseer_domain_LsThingValue_blobValue" object="${lsthingvalue}" z="mEAuKEWC3X/Y/pe9xg/W6PWzYUU="/>
-        <field:display field="operatorType" id="s_com_labsynch_labseer_domain_LsThingValue_operatorType" object="${lsthingvalue}" z="FT/AVvvkZaQghvgUCrM6khqyuqA="/>
-        <field:display field="operatorKind" id="s_com_labsynch_labseer_domain_LsThingValue_operatorKind" object="${lsthingvalue}" z="odt2wRKSx6xXH+MbS0va3wpm5gI="/>
-        <field:display field="operatorTypeAndKind" id="s_com_labsynch_labseer_domain_LsThingValue_operatorTypeAndKind" object="${lsthingvalue}" z="tSZci28LO2WWM4L4e6jqn4sWIlM="/>
-        <field:display field="numericValue" id="s_com_labsynch_labseer_domain_LsThingValue_numericValue" object="${lsthingvalue}" z="P0gyO2JvuRyh+aKL9j44pTR/o7k="/>
-        <field:display field="sigFigs" id="s_com_labsynch_labseer_domain_LsThingValue_sigFigs" object="${lsthingvalue}" z="sdNcOxkhmRi44cvXoxbF6twmToc="/>
-        <field:display field="numberOfReplicates" id="s_com_labsynch_labseer_domain_LsThingValue_numberOfReplicates" object="${lsthingvalue}" z="eL0mMmPiKso/SABTnGhsMc3/5t0="/>
-        <field:display field="uncertaintyType" id="s_com_labsynch_labseer_domain_LsThingValue_uncertaintyType" object="${lsthingvalue}" z="LVJ8XUruNab8dHsDwsoG6NuC4SU="/>
-        <field:display field="unitType" id="s_com_labsynch_labseer_domain_LsThingValue_unitType" object="${lsthingvalue}" z="JxwrSP5Dwv/11Qwq8VfnWrXtSD4="/>
-        <field:display field="unitKind" id="s_com_labsynch_labseer_domain_LsThingValue_unitKind" object="${lsthingvalue}" z="nwvCTdENzrLB4wrPERZR2hyljBk="/>
-        <field:display field="unitTypeAndKind" id="s_com_labsynch_labseer_domain_LsThingValue_unitTypeAndKind" object="${lsthingvalue}" z="MMdMo+G7bxP598QDFDirCzMYVLc="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_LsThingValue_comments" object="${lsthingvalue}" z="cCMaCeU1kRHUWHUijN37iz/nReg="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_LsThingValue_ignored" object="${lsthingvalue}" z="uKQKXK9cIT0SEOIH/VSybJ3BwfQ="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_LsThingValue_lsTransaction" object="${lsthingvalue}" z="boiAygLj+Ehfj26fJXm5zu7WpzA="/>
-        <field:display date="true" dateTimePattern="${lsThingValue_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_LsThingValue_recordedDate" object="${lsthingvalue}" z="QHtQnyJJ85RhHbhtwiTJt1Hlqz8="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_LsThingValue_recordedBy" object="${lsthingvalue}" z="5ExX2XUoYFzaRIXRdXii4sA3d2Q="/>
-        <field:display date="true" dateTimePattern="${lsThingValue_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_LsThingValue_modifiedDate" object="${lsthingvalue}" z="QVn9RPAfRZ4/f+I7R6pgpB+4CF8="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_LsThingValue_modifiedBy" object="${lsthingvalue}" z="5wMZi58JftprI/gWq+AOrU3yhsM="/>
-        <field:display field="publicData" id="s_com_labsynch_labseer_domain_LsThingValue_publicData" object="${lsthingvalue}" z="0ixip5pIHjVKRdZD4GdaidkVxvU="/>
-        <field:display field="lsState" id="s_com_labsynch_labseer_domain_LsThingValue_lsState" object="${lsthingvalue}" z="4bX/xPGG1rXOvDQgR3oPjkrEApM="/>
-        <field:display field="codeType" id="s_com_labsynch_labseer_domain_LsThingValue_codeType" object="${lsthingvalue}" z="5ShaMg58O1eib6ijoHm96UwnMTQ="/>
-        <field:display field="codeKind" id="s_com_labsynch_labseer_domain_LsThingValue_codeKind" object="${lsthingvalue}" z="MS7zxrAapnIa66+FzAXBWYayOH0="/>
-        <field:display field="codeTypeAndKind" id="s_com_labsynch_labseer_domain_LsThingValue_codeTypeAndKind" object="${lsthingvalue}" z="VNxveSIcmw+3x6CT0yuSag9zGiw="/>
-        <field:display field="uncertainty" id="s_com_labsynch_labseer_domain_LsThingValue_uncertainty" object="${lsthingvalue}" z="oJFagxmkuPAJpPRMegMp1p+g5qk="/>
-        <field:display field="codeOrigin" id="s_com_labsynch_labseer_domain_LsThingValue_codeOrigin" object="${lsthingvalue}" z="FeNSVkPk23NBm3Qy7v+nlIyI1BE="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_LsThingValue_deleted" object="${lsthingvalue}" z="qkDCrKcpesrFevkFOlOgDrMvUNM="/>
-        <field:display field="concentration" id="s_com_labsynch_labseer_domain_LsThingValue_concentration" object="${lsthingvalue}" z="jncNd0hqEJh2lse7jJQkFHMG9bs="/>
-        <field:display field="concUnit" id="s_com_labsynch_labseer_domain_LsThingValue_concUnit" object="${lsthingvalue}" z="hz1m0NeP0G/1iMF0ByWgzvuCtH0="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthingvalues/update.jspx b/src/main/webapp/WEB-INF/views/lsthingvalues/update.jspx
deleted file mode 100755
index f48cc4b82..000000000
--- a/src/main/webapp/WEB-INF/views/lsthingvalues/update.jspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_LsThingValue" modelAttribute="lsThingValue" path="/lsthingvalues" versionField="Version" z="DGMral1IMgAR38ayH7kC70psnh8=">
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_LsThingValue_lsType" required="true" z="MUn8dbVoEjr+vNSyE9Hm5oE9E38="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_LsThingValue_lsKind" required="true" z="rTSnhdMhIt3KN7MsK3/tBEgTXXw="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_LsThingValue_lsTypeAndKind" z="ri41UhF5m3toWTR+APcafPljzn4="/>
-        <field:textarea field="stringValue" id="c_com_labsynch_labseer_domain_LsThingValue_stringValue" z="p07BFGbouPgSIhMnNifu5c86xBU="/>
-        <field:textarea field="codeValue" id="c_com_labsynch_labseer_domain_LsThingValue_codeValue" z="0xka5DPtXF5ieIITtRzZ/bz1xnk="/>
-        <field:textarea field="fileValue" id="c_com_labsynch_labseer_domain_LsThingValue_fileValue" z="VpNajBX4h5tgbIpJJIS3dryu1o8="/>
-        <field:textarea field="urlValue" id="c_com_labsynch_labseer_domain_LsThingValue_urlValue" z="HhzwdGrgbjg48oeGg8pL269DH7o="/>
-        <field:datetime dateTimePattern="${lsThingValue_datevalue_date_format}" field="dateValue" id="c_com_labsynch_labseer_domain_LsThingValue_dateValue" z="bjSqxXdoCfQtA8/P4Doi+OIaU9o="/>
-        <field:input field="clobValue" id="c_com_labsynch_labseer_domain_LsThingValue_clobValue" z="IPfDyQzjEtyKbGmr1B23nXxjA+Q="/>
-        <field:input field="blobValue" id="c_com_labsynch_labseer_domain_LsThingValue_blobValue" z="Fz/zUl13KO5D0b5LMgiWzS3X+Uo="/>
-        <field:input field="operatorType" id="c_com_labsynch_labseer_domain_LsThingValue_operatorType" max="25" z="RiLzE6xK5l0lWAD4CNNasZ/VDJk="/>
-        <field:input field="operatorKind" id="c_com_labsynch_labseer_domain_LsThingValue_operatorKind" max="10" z="vrkR35rEdfwTeC9gXigqTYuHvVc="/>
-        <field:textarea field="operatorTypeAndKind" id="c_com_labsynch_labseer_domain_LsThingValue_operatorTypeAndKind" z="J0IfnBw0ovAqhAusQnMUFcKvosE="/>
-        <field:input field="numericValue" id="c_com_labsynch_labseer_domain_LsThingValue_numericValue" validationMessageCode="field_invalid_number" z="rS+DTjinRmPs6uUztd5TyvJyO0I="/>
-        <field:input field="sigFigs" id="c_com_labsynch_labseer_domain_LsThingValue_sigFigs" validationMessageCode="field_invalid_integer" z="XgzXORwFCVLbTW5jIgJJBwpU+AQ="/>
-        <field:input field="numberOfReplicates" id="c_com_labsynch_labseer_domain_LsThingValue_numberOfReplicates" validationMessageCode="field_invalid_integer" z="A0ef0hbrk8LxnVd0kvPUXPwEC4E="/>
-        <field:textarea field="uncertaintyType" id="c_com_labsynch_labseer_domain_LsThingValue_uncertaintyType" z="S0lhgHVq1+Vc1DiM1yOXV2K01sM="/>
-        <field:input field="unitType" id="c_com_labsynch_labseer_domain_LsThingValue_unitType" max="25" z="5z0SrZAa6jCntrOKUTn0beVhth4="/>
-        <field:input field="unitKind" id="c_com_labsynch_labseer_domain_LsThingValue_unitKind" max="25" z="XZ39O6BBuevS4oB8KqSDlloBmlQ="/>
-        <field:textarea field="unitTypeAndKind" id="c_com_labsynch_labseer_domain_LsThingValue_unitTypeAndKind" z="5BB5pnKsxe8C5qh9+bIFqXbIIPw="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_LsThingValue_comments" z="T6j9AkKtDMYFnkSjYeH0BJ9DqAk="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_LsThingValue_ignored" z="EKKAURJraCf1KkNtXJC4d1KD+SY="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_LsThingValue_lsTransaction" validationMessageCode="field_invalid_integer" z="LnXuEfm0YwXBbkK0Mlvf+kdeRjQ="/>
-        <field:datetime dateTimePattern="${lsThingValue_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_LsThingValue_recordedDate" required="true" z="UYWfwBXZLfArFBnVz2HVUjNPVn8="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_LsThingValue_recordedBy" required="true" z="/g5dMa0/FBg6z8q+8oB8w5Cjnxc="/>
-        <field:datetime dateTimePattern="${lsThingValue_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_LsThingValue_modifiedDate" z="WsylVte1wwHOLKiYAJW005CoB/A="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_LsThingValue_modifiedBy" z="AMC6Sr5z2WnPN7XIBKA0H4pJST8="/>
-        <field:checkbox field="publicData" id="c_com_labsynch_labseer_domain_LsThingValue_publicData" z="LrzH0UhtBof4+LA3u+dT0UMDWF0="/>
-        <field:select field="lsState" id="c_com_labsynch_labseer_domain_LsThingValue_lsState" itemValue="id" items="${lsthingstates}" path="/lsthingstates" required="true" z="flrHYfm2Ouu+SXcrloQgaJxLT64="/>
-        <field:textarea field="codeType" id="c_com_labsynch_labseer_domain_LsThingValue_codeType" z="nhUhFKV24mv4Ks0umV4GGpLCa5w="/>
-        <field:textarea field="codeKind" id="c_com_labsynch_labseer_domain_LsThingValue_codeKind" z="Z1+YEqCTOU5cjTc1J5QHiAqEkuY="/>
-        <field:textarea field="codeTypeAndKind" id="c_com_labsynch_labseer_domain_LsThingValue_codeTypeAndKind" z="64yDBrEf9AnzRAK0BIDQiP8YSkw="/>
-        <field:input field="uncertainty" id="c_com_labsynch_labseer_domain_LsThingValue_uncertainty" validationMessageCode="field_invalid_number" z="lEN56U1k4rMbfgPhe5Qkdg8BH0I="/>
-        <field:textarea field="codeOrigin" id="c_com_labsynch_labseer_domain_LsThingValue_codeOrigin" z="RZ1oQDIViL60GSjYSXWaTGJ8YXA="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_LsThingValue_deleted" z="YXijKzOUoJfyfuflGMRmKNyNOaM="/>
-        <field:input field="concentration" id="c_com_labsynch_labseer_domain_LsThingValue_concentration" validationMessageCode="field_invalid_number" z="TaYCkR/8IbJhOV0o/BCaBoEzJI4="/>
-        <field:input field="concUnit" id="c_com_labsynch_labseer_domain_LsThingValue_concUnit" max="25" z="fdwd4T/1xymdod/Z0nHrfg+RjYI="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lsthingvalues/views.xml b/src/main/webapp/WEB-INF/views/lsthingvalues/views.xml
deleted file mode 100755
index 6450ab2b4..000000000
--- a/src/main/webapp/WEB-INF/views/lsthingvalues/views.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="lsthingvalues/list">
-        <put-attribute name="body" value="/WEB-INF/views/lsthingvalues/list.jspx"/>
-    </definition>
-<definition extends="default" name="lsthingvalues/show">
-        <put-attribute name="body" value="/WEB-INF/views/lsthingvalues/show.jspx"/>
-    </definition>
-<definition extends="default" name="lsthingvalues/create">
-        <put-attribute name="body" value="/WEB-INF/views/lsthingvalues/create.jspx"/>
-    </definition>
-<definition extends="default" name="lsthingvalues/update">
-        <put-attribute name="body" value="/WEB-INF/views/lsthingvalues/update.jspx"/>
-    </definition>
-<definition extends="default" name="lsthingvalues/findLsThingValuesByLsState">
-        <put-attribute name="body" value="/WEB-INF/views/lsthingvalues/findLsThingValuesByLsState.jspx"/>
-    </definition>
-<definition extends="default" name="lsthingvalues/findLsThingValuesByLsTransactionEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lsthingvalues/findLsThingValuesByLsTransactionEquals.jspx"/>
-    </definition>
-<definition extends="default" name="lsthingvalues/findLsThingValuesByCodeValueEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lsthingvalues/findLsThingValuesByCodeValueEquals.jspx"/>
-    </definition>
-<definition extends="default" name="lsthingvalues/findLsThingValuesByIgnoredNotAndCodeValueEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lsthingvalues/findLsThingValuesByIgnoredNotAndCodeValueEquals.jspx"/>
-    </definition>
-<definition extends="default" name="lsthingvalues/findLsThingValuesByLsKindEqualsAndCodeValueLike">
-        <put-attribute name="body" value="/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndCodeValueLike.jspx"/>
-    </definition>
-<definition extends="default" name="lsthingvalues/findLsThingValuesByLsKindEqualsAndDateValueLike">
-        <put-attribute name="body" value="/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndDateValueLike.jspx"/>
-    </definition>
-<definition extends="default" name="lsthingvalues/findLsThingValuesByLsKindEqualsAndStringValueLike">
-        <put-attribute name="body" value="/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndStringValueLike.jspx"/>
-    </definition>
-<definition extends="default" name="lsthingvalues/findLsThingValuesByLsKindEqualsAndNumericValueEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndNumericValueEquals.jspx"/>
-    </definition>
-<definition extends="default" name="lsthingvalues/findLsThingValuesByLsKindEqualsAndDateValueGreaterThanEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndDateValueGreaterThanEquals.jspx"/>
-    </definition>
-<definition extends="default" name="lsthingvalues/findLsThingValuesByLsKindEqualsAndDateValueLessThanEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndDateValueLessThanEquals.jspx"/>
-    </definition>
-<definition extends="default" name="lsthingvalues/findLsThingValuesByLsKindEqualsAndNumericValueGreaterThanEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndNumericValueGreaterThanEquals.jspx"/>
-    </definition>
-<definition extends="default" name="lsthingvalues/findLsThingValuesByLsKindEqualsAndNumericValueLessThanEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndNumericValueLessThanEquals.jspx"/>
-    </definition>
-<definition extends="default" name="lsthingvalues/findLsThingValuesByLsKindEqualsAndStringValueEquals">
-        <put-attribute name="body" value="/WEB-INF/views/lsthingvalues/findLsThingValuesByLsKindEqualsAndStringValueEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/lstransactions/create.jspx b/src/main/webapp/WEB-INF/views/lstransactions/create.jspx
deleted file mode 100755
index 56a7afdb1..000000000
--- a/src/main/webapp/WEB-INF/views/lstransactions/create.jspx
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_LsTransaction" modelAttribute="lsTransaction" path="/lstransactions" render="${empty dependencies}" z="5OlJHau1hgqakxVIIHLTj9nxVdc=">
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_LsTransaction_comments" z="rdVRnTqqOyJuQB6ZYN781SrvHHk="/>
-        <field:datetime dateTimePattern="${lsTransaction_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_LsTransaction_recordedDate" required="true" z="vg6whOF5huXV2IA9llqnBvmmh2A="/>
-        <field:select field="status" id="c_com_labsynch_labseer_domain_LsTransaction_status" items="${lstransactionstatuses}" path="lstransactionstatuses" z="GHWMThgtKCEueTWSQ9Mj4zfyH1k="/>
-        <field:select field="type" id="c_com_labsynch_labseer_domain_LsTransaction_type" items="${lstransactiontypes}" path="lstransactiontypes" z="c/ISC/dzcO2w1xmI+76S5MBENts="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_LsTransaction_recordedBy" z="yHN9olKRJ/CL8Exz2auH7kTub+4="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_LsTransaction" render="${not empty dependencies}" z="74K0G7wBMXYFpgCRkyjTTatOiiI="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lstransactions/list.jspx b/src/main/webapp/WEB-INF/views/lstransactions/list.jspx
deleted file mode 100755
index 02486410b..000000000
--- a/src/main/webapp/WEB-INF/views/lstransactions/list.jspx
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_LsTransaction" items="${lstransactions}" z="V+MWW6ZTLQpkJiLRFnb7QLw9iaQ=">
-        <table:table data="${lstransactions}" id="l_com_labsynch_labseer_domain_LsTransaction" path="/lstransactions" z="L1+9t8DiTKEa8VcUptyw6F+04wU=">
-            <table:column id="c_com_labsynch_labseer_domain_LsTransaction_comments" property="comments" z="P14891sZN/H4O1Cka/ycPW+30V4="/>
-            <table:column date="true" dateTimePattern="${lsTransaction_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_LsTransaction_recordedDate" property="recordedDate" z="Qm0XQRlWZeBS+Z0HZDW3+b13fEM="/>
-            <table:column id="c_com_labsynch_labseer_domain_LsTransaction_status" property="status" z="7yapzl01hlbZ5xqKt6mRj+44JFg="/>
-            <table:column id="c_com_labsynch_labseer_domain_LsTransaction_type" property="type" z="x8jflf+F7C6as+RvCPND5Fl8fVM="/>
-            <table:column id="c_com_labsynch_labseer_domain_LsTransaction_recordedBy" property="recordedBy" z="/ZOqHaY2D5xkYlLeWObkPJXziwM="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lstransactions/show.jspx b/src/main/webapp/WEB-INF/views/lstransactions/show.jspx
deleted file mode 100755
index 41f6cb154..000000000
--- a/src/main/webapp/WEB-INF/views/lstransactions/show.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_LsTransaction" object="${lstransaction}" path="/lstransactions" z="p9/0VFH+edThDPHV0EQfJ+atTTQ=">
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_LsTransaction_comments" object="${lstransaction}" z="iThuNXnf8UXsyC91LOiMbGWcpBM="/>
-        <field:display date="true" dateTimePattern="${lsTransaction_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_LsTransaction_recordedDate" object="${lstransaction}" z="u4/QqfHRMt5DmbRnfmrWkc4EWbY="/>
-        <field:display field="status" id="s_com_labsynch_labseer_domain_LsTransaction_status" object="${lstransaction}" z="Gr4bmll7e14dhl7oQHkmOSO5xUE="/>
-        <field:display field="type" id="s_com_labsynch_labseer_domain_LsTransaction_type" object="${lstransaction}" z="9WGjFhZeuKMpxRaJ0VuT9rw1sKY="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_LsTransaction_recordedBy" object="${lstransaction}" z="x6WYuWxMeHZeQHv/Sdu0gmgKEeQ="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lstransactions/update.jspx b/src/main/webapp/WEB-INF/views/lstransactions/update.jspx
deleted file mode 100755
index 13f7aa79d..000000000
--- a/src/main/webapp/WEB-INF/views/lstransactions/update.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_LsTransaction" modelAttribute="lsTransaction" path="/lstransactions" versionField="Version" z="eFlm6bPAKktDPjOn6f5IBlMK3DM=">
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_LsTransaction_comments" z="rdVRnTqqOyJuQB6ZYN781SrvHHk="/>
-        <field:datetime dateTimePattern="${lsTransaction_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_LsTransaction_recordedDate" required="true" z="vg6whOF5huXV2IA9llqnBvmmh2A="/>
-        <field:select field="status" id="c_com_labsynch_labseer_domain_LsTransaction_status" items="${lstransactionstatuses}" path="lstransactionstatuses" z="GHWMThgtKCEueTWSQ9Mj4zfyH1k="/>
-        <field:select field="type" id="c_com_labsynch_labseer_domain_LsTransaction_type" items="${lstransactiontypes}" path="lstransactiontypes" z="c/ISC/dzcO2w1xmI+76S5MBENts="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_LsTransaction_recordedBy" z="yHN9olKRJ/CL8Exz2auH7kTub+4="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/lstransactions/views.xml b/src/main/webapp/WEB-INF/views/lstransactions/views.xml
deleted file mode 100755
index 84fa4c75c..000000000
--- a/src/main/webapp/WEB-INF/views/lstransactions/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="lstransactions/list">
-        <put-attribute name="body" value="/WEB-INF/views/lstransactions/list.jspx"/>
-    </definition>
-<definition extends="default" name="lstransactions/show">
-        <put-attribute name="body" value="/WEB-INF/views/lstransactions/show.jspx"/>
-    </definition>
-<definition extends="default" name="lstransactions/create">
-        <put-attribute name="body" value="/WEB-INF/views/lstransactions/create.jspx"/>
-    </definition>
-<definition extends="default" name="lstransactions/update">
-        <put-attribute name="body" value="/WEB-INF/views/lstransactions/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/menu.jspx b/src/main/webapp/WEB-INF/views/menu.jspx
deleted file mode 100755
index 2d4b2872c..000000000
--- a/src/main/webapp/WEB-INF/views/menu.jspx
+++ /dev/null
@@ -1,773 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:menu="urn:jsptagdir:/WEB-INF/tags/menu" id="menu" version="2.0">
-    <jsp:output omit-xml-declaration="yes"/>
-    <menu:menu id="_menu" z="user-managed">
-        <menu:gvnixmenu/>
-        <menu:category id="c_codeorigin" z="YIlul8nVnnFkXmJTSwjIrUaiCbk=">
-            <menu:item id="i_codeorigin_new" messageCode="global_menu_new" url="/codeorigins?form" z="4YkihonA/OS0RucT6PxNTrBF264="/>
-            <menu:item id="i_codeorigin_list" messageCode="global_menu_list" url="/codeorigins?page=1&amp;size=${empty param.size ? 10 : param.size}" z="mXDEu129EL4jbhn0szLC72IYL8k="/>
-        </menu:category>
-        <menu:category id="c_experimenttype" z="tw+gCRRYx0HuxAeTRe3Bk755l1Y=">
-            <menu:item id="i_experimenttype_new" messageCode="global_menu_new" url="/experimenttypes?form" z="5Rf2y1IWLG1W3WzQYG8+lOA2+70="/>
-            <menu:item id="i_experimenttype_list" messageCode="global_menu_list" url="/experimenttypes?page=1&amp;size=${empty param.size ? 10 : param.size}" z="Tc8W7Y1YMvKM7FOse1RSS6GwryA="/>
-            <menu:item id="fi_experimenttype_typenameequals" messageCode="global_menu_find" url="/experimenttypes?find=ByTypeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="qwNHSTS/1SiBHc/paFYmVpVhDbc="/>
-        </menu:category>
-        <menu:category id="c_labelsequencerole" z="lJsqdvfuWoIaXCw0EcJozZ1ys2E=">
-            <menu:item id="i_labelsequencerole_new" messageCode="global_menu_new" url="/labelsequenceroles?form" z="gH3x0VFtnFF5ZcxQRyIbzKYwG+s="/>
-            <menu:item id="i_labelsequencerole_list" messageCode="global_menu_list" url="/labelsequenceroles?page=1&amp;size=${empty param.size ? 10 : param.size}" z="59XrXSaThk0WaM6ME/zuC0TTvcI="/>
-        </menu:category>
-        <menu:category id="c_itxprotocolprotocolstate" z="5crXh8kZ9negy5Cyo9mf6r7Zwo8=">
-            <menu:item id="i_itxprotocolprotocolstate_new" messageCode="global_menu_new" url="/itxprotocolprotocolstates?form" z="m085rBwmeyS6/phK6Wv6DPfHCQ8="/>
-            <menu:item id="i_itxprotocolprotocolstate_list" messageCode="global_menu_list" url="/itxprotocolprotocolstates?page=1&amp;size=${empty param.size ? 10 : param.size}" z="awzpB8rhwPNlv8QJPdWdovGb6gU="/>
-        </menu:category>
-        <menu:category id="c_itxprotocolprotocol" z="lmgYw5QqKJwU04tbGuaKaMJoxlc=">
-            <menu:item id="i_itxprotocolprotocol_new" messageCode="global_menu_new" url="/itxprotocolprotocols?form" z="dMXVapq9fuBlhNUnKCw6jF2F8ug="/>
-            <menu:item id="i_itxprotocolprotocol_list" messageCode="global_menu_list" url="/itxprotocolprotocols?page=1&amp;size=${empty param.size ? 10 : param.size}" z="iq6qexLG4PaxGfjcA03XJ0+5AaQ="/>
-            <menu:item id="fi_itxprotocolprotocol_firstprotocol" messageCode="global_menu_find" url="/itxprotocolprotocols?find=ByFirstProtocol&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="WamLYqvRZFeyDw89OHSc7L/q2Y0="/>
-            <menu:item id="fi_itxprotocolprotocol_lstransactionequals" messageCode="global_menu_find" url="/itxprotocolprotocols?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="yWlmw++9byf44kyYPXu8bKHaNqY="/>
-            <menu:item id="fi_itxprotocolprotocol_secondprotocol" messageCode="global_menu_find" url="/itxprotocolprotocols?find=BySecondProtocol&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="a8+LsYOsW7v4skcr6IR+qp0W9nk="/>
-        </menu:category>
-        <menu:category id="c_itxexperimentexperimentvalue" z="Aeo0RR7U+fLNyS6TzQCRpXi9ulY=">
-            <menu:item id="i_itxexperimentexperimentvalue_new" messageCode="global_menu_new" url="/itxexperimentexperimentvalues?form" z="jM/hi+0hzXfIqUBD/jOxw4lh26M="/>
-            <menu:item id="i_itxexperimentexperimentvalue_list" messageCode="global_menu_list" url="/itxexperimentexperimentvalues?page=1&amp;size=${empty param.size ? 10 : param.size}" z="fq39w6t2JIM3o1taR06tBd3omG4="/>
-        </menu:category>
-        <menu:category id="c_codetype" z="JjS8QbsLEL+EkYUpI2/tdsLk7/I=">
-            <menu:item id="i_codetype_new" messageCode="global_menu_new" url="/codetypes?form" z="py101QqLgRodN2GKQE6Shlifc5o="/>
-            <menu:item id="i_codetype_list" messageCode="global_menu_list" url="/codetypes?page=1&amp;size=${empty param.size ? 10 : param.size}" z="eMyxDac/UFBzZNkqxw50aAkz22k="/>
-            <menu:item id="fi_codetype_typenameequals" messageCode="global_menu_find" url="/codetypes?find=ByTypeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="zphT1fp05HqGs5+PCcRuamH/Mx0="/>
-        </menu:category>
-        <menu:category id="c_qccompound" z="xYiBmASgLvZsBzTl4ciCL0wZpls=">
-            <menu:item id="i_qccompound_new" messageCode="global_menu_new" url="/qccompounds?form" z="44fOfP2fyH+/itfQXgUiRBBh4pY="/>
-            <menu:item id="i_qccompound_list" messageCode="global_menu_list" url="/qccompounds?page=1&amp;size=${empty param.size ? 10 : param.size}" z="ZUc8hBty5B/z7CiJAkIBF35fsqw="/>
-            <menu:item id="fi_qccompound_cdid" messageCode="global_menu_find" url="/qccompounds?find=ByCdId&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="4/i15dEiEbT6fcAA4aukkxJsl8o="/>
-        </menu:category>
-        <menu:category id="c_rolekind" z="KVQVdwzOfGV720M7rpWWHWu1/ZM=">
-            <menu:item id="i_rolekind_new" messageCode="global_menu_new" url="/rolekinds?form" z="pg+83KKlLmJSjIPVompKUXMYHV8="/>
-            <menu:item id="i_rolekind_list" messageCode="global_menu_list" url="/rolekinds?page=1&amp;size=${empty param.size ? 10 : param.size}" z="ovIkKR/Umvr6j9+j7iArQWnO5o4="/>
-            <menu:item id="fi_rolekind_kindnameequalsandlstype" messageCode="global_menu_find" url="/rolekinds?find=ByKindNameEqualsAndLsType&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="1x5OXayPskNzhOIG9p8xFJ/gBUw="/>
-            <menu:item id="fi_rolekind_lstype" messageCode="global_menu_find" url="/rolekinds?find=ByLsType&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="FRp+fV6Aiidqp8jBYF0GH8EgQr8="/>
-        </menu:category>
-        <menu:category id="c_uncertaintykind" z="uY7480Dyon89MiHEa7Yr6eeNyho=">
-            <menu:item id="i_uncertaintykind_new" messageCode="global_menu_new" url="/uncertaintykinds?form" z="9oj2gNFMygXepX7HpUmZlMUYw8w="/>
-            <menu:item id="i_uncertaintykind_list" messageCode="global_menu_list" url="/uncertaintykinds?page=1&amp;size=${empty param.size ? 10 : param.size}" z="6PEQNyWwMM3E9kA+7NFDfSnZ87w="/>
-        </menu:category>
-        <menu:category id="c_statetype" z="Mx6S70LGMuIptspjTVNIP+xCAPo=">
-            <menu:item id="i_statetype_new" messageCode="global_menu_new" url="/statetypes?form" z="H7TE9bRUmZaT1KPashC+AB2JkEA="/>
-            <menu:item id="i_statetype_list" messageCode="global_menu_list" url="/statetypes?page=1&amp;size=${empty param.size ? 10 : param.size}" z="BWSiCbx+OeibgQQSSU7efhOZ74w="/>
-            <menu:item id="fi_statetype_typenameequals" messageCode="global_menu_find" url="/statetypes?find=ByTypeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="OfFDu/h/uM0JLRslWPSzGKPYKbU="/>
-        </menu:category>
-        <menu:category id="c_thingkind" z="EB+SoA7uuAMGzqc+zI0luHoMr98=">
-            <menu:item id="i_thingkind_new" messageCode="global_menu_new" url="/thingkinds?form" z="cmQ/xFK3fn/AXjx8AjHRfx1cJd4="/>
-            <menu:item id="i_thingkind_list" messageCode="global_menu_list" url="/thingkinds?page=1&amp;size=${empty param.size ? 10 : param.size}" z="5cKa5fTXKZhJtJ8XrphjKi+wKN8="/>
-            <menu:item id="fi_thingkind_kindnameequalsandlstype" messageCode="global_menu_find" url="/thingkinds?find=ByKindNameEqualsAndLsType&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="wqNSDjaGmzybgQeAgFyapyNSHSs="/>
-            <menu:item id="fi_thingkind_lstype" messageCode="global_menu_find" url="/thingkinds?find=ByLsType&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="annDR8G211Xv/KBMAiXvSGvQwyg="/>
-            <menu:item id="fi_thingkind_lstypeandkindequals" messageCode="global_menu_find" url="/thingkinds?find=ByLsTypeAndKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="ROkMpbTVL2ZLnRGSW88HxXf3rSM="/>
-        </menu:category>
-        <menu:category id="c_operatortype" z="A+8dbY+wVhuFDbqgFE9E7JHF128=">
-            <menu:item id="i_operatortype_new" messageCode="global_menu_new" url="/operatortypes?form" z="HWe4/SpLzMoGY8ptdgBj2uTPJ9I="/>
-            <menu:item id="i_operatortype_list" messageCode="global_menu_list" url="/operatortypes?page=1&amp;size=${empty param.size ? 10 : param.size}" z="fbXDWvYnQsoEa3YjGapmFbm7JKs="/>
-            <menu:item id="fi_operatortype_typenameequals" messageCode="global_menu_find" url="/operatortypes?find=ByTypeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="qhbsJ2Mnj/N5Pl6Zu6uHRYYEN0Y="/>
-        </menu:category>
-        <menu:category id="c_ddictvalue" z="//tNoHqIxdxTRG7zgPcUetLYu8k=">
-            <menu:item id="i_ddictvalue_new" messageCode="global_menu_new" url="/ddictvalues?form" z="tC4RJQp+VQAUTyApAsKkHNYcuWw="/>
-            <menu:item id="i_ddictvalue_list" messageCode="global_menu_list" url="/ddictvalues?page=1&amp;size=${empty param.size ? 10 : param.size}" z="xmGlnyJ/6c5Fuax8ETox1f+dGzM="/>
-            <menu:item id="fi_ddictvalue_codenameequals" messageCode="global_menu_find" url="/ddictvalues?find=ByCodeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="jmCL0f3XgD1RfukCIaT20AZz9Y4="/>
-            <menu:item id="fi_ddictvalue_ignorednot" messageCode="global_menu_find" url="/ddictvalues?find=ByIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="CaV8CufwZBMYfE5+h8Fm3oQ5WFQ="/>
-            <menu:item id="fi_ddictvalue_labeltextlike" messageCode="global_menu_find" url="/ddictvalues?find=ByLabelTextLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="sz5qSQVW5smhMDpDuoTV1DDT4uA="/>
-            <menu:item id="fi_ddictvalue_lskindequals" messageCode="global_menu_find" url="/ddictvalues?find=ByLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="V3WYsAt4eHwOEttnz+rFPWsFNY4="/>
-            <menu:item id="fi_ddictvalue_lstypeequals" messageCode="global_menu_find" url="/ddictvalues?find=ByLsTypeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="1HMZmBwQHIhYKe3rtqDNm2+25H0="/>
-            <menu:item id="fi_ddictvalue_lstypeequalsandlskindequals" messageCode="global_menu_find" url="/ddictvalues?find=ByLsTypeEqualsAndLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="9IgJ691lDZraTtRUup8a01Z+558="/>
-            <menu:item id="fi_ddictvalue_lstypeequalsandlskindequalsandshortnameequals" messageCode="global_menu_find" url="/ddictvalues?find=ByLsTypeEqualsAndLsKindEqualsAndShortNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="+ud2wKj8GiYytrtYCpkZGQ0aO90="/>
-        </menu:category>
-        <menu:category id="c_itxcontainercontainer" z="hraTt2yXC1I5T46kW2CxB2Rvids=">
-            <menu:item id="i_itxcontainercontainer_new" messageCode="global_menu_new" url="/itxcontainercontainers?form" z="NhlUqtl4JMadHsSUmeKluQxkWLU="/>
-            <menu:item id="i_itxcontainercontainer_list" messageCode="global_menu_list" url="/itxcontainercontainers?page=1&amp;size=${empty param.size ? 10 : param.size}" z="rG6fKtmy1KgXBRW0mqiuB7OIYZk="/>
-            <menu:item id="fi_itxcontainercontainer_lstransactionequals" messageCode="global_menu_find" url="/itxcontainercontainers?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="eW4roQtB8THf8hNbP1nWGJy5aVc="/>
-            <menu:item id="fi_itxcontainercontainer_lstypeequalsandfirstcontainerequals" messageCode="global_menu_find" url="/itxcontainercontainers?find=ByLsTypeEqualsAndFirstContainerEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="f1ZnYZMsfUVpYumWFIVgfkNHidc="/>
-            <menu:item id="fi_itxcontainercontainer_lstypeequalsandsecondcontainerequals" messageCode="global_menu_find" url="/itxcontainercontainers?find=ByLsTypeEqualsAndSecondContainerEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="yDbQivV1KXf2SM/+FnTVal8/MLY="/>
-        </menu:category>
-        <menu:category id="c_containervalue" z="61ft2oqlcmXT8pmGGZYwQQQ0VPo=">
-            <menu:item id="i_containervalue_new" messageCode="global_menu_new" url="/containervalues?form" z="8boDwXK/aCoPpkpkvLS5e3iqgM0="/>
-            <menu:item id="i_containervalue_list" messageCode="global_menu_list" url="/containervalues?page=1&amp;size=${empty param.size ? 10 : param.size}" z="yYge5J883fDKMfAJRFUSt44XEYk="/>
-            <menu:item id="fi_containervalue_ignorednot" messageCode="global_menu_find" url="/containervalues?find=ByIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="J45Pix72EKUy9uY3+6UYh0443Ro="/>
-            <menu:item id="fi_containervalue_lsstate" messageCode="global_menu_find" url="/containervalues?find=ByLsState&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="asAnziPvciPJ0w734zfDRxi9u10="/>
-        </menu:category>
-        <menu:category id="c_lsthingvalue" z="XQNB1Y4XpCaXF1GUHOnoFM/mcB4=">
-            <menu:item id="i_lsthingvalue_new" messageCode="global_menu_new" url="/lsthingvalues?form" z="8aiCS/gGFUuEnKYD1Cs0cW1ictk="/>
-            <menu:item id="i_lsthingvalue_list" messageCode="global_menu_list" url="/lsthingvalues?page=1&amp;size=${empty param.size ? 10 : param.size}" z="QfdH6nwpOdF11WpDAtiAEMVn0yI="/>
-            <menu:item id="fi_lsthingvalue_codevalueequals" messageCode="global_menu_find" url="/lsthingvalues?find=ByCodeValueEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="W6QPCVvx4gX2a/A3NDsD/S01eAc="/>
-            <menu:item id="fi_lsthingvalue_ignorednotandcodevalueequals" messageCode="global_menu_find" url="/lsthingvalues?find=ByIgnoredNotAndCodeValueEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="a7mlgdDUVK+UcipILYX+qAHWDr8="/>
-            <menu:item id="fi_lsthingvalue_lskindequalsandcodevaluelike" messageCode="global_menu_find" url="/lsthingvalues?find=ByLsKindEqualsAndCodeValueLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="MymXPgjc1y4tDKHhGQoeoei1aaQ="/>
-            <menu:item id="fi_lsthingvalue_lskindequalsanddatevaluegreaterthanequals" messageCode="global_menu_find" url="/lsthingvalues?find=ByLsKindEqualsAndDateValueGreaterThanEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="OU+YYiAOGQsSAFkhEQ7qJw+M2OY="/>
-            <menu:item id="fi_lsthingvalue_lskindequalsanddatevaluelessthanequals" messageCode="global_menu_find" url="/lsthingvalues?find=ByLsKindEqualsAndDateValueLessThanEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="U2s1MLgcm0O7oToL/gEzeL7yCgI="/>
-            <menu:item id="fi_lsthingvalue_lskindequalsanddatevaluelike" messageCode="global_menu_find" url="/lsthingvalues?find=ByLsKindEqualsAndDateValueLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="/mp7UkmTg9+CPbVBexPpRm+ioIk="/>
-            <menu:item id="fi_lsthingvalue_lskindequalsandnumericvalueequals" messageCode="global_menu_find" url="/lsthingvalues?find=ByLsKindEqualsAndNumericValueEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="prLVqqfrhRL/45CF5M8UITNTEn0="/>
-            <menu:item id="fi_lsthingvalue_lskindequalsandnumericvaluegreaterthanequals" messageCode="global_menu_find" url="/lsthingvalues?find=ByLsKindEqualsAndNumericValueGreaterThanEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="Dd9sAPFrQhxlGqJLnZVlv1Q8r2Y="/>
-            <menu:item id="fi_lsthingvalue_lskindequalsandnumericvaluelessthanequals" messageCode="global_menu_find" url="/lsthingvalues?find=ByLsKindEqualsAndNumericValueLessThanEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="ca5So17E0Xhx9Nvikfy+A3N4Z0U="/>
-            <menu:item id="fi_lsthingvalue_lskindequalsandstringvalueequals" messageCode="global_menu_find" url="/lsthingvalues?find=ByLsKindEqualsAndStringValueEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="zQRn06RjidDuBJD4nIN5zhuxc/4="/>
-            <menu:item id="fi_lsthingvalue_lskindequalsandstringvaluelike" messageCode="global_menu_find" url="/lsthingvalues?find=ByLsKindEqualsAndStringValueLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="dKKS4wMv01BskE38gLnsuYsdGJM="/>
-            <menu:item id="fi_lsthingvalue_lsstate" messageCode="global_menu_find" url="/lsthingvalues?find=ByLsState&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="RSMfh8a1WcY9oq1H2csEKype9qk="/>
-            <menu:item id="fi_lsthingvalue_lstransactionequals" messageCode="global_menu_find" url="/lsthingvalues?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="VH4hkGT9IIwtMDUQ5sX6mcfHPjI="/>
-        </menu:category>
-        <menu:category id="c_containerstate" z="4C866eNJqZSkq/mjeOeAblklyD8=">
-            <menu:item id="i_containerstate_new" messageCode="global_menu_new" url="/containerstates?form" z="hQPVX4bz14KxIr/2C+QhEzcoPZI="/>
-            <menu:item id="i_containerstate_list" messageCode="global_menu_list" url="/containerstates?page=1&amp;size=${empty param.size ? 10 : param.size}" z="6RcIjnnxZNGCJaU0dja7qieJrSY="/>
-            <menu:item id="fi_containerstate_container" messageCode="global_menu_find" url="/containerstates?find=ByContainer&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="bsuH5DySlAgQBAa2BnEH5uh/JC4="/>
-            <menu:item id="fi_containerstate_containerandlskindequalsandignorednot" messageCode="global_menu_find" url="/containerstates?find=ByContainerAndLsKindEqualsAndIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="PxFdTrxbw175a8RW9XEYX/pa4QY="/>
-            <menu:item id="fi_containerstate_ignorednot" messageCode="global_menu_find" url="/containerstates?find=ByIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="9uRYmnjh1RgMWWb/kWhCqaEqrv4="/>
-        </menu:category>
-        <menu:category id="c_valuetype" z="78cGurSeDwDaXDfkbYxrbSOGH/s=">
-            <menu:item id="i_valuetype_new" messageCode="global_menu_new" url="/valuetypes?form" z="YAMKYD/WdE5WvE7Dz85UYELd8G4="/>
-            <menu:item id="i_valuetype_list" messageCode="global_menu_list" url="/valuetypes?page=1&amp;size=${empty param.size ? 10 : param.size}" z="F5Bw06AVT+K7meSIXte3dRdPWmA="/>
-            <menu:item id="fi_valuetype_typenameequals" messageCode="global_menu_find" url="/valuetypes?find=ByTypeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="+GIgi+NYeDMSQ+iiqCFwt8RAdJM="/>
-        </menu:category>
-        <menu:category id="c_lsthingstate" z="kDZpS4CZuCX4P3hck2rU9pGQEHs=">
-            <menu:item id="i_lsthingstate_new" messageCode="global_menu_new" url="/lsthingstates?form" z="pX/Lr4UYIRxuIGH06d1XLuCTDKI="/>
-            <menu:item id="i_lsthingstate_list" messageCode="global_menu_list" url="/lsthingstates?page=1&amp;size=${empty param.size ? 10 : param.size}" z="d98Xo60loeXGrUHJ0nLk3GFeYR4="/>
-            <menu:item id="fi_lsthingstate_lsthing" messageCode="global_menu_find" url="/lsthingstates?find=ByLsThing&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="n6K2otMw4/CjeLh0Y4+RTS9yJgI="/>
-            <menu:item id="fi_lsthingstate_lstransactionequals" messageCode="global_menu_find" url="/lsthingstates?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="ZyXd4N3Qel99e7zXmVigNibelyM="/>
-        </menu:category>
-        <menu:category id="c_subjectstate" z="0tgh9BM9hpSSmL0bvyQlmfMqw2U=">
-            <menu:item id="i_subjectstate_new" messageCode="global_menu_new" url="/subjectstates?form" z="4krRYbTerlNMe5b8ay8adW6ASaQ="/>
-            <menu:item id="i_subjectstate_list" messageCode="global_menu_list" url="/subjectstates?page=1&amp;size=${empty param.size ? 10 : param.size}" z="klh8NBo8hZN330MTV2AqH5GauUk="/>
-            <menu:item id="fi_subjectstate_lstypeequalsandlskindequalsandsubject" messageCode="global_menu_find" url="/subjectstates?find=ByLsTypeEqualsAndLsKindEqualsAndSubject&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="EOZJAhlz+ihrnP+1TloRKEYdZyc="/>
-            <menu:item id="fi_subjectstate_subject" messageCode="global_menu_find" url="/subjectstates?find=BySubject&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="JBhdSEGHbaWPjCoE07VBX7wkNLk="/>
-        </menu:category>
-        <menu:category id="c_experimentkind" z="nF3L2UteuFYCPl3sTrS1vc5Niro=">
-            <menu:item id="i_experimentkind_new" messageCode="global_menu_new" url="/experimentkinds?form" z="WMnJWdqI8grfVPwh+OfLVeMfvxc="/>
-            <menu:item id="i_experimentkind_list" messageCode="global_menu_list" url="/experimentkinds?page=1&amp;size=${empty param.size ? 10 : param.size}" z="SeDnKvtAjZbP6lpXFfLtGB36uUs="/>
-        </menu:category>
-        <menu:category id="c_operator" z="BZhwtoiUUEfw0pD60f7xI82Jcio=">
-            <menu:item id="i_operator_new" messageCode="global_menu_new" url="/operators?form" z="348aQG/OMwcpfhf4YOVFumU9lXA="/>
-            <menu:item id="i_operator_list" messageCode="global_menu_list" url="/operators?page=1&amp;size=${empty param.size ? 10 : param.size}" z="Tz16FblnAMkG7trnwdzRokFAC6Q="/>
-            <menu:item id="fi_operator_codeequals" messageCode="global_menu_find" url="/operators?find=ByCodeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="8JL8+ru+gaX6YnBv8HM6rnGGiS4="/>
-            <menu:item id="fi_operator_nameequals" messageCode="global_menu_find" url="/operators?find=ByNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="bIX2Qy9BpJdrEGhcRr1Gyk8yJjs="/>
-        </menu:category>
-        <menu:category id="c_itxcontainercontainervalue" z="Le3HhFbbIDVkj7cSxS7EZFgSAYQ=">
-            <menu:item id="i_itxcontainercontainervalue_new" messageCode="global_menu_new" url="/itxcontainercontainervalues?form" z="4b6NS0bM8YA7GZ/aQpX6LweqQyM="/>
-            <menu:item id="i_itxcontainercontainervalue_list" messageCode="global_menu_list" url="/itxcontainercontainervalues?page=1&amp;size=${empty param.size ? 10 : param.size}" z="URWUXuwprPQ0gX7+Gk5y8mH9Njs="/>
-        </menu:category>
-        <menu:category id="c_predef_corpname" z="Icw+8nGiSzyuU1YRUnPMoU/ZVMo=">
-            <menu:item id="i_predef_corpname_new" messageCode="global_menu_new" url="/predef_corpnames?form" z="Kwz8R5E274kap2paJSFMlwS0IDA="/>
-            <menu:item id="i_predef_corpname_list" messageCode="global_menu_list" url="/predef_corpnames?page=1&amp;size=${empty param.size ? 10 : param.size}" z="dvkZ3heCrrSBM1skxCr5XwRORqw="/>
-        </menu:category>
-        <menu:category id="c_experiment" z="W5OakP5QbaEqEHbKqCeTcck19zg=">
-            <menu:item id="i_experiment_new" messageCode="global_menu_new" url="/experiments?form" z="EVZT/gaNGpJpHt/Gjzy7RqeROmw="/>
-            <menu:item id="i_experiment_list" messageCode="global_menu_list" url="/experiments?page=1&amp;size=${empty param.size ? 10 : param.size}" z="x3HHZQOwFIYuEEtmv/C3xfJRZo8="/>
-            <menu:item id="fi_experiment_codenameequals" messageCode="global_menu_find" url="/experiments?find=ByCodeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="2nMPWY3Wa5zEI2dEOVPhve6wCpk="/>
-            <menu:item id="fi_experiment_codenamelike" messageCode="global_menu_find" url="/experiments?find=ByCodeNameLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="eFOA0APjcShPE3ddO+WlNNEPlM8="/>
-            <menu:item id="fi_experiment_lskindequals" messageCode="global_menu_find" url="/experiments?find=ByLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="MvZE1IUSUGKDaiMEzG3+Iuv9zW4="/>
-            <menu:item id="fi_experiment_lskindlike" messageCode="global_menu_find" url="/experiments?find=ByLsKindLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="OI9x6bKM6GuIKvC7r21hzWWS40A="/>
-            <menu:item id="fi_experiment_lstransaction" messageCode="global_menu_find" url="/experiments?find=ByLsTransaction&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="CHYwi4VjGvMKUGVmzoISilwc7l0="/>
-            <menu:item id="fi_experiment_lstypeequals" messageCode="global_menu_find" url="/experiments?find=ByLsTypeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="No4SdR0D4NniR4wrb6lxwo6oETs="/>
-            <menu:item id="fi_experiment_lstypeequalsandlskindequals" messageCode="global_menu_find" url="/experiments?find=ByLsTypeEqualsAndLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="Y/TAEtp0wbZnYFLq8ovZNp/j9Lc="/>
-            <menu:item id="fi_experiment_lstypelike" messageCode="global_menu_find" url="/experiments?find=ByLsTypeLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="66FbTpkFXEHX64ie3JdJB/O197M="/>
-            <menu:item id="fi_experiment_protocol" messageCode="global_menu_find" url="/experiments?find=ByProtocol&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="Kw5QEvJyyZ4FdEhpOVn9dFkrJTw="/>
-            <menu:item id="fi_experiment_recordedbylike" messageCode="global_menu_find" url="/experiments?find=ByRecordedByLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="I/Ysuq1TzpRa7U1mXOT21stjvLc="/>
-        </menu:category>
-        <menu:category id="c_roletype" z="4j93y9HnrS9b1iYCpRnc2GT4nVQ=">
-            <menu:item id="i_roletype_new" messageCode="global_menu_new" url="/roletypes?form" z="SCsoXt9FKGH0QpEfNXFbsigT8AE="/>
-            <menu:item id="i_roletype_list" messageCode="global_menu_list" url="/roletypes?page=1&amp;size=${empty param.size ? 10 : param.size}" z="pXs+olwjk4QH+ztDyWQ6jt195ng="/>
-            <menu:item id="fi_roletype_typenameequals" messageCode="global_menu_find" url="/roletypes?find=ByTypeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="EL1bGIOdDKVQlGyHIX70/jKFtM0="/>
-        </menu:category>
-        <menu:category id="c_thingpagearchive" z="Poh907U09OYMInXDxCLHjmgu4v8=">
-            <menu:item id="i_thingpagearchive_new" messageCode="global_menu_new" url="/thingpagearchives?form" z="DSXfkjU0T0xjJ2VoGdbj00jaelg="/>
-            <menu:item id="i_thingpagearchive_list" messageCode="global_menu_list" url="/thingpagearchives?page=1&amp;size=${empty param.size ? 10 : param.size}" z="5ukPUmuD+k46SKvTb/qayMIfiFk="/>
-        </menu:category>
-        <menu:category id="c_treatmentgroupvalue" z="r87+4zBMTUc9g5SHBTuhuuB1B5E=">
-            <menu:item id="i_treatmentgroupvalue_new" messageCode="global_menu_new" url="/treatmentgroupvalues?form" z="VX3BA/xTdKXOn/qs0i596AWg/kU="/>
-            <menu:item id="i_treatmentgroupvalue_list" messageCode="global_menu_list" url="/treatmentgroupvalues?page=1&amp;size=${empty param.size ? 10 : param.size}" z="abCxLz2+8fifTLMVS2G8aIquTEQ="/>
-            <menu:item id="fi_treatmentgroupvalue_codevalueequals" messageCode="global_menu_find" url="/treatmentgroupvalues?find=ByCodeValueEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="1K/qCqS/9dXdOTWqP/wPatSr/n4="/>
-            <menu:item id="fi_treatmentgroupvalue_ignorednotandcodevalueequals" messageCode="global_menu_find" url="/treatmentgroupvalues?find=ByIgnoredNotAndCodeValueEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="61+siccg4Kef2Uql9EtdGFmzezk="/>
-            <menu:item id="fi_treatmentgroupvalue_lsstate" messageCode="global_menu_find" url="/treatmentgroupvalues?find=ByLsState&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="QbJeUcJRUW3fOm4X/ZW7EEC1lo8="/>
-            <menu:item id="fi_treatmentgroupvalue_lstransactionequals" messageCode="global_menu_find" url="/treatmentgroupvalues?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="HP2nRE3toiuGyZBEekD9PR44sgw="/>
-        </menu:category>
-        <menu:category id="c_lstag" z="HUNDPGqka4d9BqVNzWN0BY4aRDo=">
-            <menu:item id="i_lstag_new" messageCode="global_menu_new" url="/lstags?form" z="P3yISa1eDoZNY56pqspaz8gZbVM="/>
-            <menu:item id="i_lstag_list" messageCode="global_menu_list" url="/lstags?page=1&amp;size=${empty param.size ? 10 : param.size}" z="A8hYyfp/VWJjr/u/at59oeksjCc="/>
-            <menu:item id="fi_lstag_tagtextequals" messageCode="global_menu_find" url="/lstags?find=ByTagTextEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="pyJ5ts+TAZaapcHhMqYidcOIpVY="/>
-            <menu:item id="fi_lstag_tagtextlike" messageCode="global_menu_find" url="/lstags?find=ByTagTextLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="OLnnJpUGFoNr7rravHbGEgiutwk="/>
-        </menu:category>
-        <menu:category id="c_authorstate" z="llb18vu0YwqOxWtVC/L6uvKvKJQ=">
-            <menu:item id="i_authorstate_new" messageCode="global_menu_new" url="/authorstates?form" z="MGzCCAQCGKXwRI5J8ROuGK8d6WM="/>
-            <menu:item id="i_authorstate_list" messageCode="global_menu_list" url="/authorstates?page=1&amp;size=${empty param.size ? 10 : param.size}" z="3tmMLJd8Pnu//kGpFFTawQBl0v4="/>
-        </menu:category>
-        <menu:category id="c_solutionunit" z="zuf3JM2dmCoCp/ieWZomS/PrhAk=">
-            <menu:item id="i_solutionunit_new" messageCode="global_menu_new" url="/solutionunits?form" z="LH7VnOGJk9HlXcTwnzZbC1MoOPk="/>
-            <menu:item id="i_solutionunit_list" messageCode="global_menu_list" url="/solutionunits?page=1&amp;size=${empty param.size ? 10 : param.size}" z="Xxov5+isHXigALbrAFg10eGgpiI="/>
-            <menu:item id="fi_solutionunit_codeequals" messageCode="global_menu_find" url="/solutionunits?find=ByCodeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="geMzrw9gFm8et/nRkHhRERN+vUA="/>
-            <menu:item id="fi_solutionunit_codelike" messageCode="global_menu_find" url="/solutionunits?find=ByCodeLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="7yQAqNl7Bi8wcDUW4MrKqpUHhEg="/>
-            <menu:item id="fi_solutionunit_nameequals" messageCode="global_menu_find" url="/solutionunits?find=ByNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="jJhSmPzvCvNOtGYQRO4iYyxNJg0="/>
-        </menu:category>
-        <menu:category id="c_itxsubjectcontainerstate" z="mlbpXhpw+dPookWsn6xL3DWl+Eg=">
-            <menu:item id="i_itxsubjectcontainerstate_new" messageCode="global_menu_new" url="/itxsubjectcontainerstates?form" z="Wo/7xJ/02ah0rzPycINQdhlSUuU="/>
-            <menu:item id="i_itxsubjectcontainerstate_list" messageCode="global_menu_list" url="/itxsubjectcontainerstates?page=1&amp;size=${empty param.size ? 10 : param.size}" z="migFjw2t7btf4lMeHo3wP3v4m+E="/>
-        </menu:category>
-        <menu:category id="c_itxcontainercontainerstate" z="pVrwYbMfrIyTLw8/EDoEJlCImAM=">
-            <menu:item id="i_itxcontainercontainerstate_new" messageCode="global_menu_new" url="/itxcontainercontainerstates?form" z="x0m5N12+E9xJh0q4ERVNJP9Gs7U="/>
-            <menu:item id="i_itxcontainercontainerstate_list" messageCode="global_menu_list" url="/itxcontainercontainerstates?page=1&amp;size=${empty param.size ? 10 : param.size}" z="vYO+mzXoZCHMFx0BoMT4BVX83sk="/>
-        </menu:category>
-        <menu:category id="c_cronjob" z="MJhorYNE+3OCIWEpf+RfPk4gCI0=">
-            <menu:item id="i_cronjob_new" messageCode="global_menu_new" url="/cronjobs?form" z="h4Gy14Qp0blpOVETAnQAg6Q6y+8="/>
-            <menu:item id="i_cronjob_list" messageCode="global_menu_list" url="/cronjobs?page=1&amp;size=${empty param.size ? 10 : param.size}" z="CoFS7ynqZBGXPy/UKVutNm+wlJw="/>
-        </menu:category>
-        <menu:category id="c_thingtype" z="zEjqYpuraOKTEmlqv+AQvM9g7Vg=">
-            <menu:item id="i_thingtype_new" messageCode="global_menu_new" url="/thingtypes?form" z="m4JJsOt/IlKzb2zeB0BLdnv2sqU="/>
-            <menu:item id="i_thingtype_list" messageCode="global_menu_list" url="/thingtypes?page=1&amp;size=${empty param.size ? 10 : param.size}" z="fayJaw3cu2ZrlOhre/JNWDwWstc="/>
-            <menu:item id="fi_thingtype_typenameequals" messageCode="global_menu_find" url="/thingtypes?find=ByTypeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="CRmLRD4sWqfu50zDcFZ1mZjD9wQ="/>
-        </menu:category>
-        <menu:category id="c_salt" z="QePys/02tZDpbAvRfJ89YHg4iOo=">
-            <menu:item id="i_salt_new" messageCode="global_menu_new" url="/salts?form" z="Rt6Yn5Yy2OmK8gGhLSquihEpiiI="/>
-            <menu:item id="i_salt_list" messageCode="global_menu_list" url="/salts?page=1&amp;size=${empty param.size ? 10 : param.size}" z="vjSKA4wsQUy8O7hsslkG1EC8haw="/>
-            <menu:item id="fi_salt_abbrevequals" messageCode="global_menu_find" url="/salts?find=ByAbbrevEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="faEAuZlMBHTE0ex80p7vjTsYSDo="/>
-            <menu:item id="fi_salt_abbrevequalsandnameequals" messageCode="global_menu_find" url="/salts?find=ByAbbrevEqualsAndNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="yFxOyFDs9ootIiRB/QhwmqOIn3k="/>
-            <menu:item id="fi_salt_abbrevlike" messageCode="global_menu_find" url="/salts?find=ByAbbrevLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="/soeIBsKfSoVqIwTeH+xfJs4+UI="/>
-            <menu:item id="fi_salt_cdid" messageCode="global_menu_find" url="/salts?find=ByCdId&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="lV1IoOJ3gs//kWtnqu5ktR1YUjY="/>
-            <menu:item id="fi_salt_nameequals" messageCode="global_menu_find" url="/salts?find=ByNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="CEhaZMjuxycMVvNcnHn8fJBE2hg="/>
-        </menu:category>
-        <menu:category id="c_saltform" z="SxI90gWxEI5Qb+tuwuMvUhBF6wI=">
-            <menu:item id="i_saltform_new" messageCode="global_menu_new" url="/saltforms?form" z="GJNFdQxtdlDG3OjBR5H0U/psG+4="/>
-            <menu:item id="i_saltform_list" messageCode="global_menu_list" url="/saltforms?page=1&amp;size=${empty param.size ? 10 : param.size}" z="JeDUyMUHv6JapOQDWBWCBYt3erQ="/>
-            <menu:item id="fi_saltform_bulkloadfileequals" messageCode="global_menu_find" url="/saltforms?find=ByBulkLoadFileEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="VwRclDdxN4rzNpFhlhmCtNH+/U4="/>
-            <menu:item id="fi_saltform_cdid" messageCode="global_menu_find" url="/saltforms?find=ByCdId&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="k8sB1tWhwjius1TXNUQg48kBJqE="/>
-            <menu:item id="fi_saltform_corpnameequals" messageCode="global_menu_find" url="/saltforms?find=ByCorpNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="ODunbPjAY2MmlzJ2g4H50roXLMs="/>
-            <menu:item id="fi_saltform_corpnamelike" messageCode="global_menu_find" url="/saltforms?find=ByCorpNameLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="VlEVFIkOfP/0sTY8Id/+uXNZZVw="/>
-            <menu:item id="fi_saltform_parent" messageCode="global_menu_find" url="/saltforms?find=ByParent&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="0BDsMTGOaCH2+B+hAn6H2VXOZyc="/>
-        </menu:category>
-        <menu:category id="c_lsrole" z="eIIF+3Nwhg0gA4BZWz9IqeIfBr0=">
-            <menu:item id="i_lsrole_new" messageCode="global_menu_new" url="/lsroles?form" z="sQQU8eIYjr52rryeIj1mbQvh070="/>
-            <menu:item id="i_lsrole_list" messageCode="global_menu_list" url="/lsroles?page=1&amp;size=${empty param.size ? 10 : param.size}" z="zSPyhLyoG501CR+jtEld7yKrcKg="/>
-            <menu:item id="fi_lsrole_lskindequals" messageCode="global_menu_find" url="/lsroles?find=ByLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="ytc0qbu7b0vYNHSN378+b2lf484="/>
-            <menu:item id="fi_lsrole_lstypeequals" messageCode="global_menu_find" url="/lsroles?find=ByLsTypeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="RaSqaLsLaLAUsiMXwvP2U+JByEE="/>
-            <menu:item id="fi_lsrole_lstypeequalsandlskindequals" messageCode="global_menu_find" url="/lsroles?find=ByLsTypeEqualsAndLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="vHACtm233J+ybSF7PCR+0z8JYN0="/>
-            <menu:item id="fi_lsrole_lstypeequalsandlskindequalsandrolenameequals" messageCode="global_menu_find" url="/lsroles?find=ByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="X3b5+W8wk1BGEZ8VsxfC85wexhE="/>
-            <menu:item id="fi_lsrole_lstypeequalsandrolenameequals" messageCode="global_menu_find" url="/lsroles?find=ByLsTypeEqualsAndRoleNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="b6/E4gzZdIcf+L+paDnM0w3zEOo="/>
-            <menu:item id="fi_lsrole_rolenameequals" messageCode="global_menu_find" url="/lsroles?find=ByRoleNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="vDeGKaQNwLs00xlJrs1wGLAu5PM="/>
-        </menu:category>
-        <menu:category id="c_itxsubjectcontainer" z="BaQsrD+kjFMrZewAHUS3zuOAi5Y=">
-            <menu:item id="i_itxsubjectcontainer_new" messageCode="global_menu_new" url="/itxsubjectcontainers?form" z="lH54X2DXqxeIYCECkvj7jkGYWgM="/>
-            <menu:item id="i_itxsubjectcontainer_list" messageCode="global_menu_list" url="/itxsubjectcontainers?page=1&amp;size=${empty param.size ? 10 : param.size}" z="hs/gBn4fWFBCf+lQ7YTqD/hu86U="/>
-            <menu:item id="fi_itxsubjectcontainer_codenameequals" messageCode="global_menu_find" url="/itxsubjectcontainers?find=ByCodeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="Hm3ZAXJu32iRnXiXXlIi0W4imQ4="/>
-            <menu:item id="fi_itxsubjectcontainer_container" messageCode="global_menu_find" url="/itxsubjectcontainers?find=ByContainer&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="5d2Qxsy3j/YgFavUqs18913K6rk="/>
-            <menu:item id="fi_itxsubjectcontainer_lstransactionequals" messageCode="global_menu_find" url="/itxsubjectcontainers?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="ePcmgaapU4YdbKby+zZWFeCxsXs="/>
-            <menu:item id="fi_itxsubjectcontainer_subject" messageCode="global_menu_find" url="/itxsubjectcontainers?find=BySubject&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="BXvyT6c/ISWxsxBiieFuNWIr30M="/>
-        </menu:category>
-        <menu:category id="c_applicationsetting" z="vQJTyUmf2U1KIbdu+Lo1OqSrfqQ=">
-            <menu:item id="i_applicationsetting_new" messageCode="global_menu_new" url="/applicationsettings?form" z="yTJFZ7lEGNwZU3modFJjEe4rvgg="/>
-            <menu:item id="i_applicationsetting_list" messageCode="global_menu_list" url="/applicationsettings?page=1&amp;size=${empty param.size ? 10 : param.size}" z="F1vEFUelWCe13ZKBrBCRMaMpCAE="/>
-            <menu:item id="fi_applicationsetting_propnameequals" messageCode="global_menu_find" url="/applicationsettings?find=ByPropNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="HcHpAxEBOnixB9WKm4i+Rm42sSE="/>
-            <menu:item id="fi_applicationsetting_propnameequalsandignorednot" messageCode="global_menu_find" url="/applicationsettings?find=ByPropNameEqualsAndIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="0UyLpppM9bPe84Ysubn+cZsBQHw="/>
-        </menu:category>
-        <menu:category id="c_subjectvalue" z="6SMWPdUodXL01WGzx30fZs5ZIOk=">
-            <menu:item id="i_subjectvalue_new" messageCode="global_menu_new" url="/subjectvalues?form" z="o8mLIzFTS9fohC7vjRXLXdeL8UE="/>
-            <menu:item id="i_subjectvalue_list" messageCode="global_menu_list" url="/subjectvalues?page=1&amp;size=${empty param.size ? 10 : param.size}" z="NwpiAooesA+SEm9UNL5Ow7AYVw4="/>
-            <menu:item id="fi_subjectvalue_codevalueequals" messageCode="global_menu_find" url="/subjectvalues?find=ByCodeValueEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="AsnUznxXaPNLczEY5D7hGNZEThM="/>
-            <menu:item id="fi_subjectvalue_ignorednotandcodevalueequals" messageCode="global_menu_find" url="/subjectvalues?find=ByIgnoredNotAndCodeValueEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="KIdx14YaH+4f5WZVpyq6N7F31vE="/>
-            <menu:item id="fi_subjectvalue_lsstate" messageCode="global_menu_find" url="/subjectvalues?find=ByLsState&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="tRW1NbJm+tw3aHHExxnI6p7uU6g="/>
-            <menu:item id="fi_subjectvalue_lsstateandlstypeequalsandlskindequals" messageCode="global_menu_find" url="/subjectvalues?find=ByLsStateAndLsTypeEqualsAndLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="d50+YURWrgHiYUjcbuLa6Vm3+q4="/>
-            <menu:item id="fi_subjectvalue_lstypeequalsandlskindequals" messageCode="global_menu_find" url="/subjectvalues?find=ByLsTypeEqualsAndLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="rsz0yWZRG9yumCOASDwMsPs3B4U="/>
-        </menu:category>
-        <menu:category id="c_saltformaliaskind" z="uWP0eYkofazwt44uqH7ObP58CPk=">
-            <menu:item id="i_saltformaliaskind_new" messageCode="global_menu_new" url="/saltformaliaskinds?form" z="lPt8mfOjhV5SjyM5or0dPuEwEo4="/>
-            <menu:item id="i_saltformaliaskind_list" messageCode="global_menu_list" url="/saltformaliaskinds?page=1&amp;size=${empty param.size ? 10 : param.size}" z="u6vuOJopCny1ZjUcSlihxJ+7zPM="/>
-        </menu:category>
-        <menu:category id="c_valuekind" z="9viZJ2aDVXUdiNwMWfcWAHDyag8=">
-            <menu:item id="i_valuekind_new" messageCode="global_menu_new" url="/valuekinds?form" z="2E2vA03Cv0nAAWiQXa0SyezClro="/>
-            <menu:item id="i_valuekind_list" messageCode="global_menu_list" url="/valuekinds?page=1&amp;size=${empty param.size ? 10 : param.size}" z="O28zOAw4SD/AOHia1EDIdoUuYR4="/>
-            <menu:item id="fi_valuekind_kindnameequalsandlstype" messageCode="global_menu_find" url="/valuekinds?find=ByKindNameEqualsAndLsType&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="pN3Ih5CbTObyQuZiaLl1XPSP3tA="/>
-            <menu:item id="fi_valuekind_lstype" messageCode="global_menu_find" url="/valuekinds?find=ByLsType&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="smqkLrmuQbGzdyggxOAJ208iS/E="/>
-        </menu:category>
-        <menu:category id="c_protocoltype" z="2CxVzLs9Tof8BxBl9ETGXtyMvsI=">
-            <menu:item id="i_protocoltype_new" messageCode="global_menu_new" url="/protocoltypes?form" z="7Z0Uyn35xcd4r6ul8eyd8hduLnY="/>
-            <menu:item id="i_protocoltype_list" messageCode="global_menu_list" url="/protocoltypes?page=1&amp;size=${empty param.size ? 10 : param.size}" z="F/bReZPXcStAo3Z0vR3lvVd/xns="/>
-            <menu:item id="fi_protocoltype_typenameequals" messageCode="global_menu_find" url="/protocoltypes?find=ByTypeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="wQyg5Dvz18CUeSaCZSVhwmXwKYk="/>
-        </menu:category>
-        <menu:category id="c_lsinteraction" z="g7NSeNQ6wo9tt/yta0QNpoYGGMo=">
-            <menu:item id="i_lsinteraction_new" messageCode="global_menu_new" url="/lsinteractions?form" z="4KEWKsvUsAOMrD1WrtfX7ZdpM4w="/>
-            <menu:item id="i_lsinteraction_list" messageCode="global_menu_list" url="/lsinteractions?page=1&amp;size=${empty param.size ? 10 : param.size}" z="V16Q7aunm54x1DENYIbscjzQmzs="/>
-        </menu:category>
-        <menu:category id="c_thingpage" z="eed7C8Q+FTeVMowmGZd27GbE3l0=">
-            <menu:item id="i_thingpage_new" messageCode="global_menu_new" url="/thingpages?form" z="AXcir9LqRdik2Eth3OeZJhmBCFQ="/>
-            <menu:item id="i_thingpage_list" messageCode="global_menu_list" url="/thingpages?page=1&amp;size=${empty param.size ? 10 : param.size}" z="UoXlSqZvyLI5Y/n+BTpracdv1Nw="/>
-        </menu:category>
-        <menu:category id="c_itxprotocolprotocolvalue" z="555vgfOT3Y115uZEQ8D2IetG+Do=">
-            <menu:item id="i_itxprotocolprotocolvalue_new" messageCode="global_menu_new" url="/itxprotocolprotocolvalues?form" z="c32BDszvdEtLScQVzWKW3qj7bSw="/>
-            <menu:item id="i_itxprotocolprotocolvalue_list" messageCode="global_menu_list" url="/itxprotocolprotocolvalues?page=1&amp;size=${empty param.size ? 10 : param.size}" z="HcSiFh69ErMhaCuhPWVvN3uKwOA="/>
-        </menu:category>
-        <menu:category id="c_unitkind" z="7YWBluDqoyAGJ4xzyVHzZLg6m7c=">
-            <menu:item id="i_unitkind_new" messageCode="global_menu_new" url="/unitkinds?form" z="GkwkeWRp6oEmEiokiC+TnTXLX6o="/>
-            <menu:item id="i_unitkind_list" messageCode="global_menu_list" url="/unitkinds?page=1&amp;size=${empty param.size ? 10 : param.size}" z="oraDJubVBV0e+O2voOs1obT2qB8="/>
-        </menu:category>
-        <menu:category id="c_parentaliaskind" z="U147h+OO6S1fP5Jcg/TZvkz5Iys=">
-            <menu:item id="i_parentaliaskind_new" messageCode="global_menu_new" url="/parentaliaskinds?form" z="i58ookxL/qdt0iXtCGbHhggh3gs="/>
-            <menu:item id="i_parentaliaskind_list" messageCode="global_menu_list" url="/parentaliaskinds?page=1&amp;size=${empty param.size ? 10 : param.size}" z="BMyJCAhga4yyuzifpodVs4tLO/4="/>
-        </menu:category>
-        <menu:category id="c_labelsequence" z="ejKZ7guZhfyvW84AnNefYohcs8I=">
-            <menu:item id="i_labelsequence_new" messageCode="global_menu_new" url="/labelsequences?form" z="nTXPvw/wtoW0pbK6xHA8Cuk68XM="/>
-            <menu:item id="i_labelsequence_list" messageCode="global_menu_list" url="/labelsequences?page=1&amp;size=${empty param.size ? 10 : param.size}" z="UgjjbATdvO/1WdtpamU/zsHd5FA="/>
-            <menu:item id="fi_labelsequence_labeltypeandkindequals" messageCode="global_menu_find" url="/labelsequences?find=ByLabelTypeAndKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="6hdHn+WO3sHUbgmmMvenXyS6kC0="/>
-            <menu:item id="fi_labelsequence_thingtypeandkindequals" messageCode="global_menu_find" url="/labelsequences?find=ByThingTypeAndKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="dk0oLxfrohW6goHjen+/SKRMM/w="/>
-            <menu:item id="fi_labelsequence_thingtypeandkindequalsandlabeltypeandkindequals" messageCode="global_menu_find" url="/labelsequences?find=ByThingTypeAndKindEqualsAndLabelTypeAndKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="9wGapon40hSwPwlm1eQDObmvCuw="/>
-            <menu:item id="fi_labelsequence_thingtypeandkindequalsandlabeltypeandkindequalsandlabelprefixequals" messageCode="global_menu_find" url="/labelsequences?find=ByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="OHqtdAUdxwUDLQhIFcVFrS0o5ZE="/>
-        </menu:category>
-        <menu:category id="c_subjectlabel" z="BncahBaSEdsCx0Rj9v+laWk/mmM=">
-            <menu:item id="i_subjectlabel_new" messageCode="global_menu_new" url="/subjectlabels?form" z="O12NqGQx2ex8wheKq0UWYVxK4e4="/>
-            <menu:item id="i_subjectlabel_list" messageCode="global_menu_list" url="/subjectlabels?page=1&amp;size=${empty param.size ? 10 : param.size}" z="pfyJDTBwU3rKDBdC/NMGL+83Lig="/>
-            <menu:item id="fi_subjectlabel_subject" messageCode="global_menu_find" url="/subjectlabels?find=BySubject&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="rjs6Z1u+0RJqrBZ4iIy8ji8p/TA="/>
-        </menu:category>
-        <menu:category id="c_interactiontype" z="q89Mq3tu7eGrb7XAKuNgtQEzPQs=">
-            <menu:item id="i_interactiontype_new" messageCode="global_menu_new" url="/interactiontypes?form" z="ONZQh0X/1hx+PnUklEua9dm9jBk="/>
-            <menu:item id="i_interactiontype_list" messageCode="global_menu_list" url="/interactiontypes?page=1&amp;size=${empty param.size ? 10 : param.size}" z="Wsr+nJVew+5nEyiqSiOmvTy8Zgg="/>
-        </menu:category>
-        <menu:category id="c_lotaliaskind" z="jyJInnbV1oEUFSc8dVcpMHv6GYU=">
-            <menu:item id="i_lotaliaskind_new" messageCode="global_menu_new" url="/lotaliaskinds?form" z="70JcpgQKJnM1f+bosxXSp1N2uUQ="/>
-            <menu:item id="i_lotaliaskind_list" messageCode="global_menu_list" url="/lotaliaskinds?page=1&amp;size=${empty param.size ? 10 : param.size}" z="UresvrBuxs0ZyhFkJZtCcJ6E0tY="/>
-        </menu:category>
-        <menu:category id="c_lsthing" z="1LY0tNInbjYQS0XBd+TI5c/Suyw=">
-            <menu:item id="i_lsthing_new" messageCode="global_menu_new" url="/lsthings?form" z="FkvjAHMnih2v+Eaijc3pAIivtmw="/>
-            <menu:item id="i_lsthing_list" messageCode="global_menu_list" url="/lsthings?page=1&amp;size=${empty param.size ? 10 : param.size}" z="KdnkBXuo2MoJ5nhgfl2rt3i2KCQ="/>
-            <menu:item id="fi_lsthing_codenameequals" messageCode="global_menu_find" url="/lsthings?find=ByCodeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="z+fIwg02u5tHxX78Qn59PY/p6J8="/>
-            <menu:item id="fi_lsthing_codenamelike" messageCode="global_menu_find" url="/lsthings?find=ByCodeNameLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="6y4TooMKiuhFMCqhE01hl42wxkM="/>
-            <menu:item id="fi_lsthing_lskindequals" messageCode="global_menu_find" url="/lsthings?find=ByLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="xeRasQ7UYUC60LvGWTAd96DQWzA="/>
-            <menu:item id="fi_lsthing_lskindlike" messageCode="global_menu_find" url="/lsthings?find=ByLsKindLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="0EJVnvUdmVUu8HO8eRuyi5AGlNs="/>
-            <menu:item id="fi_lsthing_lstransactionequals" messageCode="global_menu_find" url="/lsthings?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="xmL06JtkaQeufXP0+cmS4AWGL/Y="/>
-            <menu:item id="fi_lsthing_lstypeandkindequals" messageCode="global_menu_find" url="/lsthings?find=ByLsTypeAndKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="pj84ebOm7c+Z/4Rauka/lyUg9OE="/>
-            <menu:item id="fi_lsthing_lstypeequals" messageCode="global_menu_find" url="/lsthings?find=ByLsTypeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="b0c0OQhlNhBBY8rj7sljbd0u7do="/>
-            <menu:item id="fi_lsthing_lstypeequalsandlskindequals" messageCode="global_menu_find" url="/lsthings?find=ByLsTypeEqualsAndLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="IBdHNnHyEot4Lx55rY2vCLGSdQU="/>
-            <menu:item id="fi_lsthing_recordedbylike" messageCode="global_menu_find" url="/lsthings?find=ByRecordedByLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="Yr+6sbDVMSNOf0Ago/H8ISmQ5m4="/>
-            <menu:item id="fi_lsthing_recordeddategreaterthan" messageCode="global_menu_find" url="/lsthings?find=ByRecordedDateGreaterThan&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="uk5SwjdG5FHcCwUrlpN7cSnRtjA="/>
-            <menu:item id="fi_lsthing_recordeddatelessthan" messageCode="global_menu_find" url="/lsthings?find=ByRecordedDateLessThan&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="orIz5beGZ7i7sRXvK+J/Me/OX+Q="/>
-        </menu:category>
-        <menu:category id="c_experimentstate" z="CAM8rxPanB1GbvNfTSVqv0rHcAs=">
-            <menu:item id="i_experimentstate_new" messageCode="global_menu_new" url="/experimentstates?form" z="ZvFKfPK6qXFVXaxpx2LYviWtH2g="/>
-            <menu:item id="i_experimentstate_list" messageCode="global_menu_list" url="/experimentstates?page=1&amp;size=${empty param.size ? 10 : param.size}" z="7uoQbYWyv+4f8IK6w8HwCLmojYE="/>
-            <menu:item id="fi_experimentstate_experiment" messageCode="global_menu_find" url="/experimentstates?find=ByExperiment&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="xDz+7n0u9/2ID7TAwY2a4zP0et4="/>
-        </menu:category>
-        <menu:category id="c_filetype" z="ZtMAYMziwhKBWn1d7rJ2Z2qCTKU=">
-            <menu:item id="i_filetype_new" messageCode="global_menu_new" url="/filetypes?form" z="KgZDHotqr83ugmuhjsMTgMiEStM="/>
-            <menu:item id="i_filetype_list" messageCode="global_menu_list" url="/filetypes?page=1&amp;size=${empty param.size ? 10 : param.size}" z="zjaVtNqO4B+Z7hZrRGBmmy4y2x0="/>
-            <menu:item id="fi_filetype_codeequals" messageCode="global_menu_find" url="/filetypes?find=ByCodeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="8wavxGL4UqauQ9xjRXBYDYC7x3A="/>
-        </menu:category>
-        <menu:category id="c_protocolstate" z="nLEDhZIOQVG6OUhuigDx8vLJ6vg=">
-            <menu:item id="i_protocolstate_new" messageCode="global_menu_new" url="/protocolstates?form" z="KvfLrb/mSOWnvvQSWivXIoqtjZQ="/>
-            <menu:item id="i_protocolstate_list" messageCode="global_menu_list" url="/protocolstates?page=1&amp;size=${empty param.size ? 10 : param.size}" z="fSDj1dyhxj6hWiq5RKEtOSlUIaU="/>
-            <menu:item id="fi_protocolstate_lstransactionequals" messageCode="global_menu_find" url="/protocolstates?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="igxP2JZAqOO5oNO7cSYqWqJvqnA="/>
-            <menu:item id="fi_protocolstate_protocol" messageCode="global_menu_find" url="/protocolstates?find=ByProtocol&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="Od9BWcKRavkAZnk+dBloQNn+Rx4="/>
-        </menu:category>
-        <menu:category id="c_ddicttype" z="chrlf5slxhLU69oRtw0p3eAUcO8=">
-            <menu:item id="i_ddicttype_new" messageCode="global_menu_new" url="/ddicttypes?form" z="rNkCTFSaQ+VZ5Iw6eE8XjLb6O/Q="/>
-            <menu:item id="i_ddicttype_list" messageCode="global_menu_list" url="/ddicttypes?page=1&amp;size=${empty param.size ? 10 : param.size}" z="KgBIOkyA9YuvjIhRyd+WcD6nejM="/>
-            <menu:item id="fi_ddicttype_nameequals" messageCode="global_menu_find" url="/ddicttypes?find=ByNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="Msl3NKJ+YO/nSo3JYuuWH4GGn/k="/>
-        </menu:category>
-        <menu:category id="c_lot" z="ucbKGM+G4L4FklLghsh8to1Aowc=">
-            <menu:item id="i_lot_new" messageCode="global_menu_new" url="/lots?form" z="XvSv2sGLoewz46xyNnF6PAfmkMg="/>
-            <menu:item id="i_lot_list" messageCode="global_menu_list" url="/lots?page=1&amp;size=${empty param.size ? 10 : param.size}" z="kSBOYic4fT5BmdOTtxQumCZtsvM="/>
-            <menu:item id="fi_lot_buid" messageCode="global_menu_find" url="/lots?find=ByBuid&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="39SWleDfg+Ckyv3e/AfLRjEWOYQ="/>
-            <menu:item id="fi_lot_bulkloadfileequals" messageCode="global_menu_find" url="/lots?find=ByBulkLoadFileEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="+Ldxdlg0Ao6gB0uvoX0D0/3AL7w="/>
-            <menu:item id="fi_lot_chemistandsynthesisdatebetween" messageCode="global_menu_find" url="/lots?find=ByChemistAndSynthesisDateBetween&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="H+cRPHEBNQcKEsDiYjeiR5tI1Zk="/>
-            <menu:item id="fi_lot_corpnameequals" messageCode="global_menu_find" url="/lots?find=ByCorpNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="tbzVcJkWoFqRxALPz08OM88kWbw="/>
-            <menu:item id="fi_lot_corpnamelike" messageCode="global_menu_find" url="/lots?find=ByCorpNameLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="t/At1XOXR+0dJM6RUcKezNQ5Bfo="/>
-            <menu:item id="fi_lot_isvirtualnot" messageCode="global_menu_find" url="/lots?find=ByIsVirtualNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="N3sANe+KfMbNGRF7GTfZS4Birb8="/>
-            <menu:item id="fi_lot_notebookpageequals" messageCode="global_menu_find" url="/lots?find=ByNotebookPageEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="gSlxUyYJqfGuDgjgRvs3MVbCJ7w="/>
-            <menu:item id="fi_lot_notebookpageequalsandignorenot" messageCode="global_menu_find" url="/lots?find=ByNotebookPageEqualsAndIgnoreNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="jrZ94FqKz9y4Z8BEY8zK2ReFoPY="/>
-            <menu:item id="fi_lot_saltform" messageCode="global_menu_find" url="/lots?find=BySaltForm&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="/qwE9yANQKNpNjKTCuDszGczKs0="/>
-            <menu:item id="fi_lot_synthesisdatebetween" messageCode="global_menu_find" url="/lots?find=BySynthesisDateBetween&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="DS6yYr2rn7M7xcDXSSKGxFmA0Sc="/>
-            <menu:item id="fi_lot_synthesisdategreaterthan" messageCode="global_menu_find" url="/lots?find=BySynthesisDateGreaterThan&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="TkGC/ENU/YQGLRuVAPYqTkRFUlw="/>
-            <menu:item id="fi_lot_synthesisdatelessthan" messageCode="global_menu_find" url="/lots?find=BySynthesisDateLessThan&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="v+XVauxBYQl5e87fae60Oe++ho4="/>
-        </menu:category>
-        <menu:category id="c_stereocategory" z="yAJZtH9Q4SHIz5TRD7p3JrVhXg8=">
-            <menu:item id="i_stereocategory_new" messageCode="global_menu_new" url="/stereocategorys?form" z="trKta9BiDm4PjPwsPoRUoyg9g0w="/>
-            <menu:item id="i_stereocategory_list" messageCode="global_menu_list" url="/stereocategorys?page=1&amp;size=${empty param.size ? 10 : param.size}" z="sLSTkD9W4fteJyy3aAX8vRJ8rA0="/>
-            <menu:item id="fi_stereocategory_codeequals" messageCode="global_menu_find" url="/stereocategorys?find=ByCodeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="LDPrAb3m3AKlp6DBcOHDGq1Qm40="/>
-            <menu:item id="fi_stereocategory_codelike" messageCode="global_menu_find" url="/stereocategorys?find=ByCodeLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="CFf2tJFxNNj5KP5geBtxHsRYHVA="/>
-        </menu:category>
-        <menu:category id="c_analysisgroupvalue" z="TALjWgJQGdT/a00QjGfLnbKvuKM=">
-            <menu:item id="i_analysisgroupvalue_new" messageCode="global_menu_new" url="/analysisgroupvalues?form" z="9K8ZUQutSoY0r/xG5JjETerXsrA="/>
-            <menu:item id="i_analysisgroupvalue_list" messageCode="global_menu_list" url="/analysisgroupvalues?page=1&amp;size=${empty param.size ? 10 : param.size}" z="2mdguxpGcs2U9FRwNW9zlDXVKDY="/>
-            <menu:item id="fi_analysisgroupvalue_codevalueequals" messageCode="global_menu_find" url="/analysisgroupvalues?find=ByCodeValueEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="Wt6aIq88UMtAQ8hvY33IaiayqPc="/>
-            <menu:item id="fi_analysisgroupvalue_ignorednotandcodevalueequals" messageCode="global_menu_find" url="/analysisgroupvalues?find=ByIgnoredNotAndCodeValueEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="RC1MbF0WmyQO73khEHFTR9NvbOI="/>
-            <menu:item id="fi_analysisgroupvalue_lsstate" messageCode="global_menu_find" url="/analysisgroupvalues?find=ByLsState&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="Ji3BQP7ejmyO21Qv9iJWolKKjYs="/>
-            <menu:item id="fi_analysisgroupvalue_lstransactionequals" messageCode="global_menu_find" url="/analysisgroupvalues?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="BA6g98D3e0e0D6b3zh8mHClvfQU="/>
-            <menu:item id="fi_analysisgroupvalue_lstypeequalsandlskindequals" messageCode="global_menu_find" url="/analysisgroupvalues?find=ByLsTypeEqualsAndLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="LLIU5mdBfU2sHnFgcHzCIgh5gcU="/>
-            <menu:item id="fi_analysisgroupvalue_lstypeequalsandlskindequalsandstringvaluelikeandignorednot" messageCode="global_menu_find" url="/analysisgroupvalues?find=ByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="ssdwEvbR+1sQ97TN3awNEh/39lE="/>
-        </menu:category>
-        <menu:category id="c_isotope" z="Lb3o5nafeVE/VEzcrbGtNgxI1Gw=">
-            <menu:item id="i_isotope_new" messageCode="global_menu_new" url="/isotopes?form" z="v5077+SfRgbthIoVGsPAu1HyiSo="/>
-            <menu:item id="i_isotope_list" messageCode="global_menu_list" url="/isotopes?page=1&amp;size=${empty param.size ? 10 : param.size}" z="CxHGF61wygqCLpfCatHyGZE/yVs="/>
-            <menu:item id="fi_isotope_abbrevequals" messageCode="global_menu_find" url="/isotopes?find=ByAbbrevEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="8/nfUu+qQhBqBFdopPzc9Nrkluo="/>
-            <menu:item id="fi_isotope_abbrevequalsandnameequals" messageCode="global_menu_find" url="/isotopes?find=ByAbbrevEqualsAndNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="fOg34F5KJiKaKVly9SMGsnKkCJA="/>
-            <menu:item id="fi_isotope_nameequals" messageCode="global_menu_find" url="/isotopes?find=ByNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="9UN/HbJMq+lLqRKA+S2WDGYNRp4="/>
-        </menu:category>
-        <menu:category id="c_analysisgrouplabel" z="CR7Phq3TQv78PVuDP7Y/2WuZHKQ=">
-            <menu:item id="i_analysisgrouplabel_new" messageCode="global_menu_new" url="/analysisgrouplabels?form" z="WRYpKhGrRn15PHadj0ljcsF4sy4="/>
-            <menu:item id="i_analysisgrouplabel_list" messageCode="global_menu_list" url="/analysisgrouplabels?page=1&amp;size=${empty param.size ? 10 : param.size}" z="OUHJBGoWscu22Z5s3dAJKDWIlCk="/>
-            <menu:item id="fi_analysisgrouplabel_analysisgroup" messageCode="global_menu_find" url="/analysisgrouplabels?find=ByAnalysisGroup&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="hFMNKxrTMAcD/x0jLYQsTSkuRw8="/>
-            <menu:item id="fi_analysisgrouplabel_lstransactionequals" messageCode="global_menu_find" url="/analysisgrouplabels?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="DU9iFaE/Fnyx2mEzIfvDvEXjBmc="/>
-        </menu:category>
-        <menu:category id="c_treatmentgrouplabel" z="M25GmMAOZgXnpUGLXGdWZzjBKwM=">
-            <menu:item id="i_treatmentgrouplabel_new" messageCode="global_menu_new" url="/treatmentgrouplabels?form" z="sM2bs+bTfWIwnBAsnUNR62U9B90="/>
-            <menu:item id="i_treatmentgrouplabel_list" messageCode="global_menu_list" url="/treatmentgrouplabels?page=1&amp;size=${empty param.size ? 10 : param.size}" z="LBpKaImU+i7/pKrGdVLeP3zmBI0="/>
-            <menu:item id="fi_treatmentgrouplabel_lstransactionequals" messageCode="global_menu_find" url="/treatmentgrouplabels?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="10Avee9Zm5xoXvOb/1TLDKIWglY="/>
-            <menu:item id="fi_treatmentgrouplabel_treatmentgroup" messageCode="global_menu_find" url="/treatmentgrouplabels?find=ByTreatmentGroup&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="iPADywIWD9Rg+z28PsJoh4zbxcs="/>
-        </menu:category>
-        <menu:category id="c_containerkind" z="R0IbW9UM3ju0KF+SZjlHY4SydqI=">
-            <menu:item id="i_containerkind_new" messageCode="global_menu_new" url="/containerkinds?form" z="1yQxKmhMIhtT9OkzCmBK/h6UeNc="/>
-            <menu:item id="i_containerkind_list" messageCode="global_menu_list" url="/containerkinds?page=1&amp;size=${empty param.size ? 10 : param.size}" z="dEwp6G94yRxBc2iHyjXrYRgTehc="/>
-        </menu:category>
-        <menu:category id="c_labelkind" z="nxWuIyqJmw5YKN1+lHjrDoZTnE4=">
-            <menu:item id="i_labelkind_new" messageCode="global_menu_new" url="/labelkinds?form" z="8uvydylrs1B4Eq5jykzu57V+ewg="/>
-            <menu:item id="i_labelkind_list" messageCode="global_menu_list" url="/labelkinds?page=1&amp;size=${empty param.size ? 10 : param.size}" z="w5seApgTjql0/NmLpY0D6xoquAk="/>
-            <menu:item id="fi_labelkind_kindnameequals" messageCode="global_menu_find" url="/labelkinds?find=ByKindNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="unhDW3Nz/+3lncgx6X2Oou3SQmM="/>
-            <menu:item id="fi_labelkind_kindnameequalsandlstype" messageCode="global_menu_find" url="/labelkinds?find=ByKindNameEqualsAndLsType&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="NUz2GzkbDUbreBzDfRCWb7KNcpk="/>
-            <menu:item id="fi_labelkind_lstype" messageCode="global_menu_find" url="/labelkinds?find=ByLsType&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="fJOfInTpI/9RScCuu2XYHGIWoF0="/>
-        </menu:category>
-        <menu:category id="c_analysisgroupstate" z="iWZrNbLjCdJwFSJLyn/FNGjMpeQ=">
-            <menu:item id="i_analysisgroupstate_new" messageCode="global_menu_new" url="/analysisgroupstates?form" z="TZjDw5kV1aMgHZc7aH+dV+wGFNY="/>
-            <menu:item id="i_analysisgroupstate_list" messageCode="global_menu_list" url="/analysisgroupstates?page=1&amp;size=${empty param.size ? 10 : param.size}" z="+c6SxQdchuqmmpTuPtgYFpUl2NI="/>
-            <menu:item id="fi_analysisgroupstate_analysisgroup" messageCode="global_menu_find" url="/analysisgroupstates?find=ByAnalysisGroup&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="AFYApUD2u7hIaILyWMHGwyLwj9M="/>
-            <menu:item id="fi_analysisgroupstate_analysisgroupandlstypeequalsandlskindequalsandignorednot" messageCode="global_menu_find" url="/analysisgroupstates?find=ByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="5mVMAbJnljuvwUUdZCum7SO+I4M="/>
-            <menu:item id="fi_analysisgroupstate_lstransactionequals" messageCode="global_menu_find" url="/analysisgroupstates?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="VTrYOpDoAPwWNMkFvY6ORoT9zGI="/>
-            <menu:item id="fi_analysisgroupstate_lstypeandkindequals" messageCode="global_menu_find" url="/analysisgroupstates?find=ByLsTypeAndKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="i8pH4QEHyn1w0H9mLbnq4eH3xFA="/>
-            <menu:item id="fi_analysisgroupstate_lstypeequalsandlskindequals" messageCode="global_menu_find" url="/analysisgroupstates?find=ByLsTypeEqualsAndLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="T80U83E87zMAa1KOgTz+ahHSENU="/>
-        </menu:category>
-        <menu:category id="c_interactionkind" z="Lukv+RaTaunp0b1iZpWJA3c3WEc=">
-            <menu:item id="i_interactionkind_new" messageCode="global_menu_new" url="/interactionkinds?form" z="8lXF1VyJXAKPIuYTNm/wMdO1BZ0="/>
-            <menu:item id="i_interactionkind_list" messageCode="global_menu_list" url="/interactionkinds?page=1&amp;size=${empty param.size ? 10 : param.size}" z="CtxphtQyzAets/UTsubpFvTxVss="/>
-        </menu:category>
-        <menu:category id="c_author" z="DETG4XqcVC9sb/BVL/ybUSG8lUM=">
-            <menu:item id="i_author_new" messageCode="global_menu_new" url="/authors?form" z="e6WikSiFx46UnQunBmCd54pmrYE="/>
-            <menu:item id="i_author_list" messageCode="global_menu_list" url="/authors?page=1&amp;size=${empty param.size ? 10 : param.size}" z="/71/+sYxLDw3jeyTZyEHzZ9CQQQ="/>
-            <menu:item id="fi_author_activationkeyandemailaddress" messageCode="global_menu_find" url="/authors?find=ByActivationKeyAndEmailAddress&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="z2s+vAc94sDhaJZF3PWJsUvO6Dw="/>
-            <menu:item id="fi_author_emailaddress" messageCode="global_menu_find" url="/authors?find=ByEmailAddress&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="ZUKkEp77eYSn2bIAkaVDksrUVlk="/>
-            <menu:item id="fi_author_username" messageCode="global_menu_find" url="/authors?find=ByUserName&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="tlskrcOTx1Cr3BemkcaNOGZfpyg="/>
-        </menu:category>
-        <menu:category id="c_treatmentgroupstate" z="iKwmclsd7RJgWkfh/qnV5xRrEE8=">
-            <menu:item id="i_treatmentgroupstate_new" messageCode="global_menu_new" url="/treatmentgroupstates?form" z="/7irJSTBd7nNvpASy6BQuAp0z70="/>
-            <menu:item id="i_treatmentgroupstate_list" messageCode="global_menu_list" url="/treatmentgroupstates?page=1&amp;size=${empty param.size ? 10 : param.size}" z="8nWJGqJRM3wIEkxGDkDpCND5+GY="/>
-            <menu:item id="fi_treatmentgroupstate_lstransactionequals" messageCode="global_menu_find" url="/treatmentgroupstates?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="iMWwUvNsWlZggVLPNdikPM2Y9Jc="/>
-            <menu:item id="fi_treatmentgroupstate_lstypeandkindequals" messageCode="global_menu_find" url="/treatmentgroupstates?find=ByLsTypeAndKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="moxI8Av48F5KNLSS+81kEwBL9mc="/>
-            <menu:item id="fi_treatmentgroupstate_treatmentgroup" messageCode="global_menu_find" url="/treatmentgroupstates?find=ByTreatmentGroup&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="+/zIgpDT2EIJcBREaOQ+qPQopX4="/>
-        </menu:category>
-        <menu:category id="c_filelist" z="8ZjbNY11aqemS9/Ex24UebKawwo=">
-            <menu:item id="i_filelist_new" messageCode="global_menu_new" url="/filelists?form" z="T5zFpWbm4xPcs0m2oX0k7C0CCJw="/>
-            <menu:item id="i_filelist_list" messageCode="global_menu_list" url="/filelists?page=1&amp;size=${empty param.size ? 10 : param.size}" z="V1RYn6ReH9SSees3BlAu+js09r0="/>
-            <menu:item id="fi_filelist_lot" messageCode="global_menu_find" url="/filelists?find=ByLot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="/WwkZZETne1BJGJpkdb157Psa2c="/>
-            <menu:item id="fi_filelist_urlequals" messageCode="global_menu_find" url="/filelists?find=ByUrlEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="vxoq0X6tTQ7OzHg1xIiwOQS+sv0="/>
-        </menu:category>
-        <menu:category id="c_codekind" z="NYRcfkld7mu20sxgSj7+wOq9gtE=">
-            <menu:item id="i_codekind_new" messageCode="global_menu_new" url="/codekinds?form" z="PxHXDeTFNJ98VlOzu/ti0RZ1R1A="/>
-            <menu:item id="i_codekind_list" messageCode="global_menu_list" url="/codekinds?page=1&amp;size=${empty param.size ? 10 : param.size}" z="Bcm44APTBPFjR9NI/5T+mW/jQxc="/>
-            <menu:item id="fi_codekind_kindnameequalsandlstype" messageCode="global_menu_find" url="/codekinds?find=ByKindNameEqualsAndLsType&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="p/KmJRAGOl6tGeTiHaW+XGeMYck="/>
-            <menu:item id="fi_codekind_lstype" messageCode="global_menu_find" url="/codekinds?find=ByLsType&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="ynSxRdJg1IrmMAu0zWqs8HuawfU="/>
-            <menu:item id="fi_codekind_lstypeandkindequals" messageCode="global_menu_find" url="/codekinds?find=ByLsTypeAndKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="6IJrLbM8SjEsmURufcATozWWH10="/>
-        </menu:category>
-        <menu:category id="c_lotaliastype" z="HBaXLuA5/W6TFiqH7AutOMpJG0U=">
-            <menu:item id="i_lotaliastype_new" messageCode="global_menu_new" url="/lotaliastypes?form" z="Ap05dqWute6GkrvsvbL82R3tFpE="/>
-            <menu:item id="i_lotaliastype_list" messageCode="global_menu_list" url="/lotaliastypes?page=1&amp;size=${empty param.size ? 10 : param.size}" z="3xOlLWoMPwrCl25j4BZDTWWc3Dk="/>
-        </menu:category>
-        <menu:category id="c_itxlsthinglsthing" z="8Gc/rkZ1RT71J+B3ubM/dh2H9VE=">
-            <menu:item id="i_itxlsthinglsthing_new" messageCode="global_menu_new" url="/itxlsthinglsthings?form" z="Sv7z8vH12pw4uXJL4KvD5bntOUk="/>
-            <menu:item id="i_itxlsthinglsthing_list" messageCode="global_menu_list" url="/itxlsthinglsthings?page=1&amp;size=${empty param.size ? 10 : param.size}" z="dTBbXYSN3UodAC+gzSIDn7jQ2LQ="/>
-            <menu:item id="fi_itxlsthinglsthing_codenameequals" messageCode="global_menu_find" url="/itxlsthinglsthings?find=ByCodeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="qzFOuXq9heDkxPAtet/C1krz9DI="/>
-            <menu:item id="fi_itxlsthinglsthing_firstlsthing" messageCode="global_menu_find" url="/itxlsthinglsthings?find=ByFirstLsThing&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="HgqnCAu8wy3ajd3lDYC1igVAPRM="/>
-            <menu:item id="fi_itxlsthinglsthing_secondlsthing" messageCode="global_menu_find" url="/itxlsthinglsthings?find=BySecondLsThing&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="iWbqPYvTwln4j0YwyMDYNReeapY="/>
-        </menu:category>
-        <menu:category id="c_parentalias" z="ySZIUwnyeFj9Qbed4j92lUlc3Fg=">
-            <menu:item id="i_parentalias_new" messageCode="global_menu_new" url="/parentaliases?form" z="7m7jOxS/Kq3XrrtUZy9IvBxhO10="/>
-            <menu:item id="i_parentalias_list" messageCode="global_menu_list" url="/parentaliases?page=1&amp;size=${empty param.size ? 10 : param.size}" z="WI7MUG6wdygjnVfcZzwC6E4syNM="/>
-            <menu:item id="fi_parentalias_aliasnameequals" messageCode="global_menu_find" url="/parentaliases?find=ByAliasNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="rRE78zjA6mg+IWAAPMfjS7xS65U="/>
-            <menu:item id="fi_parentalias_aliasnameequalsandlstypeequalsandlskindequals" messageCode="global_menu_find" url="/parentaliases?find=ByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="9zt66MzfFVmkN9mRuvm16RCe20s="/>
-            <menu:item id="fi_parentalias_parent" messageCode="global_menu_find" url="/parentaliases?find=ByParent&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="TeasU75mfP4kzPs2h9Tw8q6allY="/>
-            <menu:item id="fi_parentalias_parentandlstypeequalsandlskindequals" messageCode="global_menu_find" url="/parentaliases?find=ByParentAndLsTypeEqualsAndLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="HsxduslvcwnYrW81fGXY2H5PH6U="/>
-            <menu:item id="fi_parentalias_parentandlstypeequalsandlskindequalsandaliasnameequals" messageCode="global_menu_find" url="/parentaliases?find=ByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="LpE4fCHUJThaxQItTfolHiRT9lA="/>
-        </menu:category>
-        <menu:category id="c_bulkloadfile" z="n3KtRzDZvUfT6OTFOVo2E4rShtU=">
-            <menu:item id="i_bulkloadfile_new" messageCode="global_menu_new" url="/bulkloadfiles?form" z="zMmy94H4QuLsagVMxhQwbSPCJzY="/>
-            <menu:item id="i_bulkloadfile_list" messageCode="global_menu_list" url="/bulkloadfiles?page=1&amp;size=${empty param.size ? 10 : param.size}" z="v/nryDWAAhhkgm4xc+dtthJBbkw="/>
-            <menu:item id="fi_bulkloadfile_filenameequals" messageCode="global_menu_find" url="/bulkloadfiles?find=ByFileNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="vUDqX4AHjmBBO5ELUhd35jq9gsE="/>
-            <menu:item id="fi_bulkloadfile_recordedbyequals" messageCode="global_menu_find" url="/bulkloadfiles?find=ByRecordedByEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="pqYjFStgDULOEPX/XuQLH9fqqls="/>
-        </menu:category>
-        <menu:category id="c_containerlabel" z="zFf2aZfRTCDXPLL7QFhJk2gdfTg=">
-            <menu:item id="i_containerlabel_new" messageCode="global_menu_new" url="/containerlabels?form" z="oM3EkEpN0g8wiRYBFWx4sZGwps4="/>
-            <menu:item id="i_containerlabel_list" messageCode="global_menu_list" url="/containerlabels?page=1&amp;size=${empty param.size ? 10 : param.size}" z="S/nVuvdie9mdWAwQCBXtfFSLdPM="/>
-            <menu:item id="fi_containerlabel_containerandignorednot" messageCode="global_menu_find" url="/containerlabels?find=ByContainerAndIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="c407gnjN+SlScUZxpZmuELN/mmA="/>
-            <menu:item id="fi_containerlabel_labeltextequalsandignorednot" messageCode="global_menu_find" url="/containerlabels?find=ByLabelTextEqualsAndIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="/AtVCbIuG4Rx4FzH/NOZhf+odbM="/>
-            <menu:item id="fi_containerlabel_lstransactionequals" messageCode="global_menu_find" url="/containerlabels?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="ZvAKO/n9azMoVFVNNtUzDyN9yD4="/>
-            <menu:item id="fi_containerlabel_lstypeequalsandlabeltextequalsandignorednot" messageCode="global_menu_find" url="/containerlabels?find=ByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="9lNbkqHEF1z6IhOhjbG9r4cCEms="/>
-        </menu:category>
-        <menu:category id="c_itxlsthinglsthingvalue" z="16NynK8hvte1Jz5OlnZk7yx2Cws=">
-            <menu:item id="i_itxlsthinglsthingvalue_new" messageCode="global_menu_new" url="/itxlsthinglsthingvalues?form" z="lSlbM5i6/TIvqxkWP3izDKm7cSg="/>
-            <menu:item id="i_itxlsthinglsthingvalue_list" messageCode="global_menu_list" url="/itxlsthinglsthingvalues?page=1&amp;size=${empty param.size ? 10 : param.size}" z="QV3L2KdCFiwrC4kWB3x3GthgZks="/>
-        </menu:category>
-        <menu:category id="c_containertype" z="lIn8JrrOqLZEoWuvjF5bv9D0gBs=">
-            <menu:item id="i_containertype_new" messageCode="global_menu_new" url="/containertypes?form" z="tdEzAD1RNQP3GYsw2jecLOntccA="/>
-            <menu:item id="i_containertype_list" messageCode="global_menu_list" url="/containertypes?page=1&amp;size=${empty param.size ? 10 : param.size}" z="6gKJRv1jsnvFi6gMbKFfSxErc6w="/>
-            <menu:item id="fi_containertype_typenameequals" messageCode="global_menu_find" url="/containertypes?find=ByTypeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="vwgAWd2IyIzyCuJkPcPokhLTApI="/>
-        </menu:category>
-        <menu:category id="c_itxlsthinglsthingstate" z="dacFM2W4nNstoyJUE8ZhmtUcl+o=">
-            <menu:item id="i_itxlsthinglsthingstate_new" messageCode="global_menu_new" url="/itxlsthinglsthingstates?form" z="URYzXejwc0AbOnmQGDN6sxGn1lA="/>
-            <menu:item id="i_itxlsthinglsthingstate_list" messageCode="global_menu_list" url="/itxlsthinglsthingstates?page=1&amp;size=${empty param.size ? 10 : param.size}" z="iJT8vqWzUsI32g9p3HD98Dus48A="/>
-        </menu:category>
-        <menu:category id="c_experimentlabel" z="/OtfTArcZoLVbM+za1A3M+tikNU=">
-            <menu:item id="i_experimentlabel_new" messageCode="global_menu_new" url="/experimentlabels?form" z="AUJwaIFjrQj6C0qw/IP+IOeWGQU="/>
-            <menu:item id="i_experimentlabel_list" messageCode="global_menu_list" url="/experimentlabels?page=1&amp;size=${empty param.size ? 10 : param.size}" z="oO1z+PebW0K/PEf8XDbfx1/E1I4="/>
-            <menu:item id="fi_experimentlabel_experiment" messageCode="global_menu_find" url="/experimentlabels?find=ByExperiment&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="GvjCTnxN68B/P62GkPr34qJpd+w="/>
-            <menu:item id="fi_experimentlabel_experimentandignorednot" messageCode="global_menu_find" url="/experimentlabels?find=ByExperimentAndIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="l5NAX1K/DXIZ/NR6M5h5FxAxsyE="/>
-            <menu:item id="fi_experimentlabel_labeltextlike" messageCode="global_menu_find" url="/experimentlabels?find=ByLabelTextLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="ANT/S1/CjSyB4HwbNMybQ6A5pfY="/>
-            <menu:item id="fi_experimentlabel_labeltextlikeandlstypeandkindequalsandpreferrednotandignorednot" messageCode="global_menu_find" url="/experimentlabels?find=ByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="vtmmFZF5c8zweWypatE0pN5KsyQ="/>
-            <menu:item id="fi_experimentlabel_lstypeandkindequalsandpreferrednotandignorednot" messageCode="global_menu_find" url="/experimentlabels?find=ByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="IHRWGrTaDA9drwwIO5gGFDp/j2k="/>
-        </menu:category>
-        <menu:category id="c_tempselecttable" z="X1VdlsMzutg1uw93oy02+OHwRJ8=">
-            <menu:item id="i_tempselecttable_new" messageCode="global_menu_new" url="/tempselecttables?form" z="REvglWHZ9RFYNQ1s3bw3Evu1juo="/>
-            <menu:item id="i_tempselecttable_list" messageCode="global_menu_list" url="/tempselecttables?page=1&amp;size=${empty param.size ? 10 : param.size}" z="jk60q6lP0txw1soEaJqLnhTg3hU="/>
-        </menu:category>
-        <menu:category id="c_lstransaction" z="U0NaXo+9gg292dbIsM3ERr7ucbM=">
-            <menu:item id="i_lstransaction_new" messageCode="global_menu_new" url="/lstransactions?form" z="kAHkjx8THLjMG4bFs1J3s3QPjL8="/>
-            <menu:item id="i_lstransaction_list" messageCode="global_menu_list" url="/lstransactions?page=1&amp;size=${empty param.size ? 10 : param.size}" z="09jXBA/DFmg58fysyYaRNDBwbXI="/>
-        </menu:category>
-        <menu:category id="c_labeltype" z="N8HQyjbykD6W9LoCKQZIeZH669c=">
-            <menu:item id="i_labeltype_new" messageCode="global_menu_new" url="/labeltypes?form" z="NA0WmB9TJCcpOjZtG3BmHvySe3I="/>
-            <menu:item id="i_labeltype_list" messageCode="global_menu_list" url="/labeltypes?page=1&amp;size=${empty param.size ? 10 : param.size}" z="uT3NbeaM8YOAE8IO0yJvLef3Src="/>
-            <menu:item id="fi_labeltype_typenameequals" messageCode="global_menu_find" url="/labeltypes?find=ByTypeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="ajC/3ioqToUqe6EMdEBiozQmM28="/>
-        </menu:category>
-        <menu:category id="c_cmpdregappsetting" z="koy8vPpUsfb25+J05tGwWzry0JE=">
-            <menu:item id="i_cmpdregappsetting_new" messageCode="global_menu_new" url="/cmpdregappsettings?form" z="au9XaWogdPQMlv6B29VXd8yXbTo="/>
-            <menu:item id="i_cmpdregappsetting_list" messageCode="global_menu_list" url="/cmpdregappsettings?page=1&amp;size=${empty param.size ? 10 : param.size}" z="E2/UtElA8zn0/iBWPy3EtS6DJ3A="/>
-        </menu:category>
-        <menu:category id="c_vendor" z="Xx4JxoRV1mz6Kt9DuTWCt02UTQs=">
-            <menu:item id="i_vendor_new" messageCode="global_menu_new" url="/vendors?form" z="5DUNHCgAaFlQsUsHrIfmstuWxPM="/>
-            <menu:item id="i_vendor_list" messageCode="global_menu_list" url="/vendors?page=1&amp;size=${empty param.size ? 10 : param.size}" z="PaHIFalbQwm47Wrz8iGe8DCcyXI="/>
-            <menu:item id="fi_vendor_codeequals" messageCode="global_menu_find" url="/vendors?find=ByCodeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="69IaDPJSu71IVkN+va/S676ad1k="/>
-            <menu:item id="fi_vendor_codelike" messageCode="global_menu_find" url="/vendors?find=ByCodeLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="F5O/oxpbL9hdNr/GN/OwdQ5No8M="/>
-            <menu:item id="fi_vendor_nameequals" messageCode="global_menu_find" url="/vendors?find=ByNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="a/DllJTHIcCZkLeDzkP9ZBAMzM8="/>
-            <menu:item id="fi_vendor_namelike" messageCode="global_menu_find" url="/vendors?find=ByNameLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="nC7kVGkTqmTfIlPPCNoUTjfZbW8="/>
-        </menu:category>
-        <menu:category id="c_authorlabel" z="sJF8F4gD+aqm5mM+UHEgh+lQkNw=">
-            <menu:item id="i_authorlabel_new" messageCode="global_menu_new" url="/authorlabels?form" z="A77Xm/veq+3sAkX9frZK2TTZTYs="/>
-            <menu:item id="i_authorlabel_list" messageCode="global_menu_list" url="/authorlabels?page=1&amp;size=${empty param.size ? 10 : param.size}" z="sv+6kax7agMiOw1CNAT2OEnnWEA="/>
-        </menu:category>
-        <menu:category id="c_protocollabel" z="AntdInfd0A614Cu4gbB3AbV0QTY=">
-            <menu:item id="i_protocollabel_new" messageCode="global_menu_new" url="/protocollabels?form" z="E0dKFpwAYLlpAN8QOblz0zWuUYM="/>
-            <menu:item id="i_protocollabel_list" messageCode="global_menu_list" url="/protocollabels?page=1&amp;size=${empty param.size ? 10 : param.size}" z="r2NAvSYe1XIHoaOfSAh9wQ/duP0="/>
-            <menu:item id="fi_protocollabel_labeltextequalsandignorednot" messageCode="global_menu_find" url="/protocollabels?find=ByLabelTextEqualsAndIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="31/ik2adQ3wJNX0/upvPdEsFKFE="/>
-            <menu:item id="fi_protocollabel_labeltextlike" messageCode="global_menu_find" url="/protocollabels?find=ByLabelTextLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="A02n1/FzAl3DjXwG1VhwLYUmHno="/>
-            <menu:item id="fi_protocollabel_lstransactionequals" messageCode="global_menu_find" url="/protocollabels?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="fMuwzMwYfD+AMyi1uwkZTSrD/BU="/>
-            <menu:item id="fi_protocollabel_protocol" messageCode="global_menu_find" url="/protocollabels?find=ByProtocol&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="Vvtc1tKCPjG+n4JPsKYtbAPaeTE="/>
-        </menu:category>
-        <menu:category id="c_corpname" z="WfnWIJFteCRmukJJxUTymEZhEKQ=">
-            <menu:item id="i_corpname_new" messageCode="global_menu_new" url="/corpnames?form" z="9Y7Fue+tBb3JgAcm0ra2eyymgrU="/>
-            <menu:item id="i_corpname_list" messageCode="global_menu_list" url="/corpnames?page=1&amp;size=${empty param.size ? 10 : param.size}" z="gvD4EmjmKU/cqBTDDHYf9+gAo2w="/>
-        </menu:category>
-        <menu:category id="c_ddictkind" z="yHaefGubr62nUhD/k83b8i8XzOA=">
-            <menu:item id="i_ddictkind_new" messageCode="global_menu_new" url="/ddictkinds?form" z="NTVKxBr80f+SE5zGFfgCiEdZuRw="/>
-            <menu:item id="i_ddictkind_list" messageCode="global_menu_list" url="/ddictkinds?page=1&amp;size=${empty param.size ? 10 : param.size}" z="CLuGcUYZD9G1SH8niBCy6EfNmts="/>
-            <menu:item id="fi_ddictkind_lstypeequalsandnameequals" messageCode="global_menu_find" url="/ddictkinds?find=ByLsTypeEqualsAndNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="iCC4PcPGWlUKUmZvQITVOomIwuI="/>
-        </menu:category>
-        <menu:category id="c_authorrole" z="5H5j5FexDI0Q/OjfqVeghRk3SBQ=">
-            <menu:item id="i_authorrole_new" messageCode="global_menu_new" url="/authorroles?form" z="R8JUiR8CbsbtSUAeFyXKb8jet5k="/>
-            <menu:item id="i_authorrole_list" messageCode="global_menu_list" url="/authorroles?page=1&amp;size=${empty param.size ? 10 : param.size}" z="1zL5TDUgIXsx+MH1ITAIzBMlzTA="/>
-            <menu:item id="fi_authorrole_roleentry" messageCode="global_menu_find" url="/authorroles?find=ByRoleEntry&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="C/uLlyl4oiUOiE5w5yeUGsMUuXE="/>
-            <menu:item id="fi_authorrole_roleentryanduserentry" messageCode="global_menu_find" url="/authorroles?find=ByRoleEntryAndUserEntry&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="RB2HrHCdHg5Hj4pkwwLw5MD95Dw="/>
-            <menu:item id="fi_authorrole_userentry" messageCode="global_menu_find" url="/authorroles?find=ByUserEntry&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="1JxYySXCqiWUff5ABZAipK3Ihak="/>
-        </menu:category>
-        <menu:category id="c_treatmentgroup" z="ktUYfUrpZ7HfqyFfY/J0m/tpOoo=">
-            <menu:item id="i_treatmentgroup_new" messageCode="global_menu_new" url="/treatmentgroups?form" z="v3FU/ZE1lF1a2skcKvCNuIjLj/U="/>
-            <menu:item id="i_treatmentgroup_list" messageCode="global_menu_list" url="/treatmentgroups?page=1&amp;size=${empty param.size ? 10 : param.size}" z="hd7pnyrJiPjfIeF0QjdyN+25FT4="/>
-            <menu:item id="fi_treatmentgroup_analysisgroups" messageCode="global_menu_find" url="/treatmentgroups?find=ByAnalysisGroups&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="Xdt80giPyaiR3zRnA+xIsoYBo7Q="/>
-            <menu:item id="fi_treatmentgroup_codenameequals" messageCode="global_menu_find" url="/treatmentgroups?find=ByCodeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="DUsy0RacIW2ITEwXD5pYZ7W84PY="/>
-            <menu:item id="fi_treatmentgroup_lstransactionequals" messageCode="global_menu_find" url="/treatmentgroups?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="2eob8td9Qaacv/yPsKIMRmVCJ88="/>
-        </menu:category>
-        <menu:category id="c_saltformalias" z="bkv0tioqygaKcAbvbjTIYDPp6n8=">
-            <menu:item id="i_saltformalias_new" messageCode="global_menu_new" url="/saltformaliases?form" z="5tGZN/CN5Imx48MNSfQymK2Xkew="/>
-            <menu:item id="i_saltformalias_list" messageCode="global_menu_list" url="/saltformaliases?page=1&amp;size=${empty param.size ? 10 : param.size}" z="mK9TBh37Cx2krVZw6kdVevu7kOg="/>
-            <menu:item id="fi_saltformalias_aliasnameequalsandlstypeequalsandlskindequals" messageCode="global_menu_find" url="/saltformaliases?find=ByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="2yiZAicxaler/mXw+1vA+eqO0d0="/>
-            <menu:item id="fi_saltformalias_saltform" messageCode="global_menu_find" url="/saltformaliases?find=BySaltForm&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="WKl9dKRNoyP0HabqtoY9MrAUhx8="/>
-        </menu:category>
-        <menu:category id="c_physicalstate" z="5TULzJ4ZMEy6Up6BnWzchCZ1Zx4=">
-            <menu:item id="i_physicalstate_new" messageCode="global_menu_new" url="/physicalstates?form" z="lOaDCAIsIIPTDCFlzMgIFHDmVWo="/>
-            <menu:item id="i_physicalstate_list" messageCode="global_menu_list" url="/physicalstates?page=1&amp;size=${empty param.size ? 10 : param.size}" z="oAJwErBMeNfYmWg7YsK1hGYPkxs="/>
-            <menu:item id="fi_physicalstate_codeequals" messageCode="global_menu_find" url="/physicalstates?find=ByCodeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="o50CF+rwB6pngfK6cBTvOPmV7pM="/>
-            <menu:item id="fi_physicalstate_nameequals" messageCode="global_menu_find" url="/physicalstates?find=ByNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="zcIHcuw5PlofzmPTHiTnSVolvtQ="/>
-            <menu:item id="fi_physicalstate_namelike" messageCode="global_menu_find" url="/physicalstates?find=ByNameLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="yVL9dEFkY4CaMo9LP1UqqvXjCfo="/>
-        </menu:category>
-        <menu:category id="c_saltformaliastype" z="JJLCZ5qqhavfaAQ8nE2ISM1izQQ=">
-            <menu:item id="i_saltformaliastype_new" messageCode="global_menu_new" url="/saltformaliastypes?form" z="TUq+ug8RbAhlro7qdBIfsdvMXXM="/>
-            <menu:item id="i_saltformaliastype_list" messageCode="global_menu_list" url="/saltformaliastypes?page=1&amp;size=${empty param.size ? 10 : param.size}" z="YAjZdd1UHN68pVC1CFtL7My0GYA="/>
-        </menu:category>
-        <menu:category id="c_parentannotation" z="DQ66Z+pO3xzfg+L12sHmL3y+qeQ=">
-            <menu:item id="i_parentannotation_new" messageCode="global_menu_new" url="/parentAnnotations?form" z="UjOZD3d0zHzYrxgnGSpkvyyF8J8="/>
-            <menu:item id="i_parentannotation_list" messageCode="global_menu_list" url="/parentAnnotations?page=1&amp;size=${empty param.size ? 10 : param.size}" z="+RZp2HcHCdygW/wE0JSftRcktUM="/>
-            <menu:item id="fi_parentannotation_codeequals" messageCode="global_menu_find" url="/parentAnnotations?find=ByCodeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="YHUygGqihI+hobIyd5+P/sm58tc="/>
-        </menu:category>
-        <menu:category id="c_itxexperimentexperiment" z="Sdn4GgIls6zJg8Di/AxrnTiSXk8=">
-            <menu:item id="i_itxexperimentexperiment_new" messageCode="global_menu_new" url="/itxexperimentexperiments?form" z="AMWVqwXle8FO2ihlo6mF17HFRnA="/>
-            <menu:item id="i_itxexperimentexperiment_list" messageCode="global_menu_list" url="/itxexperimentexperiments?page=1&amp;size=${empty param.size ? 10 : param.size}" z="vb5ZE7C5evruWlqzVReMq9prrUM="/>
-            <menu:item id="fi_itxexperimentexperiment_firstexperiment" messageCode="global_menu_find" url="/itxexperimentexperiments?find=ByFirstExperiment&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="dA8SQWht66kBQ2tKD6JJp3sPyww="/>
-            <menu:item id="fi_itxexperimentexperiment_lstransactionequals" messageCode="global_menu_find" url="/itxexperimentexperiments?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="nJfQ2m5YlwSl/fHtHuv8Osoq9uI="/>
-            <menu:item id="fi_itxexperimentexperiment_secondexperiment" messageCode="global_menu_find" url="/itxexperimentexperiments?find=BySecondExperiment&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="HLMEe22rAM0bsVsTgZx+y2hOJa4="/>
-        </menu:category>
-        <menu:category id="c_itxsubjectcontainervalue" z="p7hvR3xhX4SPAM9hlDwQBFuAa7M=">
-            <menu:item id="i_itxsubjectcontainervalue_new" messageCode="global_menu_new" url="/itxsubjectcontainervalues?form" z="LIS5Tx5kNDL+DroDTf1heIb29xQ="/>
-            <menu:item id="i_itxsubjectcontainervalue_list" messageCode="global_menu_list" url="/itxsubjectcontainervalues?page=1&amp;size=${empty param.size ? 10 : param.size}" z="cl6ZpsDYWIeOYeQEnBK0+4Sl+3k="/>
-        </menu:category>
-        <menu:category id="c_compound" z="tV3FMrJgmElWPxNS0MLSZoEG5jQ=">
-            <menu:item id="i_compound_new" messageCode="global_menu_new" url="/compounds?form" z="SKe7A7xdZ8E7DuIE23B8+k3PVBI="/>
-            <menu:item id="i_compound_list" messageCode="global_menu_list" url="/compounds?page=1&amp;size=${empty param.size ? 10 : param.size}" z="yMEcuqNr1pzc4xsPKcdIbsY0jbo="/>
-            <menu:item id="fi_compound_cdid" messageCode="global_menu_find" url="/compounds?find=ByCdId&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="L1UnsPtjXdaY5MTiTP432FyxR58="/>
-            <menu:item id="fi_compound_external_idequals" messageCode="global_menu_find" url="/compounds?find=ByExternal_idEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="7qRV5kzxEJNo63byVyExtoDs72k="/>
-        </menu:category>
-        <menu:category id="c_isosalt" z="ErQVFpd7HGhVgECjetQaU5LTEi4=">
-            <menu:item id="i_isosalt_new" messageCode="global_menu_new" url="/isosalts?form" z="JnbfM0HFvgL8F8r88L+/FqwGtlc="/>
-            <menu:item id="i_isosalt_list" messageCode="global_menu_list" url="/isosalts?page=1&amp;size=${empty param.size ? 10 : param.size}" z="pohgVl4AcM8WTdt23HNP4n+TeSw="/>
-            <menu:item id="fi_isosalt_saltform" messageCode="global_menu_find" url="/isosalts?find=BySaltForm&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="FjVZN2jiaCrevx2E94PjlPRfShY="/>
-            <menu:item id="fi_isosalt_saltformandtype" messageCode="global_menu_find" url="/isosalts?find=BySaltFormAndType&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="diKRs4UXD4ibT97UTq/1s50/tUU="/>
-        </menu:category>
-        <menu:category id="c_operatorkind" z="i4yOFpwX974Iwi11pyS5plkha5o=">
-            <menu:item id="i_operatorkind_new" messageCode="global_menu_new" url="/operatorkinds?form" z="TjvqRjIyCLgpRqnESWHQ2sgyi9E="/>
-            <menu:item id="i_operatorkind_list" messageCode="global_menu_list" url="/operatorkinds?page=1&amp;size=${empty param.size ? 10 : param.size}" z="xnWGrcrmZcIEyRUOww8CNXRNLxg="/>
-        </menu:category>
-        <menu:category id="c_saltloader" z="sT7OD63yd4CgDbMw8+8EfrRqr2k=">
-            <menu:item id="i_saltloader_new" messageCode="global_menu_new" url="/saltloaders?form" z="ztAhV4GkFI/7lXQ+ZdD1rrl7aL4="/>
-            <menu:item id="i_saltloader_list" messageCode="global_menu_list" url="/saltloaders?page=1&amp;size=${empty param.size ? 10 : param.size}" z="sTTSl1sFywOcL00SoKt61ULKQ5Y="/>
-        </menu:category>
-        <menu:category id="c_bulkloadtemplate" z="4+vSTfUa+WKlYVk/AuTQrNRbrlE=">
-            <menu:item id="i_bulkloadtemplate_new" messageCode="global_menu_new" url="/bulkloadtemplates?form" z="YxKCFxumi4SNOHebvsSTFW7efJU="/>
-            <menu:item id="i_bulkloadtemplate_list" messageCode="global_menu_list" url="/bulkloadtemplates?page=1&amp;size=${empty param.size ? 10 : param.size}" z="pBIVnAEaCYBgc8gQZP73Gg5JD+I="/>
-            <menu:item id="fi_bulkloadtemplate_recordedbyequals" messageCode="global_menu_find" url="/bulkloadtemplates?find=ByRecordedByEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="U04Qboc5c9HdjG/qldwtnpOfclg="/>
-            <menu:item id="fi_bulkloadtemplate_templatenameequals" messageCode="global_menu_find" url="/bulkloadtemplates?find=ByTemplateNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="AhIO6QCNWITbA/A7M/zPA50Bnhk="/>
-            <menu:item id="fi_bulkloadtemplate_templatenameequalsandrecordedbyequals" messageCode="global_menu_find" url="/bulkloadtemplates?find=ByTemplateNameEqualsAndRecordedByEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="v7SHjCMOIdfXNz1+jErqRur89fk="/>
-        </menu:category>
-        <menu:category id="c_subject" z="7o1gOZ254r8rrLkTPEMR4T4CYTs=">
-            <menu:item id="i_subject_new" messageCode="global_menu_new" url="/subjects?form" z="K/cpx4U1MG0/LtXu68wamJ7ttg0="/>
-            <menu:item id="i_subject_list" messageCode="global_menu_list" url="/subjects?page=1&amp;size=${empty param.size ? 10 : param.size}" z="EQd4RQgsWkj2hqqLFZF+zKoYy0I="/>
-            <menu:item id="fi_subject_codenameequals" messageCode="global_menu_find" url="/subjects?find=ByCodeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="jOUsrjPR43vGumvm+gkPQ/SKjGM="/>
-            <menu:item id="fi_subject_lstransactionequals" messageCode="global_menu_find" url="/subjects?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="BcfTwuKb+LlRHroG8tU6PYMMDvA="/>
-            <menu:item id="fi_subject_treatmentgroups" messageCode="global_menu_find" url="/subjects?find=ByTreatmentGroups&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="ma6T5d2z0O9Mb2ZX8WB6C+6hA7Q="/>
-        </menu:category>
-        <menu:category id="c_authorvalue" z="SEKbotDcjdwlJQ3FJKqsn3ODN0Y=">
-            <menu:item id="i_authorvalue_new" messageCode="global_menu_new" url="/authorvalues?form" z="tweyBRFzrkXNIgmrLrv8fWwl5ZQ="/>
-            <menu:item id="i_authorvalue_list" messageCode="global_menu_list" url="/authorvalues?page=1&amp;size=${empty param.size ? 10 : param.size}" z="GoQlL6SZmtPWPBUN4GYzj1Lq5gk="/>
-        </menu:category>
-        <menu:category id="c_container" z="XqOOWT7xIClZeUyG2iJ0J+M+1XY=">
-            <menu:item id="i_container_new" messageCode="global_menu_new" url="/containers?form" z="zPZaX1xZEYIMmXfNbwIYJu9D4Fw="/>
-            <menu:item id="i_container_list" messageCode="global_menu_list" url="/containers?page=1&amp;size=${empty param.size ? 10 : param.size}" z="gmRelJFlRPedSwfpBPdExDouyu0="/>
-        </menu:category>
-        <menu:category id="c_unittype" z="SiS1/w1xN9eZNO5OnUStYk3xOxc=">
-            <menu:item id="i_unittype_new" messageCode="global_menu_new" url="/unittypes?form" z="XlKt6NnE9oR8SfwfCceek79prF4="/>
-            <menu:item id="i_unittype_list" messageCode="global_menu_list" url="/unittypes?page=1&amp;size=${empty param.size ? 10 : param.size}" z="BuKQtIYHOrSo8DjM3HFIfFOp55A="/>
-            <menu:item id="fi_unittype_typenameequals" messageCode="global_menu_find" url="/unittypes?find=ByTypeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="yr8lREK4el7gpx989GWkJMwkGLc="/>
-        </menu:category>
-        <menu:category id="c_experimentvalue" z="XM7L0ROH0TNnJAv5TW3VnNsV1fQ=">
-            <menu:item id="i_experimentvalue_new" messageCode="global_menu_new" url="/experimentvalues?form" z="dv8tE4L0crSnTYkUjPl7c6HwixI="/>
-            <menu:item id="i_experimentvalue_list" messageCode="global_menu_list" url="/experimentvalues?page=1&amp;size=${empty param.size ? 10 : param.size}" z="Qui9XKTtYE1Dsym9RpQJEF66oek="/>
-            <menu:item id="fi_experimentvalue_lskindequalsandcodevaluelike" messageCode="global_menu_find" url="/experimentvalues?find=ByLsKindEqualsAndCodeValueLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="3XGE5Y9ZIlIUqLV59BycfCG/jQU="/>
-            <menu:item id="fi_experimentvalue_lskindequalsandstringvaluelike" messageCode="global_menu_find" url="/experimentvalues?find=ByLsKindEqualsAndStringValueLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="qnmiKr/7AUiAp6RABecOe0dYJaA="/>
-            <menu:item id="fi_experimentvalue_lsstate" messageCode="global_menu_find" url="/experimentvalues?find=ByLsState&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="idoXPJ9pJXCpjDlchfdblotr6AY="/>
-            <menu:item id="fi_experimentvalue_lsstateandignorednotandlskindequalsandlstypeequalsandstringvalueequals" messageCode="global_menu_find" url="/experimentvalues?find=ByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="I/JmouUvt1LUoHP8Xohm/c3X6O4="/>
-        </menu:category>
-        <menu:category id="c_unit" z="o+Tl1QCuj7XJBjbkOUofJ6o7OTI=">
-            <menu:item id="i_unit_new" messageCode="global_menu_new" url="/units?form" z="oJDJNzw0PlIDkMTtID4g4gvkhTY="/>
-            <menu:item id="i_unit_list" messageCode="global_menu_list" url="/units?page=1&amp;size=${empty param.size ? 10 : param.size}" z="mqpJPY7uCke3Lrgup34MXG8RkII="/>
-            <menu:item id="fi_unit_codeequals" messageCode="global_menu_find" url="/units?find=ByCodeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="xzoRz0OblHLuU4iTtHXl8gW4KSw="/>
-            <menu:item id="fi_unit_codelike" messageCode="global_menu_find" url="/units?find=ByCodeLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="TzatNt6rvhoNHOC20qBZYtMdPrI="/>
-            <menu:item id="fi_unit_nameequals" messageCode="global_menu_find" url="/units?find=ByNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="o2gi8NzDUmgaOITtqSdxG9dxnOU="/>
-        </menu:category>
-        <menu:category id="c_protocolkind" z="lA6Nz7hyvn4goCuqyyZ5UrMIMkY=">
-            <menu:item id="i_protocolkind_new" messageCode="global_menu_new" url="/protocolkinds?form" z="CUHqWfdjOjrx1F0QiGQ4jf7eRjA="/>
-            <menu:item id="i_protocolkind_list" messageCode="global_menu_list" url="/protocolkinds?page=1&amp;size=${empty param.size ? 10 : param.size}" z="M2RGDSlkfqunIWK0PDJNkAhbKxs="/>
-            <menu:item id="fi_protocolkind_lstypeequalsandkindnameequals" messageCode="global_menu_find" url="/protocolkinds?find=ByLsTypeEqualsAndKindNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="7PwqLBTKkgqZDZGKvW7MSpIMdtI="/>
-        </menu:category>
-        <menu:category id="c_protocolvalue" z="pzMqoBPcD0Jd0GZWPo1gpxt29zk=">
-            <menu:item id="i_protocolvalue_new" messageCode="global_menu_new" url="/protocolvalues?form" z="NeuraCstRhyZtMj+o86SkuN9oGQ="/>
-            <menu:item id="i_protocolvalue_list" messageCode="global_menu_list" url="/protocolvalues?page=1&amp;size=${empty param.size ? 10 : param.size}" z="FRB+41kwl8e6u9QTlycPPNaiMM8="/>
-            <menu:item id="fi_protocolvalue_lskindequalsandcodevaluelike" messageCode="global_menu_find" url="/protocolvalues?find=ByLsKindEqualsAndCodeValueLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="8/DzdrMT+f7y8IVHrplAZXPsI5Q="/>
-            <menu:item id="fi_protocolvalue_lskindequalsandstringvaluelike" messageCode="global_menu_find" url="/protocolvalues?find=ByLsKindEqualsAndStringValueLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="xJHCWHFxsGdUO31I6c3z8Zlu6ro="/>
-            <menu:item id="fi_protocolvalue_lsstate" messageCode="global_menu_find" url="/protocolvalues?find=ByLsState&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="KcbnBR4T8npQLrAEoLFRP5sAL1k="/>
-            <menu:item id="fi_protocolvalue_lstransactionequals" messageCode="global_menu_find" url="/protocolvalues?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="yXN9n4YBfbNEPyGa9PD5MqEWq3c="/>
-        </menu:category>
-        <menu:category id="c_itxexperimentexperimentstate" z="w15kS3YrfxKIudnbAwP1ajFMQag=">
-            <menu:item id="i_itxexperimentexperimentstate_new" messageCode="global_menu_new" url="/itxexperimentexperimentstates?form" z="LnR4C38cHoHF+LFlVamM1HyEego="/>
-            <menu:item id="i_itxexperimentexperimentstate_list" messageCode="global_menu_list" url="/itxexperimentexperimentstates?page=1&amp;size=${empty param.size ? 10 : param.size}" z="BN7SOiV9ZrlJ1lwIIaTuF7r2Kpo="/>
-        </menu:category>
-        <menu:category id="c_statekind" z="G5vnt/jiVbCzx5h50u4WfRZEHQU=">
-            <menu:item id="i_statekind_new" messageCode="global_menu_new" url="/statekinds?form" z="Tn9piDjIPxXyc4putmZJuDPqxJM="/>
-            <menu:item id="i_statekind_list" messageCode="global_menu_list" url="/statekinds?page=1&amp;size=${empty param.size ? 10 : param.size}" z="pIafwxCSjdoNo5okiFbjJ0j887Y="/>
-            <menu:item id="fi_statekind_kindnameequals" messageCode="global_menu_find" url="/statekinds?find=ByKindNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="9getgmRxccXO2yj3Qm8bfjOJLqE="/>
-            <menu:item id="fi_statekind_kindnameequalsandlstype" messageCode="global_menu_find" url="/statekinds?find=ByKindNameEqualsAndLsType&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="ZJArNE1a30EAQPUVI5SzWCYUu7A="/>
-            <menu:item id="fi_statekind_lstype" messageCode="global_menu_find" url="/statekinds?find=ByLsType&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="kFDFs8vchae1EAHqXMkPXiXPjhs="/>
-        </menu:category>
-        <menu:category id="c_lsthinglabel" z="JHZMQ32KDw5hqhoWzluVD2csEyQ=">
-            <menu:item id="i_lsthinglabel_new" messageCode="global_menu_new" url="/lsthinglabels?form" z="s9/dlX8815GwnpSEIUZ5gUADHGU="/>
-            <menu:item id="i_lsthinglabel_list" messageCode="global_menu_list" url="/lsthinglabels?page=1&amp;size=${empty param.size ? 10 : param.size}" z="NhXpevRj/Lhdwvu/OBKZwR/CA+k="/>
-            <menu:item id="fi_lsthinglabel_labeltextequals" messageCode="global_menu_find" url="/lsthinglabels?find=ByLabelTextEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="NkdTuZL412Fc20x7tBmAbsq4W7k="/>
-            <menu:item id="fi_lsthinglabel_labeltextequalsandignorednot" messageCode="global_menu_find" url="/lsthinglabels?find=ByLabelTextEqualsAndIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="5Pu1ODThF46obuYxpghCVsAzEqk="/>
-            <menu:item id="fi_lsthinglabel_labeltextlike" messageCode="global_menu_find" url="/lsthinglabels?find=ByLabelTextLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="ZGdWBZEjB8i4kpzF2RiPLsudTAw="/>
-            <menu:item id="fi_lsthinglabel_lsthing" messageCode="global_menu_find" url="/lsthinglabels?find=ByLsThing&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="qHCWLptlv7FuspXt6bXwrQQEPVM="/>
-            <menu:item id="fi_lsthinglabel_lstransactionequals" messageCode="global_menu_find" url="/lsthinglabels?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="BgtomocVBKtCRk3LVaFwaftTIIw="/>
-        </menu:category>
-        <menu:category id="c_parentaliastype" z="QEnpDbMF+GWLp05b7LByzPhyNHs=">
-            <menu:item id="i_parentaliastype_new" messageCode="global_menu_new" url="/parentaliastypes?form" z="DDjyUk4c9Mu0mqS5dikahwh6HS0="/>
-            <menu:item id="i_parentaliastype_list" messageCode="global_menu_list" url="/parentaliastypes?page=1&amp;size=${empty param.size ? 10 : param.size}" z="/GL/5i6szsTRV/nVHSh1uaL3qag="/>
-        </menu:category>
-        <menu:category id="c_compoundtype" z="iPhj6Z3B9CpAJolMQMiweKOvmZ8=">
-            <menu:item id="i_compoundtype_new" messageCode="global_menu_new" url="/compoundTypes?form" z="aCkGif09s3F0BXJEvgHtL53ZrI4="/>
-            <menu:item id="i_compoundtype_list" messageCode="global_menu_list" url="/compoundTypes?page=1&amp;size=${empty param.size ? 10 : param.size}" z="jJwHBtYzZ7q3NRu4cH/yrLdiJ4U="/>
-            <menu:item id="fi_compoundtype_codeequals" messageCode="global_menu_find" url="/compoundTypes?find=ByCodeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="buwZKzCnBsiw1f+bld7QxqRD8kU="/>
-        </menu:category>
-        <menu:category id="c_filething" z="ChVJ9ZRlHjPU0Rff6qUGn9D8XfA=">
-            <menu:item id="i_filething_new" messageCode="global_menu_new" url="/filethings?form" z="VXB9tYqrFi2VahQvG+RL04p0K+E="/>
-            <menu:item id="i_filething_list" messageCode="global_menu_list" url="/filethings?page=1&amp;size=${empty param.size ? 10 : param.size}" z="AK5UnxkKyE87/gEHwh+mRrN5dwk="/>
-        </menu:category>
-        <menu:category id="c_protocol" z="2nZ2u7ykKLEK9Fl9YzNUx5ln7Ak=">
-            <menu:item id="i_protocol_new" messageCode="global_menu_new" url="/protocols?form" z="TzxrlZZ307Z3cC++3uIFeI3CiLY="/>
-            <menu:item id="i_protocol_list" messageCode="global_menu_list" url="/protocols?page=1&amp;size=${empty param.size ? 10 : param.size}" z="7X6XWzyVMFP6TIul/iNyUMcSib4="/>
-            <menu:item id="fi_protocol_codenameequals" messageCode="global_menu_find" url="/protocols?find=ByCodeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="3oKY9UeQHBS+qCTevDg5eKA0/OM="/>
-            <menu:item id="fi_protocol_codenameequalsandignorednot" messageCode="global_menu_find" url="/protocols?find=ByCodeNameEqualsAndIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="ragN2FXXIYhcoHaYcze+sWew1ho="/>
-            <menu:item id="fi_protocol_codenamelike" messageCode="global_menu_find" url="/protocols?find=ByCodeNameLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="tpYIACx96dP/uzNhO4xDA50Jp+U="/>
-            <menu:item id="fi_protocol_ignorednot" messageCode="global_menu_find" url="/protocols?find=ByIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="OzVK7FQu8b9SWHZ1jBVF8PP6W3s="/>
-            <menu:item id="fi_protocol_lskindequals" messageCode="global_menu_find" url="/protocols?find=ByLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="3PbGk2iSVFyJeTwzPWjARk86/o0="/>
-            <menu:item id="fi_protocol_lskindlike" messageCode="global_menu_find" url="/protocols?find=ByLsKindLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="5ZxVsDS1fh+KwoQgzX5DT3IJLFA="/>
-            <menu:item id="fi_protocol_lstransactionequals" messageCode="global_menu_find" url="/protocols?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="RnbVuMiSPYCCCFrUMMrbKOU7wDA="/>
-            <menu:item id="fi_protocol_lstypeandkindequals" messageCode="global_menu_find" url="/protocols?find=ByLsTypeAndKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="uK+r3Jap8nw3x+hIcdqYWenNZ68="/>
-            <menu:item id="fi_protocol_lstypeequals" messageCode="global_menu_find" url="/protocols?find=ByLsTypeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="j96KXBGUIKjqZAP0sA8kyOMQX4I="/>
-            <menu:item id="fi_protocol_lstypeequalsandlskindequals" messageCode="global_menu_find" url="/protocols?find=ByLsTypeEqualsAndLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="wVHm+26hbUguA7iURzf57BX5LdY="/>
-            <menu:item id="fi_protocol_lstypelike" messageCode="global_menu_find" url="/protocols?find=ByLsTypeLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="3PzTFR2eEuxYSkRnJixZC+UPRhk="/>
-            <menu:item id="fi_protocol_recordedbylike" messageCode="global_menu_find" url="/protocols?find=ByRecordedByLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="rM2z3n7PaIfjO4cyiqOI585JYTc="/>
-        </menu:category>
-        <menu:category id="c_analysisgroup" z="iopiwKdmsxTqwIsacT4c426gzBk=">
-            <menu:item id="i_analysisgroup_new" messageCode="global_menu_new" url="/analysisgroups?form" z="X9jRijQ+XKj10kDbLotTpYYe/ys="/>
-            <menu:item id="i_analysisgroup_list" messageCode="global_menu_list" url="/analysisgroups?page=1&amp;size=${empty param.size ? 10 : param.size}" z="dMhUOKH445lv1mKn1yfZmyxOZ98="/>
-            <menu:item id="fi_analysisgroup_experiments" messageCode="global_menu_find" url="/analysisgroups?find=ByExperiments&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="UwdeYtkqZNlu+eH8hNaeE0TcVzM="/>
-            <menu:item id="fi_analysisgroup_experimentsandignorednot" messageCode="global_menu_find" url="/analysisgroups?find=ByExperimentsAndIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="XSgpEV7jRdiT7CRF9FoOvLEXrNY="/>
-            <menu:item id="fi_analysisgroup_lstransactionequals" messageCode="global_menu_find" url="/analysisgroups?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="Q/rNQkN4cyEDicgbjEPXuWAZBkg="/>
-        </menu:category>
-        <menu:category id="c_lotalias" z="JqtLnhpjNTv1NEj6AY+9hphF6G0=">
-            <menu:item id="i_lotalias_new" messageCode="global_menu_new" url="/lotaliases?form" z="7b7Z7gKs6/AHbRn1Y42KyALCZ9E="/>
-            <menu:item id="i_lotalias_list" messageCode="global_menu_list" url="/lotaliases?page=1&amp;size=${empty param.size ? 10 : param.size}" z="tcQ2uLs/U2jHGEJfw4ygmyp49Kg="/>
-            <menu:item id="fi_lotalias_aliasnameequalsandlstypeequalsandlskindequals" messageCode="global_menu_find" url="/lotaliases?find=ByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="RnL4u288C415TNmFj1z/1XD7n1c="/>
-            <menu:item id="fi_lotalias_lot" messageCode="global_menu_find" url="/lotaliases?find=ByLot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="hPeHvSNu9h5nWZ0LtatTsO0IOM4="/>
-            <menu:item id="fi_lotalias_lotandlstypeequalsandlskindequals" messageCode="global_menu_find" url="/lotaliases?find=ByLotAndLsTypeEqualsAndLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="CCTH5NRVbhe+YM52CNdiZFGhs3U="/>
-        </menu:category>
-        <menu:category id="c_updatelog" z="LGPuarvdCgXzA4AR3+c9hG3/TTw=">
-            <menu:item id="i_updatelog_new" messageCode="global_menu_new" url="/updatelogs?form" z="NRngG10Pl/Ytklu5ie7mFDHUKn8="/>
-            <menu:item id="i_updatelog_list" messageCode="global_menu_list" url="/updatelogs?page=1&amp;size=${empty param.size ? 10 : param.size}" z="cNjYhPM+N4aVFwW1e8W7aakv4nc="/>
-        </menu:category>
-        <menu:category id="c_parent" z="fi6ZYxb25wBYvhkjXvIqbkZ8HSM=">
-            <menu:item id="i_parent_new" messageCode="global_menu_new" url="/parents?form" z="1Sm2H8ouc62T/6SdPx5lIneW+9I="/>
-            <menu:item id="i_parent_list" messageCode="global_menu_list" url="/parents?page=1&amp;size=${empty param.size ? 10 : param.size}" z="DTAZKuxonCJw3ld/0pOBw9NOwNA="/>
-            <menu:item id="fi_parent_bulkloadfileequals" messageCode="global_menu_find" url="/parents?find=ByBulkLoadFileEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="DeTYxpX058xh6TGRfzygs/1qVVM="/>
-            <menu:item id="fi_parent_cdid" messageCode="global_menu_find" url="/parents?find=ByCdId&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="jP3+hwLEUHCWp5XqvdIFI9Kkefc="/>
-            <menu:item id="fi_parent_commonnamelike" messageCode="global_menu_find" url="/parents?find=ByCommonNameLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="gao0JChLRVeTwnxATw0SVJcFsmk="/>
-            <menu:item id="fi_parent_corpnameequals" messageCode="global_menu_find" url="/parents?find=ByCorpNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="8yeRSZ/rhGlkqYvw/84veveB3ug="/>
-            <menu:item id="fi_parent_corpnamelike" messageCode="global_menu_find" url="/parents?find=ByCorpNameLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="M3rHnPF7xhwNDOiCmqwgMmCnuOQ="/>
-            <menu:item id="fi_parent_saltforms" messageCode="global_menu_find" url="/parents?find=BySaltForms&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="yI44433bRe4ptlTLOJuDw+4IMh8="/>
-        </menu:category>
-        <menu:category id="c_puritymeasuredby" z="tn+Fss7pYzEfKccwedSpiTBzd44=">
-            <menu:item id="i_puritymeasuredby_new" messageCode="global_menu_new" url="/puritymeasuredbys?form" z="tvshqP/oDSgqHaraSA/XFTHK7Zg="/>
-            <menu:item id="i_puritymeasuredby_list" messageCode="global_menu_list" url="/puritymeasuredbys?page=1&amp;size=${empty param.size ? 10 : param.size}" z="NlvmmDC9n6PYUeRdurr4NHaTyPU="/>
-            <menu:item id="fi_puritymeasuredby_codeequals" messageCode="global_menu_find" url="/puritymeasuredbys?find=ByCodeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="IOmM/o/YqQumfNp7Q8lu93m+Nto="/>
-            <menu:item id="fi_puritymeasuredby_nameequals" messageCode="global_menu_find" url="/puritymeasuredbys?find=ByNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="l2P+j4EW5KT6Srij///Cfq+YCLI="/>
-            <menu:item id="fi_puritymeasuredby_namelike" messageCode="global_menu_find" url="/puritymeasuredbys?find=ByNameLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}" z="oP75O1Tjx04HMk+02DZ1efRmS+8="/>
-        </menu:category>
-    </menu:menu>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/menu.xml b/src/main/webapp/WEB-INF/views/menu.xml
deleted file mode 100644
index 88c2bbace..000000000
--- a/src/main/webapp/WEB-INF/views/menu.xml
+++ /dev/null
@@ -1,784 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<gvnix-menu id="_menu" rooMenuBasePath="/">
-<menu-item id="c_analysisgroup" labelCode="menu_category_analysisgroup_label" name="Analysisgroup">
-        <menu-item hidden="false" id="i_analysisgroup_new" labelCode="menu_item_analysisgroup_new_label" messageCode="global_menu_new" roles="" url="/analysisgroups?form"/>
-    <menu-item hidden="false" id="i_analysisgroup_list" labelCode="menu_item_analysisgroup_list_label" messageCode="global_menu_list" roles="" url="/analysisgroups?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_analysisgroup_experiments" labelCode="menu_item_analysisgroup_experiments_label" messageCode="global_menu_find" roles="" url="/analysisgroups?find=ByExperiments&amp;form"/>
-    <menu-item hidden="false" id="fi_analysisgroup_experimentsandignorednot" labelCode="menu_item_analysisgroup_experimentsandignorednot_label" messageCode="global_menu_find" roles="" url="/analysisgroups?find=ByExperimentsAndIgnoredNot&amp;form"/>
-    <menu-item hidden="false" id="fi_analysisgroup_lstransactionequals" labelCode="menu_item_analysisgroup_lstransactionequals_label" messageCode="global_menu_find" roles="" url="/analysisgroups?find=ByLsTransactionEquals&amp;form"/>
-    </menu-item>
-<menu-item id="c_subjectvalue" labelCode="menu_category_subjectvalue_label" name="Subjectvalue">
-        <menu-item hidden="false" id="i_subjectvalue_new" labelCode="menu_item_subjectvalue_new_label" messageCode="global_menu_new" roles="" url="/subjectvalues?form"/>
-    <menu-item hidden="false" id="i_subjectvalue_list" labelCode="menu_item_subjectvalue_list_label" messageCode="global_menu_list" roles="" url="/subjectvalues?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_subjectvalue_codevalueequals" labelCode="menu_item_subjectvalue_codevalueequals_label" messageCode="global_menu_find" roles="" url="/subjectvalues?find=ByCodeValueEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_subjectvalue_ignorednotandcodevalueequals" labelCode="menu_item_subjectvalue_ignorednotandcodevalueequals_label" messageCode="global_menu_find" roles="" url="/subjectvalues?find=ByIgnoredNotAndCodeValueEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_subjectvalue_lsstate" labelCode="menu_item_subjectvalue_lsstate_label" messageCode="global_menu_find" roles="" url="/subjectvalues?find=ByLsState&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_subjectvalue_lsstateandlstypeequalsandlskindequals" labelCode="menu_item_subjectvalue_lsstateandlstypeequalsandlskindequals_label" messageCode="global_menu_find" roles="" url="/subjectvalues?find=ByLsStateAndLsTypeEqualsAndLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_subjectvalue_lstypeequalsandlskindequals" labelCode="menu_item_subjectvalue_lstypeequalsandlskindequals_label" messageCode="global_menu_find" roles="" url="/subjectvalues?find=ByLsTypeEqualsAndLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_containervalue" labelCode="menu_category_containervalue_label" name="Containervalue">
-        <menu-item hidden="false" id="i_containervalue_new" labelCode="menu_item_containervalue_new_label" messageCode="global_menu_new" roles="" url="/containervalues?form"/>
-    <menu-item hidden="false" id="i_containervalue_list" labelCode="menu_item_containervalue_list_label" messageCode="global_menu_list" roles="" url="/containervalues?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_containervalue_ignorednot" labelCode="menu_item_containervalue_ignorednot_label" messageCode="global_menu_find" roles="" url="/containervalues?find=ByIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_containervalue_lsstate" labelCode="menu_item_containervalue_lsstate_label" messageCode="global_menu_find" roles="" url="/containervalues?find=ByLsState&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_subjectstate" labelCode="menu_category_subjectstate_label" name="Subjectstate">
-        <menu-item hidden="false" id="i_subjectstate_new" labelCode="menu_item_subjectstate_new_label" messageCode="global_menu_new" roles="" url="/subjectstates?form"/>
-    <menu-item hidden="false" id="i_subjectstate_list" labelCode="menu_item_subjectstate_list_label" messageCode="global_menu_list" roles="" url="/subjectstates?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_subjectstate_lstypeequalsandlskindequalsandsubject" labelCode="menu_item_subjectstate_lstypeequalsandlskindequalsandsubject_label" messageCode="global_menu_find" roles="" url="/subjectstates?find=ByLsTypeEqualsAndLsKindEqualsAndSubject&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_subjectstate_subject" labelCode="menu_item_subjectstate_subject_label" messageCode="global_menu_find" roles="" url="/subjectstates?find=BySubject&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_operatortype" labelCode="menu_category_operatortype_label" name="Operatortype">
-        <menu-item hidden="false" id="i_operatortype_new" labelCode="menu_item_operatortype_new_label" messageCode="global_menu_new" roles="" url="/operatortypes?form"/>
-    <menu-item hidden="false" id="i_operatortype_list" labelCode="menu_item_operatortype_list_label" messageCode="global_menu_list" roles="" url="/operatortypes?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_operatortype_typenameequals" labelCode="menu_item_operatortype_typenameequals_label" messageCode="global_menu_find" roles="" url="/operatortypes?find=ByTypeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_thingpage" labelCode="menu_category_thingpage_label" name="Thingpage">
-        <menu-item hidden="false" id="i_thingpage_new" labelCode="menu_item_thingpage_new_label" messageCode="global_menu_new" roles="" url="/thingpages?form"/>
-    <menu-item hidden="false" id="i_thingpage_list" labelCode="menu_item_thingpage_list_label" messageCode="global_menu_list" roles="" url="/thingpages?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_container" labelCode="menu_category_container_label" name="Container">
-        <menu-item hidden="false" id="i_container_new" labelCode="menu_item_container_new_label" messageCode="global_menu_new" roles="" url="/containers?form"/>
-    <menu-item hidden="false" id="i_container_list" labelCode="menu_item_container_list_label" messageCode="global_menu_list" roles="" url="/containers?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_protocollabel" labelCode="menu_category_protocollabel_label" name="Protocollabel">
-        <menu-item hidden="false" id="i_protocollabel_new" labelCode="menu_item_protocollabel_new_label" messageCode="global_menu_new" roles="" url="/protocollabels?form"/>
-    <menu-item hidden="false" id="i_protocollabel_list" labelCode="menu_item_protocollabel_list_label" messageCode="global_menu_list" roles="" url="/protocollabels?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_protocollabel_labeltextequalsandignorednot" labelCode="menu_item_protocollabel_labeltextequalsandignorednot_label" messageCode="global_menu_find" roles="" url="/protocollabels?find=ByLabelTextEqualsAndIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_protocollabel_labeltextlike" labelCode="menu_item_protocollabel_labeltextlike_label" messageCode="global_menu_find" roles="" url="/protocollabels?find=ByLabelTextLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_protocollabel_lstransactionequals" labelCode="menu_item_protocollabel_lstransactionequals_label" messageCode="global_menu_find" roles="" url="/protocollabels?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_protocollabel_protocol" labelCode="menu_item_protocollabel_protocol_label" messageCode="global_menu_find" roles="" url="/protocollabels?find=ByProtocol&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_itxcontainercontainervalue" labelCode="menu_category_itxcontainercontainervalue_label" name="Itxcontainercontainervalue">
-        <menu-item hidden="false" id="i_itxcontainercontainervalue_new" labelCode="menu_item_itxcontainercontainervalue_new_label" messageCode="global_menu_new" roles="" url="/itxcontainercontainervalues?form"/>
-    <menu-item hidden="false" id="i_itxcontainercontainervalue_list" labelCode="menu_item_itxcontainercontainervalue_list_label" messageCode="global_menu_list" roles="" url="/itxcontainercontainervalues?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_experimentstate" labelCode="menu_category_experimentstate_label" name="Experimentstate">
-        <menu-item hidden="false" id="i_experimentstate_new" labelCode="menu_item_experimentstate_new_label" messageCode="global_menu_new" roles="" url="/experimentstates?form"/>
-    <menu-item hidden="false" id="i_experimentstate_list" labelCode="menu_item_experimentstate_list_label" messageCode="global_menu_list" roles="" url="/experimentstates?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_experimentstate_experiment" labelCode="menu_item_experimentstate_experiment_label" messageCode="global_menu_find" roles="" url="/experimentstates?find=ByExperiment&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_interactionkind" labelCode="menu_category_interactionkind_label" name="Interactionkind">
-        <menu-item hidden="false" id="i_interactionkind_new" labelCode="menu_item_interactionkind_new_label" messageCode="global_menu_new" roles="" url="/interactionkinds?form"/>
-    <menu-item hidden="false" id="i_interactionkind_list" labelCode="menu_item_interactionkind_list_label" messageCode="global_menu_list" roles="" url="/interactionkinds?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_protocol" labelCode="menu_category_protocol_label" name="Protocol">
-        <menu-item hidden="false" id="i_protocol_new" labelCode="menu_item_protocol_new_label" messageCode="global_menu_new" roles="" url="/protocols?form"/>
-    <menu-item hidden="false" id="i_protocol_list" labelCode="menu_item_protocol_list_label" messageCode="global_menu_list" roles="" url="/protocols?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_protocol_codenameequals" labelCode="menu_item_protocol_codenameequals_label" messageCode="global_menu_find" roles="" url="/protocols?find=ByCodeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_protocol_codenameequalsandignorednot" labelCode="menu_item_protocol_codenameequalsandignorednot_label" messageCode="global_menu_find" roles="" url="/protocols?find=ByCodeNameEqualsAndIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_protocol_codenamelike" labelCode="menu_item_protocol_codenamelike_label" messageCode="global_menu_find" roles="" url="/protocols?find=ByCodeNameLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_protocol_ignorednot" labelCode="menu_item_protocol_ignorednot_label" messageCode="global_menu_find" roles="" url="/protocols?find=ByIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_protocol_lskindequals" labelCode="menu_item_protocol_lskindequals_label" messageCode="global_menu_find" roles="" url="/protocols?find=ByLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_protocol_lskindlike" labelCode="menu_item_protocol_lskindlike_label" messageCode="global_menu_find" roles="" url="/protocols?find=ByLsKindLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_protocol_lstransactionequals" labelCode="menu_item_protocol_lstransactionequals_label" messageCode="global_menu_find" roles="" url="/protocols?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_protocol_lstypeandkindequals" labelCode="menu_item_protocol_lstypeandkindequals_label" messageCode="global_menu_find" roles="" url="/protocols?find=ByLsTypeAndKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_protocol_lstypeequals" labelCode="menu_item_protocol_lstypeequals_label" messageCode="global_menu_find" roles="" url="/protocols?find=ByLsTypeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_protocol_lstypeequalsandlskindequals" labelCode="menu_item_protocol_lstypeequalsandlskindequals_label" messageCode="global_menu_find" roles="" url="/protocols?find=ByLsTypeEqualsAndLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_protocol_lstypelike" labelCode="menu_item_protocol_lstypelike_label" messageCode="global_menu_find" roles="" url="/protocols?find=ByLsTypeLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_protocol_recordedbylike" labelCode="menu_item_protocol_recordedbylike_label" messageCode="global_menu_find" roles="" url="/protocols?find=ByRecordedByLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_labeltype" labelCode="menu_category_labeltype_label" name="Labeltype">
-        <menu-item hidden="false" id="i_labeltype_new" labelCode="menu_item_labeltype_new_label" messageCode="global_menu_new" roles="" url="/labeltypes?form"/>
-    <menu-item hidden="false" id="i_labeltype_list" labelCode="menu_item_labeltype_list_label" messageCode="global_menu_list" roles="" url="/labeltypes?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_labeltype_typenameequals" labelCode="menu_item_labeltype_typenameequals_label" messageCode="global_menu_find" roles="" url="/labeltypes?find=ByTypeNameEquals&amp;form"/>
-    </menu-item>
-<menu-item id="c_itxsubjectcontainer" labelCode="menu_category_itxsubjectcontainer_label" name="Itxsubjectcontainer">
-        <menu-item hidden="false" id="i_itxsubjectcontainer_new" labelCode="menu_item_itxsubjectcontainer_new_label" messageCode="global_menu_new" roles="" url="/itxsubjectcontainers?form"/>
-    <menu-item hidden="false" id="i_itxsubjectcontainer_list" labelCode="menu_item_itxsubjectcontainer_list_label" messageCode="global_menu_list" roles="" url="/itxsubjectcontainers?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_itxsubjectcontainer_codenameequals" labelCode="menu_item_itxsubjectcontainer_codenameequals_label" messageCode="global_menu_find" roles="" url="/itxsubjectcontainers?find=ByCodeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_itxsubjectcontainer_container" labelCode="menu_item_itxsubjectcontainer_container_label" messageCode="global_menu_find" roles="" url="/itxsubjectcontainers?find=ByContainer&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_itxsubjectcontainer_lstransactionequals" labelCode="menu_item_itxsubjectcontainer_lstransactionequals_label" messageCode="global_menu_find" roles="" url="/itxsubjectcontainers?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_itxsubjectcontainer_subject" labelCode="menu_item_itxsubjectcontainer_subject_label" messageCode="global_menu_find" roles="" url="/itxsubjectcontainers?find=BySubject&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_labelkind" labelCode="menu_category_labelkind_label" name="Labelkind">
-        <menu-item hidden="false" id="i_labelkind_new" labelCode="menu_item_labelkind_new_label" messageCode="global_menu_new" roles="" url="/labelkinds?form"/>
-    <menu-item hidden="false" id="i_labelkind_list" labelCode="menu_item_labelkind_list_label" messageCode="global_menu_list" roles="" url="/labelkinds?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_labelkind_kindnameequals" labelCode="menu_item_labelkind_kindnameequals_label" messageCode="global_menu_find" roles="" url="/labelkinds?find=ByKindNameEquals&amp;form"/>
-    <menu-item hidden="false" id="fi_labelkind_kindnameequalsandlstype" labelCode="menu_item_labelkind_kindnameequalsandlstype_label" messageCode="global_menu_find" roles="" url="/labelkinds?find=ByKindNameEqualsAndLsType&amp;form"/>
-    <menu-item hidden="false" id="fi_labelkind_lstype" labelCode="menu_item_labelkind_lstype_label" messageCode="global_menu_find" roles="" url="/labelkinds?find=ByLsType&amp;form"/>
-    </menu-item>
-<menu-item id="c_lsinteraction" labelCode="menu_category_lsinteraction_label" name="Lsinteraction">
-        <menu-item hidden="false" id="i_lsinteraction_new" labelCode="menu_item_lsinteraction_new_label" messageCode="global_menu_new" roles="" url="/lsinteractions?form"/>
-    <menu-item hidden="false" id="i_lsinteraction_list" labelCode="menu_item_lsinteraction_list_label" messageCode="global_menu_list" roles="" url="/lsinteractions?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_unittype" labelCode="menu_category_unittype_label" name="Unittype">
-        <menu-item hidden="false" id="i_unittype_new" labelCode="menu_item_unittype_new_label" messageCode="global_menu_new" roles="" url="/unittypes?form"/>
-    <menu-item hidden="false" id="i_unittype_list" labelCode="menu_item_unittype_list_label" messageCode="global_menu_list" roles="" url="/unittypes?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_unittype_typenameequals" labelCode="menu_item_unittype_typenameequals_label" messageCode="global_menu_find" roles="" url="/unittypes?find=ByTypeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_treatmentgroup" labelCode="menu_category_treatmentgroup_label" name="Treatmentgroup">
-        <menu-item hidden="false" id="i_treatmentgroup_new" labelCode="menu_item_treatmentgroup_new_label" messageCode="global_menu_new" roles="" url="/treatmentgroups?form"/>
-    <menu-item hidden="false" id="i_treatmentgroup_list" labelCode="menu_item_treatmentgroup_list_label" messageCode="global_menu_list" roles="" url="/treatmentgroups?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_treatmentgroup_analysisgroups" labelCode="menu_item_treatmentgroup_analysisgroups_label" messageCode="global_menu_find" roles="" url="/treatmentgroups?find=ByAnalysisGroups&amp;form"/>
-    <menu-item hidden="false" id="fi_treatmentgroup_codenameequals" labelCode="menu_item_treatmentgroup_codenameequals_label" messageCode="global_menu_find" roles="" url="/treatmentgroups?find=ByCodeNameEquals&amp;form"/>
-    <menu-item hidden="false" id="fi_treatmentgroup_lstransactionequals" labelCode="menu_item_treatmentgroup_lstransactionequals_label" messageCode="global_menu_find" roles="" url="/treatmentgroups?find=ByLsTransactionEquals&amp;form"/>
-    </menu-item>
-<menu-item id="c_experimentlabel" labelCode="menu_category_experimentlabel_label" name="Experimentlabel">
-        <menu-item hidden="false" id="i_experimentlabel_new" labelCode="menu_item_experimentlabel_new_label" messageCode="global_menu_new" roles="" url="/experimentlabels?form"/>
-    <menu-item hidden="false" id="i_experimentlabel_list" labelCode="menu_item_experimentlabel_list_label" messageCode="global_menu_list" roles="" url="/experimentlabels?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_experimentlabel_experiment" labelCode="menu_item_experimentlabel_experiment_label" messageCode="global_menu_find" roles="" url="/experimentlabels?find=ByExperiment&amp;form"/>
-    <menu-item hidden="false" id="fi_experimentlabel_experimentandignorednot" labelCode="menu_item_experimentlabel_experimentandignorednot_label" messageCode="global_menu_find" roles="" url="/experimentlabels?find=ByExperimentAndIgnoredNot&amp;form"/>
-    <menu-item hidden="false" id="fi_experimentlabel_labeltextlike" labelCode="menu_item_experimentlabel_labeltextlike_label" messageCode="global_menu_find" roles="" url="/experimentlabels?find=ByLabelTextLike&amp;form"/>
-    <menu-item hidden="false" id="fi_experimentlabel_labeltextlikeandlstypeandkindequalsandpreferrednotandignorednot" labelCode="menu_item_experimentlabel_labeltextlikeandlstypeandkindequalsandpreferrednotandignorednot_label" messageCode="global_menu_find" roles="" url="/experimentlabels?find=ByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot&amp;form"/>
-    <menu-item hidden="false" id="fi_experimentlabel_lstypeandkindequalsandpreferrednotandignorednot" labelCode="menu_item_experimentlabel_lstypeandkindequalsandpreferrednotandignorednot_label" messageCode="global_menu_find" roles="" url="/experimentlabels?find=ByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot&amp;form"/>
-    </menu-item>
-<menu-item id="c_unitkind" labelCode="menu_category_unitkind_label" name="Unitkind">
-        <menu-item hidden="false" id="i_unitkind_new" labelCode="menu_item_unitkind_new_label" messageCode="global_menu_new" roles="" url="/unitkinds?form"/>
-    <menu-item hidden="false" id="i_unitkind_list" labelCode="menu_item_unitkind_list_label" messageCode="global_menu_list" roles="" url="/unitkinds?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_protocolstate" labelCode="menu_category_protocolstate_label" name="Protocolstate">
-        <menu-item hidden="false" id="i_protocolstate_new" labelCode="menu_item_protocolstate_new_label" messageCode="global_menu_new" roles="" url="/protocolstates?form"/>
-    <menu-item hidden="false" id="i_protocolstate_list" labelCode="menu_item_protocolstate_list_label" messageCode="global_menu_list" roles="" url="/protocolstates?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_protocolstate_lstransactionequals" labelCode="menu_item_protocolstate_lstransactionequals_label" messageCode="global_menu_find" roles="" url="/protocolstates?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_protocolstate_protocol" labelCode="menu_item_protocolstate_protocol_label" messageCode="global_menu_find" roles="" url="/protocolstates?find=ByProtocol&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_experimentvalue" labelCode="menu_category_experimentvalue_label" name="Experimentvalue">
-        <menu-item hidden="false" id="i_experimentvalue_new" labelCode="menu_item_experimentvalue_new_label" messageCode="global_menu_new" roles="" url="/experimentvalues?form"/>
-    <menu-item hidden="false" id="i_experimentvalue_list" labelCode="menu_item_experimentvalue_list_label" messageCode="global_menu_list" roles="" url="/experimentvalues?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_experimentvalue_lskindequalsandcodevaluelike" labelCode="menu_item_experimentvalue_lskindequalsandcodevaluelike_label" messageCode="global_menu_find" roles="" url="/experimentvalues?find=ByLsKindEqualsAndCodeValueLike&amp;form"/>
-    <menu-item hidden="false" id="fi_experimentvalue_lskindequalsandstringvaluelike" labelCode="menu_item_experimentvalue_lskindequalsandstringvaluelike_label" messageCode="global_menu_find" roles="" url="/experimentvalues?find=ByLsKindEqualsAndStringValueLike&amp;form"/>
-    <menu-item hidden="false" id="fi_experimentvalue_lsstate" labelCode="menu_item_experimentvalue_lsstate_label" messageCode="global_menu_find" roles="" url="/experimentvalues?find=ByLsState&amp;form"/>
-    <menu-item hidden="false" id="fi_experimentvalue_lsstateandignorednotandlskindequalsandlstypeequalsandstringvalueequals" labelCode="menu_item_experimentvalue_lsstateandignorednotandlskindequalsandlstypeequalsandstringvalueequals_label" messageCode="global_menu_find" roles="" url="/experimentvalues?find=ByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals&amp;form"/>
-    </menu-item>
-<menu-item id="c_itxsubjectcontainerstate" labelCode="menu_category_itxsubjectcontainerstate_label" name="Itxsubjectcontainerstate">
-        <menu-item hidden="false" id="i_itxsubjectcontainerstate_new" labelCode="menu_item_itxsubjectcontainerstate_new_label" messageCode="global_menu_new" roles="" url="/itxsubjectcontainerstates?form"/>
-    <menu-item hidden="false" id="i_itxsubjectcontainerstate_list" labelCode="menu_item_itxsubjectcontainerstate_list_label" messageCode="global_menu_list" roles="" url="/itxsubjectcontainerstates?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_containerkind" labelCode="menu_category_containerkind_label" name="Containerkind">
-        <menu-item hidden="false" id="i_containerkind_new" labelCode="menu_item_containerkind_new_label" messageCode="global_menu_new" roles="" url="/containerkinds?form"/>
-    <menu-item hidden="false" id="i_containerkind_list" labelCode="menu_item_containerkind_list_label" messageCode="global_menu_list" roles="" url="/containerkinds?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_subject" labelCode="menu_category_subject_label" name="Subject">
-        <menu-item hidden="false" id="i_subject_new" labelCode="menu_item_subject_new_label" messageCode="global_menu_new" roles="" url="/subjects?form"/>
-    <menu-item hidden="false" id="i_subject_list" labelCode="menu_item_subject_list_label" messageCode="global_menu_list" roles="" url="/subjects?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_subject_codenameequals" labelCode="menu_item_subject_codenameequals_label" messageCode="global_menu_find" roles="" url="/subjects?find=ByCodeNameEquals&amp;form"/>
-    <menu-item hidden="false" id="fi_subject_lstransactionequals" labelCode="menu_item_subject_lstransactionequals_label" messageCode="global_menu_find" roles="" url="/subjects?find=ByLsTransactionEquals&amp;form"/>
-    <menu-item hidden="false" id="fi_subject_treatmentgroups" labelCode="menu_item_subject_treatmentgroups_label" messageCode="global_menu_find" roles="" url="/subjects?find=ByTreatmentGroups&amp;form"/>
-    </menu-item>
-<menu-item id="c_valuekind" labelCode="menu_category_valuekind_label" name="Valuekind">
-        <menu-item hidden="false" id="i_valuekind_new" labelCode="menu_item_valuekind_new_label" messageCode="global_menu_new" roles="" url="/valuekinds?form"/>
-    <menu-item hidden="false" id="i_valuekind_list" labelCode="menu_item_valuekind_list_label" messageCode="global_menu_list" roles="" url="/valuekinds?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_valuekind_kindnameequalsandlstype" labelCode="menu_item_valuekind_kindnameequalsandlstype_label" messageCode="global_menu_find" roles="" url="/valuekinds?find=ByKindNameEqualsAndLsType&amp;form"/>
-    <menu-item hidden="false" id="fi_valuekind_lstype" labelCode="menu_item_valuekind_lstype_label" messageCode="global_menu_find" roles="" url="/valuekinds?find=ByLsType&amp;form"/>
-    </menu-item>
-<menu-item id="c_statekind" labelCode="menu_category_statekind_label" name="Statekind">
-        <menu-item hidden="false" id="i_statekind_new" labelCode="menu_item_statekind_new_label" messageCode="global_menu_new" roles="" url="/statekinds?form"/>
-    <menu-item hidden="false" id="i_statekind_list" labelCode="menu_item_statekind_list_label" messageCode="global_menu_list" roles="" url="/statekinds?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_statekind_kindnameequals" labelCode="menu_item_statekind_kindnameequals_label" messageCode="global_menu_find" roles="" url="/statekinds?find=ByKindNameEquals&amp;form"/>
-    <menu-item hidden="false" id="fi_statekind_kindnameequalsandlstype" labelCode="menu_item_statekind_kindnameequalsandlstype_label" messageCode="global_menu_find" roles="" url="/statekinds?find=ByKindNameEqualsAndLsType&amp;form"/>
-    <menu-item hidden="false" id="fi_statekind_lstype" labelCode="menu_item_statekind_lstype_label" messageCode="global_menu_find" roles="" url="/statekinds?find=ByLsType&amp;form"/>
-    </menu-item>
-<menu-item id="c_thingtype" labelCode="menu_category_thingtype_label" name="Thingtype">
-        <menu-item hidden="false" id="i_thingtype_new" labelCode="menu_item_thingtype_new_label" messageCode="global_menu_new" roles="" url="/thingtypes?form"/>
-    <menu-item hidden="false" id="i_thingtype_list" labelCode="menu_item_thingtype_list_label" messageCode="global_menu_list" roles="" url="/thingtypes?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_thingtype_typenameequals" labelCode="menu_item_thingtype_typenameequals_label" messageCode="global_menu_find" roles="" url="/thingtypes?find=ByTypeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_itxcontainercontainer" labelCode="menu_category_itxcontainercontainer_label" name="Itxcontainercontainer">
-        <menu-item hidden="false" id="i_itxcontainercontainer_new" labelCode="menu_item_itxcontainercontainer_new_label" messageCode="global_menu_new" roles="" url="/itxcontainercontainers?form"/>
-    <menu-item hidden="false" id="i_itxcontainercontainer_list" labelCode="menu_item_itxcontainercontainer_list_label" messageCode="global_menu_list" roles="" url="/itxcontainercontainers?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_itxcontainercontainer_lstransactionequals" labelCode="menu_item_itxcontainercontainer_lstransactionequals_label" messageCode="global_menu_find" roles="" url="/itxcontainercontainers?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_itxcontainercontainer_lstypeequalsandfirstcontainerequals" labelCode="menu_item_itxcontainercontainer_lstypeequalsandfirstcontainerequals_label" messageCode="global_menu_find" roles="" url="/itxcontainercontainers?find=ByLsTypeEqualsAndFirstContainerEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_itxcontainercontainer_lstypeequalsandsecondcontainerequals" labelCode="menu_item_itxcontainercontainer_lstypeequalsandsecondcontainerequals_label" messageCode="global_menu_find" roles="" url="/itxcontainercontainers?find=ByLsTypeEqualsAndSecondContainerEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_valuetype" labelCode="menu_category_valuetype_label" name="Valuetype">
-        <menu-item hidden="false" id="i_valuetype_new" labelCode="menu_item_valuetype_new_label" messageCode="global_menu_new" roles="" url="/valuetypes?form"/>
-    <menu-item hidden="false" id="i_valuetype_list" labelCode="menu_item_valuetype_list_label" messageCode="global_menu_list" roles="" url="/valuetypes?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_valuetype_typenameequals" labelCode="menu_item_valuetype_typenameequals_label" messageCode="global_menu_find" roles="" url="/valuetypes?find=ByTypeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_protocolvalue" labelCode="menu_category_protocolvalue_label" name="Protocolvalue">
-        <menu-item hidden="false" id="i_protocolvalue_new" labelCode="menu_item_protocolvalue_new_label" messageCode="global_menu_new" roles="" url="/protocolvalues?form"/>
-    <menu-item hidden="false" id="i_protocolvalue_list" labelCode="menu_item_protocolvalue_list_label" messageCode="global_menu_list" roles="" url="/protocolvalues?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_protocolvalue_lskindequalsandcodevaluelike" labelCode="menu_item_protocolvalue_lskindequalsandcodevaluelike_label" messageCode="global_menu_find" roles="" url="/protocolvalues?find=ByLsKindEqualsAndCodeValueLike&amp;form"/>
-    <menu-item hidden="false" id="fi_protocolvalue_lskindequalsandstringvaluelike" labelCode="menu_item_protocolvalue_lskindequalsandstringvaluelike_label" messageCode="global_menu_find" roles="" url="/protocolvalues?find=ByLsKindEqualsAndStringValueLike&amp;form"/>
-    <menu-item hidden="false" id="fi_protocolvalue_lsstate" labelCode="menu_item_protocolvalue_lsstate_label" messageCode="global_menu_find" roles="" url="/protocolvalues?find=ByLsState&amp;form"/>
-    <menu-item hidden="false" id="fi_protocolvalue_lstransactionequals" labelCode="menu_item_protocolvalue_lstransactionequals_label" messageCode="global_menu_find" roles="" url="/protocolvalues?find=ByLsTransactionEquals&amp;form"/>
-    </menu-item>
-<menu-item id="c_itxcontainercontainerstate" labelCode="menu_category_itxcontainercontainerstate_label" name="Itxcontainercontainerstate">
-        <menu-item hidden="false" id="i_itxcontainercontainerstate_new" labelCode="menu_item_itxcontainercontainerstate_new_label" messageCode="global_menu_new" roles="" url="/itxcontainercontainerstates?form"/>
-    <menu-item hidden="false" id="i_itxcontainercontainerstate_list" labelCode="menu_item_itxcontainercontainerstate_list_label" messageCode="global_menu_list" roles="" url="/itxcontainercontainerstates?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_interactiontype" labelCode="menu_category_interactiontype_label" name="Interactiontype">
-        <menu-item hidden="false" id="i_interactiontype_new" labelCode="menu_item_interactiontype_new_label" messageCode="global_menu_new" roles="" url="/interactiontypes?form"/>
-    <menu-item hidden="false" id="i_interactiontype_list" labelCode="menu_item_interactiontype_list_label" messageCode="global_menu_list" roles="" url="/interactiontypes?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_labelsequence" labelCode="menu_category_labelsequence_label" name="Labelsequence">
-        <menu-item hidden="false" id="i_labelsequence_new" labelCode="menu_item_labelsequence_new_label" messageCode="global_menu_new" roles="" url="/labelsequences?form"/>
-    <menu-item hidden="false" id="i_labelsequence_list" labelCode="menu_item_labelsequence_list_label" messageCode="global_menu_list" roles="" url="/labelsequences?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_labelsequence_labeltypeandkindequals" labelCode="menu_item_labelsequence_labeltypeandkindequals_label" messageCode="global_menu_find" roles="" url="/labelsequences?find=ByLabelTypeAndKindEquals&amp;form"/>
-    <menu-item hidden="false" id="fi_labelsequence_thingtypeandkindequals" labelCode="menu_item_labelsequence_thingtypeandkindequals_label" messageCode="global_menu_find" roles="" url="/labelsequences?find=ByThingTypeAndKindEquals&amp;form"/>
-    <menu-item hidden="false" id="fi_labelsequence_thingtypeandkindequalsandlabeltypeandkindequals" labelCode="menu_item_labelsequence_thingtypeandkindequalsandlabeltypeandkindequals_label" messageCode="global_menu_find" roles="" url="/labelsequences?find=ByThingTypeAndKindEqualsAndLabelTypeAndKindEquals&amp;form"/>
-    <menu-item hidden="false" id="fi_labelsequence_thingtypeandkindequalsandlabeltypeandkindequalsandlabelprefixequals" labelCode="menu_item_labelsequence_thingtypeandkindequalsandlabeltypeandkindequalsandlabelprefixequals_label" messageCode="global_menu_find" roles="" url="/labelsequences?find=ByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals&amp;form"/>
-    </menu-item>
-<menu-item id="c_containertype" labelCode="menu_category_containertype_label" name="Containertype">
-        <menu-item hidden="false" id="i_containertype_new" labelCode="menu_item_containertype_new_label" messageCode="global_menu_new" roles="" url="/containertypes?form"/>
-    <menu-item hidden="false" id="i_containertype_list" labelCode="menu_item_containertype_list_label" messageCode="global_menu_list" roles="" url="/containertypes?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_containertype_typenameequals" labelCode="menu_item_containertype_typenameequals_label" messageCode="global_menu_find" roles="" url="/containertypes?find=ByTypeNameEquals&amp;form"/>
-    </menu-item>
-<menu-item id="c_experiment" labelCode="menu_category_experiment_label" name="Experiment">
-        <menu-item hidden="false" id="i_experiment_new" labelCode="menu_item_experiment_new_label" messageCode="global_menu_new" roles="" url="/experiments?form"/>
-    <menu-item hidden="false" id="i_experiment_list" labelCode="menu_item_experiment_list_label" messageCode="global_menu_list" roles="" url="/experiments?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_experiment_codenameequals" labelCode="menu_item_experiment_codenameequals_label" messageCode="global_menu_find" roles="" url="/experiments?find=ByCodeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_experiment_codenamelike" labelCode="menu_item_experiment_codenamelike_label" messageCode="global_menu_find" roles="" url="/experiments?find=ByCodeNameLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_experiment_lskindequals" labelCode="menu_item_experiment_lskindequals_label" messageCode="global_menu_find" roles="" url="/experiments?find=ByLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_experiment_lskindlike" labelCode="menu_item_experiment_lskindlike_label" messageCode="global_menu_find" roles="" url="/experiments?find=ByLsKindLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_experiment_lstransaction" labelCode="menu_item_experiment_lstransaction_label" messageCode="global_menu_find" roles="" url="/experiments?find=ByLsTransaction&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_experiment_lstypeequals" labelCode="menu_item_experiment_lstypeequals_label" messageCode="global_menu_find" roles="" url="/experiments?find=ByLsTypeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_experiment_lstypeequalsandlskindequals" labelCode="menu_item_experiment_lstypeequalsandlskindequals_label" messageCode="global_menu_find" roles="" url="/experiments?find=ByLsTypeEqualsAndLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_experiment_lstypelike" labelCode="menu_item_experiment_lstypelike_label" messageCode="global_menu_find" roles="" url="/experiments?find=ByLsTypeLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_experiment_protocol" labelCode="menu_item_experiment_protocol_label" messageCode="global_menu_find" roles="" url="/experiments?find=ByProtocol&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_experiment_recordedbylike" labelCode="menu_item_experiment_recordedbylike_label" messageCode="global_menu_find" roles="" url="/experiments?find=ByRecordedByLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_statetype" labelCode="menu_category_statetype_label" name="Statetype">
-        <menu-item hidden="false" id="i_statetype_new" labelCode="menu_item_statetype_new_label" messageCode="global_menu_new" roles="" url="/statetypes?form"/>
-    <menu-item hidden="false" id="i_statetype_list" labelCode="menu_item_statetype_list_label" messageCode="global_menu_list" roles="" url="/statetypes?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_statetype_typenameequals" labelCode="menu_item_statetype_typenameequals_label" messageCode="global_menu_find" roles="" url="/statetypes?find=ByTypeNameEquals&amp;form"/>
-    </menu-item>
-<menu-item id="c_analysisgroupstate" labelCode="menu_category_analysisgroupstate_label" name="Analysisgroupstate">
-        <menu-item hidden="false" id="i_analysisgroupstate_new" labelCode="menu_item_analysisgroupstate_new_label" messageCode="global_menu_new" roles="" url="/analysisgroupstates?form"/>
-    <menu-item hidden="false" id="i_analysisgroupstate_list" labelCode="menu_item_analysisgroupstate_list_label" messageCode="global_menu_list" roles="" url="/analysisgroupstates?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_analysisgroupstate_analysisgroup" labelCode="menu_item_analysisgroupstate_analysisgroup_label" messageCode="global_menu_find" roles="" url="/analysisgroupstates?find=ByAnalysisGroup&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_analysisgroupstate_analysisgroupandlstypeequalsandlskindequalsandignorednot" labelCode="menu_item_analysisgroupstate_analysisgroupandlstypeequalsandlskindequalsandignorednot_label" messageCode="global_menu_find" roles="" url="/analysisgroupstates?find=ByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_analysisgroupstate_lstransactionequals" labelCode="menu_item_analysisgroupstate_lstransactionequals_label" messageCode="global_menu_find" roles="" url="/analysisgroupstates?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_analysisgroupstate_lstypeandkindequals" labelCode="menu_item_analysisgroupstate_lstypeandkindequals_label" messageCode="global_menu_find" roles="" url="/analysisgroupstates?find=ByLsTypeAndKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_analysisgroupstate_lstypeequalsandlskindequals" labelCode="menu_item_analysisgroupstate_lstypeequalsandlskindequals_label" messageCode="global_menu_find" roles="" url="/analysisgroupstates?find=ByLsTypeEqualsAndLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_itxsubjectcontainervalue" labelCode="menu_category_itxsubjectcontainervalue_label" name="Itxsubjectcontainervalue">
-        <menu-item hidden="false" id="i_itxsubjectcontainervalue_new" labelCode="menu_item_itxsubjectcontainervalue_new_label" messageCode="global_menu_new" roles="" url="/itxsubjectcontainervalues?form"/>
-    <menu-item hidden="false" id="i_itxsubjectcontainervalue_list" labelCode="menu_item_itxsubjectcontainervalue_list_label" messageCode="global_menu_list" roles="" url="/itxsubjectcontainervalues?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_treatmentgroupstate" labelCode="menu_category_treatmentgroupstate_label" name="Treatmentgroupstate">
-        <menu-item hidden="false" id="i_treatmentgroupstate_new" labelCode="menu_item_treatmentgroupstate_new_label" messageCode="global_menu_new" roles="" url="/treatmentgroupstates?form"/>
-    <menu-item hidden="false" id="i_treatmentgroupstate_list" labelCode="menu_item_treatmentgroupstate_list_label" messageCode="global_menu_list" roles="" url="/treatmentgroupstates?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_treatmentgroupstate_lstransactionequals" labelCode="menu_item_treatmentgroupstate_lstransactionequals_label" messageCode="global_menu_find" roles="" url="/treatmentgroupstates?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_treatmentgroupstate_lstypeandkindequals" labelCode="menu_item_treatmentgroupstate_lstypeandkindequals_label" messageCode="global_menu_find" roles="" url="/treatmentgroupstates?find=ByLsTypeAndKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_treatmentgroupstate_treatmentgroup" labelCode="menu_item_treatmentgroupstate_treatmentgroup_label" messageCode="global_menu_find" roles="" url="/treatmentgroupstates?find=ByTreatmentGroup&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_author" labelCode="menu_category_author_label" name="Author">
-        <menu-item hidden="false" id="i_author_new" labelCode="menu_item_author_new_label" messageCode="global_menu_new" roles="" url="/authors?form"/>
-    <menu-item hidden="false" id="i_author_list" labelCode="menu_item_author_list_label" messageCode="global_menu_list" roles="" url="/authors?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_author_activationkeyandemailaddress" labelCode="menu_item_author_activationkeyandemailaddress_label" messageCode="global_menu_find" roles="" url="/authors?find=ByActivationKeyAndEmailAddress&amp;form"/>
-    <menu-item hidden="false" id="fi_author_emailaddress" labelCode="menu_item_author_emailaddress_label" messageCode="global_menu_find" roles="" url="/authors?find=ByEmailAddress&amp;form"/>
-    <menu-item hidden="false" id="fi_author_username" labelCode="menu_item_author_username_label" messageCode="global_menu_find" roles="" url="/authors?find=ByUserName&amp;form"/>
-    </menu-item>
-<menu-item id="c_thingpagearchive" labelCode="menu_category_thingpagearchive_label" name="Thingpagearchive">
-        <menu-item hidden="false" id="i_thingpagearchive_new" labelCode="menu_item_thingpagearchive_new_label" messageCode="global_menu_new" roles="" url="/thingpagearchives?form"/>
-    <menu-item hidden="false" id="i_thingpagearchive_list" labelCode="menu_item_thingpagearchive_list_label" messageCode="global_menu_list" roles="" url="/thingpagearchives?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_analysisgrouplabel" labelCode="menu_category_analysisgrouplabel_label" name="Analysisgrouplabel">
-        <menu-item hidden="false" id="i_analysisgrouplabel_new" labelCode="menu_item_analysisgrouplabel_new_label" messageCode="global_menu_new" roles="" url="/analysisgrouplabels?form"/>
-    <menu-item hidden="false" id="i_analysisgrouplabel_list" labelCode="menu_item_analysisgrouplabel_list_label" messageCode="global_menu_list" roles="" url="/analysisgrouplabels?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_analysisgrouplabel_analysisgroup" labelCode="menu_item_analysisgrouplabel_analysisgroup_label" messageCode="global_menu_find" roles="" url="/analysisgrouplabels?find=ByAnalysisGroup&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_analysisgrouplabel_lstransactionequals" labelCode="menu_item_analysisgrouplabel_lstransactionequals_label" messageCode="global_menu_find" roles="" url="/analysisgrouplabels?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_thingkind" labelCode="menu_category_thingkind_label" name="Thingkind">
-        <menu-item hidden="false" id="i_thingkind_new" labelCode="menu_item_thingkind_new_label" messageCode="global_menu_new" roles="" url="/thingkinds?form"/>
-    <menu-item hidden="false" id="i_thingkind_list" labelCode="menu_item_thingkind_list_label" messageCode="global_menu_list" roles="" url="/thingkinds?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_thingkind_kindnameequalsandlstype" labelCode="menu_item_thingkind_kindnameequalsandlstype_label" messageCode="global_menu_find" roles="" url="/thingkinds?find=ByKindNameEqualsAndLsType&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_thingkind_lstype" labelCode="menu_item_thingkind_lstype_label" messageCode="global_menu_find" roles="" url="/thingkinds?find=ByLsType&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_thingkind_lstypeandkindequals" labelCode="menu_item_thingkind_lstypeandkindequals_label" messageCode="global_menu_find" roles="" url="/thingkinds?find=ByLsTypeAndKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_analysisgroupvalue" labelCode="menu_category_analysisgroupvalue_label" name="Analysisgroupvalue">
-        <menu-item hidden="false" id="i_analysisgroupvalue_new" labelCode="menu_item_analysisgroupvalue_new_label" messageCode="global_menu_new" roles="" url="/analysisgroupvalues?form"/>
-    <menu-item hidden="false" id="i_analysisgroupvalue_list" labelCode="menu_item_analysisgroupvalue_list_label" messageCode="global_menu_list" roles="" url="/analysisgroupvalues?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_analysisgroupvalue_codevalueequals" labelCode="menu_item_analysisgroupvalue_codevalueequals_label" messageCode="global_menu_find" roles="" url="/analysisgroupvalues?find=ByCodeValueEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_analysisgroupvalue_ignorednotandcodevalueequals" labelCode="menu_item_analysisgroupvalue_ignorednotandcodevalueequals_label" messageCode="global_menu_find" roles="" url="/analysisgroupvalues?find=ByIgnoredNotAndCodeValueEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_analysisgroupvalue_lsstate" labelCode="menu_item_analysisgroupvalue_lsstate_label" messageCode="global_menu_find" roles="" url="/analysisgroupvalues?find=ByLsState&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_analysisgroupvalue_lstransactionequals" labelCode="menu_item_analysisgroupvalue_lstransactionequals_label" messageCode="global_menu_find" roles="" url="/analysisgroupvalues?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_analysisgroupvalue_lstypeequalsandlskindequals" labelCode="menu_item_analysisgroupvalue_lstypeequalsandlskindequals_label" messageCode="global_menu_find" roles="" url="/analysisgroupvalues?find=ByLsTypeEqualsAndLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_analysisgroupvalue_lstypeequalsandlskindequalsandstringvaluelikeandignorednot" labelCode="menu_item_analysisgroupvalue_lstypeequalsandlskindequalsandstringvaluelikeandignorednot_label" messageCode="global_menu_find" roles="" url="/analysisgroupvalues?find=ByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_lstransaction" labelCode="menu_category_lstransaction_label" name="Lstransaction">
-        <menu-item hidden="false" id="i_lstransaction_new" labelCode="menu_item_lstransaction_new_label" messageCode="global_menu_new" roles="" url="/lstransactions?form"/>
-    <menu-item hidden="false" id="i_lstransaction_list" labelCode="menu_item_lstransaction_list_label" messageCode="global_menu_list" roles="" url="/lstransactions?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_containerstate" labelCode="menu_category_containerstate_label" name="Containerstate">
-        <menu-item hidden="false" id="i_containerstate_new" labelCode="menu_item_containerstate_new_label" messageCode="global_menu_new" roles="" url="/containerstates?form"/>
-    <menu-item hidden="false" id="i_containerstate_list" labelCode="menu_item_containerstate_list_label" messageCode="global_menu_list" roles="" url="/containerstates?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_containerstate_container" labelCode="menu_item_containerstate_container_label" messageCode="global_menu_find" roles="" url="/containerstates?find=ByContainer&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_containerstate_containerandlskindequalsandignorednot" labelCode="menu_item_containerstate_containerandlskindequalsandignorednot_label" messageCode="global_menu_find" roles="" url="/containerstates?find=ByContainerAndLsKindEqualsAndIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_containerstate_ignorednot" labelCode="menu_item_containerstate_ignorednot_label" messageCode="global_menu_find" roles="" url="/containerstates?find=ByIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_treatmentgroupvalue" labelCode="menu_category_treatmentgroupvalue_label" name="Treatmentgroupvalue">
-        <menu-item hidden="false" id="i_treatmentgroupvalue_new" labelCode="menu_item_treatmentgroupvalue_new_label" messageCode="global_menu_new" roles="" url="/treatmentgroupvalues?form"/>
-    <menu-item hidden="false" id="i_treatmentgroupvalue_list" labelCode="menu_item_treatmentgroupvalue_list_label" messageCode="global_menu_list" roles="" url="/treatmentgroupvalues?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_treatmentgroupvalue_codevalueequals" labelCode="menu_item_treatmentgroupvalue_codevalueequals_label" messageCode="global_menu_find" roles="" url="/treatmentgroupvalues?find=ByCodeValueEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_treatmentgroupvalue_ignorednotandcodevalueequals" labelCode="menu_item_treatmentgroupvalue_ignorednotandcodevalueequals_label" messageCode="global_menu_find" roles="" url="/treatmentgroupvalues?find=ByIgnoredNotAndCodeValueEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_treatmentgroupvalue_lsstate" labelCode="menu_item_treatmentgroupvalue_lsstate_label" messageCode="global_menu_find" roles="" url="/treatmentgroupvalues?find=ByLsState&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_treatmentgroupvalue_lstransactionequals" labelCode="menu_item_treatmentgroupvalue_lstransactionequals_label" messageCode="global_menu_find" roles="" url="/treatmentgroupvalues?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_containerlabel" labelCode="menu_category_containerlabel_label" name="Containerlabel">
-        <menu-item hidden="false" id="i_containerlabel_new" labelCode="menu_item_containerlabel_new_label" messageCode="global_menu_new" roles="" url="/containerlabels?form"/>
-    <menu-item hidden="false" id="i_containerlabel_list" labelCode="menu_item_containerlabel_list_label" messageCode="global_menu_list" roles="" url="/containerlabels?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_containerlabel_containerandignorednot" labelCode="menu_item_containerlabel_containerandignorednot_label" messageCode="global_menu_find" roles="" url="/containerlabels?find=ByContainerAndIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_containerlabel_labeltextequalsandignorednot" labelCode="menu_item_containerlabel_labeltextequalsandignorednot_label" messageCode="global_menu_find" roles="" url="/containerlabels?find=ByLabelTextEqualsAndIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_containerlabel_lstransactionequals" labelCode="menu_item_containerlabel_lstransactionequals_label" messageCode="global_menu_find" roles="" url="/containerlabels?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_containerlabel_lstypeequalsandlabeltextequalsandignorednot" labelCode="menu_item_containerlabel_lstypeequalsandlabeltextequalsandignorednot_label" messageCode="global_menu_find" roles="" url="/containerlabels?find=ByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_treatmentgrouplabel" labelCode="menu_category_treatmentgrouplabel_label" name="Treatmentgrouplabel">
-        <menu-item hidden="false" id="i_treatmentgrouplabel_new" labelCode="menu_item_treatmentgrouplabel_new_label" messageCode="global_menu_new" roles="" url="/treatmentgrouplabels?form"/>
-    <menu-item hidden="false" id="i_treatmentgrouplabel_list" labelCode="menu_item_treatmentgrouplabel_list_label" messageCode="global_menu_list" roles="" url="/treatmentgrouplabels?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_treatmentgrouplabel_lstransactionequals" labelCode="menu_item_treatmentgrouplabel_lstransactionequals_label" messageCode="global_menu_find" roles="" url="/treatmentgrouplabels?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_treatmentgrouplabel_treatmentgroup" labelCode="menu_item_treatmentgrouplabel_treatmentgroup_label" messageCode="global_menu_find" roles="" url="/treatmentgrouplabels?find=ByTreatmentGroup&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_applicationsetting" labelCode="menu_category_applicationsetting_label" name="Applicationsetting">
-        <menu-item hidden="false" id="i_applicationsetting_new" labelCode="menu_item_applicationsetting_new_label" messageCode="global_menu_new" roles="" url="/applicationsettings?form"/>
-    <menu-item hidden="false" id="i_applicationsetting_list" labelCode="menu_item_applicationsetting_list_label" messageCode="global_menu_list" roles="" url="/applicationsettings?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_applicationsetting_propnameequals" labelCode="menu_item_applicationsetting_propnameequals_label" messageCode="global_menu_find" roles="" url="/applicationsettings?find=ByPropNameEquals&amp;form"/>
-    <menu-item hidden="false" id="fi_applicationsetting_propnameequalsandignorednot" labelCode="menu_item_applicationsetting_propnameequalsandignorednot_label" messageCode="global_menu_find" roles="" url="/applicationsettings?find=ByPropNameEqualsAndIgnoredNot&amp;form"/>
-    </menu-item>
-<menu-item id="c_filething" labelCode="menu_category_filething_label" name="Filething">
-        <menu-item hidden="false" id="i_filething_new" labelCode="menu_item_filething_new_label" messageCode="global_menu_new" roles="" url="/filethings?form"/>
-    <menu-item hidden="false" id="i_filething_list" labelCode="menu_item_filething_list_label" messageCode="global_menu_list" roles="" url="/filethings?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_subjectlabel" labelCode="menu_category_subjectlabel_label" name="Subjectlabel">
-        <menu-item hidden="false" id="i_subjectlabel_new" labelCode="menu_item_subjectlabel_new_label" messageCode="global_menu_new" roles="" url="/subjectlabels?form"/>
-    <menu-item hidden="false" id="i_subjectlabel_list" labelCode="menu_item_subjectlabel_list_label" messageCode="global_menu_list" roles="" url="/subjectlabels?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_subjectlabel_subject" labelCode="menu_item_subjectlabel_subject_label" messageCode="global_menu_find" roles="" url="/subjectlabels?find=BySubject&amp;form"/>
-    </menu-item>
-<menu-item id="c_experimenttype" labelCode="menu_category_experimenttype_label" name="Experimenttype">
-        <menu-item hidden="false" id="i_experimenttype_new" labelCode="menu_item_experimenttype_new_label" messageCode="global_menu_new" roles="" url="/experimenttypes?form"/>
-    <menu-item hidden="false" id="i_experimenttype_list" labelCode="menu_item_experimenttype_list_label" messageCode="global_menu_list" roles="" url="/experimenttypes?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_experimenttype_typenameequals" labelCode="menu_item_experimenttype_typenameequals_label" messageCode="global_menu_find" roles="" url="/experimenttypes?find=ByTypeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_experimentkind" labelCode="menu_category_experimentkind_label" name="Experimentkind">
-        <menu-item hidden="false" id="i_experimentkind_new" labelCode="menu_item_experimentkind_new_label" messageCode="global_menu_new" roles="" url="/experimentkinds?form"/>
-    <menu-item hidden="false" id="i_experimentkind_list" labelCode="menu_item_experimentkind_list_label" messageCode="global_menu_list" roles="" url="/experimentkinds?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_protocoltype" labelCode="menu_category_protocoltype_label" name="Protocoltype">
-        <menu-item hidden="false" id="i_protocoltype_new" labelCode="menu_item_protocoltype_new_label" messageCode="global_menu_new" roles="" url="/protocoltypes?form"/>
-    <menu-item hidden="false" id="i_protocoltype_list" labelCode="menu_item_protocoltype_list_label" messageCode="global_menu_list" roles="" url="/protocoltypes?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_protocoltype_typenameequals" labelCode="menu_item_protocoltype_typenameequals_label" messageCode="global_menu_find" roles="" url="/protocoltypes?find=ByTypeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_protocolkind" labelCode="menu_category_protocolkind_label" name="Protocolkind">
-        <menu-item hidden="false" id="i_protocolkind_new" labelCode="menu_item_protocolkind_new_label" messageCode="global_menu_new" roles="" url="/protocolkinds?form"/>
-    <menu-item hidden="false" id="i_protocolkind_list" labelCode="menu_item_protocolkind_list_label" messageCode="global_menu_list" roles="" url="/protocolkinds?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_protocolkind_lstypeequalsandkindnameequals" labelCode="menu_item_protocolkind_lstypeequalsandkindnameequals_label" messageCode="global_menu_find" roles="" url="/protocolkinds?find=ByLsTypeEqualsAndKindNameEquals&amp;form"/>
-    </menu-item>
-<menu-item id="c_operatorkind" labelCode="menu_category_operatorkind_label" name="Operatorkind">
-        <menu-item hidden="false" id="i_operatorkind_new" labelCode="menu_item_operatorkind_new_label" messageCode="global_menu_new" roles="" url="/operatorkinds?form"/>
-    <menu-item hidden="false" id="i_operatorkind_list" labelCode="menu_item_operatorkind_list_label" messageCode="global_menu_list" roles="" url="/operatorkinds?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_uncertaintykind" labelCode="menu_category_uncertaintykind_label" name="Uncertaintykind">
-        <menu-item hidden="false" id="i_uncertaintykind_new" labelCode="menu_item_uncertaintykind_new_label" messageCode="global_menu_new" roles="" url="/uncertaintykinds?form"/>
-    <menu-item hidden="false" id="i_uncertaintykind_list" labelCode="menu_item_uncertaintykind_list_label" messageCode="global_menu_list" roles="" url="/uncertaintykinds?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_lstag" labelCode="menu_category_lstag_label" name="Lstag">
-        <menu-item hidden="false" id="i_lstag_new" labelCode="menu_item_lstag_new_label" messageCode="global_menu_new" roles="" url="/lstags?form"/>
-    <menu-item hidden="false" id="i_lstag_list" labelCode="menu_item_lstag_list_label" messageCode="global_menu_list" roles="" url="/lstags?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lstag_tagtextequals" labelCode="menu_item_lstag_tagtextequals_label" messageCode="global_menu_find" roles="" url="/lstags?find=ByTagTextEquals&amp;form"/>
-    <menu-item hidden="false" id="fi_lstag_tagtextlike" labelCode="menu_item_lstag_tagtextlike_label" messageCode="global_menu_find" roles="" url="/lstags?find=ByTagTextLike&amp;form"/>
-    </menu-item>
-<menu-item id="c_updatelog" labelCode="menu_category_updatelog_label" name="Updatelog">
-        <menu-item hidden="false" id="i_updatelog_new" labelCode="menu_item_updatelog_new_label" messageCode="global_menu_new" roles="" url="/updatelogs?form"/>
-    <menu-item hidden="false" id="i_updatelog_list" labelCode="menu_item_updatelog_list_label" messageCode="global_menu_list" roles="" url="/updatelogs?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_lsthing" labelCode="menu_category_lsthing_label" name="Lsthing">
-        <menu-item hidden="false" id="i_lsthing_new" labelCode="menu_item_lsthing_new_label" messageCode="global_menu_new" roles="" url="/lsthings?form"/>
-    <menu-item hidden="false" id="i_lsthing_list" labelCode="menu_item_lsthing_list_label" messageCode="global_menu_list" roles="" url="/lsthings?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsthing_codenameequals" labelCode="menu_item_lsthing_codenameequals_label" messageCode="global_menu_find" roles="" url="/lsthings?find=ByCodeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsthing_codenamelike" labelCode="menu_item_lsthing_codenamelike_label" messageCode="global_menu_find" roles="" url="/lsthings?find=ByCodeNameLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsthing_lskindequals" labelCode="menu_item_lsthing_lskindequals_label" messageCode="global_menu_find" roles="" url="/lsthings?find=ByLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsthing_lskindlike" labelCode="menu_item_lsthing_lskindlike_label" messageCode="global_menu_find" roles="" url="/lsthings?find=ByLsKindLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsthing_lstransactionequals" labelCode="menu_item_lsthing_lstransactionequals_label" messageCode="global_menu_find" roles="" url="/lsthings?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsthing_lstypeandkindequals" labelCode="menu_item_lsthing_lstypeandkindequals_label" messageCode="global_menu_find" roles="" url="/lsthings?find=ByLsTypeAndKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsthing_lstypeequals" labelCode="menu_item_lsthing_lstypeequals_label" messageCode="global_menu_find" roles="" url="/lsthings?find=ByLsTypeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsthing_lstypeequalsandlskindequals" labelCode="menu_item_lsthing_lstypeequalsandlskindequals_label" messageCode="global_menu_find" roles="" url="/lsthings?find=ByLsTypeEqualsAndLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsthing_recordedbylike" labelCode="menu_item_lsthing_recordedbylike_label" messageCode="global_menu_find" roles="" url="/lsthings?find=ByRecordedByLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsthing_recordeddategreaterthan" labelCode="menu_item_lsthing_recordeddategreaterthan_label" messageCode="global_menu_find" roles="" url="/lsthings?find=ByRecordedDateGreaterThan&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsthing_recordeddatelessthan" labelCode="menu_item_lsthing_recordeddatelessthan_label" messageCode="global_menu_find" roles="" url="/lsthings?find=ByRecordedDateLessThan&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_lsthingstate" labelCode="menu_category_lsthingstate_label" name="Lsthingstate">
-        <menu-item hidden="false" id="i_lsthingstate_new" labelCode="menu_item_lsthingstate_new_label" messageCode="global_menu_new" roles="" url="/lsthingstates?form"/>
-    <menu-item hidden="false" id="i_lsthingstate_list" labelCode="menu_item_lsthingstate_list_label" messageCode="global_menu_list" roles="" url="/lsthingstates?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsthingstate_lsthing" labelCode="menu_item_lsthingstate_lsthing_label" messageCode="global_menu_find" roles="" url="/lsthingstates?find=ByLsThing&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsthingstate_lstransactionequals" labelCode="menu_item_lsthingstate_lstransactionequals_label" messageCode="global_menu_find" roles="" url="/lsthingstates?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_lsthinglabel" labelCode="menu_category_lsthinglabel_label" name="Lsthinglabel">
-        <menu-item hidden="false" id="i_lsthinglabel_new" labelCode="menu_item_lsthinglabel_new_label" messageCode="global_menu_new" roles="" url="/lsthinglabels?form"/>
-    <menu-item hidden="false" id="i_lsthinglabel_list" labelCode="menu_item_lsthinglabel_list_label" messageCode="global_menu_list" roles="" url="/lsthinglabels?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsthinglabel_labeltextequals" labelCode="menu_item_lsthinglabel_labeltextequals_label" messageCode="global_menu_find" roles="" url="/lsthinglabels?find=ByLabelTextEquals&amp;form"/>
-    <menu-item hidden="false" id="fi_lsthinglabel_labeltextequalsandignorednot" labelCode="menu_item_lsthinglabel_labeltextequalsandignorednot_label" messageCode="global_menu_find" roles="" url="/lsthinglabels?find=ByLabelTextEqualsAndIgnoredNot&amp;form"/>
-    <menu-item hidden="false" id="fi_lsthinglabel_labeltextlike" labelCode="menu_item_lsthinglabel_labeltextlike_label" messageCode="global_menu_find" roles="" url="/lsthinglabels?find=ByLabelTextLike&amp;form"/>
-    <menu-item hidden="false" id="fi_lsthinglabel_lsthing" labelCode="menu_item_lsthinglabel_lsthing_label" messageCode="global_menu_find" roles="" url="/lsthinglabels?find=ByLsThing&amp;form"/>
-    <menu-item hidden="false" id="fi_lsthinglabel_lstransactionequals" labelCode="menu_item_lsthinglabel_lstransactionequals_label" messageCode="global_menu_find" roles="" url="/lsthinglabels?find=ByLsTransactionEquals&amp;form"/>
-    </menu-item>
-<menu-item id="c_lsthingvalue" labelCode="menu_category_lsthingvalue_label" name="Lsthingvalue">
-        <menu-item hidden="false" id="i_lsthingvalue_new" labelCode="menu_item_lsthingvalue_new_label" messageCode="global_menu_new" roles="" url="/lsthingvalues?form"/>
-    <menu-item hidden="false" id="i_lsthingvalue_list" labelCode="menu_item_lsthingvalue_list_label" messageCode="global_menu_list" roles="" url="/lsthingvalues?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsthingvalue_codevalueequals" labelCode="menu_item_lsthingvalue_codevalueequals_label" messageCode="global_menu_find" roles="" url="/lsthingvalues?find=ByCodeValueEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsthingvalue_ignorednotandcodevalueequals" labelCode="menu_item_lsthingvalue_ignorednotandcodevalueequals_label" messageCode="global_menu_find" roles="" url="/lsthingvalues?find=ByIgnoredNotAndCodeValueEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsthingvalue_lskindequalsandcodevaluelike" labelCode="menu_item_lsthingvalue_lskindequalsandcodevaluelike_label" messageCode="global_menu_find" roles="" url="/lsthingvalues?find=ByLsKindEqualsAndCodeValueLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsthingvalue_lskindequalsanddatevaluegreaterthanequals" labelCode="menu_item_lsthingvalue_lskindequalsanddatevaluegreaterthanequals_label" messageCode="global_menu_find" roles="" url="/lsthingvalues?find=ByLsKindEqualsAndDateValueGreaterThanEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsthingvalue_lskindequalsanddatevaluelessthanequals" labelCode="menu_item_lsthingvalue_lskindequalsanddatevaluelessthanequals_label" messageCode="global_menu_find" roles="" url="/lsthingvalues?find=ByLsKindEqualsAndDateValueLessThanEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsthingvalue_lskindequalsanddatevaluelike" labelCode="menu_item_lsthingvalue_lskindequalsanddatevaluelike_label" messageCode="global_menu_find" roles="" url="/lsthingvalues?find=ByLsKindEqualsAndDateValueLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsthingvalue_lskindequalsandnumericvalueequals" labelCode="menu_item_lsthingvalue_lskindequalsandnumericvalueequals_label" messageCode="global_menu_find" roles="" url="/lsthingvalues?find=ByLsKindEqualsAndNumericValueEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsthingvalue_lskindequalsandnumericvaluegreaterthanequals" labelCode="menu_item_lsthingvalue_lskindequalsandnumericvaluegreaterthanequals_label" messageCode="global_menu_find" roles="" url="/lsthingvalues?find=ByLsKindEqualsAndNumericValueGreaterThanEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsthingvalue_lskindequalsandnumericvaluelessthanequals" labelCode="menu_item_lsthingvalue_lskindequalsandnumericvaluelessthanequals_label" messageCode="global_menu_find" roles="" url="/lsthingvalues?find=ByLsKindEqualsAndNumericValueLessThanEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsthingvalue_lskindequalsandstringvalueequals" labelCode="menu_item_lsthingvalue_lskindequalsandstringvalueequals_label" messageCode="global_menu_find" roles="" url="/lsthingvalues?find=ByLsKindEqualsAndStringValueEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsthingvalue_lskindequalsandstringvaluelike" labelCode="menu_item_lsthingvalue_lskindequalsandstringvaluelike_label" messageCode="global_menu_find" roles="" url="/lsthingvalues?find=ByLsKindEqualsAndStringValueLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsthingvalue_lsstate" labelCode="menu_item_lsthingvalue_lsstate_label" messageCode="global_menu_find" roles="" url="/lsthingvalues?find=ByLsState&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsthingvalue_lstransactionequals" labelCode="menu_item_lsthingvalue_lstransactionequals_label" messageCode="global_menu_find" roles="" url="/lsthingvalues?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_codekind" labelCode="menu_category_codekind_label" name="Codekind">
-        <menu-item hidden="false" id="i_codekind_new" labelCode="menu_item_codekind_new_label" messageCode="global_menu_new" roles="" url="/codekinds?form"/>
-    <menu-item hidden="false" id="i_codekind_list" labelCode="menu_item_codekind_list_label" messageCode="global_menu_list" roles="" url="/codekinds?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_codekind_kindnameequalsandlstype" labelCode="menu_item_codekind_kindnameequalsandlstype_label" messageCode="global_menu_find" roles="" url="/codekinds?find=ByKindNameEqualsAndLsType&amp;form"/>
-    <menu-item hidden="false" id="fi_codekind_lstype" labelCode="menu_item_codekind_lstype_label" messageCode="global_menu_find" roles="" url="/codekinds?find=ByLsType&amp;form"/>
-    <menu-item hidden="false" id="fi_codekind_lstypeandkindequals" labelCode="menu_item_codekind_lstypeandkindequals_label" messageCode="global_menu_find" roles="" url="/codekinds?find=ByLsTypeAndKindEquals&amp;form"/>
-    </menu-item>
-<menu-item id="c_codetype" labelCode="menu_category_codetype_label" name="Codetype">
-        <menu-item hidden="false" id="i_codetype_new" labelCode="menu_item_codetype_new_label" messageCode="global_menu_new" roles="" url="/codetypes?form"/>
-    <menu-item hidden="false" id="i_codetype_list" labelCode="menu_item_codetype_list_label" messageCode="global_menu_list" roles="" url="/codetypes?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_codetype_typenameequals" labelCode="menu_item_codetype_typenameequals_label" messageCode="global_menu_find" roles="" url="/codetypes?find=ByTypeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_lsrole" labelCode="menu_category_lsrole_label" name="Lsrole">
-        <menu-item hidden="false" id="i_lsrole_new" labelCode="menu_item_lsrole_new_label" messageCode="global_menu_new" roles="" url="/lsroles?form"/>
-    <menu-item hidden="false" id="i_lsrole_list" labelCode="menu_item_lsrole_list_label" messageCode="global_menu_list" roles="" url="/lsroles?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsrole_lskindequals" labelCode="menu_item_lsrole_lskindequals_label" messageCode="global_menu_find" roles="" url="/lsroles?find=ByLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsrole_lstypeequals" labelCode="menu_item_lsrole_lstypeequals_label" messageCode="global_menu_find" roles="" url="/lsroles?find=ByLsTypeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsrole_lstypeequalsandlskindequals" labelCode="menu_item_lsrole_lstypeequalsandlskindequals_label" messageCode="global_menu_find" roles="" url="/lsroles?find=ByLsTypeEqualsAndLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsrole_lstypeequalsandlskindequalsandrolenameequals" labelCode="menu_item_lsrole_lstypeequalsandlskindequalsandrolenameequals_label" messageCode="global_menu_find" roles="" url="/lsroles?find=ByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsrole_lstypeequalsandrolenameequals" labelCode="menu_item_lsrole_lstypeequalsandrolenameequals_label" messageCode="global_menu_find" roles="" url="/lsroles?find=ByLsTypeEqualsAndRoleNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lsrole_rolenameequals" labelCode="menu_item_lsrole_rolenameequals_label" messageCode="global_menu_find" roles="" url="/lsroles?find=ByRoleNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_authorrole" labelCode="menu_category_authorrole_label" name="Authorrole">
-        <menu-item hidden="false" id="i_authorrole_new" labelCode="menu_item_authorrole_new_label" messageCode="global_menu_new" roles="" url="/authorroles?form"/>
-    <menu-item hidden="false" id="i_authorrole_list" labelCode="menu_item_authorrole_list_label" messageCode="global_menu_list" roles="" url="/authorroles?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_authorrole_roleentry" labelCode="menu_item_authorrole_roleentry_label" messageCode="global_menu_find" roles="" url="/authorroles?find=ByRoleEntry&amp;form"/>
-    <menu-item hidden="false" id="fi_authorrole_roleentryanduserentry" labelCode="menu_item_authorrole_roleentryanduserentry_label" messageCode="global_menu_find" roles="" url="/authorroles?find=ByRoleEntryAndUserEntry&amp;form"/>
-    <menu-item hidden="false" id="fi_authorrole_userentry" labelCode="menu_item_authorrole_userentry_label" messageCode="global_menu_find" roles="" url="/authorroles?find=ByUserEntry&amp;form"/>
-    </menu-item>
-<menu-item id="c_itxprotocolprotocol" labelCode="menu_category_itxprotocolprotocol_label" name="Itxprotocolprotocol">
-        <menu-item hidden="false" id="i_itxprotocolprotocol_new" labelCode="menu_item_itxprotocolprotocol_new_label" messageCode="global_menu_new" roles="" url="/itxprotocolprotocols?form"/>
-    <menu-item hidden="false" id="i_itxprotocolprotocol_list" labelCode="menu_item_itxprotocolprotocol_list_label" messageCode="global_menu_list" roles="" url="/itxprotocolprotocols?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_itxprotocolprotocol_firstprotocol" labelCode="menu_item_itxprotocolprotocol_firstprotocol_label" messageCode="global_menu_find" roles="" url="/itxprotocolprotocols?find=ByFirstProtocol&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_itxprotocolprotocol_lstransactionequals" labelCode="menu_item_itxprotocolprotocol_lstransactionequals_label" messageCode="global_menu_find" roles="" url="/itxprotocolprotocols?find=ByLsTransactionEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_itxprotocolprotocol_secondprotocol" labelCode="menu_item_itxprotocolprotocol_secondprotocol_label" messageCode="global_menu_find" roles="" url="/itxprotocolprotocols?find=BySecondProtocol&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_itxprotocolprotocolstate" labelCode="menu_category_itxprotocolprotocolstate_label" name="Itxprotocolprotocolstate">
-        <menu-item hidden="false" id="i_itxprotocolprotocolstate_new" labelCode="menu_item_itxprotocolprotocolstate_new_label" messageCode="global_menu_new" roles="" url="/itxprotocolprotocolstates?form"/>
-    <menu-item hidden="false" id="i_itxprotocolprotocolstate_list" labelCode="menu_item_itxprotocolprotocolstate_list_label" messageCode="global_menu_list" roles="" url="/itxprotocolprotocolstates?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_itxprotocolprotocolvalue" labelCode="menu_category_itxprotocolprotocolvalue_label" name="Itxprotocolprotocolvalue">
-        <menu-item hidden="false" id="i_itxprotocolprotocolvalue_new" labelCode="menu_item_itxprotocolprotocolvalue_new_label" messageCode="global_menu_new" roles="" url="/itxprotocolprotocolvalues?form"/>
-    <menu-item hidden="false" id="i_itxprotocolprotocolvalue_list" labelCode="menu_item_itxprotocolprotocolvalue_list_label" messageCode="global_menu_list" roles="" url="/itxprotocolprotocolvalues?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_ddictvalue" labelCode="menu_category_ddictvalue_label" name="Ddictvalue">
-        <menu-item hidden="false" id="i_ddictvalue_new" labelCode="menu_item_ddictvalue_new_label" messageCode="global_menu_new" roles="" url="/ddictvalues?form"/>
-    <menu-item hidden="false" id="i_ddictvalue_list" labelCode="menu_item_ddictvalue_list_label" messageCode="global_menu_list" roles="" url="/ddictvalues?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_ddictvalue_codenameequals" labelCode="menu_item_ddictvalue_codenameequals_label" messageCode="global_menu_find" roles="" url="/ddictvalues?find=ByCodeNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_ddictvalue_ignorednot" labelCode="menu_item_ddictvalue_ignorednot_label" messageCode="global_menu_find" roles="" url="/ddictvalues?find=ByIgnoredNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_ddictvalue_labeltextlike" labelCode="menu_item_ddictvalue_labeltextlike_label" messageCode="global_menu_find" roles="" url="/ddictvalues?find=ByLabelTextLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_ddictvalue_lskindequals" labelCode="menu_item_ddictvalue_lskindequals_label" messageCode="global_menu_find" roles="" url="/ddictvalues?find=ByLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_ddictvalue_lstypeequals" labelCode="menu_item_ddictvalue_lstypeequals_label" messageCode="global_menu_find" roles="" url="/ddictvalues?find=ByLsTypeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_ddictvalue_lstypeequalsandlskindequals" labelCode="menu_item_ddictvalue_lstypeequalsandlskindequals_label" messageCode="global_menu_find" roles="" url="/ddictvalues?find=ByLsTypeEqualsAndLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_ddictvalue_lstypeequalsandlskindequalsandshortnameequals" labelCode="menu_item_ddictvalue_lstypeequalsandlskindequalsandshortnameequals_label" messageCode="global_menu_find" roles="" url="/ddictvalues?find=ByLsTypeEqualsAndLsKindEqualsAndShortNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_ddictkind" labelCode="menu_category_ddictkind_label" name="Ddictkind">
-        <menu-item hidden="false" id="i_ddictkind_new" labelCode="menu_item_ddictkind_new_label" messageCode="global_menu_new" roles="" url="/ddictkinds?form"/>
-    <menu-item hidden="false" id="i_ddictkind_list" labelCode="menu_item_ddictkind_list_label" messageCode="global_menu_list" roles="" url="/ddictkinds?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_ddictkind_lstypeequalsandnameequals" labelCode="menu_item_ddictkind_lstypeequalsandnameequals_label" messageCode="global_menu_find" roles="" url="/ddictkinds?find=ByLsTypeEqualsAndNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_ddicttype" labelCode="menu_category_ddicttype_label" name="Ddicttype">
-        <menu-item hidden="false" id="i_ddicttype_new" labelCode="menu_item_ddicttype_new_label" messageCode="global_menu_new" roles="" url="/ddicttypes?form"/>
-    <menu-item hidden="false" id="i_ddicttype_list" labelCode="menu_item_ddicttype_list_label" messageCode="global_menu_list" roles="" url="/ddicttypes?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_ddicttype_nameequals" labelCode="menu_item_ddicttype_nameequals_label" messageCode="global_menu_find" roles="" url="/ddicttypes?find=ByNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_itxexperimentexperiment" labelCode="menu_category_itxexperimentexperiment_label" name="Itxexperimentexperiment">
-        <menu-item hidden="false" id="i_itxexperimentexperiment_new" labelCode="menu_item_itxexperimentexperiment_new_label" messageCode="global_menu_new" roles="" url="/itxexperimentexperiments?form"/>
-    <menu-item hidden="false" id="i_itxexperimentexperiment_list" labelCode="menu_item_itxexperimentexperiment_list_label" messageCode="global_menu_list" roles="" url="/itxexperimentexperiments?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_itxexperimentexperiment_firstexperiment" labelCode="menu_item_itxexperimentexperiment_firstexperiment_label" messageCode="global_menu_find" roles="" url="/itxexperimentexperiments?find=ByFirstExperiment&amp;form"/>
-    <menu-item hidden="false" id="fi_itxexperimentexperiment_lstransactionequals" labelCode="menu_item_itxexperimentexperiment_lstransactionequals_label" messageCode="global_menu_find" roles="" url="/itxexperimentexperiments?find=ByLsTransactionEquals&amp;form"/>
-    <menu-item hidden="false" id="fi_itxexperimentexperiment_secondexperiment" labelCode="menu_item_itxexperimentexperiment_secondexperiment_label" messageCode="global_menu_find" roles="" url="/itxexperimentexperiments?find=BySecondExperiment&amp;form"/>
-    </menu-item>
-<menu-item id="c_itxexperimentexperimentvalue" labelCode="menu_category_itxexperimentexperimentvalue_label" name="Itxexperimentexperimentvalue">
-        <menu-item hidden="false" id="i_itxexperimentexperimentvalue_new" labelCode="menu_item_itxexperimentexperimentvalue_new_label" messageCode="global_menu_new" roles="" url="/itxexperimentexperimentvalues?form"/>
-    <menu-item hidden="false" id="i_itxexperimentexperimentvalue_list" labelCode="menu_item_itxexperimentexperimentvalue_list_label" messageCode="global_menu_list" roles="" url="/itxexperimentexperimentvalues?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_itxexperimentexperimentstate" labelCode="menu_category_itxexperimentexperimentstate_label" name="Itxexperimentexperimentstate">
-        <menu-item hidden="false" id="i_itxexperimentexperimentstate_new" labelCode="menu_item_itxexperimentexperimentstate_new_label" messageCode="global_menu_new" roles="" url="/itxexperimentexperimentstates?form"/>
-    <menu-item hidden="false" id="i_itxexperimentexperimentstate_list" labelCode="menu_item_itxexperimentexperimentstate_list_label" messageCode="global_menu_list" roles="" url="/itxexperimentexperimentstates?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_codeorigin" labelCode="menu_category_codeorigin_label" name="Codeorigin">
-        <menu-item hidden="false" id="i_codeorigin_new" labelCode="menu_item_codeorigin_new_label" messageCode="global_menu_new" roles="" url="/codeorigins?form"/>
-    <menu-item hidden="false" id="i_codeorigin_list" labelCode="menu_item_codeorigin_list_label" messageCode="global_menu_list" roles="" url="/codeorigins?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_itxlsthinglsthing" labelCode="menu_category_itxlsthinglsthing_label" name="Itxlsthinglsthing">
-        <menu-item hidden="false" id="i_itxlsthinglsthing_new" labelCode="menu_item_itxlsthinglsthing_new_label" messageCode="global_menu_new" roles="" url="/itxlsthinglsthings?form"/>
-    <menu-item hidden="false" id="i_itxlsthinglsthing_list" labelCode="menu_item_itxlsthinglsthing_list_label" messageCode="global_menu_list" roles="" url="/itxlsthinglsthings?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_itxlsthinglsthing_codenameequals" labelCode="menu_item_itxlsthinglsthing_codenameequals_label" messageCode="global_menu_find" roles="" url="/itxlsthinglsthings?find=ByCodeNameEquals&amp;form"/>
-    <menu-item hidden="false" id="fi_itxlsthinglsthing_firstlsthing" labelCode="menu_item_itxlsthinglsthing_firstlsthing_label" messageCode="global_menu_find" roles="" url="/itxlsthinglsthings?find=ByFirstLsThing&amp;form"/>
-    <menu-item hidden="false" id="fi_itxlsthinglsthing_secondlsthing" labelCode="menu_item_itxlsthinglsthing_secondlsthing_label" messageCode="global_menu_find" roles="" url="/itxlsthinglsthings?find=BySecondLsThing&amp;form"/>
-    </menu-item>
-<menu-item id="c_itxlsthinglsthingvalue" labelCode="menu_category_itxlsthinglsthingvalue_label" name="Itxlsthinglsthingvalue">
-        <menu-item hidden="false" id="i_itxlsthinglsthingvalue_new" labelCode="menu_item_itxlsthinglsthingvalue_new_label" messageCode="global_menu_new" roles="" url="/itxlsthinglsthingvalues?form"/>
-    <menu-item hidden="false" id="i_itxlsthinglsthingvalue_list" labelCode="menu_item_itxlsthinglsthingvalue_list_label" messageCode="global_menu_list" roles="" url="/itxlsthinglsthingvalues?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_itxlsthinglsthingstate" labelCode="menu_category_itxlsthinglsthingstate_label" name="Itxlsthinglsthingstate">
-        <menu-item hidden="false" id="i_itxlsthinglsthingstate_new" labelCode="menu_item_itxlsthinglsthingstate_new_label" messageCode="global_menu_new" roles="" url="/itxlsthinglsthingstates?form"/>
-    <menu-item hidden="false" id="i_itxlsthinglsthingstate_list" labelCode="menu_item_itxlsthinglsthingstate_list_label" messageCode="global_menu_list" roles="" url="/itxlsthinglsthingstates?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_rolekind" labelCode="menu_category_rolekind_label" name="Rolekind">
-        <menu-item hidden="false" id="i_rolekind_new" labelCode="menu_item_rolekind_new_label" messageCode="global_menu_new" roles="" url="/rolekinds?form"/>
-    <menu-item hidden="false" id="i_rolekind_list" labelCode="menu_item_rolekind_list_label" messageCode="global_menu_list" roles="" url="/rolekinds?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_rolekind_kindnameequalsandlstype" labelCode="menu_item_rolekind_kindnameequalsandlstype_label" messageCode="global_menu_find" roles="" url="/rolekinds?find=ByKindNameEqualsAndLsType&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_rolekind_lstype" labelCode="menu_item_rolekind_lstype_label" messageCode="global_menu_find" roles="" url="/rolekinds?find=ByLsType&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_roletype" labelCode="menu_category_roletype_label" name="Roletype">
-        <menu-item hidden="false" id="i_roletype_new" labelCode="menu_item_roletype_new_label" messageCode="global_menu_new" roles="" url="/roletypes?form"/>
-    <menu-item hidden="false" id="i_roletype_list" labelCode="menu_item_roletype_list_label" messageCode="global_menu_list" roles="" url="/roletypes?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_roletype_typenameequals" labelCode="menu_item_roletype_typenameequals_label" messageCode="global_menu_find" roles="" url="/roletypes?find=ByTypeNameEquals&amp;form"/>
-    </menu-item>
-<menu-item id="c_authorstate" labelCode="menu_category_authorstate_label" name="Authorstate">
-        <menu-item hidden="false" id="i_authorstate_new" labelCode="menu_item_authorstate_new_label" messageCode="global_menu_new" roles="" url="/authorstates?form"/>
-    <menu-item hidden="false" id="i_authorstate_list" labelCode="menu_item_authorstate_list_label" messageCode="global_menu_list" roles="" url="/authorstates?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_cronjob" labelCode="menu_category_cronjob_label" name="Cronjob">
-        <menu-item hidden="false" id="i_cronjob_new" labelCode="menu_item_cronjob_new_label" messageCode="global_menu_new" roles="" url="/cronjobs?form"/>
-    <menu-item hidden="false" id="i_cronjob_list" labelCode="menu_item_cronjob_list_label" messageCode="global_menu_list" roles="" url="/cronjobs?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_authorlabel" labelCode="menu_category_authorlabel_label" name="Authorlabel">
-        <menu-item hidden="false" id="i_authorlabel_new" labelCode="menu_item_authorlabel_new_label" messageCode="global_menu_new" roles="" url="/authorlabels?form"/>
-    <menu-item hidden="false" id="i_authorlabel_list" labelCode="menu_item_authorlabel_list_label" messageCode="global_menu_list" roles="" url="/authorlabels?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_tempselecttable" labelCode="menu_category_tempselecttable_label" name="Tempselecttable">
-        <menu-item hidden="false" id="i_tempselecttable_new" labelCode="menu_item_tempselecttable_new_label" messageCode="global_menu_new" roles="" url="/tempselecttables?form"/>
-    <menu-item hidden="false" id="i_tempselecttable_list" labelCode="menu_item_tempselecttable_list_label" messageCode="global_menu_list" roles="" url="/tempselecttables?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_labelsequencerole" labelCode="menu_category_labelsequencerole_label" name="Labelsequencerole">
-        <menu-item hidden="false" id="i_labelsequencerole_new" labelCode="menu_item_labelsequencerole_new_label" messageCode="global_menu_new" roles="" url="/labelsequenceroles?form"/>
-    <menu-item hidden="false" id="i_labelsequencerole_list" labelCode="menu_item_labelsequencerole_list_label" messageCode="global_menu_list" roles="" url="/labelsequenceroles?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_authorvalue" labelCode="menu_category_authorvalue_label" name="Authorvalue">
-        <menu-item hidden="false" id="i_authorvalue_new" labelCode="menu_item_authorvalue_new_label" messageCode="global_menu_new" roles="" url="/authorvalues?form"/>
-    <menu-item hidden="false" id="i_authorvalue_list" labelCode="menu_item_authorvalue_list_label" messageCode="global_menu_list" roles="" url="/authorvalues?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_project" labelCode="menu_category_project_label" name="Project">
-        <menu-item hidden="false" id="i_project_new" labelCode="menu_item_project_new_label" messageCode="global_menu_new" roles="" url="/projects?form"/>
-    <menu-item hidden="false" id="i_project_list" labelCode="menu_item_project_list_label" messageCode="global_menu_list" roles="" url="/projects?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_project_codeequals" labelCode="menu_item_project_codeequals_label" messageCode="global_menu_find" roles="" url="/projects?find=ByCodeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_project_nameequals" labelCode="menu_item_project_nameequals_label" messageCode="global_menu_find" roles="" url="/projects?find=ByNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_qccompound" labelCode="menu_category_qccompound_label" name="Qccompound">
-        <menu-item hidden="false" id="i_qccompound_new" labelCode="menu_item_qccompound_new_label" messageCode="global_menu_new" roles="" url="/qccompounds?form"/>
-    <menu-item hidden="false" id="i_qccompound_list" labelCode="menu_item_qccompound_list_label" messageCode="global_menu_list" roles="" url="/qccompounds?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_qccompound_cdid" labelCode="menu_item_qccompound_cdid_label" messageCode="global_menu_find" roles="" url="/qccompounds?find=ByCdId&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_operator" labelCode="menu_category_operator_label" name="Operator">
-        <menu-item hidden="false" id="i_operator_new" labelCode="menu_item_operator_new_label" messageCode="global_menu_new" roles="" url="/operators?form"/>
-    <menu-item hidden="false" id="i_operator_list" labelCode="menu_item_operator_list_label" messageCode="global_menu_list" roles="" url="/operators?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_operator_codeequals" labelCode="menu_item_operator_codeequals_label" messageCode="global_menu_find" roles="" url="/operators?find=ByCodeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_operator_nameequals" labelCode="menu_item_operator_nameequals_label" messageCode="global_menu_find" roles="" url="/operators?find=ByNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_predef_corpname" labelCode="menu_category_predef_corpname_label" name="Predef_corpname">
-        <menu-item hidden="false" id="i_predef_corpname_new" labelCode="menu_item_predef_corpname_new_label" messageCode="global_menu_new" roles="" url="/predef_corpnames?form"/>
-    <menu-item hidden="false" id="i_predef_corpname_list" labelCode="menu_item_predef_corpname_list_label" messageCode="global_menu_list" roles="" url="/predef_corpnames?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_solutionunit" labelCode="menu_category_solutionunit_label" name="Solutionunit">
-        <menu-item hidden="false" id="i_solutionunit_new" labelCode="menu_item_solutionunit_new_label" messageCode="global_menu_new" roles="" url="/solutionunits?form"/>
-    <menu-item hidden="false" id="i_solutionunit_list" labelCode="menu_item_solutionunit_list_label" messageCode="global_menu_list" roles="" url="/solutionunits?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_solutionunit_codeequals" labelCode="menu_item_solutionunit_codeequals_label" messageCode="global_menu_find" roles="" url="/solutionunits?find=ByCodeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_solutionunit_codelike" labelCode="menu_item_solutionunit_codelike_label" messageCode="global_menu_find" roles="" url="/solutionunits?find=ByCodeLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_solutionunit_nameequals" labelCode="menu_item_solutionunit_nameequals_label" messageCode="global_menu_find" roles="" url="/solutionunits?find=ByNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_salt" labelCode="menu_category_salt_label" name="Salt">
-        <menu-item hidden="false" id="i_salt_new" labelCode="menu_item_salt_new_label" messageCode="global_menu_new" roles="" url="/salts?form"/>
-    <menu-item hidden="false" id="i_salt_list" labelCode="menu_item_salt_list_label" messageCode="global_menu_list" roles="" url="/salts?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_salt_abbrevequals" labelCode="menu_item_salt_abbrevequals_label" messageCode="global_menu_find" roles="" url="/salts?find=ByAbbrevEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_salt_abbrevequalsandnameequals" labelCode="menu_item_salt_abbrevequalsandnameequals_label" messageCode="global_menu_find" roles="" url="/salts?find=ByAbbrevEqualsAndNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_salt_abbrevlike" labelCode="menu_item_salt_abbrevlike_label" messageCode="global_menu_find" roles="" url="/salts?find=ByAbbrevLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_salt_cdid" labelCode="menu_item_salt_cdid_label" messageCode="global_menu_find" roles="" url="/salts?find=ByCdId&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_salt_nameequals" labelCode="menu_item_salt_nameequals_label" messageCode="global_menu_find" roles="" url="/salts?find=ByNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_saltform" labelCode="menu_category_saltform_label" name="Saltform">
-        <menu-item hidden="false" id="i_saltform_new" labelCode="menu_item_saltform_new_label" messageCode="global_menu_new" roles="" url="/saltforms?form"/>
-    <menu-item hidden="false" id="i_saltform_list" labelCode="menu_item_saltform_list_label" messageCode="global_menu_list" roles="" url="/saltforms?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_saltform_bulkloadfileequals" labelCode="menu_item_saltform_bulkloadfileequals_label" messageCode="global_menu_find" roles="" url="/saltforms?find=ByBulkLoadFileEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_saltform_cdid" labelCode="menu_item_saltform_cdid_label" messageCode="global_menu_find" roles="" url="/saltforms?find=ByCdId&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_saltform_corpnameequals" labelCode="menu_item_saltform_corpnameequals_label" messageCode="global_menu_find" roles="" url="/saltforms?find=ByCorpNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_saltform_corpnamelike" labelCode="menu_item_saltform_corpnamelike_label" messageCode="global_menu_find" roles="" url="/saltforms?find=ByCorpNameLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_saltform_parent" labelCode="menu_item_saltform_parent_label" messageCode="global_menu_find" roles="" url="/saltforms?find=ByParent&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_saltformaliaskind" labelCode="menu_category_saltformaliaskind_label" name="Saltformaliaskind">
-        <menu-item hidden="false" id="i_saltformaliaskind_new" labelCode="menu_item_saltformaliaskind_new_label" messageCode="global_menu_new" roles="" url="/saltformaliaskinds?form"/>
-    <menu-item hidden="false" id="i_saltformaliaskind_list" labelCode="menu_item_saltformaliaskind_list_label" messageCode="global_menu_list" roles="" url="/saltformaliaskinds?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_parentaliaskind" labelCode="menu_category_parentaliaskind_label" name="Parentaliaskind">
-        <menu-item hidden="false" id="i_parentaliaskind_new" labelCode="menu_item_parentaliaskind_new_label" messageCode="global_menu_new" roles="" url="/parentaliaskinds?form"/>
-    <menu-item hidden="false" id="i_parentaliaskind_list" labelCode="menu_item_parentaliaskind_list_label" messageCode="global_menu_list" roles="" url="/parentaliaskinds?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_lotaliaskind" labelCode="menu_category_lotaliaskind_label" name="Lotaliaskind">
-        <menu-item hidden="false" id="i_lotaliaskind_new" labelCode="menu_item_lotaliaskind_new_label" messageCode="global_menu_new" roles="" url="/lotaliaskinds?form"/>
-    <menu-item hidden="false" id="i_lotaliaskind_list" labelCode="menu_item_lotaliaskind_list_label" messageCode="global_menu_list" roles="" url="/lotaliaskinds?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_filetype" labelCode="menu_category_filetype_label" name="Filetype">
-        <menu-item hidden="false" id="i_filetype_new" labelCode="menu_item_filetype_new_label" messageCode="global_menu_new" roles="" url="/filetypes?form"/>
-    <menu-item hidden="false" id="i_filetype_list" labelCode="menu_item_filetype_list_label" messageCode="global_menu_list" roles="" url="/filetypes?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_filetype_codeequals" labelCode="menu_item_filetype_codeequals_label" messageCode="global_menu_find" roles="" url="/filetypes?find=ByCodeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_lot" labelCode="menu_category_lot_label" name="Lot">
-        <menu-item hidden="false" id="i_lot_new" labelCode="menu_item_lot_new_label" messageCode="global_menu_new" roles="" url="/lots?form"/>
-    <menu-item hidden="false" id="i_lot_list" labelCode="menu_item_lot_list_label" messageCode="global_menu_list" roles="" url="/lots?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lot_buid" labelCode="menu_item_lot_buid_label" messageCode="global_menu_find" roles="" url="/lots?find=ByBuid&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lot_bulkloadfileequals" labelCode="menu_item_lot_bulkloadfileequals_label" messageCode="global_menu_find" roles="" url="/lots?find=ByBulkLoadFileEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lot_chemistandsynthesisdatebetween" labelCode="menu_item_lot_chemistandsynthesisdatebetween_label" messageCode="global_menu_find" roles="" url="/lots?find=ByChemistAndSynthesisDateBetween&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lot_corpnameequals" labelCode="menu_item_lot_corpnameequals_label" messageCode="global_menu_find" roles="" url="/lots?find=ByCorpNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lot_corpnamelike" labelCode="menu_item_lot_corpnamelike_label" messageCode="global_menu_find" roles="" url="/lots?find=ByCorpNameLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lot_isvirtualnot" labelCode="menu_item_lot_isvirtualnot_label" messageCode="global_menu_find" roles="" url="/lots?find=ByIsVirtualNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lot_notebookpageequals" labelCode="menu_item_lot_notebookpageequals_label" messageCode="global_menu_find" roles="" url="/lots?find=ByNotebookPageEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lot_notebookpageequalsandignorenot" labelCode="menu_item_lot_notebookpageequalsandignorenot_label" messageCode="global_menu_find" roles="" url="/lots?find=ByNotebookPageEqualsAndIgnoreNot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lot_saltform" labelCode="menu_item_lot_saltform_label" messageCode="global_menu_find" roles="" url="/lots?find=BySaltForm&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lot_synthesisdatebetween" labelCode="menu_item_lot_synthesisdatebetween_label" messageCode="global_menu_find" roles="" url="/lots?find=BySynthesisDateBetween&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lot_synthesisdategreaterthan" labelCode="menu_item_lot_synthesisdategreaterthan_label" messageCode="global_menu_find" roles="" url="/lots?find=BySynthesisDateGreaterThan&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lot_synthesisdatelessthan" labelCode="menu_item_lot_synthesisdatelessthan_label" messageCode="global_menu_find" roles="" url="/lots?find=BySynthesisDateLessThan&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_stereocategory" labelCode="menu_category_stereocategory_label" name="Stereocategory">
-        <menu-item hidden="false" id="i_stereocategory_new" labelCode="menu_item_stereocategory_new_label" messageCode="global_menu_new" roles="" url="/stereocategorys?form"/>
-    <menu-item hidden="false" id="i_stereocategory_list" labelCode="menu_item_stereocategory_list_label" messageCode="global_menu_list" roles="" url="/stereocategorys?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_stereocategory_codeequals" labelCode="menu_item_stereocategory_codeequals_label" messageCode="global_menu_find" roles="" url="/stereocategorys?find=ByCodeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_stereocategory_codelike" labelCode="menu_item_stereocategory_codelike_label" messageCode="global_menu_find" roles="" url="/stereocategorys?find=ByCodeLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_isotope" labelCode="menu_category_isotope_label" name="Isotope">
-        <menu-item hidden="false" id="i_isotope_new" labelCode="menu_item_isotope_new_label" messageCode="global_menu_new" roles="" url="/isotopes?form"/>
-    <menu-item hidden="false" id="i_isotope_list" labelCode="menu_item_isotope_list_label" messageCode="global_menu_list" roles="" url="/isotopes?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_isotope_abbrevequals" labelCode="menu_item_isotope_abbrevequals_label" messageCode="global_menu_find" roles="" url="/isotopes?find=ByAbbrevEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_isotope_abbrevequalsandnameequals" labelCode="menu_item_isotope_abbrevequalsandnameequals_label" messageCode="global_menu_find" roles="" url="/isotopes?find=ByAbbrevEqualsAndNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_isotope_nameequals" labelCode="menu_item_isotope_nameequals_label" messageCode="global_menu_find" roles="" url="/isotopes?find=ByNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_filelist" labelCode="menu_category_filelist_label" name="Filelist">
-        <menu-item hidden="false" id="i_filelist_new" labelCode="menu_item_filelist_new_label" messageCode="global_menu_new" roles="" url="/filelists?form"/>
-    <menu-item hidden="false" id="i_filelist_list" labelCode="menu_item_filelist_list_label" messageCode="global_menu_list" roles="" url="/filelists?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_filelist_lot" labelCode="menu_item_filelist_lot_label" messageCode="global_menu_find" roles="" url="/filelists?find=ByLot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_filelist_urlequals" labelCode="menu_item_filelist_urlequals_label" messageCode="global_menu_find" roles="" url="/filelists?find=ByUrlEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_lotaliastype" labelCode="menu_category_lotaliastype_label" name="Lotaliastype">
-        <menu-item hidden="false" id="i_lotaliastype_new" labelCode="menu_item_lotaliastype_new_label" messageCode="global_menu_new" roles="" url="/lotaliastypes?form"/>
-    <menu-item hidden="false" id="i_lotaliastype_list" labelCode="menu_item_lotaliastype_list_label" messageCode="global_menu_list" roles="" url="/lotaliastypes?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_parentalias" labelCode="menu_category_parentalias_label" name="Parentalias">
-        <menu-item hidden="false" id="i_parentalias_new" labelCode="menu_item_parentalias_new_label" messageCode="global_menu_new" roles="" url="/parentaliases?form"/>
-    <menu-item hidden="false" id="i_parentalias_list" labelCode="menu_item_parentalias_list_label" messageCode="global_menu_list" roles="" url="/parentaliases?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_parentalias_aliasnameequals" labelCode="menu_item_parentalias_aliasnameequals_label" messageCode="global_menu_find" roles="" url="/parentaliases?find=ByAliasNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_parentalias_aliasnameequalsandlstypeequalsandlskindequals" labelCode="menu_item_parentalias_aliasnameequalsandlstypeequalsandlskindequals_label" messageCode="global_menu_find" roles="" url="/parentaliases?find=ByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_parentalias_parent" labelCode="menu_item_parentalias_parent_label" messageCode="global_menu_find" roles="" url="/parentaliases?find=ByParent&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_parentalias_parentandlstypeequalsandlskindequals" labelCode="menu_item_parentalias_parentandlstypeequalsandlskindequals_label" messageCode="global_menu_find" roles="" url="/parentaliases?find=ByParentAndLsTypeEqualsAndLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_parentalias_parentandlstypeequalsandlskindequalsandaliasnameequals" labelCode="menu_item_parentalias_parentandlstypeequalsandlskindequalsandaliasnameequals_label" messageCode="global_menu_find" roles="" url="/parentaliases?find=ByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_bulkloadfile" labelCode="menu_category_bulkloadfile_label" name="Bulkloadfile">
-        <menu-item hidden="false" id="i_bulkloadfile_new" labelCode="menu_item_bulkloadfile_new_label" messageCode="global_menu_new" roles="" url="/bulkloadfiles?form"/>
-    <menu-item hidden="false" id="i_bulkloadfile_list" labelCode="menu_item_bulkloadfile_list_label" messageCode="global_menu_list" roles="" url="/bulkloadfiles?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_bulkloadfile_filenameequals" labelCode="menu_item_bulkloadfile_filenameequals_label" messageCode="global_menu_find" roles="" url="/bulkloadfiles?find=ByFileNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_bulkloadfile_recordedbyequals" labelCode="menu_item_bulkloadfile_recordedbyequals_label" messageCode="global_menu_find" roles="" url="/bulkloadfiles?find=ByRecordedByEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_cmpdregappsetting" labelCode="menu_category_cmpdregappsetting_label" name="Cmpdregappsetting">
-        <menu-item hidden="false" id="i_cmpdregappsetting_new" labelCode="menu_item_cmpdregappsetting_new_label" messageCode="global_menu_new" roles="" url="/cmpdregappsettings?form"/>
-    <menu-item hidden="false" id="i_cmpdregappsetting_list" labelCode="menu_item_cmpdregappsetting_list_label" messageCode="global_menu_list" roles="" url="/cmpdregappsettings?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_vendor" labelCode="menu_category_vendor_label" name="Vendor">
-        <menu-item hidden="false" id="i_vendor_new" labelCode="menu_item_vendor_new_label" messageCode="global_menu_new" roles="" url="/vendors?form"/>
-    <menu-item hidden="false" id="i_vendor_list" labelCode="menu_item_vendor_list_label" messageCode="global_menu_list" roles="" url="/vendors?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_vendor_codeequals" labelCode="menu_item_vendor_codeequals_label" messageCode="global_menu_find" roles="" url="/vendors?find=ByCodeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_vendor_codelike" labelCode="menu_item_vendor_codelike_label" messageCode="global_menu_find" roles="" url="/vendors?find=ByCodeLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_vendor_nameequals" labelCode="menu_item_vendor_nameequals_label" messageCode="global_menu_find" roles="" url="/vendors?find=ByNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_vendor_namelike" labelCode="menu_item_vendor_namelike_label" messageCode="global_menu_find" roles="" url="/vendors?find=ByNameLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_corpname" labelCode="menu_category_corpname_label" name="Corpname">
-        <menu-item hidden="false" id="i_corpname_new" labelCode="menu_item_corpname_new_label" messageCode="global_menu_new" roles="" url="/corpnames?form"/>
-    <menu-item hidden="false" id="i_corpname_list" labelCode="menu_item_corpname_list_label" messageCode="global_menu_list" roles="" url="/corpnames?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_saltformalias" labelCode="menu_category_saltformalias_label" name="Saltformalias">
-        <menu-item hidden="false" id="i_saltformalias_new" labelCode="menu_item_saltformalias_new_label" messageCode="global_menu_new" roles="" url="/saltformaliases?form"/>
-    <menu-item hidden="false" id="i_saltformalias_list" labelCode="menu_item_saltformalias_list_label" messageCode="global_menu_list" roles="" url="/saltformaliases?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_saltformalias_aliasnameequalsandlstypeequalsandlskindequals" labelCode="menu_item_saltformalias_aliasnameequalsandlstypeequalsandlskindequals_label" messageCode="global_menu_find" roles="" url="/saltformaliases?find=ByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_saltformalias_saltform" labelCode="menu_item_saltformalias_saltform_label" messageCode="global_menu_find" roles="" url="/saltformaliases?find=BySaltForm&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_physicalstate" labelCode="menu_category_physicalstate_label" name="Physicalstate">
-        <menu-item hidden="false" id="i_physicalstate_new" labelCode="menu_item_physicalstate_new_label" messageCode="global_menu_new" roles="" url="/physicalstates?form"/>
-    <menu-item hidden="false" id="i_physicalstate_list" labelCode="menu_item_physicalstate_list_label" messageCode="global_menu_list" roles="" url="/physicalstates?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_physicalstate_codeequals" labelCode="menu_item_physicalstate_codeequals_label" messageCode="global_menu_find" roles="" url="/physicalstates?find=ByCodeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_physicalstate_nameequals" labelCode="menu_item_physicalstate_nameequals_label" messageCode="global_menu_find" roles="" url="/physicalstates?find=ByNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_physicalstate_namelike" labelCode="menu_item_physicalstate_namelike_label" messageCode="global_menu_find" roles="" url="/physicalstates?find=ByNameLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_saltformaliastype" labelCode="menu_category_saltformaliastype_label" name="Saltformaliastype">
-        <menu-item hidden="false" id="i_saltformaliastype_new" labelCode="menu_item_saltformaliastype_new_label" messageCode="global_menu_new" roles="" url="/saltformaliastypes?form"/>
-    <menu-item hidden="false" id="i_saltformaliastype_list" labelCode="menu_item_saltformaliastype_list_label" messageCode="global_menu_list" roles="" url="/saltformaliastypes?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_parentannotation" labelCode="menu_category_parentannotation_label" name="Parentannotation">
-        <menu-item hidden="false" id="i_parentannotation_new" labelCode="menu_item_parentannotation_new_label" messageCode="global_menu_new" roles="" url="/parentAnnotations?form"/>
-    <menu-item hidden="false" id="i_parentannotation_list" labelCode="menu_item_parentannotation_list_label" messageCode="global_menu_list" roles="" url="/parentAnnotations?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_parentannotation_codeequals" labelCode="menu_item_parentannotation_codeequals_label" messageCode="global_menu_find" roles="" url="/parentAnnotations?find=ByCodeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_compound" labelCode="menu_category_compound_label" name="Compound">
-        <menu-item hidden="false" id="i_compound_new" labelCode="menu_item_compound_new_label" messageCode="global_menu_new" roles="" url="/compounds?form"/>
-    <menu-item hidden="false" id="i_compound_list" labelCode="menu_item_compound_list_label" messageCode="global_menu_list" roles="" url="/compounds?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_compound_cdid" labelCode="menu_item_compound_cdid_label" messageCode="global_menu_find" roles="" url="/compounds?find=ByCdId&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_compound_external_idequals" labelCode="menu_item_compound_external_idequals_label" messageCode="global_menu_find" roles="" url="/compounds?find=ByExternal_idEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_isosalt" labelCode="menu_category_isosalt_label" name="Isosalt">
-        <menu-item hidden="false" id="i_isosalt_new" labelCode="menu_item_isosalt_new_label" messageCode="global_menu_new" roles="" url="/isosalts?form"/>
-    <menu-item hidden="false" id="i_isosalt_list" labelCode="menu_item_isosalt_list_label" messageCode="global_menu_list" roles="" url="/isosalts?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_isosalt_saltform" labelCode="menu_item_isosalt_saltform_label" messageCode="global_menu_find" roles="" url="/isosalts?find=BySaltForm&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_isosalt_saltformandtype" labelCode="menu_item_isosalt_saltformandtype_label" messageCode="global_menu_find" roles="" url="/isosalts?find=BySaltFormAndType&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_saltloader" labelCode="menu_category_saltloader_label" name="Saltloader">
-        <menu-item hidden="false" id="i_saltloader_new" labelCode="menu_item_saltloader_new_label" messageCode="global_menu_new" roles="" url="/saltloaders?form"/>
-    <menu-item hidden="false" id="i_saltloader_list" labelCode="menu_item_saltloader_list_label" messageCode="global_menu_list" roles="" url="/saltloaders?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_bulkloadtemplate" labelCode="menu_category_bulkloadtemplate_label" name="Bulkloadtemplate">
-        <menu-item hidden="false" id="i_bulkloadtemplate_new" labelCode="menu_item_bulkloadtemplate_new_label" messageCode="global_menu_new" roles="" url="/bulkloadtemplates?form"/>
-    <menu-item hidden="false" id="i_bulkloadtemplate_list" labelCode="menu_item_bulkloadtemplate_list_label" messageCode="global_menu_list" roles="" url="/bulkloadtemplates?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_bulkloadtemplate_recordedbyequals" labelCode="menu_item_bulkloadtemplate_recordedbyequals_label" messageCode="global_menu_find" roles="" url="/bulkloadtemplates?find=ByRecordedByEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_bulkloadtemplate_templatenameequals" labelCode="menu_item_bulkloadtemplate_templatenameequals_label" messageCode="global_menu_find" roles="" url="/bulkloadtemplates?find=ByTemplateNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_bulkloadtemplate_templatenameequalsandrecordedbyequals" labelCode="menu_item_bulkloadtemplate_templatenameequalsandrecordedbyequals_label" messageCode="global_menu_find" roles="" url="/bulkloadtemplates?find=ByTemplateNameEqualsAndRecordedByEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_unit" labelCode="menu_category_unit_label" name="Unit">
-        <menu-item hidden="false" id="i_unit_new" labelCode="menu_item_unit_new_label" messageCode="global_menu_new" roles="" url="/units?form"/>
-    <menu-item hidden="false" id="i_unit_list" labelCode="menu_item_unit_list_label" messageCode="global_menu_list" roles="" url="/units?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_unit_codeequals" labelCode="menu_item_unit_codeequals_label" messageCode="global_menu_find" roles="" url="/units?find=ByCodeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_unit_codelike" labelCode="menu_item_unit_codelike_label" messageCode="global_menu_find" roles="" url="/units?find=ByCodeLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_unit_nameequals" labelCode="menu_item_unit_nameequals_label" messageCode="global_menu_find" roles="" url="/units?find=ByNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_scientist" labelCode="menu_category_scientist_label" name="Scientist">
-        <menu-item hidden="false" id="i_scientist_new" labelCode="menu_item_scientist_new_label" messageCode="global_menu_new" roles="" url="/scientists?form"/>
-    <menu-item hidden="false" id="i_scientist_list" labelCode="menu_item_scientist_list_label" messageCode="global_menu_list" roles="" url="/scientists?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_scientist_codeequals" labelCode="menu_item_scientist_codeequals_label" messageCode="global_menu_find" roles="" url="/scientists?find=ByCodeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_scientist_codelike" labelCode="menu_item_scientist_codelike_label" messageCode="global_menu_find" roles="" url="/scientists?find=ByCodeLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_parentaliastype" labelCode="menu_category_parentaliastype_label" name="Parentaliastype">
-        <menu-item hidden="false" id="i_parentaliastype_new" labelCode="menu_item_parentaliastype_new_label" messageCode="global_menu_new" roles="" url="/parentaliastypes?form"/>
-    <menu-item hidden="false" id="i_parentaliastype_list" labelCode="menu_item_parentaliastype_list_label" messageCode="global_menu_list" roles="" url="/parentaliastypes?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_compoundtype" labelCode="menu_category_compoundtype_label" name="Compoundtype">
-        <menu-item hidden="false" id="i_compoundtype_new" labelCode="menu_item_compoundtype_new_label" messageCode="global_menu_new" roles="" url="/compoundTypes?form"/>
-    <menu-item hidden="false" id="i_compoundtype_list" labelCode="menu_item_compoundtype_list_label" messageCode="global_menu_list" roles="" url="/compoundTypes?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_compoundtype_codeequals" labelCode="menu_item_compoundtype_codeequals_label" messageCode="global_menu_find" roles="" url="/compoundTypes?find=ByCodeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_lotalias" labelCode="menu_category_lotalias_label" name="Lotalias">
-        <menu-item hidden="false" id="i_lotalias_new" labelCode="menu_item_lotalias_new_label" messageCode="global_menu_new" roles="" url="/lotaliases?form"/>
-    <menu-item hidden="false" id="i_lotalias_list" labelCode="menu_item_lotalias_list_label" messageCode="global_menu_list" roles="" url="/lotaliases?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lotalias_aliasnameequalsandlstypeequalsandlskindequals" labelCode="menu_item_lotalias_aliasnameequalsandlstypeequalsandlskindequals_label" messageCode="global_menu_find" roles="" url="/lotaliases?find=ByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lotalias_lot" labelCode="menu_item_lotalias_lot_label" messageCode="global_menu_find" roles="" url="/lotaliases?find=ByLot&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_lotalias_lotandlstypeequalsandlskindequals" labelCode="menu_item_lotalias_lotandlstypeequalsandlskindequals_label" messageCode="global_menu_find" roles="" url="/lotaliases?find=ByLotAndLsTypeEqualsAndLsKindEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_parent" labelCode="menu_category_parent_label" name="Parent">
-        <menu-item hidden="false" id="i_parent_new" labelCode="menu_item_parent_new_label" messageCode="global_menu_new" roles="" url="/parents?form"/>
-    <menu-item hidden="false" id="i_parent_list" labelCode="menu_item_parent_list_label" messageCode="global_menu_list" roles="" url="/parents?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_parent_bulkloadfileequals" labelCode="menu_item_parent_bulkloadfileequals_label" messageCode="global_menu_find" roles="" url="/parents?find=ByBulkLoadFileEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_parent_cdid" labelCode="menu_item_parent_cdid_label" messageCode="global_menu_find" roles="" url="/parents?find=ByCdId&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_parent_commonnamelike" labelCode="menu_item_parent_commonnamelike_label" messageCode="global_menu_find" roles="" url="/parents?find=ByCommonNameLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_parent_corpnameequals" labelCode="menu_item_parent_corpnameequals_label" messageCode="global_menu_find" roles="" url="/parents?find=ByCorpNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_parent_corpnamelike" labelCode="menu_item_parent_corpnamelike_label" messageCode="global_menu_find" roles="" url="/parents?find=ByCorpNameLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_parent_saltforms" labelCode="menu_item_parent_saltforms_label" messageCode="global_menu_find" roles="" url="/parents?find=BySaltForms&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_puritymeasuredby" labelCode="menu_category_puritymeasuredby_label" name="Puritymeasuredby">
-        <menu-item hidden="false" id="i_puritymeasuredby_new" labelCode="menu_item_puritymeasuredby_new_label" messageCode="global_menu_new" roles="" url="/puritymeasuredbys?form"/>
-    <menu-item hidden="false" id="i_puritymeasuredby_list" labelCode="menu_item_puritymeasuredby_list_label" messageCode="global_menu_list" roles="" url="/puritymeasuredbys?page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_puritymeasuredby_codeequals" labelCode="menu_item_puritymeasuredby_codeequals_label" messageCode="global_menu_find" roles="" url="/puritymeasuredbys?find=ByCodeEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_puritymeasuredby_nameequals" labelCode="menu_item_puritymeasuredby_nameequals_label" messageCode="global_menu_find" roles="" url="/puritymeasuredbys?find=ByNameEquals&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    <menu-item hidden="false" id="fi_puritymeasuredby_namelike" labelCode="menu_item_puritymeasuredby_namelike_label" messageCode="global_menu_find" roles="" url="/puritymeasuredbys?find=ByNameLike&amp;form&amp;page=1&amp;size=${empty param.size ? 10 : param.size}"/>
-    </menu-item>
-<menu-item id="c_controller" labelCode="menu_category_controller_label" name="Controller">
-        <menu-item hidden="false" id="i_controller__lotindex_id" labelCode="menu_item_controller__lotindex_id_label" messageCode="global_generic" roles="" url="/lot/index"/>
-    </menu-item>
-</gvnix-menu>
diff --git a/src/main/webapp/WEB-INF/views/operatorkinds/create.jspx b/src/main/webapp/WEB-INF/views/operatorkinds/create.jspx
deleted file mode 100755
index de32c024a..000000000
--- a/src/main/webapp/WEB-INF/views/operatorkinds/create.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_OperatorKind" modelAttribute="operatorKind" path="/operatorkinds" render="${empty dependencies}" z="LyxYzExXE3OA64zUqxFtiVNZ0cQ=">
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_OperatorKind_lsType" itemValue="id" items="${operatortypes}" path="/operatortypes" required="true" z="XGfubXWyAgJDDn9PoNQRZjA+W8M="/>
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_OperatorKind_kindName" required="true" z="pv8bZ6mDqBSkQb7u+kbC8pNql3c="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_OperatorKind_lsTypeAndKind" z="y08X6fSZhAd2+RoCQ1H7PJLzQzg="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_OperatorKind" render="${not empty dependencies}" z="3fI3LVDdOUAKHfAMBzoA/U65+eg="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/operatorkinds/list.jspx b/src/main/webapp/WEB-INF/views/operatorkinds/list.jspx
deleted file mode 100755
index 92108005e..000000000
--- a/src/main/webapp/WEB-INF/views/operatorkinds/list.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_OperatorKind" items="${operatorkinds}" z="/hvE8aPFsn9YHr9g0F1cNGxfi6U=">
-        <table:table data="${operatorkinds}" id="l_com_labsynch_labseer_domain_OperatorKind" path="/operatorkinds" z="VvYeeFOFpC9zTbzsKP0WpzulOpo=">
-            <table:column id="c_com_labsynch_labseer_domain_OperatorKind_lsType" property="lsType" z="n6JpcxYLAjZ5Mn8/KBX+k43A4gs="/>
-            <table:column id="c_com_labsynch_labseer_domain_OperatorKind_kindName" property="kindName" z="ZspNZZ1F9EfT5BfL23IJPN/XJYQ="/>
-            <table:column id="c_com_labsynch_labseer_domain_OperatorKind_lsTypeAndKind" property="lsTypeAndKind" z="qeynRWDfQNzcad7UpZbJVXJOCl4="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/operatorkinds/show.jspx b/src/main/webapp/WEB-INF/views/operatorkinds/show.jspx
deleted file mode 100755
index 8ffb11051..000000000
--- a/src/main/webapp/WEB-INF/views/operatorkinds/show.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_OperatorKind" object="${operatorkind}" path="/operatorkinds" z="Thu8ojc2XOtGd9oWxhucuvlQ7Lc=">
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_OperatorKind_lsType" object="${operatorkind}" z="9Y26lqWGJT4N5g6fEknGwan6e3g="/>
-        <field:display field="kindName" id="s_com_labsynch_labseer_domain_OperatorKind_kindName" object="${operatorkind}" z="1XNK1nSPZX08gLFoLgvXpPT7aDk="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_OperatorKind_lsTypeAndKind" object="${operatorkind}" z="x9V9ALYmSw5F+6C3V4OKM828o2U="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/operatorkinds/update.jspx b/src/main/webapp/WEB-INF/views/operatorkinds/update.jspx
deleted file mode 100755
index feb24187f..000000000
--- a/src/main/webapp/WEB-INF/views/operatorkinds/update.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_OperatorKind" modelAttribute="operatorKind" path="/operatorkinds" versionField="Version" z="0meM2XK5nDiIR+QBp5XQoEVLeb0=">
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_OperatorKind_lsType" itemValue="id" items="${operatortypes}" path="/operatortypes" required="true" z="XGfubXWyAgJDDn9PoNQRZjA+W8M="/>
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_OperatorKind_kindName" required="true" z="pv8bZ6mDqBSkQb7u+kbC8pNql3c="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_OperatorKind_lsTypeAndKind" z="y08X6fSZhAd2+RoCQ1H7PJLzQzg="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/operatorkinds/views.xml b/src/main/webapp/WEB-INF/views/operatorkinds/views.xml
deleted file mode 100755
index ee595d8e7..000000000
--- a/src/main/webapp/WEB-INF/views/operatorkinds/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="operatorkinds/list">
-        <put-attribute name="body" value="/WEB-INF/views/operatorkinds/list.jspx"/>
-    </definition>
-<definition extends="default" name="operatorkinds/show">
-        <put-attribute name="body" value="/WEB-INF/views/operatorkinds/show.jspx"/>
-    </definition>
-<definition extends="default" name="operatorkinds/create">
-        <put-attribute name="body" value="/WEB-INF/views/operatorkinds/create.jspx"/>
-    </definition>
-<definition extends="default" name="operatorkinds/update">
-        <put-attribute name="body" value="/WEB-INF/views/operatorkinds/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/operators/create.jspx b/src/main/webapp/WEB-INF/views/operators/create.jspx
deleted file mode 100644
index 847a758db..000000000
--- a/src/main/webapp/WEB-INF/views/operators/create.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_Operator" modelAttribute="operator" path="/operators" render="${empty dependencies}" z="9ImC4yQXw1ob8hq0CfeF/qToo+I=">
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_Operator_name" z="wCWf4je6sj1sYMZuHSbzMcmtq2s="/>
-        <field:textarea field="code" id="c_com_labsynch_labseer_domain_Operator_code" z="FNVXAizpnVjS7qMEd2Ba8ChhjxE="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_Operator" render="${not empty dependencies}" z="7YFiYjl8cjgI7eXtV6Z3PdAK4z8="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/operators/findOperatorsByCodeEquals.jspx b/src/main/webapp/WEB-INF/views/operators/findOperatorsByCodeEquals.jspx
deleted file mode 100644
index 9270eb9c0..000000000
--- a/src/main/webapp/WEB-INF/views/operators/findOperatorsByCodeEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeEquals" id="ff_com_labsynch_labseer_domain_Operator" path="/operators" z="0To8nkiqpii/hwUvjMAR+679uu4=">
-        <field:input disableFormBinding="true" field="code" id="f_com_labsynch_labseer_domain_Operator_code" max="255" required="true" z="pz71afIcNgBOus8Kj+Yo7tAcepM="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/operators/findOperatorsByNameEquals.jspx b/src/main/webapp/WEB-INF/views/operators/findOperatorsByNameEquals.jspx
deleted file mode 100644
index e799c4a57..000000000
--- a/src/main/webapp/WEB-INF/views/operators/findOperatorsByNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByNameEquals" id="ff_com_labsynch_labseer_domain_Operator" path="/operators" z="z5hB0uOn4s3ldDpmZEJh8kB2KlE=">
-        <field:input disableFormBinding="true" field="name" id="f_com_labsynch_labseer_domain_Operator_name" max="255" required="true" z="9yFr1Y2n/wL1bnzuSjXtCDUfcyw="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/operators/list.jspx b/src/main/webapp/WEB-INF/views/operators/list.jspx
deleted file mode 100644
index 0a2f1d43d..000000000
--- a/src/main/webapp/WEB-INF/views/operators/list.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_Operator" items="${operators}" z="yrZF7yQj6O3J3ehP2ZZIgRy19S0=">
-        <table:table data="${operators}" id="l_com_labsynch_labseer_domain_Operator" path="/operators" z="A5BAqx93zEN4nhMbjWphN98RvVw=">
-            <table:column id="c_com_labsynch_labseer_domain_Operator_name" property="name" z="t6IcKzuNzTuhNJNI3JbKe+ytEGA="/>
-            <table:column id="c_com_labsynch_labseer_domain_Operator_code" property="code" z="Qtl4FK3eVhtOIVopptlNfu/F/lw="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/operators/show.jspx b/src/main/webapp/WEB-INF/views/operators/show.jspx
deleted file mode 100644
index 15d068a4a..000000000
--- a/src/main/webapp/WEB-INF/views/operators/show.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_Operator" object="${operator}" path="/operators" z="0bspvtQ9ZOrgvlS6ZmnLB1WiuIo=">
-        <field:display field="name" id="s_com_labsynch_labseer_domain_Operator_name" object="${operator}" z="LxtaOwpDGjUBOTIftoZ8VV623jM="/>
-        <field:display field="code" id="s_com_labsynch_labseer_domain_Operator_code" object="${operator}" z="bvlGdZssSneY2rBOxTJS/+f6ZEw="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/operators/update.jspx b/src/main/webapp/WEB-INF/views/operators/update.jspx
deleted file mode 100644
index 6d758ef5c..000000000
--- a/src/main/webapp/WEB-INF/views/operators/update.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_Operator" modelAttribute="operator" path="/operators" versionField="Version" z="9bLJX2KO8oU3rZ6vjJDdsyuWhhc=">
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_Operator_name" z="wCWf4je6sj1sYMZuHSbzMcmtq2s="/>
-        <field:textarea field="code" id="c_com_labsynch_labseer_domain_Operator_code" z="FNVXAizpnVjS7qMEd2Ba8ChhjxE="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/operators/views.xml b/src/main/webapp/WEB-INF/views/operators/views.xml
deleted file mode 100644
index f0d765071..000000000
--- a/src/main/webapp/WEB-INF/views/operators/views.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="operators/list">
-        <put-attribute name="body" value="/WEB-INF/views/operators/list.jspx"/>
-    </definition>
-<definition extends="default" name="operators/show">
-        <put-attribute name="body" value="/WEB-INF/views/operators/show.jspx"/>
-    </definition>
-<definition extends="default" name="operators/create">
-        <put-attribute name="body" value="/WEB-INF/views/operators/create.jspx"/>
-    </definition>
-<definition extends="default" name="operators/update">
-        <put-attribute name="body" value="/WEB-INF/views/operators/update.jspx"/>
-    </definition>
-<definition extends="default" name="operators/findOperatorsByCodeEquals">
-        <put-attribute name="body" value="/WEB-INF/views/operators/findOperatorsByCodeEquals.jspx"/>
-    </definition>
-<definition extends="default" name="operators/findOperatorsByNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/operators/findOperatorsByNameEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/operatortypes/create.jspx b/src/main/webapp/WEB-INF/views/operatortypes/create.jspx
deleted file mode 100755
index a12d75261..000000000
--- a/src/main/webapp/WEB-INF/views/operatortypes/create.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_OperatorType" modelAttribute="operatorType" path="/operatortypes" render="${empty dependencies}" z="qxeHtwGtfQSvks8z+Ml1lft/0K0=">
-        <field:input field="typeName" id="c_com_labsynch_labseer_domain_OperatorType_typeName" max="25" required="true" z="J8O1s6ByrKVPIC/gXN2AaTn9yI4="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_OperatorType" render="${not empty dependencies}" z="K+5Vmo4N5gxRcpZC9CnLsdgJxDY="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/operatortypes/findOperatorTypesByTypeNameEquals.jspx b/src/main/webapp/WEB-INF/views/operatortypes/findOperatorTypesByTypeNameEquals.jspx
deleted file mode 100755
index a69e05717..000000000
--- a/src/main/webapp/WEB-INF/views/operatortypes/findOperatorTypesByTypeNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByTypeNameEquals" id="ff_com_labsynch_labseer_domain_OperatorType" path="/operatortypes" z="eekoKKx9k89wW3c+fUHfRl+B1+I=">
-        <field:input disableFormBinding="true" field="typeName" id="f_com_labsynch_labseer_domain_OperatorType_typeName" max="25" required="true" z="MrH3CqIf+/qLfIC93IHMJKr7V6Q="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/operatortypes/list.jspx b/src/main/webapp/WEB-INF/views/operatortypes/list.jspx
deleted file mode 100755
index 176859b2c..000000000
--- a/src/main/webapp/WEB-INF/views/operatortypes/list.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_OperatorType" items="${operatortypes}" z="SrFP8rSn56WOG3t51aAOKOASLBw=">
-        <table:table data="${operatortypes}" id="l_com_labsynch_labseer_domain_OperatorType" path="/operatortypes" z="YH3ZXUhrKFtOauZ2K8IOV450NkY=">
-            <table:column id="c_com_labsynch_labseer_domain_OperatorType_typeName" property="typeName" z="l/fxZXU3AosN913f6Yi17YC0FgY="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/operatortypes/show.jspx b/src/main/webapp/WEB-INF/views/operatortypes/show.jspx
deleted file mode 100755
index 5a6101703..000000000
--- a/src/main/webapp/WEB-INF/views/operatortypes/show.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_OperatorType" object="${operatortype}" path="/operatortypes" z="3BJ1bvly0alhhWg+sne8sLjwnSE=">
-        <field:display field="typeName" id="s_com_labsynch_labseer_domain_OperatorType_typeName" object="${operatortype}" z="90IhuSI8iy3h6lXteLLTWJc5zBM="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/operatortypes/update.jspx b/src/main/webapp/WEB-INF/views/operatortypes/update.jspx
deleted file mode 100755
index 901c389b6..000000000
--- a/src/main/webapp/WEB-INF/views/operatortypes/update.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_OperatorType" modelAttribute="operatorType" path="/operatortypes" versionField="Version" z="4mdjP5ONzaaPjCfOxudEbLIiLwk=">
-        <field:input field="typeName" id="c_com_labsynch_labseer_domain_OperatorType_typeName" max="25" required="true" z="J8O1s6ByrKVPIC/gXN2AaTn9yI4="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/operatortypes/views.xml b/src/main/webapp/WEB-INF/views/operatortypes/views.xml
deleted file mode 100755
index 447ab69f4..000000000
--- a/src/main/webapp/WEB-INF/views/operatortypes/views.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="operatortypes/list">
-        <put-attribute name="body" value="/WEB-INF/views/operatortypes/list.jspx"/>
-    </definition>
-<definition extends="default" name="operatortypes/show">
-        <put-attribute name="body" value="/WEB-INF/views/operatortypes/show.jspx"/>
-    </definition>
-<definition extends="default" name="operatortypes/create">
-        <put-attribute name="body" value="/WEB-INF/views/operatortypes/create.jspx"/>
-    </definition>
-<definition extends="default" name="operatortypes/update">
-        <put-attribute name="body" value="/WEB-INF/views/operatortypes/update.jspx"/>
-    </definition>
-<definition extends="default" name="operatortypes/findOperatorTypesByTypeNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/operatortypes/findOperatorTypesByTypeNameEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/parentAnnotations/create.jspx b/src/main/webapp/WEB-INF/views/parentAnnotations/create.jspx
deleted file mode 100644
index 13265d2da..000000000
--- a/src/main/webapp/WEB-INF/views/parentAnnotations/create.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ParentAnnotation" modelAttribute="parentAnnotation" path="/parentAnnotations" render="${empty dependencies}" z="36LVnirilFzQHUCYtZ8bdDgAiOI=">
-        <field:input field="code" id="c_com_labsynch_labseer_domain_ParentAnnotation_code" required="true" z="0ic/xratxYAJFqP4Cm/OQVDpQv0="/>
-        <field:input field="name" id="c_com_labsynch_labseer_domain_ParentAnnotation_name" required="true" z="/+QpYdiUBK8zS8i72UwASuySIL8="/>
-        <field:input field="displayOrder" id="c_com_labsynch_labseer_domain_ParentAnnotation_displayOrder" validationMessageCode="field_invalid_integer" z="FN/ubFw1xjp/KBWWmv5PimJ+Yco="/>
-        <field:input field="comment" id="c_com_labsynch_labseer_domain_ParentAnnotation_comment" z="TQhgip8+BwB5fmBhWa9hjwtcJJA="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ParentAnnotation" render="${not empty dependencies}" z="x3WA1006XYUhZsHZU8nL9Ko3jNo="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parentAnnotations/findParentAnnotationsByCodeEquals.jspx b/src/main/webapp/WEB-INF/views/parentAnnotations/findParentAnnotationsByCodeEquals.jspx
deleted file mode 100644
index c18372c3f..000000000
--- a/src/main/webapp/WEB-INF/views/parentAnnotations/findParentAnnotationsByCodeEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeEquals" id="ff_com_labsynch_labseer_domain_ParentAnnotation" path="/parentAnnotations" z="ZnxrK7JR4w6UkYFl9HMl1PboxLY=">
-        <field:input disableFormBinding="true" field="code" id="f_com_labsynch_labseer_domain_ParentAnnotation_code" required="true" z="jtkn3cZ0+MNM4yOJj5NsJdb6+tg="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parentAnnotations/list.jspx b/src/main/webapp/WEB-INF/views/parentAnnotations/list.jspx
deleted file mode 100644
index 9eff54d92..000000000
--- a/src/main/webapp/WEB-INF/views/parentAnnotations/list.jspx
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ParentAnnotation" items="${parentannotations}" z="WAV6GxP3eZWZ92+i4IoLMjWVcTw=">
-        <table:table data="${parentannotations}" id="l_com_labsynch_labseer_domain_ParentAnnotation" path="/parentAnnotations" z="vfvtfnJsTqkyYkUSFMCcOG8mquk=">
-            <table:column id="c_com_labsynch_labseer_domain_ParentAnnotation_code" property="code" z="T7wUeNnv7dnkvMituK8q6dUDRUk="/>
-            <table:column id="c_com_labsynch_labseer_domain_ParentAnnotation_name" property="name" z="vHwPQR4lJhJWcvQl8R8ebcCApes="/>
-            <table:column id="c_com_labsynch_labseer_domain_ParentAnnotation_displayOrder" property="displayOrder" z="AtVjauqXsKCq4VgXB7VpiVRp6gE="/>
-            <table:column id="c_com_labsynch_labseer_domain_ParentAnnotation_comment" property="comment" z="8l0gV60xfui2EinFte0YSLsQMOQ="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parentAnnotations/show.jspx b/src/main/webapp/WEB-INF/views/parentAnnotations/show.jspx
deleted file mode 100644
index 5ab0820bc..000000000
--- a/src/main/webapp/WEB-INF/views/parentAnnotations/show.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ParentAnnotation" object="${parentannotation}" path="/parentAnnotations" z="76lP44H8bS/ELDVHwca+IdYQMIQ=">
-        <field:display field="code" id="s_com_labsynch_labseer_domain_ParentAnnotation_code" object="${parentannotation}" z="/HaGYYmoq7sVZ5p7l6gKbcs5azk="/>
-        <field:display field="name" id="s_com_labsynch_labseer_domain_ParentAnnotation_name" object="${parentannotation}" z="gfxJvq+EBY1AXGPX0wjYmkRdbQw="/>
-        <field:display field="displayOrder" id="s_com_labsynch_labseer_domain_ParentAnnotation_displayOrder" object="${parentannotation}" z="asw2lH5e/AL75Qv5p4PU3C855Mg="/>
-        <field:display field="comment" id="s_com_labsynch_labseer_domain_ParentAnnotation_comment" object="${parentannotation}" z="y1599wsxFAzwZOy2SecKzIfrIbQ="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parentAnnotations/update.jspx b/src/main/webapp/WEB-INF/views/parentAnnotations/update.jspx
deleted file mode 100644
index 9528ab8e7..000000000
--- a/src/main/webapp/WEB-INF/views/parentAnnotations/update.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ParentAnnotation" modelAttribute="parentAnnotation" path="/parentAnnotations" versionField="Version" z="N2RNIA/fmmb1lr6F8VttKVo/vpc=">
-        <field:input field="code" id="c_com_labsynch_labseer_domain_ParentAnnotation_code" required="true" z="0ic/xratxYAJFqP4Cm/OQVDpQv0="/>
-        <field:input field="name" id="c_com_labsynch_labseer_domain_ParentAnnotation_name" required="true" z="/+QpYdiUBK8zS8i72UwASuySIL8="/>
-        <field:input field="displayOrder" id="c_com_labsynch_labseer_domain_ParentAnnotation_displayOrder" validationMessageCode="field_invalid_integer" z="FN/ubFw1xjp/KBWWmv5PimJ+Yco="/>
-        <field:input field="comment" id="c_com_labsynch_labseer_domain_ParentAnnotation_comment" z="TQhgip8+BwB5fmBhWa9hjwtcJJA="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parentAnnotations/views.xml b/src/main/webapp/WEB-INF/views/parentAnnotations/views.xml
deleted file mode 100644
index b98792ba1..000000000
--- a/src/main/webapp/WEB-INF/views/parentAnnotations/views.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="parentAnnotations/list">
-        <put-attribute name="body" value="/WEB-INF/views/parentAnnotations/list.jspx"/>
-    </definition>
-<definition extends="default" name="parentAnnotations/show">
-        <put-attribute name="body" value="/WEB-INF/views/parentAnnotations/show.jspx"/>
-    </definition>
-<definition extends="default" name="parentAnnotations/create">
-        <put-attribute name="body" value="/WEB-INF/views/parentAnnotations/create.jspx"/>
-    </definition>
-<definition extends="default" name="parentAnnotations/update">
-        <put-attribute name="body" value="/WEB-INF/views/parentAnnotations/update.jspx"/>
-    </definition>
-<definition extends="default" name="parentAnnotations/findParentAnnotationsByCodeEquals">
-        <put-attribute name="body" value="/WEB-INF/views/parentAnnotations/findParentAnnotationsByCodeEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/parentaliases/create.jspx b/src/main/webapp/WEB-INF/views/parentaliases/create.jspx
deleted file mode 100644
index 69a315d81..000000000
--- a/src/main/webapp/WEB-INF/views/parentaliases/create.jspx
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ParentAlias" modelAttribute="parentAlias" path="/parentaliases" render="${empty dependencies}" z="p7DPZrAq2b7KQYuM9m8tGR1+z3Q=">
-        <field:select field="parent" id="c_com_labsynch_labseer_domain_ParentAlias_parent" itemValue="id" items="${parents}" path="/parents" z="2Tqc675Lq3ZctUTNbFiuoV4jxh4="/>
-        <field:input field="lsType" id="c_com_labsynch_labseer_domain_ParentAlias_lsType" z="sArffcsmcMBwJ40swBjWTKI+EG0="/>
-        <field:input field="lsKind" id="c_com_labsynch_labseer_domain_ParentAlias_lsKind" z="kaYsXZhEzr7uP+gWmjmpR50/uVA="/>
-        <field:input field="aliasName" id="c_com_labsynch_labseer_domain_ParentAlias_aliasName" z="Lk34FC3Z0YqgR/tQxHP9GRpezDw="/>
-        <field:checkbox field="preferred" id="c_com_labsynch_labseer_domain_ParentAlias_preferred" z="83Og+Qqf9GMDFHmnnFzh10UBMl8="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ParentAlias_ignored" z="vIMJtX/aSI87sWaIPnw5KoVfwEw="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ParentAlias_deleted" z="hmiskjl7AwlzN0bzyHfLXMkNbWc="/>
-        <field:input field="sortId" id="c_com_labsynch_labseer_domain_ParentAlias_sortId" validationMessageCode="field_invalid_integer" z="hGOQlpqJW84b+ifpCpbUSrkN8iI="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ParentAlias" render="${not empty dependencies}" z="3fAKIuwS8BaC/x23zQoNXScUI9g="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parentaliases/findParentAliasesByAliasNameEquals.jspx b/src/main/webapp/WEB-INF/views/parentaliases/findParentAliasesByAliasNameEquals.jspx
deleted file mode 100644
index 8ab44ff91..000000000
--- a/src/main/webapp/WEB-INF/views/parentaliases/findParentAliasesByAliasNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByAliasNameEquals" id="ff_com_labsynch_labseer_domain_ParentAlias" path="/parentaliases" z="uXqu/JAD7Qtwo3ey9r8jZfonMs0=">
-        <field:input disableFormBinding="true" field="aliasName" id="f_com_labsynch_labseer_domain_ParentAlias_aliasName" required="true" z="/miBvGyFqiTTEXM2HdJAfMBSjVw="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parentaliases/findParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals.jspx b/src/main/webapp/WEB-INF/views/parentaliases/findParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals.jspx
deleted file mode 100644
index 88de83b07..000000000
--- a/src/main/webapp/WEB-INF/views/parentaliases/findParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals" id="ff_com_labsynch_labseer_domain_ParentAlias" path="/parentaliases" z="XeQG8XyGdPJSa2pi5tFL+CYgoMo=">
-        <field:input disableFormBinding="true" field="aliasName" id="f_com_labsynch_labseer_domain_ParentAlias_aliasName" required="true" z="/miBvGyFqiTTEXM2HdJAfMBSjVw="/>
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_ParentAlias_lsType" required="true" z="N2LIo3DUfaRMBb0ky3uwDgmQ/pE="/>
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_ParentAlias_lsKind" required="true" z="CuMX5IyiG0us1qLh3im8KIVTsmo="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parentaliases/findParentAliasesByParent.jspx b/src/main/webapp/WEB-INF/views/parentaliases/findParentAliasesByParent.jspx
deleted file mode 100644
index 858983207..000000000
--- a/src/main/webapp/WEB-INF/views/parentaliases/findParentAliasesByParent.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByParent" id="ff_com_labsynch_labseer_domain_ParentAlias" path="/parentaliases" z="Kx3tZvRdnISg6jLUHJSn5wPiP5E=">
-        <field:select disableFormBinding="true" field="parent" id="f_com_labsynch_labseer_domain_ParentAlias_parent" itemValue="id" items="${parents}" path="/parents" required="true" z="Wwxzev7tLRIp3pf08QpBSScWUuo="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parentaliases/findParentAliasesByParentAndLsTypeEqualsAndLsKindEquals.jspx b/src/main/webapp/WEB-INF/views/parentaliases/findParentAliasesByParentAndLsTypeEqualsAndLsKindEquals.jspx
deleted file mode 100644
index 986abf683..000000000
--- a/src/main/webapp/WEB-INF/views/parentaliases/findParentAliasesByParentAndLsTypeEqualsAndLsKindEquals.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByParentAndLsTypeEqualsAndLsKindEquals" id="ff_com_labsynch_labseer_domain_ParentAlias" path="/parentaliases" z="qJmeoMR+3hYzAZfGFxDilokpz3E=">
-        <field:select disableFormBinding="true" field="parent" id="f_com_labsynch_labseer_domain_ParentAlias_parent" itemValue="id" items="${parents}" path="/parents" required="true" z="Wwxzev7tLRIp3pf08QpBSScWUuo="/>
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_ParentAlias_lsType" required="true" z="N2LIo3DUfaRMBb0ky3uwDgmQ/pE="/>
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_ParentAlias_lsKind" required="true" z="CuMX5IyiG0us1qLh3im8KIVTsmo="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parentaliases/findParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals.jspx b/src/main/webapp/WEB-INF/views/parentaliases/findParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals.jspx
deleted file mode 100644
index b0b6ef081..000000000
--- a/src/main/webapp/WEB-INF/views/parentaliases/findParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals" id="ff_com_labsynch_labseer_domain_ParentAlias" path="/parentaliases" z="Ez0INXzeiZ44jEWjapgxOh8hF8Q=">
-        <field:select disableFormBinding="true" field="parent" id="f_com_labsynch_labseer_domain_ParentAlias_parent" itemValue="id" items="${parents}" path="/parents" required="true" z="Wwxzev7tLRIp3pf08QpBSScWUuo="/>
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_ParentAlias_lsType" required="true" z="N2LIo3DUfaRMBb0ky3uwDgmQ/pE="/>
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_ParentAlias_lsKind" required="true" z="CuMX5IyiG0us1qLh3im8KIVTsmo="/>
-        <field:input disableFormBinding="true" field="aliasName" id="f_com_labsynch_labseer_domain_ParentAlias_aliasName" required="true" z="/miBvGyFqiTTEXM2HdJAfMBSjVw="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parentaliases/list.jspx b/src/main/webapp/WEB-INF/views/parentaliases/list.jspx
deleted file mode 100644
index 59214211e..000000000
--- a/src/main/webapp/WEB-INF/views/parentaliases/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ParentAlias" items="${parentaliases}" z="3b+h/DnCNU55thzvKGfAS7XNQlM=">
-        <table:table data="${parentaliases}" id="l_com_labsynch_labseer_domain_ParentAlias" path="/parentaliases" z="buS2WILiJwxJzIrP8xJsCp98PVk=">
-            <table:column id="c_com_labsynch_labseer_domain_ParentAlias_parent" property="parent" z="8r5GvC3F1Yqj7x8c1mGHVfcjTnI="/>
-            <table:column id="c_com_labsynch_labseer_domain_ParentAlias_lsType" property="lsType" z="DtYiOLPGea6FVEBC6r05lSmTkAk="/>
-            <table:column id="c_com_labsynch_labseer_domain_ParentAlias_lsKind" property="lsKind" z="aMOcY1Pc0OZh8X3GZU36W1lEatA="/>
-            <table:column id="c_com_labsynch_labseer_domain_ParentAlias_aliasName" property="aliasName" z="2JntYz4gZsdYlMToS02EQ0Pg5u0="/>
-            <table:column id="c_com_labsynch_labseer_domain_ParentAlias_preferred" property="preferred" z="LTIG6We4+RmItwsLcYFyWMyQkPw="/>
-            <table:column id="c_com_labsynch_labseer_domain_ParentAlias_ignored" property="ignored" z="hSYfY7Y8x7nCEJ7Z9LMb/IzN0VI="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parentaliases/show.jspx b/src/main/webapp/WEB-INF/views/parentaliases/show.jspx
deleted file mode 100644
index 23cdd46dc..000000000
--- a/src/main/webapp/WEB-INF/views/parentaliases/show.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ParentAlias" object="${parentalias}" path="/parentaliases" z="lvIDJks0FUz5BL595mIZXF8MS5w=">
-        <field:display field="parent" id="s_com_labsynch_labseer_domain_ParentAlias_parent" object="${parentalias}" z="FPwk6mfYmusUSm9cemWETYZAMCQ="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ParentAlias_lsType" object="${parentalias}" z="/pX8w+QKDa6i0H+RfHzJevctCjQ="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_ParentAlias_lsKind" object="${parentalias}" z="SZtZ9DtG0CYZZezuqzwXO1Z0oZY="/>
-        <field:display field="aliasName" id="s_com_labsynch_labseer_domain_ParentAlias_aliasName" object="${parentalias}" z="cBtx63Kz4+5cP+UUod436UsmDqk="/>
-        <field:display field="preferred" id="s_com_labsynch_labseer_domain_ParentAlias_preferred" object="${parentalias}" z="YSzDcxPS5e+2JphHHW7I+SYCeaM="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ParentAlias_ignored" object="${parentalias}" z="T3EQ0UMcEK8cf6q+D2rpoKhJspw="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_ParentAlias_deleted" object="${parentalias}" z="sSpwvqT4wn0o3GFwE+7yCU3CQRY="/>
-        <field:display field="sortId" id="s_com_labsynch_labseer_domain_ParentAlias_sortId" object="${parentalias}" z="DTFKI3mnMFng8StRIl1wmFbIDDI="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parentaliases/update.jspx b/src/main/webapp/WEB-INF/views/parentaliases/update.jspx
deleted file mode 100644
index b0c81f104..000000000
--- a/src/main/webapp/WEB-INF/views/parentaliases/update.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ParentAlias" modelAttribute="parentAlias" path="/parentaliases" versionField="Version" z="aYj9IJ50/fvAeLP2uB4T9p+AIwE=">
-        <field:select field="parent" id="c_com_labsynch_labseer_domain_ParentAlias_parent" itemValue="id" items="${parents}" path="/parents" z="2Tqc675Lq3ZctUTNbFiuoV4jxh4="/>
-        <field:input field="lsType" id="c_com_labsynch_labseer_domain_ParentAlias_lsType" z="sArffcsmcMBwJ40swBjWTKI+EG0="/>
-        <field:input field="lsKind" id="c_com_labsynch_labseer_domain_ParentAlias_lsKind" z="kaYsXZhEzr7uP+gWmjmpR50/uVA="/>
-        <field:input field="aliasName" id="c_com_labsynch_labseer_domain_ParentAlias_aliasName" z="Lk34FC3Z0YqgR/tQxHP9GRpezDw="/>
-        <field:checkbox field="preferred" id="c_com_labsynch_labseer_domain_ParentAlias_preferred" z="83Og+Qqf9GMDFHmnnFzh10UBMl8="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ParentAlias_ignored" z="vIMJtX/aSI87sWaIPnw5KoVfwEw="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ParentAlias_deleted" z="hmiskjl7AwlzN0bzyHfLXMkNbWc="/>
-        <field:input field="sortId" id="c_com_labsynch_labseer_domain_ParentAlias_sortId" validationMessageCode="field_invalid_integer" z="hGOQlpqJW84b+ifpCpbUSrkN8iI="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parentaliases/views.xml b/src/main/webapp/WEB-INF/views/parentaliases/views.xml
deleted file mode 100644
index 260b794f7..000000000
--- a/src/main/webapp/WEB-INF/views/parentaliases/views.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="parentaliases/list">
-        <put-attribute name="body" value="/WEB-INF/views/parentaliases/list.jspx"/>
-    </definition>
-<definition extends="default" name="parentaliases/show">
-        <put-attribute name="body" value="/WEB-INF/views/parentaliases/show.jspx"/>
-    </definition>
-<definition extends="default" name="parentaliases/create">
-        <put-attribute name="body" value="/WEB-INF/views/parentaliases/create.jspx"/>
-    </definition>
-<definition extends="default" name="parentaliases/update">
-        <put-attribute name="body" value="/WEB-INF/views/parentaliases/update.jspx"/>
-    </definition>
-<definition extends="default" name="parentaliases/findParentAliasesByAliasNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/parentaliases/findParentAliasesByAliasNameEquals.jspx"/>
-    </definition>
-<definition extends="default" name="parentaliases/findParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/parentaliases/findParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals.jspx"/>
-    </definition>
-<definition extends="default" name="parentaliases/findParentAliasesByParent">
-        <put-attribute name="body" value="/WEB-INF/views/parentaliases/findParentAliasesByParent.jspx"/>
-    </definition>
-<definition extends="default" name="parentaliases/findParentAliasesByParentAndLsTypeEqualsAndLsKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/parentaliases/findParentAliasesByParentAndLsTypeEqualsAndLsKindEquals.jspx"/>
-    </definition>
-<definition extends="default" name="parentaliases/findParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/parentaliases/findParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/parentaliaskinds/create.jspx b/src/main/webapp/WEB-INF/views/parentaliaskinds/create.jspx
deleted file mode 100644
index bc52aab09..000000000
--- a/src/main/webapp/WEB-INF/views/parentaliaskinds/create.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ParentAliasKind" modelAttribute="parentAliasKind" path="/parentaliaskinds" render="${empty dependencies}" z="juo+Exchjr2+Yd+P1EtqEsA4ERQ=">
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_ParentAliasKind_lsType" itemValue="id" items="${parentaliastypes}" path="/parentaliastypes" required="true" z="NNXjtEZkxuz8cCY8P+xJYAWfG/k="/>
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_ParentAliasKind_kindName" z="zMnqxTyhj5xuIj4xXrRXLuKmZJU="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ParentAliasKind" render="${not empty dependencies}" z="x2t7YnKaS4Tz6wmH4PZN+Dchs/Y="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parentaliaskinds/list.jspx b/src/main/webapp/WEB-INF/views/parentaliaskinds/list.jspx
deleted file mode 100644
index 26350eb58..000000000
--- a/src/main/webapp/WEB-INF/views/parentaliaskinds/list.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ParentAliasKind" items="${parentaliaskinds}" z="qT8M1M146x0mX0PS9OT64y5YmPc=">
-        <table:table data="${parentaliaskinds}" id="l_com_labsynch_labseer_domain_ParentAliasKind" path="/parentaliaskinds" z="+rtMITuimdjgUmKiLnjAXyf7O90=">
-            <table:column id="c_com_labsynch_labseer_domain_ParentAliasKind_lsType" property="lsType" z="54sP/WrCdgzFEDXmJoguqba7VZ4="/>
-            <table:column id="c_com_labsynch_labseer_domain_ParentAliasKind_kindName" property="kindName" z="UJIK/GSsMWUzPqaNpk3bjQ/1GCM="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parentaliaskinds/show.jspx b/src/main/webapp/WEB-INF/views/parentaliaskinds/show.jspx
deleted file mode 100644
index 51138fda1..000000000
--- a/src/main/webapp/WEB-INF/views/parentaliaskinds/show.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ParentAliasKind" object="${parentaliaskind}" path="/parentaliaskinds" z="Ox+I6EZRHLvAdeJRONr7FY2DB5I=">
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ParentAliasKind_lsType" object="${parentaliaskind}" z="FlCD99oSfGA4Zrb04bd1FwuCb+c="/>
-        <field:display field="kindName" id="s_com_labsynch_labseer_domain_ParentAliasKind_kindName" object="${parentaliaskind}" z="I5dz/wAwING8j5ZKhNZgyMnA+Wg="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parentaliaskinds/update.jspx b/src/main/webapp/WEB-INF/views/parentaliaskinds/update.jspx
deleted file mode 100644
index 6d9c7f737..000000000
--- a/src/main/webapp/WEB-INF/views/parentaliaskinds/update.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ParentAliasKind" modelAttribute="parentAliasKind" path="/parentaliaskinds" versionField="Version" z="Rawidkeq7vPYzNMinQG7cIfLHYk=">
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_ParentAliasKind_lsType" itemValue="id" items="${parentaliastypes}" path="/parentaliastypes" required="true" z="NNXjtEZkxuz8cCY8P+xJYAWfG/k="/>
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_ParentAliasKind_kindName" z="zMnqxTyhj5xuIj4xXrRXLuKmZJU="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parentaliaskinds/views.xml b/src/main/webapp/WEB-INF/views/parentaliaskinds/views.xml
deleted file mode 100644
index 14d4c80ee..000000000
--- a/src/main/webapp/WEB-INF/views/parentaliaskinds/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="parentaliaskinds/list">
-        <put-attribute name="body" value="/WEB-INF/views/parentaliaskinds/list.jspx"/>
-    </definition>
-<definition extends="default" name="parentaliaskinds/show">
-        <put-attribute name="body" value="/WEB-INF/views/parentaliaskinds/show.jspx"/>
-    </definition>
-<definition extends="default" name="parentaliaskinds/create">
-        <put-attribute name="body" value="/WEB-INF/views/parentaliaskinds/create.jspx"/>
-    </definition>
-<definition extends="default" name="parentaliaskinds/update">
-        <put-attribute name="body" value="/WEB-INF/views/parentaliaskinds/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/parentaliastypes/create.jspx b/src/main/webapp/WEB-INF/views/parentaliastypes/create.jspx
deleted file mode 100644
index 746242cb3..000000000
--- a/src/main/webapp/WEB-INF/views/parentaliastypes/create.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ParentAliasType" modelAttribute="parentAliasType" path="/parentaliastypes" render="${empty dependencies}" z="SnNx+yE+5rOTHsWhc22KgTo/G/Y=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_ParentAliasType_typeName" z="kSQdiPkwSgK2L96kSOfGqXnpIs0="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ParentAliasType" render="${not empty dependencies}" z="Yk9joH0t0AoewhkJR/YBaBnGHYA="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parentaliastypes/list.jspx b/src/main/webapp/WEB-INF/views/parentaliastypes/list.jspx
deleted file mode 100644
index 94a01da08..000000000
--- a/src/main/webapp/WEB-INF/views/parentaliastypes/list.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ParentAliasType" items="${parentaliastypes}" z="Ud+SrVZBkkgJxYgEztfTAqnok/A=">
-        <table:table data="${parentaliastypes}" id="l_com_labsynch_labseer_domain_ParentAliasType" path="/parentaliastypes" z="iEwuNOqMFqUc4qC6zr+5edumEoQ=">
-            <table:column id="c_com_labsynch_labseer_domain_ParentAliasType_typeName" property="typeName" z="cg9L57TJHvEBeeWRN8mRtkK8nwM="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parentaliastypes/show.jspx b/src/main/webapp/WEB-INF/views/parentaliastypes/show.jspx
deleted file mode 100644
index 71ae80720..000000000
--- a/src/main/webapp/WEB-INF/views/parentaliastypes/show.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ParentAliasType" object="${parentaliastype}" path="/parentaliastypes" z="TG3E9gMin48GGu7q2WDqciKSxrc=">
-        <field:display field="typeName" id="s_com_labsynch_labseer_domain_ParentAliasType_typeName" object="${parentaliastype}" z="iMGa3WWVVlpttTydTecmhqfC6UA="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parentaliastypes/update.jspx b/src/main/webapp/WEB-INF/views/parentaliastypes/update.jspx
deleted file mode 100644
index 66ab85e3a..000000000
--- a/src/main/webapp/WEB-INF/views/parentaliastypes/update.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ParentAliasType" modelAttribute="parentAliasType" path="/parentaliastypes" versionField="Version" z="ILo3AKRfov9JaA1NoEx9yUeZj2A=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_ParentAliasType_typeName" z="kSQdiPkwSgK2L96kSOfGqXnpIs0="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parentaliastypes/views.xml b/src/main/webapp/WEB-INF/views/parentaliastypes/views.xml
deleted file mode 100644
index 8a19c3286..000000000
--- a/src/main/webapp/WEB-INF/views/parentaliastypes/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="parentaliastypes/list">
-        <put-attribute name="body" value="/WEB-INF/views/parentaliastypes/list.jspx"/>
-    </definition>
-<definition extends="default" name="parentaliastypes/show">
-        <put-attribute name="body" value="/WEB-INF/views/parentaliastypes/show.jspx"/>
-    </definition>
-<definition extends="default" name="parentaliastypes/create">
-        <put-attribute name="body" value="/WEB-INF/views/parentaliastypes/create.jspx"/>
-    </definition>
-<definition extends="default" name="parentaliastypes/update">
-        <put-attribute name="body" value="/WEB-INF/views/parentaliastypes/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/parents/create.jspx b/src/main/webapp/WEB-INF/views/parents/create.jspx
deleted file mode 100644
index 2ed0bb5de..000000000
--- a/src/main/webapp/WEB-INF/views/parents/create.jspx
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_Parent" modelAttribute="parent" path="/parents" render="${empty dependencies}" z="42lXYZsOTOhE/wRhGCZxy/rgFXg=">
-        <field:input field="labelPrefix" id="c_com_labsynch_labseer_domain_Parent_labelPrefix" z="00SPoYc+sKCQboC7QPMgd49bOrk="/>
-        <field:textarea field="corpName" id="c_com_labsynch_labseer_domain_Parent_corpName" required="true" z="Ml5I/GhT+J/9tYJWfXOQIRPlZsU="/>
-        <field:input field="parentNumber" id="c_com_labsynch_labseer_domain_Parent_parentNumber" z="nnGxDavZ4dxsOJ/3SX4V0pjxMlw="/>
-        <field:textarea field="commonName" id="c_com_labsynch_labseer_domain_Parent_commonName" z="MNlrAYQrcjBG9YleZ4WVwM4JT/w="/>
-        <field:select field="stereoCategory" id="c_com_labsynch_labseer_domain_Parent_stereoCategory" itemValue="id" items="${stereocategorys}" path="/stereocategorys" z="T/sPyuEU6869UjTpvRn/jZ7w/LQ="/>
-        <field:textarea field="stereoComment" id="c_com_labsynch_labseer_domain_Parent_stereoComment" z="icv7a9VEKWEfjOVWNQb9iMyt+/U="/>
-        <field:input field="molStructure" id="c_com_labsynch_labseer_domain_Parent_molStructure" z="8cTUPeDI7sNMGk2UDhXpPL5kxuE="/>
-        <field:input field="molWeight" id="c_com_labsynch_labseer_domain_Parent_molWeight" validationMessageCode="field_invalid_number" z="y5yEVMMvxjSnMQOaAWrpu1/WboI="/>
-        <field:input field="exactMass" id="c_com_labsynch_labseer_domain_Parent_exactMass" validationMessageCode="field_invalid_number" z="VWXFboQtA5Xpd0A/O3tdBwVtDZ4="/>
-        <field:textarea field="molFormula" id="c_com_labsynch_labseer_domain_Parent_molFormula" z="8rcKw3VvO79SREtwvrL9vvL5FdA="/>
-        <field:input field="CdId" id="c_com_labsynch_labseer_domain_Parent_CdId" required="true" z="tqmYcZX6tFe00WR8BML0K17HSig="/>
-        <field:datetime dateTimePattern="${parent_registrationdate_date_format}" field="registrationDate" id="c_com_labsynch_labseer_domain_Parent_registrationDate" z="SNehWAj6vK7embzg0sb6mUUANrU="/>
-        <field:datetime dateTimePattern="${parent_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_Parent_modifiedDate" z="vZxhuBbo11drtqSYR4G/riy/yIU="/>
-        <field:checkbox field="ignore" id="c_com_labsynch_labseer_domain_Parent_ignore" z="BOK0qALDDhyiCNrZrM5cB5Nn+04="/>
-        <field:simple field="saltForms" id="c_com_labsynch_labseer_domain_Parent_saltForms" messageCode="entity_reference_not_managed" messageCodeAttribute="Salt Form" z="hCF5YKbweyigUn5IaHg17a/qA4M="/>
-        <field:simple field="parentAliases" id="c_com_labsynch_labseer_domain_Parent_parentAliases" messageCode="entity_reference_not_managed" messageCodeAttribute="Parent Alias" z="1oy6NQ5c8NsHNmrKEWVi1DPQOMY="/>
-        <field:select field="bulkLoadFile" id="c_com_labsynch_labseer_domain_Parent_bulkLoadFile" itemValue="id" items="${bulkloadfiles}" path="/bulkloadfiles" z="4exmUxNie76iN68Icuqbpvtuyos="/>
-        <field:select field="parentAnnotation" id="c_com_labsynch_labseer_domain_Parent_parentAnnotation" itemValue="id" items="${parentannotations}" path="/parentAnnotations" z="iP3p56o5HeVlYyp+eoEbj0rY5hE="/>
-        <field:select field="compoundType" id="c_com_labsynch_labseer_domain_Parent_compoundType" itemValue="id" items="${compoundtypes}" path="/compoundTypes" z="EU/YFXt0rzJL7girEPwGZ060IQg="/>
-        <field:input field="comment" id="c_com_labsynch_labseer_domain_Parent_comment" z="5rOw8Zvd/0BZmVhkKU0vhjF/JOs="/>
-        <field:checkbox field="isMixture" id="c_com_labsynch_labseer_domain_Parent_isMixture" z="k3R/y0wYJpjqDb/qGkqjN7NHYtw="/>
-        <field:input field="chemist" id="c_com_labsynch_labseer_domain_Parent_chemist" z="uYsrCIbmbP1UfQSJq3iSX3lSFSg="/>
-        <field:input field="registeredBy" id="c_com_labsynch_labseer_domain_Parent_registeredBy" z="U082F6tQzd4yScuyvob+H1mVVCU="/>
-        <field:input field="modifiedBy" id="c_com_labsynch_labseer_domain_Parent_modifiedBy" z="9VrsJ6xKwxZ9s3pofxz8To/ny4M="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_Parent" render="${not empty dependencies}" z="q0eV+YEmz9e6PwbvVvLEJ4ujCQU="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parents/findParentsByBulkLoadFileEquals.jspx b/src/main/webapp/WEB-INF/views/parents/findParentsByBulkLoadFileEquals.jspx
deleted file mode 100644
index 55a14cd82..000000000
--- a/src/main/webapp/WEB-INF/views/parents/findParentsByBulkLoadFileEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByBulkLoadFileEquals" id="ff_com_labsynch_labseer_domain_Parent" path="/parents" z="gVYMOs3UnaEpKbik4XS1BUw3TRo=">
-        <field:select disableFormBinding="true" field="bulkLoadFile" id="f_com_labsynch_labseer_domain_Parent_bulkLoadFile" itemValue="id" items="${bulkloadfiles}" path="/bulkloadfiles" required="true" z="Rl84vODq+hPbYzCd1EJVPXpMEZQ="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parents/findParentsByCdId.jspx b/src/main/webapp/WEB-INF/views/parents/findParentsByCdId.jspx
deleted file mode 100644
index 1a1899b01..000000000
--- a/src/main/webapp/WEB-INF/views/parents/findParentsByCdId.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCdId" id="ff_com_labsynch_labseer_domain_Parent" path="/parents" z="sf+KEUzYoQCYxqPgxSjxFhfzHA0=">
-        <field:input disableFormBinding="true" field="CdId" id="f_com_labsynch_labseer_domain_Parent_CdId" required="true" z="Lw/tux/3J88XtWFk9ebw+gr702w="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parents/findParentsByCommonNameLike.jspx b/src/main/webapp/WEB-INF/views/parents/findParentsByCommonNameLike.jspx
deleted file mode 100644
index f6a28b2e5..000000000
--- a/src/main/webapp/WEB-INF/views/parents/findParentsByCommonNameLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCommonNameLike" id="ff_com_labsynch_labseer_domain_Parent" path="/parents" z="uqKSxP9FW9ZgA1Rh89/H/JZjdV0=">
-        <field:input disableFormBinding="true" field="commonName" id="f_com_labsynch_labseer_domain_Parent_commonName" max="1000" required="true" z="JoD1KlXpKQAeBcINBvCP5qwh0UE="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parents/findParentsByCorpNameEquals.jspx b/src/main/webapp/WEB-INF/views/parents/findParentsByCorpNameEquals.jspx
deleted file mode 100644
index 30ba99371..000000000
--- a/src/main/webapp/WEB-INF/views/parents/findParentsByCorpNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCorpNameEquals" id="ff_com_labsynch_labseer_domain_Parent" path="/parents" z="eXwQNvIgGnTwaanF/0trub+ShDw=">
-        <field:input disableFormBinding="true" field="corpName" id="f_com_labsynch_labseer_domain_Parent_corpName" max="255" required="true" z="jUVW7pl2v3WVCuGk1Vq3h6890wo="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parents/findParentsByCorpNameLike.jspx b/src/main/webapp/WEB-INF/views/parents/findParentsByCorpNameLike.jspx
deleted file mode 100644
index d07e97404..000000000
--- a/src/main/webapp/WEB-INF/views/parents/findParentsByCorpNameLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCorpNameLike" id="ff_com_labsynch_labseer_domain_Parent" path="/parents" z="H5WgkRFSlnACTkrxknuMK3htc3g=">
-        <field:input disableFormBinding="true" field="corpName" id="f_com_labsynch_labseer_domain_Parent_corpName" max="255" required="true" z="jUVW7pl2v3WVCuGk1Vq3h6890wo="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parents/findParentsBySaltForms.jspx b/src/main/webapp/WEB-INF/views/parents/findParentsBySaltForms.jspx
deleted file mode 100644
index d43da92b9..000000000
--- a/src/main/webapp/WEB-INF/views/parents/findParentsBySaltForms.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="BySaltForms" id="ff_com_labsynch_labseer_domain_Parent" path="/parents" z="jugNcXTHW4zLl7GnIX2gzilchMw=">
-        <field:select disableFormBinding="true" field="saltForms" id="f_com_labsynch_labseer_domain_Parent_saltForms" itemValue="id" items="${saltforms}" path="/saltforms" required="true" z="IE9CSq4a2stAosZu+Our9HZEWqc="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parents/list.jspx b/src/main/webapp/WEB-INF/views/parents/list.jspx
deleted file mode 100644
index d895f50a2..000000000
--- a/src/main/webapp/WEB-INF/views/parents/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_Parent" items="${parents}" z="Q9BDy+7ZIqQ0Q/M66kAs29SvbHY=">
-        <table:table data="${parents}" id="l_com_labsynch_labseer_domain_Parent" path="/parents" z="ZiqR0EAMkcYz38+4XR1xg636ZGE=">
-            <table:column id="c_com_labsynch_labseer_domain_Parent_labelPrefix" property="labelPrefix" z="mE2WWCfURqzxgpmEiwafi388cNk="/>
-            <table:column id="c_com_labsynch_labseer_domain_Parent_corpName" property="corpName" z="DdaPmb2xo5DZUxdqTZLSplM8jCc="/>
-            <table:column id="c_com_labsynch_labseer_domain_Parent_parentNumber" property="parentNumber" z="GUGYt2sCv7JQCTHq/ZHCZyYmj2Y="/>
-            <table:column id="c_com_labsynch_labseer_domain_Parent_commonName" property="commonName" z="/oic1tBFus0X1pE9WFE4gGNgS08="/>
-            <table:column id="c_com_labsynch_labseer_domain_Parent_stereoCategory" property="stereoCategory" z="jSPTSM9t8LsSjyIFAXqGs1cBf78="/>
-            <table:column id="c_com_labsynch_labseer_domain_Parent_chemist" property="chemist" z="QhfMXg/cFirflsL6dzhw5NiH6mA="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parents/show.jspx b/src/main/webapp/WEB-INF/views/parents/show.jspx
deleted file mode 100644
index 69752c50c..000000000
--- a/src/main/webapp/WEB-INF/views/parents/show.jspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_Parent" object="${parent}" path="/parents" z="kHc77vQtMcHkMgk+VSgDx6M+kPw=">
-        <field:display field="labelPrefix" id="s_com_labsynch_labseer_domain_Parent_labelPrefix" object="${parent}" z="qvhE4tzIvHAXRAQtM6/CWI06e18="/>
-        <field:display field="corpName" id="s_com_labsynch_labseer_domain_Parent_corpName" object="${parent}" z="24IPRhMpP83BUwyVVTV06hddwjE="/>
-        <field:display field="parentNumber" id="s_com_labsynch_labseer_domain_Parent_parentNumber" object="${parent}" z="FDBDjLgW4UYz4Xitj4lGhlXe5Bg="/>
-        <field:display field="commonName" id="s_com_labsynch_labseer_domain_Parent_commonName" object="${parent}" z="+CYWbGmJq0sg9L1vN6DdFPlI/RY="/>
-        <field:display field="stereoCategory" id="s_com_labsynch_labseer_domain_Parent_stereoCategory" object="${parent}" z="eG+ZAW9QoGLkOaop1vOs2pefIAA="/>
-        <field:display field="stereoComment" id="s_com_labsynch_labseer_domain_Parent_stereoComment" object="${parent}" z="XA42nEkNGuFxRrBFP9HqE52W3hU="/>
-        <field:display field="molStructure" id="s_com_labsynch_labseer_domain_Parent_molStructure" object="${parent}" z="vvKt8l0h3okgSai3NdYUSU6q9Lg="/>
-        <field:display field="molWeight" id="s_com_labsynch_labseer_domain_Parent_molWeight" object="${parent}" z="xztcy+Eobmq8RnnLb6fFuibiIf0="/>
-        <field:display field="exactMass" id="s_com_labsynch_labseer_domain_Parent_exactMass" object="${parent}" z="zkW1tHOe9ZRnmDxPbM7Ic+LS0k8="/>
-        <field:display field="molFormula" id="s_com_labsynch_labseer_domain_Parent_molFormula" object="${parent}" z="U42fGTzWmLUvnn8t+aya7/whDlc="/>
-        <field:display field="cdId" id="s_com_labsynch_labseer_domain_Parent_CdId" object="${parent}" z="3nYsxx44w05xTg/UZB7lHxpyCUQ="/>
-        <field:display date="true" dateTimePattern="${parent_registrationdate_date_format}" field="registrationDate" id="s_com_labsynch_labseer_domain_Parent_registrationDate" object="${parent}" z="y8vz+qFaJs8E130A1EzFgj9lcw0="/>
-        <field:display date="true" dateTimePattern="${parent_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_Parent_modifiedDate" object="${parent}" z="mo+4cq0xVwoEcBuYLPzcB8F0Lvo="/>
-        <field:display field="ignore" id="s_com_labsynch_labseer_domain_Parent_ignore" object="${parent}" z="kEKX218VAEGO+GcYQGaRtj+IEdM="/>
-        <field:display field="bulkLoadFile" id="s_com_labsynch_labseer_domain_Parent_bulkLoadFile" object="${parent}" z="KPwzm0cU4MplS4aVr88fd7zM26w="/>
-        <field:display field="parentAnnotation" id="s_com_labsynch_labseer_domain_Parent_parentAnnotation" object="${parent}" z="edZVnMhKxlM/sxbpkf/4TTqn8yE="/>
-        <field:display field="compoundType" id="s_com_labsynch_labseer_domain_Parent_compoundType" object="${parent}" z="TXESJsKiUl1kyFjd53G7zWgtjVY="/>
-        <field:display field="comment" id="s_com_labsynch_labseer_domain_Parent_comment" object="${parent}" z="ydKkSnmrTPX86ovLO1sCvt1r5pI="/>
-        <field:display field="isMixture" id="s_com_labsynch_labseer_domain_Parent_isMixture" object="${parent}" z="yog4nEXqm2sB/ZekWqmSD/ihRi0="/>
-        <field:display field="chemist" id="s_com_labsynch_labseer_domain_Parent_chemist" object="${parent}" z="PZFiJ0FNsgrAkF8WZrXj3FgTnp8="/>
-        <field:display field="registeredBy" id="s_com_labsynch_labseer_domain_Parent_registeredBy" object="${parent}" z="Ky81k12O9ocUAKOHtPRxCOJEM2U="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_Parent_modifiedBy" object="${parent}" z="h9QYymeorYrRL+IUimoKybivE0s="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parents/update.jspx b/src/main/webapp/WEB-INF/views/parents/update.jspx
deleted file mode 100644
index 226a9791c..000000000
--- a/src/main/webapp/WEB-INF/views/parents/update.jspx
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_Parent" modelAttribute="parent" path="/parents" versionField="Version" z="V9d26P9d9OgX0izKEAbRHgkqsJw=">
-        <field:input field="labelPrefix" id="c_com_labsynch_labseer_domain_Parent_labelPrefix" z="00SPoYc+sKCQboC7QPMgd49bOrk="/>
-        <field:textarea field="corpName" id="c_com_labsynch_labseer_domain_Parent_corpName" required="true" z="Ml5I/GhT+J/9tYJWfXOQIRPlZsU="/>
-        <field:input field="parentNumber" id="c_com_labsynch_labseer_domain_Parent_parentNumber" z="nnGxDavZ4dxsOJ/3SX4V0pjxMlw="/>
-        <field:textarea field="commonName" id="c_com_labsynch_labseer_domain_Parent_commonName" z="MNlrAYQrcjBG9YleZ4WVwM4JT/w="/>
-        <field:select field="stereoCategory" id="c_com_labsynch_labseer_domain_Parent_stereoCategory" itemValue="id" items="${stereocategorys}" path="/stereocategorys" z="T/sPyuEU6869UjTpvRn/jZ7w/LQ="/>
-        <field:textarea field="stereoComment" id="c_com_labsynch_labseer_domain_Parent_stereoComment" z="icv7a9VEKWEfjOVWNQb9iMyt+/U="/>
-        <field:input field="molStructure" id="c_com_labsynch_labseer_domain_Parent_molStructure" z="8cTUPeDI7sNMGk2UDhXpPL5kxuE="/>
-        <field:input field="molWeight" id="c_com_labsynch_labseer_domain_Parent_molWeight" validationMessageCode="field_invalid_number" z="y5yEVMMvxjSnMQOaAWrpu1/WboI="/>
-        <field:input field="exactMass" id="c_com_labsynch_labseer_domain_Parent_exactMass" validationMessageCode="field_invalid_number" z="VWXFboQtA5Xpd0A/O3tdBwVtDZ4="/>
-        <field:textarea field="molFormula" id="c_com_labsynch_labseer_domain_Parent_molFormula" z="8rcKw3VvO79SREtwvrL9vvL5FdA="/>
-        <field:input field="CdId" id="c_com_labsynch_labseer_domain_Parent_CdId" required="true" z="tqmYcZX6tFe00WR8BML0K17HSig="/>
-        <field:datetime dateTimePattern="${parent_registrationdate_date_format}" field="registrationDate" id="c_com_labsynch_labseer_domain_Parent_registrationDate" z="SNehWAj6vK7embzg0sb6mUUANrU="/>
-        <field:datetime dateTimePattern="${parent_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_Parent_modifiedDate" z="vZxhuBbo11drtqSYR4G/riy/yIU="/>
-        <field:checkbox field="ignore" id="c_com_labsynch_labseer_domain_Parent_ignore" z="BOK0qALDDhyiCNrZrM5cB5Nn+04="/>
-        <field:simple field="saltForms" id="c_com_labsynch_labseer_domain_Parent_saltForms" messageCode="entity_reference_not_managed" messageCodeAttribute="Salt Form" z="hCF5YKbweyigUn5IaHg17a/qA4M="/>
-        <field:simple field="parentAliases" id="c_com_labsynch_labseer_domain_Parent_parentAliases" messageCode="entity_reference_not_managed" messageCodeAttribute="Parent Alias" z="1oy6NQ5c8NsHNmrKEWVi1DPQOMY="/>
-        <field:select field="bulkLoadFile" id="c_com_labsynch_labseer_domain_Parent_bulkLoadFile" itemValue="id" items="${bulkloadfiles}" path="/bulkloadfiles" z="4exmUxNie76iN68Icuqbpvtuyos="/>
-        <field:select field="parentAnnotation" id="c_com_labsynch_labseer_domain_Parent_parentAnnotation" itemValue="id" items="${parentannotations}" path="/parentAnnotations" z="iP3p56o5HeVlYyp+eoEbj0rY5hE="/>
-        <field:select field="compoundType" id="c_com_labsynch_labseer_domain_Parent_compoundType" itemValue="id" items="${compoundtypes}" path="/compoundTypes" z="EU/YFXt0rzJL7girEPwGZ060IQg="/>
-        <field:input field="comment" id="c_com_labsynch_labseer_domain_Parent_comment" z="5rOw8Zvd/0BZmVhkKU0vhjF/JOs="/>
-        <field:checkbox field="isMixture" id="c_com_labsynch_labseer_domain_Parent_isMixture" z="k3R/y0wYJpjqDb/qGkqjN7NHYtw="/>
-        <field:input field="chemist" id="c_com_labsynch_labseer_domain_Parent_chemist" z="uYsrCIbmbP1UfQSJq3iSX3lSFSg="/>
-        <field:input field="registeredBy" id="c_com_labsynch_labseer_domain_Parent_registeredBy" z="U082F6tQzd4yScuyvob+H1mVVCU="/>
-        <field:input field="modifiedBy" id="c_com_labsynch_labseer_domain_Parent_modifiedBy" z="9VrsJ6xKwxZ9s3pofxz8To/ny4M="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/parents/views.xml b/src/main/webapp/WEB-INF/views/parents/views.xml
deleted file mode 100644
index 085ba846e..000000000
--- a/src/main/webapp/WEB-INF/views/parents/views.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="parents/list">
-        <put-attribute name="body" value="/WEB-INF/views/parents/list.jspx"/>
-    </definition>
-<definition extends="default" name="parents/show">
-        <put-attribute name="body" value="/WEB-INF/views/parents/show.jspx"/>
-    </definition>
-<definition extends="default" name="parents/create">
-        <put-attribute name="body" value="/WEB-INF/views/parents/create.jspx"/>
-    </definition>
-<definition extends="default" name="parents/update">
-        <put-attribute name="body" value="/WEB-INF/views/parents/update.jspx"/>
-    </definition>
-<definition extends="default" name="parents/findParentsByBulkLoadFileEquals">
-        <put-attribute name="body" value="/WEB-INF/views/parents/findParentsByBulkLoadFileEquals.jspx"/>
-    </definition>
-<definition extends="default" name="parents/findParentsByCdId">
-        <put-attribute name="body" value="/WEB-INF/views/parents/findParentsByCdId.jspx"/>
-    </definition>
-<definition extends="default" name="parents/findParentsByCommonNameLike">
-        <put-attribute name="body" value="/WEB-INF/views/parents/findParentsByCommonNameLike.jspx"/>
-    </definition>
-<definition extends="default" name="parents/findParentsByCorpNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/parents/findParentsByCorpNameEquals.jspx"/>
-    </definition>
-<definition extends="default" name="parents/findParentsByCorpNameLike">
-        <put-attribute name="body" value="/WEB-INF/views/parents/findParentsByCorpNameLike.jspx"/>
-    </definition>
-<definition extends="default" name="parents/findParentsBySaltForms">
-        <put-attribute name="body" value="/WEB-INF/views/parents/findParentsBySaltForms.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/physicalstates/create.jspx b/src/main/webapp/WEB-INF/views/physicalstates/create.jspx
deleted file mode 100644
index 2222e7692..000000000
--- a/src/main/webapp/WEB-INF/views/physicalstates/create.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_PhysicalState" modelAttribute="physicalState" path="/physicalstates" render="${empty dependencies}" z="08pgMStaFbS6rCGncpjK/AoV6Bg=">
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_PhysicalState_name" z="yG12uD3qEi6SVuENcnA9B7YMSEA="/>
-        <field:textarea field="code" id="c_com_labsynch_labseer_domain_PhysicalState_code" z="ofoSnOmDsk4UWelI+QMpQOh4OUs="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_PhysicalState" render="${not empty dependencies}" z="SAZ7DUwQ437bqlquV4r4d4QlKZU="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/physicalstates/findPhysicalStatesByCodeEquals.jspx b/src/main/webapp/WEB-INF/views/physicalstates/findPhysicalStatesByCodeEquals.jspx
deleted file mode 100644
index ff27d0d63..000000000
--- a/src/main/webapp/WEB-INF/views/physicalstates/findPhysicalStatesByCodeEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeEquals" id="ff_com_labsynch_labseer_domain_PhysicalState" path="/physicalstates" z="rnMPD/1HyrzBrk30hg82r+vLcF0=">
-        <field:input disableFormBinding="true" field="code" id="f_com_labsynch_labseer_domain_PhysicalState_code" max="100" required="true" z="pVtFAH6zn9z7lZqBy4RXuy+kLDo="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/physicalstates/findPhysicalStatesByNameEquals.jspx b/src/main/webapp/WEB-INF/views/physicalstates/findPhysicalStatesByNameEquals.jspx
deleted file mode 100644
index 2b849db37..000000000
--- a/src/main/webapp/WEB-INF/views/physicalstates/findPhysicalStatesByNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByNameEquals" id="ff_com_labsynch_labseer_domain_PhysicalState" path="/physicalstates" z="kfnNzSSRLSP6F6Na6jySpKJ7GtM=">
-        <field:input disableFormBinding="true" field="name" id="f_com_labsynch_labseer_domain_PhysicalState_name" max="255" required="true" z="CNULrscSdygQKNMzVj7lac5CvdM="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/physicalstates/findPhysicalStatesByNameLike.jspx b/src/main/webapp/WEB-INF/views/physicalstates/findPhysicalStatesByNameLike.jspx
deleted file mode 100644
index 65b28967d..000000000
--- a/src/main/webapp/WEB-INF/views/physicalstates/findPhysicalStatesByNameLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByNameLike" id="ff_com_labsynch_labseer_domain_PhysicalState" path="/physicalstates" z="k6cowcs4ywyPVlplkgh4vfJyS9M=">
-        <field:input disableFormBinding="true" field="name" id="f_com_labsynch_labseer_domain_PhysicalState_name" max="255" required="true" z="CNULrscSdygQKNMzVj7lac5CvdM="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/physicalstates/list.jspx b/src/main/webapp/WEB-INF/views/physicalstates/list.jspx
deleted file mode 100644
index 2fa715fdb..000000000
--- a/src/main/webapp/WEB-INF/views/physicalstates/list.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_PhysicalState" items="${physicalstates}" z="P4ypqFFOeYcfuvBq8PzEaOsGvkw=">
-        <table:table data="${physicalstates}" id="l_com_labsynch_labseer_domain_PhysicalState" path="/physicalstates" z="dFhsVHvh7JyARCKaqcx9SLLQLCc=">
-            <table:column id="c_com_labsynch_labseer_domain_PhysicalState_name" property="name" z="ft005PdEdm7vB1ZzBnmIfp6pfLc="/>
-            <table:column id="c_com_labsynch_labseer_domain_PhysicalState_code" property="code" z="VGunZaejq+QNBscHDef2j1oNypo="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/physicalstates/show.jspx b/src/main/webapp/WEB-INF/views/physicalstates/show.jspx
deleted file mode 100644
index 93cd34cbe..000000000
--- a/src/main/webapp/WEB-INF/views/physicalstates/show.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_PhysicalState" object="${physicalstate}" path="/physicalstates" z="Nnk/+SsfcaX8wvdTpQBkrQHuyzQ=">
-        <field:display field="name" id="s_com_labsynch_labseer_domain_PhysicalState_name" object="${physicalstate}" z="xV9WRucVS6aoMb/kbIuC6A1VNmU="/>
-        <field:display field="code" id="s_com_labsynch_labseer_domain_PhysicalState_code" object="${physicalstate}" z="q3JgoC2dnUy9kAdXV2NLv8BxCNE="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/physicalstates/update.jspx b/src/main/webapp/WEB-INF/views/physicalstates/update.jspx
deleted file mode 100644
index f937602c6..000000000
--- a/src/main/webapp/WEB-INF/views/physicalstates/update.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_PhysicalState" modelAttribute="physicalState" path="/physicalstates" versionField="Version" z="23Mls9VCh8ij48vhJh5h6E21gkk=">
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_PhysicalState_name" z="yG12uD3qEi6SVuENcnA9B7YMSEA="/>
-        <field:textarea field="code" id="c_com_labsynch_labseer_domain_PhysicalState_code" z="ofoSnOmDsk4UWelI+QMpQOh4OUs="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/physicalstates/views.xml b/src/main/webapp/WEB-INF/views/physicalstates/views.xml
deleted file mode 100644
index 5b2e2ac0c..000000000
--- a/src/main/webapp/WEB-INF/views/physicalstates/views.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="physicalstates/list">
-        <put-attribute name="body" value="/WEB-INF/views/physicalstates/list.jspx"/>
-    </definition>
-<definition extends="default" name="physicalstates/show">
-        <put-attribute name="body" value="/WEB-INF/views/physicalstates/show.jspx"/>
-    </definition>
-<definition extends="default" name="physicalstates/create">
-        <put-attribute name="body" value="/WEB-INF/views/physicalstates/create.jspx"/>
-    </definition>
-<definition extends="default" name="physicalstates/update">
-        <put-attribute name="body" value="/WEB-INF/views/physicalstates/update.jspx"/>
-    </definition>
-<definition extends="default" name="physicalstates/findPhysicalStatesByCodeEquals">
-        <put-attribute name="body" value="/WEB-INF/views/physicalstates/findPhysicalStatesByCodeEquals.jspx"/>
-    </definition>
-<definition extends="default" name="physicalstates/findPhysicalStatesByNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/physicalstates/findPhysicalStatesByNameEquals.jspx"/>
-    </definition>
-<definition extends="default" name="physicalstates/findPhysicalStatesByNameLike">
-        <put-attribute name="body" value="/WEB-INF/views/physicalstates/findPhysicalStatesByNameLike.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/predef_corpnames/create.jspx b/src/main/webapp/WEB-INF/views/predef_corpnames/create.jspx
deleted file mode 100644
index 0843f839a..000000000
--- a/src/main/webapp/WEB-INF/views/predef_corpnames/create.jspx
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_PreDef_CorpName" modelAttribute="preDef_CorpName" path="/predef_corpnames" render="${empty dependencies}" z="DwZky/5daKOs8uq9uO1ZBP7Dm0o=">
-        <field:input field="corpNumber" id="c_com_labsynch_labseer_domain_PreDef_CorpName_corpNumber" z="1cuAjP9lnpY3xXtz1u7naO5Y+10="/>
-        <field:textarea field="corpName" id="c_com_labsynch_labseer_domain_PreDef_CorpName_corpName" z="KvQtFt6Ctg9nIlvdWbOh6KoDfqQ="/>
-        <field:textarea field="comment" id="c_com_labsynch_labseer_domain_PreDef_CorpName_comment" z="NYUfOanLJL3SR8KH5ySI9W1MmDc="/>
-        <field:checkbox field="used" id="c_com_labsynch_labseer_domain_PreDef_CorpName_used" z="UgB4g1MF9pg+qjGfx74y9Khil2o="/>
-        <field:checkbox field="skip" id="c_com_labsynch_labseer_domain_PreDef_CorpName_skip" z="X0inUiZTCUODba39B/7bT6Ry4hc="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_PreDef_CorpName" render="${not empty dependencies}" z="XqCSRCDxH1w4RdY26MENjoIpLRQ="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/predef_corpnames/list.jspx b/src/main/webapp/WEB-INF/views/predef_corpnames/list.jspx
deleted file mode 100644
index 0ea48ab0b..000000000
--- a/src/main/webapp/WEB-INF/views/predef_corpnames/list.jspx
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_PreDef_CorpName" items="${predef_corpnames}" z="1e5LYSvlfcwVZFXNW9DrQfc1ES4=">
-        <table:table data="${predef_corpnames}" id="l_com_labsynch_labseer_domain_PreDef_CorpName" path="/predef_corpnames" z="53kQNyUFQk/PKcTCcHOI9Zpi4T8=">
-            <table:column id="c_com_labsynch_labseer_domain_PreDef_CorpName_corpNumber" property="corpNumber" z="e1igpf1ZV7eo/9BhdabGkuudxKc="/>
-            <table:column id="c_com_labsynch_labseer_domain_PreDef_CorpName_corpName" property="corpName" z="G6Y25oYcJzdLXE5Kbi3rTqU0NZc="/>
-            <table:column id="c_com_labsynch_labseer_domain_PreDef_CorpName_comment" property="comment" z="BWR4WOo/JLJ4xrqxmcdWU8WcrWE="/>
-            <table:column id="c_com_labsynch_labseer_domain_PreDef_CorpName_used" property="used" z="KmageF4WLxy4msObmAlHFpTufVA="/>
-            <table:column id="c_com_labsynch_labseer_domain_PreDef_CorpName_skip" property="skip" z="cbgO0VKU+dTJ9rb+KkpBvnDaDHg="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/predef_corpnames/show.jspx b/src/main/webapp/WEB-INF/views/predef_corpnames/show.jspx
deleted file mode 100644
index c5d3c22f8..000000000
--- a/src/main/webapp/WEB-INF/views/predef_corpnames/show.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_PreDef_CorpName" object="${predef_corpname}" path="/predef_corpnames" z="9mUxJFoCTj13NBM93JRjG9Z+yK4=">
-        <field:display field="corpNumber" id="s_com_labsynch_labseer_domain_PreDef_CorpName_corpNumber" object="${predef_corpname}" z="AzEJ/NcK2XV2RB1eMe6aqMnxwaA="/>
-        <field:display field="corpName" id="s_com_labsynch_labseer_domain_PreDef_CorpName_corpName" object="${predef_corpname}" z="sNLaD9oWSMgkcLxCKaICadRRF1M="/>
-        <field:display field="comment" id="s_com_labsynch_labseer_domain_PreDef_CorpName_comment" object="${predef_corpname}" z="pywn3A9Jgk5gAFGFgGitqxFVSa8="/>
-        <field:display field="used" id="s_com_labsynch_labseer_domain_PreDef_CorpName_used" object="${predef_corpname}" z="P1+9QzIH8zXI09wPfTCgf45VSAQ="/>
-        <field:display field="skip" id="s_com_labsynch_labseer_domain_PreDef_CorpName_skip" object="${predef_corpname}" z="xMz0dC21noDf4F9illDbqJ+fUDY="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/predef_corpnames/update.jspx b/src/main/webapp/WEB-INF/views/predef_corpnames/update.jspx
deleted file mode 100644
index 98323e021..000000000
--- a/src/main/webapp/WEB-INF/views/predef_corpnames/update.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_PreDef_CorpName" modelAttribute="preDef_CorpName" path="/predef_corpnames" versionField="Version" z="plAX2B/apLqmvRRshswLvGYzfbs=">
-        <field:input field="corpNumber" id="c_com_labsynch_labseer_domain_PreDef_CorpName_corpNumber" z="1cuAjP9lnpY3xXtz1u7naO5Y+10="/>
-        <field:textarea field="corpName" id="c_com_labsynch_labseer_domain_PreDef_CorpName_corpName" z="KvQtFt6Ctg9nIlvdWbOh6KoDfqQ="/>
-        <field:textarea field="comment" id="c_com_labsynch_labseer_domain_PreDef_CorpName_comment" z="NYUfOanLJL3SR8KH5ySI9W1MmDc="/>
-        <field:checkbox field="used" id="c_com_labsynch_labseer_domain_PreDef_CorpName_used" z="UgB4g1MF9pg+qjGfx74y9Khil2o="/>
-        <field:checkbox field="skip" id="c_com_labsynch_labseer_domain_PreDef_CorpName_skip" z="X0inUiZTCUODba39B/7bT6Ry4hc="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/predef_corpnames/views.xml b/src/main/webapp/WEB-INF/views/predef_corpnames/views.xml
deleted file mode 100644
index 6c2f24c4b..000000000
--- a/src/main/webapp/WEB-INF/views/predef_corpnames/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="predef_corpnames/list">
-        <put-attribute name="body" value="/WEB-INF/views/predef_corpnames/list.jspx"/>
-    </definition>
-<definition extends="default" name="predef_corpnames/show">
-        <put-attribute name="body" value="/WEB-INF/views/predef_corpnames/show.jspx"/>
-    </definition>
-<definition extends="default" name="predef_corpnames/create">
-        <put-attribute name="body" value="/WEB-INF/views/predef_corpnames/create.jspx"/>
-    </definition>
-<definition extends="default" name="predef_corpnames/update">
-        <put-attribute name="body" value="/WEB-INF/views/predef_corpnames/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/projects/create.jspx b/src/main/webapp/WEB-INF/views/projects/create.jspx
deleted file mode 100644
index ebea76f9b..000000000
--- a/src/main/webapp/WEB-INF/views/projects/create.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_Project" modelAttribute="project" path="/projects" render="${empty dependencies}" z="hVB9raFbJv3SSbry95onkI0jYHg=">
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_Project_name" z="iygVR1quVay3P5NvsWBuL9IMu8A="/>
-        <field:textarea field="code" id="c_com_labsynch_labseer_domain_Project_code" z="XyGM54dqiM4ajpj/BBisZOZhgww="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_Project" render="${not empty dependencies}" z="U3LuW+nZZml8EnG6829Fi4gyam4="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/projects/findProjectsByCodeEquals.jspx b/src/main/webapp/WEB-INF/views/projects/findProjectsByCodeEquals.jspx
deleted file mode 100644
index e8b60e59d..000000000
--- a/src/main/webapp/WEB-INF/views/projects/findProjectsByCodeEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeEquals" id="ff_com_labsynch_labseer_domain_Project" path="/projects" z="eClg0lv3q63N8c8bG1WGLwIiNFk=">
-        <field:input disableFormBinding="true" field="code" id="f_com_labsynch_labseer_domain_Project_code" max="255" required="true" z="189SwLKcdZ0M8POvM3aGjT1HHGA="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/projects/findProjectsByNameEquals.jspx b/src/main/webapp/WEB-INF/views/projects/findProjectsByNameEquals.jspx
deleted file mode 100644
index 60014e312..000000000
--- a/src/main/webapp/WEB-INF/views/projects/findProjectsByNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByNameEquals" id="ff_com_labsynch_labseer_domain_Project" path="/projects" z="/IQRALrIOSblpQO8BzBfdA1rUho=">
-        <field:input disableFormBinding="true" field="name" id="f_com_labsynch_labseer_domain_Project_name" max="255" required="true" z="fafSkLVBhLycK4GibrS2UEtCN+g="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/projects/list.jspx b/src/main/webapp/WEB-INF/views/projects/list.jspx
deleted file mode 100644
index e1692c666..000000000
--- a/src/main/webapp/WEB-INF/views/projects/list.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_Project" items="${projects}" z="1Vfb0IQBPyJEu0GLiIfkTKEfbRM=">
-        <table:table data="${projects}" id="l_com_labsynch_labseer_domain_Project" path="/projects" z="i3S8eFZzqz9ZpA4kyv7tJV0PLDA=">
-            <table:column id="c_com_labsynch_labseer_domain_Project_name" property="name" z="F9XKLbNWqmlwz5kZSI53ltSXjjM="/>
-            <table:column id="c_com_labsynch_labseer_domain_Project_code" property="code" z="+HDgOZxzsCDb3LSjNch4targ+tg="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/projects/show.jspx b/src/main/webapp/WEB-INF/views/projects/show.jspx
deleted file mode 100644
index 0f2a3a00e..000000000
--- a/src/main/webapp/WEB-INF/views/projects/show.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_Project" object="${project}" path="/projects" z="EsINZ4fR5w7LjvOYxgpJSD7cN9s=">
-        <field:display field="name" id="s_com_labsynch_labseer_domain_Project_name" object="${project}" z="xXmjo1/7cSWuJxzjMG+MlKdZ1oM="/>
-        <field:display field="code" id="s_com_labsynch_labseer_domain_Project_code" object="${project}" z="cf88kt4ccAeOgCGZiWC83P35s5c="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/projects/update.jspx b/src/main/webapp/WEB-INF/views/projects/update.jspx
deleted file mode 100644
index b7f5fad1c..000000000
--- a/src/main/webapp/WEB-INF/views/projects/update.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_Project" modelAttribute="project" path="/projects" versionField="Version" z="F55/0FSP2Q2hf4oAVEg/vE4bJcs=">
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_Project_name" z="iygVR1quVay3P5NvsWBuL9IMu8A="/>
-        <field:textarea field="code" id="c_com_labsynch_labseer_domain_Project_code" z="XyGM54dqiM4ajpj/BBisZOZhgww="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/projects/views.xml b/src/main/webapp/WEB-INF/views/projects/views.xml
deleted file mode 100644
index 1f788cc40..000000000
--- a/src/main/webapp/WEB-INF/views/projects/views.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="projects/list">
-        <put-attribute name="body" value="/WEB-INF/views/projects/list.jspx"/>
-    </definition>
-<definition extends="default" name="projects/show">
-        <put-attribute name="body" value="/WEB-INF/views/projects/show.jspx"/>
-    </definition>
-<definition extends="default" name="projects/create">
-        <put-attribute name="body" value="/WEB-INF/views/projects/create.jspx"/>
-    </definition>
-<definition extends="default" name="projects/update">
-        <put-attribute name="body" value="/WEB-INF/views/projects/update.jspx"/>
-    </definition>
-<definition extends="default" name="projects/findProjectsByCodeEquals">
-        <put-attribute name="body" value="/WEB-INF/views/projects/findProjectsByCodeEquals.jspx"/>
-    </definition>
-<definition extends="default" name="projects/findProjectsByNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/projects/findProjectsByNameEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/protocolkinds/create.jspx b/src/main/webapp/WEB-INF/views/protocolkinds/create.jspx
deleted file mode 100755
index 74d60af6a..000000000
--- a/src/main/webapp/WEB-INF/views/protocolkinds/create.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ProtocolKind" modelAttribute="protocolKind" path="/protocolkinds" render="${empty dependencies}" z="YuOA/rOU4gfTEecmn7ybh97RBU0=">
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_ProtocolKind_lsType" itemValue="id" items="${protocoltypes}" path="/protocoltypes" required="true" z="9ZpJPOFCEVJ/KalvWAhGpDOS52w="/>
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_ProtocolKind_kindName" required="true" z="sfGHzVo4h4wIwsQSIa8QVWXkG0A="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ProtocolKind_lsTypeAndKind" z="NyWkdvTs1lhP9DlZkdK5mT4bc1w="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ProtocolKind" render="${not empty dependencies}" z="K4rDll8WtLLPgJ7KUCAQPK20ZFs="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocolkinds/findProtocolKindsByLsTypeEqualsAndKindNameEquals.jspx b/src/main/webapp/WEB-INF/views/protocolkinds/findProtocolKindsByLsTypeEqualsAndKindNameEquals.jspx
deleted file mode 100644
index 254b7aff3..000000000
--- a/src/main/webapp/WEB-INF/views/protocolkinds/findProtocolKindsByLsTypeEqualsAndKindNameEquals.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeEqualsAndKindNameEquals" id="ff_com_labsynch_labseer_domain_ProtocolKind" path="/protocolkinds" z="ScGcC7PL9BBSPgNH7kBvYjulsgg=">
-        <field:select disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_ProtocolKind_lsType" itemValue="id" items="${protocoltypes}" path="/protocoltypes" required="true" z="dkohdZFa0A4VE+tX1x9SDsMiKPQ="/>
-        <field:input disableFormBinding="true" field="kindName" id="f_com_labsynch_labseer_domain_ProtocolKind_kindName" max="255" required="true" z="eA6eSz+3/RwBfSX26gOfCzEaFbI="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocolkinds/list.jspx b/src/main/webapp/WEB-INF/views/protocolkinds/list.jspx
deleted file mode 100755
index 5850e14f5..000000000
--- a/src/main/webapp/WEB-INF/views/protocolkinds/list.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ProtocolKind" items="${protocolkinds}" z="jHX/8g0BO4WUA7Q8DYxs/MJCV7g=">
-        <table:table data="${protocolkinds}" id="l_com_labsynch_labseer_domain_ProtocolKind" path="/protocolkinds" z="bMmuplyHWhFcj+Khm0eS3SE2M9I=">
-            <table:column id="c_com_labsynch_labseer_domain_ProtocolKind_lsType" property="lsType" z="noJPV8QRsWe3jbZBI8/EadoYf7k="/>
-            <table:column id="c_com_labsynch_labseer_domain_ProtocolKind_kindName" property="kindName" z="IOasOr8TNgdQUZ6fAVZBQ5q7XCg="/>
-            <table:column id="c_com_labsynch_labseer_domain_ProtocolKind_lsTypeAndKind" property="lsTypeAndKind" z="URqe9GWRxlUC0vQEfedbvJTOuxM="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocolkinds/show.jspx b/src/main/webapp/WEB-INF/views/protocolkinds/show.jspx
deleted file mode 100755
index 82628bf1f..000000000
--- a/src/main/webapp/WEB-INF/views/protocolkinds/show.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ProtocolKind" object="${protocolkind}" path="/protocolkinds" z="Yi2lZkt/B99M9MgV9O8EcEGzB84=">
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ProtocolKind_lsType" object="${protocolkind}" z="Jv3x3HJAuxfC7b9Lbd+kgGrn6yg="/>
-        <field:display field="kindName" id="s_com_labsynch_labseer_domain_ProtocolKind_kindName" object="${protocolkind}" z="HlmFLTUw4oeF2i26I3DQAhZaemc="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ProtocolKind_lsTypeAndKind" object="${protocolkind}" z="I6whwjE+OXr/lZJgq2HP9g7sdxE="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocolkinds/update.jspx b/src/main/webapp/WEB-INF/views/protocolkinds/update.jspx
deleted file mode 100755
index fb4c9f2a7..000000000
--- a/src/main/webapp/WEB-INF/views/protocolkinds/update.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ProtocolKind" modelAttribute="protocolKind" path="/protocolkinds" versionField="Version" z="q0RzoAbKxRi89B82842FGoPhJkM=">
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_ProtocolKind_lsType" itemValue="id" items="${protocoltypes}" path="/protocoltypes" required="true" z="9ZpJPOFCEVJ/KalvWAhGpDOS52w="/>
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_ProtocolKind_kindName" required="true" z="sfGHzVo4h4wIwsQSIa8QVWXkG0A="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ProtocolKind_lsTypeAndKind" z="NyWkdvTs1lhP9DlZkdK5mT4bc1w="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocolkinds/views.xml b/src/main/webapp/WEB-INF/views/protocolkinds/views.xml
deleted file mode 100755
index 56d22b74c..000000000
--- a/src/main/webapp/WEB-INF/views/protocolkinds/views.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="protocolkinds/list">
-        <put-attribute name="body" value="/WEB-INF/views/protocolkinds/list.jspx"/>
-    </definition>
-<definition extends="default" name="protocolkinds/show">
-        <put-attribute name="body" value="/WEB-INF/views/protocolkinds/show.jspx"/>
-    </definition>
-<definition extends="default" name="protocolkinds/create">
-        <put-attribute name="body" value="/WEB-INF/views/protocolkinds/create.jspx"/>
-    </definition>
-<definition extends="default" name="protocolkinds/update">
-        <put-attribute name="body" value="/WEB-INF/views/protocolkinds/update.jspx"/>
-    </definition>
-<definition extends="default" name="protocolkinds/findProtocolKindsByLsTypeEqualsAndKindNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/protocolkinds/findProtocolKindsByLsTypeEqualsAndKindNameEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/protocollabels/create.jspx b/src/main/webapp/WEB-INF/views/protocollabels/create.jspx
deleted file mode 100755
index ee5d0218d..000000000
--- a/src/main/webapp/WEB-INF/views/protocollabels/create.jspx
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ProtocolLabel" modelAttribute="protocolLabel" path="/protocollabels" render="${empty dependencies}" z="SwWm4oNnuM6/NZuTJIlbls40Ws0=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ProtocolLabel_recordedBy" required="true" z="8+Kb6z/TCkRz7lmc6eZXy7ZOgGc="/>
-        <field:datetime dateTimePattern="${protocolLabel_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ProtocolLabel_recordedDate" required="true" z="rMaI79mqa49BsMZFevCJf6feRiQ="/>
-        <field:datetime dateTimePattern="${protocolLabel_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ProtocolLabel_modifiedDate" z="wGWz8PD9/RfL5/QhcdLRqKDBo1w="/>
-        <field:checkbox field="physicallyLabled" id="c_com_labsynch_labseer_domain_ProtocolLabel_physicallyLabled" z="DxT+Cad+OoroLFCfdaQ2oVivfM4="/>
-        <field:checkbox field="preferred" id="c_com_labsynch_labseer_domain_ProtocolLabel_preferred" z="hgKE3j9F8JEstTd9HEukvZz//Ok="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ProtocolLabel_ignored" z="xpfLqfRxNGTMiTjVWDW73ZWBzrw="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ProtocolLabel_lsTransaction" validationMessageCode="field_invalid_integer" z="f281tU/Gm1gmkJTdVVCBUf/jh3g="/>
-        <field:select field="protocol" id="c_com_labsynch_labseer_domain_ProtocolLabel_protocol" itemValue="id" items="${protocols}" path="/protocols" required="true" z="mWxyakkoRMMEpZr4P1heyHGPhkM="/>
-        <field:textarea field="labelText" id="c_com_labsynch_labseer_domain_ProtocolLabel_labelText" required="true" z="QkHGEHHQLbvOcKnA14TYoRIJ5eQ="/>
-        <field:textarea field="imageFile" id="c_com_labsynch_labseer_domain_ProtocolLabel_imageFile" z="I5ltmhjLTTXyBj8nROsyDZElus4="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ProtocolLabel_lsType" required="true" z="9uzOIOMWKqvJ0/0wkyXDr7C5Tlo="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ProtocolLabel_lsKind" required="true" z="4HY0irF5SbfjGOtqLY9uoHnQeFU="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ProtocolLabel_lsTypeAndKind" z="Ze5lriVNjAwAtFL/goaIyl4VAbo="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ProtocolLabel_deleted" z="FTiwXPiLb55nQwWhH+rz+Ag4CPw="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ProtocolLabel" render="${not empty dependencies}" z="saf/DwmDB/RAeFZ0V9Lmhl9IKuI="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocollabels/findProtocolLabelsByLabelTextEqualsAndIgnoredNot.jspx b/src/main/webapp/WEB-INF/views/protocollabels/findProtocolLabelsByLabelTextEqualsAndIgnoredNot.jspx
deleted file mode 100755
index 6e8bec31d..000000000
--- a/src/main/webapp/WEB-INF/views/protocollabels/findProtocolLabelsByLabelTextEqualsAndIgnoredNot.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLabelTextEqualsAndIgnoredNot" id="ff_com_labsynch_labseer_domain_ProtocolLabel" path="/protocollabels" z="IdPIjwdm2vB7tNNKqsvYmE4zpZE=">
-        <field:input disableFormBinding="true" field="labelText" id="f_com_labsynch_labseer_domain_ProtocolLabel_labelText" max="255" required="true" z="NHYqRtGhFAnSCM9RvnnGUV6XO4c="/>
-        <field:checkbox disableFormBinding="true" field="ignored" id="f_com_labsynch_labseer_domain_ProtocolLabel_ignored" z="xgkTEY1V/pIHbGLWUiNal3mDXQc="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocollabels/findProtocolLabelsByLabelTextLike.jspx b/src/main/webapp/WEB-INF/views/protocollabels/findProtocolLabelsByLabelTextLike.jspx
deleted file mode 100755
index a92141aa7..000000000
--- a/src/main/webapp/WEB-INF/views/protocollabels/findProtocolLabelsByLabelTextLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLabelTextLike" id="ff_com_labsynch_labseer_domain_ProtocolLabel" path="/protocollabels" z="bJfYqbowyy33qefFT6v+L3HbZw4=">
-        <field:input disableFormBinding="true" field="labelText" id="f_com_labsynch_labseer_domain_ProtocolLabel_labelText" max="255" required="true" z="NHYqRtGhFAnSCM9RvnnGUV6XO4c="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocollabels/findProtocolLabelsByLsTransactionEquals.jspx b/src/main/webapp/WEB-INF/views/protocollabels/findProtocolLabelsByLsTransactionEquals.jspx
deleted file mode 100755
index f218d4431..000000000
--- a/src/main/webapp/WEB-INF/views/protocollabels/findProtocolLabelsByLsTransactionEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTransactionEquals" id="ff_com_labsynch_labseer_domain_ProtocolLabel" path="/protocollabels" z="V47qlwvCxfV0ypr7PMvxHca5gEs=">
-        <field:input disableFormBinding="true" field="lsTransaction" id="f_com_labsynch_labseer_domain_ProtocolLabel_lsTransaction" required="true" validationMessageCode="field_invalid_integer" z="X6/qJaqjgLRJASAF91hLuZnW0JE="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocollabels/findProtocolLabelsByProtocol.jspx b/src/main/webapp/WEB-INF/views/protocollabels/findProtocolLabelsByProtocol.jspx
deleted file mode 100755
index b84fa9b46..000000000
--- a/src/main/webapp/WEB-INF/views/protocollabels/findProtocolLabelsByProtocol.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByProtocol" id="ff_com_labsynch_labseer_domain_ProtocolLabel" path="/protocollabels" z="3y0THlyclaeLRKpfCg78cM1aaeo=">
-        <field:select disableFormBinding="true" field="protocol" id="f_com_labsynch_labseer_domain_ProtocolLabel_protocol" itemValue="id" items="${protocols}" path="/protocols" required="true" z="AYJcgKhWnw4ql7su8Hl75FvgjJA="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocollabels/list.jspx b/src/main/webapp/WEB-INF/views/protocollabels/list.jspx
deleted file mode 100755
index facbcfb42..000000000
--- a/src/main/webapp/WEB-INF/views/protocollabels/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ProtocolLabel" items="${protocollabels}" z="np++LZ33gnJZU3aK5SSxdh+/W+k=">
-        <table:table data="${protocollabels}" id="l_com_labsynch_labseer_domain_ProtocolLabel" path="/protocollabels" z="kg8NsCNPNU+85uln3y+EFvEW0Ho=">
-            <table:column id="c_com_labsynch_labseer_domain_ProtocolLabel_recordedBy" property="recordedBy" z="Mt/oGO8+q0T102sLTL1aBc3M6sw="/>
-            <table:column date="true" dateTimePattern="${protocolLabel_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_ProtocolLabel_recordedDate" property="recordedDate" z="WFnNLPkwy66skCr6bM//I7SGdPE="/>
-            <table:column date="true" dateTimePattern="${protocolLabel_modifieddate_date_format}" id="c_com_labsynch_labseer_domain_ProtocolLabel_modifiedDate" property="modifiedDate" z="2kvuc8hEgBDSaVcT/WAQuDRWAOM="/>
-            <table:column id="c_com_labsynch_labseer_domain_ProtocolLabel_physicallyLabled" property="physicallyLabled" z="BW2YB4Dz5DmeeUnkVWpRkAYryq0="/>
-            <table:column id="c_com_labsynch_labseer_domain_ProtocolLabel_labelText" property="labelText" z="70fulWVq051n6vPS251ZvV7Po3w="/>
-            <table:column id="c_com_labsynch_labseer_domain_ProtocolLabel_imageFile" property="imageFile" z="6Ydj3rDvauJux10IhtaQdfxNZVE="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocollabels/show.jspx b/src/main/webapp/WEB-INF/views/protocollabels/show.jspx
deleted file mode 100755
index bf607b471..000000000
--- a/src/main/webapp/WEB-INF/views/protocollabels/show.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ProtocolLabel" object="${protocollabel}" path="/protocollabels" z="XbMMgR7mz6RPJzaZQxT79jsY+Oc=">
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_ProtocolLabel_recordedBy" object="${protocollabel}" z="Omg2/GWs96bi0Wk/LxdDQzrcSYk="/>
-        <field:display date="true" dateTimePattern="${protocolLabel_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_ProtocolLabel_recordedDate" object="${protocollabel}" z="5cDKIVuZ6/7lBd0eksWEcnIgxh8="/>
-        <field:display date="true" dateTimePattern="${protocolLabel_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_ProtocolLabel_modifiedDate" object="${protocollabel}" z="wF+vMPNMj/wVbEFgh/MJiN2gzbM="/>
-        <field:display field="physicallyLabled" id="s_com_labsynch_labseer_domain_ProtocolLabel_physicallyLabled" object="${protocollabel}" z="aXnkEtOXrnDQ2Yt/JFWVTiqopgU="/>
-        <field:display field="preferred" id="s_com_labsynch_labseer_domain_ProtocolLabel_preferred" object="${protocollabel}" z="XYqUG+NBQyS5LdmNUKod+nJY+hY="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ProtocolLabel_ignored" object="${protocollabel}" z="qpdkHgLRlbEHPbTsHL8Ka7lLsiU="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_ProtocolLabel_lsTransaction" object="${protocollabel}" z="e9wg1PTOe5LNavQJm8rn1jB019c="/>
-        <field:display field="protocol" id="s_com_labsynch_labseer_domain_ProtocolLabel_protocol" object="${protocollabel}" z="jKlHHfFwDez4hjQmQqyQmpuLERQ="/>
-        <field:display field="labelText" id="s_com_labsynch_labseer_domain_ProtocolLabel_labelText" object="${protocollabel}" z="jgtoEUTmX/8D0enSd9XAnqJjS8g="/>
-        <field:display field="imageFile" id="s_com_labsynch_labseer_domain_ProtocolLabel_imageFile" object="${protocollabel}" z="dXgCuS3iUSxdayCzY1M20v4hM5E="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ProtocolLabel_lsType" object="${protocollabel}" z="EdqtG3wSCWXpVD/ryNm58/0wj0w="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_ProtocolLabel_lsKind" object="${protocollabel}" z="RYHVIv77nQA4LVFIAoagdETrDMU="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ProtocolLabel_lsTypeAndKind" object="${protocollabel}" z="tDPI+F14CisbC+7wvaxWLG8eySM="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_ProtocolLabel_deleted" object="${protocollabel}" z="5m4uQCU/D7J2BGDAsoMmGu6IO/M="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocollabels/update.jspx b/src/main/webapp/WEB-INF/views/protocollabels/update.jspx
deleted file mode 100755
index 6a0d745ce..000000000
--- a/src/main/webapp/WEB-INF/views/protocollabels/update.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ProtocolLabel" modelAttribute="protocolLabel" path="/protocollabels" versionField="Version" z="KB7Vk0gYGBVx7rIdNBU4dN81ItU=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ProtocolLabel_recordedBy" required="true" z="8+Kb6z/TCkRz7lmc6eZXy7ZOgGc="/>
-        <field:datetime dateTimePattern="${protocolLabel_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ProtocolLabel_recordedDate" required="true" z="rMaI79mqa49BsMZFevCJf6feRiQ="/>
-        <field:datetime dateTimePattern="${protocolLabel_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ProtocolLabel_modifiedDate" z="wGWz8PD9/RfL5/QhcdLRqKDBo1w="/>
-        <field:checkbox field="physicallyLabled" id="c_com_labsynch_labseer_domain_ProtocolLabel_physicallyLabled" z="DxT+Cad+OoroLFCfdaQ2oVivfM4="/>
-        <field:checkbox field="preferred" id="c_com_labsynch_labseer_domain_ProtocolLabel_preferred" z="hgKE3j9F8JEstTd9HEukvZz//Ok="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ProtocolLabel_ignored" z="xpfLqfRxNGTMiTjVWDW73ZWBzrw="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ProtocolLabel_lsTransaction" validationMessageCode="field_invalid_integer" z="f281tU/Gm1gmkJTdVVCBUf/jh3g="/>
-        <field:select field="protocol" id="c_com_labsynch_labseer_domain_ProtocolLabel_protocol" itemValue="id" items="${protocols}" path="/protocols" required="true" z="mWxyakkoRMMEpZr4P1heyHGPhkM="/>
-        <field:textarea field="labelText" id="c_com_labsynch_labseer_domain_ProtocolLabel_labelText" required="true" z="QkHGEHHQLbvOcKnA14TYoRIJ5eQ="/>
-        <field:textarea field="imageFile" id="c_com_labsynch_labseer_domain_ProtocolLabel_imageFile" z="I5ltmhjLTTXyBj8nROsyDZElus4="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ProtocolLabel_lsType" required="true" z="9uzOIOMWKqvJ0/0wkyXDr7C5Tlo="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ProtocolLabel_lsKind" required="true" z="4HY0irF5SbfjGOtqLY9uoHnQeFU="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ProtocolLabel_lsTypeAndKind" z="Ze5lriVNjAwAtFL/goaIyl4VAbo="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ProtocolLabel_deleted" z="FTiwXPiLb55nQwWhH+rz+Ag4CPw="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocollabels/views.xml b/src/main/webapp/WEB-INF/views/protocollabels/views.xml
deleted file mode 100755
index 0c26647c3..000000000
--- a/src/main/webapp/WEB-INF/views/protocollabels/views.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="protocollabels/list">
-        <put-attribute name="body" value="/WEB-INF/views/protocollabels/list.jspx"/>
-    </definition>
-<definition extends="default" name="protocollabels/show">
-        <put-attribute name="body" value="/WEB-INF/views/protocollabels/show.jspx"/>
-    </definition>
-<definition extends="default" name="protocollabels/create">
-        <put-attribute name="body" value="/WEB-INF/views/protocollabels/create.jspx"/>
-    </definition>
-<definition extends="default" name="protocollabels/update">
-        <put-attribute name="body" value="/WEB-INF/views/protocollabels/update.jspx"/>
-    </definition>
-<definition extends="default" name="protocollabels/findProtocolLabelsByLsTransactionEquals">
-        <put-attribute name="body" value="/WEB-INF/views/protocollabels/findProtocolLabelsByLsTransactionEquals.jspx"/>
-    </definition>
-<definition extends="default" name="protocollabels/findProtocolLabelsByProtocol">
-        <put-attribute name="body" value="/WEB-INF/views/protocollabels/findProtocolLabelsByProtocol.jspx"/>
-    </definition>
-<definition extends="default" name="protocollabels/findProtocolLabelsByLabelTextEqualsAndIgnoredNot">
-        <put-attribute name="body" value="/WEB-INF/views/protocollabels/findProtocolLabelsByLabelTextEqualsAndIgnoredNot.jspx"/>
-    </definition>
-<definition extends="default" name="protocollabels/findProtocolLabelsByLabelTextLike">
-        <put-attribute name="body" value="/WEB-INF/views/protocollabels/findProtocolLabelsByLabelTextLike.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/protocols/create.jspx b/src/main/webapp/WEB-INF/views/protocols/create.jspx
deleted file mode 100755
index 8390bf696..000000000
--- a/src/main/webapp/WEB-INF/views/protocols/create.jspx
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_Protocol" modelAttribute="protocol" path="/protocols" render="${empty dependencies}" z="RLRrlbjJywvWBaJ3bOqyW4XZi8k=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_Protocol_recordedBy" required="true" z="ED41RgoOzJYSucc9/PGC0rXXGUQ="/>
-        <field:datetime dateTimePattern="${protocol_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_Protocol_recordedDate" required="true" z="Vs92YbaY0TcyJZoQ3EsMJNPsFog="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_Protocol_modifiedBy" z="RHrfqRwn30xQ7BGWrQstxcEFpi8="/>
-        <field:datetime dateTimePattern="${protocol_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_Protocol_modifiedDate" z="fbGiGfkXWLOeHrC3pz5I+F4qrHY="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_Protocol_ignored" z="FfC1CpWCGx8FjkOo58vR2QhOvC8="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_Protocol_lsTransaction" validationMessageCode="field_invalid_integer" z="wmDYfRaEfvFdzXGeI3laMa3auKk="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_Protocol_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="Sq1U8qJLHRgRHVJhznC4bp52xuE="/>
-        <field:textarea field="shortDescription" id="c_com_labsynch_labseer_domain_Protocol_shortDescription" z="hMvn9OA4J5PY7g+h1tGAZK/9h8g="/>
-        <field:simple field="experiments" id="c_com_labsynch_labseer_domain_Protocol_experiments" messageCode="entity_reference_not_managed" messageCodeAttribute="Experiment" z="bNepFtnfTlXyNDyOz5is5z04R1o="/>
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_Protocol_codeName" z="t5WSFKcIjOoVnOtN4ZNw3YAsKK0="/>
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_Protocol_lsType" itemValue="typeName" items="${protocoltypes}" path="/protocoltypes" required="true" z="user-managed"/>
-        <field:select field="lsKind" id="c_com_labsynch_labseer_domain_Protocol_lsKind" itemValue="kindName" items="${protocolkinds}" path="/protocolkinds" required="true" z="user-managed"/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_Protocol_lsTypeAndKind" z="qTwu/l90Qd1pdzAmUSDgw4BGII0="/>
-        <field:simple field="lsStates" id="c_com_labsynch_labseer_domain_Protocol_lsStates" messageCode="entity_reference_not_managed" messageCodeAttribute="Protocol State" z="VF5qxZE8ByolsmtFiAhAjA5eB9E="/>
-        <field:simple field="lsLabels" id="c_com_labsynch_labseer_domain_Protocol_lsLabels" messageCode="entity_reference_not_managed" messageCodeAttribute="Protocol Label" z="yvQXkrTRsSljEbcpeg3BeH0/V50="/>
-        <field:select field="lsTags" id="c_com_labsynch_labseer_domain_Protocol_lsTags" itemValue="id" items="${lstags}" multiple="true" path="/lstags" z="dI/njSzpg1LET1k/s96ULTeiURc="/>
-        <field:simple field="firstProtocols" id="c_com_labsynch_labseer_domain_Protocol_firstProtocols" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Protocol Protocol" z="IY1kKVetMhz9vPm95yqiUazeKeA="/>
-        <field:simple field="secondProtocols" id="c_com_labsynch_labseer_domain_Protocol_secondProtocols" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Protocol Protocol" z="h9HUw1ZOXVJXhZxz/0nPBNTzpa4="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_Protocol_deleted" z="LRfgao3PkPxGufaNMssn6JeyNuQ="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_Protocol" render="${not empty dependencies}" z="tXRfgNjsuuWylj4h7IAnHG02Bvc="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocols/findProtocolsByCodeNameEquals.jspx b/src/main/webapp/WEB-INF/views/protocols/findProtocolsByCodeNameEquals.jspx
deleted file mode 100755
index 2642086b1..000000000
--- a/src/main/webapp/WEB-INF/views/protocols/findProtocolsByCodeNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeNameEquals" id="ff_com_labsynch_labseer_domain_Protocol" path="/protocols" z="Zn5jSNnIfXncvSx9TFa5kaNWS90=">
-        <field:input disableFormBinding="true" field="codeName" id="f_com_labsynch_labseer_domain_Protocol_codeName" max="255" required="true" z="wTqnTu+pDpELB4xdIisTZr4x1YY="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocols/findProtocolsByCodeNameEqualsAndIgnoredNot.jspx b/src/main/webapp/WEB-INF/views/protocols/findProtocolsByCodeNameEqualsAndIgnoredNot.jspx
deleted file mode 100644
index 66482d551..000000000
--- a/src/main/webapp/WEB-INF/views/protocols/findProtocolsByCodeNameEqualsAndIgnoredNot.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeNameEqualsAndIgnoredNot" id="ff_com_labsynch_labseer_domain_Protocol" path="/protocols" z="7R6bJVdSaD36PWgp5G8y6GShthA=">
-        <field:input disableFormBinding="true" field="codeName" id="f_com_labsynch_labseer_domain_Protocol_codeName" max="255" required="true" z="wTqnTu+pDpELB4xdIisTZr4x1YY="/>
-        <field:checkbox disableFormBinding="true" field="ignored" id="f_com_labsynch_labseer_domain_Protocol_ignored" z="4nZXBV8RAcl/3BBV/JgYguGhF8s="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocols/findProtocolsByCodeNameLike.jspx b/src/main/webapp/WEB-INF/views/protocols/findProtocolsByCodeNameLike.jspx
deleted file mode 100644
index 2b277fb5f..000000000
--- a/src/main/webapp/WEB-INF/views/protocols/findProtocolsByCodeNameLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeNameLike" id="ff_com_labsynch_labseer_domain_Protocol" path="/protocols" z="QEMWQ7JXzCBuP3sMG9RnFXbL6kM=">
-        <field:input disableFormBinding="true" field="codeName" id="f_com_labsynch_labseer_domain_Protocol_codeName" max="255" required="true" z="wTqnTu+pDpELB4xdIisTZr4x1YY="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocols/findProtocolsByIgnoredNot.jspx b/src/main/webapp/WEB-INF/views/protocols/findProtocolsByIgnoredNot.jspx
deleted file mode 100755
index 6a0b1279e..000000000
--- a/src/main/webapp/WEB-INF/views/protocols/findProtocolsByIgnoredNot.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByIgnoredNot" id="ff_com_labsynch_labseer_domain_Protocol" path="/protocols" z="FBrHQcYOvC3MoJkWhsodyB/AWZE=">
-        <field:checkbox disableFormBinding="true" field="ignored" id="f_com_labsynch_labseer_domain_Protocol_ignored" z="4nZXBV8RAcl/3BBV/JgYguGhF8s="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocols/findProtocolsByLsKindEquals.jspx b/src/main/webapp/WEB-INF/views/protocols/findProtocolsByLsKindEquals.jspx
deleted file mode 100755
index ffbe5cbe3..000000000
--- a/src/main/webapp/WEB-INF/views/protocols/findProtocolsByLsKindEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsKindEquals" id="ff_com_labsynch_labseer_domain_Protocol" path="/protocols" z="ZCDjj3PQRvZYZ7uzh8HbWWxnlzA=">
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_Protocol_lsKind" max="255" required="true" z="XIwI/XJa8y4JHvt6wGNigc1PhzI="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocols/findProtocolsByLsKindLike.jspx b/src/main/webapp/WEB-INF/views/protocols/findProtocolsByLsKindLike.jspx
deleted file mode 100644
index f7cf72307..000000000
--- a/src/main/webapp/WEB-INF/views/protocols/findProtocolsByLsKindLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsKindLike" id="ff_com_labsynch_labseer_domain_Protocol" path="/protocols" z="Ru8Iu4n4pJaNJOdEnfXDIhLQ7AI=">
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_Protocol_lsKind" max="255" required="true" z="XIwI/XJa8y4JHvt6wGNigc1PhzI="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocols/findProtocolsByLsTransactionEquals.jspx b/src/main/webapp/WEB-INF/views/protocols/findProtocolsByLsTransactionEquals.jspx
deleted file mode 100755
index dfd4d35d8..000000000
--- a/src/main/webapp/WEB-INF/views/protocols/findProtocolsByLsTransactionEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTransactionEquals" id="ff_com_labsynch_labseer_domain_Protocol" path="/protocols" z="Ulox4JKhlihvJKoJokdv5q9XqhY=">
-        <field:input disableFormBinding="true" field="lsTransaction" id="f_com_labsynch_labseer_domain_Protocol_lsTransaction" required="true" validationMessageCode="field_invalid_integer" z="ja65riLaQxPLeVVBrscW+lRjRi8="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocols/findProtocolsByLsTypeAndKindEquals.jspx b/src/main/webapp/WEB-INF/views/protocols/findProtocolsByLsTypeAndKindEquals.jspx
deleted file mode 100755
index d76789774..000000000
--- a/src/main/webapp/WEB-INF/views/protocols/findProtocolsByLsTypeAndKindEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeAndKindEquals" id="ff_com_labsynch_labseer_domain_Protocol" path="/protocols" z="gpn7cGDO145MUQvfnb5yFBTzoPQ=">
-        <field:input disableFormBinding="true" field="lsTypeAndKind" id="f_com_labsynch_labseer_domain_Protocol_lsTypeAndKind" max="255" required="true" z="lumcdRh0yqeEy46vXiWpqzY+x8U="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocols/findProtocolsByLsTypeEquals.jspx b/src/main/webapp/WEB-INF/views/protocols/findProtocolsByLsTypeEquals.jspx
deleted file mode 100755
index 9db4cf78b..000000000
--- a/src/main/webapp/WEB-INF/views/protocols/findProtocolsByLsTypeEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeEquals" id="ff_com_labsynch_labseer_domain_Protocol" path="/protocols" z="YyyYvWUbR9kh4r4iaumeN8ERwcI=">
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_Protocol_lsType" max="255" required="true" z="avzYUhle0se/eq1NxlkHRxxdXf8="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocols/findProtocolsByLsTypeEqualsAndLsKindEquals.jspx b/src/main/webapp/WEB-INF/views/protocols/findProtocolsByLsTypeEqualsAndLsKindEquals.jspx
deleted file mode 100755
index 2c64c7c83..000000000
--- a/src/main/webapp/WEB-INF/views/protocols/findProtocolsByLsTypeEqualsAndLsKindEquals.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeEqualsAndLsKindEquals" id="ff_com_labsynch_labseer_domain_Protocol" path="/protocols" z="H6PfpMlvi2ONPdUmwI/REl9/bSo=">
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_Protocol_lsType" max="255" required="true" z="avzYUhle0se/eq1NxlkHRxxdXf8="/>
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_Protocol_lsKind" max="255" required="true" z="XIwI/XJa8y4JHvt6wGNigc1PhzI="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocols/findProtocolsByLsTypeLike.jspx b/src/main/webapp/WEB-INF/views/protocols/findProtocolsByLsTypeLike.jspx
deleted file mode 100644
index 547c544d2..000000000
--- a/src/main/webapp/WEB-INF/views/protocols/findProtocolsByLsTypeLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeLike" id="ff_com_labsynch_labseer_domain_Protocol" path="/protocols" z="KqtrMZ7oZ8lMeThjwZW2oUtZpIw=">
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_Protocol_lsType" max="255" required="true" z="avzYUhle0se/eq1NxlkHRxxdXf8="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocols/findProtocolsByRecordedByLike.jspx b/src/main/webapp/WEB-INF/views/protocols/findProtocolsByRecordedByLike.jspx
deleted file mode 100644
index 1fc1a64a8..000000000
--- a/src/main/webapp/WEB-INF/views/protocols/findProtocolsByRecordedByLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByRecordedByLike" id="ff_com_labsynch_labseer_domain_Protocol" path="/protocols" z="4MzWp8Tk8egs8d889qYqXRPw410=">
-        <field:input disableFormBinding="true" field="recordedBy" id="f_com_labsynch_labseer_domain_Protocol_recordedBy" max="255" required="true" z="2GjWgGBj66cBWh2Je9hN/2TZmCQ="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocols/list.jspx b/src/main/webapp/WEB-INF/views/protocols/list.jspx
deleted file mode 100755
index ca68aac3b..000000000
--- a/src/main/webapp/WEB-INF/views/protocols/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_Protocol" items="${protocols}" z="0uVTT3aJl5mk0SwQ1SJsOsoYBVM=">
-        <table:table data="${protocols}" id="l_com_labsynch_labseer_domain_Protocol" path="/protocols" z="Arw3TUuzCKR9fh1D89mU/HCIFCA=">
-            <table:column id="c_com_labsynch_labseer_domain_Protocol_recordedBy" property="recordedBy" z="/yRk2FjieKhaF1Sv13zDyHTcLuw="/>
-            <table:column date="true" dateTimePattern="${protocol_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_Protocol_recordedDate" property="recordedDate" z="HfrJ3Iv95ik/quC1f/MznV9jJrs="/>
-            <table:column id="c_com_labsynch_labseer_domain_Protocol_codeName" property="codeName" z="tyJA9KvUNcotMTQTiydXt432WO4="/>
-            <table:column id="c_com_labsynch_labseer_domain_Protocol_lsType" property="lsType" z="RuZ1XpcxWIICg6n4dl09I+Qgm3M="/>
-            <table:column id="c_com_labsynch_labseer_domain_Protocol_lsKind" property="lsKind" z="nVV3wuXwDNGN3KRReMiEmiVIxZI="/>
-            <table:column id="c_com_labsynch_labseer_domain_Protocol_lsTypeAndKind" property="lsTypeAndKind" z="lkqDoVpBy+pHvc4mbshSnObYoZQ="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocols/show.jspx b/src/main/webapp/WEB-INF/views/protocols/show.jspx
deleted file mode 100755
index da0c6cab5..000000000
--- a/src/main/webapp/WEB-INF/views/protocols/show.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_Protocol" object="${protocol}" path="/protocols" z="JlxH6IhewofX+8odUipFDMQCB9E=">
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_Protocol_recordedBy" object="${protocol}" z="CDot+5SekSlOvWHq0T6yLoGyYjU="/>
-        <field:display date="true" dateTimePattern="${protocol_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_Protocol_recordedDate" object="${protocol}" z="fa1XufCrlaORojmdBFmSYIb6t7s="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_Protocol_modifiedBy" object="${protocol}" z="HOtEQOEpNsG78LQ2sIWP6tmG83c="/>
-        <field:display date="true" dateTimePattern="${protocol_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_Protocol_modifiedDate" object="${protocol}" z="e0l4dyDgyGamk6BdNTopeZntiHU="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_Protocol_ignored" object="${protocol}" z="9GRKL8qJwnV4kbwpZcv9hewVEyc="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_Protocol_lsTransaction" object="${protocol}" z="i4kRD6uQNMvgealshpK0enwkiE4="/>
-        <field:display field="shortDescription" id="s_com_labsynch_labseer_domain_Protocol_shortDescription" object="${protocol}" z="zgNrUv7I8URojs+A4r7nUlRc7e8="/>
-        <field:display field="codeName" id="s_com_labsynch_labseer_domain_Protocol_codeName" object="${protocol}" z="FIChpzbi0zQScxBbpb10A3rYe6E="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_Protocol_lsType" object="${protocol}" z="tGrDP8MR5VDDi54Bb5em3+CD45A="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_Protocol_lsKind" object="${protocol}" z="BC+A4TTBvJtA05RRSMKZhBa/rJA="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_Protocol_lsTypeAndKind" object="${protocol}" z="P8b/R7nKpTPW+8eU33SmiNYInBE="/>
-        <field:display field="lsTags" id="s_com_labsynch_labseer_domain_Protocol_lsTags" object="${protocol}" z="5nmBjvFYx1VLu8QecrG9HI2YlGk="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_Protocol_deleted" object="${protocol}" z="mVm7jGHQcZ0pdVxBjN0eu4Fus0Y="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocols/update.jspx b/src/main/webapp/WEB-INF/views/protocols/update.jspx
deleted file mode 100755
index b853ec73a..000000000
--- a/src/main/webapp/WEB-INF/views/protocols/update.jspx
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_Protocol" modelAttribute="protocol" path="/protocols" versionField="Version" z="F9DkYddnqtk0h99DCJWs56deGtA=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_Protocol_recordedBy" required="true" z="ED41RgoOzJYSucc9/PGC0rXXGUQ="/>
-        <field:datetime dateTimePattern="${protocol_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_Protocol_recordedDate" required="true" z="Vs92YbaY0TcyJZoQ3EsMJNPsFog="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_Protocol_modifiedBy" z="RHrfqRwn30xQ7BGWrQstxcEFpi8="/>
-        <field:datetime dateTimePattern="${protocol_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_Protocol_modifiedDate" z="fbGiGfkXWLOeHrC3pz5I+F4qrHY="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_Protocol_ignored" z="FfC1CpWCGx8FjkOo58vR2QhOvC8="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_Protocol_lsTransaction" validationMessageCode="field_invalid_integer" z="wmDYfRaEfvFdzXGeI3laMa3auKk="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_Protocol_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="Sq1U8qJLHRgRHVJhznC4bp52xuE="/>
-        <field:textarea field="shortDescription" id="c_com_labsynch_labseer_domain_Protocol_shortDescription" z="hMvn9OA4J5PY7g+h1tGAZK/9h8g="/>
-        <field:simple field="experiments" id="c_com_labsynch_labseer_domain_Protocol_experiments" messageCode="entity_reference_not_managed" messageCodeAttribute="Experiment" z="bNepFtnfTlXyNDyOz5is5z04R1o="/>
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_Protocol_codeName" z="t5WSFKcIjOoVnOtN4ZNw3YAsKK0="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_Protocol_lsType" required="true" z="PpqQA1P4s1w7eB+PGf9n3dSog3U="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_Protocol_lsKind" required="true" z="+pnFmNue3ugpD5LBDelztutascg="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_Protocol_lsTypeAndKind" z="qTwu/l90Qd1pdzAmUSDgw4BGII0="/>
-        <field:simple field="lsStates" id="c_com_labsynch_labseer_domain_Protocol_lsStates" messageCode="entity_reference_not_managed" messageCodeAttribute="Protocol State" z="VF5qxZE8ByolsmtFiAhAjA5eB9E="/>
-        <field:simple field="lsLabels" id="c_com_labsynch_labseer_domain_Protocol_lsLabels" messageCode="entity_reference_not_managed" messageCodeAttribute="Protocol Label" z="yvQXkrTRsSljEbcpeg3BeH0/V50="/>
-        <field:select field="lsTags" id="c_com_labsynch_labseer_domain_Protocol_lsTags" itemValue="id" items="${lstags}" multiple="true" path="/lstags" z="dI/njSzpg1LET1k/s96ULTeiURc="/>
-        <field:simple field="firstProtocols" id="c_com_labsynch_labseer_domain_Protocol_firstProtocols" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Protocol Protocol" z="IY1kKVetMhz9vPm95yqiUazeKeA="/>
-        <field:simple field="secondProtocols" id="c_com_labsynch_labseer_domain_Protocol_secondProtocols" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Protocol Protocol" z="h9HUw1ZOXVJXhZxz/0nPBNTzpa4="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_Protocol_deleted" z="LRfgao3PkPxGufaNMssn6JeyNuQ="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocols/views.xml b/src/main/webapp/WEB-INF/views/protocols/views.xml
deleted file mode 100755
index e31ed7a3f..000000000
--- a/src/main/webapp/WEB-INF/views/protocols/views.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="protocols/list">
-        <put-attribute name="body" value="/WEB-INF/views/protocols/list.jspx"/>
-    </definition>
-<definition extends="default" name="protocols/show">
-        <put-attribute name="body" value="/WEB-INF/views/protocols/show.jspx"/>
-    </definition>
-<definition extends="default" name="protocols/create">
-        <put-attribute name="body" value="/WEB-INF/views/protocols/create.jspx"/>
-    </definition>
-<definition extends="default" name="protocols/update">
-        <put-attribute name="body" value="/WEB-INF/views/protocols/update.jspx"/>
-    </definition>
-<definition extends="default" name="protocols/findProtocolsByCodeNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/protocols/findProtocolsByCodeNameEquals.jspx"/>
-    </definition>
-<definition extends="default" name="protocols/findProtocolsByIgnoredNot">
-        <put-attribute name="body" value="/WEB-INF/views/protocols/findProtocolsByIgnoredNot.jspx"/>
-    </definition>
-<definition extends="default" name="protocols/findProtocolsByLsKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/protocols/findProtocolsByLsKindEquals.jspx"/>
-    </definition>
-<definition extends="default" name="protocols/findProtocolsByLsTypeEquals">
-        <put-attribute name="body" value="/WEB-INF/views/protocols/findProtocolsByLsTypeEquals.jspx"/>
-    </definition>
-<definition extends="default" name="protocols/findProtocolsByLsTypeEqualsAndLsKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/protocols/findProtocolsByLsTypeEqualsAndLsKindEquals.jspx"/>
-    </definition>
-<definition extends="default" name="protocols/findProtocolsByLsTypeAndKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/protocols/findProtocolsByLsTypeAndKindEquals.jspx"/>
-    </definition>
-<definition extends="default" name="protocols/findProtocolsByLsTransactionEquals">
-        <put-attribute name="body" value="/WEB-INF/views/protocols/findProtocolsByLsTransactionEquals.jspx"/>
-    </definition>
-<definition extends="default" name="protocols/findProtocolsByLsKindLike">
-        <put-attribute name="body" value="/WEB-INF/views/protocols/findProtocolsByLsKindLike.jspx"/>
-    </definition>
-<definition extends="default" name="protocols/findProtocolsByLsTypeLike">
-        <put-attribute name="body" value="/WEB-INF/views/protocols/findProtocolsByLsTypeLike.jspx"/>
-    </definition>
-<definition extends="default" name="protocols/findProtocolsByRecordedByLike">
-        <put-attribute name="body" value="/WEB-INF/views/protocols/findProtocolsByRecordedByLike.jspx"/>
-    </definition>
-<definition extends="default" name="protocols/findProtocolsByCodeNameEqualsAndIgnoredNot">
-        <put-attribute name="body" value="/WEB-INF/views/protocols/findProtocolsByCodeNameEqualsAndIgnoredNot.jspx"/>
-    </definition>
-<definition extends="default" name="protocols/findProtocolsByCodeNameLike">
-        <put-attribute name="body" value="/WEB-INF/views/protocols/findProtocolsByCodeNameLike.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/protocolstates/create.jspx b/src/main/webapp/WEB-INF/views/protocolstates/create.jspx
deleted file mode 100755
index 44072ca01..000000000
--- a/src/main/webapp/WEB-INF/views/protocolstates/create.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ProtocolState" modelAttribute="protocolState" path="/protocolstates" render="${empty dependencies}" z="dEPgsWe9sFOp1ywdT3VBG+lmo9c=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ProtocolState_recordedBy" required="true" z="QVXliUlo4uz1xYr1Hh3SUfDq3qQ="/>
-        <field:datetime dateTimePattern="${protocolState_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ProtocolState_recordedDate" required="true" z="NQhP7ySC/whjqk4gC+FJVSOTEdg="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ProtocolState_modifiedBy" z="/OgZhfHhXh1b0DWMCfxMXsH+V3k="/>
-        <field:datetime dateTimePattern="${protocolState_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ProtocolState_modifiedDate" z="GadTNHWZp3owN9SO2YykkjxrPZA="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ProtocolState_comments" z="4vWuffr65r9f2mie7/UfI+3ij9o="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ProtocolState_ignored" z="I4HZw+SK/RMxQBazPOX22LgVHwA="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ProtocolState_lsTransaction" validationMessageCode="field_invalid_integer" z="6k550gNjJ7sQ4fDVzd2hCBLzGNk="/>
-        <field:select field="protocol" id="c_com_labsynch_labseer_domain_ProtocolState_protocol" itemValue="id" items="${protocols}" path="/protocols" required="true" z="vCIfK44raYPcef8lKW2F2CpeFvE="/>
-        <field:simple field="lsValues" id="c_com_labsynch_labseer_domain_ProtocolState_lsValues" messageCode="entity_reference_not_managed" messageCodeAttribute="Protocol Value" z="2L3clTv+op9aUtOa/z3JL4fM+VU="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ProtocolState_lsType" required="true" z="FGOp+rZ3LZts6Z+6YVva0qCqZXY="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ProtocolState_lsKind" required="true" z="atYs8v3lD1RR5vF/0aDmdMGVCxc="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ProtocolState_lsTypeAndKind" z="+67Mczf/O99FVGfbe+CD76f3xiE="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ProtocolState_deleted" z="v2bCAUjFYJ1lMiaxXHaeR5LfFSw="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ProtocolState" render="${not empty dependencies}" z="OrR73Lc7nPIiYE/2y+M/0xhGn2U="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocolstates/findProtocolStatesByLsTransactionEquals.jspx b/src/main/webapp/WEB-INF/views/protocolstates/findProtocolStatesByLsTransactionEquals.jspx
deleted file mode 100755
index 7e6dd33f4..000000000
--- a/src/main/webapp/WEB-INF/views/protocolstates/findProtocolStatesByLsTransactionEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTransactionEquals" id="ff_com_labsynch_labseer_domain_ProtocolState" path="/protocolstates" z="wHPBKBhyT59txN6QgXa9yJtqDFo=">
-        <field:input disableFormBinding="true" field="lsTransaction" id="f_com_labsynch_labseer_domain_ProtocolState_lsTransaction" required="true" validationMessageCode="field_invalid_integer" z="K5zRsDLwznm2v2bU+wFzrcE3RHU="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocolstates/findProtocolStatesByProtocol.jspx b/src/main/webapp/WEB-INF/views/protocolstates/findProtocolStatesByProtocol.jspx
deleted file mode 100755
index 42f1c2ea4..000000000
--- a/src/main/webapp/WEB-INF/views/protocolstates/findProtocolStatesByProtocol.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByProtocol" id="ff_com_labsynch_labseer_domain_ProtocolState" path="/protocolstates" z="Qu9uu2+FEcybi61fYbk+pBaN8F8=">
-        <field:select disableFormBinding="true" field="protocol" id="f_com_labsynch_labseer_domain_ProtocolState_protocol" itemValue="id" items="${protocols}" path="/protocols" required="true" z="NsIG9NvPSiusAevC0t7xIooEe2A="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocolstates/list.jspx b/src/main/webapp/WEB-INF/views/protocolstates/list.jspx
deleted file mode 100755
index 3bbf5ad6f..000000000
--- a/src/main/webapp/WEB-INF/views/protocolstates/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ProtocolState" items="${protocolstates}" z="MD6rASKqiBhgjXCkwM05hlXta44=">
-        <table:table data="${protocolstates}" id="l_com_labsynch_labseer_domain_ProtocolState" path="/protocolstates" z="GT1qFXJLbtkHvzXgBmB66UFHIAI=">
-            <table:column id="c_com_labsynch_labseer_domain_ProtocolState_recordedBy" property="recordedBy" z="L5Oj+emrA0miAuAyaTCc1EtkpmU="/>
-            <table:column date="true" dateTimePattern="${protocolState_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_ProtocolState_recordedDate" property="recordedDate" z="u2zg4NIZ5xnXRwO16TgCwJEx88U="/>
-            <table:column id="c_com_labsynch_labseer_domain_ProtocolState_modifiedBy" property="modifiedBy" z="jAZ+GWJLXOGeyDeXt4XklYcLaj4="/>
-            <table:column date="true" dateTimePattern="${protocolState_modifieddate_date_format}" id="c_com_labsynch_labseer_domain_ProtocolState_modifiedDate" property="modifiedDate" z="cqu93Ab2iN1RBQ70Q1Nakym+4Uk="/>
-            <table:column id="c_com_labsynch_labseer_domain_ProtocolState_lsType" property="lsType" z="maT7/I8GnVTx9gyta/lt/8YO6SM="/>
-            <table:column id="c_com_labsynch_labseer_domain_ProtocolState_lsKind" property="lsKind" z="HhPu8VWV4zTik1f2/Jh+0yXGtVM="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocolstates/show.jspx b/src/main/webapp/WEB-INF/views/protocolstates/show.jspx
deleted file mode 100755
index f7331c45e..000000000
--- a/src/main/webapp/WEB-INF/views/protocolstates/show.jspx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ProtocolState" object="${protocolstate}" path="/protocolstates" z="JSJKmjrlL46DJ6Z62yX7/koI66A=">
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_ProtocolState_recordedBy" object="${protocolstate}" z="Ak5v7BNgxU5sjbX6kU+9b7rbCcM="/>
-        <field:display date="true" dateTimePattern="${protocolState_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_ProtocolState_recordedDate" object="${protocolstate}" z="2kj5DuOmqhUBKuZP9PtTq2Rhw3g="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_ProtocolState_modifiedBy" object="${protocolstate}" z="BHqQXeZR+A6Bh631/gR5uK81XLo="/>
-        <field:display date="true" dateTimePattern="${protocolState_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_ProtocolState_modifiedDate" object="${protocolstate}" z="Vgk6VwSWPCKyO/ffFlBe9vT4zcM="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_ProtocolState_comments" object="${protocolstate}" z="pnrb8uD6KnpQ8GSXN0iOIUE1nU4="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ProtocolState_ignored" object="${protocolstate}" z="9gHymXkqwoFS9RDUS+udP6YpInA="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_ProtocolState_lsTransaction" object="${protocolstate}" z="5h+yiuy9fQggkojSUwCDWe0XgSM="/>
-        <field:display field="protocol" id="s_com_labsynch_labseer_domain_ProtocolState_protocol" object="${protocolstate}" z="K2K0kWtKXtay+dgdrQyxk6kam6g="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ProtocolState_lsType" object="${protocolstate}" z="pemvo+3a4SgQLsxS6PuaREV96uI="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_ProtocolState_lsKind" object="${protocolstate}" z="Ur7yaaUuxDrrcyljR2NxTtdaNMw="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ProtocolState_lsTypeAndKind" object="${protocolstate}" z="xjryEMr0qHfFuLD2U4hNyCY/aOM="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_ProtocolState_deleted" object="${protocolstate}" z="FlpC+cVE4ekE7Xprxr96Fy+4sOo="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocolstates/update.jspx b/src/main/webapp/WEB-INF/views/protocolstates/update.jspx
deleted file mode 100755
index 415200ae8..000000000
--- a/src/main/webapp/WEB-INF/views/protocolstates/update.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ProtocolState" modelAttribute="protocolState" path="/protocolstates" versionField="Version" z="RSlBX4Xnu4FNebdP8nDycHfp3sM=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ProtocolState_recordedBy" required="true" z="QVXliUlo4uz1xYr1Hh3SUfDq3qQ="/>
-        <field:datetime dateTimePattern="${protocolState_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ProtocolState_recordedDate" required="true" z="NQhP7ySC/whjqk4gC+FJVSOTEdg="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ProtocolState_modifiedBy" z="/OgZhfHhXh1b0DWMCfxMXsH+V3k="/>
-        <field:datetime dateTimePattern="${protocolState_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ProtocolState_modifiedDate" z="GadTNHWZp3owN9SO2YykkjxrPZA="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ProtocolState_comments" z="4vWuffr65r9f2mie7/UfI+3ij9o="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ProtocolState_ignored" z="I4HZw+SK/RMxQBazPOX22LgVHwA="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ProtocolState_lsTransaction" validationMessageCode="field_invalid_integer" z="6k550gNjJ7sQ4fDVzd2hCBLzGNk="/>
-        <field:select field="protocol" id="c_com_labsynch_labseer_domain_ProtocolState_protocol" itemValue="id" items="${protocols}" path="/protocols" required="true" z="vCIfK44raYPcef8lKW2F2CpeFvE="/>
-        <field:simple field="lsValues" id="c_com_labsynch_labseer_domain_ProtocolState_lsValues" messageCode="entity_reference_not_managed" messageCodeAttribute="Protocol Value" z="2L3clTv+op9aUtOa/z3JL4fM+VU="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ProtocolState_lsType" required="true" z="FGOp+rZ3LZts6Z+6YVva0qCqZXY="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ProtocolState_lsKind" required="true" z="atYs8v3lD1RR5vF/0aDmdMGVCxc="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ProtocolState_lsTypeAndKind" z="+67Mczf/O99FVGfbe+CD76f3xiE="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ProtocolState_deleted" z="v2bCAUjFYJ1lMiaxXHaeR5LfFSw="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocolstates/views.xml b/src/main/webapp/WEB-INF/views/protocolstates/views.xml
deleted file mode 100755
index 0bd19fc74..000000000
--- a/src/main/webapp/WEB-INF/views/protocolstates/views.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="protocolstates/list">
-        <put-attribute name="body" value="/WEB-INF/views/protocolstates/list.jspx"/>
-    </definition>
-<definition extends="default" name="protocolstates/show">
-        <put-attribute name="body" value="/WEB-INF/views/protocolstates/show.jspx"/>
-    </definition>
-<definition extends="default" name="protocolstates/create">
-        <put-attribute name="body" value="/WEB-INF/views/protocolstates/create.jspx"/>
-    </definition>
-<definition extends="default" name="protocolstates/update">
-        <put-attribute name="body" value="/WEB-INF/views/protocolstates/update.jspx"/>
-    </definition>
-<definition extends="default" name="protocolstates/findProtocolStatesByLsTransactionEquals">
-        <put-attribute name="body" value="/WEB-INF/views/protocolstates/findProtocolStatesByLsTransactionEquals.jspx"/>
-    </definition>
-<definition extends="default" name="protocolstates/findProtocolStatesByProtocol">
-        <put-attribute name="body" value="/WEB-INF/views/protocolstates/findProtocolStatesByProtocol.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/protocoltypes/create.jspx b/src/main/webapp/WEB-INF/views/protocoltypes/create.jspx
deleted file mode 100755
index 606c4e7cc..000000000
--- a/src/main/webapp/WEB-INF/views/protocoltypes/create.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ProtocolType" modelAttribute="protocolType" path="/protocoltypes" render="${empty dependencies}" z="kMr9qupGFlTkyTqNb5TUiSN8ufY=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_ProtocolType_typeName" required="true" z="qkX3VQOYvMqbgcwYuGBeQ7frh/4="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ProtocolType" render="${not empty dependencies}" z="ZozJYiQ4XUSAl/8dKThKFWWaxHY="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocoltypes/findProtocolTypesByTypeNameEquals.jspx b/src/main/webapp/WEB-INF/views/protocoltypes/findProtocolTypesByTypeNameEquals.jspx
deleted file mode 100755
index 8095225bd..000000000
--- a/src/main/webapp/WEB-INF/views/protocoltypes/findProtocolTypesByTypeNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByTypeNameEquals" id="ff_com_labsynch_labseer_domain_ProtocolType" path="/protocoltypes" z="yw04X386i6ItZj6sbnDWLivK89o=">
-        <field:input disableFormBinding="true" field="typeName" id="f_com_labsynch_labseer_domain_ProtocolType_typeName" max="128" required="true" z="DN9SDwHiH9m9pR6SmME8j1OWMao="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocoltypes/list.jspx b/src/main/webapp/WEB-INF/views/protocoltypes/list.jspx
deleted file mode 100755
index 391493308..000000000
--- a/src/main/webapp/WEB-INF/views/protocoltypes/list.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ProtocolType" items="${protocoltypes}" z="OGvO2aV5yxguE/ZyCekHaDT2nsQ=">
-        <table:table data="${protocoltypes}" id="l_com_labsynch_labseer_domain_ProtocolType" path="/protocoltypes" z="M6KI/xsygs9htEwntFFw/c+1oWw=">
-            <table:column id="c_com_labsynch_labseer_domain_ProtocolType_typeName" property="typeName" z="iDKDEtknN+zP83GOP/XEzJyb7c0="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocoltypes/show.jspx b/src/main/webapp/WEB-INF/views/protocoltypes/show.jspx
deleted file mode 100755
index e431ac8ee..000000000
--- a/src/main/webapp/WEB-INF/views/protocoltypes/show.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ProtocolType" object="${protocoltype}" path="/protocoltypes" z="NphwAfJhGFaFzYmkVThONsP7eJU=">
-        <field:display field="typeName" id="s_com_labsynch_labseer_domain_ProtocolType_typeName" object="${protocoltype}" z="duMjZJZrAqMs7etPH4aGXpkmfEA="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocoltypes/update.jspx b/src/main/webapp/WEB-INF/views/protocoltypes/update.jspx
deleted file mode 100755
index 827b570e9..000000000
--- a/src/main/webapp/WEB-INF/views/protocoltypes/update.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ProtocolType" modelAttribute="protocolType" path="/protocoltypes" versionField="Version" z="GPQvRZ1xvdwLPbjDpwlK+d5wrtY=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_ProtocolType_typeName" required="true" z="qkX3VQOYvMqbgcwYuGBeQ7frh/4="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocoltypes/views.xml b/src/main/webapp/WEB-INF/views/protocoltypes/views.xml
deleted file mode 100755
index 8e61099cf..000000000
--- a/src/main/webapp/WEB-INF/views/protocoltypes/views.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="protocoltypes/list">
-        <put-attribute name="body" value="/WEB-INF/views/protocoltypes/list.jspx"/>
-    </definition>
-<definition extends="default" name="protocoltypes/show">
-        <put-attribute name="body" value="/WEB-INF/views/protocoltypes/show.jspx"/>
-    </definition>
-<definition extends="default" name="protocoltypes/create">
-        <put-attribute name="body" value="/WEB-INF/views/protocoltypes/create.jspx"/>
-    </definition>
-<definition extends="default" name="protocoltypes/update">
-        <put-attribute name="body" value="/WEB-INF/views/protocoltypes/update.jspx"/>
-    </definition>
-<definition extends="default" name="protocoltypes/findProtocolTypesByTypeNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/protocoltypes/findProtocolTypesByTypeNameEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/protocolvalues/create.jspx b/src/main/webapp/WEB-INF/views/protocolvalues/create.jspx
deleted file mode 100755
index aa171ddaa..000000000
--- a/src/main/webapp/WEB-INF/views/protocolvalues/create.jspx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ProtocolValue" modelAttribute="protocolValue" path="/protocolvalues" render="${empty dependencies}" z="Vhx2RD90j0GcPlHK9cJwFH39Bdw=">
-        <field:textarea field="stringValue" id="c_com_labsynch_labseer_domain_ProtocolValue_stringValue" z="1O15e7plpbpzeIRku6tyVMgSixU="/>
-        <field:textarea field="fileValue" id="c_com_labsynch_labseer_domain_ProtocolValue_fileValue" z="08bjznZhYGxkD8Tvk1FdTBNSy8w="/>
-        <field:textarea field="urlValue" id="c_com_labsynch_labseer_domain_ProtocolValue_urlValue" z="zMix6lJrswVwVmqxsLsChRMEg6o="/>
-        <field:datetime dateTimePattern="${protocolValue_datevalue_date_format}" field="dateValue" id="c_com_labsynch_labseer_domain_ProtocolValue_dateValue" z="FcqDPao5rDKmgolyalb7AGiCCLM="/>
-        <field:input field="clobValue" id="c_com_labsynch_labseer_domain_ProtocolValue_clobValue" z="bQx1BE7jLLCvtFtqBtgb+jtJiA8="/>
-        <field:input field="blobValue" id="c_com_labsynch_labseer_domain_ProtocolValue_blobValue" z="HRLOEMfeW/dbdqt1pKgfD0bTWb8="/>
-        <field:input field="sigFigs" id="c_com_labsynch_labseer_domain_ProtocolValue_sigFigs" validationMessageCode="field_invalid_integer" z="Ixe5dC4PYANKcrOIWU99y5EfSTA="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ProtocolValue_comments" z="kQegVDC7lFr/wGNbcYzoZRHmZzc="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ProtocolValue_ignored" z="V/LIGlTmvcXqecGv9+1RRd/ULuo="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ProtocolValue_lsTransaction" validationMessageCode="field_invalid_integer" z="8FW0Qf3sGN/GMINPeGsIsQ1hZBM="/>
-        <field:datetime dateTimePattern="${protocolValue_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ProtocolValue_recordedDate" required="true" z="5mqLKfFhBsL7xrDn/lmsuum046E="/>
-        <field:datetime dateTimePattern="${protocolValue_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ProtocolValue_modifiedDate" z="/Idih2o4WqnNWRQp7e/aqTXPqpw="/>
-        <field:checkbox field="publicData" id="c_com_labsynch_labseer_domain_ProtocolValue_publicData" z="LgZXH92WjhZU1L6LdzDJpdZWG0g="/>
-        <field:textarea field="codeValue" id="c_com_labsynch_labseer_domain_ProtocolValue_codeValue" z="Pb9tALlqBtKjLcjjhhDm5ujDu2E="/>
-        <field:input field="numberOfReplicates" id="c_com_labsynch_labseer_domain_ProtocolValue_numberOfReplicates" validationMessageCode="field_invalid_integer" z="m3AuaIgrQS6U///qd+sCtNG+0NA="/>
-        <field:textarea field="uncertaintyType" id="c_com_labsynch_labseer_domain_ProtocolValue_uncertaintyType" z="y6iulY3sMitYYNUAx0+4BtfzB70="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ProtocolValue_lsType" required="true" z="ppbTnjF+ohy8B27et7ntfzrpXyg="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ProtocolValue_lsKind" required="true" z="743uiZwiHmuv0dIfWs+X5AlnApU="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ProtocolValue_lsTypeAndKind" z="hzzqCIfhngMYPlWMMCcCJZni6Ow="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ProtocolValue_recordedBy" required="true" z="mSlnwuFJ7vuQf+QO0MDdteo8FsE="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ProtocolValue_modifiedBy" z="EzP1JpUkt659WwmDxBvrJHLb4Ls="/>
-        <field:select field="lsState" id="c_com_labsynch_labseer_domain_ProtocolValue_lsState" itemValue="id" items="${protocolstates}" path="/protocolstates" required="true" z="/BWvpkmaA/a69Fp+LL1vozZ418A="/>
-        <field:input field="operatorType" id="c_com_labsynch_labseer_domain_ProtocolValue_operatorType" max="25" z="pKA3kM2uD8a1nAdFf9a1nOY+YtA="/>
-        <field:input field="operatorKind" id="c_com_labsynch_labseer_domain_ProtocolValue_operatorKind" max="10" z="b/ljGi+BHwsgPepx9yYaym9eiDI="/>
-        <field:textarea field="operatorTypeAndKind" id="c_com_labsynch_labseer_domain_ProtocolValue_operatorTypeAndKind" z="jdnJBN+dH6ebDOU++lykdl6Fslc="/>
-        <field:input field="unitType" id="c_com_labsynch_labseer_domain_ProtocolValue_unitType" max="25" z="2XFyzb1p+gzIJpr4KttkH/uiLvI="/>
-        <field:input field="unitKind" id="c_com_labsynch_labseer_domain_ProtocolValue_unitKind" max="25" z="HWU2iyn/t/KOawY+8/Q+JIjxTaI="/>
-        <field:textarea field="unitTypeAndKind" id="c_com_labsynch_labseer_domain_ProtocolValue_unitTypeAndKind" z="pmvoWLw02IW9AZZQsicBcMgfB9k="/>
-        <field:input field="numericValue" id="c_com_labsynch_labseer_domain_ProtocolValue_numericValue" validationMessageCode="field_invalid_number" z="oBmH1Wz5Geqejhpo1D+zEey+Uac="/>
-        <field:textarea field="codeType" id="c_com_labsynch_labseer_domain_ProtocolValue_codeType" z="Loqo09USLp1nYjBOhGx13SsHUTk="/>
-        <field:textarea field="codeKind" id="c_com_labsynch_labseer_domain_ProtocolValue_codeKind" z="LW4tXHUV1WDjgEFtHTPw8e6i9Ho="/>
-        <field:textarea field="codeTypeAndKind" id="c_com_labsynch_labseer_domain_ProtocolValue_codeTypeAndKind" z="xsqysATV5TBfH3LC1W3HxSkd4+U="/>
-        <field:input field="uncertainty" id="c_com_labsynch_labseer_domain_ProtocolValue_uncertainty" validationMessageCode="field_invalid_number" z="N3VmuQgokgbDSvQzYAne2ydP5yg="/>
-        <field:textarea field="codeOrigin" id="c_com_labsynch_labseer_domain_ProtocolValue_codeOrigin" z="3Mh85tgYst8bdlk2VgceRkaOgRg="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ProtocolValue_deleted" z="GvU3HjUEMP8o9r2+N2GCdw/hZgs="/>
-        <field:input field="concentration" id="c_com_labsynch_labseer_domain_ProtocolValue_concentration" validationMessageCode="field_invalid_number" z="wVQWublt6phaAul+CMfKPs0CA90="/>
-        <field:input field="concUnit" id="c_com_labsynch_labseer_domain_ProtocolValue_concUnit" max="25" z="auT61MDp/M0vhmZOYg4hEHfnBDo="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ProtocolValue" render="${not empty dependencies}" z="//RiUk84gQbQg+ClwxDKmXcxd0U="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocolvalues/findProtocolValuesByLsKindEqualsAndCodeValueLike.jspx b/src/main/webapp/WEB-INF/views/protocolvalues/findProtocolValuesByLsKindEqualsAndCodeValueLike.jspx
deleted file mode 100644
index ebe882be9..000000000
--- a/src/main/webapp/WEB-INF/views/protocolvalues/findProtocolValuesByLsKindEqualsAndCodeValueLike.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsKindEqualsAndCodeValueLike" id="ff_com_labsynch_labseer_domain_ProtocolValue" path="/protocolvalues" z="6qHlZjI77v95FCX7O5XPWG8Kofw=">
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_ProtocolValue_lsKind" max="255" required="true" z="yTh7Ne84l5p/BfiYkMhIsmmPCfg="/>
-        <field:input disableFormBinding="true" field="codeValue" id="f_com_labsynch_labseer_domain_ProtocolValue_codeValue" max="255" required="true" z="XwAg5e3ioGZMOmVTq4EL9yLeG6c="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocolvalues/findProtocolValuesByLsKindEqualsAndDateValueLike.jspx b/src/main/webapp/WEB-INF/views/protocolvalues/findProtocolValuesByLsKindEqualsAndDateValueLike.jspx
deleted file mode 100644
index 9b7448590..000000000
--- a/src/main/webapp/WEB-INF/views/protocolvalues/findProtocolValuesByLsKindEqualsAndDateValueLike.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsKindEqualsAndDateValueLike" id="ff_com_labsynch_labseer_domain_ProtocolValue" path="/protocolvalues" z="bVv1Kx6g19VLGP5Ygjo0dRv48jE=">
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_ProtocolValue_lsKind" max="255" required="true" z="yTh7Ne84l5p/BfiYkMhIsmmPCfg="/>
-        <field:datetime dateTimePattern="${protocolValue_datevalue_date_format}" disableFormBinding="true" field="dateValue" id="f_com_labsynch_labseer_domain_ProtocolValue_dateValue" required="true" z="yxVWy9rVr5MrVIwNXblvTuFria4="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocolvalues/findProtocolValuesByLsKindEqualsAndStringValueLike.jspx b/src/main/webapp/WEB-INF/views/protocolvalues/findProtocolValuesByLsKindEqualsAndStringValueLike.jspx
deleted file mode 100644
index c1a8a98f6..000000000
--- a/src/main/webapp/WEB-INF/views/protocolvalues/findProtocolValuesByLsKindEqualsAndStringValueLike.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsKindEqualsAndStringValueLike" id="ff_com_labsynch_labseer_domain_ProtocolValue" path="/protocolvalues" z="B+4DJ9Tqr4RcXFut9/MVIZWP3Hc=">
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_ProtocolValue_lsKind" max="255" required="true" z="yTh7Ne84l5p/BfiYkMhIsmmPCfg="/>
-        <field:input disableFormBinding="true" field="stringValue" id="f_com_labsynch_labseer_domain_ProtocolValue_stringValue" max="255" required="true" z="H4YY3UFS42xfNBWcHJ4bb4HT5xA="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocolvalues/findProtocolValuesByLsState.jspx b/src/main/webapp/WEB-INF/views/protocolvalues/findProtocolValuesByLsState.jspx
deleted file mode 100755
index 091dae9a3..000000000
--- a/src/main/webapp/WEB-INF/views/protocolvalues/findProtocolValuesByLsState.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsState" id="ff_com_labsynch_labseer_domain_ProtocolValue" path="/protocolvalues" z="NtPxzR8/2Uh1/k3qGffia9kvpO4=">
-        <field:select disableFormBinding="true" field="lsState" id="f_com_labsynch_labseer_domain_ProtocolValue_lsState" itemValue="id" items="${protocolstates}" path="/protocolstates" required="true" z="m/ZaY7mnGF0Cgs+kBVqq7jl0vNc="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocolvalues/findProtocolValuesByLsTransactionEquals.jspx b/src/main/webapp/WEB-INF/views/protocolvalues/findProtocolValuesByLsTransactionEquals.jspx
deleted file mode 100755
index f7da1efd6..000000000
--- a/src/main/webapp/WEB-INF/views/protocolvalues/findProtocolValuesByLsTransactionEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTransactionEquals" id="ff_com_labsynch_labseer_domain_ProtocolValue" path="/protocolvalues" z="Yj0VCPzLG2I75gP9AU6j6+9KmBA=">
-        <field:input disableFormBinding="true" field="lsTransaction" id="f_com_labsynch_labseer_domain_ProtocolValue_lsTransaction" required="true" validationMessageCode="field_invalid_integer" z="ymLCHZ0i9QBUHMLR8B2HdapGrYs="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocolvalues/list.jspx b/src/main/webapp/WEB-INF/views/protocolvalues/list.jspx
deleted file mode 100755
index 2dc58e82c..000000000
--- a/src/main/webapp/WEB-INF/views/protocolvalues/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ProtocolValue" items="${protocolvalues}" z="EeIAwWceGpS9B9tY/McOdCRkWqs=">
-        <table:table data="${protocolvalues}" id="l_com_labsynch_labseer_domain_ProtocolValue" path="/protocolvalues" z="AZ9M/Rht1U0nPQ4tTfOCsxGtf00=">
-            <table:column id="c_com_labsynch_labseer_domain_ProtocolValue_lsType" property="lsType" z="w0AmpkXzVHrCRWug6/j3Q/TfX2M="/>
-            <table:column id="c_com_labsynch_labseer_domain_ProtocolValue_lsKind" property="lsKind" z="0BRYdWMkCtCOsHA1JMMSnfRlkcI="/>
-            <table:column id="c_com_labsynch_labseer_domain_ProtocolValue_lsTypeAndKind" property="lsTypeAndKind" z="uchQnMQauszpLK0oyzU5reMKry8="/>
-            <table:column id="c_com_labsynch_labseer_domain_ProtocolValue_ignored" property="ignored" z="2OXd76hM94jHdfaYAGKIEbe8Mbg="/>
-            <table:column id="c_com_labsynch_labseer_domain_ProtocolValue_publicData" property="publicData" z="QluJF3Z4MN26SbluHcxOBe+sLQA="/>
-            <table:column id="c_com_labsynch_labseer_domain_ProtocolValue_deleted" property="deleted" z="F537fDQOBc2/rLnvhvV3K41vi3w="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocolvalues/show.jspx b/src/main/webapp/WEB-INF/views/protocolvalues/show.jspx
deleted file mode 100755
index f526ed728..000000000
--- a/src/main/webapp/WEB-INF/views/protocolvalues/show.jspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ProtocolValue" object="${protocolvalue}" path="/protocolvalues" z="SI5QPEdHj9LjS30jjohrhkyOAYA=">
-        <field:display field="stringValue" id="s_com_labsynch_labseer_domain_ProtocolValue_stringValue" object="${protocolvalue}" z="oA41ZNEG8r1M3Jh2e9Wtd4s64Dk="/>
-        <field:display field="fileValue" id="s_com_labsynch_labseer_domain_ProtocolValue_fileValue" object="${protocolvalue}" z="He49karlmJw9yqHPQDOaaniYtRw="/>
-        <field:display field="urlValue" id="s_com_labsynch_labseer_domain_ProtocolValue_urlValue" object="${protocolvalue}" z="iwTwI7b4zrTHP50Ht1yv3eVZBos="/>
-        <field:display date="true" dateTimePattern="${protocolValue_datevalue_date_format}" field="dateValue" id="s_com_labsynch_labseer_domain_ProtocolValue_dateValue" object="${protocolvalue}" z="/9HIqhCRqQj4FBU4PsNLCnPwp4g="/>
-        <field:display field="clobValue" id="s_com_labsynch_labseer_domain_ProtocolValue_clobValue" object="${protocolvalue}" z="ylLp59ZdlJAwj1hwhpaenI1xsb8="/>
-        <field:display field="blobValue" id="s_com_labsynch_labseer_domain_ProtocolValue_blobValue" object="${protocolvalue}" z="yHd3t6qfN5Iv4a8Jg0y3rgNEd0M="/>
-        <field:display field="sigFigs" id="s_com_labsynch_labseer_domain_ProtocolValue_sigFigs" object="${protocolvalue}" z="MjoO+7ydNQO84CDH8SGFqtvZg08="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_ProtocolValue_comments" object="${protocolvalue}" z="M4Aq5z1xIlp7BacMcc5/EMS5Xq8="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ProtocolValue_ignored" object="${protocolvalue}" z="2gl/PV3YLCBAOo5ur87Vhe6Wq0A="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_ProtocolValue_lsTransaction" object="${protocolvalue}" z="YkCAaxEfqAojL51BQiAnRlbunco="/>
-        <field:display date="true" dateTimePattern="${protocolValue_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_ProtocolValue_recordedDate" object="${protocolvalue}" z="1WKYNBv0cEk1gj1NZgoCx5VOTA0="/>
-        <field:display date="true" dateTimePattern="${protocolValue_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_ProtocolValue_modifiedDate" object="${protocolvalue}" z="Ho5d8CQt7O/+B1CMUM6a2h8tZzY="/>
-        <field:display field="publicData" id="s_com_labsynch_labseer_domain_ProtocolValue_publicData" object="${protocolvalue}" z="bAIGEL2hYnPvUmZ1jPrGzxxZKrQ="/>
-        <field:display field="codeValue" id="s_com_labsynch_labseer_domain_ProtocolValue_codeValue" object="${protocolvalue}" z="9fuyhURrqdHT5UMzIKPziNB97A4="/>
-        <field:display field="numberOfReplicates" id="s_com_labsynch_labseer_domain_ProtocolValue_numberOfReplicates" object="${protocolvalue}" z="cNmMSaaF115jB6vHqcfsNW1mUwM="/>
-        <field:display field="uncertaintyType" id="s_com_labsynch_labseer_domain_ProtocolValue_uncertaintyType" object="${protocolvalue}" z="K/Hj9hJWwMQxmiBTOgmgnjfJL3U="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ProtocolValue_lsType" object="${protocolvalue}" z="xAuW5p2mMVEJtj7S+dFQyOD1a/k="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_ProtocolValue_lsKind" object="${protocolvalue}" z="LpeudBkDrClqpKEmngpbn4Qi++U="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ProtocolValue_lsTypeAndKind" object="${protocolvalue}" z="DCCE/qO+2TUhqJXhUfhW5xfMFkM="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_ProtocolValue_recordedBy" object="${protocolvalue}" z="dqNQbOYGHBOzZQXhMA7GLb+ZIo4="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_ProtocolValue_modifiedBy" object="${protocolvalue}" z="IGCK14GPZgTH7MHoyXEHmB0RHEI="/>
-        <field:display field="lsState" id="s_com_labsynch_labseer_domain_ProtocolValue_lsState" object="${protocolvalue}" z="Nb5GXKIzKoDck0QsV0IRwPLVoYY="/>
-        <field:display field="operatorType" id="s_com_labsynch_labseer_domain_ProtocolValue_operatorType" object="${protocolvalue}" z="e522qGTYeXwtQUhtdYRrO2HxpYM="/>
-        <field:display field="operatorKind" id="s_com_labsynch_labseer_domain_ProtocolValue_operatorKind" object="${protocolvalue}" z="vRYGtXgbaXJKOPr9aV+/oKj0fig="/>
-        <field:display field="operatorTypeAndKind" id="s_com_labsynch_labseer_domain_ProtocolValue_operatorTypeAndKind" object="${protocolvalue}" z="Ueh+ycrv4VTYt6/qUQ3h3UV8m5k="/>
-        <field:display field="unitType" id="s_com_labsynch_labseer_domain_ProtocolValue_unitType" object="${protocolvalue}" z="vztukoiQouizlm7i1Frsgh2XL9A="/>
-        <field:display field="unitKind" id="s_com_labsynch_labseer_domain_ProtocolValue_unitKind" object="${protocolvalue}" z="phevwSKV9zStiu5c42rj3IHA6ME="/>
-        <field:display field="unitTypeAndKind" id="s_com_labsynch_labseer_domain_ProtocolValue_unitTypeAndKind" object="${protocolvalue}" z="yHfPhr1nOIV8kOgcVOqWtZ/dBU4="/>
-        <field:display field="numericValue" id="s_com_labsynch_labseer_domain_ProtocolValue_numericValue" object="${protocolvalue}" z="19AYB/ez0k6VMTVmc5whKOt9k2Q="/>
-        <field:display field="codeType" id="s_com_labsynch_labseer_domain_ProtocolValue_codeType" object="${protocolvalue}" z="Sb34Ljvc34k8vxVXqIaslfWnVgU="/>
-        <field:display field="codeKind" id="s_com_labsynch_labseer_domain_ProtocolValue_codeKind" object="${protocolvalue}" z="lYTd6sm70NyXeYLtruL1LliZgWs="/>
-        <field:display field="codeTypeAndKind" id="s_com_labsynch_labseer_domain_ProtocolValue_codeTypeAndKind" object="${protocolvalue}" z="ed/ZQt+bZGqHB3BNSHtAmmjfWxE="/>
-        <field:display field="uncertainty" id="s_com_labsynch_labseer_domain_ProtocolValue_uncertainty" object="${protocolvalue}" z="3p4Zp05pSxlRQ+M58/WE7xgGp/4="/>
-        <field:display field="codeOrigin" id="s_com_labsynch_labseer_domain_ProtocolValue_codeOrigin" object="${protocolvalue}" z="Q3X1xsz3PIifM5zhRgh9wzqE/k8="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_ProtocolValue_deleted" object="${protocolvalue}" z="tC94hBysumx2uRELRJwBsEmFLck="/>
-        <field:display field="concentration" id="s_com_labsynch_labseer_domain_ProtocolValue_concentration" object="${protocolvalue}" z="N51QvjQmNx4AJ3GV7bM0yoPspTo="/>
-        <field:display field="concUnit" id="s_com_labsynch_labseer_domain_ProtocolValue_concUnit" object="${protocolvalue}" z="AGkFVBaZa3LEC7N3syhZGoTtgEw="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocolvalues/update.jspx b/src/main/webapp/WEB-INF/views/protocolvalues/update.jspx
deleted file mode 100755
index 1aa58824d..000000000
--- a/src/main/webapp/WEB-INF/views/protocolvalues/update.jspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ProtocolValue" modelAttribute="protocolValue" path="/protocolvalues" versionField="Version" z="sDou72PIoAE5ZHDoITjXpAuQ+Lk=">
-        <field:textarea field="stringValue" id="c_com_labsynch_labseer_domain_ProtocolValue_stringValue" z="1O15e7plpbpzeIRku6tyVMgSixU="/>
-        <field:textarea field="fileValue" id="c_com_labsynch_labseer_domain_ProtocolValue_fileValue" z="08bjznZhYGxkD8Tvk1FdTBNSy8w="/>
-        <field:textarea field="urlValue" id="c_com_labsynch_labseer_domain_ProtocolValue_urlValue" z="zMix6lJrswVwVmqxsLsChRMEg6o="/>
-        <field:datetime dateTimePattern="${protocolValue_datevalue_date_format}" field="dateValue" id="c_com_labsynch_labseer_domain_ProtocolValue_dateValue" z="FcqDPao5rDKmgolyalb7AGiCCLM="/>
-        <field:input field="clobValue" id="c_com_labsynch_labseer_domain_ProtocolValue_clobValue" z="bQx1BE7jLLCvtFtqBtgb+jtJiA8="/>
-        <field:input field="blobValue" id="c_com_labsynch_labseer_domain_ProtocolValue_blobValue" z="HRLOEMfeW/dbdqt1pKgfD0bTWb8="/>
-        <field:input field="sigFigs" id="c_com_labsynch_labseer_domain_ProtocolValue_sigFigs" validationMessageCode="field_invalid_integer" z="Ixe5dC4PYANKcrOIWU99y5EfSTA="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_ProtocolValue_comments" z="kQegVDC7lFr/wGNbcYzoZRHmZzc="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ProtocolValue_ignored" z="V/LIGlTmvcXqecGv9+1RRd/ULuo="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ProtocolValue_lsTransaction" validationMessageCode="field_invalid_integer" z="8FW0Qf3sGN/GMINPeGsIsQ1hZBM="/>
-        <field:datetime dateTimePattern="${protocolValue_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ProtocolValue_recordedDate" required="true" z="5mqLKfFhBsL7xrDn/lmsuum046E="/>
-        <field:datetime dateTimePattern="${protocolValue_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ProtocolValue_modifiedDate" z="/Idih2o4WqnNWRQp7e/aqTXPqpw="/>
-        <field:checkbox field="publicData" id="c_com_labsynch_labseer_domain_ProtocolValue_publicData" z="LgZXH92WjhZU1L6LdzDJpdZWG0g="/>
-        <field:textarea field="codeValue" id="c_com_labsynch_labseer_domain_ProtocolValue_codeValue" z="Pb9tALlqBtKjLcjjhhDm5ujDu2E="/>
-        <field:input field="numberOfReplicates" id="c_com_labsynch_labseer_domain_ProtocolValue_numberOfReplicates" validationMessageCode="field_invalid_integer" z="m3AuaIgrQS6U///qd+sCtNG+0NA="/>
-        <field:textarea field="uncertaintyType" id="c_com_labsynch_labseer_domain_ProtocolValue_uncertaintyType" z="y6iulY3sMitYYNUAx0+4BtfzB70="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_ProtocolValue_lsType" required="true" z="ppbTnjF+ohy8B27et7ntfzrpXyg="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_ProtocolValue_lsKind" required="true" z="743uiZwiHmuv0dIfWs+X5AlnApU="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ProtocolValue_lsTypeAndKind" z="hzzqCIfhngMYPlWMMCcCJZni6Ow="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ProtocolValue_recordedBy" required="true" z="mSlnwuFJ7vuQf+QO0MDdteo8FsE="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ProtocolValue_modifiedBy" z="EzP1JpUkt659WwmDxBvrJHLb4Ls="/>
-        <field:select field="lsState" id="c_com_labsynch_labseer_domain_ProtocolValue_lsState" itemValue="id" items="${protocolstates}" path="/protocolstates" required="true" z="/BWvpkmaA/a69Fp+LL1vozZ418A="/>
-        <field:input field="operatorType" id="c_com_labsynch_labseer_domain_ProtocolValue_operatorType" max="25" z="pKA3kM2uD8a1nAdFf9a1nOY+YtA="/>
-        <field:input field="operatorKind" id="c_com_labsynch_labseer_domain_ProtocolValue_operatorKind" max="10" z="b/ljGi+BHwsgPepx9yYaym9eiDI="/>
-        <field:textarea field="operatorTypeAndKind" id="c_com_labsynch_labseer_domain_ProtocolValue_operatorTypeAndKind" z="jdnJBN+dH6ebDOU++lykdl6Fslc="/>
-        <field:input field="unitType" id="c_com_labsynch_labseer_domain_ProtocolValue_unitType" max="25" z="2XFyzb1p+gzIJpr4KttkH/uiLvI="/>
-        <field:input field="unitKind" id="c_com_labsynch_labseer_domain_ProtocolValue_unitKind" max="25" z="HWU2iyn/t/KOawY+8/Q+JIjxTaI="/>
-        <field:textarea field="unitTypeAndKind" id="c_com_labsynch_labseer_domain_ProtocolValue_unitTypeAndKind" z="pmvoWLw02IW9AZZQsicBcMgfB9k="/>
-        <field:input field="numericValue" id="c_com_labsynch_labseer_domain_ProtocolValue_numericValue" validationMessageCode="field_invalid_number" z="oBmH1Wz5Geqejhpo1D+zEey+Uac="/>
-        <field:textarea field="codeType" id="c_com_labsynch_labseer_domain_ProtocolValue_codeType" z="Loqo09USLp1nYjBOhGx13SsHUTk="/>
-        <field:textarea field="codeKind" id="c_com_labsynch_labseer_domain_ProtocolValue_codeKind" z="LW4tXHUV1WDjgEFtHTPw8e6i9Ho="/>
-        <field:textarea field="codeTypeAndKind" id="c_com_labsynch_labseer_domain_ProtocolValue_codeTypeAndKind" z="xsqysATV5TBfH3LC1W3HxSkd4+U="/>
-        <field:input field="uncertainty" id="c_com_labsynch_labseer_domain_ProtocolValue_uncertainty" validationMessageCode="field_invalid_number" z="N3VmuQgokgbDSvQzYAne2ydP5yg="/>
-        <field:textarea field="codeOrigin" id="c_com_labsynch_labseer_domain_ProtocolValue_codeOrigin" z="3Mh85tgYst8bdlk2VgceRkaOgRg="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_ProtocolValue_deleted" z="GvU3HjUEMP8o9r2+N2GCdw/hZgs="/>
-        <field:input field="concentration" id="c_com_labsynch_labseer_domain_ProtocolValue_concentration" validationMessageCode="field_invalid_number" z="wVQWublt6phaAul+CMfKPs0CA90="/>
-        <field:input field="concUnit" id="c_com_labsynch_labseer_domain_ProtocolValue_concUnit" max="25" z="auT61MDp/M0vhmZOYg4hEHfnBDo="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/protocolvalues/views.xml b/src/main/webapp/WEB-INF/views/protocolvalues/views.xml
deleted file mode 100755
index 6bc749890..000000000
--- a/src/main/webapp/WEB-INF/views/protocolvalues/views.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="protocolvalues/list">
-        <put-attribute name="body" value="/WEB-INF/views/protocolvalues/list.jspx"/>
-    </definition>
-<definition extends="default" name="protocolvalues/show">
-        <put-attribute name="body" value="/WEB-INF/views/protocolvalues/show.jspx"/>
-    </definition>
-<definition extends="default" name="protocolvalues/create">
-        <put-attribute name="body" value="/WEB-INF/views/protocolvalues/create.jspx"/>
-    </definition>
-<definition extends="default" name="protocolvalues/update">
-        <put-attribute name="body" value="/WEB-INF/views/protocolvalues/update.jspx"/>
-    </definition>
-<definition extends="default" name="protocolvalues/findProtocolValuesByLsState">
-        <put-attribute name="body" value="/WEB-INF/views/protocolvalues/findProtocolValuesByLsState.jspx"/>
-    </definition>
-<definition extends="default" name="protocolvalues/findProtocolValuesByLsTransactionEquals">
-        <put-attribute name="body" value="/WEB-INF/views/protocolvalues/findProtocolValuesByLsTransactionEquals.jspx"/>
-    </definition>
-<definition extends="default" name="protocolvalues/findProtocolValuesByLsKindEqualsAndCodeValueLike">
-        <put-attribute name="body" value="/WEB-INF/views/protocolvalues/findProtocolValuesByLsKindEqualsAndCodeValueLike.jspx"/>
-    </definition>
-<definition extends="default" name="protocolvalues/findProtocolValuesByLsKindEqualsAndDateValueLike">
-        <put-attribute name="body" value="/WEB-INF/views/protocolvalues/findProtocolValuesByLsKindEqualsAndDateValueLike.jspx"/>
-    </definition>
-<definition extends="default" name="protocolvalues/findProtocolValuesByLsKindEqualsAndStringValueLike">
-        <put-attribute name="body" value="/WEB-INF/views/protocolvalues/findProtocolValuesByLsKindEqualsAndStringValueLike.jspx"/>
-    </definition>
-<definition extends="default" name="protocolvalues/findProtocolValuesByLsKindEqualsAndDateValueEquals">
-        <put-attribute name="body" value="/WEB-INF/views/protocolvalues/findProtocolValuesByLsKindEqualsAndDateValueEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/puritymeasuredbys/create.jspx b/src/main/webapp/WEB-INF/views/puritymeasuredbys/create.jspx
deleted file mode 100644
index 98c688c23..000000000
--- a/src/main/webapp/WEB-INF/views/puritymeasuredbys/create.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_PurityMeasuredBy" modelAttribute="purityMeasuredBy" path="/puritymeasuredbys" render="${empty dependencies}" z="QShIhv4pvWa3JX2bwNXNiahOuqU=">
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_PurityMeasuredBy_name" z="GscDHFzEK8BI0coWw3uVhZMZq7I="/>
-        <field:textarea field="code" id="c_com_labsynch_labseer_domain_PurityMeasuredBy_code" z="FjXSaTFtOpTEkwti2JxU9Ikv3Ww="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_PurityMeasuredBy" render="${not empty dependencies}" z="SDb31O0hMm6wlQYMEmFmSg7n4Nk="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/puritymeasuredbys/findPurityMeasuredBysByCodeEquals.jspx b/src/main/webapp/WEB-INF/views/puritymeasuredbys/findPurityMeasuredBysByCodeEquals.jspx
deleted file mode 100644
index ec0e0e0ed..000000000
--- a/src/main/webapp/WEB-INF/views/puritymeasuredbys/findPurityMeasuredBysByCodeEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeEquals" id="ff_com_labsynch_labseer_domain_PurityMeasuredBy" path="/puritymeasuredbys" z="xEfF4G/N37Fy/YTZnHHei68aZaY=">
-        <field:input disableFormBinding="true" field="code" id="f_com_labsynch_labseer_domain_PurityMeasuredBy_code" max="255" required="true" z="tCHJXL1N2rPK6861fiN+kFrfAPE="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/puritymeasuredbys/findPurityMeasuredBysByNameEquals.jspx b/src/main/webapp/WEB-INF/views/puritymeasuredbys/findPurityMeasuredBysByNameEquals.jspx
deleted file mode 100644
index 84f9b2843..000000000
--- a/src/main/webapp/WEB-INF/views/puritymeasuredbys/findPurityMeasuredBysByNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByNameEquals" id="ff_com_labsynch_labseer_domain_PurityMeasuredBy" path="/puritymeasuredbys" z="spu2PWT/mwFCZ1q6358JadJQa8Y=">
-        <field:input disableFormBinding="true" field="name" id="f_com_labsynch_labseer_domain_PurityMeasuredBy_name" max="255" required="true" z="9sZ4zbWmpPWWVgiK/MV1Xy3o8QY="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/puritymeasuredbys/findPurityMeasuredBysByNameLike.jspx b/src/main/webapp/WEB-INF/views/puritymeasuredbys/findPurityMeasuredBysByNameLike.jspx
deleted file mode 100644
index f419930ec..000000000
--- a/src/main/webapp/WEB-INF/views/puritymeasuredbys/findPurityMeasuredBysByNameLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByNameLike" id="ff_com_labsynch_labseer_domain_PurityMeasuredBy" path="/puritymeasuredbys" z="mOprOcsQPEfIdePySaKUDwdMsHE=">
-        <field:input disableFormBinding="true" field="name" id="f_com_labsynch_labseer_domain_PurityMeasuredBy_name" max="255" required="true" z="9sZ4zbWmpPWWVgiK/MV1Xy3o8QY="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/puritymeasuredbys/list.jspx b/src/main/webapp/WEB-INF/views/puritymeasuredbys/list.jspx
deleted file mode 100644
index fda7d2574..000000000
--- a/src/main/webapp/WEB-INF/views/puritymeasuredbys/list.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_PurityMeasuredBy" items="${puritymeasuredbys}" z="JSMkWTUfPS6wDqhkzq13sSLGQoU=">
-        <table:table data="${puritymeasuredbys}" id="l_com_labsynch_labseer_domain_PurityMeasuredBy" path="/puritymeasuredbys" z="zO0zlRfez1MIgQt21NeCB6cWjhM=">
-            <table:column id="c_com_labsynch_labseer_domain_PurityMeasuredBy_name" property="name" z="MjVbCHn5F+bGdaSX3g2mff7nGP0="/>
-            <table:column id="c_com_labsynch_labseer_domain_PurityMeasuredBy_code" property="code" z="bLUxwj/CHlXfgzA+vFTwQCfXHT8="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/puritymeasuredbys/show.jspx b/src/main/webapp/WEB-INF/views/puritymeasuredbys/show.jspx
deleted file mode 100644
index 436c111f3..000000000
--- a/src/main/webapp/WEB-INF/views/puritymeasuredbys/show.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_PurityMeasuredBy" object="${puritymeasuredby}" path="/puritymeasuredbys" z="oskCRZOWuhp7Df4k3tzCQTTgEUk=">
-        <field:display field="name" id="s_com_labsynch_labseer_domain_PurityMeasuredBy_name" object="${puritymeasuredby}" z="cO52aoAIDb0yl7iAIp1omAE5b2k="/>
-        <field:display field="code" id="s_com_labsynch_labseer_domain_PurityMeasuredBy_code" object="${puritymeasuredby}" z="AKE21Nm+p6J0WZX24aO+hEIUM4g="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/puritymeasuredbys/update.jspx b/src/main/webapp/WEB-INF/views/puritymeasuredbys/update.jspx
deleted file mode 100644
index 9763467d3..000000000
--- a/src/main/webapp/WEB-INF/views/puritymeasuredbys/update.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_PurityMeasuredBy" modelAttribute="purityMeasuredBy" path="/puritymeasuredbys" versionField="Version" z="YaBRo6Z3M98+Vn6vO3y40uxtLn4=">
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_PurityMeasuredBy_name" z="GscDHFzEK8BI0coWw3uVhZMZq7I="/>
-        <field:textarea field="code" id="c_com_labsynch_labseer_domain_PurityMeasuredBy_code" z="FjXSaTFtOpTEkwti2JxU9Ikv3Ww="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/puritymeasuredbys/views.xml b/src/main/webapp/WEB-INF/views/puritymeasuredbys/views.xml
deleted file mode 100644
index 2f71d492c..000000000
--- a/src/main/webapp/WEB-INF/views/puritymeasuredbys/views.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="puritymeasuredbys/list">
-        <put-attribute name="body" value="/WEB-INF/views/puritymeasuredbys/list.jspx"/>
-    </definition>
-<definition extends="default" name="puritymeasuredbys/show">
-        <put-attribute name="body" value="/WEB-INF/views/puritymeasuredbys/show.jspx"/>
-    </definition>
-<definition extends="default" name="puritymeasuredbys/create">
-        <put-attribute name="body" value="/WEB-INF/views/puritymeasuredbys/create.jspx"/>
-    </definition>
-<definition extends="default" name="puritymeasuredbys/update">
-        <put-attribute name="body" value="/WEB-INF/views/puritymeasuredbys/update.jspx"/>
-    </definition>
-<definition extends="default" name="puritymeasuredbys/findPurityMeasuredBysByCodeEquals">
-        <put-attribute name="body" value="/WEB-INF/views/puritymeasuredbys/findPurityMeasuredBysByCodeEquals.jspx"/>
-    </definition>
-<definition extends="default" name="puritymeasuredbys/findPurityMeasuredBysByNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/puritymeasuredbys/findPurityMeasuredBysByNameEquals.jspx"/>
-    </definition>
-<definition extends="default" name="puritymeasuredbys/findPurityMeasuredBysByNameLike">
-        <put-attribute name="body" value="/WEB-INF/views/puritymeasuredbys/findPurityMeasuredBysByNameLike.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/resourceNotFound.jspx b/src/main/webapp/WEB-INF/views/resourceNotFound.jspx
deleted file mode 100755
index b3d27c763..000000000
--- a/src/main/webapp/WEB-INF/views/resourceNotFound.jspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:spring="http://www.springframework.org/tags" xmlns:util="urn:jsptagdir:/WEB-INF/tags/util" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-  <jsp:directive.page contentType="text/html;charset=UTF-8" />
-  <jsp:output omit-xml-declaration="yes" />
-  <spring:message var="title" code="error_resourcenotfound_title" htmlEscape="false" />
-  <util:panel id="title" title="${title}">
-    <h2>${fn:escapeXml(title)}</h2>
-    <p>
-      <spring:message code="error_resourcenotfound_problemdescription" />
-    </p>
-    <c:if test="${not empty exception}">
-      <p>
-        <h4>
-          <spring:message code="exception_details" />
-        </h4>
-        <spring:message var="message" code="exception_message" htmlEscape="false" />
-        <util:panel id="_message" title="${message}" openPane="false">
-          <c:out value="${exception.localizedMessage}" />
-        </util:panel>
-        <spring:message var="stacktrace" code="exception_stacktrace" htmlEscape="false" />
-        <util:panel id="_exception" title="${stacktrace}" openPane="false">
-          <c:forEach items="${exception.stackTrace}" var="trace">
-            <c:out value="${trace}" />
-            <br />
-          </c:forEach>
-        </util:panel>
-      </p>
-    </c:if>
-  </util:panel>
-</div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/rolekinds/create.jspx b/src/main/webapp/WEB-INF/views/rolekinds/create.jspx
deleted file mode 100644
index 175a1941f..000000000
--- a/src/main/webapp/WEB-INF/views/rolekinds/create.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_RoleKind" modelAttribute="roleKind" path="/rolekinds" render="${empty dependencies}" z="1QXVRa67IzxcIWctZeQSlNIKPtY=">
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_RoleKind_kindName" required="true" z="TVaSQasEHlgwS0PVRC0HU5QjkSY="/>
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_RoleKind_lsType" itemValue="id" items="${roletypes}" path="/roletypes" required="true" z="8SattWQV0cVgXAbOypS77l6Vksk="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_RoleKind_lsTypeAndKind" z="Gy+1FiOGTXugPAx49IAOVecoedo="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_RoleKind" render="${not empty dependencies}" z="C6MdwfOcF0Ue/HUQufMeAcZuKr4="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/rolekinds/findRoleKindsByKindNameEqualsAndLsType.jspx b/src/main/webapp/WEB-INF/views/rolekinds/findRoleKindsByKindNameEqualsAndLsType.jspx
deleted file mode 100644
index 56ed5ac4d..000000000
--- a/src/main/webapp/WEB-INF/views/rolekinds/findRoleKindsByKindNameEqualsAndLsType.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByKindNameEqualsAndLsType" id="ff_com_labsynch_labseer_domain_RoleKind" path="/rolekinds" z="gHdDnVymC+iv+lBsoXwa2ZvcX6g=">
-        <field:input disableFormBinding="true" field="kindName" id="f_com_labsynch_labseer_domain_RoleKind_kindName" max="255" required="true" z="//Ie9rGCHYrzY3kqbRNzazjJQz4="/>
-        <field:select disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_RoleKind_lsType" itemValue="id" items="${roletypes}" path="/roletypes" required="true" z="8dTFiKx3EeUEu4oRNZCdVbUXN7k="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/rolekinds/findRoleKindsByLsType.jspx b/src/main/webapp/WEB-INF/views/rolekinds/findRoleKindsByLsType.jspx
deleted file mode 100644
index 0e0863137..000000000
--- a/src/main/webapp/WEB-INF/views/rolekinds/findRoleKindsByLsType.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsType" id="ff_com_labsynch_labseer_domain_RoleKind" path="/rolekinds" z="UlbtARiUmSR7xZFE/SXJ4PY6GoQ=">
-        <field:select disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_RoleKind_lsType" itemValue="id" items="${roletypes}" path="/roletypes" required="true" z="8dTFiKx3EeUEu4oRNZCdVbUXN7k="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/rolekinds/list.jspx b/src/main/webapp/WEB-INF/views/rolekinds/list.jspx
deleted file mode 100644
index 51dd82c84..000000000
--- a/src/main/webapp/WEB-INF/views/rolekinds/list.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_RoleKind" items="${rolekinds}" z="mlGdLVaPrPi3DvlsJ0DGxkBDb7k=">
-        <table:table data="${rolekinds}" id="l_com_labsynch_labseer_domain_RoleKind" path="/rolekinds" z="ue8z4vm8cq6OfrbN1Cekpn8/ls4=">
-            <table:column id="c_com_labsynch_labseer_domain_RoleKind_kindName" property="kindName" z="SPqEbub83mBEmE700L14uUKtAoY="/>
-            <table:column id="c_com_labsynch_labseer_domain_RoleKind_lsType" property="lsType" z="tP1k791YSDCI+RUFJ6vQ8t69BK0="/>
-            <table:column id="c_com_labsynch_labseer_domain_RoleKind_lsTypeAndKind" property="lsTypeAndKind" z="YBabUJ7JU4G8bVnB7i4rD9ovon4="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/rolekinds/show.jspx b/src/main/webapp/WEB-INF/views/rolekinds/show.jspx
deleted file mode 100644
index 274204a1b..000000000
--- a/src/main/webapp/WEB-INF/views/rolekinds/show.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_RoleKind" object="${rolekind}" path="/rolekinds" z="qbfDOOLKyhVisOlwvdK6BicaMXM=">
-        <field:display field="kindName" id="s_com_labsynch_labseer_domain_RoleKind_kindName" object="${rolekind}" z="8ibI+MueIjZE0SvEcIqRbYcUIyQ="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_RoleKind_lsType" object="${rolekind}" z="t+mY28LRi8t4Mye+MUbJCcDBVJI="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_RoleKind_lsTypeAndKind" object="${rolekind}" z="m/qfrH3oWt+P0oMWDRnhcBmNvIU="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/rolekinds/update.jspx b/src/main/webapp/WEB-INF/views/rolekinds/update.jspx
deleted file mode 100644
index c8c3ec75e..000000000
--- a/src/main/webapp/WEB-INF/views/rolekinds/update.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_RoleKind" modelAttribute="roleKind" path="/rolekinds" versionField="Version" z="j9eJjZAjCNxppcHxC64yvbHYq1Q=">
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_RoleKind_kindName" required="true" z="TVaSQasEHlgwS0PVRC0HU5QjkSY="/>
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_RoleKind_lsType" itemValue="id" items="${roletypes}" path="/roletypes" required="true" z="8SattWQV0cVgXAbOypS77l6Vksk="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_RoleKind_lsTypeAndKind" z="Gy+1FiOGTXugPAx49IAOVecoedo="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/rolekinds/views.xml b/src/main/webapp/WEB-INF/views/rolekinds/views.xml
deleted file mode 100644
index 9f81c2d17..000000000
--- a/src/main/webapp/WEB-INF/views/rolekinds/views.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="rolekinds/list">
-        <put-attribute name="body" value="/WEB-INF/views/rolekinds/list.jspx"/>
-    </definition>
-<definition extends="default" name="rolekinds/show">
-        <put-attribute name="body" value="/WEB-INF/views/rolekinds/show.jspx"/>
-    </definition>
-<definition extends="default" name="rolekinds/create">
-        <put-attribute name="body" value="/WEB-INF/views/rolekinds/create.jspx"/>
-    </definition>
-<definition extends="default" name="rolekinds/update">
-        <put-attribute name="body" value="/WEB-INF/views/rolekinds/update.jspx"/>
-    </definition>
-<definition extends="default" name="rolekinds/findRoleKindsByKindNameEqualsAndLsType">
-        <put-attribute name="body" value="/WEB-INF/views/rolekinds/findRoleKindsByKindNameEqualsAndLsType.jspx"/>
-    </definition>
-<definition extends="default" name="rolekinds/findRoleKindsByLsType">
-        <put-attribute name="body" value="/WEB-INF/views/rolekinds/findRoleKindsByLsType.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/roletypes/create.jspx b/src/main/webapp/WEB-INF/views/roletypes/create.jspx
deleted file mode 100644
index 50e3b40e3..000000000
--- a/src/main/webapp/WEB-INF/views/roletypes/create.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_RoleType" modelAttribute="roleType" path="/roletypes" render="${empty dependencies}" z="lo6dLhfwibBPrKzzpYOhOkXN3Dk=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_RoleType_typeName" required="true" z="M7GN1vGZiqJuNqYsHfZ7XyYrylc="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_RoleType" render="${not empty dependencies}" z="sZhMkjia5m/6h0HXnzdthEUzpJ4="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/roletypes/findRoleTypesByTypeNameEquals.jspx b/src/main/webapp/WEB-INF/views/roletypes/findRoleTypesByTypeNameEquals.jspx
deleted file mode 100644
index af8e12204..000000000
--- a/src/main/webapp/WEB-INF/views/roletypes/findRoleTypesByTypeNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByTypeNameEquals" id="ff_com_labsynch_labseer_domain_RoleType" path="/roletypes" z="6i7eeSnY1IqSjkBB8cHmbFoLF4E=">
-        <field:input disableFormBinding="true" field="typeName" id="f_com_labsynch_labseer_domain_RoleType_typeName" max="128" required="true" z="UYv0JvdqW2aO2L4r2GdLDoQSm1M="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/roletypes/list.jspx b/src/main/webapp/WEB-INF/views/roletypes/list.jspx
deleted file mode 100644
index 13d50b54c..000000000
--- a/src/main/webapp/WEB-INF/views/roletypes/list.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_RoleType" items="${roletypes}" z="n9dbHR3tGwp37pqBcHPQHr9pIvo=">
-        <table:table data="${roletypes}" id="l_com_labsynch_labseer_domain_RoleType" path="/roletypes" z="GH2yoNPjywZnTZxRKABoflfsdto=">
-            <table:column id="c_com_labsynch_labseer_domain_RoleType_typeName" property="typeName" z="+3X93X3GrCuQj/SBMmLbZEcAA3s="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/roletypes/show.jspx b/src/main/webapp/WEB-INF/views/roletypes/show.jspx
deleted file mode 100644
index af1495ef7..000000000
--- a/src/main/webapp/WEB-INF/views/roletypes/show.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_RoleType" object="${roletype}" path="/roletypes" z="raBibjwHPMZoUIB70Hz624Ri4rM=">
-        <field:display field="typeName" id="s_com_labsynch_labseer_domain_RoleType_typeName" object="${roletype}" z="qVmGjGfY3HvkjpdQ3mxjDsLnBrU="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/roletypes/update.jspx b/src/main/webapp/WEB-INF/views/roletypes/update.jspx
deleted file mode 100644
index 66f914d37..000000000
--- a/src/main/webapp/WEB-INF/views/roletypes/update.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_RoleType" modelAttribute="roleType" path="/roletypes" versionField="Version" z="xYPZeHI75w3VREtjFaktEf5VF34=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_RoleType_typeName" required="true" z="M7GN1vGZiqJuNqYsHfZ7XyYrylc="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/roletypes/views.xml b/src/main/webapp/WEB-INF/views/roletypes/views.xml
deleted file mode 100644
index ae681d9d7..000000000
--- a/src/main/webapp/WEB-INF/views/roletypes/views.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="roletypes/list">
-        <put-attribute name="body" value="/WEB-INF/views/roletypes/list.jspx"/>
-    </definition>
-<definition extends="default" name="roletypes/show">
-        <put-attribute name="body" value="/WEB-INF/views/roletypes/show.jspx"/>
-    </definition>
-<definition extends="default" name="roletypes/create">
-        <put-attribute name="body" value="/WEB-INF/views/roletypes/create.jspx"/>
-    </definition>
-<definition extends="default" name="roletypes/update">
-        <put-attribute name="body" value="/WEB-INF/views/roletypes/update.jspx"/>
-    </definition>
-<definition extends="default" name="roletypes/findRoleTypesByTypeNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/roletypes/findRoleTypesByTypeNameEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/saltformaliases/create.jspx b/src/main/webapp/WEB-INF/views/saltformaliases/create.jspx
deleted file mode 100644
index 52df36e11..000000000
--- a/src/main/webapp/WEB-INF/views/saltformaliases/create.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_SaltFormAlias" modelAttribute="saltFormAlias" path="/saltformaliases" render="${empty dependencies}" z="zGtJNpS8erO9QEQkTY/of1GCOLc=">
-        <field:select field="saltForm" id="c_com_labsynch_labseer_domain_SaltFormAlias_saltForm" itemValue="id" items="${saltforms}" path="/saltforms" z="W2dHTFiWuGXpSSHvIoQ8qUZMHAI="/>
-        <field:input field="lsType" id="c_com_labsynch_labseer_domain_SaltFormAlias_lsType" z="h+Q3x7CgmgMBGN9CaDQb+nCdjlQ="/>
-        <field:input field="lsKind" id="c_com_labsynch_labseer_domain_SaltFormAlias_lsKind" z="68kf7JhjKENPb+uOwmg3QOV5nZY="/>
-        <field:input field="aliasName" id="c_com_labsynch_labseer_domain_SaltFormAlias_aliasName" z="ULP5FePNRtDkIwAqwESWrX8oP7k="/>
-        <field:checkbox field="preferred" id="c_com_labsynch_labseer_domain_SaltFormAlias_preferred" z="T3xhzWmWAUvEcZqaGfsUJ2IwvbY="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_SaltFormAlias_ignored" z="1qn0dCcuI1hrSmNr4mKM2qNnFLI="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_SaltFormAlias_deleted" z="Ij/l61YfkuXLxEuandYbRHpZH5I="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_SaltFormAlias" render="${not empty dependencies}" z="bUYHoDExrK4PjGUT/1LJb9sdR3k="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/saltformaliases/findSaltFormAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals.jspx b/src/main/webapp/WEB-INF/views/saltformaliases/findSaltFormAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals.jspx
deleted file mode 100644
index e77683ae6..000000000
--- a/src/main/webapp/WEB-INF/views/saltformaliases/findSaltFormAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals" id="ff_com_labsynch_labseer_domain_SaltFormAlias" path="/saltformaliases" z="f+f2YawH1SDiX4tSkue9ieJ1Toc=">
-        <field:input disableFormBinding="true" field="aliasName" id="f_com_labsynch_labseer_domain_SaltFormAlias_aliasName" required="true" z="5zlL9rFA4ixFpxsApbzTCvN0CZI="/>
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_SaltFormAlias_lsType" required="true" z="fdn0sFv9u+x3fqyemqQPWGGWvyA="/>
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_SaltFormAlias_lsKind" required="true" z="n66PAITOSYnAmXU5OE37/bO0XQo="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/saltformaliases/findSaltFormAliasesBySaltForm.jspx b/src/main/webapp/WEB-INF/views/saltformaliases/findSaltFormAliasesBySaltForm.jspx
deleted file mode 100644
index b5a34cbe6..000000000
--- a/src/main/webapp/WEB-INF/views/saltformaliases/findSaltFormAliasesBySaltForm.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="BySaltForm" id="ff_com_labsynch_labseer_domain_SaltFormAlias" path="/saltformaliases" z="pwmvVTl6vXhw2Ii+KR4Fqpm9jYg=">
-        <field:select disableFormBinding="true" field="saltForm" id="f_com_labsynch_labseer_domain_SaltFormAlias_saltForm" itemValue="id" items="${saltforms}" path="/saltforms" required="true" z="8SRwLvzQ86Cg48RDcy8iWcr9TRU="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/saltformaliases/list.jspx b/src/main/webapp/WEB-INF/views/saltformaliases/list.jspx
deleted file mode 100644
index 305b01576..000000000
--- a/src/main/webapp/WEB-INF/views/saltformaliases/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_SaltFormAlias" items="${saltformaliases}" z="H92h45K1qz5A2X7A0K3PFMLJuFk=">
-        <table:table data="${saltformaliases}" id="l_com_labsynch_labseer_domain_SaltFormAlias" path="/saltformaliases" z="zjckjcnsPqOzSQzwoIYKNiGiguQ=">
-            <table:column id="c_com_labsynch_labseer_domain_SaltFormAlias_saltForm" property="saltForm" z="azEL7McXBOVn8OGOB0G0+pteN0M="/>
-            <table:column id="c_com_labsynch_labseer_domain_SaltFormAlias_lsType" property="lsType" z="E6N/k5a90HtPB9Ll88lhjvnz5oM="/>
-            <table:column id="c_com_labsynch_labseer_domain_SaltFormAlias_lsKind" property="lsKind" z="c//IPPOdFrmGE/OAMKxKx5TPu74="/>
-            <table:column id="c_com_labsynch_labseer_domain_SaltFormAlias_aliasName" property="aliasName" z="om65oFZP30n6pJNlYYGefVzASR0="/>
-            <table:column id="c_com_labsynch_labseer_domain_SaltFormAlias_preferred" property="preferred" z="mKpu+4FZK63yGSiTvNsBvQZ+CQo="/>
-            <table:column id="c_com_labsynch_labseer_domain_SaltFormAlias_ignored" property="ignored" z="yU9zZp2/HbBUZT86e3sodA9MAJ4="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/saltformaliases/show.jspx b/src/main/webapp/WEB-INF/views/saltformaliases/show.jspx
deleted file mode 100644
index 86db812fd..000000000
--- a/src/main/webapp/WEB-INF/views/saltformaliases/show.jspx
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_SaltFormAlias" object="${saltformalias}" path="/saltformaliases" z="4x+0x8pRGoxfSwotb5b1euvfV30=">
-        <field:display field="saltForm" id="s_com_labsynch_labseer_domain_SaltFormAlias_saltForm" object="${saltformalias}" z="F/vTjk++TrR9I+2oNkESXftajB8="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_SaltFormAlias_lsType" object="${saltformalias}" z="M3dwXinfhMCrUG8DfoV7K5pMb8Y="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_SaltFormAlias_lsKind" object="${saltformalias}" z="lp0sSfKETm3aYTdgiTZk9APh9/k="/>
-        <field:display field="aliasName" id="s_com_labsynch_labseer_domain_SaltFormAlias_aliasName" object="${saltformalias}" z="3MOW2nkyyog130oh6EI41XQzOWs="/>
-        <field:display field="preferred" id="s_com_labsynch_labseer_domain_SaltFormAlias_preferred" object="${saltformalias}" z="QbjymEkkWEkmmBUA780dL97ys6c="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_SaltFormAlias_ignored" object="${saltformalias}" z="AGF6ngDy4QrGdR4pQRAzY8a9nVQ="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_SaltFormAlias_deleted" object="${saltformalias}" z="EinBIjECKpN4/rIM//edqCeHTeQ="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/saltformaliases/update.jspx b/src/main/webapp/WEB-INF/views/saltformaliases/update.jspx
deleted file mode 100644
index f7302cfd0..000000000
--- a/src/main/webapp/WEB-INF/views/saltformaliases/update.jspx
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_SaltFormAlias" modelAttribute="saltFormAlias" path="/saltformaliases" versionField="Version" z="FJug3iMBuMjlaFPqdBCzcqx766A=">
-        <field:select field="saltForm" id="c_com_labsynch_labseer_domain_SaltFormAlias_saltForm" itemValue="id" items="${saltforms}" path="/saltforms" z="W2dHTFiWuGXpSSHvIoQ8qUZMHAI="/>
-        <field:input field="lsType" id="c_com_labsynch_labseer_domain_SaltFormAlias_lsType" z="h+Q3x7CgmgMBGN9CaDQb+nCdjlQ="/>
-        <field:input field="lsKind" id="c_com_labsynch_labseer_domain_SaltFormAlias_lsKind" z="68kf7JhjKENPb+uOwmg3QOV5nZY="/>
-        <field:input field="aliasName" id="c_com_labsynch_labseer_domain_SaltFormAlias_aliasName" z="ULP5FePNRtDkIwAqwESWrX8oP7k="/>
-        <field:checkbox field="preferred" id="c_com_labsynch_labseer_domain_SaltFormAlias_preferred" z="T3xhzWmWAUvEcZqaGfsUJ2IwvbY="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_SaltFormAlias_ignored" z="1qn0dCcuI1hrSmNr4mKM2qNnFLI="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_SaltFormAlias_deleted" z="Ij/l61YfkuXLxEuandYbRHpZH5I="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/saltformaliases/views.xml b/src/main/webapp/WEB-INF/views/saltformaliases/views.xml
deleted file mode 100644
index a189f00fb..000000000
--- a/src/main/webapp/WEB-INF/views/saltformaliases/views.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="saltformaliases/list">
-        <put-attribute name="body" value="/WEB-INF/views/saltformaliases/list.jspx"/>
-    </definition>
-<definition extends="default" name="saltformaliases/show">
-        <put-attribute name="body" value="/WEB-INF/views/saltformaliases/show.jspx"/>
-    </definition>
-<definition extends="default" name="saltformaliases/create">
-        <put-attribute name="body" value="/WEB-INF/views/saltformaliases/create.jspx"/>
-    </definition>
-<definition extends="default" name="saltformaliases/update">
-        <put-attribute name="body" value="/WEB-INF/views/saltformaliases/update.jspx"/>
-    </definition>
-<definition extends="default" name="saltformaliases/findSaltFormAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/saltformaliases/findSaltFormAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals.jspx"/>
-    </definition>
-<definition extends="default" name="saltformaliases/findSaltFormAliasesBySaltForm">
-        <put-attribute name="body" value="/WEB-INF/views/saltformaliases/findSaltFormAliasesBySaltForm.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/saltformaliaskinds/create.jspx b/src/main/webapp/WEB-INF/views/saltformaliaskinds/create.jspx
deleted file mode 100644
index 9360cdf32..000000000
--- a/src/main/webapp/WEB-INF/views/saltformaliaskinds/create.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_SaltFormAliasKind" modelAttribute="saltFormAliasKind" path="/saltformaliaskinds" render="${empty dependencies}" z="rg6Ukb88NUKz+wG5Z2lisK4Bxq0=">
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_SaltFormAliasKind_lsType" itemValue="id" items="${saltformaliastypes}" path="/saltformaliastypes" required="true" z="Ml4g4t7+L7wUisxgy1Kmzl6jle8="/>
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_SaltFormAliasKind_kindName" z="CNl3l2kiaLJ2B9CbxaBZvJ4Qd3A="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_SaltFormAliasKind" render="${not empty dependencies}" z="Wl1JCfEkPSBeasK+l++1Wj1xEX8="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/saltformaliaskinds/list.jspx b/src/main/webapp/WEB-INF/views/saltformaliaskinds/list.jspx
deleted file mode 100644
index b67a409f1..000000000
--- a/src/main/webapp/WEB-INF/views/saltformaliaskinds/list.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_SaltFormAliasKind" items="${saltformaliaskinds}" z="7t/F7GCy2UuGIy4OCj3U2DWGik4=">
-        <table:table data="${saltformaliaskinds}" id="l_com_labsynch_labseer_domain_SaltFormAliasKind" path="/saltformaliaskinds" z="HyTsOI8tLTyR+D1WK5zPVT6G/6I=">
-            <table:column id="c_com_labsynch_labseer_domain_SaltFormAliasKind_lsType" property="lsType" z="LSvGM9B//LVN1IJMpuZhdv0rW1Q="/>
-            <table:column id="c_com_labsynch_labseer_domain_SaltFormAliasKind_kindName" property="kindName" z="Lyl/sj2EIEu9R6zjL2NhmFnDvjA="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/saltformaliaskinds/show.jspx b/src/main/webapp/WEB-INF/views/saltformaliaskinds/show.jspx
deleted file mode 100644
index 3b2a3ce08..000000000
--- a/src/main/webapp/WEB-INF/views/saltformaliaskinds/show.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_SaltFormAliasKind" object="${saltformaliaskind}" path="/saltformaliaskinds" z="OUqesqkqHEt83Pp3IU+iDVm4qh0=">
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_SaltFormAliasKind_lsType" object="${saltformaliaskind}" z="ozb73rhpae4f9SBR+DKO+VCvUyE="/>
-        <field:display field="kindName" id="s_com_labsynch_labseer_domain_SaltFormAliasKind_kindName" object="${saltformaliaskind}" z="TOnkTsPXfqrt25d7xz63Da4V/Xc="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/saltformaliaskinds/update.jspx b/src/main/webapp/WEB-INF/views/saltformaliaskinds/update.jspx
deleted file mode 100644
index a5dca88b3..000000000
--- a/src/main/webapp/WEB-INF/views/saltformaliaskinds/update.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_SaltFormAliasKind" modelAttribute="saltFormAliasKind" path="/saltformaliaskinds" versionField="Version" z="SzhsdSHGuzlGz8SMHSeUEYbOVtc=">
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_SaltFormAliasKind_lsType" itemValue="id" items="${saltformaliastypes}" path="/saltformaliastypes" required="true" z="Ml4g4t7+L7wUisxgy1Kmzl6jle8="/>
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_SaltFormAliasKind_kindName" z="CNl3l2kiaLJ2B9CbxaBZvJ4Qd3A="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/saltformaliaskinds/views.xml b/src/main/webapp/WEB-INF/views/saltformaliaskinds/views.xml
deleted file mode 100644
index 851889071..000000000
--- a/src/main/webapp/WEB-INF/views/saltformaliaskinds/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="saltformaliaskinds/list">
-        <put-attribute name="body" value="/WEB-INF/views/saltformaliaskinds/list.jspx"/>
-    </definition>
-<definition extends="default" name="saltformaliaskinds/show">
-        <put-attribute name="body" value="/WEB-INF/views/saltformaliaskinds/show.jspx"/>
-    </definition>
-<definition extends="default" name="saltformaliaskinds/create">
-        <put-attribute name="body" value="/WEB-INF/views/saltformaliaskinds/create.jspx"/>
-    </definition>
-<definition extends="default" name="saltformaliaskinds/update">
-        <put-attribute name="body" value="/WEB-INF/views/saltformaliaskinds/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/saltformaliastypes/create.jspx b/src/main/webapp/WEB-INF/views/saltformaliastypes/create.jspx
deleted file mode 100644
index d59705355..000000000
--- a/src/main/webapp/WEB-INF/views/saltformaliastypes/create.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_SaltFormAliasType" modelAttribute="saltFormAliasType" path="/saltformaliastypes" render="${empty dependencies}" z="kKMVS8qICXqvjH3VrvCTkKrveA0=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_SaltFormAliasType_typeName" z="pDhH12zF5uoq4OiNmyS+u3aTMsA="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_SaltFormAliasType" render="${not empty dependencies}" z="xiih2E7pZ//Sq9rptHYUaStHUcY="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/saltformaliastypes/list.jspx b/src/main/webapp/WEB-INF/views/saltformaliastypes/list.jspx
deleted file mode 100644
index 8f8d73d1c..000000000
--- a/src/main/webapp/WEB-INF/views/saltformaliastypes/list.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_SaltFormAliasType" items="${saltformaliastypes}" z="jKtaidlAhZ7ImqIY60nihqMoX50=">
-        <table:table data="${saltformaliastypes}" id="l_com_labsynch_labseer_domain_SaltFormAliasType" path="/saltformaliastypes" z="Z1KlVa9N3nnbo78HN2P9ENKswYY=">
-            <table:column id="c_com_labsynch_labseer_domain_SaltFormAliasType_typeName" property="typeName" z="wSNSg4IGWWIlX9a2idQcusPmVe4="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/saltformaliastypes/show.jspx b/src/main/webapp/WEB-INF/views/saltformaliastypes/show.jspx
deleted file mode 100644
index a5b53327d..000000000
--- a/src/main/webapp/WEB-INF/views/saltformaliastypes/show.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_SaltFormAliasType" object="${saltformaliastype}" path="/saltformaliastypes" z="YWZxxeMpD08wyWAn3yZYJuocpz4=">
-        <field:display field="typeName" id="s_com_labsynch_labseer_domain_SaltFormAliasType_typeName" object="${saltformaliastype}" z="vH8wx2V3VSkZfe2zrJkXLrtRSGM="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/saltformaliastypes/update.jspx b/src/main/webapp/WEB-INF/views/saltformaliastypes/update.jspx
deleted file mode 100644
index 604fd097d..000000000
--- a/src/main/webapp/WEB-INF/views/saltformaliastypes/update.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_SaltFormAliasType" modelAttribute="saltFormAliasType" path="/saltformaliastypes" versionField="Version" z="8T1ra9iLs//qoxIV3mGiBV5dnow=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_SaltFormAliasType_typeName" z="pDhH12zF5uoq4OiNmyS+u3aTMsA="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/saltformaliastypes/views.xml b/src/main/webapp/WEB-INF/views/saltformaliastypes/views.xml
deleted file mode 100644
index 9610cbcef..000000000
--- a/src/main/webapp/WEB-INF/views/saltformaliastypes/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="saltformaliastypes/list">
-        <put-attribute name="body" value="/WEB-INF/views/saltformaliastypes/list.jspx"/>
-    </definition>
-<definition extends="default" name="saltformaliastypes/show">
-        <put-attribute name="body" value="/WEB-INF/views/saltformaliastypes/show.jspx"/>
-    </definition>
-<definition extends="default" name="saltformaliastypes/create">
-        <put-attribute name="body" value="/WEB-INF/views/saltformaliastypes/create.jspx"/>
-    </definition>
-<definition extends="default" name="saltformaliastypes/update">
-        <put-attribute name="body" value="/WEB-INF/views/saltformaliastypes/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/saltforms/create.jspx b/src/main/webapp/WEB-INF/views/saltforms/create.jspx
deleted file mode 100644
index edf57038a..000000000
--- a/src/main/webapp/WEB-INF/views/saltforms/create.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_SaltForm" modelAttribute="saltForm" path="/saltforms" render="${empty dependencies}" z="isZLytqiQm0Ib+55Gz1KYX8P6vM=">
-        <field:input field="molStructure" id="c_com_labsynch_labseer_domain_SaltForm_molStructure" z="Q1NA0s1q1IYL5E/5ZXvyyWX4bsU="/>
-        <field:textarea field="corpName" id="c_com_labsynch_labseer_domain_SaltForm_corpName" z="0UD/r5u0saZr2CyDQ4SZKNyZRrY="/>
-        <field:textarea field="casNumber" id="c_com_labsynch_labseer_domain_SaltForm_casNumber" z="hLSxVDuLLrWTUoDy2F7UhV5I5Wo="/>
-        <field:datetime dateTimePattern="${saltForm_registrationdate_date_format}" field="registrationDate" id="c_com_labsynch_labseer_domain_SaltForm_registrationDate" z="aOjHpsFkRGoWIQXJqgcD2lXMwno="/>
-        <field:input field="CdId" id="c_com_labsynch_labseer_domain_SaltForm_CdId" z="CoYKeR3raFvzOUBdpyK7dhoL3ws="/>
-        <field:checkbox field="ignore" id="c_com_labsynch_labseer_domain_SaltForm_ignore" z="XJSa7lhkVUrWhxl4aggsO+TKGNk="/>
-        <field:input field="saltWeight" id="c_com_labsynch_labseer_domain_SaltForm_saltWeight" validationMessageCode="field_invalid_number" z="r+8alJhdE4EaWAN6bCiNY+AltX0="/>
-        <field:select field="parent" id="c_com_labsynch_labseer_domain_SaltForm_parent" itemValue="id" items="${parents}" path="/parents" z="qvLiGjZYXKM2TzFrGFLbjtLBqR0="/>
-        <field:simple field="lots" id="c_com_labsynch_labseer_domain_SaltForm_lots" messageCode="entity_reference_not_managed" messageCodeAttribute="Lot" z="gzsQYHo7YLFBb4yb1QLlc70//0s="/>
-        <field:simple field="isoSalts" id="c_com_labsynch_labseer_domain_SaltForm_isoSalts" messageCode="entity_reference_not_managed" messageCodeAttribute="Iso Salt" z="+Ii5Tuzkk7uJoRcIqMwfy69LJME="/>
-        <field:select field="bulkLoadFile" id="c_com_labsynch_labseer_domain_SaltForm_bulkLoadFile" itemValue="id" items="${bulkloadfiles}" path="/bulkloadfiles" z="bNvCWiy6f63jZ9vzW9nWexbdQfg="/>
-        <field:input field="chemist" id="c_com_labsynch_labseer_domain_SaltForm_chemist" z="XO/lYAmrklB94mES7H0/xyOMaYI="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_SaltForm" render="${not empty dependencies}" z="INC/yNIf5uL6MX/TkHdad4kEF8w="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/saltforms/findSaltFormsByBulkLoadFileEquals.jspx b/src/main/webapp/WEB-INF/views/saltforms/findSaltFormsByBulkLoadFileEquals.jspx
deleted file mode 100644
index 2a5cb20e1..000000000
--- a/src/main/webapp/WEB-INF/views/saltforms/findSaltFormsByBulkLoadFileEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByBulkLoadFileEquals" id="ff_com_labsynch_labseer_domain_SaltForm" path="/saltforms" z="eEnz+yKjg4CszYBAgKnJf6jYV2k=">
-        <field:select disableFormBinding="true" field="bulkLoadFile" id="f_com_labsynch_labseer_domain_SaltForm_bulkLoadFile" itemValue="id" items="${bulkloadfiles}" path="/bulkloadfiles" required="true" z="8C3VOlNQAeXFnS9J7xfguFUuY2g="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/saltforms/findSaltFormsByCdId.jspx b/src/main/webapp/WEB-INF/views/saltforms/findSaltFormsByCdId.jspx
deleted file mode 100644
index de61e255f..000000000
--- a/src/main/webapp/WEB-INF/views/saltforms/findSaltFormsByCdId.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCdId" id="ff_com_labsynch_labseer_domain_SaltForm" path="/saltforms" z="naXypR26giNIXT08FLvt6Zlz1HY=">
-        <field:input disableFormBinding="true" field="CdId" id="f_com_labsynch_labseer_domain_SaltForm_CdId" required="true" z="feLiMA0I6U9r/OF/u7lF9CSuChc="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/saltforms/findSaltFormsByCorpNameEquals.jspx b/src/main/webapp/WEB-INF/views/saltforms/findSaltFormsByCorpNameEquals.jspx
deleted file mode 100644
index ddf818868..000000000
--- a/src/main/webapp/WEB-INF/views/saltforms/findSaltFormsByCorpNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCorpNameEquals" id="ff_com_labsynch_labseer_domain_SaltForm" path="/saltforms" z="jzfeLtV9Pkn+ysWshbmYjejsjDs=">
-        <field:input disableFormBinding="true" field="corpName" id="f_com_labsynch_labseer_domain_SaltForm_corpName" max="255" required="true" z="CaP5LwqKqigzNKNdMRyXqwd8b44="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/saltforms/findSaltFormsByCorpNameLike.jspx b/src/main/webapp/WEB-INF/views/saltforms/findSaltFormsByCorpNameLike.jspx
deleted file mode 100644
index 342851064..000000000
--- a/src/main/webapp/WEB-INF/views/saltforms/findSaltFormsByCorpNameLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCorpNameLike" id="ff_com_labsynch_labseer_domain_SaltForm" path="/saltforms" z="29NzypUNIruOlm41XBcjclyvXx0=">
-        <field:input disableFormBinding="true" field="corpName" id="f_com_labsynch_labseer_domain_SaltForm_corpName" max="255" required="true" z="CaP5LwqKqigzNKNdMRyXqwd8b44="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/saltforms/findSaltFormsByParent.jspx b/src/main/webapp/WEB-INF/views/saltforms/findSaltFormsByParent.jspx
deleted file mode 100644
index 0db12bf2a..000000000
--- a/src/main/webapp/WEB-INF/views/saltforms/findSaltFormsByParent.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByParent" id="ff_com_labsynch_labseer_domain_SaltForm" path="/saltforms" z="4leDvFxQAc9dhObctwJskgPEq9s=">
-        <field:select disableFormBinding="true" field="parent" id="f_com_labsynch_labseer_domain_SaltForm_parent" itemValue="id" items="${parents}" path="/parents" required="true" z="u0VlSv569QZZoYMsE2gB4NDWGUc="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/saltforms/list.jspx b/src/main/webapp/WEB-INF/views/saltforms/list.jspx
deleted file mode 100644
index bb03c3183..000000000
--- a/src/main/webapp/WEB-INF/views/saltforms/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_SaltForm" items="${saltforms}" z="Mtpul8XPtAk32qpKo7Vdx2UQLDs=">
-        <table:table data="${saltforms}" id="l_com_labsynch_labseer_domain_SaltForm" path="/saltforms" z="Gs/kJYp/yIvtFeE6GhKydNfFaW0=">
-            <table:column id="c_com_labsynch_labseer_domain_SaltForm_molStructure" property="molStructure" z="aMq9B+rDB8Lf0EQAQk2fxFXGnkw="/>
-            <table:column id="c_com_labsynch_labseer_domain_SaltForm_corpName" property="corpName" z="ed/JMDYNKCFB92jDk81j+Tzj1eY="/>
-            <table:column id="c_com_labsynch_labseer_domain_SaltForm_casNumber" property="casNumber" z="S5wACEm82gDCY4Auzh+F6wkqCMo="/>
-            <table:column date="true" dateTimePattern="${saltForm_registrationdate_date_format}" id="c_com_labsynch_labseer_domain_SaltForm_registrationDate" property="registrationDate" z="aYRPpl+I0RX/RxABxBRkD2J4kgI="/>
-            <table:column id="c_com_labsynch_labseer_domain_SaltForm_CdId" property="cdId" z="j9ZWPD+QZOO5vlobTAeFOFZ1a2w="/>
-            <table:column id="c_com_labsynch_labseer_domain_SaltForm_chemist" property="chemist" z="tp+ja2bK9NOHYMEV9N58RMgM6pg="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/saltforms/show.jspx b/src/main/webapp/WEB-INF/views/saltforms/show.jspx
deleted file mode 100644
index 7e2d62350..000000000
--- a/src/main/webapp/WEB-INF/views/saltforms/show.jspx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_SaltForm" object="${saltform}" path="/saltforms" z="crvExsc9mcFFCouUyMqXIzTo0hA=">
-        <field:display field="molStructure" id="s_com_labsynch_labseer_domain_SaltForm_molStructure" object="${saltform}" z="zi0XE5XZxe6dXXGMfMYBgtsDJ2o="/>
-        <field:display field="corpName" id="s_com_labsynch_labseer_domain_SaltForm_corpName" object="${saltform}" z="1lq1cDtF3ejbktvHw9AKsjvHzTg="/>
-        <field:display field="casNumber" id="s_com_labsynch_labseer_domain_SaltForm_casNumber" object="${saltform}" z="JKufNbYa9yaYuVUguKE50SijAuQ="/>
-        <field:display date="true" dateTimePattern="${saltForm_registrationdate_date_format}" field="registrationDate" id="s_com_labsynch_labseer_domain_SaltForm_registrationDate" object="${saltform}" z="OA6OwkxG7QjxV2JpzSS2XPnVNKM="/>
-        <field:display field="cdId" id="s_com_labsynch_labseer_domain_SaltForm_CdId" object="${saltform}" z="JXQrFUKrB5VtocXbBaObLAa1gek="/>
-        <field:display field="ignore" id="s_com_labsynch_labseer_domain_SaltForm_ignore" object="${saltform}" z="lh6z2GzTXLUa2TDJ+8/1F3EBsio="/>
-        <field:display field="saltWeight" id="s_com_labsynch_labseer_domain_SaltForm_saltWeight" object="${saltform}" z="gK1Ny3w9zZ/I35qsUOVMc7pLJJk="/>
-        <field:display field="parent" id="s_com_labsynch_labseer_domain_SaltForm_parent" object="${saltform}" z="52KB6yDHMPxz4A19AfiI8u2+UJU="/>
-        <field:display field="bulkLoadFile" id="s_com_labsynch_labseer_domain_SaltForm_bulkLoadFile" object="${saltform}" z="HR0xlJ6tc62Yjrs40sJZ4jIkbmI="/>
-        <field:display field="chemist" id="s_com_labsynch_labseer_domain_SaltForm_chemist" object="${saltform}" z="TXZ3l5j9zL9fS277CnKl15hDbiM="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/saltforms/update.jspx b/src/main/webapp/WEB-INF/views/saltforms/update.jspx
deleted file mode 100644
index 57f932a02..000000000
--- a/src/main/webapp/WEB-INF/views/saltforms/update.jspx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_SaltForm" modelAttribute="saltForm" path="/saltforms" versionField="Version" z="hhm5FT1dZFCB4PnC8JLb4Jg03HA=">
-        <field:input field="molStructure" id="c_com_labsynch_labseer_domain_SaltForm_molStructure" z="Q1NA0s1q1IYL5E/5ZXvyyWX4bsU="/>
-        <field:textarea field="corpName" id="c_com_labsynch_labseer_domain_SaltForm_corpName" z="0UD/r5u0saZr2CyDQ4SZKNyZRrY="/>
-        <field:textarea field="casNumber" id="c_com_labsynch_labseer_domain_SaltForm_casNumber" z="hLSxVDuLLrWTUoDy2F7UhV5I5Wo="/>
-        <field:datetime dateTimePattern="${saltForm_registrationdate_date_format}" field="registrationDate" id="c_com_labsynch_labseer_domain_SaltForm_registrationDate" z="aOjHpsFkRGoWIQXJqgcD2lXMwno="/>
-        <field:input field="CdId" id="c_com_labsynch_labseer_domain_SaltForm_CdId" z="CoYKeR3raFvzOUBdpyK7dhoL3ws="/>
-        <field:checkbox field="ignore" id="c_com_labsynch_labseer_domain_SaltForm_ignore" z="XJSa7lhkVUrWhxl4aggsO+TKGNk="/>
-        <field:input field="saltWeight" id="c_com_labsynch_labseer_domain_SaltForm_saltWeight" validationMessageCode="field_invalid_number" z="r+8alJhdE4EaWAN6bCiNY+AltX0="/>
-        <field:select field="parent" id="c_com_labsynch_labseer_domain_SaltForm_parent" itemValue="id" items="${parents}" path="/parents" z="qvLiGjZYXKM2TzFrGFLbjtLBqR0="/>
-        <field:simple field="lots" id="c_com_labsynch_labseer_domain_SaltForm_lots" messageCode="entity_reference_not_managed" messageCodeAttribute="Lot" z="gzsQYHo7YLFBb4yb1QLlc70//0s="/>
-        <field:simple field="isoSalts" id="c_com_labsynch_labseer_domain_SaltForm_isoSalts" messageCode="entity_reference_not_managed" messageCodeAttribute="Iso Salt" z="+Ii5Tuzkk7uJoRcIqMwfy69LJME="/>
-        <field:select field="bulkLoadFile" id="c_com_labsynch_labseer_domain_SaltForm_bulkLoadFile" itemValue="id" items="${bulkloadfiles}" path="/bulkloadfiles" z="bNvCWiy6f63jZ9vzW9nWexbdQfg="/>
-        <field:input field="chemist" id="c_com_labsynch_labseer_domain_SaltForm_chemist" z="XO/lYAmrklB94mES7H0/xyOMaYI="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/saltforms/views.xml b/src/main/webapp/WEB-INF/views/saltforms/views.xml
deleted file mode 100644
index d49469fb8..000000000
--- a/src/main/webapp/WEB-INF/views/saltforms/views.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="saltforms/list">
-        <put-attribute name="body" value="/WEB-INF/views/saltforms/list.jspx"/>
-    </definition>
-<definition extends="default" name="saltforms/show">
-        <put-attribute name="body" value="/WEB-INF/views/saltforms/show.jspx"/>
-    </definition>
-<definition extends="default" name="saltforms/create">
-        <put-attribute name="body" value="/WEB-INF/views/saltforms/create.jspx"/>
-    </definition>
-<definition extends="default" name="saltforms/update">
-        <put-attribute name="body" value="/WEB-INF/views/saltforms/update.jspx"/>
-    </definition>
-<definition extends="default" name="saltforms/findSaltFormsByBulkLoadFileEquals">
-        <put-attribute name="body" value="/WEB-INF/views/saltforms/findSaltFormsByBulkLoadFileEquals.jspx"/>
-    </definition>
-<definition extends="default" name="saltforms/findSaltFormsByCdId">
-        <put-attribute name="body" value="/WEB-INF/views/saltforms/findSaltFormsByCdId.jspx"/>
-    </definition>
-<definition extends="default" name="saltforms/findSaltFormsByCorpNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/saltforms/findSaltFormsByCorpNameEquals.jspx"/>
-    </definition>
-<definition extends="default" name="saltforms/findSaltFormsByCorpNameLike">
-        <put-attribute name="body" value="/WEB-INF/views/saltforms/findSaltFormsByCorpNameLike.jspx"/>
-    </definition>
-<definition extends="default" name="saltforms/findSaltFormsByParent">
-        <put-attribute name="body" value="/WEB-INF/views/saltforms/findSaltFormsByParent.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/saltloaders/create.jspx b/src/main/webapp/WEB-INF/views/saltloaders/create.jspx
deleted file mode 100644
index 977a4299d..000000000
--- a/src/main/webapp/WEB-INF/views/saltloaders/create.jspx
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_service_SaltLoader" modelAttribute="saltLoader" path="/saltloaders" render="${empty dependencies}" z="uiUD4Zj/57SY1YgsNPRkeyRmU4w=">
-        <field:input field="name" id="c_com_labsynch_labseer_service_SaltLoader_name" z="Ik/GYihLHLtAaanw6Nr10qC7jFQ="/>
-        <field:input field="description" id="c_com_labsynch_labseer_service_SaltLoader_description" z="vjx/ingqZFrlx3FY9sBuXIvE40g="/>
-        <field:input field="numberOfSalts" id="c_com_labsynch_labseer_service_SaltLoader_numberOfSalts" z="oQOdfSHxs7/57UL9YNZQiR68fgM="/>
-        <field:input field="size" id="c_com_labsynch_labseer_service_SaltLoader_size" z="zFIASv4s44DUt28aI8O8ZEc8Lo0="/>
-        <field:checkbox field="uploaded" id="c_com_labsynch_labseer_service_SaltLoader_uploaded" z="DysvvG0sYSVNB9M3FN2Nmb+rg/Y="/>
-        <field:input field="file" id="c_com_labsynch_labseer_service_SaltLoader_file" z="OW+mJ2OVletCMo9LHMe30GHAeDk="/>
-        <field:input field="fileName" id="c_com_labsynch_labseer_service_SaltLoader_fileName" z="2LrXciXm9hRK7Z/uwKc1e56U1q0="/>
-        <field:datetime dateTimePattern="${saltLoader_loadeddate_date_format}" field="loadedDate" id="c_com_labsynch_labseer_service_SaltLoader_loadedDate" z="6vc/CzkRbew1HH7WvYtoWVjgfZc="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_service_SaltLoader" render="${not empty dependencies}" z="vAzREQB6vWu//HY+IFLOTf5Tv2o="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/saltloaders/list.jspx b/src/main/webapp/WEB-INF/views/saltloaders/list.jspx
deleted file mode 100644
index 5fb0fee53..000000000
--- a/src/main/webapp/WEB-INF/views/saltloaders/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_service_SaltLoader" items="${saltloaders}" z="mVqI/bSQHMVuh8+J5UCR6e1i1ks=">
-        <table:table data="${saltloaders}" id="l_com_labsynch_labseer_service_SaltLoader" path="/saltloaders" z="WD4PPoreS+IGlRo1AUwq6xYgtgc=">
-            <table:column id="c_com_labsynch_labseer_service_SaltLoader_name" property="name" z="d0Sv9oQzbuSdfvA503nH+7Gn2ek="/>
-            <table:column id="c_com_labsynch_labseer_service_SaltLoader_description" property="description" z="Xg5qUNo+OBOWgsjL6rxNOD2NXcY="/>
-            <table:column id="c_com_labsynch_labseer_service_SaltLoader_numberOfSalts" property="numberOfSalts" z="GQxquuq0HoMYxNrxOJ6rCgY0Z/U="/>
-            <table:column id="c_com_labsynch_labseer_service_SaltLoader_size" property="size" z="1Ibvmk3S7OidfazhE2rr6kyesKw="/>
-            <table:column id="c_com_labsynch_labseer_service_SaltLoader_uploaded" property="uploaded" z="YAKyPz8EZe5glMJif4kOgYvI+po="/>
-            <table:column id="c_com_labsynch_labseer_service_SaltLoader_file" property="file" z="kUJ3rY34dP4itKOfSp23XTWHQNc="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/saltloaders/show.jspx b/src/main/webapp/WEB-INF/views/saltloaders/show.jspx
deleted file mode 100644
index cbd643c48..000000000
--- a/src/main/webapp/WEB-INF/views/saltloaders/show.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_service_SaltLoader" object="${saltloader}" path="/saltloaders" z="9u2XgAPgWaokWOGZnU2BGUJzY/4=">
-        <field:display field="name" id="s_com_labsynch_labseer_service_SaltLoader_name" object="${saltloader}" z="N7HSH2SbWvHEc1s5Ty4/SbksREc="/>
-        <field:display field="description" id="s_com_labsynch_labseer_service_SaltLoader_description" object="${saltloader}" z="DChl8mTSXNMdZRrCM3YIB9VGa08="/>
-        <field:display field="numberOfSalts" id="s_com_labsynch_labseer_service_SaltLoader_numberOfSalts" object="${saltloader}" z="j7wlg+zwpFbK7lDcpvwNWfWxgbo="/>
-        <field:display field="size" id="s_com_labsynch_labseer_service_SaltLoader_size" object="${saltloader}" z="gvd7AdIykzhkMniJ3gDCgVILD34="/>
-        <field:display field="uploaded" id="s_com_labsynch_labseer_service_SaltLoader_uploaded" object="${saltloader}" z="vvpd9dNIS33eLa3myzlWFP1MwFY="/>
-        <field:display field="file" id="s_com_labsynch_labseer_service_SaltLoader_file" object="${saltloader}" z="7p+C6OgQYtSm+megEspl+3HYA1E="/>
-        <field:display field="fileName" id="s_com_labsynch_labseer_service_SaltLoader_fileName" object="${saltloader}" z="RUNnAvJrKIkZnwWdReghRR1aYp4="/>
-        <field:display date="true" dateTimePattern="${saltLoader_loadeddate_date_format}" field="loadedDate" id="s_com_labsynch_labseer_service_SaltLoader_loadedDate" object="${saltloader}" z="kR07ZT+mriK3+4kSmU98a/wDIZc="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/saltloaders/update.jspx b/src/main/webapp/WEB-INF/views/saltloaders/update.jspx
deleted file mode 100644
index 9227ef54f..000000000
--- a/src/main/webapp/WEB-INF/views/saltloaders/update.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_service_SaltLoader" modelAttribute="saltLoader" path="/saltloaders" versionField="Version" z="/N05F8XCtQhrezxVvhEThJwm43o=">
-        <field:input field="name" id="c_com_labsynch_labseer_service_SaltLoader_name" z="Ik/GYihLHLtAaanw6Nr10qC7jFQ="/>
-        <field:input field="description" id="c_com_labsynch_labseer_service_SaltLoader_description" z="vjx/ingqZFrlx3FY9sBuXIvE40g="/>
-        <field:input field="numberOfSalts" id="c_com_labsynch_labseer_service_SaltLoader_numberOfSalts" z="oQOdfSHxs7/57UL9YNZQiR68fgM="/>
-        <field:input field="size" id="c_com_labsynch_labseer_service_SaltLoader_size" z="zFIASv4s44DUt28aI8O8ZEc8Lo0="/>
-        <field:checkbox field="uploaded" id="c_com_labsynch_labseer_service_SaltLoader_uploaded" z="DysvvG0sYSVNB9M3FN2Nmb+rg/Y="/>
-        <field:input field="file" id="c_com_labsynch_labseer_service_SaltLoader_file" z="OW+mJ2OVletCMo9LHMe30GHAeDk="/>
-        <field:input field="fileName" id="c_com_labsynch_labseer_service_SaltLoader_fileName" z="2LrXciXm9hRK7Z/uwKc1e56U1q0="/>
-        <field:datetime dateTimePattern="${saltLoader_loadeddate_date_format}" field="loadedDate" id="c_com_labsynch_labseer_service_SaltLoader_loadedDate" z="6vc/CzkRbew1HH7WvYtoWVjgfZc="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/saltloaders/views.xml b/src/main/webapp/WEB-INF/views/saltloaders/views.xml
deleted file mode 100644
index 17bbe9a1a..000000000
--- a/src/main/webapp/WEB-INF/views/saltloaders/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="saltloaders/list">
-        <put-attribute name="body" value="/WEB-INF/views/saltloaders/list.jspx"/>
-    </definition>
-<definition extends="default" name="saltloaders/show">
-        <put-attribute name="body" value="/WEB-INF/views/saltloaders/show.jspx"/>
-    </definition>
-<definition extends="default" name="saltloaders/create">
-        <put-attribute name="body" value="/WEB-INF/views/saltloaders/create.jspx"/>
-    </definition>
-<definition extends="default" name="saltloaders/update">
-        <put-attribute name="body" value="/WEB-INF/views/saltloaders/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/salts/create.jspx b/src/main/webapp/WEB-INF/views/salts/create.jspx
deleted file mode 100644
index 67856f9b5..000000000
--- a/src/main/webapp/WEB-INF/views/salts/create.jspx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_Salt" modelAttribute="salt" path="/salts" render="${empty dependencies}" z="ZSJOkUU0JDxiuZ4Ew1q+/LYGUMc=">
-        <field:input field="molStructure" id="c_com_labsynch_labseer_domain_Salt_molStructure" z="OMahxMvBw3JYG2DEL5TBInrQlaY="/>
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_Salt_name" z="QMe9CVnzMY7ad0h2tUT53phaECs="/>
-        <field:input field="originalStructure" id="c_com_labsynch_labseer_domain_Salt_originalStructure" z="qwBsre0Z9RzR+p9Fa8DB+2opBPQ="/>
-        <field:textarea field="abbrev" id="c_com_labsynch_labseer_domain_Salt_abbrev" z="o7YMhwiKlyakUZorlk5NHcoMIlI="/>
-        <field:input field="molWeight" id="c_com_labsynch_labseer_domain_Salt_molWeight" validationMessageCode="field_invalid_number" z="0/qYMvluuLLqP2NVPzYLVHVLZmA="/>
-        <field:textarea field="formula" id="c_com_labsynch_labseer_domain_Salt_formula" z="W3iCvtdhrBI9BvVxtMC5PYe6Ceo="/>
-        <field:input field="cdId" id="c_com_labsynch_labseer_domain_Salt_cdId" z="IG1+XtkO/ZGbs87M0YLvVPZ6N18="/>
-        <field:checkbox field="ignore" id="c_com_labsynch_labseer_domain_Salt_ignore" z="4zhmT8cp5gEHFNcCiiRHZbZlCQM="/>
-        <field:input field="charge" id="c_com_labsynch_labseer_domain_Salt_charge" z="UW/TjicZUvTcUDgbWK9viNoOxKM="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_Salt" render="${not empty dependencies}" z="gHu6jLbpuKU3NkceTtx3Q4flXfs="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/salts/findSaltsByAbbrevEquals.jspx b/src/main/webapp/WEB-INF/views/salts/findSaltsByAbbrevEquals.jspx
deleted file mode 100644
index 3f4066eb7..000000000
--- a/src/main/webapp/WEB-INF/views/salts/findSaltsByAbbrevEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByAbbrevEquals" id="ff_com_labsynch_labseer_domain_Salt" path="/salts" z="dhv89VYS72SBVGzyP498RTdc0bQ=">
-        <field:input disableFormBinding="true" field="abbrev" id="f_com_labsynch_labseer_domain_Salt_abbrev" max="100" required="true" z="O2cKWJLIW2ta+YjOOxE1AYPZqe4="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/salts/findSaltsByAbbrevEqualsAndNameEquals.jspx b/src/main/webapp/WEB-INF/views/salts/findSaltsByAbbrevEqualsAndNameEquals.jspx
deleted file mode 100644
index e3d7febf8..000000000
--- a/src/main/webapp/WEB-INF/views/salts/findSaltsByAbbrevEqualsAndNameEquals.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByAbbrevEqualsAndNameEquals" id="ff_com_labsynch_labseer_domain_Salt" path="/salts" z="wwXUrTHsPMIg6ROjXt1kTdkzq8M=">
-        <field:input disableFormBinding="true" field="abbrev" id="f_com_labsynch_labseer_domain_Salt_abbrev" max="100" required="true" z="O2cKWJLIW2ta+YjOOxE1AYPZqe4="/>
-        <field:input disableFormBinding="true" field="name" id="f_com_labsynch_labseer_domain_Salt_name" max="255" required="true" z="rZi0BAH9HTlhxzGd7H9CmyA3bjQ="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/salts/findSaltsByAbbrevLike.jspx b/src/main/webapp/WEB-INF/views/salts/findSaltsByAbbrevLike.jspx
deleted file mode 100644
index da5a0a4e9..000000000
--- a/src/main/webapp/WEB-INF/views/salts/findSaltsByAbbrevLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByAbbrevLike" id="ff_com_labsynch_labseer_domain_Salt" path="/salts" z="UnOjmFJd1vroXrJHjN4/XYIUn8I=">
-        <field:input disableFormBinding="true" field="abbrev" id="f_com_labsynch_labseer_domain_Salt_abbrev" max="100" required="true" z="O2cKWJLIW2ta+YjOOxE1AYPZqe4="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/salts/findSaltsByCdId.jspx b/src/main/webapp/WEB-INF/views/salts/findSaltsByCdId.jspx
deleted file mode 100644
index 92f9400da..000000000
--- a/src/main/webapp/WEB-INF/views/salts/findSaltsByCdId.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCdId" id="ff_com_labsynch_labseer_domain_Salt" path="/salts" z="pMocitS7y7HVHCsIiQTyjCasX0k=">
-        <field:input disableFormBinding="true" field="cdId" id="f_com_labsynch_labseer_domain_Salt_cdId" required="true" z="74O7Xv9YvaG5hqGEf/VXMYKhU6c="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/salts/findSaltsByNameEquals.jspx b/src/main/webapp/WEB-INF/views/salts/findSaltsByNameEquals.jspx
deleted file mode 100644
index 2e75b455e..000000000
--- a/src/main/webapp/WEB-INF/views/salts/findSaltsByNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByNameEquals" id="ff_com_labsynch_labseer_domain_Salt" path="/salts" z="RDALoLRg75VVC0Kbd1nW+IWunmQ=">
-        <field:input disableFormBinding="true" field="name" id="f_com_labsynch_labseer_domain_Salt_name" max="255" required="true" z="rZi0BAH9HTlhxzGd7H9CmyA3bjQ="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/salts/list.jspx b/src/main/webapp/WEB-INF/views/salts/list.jspx
deleted file mode 100644
index 25a24bb03..000000000
--- a/src/main/webapp/WEB-INF/views/salts/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_Salt" items="${salts}" z="MrIQBcDaQnh4eayV/XUcnoLA9kI=">
-        <table:table data="${salts}" id="l_com_labsynch_labseer_domain_Salt" path="/salts" z="JfaGB7JylqeOZPY88HQtekB+64M=">
-            <table:column id="c_com_labsynch_labseer_domain_Salt_molStructure" property="molStructure" z="6NlmBOM0VxTewDarzo0wbP3p80k="/>
-            <table:column id="c_com_labsynch_labseer_domain_Salt_name" property="name" z="36XGgIRkvfP6U3G3RiUE/TXiqT8="/>
-            <table:column id="c_com_labsynch_labseer_domain_Salt_originalStructure" property="originalStructure" z="T+SMspd+9zbYkaXjYyG1z8Swauo="/>
-            <table:column id="c_com_labsynch_labseer_domain_Salt_abbrev" property="abbrev" z="mTmu8fwauod8wGFY77gLF2hDqT4="/>
-            <table:column id="c_com_labsynch_labseer_domain_Salt_molWeight" property="molWeight" z="RPI1PyAxfy2uCYSgDcUyyYyw7iI="/>
-            <table:column id="c_com_labsynch_labseer_domain_Salt_formula" property="formula" z="vH9SQLAc44AMEYU14iaLeUuetds="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/salts/show.jspx b/src/main/webapp/WEB-INF/views/salts/show.jspx
deleted file mode 100644
index ee8dc6b60..000000000
--- a/src/main/webapp/WEB-INF/views/salts/show.jspx
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_Salt" object="${salt}" path="/salts" z="rheiLERN0cz97QyHuRx6XUTdzM8=">
-        <field:display field="molStructure" id="s_com_labsynch_labseer_domain_Salt_molStructure" object="${salt}" z="im9X3k9xfigQMy5H92lS+7svmw0="/>
-        <field:display field="name" id="s_com_labsynch_labseer_domain_Salt_name" object="${salt}" z="EJijzD+oipKrqrRIFl16g0uuWXo="/>
-        <field:display field="originalStructure" id="s_com_labsynch_labseer_domain_Salt_originalStructure" object="${salt}" z="xQ1OKs8/EjeLSHKCa87nc0x2sSI="/>
-        <field:display field="abbrev" id="s_com_labsynch_labseer_domain_Salt_abbrev" object="${salt}" z="0g+91s1nVy0yRDFHNFoyEkmqyFE="/>
-        <field:display field="molWeight" id="s_com_labsynch_labseer_domain_Salt_molWeight" object="${salt}" z="tH+XMHx2h6G/JQ3T0Q+z7AkGHgs="/>
-        <field:display field="formula" id="s_com_labsynch_labseer_domain_Salt_formula" object="${salt}" z="dJYaXm0diTMZfL9r5ZbCZ3pmyr0="/>
-        <field:display field="cdId" id="s_com_labsynch_labseer_domain_Salt_cdId" object="${salt}" z="T3ozGg6nkmJD/V4Un0VwzV3xzPA="/>
-        <field:display field="ignore" id="s_com_labsynch_labseer_domain_Salt_ignore" object="${salt}" z="7oIuBce+CLE6MnXtJ9wHs1PV1vI="/>
-        <field:display field="charge" id="s_com_labsynch_labseer_domain_Salt_charge" object="${salt}" z="na6xxlSNl/qB9o41AKeWYD/abjw="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/salts/update.jspx b/src/main/webapp/WEB-INF/views/salts/update.jspx
deleted file mode 100644
index e07a59509..000000000
--- a/src/main/webapp/WEB-INF/views/salts/update.jspx
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_Salt" modelAttribute="salt" path="/salts" versionField="Version" z="SegEhGcSpSc7kZVEiydLkb2TXXo=">
-        <field:input field="molStructure" id="c_com_labsynch_labseer_domain_Salt_molStructure" z="OMahxMvBw3JYG2DEL5TBInrQlaY="/>
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_Salt_name" z="QMe9CVnzMY7ad0h2tUT53phaECs="/>
-        <field:input field="originalStructure" id="c_com_labsynch_labseer_domain_Salt_originalStructure" z="qwBsre0Z9RzR+p9Fa8DB+2opBPQ="/>
-        <field:textarea field="abbrev" id="c_com_labsynch_labseer_domain_Salt_abbrev" z="o7YMhwiKlyakUZorlk5NHcoMIlI="/>
-        <field:input field="molWeight" id="c_com_labsynch_labseer_domain_Salt_molWeight" validationMessageCode="field_invalid_number" z="0/qYMvluuLLqP2NVPzYLVHVLZmA="/>
-        <field:textarea field="formula" id="c_com_labsynch_labseer_domain_Salt_formula" z="W3iCvtdhrBI9BvVxtMC5PYe6Ceo="/>
-        <field:input field="cdId" id="c_com_labsynch_labseer_domain_Salt_cdId" z="IG1+XtkO/ZGbs87M0YLvVPZ6N18="/>
-        <field:checkbox field="ignore" id="c_com_labsynch_labseer_domain_Salt_ignore" z="4zhmT8cp5gEHFNcCiiRHZbZlCQM="/>
-        <field:input field="charge" id="c_com_labsynch_labseer_domain_Salt_charge" z="UW/TjicZUvTcUDgbWK9viNoOxKM="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/salts/views.xml b/src/main/webapp/WEB-INF/views/salts/views.xml
deleted file mode 100644
index 903c09cf1..000000000
--- a/src/main/webapp/WEB-INF/views/salts/views.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="salts/list">
-        <put-attribute name="body" value="/WEB-INF/views/salts/list.jspx"/>
-    </definition>
-<definition extends="default" name="salts/show">
-        <put-attribute name="body" value="/WEB-INF/views/salts/show.jspx"/>
-    </definition>
-<definition extends="default" name="salts/create">
-        <put-attribute name="body" value="/WEB-INF/views/salts/create.jspx"/>
-    </definition>
-<definition extends="default" name="salts/update">
-        <put-attribute name="body" value="/WEB-INF/views/salts/update.jspx"/>
-    </definition>
-<definition extends="default" name="salts/findSaltsByAbbrevEquals">
-        <put-attribute name="body" value="/WEB-INF/views/salts/findSaltsByAbbrevEquals.jspx"/>
-    </definition>
-<definition extends="default" name="salts/findSaltsByAbbrevEqualsAndNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/salts/findSaltsByAbbrevEqualsAndNameEquals.jspx"/>
-    </definition>
-<definition extends="default" name="salts/findSaltsByAbbrevLike">
-        <put-attribute name="body" value="/WEB-INF/views/salts/findSaltsByAbbrevLike.jspx"/>
-    </definition>
-<definition extends="default" name="salts/findSaltsByCdId">
-        <put-attribute name="body" value="/WEB-INF/views/salts/findSaltsByCdId.jspx"/>
-    </definition>
-<definition extends="default" name="salts/findSaltsByNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/salts/findSaltsByNameEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/scientists/create.jspx b/src/main/webapp/WEB-INF/views/scientists/create.jspx
deleted file mode 100644
index 6d727cef3..000000000
--- a/src/main/webapp/WEB-INF/views/scientists/create.jspx
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_Scientist" modelAttribute="scientist" path="/scientists" render="${empty dependencies}" z="7lYRJ0PggkXLPe0Bl9ZaLyNqbRA=">
-        <field:input field="code" id="c_com_labsynch_labseer_domain_Scientist_code" z="bE+rIxSTWn/BxtN+Wj7wDT338m0="/>
-        <field:input field="name" id="c_com_labsynch_labseer_domain_Scientist_name" z="jzpsmIfFGv+6pPK7KxPULrkDSi0="/>
-        <field:checkbox field="isChemist" id="c_com_labsynch_labseer_domain_Scientist_isChemist" z="EQeDCqgE8UwCU1yLDBmjmQeZVDM="/>
-        <field:checkbox field="isAdmin" id="c_com_labsynch_labseer_domain_Scientist_isAdmin" z="F9URkB66xsUEZ0uElSCtJTuC09g="/>
-        <field:checkbox field="ignore" id="c_com_labsynch_labseer_domain_Scientist_ignore" z="ZmoVheOmSMH3ATtm5NuJ9TwkcKA="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_Scientist" render="${not empty dependencies}" z="7d8AfWbsuCCKk8qb358AwIbk0eg="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/scientists/findScientistsByCodeEquals.jspx b/src/main/webapp/WEB-INF/views/scientists/findScientistsByCodeEquals.jspx
deleted file mode 100644
index 539dd467f..000000000
--- a/src/main/webapp/WEB-INF/views/scientists/findScientistsByCodeEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeEquals" id="ff_com_labsynch_labseer_domain_Scientist" path="/scientists" z="SQOVWsSqg52F2V6bm8w+pSu0+n4=">
-        <field:input disableFormBinding="true" field="code" id="f_com_labsynch_labseer_domain_Scientist_code" required="true" z="cOKzx5dGXDFh8p1nqZEap34cH4s="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/scientists/findScientistsByCodeLike.jspx b/src/main/webapp/WEB-INF/views/scientists/findScientistsByCodeLike.jspx
deleted file mode 100644
index f15e8ece2..000000000
--- a/src/main/webapp/WEB-INF/views/scientists/findScientistsByCodeLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeLike" id="ff_com_labsynch_labseer_domain_Scientist" path="/scientists" z="Pw7oVaAJOken1k0EfTr+MwSb7tI=">
-        <field:input disableFormBinding="true" field="code" id="f_com_labsynch_labseer_domain_Scientist_code" required="true" z="cOKzx5dGXDFh8p1nqZEap34cH4s="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/scientists/list.jspx b/src/main/webapp/WEB-INF/views/scientists/list.jspx
deleted file mode 100644
index 7f2c457dc..000000000
--- a/src/main/webapp/WEB-INF/views/scientists/list.jspx
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_Scientist" items="${scientists}" z="KNJ8IwyiyktcZ6tdlbtFD7z/ke8=">
-        <table:table data="${scientists}" id="l_com_labsynch_labseer_domain_Scientist" path="/scientists" z="JPacUl/NnscHCYy5ZusHX4VVbI8=">
-            <table:column id="c_com_labsynch_labseer_domain_Scientist_code" property="code" z="xvwkD6kt1MJ4En+PLUuZog/v2n0="/>
-            <table:column id="c_com_labsynch_labseer_domain_Scientist_name" property="name" z="sMPhXTHRy38YDuOdon+1FjYFihE="/>
-            <table:column id="c_com_labsynch_labseer_domain_Scientist_isChemist" property="isChemist" z="pixgwpJtNWrRc436D/cgcztjsH0="/>
-            <table:column id="c_com_labsynch_labseer_domain_Scientist_isAdmin" property="isAdmin" z="VClV3HgJ44AzNivXkuJFshX4QM4="/>
-            <table:column id="c_com_labsynch_labseer_domain_Scientist_ignore" property="ignore" z="82XTdrMVx+Kr3zHjqErSvxB7STg="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/scientists/show.jspx b/src/main/webapp/WEB-INF/views/scientists/show.jspx
deleted file mode 100644
index 2d117f9dc..000000000
--- a/src/main/webapp/WEB-INF/views/scientists/show.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_Scientist" object="${scientist}" path="/scientists" z="p8PG/qT8XN8BCfHOr63gwAI4sLA=">
-        <field:display field="code" id="s_com_labsynch_labseer_domain_Scientist_code" object="${scientist}" z="xwb1ol0DCd39wuBUSnG7y8+tyFM="/>
-        <field:display field="name" id="s_com_labsynch_labseer_domain_Scientist_name" object="${scientist}" z="eOQ6Vtq+ganfxGJFs8zW0zp54nE="/>
-        <field:display field="isChemist" id="s_com_labsynch_labseer_domain_Scientist_isChemist" object="${scientist}" z="gRsDUGpHdKBFduYwCV4ssu7E1pk="/>
-        <field:display field="isAdmin" id="s_com_labsynch_labseer_domain_Scientist_isAdmin" object="${scientist}" z="MtMRQnHy2ik2Ao7QT0OxhTPnPhQ="/>
-        <field:display field="ignore" id="s_com_labsynch_labseer_domain_Scientist_ignore" object="${scientist}" z="ZznooRgdLlJFDLsw1rnraJdhSCQ="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/scientists/update.jspx b/src/main/webapp/WEB-INF/views/scientists/update.jspx
deleted file mode 100644
index 1a1190d7e..000000000
--- a/src/main/webapp/WEB-INF/views/scientists/update.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_Scientist" modelAttribute="scientist" path="/scientists" versionField="Version" z="yJZ4u6WekwGNGi9o9JW2cBIBNLg=">
-        <field:input field="code" id="c_com_labsynch_labseer_domain_Scientist_code" z="bE+rIxSTWn/BxtN+Wj7wDT338m0="/>
-        <field:input field="name" id="c_com_labsynch_labseer_domain_Scientist_name" z="jzpsmIfFGv+6pPK7KxPULrkDSi0="/>
-        <field:checkbox field="isChemist" id="c_com_labsynch_labseer_domain_Scientist_isChemist" z="EQeDCqgE8UwCU1yLDBmjmQeZVDM="/>
-        <field:checkbox field="isAdmin" id="c_com_labsynch_labseer_domain_Scientist_isAdmin" z="F9URkB66xsUEZ0uElSCtJTuC09g="/>
-        <field:checkbox field="ignore" id="c_com_labsynch_labseer_domain_Scientist_ignore" z="ZmoVheOmSMH3ATtm5NuJ9TwkcKA="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/scientists/views.xml b/src/main/webapp/WEB-INF/views/scientists/views.xml
deleted file mode 100644
index 1655534ee..000000000
--- a/src/main/webapp/WEB-INF/views/scientists/views.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="scientists/list">
-        <put-attribute name="body" value="/WEB-INF/views/scientists/list.jspx"/>
-    </definition>
-<definition extends="default" name="scientists/show">
-        <put-attribute name="body" value="/WEB-INF/views/scientists/show.jspx"/>
-    </definition>
-<definition extends="default" name="scientists/create">
-        <put-attribute name="body" value="/WEB-INF/views/scientists/create.jspx"/>
-    </definition>
-<definition extends="default" name="scientists/update">
-        <put-attribute name="body" value="/WEB-INF/views/scientists/update.jspx"/>
-    </definition>
-<definition extends="default" name="scientists/findScientistsByCodeEquals">
-        <put-attribute name="body" value="/WEB-INF/views/scientists/findScientistsByCodeEquals.jspx"/>
-    </definition>
-<definition extends="default" name="scientists/findScientistsByCodeLike">
-        <put-attribute name="body" value="/WEB-INF/views/scientists/findScientistsByCodeLike.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/signup/error.jspx b/src/main/webapp/WEB-INF/views/signup/error.jspx
deleted file mode 100755
index c3587dfaf..000000000
--- a/src/main/webapp/WEB-INF/views/signup/error.jspx
+++ /dev/null
@@ -1,16 +0,0 @@
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" 
-    xmlns:form="http://www.springframework.org/tags/form" 
-    xmlns:jsp="http://java.sun.com/JSP/Page" 
-    xmlns:spring="http://www.springframework.org/tags" version="2.0">
-  <jsp:output omit-xml-declaration="yes"/>
-  <script type="text/javascript">dojo.require('dijit.TitlePane');dojo.require('dijit.form.SimpleTextarea');dojo.require('dijit.form.FilteringSelect');</script>
-  <div id="_title_div">
-    
-    <script type="text/javascript">Spring.addDecoration(new Spring.ElementDecoration({elementId : '_title_div', widgetType : 'dijit.TitlePane', widgetAttrs : {title: 'Sign Up'}})); </script>
-    <spring:url value="/signup" var="form_url"/>
-    
-    <script type="text/javascript">Spring.addDecoration(new Spring.ElementDecoration({elementId : '_title_div', widgetType : 'dijit.TitlePane', widgetAttrs : {title: 'Sign Up'}})); </script>
-    
-    <h3>User Registration Failed</h3>
-  </div>
-</div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/signup/index.jspx b/src/main/webapp/WEB-INF/views/signup/index.jspx
deleted file mode 100755
index d02959fa5..000000000
--- a/src/main/webapp/WEB-INF/views/signup/index.jspx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_Author" modelAttribute="Author" path="signup" render="${empty dependencies}" z="">
-    
-    
-            <field:input field="firstName" id="c_com_labsynch_labseer_domain_Author_firstName" required="true" z="+CweY3nOz9RsK9se5yCsbdaFsa4="/>
-        <field:input field="lastName" id="c_com_labsynch_labseer_domain_Author_lastName" required="true" z="LN9JI6g+rvU3ip6ug3rG5N6PtW0="/>
-        <field:input field="userName" id="c_com_labsynch_labseer_domain_Author_userName" required="true" z="NGyLkXmGZf6sexoin1eSzcne7S0="/>
-        <field:input field="emailAddress" id="c_com_labsynch_labseer_domain_Author_emailAddress" min="1" required="true" validationMessageCode="field_invalid_email" z=""/>
-        <field:input field="password" id="c_com_labsynch_labseer_domain_Author_password" required="true" type="password"/>
-                <field:input field="repeatPassword" id="c_com_labsynch_labseer_domain_Author_password" min="1" required="true" type="password"/>
-        
-        ${captcha_form}
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_Author" render="${not empty dependencies}" z=""/>
-</div>
-
-
diff --git a/src/main/webapp/WEB-INF/views/signup/thanks.jspx b/src/main/webapp/WEB-INF/views/signup/thanks.jspx
deleted file mode 100755
index c1b81d35a..000000000
--- a/src/main/webapp/WEB-INF/views/signup/thanks.jspx
+++ /dev/null
@@ -1,16 +0,0 @@
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" 
-    xmlns:form="http://www.springframework.org/tags/form" 
-    xmlns:jsp="http://java.sun.com/JSP/Page" 
-    xmlns:spring="http://www.springframework.org/tags" version="2.0">
-  <jsp:output omit-xml-declaration="yes"/>
-  <script type="text/javascript">dojo.require('dijit.TitlePane');dojo.require('dijit.form.SimpleTextarea');dojo.require('dijit.form.FilteringSelect');</script>
-  <div id="_title_div">
-    
-    <script type="text/javascript">Spring.addDecoration(new Spring.ElementDecoration({elementId : '_title_div', widgetType : 'dijit.TitlePane', widgetAttrs : {title: 'SignUp Successful'}})); </script>
-    <spring:url value="/signup" var="form_url"/>
-    SignUp Successful
-    <script type="text/javascript">Spring.addDecoration(new Spring.ElementDecoration({elementId : '_title_div', widgetType : 'dijit.TitlePane', widgetAttrs : {title: 'SignUp Successful'}})); </script>
-
-    <h3>Your signup was successful. You should receive an activation email from us shortly. In case you do not get the email, please check your junk folder.</h3>
-  </div>
-</div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/signup/views.xml b/src/main/webapp/WEB-INF/views/signup/views.xml
deleted file mode 100755
index 5b46fb7a5..000000000
--- a/src/main/webapp/WEB-INF/views/signup/views.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-	<definition extends="default" name="signup/index">
-		<put-attribute name="menu" value="" />
-		<put-attribute name="body" value="/WEB-INF/views/signup/index.jspx" />
-	</definition>
-	<definition extends="default" name="signup/thanks">
-		<put-attribute name="menu" value="" />
-		<put-attribute name="body" value="/WEB-INF/views/signup/thanks.jspx" />
-	</definition>
-
-	<definition extends="default" name="signup/error">
-		<put-attribute name="menu" value="" />
-		<put-attribute name="body" value="/WEB-INF/views/signup/error.jspx" />
-	</definition>
-
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/solutionunits/create.jspx b/src/main/webapp/WEB-INF/views/solutionunits/create.jspx
deleted file mode 100644
index b61236c0a..000000000
--- a/src/main/webapp/WEB-INF/views/solutionunits/create.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_SolutionUnit" modelAttribute="solutionUnit" path="/solutionunits" render="${empty dependencies}" z="dbt4ZBp46ZMzIy37CnYduLcIy7E=">
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_SolutionUnit_name" z="x+eAKiMncZ6KwHG7CpirYP8tAVs="/>
-        <field:textarea field="code" id="c_com_labsynch_labseer_domain_SolutionUnit_code" z="mU89Nu6CTHn6QR97vtMo3ertg5w="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_SolutionUnit" render="${not empty dependencies}" z="azgPJKLQLmIMQkyRgmIwS7da78A="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/solutionunits/findSolutionUnitsByCodeEquals.jspx b/src/main/webapp/WEB-INF/views/solutionunits/findSolutionUnitsByCodeEquals.jspx
deleted file mode 100644
index 289b4c044..000000000
--- a/src/main/webapp/WEB-INF/views/solutionunits/findSolutionUnitsByCodeEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeEquals" id="ff_com_labsynch_labseer_domain_SolutionUnit" path="/solutionunits" z="19QGAiENJR5Id+T+0l2TWbEVuXw=">
-        <field:input disableFormBinding="true" field="code" id="f_com_labsynch_labseer_domain_SolutionUnit_code" max="255" required="true" z="JqxzP4qZRIaP8Db8NcDxrW5QdvU="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/solutionunits/findSolutionUnitsByCodeLike.jspx b/src/main/webapp/WEB-INF/views/solutionunits/findSolutionUnitsByCodeLike.jspx
deleted file mode 100644
index 5be91c7f5..000000000
--- a/src/main/webapp/WEB-INF/views/solutionunits/findSolutionUnitsByCodeLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeLike" id="ff_com_labsynch_labseer_domain_SolutionUnit" path="/solutionunits" z="zsocykjJZ3pQzXEBiYMkXvk7YmY=">
-        <field:input disableFormBinding="true" field="code" id="f_com_labsynch_labseer_domain_SolutionUnit_code" max="255" required="true" z="JqxzP4qZRIaP8Db8NcDxrW5QdvU="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/solutionunits/findSolutionUnitsByNameEquals.jspx b/src/main/webapp/WEB-INF/views/solutionunits/findSolutionUnitsByNameEquals.jspx
deleted file mode 100644
index 3ebb07aec..000000000
--- a/src/main/webapp/WEB-INF/views/solutionunits/findSolutionUnitsByNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByNameEquals" id="ff_com_labsynch_labseer_domain_SolutionUnit" path="/solutionunits" z="Lg6eSB31+w75GtMLHZFxAZaPV7Y=">
-        <field:input disableFormBinding="true" field="name" id="f_com_labsynch_labseer_domain_SolutionUnit_name" max="255" required="true" z="pPqw8rWhXYsIPrrPI5TD15Z+qXk="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/solutionunits/list.jspx b/src/main/webapp/WEB-INF/views/solutionunits/list.jspx
deleted file mode 100644
index b03439dae..000000000
--- a/src/main/webapp/WEB-INF/views/solutionunits/list.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_SolutionUnit" items="${solutionunits}" z="j8LuVCZk0LRSOjxfAKsSe7Kbsb4=">
-        <table:table data="${solutionunits}" id="l_com_labsynch_labseer_domain_SolutionUnit" path="/solutionunits" z="J2H0zJMsofnyu7rWzpjJlMz4fA4=">
-            <table:column id="c_com_labsynch_labseer_domain_SolutionUnit_name" property="name" z="8LYtYVpdW505Bx/BctB11T2PrHc="/>
-            <table:column id="c_com_labsynch_labseer_domain_SolutionUnit_code" property="code" z="lGXt7G+W/9zQD5lXaxxH1Si+VDE="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/solutionunits/show.jspx b/src/main/webapp/WEB-INF/views/solutionunits/show.jspx
deleted file mode 100644
index 65a13d6dc..000000000
--- a/src/main/webapp/WEB-INF/views/solutionunits/show.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_SolutionUnit" object="${solutionunit}" path="/solutionunits" z="chxexPMjNeTanYvZeVCZ6L7GBdU=">
-        <field:display field="name" id="s_com_labsynch_labseer_domain_SolutionUnit_name" object="${solutionunit}" z="7rzPMzd85v/WvV5+SAD/0WPmJzA="/>
-        <field:display field="code" id="s_com_labsynch_labseer_domain_SolutionUnit_code" object="${solutionunit}" z="HUdc3foyhWP3/it+uG0nqEd4OuI="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/solutionunits/update.jspx b/src/main/webapp/WEB-INF/views/solutionunits/update.jspx
deleted file mode 100644
index 08530828a..000000000
--- a/src/main/webapp/WEB-INF/views/solutionunits/update.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_SolutionUnit" modelAttribute="solutionUnit" path="/solutionunits" versionField="Version" z="j8Al3jAbPBiBtFYEWsrErqbBMc8=">
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_SolutionUnit_name" z="x+eAKiMncZ6KwHG7CpirYP8tAVs="/>
-        <field:textarea field="code" id="c_com_labsynch_labseer_domain_SolutionUnit_code" z="mU89Nu6CTHn6QR97vtMo3ertg5w="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/solutionunits/views.xml b/src/main/webapp/WEB-INF/views/solutionunits/views.xml
deleted file mode 100644
index ba3283326..000000000
--- a/src/main/webapp/WEB-INF/views/solutionunits/views.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="solutionunits/list">
-        <put-attribute name="body" value="/WEB-INF/views/solutionunits/list.jspx"/>
-    </definition>
-<definition extends="default" name="solutionunits/show">
-        <put-attribute name="body" value="/WEB-INF/views/solutionunits/show.jspx"/>
-    </definition>
-<definition extends="default" name="solutionunits/create">
-        <put-attribute name="body" value="/WEB-INF/views/solutionunits/create.jspx"/>
-    </definition>
-<definition extends="default" name="solutionunits/update">
-        <put-attribute name="body" value="/WEB-INF/views/solutionunits/update.jspx"/>
-    </definition>
-<definition extends="default" name="solutionunits/findSolutionUnitsByCodeEquals">
-        <put-attribute name="body" value="/WEB-INF/views/solutionunits/findSolutionUnitsByCodeEquals.jspx"/>
-    </definition>
-<definition extends="default" name="solutionunits/findSolutionUnitsByCodeLike">
-        <put-attribute name="body" value="/WEB-INF/views/solutionunits/findSolutionUnitsByCodeLike.jspx"/>
-    </definition>
-<definition extends="default" name="solutionunits/findSolutionUnitsByNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/solutionunits/findSolutionUnitsByNameEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/statekinds/create.jspx b/src/main/webapp/WEB-INF/views/statekinds/create.jspx
deleted file mode 100755
index 93701f867..000000000
--- a/src/main/webapp/WEB-INF/views/statekinds/create.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_StateKind" modelAttribute="stateKind" path="/statekinds" render="${empty dependencies}" z="NcSEBTGY6lRxD/Kb4EvLnCUvIcM=">
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_StateKind_kindName" required="true" z="gXesMiH4S7XhbMgnx4LAcaBsYX8="/>
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_StateKind_lsType" itemValue="id" items="${statetypes}" path="/statetypes" required="true" z="4giz+M1Uhoacgr6+wHNBciBZRfc="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_StateKind_lsTypeAndKind" z="XagCo+LWKdgEbxx4vitk2Ce8S10="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_StateKind" render="${not empty dependencies}" z="S3FNLQSCwYLtnc4I7k5/f19GlQA="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/statekinds/findStateKindsByKindNameEquals.jspx b/src/main/webapp/WEB-INF/views/statekinds/findStateKindsByKindNameEquals.jspx
deleted file mode 100755
index a5437de81..000000000
--- a/src/main/webapp/WEB-INF/views/statekinds/findStateKindsByKindNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByKindNameEquals" id="ff_com_labsynch_labseer_domain_StateKind" path="/statekinds" z="J+0rFlXUBnzDRgORKHGX5GZbS84=">
-        <field:input disableFormBinding="true" field="kindName" id="f_com_labsynch_labseer_domain_StateKind_kindName" max="64" required="true" z="+b1CZtWSnxFExpzTZNoPWv99Zsw="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/statekinds/findStateKindsByKindNameEqualsAndLsType.jspx b/src/main/webapp/WEB-INF/views/statekinds/findStateKindsByKindNameEqualsAndLsType.jspx
deleted file mode 100755
index 59317f9c0..000000000
--- a/src/main/webapp/WEB-INF/views/statekinds/findStateKindsByKindNameEqualsAndLsType.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByKindNameEqualsAndLsType" id="ff_com_labsynch_labseer_domain_StateKind" path="/statekinds" z="7BbdY66HSjGcwZLBjY9675QX/dY=">
-        <field:input disableFormBinding="true" field="kindName" id="f_com_labsynch_labseer_domain_StateKind_kindName" max="64" required="true" z="+b1CZtWSnxFExpzTZNoPWv99Zsw="/>
-        <field:select disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_StateKind_lsType" itemValue="id" items="${statetypes}" path="/statetypes" required="true" z="j81FoAhFxIZxDh+p8FlbnB7I52c="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/statekinds/findStateKindsByLsType.jspx b/src/main/webapp/WEB-INF/views/statekinds/findStateKindsByLsType.jspx
deleted file mode 100755
index eda0a00d7..000000000
--- a/src/main/webapp/WEB-INF/views/statekinds/findStateKindsByLsType.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsType" id="ff_com_labsynch_labseer_domain_StateKind" path="/statekinds" z="cuFNoUB+bDtc7I7kNqqQfa5LEPc=">
-        <field:select disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_StateKind_lsType" itemValue="id" items="${statetypes}" path="/statetypes" required="true" z="j81FoAhFxIZxDh+p8FlbnB7I52c="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/statekinds/list.jspx b/src/main/webapp/WEB-INF/views/statekinds/list.jspx
deleted file mode 100755
index 881181173..000000000
--- a/src/main/webapp/WEB-INF/views/statekinds/list.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_StateKind" items="${statekinds}" z="JXv7/uW0kCmyQhVI5QCUaAUStGw=">
-        <table:table data="${statekinds}" id="l_com_labsynch_labseer_domain_StateKind" path="/statekinds" z="EaP4QauvsMoOoqiWhNyuZmU9fFY=">
-            <table:column id="c_com_labsynch_labseer_domain_StateKind_kindName" property="kindName" z="R6ozNFSd0Keb/a4Pue5uoIOoEfE="/>
-            <table:column id="c_com_labsynch_labseer_domain_StateKind_lsType" property="lsType" z="K5ZreE82hrQzwGkEBmU/HsWDu/w="/>
-            <table:column id="c_com_labsynch_labseer_domain_StateKind_lsTypeAndKind" property="lsTypeAndKind" z="bpl+77Bh0ps8bvPd7EDAsBTD7xI="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/statekinds/show.jspx b/src/main/webapp/WEB-INF/views/statekinds/show.jspx
deleted file mode 100755
index 4fed0b733..000000000
--- a/src/main/webapp/WEB-INF/views/statekinds/show.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_StateKind" object="${statekind}" path="/statekinds" z="pBHYmkRP5GB0L7nEZHVqPpUNnhI=">
-        <field:display field="kindName" id="s_com_labsynch_labseer_domain_StateKind_kindName" object="${statekind}" z="/AV+A1UhGTnHmNMF3T1gzzI1lac="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_StateKind_lsType" object="${statekind}" z="+zEhpu4KeElXnNCMH9vIijC3WKE="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_StateKind_lsTypeAndKind" object="${statekind}" z="KGV1HD1e9pDp1qdTEg+yorqwaPM="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/statekinds/update.jspx b/src/main/webapp/WEB-INF/views/statekinds/update.jspx
deleted file mode 100755
index 8566dccaa..000000000
--- a/src/main/webapp/WEB-INF/views/statekinds/update.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_StateKind" modelAttribute="stateKind" path="/statekinds" versionField="Version" z="BEcA2WOEnqM4mALcQQhxg2FbzDg=">
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_StateKind_kindName" required="true" z="gXesMiH4S7XhbMgnx4LAcaBsYX8="/>
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_StateKind_lsType" itemValue="id" items="${statetypes}" path="/statetypes" required="true" z="4giz+M1Uhoacgr6+wHNBciBZRfc="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_StateKind_lsTypeAndKind" z="XagCo+LWKdgEbxx4vitk2Ce8S10="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/statekinds/views.xml b/src/main/webapp/WEB-INF/views/statekinds/views.xml
deleted file mode 100755
index 61f8c0276..000000000
--- a/src/main/webapp/WEB-INF/views/statekinds/views.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="statekinds/list">
-        <put-attribute name="body" value="/WEB-INF/views/statekinds/list.jspx"/>
-    </definition>
-<definition extends="default" name="statekinds/show">
-        <put-attribute name="body" value="/WEB-INF/views/statekinds/show.jspx"/>
-    </definition>
-<definition extends="default" name="statekinds/create">
-        <put-attribute name="body" value="/WEB-INF/views/statekinds/create.jspx"/>
-    </definition>
-<definition extends="default" name="statekinds/update">
-        <put-attribute name="body" value="/WEB-INF/views/statekinds/update.jspx"/>
-    </definition>
-<definition extends="default" name="statekinds/findStateKindsByKindNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/statekinds/findStateKindsByKindNameEquals.jspx"/>
-    </definition>
-<definition extends="default" name="statekinds/findStateKindsByKindNameEqualsAndLsType">
-        <put-attribute name="body" value="/WEB-INF/views/statekinds/findStateKindsByKindNameEqualsAndLsType.jspx"/>
-    </definition>
-<definition extends="default" name="statekinds/findStateKindsByLsType">
-        <put-attribute name="body" value="/WEB-INF/views/statekinds/findStateKindsByLsType.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/statetypes/create.jspx b/src/main/webapp/WEB-INF/views/statetypes/create.jspx
deleted file mode 100755
index d0f5ef4d2..000000000
--- a/src/main/webapp/WEB-INF/views/statetypes/create.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_StateType" modelAttribute="stateType" path="/statetypes" render="${empty dependencies}" z="mzpx/IHKgePaXPgE15zxBhDOPHs=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_StateType_typeName" required="true" z="CsK1zURUSaQqJvM4UKQntVy/+EU="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_StateType" render="${not empty dependencies}" z="+1vpRixvWG3Ws33w9nrDx65HEdQ="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/statetypes/findStateTypesByTypeNameEquals.jspx b/src/main/webapp/WEB-INF/views/statetypes/findStateTypesByTypeNameEquals.jspx
deleted file mode 100755
index c27a691ad..000000000
--- a/src/main/webapp/WEB-INF/views/statetypes/findStateTypesByTypeNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByTypeNameEquals" id="ff_com_labsynch_labseer_domain_StateType" path="/statetypes" z="57DAS09p42BQZMSmB7t6ZP0LsPM=">
-        <field:input disableFormBinding="true" field="typeName" id="f_com_labsynch_labseer_domain_StateType_typeName" max="64" required="true" z="Y9bTE4oclCbpiHmNXjAPFmfNtaM="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/statetypes/list.jspx b/src/main/webapp/WEB-INF/views/statetypes/list.jspx
deleted file mode 100755
index f9af121d2..000000000
--- a/src/main/webapp/WEB-INF/views/statetypes/list.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_StateType" items="${statetypes}" z="JiYmjNpe8K2jblV9kLgKXZ5gOXs=">
-        <table:table data="${statetypes}" id="l_com_labsynch_labseer_domain_StateType" path="/statetypes" z="Yxb+ifCBYw+5Vi16WhByUgh/3i0=">
-            <table:column id="c_com_labsynch_labseer_domain_StateType_typeName" property="typeName" z="BnLBqDS/vref5JjxWhRQqACn570="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/statetypes/show.jspx b/src/main/webapp/WEB-INF/views/statetypes/show.jspx
deleted file mode 100755
index 1557f1a59..000000000
--- a/src/main/webapp/WEB-INF/views/statetypes/show.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_StateType" object="${statetype}" path="/statetypes" z="DkhctHymfhT1U/5sgRE9v/5PgZ8=">
-        <field:display field="typeName" id="s_com_labsynch_labseer_domain_StateType_typeName" object="${statetype}" z="Fqjck7enlMCMi/GcytG3k4cVoDg="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/statetypes/update.jspx b/src/main/webapp/WEB-INF/views/statetypes/update.jspx
deleted file mode 100755
index 40da13fbb..000000000
--- a/src/main/webapp/WEB-INF/views/statetypes/update.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_StateType" modelAttribute="stateType" path="/statetypes" versionField="Version" z="ydskOG8FXMQ8+XwLqv/l1CwQhXU=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_StateType_typeName" required="true" z="CsK1zURUSaQqJvM4UKQntVy/+EU="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/statetypes/views.xml b/src/main/webapp/WEB-INF/views/statetypes/views.xml
deleted file mode 100755
index b4853ee80..000000000
--- a/src/main/webapp/WEB-INF/views/statetypes/views.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="statetypes/list">
-        <put-attribute name="body" value="/WEB-INF/views/statetypes/list.jspx"/>
-    </definition>
-<definition extends="default" name="statetypes/show">
-        <put-attribute name="body" value="/WEB-INF/views/statetypes/show.jspx"/>
-    </definition>
-<definition extends="default" name="statetypes/create">
-        <put-attribute name="body" value="/WEB-INF/views/statetypes/create.jspx"/>
-    </definition>
-<definition extends="default" name="statetypes/update">
-        <put-attribute name="body" value="/WEB-INF/views/statetypes/update.jspx"/>
-    </definition>
-<definition extends="default" name="statetypes/findStateTypesByTypeNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/statetypes/findStateTypesByTypeNameEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/stereocategorys/create.jspx b/src/main/webapp/WEB-INF/views/stereocategorys/create.jspx
deleted file mode 100644
index 90bd6506d..000000000
--- a/src/main/webapp/WEB-INF/views/stereocategorys/create.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_StereoCategory" modelAttribute="stereoCategory" path="/stereocategorys" render="${empty dependencies}" z="ZySzPolqlvC9mKpvjBQfTOurEuM=">
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_StereoCategory_name" z="pruJvXnRSFVZC2YCzOIg1LfIyxQ="/>
-        <field:textarea field="code" id="c_com_labsynch_labseer_domain_StereoCategory_code" z="k6KYyxHg/aNWkuJbbXZgiXKIVNk="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_StereoCategory" render="${not empty dependencies}" z="TLqIXy4Qy6MIJqBrMBdoasqI47M="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/stereocategorys/findStereoCategorysByCodeEquals.jspx b/src/main/webapp/WEB-INF/views/stereocategorys/findStereoCategorysByCodeEquals.jspx
deleted file mode 100644
index 0a96ffa10..000000000
--- a/src/main/webapp/WEB-INF/views/stereocategorys/findStereoCategorysByCodeEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeEquals" id="ff_com_labsynch_labseer_domain_StereoCategory" path="/stereocategorys" z="FV11jYTiL6cpe/S9Zj5DZ9/2mYk=">
-        <field:input disableFormBinding="true" field="code" id="f_com_labsynch_labseer_domain_StereoCategory_code" max="255" required="true" z="6twP6RLQ86Se8KFYp0V02/QleeQ="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/stereocategorys/findStereoCategorysByCodeLike.jspx b/src/main/webapp/WEB-INF/views/stereocategorys/findStereoCategorysByCodeLike.jspx
deleted file mode 100644
index 7e95ebb58..000000000
--- a/src/main/webapp/WEB-INF/views/stereocategorys/findStereoCategorysByCodeLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeLike" id="ff_com_labsynch_labseer_domain_StereoCategory" path="/stereocategorys" z="VZQi1gdCKSiT/feAcW1fcZ2U0jg=">
-        <field:input disableFormBinding="true" field="code" id="f_com_labsynch_labseer_domain_StereoCategory_code" max="255" required="true" z="6twP6RLQ86Se8KFYp0V02/QleeQ="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/stereocategorys/list.jspx b/src/main/webapp/WEB-INF/views/stereocategorys/list.jspx
deleted file mode 100644
index c08de2ac0..000000000
--- a/src/main/webapp/WEB-INF/views/stereocategorys/list.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_StereoCategory" items="${stereocategorys}" z="fjH/Pm/uYEWKy4JfJtK67Z3A5as=">
-        <table:table data="${stereocategorys}" id="l_com_labsynch_labseer_domain_StereoCategory" path="/stereocategorys" z="bpW2GQKQAbt6gnMotRQhQ3BVgiA=">
-            <table:column id="c_com_labsynch_labseer_domain_StereoCategory_name" property="name" z="yoXgi3+Bs00DqXPTslNzoNZ0iMU="/>
-            <table:column id="c_com_labsynch_labseer_domain_StereoCategory_code" property="code" z="ewCEFi8AH0ipgpAX7yJ7B+Jbods="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/stereocategorys/show.jspx b/src/main/webapp/WEB-INF/views/stereocategorys/show.jspx
deleted file mode 100644
index a7dcda8c5..000000000
--- a/src/main/webapp/WEB-INF/views/stereocategorys/show.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_StereoCategory" object="${stereocategory}" path="/stereocategorys" z="VMtVexWJ/UpOtpLcKDTgVUQ9kAI=">
-        <field:display field="name" id="s_com_labsynch_labseer_domain_StereoCategory_name" object="${stereocategory}" z="QiUD1MF2ZpswuL9nn00fQBi1PD0="/>
-        <field:display field="code" id="s_com_labsynch_labseer_domain_StereoCategory_code" object="${stereocategory}" z="0RDGwGaQhpEXpp/2OANUuMMJUnM="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/stereocategorys/update.jspx b/src/main/webapp/WEB-INF/views/stereocategorys/update.jspx
deleted file mode 100644
index 662fb5a3a..000000000
--- a/src/main/webapp/WEB-INF/views/stereocategorys/update.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_StereoCategory" modelAttribute="stereoCategory" path="/stereocategorys" versionField="Version" z="SVKK7BF/CvSiI2TTIJBgAZqJTko=">
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_StereoCategory_name" z="pruJvXnRSFVZC2YCzOIg1LfIyxQ="/>
-        <field:textarea field="code" id="c_com_labsynch_labseer_domain_StereoCategory_code" z="k6KYyxHg/aNWkuJbbXZgiXKIVNk="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/stereocategorys/views.xml b/src/main/webapp/WEB-INF/views/stereocategorys/views.xml
deleted file mode 100644
index 2bcd752cf..000000000
--- a/src/main/webapp/WEB-INF/views/stereocategorys/views.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="stereocategorys/list">
-        <put-attribute name="body" value="/WEB-INF/views/stereocategorys/list.jspx"/>
-    </definition>
-<definition extends="default" name="stereocategorys/show">
-        <put-attribute name="body" value="/WEB-INF/views/stereocategorys/show.jspx"/>
-    </definition>
-<definition extends="default" name="stereocategorys/create">
-        <put-attribute name="body" value="/WEB-INF/views/stereocategorys/create.jspx"/>
-    </definition>
-<definition extends="default" name="stereocategorys/update">
-        <put-attribute name="body" value="/WEB-INF/views/stereocategorys/update.jspx"/>
-    </definition>
-<definition extends="default" name="stereocategorys/findStereoCategorysByCodeEquals">
-        <put-attribute name="body" value="/WEB-INF/views/stereocategorys/findStereoCategorysByCodeEquals.jspx"/>
-    </definition>
-<definition extends="default" name="stereocategorys/findStereoCategorysByCodeLike">
-        <put-attribute name="body" value="/WEB-INF/views/stereocategorys/findStereoCategorysByCodeLike.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/structurekinds/create.jspx b/src/main/webapp/WEB-INF/views/structurekinds/create.jspx
deleted file mode 100644
index e6d41ca99..000000000
--- a/src/main/webapp/WEB-INF/views/structurekinds/create.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_StructureKind" modelAttribute="structureKind" path="/structurekinds" render="${empty dependencies}" z="WsbpYE7jifusOnlMLE0HdnDtpSQ=">
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_StructureKind_lsType" itemValue="id" items="${structuretypes}" path="/structuretypes" required="true" z="JDTjOk+/pIM1XAqYnbW4aU/zoHY="/>
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_StructureKind_kindName" required="true" z="+fqk1pirXGDhQMiGy8V68K5Rof8="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_StructureKind_lsTypeAndKind" z="QCh//rBWDXThEdlij04phJCf6M0="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_StructureKind" render="${not empty dependencies}" z="vmlX/EIVPu8n8jcIdSjJRO29nKY="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/structurekinds/list.jspx b/src/main/webapp/WEB-INF/views/structurekinds/list.jspx
deleted file mode 100644
index 5d17844aa..000000000
--- a/src/main/webapp/WEB-INF/views/structurekinds/list.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_StructureKind" items="${structurekinds}" z="HuR1au8KsNAN0CmlrKeQG8qrnMA=">
-        <table:table data="${structurekinds}" id="l_com_labsynch_labseer_domain_StructureKind" path="/structurekinds" z="vprlBEvtZ4l1/d2fEqAl47NMGiA=">
-            <table:column id="c_com_labsynch_labseer_domain_StructureKind_lsType" property="lsType" z="nC2qWnOUw0jYSdc+9IPNq+ET+kM="/>
-            <table:column id="c_com_labsynch_labseer_domain_StructureKind_kindName" property="kindName" z="3t6eToToJ575IZ+nmpnxRGvqcIQ="/>
-            <table:column id="c_com_labsynch_labseer_domain_StructureKind_lsTypeAndKind" property="lsTypeAndKind" z="KKGbP3UQO0l0kKb45/hA7GEf4IE="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/structurekinds/show.jspx b/src/main/webapp/WEB-INF/views/structurekinds/show.jspx
deleted file mode 100644
index c71609661..000000000
--- a/src/main/webapp/WEB-INF/views/structurekinds/show.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_StructureKind" object="${structurekind}" path="/structurekinds" z="Gn7/X2LOIsbqgpmKQkNp23ENVGk=">
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_StructureKind_lsType" object="${structurekind}" z="oLUkDrhXT2adfOuLVtnYXf4hcJE="/>
-        <field:display field="kindName" id="s_com_labsynch_labseer_domain_StructureKind_kindName" object="${structurekind}" z="hzZoPk+7vsUBkf/hYf3xc1ur3ko="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_StructureKind_lsTypeAndKind" object="${structurekind}" z="mHi5iKqNjPUPWztSk3LT5YbyS30="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/structurekinds/update.jspx b/src/main/webapp/WEB-INF/views/structurekinds/update.jspx
deleted file mode 100644
index 1f0dd50d9..000000000
--- a/src/main/webapp/WEB-INF/views/structurekinds/update.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_StructureKind" modelAttribute="structureKind" path="/structurekinds" versionField="Version" z="p0PozF/vPblgyccM6qEx4ecbjRc=">
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_StructureKind_lsType" itemValue="id" items="${structuretypes}" path="/structuretypes" required="true" z="JDTjOk+/pIM1XAqYnbW4aU/zoHY="/>
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_StructureKind_kindName" required="true" z="+fqk1pirXGDhQMiGy8V68K5Rof8="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_StructureKind_lsTypeAndKind" z="QCh//rBWDXThEdlij04phJCf6M0="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/structurekinds/views.xml b/src/main/webapp/WEB-INF/views/structurekinds/views.xml
deleted file mode 100644
index 9c8cd9431..000000000
--- a/src/main/webapp/WEB-INF/views/structurekinds/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="structurekinds/list">
-        <put-attribute name="body" value="/WEB-INF/views/structurekinds/list.jspx"/>
-    </definition>
-<definition extends="default" name="structurekinds/show">
-        <put-attribute name="body" value="/WEB-INF/views/structurekinds/show.jspx"/>
-    </definition>
-<definition extends="default" name="structurekinds/create">
-        <put-attribute name="body" value="/WEB-INF/views/structurekinds/create.jspx"/>
-    </definition>
-<definition extends="default" name="structurekinds/update">
-        <put-attribute name="body" value="/WEB-INF/views/structurekinds/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/structuretypes/create.jspx b/src/main/webapp/WEB-INF/views/structuretypes/create.jspx
deleted file mode 100644
index 3ea75acf7..000000000
--- a/src/main/webapp/WEB-INF/views/structuretypes/create.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_StructureType" modelAttribute="structureType" path="/structuretypes" render="${empty dependencies}" z="br9UiTxqdyxKkncAGLNBVOPgs+0=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_StructureType_typeName" required="true" z="ipwA9+W1AcR1OG7zGrizxFTgChA="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_StructureType" render="${not empty dependencies}" z="kv6gMBbV0kGzn/RU1RoxKlfAnto="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/structuretypes/list.jspx b/src/main/webapp/WEB-INF/views/structuretypes/list.jspx
deleted file mode 100644
index 4cf1f2f64..000000000
--- a/src/main/webapp/WEB-INF/views/structuretypes/list.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_StructureType" items="${structuretypes}" z="Ibj/7y3tyxMLhNZbWy37SxICy4A=">
-        <table:table data="${structuretypes}" id="l_com_labsynch_labseer_domain_StructureType" path="/structuretypes" z="GF1o/TPRv+l0rUYE7MR4uCGLV/M=">
-            <table:column id="c_com_labsynch_labseer_domain_StructureType_typeName" property="typeName" z="Op/QdpeYOxnSF0BruD/QerdqJ0M="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/structuretypes/show.jspx b/src/main/webapp/WEB-INF/views/structuretypes/show.jspx
deleted file mode 100644
index a5cbcfad2..000000000
--- a/src/main/webapp/WEB-INF/views/structuretypes/show.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_StructureType" object="${structuretype}" path="/structuretypes" z="BmyZt3Q/CFgXdgu2tp+K2iXXWpk=">
-        <field:display field="typeName" id="s_com_labsynch_labseer_domain_StructureType_typeName" object="${structuretype}" z="8ZSlrDbCUzICaEfltN2amembEd4="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/structuretypes/update.jspx b/src/main/webapp/WEB-INF/views/structuretypes/update.jspx
deleted file mode 100644
index 3b0834f09..000000000
--- a/src/main/webapp/WEB-INF/views/structuretypes/update.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_StructureType" modelAttribute="structureType" path="/structuretypes" versionField="Version" z="vgpljaw+peQHHUnSo99edKJwxP4=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_StructureType_typeName" required="true" z="ipwA9+W1AcR1OG7zGrizxFTgChA="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/structuretypes/views.xml b/src/main/webapp/WEB-INF/views/structuretypes/views.xml
deleted file mode 100644
index b4f79b1a5..000000000
--- a/src/main/webapp/WEB-INF/views/structuretypes/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="structuretypes/list">
-        <put-attribute name="body" value="/WEB-INF/views/structuretypes/list.jspx"/>
-    </definition>
-<definition extends="default" name="structuretypes/show">
-        <put-attribute name="body" value="/WEB-INF/views/structuretypes/show.jspx"/>
-    </definition>
-<definition extends="default" name="structuretypes/create">
-        <put-attribute name="body" value="/WEB-INF/views/structuretypes/create.jspx"/>
-    </definition>
-<definition extends="default" name="structuretypes/update">
-        <put-attribute name="body" value="/WEB-INF/views/structuretypes/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/subjectlabels/create.jspx b/src/main/webapp/WEB-INF/views/subjectlabels/create.jspx
deleted file mode 100755
index 2cc26c196..000000000
--- a/src/main/webapp/WEB-INF/views/subjectlabels/create.jspx
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_SubjectLabel" modelAttribute="subjectLabel" path="/subjectlabels" render="${empty dependencies}" z="QKB93WDe1cdRbmpQ9J4c/2Q47oI=">
-        <field:textarea field="labelText" id="c_com_labsynch_labseer_domain_SubjectLabel_labelText" required="true" z="loMF/07bowkWYiGO0qMY/t8Meno="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_SubjectLabel_recordedBy" required="true" z="gYW+xkRHOpn/DQnTgXpGjlNT0Bs="/>
-        <field:datetime dateTimePattern="${subjectLabel_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_SubjectLabel_recordedDate" required="true" z="HWZ+eSiLhHhaj90U503E+Vo/Iq8="/>
-        <field:datetime dateTimePattern="${subjectLabel_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_SubjectLabel_modifiedDate" z="6Z2cFrBzvWTU5qiDBbijwPLfpos="/>
-        <field:checkbox field="physicallyLabled" id="c_com_labsynch_labseer_domain_SubjectLabel_physicallyLabled" z="f/IcZ8tM2ZPTb8ke5NZYSto7gjA="/>
-        <field:textarea field="imageFile" id="c_com_labsynch_labseer_domain_SubjectLabel_imageFile" z="Tj/95sFS2jHaJqRTREflSKqd31s="/>
-        <field:checkbox field="preferred" id="c_com_labsynch_labseer_domain_SubjectLabel_preferred" z="jlTZaNsZ+Hg3afQUrHZT/w1cVO0="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_SubjectLabel_ignored" z="rD2ctT/+g299Rrx6SDidWCcO3BA="/>
-        <field:select field="subject" id="c_com_labsynch_labseer_domain_SubjectLabel_subject" itemValue="id" items="${subjects}" path="/subjects" required="true" z="mh5puXh2P3pLlPty3IqSq75hUfY="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_SubjectLabel_lsTransaction" validationMessageCode="field_invalid_integer" z="5T6N6cH9QztgAEy/m36ufpBfyok="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_SubjectLabel_lsType" required="true" z="LbJ3ykOyc89Ak0xiBcIAQLcGAn4="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_SubjectLabel_lsKind" required="true" z="tO+QQQdNrlGfuAk/uOQRsYHxLyU="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_SubjectLabel_lsTypeAndKind" z="pPTupc3rY81iqlFoDNAPle2HU8U="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_SubjectLabel_deleted" z="2Ll5qoZ5uCnIz8Ej0XzmF17wtl4="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_SubjectLabel" render="${not empty dependencies}" z="1IpRNiIYt5SAR0KWBgQFcb4PGG8="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/subjectlabels/findSubjectLabelsBySubject.jspx b/src/main/webapp/WEB-INF/views/subjectlabels/findSubjectLabelsBySubject.jspx
deleted file mode 100755
index 27d13e38c..000000000
--- a/src/main/webapp/WEB-INF/views/subjectlabels/findSubjectLabelsBySubject.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="BySubject" id="ff_com_labsynch_labseer_domain_SubjectLabel" path="/subjectlabels" z="1LXmxT7xVfNdEzqMYyPul9zSubI=">
-        <field:select disableFormBinding="true" field="subject" id="f_com_labsynch_labseer_domain_SubjectLabel_subject" itemValue="id" items="${subjects}" path="/subjects" required="true" z="FyXnYx6eUg/WLNS3eFnjOiqNy5U="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/subjectlabels/list.jspx b/src/main/webapp/WEB-INF/views/subjectlabels/list.jspx
deleted file mode 100755
index 93e975176..000000000
--- a/src/main/webapp/WEB-INF/views/subjectlabels/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_SubjectLabel" items="${subjectlabels}" z="Cq/t01AgdzggjTpNCGK9beQfIes=">
-        <table:table data="${subjectlabels}" id="l_com_labsynch_labseer_domain_SubjectLabel" path="/subjectlabels" z="pN+jBRW3+kJxqDozT4gMap/cdDc=">
-            <table:column id="c_com_labsynch_labseer_domain_SubjectLabel_labelText" property="labelText" z="TUPFYi7o+Iwv6Oj73Il6eCWIKvo="/>
-            <table:column id="c_com_labsynch_labseer_domain_SubjectLabel_recordedBy" property="recordedBy" z="3BLrECS0MwhGNdMpgOKh1Do19Vk="/>
-            <table:column date="true" dateTimePattern="${subjectLabel_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_SubjectLabel_recordedDate" property="recordedDate" z="QOTJIEHyKthLw67cnAQyotg+4jY="/>
-            <table:column date="true" dateTimePattern="${subjectLabel_modifieddate_date_format}" id="c_com_labsynch_labseer_domain_SubjectLabel_modifiedDate" property="modifiedDate" z="zMeDGcuFnDz+C8Stma4IJ2Syi3Y="/>
-            <table:column id="c_com_labsynch_labseer_domain_SubjectLabel_physicallyLabled" property="physicallyLabled" z="ySJ0/efRo7PK37VXY+bXkRK2HFw="/>
-            <table:column id="c_com_labsynch_labseer_domain_SubjectLabel_imageFile" property="imageFile" z="Pw9WK8ys+1uc/WgT+r6M0nHqCWc="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/subjectlabels/show.jspx b/src/main/webapp/WEB-INF/views/subjectlabels/show.jspx
deleted file mode 100755
index 0a122ccea..000000000
--- a/src/main/webapp/WEB-INF/views/subjectlabels/show.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_SubjectLabel" object="${subjectlabel}" path="/subjectlabels" z="is1u8EwsIXHsgiypRmFThC3XPlk=">
-        <field:display field="labelText" id="s_com_labsynch_labseer_domain_SubjectLabel_labelText" object="${subjectlabel}" z="vLdXrRNMz6cVTpAD2eq8Mo/XLIw="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_SubjectLabel_recordedBy" object="${subjectlabel}" z="Y5t+NBy8kdsoG9lQIALmu0sLM04="/>
-        <field:display date="true" dateTimePattern="${subjectLabel_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_SubjectLabel_recordedDate" object="${subjectlabel}" z="P1eUoA/wxjGq1i64+CLdzEOAR8M="/>
-        <field:display date="true" dateTimePattern="${subjectLabel_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_SubjectLabel_modifiedDate" object="${subjectlabel}" z="cKZcrwSuoSmSYHuyOeVN++ng+dE="/>
-        <field:display field="physicallyLabled" id="s_com_labsynch_labseer_domain_SubjectLabel_physicallyLabled" object="${subjectlabel}" z="JHuLJJdYhduCMy8OzIlnn0QjBrI="/>
-        <field:display field="imageFile" id="s_com_labsynch_labseer_domain_SubjectLabel_imageFile" object="${subjectlabel}" z="GJYOrrWNh8Hy9sw494k1WlLSx/o="/>
-        <field:display field="preferred" id="s_com_labsynch_labseer_domain_SubjectLabel_preferred" object="${subjectlabel}" z="8MkAtU4+0V9KFSeRfRhXLCwrUV0="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_SubjectLabel_ignored" object="${subjectlabel}" z="12kFHmR4o+v5kVA6FegCsodJC0Y="/>
-        <field:display field="subject" id="s_com_labsynch_labseer_domain_SubjectLabel_subject" object="${subjectlabel}" z="Vv5QjJ4f8jV0ZxXGXCz9aWAxdzY="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_SubjectLabel_lsTransaction" object="${subjectlabel}" z="prCsLAUrEZOqzrN++QvtDa4OP10="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_SubjectLabel_lsType" object="${subjectlabel}" z="S17GYali6VcnfnsQNK7b6k5rDqY="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_SubjectLabel_lsKind" object="${subjectlabel}" z="6fjjySMYDtKH+tauHy64YoghZK4="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_SubjectLabel_lsTypeAndKind" object="${subjectlabel}" z="uJbwvMzipz7s/lhy+4P0NUgRSN4="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_SubjectLabel_deleted" object="${subjectlabel}" z="vizyFlhQ5zPcfGrg1cTrQSSVzFA="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/subjectlabels/update.jspx b/src/main/webapp/WEB-INF/views/subjectlabels/update.jspx
deleted file mode 100755
index d817e29c3..000000000
--- a/src/main/webapp/WEB-INF/views/subjectlabels/update.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_SubjectLabel" modelAttribute="subjectLabel" path="/subjectlabels" versionField="Version" z="xre5VE8bku2IadzHG9l642Yq5Fs=">
-        <field:textarea field="labelText" id="c_com_labsynch_labseer_domain_SubjectLabel_labelText" required="true" z="loMF/07bowkWYiGO0qMY/t8Meno="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_SubjectLabel_recordedBy" required="true" z="gYW+xkRHOpn/DQnTgXpGjlNT0Bs="/>
-        <field:datetime dateTimePattern="${subjectLabel_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_SubjectLabel_recordedDate" required="true" z="HWZ+eSiLhHhaj90U503E+Vo/Iq8="/>
-        <field:datetime dateTimePattern="${subjectLabel_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_SubjectLabel_modifiedDate" z="6Z2cFrBzvWTU5qiDBbijwPLfpos="/>
-        <field:checkbox field="physicallyLabled" id="c_com_labsynch_labseer_domain_SubjectLabel_physicallyLabled" z="f/IcZ8tM2ZPTb8ke5NZYSto7gjA="/>
-        <field:textarea field="imageFile" id="c_com_labsynch_labseer_domain_SubjectLabel_imageFile" z="Tj/95sFS2jHaJqRTREflSKqd31s="/>
-        <field:checkbox field="preferred" id="c_com_labsynch_labseer_domain_SubjectLabel_preferred" z="jlTZaNsZ+Hg3afQUrHZT/w1cVO0="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_SubjectLabel_ignored" z="rD2ctT/+g299Rrx6SDidWCcO3BA="/>
-        <field:select field="subject" id="c_com_labsynch_labseer_domain_SubjectLabel_subject" itemValue="id" items="${subjects}" path="/subjects" required="true" z="mh5puXh2P3pLlPty3IqSq75hUfY="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_SubjectLabel_lsTransaction" validationMessageCode="field_invalid_integer" z="5T6N6cH9QztgAEy/m36ufpBfyok="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_SubjectLabel_lsType" required="true" z="LbJ3ykOyc89Ak0xiBcIAQLcGAn4="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_SubjectLabel_lsKind" required="true" z="tO+QQQdNrlGfuAk/uOQRsYHxLyU="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_SubjectLabel_lsTypeAndKind" z="pPTupc3rY81iqlFoDNAPle2HU8U="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_SubjectLabel_deleted" z="2Ll5qoZ5uCnIz8Ej0XzmF17wtl4="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/subjectlabels/views.xml b/src/main/webapp/WEB-INF/views/subjectlabels/views.xml
deleted file mode 100755
index 06f74dbb1..000000000
--- a/src/main/webapp/WEB-INF/views/subjectlabels/views.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="subjectlabels/list">
-        <put-attribute name="body" value="/WEB-INF/views/subjectlabels/list.jspx"/>
-    </definition>
-<definition extends="default" name="subjectlabels/show">
-        <put-attribute name="body" value="/WEB-INF/views/subjectlabels/show.jspx"/>
-    </definition>
-<definition extends="default" name="subjectlabels/create">
-        <put-attribute name="body" value="/WEB-INF/views/subjectlabels/create.jspx"/>
-    </definition>
-<definition extends="default" name="subjectlabels/update">
-        <put-attribute name="body" value="/WEB-INF/views/subjectlabels/update.jspx"/>
-    </definition>
-<definition extends="default" name="subjectlabels/findSubjectLabelsBySubject">
-        <put-attribute name="body" value="/WEB-INF/views/subjectlabels/findSubjectLabelsBySubject.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/subjects/create.jspx b/src/main/webapp/WEB-INF/views/subjects/create.jspx
deleted file mode 100755
index c5cbc88be..000000000
--- a/src/main/webapp/WEB-INF/views/subjects/create.jspx
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_Subject" modelAttribute="subject" path="/subjects" render="${empty dependencies}" z="J9UV5YXGSqYzwjtMc0eZ5eamBuQ=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_Subject_recordedBy" required="true" z="g6Gd5MIBgf66byIWE81oB0FBllY="/>
-        <field:datetime dateTimePattern="${subject_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_Subject_recordedDate" required="true" z="4axQrsJGILEK25Ljf4HhD7yzeBg="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_Subject_modifiedBy" z="39JBWXy8WyClhdYYVLOiOBYoMNY="/>
-        <field:datetime dateTimePattern="${subject_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_Subject_modifiedDate" z="I2v3Hp+26XHe8G91z7wWdufJLHs="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_Subject_ignored" z="ZwJi0WOsZ6h8yN1HGYDpVBgcIfQ="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_Subject_lsTransaction" validationMessageCode="field_invalid_integer" z="nNUtkBFE1p6OuS6brb9eMNUMXw4="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_Subject_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="4wmwsWSqO/gVovulIzedaWV2mKg="/>
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_Subject_codeName" z="NHMFlOAuq5YC4vNgAftQUY/pBrk="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_Subject_lsType" required="true" z="fxJ5plTHSqk9+86VnCug+mqqPQY="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_Subject_lsKind" required="true" z="K4uDVl4QfOMZAjtgw0O3rqWn6MA="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_Subject_lsTypeAndKind" z="9v+JBQtJNX5i8fWS27mMoC/2e04="/>
-        <field:simple field="lsLabels" id="c_com_labsynch_labseer_domain_Subject_lsLabels" messageCode="entity_reference_not_managed" messageCodeAttribute="Subject Label" z="Hwu3tsh7EV65uBH9xnmz99tk50Y="/>
-        <field:simple field="lsStates" id="c_com_labsynch_labseer_domain_Subject_lsStates" messageCode="entity_reference_not_managed" messageCodeAttribute="Subject State" z="bi05r8z5xTjjPwe4ovuL+1yhuWc="/>
-        <field:select field="treatmentGroups" id="c_com_labsynch_labseer_domain_Subject_treatmentGroups" itemValue="id" items="${treatmentgroups}" multiple="true" path="/treatmentgroups" z="8loIl+9D3CRAINdCNPe6Q4aA2o4="/>
-        <field:simple field="containers" id="c_com_labsynch_labseer_domain_Subject_containers" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Subject Container" z="cakakeNPMta13IS/WSvmOjzrio0="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_Subject_deleted" z="V82/IRSa/P0Ex5+hHBO9Z+NIQYM="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_Subject" render="${not empty dependencies}" z="0wZfomy5H/EUhR83K3hqz+nFY54="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/subjects/findSubjectsByCodeNameEquals.jspx b/src/main/webapp/WEB-INF/views/subjects/findSubjectsByCodeNameEquals.jspx
deleted file mode 100755
index a774c41fb..000000000
--- a/src/main/webapp/WEB-INF/views/subjects/findSubjectsByCodeNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeNameEquals" id="ff_com_labsynch_labseer_domain_Subject" path="/subjects" z="BC/9MXKMU+P5HAIq217ChPCUito=">
-        <field:input disableFormBinding="true" field="codeName" id="f_com_labsynch_labseer_domain_Subject_codeName" max="255" required="true" z="/DfzA6p96RpKloLtCA5LliqtOjU="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/subjects/findSubjectsByLsTransactionEquals.jspx b/src/main/webapp/WEB-INF/views/subjects/findSubjectsByLsTransactionEquals.jspx
deleted file mode 100755
index 7856b9d3f..000000000
--- a/src/main/webapp/WEB-INF/views/subjects/findSubjectsByLsTransactionEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTransactionEquals" id="ff_com_labsynch_labseer_domain_Subject" path="/subjects" z="hxbBpHDzkaKzRFYe2X6vft3ZiFs=">
-        <field:input disableFormBinding="true" field="lsTransaction" id="f_com_labsynch_labseer_domain_Subject_lsTransaction" required="true" validationMessageCode="field_invalid_integer" z="ur/CwmzOdcr8dNbdwlDFPn43xu8="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/subjects/findSubjectsByTreatmentGroup.jspx b/src/main/webapp/WEB-INF/views/subjects/findSubjectsByTreatmentGroup.jspx
deleted file mode 100755
index a64ee2150..000000000
--- a/src/main/webapp/WEB-INF/views/subjects/findSubjectsByTreatmentGroup.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByTreatmentGroup" id="ff_com_labsynch_labseer_domain_Subject" path="/subjects" z="RcvOESXpOJr3wo/mi+74Q7i+4pw=">
-        <field:select disableFormBinding="true" field="treatmentGroup" id="f_com_labsynch_labseer_domain_Subject_treatmentGroup" itemValue="id" items="${treatmentgroups}" path="/treatmentgroups" required="true" z="j8kkrYrM6PFk5eOQVIt7PH59+qU="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/subjects/findSubjectsByTreatmentGroups.jspx b/src/main/webapp/WEB-INF/views/subjects/findSubjectsByTreatmentGroups.jspx
deleted file mode 100644
index 3f9a1a726..000000000
--- a/src/main/webapp/WEB-INF/views/subjects/findSubjectsByTreatmentGroups.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByTreatmentGroups" id="ff_com_labsynch_labseer_domain_Subject" path="/subjects" z="NeRLtQvDgyD2OMVusPeYNRcdjNo=">
-        <field:select disableFormBinding="true" field="treatmentGroups" id="f_com_labsynch_labseer_domain_Subject_treatmentGroups" itemValue="id" items="${treatmentgroups}" multiple="true" path="/treatmentgroups" required="true" z="KQZiEqEUS5MsfiOaeFBK/hStqZU="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/subjects/list.jspx b/src/main/webapp/WEB-INF/views/subjects/list.jspx
deleted file mode 100755
index 9abefda91..000000000
--- a/src/main/webapp/WEB-INF/views/subjects/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_Subject" items="${subjects}" z="LeIeMLuyhlwtrj4dyWzvRe6zCkk=">
-        <table:table data="${subjects}" id="l_com_labsynch_labseer_domain_Subject" path="/subjects" z="Ue/bBgt7qv5m0SzeGCesrpq7VNI=">
-            <table:column id="c_com_labsynch_labseer_domain_Subject_recordedBy" property="recordedBy" z="0y52UE5B9l/GO+JjV3u9veA7YUE="/>
-            <table:column date="true" dateTimePattern="${subject_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_Subject_recordedDate" property="recordedDate" z="OEZC8wW5ilTAA8WJpF2e2Vyjs24="/>
-            <table:column id="c_com_labsynch_labseer_domain_Subject_codeName" property="codeName" z="oJfqz6VWgqTWaOVfUhS6YIVOYPs="/>
-            <table:column id="c_com_labsynch_labseer_domain_Subject_lsType" property="lsType" z="BaCXmQwPXxZ8+Y5ChH2hZPgMn2U="/>
-            <table:column id="c_com_labsynch_labseer_domain_Subject_lsKind" property="lsKind" z="QWmGt89761I80MPSPkJEMYJ9W+E="/>
-            <table:column id="c_com_labsynch_labseer_domain_Subject_lsTypeAndKind" property="lsTypeAndKind" z="TGK7Sejzdq0tL/1CWEOjH59X8IU="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/subjects/show.jspx b/src/main/webapp/WEB-INF/views/subjects/show.jspx
deleted file mode 100755
index 070ebef6a..000000000
--- a/src/main/webapp/WEB-INF/views/subjects/show.jspx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_Subject" object="${subject}" path="/subjects" z="eMnyffkF8NKFnaTdxn9pnLHXaW8=">
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_Subject_recordedBy" object="${subject}" z="EEEKu/DPmV5gXcehm6EP+miLM/8="/>
-        <field:display date="true" dateTimePattern="${subject_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_Subject_recordedDate" object="${subject}" z="WP1nuFI3nVP595Ao3D6iD+a5Y6s="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_Subject_modifiedBy" object="${subject}" z="BR1O7ntlWLBiw2CX+AFeD6C1TTk="/>
-        <field:display date="true" dateTimePattern="${subject_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_Subject_modifiedDate" object="${subject}" z="XeGdtOIHImDtFiJdC1Er/76z28k="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_Subject_ignored" object="${subject}" z="dzL1wcBwP5sORP/uGWbJJh0muoY="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_Subject_lsTransaction" object="${subject}" z="+VUQ7WnyJI3ENGWkWg9li7e+5To="/>
-        <field:display field="codeName" id="s_com_labsynch_labseer_domain_Subject_codeName" object="${subject}" z="J8jFhDGl8xpe4EUC2rnl54QRICo="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_Subject_lsType" object="${subject}" z="9iYAcX+pRDtZF4ILvEDjyxYxojg="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_Subject_lsKind" object="${subject}" z="bQGEHMRaID3qaFTImfOaj53XD/0="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_Subject_lsTypeAndKind" object="${subject}" z="B3WnDuCziy+meAnvJHXJ5azImLk="/>
-        <field:display field="treatmentGroups" id="s_com_labsynch_labseer_domain_Subject_treatmentGroups" object="${subject}" z="oU4Ytr0iaYulP/tTrlhvVo8v/eU="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_Subject_deleted" object="${subject}" z="DgMTl+COOlC8s7YsrTKiP1yswys="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/subjects/update.jspx b/src/main/webapp/WEB-INF/views/subjects/update.jspx
deleted file mode 100755
index bec9da00b..000000000
--- a/src/main/webapp/WEB-INF/views/subjects/update.jspx
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_Subject" modelAttribute="subject" path="/subjects" versionField="Version" z="bWAhDq40FsqWzgnz0mAEWPSVBt4=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_Subject_recordedBy" required="true" z="g6Gd5MIBgf66byIWE81oB0FBllY="/>
-        <field:datetime dateTimePattern="${subject_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_Subject_recordedDate" required="true" z="4axQrsJGILEK25Ljf4HhD7yzeBg="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_Subject_modifiedBy" z="39JBWXy8WyClhdYYVLOiOBYoMNY="/>
-        <field:datetime dateTimePattern="${subject_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_Subject_modifiedDate" z="I2v3Hp+26XHe8G91z7wWdufJLHs="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_Subject_ignored" z="ZwJi0WOsZ6h8yN1HGYDpVBgcIfQ="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_Subject_lsTransaction" validationMessageCode="field_invalid_integer" z="nNUtkBFE1p6OuS6brb9eMNUMXw4="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_Subject_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="4wmwsWSqO/gVovulIzedaWV2mKg="/>
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_Subject_codeName" z="NHMFlOAuq5YC4vNgAftQUY/pBrk="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_Subject_lsType" required="true" z="fxJ5plTHSqk9+86VnCug+mqqPQY="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_Subject_lsKind" required="true" z="K4uDVl4QfOMZAjtgw0O3rqWn6MA="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_Subject_lsTypeAndKind" z="9v+JBQtJNX5i8fWS27mMoC/2e04="/>
-        <field:simple field="lsLabels" id="c_com_labsynch_labseer_domain_Subject_lsLabels" messageCode="entity_reference_not_managed" messageCodeAttribute="Subject Label" z="Hwu3tsh7EV65uBH9xnmz99tk50Y="/>
-        <field:simple field="lsStates" id="c_com_labsynch_labseer_domain_Subject_lsStates" messageCode="entity_reference_not_managed" messageCodeAttribute="Subject State" z="bi05r8z5xTjjPwe4ovuL+1yhuWc="/>
-        <field:select field="treatmentGroups" id="c_com_labsynch_labseer_domain_Subject_treatmentGroups" itemValue="id" items="${treatmentgroups}" multiple="true" path="/treatmentgroups" z="8loIl+9D3CRAINdCNPe6Q4aA2o4="/>
-        <field:simple field="containers" id="c_com_labsynch_labseer_domain_Subject_containers" messageCode="entity_reference_not_managed" messageCodeAttribute="Itx Subject Container" z="cakakeNPMta13IS/WSvmOjzrio0="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_Subject_deleted" z="V82/IRSa/P0Ex5+hHBO9Z+NIQYM="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/subjects/views.xml b/src/main/webapp/WEB-INF/views/subjects/views.xml
deleted file mode 100755
index 47fc8d97e..000000000
--- a/src/main/webapp/WEB-INF/views/subjects/views.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="subjects/list">
-        <put-attribute name="body" value="/WEB-INF/views/subjects/list.jspx"/>
-    </definition>
-<definition extends="default" name="subjects/show">
-        <put-attribute name="body" value="/WEB-INF/views/subjects/show.jspx"/>
-    </definition>
-<definition extends="default" name="subjects/create">
-        <put-attribute name="body" value="/WEB-INF/views/subjects/create.jspx"/>
-    </definition>
-<definition extends="default" name="subjects/update">
-        <put-attribute name="body" value="/WEB-INF/views/subjects/update.jspx"/>
-    </definition>
-<definition extends="default" name="subjects/findSubjectsByCodeNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/subjects/findSubjectsByCodeNameEquals.jspx"/>
-    </definition>
-<definition extends="default" name="subjects/findSubjectsByLsTransactionEquals">
-        <put-attribute name="body" value="/WEB-INF/views/subjects/findSubjectsByLsTransactionEquals.jspx"/>
-    </definition>
-<definition extends="default" name="subjects/findSubjectsByTreatmentGroup">
-        <put-attribute name="body" value="/WEB-INF/views/subjects/findSubjectsByTreatmentGroup.jspx"/>
-    </definition>
-<definition extends="default" name="subjects/findSubjectsByTreatmentGroups">
-        <put-attribute name="body" value="/WEB-INF/views/subjects/findSubjectsByTreatmentGroups.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/subjectstates/create.jspx b/src/main/webapp/WEB-INF/views/subjectstates/create.jspx
deleted file mode 100755
index be9c0e142..000000000
--- a/src/main/webapp/WEB-INF/views/subjectstates/create.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_SubjectState" modelAttribute="subjectState" path="/subjectstates" render="${empty dependencies}" z="1EM6udSS82HRUULvaV7vN8ffR9E=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_SubjectState_recordedBy" required="true" z="/dHNIgz6okMyhvJpWdl51gIQWls="/>
-        <field:datetime dateTimePattern="${subjectState_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_SubjectState_recordedDate" required="true" z="LFxDLEqhnXE5C0c4qdWv4+QuVjY="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_SubjectState_modifiedBy" z="bi7NNK0fK7fgxVjuyoVxrXYUhbI="/>
-        <field:datetime dateTimePattern="${subjectState_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_SubjectState_modifiedDate" z="KZiW5p+FDMfHt+vAWXICDCPXpCE="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_SubjectState_comments" z="8W+j4LEAWVHwen0JRUjjoGIKwCM="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_SubjectState_ignored" z="H0FC97D5/0uNypWCeliNu1MQTKI="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_SubjectState_lsTransaction" validationMessageCode="field_invalid_integer" z="tpsis8Oi9CfIoI2FuPm6oMmZCwg="/>
-        <field:select field="subject" id="c_com_labsynch_labseer_domain_SubjectState_subject" itemValue="id" items="${subjects}" path="/subjects" required="true" z="+Rv+weusIMeqfU5l5hyDyo7fe5Q="/>
-        <field:simple field="lsValues" id="c_com_labsynch_labseer_domain_SubjectState_lsValues" messageCode="entity_reference_not_managed" messageCodeAttribute="Subject Value" z="0mT7qQDUOBXYqw5HBLdWp9ETqtY="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_SubjectState_lsType" required="true" z="PdduCpuStV83NcNPY3BJg2bHBu0="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_SubjectState_lsKind" required="true" z="EP6ZZwh3fwB8tppviEIJNkEMUrE="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_SubjectState_lsTypeAndKind" z="HOSKIDldshyM8ZcpSg1a9LrIlyI="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_SubjectState_deleted" z="2JA/NGx+UKGzHVaasg3JFJJ2LpY="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_SubjectState" render="${not empty dependencies}" z="3Oak72MKbXvn4T/dByFd6NPphnE="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/subjectstates/findSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject.jspx b/src/main/webapp/WEB-INF/views/subjectstates/findSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject.jspx
deleted file mode 100644
index 5f98529d1..000000000
--- a/src/main/webapp/WEB-INF/views/subjectstates/findSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeEqualsAndLsKindEqualsAndSubject" id="ff_com_labsynch_labseer_domain_SubjectState" path="/subjectstates" z="ItfqFyzo+ymY4CKS2CzrpeDoe/0=">
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_SubjectState_lsType" max="64" required="true" z="t5gNLUbpxTceu6QAI6WJyFi/O/8="/>
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_SubjectState_lsKind" max="255" required="true" z="BXwuR6oTjlpCUBPl6xzvtMLvZ14="/>
-        <field:select disableFormBinding="true" field="subject" id="f_com_labsynch_labseer_domain_SubjectState_subject" itemValue="id" items="${subjects}" path="/subjects" required="true" z="8sJRT9EykI+MA6KI4OAzCDQL5qc="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/subjectstates/findSubjectStatesBySubject.jspx b/src/main/webapp/WEB-INF/views/subjectstates/findSubjectStatesBySubject.jspx
deleted file mode 100755
index 813b4edf7..000000000
--- a/src/main/webapp/WEB-INF/views/subjectstates/findSubjectStatesBySubject.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="BySubject" id="ff_com_labsynch_labseer_domain_SubjectState" path="/subjectstates" z="lFV7k10RJwawtXywXYsuRUzYJ3I=">
-        <field:select disableFormBinding="true" field="subject" id="f_com_labsynch_labseer_domain_SubjectState_subject" itemValue="id" items="${subjects}" path="/subjects" required="true" z="8sJRT9EykI+MA6KI4OAzCDQL5qc="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/subjectstates/list.jspx b/src/main/webapp/WEB-INF/views/subjectstates/list.jspx
deleted file mode 100755
index 1fb094fc2..000000000
--- a/src/main/webapp/WEB-INF/views/subjectstates/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_SubjectState" items="${subjectstates}" z="drSybCQKqODz7zFUc1+fx7NFEbs=">
-        <table:table data="${subjectstates}" id="l_com_labsynch_labseer_domain_SubjectState" path="/subjectstates" z="I9NJbFOtY/L55Mc9heS5Exw9+YI=">
-            <table:column id="c_com_labsynch_labseer_domain_SubjectState_recordedBy" property="recordedBy" z="74G5h+UhQE6JAaLzNhtWaLBHzRA="/>
-            <table:column date="true" dateTimePattern="${subjectState_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_SubjectState_recordedDate" property="recordedDate" z="If3nCNmXhUeX8nGLoVhoEmFGaRM="/>
-            <table:column id="c_com_labsynch_labseer_domain_SubjectState_modifiedBy" property="modifiedBy" z="13VVUszX+lUM1KE7j8fyh/qJgVk="/>
-            <table:column date="true" dateTimePattern="${subjectState_modifieddate_date_format}" id="c_com_labsynch_labseer_domain_SubjectState_modifiedDate" property="modifiedDate" z="gwMgJOkvY2atizZjubsK+a1wBIQ="/>
-            <table:column id="c_com_labsynch_labseer_domain_SubjectState_lsType" property="lsType" z="gtUUG4hLQrVmvfec7QXwJT+QJKc="/>
-            <table:column id="c_com_labsynch_labseer_domain_SubjectState_lsKind" property="lsKind" z="/XBon27xQa2PMOEV8nUxaLf1IQM="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/subjectstates/show.jspx b/src/main/webapp/WEB-INF/views/subjectstates/show.jspx
deleted file mode 100755
index c6f1303ff..000000000
--- a/src/main/webapp/WEB-INF/views/subjectstates/show.jspx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_SubjectState" object="${subjectstate}" path="/subjectstates" z="AoaU1CIxrgzEEnQXBP7tHbPUIbw=">
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_SubjectState_recordedBy" object="${subjectstate}" z="yQuIg3ncOFyINB05vo1jBOyM6e4="/>
-        <field:display date="true" dateTimePattern="${subjectState_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_SubjectState_recordedDate" object="${subjectstate}" z="NRQ+lE8HVpUsi4QjHjSZYcFkMQ0="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_SubjectState_modifiedBy" object="${subjectstate}" z="C2d1XWJkbgj2Cax93dx8lQk0t38="/>
-        <field:display date="true" dateTimePattern="${subjectState_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_SubjectState_modifiedDate" object="${subjectstate}" z="lC4+flK+SDy1XH9H4/42hI9CCDw="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_SubjectState_comments" object="${subjectstate}" z="xzEQps5c8NUNS02LawL7INK1bhQ="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_SubjectState_ignored" object="${subjectstate}" z="j0A/DeUIfTexaYBIqvDy7/DFF9I="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_SubjectState_lsTransaction" object="${subjectstate}" z="+IUS4qN4vE/ZkZSk1L/gS/ooUKc="/>
-        <field:display field="subject" id="s_com_labsynch_labseer_domain_SubjectState_subject" object="${subjectstate}" z="ldeiLNL1ND6B6LkEpfk8VCsMZoU="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_SubjectState_lsType" object="${subjectstate}" z="iJ4kBU0CWYzmMcfqa+L1mlT3hGI="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_SubjectState_lsKind" object="${subjectstate}" z="bLEGJLnEbv3MK9tuCqTZCQnoIjk="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_SubjectState_lsTypeAndKind" object="${subjectstate}" z="zBgymdr9Jc6sjXZ8aeMvRdf6tEM="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_SubjectState_deleted" object="${subjectstate}" z="6nylQ6m/ksnouYxz6YMDl8gmwG4="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/subjectstates/update.jspx b/src/main/webapp/WEB-INF/views/subjectstates/update.jspx
deleted file mode 100755
index 9660bde46..000000000
--- a/src/main/webapp/WEB-INF/views/subjectstates/update.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_SubjectState" modelAttribute="subjectState" path="/subjectstates" versionField="Version" z="Go8pKbIyqLVdipM+t8ZLQsPw5GA=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_SubjectState_recordedBy" required="true" z="/dHNIgz6okMyhvJpWdl51gIQWls="/>
-        <field:datetime dateTimePattern="${subjectState_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_SubjectState_recordedDate" required="true" z="LFxDLEqhnXE5C0c4qdWv4+QuVjY="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_SubjectState_modifiedBy" z="bi7NNK0fK7fgxVjuyoVxrXYUhbI="/>
-        <field:datetime dateTimePattern="${subjectState_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_SubjectState_modifiedDate" z="KZiW5p+FDMfHt+vAWXICDCPXpCE="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_SubjectState_comments" z="8W+j4LEAWVHwen0JRUjjoGIKwCM="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_SubjectState_ignored" z="H0FC97D5/0uNypWCeliNu1MQTKI="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_SubjectState_lsTransaction" validationMessageCode="field_invalid_integer" z="tpsis8Oi9CfIoI2FuPm6oMmZCwg="/>
-        <field:select field="subject" id="c_com_labsynch_labseer_domain_SubjectState_subject" itemValue="id" items="${subjects}" path="/subjects" required="true" z=""/>
-        <field:simple field="lsValues" id="c_com_labsynch_labseer_domain_SubjectState_lsValues" messageCode="entity_reference_not_managed" messageCodeAttribute="Subject Value" z="0mT7qQDUOBXYqw5HBLdWp9ETqtY="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_SubjectState_lsType" required="true" z="PdduCpuStV83NcNPY3BJg2bHBu0="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_SubjectState_lsKind" required="true" z="EP6ZZwh3fwB8tppviEIJNkEMUrE="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_SubjectState_lsTypeAndKind" z="HOSKIDldshyM8ZcpSg1a9LrIlyI="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_SubjectState_deleted" z="2JA/NGx+UKGzHVaasg3JFJJ2LpY="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/subjectstates/views.xml b/src/main/webapp/WEB-INF/views/subjectstates/views.xml
deleted file mode 100755
index 236f3bcfb..000000000
--- a/src/main/webapp/WEB-INF/views/subjectstates/views.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="subjectstates/list">
-        <put-attribute name="body" value="/WEB-INF/views/subjectstates/list.jspx"/>
-    </definition>
-<definition extends="default" name="subjectstates/show">
-        <put-attribute name="body" value="/WEB-INF/views/subjectstates/show.jspx"/>
-    </definition>
-<definition extends="default" name="subjectstates/create">
-        <put-attribute name="body" value="/WEB-INF/views/subjectstates/create.jspx"/>
-    </definition>
-<definition extends="default" name="subjectstates/update">
-        <put-attribute name="body" value="/WEB-INF/views/subjectstates/update.jspx"/>
-    </definition>
-<definition extends="default" name="subjectstates/findSubjectStatesBySubject">
-        <put-attribute name="body" value="/WEB-INF/views/subjectstates/findSubjectStatesBySubject.jspx"/>
-    </definition>
-<definition extends="default" name="subjectstates/findSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject">
-        <put-attribute name="body" value="/WEB-INF/views/subjectstates/findSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/subjectvalues/create.jspx b/src/main/webapp/WEB-INF/views/subjectvalues/create.jspx
deleted file mode 100755
index d964392d9..000000000
--- a/src/main/webapp/WEB-INF/views/subjectvalues/create.jspx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_SubjectValue" modelAttribute="subjectValue" path="/subjectvalues" render="${empty dependencies}" z="3il+MUq6sQ+CjWVXfuGqogC60zY=">
-        <field:textarea field="stringValue" id="c_com_labsynch_labseer_domain_SubjectValue_stringValue" z="mvL2QGpI1pu3UJ6S1Qk9St/lt20="/>
-        <field:textarea field="fileValue" id="c_com_labsynch_labseer_domain_SubjectValue_fileValue" z="9QdbKVG/Cj3pCo81DMl+slig0LA="/>
-        <field:textarea field="urlValue" id="c_com_labsynch_labseer_domain_SubjectValue_urlValue" z="FS4VaiZUQxOMQdzHxmcGu8qWTMM="/>
-        <field:datetime dateTimePattern="${subjectValue_datevalue_date_format}" field="dateValue" id="c_com_labsynch_labseer_domain_SubjectValue_dateValue" z="2k0X9xFkI/keyEh7+0H2TqC/iP4="/>
-        <field:input field="clobValue" id="c_com_labsynch_labseer_domain_SubjectValue_clobValue" z="Mk3M8quEIecaBQb2QFT06vdNTuE="/>
-        <field:input field="blobValue" id="c_com_labsynch_labseer_domain_SubjectValue_blobValue" z="Sz75VvGgI26QDsxMTmBwuX5UZJw="/>
-        <field:input field="sigFigs" id="c_com_labsynch_labseer_domain_SubjectValue_sigFigs" validationMessageCode="field_invalid_integer" z="b6ePySNwg6FZ202A7G9Ge//L0Mw="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_SubjectValue_comments" z="cNahh9/lNLUc2U5Q4IxvEoBZdsw="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_SubjectValue_ignored" z="NFKp+QowWrJAezXtnAJ/Y8vewHU="/>
-        <field:datetime dateTimePattern="${subjectValue_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_SubjectValue_recordedDate" required="true" z="ehgMI9MvDR0mZProRbYoH4GPyoQ="/>
-        <field:datetime dateTimePattern="${subjectValue_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_SubjectValue_modifiedDate" z="lfqyjjD0ZCQ0l1+TZ0zD/gC0Bus="/>
-        <field:checkbox field="publicData" id="c_com_labsynch_labseer_domain_SubjectValue_publicData" z="V8nNT6MJW3P7ZrXmfokKyHB9DaQ="/>
-        <field:textarea field="codeValue" id="c_com_labsynch_labseer_domain_SubjectValue_codeValue" z="e43jX040mkHtN448hPUz0y22I1w="/>
-        <field:input field="numberOfReplicates" id="c_com_labsynch_labseer_domain_SubjectValue_numberOfReplicates" validationMessageCode="field_invalid_integer" z="eHpBSPDQ4bcqfe/Ib2BZZm9asGI="/>
-        <field:textarea field="uncertaintyType" id="c_com_labsynch_labseer_domain_SubjectValue_uncertaintyType" z="Rs83MLafnbhAGgwvqC4VrnR9VXs="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_SubjectValue_lsTransaction" validationMessageCode="field_invalid_integer" z="Wvwx4owofnFH+sjBdUpXeHtfrhQ="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_SubjectValue_lsType" required="true" z="O4Fkm3gyBbsPKsDsVscwU3nYWYg="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_SubjectValue_lsKind" required="true" z="vRKcVKxCO54k3EATxozcvtNCZgc="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_SubjectValue_lsTypeAndKind" z="FE4muSlobrBXWBN3zxiokWQB/cs="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_SubjectValue_recordedBy" required="true" z="Uj0KIIYVs5KxO3ZB3bxXszqo0eg="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_SubjectValue_modifiedBy" z="Wnp7h0ARdtFSS3cSm7iyTaP7nO8="/>
-        <field:select field="lsState" id="c_com_labsynch_labseer_domain_SubjectValue_lsState" itemValue="id" items="${subjectstates}" path="/subjectstates" required="true" z="Nl/uCG1RP+3hjqYM37hL3aWj4pg="/>
-        <field:input field="operatorType" id="c_com_labsynch_labseer_domain_SubjectValue_operatorType" max="25" z="RGBwBu+posuYY3gVvwpkhnL1aNo="/>
-        <field:input field="operatorKind" id="c_com_labsynch_labseer_domain_SubjectValue_operatorKind" max="10" z="tFwOBBgqZFBHjBND/7IYWNxAR4U="/>
-        <field:textarea field="operatorTypeAndKind" id="c_com_labsynch_labseer_domain_SubjectValue_operatorTypeAndKind" z="6aToHeXIRZ26alGH9K5Q2G7Qdzw="/>
-        <field:input field="unitType" id="c_com_labsynch_labseer_domain_SubjectValue_unitType" max="25" z="50v7QMEUxzFpyT8osxK9xjDZCSA="/>
-        <field:input field="unitKind" id="c_com_labsynch_labseer_domain_SubjectValue_unitKind" max="25" z="fbbkTJ/mS+udLtsO50CQPkrPDCY="/>
-        <field:textarea field="unitTypeAndKind" id="c_com_labsynch_labseer_domain_SubjectValue_unitTypeAndKind" z="nFtiOmgaZq06czVJahPUkZnToLE="/>
-        <field:input field="numericValue" id="c_com_labsynch_labseer_domain_SubjectValue_numericValue" validationMessageCode="field_invalid_number" z="+DRqWWr+0I61R2LYUSNBSUOK7jU="/>
-        <field:textarea field="codeType" id="c_com_labsynch_labseer_domain_SubjectValue_codeType" z="sUENtjnfYzYKXNQK2v4wvb4++ec="/>
-        <field:textarea field="codeKind" id="c_com_labsynch_labseer_domain_SubjectValue_codeKind" z="7c1dq7L6BUGGxXS7im0d1jAElOM="/>
-        <field:textarea field="codeTypeAndKind" id="c_com_labsynch_labseer_domain_SubjectValue_codeTypeAndKind" z="mW9ExrSN+ZYTv6rWO2BvrSh5DiI="/>
-        <field:input field="uncertainty" id="c_com_labsynch_labseer_domain_SubjectValue_uncertainty" validationMessageCode="field_invalid_number" z="JWsVQgIh8qFKjZ5MKsMjA2agEKY="/>
-        <field:textarea field="codeOrigin" id="c_com_labsynch_labseer_domain_SubjectValue_codeOrigin" z="wd0Iylnz4Ie111nvO7DODumT1tg="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_SubjectValue_deleted" z="TNxeZAq89Gc51C6z4FhnvdC1fVU="/>
-        <field:input field="concentration" id="c_com_labsynch_labseer_domain_SubjectValue_concentration" validationMessageCode="field_invalid_number" z="bv8D4/mRMWLSWpRtM3e01/Urgq4="/>
-        <field:input field="concUnit" id="c_com_labsynch_labseer_domain_SubjectValue_concUnit" max="25" z="PhcHT4nSunKbqmrzJnJsv/3D/Q0="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_SubjectValue" render="${not empty dependencies}" z="R/tiBwbRMNV4pwGZAtn0AgrJ6CE="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/subjectvalues/findSubjectValuesByCodeValueEquals.jspx b/src/main/webapp/WEB-INF/views/subjectvalues/findSubjectValuesByCodeValueEquals.jspx
deleted file mode 100755
index fe63e876e..000000000
--- a/src/main/webapp/WEB-INF/views/subjectvalues/findSubjectValuesByCodeValueEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeValueEquals" id="ff_com_labsynch_labseer_domain_SubjectValue" path="/subjectvalues" z="4rzC55DfSI3VThb23jOnOHfXzo4=">
-        <field:input disableFormBinding="true" field="codeValue" id="f_com_labsynch_labseer_domain_SubjectValue_codeValue" max="255" required="true" z="Kf5YtHxZa81prp/r04NeRfZAPqM="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/subjectvalues/findSubjectValuesByIgnoredNotAndCodeValueEquals.jspx b/src/main/webapp/WEB-INF/views/subjectvalues/findSubjectValuesByIgnoredNotAndCodeValueEquals.jspx
deleted file mode 100755
index d6f8cc2ce..000000000
--- a/src/main/webapp/WEB-INF/views/subjectvalues/findSubjectValuesByIgnoredNotAndCodeValueEquals.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByIgnoredNotAndCodeValueEquals" id="ff_com_labsynch_labseer_domain_SubjectValue" path="/subjectvalues" z="ilqXJJOQFEVCX6wz9C4Iq54rfEA=">
-        <field:checkbox disableFormBinding="true" field="ignored" id="f_com_labsynch_labseer_domain_SubjectValue_ignored" z="/RNxpD57fs/G0td06cnX/RyCuGU="/>
-        <field:input disableFormBinding="true" field="codeValue" id="f_com_labsynch_labseer_domain_SubjectValue_codeValue" max="255" required="true" z="Kf5YtHxZa81prp/r04NeRfZAPqM="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/subjectvalues/findSubjectValuesByLsState.jspx b/src/main/webapp/WEB-INF/views/subjectvalues/findSubjectValuesByLsState.jspx
deleted file mode 100755
index a16a080bf..000000000
--- a/src/main/webapp/WEB-INF/views/subjectvalues/findSubjectValuesByLsState.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsState" id="ff_com_labsynch_labseer_domain_SubjectValue" path="/subjectvalues" z="9RON9/WcoQyDN4olWdLUxc5sq98=">
-        <field:select disableFormBinding="true" field="lsState" id="f_com_labsynch_labseer_domain_SubjectValue_lsState" itemValue="id" items="${subjectstates}" path="/subjectstates" required="true" z="iZu4woomRdBmHIGoYYQn4dHBOTg="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/subjectvalues/findSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals.jspx b/src/main/webapp/WEB-INF/views/subjectvalues/findSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals.jspx
deleted file mode 100644
index 1341f1099..000000000
--- a/src/main/webapp/WEB-INF/views/subjectvalues/findSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsStateAndLsTypeEqualsAndLsKindEquals" id="ff_com_labsynch_labseer_domain_SubjectValue" path="/subjectvalues" z="ebCIxuqzma2hPjEy6ZOWxeowJUA=">
-        <field:select disableFormBinding="true" field="lsState" id="f_com_labsynch_labseer_domain_SubjectValue_lsState" itemValue="id" items="${subjectstates}" path="/subjectstates" required="true" z="iZu4woomRdBmHIGoYYQn4dHBOTg="/>
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_SubjectValue_lsType" max="64" required="true" z="y9xAaVxn/G8/ZujG9ycg39Hii/g="/>
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_SubjectValue_lsKind" max="255" required="true" z="0reAIagnj0234Ta9c9gCbQb2kdA="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/subjectvalues/findSubjectValuesByLsTypeEqualsAndLsKindEquals.jspx b/src/main/webapp/WEB-INF/views/subjectvalues/findSubjectValuesByLsTypeEqualsAndLsKindEquals.jspx
deleted file mode 100644
index 49f405f0a..000000000
--- a/src/main/webapp/WEB-INF/views/subjectvalues/findSubjectValuesByLsTypeEqualsAndLsKindEquals.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeEqualsAndLsKindEquals" id="ff_com_labsynch_labseer_domain_SubjectValue" path="/subjectvalues" z="NCOQa4bDYa4AMJiJpq7KneJTAXU=">
-        <field:input disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_SubjectValue_lsType" max="64" required="true" z="y9xAaVxn/G8/ZujG9ycg39Hii/g="/>
-        <field:input disableFormBinding="true" field="lsKind" id="f_com_labsynch_labseer_domain_SubjectValue_lsKind" max="255" required="true" z="0reAIagnj0234Ta9c9gCbQb2kdA="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/subjectvalues/list.jspx b/src/main/webapp/WEB-INF/views/subjectvalues/list.jspx
deleted file mode 100755
index 485648353..000000000
--- a/src/main/webapp/WEB-INF/views/subjectvalues/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_SubjectValue" items="${subjectvalues}" z="GCCSuoX+lVhVNtPIFCZ1nkuHH0Q=">
-        <table:table data="${subjectvalues}" id="l_com_labsynch_labseer_domain_SubjectValue" path="/subjectvalues" z="qaS/MMHNot6StJ7EMxz7sgQjrP0=">
-            <table:column id="c_com_labsynch_labseer_domain_SubjectValue_lsType" property="lsType" z="HYld9oE0Xmcc2peSWWgVNkqIMBI="/>
-            <table:column id="c_com_labsynch_labseer_domain_SubjectValue_lsKind" property="lsKind" z="V/Tto+RJd6CEOnIXpnJtS1palFc="/>
-            <table:column id="c_com_labsynch_labseer_domain_SubjectValue_lsTypeAndKind" property="lsTypeAndKind" z="SIvXUNoQa532cvW7sKx4NE6CuK0="/>
-            <table:column id="c_com_labsynch_labseer_domain_SubjectValue_ignored" property="ignored" z="5z8//73EPIlQWjoggt21CdTdHcU="/>
-            <table:column id="c_com_labsynch_labseer_domain_SubjectValue_publicData" property="publicData" z="T0057Wwaw17UQYu9zF4U7l2NckY="/>
-            <table:column id="c_com_labsynch_labseer_domain_SubjectValue_deleted" property="deleted" z="ahSkZ8BR/9qSGYMx4ag/Gxi0lJA="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/subjectvalues/show.jspx b/src/main/webapp/WEB-INF/views/subjectvalues/show.jspx
deleted file mode 100755
index e42ea9076..000000000
--- a/src/main/webapp/WEB-INF/views/subjectvalues/show.jspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_SubjectValue" object="${subjectvalue}" path="/subjectvalues" z="qx8RFaJz3GuyY9fHGRGtVPWYrdA=">
-        <field:display field="stringValue" id="s_com_labsynch_labseer_domain_SubjectValue_stringValue" object="${subjectvalue}" z="s23owTTACduaZtUTIofkP7S2EyA="/>
-        <field:display field="fileValue" id="s_com_labsynch_labseer_domain_SubjectValue_fileValue" object="${subjectvalue}" z="fcjxHjPiN3CZV2/u6O6aKgtrlx4="/>
-        <field:display field="urlValue" id="s_com_labsynch_labseer_domain_SubjectValue_urlValue" object="${subjectvalue}" z="BQphfdobXNy51a27JclBM0+PL+w="/>
-        <field:display date="true" dateTimePattern="${subjectValue_datevalue_date_format}" field="dateValue" id="s_com_labsynch_labseer_domain_SubjectValue_dateValue" object="${subjectvalue}" z="8Mi9+Vf2/DkyIO88bIP3Y5f+ntA="/>
-        <field:display field="clobValue" id="s_com_labsynch_labseer_domain_SubjectValue_clobValue" object="${subjectvalue}" z="4+uVGzC0NgFzttX+T2q1zOA8TvU="/>
-        <field:display field="blobValue" id="s_com_labsynch_labseer_domain_SubjectValue_blobValue" object="${subjectvalue}" z="ZdZcll01iRHf2M0dy688lepWTZ0="/>
-        <field:display field="sigFigs" id="s_com_labsynch_labseer_domain_SubjectValue_sigFigs" object="${subjectvalue}" z="hv2aiGCluwXB8d+YEctAKatLhwk="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_SubjectValue_comments" object="${subjectvalue}" z="+VjRjNomf8E2C+Z0hksOqkoVeYc="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_SubjectValue_ignored" object="${subjectvalue}" z="N88qG0k3TfcQhmFhm16wq96/TVw="/>
-        <field:display date="true" dateTimePattern="${subjectValue_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_SubjectValue_recordedDate" object="${subjectvalue}" z="emD49yVG5TN0I9FOPG2FclLXQzk="/>
-        <field:display date="true" dateTimePattern="${subjectValue_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_SubjectValue_modifiedDate" object="${subjectvalue}" z="1i6Ne0W9enlTrlBqWT7X87d5LfE="/>
-        <field:display field="publicData" id="s_com_labsynch_labseer_domain_SubjectValue_publicData" object="${subjectvalue}" z="jc5E24gc/7akwilw1mWo0mndj+Q="/>
-        <field:display field="codeValue" id="s_com_labsynch_labseer_domain_SubjectValue_codeValue" object="${subjectvalue}" z="rib3Q0Mmh+ascy6MCrJGlhxZpRg="/>
-        <field:display field="numberOfReplicates" id="s_com_labsynch_labseer_domain_SubjectValue_numberOfReplicates" object="${subjectvalue}" z="YN2ncI2VBlgJ6VoFAt4c4mEiLLI="/>
-        <field:display field="uncertaintyType" id="s_com_labsynch_labseer_domain_SubjectValue_uncertaintyType" object="${subjectvalue}" z="S27QEwbeBKBKRpgAHTJXDnr8iTs="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_SubjectValue_lsTransaction" object="${subjectvalue}" z="8wZk4U7K6Xh99LUnMuC1IcRhjZ4="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_SubjectValue_lsType" object="${subjectvalue}" z="pKkQf06PiGKbl6C0K0pUR1EC1B4="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_SubjectValue_lsKind" object="${subjectvalue}" z="ib4oPIQLJLdV8cXCAf6pQ21qYHM="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_SubjectValue_lsTypeAndKind" object="${subjectvalue}" z="HK/inqa2wqOYoNkCs1hNssfrvDU="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_SubjectValue_recordedBy" object="${subjectvalue}" z="iWKV2uC67VOB2NiyYNga/BPo35w="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_SubjectValue_modifiedBy" object="${subjectvalue}" z="xv6dmNME84fTI+Mkuc6DMBQWo9g="/>
-        <field:display field="lsState" id="s_com_labsynch_labseer_domain_SubjectValue_lsState" object="${subjectvalue}" z="W5/d2BdJpTXx+Xp4P2RKG0Y2HNg="/>
-        <field:display field="operatorType" id="s_com_labsynch_labseer_domain_SubjectValue_operatorType" object="${subjectvalue}" z="1BnV6c/BaX+hq3jV7sZ00XyXk+Y="/>
-        <field:display field="operatorKind" id="s_com_labsynch_labseer_domain_SubjectValue_operatorKind" object="${subjectvalue}" z="q7pj8dok3eZw+l4RgIM73zS8iz8="/>
-        <field:display field="operatorTypeAndKind" id="s_com_labsynch_labseer_domain_SubjectValue_operatorTypeAndKind" object="${subjectvalue}" z="nfkBLE648z3vxR3QWYNV++Y1GIM="/>
-        <field:display field="unitType" id="s_com_labsynch_labseer_domain_SubjectValue_unitType" object="${subjectvalue}" z="3lvl82MIG2w19fxlHm5m8SHlF70="/>
-        <field:display field="unitKind" id="s_com_labsynch_labseer_domain_SubjectValue_unitKind" object="${subjectvalue}" z="T1+APWnE4y4xGO3e9Bn0UgXF6Is="/>
-        <field:display field="unitTypeAndKind" id="s_com_labsynch_labseer_domain_SubjectValue_unitTypeAndKind" object="${subjectvalue}" z="TKTksI5PX+n7XrKxgs1lTy+la3I="/>
-        <field:display field="numericValue" id="s_com_labsynch_labseer_domain_SubjectValue_numericValue" object="${subjectvalue}" z="Zl0p8ICcQyJqKwnE8eMuQmGEZkg="/>
-        <field:display field="codeType" id="s_com_labsynch_labseer_domain_SubjectValue_codeType" object="${subjectvalue}" z="gopMzVzjcPyiAYOLIuRoSgymCs0="/>
-        <field:display field="codeKind" id="s_com_labsynch_labseer_domain_SubjectValue_codeKind" object="${subjectvalue}" z="7K0cn+fsnIt5SvCttaKh4XU7cPc="/>
-        <field:display field="codeTypeAndKind" id="s_com_labsynch_labseer_domain_SubjectValue_codeTypeAndKind" object="${subjectvalue}" z="50QI9LYVed6ClIvutBmi/QqqjVg="/>
-        <field:display field="uncertainty" id="s_com_labsynch_labseer_domain_SubjectValue_uncertainty" object="${subjectvalue}" z="oKxNCd2+i7ObtUXAcEe7qduX85Y="/>
-        <field:display field="codeOrigin" id="s_com_labsynch_labseer_domain_SubjectValue_codeOrigin" object="${subjectvalue}" z="/RlBcSRnPdqPGs0s2xsd8FHENus="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_SubjectValue_deleted" object="${subjectvalue}" z="wOxfRfQjjTAxHohoN8sTItlxalg="/>
-        <field:display field="concentration" id="s_com_labsynch_labseer_domain_SubjectValue_concentration" object="${subjectvalue}" z="ZdxOGB4wbscFLy1j1Hx2ztGH/AE="/>
-        <field:display field="concUnit" id="s_com_labsynch_labseer_domain_SubjectValue_concUnit" object="${subjectvalue}" z="g4zE4K1T24L8eHycP5NrbqgOwvI="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/subjectvalues/update.jspx b/src/main/webapp/WEB-INF/views/subjectvalues/update.jspx
deleted file mode 100755
index 0212f1d0e..000000000
--- a/src/main/webapp/WEB-INF/views/subjectvalues/update.jspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_SubjectValue" modelAttribute="subjectValue" path="/subjectvalues" versionField="Version" z="DEdF+4LkNyTFJSIT5MLW0ueATSQ=">
-        <field:textarea field="stringValue" id="c_com_labsynch_labseer_domain_SubjectValue_stringValue" z="mvL2QGpI1pu3UJ6S1Qk9St/lt20="/>
-        <field:textarea field="fileValue" id="c_com_labsynch_labseer_domain_SubjectValue_fileValue" z="9QdbKVG/Cj3pCo81DMl+slig0LA="/>
-        <field:textarea field="urlValue" id="c_com_labsynch_labseer_domain_SubjectValue_urlValue" z="FS4VaiZUQxOMQdzHxmcGu8qWTMM="/>
-        <field:datetime dateTimePattern="${subjectValue_datevalue_date_format}" field="dateValue" id="c_com_labsynch_labseer_domain_SubjectValue_dateValue" z="2k0X9xFkI/keyEh7+0H2TqC/iP4="/>
-        <field:input field="clobValue" id="c_com_labsynch_labseer_domain_SubjectValue_clobValue" z="Mk3M8quEIecaBQb2QFT06vdNTuE="/>
-        <field:input field="blobValue" id="c_com_labsynch_labseer_domain_SubjectValue_blobValue" z="Sz75VvGgI26QDsxMTmBwuX5UZJw="/>
-        <field:input field="sigFigs" id="c_com_labsynch_labseer_domain_SubjectValue_sigFigs" validationMessageCode="field_invalid_integer" z="b6ePySNwg6FZ202A7G9Ge//L0Mw="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_SubjectValue_comments" z="cNahh9/lNLUc2U5Q4IxvEoBZdsw="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_SubjectValue_ignored" z="NFKp+QowWrJAezXtnAJ/Y8vewHU="/>
-        <field:datetime dateTimePattern="${subjectValue_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_SubjectValue_recordedDate" required="true" z="ehgMI9MvDR0mZProRbYoH4GPyoQ="/>
-        <field:datetime dateTimePattern="${subjectValue_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_SubjectValue_modifiedDate" z="lfqyjjD0ZCQ0l1+TZ0zD/gC0Bus="/>
-        <field:checkbox field="publicData" id="c_com_labsynch_labseer_domain_SubjectValue_publicData" z="V8nNT6MJW3P7ZrXmfokKyHB9DaQ="/>
-        <field:textarea field="codeValue" id="c_com_labsynch_labseer_domain_SubjectValue_codeValue" z="e43jX040mkHtN448hPUz0y22I1w="/>
-        <field:input field="numberOfReplicates" id="c_com_labsynch_labseer_domain_SubjectValue_numberOfReplicates" validationMessageCode="field_invalid_integer" z="eHpBSPDQ4bcqfe/Ib2BZZm9asGI="/>
-        <field:textarea field="uncertaintyType" id="c_com_labsynch_labseer_domain_SubjectValue_uncertaintyType" z="Rs83MLafnbhAGgwvqC4VrnR9VXs="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_SubjectValue_lsTransaction" validationMessageCode="field_invalid_integer" z="Wvwx4owofnFH+sjBdUpXeHtfrhQ="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_SubjectValue_lsType" required="true" z="O4Fkm3gyBbsPKsDsVscwU3nYWYg="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_SubjectValue_lsKind" required="true" z="vRKcVKxCO54k3EATxozcvtNCZgc="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_SubjectValue_lsTypeAndKind" z="FE4muSlobrBXWBN3zxiokWQB/cs="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_SubjectValue_recordedBy" required="true" z="Uj0KIIYVs5KxO3ZB3bxXszqo0eg="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_SubjectValue_modifiedBy" z="Wnp7h0ARdtFSS3cSm7iyTaP7nO8="/>
-        <field:input field="operatorType" id="c_com_labsynch_labseer_domain_SubjectValue_operatorType" max="25" z="RGBwBu+posuYY3gVvwpkhnL1aNo="/>
-        <field:input field="operatorKind" id="c_com_labsynch_labseer_domain_SubjectValue_operatorKind" max="10" z="tFwOBBgqZFBHjBND/7IYWNxAR4U="/>
-        <field:textarea field="operatorTypeAndKind" id="c_com_labsynch_labseer_domain_SubjectValue_operatorTypeAndKind" z="6aToHeXIRZ26alGH9K5Q2G7Qdzw="/>
-        <field:input field="unitType" id="c_com_labsynch_labseer_domain_SubjectValue_unitType" max="25" z="50v7QMEUxzFpyT8osxK9xjDZCSA="/>
-        <field:input field="unitKind" id="c_com_labsynch_labseer_domain_SubjectValue_unitKind" max="25" z="fbbkTJ/mS+udLtsO50CQPkrPDCY="/>
-        <field:textarea field="unitTypeAndKind" id="c_com_labsynch_labseer_domain_SubjectValue_unitTypeAndKind" z="nFtiOmgaZq06czVJahPUkZnToLE="/>
-        <field:input field="numericValue" id="c_com_labsynch_labseer_domain_SubjectValue_numericValue" validationMessageCode="field_invalid_number" z="+DRqWWr+0I61R2LYUSNBSUOK7jU="/>
-        <field:textarea field="codeType" id="c_com_labsynch_labseer_domain_SubjectValue_codeType" z="sUENtjnfYzYKXNQK2v4wvb4++ec="/>
-        <field:textarea field="codeKind" id="c_com_labsynch_labseer_domain_SubjectValue_codeKind" z="7c1dq7L6BUGGxXS7im0d1jAElOM="/>
-        <field:textarea field="codeTypeAndKind" id="c_com_labsynch_labseer_domain_SubjectValue_codeTypeAndKind" z="mW9ExrSN+ZYTv6rWO2BvrSh5DiI="/>
-        <field:select field="lsState" id="c_com_labsynch_labseer_domain_SubjectValue_lsState" itemValue="id" items="${subjectstates}" path="/subjectstatesnew" required="true" z="user-managed"/>
-        <field:input field="uncertainty" id="c_com_labsynch_labseer_domain_SubjectValue_uncertainty" validationMessageCode="field_invalid_number" z="JWsVQgIh8qFKjZ5MKsMjA2agEKY="/>
-        <field:textarea field="codeOrigin" id="c_com_labsynch_labseer_domain_SubjectValue_codeOrigin" z="wd0Iylnz4Ie111nvO7DODumT1tg="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_SubjectValue_deleted" z="TNxeZAq89Gc51C6z4FhnvdC1fVU="/>
-        <field:input field="concentration" id="c_com_labsynch_labseer_domain_SubjectValue_concentration" validationMessageCode="field_invalid_number" z="bv8D4/mRMWLSWpRtM3e01/Urgq4="/>
-        <field:input field="concUnit" id="c_com_labsynch_labseer_domain_SubjectValue_concUnit" max="25" z="PhcHT4nSunKbqmrzJnJsv/3D/Q0="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/subjectvalues/views.xml b/src/main/webapp/WEB-INF/views/subjectvalues/views.xml
deleted file mode 100755
index 64b4dadda..000000000
--- a/src/main/webapp/WEB-INF/views/subjectvalues/views.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="subjectvalues/list">
-        <put-attribute name="body" value="/WEB-INF/views/subjectvalues/list.jspx"/>
-    </definition>
-<definition extends="default" name="subjectvalues/show">
-        <put-attribute name="body" value="/WEB-INF/views/subjectvalues/show.jspx"/>
-    </definition>
-<definition extends="default" name="subjectvalues/create">
-        <put-attribute name="body" value="/WEB-INF/views/subjectvalues/create.jspx"/>
-    </definition>
-<definition extends="default" name="subjectvalues/update">
-        <put-attribute name="body" value="/WEB-INF/views/subjectvalues/update.jspx"/>
-    </definition>
-<definition extends="default" name="subjectvalues/findSubjectValuesByLsState">
-        <put-attribute name="body" value="/WEB-INF/views/subjectvalues/findSubjectValuesByLsState.jspx"/>
-    </definition>
-<definition extends="default" name="subjectvalues/findSubjectValuesByCodeValueEquals">
-        <put-attribute name="body" value="/WEB-INF/views/subjectvalues/findSubjectValuesByCodeValueEquals.jspx"/>
-    </definition>
-<definition extends="default" name="subjectvalues/findSubjectValuesByIgnoredNotAndCodeValueEquals">
-        <put-attribute name="body" value="/WEB-INF/views/subjectvalues/findSubjectValuesByIgnoredNotAndCodeValueEquals.jspx"/>
-    </definition>
-<definition extends="default" name="subjectvalues/findSubjectValuesByLsTypeEqualsAndLsKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/subjectvalues/findSubjectValuesByLsTypeEqualsAndLsKindEquals.jspx"/>
-    </definition>
-<definition extends="default" name="subjectvalues/findSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/subjectvalues/findSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/tempselecttables/create.jspx b/src/main/webapp/WEB-INF/views/tempselecttables/create.jspx
deleted file mode 100644
index 2a391e188..000000000
--- a/src/main/webapp/WEB-INF/views/tempselecttables/create.jspx
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_TempSelectTable" modelAttribute="tempSelectTable" path="/tempselecttables" render="${empty dependencies}" z="vUfb/1D16et1e81a4zCEQ3rFFdg=">
-        <field:input field="numberVar" id="c_com_labsynch_labseer_domain_TempSelectTable_numberVar" validationMessageCode="field_invalid_integer" z="SRMK6MND61hnunuKVAm03sAajwg="/>
-        <field:textarea field="stringVar" id="c_com_labsynch_labseer_domain_TempSelectTable_stringVar" z="WtOTdvUbS8C59VgfjM7lXATjIXM="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_TempSelectTable_lsTransaction" validationMessageCode="field_invalid_integer" z="HRrScyd5js90aATuGC2u3ce5VFU="/>
-        <field:datetime dateTimePattern="${tempSelectTable_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_TempSelectTable_recordedDate" required="true" z="SdpUgsO39WAnq/RiEMQIdhZh+gw="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_TempSelectTable_recordedBy" z="Hr7/3cmST4mS/MfcriOKg8qtHzQ="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_TempSelectTable" render="${not empty dependencies}" z="igrbRpL1NrF3fV0Y1QzASa4LlVw="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/tempselecttables/list.jspx b/src/main/webapp/WEB-INF/views/tempselecttables/list.jspx
deleted file mode 100644
index a1e91bcab..000000000
--- a/src/main/webapp/WEB-INF/views/tempselecttables/list.jspx
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_TempSelectTable" items="${tempselecttables}" z="Uqn+moXRjKh4bav1wSRuBiEkpH0=">
-        <table:table data="${tempselecttables}" id="l_com_labsynch_labseer_domain_TempSelectTable" path="/tempselecttables" z="inWctP3fvm+F5tSC0DH8LbFqHWw=">
-            <table:column id="c_com_labsynch_labseer_domain_TempSelectTable_numberVar" property="numberVar" z="HEbR2otScdcQ1Y0w7LNxLdyoZsk="/>
-            <table:column id="c_com_labsynch_labseer_domain_TempSelectTable_stringVar" property="stringVar" z="uo9DtQ/ZMHOdhQskivNIeNWS+m8="/>
-            <table:column id="c_com_labsynch_labseer_domain_TempSelectTable_lsTransaction" property="lsTransaction" z="VbsE3tzS4EQyOAL0EJ4Q2zMGNlc="/>
-            <table:column date="true" dateTimePattern="${tempSelectTable_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_TempSelectTable_recordedDate" property="recordedDate" z="Vdp4GJ6F43XY/W1ml02WOQUVPRA="/>
-            <table:column id="c_com_labsynch_labseer_domain_TempSelectTable_recordedBy" property="recordedBy" z="+DEFMfAPrT7aFdqqrJr+0PoS7ZE="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/tempselecttables/show.jspx b/src/main/webapp/WEB-INF/views/tempselecttables/show.jspx
deleted file mode 100644
index 10e982a87..000000000
--- a/src/main/webapp/WEB-INF/views/tempselecttables/show.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_TempSelectTable" object="${tempselecttable}" path="/tempselecttables" z="h0gl7JgqsiwEE8q+6PENUPlRTgE=">
-        <field:display field="numberVar" id="s_com_labsynch_labseer_domain_TempSelectTable_numberVar" object="${tempselecttable}" z="1mXmCx/BzuyHOP/1NyaMZP+CSNE="/>
-        <field:display field="stringVar" id="s_com_labsynch_labseer_domain_TempSelectTable_stringVar" object="${tempselecttable}" z="5qBE9+UbN1wECbuFhZ8JOFUg3pk="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_TempSelectTable_lsTransaction" object="${tempselecttable}" z="AyRq4HSq/i76mn2s5k/9obzH5to="/>
-        <field:display date="true" dateTimePattern="${tempSelectTable_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_TempSelectTable_recordedDate" object="${tempselecttable}" z="zgzJBP1Ag9b+TpRRfSIwaCdQl5w="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_TempSelectTable_recordedBy" object="${tempselecttable}" z="SFiVZRtpdUoKhHYxvhpf94PyKn0="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/tempselecttables/update.jspx b/src/main/webapp/WEB-INF/views/tempselecttables/update.jspx
deleted file mode 100644
index 55dd6a5b2..000000000
--- a/src/main/webapp/WEB-INF/views/tempselecttables/update.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_TempSelectTable" modelAttribute="tempSelectTable" path="/tempselecttables" versionField="Version" z="9RnMVJ/62WHY1pdCvpRgpcHdNlY=">
-        <field:input field="numberVar" id="c_com_labsynch_labseer_domain_TempSelectTable_numberVar" validationMessageCode="field_invalid_integer" z="SRMK6MND61hnunuKVAm03sAajwg="/>
-        <field:textarea field="stringVar" id="c_com_labsynch_labseer_domain_TempSelectTable_stringVar" z="WtOTdvUbS8C59VgfjM7lXATjIXM="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_TempSelectTable_lsTransaction" validationMessageCode="field_invalid_integer" z="HRrScyd5js90aATuGC2u3ce5VFU="/>
-        <field:datetime dateTimePattern="${tempSelectTable_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_TempSelectTable_recordedDate" required="true" z="SdpUgsO39WAnq/RiEMQIdhZh+gw="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_TempSelectTable_recordedBy" z="Hr7/3cmST4mS/MfcriOKg8qtHzQ="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/tempselecttables/views.xml b/src/main/webapp/WEB-INF/views/tempselecttables/views.xml
deleted file mode 100644
index a47c05c54..000000000
--- a/src/main/webapp/WEB-INF/views/tempselecttables/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="tempselecttables/list">
-        <put-attribute name="body" value="/WEB-INF/views/tempselecttables/list.jspx"/>
-    </definition>
-<definition extends="default" name="tempselecttables/show">
-        <put-attribute name="body" value="/WEB-INF/views/tempselecttables/show.jspx"/>
-    </definition>
-<definition extends="default" name="tempselecttables/create">
-        <put-attribute name="body" value="/WEB-INF/views/tempselecttables/create.jspx"/>
-    </definition>
-<definition extends="default" name="tempselecttables/update">
-        <put-attribute name="body" value="/WEB-INF/views/tempselecttables/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/thingkinds/create.jspx b/src/main/webapp/WEB-INF/views/thingkinds/create.jspx
deleted file mode 100755
index 20088867b..000000000
--- a/src/main/webapp/WEB-INF/views/thingkinds/create.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ThingKind" modelAttribute="thingKind" path="/thingkinds" render="${empty dependencies}" z="Gk8QIKs7eInuSAnWgzP6kAceyGI=">
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_ThingKind_kindName" required="true" z="KvjrCNOpqb33kW7quSusdMA3bug="/>
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_ThingKind_lsType" itemValue="id" items="${thingtypes}" path="/thingtypes" required="true" z="TZs6ko/8VogGZX76vCQ3b8EZCEY="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ThingKind_lsTypeAndKind" z="mnau6V9TENFYA/PUX1+KbgLzOUE="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ThingKind" render="${not empty dependencies}" z="my1jPYUM0iQosaStM4k7GFVHBMk="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/thingkinds/findThingKindsByKindNameEqualsAndLsType.jspx b/src/main/webapp/WEB-INF/views/thingkinds/findThingKindsByKindNameEqualsAndLsType.jspx
deleted file mode 100755
index af370ed24..000000000
--- a/src/main/webapp/WEB-INF/views/thingkinds/findThingKindsByKindNameEqualsAndLsType.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByKindNameEqualsAndLsType" id="ff_com_labsynch_labseer_domain_ThingKind" path="/thingkinds" z="C6ojvhC1BbbtvFvEZPdq9mNHjws=">
-        <field:input disableFormBinding="true" field="kindName" id="f_com_labsynch_labseer_domain_ThingKind_kindName" max="255" required="true" z="YK4dQAioAGBdvc+ivKRWkL3rnvc="/>
-        <field:select disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_ThingKind_lsType" itemValue="id" items="${thingtypes}" path="/thingtypes" required="true" z="0AlCJyNUdhbYCkQnN4KxnvtX0GU="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/thingkinds/findThingKindsByLsType.jspx b/src/main/webapp/WEB-INF/views/thingkinds/findThingKindsByLsType.jspx
deleted file mode 100755
index 72ee52bc4..000000000
--- a/src/main/webapp/WEB-INF/views/thingkinds/findThingKindsByLsType.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsType" id="ff_com_labsynch_labseer_domain_ThingKind" path="/thingkinds" z="50lYsfBZehs0znqtkqwwcoR7FmU=">
-        <field:select disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_ThingKind_lsType" itemValue="id" items="${thingtypes}" path="/thingtypes" required="true" z="0AlCJyNUdhbYCkQnN4KxnvtX0GU="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/thingkinds/findThingKindsByLsTypeAndKindEquals.jspx b/src/main/webapp/WEB-INF/views/thingkinds/findThingKindsByLsTypeAndKindEquals.jspx
deleted file mode 100755
index 301807779..000000000
--- a/src/main/webapp/WEB-INF/views/thingkinds/findThingKindsByLsTypeAndKindEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeAndKindEquals" id="ff_com_labsynch_labseer_domain_ThingKind" path="/thingkinds" z="pUJY70tmygAieTuvPHFYrxFBjno=">
-        <field:input disableFormBinding="true" field="lsTypeAndKind" id="f_com_labsynch_labseer_domain_ThingKind_lsTypeAndKind" max="255" required="true" z="+WOuhbZVDAMGoe6zd2ycIXxnDN8="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/thingkinds/list.jspx b/src/main/webapp/WEB-INF/views/thingkinds/list.jspx
deleted file mode 100755
index 406b194d2..000000000
--- a/src/main/webapp/WEB-INF/views/thingkinds/list.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ThingKind" items="${thingkinds}" z="iydj/iSdd3HgxzgTXFIGtPlCCa8=">
-        <table:table data="${thingkinds}" id="l_com_labsynch_labseer_domain_ThingKind" path="/thingkinds" z="i3li6wnEqGWPMWPW1ZizIcPZZmw=">
-            <table:column id="c_com_labsynch_labseer_domain_ThingKind_kindName" property="kindName" z="w8Z7IGWHfz3wQYinIe0RiwB2PD0="/>
-            <table:column id="c_com_labsynch_labseer_domain_ThingKind_lsType" property="lsType" z="xhofUvg8cdzGsNafS8Y6PdmS6nE="/>
-            <table:column id="c_com_labsynch_labseer_domain_ThingKind_lsTypeAndKind" property="lsTypeAndKind" z="Y0b+E1nrI+82FsVslaif2kYCDyc="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/thingkinds/show.jspx b/src/main/webapp/WEB-INF/views/thingkinds/show.jspx
deleted file mode 100755
index 88b68d143..000000000
--- a/src/main/webapp/WEB-INF/views/thingkinds/show.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ThingKind" object="${thingkind}" path="/thingkinds" z="B4clgfxCFFJ/DKbWQvjAnJynBk4=">
-        <field:display field="kindName" id="s_com_labsynch_labseer_domain_ThingKind_kindName" object="${thingkind}" z="RmUa49UI+QBVrkdj87RqEpl4b1c="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ThingKind_lsType" object="${thingkind}" z="uTaUEMFm6SIZRGByO9bLIiKDhnQ="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ThingKind_lsTypeAndKind" object="${thingkind}" z="6r9pKcc8Ca1FXXlhUelfPxGEv98="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/thingkinds/update.jspx b/src/main/webapp/WEB-INF/views/thingkinds/update.jspx
deleted file mode 100755
index 139dd8d19..000000000
--- a/src/main/webapp/WEB-INF/views/thingkinds/update.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ThingKind" modelAttribute="thingKind" path="/thingkinds" versionField="Version" z="HwPca5FFG6di+1vXZBLQx1OLZow=">
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_ThingKind_kindName" required="true" z="KvjrCNOpqb33kW7quSusdMA3bug="/>
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_ThingKind_lsType" itemValue="id" items="${thingtypes}" path="/thingtypes" required="true" z="TZs6ko/8VogGZX76vCQ3b8EZCEY="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ThingKind_lsTypeAndKind" z="mnau6V9TENFYA/PUX1+KbgLzOUE="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/thingkinds/views.xml b/src/main/webapp/WEB-INF/views/thingkinds/views.xml
deleted file mode 100755
index ddbe7fe5f..000000000
--- a/src/main/webapp/WEB-INF/views/thingkinds/views.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="thingkinds/list">
-        <put-attribute name="body" value="/WEB-INF/views/thingkinds/list.jspx"/>
-    </definition>
-<definition extends="default" name="thingkinds/show">
-        <put-attribute name="body" value="/WEB-INF/views/thingkinds/show.jspx"/>
-    </definition>
-<definition extends="default" name="thingkinds/create">
-        <put-attribute name="body" value="/WEB-INF/views/thingkinds/create.jspx"/>
-    </definition>
-<definition extends="default" name="thingkinds/update">
-        <put-attribute name="body" value="/WEB-INF/views/thingkinds/update.jspx"/>
-    </definition>
-<definition extends="default" name="thingkinds/findThingKindsByKindNameEqualsAndLsType">
-        <put-attribute name="body" value="/WEB-INF/views/thingkinds/findThingKindsByKindNameEqualsAndLsType.jspx"/>
-    </definition>
-<definition extends="default" name="thingkinds/findThingKindsByLsType">
-        <put-attribute name="body" value="/WEB-INF/views/thingkinds/findThingKindsByLsType.jspx"/>
-    </definition>
-<definition extends="default" name="thingkinds/findThingKindsByLsTypeAndKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/thingkinds/findThingKindsByLsTypeAndKindEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/thingpagearchives/create.jspx b/src/main/webapp/WEB-INF/views/thingpagearchives/create.jspx
deleted file mode 100755
index 2607479f3..000000000
--- a/src/main/webapp/WEB-INF/views/thingpagearchives/create.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ThingPageArchive" modelAttribute="thingPageArchive" path="/thingpagearchives" render="${empty dependencies}" z="yMUOZnTnD5E+KEhuqvisZFZDoWk=">
-        <field:textarea field="pageName" id="c_com_labsynch_labseer_domain_ThingPageArchive_pageName" z="zASQn7FXDfs2dJI4D0VUUUxgSb0="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ThingPageArchive_recordedBy" required="true" z="0bljF5l+ea0+LwTxVGBWcQFUmc4="/>
-        <field:datetime dateTimePattern="${thingPageArchive_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ThingPageArchive_recordedDate" required="true" z="zewuymxawn9XWSsV9UB/14nBFUw="/>
-        <field:input field="pageContent" id="c_com_labsynch_labseer_domain_ThingPageArchive_pageContent" z="W/mrX8BnWigF4Jusde9kWkTZGg4="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ThingPageArchive_modifiedBy" required="true" z="2qMI96bkU06nRydIp/Lwx9qnUeE="/>
-        <field:datetime dateTimePattern="${thingPageArchive_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ThingPageArchive_modifiedDate" required="true" z="7117EJ8EGEeiB8u8ljGg8spISaM="/>
-        <field:textarea field="currentEditor" id="c_com_labsynch_labseer_domain_ThingPageArchive_currentEditor" z="OFMPGXDV3tBl76exMfgXw6pcf0E="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ThingPageArchive_ignored" z="cwYD8apHSDMWsg0bDl6jocl2cz4="/>
-        <field:checkbox field="archived" id="c_com_labsynch_labseer_domain_ThingPageArchive_archived" z="AQnUolPckE4TntaiFK0WX9tNLUY="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ThingPageArchive_lsTransaction" validationMessageCode="field_invalid_integer" z="F5gzcFn3aFi8P9puyYVqfu6uYdA="/>
-        <field:input field="thing" id="c_com_labsynch_labseer_domain_ThingPageArchive_thing" validationMessageCode="field_invalid_integer" z="ZDsEkevgdqsI0BfAbIoCmr5s2Jg="/>
-        <field:input field="pageVersion" id="c_com_labsynch_labseer_domain_ThingPageArchive_pageVersion" validationMessageCode="field_invalid_integer" z="TqNIKzS03/rr/sPuxw7+/4CLNZg="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ThingPageArchive" render="${not empty dependencies}" z="r36uEWtsSdAov0fbVdwnt/VHtEQ="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/thingpagearchives/list.jspx b/src/main/webapp/WEB-INF/views/thingpagearchives/list.jspx
deleted file mode 100755
index db668692f..000000000
--- a/src/main/webapp/WEB-INF/views/thingpagearchives/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ThingPageArchive" items="${thingpagearchives}" z="qHl9CbAsqYdGacQiJH+OxLx9+f4=">
-        <table:table data="${thingpagearchives}" id="l_com_labsynch_labseer_domain_ThingPageArchive" path="/thingpagearchives" z="X4/YvEnTyz8d/g3WdjYGbP1QRGA=">
-            <table:column id="c_com_labsynch_labseer_domain_ThingPageArchive_pageName" property="pageName" z="cxNYuaYaRzoJ7nIOdxj4Gj4ZSZM="/>
-            <table:column id="c_com_labsynch_labseer_domain_ThingPageArchive_recordedBy" property="recordedBy" z="NWUvkMdcKU6OlVhW2/s0eV+2Qro="/>
-            <table:column date="true" dateTimePattern="${thingPageArchive_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_ThingPageArchive_recordedDate" property="recordedDate" z="HOKLGizVsDmTQD4gJDf0llf9IKY="/>
-            <table:column id="c_com_labsynch_labseer_domain_ThingPageArchive_pageContent" property="pageContent" z="8K5qccPIU4AYz4Dq7b3cITLfF7A="/>
-            <table:column id="c_com_labsynch_labseer_domain_ThingPageArchive_modifiedBy" property="modifiedBy" z="u2seYQL9ipQoK7J3cukuhCcC804="/>
-            <table:column date="true" dateTimePattern="${thingPageArchive_modifieddate_date_format}" id="c_com_labsynch_labseer_domain_ThingPageArchive_modifiedDate" property="modifiedDate" z="2F0b5ERWWltd5jztxUkv04Tfi8k="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/thingpagearchives/show.jspx b/src/main/webapp/WEB-INF/views/thingpagearchives/show.jspx
deleted file mode 100755
index 59a146dfa..000000000
--- a/src/main/webapp/WEB-INF/views/thingpagearchives/show.jspx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ThingPageArchive" object="${thingpagearchive}" path="/thingpagearchives" z="OC4aA15C9gjY+iheVmryxp0nmZQ=">
-        <field:display field="pageName" id="s_com_labsynch_labseer_domain_ThingPageArchive_pageName" object="${thingpagearchive}" z="Lxz9DXWWffe/2aItkgWws6HB2EU="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_ThingPageArchive_recordedBy" object="${thingpagearchive}" z="bZN6R/7wyvV52KnKntbLZafCtLk="/>
-        <field:display date="true" dateTimePattern="${thingPageArchive_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_ThingPageArchive_recordedDate" object="${thingpagearchive}" z="E4xQRx2xEwpx3CwWW0x13vAOeWc="/>
-        <field:display field="pageContent" id="s_com_labsynch_labseer_domain_ThingPageArchive_pageContent" object="${thingpagearchive}" z="JA8+DIT4kKBqt358fsOGCCM7zH0="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_ThingPageArchive_modifiedBy" object="${thingpagearchive}" z="ot0WAe/LX9y7n4XasOLsfZ6Ob6A="/>
-        <field:display date="true" dateTimePattern="${thingPageArchive_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_ThingPageArchive_modifiedDate" object="${thingpagearchive}" z="aedbIVCuj3s7bWKDoBHb6vF3emw="/>
-        <field:display field="currentEditor" id="s_com_labsynch_labseer_domain_ThingPageArchive_currentEditor" object="${thingpagearchive}" z="xv4mmJpGe9vv4nURRAYo0rEKzDE="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ThingPageArchive_ignored" object="${thingpagearchive}" z="4a5qGjxZ3wMlanKYXSkN+Belei8="/>
-        <field:display field="archived" id="s_com_labsynch_labseer_domain_ThingPageArchive_archived" object="${thingpagearchive}" z="GGSaaOKcUS/eXD/W1Qz17QP+C6s="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_ThingPageArchive_lsTransaction" object="${thingpagearchive}" z="/Kdsw6cWq6z2N8nVfmamffb+K1E="/>
-        <field:display field="thing" id="s_com_labsynch_labseer_domain_ThingPageArchive_thing" object="${thingpagearchive}" z="f3M1JdwtVQu7GmiyQxtGVE3ah1U="/>
-        <field:display field="pageVersion" id="s_com_labsynch_labseer_domain_ThingPageArchive_pageVersion" object="${thingpagearchive}" z="rO6YFoPhpmLrGUJnqrVyHmcPNnA="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/thingpagearchives/update.jspx b/src/main/webapp/WEB-INF/views/thingpagearchives/update.jspx
deleted file mode 100755
index 727dd5d78..000000000
--- a/src/main/webapp/WEB-INF/views/thingpagearchives/update.jspx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ThingPageArchive" modelAttribute="thingPageArchive" path="/thingpagearchives" versionField="Version" z="B2VwRDkjWNv5E05pkEBStCY5Wsg=">
-        <field:textarea field="pageName" id="c_com_labsynch_labseer_domain_ThingPageArchive_pageName" z="zASQn7FXDfs2dJI4D0VUUUxgSb0="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ThingPageArchive_recordedBy" required="true" z="0bljF5l+ea0+LwTxVGBWcQFUmc4="/>
-        <field:datetime dateTimePattern="${thingPageArchive_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ThingPageArchive_recordedDate" required="true" z="zewuymxawn9XWSsV9UB/14nBFUw="/>
-        <field:input field="pageContent" id="c_com_labsynch_labseer_domain_ThingPageArchive_pageContent" z="W/mrX8BnWigF4Jusde9kWkTZGg4="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ThingPageArchive_modifiedBy" required="true" z="2qMI96bkU06nRydIp/Lwx9qnUeE="/>
-        <field:datetime dateTimePattern="${thingPageArchive_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ThingPageArchive_modifiedDate" required="true" z="7117EJ8EGEeiB8u8ljGg8spISaM="/>
-        <field:textarea field="currentEditor" id="c_com_labsynch_labseer_domain_ThingPageArchive_currentEditor" z="OFMPGXDV3tBl76exMfgXw6pcf0E="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ThingPageArchive_ignored" z="cwYD8apHSDMWsg0bDl6jocl2cz4="/>
-        <field:checkbox field="archived" id="c_com_labsynch_labseer_domain_ThingPageArchive_archived" z="AQnUolPckE4TntaiFK0WX9tNLUY="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_ThingPageArchive_lsTransaction" validationMessageCode="field_invalid_integer" z="F5gzcFn3aFi8P9puyYVqfu6uYdA="/>
-        <field:input field="thing" id="c_com_labsynch_labseer_domain_ThingPageArchive_thing" validationMessageCode="field_invalid_integer" z="ZDsEkevgdqsI0BfAbIoCmr5s2Jg="/>
-        <field:input field="pageVersion" id="c_com_labsynch_labseer_domain_ThingPageArchive_pageVersion" validationMessageCode="field_invalid_integer" z="TqNIKzS03/rr/sPuxw7+/4CLNZg="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/thingpagearchives/views.xml b/src/main/webapp/WEB-INF/views/thingpagearchives/views.xml
deleted file mode 100755
index f4688fc67..000000000
--- a/src/main/webapp/WEB-INF/views/thingpagearchives/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="thingpagearchives/list">
-        <put-attribute name="body" value="/WEB-INF/views/thingpagearchives/list.jspx"/>
-    </definition>
-<definition extends="default" name="thingpagearchives/show">
-        <put-attribute name="body" value="/WEB-INF/views/thingpagearchives/show.jspx"/>
-    </definition>
-<definition extends="default" name="thingpagearchives/create">
-        <put-attribute name="body" value="/WEB-INF/views/thingpagearchives/create.jspx"/>
-    </definition>
-<definition extends="default" name="thingpagearchives/update">
-        <put-attribute name="body" value="/WEB-INF/views/thingpagearchives/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/thingpages/create.jspx b/src/main/webapp/WEB-INF/views/thingpages/create.jspx
deleted file mode 100755
index b63262577..000000000
--- a/src/main/webapp/WEB-INF/views/thingpages/create.jspx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ThingPage" modelAttribute="thingPage" path="/thingpages" render="${empty dependencies}" z="nwvyiKivYDRodZcdgxWs1lJH6Pc=">
-        <field:textarea field="pageName" id="c_com_labsynch_labseer_domain_ThingPage_pageName" z="dVuc5WXkrw7xlIInwNNN59YTQSg="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ThingPage_recordedBy" required="true" z="Us82Hb2C/jVQcwhFOnwLNXKHiR0="/>
-        <field:datetime dateTimePattern="${thingPage_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ThingPage_recordedDate" required="true" z="h+Q7kRVYtnYbIGscbuIpR8JQlb8="/>
-        <field:input field="pageContent" id="c_com_labsynch_labseer_domain_ThingPage_pageContent" z="clTWW4gmBhfYKiSukj2Sj18oFpQ="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ThingPage_modifiedBy" required="true" z="hlNAxUKhJcJUZQrC+Rsk/9M+FVA="/>
-        <field:datetime dateTimePattern="${thingPage_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ThingPage_modifiedDate" required="true" z="GMQfXpQ0A13azPil5smRUDoLxBQ="/>
-        <field:textarea field="currentEditor" id="c_com_labsynch_labseer_domain_ThingPage_currentEditor" required="true" z="Wpllc4hjP/N+O1JhSa5nAIu4OGs="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ThingPage_ignored" z="lqnbuC/FNty93nzalP54S7MYbZ8="/>
-        <field:checkbox field="archived" id="c_com_labsynch_labseer_domain_ThingPage_archived" z="CGmhAo9dIQqfSwmEaKsqV1Bo1O8="/>
-        <field:select field="lsTransaction" id="c_com_labsynch_labseer_domain_ThingPage_lsTransaction" itemValue="id" items="${lstransactions}" path="/lstransactions" z="216+q5VWGR6vv1RMU7YcYMreXIw="/>
-        <field:select field="thing" id="c_com_labsynch_labseer_domain_ThingPage_thing" itemValue="id" items="${abstractthings}" path="/abstractthings" required="true" z="XBp0YWHrR07tt8N+FpQZbtrVWQQ="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ThingPage" render="${not empty dependencies}" z="j5aDoyVCuAF8UeelV3skvh0T5Vc="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/thingpages/list.jspx b/src/main/webapp/WEB-INF/views/thingpages/list.jspx
deleted file mode 100755
index 19d76a762..000000000
--- a/src/main/webapp/WEB-INF/views/thingpages/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ThingPage" items="${thingpages}" z="1w5Ocz5gsl6ycXKa0Tp0SVGGVVI=">
-        <table:table data="${thingpages}" id="l_com_labsynch_labseer_domain_ThingPage" path="/thingpages" z="eawttiDHcSOIgsAcYJK+nG05EEk=">
-            <table:column id="c_com_labsynch_labseer_domain_ThingPage_pageName" property="pageName" z="06XVrGEdXojyUdJGNac2q7Mp+G0="/>
-            <table:column id="c_com_labsynch_labseer_domain_ThingPage_recordedBy" property="recordedBy" z="wx8Demrm8ZSrRVn2fTc+msRMmAs="/>
-            <table:column date="true" dateTimePattern="${thingPage_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_ThingPage_recordedDate" property="recordedDate" z="WMKVR1nbAnipP5yZ+NhE0DNFGcY="/>
-            <table:column id="c_com_labsynch_labseer_domain_ThingPage_pageContent" property="pageContent" z="c9W0dLPKQHjcwrseAeXW329XZI0="/>
-            <table:column id="c_com_labsynch_labseer_domain_ThingPage_modifiedBy" property="modifiedBy" z="hAnd5Wiw4LFSdpgMeQOs8W1NNUY="/>
-            <table:column date="true" dateTimePattern="${thingPage_modifieddate_date_format}" id="c_com_labsynch_labseer_domain_ThingPage_modifiedDate" property="modifiedDate" z="GIphOjcNK046ZC64M0ml943NuyY="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/thingpages/show.jspx b/src/main/webapp/WEB-INF/views/thingpages/show.jspx
deleted file mode 100755
index 0a43e68dc..000000000
--- a/src/main/webapp/WEB-INF/views/thingpages/show.jspx
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ThingPage" object="${thingpage}" path="/thingpages" z="W6wTtQf/jyh0CdmqM78Dyqg8ykM=">
-        <field:display field="pageName" id="s_com_labsynch_labseer_domain_ThingPage_pageName" object="${thingpage}" z="kTp9joTHU8QsKjySluWo02jGOWc="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_ThingPage_recordedBy" object="${thingpage}" z="gO062otHPnfp2r4Cx0ERLOAkbUk="/>
-        <field:display date="true" dateTimePattern="${thingPage_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_ThingPage_recordedDate" object="${thingpage}" z="1Jv0NA9nagEap22/6z26ki2ysMQ="/>
-        <field:display field="pageContent" id="s_com_labsynch_labseer_domain_ThingPage_pageContent" object="${thingpage}" z="61IgRMElJX/gbCuY/qu0yMcisro="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_ThingPage_modifiedBy" object="${thingpage}" z="DttPV+pJrCIsWrCPgNBL7ePZ0mM="/>
-        <field:display date="true" dateTimePattern="${thingPage_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_ThingPage_modifiedDate" object="${thingpage}" z="snagiEBzFohdvUDvX9pxqKpdkm0="/>
-        <field:display field="currentEditor" id="s_com_labsynch_labseer_domain_ThingPage_currentEditor" object="${thingpage}" z="xEJye5ilkRu0H32cMoQ4EFehoo4="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_ThingPage_ignored" object="${thingpage}" z="2tr4DuzHW/tiUDuWyTQw+wEzpA8="/>
-        <field:display field="archived" id="s_com_labsynch_labseer_domain_ThingPage_archived" object="${thingpage}" z="WAPw+Oxsg2SQocrV1C6S/qNVreU="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_ThingPage_lsTransaction" object="${thingpage}" z="0w4tzxTI+ClqoyTjgijBxx0AIwk="/>
-        <field:display field="thing" id="s_com_labsynch_labseer_domain_ThingPage_thing" object="${thingpage}" z="R3WUDuEByy1paO8aewHzhCTX46c="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/thingpages/update.jspx b/src/main/webapp/WEB-INF/views/thingpages/update.jspx
deleted file mode 100755
index 23a42731c..000000000
--- a/src/main/webapp/WEB-INF/views/thingpages/update.jspx
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ThingPage" modelAttribute="thingPage" path="/thingpages" versionField="Version" z="BYvNWca/+HlTsG+MVXjUuYYBXFs=">
-        <field:textarea field="pageName" id="c_com_labsynch_labseer_domain_ThingPage_pageName" z="dVuc5WXkrw7xlIInwNNN59YTQSg="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_ThingPage_recordedBy" required="true" z="Us82Hb2C/jVQcwhFOnwLNXKHiR0="/>
-        <field:datetime dateTimePattern="${thingPage_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_ThingPage_recordedDate" required="true" z="h+Q7kRVYtnYbIGscbuIpR8JQlb8="/>
-        <field:input field="pageContent" id="c_com_labsynch_labseer_domain_ThingPage_pageContent" z="clTWW4gmBhfYKiSukj2Sj18oFpQ="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_ThingPage_modifiedBy" required="true" z="hlNAxUKhJcJUZQrC+Rsk/9M+FVA="/>
-        <field:datetime dateTimePattern="${thingPage_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_ThingPage_modifiedDate" required="true" z="GMQfXpQ0A13azPil5smRUDoLxBQ="/>
-        <field:textarea field="currentEditor" id="c_com_labsynch_labseer_domain_ThingPage_currentEditor" required="true" z="Wpllc4hjP/N+O1JhSa5nAIu4OGs="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_ThingPage_ignored" z="lqnbuC/FNty93nzalP54S7MYbZ8="/>
-        <field:checkbox field="archived" id="c_com_labsynch_labseer_domain_ThingPage_archived" z="CGmhAo9dIQqfSwmEaKsqV1Bo1O8="/>
-        <field:select field="lsTransaction" id="c_com_labsynch_labseer_domain_ThingPage_lsTransaction" itemValue="id" items="${lstransactions}" path="/lstransactions" z="216+q5VWGR6vv1RMU7YcYMreXIw="/>
-        <field:select field="thing" id="c_com_labsynch_labseer_domain_ThingPage_thing" itemValue="id" items="${abstractthings}" path="/abstractthings" required="true" z="XBp0YWHrR07tt8N+FpQZbtrVWQQ="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/thingpages/views.xml b/src/main/webapp/WEB-INF/views/thingpages/views.xml
deleted file mode 100755
index fe0612117..000000000
--- a/src/main/webapp/WEB-INF/views/thingpages/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="thingpages/list">
-        <put-attribute name="body" value="/WEB-INF/views/thingpages/list.jspx"/>
-    </definition>
-<definition extends="default" name="thingpages/show">
-        <put-attribute name="body" value="/WEB-INF/views/thingpages/show.jspx"/>
-    </definition>
-<definition extends="default" name="thingpages/create">
-        <put-attribute name="body" value="/WEB-INF/views/thingpages/create.jspx"/>
-    </definition>
-<definition extends="default" name="thingpages/update">
-        <put-attribute name="body" value="/WEB-INF/views/thingpages/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/thingtypes/create.jspx b/src/main/webapp/WEB-INF/views/thingtypes/create.jspx
deleted file mode 100755
index e539ccd73..000000000
--- a/src/main/webapp/WEB-INF/views/thingtypes/create.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ThingType" modelAttribute="thingType" path="/thingtypes" render="${empty dependencies}" z="bdG+Ho/zUFbayDg1KjhxPpudS/k=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_ThingType_typeName" required="true" z="L2kay/CRuiGOaMqPvIhD5WMCJRg="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ThingType" render="${not empty dependencies}" z="vJVollNG2RXSZ2Bl9kx8J9ByhvQ="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/thingtypes/findThingTypesByTypeNameEquals.jspx b/src/main/webapp/WEB-INF/views/thingtypes/findThingTypesByTypeNameEquals.jspx
deleted file mode 100755
index 96041bea3..000000000
--- a/src/main/webapp/WEB-INF/views/thingtypes/findThingTypesByTypeNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByTypeNameEquals" id="ff_com_labsynch_labseer_domain_ThingType" path="/thingtypes" z="o6w74y/dW5P+a5dqxFxSDpplUH0=">
-        <field:input disableFormBinding="true" field="typeName" id="f_com_labsynch_labseer_domain_ThingType_typeName" max="128" required="true" z="ViupLRb/QM8fZMF464zk2Z0CXW8="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/thingtypes/list.jspx b/src/main/webapp/WEB-INF/views/thingtypes/list.jspx
deleted file mode 100755
index 0824b6fa3..000000000
--- a/src/main/webapp/WEB-INF/views/thingtypes/list.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ThingType" items="${thingtypes}" z="OmsOorOnkjc7HR2Py/9IqL9wHHA=">
-        <table:table data="${thingtypes}" id="l_com_labsynch_labseer_domain_ThingType" path="/thingtypes" z="ZPNqtyjjUsbm/2Q2KjFoWsHZ4t8=">
-            <table:column id="c_com_labsynch_labseer_domain_ThingType_typeName" property="typeName" z="MQaJ6ix6vsV0f6qTcFVWJFGJOLw="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/thingtypes/show.jspx b/src/main/webapp/WEB-INF/views/thingtypes/show.jspx
deleted file mode 100755
index 492534686..000000000
--- a/src/main/webapp/WEB-INF/views/thingtypes/show.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ThingType" object="${thingtype}" path="/thingtypes" z="iGIuDw1gp4D9ZLQTijIRYxzF/R0=">
-        <field:display field="typeName" id="s_com_labsynch_labseer_domain_ThingType_typeName" object="${thingtype}" z="52dxMSHlFd+0YGxnNC7EqQkV/6k="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/thingtypes/update.jspx b/src/main/webapp/WEB-INF/views/thingtypes/update.jspx
deleted file mode 100755
index 1be6f8b14..000000000
--- a/src/main/webapp/WEB-INF/views/thingtypes/update.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ThingType" modelAttribute="thingType" path="/thingtypes" versionField="Version" z="0ATb32bU6CbkXqWmemMdwV1ZaFk=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_ThingType_typeName" required="true" z="L2kay/CRuiGOaMqPvIhD5WMCJRg="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/thingtypes/views.xml b/src/main/webapp/WEB-INF/views/thingtypes/views.xml
deleted file mode 100755
index f797b3168..000000000
--- a/src/main/webapp/WEB-INF/views/thingtypes/views.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="thingtypes/list">
-        <put-attribute name="body" value="/WEB-INF/views/thingtypes/list.jspx"/>
-    </definition>
-<definition extends="default" name="thingtypes/show">
-        <put-attribute name="body" value="/WEB-INF/views/thingtypes/show.jspx"/>
-    </definition>
-<definition extends="default" name="thingtypes/create">
-        <put-attribute name="body" value="/WEB-INF/views/thingtypes/create.jspx"/>
-    </definition>
-<definition extends="default" name="thingtypes/update">
-        <put-attribute name="body" value="/WEB-INF/views/thingtypes/update.jspx"/>
-    </definition>
-<definition extends="default" name="thingtypes/findThingTypesByTypeNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/thingtypes/findThingTypesByTypeNameEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgrouplabels/create.jspx b/src/main/webapp/WEB-INF/views/treatmentgrouplabels/create.jspx
deleted file mode 100755
index b3f3c1ff2..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgrouplabels/create.jspx
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_TreatmentGroupLabel" modelAttribute="treatmentGroupLabel" path="/treatmentgrouplabels" render="${empty dependencies}" z="aSirAd1rtTAMqTyVt3YSv27XCXw=">
-        <field:textarea field="labelText" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_labelText" required="true" z="jEyt787WDoJxkzqgoEaM7y4SyYA="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_recordedBy" required="true" z="aDg7QAzfnqlNFv3bWNy4lcY4bPE="/>
-        <field:datetime dateTimePattern="${treatmentGroupLabel_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_recordedDate" required="true" z="C7BJcw2jVBXF2i0xZBpEQL9zkVA="/>
-        <field:datetime dateTimePattern="${treatmentGroupLabel_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_modifiedDate" z="UCK/OSfzt0thRx6t8NbJYQ7noqs="/>
-        <field:checkbox field="physicallyLabled" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_physicallyLabled" z="0f+DBH2kDkdcjmymxAN7Epfy7XU="/>
-        <field:textarea field="imageFile" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_imageFile" z="jI0CmeoTZF+sOUa1S8F2sIzSMNU="/>
-        <field:checkbox field="preferred" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_preferred" z="JNSmkaZH0/rSaXQ/4Xgw3RO2k+c="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_ignored" z="R52k2qGy2oon9rhuenFxsiOquQ8="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_lsTransaction" validationMessageCode="field_invalid_integer" z="k2NQvPyR1tFQ/3Ap8PAxteo/sU0="/>
-        <field:select field="treatmentGroup" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_treatmentGroup" itemValue="id" items="${treatmentgroups}" path="/treatmentgroups" required="true" z="+OF43yO9Y7s5lGyqGuutrf88fP4="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_lsType" required="true" z="lwEA/BXmaVpqtt4DBUVKfIXRbY0="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_lsKind" required="true" z="y7Zj5Ty3pVzCE9u9ojPDqemo//U="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_lsTypeAndKind" z="k1wCDgAg6duu5w0BsMrnCUlEUS8="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_deleted" z="e/lrvbHCztD+qBHoZc6+sLAKOeo="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_TreatmentGroupLabel" render="${not empty dependencies}" z="r2dIItv+1esxsgMTGFLk9Q2uSK4="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgrouplabels/findTreatmentGroupLabelsByLsTransactionEquals.jspx b/src/main/webapp/WEB-INF/views/treatmentgrouplabels/findTreatmentGroupLabelsByLsTransactionEquals.jspx
deleted file mode 100755
index 1aa556f0c..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgrouplabels/findTreatmentGroupLabelsByLsTransactionEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTransactionEquals" id="ff_com_labsynch_labseer_domain_TreatmentGroupLabel" path="/treatmentgrouplabels" z="qebCKmR4S12FF4SX5D3JefN1SNg=">
-        <field:input disableFormBinding="true" field="lsTransaction" id="f_com_labsynch_labseer_domain_TreatmentGroupLabel_lsTransaction" required="true" validationMessageCode="field_invalid_integer" z="eYr7dDjQJ2RAhYVOgUwpJqXinoo="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgrouplabels/findTreatmentGroupLabelsByTreatmentGroup.jspx b/src/main/webapp/WEB-INF/views/treatmentgrouplabels/findTreatmentGroupLabelsByTreatmentGroup.jspx
deleted file mode 100755
index 2e01bd12e..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgrouplabels/findTreatmentGroupLabelsByTreatmentGroup.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByTreatmentGroup" id="ff_com_labsynch_labseer_domain_TreatmentGroupLabel" path="/treatmentgrouplabels" z="tH3JC4C9gktaeJD8qIszbrkUQq4=">
-        <field:select disableFormBinding="true" field="treatmentGroup" id="f_com_labsynch_labseer_domain_TreatmentGroupLabel_treatmentGroup" itemValue="id" items="${treatmentgroups}" path="/treatmentgroups" required="true" z="nRBfcchTLmuv2Wf4K7N737WZxYk="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgrouplabels/list.jspx b/src/main/webapp/WEB-INF/views/treatmentgrouplabels/list.jspx
deleted file mode 100755
index 9a720087e..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgrouplabels/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_TreatmentGroupLabel" items="${treatmentgrouplabels}" z="Z5dA/3GQ2OeonTGpVP8zYYfSFVw=">
-        <table:table data="${treatmentgrouplabels}" id="l_com_labsynch_labseer_domain_TreatmentGroupLabel" path="/treatmentgrouplabels" z="SYIPo5oh2li/gBWaFTy/60Cfk8I=">
-            <table:column id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_labelText" property="labelText" z="yZbNIh85yLitLOv0ML2hSyOirOE="/>
-            <table:column id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_recordedBy" property="recordedBy" z="bJ5cMczb+17v9nbCIynsQfWHWNo="/>
-            <table:column date="true" dateTimePattern="${treatmentGroupLabel_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_recordedDate" property="recordedDate" z="5i7VjmSuN4oA/qr+E/j83aASyCo="/>
-            <table:column date="true" dateTimePattern="${treatmentGroupLabel_modifieddate_date_format}" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_modifiedDate" property="modifiedDate" z="68oDlMS7THRMut0KoG/yuTXd7NA="/>
-            <table:column id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_physicallyLabled" property="physicallyLabled" z="NRf5JFV4FCOVlKKb4z8bIP4q0oU="/>
-            <table:column id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_imageFile" property="imageFile" z="6Nil7cawfwnUTzQCcr45ypiI+a8="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgrouplabels/show.jspx b/src/main/webapp/WEB-INF/views/treatmentgrouplabels/show.jspx
deleted file mode 100755
index 71817ff22..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgrouplabels/show.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_TreatmentGroupLabel" object="${treatmentgrouplabel}" path="/treatmentgrouplabels" z="H7D2m+T1rxkAylJQjCQJd3TF/II=">
-        <field:display field="labelText" id="s_com_labsynch_labseer_domain_TreatmentGroupLabel_labelText" object="${treatmentgrouplabel}" z="yFWzEyWGkyReNJGB5aWVx6CZ95w="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_TreatmentGroupLabel_recordedBy" object="${treatmentgrouplabel}" z="THcAtdUp+yrj6PRa+2GxgSTtLJU="/>
-        <field:display date="true" dateTimePattern="${treatmentGroupLabel_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_TreatmentGroupLabel_recordedDate" object="${treatmentgrouplabel}" z="AdWMBJt0VxPw2SSt+4iaDP5KFls="/>
-        <field:display date="true" dateTimePattern="${treatmentGroupLabel_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_TreatmentGroupLabel_modifiedDate" object="${treatmentgrouplabel}" z="CVVMBbSLiPbHSuwOj0JlsjzgRSI="/>
-        <field:display field="physicallyLabled" id="s_com_labsynch_labseer_domain_TreatmentGroupLabel_physicallyLabled" object="${treatmentgrouplabel}" z="ItBVQtferTFQJKtxKseBTQaLOGY="/>
-        <field:display field="imageFile" id="s_com_labsynch_labseer_domain_TreatmentGroupLabel_imageFile" object="${treatmentgrouplabel}" z="kNO3o3VVq2A6rjeqFOk3Q0U1fk4="/>
-        <field:display field="preferred" id="s_com_labsynch_labseer_domain_TreatmentGroupLabel_preferred" object="${treatmentgrouplabel}" z="hGNts+fYX9aNFsFmMyCQw2QlUY8="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_TreatmentGroupLabel_ignored" object="${treatmentgrouplabel}" z="TbabOQgyR9gPA8Ji+1khy/MDEts="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_TreatmentGroupLabel_lsTransaction" object="${treatmentgrouplabel}" z="LSEdUEp+OXWJ7HxKhQdQUGZ36+A="/>
-        <field:display field="treatmentGroup" id="s_com_labsynch_labseer_domain_TreatmentGroupLabel_treatmentGroup" object="${treatmentgrouplabel}" z="la4qRh0Ix+jo2Q1hG+9tVGyfHe0="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_TreatmentGroupLabel_lsType" object="${treatmentgrouplabel}" z="6nYxbiptiU02vpDs5VVdHWSrEgE="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_TreatmentGroupLabel_lsKind" object="${treatmentgrouplabel}" z="tylcYbN2bMA2TORTbs933ZKGgEM="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_TreatmentGroupLabel_lsTypeAndKind" object="${treatmentgrouplabel}" z="KQb0syGmgU8s4JK78ebZ35lO6gM="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_TreatmentGroupLabel_deleted" object="${treatmentgrouplabel}" z="mH11+F2cfggwIKmEbCW8oUIm2+8="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgrouplabels/update.jspx b/src/main/webapp/WEB-INF/views/treatmentgrouplabels/update.jspx
deleted file mode 100755
index cacba630f..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgrouplabels/update.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_TreatmentGroupLabel" modelAttribute="treatmentGroupLabel" path="/treatmentgrouplabels" versionField="Version" z="rc1NgVQKSkM+LLvVeLT9QUBsD+8=">
-        <field:textarea field="labelText" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_labelText" required="true" z="jEyt787WDoJxkzqgoEaM7y4SyYA="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_recordedBy" required="true" z="aDg7QAzfnqlNFv3bWNy4lcY4bPE="/>
-        <field:datetime dateTimePattern="${treatmentGroupLabel_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_recordedDate" required="true" z="C7BJcw2jVBXF2i0xZBpEQL9zkVA="/>
-        <field:datetime dateTimePattern="${treatmentGroupLabel_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_modifiedDate" z="UCK/OSfzt0thRx6t8NbJYQ7noqs="/>
-        <field:checkbox field="physicallyLabled" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_physicallyLabled" z="0f+DBH2kDkdcjmymxAN7Epfy7XU="/>
-        <field:textarea field="imageFile" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_imageFile" z="jI0CmeoTZF+sOUa1S8F2sIzSMNU="/>
-        <field:checkbox field="preferred" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_preferred" z="JNSmkaZH0/rSaXQ/4Xgw3RO2k+c="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_ignored" z="R52k2qGy2oon9rhuenFxsiOquQ8="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_lsTransaction" validationMessageCode="field_invalid_integer" z="k2NQvPyR1tFQ/3Ap8PAxteo/sU0="/>
-        <field:select field="treatmentGroup" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_treatmentGroup" itemValue="id" items="${treatmentgroups}" path="/treatmentgroups" required="true" z="+OF43yO9Y7s5lGyqGuutrf88fP4="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_lsType" required="true" z="lwEA/BXmaVpqtt4DBUVKfIXRbY0="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_lsKind" required="true" z="y7Zj5Ty3pVzCE9u9ojPDqemo//U="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_lsTypeAndKind" z="k1wCDgAg6duu5w0BsMrnCUlEUS8="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_TreatmentGroupLabel_deleted" z="e/lrvbHCztD+qBHoZc6+sLAKOeo="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgrouplabels/views.xml b/src/main/webapp/WEB-INF/views/treatmentgrouplabels/views.xml
deleted file mode 100755
index fe9c33b1d..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgrouplabels/views.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="treatmentgrouplabels/list">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgrouplabels/list.jspx"/>
-    </definition>
-<definition extends="default" name="treatmentgrouplabels/show">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgrouplabels/show.jspx"/>
-    </definition>
-<definition extends="default" name="treatmentgrouplabels/create">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgrouplabels/create.jspx"/>
-    </definition>
-<definition extends="default" name="treatmentgrouplabels/update">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgrouplabels/update.jspx"/>
-    </definition>
-<definition extends="default" name="treatmentgrouplabels/findTreatmentGroupLabelsByLsTransactionEquals">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgrouplabels/findTreatmentGroupLabelsByLsTransactionEquals.jspx"/>
-    </definition>
-<definition extends="default" name="treatmentgrouplabels/findTreatmentGroupLabelsByTreatmentGroup">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgrouplabels/findTreatmentGroupLabelsByTreatmentGroup.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgroups/create.jspx b/src/main/webapp/WEB-INF/views/treatmentgroups/create.jspx
deleted file mode 100755
index d16aa009d..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgroups/create.jspx
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_TreatmentGroup" modelAttribute="treatmentGroup" path="/treatmentgroups" render="${empty dependencies}" z="55vr2nLmt+bdFfveYJsk2ZUVt8s=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_TreatmentGroup_recordedBy" required="true" z="DqSvWodwDRKayPcuze/SM/2OF8A="/>
-        <field:datetime dateTimePattern="${treatmentGroup_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_TreatmentGroup_recordedDate" required="true" z="JD4IsawVvQsQmD3rAqtdMM9WKEw="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_TreatmentGroup_modifiedBy" z="xs0ac5ZJgjEd2S0fyXzRfzxKypY="/>
-        <field:datetime dateTimePattern="${treatmentGroup_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_TreatmentGroup_modifiedDate" z="0KL+aUGmRFcZzW1dPs9nRR8iFAM="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_TreatmentGroup_ignored" z="6Re1Gz7psuMPHTzGcseWU5SspP0="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_TreatmentGroup_lsTransaction" validationMessageCode="field_invalid_integer" z="j3R/lmvO/Kvjna0MrL6PJBnbV1c="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_TreatmentGroup_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="kSwPniQe2b8w0dTJbyEbG5Ve8hg="/>
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_TreatmentGroup_codeName" z="yfqxCk4oSvNS/kmuiVXn2Mn2AoM="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_TreatmentGroup_lsType" required="true" z="ERXjcM7ePvd4pClCkblivCZB06U="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_TreatmentGroup_lsKind" required="true" z="cP6Es1HZLoLwRgqnHder+7kgBw0="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_TreatmentGroup_lsTypeAndKind" z="CG0FzAu/QltVi53395Mhe8Pim4g="/>
-        <field:simple field="lsLabels" id="c_com_labsynch_labseer_domain_TreatmentGroup_lsLabels" messageCode="entity_reference_not_managed" messageCodeAttribute="Treatment Group Label" z="lZ0LjRMFG4uqOmyCRyZ11D+khhM="/>
-        <field:simple field="lsStates" id="c_com_labsynch_labseer_domain_TreatmentGroup_lsStates" messageCode="entity_reference_not_managed" messageCodeAttribute="Treatment Group State" z="y0djJ5/AyZ4qHmU4d4n4COCjuSE="/>
-        <field:select field="analysisGroups" id="c_com_labsynch_labseer_domain_TreatmentGroup_analysisGroups" itemValue="id" items="${analysisgroups}" multiple="true" path="/analysisgroups" z="dl7zgtrHjpfEUUMzwPAkaEPBq50="/>
-        <field:select field="subjects" id="c_com_labsynch_labseer_domain_TreatmentGroup_subjects" itemValue="id" items="${subjects}" multiple="true" path="/subjects" z="OOiRJcIZPDOW2DvRnfUOGjMg9Wo="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_TreatmentGroup_deleted" z="/9FFPBEWjPed8t29JvCpilS7t0Y="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_TreatmentGroup" render="${not empty dependencies}" z="3eGh75p1F7nsGEk5jwYZXK2XS1Y="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgroups/findTreatmentGroupsByAnalysisGroup.jspx b/src/main/webapp/WEB-INF/views/treatmentgroups/findTreatmentGroupsByAnalysisGroup.jspx
deleted file mode 100755
index 1f69e766d..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgroups/findTreatmentGroupsByAnalysisGroup.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByAnalysisGroup" id="ff_com_labsynch_labseer_domain_TreatmentGroup" path="/treatmentgroups" z="ChSrKcdLNS1NQIQmtOoQfxQoQUk=">
-        <field:select disableFormBinding="true" field="analysisGroup" id="f_com_labsynch_labseer_domain_TreatmentGroup_analysisGroup" itemValue="id" items="${analysisgroups}" path="/analysisgroups" required="true" z="P427FzKQolUzRCVPHU/hcazTWbk="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgroups/findTreatmentGroupsByAnalysisGroups.jspx b/src/main/webapp/WEB-INF/views/treatmentgroups/findTreatmentGroupsByAnalysisGroups.jspx
deleted file mode 100644
index 7b4de2502..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgroups/findTreatmentGroupsByAnalysisGroups.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByAnalysisGroups" id="ff_com_labsynch_labseer_domain_TreatmentGroup" path="/treatmentgroups" z="Ej/lof6xnqp7wWEdXoUMO6xhxPA=">
-        <field:select disableFormBinding="true" field="analysisGroups" id="f_com_labsynch_labseer_domain_TreatmentGroup_analysisGroups" itemValue="id" items="${analysisgroups}" multiple="true" path="/analysisgroups" required="true" z="bUWIeZ+mwHcMh+JQvxg4D/DQkao="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgroups/findTreatmentGroupsByCodeNameEquals.jspx b/src/main/webapp/WEB-INF/views/treatmentgroups/findTreatmentGroupsByCodeNameEquals.jspx
deleted file mode 100644
index 1881cce34..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgroups/findTreatmentGroupsByCodeNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeNameEquals" id="ff_com_labsynch_labseer_domain_TreatmentGroup" path="/treatmentgroups" z="cNQ/BdSytRgYcDhNANgwB4dgBuM=">
-        <field:input disableFormBinding="true" field="codeName" id="f_com_labsynch_labseer_domain_TreatmentGroup_codeName" max="255" required="true" z="W6jkn3FjPrsb+kmiORHoyieq/4o="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgroups/findTreatmentGroupsByLsTransactionEquals.jspx b/src/main/webapp/WEB-INF/views/treatmentgroups/findTreatmentGroupsByLsTransactionEquals.jspx
deleted file mode 100755
index fa1325a32..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgroups/findTreatmentGroupsByLsTransactionEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTransactionEquals" id="ff_com_labsynch_labseer_domain_TreatmentGroup" path="/treatmentgroups" z="tmXE8Ub/ZmLthABpPDk26DYKQqo=">
-        <field:input disableFormBinding="true" field="lsTransaction" id="f_com_labsynch_labseer_domain_TreatmentGroup_lsTransaction" required="true" validationMessageCode="field_invalid_integer" z="xOutBQWCaw3XSacFmHXq/FgYoIc="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgroups/list.jspx b/src/main/webapp/WEB-INF/views/treatmentgroups/list.jspx
deleted file mode 100755
index 9e66ad9cc..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgroups/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_TreatmentGroup" items="${treatmentgroups}" z="lxJUUCfqz1639JjkYB6XJ8htN0g=">
-        <table:table data="${treatmentgroups}" id="l_com_labsynch_labseer_domain_TreatmentGroup" path="/treatmentgroups" z="z6jqQUybYEImY69KyaUNUrzIAOw=">
-            <table:column id="c_com_labsynch_labseer_domain_TreatmentGroup_recordedBy" property="recordedBy" z="IC1OfX646bifl30Cne8v70Lj74E="/>
-            <table:column date="true" dateTimePattern="${treatmentGroup_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_TreatmentGroup_recordedDate" property="recordedDate" z="nMLEQXBku9XH5q/BtrEEOcTTo+A="/>
-            <table:column id="c_com_labsynch_labseer_domain_TreatmentGroup_codeName" property="codeName" z="YpV+23u/hEcj592NYz4yU/2RWzA="/>
-            <table:column id="c_com_labsynch_labseer_domain_TreatmentGroup_lsType" property="lsType" z="kgzGSQf3hA/6lCeHkYwD43U0x5s="/>
-            <table:column id="c_com_labsynch_labseer_domain_TreatmentGroup_lsKind" property="lsKind" z="5J4LuKmxiriNKMvUR9tkFEOz+0I="/>
-            <table:column id="c_com_labsynch_labseer_domain_TreatmentGroup_lsTypeAndKind" property="lsTypeAndKind" z="7sOx4s5R7De1jDzKYbwTLqHaVOE="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgroups/show.jspx b/src/main/webapp/WEB-INF/views/treatmentgroups/show.jspx
deleted file mode 100755
index 7a874ae0f..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgroups/show.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_TreatmentGroup" object="${treatmentgroup}" path="/treatmentgroups" z="Vi334BUZx9EC45znOpr4OYBtYYU=">
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_TreatmentGroup_recordedBy" object="${treatmentgroup}" z="R4CtAVtqqMi08qfLHBO014bVoXE="/>
-        <field:display date="true" dateTimePattern="${treatmentGroup_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_TreatmentGroup_recordedDate" object="${treatmentgroup}" z="23GCXBDqPdH23HCXEs19BcFvCdc="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_TreatmentGroup_modifiedBy" object="${treatmentgroup}" z="8CAnJ4cGeDlMvh08T1qa4bwRJfg="/>
-        <field:display date="true" dateTimePattern="${treatmentGroup_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_TreatmentGroup_modifiedDate" object="${treatmentgroup}" z="vfWxUNWAI0+eeoYqRyMSgT0f4M0="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_TreatmentGroup_ignored" object="${treatmentgroup}" z="hB3nB3wfIexqZ6bTo+69051nFlI="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_TreatmentGroup_lsTransaction" object="${treatmentgroup}" z="8zHk2H5oYK5dmFduM9kOJ8R0Feo="/>
-        <field:display field="codeName" id="s_com_labsynch_labseer_domain_TreatmentGroup_codeName" object="${treatmentgroup}" z="57unvxAdnDNomusKllq6kp/YfMc="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_TreatmentGroup_lsType" object="${treatmentgroup}" z="wrMEnkBYq8pmGxadk+sxJjmehb8="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_TreatmentGroup_lsKind" object="${treatmentgroup}" z="6j7clw3vddiVXGyVQ3+DsTFnPaM="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_TreatmentGroup_lsTypeAndKind" object="${treatmentgroup}" z="5+jFU5sBgJgzOJP1TIc1F98FYuc="/>
-        <field:display field="analysisGroups" id="s_com_labsynch_labseer_domain_TreatmentGroup_analysisGroups" object="${treatmentgroup}" z="WNFHM+fuXDiFdR43f9bhg3WXJB4="/>
-        <field:display field="subjects" id="s_com_labsynch_labseer_domain_TreatmentGroup_subjects" object="${treatmentgroup}" z="el+zC/lGSs9cpWW6C/ZtE7wYN+A="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_TreatmentGroup_deleted" object="${treatmentgroup}" z="L4tLRFuFsMfgNQjiOcBw0Z3dj9I="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgroups/update.jspx b/src/main/webapp/WEB-INF/views/treatmentgroups/update.jspx
deleted file mode 100755
index c98be66b7..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgroups/update.jspx
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_TreatmentGroup" modelAttribute="treatmentGroup" path="/treatmentgroups" versionField="Version" z="LlB/zHoUQ1g5BGWsm9npt3L9z3Q=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_TreatmentGroup_recordedBy" required="true" z="DqSvWodwDRKayPcuze/SM/2OF8A="/>
-        <field:datetime dateTimePattern="${treatmentGroup_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_TreatmentGroup_recordedDate" required="true" z="JD4IsawVvQsQmD3rAqtdMM9WKEw="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_TreatmentGroup_modifiedBy" z="xs0ac5ZJgjEd2S0fyXzRfzxKypY="/>
-        <field:datetime dateTimePattern="${treatmentGroup_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_TreatmentGroup_modifiedDate" z="0KL+aUGmRFcZzW1dPs9nRR8iFAM="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_TreatmentGroup_ignored" z="6Re1Gz7psuMPHTzGcseWU5SspP0="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_TreatmentGroup_lsTransaction" validationMessageCode="field_invalid_integer" z="j3R/lmvO/Kvjna0MrL6PJBnbV1c="/>
-        <field:simple field="thingPage" id="c_com_labsynch_labseer_domain_TreatmentGroup_thingPage" messageCode="entity_reference_not_managed" messageCodeAttribute="Thing Page" z="kSwPniQe2b8w0dTJbyEbG5Ve8hg="/>
-        <field:textarea field="codeName" id="c_com_labsynch_labseer_domain_TreatmentGroup_codeName" z="yfqxCk4oSvNS/kmuiVXn2Mn2AoM="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_TreatmentGroup_lsType" required="true" z="ERXjcM7ePvd4pClCkblivCZB06U="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_TreatmentGroup_lsKind" required="true" z="cP6Es1HZLoLwRgqnHder+7kgBw0="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_TreatmentGroup_lsTypeAndKind" z="CG0FzAu/QltVi53395Mhe8Pim4g="/>
-        <field:simple field="lsLabels" id="c_com_labsynch_labseer_domain_TreatmentGroup_lsLabels" messageCode="entity_reference_not_managed" messageCodeAttribute="Treatment Group Label" z="lZ0LjRMFG4uqOmyCRyZ11D+khhM="/>
-        <field:simple field="lsStates" id="c_com_labsynch_labseer_domain_TreatmentGroup_lsStates" messageCode="entity_reference_not_managed" messageCodeAttribute="Treatment Group State" z="y0djJ5/AyZ4qHmU4d4n4COCjuSE="/>
-        <field:select field="analysisGroups" id="c_com_labsynch_labseer_domain_TreatmentGroup_analysisGroups" itemValue="id" items="${analysisgroups}" multiple="true" path="/analysisgroups" z="dl7zgtrHjpfEUUMzwPAkaEPBq50="/>
-        <field:select field="subjects" id="c_com_labsynch_labseer_domain_TreatmentGroup_subjects" itemValue="id" items="${subjects}" multiple="true" path="/subjects" z="OOiRJcIZPDOW2DvRnfUOGjMg9Wo="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_TreatmentGroup_deleted" z="/9FFPBEWjPed8t29JvCpilS7t0Y="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgroups/views.xml b/src/main/webapp/WEB-INF/views/treatmentgroups/views.xml
deleted file mode 100755
index 388694553..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgroups/views.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="treatmentgroups/list">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgroups/list.jspx"/>
-    </definition>
-<definition extends="default" name="treatmentgroups/show">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgroups/show.jspx"/>
-    </definition>
-<definition extends="default" name="treatmentgroups/create">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgroups/create.jspx"/>
-    </definition>
-<definition extends="default" name="treatmentgroups/update">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgroups/update.jspx"/>
-    </definition>
-<definition extends="default" name="treatmentgroups/findTreatmentGroupsByAnalysisGroup">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgroups/findTreatmentGroupsByAnalysisGroup.jspx"/>
-    </definition>
-<definition extends="default" name="treatmentgroups/findTreatmentGroupsByLsTransactionEquals">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgroups/findTreatmentGroupsByLsTransactionEquals.jspx"/>
-    </definition>
-<definition extends="default" name="treatmentgroups/findTreatmentGroupsByAnalysisGroups">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgroups/findTreatmentGroupsByAnalysisGroups.jspx"/>
-    </definition>
-<definition extends="default" name="treatmentgroups/findTreatmentGroupsByCodeNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgroups/findTreatmentGroupsByCodeNameEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgroupstates/create.jspx b/src/main/webapp/WEB-INF/views/treatmentgroupstates/create.jspx
deleted file mode 100755
index dded2947b..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgroupstates/create.jspx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_TreatmentGroupState" modelAttribute="treatmentGroupState" path="/treatmentgroupstates" render="${empty dependencies}" z="22eae8Jfib0GOlJdYGalhqWB6HM=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_TreatmentGroupState_recordedBy" required="true" z="qdBlD7UmJwedhmFsbH7H0y4VGhk="/>
-        <field:datetime dateTimePattern="${treatmentGroupState_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_TreatmentGroupState_recordedDate" required="true" z="Z9zpEM2EBT86+vdfP1alIRIaAUA="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_TreatmentGroupState_modifiedBy" z="6oJmJkNU9b4J7AmRVUojXLKoKhc="/>
-        <field:datetime dateTimePattern="${treatmentGroupState_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_TreatmentGroupState_modifiedDate" z="qU2l8wfKSCHf+ngCorattn4YgX8="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_TreatmentGroupState_comments" z="KYO/uhIDbiF/LAVZWNp/2iORGcU="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_TreatmentGroupState_ignored" z="nOFQkNHdIZCdZxuHIBCmce2CwAA="/>
-        <field:select field="treatmentGroup" id="c_com_labsynch_labseer_domain_TreatmentGroupState_treatmentGroup" itemValue="id" items="${treatmentgroups}" path="/treatmentgroups" required="true" z="ce4XzsiGQsnDU2xLugUIibuw5Ig="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_TreatmentGroupState_lsTransaction" validationMessageCode="field_invalid_integer" z="o2sPgnB9DiG7P+nqtXSE0E//Fr0="/>
-        <field:simple field="lsValues" id="c_com_labsynch_labseer_domain_TreatmentGroupState_lsValues" messageCode="entity_reference_not_managed" messageCodeAttribute="Treatment Group Value" z="tBZ52hO4yrtYNOuggtfETwz8cnM="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_TreatmentGroupState_lsType" required="true" z="y2JySoX9HzdlXUfWdYT9jJodFQM="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_TreatmentGroupState_lsKind" required="true" z="d5ls0ysqjyMCYCsMhDJSFeY2ads="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_TreatmentGroupState_lsTypeAndKind" z="gH6XDJh6V1edHFv3+iO6qSLx1PA="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_TreatmentGroupState_deleted" z="VQGreQP1JZBOrAy0TIBuGeO/xko="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_TreatmentGroupState" render="${not empty dependencies}" z="Y4ZOyiFbfKIqNFfjoE2e+OFqNm8="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgroupstates/findTreatmentGroupStatesByLsTransactionEquals.jspx b/src/main/webapp/WEB-INF/views/treatmentgroupstates/findTreatmentGroupStatesByLsTransactionEquals.jspx
deleted file mode 100755
index 761409374..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgroupstates/findTreatmentGroupStatesByLsTransactionEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTransactionEquals" id="ff_com_labsynch_labseer_domain_TreatmentGroupState" path="/treatmentgroupstates" z="MB+4yuFCIkNQ1ET2MoVgAXOUT8E=">
-        <field:input disableFormBinding="true" field="lsTransaction" id="f_com_labsynch_labseer_domain_TreatmentGroupState_lsTransaction" required="true" validationMessageCode="field_invalid_integer" z="nOSopMjBT0b/n+UM1U9aPn/89nQ="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgroupstates/findTreatmentGroupStatesByLsTypeAndKindEquals.jspx b/src/main/webapp/WEB-INF/views/treatmentgroupstates/findTreatmentGroupStatesByLsTypeAndKindEquals.jspx
deleted file mode 100755
index dac586e0a..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgroupstates/findTreatmentGroupStatesByLsTypeAndKindEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTypeAndKindEquals" id="ff_com_labsynch_labseer_domain_TreatmentGroupState" path="/treatmentgroupstates" z="Rr7VGNHNT0nWs/TBKCYRRJLqrLI=">
-        <field:input disableFormBinding="true" field="lsTypeAndKind" id="f_com_labsynch_labseer_domain_TreatmentGroupState_lsTypeAndKind" max="255" required="true" z="bYgQJ28YPDGqJRUkyN/7W1q0xrY="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgroupstates/findTreatmentGroupStatesByTreatmentGroup.jspx b/src/main/webapp/WEB-INF/views/treatmentgroupstates/findTreatmentGroupStatesByTreatmentGroup.jspx
deleted file mode 100755
index d34ea341e..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgroupstates/findTreatmentGroupStatesByTreatmentGroup.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByTreatmentGroup" id="ff_com_labsynch_labseer_domain_TreatmentGroupState" path="/treatmentgroupstates" z="haUGakHSFKC984GdUNaf82MunyY=">
-        <field:select disableFormBinding="true" field="treatmentGroup" id="f_com_labsynch_labseer_domain_TreatmentGroupState_treatmentGroup" itemValue="id" items="${treatmentgroups}" path="/treatmentgroups" required="true" z="vC4DdyUM38aknZQj6SfMbWkPcCg="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgroupstates/list.jspx b/src/main/webapp/WEB-INF/views/treatmentgroupstates/list.jspx
deleted file mode 100755
index 34b47014d..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgroupstates/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_TreatmentGroupState" items="${treatmentgroupstates}" z="Nc+yw2VgEq9v1wTSuigmQoTuGbM=">
-        <table:table data="${treatmentgroupstates}" id="l_com_labsynch_labseer_domain_TreatmentGroupState" path="/treatmentgroupstates" z="MvWiDahrrna7ogjD7xumE8KBoyI=">
-            <table:column id="c_com_labsynch_labseer_domain_TreatmentGroupState_recordedBy" property="recordedBy" z="7YgYVnNiPUNcSH3gmvIhCXo47I0="/>
-            <table:column date="true" dateTimePattern="${treatmentGroupState_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_TreatmentGroupState_recordedDate" property="recordedDate" z="wjEmCBp2FVFzbFOWL3Jqfn4TRKk="/>
-            <table:column id="c_com_labsynch_labseer_domain_TreatmentGroupState_modifiedBy" property="modifiedBy" z="SdwsYr80O3p0QMOowBSWMQT/124="/>
-            <table:column date="true" dateTimePattern="${treatmentGroupState_modifieddate_date_format}" id="c_com_labsynch_labseer_domain_TreatmentGroupState_modifiedDate" property="modifiedDate" z="bT3EDPsOvuXn8eeDTALMw2gnZfU="/>
-            <table:column id="c_com_labsynch_labseer_domain_TreatmentGroupState_lsType" property="lsType" z="QhQkc4zj2zOlYjPHCrmJJINirpk="/>
-            <table:column id="c_com_labsynch_labseer_domain_TreatmentGroupState_lsKind" property="lsKind" z="OO8TNKS/WN1i2h2zwCvtWGzO554="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgroupstates/show.jspx b/src/main/webapp/WEB-INF/views/treatmentgroupstates/show.jspx
deleted file mode 100755
index 51c396e68..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgroupstates/show.jspx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_TreatmentGroupState" object="${treatmentgroupstate}" path="/treatmentgroupstates" z="iofrU3pkY664bD2G//U/IRBjVcw=">
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_TreatmentGroupState_recordedBy" object="${treatmentgroupstate}" z="1PEAVBV32Bg8CfmgLUVEwM3WwwI="/>
-        <field:display date="true" dateTimePattern="${treatmentGroupState_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_TreatmentGroupState_recordedDate" object="${treatmentgroupstate}" z="etMNyk+B7TbZqFQJuJGU+yfRM4c="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_TreatmentGroupState_modifiedBy" object="${treatmentgroupstate}" z="vBaYqJkYyHgxdSucIiPwQQgnTtA="/>
-        <field:display date="true" dateTimePattern="${treatmentGroupState_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_TreatmentGroupState_modifiedDate" object="${treatmentgroupstate}" z="ozY3v12IkduNprUcUBa/WIPsbnM="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_TreatmentGroupState_comments" object="${treatmentgroupstate}" z="4omrmbrnyB2T2C1EKjB4Q5XA0G4="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_TreatmentGroupState_ignored" object="${treatmentgroupstate}" z="zTmGMtQYDN+MS7cAEow3AVJqbTA="/>
-        <field:display field="treatmentGroup" id="s_com_labsynch_labseer_domain_TreatmentGroupState_treatmentGroup" object="${treatmentgroupstate}" z="V8P4PiAQ1RitQTJxcMPad1mrXaA="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_TreatmentGroupState_lsTransaction" object="${treatmentgroupstate}" z="xbeuLLqlpRnWlxwxJMwy4mcd+2s="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_TreatmentGroupState_lsType" object="${treatmentgroupstate}" z="A/NJzSYHGj7dV7Ci5XD3IlpG3iE="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_TreatmentGroupState_lsKind" object="${treatmentgroupstate}" z="ojSQug2YkP09idZOE3fes9l+Pkk="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_TreatmentGroupState_lsTypeAndKind" object="${treatmentgroupstate}" z="CSc1luEDlMLJOwX3kJBXgo31jTg="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_TreatmentGroupState_deleted" object="${treatmentgroupstate}" z="pQlxJo5t0jhGmo94SDlB+QrPWgA="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgroupstates/update.jspx b/src/main/webapp/WEB-INF/views/treatmentgroupstates/update.jspx
deleted file mode 100755
index de5c8a119..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgroupstates/update.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_TreatmentGroupState" modelAttribute="treatmentGroupState" path="/treatmentgroupstates" versionField="Version" z="baktuH/rTpNXmkNM0MXJrU5j9UU=">
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_TreatmentGroupState_recordedBy" required="true" z="qdBlD7UmJwedhmFsbH7H0y4VGhk="/>
-        <field:datetime dateTimePattern="${treatmentGroupState_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_TreatmentGroupState_recordedDate" required="true" z="Z9zpEM2EBT86+vdfP1alIRIaAUA="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_TreatmentGroupState_modifiedBy" z="6oJmJkNU9b4J7AmRVUojXLKoKhc="/>
-        <field:datetime dateTimePattern="${treatmentGroupState_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_TreatmentGroupState_modifiedDate" z="qU2l8wfKSCHf+ngCorattn4YgX8="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_TreatmentGroupState_comments" z="KYO/uhIDbiF/LAVZWNp/2iORGcU="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_TreatmentGroupState_ignored" z="nOFQkNHdIZCdZxuHIBCmce2CwAA="/>
-        <field:select field="treatmentGroup" id="c_com_labsynch_labseer_domain_TreatmentGroupState_treatmentGroup" itemValue="id" items="${treatmentgroups}" path="/treatmentgroups" required="true" z="ce4XzsiGQsnDU2xLugUIibuw5Ig="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_TreatmentGroupState_lsTransaction" validationMessageCode="field_invalid_integer" z="o2sPgnB9DiG7P+nqtXSE0E//Fr0="/>
-        <field:simple field="lsValues" id="c_com_labsynch_labseer_domain_TreatmentGroupState_lsValues" messageCode="entity_reference_not_managed" messageCodeAttribute="Treatment Group Value" z="tBZ52hO4yrtYNOuggtfETwz8cnM="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_TreatmentGroupState_lsType" required="true" z="y2JySoX9HzdlXUfWdYT9jJodFQM="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_TreatmentGroupState_lsKind" required="true" z="d5ls0ysqjyMCYCsMhDJSFeY2ads="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_TreatmentGroupState_lsTypeAndKind" z="gH6XDJh6V1edHFv3+iO6qSLx1PA="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_TreatmentGroupState_deleted" z="VQGreQP1JZBOrAy0TIBuGeO/xko="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgroupstates/views.xml b/src/main/webapp/WEB-INF/views/treatmentgroupstates/views.xml
deleted file mode 100755
index 0f74be01b..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgroupstates/views.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="treatmentgroupstates/list">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgroupstates/list.jspx"/>
-    </definition>
-<definition extends="default" name="treatmentgroupstates/show">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgroupstates/show.jspx"/>
-    </definition>
-<definition extends="default" name="treatmentgroupstates/create">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgroupstates/create.jspx"/>
-    </definition>
-<definition extends="default" name="treatmentgroupstates/update">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgroupstates/update.jspx"/>
-    </definition>
-<definition extends="default" name="treatmentgroupstates/findTreatmentGroupStatesByLsTransactionEquals">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgroupstates/findTreatmentGroupStatesByLsTransactionEquals.jspx"/>
-    </definition>
-<definition extends="default" name="treatmentgroupstates/findTreatmentGroupStatesByTreatmentGroup">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgroupstates/findTreatmentGroupStatesByTreatmentGroup.jspx"/>
-    </definition>
-<definition extends="default" name="treatmentgroupstates/findTreatmentGroupStatesByLsTypeAndKindEquals">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgroupstates/findTreatmentGroupStatesByLsTypeAndKindEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgroupvalues/create.jspx b/src/main/webapp/WEB-INF/views/treatmentgroupvalues/create.jspx
deleted file mode 100755
index 95bf1f8c0..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgroupvalues/create.jspx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_TreatmentGroupValue" modelAttribute="treatmentGroupValue" path="/treatmentgroupvalues" render="${empty dependencies}" z="prclSeRtyalRtgaXvrdgX4G8g/g=">
-        <field:textarea field="stringValue" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_stringValue" z="XgmNJ0np6Mwj/V+DbKuNgs1yTqs="/>
-        <field:textarea field="fileValue" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_fileValue" z="dSKqbMcZjM6FH4urrHWXrmxa4eM="/>
-        <field:textarea field="urlValue" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_urlValue" z="qN5m3iT3vpD4Nc7OfjzfSLskiYs="/>
-        <field:datetime dateTimePattern="${treatmentGroupValue_datevalue_date_format}" field="dateValue" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_dateValue" z="4dhiiRTBsJ6lvW67XPPb3DL2pC4="/>
-        <field:input field="clobValue" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_clobValue" z="/A2oUplk8Tw7kJl5H4zKr9Xw/2A="/>
-        <field:input field="blobValue" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_blobValue" z="VhlEXwxguNeewjB7xfBVi2fmXh0="/>
-        <field:input field="sigFigs" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_sigFigs" validationMessageCode="field_invalid_integer" z="tqxPU0d7m9/ZlYBympXY6Qaz6jM="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_comments" z="Nufz9P/ZJJlnDHy+o3+RtX3babo="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_ignored" z="4TwkE4oaIK0Dgy4Jm/05YgWvvbI="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_lsTransaction" validationMessageCode="field_invalid_integer" z="z/ATbtcSL8kpbXjb+MGS+Evok5c="/>
-        <field:datetime dateTimePattern="${treatmentGroupValue_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_recordedDate" required="true" z="sx3t+/IxicJoh4oAgYRZxGeONMo="/>
-        <field:datetime dateTimePattern="${treatmentGroupValue_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_modifiedDate" z="l6aJFsWu43z2fr54Xbgb/gJ76aw="/>
-        <field:checkbox field="publicData" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_publicData" z="q/GPl7ug9wNfbg/0XhAMdcDYkaI="/>
-        <field:textarea field="codeValue" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_codeValue" z="TxPcgp+j3Dqi2CENpCyw5pkxNKU="/>
-        <field:input field="numberOfReplicates" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_numberOfReplicates" validationMessageCode="field_invalid_integer" z="99fbYOnl9S/NihcRKI23cg3zjGg="/>
-        <field:textarea field="uncertaintyType" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_uncertaintyType" z="d5iuK3thNVbtqm3EDMIWJIEkx4M="/>
-        <field:select field="lsState" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_lsState" itemValue="id" items="${treatmentgroupstates}" path="/treatmentgroupstates" required="true" z="kjPh7tcMUl9MT9v8RCo8EoHYVyY="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_lsType" required="true" z="vIi2iMdEnPjJQA63y+NpGUqitOU="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_lsKind" required="true" z="Nlpegfwb7U4C6ISk8+o4cS4QF/o="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_lsTypeAndKind" z="sSgIYu7PcGP3xNDt3LiHPgotqYg="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_recordedBy" required="true" z="b8sNvvjA+fZaXdvJ2oyjqibTlgE="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_modifiedBy" z="FvYWm+Mo/Ki27ptGMNvOmG1oiws="/>
-        <field:input field="operatorType" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_operatorType" max="25" z="DqUvSy9Pw1tS0h/iVW1Rhio4cTs="/>
-        <field:input field="operatorKind" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_operatorKind" max="10" z="lAcJzVq3cqhBcj46DEFP1xNbjcs="/>
-        <field:textarea field="operatorTypeAndKind" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_operatorTypeAndKind" z="DE1nyLbVpFtiKQlwH0ztb5Gj7mg="/>
-        <field:input field="unitType" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_unitType" max="25" z="c9mGr8RHkGwm6Jn6z0BY5hDRm24="/>
-        <field:input field="unitKind" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_unitKind" max="25" z="i3+cOFmkoFzcNu/081XVbhK7z10="/>
-        <field:textarea field="unitTypeAndKind" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_unitTypeAndKind" z="x/g7mtVES8rqz4Yc5H1kEbdxKnM="/>
-        <field:input field="numericValue" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_numericValue" validationMessageCode="field_invalid_number" z="zedeCsymVzjzB4aNdeYgAE5owzE="/>
-        <field:textarea field="codeType" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_codeType" z="OtsD3NnPc71kikzADHNTHfC6om0="/>
-        <field:textarea field="codeKind" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_codeKind" z="HMTnhpGKMdhMbzggO2umBBABueQ="/>
-        <field:textarea field="codeTypeAndKind" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_codeTypeAndKind" z="WsyUIZFOYKfbfPp5M9X4IDm4EqU="/>
-        <field:input field="uncertainty" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_uncertainty" validationMessageCode="field_invalid_number" z="qUdHnRN7ZvHrWGNJhiAJtKeWvc4="/>
-        <field:textarea field="codeOrigin" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_codeOrigin" z="1B5R4a2U7gTmgDPLHY3eTtT8zhk="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_deleted" z="0DsWsQPbSUFufX4J2Kw0zO8kL38="/>
-        <field:input field="concentration" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_concentration" validationMessageCode="field_invalid_number" z="TZ5OPWl0/L/cEOWvqDdmzPwE+EE="/>
-        <field:input field="concUnit" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_concUnit" max="25" z="SU7Ve+k+22KYhDCK2E7ss7Ct4SI="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_TreatmentGroupValue" render="${not empty dependencies}" z="iZTWqiGKFrIHQESzDGG3HpIL9gg="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgroupvalues/findTreatmentGroupValuesByCodeValueEquals.jspx b/src/main/webapp/WEB-INF/views/treatmentgroupvalues/findTreatmentGroupValuesByCodeValueEquals.jspx
deleted file mode 100755
index a1ca7598f..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgroupvalues/findTreatmentGroupValuesByCodeValueEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeValueEquals" id="ff_com_labsynch_labseer_domain_TreatmentGroupValue" path="/treatmentgroupvalues" z="mMR2gupl+b3E9kh9YQ8cuurRAkY=">
-        <field:input disableFormBinding="true" field="codeValue" id="f_com_labsynch_labseer_domain_TreatmentGroupValue_codeValue" max="255" required="true" z="9s50WgeDDgQI/I+xpku7DsM3Wz0="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgroupvalues/findTreatmentGroupValuesByIgnoredNotAndCodeValueEquals.jspx b/src/main/webapp/WEB-INF/views/treatmentgroupvalues/findTreatmentGroupValuesByIgnoredNotAndCodeValueEquals.jspx
deleted file mode 100755
index f811812c5..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgroupvalues/findTreatmentGroupValuesByIgnoredNotAndCodeValueEquals.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByIgnoredNotAndCodeValueEquals" id="ff_com_labsynch_labseer_domain_TreatmentGroupValue" path="/treatmentgroupvalues" z="vT2fhFX25CDAo4GAKoUk8NeIg7g=">
-        <field:checkbox disableFormBinding="true" field="ignored" id="f_com_labsynch_labseer_domain_TreatmentGroupValue_ignored" z="I7K//PREptRCxF7DHZUOKEQ6+Yc="/>
-        <field:input disableFormBinding="true" field="codeValue" id="f_com_labsynch_labseer_domain_TreatmentGroupValue_codeValue" max="255" required="true" z="9s50WgeDDgQI/I+xpku7DsM3Wz0="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgroupvalues/findTreatmentGroupValuesByLsState.jspx b/src/main/webapp/WEB-INF/views/treatmentgroupvalues/findTreatmentGroupValuesByLsState.jspx
deleted file mode 100755
index 9f8872c0a..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgroupvalues/findTreatmentGroupValuesByLsState.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsState" id="ff_com_labsynch_labseer_domain_TreatmentGroupValue" path="/treatmentgroupvalues" z="YrD0dd/3KTdTaZSxIEkZRhKlFzQ=">
-        <field:select disableFormBinding="true" field="lsState" id="f_com_labsynch_labseer_domain_TreatmentGroupValue_lsState" itemValue="id" items="${treatmentgroupstates}" path="/treatmentgroupstates" required="true" z="O/qu4Vt7awG57jHsszpRzB4eotg="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgroupvalues/findTreatmentGroupValuesByLsTransactionEquals.jspx b/src/main/webapp/WEB-INF/views/treatmentgroupvalues/findTreatmentGroupValuesByLsTransactionEquals.jspx
deleted file mode 100755
index 9fab170da..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgroupvalues/findTreatmentGroupValuesByLsTransactionEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsTransactionEquals" id="ff_com_labsynch_labseer_domain_TreatmentGroupValue" path="/treatmentgroupvalues" z="47gwx7kTtZ4EogMHUPheGVBwHhQ=">
-        <field:input disableFormBinding="true" field="lsTransaction" id="f_com_labsynch_labseer_domain_TreatmentGroupValue_lsTransaction" required="true" validationMessageCode="field_invalid_integer" z="K6IsYILa66e1Xp9Yj5esLSbi3C0="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgroupvalues/list.jspx b/src/main/webapp/WEB-INF/views/treatmentgroupvalues/list.jspx
deleted file mode 100755
index 232e4f182..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgroupvalues/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_TreatmentGroupValue" items="${treatmentgroupvalues}" z="LJI7xIazu47asRO4oQmDVP9Dco8=">
-        <table:table data="${treatmentgroupvalues}" id="l_com_labsynch_labseer_domain_TreatmentGroupValue" path="/treatmentgroupvalues" z="9aCC/BuE6o9p92nvwI+EghXiH1I=">
-            <table:column id="c_com_labsynch_labseer_domain_TreatmentGroupValue_lsType" property="lsType" z="Sax94JwWPg97kPyEqoKpSe0PGHo="/>
-            <table:column id="c_com_labsynch_labseer_domain_TreatmentGroupValue_lsKind" property="lsKind" z="R2rbK8VA1AXl6n1Lu8Vlmv6kph0="/>
-            <table:column id="c_com_labsynch_labseer_domain_TreatmentGroupValue_lsTypeAndKind" property="lsTypeAndKind" z="e1P+ClUWjTQCCtUF1/FVfKXrwRU="/>
-            <table:column id="c_com_labsynch_labseer_domain_TreatmentGroupValue_ignored" property="ignored" z="QYCz2xLKeLWMt3GfOXIoY4dIZLo="/>
-            <table:column id="c_com_labsynch_labseer_domain_TreatmentGroupValue_publicData" property="publicData" z="IU66gcnM6FULDK8g3jBg4yeO4iU="/>
-            <table:column id="c_com_labsynch_labseer_domain_TreatmentGroupValue_deleted" property="deleted" z="pLJl9Hflu2Ea2ZOnASeMEcNMNkI="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgroupvalues/show.jspx b/src/main/webapp/WEB-INF/views/treatmentgroupvalues/show.jspx
deleted file mode 100755
index a491b6651..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgroupvalues/show.jspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_TreatmentGroupValue" object="${treatmentgroupvalue}" path="/treatmentgroupvalues" z="758bUKheN4gw28Z8v/VcOwRS0tY=">
-        <field:display field="stringValue" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_stringValue" object="${treatmentgroupvalue}" z="6fs8k+xwSamhwBBG3Vz6+ewhlHw="/>
-        <field:display field="fileValue" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_fileValue" object="${treatmentgroupvalue}" z="uBErQd1XCiEKLmnNhWov6Q/zBe0="/>
-        <field:display field="urlValue" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_urlValue" object="${treatmentgroupvalue}" z="zqOl2QxDKOtQWUfhbJ5Kz4tidV8="/>
-        <field:display date="true" dateTimePattern="${treatmentGroupValue_datevalue_date_format}" field="dateValue" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_dateValue" object="${treatmentgroupvalue}" z="HVCKhfRCST/PWTANLnqP7TSxE+8="/>
-        <field:display field="clobValue" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_clobValue" object="${treatmentgroupvalue}" z="RRDxtwO8pRkcmTD7418WT/61jIo="/>
-        <field:display field="blobValue" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_blobValue" object="${treatmentgroupvalue}" z="lq7wWk3EK7+mDNlqQI/Pkl1AYRA="/>
-        <field:display field="sigFigs" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_sigFigs" object="${treatmentgroupvalue}" z="jScnUfLDtGxCXQrnaP84t9OOgAk="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_comments" object="${treatmentgroupvalue}" z="0TMi4+JyFPLcYilNpaQ2w6iJ78c="/>
-        <field:display field="ignored" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_ignored" object="${treatmentgroupvalue}" z="JVP4FmgiHaRo6Z5sg2fg96+U78Y="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_lsTransaction" object="${treatmentgroupvalue}" z="p36Rf2UR/i9bz9UfCzbHpqOuKRE="/>
-        <field:display date="true" dateTimePattern="${treatmentGroupValue_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_recordedDate" object="${treatmentgroupvalue}" z="UY/BiW6uDOXHOneDgu23hHXtIAU="/>
-        <field:display date="true" dateTimePattern="${treatmentGroupValue_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_modifiedDate" object="${treatmentgroupvalue}" z="TGOIMsIP8EC9REDvIxeNzS5D8cU="/>
-        <field:display field="publicData" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_publicData" object="${treatmentgroupvalue}" z="DpjmyaaY6SsYAg823prXDUrsI7o="/>
-        <field:display field="codeValue" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_codeValue" object="${treatmentgroupvalue}" z="hD7Whr7neNtIzNDO94TMdGLu3gE="/>
-        <field:display field="numberOfReplicates" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_numberOfReplicates" object="${treatmentgroupvalue}" z="Yl55ZZRolbzEvjuykwG11dy1wfE="/>
-        <field:display field="uncertaintyType" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_uncertaintyType" object="${treatmentgroupvalue}" z="K75mCN/mqVQH9jvlrfatCKIeZE4="/>
-        <field:display field="lsState" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_lsState" object="${treatmentgroupvalue}" z="xfy/GQt4dnuuyEfpT7sKKdgXD2I="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_lsType" object="${treatmentgroupvalue}" z="4+i6bZgTQ5ZsXrD4fo3uqhYQH+A="/>
-        <field:display field="lsKind" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_lsKind" object="${treatmentgroupvalue}" z="i8bES+bfIdesflVcKbIxmafGVNc="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_lsTypeAndKind" object="${treatmentgroupvalue}" z="WnEEhTAbHqtbrNhq0EdOE7Dn+o8="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_recordedBy" object="${treatmentgroupvalue}" z="AT26AtXaoJmgIgKWdPJ615mnAiQ="/>
-        <field:display field="modifiedBy" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_modifiedBy" object="${treatmentgroupvalue}" z="e+MRaQSnLVUznc2pVY9g6GlBoak="/>
-        <field:display field="operatorType" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_operatorType" object="${treatmentgroupvalue}" z="GyPQC047jsyanKU98pRUn9yx+2o="/>
-        <field:display field="operatorKind" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_operatorKind" object="${treatmentgroupvalue}" z="mac59Evv0nGpjQXJIU+PjAfq2ks="/>
-        <field:display field="operatorTypeAndKind" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_operatorTypeAndKind" object="${treatmentgroupvalue}" z="u/bL8Bvj2/E4m8t+OA3ysWzNlE0="/>
-        <field:display field="unitType" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_unitType" object="${treatmentgroupvalue}" z="0Lh7Yr2oRWMY0L5lZhLsBdBs5cs="/>
-        <field:display field="unitKind" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_unitKind" object="${treatmentgroupvalue}" z="dh1bwbxjLqgKdoiCubIlAv3gubY="/>
-        <field:display field="unitTypeAndKind" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_unitTypeAndKind" object="${treatmentgroupvalue}" z="W1k1YJ+eW3lP2s/KY2S99kS1ji8="/>
-        <field:display field="numericValue" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_numericValue" object="${treatmentgroupvalue}" z="t+9ObW7E99HT3eVmPSrnA7cMR3c="/>
-        <field:display field="codeType" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_codeType" object="${treatmentgroupvalue}" z="jWZBursAqAwldv/jYGYHsCrQ6BE="/>
-        <field:display field="codeKind" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_codeKind" object="${treatmentgroupvalue}" z="XC6kKuS0NhO8l7P3sqo3MlZmTcE="/>
-        <field:display field="codeTypeAndKind" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_codeTypeAndKind" object="${treatmentgroupvalue}" z="AXhQI7KfsrPZMR9Skz3qkD0N0pw="/>
-        <field:display field="uncertainty" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_uncertainty" object="${treatmentgroupvalue}" z="Laov6m/Kig78TdQi2NIrQl6YKDk="/>
-        <field:display field="codeOrigin" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_codeOrigin" object="${treatmentgroupvalue}" z="gwuZkyNanw3S5PWI0HEHNMCrZME="/>
-        <field:display field="deleted" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_deleted" object="${treatmentgroupvalue}" z="9UHZ49lYMgVtEEuUwLOseHMDZPM="/>
-        <field:display field="concentration" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_concentration" object="${treatmentgroupvalue}" z="3z1V7Kj/VipCV6/lxeSREWLJA0s="/>
-        <field:display field="concUnit" id="s_com_labsynch_labseer_domain_TreatmentGroupValue_concUnit" object="${treatmentgroupvalue}" z="waphsxg2v3HgTQ7ABUHEETr7uTE="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgroupvalues/update.jspx b/src/main/webapp/WEB-INF/views/treatmentgroupvalues/update.jspx
deleted file mode 100755
index 8e1e3bc49..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgroupvalues/update.jspx
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_TreatmentGroupValue" modelAttribute="treatmentGroupValue" path="/treatmentgroupvalues" versionField="Version" z="E/o1KX5qlaFOi02UwyiXckg/a/k=">
-        <field:textarea field="stringValue" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_stringValue" z="XgmNJ0np6Mwj/V+DbKuNgs1yTqs="/>
-        <field:textarea field="fileValue" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_fileValue" z="dSKqbMcZjM6FH4urrHWXrmxa4eM="/>
-        <field:textarea field="urlValue" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_urlValue" z="qN5m3iT3vpD4Nc7OfjzfSLskiYs="/>
-        <field:datetime dateTimePattern="${treatmentGroupValue_datevalue_date_format}" field="dateValue" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_dateValue" z="4dhiiRTBsJ6lvW67XPPb3DL2pC4="/>
-        <field:input field="clobValue" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_clobValue" z="/A2oUplk8Tw7kJl5H4zKr9Xw/2A="/>
-        <field:input field="blobValue" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_blobValue" z="VhlEXwxguNeewjB7xfBVi2fmXh0="/>
-        <field:input field="sigFigs" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_sigFigs" validationMessageCode="field_invalid_integer" z="tqxPU0d7m9/ZlYBympXY6Qaz6jM="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_comments" z="Nufz9P/ZJJlnDHy+o3+RtX3babo="/>
-        <field:checkbox field="ignored" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_ignored" z="4TwkE4oaIK0Dgy4Jm/05YgWvvbI="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_lsTransaction" validationMessageCode="field_invalid_integer" z="z/ATbtcSL8kpbXjb+MGS+Evok5c="/>
-        <field:datetime dateTimePattern="${treatmentGroupValue_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_recordedDate" required="true" z="sx3t+/IxicJoh4oAgYRZxGeONMo="/>
-        <field:datetime dateTimePattern="${treatmentGroupValue_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_modifiedDate" z="l6aJFsWu43z2fr54Xbgb/gJ76aw="/>
-        <field:checkbox field="publicData" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_publicData" z="q/GPl7ug9wNfbg/0XhAMdcDYkaI="/>
-        <field:textarea field="codeValue" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_codeValue" z="TxPcgp+j3Dqi2CENpCyw5pkxNKU="/>
-        <field:input field="numberOfReplicates" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_numberOfReplicates" validationMessageCode="field_invalid_integer" z="99fbYOnl9S/NihcRKI23cg3zjGg="/>
-        <field:textarea field="uncertaintyType" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_uncertaintyType" z="d5iuK3thNVbtqm3EDMIWJIEkx4M="/>
-        <field:select field="lsState" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_lsState" itemValue="id" items="${treatmentgroupstates}" path="/treatmentgroupstates" required="true" z="kjPh7tcMUl9MT9v8RCo8EoHYVyY="/>
-        <field:textarea field="lsType" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_lsType" required="true" z="vIi2iMdEnPjJQA63y+NpGUqitOU="/>
-        <field:textarea field="lsKind" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_lsKind" required="true" z="Nlpegfwb7U4C6ISk8+o4cS4QF/o="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_lsTypeAndKind" z="sSgIYu7PcGP3xNDt3LiHPgotqYg="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_recordedBy" required="true" z="b8sNvvjA+fZaXdvJ2oyjqibTlgE="/>
-        <field:textarea field="modifiedBy" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_modifiedBy" z="FvYWm+Mo/Ki27ptGMNvOmG1oiws="/>
-        <field:input field="operatorType" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_operatorType" max="25" z="DqUvSy9Pw1tS0h/iVW1Rhio4cTs="/>
-        <field:input field="operatorKind" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_operatorKind" max="10" z="lAcJzVq3cqhBcj46DEFP1xNbjcs="/>
-        <field:textarea field="operatorTypeAndKind" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_operatorTypeAndKind" z="DE1nyLbVpFtiKQlwH0ztb5Gj7mg="/>
-        <field:input field="unitType" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_unitType" max="25" z="c9mGr8RHkGwm6Jn6z0BY5hDRm24="/>
-        <field:input field="unitKind" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_unitKind" max="25" z="i3+cOFmkoFzcNu/081XVbhK7z10="/>
-        <field:textarea field="unitTypeAndKind" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_unitTypeAndKind" z="x/g7mtVES8rqz4Yc5H1kEbdxKnM="/>
-        <field:input field="numericValue" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_numericValue" validationMessageCode="field_invalid_number" z="zedeCsymVzjzB4aNdeYgAE5owzE="/>
-        <field:textarea field="codeType" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_codeType" z="OtsD3NnPc71kikzADHNTHfC6om0="/>
-        <field:textarea field="codeKind" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_codeKind" z="HMTnhpGKMdhMbzggO2umBBABueQ="/>
-        <field:textarea field="codeTypeAndKind" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_codeTypeAndKind" z="WsyUIZFOYKfbfPp5M9X4IDm4EqU="/>
-        <field:input field="uncertainty" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_uncertainty" validationMessageCode="field_invalid_number" z="qUdHnRN7ZvHrWGNJhiAJtKeWvc4="/>
-        <field:textarea field="codeOrigin" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_codeOrigin" z="1B5R4a2U7gTmgDPLHY3eTtT8zhk="/>
-        <field:checkbox field="deleted" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_deleted" z="0DsWsQPbSUFufX4J2Kw0zO8kL38="/>
-        <field:input field="concentration" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_concentration" validationMessageCode="field_invalid_number" z="TZ5OPWl0/L/cEOWvqDdmzPwE+EE="/>
-        <field:input field="concUnit" id="c_com_labsynch_labseer_domain_TreatmentGroupValue_concUnit" max="25" z="SU7Ve+k+22KYhDCK2E7ss7Ct4SI="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/treatmentgroupvalues/views.xml b/src/main/webapp/WEB-INF/views/treatmentgroupvalues/views.xml
deleted file mode 100755
index aa79d76d0..000000000
--- a/src/main/webapp/WEB-INF/views/treatmentgroupvalues/views.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="treatmentgroupvalues/list">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgroupvalues/list.jspx"/>
-    </definition>
-<definition extends="default" name="treatmentgroupvalues/show">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgroupvalues/show.jspx"/>
-    </definition>
-<definition extends="default" name="treatmentgroupvalues/create">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgroupvalues/create.jspx"/>
-    </definition>
-<definition extends="default" name="treatmentgroupvalues/update">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgroupvalues/update.jspx"/>
-    </definition>
-<definition extends="default" name="treatmentgroupvalues/findTreatmentGroupValuesByLsState">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgroupvalues/findTreatmentGroupValuesByLsState.jspx"/>
-    </definition>
-<definition extends="default" name="treatmentgroupvalues/findTreatmentGroupValuesByLsTransactionEquals">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgroupvalues/findTreatmentGroupValuesByLsTransactionEquals.jspx"/>
-    </definition>
-<definition extends="default" name="treatmentgroupvalues/findTreatmentGroupValuesByCodeValueEquals">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgroupvalues/findTreatmentGroupValuesByCodeValueEquals.jspx"/>
-    </definition>
-<definition extends="default" name="treatmentgroupvalues/findTreatmentGroupValuesByIgnoredNotAndCodeValueEquals">
-        <put-attribute name="body" value="/WEB-INF/views/treatmentgroupvalues/findTreatmentGroupValuesByIgnoredNotAndCodeValueEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/uncaughtException.jspx b/src/main/webapp/WEB-INF/views/uncaughtException.jspx
deleted file mode 100755
index 9180b0dac..000000000
--- a/src/main/webapp/WEB-INF/views/uncaughtException.jspx
+++ /dev/null
@@ -1,29 +0,0 @@
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:util="urn:jsptagdir:/WEB-INF/tags/util" xmlns:spring="http://www.springframework.org/tags" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-  <jsp:directive.page contentType="text/html;charset=UTF-8" />
-  <jsp:output omit-xml-declaration="yes" />
-  <spring:message var="title" code="error_uncaughtexception_title" htmlEscape="false" />
-  <util:panel id="title" title="${title}">
-    <h2>${fn:escapeXml(title)}</h2>
-    <p>
-      <spring:message code="error_uncaughtexception_problemdescription" />
-    </p>
-    <c:if test="${not empty exception}">
-      <p>
-        <h4>
-          <spring:message code="exception_details" />
-        </h4>
-        <spring:message var="message" code="exception_message" htmlEscape="false" />
-        <util:panel id="_message" title="${message}" openPane="false">
-          <c:out value="${exception.localizedMessage}" />
-        </util:panel>
-        <spring:message var="stacktrace" code="exception_stacktrace" htmlEscape="false" />
-        <util:panel id="_exception" title="${stacktrace}" openPane="false">
-          <c:forEach items="${exception.stackTrace}" var="trace">
-            <c:out value="${trace}" />
-            <br />
-          </c:forEach>
-        </util:panel>
-      </p>
-    </c:if>
-  </util:panel>
-</div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/uncertaintykinds/create.jspx b/src/main/webapp/WEB-INF/views/uncertaintykinds/create.jspx
deleted file mode 100755
index 71a5ef2e3..000000000
--- a/src/main/webapp/WEB-INF/views/uncertaintykinds/create.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_UncertaintyKind" modelAttribute="uncertaintyKind" path="/uncertaintykinds" render="${empty dependencies}" z="JATDvX7M3G80ERvjRgOgxHRXOqU=">
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_UncertaintyKind_kindName" required="true" z="q08uy2HQLc29uhZD/M5aeRL2NQQ="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_UncertaintyKind" render="${not empty dependencies}" z="aJiShgMLZTPu0HPiR2YytEwGSYQ="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/uncertaintykinds/list.jspx b/src/main/webapp/WEB-INF/views/uncertaintykinds/list.jspx
deleted file mode 100755
index 4a0303de7..000000000
--- a/src/main/webapp/WEB-INF/views/uncertaintykinds/list.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_UncertaintyKind" items="${uncertaintykinds}" z="QakgPBOu53VXd8brC99Os8etZbE=">
-        <table:table data="${uncertaintykinds}" id="l_com_labsynch_labseer_domain_UncertaintyKind" path="/uncertaintykinds" z="6qEHiocG3Z04SmgrvsC63wJm8A0=">
-            <table:column id="c_com_labsynch_labseer_domain_UncertaintyKind_kindName" property="kindName" z="tYMlWobgAPRE4WiSrLAlLa7uNdY="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/uncertaintykinds/show.jspx b/src/main/webapp/WEB-INF/views/uncertaintykinds/show.jspx
deleted file mode 100755
index 7317af1e1..000000000
--- a/src/main/webapp/WEB-INF/views/uncertaintykinds/show.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_UncertaintyKind" object="${uncertaintykind}" path="/uncertaintykinds" z="775dDMSxkNDkHkY7CQSolXjKavE=">
-        <field:display field="kindName" id="s_com_labsynch_labseer_domain_UncertaintyKind_kindName" object="${uncertaintykind}" z="gh9kkpI8/9kn6OcuJBIujYV3MAM="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/uncertaintykinds/update.jspx b/src/main/webapp/WEB-INF/views/uncertaintykinds/update.jspx
deleted file mode 100755
index 0cd16d817..000000000
--- a/src/main/webapp/WEB-INF/views/uncertaintykinds/update.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_UncertaintyKind" modelAttribute="uncertaintyKind" path="/uncertaintykinds" versionField="Version" z="/QrKMSuYikVscfCr6BVt75vz9R4=">
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_UncertaintyKind_kindName" required="true" z="q08uy2HQLc29uhZD/M5aeRL2NQQ="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/uncertaintykinds/views.xml b/src/main/webapp/WEB-INF/views/uncertaintykinds/views.xml
deleted file mode 100755
index 4546581a2..000000000
--- a/src/main/webapp/WEB-INF/views/uncertaintykinds/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="uncertaintykinds/list">
-        <put-attribute name="body" value="/WEB-INF/views/uncertaintykinds/list.jspx"/>
-    </definition>
-<definition extends="default" name="uncertaintykinds/show">
-        <put-attribute name="body" value="/WEB-INF/views/uncertaintykinds/show.jspx"/>
-    </definition>
-<definition extends="default" name="uncertaintykinds/create">
-        <put-attribute name="body" value="/WEB-INF/views/uncertaintykinds/create.jspx"/>
-    </definition>
-<definition extends="default" name="uncertaintykinds/update">
-        <put-attribute name="body" value="/WEB-INF/views/uncertaintykinds/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/unitkinds/create.jspx b/src/main/webapp/WEB-INF/views/unitkinds/create.jspx
deleted file mode 100755
index 05e981244..000000000
--- a/src/main/webapp/WEB-INF/views/unitkinds/create.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_UnitKind" modelAttribute="unitKind" path="/unitkinds" render="${empty dependencies}" z="f2hrWCcYrUjg3rVauDPq6ilhlZE=">
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_UnitKind_kindName" required="true" z="CGe8XjGL8wW4TdcEEXhQvtSmffw="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_UnitKind_lsTypeAndKind" z="WSbtpGFNShMVfr36FlJ7FEMzWLk="/>
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_UnitKind_lsType" itemValue="id" items="${unittypes}" path="/unittypes" required="true" z="xY5L7YXtBX9KMIHOeFJTm5IkRyw="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_UnitKind" render="${not empty dependencies}" z="qqQE73zig149onslFiJc3/jFxco="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/unitkinds/list.jspx b/src/main/webapp/WEB-INF/views/unitkinds/list.jspx
deleted file mode 100755
index 846ce1ae3..000000000
--- a/src/main/webapp/WEB-INF/views/unitkinds/list.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_UnitKind" items="${unitkinds}" z="0TwiJ6hI6Tbs/Tcx40nOdigoNOY=">
-        <table:table data="${unitkinds}" id="l_com_labsynch_labseer_domain_UnitKind" path="/unitkinds" z="CdgPBoEatiGFgaZjMb8RoXFi3+Y=">
-            <table:column id="c_com_labsynch_labseer_domain_UnitKind_kindName" property="kindName" z="7JUyQDvBOysT1ZLB0MUOPEvVt7g="/>
-            <table:column id="c_com_labsynch_labseer_domain_UnitKind_lsTypeAndKind" property="lsTypeAndKind" z="dvEeL6psJWQfW/EIdg58bRenOyY="/>
-            <table:column id="c_com_labsynch_labseer_domain_UnitKind_lsType" property="lsType" z="hXaILRnhfRKp598YL/q25hsoDAA="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/unitkinds/show.jspx b/src/main/webapp/WEB-INF/views/unitkinds/show.jspx
deleted file mode 100755
index 9628deb3c..000000000
--- a/src/main/webapp/WEB-INF/views/unitkinds/show.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_UnitKind" object="${unitkind}" path="/unitkinds" z="GPB2xmd/qGEeOSmQZeOBck4M3DE=">
-        <field:display field="kindName" id="s_com_labsynch_labseer_domain_UnitKind_kindName" object="${unitkind}" z="SMYWhzEE06wkpCFEW1X10aTgct4="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_UnitKind_lsTypeAndKind" object="${unitkind}" z="h35ZZ5HwGxTrhZDMchHOd2ExM+U="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_UnitKind_lsType" object="${unitkind}" z="k68zSC2gsYesPuxUPGCgtjDBogM="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/unitkinds/update.jspx b/src/main/webapp/WEB-INF/views/unitkinds/update.jspx
deleted file mode 100755
index 537d14969..000000000
--- a/src/main/webapp/WEB-INF/views/unitkinds/update.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_UnitKind" modelAttribute="unitKind" path="/unitkinds" versionField="Version" z="SzwB1W7nBVjA2qFHDEr5PdjuRcw=">
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_UnitKind_kindName" required="true" z="CGe8XjGL8wW4TdcEEXhQvtSmffw="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_UnitKind_lsTypeAndKind" z="WSbtpGFNShMVfr36FlJ7FEMzWLk="/>
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_UnitKind_lsType" itemValue="id" items="${unittypes}" path="/unittypes" required="true" z="xY5L7YXtBX9KMIHOeFJTm5IkRyw="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/unitkinds/views.xml b/src/main/webapp/WEB-INF/views/unitkinds/views.xml
deleted file mode 100755
index 438925a0e..000000000
--- a/src/main/webapp/WEB-INF/views/unitkinds/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="unitkinds/list">
-        <put-attribute name="body" value="/WEB-INF/views/unitkinds/list.jspx"/>
-    </definition>
-<definition extends="default" name="unitkinds/show">
-        <put-attribute name="body" value="/WEB-INF/views/unitkinds/show.jspx"/>
-    </definition>
-<definition extends="default" name="unitkinds/create">
-        <put-attribute name="body" value="/WEB-INF/views/unitkinds/create.jspx"/>
-    </definition>
-<definition extends="default" name="unitkinds/update">
-        <put-attribute name="body" value="/WEB-INF/views/unitkinds/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/units/create.jspx b/src/main/webapp/WEB-INF/views/units/create.jspx
deleted file mode 100644
index 6a876891e..000000000
--- a/src/main/webapp/WEB-INF/views/units/create.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_Unit" modelAttribute="unit" path="/units" render="${empty dependencies}" z="ACJ9nuOUdLjvp3AtPdcm6Scuzpg=">
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_Unit_name" z="PV65cYUZHLCvYnIbVqT/GiY6RSA="/>
-        <field:textarea field="code" id="c_com_labsynch_labseer_domain_Unit_code" z="Bf0QeHL/RQaepNnPfzH5sQdNeFc="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_Unit" render="${not empty dependencies}" z="WVaDclc1/eKP6CMqLXiCwJX4I8w="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/units/findUnitsByCodeEquals.jspx b/src/main/webapp/WEB-INF/views/units/findUnitsByCodeEquals.jspx
deleted file mode 100644
index b23678201..000000000
--- a/src/main/webapp/WEB-INF/views/units/findUnitsByCodeEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeEquals" id="ff_com_labsynch_labseer_domain_Unit" path="/units" z="5s/gWomY7ZCKX/RpZNvijlXs0Is=">
-        <field:input disableFormBinding="true" field="code" id="f_com_labsynch_labseer_domain_Unit_code" max="255" required="true" z="8MakccrybNwmwR+0GvFjK24iXnE="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/units/findUnitsByCodeLike.jspx b/src/main/webapp/WEB-INF/views/units/findUnitsByCodeLike.jspx
deleted file mode 100644
index b283c0d51..000000000
--- a/src/main/webapp/WEB-INF/views/units/findUnitsByCodeLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeLike" id="ff_com_labsynch_labseer_domain_Unit" path="/units" z="+0UQpqr02s5rgjIpciwK03sv1Ks=">
-        <field:input disableFormBinding="true" field="code" id="f_com_labsynch_labseer_domain_Unit_code" max="255" required="true" z="8MakccrybNwmwR+0GvFjK24iXnE="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/units/findUnitsByNameEquals.jspx b/src/main/webapp/WEB-INF/views/units/findUnitsByNameEquals.jspx
deleted file mode 100644
index 164c32987..000000000
--- a/src/main/webapp/WEB-INF/views/units/findUnitsByNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByNameEquals" id="ff_com_labsynch_labseer_domain_Unit" path="/units" z="C1e3aNWP4JTB/hpCHzBxEzchC8E=">
-        <field:input disableFormBinding="true" field="name" id="f_com_labsynch_labseer_domain_Unit_name" max="255" required="true" z="FE02Kv4vraBcAb9gPAo4Lyz94kg="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/units/list.jspx b/src/main/webapp/WEB-INF/views/units/list.jspx
deleted file mode 100644
index a008cf782..000000000
--- a/src/main/webapp/WEB-INF/views/units/list.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_Unit" items="${units}" z="WYYQsworWVy9Y2gVUsNR3eQJ+88=">
-        <table:table data="${units}" id="l_com_labsynch_labseer_domain_Unit" path="/units" z="GtvHV/s5m200iv3fcig7xSSgumo=">
-            <table:column id="c_com_labsynch_labseer_domain_Unit_name" property="name" z="zddx2q9MMRQG3gFs6VtJsmIjAeg="/>
-            <table:column id="c_com_labsynch_labseer_domain_Unit_code" property="code" z="zWbVsfEvg5y0doSJrIVK8+3JlA8="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/units/show.jspx b/src/main/webapp/WEB-INF/views/units/show.jspx
deleted file mode 100644
index 4d921895c..000000000
--- a/src/main/webapp/WEB-INF/views/units/show.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_Unit" object="${unit}" path="/units" z="Mydk/jn8+36cUFzOvHEbiG7vYuM=">
-        <field:display field="name" id="s_com_labsynch_labseer_domain_Unit_name" object="${unit}" z="jYCzcHVZijEq8kmawxujT02vcuQ="/>
-        <field:display field="code" id="s_com_labsynch_labseer_domain_Unit_code" object="${unit}" z="B/xmZp2EJ2czAo3kX+9/TxEJjiQ="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/units/update.jspx b/src/main/webapp/WEB-INF/views/units/update.jspx
deleted file mode 100644
index 04ad08e50..000000000
--- a/src/main/webapp/WEB-INF/views/units/update.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_Unit" modelAttribute="unit" path="/units" versionField="Version" z="rCBmMYPquWwQoab2QLZd86bHVZU=">
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_Unit_name" z="PV65cYUZHLCvYnIbVqT/GiY6RSA="/>
-        <field:textarea field="code" id="c_com_labsynch_labseer_domain_Unit_code" z="Bf0QeHL/RQaepNnPfzH5sQdNeFc="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/units/views.xml b/src/main/webapp/WEB-INF/views/units/views.xml
deleted file mode 100644
index cd66c7ac7..000000000
--- a/src/main/webapp/WEB-INF/views/units/views.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="units/list">
-        <put-attribute name="body" value="/WEB-INF/views/units/list.jspx"/>
-    </definition>
-<definition extends="default" name="units/show">
-        <put-attribute name="body" value="/WEB-INF/views/units/show.jspx"/>
-    </definition>
-<definition extends="default" name="units/create">
-        <put-attribute name="body" value="/WEB-INF/views/units/create.jspx"/>
-    </definition>
-<definition extends="default" name="units/update">
-        <put-attribute name="body" value="/WEB-INF/views/units/update.jspx"/>
-    </definition>
-<definition extends="default" name="units/findUnitsByCodeEquals">
-        <put-attribute name="body" value="/WEB-INF/views/units/findUnitsByCodeEquals.jspx"/>
-    </definition>
-<definition extends="default" name="units/findUnitsByCodeLike">
-        <put-attribute name="body" value="/WEB-INF/views/units/findUnitsByCodeLike.jspx"/>
-    </definition>
-<definition extends="default" name="units/findUnitsByNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/units/findUnitsByNameEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/unittypes/create.jspx b/src/main/webapp/WEB-INF/views/unittypes/create.jspx
deleted file mode 100755
index 039a9dfe3..000000000
--- a/src/main/webapp/WEB-INF/views/unittypes/create.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_UnitType" modelAttribute="unitType" path="/unittypes" render="${empty dependencies}" z="icJXttfaFO+KqePcp/UBZ0LqP4Y=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_UnitType_typeName" required="true" z="9GdHAeJBYZYf+yqIDclxrYTLPIw="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_UnitType" render="${not empty dependencies}" z="q9BhsHouwAEgZ+Km482iHSNMAAI="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/unittypes/findUnitTypesByTypeNameEquals.jspx b/src/main/webapp/WEB-INF/views/unittypes/findUnitTypesByTypeNameEquals.jspx
deleted file mode 100755
index 0261512e9..000000000
--- a/src/main/webapp/WEB-INF/views/unittypes/findUnitTypesByTypeNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByTypeNameEquals" id="ff_com_labsynch_labseer_domain_UnitType" path="/unittypes" z="0peknXEuCMz1DQ6KYVdgY7dQ0JA=">
-        <field:input disableFormBinding="true" field="typeName" id="f_com_labsynch_labseer_domain_UnitType_typeName" max="64" required="true" z="/O7qhsN8bxJww6nqyTWCBxh5pmo="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/unittypes/list.jspx b/src/main/webapp/WEB-INF/views/unittypes/list.jspx
deleted file mode 100755
index 2a811e0d2..000000000
--- a/src/main/webapp/WEB-INF/views/unittypes/list.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_UnitType" items="${unittypes}" z="ZuyvhInFL3dDHyJvif3rHNoyBnY=">
-        <table:table data="${unittypes}" id="l_com_labsynch_labseer_domain_UnitType" path="/unittypes" z="So2zeCHlylvGS2gY5Hx52BbUxik=">
-            <table:column id="c_com_labsynch_labseer_domain_UnitType_typeName" property="typeName" z="rJf+ocFt+1Md0B5ZWQ4PqXkeNWM="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/unittypes/show.jspx b/src/main/webapp/WEB-INF/views/unittypes/show.jspx
deleted file mode 100755
index 1611c6ef1..000000000
--- a/src/main/webapp/WEB-INF/views/unittypes/show.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_UnitType" object="${unittype}" path="/unittypes" z="bMFhSwRBCT2ilEfRsnGkUgICvDM=">
-        <field:display field="typeName" id="s_com_labsynch_labseer_domain_UnitType_typeName" object="${unittype}" z="gIvfL09bHIszqfX3v8v+eWSpfJE="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/unittypes/update.jspx b/src/main/webapp/WEB-INF/views/unittypes/update.jspx
deleted file mode 100755
index 9bd6862df..000000000
--- a/src/main/webapp/WEB-INF/views/unittypes/update.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_UnitType" modelAttribute="unitType" path="/unittypes" versionField="Version" z="xmZ4bl92qqH/iyduSOMimiK0sPA=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_UnitType_typeName" required="true" z="9GdHAeJBYZYf+yqIDclxrYTLPIw="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/unittypes/views.xml b/src/main/webapp/WEB-INF/views/unittypes/views.xml
deleted file mode 100755
index ac8105bfe..000000000
--- a/src/main/webapp/WEB-INF/views/unittypes/views.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="unittypes/list">
-        <put-attribute name="body" value="/WEB-INF/views/unittypes/list.jspx"/>
-    </definition>
-<definition extends="default" name="unittypes/show">
-        <put-attribute name="body" value="/WEB-INF/views/unittypes/show.jspx"/>
-    </definition>
-<definition extends="default" name="unittypes/create">
-        <put-attribute name="body" value="/WEB-INF/views/unittypes/create.jspx"/>
-    </definition>
-<definition extends="default" name="unittypes/update">
-        <put-attribute name="body" value="/WEB-INF/views/unittypes/update.jspx"/>
-    </definition>
-<definition extends="default" name="unittypes/findUnitTypesByTypeNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/unittypes/findUnitTypesByTypeNameEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/updatelogs/create.jspx b/src/main/webapp/WEB-INF/views/updatelogs/create.jspx
deleted file mode 100755
index cedbed6d0..000000000
--- a/src/main/webapp/WEB-INF/views/updatelogs/create.jspx
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_UpdateLog" modelAttribute="updateLog" path="/updatelogs" render="${empty dependencies}" z="ElXh7Z3AF6mI+a1zGaYTwUbZB9k=">
-        <field:input field="thing" id="c_com_labsynch_labseer_domain_UpdateLog_thing" validationMessageCode="field_invalid_integer" z="5vArs30dvdu6A+rpx8nrT7XzRk0="/>
-        <field:textarea field="updateAction" id="c_com_labsynch_labseer_domain_UpdateLog_updateAction" z="JlKcRFDyRz24T/BdTUyNBKuzK2s="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_UpdateLog_comments" z="yohrxSDwYPCtKbyRNP/WGBu9Z+E="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_UpdateLog_lsTransaction" validationMessageCode="field_invalid_integer" z="fUjrTuymkboxDWkVHVe4LrNr8SI="/>
-        <field:datetime dateTimePattern="${updateLog_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_UpdateLog_recordedDate" required="true" z="NqcbHK9+ukQ0JPt8UFLORg1i9pI="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_UpdateLog_recordedBy" z="8mV1xpT4kBTpXcse7KxDTW40yAc="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_UpdateLog" render="${not empty dependencies}" z="rdtCR2v3KE/zqJ/SXFhpFCDbhBY="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/updatelogs/list.jspx b/src/main/webapp/WEB-INF/views/updatelogs/list.jspx
deleted file mode 100755
index 6fa09f9ab..000000000
--- a/src/main/webapp/WEB-INF/views/updatelogs/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_UpdateLog" items="${updatelogs}" z="P80HidHawGHcjfQBUEHyU6PLc2A=">
-        <table:table data="${updatelogs}" id="l_com_labsynch_labseer_domain_UpdateLog" path="/updatelogs" z="6oyxAIjzZsNY7N+c0PyZZT7nIpg=">
-            <table:column id="c_com_labsynch_labseer_domain_UpdateLog_thing" property="thing" z="xOVMKib7PHmNqvgKV1GUfzGt/c4="/>
-            <table:column id="c_com_labsynch_labseer_domain_UpdateLog_updateAction" property="updateAction" z="+eDKQQemDfgNJV/KcmJEvBpfgSQ="/>
-            <table:column id="c_com_labsynch_labseer_domain_UpdateLog_comments" property="comments" z="UQTH/MgU0jW2Xk0csoy3SMt8kJg="/>
-            <table:column id="c_com_labsynch_labseer_domain_UpdateLog_lsTransaction" property="lsTransaction" z="c3w5rQ883c9vDKxDIC66qoonLLE="/>
-            <table:column date="true" dateTimePattern="${updateLog_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_UpdateLog_recordedDate" property="recordedDate" z="3Z6Hit6YM2/8DxGAYPCCcLy6xwY="/>
-            <table:column id="c_com_labsynch_labseer_domain_UpdateLog_recordedBy" property="recordedBy" z="TbIUGnzngHd7RVqKV7hOKzOAKd8="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/updatelogs/show.jspx b/src/main/webapp/WEB-INF/views/updatelogs/show.jspx
deleted file mode 100755
index 22408e8d6..000000000
--- a/src/main/webapp/WEB-INF/views/updatelogs/show.jspx
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_UpdateLog" object="${updatelog}" path="/updatelogs" z="mwDvXjJM6IBXtpXCmQPn5Rzo2HI=">
-        <field:display field="thing" id="s_com_labsynch_labseer_domain_UpdateLog_thing" object="${updatelog}" z="GXUAtgxOX/pyrMrX3KJssmotXE0="/>
-        <field:display field="updateAction" id="s_com_labsynch_labseer_domain_UpdateLog_updateAction" object="${updatelog}" z="+RyepvxEBwbz8cTaNRNbUUcZxxk="/>
-        <field:display field="comments" id="s_com_labsynch_labseer_domain_UpdateLog_comments" object="${updatelog}" z="TKwxK/S+6BcMimfpowk3fkcIe1c="/>
-        <field:display field="lsTransaction" id="s_com_labsynch_labseer_domain_UpdateLog_lsTransaction" object="${updatelog}" z="rwSFXTiGCre9WLi1IqVSNgeqofg="/>
-        <field:display date="true" dateTimePattern="${updateLog_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_UpdateLog_recordedDate" object="${updatelog}" z="JnqScxUIDFUi1SwNjK4C285zDQ4="/>
-        <field:display field="recordedBy" id="s_com_labsynch_labseer_domain_UpdateLog_recordedBy" object="${updatelog}" z="7rKjVqFN3MLJvc1xBbQCCdMTiPI="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/updatelogs/update.jspx b/src/main/webapp/WEB-INF/views/updatelogs/update.jspx
deleted file mode 100755
index c18376d52..000000000
--- a/src/main/webapp/WEB-INF/views/updatelogs/update.jspx
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_UpdateLog" modelAttribute="updateLog" path="/updatelogs" versionField="Version" z="i5YRnGq5nC11L96Xj8vvyejsuFI=">
-        <field:input field="thing" id="c_com_labsynch_labseer_domain_UpdateLog_thing" validationMessageCode="field_invalid_integer" z="5vArs30dvdu6A+rpx8nrT7XzRk0="/>
-        <field:textarea field="updateAction" id="c_com_labsynch_labseer_domain_UpdateLog_updateAction" z="JlKcRFDyRz24T/BdTUyNBKuzK2s="/>
-        <field:textarea field="comments" id="c_com_labsynch_labseer_domain_UpdateLog_comments" z="yohrxSDwYPCtKbyRNP/WGBu9Z+E="/>
-        <field:input field="lsTransaction" id="c_com_labsynch_labseer_domain_UpdateLog_lsTransaction" validationMessageCode="field_invalid_integer" z="fUjrTuymkboxDWkVHVe4LrNr8SI="/>
-        <field:datetime dateTimePattern="${updateLog_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_UpdateLog_recordedDate" required="true" z="NqcbHK9+ukQ0JPt8UFLORg1i9pI="/>
-        <field:textarea field="recordedBy" id="c_com_labsynch_labseer_domain_UpdateLog_recordedBy" z="8mV1xpT4kBTpXcse7KxDTW40yAc="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/updatelogs/views.xml b/src/main/webapp/WEB-INF/views/updatelogs/views.xml
deleted file mode 100755
index 73aab2b4d..000000000
--- a/src/main/webapp/WEB-INF/views/updatelogs/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="updatelogs/list">
-        <put-attribute name="body" value="/WEB-INF/views/updatelogs/list.jspx"/>
-    </definition>
-<definition extends="default" name="updatelogs/show">
-        <put-attribute name="body" value="/WEB-INF/views/updatelogs/show.jspx"/>
-    </definition>
-<definition extends="default" name="updatelogs/create">
-        <put-attribute name="body" value="/WEB-INF/views/updatelogs/create.jspx"/>
-    </definition>
-<definition extends="default" name="updatelogs/update">
-        <put-attribute name="body" value="/WEB-INF/views/updatelogs/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/userroles/create.jspx b/src/main/webapp/WEB-INF/views/userroles/create.jspx
deleted file mode 100755
index f0bac564b..000000000
--- a/src/main/webapp/WEB-INF/views/userroles/create.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_AuthorRole" modelAttribute="authorRole" path="/userroles" render="${empty dependencies}" z="Y02Daljqk5l++BOb0ARZ9pXJAEc=">
-        <field:select field="userEntry" id="c_com_labsynch_labseer_domain_AuthorRole_userEntry" itemValue="id" items="${authors}" path="/authors" required="true" z="3E6WWfXLD6xF+pf2cSh6rBje/Z0="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_AuthorRole" render="${not empty dependencies}" z="rTGhOufJFt9L4fqCpmWSpwLfXVY="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/userroles/findAuthorRolesByUserEntry.jspx b/src/main/webapp/WEB-INF/views/userroles/findAuthorRolesByUserEntry.jspx
deleted file mode 100755
index 80d7eb711..000000000
--- a/src/main/webapp/WEB-INF/views/userroles/findAuthorRolesByUserEntry.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByUserEntry" id="ff_com_labsynch_labseer_domain_AuthorRole" path="/userroles" z="FjJEohqM3cQROXYle/VtovBP1E0=">
-        <field:select disableFormBinding="true" field="userEntry" id="f_com_labsynch_labseer_domain_AuthorRole_userEntry" itemValue="id" items="${authors}" path="/authors" required="true" z="KhMPlRBE6JD3bMaxJadGwpTABbs="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/userroles/list.jspx b/src/main/webapp/WEB-INF/views/userroles/list.jspx
deleted file mode 100755
index 50f2de628..000000000
--- a/src/main/webapp/WEB-INF/views/userroles/list.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_AuthorRole" items="${authorroles}" z="fCVQ63fzju16Q+Mb7fMn+qVawU0=">
-        <table:table data="${authorroles}" id="l_com_labsynch_labseer_domain_AuthorRole" path="/userroles" z="woka1kd/c4rr0iLNiuUWRBJBlx8=">
-            <table:column id="c_com_labsynch_labseer_domain_AuthorRole_userEntry" property="userEntry" z="M7ra2LYyt6dJ3v9by40+ofmB/nw="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/userroles/show.jspx b/src/main/webapp/WEB-INF/views/userroles/show.jspx
deleted file mode 100755
index 12ad56469..000000000
--- a/src/main/webapp/WEB-INF/views/userroles/show.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_AuthorRole" object="${authorrole}" path="/userroles" z="5AsTBpbu1OPLd7MXIIOZ2kjVKQ8=">
-        <field:display field="userEntry" id="s_com_labsynch_labseer_domain_AuthorRole_userEntry" object="${authorrole}" z="dzfFNUlgTYHgXza2Azqw/+2Tqao="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/userroles/update.jspx b/src/main/webapp/WEB-INF/views/userroles/update.jspx
deleted file mode 100755
index 06b48482a..000000000
--- a/src/main/webapp/WEB-INF/views/userroles/update.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_AuthorRole" modelAttribute="authorRole" path="/userroles" versionField="Version" z="wZIA5YmC3VTv/oPVha5vYB13cEc=">
-        <field:select field="userEntry" id="c_com_labsynch_labseer_domain_AuthorRole_userEntry" itemValue="id" items="${authors}" path="/authors" required="true" z="3E6WWfXLD6xF+pf2cSh6rBje/Z0="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/userroles/views.xml b/src/main/webapp/WEB-INF/views/userroles/views.xml
deleted file mode 100755
index ebc2f0197..000000000
--- a/src/main/webapp/WEB-INF/views/userroles/views.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="userroles/list">
-        <put-attribute name="body" value="/WEB-INF/views/userroles/list.jspx"/>
-    </definition>
-<definition extends="default" name="userroles/show">
-        <put-attribute name="body" value="/WEB-INF/views/userroles/show.jspx"/>
-    </definition>
-<definition extends="default" name="userroles/create">
-        <put-attribute name="body" value="/WEB-INF/views/userroles/create.jspx"/>
-    </definition>
-<definition extends="default" name="userroles/update">
-        <put-attribute name="body" value="/WEB-INF/views/userroles/update.jspx"/>
-    </definition>
-<definition extends="default" name="userroles/findAuthorRolesByUserEntry">
-        <put-attribute name="body" value="/WEB-INF/views/userroles/findAuthorRolesByUserEntry.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/users/create.jspx b/src/main/webapp/WEB-INF/views/users/create.jspx
deleted file mode 100755
index 91d10ecab..000000000
--- a/src/main/webapp/WEB-INF/views/users/create.jspx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_User" modelAttribute="user" path="/users" render="${empty dependencies}" z="EIbh3JAkhJcc/OF4JIyFQyAfyw4=">
-        <field:textarea field="firstName" id="c_com_labsynch_labseer_domain_User_firstName" required="true" z="oqelF66z5UriSpH/LeB202uEFKU="/>
-        <field:textarea field="lastName" id="c_com_labsynch_labseer_domain_User_lastName" required="true" z="YFaVQquwO5LeBR6xpCkc+5G5xxU="/>
-        <field:input field="emailAddress" id="c_com_labsynch_labseer_domain_User_emailAddress" min="1" required="true" validationMessageCode="field_invalid_email" z="giZNP6uYWpk2Zy0vnKIylKDRrpg="/>
-        <field:textarea field="password" id="c_com_labsynch_labseer_domain_User_password" required="true" z="s9th6YxQEuXirVmYw4afGavQQAM="/>
-        <field:datetime dateTimePattern="${user_activationdate_date_format}" field="activationDate" id="c_com_labsynch_labseer_domain_User_activationDate" z="zmGEZzVFEnqIo3AbY/fMREnNMq4="/>
-        <field:input field="activationKey" id="c_com_labsynch_labseer_domain_User_activationKey" z="FO9vmGmvNNKNaYufyBLMUDQisKk="/>
-        <field:checkbox field="enabled" id="c_com_labsynch_labseer_domain_User_enabled" z="1Lqhm/P+WyWC1jqgYac3qo2DayQ="/>
-        <field:checkbox field="locked" id="c_com_labsynch_labseer_domain_User_locked" z="OpbLhYCHSIt3eUfmCDe359aQ9Xc="/>
-        <field:textarea field="userName" id="c_com_labsynch_labseer_domain_User_userName" required="true" z="SY0tyk1YbTyEfu3mVD2D+ZafBJ4="/>
-        <field:textarea field="email" id="c_com_labsynch_labseer_domain_User_email" required="true" validationMessageCode="field_invalid_email" z="Lwm1vXSO/T7yszctvFcHEKEOD2k="/>
-        <field:datetime dateTimePattern="${user_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_User_recordedDate" required="true" z="z67nFW1h/DTH/SKjviqC98STZP0="/>
-        <field:datetime dateTimePattern="${user_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_User_modifiedDate" z="J+yWmVpofJLrtoDMxLFr0q5ZrVk="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_User" render="${not empty dependencies}" z="IjXHIAunrc4aXwKBwOSoFckJqxc="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/users/list.jspx b/src/main/webapp/WEB-INF/views/users/list.jspx
deleted file mode 100755
index 951a33f14..000000000
--- a/src/main/webapp/WEB-INF/views/users/list.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_User" items="${users}" z="Nd9FsBTBP7mhTVhX/eCVbe9QwQE=">
-        <table:table data="${users}" id="l_com_labsynch_labseer_domain_User" path="/users" z="seSpSdjfU7/OlefgUfAwsicAS/0=">
-            <table:column id="c_com_labsynch_labseer_domain_User_firstName" property="firstName" z="CFdXoHiv7hOZNH7B62lvWf3hxj0="/>
-            <table:column id="c_com_labsynch_labseer_domain_User_lastName" property="lastName" z="z6ATXBm67oH6KVno0KDXsMdN3Ho="/>
-            <table:column id="c_com_labsynch_labseer_domain_User_password" property="password" z="JorlgIPtHNePn8nWEte9Md8tXxg="/>
-            <table:column id="c_com_labsynch_labseer_domain_User_userName" property="userName" z="T/QOpqF+W9dM62idAPinQXnpUNg="/>
-            <table:column id="c_com_labsynch_labseer_domain_User_email" property="email" z="eY+C9TtmktFQF3JE2L/LFv8ZyWc="/>
-            <table:column date="true" dateTimePattern="${user_recordeddate_date_format}" id="c_com_labsynch_labseer_domain_User_recordedDate" property="recordedDate" z="F3GCgp4HphFFWZd5TrDxSP2PrNI="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/users/show.jspx b/src/main/webapp/WEB-INF/views/users/show.jspx
deleted file mode 100755
index 6080f9af5..000000000
--- a/src/main/webapp/WEB-INF/views/users/show.jspx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_User" object="${user}" path="/users" z="fk8SB5chxEpVN4AfCoQQRZPU/lY=">
-        <field:display field="firstName" id="s_com_labsynch_labseer_domain_User_firstName" object="${user}" z="Mlqgzt8bxj0rXJRIH0GarblhIf0="/>
-        <field:display field="lastName" id="s_com_labsynch_labseer_domain_User_lastName" object="${user}" z="R4Q4/yXUXD++kyQ8NAeJnu4g96w="/>
-        <field:display field="emailAddress" id="s_com_labsynch_labseer_domain_User_emailAddress" object="${user}" z="zvyhjGwpPdRJmgU6mnWFHsfe/VU="/>
-        <field:display field="password" id="s_com_labsynch_labseer_domain_User_password" object="${user}" z="0q4riZQN+1789Ekl26igdjMJeC8="/>
-        <field:display date="true" dateTimePattern="${user_activationdate_date_format}" field="activationDate" id="s_com_labsynch_labseer_domain_User_activationDate" object="${user}" z="zvjCFuu9cfPbBoiFIoPojcM6bCc="/>
-        <field:display field="activationKey" id="s_com_labsynch_labseer_domain_User_activationKey" object="${user}" z="7PeVrQ0QI4IffUhMeYJUC7gat6k="/>
-        <field:display field="enabled" id="s_com_labsynch_labseer_domain_User_enabled" object="${user}" z="RaiWmm2DyyaA0qijPNUlSQBnL5U="/>
-        <field:display field="locked" id="s_com_labsynch_labseer_domain_User_locked" object="${user}" z="dMt9zETH7t+EKmKisPzWzIFojG0="/>
-        <field:display field="userName" id="s_com_labsynch_labseer_domain_User_userName" object="${user}" z="JNaATDqTJ9NzBeXQMUWVzN5hsdg="/>
-        <field:display field="email" id="s_com_labsynch_labseer_domain_User_email" object="${user}" z="8bybQ2izXSKNdTgCcskFv64RAFI="/>
-        <field:display date="true" dateTimePattern="${user_recordeddate_date_format}" field="recordedDate" id="s_com_labsynch_labseer_domain_User_recordedDate" object="${user}" z="YGgecokvWuFfIlrTosO/lwbrfi0="/>
-        <field:display date="true" dateTimePattern="${user_modifieddate_date_format}" field="modifiedDate" id="s_com_labsynch_labseer_domain_User_modifiedDate" object="${user}" z="nTRQLlEDt4OB2TBRzjCugqzPMi0="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/users/update.jspx b/src/main/webapp/WEB-INF/views/users/update.jspx
deleted file mode 100755
index d66c26b9d..000000000
--- a/src/main/webapp/WEB-INF/views/users/update.jspx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_User" modelAttribute="user" path="/users" versionField="Version" z="OkKARNsVVR7wUqS40WtfrGyScdo=">
-        <field:textarea field="firstName" id="c_com_labsynch_labseer_domain_User_firstName" required="true" z="oqelF66z5UriSpH/LeB202uEFKU="/>
-        <field:textarea field="lastName" id="c_com_labsynch_labseer_domain_User_lastName" required="true" z="YFaVQquwO5LeBR6xpCkc+5G5xxU="/>
-        <field:input field="emailAddress" id="c_com_labsynch_labseer_domain_User_emailAddress" min="1" required="true" validationMessageCode="field_invalid_email" z="giZNP6uYWpk2Zy0vnKIylKDRrpg="/>
-        <field:textarea field="password" id="c_com_labsynch_labseer_domain_User_password" required="true" z="s9th6YxQEuXirVmYw4afGavQQAM="/>
-        <field:datetime dateTimePattern="${user_activationdate_date_format}" field="activationDate" id="c_com_labsynch_labseer_domain_User_activationDate" z="zmGEZzVFEnqIo3AbY/fMREnNMq4="/>
-        <field:input field="activationKey" id="c_com_labsynch_labseer_domain_User_activationKey" z="FO9vmGmvNNKNaYufyBLMUDQisKk="/>
-        <field:checkbox field="enabled" id="c_com_labsynch_labseer_domain_User_enabled" z="1Lqhm/P+WyWC1jqgYac3qo2DayQ="/>
-        <field:checkbox field="locked" id="c_com_labsynch_labseer_domain_User_locked" z="OpbLhYCHSIt3eUfmCDe359aQ9Xc="/>
-        <field:textarea field="userName" id="c_com_labsynch_labseer_domain_User_userName" required="true" z="SY0tyk1YbTyEfu3mVD2D+ZafBJ4="/>
-        <field:textarea field="email" id="c_com_labsynch_labseer_domain_User_email" required="true" validationMessageCode="field_invalid_email" z="Lwm1vXSO/T7yszctvFcHEKEOD2k="/>
-        <field:datetime dateTimePattern="${user_recordeddate_date_format}" field="recordedDate" id="c_com_labsynch_labseer_domain_User_recordedDate" required="true" z="z67nFW1h/DTH/SKjviqC98STZP0="/>
-        <field:datetime dateTimePattern="${user_modifieddate_date_format}" field="modifiedDate" id="c_com_labsynch_labseer_domain_User_modifiedDate" z="J+yWmVpofJLrtoDMxLFr0q5ZrVk="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/users/views.xml b/src/main/webapp/WEB-INF/views/users/views.xml
deleted file mode 100755
index 39d37cf19..000000000
--- a/src/main/webapp/WEB-INF/views/users/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="users/list">
-        <put-attribute name="body" value="/WEB-INF/views/users/list.jspx"/>
-    </definition>
-<definition extends="default" name="users/show">
-        <put-attribute name="body" value="/WEB-INF/views/users/show.jspx"/>
-    </definition>
-<definition extends="default" name="users/create">
-        <put-attribute name="body" value="/WEB-INF/views/users/create.jspx"/>
-    </definition>
-<definition extends="default" name="users/update">
-        <put-attribute name="body" value="/WEB-INF/views/users/update.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/valuekinds/create.jspx b/src/main/webapp/WEB-INF/views/valuekinds/create.jspx
deleted file mode 100755
index a7169529b..000000000
--- a/src/main/webapp/WEB-INF/views/valuekinds/create.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ValueKind" modelAttribute="valueKind" path="/valuekinds" render="${empty dependencies}" z="zj+a6/u5HlXGXJTJfOWIdRW9O6I=">
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_ValueKind_kindName" required="true" z="D+jrxcIQTpWhJOKcWqrT6fRFyxg="/>
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_ValueKind_lsType" itemValue="id" items="${valuetypes}" path="/valuetypes" required="true" z="5h6NAy9aAItXIu71eh78qqUqLVQ="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ValueKind_lsTypeAndKind" z="wE/0laCYYMdMTC9ccBdIrFzFTg0="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ValueKind" render="${not empty dependencies}" z="icNJw7fzEe+2IwpJfx7jpZBnA7k="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/valuekinds/findValueKindsByKindNameEqualsAndLsType.jspx b/src/main/webapp/WEB-INF/views/valuekinds/findValueKindsByKindNameEqualsAndLsType.jspx
deleted file mode 100755
index 38cca5424..000000000
--- a/src/main/webapp/WEB-INF/views/valuekinds/findValueKindsByKindNameEqualsAndLsType.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByKindNameEqualsAndLsType" id="ff_com_labsynch_labseer_domain_ValueKind" path="/valuekinds" z="kAivBJCe0jo8x7UhTISCU77DqmU=">
-        <field:input disableFormBinding="true" field="kindName" id="f_com_labsynch_labseer_domain_ValueKind_kindName" max="64" required="true" z="vfJIuBt2h7AjpXmdLSFxh1UaDkg="/>
-        <field:select disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_ValueKind_lsType" itemValue="id" items="${valuetypes}" path="/valuetypes" required="true" z="0iK3LrdZsrqRcWf2s5s7DkvxVS4="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/valuekinds/findValueKindsByLsType.jspx b/src/main/webapp/WEB-INF/views/valuekinds/findValueKindsByLsType.jspx
deleted file mode 100755
index 0bd39f1ca..000000000
--- a/src/main/webapp/WEB-INF/views/valuekinds/findValueKindsByLsType.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByLsType" id="ff_com_labsynch_labseer_domain_ValueKind" path="/valuekinds" z="F7BohWx6JsmzFfbnxWXm7Yoo1JI=">
-        <field:select disableFormBinding="true" field="lsType" id="f_com_labsynch_labseer_domain_ValueKind_lsType" itemValue="id" items="${valuetypes}" path="/valuetypes" required="true" z="0iK3LrdZsrqRcWf2s5s7DkvxVS4="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/valuekinds/list.jspx b/src/main/webapp/WEB-INF/views/valuekinds/list.jspx
deleted file mode 100755
index 1ae9da8ca..000000000
--- a/src/main/webapp/WEB-INF/views/valuekinds/list.jspx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ValueKind" items="${valuekinds}" z="ZeY+6YmtfMaawWtQJtjpHeJ1EU0=">
-        <table:table data="${valuekinds}" id="l_com_labsynch_labseer_domain_ValueKind" path="/valuekinds" z="wEicJhib81tQ5sv4reyQ1W6kS1k=">
-            <table:column id="c_com_labsynch_labseer_domain_ValueKind_kindName" property="kindName" z="F2qxXrE12o4Yg/XyQ3yudrLn5sk="/>
-            <table:column id="c_com_labsynch_labseer_domain_ValueKind_lsType" property="lsType" z="/jSn1N/XU7Q+hqevZbhL44b1Z6c="/>
-            <table:column id="c_com_labsynch_labseer_domain_ValueKind_lsTypeAndKind" property="lsTypeAndKind" z="60yNBt2FnUQG0M2ylkOvmsbaCSo="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/valuekinds/show.jspx b/src/main/webapp/WEB-INF/views/valuekinds/show.jspx
deleted file mode 100755
index ea3faa6cf..000000000
--- a/src/main/webapp/WEB-INF/views/valuekinds/show.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ValueKind" object="${valuekind}" path="/valuekinds" z="coM2w0Qx/c/Zjn43ZAxZqp7NMVg=">
-        <field:display field="kindName" id="s_com_labsynch_labseer_domain_ValueKind_kindName" object="${valuekind}" z="AvVDdga+QZJGOoMffY+CdjYE+lw="/>
-        <field:display field="lsType" id="s_com_labsynch_labseer_domain_ValueKind_lsType" object="${valuekind}" z="5s+45IWoC5paK8dVcYFPipGCLUM="/>
-        <field:display field="lsTypeAndKind" id="s_com_labsynch_labseer_domain_ValueKind_lsTypeAndKind" object="${valuekind}" z="h6vys3ruIHAruw8aoEAhESiwGD8="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/valuekinds/update.jspx b/src/main/webapp/WEB-INF/views/valuekinds/update.jspx
deleted file mode 100755
index 9aca12a33..000000000
--- a/src/main/webapp/WEB-INF/views/valuekinds/update.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ValueKind" modelAttribute="valueKind" path="/valuekinds" versionField="Version" z="Em9j9K3Y/wjg/pH9p46ctlNUfMk=">
-        <field:textarea field="kindName" id="c_com_labsynch_labseer_domain_ValueKind_kindName" required="true" z="D+jrxcIQTpWhJOKcWqrT6fRFyxg="/>
-        <field:select field="lsType" id="c_com_labsynch_labseer_domain_ValueKind_lsType" itemValue="id" items="${valuetypes}" path="/valuetypes" required="true" z="5h6NAy9aAItXIu71eh78qqUqLVQ="/>
-        <field:textarea field="lsTypeAndKind" id="c_com_labsynch_labseer_domain_ValueKind_lsTypeAndKind" z="wE/0laCYYMdMTC9ccBdIrFzFTg0="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/valuekinds/views.xml b/src/main/webapp/WEB-INF/views/valuekinds/views.xml
deleted file mode 100755
index 730f61019..000000000
--- a/src/main/webapp/WEB-INF/views/valuekinds/views.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="valuekinds/list">
-        <put-attribute name="body" value="/WEB-INF/views/valuekinds/list.jspx"/>
-    </definition>
-<definition extends="default" name="valuekinds/show">
-        <put-attribute name="body" value="/WEB-INF/views/valuekinds/show.jspx"/>
-    </definition>
-<definition extends="default" name="valuekinds/create">
-        <put-attribute name="body" value="/WEB-INF/views/valuekinds/create.jspx"/>
-    </definition>
-<definition extends="default" name="valuekinds/update">
-        <put-attribute name="body" value="/WEB-INF/views/valuekinds/update.jspx"/>
-    </definition>
-<definition extends="default" name="valuekinds/findValueKindsByKindNameEqualsAndLsType">
-        <put-attribute name="body" value="/WEB-INF/views/valuekinds/findValueKindsByKindNameEqualsAndLsType.jspx"/>
-    </definition>
-<definition extends="default" name="valuekinds/findValueKindsByLsType">
-        <put-attribute name="body" value="/WEB-INF/views/valuekinds/findValueKindsByLsType.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/valuetypes/create.jspx b/src/main/webapp/WEB-INF/views/valuetypes/create.jspx
deleted file mode 100755
index 639ad6a36..000000000
--- a/src/main/webapp/WEB-INF/views/valuetypes/create.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_ValueType" modelAttribute="valueType" path="/valuetypes" render="${empty dependencies}" z="+BSduhlMg4nDbeD4ylPNaS5vlwk=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_ValueType_typeName" required="true" z="oC6VnZrizFMD5GYGIE+mpP3ekRg="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_ValueType" render="${not empty dependencies}" z="j+GYO1mVMHUscBIpWVBT/sTc8sQ="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/valuetypes/findValueTypesByTypeNameEquals.jspx b/src/main/webapp/WEB-INF/views/valuetypes/findValueTypesByTypeNameEquals.jspx
deleted file mode 100755
index 0956d57fb..000000000
--- a/src/main/webapp/WEB-INF/views/valuetypes/findValueTypesByTypeNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByTypeNameEquals" id="ff_com_labsynch_labseer_domain_ValueType" path="/valuetypes" z="nJJ+fHhiebAy98TDG5gmbaBxvSQ=">
-        <field:input disableFormBinding="true" field="typeName" id="f_com_labsynch_labseer_domain_ValueType_typeName" max="64" required="true" z="MAP5+mmFuyp2jBWEnr5czo3Kzlw="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/valuetypes/list.jspx b/src/main/webapp/WEB-INF/views/valuetypes/list.jspx
deleted file mode 100755
index a823fb756..000000000
--- a/src/main/webapp/WEB-INF/views/valuetypes/list.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_ValueType" items="${valuetypes}" z="EnEcccWf6UqBh8tm8LsiwD1GS2s=">
-        <table:table data="${valuetypes}" id="l_com_labsynch_labseer_domain_ValueType" path="/valuetypes" z="m7k84ICAgxDSlHJpMsInEhV3GA0=">
-            <table:column id="c_com_labsynch_labseer_domain_ValueType_typeName" property="typeName" z="FzX6P1JxM3pq84BMXQFw40qC04Q="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/valuetypes/show.jspx b/src/main/webapp/WEB-INF/views/valuetypes/show.jspx
deleted file mode 100755
index 61f750482..000000000
--- a/src/main/webapp/WEB-INF/views/valuetypes/show.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_ValueType" object="${valuetype}" path="/valuetypes" z="bg8apWP8asRORlxdJP9mp8PxKjI=">
-        <field:display field="typeName" id="s_com_labsynch_labseer_domain_ValueType_typeName" object="${valuetype}" z="E2fDlInpdzyP3lRZUSfJqIbqn3o="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/valuetypes/update.jspx b/src/main/webapp/WEB-INF/views/valuetypes/update.jspx
deleted file mode 100755
index 76df8d39b..000000000
--- a/src/main/webapp/WEB-INF/views/valuetypes/update.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_ValueType" modelAttribute="valueType" path="/valuetypes" versionField="Version" z="izzNDpGsP/3hSmlJRRojvM6Gpdk=">
-        <field:textarea field="typeName" id="c_com_labsynch_labseer_domain_ValueType_typeName" required="true" z="oC6VnZrizFMD5GYGIE+mpP3ekRg="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/valuetypes/views.xml b/src/main/webapp/WEB-INF/views/valuetypes/views.xml
deleted file mode 100755
index 5be85b6ae..000000000
--- a/src/main/webapp/WEB-INF/views/valuetypes/views.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="valuetypes/list">
-        <put-attribute name="body" value="/WEB-INF/views/valuetypes/list.jspx"/>
-    </definition>
-<definition extends="default" name="valuetypes/show">
-        <put-attribute name="body" value="/WEB-INF/views/valuetypes/show.jspx"/>
-    </definition>
-<definition extends="default" name="valuetypes/create">
-        <put-attribute name="body" value="/WEB-INF/views/valuetypes/create.jspx"/>
-    </definition>
-<definition extends="default" name="valuetypes/update">
-        <put-attribute name="body" value="/WEB-INF/views/valuetypes/update.jspx"/>
-    </definition>
-<definition extends="default" name="valuetypes/findValueTypesByTypeNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/valuetypes/findValueTypesByTypeNameEquals.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/vendors/create.jspx b/src/main/webapp/WEB-INF/views/vendors/create.jspx
deleted file mode 100644
index b5a1a65b4..000000000
--- a/src/main/webapp/WEB-INF/views/vendors/create.jspx
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_com_labsynch_labseer_domain_Vendor" modelAttribute="vendor" path="/vendors" render="${empty dependencies}" z="7Ls4BWMnZIsDRn1C2jsWlwDmFq4=">
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_Vendor_name" z="aRFHneinamtZdL5T4On79ZxCp94="/>
-        <field:textarea field="code" id="c_com_labsynch_labseer_domain_Vendor_code" z="UfTYISjlN4Es6T6puAxv4VThcy8="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_com_labsynch_labseer_domain_Vendor" render="${not empty dependencies}" z="EAieqVgRdT9GnyKYrgdMlKeyH50="/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/vendors/findVendorsByCodeEquals.jspx b/src/main/webapp/WEB-INF/views/vendors/findVendorsByCodeEquals.jspx
deleted file mode 100644
index 5e018b35b..000000000
--- a/src/main/webapp/WEB-INF/views/vendors/findVendorsByCodeEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeEquals" id="ff_com_labsynch_labseer_domain_Vendor" path="/vendors" z="erlvMLsLXLNN0ZEO24Y2NUOq4qc=">
-        <field:input disableFormBinding="true" field="code" id="f_com_labsynch_labseer_domain_Vendor_code" max="255" required="true" z="YcKdRY5XRQ82qb2T4Nf8UNh4ark="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/vendors/findVendorsByCodeLike.jspx b/src/main/webapp/WEB-INF/views/vendors/findVendorsByCodeLike.jspx
deleted file mode 100644
index 3ef883a88..000000000
--- a/src/main/webapp/WEB-INF/views/vendors/findVendorsByCodeLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByCodeLike" id="ff_com_labsynch_labseer_domain_Vendor" path="/vendors" z="nd31mLVP1p5TSsCXblUP5ZTM57Y=">
-        <field:input disableFormBinding="true" field="code" id="f_com_labsynch_labseer_domain_Vendor_code" max="255" required="true" z="YcKdRY5XRQ82qb2T4Nf8UNh4ark="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/vendors/findVendorsByNameEquals.jspx b/src/main/webapp/WEB-INF/views/vendors/findVendorsByNameEquals.jspx
deleted file mode 100644
index 6be5aed8a..000000000
--- a/src/main/webapp/WEB-INF/views/vendors/findVendorsByNameEquals.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByNameEquals" id="ff_com_labsynch_labseer_domain_Vendor" path="/vendors" z="6A69HYot3+jiNDEc58N40bUPDeM=">
-        <field:input disableFormBinding="true" field="name" id="f_com_labsynch_labseer_domain_Vendor_name" max="255" required="true" z="lHggT3wpCJ1/L2n6St7JY5NNiys="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/vendors/findVendorsByNameLike.jspx b/src/main/webapp/WEB-INF/views/vendors/findVendorsByNameLike.jspx
deleted file mode 100644
index 873bc4b11..000000000
--- a/src/main/webapp/WEB-INF/views/vendors/findVendorsByNameLike.jspx
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:find finderName="ByNameLike" id="ff_com_labsynch_labseer_domain_Vendor" path="/vendors" z="MXzWXfl/RGrH3WgBx2DZep0NEeU=">
-        <field:input disableFormBinding="true" field="name" id="f_com_labsynch_labseer_domain_Vendor_name" max="255" required="true" z="lHggT3wpCJ1/L2n6St7JY5NNiys="/>
-    </form:find>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/vendors/list.jspx b/src/main/webapp/WEB-INF/views/vendors/list.jspx
deleted file mode 100644
index 209200b2f..000000000
--- a/src/main/webapp/WEB-INF/views/vendors/list.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_com_labsynch_labseer_domain_Vendor" items="${vendors}" z="DYHa3AYYOjq23yb9fct32Swq8kI=">
-        <table:table data="${vendors}" id="l_com_labsynch_labseer_domain_Vendor" path="/vendors" z="FX9FHeGUzQMFkwkB7gS1pvt0Hm8=">
-            <table:column id="c_com_labsynch_labseer_domain_Vendor_name" property="name" z="2PnF4O3SrNhNynqr3d+1fMTV9LQ="/>
-            <table:column id="c_com_labsynch_labseer_domain_Vendor_code" property="code" z="2EEt4qSHBHw2G3v6SvbShOTI2L8="/>
-        </table:table>
-    </page:list>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/vendors/show.jspx b/src/main/webapp/WEB-INF/views/vendors/show.jspx
deleted file mode 100644
index df629a35b..000000000
--- a/src/main/webapp/WEB-INF/views/vendors/show.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_com_labsynch_labseer_domain_Vendor" object="${vendor}" path="/vendors" z="chdGAC0ME5fl8wdHub+u1uNHgEo=">
-        <field:display field="name" id="s_com_labsynch_labseer_domain_Vendor_name" object="${vendor}" z="DqTVTsUtLoYu12Tiahp0Litl3Cs="/>
-        <field:display field="code" id="s_com_labsynch_labseer_domain_Vendor_code" object="${vendor}" z="c4W80Ru6NDDU/aw/dVUMS8b+wfg="/>
-    </page:show>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/vendors/update.jspx b/src/main/webapp/WEB-INF/views/vendors/update.jspx
deleted file mode 100644
index c9843dd01..000000000
--- a/src/main/webapp/WEB-INF/views/vendors/update.jspx
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_com_labsynch_labseer_domain_Vendor" modelAttribute="vendor" path="/vendors" versionField="Version" z="rqWx8fCmvCdtF+ADRSTm67u88+4=">
-        <field:textarea field="name" id="c_com_labsynch_labseer_domain_Vendor_name" z="aRFHneinamtZdL5T4On79ZxCp94="/>
-        <field:textarea field="code" id="c_com_labsynch_labseer_domain_Vendor_code" z="UfTYISjlN4Es6T6puAxv4VThcy8="/>
-    </form:update>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/vendors/views.xml b/src/main/webapp/WEB-INF/views/vendors/views.xml
deleted file mode 100644
index 626498a1d..000000000
--- a/src/main/webapp/WEB-INF/views/vendors/views.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-    <definition extends="default" name="vendors/list">
-        <put-attribute name="body" value="/WEB-INF/views/vendors/list.jspx"/>
-    </definition>
-<definition extends="default" name="vendors/show">
-        <put-attribute name="body" value="/WEB-INF/views/vendors/show.jspx"/>
-    </definition>
-<definition extends="default" name="vendors/create">
-        <put-attribute name="body" value="/WEB-INF/views/vendors/create.jspx"/>
-    </definition>
-<definition extends="default" name="vendors/update">
-        <put-attribute name="body" value="/WEB-INF/views/vendors/update.jspx"/>
-    </definition>
-<definition extends="default" name="vendors/findVendorsByCodeEquals">
-        <put-attribute name="body" value="/WEB-INF/views/vendors/findVendorsByCodeEquals.jspx"/>
-    </definition>
-<definition extends="default" name="vendors/findVendorsByCodeLike">
-        <put-attribute name="body" value="/WEB-INF/views/vendors/findVendorsByCodeLike.jspx"/>
-    </definition>
-<definition extends="default" name="vendors/findVendorsByNameEquals">
-        <put-attribute name="body" value="/WEB-INF/views/vendors/findVendorsByNameEquals.jspx"/>
-    </definition>
-<definition extends="default" name="vendors/findVendorsByNameLike">
-        <put-attribute name="body" value="/WEB-INF/views/vendors/findVendorsByNameLike.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/views.xml b/src/main/webapp/WEB-INF/views/views.xml
deleted file mode 100755
index e92932a94..000000000
--- a/src/main/webapp/WEB-INF/views/views.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-
-  <definition extends="default" name="index">
-    <put-attribute name="body" value="/WEB-INF/views/index.jspx"/>
-  </definition>
-
-  <definition extends="public" name="dataAccessFailure">
-    <put-attribute name="body" value="/WEB-INF/views/dataAccessFailure.jspx"/>
-  </definition>
-
-  <definition extends="public" name="resourceNotFound">
-    <put-attribute name="body" value="/WEB-INF/views/resourceNotFound.jspx"/>
-  </definition>
-
-  <definition extends="public" name="uncaughtException">
-    <put-attribute name="body" value="/WEB-INF/views/uncaughtException.jspx"/>
-  </definition>
-
-<definition extends="public" name="login">
-        <put-attribute name="body" value="/WEB-INF/views/login.jspx"/>
-    </definition>
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index f189e573e..91d00c072 100755
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -4,7 +4,7 @@
 
 	<display-name>acas</display-name>
 
-	<description>Roo generated acas application</description>
+	<description>acas application</description>
 
 
 	<!-- Enable escaping of form submission contents -->
diff --git a/src/main/webapp/images/add.png b/src/main/webapp/images/add.png
deleted file mode 100755
index d5bfa0719bc3a2ce4fc529403f0acd6b6057c956..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 739
zcmV<90v!E`P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!bxA})R2Ufr
z!A*#jRTu!^=RMz<JELQhSp)+?Az2yNpGYc3MHr-Rf?BmHs+G2is8zIz7A;GmjgS#k
zn{udySz>BG67=JY6c|L1R-#TR>fC$3^Y%QEnYO<A)ziynCZ8%{J*E&KkU=)%)_z+&
zmtVwx7hXEDXU7mAGSjx#j~&_f!uqwP#LA?T0AxZsduinT?-%{`$I|7K^S`V*x@X4{
zR485CKB(Qwg@1G<f*>1xHsf)+GU`3F<{J0kR(;pbF3)zyg$H+idfnl-wl5Wkh!vUH
z4Z32YP=l_}1rZd1W_D&^$A($A+&a0e&P?xx0!ctY2}*<#p+qPVN*B(YzvAW<BX_O}
z&u_Y3H_<%_6(Ez^5kf|2eNsa07-VtkTpG5q)`lKfJt=A#LxoHdHHwrHQ9>Xa*%bzq
z7Fz41LKILT(GWohi9|LgIzSZBhb*Zf6R6O}WYQ4GOi&71s9lmll0x6;8&ILOl$j(c
z0Z1T(6Tg09{?wd{moFHNN6PS?$|e>1MxSJ(0Z7o2<MSUneerV-Z`t6cRcjnt_}Jz7
zxw>)J-Zv|>acY@f`(Y@g7GwsEj5NLQo+q|HsxQ5}XSX_d@*^A9ZT9=A{W~j+$GyI1
zc4oqTHx@1FlRjw4XWyPN5i2~l_F3@aBk!0yu^aoRDvXy}8@HCjUVQUsuSH4$T5|r<
zzZOn^?Wfa6y|Q($Hx4{ws+)wX6-HP4zo!S?4KJ@7PG@G3G{CjXs(p*kIrj6rHs7_y
z+=<-=Q62s9FuWa^X~WKgJIAAZJR<H*xg0=}NNJ+`pw{kC<the!YpV|&-~Hvb{{bf<
VF=qYo>&XBB002ovPDHLkV1jCMPILeO

diff --git a/src/main/webapp/images/banner-graphic.png b/src/main/webapp/images/banner-graphic.png
deleted file mode 100755
index 7d2b78c6e370c97f342921e8158c324b73c8bda6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13194
zcmZvCWmH_jvh@%M?h@SHEx0=b2*KSw1czY39R?5X?hb>yI|OHNf&~xm-;jIXdhf@#
zrsu4)&g$vuu2Z#Z@9GZ!@>vE2kpK|@0HDapN~!<=&}5K%d3adJHLQH+8vuZ)WGx}_
z<%^ZQi@mdzy#tw?gany`lf8xYH*)~MeI--XQcd;ngV62zmAHJE-%oja6&!dn74b+v
z>^K?*as>2GVdS~XILbX3Qc^I4!#QEl(b0ZD9Azft2*f40-{g7Gf%#z(qmNr&`8Esf
zw|f&Wjf=wj6_=UyQ*hnz$VsxC%3OZPrQ#$Qn}I|9gIm8@MEwz|902I>^=9PG&y-Mr
zJ0C$oMv88@P5_kqED}7RTQR+xjVSaL?T>h>9+Y1YRJThUuROdTHbB%fTD%A#Dh=hA
znL?uq$bkVEjhUM40KPB-jA(uLW&wVgcd1@b0NtPDI8Zrp05UA|FiC)w0H9(@BSH$G
z#RkB(kniUMEHMMv<TNd00X0p4?n!i{IsiN}fK53pm>vM*1uz<>q;v-ar2?>}|7r?e
zFjk@OGe9hrS|`{-#V6&j3(xEbr>V(8LN_Ug%ZSZw{LVN{l%>}r6`#ZZBiiQWH~^3n
zhXYyd<+J-FYSrW<cQgpqkoiv+>??(d$<E8}RJnsF0I=oaGxNg4T2J670PAP_l1F_C
zV`YGp<9ZuuQHLhl2*^2H(Y$ncvyD`4Y|HZU?(g4ApZdjhjYl=TUo3kKyEUJ`-TMeW
z-Cl2YZd3Vl==;mS+->%bUnvw4O~oSwnXK-`$UHS6y*?4oQuNE2v}iG4?<iwBMoXpv
zFF6V+!o}n12dIC&nr&||Jwgj_Z~<z*3PX9tF_-9@Lf^>KqHDQyZ{Gp{f7|SP=IG#|
z{j37Frrci7M4n}Gr~!T!a`BD;fPo|xi`r<t$PhdLAerOOP$Nco)q}^>4NKJXezgbb
z$%s2hoT|T999<mI%#X;)h`u5~oGxUdhM2*KbxxG{W4E$ZNP+_@ORst}s*nTPgE4$o
z4_&)I0*u%&JeD!}N*I($gcfBqJZ@_69eIx|3}z%1*+>|+GKG8`mn^$Vgc_N;Eb(6<
zr+0jzdeW_N0>c1~fTxgl8TOz4b;?3>$c+*$B|HQ{(s@YJW-jb$F&}c$r=1!Ign-<+
z`_tuCXe%+o5<_g=2Y7It{omMF2K&Tod6^IrOvh>|Dv-+u32HPdpxeT)O{Z$zU@-lq
zx)Hcx+{DR@NyKEe6tq4s$(E22QGLW%LEu4v4pQ!=rAR1|Z=h+#xbMd^;b0Hdl4YV?
zz>L9SMfVDm=;xur442@bZHav+S6iU=3-g!sFFO^=L#ER7kFo@m2_q|JHg#}(KbgoF
zhl77-{_gwD`J3=J`CnbcOcPPZf;-i1I+f9{pYV6lcR%jJnx}AxspqGutd-=dVQ|Ih
zh*#!<RH~IjORzq=rtwV#evp$dtjtTCC9uM^y0xx8aB0O@OC<T6Jgxa_>`>+)`2hOL
z4H+c_CvYgtk`6x|4-U@~-wm%iMWG0PHWGhGjg5!>C}lqtE!AFKivh&&11D}2G4WF(
zO(G!!t6FJUQQ3MKlKQ3km|9G!fvR_vv^uBiPAS4%Qn`9r=9eQ?LRHIBfs)WN%MyDv
zkpds>=Wtl<K7~Fdi2~)ETEm_8K{6y${CamLavPNL5LbV$ewx~e<saV}+ESj0+aiU^
zN^|)nI6rY})~j6pv=D*YNpZZ(aQTd|Pgk6L=@YSzeMY}cPgwL(p@rRC&!#LXIZ3Nr
zwp_Vf=BR_a>ZCZcs6(nv`_Ug&Z0HlM9<7XJ%;fvbebr^vwPM8L4~jzk*HtWKHid+_
zZIW(XcEzVDS)B%cSqk>W>mD8Z4@BOq&uY)M55?Cq$Xc-V$W*Xk<Vifi0WL>-L1NY+
z@P)F3exImBp>d*d@>Wn>%Zy<DymXW_8qj)BZ-;8fcF=Y(p9YqOoJL;pkK$>XiegI<
zeUX5IfWpwk_(a~sLMm6f5c?v>e)@j;V){mtk&e3#6Q~5#Y%W*#Tc=3-6x41Ptiz{W
zsHLu>UoTymSxLRnR@qjJQQY!5;d6P`f@NRL1!x3R+Js-Ty95ia0@;GRjV(=ZEt>|a
z`c4x%61-czqn?G}P(qhc%ZYV}eViMdu=zFk*V865PDQ*2u96N}Ew!f5r<OQ(Kv-k+
z{nnYP>9aDHxRx!>ftO*C;qn1vEXl$w>4bx8!yUgrxm-KyZ+ZT@&P=aQ?>#92SD$j9
zTAzllW{-c&rq9ymbe`@Tme^F@oe@FGPGqy$sPIveQ1Z8I+^1wUWsTFUT&!s-bSt|x
zKEoBh5q8Sn5#ABxS?5^SHXP^aZW?YHQ|hzNG7R33@TGh;d-Z&s0TlaDLs>$H`-}PO
zzI(j${6XFoEy52rzo}b35d-G5h~bFE1XKp>_EeHv4Ijr=lHcy9OvX)GqXvKRIarv6
zGu|_f?DIjU4Gs;~3=xTT2-6~%VNd3An^~1`-jIBdOp;trw`5o1t7iVh#UNb9@>Ot!
zr}bm2$RLY__V~P3rk30{c_Ka*hAM8mZ=D-YCzqkyncGM^Ubrc&!}<;$xs$zD!Nng+
zSumOSlSCE5KJ)%O7ei+#`2eK;i{(Zgjp)%!+-pg}I>S8^wj`m)K=S#oEQ6wF{Bc}6
zmj~4VXCc#WOAu{oY`X%A!dg0i)`zt3WVRea{2lCp@o}+^;$`HD2_VZqmU|Z8$12Q&
z>s|)zBAZxA65&Q{>SHV3YcnH)#ETBpbm$ft;OZ>RH7&X(!bka%%Ci_JPR8p;!Ld9U
zXW6eOn7x==@u0#Gc}-?wt-X$luY7fajvipd9h~=!AsVn1g3S>i2HSb1@)OPEDxVG-
zPemJlgPzfVo<=B}BP4ai-C*yd)x{HiB`sF%jYi{#kW4~hobZS$Y%p#zj_(rPs{1Zs
zsQqYH>gvyi((?Wmvnh*T7KeN5%vrjqNoC1<$*6WH%PS2i8yXEK*EdpN*5nB~a9bcq
zq9wmeu({p5cw}-yKt!!T?Mm%Ijr;W1TBGseo!!hSp;!CO$K!dhZu{-C@JJ_E9ZFqs
z-eTVTQSPz+R-`Jt?C>t>(N@3mv#sOF5cDtTXE;h!&|=HnJn=6fHI<kJ#v>WjA=1v5
z%riG;6mAstsEomFN(V`g--ovd8@D7V{43vqUKLw#v!vgNEs0sbil_ZelTKGnd(<`2
zZB-f<o>};_?)fAGCPmBmD5&l6=~8XPdgU-+Ho@}m6fiR})7yvTe$@z^2lCoCo!t0}
zW`EX-?y~hu>NRp-pj}{6?{Blq-#YLvmS(eNS~b6+?H`vvf-ecPN<(cKZE004dNwVm
zo*j)|7Pp6lSv-?#R~;S~A6^&cv-pJ8Ixao!ZwGF#H$JTSIMF^&j<qej(VkYeE43S5
ziJpipORR;?i|D?rE}gCVe(iS4xtv**xrGf5oO+47jzN=nACnq07J?FTl*KE|$G0uw
z^nCbKEHPy^MU#d5lJ_!Jh5Lck=WhOJadIYQCO7$SazdBwkHY6a-ADM<;KANOlFku#
zPIiMUjmMK7w^cXdv-}M-rQbiueCb}T?rX1Ar;8sG@DmbVVW3kkpG-NK!4QTCYa%Zr
z33z?`<a87#K%O8t$Z9(S07zJGUnoFY1|H-goQs^I6x=ctEUW<Cv00fe06+$ilN3{P
zUpdM2${;dNJ@a)vJZ&+v;7C>ANPyvh!X(4!`yFr;VAkE-iZCi21v|ZS$Ns22AfHhm
zKoT=dcPazLRhL|W$dbPeg_4E0;DE}MEZ0s%PQ`9T(Gn*|#+fkw{7cBY+;fU_USEIy
zT4P>U=yv3Cch;<x#lFM!$kXRq@a$3+$PODo2LG>xA&3@9h@!)Y{c8y5|MOhd?|+_&
z#RACx(-%Gf2L3<&AlLtI*LOkx9rpirr4s$0pOgKcQUA9qCfR@gT@3wyyQYMcw1>+v
z``={kOs9S*VTZMN#<Wtr;M)cp1%S`>6L1#XZd(+LFd2<(pl-8j16T<57LYz19OJks
zvT>(<(C${`P)lU#?f$}pSxTpJNcD-rJXXROIXXi|7J(8w0%$@S$f}6mPi3-R^()AJ
z<puPm^}y#7UINXQAQqMwL+aqLEQOn^e5x}uyKE}sMux=?|DQaHAuu$%FTrC!st==2
z&`rgu^niuQdPq{rYww4@w8ORez6!PbJkX`YIF6=F@|@y1E8N<RdHcLv9p4^<R>7`S
zLtMh|AJV$As|LTVd$t}4AHEF5&$7;dg21Lf{I|c4uT3T{dfW<U0|hcSc+M_u4RE9H
zdz#|9jssef^E)1YPGf~Hin!J8(dwn1bH7>Dgg^c>`&IU0toKG{H79lWvRU&<+fUk|
z6N2{(QmIs_6vDoQe}A{DHXmsD_E~&uGZl!49OZc6Fr6XdYeQ2KeiX{pgwB(0J>^*2
z@U!T&4Ua%u6uyhVM>GCSE{s=Q*>39*i9uu5&e4qUes7J$`4)IS0C#zoKK62tfL6up
zvJAV}Y^k8N+HBirxOs=**kdCp>Jo;)^X5h=_{g`1c=&TY90WP&P$n<*yCh&I0|6@0
zB3P+7iXV^iUJmMO1QLE3$AW&@&kxyx6BNpU+yX)+i-9fpp;?0<HxVfm_pA#7$sf%G
z7g>W1ZMlb*?GM-b<IT6+PHXLSPtTUZu>4q9B~{{zzXe|1AH2$3$jJq=dIQ^uAuiQF
z5K;y0ooQ`FANidOieo3v>^<|w4}290V$+QuSJ9ij5=(R;#g0>}z;C#H3+1*LXHXk8
z9}c|$eM>wIkvLR>6=Uwfge~~D3f;rI_?N9lCCLXr^vRGF^?tzHNzi?a?XCFt3Mj%*
z4)IQBp$2iuH~>ksqCiJ-l6O?~ya=(SiXI-+a~mYfhxCHYCf$A0x14{R20^o0rv59}
z=s0vtFrT!3H~>A0A_>5G_M6Jn;0H1i%9kYsC{`6HgBWo^I)iP>1MZ^MbF!JYz|&Kp
z+8O`x#36=4=AoEBbkJbzP=og83{41UT=d3W_v}?;ePDX7<9!gsgtXZ1vmHQ9k*&Bc
zP2hV32`n^>OZ!M)<fou`+sF6O>F2n}COgtkQVKOM5%5H;N<T~JaxUJ?2BXYd3M0W#
zmHyYCmdRz(g@!jO<)K996E1gbhq&ESlx=731WY}~#R_VCoLs;AE&<SIIWMShI;G9=
z%w+f>s_<e=at~Bgb>uIpz~*@1X!kB0@9f1h%eQG~hvSQ30UEZ2)El;#O8k(7o23%P
z#6hbo{{jUBY68`UuQ18-q^;N_7&ex^v)3SvOaJ~#hG;ewV2^0Xvm-3~osotH+dV+x
zi{HI{pl?;s<DO|yTPCFssH|5|kK!4p!{B+aJofwzgu=qfxwad|+phyr%QA(a--o@X
zyC|EEn#Q(F8JWy{lN3W%nK6G30<zEvW;~m|U%bN8S48p===8q)>u?_?p{z_tQRCj*
z$HVN@4K(fa&S7JG^JzTic*hWzQ6WZ4BbHw>$Bm3QRNKhDd__uQFXf;67GG^UhIQ>O
z)6UB`Hos~;RMXn6)`>!oR|>(K73>G!0XvIAW6n1b1T=H^W_i#g1hq8kd;i$p&0iS>
z1QTb1;rGIGKDNHS19qQ+?bfa7;my7KSY{=MaPy%E*=WnNfjwMp&tPEsdaj9FW)N`<
zRq=^WNihD^`Nz|aA?7<=0JgRg6PD(A8cCIOyFH$c-&`xmHXIlGisN(*25V9FmN!X5
zvfj>vSiTDs08c&Ca=8|g<6iWiwWXkAQjXuagF*~<BQZv3Bv=d>EamTxni!j3Y!N?2
z_@CN^)M;b#PbqD9t8~EHJtD+B-H#7h%|Zv^dk`dL4YqaRVP5?CjmCkClDQr69yd^<
z;ML&qj8zckt0#7B596?pr^gq`NK&U5ZOFX->jeohMNm39$u}=k3#o$qR76n1=j-TI
zzHRTMEW!r;IPDL#zPA8(ia!>_&o174Swl9BtDzery9C((LgIGNN5Y0>Gax>3eAvSh
z#wjq$Uh+HLOl<E64xNR+Esr7hw3AeU=iHd4zi1ftIrNj_bc~XAk8KKk^ABkmjxx#(
zwRpjTP+61mR0d&jV+1#QBxB=BWn)LHl&vUd<gx0HH+O~44-M-g>VhYXQ}Ea9b-|I_
z2tlkK8q%!YN90<w5>%3(=61I1cq11ZYFH+g=zhH*TAX86>G$%<Y`;fGV%4GJ*UJ1a
zP&mm^4-5<rWU1fUua}zj!?6)Tf6jo>&}U5FK<g}1bcT9&;lNmRzKQ232<_CsB@_Tm
zbl@U`p1V31W-%G;NEc(|7+w)+tiA*LI<l%5H_E5PhK_Yt7KLUHV~k)*&yOO!WduZ|
z*dP`v;ngBTg%S5;mXYwNWWyPU%cuyxvwfu^4ARu~$KnT^w#$k`V;p!>wvc|1o!=Ki
z!wYf_BV9J+2_AW^oNp@cr0eCwQru}cUYQIiN?q6b77?ot$^S_G9mD)UwK|E0N%GH2
zZ>;D=mH3L~a~v2+YIy^T#@ws8f^R!%%~lj1eTsJyB~}_XMCO%#IM{e<MM-RljlYE4
zK4*KdeA%Bpq{_Pxb8*S;&Hnrh3uoX3Tj~<PXrgfaE%k#+ulv~US+{y*bziT?*cWY$
zz&u$509jU8p8bK~q&{!-;$%BeQwc<o8Ucq%O3oEvQ`L;2Isc5qlIn)D_j56aPUS0T
zLtx3Dhn1+$aOK5Mgv1x4)Md3kttI{Zypo54$c}nCN#1LFOT(_0+bT?}Mr}w;3JwA7
zUxW*&AY?xBqW&$|^$@iv(=0dvMrV<Pbm>=%$Kij}@4c+FK7N?G0xpRhGHz@P_XDTf
zsa-k%TU(b&>vgBl+1@?1tGF*M<fcoZwapgq?OL`Hv_77Fa`th1<r923V$IKg#J+tu
zb)%Ss{jp*_z^&>Y{!`>woNUzQ0Cdbw%uv=)aA!Th@6U4b=88Gb&R(M%876}?lW@?!
z!3#o`?=HKQ=gRDGBK3Qo$_`>*XMM^~k&Lmj(VO?0Bz^viSv|q)oB%(M#N@n}QMWDq
zMQ`Ld2X>PSF~Q4U`FGXHKFC6|!bn#AZNyWx$iZXTr<${Ul^Z5pitY75;YIwY6oRrY
zZ{Xa&#JO5d$-PPB&$8>?<ef-0=4=>XmO4e{MT~BdO1t0KM-|?d(ei>#<e*}}vIRn8
zXuctMANpFcQz~TL;5JD_NUh}8?D6p!c1<f-*JJ+5{k)#F6+Tvvv@h4>Y3JnCzoi~G
zZ46o3>%3b@Btq*)tWAIN2X&*P%3ITs02=^cCJyRpY*OjXT5jK@ZRgGJRzqKj3kT{^
zq*h)mf4pkG68F^#hvtrTf6);n%wE0H*8@2eF2CFiHRW|YQr+G$rFikB*}Y;|n6HSe
zy)b+iyyrt6^wft<MGDG92(IQUEHu>h5$7y9KL>}TpAUb||1SuVT)BRgjjHi`*DstP
zr_sY+{~jJtp<lT<PRP%qm*T-4k-;f`Z-7=0g4+pgcPDH{ZvR4f<T;!@nPNF_bJT7&
zdd{?jZEB4}pkWKO6BZLo&{HgYE~NSc(9N3V3pmlIWtOg5Te3Y94j#&WF1qiq>(M=5
zo_Gy$C>cKXz3Gb837WE7H;zC9xIZoXI^mEaBk#8=ZCk$H9_=+yBdtf+>iYP_>h!aB
zcc{*D6geN6-enSYx=*)|APAiirI`5LN6k(LgW_1z+zrq&51(S0yLw(XV`#}Q-UtNx
z4w8IZR2<5;h7Xd8uEd~k-+HG=1cA6Zu;WwC%+O1Y_Kcu!R=tC+QL2AZPDFAhWG~|Q
zlI_+Jij{}(b_krFrpaDB@1^s*!Y;V!l-eDq+3g3+c^n?UA4O&N<avyZpY3~r9S)W*
zs|LLnrk{7hai^D^S2CJvJn6YB!4`P)N!RNe=N@_-BDk0f%gzLFG0(WSm0kCH+3ZC8
zH$?ochCKVMX>QcQ?w2BaK$jSv8xV-;Jm}ros>1-eWsZ<@sr#8>Xpo~6qjNd%6kYK<
zyGqIV=5<^U+}r9D{O*iISIiFr(l7maI;KZ)eP44eo{qtxwVqPYB<st-bVA1QsmuwK
zr6yk<ke!{h>W;)xU9PoC%>1+4$)Ix#s)DBoji?`Qc`9f0`DUkUh_3}hQ`7wYpx2j+
zICHX<-4v1HyoGfd(-c*1QeW?hO3<#;HgxBs=fT}2=xnje6|0QlL&^r@*jI<X(OYm*
zZ3LRzRLlk6`AR*=)xP~Eu!N!7wI!~jL$>NYhW`4?<;p0}`g31-ENx0k+ZU$`PhP16
zec;lAmftzsZSsE?g{KqH(#n5Vm=fqA-G2AS(gz6U;oiCs0y{23H|1UL>Vxiwz^Gf{
z#Z9KOmVel=Px>xE5((ckG??wX|Lmdw{3_GaEkOWdj}W$7#a4$TvSKSoS)-|jvhf|2
zph%2S<%#$VEag<tBGaqxaGi<nsmo(_^B`}`?7l%GDX(^q>ljbU(eu2nonyo6LrWh?
z7O7X*($PMuz=|(ecm0SpI;cZ-T(|#s<A7ja{i+~hYwVY8g!cySNv1jc!P*#aVA4RD
zi1>n>#PrHzOF8LeU=XKk_rOa~1rEBY;uidiWFP25w-UOw1PC#OhD;ol#CE_xzY^d#
zl)WyTUyYEcIkDPxuGig)K~k#X0Sy!ykjZMYxT*L$<RtXGPXyNU9D&^8K1{;Tx3VP(
z9i=oL|7vu9xJ66%-8V%6*CC>1Ij$~)_q1OBv^E(}opqjh3O_|&UIgb_8H;0Fkn7<a
z&^h|2H%Z-gu>@7Cz9j)N8cb&9dw7()6;?a<C?xA<J1hWiJBb0Z^drr+miI-EE^CC1
zxRB3x5sF;QAPFh>&<J#dM6v>DbQQ{8Y2qf{Y*EK%GMt7?@j;`*LK~vU4$nHSVjw3t
zMZ}VQpW?`o$K>+CSf6|BiO+R!g-cyN<7CM5q&J#UuzjVvRHqkB<XsRF;9(vN?}U1%
z-SX6gQIICIc!VM99((YQ+?EDc9cE!ld_+*6P9v2+;=q^7H!+BcS?`Gdyda5yuD{3@
zkJl?}GF&A~jbPk}xAg@>{A>T6X1J(&-<QOi(2FuJg2=o>GpPm#Dm9>6RZAcD>koUv
ztc_Pr87(Di$Kd=*H3o7jVV5GxIH!g7Y;`^Viv3Wqj}w(;#{P-r%L@(PN%DuO8wK@a
z-_`ab+Zw>WXajs+iJMeOQK*c%$A9U8(DbhtP$m@{v(<-+x?i8t(aDQq0T&#+SfzNF
zr75OaOpNgKA#}=#Y`wYgYSiDtu=x79@I36t*N|lvW7EdFAgO(TYwV)a?Z+SyeAN*F
zDv1~B>*K(QY=KD?_;O7ni~QJ7OS#}QDEXGmroYXudta-ya_=M&F&-eg=z3v$7p9z>
zMj}>)@Zb3~&U9qY@9aY1N8IFAG+?4E+V)~8i3DL42cobUHnu~J{rRITP>sqp?`q*b
z2LZvQx>|(BdDp$VnB#BKM=$yZ$6t3q%3XO-nfkU%>vbrA>AAbu)SKHQ0fJilR~F~x
zLRUs*UHwpjt_35Is;YiyNMrgJ$bjWZJSppG%!Fy@TPR?KTG#dy^qU5d(bW2f#ph8_
zV{PsX2rWjWgSczC%S#+~yZpVrOlwHcBrdJCKe`HMo+JW!K?wO6gZNjNh>GUWySx4e
z+t(-imf4uhwHVs$S5%g(%q@ZzAbY<wtg;6GQ0HYXTYPEr#JMZy_(Ut|hrCpiP(Njd
zn)ZfKA0lz7Fj~_rSmy=Vn4rkalNe+eY!VYwI!P&HL-#xE#NR|RkAFX(#b<9){F9vM
zv$!$v6{6Pefu5qMMAlqG{y(}}aL`_R(GiF}D9E#;jtFKTM(C&<-#l0PW;bY?f!(6Z
z!()21XR-RcS;_0(kO-FkZgdX;Snhg#sBVV_v?(F}?ll8Q`XTY!WOG{=aswHyttf&#
zAl9#~s3jRonoBns8cjk`TxxB>hghClN&!^eWNYPg42HnM-C(pda@55Vo~s~BgBriT
z8vj<OGIhp%$(Nt#*nDR9y20_uiVS1>O@=Y?c}^9&*T(ISwo!XmjI8>RQ}*{zB<tQh
z1|qjIRkfa-O%vpzqo2yAIUS<y3-<9_%&8NjUtDh5?W){5_ZuYq#u-vgvB=u7>$OMa
z%ZN_gT(Y+b4_Wfad<pHY#RPRt?6OENA`Va2acXNRs01Of0dE4ED~}i1-zta}maO^v
zLTH2YJ-pEz^!+0mSNcY1p7-7TEMMHYq%_&_vW+|X=qJY7BSVzhU(53rh!HWX9lx$z
zzUeK7K@eLJtsi2TO;tl1HgFAMnAKd#nK2G2V0wK%<eIcvRNI=`$LW>4zVi6{qVFpF
z<pv~kC(X~NQ|!5e$(^&*^~@d{Z+G>1Q!p4cE*dQDBU`GMpP3meKQ0P6G`Oz9^^GMs
z5*Ia6ZI2iu$6T2jH6wKdo-|LpeIQ;dKHm#A<(>8T*=FEUKq>^iU*mNqvXj^)Xqv96
zqvv0F)<#+%!Po+OR9j!oyOJ(qS*xAUzc$U)PJhY3>RR!t1D0>;nrc5zF*HS03C;iI
z+4&`fXK48aLc}*I@m7(9|4RC6>ViB8GoGgmX_~UUu3aHP`r$&%+U1{q+1uh9oO4#R
zRs#z;KA?9xyjEJdUAUV?ogVME$iO+|59C8~9A^hL;UZVwP5_3uIZFLX{USQi@-D=j
zj^II>biZMzofX};I3;cIqF(TAf9JN3f4{8OUG?ZZh|W=-%wwcvgXGgtzs&s#Nt-(u
zV+|ErP{>N37TRi)6L7`}>KeaY+{L8E70<q3g~*807aqsXCKQpUd0ZlcByH+?$JsP6
z8{SFJxvYpZW*;P;WUUd}ul9>`j?!%JsT&vJ=cq=Q+PZx>T=e_oWqfQ|?n5cNzBl+T
z_a^dDu9<hcet*<tDsyXiZPWDKCFlR~r|~!bl|gD{#*QkU=IU>xm>*kv8s3?@vy{Fs
zyc&#}k!BEfa|_`(35B8o^2jt~N|L<pzok|$f)kr}kQgt{S<^1gKkr=Lk@#drRj*sS
zGyfg=!1Q}&c|L@e>7;V>(!p#%&eoN<vo?PQn;I?#Wb!=3NCc_=;6>aRZ}|9pH7<`W
z$xH^vz(&?=BXE>2rNI}SBote25@p@@`SKR=RJ5W<#i<}8yXD%KU_m_P;Exxy%;#5<
zsgu`m+vO&MT2$}A{TY!t^ROf>Qi$46ZKhIjq*6sF_$61->eOMo=Iy&0e(L}Ia^c|A
z7psf!Ngm8mUhRpyA-mtcYv_I5X1if1co&3EGKeL)aN`mRCsQ#h=vxuyb)foroOkFa
zZwI5cQcS)5!lylL$KFRE&S5iZ0NKGy4Q2!#R@X!gKRH-g&0IRGKDE^lH~7V<r!l<b
zOkyr}A|hyrGdt9cduMMDvBJKh`zFa2#EwcxNI-n_h`-O>mrZE|*t|>a>ouhh5lXuJ
z8{gb$k3+dzn3#2>(+86Eb8!C~e8&3=E_99!RPjo>y6fA%Uk*C23cgG-nO8p(7vuwK
z{Xp-de8!8oHep+d^50^)Ld%rd_(Gec-wNC4%*weau=YYL*#2mDh4MYm_dxI=l*P!Q
znK0&MKiLs<$=Z@2bnDc99pM^An-6J_%qCm7^VW*724&>8ArjEIXLW4ideVhtU<x7_
zth+6v?kYmb8Tp%g`z)E{7n&Dc*D4IMp0&X9R}J?wsj!MlVvDoW%(Jteh}J^pO!>vR
zhxB8#Q4L9TjiwFe8<S?i8Z)|v0VyrFp#*U)zPfVMAH{MxzUPrADku%V*jU?28zghO
zcCmby7T`ByGRQq%1_wNT|1BBH<s#RAFojERXF?rTY+Ausr;EhI;)+l^idfw7=#~Ju
zFrizBEWUY8H+_h@CheuZta4I_q0P7QxjS>%j)LB6@V#q0+l;^0Y_r>m_t4xT<@R2D
z@;M$KyIY}5M^{2lm;SCJPmvmJ3K_<Wv~zyJXJ^npr_6*L;!u(@5QPE>w-A{JWj-5W
zVbGSa?&Iytx%UD7w;`hjIEmVIARUL`M~PYk<e`UVQk%zRB_?63M>Ctw{)E0%rMV|6
zRmwfubXl@T_8U%fES%P=U11`nK{f99VMg)TFo-o|_;a0Kzegaw^86{4Ok*hm#3l#8
zN9dA^bN5Ie_2gHYCi#4)__YMPE2+zp@L{U2{;LP{8-TmLvMipnV3K{vdYC|kgb3K}
zQ<CFjTi13TpzR{@%)a~8bB{1=Flw%S<Ke3Q?)-t(c&42(mw~+G6MW>JemGj?D@Eu1
zp{25cPVm7nz~{lYGsMfs0V$*oXOcG8J3tafZ2DPDL48<WOo6)dd7!xFt5o3mUkUtb
ziQIQ48gjvXOW6#^;4UOD&R!F3eWBBq`hjs!BV=}vyZ3O>pcO%}opAm{)JfK^c}Brk
zXhRN_KZ6N<?t5r4+Y(1-b<AFC5h#0qNn6}%nbjC83(v=JyCQ|U9?2Kx?FSpj>;_R5
zeE?0X=k$`jkOMH193d~cm%Kmna6*;Z{W?N@{3SVPZZ>(quTXZ)H_#=951;kAoUrU#
zUJ}A2KSkYODPN&}-=41Bcf9LIx|`TCL~K%mpc#;4hOHtJLrVQ!WVrYOISVS)h%b?B
zCvMO_4uVb?8{P7;QfPDotYK3XiFsin1gAVcKxHVLf@i|82vK+X2tmdW&R~HO2Q8yp
z`#hwGwSAuw|Bi~00bn#Sf5y%#PuaobaNcN1d^B7aKw0b?`RH>M&kUXwZ9uZ*k8WOt
z$K2Ckl2jiMZ+G0{$~Y8^$ntl_3%empC4d41Nes|2rUvrua>Y{NN0ue$y47HLOJs^a
za(FEW{+vpSOt2^Fzo@T%3*(tPztk3a^<Fx91{v)UBH8$$vcK=~fcVB5Z@TA-d$3rb
z{rOq|)$UR@1w9^_Ek@p`0xm;$q#9~JgbSuLR%~f`T=Uj3;-&@V(=El3BEF5z?V0#<
z1S}E%uRm$?HWVp!<XU^8=4*FsnWUe;2zg<c$@xzLYvF;1)7KyQ+mtSS;mvU(Z8VHd
zkEQ&m$P+(rUEgTV%)b`V3j-jl5u57f%Q)mU34@jE&4|!psxUy*{vP9)X#T!YJvrB8
zK~I*gog9+$r$v7BBysarQnTZo4BoGETj?PBDFYoKgT_)5kSRh6(uq-y{HQKZ@Qx`|
z9ua6Xbc%=wOdYm6+=~@T+7RZEUwT14g<e3oxH?Llk)`izDv_`K-kV8sfa!C#4I(<n
zJ;h-y9I7er3Qy^_=~pE5F@PndM8Y5rmO2j7$#$Ui0U>{k<S70ml{^PaWeY*v7dh!A
ztAhhRb1ag3s#!<91Azn#Zi3!ilQ|82*l=e~x%i;_#K_z-jDu7KRUzn;EcLBf9ZYYD
z{U~oE0&MMp<2r(eMv8xwOqy)02W$5HkKZs9%Ca^!juxnZq|L3tcx;e{Nnhm*9W{Gt
z6-aywGEuULw7fop2$kdJCLCSvkIO~&%hN&XV}$23ZJJI4p^Y@M+zMmz@a7%VV;`zr
z=CHJ5Q+dh@#ASiMSrdqVbXHWYt1BpC|9b4w;-i*V=(>)81)C4!^<{rPsV7}3qb@1a
zGNR9dI{<FYrH3|4zdrFrLW15Fl&TQbtf4<;X?(3x@|Cxqq0gvc5hI$b?VGR#&eSAR
zZ|njl?}nFj$ur+BQVv6zc9$uYaL`tq&%^wG7N|1|j+5q}tQWuhLF94vy|6uX;Y`7V
z8>*M-^7r_LeDa*>L`3=*9UXs2;ee0Z_gt3oO=4$tFjrl3`aE<S&uJ`fL1<$JuQMKm
zRHa?soNfeXi#(&dO+P?Hkk!{8!`CTqS>S{jtPuCNTR*t4b8WqDf_tx^s1-Fv$cPkX
zV`e@iX5AJ(4Z>W5`-dO}h`aTe^g-tQ#h*B2i+Vn$RVfBVWw&vQzLt}kiELF`YG`ut
zP7f*U5Ny~K-_VxvD#IMyUcreaOFg-P<Vm+0i4qZ<`Z8q${>6pt=u_2c7fPvoit>_D
z9TUctWW`iQaXDqaPZ6Vv7rl5Aujd{zuCD)dd)Q%rw+Bi%-VP#q`sq0anL-_6w4PU8
zBw!>QC!A4D0cwXGo|;j#BEYy+MMEbXGF^zn_r-kYc1|uWt?CPOJCU|^&7{{G45Sx?
zmE`Qps`J%N)%38g$}ynHU`YI&W0{lbJ1xJLLawtsT@}|~<KT-ql2Rxlz16v$$KmYb
zsGPdIc+3q^Uk;C@E)>;OAt5z7l3h9wG=S8nY_R9OQuxjkm#ehd008)!x3d7vA2Wdq
z*4=M%=epYVpm}<aK^Ty)Wujp<udx`VTav`Dj;3}qAp-ra1#G4*X0DC$DbmuC!JqIF
z*t1@pP7?kjqL(@~Vq^Tuui#hD`+yl*ST+kRcyj7^j8A-MvO4mJP1V-)roK$imjuV3
zA+vzQGI1=nJrqUSdz<#z^GUV3EHr>PeSlKNNU%ecCU+G*ljv1OEgB`0^&xfnMAvR?
zkjpQ0!rD8s*2j&HL*C~qFQuQB@Jh0@N&U*Twr*&5mi=0U15GgC>nc*-NoklJ5L_Z>
zkDldcT~u|)f6{UqA;^_hD|laa8NtHCg8RV|Y*&hhqwZfIo3OB$8n)Pyef%?p0!*q%
zdiVmVZKRk?71X$8G1Ab92cU}6A}6s-1}nEjxz?H}5`M#>oc-iiVmyzHNHJRp%g3}G
z*n_8+#WhZutD>epM?u6Ot=tTQR8}qe%?uzENL&>XS#`uM)|Ya3j!U^JUmr<v^b&+!
z!10)W$lo463iZ?w#6PQGk9MhLIES995E$HK+jN;%$VGPIt2jPRy4!miGn4T+f=;^d
zjIsP;^&tDk!TYhj7J|)0f3+0Fb={qRo)b_uh?^<u&Qu8D#94=;gihM%{_9r3Rp;-4
zGD*t3<1@KRlH!A=a-<b?yrIF4u7nEN$ftrh2zv}WHg2M+&#sAVJPcO_|4M>d$`0?}
zp`U<|{oXdEn-!`BVQQ?ARlEcRUx>N#Myp^`RmrUPxXsi#Iz$bc8$~dH7U1@0%hu?~
zDDktHT67qS*??72v0KiAXACppHB!jCR)y1cZQ^|vA_byu(($c-AI2um9u6{Tsddz+
zv;!NNb$OauUf$_rsa_lH0v#vR+1LizGLE@y><(ICr4Vu}%%b}?<!tB+ROrE?7f<N4
z`m^2-1-cQ$UqR?Bic0$ri1`~jI)O<G!N?q36)QneRY&6FCUz%EFyFAd5Cj8VIBw00
zwk=97W4f9ad(K|arA7;A5j=gd-~F3iLJSpDuJXXDY{IXzv_JfuMAl-inU*LqrIU+p
zAGaZpRAI302SMiT!N&A&mzt1*CPWkGKr+o68nOC#%{F_8_|a#CxH+C6UeafsY-)d=
zKvhRDe#xM&iOz(GGMDQPW8JE{3fO^x!s%bu&Ml|@&b`)l=Gu-0TZ)BPVFPebc-AgB
z+Kq*%(SvY7eeG0o;#$nyaLv#mi!_;~@xmW|52bhwWT@`0M8-rux6eMmg^v%i!8At9
zpQ={z?E~P<0@MgIArnfqAqrYo#J*}Oq|EaLB0bA5BZx@s1%kXE-SS;uSzNw1Ms?9;
zmc9E8A;9S&g2*0kyHh(Xx&pUOU?(7Z##tk2JEUNt_EVEQQz12ghTyDER*+$iR2?DR
zmA}q}HjaS3yd-p<B1k+=Avub<KS9~ppHdDJQZ{2POSyO#g>w&WIArq##V#}=a)z6p
ztN71X?=Vgl(N9cKp-c#agr#8M*`cOZN0v&c<c(UJPDhHyCkUS6k9}N!1Akb^*V|BM
z0rPm3Eo@X#f&o1W?T~oZuBkH_N*mNn{$<3JA>TKKXC@bdDhBnA9;-9)G6z_A2LL4D
zitl_-{am}35IOw3)hvwTF-NX)FWtB(g!}W5%;MlJsPRO^G4SIH_<B{PIE`9X{Bjhu
zs6=6+7^T#o;BxopS7VJTlCkKJTZ;sOprD(L<)ycJ$bVu_jp{vNnkoLc#nI-Hio;Zi
z{Y-5e=rmjUF=r@uxNO;84)MGE((F_3s-ga(P>lA1(X{~Rp8dBS`|ka$RFsS-r=a6)
zXnI_>uP?ADO8k8kfd=uruY&z>|9o$DcoQfaYvzX_j5<s&_Rj1oB%mS<x-4}vh^6x>
zjd1!n_!||Cn1-2TZ(*!DAEP=MyXY+DD!1u{SP&&feK+YWz8dwhE*l#ogUcE^Sv+dN
zRnUD1uT2U530`lX&X|N55&RUGd?dtPMH%~m1o}&2?7;aIJ3(cjM+cDHnUBU!Fy4_1
zGQXXN8J7}_c}HJfpOMttmO4+N2D7cao|Q>06ocYN$X2z<1I3shL452S9s-Jq2@E`R
zU|C3%f`$T<fP&8i3ftgBrU)aE7(?7giE6xAb|PX2TQ{Q`!htvri6FKR*=9UX!4rbh
zpM>dgrFoMs{rRVky4K9*<wh)Ge=82zKfubzdcq!>>Cg$4Bw>=anY=X1Mld@kGckgW
z&4J1c9ks0@(q6>C;y6L&5bpmNZu|f!D?5n4&v$@L(Qe)Dz=+tDR<tO7vN|?1<NZ~S
zC+~>BOl|}i`6XvxDCklOF7^^$Ye;R0zbZ(XDD}N;OD$Gw)xAZQ36T5)X;4`Z1}Y8|
zpf?w@ppojMkolz^T^%AHmS-WSMZpRVo*E1P`46Xc(URe1!Pb4Jg={EAXAe^r`e<hh
zfwR=_Q~&~J9vB>I7+YjcA4OWk77_SX5eVrkBFz1Umt==au)3kNZqG{GiywIP`f`Qs
zbzU2z7(O|k*+Ew=-qL~TxhHRd%GrULmL<)QDaw#Z*S-0LOdj#~u{(-f9WsFDr4cPG
z8;VvxzQtAjZ}LbucgN;#KtmrM$|?21OAh4igr!D6&KT`~w6eA+1I}3Vj3Q!<25?Pe
zH3AQhRng{l#Lu+(3H~L2^!{e{=|XaLy%d0PJl6?J;Z|l<MN1JB2icZDHrO(R@@=OC
z()!)eSvY!Y6dciw^bvc~Ugp$TdwD=Y))`|Eba*=O?X<wYqI~1EkRvXRqA2pQ!AA<q
z$@!vlhZArcm-J7+b*shI#bdSBH$$MSg(3}KZ#FLejC8mZghghRC$|$rb|Bf=R^J0s
zbZgP$nexleQ22S@{uu)s7FlmPHjF*JlkOu7QVu(rYNo5b7wHT5u@g9eRK;EV?E9Nt
XiZ+E4?jCZq5g;e^S+YvpDB%AAdnZA%

diff --git a/src/main/webapp/images/create.png b/src/main/webapp/images/create.png
deleted file mode 100755
index d5bfa0719bc3a2ce4fc529403f0acd6b6057c956..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 739
zcmV<90v!E`P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!bxA})R2Ufr
z!A*#jRTu!^=RMz<JELQhSp)+?Az2yNpGYc3MHr-Rf?BmHs+G2is8zIz7A;GmjgS#k
zn{udySz>BG67=JY6c|L1R-#TR>fC$3^Y%QEnYO<A)ziynCZ8%{J*E&KkU=)%)_z+&
zmtVwx7hXEDXU7mAGSjx#j~&_f!uqwP#LA?T0AxZsduinT?-%{`$I|7K^S`V*x@X4{
zR485CKB(Qwg@1G<f*>1xHsf)+GU`3F<{J0kR(;pbF3)zyg$H+idfnl-wl5Wkh!vUH
z4Z32YP=l_}1rZd1W_D&^$A($A+&a0e&P?xx0!ctY2}*<#p+qPVN*B(YzvAW<BX_O}
z&u_Y3H_<%_6(Ez^5kf|2eNsa07-VtkTpG5q)`lKfJt=A#LxoHdHHwrHQ9>Xa*%bzq
z7Fz41LKILT(GWohi9|LgIzSZBhb*Zf6R6O}WYQ4GOi&71s9lmll0x6;8&ILOl$j(c
z0Z1T(6Tg09{?wd{moFHNN6PS?$|e>1MxSJ(0Z7o2<MSUneerV-Z`t6cRcjnt_}Jz7
zxw>)J-Zv|>acY@f`(Y@g7GwsEj5NLQo+q|HsxQ5}XSX_d@*^A9ZT9=A{W~j+$GyI1
zc4oqTHx@1FlRjw4XWyPN5i2~l_F3@aBk!0yu^aoRDvXy}8@HCjUVQUsuSH4$T5|r<
zzZOn^?Wfa6y|Q($Hx4{ws+)wX6-HP4zo!S?4KJ@7PG@G3G{CjXs(p*kIrj6rHs7_y
z+=<-=Q62s9FuWa^X~WKgJIAAZJR<H*xg0=}NNJ+`pw{kC<the!YpV|&-~Hvb{{bf<
VF=qYo>&XBB002ovPDHLkV1jCMPILeO

diff --git a/src/main/webapp/images/delete.png b/src/main/webapp/images/delete.png
deleted file mode 100755
index 3141467c678d2b53f79deb22086a9cb3a576a08d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 740
zcmV<A0vr8_P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!c1c7*R2Ufr
z!ApphWf%b9=l%X~&fILgg)|a)q3lLMiinG-MM0^Xf{17nMvGFRf@l{mqIHW<SG5R&
zXq8}#Y9h4@K~zLaQ3eT?HkzX0c+Q;vdwZV9Opm;N;@RoB$!AK~hA9LHWRT6cwKG>P
z<w9J&{OZZWdqx0}nRdPT)yek`Y`d$JSe0}VfJ{h>|1Ep}yDQG09bP~E^Dk?@JiKQJ
z6-pO(3~IOP)IYisL6D6;oAEd;E%zR}{U$rMRNuD6nQV7nesKS>)yLo7JuDCrD>Abi
zbj3uW23?^GA}9jQ{M^8v?ejL?HaT7AX5WPZNkBmfN`w-jL?{tT7ykZt$%Yln?p_m~
z-?>&d(LD(jAd}h=LPltPQbO$*Wbyl@G-_k5jXbb<Qq(er3YjEo6e%U5gg`d3D-0+t
zwAM+5D4;^3A%YMRiEK=CfGDC5SyDqLP@#><q#=-*pcJ%FyCj1og}%`@ph9aYGf7ec
zkU$9i=SPed4p~0;n^Wu7+cEuEWv2>#qffHY03>M1jfEqoPJQ6Mr=Byp=^jfzePZV1
zLjCmNi31hdIJHa%e;5g=1(`u3BRzfeExY%=VCu{loOr{`%2hUR*x>tL^W_TTaj);0
zpPR6CUD1+0>4TQ6zVfH3TQ;%l6#(_%yspK@3gcmG<JNN2i*L^LTBH=9CF@ttyZ+-b
zvqxVvTsrSMu3hc)oxdt9-{>#Q4!WCPyLU93nMKk7E2pcA=l45({2jNho>sdF*A~bA
zxX?-cp~y_z_kFf+yqu3m#QiB}03?Z&9vvR5TNgj<)($Vm)xq5G>|o2sFMag&6aNF+
WAT1?sQBYt20000<MNUMnLSTZ8C{xG)

diff --git a/src/main/webapp/images/en.png b/src/main/webapp/images/en.png
deleted file mode 100755
index ff701e19f6d2c0658fb23b1d94124cba4ce60851..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 599
zcmV-d0;v6oP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz`AI}URCwBAoHTQvnvLG!L$_YOVPIhR
z`}g19iWuE1ZBzdL{i|D>U(k2*|8J(R-+sudaynhucHbwAMTnor{mwqO^w7JHzaBsT
z{O^B8RYf5+LvDs&KmRKVd78=o{`1#HTiEo_OolaGleS)G+IQ#sUI`b*<ttPkoQ(BX
zdH(z-BO?RD#k&lb?f@B&-u_Q#y`y({1!HORg0(k0n@%tR-SPDK`}#L}kNztCZEmQ{
z)B=hyeE-bw{X3BEzCWGY&E{rcl9ShpD>pv<`1zCJ=H0jd{{2S>p`ri%{LsXJ%FbMS
z$#S`6f|?OG!^Jxczkf6Q`UNF{l0Sd`ad7zm>({^EzyAS6{{CgrkluOb3l1A>ZU2~A
zK+FZ=zkmP!`TOVhpFbzBzF<mgJlZ$!LUj7htJgj-ynFjAB?0L4|6jiYZ2)<O;r}yd
zr$cjg$jHr$OxbL1*Ua?e#~*QFwxu)O<=6CooI5XBFdeAs-_M^w$1wc=Z|$&LWbZyx
z#upb{59yi8GyMC*6cei&?XU5pqw<n{Y~wd`A)deg|1&UZN;7Io039Q%E))~L=CG!%
z=$tv3r|Yv5ZCRebeml)AZM~}fxupkx|M~vs@885Q)osT={QvXE{ra1g8}~B&`@4GU
lArU#j%I>aPmD2$N3;+$pK?>zdet`f0002ovPDHLkV1gy;I?Vt8

diff --git a/src/main/webapp/images/favicon.ico b/src/main/webapp/images/favicon.ico
deleted file mode 100755
index c2f2b6ccdaa425cbd4acdff6e32860723ca35c87..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1406
zcmeHEOHWfl7(JKUOABpjsqzp-K}A3W!TO@KmWzM|MMMWIRxhX_VL@Dpp)pEOo<^|Y
zSrmNKLIHz@L}UC3CbBY`7=sI<Aw)C;BvqPnom-<DmoD6JCiBgAzI^%S%o%{8ORGfy
z)f^B>vn0BuQXJh36f^?aOyKw{h@uGe%%Wq^169do=n}I~R6hvCr3tVvMAWnoLz7vK
zrO%(BZka@ARX?KW6vnlT=-3oo?Q#Qc?_g^kLRfksRJJxW3`{_oQw7nxfY1vgkd2Fw
z-=9Zq-xwk)+o9;5hE^7g^BtqWokg_tKg7ij7s?v%0gh?-7QTRMeg$=f1ESxHYtBc|
zrRIV2c%iJOJ<YEnch2D44SKipE9_k!U}6P!=VQoR-*BaO6so$XAdPO=uHOZQRuDWm
z2i%&1j%u%Ie}IPGVJy$j!si#kjjo`!a|HFb$HBC{fxPJ@#2-t*&G%p(9}r@H23?v3
zS|$iheQx;uez0RAg4{l!<t^&FU09l%0sBORvUL*n&LPzGcp&<`V4qWe9UtkeDTK2e
z!YZXVeGmK-1{T3ly{lMt;D0#4NZ^IsttS{hkV}+d^WrnJ|4?Cb8i@(Y-1e)$3q^Uv
zV9;lzNAps%U@oEbSi#Pc16H2W<CJQMI<<7YaZ55Im@SH8je*GWiGf(m!pVZHb%}a?
z;aas^uOXJ)4Z70&C|QK*h}N`^<WvSHha1adLQR`an>cN3{C*{qT&5#C4p)SwY*g9S
zP))p0W+Z#gB%LK0aREiVb(f9k_2g7YG=Ef*NDD?%Y&>{Kk{5t=Z$iR$>u)A??2e>b
JCH$-BKLHYvzV844

diff --git a/src/main/webapp/images/list.png b/src/main/webapp/images/list.png
deleted file mode 100755
index acc30b853b3740bad231e4daa8e9f5a81f3f757b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 473
zcmV;~0Ve*5P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzYe_^wR5;6}
zlfO!1Q4q#|xm-mEY`ZVuBcuo@Aw{@_n8FA)LTn@;R#rZNpv^7_Vr{vy*hmmeBdPKR
zmSSORrLj0?=Cio>x=~R!WME*<f%E;DIa86uEKyn8`?I^;tQ|d$Rh0mD<c_%^7cNI;
zxP;6wcYe%==iA$d{fl24Cuwb|c09LGO@1y+MO=Lz+c9vGj)Ri%<I~jAUxE^VR3;8K
z7pDf;KD;LfkOQ!D1E)<GjYdeq%y9Ql36NzO=9U9cOyRVdBiHNocTAI0nyft*0437a
zHJoKI91bxvVvKJpCe=uy)9K*mg$2)1&$1l3(P(_hI(hceLRqX|!rxUf7z~IpzRQma
zy4~(uKhhWikUy40tJV6Jxr`WMVWIG{a#5kbCi?w8Ap}AQ#25)7e40Y9*F&X(^73jO
zAferE|JOh8LQ(o~cYnU~J8ZZaZvQ%NC9{OwkQIC3PQiH&P?>cb6K0H8ItD70ARH|h
P00000NkvXXu0mjfzPQHT

diff --git a/src/main/webapp/images/resultset_first.png b/src/main/webapp/images/resultset_first.png
deleted file mode 100755
index b03eaf8b5416fa6878165d95116e73003f8445f5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 522
zcmV+l0`>igP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzoJmAMR5;7U
zQ#(jPQ5gPjnOErnVTBPAR5;WYF3}J<L=kO5wDf@1)@pSqqrtJ!rCOqhsA!9#tr~&~
zv8|y%M9Nq9o_FUQLNvNA4jnjf&j0^>ufs8f5Kzx*fI63}@)AAFXgQp7K#X5)&2^7g
z_9O9^7^ARqyc%qAP{1M7?|}io8xW>dotf=a%%ZSXBBI&Rf<-t`#(~H!2g~*8&15{#
zVXjXMwHZYVJ6lk!gb6?r$g;SuO>QI;y<Og=px*;b_6mqOhp1RF<r?4%VF*W`_X0k1
zX|TtHk0JqE*7HBWe=1O{NCJ3G19FIs4EME~J?%}9&J)O&DEL}jKrP~|K(S)QZZr6@
zXc1GUS#8X9KI+VWDX0P{Amv{`I!Bb(r<1$v(dFX@c-;mVpzH|{2s;C)gb|VKGAQX)
zyzYb|&#BzO&BG@&dm42<!e+G;Fdd+cS=sCR{^)G#F}r(vpVj&BS|O^0ZS@KgpmH#M
z9-i+UyWj-T1wp7YfMQLYy-A-^DytsMTu&|fLZ<}WuI0+Q@$bL!8}!lzjesmDrvLx|
M07*qoM6N<$f|&l~zyJUM

diff --git a/src/main/webapp/images/resultset_last.png b/src/main/webapp/images/resultset_last.png
deleted file mode 100755
index 8ec89478477aada6c95cac22920094dd12f399a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 524
zcmV+n0`vWeP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzo=HSOR5;7U
zlfP>eQ51#0H@Z6sk_ajqECPZEqLq!PMf5MQ5gS1i(Owi(ut_CY*w|Psf-Iy6=08Y`
zHnsuDs6h)+OwcBqopImX_v1c`5LkrSCWWWFUvW71z%eN$cB714YVYtd`}$X<%JbQ)
zM;;CHJDu;#-swg0iul07{S&4s!M><GxYzyhWEfhjoSGiv(&-6GNzE@<uberSo5Pds
zhqqpQd$z*|;t(HkUa72WHV_w3VESO2sr~J{m!Gb^1Sln8T|&H4N^I`nk59Ou^ljw$
zREtfU-#q{LLmLdW8>4O+`c|6_tW_i^y+I%|aPsIlEx5K=^ki~8LwqDy-)t}thx1D9
zB6|#ECQ%2a60OQQ<{6-)5|ok<pCCb=8{QUMtbFY+kT~>v)6E>1Xpv+@iIv@MJ8v15
zR{N~1_2z$e&R$WgNhIQelIl1rK}5XruIN#GDZA_4bJqcqID*^mXXFcgt1K5iK7HPL
zwLW*@#tu()#Cyd@CHc^75Ul6pYT4PCpSeBE)hh4bY><NT@A%ArU*lhrcKIamJ{)WS
O0000<MNUMnLSTaY5bkLJ

diff --git a/src/main/webapp/images/resultset_next.png b/src/main/webapp/images/resultset_next.png
deleted file mode 100755
index e252606d3e68c6da135a9b165996d9da968ef7fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 395
zcmV;60d)R}P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz9Z5t%R5;6H
z`2YVu10|S&>IO8de(|Ml<%@O-40!dwX61{2C5s-llVw2V@@N0oo_PPieZ!0Y2~+R(
zk!(QTf=B;X9DnzJ@u9c>OP4(U@7{849!UlyO@H`*;lVfmCvAW6f9CF&{}ZR*{jXDW
zb_vl21ozzrYJBy-Vb$aRjjJF3@7nm}zjw#A|58cE9uZ}LbIY~=6ShA8U$XeY|MDdd
zfQCH!?_7WRzhvaG%|sbsT7Kz&`}!yUix%Do#>T_{_Ei`DO9UTSBkH=Hg(w4*^UnUS
zTk-IJ<+2C=ZObqG7Z2FGlB7VCN;>(!bn*TFHYMl(i+Sx`L~=ArL>~EXU3lidsO!!J
pWF;gqzXSh89JkLNxXeT<1_12n>%V}Y6R`jQ002ovPDHLkV1iLCz99er

diff --git a/src/main/webapp/images/resultset_previous.png b/src/main/webapp/images/resultset_previous.png
deleted file mode 100755
index 18f9cc10948f025fde708328fa704b520161e5f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 389
zcmV;00eb$4P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz7fD1xR5;6H
z`2YVu10|S&E(T=Je%PKm^Whh=3`m`MzddRC!+((z?*1p)fP|@c`>K{b{Xc8(tN&i@
zH%T)fYQpV#rAr?FpSk<x|EW7){I{yPLc9UNy*HN>E_eXe+_wJd|K3f{{%aMTC(eL?
z&YO?2=RWv9b;pbUjjJF3FIss2fAiYM|D{t;5@&#8!?n%vQ}6um-u(1``H~0!(`ViJ
zU$yMvf616*#2KJfaGFIu@9Y|n)@%Q3RzCcnHskjH!iD$#iw7MbEf6JRj;ypTzwkeA
z{@wqXv+w*Db>B;RG>UocU1Xkp@_*9QTmMBIcK#<TAqiV<Szs7{<iD`x_WxujWkG`t
jvxSVe{2#c?gbxD%(2D2&kkL<{00000NkvXXu0mjfE_S?j

diff --git a/src/main/webapp/images/show.png b/src/main/webapp/images/show.png
deleted file mode 100755
index 2f193889f7ea091c292acdd684c595dcb206b5c4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 879
zcmV-#1CacQP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#0ZBwbR2Ufr
z!AoeIRTzNb_dDnRXC|3s(k4x4#Y?rsCTNRVuZyT4f|N*g-HnSbid7Jyh#+1zBDg5%
zq8ky4kl2Exq9H=O)W#wWl45E?r)}CKGn33@k|s?$m&}}VKA%Ta6@XVizW7#4CVA8d
zhkz6y00^K08gL=ZZLH~Uvblb8;`CqxKvWfg!=GQ8`0m|9{l>@+1&aazfGU7ezSm^v
zpACwO+tu0su66!(dT=`e05DeeCnCFJW(8|RKtKa{4LGONnx2<?+j;KMh|8hes-bWF
zrFTYmimLL_7hiWSFBR4-fj5pG=j^v%(R7~oKRtyHfreA+4bO|cDQ3!w)4=$@MSh={
z8@BniYRAs5?oT?qx}U!~HA(-0r@8dU82tyIU@kkuzWtAbSUgIsO?uMGo;J(DJxR__
z7W>V85A4m%PEQ?MEtR-esdM$pB-`H542D0)N2zSC6Imf)4L8?>%ZrW+H>xCKi$unm
zvGZq-*Q%Aahx;C*=l+K%-?>XB)6TB$-L$r*`RUvlA`xP1NG2?)ge8@TQ4EN|Jks0u
zcDg;oFC#-#R`YbWB`D?Q`1#y7l$LXhjSLf8AvQuB84}i#j0^!#g{VE#(K7h@5pFHy
zSenl=@XBEdxp`h2Ji>CR%=qXJ7!e|?paKet-~;#ok#jETyeB(5&Bkhp;!+;51~G=)
zH?L7xm<K=*L?JQ|fK&|LDW<Zu$zpzqdaXu2m!q<^#ohHgT+e1%T`96wE)rDn0Tc)d
z3dGjn8jdKxc>DUu_h+a$+xuWom;AWW!mS$%%+436Rjc@}y?l1134kgD0AOf$OmjOR
zstUlshZk$ZC!bAyIg{Y29z#&@3SJ;6D4+_eFume9^#TmMccC5u0J!ZCTnO6m$lnD|
z5JeFHf`Xs~1vP>RLKI1GKDY<~pjr2&bi(fX;6Nj-ss@Ds0CcoO0H{JsEQk<dD_h=$
zf~YD0&z$)6glp=XBJ!l7tpEThD4-|+C;;^k!jyrb{{i@rhcu{^lS}{r002ovPDHLk
FV1hpIi-`aL

diff --git a/src/main/webapp/images/springsource-logo.png b/src/main/webapp/images/springsource-logo.png
deleted file mode 100755
index e170f8abf778b24ed1de11dad6f1444e849269ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4974
zcmV-!6OrtRP)<h;3K|Lk000e1NJLTq005H!000mO0ssI2ouk?`00009a7bBm000XU
z000XU0RWnu7ytkYPiaF#P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag
z^g>IBfRsybQWXdwQbLP>6p<z>Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh<iVD~V
z<RPMtgQJLw%KPDaqifc@_vX$1wbwr9tn;0-&j-K=43<bUQ8j=JsX`tR;Dg7+#^K~H
zK!FM*Z~zbpvt%K2{UZSY_<lS*D<Z%Lz5oGu(+dayz)hRLFdT>f59&ghTmgWD0l;*T
zI7<kC6aYYajzXpYKt=(8otP$50H6c_V9R4-;{Z@C0AMG7=F<Rxo%or10RUT+Ar%3j
zkpLhQWr#!oXgdI`&sK^>09Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p
z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-<?i
z0%4j!F2Z@488U%158(66005wo6%pWr^Zj_v4zAA5HjcIqUoGmt2LB>rV&neh&#Q1i
z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_<lS*MWK+n+1cgf
z<k(8YLR(?VSAG6x!e78w{cQPuJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4G
zw+sLL9n&JjNn*KJDiq^U5^;`1nvC-@r6P$!k}1U{(*I=Q-z@tBKHoI}uxdU5dyy@u
zU1J0GOD7Ombim^G008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaR2~bL?kX$%CkSm
z2mk;?pn)o|K^yeJ7%adB9Ki+L!3+FgHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_v
zKpix|QD}yfa1JiQRk#j4a1Z)n2%f<xynzV>LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW
zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifq<Ex{*7`05XF7hP+2Hl!3BQJ=6@fL%FCo
z8iYoo3(#bAF`ADSpqtQgv>H8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X
zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ<AYmRsNLWl*PS{AOARHt#5!wki2?K;t
z!Y3k=s7tgax)J%r7-BLphge7~Bi0g+6E6^Zh(p9TBoc{3GAFr^0!gu?RMHaCM$&Fl
zBk3%un>0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4
z<uv66WtcKSRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_
zbh;7Ul^#x)&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#l
znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U
zt5vF<Q0r40Q)j6=sE4X&sBct1q<&fbi3VB2Ov6t@q*0);U*o*SAPZv|vv@2aYYnT0
zb%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5cP6_8Ir<e17iry6O
zDdH&`rZh~sF=bq9s+O0QSgS~@QL9Jmy*94xr=6y~MY~!1fet~(N+(<=M`w@D1)b+p
z*;C!83a1uLJv#NSE~;y#8=<>IcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya?
z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y
zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB
zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt
z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=
zKYhjYmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C
z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB
zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe
zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0
z?2xS?_ve_-k<Mujg;0Lz*3buG=3$G&ehepthlN*$KaOySSQ^nWmo<0M+(UEUMEXRQ
zMBbZcF;6+KElM>iKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$
z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4
z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu
zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX
z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&
z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01
z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R
z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw
zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD
zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3|
zawq-H%e&ckC+@AhPrP6BK<z=<L*0kfKU@CX*zeqbYQT4(^U>T#_XdT7&;F71j}Joy
zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z
zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr~8u`lav1h
z1DNytV>2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}
z000P?Nkl<Zc-rh)TWlL?6+ZT4ev*z`W=xrQ8OPfpu1&3h#@;sGZ4<UN8#$sfLaGE?
z34sJcV!6EVf_Ok%7D3^KrK?3;9#FfxQVL7kMMk2Qx~@<YwBA-pQw_E3jdxtfY3ylZ
zJBcT8#<7Qo6OD|MxDl7VNIeghJ^#6U=klNb{9}t@81RTb*kpiV0ZZFM>!Y}QU}<rs
z`l~;`{K}iJH=C9D%AX!(?!!T6-}vqRQ{FRweDSGIJ<&9pihA~)!V9eoUFNrPsa)6V
ztequ<ykBtDf~r+D(Jh)!<Xf`n78x6}a}5B%JNV9Q<x&{{I6JpPweMwc8qLNxUi{wq
zH+~0TdHu}g{lX`2-TlhidNE&mm2~ZWjQtYn+PjfCwV);@5?WP5$#5jRbC>?-nNthu
zzh!P(<{kV_GMBoOlBeamUIzf0&?irw?7%$r_7nhwMngM+^d1N2`@jFu`Afe6X3w5I
z_7Q)$vhrq0`$v~`w_!B$rB|0$r`^3j>>>NQu&!B-4M)NNkiL^{Ei^)i88uzkwW`*N
zTi5kUsnS~DYC)w5ZStrEb-VJ{s+v~S%vCIEUDvk@U*~$)bzPp8#eOj`7|?ZHz9n~-
zZOvJm7x>fkLcS$43=@uo2_dOFsaCZQ-Pzl9f(|?Wt~&eD#g}0>2LLPD(!GTOZ+~Eb
z0RR>Ywcf1O8)fDGOFrS3T>zjKRk2@0-=qNv04|)rz}OfpG|vG~U@$QG_N0<g>Uy2A
zF~OrjwV<YwDFCSJb(+wlk<oIgJbrB)&HE4g0U(`BYgLW0G15Vau`%&jobTn;q8dCJ
zRAv-S({x>DY|Ln6G%=n~G78G_z3t(+e(gG1kq%1fWLoGG0)qhnh+d3}{UQR^sv2Sg
z073{dTsVJ$CbTKb*|~Tu&f3{Zse)Fd0Vy7fn>?X#h!7Hw#myZS3Wv(&GT+N%aJ)V*
z0OWJ|sT)&TRig>*J>caXd^{F^_G`~#n$?1eYSCH$VZYf4gg(LR^Cl(|G@&b{3I?{#
z*=QnWXFtBUvfOAk*0rVcS6}=2*S}4uUo?%n1*~8+8qL*e?VtL(N}WD^TG#bVI+LHx
zFD)+Z`RE=(2-fe&i4g!u%1Oq?+@8FB<g-T(J#}c|{z4|5;q2VPgN5Pa!~Q{kHj||Z
zold4*`&=U@Mntz*Tdm!E>!$aBH#8d3s@m<z+k#8TWpjc{IQYcDx!fE8jGP#8d)@N1
zOi@%)PD%%*&}c~4_1bE!ty}seUuZN`Tdid?S<eAaI+^x;+NT!ObTS<r3SvxqdV2D+
z`D`YepUu}+Ypk86D9V&wUR=&)b5562$tZ4*TN;qi5bxlXjB@OmW5J<dE}J8S%%o;&
zwc2Q8G%y&Dr)AMCQWTZVWR;AfRkiM(Zi=E}(HI7&*=WksGHYiG_X=1*cuu2Q(Je{?
zQc_M5LPkD6A`M7{km<>3x5xeD(38A_zxmcplxn4)yz*1SN~w$Y4Z{G6lC$zxpLuTg
zu9byq!fGJ^Kv{RK8_S&Sh!p?=gMp#rLwqkkH#---7{#sabUDo}m`bK-LOWefLWtAl
z#FFGVj(6~c5QbsudYxgIbTXY7PpAbIYabJUpOsPt4e<_MEvlNP#jnK2<Kvhc)6kav
z5St9z<?LKtujg}lWkwPDgx2#f6b=QC204yPB~#IhQ3Q#yqFcn~jD`?)n|?x*x?Zo8
zD{X2qI6|K=H#--L#;^~gQy!lOyUvy!5)D;K6|rArYz!fUvvZYFWiB@tzY<4180uE~
z%zppM+A3wG005}2#rtz-|MKg{KlU9$aRxL2z<_ni(%nrtHf{w@moqRJ2uH$<jcHYf
z2hZjXwwZ=Q!~Vm5UDp#631vp<%*=6|G$2U>((v(NXP=WM^bQXU*3Jrjf-<AzXY*KF
zCJ{nJw-_7>MovcRdVO<Hc4CDl^yccp;6zSFu+#pR1Bl=f(DzU{#M;@m)h|E&#YVH?
z;CN`P0|0b0uUvg?Ro^4nPd1vX77JCY-|MEG-K5V70P!nv^s`c`VEe|C0|yqG&|aSx
zD_z(1d@jG`q?fvr65Zl(XqfNi@c_g8;b$vEp-)hYDq~}?*m(zUD#xRH^Yo$Xdg@LJ
z&l{)9IX63J7QQ(GT#sKz%-D_53sY9;6LvDtJNukUM!`LePp(9-U~tN%vR2htJImTx
zT*YY)z1R*v-^*jC#Z}hM;>5%|c&(~!h9vFtjrfl--MgUK+<1QiV1Xv{5idZ~fF^+P
z_}=F>ZUvgA#ba^PlIRwvZcHU65{Zcf&LfPC@f`3ZCK9a^N}EY}TAsQw#n>2K*N2Y}
zmrLbzGA&Qb$lnUl>+@<=EqXC(&e^P;#p#A7G{?11T)2dKFky*_gxD{(?G?4CnmWaP
z5qD&p>_f@p^JrCV{Mxu#oprr#28Xq?(tuPcRT2}4bTW;D5AWdlUVc0L{y~2{7Dr%0
zpAa}4n7lE0Y3vd*w-(>Vn-Pok?6-b);qRA!@P{9(_w!KGzWar5b`xu^blWf*&E~4-
zu@^Yz2mpX#7=~e#7D~nWVrij-KgZ6E&EB0Y&KHdqT3cH)8MdV2e6cuRTw7afeX<?%
z+S*zxbF1|>sxDVs^%UoeW9P=I%hk=C=!Lm7c5dw5ci!!QVM|n|(Xn%5D2o8v;I*mk
zfZvSFb{=g>f4gxNo+gp!Ppvl^50>LsW!FS{xVZRNlVRf>%I3QTA*AiTLI@%DP7P=C
z{ief>r%itcPR7Qx_Ge{A;d{5fn{W2Q?8!T%N~wYaJzfS-whh3RfIC}hTisG&8;u_N
z+~qTu?=2LqmU?k9>Tx{(3GNhS?J*fFTmDz@(3|i3NI1Lh<gLno;00d8akAg}E4Tk2
sEv-~{_w2G*ws^g4dGs&Ohm`&`0AF19UjV*Mq5uE@07*qoM6N<$f@3s&R{#J2

diff --git a/src/main/webapp/images/update.png b/src/main/webapp/images/update.png
deleted file mode 100755
index 046811ed7a6ef16be1a54bb860e1f22c6dacdacf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 807
zcmV+?1K9kDP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!xk*GpR2Ufr
z!B1$GbsPZj&+mDkce=Sb(GX{4jS{UGCL$d&@sNckLFa-xb@Ntq2%;`QL0vpd$~qW`
zhlrv&WJRE}Jj9yXYDhEtv)r7U(@poj@1E!P?ej?yVgDPaU+P}F>iHtsh1EzPArg^Q
zIZrOk#rNsfjaSbMAL;<4h;Z=jvu8dzyz8N&Nb7=z03ZUw?9z%8KQEa6yM5=kUnka&
z3?FJk2}L7q>na=T#;<7<DUpaw9a&X{<(1mLt$p?njM%t%yr*$ssCEA1BT{SX#S&6V
zy%EvqYBVGvkPBq$L?LNUe{SpIIo(4q=pWo^;m>U*P91x<gdjnIln4n#N{U4P@+oy(
zuzu^~<|lvGl{)&?ZqmD9OMeLvLD?WlA|<&FilldW#FkZ~`UjuZzIswuPx9B;gqwF#
z6z#bk1w;@iQ=v#nfku(6UOa6}e5?O~gIfQ6C^c_r_V(${^NwCWu(JE`XO{{HWTZrq
zk|HIoD_>fF`;`6%pVgWgRy0?1ZryL@%z52=-!fGXWGEn4M351<efeuWi$B`<$TK?A
z$27V^`__GCMn=u;8J0F|S7)GroI^wqOpl(_z3`KjyxG-@M`SIx=kGRiZo=Z;qf+mH
z)y<@?0u)eZ>L4<+7eDgwo|moqXT+s1&Kmn>-uQQ8mL7XY)w5Zk*(g+<3Y3tmkR!bL
zOUKaUtj_pX26sH+=Iorwu}MGd`_%O-_sS}8VpG#fJA)Fcs#ezwtZf?q<C^zB7`A)+
zpykawEIoPLqkZ>?Ac70mDv`rVs{$od?VPKeqf<-kUjNtS6ecB*mq<&M97K^6IVsDO
zt2$Ru!b+>2S<}_H>$RcInusU_8PMNdf(W{sNlJ3FkrwMJPeBPO#d}Y^a{9TH(#{Y)
l0D?dWAV4eUJX#h`!2gmISk&ZKd4B)^002ovPDHLkV1g&sd|Lnj

diff --git a/src/main/webapp/public/docs/css/reset.css b/src/main/webapp/public/docs/css/reset.css
deleted file mode 100644
index b2b078943..000000000
--- a/src/main/webapp/public/docs/css/reset.css
+++ /dev/null
@@ -1,125 +0,0 @@
-/* http://meyerweb.com/eric/tools/css/reset/ v2.0 | 20110126 */
-html,
-body,
-div,
-span,
-applet,
-object,
-iframe,
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-p,
-blockquote,
-pre,
-a,
-abbr,
-acronym,
-address,
-big,
-cite,
-code,
-del,
-dfn,
-em,
-img,
-ins,
-kbd,
-q,
-s,
-samp,
-small,
-strike,
-strong,
-sub,
-sup,
-tt,
-var,
-b,
-u,
-i,
-center,
-dl,
-dt,
-dd,
-ol,
-ul,
-li,
-fieldset,
-form,
-label,
-legend,
-table,
-caption,
-tbody,
-tfoot,
-thead,
-tr,
-th,
-td,
-article,
-aside,
-canvas,
-details,
-embed,
-figure,
-figcaption,
-footer,
-header,
-hgroup,
-menu,
-nav,
-output,
-ruby,
-section,
-summary,
-time,
-mark,
-audio,
-video {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  font-size: 100%;
-  font: inherit;
-  vertical-align: baseline;
-}
-/* HTML5 display-role reset for older browsers */
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-menu,
-nav,
-section {
-  display: block;
-}
-body {
-  line-height: 1;
-}
-ol,
-ul {
-  list-style: none;
-}
-blockquote,
-q {
-  quotes: none;
-}
-blockquote:before,
-blockquote:after,
-q:before,
-q:after {
-  content: '';
-  content: none;
-}
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
diff --git a/src/main/webapp/public/docs/css/screen.css b/src/main/webapp/public/docs/css/screen.css
deleted file mode 100644
index 478b99837..000000000
--- a/src/main/webapp/public/docs/css/screen.css
+++ /dev/null
@@ -1,1224 +0,0 @@
-/* Original style from softwaremaniacs.org (c) Ivan Sagalaev <Maniac@SoftwareManiacs.Org> */
-.swagger-section pre code {
-  display: block;
-  padding: 0.5em;
-  background: #F0F0F0;
-}
-.swagger-section pre code,
-.swagger-section pre .subst,
-.swagger-section pre .tag .title,
-.swagger-section pre .lisp .title,
-.swagger-section pre .clojure .built_in,
-.swagger-section pre .nginx .title {
-  color: black;
-}
-.swagger-section pre .string,
-.swagger-section pre .title,
-.swagger-section pre .constant,
-.swagger-section pre .parent,
-.swagger-section pre .tag .value,
-.swagger-section pre .rules .value,
-.swagger-section pre .rules .value .number,
-.swagger-section pre .preprocessor,
-.swagger-section pre .ruby .symbol,
-.swagger-section pre .ruby .symbol .string,
-.swagger-section pre .aggregate,
-.swagger-section pre .template_tag,
-.swagger-section pre .django .variable,
-.swagger-section pre .smalltalk .class,
-.swagger-section pre .addition,
-.swagger-section pre .flow,
-.swagger-section pre .stream,
-.swagger-section pre .bash .variable,
-.swagger-section pre .apache .tag,
-.swagger-section pre .apache .cbracket,
-.swagger-section pre .tex .command,
-.swagger-section pre .tex .special,
-.swagger-section pre .erlang_repl .function_or_atom,
-.swagger-section pre .markdown .header {
-  color: #800;
-}
-.swagger-section pre .comment,
-.swagger-section pre .annotation,
-.swagger-section pre .template_comment,
-.swagger-section pre .diff .header,
-.swagger-section pre .chunk,
-.swagger-section pre .markdown .blockquote {
-  color: #888;
-}
-.swagger-section pre .number,
-.swagger-section pre .date,
-.swagger-section pre .regexp,
-.swagger-section pre .literal,
-.swagger-section pre .smalltalk .symbol,
-.swagger-section pre .smalltalk .char,
-.swagger-section pre .go .constant,
-.swagger-section pre .change,
-.swagger-section pre .markdown .bullet,
-.swagger-section pre .markdown .link_url {
-  color: #080;
-}
-.swagger-section pre .label,
-.swagger-section pre .javadoc,
-.swagger-section pre .ruby .string,
-.swagger-section pre .decorator,
-.swagger-section pre .filter .argument,
-.swagger-section pre .localvars,
-.swagger-section pre .array,
-.swagger-section pre .attr_selector,
-.swagger-section pre .important,
-.swagger-section pre .pseudo,
-.swagger-section pre .pi,
-.swagger-section pre .doctype,
-.swagger-section pre .deletion,
-.swagger-section pre .envvar,
-.swagger-section pre .shebang,
-.swagger-section pre .apache .sqbracket,
-.swagger-section pre .nginx .built_in,
-.swagger-section pre .tex .formula,
-.swagger-section pre .erlang_repl .reserved,
-.swagger-section pre .prompt,
-.swagger-section pre .markdown .link_label,
-.swagger-section pre .vhdl .attribute,
-.swagger-section pre .clojure .attribute,
-.swagger-section pre .coffeescript .property {
-  color: #8888ff;
-}
-.swagger-section pre .keyword,
-.swagger-section pre .id,
-.swagger-section pre .phpdoc,
-.swagger-section pre .title,
-.swagger-section pre .built_in,
-.swagger-section pre .aggregate,
-.swagger-section pre .css .tag,
-.swagger-section pre .javadoctag,
-.swagger-section pre .phpdoc,
-.swagger-section pre .yardoctag,
-.swagger-section pre .smalltalk .class,
-.swagger-section pre .winutils,
-.swagger-section pre .bash .variable,
-.swagger-section pre .apache .tag,
-.swagger-section pre .go .typename,
-.swagger-section pre .tex .command,
-.swagger-section pre .markdown .strong,
-.swagger-section pre .request,
-.swagger-section pre .status {
-  font-weight: bold;
-}
-.swagger-section pre .markdown .emphasis {
-  font-style: italic;
-}
-.swagger-section pre .nginx .built_in {
-  font-weight: normal;
-}
-.swagger-section pre .coffeescript .javascript,
-.swagger-section pre .javascript .xml,
-.swagger-section pre .tex .formula,
-.swagger-section pre .xml .javascript,
-.swagger-section pre .xml .vbscript,
-.swagger-section pre .xml .css,
-.swagger-section pre .xml .cdata {
-  opacity: 0.5;
-}
-.swagger-section .swagger-ui-wrap {
-  line-height: 1;
-  font-family: "Droid Sans", sans-serif;
-  max-width: 960px;
-  margin-left: auto;
-  margin-right: auto;
-}
-.swagger-section .swagger-ui-wrap b,
-.swagger-section .swagger-ui-wrap strong {
-  font-family: "Droid Sans", sans-serif;
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap q,
-.swagger-section .swagger-ui-wrap blockquote {
-  quotes: none;
-}
-.swagger-section .swagger-ui-wrap p {
-  line-height: 1.4em;
-  padding: 0 0 10px;
-  color: #333333;
-}
-.swagger-section .swagger-ui-wrap q:before,
-.swagger-section .swagger-ui-wrap q:after,
-.swagger-section .swagger-ui-wrap blockquote:before,
-.swagger-section .swagger-ui-wrap blockquote:after {
-  content: none;
-}
-.swagger-section .swagger-ui-wrap .heading_with_menu h1,
-.swagger-section .swagger-ui-wrap .heading_with_menu h2,
-.swagger-section .swagger-ui-wrap .heading_with_menu h3,
-.swagger-section .swagger-ui-wrap .heading_with_menu h4,
-.swagger-section .swagger-ui-wrap .heading_with_menu h5,
-.swagger-section .swagger-ui-wrap .heading_with_menu h6 {
-  display: block;
-  clear: none;
-  float: left;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  box-sizing: border-box;
-  width: 60%;
-}
-.swagger-section .swagger-ui-wrap table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-.swagger-section .swagger-ui-wrap table thead tr th {
-  padding: 5px;
-  font-size: 0.9em;
-  color: #666666;
-  border-bottom: 1px solid #999999;
-}
-.swagger-section .swagger-ui-wrap table tbody tr:last-child td {
-  border-bottom: none;
-}
-.swagger-section .swagger-ui-wrap table tbody tr.offset {
-  background-color: #f0f0f0;
-}
-.swagger-section .swagger-ui-wrap table tbody tr td {
-  padding: 6px;
-  font-size: 0.9em;
-  border-bottom: 1px solid #cccccc;
-  vertical-align: top;
-  line-height: 1.3em;
-}
-.swagger-section .swagger-ui-wrap ol {
-  margin: 0px 0 10px;
-  padding: 0 0 0 18px;
-  list-style-type: decimal;
-}
-.swagger-section .swagger-ui-wrap ol li {
-  padding: 5px 0px;
-  font-size: 0.9em;
-  color: #333333;
-}
-.swagger-section .swagger-ui-wrap ol,
-.swagger-section .swagger-ui-wrap ul {
-  list-style: none;
-}
-.swagger-section .swagger-ui-wrap h1 a,
-.swagger-section .swagger-ui-wrap h2 a,
-.swagger-section .swagger-ui-wrap h3 a,
-.swagger-section .swagger-ui-wrap h4 a,
-.swagger-section .swagger-ui-wrap h5 a,
-.swagger-section .swagger-ui-wrap h6 a {
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap h1 a:hover,
-.swagger-section .swagger-ui-wrap h2 a:hover,
-.swagger-section .swagger-ui-wrap h3 a:hover,
-.swagger-section .swagger-ui-wrap h4 a:hover,
-.swagger-section .swagger-ui-wrap h5 a:hover,
-.swagger-section .swagger-ui-wrap h6 a:hover {
-  text-decoration: underline;
-}
-.swagger-section .swagger-ui-wrap h1 span.divider,
-.swagger-section .swagger-ui-wrap h2 span.divider,
-.swagger-section .swagger-ui-wrap h3 span.divider,
-.swagger-section .swagger-ui-wrap h4 span.divider,
-.swagger-section .swagger-ui-wrap h5 span.divider,
-.swagger-section .swagger-ui-wrap h6 span.divider {
-  color: #aaaaaa;
-}
-.swagger-section .swagger-ui-wrap a {
-  color: #547f00;
-}
-.swagger-section .swagger-ui-wrap a img {
-  border: none;
-}
-.swagger-section .swagger-ui-wrap article,
-.swagger-section .swagger-ui-wrap aside,
-.swagger-section .swagger-ui-wrap details,
-.swagger-section .swagger-ui-wrap figcaption,
-.swagger-section .swagger-ui-wrap figure,
-.swagger-section .swagger-ui-wrap footer,
-.swagger-section .swagger-ui-wrap header,
-.swagger-section .swagger-ui-wrap hgroup,
-.swagger-section .swagger-ui-wrap menu,
-.swagger-section .swagger-ui-wrap nav,
-.swagger-section .swagger-ui-wrap section,
-.swagger-section .swagger-ui-wrap summary {
-  display: block;
-}
-.swagger-section .swagger-ui-wrap pre {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  background-color: #fcf6db;
-  border: 1px solid #e5e0c6;
-  padding: 10px;
-}
-.swagger-section .swagger-ui-wrap pre code {
-  line-height: 1.6em;
-  background: none;
-}
-.swagger-section .swagger-ui-wrap .content > .content-type > div > label {
-  clear: both;
-  display: block;
-  color: #0F6AB4;
-  font-size: 1.1em;
-  margin: 0;
-  padding: 15px 0 5px;
-}
-.swagger-section .swagger-ui-wrap .content pre {
-  font-size: 12px;
-  margin-top: 5px;
-  padding: 5px;
-}
-.swagger-section .swagger-ui-wrap .icon-btn {
-  cursor: pointer;
-}
-.swagger-section .swagger-ui-wrap .info_title {
-  padding-bottom: 10px;
-  font-weight: bold;
-  font-size: 25px;
-}
-.swagger-section .swagger-ui-wrap p.big,
-.swagger-section .swagger-ui-wrap div.big p {
-  font-size: 1em;
-  margin-bottom: 10px;
-}
-.swagger-section .swagger-ui-wrap form.fullwidth ol li.string input,
-.swagger-section .swagger-ui-wrap form.fullwidth ol li.url input,
-.swagger-section .swagger-ui-wrap form.fullwidth ol li.text textarea,
-.swagger-section .swagger-ui-wrap form.fullwidth ol li.numeric input {
-  width: 500px !important;
-}
-.swagger-section .swagger-ui-wrap .info_license {
-  padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .info_tos {
-  padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .message-fail {
-  color: #cc0000;
-}
-.swagger-section .swagger-ui-wrap .info_contact {
-  padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .info_description {
-  padding-bottom: 10px;
-  font-size: 15px;
-}
-.swagger-section .swagger-ui-wrap .markdown ol li,
-.swagger-section .swagger-ui-wrap .markdown ul li {
-  padding: 3px 0px;
-  line-height: 1.4em;
-  color: #333333;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.string input,
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.url input,
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.numeric input {
-  display: block;
-  padding: 4px;
-  width: auto;
-  clear: both;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.string input.title,
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.url input.title,
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.numeric input.title {
-  font-size: 1.3em;
-}
-.swagger-section .swagger-ui-wrap table.fullwidth {
-  width: 100%;
-}
-.swagger-section .swagger-ui-wrap .model-signature {
-  font-family: "Droid Sans", sans-serif;
-  font-size: 1em;
-  line-height: 1.5em;
-}
-.swagger-section .swagger-ui-wrap .model-signature .signature-nav a {
-  text-decoration: none;
-  color: #AAA;
-}
-.swagger-section .swagger-ui-wrap .model-signature .signature-nav a:hover {
-  text-decoration: underline;
-  color: black;
-}
-.swagger-section .swagger-ui-wrap .model-signature .signature-nav .selected {
-  color: black;
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap .model-signature .propType {
-  color: #5555aa;
-}
-.swagger-section .swagger-ui-wrap .model-signature pre:hover {
-  background-color: #ffffdd;
-}
-.swagger-section .swagger-ui-wrap .model-signature pre {
-  font-size: .85em;
-  line-height: 1.2em;
-  overflow: auto;
-  max-height: 200px;
-  cursor: pointer;
-}
-.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav {
-  display: block;
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav li:last-child {
-  padding-right: 0;
-  border-right: none;
-}
-.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav li {
-  float: left;
-  margin: 0 5px 5px 0;
-  padding: 2px 5px 2px 0;
-  border-right: 1px solid #ddd;
-}
-.swagger-section .swagger-ui-wrap .model-signature .propOpt {
-  color: #555;
-}
-.swagger-section .swagger-ui-wrap .model-signature .snippet small {
-  font-size: 0.75em;
-}
-.swagger-section .swagger-ui-wrap .model-signature .propOptKey {
-  font-style: italic;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .strong {
-  font-weight: bold;
-  color: #000;
-  font-size: .9em;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description div {
-  font-size: 0.9em;
-  line-height: 1.5em;
-  margin-left: 1em;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .stronger {
-  font-weight: bold;
-  color: #000;
-}
-.swagger-section .swagger-ui-wrap .model-signature .propName {
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap .model-signature .signature-container {
-  clear: both;
-}
-.swagger-section .swagger-ui-wrap .body-textarea {
-  width: 300px;
-  height: 100px;
-  border: 1px solid #aaa;
-}
-.swagger-section .swagger-ui-wrap .markdown p code,
-.swagger-section .swagger-ui-wrap .markdown li code {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  background-color: #f0f0f0;
-  color: black;
-  padding: 1px 3px;
-}
-.swagger-section .swagger-ui-wrap .required {
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap input.parameter {
-  width: 300px;
-  border: 1px solid #aaa;
-}
-.swagger-section .swagger-ui-wrap h1 {
-  color: black;
-  font-size: 1.5em;
-  line-height: 1.3em;
-  padding: 10px 0 10px 0;
-  font-family: "Droid Sans", sans-serif;
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap .heading_with_menu {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-}
-.swagger-section .swagger-ui-wrap .heading_with_menu ul {
-  display: block;
-  clear: none;
-  float: right;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  box-sizing: border-box;
-  margin-top: 10px;
-}
-.swagger-section .swagger-ui-wrap h2 {
-  color: black;
-  font-size: 1.3em;
-  padding: 10px 0 10px 0;
-}
-.swagger-section .swagger-ui-wrap h2 a {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap h2 span.sub {
-  font-size: 0.7em;
-  color: #999999;
-  font-style: italic;
-}
-.swagger-section .swagger-ui-wrap h2 span.sub a {
-  color: #777777;
-}
-.swagger-section .swagger-ui-wrap span.weak {
-  color: #666666;
-}
-.swagger-section .swagger-ui-wrap .message-success {
-  color: #89BF04;
-}
-.swagger-section .swagger-ui-wrap caption,
-.swagger-section .swagger-ui-wrap th,
-.swagger-section .swagger-ui-wrap td {
-  text-align: left;
-  font-weight: normal;
-  vertical-align: middle;
-}
-.swagger-section .swagger-ui-wrap .code {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.text textarea {
-  font-family: "Droid Sans", sans-serif;
-  height: 250px;
-  padding: 4px;
-  display: block;
-  clear: both;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.select select {
-  display: block;
-  clear: both;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean label {
-  display: block;
-  float: left;
-  clear: none;
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean input {
-  display: block;
-  float: left;
-  clear: none;
-  margin: 0 5px 0 0;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.required label {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li label {
-  display: block;
-  clear: both;
-  width: auto;
-  padding: 0 0 3px;
-  color: #666666;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li label abbr {
-  padding-left: 3px;
-  color: #888888;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li p.inline-hints {
-  margin-left: 0;
-  font-style: italic;
-  font-size: 0.9em;
-  margin: 0;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.buttons {
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap span.blank,
-.swagger-section .swagger-ui-wrap span.empty {
-  color: #888888;
-  font-style: italic;
-}
-.swagger-section .swagger-ui-wrap .markdown h3 {
-  color: #547f00;
-}
-.swagger-section .swagger-ui-wrap .markdown h4 {
-  color: #666666;
-}
-.swagger-section .swagger-ui-wrap .markdown pre {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  background-color: #fcf6db;
-  border: 1px solid #e5e0c6;
-  padding: 10px;
-  margin: 0 0 10px 0;
-}
-.swagger-section .swagger-ui-wrap .markdown pre code {
-  line-height: 1.6em;
-}
-.swagger-section .swagger-ui-wrap div.gist {
-  margin: 20px 0 25px 0 !important;
-}
-.swagger-section .swagger-ui-wrap ul#resources {
-  font-family: "Droid Sans", sans-serif;
-  font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource {
-  border-bottom: 1px solid #dddddd;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource:hover div.heading h2 a,
-.swagger-section .swagger-ui-wrap ul#resources li.resource.active div.heading h2 a {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource:hover div.heading ul.options li a,
-.swagger-section .swagger-ui-wrap ul#resources li.resource.active div.heading ul.options li a {
-  color: #555555;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource:last-child {
-  border-bottom: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading {
-  border: 1px solid transparent;
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options {
-  overflow: hidden;
-  padding: 0;
-  display: block;
-  clear: none;
-  float: right;
-  margin: 14px 10px 0 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li {
-  float: left;
-  clear: none;
-  margin: 0;
-  padding: 2px 10px;
-  border-right: 1px solid #dddddd;
-  color: #666666;
-  font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a {
-  color: #aaaaaa;
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:hover {
-  text-decoration: underline;
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:hover,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:active,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a.active {
-  text-decoration: underline;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li:first-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li.first {
-  padding-left: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li.last {
-  padding-right: 0;
-  border-right: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options:first-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options.first {
-  padding-left: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 {
-  color: #999999;
-  padding-left: 0;
-  display: block;
-  clear: none;
-  float: left;
-  font-family: "Droid Sans", sans-serif;
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a {
-  color: #999999;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a:hover {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-  margin: 0 0 10px;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 {
-  display: block;
-  clear: none;
-  float: left;
-  width: auto;
-  margin: 0;
-  padding: 0;
-  line-height: 1.1em;
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path {
-  padding-left: 10px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path a {
-  color: black;
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path a:hover {
-  text-decoration: underline;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.http_method a {
-  text-transform: uppercase;
-  text-decoration: none;
-  color: white;
-  display: inline-block;
-  width: 50px;
-  font-size: 0.7em;
-  text-align: center;
-  padding: 7px 0 4px;
-  -moz-border-radius: 2px;
-  -webkit-border-radius: 2px;
-  -o-border-radius: 2px;
-  -ms-border-radius: 2px;
-  -khtml-border-radius: 2px;
-  border-radius: 2px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span {
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options {
-  overflow: hidden;
-  padding: 0;
-  display: block;
-  clear: none;
-  float: right;
-  margin: 6px 10px 0 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li {
-  float: left;
-  clear: none;
-  margin: 0;
-  padding: 2px 10px;
-  font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li a {
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li.access {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content {
-  border-top: none;
-  padding: 10px;
-  -moz-border-radius-bottomleft: 6px;
-  -webkit-border-bottom-left-radius: 6px;
-  -o-border-bottom-left-radius: 6px;
-  -ms-border-bottom-left-radius: 6px;
-  -khtml-border-bottom-left-radius: 6px;
-  border-bottom-left-radius: 6px;
-  -moz-border-radius-bottomright: 6px;
-  -webkit-border-bottom-right-radius: 6px;
-  -o-border-bottom-right-radius: 6px;
-  -ms-border-bottom-right-radius: 6px;
-  -khtml-border-bottom-right-radius: 6px;
-  border-bottom-right-radius: 6px;
-  margin: 0 0 20px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content h4 {
-  font-size: 1.1em;
-  margin: 0;
-  padding: 15px 0 5px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header a {
-  padding: 4px 0 0 10px;
-  display: inline-block;
-  font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header input.submit {
-  display: block;
-  clear: none;
-  float: left;
-  padding: 6px 8px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header span.response_throbber {
-  background-image: url('../images/throbber.gif');
-  width: 128px;
-  height: 16px;
-  display: block;
-  clear: none;
-  float: right;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form input[type='text'].error {
-  outline: 2px solid black;
-  outline-color: #cc0000;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  padding: 10px;
-  font-size: 0.9em;
-  max-height: 400px;
-  overflow-y: auto;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading {
-  background-color: #f9f2e9;
-  border: 1px solid #f0e0ca;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading h3 span.http_method a {
-  background-color: #c5862b;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #f0e0ca;
-  color: #c5862b;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li a {
-  color: #c5862b;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content {
-  background-color: #faf5ee;
-  border: 1px solid #f0e0ca;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content h4 {
-  color: #c5862b;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content div.sandbox_header a {
-  color: #dcb67f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading {
-  background-color: #fcffcd;
-  border: 1px solid black;
-  border-color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading h3 span.http_method a {
-  text-transform: uppercase;
-  background-color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #ffd20f;
-  color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li a {
-  color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content {
-  background-color: #fcffcd;
-  border: 1px solid black;
-  border-color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content h4 {
-  color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content div.sandbox_header a {
-  color: #6fc992;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading {
-  background-color: #f5e8e8;
-  border: 1px solid #e8c6c7;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading h3 span.http_method a {
-  text-transform: uppercase;
-  background-color: #a41e22;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #e8c6c7;
-  color: #a41e22;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li a {
-  color: #a41e22;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content {
-  background-color: #f7eded;
-  border: 1px solid #e8c6c7;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content h4 {
-  color: #a41e22;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content div.sandbox_header a {
-  color: #c8787a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading {
-  background-color: #e7f6ec;
-  border: 1px solid #c3e8d1;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading h3 span.http_method a {
-  background-color: #10a54a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #c3e8d1;
-  color: #10a54a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li a {
-  color: #10a54a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content {
-  background-color: #ebf7f0;
-  border: 1px solid #c3e8d1;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content h4 {
-  color: #10a54a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content div.sandbox_header a {
-  color: #6fc992;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading {
-  background-color: #FCE9E3;
-  border: 1px solid #F5D5C3;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading h3 span.http_method a {
-  background-color: #D38042;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #f0cecb;
-  color: #D38042;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li a {
-  color: #D38042;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content {
-  background-color: #faf0ef;
-  border: 1px solid #f0cecb;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content h4 {
-  color: #D38042;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content div.sandbox_header a {
-  color: #dcb67f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading {
-  background-color: #e7f0f7;
-  border: 1px solid #c3d9ec;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading h3 span.http_method a {
-  background-color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #c3d9ec;
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li a {
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content {
-  background-color: #ebf3f9;
-  border: 1px solid #c3d9ec;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content h4 {
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content div.sandbox_header a {
-  color: #6fa5d2;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading {
-  background-color: #e7f0f7;
-  border: 1px solid #c3d9ec;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading h3 span.http_method a {
-  background-color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #c3d9ec;
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading ul.options li a {
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content {
-  background-color: #ebf3f9;
-  border: 1px solid #c3d9ec;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content h4 {
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content div.sandbox_header a {
-  color: #6fa5d2;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content {
-  border-top: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li.last {
-  padding-right: 0;
-  border-right: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a:hover,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a:active,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a.active {
-  text-decoration: underline;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li:first-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li.first {
-  padding-left: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations:first-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations.first {
-  padding-left: 0;
-}
-.swagger-section .swagger-ui-wrap p#colophon {
-  margin: 0 15px 40px 15px;
-  padding: 10px 0;
-  font-size: 0.8em;
-  border-top: 1px solid #dddddd;
-  font-family: "Droid Sans", sans-serif;
-  color: #999999;
-  font-style: italic;
-}
-.swagger-section .swagger-ui-wrap p#colophon a {
-  text-decoration: none;
-  color: #547f00;
-}
-.swagger-section .swagger-ui-wrap h3 {
-  color: black;
-  font-size: 1.1em;
-  padding: 10px 0 10px 0;
-}
-.swagger-section .swagger-ui-wrap .markdown ol,
-.swagger-section .swagger-ui-wrap .markdown ul {
-  font-family: "Droid Sans", sans-serif;
-  margin: 5px 0 10px;
-  padding: 0 0 0 18px;
-  list-style-type: disc;
-}
-.swagger-section .swagger-ui-wrap form.form_box {
-  background-color: #ebf3f9;
-  border: 1px solid #c3d9ec;
-  padding: 10px;
-}
-.swagger-section .swagger-ui-wrap form.form_box label {
-  color: #0f6ab4 !important;
-}
-.swagger-section .swagger-ui-wrap form.form_box input[type=submit] {
-  display: block;
-  padding: 10px;
-}
-.swagger-section .swagger-ui-wrap form.form_box p.weak {
-  font-size: 0.8em;
-}
-.swagger-section .swagger-ui-wrap form.form_box p {
-  font-size: 0.9em;
-  padding: 0 0 15px;
-  color: #7e7b6d;
-}
-.swagger-section .swagger-ui-wrap form.form_box p a {
-  color: #646257;
-}
-.swagger-section .swagger-ui-wrap form.form_box p strong {
-  color: black;
-}
-.swagger-section .title {
-  font-style: bold;
-}
-.swagger-section .secondary_form {
-  display: none;
-}
-.swagger-section .main_image {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-.swagger-section .oauth_body {
-  margin-left: 100px;
-  margin-right: 100px;
-}
-.swagger-section .oauth_submit {
-  text-align: center;
-}
-.swagger-section .api-popup-dialog {
-  z-index: 10000;
-  position: absolute;
-  width: 500px;
-  background: #FFF;
-  padding: 20px;
-  border: 1px solid #ccc;
-  border-radius: 5px;
-  display: none;
-  font-size: 13px;
-  color: #777;
-}
-.swagger-section .api-popup-dialog .api-popup-title {
-  font-size: 24px;
-  padding: 10px 0;
-}
-.swagger-section .api-popup-dialog .api-popup-title {
-  font-size: 24px;
-  padding: 10px 0;
-}
-.swagger-section .api-popup-dialog p.error-msg {
-  padding-left: 5px;
-  padding-bottom: 5px;
-}
-.swagger-section .api-popup-dialog button.api-popup-authbtn {
-  height: 30px;
-}
-.swagger-section .api-popup-dialog button.api-popup-cancel {
-  height: 30px;
-}
-.swagger-section .api-popup-scopes {
-  padding: 10px 20px;
-}
-.swagger-section .api-popup-scopes li {
-  padding: 5px 0;
-  line-height: 20px;
-}
-.swagger-section .api-popup-scopes .api-scope-desc {
-  padding-left: 20px;
-  font-style: italic;
-}
-.swagger-section .api-popup-scopes li input {
-  position: relative;
-  top: 2px;
-}
-.swagger-section .api-popup-actions {
-  padding-top: 10px;
-}
-.swagger-section .access {
-  float: right;
-}
-.swagger-section .auth {
-  float: right;
-}
-.swagger-section #api_information_panel {
-  position: absolute;
-  background: #FFF;
-  border: 1px solid #ccc;
-  border-radius: 5px;
-  display: none;
-  font-size: 13px;
-  max-width: 300px;
-  line-height: 30px;
-  color: black;
-  padding: 5px;
-}
-.swagger-section #api_information_panel p .api-msg-enabled {
-  color: green;
-}
-.swagger-section #api_information_panel p .api-msg-disabled {
-  color: red;
-}
-.swagger-section .api-ic {
-  height: 18px;
-  vertical-align: middle;
-  display: inline-block;
-  background: url(../images/explorer_icons.png) no-repeat;
-}
-.swagger-section .ic-info {
-  background-position: 0 0;
-  width: 18px;
-  margin-top: -7px;
-  margin-left: 4px;
-}
-.swagger-section .ic-warning {
-  background-position: -60px 0;
-  width: 18px;
-  margin-top: -7px;
-  margin-left: 4px;
-}
-.swagger-section .ic-error {
-  background-position: -30px 0;
-  width: 18px;
-  margin-top: -7px;
-  margin-left: 4px;
-}
-.swagger-section .ic-off {
-  background-position: -90px 0;
-  width: 58px;
-  margin-top: -4px;
-  cursor: pointer;
-}
-.swagger-section .ic-on {
-  background-position: -160px 0;
-  width: 58px;
-  margin-top: -4px;
-  cursor: pointer;
-}
-.swagger-section #header {
-  background-color: #89bf04;
-  padding: 14px;
-}
-.swagger-section #header a#logo {
-  font-size: 1.5em;
-  font-weight: bold;
-  text-decoration: none;
-  background: transparent url(../images/logo_small.png) no-repeat left center;
-  padding: 20px 0 20px 40px;
-  color: white;
-}
-.swagger-section #header form#api_selector {
-  display: block;
-  clear: none;
-  float: right;
-}
-.swagger-section #header form#api_selector .input {
-  display: block;
-  clear: none;
-  float: left;
-  margin: 0 10px 0 0;
-}
-.swagger-section #header form#api_selector .input input#input_apiKey {
-  width: 200px;
-}
-.swagger-section #header form#api_selector .input input#input_baseUrl {
-  width: 400px;
-}
-.swagger-section #header form#api_selector .input a#explore {
-  display: block;
-  text-decoration: none;
-  font-weight: bold;
-  padding: 6px 8px;
-  font-size: 0.9em;
-  color: white;
-  background-color: #547f00;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  -o-border-radius: 4px;
-  -ms-border-radius: 4px;
-  -khtml-border-radius: 4px;
-  border-radius: 4px;
-}
-.swagger-section #header form#api_selector .input a#explore:hover {
-  background-color: #547f00;
-}
-.swagger-section #header form#api_selector .input input {
-  font-size: 0.9em;
-  padding: 3px;
-  margin: 0;
-}
-.swagger-section #content_message {
-  margin: 10px 15px;
-  font-style: italic;
-  color: #999999;
-}
-.swagger-section #message-bar {
-  min-height: 30px;
-  text-align: center;
-  padding-top: 10px;
-}
diff --git a/src/main/webapp/public/docs/images/explorer_icons.png b/src/main/webapp/public/docs/images/explorer_icons.png
deleted file mode 100644
index ed9d2fffb64a2e6e282b90e489d83fc4ddfac3cd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5763
zcmZ{mbyU<(_s2g-OG-&gcc*kqH^>44l1sRf(jbV^A<_-v(jAL*ch?e2h)bu^&BOEk
zo%4PE`u#EQxpQV-XJ+oXbLU3rXer}8rF;qi0G_Ifq8<RCa6Q@rSQwAG3E$*+?66%_
zjNJhMhxoq@1xU{%2Y{#A4hjl7I`+;U&hGZkE_A923Un@R&UOy(YyrS~F-sq8pua;V
zb+K|PuO1$hsP3#sibba<9~DFr&%!~EO{f-5pSM7&+xbjM35{wXHykxKHYl1@mkT%Y
z={)8-{rA|A{P4)3n>D|DCwR-n=IDL>ob*=NNmlJRW(O8-vWlRta1d^>JngezA^kml
zYwJ9+!B3f7079%<8+!LUMik&OP*ReUp#!rGK=Gc&!2&uoGdlRF!yX8B<<s7v1bs&7
z@Q8n@juk`#$oj_07XY%aP=c~jS@eNiG~n&9wG|T3;RfEae%zb}g0e2t{7?YXM0!$`
z+<1VF*fv}du$KVJ#$QJ&0U$nr#7@0O44CHz_*9MTRDh}mpks^>rv|{n1^9Hszpw*n
ze!$xSMn-Soa~eSM>exu~FJ}ee)}wE|(`qCenZ%TWO|iILF^!CPXxYY8pL3FkSU#~#
zm*wg5Nuv-579#j{G6Dd(@uZKpJ-PE9!><?{6N!c4TX65TV>~ceSt0K?#!Fpf0btD|
zaPppux0W(U0wV}=|DE{|&E6a*_rpb$T@8V3J&?PzXmsN8U*9O@eQjJ=*jQhmSL=~C
zwHz`ExCeJxbQs;ey9$)Ny*T^T_M0hKz${o9?ebUG$f*XDdi)#qXRD>nIOW?0oQGSQ
zX@(wEt40t92~wBHHC8b_`a}TA5F!7Ky_b3F!RGfW*A1%lsxVOHD2?J5&s}6@je4%m
zN(l1k_<aEY$IZ^2Gi+F>LG~eQ<6aL(GIz?k%s`Nx>Ni&aFjr*aF&L_q>Bj;9#oS<y
zDmkjtPI9ge4C+qwrB0mNw<4eAnR>e93FV*K1W~)aWiR_A&lWmbMZ@uycSe>*s6*F2
zG{FU*r_1mszLX2WwIx<|CtFJ}Hk#Z37O^G$VmOLbB#1E<>v`IjOZrX~G@>Xby1{S~
zT?X}dVHJM8NCP@U6`Eryw<ls@Z(cRUOAG)4pKe22l=%~bYjmY%aO)Ksi$p0uzxs|d
zVdKG{9!Hj&G2vE6DHSb}w>42}Pp}v#t<cZcu}zLC*z=B$r>|SS`Xv{3g7t7ULm6&q
zA7$0+GSudXGwbncFEpZHr4DQnG%tBNOIkS<kOoL=UZseRnn~!{BDN?t>Sx_9R)&Nk
z^*WZOXIDMsRs#HCAQdh~I8huiFQH$!LXRjDQG|j3Yvb1^s?|RXrii9qO}*D++~F$D
z5K^IJOc-3WajL--OXQ;C9Qd-HwcfohxK6cBe{A|R%SzVu$EE&nHoYN7HHr<w4WSJT
z+f)HL!~Ar;<)S=;XTotN^5uCjy-MA%B4VKr>0+ZHWUA`W^6yF0l=jc<FB~ejJ(`{^
zC(&x9Oc+fK?<jAlY@?of;o^mohV+Mn*(fr|G0DLcUgVXj8U+;7Q55|Ke4_k&sat6T
zY0icq4j6|&Y5dUBB()@#Bq|PGgW{5cl9du1!xO_{gScXI{eX&BhJyOYV(gjZQp1ug
zojrXjeQ>cvQCJDM$k{;VN1*Xt1cq_9Mz^-Y58d2q3uH?l9ga0ctv46F6JBZPhhX6z
zmg><3e@~9))H|ByD5;X-JTV19H9@0Vy^};c8BAoV>t&{g7WNifVaiEh<O<0V`)_ut
z0wIk?e%m)rCCMqtpi-4m-BRVfR*{N>!mNT;rDo%sV0^iLHP$z*%HX&$^sFuY1^wm1
zr-fviQsQS7JS9$0s=Q`JulDzahpE|Z=0VvS&V?&Jty|aB0laqxcaZDCGi6*5MlCKA
z1_F1CT(Vc#)mf5;w;%CWSHY}XRsm|6WSO$|IlggHGJp0}%qxOuhrTyRCM2W}(wEPI
z!9vfXuDPpun69VUSioK&p&_BsKRPn{eH5N1oFT<OC$N>Vl`)sG+VIxI+k^{N1p8^L
zTC;9aV0;K`dH=;k%oqwXG%>4vRi0JO3~w%PE__zlsFk2qnhghcSN(+z!ipOxsy5~^
z5EU>8EWi?M^&H&LThV=((3%j?6cBSKg^3rofL}^uLKEm-=SCv_T6`saEb~w%p!YO+
zhZhVQCmf#_M8b%N*?Sza^fRWF!Oy{s?ja}PQ4#8&hIvw?c`~T_mIqqb)jZBz&DMOU
z&ayIUGrA6n5S51_hYp8fOF1J#IqccSg6<RD0}8)%Hzs9pa+3I*R?7ml6|{rF^;?X*
z*1YjX<#SaHP_L2;%cJMg=hALDNNJ>`=!(FKvBijJN5eqFuy(g|w#AoKg^!F6HV?iJ
zlR#k*GYS|rB3Lfi^vTVouRncztc*Cq_Pl1{KrTABQI1qD?o;`vjm~m<`+@zh<@6U@
zsbleD4)|Ym0=MB4n3kKCQQd*KtY5;u7=_Bjx`cx$C;3x^y(X6w+*cK^6_XWLGQj-W
zVwK!#!W_~iJdTo!qD?|gGJQOD#v`+!ERgCub!ssljtY_Y@7h*x4^F~<XZ^-O`aMtO
z9WZn8$s6lB{ZdF)%tOQ_o-C^ouJtnUj~pRK5m_|zF|ikO>{FjEnl3N{@1)3N_`Jd!
z4qB~a6%I|`Z~O5r!ahvBf>5rF#?P$9Ut2WrG?p{Ov&qsu=^z49;;sB4-{QZz%9qe<
zCcwbE;7vQv;WFDVHTS*mqZ)W=lQ0LJYQL7D8*@K}$ro%Jn6S-pVAg<bjqKV-BZkD1
zOS3sg4@PQ-5MM<zk8&Okh`NZ@zQLfO>PFl&pv~4YN3j}7S0BVvBq=&)=xdBJ$)Axh
z4#=!_>48y7MPMt7uclM5dFRll&UzH5JsiWQ8(#wUmgWx3v_ZVatM!)Gp;=VYq!E!7
zB#7rJq#x(mmb^Ep!kmZN)0PtJic5PMZN}}U>~=O+xU)_1lS@)IQ}Ey8EiBgIt-h{1
zI6GHD@TQEiA(}&A3XS>gl0RE)3kSzWC1ebK7@Qhh8;BfEE!SJlUA~_@r1EPy7uugi
zn6_NpNe{Lm3{ea<XYFQfZ&Yt;FJvkrN_H-jZy;vnS`gQRe$*+{J4{A=*j(exEX|aZ
zfnFS(b59w+|3%w<){z%Co(P^{OlIG2Mi)h&^_>gs)eBlY@kP&Qzp^#V=@*_fU>aUW
z`Sj!TR~h>0H>OsmP1+;UlknXY-&<wG3xZ4`Nn;<i6N5pA#hp*n3E<=L=&YoyfIyzB
zrMHOhFuyJ9u~kO`=c6V<kF_bKho~)y7KyPp$3H!eYY-d6Mn8?xE5$7!yB@oe_X*S5
z{mq%p=@pG{oEi^(TkHMoE_SH0MaPy;TYdhLJ-}zP#iW*7Pkfy(dN0ma$(94%SntM$
zn-{!T56fG$TP#jx59AgUmcwRcOz)TGkCr|<c6jBUOfD&3V0;M~zmGqQBTzt(ON$#0
z#S7ibekm;`_FKm7Zs)d8Vcce%CHwjP_xs_B=VZKrm$Q3wW0R?qc`3&!3GEPn=-qC|
z9z`Xhud9!?ZO~hg-~9CT%|WNvk{8WU{wjg?x<B1Vwg>yG>NEX`!kYw&goFn))YOw(
zYe8<rW4%ddt)iz10KUus5EKFcR}YW<4gh@M1AyJP03e<U0MDJjS@gbotVb(U73B=P
z7xyzEE(Ws{{U5gu)oXlEm?A}Fq4f+ZC2|q+s0)9HxW0xL=+#YkMweeg%QX%_)Z*xN
ziXJ9~zcC%sicxU|hql?|gFL+{zR7Z9d{cQ=z@{>xr-L1DQ>%Ku;&*L1$jsDC@8?B7
z?-MBKHNU^m`rvoixYa&>vgEGYW4WTIsZZ%(FNoTWaJa%cx{9em2ADf(GO$6d+CF-(
zWZ5)q{&46X;Nuc+l_niquGuQt+wDFH8WWnJ$dzzlEn|77npQ!FH8|~buJuu_klohE
z9`q!7A8wO>CjPc}9e@1q#;~DUOuj2TQK&rnsns?I2+Y}PHS>8F>FDE#r~V>4Bh=O?
z_moH{<-({M-?aQ!#ovBI0?X&2&{e-9De3ENMuvD5y^w<XJ{TlXZ%jmIeRES!M@Kd=
zFmPnAxZTXr-aZ!wOP(&&CIDH~!N=^#UrlYzZk_PIUwXMYmX$Hm_{@qj8Lr_s$zxDO
zta5ate*FP)%(ZkUVax19O=+L0ZxH_4Xa@bRss9fTwQ-|_j~N~{2dCmBuh~1Yl3TU8
zragH1bb*7Ofk6*<!_v2z+$=Ho(A`}}u)McqHcE5QSdPqiJfrf!@Gv7eZc}=qp`qb*
zQfPIiQ#Ic~a0YGxUI=QWvhz~<l<To?tK|J9(h9`hfjF~TRJ(Zw^)B_Z?(`z<#!#|2
zlKzhEWu949#G2SoYjpdKXXyl?Ua%3`XWXegk+O$z*h(<2DT+#1vKWCM*1W%ojezw9
zNSFR}={c8D-8rtTQQn@ks5wGe)tsCgHGJD3(L^3S{bG#6z{}YS>UX@Z%E7^5@8pC`
z(3V!+otU1UPUE-6aBlgFk-)0WLWqSs&`TVl_~**s#>PfRUtfWb+@n5canWQ97K1@I
z>b2nmF{U&PDeu&o97XD;)Svki@Z8aO34qdX&r{O)k<Zy_3hSNbBBy^$RoS)JuN3&D
zVst26blo*5VK$!kFn2c%+|eRTT0M%*=LMzq+l@(=3k;o?_iNmqpcA9m%Uq%qSc7uc
z0*PBqcx^4mPpek*9>Smva?WOMYV>~crytbKM7tx;pKq9zpG|!kg1R_4aVFa`(>zmR
zcxGa1y0g9A0mI~B`g`S%OCj)Cg-M=`#H}?)hYhXdqa7)~a26TJbLKNHX-xW^i8Y(O
zXg-8iAztfLa82cORaQoWGpZ~xF5#<ucls4(jP0Ux^9Wl`nQE;$nidl^&v>S4^R7!_
zsrRt~<d0I3c>GV}Q8ehA^AuLGH(Mp`W<SIO_Be&hOG~YfR$7IGg;Bnyq$oQ$u<z{b
zP)qqH#!!i#Uyt2horncoKh6rbE|T$@YxrJoEYw<(&+S{)b7_VZr+HbhMA4G3w>%83
z^8SHi()-gY^(Jx!(vDc2Rgj4s5?Hc<%;LKn+*=YWub+$qF$rH8x@$C?NQ!PjF&X$>
zGSabH;mPOo5_}};K{?DEONS0|rHIOiNKa_gaom&R1Q#r?rl7gKRy$Nv3ybm1(Tp@H
zKat+v-p}2Z@G|4>bYUk@oqfEuko)EcJvpv;uN?v==DvvwXv^FQb%zmnt%zz857%Jq
zTM0uzryX=^$4_qWv+T}a9KBuFA^7P3jtv=l18UoG+NzDy99qvpg(#NUug_MhBdr2X
zOkxwhl83?_wOaa+VBrs}`KE;w<1c4E?eK2*xXY7TG~`Ht{#<oWo2`Ez+}q73XdVg<
zkhV~3_!;6zJ~K1JXVruCsgth2;rGSOe^0HcsW~${D;5f^?-SAlPn&o(^XEk<GQ{fQ
z*<54uF?GLP2}pY<KHqnbqyhZlHr19EoXkEb7?_E~uG!+?<M|&N8WJXZyJ{~g3tfrc
z+-`G1Pms&50d_DqN05xq=w=j7^@XMP06@fTwa)6d?-?dc*OXe}QMthDrL2tkxO+6M
z)FM9vl%%n-5fBm;O-M__?tnoM^Dsz8g1}=sSX~$|t!&$E;bCXbtEzI5<%PR;=O;YK
zZ1Kh&H{G|n|7<t)oan2x!?(Iy>2XpavNY=tMR&BHsz*nhhKS~2ms#4^T=+mBH^id&
zQbIe-{4mcvzYi>*R*(9RF8Vbd)8J#~8D=P`z$)7V4Gj&YihtlRapD?wgVUi%o{R`S
zW=L@e4ANhg24#r+LpfPKKG0w48_-|JtE3f3aLGe9tL<+&H8DS^jZ@n+3pL20EFg!A
zc2!9SufK-))r+nTmeL(cA;*Yc<nw4fq1lOcmNM@iEib;jDCuUEHOusGs;vz1`k=n=
z_ye;Vmy;0dYeGVIwRQiWn>#Iziv@5F3g5eVzW&4}UdaQ2hC@iG<x2;vmM0%MuAzx;
zBP{36XqmSHj_lU%0sAkh`_9=Ik~cRyC!bsmR%*O&XZGbXCwRB?!fGSVIk)jZj|0&V
z+UAI4`Y}*d2X9XLZG2%w8M75Sm3BFI`aUMI7}0WHdAFd1Y@FuK$|sWfwM<yp4i-IC
zPZ@Lm&?LSvx1D0@q^YWk?c8?7V%qTD_A%NYU!ktCv8t99egcc;_q@E$t9LB}gRq02
z5F^x^rver*(7QW6jjPYN_<@UZqt*BY(OSre?_4Dh%Ub#ao{wK6N#U4Me%bHpomhu6
z=;SQRGx!IyZh>=oqF#g16U-dFD!xwAE!biy^7EF1^$Gd)46lQX!T8nO1NF^~iImLR
zug)H8g^*U)<_vxex99SE^e<~gR%o-0h~c?s78OxgoY|I|ndD~uFzbGN&x1wuj?2GD
zc23Ub0+z%9e$%_3xE2VX;0F=YvQ)2-lNG85+{YN-vyD=k<|&ACo`dO1iY%*&ahqC*
zBAI^jm6?qfPn;&53rr0AiommjDouEJ+M;Om>nLcgv#8dbAIdpA+&m`*bXq+yNAI59
zBaS*g-q5`91~a}sxgu|ZahfGHF#jM(;zsq|aYKd>UYdK{I1;Chwt7^biqEm$aNN4}
z`>vF8I;OvLWq5RGB!%#Dz{PTzN&Qf<_J_i{x*2|0@S8ruI4^?F-WRg_W&Yi5uSNEo
z4eTFIhq2tvrTxrab$u$OBm)(ZVqEK@TQ`Zm7cZ(LG1El+EpxkLs)WUm4o$>ODTvmA
zS$8f-CRTL9&d%oezjGGEl$CitpjB@e2lwwn)!j*LV#44Aowwr2QX2Zm2E`>xbyHKS
zg@pxnil52JWKV)+m%e0}=^A(`>_wI|6$YCjY~y2X&x~t#RbNtTl~_EkEc$cyw`dui
z=ZAkL#_`(egJ`Cp*a34^1mwlGgGqo++n(5XvlOes_xR3;DfYBb2z72w6Q$vO7R2ux
zd=?LyMqaYo#Aa5}X0c=9b$5NX$cIbo|3|K-rsf-E9UT5z#Cc`pS7!)27Z>#eNdXl4
zWoSsPFPcI@S2w;i&DhMW{J}sb6vwi8)d^aGQGk~g*qbkUq_XpJ0XF&x9jB*W&jAGV
za@Nm<m=keI?Z0Z(Yx3W+IvUJ&2uB!fPQM`YOS0sRNTT(0FY!&}c~M_3Zrjv!PtQy1
zq&jk1W%@DL?ZaI14-b@9&jS-mDk^=wqn)Ocl*k7RW(om8L3TE_ZQnl&XCHa>4Gonb
z5QyG5lX=|M8Qjzv`u#gYnmc2UU>Q$A#SDcSLLV3UNyN8IKF6@gxBT>6q<w4Vrajh7
zR26nU^%Crev6%jZqsWrWg{){!4RT@Ukx6+4zcErWdXb)h(nmsv6^$N1R=z6-VNLW@
zyZcrC;{&>!O0eZ%4>8(W#wYqhSwb{^F1i1co+>ms!v9G((c|!6!Br<jllxcxW&WZ6
t$NXdc%lt$C%lt$Cf8f823iksQ5cU%_zSO6;;IYaFRF$+8E9BpP`VWcp0aO40

diff --git a/src/main/webapp/public/docs/images/logo_small.png b/src/main/webapp/public/docs/images/logo_small.png
deleted file mode 100644
index 5496a65579ae903d4008f9d268fac422ef9d3679..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 770
zcmV+d1O5DoP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!q)9|URCwCNS3PXgKoov)mx?ZCXvOFe
zK?hd?DH21?f<Rp|bSP7tt%#w?!kTtNVn{o{!ca4@AdyH^>K11rQipnJ)eVnTSzHNF
zN8ab&RhE5cC$$4FI-PZXx$pga@8yN)KS}L2Us~^y$(x-xioWbnFcV+~b9ig=!ft8Q
z0RD+rpA8910Smyc0GviVUOPGiY6YM@-r6Nn8S&~cxHl27$l)-R$1(!Xx045RDy;_&
zeXkG{;_#i9rz0B6149#Ddj=KM6MV^rTD%ylzGdCBX<^=^@I0X3SCR7OMbn}sUKdeF
zKO-flaJa%@kJ27@Rod?J9=+Q<rfqi^8=#Y?wj1kwX#b$c_Zv$4C0UJ>x5|=PtG8n>
zy~9rIu}+48M}FW5Bbqw3t#po?c?kmG!FX32W(dOjzTb+U@64MzHItoeB!M0Jcd}|E
z>ekW`<~FjR_ZVVJkF|_htH&v!({Oad?xax?0K0sLwBY%nr46DpCmIIaa?@|Y&?n0q
z@kJlMy`pE2HtEgASNd~xNzt$Kn7w#^Fy5oi`e$bUE*+f>Vk5z7=-2pj68afrqli$_
zvqe##5V?a)QU_-s9+s?mJYT5m`MQDRH4cYs^L1lCW;Dua5<w(jsQdP=t_rRj2zL@+
zcgfLNKa<-c0Vu+oQ+k1s`Vr4aUfq_EQ4-j%;>Ln9lG0BC@9DJQHA(}y&Z}$apb{kU
zbezR}b^|O%6i+$BFsT3zqAe8wg9`vfiRp#{)z2bsJw`vBQL7Bt!IexM3$Hsf0tHK3
z+R=x{lR$K`s;7__?ASPW=3?*xgCpGaiadSEpoi0pw-_V#OXM8Ap{4qlG08x0ig9IY
z3Ijqh(t1_=g#jocuqyJO=729e9OSiNDSrhR0Gc5G)(QGH?*IS*07*qoM6N<$f<~fU
A82|tP

diff --git a/src/main/webapp/public/docs/images/pet_store_api.png b/src/main/webapp/public/docs/images/pet_store_api.png
deleted file mode 100644
index f9f9cd4aeb35a108c4b2f1dddb59977d56c595d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 824
zcmV-81IPS{P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o
zcW-iQb09-gHF34$HUIzuvPnciR7i=fl}Tt6K@>n=Rd;8mVwQ<w7Vu!yh)%}+A_y4|
z-UNe}fD5=LMo};*QSmG;(NPF0A}$9}@FM6z1efSh#09bl12MQ@5|hbdlCI2Ty1bZM
z2B)3;YyJP;ug@<^05qRC<;3Ih6RztX_B>NY4k4xJQ%YT}s;WA7;r!W@XgqjG_4og}
z8w>{OB9REiMa8-B85td+y}bji^~2KA`Md4j-u{zw=H%Da@83%_8qEnl9k1WK;pWX-
zb-lg)pQYAreK@>)*5Clqni{IZVYGG+NY67Bp-^bn;L{Nbh44I6CIK+n7p8#U?;fCA
zYMFcy%UEjup4fgnli%NyzSe*@419QuU9lJ|T$?f9w?HIQ$RwEJGK7^!y7LhxIgVJp
z9c!kB{0aydM1epU1NJ=h(<e-{>}2X?Y{qn70yEN$dwm~favs=VbQ+T?!AvSl{P~PE
zS&zsJbTQttne>kdM4$jBhLMFy@I1)3u-4cAzrY*l!o9eK^w%+jqY!oi(Ri8sMauvK
zwnCP#%3hEH#FtNqq{iT(?=_JA_8XC>5Y8Y@!wmxKb|A87ZbpHA`+%v~0pt{5Nko1L
zLKR^25YExt1lH7L1<xo5e7uJ-X(+4!X+Qw(Fk<f&f<EAoVT;7lP2gydL*Q621)^}0
zf)y)$!86{#+1P{#mE*;qp`Sg$Py%CM#x#`r6J&e`_Udg|)my<$z<3`7B_hx9N9P}F
zYK3c24KdPPZP*+3AQ!CtKY<XLC+kF;aH37V!P87BrTCdh4EhHAD~1vYq?CP9Db?E1
z*~P0@ZL<b%YkN(5M<+_DR&nfjv(wYlb0-iC>{t<rP*hZu6MS@Zbo$f3zhue6T>{|P
z@n)yHyZf~3>LZ@#&CNw1rA#OlY^|)UJQKUrlKKO&x%wPhH}6&e0000<MNUMnLSTZR
CaCsR3

diff --git a/src/main/webapp/public/docs/images/throbber.gif b/src/main/webapp/public/docs/images/throbber.gif
deleted file mode 100644
index 06393889242fb3ea9e0205fa84369ec7bb66d15a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9257
zcmd^^X;@R|x`tQg5wbE8AV3mAn1TjmQ&en2CK8~ENEH<+P_)pZ24y2E+7O0>K^a6u
zQ3;5MiU^7p6*M3qDk!2=YEcHMQ>nzEYP;R`e2C@r+U+?#XaC*&gKPcB#k$`o&;7mu
zYNhYYXe|Uo84#4ZIko#rcU5K8*yFL{qT<GrjW1rl$jiwa9U0BY${4skP<yEM#j_W?
z_wH^!+x+J3n+#pXjlLUI)m39p#)?adn@=~t`Q=UC*1XaCqtKuI@O~xDRfH{&`G+XH
zrioDq@C@%~Gyx4!AkoD06CVS@yd84f8XLbi?oeIA4`(%^t4S*dQ|iW3$A9&{94l5Y
z#-fy$v|*KOm5ey6-k2f(Z0)H{$^)vy7e}}P7piA`Xp;a<{0ZOS%VCvnlNK~Fb_-b4
z6==&f{MZ$7dP>47O<q!R%7)a<T1Q<*mXHd;<v5~{X*61_7hp-oa#|?`Wl>&^5fZH$
zVZ@%(l~vVHjnm;H@KL8@r%yUHoo;rbHI_4lIH(_nsTT>S2`DFOD~uCb9_dF4`#QgI
zy7ldMcLs+A_s%|e1pRPrbX-tpeNP!9(IpMFTce`t<Ok;&e<>_5U%lP99z%&i6`1d~
zWeM!Rxc50<+d$e^9LT`?<e^bHaABdT*TkMdYs&L?jP|k(q`SwT;5_ZS;Ti6|^6qKl
z+F%S4#-pR!@0-eeg#xE=ZB(8Pn@sE{F|;8VC2Oy8&li=Czft}DWU@!}@R$7!J1+^j
znwRZVvZ9V`GHDC(SawmcT7>B+aMK~a<R!dD#B|JKA4rL?Haxg$l;zrge7f<`^_m4|
z@QC;CiS^&_DHDxEgZJOw*&ZAi43GiuoMX=c)BsEXHGmzmB{_CQthbjpAP8Uu7}>pR
zH<?HV5DA0=z!V?|aFmpsgvO!)U)`6w!xn~3(DZmrz!w0Z2JQ|3pa5138pGSi8;}KX
zn*<P``e%gwKmLY&E6LTUL^k<dRckIL%qs7#NeVo&B)`m%rES`9ZpfYZe6dQkWvff~
zsx#S4%c!|mqe2vg7t#ZSFE<6aY$T}D?Y|7*!}hRxL#q0#LX|#q`^Ic3Ur0+T7ZBwz
zQMeSpOU9&ITGBBAc(jd>m?q;p<7{wN2g|I^aGlSws;VP84j(z%aQwvAWv83Z$}p(%
zZ^?2;gxg(ey_`V5J7{;!o;o;KslW@z5EP~JGs|U)J7dF&(ff#A=6vU?cGQ$-4+;Jf
z-ggJEa!yStn`_EWvl)#yhm6XVs}UUbsi;+agri;mCfjH^Uy;lH+Zw^h)4N?oZgZz4
zJk(fTZ|Bi^;+s_M=~+d#vyoxEPzTlOS=mX@sbl*uRj>=MaMr}cFIY8i?UM61>86uB
zV$DlOUCiUJwbzJMP@D$urzK|lL2-PC!p1l47V-ZG<5Ev0Z5h~Kx?`KOp7gkAjV93A
z-Gc7MrlxTf?wF;CbNc@tCHJH{TB3c;#{SVu%97}tyAM2n&|9W_?qv}$*Jt*%7Yxb#
zV0;d;7|lDEltJYS+U)#aiJO};?_Jyy_4%syQ(uy?-J-Yx-9O5nKRk@@XSS~X<(2u~
z<??yw&Tjg^|F<|1{}I!+cDYnOf$7L7fG;*Cb|T-7H3FCzEC!$|EHn(D2}lKW0{#HC
zfH1)8WTpY80iD5fgA=|;0F*~8iSV1{H%YBrDF?^``T^?z*~!f0*l=##ya5IPAX{5k
z3(yDnPQ@m`8q7mPWW@i4R)A^gA2B_^LX2#Kmz^6DZ|i&5?bfNfU%W<yo!*eTxkU@5
zXdetQD+TM<TQZbFDwU`v>V-LamWm~!iqtH9wkpf8mAXZhOD&L#aA_%)4h2M;1M5jt
zIR>Us+%W-GXa_f^opKg=DSrAs)AXeRa;Hp0aC1OgbxQ%Qr_QvTleM1jkR!2mkcX$3
ztsR8~G9iqh(-FJ@F_rQBIYDXV_6s7G9SxaVF^<fUj(xos?EKch7#l`)9W{KUMe3W(
zk}GK@wDV1buUOEA(>laZqcx$!D97m|7t16j6@Jt6UdDRy49Qyvs|c<Po0+lPztrpd
zZ#YuzK6jiXC?n#7%29olYp%G!dVG0d#`6&mCz>>RuA|@b%}`*wU}2^7q;&Vtc6@lb
zcXl)T!6nYDzmMJ~%n$KNXyNlCG)GkJ4!82;v6@d3>s5r~<Xm_mo7xa#$kY2~;eXzH
zaDlzOcc{4S(Lqd8R`@?4o=-h#+80hWVePuSXl6}oeF(xILVIP*P8WXsdhE7RG<37a
zwtt+0*DdA1arr-fRObixiFEXuXXRUiX-rq0;qkRQ?(m0A&2#v~UgyR029eoVnkGa?
z<<}PKaI1?Y4t8W8RVINcLG4LrEQ}k@WUr_h&RT;+|CYU+KSJI48`OZln2DqXISIG}
zTm!m6mVz8kT9Y)%H6RWI^#t8d#sHpxL4Y>E+3!O?049JDr14Y^PeMI02R`0lJ^=oJ
zYd|*u9|SU(j7hY?+<=(?fP*mtV*zFh<axrXgumn(K)v;kP#;y7W@Ao;)DM}NE7UxN
zNZt9=b2E1PH~ZRDhVj??6P`nUNWOyV31vd=2(ipzQ&y(?N`;uuw^&@fBEXfw|5W8#
zoTIX+*s;BOr`(IX)sCGe^+IjUr%U<A8#7URrA}yjk+4$k>Orz6%{VA?ozdm&(Jf^V
zMfPZ?>l`mS3{Uq8IM;e!+1YjJy2!mzK$O|wPeU{*QSbs9m+@`f5Kx<Ys1761Qu7*p
z*^rdrXobYy2r;VC2?#_MH~EM1_B1)sE7%v^iQQoDHM93?DSq}Q3YQ$uqZ+&UGrSIk
z_?uL34e8Kyc3M3>O3PBnQ=%RsZg%go*fJ`*w9TL{-WgZVIA$!YV}3BRcfeXaR$x#b
zW)Tpd#8E4)^MyYdkH;4_;ChJuw%n+Be7Ko4;w-nHvyo$d<k(%I&1&N68F@iPs*EO)
zJ<D_cwo1WC<p-=p^0!^F$F^^3@Ve0|=?J$zdwYZ%bD|D0cR_Kl`D6d1E2w?T`b$RI
zbP$Q3a5&lHyOXP6zhHQg{Dal_vsW?md<F~{tlgWMlomq)Pu_yYZx)#FdB_6=8d}50
z_!{K7!?`Zdz7O@U_!<ErwWLe0W;rq9GVrig16lmY<e4Brm%om5@cWA4tZ;f5eGlR1
zM3)hRpd@Z2+oifm4!>_0e-YiF78Df&)_)(}fcr_r0mPH(4RRYWIu+d@t0&Ss@O^s!
zOKyX&13)%N@83r^;QsgN{rl(!0|RF1FA)b1{CRXAy&1ySz@>olPiR4r$aMdq&_=nK
zq|cFs8phWJ1@%dZ-gXd{zDbTILD>)qEvH-N<XE^Ui8LBZ1<D3%N3u#-t}dZ{s@lI(
z$(oL{cO)N@S#b*8C<nw=hQizgF|WDB&ekYqk?U~NkI8E5>U*Rf1b2J1Ri79`rBFl@
z8E^0I)OqEi{pH(a24b9YPG;Kz@t-qZW;3Mpe`MRlmYx{7bH-XZ&`RQ7Rb^%}gc&X|
zd}Q-FZf|RWxHU?PR!(C?80zu(^l>*h{#ulSiid(O!J(8P-41bNM3tnX@U6NS5yo0?
zdcF)~xFE&+&|gZ$23dV5t~?$$&ymZ;F8j7GGMncGSsDo%>J`26=&l=X#rSKv_64;0
zr;k6no@=gV`P)K!=kaHl>q?!`X>(A;84tg^Md<`zA%qbRLby1Z=fn*ZRdNqs%Tq|3
zOt}lZu0q9oKJhgz&+^7PCt$=UFW=R*w?a1)ePoL<D_IM_zNzf7@mV=wpJIUPdN5XZ
zX$*c$#jDeU0e+dKk)s`YIY+6{4@>*`R$Gxj?TU@12tTHsT$giHQU+sqf;fS0FpT!<
z<s4q?a(RRVfn|pjl+K`5!FrUlL~L)*Sjbi)xW&(<(^wYC4~O;KtO?46RP=kkt^YK|
zL5HZU0-YDs2*5W;@hKcZ^iJ^&u$#<pz&B{kAmByQL?Cx3WejjRmERMUyt)dIJt1->
z#UR4L_rT;lfRLVo8|3$7cmuxwjY5rmYs&kR6z_LRhf9-=4QalKQYEWw^4-EBI3j$&
zA>$Im_{ZA>0`)E_&m%x6a)BThkx=e|aMkOrK9zb1YzqpQ&WZ^$)2T>CwTCuYRn5y)
z3fVXg-@R5&Bf4?W<VLB;vDA?&7vW3wHf7dM9i5ORuCcEEShMtG)9G)lohSIds94Hz
zBUZ?T?)5nKZTIO2Gli^ldis>UTyD|hBDe2>xEh|o-y}o5Se~+Ob!5xN>CaAN!<4)F
zwNh!Y7B?@AigokFYNJL`0Vz&-ekrY95-n3M<%GR<;SzXRmO7(zd+gf|$Thb%;pby2
zyd{5TJ?|JYUgpSlJ0=LB@k6#d&opuPGq^qJAIumfhigC2qAX0OEnYnT@O;bA?X1O5
zpLe9|%_H+Yki!Rv$7Kvjv8r7<gY+x1np@gB)S4mt<>Z?$<>G)g*%D*V#s&kz>Z3V1
z3!ZKh9H8Nl9IdhEW_rY#oYdDCLTe<C`bCUXSe3CV*fLBmJF@Ep^;Z3f#Eo{m0hmsX
zNLf(Nu*>+nQ{(d2pBX8%CmxL+1`|b#Vb!?IY!kT7$PDWAP9$FY=e9KSK{DEH|408!
zl-$lv)U8$EB{~es&j>rYg%{{JRvIl8@NK}L=xDAEVv(o#W@3LUDc*m?yKSPR0O|nY
zAh;*QuBdpja8HzP8Uw`ce-r*LrUA47ZvZ)ff3k4^>;dFcof}9eXeeM<0OVj&CKDVK
zpUKKIF%hSmry!pwK68UX>zOF@dv}B4Gg)^2GQmN7@A?zG!xO6dT*Cq0+r{eY6}AfU
zf`|~y!?^R*nB0!iTcg|CgM}ou^H*s~5)%h;Xh;PYOM!|Yhfk$w;<jxZMy3q#ouMXu
z<y`euvVv`cw-XQ!$);O~ma&fQu!do4uEH61-{n%`&9*Dt1z}U!qVty_vW2|yWaKGt
zG$`Ln7RF9wvA3L1hqt*+5F?(zoif+)aps`R*?Rm5?>@`1Dx1y!EZrM&^zMat!^Wz#
z=Z{;Pa0w21oA1X3*9=`*c7o3ePa^k%Vzu>2C_7DaZJ8FW5GJv|t>`Ym;_S>7g_3XI
zdRb!Ppd`ErK`pUDHRsJd9@)bu>}s1)nKsyAR7h21<1u{DX1gd_Vf;^zdUpFPeSHHR
z7AMgw^{FlFlK91CGMafKt`$FLhq#^=->@Uok7pqW6&#Zs4*E(i5-jog43A*qC@!(8
z8&F}pofRcMVmcJd=f;fvlfAR!ZqeaTE?#TQ^jQM0ioaJf8<pmRs8mZ4Wu4ivA6XQy
zKbhP|yy>m^!Kdv^`f5kEsD0=gX#4={QE1$3A4K~V$ITKEd){XVLx?i6K*D>JF6E=i
znqF^X#&UX}rfB|#A9%y|sR5i6B5gyk>8@Q+xHg|^5iz7C2}YkGF)nuP4LX#k2tRBP
z=!VnWnXea(<cLl_9LW`Tx+s3DE1v%Y?*MjyJOJ~5G0pdN{C|+mf5S8<yZFB?n;_2r
z#59lgk3Hi{Qfd4nDV&xr#>K#Wvg2&0f{!mXuuWaPpsoZ)3TSaEp;i|_)CvP=4wjI;
zH%7tcLM8dQXsHW*#|}%TG9yiGpyjBltpcpXkpl8zg~x<XvX9B%)sZ44dqO$0q%<4*
zz1&t$58U1oONYZmo9jDBGywcn`T33uN-J_CUVK{iuCB0^EVG%pOD3e6$9Y|zg0PfV
z)BFq3&ei)<#BwcSB^1$RD6F8%A;F8M`-Uh+i4H-Y8;V$yRS2U8Pq{wR-a7-4bHvD>
zD{QG)2Z<MF%`ob%+(s8EzJA{%Xv>8x$vfjgDc(J6i|OHoLX&!<+m^<$S3DtA8Mf!{
z7;g1}0uqJ0Mxuy%=#BFX5;Xh9Jkr<ud{?+XDp}RCgHg-c>A$d}neS9T;$F$kXn}ss
zF{Jn}9EDk=>h)sMy$YXfhKID<rRwRuF1c_Kt6Eokk#8jeyhmYY^BNO|Pur#6N~ciU
z_H>xr7U@3xl+uI|N5y!>?{aVn703L1Qgb$ql%JT^lsGD%)~)(H?Spj$zNt)h)Raob
z@KyVB@&ngE0rtMW4!UTqGX>{&KHJAWqb)oYq9O)e)nmN0jVa;LNbKXx04a+8&O;q)
zHBzGejrqt7Dk$Z2VR%%K#`!((pXE*MR{jGtv|q$p5#v9N0f^6B9IB!Q6(y$TmHRLM
zsYXm2jn3f{9T)KVVzotDx=Ng8q0Z*VDZOkd5C!p0PRoFt>NyVEc9*%YR&2>Nq~$AI
zXOQfjJ&wpGMe~I8y=cC(QR4=W2GWccFK(3`d&gN+)qWtW-`*}mZI%KDRl4@rUv1%d
zxFO82lhW$xQyYxJg8tOZyX<S|g(!QGj!xkWGF*YrW!_eC7?lWwFGS05;U-eG?L3s#
zTtSg0`aGXUY&#Q$*5&L#ARAryZRe$wTUm`w&R4tMlE0cxfYTa=EA;`Ev+Cey_4iQt
zS?jUdC8G~68<kSk^2P1@KicU%2kKZH>m1As%kEFNn)eW{R61M>af@wr(YW{R@+eL2
zx?SovK+867$F%T;Dfeajw|kiQ81GcOnS$Y4+hp8<J1+_=6&mZA31j^`Wuq7IizAfl
zqW!fP>g_w1P8_~79d9p$*M1_Ei81$H$Ti6oi?ZW)&tmsJa7RV1LKddm7R*qL54L7j
zvCr1Mrb;l!=m^TbJun-C_6$7w81E1eAQC^6s4>rZ4&I5+yyu$kha%Z&d+|S7Ki#{2
zy}%Giz|eR|G?ychX%%=eL`W(aLarb(L4jd>J+wlX;xMV9H8J!l&i?~Mw7)jlIuLD%
zyq+AK92j#kC`ycv$SJ|E7!FBP<s97a6z}9gqpep7)6xToX)&s7pr0EzsgO1kcDi}O
zPWMjQX?Z!Y(=GY$RkT(<shW+l->arx#v<3_rZ-DLQ@>`#sdl5}immok8&`{YgF|+<
z`tB>e%6G{=B4?V-be>`&*}0d*f?$yBX@w+rJht@O+=^zttqB2p=IiA17#YD$4-fih
z@$gJ95mGmFhN!d;3Ag4#>3o`>%L{G=9<}qOJ$wDN)%)MN6bVsAPG4oKB3+8r6!Qf9
z3m8?jIpWcEJbt6|f?Y4nMXK(--YZ|GA2_aRS!do%J9S7?Q&4FYL@sPilq}e4tlYa&
z?f+we^=FH^Z9|dnXZghblW!IYGIAT{``58&7vZBybh+GuIPP{h*J?&vf7i8rv6qgx
zab9~l+K`tvC7pWtlS!5lt(n#Yl}PAR(v01oXjc0F?T0w>+*p#PtE?Tf_hMrEaZ!^V
zbv_>=4xibc0TUxg^I>TS?HR4fdiWl`@6{7|WU9G68l7tOz2p>oIe~NNr!>Q&PHm`4
z98R?g(IT*nl#{_|*WO_h0X78;WwMp?A^Zi)W@BX5q==TdOl?~J6HK(0b(xD6?m3e3
z#+zMaSJb(W$h5+d+6vujSjyi_R80c9>7h;0YlUFDvN`iNGu<KsX1ZgCRrG|J8jVb6
z`J{-Jy%*8rvUjR^Sh)<SW>&5HQ5^e>6x?&JSc4V$6_I1jJ4vnCVbkU`Gz=Uy#~OI(
zlL-$UAE$pVCsD_rICM#Q!ltzcqDphp5L|ZrqUm>=H%x!RjMrF#*?BN2shvUg=H;)&
zy~_xWl*k$~9Hl6PIq({dELPE-r4*YNs7?5{>dlC`EcK~lPKB_8V)G@H)UZFF8$tXT
z@^raW#Hq4OJGFL2Aye|HU&_NL%dYans6?ltqEBz`Q|m=@Zh4=-p2r;}q(Nbsk$fUI
zP|(Ns2>MDvZi1H7<55frlQn#%?`WY3g`+fRuC#UJx%#d!zxEu3=}zF514S=6f@?~$
zeuSB=6E7r3ya|<TV`eOOs;*erbNd9c|5oo8sLY|-0{mM4E%Z?StQrfq<bQhhUYL(Z
zc~lpA!7ggjvmf%t2)qx^zkIUotp0<_d_F`H^{va9mP5~6FkB<;)S{oQDWf6_qFNz}
zL7qcoRY@*jIBymJz&~s?p%E4auH-%7Tc<WH9{+na=fAJ!KtjRo2M8(fP+*QzDhk>;
z@K7M3VBrls6c{M*M_{AB_fVjgQ|F(FuK(@=1eWeVMSpLglllqV6Rg-L_46;?^IskS
z)x6|SR1^gG<sUbEjZyc#=yM4#c3keX*vXZq=BsnA7H0dp?%YxJO~NXbW=&FZ0D+E$
zY^gv-aTKT+vS%t7)_9I1=_|QA*_DH48f6$3470caOf<)pyiU#_?Z#WzNO$et+u{KZ
z;BAL$>l6amWjkb1dX}^8DumNXNmhsfxKA#;bBBIZE@0gma5yQY(FX>|N~Y^mgq`xc
zdxOf6r{9<CKT}_~EEB#78Q3FInH1uA!9T<KWduhUzlKzAG@vbC`5Jh~Ai+nD);Fkv
zsEo?fkX3H1fUVsZux&t2i#GSB-8W*ssa+X0bM(A#F57+0L)GZMz&(ObBeg@T!5xU6
z-xhpm)uWyRj+y4*hf%S5<JBzMBeNH#iAUaw6%?5sDw7Msn|Cj&x_dcQ(chQ!rC^$5
zt?coVj@eah{4b}6?n#N0jDV9ZjF$BJm%8Bh&$agNY?UG$8E*Aa9o(_+El&sI&)4oe
z{yEmTWlQ8Izj)t)uDJaT8qlHtR)LH7T8rY_enH^U@bn@`&hxwZiW`0Jb2#b2PGiu8
z%`IIyR125&^}8RNvOY%zrtX|KsK&HsdisWV#%%cKuMpN{NQ-908MRZ@<BwN%02(k#
zutxz%PF{BaYZHf=yA!wesl(+2o~N4utpMuDl^)oUOx<+=<6vJh!S$1|$#c$xW7<rd
zZ2;p_>u#_e0gV3(fdBTdV2Sc4SN5Zm<epO%N{bkY#NBHuB+6+wf7}<_qPjw=G|#ll
zavn@bP71)V$&i(hrv#UCw!QUw1qUl&qo~{DJWC4;r(7i!#TM8l%J|m#IOnoMTMLSm
z+js1&m+mRA2&k&AQD7XbpiT%~DYIrEdMv0)_{tSJQ$e!4(qnUwg`xNKVD|||5J+YB
zjo!W+jGO(p!T)pU!KfU|z0m0>P<R`@#I~wX8+wqjaMmy<3#ssGCiR-SvRA&qvZ+lT
zl2$(M5hkRomnY}bu6`1hSuxmvJLnz!Ml~9BAyZC_PGvVZc4lsuS36Z1J%@tRQR@5c
z_0LDW$|W9#xS_uO^jR`=l7M<drC;~dpeoo|zqF7@pLO4nmL|WDq-e|;{bKZRQ@yM+
zloVBhUvfebDA26u9SXyP{U2O#S?3YFD{riANV4+~p8lcrkW8MTT?pIcN@`0JJ%S2s
z=hb!NkFU5QC30Po^R!4M#?3U1&;L53Qz{6<XUJ0!wE<U#9_?HDapqu$ej|N0XXXJ&
hKh3YnqWa7$cM^Z>?cB4?KR<tX{qU!QbMVmY{{q00Dd7MB

diff --git a/src/main/webapp/public/docs/images/wordnik_api.png b/src/main/webapp/public/docs/images/wordnik_api.png
deleted file mode 100644
index dca4f1455ac45e9cdc3659d77d6a47370048eb1c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 980
zcmV;_11tQAP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|9CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o
zcW-iQb09-gHF34$HUIzvPDw;TR7i=Xl}%_|RTRg6XC{pqCo`k81cgjzl5UhNtQ+m3
zt*8-2j9OY3)<lrHC`CuamA2RkRj?pvrT9T=!KPmeE2XVSKmvXtEehhoZtP6biP(r$
zCzI(*oO|DKk(tST^8o|?;qdPLzjOZQ+>dvj&>@zN_HP5m0E=+A=efDBI*IG*Gy%%<
zz@yc%2XvGm)QQv5k^Z&#4C6!9MwX8BCmQ{3eAX|GTwn#>(PS6PoB=$Pw<CKBKLBV&
zb_3mx>n*?wz?%Tx2gwJ4apoy`A15D=>?%}hj`fV*p=6XW=YR(sp))`dxTnqHE&{&;
zPdeO}SVkf*6_$c45W3Z}u|Z&a8{r!6ZNY62S>5{jAd)Hkjg@h%@c)c#BvZK2lmGw|
z`Vh+%ECkF{t=)XpF3Z1bj=Pe9LpHbnQwjeTU#=4hB76#52DU2P2Ouj~^lRWwRd%eN
zBw_z%FL0CUlk!`s2!<DdgRAm78r^sGWZmbD^^*Y6eOJdEZYRibN9$EW9FD#=y9glV
zY-%$wg76eD;3WSxx_@?yTTMBeP5?x+GsOTup85vZ>`>QG&H__i_)I9=AuA=jn4<xW
z!ZoN3`U>0z>;@hRsg)>J(58cx;l;h_zE*-R7Wbz6Ff#1Mss*)zTImU4`2@?a7y;v4
zH=lJ_PM5Rkw*AU`Cmq6aa>chASJ&Z3Ebj`y;w$MM!fa6`13VU7Kc|T5Xl#7ecj?mp
zREV-nBJ6C)`?&}QDe_(KM>BrlN|iF{7-90j+J>N0^vY=LK;8!^9Y_m*aRPX{!S6ag
zgRw(13pJvt`;{^S-vgUk?8pV_Vh4a4P7~}uHT)ENFMqd71QIOl8Q6+24TM_+158z)
z54U-*C{M)S&!2Bfu&`?&#2Ti6;WojY;%6+I;uCof+*T2iUMz!7Eg<{}#DJSx)C$5f
zP(oSf>_s1t06cJ-U3?<9poS4O{Go>H>hro^ks;r3mm1Ehfq?m(_YE8UiVUgG%W9ZY
z!@O^}KR%JW*0e=66rUYj5BP~=x%$^x92-m_<lKT#h7yyxUmTxX5xNt{a`UcUQ-XFV
zKC|Hq;F0R|QsTswRzI62boA2)P|LK|+W^y@#{CEF=vbZ23tjU70000<MNUMnLSTXw
CR=u(S

diff --git a/src/main/webapp/public/docs/index.html b/src/main/webapp/public/docs/index.html
deleted file mode 100644
index c57639864..000000000
--- a/src/main/webapp/public/docs/index.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Swagger UI</title>
-  <link href='//fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'/>
-  <link href='css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
-  <link href='css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
-  <link href='css/reset.css' media='print' rel='stylesheet' type='text/css'/>
-  <link href='css/screen.css' media='print' rel='stylesheet' type='text/css'/>
-  <script type="text/javascript" src="lib/shred.bundle.js"></script>
-  <script src='lib/jquery-1.8.0.min.js' type='text/javascript'></script>
-  <script src='lib/jquery.slideto.min.js' type='text/javascript'></script>
-  <script src='lib/jquery.wiggle.min.js' type='text/javascript'></script>
-  <script src='lib/jquery.ba-bbq.min.js' type='text/javascript'></script>
-  <script src='lib/handlebars-1.0.0.js' type='text/javascript'></script>
-  <script src='lib/underscore-min.js' type='text/javascript'></script>
-  <script src='lib/backbone-min.js' type='text/javascript'></script>
-  <script src='lib/swagger.js' type='text/javascript'></script>
-  <script src='lib/swagger-client.js' type='text/javascript'></script>
-  <script src='swagger-ui.js' type='text/javascript'></script>
-  <script src='lib/highlight.7.3.pack.js' type='text/javascript'></script>
-
-  <!-- enabling this will enable oauth2 implicit scope support -->
-  <script src='lib/swagger-oauth.js' type='text/javascript'></script>
-  <script type="text/javascript">
-  
-  $(function () {
-	  var apiUrl = window.location.protocol + "//" + window.location.host;
-	  if (window.location.pathname.indexOf('/api') > 0) {
-	    apiUrl += window.location.pathname.substring(0, window.location.pathname.indexOf('/api'))
-	  }
-	  apiUrl += "/acas/api-docs";
-	  log('API URL: ' + apiUrl);
-	  window.swaggerUi = new SwaggerUi({
-	    url: apiUrl,
-	    dom_id: "swagger-ui-container",
-        supportedSubmitMethods: ['get', 'post', 'put', 'delete'],
-        onComplete: function(swaggerApi, swaggerUi){
-          log("Loaded SwaggerUI");
-          if(typeof initOAuth == "function") {
-            /*
-            initOAuth({
-              clientId: "your-client-id",
-              realm: "your-realms",
-              appName: "your-app-name"
-            });
-            */
-          }
-          $('pre code').each(function(i, e) {
-            hljs.highlightBlock(e)
-          });
-        },
-        onFailure: function(data) {
-          log("Unable to Load SwaggerUI");
-        },
-        docExpansion: "none",
-        sorter : "alpha"
-      });
-
-      function addApiKeyAuthorization() {
-        var key = $('#input_apiKey')[0].value;
-        log("key: " + key);
-        if(key && key.trim() != "") {
-            log("added key " + key);
-            window.authorizations.add("api_key", new ApiKeyAuthorization("api_key", key, "query"));
-        }
-      }
-
-      $('#input_apiKey').change(function() {
-        addApiKeyAuthorization();
-      });
-
-      // if you have an apiKey you would like to pre-populate on the page for demonstration purposes...
-      /*
-        var apiKey = "myApiKeyXXXX123456789";
-        $('#input_apiKey').val(apiKey);
-        addApiKeyAuthorization();
-      */
-
-      window.swaggerUi.load();
-  });
-  </script>
-</head>
-
-<body class="swagger-section">
-<div id='header'>
-  <div class="swagger-ui-wrap">
-    <a id="logo" href="http://swagger.wordnik.com">swagger</a>
-    <form id='api_selector'>
-      <div class='input icon-btn'>
-        <img id="show-pet-store-icon" src="images/pet_store_api.png" title="Show Swagger Petstore Example Apis">
-      </div>
-      <div class='input icon-btn'>
-        <img id="show-wordnik-dev-icon" src="images/wordnik_api.png" title="Show Wordnik Developer Apis">
-      </div>
-      <div class='input'><input placeholder="http://example.com/api" id="input_baseUrl" name="baseUrl" type="text"/></div>
-      <div class='input'><input placeholder="api_key" id="input_apiKey" name="apiKey" type="text"/></div>
-      <div class='input'><a id="explore" href="#">Explore</a></div>
-    </form>
-  </div>
-</div>
-
-<div id="message-bar" class="swagger-ui-wrap">&nbsp;</div>
-<div id="swagger-ui-container" class="swagger-ui-wrap"></div>
-</body>
-</html>
diff --git a/src/main/webapp/public/docs/lib/backbone-min.js b/src/main/webapp/public/docs/lib/backbone-min.js
deleted file mode 100644
index c1c0d4fff..000000000
--- a/src/main/webapp/public/docs/lib/backbone-min.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Backbone.js 0.9.2
-
-// (c) 2010-2012 Jeremy Ashkenas, DocumentCloud Inc.
-// Backbone may be freely distributed under the MIT license.
-// For all details and documentation:
-// http://backbonejs.org
-(function(){var l=this,y=l.Backbone,z=Array.prototype.slice,A=Array.prototype.splice,g;g="undefined"!==typeof exports?exports:l.Backbone={};g.VERSION="0.9.2";var f=l._;!f&&"undefined"!==typeof require&&(f=require("underscore"));var i=l.jQuery||l.Zepto||l.ender;g.setDomLibrary=function(a){i=a};g.noConflict=function(){l.Backbone=y;return this};g.emulateHTTP=!1;g.emulateJSON=!1;var p=/\s+/,k=g.Events={on:function(a,b,c){var d,e,f,g,j;if(!b)return this;a=a.split(p);for(d=this._callbacks||(this._callbacks=
-{});e=a.shift();)f=(j=d[e])?j.tail:{},f.next=g={},f.context=c,f.callback=b,d[e]={tail:g,next:j?j.next:f};return this},off:function(a,b,c){var d,e,h,g,j,q;if(e=this._callbacks){if(!a&&!b&&!c)return delete this._callbacks,this;for(a=a?a.split(p):f.keys(e);d=a.shift();)if(h=e[d],delete e[d],h&&(b||c))for(g=h.tail;(h=h.next)!==g;)if(j=h.callback,q=h.context,b&&j!==b||c&&q!==c)this.on(d,j,q);return this}},trigger:function(a){var b,c,d,e,f,g;if(!(d=this._callbacks))return this;f=d.all;a=a.split(p);for(g=
-z.call(arguments,1);b=a.shift();){if(c=d[b])for(e=c.tail;(c=c.next)!==e;)c.callback.apply(c.context||this,g);if(c=f){e=c.tail;for(b=[b].concat(g);(c=c.next)!==e;)c.callback.apply(c.context||this,b)}}return this}};k.bind=k.on;k.unbind=k.off;var o=g.Model=function(a,b){var c;a||(a={});b&&b.parse&&(a=this.parse(a));if(c=n(this,"defaults"))a=f.extend({},c,a);b&&b.collection&&(this.collection=b.collection);this.attributes={};this._escapedAttributes={};this.cid=f.uniqueId("c");this.changed={};this._silent=
-{};this._pending={};this.set(a,{silent:!0});this.changed={};this._silent={};this._pending={};this._previousAttributes=f.clone(this.attributes);this.initialize.apply(this,arguments)};f.extend(o.prototype,k,{changed:null,_silent:null,_pending:null,idAttribute:"id",initialize:function(){},toJSON:function(){return f.clone(this.attributes)},get:function(a){return this.attributes[a]},escape:function(a){var b;if(b=this._escapedAttributes[a])return b;b=this.get(a);return this._escapedAttributes[a]=f.escape(null==
-b?"":""+b)},has:function(a){return null!=this.get(a)},set:function(a,b,c){var d,e;f.isObject(a)||null==a?(d=a,c=b):(d={},d[a]=b);c||(c={});if(!d)return this;d instanceof o&&(d=d.attributes);if(c.unset)for(e in d)d[e]=void 0;if(!this._validate(d,c))return!1;this.idAttribute in d&&(this.id=d[this.idAttribute]);var b=c.changes={},h=this.attributes,g=this._escapedAttributes,j=this._previousAttributes||{};for(e in d){a=d[e];if(!f.isEqual(h[e],a)||c.unset&&f.has(h,e))delete g[e],(c.silent?this._silent:
-b)[e]=!0;c.unset?delete h[e]:h[e]=a;!f.isEqual(j[e],a)||f.has(h,e)!=f.has(j,e)?(this.changed[e]=a,c.silent||(this._pending[e]=!0)):(delete this.changed[e],delete this._pending[e])}c.silent||this.change(c);return this},unset:function(a,b){(b||(b={})).unset=!0;return this.set(a,null,b)},clear:function(a){(a||(a={})).unset=!0;return this.set(f.clone(this.attributes),a)},fetch:function(a){var a=a?f.clone(a):{},b=this,c=a.success;a.success=function(d,e,f){if(!b.set(b.parse(d,f),a))return!1;c&&c(b,d)};
-a.error=g.wrapError(a.error,b,a);return(this.sync||g.sync).call(this,"read",this,a)},save:function(a,b,c){var d,e;f.isObject(a)||null==a?(d=a,c=b):(d={},d[a]=b);c=c?f.clone(c):{};if(c.wait){if(!this._validate(d,c))return!1;e=f.clone(this.attributes)}a=f.extend({},c,{silent:!0});if(d&&!this.set(d,c.wait?a:c))return!1;var h=this,i=c.success;c.success=function(a,b,e){b=h.parse(a,e);if(c.wait){delete c.wait;b=f.extend(d||{},b)}if(!h.set(b,c))return false;i?i(h,a):h.trigger("sync",h,a,c)};c.error=g.wrapError(c.error,
-h,c);b=this.isNew()?"create":"update";b=(this.sync||g.sync).call(this,b,this,c);c.wait&&this.set(e,a);return b},destroy:function(a){var a=a?f.clone(a):{},b=this,c=a.success,d=function(){b.trigger("destroy",b,b.collection,a)};if(this.isNew())return d(),!1;a.success=function(e){a.wait&&d();c?c(b,e):b.trigger("sync",b,e,a)};a.error=g.wrapError(a.error,b,a);var e=(this.sync||g.sync).call(this,"delete",this,a);a.wait||d();return e},url:function(){var a=n(this,"urlRoot")||n(this.collection,"url")||t();
-return this.isNew()?a:a+("/"==a.charAt(a.length-1)?"":"/")+encodeURIComponent(this.id)},parse:function(a){return a},clone:function(){return new this.constructor(this.attributes)},isNew:function(){return null==this.id},change:function(a){a||(a={});var b=this._changing;this._changing=!0;for(var c in this._silent)this._pending[c]=!0;var d=f.extend({},a.changes,this._silent);this._silent={};for(c in d)this.trigger("change:"+c,this,this.get(c),a);if(b)return this;for(;!f.isEmpty(this._pending);){this._pending=
-{};this.trigger("change",this,a);for(c in this.changed)!this._pending[c]&&!this._silent[c]&&delete this.changed[c];this._previousAttributes=f.clone(this.attributes)}this._changing=!1;return this},hasChanged:function(a){return!arguments.length?!f.isEmpty(this.changed):f.has(this.changed,a)},changedAttributes:function(a){if(!a)return this.hasChanged()?f.clone(this.changed):!1;var b,c=!1,d=this._previousAttributes,e;for(e in a)if(!f.isEqual(d[e],b=a[e]))(c||(c={}))[e]=b;return c},previous:function(a){return!arguments.length||
-!this._previousAttributes?null:this._previousAttributes[a]},previousAttributes:function(){return f.clone(this._previousAttributes)},isValid:function(){return!this.validate(this.attributes)},_validate:function(a,b){if(b.silent||!this.validate)return!0;var a=f.extend({},this.attributes,a),c=this.validate(a,b);if(!c)return!0;b&&b.error?b.error(this,c,b):this.trigger("error",this,c,b);return!1}});var r=g.Collection=function(a,b){b||(b={});b.model&&(this.model=b.model);b.comparator&&(this.comparator=b.comparator);
-this._reset();this.initialize.apply(this,arguments);a&&this.reset(a,{silent:!0,parse:b.parse})};f.extend(r.prototype,k,{model:o,initialize:function(){},toJSON:function(a){return this.map(function(b){return b.toJSON(a)})},add:function(a,b){var c,d,e,g,i,j={},k={},l=[];b||(b={});a=f.isArray(a)?a.slice():[a];c=0;for(d=a.length;c<d;c++){if(!(e=a[c]=this._prepareModel(a[c],b)))throw Error("Can't add an invalid model to a collection");g=e.cid;i=e.id;j[g]||this._byCid[g]||null!=i&&(k[i]||this._byId[i])?
-l.push(c):j[g]=k[i]=e}for(c=l.length;c--;)a.splice(l[c],1);c=0;for(d=a.length;c<d;c++)(e=a[c]).on("all",this._onModelEvent,this),this._byCid[e.cid]=e,null!=e.id&&(this._byId[e.id]=e);this.length+=d;A.apply(this.models,[null!=b.at?b.at:this.models.length,0].concat(a));this.comparator&&this.sort({silent:!0});if(b.silent)return this;c=0;for(d=this.models.length;c<d;c++)if(j[(e=this.models[c]).cid])b.index=c,e.trigger("add",e,this,b);return this},remove:function(a,b){var c,d,e,g;b||(b={});a=f.isArray(a)?
-a.slice():[a];c=0;for(d=a.length;c<d;c++)if(g=this.getByCid(a[c])||this.get(a[c]))delete this._byId[g.id],delete this._byCid[g.cid],e=this.indexOf(g),this.models.splice(e,1),this.length--,b.silent||(b.index=e,g.trigger("remove",g,this,b)),this._removeReference(g);return this},push:function(a,b){a=this._prepareModel(a,b);this.add(a,b);return a},pop:function(a){var b=this.at(this.length-1);this.remove(b,a);return b},unshift:function(a,b){a=this._prepareModel(a,b);this.add(a,f.extend({at:0},b));return a},
-shift:function(a){var b=this.at(0);this.remove(b,a);return b},get:function(a){return null==a?void 0:this._byId[null!=a.id?a.id:a]},getByCid:function(a){return a&&this._byCid[a.cid||a]},at:function(a){return this.models[a]},where:function(a){return f.isEmpty(a)?[]:this.filter(function(b){for(var c in a)if(a[c]!==b.get(c))return!1;return!0})},sort:function(a){a||(a={});if(!this.comparator)throw Error("Cannot sort a set without a comparator");var b=f.bind(this.comparator,this);1==this.comparator.length?
-this.models=this.sortBy(b):this.models.sort(b);a.silent||this.trigger("reset",this,a);return this},pluck:function(a){return f.map(this.models,function(b){return b.get(a)})},reset:function(a,b){a||(a=[]);b||(b={});for(var c=0,d=this.models.length;c<d;c++)this._removeReference(this.models[c]);this._reset();this.add(a,f.extend({silent:!0},b));b.silent||this.trigger("reset",this,b);return this},fetch:function(a){a=a?f.clone(a):{};void 0===a.parse&&(a.parse=!0);var b=this,c=a.success;a.success=function(d,
-e,f){b[a.add?"add":"reset"](b.parse(d,f),a);c&&c(b,d)};a.error=g.wrapError(a.error,b,a);return(this.sync||g.sync).call(this,"read",this,a)},create:function(a,b){var c=this,b=b?f.clone(b):{},a=this._prepareModel(a,b);if(!a)return!1;b.wait||c.add(a,b);var d=b.success;b.success=function(e,f){b.wait&&c.add(e,b);d?d(e,f):e.trigger("sync",a,f,b)};a.save(null,b);return a},parse:function(a){return a},chain:function(){return f(this.models).chain()},_reset:function(){this.length=0;this.models=[];this._byId=
-{};this._byCid={}},_prepareModel:function(a,b){b||(b={});a instanceof o?a.collection||(a.collection=this):(b.collection=this,a=new this.model(a,b),a._validate(a.attributes,b)||(a=!1));return a},_removeReference:function(a){this==a.collection&&delete a.collection;a.off("all",this._onModelEvent,this)},_onModelEvent:function(a,b,c,d){("add"==a||"remove"==a)&&c!=this||("destroy"==a&&this.remove(b,d),b&&a==="change:"+b.idAttribute&&(delete this._byId[b.previous(b.idAttribute)],this._byId[b.id]=b),this.trigger.apply(this,
-arguments))}});f.each("forEach,each,map,reduce,reduceRight,find,detect,filter,select,reject,every,all,some,any,include,contains,invoke,max,min,sortBy,sortedIndex,toArray,size,first,initial,rest,last,without,indexOf,shuffle,lastIndexOf,isEmpty,groupBy".split(","),function(a){r.prototype[a]=function(){return f[a].apply(f,[this.models].concat(f.toArray(arguments)))}});var u=g.Router=function(a){a||(a={});a.routes&&(this.routes=a.routes);this._bindRoutes();this.initialize.apply(this,arguments)},B=/:\w+/g,
-C=/\*\w+/g,D=/[-[\]{}()+?.,\\^$|#\s]/g;f.extend(u.prototype,k,{initialize:function(){},route:function(a,b,c){g.history||(g.history=new m);f.isRegExp(a)||(a=this._routeToRegExp(a));c||(c=this[b]);g.history.route(a,f.bind(function(d){d=this._extractParameters(a,d);c&&c.apply(this,d);this.trigger.apply(this,["route:"+b].concat(d));g.history.trigger("route",this,b,d)},this));return this},navigate:function(a,b){g.history.navigate(a,b)},_bindRoutes:function(){if(this.routes){var a=[],b;for(b in this.routes)a.unshift([b,
-this.routes[b]]);b=0;for(var c=a.length;b<c;b++)this.route(a[b][0],a[b][1],this[a[b][1]])}},_routeToRegExp:function(a){a=a.replace(D,"\\$&").replace(B,"([^/]+)").replace(C,"(.*?)");return RegExp("^"+a+"$")},_extractParameters:function(a,b){return a.exec(b).slice(1)}});var m=g.History=function(){this.handlers=[];f.bindAll(this,"checkUrl")},s=/^[#\/]/,E=/msie [\w.]+/;m.started=!1;f.extend(m.prototype,k,{interval:50,getHash:function(a){return(a=(a?a.location:window.location).href.match(/#(.*)$/))?a[1]:
-""},getFragment:function(a,b){if(null==a)if(this._hasPushState||b){var a=window.location.pathname,c=window.location.search;c&&(a+=c)}else a=this.getHash();a.indexOf(this.options.root)||(a=a.substr(this.options.root.length));return a.replace(s,"")},start:function(a){if(m.started)throw Error("Backbone.history has already been started");m.started=!0;this.options=f.extend({},{root:"/"},this.options,a);this._wantsHashChange=!1!==this.options.hashChange;this._wantsPushState=!!this.options.pushState;this._hasPushState=
-!(!this.options.pushState||!window.history||!window.history.pushState);var a=this.getFragment(),b=document.documentMode;if(b=E.exec(navigator.userAgent.toLowerCase())&&(!b||7>=b))this.iframe=i('<iframe src="javascript:0" tabindex="-1" />').hide().appendTo("body")[0].contentWindow,this.navigate(a);this._hasPushState?i(window).bind("popstate",this.checkUrl):this._wantsHashChange&&"onhashchange"in window&&!b?i(window).bind("hashchange",this.checkUrl):this._wantsHashChange&&(this._checkUrlInterval=setInterval(this.checkUrl,
-this.interval));this.fragment=a;a=window.location;b=a.pathname==this.options.root;if(this._wantsHashChange&&this._wantsPushState&&!this._hasPushState&&!b)return this.fragment=this.getFragment(null,!0),window.location.replace(this.options.root+"#"+this.fragment),!0;this._wantsPushState&&this._hasPushState&&b&&a.hash&&(this.fragment=this.getHash().replace(s,""),window.history.replaceState({},document.title,a.protocol+"//"+a.host+this.options.root+this.fragment));if(!this.options.silent)return this.loadUrl()},
-stop:function(){i(window).unbind("popstate",this.checkUrl).unbind("hashchange",this.checkUrl);clearInterval(this._checkUrlInterval);m.started=!1},route:function(a,b){this.handlers.unshift({route:a,callback:b})},checkUrl:function(){var a=this.getFragment();a==this.fragment&&this.iframe&&(a=this.getFragment(this.getHash(this.iframe)));if(a==this.fragment)return!1;this.iframe&&this.navigate(a);this.loadUrl()||this.loadUrl(this.getHash())},loadUrl:function(a){var b=this.fragment=this.getFragment(a);return f.any(this.handlers,
-function(a){if(a.route.test(b))return a.callback(b),!0})},navigate:function(a,b){if(!m.started)return!1;if(!b||!0===b)b={trigger:b};var c=(a||"").replace(s,"");this.fragment!=c&&(this._hasPushState?(0!=c.indexOf(this.options.root)&&(c=this.options.root+c),this.fragment=c,window.history[b.replace?"replaceState":"pushState"]({},document.title,c)):this._wantsHashChange?(this.fragment=c,this._updateHash(window.location,c,b.replace),this.iframe&&c!=this.getFragment(this.getHash(this.iframe))&&(b.replace||
-this.iframe.document.open().close(),this._updateHash(this.iframe.location,c,b.replace))):window.location.assign(this.options.root+a),b.trigger&&this.loadUrl(a))},_updateHash:function(a,b,c){c?a.replace(a.toString().replace(/(javascript:|#).*$/,"")+"#"+b):a.hash=b}});var v=g.View=function(a){this.cid=f.uniqueId("view");this._configure(a||{});this._ensureElement();this.initialize.apply(this,arguments);this.delegateEvents()},F=/^(\S+)\s*(.*)$/,w="model,collection,el,id,attributes,className,tagName".split(",");
-f.extend(v.prototype,k,{tagName:"div",$:function(a){return this.$el.find(a)},initialize:function(){},render:function(){return this},remove:function(){this.$el.remove();return this},make:function(a,b,c){a=document.createElement(a);b&&i(a).attr(b);c&&i(a).html(c);return a},setElement:function(a,b){this.$el&&this.undelegateEvents();this.$el=a instanceof i?a:i(a);this.el=this.$el[0];!1!==b&&this.delegateEvents();return this},delegateEvents:function(a){if(a||(a=n(this,"events"))){this.undelegateEvents();
-for(var b in a){var c=a[b];f.isFunction(c)||(c=this[a[b]]);if(!c)throw Error('Method "'+a[b]+'" does not exist');var d=b.match(F),e=d[1],d=d[2],c=f.bind(c,this),e=e+(".delegateEvents"+this.cid);""===d?this.$el.bind(e,c):this.$el.delegate(d,e,c)}}},undelegateEvents:function(){this.$el.unbind(".delegateEvents"+this.cid)},_configure:function(a){this.options&&(a=f.extend({},this.options,a));for(var b=0,c=w.length;b<c;b++){var d=w[b];a[d]&&(this[d]=a[d])}this.options=a},_ensureElement:function(){if(this.el)this.setElement(this.el,
-!1);else{var a=n(this,"attributes")||{};this.id&&(a.id=this.id);this.className&&(a["class"]=this.className);this.setElement(this.make(this.tagName,a),!1)}}});o.extend=r.extend=u.extend=v.extend=function(a,b){var c=G(this,a,b);c.extend=this.extend;return c};var H={create:"POST",update:"PUT","delete":"DELETE",read:"GET"};g.sync=function(a,b,c){var d=H[a];c||(c={});var e={type:d,dataType:"json"};c.url||(e.url=n(b,"url")||t());if(!c.data&&b&&("create"==a||"update"==a))e.contentType="application/json",
-e.data=JSON.stringify(b.toJSON());g.emulateJSON&&(e.contentType="application/x-www-form-urlencoded",e.data=e.data?{model:e.data}:{});if(g.emulateHTTP&&("PUT"===d||"DELETE"===d))g.emulateJSON&&(e.data._method=d),e.type="POST",e.beforeSend=function(a){a.setRequestHeader("X-HTTP-Method-Override",d)};"GET"!==e.type&&!g.emulateJSON&&(e.processData=!1);return i.ajax(f.extend(e,c))};g.wrapError=function(a,b,c){return function(d,e){e=d===b?e:d;a?a(b,e,c):b.trigger("error",b,e,c)}};var x=function(){},G=function(a,
-b,c){var d;d=b&&b.hasOwnProperty("constructor")?b.constructor:function(){a.apply(this,arguments)};f.extend(d,a);x.prototype=a.prototype;d.prototype=new x;b&&f.extend(d.prototype,b);c&&f.extend(d,c);d.prototype.constructor=d;d.__super__=a.prototype;return d},n=function(a,b){return!a||!a[b]?null:f.isFunction(a[b])?a[b]():a[b]},t=function(){throw Error('A "url" property or function must be specified');}}).call(this);
diff --git a/src/main/webapp/public/docs/lib/handlebars-1.0.0.js b/src/main/webapp/public/docs/lib/handlebars-1.0.0.js
deleted file mode 100644
index c70f09d1d..000000000
--- a/src/main/webapp/public/docs/lib/handlebars-1.0.0.js
+++ /dev/null
@@ -1,2278 +0,0 @@
-/*
-
-Copyright (C) 2011 by Yehuda Katz
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-*/
-
-// lib/handlebars/browser-prefix.js
-var Handlebars = {};
-
-(function(Handlebars, undefined) {
-;
-// lib/handlebars/base.js
-
-Handlebars.VERSION = "1.0.0";
-Handlebars.COMPILER_REVISION = 4;
-
-Handlebars.REVISION_CHANGES = {
-  1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it
-  2: '== 1.0.0-rc.3',
-  3: '== 1.0.0-rc.4',
-  4: '>= 1.0.0'
-};
-
-Handlebars.helpers  = {};
-Handlebars.partials = {};
-
-var toString = Object.prototype.toString,
-    functionType = '[object Function]',
-    objectType = '[object Object]';
-
-Handlebars.registerHelper = function(name, fn, inverse) {
-  if (toString.call(name) === objectType) {
-    if (inverse || fn) { throw new Handlebars.Exception('Arg not supported with multiple helpers'); }
-    Handlebars.Utils.extend(this.helpers, name);
-  } else {
-    if (inverse) { fn.not = inverse; }
-    this.helpers[name] = fn;
-  }
-};
-
-Handlebars.registerPartial = function(name, str) {
-  if (toString.call(name) === objectType) {
-    Handlebars.Utils.extend(this.partials,  name);
-  } else {
-    this.partials[name] = str;
-  }
-};
-
-Handlebars.registerHelper('helperMissing', function(arg) {
-  if(arguments.length === 2) {
-    return undefined;
-  } else {
-    throw new Error("Missing helper: '" + arg + "'");
-  }
-});
-
-Handlebars.registerHelper('blockHelperMissing', function(context, options) {
-  var inverse = options.inverse || function() {}, fn = options.fn;
-
-  var type = toString.call(context);
-
-  if(type === functionType) { context = context.call(this); }
-
-  if(context === true) {
-    return fn(this);
-  } else if(context === false || context == null) {
-    return inverse(this);
-  } else if(type === "[object Array]") {
-    if(context.length > 0) {
-      return Handlebars.helpers.each(context, options);
-    } else {
-      return inverse(this);
-    }
-  } else {
-    return fn(context);
-  }
-});
-
-Handlebars.K = function() {};
-
-Handlebars.createFrame = Object.create || function(object) {
-  Handlebars.K.prototype = object;
-  var obj = new Handlebars.K();
-  Handlebars.K.prototype = null;
-  return obj;
-};
-
-Handlebars.logger = {
-  DEBUG: 0, INFO: 1, WARN: 2, ERROR: 3, level: 3,
-
-  methodMap: {0: 'debug', 1: 'info', 2: 'warn', 3: 'error'},
-
-  // can be overridden in the host environment
-  log: function(level, obj) {
-    if (Handlebars.logger.level <= level) {
-      var method = Handlebars.logger.methodMap[level];
-      if (typeof console !== 'undefined' && console[method]) {
-        console[method].call(console, obj);
-      }
-    }
-  }
-};
-
-Handlebars.log = function(level, obj) { Handlebars.logger.log(level, obj); };
-
-Handlebars.registerHelper('each', function(context, options) {
-  var fn = options.fn, inverse = options.inverse;
-  var i = 0, ret = "", data;
-
-  var type = toString.call(context);
-  if(type === functionType) { context = context.call(this); }
-
-  if (options.data) {
-    data = Handlebars.createFrame(options.data);
-  }
-
-  if(context && typeof context === 'object') {
-    if(context instanceof Array){
-      for(var j = context.length; i<j; i++) {
-        if (data) { data.index = i; }
-        ret = ret + fn(context[i], { data: data });
-      }
-    } else {
-      for(var key in context) {
-        if(context.hasOwnProperty(key)) {
-          if(data) { data.key = key; }
-          ret = ret + fn(context[key], {data: data});
-          i++;
-        }
-      }
-    }
-  }
-
-  if(i === 0){
-    ret = inverse(this);
-  }
-
-  return ret;
-});
-
-Handlebars.registerHelper('if', function(conditional, options) {
-  var type = toString.call(conditional);
-  if(type === functionType) { conditional = conditional.call(this); }
-
-  if(!conditional || Handlebars.Utils.isEmpty(conditional)) {
-    return options.inverse(this);
-  } else {
-    return options.fn(this);
-  }
-});
-
-Handlebars.registerHelper('unless', function(conditional, options) {
-  return Handlebars.helpers['if'].call(this, conditional, {fn: options.inverse, inverse: options.fn});
-});
-
-Handlebars.registerHelper('with', function(context, options) {
-  var type = toString.call(context);
-  if(type === functionType) { context = context.call(this); }
-
-  if (!Handlebars.Utils.isEmpty(context)) return options.fn(context);
-});
-
-Handlebars.registerHelper('log', function(context, options) {
-  var level = options.data && options.data.level != null ? parseInt(options.data.level, 10) : 1;
-  Handlebars.log(level, context);
-});
-;
-// lib/handlebars/compiler/parser.js
-/* Jison generated parser */
-var handlebars = (function(){
-var parser = {trace: function trace() { },
-yy: {},
-symbols_: {"error":2,"root":3,"program":4,"EOF":5,"simpleInverse":6,"statements":7,"statement":8,"openInverse":9,"closeBlock":10,"openBlock":11,"mustache":12,"partial":13,"CONTENT":14,"COMMENT":15,"OPEN_BLOCK":16,"inMustache":17,"CLOSE":18,"OPEN_INVERSE":19,"OPEN_ENDBLOCK":20,"path":21,"OPEN":22,"OPEN_UNESCAPED":23,"CLOSE_UNESCAPED":24,"OPEN_PARTIAL":25,"partialName":26,"params":27,"hash":28,"dataName":29,"param":30,"STRING":31,"INTEGER":32,"BOOLEAN":33,"hashSegments":34,"hashSegment":35,"ID":36,"EQUALS":37,"DATA":38,"pathSegments":39,"SEP":40,"$accept":0,"$end":1},
-terminals_: {2:"error",5:"EOF",14:"CONTENT",15:"COMMENT",16:"OPEN_BLOCK",18:"CLOSE",19:"OPEN_INVERSE",20:"OPEN_ENDBLOCK",22:"OPEN",23:"OPEN_UNESCAPED",24:"CLOSE_UNESCAPED",25:"OPEN_PARTIAL",31:"STRING",32:"INTEGER",33:"BOOLEAN",36:"ID",37:"EQUALS",38:"DATA",40:"SEP"},
-productions_: [0,[3,2],[4,2],[4,3],[4,2],[4,1],[4,1],[4,0],[7,1],[7,2],[8,3],[8,3],[8,1],[8,1],[8,1],[8,1],[11,3],[9,3],[10,3],[12,3],[12,3],[13,3],[13,4],[6,2],[17,3],[17,2],[17,2],[17,1],[17,1],[27,2],[27,1],[30,1],[30,1],[30,1],[30,1],[30,1],[28,1],[34,2],[34,1],[35,3],[35,3],[35,3],[35,3],[35,3],[26,1],[26,1],[26,1],[29,2],[21,1],[39,3],[39,1]],
-performAction: function anonymous(yytext,yyleng,yylineno,yy,yystate,$$,_$) {
-
-var $0 = $$.length - 1;
-switch (yystate) {
-case 1: return $$[$0-1]; 
-break;
-case 2: this.$ = new yy.ProgramNode([], $$[$0]); 
-break;
-case 3: this.$ = new yy.ProgramNode($$[$0-2], $$[$0]); 
-break;
-case 4: this.$ = new yy.ProgramNode($$[$0-1], []); 
-break;
-case 5: this.$ = new yy.ProgramNode($$[$0]); 
-break;
-case 6: this.$ = new yy.ProgramNode([], []); 
-break;
-case 7: this.$ = new yy.ProgramNode([]); 
-break;
-case 8: this.$ = [$$[$0]]; 
-break;
-case 9: $$[$0-1].push($$[$0]); this.$ = $$[$0-1]; 
-break;
-case 10: this.$ = new yy.BlockNode($$[$0-2], $$[$0-1].inverse, $$[$0-1], $$[$0]); 
-break;
-case 11: this.$ = new yy.BlockNode($$[$0-2], $$[$0-1], $$[$0-1].inverse, $$[$0]); 
-break;
-case 12: this.$ = $$[$0]; 
-break;
-case 13: this.$ = $$[$0]; 
-break;
-case 14: this.$ = new yy.ContentNode($$[$0]); 
-break;
-case 15: this.$ = new yy.CommentNode($$[$0]); 
-break;
-case 16: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1]); 
-break;
-case 17: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1]); 
-break;
-case 18: this.$ = $$[$0-1]; 
-break;
-case 19:
-    // Parsing out the '&' escape token at this level saves ~500 bytes after min due to the removal of one parser node.
-    this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1], $$[$0-2][2] === '&');
-  
-break;
-case 20: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1], true); 
-break;
-case 21: this.$ = new yy.PartialNode($$[$0-1]); 
-break;
-case 22: this.$ = new yy.PartialNode($$[$0-2], $$[$0-1]); 
-break;
-case 23: 
-break;
-case 24: this.$ = [[$$[$0-2]].concat($$[$0-1]), $$[$0]]; 
-break;
-case 25: this.$ = [[$$[$0-1]].concat($$[$0]), null]; 
-break;
-case 26: this.$ = [[$$[$0-1]], $$[$0]]; 
-break;
-case 27: this.$ = [[$$[$0]], null]; 
-break;
-case 28: this.$ = [[$$[$0]], null]; 
-break;
-case 29: $$[$0-1].push($$[$0]); this.$ = $$[$0-1]; 
-break;
-case 30: this.$ = [$$[$0]]; 
-break;
-case 31: this.$ = $$[$0]; 
-break;
-case 32: this.$ = new yy.StringNode($$[$0]); 
-break;
-case 33: this.$ = new yy.IntegerNode($$[$0]); 
-break;
-case 34: this.$ = new yy.BooleanNode($$[$0]); 
-break;
-case 35: this.$ = $$[$0]; 
-break;
-case 36: this.$ = new yy.HashNode($$[$0]); 
-break;
-case 37: $$[$0-1].push($$[$0]); this.$ = $$[$0-1]; 
-break;
-case 38: this.$ = [$$[$0]]; 
-break;
-case 39: this.$ = [$$[$0-2], $$[$0]]; 
-break;
-case 40: this.$ = [$$[$0-2], new yy.StringNode($$[$0])]; 
-break;
-case 41: this.$ = [$$[$0-2], new yy.IntegerNode($$[$0])]; 
-break;
-case 42: this.$ = [$$[$0-2], new yy.BooleanNode($$[$0])]; 
-break;
-case 43: this.$ = [$$[$0-2], $$[$0]]; 
-break;
-case 44: this.$ = new yy.PartialNameNode($$[$0]); 
-break;
-case 45: this.$ = new yy.PartialNameNode(new yy.StringNode($$[$0])); 
-break;
-case 46: this.$ = new yy.PartialNameNode(new yy.IntegerNode($$[$0])); 
-break;
-case 47: this.$ = new yy.DataNode($$[$0]); 
-break;
-case 48: this.$ = new yy.IdNode($$[$0]); 
-break;
-case 49: $$[$0-2].push({part: $$[$0], separator: $$[$0-1]}); this.$ = $$[$0-2]; 
-break;
-case 50: this.$ = [{part: $$[$0]}]; 
-break;
-}
-},
-table: [{3:1,4:2,5:[2,7],6:3,7:4,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,5],22:[1,14],23:[1,15],25:[1,16]},{1:[3]},{5:[1,17]},{5:[2,6],7:18,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,19],20:[2,6],22:[1,14],23:[1,15],25:[1,16]},{5:[2,5],6:20,8:21,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,5],20:[2,5],22:[1,14],23:[1,15],25:[1,16]},{17:23,18:[1,22],21:24,29:25,36:[1,28],38:[1,27],39:26},{5:[2,8],14:[2,8],15:[2,8],16:[2,8],19:[2,8],20:[2,8],22:[2,8],23:[2,8],25:[2,8]},{4:29,6:3,7:4,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,5],20:[2,7],22:[1,14],23:[1,15],25:[1,16]},{4:30,6:3,7:4,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,5],20:[2,7],22:[1,14],23:[1,15],25:[1,16]},{5:[2,12],14:[2,12],15:[2,12],16:[2,12],19:[2,12],20:[2,12],22:[2,12],23:[2,12],25:[2,12]},{5:[2,13],14:[2,13],15:[2,13],16:[2,13],19:[2,13],20:[2,13],22:[2,13],23:[2,13],25:[2,13]},{5:[2,14],14:[2,14],15:[2,14],16:[2,14],19:[2,14],20:[2,14],22:[2,14],23:[2,14],25:[2,14]},{5:[2,15],14:[2,15],15:[2,15],16:[2,15],19:[2,15],20:[2,15],22:[2,15],23:[2,15],25:[2,15]},{17:31,21:24,29:25,36:[1,28],38:[1,27],39:26},{17:32,21:24,29:25,36:[1,28],38:[1,27],39:26},{17:33,21:24,29:25,36:[1,28],38:[1,27],39:26},{21:35,26:34,31:[1,36],32:[1,37],36:[1,28],39:26},{1:[2,1]},{5:[2,2],8:21,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,19],20:[2,2],22:[1,14],23:[1,15],25:[1,16]},{17:23,21:24,29:25,36:[1,28],38:[1,27],39:26},{5:[2,4],7:38,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,19],20:[2,4],22:[1,14],23:[1,15],25:[1,16]},{5:[2,9],14:[2,9],15:[2,9],16:[2,9],19:[2,9],20:[2,9],22:[2,9],23:[2,9],25:[2,9]},{5:[2,23],14:[2,23],15:[2,23],16:[2,23],19:[2,23],20:[2,23],22:[2,23],23:[2,23],25:[2,23]},{18:[1,39]},{18:[2,27],21:44,24:[2,27],27:40,28:41,29:48,30:42,31:[1,45],32:[1,46],33:[1,47],34:43,35:49,36:[1,50],38:[1,27],39:26},{18:[2,28],24:[2,28]},{18:[2,48],24:[2,48],31:[2,48],32:[2,48],33:[2,48],36:[2,48],38:[2,48],40:[1,51]},{21:52,36:[1,28],39:26},{18:[2,50],24:[2,50],31:[2,50],32:[2,50],33:[2,50],36:[2,50],38:[2,50],40:[2,50]},{10:53,20:[1,54]},{10:55,20:[1,54]},{18:[1,56]},{18:[1,57]},{24:[1,58]},{18:[1,59],21:60,36:[1,28],39:26},{18:[2,44],36:[2,44]},{18:[2,45],36:[2,45]},{18:[2,46],36:[2,46]},{5:[2,3],8:21,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,19],20:[2,3],22:[1,14],23:[1,15],25:[1,16]},{14:[2,17],15:[2,17],16:[2,17],19:[2,17],20:[2,17],22:[2,17],23:[2,17],25:[2,17]},{18:[2,25],21:44,24:[2,25],28:61,29:48,30:62,31:[1,45],32:[1,46],33:[1,47],34:43,35:49,36:[1,50],38:[1,27],39:26},{18:[2,26],24:[2,26]},{18:[2,30],24:[2,30],31:[2,30],32:[2,30],33:[2,30],36:[2,30],38:[2,30]},{18:[2,36],24:[2,36],35:63,36:[1,64]},{18:[2,31],24:[2,31],31:[2,31],32:[2,31],33:[2,31],36:[2,31],38:[2,31]},{18:[2,32],24:[2,32],31:[2,32],32:[2,32],33:[2,32],36:[2,32],38:[2,32]},{18:[2,33],24:[2,33],31:[2,33],32:[2,33],33:[2,33],36:[2,33],38:[2,33]},{18:[2,34],24:[2,34],31:[2,34],32:[2,34],33:[2,34],36:[2,34],38:[2,34]},{18:[2,35],24:[2,35],31:[2,35],32:[2,35],33:[2,35],36:[2,35],38:[2,35]},{18:[2,38],24:[2,38],36:[2,38]},{18:[2,50],24:[2,50],31:[2,50],32:[2,50],33:[2,50],36:[2,50],37:[1,65],38:[2,50],40:[2,50]},{36:[1,66]},{18:[2,47],24:[2,47],31:[2,47],32:[2,47],33:[2,47],36:[2,47],38:[2,47]},{5:[2,10],14:[2,10],15:[2,10],16:[2,10],19:[2,10],20:[2,10],22:[2,10],23:[2,10],25:[2,10]},{21:67,36:[1,28],39:26},{5:[2,11],14:[2,11],15:[2,11],16:[2,11],19:[2,11],20:[2,11],22:[2,11],23:[2,11],25:[2,11]},{14:[2,16],15:[2,16],16:[2,16],19:[2,16],20:[2,16],22:[2,16],23:[2,16],25:[2,16]},{5:[2,19],14:[2,19],15:[2,19],16:[2,19],19:[2,19],20:[2,19],22:[2,19],23:[2,19],25:[2,19]},{5:[2,20],14:[2,20],15:[2,20],16:[2,20],19:[2,20],20:[2,20],22:[2,20],23:[2,20],25:[2,20]},{5:[2,21],14:[2,21],15:[2,21],16:[2,21],19:[2,21],20:[2,21],22:[2,21],23:[2,21],25:[2,21]},{18:[1,68]},{18:[2,24],24:[2,24]},{18:[2,29],24:[2,29],31:[2,29],32:[2,29],33:[2,29],36:[2,29],38:[2,29]},{18:[2,37],24:[2,37],36:[2,37]},{37:[1,65]},{21:69,29:73,31:[1,70],32:[1,71],33:[1,72],36:[1,28],38:[1,27],39:26},{18:[2,49],24:[2,49],31:[2,49],32:[2,49],33:[2,49],36:[2,49],38:[2,49],40:[2,49]},{18:[1,74]},{5:[2,22],14:[2,22],15:[2,22],16:[2,22],19:[2,22],20:[2,22],22:[2,22],23:[2,22],25:[2,22]},{18:[2,39],24:[2,39],36:[2,39]},{18:[2,40],24:[2,40],36:[2,40]},{18:[2,41],24:[2,41],36:[2,41]},{18:[2,42],24:[2,42],36:[2,42]},{18:[2,43],24:[2,43],36:[2,43]},{5:[2,18],14:[2,18],15:[2,18],16:[2,18],19:[2,18],20:[2,18],22:[2,18],23:[2,18],25:[2,18]}],
-defaultActions: {17:[2,1]},
-parseError: function parseError(str, hash) {
-    throw new Error(str);
-},
-parse: function parse(input) {
-    var self = this, stack = [0], vstack = [null], lstack = [], table = this.table, yytext = "", yylineno = 0, yyleng = 0, recovering = 0, TERROR = 2, EOF = 1;
-    this.lexer.setInput(input);
-    this.lexer.yy = this.yy;
-    this.yy.lexer = this.lexer;
-    this.yy.parser = this;
-    if (typeof this.lexer.yylloc == "undefined")
-        this.lexer.yylloc = {};
-    var yyloc = this.lexer.yylloc;
-    lstack.push(yyloc);
-    var ranges = this.lexer.options && this.lexer.options.ranges;
-    if (typeof this.yy.parseError === "function")
-        this.parseError = this.yy.parseError;
-    function popStack(n) {
-        stack.length = stack.length - 2 * n;
-        vstack.length = vstack.length - n;
-        lstack.length = lstack.length - n;
-    }
-    function lex() {
-        var token;
-        token = self.lexer.lex() || 1;
-        if (typeof token !== "number") {
-            token = self.symbols_[token] || token;
-        }
-        return token;
-    }
-    var symbol, preErrorSymbol, state, action, a, r, yyval = {}, p, len, newState, expected;
-    while (true) {
-        state = stack[stack.length - 1];
-        if (this.defaultActions[state]) {
-            action = this.defaultActions[state];
-        } else {
-            if (symbol === null || typeof symbol == "undefined") {
-                symbol = lex();
-            }
-            action = table[state] && table[state][symbol];
-        }
-        if (typeof action === "undefined" || !action.length || !action[0]) {
-            var errStr = "";
-            if (!recovering) {
-                expected = [];
-                for (p in table[state])
-                    if (this.terminals_[p] && p > 2) {
-                        expected.push("'" + this.terminals_[p] + "'");
-                    }
-                if (this.lexer.showPosition) {
-                    errStr = "Parse error on line " + (yylineno + 1) + ":\n" + this.lexer.showPosition() + "\nExpecting " + expected.join(", ") + ", got '" + (this.terminals_[symbol] || symbol) + "'";
-                } else {
-                    errStr = "Parse error on line " + (yylineno + 1) + ": Unexpected " + (symbol == 1?"end of input":"'" + (this.terminals_[symbol] || symbol) + "'");
-                }
-                this.parseError(errStr, {text: this.lexer.match, token: this.terminals_[symbol] || symbol, line: this.lexer.yylineno, loc: yyloc, expected: expected});
-            }
-        }
-        if (action[0] instanceof Array && action.length > 1) {
-            throw new Error("Parse Error: multiple actions possible at state: " + state + ", token: " + symbol);
-        }
-        switch (action[0]) {
-        case 1:
-            stack.push(symbol);
-            vstack.push(this.lexer.yytext);
-            lstack.push(this.lexer.yylloc);
-            stack.push(action[1]);
-            symbol = null;
-            if (!preErrorSymbol) {
-                yyleng = this.lexer.yyleng;
-                yytext = this.lexer.yytext;
-                yylineno = this.lexer.yylineno;
-                yyloc = this.lexer.yylloc;
-                if (recovering > 0)
-                    recovering--;
-            } else {
-                symbol = preErrorSymbol;
-                preErrorSymbol = null;
-            }
-            break;
-        case 2:
-            len = this.productions_[action[1]][1];
-            yyval.$ = vstack[vstack.length - len];
-            yyval._$ = {first_line: lstack[lstack.length - (len || 1)].first_line, last_line: lstack[lstack.length - 1].last_line, first_column: lstack[lstack.length - (len || 1)].first_column, last_column: lstack[lstack.length - 1].last_column};
-            if (ranges) {
-                yyval._$.range = [lstack[lstack.length - (len || 1)].range[0], lstack[lstack.length - 1].range[1]];
-            }
-            r = this.performAction.call(yyval, yytext, yyleng, yylineno, this.yy, action[1], vstack, lstack);
-            if (typeof r !== "undefined") {
-                return r;
-            }
-            if (len) {
-                stack = stack.slice(0, -1 * len * 2);
-                vstack = vstack.slice(0, -1 * len);
-                lstack = lstack.slice(0, -1 * len);
-            }
-            stack.push(this.productions_[action[1]][0]);
-            vstack.push(yyval.$);
-            lstack.push(yyval._$);
-            newState = table[stack[stack.length - 2]][stack[stack.length - 1]];
-            stack.push(newState);
-            break;
-        case 3:
-            return true;
-        }
-    }
-    return true;
-}
-};
-/* Jison generated lexer */
-var lexer = (function(){
-var lexer = ({EOF:1,
-parseError:function parseError(str, hash) {
-        if (this.yy.parser) {
-            this.yy.parser.parseError(str, hash);
-        } else {
-            throw new Error(str);
-        }
-    },
-setInput:function (input) {
-        this._input = input;
-        this._more = this._less = this.done = false;
-        this.yylineno = this.yyleng = 0;
-        this.yytext = this.matched = this.match = '';
-        this.conditionStack = ['INITIAL'];
-        this.yylloc = {first_line:1,first_column:0,last_line:1,last_column:0};
-        if (this.options.ranges) this.yylloc.range = [0,0];
-        this.offset = 0;
-        return this;
-    },
-input:function () {
-        var ch = this._input[0];
-        this.yytext += ch;
-        this.yyleng++;
-        this.offset++;
-        this.match += ch;
-        this.matched += ch;
-        var lines = ch.match(/(?:\r\n?|\n).*/g);
-        if (lines) {
-            this.yylineno++;
-            this.yylloc.last_line++;
-        } else {
-            this.yylloc.last_column++;
-        }
-        if (this.options.ranges) this.yylloc.range[1]++;
-
-        this._input = this._input.slice(1);
-        return ch;
-    },
-unput:function (ch) {
-        var len = ch.length;
-        var lines = ch.split(/(?:\r\n?|\n)/g);
-
-        this._input = ch + this._input;
-        this.yytext = this.yytext.substr(0, this.yytext.length-len-1);
-        //this.yyleng -= len;
-        this.offset -= len;
-        var oldLines = this.match.split(/(?:\r\n?|\n)/g);
-        this.match = this.match.substr(0, this.match.length-1);
-        this.matched = this.matched.substr(0, this.matched.length-1);
-
-        if (lines.length-1) this.yylineno -= lines.length-1;
-        var r = this.yylloc.range;
-
-        this.yylloc = {first_line: this.yylloc.first_line,
-          last_line: this.yylineno+1,
-          first_column: this.yylloc.first_column,
-          last_column: lines ?
-              (lines.length === oldLines.length ? this.yylloc.first_column : 0) + oldLines[oldLines.length - lines.length].length - lines[0].length:
-              this.yylloc.first_column - len
-          };
-
-        if (this.options.ranges) {
-            this.yylloc.range = [r[0], r[0] + this.yyleng - len];
-        }
-        return this;
-    },
-more:function () {
-        this._more = true;
-        return this;
-    },
-less:function (n) {
-        this.unput(this.match.slice(n));
-    },
-pastInput:function () {
-        var past = this.matched.substr(0, this.matched.length - this.match.length);
-        return (past.length > 20 ? '...':'') + past.substr(-20).replace(/\n/g, "");
-    },
-upcomingInput:function () {
-        var next = this.match;
-        if (next.length < 20) {
-            next += this._input.substr(0, 20-next.length);
-        }
-        return (next.substr(0,20)+(next.length > 20 ? '...':'')).replace(/\n/g, "");
-    },
-showPosition:function () {
-        var pre = this.pastInput();
-        var c = new Array(pre.length + 1).join("-");
-        return pre + this.upcomingInput() + "\n" + c+"^";
-    },
-next:function () {
-        if (this.done) {
-            return this.EOF;
-        }
-        if (!this._input) this.done = true;
-
-        var token,
-            match,
-            tempMatch,
-            index,
-            col,
-            lines;
-        if (!this._more) {
-            this.yytext = '';
-            this.match = '';
-        }
-        var rules = this._currentRules();
-        for (var i=0;i < rules.length; i++) {
-            tempMatch = this._input.match(this.rules[rules[i]]);
-            if (tempMatch && (!match || tempMatch[0].length > match[0].length)) {
-                match = tempMatch;
-                index = i;
-                if (!this.options.flex) break;
-            }
-        }
-        if (match) {
-            lines = match[0].match(/(?:\r\n?|\n).*/g);
-            if (lines) this.yylineno += lines.length;
-            this.yylloc = {first_line: this.yylloc.last_line,
-                           last_line: this.yylineno+1,
-                           first_column: this.yylloc.last_column,
-                           last_column: lines ? lines[lines.length-1].length-lines[lines.length-1].match(/\r?\n?/)[0].length : this.yylloc.last_column + match[0].length};
-            this.yytext += match[0];
-            this.match += match[0];
-            this.matches = match;
-            this.yyleng = this.yytext.length;
-            if (this.options.ranges) {
-                this.yylloc.range = [this.offset, this.offset += this.yyleng];
-            }
-            this._more = false;
-            this._input = this._input.slice(match[0].length);
-            this.matched += match[0];
-            token = this.performAction.call(this, this.yy, this, rules[index],this.conditionStack[this.conditionStack.length-1]);
-            if (this.done && this._input) this.done = false;
-            if (token) return token;
-            else return;
-        }
-        if (this._input === "") {
-            return this.EOF;
-        } else {
-            return this.parseError('Lexical error on line '+(this.yylineno+1)+'. Unrecognized text.\n'+this.showPosition(),
-                    {text: "", token: null, line: this.yylineno});
-        }
-    },
-lex:function lex() {
-        var r = this.next();
-        if (typeof r !== 'undefined') {
-            return r;
-        } else {
-            return this.lex();
-        }
-    },
-begin:function begin(condition) {
-        this.conditionStack.push(condition);
-    },
-popState:function popState() {
-        return this.conditionStack.pop();
-    },
-_currentRules:function _currentRules() {
-        return this.conditions[this.conditionStack[this.conditionStack.length-1]].rules;
-    },
-topState:function () {
-        return this.conditionStack[this.conditionStack.length-2];
-    },
-pushState:function begin(condition) {
-        this.begin(condition);
-    }});
-lexer.options = {};
-lexer.performAction = function anonymous(yy,yy_,$avoiding_name_collisions,YY_START) {
-
-var YYSTATE=YY_START
-switch($avoiding_name_collisions) {
-case 0: yy_.yytext = "\\"; return 14; 
-break;
-case 1:
-                                   if(yy_.yytext.slice(-1) !== "\\") this.begin("mu");
-                                   if(yy_.yytext.slice(-1) === "\\") yy_.yytext = yy_.yytext.substr(0,yy_.yyleng-1), this.begin("emu");
-                                   if(yy_.yytext) return 14;
-                                 
-break;
-case 2: return 14; 
-break;
-case 3:
-                                   if(yy_.yytext.slice(-1) !== "\\") this.popState();
-                                   if(yy_.yytext.slice(-1) === "\\") yy_.yytext = yy_.yytext.substr(0,yy_.yyleng-1);
-                                   return 14;
-                                 
-break;
-case 4: yy_.yytext = yy_.yytext.substr(0, yy_.yyleng-4); this.popState(); return 15; 
-break;
-case 5: return 25; 
-break;
-case 6: return 16; 
-break;
-case 7: return 20; 
-break;
-case 8: return 19; 
-break;
-case 9: return 19; 
-break;
-case 10: return 23; 
-break;
-case 11: return 22; 
-break;
-case 12: this.popState(); this.begin('com'); 
-break;
-case 13: yy_.yytext = yy_.yytext.substr(3,yy_.yyleng-5); this.popState(); return 15; 
-break;
-case 14: return 22; 
-break;
-case 15: return 37; 
-break;
-case 16: return 36; 
-break;
-case 17: return 36; 
-break;
-case 18: return 40; 
-break;
-case 19: /*ignore whitespace*/ 
-break;
-case 20: this.popState(); return 24; 
-break;
-case 21: this.popState(); return 18; 
-break;
-case 22: yy_.yytext = yy_.yytext.substr(1,yy_.yyleng-2).replace(/\\"/g,'"'); return 31; 
-break;
-case 23: yy_.yytext = yy_.yytext.substr(1,yy_.yyleng-2).replace(/\\'/g,"'"); return 31; 
-break;
-case 24: return 38; 
-break;
-case 25: return 33; 
-break;
-case 26: return 33; 
-break;
-case 27: return 32; 
-break;
-case 28: return 36; 
-break;
-case 29: yy_.yytext = yy_.yytext.substr(1, yy_.yyleng-2); return 36; 
-break;
-case 30: return 'INVALID'; 
-break;
-case 31: return 5; 
-break;
-}
-};
-lexer.rules = [/^(?:\\\\(?=(\{\{)))/,/^(?:[^\x00]*?(?=(\{\{)))/,/^(?:[^\x00]+)/,/^(?:[^\x00]{2,}?(?=(\{\{|$)))/,/^(?:[\s\S]*?--\}\})/,/^(?:\{\{>)/,/^(?:\{\{#)/,/^(?:\{\{\/)/,/^(?:\{\{\^)/,/^(?:\{\{\s*else\b)/,/^(?:\{\{\{)/,/^(?:\{\{&)/,/^(?:\{\{!--)/,/^(?:\{\{![\s\S]*?\}\})/,/^(?:\{\{)/,/^(?:=)/,/^(?:\.(?=[}\/ ]))/,/^(?:\.\.)/,/^(?:[\/.])/,/^(?:\s+)/,/^(?:\}\}\})/,/^(?:\}\})/,/^(?:"(\\["]|[^"])*")/,/^(?:'(\\[']|[^'])*')/,/^(?:@)/,/^(?:true(?=[}\s]))/,/^(?:false(?=[}\s]))/,/^(?:-?[0-9]+(?=[}\s]))/,/^(?:[^\s!"#%-,\.\/;->@\[-\^`\{-~]+(?=[=}\s\/.]))/,/^(?:\[[^\]]*\])/,/^(?:.)/,/^(?:$)/];
-lexer.conditions = {"mu":{"rules":[5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31],"inclusive":false},"emu":{"rules":[3],"inclusive":false},"com":{"rules":[4],"inclusive":false},"INITIAL":{"rules":[0,1,2,31],"inclusive":true}};
-return lexer;})()
-parser.lexer = lexer;
-function Parser () { this.yy = {}; }Parser.prototype = parser;parser.Parser = Parser;
-return new Parser;
-})();;
-// lib/handlebars/compiler/base.js
-
-Handlebars.Parser = handlebars;
-
-Handlebars.parse = function(input) {
-
-  // Just return if an already-compile AST was passed in.
-  if(input.constructor === Handlebars.AST.ProgramNode) { return input; }
-
-  Handlebars.Parser.yy = Handlebars.AST;
-  return Handlebars.Parser.parse(input);
-};
-;
-// lib/handlebars/compiler/ast.js
-Handlebars.AST = {};
-
-Handlebars.AST.ProgramNode = function(statements, inverse) {
-  this.type = "program";
-  this.statements = statements;
-  if(inverse) { this.inverse = new Handlebars.AST.ProgramNode(inverse); }
-};
-
-Handlebars.AST.MustacheNode = function(rawParams, hash, unescaped) {
-  this.type = "mustache";
-  this.escaped = !unescaped;
-  this.hash = hash;
-
-  var id = this.id = rawParams[0];
-  var params = this.params = rawParams.slice(1);
-
-  // a mustache is an eligible helper if:
-  // * its id is simple (a single part, not `this` or `..`)
-  var eligibleHelper = this.eligibleHelper = id.isSimple;
-
-  // a mustache is definitely a helper if:
-  // * it is an eligible helper, and
-  // * it has at least one parameter or hash segment
-  this.isHelper = eligibleHelper && (params.length || hash);
-
-  // if a mustache is an eligible helper but not a definite
-  // helper, it is ambiguous, and will be resolved in a later
-  // pass or at runtime.
-};
-
-Handlebars.AST.PartialNode = function(partialName, context) {
-  this.type         = "partial";
-  this.partialName  = partialName;
-  this.context      = context;
-};
-
-Handlebars.AST.BlockNode = function(mustache, program, inverse, close) {
-  var verifyMatch = function(open, close) {
-    if(open.original !== close.original) {
-      throw new Handlebars.Exception(open.original + " doesn't match " + close.original);
-    }
-  };
-
-  verifyMatch(mustache.id, close);
-  this.type = "block";
-  this.mustache = mustache;
-  this.program  = program;
-  this.inverse  = inverse;
-
-  if (this.inverse && !this.program) {
-    this.isInverse = true;
-  }
-};
-
-Handlebars.AST.ContentNode = function(string) {
-  this.type = "content";
-  this.string = string;
-};
-
-Handlebars.AST.HashNode = function(pairs) {
-  this.type = "hash";
-  this.pairs = pairs;
-};
-
-Handlebars.AST.IdNode = function(parts) {
-  this.type = "ID";
-
-  var original = "",
-      dig = [],
-      depth = 0;
-
-  for(var i=0,l=parts.length; i<l; i++) {
-    var part = parts[i].part;
-    original += (parts[i].separator || '') + part;
-
-    if (part === ".." || part === "." || part === "this") {
-      if (dig.length > 0) { throw new Handlebars.Exception("Invalid path: " + original); }
-      else if (part === "..") { depth++; }
-      else { this.isScoped = true; }
-    }
-    else { dig.push(part); }
-  }
-
-  this.original = original;
-  this.parts    = dig;
-  this.string   = dig.join('.');
-  this.depth    = depth;
-
-  // an ID is simple if it only has one part, and that part is not
-  // `..` or `this`.
-  this.isSimple = parts.length === 1 && !this.isScoped && depth === 0;
-
-  this.stringModeValue = this.string;
-};
-
-Handlebars.AST.PartialNameNode = function(name) {
-  this.type = "PARTIAL_NAME";
-  this.name = name.original;
-};
-
-Handlebars.AST.DataNode = function(id) {
-  this.type = "DATA";
-  this.id = id;
-};
-
-Handlebars.AST.StringNode = function(string) {
-  this.type = "STRING";
-  this.original =
-    this.string =
-    this.stringModeValue = string;
-};
-
-Handlebars.AST.IntegerNode = function(integer) {
-  this.type = "INTEGER";
-  this.original =
-    this.integer = integer;
-  this.stringModeValue = Number(integer);
-};
-
-Handlebars.AST.BooleanNode = function(bool) {
-  this.type = "BOOLEAN";
-  this.bool = bool;
-  this.stringModeValue = bool === "true";
-};
-
-Handlebars.AST.CommentNode = function(comment) {
-  this.type = "comment";
-  this.comment = comment;
-};
-;
-// lib/handlebars/utils.js
-
-var errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack'];
-
-Handlebars.Exception = function(message) {
-  var tmp = Error.prototype.constructor.apply(this, arguments);
-
-  // Unfortunately errors are not enumerable in Chrome (at least), so `for prop in tmp` doesn't work.
-  for (var idx = 0; idx < errorProps.length; idx++) {
-    this[errorProps[idx]] = tmp[errorProps[idx]];
-  }
-};
-Handlebars.Exception.prototype = new Error();
-
-// Build out our basic SafeString type
-Handlebars.SafeString = function(string) {
-  this.string = string;
-};
-Handlebars.SafeString.prototype.toString = function() {
-  return this.string.toString();
-};
-
-var escape = {
-  "&": "&amp;",
-  "<": "&lt;",
-  ">": "&gt;",
-  '"': "&quot;",
-  "'": "&#x27;",
-  "`": "&#x60;"
-};
-
-var badChars = /[&<>"'`]/g;
-var possible = /[&<>"'`]/;
-
-var escapeChar = function(chr) {
-  return escape[chr] || "&amp;";
-};
-
-Handlebars.Utils = {
-  extend: function(obj, value) {
-    for(var key in value) {
-      if(value.hasOwnProperty(key)) {
-        obj[key] = value[key];
-      }
-    }
-  },
-
-  escapeExpression: function(string) {
-    // don't escape SafeStrings, since they're already safe
-    if (string instanceof Handlebars.SafeString) {
-      return string.toString();
-    } else if (string == null || string === false) {
-      return "";
-    }
-
-    // Force a string conversion as this will be done by the append regardless and
-    // the regex test will do this transparently behind the scenes, causing issues if
-    // an object's to string has escaped characters in it.
-    string = string.toString();
-
-    if(!possible.test(string)) { return string; }
-    return string.replace(badChars, escapeChar);
-  },
-
-  isEmpty: function(value) {
-    if (!value && value !== 0) {
-      return true;
-    } else if(toString.call(value) === "[object Array]" && value.length === 0) {
-      return true;
-    } else {
-      return false;
-    }
-  }
-};
-;
-// lib/handlebars/compiler/compiler.js
-
-/*jshint eqnull:true*/
-var Compiler = Handlebars.Compiler = function() {};
-var JavaScriptCompiler = Handlebars.JavaScriptCompiler = function() {};
-
-// the foundHelper register will disambiguate helper lookup from finding a
-// function in a context. This is necessary for mustache compatibility, which
-// requires that context functions in blocks are evaluated by blockHelperMissing,
-// and then proceed as if the resulting value was provided to blockHelperMissing.
-
-Compiler.prototype = {
-  compiler: Compiler,
-
-  disassemble: function() {
-    var opcodes = this.opcodes, opcode, out = [], params, param;
-
-    for (var i=0, l=opcodes.length; i<l; i++) {
-      opcode = opcodes[i];
-
-      if (opcode.opcode === 'DECLARE') {
-        out.push("DECLARE " + opcode.name + "=" + opcode.value);
-      } else {
-        params = [];
-        for (var j=0; j<opcode.args.length; j++) {
-          param = opcode.args[j];
-          if (typeof param === "string") {
-            param = "\"" + param.replace("\n", "\\n") + "\"";
-          }
-          params.push(param);
-        }
-        out.push(opcode.opcode + " " + params.join(" "));
-      }
-    }
-
-    return out.join("\n");
-  },
-  equals: function(other) {
-    var len = this.opcodes.length;
-    if (other.opcodes.length !== len) {
-      return false;
-    }
-
-    for (var i = 0; i < len; i++) {
-      var opcode = this.opcodes[i],
-          otherOpcode = other.opcodes[i];
-      if (opcode.opcode !== otherOpcode.opcode || opcode.args.length !== otherOpcode.args.length) {
-        return false;
-      }
-      for (var j = 0; j < opcode.args.length; j++) {
-        if (opcode.args[j] !== otherOpcode.args[j]) {
-          return false;
-        }
-      }
-    }
-
-    len = this.children.length;
-    if (other.children.length !== len) {
-      return false;
-    }
-    for (i = 0; i < len; i++) {
-      if (!this.children[i].equals(other.children[i])) {
-        return false;
-      }
-    }
-
-    return true;
-  },
-
-  guid: 0,
-
-  compile: function(program, options) {
-    this.children = [];
-    this.depths = {list: []};
-    this.options = options;
-
-    // These changes will propagate to the other compiler components
-    var knownHelpers = this.options.knownHelpers;
-    this.options.knownHelpers = {
-      'helperMissing': true,
-      'blockHelperMissing': true,
-      'each': true,
-      'if': true,
-      'unless': true,
-      'with': true,
-      'log': true
-    };
-    if (knownHelpers) {
-      for (var name in knownHelpers) {
-        this.options.knownHelpers[name] = knownHelpers[name];
-      }
-    }
-
-    return this.program(program);
-  },
-
-  accept: function(node) {
-    return this[node.type](node);
-  },
-
-  program: function(program) {
-    var statements = program.statements, statement;
-    this.opcodes = [];
-
-    for(var i=0, l=statements.length; i<l; i++) {
-      statement = statements[i];
-      this[statement.type](statement);
-    }
-    this.isSimple = l === 1;
-
-    this.depths.list = this.depths.list.sort(function(a, b) {
-      return a - b;
-    });
-
-    return this;
-  },
-
-  compileProgram: function(program) {
-    var result = new this.compiler().compile(program, this.options);
-    var guid = this.guid++, depth;
-
-    this.usePartial = this.usePartial || result.usePartial;
-
-    this.children[guid] = result;
-
-    for(var i=0, l=result.depths.list.length; i<l; i++) {
-      depth = result.depths.list[i];
-
-      if(depth < 2) { continue; }
-      else { this.addDepth(depth - 1); }
-    }
-
-    return guid;
-  },
-
-  block: function(block) {
-    var mustache = block.mustache,
-        program = block.program,
-        inverse = block.inverse;
-
-    if (program) {
-      program = this.compileProgram(program);
-    }
-
-    if (inverse) {
-      inverse = this.compileProgram(inverse);
-    }
-
-    var type = this.classifyMustache(mustache);
-
-    if (type === "helper") {
-      this.helperMustache(mustache, program, inverse);
-    } else if (type === "simple") {
-      this.simpleMustache(mustache);
-
-      // now that the simple mustache is resolved, we need to
-      // evaluate it by executing `blockHelperMissing`
-      this.opcode('pushProgram', program);
-      this.opcode('pushProgram', inverse);
-      this.opcode('emptyHash');
-      this.opcode('blockValue');
-    } else {
-      this.ambiguousMustache(mustache, program, inverse);
-
-      // now that the simple mustache is resolved, we need to
-      // evaluate it by executing `blockHelperMissing`
-      this.opcode('pushProgram', program);
-      this.opcode('pushProgram', inverse);
-      this.opcode('emptyHash');
-      this.opcode('ambiguousBlockValue');
-    }
-
-    this.opcode('append');
-  },
-
-  hash: function(hash) {
-    var pairs = hash.pairs, pair, val;
-
-    this.opcode('pushHash');
-
-    for(var i=0, l=pairs.length; i<l; i++) {
-      pair = pairs[i];
-      val  = pair[1];
-
-      if (this.options.stringParams) {
-        if(val.depth) {
-          this.addDepth(val.depth);
-        }
-        this.opcode('getContext', val.depth || 0);
-        this.opcode('pushStringParam', val.stringModeValue, val.type);
-      } else {
-        this.accept(val);
-      }
-
-      this.opcode('assignToHash', pair[0]);
-    }
-    this.opcode('popHash');
-  },
-
-  partial: function(partial) {
-    var partialName = partial.partialName;
-    this.usePartial = true;
-
-    if(partial.context) {
-      this.ID(partial.context);
-    } else {
-      this.opcode('push', 'depth0');
-    }
-
-    this.opcode('invokePartial', partialName.name);
-    this.opcode('append');
-  },
-
-  content: function(content) {
-    this.opcode('appendContent', content.string);
-  },
-
-  mustache: function(mustache) {
-    var options = this.options;
-    var type = this.classifyMustache(mustache);
-
-    if (type === "simple") {
-      this.simpleMustache(mustache);
-    } else if (type === "helper") {
-      this.helperMustache(mustache);
-    } else {
-      this.ambiguousMustache(mustache);
-    }
-
-    if(mustache.escaped && !options.noEscape) {
-      this.opcode('appendEscaped');
-    } else {
-      this.opcode('append');
-    }
-  },
-
-  ambiguousMustache: function(mustache, program, inverse) {
-    var id = mustache.id,
-        name = id.parts[0],
-        isBlock = program != null || inverse != null;
-
-    this.opcode('getContext', id.depth);
-
-    this.opcode('pushProgram', program);
-    this.opcode('pushProgram', inverse);
-
-    this.opcode('invokeAmbiguous', name, isBlock);
-  },
-
-  simpleMustache: function(mustache) {
-    var id = mustache.id;
-
-    if (id.type === 'DATA') {
-      this.DATA(id);
-    } else if (id.parts.length) {
-      this.ID(id);
-    } else {
-      // Simplified ID for `this`
-      this.addDepth(id.depth);
-      this.opcode('getContext', id.depth);
-      this.opcode('pushContext');
-    }
-
-    this.opcode('resolvePossibleLambda');
-  },
-
-  helperMustache: function(mustache, program, inverse) {
-    var params = this.setupFullMustacheParams(mustache, program, inverse),
-        name = mustache.id.parts[0];
-
-    if (this.options.knownHelpers[name]) {
-      this.opcode('invokeKnownHelper', params.length, name);
-    } else if (this.options.knownHelpersOnly) {
-      throw new Error("You specified knownHelpersOnly, but used the unknown helper " + name);
-    } else {
-      this.opcode('invokeHelper', params.length, name);
-    }
-  },
-
-  ID: function(id) {
-    this.addDepth(id.depth);
-    this.opcode('getContext', id.depth);
-
-    var name = id.parts[0];
-    if (!name) {
-      this.opcode('pushContext');
-    } else {
-      this.opcode('lookupOnContext', id.parts[0]);
-    }
-
-    for(var i=1, l=id.parts.length; i<l; i++) {
-      this.opcode('lookup', id.parts[i]);
-    }
-  },
-
-  DATA: function(data) {
-    this.options.data = true;
-    if (data.id.isScoped || data.id.depth) {
-      throw new Handlebars.Exception('Scoped data references are not supported: ' + data.original);
-    }
-
-    this.opcode('lookupData');
-    var parts = data.id.parts;
-    for(var i=0, l=parts.length; i<l; i++) {
-      this.opcode('lookup', parts[i]);
-    }
-  },
-
-  STRING: function(string) {
-    this.opcode('pushString', string.string);
-  },
-
-  INTEGER: function(integer) {
-    this.opcode('pushLiteral', integer.integer);
-  },
-
-  BOOLEAN: function(bool) {
-    this.opcode('pushLiteral', bool.bool);
-  },
-
-  comment: function() {},
-
-  // HELPERS
-  opcode: function(name) {
-    this.opcodes.push({ opcode: name, args: [].slice.call(arguments, 1) });
-  },
-
-  declare: function(name, value) {
-    this.opcodes.push({ opcode: 'DECLARE', name: name, value: value });
-  },
-
-  addDepth: function(depth) {
-    if(isNaN(depth)) { throw new Error("EWOT"); }
-    if(depth === 0) { return; }
-
-    if(!this.depths[depth]) {
-      this.depths[depth] = true;
-      this.depths.list.push(depth);
-    }
-  },
-
-  classifyMustache: function(mustache) {
-    var isHelper   = mustache.isHelper;
-    var isEligible = mustache.eligibleHelper;
-    var options    = this.options;
-
-    // if ambiguous, we can possibly resolve the ambiguity now
-    if (isEligible && !isHelper) {
-      var name = mustache.id.parts[0];
-
-      if (options.knownHelpers[name]) {
-        isHelper = true;
-      } else if (options.knownHelpersOnly) {
-        isEligible = false;
-      }
-    }
-
-    if (isHelper) { return "helper"; }
-    else if (isEligible) { return "ambiguous"; }
-    else { return "simple"; }
-  },
-
-  pushParams: function(params) {
-    var i = params.length, param;
-
-    while(i--) {
-      param = params[i];
-
-      if(this.options.stringParams) {
-        if(param.depth) {
-          this.addDepth(param.depth);
-        }
-
-        this.opcode('getContext', param.depth || 0);
-        this.opcode('pushStringParam', param.stringModeValue, param.type);
-      } else {
-        this[param.type](param);
-      }
-    }
-  },
-
-  setupMustacheParams: function(mustache) {
-    var params = mustache.params;
-    this.pushParams(params);
-
-    if(mustache.hash) {
-      this.hash(mustache.hash);
-    } else {
-      this.opcode('emptyHash');
-    }
-
-    return params;
-  },
-
-  // this will replace setupMustacheParams when we're done
-  setupFullMustacheParams: function(mustache, program, inverse) {
-    var params = mustache.params;
-    this.pushParams(params);
-
-    this.opcode('pushProgram', program);
-    this.opcode('pushProgram', inverse);
-
-    if(mustache.hash) {
-      this.hash(mustache.hash);
-    } else {
-      this.opcode('emptyHash');
-    }
-
-    return params;
-  }
-};
-
-var Literal = function(value) {
-  this.value = value;
-};
-
-JavaScriptCompiler.prototype = {
-  // PUBLIC API: You can override these methods in a subclass to provide
-  // alternative compiled forms for name lookup and buffering semantics
-  nameLookup: function(parent, name /* , type*/) {
-    if (/^[0-9]+$/.test(name)) {
-      return parent + "[" + name + "]";
-    } else if (JavaScriptCompiler.isValidJavaScriptVariableName(name)) {
-      return parent + "." + name;
-    }
-    else {
-      return parent + "['" + name + "']";
-    }
-  },
-
-  appendToBuffer: function(string) {
-    if (this.environment.isSimple) {
-      return "return " + string + ";";
-    } else {
-      return {
-        appendToBuffer: true,
-        content: string,
-        toString: function() { return "buffer += " + string + ";"; }
-      };
-    }
-  },
-
-  initializeBuffer: function() {
-    return this.quotedString("");
-  },
-
-  namespace: "Handlebars",
-  // END PUBLIC API
-
-  compile: function(environment, options, context, asObject) {
-    this.environment = environment;
-    this.options = options || {};
-
-    Handlebars.log(Handlebars.logger.DEBUG, this.environment.disassemble() + "\n\n");
-
-    this.name = this.environment.name;
-    this.isChild = !!context;
-    this.context = context || {
-      programs: [],
-      environments: [],
-      aliases: { }
-    };
-
-    this.preamble();
-
-    this.stackSlot = 0;
-    this.stackVars = [];
-    this.registers = { list: [] };
-    this.compileStack = [];
-    this.inlineStack = [];
-
-    this.compileChildren(environment, options);
-
-    var opcodes = environment.opcodes, opcode;
-
-    this.i = 0;
-
-    for(l=opcodes.length; this.i<l; this.i++) {
-      opcode = opcodes[this.i];
-
-      if(opcode.opcode === 'DECLARE') {
-        this[opcode.name] = opcode.value;
-      } else {
-        this[opcode.opcode].apply(this, opcode.args);
-      }
-    }
-
-    return this.createFunctionContext(asObject);
-  },
-
-  nextOpcode: function() {
-    var opcodes = this.environment.opcodes;
-    return opcodes[this.i + 1];
-  },
-
-  eat: function() {
-    this.i = this.i + 1;
-  },
-
-  preamble: function() {
-    var out = [];
-
-    if (!this.isChild) {
-      var namespace = this.namespace;
-
-      var copies = "helpers = this.merge(helpers, " + namespace + ".helpers);";
-      if (this.environment.usePartial) { copies = copies + " partials = this.merge(partials, " + namespace + ".partials);"; }
-      if (this.options.data) { copies = copies + " data = data || {};"; }
-      out.push(copies);
-    } else {
-      out.push('');
-    }
-
-    if (!this.environment.isSimple) {
-      out.push(", buffer = " + this.initializeBuffer());
-    } else {
-      out.push("");
-    }
-
-    // track the last context pushed into place to allow skipping the
-    // getContext opcode when it would be a noop
-    this.lastContext = 0;
-    this.source = out;
-  },
-
-  createFunctionContext: function(asObject) {
-    var locals = this.stackVars.concat(this.registers.list);
-
-    if(locals.length > 0) {
-      this.source[1] = this.source[1] + ", " + locals.join(", ");
-    }
-
-    // Generate minimizer alias mappings
-    if (!this.isChild) {
-      for (var alias in this.context.aliases) {
-        if (this.context.aliases.hasOwnProperty(alias)) {
-          this.source[1] = this.source[1] + ', ' + alias + '=' + this.context.aliases[alias];
-        }
-      }
-    }
-
-    if (this.source[1]) {
-      this.source[1] = "var " + this.source[1].substring(2) + ";";
-    }
-
-    // Merge children
-    if (!this.isChild) {
-      this.source[1] += '\n' + this.context.programs.join('\n') + '\n';
-    }
-
-    if (!this.environment.isSimple) {
-      this.source.push("return buffer;");
-    }
-
-    var params = this.isChild ? ["depth0", "data"] : ["Handlebars", "depth0", "helpers", "partials", "data"];
-
-    for(var i=0, l=this.environment.depths.list.length; i<l; i++) {
-      params.push("depth" + this.environment.depths.list[i]);
-    }
-
-    // Perform a second pass over the output to merge content when possible
-    var source = this.mergeSource();
-
-    if (!this.isChild) {
-      var revision = Handlebars.COMPILER_REVISION,
-          versions = Handlebars.REVISION_CHANGES[revision];
-      source = "this.compilerInfo = ["+revision+",'"+versions+"'];\n"+source;
-    }
-
-    if (asObject) {
-      params.push(source);
-
-      return Function.apply(this, params);
-    } else {
-      var functionSource = 'function ' + (this.name || '') + '(' + params.join(',') + ') {\n  ' + source + '}';
-      Handlebars.log(Handlebars.logger.DEBUG, functionSource + "\n\n");
-      return functionSource;
-    }
-  },
-  mergeSource: function() {
-    // WARN: We are not handling the case where buffer is still populated as the source should
-    // not have buffer append operations as their final action.
-    var source = '',
-        buffer;
-    for (var i = 0, len = this.source.length; i < len; i++) {
-      var line = this.source[i];
-      if (line.appendToBuffer) {
-        if (buffer) {
-          buffer = buffer + '\n    + ' + line.content;
-        } else {
-          buffer = line.content;
-        }
-      } else {
-        if (buffer) {
-          source += 'buffer += ' + buffer + ';\n  ';
-          buffer = undefined;
-        }
-        source += line + '\n  ';
-      }
-    }
-    return source;
-  },
-
-  // [blockValue]
-  //
-  // On stack, before: hash, inverse, program, value
-  // On stack, after: return value of blockHelperMissing
-  //
-  // The purpose of this opcode is to take a block of the form
-  // `{{#foo}}...{{/foo}}`, resolve the value of `foo`, and
-  // replace it on the stack with the result of properly
-  // invoking blockHelperMissing.
-  blockValue: function() {
-    this.context.aliases.blockHelperMissing = 'helpers.blockHelperMissing';
-
-    var params = ["depth0"];
-    this.setupParams(0, params);
-
-    this.replaceStack(function(current) {
-      params.splice(1, 0, current);
-      return "blockHelperMissing.call(" + params.join(", ") + ")";
-    });
-  },
-
-  // [ambiguousBlockValue]
-  //
-  // On stack, before: hash, inverse, program, value
-  // Compiler value, before: lastHelper=value of last found helper, if any
-  // On stack, after, if no lastHelper: same as [blockValue]
-  // On stack, after, if lastHelper: value
-  ambiguousBlockValue: function() {
-    this.context.aliases.blockHelperMissing = 'helpers.blockHelperMissing';
-
-    var params = ["depth0"];
-    this.setupParams(0, params);
-
-    var current = this.topStack();
-    params.splice(1, 0, current);
-
-    // Use the options value generated from the invocation
-    params[params.length-1] = 'options';
-
-    this.source.push("if (!" + this.lastHelper + ") { " + current + " = blockHelperMissing.call(" + params.join(", ") + "); }");
-  },
-
-  // [appendContent]
-  //
-  // On stack, before: ...
-  // On stack, after: ...
-  //
-  // Appends the string value of `content` to the current buffer
-  appendContent: function(content) {
-    this.source.push(this.appendToBuffer(this.quotedString(content)));
-  },
-
-  // [append]
-  //
-  // On stack, before: value, ...
-  // On stack, after: ...
-  //
-  // Coerces `value` to a String and appends it to the current buffer.
-  //
-  // If `value` is truthy, or 0, it is coerced into a string and appended
-  // Otherwise, the empty string is appended
-  append: function() {
-    // Force anything that is inlined onto the stack so we don't have duplication
-    // when we examine local
-    this.flushInline();
-    var local = this.popStack();
-    this.source.push("if(" + local + " || " + local + " === 0) { " + this.appendToBuffer(local) + " }");
-    if (this.environment.isSimple) {
-      this.source.push("else { " + this.appendToBuffer("''") + " }");
-    }
-  },
-
-  // [appendEscaped]
-  //
-  // On stack, before: value, ...
-  // On stack, after: ...
-  //
-  // Escape `value` and append it to the buffer
-  appendEscaped: function() {
-    this.context.aliases.escapeExpression = 'this.escapeExpression';
-
-    this.source.push(this.appendToBuffer("escapeExpression(" + this.popStack() + ")"));
-  },
-
-  // [getContext]
-  //
-  // On stack, before: ...
-  // On stack, after: ...
-  // Compiler value, after: lastContext=depth
-  //
-  // Set the value of the `lastContext` compiler value to the depth
-  getContext: function(depth) {
-    if(this.lastContext !== depth) {
-      this.lastContext = depth;
-    }
-  },
-
-  // [lookupOnContext]
-  //
-  // On stack, before: ...
-  // On stack, after: currentContext[name], ...
-  //
-  // Looks up the value of `name` on the current context and pushes
-  // it onto the stack.
-  lookupOnContext: function(name) {
-    this.push(this.nameLookup('depth' + this.lastContext, name, 'context'));
-  },
-
-  // [pushContext]
-  //
-  // On stack, before: ...
-  // On stack, after: currentContext, ...
-  //
-  // Pushes the value of the current context onto the stack.
-  pushContext: function() {
-    this.pushStackLiteral('depth' + this.lastContext);
-  },
-
-  // [resolvePossibleLambda]
-  //
-  // On stack, before: value, ...
-  // On stack, after: resolved value, ...
-  //
-  // If the `value` is a lambda, replace it on the stack by
-  // the return value of the lambda
-  resolvePossibleLambda: function() {
-    this.context.aliases.functionType = '"function"';
-
-    this.replaceStack(function(current) {
-      return "typeof " + current + " === functionType ? " + current + ".apply(depth0) : " + current;
-    });
-  },
-
-  // [lookup]
-  //
-  // On stack, before: value, ...
-  // On stack, after: value[name], ...
-  //
-  // Replace the value on the stack with the result of looking
-  // up `name` on `value`
-  lookup: function(name) {
-    this.replaceStack(function(current) {
-      return current + " == null || " + current + " === false ? " + current + " : " + this.nameLookup(current, name, 'context');
-    });
-  },
-
-  // [lookupData]
-  //
-  // On stack, before: ...
-  // On stack, after: data[id], ...
-  //
-  // Push the result of looking up `id` on the current data
-  lookupData: function(id) {
-    this.push('data');
-  },
-
-  // [pushStringParam]
-  //
-  // On stack, before: ...
-  // On stack, after: string, currentContext, ...
-  //
-  // This opcode is designed for use in string mode, which
-  // provides the string value of a parameter along with its
-  // depth rather than resolving it immediately.
-  pushStringParam: function(string, type) {
-    this.pushStackLiteral('depth' + this.lastContext);
-
-    this.pushString(type);
-
-    if (typeof string === 'string') {
-      this.pushString(string);
-    } else {
-      this.pushStackLiteral(string);
-    }
-  },
-
-  emptyHash: function() {
-    this.pushStackLiteral('{}');
-
-    if (this.options.stringParams) {
-      this.register('hashTypes', '{}');
-      this.register('hashContexts', '{}');
-    }
-  },
-  pushHash: function() {
-    this.hash = {values: [], types: [], contexts: []};
-  },
-  popHash: function() {
-    var hash = this.hash;
-    this.hash = undefined;
-
-    if (this.options.stringParams) {
-      this.register('hashContexts', '{' + hash.contexts.join(',') + '}');
-      this.register('hashTypes', '{' + hash.types.join(',') + '}');
-    }
-    this.push('{\n    ' + hash.values.join(',\n    ') + '\n  }');
-  },
-
-  // [pushString]
-  //
-  // On stack, before: ...
-  // On stack, after: quotedString(string), ...
-  //
-  // Push a quoted version of `string` onto the stack
-  pushString: function(string) {
-    this.pushStackLiteral(this.quotedString(string));
-  },
-
-  // [push]
-  //
-  // On stack, before: ...
-  // On stack, after: expr, ...
-  //
-  // Push an expression onto the stack
-  push: function(expr) {
-    this.inlineStack.push(expr);
-    return expr;
-  },
-
-  // [pushLiteral]
-  //
-  // On stack, before: ...
-  // On stack, after: value, ...
-  //
-  // Pushes a value onto the stack. This operation prevents
-  // the compiler from creating a temporary variable to hold
-  // it.
-  pushLiteral: function(value) {
-    this.pushStackLiteral(value);
-  },
-
-  // [pushProgram]
-  //
-  // On stack, before: ...
-  // On stack, after: program(guid), ...
-  //
-  // Push a program expression onto the stack. This takes
-  // a compile-time guid and converts it into a runtime-accessible
-  // expression.
-  pushProgram: function(guid) {
-    if (guid != null) {
-      this.pushStackLiteral(this.programExpression(guid));
-    } else {
-      this.pushStackLiteral(null);
-    }
-  },
-
-  // [invokeHelper]
-  //
-  // On stack, before: hash, inverse, program, params..., ...
-  // On stack, after: result of helper invocation
-  //
-  // Pops off the helper's parameters, invokes the helper,
-  // and pushes the helper's return value onto the stack.
-  //
-  // If the helper is not found, `helperMissing` is called.
-  invokeHelper: function(paramSize, name) {
-    this.context.aliases.helperMissing = 'helpers.helperMissing';
-
-    var helper = this.lastHelper = this.setupHelper(paramSize, name, true);
-    var nonHelper = this.nameLookup('depth' + this.lastContext, name, 'context');
-
-    this.push(helper.name + ' || ' + nonHelper);
-    this.replaceStack(function(name) {
-      return name + ' ? ' + name + '.call(' +
-          helper.callParams + ") " + ": helperMissing.call(" +
-          helper.helperMissingParams + ")";
-    });
-  },
-
-  // [invokeKnownHelper]
-  //
-  // On stack, before: hash, inverse, program, params..., ...
-  // On stack, after: result of helper invocation
-  //
-  // This operation is used when the helper is known to exist,
-  // so a `helperMissing` fallback is not required.
-  invokeKnownHelper: function(paramSize, name) {
-    var helper = this.setupHelper(paramSize, name);
-    this.push(helper.name + ".call(" + helper.callParams + ")");
-  },
-
-  // [invokeAmbiguous]
-  //
-  // On stack, before: hash, inverse, program, params..., ...
-  // On stack, after: result of disambiguation
-  //
-  // This operation is used when an expression like `{{foo}}`
-  // is provided, but we don't know at compile-time whether it
-  // is a helper or a path.
-  //
-  // This operation emits more code than the other options,
-  // and can be avoided by passing the `knownHelpers` and
-  // `knownHelpersOnly` flags at compile-time.
-  invokeAmbiguous: function(name, helperCall) {
-    this.context.aliases.functionType = '"function"';
-
-    this.pushStackLiteral('{}');    // Hash value
-    var helper = this.setupHelper(0, name, helperCall);
-
-    var helperName = this.lastHelper = this.nameLookup('helpers', name, 'helper');
-
-    var nonHelper = this.nameLookup('depth' + this.lastContext, name, 'context');
-    var nextStack = this.nextStack();
-
-    this.source.push('if (' + nextStack + ' = ' + helperName + ') { ' + nextStack + ' = ' + nextStack + '.call(' + helper.callParams + '); }');
-    this.source.push('else { ' + nextStack + ' = ' + nonHelper + '; ' + nextStack + ' = typeof ' + nextStack + ' === functionType ? ' + nextStack + '.apply(depth0) : ' + nextStack + '; }');
-  },
-
-  // [invokePartial]
-  //
-  // On stack, before: context, ...
-  // On stack after: result of partial invocation
-  //
-  // This operation pops off a context, invokes a partial with that context,
-  // and pushes the result of the invocation back.
-  invokePartial: function(name) {
-    var params = [this.nameLookup('partials', name, 'partial'), "'" + name + "'", this.popStack(), "helpers", "partials"];
-
-    if (this.options.data) {
-      params.push("data");
-    }
-
-    this.context.aliases.self = "this";
-    this.push("self.invokePartial(" + params.join(", ") + ")");
-  },
-
-  // [assignToHash]
-  //
-  // On stack, before: value, hash, ...
-  // On stack, after: hash, ...
-  //
-  // Pops a value and hash off the stack, assigns `hash[key] = value`
-  // and pushes the hash back onto the stack.
-  assignToHash: function(key) {
-    var value = this.popStack(),
-        context,
-        type;
-
-    if (this.options.stringParams) {
-      type = this.popStack();
-      context = this.popStack();
-    }
-
-    var hash = this.hash;
-    if (context) {
-      hash.contexts.push("'" + key + "': " + context);
-    }
-    if (type) {
-      hash.types.push("'" + key + "': " + type);
-    }
-    hash.values.push("'" + key + "': (" + value + ")");
-  },
-
-  // HELPERS
-
-  compiler: JavaScriptCompiler,
-
-  compileChildren: function(environment, options) {
-    var children = environment.children, child, compiler;
-
-    for(var i=0, l=children.length; i<l; i++) {
-      child = children[i];
-      compiler = new this.compiler();
-
-      var index = this.matchExistingProgram(child);
-
-      if (index == null) {
-        this.context.programs.push('');     // Placeholder to prevent name conflicts for nested children
-        index = this.context.programs.length;
-        child.index = index;
-        child.name = 'program' + index;
-        this.context.programs[index] = compiler.compile(child, options, this.context);
-        this.context.environments[index] = child;
-      } else {
-        child.index = index;
-        child.name = 'program' + index;
-      }
-    }
-  },
-  matchExistingProgram: function(child) {
-    for (var i = 0, len = this.context.environments.length; i < len; i++) {
-      var environment = this.context.environments[i];
-      if (environment && environment.equals(child)) {
-        return i;
-      }
-    }
-  },
-
-  programExpression: function(guid) {
-    this.context.aliases.self = "this";
-
-    if(guid == null) {
-      return "self.noop";
-    }
-
-    var child = this.environment.children[guid],
-        depths = child.depths.list, depth;
-
-    var programParams = [child.index, child.name, "data"];
-
-    for(var i=0, l = depths.length; i<l; i++) {
-      depth = depths[i];
-
-      if(depth === 1) { programParams.push("depth0"); }
-      else { programParams.push("depth" + (depth - 1)); }
-    }
-
-    return (depths.length === 0 ? "self.program(" : "self.programWithDepth(") + programParams.join(", ") + ")";
-  },
-
-  register: function(name, val) {
-    this.useRegister(name);
-    this.source.push(name + " = " + val + ";");
-  },
-
-  useRegister: function(name) {
-    if(!this.registers[name]) {
-      this.registers[name] = true;
-      this.registers.list.push(name);
-    }
-  },
-
-  pushStackLiteral: function(item) {
-    return this.push(new Literal(item));
-  },
-
-  pushStack: function(item) {
-    this.flushInline();
-
-    var stack = this.incrStack();
-    if (item) {
-      this.source.push(stack + " = " + item + ";");
-    }
-    this.compileStack.push(stack);
-    return stack;
-  },
-
-  replaceStack: function(callback) {
-    var prefix = '',
-        inline = this.isInline(),
-        stack;
-
-    // If we are currently inline then we want to merge the inline statement into the
-    // replacement statement via ','
-    if (inline) {
-      var top = this.popStack(true);
-
-      if (top instanceof Literal) {
-        // Literals do not need to be inlined
-        stack = top.value;
-      } else {
-        // Get or create the current stack name for use by the inline
-        var name = this.stackSlot ? this.topStackName() : this.incrStack();
-
-        prefix = '(' + this.push(name) + ' = ' + top + '),';
-        stack = this.topStack();
-      }
-    } else {
-      stack = this.topStack();
-    }
-
-    var item = callback.call(this, stack);
-
-    if (inline) {
-      if (this.inlineStack.length || this.compileStack.length) {
-        this.popStack();
-      }
-      this.push('(' + prefix + item + ')');
-    } else {
-      // Prevent modification of the context depth variable. Through replaceStack
-      if (!/^stack/.test(stack)) {
-        stack = this.nextStack();
-      }
-
-      this.source.push(stack + " = (" + prefix + item + ");");
-    }
-    return stack;
-  },
-
-  nextStack: function() {
-    return this.pushStack();
-  },
-
-  incrStack: function() {
-    this.stackSlot++;
-    if(this.stackSlot > this.stackVars.length) { this.stackVars.push("stack" + this.stackSlot); }
-    return this.topStackName();
-  },
-  topStackName: function() {
-    return "stack" + this.stackSlot;
-  },
-  flushInline: function() {
-    var inlineStack = this.inlineStack;
-    if (inlineStack.length) {
-      this.inlineStack = [];
-      for (var i = 0, len = inlineStack.length; i < len; i++) {
-        var entry = inlineStack[i];
-        if (entry instanceof Literal) {
-          this.compileStack.push(entry);
-        } else {
-          this.pushStack(entry);
-        }
-      }
-    }
-  },
-  isInline: function() {
-    return this.inlineStack.length;
-  },
-
-  popStack: function(wrapped) {
-    var inline = this.isInline(),
-        item = (inline ? this.inlineStack : this.compileStack).pop();
-
-    if (!wrapped && (item instanceof Literal)) {
-      return item.value;
-    } else {
-      if (!inline) {
-        this.stackSlot--;
-      }
-      return item;
-    }
-  },
-
-  topStack: function(wrapped) {
-    var stack = (this.isInline() ? this.inlineStack : this.compileStack),
-        item = stack[stack.length - 1];
-
-    if (!wrapped && (item instanceof Literal)) {
-      return item.value;
-    } else {
-      return item;
-    }
-  },
-
-  quotedString: function(str) {
-    return '"' + str
-      .replace(/\\/g, '\\\\')
-      .replace(/"/g, '\\"')
-      .replace(/\n/g, '\\n')
-      .replace(/\r/g, '\\r')
-      .replace(/\u2028/g, '\\u2028')   // Per Ecma-262 7.3 + 7.8.4
-      .replace(/\u2029/g, '\\u2029') + '"';
-  },
-
-  setupHelper: function(paramSize, name, missingParams) {
-    var params = [];
-    this.setupParams(paramSize, params, missingParams);
-    var foundHelper = this.nameLookup('helpers', name, 'helper');
-
-    return {
-      params: params,
-      name: foundHelper,
-      callParams: ["depth0"].concat(params).join(", "),
-      helperMissingParams: missingParams && ["depth0", this.quotedString(name)].concat(params).join(", ")
-    };
-  },
-
-  // the params and contexts arguments are passed in arrays
-  // to fill in
-  setupParams: function(paramSize, params, useRegister) {
-    var options = [], contexts = [], types = [], param, inverse, program;
-
-    options.push("hash:" + this.popStack());
-
-    inverse = this.popStack();
-    program = this.popStack();
-
-    // Avoid setting fn and inverse if neither are set. This allows
-    // helpers to do a check for `if (options.fn)`
-    if (program || inverse) {
-      if (!program) {
-        this.context.aliases.self = "this";
-        program = "self.noop";
-      }
-
-      if (!inverse) {
-       this.context.aliases.self = "this";
-        inverse = "self.noop";
-      }
-
-      options.push("inverse:" + inverse);
-      options.push("fn:" + program);
-    }
-
-    for(var i=0; i<paramSize; i++) {
-      param = this.popStack();
-      params.push(param);
-
-      if(this.options.stringParams) {
-        types.push(this.popStack());
-        contexts.push(this.popStack());
-      }
-    }
-
-    if (this.options.stringParams) {
-      options.push("contexts:[" + contexts.join(",") + "]");
-      options.push("types:[" + types.join(",") + "]");
-      options.push("hashContexts:hashContexts");
-      options.push("hashTypes:hashTypes");
-    }
-
-    if(this.options.data) {
-      options.push("data:data");
-    }
-
-    options = "{" + options.join(",") + "}";
-    if (useRegister) {
-      this.register('options', options);
-      params.push('options');
-    } else {
-      params.push(options);
-    }
-    return params.join(", ");
-  }
-};
-
-var reservedWords = (
-  "break else new var" +
-  " case finally return void" +
-  " catch for switch while" +
-  " continue function this with" +
-  " default if throw" +
-  " delete in try" +
-  " do instanceof typeof" +
-  " abstract enum int short" +
-  " boolean export interface static" +
-  " byte extends long super" +
-  " char final native synchronized" +
-  " class float package throws" +
-  " const goto private transient" +
-  " debugger implements protected volatile" +
-  " double import public let yield"
-).split(" ");
-
-var compilerWords = JavaScriptCompiler.RESERVED_WORDS = {};
-
-for(var i=0, l=reservedWords.length; i<l; i++) {
-  compilerWords[reservedWords[i]] = true;
-}
-
-JavaScriptCompiler.isValidJavaScriptVariableName = function(name) {
-  if(!JavaScriptCompiler.RESERVED_WORDS[name] && /^[a-zA-Z_$][0-9a-zA-Z_$]+$/.test(name)) {
-    return true;
-  }
-  return false;
-};
-
-Handlebars.precompile = function(input, options) {
-  if (input == null || (typeof input !== 'string' && input.constructor !== Handlebars.AST.ProgramNode)) {
-    throw new Handlebars.Exception("You must pass a string or Handlebars AST to Handlebars.precompile. You passed " + input);
-  }
-
-  options = options || {};
-  if (!('data' in options)) {
-    options.data = true;
-  }
-  var ast = Handlebars.parse(input);
-  var environment = new Compiler().compile(ast, options);
-  return new JavaScriptCompiler().compile(environment, options);
-};
-
-Handlebars.compile = function(input, options) {
-  if (input == null || (typeof input !== 'string' && input.constructor !== Handlebars.AST.ProgramNode)) {
-    throw new Handlebars.Exception("You must pass a string or Handlebars AST to Handlebars.compile. You passed " + input);
-  }
-
-  options = options || {};
-  if (!('data' in options)) {
-    options.data = true;
-  }
-  var compiled;
-  function compile() {
-    var ast = Handlebars.parse(input);
-    var environment = new Compiler().compile(ast, options);
-    var templateSpec = new JavaScriptCompiler().compile(environment, options, undefined, true);
-    return Handlebars.template(templateSpec);
-  }
-
-  // Template is only compiled on first use and cached after that point.
-  return function(context, options) {
-    if (!compiled) {
-      compiled = compile();
-    }
-    return compiled.call(this, context, options);
-  };
-};
-
-;
-// lib/handlebars/runtime.js
-
-Handlebars.VM = {
-  template: function(templateSpec) {
-    // Just add water
-    var container = {
-      escapeExpression: Handlebars.Utils.escapeExpression,
-      invokePartial: Handlebars.VM.invokePartial,
-      programs: [],
-      program: function(i, fn, data) {
-        var programWrapper = this.programs[i];
-        if(data) {
-          programWrapper = Handlebars.VM.program(i, fn, data);
-        } else if (!programWrapper) {
-          programWrapper = this.programs[i] = Handlebars.VM.program(i, fn);
-        }
-        return programWrapper;
-      },
-      merge: function(param, common) {
-        var ret = param || common;
-
-        if (param && common) {
-          ret = {};
-          Handlebars.Utils.extend(ret, common);
-          Handlebars.Utils.extend(ret, param);
-        }
-        return ret;
-      },
-      programWithDepth: Handlebars.VM.programWithDepth,
-      noop: Handlebars.VM.noop,
-      compilerInfo: null
-    };
-
-    return function(context, options) {
-      options = options || {};
-      var result = templateSpec.call(container, Handlebars, context, options.helpers, options.partials, options.data);
-
-      var compilerInfo = container.compilerInfo || [],
-          compilerRevision = compilerInfo[0] || 1,
-          currentRevision = Handlebars.COMPILER_REVISION;
-
-      if (compilerRevision !== currentRevision) {
-        if (compilerRevision < currentRevision) {
-          var runtimeVersions = Handlebars.REVISION_CHANGES[currentRevision],
-              compilerVersions = Handlebars.REVISION_CHANGES[compilerRevision];
-          throw "Template was precompiled with an older version of Handlebars than the current runtime. "+
-                "Please update your precompiler to a newer version ("+runtimeVersions+") or downgrade your runtime to an older version ("+compilerVersions+").";
-        } else {
-          // Use the embedded version info since the runtime doesn't know about this revision yet
-          throw "Template was precompiled with a newer version of Handlebars than the current runtime. "+
-                "Please update your runtime to a newer version ("+compilerInfo[1]+").";
-        }
-      }
-
-      return result;
-    };
-  },
-
-  programWithDepth: function(i, fn, data /*, $depth */) {
-    var args = Array.prototype.slice.call(arguments, 3);
-
-    var program = function(context, options) {
-      options = options || {};
-
-      return fn.apply(this, [context, options.data || data].concat(args));
-    };
-    program.program = i;
-    program.depth = args.length;
-    return program;
-  },
-  program: function(i, fn, data) {
-    var program = function(context, options) {
-      options = options || {};
-
-      return fn(context, options.data || data);
-    };
-    program.program = i;
-    program.depth = 0;
-    return program;
-  },
-  noop: function() { return ""; },
-  invokePartial: function(partial, name, context, helpers, partials, data) {
-    var options = { helpers: helpers, partials: partials, data: data };
-
-    if(partial === undefined) {
-      throw new Handlebars.Exception("The partial " + name + " could not be found");
-    } else if(partial instanceof Function) {
-      return partial(context, options);
-    } else if (!Handlebars.compile) {
-      throw new Handlebars.Exception("The partial " + name + " could not be compiled when running in runtime-only mode");
-    } else {
-      partials[name] = Handlebars.compile(partial, {data: data !== undefined});
-      return partials[name](context, options);
-    }
-  }
-};
-
-Handlebars.template = Handlebars.VM.template;
-;
-// lib/handlebars/browser-suffix.js
-})(Handlebars);
-;
diff --git a/src/main/webapp/public/docs/lib/highlight.7.3.pack.js b/src/main/webapp/public/docs/lib/highlight.7.3.pack.js
deleted file mode 100644
index 9a95a75ea..000000000
--- a/src/main/webapp/public/docs/lib/highlight.7.3.pack.js
+++ /dev/null
@@ -1 +0,0 @@
-var hljs=new function(){function l(o){return o.replace(/&/gm,"&amp;").replace(/</gm,"&lt;").replace(/>/gm,"&gt;")}function b(p){for(var o=p.firstChild;o;o=o.nextSibling){if(o.nodeName=="CODE"){return o}if(!(o.nodeType==3&&o.nodeValue.match(/\s+/))){break}}}function h(p,o){return Array.prototype.map.call(p.childNodes,function(q){if(q.nodeType==3){return o?q.nodeValue.replace(/\n/g,""):q.nodeValue}if(q.nodeName=="BR"){return"\n"}return h(q,o)}).join("")}function a(q){var p=(q.className+" "+q.parentNode.className).split(/\s+/);p=p.map(function(r){return r.replace(/^language-/,"")});for(var o=0;o<p.length;o++){if(e[p[o]]||p[o]=="no-highlight"){return p[o]}}}function c(q){var o=[];(function p(r,s){for(var t=r.firstChild;t;t=t.nextSibling){if(t.nodeType==3){s+=t.nodeValue.length}else{if(t.nodeName=="BR"){s+=1}else{if(t.nodeType==1){o.push({event:"start",offset:s,node:t});s=p(t,s);o.push({event:"stop",offset:s,node:t})}}}}return s})(q,0);return o}function j(x,v,w){var p=0;var y="";var r=[];function t(){if(x.length&&v.length){if(x[0].offset!=v[0].offset){return(x[0].offset<v[0].offset)?x:v}else{return v[0].event=="start"?x:v}}else{return x.length?x:v}}function s(A){function z(B){return" "+B.nodeName+'="'+l(B.value)+'"'}return"<"+A.nodeName+Array.prototype.map.call(A.attributes,z).join("")+">"}while(x.length||v.length){var u=t().splice(0,1)[0];y+=l(w.substr(p,u.offset-p));p=u.offset;if(u.event=="start"){y+=s(u.node);r.push(u.node)}else{if(u.event=="stop"){var o,q=r.length;do{q--;o=r[q];y+=("</"+o.nodeName.toLowerCase()+">")}while(o!=u.node);r.splice(q,1);while(q<r.length){y+=s(r[q]);q++}}}}return y+l(w.substr(p))}function f(q){function o(s,r){return RegExp(s,"m"+(q.cI?"i":"")+(r?"g":""))}function p(y,w){if(y.compiled){return}y.compiled=true;var s=[];if(y.k){var r={};function z(A,t){t.split(" ").forEach(function(B){var C=B.split("|");r[C[0]]=[A,C[1]?Number(C[1]):1];s.push(C[0])})}y.lR=o(y.l||hljs.IR,true);if(typeof y.k=="string"){z("keyword",y.k)}else{for(var x in y.k){if(!y.k.hasOwnProperty(x)){continue}z(x,y.k[x])}}y.k=r}if(w){if(y.bWK){y.b="\\b("+s.join("|")+")\\s"}y.bR=o(y.b?y.b:"\\B|\\b");if(!y.e&&!y.eW){y.e="\\B|\\b"}if(y.e){y.eR=o(y.e)}y.tE=y.e||"";if(y.eW&&w.tE){y.tE+=(y.e?"|":"")+w.tE}}if(y.i){y.iR=o(y.i)}if(y.r===undefined){y.r=1}if(!y.c){y.c=[]}for(var v=0;v<y.c.length;v++){if(y.c[v]=="self"){y.c[v]=y}p(y.c[v],y)}if(y.starts){p(y.starts,w)}var u=[];for(var v=0;v<y.c.length;v++){u.push(y.c[v].b)}if(y.tE){u.push(y.tE)}if(y.i){u.push(y.i)}y.t=u.length?o(u.join("|"),true):{exec:function(t){return null}}}p(q)}function d(D,E){function o(r,M){for(var L=0;L<M.c.length;L++){var K=M.c[L].bR.exec(r);if(K&&K.index==0){return M.c[L]}}}function s(K,r){if(K.e&&K.eR.test(r)){return K}if(K.eW){return s(K.parent,r)}}function t(r,K){return K.i&&K.iR.test(r)}function y(L,r){var K=F.cI?r[0].toLowerCase():r[0];return L.k.hasOwnProperty(K)&&L.k[K]}function G(){var K=l(w);if(!A.k){return K}var r="";var N=0;A.lR.lastIndex=0;var L=A.lR.exec(K);while(L){r+=K.substr(N,L.index-N);var M=y(A,L);if(M){v+=M[1];r+='<span class="'+M[0]+'">'+L[0]+"</span>"}else{r+=L[0]}N=A.lR.lastIndex;L=A.lR.exec(K)}return r+K.substr(N)}function z(){if(A.sL&&!e[A.sL]){return l(w)}var r=A.sL?d(A.sL,w):g(w);if(A.r>0){v+=r.keyword_count;B+=r.r}return'<span class="'+r.language+'">'+r.value+"</span>"}function J(){return A.sL!==undefined?z():G()}function I(L,r){var K=L.cN?'<span class="'+L.cN+'">':"";if(L.rB){x+=K;w=""}else{if(L.eB){x+=l(r)+K;w=""}else{x+=K;w=r}}A=Object.create(L,{parent:{value:A}});B+=L.r}function C(K,r){w+=K;if(r===undefined){x+=J();return 0}var L=o(r,A);if(L){x+=J();I(L,r);return L.rB?0:r.length}var M=s(A,r);if(M){if(!(M.rE||M.eE)){w+=r}x+=J();do{if(A.cN){x+="</span>"}A=A.parent}while(A!=M.parent);if(M.eE){x+=l(r)}w="";if(M.starts){I(M.starts,"")}return M.rE?0:r.length}if(t(r,A)){throw"Illegal"}w+=r;return r.length||1}var F=e[D];f(F);var A=F;var w="";var B=0;var v=0;var x="";try{var u,q,p=0;while(true){A.t.lastIndex=p;u=A.t.exec(E);if(!u){break}q=C(E.substr(p,u.index-p),u[0]);p=u.index+q}C(E.substr(p));return{r:B,keyword_count:v,value:x,language:D}}catch(H){if(H=="Illegal"){return{r:0,keyword_count:0,value:l(E)}}else{throw H}}}function g(s){var o={keyword_count:0,r:0,value:l(s)};var q=o;for(var p in e){if(!e.hasOwnProperty(p)){continue}var r=d(p,s);r.language=p;if(r.keyword_count+r.r>q.keyword_count+q.r){q=r}if(r.keyword_count+r.r>o.keyword_count+o.r){q=o;o=r}}if(q.language){o.second_best=q}return o}function i(q,p,o){if(p){q=q.replace(/^((<[^>]+>|\t)+)/gm,function(r,v,u,t){return v.replace(/\t/g,p)})}if(o){q=q.replace(/\n/g,"<br>")}return q}function m(r,u,p){var v=h(r,p);var t=a(r);if(t=="no-highlight"){return}var w=t?d(t,v):g(v);t=w.language;var o=c(r);if(o.length){var q=document.createElement("pre");q.innerHTML=w.value;w.value=j(o,c(q),v)}w.value=i(w.value,u,p);var s=r.className;if(!s.match("(\\s|^)(language-)?"+t+"(\\s|$)")){s=s?(s+" "+t):t}r.innerHTML=w.value;r.className=s;r.result={language:t,kw:w.keyword_count,re:w.r};if(w.second_best){r.second_best={language:w.second_best.language,kw:w.second_best.keyword_count,re:w.second_best.r}}}function n(){if(n.called){return}n.called=true;Array.prototype.map.call(document.getElementsByTagName("pre"),b).filter(Boolean).forEach(function(o){m(o,hljs.tabReplace)})}function k(){window.addEventListener("DOMContentLoaded",n,false);window.addEventListener("load",n,false)}var e={};this.LANGUAGES=e;this.highlight=d;this.highlightAuto=g;this.fixMarkup=i;this.highlightBlock=m;this.initHighlighting=n;this.initHighlightingOnLoad=k;this.IR="[a-zA-Z][a-zA-Z0-9_]*";this.UIR="[a-zA-Z_][a-zA-Z0-9_]*";this.NR="\\b\\d+(\\.\\d+)?";this.CNR="(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)";this.BNR="\\b(0b[01]+)";this.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|\\.|-|-=|/|/=|:|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~";this.BE={b:"\\\\[\\s\\S]",r:0};this.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[this.BE],r:0};this.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[this.BE],r:0};this.CLCM={cN:"comment",b:"//",e:"$"};this.CBLCLM={cN:"comment",b:"/\\*",e:"\\*/"};this.HCM={cN:"comment",b:"#",e:"$"};this.NM={cN:"number",b:this.NR,r:0};this.CNM={cN:"number",b:this.CNR,r:0};this.BNM={cN:"number",b:this.BNR,r:0};this.inherit=function(q,r){var o={};for(var p in q){o[p]=q[p]}if(r){for(var p in r){o[p]=r[p]}}return o}}();hljs.LANGUAGES.xml=function(a){var c="[A-Za-z0-9\\._:-]+";var b={eW:true,c:[{cN:"attribute",b:c,r:0},{b:'="',rB:true,e:'"',c:[{cN:"value",b:'"',eW:true}]},{b:"='",rB:true,e:"'",c:[{cN:"value",b:"'",eW:true}]},{b:"=",c:[{cN:"value",b:"[^\\s/>]+"}]}]};return{cI:true,c:[{cN:"pi",b:"<\\?",e:"\\?>",r:10},{cN:"doctype",b:"<!DOCTYPE",e:">",r:10,c:[{b:"\\[",e:"\\]"}]},{cN:"comment",b:"<!--",e:"-->",r:10},{cN:"cdata",b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{cN:"tag",b:"<style(?=\\s|>|$)",e:">",k:{title:"style"},c:[b],starts:{e:"</style>",rE:true,sL:"css"}},{cN:"tag",b:"<script(?=\\s|>|$)",e:">",k:{title:"script"},c:[b],starts:{e:"<\/script>",rE:true,sL:"javascript"}},{b:"<%",e:"%>",sL:"vbscript"},{cN:"tag",b:"</?",e:"/?>",c:[{cN:"title",b:"[^ />]+"},b]}]}}(hljs);hljs.LANGUAGES.json=function(a){var e={literal:"true false null"};var d=[a.QSM,a.CNM];var c={cN:"value",e:",",eW:true,eE:true,c:d,k:e};var b={b:"{",e:"}",c:[{cN:"attribute",b:'\\s*"',e:'"\\s*:\\s*',eB:true,eE:true,c:[a.BE],i:"\\n",starts:c}],i:"\\S"};var f={b:"\\[",e:"\\]",c:[a.inherit(c,{cN:null})],i:"\\S"};d.splice(d.length,0,b,f);return{c:d,k:e,i:"\\S"}}(hljs);
\ No newline at end of file
diff --git a/src/main/webapp/public/docs/lib/jquery-1.8.0.min.js b/src/main/webapp/public/docs/lib/jquery-1.8.0.min.js
deleted file mode 100644
index f121291c4..000000000
--- a/src/main/webapp/public/docs/lib/jquery-1.8.0.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v@1.8.0 jquery.com | jquery.org/license */
-(function(a,b){function G(a){var b=F[a]={};return p.each(a.split(s),function(a,c){b[c]=!0}),b}function J(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(I,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:+d+""===d?+d:H.test(d)?p.parseJSON(d):d}catch(f){}p.data(a,c,d)}else d=b}return d}function K(a){var b;for(b in a){if(b==="data"&&p.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function ba(){return!1}function bb(){return!0}function bh(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function bi(a,b){do a=a[b];while(a&&a.nodeType!==1);return a}function bj(a,b,c){b=b||0;if(p.isFunction(b))return p.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return p.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=p.grep(a,function(a){return a.nodeType===1});if(be.test(b))return p.filter(b,d,!c);b=p.filter(b,d)}return p.grep(a,function(a,d){return p.inArray(a,b)>=0===c})}function bk(a){var b=bl.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function bC(a,b){return a.getElementsByTagName(b)[0]||a.appendChild(a.ownerDocument.createElement(b))}function bD(a,b){if(b.nodeType!==1||!p.hasData(a))return;var c,d,e,f=p._data(a),g=p._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;d<e;d++)p.event.add(b,c,h[c][d])}g.data&&(g.data=p.extend({},g.data))}function bE(a,b){var c;if(b.nodeType!==1)return;b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase(),c==="object"?(b.parentNode&&(b.outerHTML=a.outerHTML),p.support.html5Clone&&a.innerHTML&&!p.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):c==="input"&&bv.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):c==="option"?b.selected=a.defaultSelected:c==="input"||c==="textarea"?b.defaultValue=a.defaultValue:c==="script"&&b.text!==a.text&&(b.text=a.text),b.removeAttribute(p.expando)}function bF(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bG(a){bv.test(a.type)&&(a.defaultChecked=a.checked)}function bX(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=bV.length;while(e--){b=bV[e]+c;if(b in a)return b}return d}function bY(a,b){return a=b||a,p.css(a,"display")==="none"||!p.contains(a.ownerDocument,a)}function bZ(a,b){var c,d,e=[],f=0,g=a.length;for(;f<g;f++){c=a[f];if(!c.style)continue;e[f]=p._data(c,"olddisplay"),b?(!e[f]&&c.style.display==="none"&&(c.style.display=""),c.style.display===""&&bY(c)&&(e[f]=p._data(c,"olddisplay",cb(c.nodeName)))):(d=bH(c,"display"),!e[f]&&d!=="none"&&p._data(c,"olddisplay",d))}for(f=0;f<g;f++){c=a[f];if(!c.style)continue;if(!b||c.style.display==="none"||c.style.display==="")c.style.display=b?e[f]||"":"none"}return a}function b$(a,b,c){var d=bO.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function b_(a,b,c,d){var e=c===(d?"border":"content")?4:b==="width"?1:0,f=0;for(;e<4;e+=2)c==="margin"&&(f+=p.css(a,c+bU[e],!0)),d?(c==="content"&&(f-=parseFloat(bH(a,"padding"+bU[e]))||0),c!=="margin"&&(f-=parseFloat(bH(a,"border"+bU[e]+"Width"))||0)):(f+=parseFloat(bH(a,"padding"+bU[e]))||0,c!=="padding"&&(f+=parseFloat(bH(a,"border"+bU[e]+"Width"))||0));return f}function ca(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=!0,f=p.support.boxSizing&&p.css(a,"boxSizing")==="border-box";if(d<=0){d=bH(a,b);if(d<0||d==null)d=a.style[b];if(bP.test(d))return d;e=f&&(p.support.boxSizingReliable||d===a.style[b]),d=parseFloat(d)||0}return d+b_(a,b,c||(f?"border":"content"),e)+"px"}function cb(a){if(bR[a])return bR[a];var b=p("<"+a+">").appendTo(e.body),c=b.css("display");b.remove();if(c==="none"||c===""){bI=e.body.appendChild(bI||p.extend(e.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!bJ||!bI.createElement)bJ=(bI.contentWindow||bI.contentDocument).document,bJ.write("<!doctype html><html><body>"),bJ.close();b=bJ.body.appendChild(bJ.createElement(a)),c=bH(b,"display"),e.body.removeChild(bI)}return bR[a]=c,c}function ch(a,b,c,d){var e;if(p.isArray(b))p.each(b,function(b,e){c||cd.test(a)?d(a,e):ch(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&p.type(b)==="object")for(e in b)ch(a+"["+e+"]",b[e],c,d);else d(a,b)}function cy(a){return function(b,c){typeof b!="string"&&(c=b,b="*");var d,e,f,g=b.toLowerCase().split(s),h=0,i=g.length;if(p.isFunction(c))for(;h<i;h++)d=g[h],f=/^\+/.test(d),f&&(d=d.substr(1)||"*"),e=a[d]=a[d]||[],e[f?"unshift":"push"](c)}}function cz(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h,i=a[f],j=0,k=i?i.length:0,l=a===cu;for(;j<k&&(l||!h);j++)h=i[j](c,d,e),typeof h=="string"&&(!l||g[h]?h=b:(c.dataTypes.unshift(h),h=cz(a,c,d,e,h,g)));return(l||!h)&&!g["*"]&&(h=cz(a,c,d,e,"*",g)),h}function cA(a,c){var d,e,f=p.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((f[d]?a:e||(e={}))[d]=c[d]);e&&p.extend(!0,a,e)}function cB(a,c,d){var e,f,g,h,i=a.contents,j=a.dataTypes,k=a.responseFields;for(f in k)f in d&&(c[k[f]]=d[f]);while(j[0]==="*")j.shift(),e===b&&(e=a.mimeType||c.getResponseHeader("content-type"));if(e)for(f in i)if(i[f]&&i[f].test(e)){j.unshift(f);break}if(j[0]in d)g=j[0];else{for(f in d){if(!j[0]||a.converters[f+" "+j[0]]){g=f;break}h||(h=f)}g=g||h}if(g)return g!==j[0]&&j.unshift(g),d[g]}function cC(a,b){var c,d,e,f,g=a.dataTypes.slice(),h=g[0],i={},j=0;a.dataFilter&&(b=a.dataFilter(b,a.dataType));if(g[1])for(c in a.converters)i[c.toLowerCase()]=a.converters[c];for(;e=g[++j];)if(e!=="*"){if(h!=="*"&&h!==e){c=i[h+" "+e]||i["* "+e];if(!c)for(d in i){f=d.split(" ");if(f[1]===e){c=i[h+" "+f[0]]||i["* "+f[0]];if(c){c===!0?c=i[d]:i[d]!==!0&&(e=f[0],g.splice(j--,0,e));break}}}if(c!==!0)if(c&&a["throws"])b=c(b);else try{b=c(b)}catch(k){return{state:"parsererror",error:c?k:"No conversion from "+h+" to "+e}}}h=e}return{state:"success",data:b}}function cK(){try{return new a.XMLHttpRequest}catch(b){}}function cL(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function cT(){return setTimeout(function(){cM=b},0),cM=p.now()}function cU(a,b){p.each(b,function(b,c){var d=(cS[b]||[]).concat(cS["*"]),e=0,f=d.length;for(;e<f;e++)if(d[e].call(a,b,c))return})}function cV(a,b,c){var d,e=0,f=0,g=cR.length,h=p.Deferred().always(function(){delete i.elem}),i=function(){var b=cM||cT(),c=Math.max(0,j.startTime+j.duration-b),d=1-(c/j.duration||0),e=0,f=j.tweens.length;for(;e<f;e++)j.tweens[e].run(d);return h.notifyWith(a,[j,d,c]),d<1&&f?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:p.extend({},b),opts:p.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:cM||cT(),duration:c.duration,tweens:[],createTween:function(b,c,d){var e=p.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(e),e},stop:function(b){var c=0,d=b?j.tweens.length:0;for(;c<d;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;cW(k,j.opts.specialEasing);for(;e<g;e++){d=cR[e].call(j,a,k,j.opts);if(d)return d}return cU(j,k),p.isFunction(j.opts.start)&&j.opts.start.call(a,j),p.fx.timer(p.extend(i,{anim:j,queue:j.opts.queue,elem:a})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}function cW(a,b){var c,d,e,f,g;for(c in a){d=p.camelCase(c),e=b[d],f=a[c],p.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=p.cssHooks[d];if(g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}}function cX(a,b,c){var d,e,f,g,h,i,j,k,l=this,m=a.style,n={},o=[],q=a.nodeType&&bY(a);c.queue||(j=p._queueHooks(a,"fx"),j.unqueued==null&&(j.unqueued=0,k=j.empty.fire,j.empty.fire=function(){j.unqueued||k()}),j.unqueued++,l.always(function(){l.always(function(){j.unqueued--,p.queue(a,"fx").length||j.empty.fire()})})),a.nodeType===1&&("height"in b||"width"in b)&&(c.overflow=[m.overflow,m.overflowX,m.overflowY],p.css(a,"display")==="inline"&&p.css(a,"float")==="none"&&(!p.support.inlineBlockNeedsLayout||cb(a.nodeName)==="inline"?m.display="inline-block":m.zoom=1)),c.overflow&&(m.overflow="hidden",p.support.shrinkWrapBlocks||l.done(function(){m.overflow=c.overflow[0],m.overflowX=c.overflow[1],m.overflowY=c.overflow[2]}));for(d in b){f=b[d];if(cO.exec(f)){delete b[d];if(f===(q?"hide":"show"))continue;o.push(d)}}g=o.length;if(g){h=p._data(a,"fxshow")||p._data(a,"fxshow",{}),q?p(a).show():l.done(function(){p(a).hide()}),l.done(function(){var b;p.removeData(a,"fxshow",!0);for(b in n)p.style(a,b,n[b])});for(d=0;d<g;d++)e=o[d],i=l.createTween(e,q?h[e]:0),n[e]=h[e]||p.style(a,e),e in h||(h[e]=i.start,q&&(i.end=i.start,i.start=e==="width"||e==="height"?1:0))}}function cY(a,b,c,d,e){return new cY.prototype.init(a,b,c,d,e)}function cZ(a,b){var c,d={height:a},e=0;for(;e<4;e+=2-b)c=bU[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function c_(a){return p.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}var c,d,e=a.document,f=a.location,g=a.navigator,h=a.jQuery,i=a.$,j=Array.prototype.push,k=Array.prototype.slice,l=Array.prototype.indexOf,m=Object.prototype.toString,n=Object.prototype.hasOwnProperty,o=String.prototype.trim,p=function(a,b){return new p.fn.init(a,b,c)},q=/[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source,r=/\S/,s=/\s+/,t=r.test(" ")?/^[\s\xA0]+|[\s\xA0]+$/g:/^\s+|\s+$/g,u=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,y=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,z=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,A=/^-ms-/,B=/-([\da-z])/gi,C=function(a,b){return(b+"").toUpperCase()},D=function(){e.addEventListener?(e.removeEventListener("DOMContentLoaded",D,!1),p.ready()):e.readyState==="complete"&&(e.detachEvent("onreadystatechange",D),p.ready())},E={};p.fn=p.prototype={constructor:p,init:function(a,c,d){var f,g,h,i;if(!a)return this;if(a.nodeType)return this.context=this[0]=a,this.length=1,this;if(typeof a=="string"){a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3?f=[null,a,null]:f=u.exec(a);if(f&&(f[1]||!c)){if(f[1])return c=c instanceof p?c[0]:c,i=c&&c.nodeType?c.ownerDocument||c:e,a=p.parseHTML(f[1],i,!0),v.test(f[1])&&p.isPlainObject(c)&&this.attr.call(a,c,!0),p.merge(this,a);g=e.getElementById(f[2]);if(g&&g.parentNode){if(g.id!==f[2])return d.find(a);this.length=1,this[0]=g}return this.context=e,this.selector=a,this}return!c||c.jquery?(c||d).find(a):this.constructor(c).find(a)}return p.isFunction(a)?d.ready(a):(a.selector!==b&&(this.selector=a.selector,this.context=a.context),p.makeArray(a,this))},selector:"",jquery:"1.8.0",length:0,size:function(){return this.length},toArray:function(){return k.call(this)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=p.merge(this.constructor(),a);return d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")"),d},each:function(a,b){return p.each(this,a,b)},ready:function(a){return p.ready.promise().done(a),this},eq:function(a){return a=+a,a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(k.apply(this,arguments),"slice",k.call(arguments).join(","))},map:function(a){return this.pushStack(p.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:j,sort:[].sort,splice:[].splice},p.fn.init.prototype=p.fn,p.extend=p.fn.extend=function(){var a,c,d,e,f,g,h=arguments[0]||{},i=1,j=arguments.length,k=!1;typeof h=="boolean"&&(k=h,h=arguments[1]||{},i=2),typeof h!="object"&&!p.isFunction(h)&&(h={}),j===i&&(h=this,--i);for(;i<j;i++)if((a=arguments[i])!=null)for(c in a){d=h[c],e=a[c];if(h===e)continue;k&&e&&(p.isPlainObject(e)||(f=p.isArray(e)))?(f?(f=!1,g=d&&p.isArray(d)?d:[]):g=d&&p.isPlainObject(d)?d:{},h[c]=p.extend(k,g,e)):e!==b&&(h[c]=e)}return h},p.extend({noConflict:function(b){return a.$===p&&(a.$=i),b&&a.jQuery===p&&(a.jQuery=h),p},isReady:!1,readyWait:1,holdReady:function(a){a?p.readyWait++:p.ready(!0)},ready:function(a){if(a===!0?--p.readyWait:p.isReady)return;if(!e.body)return setTimeout(p.ready,1);p.isReady=!0;if(a!==!0&&--p.readyWait>0)return;d.resolveWith(e,[p]),p.fn.trigger&&p(e).trigger("ready").off("ready")},isFunction:function(a){return p.type(a)==="function"},isArray:Array.isArray||function(a){return p.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):E[m.call(a)]||"object"},isPlainObject:function(a){if(!a||p.type(a)!=="object"||a.nodeType||p.isWindow(a))return!1;try{if(a.constructor&&!n.call(a,"constructor")&&!n.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||n.call(a,d)},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},error:function(a){throw new Error(a)},parseHTML:function(a,b,c){var d;return!a||typeof a!="string"?null:(typeof b=="boolean"&&(c=b,b=0),b=b||e,(d=v.exec(a))?[b.createElement(d[1])]:(d=p.buildFragment([a],b,c?null:[]),p.merge([],(d.cacheable?p.clone(d.fragment):d.fragment).childNodes)))},parseJSON:function(b){if(!b||typeof b!="string")return null;b=p.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(w.test(b.replace(y,"@").replace(z,"]").replace(x,"")))return(new Function("return "+b))();p.error("Invalid JSON: "+b)},parseXML:function(c){var d,e;if(!c||typeof c!="string")return null;try{a.DOMParser?(e=new DOMParser,d=e.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(f){d=b}return(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&p.error("Invalid XML: "+c),d},noop:function(){},globalEval:function(b){b&&r.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(A,"ms-").replace(B,C)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var e,f=0,g=a.length,h=g===b||p.isFunction(a);if(d){if(h){for(e in a)if(c.apply(a[e],d)===!1)break}else for(;f<g;)if(c.apply(a[f++],d)===!1)break}else if(h){for(e in a)if(c.call(a[e],e,a[e])===!1)break}else for(;f<g;)if(c.call(a[f],f,a[f++])===!1)break;return a},trim:o?function(a){return a==null?"":o.call(a)}:function(a){return a==null?"":a.toString().replace(t,"")},makeArray:function(a,b){var c,d=b||[];return a!=null&&(c=p.type(a),a.length==null||c==="string"||c==="function"||c==="regexp"||p.isWindow(a)?j.call(d,a):p.merge(d,a)),d},inArray:function(a,b,c){var d;if(b){if(l)return l.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=c.length,e=a.length,f=0;if(typeof d=="number")for(;f<d;f++)a[e++]=c[f];else while(c[f]!==b)a[e++]=c[f++];return a.length=e,a},grep:function(a,b,c){var d,e=[],f=0,g=a.length;c=!!c;for(;f<g;f++)d=!!b(a[f],f),c!==d&&e.push(a[f]);return e},map:function(a,c,d){var e,f,g=[],h=0,i=a.length,j=a instanceof p||i!==b&&typeof i=="number"&&(i>0&&a[0]&&a[i-1]||i===0||p.isArray(a));if(j)for(;h<i;h++)e=c(a[h],h,d),e!=null&&(g[g.length]=e);else for(f in a)e=c(a[f],f,d),e!=null&&(g[g.length]=e);return g.concat.apply([],g)},guid:1,proxy:function(a,c){var d,e,f;return typeof c=="string"&&(d=a[c],c=a,a=d),p.isFunction(a)?(e=k.call(arguments,2),f=function(){return a.apply(c,e.concat(k.call(arguments)))},f.guid=a.guid=a.guid||f.guid||p.guid++,f):b},access:function(a,c,d,e,f,g,h){var i,j=d==null,k=0,l=a.length;if(d&&typeof d=="object"){for(k in d)p.access(a,c,k,d[k],1,g,e);f=1}else if(e!==b){i=h===b&&p.isFunction(e),j&&(i?(i=c,c=function(a,b,c){return i.call(p(a),c)}):(c.call(a,e),c=null));if(c)for(;k<l;k++)c(a[k],d,i?e.call(a[k],k,c(a[k],d)):e,h);f=1}return f?a:j?c.call(a):l?c(a[0],d):g},now:function(){return(new Date).getTime()}}),p.ready.promise=function(b){if(!d){d=p.Deferred();if(e.readyState==="complete"||e.readyState!=="loading"&&e.addEventListener)setTimeout(p.ready,1);else if(e.addEventListener)e.addEventListener("DOMContentLoaded",D,!1),a.addEventListener("load",p.ready,!1);else{e.attachEvent("onreadystatechange",D),a.attachEvent("onload",p.ready);var c=!1;try{c=a.frameElement==null&&e.documentElement}catch(f){}c&&c.doScroll&&function g(){if(!p.isReady){try{c.doScroll("left")}catch(a){return setTimeout(g,50)}p.ready()}}()}}return d.promise(b)},p.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){E["[object "+b+"]"]=b.toLowerCase()}),c=p(e);var F={};p.Callbacks=function(a){a=typeof a=="string"?F[a]||G(a):p.extend({},a);var c,d,e,f,g,h,i=[],j=!a.once&&[],k=function(b){c=a.memory&&b,d=!0,h=f||0,f=0,g=i.length,e=!0;for(;i&&h<g;h++)if(i[h].apply(b[0],b[1])===!1&&a.stopOnFalse){c=!1;break}e=!1,i&&(j?j.length&&k(j.shift()):c?i=[]:l.disable())},l={add:function(){if(i){var b=i.length;(function d(b){p.each(b,function(b,c){p.isFunction(c)&&(!a.unique||!l.has(c))?i.push(c):c&&c.length&&d(c)})})(arguments),e?g=i.length:c&&(f=b,k(c))}return this},remove:function(){return i&&p.each(arguments,function(a,b){var c;while((c=p.inArray(b,i,c))>-1)i.splice(c,1),e&&(c<=g&&g--,c<=h&&h--)}),this},has:function(a){return p.inArray(a,i)>-1},empty:function(){return i=[],this},disable:function(){return i=j=c=b,this},disabled:function(){return!i},lock:function(){return j=b,c||l.disable(),this},locked:function(){return!j},fireWith:function(a,b){return b=b||[],b=[a,b.slice?b.slice():b],i&&(!d||j)&&(e?j.push(b):k(b)),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!d}};return l},p.extend({Deferred:function(a){var b=[["resolve","done",p.Callbacks("once memory"),"resolved"],["reject","fail",p.Callbacks("once memory"),"rejected"],["notify","progress",p.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return p.Deferred(function(c){p.each(b,function(b,d){var f=d[0],g=a[b];e[d[1]](p.isFunction(g)?function(){var a=g.apply(this,arguments);a&&p.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f+"With"](this===e?c:this,[a])}:c[f])}),a=null}).promise()},promise:function(a){return typeof a=="object"?p.extend(a,d):d}},e={};return d.pipe=d.then,p.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[a^1][2].disable,b[2][2].lock),e[f[0]]=g.fire,e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=k.call(arguments),d=c.length,e=d!==1||a&&p.isFunction(a.promise)?d:0,f=e===1?a:p.Deferred(),g=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?k.call(arguments):d,c===h?f.notifyWith(b,c):--e||f.resolveWith(b,c)}},h,i,j;if(d>1){h=new Array(d),i=new Array(d),j=new Array(d);for(;b<d;b++)c[b]&&p.isFunction(c[b].promise)?c[b].promise().done(g(b,j,c)).fail(f.reject).progress(g(b,i,h)):--e}return e||f.resolveWith(j,c),f.promise()}}),p.support=function(){var b,c,d,f,g,h,i,j,k,l,m,n=e.createElement("div");n.setAttribute("className","t"),n.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",c=n.getElementsByTagName("*"),d=n.getElementsByTagName("a")[0],d.style.cssText="top:1px;float:left;opacity:.5";if(!c||!c.length||!d)return{};f=e.createElement("select"),g=f.appendChild(e.createElement("option")),h=n.getElementsByTagName("input")[0],b={leadingWhitespace:n.firstChild.nodeType===3,tbody:!n.getElementsByTagName("tbody").length,htmlSerialize:!!n.getElementsByTagName("link").length,style:/top/.test(d.getAttribute("style")),hrefNormalized:d.getAttribute("href")==="/a",opacity:/^0.5/.test(d.style.opacity),cssFloat:!!d.style.cssFloat,checkOn:h.value==="on",optSelected:g.selected,getSetAttribute:n.className!=="t",enctype:!!e.createElement("form").enctype,html5Clone:e.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",boxModel:e.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},h.checked=!0,b.noCloneChecked=h.cloneNode(!0).checked,f.disabled=!0,b.optDisabled=!g.disabled;try{delete n.test}catch(o){b.deleteExpando=!1}!n.addEventListener&&n.attachEvent&&n.fireEvent&&(n.attachEvent("onclick",m=function(){b.noCloneEvent=!1}),n.cloneNode(!0).fireEvent("onclick"),n.detachEvent("onclick",m)),h=e.createElement("input"),h.value="t",h.setAttribute("type","radio"),b.radioValue=h.value==="t",h.setAttribute("checked","checked"),h.setAttribute("name","t"),n.appendChild(h),i=e.createDocumentFragment(),i.appendChild(n.lastChild),b.checkClone=i.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=h.checked,i.removeChild(h),i.appendChild(n);if(n.attachEvent)for(k in{submit:!0,change:!0,focusin:!0})j="on"+k,l=j in n,l||(n.setAttribute(j,"return;"),l=typeof n[j]=="function"),b[k+"Bubbles"]=l;return p(function(){var c,d,f,g,h="padding:0;margin:0;border:0;display:block;overflow:hidden;",i=e.getElementsByTagName("body")[0];if(!i)return;c=e.createElement("div"),c.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",i.insertBefore(c,i.firstChild),d=e.createElement("div"),c.appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",f=d.getElementsByTagName("td"),f[0].style.cssText="padding:0;margin:0;border:0;display:none",l=f[0].offsetHeight===0,f[0].style.display="",f[1].style.display="none",b.reliableHiddenOffsets=l&&f[0].offsetHeight===0,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",b.boxSizing=d.offsetWidth===4,b.doesNotIncludeMarginInBodyOffset=i.offsetTop!==1,a.getComputedStyle&&(b.pixelPosition=(a.getComputedStyle(d,null)||{}).top!=="1%",b.boxSizingReliable=(a.getComputedStyle(d,null)||{width:"4px"}).width==="4px",g=e.createElement("div"),g.style.cssText=d.style.cssText=h,g.style.marginRight=g.style.width="0",d.style.width="1px",d.appendChild(g),b.reliableMarginRight=!parseFloat((a.getComputedStyle(g,null)||{}).marginRight)),typeof d.style.zoom!="undefined"&&(d.innerHTML="",d.style.cssText=h+"width:1px;padding:1px;display:inline;zoom:1",b.inlineBlockNeedsLayout=d.offsetWidth===3,d.style.display="block",d.style.overflow="visible",d.innerHTML="<div></div>",d.firstChild.style.width="5px",b.shrinkWrapBlocks=d.offsetWidth!==3,c.style.zoom=1),i.removeChild(c),c=d=f=g=null}),i.removeChild(n),c=d=f=g=h=i=n=null,b}();var H=/^(?:\{.*\}|\[.*\])$/,I=/([A-Z])/g;p.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(p.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){return a=a.nodeType?p.cache[a[p.expando]]:a[p.expando],!!a&&!K(a)},data:function(a,c,d,e){if(!p.acceptData(a))return;var f,g,h=p.expando,i=typeof c=="string",j=a.nodeType,k=j?p.cache:a,l=j?a[h]:a[h]&&h;if((!l||!k[l]||!e&&!k[l].data)&&i&&d===b)return;l||(j?a[h]=l=p.deletedIds.pop()||++p.uuid:l=h),k[l]||(k[l]={},j||(k[l].toJSON=p.noop));if(typeof c=="object"||typeof c=="function")e?k[l]=p.extend(k[l],c):k[l].data=p.extend(k[l].data,c);return f=k[l],e||(f.data||(f.data={}),f=f.data),d!==b&&(f[p.camelCase(c)]=d),i?(g=f[c],g==null&&(g=f[p.camelCase(c)])):g=f,g},removeData:function(a,b,c){if(!p.acceptData(a))return;var d,e,f,g=a.nodeType,h=g?p.cache:a,i=g?a[p.expando]:p.expando;if(!h[i])return;if(b){d=c?h[i]:h[i].data;if(d){p.isArray(b)||(b in d?b=[b]:(b=p.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,f=b.length;e<f;e++)delete d[b[e]];if(!(c?K:p.isEmptyObject)(d))return}}if(!c){delete h[i].data;if(!K(h[i]))return}g?p.cleanData([a],!0):p.support.deleteExpando||h!=h.window?delete h[i]:h[i]=null},_data:function(a,b,c){return p.data(a,b,c,!0)},acceptData:function(a){var b=a.nodeName&&p.noData[a.nodeName.toLowerCase()];return!b||b!==!0&&a.getAttribute("classid")===b}}),p.fn.extend({data:function(a,c){var d,e,f,g,h,i=this[0],j=0,k=null;if(a===b){if(this.length){k=p.data(i);if(i.nodeType===1&&!p._data(i,"parsedAttrs")){f=i.attributes;for(h=f.length;j<h;j++)g=f[j].name,g.indexOf("data-")===0&&(g=p.camelCase(g.substring(5)),J(i,g,k[g]));p._data(i,"parsedAttrs",!0)}}return k}return typeof a=="object"?this.each(function(){p.data(this,a)}):(d=a.split(".",2),d[1]=d[1]?"."+d[1]:"",e=d[1]+"!",p.access(this,function(c){if(c===b)return k=this.triggerHandler("getData"+e,[d[0]]),k===b&&i&&(k=p.data(i,a),k=J(i,a,k)),k===b&&d[1]?this.data(d[0]):k;d[1]=c,this.each(function(){var b=p(this);b.triggerHandler("setData"+e,d),p.data(this,a,c),b.triggerHandler("changeData"+e,d)})},null,c,arguments.length>1,null,!1))},removeData:function(a){return this.each(function(){p.removeData(this,a)})}}),p.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=p._data(a,b),c&&(!d||p.isArray(c)?d=p._data(a,b,p.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=p.queue(a,b),d=c.shift(),e=p._queueHooks(a,b),f=function(){p.dequeue(a,b)};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),delete e.stop,d.call(a,f,e)),!c.length&&e&&e.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return p._data(a,c)||p._data(a,c,{empty:p.Callbacks("once memory").add(function(){p.removeData(a,b+"queue",!0),p.removeData(a,c,!0)})})}}),p.fn.extend({queue:function(a,c){var d=2;return typeof a!="string"&&(c=a,a="fx",d--),arguments.length<d?p.queue(this[0],a):c===b?this:this.each(function(){var b=p.queue(this,a,c);p._queueHooks(this,a),a==="fx"&&b[0]!=="inprogress"&&p.dequeue(this,a)})},dequeue:function(a){return this.each(function(){p.dequeue(this,a)})},delay:function(a,b){return a=p.fx?p.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){var d,e=1,f=p.Deferred(),g=this,h=this.length,i=function(){--e||f.resolveWith(g,[g])};typeof a!="string"&&(c=a,a=b),a=a||"fx";while(h--)(d=p._data(g[h],a+"queueHooks"))&&d.empty&&(e++,d.empty.add(i));return i(),f.promise(c)}});var L,M,N,O=/[\t\r\n]/g,P=/\r/g,Q=/^(?:button|input)$/i,R=/^(?:button|input|object|select|textarea)$/i,S=/^a(?:rea|)$/i,T=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,U=p.support.getSetAttribute;p.fn.extend({attr:function(a,b){return p.access(this,p.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){p.removeAttr(this,a)})},prop:function(a,b){return p.access(this,p.prop,a,b,arguments.length>1)},removeProp:function(a){return a=p.propFix[a]||a,this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,f,g,h;if(p.isFunction(a))return this.each(function(b){p(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(s);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{f=" "+e.className+" ";for(g=0,h=b.length;g<h;g++)~f.indexOf(" "+b[g]+" ")||(f+=b[g]+" ");e.className=p.trim(f)}}}return this},removeClass:function(a){var c,d,e,f,g,h,i;if(p.isFunction(a))return this.each(function(b){p(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(s);for(h=0,i=this.length;h<i;h++){e=this[h];if(e.nodeType===1&&e.className){d=(" "+e.className+" ").replace(O," ");for(f=0,g=c.length;f<g;f++)while(d.indexOf(" "+c[f]+" ")>-1)d=d.replace(" "+c[f]+" "," ");e.className=a?p.trim(d):""}}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";return p.isFunction(a)?this.each(function(c){p(this).toggleClass(a.call(this,c,this.className,b),b)}):this.each(function(){if(c==="string"){var e,f=0,g=p(this),h=b,i=a.split(s);while(e=i[f++])h=d?h:!g.hasClass(e),g[h?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&p._data(this,"__className__",this.className),this.className=this.className||a===!1?"":p._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(O," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,f=this[0];if(!arguments.length){if(f)return c=p.valHooks[f.type]||p.valHooks[f.nodeName.toLowerCase()],c&&"get"in c&&(d=c.get(f,"value"))!==b?d:(d=f.value,typeof d=="string"?d.replace(P,""):d==null?"":d);return}return e=p.isFunction(a),this.each(function(d){var f,g=p(this);if(this.nodeType!==1)return;e?f=a.call(this,d,g.val()):f=a,f==null?f="":typeof f=="number"?f+="":p.isArray(f)&&(f=p.map(f,function(a){return a==null?"":a+""})),c=p.valHooks[this.type]||p.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,f,"value")===b)this.value=f})}}),p.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,f=a.selectedIndex,g=[],h=a.options,i=a.type==="select-one";if(f<0)return null;c=i?f:0,d=i?f+1:h.length;for(;c<d;c++){e=h[c];if(e.selected&&(p.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!p.nodeName(e.parentNode,"optgroup"))){b=p(e).val();if(i)return b;g.push(b)}}return i&&!g.length&&h.length?p(h[f]).val():g},set:function(a,b){var c=p.makeArray(b);return p(a).find("option").each(function(){this.selected=p.inArray(p(this).val(),c)>=0}),c.length||(a.selectedIndex=-1),c}}},attrFn:{},attr:function(a,c,d,e){var f,g,h,i=a.nodeType;if(!a||i===3||i===8||i===2)return;if(e&&p.isFunction(p.fn[c]))return p(a)[c](d);if(typeof a.getAttribute=="undefined")return p.prop(a,c,d);h=i!==1||!p.isXMLDoc(a),h&&(c=c.toLowerCase(),g=p.attrHooks[c]||(T.test(c)?M:L));if(d!==b){if(d===null){p.removeAttr(a,c);return}return g&&"set"in g&&h&&(f=g.set(a,d,c))!==b?f:(a.setAttribute(c,""+d),d)}return g&&"get"in g&&h&&(f=g.get(a,c))!==null?f:(f=a.getAttribute(c),f===null?b:f)},removeAttr:function(a,b){var c,d,e,f,g=0;if(b&&a.nodeType===1){d=b.split(s);for(;g<d.length;g++)e=d[g],e&&(c=p.propFix[e]||e,f=T.test(e),f||p.attr(a,e,""),a.removeAttribute(U?e:c),f&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(Q.test(a.nodeName)&&a.parentNode)p.error("type property can't be changed");else if(!p.support.radioValue&&b==="radio"&&p.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}},value:{get:function(a,b){return L&&p.nodeName(a,"button")?L.get(a,b):b in a?a.value:null},set:function(a,b,c){if(L&&p.nodeName(a,"button"))return L.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,f,g,h=a.nodeType;if(!a||h===3||h===8||h===2)return;return g=h!==1||!p.isXMLDoc(a),g&&(c=p.propFix[c]||c,f=p.propHooks[c]),d!==b?f&&"set"in f&&(e=f.set(a,d,c))!==b?e:a[c]=d:f&&"get"in f&&(e=f.get(a,c))!==null?e:a[c]},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):R.test(a.nodeName)||S.test(a.nodeName)&&a.href?0:b}}}}),M={get:function(a,c){var d,e=p.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;return b===!1?p.removeAttr(a,c):(d=p.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase())),c}},U||(N={name:!0,id:!0,coords:!0},L=p.valHooks.button={get:function(a,c){var d;return d=a.getAttributeNode(c),d&&(N[c]?d.value!=="":d.specified)?d.value:b},set:function(a,b,c){var d=a.getAttributeNode(c);return d||(d=e.createAttribute(c),a.setAttributeNode(d)),d.value=b+""}},p.each(["width","height"],function(a,b){p.attrHooks[b]=p.extend(p.attrHooks[b],{set:function(a,c){if(c==="")return a.setAttribute(b,"auto"),c}})}),p.attrHooks.contenteditable={get:L.get,set:function(a,b,c){b===""&&(b="false"),L.set(a,b,c)}}),p.support.hrefNormalized||p.each(["href","src","width","height"],function(a,c){p.attrHooks[c]=p.extend(p.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),p.support.style||(p.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),p.support.optSelected||(p.propHooks.selected=p.extend(p.propHooks.selected,{get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}})),p.support.enctype||(p.propFix.enctype="encoding"),p.support.checkOn||p.each(["radio","checkbox"],function(){p.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),p.each(["radio","checkbox"],function(){p.valHooks[this]=p.extend(p.valHooks[this],{set:function(a,b){if(p.isArray(b))return a.checked=p.inArray(p(a).val(),b)>=0}})});var V=/^(?:textarea|input|select)$/i,W=/^([^\.]*|)(?:\.(.+)|)$/,X=/(?:^|\s)hover(\.\S+|)\b/,Y=/^key/,Z=/^(?:mouse|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=function(a){return p.event.special.hover?a:a.replace(X,"mouseenter$1 mouseleave$1")};p.event={add:function(a,c,d,e,f){var g,h,i,j,k,l,m,n,o,q,r;if(a.nodeType===3||a.nodeType===8||!c||!d||!(g=p._data(a)))return;d.handler&&(o=d,d=o.handler,f=o.selector),d.guid||(d.guid=p.guid++),i=g.events,i||(g.events=i={}),h=g.handle,h||(g.handle=h=function(a){return typeof p!="undefined"&&(!a||p.event.triggered!==a.type)?p.event.dispatch.apply(h.elem,arguments):b},h.elem=a),c=p.trim(_(c)).split(" ");for(j=0;j<c.length;j++){k=W.exec(c[j])||[],l=k[1],m=(k[2]||"").split(".").sort(),r=p.event.special[l]||{},l=(f?r.delegateType:r.bindType)||l,r=p.event.special[l]||{},n=p.extend({type:l,origType:k[1],data:e,handler:d,guid:d.guid,selector:f,namespace:m.join(".")},o),q=i[l];if(!q){q=i[l]=[],q.delegateCount=0;if(!r.setup||r.setup.call(a,e,m,h)===!1)a.addEventListener?a.addEventListener(l,h,!1):a.attachEvent&&a.attachEvent("on"+l,h)}r.add&&(r.add.call(a,n),n.handler.guid||(n.handler.guid=d.guid)),f?q.splice(q.delegateCount++,0,n):q.push(n),p.event.global[l]=!0}a=null},global:{},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,q,r=p.hasData(a)&&p._data(a);if(!r||!(m=r.events))return;b=p.trim(_(b||"")).split(" ");for(f=0;f<b.length;f++){g=W.exec(b[f])||[],h=i=g[1],j=g[2];if(!h){for(h in m)p.event.remove(a,h+b[f],c,d,!0);continue}n=p.event.special[h]||{},h=(d?n.delegateType:n.bindType)||h,o=m[h]||[],k=o.length,j=j?new RegExp("(^|\\.)"+j.split(".").sort().join("\\.(?:.*\\.|)")+"(\\.|$)"):null;for(l=0;l<o.length;l++)q=o[l],(e||i===q.origType)&&(!c||c.guid===q.guid)&&(!j||j.test(q.namespace))&&(!d||d===q.selector||d==="**"&&q.selector)&&(o.splice(l--,1),q.selector&&o.delegateCount--,n.remove&&n.remove.call(a,q));o.length===0&&k!==o.length&&((!n.teardown||n.teardown.call(a,j,r.handle)===!1)&&p.removeEvent(a,h,r.handle),delete m[h])}p.isEmptyObject(m)&&(delete r.handle,p.removeData(a,"events",!0))},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,f,g){if(!f||f.nodeType!==3&&f.nodeType!==8){var h,i,j,k,l,m,n,o,q,r,s=c.type||c,t=[];if($.test(s+p.event.triggered))return;s.indexOf("!")>=0&&(s=s.slice(0,-1),i=!0),s.indexOf(".")>=0&&(t=s.split("."),s=t.shift(),t.sort());if((!f||p.event.customEvent[s])&&!p.event.global[s])return;c=typeof c=="object"?c[p.expando]?c:new p.Event(s,c):new p.Event(s),c.type=s,c.isTrigger=!0,c.exclusive=i,c.namespace=t.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+t.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,m=s.indexOf(":")<0?"on"+s:"";if(!f){h=p.cache;for(j in h)h[j].events&&h[j].events[s]&&p.event.trigger(c,d,h[j].handle.elem,!0);return}c.result=b,c.target||(c.target=f),d=d!=null?p.makeArray(d):[],d.unshift(c),n=p.event.special[s]||{};if(n.trigger&&n.trigger.apply(f,d)===!1)return;q=[[f,n.bindType||s]];if(!g&&!n.noBubble&&!p.isWindow(f)){r=n.delegateType||s,k=$.test(r+s)?f:f.parentNode;for(l=f;k;k=k.parentNode)q.push([k,r]),l=k;l===(f.ownerDocument||e)&&q.push([l.defaultView||l.parentWindow||a,r])}for(j=0;j<q.length&&!c.isPropagationStopped();j++)k=q[j][0],c.type=q[j][1],o=(p._data(k,"events")||{})[c.type]&&p._data(k,"handle"),o&&o.apply(k,d),o=m&&k[m],o&&p.acceptData(k)&&o.apply(k,d)===!1&&c.preventDefault();return c.type=s,!g&&!c.isDefaultPrevented()&&(!n._default||n._default.apply(f.ownerDocument,d)===!1)&&(s!=="click"||!p.nodeName(f,"a"))&&p.acceptData(f)&&m&&f[s]&&(s!=="focus"&&s!=="blur"||c.target.offsetWidth!==0)&&!p.isWindow(f)&&(l=f[m],l&&(f[m]=null),p.event.triggered=s,f[s](),p.event.triggered=b,l&&(f[m]=l)),c.result}return},dispatch:function(c){c=p.event.fix(c||a.event);var d,e,f,g,h,i,j,k,l,m,n,o=(p._data(this,"events")||{})[c.type]||[],q=o.delegateCount,r=[].slice.call(arguments),s=!c.exclusive&&!c.namespace,t=p.event.special[c.type]||{},u=[];r[0]=c,c.delegateTarget=this;if(t.preDispatch&&t.preDispatch.call(this,c)===!1)return;if(q&&(!c.button||c.type!=="click")){g=p(this),g.context=this;for(f=c.target;f!=this;f=f.parentNode||this)if(f.disabled!==!0||c.type!=="click"){i={},k=[],g[0]=f;for(d=0;d<q;d++)l=o[d],m=l.selector,i[m]===b&&(i[m]=g.is(m)),i[m]&&k.push(l);k.length&&u.push({elem:f,matches:k})}}o.length>q&&u.push({elem:this,matches:o.slice(q)});for(d=0;d<u.length&&!c.isPropagationStopped();d++){j=u[d],c.currentTarget=j.elem;for(e=0;e<j.matches.length&&!c.isImmediatePropagationStopped();e++){l=j.matches[e];if(s||!c.namespace&&!l.namespace||c.namespace_re&&c.namespace_re.test(l.namespace))c.data=l.data,c.handleObj=l,h=((p.event.special[l.origType]||{}).handle||l.handler).apply(j.elem,r),h!==b&&(c.result=h,h===!1&&(c.preventDefault(),c.stopPropagation()))}}return t.postDispatch&&t.postDispatch.call(this,c),c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,c){var d,f,g,h=c.button,i=c.fromElement;return a.pageX==null&&c.clientX!=null&&(d=a.target.ownerDocument||e,f=d.documentElement,g=d.body,a.pageX=c.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=c.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?c.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0),a}},fix:function(a){if(a[p.expando])return a;var b,c,d=a,f=p.event.fixHooks[a.type]||{},g=f.props?this.props.concat(f.props):this.props;a=p.Event(d);for(b=g.length;b;)c=g[--b],a[c]=d[c];return a.target||(a.target=d.srcElement||e),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,f.filter?f.filter(a,d):a},special:{ready:{setup:p.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){p.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=p.extend(new p.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?p.event.trigger(e,null,b):p.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},p.event.handle=p.event.dispatch,p.removeEvent=e.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]=="undefined"&&(a[d]=null),a.detachEvent(d,c))},p.Event=function(a,b){if(this instanceof p.Event)a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?bb:ba):this.type=a,b&&p.extend(this,b),this.timeStamp=a&&a.timeStamp||p.now(),this[p.expando]=!0;else return new p.Event(a,b)},p.Event.prototype={preventDefault:function(){this.isDefaultPrevented=bb;var a=this.originalEvent;if(!a)return;a.preventDefault?a.preventDefault():a.returnValue=!1},stopPropagation:function(){this.isPropagationStopped=bb;var a=this.originalEvent;if(!a)return;a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=bb,this.stopPropagation()},isDefaultPrevented:ba,isPropagationStopped:ba,isImmediatePropagationStopped:ba},p.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){p.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj,g=f.selector;if(!e||e!==d&&!p.contains(d,e))a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b;return c}}}),p.support.submitBubbles||(p.event.special.submit={setup:function(){if(p.nodeName(this,"form"))return!1;p.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=p.nodeName(c,"input")||p.nodeName(c,"button")?c.form:b;d&&!p._data(d,"_submit_attached")&&(p.event.add(d,"submit._submit",function(a){a._submit_bubble=!0}),p._data(d,"_submit_attached",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&p.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){if(p.nodeName(this,"form"))return!1;p.event.remove(this,"._submit")}}),p.support.changeBubbles||(p.event.special.change={setup:function(){if(V.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")p.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),p.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),p.event.simulate("change",this,a,!0)});return!1}p.event.add(this,"beforeactivate._change",function(a){var b=a.target;V.test(b.nodeName)&&!p._data(b,"_change_attached")&&(p.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&p.event.simulate("change",this.parentNode,a,!0)}),p._data(b,"_change_attached",!0))})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){return p.event.remove(this,"._change"),V.test(this.nodeName)}}),p.support.focusinBubbles||p.each({focus:"focusin",blur:"focusout"},function(a,b){var c=0,d=function(a){p.event.simulate(b,a.target,p.event.fix(a),!0)};p.event.special[b]={setup:function(){c++===0&&e.addEventListener(a,d,!0)},teardown:function(){--c===0&&e.removeEventListener(a,d,!0)}}}),p.fn.extend({on:function(a,c,d,e,f){var g,h;if(typeof a=="object"){typeof c!="string"&&(d=d||c,c=b);for(h in a)this.on(h,c,d,a[h],f);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=ba;else if(!e)return this;return f===1&&(g=e,e=function(a){return p().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=p.guid++)),this.each(function(){p.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,c,d){var e,f;if(a&&a.preventDefault&&a.handleObj)return e=a.handleObj,p(a.delegateTarget).off(e.namespace?e.origType+"."+e.namespace:e.origType,e.selector,e.handler),this;if(typeof a=="object"){for(f in a)this.off(f,c,a[f]);return this}if(c===!1||typeof c=="function")d=c,c=b;return d===!1&&(d=ba),this.each(function(){p.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){return p(this.context).on(a,this.selector,b,c),this},die:function(a,b){return p(this.context).off(a,this.selector||"**",b),this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a||"**",c)},trigger:function(a,b){return this.each(function(){p.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return p.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||p.guid++,d=0,e=function(c){var e=(p._data(this,"lastToggle"+a.guid)||0)%d;return p._data(this,"lastToggle"+a.guid,e+1),c.preventDefault(),b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),p.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){p.fn[b]=function(a,c){return c==null&&(c=a,a=null),arguments.length>0?this.on(b,null,a,c):this.trigger(b)},Y.test(b)&&(p.event.fixHooks[b]=p.event.keyHooks),Z.test(b)&&(p.event.fixHooks[b]=p.event.mouseHooks)}),function(a,b){function bd(a,b,c,d){var e=0,f=b.length;for(;e<f;e++)Z(a,b[e],c,d)}function be(a,b,c,d,e,f){var g,h=$.setFilters[b.toLowerCase()];return h||Z.error(b),(a||!(g=e))&&bd(a||"*",d,g=[],e),g.length>0?h(g,c,f):[]}function bf(a,c,d,e,f){var g,h,i,j,k,l,m,n,p=0,q=f.length,s=L.POS,t=new RegExp("^"+s.source+"(?!"+r+")","i"),u=function(){var a=1,c=arguments.length-2;for(;a<c;a++)arguments[a]===b&&(g[a]=b)};for(;p<q;p++){s.exec(""),a=f[p],j=[],i=0,k=e;while(g=s.exec(a)){n=s.lastIndex=g.index+g[0].length;if(n>i){m=a.slice(i,g.index),i=n,l=[c],B.test(m)&&(k&&(l=k),k=e);if(h=H.test(m))m=m.slice(0,-5).replace(B,"$&*");g.length>1&&g[0].replace(t,u),k=be(m,g[1],g[2],l,k,h)}}k?(j=j.concat(k),(m=a.slice(i))&&m!==")"?B.test(m)?bd(m,j,d,e):Z(m,c,d,e?e.concat(k):k):o.apply(d,j)):Z(a,c,d,e)}return q===1?d:Z.uniqueSort(d)}function bg(a,b,c){var d,e,f,g=[],i=0,j=D.exec(a),k=!j.pop()&&!j.pop(),l=k&&a.match(C)||[""],m=$.preFilter,n=$.filter,o=!c&&b!==h;for(;(e=l[i])!=null&&k;i++){g.push(d=[]),o&&(e=" "+e);while(e){k=!1;if(j=B.exec(e))e=e.slice(j[0].length),k=d.push({part:j.pop().replace(A," "),captures:j});for(f in n)(j=L[f].exec(e))&&(!m[f]||(j=m[f](j,b,c)))&&(e=e.slice(j.shift().length),k=d.push({part:f,captures:j}));if(!k)break}}return k||Z.error(a),g}function bh(a,b,e){var f=b.dir,g=m++;return a||(a=function(a){return a===e}),b.first?function(b,c){while(b=b[f])if(b.nodeType===1)return a(b,c)&&b}:function(b,e){var h,i=g+"."+d,j=i+"."+c;while(b=b[f])if(b.nodeType===1){if((h=b[q])===j)return b.sizset;if(typeof h=="string"&&h.indexOf(i)===0){if(b.sizset)return b}else{b[q]=j;if(a(b,e))return b.sizset=!0,b;b.sizset=!1}}}}function bi(a,b){return a?function(c,d){var e=b(c,d);return e&&a(e===!0?c:e,d)}:b}function bj(a,b,c){var d,e,f=0;for(;d=a[f];f++)$.relative[d.part]?e=bh(e,$.relative[d.part],b):(d.captures.push(b,c),e=bi(e,$.filter[d.part].apply(null,d.captures)));return e}function bk(a){return function(b,c){var d,e=0;for(;d=a[e];e++)if(d(b,c))return!0;return!1}}var c,d,e,f,g,h=a.document,i=h.documentElement,j="undefined",k=!1,l=!0,m=0,n=[].slice,o=[].push,q=("sizcache"+Math.random()).replace(".",""),r="[\\x20\\t\\r\\n\\f]",s="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",t=s.replace("w","w#"),u="([*^$|!~]?=)",v="\\["+r+"*("+s+")"+r+"*(?:"+u+r+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+t+")|)|)"+r+"*\\]",w=":("+s+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|((?:[^,]|\\\\,|(?:,(?=[^\\[]*\\]))|(?:,(?=[^\\(]*\\))))*))\\)|)",x=":(nth|eq|gt|lt|first|last|even|odd)(?:\\((\\d*)\\)|)(?=[^-]|$)",y=r+"*([\\x20\\t\\r\\n\\f>+~])"+r+"*",z="(?=[^\\x20\\t\\r\\n\\f])(?:\\\\.|"+v+"|"+w.replace(2,7)+"|[^\\\\(),])+",A=new RegExp("^"+r+"+|((?:^|[^\\\\])(?:\\\\.)*)"+r+"+$","g"),B=new RegExp("^"+y),C=new RegExp(z+"?(?="+r+"*,|$)","g"),D=new RegExp("^(?:(?!,)(?:(?:^|,)"+r+"*"+z+")*?|"+r+"*(.*?))(\\)|$)"),E=new RegExp(z.slice(19,-6)+"\\x20\\t\\r\\n\\f>+~])+|"+y,"g"),F=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,G=/[\x20\t\r\n\f]*[+~]/,H=/:not\($/,I=/h\d/i,J=/input|select|textarea|button/i,K=/\\(?!\\)/g,L={ID:new RegExp("^#("+s+")"),CLASS:new RegExp("^\\.("+s+")"),NAME:new RegExp("^\\[name=['\"]?("+s+")['\"]?\\]"),TAG:new RegExp("^("+s.replace("[-","[-\\*")+")"),ATTR:new RegExp("^"+v),PSEUDO:new RegExp("^"+w),CHILD:new RegExp("^:(only|nth|last|first)-child(?:\\("+r+"*(even|odd|(([+-]|)(\\d*)n|)"+r+"*(?:([+-]|)"+r+"*(\\d+)|))"+r+"*\\)|)","i"),POS:new RegExp(x,"ig"),needsContext:new RegExp("^"+r+"*[>+~]|"+x,"i")},M={},N=[],O={},P=[],Q=function(a){return a.sizzleFilter=!0,a},R=function(a){return function(b){return b.nodeName.toLowerCase()==="input"&&b.type===a}},S=function(a){return function(b){var c=b.nodeName.toLowerCase();return(c==="input"||c==="button")&&b.type===a}},T=function(a){var b=!1,c=h.createElement("div");try{b=a(c)}catch(d){}return c=null,b},U=T(function(a){a.innerHTML="<select></select>";var b=typeof a.lastChild.getAttribute("multiple");return b!=="boolean"&&b!=="string"}),V=T(function(a){a.id=q+0,a.innerHTML="<a name='"+q+"'></a><div name='"+q+"'></div>",i.insertBefore(a,i.firstChild);var b=h.getElementsByName&&h.getElementsByName(q).length===2+h.getElementsByName(q+0).length;return g=!h.getElementById(q),i.removeChild(a),b}),W=T(function(a){return a.appendChild(h.createComment("")),a.getElementsByTagName("*").length===0}),X=T(function(a){return a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!==j&&a.firstChild.getAttribute("href")==="#"}),Y=T(function(a){return a.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",!a.getElementsByClassName||a.getElementsByClassName("e").length===0?!1:(a.lastChild.className="e",a.getElementsByClassName("e").length!==1)}),Z=function(a,b,c,d){c=c||[],b=b||h;var e,f,g,i,j=b.nodeType;if(j!==1&&j!==9)return[];if(!a||typeof a!="string")return c;g=ba(b);if(!g&&!d)if(e=F.exec(a))if(i=e[1]){if(j===9){f=b.getElementById(i);if(!f||!f.parentNode)return c;if(f.id===i)return c.push(f),c}else if(b.ownerDocument&&(f=b.ownerDocument.getElementById(i))&&bb(b,f)&&f.id===i)return c.push(f),c}else{if(e[2])return o.apply(c,n.call(b.getElementsByTagName(a),0)),c;if((i=e[3])&&Y&&b.getElementsByClassName)return o.apply(c,n.call(b.getElementsByClassName(i),0)),c}return bm(a,b,c,d,g)},$=Z.selectors={cacheLength:50,match:L,order:["ID","TAG"],attrHandle:{},createPseudo:Q,find:{ID:g?function(a,b,c){if(typeof b.getElementById!==j&&!c){var d=b.getElementById(a);return d&&d.parentNode?[d]:[]}}:function(a,c,d){if(typeof c.getElementById!==j&&!d){var e=c.getElementById(a);return e?e.id===a||typeof e.getAttributeNode!==j&&e.getAttributeNode("id").value===a?[e]:b:[]}},TAG:W?function(a,b){if(typeof b.getElementsByTagName!==j)return b.getElementsByTagName(a)}:function(a,b){var c=b.getElementsByTagName(a);if(a==="*"){var d,e=[],f=0;for(;d=c[f];f++)d.nodeType===1&&e.push(d);return e}return c}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(K,""),a[3]=(a[4]||a[5]||"").replace(K,""),a[2]==="~="&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),a[1]==="nth"?(a[2]||Z.error(a[0]),a[3]=+(a[3]?a[4]+(a[5]||1):2*(a[2]==="even"||a[2]==="odd")),a[4]=+(a[6]+a[7]||a[2]==="odd")):a[2]&&Z.error(a[0]),a},PSEUDO:function(a){var b,c=a[4];return L.CHILD.test(a[0])?null:(c&&(b=D.exec(c))&&b.pop()&&(a[0]=a[0].slice(0,b[0].length-c.length-1),c=b[0].slice(0,-1)),a.splice(2,3,c||a[3]),a)}},filter:{ID:g?function(a){return a=a.replace(K,""),function(b){return b.getAttribute("id")===a}}:function(a){return a=a.replace(K,""),function(b){var c=typeof b.getAttributeNode!==j&&b.getAttributeNode("id");return c&&c.value===a}},TAG:function(a){return a==="*"?function(){return!0}:(a=a.replace(K,"").toLowerCase(),function(b){return b.nodeName&&b.nodeName.toLowerCase()===a})},CLASS:function(a){var b=M[a];return b||(b=M[a]=new RegExp("(^|"+r+")"+a+"("+r+"|$)"),N.push(a),N.length>$.cacheLength&&delete M[N.shift()]),function(a){return b.test(a.className||typeof a.getAttribute!==j&&a.getAttribute("class")||"")}},ATTR:function(a,b,c){return b?function(d){var e=Z.attr(d,a),f=e+"";if(e==null)return b==="!=";switch(b){case"=":return f===c;case"!=":return f!==c;case"^=":return c&&f.indexOf(c)===0;case"*=":return c&&f.indexOf(c)>-1;case"$=":return c&&f.substr(f.length-c.length)===c;case"~=":return(" "+f+" ").indexOf(c)>-1;case"|=":return f===c||f.substr(0,c.length+1)===c+"-"}}:function(b){return Z.attr(b,a)!=null}},CHILD:function(a,b,c,d){if(a==="nth"){var e=m++;return function(a){var b,f,g=0,h=a;if(c===1&&d===0)return!0;b=a.parentNode;if(b&&(b[q]!==e||!a.sizset)){for(h=b.firstChild;h;h=h.nextSibling)if(h.nodeType===1){h.sizset=++g;if(h===a)break}b[q]=e}return f=a.sizset-d,c===0?f===0:f%c===0&&f/c>=0}}return function(b){var c=b;switch(a){case"only":case"first":while(c=c.previousSibling)if(c.nodeType===1)return!1;if(a==="first")return!0;c=b;case"last":while(c=c.nextSibling)if(c.nodeType===1)return!1;return!0}}},PSEUDO:function(a,b,c,d){var e=$.pseudos[a]||$.pseudos[a.toLowerCase()];return e||Z.error("unsupported pseudo: "+a),e.sizzleFilter?e(b,c,d):e}},pseudos:{not:Q(function(a,b,c){var d=bl(a.replace(A,"$1"),b,c);return function(a){return!d(a)}}),enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&!!a.checked||b==="option"&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},parent:function(a){return!$.pseudos.empty(a)},empty:function(a){var b;a=a.firstChild;while(a){if(a.nodeName>"@"||(b=a.nodeType)===3||b===4)return!1;a=a.nextSibling}return!0},contains:Q(function(a){return function(b){return(b.textContent||b.innerText||bc(b)).indexOf(a)>-1}}),has:Q(function(a){return function(b){return Z(a,b).length>0}}),header:function(a){return I.test(a.nodeName)},text:function(a){var b,c;return a.nodeName.toLowerCase()==="input"&&(b=a.type)==="text"&&((c=a.getAttribute("type"))==null||c.toLowerCase()===b)},radio:R("radio"),checkbox:R("checkbox"),file:R("file"),password:R("password"),image:R("image"),submit:S("submit"),reset:S("reset"),button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&a.type==="button"||b==="button"},input:function(a){return J.test(a.nodeName)},focus:function(a){var b=a.ownerDocument;return a===b.activeElement&&(!b.hasFocus||b.hasFocus())&&(!!a.type||!!a.href)},active:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b,c){return c?a.slice(1):[a[0]]},last:function(a,b,c){var d=a.pop();return c?a:[d]},even:function(a,b,c){var d=[],e=c?1:0,f=a.length;for(;e<f;e=e+2)d.push(a[e]);return d},odd:function(a,b,c){var d=[],e=c?0:1,f=a.length;for(;e<f;e=e+2)d.push(a[e]);return d},lt:function(a,b,c){return c?a.slice(+b):a.slice(0,+b)},gt:function(a,b,c){return c?a.slice(0,+b+1):a.slice(+b+1)},eq:function(a,b,c){var d=a.splice(+b,1);return c?a:d}}};$.setFilters.nth=$.setFilters.eq,$.filters=$.pseudos,X||($.attrHandle={href:function(a){return a.getAttribute("href",2)},type:function(a){return a.getAttribute("type")}}),V&&($.order.push("NAME"),$.find.NAME=function(a,b){if(typeof b.getElementsByName!==j)return b.getElementsByName(a)}),Y&&($.order.splice(1,0,"CLASS"),$.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!==j&&!c)return b.getElementsByClassName(a)});try{n.call(i.childNodes,0)[0].nodeType}catch(_){n=function(a){var b,c=[];for(;b=this[a];a++)c.push(b);return c}}var ba=Z.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?b.nodeName!=="HTML":!1},bb=Z.contains=i.compareDocumentPosition?function(a,b){return!!(a.compareDocumentPosition(b)&16)}:i.contains?function(a,b){var c=a.nodeType===9?a.documentElement:a,d=b.parentNode;return a===d||!!(d&&d.nodeType===1&&c.contains&&c.contains(d))}:function(a,b){while(b=b.parentNode)if(b===a)return!0;return!1},bc=Z.getText=function(a){var b,c="",d=0,e=a.nodeType;if(e){if(e===1||e===9||e===11){if(typeof a.textContent=="string")return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=bc(a)}else if(e===3||e===4)return a.nodeValue}else for(;b=a[d];d++)c+=bc(b);return c};Z.attr=function(a,b){var c,d=ba(a);return d||(b=b.toLowerCase()),$.attrHandle[b]?$.attrHandle[b](a):U||d?a.getAttribute(b):(c=a.getAttributeNode(b),c?typeof a[b]=="boolean"?a[b]?b:null:c.specified?c.value:null:null)},Z.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},[0,0].sort(function(){return l=0}),i.compareDocumentPosition?e=function(a,b){return a===b?(k=!0,0):(!a.compareDocumentPosition||!b.compareDocumentPosition?a.compareDocumentPosition:a.compareDocumentPosition(b)&4)?-1:1}:(e=function(a,b){if(a===b)return k=!0,0;if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],g=[],h=a.parentNode,i=b.parentNode,j=h;if(h===i)return f(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)g.unshift(j),j=j.parentNode;c=e.length,d=g.length;for(var l=0;l<c&&l<d;l++)if(e[l]!==g[l])return f(e[l],g[l]);return l===c?f(a,g[l],-1):f(e[l],b,1)},f=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),Z.uniqueSort=function(a){var b,c=1;if(e){k=l,a.sort(e);if(k)for(;b=a[c];c++)b===a[c-1]&&a.splice(c--,1)}return a};var bl=Z.compile=function(a,b,c){var d,e,f,g=O[a];if(g&&g.context===b)return g;e=bg(a,b,c);for(f=0;d=e[f];f++)e[f]=bj(d,b,c);return g=O[a]=bk(e),g.context=b,g.runs=g.dirruns=0,P.push(a),P.length>$.cacheLength&&delete O[P.shift()],g};Z.matches=function(a,b){return Z(a,null,null,b)},Z.matchesSelector=function(a,b){return Z(b,null,null,[a]).length>0};var bm=function(a,b,e,f,g){a=a.replace(A,"$1");var h,i,j,k,l,m,p,q,r,s=a.match(C),t=a.match(E),u=b.nodeType;if(L.POS.test(a))return bf(a,b,e,f,s);if(f)h=n.call(f,0);else if(s&&s.length===1){if(t.length>1&&u===9&&!g&&(s=L.ID.exec(t[0]))){b=$.find.ID(s[1],b,g)[0];if(!b)return e;a=a.slice(t.shift().length)}q=(s=G.exec(t[0]))&&!s.index&&b.parentNode||b,r=t.pop(),m=r.split(":not")[0];for(j=0,k=$.order.length;j<k;j++){p=$.order[j];if(s=L[p].exec(m)){h=$.find[p]((s[1]||"").replace(K,""),q,g);if(h==null)continue;m===r&&(a=a.slice(0,a.length-r.length)+m.replace(L[p],""),a||o.apply(e,n.call(h,0)));break}}}if(a){i=bl(a,b,g),d=i.dirruns++,h==null&&(h=$.find.TAG("*",G.test(a)&&b.parentNode||b));for(j=0;l=h[j];j++)c=i.runs++,i(l,b)&&e.push(l)}return e};h.querySelectorAll&&function(){var a,b=bm,c=/'|\\/g,d=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,e=[],f=[":active"],g=i.matchesSelector||i.mozMatchesSelector||i.webkitMatchesSelector||i.oMatchesSelector||i.msMatchesSelector;T(function(a){a.innerHTML="<select><option selected></option></select>",a.querySelectorAll("[selected]").length||e.push("\\["+r+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),a.querySelectorAll(":checked").length||e.push(":checked")}),T(function(a){a.innerHTML="<p test=''></p>",a.querySelectorAll("[test^='']").length&&e.push("[*^$]="+r+"*(?:\"\"|'')"),a.innerHTML="<input type='hidden'>",a.querySelectorAll(":enabled").length||e.push(":enabled",":disabled")}),e=e.length&&new RegExp(e.join("|")),bm=function(a,d,f,g,h){if(!g&&!h&&(!e||!e.test(a)))if(d.nodeType===9)try{return o.apply(f,n.call(d.querySelectorAll(a),0)),f}catch(i){}else if(d.nodeType===1&&d.nodeName.toLowerCase()!=="object"){var j=d.getAttribute("id"),k=j||q,l=G.test(a)&&d.parentNode||d;j?k=k.replace(c,"\\$&"):d.setAttribute("id",k);try{return o.apply(f,n.call(l.querySelectorAll(a.replace(C,"[id='"+k+"'] $&")),0)),f}catch(i){}finally{j||d.removeAttribute("id")}}return b(a,d,f,g,h)},g&&(T(function(b){a=g.call(b,"div");try{g.call(b,"[test!='']:sizzle"),f.push($.match.PSEUDO)}catch(c){}}),f=new RegExp(f.join("|")),Z.matchesSelector=function(b,c){c=c.replace(d,"='$1']");if(!ba(b)&&!f.test(c)&&(!e||!e.test(c)))try{var h=g.call(b,c);if(h||a||b.document&&b.document.nodeType!==11)return h}catch(i){}return Z(c,null,null,[b]).length>0})}(),Z.attr=p.attr,p.find=Z,p.expr=Z.selectors,p.expr[":"]=p.expr.pseudos,p.unique=Z.uniqueSort,p.text=Z.getText,p.isXMLDoc=Z.isXML,p.contains=Z.contains}(a);var bc=/Until$/,bd=/^(?:parents|prev(?:Until|All))/,be=/^.[^:#\[\.,]*$/,bf=p.expr.match.needsContext,bg={children:!0,contents:!0,next:!0,prev:!0};p.fn.extend({find:function(a){var b,c,d,e,f,g,h=this;if(typeof a!="string")return p(a).filter(function(){for(b=0,c=h.length;b<c;b++)if(p.contains(h[b],this))return!0});g=this.pushStack("","find",a);for(b=0,c=this.length;b<c;b++){d=g.length,p.find(a,this[b],g);if(b>0)for(e=d;e<g.length;e++)for(f=0;f<d;f++)if(g[f]===g[e]){g.splice(e--,1);break}}return g},has:function(a){var b,c=p(a,this),d=c.length;return this.filter(function(){for(b=0;b<d;b++)if(p.contains(this,c[b]))return!0})},not:function(a){return this.pushStack(bj(this,a,!1),"not",a)},filter:function(a){return this.pushStack(bj(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?bf.test(a)?p(a,this.context).index(this[0])>=0:p.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c,d=0,e=this.length,f=[],g=bf.test(a)||typeof a!="string"?p(a,b||this.context):0;for(;d<e;d++){c=this[d];while(c&&c.ownerDocument&&c!==b&&c.nodeType!==11){if(g?g.index(c)>-1:p.find.matchesSelector(c,a)){f.push(c);break}c=c.parentNode}}return f=f.length>1?p.unique(f):f,this.pushStack(f,"closest",a)},index:function(a){return a?typeof a=="string"?p.inArray(this[0],p(a)):p.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(a,b){var c=typeof a=="string"?p(a,b):p.makeArray(a&&a.nodeType?[a]:a),d=p.merge(this.get(),c);return this.pushStack(bh(c[0])||bh(d[0])?d:p.unique(d))},addBack:function(a){return this.add(a==null?this.prevObject:this.prevObject.filter(a))}}),p.fn.andSelf=p.fn.addBack,p.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return p.dir(a,"parentNode")},parentsUntil:function(a,b,c){return p.dir(a,"parentNode",c)},next:function(a){return bi(a,"nextSibling")},prev:function(a){return bi(a,"previousSibling")},nextAll:function(a){return p.dir(a,"nextSibling")},prevAll:function(a){return p.dir(a,"previousSibling")},nextUntil:function(a,b,c){return p.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return p.dir(a,"previousSibling",c)},siblings:function(a){return p.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return p.sibling(a.firstChild)},contents:function(a){return p.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:p.merge([],a.childNodes)}},function(a,b){p.fn[a]=function(c,d){var e=p.map(this,b,c);return bc.test(a)||(d=c),d&&typeof d=="string"&&(e=p.filter(d,e)),e=this.length>1&&!bg[a]?p.unique(e):e,this.length>1&&bd.test(a)&&(e=e.reverse()),this.pushStack(e,a,k.call(arguments).join(","))}}),p.extend({filter:function(a,b,c){return c&&(a=":not("+a+")"),b.length===1?p.find.matchesSelector(b[0],a)?[b[0]]:[]:p.find.matches(a,b)},dir:function(a,c,d){var e=[],f=a[c];while(f&&f.nodeType!==9&&(d===b||f.nodeType!==1||!p(f).is(d)))f.nodeType===1&&e.push(f),f=f[c];return e},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var bl="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",bm=/ jQuery\d+="(?:null|\d+)"/g,bn=/^\s+/,bo=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bp=/<([\w:]+)/,bq=/<tbody/i,br=/<|&#?\w+;/,bs=/<(?:script|style|link)/i,bt=/<(?:script|object|embed|option|style)/i,bu=new RegExp("<(?:"+bl+")[\\s/>]","i"),bv=/^(?:checkbox|radio)$/,bw=/checked\s*(?:[^=]|=\s*.checked.)/i,bx=/\/(java|ecma)script/i,by=/^\s*<!(?:\[CDATA\[|\-\-)|[\]\-]{2}>\s*$/g,bz={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bA=bk(e),bB=bA.appendChild(e.createElement("div"));bz.optgroup=bz.option,bz.tbody=bz.tfoot=bz.colgroup=bz.caption=bz.thead,bz.th=bz.td,p.support.htmlSerialize||(bz._default=[1,"X<div>","</div>"]),p.fn.extend({text:function(a){return p.access(this,function(a){return a===b?p.text(this):this.empty().append((this[0]&&this[0].ownerDocument||e).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(p.isFunction(a))return this.each(function(b){p(this).wrapAll(a.call(this,b))});if(this[0]){var b=p(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return p.isFunction(a)?this.each(function(b){p(this).wrapInner(a.call(this,b))}):this.each(function(){var b=p(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=p.isFunction(a);return this.each(function(c){p(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){p.nodeName(this,"body")||p(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(a,this.firstChild)})},before:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(a,this),"before",this.selector)}},after:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(this,a),"after",this.selector)}},remove:function(a,b){var c,d=0;for(;(c=this[d])!=null;d++)if(!a||p.filter(a,[c]).length)!b&&c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),p.cleanData([c])),c.parentNode&&c.parentNode.removeChild(c);return this},empty:function(){var a,b=0;for(;(a=this[b])!=null;b++){a.nodeType===1&&p.cleanData(a.getElementsByTagName("*"));while(a.firstChild)a.removeChild(a.firstChild)}return this},clone:function(a,b){return a=a==null?!1:a,b=b==null?a:b,this.map(function(){return p.clone(this,a,b)})},html:function(a){return p.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(bm,""):b;if(typeof a=="string"&&!bs.test(a)&&(p.support.htmlSerialize||!bu.test(a))&&(p.support.leadingWhitespace||!bn.test(a))&&!bz[(bp.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(bo,"<$1></$2>");try{for(;d<e;d++)c=this[d]||{},c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),c.innerHTML=a);c=0}catch(f){}}c&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(a){return bh(this[0])?this.length?this.pushStack(p(p.isFunction(a)?a():a),"replaceWith",a):this:p.isFunction(a)?this.each(function(b){var c=p(this),d=c.html();c.replaceWith(a.call(this,b,d))}):(typeof a!="string"&&(a=p(a).detach()),this.each(function(){var b=this.nextSibling,c=this.parentNode;p(this).remove(),b?p(b).before(a):p(c).append(a)}))},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){a=[].concat.apply([],a);var e,f,g,h,i=0,j=a[0],k=[],l=this.length;if(!p.support.checkClone&&l>1&&typeof j=="string"&&bw.test(j))return this.each(function(){p(this).domManip(a,c,d)});if(p.isFunction(j))return this.each(function(e){var f=p(this);a[0]=j.call(this,e,c?f.html():b),f.domManip(a,c,d)});if(this[0]){e=p.buildFragment(a,this,k),g=e.fragment,f=g.firstChild,g.childNodes.length===1&&(g=f);if(f){c=c&&p.nodeName(f,"tr");for(h=e.cacheable||l-1;i<l;i++)d.call(c&&p.nodeName(this[i],"table")?bC(this[i],"tbody"):this[i],i===h?g:p.clone(g,!0,!0))}g=f=null,k.length&&p.each(k,function(a,b){b.src?p.ajax?p.ajax({url:b.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):p.error("no ajax"):p.globalEval((b.text||b.textContent||b.innerHTML||"").replace(by,"")),b.parentNode&&b.parentNode.removeChild(b)})}return this}}),p.buildFragment=function(a,c,d){var f,g,h,i=a[0];return c=c||e,c=(c[0]||c).ownerDocument||c[0]||c,typeof c.createDocumentFragment=="undefined"&&(c=e),a.length===1&&typeof i=="string"&&i.length<512&&c===e&&i.charAt(0)==="<"&&!bt.test(i)&&(p.support.checkClone||!bw.test(i))&&(p.support.html5Clone||!bu.test(i))&&(g=!0,f=p.fragments[i],h=f!==b),f||(f=c.createDocumentFragment(),p.clean(a,c,f,d),g&&(p.fragments[i]=h&&f)),{fragment:f,cacheable:g}},p.fragments={},p.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){p.fn[a]=function(c){var d,e=0,f=[],g=p(c),h=g.length,i=this.length===1&&this[0].parentNode;if((i==null||i&&i.nodeType===11&&i.childNodes.length===1)&&h===1)return g[b](this[0]),this;for(;e<h;e++)d=(e>0?this.clone(!0):this).get(),p(g[e])[b](d),f=f.concat(d);return this.pushStack(f,a,g.selector)}}),p.extend({clone:function(a,b,c){var d,e,f,g;p.support.html5Clone||p.isXMLDoc(a)||!bu.test("<"+a.nodeName+">")?g=a.cloneNode(!0):(bB.innerHTML=a.outerHTML,bB.removeChild(g=bB.firstChild));if((!p.support.noCloneEvent||!p.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!p.isXMLDoc(a)){bE(a,g),d=bF(a),e=bF(g);for(f=0;d[f];++f)e[f]&&bE(d[f],e[f])}if(b){bD(a,g);if(c){d=bF(a),e=bF(g);for(f=0;d[f];++f)bD(d[f],e[f])}}return d=e=null,g},clean:function(a,b,c,d){var f,g,h,i,j,k,l,m,n,o,q,r,s=0,t=[];if(!b||typeof b.createDocumentFragment=="undefined")b=e;for(g=b===e&&bA;(h=a[s])!=null;s++){typeof h=="number"&&(h+="");if(!h)continue;if(typeof h=="string")if(!br.test(h))h=b.createTextNode(h);else{g=g||bk(b),l=l||g.appendChild(b.createElement("div")),h=h.replace(bo,"<$1></$2>"),i=(bp.exec(h)||["",""])[1].toLowerCase(),j=bz[i]||bz._default,k=j[0],l.innerHTML=j[1]+h+j[2];while(k--)l=l.lastChild;if(!p.support.tbody){m=bq.test(h),n=i==="table"&&!m?l.firstChild&&l.firstChild.childNodes:j[1]==="<table>"&&!m?l.childNodes:[];for(f=n.length-1;f>=0;--f)p.nodeName(n[f],"tbody")&&!n[f].childNodes.length&&n[f].parentNode.removeChild(n[f])}!p.support.leadingWhitespace&&bn.test(h)&&l.insertBefore(b.createTextNode(bn.exec(h)[0]),l.firstChild),h=l.childNodes,l=g.lastChild}h.nodeType?t.push(h):t=p.merge(t,h)}l&&(g.removeChild(l),h=l=g=null);if(!p.support.appendChecked)for(s=0;(h=t[s])!=null;s++)p.nodeName(h,"input")?bG(h):typeof h.getElementsByTagName!="undefined"&&p.grep(h.getElementsByTagName("input"),bG);if(c){q=function(a){if(!a.type||bx.test(a.type))return d?d.push(a.parentNode?a.parentNode.removeChild(a):a):c.appendChild(a)};for(s=0;(h=t[s])!=null;s++)if(!p.nodeName(h,"script")||!q(h))c.appendChild(h),typeof h.getElementsByTagName!="undefined"&&(r=p.grep(p.merge([],h.getElementsByTagName("script")),q),t.splice.apply(t,[s+1,0].concat(r)),s+=r.length)}return t},cleanData:function(a,b){var c,d,e,f,g=0,h=p.expando,i=p.cache,j=p.support.deleteExpando,k=p.event.special;for(;(e=a[g])!=null;g++)if(b||p.acceptData(e)){d=e[h],c=d&&i[d];if(c){if(c.events)for(f in c.events)k[f]?p.event.remove(e,f):p.removeEvent(e,f,c.handle);i[d]&&(delete i[d],j?delete e[h]:e.removeAttribute?e.removeAttribute(h):e[h]=null,p.deletedIds.push(d))}}}}),function(){var a,b;p.uaMatch=function(a){a=a.toLowerCase();var b=/(chrome)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||a.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},a=p.uaMatch(g.userAgent),b={},a.browser&&(b[a.browser]=!0,b.version=a.version),b.webkit&&(b.safari=!0),p.browser=b,p.sub=function(){function a(b,c){return new a.fn.init(b,c)}p.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function c(c,d){return d&&d instanceof p&&!(d instanceof a)&&(d=a(d)),p.fn.init.call(this,c,d,b)},a.fn.init.prototype=a.fn;var b=a(e);return a}}();var bH,bI,bJ,bK=/alpha\([^)]*\)/i,bL=/opacity=([^)]*)/,bM=/^(top|right|bottom|left)$/,bN=/^margin/,bO=new RegExp("^("+q+")(.*)$","i"),bP=new RegExp("^("+q+")(?!px)[a-z%]+$","i"),bQ=new RegExp("^([-+])=("+q+")","i"),bR={},bS={position:"absolute",visibility:"hidden",display:"block"},bT={letterSpacing:0,fontWeight:400,lineHeight:1},bU=["Top","Right","Bottom","Left"],bV=["Webkit","O","Moz","ms"],bW=p.fn.toggle;p.fn.extend({css:function(a,c){return p.access(this,function(a,c,d){return d!==b?p.style(a,c,d):p.css(a,c)},a,c,arguments.length>1)},show:function(){return bZ(this,!0)},hide:function(){return bZ(this)},toggle:function(a,b){var c=typeof a=="boolean";return p.isFunction(a)&&p.isFunction(b)?bW.apply(this,arguments):this.each(function(){(c?a:bY(this))?p(this).show():p(this).hide()})}}),p.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bH(a,"opacity");return c===""?"1":c}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":p.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!a||a.nodeType===3||a.nodeType===8||!a.style)return;var f,g,h,i=p.camelCase(c),j=a.style;c=p.cssProps[i]||(p.cssProps[i]=bX(j,i)),h=p.cssHooks[c]||p.cssHooks[i];if(d===b)return h&&"get"in h&&(f=h.get(a,!1,e))!==b?f:j[c];g=typeof d,g==="string"&&(f=bQ.exec(d))&&(d=(f[1]+1)*f[2]+parseFloat(p.css(a,c)),g="number");if(d==null||g==="number"&&isNaN(d))return;g==="number"&&!p.cssNumber[i]&&(d+="px");if(!h||!("set"in h)||(d=h.set(a,d,e))!==b)try{j[c]=d}catch(k){}},css:function(a,c,d,e){var f,g,h,i=p.camelCase(c);return c=p.cssProps[i]||(p.cssProps[i]=bX(a.style,i)),h=p.cssHooks[c]||p.cssHooks[i],h&&"get"in h&&(f=h.get(a,!0,e)),f===b&&(f=bH(a,c)),f==="normal"&&c in bT&&(f=bT[c]),d||e!==b?(g=parseFloat(f),d||p.isNumeric(g)?g||0:f):f},swap:function(a,b,c){var d,e,f={};for(e in b)f[e]=a.style[e],a.style[e]=b[e];d=c.call(a);for(e in b)a.style[e]=f[e];return d}}),a.getComputedStyle?bH=function(a,b){var c,d,e,f,g=getComputedStyle(a,null),h=a.style;return g&&(c=g[b],c===""&&!p.contains(a.ownerDocument.documentElement,a)&&(c=p.style(a,b)),bP.test(c)&&bN.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=c,c=g.width,h.width=d,h.minWidth=e,h.maxWidth=f)),c}:e.documentElement.currentStyle&&(bH=function(a,b){var c,d,e=a.currentStyle&&a.currentStyle[b],f=a.style;return e==null&&f&&f[b]&&(e=f[b]),bP.test(e)&&!bM.test(b)&&(c=f.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":e,e=f.pixelLeft+"px",f.left=c,d&&(a.runtimeStyle.left=d)),e===""?"auto":e}),p.each(["height","width"],function(a,b){p.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth!==0||bH(a,"display")!=="none"?ca(a,b,d):p.swap(a,bS,function(){return ca(a,b,d)})},set:function(a,c,d){return b$(a,c,d?b_(a,b,d,p.support.boxSizing&&p.css(a,"boxSizing")==="border-box"):0)}}}),p.support.opacity||(p.cssHooks.opacity={get:function(a,b){return bL.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=p.isNumeric(b)?"alpha(opacity="+b*100+")":"",f=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&p.trim(f.replace(bK,""))===""&&c.removeAttribute){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bK.test(f)?f.replace(bK,e):f+" "+e}}),p(function(){p.support.reliableMarginRight||(p.cssHooks.marginRight={get:function(a,b){return p.swap(a,{display:"inline-block"},function(){if(b)return bH(a,"marginRight")})}}),!p.support.pixelPosition&&p.fn.position&&p.each(["top","left"],function(a,b){p.cssHooks[b]={get:function(a,c){if(c){var d=bH(a,b);return bP.test(d)?p(a).position()[b]+"px":d}}}})}),p.expr&&p.expr.filters&&(p.expr.filters.hidden=function(a){return a.offsetWidth===0&&a.offsetHeight===0||!p.support.reliableHiddenOffsets&&(a.style&&a.style.display||bH(a,"display"))==="none"},p.expr.filters.visible=function(a){return!p.expr.filters.hidden(a)}),p.each({margin:"",padding:"",border:"Width"},function(a,b){p.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bU[d]+b]=e[d]||e[d-2]||e[0];return f}},bN.test(a)||(p.cssHooks[a+b].set=b$)});var cc=/%20/g,cd=/\[\]$/,ce=/\r?\n/g,cf=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,cg=/^(?:select|textarea)/i;p.fn.extend({serialize:function(){return p.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?p.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||cg.test(this.nodeName)||cf.test(this.type))}).map(function(a,b){var c=p(this).val();return c==null?null:p.isArray(c)?p.map(c,function(a,c){return{name:b.name,value:a.replace(ce,"\r\n")}}):{name:b.name,value:c.replace(ce,"\r\n")}}).get()}}),p.param=function(a,c){var d,e=[],f=function(a,b){b=p.isFunction(b)?b():b==null?"":b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=p.ajaxSettings&&p.ajaxSettings.traditional);if(p.isArray(a)||a.jquery&&!p.isPlainObject(a))p.each(a,function(){f(this.name,this.value)});else for(d in a)ch(d,a[d],c,f);return e.join("&").replace(cc,"+")};var ci,cj,ck=/#.*$/,cl=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,cm=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,cn=/^(?:GET|HEAD)$/,co=/^\/\//,cp=/\?/,cq=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,cr=/([?&])_=[^&]*/,cs=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,ct=p.fn.load,cu={},cv={},cw=["*/"]+["*"];try{ci=f.href}catch(cx){ci=e.createElement("a"),ci.href="",ci=ci.href}cj=cs.exec(ci.toLowerCase())||[],p.fn.load=function(a,c,d){if(typeof a!="string"&&ct)return ct.apply(this,arguments);if(!this.length)return this;var e,f,g,h=this,i=a.indexOf(" ");return i>=0&&(e=a.slice(i,a.length),a=a.slice(0,i)),p.isFunction(c)?(d=c,c=b):typeof c=="object"&&(f="POST"),p.ajax({url:a,type:f,dataType:"html",data:c,complete:function(a,b){d&&h.each(d,g||[a.responseText,b,a])}}).done(function(a){g=arguments,h.html(e?p("<div>").append(a.replace(cq,"")).find(e):a)}),this},p.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){p.fn[b]=function(a){return this.on(b,a)}}),p.each(["get","post"],function(a,c){p[c]=function(a,d,e,f){return p.isFunction(d)&&(f=f||e,e=d,d=b),p.ajax({type:c,url:a,data:d,success:e,dataType:f})}}),p.extend({getScript:function(a,c){return p.get(a,b,c,"script")},getJSON:function(a,b,c){return p.get(a,b,c,"json")},ajaxSetup:function(a,b){return b?cA(a,p.ajaxSettings):(b=a,a=p.ajaxSettings),cA(a,b),a},ajaxSettings:{url:ci,isLocal:cm.test(cj[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":cw},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":p.parseJSON,"text xml":p.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:cy(cu),ajaxTransport:cy(cv),ajax:function(a,c){function y(a,c,f,i){var k,s,t,u,w,y=c;if(v===2)return;v=2,h&&clearTimeout(h),g=b,e=i||"",x.readyState=a>0?4:0,f&&(u=cB(l,x,f));if(a>=200&&a<300||a===304)l.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(p.lastModified[d]=w),w=x.getResponseHeader("Etag"),w&&(p.etag[d]=w)),a===304?(y="notmodified",k=!0):(k=cC(l,u),y=k.state,s=k.data,t=k.error,k=!t);else{t=y;if(!y||a)y="error",a<0&&(a=0)}x.status=a,x.statusText=""+(c||y),k?o.resolveWith(m,[s,y,x]):o.rejectWith(m,[x,y,t]),x.statusCode(r),r=b,j&&n.trigger("ajax"+(k?"Success":"Error"),[x,l,k?s:t]),q.fireWith(m,[x,y]),j&&(n.trigger("ajaxComplete",[x,l]),--p.active||p.event.trigger("ajaxStop"))}typeof a=="object"&&(c=a,a=b),c=c||{};var d,e,f,g,h,i,j,k,l=p.ajaxSetup({},c),m=l.context||l,n=m!==l&&(m.nodeType||m instanceof p)?p(m):p.event,o=p.Deferred(),q=p.Callbacks("once memory"),r=l.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,setRequestHeader:function(a,b){if(!v){var c=a.toLowerCase();a=u[c]=u[c]||a,t[a]=b}return this},getAllResponseHeaders:function(){return v===2?e:null},getResponseHeader:function(a){var c;if(v===2){if(!f){f={};while(c=cl.exec(e))f[c[1].toLowerCase()]=c[2]}c=f[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){return v||(l.mimeType=a),this},abort:function(a){return a=a||w,g&&g.abort(a),y(0,a),this}};o.promise(x),x.success=x.done,x.error=x.fail,x.complete=q.add,x.statusCode=function(a){if(a){var b;if(v<2)for(b in a)r[b]=[r[b],a[b]];else b=a[x.status],x.always(b)}return this},l.url=((a||l.url)+"").replace(ck,"").replace(co,cj[1]+"//"),l.dataTypes=p.trim(l.dataType||"*").toLowerCase().split(s),l.crossDomain==null&&(i=cs.exec(l.url.toLowerCase()),l.crossDomain=!(!i||i[1]==cj[1]&&i[2]==cj[2]&&(i[3]||(i[1]==="http:"?80:443))==(cj[3]||(cj[1]==="http:"?80:443)))),l.data&&l.processData&&typeof l.data!="string"&&(l.data=p.param(l.data,l.traditional)),cz(cu,l,c,x);if(v===2)return x;j=l.global,l.type=l.type.toUpperCase(),l.hasContent=!cn.test(l.type),j&&p.active++===0&&p.event.trigger("ajaxStart");if(!l.hasContent){l.data&&(l.url+=(cp.test(l.url)?"&":"?")+l.data,delete l.data),d=l.url;if(l.cache===!1){var z=p.now(),A=l.url.replace(cr,"$1_="+z);l.url=A+(A===l.url?(cp.test(l.url)?"&":"?")+"_="+z:"")}}(l.data&&l.hasContent&&l.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",l.contentType),l.ifModified&&(d=d||l.url,p.lastModified[d]&&x.setRequestHeader("If-Modified-Since",p.lastModified[d]),p.etag[d]&&x.setRequestHeader("If-None-Match",p.etag[d])),x.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+(l.dataTypes[0]!=="*"?", "+cw+"; q=0.01":""):l.accepts["*"]);for(k in l.headers)x.setRequestHeader(k,l.headers[k]);if(!l.beforeSend||l.beforeSend.call(m,x,l)!==!1&&v!==2){w="abort";for(k in{success:1,error:1,complete:1})x[k](l[k]);g=cz(cv,l,c,x);if(!g)y(-1,"No Transport");else{x.readyState=1,j&&n.trigger("ajaxSend",[x,l]),l.async&&l.timeout>0&&(h=setTimeout(function(){x.abort("timeout")},l.timeout));try{v=1,g.send(t,y)}catch(B){if(v<2)y(-1,B);else throw B}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var cD=[],cE=/\?/,cF=/(=)\?(?=&|$)|\?\?/,cG=p.now();p.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=cD.pop()||p.expando+"_"+cG++;return this[a]=!0,a}}),p.ajaxPrefilter("json jsonp",function(c,d,e){var f,g,h,i=c.data,j=c.url,k=c.jsonp!==!1,l=k&&cF.test(j),m=k&&!l&&typeof i=="string"&&!(c.contentType||"").indexOf("application/x-www-form-urlencoded")&&cF.test(i);if(c.dataTypes[0]==="jsonp"||l||m)return f=c.jsonpCallback=p.isFunction(c.jsonpCallback)?c.jsonpCallback():c.jsonpCallback,g=a[f],l?c.url=j.replace(cF,"$1"+f):m?c.data=i.replace(cF,"$1"+f):k&&(c.url+=(cE.test(j)?"&":"?")+c.jsonp+"="+f),c.converters["script json"]=function(){return h||p.error(f+" was not called"),h[0]},c.dataTypes[0]="json",a[f]=function(){h=arguments},e.always(function(){a[f]=g,c[f]&&(c.jsonpCallback=d.jsonpCallback,cD.push(f)),h&&p.isFunction(g)&&g(h[0]),h=g=b}),"script"}),p.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){return p.globalEval(a),a}}}),p.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),p.ajaxTransport("script",function(a){if(a.crossDomain){var c,d=e.head||e.getElementsByTagName("head")[0]||e.documentElement;return{send:function(f,g){c=e.createElement("script"),c.async="async",a.scriptCharset&&(c.charset=a.scriptCharset),c.src=a.url,c.onload=c.onreadystatechange=function(a,e){if(e||!c.readyState||/loaded|complete/.test(c.readyState))c.onload=c.onreadystatechange=null,d&&c.parentNode&&d.removeChild(c),c=b,e||g(200,"success")},d.insertBefore(c,d.firstChild)},abort:function(){c&&c.onload(0,1)}}}});var cH,cI=a.ActiveXObject?function(){for(var a in cH)cH[a](0,1)}:!1,cJ=0;p.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&cK()||cL()}:cK,function(a){p.extend(p.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(p.ajaxSettings.xhr()),p.support.ajax&&p.ajaxTransport(function(c){if(!c.crossDomain||p.support.cors){var d;return{send:function(e,f){var g,h,i=c.xhr();c.username?i.open(c.type,c.url,c.async,c.username,c.password):i.open(c.type,c.url,c.async);if(c.xhrFields)for(h in c.xhrFields)i[h]=c.xhrFields[h];c.mimeType&&i.overrideMimeType&&i.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(h in e)i.setRequestHeader(h,e[h])}catch(j){}i.send(c.hasContent&&c.data||null),d=function(a,e){var h,j,k,l,m;try{if(d&&(e||i.readyState===4)){d=b,g&&(i.onreadystatechange=p.noop,cI&&delete cH[g]);if(e)i.readyState!==4&&i.abort();else{h=i.status,k=i.getAllResponseHeaders(),l={},m=i.responseXML,m&&m.documentElement&&(l.xml=m);try{l.text=i.responseText}catch(a){}try{j=i.statusText}catch(n){j=""}!h&&c.isLocal&&!c.crossDomain?h=l.text?200:404:h===1223&&(h=204)}}}catch(o){e||f(-1,o)}l&&f(h,j,l,k)},c.async?i.readyState===4?setTimeout(d,0):(g=++cJ,cI&&(cH||(cH={},p(a).unload(cI)),cH[g]=d),i.onreadystatechange=d):d()},abort:function(){d&&d(0,1)}}}});var cM,cN,cO=/^(?:toggle|show|hide)$/,cP=new RegExp("^(?:([-+])=|)("+q+")([a-z%]*)$","i"),cQ=/queueHooks$/,cR=[cX],cS={"*":[function(a,b){var c,d,e,f=this.createTween(a,b),g=cP.exec(b),h=f.cur(),i=+h||0,j=1;if(g){c=+g[2],d=g[3]||(p.cssNumber[a]?"":"px");if(d!=="px"&&i){i=p.css(f.elem,a,!0)||c||1;do e=j=j||".5",i=i/j,p.style(f.elem,a,i+d),j=f.cur()/h;while(j!==1&&j!==e)}f.unit=d,f.start=i,f.end=g[1]?i+(g[1]+1)*c:c}return f}]};p.Animation=p.extend(cV,{tweener:function(a,b){p.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");var c,d=0,e=a.length;for(;d<e;d++)c=a[d],cS[c]=cS[c]||[],cS[c].unshift(b)},prefilter:function(a,b){b?cR.unshift(a):cR.push(a)}}),p.Tween=cY,cY.prototype={constructor:cY,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(p.cssNumber[c]?"":"px")},cur:function(){var a=cY.propHooks[this.prop];return a&&a.get?a.get(this):cY.propHooks._default.get(this)},run:function(a){var b,c=cY.propHooks[this.prop];return this.pos=b=p.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration),this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):cY.propHooks._default.set(this),this}},cY.prototype.init.prototype=cY.prototype,cY.propHooks={_default:{get:function(a){var b;return a.elem[a.prop]==null||!!a.elem.style&&a.elem.style[a.prop]!=null?(b=p.css(a.elem,a.prop,!1,""),!b||b==="auto"?0:b):a.elem[a.prop]},set:function(a){p.fx.step[a.prop]?p.fx.step[a.prop](a):a.elem.style&&(a.elem.style[p.cssProps[a.prop]]!=null||p.cssHooks[a.prop])?p.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},cY.propHooks.scrollTop=cY.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},p.each(["toggle","show","hide"],function(a,b){var c=p.fn[b];p.fn[b]=function(d,e,f){return d==null||typeof d=="boolean"||!a&&p.isFunction(d)&&p.isFunction(e)?c.apply(this,arguments):this.animate(cZ(b,!0),d,e,f)}}),p.fn.extend({fadeTo:function(a,b,c,d){return this.filter(bY).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=p.isEmptyObject(a),f=p.speed(b,c,d),g=function(){var b=cV(this,p.extend({},a),f);e&&b.stop(!0)};return e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,c,d){var e=function(a){var b=a.stop;delete a.stop,b(d)};return typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,c=a!=null&&a+"queueHooks",f=p.timers,g=p._data(this);if(c)g[c]&&g[c].stop&&e(g[c]);else for(c in g)g[c]&&g[c].stop&&cQ.test(c)&&e(g[c]);for(c=f.length;c--;)f[c].elem===this&&(a==null||f[c].queue===a)&&(f[c].anim.stop(d),b=!1,f.splice(c,1));(b||!d)&&p.dequeue(this,a)})}}),p.each({slideDown:cZ("show"),slideUp:cZ("hide"),slideToggle:cZ("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){p.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),p.speed=function(a,b,c){var d=a&&typeof a=="object"?p.extend({},a):{complete:c||!c&&b||p.isFunction(a)&&a,duration:a,easing:c&&b||b&&!p.isFunction(b)&&b};d.duration=p.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in p.fx.speeds?p.fx.speeds[d.duration]:p.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";return d.old=d.complete,d.complete=function(){p.isFunction(d.old)&&d.old.call(this),d.queue&&p.dequeue(this,d.queue)},d},p.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},p.timers=[],p.fx=cY.prototype.init,p.fx.tick=function(){var a,b=p.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||p.fx.stop()},p.fx.timer=function(a){a()&&p.timers.push(a)&&!cN&&(cN=setInterval(p.fx.tick,p.fx.interval))},p.fx.interval=13,p.fx.stop=function(){clearInterval(cN),cN=null},p.fx.speeds={slow:600,fast:200,_default:400},p.fx.step={},p.expr&&p.expr.filters&&(p.expr.filters.animated=function(a){return p.grep(p.timers,function(b){return a===b.elem}).length});var c$=/^(?:body|html)$/i;p.fn.offset=function(a){if(arguments.length)return a===b?this:this.each(function(b){p.offset.setOffset(this,a,b)});var c,d,e,f,g,h,i,j,k,l,m=this[0],n=m&&m.ownerDocument;if(!n)return;return(e=n.body)===m?p.offset.bodyOffset(m):(d=n.documentElement,p.contains(d,m)?(c=m.getBoundingClientRect(),f=c_(n),g=d.clientTop||e.clientTop||0,h=d.clientLeft||e.clientLeft||0,i=f.pageYOffset||d.scrollTop,j=f.pageXOffset||d.scrollLeft,k=c.top+i-g,l=c.left+j-h,{top:k,left:l}):{top:0,left:0})},p.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;return p.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(p.css(a,"marginTop"))||0,c+=parseFloat(p.css(a,"marginLeft"))||0),{top:b,left:c}},setOffset:function(a,b,c){var d=p.css(a,"position");d==="static"&&(a.style.position="relative");var e=p(a),f=e.offset(),g=p.css(a,"top"),h=p.css(a,"left"),i=(d==="absolute"||d==="fixed")&&p.inArray("auto",[g,h])>-1,j={},k={},l,m;i?(k=e.position(),l=k.top,m=k.left):(l=parseFloat(g)||0,m=parseFloat(h)||0),p.isFunction(b)&&(b=b.call(a,c,f)),b.top!=null&&(j.top=b.top-f.top+l),b.left!=null&&(j.left=b.left-f.left+m),"using"in b?b.using.call(a,j):e.css(j)}},p.fn.extend({position:function(){if(!this[0])return;var a=this[0],b=this.offsetParent(),c=this.offset(),d=c$.test(b[0].nodeName)?{top:0,left:0}:b.offset();return c.top-=parseFloat(p.css(a,"marginTop"))||0,c.left-=parseFloat(p.css(a,"marginLeft"))||0,d.top+=parseFloat(p.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(p.css(b[0],"borderLeftWidth"))||0,{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||e.body;while(a&&!c$.test(a.nodeName)&&p.css(a,"position")==="static")a=a.offsetParent;return a||e.body})}}),p.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);p.fn[a]=function(e){return p.access(this,function(a,e,f){var g=c_(a);if(f===b)return g?c in g?g[c]:g.document.documentElement[e]:a[e];g?g.scrollTo(d?p(g).scrollLeft():f,d?f:p(g).scrollTop()):a[e]=f},a,e,arguments.length,null)}}),p.each({Height:"height",Width:"width"},function(a,c){p.each({padding:"inner"+a,content:c,"":"outer"+a},function(d,e){p.fn[e]=function(e,f){var g=arguments.length&&(d||typeof e!="boolean"),h=d||(e===!0||f===!0?"margin":"border");return p.access(this,function(c,d,e){var f;return p.isWindow(c)?c.document.documentElement["client"+a]:c.nodeType===9?(f=c.documentElement,Math.max(c.body["scroll"+a],f["scroll"+a],c.body["offset"+a],f["offset"+a],f["client"+a])):e===b?p.css(c,d,e,h):p.style(c,d,e,h)},c,g?e:b,g)}})}),a.jQuery=a.$=p,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return p})})(window);
\ No newline at end of file
diff --git a/src/main/webapp/public/docs/lib/jquery.ba-bbq.min.js b/src/main/webapp/public/docs/lib/jquery.ba-bbq.min.js
deleted file mode 100644
index bcbf24834..000000000
--- a/src/main/webapp/public/docs/lib/jquery.ba-bbq.min.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * jQuery BBQ: Back Button & Query Library - v1.2.1 - 2/17/2010
- * http://benalman.com/projects/jquery-bbq-plugin/
- * 
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
- */
-(function($,p){var i,m=Array.prototype.slice,r=decodeURIComponent,a=$.param,c,l,v,b=$.bbq=$.bbq||{},q,u,j,e=$.event.special,d="hashchange",A="querystring",D="fragment",y="elemUrlAttr",g="location",k="href",t="src",x=/^.*\?|#.*$/g,w=/^.*\#/,h,C={};function E(F){return typeof F==="string"}function B(G){var F=m.call(arguments,1);return function(){return G.apply(this,F.concat(m.call(arguments)))}}function n(F){return F.replace(/^[^#]*#?(.*)$/,"$1")}function o(F){return F.replace(/(?:^[^?#]*\?([^#]*).*$)?.*/,"$1")}function f(H,M,F,I,G){var O,L,K,N,J;if(I!==i){K=F.match(H?/^([^#]*)\#?(.*)$/:/^([^#?]*)\??([^#]*)(#?.*)/);J=K[3]||"";if(G===2&&E(I)){L=I.replace(H?w:x,"")}else{N=l(K[2]);I=E(I)?l[H?D:A](I):I;L=G===2?I:G===1?$.extend({},I,N):$.extend({},N,I);L=a(L);if(H){L=L.replace(h,r)}}O=K[1]+(H?"#":L||!K[1]?"?":"")+L+J}else{O=M(F!==i?F:p[g][k])}return O}a[A]=B(f,0,o);a[D]=c=B(f,1,n);c.noEscape=function(G){G=G||"";var F=$.map(G.split(""),encodeURIComponent);h=new RegExp(F.join("|"),"g")};c.noEscape(",/");$.deparam=l=function(I,F){var H={},G={"true":!0,"false":!1,"null":null};$.each(I.replace(/\+/g," ").split("&"),function(L,Q){var K=Q.split("="),P=r(K[0]),J,O=H,M=0,R=P.split("]["),N=R.length-1;if(/\[/.test(R[0])&&/\]$/.test(R[N])){R[N]=R[N].replace(/\]$/,"");R=R.shift().split("[").concat(R);N=R.length-1}else{N=0}if(K.length===2){J=r(K[1]);if(F){J=J&&!isNaN(J)?+J:J==="undefined"?i:G[J]!==i?G[J]:J}if(N){for(;M<=N;M++){P=R[M]===""?O.length:R[M];O=O[P]=M<N?O[P]||(R[M+1]&&isNaN(R[M+1])?{}:[]):J}}else{if($.isArray(H[P])){H[P].push(J)}else{if(H[P]!==i){H[P]=[H[P],J]}else{H[P]=J}}}}else{if(P){H[P]=F?i:""}}});return H};function z(H,F,G){if(F===i||typeof F==="boolean"){G=F;F=a[H?D:A]()}else{F=E(F)?F.replace(H?w:x,""):F}return l(F,G)}l[A]=B(z,0);l[D]=v=B(z,1);$[y]||($[y]=function(F){return $.extend(C,F)})({a:k,base:k,iframe:t,img:t,input:t,form:"action",link:k,script:t});j=$[y];function s(I,G,H,F){if(!E(H)&&typeof H!=="object"){F=H;H=G;G=i}return this.each(function(){var L=$(this),J=G||j()[(this.nodeName||"").toLowerCase()]||"",K=J&&L.attr(J)||"";L.attr(J,a[I](K,H,F))})}$.fn[A]=B(s,A);$.fn[D]=B(s,D);b.pushState=q=function(I,F){if(E(I)&&/^#/.test(I)&&F===i){F=2}var H=I!==i,G=c(p[g][k],H?I:{},H?F:2);p[g][k]=G+(/#/.test(G)?"":"#")};b.getState=u=function(F,G){return F===i||typeof F==="boolean"?v(F):v(G)[F]};b.removeState=function(F){var G={};if(F!==i){G=u();$.each($.isArray(F)?F:arguments,function(I,H){delete G[H]})}q(G,2)};e[d]=$.extend(e[d],{add:function(F){var H;function G(J){var I=J[D]=c();J.getState=function(K,L){return K===i||typeof K==="boolean"?l(I,K):l(I,L)[K]};H.apply(this,arguments)}if($.isFunction(F)){H=F;return G}else{H=F.handler;F.handler=G}}})})(jQuery,this);
-/*
- * jQuery hashchange event - v1.2 - 2/11/2010
- * http://benalman.com/projects/jquery-hashchange-plugin/
- * 
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
- */
-(function($,i,b){var j,k=$.event.special,c="location",d="hashchange",l="href",f=$.browser,g=document.documentMode,h=f.msie&&(g===b||g<8),e="on"+d in i&&!h;function a(m){m=m||i[c][l];return m.replace(/^[^#]*#?(.*)$/,"$1")}$[d+"Delay"]=100;k[d]=$.extend(k[d],{setup:function(){if(e){return false}$(j.start)},teardown:function(){if(e){return false}$(j.stop)}});j=(function(){var m={},r,n,o,q;function p(){o=q=function(s){return s};if(h){n=$('<iframe src="javascript:0"/>').hide().insertAfter("body")[0].contentWindow;q=function(){return a(n.document[c][l])};o=function(u,s){if(u!==s){var t=n.document;t.open().close();t[c].hash="#"+u}};o(a())}}m.start=function(){if(r){return}var t=a();o||p();(function s(){var v=a(),u=q(t);if(v!==t){o(t=v,u);$(i).trigger(d)}else{if(u!==t){i[c][l]=i[c][l].replace(/#.*/,"")+"#"+u}}r=setTimeout(s,$[d+"Delay"])})()};m.stop=function(){if(!n){r&&clearTimeout(r);r=0}};return m})()})(jQuery,this);
\ No newline at end of file
diff --git a/src/main/webapp/public/docs/lib/jquery.slideto.min.js b/src/main/webapp/public/docs/lib/jquery.slideto.min.js
deleted file mode 100644
index ba32cff36..000000000
--- a/src/main/webapp/public/docs/lib/jquery.slideto.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(b){b.fn.slideto=function(a){a=b.extend({slide_duration:"slow",highlight_duration:3E3,highlight:true,highlight_color:"#FFFF99"},a);return this.each(function(){obj=b(this);b("body").animate({scrollTop:obj.offset().top},a.slide_duration,function(){a.highlight&&b.ui.version&&obj.effect("highlight",{color:a.highlight_color},a.highlight_duration)})})}})(jQuery);
diff --git a/src/main/webapp/public/docs/lib/jquery.wiggle.min.js b/src/main/webapp/public/docs/lib/jquery.wiggle.min.js
deleted file mode 100644
index 2adb0d6d5..000000000
--- a/src/main/webapp/public/docs/lib/jquery.wiggle.min.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
-jQuery Wiggle
-Author: WonderGroup, Jordan Thomas
-URL: http://labs.wondergroup.com/demos/mini-ui/index.html
-License: MIT (http://en.wikipedia.org/wiki/MIT_License)
-*/
-jQuery.fn.wiggle=function(o){var d={speed:50,wiggles:3,travel:5,callback:null};var o=jQuery.extend(d,o);return this.each(function(){var cache=this;var wrap=jQuery(this).wrap('<div class="wiggle-wrap"></div>').css("position","relative");var calls=0;for(i=1;i<=o.wiggles;i++){jQuery(this).animate({left:"-="+o.travel},o.speed).animate({left:"+="+o.travel*2},o.speed*2).animate({left:"-="+o.travel},o.speed,function(){calls++;if(jQuery(cache).parent().hasClass('wiggle-wrap')){jQuery(cache).parent().replaceWith(cache);}
-if(calls==o.wiggles&&jQuery.isFunction(o.callback)){o.callback();}});}});};
\ No newline at end of file
diff --git a/src/main/webapp/public/docs/lib/shred.bundle.js b/src/main/webapp/public/docs/lib/shred.bundle.js
deleted file mode 100644
index d122d0bd5..000000000
--- a/src/main/webapp/public/docs/lib/shred.bundle.js
+++ /dev/null
@@ -1,2765 +0,0 @@
-var require = function (file, cwd) {
-    var resolved = require.resolve(file, cwd || '/');
-    var mod = require.modules[resolved];
-    if (!mod) throw new Error(
-        'Failed to resolve module ' + file + ', tried ' + resolved
-    );
-    var res = mod._cached ? mod._cached : mod();
-    return res;
-}
-
-require.paths = [];
-require.modules = {};
-require.extensions = [".js",".coffee"];
-
-require._core = {
-    'assert': true,
-    'events': true,
-    'fs': true,
-    'path': true,
-    'vm': true
-};
-
-require.resolve = (function () {
-    return function (x, cwd) {
-        if (!cwd) cwd = '/';
-        
-        if (require._core[x]) return x;
-        var path = require.modules.path();
-        var y = cwd || '.';
-        
-        if (x.match(/^(?:\.\.?\/|\/)/)) {
-            var m = loadAsFileSync(path.resolve(y, x))
-                || loadAsDirectorySync(path.resolve(y, x));
-            if (m) return m;
-        }
-        
-        var n = loadNodeModulesSync(x, y);
-        if (n) return n;
-        
-        throw new Error("Cannot find module '" + x + "'");
-        
-        function loadAsFileSync (x) {
-            if (require.modules[x]) {
-                return x;
-            }
-            
-            for (var i = 0; i < require.extensions.length; i++) {
-                var ext = require.extensions[i];
-                if (require.modules[x + ext]) return x + ext;
-            }
-        }
-        
-        function loadAsDirectorySync (x) {
-            x = x.replace(/\/+$/, '');
-            var pkgfile = x + '/package.json';
-            if (require.modules[pkgfile]) {
-                var pkg = require.modules[pkgfile]();
-                var b = pkg.browserify;
-                if (typeof b === 'object' && b.main) {
-                    var m = loadAsFileSync(path.resolve(x, b.main));
-                    if (m) return m;
-                }
-                else if (typeof b === 'string') {
-                    var m = loadAsFileSync(path.resolve(x, b));
-                    if (m) return m;
-                }
-                else if (pkg.main) {
-                    var m = loadAsFileSync(path.resolve(x, pkg.main));
-                    if (m) return m;
-                }
-            }
-            
-            return loadAsFileSync(x + '/index');
-        }
-        
-        function loadNodeModulesSync (x, start) {
-            var dirs = nodeModulesPathsSync(start);
-            for (var i = 0; i < dirs.length; i++) {
-                var dir = dirs[i];
-                var m = loadAsFileSync(dir + '/' + x);
-                if (m) return m;
-                var n = loadAsDirectorySync(dir + '/' + x);
-                if (n) return n;
-            }
-            
-            var m = loadAsFileSync(x);
-            if (m) return m;
-        }
-        
-        function nodeModulesPathsSync (start) {
-            var parts;
-            if (start === '/') parts = [ '' ];
-            else parts = path.normalize(start).split('/');
-            
-            var dirs = [];
-            for (var i = parts.length - 1; i >= 0; i--) {
-                if (parts[i] === 'node_modules') continue;
-                var dir = parts.slice(0, i + 1).join('/') + '/node_modules';
-                dirs.push(dir);
-            }
-            
-            return dirs;
-        }
-    };
-})();
-
-require.alias = function (from, to) {
-    var path = require.modules.path();
-    var res = null;
-    try {
-        res = require.resolve(from + '/package.json', '/');
-    }
-    catch (err) {
-        res = require.resolve(from, '/');
-    }
-    var basedir = path.dirname(res);
-    
-    var keys = (Object.keys || function (obj) {
-        var res = [];
-        for (var key in obj) res.push(key)
-        return res;
-    })(require.modules);
-    
-    for (var i = 0; i < keys.length; i++) {
-        var key = keys[i];
-        if (key.slice(0, basedir.length + 1) === basedir + '/') {
-            var f = key.slice(basedir.length);
-            require.modules[to + f] = require.modules[basedir + f];
-        }
-        else if (key === basedir) {
-            require.modules[to] = require.modules[basedir];
-        }
-    }
-};
-
-require.define = function (filename, fn) {
-    var dirname = require._core[filename]
-        ? ''
-        : require.modules.path().dirname(filename)
-    ;
-    
-    var require_ = function (file) {
-        return require(file, dirname)
-    };
-    require_.resolve = function (name) {
-        return require.resolve(name, dirname);
-    };
-    require_.modules = require.modules;
-    require_.define = require.define;
-    var module_ = { exports : {} };
-    
-    require.modules[filename] = function () {
-        require.modules[filename]._cached = module_.exports;
-        fn.call(
-            module_.exports,
-            require_,
-            module_,
-            module_.exports,
-            dirname,
-            filename
-        );
-        require.modules[filename]._cached = module_.exports;
-        return module_.exports;
-    };
-};
-
-if (typeof process === 'undefined') process = {};
-
-if (!process.nextTick) process.nextTick = (function () {
-    var queue = [];
-    var canPost = typeof window !== 'undefined'
-        && window.postMessage && window.addEventListener
-    ;
-    
-    if (canPost) {
-        window.addEventListener('message', function (ev) {
-            if (ev.source === window && ev.data === 'browserify-tick') {
-                ev.stopPropagation();
-                if (queue.length > 0) {
-                    var fn = queue.shift();
-                    fn();
-                }
-            }
-        }, true);
-    }
-    
-    return function (fn) {
-        if (canPost) {
-            queue.push(fn);
-            window.postMessage('browserify-tick', '*');
-        }
-        else setTimeout(fn, 0);
-    };
-})();
-
-if (!process.title) process.title = 'browser';
-
-if (!process.binding) process.binding = function (name) {
-    if (name === 'evals') return require('vm')
-    else throw new Error('No such module')
-};
-
-if (!process.cwd) process.cwd = function () { return '.' };
-
-require.define("path", function (require, module, exports, __dirname, __filename) {
-    function filter (xs, fn) {
-    var res = [];
-    for (var i = 0; i < xs.length; i++) {
-        if (fn(xs[i], i, xs)) res.push(xs[i]);
-    }
-    return res;
-}
-
-// resolves . and .. elements in a path array with directory names there
-// must be no slashes, empty elements, or device names (c:\) in the array
-// (so also no leading and trailing slashes - it does not distinguish
-// relative and absolute paths)
-function normalizeArray(parts, allowAboveRoot) {
-  // if the path tries to go above the root, `up` ends up > 0
-  var up = 0;
-  for (var i = parts.length; i >= 0; i--) {
-    var last = parts[i];
-    if (last == '.') {
-      parts.splice(i, 1);
-    } else if (last === '..') {
-      parts.splice(i, 1);
-      up++;
-    } else if (up) {
-      parts.splice(i, 1);
-      up--;
-    }
-  }
-
-  // if the path is allowed to go above the root, restore leading ..s
-  if (allowAboveRoot) {
-    for (; up--; up) {
-      parts.unshift('..');
-    }
-  }
-
-  return parts;
-}
-
-// Regex to split a filename into [*, dir, basename, ext]
-// posix version
-var splitPathRe = /^(.+\/(?!$)|\/)?((?:.+?)?(\.[^.]*)?)$/;
-
-// path.resolve([from ...], to)
-// posix version
-exports.resolve = function() {
-var resolvedPath = '',
-    resolvedAbsolute = false;
-
-for (var i = arguments.length; i >= -1 && !resolvedAbsolute; i--) {
-  var path = (i >= 0)
-      ? arguments[i]
-      : process.cwd();
-
-  // Skip empty and invalid entries
-  if (typeof path !== 'string' || !path) {
-    continue;
-  }
-
-  resolvedPath = path + '/' + resolvedPath;
-  resolvedAbsolute = path.charAt(0) === '/';
-}
-
-// At this point the path should be resolved to a full absolute path, but
-// handle relative paths to be safe (might happen when process.cwd() fails)
-
-// Normalize the path
-resolvedPath = normalizeArray(filter(resolvedPath.split('/'), function(p) {
-    return !!p;
-  }), !resolvedAbsolute).join('/');
-
-  return ((resolvedAbsolute ? '/' : '') + resolvedPath) || '.';
-};
-
-// path.normalize(path)
-// posix version
-exports.normalize = function(path) {
-var isAbsolute = path.charAt(0) === '/',
-    trailingSlash = path.slice(-1) === '/';
-
-// Normalize the path
-path = normalizeArray(filter(path.split('/'), function(p) {
-    return !!p;
-  }), !isAbsolute).join('/');
-
-  if (!path && !isAbsolute) {
-    path = '.';
-  }
-  if (path && trailingSlash) {
-    path += '/';
-  }
-  
-  return (isAbsolute ? '/' : '') + path;
-};
-
-
-// posix version
-exports.join = function() {
-  var paths = Array.prototype.slice.call(arguments, 0);
-  return exports.normalize(filter(paths, function(p, index) {
-    return p && typeof p === 'string';
-  }).join('/'));
-};
-
-
-exports.dirname = function(path) {
-  var dir = splitPathRe.exec(path)[1] || '';
-  var isWindows = false;
-  if (!dir) {
-    // No dirname
-    return '.';
-  } else if (dir.length === 1 ||
-      (isWindows && dir.length <= 3 && dir.charAt(1) === ':')) {
-    // It is just a slash or a drive letter with a slash
-    return dir;
-  } else {
-    // It is a full dirname, strip trailing slash
-    return dir.substring(0, dir.length - 1);
-  }
-};
-
-
-exports.basename = function(path, ext) {
-  var f = splitPathRe.exec(path)[2] || '';
-  // TODO: make this comparison case-insensitive on windows?
-  if (ext && f.substr(-1 * ext.length) === ext) {
-    f = f.substr(0, f.length - ext.length);
-  }
-  return f;
-};
-
-
-exports.extname = function(path) {
-  return splitPathRe.exec(path)[3] || '';
-};
-
-});
-
-require.define("/shred.js", function (require, module, exports, __dirname, __filename) {
-    // Shred is an HTTP client library intended to simplify the use of Node's
-// built-in HTTP library. In particular, we wanted to make it easier to interact
-// with HTTP-based APIs.
-// 
-// See the [examples](./examples.html) for more details.
-
-// Ax is a nice logging library we wrote. You can use any logger, providing it
-// has `info`, `warn`, `debug`, and `error` methods that take a string.
-var Ax = require("ax")
-  , CookieJarLib = require( "cookiejar" )
-  , CookieJar = CookieJarLib.CookieJar
-;
-
-// Shred takes some options, including a logger and request defaults.
-
-var Shred = function(options) {
-  options = (options||{});
-  this.agent = options.agent;
-  this.defaults = options.defaults||{};
-  this.log = options.logger||(new Ax({ level: "info" }));
-  this._sharedCookieJar = new CookieJar();
-  this.logCurl = options.logCurl || false;
-};
-
-// Most of the real work is done in the request and reponse classes.
- 
-Shred.Request = require("./shred/request");
-Shred.Response = require("./shred/response");
-
-// The `request` method kicks off a new request, instantiating a new `Request`
-// object and passing along whatever default options we were given.
-
-Shred.prototype = {
-  request: function(options) {
-    options.logger = this.log;
-    options.logCurl = options.logCurl || this.logCurl;
-    options.cookieJar = ( 'cookieJar' in options ) ? options.cookieJar : this._sharedCookieJar; // let them set cookieJar = null
-    options.agent = options.agent || this.agent;
-    // fill in default options
-    for (var key in this.defaults) {
-      if (this.defaults.hasOwnProperty(key) && !options[key]) {
-        options[key] = this.defaults[key]
-      }
-    }
-    return new Shred.Request(options);
-  }
-};
-
-// Define a bunch of convenience methods so that you don't have to include
-// a `method` property in your request options.
-
-"get put post delete".split(" ").forEach(function(method) {
-  Shred.prototype[method] = function(options) {
-    options.method = method;
-    return this.request(options);
-  };
-});
-
-
-module.exports = Shred;
-
-});
-
-require.define("/node_modules/ax/package.json", function (require, module, exports, __dirname, __filename) {
-    module.exports = {"main":"./lib/ax.js"}
-});
-
-require.define("/node_modules/ax/lib/ax.js", function (require, module, exports, __dirname, __filename) {
-    var inspect = require("util").inspect
-  , fs = require("fs")
-;
-
-
-// this is a quick-and-dirty logger. there are other nicer loggers out there
-// but the ones i found were also somewhat involved. this one has a Ruby
-// logger type interface
-//
-// we can easily replace this, provide the info, debug, etc. methods are the
-// same. or, we can change Haiku to use a more standard node.js interface
-
-var format = function(level,message) {
-  var debug = (level=="debug"||level=="error");
-  if (!message) { return message.toString(); }
-  if (typeof(message) == "object") {
-    if (message instanceof Error && debug) {
-      return message.stack;
-    } else {
-      return inspect(message);
-    }
-  } else {
-    return message.toString();
-  }
-};
-
-var noOp = function(message) { return this; }
-var makeLogger = function(level,fn) {
-  return function(message) { 
-    this.stream.write(this.format(level, message)+"\n");
-    return this;
-  }
-};
-
-var Logger = function(options) {
-  var logger = this;
-  var options = options||{};
-
-  // Default options
-  options.level = options.level || "info";
-  options.timestamp = options.timestamp || true;
-  options.prefix = options.prefix || "";
-  logger.options = options;
-
-  // Allows a prefix to be added to the message.
-  //
-  //    var logger = new Ax({ module: 'Haiku' })
-  //    logger.warn('this is going to be awesome!');
-  //    //=> Haiku: this is going to be awesome!
-  //
-  if (logger.options.module){
-    logger.options.prefix = logger.options.module;
-  }
-
-  // Write to stderr or a file
-  if (logger.options.file){
-    logger.stream = fs.createWriteStream(logger.options.file, {"flags": "a"});
-  } else {
-      if(process.title === "node")
-    logger.stream = process.stderr;
-      else if(process.title === "browser")
-    logger.stream = function () {
-      // Work around weird console context issue: http://code.google.com/p/chromium/issues/detail?id=48662
-      return console[logger.options.level].apply(console, arguments);
-    };
-  }
-
-  switch(logger.options.level){
-    case 'debug':
-      ['debug', 'info', 'warn'].forEach(function (level) {
-        logger[level] = Logger.writer(level);
-      });
-    case 'info':
-      ['info', 'warn'].forEach(function (level) {
-        logger[level] = Logger.writer(level);
-      });
-    case 'warn':
-      logger.warn = Logger.writer('warn');
-  }
-}
-
-// Used to define logger methods
-Logger.writer = function(level){
-  return function(message){
-    var logger = this;
-
-    if(process.title === "node")
-  logger.stream.write(logger.format(level, message) + '\n');
-    else if(process.title === "browser")
-  logger.stream(logger.format(level, message) + '\n');
-
-  };
-}
-
-
-Logger.prototype = {
-  info: function(){},
-  debug: function(){},
-  warn: function(){},
-  error: Logger.writer('error'),
-  format: function(level, message){
-    if (! message) return '';
-
-    var logger = this
-      , prefix = logger.options.prefix
-      , timestamp = logger.options.timestamp ? " " + (new Date().toISOString()) : ""
-    ;
-
-    return (prefix + timestamp + ": " + message);
-  }
-};
-
-module.exports = Logger;
-
-});
-
-require.define("util", function (require, module, exports, __dirname, __filename) {
-    // todo
-
-});
-
-require.define("fs", function (require, module, exports, __dirname, __filename) {
-    // nothing to see here... no file methods for the browser
-
-});
-
-require.define("/node_modules/cookiejar/package.json", function (require, module, exports, __dirname, __filename) {
-    module.exports = {"main":"cookiejar.js"}
-});
-
-require.define("/node_modules/cookiejar/cookiejar.js", function (require, module, exports, __dirname, __filename) {
-    exports.CookieAccessInfo=CookieAccessInfo=function CookieAccessInfo(domain,path,secure,script) {
-    if(this instanceof CookieAccessInfo) {
-      this.domain=domain||undefined;
-      this.path=path||"/";
-      this.secure=!!secure;
-      this.script=!!script;
-      return this;
-    }
-    else {
-        return new CookieAccessInfo(domain,path,secure,script)    
-    }
-}
-
-exports.Cookie=Cookie=function Cookie(cookiestr) {
-  if(cookiestr instanceof Cookie) {
-    return cookiestr;
-  }
-    else {
-        if(this instanceof Cookie) {
-          this.name = null;
-          this.value = null;
-          this.expiration_date = Infinity;
-          this.path = "/";
-          this.domain = null;
-          this.secure = false; //how to define?
-          this.noscript = false; //httponly
-          if(cookiestr) {
-            this.parse(cookiestr)
-          }
-          return this;
-        }
-        return new Cookie(cookiestr)
-    }
-}
-
-Cookie.prototype.toString = function toString() {
-  var str=[this.name+"="+this.value];
-  if(this.expiration_date !== Infinity) {
-    str.push("expires="+(new Date(this.expiration_date)).toGMTString());
-  }
-  if(this.domain) {
-    str.push("domain="+this.domain);
-  }
-  if(this.path) {
-    str.push("path="+this.path);
-  }
-  if(this.secure) {
-    str.push("secure");
-  }
-  if(this.noscript) {
-    str.push("httponly");
-  }
-  return str.join("; ");
-}
-
-Cookie.prototype.toValueString = function toValueString() {
-  return this.name+"="+this.value;
-}
-
-var cookie_str_splitter=/[:](?=\s*[a-zA-Z0-9_\-]+\s*[=])/g
-Cookie.prototype.parse = function parse(str) {
-  if(this instanceof Cookie) {
-      var parts=str.split(";")
-      , pair=parts[0].match(/([^=]+)=((?:.|\n)*)/)
-      , key=pair[1]
-      , value=pair[2];
-      this.name = key;
-      this.value = value;
-    
-      for(var i=1;i<parts.length;i++) {
-        pair=parts[i].match(/([^=]+)(?:=((?:.|\n)*))?/)
-        , key=pair[1].trim().toLowerCase()
-        , value=pair[2];
-        switch(key) {
-          case "httponly":
-            this.noscript = true;
-          break;
-          case "expires":
-            this.expiration_date = value
-              ? Number(Date.parse(value))
-              : Infinity;
-          break;
-          case "path":
-            this.path = value
-              ? value.trim()
-              : "";
-          break;
-          case "domain":
-            this.domain = value
-              ? value.trim()
-              : "";
-          break;
-          case "secure":
-            this.secure = true;
-          break
-        }
-      }
-    
-      return this;
-  }
-    return new Cookie().parse(str)
-}
-
-Cookie.prototype.matches = function matches(access_info) {
-  if(this.noscript && access_info.script
-  || this.secure && !access_info.secure
-  || !this.collidesWith(access_info)) {
-    return false
-  }
-  return true;
-}
-
-Cookie.prototype.collidesWith = function collidesWith(access_info) {
-  if((this.path && !access_info.path) || (this.domain && !access_info.domain)) {
-    return false
-  }
-  if(this.path && access_info.path.indexOf(this.path) !== 0) {
-    return false;
-  }
-  if (this.domain===access_info.domain) {
-    return true;
-  }
-  else if(this.domain && this.domain.charAt(0)===".")
-  {
-    var wildcard=access_info.domain.indexOf(this.domain.slice(1))
-    if(wildcard===-1 || wildcard!==access_info.domain.length-this.domain.length+1) {
-      return false;
-    }
-  }
-  else if(this.domain){
-    return false
-  }
-  return true;
-}
-
-exports.CookieJar=CookieJar=function CookieJar() {
-  if(this instanceof CookieJar) {
-      var cookies = {} //name: [Cookie]
-    
-      this.setCookie = function setCookie(cookie) {
-        cookie = Cookie(cookie);
-        //Delete the cookie if the set is past the current time
-        var remove = cookie.expiration_date <= Date.now();
-        if(cookie.name in cookies) {
-          var cookies_list = cookies[cookie.name];
-          for(var i=0;i<cookies_list.length;i++) {
-            var collidable_cookie = cookies_list[i];
-            if(collidable_cookie.collidesWith(cookie)) {
-              if(remove) {
-                cookies_list.splice(i,1);
-                if(cookies_list.length===0) {
-                  delete cookies[cookie.name]
-                }
-                return false;
-              }
-              else {
-                return cookies_list[i]=cookie;
-              }
-            }
-          }
-          if(remove) {
-            return false;
-          }
-          cookies_list.push(cookie);
-          return cookie;
-        }
-        else if(remove){
-          return false;
-        }
-        else {
-          return cookies[cookie.name]=[cookie];
-        }
-      }
-      //returns a cookie
-      this.getCookie = function getCookie(cookie_name,access_info) {
-        var cookies_list = cookies[cookie_name];
-        for(var i=0;i<cookies_list.length;i++) {
-          var cookie = cookies_list[i];
-          if(cookie.expiration_date <= Date.now()) {
-            if(cookies_list.length===0) {
-              delete cookies[cookie.name]
-            }
-            continue;
-          }
-          if(cookie.matches(access_info)) {
-            return cookie;
-          }
-        }
-      }
-      //returns a list of cookies
-      this.getCookies = function getCookies(access_info) {
-        var matches=[];
-        for(var cookie_name in cookies) {
-          var cookie=this.getCookie(cookie_name,access_info);
-          if (cookie) {
-            matches.push(cookie);
-          }
-        }
-        matches.toString=function toString(){return matches.join(":");}
-            matches.toValueString=function() {return matches.map(function(c){return c.toValueString();}).join(';');}
-        return matches;
-      }
-    
-      return this;
-  }
-    return new CookieJar()
-}
-
-
-//returns list of cookies that were set correctly
-CookieJar.prototype.setCookies = function setCookies(cookies) {
-  cookies=Array.isArray(cookies)
-    ?cookies
-    :cookies.split(cookie_str_splitter);
-  var successful=[]
-  for(var i=0;i<cookies.length;i++) {
-    var cookie = Cookie(cookies[i]);
-    if(this.setCookie(cookie)) {
-      successful.push(cookie);
-    }
-  }
-  return successful;
-}
-
-});
-
-require.define("/shred/request.js", function (require, module, exports, __dirname, __filename) {
-    // The request object encapsulates a request, creating a Node.js HTTP request and
-// then handling the response.
-
-var HTTP = require("http")
-  , HTTPS = require("https")
-  , parseUri = require("./parseUri")
-  , Emitter = require('events').EventEmitter
-  , sprintf = require("sprintf").sprintf
-  , Response = require("./response")
-  , HeaderMixins = require("./mixins/headers")
-  , Content = require("./content")
-;
-
-var STATUS_CODES = HTTP.STATUS_CODES || {
-    100 : 'Continue',
-    101 : 'Switching Protocols',
-    102 : 'Processing', // RFC 2518, obsoleted by RFC 4918
-    200 : 'OK',
-    201 : 'Created',
-    202 : 'Accepted',
-    203 : 'Non-Authoritative Information',
-    204 : 'No Content',
-    205 : 'Reset Content',
-    206 : 'Partial Content',
-    207 : 'Multi-Status', // RFC 4918
-    300 : 'Multiple Choices',
-    301 : 'Moved Permanently',
-    302 : 'Moved Temporarily',
-    303 : 'See Other',
-    304 : 'Not Modified',
-    305 : 'Use Proxy',
-    307 : 'Temporary Redirect',
-    400 : 'Bad Request',
-    401 : 'Unauthorized',
-    402 : 'Payment Required',
-    403 : 'Forbidden',
-    404 : 'Not Found',
-    405 : 'Method Not Allowed',
-    406 : 'Not Acceptable',
-    407 : 'Proxy Authentication Required',
-    408 : 'Request Time-out',
-    409 : 'Conflict',
-    410 : 'Gone',
-    411 : 'Length Required',
-    412 : 'Precondition Failed',
-    413 : 'Request Entity Too Large',
-    414 : 'Request-URI Too Large',
-    415 : 'Unsupported Media Type',
-    416 : 'Requested Range Not Satisfiable',
-    417 : 'Expectation Failed',
-    418 : 'I\'m a teapot', // RFC 2324
-    422 : 'Unprocessable Entity', // RFC 4918
-    423 : 'Locked', // RFC 4918
-    424 : 'Failed Dependency', // RFC 4918
-    425 : 'Unordered Collection', // RFC 4918
-    426 : 'Upgrade Required', // RFC 2817
-    500 : 'Internal Server Error',
-    501 : 'Not Implemented',
-    502 : 'Bad Gateway',
-    503 : 'Service Unavailable',
-    504 : 'Gateway Time-out',
-    505 : 'HTTP Version not supported',
-    506 : 'Variant Also Negotiates', // RFC 2295
-    507 : 'Insufficient Storage', // RFC 4918
-    509 : 'Bandwidth Limit Exceeded',
-    510 : 'Not Extended' // RFC 2774
-};
-
-// The Shred object itself constructs the `Request` object. You should rarely
-// need to do this directly.
-
-var Request = function(options) {
-  this.log = options.logger;
-  this.cookieJar = options.cookieJar;
-  this.encoding = options.encoding;
-  this.logCurl = options.logCurl;
-  processOptions(this,options||{});
-  createRequest(this);
-};
-
-// A `Request` has a number of properties, many of which help with details like
-// URL parsing or defaulting the port for the request.
-
-Object.defineProperties(Request.prototype, {
-
-// - **url**. You can set the `url` property with a valid URL string and all the
-//   URL-related properties (host, port, etc.) will be automatically set on the
-//   request object.
-
-  url: {
-    get: function() {
-      if (!this.scheme) { return null; }
-      return sprintf("%s://%s:%s%s",
-          this.scheme, this.host, this.port,
-          (this.proxy ? "/" : this.path) +
-          (this.query ? ("?" + this.query) : ""));
-    },
-    set: function(_url) {
-      _url = parseUri(_url);
-      this.scheme = _url.protocol;
-      this.host = _url.host;
-      this.port = _url.port;
-      this.path = _url.path;
-      this.query = _url.query;
-      return this;
-    },
-    enumerable: true
-  },
-
-// - **headers**. Returns a hash representing the request headers. You can't set
-//   this directly, only get it. You can add or modify headers by using the
-//   `setHeader` or `setHeaders` method. This ensures that the headers are
-//   normalized - that is, you don't accidentally send `Content-Type` and
-//   `content-type` headers. Keep in mind that if you modify the returned hash,
-//   it will *not* modify the request headers.
-
-  headers: {
-    get: function() {
-      return this.getHeaders();
-    },
-    enumerable: true
-  },
-
-// - **port**. Unless you set the `port` explicitly or include it in the URL, it
-//   will default based on the scheme.
-
-  port: {
-    get: function() {
-      if (!this._port) {
-        switch(this.scheme) {
-          case "https": return this._port = 443;
-          case "http":
-          default: return this._port = 80;
-        }
-      }
-      return this._port;
-    },
-    set: function(value) { this._port = value; return this; },
-    enumerable: true
-  },
-
-// - **method**. The request method - `get`, `put`, `post`, etc. that will be
-//   used to make the request. Defaults to `get`.
-
-  method: {
-    get: function() {
-      return this._method = (this._method||"GET");
-    },
-    set: function(value) {
-      this._method = value; return this;
-    },
-    enumerable: true
-  },
-
-// - **query**. Can be set either with a query string or a hash (object). Get
-//   will always return a properly escaped query string or null if there is no
-//   query component for the request.
-
-  query: {
-    get: function() {return this._query;},
-    set: function(value) {
-      var stringify = function (hash) {
-        var query = "";
-        for (var key in hash) {
-          query += encodeURIComponent(key) + '=' + encodeURIComponent(hash[key]) + '&';
-        }
-        // Remove the last '&'
-        query = query.slice(0, -1);
-        return query;
-      }
-
-      if (value) {
-        if (typeof value === 'object') {
-          value = stringify(value);
-        }
-        this._query = value;
-      } else {
-        this._query = "";
-      }
-      return this;
-    },
-    enumerable: true
-  },
-
-// - **parameters**. This will return the query parameters in the form of a hash
-//   (object).
-
-  parameters: {
-    get: function() { return QueryString.parse(this._query||""); },
-    enumerable: true
-  },
-
-// - **content**. (Aliased as `body`.) Set this to add a content entity to the
-//   request. Attempts to use the `content-type` header to determine what to do
-//   with the content value. Get this to get back a [`Content`
-//   object](./content.html).
-
-  body: {
-    get: function() { return this._body; },
-    set: function(value) {
-      this._body = new Content({
-        data: value,
-        type: this.getHeader("Content-Type")
-      });
-      this.setHeader("Content-Type",this.content.type);
-      this.setHeader("Content-Length",this.content.length);
-      return this;
-    },
-    enumerable: true
-  },
-
-// - **timeout**. Used to determine how long to wait for a response. Does not
-//   distinguish between connect timeouts versus request timeouts. Set either in
-//   milliseconds or with an object with temporal attributes (hours, minutes,
-//   seconds) and convert it into milliseconds. Get will always return
-//   milliseconds.
-
-  timeout: {
-    get: function() { return this._timeout; }, // in milliseconds
-    set: function(timeout) {
-      var request = this
-        , milliseconds = 0;
-      ;
-      if (!timeout) return this;
-      if (typeof timeout==="number") { milliseconds = timeout; }
-      else {
-        milliseconds = (timeout.milliseconds||0) +
-          (1000 * ((timeout.seconds||0) +
-              (60 * ((timeout.minutes||0) +
-                (60 * (timeout.hours||0))))));
-      }
-      this._timeout = milliseconds;
-      return this;
-    },
-    enumerable: true
-  }
-});
-
-// Alias `body` property to `content`. Since the [content object](./content.html)
-// has a `body` attribute, it's preferable to use `content` since you can then
-// access the raw content data using `content.body`.
-
-Object.defineProperty(Request.prototype,"content",
-    Object.getOwnPropertyDescriptor(Request.prototype, "body"));
-
-// The `Request` object can be pretty overwhelming to view using the built-in
-// Node.js inspect method. We want to make it a bit more manageable. This
-// probably goes [too far in the other
-// direction](https://github.com/spire-io/shred/issues/2).
-
-Request.prototype.inspect = function () {
-  var request = this;
-  var headers = this.format_headers();
-  var summary = ["<Shred Request> ", request.method.toUpperCase(),
-      request.url].join(" ")
-  return [ summary, "- Headers:", headers].join("\n");
-};
-
-Request.prototype.format_headers = function () {
-  var array = []
-  var headers = this._headers
-  for (var key in headers) {
-    if (headers.hasOwnProperty(key)) {
-      var value = headers[key]
-      array.push("\t" + key + ": " + value);
-    }
-  }
-  return array.join("\n");
-};
-
-// Allow chainable 'on's:  shred.get({ ... }).on( ... ).  You can pass in a
-// single function, a pair (event, function), or a hash:
-// { event: function, event: function }
-Request.prototype.on = function (eventOrHash, listener) {
-  var emitter = this.emitter;
-  // Pass in a single argument as a function then make it the default response handler
-  if (arguments.length === 1 && typeof(eventOrHash) === 'function') {
-    emitter.on('response', eventOrHash);
-  } else if (arguments.length === 1 && typeof(eventOrHash) === 'object') {
-    for (var key in eventOrHash) {
-      if (eventOrHash.hasOwnProperty(key)) {
-        emitter.on(key, eventOrHash[key]);
-      }
-    }
-  } else {
-    emitter.on(eventOrHash, listener);
-  }
-  return this;
-};
-
-// Add in the header methods. Again, these ensure we don't get the same header
-// multiple times with different case conventions.
-HeaderMixins.gettersAndSetters(Request);
-
-// `processOptions` is called from the constructor to handle all the work
-// associated with making sure we do our best to ensure we have a valid request.
-
-var processOptions = function(request,options) {
-
-  request.log.debug("Processing request options ..");
-
-  // We'll use `request.emitter` to manage the `on` event handlers.
-  request.emitter = (new Emitter);
-
-  request.agent = options.agent;
-
-  // Set up the handlers ...
-  if (options.on) {
-    for (var key in options.on) {
-      if (options.on.hasOwnProperty(key)) {
-        request.emitter.on(key, options.on[key]);
-      }
-    }
-  }
-
-  // Make sure we were give a URL or a host
-  if (!options.url && !options.host) {
-    request.emitter.emit("request_error",
-        new Error("No url or url options (host, port, etc.)"));
-    return;
-  }
-
-  // Allow for the [use of a proxy](http://www.jmarshall.com/easy/http/#proxies).
-
-  if (options.url) {
-    if (options.proxy) {
-      request.url = options.proxy;
-      request.path = options.url;
-    } else {
-      request.url = options.url;
-    }
-  }
-
-  // Set the remaining options.
-  request.query = options.query||options.parameters||request.query ;
-  request.method = options.method;
-  request.setHeader("user-agent",options.agent||"Shred");
-  request.setHeaders(options.headers);
-
-  if (request.cookieJar) {
-    var cookies = request.cookieJar.getCookies( CookieAccessInfo( request.host, request.path ) );
-    if (cookies.length) {
-      var cookieString = request.getHeader('cookie')||'';
-      for (var cookieIndex = 0; cookieIndex < cookies.length; ++cookieIndex) {
-          if ( cookieString.length && cookieString[ cookieString.length - 1 ] != ';' )
-          {
-              cookieString += ';';
-          }
-          cookieString += cookies[ cookieIndex ].name + '=' + cookies[ cookieIndex ].value + ';';
-      }
-      request.setHeader("cookie", cookieString);
-    }
-  }
-  
-  // The content entity can be set either using the `body` or `content` attributes.
-  if (options.body||options.content) {
-    request.content = options.body||options.content;
-  }
-  request.timeout = options.timeout;
-
-};
-
-// `createRequest` is also called by the constructor, after `processOptions`.
-// This actually makes the request and processes the response, so `createRequest`
-// is a bit of a misnomer.
-
-var createRequest = function(request) {
-  var timeout ;
-
-  request.log.debug("Creating request ..");
-  request.log.debug(request);
-
-  var reqParams = {
-    host: request.host,
-    port: request.port,
-    method: request.method,
-    path: request.path + (request.query ? '?'+request.query : ""),
-    headers: request.getHeaders(),
-    // Node's HTTP/S modules will ignore this, but we are using the
-    // browserify-http module in the browser for both HTTP and HTTPS, and this
-    // is how you differentiate the two.
-    scheme: request.scheme,
-    // Use a provided agent.  'Undefined' is the default, which uses a global
-    // agent.
-    agent: request.agent
-  };
-
-  if (request.logCurl) {
-    logCurl(request);
-  }
-
-  var http = request.scheme == "http" ? HTTP : HTTPS;
-
-  // Set up the real request using the selected library. The request won't be
-  // sent until we call `.end()`.
-  request._raw = http.request(reqParams, function(response) {
-    request.log.debug("Received response ..");
-
-    // We haven't timed out and we have a response, so make sure we clear the
-    // timeout so it doesn't fire while we're processing the response.
-    clearTimeout(timeout);
-
-    // Construct a Shred `Response` object from the response. This will stream
-    // the response, thus the need for the callback. We can access the response
-    // entity safely once we're in the callback.
-    response = new Response(response, request, function(response) {
-
-      // Set up some event magic. The precedence is given first to
-      // status-specific handlers, then to responses for a given event, and then
-      // finally to the more general `response` handler. In the last case, we
-      // need to first make sure we're not dealing with a a redirect.
-      var emit = function(event) {
-        var emitter = request.emitter;
-        var textStatus = STATUS_CODES[response.status] ? STATUS_CODES[response.status].toLowerCase() : null;
-        if (emitter.listeners(response.status).length > 0 || emitter.listeners(textStatus).length > 0) {
-          emitter.emit(response.status, response);
-          emitter.emit(textStatus, response);
-        } else {
-          if (emitter.listeners(event).length>0) {
-            emitter.emit(event, response);
-          } else if (!response.isRedirect) {
-            emitter.emit("response", response);
-            //console.warn("Request has no event listener for status code " + response.status);
-          }
-        }
-      };
-
-      // Next, check for a redirect. We simply repeat the request with the URL
-      // given in the `Location` header. We fire a `redirect` event.
-      if (response.isRedirect) {
-        request.log.debug("Redirecting to "
-            + response.getHeader("Location"));
-        request.url = response.getHeader("Location");
-        emit("redirect");
-        createRequest(request);
-
-      // Okay, it's not a redirect. Is it an error of some kind?
-      } else if (response.isError) {
-        emit("error");
-      } else {
-      // It looks like we're good shape. Trigger the `success` event.
-        emit("success");
-      }
-    });
-  });
-
-  // We're still setting up the request. Next, we're going to handle error cases
-  // where we have no response. We don't emit an error event because that event
-  // takes a response. We don't response handlers to have to check for a null
-  // value. However, we [should introduce a different event
-  // type](https://github.com/spire-io/shred/issues/3) for this type of error.
-  request._raw.on("error", function(error) {
-    request.emitter.emit("request_error", error);
-  });
-
-  request._raw.on("socket", function(socket) {
-    request.emitter.emit("socket", socket);
-  });
-
-  // TCP timeouts should also trigger the "response_error" event.
-  request._raw.on('socket', function () {
-    request._raw.socket.on('timeout', function () {
-      // This should trigger the "error" event on the raw request, which will
-      // trigger the "response_error" on the shred request.
-      request._raw.abort();
-    });
-  });
-
-
-  // We're almost there. Next, we need to write the request entity to the
-  // underlying request object.
-  if (request.content) {
-    request.log.debug("Streaming body: '" +
-        request.content.data.slice(0,59) + "' ... ");
-    request._raw.write(request.content.data);
-  }
-
-  // Finally, we need to set up the timeout. We do this last so that we don't
-  // start the clock ticking until the last possible moment.
-  if (request.timeout) {
-    timeout = setTimeout(function() {
-      request.log.debug("Timeout fired, aborting request ...");
-      request._raw.abort();
-      request.emitter.emit("timeout", request);
-    },request.timeout);
-  }
-
-  // The `.end()` method will cause the request to fire. Technically, it might
-  // have already sent the headers and body.
-  request.log.debug("Sending request ...");
-  request._raw.end();
-};
-
-// Logs the curl command for the request.
-var logCurl = function (req) {
-  var headers = req.getHeaders();
-  var headerString = "";
-
-  for (var key in headers) {
-    headerString += '-H "' + key + ": " + headers[key] + '" ';
-  }
-
-  var bodyString = ""
-
-  if (req.content) {
-    bodyString += "-d '" + req.content.body + "' ";
-  }
-
-  var query = req.query ? '?' + req.query : "";
-
-  console.log("curl " +
-    "-X " + req.method.toUpperCase() + " " +
-    req.scheme + "://" + req.host + ":" + req.port + req.path + query + " " +
-    headerString +
-    bodyString
-  );
-};
-
-
-module.exports = Request;
-
-});
-
-require.define("http", function (require, module, exports, __dirname, __filename) {
-    // todo
-
-});
-
-require.define("https", function (require, module, exports, __dirname, __filename) {
-    // todo
-
-});
-
-require.define("/shred/parseUri.js", function (require, module, exports, __dirname, __filename) {
-    // parseUri 1.2.2
-// (c) Steven Levithan <stevenlevithan.com>
-// MIT License
-
-function parseUri (str) {
-  var o   = parseUri.options,
-    m   = o.parser[o.strictMode ? "strict" : "loose"].exec(str),
-    uri = {},
-    i   = 14;
-
-  while (i--) uri[o.key[i]] = m[i] || "";
-
-  uri[o.q.name] = {};
-  uri[o.key[12]].replace(o.q.parser, function ($0, $1, $2) {
-    if ($1) uri[o.q.name][$1] = $2;
-  });
-
-  return uri;
-};
-
-parseUri.options = {
-  strictMode: false,
-  key: ["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],
-  q:   {
-    name:   "queryKey",
-    parser: /(?:^|&)([^&=]*)=?([^&]*)/g
-  },
-  parser: {
-    strict: /^(?:([^:\/?#]+):)?(?:\/\/((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?))?((((?:[^?#\/]*\/)*)([^?#]*))(?:\?([^#]*))?(?:#(.*))?)/,
-    loose:  /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/
-  }
-};
-
-module.exports = parseUri;
-
-});
-
-require.define("events", function (require, module, exports, __dirname, __filename) {
-    if (!process.EventEmitter) process.EventEmitter = function () {};
-
-var EventEmitter = exports.EventEmitter = process.EventEmitter;
-var isArray = typeof Array.isArray === 'function'
-    ? Array.isArray
-    : function (xs) {
-        return Object.toString.call(xs) === '[object Array]'
-    }
-;
-
-// By default EventEmitters will print a warning if more than
-// 10 listeners are added to it. This is a useful default which
-// helps finding memory leaks.
-//
-// Obviously not all Emitters should be limited to 10. This function allows
-// that to be increased. Set to zero for unlimited.
-var defaultMaxListeners = 10;
-EventEmitter.prototype.setMaxListeners = function(n) {
-  if (!this._events) this._events = {};
-  this._events.maxListeners = n;
-};
-
-
-EventEmitter.prototype.emit = function(type) {
-  // If there is no 'error' event listener then throw.
-  if (type === 'error') {
-    if (!this._events || !this._events.error ||
-        (isArray(this._events.error) && !this._events.error.length))
-    {
-      if (arguments[1] instanceof Error) {
-        throw arguments[1]; // Unhandled 'error' event
-      } else {
-        throw new Error("Uncaught, unspecified 'error' event.");
-      }
-      return false;
-    }
-  }
-
-  if (!this._events) return false;
-  var handler = this._events[type];
-  if (!handler) return false;
-
-  if (typeof handler == 'function') {
-    switch (arguments.length) {
-      // fast cases
-      case 1:
-        handler.call(this);
-        break;
-      case 2:
-        handler.call(this, arguments[1]);
-        break;
-      case 3:
-        handler.call(this, arguments[1], arguments[2]);
-        break;
-      // slower
-      default:
-        var args = Array.prototype.slice.call(arguments, 1);
-        handler.apply(this, args);
-    }
-    return true;
-
-  } else if (isArray(handler)) {
-    var args = Array.prototype.slice.call(arguments, 1);
-
-    var listeners = handler.slice();
-    for (var i = 0, l = listeners.length; i < l; i++) {
-      listeners[i].apply(this, args);
-    }
-    return true;
-
-  } else {
-    return false;
-  }
-};
-
-// EventEmitter is defined in src/node_events.cc
-// EventEmitter.prototype.emit() is also defined there.
-EventEmitter.prototype.addListener = function(type, listener) {
-  if ('function' !== typeof listener) {
-    throw new Error('addListener only takes instances of Function');
-  }
-
-  if (!this._events) this._events = {};
-
-  // To avoid recursion in the case that type == "newListeners"! Before
-  // adding it to the listeners, first emit "newListeners".
-  this.emit('newListener', type, listener);
-
-  if (!this._events[type]) {
-    // Optimize the case of one listener. Don't need the extra array object.
-    this._events[type] = listener;
-  } else if (isArray(this._events[type])) {
-
-    // Check for listener leak
-    if (!this._events[type].warned) {
-      var m;
-      if (this._events.maxListeners !== undefined) {
-        m = this._events.maxListeners;
-      } else {
-        m = defaultMaxListeners;
-      }
-
-      if (m && m > 0 && this._events[type].length > m) {
-        this._events[type].warned = true;
-        console.error('(node) warning: possible EventEmitter memory ' +
-                      'leak detected. %d listeners added. ' +
-                      'Use emitter.setMaxListeners() to increase limit.',
-                      this._events[type].length);
-        console.trace();
-      }
-    }
-
-    // If we've already got an array, just append.
-    this._events[type].push(listener);
-  } else {
-    // Adding the second element, need to change to array.
-    this._events[type] = [this._events[type], listener];
-  }
-
-  return this;
-};
-
-EventEmitter.prototype.on = EventEmitter.prototype.addListener;
-
-EventEmitter.prototype.once = function(type, listener) {
-  var self = this;
-  self.on(type, function g() {
-    self.removeListener(type, g);
-    listener.apply(this, arguments);
-  });
-
-  return this;
-};
-
-EventEmitter.prototype.removeListener = function(type, listener) {
-  if ('function' !== typeof listener) {
-    throw new Error('removeListener only takes instances of Function');
-  }
-
-  // does not use listeners(), so no side effect of creating _events[type]
-  if (!this._events || !this._events[type]) return this;
-
-  var list = this._events[type];
-
-  if (isArray(list)) {
-    var i = list.indexOf(listener);
-    if (i < 0) return this;
-    list.splice(i, 1);
-    if (list.length == 0)
-      delete this._events[type];
-  } else if (this._events[type] === listener) {
-    delete this._events[type];
-  }
-
-  return this;
-};
-
-EventEmitter.prototype.removeAllListeners = function(type) {
-  // does not use listeners(), so no side effect of creating _events[type]
-  if (type && this._events && this._events[type]) this._events[type] = null;
-  return this;
-};
-
-EventEmitter.prototype.listeners = function(type) {
-  if (!this._events) this._events = {};
-  if (!this._events[type]) this._events[type] = [];
-  if (!isArray(this._events[type])) {
-    this._events[type] = [this._events[type]];
-  }
-  return this._events[type];
-};
-
-});
-
-require.define("/node_modules/sprintf/package.json", function (require, module, exports, __dirname, __filename) {
-    module.exports = {"main":"./lib/sprintf"}
-});
-
-require.define("/node_modules/sprintf/lib/sprintf.js", function (require, module, exports, __dirname, __filename) {
-    /**
-sprintf() for JavaScript 0.7-beta1
-http://www.diveintojavascript.com/projects/javascript-sprintf
-
-Copyright (c) Alexandru Marasteanu <alexaholic [at) gmail (dot] com>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of sprintf() for JavaScript nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL Alexandru Marasteanu BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-Changelog:
-2010.11.07 - 0.7-beta1-node
-  - converted it to a node.js compatible module
-
-2010.09.06 - 0.7-beta1
-  - features: vsprintf, support for named placeholders
-  - enhancements: format cache, reduced global namespace pollution
-
-2010.05.22 - 0.6:
- - reverted to 0.4 and fixed the bug regarding the sign of the number 0
- Note:
- Thanks to Raphael Pigulla <raph (at] n3rd [dot) org> (http://www.n3rd.org/)
- who warned me about a bug in 0.5, I discovered that the last update was
- a regress. I appologize for that.
-
-2010.05.09 - 0.5:
- - bug fix: 0 is now preceeded with a + sign
- - bug fix: the sign was not at the right position on padded results (Kamal Abdali)
- - switched from GPL to BSD license
-
-2007.10.21 - 0.4:
- - unit test and patch (David Baird)
-
-2007.09.17 - 0.3:
- - bug fix: no longer throws exception on empty paramenters (Hans Pufal)
-
-2007.09.11 - 0.2:
- - feature: added argument swapping
-
-2007.04.03 - 0.1:
- - initial release
-**/
-
-var sprintf = (function() {
-  function get_type(variable) {
-    return Object.prototype.toString.call(variable).slice(8, -1).toLowerCase();
-  }
-  function str_repeat(input, multiplier) {
-    for (var output = []; multiplier > 0; output[--multiplier] = input) {/* do nothing */}
-    return output.join('');
-  }
-
-  var str_format = function() {
-    if (!str_format.cache.hasOwnProperty(arguments[0])) {
-      str_format.cache[arguments[0]] = str_format.parse(arguments[0]);
-    }
-    return str_format.format.call(null, str_format.cache[arguments[0]], arguments);
-  };
-
-  str_format.format = function(parse_tree, argv) {
-    var cursor = 1, tree_length = parse_tree.length, node_type = '', arg, output = [], i, k, match, pad, pad_character, pad_length;
-    for (i = 0; i < tree_length; i++) {
-      node_type = get_type(parse_tree[i]);
-      if (node_type === 'string') {
-        output.push(parse_tree[i]);
-      }
-      else if (node_type === 'array') {
-        match = parse_tree[i]; // convenience purposes only
-        if (match[2]) { // keyword argument
-          arg = argv[cursor];
-          for (k = 0; k < match[2].length; k++) {
-            if (!arg.hasOwnProperty(match[2][k])) {
-              throw(sprintf('[sprintf] property "%s" does not exist', match[2][k]));
-            }
-            arg = arg[match[2][k]];
-          }
-        }
-        else if (match[1]) { // positional argument (explicit)
-          arg = argv[match[1]];
-        }
-        else { // positional argument (implicit)
-          arg = argv[cursor++];
-        }
-
-        if (/[^s]/.test(match[8]) && (get_type(arg) != 'number')) {
-          throw(sprintf('[sprintf] expecting number but found %s', get_type(arg)));
-        }
-        switch (match[8]) {
-          case 'b': arg = arg.toString(2); break;
-          case 'c': arg = String.fromCharCode(arg); break;
-          case 'd': arg = parseInt(arg, 10); break;
-          case 'e': arg = match[7] ? arg.toExponential(match[7]) : arg.toExponential(); break;
-          case 'f': arg = match[7] ? parseFloat(arg).toFixed(match[7]) : parseFloat(arg); break;
-          case 'o': arg = arg.toString(8); break;
-          case 's': arg = ((arg = String(arg)) && match[7] ? arg.substring(0, match[7]) : arg); break;
-          case 'u': arg = Math.abs(arg); break;
-          case 'x': arg = arg.toString(16); break;
-          case 'X': arg = arg.toString(16).toUpperCase(); break;
-        }
-        arg = (/[def]/.test(match[8]) && match[3] && arg >= 0 ? '+'+ arg : arg);
-        pad_character = match[4] ? match[4] == '0' ? '0' : match[4].charAt(1) : ' ';
-        pad_length = match[6] - String(arg).length;
-        pad = match[6] ? str_repeat(pad_character, pad_length) : '';
-        output.push(match[5] ? arg + pad : pad + arg);
-      }
-    }
-    return output.join('');
-  };
-
-  str_format.cache = {};
-
-  str_format.parse = function(fmt) {
-    var _fmt = fmt, match = [], parse_tree = [], arg_names = 0;
-    while (_fmt) {
-      if ((match = /^[^\x25]+/.exec(_fmt)) !== null) {
-        parse_tree.push(match[0]);
-      }
-      else if ((match = /^\x25{2}/.exec(_fmt)) !== null) {
-        parse_tree.push('%');
-      }
-      else if ((match = /^\x25(?:([1-9]\d*)\$|\(([^\)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-fosuxX])/.exec(_fmt)) !== null) {
-        if (match[2]) {
-          arg_names |= 1;
-          var field_list = [], replacement_field = match[2], field_match = [];
-          if ((field_match = /^([a-z_][a-z_\d]*)/i.exec(replacement_field)) !== null) {
-            field_list.push(field_match[1]);
-            while ((replacement_field = replacement_field.substring(field_match[0].length)) !== '') {
-              if ((field_match = /^\.([a-z_][a-z_\d]*)/i.exec(replacement_field)) !== null) {
-                field_list.push(field_match[1]);
-              }
-              else if ((field_match = /^\[(\d+)\]/.exec(replacement_field)) !== null) {
-                field_list.push(field_match[1]);
-              }
-              else {
-                throw('[sprintf] huh?');
-              }
-            }
-          }
-          else {
-            throw('[sprintf] huh?');
-          }
-          match[2] = field_list;
-        }
-        else {
-          arg_names |= 2;
-        }
-        if (arg_names === 3) {
-          throw('[sprintf] mixing positional and named placeholders is not (yet) supported');
-        }
-        parse_tree.push(match);
-      }
-      else {
-        throw('[sprintf] huh?');
-      }
-      _fmt = _fmt.substring(match[0].length);
-    }
-    return parse_tree;
-  };
-
-  return str_format;
-})();
-
-var vsprintf = function(fmt, argv) {
-  argv.unshift(fmt);
-  return sprintf.apply(null, argv);
-};
-
-exports.sprintf = sprintf;
-exports.vsprintf = vsprintf;
-});
-
-require.define("/shred/response.js", function (require, module, exports, __dirname, __filename) {
-    // The `Response object` encapsulates a Node.js HTTP response.
-
-var Content = require("./content")
-  , HeaderMixins = require("./mixins/headers")
-  , CookieJarLib = require( "cookiejar" )
-  , Cookie = CookieJarLib.Cookie
-;
-
-// Browser doesn't have zlib.
-var zlib = null;
-try {
-  zlib = require('zlib');
-} catch (e) {
-  console.warn("no zlib library");
-}
-
-// Iconv doesn't work in browser
-var Iconv = null;
-try {
-  Iconv = require('iconv-lite');
-} catch (e) {
-  console.warn("no iconv library");
-}
-
-// Construct a `Response` object. You should never have to do this directly. The
-// `Request` object handles this, getting the raw response object and passing it
-// in here, along with the request. The callback allows us to stream the response
-// and then use the callback to let the request know when it's ready.
-var Response = function(raw, request, callback) { 
-  var response = this;
-  this._raw = raw;
-
-  // The `._setHeaders` method is "private"; you can't otherwise set headers on
-  // the response.
-  this._setHeaders.call(this,raw.headers);
-  
-  // store any cookies
-  if (request.cookieJar && this.getHeader('set-cookie')) {
-    var cookieStrings = this.getHeader('set-cookie');
-    var cookieObjs = []
-      , cookie;
-
-    for (var i = 0; i < cookieStrings.length; i++) {
-      var cookieString = cookieStrings[i];
-      if (!cookieString) {
-        continue;
-      }
-
-      if (!cookieString.match(/domain\=/i)) {
-        cookieString += '; domain=' + request.host;
-      }
-
-      if (!cookieString.match(/path\=/i)) {
-        cookieString += '; path=' + request.path;
-      }
-
-      try {
-        cookie = new Cookie(cookieString);
-        if (cookie) {
-          cookieObjs.push(cookie);
-        }
-      } catch (e) {
-        console.warn("Tried to set bad cookie: " + cookieString);
-      }
-    }
-
-    request.cookieJar.setCookies(cookieObjs);
-  }
-
-  this.request = request;
-  this.client = request.client;
-  this.log = this.request.log;
-
-  // Stream the response content entity and fire the callback when we're done.
-  // Store the incoming data in a array of Buffers which we concatinate into one
-  // buffer at the end.  We need to use buffers instead of strings here in order
-  // to preserve binary data.
-  var chunkBuffers = [];
-  var dataLength = 0;
-  raw.on("data", function(chunk) {
-    chunkBuffers.push(chunk);
-    dataLength += chunk.length;
-  });
-  raw.on("end", function() {
-    var body;
-    if (typeof Buffer === 'undefined') {
-      // Just concatinate into a string
-      body = chunkBuffers.join('');
-    } else {
-      // Initialize new buffer and add the chunks one-at-a-time.
-      body = new Buffer(dataLength);
-      for (var i = 0, pos = 0; i < chunkBuffers.length; i++) {
-        chunkBuffers[i].copy(body, pos);
-        pos += chunkBuffers[i].length;
-      }
-    }
-
-    var setBodyAndFinish = function (body) {
-      response._body = new Content({ 
-        body: body,
-        type: response.getHeader("Content-Type")
-      });
-      callback(response);
-    }
-
-    if (zlib && response.getHeader("Content-Encoding") === 'gzip'){
-      zlib.gunzip(body, function (err, gunzippedBody) {
-        if (Iconv && response.request.encoding){
-          body = Iconv.fromEncoding(gunzippedBody,response.request.encoding);
-        } else {
-          body = gunzippedBody.toString();
-        }
-        setBodyAndFinish(body);
-      })
-    }
-    else{
-       if (response.request.encoding){
-            body = Iconv.fromEncoding(body,response.request.encoding);
-        }        
-      setBodyAndFinish(body);
-    }
-  });
-};
-
-// The `Response` object can be pretty overwhelming to view using the built-in
-// Node.js inspect method. We want to make it a bit more manageable. This
-// probably goes [too far in the other
-// direction](https://github.com/spire-io/shred/issues/2).
-
-Response.prototype = {
-  inspect: function() {
-    var response = this;
-    var headers = this.format_headers();
-    var summary = ["<Shred Response> ", response.status].join(" ")
-    return [ summary, "- Headers:", headers].join("\n");
-  },
-  format_headers: function () {
-    var array = []
-    var headers = this._headers
-    for (var key in headers) {
-      if (headers.hasOwnProperty(key)) {
-        var value = headers[key]
-        array.push("\t" + key + ": " + value);
-      }
-    }
-    return array.join("\n");
-  }
-};
-
-// `Response` object properties, all of which are read-only:
-Object.defineProperties(Response.prototype, {
-  
-// - **status**. The HTTP status code for the response. 
-  status: {
-    get: function() { return this._raw.statusCode; },
-    enumerable: true
-  },
-
-// - **content**. The HTTP content entity, if any. Provided as a [content
-//   object](./content.html), which will attempt to convert the entity based upon
-//   the `content-type` header. The converted value is available as
-//   `content.data`. The original raw content entity is available as
-//   `content.body`.
-  body: {
-    get: function() { return this._body; }
-  },
-  content: {
-    get: function() { return this.body; },
-    enumerable: true
-  },
-
-// - **isRedirect**. Is the response a redirect? These are responses with 3xx
-//   status and a `Location` header.
-  isRedirect: {
-    get: function() {
-      return (this.status>299
-          &&this.status<400
-          &&this.getHeader("Location"));
-    },
-    enumerable: true
-  },
-
-// - **isError**. Is the response an error? These are responses with status of
-//   400 or greater.
-  isError: {
-    get: function() {
-      return (this.status === 0 || this.status > 399)
-    },
-    enumerable: true
-  }
-});
-
-// Add in the [getters for accessing the normalized headers](./headers.js).
-HeaderMixins.getters(Response);
-HeaderMixins.privateSetters(Response);
-
-// Work around Mozilla bug #608735 [https://bugzil.la/608735], which causes
-// getAllResponseHeaders() to return {} if the response is a CORS request.
-// xhr.getHeader still works correctly.
-var getHeader = Response.prototype.getHeader;
-Response.prototype.getHeader = function (name) {
-  return (getHeader.call(this,name) ||
-    (typeof this._raw.getHeader === 'function' && this._raw.getHeader(name)));
-};
-
-module.exports = Response;
-
-});
-
-require.define("/shred/content.js", function (require, module, exports, __dirname, __filename) {
-    
-// The purpose of the `Content` object is to abstract away the data conversions
-// to and from raw content entities as strings. For example, you want to be able
-// to pass in a Javascript object and have it be automatically converted into a
-// JSON string if the `content-type` is set to a JSON-based media type.
-// Conversely, you want to be able to transparently get back a Javascript object
-// in the response if the `content-type` is a JSON-based media-type.
-
-// One limitation of the current implementation is that it [assumes the `charset` is UTF-8](https://github.com/spire-io/shred/issues/5).
-
-// The `Content` constructor takes an options object, which *must* have either a
-// `body` or `data` property and *may* have a `type` property indicating the
-// media type. If there is no `type` attribute, a default will be inferred.
-var Content = function(options) {
-  this.body = options.body;
-  this.data = options.data;
-  this.type = options.type;
-};
-
-Content.prototype = {
-  // Treat `toString()` as asking for the `content.body`. That is, the raw content entity.
-  //
-  //     toString: function() { return this.body; }
-  //
-  // Commented out, but I've forgotten why. :/
-};
-
-
-// `Content` objects have the following attributes:
-Object.defineProperties(Content.prototype,{
-  
-// - **type**. Typically accessed as `content.type`, reflects the `content-type`
-//   header associated with the request or response. If not passed as an options
-//   to the constructor or set explicitly, it will infer the type the `data`
-//   attribute, if possible, and, failing that, will default to `text/plain`.
-  type: {
-    get: function() {
-      if (this._type) {
-        return this._type;
-      } else {
-        if (this._data) {
-          switch(typeof this._data) {
-            case "string": return "text/plain";
-            case "object": return "application/json";
-          }
-        }
-      }
-      return "text/plain";
-    },
-    set: function(value) {
-      this._type = value;
-      return this;
-    },
-    enumerable: true
-  },
-
-// - **data**. Typically accessed as `content.data`, reflects the content entity
-//   converted into Javascript data. This can be a string, if the `type` is, say,
-//   `text/plain`, but can also be a Javascript object. The conversion applied is
-//   based on the `processor` attribute. The `data` attribute can also be set
-//   directly, in which case the conversion will be done the other way, to infer
-//   the `body` attribute.
-  data: {
-    get: function() {
-      if (this._body) {
-        return this.processor.parser(this._body);
-      } else {
-        return this._data;
-      }
-    },
-    set: function(data) {
-      if (this._body&&data) Errors.setDataWithBody(this);
-      this._data = data;
-      return this;
-    },
-    enumerable: true
-  },
-
-// - **body**. Typically accessed as `content.body`, reflects the content entity
-//   as a UTF-8 string. It is the mirror of the `data` attribute. If you set the
-//   `data` attribute, the `body` attribute will be inferred and vice-versa. If
-//   you attempt to set both, an exception is raised.
-  body: {
-    get: function() {
-      if (this._data) {
-        return this.processor.stringify(this._data);
-      } else {
-        return this.processor.stringify(this._body);
-      }
-    },
-    set: function(body) {
-      if (this._data&&body) Errors.setBodyWithData(this);
-      this._body = body;
-      return this;
-    },
-    enumerable: true
-  },
-
-// - **processor**. The functions that will be used to convert to/from `data` and
-//   `body` attributes. You can add processors. The two that are built-in are for
-//   `text/plain`, which is basically an identity transformation and
-//   `application/json` and other JSON-based media types (including custom media
-//   types with `+json`). You can add your own processors. See below.
-  processor: {
-    get: function() {
-      var processor = Content.processors[this.type];
-      if (processor) {
-        return processor;
-      } else {
-        // Return the first processor that matches any part of the
-        // content type. ex: application/vnd.foobar.baz+json will match json.
-        var main = this.type.split(";")[0];
-        var parts = main.split(/\+|\//);
-        for (var i=0, l=parts.length; i < l; i++) {
-          processor = Content.processors[parts[i]]
-        }
-        return processor || {parser:identity,stringify:toString};
-      }
-    },
-    enumerable: true
-  },
-
-// - **length**. Typically accessed as `content.length`, returns the length in
-//   bytes of the raw content entity.
-  length: {
-    get: function() {
-      if (typeof Buffer !== 'undefined') {
-        return Buffer.byteLength(this.body);
-      }
-      return this.body.length;
-    }
-  }
-});
-
-Content.processors = {};
-
-// The `registerProcessor` function allows you to add your own processors to
-// convert content entities. Each processor consists of a Javascript object with
-// two properties:
-// - **parser**. The function used to parse a raw content entity and convert it
-//   into a Javascript data type.
-// - **stringify**. The function used to convert a Javascript data type into a
-//   raw content entity.
-Content.registerProcessor = function(types,processor) {
-  
-// You can pass an array of types that will trigger this processor, or just one.
-// We determine the array via duck-typing here.
-  if (types.forEach) {
-    types.forEach(function(type) {
-      Content.processors[type] = processor;
-    });
-  } else {
-    // If you didn't pass an array, we just use what you pass in.
-    Content.processors[types] = processor;
-  }
-};
-
-// Register the identity processor, which is used for text-based media types.
-var identity = function(x) { return x; }
-  , toString = function(x) { return x.toString(); }
-Content.registerProcessor(
-  ["text/html","text/plain","text"],
-  { parser: identity, stringify: toString });
-
-// Register the JSON processor, which is used for JSON-based media types.
-Content.registerProcessor(
-  ["application/json; charset=utf-8","application/json","json"],
-  {
-    parser: function(string) {
-      return JSON.parse(string);
-    },
-    stringify: function(data) {
-      return JSON.stringify(data); }});
-
-// Error functions are defined separately here in an attempt to make the code
-// easier to read.
-var Errors = {
-  setDataWithBody: function(object) {
-    throw new Error("Attempt to set data attribute of a content object " +
-        "when the body attributes was already set.");
-  },
-  setBodyWithData: function(object) {
-    throw new Error("Attempt to set body attribute of a content object " +
-        "when the data attributes was already set.");
-  }
-}
-module.exports = Content;
-
-});
-
-require.define("/shred/mixins/headers.js", function (require, module, exports, __dirname, __filename) {
-    // The header mixins allow you to add HTTP header support to any object. This
-// might seem pointless: why not simply use a hash? The main reason is that, per
-// the [HTTP spec](http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.2),
-// headers are case-insensitive. So, for example, `content-type` is the same as
-// `CONTENT-TYPE` which is the same as `Content-Type`. Since there is no way to
-// overload the index operator in Javascript, using a hash to represent the
-// headers means it's possible to have two conflicting values for a single
-// header.
-// 
-// The solution to this is to provide explicit methods to set or get headers.
-// This also has the benefit of allowing us to introduce additional variations,
-// including snake case, which we automatically convert to what Matthew King has
-// dubbed "corset case" - the hyphen-separated names with initial caps:
-// `Content-Type`. We use corset-case just in case we're dealing with servers
-// that haven't properly implemented the spec.
-
-// Convert headers to corset-case. **Example:** `CONTENT-TYPE` will be converted
-// to `Content-Type`.
-
-var corsetCase = function(string) {
-  return string;//.toLowerCase()
-      //.replace("_","-")
-      // .replace(/(^|-)(\w)/g, 
-          // function(s) { return s.toUpperCase(); });
-};
-
-// We suspect that `initializeHeaders` was once more complicated ...
-var initializeHeaders = function(object) {
-  return {};
-};
-
-// Access the `_headers` property using lazy initialization. **Warning:** If you
-// mix this into an object that is using the `_headers` property already, you're
-// going to have trouble.
-var $H = function(object) {
-  return object._headers||(object._headers=initializeHeaders(object));
-};
-
-// Hide the implementations as private functions, separate from how we expose them.
-
-// The "real" `getHeader` function: get the header after normalizing the name.
-var getHeader = function(object,name) {
-  return $H(object)[corsetCase(name)];
-};
-
-// The "real" `getHeader` function: get one or more headers, or all of them
-// if you don't ask for any specifics. 
-var getHeaders = function(object,names) {
-  var keys = (names && names.length>0) ? names : Object.keys($H(object));
-  var hash = keys.reduce(function(hash,key) {
-    hash[key] = getHeader(object,key);
-    return hash;
-  },{});
-  // Freeze the resulting hash so you don't mistakenly think you're modifying
-  // the real headers.
-  Object.freeze(hash);
-  return hash;
-};
-
-// The "real" `setHeader` function: set a header, after normalizing the name.
-var setHeader = function(object,name,value) {
-  $H(object)[corsetCase(name)] = value;
-  return object;
-};
-
-// The "real" `setHeaders` function: set multiple headers based on a hash.
-var setHeaders = function(object,hash) {
-  for( var key in hash ) { setHeader(object,key,hash[key]); };
-  return this;
-};
-
-// Here's where we actually bind the functionality to an object. These mixins work by
-// exposing mixin functions. Each function mixes in a specific batch of features.
-module.exports = {
-  
-  // Add getters.
-  getters: function(constructor) {
-    constructor.prototype.getHeader = function(name) { return getHeader(this,name); };
-    constructor.prototype.getHeaders = function() { return getHeaders(this,arguments); };
-  },
-  // Add setters but as "private" methods.
-  privateSetters: function(constructor) {
-    constructor.prototype._setHeader = function(key,value) { return setHeader(this,key,value); };
-    constructor.prototype._setHeaders = function(hash) { return setHeaders(this,hash); };
-  },
-  // Add setters.
-  setters: function(constructor) {
-    constructor.prototype.setHeader = function(key,value) { return setHeader(this,key,value); };
-    constructor.prototype.setHeaders = function(hash) { return setHeaders(this,hash); };
-  },
-  // Add both getters and setters.
-  gettersAndSetters: function(constructor) {
-    constructor.prototype.getHeader = function(name) { return getHeader(this,name); };
-    constructor.prototype.getHeaders = function() { return getHeaders(this,arguments); };
-    constructor.prototype.setHeader = function(key,value) { return setHeader(this,key,value); };
-    constructor.prototype.setHeaders = function(hash) { return setHeaders(this,hash); };
-  },
-};
-
-});
-
-require.define("/node_modules/iconv-lite/package.json", function (require, module, exports, __dirname, __filename) {
-    module.exports = {}
-});
-
-require.define("/node_modules/iconv-lite/index.js", function (require, module, exports, __dirname, __filename) {
-    // Module exports
-var iconv = module.exports = {
-    toEncoding: function(str, encoding) {
-        return iconv.getCodec(encoding).toEncoding(str);
-    },
-    fromEncoding: function(buf, encoding) {
-        return iconv.getCodec(encoding).fromEncoding(buf);
-    },
-    
-    defaultCharUnicode: '�',
-    defaultCharSingleByte: '?',
-    
-    // Get correct codec for given encoding.
-    getCodec: function(encoding) {
-        var enc = encoding || "utf8";
-        var codecOptions = undefined;
-        while (1) {
-            if (getType(enc) === "String")
-                enc = enc.replace(/[- ]/g, "").toLowerCase();
-            var codec = iconv.encodings[enc];
-            var type = getType(codec);
-            if (type === "String") {
-                // Link to other encoding.
-                codecOptions = {originalEncoding: enc};
-                enc = codec;
-            }
-            else if (type === "Object" && codec.type != undefined) {
-                // Options for other encoding.
-                codecOptions = codec;
-                enc = codec.type;
-            } 
-            else if (type === "Function")
-                // Codec itself.
-                return codec(codecOptions);
-            else
-                throw new Error("Encoding not recognized: '" + encoding + "' (searched as: '"+enc+"')");
-        }
-    },
-    
-    // Define basic encodings
-    encodings: {
-        internal: function(options) {
-            return {
-                toEncoding: function(str) {
-                    return new Buffer(ensureString(str), options.originalEncoding);
-                },
-                fromEncoding: function(buf) {
-                    return ensureBuffer(buf).toString(options.originalEncoding);
-                }
-            };
-        },
-        utf8: "internal",
-        ucs2: "internal",
-        binary: "internal",
-        ascii: "internal",
-        base64: "internal",
-        
-        // Codepage single-byte encodings.
-        singlebyte: function(options) {
-            // Prepare chars if needed
-            if (!options.chars || (options.chars.length !== 128 && options.chars.length !== 256))
-                throw new Error("Encoding '"+options.type+"' has incorrect 'chars' (must be of len 128 or 256)");
-            
-            if (options.chars.length === 128)
-                options.chars = asciiString + options.chars;
-            
-            if (!options.charsBuf) {
-                options.charsBuf = new Buffer(options.chars, 'ucs2');
-            }
-            
-            if (!options.revCharsBuf) {
-                options.revCharsBuf = new Buffer(65536);
-                var defChar = iconv.defaultCharSingleByte.charCodeAt(0);
-                for (var i = 0; i < options.revCharsBuf.length; i++)
-                    options.revCharsBuf[i] = defChar;
-                for (var i = 0; i < options.chars.length; i++)
-                    options.revCharsBuf[options.chars.charCodeAt(i)] = i;
-            }
-            
-            return {
-                toEncoding: function(str) {
-                    str = ensureString(str);
-                    
-                    var buf = new Buffer(str.length);
-                    var revCharsBuf = options.revCharsBuf;
-                    for (var i = 0; i < str.length; i++)
-                        buf[i] = revCharsBuf[str.charCodeAt(i)];
-                    
-                    return buf;
-                },
-                fromEncoding: function(buf) {
-                    buf = ensureBuffer(buf);
-                    
-                    // Strings are immutable in JS -> we use ucs2 buffer to speed up computations.
-                    var charsBuf = options.charsBuf;
-                    var newBuf = new Buffer(buf.length*2);
-                    var idx1 = 0, idx2 = 0;
-                    for (var i = 0, _len = buf.length; i < _len; i++) {
-                        idx1 = buf[i]*2; idx2 = i*2;
-                        newBuf[idx2] = charsBuf[idx1];
-                        newBuf[idx2+1] = charsBuf[idx1+1];
-                    }
-                    return newBuf.toString('ucs2');
-                }
-            };
-        },
-
-        // Codepage double-byte encodings.
-        table: function(options) {
-            var table = options.table, key, revCharsTable = options.revCharsTable;
-            if (!table) {
-                throw new Error("Encoding '" + options.type +"' has incorect 'table' option");
-            }
-            if(!revCharsTable) {
-                revCharsTable = options.revCharsTable = {};
-                for (key in table) {
-                    revCharsTable[table[key]] = parseInt(key);
-                }
-            }
-            
-            return {
-                toEncoding: function(str) {
-                    str = ensureString(str);
-                    var strLen = str.length;
-                    var bufLen = strLen;
-                    for (var i = 0; i < strLen; i++)
-                        if (str.charCodeAt(i) >> 7)
-                            bufLen++;
-
-                    var newBuf = new Buffer(bufLen), gbkcode, unicode, 
-                        defaultChar = revCharsTable[iconv.defaultCharUnicode.charCodeAt(0)];
-
-                    for (var i = 0, j = 0; i < strLen; i++) {
-                        unicode = str.charCodeAt(i);
-                        if (unicode >> 7) {
-                            gbkcode = revCharsTable[unicode] || defaultChar;
-                            newBuf[j++] = gbkcode >> 8; //high byte;
-                            newBuf[j++] = gbkcode & 0xFF; //low byte
-                        } else {//ascii
-                            newBuf[j++] = unicode;
-                        }
-                    }
-                    return newBuf;
-                },
-                fromEncoding: function(buf) {
-                    buf = ensureBuffer(buf);
-                    var bufLen = buf.length, strLen = 0;
-                    for (var i = 0; i < bufLen; i++) {
-                        strLen++;
-                        if (buf[i] & 0x80) //the high bit is 1, so this byte is gbkcode's high byte.skip next byte
-                            i++;
-                    }
-                    var newBuf = new Buffer(strLen*2), unicode, gbkcode,
-                        defaultChar = iconv.defaultCharUnicode.charCodeAt(0);
-                    
-                    for (var i = 0, j = 0; i < bufLen; i++, j+=2) {
-                        gbkcode = buf[i];
-                        if (gbkcode & 0x80) {
-                            gbkcode = (gbkcode << 8) + buf[++i];
-                            unicode = table[gbkcode] || defaultChar;
-                        } else {
-                            unicode = gbkcode;
-                        }
-                        newBuf[j] = unicode & 0xFF; //low byte
-                        newBuf[j+1] = unicode >> 8; //high byte
-                    }
-                    return newBuf.toString('ucs2');
-                }
-            }
-        }
-    }
-};
-
-// Add aliases to convert functions
-iconv.encode = iconv.toEncoding;
-iconv.decode = iconv.fromEncoding;
-
-// Load other encodings from files in /encodings dir.
-var encodingsDir = __dirname+"/encodings/",
-    fs = require('fs');
-fs.readdirSync(encodingsDir).forEach(function(file) {
-    if(fs.statSync(encodingsDir + file).isDirectory()) return;
-    var encodings = require(encodingsDir + file)
-    for (var key in encodings)
-        iconv.encodings[key] = encodings[key]
-});
-
-// Utilities
-var asciiString = '\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f'+
-              ' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7f';
-
-var ensureBuffer = function(buf) {
-    buf = buf || new Buffer(0);
-    return (buf instanceof Buffer) ? buf : new Buffer(buf.toString(), "utf8");
-}
-
-var ensureString = function(str) {
-    str = str || "";
-    return (str instanceof String) ? str : str.toString((str instanceof Buffer) ? 'utf8' : undefined);
-}
-
-var getType = function(obj) {
-    return Object.prototype.toString.call(obj).slice(8, -1);
-}
-
-
-});
-
-require.define("/node_modules/http-browserify/package.json", function (require, module, exports, __dirname, __filename) {
-    module.exports = {"main":"index.js","browserify":"browser.js"}
-});
-
-require.define("/node_modules/http-browserify/browser.js", function (require, module, exports, __dirname, __filename) {
-    var http = module.exports;
-var EventEmitter = require('events').EventEmitter;
-var Request = require('./lib/request');
-
-http.request = function (params, cb) {
-    if (!params) params = {};
-    if (!params.host) params.host = window.location.host.split(':')[0];
-    if (!params.port) params.port = window.location.port;
-    
-    var req = new Request(new xhrHttp, params);
-    if (cb) req.on('response', cb);
-    return req;
-};
-
-http.get = function (params, cb) {
-    params.method = 'GET';
-    var req = http.request(params, cb);
-    req.end();
-    return req;
-};
-
-var xhrHttp = (function () {
-    if (typeof window === 'undefined') {
-        throw new Error('no window object present');
-    }
-    else if (window.XMLHttpRequest) {
-        return window.XMLHttpRequest;
-    }
-    else if (window.ActiveXObject) {
-        var axs = [
-            'Msxml2.XMLHTTP.6.0',
-            'Msxml2.XMLHTTP.3.0',
-            'Microsoft.XMLHTTP'
-        ];
-        for (var i = 0; i < axs.length; i++) {
-            try {
-                var ax = new(window.ActiveXObject)(axs[i]);
-                return function () {
-                    if (ax) {
-                        var ax_ = ax;
-                        ax = null;
-                        return ax_;
-                    }
-                    else {
-                        return new(window.ActiveXObject)(axs[i]);
-                    }
-                };
-            }
-            catch (e) {}
-        }
-        throw new Error('ajax not supported in this browser')
-    }
-    else {
-        throw new Error('ajax not supported in this browser');
-    }
-})();
-
-http.STATUS_CODES = {
-    100 : 'Continue',
-    101 : 'Switching Protocols',
-    102 : 'Processing', // RFC 2518, obsoleted by RFC 4918
-    200 : 'OK',
-    201 : 'Created',
-    202 : 'Accepted',
-    203 : 'Non-Authoritative Information',
-    204 : 'No Content',
-    205 : 'Reset Content',
-    206 : 'Partial Content',
-    207 : 'Multi-Status', // RFC 4918
-    300 : 'Multiple Choices',
-    301 : 'Moved Permanently',
-    302 : 'Moved Temporarily',
-    303 : 'See Other',
-    304 : 'Not Modified',
-    305 : 'Use Proxy',
-    307 : 'Temporary Redirect',
-    400 : 'Bad Request',
-    401 : 'Unauthorized',
-    402 : 'Payment Required',
-    403 : 'Forbidden',
-    404 : 'Not Found',
-    405 : 'Method Not Allowed',
-    406 : 'Not Acceptable',
-    407 : 'Proxy Authentication Required',
-    408 : 'Request Time-out',
-    409 : 'Conflict',
-    410 : 'Gone',
-    411 : 'Length Required',
-    412 : 'Precondition Failed',
-    413 : 'Request Entity Too Large',
-    414 : 'Request-URI Too Large',
-    415 : 'Unsupported Media Type',
-    416 : 'Requested Range Not Satisfiable',
-    417 : 'Expectation Failed',
-    418 : 'I\'m a teapot', // RFC 2324
-    422 : 'Unprocessable Entity', // RFC 4918
-    423 : 'Locked', // RFC 4918
-    424 : 'Failed Dependency', // RFC 4918
-    425 : 'Unordered Collection', // RFC 4918
-    426 : 'Upgrade Required', // RFC 2817
-    500 : 'Internal Server Error',
-    501 : 'Not Implemented',
-    502 : 'Bad Gateway',
-    503 : 'Service Unavailable',
-    504 : 'Gateway Time-out',
-    505 : 'HTTP Version not supported',
-    506 : 'Variant Also Negotiates', // RFC 2295
-    507 : 'Insufficient Storage', // RFC 4918
-    509 : 'Bandwidth Limit Exceeded',
-    510 : 'Not Extended' // RFC 2774
-};
-
-});
-
-require.define("/node_modules/http-browserify/lib/request.js", function (require, module, exports, __dirname, __filename) {
-    var EventEmitter = require('events').EventEmitter;
-var Response = require('./response');
-var isSafeHeader = require('./isSafeHeader');
-
-var Request = module.exports = function (xhr, params) {
-    var self = this;
-    self.xhr = xhr;
-    self.body = '';
-    
-    var uri = params.host + ':' + params.port + (params.path || '/');
-    
-    xhr.open(
-        params.method || 'GET',
-        (params.scheme || 'http') + '://' + uri,
-        true
-    );
-    
-    if (params.headers) {
-        Object.keys(params.headers).forEach(function (key) {
-            if (!isSafeHeader(key)) return;
-            var value = params.headers[key];
-            if (Array.isArray(value)) {
-                value.forEach(function (v) {
-                    xhr.setRequestHeader(key, v);
-                });
-            }
-            else xhr.setRequestHeader(key, value)
-        });
-    }
-    
-    var res = new Response(xhr);
-    res.on('ready', function () {
-        self.emit('response', res);
-    });
-    
-    xhr.onreadystatechange = function () {
-        res.handle(xhr);
-    };
-};
-
-Request.prototype = new EventEmitter;
-
-Request.prototype.setHeader = function (key, value) {
-    if ((Array.isArray && Array.isArray(value))
-    || value instanceof Array) {
-        for (var i = 0; i < value.length; i++) {
-            this.xhr.setRequestHeader(key, value[i]);
-        }
-    }
-    else {
-        this.xhr.setRequestHeader(key, value);
-    }
-};
-
-Request.prototype.write = function (s) {
-    this.body += s;
-};
-
-Request.prototype.end = function (s) {
-    if (s !== undefined) this.write(s);
-    this.xhr.send(this.body);
-};
-
-});
-
-require.define("/node_modules/http-browserify/lib/response.js", function (require, module, exports, __dirname, __filename) {
-    var EventEmitter = require('events').EventEmitter;
-var isSafeHeader = require('./isSafeHeader');
-
-var Response = module.exports = function (xhr) {
-    this.xhr = xhr;
-    this.offset = 0;
-};
-
-Response.prototype = new EventEmitter;
-
-var capable = {
-    streaming : true,
-    status2 : true
-};
-
-function parseHeaders (xhr) {
-    var lines = xhr.getAllResponseHeaders().split(/\r?\n/);
-    var headers = {};
-    for (var i = 0; i < lines.length; i++) {
-        var line = lines[i];
-        if (line === '') continue;
-        
-        var m = line.match(/^([^:]+):\s*(.*)/);
-        if (m) {
-            var key = m[1].toLowerCase(), value = m[2];
-            
-            if (headers[key] !== undefined) {
-                if ((Array.isArray && Array.isArray(headers[key]))
-                || headers[key] instanceof Array) {
-                    headers[key].push(value);
-                }
-                else {
-                    headers[key] = [ headers[key], value ];
-                }
-            }
-            else {
-                headers[key] = value;
-            }
-        }
-        else {
-            headers[line] = true;
-        }
-    }
-    return headers;
-}
-
-Response.prototype.getHeader = function (key) {
-    var header = this.headers ? this.headers[key.toLowerCase()] : null;
-    if (header) return header;
-
-    // Work around Mozilla bug #608735 [https://bugzil.la/608735], which causes
-    // getAllResponseHeaders() to return {} if the response is a CORS request.
-    // xhr.getHeader still works correctly.
-    if (isSafeHeader(key)) {
-      return this.xhr.getResponseHeader(key);
-    }
-    return null;
-};
-
-Response.prototype.handle = function () {
-    var xhr = this.xhr;
-    if (xhr.readyState === 2 && capable.status2) {
-        try {
-            this.statusCode = xhr.status;
-            this.headers = parseHeaders(xhr);
-        }
-        catch (err) {
-            capable.status2 = false;
-        }
-        
-        if (capable.status2) {
-            this.emit('ready');
-        }
-    }
-    else if (capable.streaming && xhr.readyState === 3) {
-        try {
-            if (!this.statusCode) {
-                this.statusCode = xhr.status;
-                this.headers = parseHeaders(xhr);
-                this.emit('ready');
-            }
-        }
-        catch (err) {}
-        
-        try {
-            this.write();
-        }
-        catch (err) {
-            capable.streaming = false;
-        }
-    }
-    else if (xhr.readyState === 4) {
-        if (!this.statusCode) {
-            this.statusCode = xhr.status;
-            this.emit('ready');
-        }
-        this.write();
-        
-        if (xhr.error) {
-            this.emit('error', xhr.responseText);
-        }
-        else this.emit('end');
-    }
-};
-
-Response.prototype.write = function () {
-    var xhr = this.xhr;
-    if (xhr.responseText.length > this.offset) {
-        this.emit('data', xhr.responseText.slice(this.offset));
-        this.offset = xhr.responseText.length;
-    }
-};
-
-});
-
-require.define("/node_modules/http-browserify/lib/isSafeHeader.js", function (require, module, exports, __dirname, __filename) {
-    // Taken from http://dxr.mozilla.org/mozilla/mozilla-central/content/base/src/nsXMLHttpRequest.cpp.html
-var unsafeHeaders = [
-    "accept-charset",
-    "accept-encoding",
-    "access-control-request-headers",
-    "access-control-request-method",
-    "connection",
-    "content-length",
-    "cookie",
-    "cookie2",
-    "content-transfer-encoding",
-    "date",
-    "expect",
-    "host",
-    "keep-alive",
-    "origin",
-    "referer",
-    "set-cookie",
-    "te",
-    "trailer",
-    "transfer-encoding",
-    "upgrade",
-    "user-agent",
-    "via"
-];
-
-module.exports = function (headerName) {
-    if (!headerName) return false;
-    return (unsafeHeaders.indexOf(headerName.toLowerCase()) === -1)
-};
-
-});
-
-require.alias("http-browserify", "/node_modules/http");
-
-require.alias("http-browserify", "/node_modules/https");
\ No newline at end of file
diff --git a/src/main/webapp/public/docs/lib/shred/content.js b/src/main/webapp/public/docs/lib/shred/content.js
deleted file mode 100644
index b8051fedd..000000000
--- a/src/main/webapp/public/docs/lib/shred/content.js
+++ /dev/null
@@ -1,193 +0,0 @@
-
-// The purpose of the `Content` object is to abstract away the data conversions
-// to and from raw content entities as strings. For example, you want to be able
-// to pass in a Javascript object and have it be automatically converted into a
-// JSON string if the `content-type` is set to a JSON-based media type.
-// Conversely, you want to be able to transparently get back a Javascript object
-// in the response if the `content-type` is a JSON-based media-type.
-
-// One limitation of the current implementation is that it [assumes the `charset` is UTF-8](https://github.com/spire-io/shred/issues/5).
-
-// The `Content` constructor takes an options object, which *must* have either a
-// `body` or `data` property and *may* have a `type` property indicating the
-// media type. If there is no `type` attribute, a default will be inferred.
-var Content = function(options) {
-  this.body = options.body;
-  this.data = options.data;
-  this.type = options.type;
-};
-
-Content.prototype = {
-  // Treat `toString()` as asking for the `content.body`. That is, the raw content entity.
-  //
-  //     toString: function() { return this.body; }
-  //
-  // Commented out, but I've forgotten why. :/
-};
-
-
-// `Content` objects have the following attributes:
-Object.defineProperties(Content.prototype,{
-  
-// - **type**. Typically accessed as `content.type`, reflects the `content-type`
-//   header associated with the request or response. If not passed as an options
-//   to the constructor or set explicitly, it will infer the type the `data`
-//   attribute, if possible, and, failing that, will default to `text/plain`.
-  type: {
-    get: function() {
-      if (this._type) {
-        return this._type;
-      } else {
-        if (this._data) {
-          switch(typeof this._data) {
-            case "string": return "text/plain";
-            case "object": return "application/json";
-          }
-        }
-      }
-      return "text/plain";
-    },
-    set: function(value) {
-      this._type = value;
-      return this;
-    },
-    enumerable: true
-  },
-
-// - **data**. Typically accessed as `content.data`, reflects the content entity
-//   converted into Javascript data. This can be a string, if the `type` is, say,
-//   `text/plain`, but can also be a Javascript object. The conversion applied is
-//   based on the `processor` attribute. The `data` attribute can also be set
-//   directly, in which case the conversion will be done the other way, to infer
-//   the `body` attribute.
-  data: {
-    get: function() {
-      if (this._body) {
-        return this.processor.parser(this._body);
-      } else {
-        return this._data;
-      }
-    },
-    set: function(data) {
-      if (this._body&&data) Errors.setDataWithBody(this);
-      this._data = data;
-      return this;
-    },
-    enumerable: true
-  },
-
-// - **body**. Typically accessed as `content.body`, reflects the content entity
-//   as a UTF-8 string. It is the mirror of the `data` attribute. If you set the
-//   `data` attribute, the `body` attribute will be inferred and vice-versa. If
-//   you attempt to set both, an exception is raised.
-  body: {
-    get: function() {
-      if (this._data) {
-        return this.processor.stringify(this._data);
-      } else {
-        return this._body.toString();
-      }
-    },
-    set: function(body) {
-      if (this._data&&body) Errors.setBodyWithData(this);
-      this._body = body;
-      return this;
-    },
-    enumerable: true
-  },
-
-// - **processor**. The functions that will be used to convert to/from `data` and
-//   `body` attributes. You can add processors. The two that are built-in are for
-//   `text/plain`, which is basically an identity transformation and
-//   `application/json` and other JSON-based media types (including custom media
-//   types with `+json`). You can add your own processors. See below.
-  processor: {
-    get: function() {
-      var processor = Content.processors[this.type];
-      if (processor) {
-        return processor;
-      } else {
-        // Return the first processor that matches any part of the
-        // content type. ex: application/vnd.foobar.baz+json will match json.
-        var main = this.type.split(";")[0];
-        var parts = main.split(/\+|\//);
-        for (var i=0, l=parts.length; i < l; i++) {
-          processor = Content.processors[parts[i]]
-        }
-        return processor || {parser:identity,stringify:toString};
-      }
-    },
-    enumerable: true
-  },
-
-// - **length**. Typically accessed as `content.length`, returns the length in
-//   bytes of the raw content entity.
-  length: {
-    get: function() {
-      if (typeof Buffer !== 'undefined') {
-        return Buffer.byteLength(this.body);
-      }
-      return this.body.length;
-    }
-  }
-});
-
-Content.processors = {};
-
-// The `registerProcessor` function allows you to add your own processors to
-// convert content entities. Each processor consists of a Javascript object with
-// two properties:
-// - **parser**. The function used to parse a raw content entity and convert it
-//   into a Javascript data type.
-// - **stringify**. The function used to convert a Javascript data type into a
-//   raw content entity.
-Content.registerProcessor = function(types,processor) {
-  
-// You can pass an array of types that will trigger this processor, or just one.
-// We determine the array via duck-typing here.
-  if (types.forEach) {
-    types.forEach(function(type) {
-      Content.processors[type] = processor;
-    });
-  } else {
-    // If you didn't pass an array, we just use what you pass in.
-    Content.processors[types] = processor;
-  }
-};
-
-// Register the identity processor, which is used for text-based media types.
-var identity = function(x) { return x; }
-  , toString = function(x) { return x.toString(); }
-Content.registerProcessor(
-  ["text/html","text/plain","text"],
-  { parser: identity, stringify: toString });
-
-// Register the JSON processor, which is used for JSON-based media types.
-Content.registerProcessor(
-  ["application/json; charset=utf-8","application/json","json"],
-  {
-    parser: function(string) {
-      return JSON.parse(string);
-    },
-    stringify: function(data) {
-      return JSON.stringify(data); }});
-
-var qs = require('querystring');
-// Register the post processor, which is used for JSON-based media types.
-Content.registerProcessor(
-  ["application/x-www-form-urlencoded"],
-  { parser : qs.parse, stringify : qs.stringify });
-
-// Error functions are defined separately here in an attempt to make the code
-// easier to read.
-var Errors = {
-  setDataWithBody: function(object) {
-    throw new Error("Attempt to set data attribute of a content object " +
-        "when the body attributes was already set.");
-  },
-  setBodyWithData: function(object) {
-    throw new Error("Attempt to set body attribute of a content object " +
-        "when the data attributes was already set.");
-  }
-}
-module.exports = Content;
\ No newline at end of file
diff --git a/src/main/webapp/public/docs/lib/swagger-client.js b/src/main/webapp/public/docs/lib/swagger-client.js
deleted file mode 100644
index f896bc33f..000000000
--- a/src/main/webapp/public/docs/lib/swagger-client.js
+++ /dev/null
@@ -1,1483 +0,0 @@
-// swagger-client.js
-// version 2.1.0-alpha.2
-/**
- * Array Model
- **/
-var ArrayModel = function(definition) {
-  this.name = "name";
-  this.definition = definition || {};
-  this.properties = [];
-  this.type;
-  this.ref;
-
-  var requiredFields = definition.enum || [];
-  var items = definition.items;
-  if(items) {
-    var type = items.type;
-    if(items.type) {
-      this.type = typeFromJsonSchema(type.type, type.format);
-    }
-    else {
-      this.ref = items['$ref'];
-    }
-  }
-}
-
-ArrayModel.prototype.createJSONSample = function(modelsToIgnore) {
-  var result;
-  modelsToIgnore = (modelsToIgnore||{})
-  if(this.type) {
-    result = type;
-  }
-  else if (this.ref) {
-    var name = simpleRef(this.ref);
-    result = models[name].createJSONSample();
-  }
-  return [ result ];
-};
-
-ArrayModel.prototype.getSampleValue = function(modelsToIgnore) {
-  var result;
-  modelsToIgnore = (modelsToIgnore || {})
-  if(this.type) {
-    result = type;
-  }
-  else if (this.ref) {
-    var name = simpleRef(this.ref);
-    result = models[name].getSampleValue(modelsToIgnore);
-  }
-  return [ result ];
-}
-
-ArrayModel.prototype.getMockSignature = function(modelsToIgnore) {
-  var propertiesStr = [];
-
-  if(this.ref) {
-    return models[simpleRef(this.ref)].getMockSignature();
-  }
-};
-
-/**
- * SwaggerAuthorizations applys the correct authorization to an operation being executed
- */
-var SwaggerAuthorizations = function() {
-  this.authz = {};
-};
-
-SwaggerAuthorizations.prototype.add = function(name, auth) {
-  this.authz[name] = auth;
-  return auth;
-};
-
-SwaggerAuthorizations.prototype.remove = function(name) {
-  return delete this.authz[name];
-};
-
-SwaggerAuthorizations.prototype.apply = function(obj, authorizations) {
-  var status = null;
-  var key;
-
-  // if the "authorizations" key is undefined, or has an empty array, add all keys
-  if(typeof authorizations === 'undefined' || Object.keys(authorizations).length == 0) {
-    for (key in this.authz) {
-      value = this.authz[key];
-      result = value.apply(obj, authorizations);
-      if (result === true)
-        status = true;
-    }
-  }
-  else {
-    if(Array.isArray(authorizations)) {
-      var i;
-      for(i = 0; i < authorizations.length; i++) {
-        var auth = authorizations[i];
-        log(auth);
-        for (key in this.authz) {
-          var value = this.authz[key];
-          if(typeof value !== 'undefined') {
-            result = value.apply(obj, authorizations);
-            if (result === true)
-              status = true;
-          }
-        }
-      }
-    }
-  }
-
-  return status;
-};
-
-/**
- * ApiKeyAuthorization allows a query param or header to be injected
- */
-var ApiKeyAuthorization = function(name, value, type) {
-  this.name = name;
-  this.value = value;
-  this.type = type;
-};
-
-ApiKeyAuthorization.prototype.apply = function(obj, authorizations) {
-  if (this.type === "query") {
-    if (obj.url.indexOf('?') > 0)
-      obj.url = obj.url + "&" + this.name + "=" + this.value;
-    else
-      obj.url = obj.url + "?" + this.name + "=" + this.value;
-    return true;
-  } else if (this.type === "header") {
-    obj.headers[this.name] = this.value;
-    return true;
-  }
-};
-
-var CookieAuthorization = function(cookie) {
-  this.cookie = cookie;
-}
-
-CookieAuthorization.prototype.apply = function(obj, authorizations) {
-  obj.cookieJar = obj.cookieJar || CookieJar();
-  obj.cookieJar.setCookie(this.cookie);
-  return true;
-}
-
-/**
- * Password Authorization is a basic auth implementation
- */
-var PasswordAuthorization = function(name, username, password) {
-  this.name = name;
-  this.username = username;
-  this.password = password;
-  this._btoa = null;
-  if (typeof window !== 'undefined')
-    this._btoa = btoa;
-  else
-    this._btoa = require("btoa");
-};
-
-PasswordAuthorization.prototype.apply = function(obj, authorizations) {
-  var base64encoder = this._btoa;
-  obj.headers["Authorization"] = "Basic " + base64encoder(this.username + ":" + this.password);
-  return true;
-};var __bind = function(fn, me){
-  return function(){
-    return fn.apply(me, arguments);
-  };
-};
-
-fail = function(message) {
-  log(message);
-}
-
-log = function(){
-  log.history = log.history || [];
-  log.history.push(arguments);
-  if(this.console){
-    console.log( Array.prototype.slice.call(arguments)[0] );
-  }
-};
-
-if (!Array.prototype.indexOf) {
-  Array.prototype.indexOf = function(obj, start) {
-    for (var i = (start || 0), j = this.length; i < j; i++) {
-      if (this[i] === obj) { return i; }
-    }
-    return -1;
-  }
-}
-
-if (!('filter' in Array.prototype)) {
-  Array.prototype.filter= function(filter, that /*opt*/) {
-    var other= [], v;
-    for (var i=0, n= this.length; i<n; i++)
-      if (i in this && filter.call(that, v= this[i], i, this))
-        other.push(v);
-    return other;
-  };
-}
-
-if (!('map' in Array.prototype)) {
-  Array.prototype.map= function(mapper, that /*opt*/) {
-    var other= new Array(this.length);
-    for (var i= 0, n= this.length; i<n; i++)
-      if (i in this)
-        other[i]= mapper.call(that, this[i], i, this);
-    return other;
-  };
-}
-
-Object.keys = Object.keys || (function () {
-  var hasOwnProperty = Object.prototype.hasOwnProperty,
-    hasDontEnumBug = !{toString:null}.propertyIsEnumerable("toString"),
-    DontEnums = [
-      'toString',
-      'toLocaleString',
-      'valueOf',
-      'hasOwnProperty',
-      'isPrototypeOf',
-      'propertyIsEnumerable',
-      'constructor'
-    ],
-  DontEnumsLength = DontEnums.length;
-
-  return function (o) {
-    if (typeof o != "object" && typeof o != "function" || o === null)
-      throw new TypeError("Object.keys called on a non-object");
-
-    var result = [];
-    for (var name in o) {
-      if (hasOwnProperty.call(o, name))
-        result.push(name);
-    }
-
-    if (hasDontEnumBug) {
-      for (var i = 0; i < DontEnumsLength; i++) {
-        if (hasOwnProperty.call(o, DontEnums[i]))
-          result.push(DontEnums[i]);
-      }
-    }
-
-    return result;
-  };
-})();
-/**
- * PrimitiveModel
- **/
-var PrimitiveModel = function(definition) {
-  this.name = "name";
-  this.definition = definition || {};
-  this.properties = [];
-  this.type;
-
-  var requiredFields = definition.enum || [];
-  this.type = typeFromJsonSchema(definition.type, definition.format);
-}
-
-PrimitiveModel.prototype.createJSONSample = function(modelsToIgnore) {
-  var result = this.type;
-  return result;
-};
-
-PrimitiveModel.prototype.getSampleValue = function() {
-  var result = this.type;
-  return null;
-}
-
-PrimitiveModel.prototype.getMockSignature = function(modelsToIgnore) {
-  var propertiesStr = [];
-  var i;
-  for (i = 0; i < this.properties.length; i++) {
-    var prop = this.properties[i];
-    propertiesStr.push(prop.toString());
-  }
-
-  var strong = '<span class="strong">';
-  var stronger = '<span class="stronger">';
-  var strongClose = '</span>';
-  var classOpen = strong + this.name + ' {' + strongClose;
-  var classClose = strong + '}' + strongClose;
-  var returnVal = classOpen + '<div>' + propertiesStr.join(',</div><div>') + '</div>' + classClose;
-
-  if (!modelsToIgnore)
-    modelsToIgnore = {};
-  modelsToIgnore[this.name] = this;
-  var i;
-  for (i = 0; i < this.properties.length; i++) {
-    var prop = this.properties[i];
-    var ref = prop['$ref'];
-    var model = models[ref];
-    if (model && typeof modelsToIgnore[ref] === 'undefined') {
-      returnVal = returnVal + ('<br>' + model.getMockSignature(modelsToIgnore));
-    }
-  }
-  return returnVal;
-};var SwaggerClient = function(url, options) {
-  this.isBuilt = false;
-  this.url = null;
-  this.debug = false;
-  this.basePath = null;
-  this.authorizations = null;
-  this.authorizationScheme = null;
-  this.isValid = false;
-  this.info = null;
-  this.useJQuery = false;
-  this.models = models;
-
-  options = (options||{});
-  if (url)
-    if (url.url) options = url;
-    else this.url = url;
-  else options = url;
-
-  if (options.url != null)
-    this.url = options.url;
-
-  if (options.success != null)
-    this.success = options.success;
-
-  if (typeof options.useJQuery === 'boolean')
-    this.useJQuery = options.useJQuery;
-
-  this.failure = options.failure != null ? options.failure : function() {};
-  this.progress = options.progress != null ? options.progress : function() {};
-  this.spec = options.spec;
-
-  if (options.success != null)
-    this.build();
-}
-
-SwaggerClient.prototype.build = function() {
-  var self = this;
-  this.progress('fetching resource list: ' + this.url);
-  var obj = {
-    useJQuery: this.useJQuery,
-    url: this.url,
-    method: "get",
-    headers: {
-      accept: "application/json, */*"
-    },
-    on: {
-      error: function(response) {
-        if (self.url.substring(0, 4) !== 'http')
-          return self.fail('Please specify the protocol for ' + self.url);
-        else if (response.status === 0)
-          return self.fail('Can\'t read from server.  It may not have the appropriate access-control-origin settings.');
-        else if (response.status === 404)
-          return self.fail('Can\'t read swagger JSON from ' + self.url);
-        else
-          return self.fail(response.status + ' : ' + response.statusText + ' ' + self.url);
-      },
-      response: function(resp) {
-        var responseObj = resp.obj || JSON.parse(resp.data);
-        self.swaggerVersion = responseObj.swaggerVersion;
-
-        if(responseObj.swagger && parseInt(responseObj.swagger) === 2) {
-          self.swaggerVersion = responseObj.swagger;
-          self.buildFromSpec(responseObj);
-          self.isValid = true;
-        }
-        else {
-          self.isValid = false;
-          self.failure();
-        }
-      }
-    }
-  };
-  if(this.spec) {
-    var self = this;
-    setTimeout(function() { self.buildFromSpec(self.spec); }, 10);
-  }
-  else {
-    var e = (typeof window !== 'undefined' ? window : exports);
-    var status = e.authorizations.apply(obj);
-    new SwaggerHttp().execute(obj);
-  }
-
-  return this;
-};
-
-SwaggerClient.prototype.buildFromSpec = function(response) {
-  if(this.isBuilt) return this;
-
-  this.info = response.info || {};
-  this.title = response.title || '';
-  this.host = response.host || '';
-  this.schemes = response.schemes || [];
-  this.scheme;
-  this.basePath = response.basePath || '';
-  this.apis = {};
-  this.apisArray = [];
-  this.consumes = response.consumes;
-  this.produces = response.produces;
-  this.securityDefinitions = response.securityDefinitions;
-
-  var location = this.parseUri(this.url);
-  if(typeof this.schemes === 'undefined' || this.schemes.length === 0) {
-    this.scheme = location.scheme;
-  }
-  else {
-    this.scheme = this.schemes[0];
-  }
-
-  if(typeof this.host === 'undefined' || this.host === '') {
-    this.host = location.host;
-    if (location.port) {
-      this.host = this.host + ':' + location.port;
-    }
-  }
-
-  this.definitions = response.definitions;
-  var key;
-  for(key in this.definitions) {
-    var model = new Model(key, this.definitions[key]);
-    if(model) {
-      models[key] = model;
-    }
-  }
-
-  // get paths, create functions for each operationId
-  var path;
-  var operations = [];
-  for(path in response.paths) {
-    if(typeof response.paths[path] === 'object') {
-      var httpMethod;
-      for(httpMethod in response.paths[path]) {
-        var operation = response.paths[path][httpMethod];
-        var tags = operation.tags;
-        if(typeof tags === 'undefined') {
-          operation.tags = [ 'default' ];
-          tags = operation.tags;
-        }
-        var operationId = this.idFromOp(path, httpMethod, operation);
-        var operationObject = new Operation (
-          this,
-          operationId,
-          httpMethod,
-          path,
-          operation,
-          this.definitions
-        );
-        // bind this operation's execute command to the api
-        if(tags.length > 0) {
-          var i;
-          for(i = 0; i < tags.length; i++) {
-            var tag = this.tagFromLabel(tags[i]);
-            var operationGroup = this[tag];
-            if(typeof operationGroup === 'undefined') {
-              this[tag] = [];
-              operationGroup = this[tag];
-              operationGroup.label = tag;
-              operationGroup.apis = [];
-              this[tag].help = this.help.bind(operationGroup);
-              this.apisArray.push(new OperationGroup(tag, operationObject));
-            }
-            operationGroup[operationId] = operationObject.execute.bind(operationObject);
-            operationGroup[operationId].help = operationObject.help.bind(operationObject);
-            operationGroup.apis.push(operationObject);
-
-            // legacy UI feature
-            var j;
-            var api;
-            for(j = 0; j < this.apisArray.length; j++) {
-              if(this.apisArray[j].tag === tag) {
-                api = this.apisArray[j];
-              }
-            }
-            if(api) {
-              api.operationsArray.push(operationObject);
-            }
-          }
-        }
-        else {
-          log('no group to bind to');
-        }
-      }
-    }
-  }
-  this.isBuilt = true;
-  if (this.success)
-    this.success();
-  return this;
-}
-
-SwaggerClient.prototype.parseUri = function(uri) {
-  var urlParseRE = /^(((([^:\/#\?]+:)?(?:(\/\/)((?:(([^:@\/#\?]+)(?:\:([^:@\/#\?]+))?)@)?(([^:\/#\?\]\[]+|\[[^\/\]@#?]+\])(?:\:([0-9]+))?))?)?)?((\/?(?:[^\/\?#]+\/+)*)([^\?#]*)))?(\?[^#]+)?)(#.*)?/;
-  var parts = urlParseRE.exec(uri);
-  return {
-    scheme: parts[4].replace(':',''),
-    host: parts[11],
-    port: parts[12],
-    path: parts[15]
-  };
-}
-
-SwaggerClient.prototype.help = function() {
-  var i;
-  log('operations for the "' + this.label + '" tag');
-  for(i = 0; i < this.apis.length; i++) {
-    var api = this.apis[i];
-    log('  * ' + api.nickname + ': ' + api.operation.summary);
-  }
-}
-
-SwaggerClient.prototype.tagFromLabel = function(label) {
-  return label;
-}
-
-SwaggerClient.prototype.idFromOp = function(path, httpMethod, op) {
-  if(typeof op.operationId !== 'undefined') {
-    return (op.operationId);
-  }
-  else {
-    return path.substring(1).replace(/\//g, "_").replace(/\{/g, "").replace(/\}/g, "") + "_" + httpMethod;
-  }
-}
-
-SwaggerClient.prototype.fail = function(message) {
-  this.failure(message);
-  throw message;
-};
-
-var OperationGroup = function(tag, operation) {
-  this.tag = tag;
-  this.path = tag;
-  this.name = tag;
-  this.operation = operation;
-  this.operationsArray = [];
-
-  this.description = operation.description || "";
-}
-
-var Operation = function(parent, operationId, httpMethod, path, args, definitions) {
-  var errors = [];
-  this.operation = args;
-  this.deprecated = args.deprecated;
-  this.consumes = args.consumes;
-  this.produces = args.produces;
-  this.parent = parent;
-  this.host = parent.host;
-  this.schemes = parent.schemes;
-  this.scheme = parent.scheme || 'http';
-  this.basePath = parent.basePath;
-  this.nickname = (operationId||errors.push('Operations must have a nickname.'));
-  this.method = (httpMethod||errors.push('Operation ' + operationId + ' is missing method.'));
-  this.path = (path||errors.push('Operation ' + nickname + ' is missing path.'));
-  this.parameters = args != null ? (args.parameters||[]) : {};
-  this.summary = args.summary || '';
-  this.responses = (args.responses||{});
-  this.type = null;
-  this.security = args.security;
-  this.authorizations = args.security;
-  this.description = args.description;
-
-  var i;
-  for(i = 0; i < this.parameters.length; i++) {
-    var param = this.parameters[i];
-    if(param.type === 'array') {
-      param.isList = true;
-      param.allowMultiple = true;
-    }
-    var innerType = this.getType(param);
-    if(innerType.toString().toLowerCase() === 'boolean') {
-      param.allowableValues = {};
-      param.isList = true;
-      param.enum = ["true", "false"];
-    }
-    if(typeof param.enum !== 'undefined') {
-      var id;
-      param.allowableValues = {};
-      param.allowableValues.values = [];
-      param.allowableValues.descriptiveValues = [];
-      for(id = 0; id < param.enum.length; id++) {
-        var value = param.enum[id];
-        var isDefault = (value === param.default) ? true : false;
-        param.allowableValues.values.push(value);
-        param.allowableValues.descriptiveValues.push({value : value, isDefault: isDefault});
-      }
-    }
-    if(param.type === 'array' && typeof param.allowableValues === 'undefined') {
-      // can't show as a list if no values to select from
-      delete param.isList;
-      delete param.allowMultiple;
-    }
-    param.signature = this.getSignature(innerType, models);
-    param.sampleJSON = this.getSampleJSON(innerType, models);
-    param.responseClassSignature = param.signature;
-  }
-
-  var response;
-  var model;
-  var responses = this.responses;
-
-  if(responses['200']) {
-    response = responses['200'];
-    defaultResponseCode = '200';
-  }
-  else if(responses['201']) {
-    response = responses['201'];
-    defaultResponseCode = '201';
-  }
-  else if(responses['202']) {
-    response = responses['202'];
-    defaultResponseCode = '202';
-  }
-  else if(responses['203']) {
-    response = responses['203'];
-    defaultResponseCode = '203';
-  }
-  else if(responses['204']) {
-    response = responses['204'];
-    defaultResponseCode = '204';
-  }
-  else if(responses['205']) {
-    response = responses['205'];
-    defaultResponseCode = '205';
-  }
-  else if(responses['206']) {
-    response = responses['206'];
-    defaultResponseCode = '206';
-  }
-  else if(responses['default']) {
-    response = responses['default'];
-    defaultResponseCode = 'default';
-  }
-
-  if(response && response.schema) {
-    var resolvedModel = this.resolveModel(response.schema, definitions);
-    if(resolvedModel) {
-      this.type = resolvedModel.name;
-      this.responseSampleJSON = JSON.stringify(resolvedModel.getSampleValue(), null, 2);
-      this.responseClassSignature = resolvedModel.getMockSignature();
-      delete responses[defaultResponseCode];
-    }
-    else {
-      this.type = response.schema.type;
-    }
-  }
-
-  if (errors.length > 0)
-    this.resource.api.fail(errors);
-
-  return this;
-}
-
-OperationGroup.prototype.sort = function(sorter) {
-
-}
-
-Operation.prototype.getType = function (param) {
-  var type = param.type;
-  var format = param.format;
-  var isArray = false;
-  var str;
-  if(type === 'integer' && format === 'int32')
-    str = 'integer';
-  else if(type === 'integer' && format === 'int64')
-    str = 'long';
-  else if(type === 'integer' && typeof format === 'undefined')
-    str = 'long';
-  else if(type === 'string' && format === 'date-time')
-    str = 'date-time';
-  else if(type === 'string' && format === 'date')
-    str = 'date';
-  else if(type === 'number' && format === 'float')
-    str = 'float';
-  else if(type === 'number' && format === 'double')
-    str = 'double';
-  else if(type === 'number' && typeof format === 'undefined')
-    str = 'double';
-  else if(type === 'boolean')
-    str = 'boolean';
-  else if(type === 'string')
-    str = 'string';
-  else if(type === 'array') {
-    isArray = true;
-    if(param.items)
-      str = this.getType(param.items);
-  }
-  if(param['$ref'])
-    str = param['$ref'];
-
-  var schema = param.schema;
-  if(schema) {
-    var ref = schema['$ref'];
-    if(ref) {
-      ref = simpleRef(ref);
-      if(isArray)
-        return [ ref ];
-      else
-        return ref;
-    }
-    else
-      return this.getType(schema);
-  }
-  if(isArray)
-    return [ str ];
-  else
-    return str;
-}
-
-Operation.prototype.resolveModel = function (schema, definitions) {
-  if(typeof schema['$ref'] !== 'undefined') {
-    var ref = schema['$ref'];
-    if(ref.indexOf('#/definitions/') == 0)
-      ref = ref.substring('#/definitions/'.length);
-    if(definitions[ref])
-      return new Model(ref, definitions[ref]);
-  }
-  if(schema.type === 'array')
-    return new ArrayModel(schema);
-  else
-    return null;
-}
-
-Operation.prototype.help = function() {
-  log(this.nickname + ': ' + this.operation.summary);
-  for(var i = 0; i < this.parameters.length; i++) {
-    var param = this.parameters[i];
-    log('  * ' + param.name + ': ' + param.description);
-  }
-}
-
-Operation.prototype.getSignature = function(type, models) {
-  var isPrimitive, listType;
-
-  if(type instanceof Array) {
-    listType = true;
-    type = type[0];
-  }
-
-  if(type === 'string')
-    isPrimitive = true
-  else
-    isPrimitive = ((listType != null) && models[listType]) || (models[type] != null) ? false : true;
-  if (isPrimitive) {
-    return type;
-  } else {
-    if (listType != null)
-      return models[type].getMockSignature();
-    else
-      return models[type].getMockSignature();
-  }
-};
-
-/**
- * gets sample response for a single operation
- **/
-Operation.prototype.getSampleJSON = function(type, models) {
-  var isPrimitive, listType, sampleJson;
-
-  listType = (type instanceof Array);
-  isPrimitive = (models[type] != null) ? false : true;
-  sampleJson = isPrimitive ? void 0 : models[type].createJSONSample();
-
-  if (sampleJson) {
-    sampleJson = listType ? [sampleJson] : sampleJson;
-    if(typeof sampleJson == 'string')
-      return sampleJson;
-    else if(typeof sampleJson === 'object') {
-      var t = sampleJson;
-      if(sampleJson instanceof Array && sampleJson.length > 0) {
-        t = sampleJson[0];
-      }
-      if(t.nodeName) {
-        var xmlString = new XMLSerializer().serializeToString(t);
-        return this.formatXml(xmlString);
-      }
-      else
-        return JSON.stringify(sampleJson, null, 2);
-    }
-    else
-      return sampleJson;
-  }
-};
-
-/**
- * legacy binding
- **/
-Operation.prototype["do"] = function(args, opts, callback, error, parent) {
-  return this.execute(args, opts, callback, error, parent);
-}
-
-/**
- * executes an operation
- **/
-Operation.prototype.execute = function(arg1, arg2, arg3, arg4, parent) {
-  var args = (arg1||{});
-  var opts = {}, success, error;
-  if(typeof arg2 === 'object') {
-    opts = arg2;
-    success = arg3;
-    error = arg4;
-  }
-  if(typeof arg2 === 'function') {
-    success = arg2;
-    error = arg3;
-  }
-
-  var formParams = {};
-  var headers = {};
-  var requestUrl = this.path;
-
-  success = (success||log)
-  error = (error||log)
-
-  var requiredParams = [];
-  var missingParams = [];
-  // check required params, track the ones that are missing
-  var i;
-  for(i = 0; i < this.parameters.length; i++) {
-    var param = this.parameters[i];
-    if(param.required === true) {
-      requiredParams.push(param.name);
-      if(typeof args[param.name] === 'undefined')
-        missingParams = param.name;
-    }
-  }
-
-  if(missingParams.length > 0) {
-    var message = 'missing required params: ' + missingParams;
-    fail(message);
-    return;
-  }
-
-  // set content type negotiation
-  var consumes = this.consumes || this.parent.consumes || [ 'application/json' ];
-  var produces = this.produces || this.parent.produces || [ 'application/json' ];
-
-  headers = this.setContentTypes(args, opts);
-
-  // grab params from the args, build the querystring along the way
-  var querystring = "";
-  for(var i = 0; i < this.parameters.length; i++) {
-    var param = this.parameters[i];
-    if(typeof args[param.name] !== 'undefined') {
-      if(param.in === 'path') {
-        var reg = new RegExp('\{' + param.name + '[^\}]*\}', 'gi');
-        requestUrl = requestUrl.replace(reg, this.encodePathParam(args[param.name]));
-      }
-      else if (param.in === 'query') {
-        if(querystring === '')
-          querystring += '?';
-        else
-          querystring += '&';
-        if(typeof param.collectionFormat !== 'undefined') {
-          var qp = args[param.name];
-          if(Array.isArray(qp))
-            querystring += this.encodeCollection(param.collectionFormat, param.name, qp);
-          else
-            querystring += this.encodeQueryParam(param.name) + '=' + this.encodeQueryParam(args[param.name]);
-        }
-        else
-          querystring += this.encodeQueryParam(param.name) + '=' + this.encodeQueryParam(args[param.name]);
-      }
-      else if (param.in === 'header')
-        headers[param.name] = args[param.name];
-      else if (param.in === 'formData')
-        formParams[param.name] = args[param.name];
-      else if (param.in === 'body')
-        args.body = args[param.name];
-    }
-  }
-  // handle form params
-  if(headers['Content-Type'] === 'application/x-www-form-urlencoded') {
-    var encoded = "";
-    var key;
-    for(key in formParams) {
-      value = formParams[key];
-      if(typeof value !== 'undefined'){
-        if(encoded !== "")
-          encoded += "&";
-        encoded += encodeURIComponent(key) + '=' + encodeURIComponent(value);
-      }
-    }
-    // todo append?
-    args.body = encoded;
-  }
-  var url = this.scheme + '://' + this.host + this.basePath + requestUrl + querystring;
-
-  var obj = {
-    url: url,
-    method: this.method,
-    body: args.body,
-    useJQuery: this.useJQuery,
-    headers: headers,
-    on: {
-      response: function(response) {
-        return success(response, parent);
-      },
-      error: function(response) {
-        return error(response, parent);
-      }
-    }
-  };
-  var status = e.authorizations.apply(obj, this.operation.security);
-  new SwaggerHttp().execute(obj);
-}
-
-Operation.prototype.setContentTypes = function(args, opts) {
-  // default type
-  var accepts = 'application/json';
-  var consumes = 'application/json';
-
-  var allDefinedParams = this.parameters;
-  var definedFormParams = [];
-  var definedFileParams = [];
-  var body = args.body;
-  var headers = {};
-
-  // get params from the operation and set them in definedFileParams, definedFormParams, headers
-  var i;
-  for(i = 0; i < allDefinedParams.length; i++) {
-    var param = allDefinedParams[i];
-    if(param.in === 'formData')
-      definedFormParams.push(param);
-    else if(param.in === 'file')
-      definedFileParams.push(param);
-    else if(param.in === 'header' && this.headers) {
-      var key = param.name;
-      var headerValue = this.headers[param.name];
-      if(typeof this.headers[param.name] !== 'undefined')
-        headers[key] = headerValue;
-    }
-  }
-
-  // if there's a body, need to set the accepts header via requestContentType
-  if (body && (this.type === 'post' || this.type === 'put' || this.type === 'patch' || this.type === 'delete')) {
-    if (opts.requestContentType)
-      consumes = opts.requestContentType;
-  } else {
-    // if any form params, content type must be set
-    if(definedFormParams.length > 0) {
-      if(definedFileParams.length > 0)
-        consumes = 'multipart/form-data';
-      else
-        consumes = 'application/x-www-form-urlencoded';
-    }
-    else if (this.type == 'DELETE')
-      body = '{}';
-    else if (this.type != 'DELETE')
-      accepts = null;
-  }
-
-  if (consumes && this.consumes) {
-    if (this.consumes.indexOf(consumes) === -1) {
-      log('server doesn\'t consume ' + consumes + ', try ' + JSON.stringify(this.consumes));
-      consumes = this.operation.consumes[0];
-    }
-  }
-
-  if (opts.responseContentType) {
-    accepts = opts.responseContentType;
-  } else {
-    accepts = 'application/json';
-  }
-  if (accepts && this.produces) {
-    if (this.produces.indexOf(accepts) === -1) {
-      log('server can\'t produce ' + accepts);
-      accepts = this.produces[0];
-    }
-  }
-
-  if ((consumes && body !== '') || (consumes === 'application/x-www-form-urlencoded'))
-    headers['Content-Type'] = consumes;
-  if (accepts)
-    headers['Accept'] = accepts;
-  return headers;
-}
-
-Operation.prototype.encodeCollection = function(type, name, value) {
-  var encoded = '';
-  var i;
-  if(type === 'default' || type === 'multi') {
-    for(i = 0; i < value.length; i++) {
-      if(i > 0) encoded += '&'
-      encoded += this.encodeQueryParam(name) + '=' + this.encodeQueryParam(value[i]);
-    }
-  }
-  else {
-    var separator = '';
-    if(type === 'csv')
-      separator = ',';
-    else if(type === 'ssv')
-      separator = '%20';
-    else if(type === 'tsv')
-      separator = '\\t';
-    else if(type === 'pipes')
-      separator = '|';
-    if(separator !== '') {
-      for(i = 0; i < value.length; i++) {
-        if(i == 0)
-          encoded = this.encodeQueryParam(name) + '=' + this.encodeQueryParam(value[i]);
-        else
-          encoded += separator + this.encodeQueryParam(value[i]);
-      }
-    }
-  }
-  // TODO: support the different encoding schemes here
-  return encoded;
-}
-
-/**
- * TODO this encoding needs to be changed 
- **/
-Operation.prototype.encodeQueryParam = function(arg) {
-  return escape(arg);
-}
-
-/**
- * TODO revisit, might not want to leave '/'
- **/
-Operation.prototype.encodePathParam = function(pathParam) {
-  var encParts, part, parts, _i, _len;
-  pathParam = pathParam.toString();
-  if (pathParam.indexOf('/') === -1) {
-    return encodeURIComponent(pathParam);
-  } else {
-    parts = pathParam.split('/');
-    encParts = [];
-    for (_i = 0, _len = parts.length; _i < _len; _i++) {
-      part = parts[_i];
-      encParts.push(encodeURIComponent(part));
-    }
-    return encParts.join('/');
-  }
-};
-
-var Model = function(name, definition) {
-  this.name = name;
-  this.definition = definition || {};
-  this.properties = [];
-  var requiredFields = definition.required || [];
-
-  var key;
-  var props = definition.properties;
-  if(props) {
-    for(key in props) {
-      var required = false;
-      var property = props[key];
-      if(requiredFields.indexOf(key) >= 0)
-        required = true;
-      this.properties.push(new Property(key, property, required));
-    }    
-  }
-}
-
-Model.prototype.createJSONSample = function(modelsToIgnore) {
-  var result = {};
-  modelsToIgnore = (modelsToIgnore||{})
-  modelsToIgnore[this.name] = this;
-  var i;
-  for (i = 0; i < this.properties.length; i++) {
-    prop = this.properties[i];
-    result[prop.name] = prop.getSampleValue(modelsToIgnore);
-  }
-  delete modelsToIgnore[this.name];
-  return result;
-};
-
-Model.prototype.getSampleValue = function(modelsToIgnore) {
-  var i;
-  var obj = {};
-  for(i = 0; i < this.properties.length; i++ ) {
-    var property = this.properties[i];
-    obj[property.name] = property.sampleValue(false, modelsToIgnore);
-  }
-  return obj;
-}
-
-Model.prototype.getMockSignature = function(modelsToIgnore) {
-  var propertiesStr = [];
-  var i;
-  for (i = 0; i < this.properties.length; i++) {
-    var prop = this.properties[i];
-    propertiesStr.push(prop.toString());
-  }
-
-  var strong = '<span class="strong">';
-  var stronger = '<span class="stronger">';
-  var strongClose = '</span>';
-  var classOpen = strong + this.name + ' {' + strongClose;
-  var classClose = strong + '}' + strongClose;
-  var returnVal = classOpen + '<div>' + propertiesStr.join(',</div><div>') + '</div>' + classClose;
-  if (!modelsToIgnore)
-    modelsToIgnore = {};
-
-  modelsToIgnore[this.name] = this;
-  var i;
-  for (i = 0; i < this.properties.length; i++) {
-    var prop = this.properties[i];
-    var ref = prop['$ref'];
-    var model = models[ref];
-    if (model && typeof modelsToIgnore[model.name] === 'undefined') {
-      returnVal = returnVal + ('<br>' + model.getMockSignature(modelsToIgnore));
-    }
-  }
-  return returnVal;
-};
-
-var Property = function(name, obj, required) {
-  this.schema = obj;
-  this.required = required;
-  if(obj['$ref']) {
-    var refType = obj['$ref'];
-    refType = refType.indexOf('#/definitions') === -1 ? refType : refType.substring('#/definitions').length;
-    this['$ref'] = refType;
-  }
-  else if (obj.type === 'array') {
-    if(obj.items['$ref'])
-      this['$ref'] = obj.items['$ref'];
-    else
-      obj = obj.items;
-  }
-  this.name = name;
-  this.description = obj.description;
-  this.obj = obj;
-  this.optional = true;
-  this.default = obj.default || null;
-  this.example = obj.example || null;
-}
-
-Property.prototype.getSampleValue = function (modelsToIgnore) {
-  return this.sampleValue(false, modelsToIgnore);
-}
-
-Property.prototype.isArray = function () {
-  var schema = this.schema;
-  if(schema.type === 'array')
-    return true;
-  else
-    return false;
-}
-
-Property.prototype.sampleValue = function(isArray, ignoredModels) {
-  isArray = (isArray || this.isArray());
-  ignoredModels = (ignoredModels || {});
-  var type = getStringSignature(this.obj);
-  var output;
-
-  if(this['$ref']) {
-    var refModel = models[this['$ref']];
-    if(refModel && typeof ignoredModels[type] === 'undefined') {
-      ignoredModels[type] = this;
-      output = refModel.getSampleValue(ignoredModels);
-    }
-    else
-      type = refModel;
-  }
-  else if(this.example)
-    output = this.example;
-  else if(this.default)
-    output = this.default;
-  else if(type === 'date-time')
-    output = new Date().toISOString();
-  else if(type === 'string')
-    output = 'string';
-  else if(type === 'integer')
-    output = 0;
-  else if(type === 'long')
-    output = 0;
-  else if(type === 'float')
-    output = 0.0;
-  else if(type === 'double')
-    output = 0.0;
-  else if(type === 'boolean')
-    output = true;
-  else
-    output = {};
-  ignoredModels[type] = output;
-  if(isArray)
-    return [output];
-  else
-    return output;
-}
-
-getStringSignature = function(obj) {
-  var str = '';
-  if(obj.type === 'array') {
-    obj = (obj.items || obj['$ref'] || {});
-    str += 'Array[';
-  }
-  if(obj.type === 'integer' && obj.format === 'int32')
-    str += 'integer';
-  else if(obj.type === 'integer' && obj.format === 'int64')
-    str += 'long';
-  else if(obj.type === 'integer' && typeof obj.format === 'undefined')
-    str += 'long';
-  else if(obj.type === 'string' && obj.format === 'date-time')
-    str += 'date-time';
-  else if(obj.type === 'string' && obj.format === 'date')
-    str += 'date';
-  else if(obj.type === 'number' && obj.format === 'float')
-    str += 'float';
-  else if(obj.type === 'number' && obj.format === 'double')
-    str += 'double';
-  else if(obj.type === 'number' && typeof obj.format === 'undefined')
-    str += 'double';
-  else if(obj.type === 'boolean')
-    str += 'boolean';
-  else
-    str += obj.type || obj['$ref'];
-  if(obj.type === 'array')
-    str += ']';
-  return str;
-}
-
-simpleRef = function(name) {
-  if(name.indexOf("#/definitions/") === 0)
-    return name.substring('#/definitions/'.length)
-  else
-    return name;
-}
-
-Property.prototype.toString = function() {
-  var str = getStringSignature(this.obj);
-  if(str !== '') {
-    str = '<span class="propName ' + this.required + '">' + this.name + '</span> (<span class="propType">' + str + '</span>';
-    if(!this.required)
-      str += ', <span class="propOptKey">optional</span>';
-    str += ')';
-  }
-  else 
-    str = this.name + ' (' + JSON.stringify(this.obj) + ')';
-
-  if(typeof this.description !== 'undefined')
-    str += ': ' + this.description;
-  return str;
-}
-
-typeFromJsonSchema = function(type, format) {
-  var str;
-  if(type === 'integer' && format === 'int32')
-    str = 'integer';
-  else if(type === 'integer' && format === 'int64')
-    str = 'long';
-  else if(type === 'integer' && typeof format === 'undefined')
-    str = 'long';
-  else if(type === 'string' && format === 'date-time')
-    str = 'date-time';
-  else if(type === 'string' && format === 'date')
-    str = 'date';
-  else if(type === 'number' && format === 'float')
-    str = 'float';
-  else if(type === 'number' && format === 'double')
-    str = 'double';
-  else if(type === 'number' && typeof format === 'undefined')
-    str = 'double';
-  else if(type === 'boolean')
-    str = 'boolean';
-  else if(type === 'string')
-    str = 'string';
-
-  return str;
-}
-
-var e = (typeof window !== 'undefined' ? window : exports);
-
-var sampleModels = {};
-var cookies = {};
-var models = {};
-
-e.authorizations = new SwaggerAuthorizations();
-e.ApiKeyAuthorization = ApiKeyAuthorization;
-e.PasswordAuthorization = PasswordAuthorization;
-e.CookieAuthorization = CookieAuthorization;
-e.SwaggerClient = SwaggerClient;
-
-/**
- * SwaggerHttp is a wrapper for executing requests
- */
-var SwaggerHttp = function() {};
-
-SwaggerHttp.prototype.execute = function(obj) {
-  if(obj && (typeof obj.useJQuery === 'boolean'))
-    this.useJQuery = obj.useJQuery;
-  else
-    this.useJQuery = this.isIE8();
-
-  if(this.useJQuery)
-    return new JQueryHttpClient().execute(obj);
-  else
-    return new ShredHttpClient().execute(obj);
-}
-
-SwaggerHttp.prototype.isIE8 = function() {
-  var detectedIE = false;
-  if (typeof navigator !== 'undefined' && navigator.userAgent) {
-    nav = navigator.userAgent.toLowerCase();
-    if (nav.indexOf('msie') !== -1) {
-      var version = parseInt(nav.split('msie')[1]);
-      if (version <= 8) {
-        detectedIE = true;
-      }
-    }
-  }
-  return detectedIE;
-};
-
-/*
- * JQueryHttpClient lets a browser take advantage of JQuery's cross-browser magic.
- * NOTE: when jQuery is available it will export both '$' and 'jQuery' to the global space.
- *       Since we are using closures here we need to alias it for internal use.
- */
-var JQueryHttpClient = function(options) {
-  "use strict";
-  if(!jQuery){
-    var jQuery = window.jQuery;
-  }
-}
-
-JQueryHttpClient.prototype.execute = function(obj) {
-  var cb = obj.on;
-  var request = obj;
-
-  obj.type = obj.method;
-  obj.cache = false;
-
-  obj.beforeSend = function(xhr) {
-    var key, results;
-    if (obj.headers) {
-      results = [];
-      var key;
-      for (key in obj.headers) {
-        if (key.toLowerCase() === "content-type") {
-          results.push(obj.contentType = obj.headers[key]);
-        } else if (key.toLowerCase() === "accept") {
-          results.push(obj.accepts = obj.headers[key]);
-        } else {
-          results.push(xhr.setRequestHeader(key, obj.headers[key]));
-        }
-      }
-      return results;
-    }
-  };
-
-  obj.data = obj.body;
-  obj.complete = function(response, textStatus, opts) {
-    var headers = {},
-        headerArray = response.getAllResponseHeaders().split("\n");
-
-    for(var i = 0; i < headerArray.length; i++) {
-      var toSplit = headerArray[i].trim();
-      if(toSplit.length === 0)
-        continue;
-      var separator = toSplit.indexOf(":");
-      if(separator === -1) {
-        // Name but no value in the header
-        headers[toSplit] = null;
-        continue;
-      }
-      var name = toSplit.substring(0, separator).trim(),
-          value = toSplit.substring(separator + 1).trim();
-      headers[name] = value;
-    }
-
-    var out = {
-      url: request.url,
-      method: request.method,
-      status: response.status,
-      data: response.responseText,
-      headers: headers
-    };
-
-    var contentType = (headers["content-type"]||headers["Content-Type"]||null)
-
-    if(contentType != null) {
-      if(contentType.indexOf("application/json") == 0 || contentType.indexOf("+json") > 0) {
-        if(response.responseText && response.responseText !== "")
-          out.obj = JSON.parse(response.responseText);
-        else
-          out.obj = {}
-      }
-    }
-
-    if(response.status >= 200 && response.status < 300)
-      cb.response(out);
-    else if(response.status === 0 || (response.status >= 400 && response.status < 599))
-      cb.error(out);
-    else
-      return cb.response(out);
-  };
-
-  jQuery.support.cors = true;
-  return jQuery.ajax(obj);
-}
-
-/*
- * ShredHttpClient is a light-weight, node or browser HTTP client
- */
-var ShredHttpClient = function(options) {
-  this.options = (options||{});
-  this.isInitialized = false;
-
-  var identity, toString;
-
-  if (typeof window !== 'undefined') {
-    this.Shred = require("./shred");
-    this.content = require("./shred/content");
-  }
-  else
-    this.Shred = require("shred");
-  this.shred = new this.Shred(options);
-}
-
-ShredHttpClient.prototype.initShred = function () {
-  this.isInitialized = true;
-  this.registerProcessors(this.shred);
-}
-
-ShredHttpClient.prototype.registerProcessors = function(shred) {
-  var identity = function(x) {
-    return x;
-  };
-  var toString = function(x) {
-    return x.toString();
-  };
-
-  if (typeof window !== 'undefined') {
-    this.content.registerProcessor(["application/json; charset=utf-8", "application/json", "json"], {
-      parser: identity,
-      stringify: toString
-    });
-  } else {
-    this.Shred.registerProcessor(["application/json; charset=utf-8", "application/json", "json"], {
-      parser: identity,
-      stringify: toString
-    });
-  }
-}
-
-ShredHttpClient.prototype.execute = function(obj) {
-  if(!this.isInitialized)
-    this.initShred();
-
-  var cb = obj.on, res;
-
-  var transform = function(response) {
-    var out = {
-      headers: response._headers,
-      url: response.request.url,
-      method: response.request.method,
-      status: response.status,
-      data: response.content.data
-    };
-
-    var contentType = (response._headers["content-type"]||response._headers["Content-Type"]||null)
-
-    if(contentType != null) {
-      if(contentType.indexOf("application/json") == 0 || contentType.indexOf("+json") > 0) {
-        if(response.content.data && response.content.data !== "")
-          try{
-            out.obj = JSON.parse(response.content.data);
-          }
-          catch (e) {
-            // unable to parse
-          }
-        else
-          out.obj = {}
-      }
-    }
-    return out;
-  };
-
-  res = {
-    error: function(response) {
-      if (obj)
-        return cb.error(transform(response));
-    },
-    redirect: function(response) {
-      if (obj)
-        return cb.redirect(transform(response));
-    },
-    307: function(response) {
-      if (obj)
-        return cb.redirect(transform(response));
-    },
-    response: function(response) {
-      if (obj)
-        return cb.response(transform(response));
-    }
-  };
-  if (obj) {
-    obj.on = res;
-  }
-  return this.shred.request(obj);
-};
\ No newline at end of file
diff --git a/src/main/webapp/public/docs/lib/swagger-oauth.js b/src/main/webapp/public/docs/lib/swagger-oauth.js
deleted file mode 100644
index 8bb17fb07..000000000
--- a/src/main/webapp/public/docs/lib/swagger-oauth.js
+++ /dev/null
@@ -1,211 +0,0 @@
-var appName;
-var popupMask;
-var popupDialog;
-var clientId;
-var realm;
-
-function handleLogin() {
-  var scopes = [];
-
-  if(window.swaggerUi.api.authSchemes 
-    && window.swaggerUi.api.authSchemes.oauth2
-    && window.swaggerUi.api.authSchemes.oauth2.scopes) {
-    scopes = window.swaggerUi.api.authSchemes.oauth2.scopes;
-  }
-
-  if(window.swaggerUi.api
-    && window.swaggerUi.api.info) {
-    appName = window.swaggerUi.api.info.title;
-  }
-
-  if(popupDialog.length > 0)
-    popupDialog = popupDialog.last();
-  else {
-    popupDialog = $(
-      [
-        '<div class="api-popup-dialog">',
-        '<div class="api-popup-title">Select OAuth2.0 Scopes</div>',
-        '<div class="api-popup-content">',
-          '<p>Scopes are used to grant an application different levels of access to data on behalf of the end user. Each API may declare one or more scopes.',
-            '<a href="#">Learn how to use</a>',
-          '</p>',
-          '<p><strong>' + appName + '</strong> API requires the following scopes. Select which ones you want to grant to Swagger UI.</p>',
-          '<ul class="api-popup-scopes">',
-          '</ul>',
-          '<p class="error-msg"></p>',
-          '<div class="api-popup-actions"><button class="api-popup-authbtn api-button green" type="button">Authorize</button><button class="api-popup-cancel api-button gray" type="button">Cancel</button></div>',
-        '</div>',
-        '</div>'].join(''));
-    $(document.body).append(popupDialog);
-
-    popup = popupDialog.find('ul.api-popup-scopes').empty();
-    for (i = 0; i < scopes.length; i ++) {
-      scope = scopes[i];
-      str = '<li><input type="checkbox" id="scope_' + i + '" scope="' + scope.scope + '"/>' + '<label for="scope_' + i + '">' + scope.scope;
-      if (scope.description) {
-        str += '<br/><span class="api-scope-desc">' + scope.description + '</span>';
-      }
-      str += '</label></li>';
-      popup.append(str);
-    }
-  }
-
-  var $win = $(window),
-    dw = $win.width(),
-    dh = $win.height(),
-    st = $win.scrollTop(),
-    dlgWd = popupDialog.outerWidth(),
-    dlgHt = popupDialog.outerHeight(),
-    top = (dh -dlgHt)/2 + st,
-    left = (dw - dlgWd)/2;
-
-  popupDialog.css({
-    top: (top < 0? 0 : top) + 'px',
-    left: (left < 0? 0 : left) + 'px'
-  });
-
-  popupDialog.find('button.api-popup-cancel').click(function() {
-    popupMask.hide();
-    popupDialog.hide();
-  });
-  popupDialog.find('button.api-popup-authbtn').click(function() {
-    popupMask.hide();
-    popupDialog.hide();
-
-    var authSchemes = window.swaggerUi.api.authSchemes;
-    var host = window.location;
-    var pathname = location.pathname.substring(0, location.pathname.lastIndexOf("/"));
-    var redirectUrl = host.protocol + '//' + host.host + pathname + "/o2c.html";
-    var url = null;
-
-    for (var key in authSchemes) {
-      if (authSchemes.hasOwnProperty(key)) {
-        var o = authSchemes[key].grantTypes;
-        for(var t in o) {
-          if(o.hasOwnProperty(t) && t === 'implicit') {
-            var dets = o[t];
-            url = dets.loginEndpoint.url + "?response_type=token";
-            window.swaggerUi.tokenName = dets.tokenName;
-          }
-        }
-      }
-    }
-    var scopes = []
-    var o = $('.api-popup-scopes').find('input:checked');
-
-    for(k =0; k < o.length; k++) {
-      scopes.push($(o[k]).attr("scope"));
-    }
-
-    window.enabledScopes=scopes;
-
-    url += '&redirect_uri=' + encodeURIComponent(redirectUrl);
-    url += '&realm=' + encodeURIComponent(realm);
-    url += '&client_id=' + encodeURIComponent(clientId);
-    url += '&scope=' + encodeURIComponent(scopes);
-
-    window.open(url);
-  });
-
-  popupMask.show();
-  popupDialog.show();
-  return;
-}
-
-
-function handleLogout() {
-  for(key in window.authorizations.authz){
-    window.authorizations.remove(key)
-  }
-  window.enabledScopes = null;
-  $('.api-ic.ic-on').addClass('ic-off');
-  $('.api-ic.ic-on').removeClass('ic-on');
-
-  // set the info box
-  $('.api-ic.ic-warning').addClass('ic-error');
-  $('.api-ic.ic-warning').removeClass('ic-warning');
-}
-
-function initOAuth(opts) {
-  var o = (opts||{});
-  var errors = [];
-
-  appName = (o.appName||errors.push("missing appName"));
-  popupMask = (o.popupMask||$('#api-common-mask'));
-  popupDialog = (o.popupDialog||$('.api-popup-dialog'));
-  clientId = (o.clientId||errors.push("missing client id"));
-  realm = (o.realm||errors.push("missing realm"));
-
-  if(errors.length > 0){
-    log("auth unable initialize oauth: " + errors);
-    return;
-  }
-
-  $('pre code').each(function(i, e) {hljs.highlightBlock(e)});
-  $('.api-ic').click(function(s) {
-    if($(s.target).hasClass('ic-off'))
-      handleLogin();
-    else {
-      handleLogout();
-    }
-    false;
-  });
-}
-
-function onOAuthComplete(token) {
-  if(token) {
-    if(token.error) {
-      var checkbox = $('input[type=checkbox],.secured')
-      checkbox.each(function(pos){
-        checkbox[pos].checked = false;
-      });
-      alert(token.error);
-    }
-    else {
-      var b = token[window.swaggerUi.tokenName];
-      if(b){
-        // if all roles are satisfied
-        var o = null;
-        $.each($('.auth #api_information_panel'), function(k, v) {
-          var children = v;
-          if(children && children.childNodes) {
-            var requiredScopes = [];
-            $.each((children.childNodes), function (k1, v1){
-              var inner = v1.innerHTML;
-              if(inner)
-                requiredScopes.push(inner);
-            });
-            var diff = [];
-            for(var i=0; i < requiredScopes.length; i++) {
-              var s = requiredScopes[i];
-              if(window.enabledScopes && window.enabledScopes.indexOf(s) == -1) {
-                diff.push(s);
-              }
-            }
-            if(diff.length > 0){
-              o = v.parentNode;
-              $(o.parentNode).find('.api-ic.ic-on').addClass('ic-off');
-              $(o.parentNode).find('.api-ic.ic-on').removeClass('ic-on');
-
-              // sorry, not all scopes are satisfied
-              $(o).find('.api-ic').addClass('ic-warning');
-              $(o).find('.api-ic').removeClass('ic-error');
-            }
-            else {
-              o = v.parentNode;
-              $(o.parentNode).find('.api-ic.ic-off').addClass('ic-on');
-              $(o.parentNode).find('.api-ic.ic-off').removeClass('ic-off');
-
-              // all scopes are satisfied
-              $(o).find('.api-ic').addClass('ic-info');
-              $(o).find('.api-ic').removeClass('ic-warning');
-              $(o).find('.api-ic').removeClass('ic-error');          
-            }
-          }
-        });
-
-        window.authorizations.add("oauth2", new ApiKeyAuthorization("Authorization", "Bearer " + b, "header"));
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/main/webapp/public/docs/lib/swagger.js b/src/main/webapp/public/docs/lib/swagger.js
deleted file mode 100644
index 20b5ed2be..000000000
--- a/src/main/webapp/public/docs/lib/swagger.js
+++ /dev/null
@@ -1,1678 +0,0 @@
-// swagger.js
-// version 2.0.41
-
-(function () {
-
-  var __bind = function (fn, me) {
-    return function () {
-      return fn.apply(me, arguments);
-    };
-  };
-
-  var log = function () {
-    log.history = log.history || [];
-    log.history.push(arguments);
-    if (this.console) {
-      console.log(Array.prototype.slice.call(arguments)[0]);
-    }
-  };
-
-  // if you want to apply conditional formatting of parameter values
-  var parameterMacro = function (value) {
-    return value;
-  }
-
-  // if you want to apply conditional formatting of model property values
-  var modelPropertyMacro = function (value) {
-    return value;
-  }
-
-  if (!Array.prototype.indexOf) {
-    Array.prototype.indexOf = function (obj, start) {
-      for (var i = (start || 0), j = this.length; i < j; i++) {
-        if (this[i] === obj) { return i; }
-      }
-      return -1;
-    }
-  }
-
-  if (!('filter' in Array.prototype)) {
-    Array.prototype.filter = function (filter, that /*opt*/) {
-      var other = [], v;
-      for (var i = 0, n = this.length; i < n; i++)
-        if (i in this && filter.call(that, v = this[i], i, this))
-          other.push(v);
-      return other;
-    };
-  }
-
-  if (!('map' in Array.prototype)) {
-    Array.prototype.map = function (mapper, that /*opt*/) {
-      var other = new Array(this.length);
-      for (var i = 0, n = this.length; i < n; i++)
-        if (i in this)
-          other[i] = mapper.call(that, this[i], i, this);
-      return other;
-    };
-  }
-
-  Object.keys = Object.keys || (function () {
-    var hasOwnProperty = Object.prototype.hasOwnProperty,
-      hasDontEnumBug = !{ toString: null }.propertyIsEnumerable("toString"),
-      DontEnums = [
-      'toString',
-      'toLocaleString',
-      'valueOf',
-      'hasOwnProperty',
-      'isPrototypeOf',
-      'propertyIsEnumerable',
-      'constructor'
-      ],
-    DontEnumsLength = DontEnums.length;
-
-    return function (o) {
-      if (typeof o != "object" && typeof o != "function" || o === null)
-        throw new TypeError("Object.keys called on a non-object");
-
-      var result = [];
-      for (var name in o) {
-        if (hasOwnProperty.call(o, name))
-          result.push(name);
-      }
-
-      if (hasDontEnumBug) {
-        for (var i = 0; i < DontEnumsLength; i++) {
-          if (hasOwnProperty.call(o, DontEnums[i]))
-            result.push(DontEnums[i]);
-        }
-      }
-
-      return result;
-    };
-  })();
-
-  var SwaggerApi = function (url, options) {
-    this.isBuilt = false;
-    this.url = null;
-    this.debug = false;
-    this.basePath = null;
-    this.authorizations = null;
-    this.authorizationScheme = null;
-    this.info = null;
-    this.useJQuery = false;
-    this.modelsArray = [];
-    this.isValid;
-
-    options = (options || {});
-    if (url)
-      if (url.url)
-        options = url;
-      else
-        this.url = url;
-    else
-      options = url;
-
-    if (options.url != null)
-      this.url = options.url;
-
-    if (options.success != null)
-      this.success = options.success;
-
-    if (typeof options.useJQuery === 'boolean')
-      this.useJQuery = options.useJQuery;
-
-    this.failure = options.failure != null ? options.failure : function () { };
-    this.progress = options.progress != null ? options.progress : function () { };
-    if (options.success != null) {
-      this.build();
-      this.isBuilt = true;
-    }
-  }
-
-  SwaggerApi.prototype.build = function () {
-    if (this.isBuilt)
-      return this;
-    var _this = this;
-    this.progress('fetching resource list: ' + this.url);
-    var obj = {
-      useJQuery: this.useJQuery,
-      url: this.url,
-      method: "get",
-      headers: {
-        accept: "application/json,application/json;charset=\"utf-8\",*/*"
-      },
-      on: {
-        error: function (response) {
-          if (_this.url.substring(0, 4) !== 'http') {
-            return _this.fail('Please specify the protocol for ' + _this.url);
-          } else if (response.status === 0) {
-            return _this.fail('Can\'t read from server.  It may not have the appropriate access-control-origin settings.');
-          } else if (response.status === 404) {
-            return _this.fail('Can\'t read swagger JSON from ' + _this.url);
-          } else {
-            return _this.fail(response.status + ' : ' + response.statusText + ' ' + _this.url);
-          }
-        },
-        response: function (resp) {
-          var responseObj = resp.obj || JSON.parse(resp.data);
-          _this.swaggerVersion = responseObj.swaggerVersion;
-          if (_this.swaggerVersion === "1.2") {
-            return _this.buildFromSpec(responseObj);
-          } else {
-            return _this.buildFrom1_1Spec(responseObj);
-          }
-        }
-      }
-    };
-    var e = (typeof window !== 'undefined' ? window : exports);
-    e.authorizations.apply(obj);
-    new SwaggerHttp().execute(obj);
-    return this;
-  };
-
-  SwaggerApi.prototype.buildFromSpec = function (response) {
-    if (response.apiVersion != null) {
-      this.apiVersion = response.apiVersion;
-    }
-    this.apis = {};
-    this.apisArray = [];
-    this.consumes = response.consumes;
-    this.produces = response.produces;
-    this.authSchemes = response.authorizations;
-    if (response.info != null) {
-      this.info = response.info;
-    }
-    var isApi = false;
-    var i;
-    for (i = 0; i < response.apis.length; i++) {
-      var api = response.apis[i];
-      if (api.operations) {
-        var j;
-        for (j = 0; j < api.operations.length; j++) {
-          operation = api.operations[j];
-          isApi = true;
-        }
-      }
-    }
-    if (response.basePath)
-      this.basePath = response.basePath;
-    else if (this.url.indexOf('?') > 0)
-      this.basePath = this.url.substring(0, this.url.lastIndexOf('?'));
-    else
-      this.basePath = this.url;
-
-    if (isApi) {
-      var newName = response.resourcePath.replace(/\//g, '');
-      this.resourcePath = response.resourcePath;
-      var res = new SwaggerResource(response, this);
-      this.apis[newName] = res;
-      this.apisArray.push(res);
-    } else {
-      var k;
-      for (k = 0; k < response.apis.length; k++) {
-        var resource = response.apis[k];
-        var res = new SwaggerResource(resource, this);
-        this.apis[res.name] = res;
-        this.apisArray.push(res);
-      }
-    }
-    this.isValid = true;
-    if (this.success) {
-      this.success();
-    }
-    return this;
-  };
-
-  SwaggerApi.prototype.buildFrom1_1Spec = function (response) {
-    log("This API is using a deprecated version of Swagger!  Please see http://github.com/wordnik/swagger-core/wiki for more info");
-    if (response.apiVersion != null)
-      this.apiVersion = response.apiVersion;
-    this.apis = {};
-    this.apisArray = [];
-    this.produces = response.produces;
-    if (response.info != null) {
-      this.info = response.info;
-    }
-    var isApi = false;
-    for (var i = 0; i < response.apis.length; i++) {
-      var api = response.apis[i];
-      if (api.operations) {
-        for (var j = 0; j < api.operations.length; j++) {
-          operation = api.operations[j];
-          isApi = true;
-        }
-      }
-    }
-    if (response.basePath) {
-      this.basePath = response.basePath;
-    } else if (this.url.indexOf('?') > 0) {
-      this.basePath = this.url.substring(0, this.url.lastIndexOf('?'));
-    } else {
-      this.basePath = this.url;
-    }
-    if (isApi) {
-      var newName = response.resourcePath.replace(/\//g, '');
-      this.resourcePath = response.resourcePath;
-      var res = new SwaggerResource(response, this);
-      this.apis[newName] = res;
-      this.apisArray.push(res);
-    } else {
-      for (k = 0; k < response.apis.length; k++) {
-        resource = response.apis[k];
-        var res = new SwaggerResource(resource, this);
-        this.apis[res.name] = res;
-        this.apisArray.push(res);
-      }
-    }
-    this.isValid = true;
-    if (this.success) {
-      this.success();
-    }
-    return this;
-  };
-
-  SwaggerApi.prototype.selfReflect = function () {
-    var resource, resource_name, _ref;
-    if (this.apis == null) {
-      return false;
-    }
-    _ref = this.apis;
-    for (resource_name in _ref) {
-      resource = _ref[resource_name];
-      if (resource.ready == null) {
-        return false;
-      }
-    }
-    this.setConsolidatedModels();
-    this.ready = true;
-    if (this.success != null) {
-      return this.success();
-    }
-  };
-
-  SwaggerApi.prototype.fail = function (message) {
-    this.failure(message);
-    throw message;
-  };
-
-  SwaggerApi.prototype.setConsolidatedModels = function () {
-    var model, modelName, resource, resource_name, _i, _len, _ref, _ref1, _results;
-    this.models = {};
-    _ref = this.apis;
-    for (resource_name in _ref) {
-      resource = _ref[resource_name];
-      for (modelName in resource.models) {
-        if (this.models[modelName] == null) {
-          this.models[modelName] = resource.models[modelName];
-          this.modelsArray.push(resource.models[modelName]);
-        }
-      }
-    }
-    _ref1 = this.modelsArray;
-    _results = [];
-    for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
-      model = _ref1[_i];
-      _results.push(model.setReferencedModels(this.models));
-    }
-    return _results;
-  };
-
-  SwaggerApi.prototype.help = function () {
-    var operation, operation_name, parameter, resource, resource_name, _i, _len, _ref, _ref1, _ref2;
-    _ref = this.apis;
-    for (resource_name in _ref) {
-      resource = _ref[resource_name];
-      log(resource_name);
-      _ref1 = resource.operations;
-      for (operation_name in _ref1) {
-        operation = _ref1[operation_name];
-        log("  " + operation.nickname);
-        _ref2 = operation.parameters;
-        for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-          parameter = _ref2[_i];
-          log("  " + parameter.name + (parameter.required ? ' (required)' : '') + " - " + parameter.description);
-        }
-      }
-    }
-    return this;
-  };
-
-  var SwaggerResource = function (resourceObj, api) {
-    var _this = this;
-    this.api = api;
-    this.api = this.api;
-    var consumes = (this.consumes | []);
-    var produces = (this.produces | []);
-    this.path = this.api.resourcePath != null ? this.api.resourcePath : resourceObj.path;
-    this.description = resourceObj.description;
-
-    var parts = this.path.split("/");
-    this.name = parts[parts.length - 1].replace('.{format}', '');
-    this.basePath = this.api.basePath;
-    this.operations = {};
-    this.operationsArray = [];
-    this.modelsArray = [];
-    this.models = {};
-    this.rawModels = {};
-    this.useJQuery = (typeof api.useJQuery !== 'undefined' ? api.useJQuery : null);
-
-    if ((resourceObj.apis != null) && (this.api.resourcePath != null)) {
-      this.addApiDeclaration(resourceObj);
-    } else {
-      if (this.path == null) {
-        this.api.fail("SwaggerResources must have a path.");
-      }
-      if (this.path.substring(0, 4) === 'http') {
-        this.url = this.path.replace('{format}', 'json');
-      } else {
-        this.url = this.api.basePath + this.path.replace('{format}', 'json');
-      }
-      this.api.progress('fetching resource ' + this.name + ': ' + this.url);
-      var obj = {
-        url: this.url,
-        method: "get",
-        useJQuery: this.useJQuery,
-        headers: {
-          accept: "application/json,application/json;charset=\"utf-8\",*/*"
-        },
-        on: {
-          response: function (resp) {
-            var responseObj = resp.obj || JSON.parse(resp.data);
-            return _this.addApiDeclaration(responseObj);
-          },
-          error: function (response) {
-            return _this.api.fail("Unable to read api '" +
-              _this.name + "' from path " + _this.url + " (server returned " + response.statusText + ")");
-          }
-        }
-      };
-      var e = typeof window !== 'undefined' ? window : exports;
-      e.authorizations.apply(obj);
-      new SwaggerHttp().execute(obj);
-    }
-  }
-
-  SwaggerResource.prototype.getAbsoluteBasePath = function (relativeBasePath) {
-    var pos, url;
-    url = this.api.basePath;
-    pos = url.lastIndexOf(relativeBasePath);
-    var parts = url.split("/");
-    var rootUrl = parts[0] + "//" + parts[2];
-
-    if (relativeBasePath.indexOf("http") === 0)
-      return relativeBasePath;
-    if (relativeBasePath === "/")
-      return rootUrl;
-    if (relativeBasePath.substring(0, 1) == "/") {
-      // use root + relative
-      return rootUrl + relativeBasePath;
-    }
-    else {
-      var pos = this.basePath.lastIndexOf("/");
-      var base = this.basePath.substring(0, pos);
-      if (base.substring(base.length - 1) == "/")
-        return base + relativeBasePath;
-      else
-        return base + "/" + relativeBasePath;
-    }
-  };
-
-  SwaggerResource.prototype.addApiDeclaration = function (response) {
-    if (response.produces != null)
-      this.produces = response.produces;
-    if (response.consumes != null)
-      this.consumes = response.consumes;
-    if ((response.basePath != null) && response.basePath.replace(/\s/g, '').length > 0)
-      this.basePath = response.basePath.indexOf("http") === -1 ? this.getAbsoluteBasePath(response.basePath) : response.basePath;
-
-    this.addModels(response.models);
-    if (response.apis) {
-      for (var i = 0 ; i < response.apis.length; i++) {
-        var endpoint = response.apis[i];
-        this.addOperations(endpoint.path, endpoint.operations, response.consumes, response.produces);
-      }
-    }
-    this.api[this.name] = this;
-    this.ready = true;
-    return this.api.selfReflect();
-  };
-
-  SwaggerResource.prototype.addModels = function (models) {
-    if (models != null) {
-      var modelName;
-      for (modelName in models) {
-        if (this.models[modelName] == null) {
-          var swaggerModel = new SwaggerModel(modelName, models[modelName]);
-          this.modelsArray.push(swaggerModel);
-          this.models[modelName] = swaggerModel;
-          this.rawModels[modelName] = models[modelName];
-        }
-      }
-      var output = [];
-      for (var i = 0; i < this.modelsArray.length; i++) {
-        var model = this.modelsArray[i];
-        output.push(model.setReferencedModels(this.models));
-      }
-      return output;
-    }
-  };
-
-  SwaggerResource.prototype.addOperations = function (resource_path, ops, consumes, produces) {
-    if (ops) {
-      var output = [];
-      for (var i = 0; i < ops.length; i++) {
-        var o = ops[i];
-        consumes = this.consumes;
-        produces = this.produces;
-        if (o.consumes != null)
-          consumes = o.consumes;
-        else
-          consumes = this.consumes;
-
-        if (o.produces != null)
-          produces = o.produces;
-        else
-          produces = this.produces;
-        var type = (o.type || o.responseClass);
-
-        if (type === "array") {
-          ref = null;
-          if (o.items)
-            ref = o.items["type"] || o.items["$ref"];
-          type = "array[" + ref + "]";
-        }
-        var responseMessages = o.responseMessages;
-        var method = o.method;
-        if (o.httpMethod) {
-          method = o.httpMethod;
-        }
-        if (o.supportedContentTypes) {
-          consumes = o.supportedContentTypes;
-        }
-        if (o.errorResponses) {
-          responseMessages = o.errorResponses;
-          for (var j = 0; j < responseMessages.length; j++) {
-            r = responseMessages[j];
-            r.message = r.reason;
-            r.reason = null;
-          }
-        }
-        o.nickname = this.sanitize(o.nickname);
-        var op = new SwaggerOperation(o.nickname, resource_path, method, o.parameters, o.summary, o.notes, type, responseMessages, this, consumes, produces, o.authorizations);
-        this.operations[op.nickname] = op;
-        output.push(this.operationsArray.push(op));
-      }
-      return output;
-    }
-  };
-
-  SwaggerResource.prototype.sanitize = function (nickname) {
-    var op;
-    op = nickname.replace(/[\s!@#$%^&*()_+=\[{\]};:<>|.\/?,\\'""-]/g, '_');
-    op = op.replace(/((_){2,})/g, '_');
-    op = op.replace(/^(_)*/g, '');
-    op = op.replace(/([_])*$/g, '');
-    return op;
-  };
-
-  SwaggerResource.prototype.help = function () {
-    var op = this.operations;
-    var output = [];
-    var operation_name;
-    for (operation_name in op) {
-      operation = op[operation_name];
-      var msg = "  " + operation.nickname;
-      for (var i = 0; i < operation.parameters; i++) {
-        parameter = operation.parameters[i];
-        msg.concat("  " + parameter.name + (parameter.required ? ' (required)' : '') + " - " + parameter.description);
-      }
-      output.push(msg);
-    }
-    return output;
-  };
-
-  var SwaggerModel = function (modelName, obj) {
-    this.name = obj.id != null ? obj.id : modelName;
-    this.properties = [];
-    var propertyName;
-    for (propertyName in obj.properties) {
-      if (obj.required != null) {
-        var value;
-        for (value in obj.required) {
-          if (propertyName === obj.required[value]) {
-            obj.properties[propertyName].required = true;
-          }
-        }
-      }
-      var prop = new SwaggerModelProperty(propertyName, obj.properties[propertyName]);
-      this.properties.push(prop);
-    }
-  }
-
-  SwaggerModel.prototype.setReferencedModels = function (allModels) {
-    var results = [];
-    for (var i = 0; i < this.properties.length; i++) {
-      var property = this.properties[i];
-      var type = property.type || property.dataType;
-      if (allModels[type] != null)
-        results.push(property.refModel = allModels[type]);
-      else if ((property.refDataType != null) && (allModels[property.refDataType] != null))
-        results.push(property.refModel = allModels[property.refDataType]);
-      else
-        results.push(void 0);
-    }
-    return results;
-  };
-
-  SwaggerModel.prototype.getMockSignature = function (modelsToIgnore) {
-    var propertiesStr = [];
-    for (var i = 0; i < this.properties.length; i++) {
-      var prop = this.properties[i];
-      propertiesStr.push(prop.toString());
-    }
-
-    var strong = '<span class="strong">';
-    var stronger = '<span class="stronger">';
-    var strongClose = '</span>';
-    var classOpen = strong + this.name + ' {' + strongClose;
-    var classClose = strong + '}' + strongClose;
-    var returnVal = classOpen + '<div>' + propertiesStr.join(',</div><div>') + '</div>' + classClose;
-    if (!modelsToIgnore)
-      modelsToIgnore = [];
-    modelsToIgnore.push(this.name);
-
-    for (var i = 0; i < this.properties.length; i++) {
-      var prop = this.properties[i];
-      if ((prop.refModel != null) && modelsToIgnore.indexOf(prop.refModel.name) === -1) {
-        returnVal = returnVal + ('<br>' + prop.refModel.getMockSignature(modelsToIgnore));
-      }
-    }
-    return returnVal;
-  };
-
-  SwaggerModel.prototype.createJSONSample = function (modelsToIgnore) {
-    if (sampleModels[this.name]) {
-      return sampleModels[this.name];
-    }
-    else {
-      var result = {};
-      var modelsToIgnore = (modelsToIgnore || [])
-      modelsToIgnore.push(this.name);
-      for (var i = 0; i < this.properties.length; i++) {
-        var prop = this.properties[i];
-        result[prop.name] = prop.getSampleValue(modelsToIgnore);
-      }
-      modelsToIgnore.pop(this.name);
-      return result;
-    }
-  };
-
-  var SwaggerModelProperty = function (name, obj) {
-    this.name = name;
-    this.dataType = obj.type || obj.dataType || obj["$ref"];
-    this.isCollection = this.dataType && (this.dataType.toLowerCase() === 'array' || this.dataType.toLowerCase() === 'list' || this.dataType.toLowerCase() === 'set');
-    this.descr = obj.description;
-    this.required = obj.required;
-    this.defaultValue = modelPropertyMacro(obj.defaultValue);
-    if (obj.items != null) {
-      if (obj.items.type != null) {
-        this.refDataType = obj.items.type;
-      }
-      if (obj.items.$ref != null) {
-        this.refDataType = obj.items.$ref;
-      }
-    }
-    this.dataTypeWithRef = this.refDataType != null ? (this.dataType + '[' + this.refDataType + ']') : this.dataType;
-    if (obj.allowableValues != null) {
-      this.valueType = obj.allowableValues.valueType;
-      this.values = obj.allowableValues.values;
-      if (this.values != null) {
-        this.valuesString = "'" + this.values.join("' or '") + "'";
-      }
-    }
-    if (obj["enum"] != null) {
-      this.valueType = "string";
-      this.values = obj["enum"];
-      if (this.values != null) {
-        this.valueString = "'" + this.values.join("' or '") + "'";
-      }
-    }
-  }
-
-  SwaggerModelProperty.prototype.getSampleValue = function (modelsToIgnore) {
-    var result;
-    if ((this.refModel != null) && (modelsToIgnore.indexOf(this.refModel.name) === -1)) {
-      result = this.refModel.createJSONSample(modelsToIgnore);
-    } else {
-      if (this.isCollection) {
-        result = this.toSampleValue(this.refDataType);
-      } else {
-        result = this.toSampleValue(this.dataType);
-      }
-    }
-    if (this.isCollection) {
-      return [result];
-    } else {
-      return result;
-    }
-  };
-
-  SwaggerModelProperty.prototype.toSampleValue = function (value) {
-    var result;
-    if ((typeof this.defaultValue !== 'undefined') && this.defaultValue !== null) {
-      result = this.defaultValue;
-    } else if (value === "integer") {
-      result = 0;
-    } else if (value === "boolean") {
-      result = false;
-    } else if (value === "double" || value === "number") {
-      result = 0.0;
-    } else if (value === "string") {
-      result = "";
-    } else {
-      result = value;
-    }
-    return result;
-  };
-
-  SwaggerModelProperty.prototype.toString = function () {
-    var req = this.required ? 'propReq' : 'propOpt';
-    var str = '<span class="propName ' + req + '">' + this.name + '</span> (<span class="propType">' + this.dataTypeWithRef + '</span>';
-    if (!this.required) {
-      str += ', <span class="propOptKey">optional</span>';
-    }
-    str += ')';
-    if (this.values != null) {
-      str += " = <span class='propVals'>['" + this.values.join("' or '") + "']</span>";
-    }
-    if (this.descr != null) {
-      str += ': <span class="propDesc">' + this.descr + '</span>';
-    }
-    return str;
-  };
-
-  var SwaggerOperation = function (nickname, path, method, parameters, summary, notes, type, responseMessages, resource, consumes, produces, authorizations) {
-    var _this = this;
-
-    var errors = [];
-    this.nickname = (nickname || errors.push("SwaggerOperations must have a nickname."));
-    this.path = (path || errors.push("SwaggerOperation " + nickname + " is missing path."));
-    this.method = (method || errors.push("SwaggerOperation " + nickname + " is missing method."));
-    this.parameters = parameters != null ? parameters : [];
-    this.summary = summary;
-    this.notes = notes;
-    this.type = type;
-    this.responseMessages = (responseMessages || []);
-    this.resource = (resource || errors.push("Resource is required"));
-    this.consumes = consumes;
-    this.produces = produces;
-    this.authorizations = authorizations;
-    this["do"] = __bind(this["do"], this);
-
-    if (errors.length > 0) {
-      console.error('SwaggerOperation errors', errors, arguments);
-      this.resource.api.fail(errors);
-    }
-
-    this.path = this.path.replace('{format}', 'json');
-    this.method = this.method.toLowerCase();
-    this.isGetMethod = this.method === "get";
-
-    this.resourceName = this.resource.name;
-    if (typeof this.type !== 'undefined' && this.type === 'void')
-      this.type = null;
-    else {
-      this.responseClassSignature = this.getSignature(this.type, this.resource.models);
-      this.responseSampleJSON = this.getSampleJSON(this.type, this.resource.models);
-    }
-
-    for (var i = 0; i < this.parameters.length; i++) {
-      var param = this.parameters[i];
-      // might take this away
-      param.name = param.name || param.type || param.dataType;
-
-      // for 1.1 compatibility
-      var type = param.type || param.dataType;
-      if (type === 'array') {
-        type = 'array[' + (param.items.$ref ? param.items.$ref : param.items.type) + ']';
-      }
-      param.type = type;
-
-      if (type.toLowerCase() === 'boolean') {
-        param.allowableValues = {};
-        param.allowableValues.values = ["true", "false"];
-      }
-      param.signature = this.getSignature(type, this.resource.models);
-      param.sampleJSON = this.getSampleJSON(type, this.resource.models);
-
-      var enumValue = param["enum"];
-      if (enumValue != null) {
-        param.isList = true;
-        param.allowableValues = {};
-        param.allowableValues.descriptiveValues = [];
-
-        for (var j = 0; j < enumValue.length; j++) {
-          var v = enumValue[j];
-          if (param.defaultValue != null) {
-            param.allowableValues.descriptiveValues.push({
-              value: String(v),
-              isDefault: (v === param.defaultValue)
-            });
-          }
-          else {
-            param.allowableValues.descriptiveValues.push({
-              value: String(v),
-              isDefault: false
-            });
-          }
-        }
-      }
-      else if (param.allowableValues != null) {
-        if (param.allowableValues.valueType === "RANGE")
-          param.isRange = true;
-        else
-          param.isList = true;
-        if (param.allowableValues != null) {
-          param.allowableValues.descriptiveValues = [];
-          if (param.allowableValues.values) {
-            for (var j = 0; j < param.allowableValues.values.length; j++) {
-              var v = param.allowableValues.values[j];
-              if (param.defaultValue != null) {
-                param.allowableValues.descriptiveValues.push({
-                  value: String(v),
-                  isDefault: (v === param.defaultValue)
-                });
-              }
-              else {
-                param.allowableValues.descriptiveValues.push({
-                  value: String(v),
-                  isDefault: false
-                });
-              }
-            }
-          }
-        }
-      }
-      param.defaultValue = parameterMacro(param.defaultValue);
-    }
-    this.resource[this.nickname] = function (args, callback, error) {
-      return _this["do"](args, callback, error);
-    };
-    this.resource[this.nickname].help = function () {
-      return _this.help();
-    };
-  }
-
-  SwaggerOperation.prototype.isListType = function (type) {
-    if (type && type.indexOf('[') >= 0) {
-      return type.substring(type.indexOf('[') + 1, type.indexOf(']'));
-    } else {
-      return void 0;
-    }
-  };
-
-  SwaggerOperation.prototype.getSignature = function (type, models) {
-    var isPrimitive, listType;
-    listType = this.isListType(type);
-    isPrimitive = ((listType != null) && models[listType]) || (models[type] != null) ? false : true;
-    if (isPrimitive) {
-      return type;
-    } else {
-      if (listType != null) {
-        return models[listType].getMockSignature();
-      } else {
-        return models[type].getMockSignature();
-      }
-    }
-  };
-
-  SwaggerOperation.prototype.getSampleJSON = function (type, models) {
-    var isPrimitive, listType, val;
-    listType = this.isListType(type);
-    isPrimitive = ((listType != null) && models[listType]) || (models[type] != null) ? false : true;
-    val = isPrimitive ? void 0 : (listType != null ? models[listType].createJSONSample() : models[type].createJSONSample());
-    if (val) {
-      val = listType ? [val] : val;
-      if (typeof val == "string")
-        return val;
-      else if (typeof val === "object") {
-        var t = val;
-        if (val instanceof Array && val.length > 0) {
-          t = val[0];
-        }
-        if (t.nodeName) {
-          var xmlString = new XMLSerializer().serializeToString(t);
-          return this.formatXml(xmlString);
-        }
-        else
-          return JSON.stringify(val, null, 2);
-      }
-      else
-        return val;
-    }
-  };
-
-  SwaggerOperation.prototype["do"] = function (args, opts, callback, error) {
-    var key, param, params, possibleParams, req, requestContentType, responseContentType, value, _i, _len, _ref;
-    if (args == null) {
-      args = {};
-    }
-    if (opts == null) {
-      opts = {};
-    }
-    requestContentType = null;
-    responseContentType = null;
-    if ((typeof args) === "function") {
-      error = opts;
-      callback = args;
-      args = {};
-    }
-    if ((typeof opts) === "function") {
-      error = callback;
-      callback = opts;
-    }
-    if (error == null) {
-      error = function (xhr, textStatus, error) {
-        return log(xhr, textStatus, error);
-      };
-    }
-    if (callback == null) {
-      callback = function (response) {
-        var content;
-        content = null;
-        if (response != null) {
-          content = response.data;
-        } else {
-          content = "no data";
-        }
-        return log("default callback: " + content);
-      };
-    }
-    params = {};
-    params.headers = [];
-    if (args.headers != null) {
-      params.headers = args.headers;
-      delete args.headers;
-    }
-
-    var possibleParams = [];
-    for (var i = 0; i < this.parameters.length; i++) {
-      var param = this.parameters[i];
-      if (param.paramType === 'header') {
-        if (args[param.name])
-          params.headers[param.name] = args[param.name];
-      }
-      else if (param.paramType === 'form' || param.paramType.toLowerCase() === 'file')
-        possibleParams.push(param);
-    }
-
-    if (args.body != null) {
-      params.body = args.body;
-      delete args.body;
-    }
-
-    if (possibleParams) {
-      var key;
-      for (key in possibleParams) {
-        var value = possibleParams[key];
-        if (args[value.name]) {
-          params[value.name] = args[value.name];
-        }
-      }
-    }
-
-    req = new SwaggerRequest(this.method, this.urlify(args), params, opts, callback, error, this);
-    if (opts.mock != null) {
-      return req;
-    } else {
-      return true;
-    }
-  };
-
-  SwaggerOperation.prototype.pathJson = function () {
-    return this.path.replace("{format}", "json");
-  };
-
-  SwaggerOperation.prototype.pathXml = function () {
-    return this.path.replace("{format}", "xml");
-  };
-
-  SwaggerOperation.prototype.encodePathParam = function (pathParam) {
-    var encParts, part, parts, _i, _len;
-    pathParam = pathParam.toString();
-    if (pathParam.indexOf("/") === -1) {
-      return encodeURIComponent(pathParam);
-    } else {
-      parts = pathParam.split("/");
-      encParts = [];
-      for (_i = 0, _len = parts.length; _i < _len; _i++) {
-        part = parts[_i];
-        encParts.push(encodeURIComponent(part));
-      }
-      return encParts.join("/");
-    }
-  };
-
-  SwaggerOperation.prototype.urlify = function (args) {
-    var url = this.resource.basePath + this.pathJson();
-    var params = this.parameters;
-    for (var i = 0; i < params.length; i++) {
-      var param = params[i];
-      if (param.paramType === 'path') {
-        if (args[param.name]) {
-          // apply path params and remove from args
-          var reg = new RegExp('\\{\\s*?' + param.name + '.*?\\}(?=\\s*?(\\/|$))', 'gi');
-          url = url.replace(reg, this.encodePathParam(args[param.name]));
-          delete args[param.name];
-        }
-        else
-          throw "" + param.name + " is a required path param.";
-      }
-    }
-
-    var queryParams = "";
-    for (var i = 0; i < params.length; i++) {
-      var param = params[i];
-      if (param.paramType === 'query') {
-        if (args[param.name] !== undefined) {
-          var value = args[param.name];
-          if (queryParams !== '')
-            queryParams += '&';
-          if (Array.isArray(value)) {
-            var j;
-            var output = '';
-            for(j = 0; j < value.length; j++) {
-              if(j > 0)
-                output += ',';
-              output += encodeURIComponent(value[j]);
-            }
-            queryParams += encodeURIComponent(param.name) + '=' + output;
-          }
-          else {
-            queryParams += encodeURIComponent(param.name) + '=' + encodeURIComponent(args[param.name]);            
-          }
-        }
-      }
-    }
-    if ((queryParams != null) && queryParams.length > 0)
-      url += '?' + queryParams;
-    return url;
-  };
-
-  SwaggerOperation.prototype.supportHeaderParams = function () {
-    return this.resource.api.supportHeaderParams;
-  };
-
-  SwaggerOperation.prototype.supportedSubmitMethods = function () {
-    return this.resource.api.supportedSubmitMethods;
-  };
-
-  SwaggerOperation.prototype.getQueryParams = function (args) {
-    return this.getMatchingParams(['query'], args);
-  };
-
-  SwaggerOperation.prototype.getHeaderParams = function (args) {
-    return this.getMatchingParams(['header'], args);
-  };
-
-  SwaggerOperation.prototype.getMatchingParams = function (paramTypes, args) {
-    var matchingParams = {};
-    var params = this.parameters;
-    for (var i = 0; i < params.length; i++) {
-      param = params[i];
-      if (args && args[param.name])
-        matchingParams[param.name] = args[param.name];
-    }
-    var headers = this.resource.api.headers;
-    var name;
-    for (name in headers) {
-      var value = headers[name];
-      matchingParams[name] = value;
-    }
-    return matchingParams;
-  };
-
-  SwaggerOperation.prototype.help = function () {
-    var msg = "";
-    var params = this.parameters;
-    for (var i = 0; i < params.length; i++) {
-      var param = params[i];
-      if (msg !== "")
-        msg += "\n";
-      msg += "* " + param.name + (param.required ? ' (required)' : '') + " - " + param.description;
-    }
-    return msg;
-  };
-
-
-  SwaggerOperation.prototype.formatXml = function (xml) {
-    var contexp, formatted, indent, lastType, lines, ln, pad, reg, transitions, wsexp, _fn, _i, _len;
-    reg = /(>)(<)(\/*)/g;
-    wsexp = /[ ]*(.*)[ ]+\n/g;
-    contexp = /(<.+>)(.+\n)/g;
-    xml = xml.replace(reg, '$1\n$2$3').replace(wsexp, '$1\n').replace(contexp, '$1\n$2');
-    pad = 0;
-    formatted = '';
-    lines = xml.split('\n');
-    indent = 0;
-    lastType = 'other';
-    transitions = {
-      'single->single': 0,
-      'single->closing': -1,
-      'single->opening': 0,
-      'single->other': 0,
-      'closing->single': 0,
-      'closing->closing': -1,
-      'closing->opening': 0,
-      'closing->other': 0,
-      'opening->single': 1,
-      'opening->closing': 0,
-      'opening->opening': 1,
-      'opening->other': 1,
-      'other->single': 0,
-      'other->closing': -1,
-      'other->opening': 0,
-      'other->other': 0
-    };
-    _fn = function (ln) {
-      var fromTo, j, key, padding, type, types, value;
-      types = {
-        single: Boolean(ln.match(/<.+\/>/)),
-        closing: Boolean(ln.match(/<\/.+>/)),
-        opening: Boolean(ln.match(/<[^!?].*>/))
-      };
-      type = ((function () {
-        var _results;
-        _results = [];
-        for (key in types) {
-          value = types[key];
-          if (value) {
-            _results.push(key);
-          }
-        }
-        return _results;
-      })())[0];
-      type = type === void 0 ? 'other' : type;
-      fromTo = lastType + '->' + type;
-      lastType = type;
-      padding = '';
-      indent += transitions[fromTo];
-      padding = ((function () {
-        var _j, _ref5, _results;
-        _results = [];
-        for (j = _j = 0, _ref5 = indent; 0 <= _ref5 ? _j < _ref5 : _j > _ref5; j = 0 <= _ref5 ? ++_j : --_j) {
-          _results.push('  ');
-        }
-        return _results;
-      })()).join('');
-      if (fromTo === 'opening->closing') {
-        return formatted = formatted.substr(0, formatted.length - 1) + ln + '\n';
-      } else {
-        return formatted += padding + ln + '\n';
-      }
-    };
-    for (_i = 0, _len = lines.length; _i < _len; _i++) {
-      ln = lines[_i];
-      _fn(ln);
-    }
-    return formatted;
-  };
-
-  var SwaggerRequest = function (type, url, params, opts, successCallback, errorCallback, operation, execution) {
-    var _this = this;
-    var errors = [];
-    this.useJQuery = (typeof operation.resource.useJQuery !== 'undefined' ? operation.resource.useJQuery : null);
-    this.type = (type || errors.push("SwaggerRequest type is required (get/post/put/delete/patch/options)."));
-    this.url = (url || errors.push("SwaggerRequest url is required."));
-    this.params = params;
-    this.opts = opts;
-    this.successCallback = (successCallback || errors.push("SwaggerRequest successCallback is required."));
-    this.errorCallback = (errorCallback || errors.push("SwaggerRequest error callback is required."));
-    this.operation = (operation || errors.push("SwaggerRequest operation is required."));
-    this.execution = execution;
-    this.headers = (params.headers || {});
-
-    if (errors.length > 0) {
-      throw errors;
-    }
-
-    this.type = this.type.toUpperCase();
-
-    // set request, response content type headers
-    var headers = this.setHeaders(params, this.operation);
-    var body = params.body;
-
-    // encode the body for form submits
-    if (headers["Content-Type"]) {
-      var values = {};
-      var i;
-      var operationParams = this.operation.parameters;
-      for (i = 0; i < operationParams.length; i++) {
-        var param = operationParams[i];
-        if (param.paramType === "form")
-          values[param.name] = param;
-      }
-
-      if (headers["Content-Type"].indexOf("application/x-www-form-urlencoded") === 0) {
-        var encoded = "";
-        var key, value;
-        for (key in values) {
-          value = this.params[key];
-          if (typeof value !== 'undefined') {
-            if (encoded !== "")
-              encoded += "&";
-            encoded += encodeURIComponent(key) + '=' + encodeURIComponent(value);
-          }
-        }
-        body = encoded;
-      }
-      else if (headers["Content-Type"].indexOf("multipart/form-data") === 0) {
-        // encode the body for form submits
-        var data = "";
-        var boundary = "----SwaggerFormBoundary" + Date.now();
-        var key, value;
-        for (key in values) {
-          value = this.params[key];
-          if (typeof value !== 'undefined') {
-            data += '--' + boundary + '\n';
-            data += 'Content-Disposition: form-data; name="' + key + '"';
-            data += '\n\n';
-            data += value + "\n";
-          }
-        }
-        data += "--" + boundary + "--\n";
-        headers["Content-Type"] = "multipart/form-data; boundary=" + boundary;
-        body = data;
-      }
-    }
-
-    var obj;
-    if (!((this.headers != null) && (this.headers.mock != null))) {
-      obj = {
-        url: this.url,
-        method: this.type,
-        headers: headers,
-        body: body,
-        useJQuery: this.useJQuery,
-        on: {
-          error: function (response) {
-            return _this.errorCallback(response, _this.opts.parent);
-          },
-          redirect: function (response) {
-            return _this.successCallback(response, _this.opts.parent);
-          },
-          307: function (response) {
-            return _this.successCallback(response, _this.opts.parent);
-          },
-          response: function (response) {
-            return _this.successCallback(response, _this.opts.parent);
-          }
-        }
-      };
-      var e;
-      if (typeof window !== 'undefined') {
-        e = window;
-      } else {
-        e = exports;
-      }
-      var status = e.authorizations.apply(obj, this.operation.authorizations);
-      if (opts.mock == null) {
-        if (status !== false) {
-          new SwaggerHttp().execute(obj);
-        } else {
-          obj.canceled = true;
-        }
-      } else {
-        return obj;
-      }
-    }
-    return obj;
-  };
-
-  SwaggerRequest.prototype.setHeaders = function (params, operation) {
-    // default type
-    var accepts = "application/json";
-    var consumes = "application/json";
-
-    var allDefinedParams = this.operation.parameters;
-    var definedFormParams = [];
-    var definedFileParams = [];
-    var body = params.body;
-    var headers = {};
-
-    // get params from the operation and set them in definedFileParams, definedFormParams, headers
-    var i;
-    for (i = 0; i < allDefinedParams.length; i++) {
-      var param = allDefinedParams[i];
-      if (param.paramType === "form")
-        definedFormParams.push(param);
-      else if (param.paramType === "file")
-        definedFileParams.push(param);
-      else if (param.paramType === "header" && this.params.headers) {
-        var key = param.name;
-        var headerValue = this.params.headers[param.name];
-        if (typeof this.params.headers[param.name] !== 'undefined')
-          headers[key] = headerValue;
-      }
-    }
-
-    // if there's a body, need to set the accepts header via requestContentType
-    if (body && (this.type === "POST" || this.type === "PUT" || this.type === "PATCH" || this.type === "DELETE")) {
-      if (this.opts.requestContentType)
-        consumes = this.opts.requestContentType;
-    } else {
-      // if any form params, content type must be set
-      if (definedFormParams.length > 0) {
-        if (definedFileParams.length > 0)
-          consumes = "multipart/form-data";
-        else
-          consumes = "application/x-www-form-urlencoded";
-      }
-      else if (this.type === "DELETE")
-        body = "{}";
-      else if (this.type != "DELETE")
-        accepts = null;
-    }
-
-    if (consumes && this.operation.consumes) {
-      if (this.operation.consumes.indexOf(consumes) === -1) {
-        log("server doesn't consume " + consumes + ", try " + JSON.stringify(this.operation.consumes));
-        consumes = this.operation.consumes[0];
-      }
-    }
-
-    if (this.opts.responseContentType) {
-      accepts = this.opts.responseContentType;
-    } else {
-      accepts = "application/json";
-    }
-    if (accepts && this.operation.produces) {
-      if (this.operation.produces.indexOf(accepts) === -1) {
-        log("server can't produce " + accepts);
-        accepts = this.operation.produces[0];
-      }
-    }
-
-    if ((consumes && body !== "") || (consumes === "application/x-www-form-urlencoded"))
-      headers["Content-Type"] = consumes;
-    if (accepts)
-      headers["Accept"] = accepts;
-    return headers;
-  }
-
-  SwaggerRequest.prototype.asCurl = function () {
-    var results = [];
-    if (this.headers) {
-      var key;
-      for (key in this.headers) {
-        results.push("--header \"" + key + ": " + this.headers[v] + "\"");
-      }
-    }
-    return "curl " + (results.join(" ")) + " " + this.url;
-  };
-
-  /**
-   * SwaggerHttp is a wrapper for executing requests
-   */
-  var SwaggerHttp = function () { };
-
-  SwaggerHttp.prototype.execute = function (obj) {
-    if (obj && (typeof obj.useJQuery === 'boolean'))
-      this.useJQuery = obj.useJQuery;
-    else
-      this.useJQuery = this.isIE8();
-
-    if (this.useJQuery)
-      return new JQueryHttpClient().execute(obj);
-    else
-      return new ShredHttpClient().execute(obj);
-  }
-
-  SwaggerHttp.prototype.isIE8 = function () {
-    var detectedIE = false;
-    if (typeof navigator !== 'undefined' && navigator.userAgent) {
-      nav = navigator.userAgent.toLowerCase();
-      if (nav.indexOf('msie') !== -1) {
-        var version = parseInt(nav.split('msie')[1]);
-        if (version <= 8) {
-          detectedIE = true;
-        }
-      }
-    }
-    return detectedIE;
-  };
-
-  /*
-   * JQueryHttpClient lets a browser take advantage of JQuery's cross-browser magic.
-   * NOTE: when jQuery is available it will export both '$' and 'jQuery' to the global space.
-   *     Since we are using closures here we need to alias it for internal use.
-   */
-  var JQueryHttpClient = function (options) {
-    "use strict";
-    if (!jQuery) {
-      var jQuery = window.jQuery;
-    }
-  }
-
-  JQueryHttpClient.prototype.execute = function (obj) {
-    var cb = obj.on;
-    var request = obj;
-
-    obj.type = obj.method;
-    obj.cache = false;
-
-    obj.beforeSend = function (xhr) {
-      var key, results;
-      if (obj.headers) {
-        results = [];
-        var key;
-        for (key in obj.headers) {
-          if (key.toLowerCase() === "content-type") {
-            results.push(obj.contentType = obj.headers[key]);
-          } else if (key.toLowerCase() === "accept") {
-            results.push(obj.accepts = obj.headers[key]);
-          } else {
-            results.push(xhr.setRequestHeader(key, obj.headers[key]));
-          }
-        }
-        return results;
-      }
-    };
-
-    obj.data = obj.body;
-    obj.complete = function (response, textStatus, opts) {
-      var headers = {},
-        headerArray = response.getAllResponseHeaders().split("\n");
-
-      for (var i = 0; i < headerArray.length; i++) {
-        var toSplit = headerArray[i].trim();
-        if (toSplit.length === 0)
-          continue;
-        var separator = toSplit.indexOf(":");
-        if (separator === -1) {
-          // Name but no value in the header
-          headers[toSplit] = null;
-          continue;
-        }
-        var name = toSplit.substring(0, separator).trim(),
-          value = toSplit.substring(separator + 1).trim();
-        headers[name] = value;
-      }
-
-      var out = {
-        url: request.url,
-        method: request.method,
-        status: response.status,
-        data: response.responseText,
-        headers: headers
-      };
-
-      var contentType = (headers["content-type"] || headers["Content-Type"] || null)
-
-      if (contentType != null) {
-        if (contentType.indexOf("application/json") == 0 || contentType.indexOf("+json") > 0) {
-          if (response.responseText && response.responseText !== "")
-            out.obj = JSON.parse(response.responseText);
-          else
-            out.obj = {}
-        }
-      }
-
-      if (response.status >= 200 && response.status < 300)
-        cb.response(out);
-      else if (response.status === 0 || (response.status >= 400 && response.status < 599))
-        cb.error(out);
-      else
-        return cb.response(out);
-    };
-
-    jQuery.support.cors = true;
-    return jQuery.ajax(obj);
-  }
-
-  /*
-   * ShredHttpClient is a light-weight, node or browser HTTP client
-   */
-  var ShredHttpClient = function (options) {
-    this.options = (options || {});
-    this.isInitialized = false;
-
-    var identity, toString;
-
-    if (typeof window !== 'undefined') {
-      this.Shred = require("./shred");
-      this.content = require("./shred/content");
-    }
-    else
-      this.Shred = require("shred");
-    this.shred = new this.Shred();
-  }
-
-  ShredHttpClient.prototype.initShred = function () {
-    this.isInitialized = true;
-    this.registerProcessors(this.shred);
-  }
-
-  ShredHttpClient.prototype.registerProcessors = function (shred) {
-    var identity = function (x) {
-      return x;
-    };
-    var toString = function (x) {
-      return x.toString();
-    };
-
-    if (typeof window !== 'undefined') {
-      this.content.registerProcessor(["application/json; charset=utf-8", "application/json", "json"], {
-        parser: identity,
-        stringify: toString
-      });
-    } else {
-      this.Shred.registerProcessor(["application/json; charset=utf-8", "application/json", "json"], {
-        parser: identity,
-        stringify: toString
-      });
-    }
-  }
-
-  ShredHttpClient.prototype.execute = function (obj) {
-    if (!this.isInitialized)
-      this.initShred();
-
-    var cb = obj.on, res;
-
-    var transform = function (response) {
-      var out = {
-        headers: response._headers,
-        url: response.request.url,
-        method: response.request.method,
-        status: response.status,
-        data: response.content.data
-      };
-
-      var contentType = (response._headers["content-type"] || response._headers["Content-Type"] || null)
-
-      if (contentType != null) {
-        if (contentType.indexOf("application/json") == 0 || contentType.indexOf("+json") > 0) {
-          if (response.content.data && response.content.data !== "")
-            out.obj = JSON.parse(response.content.data);
-          else
-            out.obj = {}
-        }
-      }
-      return out;
-    };
-
-    // Transform an error into a usable response-like object
-    var transformError = function (error) {
-      var out = {
-        // Default to a status of 0 - The client will treat this as a generic permissions sort of error
-        status: 0,
-        data: error.message || error
-      };
-
-      if (error.code) {
-        out.obj = error;
-
-        if (error.code === 'ENOTFOUND' || error.code === 'ECONNREFUSED') {
-          // We can tell the client that this should be treated as a missing resource and not as a permissions thing
-          out.status = 404;
-        }
-      }
-
-      return out;
-    };
-
-    var res = {
-      error: function (response) {
-        if (obj)
-          return cb.error(transform(response));
-      },
-      // Catch the Shred error raised when the request errors as it is made (i.e. No Response is coming)
-      request_error: function (err) {
-        if (obj)
-          return cb.error(transformError(err));
-      },
-      redirect: function (response) {
-        if (obj)
-          return cb.redirect(transform(response));
-      },
-      307: function (response) {
-        if (obj)
-          return cb.redirect(transform(response));
-      },
-      response: function (response) {
-        if (obj)
-          return cb.response(transform(response));
-      }
-    };
-    if (obj) {
-      obj.on = res;
-    }
-    return this.shred.request(obj);
-  };
-
-  /**
-   * SwaggerAuthorizations applys the correct authorization to an operation being executed
-   */
-  var SwaggerAuthorizations = function () {
-    this.authz = {};
-  };
-
-  SwaggerAuthorizations.prototype.add = function (name, auth) {
-    this.authz[name] = auth;
-    return auth;
-  };
-
-  SwaggerAuthorizations.prototype.remove = function (name) {
-    return delete this.authz[name];
-  };
-
-  SwaggerAuthorizations.prototype.apply = function (obj, authorizations) {
-    var status = null;
-    var key, value, result;
-
-    // if the "authorizations" key is undefined, or has an empty array, add all keys
-    if (typeof authorizations === 'undefined' || Object.keys(authorizations).length == 0) {
-      for (key in this.authz) {
-        value = this.authz[key];
-        result = value.apply(obj, authorizations);
-        if (result === true)
-          status = true;
-      }
-    }
-    else {
-      for (name in authorizations) {
-        for (key in this.authz) {
-          if (key == name) {
-            value = this.authz[key];
-            result = value.apply(obj, authorizations);
-            if (result === true)
-              status = true;
-          }
-        }
-      }
-    }
-
-    return status;
-  };
-
-  /**
-   * ApiKeyAuthorization allows a query param or header to be injected
-   */
-  var ApiKeyAuthorization = function (name, value, type, delimiter) {
-    this.name = name;
-    this.value = value;
-    this.type = type;
-    this.delimiter = delimiter;
-  };
-
-  ApiKeyAuthorization.prototype.apply = function (obj, authorizations) {
-    if (this.type === "query") {
-      if (obj.url.indexOf('?') > 0)
-        obj.url = obj.url + "&" + this.name + "=" + this.value;
-      else
-        obj.url = obj.url + "?" + this.name + "=" + this.value;
-      return true;
-    } else if (this.type === "header") {
-      if (typeof obj.headers[this.name] !== 'undefined') {
-        if (typeof this.delimiter !== 'undefined')
-          obj.headers[this.name] = obj.headers[this.name] + this.delimiter + this.value;
-      }
-      else
-        obj.headers[this.name] = this.value;
-      return true;
-    }
-  };
-
-  var CookieAuthorization = function (cookie) {
-    this.cookie = cookie;
-  }
-
-  CookieAuthorization.prototype.apply = function (obj, authorizations) {
-    obj.cookieJar = obj.cookieJar || CookieJar();
-    obj.cookieJar.setCookie(this.cookie);
-    return true;
-  }
-
-  /**
-   * Password Authorization is a basic auth implementation
-   */
-  var PasswordAuthorization = function (name, username, password) {
-    this.name = name;
-    this.username = username;
-    this.password = password;
-    this._btoa = null;
-    if (typeof window !== 'undefined')
-      this._btoa = btoa;
-    else
-      this._btoa = require("btoa");
-  };
-
-  PasswordAuthorization.prototype.apply = function (obj, authorizations) {
-    var base64encoder = this._btoa;
-    obj.headers["Authorization"] = "Basic " + base64encoder(this.username + ":" + this.password);
-    return true;
-  };
-
-  var e = (typeof window !== 'undefined' ? window : exports);
-
-  var sampleModels = {};
-  var cookies = {};
-
-  e.SampleModels = sampleModels;
-  e.SwaggerHttp = SwaggerHttp;
-  e.SwaggerRequest = SwaggerRequest;
-  e.authorizations = new SwaggerAuthorizations();
-  e.ApiKeyAuthorization = ApiKeyAuthorization;
-  e.PasswordAuthorization = PasswordAuthorization;
-  e.CookieAuthorization = CookieAuthorization;
-  e.JQueryHttpClient = JQueryHttpClient;
-  e.ShredHttpClient = ShredHttpClient;
-  e.SwaggerOperation = SwaggerOperation;
-  e.SwaggerModel = SwaggerModel;
-  e.SwaggerModelProperty = SwaggerModelProperty;
-  e.SwaggerResource = SwaggerResource;
-  e.SwaggerApi = SwaggerApi;
-  e.log = log;
-
-})();
diff --git a/src/main/webapp/public/docs/lib/underscore-min.js b/src/main/webapp/public/docs/lib/underscore-min.js
deleted file mode 100644
index 5a0cb3b00..000000000
--- a/src/main/webapp/public/docs/lib/underscore-min.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Underscore.js 1.3.3
-// (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
-// Underscore is freely distributable under the MIT license.
-// Portions of Underscore are inspired or borrowed from Prototype,
-// Oliver Steele's Functional, and John Resig's Micro-Templating.
-// For all details and documentation:
-// http://documentcloud.github.com/underscore
-(function(){function r(a,c,d){if(a===c)return 0!==a||1/a==1/c;if(null==a||null==c)return a===c;a._chain&&(a=a._wrapped);c._chain&&(c=c._wrapped);if(a.isEqual&&b.isFunction(a.isEqual))return a.isEqual(c);if(c.isEqual&&b.isFunction(c.isEqual))return c.isEqual(a);var e=l.call(a);if(e!=l.call(c))return!1;switch(e){case "[object String]":return a==""+c;case "[object Number]":return a!=+a?c!=+c:0==a?1/a==1/c:a==+c;case "[object Date]":case "[object Boolean]":return+a==+c;case "[object RegExp]":return a.source==
-c.source&&a.global==c.global&&a.multiline==c.multiline&&a.ignoreCase==c.ignoreCase}if("object"!=typeof a||"object"!=typeof c)return!1;for(var f=d.length;f--;)if(d[f]==a)return!0;d.push(a);var f=0,g=!0;if("[object Array]"==e){if(f=a.length,g=f==c.length)for(;f--&&(g=f in a==f in c&&r(a[f],c[f],d)););}else{if("constructor"in a!="constructor"in c||a.constructor!=c.constructor)return!1;for(var h in a)if(b.has(a,h)&&(f++,!(g=b.has(c,h)&&r(a[h],c[h],d))))break;if(g){for(h in c)if(b.has(c,h)&&!f--)break;
-g=!f}}d.pop();return g}var s=this,I=s._,o={},k=Array.prototype,p=Object.prototype,i=k.slice,J=k.unshift,l=p.toString,K=p.hasOwnProperty,y=k.forEach,z=k.map,A=k.reduce,B=k.reduceRight,C=k.filter,D=k.every,E=k.some,q=k.indexOf,F=k.lastIndexOf,p=Array.isArray,L=Object.keys,t=Function.prototype.bind,b=function(a){return new m(a)};"undefined"!==typeof exports?("undefined"!==typeof module&&module.exports&&(exports=module.exports=b),exports._=b):s._=b;b.VERSION="1.3.3";var j=b.each=b.forEach=function(a,
-c,d){if(a!=null)if(y&&a.forEach===y)a.forEach(c,d);else if(a.length===+a.length)for(var e=0,f=a.length;e<f;e++){if(e in a&&c.call(d,a[e],e,a)===o)break}else for(e in a)if(b.has(a,e)&&c.call(d,a[e],e,a)===o)break};b.map=b.collect=function(a,c,b){var e=[];if(a==null)return e;if(z&&a.map===z)return a.map(c,b);j(a,function(a,g,h){e[e.length]=c.call(b,a,g,h)});if(a.length===+a.length)e.length=a.length;return e};b.reduce=b.foldl=b.inject=function(a,c,d,e){var f=arguments.length>2;a==null&&(a=[]);if(A&&
-a.reduce===A){e&&(c=b.bind(c,e));return f?a.reduce(c,d):a.reduce(c)}j(a,function(a,b,i){if(f)d=c.call(e,d,a,b,i);else{d=a;f=true}});if(!f)throw new TypeError("Reduce of empty array with no initial value");return d};b.reduceRight=b.foldr=function(a,c,d,e){var f=arguments.length>2;a==null&&(a=[]);if(B&&a.reduceRight===B){e&&(c=b.bind(c,e));return f?a.reduceRight(c,d):a.reduceRight(c)}var g=b.toArray(a).reverse();e&&!f&&(c=b.bind(c,e));return f?b.reduce(g,c,d,e):b.reduce(g,c)};b.find=b.detect=function(a,
-c,b){var e;G(a,function(a,g,h){if(c.call(b,a,g,h)){e=a;return true}});return e};b.filter=b.select=function(a,c,b){var e=[];if(a==null)return e;if(C&&a.filter===C)return a.filter(c,b);j(a,function(a,g,h){c.call(b,a,g,h)&&(e[e.length]=a)});return e};b.reject=function(a,c,b){var e=[];if(a==null)return e;j(a,function(a,g,h){c.call(b,a,g,h)||(e[e.length]=a)});return e};b.every=b.all=function(a,c,b){var e=true;if(a==null)return e;if(D&&a.every===D)return a.every(c,b);j(a,function(a,g,h){if(!(e=e&&c.call(b,
-a,g,h)))return o});return!!e};var G=b.some=b.any=function(a,c,d){c||(c=b.identity);var e=false;if(a==null)return e;if(E&&a.some===E)return a.some(c,d);j(a,function(a,b,h){if(e||(e=c.call(d,a,b,h)))return o});return!!e};b.include=b.contains=function(a,c){var b=false;if(a==null)return b;if(q&&a.indexOf===q)return a.indexOf(c)!=-1;return b=G(a,function(a){return a===c})};b.invoke=function(a,c){var d=i.call(arguments,2);return b.map(a,function(a){return(b.isFunction(c)?c||a:a[c]).apply(a,d)})};b.pluck=
-function(a,c){return b.map(a,function(a){return a[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a)&&a[0]===+a[0])return Math.max.apply(Math,a);if(!c&&b.isEmpty(a))return-Infinity;var e={computed:-Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b>=e.computed&&(e={value:a,computed:b})});return e.value};b.min=function(a,c,d){if(!c&&b.isArray(a)&&a[0]===+a[0])return Math.min.apply(Math,a);if(!c&&b.isEmpty(a))return Infinity;var e={computed:Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b<e.computed&&
-(e={value:a,computed:b})});return e.value};b.shuffle=function(a){var b=[],d;j(a,function(a,f){d=Math.floor(Math.random()*(f+1));b[f]=b[d];b[d]=a});return b};b.sortBy=function(a,c,d){var e=b.isFunction(c)?c:function(a){return a[c]};return b.pluck(b.map(a,function(a,b,c){return{value:a,criteria:e.call(d,a,b,c)}}).sort(function(a,b){var c=a.criteria,d=b.criteria;return c===void 0?1:d===void 0?-1:c<d?-1:c>d?1:0}),"value")};b.groupBy=function(a,c){var d={},e=b.isFunction(c)?c:function(a){return a[c]};
-j(a,function(a,b){var c=e(a,b);(d[c]||(d[c]=[])).push(a)});return d};b.sortedIndex=function(a,c,d){d||(d=b.identity);for(var e=0,f=a.length;e<f;){var g=e+f>>1;d(a[g])<d(c)?e=g+1:f=g}return e};b.toArray=function(a){return!a?[]:b.isArray(a)||b.isArguments(a)?i.call(a):a.toArray&&b.isFunction(a.toArray)?a.toArray():b.values(a)};b.size=function(a){return b.isArray(a)?a.length:b.keys(a).length};b.first=b.head=b.take=function(a,b,d){return b!=null&&!d?i.call(a,0,b):a[0]};b.initial=function(a,b,d){return i.call(a,
-0,a.length-(b==null||d?1:b))};b.last=function(a,b,d){return b!=null&&!d?i.call(a,Math.max(a.length-b,0)):a[a.length-1]};b.rest=b.tail=function(a,b,d){return i.call(a,b==null||d?1:b)};b.compact=function(a){return b.filter(a,function(a){return!!a})};b.flatten=function(a,c){return b.reduce(a,function(a,e){if(b.isArray(e))return a.concat(c?e:b.flatten(e));a[a.length]=e;return a},[])};b.without=function(a){return b.difference(a,i.call(arguments,1))};b.uniq=b.unique=function(a,c,d){var d=d?b.map(a,d):a,
-e=[];a.length<3&&(c=true);b.reduce(d,function(d,g,h){if(c?b.last(d)!==g||!d.length:!b.include(d,g)){d.push(g);e.push(a[h])}return d},[]);return e};b.union=function(){return b.uniq(b.flatten(arguments,true))};b.intersection=b.intersect=function(a){var c=i.call(arguments,1);return b.filter(b.uniq(a),function(a){return b.every(c,function(c){return b.indexOf(c,a)>=0})})};b.difference=function(a){var c=b.flatten(i.call(arguments,1),true);return b.filter(a,function(a){return!b.include(c,a)})};b.zip=function(){for(var a=
-i.call(arguments),c=b.max(b.pluck(a,"length")),d=Array(c),e=0;e<c;e++)d[e]=b.pluck(a,""+e);return d};b.indexOf=function(a,c,d){if(a==null)return-1;var e;if(d){d=b.sortedIndex(a,c);return a[d]===c?d:-1}if(q&&a.indexOf===q)return a.indexOf(c);d=0;for(e=a.length;d<e;d++)if(d in a&&a[d]===c)return d;return-1};b.lastIndexOf=function(a,b){if(a==null)return-1;if(F&&a.lastIndexOf===F)return a.lastIndexOf(b);for(var d=a.length;d--;)if(d in a&&a[d]===b)return d;return-1};b.range=function(a,b,d){if(arguments.length<=
-1){b=a||0;a=0}for(var d=arguments[2]||1,e=Math.max(Math.ceil((b-a)/d),0),f=0,g=Array(e);f<e;){g[f++]=a;a=a+d}return g};var H=function(){};b.bind=function(a,c){var d,e;if(a.bind===t&&t)return t.apply(a,i.call(arguments,1));if(!b.isFunction(a))throw new TypeError;e=i.call(arguments,2);return d=function(){if(!(this instanceof d))return a.apply(c,e.concat(i.call(arguments)));H.prototype=a.prototype;var b=new H,g=a.apply(b,e.concat(i.call(arguments)));return Object(g)===g?g:b}};b.bindAll=function(a){var c=
-i.call(arguments,1);c.length==0&&(c=b.functions(a));j(c,function(c){a[c]=b.bind(a[c],a)});return a};b.memoize=function(a,c){var d={};c||(c=b.identity);return function(){var e=c.apply(this,arguments);return b.has(d,e)?d[e]:d[e]=a.apply(this,arguments)}};b.delay=function(a,b){var d=i.call(arguments,2);return setTimeout(function(){return a.apply(null,d)},b)};b.defer=function(a){return b.delay.apply(b,[a,1].concat(i.call(arguments,1)))};b.throttle=function(a,c){var d,e,f,g,h,i,j=b.debounce(function(){h=
-g=false},c);return function(){d=this;e=arguments;f||(f=setTimeout(function(){f=null;h&&a.apply(d,e);j()},c));g?h=true:i=a.apply(d,e);j();g=true;return i}};b.debounce=function(a,b,d){var e;return function(){var f=this,g=arguments;d&&!e&&a.apply(f,g);clearTimeout(e);e=setTimeout(function(){e=null;d||a.apply(f,g)},b)}};b.once=function(a){var b=false,d;return function(){if(b)return d;b=true;return d=a.apply(this,arguments)}};b.wrap=function(a,b){return function(){var d=[a].concat(i.call(arguments,0));
-return b.apply(this,d)}};b.compose=function(){var a=arguments;return function(){for(var b=arguments,d=a.length-1;d>=0;d--)b=[a[d].apply(this,b)];return b[0]}};b.after=function(a,b){return a<=0?b():function(){if(--a<1)return b.apply(this,arguments)}};b.keys=L||function(a){if(a!==Object(a))throw new TypeError("Invalid object");var c=[],d;for(d in a)b.has(a,d)&&(c[c.length]=d);return c};b.values=function(a){return b.map(a,b.identity)};b.functions=b.methods=function(a){var c=[],d;for(d in a)b.isFunction(a[d])&&
-c.push(d);return c.sort()};b.extend=function(a){j(i.call(arguments,1),function(b){for(var d in b)a[d]=b[d]});return a};b.pick=function(a){var c={};j(b.flatten(i.call(arguments,1)),function(b){b in a&&(c[b]=a[b])});return c};b.defaults=function(a){j(i.call(arguments,1),function(b){for(var d in b)a[d]==null&&(a[d]=b[d])});return a};b.clone=function(a){return!b.isObject(a)?a:b.isArray(a)?a.slice():b.extend({},a)};b.tap=function(a,b){b(a);return a};b.isEqual=function(a,b){return r(a,b,[])};b.isEmpty=
-function(a){if(a==null)return true;if(b.isArray(a)||b.isString(a))return a.length===0;for(var c in a)if(b.has(a,c))return false;return true};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=p||function(a){return l.call(a)=="[object Array]"};b.isObject=function(a){return a===Object(a)};b.isArguments=function(a){return l.call(a)=="[object Arguments]"};b.isArguments(arguments)||(b.isArguments=function(a){return!(!a||!b.has(a,"callee"))});b.isFunction=function(a){return l.call(a)=="[object Function]"};
-b.isString=function(a){return l.call(a)=="[object String]"};b.isNumber=function(a){return l.call(a)=="[object Number]"};b.isFinite=function(a){return b.isNumber(a)&&isFinite(a)};b.isNaN=function(a){return a!==a};b.isBoolean=function(a){return a===true||a===false||l.call(a)=="[object Boolean]"};b.isDate=function(a){return l.call(a)=="[object Date]"};b.isRegExp=function(a){return l.call(a)=="[object RegExp]"};b.isNull=function(a){return a===null};b.isUndefined=function(a){return a===void 0};b.has=function(a,
-b){return K.call(a,b)};b.noConflict=function(){s._=I;return this};b.identity=function(a){return a};b.times=function(a,b,d){for(var e=0;e<a;e++)b.call(d,e)};b.escape=function(a){return(""+a).replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#x27;").replace(/\//g,"&#x2F;")};b.result=function(a,c){if(a==null)return null;var d=a[c];return b.isFunction(d)?d.call(a):d};b.mixin=function(a){j(b.functions(a),function(c){M(c,b[c]=a[c])})};var N=0;b.uniqueId=
-function(a){var b=N++;return a?a+b:b};b.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var u=/.^/,n={"\\":"\\","'":"'",r:"\r",n:"\n",t:"\t",u2028:"\u2028",u2029:"\u2029"},v;for(v in n)n[n[v]]=v;var O=/\\|'|\r|\n|\t|\u2028|\u2029/g,P=/\\(\\|'|r|n|t|u2028|u2029)/g,w=function(a){return a.replace(P,function(a,b){return n[b]})};b.template=function(a,c,d){d=b.defaults(d||{},b.templateSettings);a="__p+='"+a.replace(O,function(a){return"\\"+n[a]}).replace(d.escape||
-u,function(a,b){return"'+\n_.escape("+w(b)+")+\n'"}).replace(d.interpolate||u,function(a,b){return"'+\n("+w(b)+")+\n'"}).replace(d.evaluate||u,function(a,b){return"';\n"+w(b)+"\n;__p+='"})+"';\n";d.variable||(a="with(obj||{}){\n"+a+"}\n");var a="var __p='';var print=function(){__p+=Array.prototype.join.call(arguments, '')};\n"+a+"return __p;\n",e=new Function(d.variable||"obj","_",a);if(c)return e(c,b);c=function(a){return e.call(this,a,b)};c.source="function("+(d.variable||"obj")+"){\n"+a+"}";return c};
-b.chain=function(a){return b(a).chain()};var m=function(a){this._wrapped=a};b.prototype=m.prototype;var x=function(a,c){return c?b(a).chain():a},M=function(a,c){m.prototype[a]=function(){var a=i.call(arguments);J.call(a,this._wrapped);return x(c.apply(b,a),this._chain)}};b.mixin(b);j("pop,push,reverse,shift,sort,splice,unshift".split(","),function(a){var b=k[a];m.prototype[a]=function(){var d=this._wrapped;b.apply(d,arguments);var e=d.length;(a=="shift"||a=="splice")&&e===0&&delete d[0];return x(d,
-this._chain)}});j(["concat","join","slice"],function(a){var b=k[a];m.prototype[a]=function(){return x(b.apply(this._wrapped,arguments),this._chain)}});m.prototype.chain=function(){this._chain=true;return this};m.prototype.value=function(){return this._wrapped}}).call(this);
diff --git a/src/main/webapp/public/docs/o2c.html b/src/main/webapp/public/docs/o2c.html
deleted file mode 100644
index d32d130ec..000000000
--- a/src/main/webapp/public/docs/o2c.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<script>
-var qp = null;
-if(window.location.hash) {
-  qp = location.hash.substring(1);
-}
-else {
-  qp = location.search.substring(1);
-}
-qp = qp ? JSON.parse('{"' + qp.replace(/&/g, '","').replace(/=/g,'":"') + '"}',
-  function(key, value) {
-    return key===""?value:decodeURIComponent(value) }
-  ):{}
-window.opener.onOAuthComplete(qp);
-window.close();
-</script>
\ No newline at end of file
diff --git a/src/main/webapp/public/docs/swagger-ui.js b/src/main/webapp/public/docs/swagger-ui.js
deleted file mode 100644
index 505207e3f..000000000
--- a/src/main/webapp/public/docs/swagger-ui.js
+++ /dev/null
@@ -1,2670 +0,0 @@
-// swagger-ui.js
-// version 2.1.0-alpha.3
-$(function() {
-
-	// Helper function for vertically aligning DOM elements
-	// http://www.seodenver.com/simple-vertical-align-plugin-for-jquery/
-	$.fn.vAlign = function() {
-		return this.each(function(i){
-		var ah = $(this).height();
-		var ph = $(this).parent().height();
-		var mh = (ph - ah) / 2;
-		$(this).css('margin-top', mh);
-		});
-	};
-
-	$.fn.stretchFormtasticInputWidthToParent = function() {
-		return this.each(function(i){
-		var p_width = $(this).closest("form").innerWidth();
-		var p_padding = parseInt($(this).closest("form").css('padding-left') ,10) + parseInt($(this).closest("form").css('padding-right'), 10);
-		var this_padding = parseInt($(this).css('padding-left'), 10) + parseInt($(this).css('padding-right'), 10);
-		$(this).css('width', p_width - p_padding - this_padding);
-		});
-	};
-
-	$('form.formtastic li.string input, form.formtastic textarea').stretchFormtasticInputWidthToParent();
-
-	// Vertically center these paragraphs
-	// Parent may need a min-height for this to work..
-	$('ul.downplayed li div.content p').vAlign();
-
-	// When a sandbox form is submitted..
-	$("form.sandbox").submit(function(){
-
-		var error_free = true;
-
-		// Cycle through the forms required inputs
- 		$(this).find("input.required").each(function() {
-
-			// Remove any existing error styles from the input
-			$(this).removeClass('error');
-
-			// Tack the error style on if the input is empty..
-			if ($(this).val() == '') {
-				$(this).addClass('error');
-				$(this).wiggle();
-				error_free = false;
-			}
-
-		});
-
-		return error_free;
-	});
-
-});
-
-function clippyCopiedCallback(a) {
-  $('#api_key_copied').fadeIn().delay(1000).fadeOut();
-
-  // var b = $("#clippy_tooltip_" + a);
-  // b.length != 0 && (b.attr("title", "copied!").trigger("tipsy.reload"), setTimeout(function() {
-  //   b.attr("title", "copy to clipboard")
-  // },
-  // 500))
-}
-
-// Logging function that accounts for browsers that don't have window.console
-log = function(){
-  log.history = log.history || [];
-  log.history.push(arguments);
-  if(this.console){
-    console.log( Array.prototype.slice.call(arguments)[0] );
-  }
-};
-
-// Handle browsers that do console incorrectly (IE9 and below, see http://stackoverflow.com/a/5539378/7913)
-if (Function.prototype.bind && console && typeof console.log == "object") {
-    [
-      "log","info","warn","error","assert","dir","clear","profile","profileEnd"
-    ].forEach(function (method) {
-        console[method] = this.bind(console[method], console);
-    }, Function.prototype.call);
-}
-
-var Docs = {
-
-	shebang: function() {
-
-		// If shebang has an operation nickname in it..
-		// e.g. /docs/#!/words/get_search
-		var fragments = $.param.fragment().split('/');
-		fragments.shift(); // get rid of the bang
-
-		switch (fragments.length) {
-			case 1:
-				// Expand all operations for the resource and scroll to it
-				var dom_id = 'resource_' + fragments[0];
-
-				Docs.expandEndpointListForResource(fragments[0]);
-				$("#"+dom_id).slideto({highlight: false});
-				break;
-			case 2:
-				// Refer to the endpoint DOM element, e.g. #words_get_search
-
-        // Expand Resource
-        Docs.expandEndpointListForResource(fragments[0]);
-        $("#"+dom_id).slideto({highlight: false});
-
-        // Expand operation
-				var li_dom_id = fragments.join('_');
-				var li_content_dom_id = li_dom_id + "_content";
-
-
-				Docs.expandOperation($('#'+li_content_dom_id));
-				$('#'+li_dom_id).slideto({highlight: false});
-				break;
-		}
-
-	},
-
-	toggleEndpointListForResource: function(resource) {
-		var elem = $('li#resource_' + Docs.escapeResourceName(resource) + ' ul.endpoints');
-		if (elem.is(':visible')) {
-			Docs.collapseEndpointListForResource(resource);
-		} else {
-			Docs.expandEndpointListForResource(resource);
-		}
-	},
-
-	// Expand resource
-	expandEndpointListForResource: function(resource) {
-		var resource = Docs.escapeResourceName(resource);
-		if (resource == '') {
-			$('.resource ul.endpoints').slideDown();
-			return;
-		}
-		
-		$('li#resource_' + resource).addClass('active');
-
-		var elem = $('li#resource_' + resource + ' ul.endpoints');
-		elem.slideDown();
-	},
-
-	// Collapse resource and mark as explicitly closed
-	collapseEndpointListForResource: function(resource) {
-		var resource = Docs.escapeResourceName(resource);
-		$('li#resource_' + resource).removeClass('active');
-
-		var elem = $('li#resource_' + resource + ' ul.endpoints');
-		elem.slideUp();
-	},
-
-	expandOperationsForResource: function(resource) {
-		// Make sure the resource container is open..
-		Docs.expandEndpointListForResource(resource);
-		
-		if (resource == '') {
-			$('.resource ul.endpoints li.operation div.content').slideDown();
-			return;
-		}
-
-		$('li#resource_' + Docs.escapeResourceName(resource) + ' li.operation div.content').each(function() {
-			Docs.expandOperation($(this));
-		});
-	},
-
-	collapseOperationsForResource: function(resource) {
-		// Make sure the resource container is open..
-		Docs.expandEndpointListForResource(resource);
-
-		$('li#resource_' + Docs.escapeResourceName(resource) + ' li.operation div.content').each(function() {
-			Docs.collapseOperation($(this));
-		});
-	},
-
-	escapeResourceName: function(resource) {
-		return resource.replace(/[!"#$%&'()*+,.\/:;<=>?@\[\\\]\^`{|}~]/g, "\\$&");
-	},
-
-	expandOperation: function(elem) {
-		elem.slideDown();
-	},
-
-	collapseOperation: function(elem) {
-		elem.slideUp();
-	}
-};(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['apikey_button_view'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression;
-
-
-  buffer += "<div class='auth_button' id='apikey_button'><img class='auth_icon' alt='apply api key' src='images/apikey.jpeg'></div>\n<div class='auth_container' id='apikey_container'>\n  <div class='key_input_container'>\n    <div class='auth_label'>";
-  if (stack1 = helpers.keyName) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.keyName; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</div>\n    <input placeholder=\"api_key\" class=\"auth_input\" id=\"input_apiKey_entry\" name=\"apiKey\" type=\"text\"/>\n    <div class='auth_submit'><a class='auth_submit_button' id=\"apply_api_key\" href=\"#\">apply</a></div>\n  </div>\n</div>\n\n";
-  return buffer;
-  });
-})();
-
-(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['basic_auth_button_view'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  
-
-
-  return "<div class='auth_button' id='basic_auth_button'><img class='auth_icon' src='images/password.jpeg'></div>\n<div class='auth_container' id='basic_auth_container'>\n  <div class='key_input_container'>\n    <div class=\"auth_label\">Username</div>\n    <input placeholder=\"username\" class=\"auth_input\" id=\"input_username\" name=\"username\" type=\"text\"/>\n    <div class=\"auth_label\">Password</div>\n    <input placeholder=\"password\" class=\"auth_input\" id=\"input_password\" name=\"password\" type=\"password\"/>\n    <div class='auth_submit'><a class='auth_submit_button' id=\"apply_basic_auth\" href=\"#\">apply</a></div>\n  </div>\n</div>\n\n";
-  });
-})();
-
-(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['content_type'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  var buffer = "", stack1, functionType="function", self=this;
-
-function program1(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n  ";
-  stack1 = helpers.each.call(depth0, depth0.produces, {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n";
-  return buffer;
-  }
-function program2(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n	<option value=\"";
-  stack1 = (typeof depth0 === functionType ? depth0.apply(depth0) : depth0);
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\">";
-  stack1 = (typeof depth0 === functionType ? depth0.apply(depth0) : depth0);
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</option>\n	";
-  return buffer;
-  }
-
-function program4(depth0,data) {
-  
-  
-  return "\n  <option value=\"application/json\">application/json</option>\n";
-  }
-
-  buffer += "<label for=\"contentType\"></label>\n<select name=\"contentType\">\n";
-  stack1 = helpers['if'].call(depth0, depth0.produces, {hash:{},inverse:self.program(4, program4, data),fn:self.program(1, program1, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n</select>\n";
-  return buffer;
-  });
-})();
-
-(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['main'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  var buffer = "", stack1, stack2, functionType="function", escapeExpression=this.escapeExpression, self=this;
-
-function program1(depth0,data) {
-  
-  var buffer = "", stack1, stack2;
-  buffer += "\n  <div class=\"info_title\">"
-    + escapeExpression(((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.title)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "</div>\n  <div class=\"info_description\">";
-  stack2 = ((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.description)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1);
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "</div>\n  ";
-  stack2 = helpers['if'].call(depth0, ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.termsOfServiceUrl), {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data});
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n  ";
-  stack2 = helpers['if'].call(depth0, ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.contact), {hash:{},inverse:self.noop,fn:self.program(4, program4, data),data:data});
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n  ";
-  stack2 = helpers['if'].call(depth0, ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.license), {hash:{},inverse:self.noop,fn:self.program(6, program6, data),data:data});
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n  ";
-  return buffer;
-  }
-function program2(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "<div class=\"info_tos\"><a href=\""
-    + escapeExpression(((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.termsOfServiceUrl)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "\">Terms of service</a></div>";
-  return buffer;
-  }
-
-function program4(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "<div class='info_contact'><a href=\"mailto:"
-    + escapeExpression(((stack1 = ((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.contact)),stack1 == null || stack1 === false ? stack1 : stack1.name)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "\">Contact the developer</a></div>";
-  return buffer;
-  }
-
-function program6(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "<div class='info_license'><a href='"
-    + escapeExpression(((stack1 = ((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.license)),stack1 == null || stack1 === false ? stack1 : stack1.url)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "'>"
-    + escapeExpression(((stack1 = ((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.license)),stack1 == null || stack1 === false ? stack1 : stack1.name)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "</a></div>";
-  return buffer;
-  }
-
-function program8(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n    , <span style=\"font-variant: small-caps\">api version</span>: "
-    + escapeExpression(((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.version)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "\n    ";
-  return buffer;
-  }
-
-function program10(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n    <span style=\"float:right\"><a href=\"";
-  if (stack1 = helpers.validatorUrl) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.validatorUrl; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "/debug?url=";
-  if (stack1 = helpers.url) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.url; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "\"><img id=\"validator\" src=\"";
-  if (stack1 = helpers.validatorUrl) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.validatorUrl; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "?url=";
-  if (stack1 = helpers.url) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.url; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "\"></a>\n    </span>\n    ";
-  return buffer;
-  }
-
-  buffer += "<div class='info' id='api_info'>\n  ";
-  stack1 = helpers['if'].call(depth0, depth0.info, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n</div>\n<div class='container' id='resources_container'>\n  <ul id='resources'></ul>\n\n  <div class=\"footer\">\n    <br>\n    <br>\n    <h4 style=\"color: #999\">[ <span style=\"font-variant: small-caps\">base url</span>: ";
-  if (stack1 = helpers.basePath) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.basePath; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "\n    ";
-  stack2 = helpers['if'].call(depth0, ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.version), {hash:{},inverse:self.noop,fn:self.program(8, program8, data),data:data});
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "]\n    ";
-  stack2 = helpers['if'].call(depth0, depth0.validatorUrl, {hash:{},inverse:self.noop,fn:self.program(10, program10, data),data:data});
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n    </h4>\n    </div>\n</div>\n";
-  return buffer;
-  });
-})();
-
-(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['operation'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  var buffer = "", stack1, options, functionType="function", escapeExpression=this.escapeExpression, self=this, blockHelperMissing=helpers.blockHelperMissing;
-
-function program1(depth0,data) {
-  
-  
-  return "deprecated";
-  }
-
-function program3(depth0,data) {
-  
-  
-  return "\n            <h4>Warning: Deprecated</h4>\n        ";
-  }
-
-function program5(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n        <h4>Implementation Notes</h4>\n        <p>";
-  if (stack1 = helpers.description) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.description; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</p>\n        ";
-  return buffer;
-  }
-
-function program7(depth0,data) {
-  
-  
-  return "\n        <div class=\"auth\">\n        <span class=\"api-ic ic-error\"></span>";
-  }
-
-function program9(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n          <div id=\"api_information_panel\" style=\"top: 526px; left: 776px; display: none;\">\n          ";
-  stack1 = helpers.each.call(depth0, depth0, {hash:{},inverse:self.noop,fn:self.program(10, program10, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n          </div>\n        ";
-  return buffer;
-  }
-function program10(depth0,data) {
-  
-  var buffer = "", stack1, stack2;
-  buffer += "\n            <div title='";
-  stack2 = ((stack1 = depth0.description),typeof stack1 === functionType ? stack1.apply(depth0) : stack1);
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "'>"
-    + escapeExpression(((stack1 = depth0.scope),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "</div>\n          ";
-  return buffer;
-  }
-
-function program12(depth0,data) {
-  
-  
-  return "</div>";
-  }
-
-function program14(depth0,data) {
-  
-  
-  return "\n        <div class='access'>\n          <span class=\"api-ic ic-off\" title=\"click to authenticate\"></span>\n        </div>\n        ";
-  }
-
-function program16(depth0,data) {
-  
-  
-  return "\n          <h4>Response Class</h4>\n          <p><span class=\"model-signature\" /></p>\n          <br/>\n          <div class=\"response-content-type\" />\n        ";
-  }
-
-function program18(depth0,data) {
-  
-  
-  return "\n          <h4>Parameters</h4>\n          <table class='fullwidth'>\n          <thead>\n            <tr>\n            <th style=\"width: 100px; max-width: 100px\">Parameter</th>\n            <th style=\"width: 310px; max-width: 310px\">Value</th>\n            <th style=\"width: 200px; max-width: 200px\">Description</th>\n            <th style=\"width: 100px; max-width: 100px\">Parameter Type</th>\n            <th style=\"width: 220px; max-width: 230px\">Data Type</th>\n            </tr>\n          </thead>\n          <tbody class=\"operation-params\">\n\n          </tbody>\n          </table>\n          ";
-  }
-
-function program20(depth0,data) {
-  
-  
-  return "\n          <div style='margin:0;padding:0;display:inline'></div>\n          <h4>Response Messages</h4>\n          <table class='fullwidth'>\n            <thead>\n            <tr>\n              <th>HTTP Status Code</th>\n              <th>Reason</th>\n              <th>Response Model</th>\n            </tr>\n            </thead>\n            <tbody class=\"operation-status\">\n            \n            </tbody>\n          </table>\n          ";
-  }
-
-function program22(depth0,data) {
-  
-  
-  return "\n          ";
-  }
-
-function program24(depth0,data) {
-  
-  
-  return "\n          <div class='sandbox_header'>\n            <input class='submit' name='commit' type='button' value='Try it out!' />\n            <a href='#' class='response_hider' style='display:none'>Hide Response</a>\n            <span class='response_throbber' style='display:none'></span>\n          </div>\n          ";
-  }
-
-  buffer += "\n  <ul class='operations' >\n    <li class='";
-  if (stack1 = helpers.method) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.method; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + " operation' id='";
-  if (stack1 = helpers.parentId) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.parentId; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "_";
-  if (stack1 = helpers.nickname) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.nickname; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'>\n      <div class='heading'>\n        <h3>\n          <span class='http_method'>\n          <a href='#!/";
-  if (stack1 = helpers.parentId) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.parentId; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "/";
-  if (stack1 = helpers.nickname) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.nickname; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "' class=\"toggleOperation\">";
-  if (stack1 = helpers.method) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.method; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</a>\n          </span>\n          <span class='path'>\n          <a href='#!/";
-  if (stack1 = helpers.parentId) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.parentId; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "/";
-  if (stack1 = helpers.nickname) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.nickname; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "' class=\"toggleOperation ";
-  stack1 = helpers['if'].call(depth0, depth0.deprecated, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\">";
-  if (stack1 = helpers.path) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.path; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</a>\n          </span>\n        </h3>\n        <ul class='options'>\n          <li>\n          <a href='#!/";
-  if (stack1 = helpers.parentId) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.parentId; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "/";
-  if (stack1 = helpers.nickname) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.nickname; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "' class=\"toggleOperation\">";
-  if (stack1 = helpers.summary) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.summary; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</a>\n          </li>\n        </ul>\n      </div>\n      <div class='content' id='";
-  if (stack1 = helpers.parentId) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.parentId; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "_";
-  if (stack1 = helpers.nickname) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.nickname; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "_content' style='display:none'>\n        ";
-  stack1 = helpers['if'].call(depth0, depth0.deprecated, {hash:{},inverse:self.noop,fn:self.program(3, program3, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n        ";
-  stack1 = helpers['if'].call(depth0, depth0.description, {hash:{},inverse:self.noop,fn:self.program(5, program5, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n        ";
-  options = {hash:{},inverse:self.noop,fn:self.program(7, program7, data),data:data};
-  if (stack1 = helpers.oauth) { stack1 = stack1.call(depth0, options); }
-  else { stack1 = depth0.oauth; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if (!helpers.oauth) { stack1 = blockHelperMissing.call(depth0, stack1, options); }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n        ";
-  stack1 = helpers.each.call(depth0, depth0.oauth, {hash:{},inverse:self.noop,fn:self.program(9, program9, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n        ";
-  options = {hash:{},inverse:self.noop,fn:self.program(12, program12, data),data:data};
-  if (stack1 = helpers.oauth) { stack1 = stack1.call(depth0, options); }
-  else { stack1 = depth0.oauth; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if (!helpers.oauth) { stack1 = blockHelperMissing.call(depth0, stack1, options); }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n        ";
-  options = {hash:{},inverse:self.noop,fn:self.program(14, program14, data),data:data};
-  if (stack1 = helpers.oauth) { stack1 = stack1.call(depth0, options); }
-  else { stack1 = depth0.oauth; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if (!helpers.oauth) { stack1 = blockHelperMissing.call(depth0, stack1, options); }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n        ";
-  stack1 = helpers['if'].call(depth0, depth0.type, {hash:{},inverse:self.noop,fn:self.program(16, program16, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n        <form accept-charset='UTF-8' class='sandbox'>\n          <div style='margin:0;padding:0;display:inline'></div>\n          ";
-  stack1 = helpers['if'].call(depth0, depth0.parameters, {hash:{},inverse:self.noop,fn:self.program(18, program18, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n          ";
-  stack1 = helpers['if'].call(depth0, depth0.responseMessages, {hash:{},inverse:self.noop,fn:self.program(20, program20, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n          ";
-  stack1 = helpers['if'].call(depth0, depth0.isReadOnly, {hash:{},inverse:self.program(24, program24, data),fn:self.program(22, program22, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n        </form>\n        <div class='response' style='display:none'>\n          <h4>Request URL</h4>\n          <div class='block request_url'></div>\n          <h4>Response Body</h4>\n          <div class='block response_body'></div>\n          <h4>Response Code</h4>\n          <div class='block response_code'></div>\n          <h4>Response Headers</h4>\n          <div class='block response_headers'></div>\n        </div>\n      </div>\n    </li>\n  </ul>\n";
-  return buffer;
-  });
-})();
-
-(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['param'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this;
-
-function program1(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n		";
-  stack1 = helpers['if'].call(depth0, depth0.isFile, {hash:{},inverse:self.program(4, program4, data),fn:self.program(2, program2, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n	";
-  return buffer;
-  }
-function program2(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n			<input type=\"file\" name='";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'/>\n			<div class=\"parameter-content-type\" />\n		";
-  return buffer;
-  }
-
-function program4(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n			";
-  stack1 = helpers['if'].call(depth0, depth0['default'], {hash:{},inverse:self.program(7, program7, data),fn:self.program(5, program5, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n		";
-  return buffer;
-  }
-function program5(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n				<textarea class='body-textarea' name='";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'>";
-  if (stack1 = helpers['default']) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0['default']; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</textarea>\n			";
-  return buffer;
-  }
-
-function program7(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n				<textarea class='body-textarea' name='";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'></textarea>\n				<br />\n				<div class=\"parameter-content-type\" />\n			";
-  return buffer;
-  }
-
-function program9(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n		";
-  stack1 = helpers['if'].call(depth0, depth0.isFile, {hash:{},inverse:self.program(10, program10, data),fn:self.program(2, program2, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n	";
-  return buffer;
-  }
-function program10(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n			";
-  stack1 = helpers['if'].call(depth0, depth0['default'], {hash:{},inverse:self.program(13, program13, data),fn:self.program(11, program11, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n		";
-  return buffer;
-  }
-function program11(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n				<input class='parameter' minlength='0' name='";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "' placeholder='' type='text' value='";
-  if (stack1 = helpers['default']) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0['default']; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'/>\n			";
-  return buffer;
-  }
-
-function program13(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n				<input class='parameter' minlength='0' name='";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "' placeholder='' type='text' value=''/>\n			";
-  return buffer;
-  }
-
-  buffer += "<td class='code'>";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</td>\n<td>\n\n	";
-  stack1 = helpers['if'].call(depth0, depth0.isBody, {hash:{},inverse:self.program(9, program9, data),fn:self.program(1, program1, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n\n</td>\n<td>";
-  if (stack1 = helpers.description) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.description; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</td>\n<td>";
-  if (stack1 = helpers.paramType) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.paramType; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</td>\n<td>\n	<span class=\"model-signature\"></span>\n</td>\n";
-  return buffer;
-  });
-})();
-
-(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['param_list'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  var buffer = "", stack1, stack2, options, self=this, helperMissing=helpers.helperMissing, functionType="function", escapeExpression=this.escapeExpression;
-
-function program1(depth0,data) {
-  
-  
-  return " multiple='multiple'";
-  }
-
-function program3(depth0,data) {
-  
-  
-  return "\n    ";
-  }
-
-function program5(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n      ";
-  stack1 = helpers['if'].call(depth0, depth0.defaultValue, {hash:{},inverse:self.program(8, program8, data),fn:self.program(6, program6, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n    ";
-  return buffer;
-  }
-function program6(depth0,data) {
-  
-  
-  return "\n      ";
-  }
-
-function program8(depth0,data) {
-  
-  var buffer = "", stack1, stack2, options;
-  buffer += "\n        ";
-  options = {hash:{},inverse:self.program(11, program11, data),fn:self.program(9, program9, data),data:data};
-  stack2 = ((stack1 = helpers.isArray || depth0.isArray),stack1 ? stack1.call(depth0, depth0, options) : helperMissing.call(depth0, "isArray", depth0, options));
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n      ";
-  return buffer;
-  }
-function program9(depth0,data) {
-  
-  
-  return "\n        ";
-  }
-
-function program11(depth0,data) {
-  
-  
-  return "\n          <option selected=\"\" value=''></option>\n        ";
-  }
-
-function program13(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n      ";
-  stack1 = helpers['if'].call(depth0, depth0.isDefault, {hash:{},inverse:self.program(16, program16, data),fn:self.program(14, program14, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n    ";
-  return buffer;
-  }
-function program14(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n        <option selected=\"\" value='";
-  if (stack1 = helpers.value) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.value; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'>";
-  if (stack1 = helpers.value) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.value; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + " (default)</option>\n      ";
-  return buffer;
-  }
-
-function program16(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n        <option value='";
-  if (stack1 = helpers.value) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.value; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'>";
-  if (stack1 = helpers.value) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.value; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</option>\n      ";
-  return buffer;
-  }
-
-  buffer += "<td class='code'>";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</td>\n<td>\n  <select ";
-  options = {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data};
-  stack2 = ((stack1 = helpers.isArray || depth0.isArray),stack1 ? stack1.call(depth0, depth0, options) : helperMissing.call(depth0, "isArray", depth0, options));
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += " class='parameter' name='";
-  if (stack2 = helpers.name) { stack2 = stack2.call(depth0, {hash:{},data:data}); }
-  else { stack2 = depth0.name; stack2 = typeof stack2 === functionType ? stack2.apply(depth0) : stack2; }
-  buffer += escapeExpression(stack2)
-    + "'>\n    ";
-  stack2 = helpers['if'].call(depth0, depth0.required, {hash:{},inverse:self.program(5, program5, data),fn:self.program(3, program3, data),data:data});
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n    ";
-  stack2 = helpers.each.call(depth0, ((stack1 = depth0.allowableValues),stack1 == null || stack1 === false ? stack1 : stack1.descriptiveValues), {hash:{},inverse:self.noop,fn:self.program(13, program13, data),data:data});
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n  </select>\n</td>\n<td>";
-  if (stack2 = helpers.description) { stack2 = stack2.call(depth0, {hash:{},data:data}); }
-  else { stack2 = depth0.description; stack2 = typeof stack2 === functionType ? stack2.apply(depth0) : stack2; }
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "</td>\n<td>";
-  if (stack2 = helpers.paramType) { stack2 = stack2.call(depth0, {hash:{},data:data}); }
-  else { stack2 = depth0.paramType; stack2 = typeof stack2 === functionType ? stack2.apply(depth0) : stack2; }
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "</td>\n<td><span class=\"model-signature\"></span></td>";
-  return buffer;
-  });
-})();
-
-(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['param_readonly'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this;
-
-function program1(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n        <textarea class='body-textarea' readonly='readonly' name='";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'>";
-  if (stack1 = helpers.defaultValue) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.defaultValue; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</textarea>\n    ";
-  return buffer;
-  }
-
-function program3(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n        ";
-  stack1 = helpers['if'].call(depth0, depth0.defaultValue, {hash:{},inverse:self.program(6, program6, data),fn:self.program(4, program4, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n    ";
-  return buffer;
-  }
-function program4(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n            ";
-  if (stack1 = helpers.defaultValue) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.defaultValue; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "\n        ";
-  return buffer;
-  }
-
-function program6(depth0,data) {
-  
-  
-  return "\n            (empty)\n        ";
-  }
-
-  buffer += "<td class='code'>";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</td>\n<td>\n    ";
-  stack1 = helpers['if'].call(depth0, depth0.isBody, {hash:{},inverse:self.program(3, program3, data),fn:self.program(1, program1, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n</td>\n<td>";
-  if (stack1 = helpers.description) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.description; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</td>\n<td>";
-  if (stack1 = helpers.paramType) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.paramType; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</td>\n<td><span class=\"model-signature\"></span></td>\n";
-  return buffer;
-  });
-})();
-
-(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['param_readonly_required'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this;
-
-function program1(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n        <textarea class='body-textarea'  readonly='readonly' placeholder='(required)' name='";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'>";
-  if (stack1 = helpers.defaultValue) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.defaultValue; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</textarea>\n    ";
-  return buffer;
-  }
-
-function program3(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n        ";
-  stack1 = helpers['if'].call(depth0, depth0.defaultValue, {hash:{},inverse:self.program(6, program6, data),fn:self.program(4, program4, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n    ";
-  return buffer;
-  }
-function program4(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n            ";
-  if (stack1 = helpers.defaultValue) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.defaultValue; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "\n        ";
-  return buffer;
-  }
-
-function program6(depth0,data) {
-  
-  
-  return "\n            (empty)\n        ";
-  }
-
-  buffer += "<td class='code required'>";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</td>\n<td>\n    ";
-  stack1 = helpers['if'].call(depth0, depth0.isBody, {hash:{},inverse:self.program(3, program3, data),fn:self.program(1, program1, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n</td>\n<td>";
-  if (stack1 = helpers.description) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.description; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</td>\n<td>";
-  if (stack1 = helpers.paramType) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.paramType; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</td>\n<td><span class=\"model-signature\"></span></td>\n";
-  return buffer;
-  });
-})();
-
-(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['param_required'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this;
-
-function program1(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n		";
-  stack1 = helpers['if'].call(depth0, depth0.isFile, {hash:{},inverse:self.program(4, program4, data),fn:self.program(2, program2, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n	";
-  return buffer;
-  }
-function program2(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n			<input type=\"file\" name='";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'/>\n		";
-  return buffer;
-  }
-
-function program4(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n			";
-  stack1 = helpers['if'].call(depth0, depth0.defaultValue, {hash:{},inverse:self.program(7, program7, data),fn:self.program(5, program5, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n		";
-  return buffer;
-  }
-function program5(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n				<textarea class='body-textarea' placeholder='(required)' name='";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'>";
-  if (stack1 = helpers.defaultValue) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.defaultValue; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</textarea>\n			";
-  return buffer;
-  }
-
-function program7(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n				<textarea class='body-textarea' placeholder='(required)' name='";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'></textarea>\n				<br />\n				<div class=\"parameter-content-type\" />\n			";
-  return buffer;
-  }
-
-function program9(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n		";
-  stack1 = helpers['if'].call(depth0, depth0.isFile, {hash:{},inverse:self.program(12, program12, data),fn:self.program(10, program10, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n	";
-  return buffer;
-  }
-function program10(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n			<input class='parameter' class='required' type='file' name='";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'/>\n		";
-  return buffer;
-  }
-
-function program12(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n			";
-  stack1 = helpers['if'].call(depth0, depth0.defaultValue, {hash:{},inverse:self.program(15, program15, data),fn:self.program(13, program13, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n		";
-  return buffer;
-  }
-function program13(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n				<input class='parameter required' minlength='1' name='";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "' placeholder='(required)' type='text' value='";
-  if (stack1 = helpers.defaultValue) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.defaultValue; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'/>\n			";
-  return buffer;
-  }
-
-function program15(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n				<input class='parameter required' minlength='1' name='";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "' placeholder='(required)' type='text' value=''/>\n			";
-  return buffer;
-  }
-
-  buffer += "<td class='code required'>";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</td>\n<td>\n	";
-  stack1 = helpers['if'].call(depth0, depth0.isBody, {hash:{},inverse:self.program(9, program9, data),fn:self.program(1, program1, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n</td>\n<td>\n	<strong>";
-  if (stack1 = helpers.description) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.description; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</strong>\n</td>\n<td>";
-  if (stack1 = helpers.paramType) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.paramType; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</td>\n<td><span class=\"model-signature\"></span></td>\n";
-  return buffer;
-  });
-})();
-
-(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['parameter_content_type'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  var buffer = "", stack1, functionType="function", self=this;
-
-function program1(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n  ";
-  stack1 = helpers.each.call(depth0, depth0.consumes, {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n";
-  return buffer;
-  }
-function program2(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n  <option value=\"";
-  stack1 = (typeof depth0 === functionType ? depth0.apply(depth0) : depth0);
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\">";
-  stack1 = (typeof depth0 === functionType ? depth0.apply(depth0) : depth0);
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</option>\n  ";
-  return buffer;
-  }
-
-function program4(depth0,data) {
-  
-  
-  return "\n  <option value=\"application/json\">application/json</option>\n";
-  }
-
-  buffer += "<label for=\"parameterContentType\"></label>\n<select name=\"parameterContentType\">\n";
-  stack1 = helpers['if'].call(depth0, depth0.consumes, {hash:{},inverse:self.program(4, program4, data),fn:self.program(1, program1, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n</select>\n";
-  return buffer;
-  });
-})();
-
-(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['resource'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  var buffer = "", stack1, options, functionType="function", escapeExpression=this.escapeExpression, self=this, blockHelperMissing=helpers.blockHelperMissing;
-
-function program1(depth0,data) {
-  
-  
-  return " : ";
-  }
-
-function program3(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "<li>\n      <a href='";
-  if (stack1 = helpers.url) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.url; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'>Raw</a>\n    </li>";
-  return buffer;
-  }
-
-  buffer += "<div class='heading'>\n  <h2>\n    <a href='#!/";
-  if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "' class=\"toggleEndpointList\" data-id=\"";
-  if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "\">";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</a> ";
-  options = {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data};
-  if (stack1 = helpers.summary) { stack1 = stack1.call(depth0, options); }
-  else { stack1 = depth0.summary; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if (!helpers.summary) { stack1 = blockHelperMissing.call(depth0, stack1, options); }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  if (stack1 = helpers.summary) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.summary; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n  </h2>\n  <ul class='options'>\n    <li>\n      <a href='#!/";
-  if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "' id='endpointListTogger_";
-  if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "' class=\"toggleEndpointList\" data-id=\"";
-  if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "\">Show/Hide</a>\n    </li>\n    <li>\n      <a href='#' class=\"collapseResource\" data-id=\"";
-  if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "\">\n        List Operations\n      </a>\n    </li>\n    <li>\n      <a href='#' class=\"expandResource\" data-id=";
-  if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + ">\n        Expand Operations\n      </a>\n    </li>\n    ";
-  options = {hash:{},inverse:self.noop,fn:self.program(3, program3, data),data:data};
-  if (stack1 = helpers.url) { stack1 = stack1.call(depth0, options); }
-  else { stack1 = depth0.url; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if (!helpers.url) { stack1 = blockHelperMissing.call(depth0, stack1, options); }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n  </ul>\n</div>\n<ul class='endpoints' id='";
-  if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "_endpoint_list' style='display:none'>\n\n</ul>\n";
-  return buffer;
-  });
-})();
-
-(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['response_content_type'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  var buffer = "", stack1, functionType="function", self=this;
-
-function program1(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n  ";
-  stack1 = helpers.each.call(depth0, depth0.produces, {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n";
-  return buffer;
-  }
-function program2(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n  <option value=\"";
-  stack1 = (typeof depth0 === functionType ? depth0.apply(depth0) : depth0);
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\">";
-  stack1 = (typeof depth0 === functionType ? depth0.apply(depth0) : depth0);
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</option>\n  ";
-  return buffer;
-  }
-
-function program4(depth0,data) {
-  
-  
-  return "\n  <option value=\"application/json\">application/json</option>\n";
-  }
-
-  buffer += "<label for=\"responseContentType\"></label>\n<select name=\"responseContentType\">\n";
-  stack1 = helpers['if'].call(depth0, depth0.produces, {hash:{},inverse:self.program(4, program4, data),fn:self.program(1, program1, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n</select>\n";
-  return buffer;
-  });
-})();
-
-(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['signature'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression;
-
-
-  buffer += "<div>\n<ul class=\"signature-nav\">\n  <li><a class=\"description-link\" href=\"#\">Model</a></li>\n  <li><a class=\"snippet-link\" href=\"#\">Model Schema</a></li>\n</ul>\n<div>\n\n<div class=\"signature-container\">\n  <div class=\"description\">\n    ";
-  if (stack1 = helpers.signature) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.signature; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n  </div>\n\n  <div class=\"snippet\">\n    <pre><code>";
-  if (stack1 = helpers.sampleJSON) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.sampleJSON; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</code></pre>\n    <small class=\"notice\"></small>\n  </div>\n</div>\n\n";
-  return buffer;
-  });
-})();
-
-(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['status_code'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression;
-
-
-  buffer += "<td width='15%' class='code'>";
-  if (stack1 = helpers.code) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.code; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</td>\n<td>";
-  if (stack1 = helpers.message) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.message; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</td>\n<td width='50%'><span class=\"model-signature\" /></td>";
-  return buffer;
-  });
-})();
-
-
-
-// Generated by CoffeeScript 1.6.3
-(function() {
-  var ApiKeyButton, BasicAuthButton, ContentTypeView, HeaderView, MainView, OperationView, ParameterContentTypeView, ParameterView, ResourceView, ResponseContentTypeView, SignatureView, StatusCodeView, SwaggerUi, _ref, _ref1, _ref10, _ref11, _ref12, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8, _ref9,
-    __hasProp = {}.hasOwnProperty,
-    __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
-
-  SwaggerUi = (function(_super) {
-    __extends(SwaggerUi, _super);
-
-    function SwaggerUi() {
-      _ref = SwaggerUi.__super__.constructor.apply(this, arguments);
-      return _ref;
-    }
-
-    SwaggerUi.prototype.dom_id = "swagger_ui";
-
-    SwaggerUi.prototype.options = null;
-
-    SwaggerUi.prototype.api = null;
-
-    SwaggerUi.prototype.headerView = null;
-
-    SwaggerUi.prototype.mainView = null;
-
-    SwaggerUi.prototype.initialize = function(options) {
-      var _this = this;
-      if (options == null) {
-        options = {};
-      }
-      if (options.dom_id != null) {
-        this.dom_id = options.dom_id;
-        delete options.dom_id;
-      }
-      if ($('#' + this.dom_id) == null) {
-        $('body').append('<div id="' + this.dom_id + '"></div>');
-      }
-      this.options = options;
-      this.options.success = function() {
-        return _this.render();
-      };
-      this.options.progress = function(d) {
-        return _this.showMessage(d);
-      };
-      this.options.failure = function(d) {
-        if (_this.api && _this.api.isValid === false) {
-          log("not a valid 2.0 spec, loading legacy client");
-          _this.api = new SwaggerApi(_this.options);
-          return _this.api.build();
-        } else {
-          return _this.onLoadFailure(d);
-        }
-      };
-      this.headerView = new HeaderView({
-        el: $('#header')
-      });
-      return this.headerView.on('update-swagger-ui', function(data) {
-        return _this.updateSwaggerUi(data);
-      });
-    };
-
-    SwaggerUi.prototype.setOption = function(option, value) {
-      return this.options[option] = value;
-    };
-
-    SwaggerUi.prototype.getOption = function(option) {
-      return this.options[option];
-    };
-
-    SwaggerUi.prototype.updateSwaggerUi = function(data) {
-      this.options.url = data.url;
-      return this.load();
-    };
-
-    SwaggerUi.prototype.load = function() {
-      var url, _ref1;
-      if ((_ref1 = this.mainView) != null) {
-        _ref1.clear();
-      }
-      url = this.options.url;
-      if (url.indexOf("http") !== 0) {
-        url = this.buildUrl(window.location.href.toString(), url);
-      }
-      this.options.url = url;
-      this.headerView.update(url);
-      this.api = new SwaggerClient(this.options);
-      return this.api.build();
-    };
-
-    SwaggerUi.prototype.render = function() {
-      var _this = this;
-      this.showMessage('Finished Loading Resource Information. Rendering Swagger UI...');
-      this.mainView = new MainView({
-        model: this.api,
-        el: $('#' + this.dom_id),
-        swaggerOptions: this.options
-      }).render();
-      this.showMessage();
-      switch (this.options.docExpansion) {
-        case "full":
-          Docs.expandOperationsForResource('');
-          break;
-        case "list":
-          Docs.collapseOperationsForResource('');
-      }
-      if (this.options.onComplete) {
-        this.options.onComplete(this.api, this);
-      }
-      return setTimeout(function() {
-        return Docs.shebang();
-      }, 400);
-    };
-
-    SwaggerUi.prototype.buildUrl = function(base, url) {
-      var endOfPath, parts;
-      log("base is " + base);
-      if (url.indexOf("/") === 0) {
-        parts = base.split("/");
-        base = parts[0] + "//" + parts[2];
-        return base + url;
-      } else {
-        endOfPath = base.length;
-        if (base.indexOf("?") > -1) {
-          endOfPath = Math.min(endOfPath, base.indexOf("?"));
-        }
-        if (base.indexOf("#") > -1) {
-          endOfPath = Math.min(endOfPath, base.indexOf("#"));
-        }
-        base = base.substring(0, endOfPath);
-        if (base.indexOf("/", base.length - 1) !== -1) {
-          return base + url;
-        }
-        return base + "/" + url;
-      }
-    };
-
-    SwaggerUi.prototype.showMessage = function(data) {
-      if (data == null) {
-        data = '';
-      }
-      $('#message-bar').removeClass('message-fail');
-      $('#message-bar').addClass('message-success');
-      return $('#message-bar').html(data);
-    };
-
-    SwaggerUi.prototype.onLoadFailure = function(data) {
-      var val;
-      if (data == null) {
-        data = '';
-      }
-      $('#message-bar').removeClass('message-success');
-      $('#message-bar').addClass('message-fail');
-      val = $('#message-bar').html(data);
-      if (this.options.onFailure != null) {
-        this.options.onFailure(data);
-      }
-      return val;
-    };
-
-    return SwaggerUi;
-
-  })(Backbone.Router);
-
-  window.SwaggerUi = SwaggerUi;
-
-  HeaderView = (function(_super) {
-    __extends(HeaderView, _super);
-
-    function HeaderView() {
-      _ref1 = HeaderView.__super__.constructor.apply(this, arguments);
-      return _ref1;
-    }
-
-    HeaderView.prototype.events = {
-      'click #show-pet-store-icon': 'showPetStore',
-      'click #show-wordnik-dev-icon': 'showWordnikDev',
-      'click #explore': 'showCustom',
-      'keyup #input_baseUrl': 'showCustomOnKeyup',
-      'keyup #input_apiKey': 'showCustomOnKeyup'
-    };
-
-    HeaderView.prototype.initialize = function() {};
-
-    HeaderView.prototype.showPetStore = function(e) {
-      return this.trigger('update-swagger-ui', {
-        url: "http://petstore.swagger.wordnik.com/api/api-docs"
-      });
-    };
-
-    HeaderView.prototype.showWordnikDev = function(e) {
-      return this.trigger('update-swagger-ui', {
-        url: "http://api.wordnik.com/v4/resources.json"
-      });
-    };
-
-    HeaderView.prototype.showCustomOnKeyup = function(e) {
-      if (e.keyCode === 13) {
-        return this.showCustom();
-      }
-    };
-
-    HeaderView.prototype.showCustom = function(e) {
-      if (e != null) {
-        e.preventDefault();
-      }
-      return this.trigger('update-swagger-ui', {
-        url: $('#input_baseUrl').val(),
-        apiKey: $('#input_apiKey').val()
-      });
-    };
-
-    HeaderView.prototype.update = function(url, apiKey, trigger) {
-      if (trigger == null) {
-        trigger = false;
-      }
-      $('#input_baseUrl').val(url);
-      if (trigger) {
-        return this.trigger('update-swagger-ui', {
-          url: url
-        });
-      }
-    };
-
-    return HeaderView;
-
-  })(Backbone.View);
-
-  MainView = (function(_super) {
-    var sorters;
-
-    __extends(MainView, _super);
-
-    function MainView() {
-      _ref2 = MainView.__super__.constructor.apply(this, arguments);
-      return _ref2;
-    }
-
-    sorters = {
-      'alpha': function(a, b) {
-        return a.path.localeCompare(b.path);
-      },
-      'method': function(a, b) {
-        return a.method.localeCompare(b.method);
-      }
-    };
-
-    MainView.prototype.initialize = function(opts) {
-      var auth, key, name, url, value, _ref3;
-      if (opts == null) {
-        opts = {};
-      }
-      this.model.auths = [];
-      _ref3 = this.model.securityDefinitions;
-      for (key in _ref3) {
-        value = _ref3[key];
-        auth = {
-          name: key,
-          type: value.type,
-          value: value
-        };
-        this.model.auths.push(auth);
-      }
-      if (this.model.info && this.model.info.license && typeof this.model.info.license === 'string') {
-        name = this.model.info.license;
-        url = this.model.info.licenseUrl;
-        this.model.info.license = {};
-        this.model.info.license.name = name;
-        this.model.info.license.url = url;
-      }
-      if (!this.model.info) {
-        this.model.info = {};
-      }
-      if (!this.model.info.version) {
-        this.model.info.version = this.model.apiVersion;
-      }
-      if (this.model.swaggerVersion === "2.0") {
-        if ("validatorUrl" in opts.swaggerOptions) {
-          return this.model.validatorUrl = opts.swaggerOptions.validatorUrl;
-        } else if (this.model.url.match(/https?:\/\/localhost/)) {
-          return this.model.validatorUrl = this.model.url;
-        } else {
-          return this.model.validatorUrl = "http://online.swagger.io/validator";
-        }
-      }
-    };
-
-    MainView.prototype.render = function() {
-      var auth, button, counter, id, name, resource, resources, _i, _len, _ref3;
-      if (this.model.securityDefinitions) {
-        for (name in this.model.securityDefinitions) {
-          auth = this.model.securityDefinitions[name];
-          if (auth.type === "apiKey" && $("#apikey_button").length === 0) {
-            button = new ApiKeyButton({
-              model: auth
-            }).render().el;
-            $('.auth_main_container').append(button);
-          }
-          if (auth.type === "basicAuth" && $("#basic_auth_button").length === 0) {
-            button = new BasicAuthButton({
-              model: auth
-            }).render().el;
-            $('.auth_main_container').append(button);
-          }
-        }
-      }
-      $(this.el).html(Handlebars.templates.main(this.model));
-      resources = {};
-      counter = 0;
-      _ref3 = this.model.apisArray;
-      for (_i = 0, _len = _ref3.length; _i < _len; _i++) {
-        resource = _ref3[_i];
-        id = resource.name;
-        while (typeof resources[id] !== 'undefined') {
-          id = id + "_" + counter;
-          counter += 1;
-        }
-        resource.id = id;
-        resources[id] = resource;
-        this.addResource(resource, this.model.auths);
-      }
-      return this;
-    };
-
-    MainView.prototype.addResource = function(resource, auths) {
-      var resourceView;
-      resource.id = resource.id.replace(/\s/g, '_');
-      resourceView = new ResourceView({
-        model: resource,
-        tagName: 'li',
-        id: 'resource_' + resource.id,
-        className: 'resource',
-        auths: auths,
-        swaggerOptions: this.options.swaggerOptions
-      });
-      return $('#resources').append(resourceView.render().el);
-    };
-
-    MainView.prototype.clear = function() {
-      return $(this.el).html('');
-    };
-
-    return MainView;
-
-  })(Backbone.View);
-
-  ResourceView = (function(_super) {
-    __extends(ResourceView, _super);
-
-    function ResourceView() {
-      _ref3 = ResourceView.__super__.constructor.apply(this, arguments);
-      return _ref3;
-    }
-
-    ResourceView.prototype.initialize = function(opts) {
-      if (opts == null) {
-        opts = {};
-      }
-      this.auths = opts.auths;
-      if ("" === this.model.description) {
-        return this.model.description = null;
-      }
-    };
-
-    ResourceView.prototype.render = function() {
-      var counter, id, methods, operation, _i, _len, _ref4;
-      $(this.el).html(Handlebars.templates.resource(this.model));
-      methods = {};
-      if (this.model.description) {
-        this.model.summary = this.model.description;
-      }
-      _ref4 = this.model.operationsArray;
-      for (_i = 0, _len = _ref4.length; _i < _len; _i++) {
-        operation = _ref4[_i];
-        counter = 0;
-        id = operation.nickname;
-        while (typeof methods[id] !== 'undefined') {
-          id = id + "_" + counter;
-          counter += 1;
-        }
-        methods[id] = operation;
-        operation.nickname = id;
-        operation.parentId = this.model.id;
-        this.addOperation(operation);
-      }
-      $('.toggleEndpointList', this.el).click(this.callDocs.bind(this, 'toggleEndpointListForResource'));
-      $('.collapseResource', this.el).click(this.callDocs.bind(this, 'collapseOperationsForResource'));
-      $('.expandResource', this.el).click(this.callDocs.bind(this, 'expandOperationsForResource'));
-      return this;
-    };
-
-    ResourceView.prototype.addOperation = function(operation) {
-      var operationView;
-      operation.number = this.number;
-      operationView = new OperationView({
-        model: operation,
-        tagName: 'li',
-        className: 'endpoint',
-        swaggerOptions: this.options.swaggerOptions,
-        auths: this.auths
-      });
-      $('.endpoints', $(this.el)).append(operationView.render().el);
-      return this.number++;
-    };
-
-    ResourceView.prototype.callDocs = function(fnName, e) {
-      e.preventDefault();
-      return Docs[fnName](e.currentTarget.getAttribute('data-id'));
-    };
-
-    return ResourceView;
-
-  })(Backbone.View);
-
-  OperationView = (function(_super) {
-    __extends(OperationView, _super);
-
-    function OperationView() {
-      _ref4 = OperationView.__super__.constructor.apply(this, arguments);
-      return _ref4;
-    }
-
-    OperationView.prototype.invocationUrl = null;
-
-    OperationView.prototype.events = {
-      'submit .sandbox': 'submitOperation',
-      'click .submit': 'submitOperation',
-      'click .response_hider': 'hideResponse',
-      'click .toggleOperation': 'toggleOperationContent',
-      'mouseenter .api-ic': 'mouseEnter',
-      'mouseout .api-ic': 'mouseExit'
-    };
-
-    OperationView.prototype.initialize = function(opts) {
-      if (opts == null) {
-        opts = {};
-      }
-      this.auths = opts.auths;
-      return this;
-    };
-
-    OperationView.prototype.mouseEnter = function(e) {
-      var elem, hgh, pos, scMaxX, scMaxY, scX, scY, wd, x, y;
-      elem = $(e.currentTarget.parentNode).find('#api_information_panel');
-      x = e.pageX;
-      y = e.pageY;
-      scX = $(window).scrollLeft();
-      scY = $(window).scrollTop();
-      scMaxX = scX + $(window).width();
-      scMaxY = scY + $(window).height();
-      wd = elem.width();
-      hgh = elem.height();
-      if (x + wd > scMaxX) {
-        x = scMaxX - wd;
-      }
-      if (x < scX) {
-        x = scX;
-      }
-      if (y + hgh > scMaxY) {
-        y = scMaxY - hgh;
-      }
-      if (y < scY) {
-        y = scY;
-      }
-      pos = {};
-      pos.top = y;
-      pos.left = x;
-      elem.css(pos);
-      return $(e.currentTarget.parentNode).find('#api_information_panel').show();
-    };
-
-    OperationView.prototype.mouseExit = function(e) {
-      return $(e.currentTarget.parentNode).find('#api_information_panel').hide();
-    };
-
-    OperationView.prototype.render = function() {
-      var a, auth, auths, code, contentTypeModel, isMethodSubmissionSupported, k, key, o, param, ref, responseContentTypeView, responseSignatureView, schema, schemaObj, signatureModel, statusCode, type, v, value, _i, _j, _k, _l, _len, _len1, _len2, _len3, _len4, _m, _ref10, _ref11, _ref5, _ref6, _ref7, _ref8, _ref9;
-      isMethodSubmissionSupported = true;
-      if (!isMethodSubmissionSupported) {
-        this.model.isReadOnly = true;
-      }
-      this.model.description = this.model.description || this.model.notes;
-      if (this.model.description) {
-        this.model.description = this.model.description.replace(/(?:\r\n|\r|\n)/g, '<br />');
-      }
-      this.model.oauth = null;
-      log(this.model.authorizations);
-      if (this.model.authorizations) {
-        if (Array.isArray(this.model.authorizations)) {
-          _ref5 = this.model.authorizations;
-          for (_i = 0, _len = _ref5.length; _i < _len; _i++) {
-            auths = _ref5[_i];
-            for (key in auths) {
-              auth = auths[key];
-              for (a in this.auths) {
-                auth = this.auths[a];
-                if (auth.type === 'oauth2') {
-                  this.model.oauth = {};
-                  this.model.oauth.scopes = [];
-                  _ref6 = auth.value.scopes;
-                  for (k in _ref6) {
-                    v = _ref6[k];
-                    o = {
-                      scope: k,
-                      description: v
-                    };
-                    this.model.oauth.scopes.push(o);
-                  }
-                }
-              }
-            }
-          }
-        } else {
-          _ref7 = this.model.authorizations;
-          for (k in _ref7) {
-            v = _ref7[k];
-            if (k === "oauth2") {
-              if (this.model.oauth === null) {
-                this.model.oauth = {};
-              }
-              if (this.model.oauth.scopes === void 0) {
-                this.model.oauth.scopes = [];
-              }
-              for (_j = 0, _len1 = v.length; _j < _len1; _j++) {
-                o = v[_j];
-                this.model.oauth.scopes.push(o);
-              }
-            }
-          }
-        }
-      }
-      if (typeof this.model.responses !== 'undefined') {
-        this.model.responseMessages = [];
-        _ref8 = this.model.responses;
-        for (code in _ref8) {
-          value = _ref8[code];
-          schema = null;
-          schemaObj = this.model.responses[code].schema;
-          if (schemaObj && schemaObj['$ref']) {
-            schema = schemaObj['$ref'];
-            if (schema.indexOf('#/definitions/') === 0) {
-              schema = schema.substring('#/definitions/'.length);
-            }
-          }
-          this.model.responseMessages.push({
-            code: code,
-            message: value.description,
-            responseModel: schema
-          });
-        }
-      }
-      if (typeof this.model.responseMessages === 'undefined') {
-        this.model.responseMessages = [];
-      }
-      $(this.el).html(Handlebars.templates.operation(this.model));
-      if (this.model.responseClassSignature && this.model.responseClassSignature !== 'string') {
-        signatureModel = {
-          sampleJSON: this.model.responseSampleJSON,
-          isParam: false,
-          signature: this.model.responseClassSignature
-        };
-        responseSignatureView = new SignatureView({
-          model: signatureModel,
-          tagName: 'div'
-        });
-        $('.model-signature', $(this.el)).append(responseSignatureView.render().el);
-      } else {
-        this.model.responseClassSignature = 'string';
-        $('.model-signature', $(this.el)).html(this.model.type);
-      }
-      contentTypeModel = {
-        isParam: false
-      };
-      contentTypeModel.consumes = this.model.consumes;
-      contentTypeModel.produces = this.model.produces;
-      _ref9 = this.model.parameters;
-      for (_k = 0, _len2 = _ref9.length; _k < _len2; _k++) {
-        param = _ref9[_k];
-        type = param.type || param.dataType;
-        if (typeof type === 'undefined') {
-          schema = param.schema;
-          if (schema && schema['$ref']) {
-            ref = schema['$ref'];
-            if (ref.indexOf('#/definitions/') === 0) {
-              type = ref.substring('#/definitions/'.length);
-            } else {
-              type = ref;
-            }
-          }
-        }
-        if (type && type.toLowerCase() === 'file') {
-          if (!contentTypeModel.consumes) {
-            contentTypeModel.consumes = 'multipart/form-data';
-          }
-        }
-        param.type = type;
-      }
-      responseContentTypeView = new ResponseContentTypeView({
-        model: contentTypeModel
-      });
-      $('.response-content-type', $(this.el)).append(responseContentTypeView.render().el);
-      _ref10 = this.model.parameters;
-      for (_l = 0, _len3 = _ref10.length; _l < _len3; _l++) {
-        param = _ref10[_l];
-        this.addParameter(param, contentTypeModel.consumes);
-      }
-      _ref11 = this.model.responseMessages;
-      for (_m = 0, _len4 = _ref11.length; _m < _len4; _m++) {
-        statusCode = _ref11[_m];
-        this.addStatusCode(statusCode);
-      }
-      return this;
-    };
-
-    OperationView.prototype.addParameter = function(param, consumes) {
-      var paramView;
-      param.consumes = consumes;
-      paramView = new ParameterView({
-        model: param,
-        tagName: 'tr',
-        readOnly: this.model.isReadOnly
-      });
-      return $('.operation-params', $(this.el)).append(paramView.render().el);
-    };
-
-    OperationView.prototype.addStatusCode = function(statusCode) {
-      var statusCodeView;
-      statusCodeView = new StatusCodeView({
-        model: statusCode,
-        tagName: 'tr'
-      });
-      return $('.operation-status', $(this.el)).append(statusCodeView.render().el);
-    };
-
-    OperationView.prototype.submitOperation = function(e) {
-      var error_free, form, isFileUpload, map, o, opts, val, _i, _j, _k, _len, _len1, _len2, _ref5, _ref6, _ref7;
-      if (e != null) {
-        e.preventDefault();
-      }
-      form = $('.sandbox', $(this.el));
-      error_free = true;
-      form.find("input.required").each(function() {
-        var _this = this;
-        $(this).removeClass("error");
-        if (jQuery.trim($(this).val()) === "") {
-          $(this).addClass("error");
-          $(this).wiggle({
-            callback: function() {
-              return $(_this).focus();
-            }
-          });
-          return error_free = false;
-        }
-      });
-      if (error_free) {
-        map = {};
-        opts = {
-          parent: this
-        };
-        isFileUpload = false;
-        _ref5 = form.find("input");
-        for (_i = 0, _len = _ref5.length; _i < _len; _i++) {
-          o = _ref5[_i];
-          if ((o.value != null) && jQuery.trim(o.value).length > 0) {
-            map[o.name] = o.value;
-          }
-          if (o.type === "file") {
-            isFileUpload = true;
-          }
-        }
-        _ref6 = form.find("textarea");
-        for (_j = 0, _len1 = _ref6.length; _j < _len1; _j++) {
-          o = _ref6[_j];
-          if ((o.value != null) && jQuery.trim(o.value).length > 0) {
-            map[o.name] = o.value;
-          }
-        }
-        _ref7 = form.find("select");
-        for (_k = 0, _len2 = _ref7.length; _k < _len2; _k++) {
-          o = _ref7[_k];
-          val = this.getSelectedValue(o);
-          if ((val != null) && jQuery.trim(val).length > 0) {
-            map[o.name] = val;
-          }
-        }
-        opts.responseContentType = $("div select[name=responseContentType]", $(this.el)).val();
-        opts.requestContentType = $("div select[name=parameterContentType]", $(this.el)).val();
-        $(".response_throbber", $(this.el)).show();
-        if (isFileUpload) {
-          return this.handleFileUpload(map, form);
-        } else {
-          return this.model["do"](map, opts, this.showCompleteStatus, this.showErrorStatus, this);
-        }
-      }
-    };
-
-    OperationView.prototype.success = function(response, parent) {
-      return parent.showCompleteStatus(response);
-    };
-
-    OperationView.prototype.handleFileUpload = function(map, form) {
-      var bodyParam, el, headerParams, o, obj, param, params, _i, _j, _k, _l, _len, _len1, _len2, _len3, _ref5, _ref6, _ref7, _ref8,
-        _this = this;
-      _ref5 = form.serializeArray();
-      for (_i = 0, _len = _ref5.length; _i < _len; _i++) {
-        o = _ref5[_i];
-        if ((o.value != null) && jQuery.trim(o.value).length > 0) {
-          map[o.name] = o.value;
-        }
-      }
-      bodyParam = new FormData();
-      params = 0;
-      _ref6 = this.model.parameters;
-      for (_j = 0, _len1 = _ref6.length; _j < _len1; _j++) {
-        param = _ref6[_j];
-        if (param.paramType === 'form') {
-          if (param.type.toLowerCase() !== 'file' && map[param.name] !== void 0) {
-            bodyParam.append(param.name, map[param.name]);
-          }
-        }
-      }
-      headerParams = {};
-      _ref7 = this.model.parameters;
-      for (_k = 0, _len2 = _ref7.length; _k < _len2; _k++) {
-        param = _ref7[_k];
-        if (param.paramType === 'header') {
-          headerParams[param.name] = map[param.name];
-        }
-      }
-      _ref8 = form.find('input[type~="file"]');
-      for (_l = 0, _len3 = _ref8.length; _l < _len3; _l++) {
-        el = _ref8[_l];
-        if (typeof el.files[0] !== 'undefined') {
-          bodyParam.append($(el).attr('name'), el.files[0]);
-          params += 1;
-        }
-      }
-      this.invocationUrl = this.model.supportHeaderParams() ? (headerParams = this.model.getHeaderParams(map), this.model.urlify(map, false)) : this.model.urlify(map, true);
-      $(".request_url", $(this.el)).html("<pre></pre>");
-      $(".request_url pre", $(this.el)).text(this.invocationUrl);
-      obj = {
-        type: this.model.method,
-        url: this.invocationUrl,
-        headers: headerParams,
-        data: bodyParam,
-        dataType: 'json',
-        contentType: false,
-        processData: false,
-        error: function(data, textStatus, error) {
-          return _this.showErrorStatus(_this.wrap(data), _this);
-        },
-        success: function(data) {
-          return _this.showResponse(data, _this);
-        },
-        complete: function(data) {
-          return _this.showCompleteStatus(_this.wrap(data), _this);
-        }
-      };
-      if (window.authorizations) {
-        window.authorizations.apply(obj);
-      }
-      if (params === 0) {
-        obj.data.append("fake", "true");
-      }
-      jQuery.ajax(obj);
-      return false;
-    };
-
-    OperationView.prototype.wrap = function(data) {
-      var h, headerArray, headers, i, o, _i, _len;
-      headers = {};
-      headerArray = data.getAllResponseHeaders().split("\r");
-      for (_i = 0, _len = headerArray.length; _i < _len; _i++) {
-        i = headerArray[_i];
-        h = i.split(':');
-        if (h[0] !== void 0 && h[1] !== void 0) {
-          headers[h[0].trim()] = h[1].trim();
-        }
-      }
-      o = {};
-      o.content = {};
-      o.content.data = data.responseText;
-      o.headers = headers;
-      o.request = {};
-      o.request.url = this.invocationUrl;
-      o.status = data.status;
-      return o;
-    };
-
-    OperationView.prototype.getSelectedValue = function(select) {
-      var opt, options, _i, _len, _ref5;
-      if (!select.multiple) {
-        return select.value;
-      } else {
-        options = [];
-        _ref5 = select.options;
-        for (_i = 0, _len = _ref5.length; _i < _len; _i++) {
-          opt = _ref5[_i];
-          if (opt.selected) {
-            options.push(opt.value);
-          }
-        }
-        if (options.length > 0) {
-          return options;
-        } else {
-          return null;
-        }
-      }
-    };
-
-    OperationView.prototype.hideResponse = function(e) {
-      if (e != null) {
-        e.preventDefault();
-      }
-      $(".response", $(this.el)).slideUp();
-      return $(".response_hider", $(this.el)).fadeOut();
-    };
-
-    OperationView.prototype.showResponse = function(response) {
-      var prettyJson;
-      prettyJson = JSON.stringify(response, null, "\t").replace(/\n/g, "<br>");
-      return $(".response_body", $(this.el)).html(escape(prettyJson));
-    };
-
-    OperationView.prototype.showErrorStatus = function(data, parent) {
-      return parent.showStatus(data);
-    };
-
-    OperationView.prototype.showCompleteStatus = function(data, parent) {
-      return parent.showStatus(data);
-    };
-
-    OperationView.prototype.formatXml = function(xml) {
-      var contexp, formatted, indent, lastType, lines, ln, pad, reg, transitions, wsexp, _fn, _i, _len;
-      reg = /(>)(<)(\/*)/g;
-      wsexp = /[ ]*(.*)[ ]+\n/g;
-      contexp = /(<.+>)(.+\n)/g;
-      xml = xml.replace(reg, '$1\n$2$3').replace(wsexp, '$1\n').replace(contexp, '$1\n$2');
-      pad = 0;
-      formatted = '';
-      lines = xml.split('\n');
-      indent = 0;
-      lastType = 'other';
-      transitions = {
-        'single->single': 0,
-        'single->closing': -1,
-        'single->opening': 0,
-        'single->other': 0,
-        'closing->single': 0,
-        'closing->closing': -1,
-        'closing->opening': 0,
-        'closing->other': 0,
-        'opening->single': 1,
-        'opening->closing': 0,
-        'opening->opening': 1,
-        'opening->other': 1,
-        'other->single': 0,
-        'other->closing': -1,
-        'other->opening': 0,
-        'other->other': 0
-      };
-      _fn = function(ln) {
-        var fromTo, j, key, padding, type, types, value;
-        types = {
-          single: Boolean(ln.match(/<.+\/>/)),
-          closing: Boolean(ln.match(/<\/.+>/)),
-          opening: Boolean(ln.match(/<[^!?].*>/))
-        };
-        type = ((function() {
-          var _results;
-          _results = [];
-          for (key in types) {
-            value = types[key];
-            if (value) {
-              _results.push(key);
-            }
-          }
-          return _results;
-        })())[0];
-        type = type === void 0 ? 'other' : type;
-        fromTo = lastType + '->' + type;
-        lastType = type;
-        padding = '';
-        indent += transitions[fromTo];
-        padding = ((function() {
-          var _j, _ref5, _results;
-          _results = [];
-          for (j = _j = 0, _ref5 = indent; 0 <= _ref5 ? _j < _ref5 : _j > _ref5; j = 0 <= _ref5 ? ++_j : --_j) {
-            _results.push('  ');
-          }
-          return _results;
-        })()).join('');
-        if (fromTo === 'opening->closing') {
-          return formatted = formatted.substr(0, formatted.length - 1) + ln + '\n';
-        } else {
-          return formatted += padding + ln + '\n';
-        }
-      };
-      for (_i = 0, _len = lines.length; _i < _len; _i++) {
-        ln = lines[_i];
-        _fn(ln);
-      }
-      return formatted;
-    };
-
-    OperationView.prototype.showStatus = function(response) {
-      var code, content, contentType, e, headers, json, opts, pre, response_body, response_body_el, url;
-      if (response.content === void 0) {
-        content = response.data;
-        url = response.url;
-      } else {
-        content = response.content.data;
-        url = response.request.url;
-      }
-      headers = response.headers;
-      contentType = null;
-      if (headers) {
-        contentType = headers["Content-Type"] || headers["content-type"];
-        if (contentType) {
-          contentType = contentType.split(";")[0].trim();
-        }
-      }
-      if (!content) {
-        code = $('<code />').text("no content");
-        pre = $('<pre class="json" />').append(code);
-      } else if (contentType === "application/json" || /\+json$/.test(contentType)) {
-        json = null;
-        try {
-          json = JSON.stringify(JSON.parse(content), null, "  ");
-        } catch (_error) {
-          e = _error;
-          json = "can't parse JSON.  Raw result:\n\n" + content;
-        }
-        code = $('<code />').text(json);
-        pre = $('<pre class="json" />').append(code);
-      } else if (contentType === "application/xml" || /\+xml$/.test(contentType)) {
-        code = $('<code />').text(this.formatXml(content));
-        pre = $('<pre class="xml" />').append(code);
-      } else if (contentType === "text/html") {
-        code = $('<code />').html(_.escape(content));
-        pre = $('<pre class="xml" />').append(code);
-      } else if (/^image\//.test(contentType)) {
-        pre = $('<img>').attr('src', url);
-      } else {
-        code = $('<code />').text(content);
-        pre = $('<pre class="json" />').append(code);
-      }
-      response_body = pre;
-      $(".request_url", $(this.el)).html("<pre></pre>");
-      $(".request_url pre", $(this.el)).text(url);
-      $(".response_code", $(this.el)).html("<pre>" + response.status + "</pre>");
-      $(".response_body", $(this.el)).html(response_body);
-      $(".response_headers", $(this.el)).html("<pre>" + _.escape(JSON.stringify(response.headers, null, "  ")).replace(/\n/g, "<br>") + "</pre>");
-      $(".response", $(this.el)).slideDown();
-      $(".response_hider", $(this.el)).show();
-      $(".response_throbber", $(this.el)).hide();
-      response_body_el = $('.response_body', $(this.el))[0];
-      opts = this.options.swaggerOptions;
-      if (opts.highlightSizeThreshold && response.data.length > opts.highlightSizeThreshold) {
-        return response_body_el;
-      } else {
-        return hljs.highlightBlock(response_body_el);
-      }
-    };
-
-    OperationView.prototype.toggleOperationContent = function() {
-      var elem;
-      elem = $('#' + Docs.escapeResourceName(this.model.parentId) + "_" + this.model.nickname + "_content");
-      if (elem.is(':visible')) {
-        return Docs.collapseOperation(elem);
-      } else {
-        return Docs.expandOperation(elem);
-      }
-    };
-
-    return OperationView;
-
-  })(Backbone.View);
-
-  StatusCodeView = (function(_super) {
-    __extends(StatusCodeView, _super);
-
-    function StatusCodeView() {
-      _ref5 = StatusCodeView.__super__.constructor.apply(this, arguments);
-      return _ref5;
-    }
-
-    StatusCodeView.prototype.initialize = function() {};
-
-    StatusCodeView.prototype.render = function() {
-      var responseModel, responseModelView, template;
-      template = this.template();
-      $(this.el).html(template(this.model));
-      if (swaggerUi.api.models.hasOwnProperty(this.model.responseModel)) {
-        responseModel = {
-          sampleJSON: JSON.stringify(swaggerUi.api.models[this.model.responseModel].createJSONSample(), null, 2),
-          isParam: false,
-          signature: swaggerUi.api.models[this.model.responseModel].getMockSignature()
-        };
-        responseModelView = new SignatureView({
-          model: responseModel,
-          tagName: 'div'
-        });
-        $('.model-signature', this.$el).append(responseModelView.render().el);
-      } else {
-        $('.model-signature', this.$el).html('');
-      }
-      return this;
-    };
-
-    StatusCodeView.prototype.template = function() {
-      return Handlebars.templates.status_code;
-    };
-
-    return StatusCodeView;
-
-  })(Backbone.View);
-
-  ParameterView = (function(_super) {
-    __extends(ParameterView, _super);
-
-    function ParameterView() {
-      _ref6 = ParameterView.__super__.constructor.apply(this, arguments);
-      return _ref6;
-    }
-
-    ParameterView.prototype.initialize = function() {
-      return Handlebars.registerHelper('isArray', function(param, opts) {
-        if (param.type.toLowerCase() === 'array' || param.allowMultiple) {
-          return opts.fn(this);
-        } else {
-          return opts.inverse(this);
-        }
-      });
-    };
-
-    ParameterView.prototype.render = function() {
-      var contentTypeModel, isParam, parameterContentTypeView, ref, responseContentTypeView, schema, signatureModel, signatureView, template, type;
-      type = this.model.type || this.model.dataType;
-      if (typeof type === 'undefined') {
-        schema = this.model.schema;
-        if (schema && schema['$ref']) {
-          ref = schema['$ref'];
-          if (ref.indexOf('#/definitions/') === 0) {
-            type = ref.substring('#/definitions/'.length);
-          } else {
-            type = ref;
-          }
-        }
-      }
-      this.model.type = type;
-      this.model.paramType = this.model["in"] || this.model.paramType;
-      if (this.model.paramType === 'body') {
-        this.model.isBody = true;
-      }
-      if (type && type.toLowerCase() === 'file') {
-        this.model.isFile = true;
-      }
-      this.model["default"] = this.model["default"] || this.model.defaultValue;
-      template = this.template();
-      $(this.el).html(template(this.model));
-      signatureModel = {
-        sampleJSON: this.model.sampleJSON,
-        isParam: true,
-        signature: this.model.signature
-      };
-      if (this.model.sampleJSON) {
-        signatureView = new SignatureView({
-          model: signatureModel,
-          tagName: 'div'
-        });
-        $('.model-signature', $(this.el)).append(signatureView.render().el);
-      } else {
-        $('.model-signature', $(this.el)).html(this.model.signature);
-      }
-      isParam = false;
-      if (this.model.isBody) {
-        isParam = true;
-      }
-      contentTypeModel = {
-        isParam: isParam
-      };
-      contentTypeModel.consumes = this.model.consumes;
-      if (isParam) {
-        parameterContentTypeView = new ParameterContentTypeView({
-          model: contentTypeModel
-        });
-        $('.parameter-content-type', $(this.el)).append(parameterContentTypeView.render().el);
-      } else {
-        responseContentTypeView = new ResponseContentTypeView({
-          model: contentTypeModel
-        });
-        $('.response-content-type', $(this.el)).append(responseContentTypeView.render().el);
-      }
-      return this;
-    };
-
-    ParameterView.prototype.template = function() {
-      if (this.model.isList) {
-        return Handlebars.templates.param_list;
-      } else {
-        if (this.options.readOnly) {
-          if (this.model.required) {
-            return Handlebars.templates.param_readonly_required;
-          } else {
-            return Handlebars.templates.param_readonly;
-          }
-        } else {
-          if (this.model.required) {
-            return Handlebars.templates.param_required;
-          } else {
-            return Handlebars.templates.param;
-          }
-        }
-      }
-    };
-
-    return ParameterView;
-
-  })(Backbone.View);
-
-  SignatureView = (function(_super) {
-    __extends(SignatureView, _super);
-
-    function SignatureView() {
-      _ref7 = SignatureView.__super__.constructor.apply(this, arguments);
-      return _ref7;
-    }
-
-    SignatureView.prototype.events = {
-      'click a.description-link': 'switchToDescription',
-      'click a.snippet-link': 'switchToSnippet',
-      'mousedown .snippet': 'snippetToTextArea'
-    };
-
-    SignatureView.prototype.initialize = function() {};
-
-    SignatureView.prototype.render = function() {
-      var template;
-      template = this.template();
-      $(this.el).html(template(this.model));
-      this.switchToSnippet();
-      this.isParam = this.model.isParam;
-      if (this.isParam) {
-        $('.notice', $(this.el)).text('Click to set as parameter value');
-      }
-      return this;
-    };
-
-    SignatureView.prototype.template = function() {
-      return Handlebars.templates.signature;
-    };
-
-    SignatureView.prototype.switchToDescription = function(e) {
-      if (e != null) {
-        e.preventDefault();
-      }
-      $(".snippet", $(this.el)).hide();
-      $(".description", $(this.el)).show();
-      $('.description-link', $(this.el)).addClass('selected');
-      return $('.snippet-link', $(this.el)).removeClass('selected');
-    };
-
-    SignatureView.prototype.switchToSnippet = function(e) {
-      if (e != null) {
-        e.preventDefault();
-      }
-      $(".description", $(this.el)).hide();
-      $(".snippet", $(this.el)).show();
-      $('.snippet-link', $(this.el)).addClass('selected');
-      return $('.description-link', $(this.el)).removeClass('selected');
-    };
-
-    SignatureView.prototype.snippetToTextArea = function(e) {
-      var textArea;
-      if (this.isParam) {
-        if (e != null) {
-          e.preventDefault();
-        }
-        textArea = $('textarea', $(this.el.parentNode.parentNode.parentNode));
-        if ($.trim(textArea.val()) === '') {
-          return textArea.val(this.model.sampleJSON);
-        }
-      }
-    };
-
-    return SignatureView;
-
-  })(Backbone.View);
-
-  ContentTypeView = (function(_super) {
-    __extends(ContentTypeView, _super);
-
-    function ContentTypeView() {
-      _ref8 = ContentTypeView.__super__.constructor.apply(this, arguments);
-      return _ref8;
-    }
-
-    ContentTypeView.prototype.initialize = function() {};
-
-    ContentTypeView.prototype.render = function() {
-      var template;
-      template = this.template();
-      $(this.el).html(template(this.model));
-      $('label[for=contentType]', $(this.el)).text('Response Content Type');
-      return this;
-    };
-
-    ContentTypeView.prototype.template = function() {
-      return Handlebars.templates.content_type;
-    };
-
-    return ContentTypeView;
-
-  })(Backbone.View);
-
-  ResponseContentTypeView = (function(_super) {
-    __extends(ResponseContentTypeView, _super);
-
-    function ResponseContentTypeView() {
-      _ref9 = ResponseContentTypeView.__super__.constructor.apply(this, arguments);
-      return _ref9;
-    }
-
-    ResponseContentTypeView.prototype.initialize = function() {};
-
-    ResponseContentTypeView.prototype.render = function() {
-      var template;
-      template = this.template();
-      $(this.el).html(template(this.model));
-      $('label[for=responseContentType]', $(this.el)).text('Response Content Type');
-      return this;
-    };
-
-    ResponseContentTypeView.prototype.template = function() {
-      return Handlebars.templates.response_content_type;
-    };
-
-    return ResponseContentTypeView;
-
-  })(Backbone.View);
-
-  ParameterContentTypeView = (function(_super) {
-    __extends(ParameterContentTypeView, _super);
-
-    function ParameterContentTypeView() {
-      _ref10 = ParameterContentTypeView.__super__.constructor.apply(this, arguments);
-      return _ref10;
-    }
-
-    ParameterContentTypeView.prototype.initialize = function() {};
-
-    ParameterContentTypeView.prototype.render = function() {
-      var template;
-      template = this.template();
-      $(this.el).html(template(this.model));
-      $('label[for=parameterContentType]', $(this.el)).text('Parameter content type:');
-      return this;
-    };
-
-    ParameterContentTypeView.prototype.template = function() {
-      return Handlebars.templates.parameter_content_type;
-    };
-
-    return ParameterContentTypeView;
-
-  })(Backbone.View);
-
-  ApiKeyButton = (function(_super) {
-    __extends(ApiKeyButton, _super);
-
-    function ApiKeyButton() {
-      _ref11 = ApiKeyButton.__super__.constructor.apply(this, arguments);
-      return _ref11;
-    }
-
-    ApiKeyButton.prototype.initialize = function() {};
-
-    ApiKeyButton.prototype.render = function() {
-      var template;
-      template = this.template();
-      $(this.el).html(template(this.model));
-      return this;
-    };
-
-    ApiKeyButton.prototype.events = {
-      "click #apikey_button": "toggleApiKeyContainer",
-      "click #apply_api_key": "applyApiKey"
-    };
-
-    ApiKeyButton.prototype.applyApiKey = function() {
-      var elem;
-      window.authorizations.add(this.model.name, new ApiKeyAuthorization(this.model.name, $("#input_apiKey_entry").val(), this.model["in"]));
-      window.swaggerUi.load();
-      return elem = $('#apikey_container').show();
-    };
-
-    ApiKeyButton.prototype.toggleApiKeyContainer = function() {
-      var elem;
-      if ($('#apikey_container').length > 0) {
-        elem = $('#apikey_container').first();
-        if (elem.is(':visible')) {
-          return elem.hide();
-        } else {
-          $('.auth_container').hide();
-          return elem.show();
-        }
-      }
-    };
-
-    ApiKeyButton.prototype.template = function() {
-      return Handlebars.templates.apikey_button_view;
-    };
-
-    return ApiKeyButton;
-
-  })(Backbone.View);
-
-  BasicAuthButton = (function(_super) {
-    __extends(BasicAuthButton, _super);
-
-    function BasicAuthButton() {
-      _ref12 = BasicAuthButton.__super__.constructor.apply(this, arguments);
-      return _ref12;
-    }
-
-    BasicAuthButton.prototype.initialize = function() {};
-
-    BasicAuthButton.prototype.render = function() {
-      var template;
-      template = this.template();
-      $(this.el).html(template(this.model));
-      return this;
-    };
-
-    BasicAuthButton.prototype.events = {
-      "click #basic_auth_button": "togglePasswordContainer",
-      "click #apply_basic_auth": "applyPassword"
-    };
-
-    BasicAuthButton.prototype.applyPassword = function() {
-      var elem, password, username;
-      console.log("applying password");
-      username = $(".input_username").val();
-      password = $(".input_password").val();
-      window.authorizations.add(this.model.type, new PasswordAuthorization("basic", username, password));
-      window.swaggerUi.load();
-      return elem = $('#basic_auth_container').hide();
-    };
-
-    BasicAuthButton.prototype.togglePasswordContainer = function() {
-      var elem;
-      if ($('#basic_auth_container').length > 0) {
-        elem = $('#basic_auth_container').show();
-        if (elem.is(':visible')) {
-          return elem.slideUp();
-        } else {
-          $('.auth_container').hide();
-          return elem.show();
-        }
-      }
-    };
-
-    BasicAuthButton.prototype.template = function() {
-      return Handlebars.templates.basic_auth_button_view;
-    };
-
-    return BasicAuthButton;
-
-  })(Backbone.View);
-
-}).call(this);
diff --git a/src/main/webapp/public/docs/swagger-ui.min.js b/src/main/webapp/public/docs/swagger-ui.min.js
deleted file mode 100644
index f13bdc979..000000000
--- a/src/main/webapp/public/docs/swagger-ui.min.js
+++ /dev/null
@@ -1 +0,0 @@
-$(function(){$.fn.vAlign=function(){return this.each(function(c){var a=$(this).height();var d=$(this).parent().height();var b=(d-a)/2;$(this).css("margin-top",b)})};$.fn.stretchFormtasticInputWidthToParent=function(){return this.each(function(b){var d=$(this).closest("form").innerWidth();var c=parseInt($(this).closest("form").css("padding-left"),10)+parseInt($(this).closest("form").css("padding-right"),10);var a=parseInt($(this).css("padding-left"),10)+parseInt($(this).css("padding-right"),10);$(this).css("width",d-c-a)})};$("form.formtastic li.string input, form.formtastic textarea").stretchFormtasticInputWidthToParent();$("ul.downplayed li div.content p").vAlign();$("form.sandbox").submit(function(){var a=true;$(this).find("input.required").each(function(){$(this).removeClass("error");if($(this).val()==""){$(this).addClass("error");$(this).wiggle();a=false}});return a})});function clippyCopiedCallback(b){$("#api_key_copied").fadeIn().delay(1000).fadeOut()}log=function(){log.history=log.history||[];log.history.push(arguments);if(this.console){console.log(Array.prototype.slice.call(arguments)[0])}};if(Function.prototype.bind&&console&&typeof console.log=="object"){["log","info","warn","error","assert","dir","clear","profile","profileEnd"].forEach(function(a){console[a]=this.bind(console[a],console)},Function.prototype.call)}var Docs={shebang:function(){var b=$.param.fragment().split("/");b.shift();switch(b.length){case 1:var d="resource_"+b[0];Docs.expandEndpointListForResource(b[0]);$("#"+d).slideto({highlight:false});break;case 2:Docs.expandEndpointListForResource(b[0]);$("#"+d).slideto({highlight:false});var c=b.join("_");var a=c+"_content";Docs.expandOperation($("#"+a));$("#"+c).slideto({highlight:false});break}},toggleEndpointListForResource:function(b){var a=$("li#resource_"+Docs.escapeResourceName(b)+" ul.endpoints");if(a.is(":visible")){Docs.collapseEndpointListForResource(b)}else{Docs.expandEndpointListForResource(b)}},expandEndpointListForResource:function(b){var b=Docs.escapeResourceName(b);if(b==""){$(".resource ul.endpoints").slideDown();return}$("li#resource_"+b).addClass("active");var a=$("li#resource_"+b+" ul.endpoints");a.slideDown()},collapseEndpointListForResource:function(b){var b=Docs.escapeResourceName(b);$("li#resource_"+b).removeClass("active");var a=$("li#resource_"+b+" ul.endpoints");a.slideUp()},expandOperationsForResource:function(a){Docs.expandEndpointListForResource(a);if(a==""){$(".resource ul.endpoints li.operation div.content").slideDown();return}$("li#resource_"+Docs.escapeResourceName(a)+" li.operation div.content").each(function(){Docs.expandOperation($(this))})},collapseOperationsForResource:function(a){Docs.expandEndpointListForResource(a);$("li#resource_"+Docs.escapeResourceName(a)+" li.operation div.content").each(function(){Docs.collapseOperation($(this))})},escapeResourceName:function(a){return a.replace(/[!"#$%&'()*+,.\/:;<=>?@\[\\\]\^`{|}~]/g,"\\$&")},expandOperation:function(a){a.slideDown()},collapseOperation:function(a){a.slideUp()}};(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.apikey_button_view=b(function(e,k,d,j,i){this.compilerInfo=[4,">= 1.0.0"];d=this.merge(d,e.helpers);i=i||{};var g="",c,f="function",h=this.escapeExpression;g+="<div class='auth_button' id='apikey_button'><img class='auth_icon' alt='apply api key' src='images/apikey.jpeg'></div>\n<div class='auth_container' id='apikey_container'>\n  <div class='key_input_container'>\n    <div class='auth_label'>";if(c=d.keyName){c=c.call(k,{hash:{},data:i})}else{c=k.keyName;c=typeof c===f?c.apply(k):c}g+=h(c)+'</div>\n    <input placeholder="api_key" class="auth_input" id="input_apiKey_entry" name="apiKey" type="text"/>\n    <div class=\'auth_submit\'><a class=\'auth_submit_button\' id="apply_api_key" href="#">apply</a></div>\n  </div>\n</div>\n\n';return g})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.basic_auth_button_view=b(function(f,g,d,c,e){this.compilerInfo=[4,">= 1.0.0"];d=this.merge(d,f.helpers);e=e||{};return'<div class=\'auth_button\' id=\'basic_auth_button\'><img class=\'auth_icon\' src=\'images/password.jpeg\'></div>\n<div class=\'auth_container\' id=\'basic_auth_container\'>\n  <div class=\'key_input_container\'>\n    <div class="auth_label">Username</div>\n    <input placeholder="username" class="auth_input" id="input_username" name="username" type="text"/>\n    <div class="auth_label">Password</div>\n    <input placeholder="password" class="auth_input" id="input_password" name="password" type="password"/>\n    <div class=\'auth_submit\'><a class=\'auth_submit_button\' id="apply_basic_auth" href="#">apply</a></div>\n  </div>\n</div>\n\n'})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.content_type=b(function(g,l,f,k,j){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);j=j||{};var i="",c,h="function",m=this;function e(r,q){var o="",p;o+="\n  ";p=f.each.call(r,r.produces,{hash:{},inverse:m.noop,fn:m.program(2,d,q),data:q});if(p||p===0){o+=p}o+="\n";return o}function d(r,q){var o="",p;o+='\n	<option value="';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+='">';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+="</option>\n	";return o}function n(p,o){return'\n  <option value="application/json">application/json</option>\n'}i+='<label for="contentType"></label>\n<select name="contentType">\n';c=f["if"].call(l,l.produces,{hash:{},inverse:m.program(4,n,j),fn:m.program(1,e,j),data:j});if(c||c===0){i+=c}i+="\n</select>\n";return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.main=b(function(h,n,g,m,l){this.compilerInfo=[4,">= 1.0.0"];g=this.merge(g,h.helpers);l=l||{};var j="",c,s,i="function",k=this.escapeExpression,q=this;function f(x,w){var t="",v,u;t+='\n  <div class="info_title">'+k(((v=((v=x.info),v==null||v===false?v:v.title)),typeof v===i?v.apply(x):v))+'</div>\n  <div class="info_description">';u=((v=((v=x.info),v==null||v===false?v:v.description)),typeof v===i?v.apply(x):v);if(u||u===0){t+=u}t+="</div>\n  ";u=g["if"].call(x,((v=x.info),v==null||v===false?v:v.termsOfServiceUrl),{hash:{},inverse:q.noop,fn:q.program(2,d,w),data:w});if(u||u===0){t+=u}t+="\n  ";u=g["if"].call(x,((v=x.info),v==null||v===false?v:v.contact),{hash:{},inverse:q.noop,fn:q.program(4,r,w),data:w});if(u||u===0){t+=u}t+="\n  ";u=g["if"].call(x,((v=x.info),v==null||v===false?v:v.license),{hash:{},inverse:q.noop,fn:q.program(6,p,w),data:w});if(u||u===0){t+=u}t+="\n  ";return t}function d(w,v){var t="",u;t+='<div class="info_tos"><a href="'+k(((u=((u=w.info),u==null||u===false?u:u.termsOfServiceUrl)),typeof u===i?u.apply(w):u))+'">Terms of service</a></div>';return t}function r(w,v){var t="",u;t+="<div class='info_contact'><a href=\"mailto:"+k(((u=((u=((u=w.info),u==null||u===false?u:u.contact)),u==null||u===false?u:u.name)),typeof u===i?u.apply(w):u))+'">Contact the developer</a></div>';return t}function p(w,v){var t="",u;t+="<div class='info_license'><a href='"+k(((u=((u=((u=w.info),u==null||u===false?u:u.license)),u==null||u===false?u:u.url)),typeof u===i?u.apply(w):u))+"'>"+k(((u=((u=((u=w.info),u==null||u===false?u:u.license)),u==null||u===false?u:u.name)),typeof u===i?u.apply(w):u))+"</a></div>";return t}function o(w,v){var t="",u;t+='\n    , <span style="font-variant: small-caps">api version</span>: '+k(((u=((u=w.info),u==null||u===false?u:u.version)),typeof u===i?u.apply(w):u))+"\n    ";return t}function e(w,v){var t="",u;t+='\n    <span style="float:right"><a href="';if(u=g.validatorUrl){u=u.call(w,{hash:{},data:v})}else{u=w.validatorUrl;u=typeof u===i?u.apply(w):u}t+=k(u)+"/debug?url=";if(u=g.url){u=u.call(w,{hash:{},data:v})}else{u=w.url;u=typeof u===i?u.apply(w):u}t+=k(u)+'"><img id="validator" src="';if(u=g.validatorUrl){u=u.call(w,{hash:{},data:v})}else{u=w.validatorUrl;u=typeof u===i?u.apply(w):u}t+=k(u)+"?url=";if(u=g.url){u=u.call(w,{hash:{},data:v})}else{u=w.url;u=typeof u===i?u.apply(w):u}t+=k(u)+'"></a>\n    </span>\n    ';return t}j+="<div class='info' id='api_info'>\n  ";c=g["if"].call(n,n.info,{hash:{},inverse:q.noop,fn:q.program(1,f,l),data:l});if(c||c===0){j+=c}j+="\n</div>\n<div class='container' id='resources_container'>\n  <ul id='resources'></ul>\n\n  <div class=\"footer\">\n    <br>\n    <br>\n    <h4 style=\"color: #999\">[ <span style=\"font-variant: small-caps\">base url</span>: ";if(c=g.basePath){c=c.call(n,{hash:{},data:l})}else{c=n.basePath;c=typeof c===i?c.apply(n):c}j+=k(c)+"\n    ";s=g["if"].call(n,((c=n.info),c==null||c===false?c:c.version),{hash:{},inverse:q.noop,fn:q.program(8,o,l),data:l});if(s||s===0){j+=s}j+="]\n    ";s=g["if"].call(n,n.validatorUrl,{hash:{},inverse:q.noop,fn:q.program(10,e,l),data:l});if(s||s===0){j+=s}j+="\n    </h4>\n    </div>\n</div>\n";return j})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.operation=b(function(j,u,s,o,A){this.compilerInfo=[4,">= 1.0.0"];s=this.merge(s,j.helpers);A=A||{};var t="",k,f,e="function",d=this.escapeExpression,r=this,c=s.blockHelperMissing;function q(C,B){return"deprecated"}function p(C,B){return"\n            <h4>Warning: Deprecated</h4>\n        "}function n(E,D){var B="",C;B+="\n        <h4>Implementation Notes</h4>\n        <p>";if(C=s.description){C=C.call(E,{hash:{},data:D})}else{C=E.description;C=typeof C===e?C.apply(E):C}if(C||C===0){B+=C}B+="</p>\n        ";return B}function m(C,B){return'\n        <div class="auth">\n        <span class="api-ic ic-error"></span>'}function i(E,D){var B="",C;B+='\n          <div id="api_information_panel" style="top: 526px; left: 776px; display: none;">\n          ';C=s.each.call(E,E,{hash:{},inverse:r.noop,fn:r.program(10,z,D),data:D});if(C||C===0){B+=C}B+="\n          </div>\n        ";return B}function z(F,E){var B="",D,C;B+="\n            <div title='";C=((D=F.description),typeof D===e?D.apply(F):D);if(C||C===0){B+=C}B+="'>"+d(((D=F.scope),typeof D===e?D.apply(F):D))+"</div>\n          ";return B}function y(C,B){return"</div>"}function x(C,B){return'\n        <div class=\'access\'>\n          <span class="api-ic ic-off" title="click to authenticate"></span>\n        </div>\n        '}function w(C,B){return'\n          <h4>Response Class</h4>\n          <p><span class="model-signature" /></p>\n          <br/>\n          <div class="response-content-type" />\n        '}function v(C,B){return'\n          <h4>Parameters</h4>\n          <table class=\'fullwidth\'>\n          <thead>\n            <tr>\n            <th style="width: 100px; max-width: 100px">Parameter</th>\n            <th style="width: 310px; max-width: 310px">Value</th>\n            <th style="width: 200px; max-width: 200px">Description</th>\n            <th style="width: 100px; max-width: 100px">Parameter Type</th>\n            <th style="width: 220px; max-width: 230px">Data Type</th>\n            </tr>\n          </thead>\n          <tbody class="operation-params">\n\n          </tbody>\n          </table>\n          '}function l(C,B){return"\n          <div style='margin:0;padding:0;display:inline'></div>\n          <h4>Response Messages</h4>\n          <table class='fullwidth'>\n            <thead>\n            <tr>\n              <th>HTTP Status Code</th>\n              <th>Reason</th>\n              <th>Response Model</th>\n            </tr>\n            </thead>\n            <tbody class=\"operation-status\">\n            \n            </tbody>\n          </table>\n          "}function h(C,B){return"\n          "}function g(C,B){return"\n          <div class='sandbox_header'>\n            <input class='submit' name='commit' type='button' value='Try it out!' />\n            <a href='#' class='response_hider' style='display:none'>Hide Response</a>\n            <span class='response_throbber' style='display:none'></span>\n          </div>\n          "}t+="\n  <ul class='operations' >\n    <li class='";if(k=s.method){k=k.call(u,{hash:{},data:A})}else{k=u.method;k=typeof k===e?k.apply(u):k}t+=d(k)+" operation' id='";if(k=s.parentId){k=k.call(u,{hash:{},data:A})}else{k=u.parentId;k=typeof k===e?k.apply(u):k}t+=d(k)+"_";if(k=s.nickname){k=k.call(u,{hash:{},data:A})}else{k=u.nickname;k=typeof k===e?k.apply(u):k}t+=d(k)+"'>\n      <div class='heading'>\n        <h3>\n          <span class='http_method'>\n          <a href='#!/";if(k=s.parentId){k=k.call(u,{hash:{},data:A})}else{k=u.parentId;k=typeof k===e?k.apply(u):k}t+=d(k)+"/";if(k=s.nickname){k=k.call(u,{hash:{},data:A})}else{k=u.nickname;k=typeof k===e?k.apply(u):k}t+=d(k)+'\' class="toggleOperation">';if(k=s.method){k=k.call(u,{hash:{},data:A})}else{k=u.method;k=typeof k===e?k.apply(u):k}t+=d(k)+"</a>\n          </span>\n          <span class='path'>\n          <a href='#!/";if(k=s.parentId){k=k.call(u,{hash:{},data:A})}else{k=u.parentId;k=typeof k===e?k.apply(u):k}t+=d(k)+"/";if(k=s.nickname){k=k.call(u,{hash:{},data:A})}else{k=u.nickname;k=typeof k===e?k.apply(u):k}t+=d(k)+"' class=\"toggleOperation ";k=s["if"].call(u,u.deprecated,{hash:{},inverse:r.noop,fn:r.program(1,q,A),data:A});if(k||k===0){t+=k}t+='">';if(k=s.path){k=k.call(u,{hash:{},data:A})}else{k=u.path;k=typeof k===e?k.apply(u):k}t+=d(k)+"</a>\n          </span>\n        </h3>\n        <ul class='options'>\n          <li>\n          <a href='#!/";if(k=s.parentId){k=k.call(u,{hash:{},data:A})}else{k=u.parentId;k=typeof k===e?k.apply(u):k}t+=d(k)+"/";if(k=s.nickname){k=k.call(u,{hash:{},data:A})}else{k=u.nickname;k=typeof k===e?k.apply(u):k}t+=d(k)+'\' class="toggleOperation">';if(k=s.summary){k=k.call(u,{hash:{},data:A})}else{k=u.summary;k=typeof k===e?k.apply(u):k}if(k||k===0){t+=k}t+="</a>\n          </li>\n        </ul>\n      </div>\n      <div class='content' id='";if(k=s.parentId){k=k.call(u,{hash:{},data:A})}else{k=u.parentId;k=typeof k===e?k.apply(u):k}t+=d(k)+"_";if(k=s.nickname){k=k.call(u,{hash:{},data:A})}else{k=u.nickname;k=typeof k===e?k.apply(u):k}t+=d(k)+"_content' style='display:none'>\n        ";k=s["if"].call(u,u.deprecated,{hash:{},inverse:r.noop,fn:r.program(3,p,A),data:A});if(k||k===0){t+=k}t+="\n        ";k=s["if"].call(u,u.description,{hash:{},inverse:r.noop,fn:r.program(5,n,A),data:A});if(k||k===0){t+=k}t+="\n        ";f={hash:{},inverse:r.noop,fn:r.program(7,m,A),data:A};if(k=s.oauth){k=k.call(u,f)}else{k=u.oauth;k=typeof k===e?k.apply(u):k}if(!s.oauth){k=c.call(u,k,f)}if(k||k===0){t+=k}t+="\n        ";k=s.each.call(u,u.oauth,{hash:{},inverse:r.noop,fn:r.program(9,i,A),data:A});if(k||k===0){t+=k}t+="\n        ";f={hash:{},inverse:r.noop,fn:r.program(12,y,A),data:A};if(k=s.oauth){k=k.call(u,f)}else{k=u.oauth;k=typeof k===e?k.apply(u):k}if(!s.oauth){k=c.call(u,k,f)}if(k||k===0){t+=k}t+="\n        ";f={hash:{},inverse:r.noop,fn:r.program(14,x,A),data:A};if(k=s.oauth){k=k.call(u,f)}else{k=u.oauth;k=typeof k===e?k.apply(u):k}if(!s.oauth){k=c.call(u,k,f)}if(k||k===0){t+=k}t+="\n        ";k=s["if"].call(u,u.type,{hash:{},inverse:r.noop,fn:r.program(16,w,A),data:A});if(k||k===0){t+=k}t+="\n        <form accept-charset='UTF-8' class='sandbox'>\n          <div style='margin:0;padding:0;display:inline'></div>\n          ";k=s["if"].call(u,u.parameters,{hash:{},inverse:r.noop,fn:r.program(18,v,A),data:A});if(k||k===0){t+=k}t+="\n          ";k=s["if"].call(u,u.responseMessages,{hash:{},inverse:r.noop,fn:r.program(20,l,A),data:A});if(k||k===0){t+=k}t+="\n          ";k=s["if"].call(u,u.isReadOnly,{hash:{},inverse:r.program(24,g,A),fn:r.program(22,h,A),data:A});if(k||k===0){t+=k}t+="\n        </form>\n        <div class='response' style='display:none'>\n          <h4>Request URL</h4>\n          <div class='block request_url'></div>\n          <h4>Response Body</h4>\n          <div class='block response_body'></div>\n          <h4>Response Code</h4>\n          <div class='block response_code'></div>\n          <h4>Response Headers</h4>\n          <div class='block response_headers'></div>\n        </div>\n      </div>\n    </li>\n  </ul>\n";return t})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param=b(function(f,q,o,j,t){this.compilerInfo=[4,">= 1.0.0"];o=this.merge(o,f.helpers);t=t||{};var p="",g,d="function",c=this.escapeExpression,n=this;function m(y,x){var v="",w;v+="\n		";w=o["if"].call(y,y.isFile,{hash:{},inverse:n.program(4,k,x),fn:n.program(2,l,x),data:x});if(w||w===0){v+=w}v+="\n	";return v}function l(y,x){var v="",w;v+='\n			<input type="file" name=\'';if(w=o.name){w=w.call(y,{hash:{},data:x})}else{w=y.name;w=typeof w===d?w.apply(y):w}v+=c(w)+'\'/>\n			<div class="parameter-content-type" />\n		';return v}function k(y,x){var v="",w;v+="\n			";w=o["if"].call(y,y["default"],{hash:{},inverse:n.program(7,h,x),fn:n.program(5,i,x),data:x});if(w||w===0){v+=w}v+="\n		";return v}function i(y,x){var v="",w;v+="\n				<textarea class='body-textarea' name='";if(w=o.name){w=w.call(y,{hash:{},data:x})}else{w=y.name;w=typeof w===d?w.apply(y):w}v+=c(w)+"'>";if(w=o["default"]){w=w.call(y,{hash:{},data:x})}else{w=y["default"];w=typeof w===d?w.apply(y):w}v+=c(w)+"</textarea>\n			";return v}function h(y,x){var v="",w;v+="\n				<textarea class='body-textarea' name='";if(w=o.name){w=w.call(y,{hash:{},data:x})}else{w=y.name;w=typeof w===d?w.apply(y):w}v+=c(w)+'\'></textarea>\n				<br />\n				<div class="parameter-content-type" />\n			';return v}function e(y,x){var v="",w;v+="\n		";w=o["if"].call(y,y.isFile,{hash:{},inverse:n.program(10,u,x),fn:n.program(2,l,x),data:x});if(w||w===0){v+=w}v+="\n	";return v}function u(y,x){var v="",w;v+="\n			";w=o["if"].call(y,y["default"],{hash:{},inverse:n.program(13,r,x),fn:n.program(11,s,x),data:x});if(w||w===0){v+=w}v+="\n		";return v}function s(y,x){var v="",w;v+="\n				<input class='parameter' minlength='0' name='";if(w=o.name){w=w.call(y,{hash:{},data:x})}else{w=y.name;w=typeof w===d?w.apply(y):w}v+=c(w)+"' placeholder='' type='text' value='";if(w=o["default"]){w=w.call(y,{hash:{},data:x})}else{w=y["default"];w=typeof w===d?w.apply(y):w}v+=c(w)+"'/>\n			";return v}function r(y,x){var v="",w;v+="\n				<input class='parameter' minlength='0' name='";if(w=o.name){w=w.call(y,{hash:{},data:x})}else{w=y.name;w=typeof w===d?w.apply(y):w}v+=c(w)+"' placeholder='' type='text' value=''/>\n			";return v}p+="<td class='code'>";if(g=o.name){g=g.call(q,{hash:{},data:t})}else{g=q.name;g=typeof g===d?g.apply(q):g}p+=c(g)+"</td>\n<td>\n\n	";g=o["if"].call(q,q.isBody,{hash:{},inverse:n.program(9,e,t),fn:n.program(1,m,t),data:t});if(g||g===0){p+=g}p+="\n\n</td>\n<td>";if(g=o.description){g=g.call(q,{hash:{},data:t})}else{g=q.description;g=typeof g===d?g.apply(q):g}if(g||g===0){p+=g}p+="</td>\n<td>";if(g=o.paramType){g=g.call(q,{hash:{},data:t})}else{g=q.paramType;g=typeof g===d?g.apply(q):g}if(g||g===0){p+=g}p+='</td>\n<td>\n	<span class="model-signature"></span>\n</td>\n';return p})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param_list=b(function(h,t,r,m,y){this.compilerInfo=[4,">= 1.0.0"];r=this.merge(r,h.helpers);y=y||{};var s="",j,g,e,p=this,q=r.helperMissing,d="function",c=this.escapeExpression;function o(A,z){return" multiple='multiple'"}function n(A,z){return"\n    "}function l(C,B){var z="",A;z+="\n      ";A=r["if"].call(C,C.defaultValue,{hash:{},inverse:p.program(8,i,B),fn:p.program(6,k,B),data:B});if(A||A===0){z+=A}z+="\n    ";return z}function k(A,z){return"\n      "}function i(E,D){var z="",C,B,A;z+="\n        ";A={hash:{},inverse:p.program(11,x,D),fn:p.program(9,f,D),data:D};B=((C=r.isArray||E.isArray),C?C.call(E,E,A):q.call(E,"isArray",E,A));if(B||B===0){z+=B}z+="\n      ";return z}function f(A,z){return"\n        "}function x(A,z){return"\n          <option selected=\"\" value=''></option>\n        "}function w(C,B){var z="",A;z+="\n      ";A=r["if"].call(C,C.isDefault,{hash:{},inverse:p.program(16,u,B),fn:p.program(14,v,B),data:B});if(A||A===0){z+=A}z+="\n    ";return z}function v(C,B){var z="",A;z+='\n        <option selected="" value=\'';if(A=r.value){A=A.call(C,{hash:{},data:B})}else{A=C.value;A=typeof A===d?A.apply(C):A}z+=c(A)+"'>";if(A=r.value){A=A.call(C,{hash:{},data:B})}else{A=C.value;A=typeof A===d?A.apply(C):A}z+=c(A)+" (default)</option>\n      ";return z}function u(C,B){var z="",A;z+="\n        <option value='";if(A=r.value){A=A.call(C,{hash:{},data:B})}else{A=C.value;A=typeof A===d?A.apply(C):A}z+=c(A)+"'>";if(A=r.value){A=A.call(C,{hash:{},data:B})}else{A=C.value;A=typeof A===d?A.apply(C):A}z+=c(A)+"</option>\n      ";return z}s+="<td class='code'>";if(j=r.name){j=j.call(t,{hash:{},data:y})}else{j=t.name;j=typeof j===d?j.apply(t):j}s+=c(j)+"</td>\n<td>\n  <select ";e={hash:{},inverse:p.noop,fn:p.program(1,o,y),data:y};g=((j=r.isArray||t.isArray),j?j.call(t,t,e):q.call(t,"isArray",t,e));if(g||g===0){s+=g}s+=" class='parameter' name='";if(g=r.name){g=g.call(t,{hash:{},data:y})}else{g=t.name;g=typeof g===d?g.apply(t):g}s+=c(g)+"'>\n    ";g=r["if"].call(t,t.required,{hash:{},inverse:p.program(5,l,y),fn:p.program(3,n,y),data:y});if(g||g===0){s+=g}s+="\n    ";g=r.each.call(t,((j=t.allowableValues),j==null||j===false?j:j.descriptiveValues),{hash:{},inverse:p.noop,fn:p.program(13,w,y),data:y});if(g||g===0){s+=g}s+="\n  </select>\n</td>\n<td>";if(g=r.description){g=g.call(t,{hash:{},data:y})}else{g=t.description;g=typeof g===d?g.apply(t):g}if(g||g===0){s+=g}s+="</td>\n<td>";if(g=r.paramType){g=g.call(t,{hash:{},data:y})}else{g=t.paramType;g=typeof g===d?g.apply(t):g}if(g||g===0){s+=g}s+='</td>\n<td><span class="model-signature"></span></td>';return s})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param_readonly=b(function(g,m,f,l,k){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);k=k||{};var i="",d,h="function",j=this.escapeExpression,o=this;function e(t,s){var q="",r;q+="\n        <textarea class='body-textarea' readonly='readonly' name='";if(r=f.name){r=r.call(t,{hash:{},data:s})}else{r=t.name;r=typeof r===h?r.apply(t):r}q+=j(r)+"'>";if(r=f.defaultValue){r=r.call(t,{hash:{},data:s})}else{r=t.defaultValue;r=typeof r===h?r.apply(t):r}q+=j(r)+"</textarea>\n    ";return q}function c(t,s){var q="",r;q+="\n        ";r=f["if"].call(t,t.defaultValue,{hash:{},inverse:o.program(6,n,s),fn:o.program(4,p,s),data:s});if(r||r===0){q+=r}q+="\n    ";return q}function p(t,s){var q="",r;q+="\n            ";if(r=f.defaultValue){r=r.call(t,{hash:{},data:s})}else{r=t.defaultValue;r=typeof r===h?r.apply(t):r}q+=j(r)+"\n        ";return q}function n(r,q){return"\n            (empty)\n        "}i+="<td class='code'>";if(d=f.name){d=d.call(m,{hash:{},data:k})}else{d=m.name;d=typeof d===h?d.apply(m):d}i+=j(d)+"</td>\n<td>\n    ";d=f["if"].call(m,m.isBody,{hash:{},inverse:o.program(3,c,k),fn:o.program(1,e,k),data:k});if(d||d===0){i+=d}i+="\n</td>\n<td>";if(d=f.description){d=d.call(m,{hash:{},data:k})}else{d=m.description;d=typeof d===h?d.apply(m):d}if(d||d===0){i+=d}i+="</td>\n<td>";if(d=f.paramType){d=d.call(m,{hash:{},data:k})}else{d=m.paramType;d=typeof d===h?d.apply(m):d}if(d||d===0){i+=d}i+='</td>\n<td><span class="model-signature"></span></td>\n';return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param_readonly_required=b(function(g,m,f,l,k){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);k=k||{};var i="",d,h="function",j=this.escapeExpression,o=this;function e(t,s){var q="",r;q+="\n        <textarea class='body-textarea'  readonly='readonly' placeholder='(required)' name='";if(r=f.name){r=r.call(t,{hash:{},data:s})}else{r=t.name;r=typeof r===h?r.apply(t):r}q+=j(r)+"'>";if(r=f.defaultValue){r=r.call(t,{hash:{},data:s})}else{r=t.defaultValue;r=typeof r===h?r.apply(t):r}q+=j(r)+"</textarea>\n    ";return q}function c(t,s){var q="",r;q+="\n        ";r=f["if"].call(t,t.defaultValue,{hash:{},inverse:o.program(6,n,s),fn:o.program(4,p,s),data:s});if(r||r===0){q+=r}q+="\n    ";return q}function p(t,s){var q="",r;q+="\n            ";if(r=f.defaultValue){r=r.call(t,{hash:{},data:s})}else{r=t.defaultValue;r=typeof r===h?r.apply(t):r}q+=j(r)+"\n        ";return q}function n(r,q){return"\n            (empty)\n        "}i+="<td class='code required'>";if(d=f.name){d=d.call(m,{hash:{},data:k})}else{d=m.name;d=typeof d===h?d.apply(m):d}i+=j(d)+"</td>\n<td>\n    ";d=f["if"].call(m,m.isBody,{hash:{},inverse:o.program(3,c,k),fn:o.program(1,e,k),data:k});if(d||d===0){i+=d}i+="\n</td>\n<td>";if(d=f.description){d=d.call(m,{hash:{},data:k})}else{d=m.description;d=typeof d===h?d.apply(m):d}if(d||d===0){i+=d}i+="</td>\n<td>";if(d=f.paramType){d=d.call(m,{hash:{},data:k})}else{d=m.paramType;d=typeof d===h?d.apply(m):d}if(d||d===0){i+=d}i+='</td>\n<td><span class="model-signature"></span></td>\n';return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param_required=b(function(f,q,o,j,u){this.compilerInfo=[4,">= 1.0.0"];o=this.merge(o,f.helpers);u=u||{};var p="",g,d="function",c=this.escapeExpression,n=this;function m(z,y){var w="",x;w+="\n		";x=o["if"].call(z,z.isFile,{hash:{},inverse:n.program(4,k,y),fn:n.program(2,l,y),data:y});if(x||x===0){w+=x}w+="\n	";return w}function l(z,y){var w="",x;w+='\n			<input type="file" name=\'';if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"'/>\n		";return w}function k(z,y){var w="",x;w+="\n			";x=o["if"].call(z,z.defaultValue,{hash:{},inverse:n.program(7,h,y),fn:n.program(5,i,y),data:y});if(x||x===0){w+=x}w+="\n		";return w}function i(z,y){var w="",x;w+="\n				<textarea class='body-textarea' placeholder='(required)' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"'>";if(x=o.defaultValue){x=x.call(z,{hash:{},data:y})}else{x=z.defaultValue;x=typeof x===d?x.apply(z):x}w+=c(x)+"</textarea>\n			";return w}function h(z,y){var w="",x;w+="\n				<textarea class='body-textarea' placeholder='(required)' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+'\'></textarea>\n				<br />\n				<div class="parameter-content-type" />\n			';return w}function e(z,y){var w="",x;w+="\n		";x=o["if"].call(z,z.isFile,{hash:{},inverse:n.program(12,t,y),fn:n.program(10,v,y),data:y});if(x||x===0){w+=x}w+="\n	";return w}function v(z,y){var w="",x;w+="\n			<input class='parameter' class='required' type='file' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"'/>\n		";return w}function t(z,y){var w="",x;w+="\n			";x=o["if"].call(z,z.defaultValue,{hash:{},inverse:n.program(15,r,y),fn:n.program(13,s,y),data:y});if(x||x===0){w+=x}w+="\n		";return w}function s(z,y){var w="",x;w+="\n				<input class='parameter required' minlength='1' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"' placeholder='(required)' type='text' value='";if(x=o.defaultValue){x=x.call(z,{hash:{},data:y})}else{x=z.defaultValue;x=typeof x===d?x.apply(z):x}w+=c(x)+"'/>\n			";return w}function r(z,y){var w="",x;w+="\n				<input class='parameter required' minlength='1' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"' placeholder='(required)' type='text' value=''/>\n			";return w}p+="<td class='code required'>";if(g=o.name){g=g.call(q,{hash:{},data:u})}else{g=q.name;g=typeof g===d?g.apply(q):g}p+=c(g)+"</td>\n<td>\n	";g=o["if"].call(q,q.isBody,{hash:{},inverse:n.program(9,e,u),fn:n.program(1,m,u),data:u});if(g||g===0){p+=g}p+="\n</td>\n<td>\n	<strong>";if(g=o.description){g=g.call(q,{hash:{},data:u})}else{g=q.description;g=typeof g===d?g.apply(q):g}if(g||g===0){p+=g}p+="</strong>\n</td>\n<td>";if(g=o.paramType){g=g.call(q,{hash:{},data:u})}else{g=q.paramType;g=typeof g===d?g.apply(q):g}if(g||g===0){p+=g}p+='</td>\n<td><span class="model-signature"></span></td>\n';return p})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.parameter_content_type=b(function(g,l,f,k,j){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);j=j||{};var i="",c,h="function",m=this;function e(r,q){var o="",p;o+="\n  ";p=f.each.call(r,r.consumes,{hash:{},inverse:m.noop,fn:m.program(2,d,q),data:q});if(p||p===0){o+=p}o+="\n";return o}function d(r,q){var o="",p;o+='\n  <option value="';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+='">';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+="</option>\n  ";return o}function n(p,o){return'\n  <option value="application/json">application/json</option>\n'}i+='<label for="parameterContentType"></label>\n<select name="parameterContentType">\n';c=f["if"].call(l,l.consumes,{hash:{},inverse:m.program(4,n,j),fn:m.program(1,e,j),data:j});if(c||c===0){i+=c}i+="\n</select>\n";return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.resource=b(function(g,m,f,l,k){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);k=k||{};var i="",d,p,h="function",j=this.escapeExpression,o=this,n=f.blockHelperMissing;function e(r,q){return" : "}function c(t,s){var q="",r;q+="<li>\n      <a href='";if(r=f.url){r=r.call(t,{hash:{},data:s})}else{r=t.url;r=typeof r===h?r.apply(t):r}q+=j(r)+"'>Raw</a>\n    </li>";return q}i+="<div class='heading'>\n  <h2>\n    <a href='#!/";if(d=f.id){d=d.call(m,{hash:{},data:k})}else{d=m.id;d=typeof d===h?d.apply(m):d}i+=j(d)+'\' class="toggleEndpointList" data-id="';if(d=f.id){d=d.call(m,{hash:{},data:k})}else{d=m.id;d=typeof d===h?d.apply(m):d}i+=j(d)+'">';if(d=f.name){d=d.call(m,{hash:{},data:k})}else{d=m.name;d=typeof d===h?d.apply(m):d}i+=j(d)+"</a> ";p={hash:{},inverse:o.noop,fn:o.program(1,e,k),data:k};if(d=f.summary){d=d.call(m,p)}else{d=m.summary;d=typeof d===h?d.apply(m):d}if(!f.summary){d=n.call(m,d,p)}if(d||d===0){i+=d}if(d=f.summary){d=d.call(m,{hash:{},data:k})}else{d=m.summary;d=typeof d===h?d.apply(m):d}if(d||d===0){i+=d}i+="\n  </h2>\n  <ul class='options'>\n    <li>\n      <a href='#!/";if(d=f.id){d=d.call(m,{hash:{},data:k})}else{d=m.id;d=typeof d===h?d.apply(m):d}i+=j(d)+"' id='endpointListTogger_";if(d=f.id){d=d.call(m,{hash:{},data:k})}else{d=m.id;d=typeof d===h?d.apply(m):d}i+=j(d)+'\' class="toggleEndpointList" data-id="';if(d=f.id){d=d.call(m,{hash:{},data:k})}else{d=m.id;d=typeof d===h?d.apply(m):d}i+=j(d)+'">Show/Hide</a>\n    </li>\n    <li>\n      <a href=\'#\' class="collapseResource" data-id="';if(d=f.id){d=d.call(m,{hash:{},data:k})}else{d=m.id;d=typeof d===h?d.apply(m):d}i+=j(d)+'">\n        List Operations\n      </a>\n    </li>\n    <li>\n      <a href=\'#\' class="expandResource" data-id=';if(d=f.id){d=d.call(m,{hash:{},data:k})}else{d=m.id;d=typeof d===h?d.apply(m):d}i+=j(d)+">\n        Expand Operations\n      </a>\n    </li>\n    ";p={hash:{},inverse:o.noop,fn:o.program(3,c,k),data:k};if(d=f.url){d=d.call(m,p)}else{d=m.url;d=typeof d===h?d.apply(m):d}if(!f.url){d=n.call(m,d,p)}if(d||d===0){i+=d}i+="\n  </ul>\n</div>\n<ul class='endpoints' id='";if(d=f.id){d=d.call(m,{hash:{},data:k})}else{d=m.id;d=typeof d===h?d.apply(m):d}i+=j(d)+"_endpoint_list' style='display:none'>\n\n</ul>\n";return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.response_content_type=b(function(g,l,f,k,j){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);j=j||{};var i="",c,h="function",m=this;function e(r,q){var o="",p;o+="\n  ";p=f.each.call(r,r.produces,{hash:{},inverse:m.noop,fn:m.program(2,d,q),data:q});if(p||p===0){o+=p}o+="\n";return o}function d(r,q){var o="",p;o+='\n  <option value="';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+='">';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+="</option>\n  ";return o}function n(p,o){return'\n  <option value="application/json">application/json</option>\n'}i+='<label for="responseContentType"></label>\n<select name="responseContentType">\n';c=f["if"].call(l,l.produces,{hash:{},inverse:m.program(4,n,j),fn:m.program(1,e,j),data:j});if(c||c===0){i+=c}i+="\n</select>\n";return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.signature=b(function(e,k,d,j,i){this.compilerInfo=[4,">= 1.0.0"];d=this.merge(d,e.helpers);i=i||{};var g="",c,f="function",h=this.escapeExpression;g+='<div>\n<ul class="signature-nav">\n  <li><a class="description-link" href="#">Model</a></li>\n  <li><a class="snippet-link" href="#">Model Schema</a></li>\n</ul>\n<div>\n\n<div class="signature-container">\n  <div class="description">\n    ';if(c=d.signature){c=c.call(k,{hash:{},data:i})}else{c=k.signature;c=typeof c===f?c.apply(k):c}if(c||c===0){g+=c}g+='\n  </div>\n\n  <div class="snippet">\n    <pre><code>';if(c=d.sampleJSON){c=c.call(k,{hash:{},data:i})}else{c=k.sampleJSON;c=typeof c===f?c.apply(k):c}g+=h(c)+'</code></pre>\n    <small class="notice"></small>\n  </div>\n</div>\n\n';return g})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.status_code=b(function(e,k,d,j,i){this.compilerInfo=[4,">= 1.0.0"];d=this.merge(d,e.helpers);i=i||{};var g="",c,f="function",h=this.escapeExpression;g+="<td width='15%' class='code'>";if(c=d.code){c=c.call(k,{hash:{},data:i})}else{c=k.code;c=typeof c===f?c.apply(k):c}g+=h(c)+"</td>\n<td>";if(c=d.message){c=c.call(k,{hash:{},data:i})}else{c=k.message;c=typeof c===f?c.apply(k):c}if(c||c===0){g+=c}g+="</td>\n<td width='50%'><span class=\"model-signature\" /></td>";return g})})();(function(){var t,k,l,u,x,q,n,m,p,o,j,r,v,s,i,d,b,B,h,g,f,e,c,a,A,z,w={}.hasOwnProperty,y=function(F,D){for(var C in D){if(w.call(D,C)){F[C]=D[C]}}function E(){this.constructor=F}E.prototype=D.prototype;F.prototype=new E();F.__super__=D.prototype;return F};v=(function(D){y(C,D);function C(){s=C.__super__.constructor.apply(this,arguments);return s}C.prototype.dom_id="swagger_ui";C.prototype.options=null;C.prototype.api=null;C.prototype.headerView=null;C.prototype.mainView=null;C.prototype.initialize=function(E){var F=this;if(E==null){E={}}if(E.dom_id!=null){this.dom_id=E.dom_id;delete E.dom_id}if($("#"+this.dom_id)==null){$("body").append('<div id="'+this.dom_id+'"></div>')}this.options=E;this.options.success=function(){return F.render()};this.options.progress=function(G){return F.showMessage(G)};this.options.failure=function(G){if(F.api&&F.api.isValid===false){log("not a valid 2.0 spec, loading legacy client");F.api=new SwaggerApi(F.options);return F.api.build()}else{return F.onLoadFailure(G)}};this.headerView=new u({el:$("#header")});return this.headerView.on("update-swagger-ui",function(G){return F.updateSwaggerUi(G)})};C.prototype.setOption=function(E,F){return this.options[E]=F};C.prototype.getOption=function(E){return this.options[E]};C.prototype.updateSwaggerUi=function(E){this.options.url=E.url;return this.load()};C.prototype.load=function(){var F,E;if((E=this.mainView)!=null){E.clear()}F=this.options.url;if(F.indexOf("http")!==0){F=this.buildUrl(window.location.href.toString(),F)}this.options.url=F;this.headerView.update(F);this.api=new SwaggerClient(this.options);return this.api.build()};C.prototype.render=function(){var E=this;this.showMessage("Finished Loading Resource Information. Rendering Swagger UI...");this.mainView=new x({model:this.api,el:$("#"+this.dom_id),swaggerOptions:this.options}).render();this.showMessage();switch(this.options.docExpansion){case"full":Docs.expandOperationsForResource("");break;case"list":Docs.collapseOperationsForResource("")}if(this.options.onComplete){this.options.onComplete(this.api,this)}return setTimeout(function(){return Docs.shebang()},400)};C.prototype.buildUrl=function(G,E){var F,H;log("base is "+G);if(E.indexOf("/")===0){H=G.split("/");G=H[0]+"//"+H[2];return G+E}else{F=G.length;if(G.indexOf("?")>-1){F=Math.min(F,G.indexOf("?"))}if(G.indexOf("#")>-1){F=Math.min(F,G.indexOf("#"))}G=G.substring(0,F);if(G.indexOf("/",G.length-1)!==-1){return G+E}return G+"/"+E}};C.prototype.showMessage=function(E){if(E==null){E=""}$("#message-bar").removeClass("message-fail");$("#message-bar").addClass("message-success");return $("#message-bar").html(E)};C.prototype.onLoadFailure=function(E){var F;if(E==null){E=""}$("#message-bar").removeClass("message-success");$("#message-bar").addClass("message-fail");F=$("#message-bar").html(E);if(this.options.onFailure!=null){this.options.onFailure(E)}return F};return C})(Backbone.Router);window.SwaggerUi=v;u=(function(D){y(C,D);function C(){i=C.__super__.constructor.apply(this,arguments);return i}C.prototype.events={"click #show-pet-store-icon":"showPetStore","click #show-wordnik-dev-icon":"showWordnikDev","click #explore":"showCustom","keyup #input_baseUrl":"showCustomOnKeyup","keyup #input_apiKey":"showCustomOnKeyup"};C.prototype.initialize=function(){};C.prototype.showPetStore=function(E){return this.trigger("update-swagger-ui",{url:"http://petstore.swagger.wordnik.com/api/api-docs"})};C.prototype.showWordnikDev=function(E){return this.trigger("update-swagger-ui",{url:"http://api.wordnik.com/v4/resources.json"})};C.prototype.showCustomOnKeyup=function(E){if(E.keyCode===13){return this.showCustom()}};C.prototype.showCustom=function(E){if(E!=null){E.preventDefault()}return this.trigger("update-swagger-ui",{url:$("#input_baseUrl").val(),apiKey:$("#input_apiKey").val()})};C.prototype.update=function(F,G,E){if(E==null){E=false}$("#input_baseUrl").val(F);if(E){return this.trigger("update-swagger-ui",{url:F})}};return C})(Backbone.View);x=(function(C){var D;y(E,C);function E(){h=E.__super__.constructor.apply(this,arguments);return h}D={alpha:function(G,F){return G.path.localeCompare(F.path)},method:function(G,F){return G.method.localeCompare(F.method)}};E.prototype.initialize=function(J){var I,H,G,F,K,L;if(J==null){J={}}this.model.auths=[];L=this.model.securityDefinitions;for(H in L){K=L[H];I={name:H,type:K.type,value:K};this.model.auths.push(I)}if(this.model.info&&this.model.info.license&&typeof this.model.info.license==="string"){G=this.model.info.license;F=this.model.info.licenseUrl;this.model.info.license={};this.model.info.license.name=G;this.model.info.license.url=F}if(!this.model.info){this.model.info={}}if(!this.model.info.version){this.model.info.version=this.model.apiVersion}if(this.model.swaggerVersion==="2.0"){if("validatorUrl" in J.swaggerOptions){return this.model.validatorUrl=J.swaggerOptions.validatorUrl}else{if(this.model.url.match(/https?:\/\/localhost/)){return this.model.validatorUrl=this.model.url}else{return this.model.validatorUrl="http://online.swagger.io/validator"}}}};E.prototype.render=function(){var K,N,F,H,G,L,I,M,O,J;if(this.model.securityDefinitions){for(G in this.model.securityDefinitions){K=this.model.securityDefinitions[G];if(K.type==="apiKey"&&$("#apikey_button").length===0){N=new t({model:K}).render().el;$(".auth_main_container").append(N)}if(K.type==="basicAuth"&&$("#basic_auth_button").length===0){N=new k({model:K}).render().el;$(".auth_main_container").append(N)}}}$(this.el).html(Handlebars.templates.main(this.model));I={};F=0;J=this.model.apisArray;for(M=0,O=J.length;M<O;M++){L=J[M];H=L.name;while(typeof I[H]!=="undefined"){H=H+"_"+F;F+=1}L.id=H;I[H]=L;this.addResource(L,this.model.auths)}return this};E.prototype.addResource=function(H,G){var F;H.id=H.id.replace(/\s/g,"_");F=new p({model:H,tagName:"li",id:"resource_"+H.id,className:"resource",auths:G,swaggerOptions:this.options.swaggerOptions});return $("#resources").append(F.render().el)};E.prototype.clear=function(){return $(this.el).html("")};return E})(Backbone.View);p=(function(D){y(C,D);function C(){g=C.__super__.constructor.apply(this,arguments);return g}C.prototype.initialize=function(E){if(E==null){E={}}this.auths=E.auths;if(""===this.model.description){return this.model.description=null}};C.prototype.render=function(){var F,K,H,G,I,E,J;$(this.el).html(Handlebars.templates.resource(this.model));H={};if(this.model.description){this.model.summary=this.model.description}J=this.model.operationsArray;for(I=0,E=J.length;I<E;I++){G=J[I];F=0;K=G.nickname;while(typeof H[K]!=="undefined"){K=K+"_"+F;F+=1}H[K]=G;G.nickname=K;G.parentId=this.model.id;this.addOperation(G)}$(".toggleEndpointList",this.el).click(this.callDocs.bind(this,"toggleEndpointListForResource"));$(".collapseResource",this.el).click(this.callDocs.bind(this,"collapseOperationsForResource"));$(".expandResource",this.el).click(this.callDocs.bind(this,"expandOperationsForResource"));return this};C.prototype.addOperation=function(E){var F;E.number=this.number;F=new q({model:E,tagName:"li",className:"endpoint",swaggerOptions:this.options.swaggerOptions,auths:this.auths});$(".endpoints",$(this.el)).append(F.render().el);return this.number++};C.prototype.callDocs=function(F,E){E.preventDefault();return Docs[F](E.currentTarget.getAttribute("data-id"))};return C})(Backbone.View);q=(function(D){y(C,D);function C(){f=C.__super__.constructor.apply(this,arguments);return f}C.prototype.invocationUrl=null;C.prototype.events={"submit .sandbox":"submitOperation","click .submit":"submitOperation","click .response_hider":"hideResponse","click .toggleOperation":"toggleOperationContent","mouseenter .api-ic":"mouseEnter","mouseout .api-ic":"mouseExit"};C.prototype.initialize=function(E){if(E==null){E={}}this.auths=E.auths;return this};C.prototype.mouseEnter=function(J){var H,I,M,F,E,N,K,G,O,L;H=$(J.currentTarget.parentNode).find("#api_information_panel");O=J.pageX;L=J.pageY;N=$(window).scrollLeft();K=$(window).scrollTop();F=N+$(window).width();E=K+$(window).height();G=H.width();I=H.height();if(O+G>F){O=F-G}if(O<N){O=N}if(L+I>E){L=E-I}if(L<K){L=K}M={};M.top=L;M.left=O;H.css(M);return $(J.currentTarget.parentNode).find("#api_information_panel").show()};C.prototype.mouseExit=function(E){return $(E.currentTarget.parentNode).find("#api_information_panel").hide()};C.prototype.render=function(){var al,R,aj,F,W,V,af,S,ab,H,Z,G,U,X,ad,ak,E,ao,Y,aa,ai,ah,ag,ae,T,N,L,J,I,ac,an,am,Q,P,O,M,K;V=true;if(!V){this.model.isReadOnly=true}this.model.description=this.model.description||this.model.notes;if(this.model.description){this.model.description=this.model.description.replace(/(?:\r\n|\r|\n)/g,"<br />")}this.model.oauth=null;log(this.model.authorizations);if(this.model.authorizations){if(Array.isArray(this.model.authorizations)){Q=this.model.authorizations;for(ai=0,T=Q.length;ai<T;ai++){aj=Q[ai];for(S in aj){R=aj[S];for(al in this.auths){R=this.auths[al];if(R.type==="oauth2"){this.model.oauth={};this.model.oauth.scopes=[];P=R.value.scopes;for(af in P){Y=P[af];ab={scope:af,description:Y};this.model.oauth.scopes.push(ab)}}}}}}else{O=this.model.authorizations;for(af in O){Y=O[af];if(af==="oauth2"){if(this.model.oauth===null){this.model.oauth={}}if(this.model.oauth.scopes===void 0){this.model.oauth.scopes=[]}for(ah=0,N=Y.length;ah<N;ah++){ab=Y[ah];this.model.oauth.scopes.push(ab)}}}}}if(typeof this.model.responses!=="undefined"){this.model.responseMessages=[];M=this.model.responses;for(F in M){aa=M[F];X=null;ad=this.model.responses[F].schema;if(ad&&ad["$ref"]){X=ad["$ref"];if(X.indexOf("#/definitions/")===0){X=X.substring("#/definitions/".length)}}this.model.responseMessages.push({code:F,message:aa.description,responseModel:X})}}if(typeof this.model.responseMessages==="undefined"){this.model.responseMessages=[]}$(this.el).html(Handlebars.templates.operation(this.model));if(this.model.responseClassSignature&&this.model.responseClassSignature!=="string"){ak={sampleJSON:this.model.responseSampleJSON,isParam:false,signature:this.model.responseClassSignature};U=new j({model:ak,tagName:"div"});$(".model-signature",$(this.el)).append(U.render().el)}else{this.model.responseClassSignature="string";$(".model-signature",$(this.el)).html(this.model.type)}W={isParam:false};W.consumes=this.model.consumes;W.produces=this.model.produces;K=this.model.parameters;for(ag=0,L=K.length;ag<L;ag++){H=K[ag];ao=H.type||H.dataType;if(typeof ao==="undefined"){X=H.schema;if(X&&X["$ref"]){Z=X["$ref"];if(Z.indexOf("#/definitions/")===0){ao=Z.substring("#/definitions/".length)}else{ao=Z}}}if(ao&&ao.toLowerCase()==="file"){if(!W.consumes){W.consumes="multipart/form-data"}}H.type=ao}G=new o({model:W});$(".response-content-type",$(this.el)).append(G.render().el);an=this.model.parameters;for(ae=0,J=an.length;ae<J;ae++){H=an[ae];this.addParameter(H,W.consumes)}am=this.model.responseMessages;for(ac=0,I=am.length;ac<I;ac++){E=am[ac];this.addStatusCode(E)}return this};C.prototype.addParameter=function(G,E){var F;G.consumes=E;F=new m({model:G,tagName:"tr",readOnly:this.model.isReadOnly});return $(".operation-params",$(this.el)).append(F.render().el)};C.prototype.addStatusCode=function(F){var E;E=new r({model:F,tagName:"tr"});return $(".operation-status",$(this.el)).append(E.render().el)};C.prototype.submitOperation=function(S){var U,K,R,H,M,E,N,Q,P,O,T,J,G,L,I,F;if(S!=null){S.preventDefault()}K=$(".sandbox",$(this.el));U=true;K.find("input.required").each(function(){var V=this;$(this).removeClass("error");if(jQuery.trim($(this).val())===""){$(this).addClass("error");$(this).wiggle({callback:function(){return $(V).focus()}});return U=false}});if(U){H={};E={parent:this};R=false;L=K.find("input");for(Q=0,T=L.length;Q<T;Q++){M=L[Q];if((M.value!=null)&&jQuery.trim(M.value).length>0){H[M.name]=M.value}if(M.type==="file"){R=true}}I=K.find("textarea");for(P=0,J=I.length;P<J;P++){M=I[P];if((M.value!=null)&&jQuery.trim(M.value).length>0){H[M.name]=M.value}}F=K.find("select");for(O=0,G=F.length;O<G;O++){M=F[O];N=this.getSelectedValue(M);if((N!=null)&&jQuery.trim(N).length>0){H[M.name]=N}}E.responseContentType=$("div select[name=responseContentType]",$(this.el)).val();E.requestContentType=$("div select[name=parameterContentType]",$(this.el)).val();$(".response_throbber",$(this.el)).show();if(R){return this.handleFileUpload(H,K)}else{return this.model["do"](H,E,this.showCompleteStatus,this.showErrorStatus,this)}}};C.prototype.success=function(E,F){return F.showCompleteStatus(E)};C.prototype.handleFileUpload=function(V,M){var Q,L,G,R,P,O,T,N,K,J,H,U,Y,X,W,I,F,E,Z,S=this;I=M.serializeArray();for(N=0,U=I.length;N<U;N++){R=I[N];if((R.value!=null)&&jQuery.trim(R.value).length>0){V[R.name]=R.value}}Q=new FormData();T=0;F=this.model.parameters;for(K=0,Y=F.length;K<Y;K++){O=F[K];if(O.paramType==="form"){if(O.type.toLowerCase()!=="file"&&V[O.name]!==void 0){Q.append(O.name,V[O.name])}}}G={};E=this.model.parameters;for(J=0,X=E.length;J<X;J++){O=E[J];if(O.paramType==="header"){G[O.name]=V[O.name]}}Z=M.find('input[type~="file"]');for(H=0,W=Z.length;H<W;H++){L=Z[H];if(typeof L.files[0]!=="undefined"){Q.append($(L).attr("name"),L.files[0]);T+=1}}this.invocationUrl=this.model.supportHeaderParams()?(G=this.model.getHeaderParams(V),this.model.urlify(V,false)):this.model.urlify(V,true);$(".request_url",$(this.el)).html("<pre></pre>");$(".request_url pre",$(this.el)).text(this.invocationUrl);P={type:this.model.method,url:this.invocationUrl,headers:G,data:Q,dataType:"json",contentType:false,processData:false,error:function(ab,ac,aa){return S.showErrorStatus(S.wrap(ab),S)},success:function(aa){return S.showResponse(aa,S)},complete:function(aa){return S.showCompleteStatus(S.wrap(aa),S)}};if(window.authorizations){window.authorizations.apply(P)}if(T===0){P.data.append("fake","true")}jQuery.ajax(P);return false};C.prototype.wrap=function(I){var G,J,L,F,K,H,E;L={};J=I.getAllResponseHeaders().split("\r");for(H=0,E=J.length;H<E;H++){F=J[H];G=F.split(":");if(G[0]!==void 0&&G[1]!==void 0){L[G[0].trim()]=G[1].trim()}}K={};K.content={};K.content.data=I.responseText;K.headers=L;K.request={};K.request.url=this.invocationUrl;K.status=I.status;return K};C.prototype.getSelectedValue=function(E){var H,G,J,F,I;if(!E.multiple){return E.value}else{G=[];I=E.options;for(J=0,F=I.length;J<F;J++){H=I[J];if(H.selected){G.push(H.value)}}if(G.length>0){return G}else{return null}}};C.prototype.hideResponse=function(E){if(E!=null){E.preventDefault()}$(".response",$(this.el)).slideUp();return $(".response_hider",$(this.el)).fadeOut()};C.prototype.showResponse=function(E){var F;F=JSON.stringify(E,null,"\t").replace(/\n/g,"<br>");return $(".response_body",$(this.el)).html(escape(F))};C.prototype.showErrorStatus=function(F,E){return E.showStatus(F)};C.prototype.showCompleteStatus=function(F,E){return E.showStatus(F)};C.prototype.formatXml=function(L){var H,K,F,M,R,N,G,E,P,Q,J,I,O;E=/(>)(<)(\/*)/g;Q=/[ ]*(.*)[ ]+\n/g;H=/(<.+>)(.+\n)/g;L=L.replace(E,"$1\n$2$3").replace(Q,"$1\n").replace(H,"$1\n$2");G=0;K="";R=L.split("\n");F=0;M="other";P={"single->single":0,"single->closing":-1,"single->opening":0,"single->other":0,"closing->single":0,"closing->closing":-1,"closing->opening":0,"closing->other":0,"opening->single":1,"opening->closing":0,"opening->opening":1,"opening->other":1,"other->single":0,"other->closing":-1,"other->opening":0,"other->other":0};J=function(X){var T,S,V,Z,W,U,Y;U={single:Boolean(X.match(/<.+\/>/)),closing:Boolean(X.match(/<\/.+>/)),opening:Boolean(X.match(/<[^!?].*>/))};W=((function(){var aa;aa=[];for(V in U){Y=U[V];if(Y){aa.push(V)}}return aa})())[0];W=W===void 0?"other":W;T=M+"->"+W;M=W;Z="";F+=P[T];Z=((function(){var ab,ac,aa;aa=[];for(S=ab=0,ac=F;0<=ac?ab<ac:ab>ac;S=0<=ac?++ab:--ab){aa.push("  ")}return aa})()).join("");if(T==="opening->closing"){return K=K.substr(0,K.length-1)+X+"\n"}else{return K+=Z+X+"\n"}};for(I=0,O=R.length;I<O;I++){N=R[I];J(N)}return K};C.prototype.showStatus=function(J){var G,N,P,M,H,Q,E,I,L,K,F;if(J.content===void 0){N=J.data;F=J.url}else{N=J.content.data;F=J.request.url}H=J.headers;P=null;if(H){P=H["Content-Type"]||H["content-type"];if(P){P=P.split(";")[0].trim()}}if(!N){G=$("<code />").text("no content");I=$('<pre class="json" />').append(G)}else{if(P==="application/json"||/\+json$/.test(P)){Q=null;try{Q=JSON.stringify(JSON.parse(N),null,"  ")}catch(O){M=O;Q="can't parse JSON.  Raw result:\n\n"+N}G=$("<code />").text(Q);I=$('<pre class="json" />').append(G)}else{if(P==="application/xml"||/\+xml$/.test(P)){G=$("<code />").text(this.formatXml(N));I=$('<pre class="xml" />').append(G)}else{if(P==="text/html"){G=$("<code />").html(_.escape(N));I=$('<pre class="xml" />').append(G)}else{if(/^image\//.test(P)){I=$("<img>").attr("src",F)}else{G=$("<code />").text(N);I=$('<pre class="json" />').append(G)}}}}}L=I;$(".request_url",$(this.el)).html("<pre></pre>");$(".request_url pre",$(this.el)).text(F);$(".response_code",$(this.el)).html("<pre>"+J.status+"</pre>");$(".response_body",$(this.el)).html(L);$(".response_headers",$(this.el)).html("<pre>"+_.escape(JSON.stringify(J.headers,null,"  ")).replace(/\n/g,"<br>")+"</pre>");$(".response",$(this.el)).slideDown();$(".response_hider",$(this.el)).show();$(".response_throbber",$(this.el)).hide();K=$(".response_body",$(this.el))[0];E=this.options.swaggerOptions;if(E.highlightSizeThreshold&&J.data.length>E.highlightSizeThreshold){return K}else{return hljs.highlightBlock(K)}};C.prototype.toggleOperationContent=function(){var E;E=$("#"+Docs.escapeResourceName(this.model.parentId)+"_"+this.model.nickname+"_content");if(E.is(":visible")){return Docs.collapseOperation(E)}else{return Docs.expandOperation(E)}};return C})(Backbone.View);r=(function(D){y(C,D);function C(){e=C.__super__.constructor.apply(this,arguments);return e}C.prototype.initialize=function(){};C.prototype.render=function(){var F,E,G;G=this.template();$(this.el).html(G(this.model));if(swaggerUi.api.models.hasOwnProperty(this.model.responseModel)){F={sampleJSON:JSON.stringify(swaggerUi.api.models[this.model.responseModel].createJSONSample(),null,2),isParam:false,signature:swaggerUi.api.models[this.model.responseModel].getMockSignature()};E=new j({model:F,tagName:"div"});$(".model-signature",this.$el).append(E.render().el)}else{$(".model-signature",this.$el).html("")}return this};C.prototype.template=function(){return Handlebars.templates.status_code};return C})(Backbone.View);m=(function(D){y(C,D);function C(){c=C.__super__.constructor.apply(this,arguments);return c}C.prototype.initialize=function(){return Handlebars.registerHelper("isArray",function(F,E){if(F.type.toLowerCase()==="array"||F.allowMultiple){return E.fn(this)}else{return E.inverse(this)}})};C.prototype.render=function(){var E,F,I,G,J,H,M,N,L,K;K=this.model.type||this.model.dataType;if(typeof K==="undefined"){H=this.model.schema;if(H&&H["$ref"]){G=H["$ref"];if(G.indexOf("#/definitions/")===0){K=G.substring("#/definitions/".length)}else{K=G}}}this.model.type=K;this.model.paramType=this.model["in"]||this.model.paramType;if(this.model.paramType==="body"){this.model.isBody=true}if(K&&K.toLowerCase()==="file"){this.model.isFile=true}this.model["default"]=this.model["default"]||this.model.defaultValue;L=this.template();$(this.el).html(L(this.model));M={sampleJSON:this.model.sampleJSON,isParam:true,signature:this.model.signature};if(this.model.sampleJSON){N=new j({model:M,tagName:"div"});$(".model-signature",$(this.el)).append(N.render().el)}else{$(".model-signature",$(this.el)).html(this.model.signature)}F=false;if(this.model.isBody){F=true}E={isParam:F};E.consumes=this.model.consumes;if(F){I=new n({model:E});$(".parameter-content-type",$(this.el)).append(I.render().el)}else{J=new o({model:E});$(".response-content-type",$(this.el)).append(J.render().el)}return this};C.prototype.template=function(){if(this.model.isList){return Handlebars.templates.param_list}else{if(this.options.readOnly){if(this.model.required){return Handlebars.templates.param_readonly_required}else{return Handlebars.templates.param_readonly}}else{if(this.model.required){return Handlebars.templates.param_required}else{return Handlebars.templates.param}}}};return C})(Backbone.View);j=(function(D){y(C,D);function C(){a=C.__super__.constructor.apply(this,arguments);return a}C.prototype.events={"click a.description-link":"switchToDescription","click a.snippet-link":"switchToSnippet","mousedown .snippet":"snippetToTextArea"};C.prototype.initialize=function(){};C.prototype.render=function(){var E;E=this.template();$(this.el).html(E(this.model));this.switchToSnippet();this.isParam=this.model.isParam;if(this.isParam){$(".notice",$(this.el)).text("Click to set as parameter value")}return this};C.prototype.template=function(){return Handlebars.templates.signature};C.prototype.switchToDescription=function(E){if(E!=null){E.preventDefault()}$(".snippet",$(this.el)).hide();$(".description",$(this.el)).show();$(".description-link",$(this.el)).addClass("selected");return $(".snippet-link",$(this.el)).removeClass("selected")};C.prototype.switchToSnippet=function(E){if(E!=null){E.preventDefault()}$(".description",$(this.el)).hide();$(".snippet",$(this.el)).show();$(".snippet-link",$(this.el)).addClass("selected");return $(".description-link",$(this.el)).removeClass("selected")};C.prototype.snippetToTextArea=function(E){var F;if(this.isParam){if(E!=null){E.preventDefault()}F=$("textarea",$(this.el.parentNode.parentNode.parentNode));if($.trim(F.val())===""){return F.val(this.model.sampleJSON)}}};return C})(Backbone.View);l=(function(C){y(D,C);function D(){A=D.__super__.constructor.apply(this,arguments);return A}D.prototype.initialize=function(){};D.prototype.render=function(){var E;E=this.template();$(this.el).html(E(this.model));$("label[for=contentType]",$(this.el)).text("Response Content Type");return this};D.prototype.template=function(){return Handlebars.templates.content_type};return D})(Backbone.View);o=(function(C){y(D,C);function D(){z=D.__super__.constructor.apply(this,arguments);return z}D.prototype.initialize=function(){};D.prototype.render=function(){var E;E=this.template();$(this.el).html(E(this.model));$("label[for=responseContentType]",$(this.el)).text("Response Content Type");return this};D.prototype.template=function(){return Handlebars.templates.response_content_type};return D})(Backbone.View);n=(function(D){y(C,D);function C(){d=C.__super__.constructor.apply(this,arguments);return d}C.prototype.initialize=function(){};C.prototype.render=function(){var E;E=this.template();$(this.el).html(E(this.model));$("label[for=parameterContentType]",$(this.el)).text("Parameter content type:");return this};C.prototype.template=function(){return Handlebars.templates.parameter_content_type};return C})(Backbone.View);t=(function(D){y(C,D);function C(){b=C.__super__.constructor.apply(this,arguments);return b}C.prototype.initialize=function(){};C.prototype.render=function(){var E;E=this.template();$(this.el).html(E(this.model));return this};C.prototype.events={"click #apikey_button":"toggleApiKeyContainer","click #apply_api_key":"applyApiKey"};C.prototype.applyApiKey=function(){var E;window.authorizations.add(this.model.name,new ApiKeyAuthorization(this.model.name,$("#input_apiKey_entry").val(),this.model["in"]));window.swaggerUi.load();return E=$("#apikey_container").show()};C.prototype.toggleApiKeyContainer=function(){var E;if($("#apikey_container").length>0){E=$("#apikey_container").first();if(E.is(":visible")){return E.hide()}else{$(".auth_container").hide();return E.show()}}};C.prototype.template=function(){return Handlebars.templates.apikey_button_view};return C})(Backbone.View);k=(function(D){y(C,D);function C(){B=C.__super__.constructor.apply(this,arguments);return B}C.prototype.initialize=function(){};C.prototype.render=function(){var E;E=this.template();$(this.el).html(E(this.model));return this};C.prototype.events={"click #basic_auth_button":"togglePasswordContainer","click #apply_basic_auth":"applyPassword"};C.prototype.applyPassword=function(){var F,E,G;console.log("applying password");G=$(".input_username").val();E=$(".input_password").val();window.authorizations.add(this.model.type,new PasswordAuthorization("basic",G,E));window.swaggerUi.load();return F=$("#basic_auth_container").hide()};C.prototype.togglePasswordContainer=function(){var E;if($("#basic_auth_container").length>0){E=$("#basic_auth_container").show();if(E.is(":visible")){return E.slideUp()}else{$(".auth_container").hide();return E.show()}}};C.prototype.template=function(){return Handlebars.templates.basic_auth_button_view};return C})(Backbone.View)}).call(this);
\ No newline at end of file
diff --git a/src/main/webapp/styles/alt.css b/src/main/webapp/styles/alt.css
deleted file mode 100755
index dc99e4edf..000000000
--- a/src/main/webapp/styles/alt.css
+++ /dev/null
@@ -1,369 +0,0 @@
-/* main elements */
-
-body,div,td {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #666;
-}
-
-body {
-	background-color: #fff;
-	text-align: center;
-}
-
-#header {
-	margin-bottom: 1em;
-}
-
-#wrapper {
-	width:800px;
-	min-width: 800px;
-	max-width: 800px;
-	margin-right: auto;
-	margin-left: auto;
-
-	/* fix max-width incompatibility in IE6 */
-	width:expression(document.body.clientWidth > 800? "800px": "auto" );
-	
-	overflow:hidden;
-	display:block;
-}
-
-/* header and footer elements */
-
-#main {
-	overflow:hidden;
-	display:box;
-}
-
-#menu {
-    background: #eee;
-  	position:relative;
-  	float:right;  	
-  	left:0px;
-  	width:220px;
-  	margin-left:15px;
-}
-
-#menu ul{
-	list-style: none;
-	margin: 0;
-	padding: 0;
-}
-
-#menu ul li{
-	padding: 0px;
-}
-
-
-#menu a, #menu h2 {
-	display: block;
-	margin: 0;
-	padding: 2px 6px;
-	color:#FFFFFF;
-}
-
-#menu h2 {
-	color: #fff;
-	background: #648C1D;
-	text-transform: uppercase;
-	font-weight:bold;
-	font-size: 12px;
-}
-
-#menu a {
-	color: #666666;
-	background: #efefef;
-	text-decoration: none;
-	padding: 2px 12px;
-}
-
-#menu a:hover {
-	color: #648C1D;
-	background: #fff;
-}
-
-#footer {
-	background:#fff;
-	border:none;
-	margin-top:15px;
-	border-top:1px solid #999999;
-}
-
-#footer .new {
-	float:left;
-}
-
-#footer a:link {color: #7db223;}
-
-.quicklinks {
-	clear:both; 
-	padding-bottom: 15px
-}
-.quicklinks span {
-	float: right;
-}
-
-label {
-	width:100px;
-	float:left;
-	margin-left: 5px;
-	margin-top: 0px;
-}
-
-input {
-	height:20px;
-}
-
-input, textarea, select {
-	border:1px solid #B3B3B3;
-}
-
-input.image {
-	border: none;
-	height: auto;
-	vertical-align: middle;
-}
-
-submit {
-	height:25px;
-}
-
-div {
-	text-align: left;
-}
-
-div .box {
-	display:block;
-	margin-left:105px;
-}
-
-/* menu elements*/
-
-a.menu, a.menu:link, a.menu:visited {display:block; width:150px; height:25px;} 
-	
-/* text styles */
-
-h1,h2,h3 {
-	font-family: Helvetica, sans-serif;
-	color: #7db223;
-}
-
-h1 {
-	font-size: 20px;
-	line-height: 26px;
-}
-
-h2 {
-	font-size: 18px;
-	line-height: 20px;
-}
-
-h3 {
-	font-size: 15px;
-	line-height: 21px;
-	color:#555;
-}
-
-h4 {
-	font-size: 14px;
-	line-height: 20px;
-}
-
-.errors {
-	color: red;
-	font-weight: bold;
-	display: block;
-	margin-left: 105px;
-}
-
-a {
-	text-decoration: underline;
-	font-size: 12px;
-}
-
-a img {
-	border: 0 none;
-	vertical-align: middle;
-}
-
-tr:nth-child(odd) {
-	background-color: #FFFFFF;
-}
-
-tr:nth-child(even) {
-	background-color: #EFEFEF;
-}
-
-a:link {
-	color: #7db223;
-}
-
-a:hover {
-	color: #456314;
-}
-
-a:active {
-	color: #7db223;
-}
-
-a:visited {
-	color: #7db223;
-}
-
-li {
-	padding-top: 5px;
-	text-align: left;
-}
-
-ul li {
-	margin:0 0 0.25em 0;
-	padding:0;
-}
-/* table elements */
-
-table {
-	background: #EEEEEE;
-	margin: 2px 0 0 0;
-	border: 1px solid #BBBBBB;
-	border-collapse: collapse;
-	width: 100%
-}
-
-table table {
-	margin: -5px 0;
-	border: 0px solid #e0e7d3;
-	width: 100%;
-}
-
-table td,table th {
-	padding: 2px;
-	border: 1px solid #CCCCCC;
-}
-
-table td form {
-	text-align:center;
-	vertical-align: middle;
-	margin: 0px;
-}
-
-table th {
-	font-size: 0.9em;
-	text-align: left;
-	font-weight: bold;
-	color: #FFF;
-	background: #999;
-}
-
-table thead {
-	font-weight: bold;
-	font-style: italic;
-	background-color: #BBBBBB;
-}
-
-table a:link {color: #303030;}
-
-.utilbox {width: 18px;}
-
-caption {
-	caption-side: top;
-	width: auto;
-	text-align: left;
-	font-size: 12px;
-	color: #848f73;
-	padding-bottom: 4px;
-}
-
-fieldset {
-	background: #e0e7d3;
-	padding: 8px;
-	padding-bottom: 22px;
-	border: none;
-	width: 560px;
-}
-
-fieldset label {
-	width: 70px;
-	float: left;
-	margin-top: 1.7em;
-	margin-left: 20px;
-}
-
-fieldset textfield {
-	margin: 3px;
-	height: 20px;
-	background: #e0e7d3;
-}
-
-fieldset textarea {
-	margin: 3px;
-	height: 165px;
-	background: #e0e7d3;
-}
-
-fieldset input {
-	margin: 3px;
-	height: 20px;
-	background: #e0e7d3;
-}
-
-fieldset table {
-	width: 100%;
-}
-
-fieldset th {
-	padding-left: 25px;
-}
-
-.table-buttons {
-	background-color:#fff;
-	border:none;
-}
-
-.table-buttons td {
-	border:none;
-}
-
-.submit input {
-	border: 1px solid #BBBBBB;
-	color:#777777;
-	padding:2px 7px;
-	font-size:11px;
-	text-transform:uppercase;
-	font-weight:bold;
-	height:24px;
-}
-
-.updated {
-	background:#ecf1e5;
-	font-size:11px;
-	margin-left:2px;
-	border:4px solid #ecf1e5;
-}
-
-.updated td {
-	padding:2px 8px;
-	font-size:11px;
-	color:#888888;
-}
-
-.dijitArrowButton {
-	height: 20px;
-}
-
-.dijitTextArea{
-	min-height:5.5em !important;
-	max-height:22em !important;
-	overflow-y: auto !important;
-	max-width: 175px;
-}
-
-.RichTextEditable{
-	min-height:18em !important;
-	max-height:18em !important;
-}
-
-.flag {
-	height: 11px;
-	width: 16px;
-}
\ No newline at end of file
diff --git a/src/main/webapp/styles/standard.css b/src/main/webapp/styles/standard.css
deleted file mode 100755
index 9f79bb08c..000000000
--- a/src/main/webapp/styles/standard.css
+++ /dev/null
@@ -1,373 +0,0 @@
-/* main elements */
-
-body,div,td {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #666;
-}
-
-body {
-	background-color: #fff;
-	text-align: center;
-}
-
-#header {
-	margin-bottom: 1em;
-}
-
-#wrapper {
-	width:800px;
-	min-width: 800px;
-	max-width: 800px;
-	margin-right: auto;
-	margin-left: auto;
-
-	/* fix max-width incompatibility in IE6 */
-	width:expression(document.body.clientWidth > 800? "800px": "auto" );
-	
-	overflow:hidden;
-	display:block;
-}
-
-/* header and footer elements */
-
-#main {
-	overflow:hidden;
-	display:box;
-}
-
-#menu {
-	background: #eee;
-	position:relative;
-	float:left;  	
-	left:0px;
-	width:220px;
-	margin-right:15px;
-}
-
-#menu ul{
-	list-style: none;
-	margin: 0;
-	padding: 0;
-}
-
-#menu ul li{
-	padding: 0px;
-}
-
-
-#menu a, #menu h2 {
-	display: block;
-	margin: 0;
-	padding: 2px 6px;
-	color:#FFFFFF;
-}
-
-#menu h2 {
-	color: #fff;
-	background: #648C1D;
-	text-transform: uppercase;
-	font-weight:bold;
-	font-size: 12px;
-}
-
-#menu a {
-	color: #666666;
-	background: #efefef;
-	text-decoration: none;
-	padding: 2px 12px;
-}
-
-#menu a:hover {
-	color: #648C1D;
-	background: #fff;
-}
-
-#footer {
-	background:#fff;
-	border:none;
-	margin-top:15px;
-	border-top:1px solid #999999;
-}
-
-#footer .new {
-	float:left;
-}
-
-#footer a:link {color: #7db223;}
-
-.quicklinks {
-	clear:both; 
-	padding-bottom: 15px
-}
-.quicklinks span {
-	float: right;
-}
-
-table.navigation {
-	border: 0px;
-}
-
-label {
-	width:100px;
-	float:left;
-	margin-left: 5px;
-	margin-top: 0px;
-}
-
-input {
-	height:20px;
-}
-
-input, textarea, select {
-	border:1px solid #B3B3B3;
-}
-
-input.image {
-	border: none;
-	height: auto;
-	vertical-align: middle;
-}
-
-submit {
-	height:25px;
-}
-
-div {
-	text-align: left;
-}
-
-div .box {
-	display:block;
-	margin-left:105px;
-}
-
-/* menu elements*/
-
-a.menu, a.menu:link, a.menu:visited {display:block; width:150px; height:25px;} 
-	
-/* text styles */
-
-h1,h2,h3 {
-	font-family: Helvetica, sans-serif;
-	color: #7db223;
-}
-
-h1 {
-	font-size: 20px;
-	line-height: 26px;
-}
-
-h2 {
-	font-size: 18px;
-	line-height: 20px;
-}
-
-h3 {
-	font-size: 15px;
-	line-height: 21px;
-	color:#555;
-}
-
-h4 {
-	font-size: 14px;
-	line-height: 20px;
-}
-
-.errors {
-	color: red;
-	font-weight: bold;
-	display: block;
-	margin-left: 105px;
-}
-
-a {
-	text-decoration: underline;
-	font-size: 12px;
-}
-
-a img {
-	border: 0 none;
-	vertical-align: middle;
-}
-
-tr:nth-child(odd) {
-	background-color: #FFFFFF;
-}
-
-tr:nth-child(even) {
-	background-color: #EFEFEF;
-}
-
-a:link {
-	color: #7db223;
-}
-
-a:hover {
-	color: #456314;
-}
-
-a:active {
-	color: #7db223;
-}
-
-a:visited {
-	color: #7db223;
-}
-
-li {
-	padding-top: 5px;
-	text-align: left;
-}
-
-ul li {
-	margin:0 0 0.25em 0;
-	padding:0;
-}
-/* table elements */
-
-table {
-	background: #EEEEEE;
-	margin: 2px 0 0 0;
-	border: 1px solid #BBBBBB;
-	border-collapse: collapse;
-	width: 100%
-}
-
-table table {
-	margin: -5px 0;
-	border: 0px solid #e0e7d3;
-	width: 100%;
-}
-
-table td,table th {
-	padding: 2px;
-	border: 1px solid #CCCCCC;
-}
-
-table td form {
-	text-align:center;
-	vertical-align: middle;
-	margin: 0px;
-}
-
-table th {
-	font-size: 0.9em;
-	text-align: left;
-	font-weight: bold;
-	color: #FFF;
-	background: #999;
-}
-
-table thead {
-	font-weight: bold;
-	font-style: italic;
-	background-color: #BBBBBB;
-}
-
-table a:link {color: #303030;}
-
-.utilbox {width: 18px;}
-
-caption {
-	caption-side: top;
-	width: auto;
-	text-align: left;
-	font-size: 12px;
-	color: #848f73;
-	padding-bottom: 4px;
-}
-
-fieldset {
-	background: #e0e7d3;
-	padding: 8px;
-	padding-bottom: 22px;
-	border: none;
-	width: 560px;
-}
-
-fieldset label {
-	width: 70px;
-	float: left;
-	margin-top: 1.7em;
-	margin-left: 20px;
-}
-
-fieldset textfield {
-	margin: 3px;
-	height: 20px;
-	background: #e0e7d3;
-}
-
-fieldset textarea {
-	margin: 3px;
-	height: 165px;
-	background: #e0e7d3;
-}
-
-fieldset input {
-	margin: 3px;
-	height: 20px;
-	background: #e0e7d3;
-}
-
-fieldset table {
-	width: 100%;
-}
-
-fieldset th {
-	padding-left: 25px;
-}
-
-.table-buttons {
-	background-color:#fff;
-	border:none;
-}
-
-.table-buttons td {
-	border:none;
-}
-
-.submit input {
-	border: 1px solid #BBBBBB;
-	color:#777777;
-	padding:2px 7px;
-	font-size:11px;
-	text-transform:uppercase;
-	font-weight:bold;
-	height:24px;
-}
-
-.updated {
-	background:#ecf1e5;
-	font-size:11px;
-	margin-left:2px;
-	border:4px solid #ecf1e5;
-}
-
-.updated td {
-	padding:2px 8px;
-	font-size:11px;
-	color:#888888;
-}
-
-.dijitArrowButton {
-	height: 20px;
-}
-
-.dijitTextArea{
-	min-height:5.5em !important;
-	max-height:22em !important;
-	overflow-y: auto !important;
-	max-width: 175px;
-}
-
-.RichTextEditable{
-	min-height:18em !important;
-	max-height:18em !important;
-}
-
-.flag {
-	height: 11px;
-	width: 16px;
-}
\ No newline at end of file

From 1a52dc96116065d58f7cc23bcbc52718f0899a7c Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Thu, 28 Apr 2022 16:57:08 -0700
Subject: [PATCH 52/73] Remove tiles

---
 pom.xml                                       |  5 -----
 src/main/webapp/WEB-INF/layouts/layouts.xml   | 19 -------------------
 .../WEB-INF/spring/webmvc-config-test.xml     | 15 ++-------------
 .../webapp/WEB-INF/spring/webmvc-config.xml   | 15 ++-------------
 4 files changed, 4 insertions(+), 50 deletions(-)
 delete mode 100755 src/main/webapp/WEB-INF/layouts/layouts.xml

diff --git a/pom.xml b/pom.xml
index 3f47a60c2..11550c316 100644
--- a/pom.xml
+++ b/pom.xml
@@ -438,11 +438,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 			<artifactId>commons-codec</artifactId>
 			<version>1.5</version>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.tiles</groupId>
-			<artifactId>tiles-jsp</artifactId>
-			<version>3.0.8</version>
-		</dependency>
 		<dependency>
 			<groupId>com.mysema.querydsl</groupId>
 			<artifactId>querydsl-spatial</artifactId>
diff --git a/src/main/webapp/WEB-INF/layouts/layouts.xml b/src/main/webapp/WEB-INF/layouts/layouts.xml
deleted file mode 100755
index 3c9d6d4bb..000000000
--- a/src/main/webapp/WEB-INF/layouts/layouts.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE tiles-definitions PUBLIC
-       "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN"
-       "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-
-<tiles-definitions>
-
-  <definition name="default" template="/WEB-INF/layouts/default.jspx">
-    <put-attribute name="header" value="/WEB-INF/views/header.jspx" />
-    <put-attribute name="menu" value="/WEB-INF/views/menu.jspx" />
-    <put-attribute name="footer" value="/WEB-INF/views/footer.jspx" />
-  </definition>
-
-  <definition name="public" template="/WEB-INF/layouts/default.jspx">
-    <put-attribute name="header" value="/WEB-INF/views/header.jspx" />
-    <put-attribute name="footer" value="/WEB-INF/views/footer.jspx" />
-  </definition>
-
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/spring/webmvc-config-test.xml b/src/main/webapp/WEB-INF/spring/webmvc-config-test.xml
index 0d1d49ae3..f8920cc3f 100755
--- a/src/main/webapp/WEB-INF/spring/webmvc-config-test.xml
+++ b/src/main/webapp/WEB-INF/spring/webmvc-config-test.xml
@@ -61,17 +61,6 @@
 
     <!-- Enable this for integration of file upload functionality -->
     <bean class="org.springframework.web.multipart.commons.CommonsMultipartResolver" id="multipartResolver"/>
-<bean class="org.springframework.web.servlet.view.UrlBasedViewResolver" id="tilesViewResolver">
-    <property name="viewClass" value="org.springframework.web.servlet.view.tiles.TilesView"/>
-  </bean>
-     <bean class="org.springframework.web.servlet.view.tiles3.TilesConfigurer" id="tilesConfigurer">
-    <property name="definitions">
-      <list>
-        <value>/WEB-INF/layouts/layouts.xml</value>
-        <!-- Scan views directory for Tiles configurations -->
-        <value>/WEB-INF/views/**/views.xml</value>
-      </list>
-    </property>
-  </bean>
-<bean class="com.labsynch.labseer.web.ApplicationConversionServiceFactoryBean" id="applicationConversionService"/>
+
+    <bean class="com.labsynch.labseer.web.ApplicationConversionServiceFactoryBean" id="applicationConversionService"/>
 </beans>
diff --git a/src/main/webapp/WEB-INF/spring/webmvc-config.xml b/src/main/webapp/WEB-INF/spring/webmvc-config.xml
index 6c075995b..d51b9655a 100755
--- a/src/main/webapp/WEB-INF/spring/webmvc-config.xml
+++ b/src/main/webapp/WEB-INF/spring/webmvc-config.xml
@@ -79,18 +79,7 @@
 
     <!-- Enable this for integration of file upload functionality -->
     <bean class="org.springframework.web.multipart.commons.CommonsMultipartResolver" id="multipartResolver"/>
-<bean class="org.springframework.web.servlet.view.UrlBasedViewResolver" id="tilesViewResolver">
-    <property name="viewClass" value="org.springframework.web.servlet.view.tiles3.TilesView"/>
-  </bean>
-    <bean class="org.springframework.web.servlet.view.tiles3.TilesConfigurer" id="tilesConfigurer">
-    <property name="definitions">
-      <list>
-        <value>/WEB-INF/layouts/layouts.xml</value>
-        <!-- Scan views directory for Tiles configurations -->
-        <value>/WEB-INF/views/**/views.xml</value>
-      </list>
-    </property>
-  </bean>
-<bean class="com.labsynch.labseer.web.ApplicationConversionServiceFactoryBean" id="applicationConversionService"/>
+
+    <bean class="com.labsynch.labseer.web.ApplicationConversionServiceFactoryBean" id="applicationConversionService"/>
 
 </beans>

From bf346713d70865ee9bfc40c4e048b79a01b49c7b Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Thu, 28 Apr 2022 17:52:01 -0700
Subject: [PATCH 53/73] Pushin all aspectj files

---
 .../bbchem/BBChemDryRunStructure.java         | 159 ++-
 .../BBChemDryRunStructure_Roo_Configurable.aj |  13 -
 .../BBChemDryRunStructure_Roo_Finder.aj       |  74 --
 ...hemDryRunStructure_Roo_Jpa_ActiveRecord.aj |  61 --
 .../BBChemDryRunStructure_Roo_Jpa_Entity.aj   |  13 -
 .../bbchem/BBChemDryRunStructure_Roo_Json.aj  |  45 -
 .../BBChemDryRunStructure_Roo_ToString.aj     |  16 -
 .../bbchem/BBChemParentStructure.java         | 157 ++-
 .../BBChemParentStructure_Roo_Configurable.aj |  13 -
 .../BBChemParentStructure_Roo_Finder.aj       |  74 --
 ...hemParentStructure_Roo_Jpa_ActiveRecord.aj |  61 --
 .../BBChemParentStructure_Roo_Jpa_Entity.aj   |  13 -
 .../bbchem/BBChemParentStructure_Roo_Json.aj  |  45 -
 .../BBChemParentStructure_Roo_ToString.aj     |  16 -
 .../bbchem/BBChemSaltFormStructure.java       | 157 ++-
 ...BChemSaltFormStructure_Roo_Configurable.aj |  13 -
 .../BBChemSaltFormStructure_Roo_Finder.aj     |  74 --
 ...mSaltFormStructure_Roo_Jpa_ActiveRecord.aj |  61 --
 .../BBChemSaltFormStructure_Roo_Jpa_Entity.aj |  13 -
 .../BBChemSaltFormStructure_Roo_Json.aj       |  45 -
 .../BBChemSaltFormStructure_Roo_ToString.aj   |  16 -
 .../bbchem/BBChemSaltStructure.java           | 159 ++-
 .../BBChemSaltStructure_Roo_Configurable.aj   |  13 -
 .../bbchem/BBChemSaltStructure_Roo_Finder.aj  |  74 --
 ...BChemSaltStructure_Roo_Jpa_ActiveRecord.aj |  61 --
 .../BBChemSaltStructure_Roo_Jpa_Entity.aj     |  13 -
 .../bbchem/BBChemSaltStructure_Roo_Json.aj    |  45 -
 .../BBChemSaltStructure_Roo_ToString.aj       |  16 -
 .../BBChemStandardizationDryRunStructure.java | 159 ++-
 ...izationDryRunStructure_Roo_Configurable.aj |  13 -
 ...andardizationDryRunStructure_Roo_Finder.aj |  74 --
 ...ionDryRunStructure_Roo_Jpa_ActiveRecord.aj |  61 --
 ...rdizationDryRunStructure_Roo_Jpa_Entity.aj |  13 -
 ...StandardizationDryRunStructure_Roo_Json.aj |  45 -
 ...dardizationDryRunStructure_Roo_ToString.aj |  16 -
 .../domain/AbstractBBChemStructure.java       | 291 +++++-
 ...bstractBBChemStructure_Roo_Configurable.aj |  13 -
 .../AbstractBBChemStructure_Roo_JavaBean.aj   | 151 ---
 ...actBBChemStructure_Roo_Jpa_ActiveRecord.aj | 102 --
 .../AbstractBBChemStructure_Roo_Jpa_Entity.aj |  31 -
 .../AbstractBBChemStructure_Roo_Json.aj       |  45 -
 .../AbstractBBChemStructure_Roo_ToString.aj   |  16 -
 .../labseer/domain/AbstractLabel.java         | 197 +++-
 .../domain/AbstractLabel_Roo_Configurable.aj  |  13 -
 .../domain/AbstractLabel_Roo_JavaBean.aj      | 115 ---
 .../AbstractLabel_Roo_Jpa_ActiveRecord.aj     |  76 --
 .../domain/AbstractLabel_Roo_Jpa_Entity.aj    |  31 -
 .../domain/AbstractLabel_Roo_ToString.aj      |  16 -
 .../labseer/domain/AbstractState.java         | 181 +++-
 .../domain/AbstractState_Roo_Configurable.aj  |  13 -
 .../domain/AbstractState_Roo_JavaBean.aj      |  99 --
 .../AbstractState_Roo_Jpa_ActiveRecord.aj     |  76 --
 .../domain/AbstractState_Roo_Jpa_Entity.aj    |  31 -
 .../domain/AbstractState_Roo_ToString.aj      |  16 -
 .../labseer/domain/AbstractThing.java         | 146 ++-
 .../domain/AbstractThing_Roo_Configurable.aj  |  13 -
 .../domain/AbstractThing_Roo_JavaBean.aj      | 109 --
 .../AbstractThing_Roo_Jpa_ActiveRecord.aj     |  48 -
 .../domain/AbstractThing_Roo_Jpa_Entity.aj    |  17 -
 .../domain/AbstractThing_Roo_ToString.aj      |  16 -
 .../labseer/domain/AbstractValue.java         | 365 ++++++-
 .../domain/AbstractValue_Roo_Configurable.aj  |  13 -
 .../domain/AbstractValue_Roo_JavaBean.aj      | 284 ------
 .../AbstractValue_Roo_Jpa_ActiveRecord.aj     |  76 --
 .../domain/AbstractValue_Roo_Jpa_Entity.aj    |  31 -
 .../domain/AbstractValue_Roo_ToString.aj      |  16 -
 .../labseer/domain/AnalysisGroup.java         | 237 ++++-
 .../labseer/domain/AnalysisGroupLabel.java    | 162 ++-
 .../AnalysisGroupLabel_Roo_Configurable.aj    |  13 -
 .../domain/AnalysisGroupLabel_Roo_Finder.aj   |  75 --
 .../domain/AnalysisGroupLabel_Roo_JavaBean.aj |  19 -
 ...AnalysisGroupLabel_Roo_Jpa_ActiveRecord.aj |  61 --
 .../AnalysisGroupLabel_Roo_Jpa_Entity.aj      |  17 -
 .../domain/AnalysisGroupLabel_Roo_Json.aj     |  38 -
 .../domain/AnalysisGroupLabel_Roo_ToString.aj |  16 -
 .../labseer/domain/AnalysisGroupState.java    | 225 ++++-
 .../AnalysisGroupState_Roo_Configurable.aj    |  13 -
 .../domain/AnalysisGroupState_Roo_Finder.aj   | 158 ---
 .../domain/AnalysisGroupState_Roo_JavaBean.aj |  29 -
 ...AnalysisGroupState_Roo_Jpa_ActiveRecord.aj |  61 --
 .../AnalysisGroupState_Roo_Jpa_Entity.aj      |  17 -
 .../domain/AnalysisGroupState_Roo_ToString.aj |  16 -
 .../labseer/domain/AnalysisGroupValue.java    | 279 ++++-
 .../AnalysisGroupValue_Roo_Configurable.aj    |  13 -
 .../domain/AnalysisGroupValue_Roo_Finder.aj   | 244 -----
 .../domain/AnalysisGroupValue_Roo_JavaBean.aj |  19 -
 ...AnalysisGroupValue_Roo_Jpa_ActiveRecord.aj |  35 -
 .../AnalysisGroupValue_Roo_Jpa_Entity.aj      |  17 -
 .../domain/AnalysisGroupValue_Roo_ToString.aj |  16 -
 .../domain/AnalysisGroup_Roo_Configurable.aj  |  13 -
 .../domain/AnalysisGroup_Roo_Finder.aj        | 159 ---
 .../domain/AnalysisGroup_Roo_JavaBean.aj      |  47 -
 .../AnalysisGroup_Roo_Jpa_ActiveRecord.aj     |  61 --
 .../domain/AnalysisGroup_Roo_Jpa_Entity.aj    |  13 -
 .../domain/AnalysisGroup_Roo_ToString.aj      |  16 -
 .../labseer/domain/ApplicationSetting.java    | 274 ++++-
 .../ApplicationSetting_Roo_Configurable.aj    |  13 -
 .../domain/ApplicationSetting_Roo_Finder.aj   |  77 --
 .../domain/ApplicationSetting_Roo_JavaBean.aj |  51 -
 ...ApplicationSetting_Roo_Jpa_ActiveRecord.aj | 101 --
 .../ApplicationSetting_Roo_Jpa_Entity.aj      |  45 -
 .../domain/ApplicationSetting_Roo_Json.aj     |  45 -
 .../domain/ApplicationSetting_Roo_ToString.aj |  16 -
 .../com/labsynch/labseer/domain/Author.java   | 223 +++-
 .../labsynch/labseer/domain/AuthorLabel.java  | 163 ++-
 .../domain/AuthorLabel_Roo_Configurable.aj    |  13 -
 .../labseer/domain/AuthorLabel_Roo_Finder.aj  |  75 --
 .../domain/AuthorLabel_Roo_JavaBean.aj        |  19 -
 .../AuthorLabel_Roo_Jpa_ActiveRecord.aj       |  61 --
 .../domain/AuthorLabel_Roo_Jpa_Entity.aj      |  17 -
 .../labseer/domain/AuthorLabel_Roo_Json.aj    |  38 -
 .../domain/AuthorLabel_Roo_ToString.aj        |  16 -
 .../labsynch/labseer/domain/AuthorRole.java   | 212 +++-
 .../domain/AuthorRole_Roo_Configurable.aj     |  13 -
 .../labseer/domain/AuthorRole_Roo_Finder.aj   | 113 ---
 .../labseer/domain/AuthorRole_Roo_JavaBean.aj |  28 -
 .../domain/AuthorRole_Roo_Jpa_ActiveRecord.aj | 101 --
 .../domain/AuthorRole_Roo_Jpa_Entity.aj       |  13 -
 .../labsynch/labseer/domain/AuthorState.java  | 256 ++++-
 .../domain/AuthorState_Roo_Configurable.aj    |  13 -
 .../labseer/domain/AuthorState_Roo_Finder.aj  | 189 ----
 .../domain/AuthorState_Roo_JavaBean.aj        |  29 -
 .../AuthorState_Roo_Jpa_ActiveRecord.aj       |  61 --
 .../domain/AuthorState_Roo_Jpa_Entity.aj      |  17 -
 .../domain/AuthorState_Roo_ToString.aj        |  16 -
 .../labsynch/labseer/domain/AuthorValue.java  | 333 +++++-
 .../domain/AuthorValue_Roo_Configurable.aj    |  13 -
 .../labseer/domain/AuthorValue_Roo_Finder.aj  | 244 -----
 .../domain/AuthorValue_Roo_JavaBean.aj        |  19 -
 .../AuthorValue_Roo_Jpa_ActiveRecord.aj       |  57 --
 .../domain/AuthorValue_Roo_Jpa_Entity.aj      |  13 -
 .../labseer/domain/AuthorValue_Roo_Json.aj    |  45 -
 .../domain/AuthorValue_Roo_ToString.aj        |  16 -
 .../labseer/domain/Author_Roo_Configurable.aj |  13 -
 .../labseer/domain/Author_Roo_Finder.aj       |  85 --
 .../labseer/domain/Author_Roo_JavaBean.aj     | 111 --
 .../domain/Author_Roo_Jpa_ActiveRecord.aj     |  61 --
 .../labseer/domain/Author_Roo_Jpa_Entity.aj   |  13 -
 .../labsynch/labseer/domain/BulkLoadFile.java | 284 +++++-
 .../domain/BulkLoadFile_Roo_Configurable.aj   |  13 -
 .../labseer/domain/BulkLoadFile_Roo_Finder.aj |  74 --
 .../domain/BulkLoadFile_Roo_JavaBean.aj       |  67 --
 .../BulkLoadFile_Roo_Jpa_ActiveRecord.aj      | 101 --
 .../domain/BulkLoadFile_Roo_Jpa_Entity.aj     |  43 -
 .../labseer/domain/BulkLoadFile_Roo_Json.aj   |  45 -
 .../domain/BulkLoadFile_Roo_ToString.aj       |  16 -
 .../labseer/domain/BulkLoadTemplate.java      | 297 +++++-
 .../BulkLoadTemplate_Roo_Configurable.aj      |  13 -
 .../domain/BulkLoadTemplate_Roo_Finder.aj     | 111 --
 .../domain/BulkLoadTemplate_Roo_JavaBean.aj   |  42 -
 .../BulkLoadTemplate_Roo_Jpa_ActiveRecord.aj  | 101 --
 .../domain/BulkLoadTemplate_Roo_Jpa_Entity.aj |  43 -
 .../domain/BulkLoadTemplate_Roo_Json.aj       |  45 -
 .../domain/BulkLoadTemplate_Roo_ToString.aj   |  16 -
 .../labseer/domain/ChemStructure.java         | 276 ++++-
 .../domain/ChemStructure_Roo_Configurable.aj  |  13 -
 .../domain/ChemStructure_Roo_Finder.aj        |  43 -
 .../domain/ChemStructure_Roo_JavaBean.aj      | 115 ---
 .../ChemStructure_Roo_Jpa_ActiveRecord.aj     | 101 --
 .../domain/ChemStructure_Roo_Jpa_Entity.aj    |  17 -
 .../labseer/domain/ChemStructure_Roo_Json.aj  |  45 -
 .../domain/ChemStructure_Roo_ToString.aj      |  16 -
 .../labseer/domain/CmpdRegAppSetting.java     | 206 +++-
 .../CmpdRegAppSetting_Roo_Configurable.aj     |  13 -
 .../domain/CmpdRegAppSetting_Roo_JavaBean.aj  |  51 -
 .../CmpdRegAppSetting_Roo_Jpa_ActiveRecord.aj | 101 --
 .../CmpdRegAppSetting_Roo_Jpa_Entity.aj       |  43 -
 .../domain/CmpdRegAppSetting_Roo_Json.aj      |  45 -
 .../domain/CmpdRegAppSetting_Roo_ToString.aj  |  16 -
 .../com/labsynch/labseer/domain/CodeKind.java | 190 +++-
 .../domain/CodeKind_Roo_Configurable.aj       |  13 -
 .../labseer/domain/CodeKind_Roo_Finder.aj     | 112 --
 .../labseer/domain/CodeKind_Roo_JavaBean.aj   |  35 -
 .../domain/CodeKind_Roo_Jpa_ActiveRecord.aj   |  35 -
 .../labseer/domain/CodeKind_Roo_Json.aj       |  45 -
 .../labseer/domain/CodeKind_Roo_ToString.aj   |  16 -
 .../labsynch/labseer/domain/CodeOrigin.java   | 205 +++-
 .../domain/CodeOrigin_Roo_Configurable.aj     |  13 -
 .../labseer/domain/CodeOrigin_Roo_Finder.aj   |  43 -
 .../labseer/domain/CodeOrigin_Roo_JavaBean.aj |  18 -
 .../domain/CodeOrigin_Roo_Jpa_ActiveRecord.aj | 101 --
 .../domain/CodeOrigin_Roo_Jpa_Entity.aj       |  45 -
 .../labseer/domain/CodeOrigin_Roo_Json.aj     |  45 -
 .../labseer/domain/CodeOrigin_Roo_ToString.aj |  16 -
 .../com/labsynch/labseer/domain/CodeType.java | 172 +++-
 .../domain/CodeType_Roo_Configurable.aj       |  13 -
 .../labseer/domain/CodeType_Roo_Finder.aj     |  43 -
 .../labseer/domain/CodeType_Roo_JavaBean.aj   |  18 -
 .../domain/CodeType_Roo_Jpa_ActiveRecord.aj   | 101 --
 .../labseer/domain/CodeType_Roo_Json.aj       |  45 -
 .../labseer/domain/CodeType_Roo_ToString.aj   |  16 -
 .../com/labsynch/labseer/domain/Compound.java | 279 +++++
 .../labsynch/labseer/domain/CompoundType.java | 229 ++++-
 .../domain/CompoundType_Roo_Configurable.aj   |  13 -
 .../labseer/domain/CompoundType_Roo_Finder.aj |  43 -
 .../domain/CompoundType_Roo_JavaBean.aj       |  42 -
 .../CompoundType_Roo_Jpa_ActiveRecord.aj      | 101 --
 .../domain/CompoundType_Roo_Jpa_Entity.aj     |  43 -
 .../labseer/domain/CompoundType_Roo_Json.aj   |  45 -
 .../domain/CompoundType_Roo_ToString.aj       |  16 -
 .../domain/Compound_Roo_Configurable.aj       |  13 -
 .../labseer/domain/Compound_Roo_Finder.aj     |  71 --
 .../labseer/domain/Compound_Roo_JavaBean.aj   |  67 --
 .../domain/Compound_Roo_Jpa_ActiveRecord.aj   | 101 --
 .../labseer/domain/Compound_Roo_Jpa_Entity.aj |  43 -
 .../labseer/domain/Compound_Roo_Json.aj       |  45 -
 .../labseer/domain/Compound_Roo_ToString.aj   |  16 -
 .../labsynch/labseer/domain/Container.java    | 198 +++-
 .../labseer/domain/ContainerKind.java         | 202 +++-
 .../domain/ContainerKind_Roo_Configurable.aj  |  13 -
 .../domain/ContainerKind_Roo_Finder.aj        |  50 -
 .../domain/ContainerKind_Roo_JavaBean.aj      |  35 -
 .../ContainerKind_Roo_Jpa_ActiveRecord.aj     |  76 --
 .../domain/ContainerKind_Roo_Jpa_Entity.aj    |  45 -
 .../labseer/domain/ContainerKind_Roo_Json.aj  |  45 -
 .../domain/ContainerKind_Roo_ToString.aj      |  16 -
 .../labseer/domain/ContainerLabel.java        | 196 +++-
 .../domain/ContainerLabel_Roo_Configurable.aj |  13 -
 .../domain/ContainerLabel_Roo_Finder.aj       | 134 ---
 .../domain/ContainerLabel_Roo_JavaBean.aj     |  19 -
 .../ContainerLabel_Roo_Jpa_ActiveRecord.aj    |  61 --
 .../domain/ContainerLabel_Roo_Jpa_Entity.aj   |  17 -
 .../domain/ContainerLabel_Roo_ToString.aj     |  16 -
 .../labseer/domain/ContainerState.java        | 179 +++-
 .../domain/ContainerState_Roo_Configurable.aj |  13 -
 .../domain/ContainerState_Roo_Finder.aj       | 112 --
 .../domain/ContainerState_Roo_JavaBean.aj     |  29 -
 .../ContainerState_Roo_Jpa_ActiveRecord.aj    |  61 --
 .../domain/ContainerState_Roo_Jpa_Entity.aj   |  17 -
 .../domain/ContainerState_Roo_ToString.aj     |  16 -
 .../labseer/domain/ContainerType.java         | 206 +++-
 .../domain/ContainerType_Roo_Configurable.aj  |  13 -
 .../domain/ContainerType_Roo_Finder.aj        |  43 -
 .../domain/ContainerType_Roo_JavaBean.aj      |  18 -
 .../ContainerType_Roo_Jpa_ActiveRecord.aj     | 101 --
 .../domain/ContainerType_Roo_Jpa_Entity.aj    |  45 -
 .../labseer/domain/ContainerType_Roo_Json.aj  |  45 -
 .../domain/ContainerType_Roo_ToString.aj      |  16 -
 .../labseer/domain/ContainerValue.java        | 103 +-
 .../domain/ContainerValue_Roo_Configurable.aj |  13 -
 .../domain/ContainerValue_Roo_Finder.aj       |  72 --
 .../domain/ContainerValue_Roo_JavaBean.aj     |  19 -
 .../ContainerValue_Roo_Jpa_ActiveRecord.aj    |  35 -
 .../domain/ContainerValue_Roo_Jpa_Entity.aj   |  13 -
 .../domain/ContainerValue_Roo_ToString.aj     |  16 -
 .../domain/Container_Roo_Configurable.aj      |  13 -
 .../labseer/domain/Container_Roo_Finder.aj    | 111 --
 .../labseer/domain/Container_Roo_JavaBean.aj  |  79 --
 .../domain/Container_Roo_Jpa_ActiveRecord.aj  |  35 -
 .../domain/Container_Roo_Jpa_Entity.aj        |  13 -
 .../labseer/domain/Container_Roo_ToString.aj  |  16 -
 .../com/labsynch/labseer/domain/CorpName.java | 189 +++-
 .../domain/CorpName_Roo_Configurable.aj       |  13 -
 .../labseer/domain/CorpName_Roo_JavaBean.aj   |  34 -
 .../domain/CorpName_Roo_Jpa_ActiveRecord.aj   | 101 --
 .../labseer/domain/CorpName_Roo_Jpa_Entity.aj |  43 -
 .../labseer/domain/CorpName_Roo_Json.aj       |  45 -
 .../labseer/domain/CorpName_Roo_ToString.aj   |  16 -
 .../com/labsynch/labseer/domain/CronJob.java  | 271 ++++-
 .../domain/CronJob_Roo_Configurable.aj        |  13 -
 .../labseer/domain/CronJob_Roo_Finder.aj      |  43 -
 .../labseer/domain/CronJob_Roo_JavaBean.aj    | 115 ---
 .../domain/CronJob_Roo_Jpa_ActiveRecord.aj    | 101 --
 .../labseer/domain/CronJob_Roo_Jpa_Entity.aj  |  13 -
 .../labseer/domain/CronJob_Roo_Json.aj        |  45 -
 .../labseer/domain/CronJob_Roo_ToString.aj    |  16 -
 .../labsynch/labseer/domain/DDictKind.java    | 160 ++-
 .../domain/DDictKind_Roo_Configurable.aj      |  13 -
 .../labseer/domain/DDictKind_Roo_Finder.aj    |  49 -
 .../labseer/domain/DDictKind_Roo_JavaBean.aj  |  66 --
 .../domain/DDictKind_Roo_Jpa_ActiveRecord.aj  |  35 -
 .../labseer/domain/DDictKind_Roo_Json.aj      |  45 -
 .../labseer/domain/DDictKind_Roo_ToString.aj  |  16 -
 .../labsynch/labseer/domain/DDictType.java    | 238 ++++-
 .../domain/DDictType_Roo_Configurable.aj      |  13 -
 .../labseer/domain/DDictType_Roo_Finder.aj    |  43 -
 .../labseer/domain/DDictType_Roo_JavaBean.aj  |  50 -
 .../domain/DDictType_Roo_Jpa_ActiveRecord.aj  | 101 --
 .../domain/DDictType_Roo_Jpa_Entity.aj        |  45 -
 .../labseer/domain/DDictType_Roo_Json.aj      |  45 -
 .../labseer/domain/DDictType_Roo_ToString.aj  |  16 -
 .../labsynch/labseer/domain/DDictValue.java   | 350 ++++++-
 .../domain/DDictValue_Roo_Configurable.aj     |  13 -
 .../labseer/domain/DDictValue_Roo_Finder.aj   | 257 -----
 .../labseer/domain/DDictValue_Roo_JavaBean.aj |  82 --
 .../domain/DDictValue_Roo_Jpa_ActiveRecord.aj |  35 -
 .../labseer/domain/DDictValue_Roo_ToString.aj |  16 -
 .../labseer/domain/DryRunCompound.java        | 268 +++++
 .../domain/DryRunCompound_Roo_Configurable.aj |  13 -
 .../domain/DryRunCompound_Roo_Finder.aj       |  71 --
 .../domain/DryRunCompound_Roo_JavaBean.aj     |  58 --
 .../DryRunCompound_Roo_Jpa_ActiveRecord.aj    | 101 --
 .../domain/DryRunCompound_Roo_Jpa_Entity.aj   |  43 -
 .../labseer/domain/DryRunCompound_Roo_Json.aj |  45 -
 .../domain/DryRunCompound_Roo_ToString.aj     |  16 -
 .../labsynch/labseer/domain/Experiment.java   | 475 ++++++++-
 .../labseer/domain/ExperimentKind.java        | 130 ++-
 .../domain/ExperimentKind_Roo_Configurable.aj |  13 -
 .../domain/ExperimentKind_Roo_Finder.aj       |  50 -
 .../domain/ExperimentKind_Roo_JavaBean.aj     |  35 -
 .../ExperimentKind_Roo_Jpa_ActiveRecord.aj    |  35 -
 .../domain/ExperimentKind_Roo_Jpa_Entity.aj   |  13 -
 .../labseer/domain/ExperimentKind_Roo_Json.aj |  45 -
 .../domain/ExperimentKind_Roo_ToString.aj     |  16 -
 .../labseer/domain/ExperimentLabel.java       | 291 +++++-
 .../ExperimentLabel_Roo_Configurable.aj       |  13 -
 .../domain/ExperimentLabel_Roo_Finder.aj      | 231 -----
 .../domain/ExperimentLabel_Roo_JavaBean.aj    |  19 -
 .../ExperimentLabel_Roo_Jpa_ActiveRecord.aj   |  61 --
 .../domain/ExperimentLabel_Roo_Jpa_Entity.aj  |  17 -
 .../domain/ExperimentLabel_Roo_ToString.aj    |  16 -
 .../labseer/domain/ExperimentState.java       | 100 ++
 .../ExperimentState_Roo_Configurable.aj       |  13 -
 .../domain/ExperimentState_Roo_Finder.aj      |  44 -
 .../domain/ExperimentState_Roo_JavaBean.aj    |  29 -
 .../ExperimentState_Roo_Jpa_ActiveRecord.aj   |  61 --
 .../domain/ExperimentState_Roo_Jpa_Entity.aj  |  13 -
 .../labseer/domain/ExperimentType.java        | 206 +++-
 .../domain/ExperimentType_Roo_Configurable.aj |  13 -
 .../domain/ExperimentType_Roo_Finder.aj       |  43 -
 .../domain/ExperimentType_Roo_JavaBean.aj     |  18 -
 .../ExperimentType_Roo_Jpa_ActiveRecord.aj    | 101 --
 .../domain/ExperimentType_Roo_Jpa_Entity.aj   |  45 -
 .../labseer/domain/ExperimentType_Roo_Json.aj |  45 -
 .../domain/ExperimentType_Roo_ToString.aj     |  16 -
 .../labseer/domain/ExperimentValue.java       | 264 ++++-
 .../ExperimentValue_Roo_Configurable.aj       |  13 -
 .../domain/ExperimentValue_Roo_Finder.aj      | 212 ----
 .../domain/ExperimentValue_Roo_JavaBean.aj    |  19 -
 .../ExperimentValue_Roo_Jpa_ActiveRecord.aj   |  35 -
 .../domain/ExperimentValue_Roo_Jpa_Entity.aj  |  13 -
 .../domain/ExperimentValue_Roo_Json.aj        |  32 -
 .../domain/ExperimentValue_Roo_ToString.aj    |  16 -
 .../domain/Experiment_Roo_Configurable.aj     |  13 -
 .../labseer/domain/Experiment_Roo_Finder.aj   | 389 -------
 .../labseer/domain/Experiment_Roo_JavaBean.aj |  81 --
 .../domain/Experiment_Roo_Jpa_ActiveRecord.aj |  35 -
 .../domain/Experiment_Roo_Jpa_Entity.aj       |  13 -
 .../labseer/domain/Experiment_Roo_ToString.aj |  16 -
 .../com/labsynch/labseer/domain/FileList.java | 219 +++-
 .../domain/FileList_Roo_Configurable.aj       |  13 -
 .../labseer/domain/FileList_Roo_Finder.aj     |  59 --
 .../labseer/domain/FileList_Roo_JavaBean.aj   |  18 -
 .../domain/FileList_Roo_Jpa_ActiveRecord.aj   | 101 --
 .../labseer/domain/FileList_Roo_Jpa_Entity.aj |  43 -
 .../labseer/domain/FileList_Roo_Json.aj       |  45 -
 .../labseer/domain/FileList_Roo_ToString.aj   |  16 -
 .../labsynch/labseer/domain/FileThing.java    | 155 ++-
 .../domain/FileThing_Roo_Configurable.aj      |  13 -
 .../labseer/domain/FileThing_Roo_JavaBean.aj  |  66 --
 .../domain/FileThing_Roo_Jpa_ActiveRecord.aj  |  61 --
 .../domain/FileThing_Roo_Jpa_Entity.aj        |  17 -
 .../labseer/domain/FileThing_Roo_Json.aj      |  45 -
 .../labseer/domain/FileThing_Roo_ToString.aj  |  16 -
 .../com/labsynch/labseer/domain/FileType.java | 213 +++-
 .../domain/FileType_Roo_Configurable.aj       |  13 -
 .../labseer/domain/FileType_Roo_Finder.aj     |  43 -
 .../labseer/domain/FileType_Roo_JavaBean.aj   |  26 -
 .../domain/FileType_Roo_Jpa_ActiveRecord.aj   | 101 --
 .../labseer/domain/FileType_Roo_Jpa_Entity.aj |  43 -
 .../labseer/domain/FileType_Roo_Json.aj       |  45 -
 .../labseer/domain/FileType_Roo_ToString.aj   |  16 -
 .../labseer/domain/InteractionKind.java       | 161 ++-
 .../InteractionKind_Roo_Configurable.aj       |  13 -
 .../domain/InteractionKind_Roo_Finder.aj      |  81 --
 .../domain/InteractionKind_Roo_JavaBean.aj    |  35 -
 .../InteractionKind_Roo_Jpa_ActiveRecord.aj   |  35 -
 .../domain/InteractionKind_Roo_Jpa_Entity.aj  |  13 -
 .../domain/InteractionKind_Roo_Json.aj        |  45 -
 .../domain/InteractionKind_Roo_ToString.aj    |  16 -
 .../labseer/domain/InteractionType.java       | 248 +++++
 .../InteractionType_Roo_Configurable.aj       |  13 -
 .../domain/InteractionType_Roo_Finder.aj      |  80 --
 .../domain/InteractionType_Roo_JavaBean.aj    |  26 -
 .../InteractionType_Roo_Jpa_ActiveRecord.aj   | 101 --
 .../domain/InteractionType_Roo_Jpa_Entity.aj  |  45 -
 .../domain/InteractionType_Roo_Json.aj        |  45 -
 .../domain/InteractionType_Roo_ToString.aj    |  16 -
 .../com/labsynch/labseer/domain/IsoSalt.java  | 248 ++++-
 .../domain/IsoSalt_Roo_Configurable.aj        |  13 -
 .../labseer/domain/IsoSalt_Roo_Finder.aj      |  81 --
 .../labseer/domain/IsoSalt_Roo_JavaBean.aj    |  61 --
 .../domain/IsoSalt_Roo_Jpa_ActiveRecord.aj    | 101 --
 .../labseer/domain/IsoSalt_Roo_Jpa_Entity.aj  |  43 -
 .../labseer/domain/IsoSalt_Roo_ToString.aj    |  16 -
 .../com/labsynch/labseer/domain/Isotope.java  | 269 ++++-
 .../domain/Isotope_Roo_Configurable.aj        |  13 -
 .../labseer/domain/Isotope_Roo_Finder.aj      |  85 --
 .../labseer/domain/Isotope_Roo_JavaBean.aj    |  42 -
 .../domain/Isotope_Roo_Jpa_ActiveRecord.aj    | 101 --
 .../labseer/domain/Isotope_Roo_Jpa_Entity.aj  |  43 -
 .../labseer/domain/Isotope_Roo_Json.aj        |  45 -
 .../labseer/domain/Isotope_Roo_ToString.aj    |  16 -
 .../labseer/domain/ItxContainerContainer.java | 195 +++-
 .../domain/ItxContainerContainerState.java    |  80 +-
 ...ontainerContainerState_Roo_Configurable.aj |  13 -
 ...ItxContainerContainerState_Roo_JavaBean.aj |  29 -
 ...inerContainerState_Roo_Jpa_ActiveRecord.aj |  61 --
 ...xContainerContainerState_Roo_Jpa_Entity.aj |  17 -
 ...ItxContainerContainerState_Roo_ToString.aj |  16 -
 .../domain/ItxContainerContainerValue.java    |  69 +-
 ...ontainerContainerValue_Roo_Configurable.aj |  13 -
 ...ItxContainerContainerValue_Roo_JavaBean.aj |  19 -
 ...inerContainerValue_Roo_Jpa_ActiveRecord.aj |  61 --
 ...xContainerContainerValue_Roo_Jpa_Entity.aj |  13 -
 ...ItxContainerContainerValue_Roo_ToString.aj |  16 -
 .../ItxContainerContainer_Roo_Configurable.aj |  13 -
 .../ItxContainerContainer_Roo_Finder.aj       | 118 ---
 .../ItxContainerContainer_Roo_JavaBean.aj     |  37 -
 ...ContainerContainer_Roo_Jpa_ActiveRecord.aj |  61 --
 .../ItxContainerContainer_Roo_Jpa_Entity.aj   |  17 -
 .../ItxContainerContainer_Roo_ToString.aj     |  16 -
 .../domain/ItxExperimentExperiment.java       | 185 +++-
 .../domain/ItxExperimentExperimentState.java  |  85 +-
 ...erimentExperimentState_Roo_Configurable.aj |  13 -
 ...xExperimentExperimentState_Roo_JavaBean.aj |  29 -
 ...entExperimentState_Roo_Jpa_ActiveRecord.aj |  61 --
 ...xperimentExperimentState_Roo_Jpa_Entity.aj |  17 -
 .../ItxExperimentExperimentState_Roo_Json.aj  |  16 -
 ...xExperimentExperimentState_Roo_ToString.aj |  16 -
 .../domain/ItxExperimentExperimentValue.java  |  69 +-
 ...erimentExperimentValue_Roo_Configurable.aj |  13 -
 ...xExperimentExperimentValue_Roo_JavaBean.aj |  19 -
 ...entExperimentValue_Roo_Jpa_ActiveRecord.aj |  61 --
 ...xperimentExperimentValue_Roo_Jpa_Entity.aj |  13 -
 ...xExperimentExperimentValue_Roo_ToString.aj |  16 -
 ...txExperimentExperiment_Roo_Configurable.aj |  13 -
 .../ItxExperimentExperiment_Roo_Finder.aj     | 106 --
 .../ItxExperimentExperiment_Roo_JavaBean.aj   |  37 -
 ...perimentExperiment_Roo_Jpa_ActiveRecord.aj |  61 --
 .../ItxExperimentExperiment_Roo_Jpa_Entity.aj |  17 -
 .../ItxExperimentExperiment_Roo_ToString.aj   |  16 -
 .../labseer/domain/ItxLsThingLsThing.java     | 159 ++-
 .../domain/ItxLsThingLsThingState.java        |  80 +-
 ...ItxLsThingLsThingState_Roo_Configurable.aj |  13 -
 .../ItxLsThingLsThingState_Roo_JavaBean.aj    |  29 -
 ...sThingLsThingState_Roo_Jpa_ActiveRecord.aj |  61 --
 .../ItxLsThingLsThingState_Roo_Jpa_Entity.aj  |  17 -
 .../ItxLsThingLsThingState_Roo_ToString.aj    |  16 -
 .../domain/ItxLsThingLsThingValue.java        | 114 ++-
 ...ItxLsThingLsThingValue_Roo_Configurable.aj |  13 -
 .../ItxLsThingLsThingValue_Roo_Finder.aj      |  58 --
 .../ItxLsThingLsThingValue_Roo_JavaBean.aj    |  19 -
 ...sThingLsThingValue_Roo_Jpa_ActiveRecord.aj |  61 --
 .../ItxLsThingLsThingValue_Roo_Jpa_Entity.aj  |  13 -
 .../ItxLsThingLsThingValue_Roo_ToString.aj    |  16 -
 .../ItxLsThingLsThing_Roo_Configurable.aj     |  13 -
 .../domain/ItxLsThingLsThing_Roo_Finder.aj    |  82 --
 .../domain/ItxLsThingLsThing_Roo_JavaBean.aj  |  37 -
 .../ItxLsThingLsThing_Roo_Jpa_ActiveRecord.aj |  61 --
 .../ItxLsThingLsThing_Roo_Jpa_Entity.aj       |  17 -
 .../domain/ItxLsThingLsThing_Roo_ToString.aj  |  16 -
 .../labseer/domain/ItxProtocolProtocol.java   | 157 ++-
 .../domain/ItxProtocolProtocolState.java      |  85 +-
 ...xProtocolProtocolState_Roo_Configurable.aj |  13 -
 .../ItxProtocolProtocolState_Roo_JavaBean.aj  |  29 -
 ...tocolProtocolState_Roo_Jpa_ActiveRecord.aj |  61 --
 ...ItxProtocolProtocolState_Roo_Jpa_Entity.aj |  17 -
 .../ItxProtocolProtocolState_Roo_Json.aj      |  16 -
 .../ItxProtocolProtocolState_Roo_ToString.aj  |  16 -
 .../domain/ItxProtocolProtocolValue.java      |  69 +-
 ...xProtocolProtocolValue_Roo_Configurable.aj |  13 -
 .../ItxProtocolProtocolValue_Roo_JavaBean.aj  |  19 -
 ...tocolProtocolValue_Roo_Jpa_ActiveRecord.aj |  61 --
 ...ItxProtocolProtocolValue_Roo_Jpa_Entity.aj |  13 -
 .../ItxProtocolProtocolValue_Roo_ToString.aj  |  16 -
 .../ItxProtocolProtocol_Roo_Configurable.aj   |  13 -
 .../domain/ItxProtocolProtocol_Roo_Finder.aj  |  82 --
 .../ItxProtocolProtocol_Roo_JavaBean.aj       |  37 -
 ...txProtocolProtocol_Roo_Jpa_ActiveRecord.aj |  61 --
 .../ItxProtocolProtocol_Roo_Jpa_Entity.aj     |  17 -
 .../ItxProtocolProtocol_Roo_ToString.aj       |  16 -
 .../labseer/domain/ItxSubjectContainer.java   | 183 +++-
 .../domain/ItxSubjectContainerState.java      |  76 +-
 ...xSubjectContainerState_Roo_Configurable.aj |  13 -
 .../ItxSubjectContainerState_Roo_JavaBean.aj  |  29 -
 ...jectContainerState_Roo_Jpa_ActiveRecord.aj |  61 --
 ...ItxSubjectContainerState_Roo_Jpa_Entity.aj |  13 -
 .../ItxSubjectContainerState_Roo_ToString.aj  |  16 -
 .../domain/ItxSubjectContainerValue.java      |  69 +-
 ...xSubjectContainerValue_Roo_Configurable.aj |  13 -
 .../ItxSubjectContainerValue_Roo_JavaBean.aj  |  19 -
 ...jectContainerValue_Roo_Jpa_ActiveRecord.aj |  61 --
 ...ItxSubjectContainerValue_Roo_Jpa_Entity.aj |  13 -
 .../ItxSubjectContainerValue_Roo_ToString.aj  |  16 -
 .../ItxSubjectContainer_Roo_Configurable.aj   |  13 -
 .../domain/ItxSubjectContainer_Roo_Finder.aj  | 138 ---
 .../ItxSubjectContainer_Roo_JavaBean.aj       |  38 -
 ...txSubjectContainer_Roo_Jpa_ActiveRecord.aj |  35 -
 .../ItxSubjectContainer_Roo_Jpa_Entity.aj     |  13 -
 .../ItxSubjectContainer_Roo_ToString.aj       |  16 -
 .../labsynch/labseer/domain/LabelKind.java    | 190 +++-
 .../domain/LabelKind_Roo_Configurable.aj      |  13 -
 .../labseer/domain/LabelKind_Roo_Finder.aj    | 112 --
 .../labseer/domain/LabelKind_Roo_JavaBean.aj  |  35 -
 .../domain/LabelKind_Roo_Jpa_ActiveRecord.aj  |  35 -
 .../labseer/domain/LabelKind_Roo_Json.aj      |  45 -
 .../labseer/domain/LabelKind_Roo_ToString.aj  |  16 -
 .../labseer/domain/LabelSequence.java         | 374 ++++++-
 .../labseer/domain/LabelSequenceRole.java     | 182 +++-
 .../LabelSequenceRole_Roo_Configurable.aj     |  13 -
 .../domain/LabelSequenceRole_Roo_Finder.aj    |  51 -
 .../domain/LabelSequenceRole_Roo_JavaBean.aj  |  28 -
 .../LabelSequenceRole_Roo_Jpa_ActiveRecord.aj | 101 --
 .../LabelSequenceRole_Roo_Jpa_Entity.aj       |  13 -
 .../domain/LabelSequenceRole_Roo_Json.aj      |  45 -
 .../domain/LabelSequence_Roo_Configurable.aj  |  13 -
 .../domain/LabelSequence_Roo_Finder.aj        | 154 ---
 .../domain/LabelSequence_Roo_JavaBean.aj      | 101 --
 .../LabelSequence_Roo_Jpa_ActiveRecord.aj     | 101 --
 .../domain/LabelSequence_Roo_Jpa_Entity.aj    |  45 -
 .../labseer/domain/LabelSequence_Roo_Json.aj  |  24 -
 .../domain/LabelSequence_Roo_ToString.aj      |  16 -
 .../labsynch/labseer/domain/LabelType.java    | 172 +++-
 .../domain/LabelType_Roo_Configurable.aj      |  13 -
 .../labseer/domain/LabelType_Roo_Finder.aj    |  43 -
 .../labseer/domain/LabelType_Roo_JavaBean.aj  |  18 -
 .../domain/LabelType_Roo_Jpa_ActiveRecord.aj  | 101 --
 .../labseer/domain/LabelType_Roo_Json.aj      |  45 -
 .../labseer/domain/LabelType_Roo_ToString.aj  |  16 -
 .../java/com/labsynch/labseer/domain/Lot.java | 953 +++++++++++++++++-
 .../com/labsynch/labseer/domain/LotAlias.java | 340 ++++++-
 .../labsynch/labseer/domain/LotAliasKind.java | 181 +++-
 .../domain/LotAliasKind_Roo_Configurable.aj   |  13 -
 .../domain/LotAliasKind_Roo_JavaBean.aj       |  27 -
 .../LotAliasKind_Roo_Jpa_ActiveRecord.aj      | 101 --
 .../domain/LotAliasKind_Roo_Jpa_Entity.aj     |  43 -
 .../labseer/domain/LotAliasKind_Roo_Json.aj   |  45 -
 .../domain/LotAliasKind_Roo_ToString.aj       |  16 -
 .../labsynch/labseer/domain/LotAliasType.java | 173 +++-
 .../domain/LotAliasType_Roo_Configurable.aj   |  13 -
 .../domain/LotAliasType_Roo_JavaBean.aj       |  18 -
 .../LotAliasType_Roo_Jpa_ActiveRecord.aj      | 101 --
 .../domain/LotAliasType_Roo_Jpa_Entity.aj     |  43 -
 .../labseer/domain/LotAliasType_Roo_Json.aj   |  45 -
 .../domain/LotAliasType_Roo_ToString.aj       |  16 -
 .../domain/LotAlias_Roo_Configurable.aj       |  13 -
 .../labseer/domain/LotAlias_Roo_Finder.aj     | 130 ---
 .../labseer/domain/LotAlias_Roo_JavaBean.aj   |  67 --
 .../domain/LotAlias_Roo_Jpa_ActiveRecord.aj   | 101 --
 .../labseer/domain/LotAlias_Roo_Jpa_Entity.aj |  43 -
 .../labseer/domain/LotAlias_Roo_Json.aj       |  45 -
 .../labseer/domain/LotAlias_Roo_ToString.aj   |  16 -
 .../labseer/domain/Lot_Roo_Configurable.aj    |  13 -
 .../labsynch/labseer/domain/Lot_Roo_Finder.aj | 416 --------
 .../labseer/domain/Lot_Roo_JavaBean.aj        | 425 --------
 .../domain/Lot_Roo_Jpa_ActiveRecord.aj        |  88 --
 .../labseer/domain/Lot_Roo_Jpa_Entity.aj      |  43 -
 .../labsynch/labseer/domain/Lot_Roo_Json.aj   |  45 -
 .../labseer/domain/Lot_Roo_ToString.aj        |  16 -
 .../labseer/domain/LsInteraction.java         | 111 +-
 .../domain/LsInteraction_Roo_Configurable.aj  |  13 -
 .../domain/LsInteraction_Roo_JavaBean.aj      |  26 -
 .../LsInteraction_Roo_Jpa_ActiveRecord.aj     |  61 --
 .../domain/LsInteraction_Roo_Jpa_Entity.aj    |  13 -
 .../labseer/domain/LsInteraction_Roo_Json.aj  |  45 -
 .../domain/LsInteraction_Roo_ToString.aj      |  16 -
 .../com/labsynch/labseer/domain/LsRole.java   | 369 ++++++-
 .../labseer/domain/LsRole_Roo_Configurable.aj |  13 -
 .../labseer/domain/LsRole_Roo_Finder.aj       | 214 ----
 .../labseer/domain/LsRole_Roo_JavaBean.aj     |  60 --
 .../domain/LsRole_Roo_Jpa_ActiveRecord.aj     |  95 --
 .../labseer/domain/LsRole_Roo_Jpa_Entity.aj   |  13 -
 .../labseer/domain/LsRole_Roo_Json.aj         |  45 -
 .../labsynch/labseer/domain/LsSeqAnlGrp.java  | 127 +++
 .../domain/LsSeqAnlGrp_Roo_Configurable.aj    |  13 -
 .../LsSeqAnlGrp_Roo_Jpa_ActiveRecord.aj       | 101 --
 .../domain/LsSeqAnlGrp_Roo_Jpa_Entity.aj      |  45 -
 .../labseer/domain/LsSeqContainer.java        | 127 +++
 .../domain/LsSeqContainer_Roo_Configurable.aj |  13 -
 .../LsSeqContainer_Roo_Jpa_ActiveRecord.aj    | 101 --
 .../domain/LsSeqContainer_Roo_Jpa_Entity.aj   |  45 -
 .../labsynch/labseer/domain/LsSeqExpt.java    | 127 +++
 .../domain/LsSeqExpt_Roo_Configurable.aj      |  13 -
 .../domain/LsSeqExpt_Roo_Jpa_ActiveRecord.aj  | 101 --
 .../domain/LsSeqExpt_Roo_Jpa_Entity.aj        |  45 -
 .../labseer/domain/LsSeqItxCntrCntr.java      | 127 +++
 .../LsSeqItxCntrCntr_Roo_Configurable.aj      |  13 -
 .../LsSeqItxCntrCntr_Roo_Jpa_ActiveRecord.aj  | 101 --
 .../domain/LsSeqItxCntrCntr_Roo_Jpa_Entity.aj |  45 -
 .../domain/LsSeqItxExperimentExperiment.java  | 128 ++-
 ...txExperimentExperiment_Roo_Configurable.aj |  13 -
 ...perimentExperiment_Roo_Jpa_ActiveRecord.aj | 101 --
 ...qItxExperimentExperiment_Roo_Jpa_Entity.aj |  45 -
 .../domain/LsSeqItxLsThingLsThing.java        | 127 +++
 ...LsSeqItxLsThingLsThing_Roo_Configurable.aj |  13 -
 ...qItxLsThingLsThing_Roo_Jpa_ActiveRecord.aj | 101 --
 .../LsSeqItxLsThingLsThing_Roo_Jpa_Entity.aj  |  45 -
 .../domain/LsSeqItxProtocolProtocol.java      | 127 +++
 ...SeqItxProtocolProtocol_Roo_Configurable.aj |  13 -
 ...txProtocolProtocol_Roo_Jpa_ActiveRecord.aj | 101 --
 ...LsSeqItxProtocolProtocol_Roo_Jpa_Entity.aj |  45 -
 .../labseer/domain/LsSeqItxSubjCntr.java      | 127 +++
 .../LsSeqItxSubjCntr_Roo_Configurable.aj      |  13 -
 .../LsSeqItxSubjCntr_Roo_Jpa_ActiveRecord.aj  | 101 --
 .../domain/LsSeqItxSubjCntr_Roo_Jpa_Entity.aj |  45 -
 .../labseer/domain/LsSeqProtocol.java         | 127 +++
 .../domain/LsSeqProtocol_Roo_Configurable.aj  |  13 -
 .../LsSeqProtocol_Roo_Jpa_ActiveRecord.aj     | 101 --
 .../domain/LsSeqProtocol_Roo_Jpa_Entity.aj    |  45 -
 .../labsynch/labseer/domain/LsSeqSubject.java | 127 +++
 .../domain/LsSeqSubject_Roo_Configurable.aj   |  13 -
 .../LsSeqSubject_Roo_Jpa_ActiveRecord.aj      | 101 --
 .../domain/LsSeqSubject_Roo_Jpa_Entity.aj     |  45 -
 .../labsynch/labseer/domain/LsSeqTrtGrp.java  | 127 +++
 .../domain/LsSeqTrtGrp_Roo_Configurable.aj    |  13 -
 .../LsSeqTrtGrp_Roo_Jpa_ActiveRecord.aj       | 101 --
 .../domain/LsSeqTrtGrp_Roo_Jpa_Entity.aj      |  45 -
 .../com/labsynch/labseer/domain/LsTag.java    | 258 ++++-
 .../labseer/domain/LsTag_Roo_Configurable.aj  |  13 -
 .../labseer/domain/LsTag_Roo_Finder.aj        |  95 --
 .../labseer/domain/LsTag_Roo_JavaBean.aj      |  55 -
 .../domain/LsTag_Roo_Jpa_ActiveRecord.aj      | 101 --
 .../labseer/domain/LsTag_Roo_Jpa_Entity.aj    |  45 -
 .../labseer/domain/LsTag_Roo_ToString.aj      |  16 -
 .../com/labsynch/labseer/domain/LsThing.java  | 520 +++++++++-
 .../labsynch/labseer/domain/LsThingLabel.java | 256 ++++-
 .../domain/LsThingLabel_Roo_Configurable.aj   |  13 -
 .../labseer/domain/LsThingLabel_Roo_Finder.aj | 192 ----
 .../domain/LsThingLabel_Roo_JavaBean.aj       |  27 -
 .../LsThingLabel_Roo_Jpa_ActiveRecord.aj      |  61 --
 .../domain/LsThingLabel_Roo_Jpa_Entity.aj     |  13 -
 .../domain/LsThingLabel_Roo_ToString.aj       |  16 -
 .../labsynch/labseer/domain/LsThingState.java | 138 ++-
 .../domain/LsThingState_Roo_Configurable.aj   |  13 -
 .../labseer/domain/LsThingState_Roo_Finder.aj |  75 --
 .../domain/LsThingState_Roo_JavaBean.aj       |  29 -
 .../LsThingState_Roo_Jpa_ActiveRecord.aj      |  61 --
 .../domain/LsThingState_Roo_Jpa_Entity.aj     |  13 -
 .../domain/LsThingState_Roo_ToString.aj       |  16 -
 .../labsynch/labseer/domain/LsThingValue.java | 487 ++++++++-
 .../domain/LsThingValue_Roo_Configurable.aj   |  13 -
 .../labseer/domain/LsThingValue_Roo_Finder.aj | 413 --------
 .../domain/LsThingValue_Roo_JavaBean.aj       |  19 -
 .../LsThingValue_Roo_Jpa_ActiveRecord.aj      |  61 --
 .../domain/LsThingValue_Roo_Jpa_Entity.aj     |  13 -
 .../labseer/domain/LsThingValue_Roo_Json.aj   |  32 -
 .../domain/LsThingValue_Roo_ToString.aj       |  16 -
 .../domain/LsThing_Roo_Configurable.aj        |  13 -
 .../labseer/domain/LsThing_Roo_Finder.aj      | 423 --------
 .../labseer/domain/LsThing_Roo_JavaBean.aj    |  55 -
 .../domain/LsThing_Roo_Jpa_ActiveRecord.aj    |  61 --
 .../labseer/domain/LsThing_Roo_Jpa_Entity.aj  |  13 -
 .../labseer/domain/LsThing_Roo_Json.aj        |  24 -
 .../labseer/domain/LsThing_Roo_ToString.aj    |  16 -
 .../labseer/domain/LsTransaction.java         | 208 +++-
 .../domain/LsTransaction_Roo_Configurable.aj  |  13 -
 .../domain/LsTransaction_Roo_JavaBean.aj      |  53 -
 .../LsTransaction_Roo_Jpa_ActiveRecord.aj     | 101 --
 .../domain/LsTransaction_Roo_Jpa_Entity.aj    |  45 -
 .../labseer/domain/LsTransaction_Roo_Json.aj  |  45 -
 .../domain/LsTransaction_Roo_ToString.aj      |  16 -
 .../com/labsynch/labseer/domain/Operator.java | 244 ++++-
 .../labsynch/labseer/domain/OperatorKind.java | 128 ++-
 .../domain/OperatorKind_Roo_Configurable.aj   |  13 -
 .../labseer/domain/OperatorKind_Roo_Finder.aj |  50 -
 .../domain/OperatorKind_Roo_JavaBean.aj       |  35 -
 .../OperatorKind_Roo_Jpa_ActiveRecord.aj      |  35 -
 .../labseer/domain/OperatorKind_Roo_Json.aj   |  45 -
 .../domain/OperatorKind_Roo_ToString.aj       |  16 -
 .../labsynch/labseer/domain/OperatorType.java | 173 +++-
 .../domain/OperatorType_Roo_Configurable.aj   |  13 -
 .../labseer/domain/OperatorType_Roo_Finder.aj |  43 -
 .../domain/OperatorType_Roo_JavaBean.aj       |  18 -
 .../OperatorType_Roo_Jpa_ActiveRecord.aj      | 101 --
 .../labseer/domain/OperatorType_Roo_Json.aj   |  45 -
 .../domain/OperatorType_Roo_ToString.aj       |  16 -
 .../domain/Operator_Roo_Configurable.aj       |  13 -
 .../labseer/domain/Operator_Roo_Finder.aj     |  74 --
 .../labseer/domain/Operator_Roo_JavaBean.aj   |  26 -
 .../domain/Operator_Roo_Jpa_ActiveRecord.aj   | 101 --
 .../labseer/domain/Operator_Roo_Jpa_Entity.aj |  43 -
 .../labseer/domain/Operator_Roo_Json.aj       |  45 -
 .../labseer/domain/Operator_Roo_ToString.aj   |  16 -
 .../com/labsynch/labseer/domain/Parent.java   | 573 ++++++++++-
 .../labsynch/labseer/domain/ParentAlias.java  | 428 +++++++-
 .../labseer/domain/ParentAliasKind.java       | 181 +++-
 .../ParentAliasKind_Roo_Configurable.aj       |  13 -
 .../domain/ParentAliasKind_Roo_JavaBean.aj    |  27 -
 .../ParentAliasKind_Roo_Jpa_ActiveRecord.aj   | 101 --
 .../domain/ParentAliasKind_Roo_Jpa_Entity.aj  |  43 -
 .../domain/ParentAliasKind_Roo_Json.aj        |  45 -
 .../domain/ParentAliasKind_Roo_ToString.aj    |  16 -
 .../labseer/domain/ParentAliasType.java       | 173 +++-
 .../ParentAliasType_Roo_Configurable.aj       |  13 -
 .../domain/ParentAliasType_Roo_JavaBean.aj    |  18 -
 .../ParentAliasType_Roo_Jpa_ActiveRecord.aj   | 101 --
 .../domain/ParentAliasType_Roo_Jpa_Entity.aj  |  43 -
 .../domain/ParentAliasType_Roo_Json.aj        |  45 -
 .../domain/ParentAliasType_Roo_ToString.aj    |  16 -
 .../domain/ParentAlias_Roo_Configurable.aj    |  13 -
 .../labseer/domain/ParentAlias_Roo_Finder.aj  | 210 ----
 .../domain/ParentAlias_Roo_JavaBean.aj        |  75 --
 .../ParentAlias_Roo_Jpa_ActiveRecord.aj       | 101 --
 .../domain/ParentAlias_Roo_Jpa_Entity.aj      |  43 -
 .../labseer/domain/ParentAlias_Roo_Json.aj    |  45 -
 .../domain/ParentAlias_Roo_ToString.aj        |  16 -
 .../labseer/domain/ParentAnnotation.java      | 229 ++++-
 .../ParentAnnotation_Roo_Configurable.aj      |  13 -
 .../domain/ParentAnnotation_Roo_Finder.aj     |  43 -
 .../domain/ParentAnnotation_Roo_JavaBean.aj   |  42 -
 .../ParentAnnotation_Roo_Jpa_ActiveRecord.aj  | 101 --
 .../domain/ParentAnnotation_Roo_Jpa_Entity.aj |  43 -
 .../domain/ParentAnnotation_Roo_Json.aj       |  45 -
 .../domain/ParentAnnotation_Roo_ToString.aj   |  16 -
 .../labseer/domain/Parent_Roo_Configurable.aj |  13 -
 .../labseer/domain/Parent_Roo_Finder.aj       | 256 -----
 .../labseer/domain/Parent_Roo_JavaBean.aj     | 202 ----
 .../domain/Parent_Roo_Jpa_ActiveRecord.aj     |  88 --
 .../labseer/domain/Parent_Roo_Jpa_Entity.aj   |  43 -
 .../labseer/domain/Parent_Roo_Json.aj         |  45 -
 .../labseer/domain/Parent_Roo_ToString.aj     |  16 -
 .../labseer/domain/PhysicalState.java         | 296 +++++-
 .../domain/PhysicalState_Roo_Configurable.aj  |  13 -
 .../domain/PhysicalState_Roo_Finder.aj        | 126 ---
 .../domain/PhysicalState_Roo_JavaBean.aj      |  26 -
 .../PhysicalState_Roo_Jpa_ActiveRecord.aj     | 101 --
 .../domain/PhysicalState_Roo_Jpa_Entity.aj    |  43 -
 .../labseer/domain/PhysicalState_Roo_Json.aj  |  45 -
 .../domain/PhysicalState_Roo_ToString.aj      |  16 -
 .../labseer/domain/PreDef_CorpName.java       | 204 +++-
 .../PreDef_CorpName_Roo_Configurable.aj       |  13 -
 .../domain/PreDef_CorpName_Roo_JavaBean.aj    |  50 -
 .../PreDef_CorpName_Roo_Jpa_ActiveRecord.aj   | 101 --
 .../domain/PreDef_CorpName_Roo_Jpa_Entity.aj  |  43 -
 .../domain/PreDef_CorpName_Roo_Json.aj        |  45 -
 .../domain/PreDef_CorpName_Roo_ToString.aj    |  16 -
 .../com/labsynch/labseer/domain/Protocol.java | 575 ++++++++++-
 .../labsynch/labseer/domain/ProtocolKind.java | 144 ++-
 .../domain/ProtocolKind_Roo_Configurable.aj   |  13 -
 .../labseer/domain/ProtocolKind_Roo_Finder.aj |  50 -
 .../domain/ProtocolKind_Roo_JavaBean.aj       |  51 -
 .../ProtocolKind_Roo_Jpa_ActiveRecord.aj      |  35 -
 .../labseer/domain/ProtocolKind_Roo_Json.aj   |  45 -
 .../domain/ProtocolKind_Roo_ToString.aj       |  16 -
 .../labseer/domain/ProtocolLabel.java         | 218 +++-
 .../domain/ProtocolLabel_Roo_Configurable.aj  |  13 -
 .../domain/ProtocolLabel_Roo_Finder.aj        | 161 ---
 .../domain/ProtocolLabel_Roo_JavaBean.aj      |  19 -
 .../ProtocolLabel_Roo_Jpa_ActiveRecord.aj     |  56 -
 .../domain/ProtocolLabel_Roo_Jpa_Entity.aj    |  17 -
 .../domain/ProtocolLabel_Roo_ToString.aj      |  16 -
 .../labseer/domain/ProtocolState.java         | 135 +++
 .../domain/ProtocolState_Roo_Configurable.aj  |  13 -
 .../domain/ProtocolState_Roo_Finder.aj        |  75 --
 .../domain/ProtocolState_Roo_JavaBean.aj      |  29 -
 .../ProtocolState_Roo_Jpa_ActiveRecord.aj     |  61 --
 .../domain/ProtocolState_Roo_Jpa_Entity.aj    |  17 -
 .../labsynch/labseer/domain/ProtocolType.java | 173 +++-
 .../domain/ProtocolType_Roo_Configurable.aj   |  13 -
 .../labseer/domain/ProtocolType_Roo_Finder.aj |  43 -
 .../domain/ProtocolType_Roo_JavaBean.aj       |  18 -
 .../ProtocolType_Roo_Jpa_ActiveRecord.aj      | 101 --
 .../labseer/domain/ProtocolType_Roo_Json.aj   |  45 -
 .../domain/ProtocolType_Roo_ToString.aj       |  16 -
 .../labseer/domain/ProtocolValue.java         | 274 ++++-
 .../domain/ProtocolValue_Roo_Configurable.aj  |  13 -
 .../domain/ProtocolValue_Roo_Finder.aj        | 191 ----
 .../domain/ProtocolValue_Roo_JavaBean.aj      |  19 -
 .../ProtocolValue_Roo_Jpa_ActiveRecord.aj     |  61 --
 .../domain/ProtocolValue_Roo_Jpa_Entity.aj    |  17 -
 .../labseer/domain/ProtocolValue_Roo_Json.aj  |  32 -
 .../domain/ProtocolValue_Roo_ToString.aj      |  16 -
 .../domain/Protocol_Roo_Configurable.aj       |  13 -
 .../labseer/domain/Protocol_Roo_Finder.aj     | 474 ---------
 .../labseer/domain/Protocol_Roo_JavaBean.aj   |  72 --
 .../domain/Protocol_Roo_Jpa_ActiveRecord.aj   |  56 -
 .../labseer/domain/Protocol_Roo_Jpa_Entity.aj |  13 -
 .../labseer/domain/Protocol_Roo_ToString.aj   |  16 -
 .../labseer/domain/PurityMeasuredBy.java      | 296 +++++-
 .../PurityMeasuredBy_Roo_Configurable.aj      |  13 -
 .../domain/PurityMeasuredBy_Roo_Finder.aj     | 126 ---
 .../domain/PurityMeasuredBy_Roo_JavaBean.aj   |  26 -
 .../PurityMeasuredBy_Roo_Jpa_ActiveRecord.aj  | 101 --
 .../domain/PurityMeasuredBy_Roo_Jpa_Entity.aj |  43 -
 .../domain/PurityMeasuredBy_Roo_Json.aj       |  45 -
 .../domain/PurityMeasuredBy_Roo_ToString.aj   |  16 -
 .../labsynch/labseer/domain/RegSearch.java    |  57 +-
 .../labseer/domain/RegSearch_Roo_JavaBean.aj  |  26 -
 .../labseer/domain/RegSearch_Roo_Json.aj      |  45 -
 .../labseer/domain/RegSearch_Roo_ToString.aj  |  16 -
 .../com/labsynch/labseer/domain/RoleKind.java | 252 ++++-
 .../domain/RoleKind_Roo_Configurable.aj       |  13 -
 .../labseer/domain/RoleKind_Roo_Finder.aj     |  81 --
 .../labseer/domain/RoleKind_Roo_JavaBean.aj   |  35 -
 .../domain/RoleKind_Roo_Jpa_ActiveRecord.aj   |  95 --
 .../labseer/domain/RoleKind_Roo_Jpa_Entity.aj |  45 -
 .../labseer/domain/RoleKind_Roo_Json.aj       |  45 -
 .../labseer/domain/RoleKind_Roo_ToString.aj   |  16 -
 .../com/labsynch/labseer/domain/RoleType.java | 206 +++-
 .../domain/RoleType_Roo_Configurable.aj       |  13 -
 .../labseer/domain/RoleType_Roo_Finder.aj     |  43 -
 .../labseer/domain/RoleType_Roo_JavaBean.aj   |  18 -
 .../domain/RoleType_Roo_Jpa_ActiveRecord.aj   | 101 --
 .../labseer/domain/RoleType_Roo_Jpa_Entity.aj |  45 -
 .../labseer/domain/RoleType_Roo_Json.aj       |  45 -
 .../labseer/domain/RoleType_Roo_ToString.aj   |  16 -
 .../com/labsynch/labseer/domain/Salt.java     | 364 ++++++-
 .../com/labsynch/labseer/domain/SaltForm.java | 411 +++++++-
 .../labseer/domain/SaltFormAlias.java         | 297 +++++-
 .../labseer/domain/SaltFormAliasKind.java     | 181 +++-
 .../SaltFormAliasKind_Roo_Configurable.aj     |  13 -
 .../domain/SaltFormAliasKind_Roo_JavaBean.aj  |  27 -
 .../SaltFormAliasKind_Roo_Jpa_ActiveRecord.aj | 101 --
 .../SaltFormAliasKind_Roo_Jpa_Entity.aj       |  43 -
 .../domain/SaltFormAliasKind_Roo_Json.aj      |  45 -
 .../domain/SaltFormAliasKind_Roo_ToString.aj  |  16 -
 .../labseer/domain/SaltFormAliasType.java     | 173 +++-
 .../SaltFormAliasType_Roo_Configurable.aj     |  13 -
 .../domain/SaltFormAliasType_Roo_JavaBean.aj  |  18 -
 .../SaltFormAliasType_Roo_Jpa_ActiveRecord.aj | 101 --
 .../SaltFormAliasType_Roo_Jpa_Entity.aj       |  43 -
 .../domain/SaltFormAliasType_Roo_Json.aj      |  45 -
 .../domain/SaltFormAliasType_Roo_ToString.aj  |  16 -
 .../domain/SaltFormAlias_Roo_Configurable.aj  |  13 -
 .../domain/SaltFormAlias_Roo_Finder.aj        |  87 --
 .../domain/SaltFormAlias_Roo_JavaBean.aj      |  67 --
 .../SaltFormAlias_Roo_Jpa_ActiveRecord.aj     | 101 --
 .../domain/SaltFormAlias_Roo_Jpa_Entity.aj    |  43 -
 .../labseer/domain/SaltFormAlias_Roo_Json.aj  |  45 -
 .../domain/SaltFormAlias_Roo_ToString.aj      |  16 -
 .../domain/SaltForm_Roo_Configurable.aj       |  13 -
 .../labseer/domain/SaltForm_Roo_Finder.aj     | 187 ----
 .../labseer/domain/SaltForm_Roo_JavaBean.aj   | 112 --
 .../domain/SaltForm_Roo_Jpa_ActiveRecord.aj   |  82 --
 .../labseer/domain/SaltForm_Roo_Jpa_Entity.aj |  43 -
 .../labseer/domain/SaltForm_Roo_Json.aj       |  45 -
 .../labseer/domain/SaltForm_Roo_ToString.aj   |  16 -
 .../labseer/domain/Salt_Roo_Configurable.aj   |  13 -
 .../labseer/domain/Salt_Roo_Finder.aj         | 143 ---
 .../labseer/domain/Salt_Roo_JavaBean.aj       |  82 --
 .../domain/Salt_Roo_Jpa_ActiveRecord.aj       | 101 --
 .../labseer/domain/Salt_Roo_Jpa_Entity.aj     |  43 -
 .../labsynch/labseer/domain/Salt_Roo_Json.aj  |  45 -
 .../labseer/domain/Salt_Roo_ToString.aj       |  16 -
 .../labsynch/labseer/domain/SolutionUnit.java | 296 +++++-
 .../domain/SolutionUnit_Roo_Configurable.aj   |  13 -
 .../labseer/domain/SolutionUnit_Roo_Finder.aj | 126 ---
 .../domain/SolutionUnit_Roo_JavaBean.aj       |  26 -
 .../SolutionUnit_Roo_Jpa_ActiveRecord.aj      | 101 --
 .../domain/SolutionUnit_Roo_Jpa_Entity.aj     |  43 -
 .../labseer/domain/SolutionUnit_Roo_Json.aj   |  45 -
 .../domain/SolutionUnit_Roo_ToString.aj       |  16 -
 .../domain/StandardizationDryRunCompound.java | 417 ++++++++
 ...tandardizationDryRunCompound_Roo_Finder.aj |  71 --
 ...ndardizationDryRunCompound_Roo_JavaBean.aj | 213 ----
 ...tionDryRunCompound_Roo_Jpa_ActiveRecord.aj | 101 --
 ...ardizationDryRunCompound_Roo_Jpa_Entity.aj |  43 -
 .../StandardizationDryRunCompound_Roo_Json.aj |  45 -
 ...ndardizationDryRunCompound_Roo_ToString.aj |  16 -
 .../domain/StandardizationHistory.java        | 325 +++++-
 ...StandardizationHistory_Roo_Configurable.aj |  13 -
 .../StandardizationHistory_Roo_JavaBean.aj    | 187 ----
 ...dardizationHistory_Roo_Jpa_ActiveRecord.aj | 101 --
 .../StandardizationHistory_Roo_Jpa_Entity.aj  |  27 -
 .../domain/StandardizationHistory_Roo_Json.aj |  45 -
 .../StandardizationHistory_Roo_ToString.aj    |  16 -
 .../domain/StandardizationSettings.java       | 215 +++-
 ...tandardizationSettings_Roo_Configurable.aj |  13 -
 .../StandardizationSettings_Roo_Finder.aj     |  43 -
 .../StandardizationSettings_Roo_JavaBean.aj   |  27 -
 ...ardizationSettings_Roo_Jpa_ActiveRecord.aj | 101 --
 .../StandardizationSettings_Roo_Jpa_Entity.aj |  43 -
 .../StandardizationSettings_Roo_Json.aj       |  45 -
 .../StandardizationSettings_Roo_ToString.aj   |  16 -
 .../labsynch/labseer/domain/StateKind.java    | 190 +++-
 .../domain/StateKind_Roo_Configurable.aj      |  13 -
 .../labseer/domain/StateKind_Roo_Finder.aj    | 112 --
 .../labseer/domain/StateKind_Roo_JavaBean.aj  |  35 -
 .../domain/StateKind_Roo_Jpa_ActiveRecord.aj  |  35 -
 .../labseer/domain/StateKind_Roo_Json.aj      |  45 -
 .../labseer/domain/StateKind_Roo_ToString.aj  |  16 -
 .../labsynch/labseer/domain/StateType.java    | 172 +++-
 .../domain/StateType_Roo_Configurable.aj      |  13 -
 .../labseer/domain/StateType_Roo_Finder.aj    |  43 -
 .../labseer/domain/StateType_Roo_JavaBean.aj  |  18 -
 .../domain/StateType_Roo_Jpa_ActiveRecord.aj  | 101 --
 .../labseer/domain/StateType_Roo_Json.aj      |  45 -
 .../labseer/domain/StateType_Roo_ToString.aj  |  16 -
 .../labseer/domain/StereoCategory.java        | 263 ++++-
 .../domain/StereoCategory_Roo_Configurable.aj |  13 -
 .../domain/StereoCategory_Roo_Finder.aj       |  95 --
 .../domain/StereoCategory_Roo_JavaBean.aj     |  26 -
 .../StereoCategory_Roo_Jpa_ActiveRecord.aj    | 101 --
 .../domain/StereoCategory_Roo_Jpa_Entity.aj   |  43 -
 .../labseer/domain/StereoCategory_Roo_Json.aj |  45 -
 .../domain/StereoCategory_Roo_ToString.aj     |  16 -
 .../labseer/domain/StructureKind.java         | 190 +++-
 .../domain/StructureKind_Roo_Configurable.aj  |  13 -
 .../domain/StructureKind_Roo_Finder.aj        | 112 --
 .../domain/StructureKind_Roo_JavaBean.aj      |  35 -
 .../StructureKind_Roo_Jpa_ActiveRecord.aj     |  35 -
 .../labseer/domain/StructureKind_Roo_Json.aj  |  45 -
 .../domain/StructureKind_Roo_ToString.aj      |  16 -
 .../labseer/domain/StructureType.java         | 172 +++-
 .../domain/StructureType_Roo_Configurable.aj  |  13 -
 .../domain/StructureType_Roo_Finder.aj        |  43 -
 .../domain/StructureType_Roo_JavaBean.aj      |  18 -
 .../StructureType_Roo_Jpa_ActiveRecord.aj     | 101 --
 .../labseer/domain/StructureType_Roo_Json.aj  |  45 -
 .../domain/StructureType_Roo_ToString.aj      |  16 -
 .../com/labsynch/labseer/domain/Subject.java  | 208 +++-
 .../labsynch/labseer/domain/SubjectLabel.java | 127 ++-
 .../domain/SubjectLabel_Roo_Configurable.aj   |  13 -
 .../labseer/domain/SubjectLabel_Roo_Finder.aj |  44 -
 .../domain/SubjectLabel_Roo_JavaBean.aj       |  19 -
 .../SubjectLabel_Roo_Jpa_ActiveRecord.aj      |  61 --
 .../domain/SubjectLabel_Roo_Jpa_Entity.aj     |  13 -
 .../labseer/domain/SubjectLabel_Roo_Json.aj   |  38 -
 .../domain/SubjectLabel_Roo_ToString.aj       |  16 -
 .../labsynch/labseer/domain/SubjectState.java | 117 ++-
 .../domain/SubjectState_Roo_Configurable.aj   |  13 -
 .../labseer/domain/SubjectState_Roo_Finder.aj |  79 --
 .../domain/SubjectState_Roo_JavaBean.aj       |  29 -
 .../SubjectState_Roo_Jpa_ActiveRecord.aj      |  35 -
 .../domain/SubjectState_Roo_Jpa_Entity.aj     |  13 -
 .../domain/SubjectState_Roo_ToString.aj       |  16 -
 .../labsynch/labseer/domain/SubjectValue.java | 220 +++-
 .../domain/SubjectValue_Roo_Configurable.aj   |  13 -
 .../labseer/domain/SubjectValue_Roo_Finder.aj | 189 ----
 .../domain/SubjectValue_Roo_JavaBean.aj       |  19 -
 .../SubjectValue_Roo_Jpa_ActiveRecord.aj      |  35 -
 .../domain/SubjectValue_Roo_Jpa_Entity.aj     |  13 -
 .../domain/SubjectValue_Roo_ToString.aj       |  16 -
 .../domain/Subject_Roo_Configurable.aj        |  13 -
 .../labseer/domain/Subject_Roo_Finder.aj      | 130 ---
 .../labseer/domain/Subject_Roo_JavaBean.aj    |  47 -
 .../domain/Subject_Roo_Jpa_ActiveRecord.aj    |  61 --
 .../labseer/domain/Subject_Roo_Jpa_Entity.aj  |  13 -
 .../labseer/domain/Subject_Roo_ToString.aj    |  16 -
 .../labseer/domain/TempSelectTable.java       | 163 ++-
 .../TempSelectTable_Roo_Configurable.aj       |  13 -
 .../domain/TempSelectTable_Roo_JavaBean.aj    |  51 -
 .../TempSelectTable_Roo_Jpa_ActiveRecord.aj   |  90 --
 .../domain/TempSelectTable_Roo_Jpa_Entity.aj  |  45 -
 .../domain/TempSelectTable_Roo_ToString.aj    |  16 -
 .../labsynch/labseer/domain/ThingKind.java    | 190 +++-
 .../domain/ThingKind_Roo_Configurable.aj      |  13 -
 .../labseer/domain/ThingKind_Roo_Finder.aj    | 112 --
 .../labseer/domain/ThingKind_Roo_JavaBean.aj  |  35 -
 .../domain/ThingKind_Roo_Jpa_ActiveRecord.aj  |  35 -
 .../labseer/domain/ThingKind_Roo_Json.aj      |  45 -
 .../labseer/domain/ThingKind_Roo_ToString.aj  |  16 -
 .../labsynch/labseer/domain/ThingPage.java    | 255 ++++-
 .../labseer/domain/ThingPageArchive.java      | 263 ++++-
 .../ThingPageArchive_Roo_Configurable.aj      |  13 -
 .../domain/ThingPageArchive_Roo_JavaBean.aj   | 107 --
 .../ThingPageArchive_Roo_Jpa_ActiveRecord.aj  | 101 --
 .../domain/ThingPageArchive_Roo_Jpa_Entity.aj |  45 -
 .../domain/ThingPageArchive_Roo_Json.aj       |  45 -
 .../domain/ThingPageArchive_Roo_ToString.aj   |  16 -
 .../domain/ThingPage_Roo_Configurable.aj      |  13 -
 .../labseer/domain/ThingPage_Roo_JavaBean.aj  | 101 --
 .../domain/ThingPage_Roo_Jpa_ActiveRecord.aj  | 101 --
 .../domain/ThingPage_Roo_Jpa_Entity.aj        |  45 -
 .../labseer/domain/ThingPage_Roo_Json.aj      |  45 -
 .../labseer/domain/ThingPage_Roo_ToString.aj  |  16 -
 .../labsynch/labseer/domain/ThingType.java    | 172 +++-
 .../domain/ThingType_Roo_Configurable.aj      |  13 -
 .../labseer/domain/ThingType_Roo_Finder.aj    |  43 -
 .../labseer/domain/ThingType_Roo_JavaBean.aj  |  18 -
 .../domain/ThingType_Roo_Jpa_ActiveRecord.aj  | 101 --
 .../labseer/domain/ThingType_Roo_Json.aj      |  45 -
 .../labseer/domain/ThingType_Roo_ToString.aj  |  16 -
 .../labseer/domain/TreatmentGroup.java        | 209 +++-
 .../labseer/domain/TreatmentGroupLabel.java   | 132 ++-
 .../TreatmentGroupLabel_Roo_Configurable.aj   |  13 -
 .../domain/TreatmentGroupLabel_Roo_Finder.aj  |  75 --
 .../TreatmentGroupLabel_Roo_JavaBean.aj       |  19 -
 ...reatmentGroupLabel_Roo_Jpa_ActiveRecord.aj |  61 --
 .../TreatmentGroupLabel_Roo_Jpa_Entity.aj     |  13 -
 .../TreatmentGroupLabel_Roo_ToString.aj       |  16 -
 .../labseer/domain/TreatmentGroupState.java   | 144 ++-
 .../TreatmentGroupState_Roo_Configurable.aj   |  13 -
 .../domain/TreatmentGroupState_Roo_Finder.aj  | 106 --
 .../TreatmentGroupState_Roo_JavaBean.aj       |  29 -
 ...reatmentGroupState_Roo_Jpa_ActiveRecord.aj |  35 -
 .../TreatmentGroupState_Roo_Jpa_Entity.aj     |  13 -
 .../TreatmentGroupState_Roo_ToString.aj       |  16 -
 .../labseer/domain/TreatmentGroupValue.java   | 171 +++-
 .../TreatmentGroupValue_Roo_Configurable.aj   |  13 -
 .../domain/TreatmentGroupValue_Roo_Finder.aj  | 140 ---
 .../TreatmentGroupValue_Roo_JavaBean.aj       |  19 -
 ...reatmentGroupValue_Roo_Jpa_ActiveRecord.aj |  35 -
 .../TreatmentGroupValue_Roo_Jpa_Entity.aj     |  13 -
 .../TreatmentGroupValue_Roo_ToString.aj       |  16 -
 .../domain/TreatmentGroup_Roo_Configurable.aj |  13 -
 .../domain/TreatmentGroup_Roo_Finder.aj       | 130 ---
 .../domain/TreatmentGroup_Roo_JavaBean.aj     |  47 -
 .../TreatmentGroup_Roo_Jpa_ActiveRecord.aj    |  61 --
 .../domain/TreatmentGroup_Roo_Jpa_Entity.aj   |  13 -
 .../domain/TreatmentGroup_Roo_ToString.aj     |  16 -
 .../labseer/domain/UncertaintyKind.java       | 174 +++-
 .../UncertaintyKind_Roo_Configurable.aj       |  13 -
 .../domain/UncertaintyKind_Roo_JavaBean.aj    |  18 -
 .../UncertaintyKind_Roo_Jpa_ActiveRecord.aj   | 101 --
 .../domain/UncertaintyKind_Roo_Jpa_Entity.aj  |  45 -
 .../domain/UncertaintyKind_Roo_Json.aj        |  45 -
 .../domain/UncertaintyKind_Roo_ToString.aj    |  16 -
 .../com/labsynch/labseer/domain/Unit.java     | 296 +++++-
 .../com/labsynch/labseer/domain/UnitKind.java | 128 ++-
 .../domain/UnitKind_Roo_Configurable.aj       |  13 -
 .../labseer/domain/UnitKind_Roo_Finder.aj     |  50 -
 .../labseer/domain/UnitKind_Roo_JavaBean.aj   |  35 -
 .../domain/UnitKind_Roo_Jpa_ActiveRecord.aj   |  35 -
 .../labseer/domain/UnitKind_Roo_Json.aj       |  45 -
 .../labseer/domain/UnitKind_Roo_ToString.aj   |  16 -
 .../com/labsynch/labseer/domain/UnitType.java | 173 +++-
 .../domain/UnitType_Roo_Configurable.aj       |  13 -
 .../labseer/domain/UnitType_Roo_Finder.aj     |  43 -
 .../labseer/domain/UnitType_Roo_JavaBean.aj   |  18 -
 .../domain/UnitType_Roo_Jpa_ActiveRecord.aj   | 101 --
 .../labseer/domain/UnitType_Roo_Json.aj       |  45 -
 .../labseer/domain/UnitType_Roo_ToString.aj   |  16 -
 .../labseer/domain/Unit_Roo_Configurable.aj   |  13 -
 .../labseer/domain/Unit_Roo_Finder.aj         | 126 ---
 .../labseer/domain/Unit_Roo_JavaBean.aj       |  26 -
 .../domain/Unit_Roo_Jpa_ActiveRecord.aj       | 101 --
 .../labseer/domain/Unit_Roo_Jpa_Entity.aj     |  43 -
 .../labsynch/labseer/domain/Unit_Roo_Json.aj  |  45 -
 .../labseer/domain/Unit_Roo_ToString.aj       |  16 -
 .../labsynch/labseer/domain/UpdateLog.java    | 183 +++-
 .../domain/UpdateLog_Roo_Configurable.aj      |  13 -
 .../labseer/domain/UpdateLog_Roo_JavaBean.aj  |  59 --
 .../domain/UpdateLog_Roo_Jpa_ActiveRecord.aj  | 101 --
 .../domain/UpdateLog_Roo_Jpa_Entity.aj        |  45 -
 .../labseer/domain/UpdateLog_Roo_ToString.aj  |  16 -
 .../labsynch/labseer/domain/ValueKind.java    | 159 ++-
 .../domain/ValueKind_Roo_Configurable.aj      |  13 -
 .../labseer/domain/ValueKind_Roo_Finder.aj    |  81 --
 .../labseer/domain/ValueKind_Roo_JavaBean.aj  |  35 -
 .../domain/ValueKind_Roo_Jpa_ActiveRecord.aj  |  35 -
 .../labseer/domain/ValueKind_Roo_Json.aj      |  45 -
 .../labseer/domain/ValueKind_Roo_ToString.aj  |  16 -
 .../labsynch/labseer/domain/ValueType.java    | 172 +++-
 .../domain/ValueType_Roo_Configurable.aj      |  13 -
 .../labseer/domain/ValueType_Roo_Finder.aj    |  43 -
 .../labseer/domain/ValueType_Roo_JavaBean.aj  |  18 -
 .../domain/ValueType_Roo_Jpa_ActiveRecord.aj  | 101 --
 .../labseer/domain/ValueType_Roo_Json.aj      |  45 -
 .../labseer/domain/ValueType_Roo_ToString.aj  |  16 -
 .../com/labsynch/labseer/domain/Vendor.java   | 346 ++++++-
 .../labseer/domain/Vendor_Roo_Configurable.aj |  13 -
 .../labseer/domain/Vendor_Roo_Finder.aj       | 178 ----
 .../labseer/domain/Vendor_Roo_JavaBean.aj     |  26 -
 .../domain/Vendor_Roo_Jpa_ActiveRecord.aj     | 101 --
 .../labseer/domain/Vendor_Roo_Jpa_Entity.aj   |  43 -
 .../labseer/domain/Vendor_Roo_Json.aj         |  45 -
 .../labseer/domain/Vendor_Roo_ToString.aj     |  16 -
 .../labseer/dto/AnalysisGroupCodeDTO.java     |  56 +-
 .../dto/AnalysisGroupCodeDTO_Roo_JavaBean.aj  |  28 -
 .../dto/AnalysisGroupCodeDTO_Roo_Json.aj      |  45 -
 .../dto/AnalysisGroupCodeDTO_Roo_ToString.aj  |  16 -
 .../labseer/dto/AnalysisGroupCsvDTO.java      | 369 ++++++-
 .../dto/AnalysisGroupCsvDTO_Roo_JavaBean.aj   | 340 -------
 .../dto/AnalysisGroupCsvDTO_Roo_Json.aj       |  45 -
 .../dto/AnalysisGroupCsvDTO_Roo_ToString.aj   |  16 -
 .../dto/AnalysisGroupStatePathDTO.java        |  52 +-
 .../AnalysisGroupStatePathDTO_Roo_JavaBean.aj |  44 -
 .../dto/AnalysisGroupStatePathDTO_Roo_Json.aj |  24 -
 .../AnalysisGroupStatePathDTO_Roo_ToString.aj |  16 -
 .../dto/AnalysisGroupValueBaseDTO.java        | 233 ++++-
 .../AnalysisGroupValueBaseDTO_Roo_JavaBean.aj | 204 ----
 .../dto/AnalysisGroupValueBaseDTO_Roo_Json.aj |  45 -
 .../AnalysisGroupValueBaseDTO_Roo_ToString.aj |  16 -
 .../labseer/dto/AnalysisGroupValueDTO.java    | 175 +++-
 .../dto/AnalysisGroupValueDTO_Roo_JavaBean.aj | 178 ----
 .../dto/AnalysisGroupValueDTO_Roo_ToString.aj |  16 -
 .../dto/AnalysisGroupValuePathDTO.java        |  68 +-
 .../AnalysisGroupValuePathDTO_Roo_JavaBean.aj |  60 --
 .../dto/AnalysisGroupValuePathDTO_Roo_Json.aj |  24 -
 .../AnalysisGroupValuePathDTO_Roo_ToString.aj |  16 -
 .../labseer/dto/AuthGroupsAndProjectsDTO.java |  33 +-
 .../AuthGroupsAndProjectsDTO_Roo_JavaBean.aj  |  29 -
 .../dto/AuthGroupsAndProjectsDTO_Roo_Json.aj  |  24 -
 .../AuthGroupsAndProjectsDTO_Roo_ToString.aj  |  16 -
 .../labsynch/labseer/dto/AuthGroupsDTO.java   |  22 +
 .../labseer/dto/AuthGroupsDTO_Roo_JavaBean.aj |  27 -
 .../labseer/dto/AuthGroupsDTO_Roo_ToString.aj |  16 -
 .../labsynch/labseer/dto/AuthProjectDTO.java  |  23 +-
 .../dto/AuthProjectDTO_Roo_JavaBean.aj        |  27 -
 .../dto/AuthProjectDTO_Roo_ToString.aj        |  16 -
 .../labseer/dto/AuthProjectGroupsDTO.java     |  73 +-
 .../dto/AuthProjectGroupsDTO_Roo_JavaBean.aj  |  67 --
 .../dto/AuthProjectGroupsDTO_Roo_Json.aj      |  24 -
 .../dto/AuthProjectGroupsDTO_Roo_ToString.aj  |  16 -
 .../com/labsynch/labseer/dto/AuthUserDTO.java |  48 +
 .../labseer/dto/AuthUserDTO_Roo_JavaBean.aj   |  18 -
 .../labseer/dto/AuthUserDTO_Roo_Json.aj       |  45 -
 .../labseer/dto/AuthUserDTO_Roo_ToString.aj   |  16 -
 .../labseer/dto/AuthorBrowserQueryDTO.java    |  56 +
 .../dto/AuthorBrowserQueryDTO_Roo_JavaBean.aj |  27 -
 .../dto/AuthorBrowserQueryDTO_Roo_Json.aj     |  45 -
 .../dto/AuthorBrowserQueryDTO_Roo_ToString.aj |  16 -
 .../labsynch/labseer/dto/AuthorNameDTO.java   |  48 +
 .../labseer/dto/AuthorNameDTO_Roo_JavaBean.aj |  18 -
 .../labseer/dto/AuthorNameDTO_Roo_Json.aj     |  45 -
 .../labseer/dto/AuthorNameDTO_Roo_ToString.aj |  16 -
 .../labsynch/labseer/dto/AuthorQueryDTO.java  | 128 ++-
 .../dto/AuthorQueryDTO_Roo_JavaBean.aj        | 102 --
 .../labseer/dto/AuthorQueryDTO_Roo_Json.aj    |  45 -
 .../dto/AuthorQueryDTO_Roo_ToString.aj        |  16 -
 .../labseer/dto/AuthorQueryResultDTO.java     |  54 +-
 .../dto/AuthorQueryResultDTO_Roo_JavaBean.aj  |  36 -
 .../dto/AuthorQueryResultDTO_Roo_Json.aj      |  35 -
 .../dto/AuthorQueryResultDTO_Roo_ToString.aj  |  16 -
 .../labsynch/labseer/dto/AuthorRoleDTO.java   |  72 ++
 .../labseer/dto/AuthorRoleDTO_Roo_JavaBean.aj |  42 -
 .../labseer/dto/AuthorRoleDTO_Roo_Json.aj     |  45 -
 .../labseer/dto/AuthorRoleDTO_Roo_ToString.aj |  16 -
 .../labsynch/labseer/dto/AutoLabelDTO.java    |  56 +
 .../labseer/dto/AutoLabelDTO_Roo_JavaBean.aj  |  26 -
 .../labseer/dto/AutoLabelDTO_Roo_Json.aj      |  45 -
 .../labseer/dto/AutoLabelDTO_Roo_ToString.aj  |  16 -
 .../labsynch/labseer/dto/BatchCodeDTO.java    |  48 +
 .../labseer/dto/BatchCodeDTO_Roo_JavaBean.aj  |  18 -
 .../labseer/dto/BatchCodeDTO_Roo_Json.aj      |  45 -
 .../labseer/dto/BatchCodeDTO_Roo_ToString.aj  |  16 -
 .../labseer/dto/BatchCodeDependencyDTO.java   |  61 +-
 .../BatchCodeDependencyDTO_Roo_JavaBean.aj    |  45 -
 .../dto/BatchCodeDependencyDTO_Roo_Json.aj    |  35 -
 .../BatchCodeDependencyDTO_Roo_ToString.aj    |  16 -
 .../labsynch/labseer/dto/BatchProjectDTO.java |  55 +-
 .../dto/BatchProjectDTO_Roo_JavaBean.aj       |  26 -
 .../labseer/dto/BatchProjectDTO_Roo_Json.aj   |  45 -
 .../dto/BatchProjectDTO_Roo_ToString.aj       |  16 -
 .../labseer/dto/BulkLoadPropertiesDTO.java    |  77 +-
 .../dto/BulkLoadPropertiesDTO_Roo_JavaBean.aj |  62 --
 .../dto/BulkLoadPropertiesDTO_Roo_Json.aj     |  35 -
 .../dto/BulkLoadPropertiesDTO_Roo_ToString.aj |  16 -
 .../dto/BulkLoadPropertyMappingDTO.java       |  77 +-
 ...BulkLoadPropertyMappingDTO_Roo_JavaBean.aj |  59 --
 .../BulkLoadPropertyMappingDTO_Roo_Json.aj    |  35 -
 ...BulkLoadPropertyMappingDTO_Roo_ToString.aj |  16 -
 .../dto/BulkLoadRegisterSDFRequestDTO.java    |  78 +-
 ...kLoadRegisterSDFRequestDTO_Roo_JavaBean.aj |  62 --
 .../BulkLoadRegisterSDFRequestDTO_Roo_Json.aj |  35 -
 ...kLoadRegisterSDFRequestDTO_Roo_ToString.aj |  16 -
 .../dto/BulkLoadRegisterSDFResponseDTO.java   |  53 +-
 ...LoadRegisterSDFResponseDTO_Roo_JavaBean.aj |  36 -
 ...BulkLoadRegisterSDFResponseDTO_Roo_Json.aj |  35 -
 ...LoadRegisterSDFResponseDTO_Roo_ToString.aj |  16 -
 .../dto/BulkLoadSDFPropertyRequestDTO.java    |  80 +-
 ...kLoadSDFPropertyRequestDTO_Roo_JavaBean.aj |  52 -
 .../BulkLoadSDFPropertyRequestDTO_Roo_Json.aj |  45 -
 ...kLoadSDFPropertyRequestDTO_Roo_ToString.aj |  16 -
 ...oadSDFValidationPropertiesResponseDTO.java |  45 +-
 ...ationPropertiesResponseDTO_Roo_JavaBean.aj |  27 -
 ...alidationPropertiesResponseDTO_Roo_Json.aj |  35 -
 ...ationPropertiesResponseDTO_Roo_ToString.aj |  16 -
 .../labseer/dto/BulkLoadTemplateDTO.java      |  71 +-
 .../dto/BulkLoadTemplateDTO_Roo_JavaBean.aj   |  44 -
 .../dto/BulkLoadTemplateDTO_Roo_Json.aj       |  45 -
 .../dto/BulkLoadTemplateDTO_Roo_ToString.aj   |  16 -
 .../labseer/dto/BulkTransferPart1DTO.java     | 169 +++-
 .../dto/BulkTransferPart1DTO_Roo_JavaBean.aj  | 139 ---
 .../dto/BulkTransferPart1DTO_Roo_Json.aj      |  45 -
 .../dto/BulkTransferPart1DTO_Roo_ToString.aj  |  16 -
 .../labseer/dto/ChangePasswordDTO.java        |  72 ++
 .../dto/ChangePasswordDTO_Roo_JavaBean.aj     |  42 -
 .../labseer/dto/ChangePasswordDTO_Roo_Json.aj |  45 -
 .../dto/ChangePasswordDTO_Roo_ToString.aj     |  16 -
 .../labseer/dto/CleanMolOptionsDTO.java       |  56 +
 .../dto/CleanMolOptionsDTO_Roo_JavaBean.aj    |  26 -
 .../dto/CleanMolOptionsDTO_Roo_Json.aj        |  45 -
 .../dto/CleanMolOptionsDTO_Roo_ToString.aj    |  16 -
 .../labseer/dto/CmpdRegBatchCodeDTO.java      |  62 +-
 .../dto/CmpdRegBatchCodeDTO_Roo_JavaBean.aj   |  45 -
 .../dto/CmpdRegBatchCodeDTO_Roo_Json.aj       |  35 -
 .../dto/CmpdRegBatchCodeDTO_Roo_ToString.aj   |  16 -
 .../dto/CmpdRegStructureSearchDTO.java        |  80 +-
 .../CmpdRegStructureSearchDTO_Roo_JavaBean.aj |  51 -
 .../dto/CmpdRegStructureSearchDTO_Roo_Json.aj |  45 -
 .../CmpdRegStructureSearchDTO_Roo_ToString.aj |  16 -
 .../labsynch/labseer/dto/CodeLabelDTO.java    |  51 +-
 .../labseer/dto/CodeLabelDTO_Roo_JavaBean.aj  |  43 -
 .../labseer/dto/CodeLabelDTO_Roo_Json.aj      |  24 -
 .../labseer/dto/CodeLabelDTO_Roo_ToString.aj  |  16 -
 .../labseer/dto/CodeNameQueryDTO.java         |  56 +
 .../dto/CodeNameQueryDTO_Roo_JavaBean.aj      |  26 -
 .../labseer/dto/CodeNameQueryDTO_Roo_Json.aj  |  45 -
 .../dto/CodeNameQueryDTO_Roo_ToString.aj      |  16 -
 .../labseer/dto/CodeNameValueDTO.java         |  36 +-
 .../dto/CodeNameValueDTO_Roo_JavaBean.aj      |  27 -
 .../labseer/dto/CodeNameValueDTO_Roo_Json.aj  |  24 -
 .../dto/CodeNameValueDTO_Roo_ToString.aj      |  16 -
 .../labsynch/labseer/dto/CodeTableDTO.java    |  99 +-
 .../labseer/dto/CodeTableDTO_Roo_JavaBean.aj  |  90 --
 .../labseer/dto/CodeTableDTO_Roo_Json.aj      |  24 -
 .../labseer/dto/CodeTableDTO_Roo_ToString.aj  |  16 -
 .../labsynch/labseer/dto/CodeTypeKindDTO.java |  44 +-
 .../dto/CodeTypeKindDTO_Roo_JavaBean.aj       |  34 -
 .../labseer/dto/CodeTypeKindDTO_Roo_Json.aj   |  24 -
 .../dto/CodeTypeKindDTO_Roo_ToString.aj       |  16 -
 .../labseer/dto/ContainerBatchCodeDTO.java    |  60 +-
 .../dto/ContainerBatchCodeDTO_Roo_JavaBean.aj |  50 -
 .../dto/ContainerBatchCodeDTO_Roo_Json.aj     |  24 -
 .../dto/ContainerBatchCodeDTO_Roo_ToString.aj |  16 -
 .../labseer/dto/ContainerBrowserQueryDTO.java |  56 +
 .../ContainerBrowserQueryDTO_Roo_JavaBean.aj  |  27 -
 .../dto/ContainerBrowserQueryDTO_Roo_Json.aj  |  45 -
 .../ContainerBrowserQueryDTO_Roo_ToString.aj  |  16 -
 .../dto/ContainerCodeNameStateDTO.java        |  36 +-
 .../ContainerCodeNameStateDTO_Roo_JavaBean.aj |  27 -
 .../dto/ContainerCodeNameStateDTO_Roo_Json.aj |  24 -
 .../ContainerCodeNameStateDTO_Roo_ToString.aj |  16 -
 .../dto/ContainerDependencyCheckDTO.java      |  70 +-
 ...ontainerDependencyCheckDTO_Roo_JavaBean.aj |  54 -
 .../ContainerDependencyCheckDTO_Roo_Json.aj   |  35 -
 ...ontainerDependencyCheckDTO_Roo_ToString.aj |  16 -
 .../labseer/dto/ContainerErrorMessageDTO.java |  60 +-
 .../ContainerErrorMessageDTO_Roo_JavaBean.aj  |  51 -
 .../dto/ContainerErrorMessageDTO_Roo_Json.aj  |  24 -
 .../ContainerErrorMessageDTO_Roo_ToString.aj  |  16 -
 .../labseer/dto/ContainerLocationDTO.java     |  76 +-
 .../dto/ContainerLocationDTO_Roo_JavaBean.aj  |  67 --
 .../dto/ContainerLocationDTO_Roo_Json.aj      |  24 -
 .../dto/ContainerLocationDTO_Roo_ToString.aj  |  16 -
 .../labseer/dto/ContainerLocationTreeDTO.java | 128 +++
 .../ContainerLocationTreeDTO_Roo_JavaBean.aj  |  98 --
 .../dto/ContainerLocationTreeDTO_Roo_Json.aj  |  45 -
 .../ContainerLocationTreeDTO_Roo_ToString.aj  |  16 -
 .../labseer/dto/ContainerMiniDTO.java         |  56 +
 .../dto/ContainerMiniDTO_Roo_JavaBean.aj      |  26 -
 .../labseer/dto/ContainerMiniDTO_Roo_Json.aj  |  45 -
 .../dto/ContainerMiniDTO_Roo_ToString.aj      |  16 -
 .../labseer/dto/ContainerQueryDTO.java        | 128 ++-
 .../dto/ContainerQueryDTO_Roo_JavaBean.aj     | 103 --
 .../labseer/dto/ContainerQueryDTO_Roo_Json.aj |  45 -
 .../dto/ContainerQueryDTO_Roo_ToString.aj     |  16 -
 .../labseer/dto/ContainerQueryResultDTO.java  |  54 +-
 .../ContainerQueryResultDTO_Roo_JavaBean.aj   |  36 -
 .../dto/ContainerQueryResultDTO_Roo_Json.aj   |  35 -
 .../ContainerQueryResultDTO_Roo_ToString.aj   |  16 -
 .../labseer/dto/ContainerRequestDTO.java      |  81 +-
 .../dto/ContainerRequestDTO_Roo_JavaBean.aj   |  52 -
 .../dto/ContainerRequestDTO_Roo_Json.aj       |  45 -
 .../dto/ContainerRequestDTO_Roo_ToString.aj   |  16 -
 .../dto/ContainerSearchRequestDTO.java        |  94 +-
 .../ContainerSearchRequestDTO_Roo_JavaBean.aj |  74 --
 .../dto/ContainerSearchRequestDTO_Roo_Json.aj |  35 -
 .../ContainerSearchRequestDTO_Roo_ToString.aj |  16 -
 .../labseer/dto/ContainerStateMiniDTO.java    |  64 ++
 .../dto/ContainerStateMiniDTO_Roo_JavaBean.aj |  35 -
 .../dto/ContainerStateMiniDTO_Roo_Json.aj     |  45 -
 .../dto/ContainerStateMiniDTO_Roo_ToString.aj |  16 -
 .../labseer/dto/ContainerStatePathDTO.java    |  52 +-
 .../dto/ContainerStatePathDTO_Roo_JavaBean.aj |  44 -
 .../dto/ContainerStatePathDTO_Roo_Json.aj     |  24 -
 .../dto/ContainerStatePathDTO_Roo_ToString.aj |  16 -
 .../labseer/dto/ContainerSubjectsDTO.java     |  52 +-
 .../dto/ContainerSubjectsDTO_Roo_JavaBean.aj  |  44 -
 .../dto/ContainerSubjectsDTO_Roo_Json.aj      |  24 -
 .../dto/ContainerSubjectsDTO_Roo_ToString.aj  |  16 -
 .../labseer/dto/ContainerValuePathDTO.java    |  68 +-
 .../dto/ContainerValuePathDTO_Roo_JavaBean.aj |  60 --
 .../dto/ContainerValuePathDTO_Roo_Json.aj     |  24 -
 .../dto/ContainerValuePathDTO_Roo_ToString.aj |  16 -
 .../labseer/dto/ContainerValueRequestDTO.java |  96 ++
 .../ContainerValueRequestDTO_Roo_JavaBean.aj  |  66 --
 .../dto/ContainerValueRequestDTO_Roo_Json.aj  |  45 -
 .../ContainerValueRequestDTO_Roo_ToString.aj  |  16 -
 .../labseer/dto/ContainerWellCodeDTO.java     |  35 +-
 .../dto/ContainerWellCodeDTO_Roo_JavaBean.aj  |  27 -
 .../dto/ContainerWellCodeDTO_Roo_Json.aj      |  24 -
 .../dto/ContainerWellCodeDTO_Roo_ToString.aj  |  16 -
 .../com/labsynch/labseer/dto/CorpNameDTO.java |  56 +
 .../labseer/dto/CorpNameDTO_Roo_JavaBean.aj   |  26 -
 .../labseer/dto/CorpNameDTO_Roo_Json.aj       |  45 -
 .../labseer/dto/CorpNameDTO_Roo_ToString.aj   |  16 -
 .../labseer/dto/CreatePlateRequestDTO.java    | 110 +-
 .../dto/CreatePlateRequestDTO_Roo_JavaBean.aj |  93 --
 .../dto/CreatePlateRequestDTO_Roo_Json.aj     |  35 -
 .../dto/CreatePlateRequestDTO_Roo_ToString.aj |  16 -
 .../com/labsynch/labseer/dto/CurveFitDTO.java | 431 +++++++-
 .../labseer/dto/CurveFitDTO_Roo_JavaBean.aj   | 404 --------
 .../labseer/dto/CurveFitDTO_Roo_Json.aj       |  45 -
 .../labseer/dto/CurveFitDTO_Roo_ToString.aj   |  16 -
 .../dto/DateValueComparisonRequest.java       |  96 ++
 ...DateValueComparisonRequest_Roo_JavaBean.aj |  66 --
 .../DateValueComparisonRequest_Roo_Json.aj    |  45 -
 ...DateValueComparisonRequest_Roo_ToString.aj |  16 -
 .../labseer/dto/DependencyCheckDTO.java       |  78 +-
 .../dto/DependencyCheckDTO_Roo_JavaBean.aj    |  61 --
 .../dto/DependencyCheckDTO_Roo_Json.aj        |  35 -
 .../dto/DependencyCheckDTO_Roo_ToString.aj    |  16 -
 .../labseer/dto/DoseReponseParamsDTO.java     | 225 ++++-
 .../dto/DoseReponseParamsDTO_Roo_JavaBean.aj  | 195 ----
 .../dto/DoseReponseParamsDTO_Roo_Json.aj      |  45 -
 .../dto/DoseReponseParamsDTO_Roo_ToString.aj  |  16 -
 .../com/labsynch/labseer/dto/EntrezDbDTO.java |  64 ++
 .../labseer/dto/EntrezDbDTO_Roo_JavaBean.aj   |  34 -
 .../labseer/dto/EntrezDbDTO_Roo_Json.aj       |  45 -
 .../labseer/dto/EntrezDbDTO_Roo_ToString.aj   |  16 -
 .../labsynch/labseer/dto/EntrezDbGeneDTO.java | 161 ++-
 .../dto/EntrezDbGeneDTO_Roo_JavaBean.aj       | 131 ---
 .../labseer/dto/EntrezDbGeneDTO_Roo_Json.aj   |  45 -
 .../dto/EntrezDbGeneDTO_Roo_ToString.aj       |  16 -
 .../dto/EntrezDiscontinuedGeneDTO.java        |  81 +-
 .../EntrezDiscontinuedGeneDTO_Roo_JavaBean.aj |  51 -
 .../dto/EntrezDiscontinuedGeneDTO_Roo_Json.aj |  45 -
 .../EntrezDiscontinuedGeneDTO_Roo_ToString.aj |  16 -
 .../labsynch/labseer/dto/ErrorMessageDTO.java |  56 +
 .../dto/ErrorMessageDTO_Roo_JavaBean.aj       |  26 -
 .../labseer/dto/ErrorMessageDTO_Roo_Json.aj   |  45 -
 .../dto/ErrorMessageDTO_Roo_ToString.aj       |  16 -
 .../labseer/dto/ExperimentCodeDTO.java        |  56 +
 .../dto/ExperimentCodeDTO_Roo_JavaBean.aj     |  26 -
 .../labseer/dto/ExperimentCodeDTO_Roo_Json.aj |  45 -
 .../dto/ExperimentCodeDTO_Roo_ToString.aj     |  16 -
 .../labseer/dto/ExperimentCsvDataDTO.java     |  72 ++
 .../dto/ExperimentCsvDataDTO_Roo_JavaBean.aj  |  42 -
 .../dto/ExperimentCsvDataDTO_Roo_Json.aj      |  45 -
 .../dto/ExperimentCsvDataDTO_Roo_ToString.aj  |  16 -
 .../labseer/dto/ExperimentDataDTO.java        | 111 +-
 .../dto/ExperimentDataDTO_Roo_JavaBean.aj     | 117 ---
 .../dto/ExperimentDataDTO_Roo_ToString.aj     |  16 -
 .../dto/ExperimentErrorMessageDTO.java        |  52 +-
 .../ExperimentErrorMessageDTO_Roo_JavaBean.aj |  43 -
 .../dto/ExperimentErrorMessageDTO_Roo_Json.aj |  24 -
 .../ExperimentErrorMessageDTO_Roo_ToString.aj |  16 -
 .../labseer/dto/ExperimentFilterDTO.java      |  39 +-
 .../dto/ExperimentFilterDTO_Roo_JavaBean.aj   |  44 -
 .../dto/ExperimentFilterDTO_Roo_ToString.aj   |  16 -
 .../dto/ExperimentFilterSearchDTO.java        | 112 ++
 .../ExperimentFilterSearchDTO_Roo_JavaBean.aj |  82 --
 .../dto/ExperimentFilterSearchDTO_Roo_Json.aj |  45 -
 .../ExperimentFilterSearchDTO_Roo_ToString.aj |  16 -
 .../labseer/dto/ExperimentGuiStubDTO.java     | 161 ++-
 .../dto/ExperimentGuiStubDTO_Roo_JavaBean.aj  | 131 ---
 .../dto/ExperimentGuiStubDTO_Roo_Json.aj      |  45 -
 .../dto/ExperimentGuiStubDTO_Roo_ToString.aj  |  16 -
 .../dto/ExperimentSearchRequestDTO.java       |  55 +-
 ...ExperimentSearchRequestDTO_Roo_JavaBean.aj |  60 --
 ...ExperimentSearchRequestDTO_Roo_ToString.aj |  16 -
 .../labseer/dto/ExperimentStatePathDTO.java   |  52 +-
 .../ExperimentStatePathDTO_Roo_JavaBean.aj    |  44 -
 .../dto/ExperimentStatePathDTO_Roo_Json.aj    |  24 -
 .../ExperimentStatePathDTO_Roo_ToString.aj    |  16 -
 .../labseer/dto/ExperimentValuePathDTO.java   |  68 +-
 .../ExperimentValuePathDTO_Roo_JavaBean.aj    |  60 --
 .../dto/ExperimentValuePathDTO_Roo_Json.aj    |  24 -
 .../ExperimentValuePathDTO_Roo_ToString.aj    |  16 -
 .../labsynch/labseer/dto/ExportResultDTO.java |  62 +-
 .../dto/ExportResultDTO_Roo_JavaBean.aj       |  42 -
 .../labseer/dto/ExportResultDTO_Roo_Json.aj   |  35 -
 .../dto/ExportResultDTO_Roo_ToString.aj       |  16 -
 .../labseer/dto/FileSaveReturnArrayDTO.java   |  15 +-
 .../FileSaveReturnArrayDTO_Roo_JavaBean.aj    |  20 -
 .../FileSaveReturnArrayDTO_Roo_ToString.aj    |  16 -
 .../labseer/dto/FileSaveReturnDTO.java        |  75 +-
 .../dto/FileSaveReturnDTO_Roo_JavaBean.aj     |  79 --
 .../dto/FileSaveReturnDTO_Roo_ToString.aj     |  16 -
 .../labsynch/labseer/dto/FileSaveSendDTO.java |  78 +-
 .../dto/FileSaveSendDTO_Roo_JavaBean.aj       |  49 -
 .../labseer/dto/FileSaveSendDTO_Roo_Json.aj   |  45 -
 .../dto/FileSaveSendDTO_Roo_ToString.aj       |  16 -
 .../com/labsynch/labseer/dto/FlagWellDTO.java | 159 ++-
 .../labseer/dto/FlagWellDTO_Roo_JavaBean.aj   | 130 ---
 .../labseer/dto/FlagWellDTO_Roo_Json.aj       |  45 -
 .../labseer/dto/FlagWellDTO_Roo_ToString.aj   |  16 -
 .../labsynch/labseer/dto/FlatThingCsvDTO.java | 381 ++++++-
 .../dto/FlatThingCsvDTO_Roo_JavaBean.aj       | 352 -------
 .../labseer/dto/FlatThingCsvDTO_Roo_Json.aj   |  45 -
 .../dto/FlatThingCsvDTO_Roo_ToString.aj       |  16 -
 .../com/labsynch/labseer/dto/GeneIdDTO.java   |  48 +
 .../labseer/dto/GeneIdDTO_Roo_JavaBean.aj     |  18 -
 .../labseer/dto/GeneIdDTO_Roo_Json.aj         |  45 -
 .../labseer/dto/GeneIdDTO_Roo_ToString.aj     |  16 -
 .../labsynch/labseer/dto/GeneOrthologDTO.java | 198 ++++
 .../dto/GeneOrthologDTO_Roo_JavaBean.aj       | 202 ----
 .../dto/GeneOrthologDTO_Roo_ToString.aj       |  16 -
 .../labseer/dto/GeneOrthologFileDTO.java      |  96 ++
 .../dto/GeneOrthologFileDTO_Roo_JavaBean.aj   |  66 --
 .../dto/GeneOrthologFileDTO_Roo_Json.aj       |  45 -
 .../dto/GeneOrthologFileDTO_Roo_ToString.aj   |  16 -
 .../dto/GenericQueryCodeTableResultDTO.java   |  54 +-
 ...ricQueryCodeTableResultDTO_Roo_JavaBean.aj |  36 -
 ...GenericQueryCodeTableResultDTO_Roo_Json.aj |  35 -
 ...ricQueryCodeTableResultDTO_Roo_ToString.aj |  16 -
 .../labseer/dto/GenericStatePathRequest.java  |  44 +-
 .../GenericStatePathRequest_Roo_JavaBean.aj   |  34 -
 .../dto/GenericStatePathRequest_Roo_Json.aj   |  24 -
 .../GenericStatePathRequest_Roo_ToString.aj   |  16 -
 .../labseer/dto/GenericValuePathRequest.java  |  60 +-
 .../GenericValuePathRequest_Roo_JavaBean.aj   |  50 -
 .../dto/GenericValuePathRequest_Roo_Json.aj   |  24 -
 .../GenericValuePathRequest_Roo_ToString.aj   |  16 -
 .../labseer/dto/HydrogenizeMolInputDTO.java   |  64 ++
 .../HydrogenizeMolInputDTO_Roo_JavaBean.aj    |  35 -
 .../dto/HydrogenizeMolInputDTO_Roo_Json.aj    |  45 -
 .../HydrogenizeMolInputDTO_Roo_ToString.aj    |  16 -
 .../labsynch/labseer/dto/IdCollectionDTO.java |  56 +
 .../dto/IdCollectionDTO_Roo_JavaBean.aj       |  26 -
 .../labseer/dto/IdCollectionDTO_Roo_Json.aj   |  45 -
 .../dto/IdCollectionDTO_Roo_ToString.aj       |  16 -
 .../com/labsynch/labseer/dto/IdSetDTO.java    |  15 +-
 .../labseer/dto/IdSetDTO_Roo_JavaBean.aj      |  19 -
 .../labseer/dto/IdSetDTO_Roo_ToString.aj      |  16 -
 .../com/labsynch/labseer/dto/ItxQueryDTO.java | 120 ++-
 .../labseer/dto/ItxQueryDTO_Roo_JavaBean.aj   |  92 --
 .../labseer/dto/ItxQueryDTO_Roo_Json.aj       |  45 -
 .../labseer/dto/ItxQueryDTO_Roo_ToString.aj   |  16 -
 .../labsynch/labseer/dto/JSTreeNodeDTO.java   |  46 +
 .../labseer/dto/JSTreeNodeDTO_Roo_JavaBean.aj |  52 -
 .../labseer/dto/JSTreeNodeDTO_Roo_ToString.aj |  16 -
 .../com/labsynch/labseer/dto/KeyValueDTO.java |  56 +
 .../labseer/dto/KeyValueDTO_Roo_JavaBean.aj   |  26 -
 .../labseer/dto/KeyValueDTO_Roo_Json.aj       |  45 -
 .../labseer/dto/KeyValueDTO_Roo_ToString.aj   |  16 -
 .../labsynch/labseer/dto/KiCurveFitDTO.java   | 455 ++++++++-
 .../labseer/dto/KiCurveFitDTO_Roo_JavaBean.aj | 428 --------
 .../labseer/dto/KiCurveFitDTO_Roo_Json.aj     |  45 -
 .../labseer/dto/KiCurveFitDTO_Roo_ToString.aj |  16 -
 .../labsynch/labseer/dto/LabelPrefixDTO.java  | 104 +-
 .../dto/LabelPrefixDTO_Roo_JavaBean.aj        |  74 --
 .../labseer/dto/LabelPrefixDTO_Roo_Json.aj    |  45 -
 .../dto/LabelPrefixDTO_Roo_ToString.aj        |  16 -
 .../labsynch/labseer/dto/LabelQueryDTO.java   |  72 ++
 .../labseer/dto/LabelQueryDTO_Roo_JavaBean.aj |  42 -
 .../labseer/dto/LabelQueryDTO_Roo_Json.aj     |  45 -
 .../labseer/dto/LabelQueryDTO_Roo_ToString.aj |  16 -
 .../labseer/dto/LabelSequenceDTO.java         | 104 ++
 .../dto/LabelSequenceDTO_Roo_JavaBean.aj      |  74 --
 .../labseer/dto/LabelSequenceDTO_Roo_Json.aj  |  45 -
 .../dto/LabelSequenceDTO_Roo_ToString.aj      |  16 -
 .../com/labsynch/labseer/dto/LicenseDTO.java  |  96 ++
 .../labseer/dto/LicenseDTO_Roo_JavaBean.aj    |  66 --
 .../labseer/dto/LicenseDTO_Roo_Json.aj        |  45 -
 .../labseer/dto/LicenseDTO_Roo_ToString.aj    |  16 -
 .../com/labsynch/labseer/dto/LotAliasDTO.java |  80 +-
 .../labseer/dto/LotAliasDTO_Roo_JavaBean.aj   |  50 -
 .../labseer/dto/LotAliasDTO_Roo_Json.aj       |  45 -
 .../labseer/dto/LotAliasDTO_Roo_ToString.aj   |  16 -
 .../java/com/labsynch/labseer/dto/LotDTO.java | 601 ++++++++++-
 .../labseer/dto/LotDTO_Roo_JavaBean.aj        | 571 -----------
 .../labsynch/labseer/dto/LotDTO_Roo_Json.aj   |  45 -
 .../labseer/dto/LotDTO_Roo_ToString.aj        |  16 -
 .../labseer/dto/LotsByProjectDTO.java         |  83 +-
 .../dto/LotsByProjectDTO_Roo_JavaBean.aj      |  59 --
 .../labseer/dto/LotsByProjectDTO_Roo_Json.aj  |  45 -
 .../labseer/dto/LsThingBrowserQueryDTO.java   |  56 +
 .../LsThingBrowserQueryDTO_Roo_JavaBean.aj    |  27 -
 .../dto/LsThingBrowserQueryDTO_Roo_Json.aj    |  45 -
 .../LsThingBrowserQueryDTO_Roo_ToString.aj    |  16 -
 .../labsynch/labseer/dto/LsThingQueryDTO.java | 136 ++-
 .../dto/LsThingQueryDTO_Roo_JavaBean.aj       | 112 --
 .../labseer/dto/LsThingQueryDTO_Roo_Json.aj   |  45 -
 .../dto/LsThingQueryDTO_Roo_ToString.aj       |  16 -
 .../labseer/dto/LsThingQueryResultDTO.java    |  54 +-
 .../dto/LsThingQueryResultDTO_Roo_JavaBean.aj |  36 -
 .../dto/LsThingQueryResultDTO_Roo_Json.aj     |  35 -
 .../dto/LsThingQueryResultDTO_Roo_ToString.aj |  16 -
 .../labseer/dto/LsThingStatePathDTO.java      |  52 +-
 .../dto/LsThingStatePathDTO_Roo_JavaBean.aj   |  44 -
 .../dto/LsThingStatePathDTO_Roo_Json.aj       |  24 -
 .../dto/LsThingStatePathDTO_Roo_ToString.aj   |  16 -
 .../labseer/dto/LsThingValidationDTO.java     |  89 +-
 .../dto/LsThingValidationDTO_Roo_JavaBean.aj  |  61 --
 .../dto/LsThingValidationDTO_Roo_Json.aj      |  45 -
 .../dto/LsThingValidationDTO_Roo_ToString.aj  |  16 -
 .../labseer/dto/LsThingValuePathDTO.java      |  68 +-
 .../dto/LsThingValuePathDTO_Roo_JavaBean.aj   |  60 --
 .../dto/LsThingValuePathDTO_Roo_Json.aj       |  24 -
 .../dto/LsThingValuePathDTO_Roo_ToString.aj   |  16 -
 .../labseer/dto/LsTransactionQueryDTO.java    |  84 +-
 .../dto/LsTransactionQueryDTO_Roo_JavaBean.aj |  77 --
 .../dto/LsTransactionQueryDTO_Roo_Json.aj     |  24 -
 .../dto/LsTransactionQueryDTO_Roo_ToString.aj |  16 -
 .../com/labsynch/labseer/dto/Metalot.java     |  39 +-
 .../labsynch/labseer/dto/MetalotReturn.java   |  48 +-
 .../labseer/dto/MetalotReturnDTO.java         |  64 ++
 .../dto/MetalotReturnDTO_Roo_JavaBean.aj      |  34 -
 .../labseer/dto/MetalotReturnDTO_Roo_Json.aj  |  45 -
 .../dto/MetalotReturnDTO_Roo_ToString.aj      |  16 -
 .../labseer/dto/MetalotReturn_Roo_JavaBean.aj |  29 -
 .../labseer/dto/MetalotReturn_Roo_Json.aj     |  35 -
 .../labseer/dto/MetalotReturn_Roo_ToString.aj |  16 -
 .../labseer/dto/Metalot_Roo_JavaBean.aj       |  46 -
 .../labseer/dto/Metalot_Roo_ToString.aj       |  16 -
 .../labsynch/labseer/dto/MethodOptionDTO.java |  48 +
 .../dto/MethodOptionDTO_Roo_JavaBean.aj       |  18 -
 .../labseer/dto/MethodOptionDTO_Roo_Json.aj   |  45 -
 .../dto/MethodOptionDTO_Roo_ToString.aj       |  16 -
 .../labseer/dto/MolCleanInputDTO.java         |  56 +
 .../dto/MolCleanInputDTO_Roo_JavaBean.aj      |  27 -
 .../labseer/dto/MolCleanInputDTO_Roo_Json.aj  |  45 -
 .../dto/MolCleanInputDTO_Roo_ToString.aj      |  16 -
 .../labseer/dto/MolConvertInputDTO.java       |  64 ++
 .../dto/MolConvertInputDTO_Roo_JavaBean.aj    |  34 -
 .../dto/MolConvertInputDTO_Roo_Json.aj        |  45 -
 .../dto/MolConvertInputDTO_Roo_ToString.aj    |  16 -
 .../labseer/dto/MolConvertOutputDTO.java      |  64 ++
 .../dto/MolConvertOutputDTO_Roo_JavaBean.aj   |  34 -
 .../dto/MolConvertOutputDTO_Roo_Json.aj       |  45 -
 .../dto/MolConvertOutputDTO_Roo_ToString.aj   |  16 -
 .../com/labsynch/labseer/dto/MolInputDTO.java |  48 +
 .../labseer/dto/MolInputDTO_Roo_JavaBean.aj   |  18 -
 .../labseer/dto/MolInputDTO_Roo_Json.aj       |  45 -
 .../labseer/dto/MolInputDTO_Roo_ToString.aj   |  16 -
 .../labseer/dto/MolPropertiesDTO.java         |  72 ++
 .../dto/MolPropertiesDTO_Roo_JavaBean.aj      |  42 -
 .../labseer/dto/MolPropertiesDTO_Roo_Json.aj  |  45 -
 .../dto/MolPropertiesDTO_Roo_ToString.aj      |  16 -
 .../MultiContainerSubjectSearchRequest.java   |  96 +-
 ...tainerSubjectSearchRequest_Roo_JavaBean.aj |  68 --
 ...iContainerSubjectSearchRequest_Roo_Json.aj |  45 -
 ...tainerSubjectSearchRequest_Roo_ToString.aj |  16 -
 .../MultiContainerSubjectSearchResultDTO.java |  54 +-
 ...inerSubjectSearchResultDTO_Roo_JavaBean.aj |  36 -
 ...ontainerSubjectSearchResultDTO_Roo_Json.aj |  35 -
 ...inerSubjectSearchResultDTO_Roo_ToString.aj |  16 -
 .../labsynch/labseer/dto/ParentAliasDTO.java  | 110 ++
 .../dto/ParentAliasDTO_Roo_JavaBean.aj        |  82 --
 .../labseer/dto/ParentAliasDTO_Roo_Json.aj    |  45 -
 .../dto/ParentAliasDTO_Roo_ToString.aj        |  16 -
 .../com/labsynch/labseer/dto/ParentDTO.java   | 185 +++-
 .../labseer/dto/ParentDTO_Roo_JavaBean.aj     | 160 ---
 .../labseer/dto/ParentDTO_Roo_Json.aj         |  45 -
 .../labseer/dto/ParentDTO_Roo_ToString.aj     |  16 -
 .../labsynch/labseer/dto/ParentEditDTO.java   | 209 +++-
 .../labseer/dto/ParentEditDTO_Roo_JavaBean.aj | 180 ----
 .../labseer/dto/ParentEditDTO_Roo_Json.aj     |  45 -
 .../labseer/dto/ParentEditDTO_Roo_ToString.aj |  16 -
 .../labseer/dto/ParentLotCodeDTO.java         |  44 +-
 .../dto/ParentLotCodeDTO_Roo_JavaBean.aj      |  35 -
 .../labseer/dto/ParentLotCodeDTO_Roo_Json.aj  |  24 -
 .../dto/ParentLotCodeDTO_Roo_ToString.aj      |  16 -
 .../labseer/dto/ParentValidationDTO.java      |  62 +-
 .../dto/ParentValidationDTO_Roo_JavaBean.aj   |  46 -
 .../dto/ParentValidationDTO_Roo_Json.aj       |  35 -
 .../dto/ParentValidationDTO_Roo_ToString.aj   |  16 -
 .../labsynch/labseer/dto/PlateStubDTO.java    |  62 +-
 .../labseer/dto/PlateStubDTO_Roo_JavaBean.aj  |  44 -
 .../labseer/dto/PlateStubDTO_Roo_Json.aj      |  35 -
 .../labseer/dto/PlateStubDTO_Roo_ToString.aj  |  16 -
 .../labsynch/labseer/dto/PlateWellDTO.java    |  72 ++
 .../labseer/dto/PlateWellDTO_Roo_JavaBean.aj  |  42 -
 .../labseer/dto/PlateWellDTO_Roo_Json.aj      |  45 -
 .../labseer/dto/PlateWellDTO_Roo_ToString.aj  |  16 -
 .../labseer/dto/PreferredNameDTO.java         |  64 +-
 .../dto/PreferredNameDTO_Roo_JavaBean.aj      |  34 -
 .../labseer/dto/PreferredNameDTO_Roo_Json.aj  |  45 -
 .../dto/PreferredNameDTO_Roo_ToString.aj      |  16 -
 .../labseer/dto/PreferredNameRequestDTO.java  |  41 +-
 .../PreferredNameRequestDTO_Roo_JavaBean.aj   |  37 -
 .../dto/PreferredNameRequestDTO_Roo_Json.aj   |  24 -
 .../PreferredNameRequestDTO_Roo_ToString.aj   |  16 -
 .../labseer/dto/PreferredNameResultsDTO.java  |  31 +-
 .../PreferredNameResultsDTO_Roo_JavaBean.aj   |  37 -
 .../PreferredNameResultsDTO_Roo_ToString.aj   |  16 -
 .../dto/PreferredNameWithErrorDTO.java        |  72 ++
 .../PreferredNameWithErrorDTO_Roo_JavaBean.aj |  43 -
 .../dto/PreferredNameWithErrorDTO_Roo_Json.aj |  45 -
 .../PreferredNameWithErrorDTO_Roo_ToString.aj |  16 -
 .../com/labsynch/labseer/dto/ProtocolDTO.java | 185 +++-
 .../labseer/dto/ProtocolDTO_Roo_JavaBean.aj   | 186 ----
 .../labseer/dto/ProtocolDTO_Roo_Json.aj       |  24 -
 .../labseer/dto/ProtocolDTO_Roo_ToString.aj   |  16 -
 .../labseer/dto/ProtocolErrorMessageDTO.java  |  52 +-
 .../ProtocolErrorMessageDTO_Roo_JavaBean.aj   |  43 -
 .../dto/ProtocolErrorMessageDTO_Roo_Json.aj   |  24 -
 .../ProtocolErrorMessageDTO_Roo_ToString.aj   |  16 -
 .../labseer/dto/ProtocolStatePathDTO.java     |  52 +-
 .../dto/ProtocolStatePathDTO_Roo_JavaBean.aj  |  44 -
 .../dto/ProtocolStatePathDTO_Roo_Json.aj      |  24 -
 .../dto/ProtocolStatePathDTO_Roo_ToString.aj  |  16 -
 .../labseer/dto/ProtocolValuePathDTO.java     |  68 +-
 .../dto/ProtocolValuePathDTO_Roo_JavaBean.aj  |  60 --
 .../dto/ProtocolValuePathDTO_Roo_Json.aj      |  24 -
 .../dto/ProtocolValuePathDTO_Roo_ToString.aj  |  16 -
 .../PurgeFileDependencyCheckResponseDTO.java  |  46 +-
 ...DependencyCheckResponseDTO_Roo_JavaBean.aj |  26 -
 ...FileDependencyCheckResponseDTO_Roo_Json.aj |  35 -
 ...DependencyCheckResponseDTO_Roo_ToString.aj |  16 -
 .../labseer/dto/PurgeFileResponseDTO.java     |  54 +-
 .../dto/PurgeFileResponseDTO_Roo_JavaBean.aj  |  34 -
 .../dto/PurgeFileResponseDTO_Roo_Json.aj      |  35 -
 .../dto/PurgeFileResponseDTO_Roo_ToString.aj  |  16 -
 .../labsynch/labseer/dto/RawCurveDataDTO.java | 207 +++-
 .../dto/RawCurveDataDTO_Roo_JavaBean.aj       | 179 ----
 .../labseer/dto/RawCurveDataDTO_Roo_Json.aj   |  45 -
 .../dto/RawCurveDataDTO_Roo_ToString.aj       |  16 -
 .../labsynch/labseer/dto/RegSearchDTO.java    |  55 +-
 .../labseer/dto/RegSearchDTO_Roo_JavaBean.aj  |  60 --
 .../labseer/dto/RegSearchDTO_Roo_ToString.aj  |  16 -
 .../labseer/dto/RegSearchParamsDTO.java       |  80 ++
 .../dto/RegSearchParamsDTO_Roo_JavaBean.aj    |  50 -
 .../dto/RegSearchParamsDTO_Roo_Json.aj        |  45 -
 .../dto/RegSearchParamsDTO_Roo_ToString.aj    |  16 -
 .../labseer/dto/RenderMolRequestDTO.java      |  80 ++
 .../dto/RenderMolRequestDTO_Roo_JavaBean.aj   |  50 -
 .../dto/RenderMolRequestDTO_Roo_Json.aj       |  45 -
 .../dto/RenderMolRequestDTO_Roo_ToString.aj   |  16 -
 .../labsynch/labseer/dto/ReparentLotDTO.java  |  64 ++
 .../dto/ReparentLotDTO_Roo_JavaBean.aj        |  34 -
 .../labseer/dto/ReparentLotDTO_Roo_Json.aj    |  45 -
 .../dto/ReparentLotDTO_Roo_ToString.aj        |  16 -
 .../labsynch/labseer/dto/RequestNameDTO.java  |  48 +
 .../dto/RequestNameDTO_Roo_JavaBean.aj        |  18 -
 .../labseer/dto/RequestNameDTO_Roo_Json.aj    |  45 -
 .../dto/RequestNameDTO_Roo_ToString.aj        |  16 -
 .../labsynch/labseer/dto/SELColOrderDTO.java  |  96 ++
 .../dto/SELColOrderDTO_Roo_JavaBean.aj        |  66 --
 .../labseer/dto/SELColOrderDTO_Roo_Json.aj    |  45 -
 .../dto/SELColOrderDTO_Roo_ToString.aj        |  16 -
 .../labseer/dto/SaltFormAliasDTO.java         |  80 ++
 .../dto/SaltFormAliasDTO_Roo_JavaBean.aj      |  50 -
 .../labseer/dto/SaltFormAliasDTO_Roo_Json.aj  |  45 -
 .../dto/SaltFormAliasDTO_Roo_ToString.aj      |  16 -
 .../com/labsynch/labseer/dto/SaltFormDTO.java |  45 +-
 .../labseer/dto/SaltFormDTO_Roo_JavaBean.aj   |  14 -
 .../labseer/dto/SaltFormDTO_Roo_Json.aj       |  45 -
 .../labseer/dto/SaltFormDTO_Roo_ToString.aj   |  16 -
 .../labseer/dto/SearchCdIdReturnDTO.java      |  72 ++
 .../dto/SearchCdIdReturnDTO_Roo_JavaBean.aj   |  42 -
 .../dto/SearchCdIdReturnDTO_Roo_Json.aj       |  45 -
 .../dto/SearchCdIdReturnDTO_Roo_ToString.aj   |  16 -
 .../labseer/dto/SearchCompoundReturnDTO.java  |  63 +-
 .../SearchCompoundReturnDTO_Roo_JavaBean.aj   |  69 --
 .../SearchCompoundReturnDTO_Roo_ToString.aj   |  16 -
 .../labsynch/labseer/dto/SearchFormDTO.java   | 199 +++-
 .../labseer/dto/SearchFormDTO_Roo_JavaBean.aj | 204 ----
 .../labseer/dto/SearchFormDTO_Roo_ToString.aj |  16 -
 .../labseer/dto/SearchFormReturnDTO.java      |  23 +-
 .../dto/SearchFormReturnDTO_Roo_JavaBean.aj   |  28 -
 .../dto/SearchFormReturnDTO_Roo_ToString.aj   |  16 -
 .../labsynch/labseer/dto/SearchLotDTO.java    |  55 +-
 .../labseer/dto/SearchLotDTO_Roo_JavaBean.aj  |  61 --
 .../labseer/dto/SearchLotDTO_Roo_ToString.aj  |  16 -
 .../dto/SearchResultExportRequestDTO.java     |  46 +-
 ...archResultExportRequestDTO_Roo_JavaBean.aj |  27 -
 .../SearchResultExportRequestDTO_Roo_Json.aj  |  35 -
 ...archResultExportRequestDTO_Roo_ToString.aj |  16 -
 .../labseer/dto/SetTubeLocationDTO.java       |  81 +-
 .../dto/SetTubeLocationDTO_Roo_JavaBean.aj    |  51 -
 .../dto/SetTubeLocationDTO_Roo_Json.aj        |  45 -
 .../dto/SetTubeLocationDTO_Roo_ToString.aj    |  16 -
 .../dto/SimpleBulkLoadPropertyDTO.java        |  70 +-
 .../SimpleBulkLoadPropertyDTO_Roo_JavaBean.aj |  50 -
 .../dto/SimpleBulkLoadPropertyDTO_Roo_Json.aj |  35 -
 .../SimpleBulkLoadPropertyDTO_Roo_ToString.aj |  16 -
 .../dto/StandardizationDryRunSearchDTO.java   | 153 ++-
 ...dardizationDryRunSearchDTO_Roo_JavaBean.aj | 124 ---
 ...StandardizationDryRunSearchDTO_Roo_Json.aj |  45 -
 ...dardizationDryRunSearchDTO_Roo_ToString.aj |  16 -
 .../labseer/dto/StateValueCsvDTO.java         | 281 +++++-
 .../dto/StateValueCsvDTO_Roo_JavaBean.aj      | 252 -----
 .../labseer/dto/StateValueCsvDTO_Roo_Json.aj  |  45 -
 .../dto/StateValueCsvDTO_Roo_ToString.aj      |  16 -
 .../labsynch/labseer/dto/StateValueDTO.java   |  56 +
 .../labseer/dto/StateValueDTO_Roo_JavaBean.aj |  26 -
 .../labseer/dto/StateValueDTO_Roo_Json.aj     |  45 -
 .../labseer/dto/StateValueDTO_Roo_ToString.aj |  16 -
 .../dto/StoichiometryPropertiesDTO.java       | 115 ++-
 ...StoichiometryPropertiesDTO_Roo_JavaBean.aj | 107 --
 .../StoichiometryPropertiesDTO_Roo_Json.aj    |  24 -
 ...StoichiometryPropertiesDTO_Roo_ToString.aj |  16 -
 .../StoichiometryPropertiesResultsDTO.java    |  52 +-
 ...ometryPropertiesResultsDTO_Roo_JavaBean.aj |  45 -
 ...ichiometryPropertiesResultsDTO_Roo_Json.aj |  24 -
 ...ometryPropertiesResultsDTO_Roo_ToString.aj |  16 -
 .../labseer/dto/StringCollectionDTO.java      |  56 +
 .../dto/StringCollectionDTO_Roo_JavaBean.aj   |  26 -
 .../dto/StringCollectionDTO_Roo_Json.aj       |  45 -
 .../dto/StringCollectionDTO_Roo_ToString.aj   |  16 -
 .../labsynch/labseer/dto/StrippedSaltDTO.java |  36 +-
 .../dto/StrippedSaltDTO_Roo_JavaBean.aj       |  30 -
 .../labseer/dto/StrippedSaltDTO_Roo_Json.aj   |  24 -
 .../dto/StrippedSaltDTO_Roo_ToString.aj       |  16 -
 .../dto/StructureAndThingSearchDTO.java       |  46 +
 ...StructureAndThingSearchDTO_Roo_JavaBean.aj |  51 -
 ...StructureAndThingSearchDTO_Roo_ToString.aj |  16 -
 .../labseer/dto/StructureSearchDTO.java       |  88 ++
 .../dto/StructureSearchDTO_Roo_JavaBean.aj    |  58 --
 .../dto/StructureSearchDTO_Roo_Json.aj        |  45 -
 .../dto/StructureSearchDTO_Roo_ToString.aj    |  16 -
 .../labsynch/labseer/dto/SubjectCodeDTO.java  |  36 +-
 .../dto/SubjectCodeDTO_Roo_JavaBean.aj        |  28 -
 .../labseer/dto/SubjectCodeDTO_Roo_Json.aj    |  24 -
 .../dto/SubjectCodeDTO_Roo_ToString.aj        |  16 -
 .../labseer/dto/SubjectCodeNameDTO.java       |  36 +-
 .../dto/SubjectCodeNameDTO_Roo_JavaBean.aj    |  27 -
 .../dto/SubjectCodeNameDTO_Roo_Json.aj        |  24 -
 .../dto/SubjectCodeNameDTO_Roo_ToString.aj    |  16 -
 .../labseer/dto/SubjectCodeStateDTO.java      |  56 +
 .../dto/SubjectCodeStateDTO_Roo_JavaBean.aj   |  27 -
 .../dto/SubjectCodeStateDTO_Roo_Json.aj       |  45 -
 .../dto/SubjectCodeStateDTO_Roo_ToString.aj   |  16 -
 .../labseer/dto/SubjectCsvDataDTO.java        |  56 +-
 .../dto/SubjectCsvDataDTO_Roo_JavaBean.aj     |  27 -
 .../labseer/dto/SubjectCsvDataDTO_Roo_Json.aj |  45 -
 .../dto/SubjectCsvDataDTO_Roo_ToString.aj     |  16 -
 .../com/labsynch/labseer/dto/SubjectDTO.java  | 127 ++-
 .../labseer/dto/SubjectDTO_Roo_JavaBean.aj    | 136 ---
 .../labseer/dto/SubjectDTO_Roo_ToString.aj    |  16 -
 .../labsynch/labseer/dto/SubjectLabelDTO.java | 153 ++-
 .../dto/SubjectLabelDTO_Roo_JavaBean.aj       | 124 ---
 .../labseer/dto/SubjectLabelDTO_Roo_Json.aj   |  45 -
 .../dto/SubjectLabelDTO_Roo_ToString.aj       |  16 -
 .../labsynch/labseer/dto/SubjectMiniDTO.java  |  64 ++
 .../dto/SubjectMiniDTO_Roo_JavaBean.aj        |  34 -
 .../labseer/dto/SubjectMiniDTO_Roo_Json.aj    |  45 -
 .../dto/SubjectMiniDTO_Roo_ToString.aj        |  16 -
 .../labseer/dto/SubjectSearchRequest.java     |  96 +-
 .../dto/SubjectSearchRequest_Roo_JavaBean.aj  |  68 --
 .../dto/SubjectSearchRequest_Roo_Json.aj      |  45 -
 .../dto/SubjectSearchRequest_Roo_ToString.aj  |  16 -
 .../labseer/dto/SubjectSearchResultDTO.java   |  54 +-
 .../SubjectSearchResultDTO_Roo_JavaBean.aj    |  36 -
 .../dto/SubjectSearchResultDTO_Roo_Json.aj    |  35 -
 .../SubjectSearchResultDTO_Roo_ToString.aj    |  16 -
 .../labsynch/labseer/dto/SubjectStateDTO.java | 145 ++-
 .../dto/SubjectStateDTO_Roo_JavaBean.aj       | 118 ---
 .../labseer/dto/SubjectStateDTO_Roo_Json.aj   |  45 -
 .../dto/SubjectStateDTO_Roo_ToString.aj       |  16 -
 .../labseer/dto/SubjectStateMiniDTO.java      |  48 +
 .../dto/SubjectStateMiniDTO_Roo_JavaBean.aj   |  18 -
 .../dto/SubjectStateMiniDTO_Roo_Json.aj       |  45 -
 .../dto/SubjectStateMiniDTO_Roo_ToString.aj   |  16 -
 .../labseer/dto/SubjectStatePathDTO.java      |  52 +-
 .../dto/SubjectStatePathDTO_Roo_JavaBean.aj   |  44 -
 .../dto/SubjectStatePathDTO_Roo_Json.aj       |  24 -
 .../dto/SubjectStatePathDTO_Roo_ToString.aj   |  16 -
 .../labseer/dto/SubjectStateValueDTO.java     |  56 +
 .../dto/SubjectStateValueDTO_Roo_JavaBean.aj  |  26 -
 .../dto/SubjectStateValueDTO_Roo_Json.aj      |  45 -
 .../dto/SubjectStateValueDTO_Roo_ToString.aj  |  16 -
 .../labsynch/labseer/dto/SubjectValueDTO.java | 353 ++++++-
 .../dto/SubjectValueDTO_Roo_JavaBean.aj       | 325 ------
 .../labseer/dto/SubjectValueDTO_Roo_Json.aj   |  45 -
 .../dto/SubjectValueDTO_Roo_ToString.aj       |  16 -
 .../labseer/dto/SubjectValuePathDTO.java      |  68 +-
 .../dto/SubjectValuePathDTO_Roo_JavaBean.aj   |  60 --
 .../dto/SubjectValuePathDTO_Roo_Json.aj       |  24 -
 .../dto/SubjectValuePathDTO_Roo_ToString.aj   |  16 -
 .../labsynch/labseer/dto/TempThingDTO.java    |  80 ++
 .../labseer/dto/TempThingDTO_Roo_JavaBean.aj  |  50 -
 .../labseer/dto/TempThingDTO_Roo_Json.aj      |  45 -
 .../labseer/dto/TempThingDTO_Roo_ToString.aj  |  16 -
 .../com/labsynch/labseer/dto/TgDataDTO.java   | 143 ++-
 .../labseer/dto/TgDataDTO_Roo_JavaBean.aj     | 115 ---
 .../labseer/dto/TgDataDTO_Roo_Json.aj         |  45 -
 .../labseer/dto/TgDataDTO_Roo_ToString.aj     |  16 -
 .../labseer/dto/TreatmentGroupCodeDTO.java    |  56 +-
 .../dto/TreatmentGroupCodeDTO_Roo_JavaBean.aj |  28 -
 .../dto/TreatmentGroupCodeDTO_Roo_Json.aj     |  45 -
 .../dto/TreatmentGroupCodeDTO_Roo_ToString.aj |  16 -
 .../labseer/dto/TreatmentGroupMiniDTO.java    |  64 ++
 .../dto/TreatmentGroupMiniDTO_Roo_JavaBean.aj |  34 -
 .../dto/TreatmentGroupMiniDTO_Roo_Json.aj     |  45 -
 .../dto/TreatmentGroupMiniDTO_Roo_ToString.aj |  16 -
 .../dto/TreatmentGroupStatePathDTO.java       |  52 +-
 ...TreatmentGroupStatePathDTO_Roo_JavaBean.aj |  44 -
 .../TreatmentGroupStatePathDTO_Roo_Json.aj    |  24 -
 ...TreatmentGroupStatePathDTO_Roo_ToString.aj |  16 -
 .../labseer/dto/TreatmentGroupValueDTO.java   | 353 ++++++-
 .../TreatmentGroupValueDTO_Roo_JavaBean.aj    | 325 ------
 .../dto/TreatmentGroupValueDTO_Roo_Json.aj    |  45 -
 .../TreatmentGroupValueDTO_Roo_ToString.aj    |  16 -
 .../dto/TreatmentGroupValuePathDTO.java       |  68 +-
 ...TreatmentGroupValuePathDTO_Roo_JavaBean.aj |  60 --
 .../TreatmentGroupValuePathDTO_Roo_Json.aj    |  24 -
 ...TreatmentGroupValuePathDTO_Roo_ToString.aj |  16 -
 .../labseer/dto/TsvLoaderResponseDTO.java     |  44 +-
 .../dto/TsvLoaderResponseDTO_Roo_JavaBean.aj  |  36 -
 .../dto/TsvLoaderResponseDTO_Roo_Json.aj      |  24 -
 .../dto/TsvLoaderResponseDTO_Roo_ToString.aj  |  16 -
 .../com/labsynch/labseer/dto/TypeDTO.java     |  47 +-
 .../labseer/dto/TypeDTO_Roo_JavaBean.aj       |  18 -
 .../labsynch/labseer/dto/TypeDTO_Roo_Json.aj  |  45 -
 .../labseer/dto/TypeDTO_Roo_ToString.aj       |  16 -
 .../com/labsynch/labseer/dto/TypeKindDTO.java |  55 +-
 .../labseer/dto/TypeKindDTO_Roo_JavaBean.aj   |  26 -
 .../labseer/dto/TypeKindDTO_Roo_Json.aj       |  45 -
 .../labseer/dto/TypeKindDTO_Roo_ToString.aj   |  16 -
 .../labseer/dto/ValidationResponseDTO.java    |  71 +-
 .../dto/ValidationResponseDTO_Roo_JavaBean.aj |  50 -
 .../dto/ValidationResponseDTO_Roo_Json.aj     |  35 -
 .../dto/ValidationResponseDTO_Roo_ToString.aj |  16 -
 .../labsynch/labseer/dto/ValuePathDTO.java    |  97 +-
 .../labseer/dto/ValuePathDTO_Roo_JavaBean.aj  |  66 --
 .../labseer/dto/ValuePathDTO_Roo_Json.aj      |  45 -
 .../labseer/dto/ValuePathDTO_Roo_ToString.aj  |  16 -
 .../labsynch/labseer/dto/ValueQueryDTO.java   |  88 ++
 .../labseer/dto/ValueQueryDTO_Roo_JavaBean.aj |  58 --
 .../labseer/dto/ValueQueryDTO_Roo_Json.aj     |  45 -
 .../labseer/dto/ValueQueryDTO_Roo_ToString.aj |  16 -
 .../labsynch/labseer/dto/ValueRuleDTO.java    |  65 +-
 .../labseer/dto/ValueRuleDTO_Roo_JavaBean.aj  |  36 -
 .../labseer/dto/ValueRuleDTO_Roo_Json.aj      |  45 -
 .../labseer/dto/ValueRuleDTO_Roo_ToString.aj  |  16 -
 .../labseer/dto/ValueTypeKindDTO.java         |  72 ++
 .../dto/ValueTypeKindDTO_Roo_JavaBean.aj      |  43 -
 .../labseer/dto/ValueTypeKindDTO_Roo_Json.aj  |  45 -
 .../dto/ValueTypeKindDTO_Roo_ToString.aj      |  16 -
 .../labsynch/labseer/dto/WellContentDTO.java  | 168 ++-
 .../dto/WellContentDTO_Roo_JavaBean.aj        | 140 ---
 .../labseer/dto/WellContentDTO_Roo_Json.aj    |  45 -
 .../dto/WellContentDTO_Roo_ToString.aj        |  16 -
 .../com/labsynch/labseer/dto/WellStubDTO.java |  71 +-
 .../labseer/dto/WellStubDTO_Roo_JavaBean.aj   |  42 -
 .../labseer/dto/WellStubDTO_Roo_Json.aj       |  45 -
 .../labseer/dto/WellStubDTO_Roo_ToString.aj   |  16 -
 .../StandardizerSettingsConfigDTO.java        |  64 ++
 ...ndardizerSettingsConfigDTO_Roo_JavaBean.aj |  34 -
 .../StandardizerSettingsConfigDTO_Roo_Json.aj |  45 -
 ...ndardizerSettingsConfigDTO_Roo_ToString.aj |  16 -
 .../labseer/exceptions/ErrorMessage.java      |  57 +-
 .../exceptions/ErrorMessage_Roo_JavaBean.aj   |  26 -
 .../exceptions/ErrorMessage_Roo_Json.aj       |  45 -
 .../exceptions/ErrorMessage_Roo_ToString.aj   |  16 -
 .../LsThingValidationErrorMessage.java        |  73 +-
 ...hingValidationErrorMessage_Roo_JavaBean.aj |  42 -
 .../LsThingValidationErrorMessage_Roo_Json.aj |  45 -
 ...hingValidationErrorMessage_Roo_ToString.aj |  16 -
 .../labsynch/labseer/service/ErrorList.java   |  15 +-
 .../labseer/service/ErrorList_Roo_JavaBean.aj |  20 -
 .../labseer/service/ErrorList_Roo_ToString.aj |  16 -
 .../labseer/service/ErrorMessage.java         |  57 +-
 .../service/ErrorMessage_Roo_JavaBean.aj      |  26 -
 .../labseer/service/ErrorMessage_Roo_Json.aj  |  45 -
 .../service/ErrorMessage_Roo_ToString.aj      |  16 -
 .../labsynch/labseer/service/SaltLoader.java  | 197 +++-
 .../service/SaltLoader_Roo_Configurable.aj    |  13 -
 .../service/SaltLoader_Roo_JavaBean.aj        |  76 --
 .../SaltLoader_Roo_Jpa_ActiveRecord.aj        | 101 --
 .../service/SaltLoader_Roo_Jpa_Entity.aj      |  43 -
 .../service/SaltLoader_Roo_ToString.aj        |  16 -
 ...plicationConversionServiceFactoryBean.java | 915 +++++++++++++++--
 ...erviceFactoryBean_Roo_ConversionService.aj | 853 ----------------
 .../domain/AnalysisGroupDataOnDemand.java     | 160 +++
 ...lysisGroupDataOnDemand_Roo_Configurable.aj |  13 -
 ...lysisGroupDataOnDemand_Roo_DataOnDemand.aj | 170 ----
 .../domain/AnalysisGroupIntegrationTest.java  | 119 +++
 ...isGroupIntegrationTest_Roo_Configurable.aj |  13 -
 ...roupIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../AnalysisGroupLabelDataOnDemand.java       | 182 ++++
 ...GroupLabelDataOnDemand_Roo_Configurable.aj |  13 -
 ...GroupLabelDataOnDemand_Roo_DataOnDemand.aj | 194 ----
 .../AnalysisGroupLabelIntegrationTest.java    | 119 +++
 ...upLabelIntegrationTest_Roo_Configurable.aj |  13 -
 ...abelIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../AnalysisGroupStateDataOnDemand.java       | 170 ++++
 ...GroupStateDataOnDemand_Roo_Configurable.aj |  13 -
 ...GroupStateDataOnDemand_Roo_DataOnDemand.aj | 182 ----
 .../AnalysisGroupStateIntegrationTest.java    | 119 +++
 ...upStateIntegrationTest_Roo_Configurable.aj |  13 -
 ...tateIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../AnalysisGroupValueDataOnDemand.java       | 375 +++++++
 ...GroupValueDataOnDemand_Roo_Configurable.aj |  13 -
 ...GroupValueDataOnDemand_Roo_DataOnDemand.aj | 387 -------
 .../AnalysisGroupValueIntegrationTest.java    | 119 +++
 ...upValueIntegrationTest_Roo_Configurable.aj |  13 -
 ...alueIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../labseer/domain/AuthorDataOnDemand.java    | 229 +++++
 .../AuthorDataOnDemand_Roo_Configurable.aj    |  13 -
 .../AuthorDataOnDemand_Roo_DataOnDemand.aj    | 239 -----
 .../labseer/domain/AuthorIntegrationTest.java | 119 +++
 .../AuthorIntegrationTest_Roo_Configurable.aj |  13 -
 ...thorIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../labsynch/labseer/domain/AuthorTest.java   | 119 +++
 .../domain/AuthorTest_Roo_Configurable.aj     |  13 -
 .../domain/AuthorTest_Roo_IntegrationTest.aj  | 133 ---
 .../labseer/domain/ContainerDataOnDemand.java | 178 ++++
 .../ContainerDataOnDemand_Roo_Configurable.aj |  13 -
 .../ContainerDataOnDemand_Roo_DataOnDemand.aj | 188 ----
 .../domain/ContainerIntegrationTest.java      | 119 +++
 ...ntainerIntegrationTest_Roo_Configurable.aj |  13 -
 ...inerIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../domain/ContainerKindDataOnDemand.java     | 101 ++
 ...tainerKindDataOnDemand_Roo_Configurable.aj |  13 -
 ...tainerKindDataOnDemand_Roo_DataOnDemand.aj | 113 ---
 .../domain/ContainerKindIntegrationTest.java  | 119 +++
 ...nerKindIntegrationTest_Roo_Configurable.aj |  13 -
 ...KindIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../domain/ContainerLabelDataOnDemand.java    | 182 ++++
 ...ainerLabelDataOnDemand_Roo_Configurable.aj |  13 -
 ...ainerLabelDataOnDemand_Roo_DataOnDemand.aj | 194 ----
 .../domain/ContainerLabelIntegrationTest.java | 119 +++
 ...erLabelIntegrationTest_Roo_Configurable.aj |  13 -
 ...abelIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../domain/ContainerStateDataOnDemand.java    | 170 ++++
 ...ainerStateDataOnDemand_Roo_Configurable.aj |  13 -
 ...ainerStateDataOnDemand_Roo_DataOnDemand.aj | 182 ----
 .../domain/ContainerStateIntegrationTest.java | 119 +++
 ...erStateIntegrationTest_Roo_Configurable.aj |  13 -
 ...tateIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../domain/ContainerTypeDataOnDemand.java     |  82 ++
 ...tainerTypeDataOnDemand_Roo_Configurable.aj |  13 -
 ...tainerTypeDataOnDemand_Roo_DataOnDemand.aj |  92 --
 .../domain/ContainerTypeIntegrationTest.java  | 119 +++
 ...nerTypeIntegrationTest_Roo_Configurable.aj |  13 -
 ...TypeIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../domain/ContainerValueDataOnDemand.java    | 375 +++++++
 ...ainerValueDataOnDemand_Roo_Configurable.aj |  13 -
 ...ainerValueDataOnDemand_Roo_DataOnDemand.aj | 387 -------
 .../domain/ContainerValueIntegrationTest.java | 119 +++
 ...erValueIntegrationTest_Roo_Configurable.aj |  13 -
 ...alueIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../domain/ExperimentDataOnDemand.java        | 179 ++++
 ...ExperimentDataOnDemand_Roo_Configurable.aj |  13 -
 ...ExperimentDataOnDemand_Roo_DataOnDemand.aj | 191 ----
 .../domain/ExperimentIntegrationTest.java     | 119 +++
 ...erimentIntegrationTest_Roo_Configurable.aj |  13 -
 ...mentIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../domain/ExperimentKindDataOnDemand.java    | 101 ++
 ...rimentKindDataOnDemand_Roo_Configurable.aj |  13 -
 ...rimentKindDataOnDemand_Roo_DataOnDemand.aj | 113 ---
 .../domain/ExperimentKindIntegrationTest.java | 119 +++
 ...entKindIntegrationTest_Roo_Configurable.aj |  13 -
 ...KindIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../domain/ExperimentLabelDataOnDemand.java   | 182 ++++
 ...imentLabelDataOnDemand_Roo_Configurable.aj |  13 -
 ...imentLabelDataOnDemand_Roo_DataOnDemand.aj | 194 ----
 .../ExperimentLabelIntegrationTest.java       | 119 +++
 ...ntLabelIntegrationTest_Roo_Configurable.aj |  13 -
 ...abelIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../domain/ExperimentStateDataOnDemand.java   | 170 ++++
 ...imentStateDataOnDemand_Roo_Configurable.aj |  13 -
 ...imentStateDataOnDemand_Roo_DataOnDemand.aj | 182 ----
 .../ExperimentStateIntegrationTest.java       | 119 +++
 ...ntStateIntegrationTest_Roo_Configurable.aj |  13 -
 ...tateIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../domain/ExperimentTypeDataOnDemand.java    |  82 ++
 ...rimentTypeDataOnDemand_Roo_Configurable.aj |  13 -
 ...rimentTypeDataOnDemand_Roo_DataOnDemand.aj |  92 --
 .../domain/ExperimentTypeIntegrationTest.java | 119 +++
 ...entTypeIntegrationTest_Roo_Configurable.aj |  13 -
 ...TypeIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../domain/ExperimentValueDataOnDemand.java   | 375 +++++++
 ...imentValueDataOnDemand_Roo_Configurable.aj |  13 -
 ...imentValueDataOnDemand_Roo_DataOnDemand.aj | 387 -------
 .../ExperimentValueIntegrationTest.java       | 119 +++
 ...ntValueIntegrationTest_Roo_Configurable.aj |  13 -
 ...alueIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../domain/InteractionKindDataOnDemand.java   | 101 ++
 ...actionKindDataOnDemand_Roo_Configurable.aj |  13 -
 ...actionKindDataOnDemand_Roo_DataOnDemand.aj | 113 ---
 .../InteractionKindIntegrationTest.java       | 119 +++
 ...ionKindIntegrationTest_Roo_Configurable.aj |  13 -
 ...KindIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../domain/InteractionTypeDataOnDemand.java   |  91 ++
 ...actionTypeDataOnDemand_Roo_Configurable.aj |  13 -
 ...actionTypeDataOnDemand_Roo_DataOnDemand.aj | 101 --
 .../InteractionTypeIntegrationTest.java       | 119 +++
 ...ionTypeIntegrationTest_Roo_Configurable.aj |  13 -
 ...TypeIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../ItxContainerContainerDataOnDemand.java    | 176 ++++
 ...rContainerDataOnDemand_Roo_Configurable.aj |  13 -
 ...rContainerDataOnDemand_Roo_DataOnDemand.aj | 188 ----
 .../ItxContainerContainerIntegrationTest.java | 119 +++
 ...ntainerIntegrationTest_Roo_Configurable.aj |  13 -
 ...inerIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 ...txContainerContainerStateDataOnDemand.java | 164 +++
 ...ainerStateDataOnDemand_Roo_Configurable.aj |  13 -
 ...ainerStateDataOnDemand_Roo_DataOnDemand.aj | 175 ----
 ...ontainerContainerStateIntegrationTest.java | 119 +++
 ...erStateIntegrationTest_Roo_Configurable.aj |  13 -
 ...tateIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 ...txContainerContainerValueDataOnDemand.java | 369 +++++++
 ...ainerValueDataOnDemand_Roo_Configurable.aj |  13 -
 ...ainerValueDataOnDemand_Roo_DataOnDemand.aj | 380 -------
 ...ontainerContainerValueIntegrationTest.java | 119 +++
 ...erValueIntegrationTest_Roo_Configurable.aj |  13 -
 ...alueIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../ItxSubjectContainerDataOnDemand.java      | 179 ++++
 ...tContainerDataOnDemand_Roo_Configurable.aj |  13 -
 ...tContainerDataOnDemand_Roo_DataOnDemand.aj | 193 ----
 .../ItxSubjectContainerIntegrationTest.java   | 119 +++
 ...ntainerIntegrationTest_Roo_Configurable.aj |  13 -
 ...inerIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../ItxSubjectContainerStateDataOnDemand.java | 164 +++
 ...ainerStateDataOnDemand_Roo_Configurable.aj |  13 -
 ...ainerStateDataOnDemand_Roo_DataOnDemand.aj | 175 ----
 ...xSubjectContainerStateIntegrationTest.java | 119 +++
 ...erStateIntegrationTest_Roo_Configurable.aj |  13 -
 ...tateIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../ItxSubjectContainerValueDataOnDemand.java | 369 +++++++
 ...ainerValueDataOnDemand_Roo_Configurable.aj |  13 -
 ...ainerValueDataOnDemand_Roo_DataOnDemand.aj | 380 -------
 ...xSubjectContainerValueIntegrationTest.java | 119 +++
 ...erValueIntegrationTest_Roo_Configurable.aj |  13 -
 ...alueIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../labseer/domain/LabelKindDataOnDemand.java |  95 ++
 .../LabelKindDataOnDemand_Roo_Configurable.aj |  13 -
 .../LabelKindDataOnDemand_Roo_DataOnDemand.aj | 106 --
 .../domain/LabelKindIntegrationTest.java      | 119 +++
 ...belKindIntegrationTest_Roo_Configurable.aj |  13 -
 ...KindIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../domain/LabelSequenceDataOnDemand.java     | 148 +++
 ...elSequenceDataOnDemand_Roo_Configurable.aj |  13 -
 ...elSequenceDataOnDemand_Roo_DataOnDemand.aj | 158 ---
 .../domain/LabelSequenceIntegrationTest.java  | 119 +++
 ...equenceIntegrationTest_Roo_Configurable.aj |  13 -
 ...enceIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../labseer/domain/LabelTypeDataOnDemand.java |  82 ++
 .../LabelTypeDataOnDemand_Roo_Configurable.aj |  13 -
 .../LabelTypeDataOnDemand_Roo_DataOnDemand.aj |  92 --
 .../domain/LabelTypeIntegrationTest.java      | 119 +++
 ...belTypeIntegrationTest_Roo_Configurable.aj |  13 -
 ...TypeIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../domain/LsInteractionDataOnDemand.java     | 172 ++++
 ...nteractionDataOnDemand_Roo_Configurable.aj |  13 -
 ...nteractionDataOnDemand_Roo_DataOnDemand.aj | 182 ----
 .../domain/LsInteractionIntegrationTest.java  | 119 +++
 ...ractionIntegrationTest_Roo_Configurable.aj |  13 -
 ...tionIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../domain/LsTransactionDataOnDemand.java     | 112 ++
 ...ransactionDataOnDemand_Roo_Configurable.aj |  13 -
 ...ransactionDataOnDemand_Roo_DataOnDemand.aj | 124 ---
 .../domain/LsTransactionIntegrationTest.java  | 119 +++
 ...sactionIntegrationTest_Roo_Configurable.aj |  13 -
 ...tionIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../domain/OperatorTypeDataOnDemand.java      |  82 ++
 ...eratorTypeDataOnDemand_Roo_Configurable.aj |  13 -
 ...eratorTypeDataOnDemand_Roo_DataOnDemand.aj |  92 --
 .../domain/OperatorTypeIntegrationTest.java   | 119 +++
 ...torTypeIntegrationTest_Roo_Configurable.aj |  13 -
 ...TypeIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../labseer/domain/ProtocolDataOnDemand.java  | 169 ++++
 .../ProtocolDataOnDemand_Roo_Configurable.aj  |  13 -
 .../ProtocolDataOnDemand_Roo_DataOnDemand.aj  | 179 ----
 .../domain/ProtocolIntegrationTest.java       | 119 +++
 ...rotocolIntegrationTest_Roo_Configurable.aj |  13 -
 ...ocolIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../domain/ProtocolKindDataOnDemand.java      | 101 ++
 ...otocolKindDataOnDemand_Roo_Configurable.aj |  13 -
 ...otocolKindDataOnDemand_Roo_DataOnDemand.aj | 113 ---
 .../domain/ProtocolKindIntegrationTest.java   | 119 +++
 ...colKindIntegrationTest_Roo_Configurable.aj |  13 -
 ...KindIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../domain/ProtocolLabelDataOnDemand.java     | 182 ++++
 ...tocolLabelDataOnDemand_Roo_Configurable.aj |  13 -
 ...tocolLabelDataOnDemand_Roo_DataOnDemand.aj | 194 ----
 .../domain/ProtocolLabelIntegrationTest.java  | 119 +++
 ...olLabelIntegrationTest_Roo_Configurable.aj |  13 -
 ...abelIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../domain/ProtocolStateDataOnDemand.java     | 170 ++++
 ...tocolStateDataOnDemand_Roo_Configurable.aj |  13 -
 ...tocolStateDataOnDemand_Roo_DataOnDemand.aj | 182 ----
 .../domain/ProtocolStateIntegrationTest.java  | 119 +++
 ...olStateIntegrationTest_Roo_Configurable.aj |  13 -
 ...tateIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../domain/ProtocolTypeDataOnDemand.java      |  82 ++
 ...otocolTypeDataOnDemand_Roo_Configurable.aj |  13 -
 ...otocolTypeDataOnDemand_Roo_DataOnDemand.aj |  92 --
 .../domain/ProtocolTypeIntegrationTest.java   | 119 +++
 ...colTypeIntegrationTest_Roo_Configurable.aj |  13 -
 ...TypeIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../domain/ProtocolValueDataOnDemand.java     | 375 +++++++
 ...tocolValueDataOnDemand_Roo_Configurable.aj |  13 -
 ...tocolValueDataOnDemand_Roo_DataOnDemand.aj | 387 -------
 .../domain/ProtocolValueIntegrationTest.java  | 119 +++
 ...olValueIntegrationTest_Roo_Configurable.aj |  13 -
 ...alueIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../labseer/domain/StateKindDataOnDemand.java | 101 ++
 .../StateKindDataOnDemand_Roo_Configurable.aj |  13 -
 .../StateKindDataOnDemand_Roo_DataOnDemand.aj | 113 ---
 .../domain/StateKindIntegrationTest.java      | 119 +++
 ...ateKindIntegrationTest_Roo_Configurable.aj |  13 -
 ...KindIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../labseer/domain/StateTypeDataOnDemand.java |  82 ++
 .../StateTypeDataOnDemand_Roo_Configurable.aj |  13 -
 .../StateTypeDataOnDemand_Roo_DataOnDemand.aj |  92 --
 .../domain/StateTypeIntegrationTest.java      | 119 +++
 ...ateTypeIntegrationTest_Roo_Configurable.aj |  13 -
 ...TypeIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../labseer/domain/SubjectDataOnDemand.java   | 160 +++
 .../SubjectDataOnDemand_Roo_Configurable.aj   |  13 -
 .../SubjectDataOnDemand_Roo_DataOnDemand.aj   | 170 ----
 .../domain/SubjectIntegrationTest.java        | 119 +++
 ...SubjectIntegrationTest_Roo_Configurable.aj |  13 -
 ...jectIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../domain/SubjectStateDataOnDemand.java      | 170 ++++
 ...bjectStateDataOnDemand_Roo_Configurable.aj |  13 -
 ...bjectStateDataOnDemand_Roo_DataOnDemand.aj | 182 ----
 .../domain/SubjectStateIntegrationTest.java   | 119 +++
 ...ctStateIntegrationTest_Roo_Configurable.aj |  13 -
 ...tateIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../domain/SubjectValueDataOnDemand.java      | 375 +++++++
 ...bjectValueDataOnDemand_Roo_Configurable.aj |  13 -
 ...bjectValueDataOnDemand_Roo_DataOnDemand.aj | 387 -------
 .../domain/SubjectValueIntegrationTest.java   | 119 +++
 ...ctValueIntegrationTest_Roo_Configurable.aj |  13 -
 ...alueIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../labseer/domain/ThingKindDataOnDemand.java | 101 ++
 .../ThingKindDataOnDemand_Roo_Configurable.aj |  13 -
 .../ThingKindDataOnDemand_Roo_DataOnDemand.aj | 113 ---
 .../domain/ThingKindIntegrationTest.java      | 119 +++
 ...ingKindIntegrationTest_Roo_Configurable.aj |  13 -
 ...KindIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../domain/ThingPageArchiveDataOnDemand.java  | 160 +++
 ...ageArchiveDataOnDemand_Roo_Configurable.aj |  13 -
 ...ageArchiveDataOnDemand_Roo_DataOnDemand.aj | 170 ----
 .../ThingPageArchiveIntegrationTest.java      | 119 +++
 ...ArchiveIntegrationTest_Roo_Configurable.aj |  13 -
 ...hiveIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../labseer/domain/ThingPageDataOnDemand.java | 152 +++
 .../ThingPageDataOnDemand_Roo_Configurable.aj |  13 -
 .../ThingPageDataOnDemand_Roo_DataOnDemand.aj | 164 ---
 .../domain/ThingPageIntegrationTest.java      | 119 +++
 ...ingPageIntegrationTest_Roo_Configurable.aj |  13 -
 ...PageIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../labseer/domain/ThingTypeDataOnDemand.java |  82 ++
 .../ThingTypeDataOnDemand_Roo_Configurable.aj |  13 -
 .../ThingTypeDataOnDemand_Roo_DataOnDemand.aj |  92 --
 .../domain/ThingTypeIntegrationTest.java      | 119 +++
 ...ingTypeIntegrationTest_Roo_Configurable.aj |  13 -
 ...TypeIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../domain/TreatmentGroupDataOnDemand.java    | 160 +++
 ...tmentGroupDataOnDemand_Roo_Configurable.aj |  13 -
 ...tmentGroupDataOnDemand_Roo_DataOnDemand.aj | 170 ----
 .../domain/TreatmentGroupIntegrationTest.java | 119 +++
 ...ntGroupIntegrationTest_Roo_Configurable.aj |  13 -
 ...roupIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../TreatmentGroupStateDataOnDemand.java      | 170 ++++
 ...GroupStateDataOnDemand_Roo_Configurable.aj |  13 -
 ...GroupStateDataOnDemand_Roo_DataOnDemand.aj | 182 ----
 .../TreatmentGroupStateIntegrationTest.java   | 119 +++
 ...upStateIntegrationTest_Roo_Configurable.aj |  13 -
 ...tateIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../TreatmentGroupValueDataOnDemand.java      | 375 +++++++
 ...GroupValueDataOnDemand_Roo_Configurable.aj |  13 -
 ...GroupValueDataOnDemand_Roo_DataOnDemand.aj | 387 -------
 .../TreatmentGroupValueIntegrationTest.java   | 119 +++
 ...upValueIntegrationTest_Roo_Configurable.aj |  13 -
 ...alueIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../labseer/domain/UnitKindDataOnDemand.java  | 101 ++
 .../UnitKindDataOnDemand_Roo_Configurable.aj  |  13 -
 .../UnitKindDataOnDemand_Roo_DataOnDemand.aj  | 113 ---
 .../domain/UnitKindIntegrationTest.java       | 119 +++
 ...nitKindIntegrationTest_Roo_Configurable.aj |  13 -
 ...KindIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../labseer/domain/UnitTypeDataOnDemand.java  |  82 ++
 .../UnitTypeDataOnDemand_Roo_Configurable.aj  |  13 -
 .../UnitTypeDataOnDemand_Roo_DataOnDemand.aj  |  92 --
 .../domain/UnitTypeIntegrationTest.java       | 119 +++
 ...nitTypeIntegrationTest_Roo_Configurable.aj |  13 -
 ...TypeIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../labseer/domain/UpdateLogDataOnDemand.java | 121 +++
 .../UpdateLogDataOnDemand_Roo_Configurable.aj |  13 -
 .../UpdateLogDataOnDemand_Roo_DataOnDemand.aj | 131 ---
 .../domain/UpdateLogIntegrationTest.java      | 119 +++
 ...dateLogIntegrationTest_Roo_Configurable.aj |  13 -
 ...eLogIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../labseer/domain/ValueKindDataOnDemand.java | 101 ++
 .../ValueKindDataOnDemand_Roo_Configurable.aj |  13 -
 .../ValueKindDataOnDemand_Roo_DataOnDemand.aj | 113 ---
 .../domain/ValueKindIntegrationTest.java      | 119 +++
 ...lueKindIntegrationTest_Roo_Configurable.aj |  13 -
 ...KindIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 .../labseer/domain/ValueTypeDataOnDemand.java |  82 ++
 .../ValueTypeDataOnDemand_Roo_Configurable.aj |  13 -
 .../ValueTypeDataOnDemand_Roo_DataOnDemand.aj |  92 --
 .../domain/ValueTypeIntegrationTest.java      | 119 +++
 ...lueTypeIntegrationTest_Roo_Configurable.aj |  13 -
 ...TypeIntegrationTest_Roo_IntegrationTest.aj | 133 ---
 2158 files changed, 66707 insertions(+), 86457 deletions(-)
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AbstractLabel_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AbstractLabel_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AbstractLabel_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AbstractLabel_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AbstractLabel_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AbstractState_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AbstractState_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AbstractState_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AbstractState_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AbstractState_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AbstractThing_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AbstractThing_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AbstractThing_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AbstractThing_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AbstractThing_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AbstractValue_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AbstractValue_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AbstractValue_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AbstractValue_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AbstractValue_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AnalysisGroupState_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AnalysisGroupState_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AnalysisGroupState_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AnalysisGroupState_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AnalysisGroupState_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AnalysisGroupState_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AnalysisGroup_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AnalysisGroup_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AnalysisGroup_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AnalysisGroup_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AnalysisGroup_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AnalysisGroup_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ApplicationSetting_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ApplicationSetting_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ApplicationSetting_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ApplicationSetting_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ApplicationSetting_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ApplicationSetting_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ApplicationSetting_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/AuthorLabel_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/AuthorLabel_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/AuthorLabel_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/AuthorLabel_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/AuthorLabel_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/AuthorLabel_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/AuthorLabel_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AuthorRole_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AuthorRole_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AuthorRole_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/AuthorRole_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/AuthorRole_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/AuthorState_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/AuthorState_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/AuthorState_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/AuthorState_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/AuthorState_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/AuthorState_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/AuthorValue_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/AuthorValue_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/AuthorValue_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/AuthorValue_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/AuthorValue_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/AuthorValue_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/AuthorValue_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/Author_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Author_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/Author_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Author_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Author_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/BulkLoadFile_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/BulkLoadFile_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/BulkLoadFile_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/BulkLoadFile_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/BulkLoadFile_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/BulkLoadFile_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/BulkLoadFile_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ChemStructure_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ChemStructure_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ChemStructure_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ChemStructure_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ChemStructure_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ChemStructure_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ChemStructure_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/CodeKind_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/CodeKind_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/CodeKind_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CodeKind_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/CodeKind_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/CodeKind_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CodeOrigin_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CodeOrigin_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CodeOrigin_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CodeOrigin_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CodeOrigin_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CodeOrigin_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CodeOrigin_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/CodeType_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/CodeType_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/CodeType_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/CodeType_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/CodeType_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/CodeType_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CompoundType_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CompoundType_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CompoundType_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CompoundType_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CompoundType_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CompoundType_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CompoundType_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Compound_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Compound_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Compound_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Compound_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Compound_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Compound_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Compound_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerKind_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ContainerKind_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerKind_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerKind_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerKind_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerKind_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerKind_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerLabel_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerLabel_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerLabel_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerLabel_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerLabel_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerLabel_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerState_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerState_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerState_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerState_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerState_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerState_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerType_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerType_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerType_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerType_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerType_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerType_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerType_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerValue_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerValue_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerValue_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ContainerValue_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerValue_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ContainerValue_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/Container_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Container_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/Container_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Container_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/Container_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/Container_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CorpName_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CorpName_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CorpName_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CorpName_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CorpName_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CorpName_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CronJob_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CronJob_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CronJob_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CronJob_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CronJob_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CronJob_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/CronJob_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/DDictKind_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/DDictKind_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/DDictKind_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/DDictKind_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/DDictKind_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/DDictKind_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/DDictType_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/DDictType_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/DDictType_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/DDictType_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/DDictType_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/DDictType_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/DDictType_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/DDictValue_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/DDictValue_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/DDictValue_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/DDictValue_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/DDictValue_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/DryRunCompound_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/DryRunCompound_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/DryRunCompound_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/DryRunCompound_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/DryRunCompound_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/DryRunCompound_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/DryRunCompound_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ExperimentKind_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ExperimentKind_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ExperimentKind_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ExperimentKind_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ExperimentKind_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ExperimentKind_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ExperimentKind_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ExperimentLabel_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ExperimentLabel_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ExperimentLabel_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ExperimentLabel_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ExperimentLabel_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ExperimentLabel_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ExperimentState_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ExperimentState_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ExperimentState_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ExperimentState_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ExperimentState_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ExperimentType_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ExperimentType_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ExperimentType_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ExperimentType_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ExperimentType_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ExperimentType_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ExperimentType_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ExperimentValue_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ExperimentValue_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ExperimentValue_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ExperimentValue_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ExperimentValue_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ExperimentValue_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ExperimentValue_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/Experiment_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Experiment_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/Experiment_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Experiment_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/Experiment_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/Experiment_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/FileList_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/FileList_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/FileList_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/FileList_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/FileList_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/FileList_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/FileList_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/FileThing_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/FileThing_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/FileThing_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/FileThing_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/FileThing_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/FileThing_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/FileType_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/FileType_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/FileType_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/FileType_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/FileType_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/FileType_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/FileType_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/InteractionKind_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/InteractionKind_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/InteractionKind_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/InteractionKind_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/InteractionKind_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/InteractionKind_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/InteractionKind_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/InteractionType_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/InteractionType_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/InteractionType_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/InteractionType_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/InteractionType_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/InteractionType_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/InteractionType_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/IsoSalt_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/IsoSalt_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/IsoSalt_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/IsoSalt_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/IsoSalt_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/IsoSalt_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Isotope_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Isotope_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Isotope_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Isotope_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Isotope_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Isotope_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Isotope_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxContainerContainer_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxContainerContainer_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxContainerContainer_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxContainerContainer_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxContainerContainer_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxContainerContainer_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LabelKind_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LabelKind_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LabelKind_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LabelKind_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LabelKind_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LabelKind_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LabelSequenceRole_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LabelSequenceRole_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LabelSequenceRole_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LabelSequenceRole_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LabelSequenceRole_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LabelSequenceRole_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LabelSequence_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LabelSequence_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LabelSequence_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LabelSequence_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LabelSequence_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LabelSequence_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LabelSequence_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LabelType_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LabelType_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LabelType_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LabelType_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LabelType_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LabelType_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LotAliasKind_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LotAliasKind_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LotAliasKind_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LotAliasKind_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LotAliasKind_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LotAliasKind_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LotAliasType_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LotAliasType_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LotAliasType_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LotAliasType_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LotAliasType_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LotAliasType_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LotAlias_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LotAlias_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LotAlias_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LotAlias_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LotAlias_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LotAlias_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LotAlias_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Lot_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Lot_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Lot_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Lot_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Lot_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Lot_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Lot_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsInteraction_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsInteraction_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsInteraction_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsInteraction_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsInteraction_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsInteraction_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsRole_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsRole_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsRole_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsRole_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsRole_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsRole_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqAnlGrp_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqAnlGrp_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqAnlGrp_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqContainer_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqContainer_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqContainer_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqExpt_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqExpt_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqExpt_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqItxCntrCntr_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqItxCntrCntr_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqItxCntrCntr_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqItxExperimentExperiment_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqItxExperimentExperiment_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqItxExperimentExperiment_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqItxLsThingLsThing_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqItxLsThingLsThing_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqItxLsThingLsThing_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqItxProtocolProtocol_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqItxProtocolProtocol_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqItxProtocolProtocol_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqItxSubjCntr_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqItxSubjCntr_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqItxSubjCntr_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqProtocol_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqProtocol_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqProtocol_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqSubject_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqSubject_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqSubject_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqTrtGrp_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqTrtGrp_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/LsSeqTrtGrp_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsTag_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsTag_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsTag_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsTag_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsTag_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsTag_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsThingLabel_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsThingLabel_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsThingLabel_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsThingLabel_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsThingLabel_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsThingLabel_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsThingState_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsThingState_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsThingState_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsThingState_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsThingState_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsThingState_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsThingValue_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsThingValue_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsThingValue_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsThingValue_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsThingValue_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsThingValue_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsThingValue_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsThing_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsThing_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsThing_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsThing_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsThing_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsThing_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsThing_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsTransaction_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsTransaction_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsTransaction_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsTransaction_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsTransaction_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/LsTransaction_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/OperatorKind_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/OperatorKind_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/OperatorKind_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/OperatorKind_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/OperatorKind_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/OperatorKind_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/OperatorType_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/OperatorType_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/OperatorType_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/OperatorType_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/OperatorType_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/OperatorType_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Operator_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Operator_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Operator_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Operator_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Operator_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Operator_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Operator_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ParentAliasKind_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ParentAliasKind_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ParentAliasKind_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ParentAliasKind_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ParentAliasKind_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ParentAliasKind_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ParentAliasType_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ParentAliasType_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ParentAliasType_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ParentAliasType_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ParentAliasType_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ParentAliasType_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ParentAlias_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ParentAlias_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ParentAlias_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ParentAlias_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ParentAlias_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ParentAlias_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ParentAlias_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ParentAnnotation_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ParentAnnotation_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ParentAnnotation_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ParentAnnotation_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ParentAnnotation_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ParentAnnotation_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ParentAnnotation_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Parent_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Parent_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Parent_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Parent_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Parent_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Parent_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Parent_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/PhysicalState_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/PhysicalState_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/PhysicalState_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/PhysicalState_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/PhysicalState_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/PhysicalState_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/PhysicalState_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/PreDef_CorpName_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/PreDef_CorpName_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/PreDef_CorpName_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/PreDef_CorpName_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/PreDef_CorpName_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/PreDef_CorpName_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ProtocolKind_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ProtocolKind_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ProtocolKind_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ProtocolKind_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ProtocolKind_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ProtocolKind_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ProtocolLabel_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ProtocolLabel_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ProtocolLabel_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ProtocolLabel_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ProtocolLabel_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ProtocolLabel_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ProtocolState_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ProtocolState_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ProtocolState_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ProtocolState_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ProtocolState_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ProtocolType_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ProtocolType_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ProtocolType_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ProtocolType_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ProtocolType_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ProtocolType_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ProtocolValue_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ProtocolValue_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ProtocolValue_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ProtocolValue_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ProtocolValue_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ProtocolValue_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ProtocolValue_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/Protocol_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/Protocol_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/Protocol_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/Protocol_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/Protocol_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/Protocol_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/RegSearch_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/RegSearch_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/RegSearch_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/RoleKind_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/RoleKind_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/RoleKind_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/RoleKind_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/RoleKind_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/RoleKind_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/RoleKind_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/RoleType_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/RoleType_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/RoleType_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/RoleType_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/RoleType_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/RoleType_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/RoleType_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SaltFormAliasType_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SaltFormAliasType_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SaltFormAliasType_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SaltFormAliasType_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SaltFormAliasType_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SaltFormAliasType_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SaltFormAlias_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SaltFormAlias_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SaltFormAlias_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SaltFormAlias_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SaltFormAlias_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SaltFormAlias_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SaltFormAlias_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SaltForm_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SaltForm_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SaltForm_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SaltForm_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SaltForm_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SaltForm_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SaltForm_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Salt_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Salt_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Salt_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Salt_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Salt_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Salt_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Salt_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SolutionUnit_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SolutionUnit_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SolutionUnit_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SolutionUnit_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SolutionUnit_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SolutionUnit_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SolutionUnit_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StandardizationHistory_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StandardizationHistory_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StandardizationHistory_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StandardizationHistory_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StandardizationHistory_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StandardizationHistory_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StandardizationSettings_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StandardizationSettings_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StandardizationSettings_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StandardizationSettings_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StandardizationSettings_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StandardizationSettings_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StandardizationSettings_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/StateKind_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/StateKind_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/StateKind_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StateKind_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/StateKind_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/StateKind_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/StateType_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/StateType_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/StateType_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/StateType_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/StateType_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/StateType_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StereoCategory_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StereoCategory_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StereoCategory_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StereoCategory_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StereoCategory_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StereoCategory_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StereoCategory_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StructureKind_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StructureKind_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StructureKind_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StructureKind_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StructureKind_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StructureKind_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StructureType_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StructureType_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StructureType_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StructureType_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StructureType_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/StructureType_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/SubjectLabel_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/SubjectLabel_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/SubjectLabel_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/SubjectLabel_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/SubjectLabel_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/SubjectLabel_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/SubjectLabel_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/SubjectState_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SubjectState_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/SubjectState_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SubjectState_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SubjectState_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/SubjectState_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/SubjectValue_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/SubjectValue_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/SubjectValue_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SubjectValue_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/SubjectValue_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/SubjectValue_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/Subject_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/Subject_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/Subject_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/Subject_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Subject_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/Subject_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/TempSelectTable_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/TempSelectTable_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/TempSelectTable_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/TempSelectTable_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/TempSelectTable_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ThingKind_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ThingKind_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ThingKind_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ThingKind_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ThingKind_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ThingKind_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ThingPageArchive_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ThingPageArchive_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ThingPageArchive_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ThingPageArchive_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ThingPageArchive_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ThingPageArchive_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ThingPage_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ThingPage_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ThingPage_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ThingPage_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ThingPage_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ThingPage_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ThingType_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ThingType_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ThingType_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ThingType_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ThingType_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ThingType_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/TreatmentGroupState_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/TreatmentGroupState_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/TreatmentGroupState_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/TreatmentGroupState_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/TreatmentGroupState_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/TreatmentGroupState_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/TreatmentGroup_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/TreatmentGroup_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/TreatmentGroup_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/TreatmentGroup_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/TreatmentGroup_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/TreatmentGroup_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/UncertaintyKind_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/UncertaintyKind_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/UncertaintyKind_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/UncertaintyKind_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/UncertaintyKind_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/UncertaintyKind_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/UnitKind_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/UnitKind_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/UnitKind_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/UnitKind_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/UnitKind_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/UnitKind_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/UnitType_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/UnitType_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/UnitType_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/UnitType_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/UnitType_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/UnitType_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Unit_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Unit_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Unit_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Unit_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Unit_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Unit_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Unit_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/UpdateLog_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/UpdateLog_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/UpdateLog_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/UpdateLog_Roo_Jpa_Entity.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/UpdateLog_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ValueKind_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ValueKind_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ValueKind_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/ValueKind_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ValueKind_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ValueKind_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ValueType_Roo_Configurable.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ValueType_Roo_Finder.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ValueType_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ValueType_Roo_Jpa_ActiveRecord.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ValueType_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/domain/ValueType_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Vendor_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Vendor_Roo_Finder.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Vendor_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Vendor_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Vendor_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Vendor_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/domain/Vendor_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AnalysisGroupCodeDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AnalysisGroupCodeDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AnalysisGroupCodeDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AnalysisGroupCsvDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AnalysisGroupCsvDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AnalysisGroupCsvDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AnalysisGroupStatePathDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AnalysisGroupStatePathDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AnalysisGroupStatePathDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueBaseDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueBaseDTO_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueBaseDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AnalysisGroupValuePathDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AnalysisGroupValuePathDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AnalysisGroupValuePathDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AuthGroupsAndProjectsDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AuthGroupsAndProjectsDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AuthGroupsAndProjectsDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AuthGroupsDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AuthGroupsDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AuthProjectDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AuthProjectDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AuthProjectGroupsDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AuthProjectGroupsDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AuthProjectGroupsDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AuthUserDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AuthUserDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AuthUserDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AuthorBrowserQueryDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AuthorBrowserQueryDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AuthorBrowserQueryDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/AuthorNameDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/AuthorNameDTO_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/AuthorNameDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AuthorQueryDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AuthorQueryDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AuthorQueryDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AuthorQueryResultDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AuthorQueryResultDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AuthorQueryResultDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AuthorRoleDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AuthorRoleDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/AuthorRoleDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/AutoLabelDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/AutoLabelDTO_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/AutoLabelDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/BatchCodeDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/BatchCodeDTO_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/BatchCodeDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/BatchProjectDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/BatchProjectDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/BatchProjectDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/BulkLoadPropertyMappingDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/BulkLoadPropertyMappingDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/BulkLoadPropertyMappingDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFRequestDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFRequestDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFRequestDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFResponseDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFResponseDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFResponseDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/BulkLoadSDFPropertyRequestDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/BulkLoadSDFPropertyRequestDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/BulkLoadSDFPropertyRequestDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/BulkTransferPart1DTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/BulkTransferPart1DTO_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/BulkTransferPart1DTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ChangePasswordDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ChangePasswordDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ChangePasswordDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CleanMolOptionsDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CleanMolOptionsDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CleanMolOptionsDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CmpdRegStructureSearchDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CmpdRegStructureSearchDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CmpdRegStructureSearchDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CodeLabelDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CodeLabelDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CodeLabelDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CodeNameQueryDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CodeNameQueryDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CodeNameQueryDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CodeNameValueDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CodeNameValueDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CodeNameValueDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/CodeTableDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/CodeTableDTO_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/CodeTableDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CodeTypeKindDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CodeTypeKindDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CodeTypeKindDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerBatchCodeDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerBatchCodeDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerBatchCodeDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerBrowserQueryDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerBrowserQueryDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerBrowserQueryDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerCodeNameStateDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerCodeNameStateDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerCodeNameStateDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerDependencyCheckDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerDependencyCheckDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerDependencyCheckDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerErrorMessageDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerErrorMessageDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerErrorMessageDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerLocationDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerLocationDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerLocationDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerLocationTreeDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerLocationTreeDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerLocationTreeDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/ContainerMiniDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/ContainerMiniDTO_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/ContainerMiniDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerQueryDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerQueryDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerQueryDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerQueryResultDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerQueryResultDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerQueryResultDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerRequestDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerRequestDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerRequestDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerSearchRequestDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerSearchRequestDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerSearchRequestDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/ContainerStateMiniDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/ContainerStateMiniDTO_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/ContainerStateMiniDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerStatePathDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerStatePathDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerStatePathDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerSubjectsDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerSubjectsDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerSubjectsDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerValuePathDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerValuePathDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerValuePathDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerValueRequestDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerValueRequestDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerValueRequestDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerWellCodeDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerWellCodeDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ContainerWellCodeDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CorpNameDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CorpNameDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CorpNameDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CreatePlateRequestDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CreatePlateRequestDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CreatePlateRequestDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CurveFitDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CurveFitDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/CurveFitDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/DateValueComparisonRequest_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/DateValueComparisonRequest_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/DateValueComparisonRequest_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/DependencyCheckDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/DependencyCheckDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/DependencyCheckDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/DoseReponseParamsDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/DoseReponseParamsDTO_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/DoseReponseParamsDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/EntrezDbDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/EntrezDbDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/EntrezDbDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/EntrezDbGeneDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/EntrezDbGeneDTO_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/EntrezDbGeneDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/EntrezDiscontinuedGeneDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/EntrezDiscontinuedGeneDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/EntrezDiscontinuedGeneDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/ErrorMessageDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/ErrorMessageDTO_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/ErrorMessageDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ExperimentCodeDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ExperimentCodeDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ExperimentCodeDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ExperimentCsvDataDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ExperimentCsvDataDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ExperimentCsvDataDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ExperimentDataDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ExperimentDataDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ExperimentErrorMessageDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ExperimentErrorMessageDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ExperimentErrorMessageDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/ExperimentFilterDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/ExperimentFilterDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/ExperimentFilterSearchDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/ExperimentFilterSearchDTO_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/ExperimentFilterSearchDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/ExperimentGuiStubDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/ExperimentGuiStubDTO_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/ExperimentGuiStubDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/ExperimentSearchRequestDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/ExperimentSearchRequestDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ExperimentStatePathDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ExperimentStatePathDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ExperimentStatePathDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ExperimentValuePathDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ExperimentValuePathDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ExperimentValuePathDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ExportResultDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ExportResultDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ExportResultDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/FileSaveReturnArrayDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/FileSaveReturnArrayDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/FileSaveReturnDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/FileSaveReturnDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/FileSaveSendDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/FileSaveSendDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/FileSaveSendDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/FlagWellDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/FlagWellDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/FlagWellDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/FlatThingCsvDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/FlatThingCsvDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/FlatThingCsvDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/GeneIdDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/GeneIdDTO_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/GeneIdDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/GeneOrthologDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/GeneOrthologDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/GeneOrthologFileDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/GeneOrthologFileDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/GeneOrthologFileDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/GenericQueryCodeTableResultDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/GenericQueryCodeTableResultDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/GenericQueryCodeTableResultDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/GenericStatePathRequest_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/GenericStatePathRequest_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/GenericStatePathRequest_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/GenericValuePathRequest_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/GenericValuePathRequest_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/GenericValuePathRequest_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/HydrogenizeMolInputDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/HydrogenizeMolInputDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/HydrogenizeMolInputDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/IdCollectionDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/IdCollectionDTO_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/IdCollectionDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/IdSetDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/IdSetDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ItxQueryDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ItxQueryDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ItxQueryDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/JSTreeNodeDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/JSTreeNodeDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/KeyValueDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/KeyValueDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/KeyValueDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/KiCurveFitDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/KiCurveFitDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/KiCurveFitDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LabelPrefixDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LabelPrefixDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LabelPrefixDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LabelQueryDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LabelQueryDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LabelQueryDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/LabelSequenceDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/LabelSequenceDTO_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/LabelSequenceDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LicenseDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LicenseDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LicenseDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LotAliasDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LotAliasDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LotAliasDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LotDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LotDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LotDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LotsByProjectDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LotsByProjectDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LsThingBrowserQueryDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LsThingBrowserQueryDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LsThingBrowserQueryDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LsThingQueryDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LsThingQueryDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LsThingQueryDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LsThingQueryResultDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LsThingQueryResultDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LsThingQueryResultDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LsThingStatePathDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LsThingStatePathDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LsThingStatePathDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LsThingValidationDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LsThingValidationDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LsThingValidationDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LsThingValuePathDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LsThingValuePathDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LsThingValuePathDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LsTransactionQueryDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LsTransactionQueryDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/LsTransactionQueryDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MetalotReturnDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MetalotReturnDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MetalotReturnDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MetalotReturn_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MetalotReturn_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MetalotReturn_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/Metalot_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/Metalot_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MethodOptionDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MethodOptionDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MethodOptionDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MolCleanInputDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MolCleanInputDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MolCleanInputDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MolConvertInputDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MolConvertInputDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MolConvertInputDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MolConvertOutputDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MolConvertOutputDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MolConvertOutputDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MolInputDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MolInputDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MolInputDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MolPropertiesDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MolPropertiesDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MolPropertiesDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchRequest_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchRequest_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchRequest_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchResultDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchResultDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchResultDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ParentAliasDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ParentAliasDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ParentAliasDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ParentDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ParentDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ParentDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ParentEditDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ParentEditDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ParentEditDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ParentLotCodeDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ParentLotCodeDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ParentLotCodeDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ParentValidationDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ParentValidationDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ParentValidationDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/PlateStubDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/PlateStubDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/PlateStubDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/PlateWellDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/PlateWellDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/PlateWellDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/PreferredNameDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/PreferredNameDTO_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/PreferredNameDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/PreferredNameRequestDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/PreferredNameRequestDTO_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/PreferredNameRequestDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/PreferredNameResultsDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/PreferredNameResultsDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/PreferredNameWithErrorDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/PreferredNameWithErrorDTO_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/PreferredNameWithErrorDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ProtocolDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ProtocolDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ProtocolDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ProtocolErrorMessageDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ProtocolErrorMessageDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ProtocolErrorMessageDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ProtocolStatePathDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ProtocolStatePathDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ProtocolStatePathDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ProtocolValuePathDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ProtocolValuePathDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ProtocolValuePathDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/PurgeFileDependencyCheckResponseDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/PurgeFileDependencyCheckResponseDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/PurgeFileDependencyCheckResponseDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/PurgeFileResponseDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/PurgeFileResponseDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/PurgeFileResponseDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/RawCurveDataDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/RawCurveDataDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/RawCurveDataDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/RegSearchDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/RegSearchDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/RegSearchParamsDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/RegSearchParamsDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/RegSearchParamsDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/RenderMolRequestDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/RenderMolRequestDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/RenderMolRequestDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ReparentLotDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ReparentLotDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ReparentLotDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/RequestNameDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/RequestNameDTO_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/RequestNameDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SELColOrderDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SELColOrderDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SELColOrderDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SaltFormAliasDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SaltFormAliasDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SaltFormAliasDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SaltFormDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SaltFormDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SaltFormDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SearchCdIdReturnDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SearchCdIdReturnDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SearchCdIdReturnDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SearchCompoundReturnDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SearchCompoundReturnDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SearchFormDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SearchFormDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SearchFormReturnDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SearchFormReturnDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SearchLotDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SearchLotDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SearchResultExportRequestDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SearchResultExportRequestDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SearchResultExportRequestDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SetTubeLocationDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SetTubeLocationDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SetTubeLocationDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SimpleBulkLoadPropertyDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SimpleBulkLoadPropertyDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SimpleBulkLoadPropertyDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/StandardizationDryRunSearchDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/StandardizationDryRunSearchDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/StandardizationDryRunSearchDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/StateValueCsvDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/StateValueCsvDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/StateValueCsvDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/StateValueDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/StateValueDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/StateValueDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesResultsDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesResultsDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesResultsDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/StringCollectionDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/StringCollectionDTO_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/StringCollectionDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/StrippedSaltDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/StrippedSaltDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/StrippedSaltDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/StructureAndThingSearchDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/StructureAndThingSearchDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/StructureSearchDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/StructureSearchDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/StructureSearchDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SubjectCodeDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SubjectCodeDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SubjectCodeDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SubjectCodeNameDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SubjectCodeNameDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SubjectCodeNameDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SubjectCodeStateDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SubjectCodeStateDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SubjectCodeStateDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SubjectCsvDataDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SubjectCsvDataDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SubjectCsvDataDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/SubjectDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/SubjectDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/SubjectLabelDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/SubjectLabelDTO_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/SubjectLabelDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/SubjectMiniDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/SubjectMiniDTO_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/SubjectMiniDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SubjectSearchRequest_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SubjectSearchRequest_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SubjectSearchRequest_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SubjectSearchResultDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SubjectSearchResultDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SubjectSearchResultDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/SubjectStateDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/SubjectStateDTO_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/SubjectStateDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/SubjectStateMiniDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/SubjectStateMiniDTO_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/SubjectStateMiniDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SubjectStatePathDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SubjectStatePathDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SubjectStatePathDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SubjectStateValueDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SubjectStateValueDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SubjectStateValueDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/SubjectValueDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/SubjectValueDTO_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/SubjectValueDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SubjectValuePathDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SubjectValuePathDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/SubjectValuePathDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/TempThingDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/TempThingDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/TempThingDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/TgDataDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/TgDataDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/TgDataDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/TreatmentGroupCodeDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/TreatmentGroupCodeDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/TreatmentGroupCodeDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/TreatmentGroupMiniDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/TreatmentGroupMiniDTO_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/TreatmentGroupMiniDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/TreatmentGroupStatePathDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/TreatmentGroupStatePathDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/TreatmentGroupStatePathDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/TreatmentGroupValueDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/TreatmentGroupValueDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/TreatmentGroupValueDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/TreatmentGroupValuePathDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/TreatmentGroupValuePathDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/TreatmentGroupValuePathDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/TsvLoaderResponseDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/TsvLoaderResponseDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/TsvLoaderResponseDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/TypeDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/TypeDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/TypeDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/TypeKindDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/TypeKindDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/TypeKindDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ValidationResponseDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ValidationResponseDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ValidationResponseDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ValuePathDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ValuePathDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ValuePathDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ValueQueryDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ValueQueryDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ValueQueryDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ValueRuleDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ValueRuleDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/ValueRuleDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/ValueTypeKindDTO_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/ValueTypeKindDTO_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/dto/ValueTypeKindDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/WellContentDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/WellContentDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/WellContentDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/WellStubDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/WellStubDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/WellStubDTO_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/configuration/StandardizerSettingsConfigDTO_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/configuration/StandardizerSettingsConfigDTO_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/dto/configuration/StandardizerSettingsConfigDTO_Roo_ToString.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/exceptions/ErrorMessage_Roo_JavaBean.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/exceptions/ErrorMessage_Roo_Json.aj
 delete mode 100755 src/main/java/com/labsynch/labseer/exceptions/ErrorMessage_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/exceptions/LsThingValidationErrorMessage_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/exceptions/LsThingValidationErrorMessage_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/exceptions/LsThingValidationErrorMessage_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/service/ErrorList_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/service/ErrorList_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/service/ErrorMessage_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/service/ErrorMessage_Roo_Json.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/service/ErrorMessage_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/service/SaltLoader_Roo_Configurable.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/service/SaltLoader_Roo_JavaBean.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/service/SaltLoader_Roo_Jpa_ActiveRecord.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/service/SaltLoader_Roo_Jpa_Entity.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/service/SaltLoader_Roo_ToString.aj
 delete mode 100644 src/main/java/com/labsynch/labseer/web/ApplicationConversionServiceFactoryBean_Roo_ConversionService.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/AnalysisGroupDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/AnalysisGroupDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/AnalysisGroupIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/AnalysisGroupIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/AuthorDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/AuthorDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/AuthorIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/AuthorIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/AuthorTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/AuthorTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ContainerDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ContainerDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ContainerIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ContainerIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ContainerKindDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ContainerKindDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ContainerKindIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ContainerKindIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ContainerLabelDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ContainerLabelDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ContainerLabelIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ContainerLabelIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ContainerStateDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ContainerStateDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ContainerStateIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ContainerStateIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ContainerTypeDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ContainerTypeDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ContainerTypeIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ContainerTypeIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ContainerValueDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ContainerValueDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ContainerValueIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ContainerValueIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ExperimentDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ExperimentDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ExperimentIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ExperimentIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ExperimentKindDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ExperimentKindDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ExperimentKindIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ExperimentKindIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ExperimentLabelDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ExperimentLabelDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ExperimentLabelIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ExperimentLabelIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ExperimentStateDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ExperimentStateDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ExperimentStateIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ExperimentStateIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ExperimentTypeDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ExperimentTypeDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ExperimentTypeIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ExperimentTypeIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ExperimentValueDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ExperimentValueDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ExperimentValueIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ExperimentValueIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/InteractionKindDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/InteractionKindDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/InteractionKindIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/InteractionKindIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/InteractionTypeDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/InteractionTypeDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/InteractionTypeIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/InteractionTypeIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ItxContainerContainerDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ItxContainerContainerDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ItxContainerContainerIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ItxContainerContainerIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/LabelKindDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/LabelKindDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/LabelKindIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/LabelKindIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/LabelSequenceDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/LabelSequenceDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/LabelSequenceIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/LabelSequenceIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/LabelTypeDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/LabelTypeDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/LabelTypeIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/LabelTypeIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/LsInteractionDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/LsInteractionDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/LsInteractionIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/LsInteractionIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/LsTransactionDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/LsTransactionDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/LsTransactionIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/LsTransactionIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/OperatorTypeDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/OperatorTypeDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/OperatorTypeIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/OperatorTypeIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ProtocolDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ProtocolDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ProtocolIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ProtocolIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ProtocolKindDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ProtocolKindDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ProtocolKindIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ProtocolKindIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ProtocolLabelDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ProtocolLabelDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ProtocolLabelIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ProtocolLabelIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ProtocolStateDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ProtocolStateDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ProtocolStateIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ProtocolStateIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ProtocolTypeDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ProtocolTypeDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ProtocolTypeIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ProtocolTypeIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ProtocolValueDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ProtocolValueDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ProtocolValueIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ProtocolValueIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/StateKindDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/StateKindDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/StateKindIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/StateKindIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/StateTypeDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/StateTypeDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/StateTypeIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/StateTypeIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/SubjectDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/SubjectDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/SubjectIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/SubjectIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/SubjectStateDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/SubjectStateDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/SubjectStateIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/SubjectStateIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/SubjectValueDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/SubjectValueDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/SubjectValueIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/SubjectValueIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ThingKindDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ThingKindDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ThingKindIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ThingKindIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ThingPageArchiveDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ThingPageArchiveDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ThingPageArchiveIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ThingPageArchiveIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ThingPageDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ThingPageDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ThingPageIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ThingPageIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ThingTypeDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ThingTypeDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ThingTypeIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ThingTypeIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/TreatmentGroupDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/TreatmentGroupDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/TreatmentGroupIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/TreatmentGroupIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/UnitKindDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/UnitKindDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/UnitKindIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/UnitKindIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/UnitTypeDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/UnitTypeDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/UnitTypeIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/UnitTypeIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/UpdateLogDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/UpdateLogDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/UpdateLogIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/UpdateLogIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ValueKindDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ValueKindDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ValueKindIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ValueKindIntegrationTest_Roo_IntegrationTest.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ValueTypeDataOnDemand_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ValueTypeDataOnDemand_Roo_DataOnDemand.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ValueTypeIntegrationTest_Roo_Configurable.aj
 delete mode 100755 src/test/java/com/labsynch/labseer/domain/ValueTypeIntegrationTest_Roo_IntegrationTest.aj

diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure.java
index 4d4408f6a..224d1bb11 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure.java
@@ -1,16 +1,173 @@
 package com.labsynch.labseer.chemclasses.bbchem;
 
 import com.labsynch.labseer.domain.AbstractBBChemStructure;
-
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.TypedQuery;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
 @RooJpaActiveRecord(sequenceName = "BBCHEM_STRUCTURE_PKSEQ", finders = { "findBBChemDryRunStructuresByRegEquals", "findBBChemDryRunStructuresByPreRegEquals"})
 public class BBChemDryRunStructure extends AbstractBBChemStructure {
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static BBChemDryRunStructure fromJsonToBBChemDryRunStructure(String json) {
+        return new JSONDeserializer<BBChemDryRunStructure>()
+        .use(null, BBChemDryRunStructure.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<BBChemDryRunStructure> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<BBChemDryRunStructure> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<BBChemDryRunStructure> fromJsonArrayToBBChemDryRunStructures(String json) {
+        return new JSONDeserializer<List<BBChemDryRunStructure>>()
+        .use("values", BBChemDryRunStructure.class).deserialize(json);
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+
+	public static long countBBChemDryRunStructures() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM BBChemDryRunStructure o", Long.class).getSingleResult();
+    }
+
+	public static List<BBChemDryRunStructure> findAllBBChemDryRunStructures() {
+        return entityManager().createQuery("SELECT o FROM BBChemDryRunStructure o", BBChemDryRunStructure.class).getResultList();
+    }
+
+	public static List<BBChemDryRunStructure> findAllBBChemDryRunStructures(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM BBChemDryRunStructure o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, BBChemDryRunStructure.class).getResultList();
+    }
+
+	public static BBChemDryRunStructure findBBChemDryRunStructure(Long id) {
+        if (id == null) return null;
+        return entityManager().find(BBChemDryRunStructure.class, id);
+    }
+
+	public static List<BBChemDryRunStructure> findBBChemDryRunStructureEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM BBChemDryRunStructure o", BBChemDryRunStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<BBChemDryRunStructure> findBBChemDryRunStructureEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM BBChemDryRunStructure o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, BBChemDryRunStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public BBChemDryRunStructure merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        BBChemDryRunStructure merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public static Long countFindBBChemDryRunStructuresByPreRegEquals(String preReg) {
+        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+        EntityManager em = BBChemDryRunStructure.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemDryRunStructure AS o WHERE o.preReg = :preReg", Long.class);
+        q.setParameter("preReg", preReg);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindBBChemDryRunStructuresByRegEquals(String reg) {
+        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+        EntityManager em = BBChemDryRunStructure.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemDryRunStructure AS o WHERE o.reg = :reg", Long.class);
+        q.setParameter("reg", reg);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<BBChemDryRunStructure> findBBChemDryRunStructuresByPreRegEquals(String preReg) {
+        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+        EntityManager em = BBChemDryRunStructure.entityManager();
+        TypedQuery<BBChemDryRunStructure> q = em.createQuery("SELECT o FROM BBChemDryRunStructure AS o WHERE o.preReg = :preReg", BBChemDryRunStructure.class);
+        q.setParameter("preReg", preReg);
+        return q;
+    }
+
+	public static TypedQuery<BBChemDryRunStructure> findBBChemDryRunStructuresByPreRegEquals(String preReg, String sortFieldName, String sortOrder) {
+        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+        EntityManager em = BBChemDryRunStructure.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemDryRunStructure AS o WHERE o.preReg = :preReg");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<BBChemDryRunStructure> q = em.createQuery(queryBuilder.toString(), BBChemDryRunStructure.class);
+        q.setParameter("preReg", preReg);
+        return q;
+    }
+
+	public static TypedQuery<BBChemDryRunStructure> findBBChemDryRunStructuresByRegEquals(String reg) {
+        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+        EntityManager em = BBChemDryRunStructure.entityManager();
+        TypedQuery<BBChemDryRunStructure> q = em.createQuery("SELECT o FROM BBChemDryRunStructure AS o WHERE o.reg = :reg", BBChemDryRunStructure.class);
+        q.setParameter("reg", reg);
+        return q;
+    }
+
+	public static TypedQuery<BBChemDryRunStructure> findBBChemDryRunStructuresByRegEquals(String reg, String sortFieldName, String sortOrder) {
+        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+        EntityManager em = BBChemDryRunStructure.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemDryRunStructure AS o WHERE o.reg = :reg");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<BBChemDryRunStructure> q = em.createQuery(queryBuilder.toString(), BBChemDryRunStructure.class);
+        q.setParameter("reg", reg);
+        return q;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure_Roo_Configurable.aj
deleted file mode 100644
index 9051d1469..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemDryRunStructure;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect BBChemDryRunStructure_Roo_Configurable {
-    
-    declare @type: BBChemDryRunStructure: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure_Roo_Finder.aj
deleted file mode 100644
index 482c6282f..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure_Roo_Finder.aj
+++ /dev/null
@@ -1,74 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemDryRunStructure;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect BBChemDryRunStructure_Roo_Finder {
-    
-    public static Long BBChemDryRunStructure.countFindBBChemDryRunStructuresByPreRegEquals(String preReg) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
-        EntityManager em = BBChemDryRunStructure.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemDryRunStructure AS o WHERE o.preReg = :preReg", Long.class);
-        q.setParameter("preReg", preReg);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long BBChemDryRunStructure.countFindBBChemDryRunStructuresByRegEquals(String reg) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
-        EntityManager em = BBChemDryRunStructure.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemDryRunStructure AS o WHERE o.reg = :reg", Long.class);
-        q.setParameter("reg", reg);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<BBChemDryRunStructure> BBChemDryRunStructure.findBBChemDryRunStructuresByPreRegEquals(String preReg) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
-        EntityManager em = BBChemDryRunStructure.entityManager();
-        TypedQuery<BBChemDryRunStructure> q = em.createQuery("SELECT o FROM BBChemDryRunStructure AS o WHERE o.preReg = :preReg", BBChemDryRunStructure.class);
-        q.setParameter("preReg", preReg);
-        return q;
-    }
-    
-    public static TypedQuery<BBChemDryRunStructure> BBChemDryRunStructure.findBBChemDryRunStructuresByPreRegEquals(String preReg, String sortFieldName, String sortOrder) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
-        EntityManager em = BBChemDryRunStructure.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemDryRunStructure AS o WHERE o.preReg = :preReg");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<BBChemDryRunStructure> q = em.createQuery(queryBuilder.toString(), BBChemDryRunStructure.class);
-        q.setParameter("preReg", preReg);
-        return q;
-    }
-    
-    public static TypedQuery<BBChemDryRunStructure> BBChemDryRunStructure.findBBChemDryRunStructuresByRegEquals(String reg) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
-        EntityManager em = BBChemDryRunStructure.entityManager();
-        TypedQuery<BBChemDryRunStructure> q = em.createQuery("SELECT o FROM BBChemDryRunStructure AS o WHERE o.reg = :reg", BBChemDryRunStructure.class);
-        q.setParameter("reg", reg);
-        return q;
-    }
-    
-    public static TypedQuery<BBChemDryRunStructure> BBChemDryRunStructure.findBBChemDryRunStructuresByRegEquals(String reg, String sortFieldName, String sortOrder) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
-        EntityManager em = BBChemDryRunStructure.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemDryRunStructure AS o WHERE o.reg = :reg");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<BBChemDryRunStructure> q = em.createQuery(queryBuilder.toString(), BBChemDryRunStructure.class);
-        q.setParameter("reg", reg);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 0e42514ba..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemDryRunStructure;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect BBChemDryRunStructure_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> BBChemDryRunStructure.fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
-    
-    public static long BBChemDryRunStructure.countBBChemDryRunStructures() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM BBChemDryRunStructure o", Long.class).getSingleResult();
-    }
-    
-    public static List<BBChemDryRunStructure> BBChemDryRunStructure.findAllBBChemDryRunStructures() {
-        return entityManager().createQuery("SELECT o FROM BBChemDryRunStructure o", BBChemDryRunStructure.class).getResultList();
-    }
-    
-    public static List<BBChemDryRunStructure> BBChemDryRunStructure.findAllBBChemDryRunStructures(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM BBChemDryRunStructure o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, BBChemDryRunStructure.class).getResultList();
-    }
-    
-    public static BBChemDryRunStructure BBChemDryRunStructure.findBBChemDryRunStructure(Long id) {
-        if (id == null) return null;
-        return entityManager().find(BBChemDryRunStructure.class, id);
-    }
-    
-    public static List<BBChemDryRunStructure> BBChemDryRunStructure.findBBChemDryRunStructureEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM BBChemDryRunStructure o", BBChemDryRunStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<BBChemDryRunStructure> BBChemDryRunStructure.findBBChemDryRunStructureEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM BBChemDryRunStructure o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, BBChemDryRunStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public BBChemDryRunStructure BBChemDryRunStructure.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        BBChemDryRunStructure merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure_Roo_Jpa_Entity.aj
deleted file mode 100644
index 31a3895f4..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemDryRunStructure;
-import javax.persistence.Entity;
-
-privileged aspect BBChemDryRunStructure_Roo_Jpa_Entity {
-    
-    declare @type: BBChemDryRunStructure: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure_Roo_Json.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure_Roo_Json.aj
deleted file mode 100644
index 0e0749372..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemDryRunStructure;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect BBChemDryRunStructure_Roo_Json {
-    
-    public String BBChemDryRunStructure.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String BBChemDryRunStructure.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static BBChemDryRunStructure BBChemDryRunStructure.fromJsonToBBChemDryRunStructure(String json) {
-        return new JSONDeserializer<BBChemDryRunStructure>()
-        .use(null, BBChemDryRunStructure.class).deserialize(json);
-    }
-    
-    public static String BBChemDryRunStructure.toJsonArray(Collection<BBChemDryRunStructure> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String BBChemDryRunStructure.toJsonArray(Collection<BBChemDryRunStructure> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<BBChemDryRunStructure> BBChemDryRunStructure.fromJsonArrayToBBChemDryRunStructures(String json) {
-        return new JSONDeserializer<List<BBChemDryRunStructure>>()
-        .use("values", BBChemDryRunStructure.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure_Roo_ToString.aj
deleted file mode 100644
index b4b51c4e1..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemDryRunStructure;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect BBChemDryRunStructure_Roo_ToString {
-    
-    public String BBChemDryRunStructure.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure.java
index e88d50c03..fd759cf8a 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure.java
@@ -1,20 +1,28 @@
 package com.labsynch.labseer.chemclasses.bbchem;
 
 import java.util.BitSet;
+import java.util.Collection;
 import java.util.List;
-
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 
 import com.labsynch.labseer.domain.AbstractBBChemStructure;
 import com.labsynch.labseer.utils.SimpleUtil;
-
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -32,4 +40,149 @@ public static List<BBChemParentStructure> findBBChemParentStructuresBySubstructu
 		}
         return q.getResultList();
     }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static BBChemParentStructure fromJsonToBBChemParentStructure(String json) {
+        return new JSONDeserializer<BBChemParentStructure>()
+        .use(null, BBChemParentStructure.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<BBChemParentStructure> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<BBChemParentStructure> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<BBChemParentStructure> fromJsonArrayToBBChemParentStructures(String json) {
+        return new JSONDeserializer<List<BBChemParentStructure>>()
+        .use("values", BBChemParentStructure.class).deserialize(json);
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+
+	public static long countBBChemParentStructures() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM BBChemParentStructure o", Long.class).getSingleResult();
+    }
+
+	public static List<BBChemParentStructure> findAllBBChemParentStructures() {
+        return entityManager().createQuery("SELECT o FROM BBChemParentStructure o", BBChemParentStructure.class).getResultList();
+    }
+
+	public static List<BBChemParentStructure> findAllBBChemParentStructures(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM BBChemParentStructure o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, BBChemParentStructure.class).getResultList();
+    }
+
+	public static BBChemParentStructure findBBChemParentStructure(Long id) {
+        if (id == null) return null;
+        return entityManager().find(BBChemParentStructure.class, id);
+    }
+
+	public static List<BBChemParentStructure> findBBChemParentStructureEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM BBChemParentStructure o", BBChemParentStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<BBChemParentStructure> findBBChemParentStructureEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM BBChemParentStructure o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, BBChemParentStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public BBChemParentStructure merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        BBChemParentStructure merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static Long countFindBBChemParentStructuresByPreRegEquals(String preReg) {
+        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+        EntityManager em = BBChemParentStructure.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemParentStructure AS o WHERE o.preReg = :preReg", Long.class);
+        q.setParameter("preReg", preReg);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindBBChemParentStructuresByRegEquals(String reg) {
+        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+        EntityManager em = BBChemParentStructure.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemParentStructure AS o WHERE o.reg = :reg", Long.class);
+        q.setParameter("reg", reg);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<BBChemParentStructure> findBBChemParentStructuresByPreRegEquals(String preReg) {
+        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+        EntityManager em = BBChemParentStructure.entityManager();
+        TypedQuery<BBChemParentStructure> q = em.createQuery("SELECT o FROM BBChemParentStructure AS o WHERE o.preReg = :preReg", BBChemParentStructure.class);
+        q.setParameter("preReg", preReg);
+        return q;
+    }
+
+	public static TypedQuery<BBChemParentStructure> findBBChemParentStructuresByPreRegEquals(String preReg, String sortFieldName, String sortOrder) {
+        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+        EntityManager em = BBChemParentStructure.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemParentStructure AS o WHERE o.preReg = :preReg");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<BBChemParentStructure> q = em.createQuery(queryBuilder.toString(), BBChemParentStructure.class);
+        q.setParameter("preReg", preReg);
+        return q;
+    }
+
+	public static TypedQuery<BBChemParentStructure> findBBChemParentStructuresByRegEquals(String reg) {
+        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+        EntityManager em = BBChemParentStructure.entityManager();
+        TypedQuery<BBChemParentStructure> q = em.createQuery("SELECT o FROM BBChemParentStructure AS o WHERE o.reg = :reg", BBChemParentStructure.class);
+        q.setParameter("reg", reg);
+        return q;
+    }
+
+	public static TypedQuery<BBChemParentStructure> findBBChemParentStructuresByRegEquals(String reg, String sortFieldName, String sortOrder) {
+        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+        EntityManager em = BBChemParentStructure.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemParentStructure AS o WHERE o.reg = :reg");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<BBChemParentStructure> q = em.createQuery(queryBuilder.toString(), BBChemParentStructure.class);
+        q.setParameter("reg", reg);
+        return q;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure_Roo_Configurable.aj
deleted file mode 100644
index 083ac32e5..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemParentStructure;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect BBChemParentStructure_Roo_Configurable {
-    
-    declare @type: BBChemParentStructure: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure_Roo_Finder.aj
deleted file mode 100644
index 442c9067d..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure_Roo_Finder.aj
+++ /dev/null
@@ -1,74 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemParentStructure;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect BBChemParentStructure_Roo_Finder {
-    
-    public static Long BBChemParentStructure.countFindBBChemParentStructuresByPreRegEquals(String preReg) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
-        EntityManager em = BBChemParentStructure.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemParentStructure AS o WHERE o.preReg = :preReg", Long.class);
-        q.setParameter("preReg", preReg);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long BBChemParentStructure.countFindBBChemParentStructuresByRegEquals(String reg) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
-        EntityManager em = BBChemParentStructure.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemParentStructure AS o WHERE o.reg = :reg", Long.class);
-        q.setParameter("reg", reg);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<BBChemParentStructure> BBChemParentStructure.findBBChemParentStructuresByPreRegEquals(String preReg) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
-        EntityManager em = BBChemParentStructure.entityManager();
-        TypedQuery<BBChemParentStructure> q = em.createQuery("SELECT o FROM BBChemParentStructure AS o WHERE o.preReg = :preReg", BBChemParentStructure.class);
-        q.setParameter("preReg", preReg);
-        return q;
-    }
-    
-    public static TypedQuery<BBChemParentStructure> BBChemParentStructure.findBBChemParentStructuresByPreRegEquals(String preReg, String sortFieldName, String sortOrder) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
-        EntityManager em = BBChemParentStructure.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemParentStructure AS o WHERE o.preReg = :preReg");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<BBChemParentStructure> q = em.createQuery(queryBuilder.toString(), BBChemParentStructure.class);
-        q.setParameter("preReg", preReg);
-        return q;
-    }
-    
-    public static TypedQuery<BBChemParentStructure> BBChemParentStructure.findBBChemParentStructuresByRegEquals(String reg) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
-        EntityManager em = BBChemParentStructure.entityManager();
-        TypedQuery<BBChemParentStructure> q = em.createQuery("SELECT o FROM BBChemParentStructure AS o WHERE o.reg = :reg", BBChemParentStructure.class);
-        q.setParameter("reg", reg);
-        return q;
-    }
-    
-    public static TypedQuery<BBChemParentStructure> BBChemParentStructure.findBBChemParentStructuresByRegEquals(String reg, String sortFieldName, String sortOrder) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
-        EntityManager em = BBChemParentStructure.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemParentStructure AS o WHERE o.reg = :reg");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<BBChemParentStructure> q = em.createQuery(queryBuilder.toString(), BBChemParentStructure.class);
-        q.setParameter("reg", reg);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 750841a79..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemParentStructure;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect BBChemParentStructure_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> BBChemParentStructure.fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
-    
-    public static long BBChemParentStructure.countBBChemParentStructures() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM BBChemParentStructure o", Long.class).getSingleResult();
-    }
-    
-    public static List<BBChemParentStructure> BBChemParentStructure.findAllBBChemParentStructures() {
-        return entityManager().createQuery("SELECT o FROM BBChemParentStructure o", BBChemParentStructure.class).getResultList();
-    }
-    
-    public static List<BBChemParentStructure> BBChemParentStructure.findAllBBChemParentStructures(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM BBChemParentStructure o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, BBChemParentStructure.class).getResultList();
-    }
-    
-    public static BBChemParentStructure BBChemParentStructure.findBBChemParentStructure(Long id) {
-        if (id == null) return null;
-        return entityManager().find(BBChemParentStructure.class, id);
-    }
-    
-    public static List<BBChemParentStructure> BBChemParentStructure.findBBChemParentStructureEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM BBChemParentStructure o", BBChemParentStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<BBChemParentStructure> BBChemParentStructure.findBBChemParentStructureEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM BBChemParentStructure o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, BBChemParentStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public BBChemParentStructure BBChemParentStructure.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        BBChemParentStructure merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure_Roo_Jpa_Entity.aj
deleted file mode 100644
index a871331ca..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemParentStructure;
-import javax.persistence.Entity;
-
-privileged aspect BBChemParentStructure_Roo_Jpa_Entity {
-    
-    declare @type: BBChemParentStructure: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure_Roo_Json.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure_Roo_Json.aj
deleted file mode 100644
index 192190293..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemParentStructure;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect BBChemParentStructure_Roo_Json {
-    
-    public String BBChemParentStructure.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String BBChemParentStructure.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static BBChemParentStructure BBChemParentStructure.fromJsonToBBChemParentStructure(String json) {
-        return new JSONDeserializer<BBChemParentStructure>()
-        .use(null, BBChemParentStructure.class).deserialize(json);
-    }
-    
-    public static String BBChemParentStructure.toJsonArray(Collection<BBChemParentStructure> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String BBChemParentStructure.toJsonArray(Collection<BBChemParentStructure> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<BBChemParentStructure> BBChemParentStructure.fromJsonArrayToBBChemParentStructures(String json) {
-        return new JSONDeserializer<List<BBChemParentStructure>>()
-        .use("values", BBChemParentStructure.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure_Roo_ToString.aj
deleted file mode 100644
index 1c5e3a86e..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemParentStructure;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect BBChemParentStructure_Roo_ToString {
-    
-    public String BBChemParentStructure.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure.java
index 6b551473a..efd8fc726 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure.java
@@ -1,20 +1,28 @@
 package com.labsynch.labseer.chemclasses.bbchem;
 
 import java.util.BitSet;
+import java.util.Collection;
 import java.util.List;
-
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 
 import com.labsynch.labseer.domain.AbstractBBChemStructure;
 import com.labsynch.labseer.utils.SimpleUtil;
-
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -33,4 +41,149 @@ public static List<BBChemSaltFormStructure> findBBChemSaltFormStructuresBySubstr
         return q.getResultList();
     }
 
+
+	public static Long countFindBBChemSaltFormStructuresByPreRegEquals(String preReg) {
+        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+        EntityManager em = BBChemSaltFormStructure.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemSaltFormStructure AS o WHERE o.preReg = :preReg", Long.class);
+        q.setParameter("preReg", preReg);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindBBChemSaltFormStructuresByRegEquals(String reg) {
+        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+        EntityManager em = BBChemSaltFormStructure.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemSaltFormStructure AS o WHERE o.reg = :reg", Long.class);
+        q.setParameter("reg", reg);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<BBChemSaltFormStructure> findBBChemSaltFormStructuresByPreRegEquals(String preReg) {
+        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+        EntityManager em = BBChemSaltFormStructure.entityManager();
+        TypedQuery<BBChemSaltFormStructure> q = em.createQuery("SELECT o FROM BBChemSaltFormStructure AS o WHERE o.preReg = :preReg", BBChemSaltFormStructure.class);
+        q.setParameter("preReg", preReg);
+        return q;
+    }
+
+	public static TypedQuery<BBChemSaltFormStructure> findBBChemSaltFormStructuresByPreRegEquals(String preReg, String sortFieldName, String sortOrder) {
+        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+        EntityManager em = BBChemSaltFormStructure.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemSaltFormStructure AS o WHERE o.preReg = :preReg");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<BBChemSaltFormStructure> q = em.createQuery(queryBuilder.toString(), BBChemSaltFormStructure.class);
+        q.setParameter("preReg", preReg);
+        return q;
+    }
+
+	public static TypedQuery<BBChemSaltFormStructure> findBBChemSaltFormStructuresByRegEquals(String reg) {
+        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+        EntityManager em = BBChemSaltFormStructure.entityManager();
+        TypedQuery<BBChemSaltFormStructure> q = em.createQuery("SELECT o FROM BBChemSaltFormStructure AS o WHERE o.reg = :reg", BBChemSaltFormStructure.class);
+        q.setParameter("reg", reg);
+        return q;
+    }
+
+	public static TypedQuery<BBChemSaltFormStructure> findBBChemSaltFormStructuresByRegEquals(String reg, String sortFieldName, String sortOrder) {
+        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+        EntityManager em = BBChemSaltFormStructure.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemSaltFormStructure AS o WHERE o.reg = :reg");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<BBChemSaltFormStructure> q = em.createQuery(queryBuilder.toString(), BBChemSaltFormStructure.class);
+        q.setParameter("reg", reg);
+        return q;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+
+	public static long countBBChemSaltFormStructures() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM BBChemSaltFormStructure o", Long.class).getSingleResult();
+    }
+
+	public static List<BBChemSaltFormStructure> findAllBBChemSaltFormStructures() {
+        return entityManager().createQuery("SELECT o FROM BBChemSaltFormStructure o", BBChemSaltFormStructure.class).getResultList();
+    }
+
+	public static List<BBChemSaltFormStructure> findAllBBChemSaltFormStructures(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM BBChemSaltFormStructure o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, BBChemSaltFormStructure.class).getResultList();
+    }
+
+	public static BBChemSaltFormStructure findBBChemSaltFormStructure(Long id) {
+        if (id == null) return null;
+        return entityManager().find(BBChemSaltFormStructure.class, id);
+    }
+
+	public static List<BBChemSaltFormStructure> findBBChemSaltFormStructureEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM BBChemSaltFormStructure o", BBChemSaltFormStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<BBChemSaltFormStructure> findBBChemSaltFormStructureEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM BBChemSaltFormStructure o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, BBChemSaltFormStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public BBChemSaltFormStructure merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        BBChemSaltFormStructure merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static BBChemSaltFormStructure fromJsonToBBChemSaltFormStructure(String json) {
+        return new JSONDeserializer<BBChemSaltFormStructure>()
+        .use(null, BBChemSaltFormStructure.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<BBChemSaltFormStructure> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<BBChemSaltFormStructure> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<BBChemSaltFormStructure> fromJsonArrayToBBChemSaltFormStructures(String json) {
+        return new JSONDeserializer<List<BBChemSaltFormStructure>>()
+        .use("values", BBChemSaltFormStructure.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure_Roo_Configurable.aj
deleted file mode 100644
index ff18d45e3..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemSaltFormStructure;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect BBChemSaltFormStructure_Roo_Configurable {
-    
-    declare @type: BBChemSaltFormStructure: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure_Roo_Finder.aj
deleted file mode 100644
index 26a2c5827..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure_Roo_Finder.aj
+++ /dev/null
@@ -1,74 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemSaltFormStructure;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect BBChemSaltFormStructure_Roo_Finder {
-    
-    public static Long BBChemSaltFormStructure.countFindBBChemSaltFormStructuresByPreRegEquals(String preReg) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
-        EntityManager em = BBChemSaltFormStructure.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemSaltFormStructure AS o WHERE o.preReg = :preReg", Long.class);
-        q.setParameter("preReg", preReg);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long BBChemSaltFormStructure.countFindBBChemSaltFormStructuresByRegEquals(String reg) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
-        EntityManager em = BBChemSaltFormStructure.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemSaltFormStructure AS o WHERE o.reg = :reg", Long.class);
-        q.setParameter("reg", reg);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<BBChemSaltFormStructure> BBChemSaltFormStructure.findBBChemSaltFormStructuresByPreRegEquals(String preReg) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
-        EntityManager em = BBChemSaltFormStructure.entityManager();
-        TypedQuery<BBChemSaltFormStructure> q = em.createQuery("SELECT o FROM BBChemSaltFormStructure AS o WHERE o.preReg = :preReg", BBChemSaltFormStructure.class);
-        q.setParameter("preReg", preReg);
-        return q;
-    }
-    
-    public static TypedQuery<BBChemSaltFormStructure> BBChemSaltFormStructure.findBBChemSaltFormStructuresByPreRegEquals(String preReg, String sortFieldName, String sortOrder) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
-        EntityManager em = BBChemSaltFormStructure.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemSaltFormStructure AS o WHERE o.preReg = :preReg");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<BBChemSaltFormStructure> q = em.createQuery(queryBuilder.toString(), BBChemSaltFormStructure.class);
-        q.setParameter("preReg", preReg);
-        return q;
-    }
-    
-    public static TypedQuery<BBChemSaltFormStructure> BBChemSaltFormStructure.findBBChemSaltFormStructuresByRegEquals(String reg) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
-        EntityManager em = BBChemSaltFormStructure.entityManager();
-        TypedQuery<BBChemSaltFormStructure> q = em.createQuery("SELECT o FROM BBChemSaltFormStructure AS o WHERE o.reg = :reg", BBChemSaltFormStructure.class);
-        q.setParameter("reg", reg);
-        return q;
-    }
-    
-    public static TypedQuery<BBChemSaltFormStructure> BBChemSaltFormStructure.findBBChemSaltFormStructuresByRegEquals(String reg, String sortFieldName, String sortOrder) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
-        EntityManager em = BBChemSaltFormStructure.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemSaltFormStructure AS o WHERE o.reg = :reg");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<BBChemSaltFormStructure> q = em.createQuery(queryBuilder.toString(), BBChemSaltFormStructure.class);
-        q.setParameter("reg", reg);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 6a3f392e4..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemSaltFormStructure;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect BBChemSaltFormStructure_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> BBChemSaltFormStructure.fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
-    
-    public static long BBChemSaltFormStructure.countBBChemSaltFormStructures() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM BBChemSaltFormStructure o", Long.class).getSingleResult();
-    }
-    
-    public static List<BBChemSaltFormStructure> BBChemSaltFormStructure.findAllBBChemSaltFormStructures() {
-        return entityManager().createQuery("SELECT o FROM BBChemSaltFormStructure o", BBChemSaltFormStructure.class).getResultList();
-    }
-    
-    public static List<BBChemSaltFormStructure> BBChemSaltFormStructure.findAllBBChemSaltFormStructures(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM BBChemSaltFormStructure o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, BBChemSaltFormStructure.class).getResultList();
-    }
-    
-    public static BBChemSaltFormStructure BBChemSaltFormStructure.findBBChemSaltFormStructure(Long id) {
-        if (id == null) return null;
-        return entityManager().find(BBChemSaltFormStructure.class, id);
-    }
-    
-    public static List<BBChemSaltFormStructure> BBChemSaltFormStructure.findBBChemSaltFormStructureEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM BBChemSaltFormStructure o", BBChemSaltFormStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<BBChemSaltFormStructure> BBChemSaltFormStructure.findBBChemSaltFormStructureEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM BBChemSaltFormStructure o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, BBChemSaltFormStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public BBChemSaltFormStructure BBChemSaltFormStructure.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        BBChemSaltFormStructure merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure_Roo_Jpa_Entity.aj
deleted file mode 100644
index 7544e168b..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemSaltFormStructure;
-import javax.persistence.Entity;
-
-privileged aspect BBChemSaltFormStructure_Roo_Jpa_Entity {
-    
-    declare @type: BBChemSaltFormStructure: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure_Roo_Json.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure_Roo_Json.aj
deleted file mode 100644
index a7f51610f..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemSaltFormStructure;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect BBChemSaltFormStructure_Roo_Json {
-    
-    public String BBChemSaltFormStructure.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String BBChemSaltFormStructure.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static BBChemSaltFormStructure BBChemSaltFormStructure.fromJsonToBBChemSaltFormStructure(String json) {
-        return new JSONDeserializer<BBChemSaltFormStructure>()
-        .use(null, BBChemSaltFormStructure.class).deserialize(json);
-    }
-    
-    public static String BBChemSaltFormStructure.toJsonArray(Collection<BBChemSaltFormStructure> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String BBChemSaltFormStructure.toJsonArray(Collection<BBChemSaltFormStructure> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<BBChemSaltFormStructure> BBChemSaltFormStructure.fromJsonArrayToBBChemSaltFormStructures(String json) {
-        return new JSONDeserializer<List<BBChemSaltFormStructure>>()
-        .use("values", BBChemSaltFormStructure.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure_Roo_ToString.aj
deleted file mode 100644
index f4fdea222..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemSaltFormStructure;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect BBChemSaltFormStructure_Roo_ToString {
-    
-    public String BBChemSaltFormStructure.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure.java
index 54f010ac5..d022fc02c 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure.java
@@ -1,16 +1,173 @@
 package com.labsynch.labseer.chemclasses.bbchem;
 
 import com.labsynch.labseer.domain.AbstractBBChemStructure;
-
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.TypedQuery;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
 @RooJpaActiveRecord(sequenceName = "BBCHEM_STRUCTURE_PKSEQ", finders = { "findBBChemSaltStructuresByRegEquals", "findBBChemSaltStructuresByPreRegEquals"})
 public class BBChemSaltStructure extends AbstractBBChemStructure {
 
+
+	public static Long countFindBBChemSaltStructuresByPreRegEquals(String preReg) {
+        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+        EntityManager em = BBChemSaltStructure.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemSaltStructure AS o WHERE o.preReg = :preReg", Long.class);
+        q.setParameter("preReg", preReg);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindBBChemSaltStructuresByRegEquals(String reg) {
+        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+        EntityManager em = BBChemSaltStructure.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemSaltStructure AS o WHERE o.reg = :reg", Long.class);
+        q.setParameter("reg", reg);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<BBChemSaltStructure> findBBChemSaltStructuresByPreRegEquals(String preReg) {
+        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+        EntityManager em = BBChemSaltStructure.entityManager();
+        TypedQuery<BBChemSaltStructure> q = em.createQuery("SELECT o FROM BBChemSaltStructure AS o WHERE o.preReg = :preReg", BBChemSaltStructure.class);
+        q.setParameter("preReg", preReg);
+        return q;
+    }
+
+	public static TypedQuery<BBChemSaltStructure> findBBChemSaltStructuresByPreRegEquals(String preReg, String sortFieldName, String sortOrder) {
+        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+        EntityManager em = BBChemSaltStructure.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemSaltStructure AS o WHERE o.preReg = :preReg");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<BBChemSaltStructure> q = em.createQuery(queryBuilder.toString(), BBChemSaltStructure.class);
+        q.setParameter("preReg", preReg);
+        return q;
+    }
+
+	public static TypedQuery<BBChemSaltStructure> findBBChemSaltStructuresByRegEquals(String reg) {
+        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+        EntityManager em = BBChemSaltStructure.entityManager();
+        TypedQuery<BBChemSaltStructure> q = em.createQuery("SELECT o FROM BBChemSaltStructure AS o WHERE o.reg = :reg", BBChemSaltStructure.class);
+        q.setParameter("reg", reg);
+        return q;
+    }
+
+	public static TypedQuery<BBChemSaltStructure> findBBChemSaltStructuresByRegEquals(String reg, String sortFieldName, String sortOrder) {
+        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+        EntityManager em = BBChemSaltStructure.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemSaltStructure AS o WHERE o.reg = :reg");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<BBChemSaltStructure> q = em.createQuery(queryBuilder.toString(), BBChemSaltStructure.class);
+        q.setParameter("reg", reg);
+        return q;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+
+	public static long countBBChemSaltStructures() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM BBChemSaltStructure o", Long.class).getSingleResult();
+    }
+
+	public static List<BBChemSaltStructure> findAllBBChemSaltStructures() {
+        return entityManager().createQuery("SELECT o FROM BBChemSaltStructure o", BBChemSaltStructure.class).getResultList();
+    }
+
+	public static List<BBChemSaltStructure> findAllBBChemSaltStructures(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM BBChemSaltStructure o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, BBChemSaltStructure.class).getResultList();
+    }
+
+	public static BBChemSaltStructure findBBChemSaltStructure(Long id) {
+        if (id == null) return null;
+        return entityManager().find(BBChemSaltStructure.class, id);
+    }
+
+	public static List<BBChemSaltStructure> findBBChemSaltStructureEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM BBChemSaltStructure o", BBChemSaltStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<BBChemSaltStructure> findBBChemSaltStructureEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM BBChemSaltStructure o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, BBChemSaltStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public BBChemSaltStructure merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        BBChemSaltStructure merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static BBChemSaltStructure fromJsonToBBChemSaltStructure(String json) {
+        return new JSONDeserializer<BBChemSaltStructure>()
+        .use(null, BBChemSaltStructure.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<BBChemSaltStructure> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<BBChemSaltStructure> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<BBChemSaltStructure> fromJsonArrayToBBChemSaltStructures(String json) {
+        return new JSONDeserializer<List<BBChemSaltStructure>>()
+        .use("values", BBChemSaltStructure.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure_Roo_Configurable.aj
deleted file mode 100644
index ad09f2502..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemSaltStructure;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect BBChemSaltStructure_Roo_Configurable {
-    
-    declare @type: BBChemSaltStructure: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure_Roo_Finder.aj
deleted file mode 100644
index 5db4e8955..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure_Roo_Finder.aj
+++ /dev/null
@@ -1,74 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemSaltStructure;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect BBChemSaltStructure_Roo_Finder {
-    
-    public static Long BBChemSaltStructure.countFindBBChemSaltStructuresByPreRegEquals(String preReg) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
-        EntityManager em = BBChemSaltStructure.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemSaltStructure AS o WHERE o.preReg = :preReg", Long.class);
-        q.setParameter("preReg", preReg);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long BBChemSaltStructure.countFindBBChemSaltStructuresByRegEquals(String reg) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
-        EntityManager em = BBChemSaltStructure.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemSaltStructure AS o WHERE o.reg = :reg", Long.class);
-        q.setParameter("reg", reg);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<BBChemSaltStructure> BBChemSaltStructure.findBBChemSaltStructuresByPreRegEquals(String preReg) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
-        EntityManager em = BBChemSaltStructure.entityManager();
-        TypedQuery<BBChemSaltStructure> q = em.createQuery("SELECT o FROM BBChemSaltStructure AS o WHERE o.preReg = :preReg", BBChemSaltStructure.class);
-        q.setParameter("preReg", preReg);
-        return q;
-    }
-    
-    public static TypedQuery<BBChemSaltStructure> BBChemSaltStructure.findBBChemSaltStructuresByPreRegEquals(String preReg, String sortFieldName, String sortOrder) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
-        EntityManager em = BBChemSaltStructure.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemSaltStructure AS o WHERE o.preReg = :preReg");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<BBChemSaltStructure> q = em.createQuery(queryBuilder.toString(), BBChemSaltStructure.class);
-        q.setParameter("preReg", preReg);
-        return q;
-    }
-    
-    public static TypedQuery<BBChemSaltStructure> BBChemSaltStructure.findBBChemSaltStructuresByRegEquals(String reg) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
-        EntityManager em = BBChemSaltStructure.entityManager();
-        TypedQuery<BBChemSaltStructure> q = em.createQuery("SELECT o FROM BBChemSaltStructure AS o WHERE o.reg = :reg", BBChemSaltStructure.class);
-        q.setParameter("reg", reg);
-        return q;
-    }
-    
-    public static TypedQuery<BBChemSaltStructure> BBChemSaltStructure.findBBChemSaltStructuresByRegEquals(String reg, String sortFieldName, String sortOrder) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
-        EntityManager em = BBChemSaltStructure.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemSaltStructure AS o WHERE o.reg = :reg");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<BBChemSaltStructure> q = em.createQuery(queryBuilder.toString(), BBChemSaltStructure.class);
-        q.setParameter("reg", reg);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index bd95e2bdf..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemSaltStructure;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect BBChemSaltStructure_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> BBChemSaltStructure.fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
-    
-    public static long BBChemSaltStructure.countBBChemSaltStructures() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM BBChemSaltStructure o", Long.class).getSingleResult();
-    }
-    
-    public static List<BBChemSaltStructure> BBChemSaltStructure.findAllBBChemSaltStructures() {
-        return entityManager().createQuery("SELECT o FROM BBChemSaltStructure o", BBChemSaltStructure.class).getResultList();
-    }
-    
-    public static List<BBChemSaltStructure> BBChemSaltStructure.findAllBBChemSaltStructures(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM BBChemSaltStructure o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, BBChemSaltStructure.class).getResultList();
-    }
-    
-    public static BBChemSaltStructure BBChemSaltStructure.findBBChemSaltStructure(Long id) {
-        if (id == null) return null;
-        return entityManager().find(BBChemSaltStructure.class, id);
-    }
-    
-    public static List<BBChemSaltStructure> BBChemSaltStructure.findBBChemSaltStructureEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM BBChemSaltStructure o", BBChemSaltStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<BBChemSaltStructure> BBChemSaltStructure.findBBChemSaltStructureEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM BBChemSaltStructure o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, BBChemSaltStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public BBChemSaltStructure BBChemSaltStructure.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        BBChemSaltStructure merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure_Roo_Jpa_Entity.aj
deleted file mode 100644
index b716dd592..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemSaltStructure;
-import javax.persistence.Entity;
-
-privileged aspect BBChemSaltStructure_Roo_Jpa_Entity {
-    
-    declare @type: BBChemSaltStructure: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure_Roo_Json.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure_Roo_Json.aj
deleted file mode 100644
index 88a2c954c..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemSaltStructure;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect BBChemSaltStructure_Roo_Json {
-    
-    public String BBChemSaltStructure.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String BBChemSaltStructure.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static BBChemSaltStructure BBChemSaltStructure.fromJsonToBBChemSaltStructure(String json) {
-        return new JSONDeserializer<BBChemSaltStructure>()
-        .use(null, BBChemSaltStructure.class).deserialize(json);
-    }
-    
-    public static String BBChemSaltStructure.toJsonArray(Collection<BBChemSaltStructure> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String BBChemSaltStructure.toJsonArray(Collection<BBChemSaltStructure> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<BBChemSaltStructure> BBChemSaltStructure.fromJsonArrayToBBChemSaltStructures(String json) {
-        return new JSONDeserializer<List<BBChemSaltStructure>>()
-        .use("values", BBChemSaltStructure.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure_Roo_ToString.aj
deleted file mode 100644
index 935f2559d..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemSaltStructure;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect BBChemSaltStructure_Roo_ToString {
-    
-    public String BBChemSaltStructure.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure.java
index 76c9cecd3..24a5587a2 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure.java
@@ -1,16 +1,173 @@
 package com.labsynch.labseer.chemclasses.bbchem;
 
 import com.labsynch.labseer.domain.AbstractBBChemStructure;
-
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.TypedQuery;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
 @RooJpaActiveRecord(sequenceName = "BBCHEM_STRUCTURE_PKSEQ", finders = { "findBBChemStandardizationDryRunStructuresByRegEquals", "findBBChemStandardizationDryRunStructuresByPreRegEquals"})
 public class BBChemStandardizationDryRunStructure extends AbstractBBChemStructure {
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static Long countFindBBChemStandardizationDryRunStructuresByPreRegEquals(String preReg) {
+        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+        EntityManager em = BBChemStandardizationDryRunStructure.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemStandardizationDryRunStructure AS o WHERE o.preReg = :preReg", Long.class);
+        q.setParameter("preReg", preReg);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindBBChemStandardizationDryRunStructuresByRegEquals(String reg) {
+        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+        EntityManager em = BBChemStandardizationDryRunStructure.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemStandardizationDryRunStructure AS o WHERE o.reg = :reg", Long.class);
+        q.setParameter("reg", reg);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<BBChemStandardizationDryRunStructure> findBBChemStandardizationDryRunStructuresByPreRegEquals(String preReg) {
+        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+        EntityManager em = BBChemStandardizationDryRunStructure.entityManager();
+        TypedQuery<BBChemStandardizationDryRunStructure> q = em.createQuery("SELECT o FROM BBChemStandardizationDryRunStructure AS o WHERE o.preReg = :preReg", BBChemStandardizationDryRunStructure.class);
+        q.setParameter("preReg", preReg);
+        return q;
+    }
+
+	public static TypedQuery<BBChemStandardizationDryRunStructure> findBBChemStandardizationDryRunStructuresByPreRegEquals(String preReg, String sortFieldName, String sortOrder) {
+        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+        EntityManager em = BBChemStandardizationDryRunStructure.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemStandardizationDryRunStructure AS o WHERE o.preReg = :preReg");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<BBChemStandardizationDryRunStructure> q = em.createQuery(queryBuilder.toString(), BBChemStandardizationDryRunStructure.class);
+        q.setParameter("preReg", preReg);
+        return q;
+    }
+
+	public static TypedQuery<BBChemStandardizationDryRunStructure> findBBChemStandardizationDryRunStructuresByRegEquals(String reg) {
+        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+        EntityManager em = BBChemStandardizationDryRunStructure.entityManager();
+        TypedQuery<BBChemStandardizationDryRunStructure> q = em.createQuery("SELECT o FROM BBChemStandardizationDryRunStructure AS o WHERE o.reg = :reg", BBChemStandardizationDryRunStructure.class);
+        q.setParameter("reg", reg);
+        return q;
+    }
+
+	public static TypedQuery<BBChemStandardizationDryRunStructure> findBBChemStandardizationDryRunStructuresByRegEquals(String reg, String sortFieldName, String sortOrder) {
+        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+        EntityManager em = BBChemStandardizationDryRunStructure.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemStandardizationDryRunStructure AS o WHERE o.reg = :reg");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<BBChemStandardizationDryRunStructure> q = em.createQuery(queryBuilder.toString(), BBChemStandardizationDryRunStructure.class);
+        q.setParameter("reg", reg);
+        return q;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+
+	public static long countBBChemStandardizationDryRunStructures() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM BBChemStandardizationDryRunStructure o", Long.class).getSingleResult();
+    }
+
+	public static List<BBChemStandardizationDryRunStructure> findAllBBChemStandardizationDryRunStructures() {
+        return entityManager().createQuery("SELECT o FROM BBChemStandardizationDryRunStructure o", BBChemStandardizationDryRunStructure.class).getResultList();
+    }
+
+	public static List<BBChemStandardizationDryRunStructure> findAllBBChemStandardizationDryRunStructures(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM BBChemStandardizationDryRunStructure o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, BBChemStandardizationDryRunStructure.class).getResultList();
+    }
+
+	public static BBChemStandardizationDryRunStructure findBBChemStandardizationDryRunStructure(Long id) {
+        if (id == null) return null;
+        return entityManager().find(BBChemStandardizationDryRunStructure.class, id);
+    }
+
+	public static List<BBChemStandardizationDryRunStructure> findBBChemStandardizationDryRunStructureEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM BBChemStandardizationDryRunStructure o", BBChemStandardizationDryRunStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<BBChemStandardizationDryRunStructure> findBBChemStandardizationDryRunStructureEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM BBChemStandardizationDryRunStructure o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, BBChemStandardizationDryRunStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public BBChemStandardizationDryRunStructure merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        BBChemStandardizationDryRunStructure merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static BBChemStandardizationDryRunStructure fromJsonToBBChemStandardizationDryRunStructure(String json) {
+        return new JSONDeserializer<BBChemStandardizationDryRunStructure>()
+        .use(null, BBChemStandardizationDryRunStructure.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<BBChemStandardizationDryRunStructure> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<BBChemStandardizationDryRunStructure> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<BBChemStandardizationDryRunStructure> fromJsonArrayToBBChemStandardizationDryRunStructures(String json) {
+        return new JSONDeserializer<List<BBChemStandardizationDryRunStructure>>()
+        .use("values", BBChemStandardizationDryRunStructure.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure_Roo_Configurable.aj
deleted file mode 100644
index f817c26f4..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemStandardizationDryRunStructure;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect BBChemStandardizationDryRunStructure_Roo_Configurable {
-    
-    declare @type: BBChemStandardizationDryRunStructure: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure_Roo_Finder.aj
deleted file mode 100644
index 311b739b4..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure_Roo_Finder.aj
+++ /dev/null
@@ -1,74 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemStandardizationDryRunStructure;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect BBChemStandardizationDryRunStructure_Roo_Finder {
-    
-    public static Long BBChemStandardizationDryRunStructure.countFindBBChemStandardizationDryRunStructuresByPreRegEquals(String preReg) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
-        EntityManager em = BBChemStandardizationDryRunStructure.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemStandardizationDryRunStructure AS o WHERE o.preReg = :preReg", Long.class);
-        q.setParameter("preReg", preReg);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long BBChemStandardizationDryRunStructure.countFindBBChemStandardizationDryRunStructuresByRegEquals(String reg) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
-        EntityManager em = BBChemStandardizationDryRunStructure.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemStandardizationDryRunStructure AS o WHERE o.reg = :reg", Long.class);
-        q.setParameter("reg", reg);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<BBChemStandardizationDryRunStructure> BBChemStandardizationDryRunStructure.findBBChemStandardizationDryRunStructuresByPreRegEquals(String preReg) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
-        EntityManager em = BBChemStandardizationDryRunStructure.entityManager();
-        TypedQuery<BBChemStandardizationDryRunStructure> q = em.createQuery("SELECT o FROM BBChemStandardizationDryRunStructure AS o WHERE o.preReg = :preReg", BBChemStandardizationDryRunStructure.class);
-        q.setParameter("preReg", preReg);
-        return q;
-    }
-    
-    public static TypedQuery<BBChemStandardizationDryRunStructure> BBChemStandardizationDryRunStructure.findBBChemStandardizationDryRunStructuresByPreRegEquals(String preReg, String sortFieldName, String sortOrder) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
-        EntityManager em = BBChemStandardizationDryRunStructure.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemStandardizationDryRunStructure AS o WHERE o.preReg = :preReg");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<BBChemStandardizationDryRunStructure> q = em.createQuery(queryBuilder.toString(), BBChemStandardizationDryRunStructure.class);
-        q.setParameter("preReg", preReg);
-        return q;
-    }
-    
-    public static TypedQuery<BBChemStandardizationDryRunStructure> BBChemStandardizationDryRunStructure.findBBChemStandardizationDryRunStructuresByRegEquals(String reg) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
-        EntityManager em = BBChemStandardizationDryRunStructure.entityManager();
-        TypedQuery<BBChemStandardizationDryRunStructure> q = em.createQuery("SELECT o FROM BBChemStandardizationDryRunStructure AS o WHERE o.reg = :reg", BBChemStandardizationDryRunStructure.class);
-        q.setParameter("reg", reg);
-        return q;
-    }
-    
-    public static TypedQuery<BBChemStandardizationDryRunStructure> BBChemStandardizationDryRunStructure.findBBChemStandardizationDryRunStructuresByRegEquals(String reg, String sortFieldName, String sortOrder) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
-        EntityManager em = BBChemStandardizationDryRunStructure.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemStandardizationDryRunStructure AS o WHERE o.reg = :reg");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<BBChemStandardizationDryRunStructure> q = em.createQuery(queryBuilder.toString(), BBChemStandardizationDryRunStructure.class);
-        q.setParameter("reg", reg);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index f432e354f..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemStandardizationDryRunStructure;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect BBChemStandardizationDryRunStructure_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> BBChemStandardizationDryRunStructure.fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
-    
-    public static long BBChemStandardizationDryRunStructure.countBBChemStandardizationDryRunStructures() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM BBChemStandardizationDryRunStructure o", Long.class).getSingleResult();
-    }
-    
-    public static List<BBChemStandardizationDryRunStructure> BBChemStandardizationDryRunStructure.findAllBBChemStandardizationDryRunStructures() {
-        return entityManager().createQuery("SELECT o FROM BBChemStandardizationDryRunStructure o", BBChemStandardizationDryRunStructure.class).getResultList();
-    }
-    
-    public static List<BBChemStandardizationDryRunStructure> BBChemStandardizationDryRunStructure.findAllBBChemStandardizationDryRunStructures(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM BBChemStandardizationDryRunStructure o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, BBChemStandardizationDryRunStructure.class).getResultList();
-    }
-    
-    public static BBChemStandardizationDryRunStructure BBChemStandardizationDryRunStructure.findBBChemStandardizationDryRunStructure(Long id) {
-        if (id == null) return null;
-        return entityManager().find(BBChemStandardizationDryRunStructure.class, id);
-    }
-    
-    public static List<BBChemStandardizationDryRunStructure> BBChemStandardizationDryRunStructure.findBBChemStandardizationDryRunStructureEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM BBChemStandardizationDryRunStructure o", BBChemStandardizationDryRunStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<BBChemStandardizationDryRunStructure> BBChemStandardizationDryRunStructure.findBBChemStandardizationDryRunStructureEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM BBChemStandardizationDryRunStructure o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, BBChemStandardizationDryRunStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public BBChemStandardizationDryRunStructure BBChemStandardizationDryRunStructure.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        BBChemStandardizationDryRunStructure merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure_Roo_Jpa_Entity.aj
deleted file mode 100644
index ca4a4e78c..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemStandardizationDryRunStructure;
-import javax.persistence.Entity;
-
-privileged aspect BBChemStandardizationDryRunStructure_Roo_Jpa_Entity {
-    
-    declare @type: BBChemStandardizationDryRunStructure: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure_Roo_Json.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure_Roo_Json.aj
deleted file mode 100644
index febaabf24..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemStandardizationDryRunStructure;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect BBChemStandardizationDryRunStructure_Roo_Json {
-    
-    public String BBChemStandardizationDryRunStructure.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String BBChemStandardizationDryRunStructure.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static BBChemStandardizationDryRunStructure BBChemStandardizationDryRunStructure.fromJsonToBBChemStandardizationDryRunStructure(String json) {
-        return new JSONDeserializer<BBChemStandardizationDryRunStructure>()
-        .use(null, BBChemStandardizationDryRunStructure.class).deserialize(json);
-    }
-    
-    public static String BBChemStandardizationDryRunStructure.toJsonArray(Collection<BBChemStandardizationDryRunStructure> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String BBChemStandardizationDryRunStructure.toJsonArray(Collection<BBChemStandardizationDryRunStructure> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<BBChemStandardizationDryRunStructure> BBChemStandardizationDryRunStructure.fromJsonArrayToBBChemStandardizationDryRunStructures(String json) {
-        return new JSONDeserializer<List<BBChemStandardizationDryRunStructure>>()
-        .use("values", BBChemStandardizationDryRunStructure.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure_Roo_ToString.aj
deleted file mode 100644
index bd732c5af..000000000
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.chemclasses.bbchem;
-
-import com.labsynch.labseer.chemclasses.bbchem.BBChemStandardizationDryRunStructure;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect BBChemStandardizationDryRunStructure_Roo_ToString {
-    
-    public String BBChemStandardizationDryRunStructure.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure.java b/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure.java
index db711426f..135bc6ee8 100644
--- a/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure.java
+++ b/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure.java
@@ -1,28 +1,45 @@
 package com.labsynch.labseer.domain;
 
 import java.util.BitSet;
+import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
-
+import java.util.List;
 import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Transient;
+import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 
 import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
-
+import com.labsynch.labseer.chemclasses.CmpdRegMolecule.RegistrationStatus;
+import com.labsynch.labseer.chemclasses.CmpdRegMolecule.StandardizationStatus;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.hibernate.annotations.Type;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
+@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
 @RooJavaBean
 @RooToString
 @RooJson
@@ -113,4 +130,274 @@ public void updateStructureInfo(AbstractBBChemStructure updatedBbChemStructure)
         this.setRecordedDate(updatedBbChemStructure.getRecordedDate());
     } 
 
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("id", "preReg", "reg", "mol", "substructure", "similarity", "recordedDate", "standardizationStatus", "standardizationComment", "registrationStatus", "registrationComment", "exactMolWeight", "averageMolWeight", "totalCharge", "smiles", "inchi", "molecularFormula", "properties");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new AbstractBBChemStructure() {
+        }.entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countAbstractBBChemStructures() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM AbstractBBChemStructure o", Long.class).getSingleResult();
+    }
+
+	public static List<AbstractBBChemStructure> findAllAbstractBBChemStructures() {
+        return entityManager().createQuery("SELECT o FROM AbstractBBChemStructure o", AbstractBBChemStructure.class).getResultList();
+    }
+
+	public static List<AbstractBBChemStructure> findAllAbstractBBChemStructures(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM AbstractBBChemStructure o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, AbstractBBChemStructure.class).getResultList();
+    }
+
+	public static AbstractBBChemStructure findAbstractBBChemStructure(Long id) {
+        if (id == null) return null;
+        return entityManager().find(AbstractBBChemStructure.class, id);
+    }
+
+	public static List<AbstractBBChemStructure> findAbstractBBChemStructureEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM AbstractBBChemStructure o", AbstractBBChemStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<AbstractBBChemStructure> findAbstractBBChemStructureEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM AbstractBBChemStructure o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, AbstractBBChemStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            AbstractBBChemStructure attached = AbstractBBChemStructure.findAbstractBBChemStructure(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public AbstractBBChemStructure merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        AbstractBBChemStructure merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String getPreReg() {
+        return this.preReg;
+    }
+
+	public void setPreReg(String preReg) {
+        this.preReg = preReg;
+    }
+
+	public String getReg() {
+        return this.reg;
+    }
+
+	public void setReg(String reg) {
+        this.reg = reg;
+    }
+
+	public String getMol() {
+        return this.mol;
+    }
+
+	public void setMol(String mol) {
+        this.mol = mol;
+    }
+
+	public BitSet getSubstructure() {
+        return this.substructure;
+    }
+
+	public void setSubstructure(BitSet substructure) {
+        this.substructure = substructure;
+    }
+
+	public BitSet getSimilarity() {
+        return this.similarity;
+    }
+
+	public void setSimilarity(BitSet similarity) {
+        this.similarity = similarity;
+    }
+
+	public Date getRecordedDate() {
+        return this.recordedDate;
+    }
+
+	public void setRecordedDate(Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+	public StandardizationStatus getStandardizationStatus() {
+        return this.standardizationStatus;
+    }
+
+	public void setStandardizationStatus(StandardizationStatus standardizationStatus) {
+        this.standardizationStatus = standardizationStatus;
+    }
+
+	public String getStandardizationComment() {
+        return this.standardizationComment;
+    }
+
+	public void setStandardizationComment(String standardizationComment) {
+        this.standardizationComment = standardizationComment;
+    }
+
+	public RegistrationStatus getRegistrationStatus() {
+        return this.registrationStatus;
+    }
+
+	public void setRegistrationStatus(RegistrationStatus registrationStatus) {
+        this.registrationStatus = registrationStatus;
+    }
+
+	public String getRegistrationComment() {
+        return this.registrationComment;
+    }
+
+	public void setRegistrationComment(String registrationComment) {
+        this.registrationComment = registrationComment;
+    }
+
+	public Double getExactMolWeight() {
+        return this.exactMolWeight;
+    }
+
+	public void setExactMolWeight(Double exactMolWeight) {
+        this.exactMolWeight = exactMolWeight;
+    }
+
+	public Double getAverageMolWeight() {
+        return this.averageMolWeight;
+    }
+
+	public void setAverageMolWeight(Double averageMolWeight) {
+        this.averageMolWeight = averageMolWeight;
+    }
+
+	public Integer getTotalCharge() {
+        return this.totalCharge;
+    }
+
+	public void setTotalCharge(Integer totalCharge) {
+        this.totalCharge = totalCharge;
+    }
+
+	public String getSmiles() {
+        return this.smiles;
+    }
+
+	public void setSmiles(String smiles) {
+        this.smiles = smiles;
+    }
+
+	public String getInchi() {
+        return this.inchi;
+    }
+
+	public void setInchi(String inchi) {
+        this.inchi = inchi;
+    }
+
+	public String getMolecularFormula() {
+        return this.molecularFormula;
+    }
+
+	public void setMolecularFormula(String molecularFormula) {
+        this.molecularFormula = molecularFormula;
+    }
+
+	public HashMap<String, String> getProperties() {
+        return this.properties;
+    }
+
+	public void setProperties(HashMap<String, String> properties) {
+        this.properties = properties;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static AbstractBBChemStructure fromJsonToAbstractBBChemStructure(String json) {
+        return new JSONDeserializer<AbstractBBChemStructure>()
+        .use(null, AbstractBBChemStructure.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<AbstractBBChemStructure> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<AbstractBBChemStructure> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<AbstractBBChemStructure> fromJsonArrayToAbstractBBChemStructures(String json) {
+        return new JSONDeserializer<List<AbstractBBChemStructure>>()
+        .use("values", AbstractBBChemStructure.class).deserialize(json);
+    }
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure_Roo_Configurable.aj
deleted file mode 100644
index 4a65e9fff..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AbstractBBChemStructure;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect AbstractBBChemStructure_Roo_Configurable {
-    
-    declare @type: AbstractBBChemStructure: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure_Roo_JavaBean.aj
deleted file mode 100644
index fc194d351..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure_Roo_JavaBean.aj
+++ /dev/null
@@ -1,151 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.chemclasses.CmpdRegMolecule.RegistrationStatus;
-import com.labsynch.labseer.chemclasses.CmpdRegMolecule.StandardizationStatus;
-import com.labsynch.labseer.domain.AbstractBBChemStructure;
-import java.util.BitSet;
-import java.util.Date;
-import java.util.HashMap;
-
-privileged aspect AbstractBBChemStructure_Roo_JavaBean {
-    
-    public String AbstractBBChemStructure.getPreReg() {
-        return this.preReg;
-    }
-    
-    public void AbstractBBChemStructure.setPreReg(String preReg) {
-        this.preReg = preReg;
-    }
-    
-    public String AbstractBBChemStructure.getReg() {
-        return this.reg;
-    }
-    
-    public void AbstractBBChemStructure.setReg(String reg) {
-        this.reg = reg;
-    }
-    
-    public String AbstractBBChemStructure.getMol() {
-        return this.mol;
-    }
-    
-    public void AbstractBBChemStructure.setMol(String mol) {
-        this.mol = mol;
-    }
-    
-    public BitSet AbstractBBChemStructure.getSubstructure() {
-        return this.substructure;
-    }
-    
-    public void AbstractBBChemStructure.setSubstructure(BitSet substructure) {
-        this.substructure = substructure;
-    }
-    
-    public BitSet AbstractBBChemStructure.getSimilarity() {
-        return this.similarity;
-    }
-    
-    public void AbstractBBChemStructure.setSimilarity(BitSet similarity) {
-        this.similarity = similarity;
-    }
-    
-    public Date AbstractBBChemStructure.getRecordedDate() {
-        return this.recordedDate;
-    }
-    
-    public void AbstractBBChemStructure.setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
-    
-    public StandardizationStatus AbstractBBChemStructure.getStandardizationStatus() {
-        return this.standardizationStatus;
-    }
-    
-    public void AbstractBBChemStructure.setStandardizationStatus(StandardizationStatus standardizationStatus) {
-        this.standardizationStatus = standardizationStatus;
-    }
-    
-    public String AbstractBBChemStructure.getStandardizationComment() {
-        return this.standardizationComment;
-    }
-    
-    public void AbstractBBChemStructure.setStandardizationComment(String standardizationComment) {
-        this.standardizationComment = standardizationComment;
-    }
-    
-    public RegistrationStatus AbstractBBChemStructure.getRegistrationStatus() {
-        return this.registrationStatus;
-    }
-    
-    public void AbstractBBChemStructure.setRegistrationStatus(RegistrationStatus registrationStatus) {
-        this.registrationStatus = registrationStatus;
-    }
-    
-    public String AbstractBBChemStructure.getRegistrationComment() {
-        return this.registrationComment;
-    }
-    
-    public void AbstractBBChemStructure.setRegistrationComment(String registrationComment) {
-        this.registrationComment = registrationComment;
-    }
-    
-    public Double AbstractBBChemStructure.getExactMolWeight() {
-        return this.exactMolWeight;
-    }
-    
-    public void AbstractBBChemStructure.setExactMolWeight(Double exactMolWeight) {
-        this.exactMolWeight = exactMolWeight;
-    }
-    
-    public Double AbstractBBChemStructure.getAverageMolWeight() {
-        return this.averageMolWeight;
-    }
-    
-    public void AbstractBBChemStructure.setAverageMolWeight(Double averageMolWeight) {
-        this.averageMolWeight = averageMolWeight;
-    }
-    
-    public Integer AbstractBBChemStructure.getTotalCharge() {
-        return this.totalCharge;
-    }
-    
-    public void AbstractBBChemStructure.setTotalCharge(Integer totalCharge) {
-        this.totalCharge = totalCharge;
-    }
-    
-    public String AbstractBBChemStructure.getSmiles() {
-        return this.smiles;
-    }
-    
-    public void AbstractBBChemStructure.setSmiles(String smiles) {
-        this.smiles = smiles;
-    }
-    
-    public String AbstractBBChemStructure.getInchi() {
-        return this.inchi;
-    }
-    
-    public void AbstractBBChemStructure.setInchi(String inchi) {
-        this.inchi = inchi;
-    }
-    
-    public String AbstractBBChemStructure.getMolecularFormula() {
-        return this.molecularFormula;
-    }
-    
-    public void AbstractBBChemStructure.setMolecularFormula(String molecularFormula) {
-        this.molecularFormula = molecularFormula;
-    }
-    
-    public HashMap<String, String> AbstractBBChemStructure.getProperties() {
-        return this.properties;
-    }
-    
-    public void AbstractBBChemStructure.setProperties(HashMap<String, String> properties) {
-        this.properties = properties;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index d7942c578..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,102 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AbstractBBChemStructure;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect AbstractBBChemStructure_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager AbstractBBChemStructure.entityManager;
-    
-    public static final List<String> AbstractBBChemStructure.fieldNames4OrderClauseFilter = java.util.Arrays.asList("id", "preReg", "reg", "mol", "substructure", "similarity", "recordedDate", "standardizationStatus", "standardizationComment", "registrationStatus", "registrationComment", "exactMolWeight", "averageMolWeight", "totalCharge", "smiles", "inchi", "molecularFormula", "properties");
-    
-    public static final EntityManager AbstractBBChemStructure.entityManager() {
-        EntityManager em = new AbstractBBChemStructure() {
-        }.entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long AbstractBBChemStructure.countAbstractBBChemStructures() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM AbstractBBChemStructure o", Long.class).getSingleResult();
-    }
-    
-    public static List<AbstractBBChemStructure> AbstractBBChemStructure.findAllAbstractBBChemStructures() {
-        return entityManager().createQuery("SELECT o FROM AbstractBBChemStructure o", AbstractBBChemStructure.class).getResultList();
-    }
-    
-    public static List<AbstractBBChemStructure> AbstractBBChemStructure.findAllAbstractBBChemStructures(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AbstractBBChemStructure o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AbstractBBChemStructure.class).getResultList();
-    }
-    
-    public static AbstractBBChemStructure AbstractBBChemStructure.findAbstractBBChemStructure(Long id) {
-        if (id == null) return null;
-        return entityManager().find(AbstractBBChemStructure.class, id);
-    }
-    
-    public static List<AbstractBBChemStructure> AbstractBBChemStructure.findAbstractBBChemStructureEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM AbstractBBChemStructure o", AbstractBBChemStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<AbstractBBChemStructure> AbstractBBChemStructure.findAbstractBBChemStructureEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AbstractBBChemStructure o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AbstractBBChemStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void AbstractBBChemStructure.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void AbstractBBChemStructure.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            AbstractBBChemStructure attached = AbstractBBChemStructure.findAbstractBBChemStructure(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void AbstractBBChemStructure.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void AbstractBBChemStructure.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public AbstractBBChemStructure AbstractBBChemStructure.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        AbstractBBChemStructure merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure_Roo_Jpa_Entity.aj
deleted file mode 100644
index 7010bdf90..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,31 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AbstractBBChemStructure;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Version;
-
-privileged aspect AbstractBBChemStructure_Roo_Jpa_Entity {
-    
-    declare @type: AbstractBBChemStructure: @Entity;
-    
-    declare @type: AbstractBBChemStructure: @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS);
-    
-    @Version
-    @Column(name = "version")
-    private Integer AbstractBBChemStructure.version;
-    
-    public Integer AbstractBBChemStructure.getVersion() {
-        return this.version;
-    }
-    
-    public void AbstractBBChemStructure.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure_Roo_Json.aj
deleted file mode 100644
index d040844b8..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AbstractBBChemStructure;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect AbstractBBChemStructure_Roo_Json {
-    
-    public String AbstractBBChemStructure.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String AbstractBBChemStructure.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static AbstractBBChemStructure AbstractBBChemStructure.fromJsonToAbstractBBChemStructure(String json) {
-        return new JSONDeserializer<AbstractBBChemStructure>()
-        .use(null, AbstractBBChemStructure.class).deserialize(json);
-    }
-    
-    public static String AbstractBBChemStructure.toJsonArray(Collection<AbstractBBChemStructure> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String AbstractBBChemStructure.toJsonArray(Collection<AbstractBBChemStructure> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<AbstractBBChemStructure> AbstractBBChemStructure.fromJsonArrayToAbstractBBChemStructures(String json) {
-        return new JSONDeserializer<List<AbstractBBChemStructure>>()
-        .use("values", AbstractBBChemStructure.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure_Roo_ToString.aj
deleted file mode 100644
index 1bbe8aa2d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AbstractBBChemStructure;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AbstractBBChemStructure_Roo_ToString {
-    
-    public String AbstractBBChemStructure.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractLabel.java b/src/main/java/com/labsynch/labseer/domain/AbstractLabel.java
index 0e404c70d..4d71d5b13 100755
--- a/src/main/java/com/labsynch/labseer/domain/AbstractLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/AbstractLabel.java
@@ -1,25 +1,34 @@
 package com.labsynch.labseer.domain;
 
 import java.util.Date;
-
+import java.util.List;
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
+import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord(sequenceName = "LABEL_PKSEQ", inheritanceType = "TABLE_PER_CLASS")
@@ -114,4 +123,188 @@ public AbstractLabel merge() {
 		this.entityManager.flush();
 		return merged;
 	}
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String getLabelText() {
+        return this.labelText;
+    }
+
+	public void setLabelText(String labelText) {
+        this.labelText = labelText;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public Date getRecordedDate() {
+        return this.recordedDate;
+    }
+
+	public void setRecordedDate(Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+	public Date getModifiedDate() {
+        return this.modifiedDate;
+    }
+
+	public void setModifiedDate(Date modifiedDate) {
+        this.modifiedDate = modifiedDate;
+    }
+
+	public boolean isPhysicallyLabled() {
+        return this.physicallyLabled;
+    }
+
+	public void setPhysicallyLabled(boolean physicallyLabled) {
+        this.physicallyLabled = physicallyLabled;
+    }
+
+	public String getImageFile() {
+        return this.imageFile;
+    }
+
+	public void setImageFile(String imageFile) {
+        this.imageFile = imageFile;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getLsTypeAndKind() {
+        return this.lsTypeAndKind;
+    }
+
+	public void setLsTypeAndKind(String lsTypeAndKind) {
+        this.lsTypeAndKind = lsTypeAndKind;
+    }
+
+	public boolean isPreferred() {
+        return this.preferred;
+    }
+
+	public void setPreferred(boolean preferred) {
+        this.preferred = preferred;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public boolean isDeleted() {
+        return this.deleted;
+    }
+
+	public void setDeleted(boolean deleted) {
+        this.deleted = deleted;
+    }
+
+	public Long getLsTransaction() {
+        return this.lsTransaction;
+    }
+
+	public void setLsTransaction(Long lsTransaction) {
+        this.lsTransaction = lsTransaction;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("labelText", "recordedBy", "recordedDate", "modifiedDate", "physicallyLabled", "imageFile", "lsType", "lsKind", "lsTypeAndKind", "preferred", "ignored", "deleted", "lsTransaction", "id", "entityManager");
+
+	public static long countAbstractLabels() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM AbstractLabel o", Long.class).getSingleResult();
+    }
+
+	public static List<AbstractLabel> findAllAbstractLabels() {
+        return entityManager().createQuery("SELECT o FROM AbstractLabel o", AbstractLabel.class).getResultList();
+    }
+
+	public static List<AbstractLabel> findAllAbstractLabels(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM AbstractLabel o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, AbstractLabel.class).getResultList();
+    }
+
+	public static AbstractLabel findAbstractLabel(Long id) {
+        if (id == null) return null;
+        return entityManager().find(AbstractLabel.class, id);
+    }
+
+	public static List<AbstractLabel> findAbstractLabelEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM AbstractLabel o", AbstractLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<AbstractLabel> findAbstractLabelEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM AbstractLabel o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, AbstractLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            AbstractLabel attached = AbstractLabel.findAbstractLabel(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractLabel_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/AbstractLabel_Roo_Configurable.aj
deleted file mode 100755
index fb16451ee..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AbstractLabel_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AbstractLabel;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect AbstractLabel_Roo_Configurable {
-    
-    declare @type: AbstractLabel: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractLabel_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/AbstractLabel_Roo_JavaBean.aj
deleted file mode 100755
index e170b0c2b..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AbstractLabel_Roo_JavaBean.aj
+++ /dev/null
@@ -1,115 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AbstractLabel;
-import java.util.Date;
-
-privileged aspect AbstractLabel_Roo_JavaBean {
-    
-    public String AbstractLabel.getLabelText() {
-        return this.labelText;
-    }
-    
-    public void AbstractLabel.setLabelText(String labelText) {
-        this.labelText = labelText;
-    }
-    
-    public String AbstractLabel.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void AbstractLabel.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public Date AbstractLabel.getRecordedDate() {
-        return this.recordedDate;
-    }
-    
-    public void AbstractLabel.setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
-    
-    public Date AbstractLabel.getModifiedDate() {
-        return this.modifiedDate;
-    }
-    
-    public void AbstractLabel.setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
-    
-    public boolean AbstractLabel.isPhysicallyLabled() {
-        return this.physicallyLabled;
-    }
-    
-    public void AbstractLabel.setPhysicallyLabled(boolean physicallyLabled) {
-        this.physicallyLabled = physicallyLabled;
-    }
-    
-    public String AbstractLabel.getImageFile() {
-        return this.imageFile;
-    }
-    
-    public void AbstractLabel.setImageFile(String imageFile) {
-        this.imageFile = imageFile;
-    }
-    
-    public String AbstractLabel.getLsType() {
-        return this.lsType;
-    }
-    
-    public void AbstractLabel.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String AbstractLabel.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void AbstractLabel.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String AbstractLabel.getLsTypeAndKind() {
-        return this.lsTypeAndKind;
-    }
-    
-    public void AbstractLabel.setLsTypeAndKind(String lsTypeAndKind) {
-        this.lsTypeAndKind = lsTypeAndKind;
-    }
-    
-    public boolean AbstractLabel.isPreferred() {
-        return this.preferred;
-    }
-    
-    public void AbstractLabel.setPreferred(boolean preferred) {
-        this.preferred = preferred;
-    }
-    
-    public boolean AbstractLabel.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void AbstractLabel.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public boolean AbstractLabel.isDeleted() {
-        return this.deleted;
-    }
-    
-    public void AbstractLabel.setDeleted(boolean deleted) {
-        this.deleted = deleted;
-    }
-    
-    public Long AbstractLabel.getLsTransaction() {
-        return this.lsTransaction;
-    }
-    
-    public void AbstractLabel.setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractLabel_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/AbstractLabel_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 49e6d68c8..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AbstractLabel_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,76 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AbstractLabel;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect AbstractLabel_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> AbstractLabel.fieldNames4OrderClauseFilter = java.util.Arrays.asList("labelText", "recordedBy", "recordedDate", "modifiedDate", "physicallyLabled", "imageFile", "lsType", "lsKind", "lsTypeAndKind", "preferred", "ignored", "deleted", "lsTransaction", "id", "entityManager");
-    
-    public static long AbstractLabel.countAbstractLabels() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM AbstractLabel o", Long.class).getSingleResult();
-    }
-    
-    public static List<AbstractLabel> AbstractLabel.findAllAbstractLabels() {
-        return entityManager().createQuery("SELECT o FROM AbstractLabel o", AbstractLabel.class).getResultList();
-    }
-    
-    public static List<AbstractLabel> AbstractLabel.findAllAbstractLabels(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AbstractLabel o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AbstractLabel.class).getResultList();
-    }
-    
-    public static AbstractLabel AbstractLabel.findAbstractLabel(Long id) {
-        if (id == null) return null;
-        return entityManager().find(AbstractLabel.class, id);
-    }
-    
-    public static List<AbstractLabel> AbstractLabel.findAbstractLabelEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM AbstractLabel o", AbstractLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<AbstractLabel> AbstractLabel.findAbstractLabelEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AbstractLabel o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AbstractLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void AbstractLabel.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            AbstractLabel attached = AbstractLabel.findAbstractLabel(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void AbstractLabel.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void AbstractLabel.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractLabel_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/AbstractLabel_Roo_Jpa_Entity.aj
deleted file mode 100755
index cd8570f70..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AbstractLabel_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,31 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AbstractLabel;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Version;
-
-privileged aspect AbstractLabel_Roo_Jpa_Entity {
-    
-    declare @type: AbstractLabel: @Entity;
-    
-    declare @type: AbstractLabel: @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS);
-    
-    @Version
-    @Column(name = "version")
-    private Integer AbstractLabel.version;
-    
-    public Integer AbstractLabel.getVersion() {
-        return this.version;
-    }
-    
-    public void AbstractLabel.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractLabel_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/AbstractLabel_Roo_ToString.aj
deleted file mode 100755
index da3bba4a4..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AbstractLabel_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AbstractLabel;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AbstractLabel_Roo_ToString {
-    
-    public String AbstractLabel.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractState.java b/src/main/java/com/labsynch/labseer/domain/AbstractState.java
index cffabca82..561bc7040 100755
--- a/src/main/java/com/labsynch/labseer/domain/AbstractState.java
+++ b/src/main/java/com/labsynch/labseer/domain/AbstractState.java
@@ -1,25 +1,34 @@
 package com.labsynch.labseer.domain;
 
 import java.util.Date;
-
+import java.util.List;
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
+import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
+@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord(sequenceName = "STATE_PKSEQ", inheritanceType = "TABLE_PER_CLASS")
@@ -106,4 +115,172 @@ public AbstractState merge() {
 		return merged;
 	}
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public Date getRecordedDate() {
+        return this.recordedDate;
+    }
+
+	public void setRecordedDate(Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+	public String getModifiedBy() {
+        return this.modifiedBy;
+    }
+
+	public void setModifiedBy(String modifiedBy) {
+        this.modifiedBy = modifiedBy;
+    }
+
+	public Date getModifiedDate() {
+        return this.modifiedDate;
+    }
+
+	public void setModifiedDate(Date modifiedDate) {
+        this.modifiedDate = modifiedDate;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getLsTypeAndKind() {
+        return this.lsTypeAndKind;
+    }
+
+	public void setLsTypeAndKind(String lsTypeAndKind) {
+        this.lsTypeAndKind = lsTypeAndKind;
+    }
+
+	public String getComments() {
+        return this.comments;
+    }
+
+	public void setComments(String comments) {
+        this.comments = comments;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public boolean isDeleted() {
+        return this.deleted;
+    }
+
+	public void setDeleted(boolean deleted) {
+        this.deleted = deleted;
+    }
+
+	public Long getLsTransaction() {
+        return this.lsTransaction;
+    }
+
+	public void setLsTransaction(Long lsTransaction) {
+        this.lsTransaction = lsTransaction;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("recordedBy", "recordedDate", "modifiedBy", "modifiedDate", "lsType", "lsKind", "lsTypeAndKind", "comments", "ignored", "deleted", "lsTransaction", "id", "entityManager");
+
+	public static long countAbstractStates() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM AbstractState o", Long.class).getSingleResult();
+    }
+
+	public static List<AbstractState> findAllAbstractStates() {
+        return entityManager().createQuery("SELECT o FROM AbstractState o", AbstractState.class).getResultList();
+    }
+
+	public static List<AbstractState> findAllAbstractStates(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM AbstractState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, AbstractState.class).getResultList();
+    }
+
+	public static AbstractState findAbstractState(Long id) {
+        if (id == null) return null;
+        return entityManager().find(AbstractState.class, id);
+    }
+
+	public static List<AbstractState> findAbstractStateEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM AbstractState o", AbstractState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<AbstractState> findAbstractStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM AbstractState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, AbstractState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            AbstractState attached = AbstractState.findAbstractState(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractState_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/AbstractState_Roo_Configurable.aj
deleted file mode 100755
index af3c87294..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AbstractState_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AbstractState;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect AbstractState_Roo_Configurable {
-    
-    declare @type: AbstractState: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractState_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/AbstractState_Roo_JavaBean.aj
deleted file mode 100755
index 8250bc454..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AbstractState_Roo_JavaBean.aj
+++ /dev/null
@@ -1,99 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AbstractState;
-import java.util.Date;
-
-privileged aspect AbstractState_Roo_JavaBean {
-    
-    public String AbstractState.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void AbstractState.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public Date AbstractState.getRecordedDate() {
-        return this.recordedDate;
-    }
-    
-    public void AbstractState.setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
-    
-    public String AbstractState.getModifiedBy() {
-        return this.modifiedBy;
-    }
-    
-    public void AbstractState.setModifiedBy(String modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
-    
-    public Date AbstractState.getModifiedDate() {
-        return this.modifiedDate;
-    }
-    
-    public void AbstractState.setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
-    
-    public String AbstractState.getLsType() {
-        return this.lsType;
-    }
-    
-    public void AbstractState.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String AbstractState.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void AbstractState.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String AbstractState.getLsTypeAndKind() {
-        return this.lsTypeAndKind;
-    }
-    
-    public void AbstractState.setLsTypeAndKind(String lsTypeAndKind) {
-        this.lsTypeAndKind = lsTypeAndKind;
-    }
-    
-    public String AbstractState.getComments() {
-        return this.comments;
-    }
-    
-    public void AbstractState.setComments(String comments) {
-        this.comments = comments;
-    }
-    
-    public boolean AbstractState.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void AbstractState.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public boolean AbstractState.isDeleted() {
-        return this.deleted;
-    }
-    
-    public void AbstractState.setDeleted(boolean deleted) {
-        this.deleted = deleted;
-    }
-    
-    public Long AbstractState.getLsTransaction() {
-        return this.lsTransaction;
-    }
-    
-    public void AbstractState.setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractState_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/AbstractState_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 9332efc1d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AbstractState_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,76 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AbstractState;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect AbstractState_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> AbstractState.fieldNames4OrderClauseFilter = java.util.Arrays.asList("recordedBy", "recordedDate", "modifiedBy", "modifiedDate", "lsType", "lsKind", "lsTypeAndKind", "comments", "ignored", "deleted", "lsTransaction", "id", "entityManager");
-    
-    public static long AbstractState.countAbstractStates() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM AbstractState o", Long.class).getSingleResult();
-    }
-    
-    public static List<AbstractState> AbstractState.findAllAbstractStates() {
-        return entityManager().createQuery("SELECT o FROM AbstractState o", AbstractState.class).getResultList();
-    }
-    
-    public static List<AbstractState> AbstractState.findAllAbstractStates(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AbstractState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AbstractState.class).getResultList();
-    }
-    
-    public static AbstractState AbstractState.findAbstractState(Long id) {
-        if (id == null) return null;
-        return entityManager().find(AbstractState.class, id);
-    }
-    
-    public static List<AbstractState> AbstractState.findAbstractStateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM AbstractState o", AbstractState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<AbstractState> AbstractState.findAbstractStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AbstractState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AbstractState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void AbstractState.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            AbstractState attached = AbstractState.findAbstractState(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void AbstractState.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void AbstractState.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractState_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/AbstractState_Roo_Jpa_Entity.aj
deleted file mode 100755
index d43431d65..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AbstractState_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,31 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AbstractState;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Version;
-
-privileged aspect AbstractState_Roo_Jpa_Entity {
-    
-    declare @type: AbstractState: @Entity;
-    
-    declare @type: AbstractState: @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS);
-    
-    @Version
-    @Column(name = "version")
-    private Integer AbstractState.version;
-    
-    public Integer AbstractState.getVersion() {
-        return this.version;
-    }
-    
-    public void AbstractState.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractState_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/AbstractState_Roo_ToString.aj
deleted file mode 100755
index e0c93bf3f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AbstractState_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AbstractState;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AbstractState_Roo_ToString {
-    
-    public String AbstractState.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractThing.java b/src/main/java/com/labsynch/labseer/domain/AbstractThing.java
index 765a76d61..b24ba2aba 100755
--- a/src/main/java/com/labsynch/labseer/domain/AbstractThing.java
+++ b/src/main/java/com/labsynch/labseer/domain/AbstractThing.java
@@ -7,10 +7,13 @@
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.OneToMany;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
@@ -19,13 +22,18 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
+@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord(sequenceName = "THING_PKSEQ", inheritanceType = "TABLE_PER_CLASS")
@@ -167,4 +175,140 @@ public void logicalDelete() {
 
 
 	
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getLsTypeAndKind() {
+        return this.lsTypeAndKind;
+    }
+
+	public void setLsTypeAndKind(String lsTypeAndKind) {
+        this.lsTypeAndKind = lsTypeAndKind;
+    }
+
+	public String getCodeName() {
+        return this.codeName;
+    }
+
+	public void setCodeName(String codeName) {
+        this.codeName = codeName;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public Date getRecordedDate() {
+        return this.recordedDate;
+    }
+
+	public void setRecordedDate(Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+	public String getModifiedBy() {
+        return this.modifiedBy;
+    }
+
+	public void setModifiedBy(String modifiedBy) {
+        this.modifiedBy = modifiedBy;
+    }
+
+	public Date getModifiedDate() {
+        return this.modifiedDate;
+    }
+
+	public void setModifiedDate(Date modifiedDate) {
+        this.modifiedDate = modifiedDate;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public boolean isDeleted() {
+        return this.deleted;
+    }
+
+	public void setDeleted(boolean deleted) {
+        this.deleted = deleted;
+    }
+
+	public Long getLsTransaction() {
+        return this.lsTransaction;
+    }
+
+	public void setLsTransaction(Long lsTransaction) {
+        this.lsTransaction = lsTransaction;
+    }
+
+	public Set<ThingPage> getThingPage() {
+        return this.thingPage;
+    }
+
+	public void setThingPage(Set<ThingPage> thingPage) {
+        this.thingPage = thingPage;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("id", "version", "lsType", "lsKind", "lsTypeAndKind", "codeName", "recordedBy", "recordedDate", "modifiedBy", "modifiedDate", "ignored", "deleted", "lsTransaction", "thingPage", "entityManager");
+
+	public static List<AbstractThing> findAllAbstractThings(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM AbstractThing o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, AbstractThing.class).getResultList();
+    }
+
+	public static List<AbstractThing> findAbstractThingEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM AbstractThing o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, AbstractThing.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractThing_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/AbstractThing_Roo_Configurable.aj
deleted file mode 100755
index 81c030746..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AbstractThing_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AbstractThing;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect AbstractThing_Roo_Configurable {
-    
-    declare @type: AbstractThing: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractThing_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/AbstractThing_Roo_JavaBean.aj
deleted file mode 100755
index be52205eb..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AbstractThing_Roo_JavaBean.aj
+++ /dev/null
@@ -1,109 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AbstractThing;
-import com.labsynch.labseer.domain.ThingPage;
-import java.util.Date;
-import java.util.Set;
-
-privileged aspect AbstractThing_Roo_JavaBean {
-    
-    public String AbstractThing.getLsType() {
-        return this.lsType;
-    }
-    
-    public void AbstractThing.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String AbstractThing.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void AbstractThing.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String AbstractThing.getLsTypeAndKind() {
-        return this.lsTypeAndKind;
-    }
-    
-    public void AbstractThing.setLsTypeAndKind(String lsTypeAndKind) {
-        this.lsTypeAndKind = lsTypeAndKind;
-    }
-    
-    public String AbstractThing.getCodeName() {
-        return this.codeName;
-    }
-    
-    public void AbstractThing.setCodeName(String codeName) {
-        this.codeName = codeName;
-    }
-    
-    public String AbstractThing.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void AbstractThing.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public Date AbstractThing.getRecordedDate() {
-        return this.recordedDate;
-    }
-    
-    public void AbstractThing.setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
-    
-    public String AbstractThing.getModifiedBy() {
-        return this.modifiedBy;
-    }
-    
-    public void AbstractThing.setModifiedBy(String modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
-    
-    public Date AbstractThing.getModifiedDate() {
-        return this.modifiedDate;
-    }
-    
-    public void AbstractThing.setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
-    
-    public boolean AbstractThing.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void AbstractThing.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public boolean AbstractThing.isDeleted() {
-        return this.deleted;
-    }
-    
-    public void AbstractThing.setDeleted(boolean deleted) {
-        this.deleted = deleted;
-    }
-    
-    public Long AbstractThing.getLsTransaction() {
-        return this.lsTransaction;
-    }
-    
-    public void AbstractThing.setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
-    
-    public Set<ThingPage> AbstractThing.getThingPage() {
-        return this.thingPage;
-    }
-    
-    public void AbstractThing.setThingPage(Set<ThingPage> thingPage) {
-        this.thingPage = thingPage;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractThing_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/AbstractThing_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 15d47ecbd..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AbstractThing_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,48 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AbstractThing;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect AbstractThing_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> AbstractThing.fieldNames4OrderClauseFilter = java.util.Arrays.asList("id", "version", "lsType", "lsKind", "lsTypeAndKind", "codeName", "recordedBy", "recordedDate", "modifiedBy", "modifiedDate", "ignored", "deleted", "lsTransaction", "thingPage", "entityManager");
-    
-    public static List<AbstractThing> AbstractThing.findAllAbstractThings(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AbstractThing o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AbstractThing.class).getResultList();
-    }
-    
-    public static List<AbstractThing> AbstractThing.findAbstractThingEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AbstractThing o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AbstractThing.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void AbstractThing.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void AbstractThing.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractThing_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/AbstractThing_Roo_Jpa_Entity.aj
deleted file mode 100755
index 6e2a6240e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AbstractThing_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,17 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AbstractThing;
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-
-privileged aspect AbstractThing_Roo_Jpa_Entity {
-    
-    declare @type: AbstractThing: @Entity;
-    
-    declare @type: AbstractThing: @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS);
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractThing_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/AbstractThing_Roo_ToString.aj
deleted file mode 100755
index c1d372b51..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AbstractThing_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AbstractThing;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AbstractThing_Roo_ToString {
-    
-    public String AbstractThing.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractValue.java b/src/main/java/com/labsynch/labseer/domain/AbstractValue.java
index f28781aa5..e55c2a415 100755
--- a/src/main/java/com/labsynch/labseer/domain/AbstractValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/AbstractValue.java
@@ -2,21 +2,27 @@
 
 import java.math.BigDecimal;
 import java.util.Date;
-
+import java.util.List;
 import javax.persistence.Basic;
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
+import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
@@ -25,6 +31,9 @@
 import org.supercsv.cellprocessor.Optional;
 import org.supercsv.cellprocessor.ift.CellProcessor;
 
+@Configurable
+@Entity
+@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord(sequenceName = "VALUE_PKSEQ", inheritanceType = "TABLE_PER_CLASS")
@@ -304,4 +313,356 @@ public static CellProcessor[] getProcessors() {
 	
 	
 	
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getLsTypeAndKind() {
+        return this.lsTypeAndKind;
+    }
+
+	public String getCodeOrigin() {
+        return this.codeOrigin;
+    }
+
+	public void setCodeOrigin(String codeOrigin) {
+        this.codeOrigin = codeOrigin;
+    }
+
+	public String getCodeType() {
+        return this.codeType;
+    }
+
+	public void setCodeType(String codeType) {
+        this.codeType = codeType;
+    }
+
+	public String getCodeKind() {
+        return this.codeKind;
+    }
+
+	public void setCodeKind(String codeKind) {
+        this.codeKind = codeKind;
+    }
+
+	public String getCodeTypeAndKind() {
+        return this.codeTypeAndKind;
+    }
+
+	public void setCodeTypeAndKind(String codeTypeAndKind) {
+        this.codeTypeAndKind = codeTypeAndKind;
+    }
+
+	public String getStringValue() {
+        return this.stringValue;
+    }
+
+	public void setStringValue(String stringValue) {
+        this.stringValue = stringValue;
+    }
+
+	public String getCodeValue() {
+        return this.codeValue;
+    }
+
+	public void setCodeValue(String codeValue) {
+        this.codeValue = codeValue;
+    }
+
+	public String getFileValue() {
+        return this.fileValue;
+    }
+
+	public void setFileValue(String fileValue) {
+        this.fileValue = fileValue;
+    }
+
+	public String getUrlValue() {
+        return this.urlValue;
+    }
+
+	public void setUrlValue(String urlValue) {
+        this.urlValue = urlValue;
+    }
+
+	public Date getDateValue() {
+        return this.dateValue;
+    }
+
+	public void setDateValue(Date dateValue) {
+        this.dateValue = dateValue;
+    }
+
+	public String getClobValue() {
+        return this.clobValue;
+    }
+
+	public void setClobValue(String clobValue) {
+        this.clobValue = clobValue;
+    }
+
+	public byte[] getBlobValue() {
+        return this.blobValue;
+    }
+
+	public void setBlobValue(byte[] blobValue) {
+        this.blobValue = blobValue;
+    }
+
+	public String getOperatorType() {
+        return this.operatorType;
+    }
+
+	public void setOperatorType(String operatorType) {
+        this.operatorType = operatorType;
+    }
+
+	public String getOperatorKind() {
+        return this.operatorKind;
+    }
+
+	public void setOperatorKind(String operatorKind) {
+        this.operatorKind = operatorKind;
+    }
+
+	public String getOperatorTypeAndKind() {
+        return this.operatorTypeAndKind;
+    }
+
+	public BigDecimal getNumericValue() {
+        return this.numericValue;
+    }
+
+	public Integer getSigFigs() {
+        return this.sigFigs;
+    }
+
+	public void setSigFigs(Integer sigFigs) {
+        this.sigFigs = sigFigs;
+    }
+
+	public BigDecimal getUncertainty() {
+        return this.uncertainty;
+    }
+
+	public void setUncertainty(BigDecimal uncertainty) {
+        this.uncertainty = uncertainty;
+    }
+
+	public Integer getNumberOfReplicates() {
+        return this.numberOfReplicates;
+    }
+
+	public void setNumberOfReplicates(Integer numberOfReplicates) {
+        this.numberOfReplicates = numberOfReplicates;
+    }
+
+	public String getUncertaintyType() {
+        return this.uncertaintyType;
+    }
+
+	public void setUncertaintyType(String uncertaintyType) {
+        this.uncertaintyType = uncertaintyType;
+    }
+
+	public String getUnitType() {
+        return this.unitType;
+    }
+
+	public void setUnitType(String unitType) {
+        this.unitType = unitType;
+    }
+
+	public String getUnitKind() {
+        return this.unitKind;
+    }
+
+	public void setUnitKind(String unitKind) {
+        this.unitKind = unitKind;
+    }
+
+	public String getUnitTypeAndKind() {
+        return this.unitTypeAndKind;
+    }
+
+	public Double getConcentration() {
+        return this.concentration;
+    }
+
+	public void setConcentration(Double concentration) {
+        this.concentration = concentration;
+    }
+
+	public String getConcUnit() {
+        return this.concUnit;
+    }
+
+	public void setConcUnit(String concUnit) {
+        this.concUnit = concUnit;
+    }
+
+	public String getComments() {
+        return this.comments;
+    }
+
+	public void setComments(String comments) {
+        this.comments = comments;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public boolean isDeleted() {
+        return this.deleted;
+    }
+
+	public void setDeleted(boolean deleted) {
+        this.deleted = deleted;
+    }
+
+	public Long getLsTransaction() {
+        return this.lsTransaction;
+    }
+
+	public void setLsTransaction(Long lsTransaction) {
+        this.lsTransaction = lsTransaction;
+    }
+
+	public Date getRecordedDate() {
+        return this.recordedDate;
+    }
+
+	public void setRecordedDate(Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public Date getModifiedDate() {
+        return this.modifiedDate;
+    }
+
+	public void setModifiedDate(Date modifiedDate) {
+        this.modifiedDate = modifiedDate;
+    }
+
+	public String getModifiedBy() {
+        return this.modifiedBy;
+    }
+
+	public void setModifiedBy(String modifiedBy) {
+        this.modifiedBy = modifiedBy;
+    }
+
+	public boolean isPublicData() {
+        return this.publicData;
+    }
+
+	public void setPublicData(boolean publicData) {
+        this.publicData = publicData;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "lsKind", "lsTypeAndKind", "codeOrigin", "codeType", "codeKind", "codeTypeAndKind", "stringValue", "codeValue", "fileValue", "urlValue", "dateValue", "clobValue", "blobValue", "operatorType", "operatorKind", "operatorTypeAndKind", "numericValue", "sigFigs", "uncertainty", "numberOfReplicates", "uncertaintyType", "unitType", "unitKind", "unitTypeAndKind", "concentration", "concUnit", "comments", "ignored", "deleted", "lsTransaction", "recordedDate", "recordedBy", "modifiedDate", "modifiedBy", "publicData", "id", "entityManager");
+
+	public static long countAbstractValues() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM AbstractValue o", Long.class).getSingleResult();
+    }
+
+	public static List<AbstractValue> findAllAbstractValues() {
+        return entityManager().createQuery("SELECT o FROM AbstractValue o", AbstractValue.class).getResultList();
+    }
+
+	public static List<AbstractValue> findAllAbstractValues(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM AbstractValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, AbstractValue.class).getResultList();
+    }
+
+	public static AbstractValue findAbstractValue(Long id) {
+        if (id == null) return null;
+        return entityManager().find(AbstractValue.class, id);
+    }
+
+	public static List<AbstractValue> findAbstractValueEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM AbstractValue o", AbstractValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<AbstractValue> findAbstractValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM AbstractValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, AbstractValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            AbstractValue attached = AbstractValue.findAbstractValue(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractValue_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/AbstractValue_Roo_Configurable.aj
deleted file mode 100755
index 91d6e8ec1..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AbstractValue_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AbstractValue;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect AbstractValue_Roo_Configurable {
-    
-    declare @type: AbstractValue: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractValue_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/AbstractValue_Roo_JavaBean.aj
deleted file mode 100755
index 5ed400d22..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AbstractValue_Roo_JavaBean.aj
+++ /dev/null
@@ -1,284 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AbstractValue;
-import java.math.BigDecimal;
-import java.util.Date;
-
-privileged aspect AbstractValue_Roo_JavaBean {
-    
-    public String AbstractValue.getLsType() {
-        return this.lsType;
-    }
-    
-    public void AbstractValue.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String AbstractValue.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void AbstractValue.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String AbstractValue.getLsTypeAndKind() {
-        return this.lsTypeAndKind;
-    }
-    
-    public String AbstractValue.getCodeOrigin() {
-        return this.codeOrigin;
-    }
-    
-    public void AbstractValue.setCodeOrigin(String codeOrigin) {
-        this.codeOrigin = codeOrigin;
-    }
-    
-    public String AbstractValue.getCodeType() {
-        return this.codeType;
-    }
-    
-    public void AbstractValue.setCodeType(String codeType) {
-        this.codeType = codeType;
-    }
-    
-    public String AbstractValue.getCodeKind() {
-        return this.codeKind;
-    }
-    
-    public void AbstractValue.setCodeKind(String codeKind) {
-        this.codeKind = codeKind;
-    }
-    
-    public String AbstractValue.getCodeTypeAndKind() {
-        return this.codeTypeAndKind;
-    }
-    
-    public void AbstractValue.setCodeTypeAndKind(String codeTypeAndKind) {
-        this.codeTypeAndKind = codeTypeAndKind;
-    }
-    
-    public String AbstractValue.getStringValue() {
-        return this.stringValue;
-    }
-    
-    public void AbstractValue.setStringValue(String stringValue) {
-        this.stringValue = stringValue;
-    }
-    
-    public String AbstractValue.getCodeValue() {
-        return this.codeValue;
-    }
-    
-    public void AbstractValue.setCodeValue(String codeValue) {
-        this.codeValue = codeValue;
-    }
-    
-    public String AbstractValue.getFileValue() {
-        return this.fileValue;
-    }
-    
-    public void AbstractValue.setFileValue(String fileValue) {
-        this.fileValue = fileValue;
-    }
-    
-    public String AbstractValue.getUrlValue() {
-        return this.urlValue;
-    }
-    
-    public void AbstractValue.setUrlValue(String urlValue) {
-        this.urlValue = urlValue;
-    }
-    
-    public Date AbstractValue.getDateValue() {
-        return this.dateValue;
-    }
-    
-    public void AbstractValue.setDateValue(Date dateValue) {
-        this.dateValue = dateValue;
-    }
-    
-    public String AbstractValue.getClobValue() {
-        return this.clobValue;
-    }
-    
-    public void AbstractValue.setClobValue(String clobValue) {
-        this.clobValue = clobValue;
-    }
-    
-    public byte[] AbstractValue.getBlobValue() {
-        return this.blobValue;
-    }
-    
-    public void AbstractValue.setBlobValue(byte[] blobValue) {
-        this.blobValue = blobValue;
-    }
-    
-    public String AbstractValue.getOperatorType() {
-        return this.operatorType;
-    }
-    
-    public void AbstractValue.setOperatorType(String operatorType) {
-        this.operatorType = operatorType;
-    }
-    
-    public String AbstractValue.getOperatorKind() {
-        return this.operatorKind;
-    }
-    
-    public void AbstractValue.setOperatorKind(String operatorKind) {
-        this.operatorKind = operatorKind;
-    }
-    
-    public String AbstractValue.getOperatorTypeAndKind() {
-        return this.operatorTypeAndKind;
-    }
-    
-    public BigDecimal AbstractValue.getNumericValue() {
-        return this.numericValue;
-    }
-    
-    public Integer AbstractValue.getSigFigs() {
-        return this.sigFigs;
-    }
-    
-    public void AbstractValue.setSigFigs(Integer sigFigs) {
-        this.sigFigs = sigFigs;
-    }
-    
-    public BigDecimal AbstractValue.getUncertainty() {
-        return this.uncertainty;
-    }
-    
-    public void AbstractValue.setUncertainty(BigDecimal uncertainty) {
-        this.uncertainty = uncertainty;
-    }
-    
-    public Integer AbstractValue.getNumberOfReplicates() {
-        return this.numberOfReplicates;
-    }
-    
-    public void AbstractValue.setNumberOfReplicates(Integer numberOfReplicates) {
-        this.numberOfReplicates = numberOfReplicates;
-    }
-    
-    public String AbstractValue.getUncertaintyType() {
-        return this.uncertaintyType;
-    }
-    
-    public void AbstractValue.setUncertaintyType(String uncertaintyType) {
-        this.uncertaintyType = uncertaintyType;
-    }
-    
-    public String AbstractValue.getUnitType() {
-        return this.unitType;
-    }
-    
-    public void AbstractValue.setUnitType(String unitType) {
-        this.unitType = unitType;
-    }
-    
-    public String AbstractValue.getUnitKind() {
-        return this.unitKind;
-    }
-    
-    public void AbstractValue.setUnitKind(String unitKind) {
-        this.unitKind = unitKind;
-    }
-    
-    public String AbstractValue.getUnitTypeAndKind() {
-        return this.unitTypeAndKind;
-    }
-    
-    public Double AbstractValue.getConcentration() {
-        return this.concentration;
-    }
-    
-    public void AbstractValue.setConcentration(Double concentration) {
-        this.concentration = concentration;
-    }
-    
-    public String AbstractValue.getConcUnit() {
-        return this.concUnit;
-    }
-    
-    public void AbstractValue.setConcUnit(String concUnit) {
-        this.concUnit = concUnit;
-    }
-    
-    public String AbstractValue.getComments() {
-        return this.comments;
-    }
-    
-    public void AbstractValue.setComments(String comments) {
-        this.comments = comments;
-    }
-    
-    public boolean AbstractValue.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void AbstractValue.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public boolean AbstractValue.isDeleted() {
-        return this.deleted;
-    }
-    
-    public void AbstractValue.setDeleted(boolean deleted) {
-        this.deleted = deleted;
-    }
-    
-    public Long AbstractValue.getLsTransaction() {
-        return this.lsTransaction;
-    }
-    
-    public void AbstractValue.setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
-    
-    public Date AbstractValue.getRecordedDate() {
-        return this.recordedDate;
-    }
-    
-    public void AbstractValue.setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
-    
-    public String AbstractValue.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void AbstractValue.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public Date AbstractValue.getModifiedDate() {
-        return this.modifiedDate;
-    }
-    
-    public void AbstractValue.setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
-    
-    public String AbstractValue.getModifiedBy() {
-        return this.modifiedBy;
-    }
-    
-    public void AbstractValue.setModifiedBy(String modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
-    
-    public boolean AbstractValue.isPublicData() {
-        return this.publicData;
-    }
-    
-    public void AbstractValue.setPublicData(boolean publicData) {
-        this.publicData = publicData;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractValue_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/AbstractValue_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 6f21aa2c3..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AbstractValue_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,76 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AbstractValue;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect AbstractValue_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> AbstractValue.fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "lsKind", "lsTypeAndKind", "codeOrigin", "codeType", "codeKind", "codeTypeAndKind", "stringValue", "codeValue", "fileValue", "urlValue", "dateValue", "clobValue", "blobValue", "operatorType", "operatorKind", "operatorTypeAndKind", "numericValue", "sigFigs", "uncertainty", "numberOfReplicates", "uncertaintyType", "unitType", "unitKind", "unitTypeAndKind", "concentration", "concUnit", "comments", "ignored", "deleted", "lsTransaction", "recordedDate", "recordedBy", "modifiedDate", "modifiedBy", "publicData", "id", "entityManager");
-    
-    public static long AbstractValue.countAbstractValues() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM AbstractValue o", Long.class).getSingleResult();
-    }
-    
-    public static List<AbstractValue> AbstractValue.findAllAbstractValues() {
-        return entityManager().createQuery("SELECT o FROM AbstractValue o", AbstractValue.class).getResultList();
-    }
-    
-    public static List<AbstractValue> AbstractValue.findAllAbstractValues(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AbstractValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AbstractValue.class).getResultList();
-    }
-    
-    public static AbstractValue AbstractValue.findAbstractValue(Long id) {
-        if (id == null) return null;
-        return entityManager().find(AbstractValue.class, id);
-    }
-    
-    public static List<AbstractValue> AbstractValue.findAbstractValueEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM AbstractValue o", AbstractValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<AbstractValue> AbstractValue.findAbstractValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AbstractValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AbstractValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void AbstractValue.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            AbstractValue attached = AbstractValue.findAbstractValue(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void AbstractValue.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void AbstractValue.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractValue_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/AbstractValue_Roo_Jpa_Entity.aj
deleted file mode 100755
index fc6724397..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AbstractValue_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,31 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AbstractValue;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Version;
-
-privileged aspect AbstractValue_Roo_Jpa_Entity {
-    
-    declare @type: AbstractValue: @Entity;
-    
-    declare @type: AbstractValue: @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS);
-    
-    @Version
-    @Column(name = "version")
-    private Integer AbstractValue.version;
-    
-    public Integer AbstractValue.getVersion() {
-        return this.version;
-    }
-    
-    public void AbstractValue.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractValue_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/AbstractValue_Roo_ToString.aj
deleted file mode 100755
index 4bd6811fb..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AbstractValue_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AbstractValue;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AbstractValue_Roo_ToString {
-    
-    public String AbstractValue.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroup.java b/src/main/java/com/labsynch/labseer/domain/AnalysisGroup.java
index 08fb71e1e..26cfd1dcd 100755
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroup.java
+++ b/src/main/java/com/labsynch/labseer/domain/AnalysisGroup.java
@@ -10,6 +10,7 @@
 import java.util.Set;
 
 import javax.persistence.CascadeType;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
 import javax.persistence.JoinTable;
@@ -17,9 +18,11 @@
 import javax.persistence.OneToMany;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -34,6 +37,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -284,4 +289,234 @@ private static Collection<Long> removeCascadeAware(Long id) {
         return treatmentGroupIds;
 		
 	}
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "experiments", "lsLabels", "lsStates", "treatmentGroups");
+
+	public static long countAnalysisGroups() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM AnalysisGroup o", Long.class).getSingleResult();
+    }
+
+	public static List<AnalysisGroup> findAllAnalysisGroups() {
+        return entityManager().createQuery("SELECT o FROM AnalysisGroup o", AnalysisGroup.class).getResultList();
+    }
+
+	public static List<AnalysisGroup> findAllAnalysisGroups(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM AnalysisGroup o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, AnalysisGroup.class).getResultList();
+    }
+
+	public static AnalysisGroup findAnalysisGroup(Long id) {
+        if (id == null) return null;
+        return entityManager().find(AnalysisGroup.class, id);
+    }
+
+	public static List<AnalysisGroup> findAnalysisGroupEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM AnalysisGroup o", AnalysisGroup.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<AnalysisGroup> findAnalysisGroupEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM AnalysisGroup o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, AnalysisGroup.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public AnalysisGroup merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        AnalysisGroup merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public static Long countFindAnalysisGroupsByExperiments(Set<Experiment> experiments) {
+        if (experiments == null) throw new IllegalArgumentException("The experiments argument is required");
+        EntityManager em = AnalysisGroup.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT COUNT(o) FROM AnalysisGroup AS o WHERE");
+        for (int i = 0; i < experiments.size(); i++) {
+            if (i > 0) queryBuilder.append(" AND");
+            queryBuilder.append(" :experiments_item").append(i).append(" MEMBER OF o.experiments");
+        }
+        TypedQuery q = em.createQuery(queryBuilder.toString(), Long.class);
+        int experimentsIndex = 0;
+        for (Experiment _experiment: experiments) {
+            q.setParameter("experiments_item" + experimentsIndex++, _experiment);
+        }
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindAnalysisGroupsByExperimentsAndIgnoredNot(Set<Experiment> experiments, boolean ignored) {
+        if (experiments == null) throw new IllegalArgumentException("The experiments argument is required");
+        EntityManager em = AnalysisGroup.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT COUNT(o) FROM AnalysisGroup AS o WHERE o.ignored IS NOT :ignored");
+        queryBuilder.append(" AND");
+        for (int i = 0; i < experiments.size(); i++) {
+            if (i > 0) queryBuilder.append(" AND");
+            queryBuilder.append(" :experiments_item").append(i).append(" MEMBER OF o.experiments");
+        }
+        TypedQuery q = em.createQuery(queryBuilder.toString(), Long.class);
+        int experimentsIndex = 0;
+        for (Experiment _experiment: experiments) {
+            q.setParameter("experiments_item" + experimentsIndex++, _experiment);
+        }
+        q.setParameter("ignored", ignored);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindAnalysisGroupsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = AnalysisGroup.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroup AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<AnalysisGroup> findAnalysisGroupsByExperiments(Set<Experiment> experiments) {
+        if (experiments == null) throw new IllegalArgumentException("The experiments argument is required");
+        EntityManager em = AnalysisGroup.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroup AS o WHERE");
+        for (int i = 0; i < experiments.size(); i++) {
+            if (i > 0) queryBuilder.append(" AND");
+            queryBuilder.append(" :experiments_item").append(i).append(" MEMBER OF o.experiments");
+        }
+        TypedQuery<AnalysisGroup> q = em.createQuery(queryBuilder.toString(), AnalysisGroup.class);
+        int experimentsIndex = 0;
+        for (Experiment _experiment: experiments) {
+            q.setParameter("experiments_item" + experimentsIndex++, _experiment);
+        }
+        return q;
+    }
+
+	public static TypedQuery<AnalysisGroup> findAnalysisGroupsByExperiments(Set<Experiment> experiments, String sortFieldName, String sortOrder) {
+        if (experiments == null) throw new IllegalArgumentException("The experiments argument is required");
+        EntityManager em = AnalysisGroup.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroup AS o WHERE");
+        for (int i = 0; i < experiments.size(); i++) {
+            if (i > 0) queryBuilder.append(" AND");
+            queryBuilder.append(" :experiments_item").append(i).append(" MEMBER OF o.experiments");
+        }
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" " + sortOrder);
+            }
+        }
+        TypedQuery<AnalysisGroup> q = em.createQuery(queryBuilder.toString(), AnalysisGroup.class);
+        int experimentsIndex = 0;
+        for (Experiment _experiment: experiments) {
+            q.setParameter("experiments_item" + experimentsIndex++, _experiment);
+        }
+        return q;
+    }
+
+	public static TypedQuery<AnalysisGroup> findAnalysisGroupsByExperimentsAndIgnoredNot(Set<Experiment> experiments, boolean ignored) {
+        if (experiments == null) throw new IllegalArgumentException("The experiments argument is required");
+        EntityManager em = AnalysisGroup.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroup AS o WHERE o.ignored IS NOT :ignored");
+        queryBuilder.append(" AND");
+        for (int i = 0; i < experiments.size(); i++) {
+            if (i > 0) queryBuilder.append(" AND");
+            queryBuilder.append(" :experiments_item").append(i).append(" MEMBER OF o.experiments");
+        }
+        TypedQuery<AnalysisGroup> q = em.createQuery(queryBuilder.toString(), AnalysisGroup.class);
+        int experimentsIndex = 0;
+        for (Experiment _experiment: experiments) {
+            q.setParameter("experiments_item" + experimentsIndex++, _experiment);
+        }
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<AnalysisGroup> findAnalysisGroupsByExperimentsAndIgnoredNot(Set<Experiment> experiments, boolean ignored, String sortFieldName, String sortOrder) {
+        if (experiments == null) throw new IllegalArgumentException("The experiments argument is required");
+        EntityManager em = AnalysisGroup.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroup AS o WHERE o.ignored IS NOT :ignored");
+        queryBuilder.append(" AND");
+        for (int i = 0; i < experiments.size(); i++) {
+            if (i > 0) queryBuilder.append(" AND");
+            queryBuilder.append(" :experiments_item").append(i).append(" MEMBER OF o.experiments");
+        }
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" " + sortOrder);
+            }
+        }
+        TypedQuery<AnalysisGroup> q = em.createQuery(queryBuilder.toString(), AnalysisGroup.class);
+        int experimentsIndex = 0;
+        for (Experiment _experiment: experiments) {
+            q.setParameter("experiments_item" + experimentsIndex++, _experiment);
+        }
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<AnalysisGroup> findAnalysisGroupsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = AnalysisGroup.entityManager();
+        TypedQuery<AnalysisGroup> q = em.createQuery("SELECT o FROM AnalysisGroup AS o WHERE o.lsTransaction = :lsTransaction", AnalysisGroup.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<AnalysisGroup> findAnalysisGroupsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = AnalysisGroup.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroup AS o WHERE o.lsTransaction = :lsTransaction");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AnalysisGroup> q = em.createQuery(queryBuilder.toString(), AnalysisGroup.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public Set<Experiment> getExperiments() {
+        return this.experiments;
+    }
+
+	public void setExperiments(Set<Experiment> experiments) {
+        this.experiments = experiments;
+    }
+
+	public Set<AnalysisGroupLabel> getLsLabels() {
+        return this.lsLabels;
+    }
+
+	public void setLsLabels(Set<AnalysisGroupLabel> lsLabels) {
+        this.lsLabels = lsLabels;
+    }
+
+	public Set<AnalysisGroupState> getLsStates() {
+        return this.lsStates;
+    }
+
+	public void setLsStates(Set<AnalysisGroupState> lsStates) {
+        this.lsStates = lsStates;
+    }
+
+	public Set<TreatmentGroup> getTreatmentGroups() {
+        return this.treatmentGroups;
+    }
+
+	public void setTreatmentGroups(Set<TreatmentGroup> treatmentGroups) {
+        this.treatmentGroups = treatmentGroups;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel.java b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel.java
index a3db9a60a..c63863b36 100755
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel.java
@@ -5,13 +5,16 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
-
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Query;
+import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -19,7 +22,10 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -80,4 +86,156 @@ public static int deleteByExperimentID(Long experimentId) {
 	}
     
     
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static AnalysisGroupLabel fromJsonToAnalysisGroupLabel(String json) {
+        return new JSONDeserializer<AnalysisGroupLabel>()
+        .use(null, AnalysisGroupLabel.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<AnalysisGroupLabel> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<AnalysisGroupLabel> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public AnalysisGroupLabel() {
+        super();
+    }
+
+	public AnalysisGroup getAnalysisGroup() {
+        return this.analysisGroup;
+    }
+
+	public void setAnalysisGroup(AnalysisGroup analysisGroup) {
+        this.analysisGroup = analysisGroup;
+    }
+
+	public static Long countFindAnalysisGroupLabelsByAnalysisGroup(AnalysisGroup analysisGroup) {
+        if (analysisGroup == null) throw new IllegalArgumentException("The analysisGroup argument is required");
+        EntityManager em = AnalysisGroupLabel.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupLabel AS o WHERE o.analysisGroup = :analysisGroup", Long.class);
+        q.setParameter("analysisGroup", analysisGroup);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindAnalysisGroupLabelsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = AnalysisGroupLabel.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupLabel AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<AnalysisGroupLabel> findAnalysisGroupLabelsByAnalysisGroup(AnalysisGroup analysisGroup) {
+        if (analysisGroup == null) throw new IllegalArgumentException("The analysisGroup argument is required");
+        EntityManager em = AnalysisGroupLabel.entityManager();
+        TypedQuery<AnalysisGroupLabel> q = em.createQuery("SELECT o FROM AnalysisGroupLabel AS o WHERE o.analysisGroup = :analysisGroup", AnalysisGroupLabel.class);
+        q.setParameter("analysisGroup", analysisGroup);
+        return q;
+    }
+
+	public static TypedQuery<AnalysisGroupLabel> findAnalysisGroupLabelsByAnalysisGroup(AnalysisGroup analysisGroup, String sortFieldName, String sortOrder) {
+        if (analysisGroup == null) throw new IllegalArgumentException("The analysisGroup argument is required");
+        EntityManager em = AnalysisGroupLabel.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupLabel AS o WHERE o.analysisGroup = :analysisGroup");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AnalysisGroupLabel> q = em.createQuery(queryBuilder.toString(), AnalysisGroupLabel.class);
+        q.setParameter("analysisGroup", analysisGroup);
+        return q;
+    }
+
+	public static TypedQuery<AnalysisGroupLabel> findAnalysisGroupLabelsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = AnalysisGroupLabel.entityManager();
+        TypedQuery<AnalysisGroupLabel> q = em.createQuery("SELECT o FROM AnalysisGroupLabel AS o WHERE o.lsTransaction = :lsTransaction", AnalysisGroupLabel.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<AnalysisGroupLabel> findAnalysisGroupLabelsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = AnalysisGroupLabel.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupLabel AS o WHERE o.lsTransaction = :lsTransaction");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AnalysisGroupLabel> q = em.createQuery(queryBuilder.toString(), AnalysisGroupLabel.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("analysisGroup");
+
+	public static long countAnalysisGroupLabels() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM AnalysisGroupLabel o", Long.class).getSingleResult();
+    }
+
+	public static List<AnalysisGroupLabel> findAllAnalysisGroupLabels() {
+        return entityManager().createQuery("SELECT o FROM AnalysisGroupLabel o", AnalysisGroupLabel.class).getResultList();
+    }
+
+	public static List<AnalysisGroupLabel> findAllAnalysisGroupLabels(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM AnalysisGroupLabel o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, AnalysisGroupLabel.class).getResultList();
+    }
+
+	public static AnalysisGroupLabel findAnalysisGroupLabel(Long id) {
+        if (id == null) return null;
+        return entityManager().find(AnalysisGroupLabel.class, id);
+    }
+
+	public static List<AnalysisGroupLabel> findAnalysisGroupLabelEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM AnalysisGroupLabel o", AnalysisGroupLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<AnalysisGroupLabel> findAnalysisGroupLabelEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM AnalysisGroupLabel o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, AnalysisGroupLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public AnalysisGroupLabel merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        AnalysisGroupLabel merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel_Roo_Configurable.aj
deleted file mode 100755
index c046c0791..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroupLabel;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect AnalysisGroupLabel_Roo_Configurable {
-    
-    declare @type: AnalysisGroupLabel: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel_Roo_Finder.aj
deleted file mode 100755
index 2cdbb951f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel_Roo_Finder.aj
+++ /dev/null
@@ -1,75 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.AnalysisGroupLabel;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect AnalysisGroupLabel_Roo_Finder {
-    
-    public static Long AnalysisGroupLabel.countFindAnalysisGroupLabelsByAnalysisGroup(AnalysisGroup analysisGroup) {
-        if (analysisGroup == null) throw new IllegalArgumentException("The analysisGroup argument is required");
-        EntityManager em = AnalysisGroupLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupLabel AS o WHERE o.analysisGroup = :analysisGroup", Long.class);
-        q.setParameter("analysisGroup", analysisGroup);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long AnalysisGroupLabel.countFindAnalysisGroupLabelsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = AnalysisGroupLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupLabel AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<AnalysisGroupLabel> AnalysisGroupLabel.findAnalysisGroupLabelsByAnalysisGroup(AnalysisGroup analysisGroup) {
-        if (analysisGroup == null) throw new IllegalArgumentException("The analysisGroup argument is required");
-        EntityManager em = AnalysisGroupLabel.entityManager();
-        TypedQuery<AnalysisGroupLabel> q = em.createQuery("SELECT o FROM AnalysisGroupLabel AS o WHERE o.analysisGroup = :analysisGroup", AnalysisGroupLabel.class);
-        q.setParameter("analysisGroup", analysisGroup);
-        return q;
-    }
-    
-    public static TypedQuery<AnalysisGroupLabel> AnalysisGroupLabel.findAnalysisGroupLabelsByAnalysisGroup(AnalysisGroup analysisGroup, String sortFieldName, String sortOrder) {
-        if (analysisGroup == null) throw new IllegalArgumentException("The analysisGroup argument is required");
-        EntityManager em = AnalysisGroupLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupLabel AS o WHERE o.analysisGroup = :analysisGroup");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AnalysisGroupLabel> q = em.createQuery(queryBuilder.toString(), AnalysisGroupLabel.class);
-        q.setParameter("analysisGroup", analysisGroup);
-        return q;
-    }
-    
-    public static TypedQuery<AnalysisGroupLabel> AnalysisGroupLabel.findAnalysisGroupLabelsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = AnalysisGroupLabel.entityManager();
-        TypedQuery<AnalysisGroupLabel> q = em.createQuery("SELECT o FROM AnalysisGroupLabel AS o WHERE o.lsTransaction = :lsTransaction", AnalysisGroupLabel.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<AnalysisGroupLabel> AnalysisGroupLabel.findAnalysisGroupLabelsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = AnalysisGroupLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupLabel AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AnalysisGroupLabel> q = em.createQuery(queryBuilder.toString(), AnalysisGroupLabel.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel_Roo_JavaBean.aj
deleted file mode 100755
index e6beea8a7..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel_Roo_JavaBean.aj
+++ /dev/null
@@ -1,19 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.AnalysisGroupLabel;
-
-privileged aspect AnalysisGroupLabel_Roo_JavaBean {
-    
-    public AnalysisGroup AnalysisGroupLabel.getAnalysisGroup() {
-        return this.analysisGroup;
-    }
-    
-    public void AnalysisGroupLabel.setAnalysisGroup(AnalysisGroup analysisGroup) {
-        this.analysisGroup = analysisGroup;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index a3aeb167e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroupLabel;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect AnalysisGroupLabel_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> AnalysisGroupLabel.fieldNames4OrderClauseFilter = java.util.Arrays.asList("analysisGroup");
-    
-    public static long AnalysisGroupLabel.countAnalysisGroupLabels() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM AnalysisGroupLabel o", Long.class).getSingleResult();
-    }
-    
-    public static List<AnalysisGroupLabel> AnalysisGroupLabel.findAllAnalysisGroupLabels() {
-        return entityManager().createQuery("SELECT o FROM AnalysisGroupLabel o", AnalysisGroupLabel.class).getResultList();
-    }
-    
-    public static List<AnalysisGroupLabel> AnalysisGroupLabel.findAllAnalysisGroupLabels(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AnalysisGroupLabel o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AnalysisGroupLabel.class).getResultList();
-    }
-    
-    public static AnalysisGroupLabel AnalysisGroupLabel.findAnalysisGroupLabel(Long id) {
-        if (id == null) return null;
-        return entityManager().find(AnalysisGroupLabel.class, id);
-    }
-    
-    public static List<AnalysisGroupLabel> AnalysisGroupLabel.findAnalysisGroupLabelEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM AnalysisGroupLabel o", AnalysisGroupLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<AnalysisGroupLabel> AnalysisGroupLabel.findAnalysisGroupLabelEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AnalysisGroupLabel o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AnalysisGroupLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public AnalysisGroupLabel AnalysisGroupLabel.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        AnalysisGroupLabel merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel_Roo_Jpa_Entity.aj
deleted file mode 100755
index c8a2a7251..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,17 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroupLabel;
-import javax.persistence.Entity;
-
-privileged aspect AnalysisGroupLabel_Roo_Jpa_Entity {
-    
-    declare @type: AnalysisGroupLabel: @Entity;
-    
-    public AnalysisGroupLabel.new() {
-        super();
-    }
-
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel_Roo_Json.aj
deleted file mode 100755
index 2a539f673..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel_Roo_Json.aj
+++ /dev/null
@@ -1,38 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroupLabel;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.Collection;
-
-privileged aspect AnalysisGroupLabel_Roo_Json {
-    
-    public String AnalysisGroupLabel.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String AnalysisGroupLabel.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static AnalysisGroupLabel AnalysisGroupLabel.fromJsonToAnalysisGroupLabel(String json) {
-        return new JSONDeserializer<AnalysisGroupLabel>()
-        .use(null, AnalysisGroupLabel.class).deserialize(json);
-    }
-    
-    public static String AnalysisGroupLabel.toJsonArray(Collection<AnalysisGroupLabel> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String AnalysisGroupLabel.toJsonArray(Collection<AnalysisGroupLabel> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel_Roo_ToString.aj
deleted file mode 100755
index 15af4c3e2..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroupLabel;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AnalysisGroupLabel_Roo_ToString {
-    
-    public String AnalysisGroupLabel.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState.java b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState.java
index 2a18b4568..ff25719e3 100755
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState.java
+++ b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState.java
@@ -10,6 +10,7 @@
 import java.util.Set;
 
 import javax.persistence.CascadeType;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
@@ -18,7 +19,9 @@
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -33,6 +36,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -194,4 +199,222 @@ public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByLsTypeEqua
         q.setParameter("lsKind", lsKind);
         return q;
     }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("analysisGroup", "lsValues");
+
+	public static long countAnalysisGroupStates() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM AnalysisGroupState o", Long.class).getSingleResult();
+    }
+
+	public static List<AnalysisGroupState> findAllAnalysisGroupStates() {
+        return entityManager().createQuery("SELECT o FROM AnalysisGroupState o", AnalysisGroupState.class).getResultList();
+    }
+
+	public static List<AnalysisGroupState> findAllAnalysisGroupStates(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM AnalysisGroupState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, AnalysisGroupState.class).getResultList();
+    }
+
+	public static AnalysisGroupState findAnalysisGroupState(Long id) {
+        if (id == null) return null;
+        return entityManager().find(AnalysisGroupState.class, id);
+    }
+
+	public static List<AnalysisGroupState> findAnalysisGroupStateEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM AnalysisGroupState o", AnalysisGroupState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<AnalysisGroupState> findAnalysisGroupStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM AnalysisGroupState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, AnalysisGroupState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public AnalysisGroupState merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        AnalysisGroupState merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public AnalysisGroupState() {
+        super();
+    }
+
+	public static Long countFindAnalysisGroupStatesByAnalysisGroup(AnalysisGroup analysisGroup) {
+        if (analysisGroup == null) throw new IllegalArgumentException("The analysisGroup argument is required");
+        EntityManager em = AnalysisGroupState.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupState AS o WHERE o.analysisGroup = :analysisGroup", Long.class);
+        q.setParameter("analysisGroup", analysisGroup);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(AnalysisGroup analysisGroup, String lsType, String lsKind, boolean ignored) {
+        if (analysisGroup == null) throw new IllegalArgumentException("The analysisGroup argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = AnalysisGroupState.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupState AS o WHERE o.analysisGroup = :analysisGroup AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored", Long.class);
+        q.setParameter("analysisGroup", analysisGroup);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("ignored", ignored);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindAnalysisGroupStatesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = AnalysisGroupState.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupState AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindAnalysisGroupStatesByLsTypeAndKindEquals(String lsTypeAndKind) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        EntityManager em = AnalysisGroupState.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", Long.class);
+        q.setParameter("lsTypeAndKind", lsTypeAndKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindAnalysisGroupStatesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = AnalysisGroupState.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByAnalysisGroup(AnalysisGroup analysisGroup) {
+        if (analysisGroup == null) throw new IllegalArgumentException("The analysisGroup argument is required");
+        EntityManager em = AnalysisGroupState.entityManager();
+        TypedQuery<AnalysisGroupState> q = em.createQuery("SELECT o FROM AnalysisGroupState AS o WHERE o.analysisGroup = :analysisGroup", AnalysisGroupState.class);
+        q.setParameter("analysisGroup", analysisGroup);
+        return q;
+    }
+
+	public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByAnalysisGroup(AnalysisGroup analysisGroup, String sortFieldName, String sortOrder) {
+        if (analysisGroup == null) throw new IllegalArgumentException("The analysisGroup argument is required");
+        EntityManager em = AnalysisGroupState.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupState AS o WHERE o.analysisGroup = :analysisGroup");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AnalysisGroupState> q = em.createQuery(queryBuilder.toString(), AnalysisGroupState.class);
+        q.setParameter("analysisGroup", analysisGroup);
+        return q;
+    }
+
+	public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(AnalysisGroup analysisGroup, String lsType, String lsKind, boolean ignored, String sortFieldName, String sortOrder) {
+        if (analysisGroup == null) throw new IllegalArgumentException("The analysisGroup argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = AnalysisGroupState.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupState AS o WHERE o.analysisGroup = :analysisGroup AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AnalysisGroupState> q = em.createQuery(queryBuilder.toString(), AnalysisGroupState.class);
+        q.setParameter("analysisGroup", analysisGroup);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = AnalysisGroupState.entityManager();
+        TypedQuery<AnalysisGroupState> q = em.createQuery("SELECT o FROM AnalysisGroupState AS o WHERE o.lsTransaction = :lsTransaction", AnalysisGroupState.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = AnalysisGroupState.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupState AS o WHERE o.lsTransaction = :lsTransaction");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AnalysisGroupState> q = em.createQuery(queryBuilder.toString(), AnalysisGroupState.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByLsTypeAndKindEquals(String lsTypeAndKind, String sortFieldName, String sortOrder) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        EntityManager em = AnalysisGroupState.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AnalysisGroupState> q = em.createQuery(queryBuilder.toString(), AnalysisGroupState.class);
+        q.setParameter("lsTypeAndKind", lsTypeAndKind);
+        return q;
+    }
+
+	public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = AnalysisGroupState.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AnalysisGroupState> q = em.createQuery(queryBuilder.toString(), AnalysisGroupState.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public AnalysisGroup getAnalysisGroup() {
+        return this.analysisGroup;
+    }
+
+	public void setAnalysisGroup(AnalysisGroup analysisGroup) {
+        this.analysisGroup = analysisGroup;
+    }
+
+	public Set<AnalysisGroupValue> getLsValues() {
+        return this.lsValues;
+    }
+
+	public void setLsValues(Set<AnalysisGroupValue> lsValues) {
+        this.lsValues = lsValues;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState_Roo_Configurable.aj
deleted file mode 100755
index dc4266282..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect AnalysisGroupState_Roo_Configurable {
-    
-    declare @type: AnalysisGroupState: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState_Roo_Finder.aj
deleted file mode 100755
index 86d6d32c4..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState_Roo_Finder.aj
+++ /dev/null
@@ -1,158 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect AnalysisGroupState_Roo_Finder {
-    
-    public static Long AnalysisGroupState.countFindAnalysisGroupStatesByAnalysisGroup(AnalysisGroup analysisGroup) {
-        if (analysisGroup == null) throw new IllegalArgumentException("The analysisGroup argument is required");
-        EntityManager em = AnalysisGroupState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupState AS o WHERE o.analysisGroup = :analysisGroup", Long.class);
-        q.setParameter("analysisGroup", analysisGroup);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long AnalysisGroupState.countFindAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(AnalysisGroup analysisGroup, String lsType, String lsKind, boolean ignored) {
-        if (analysisGroup == null) throw new IllegalArgumentException("The analysisGroup argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = AnalysisGroupState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupState AS o WHERE o.analysisGroup = :analysisGroup AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored", Long.class);
-        q.setParameter("analysisGroup", analysisGroup);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("ignored", ignored);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long AnalysisGroupState.countFindAnalysisGroupStatesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = AnalysisGroupState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupState AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long AnalysisGroupState.countFindAnalysisGroupStatesByLsTypeAndKindEquals(String lsTypeAndKind) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
-        EntityManager em = AnalysisGroupState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", Long.class);
-        q.setParameter("lsTypeAndKind", lsTypeAndKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long AnalysisGroupState.countFindAnalysisGroupStatesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = AnalysisGroupState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<AnalysisGroupState> AnalysisGroupState.findAnalysisGroupStatesByAnalysisGroup(AnalysisGroup analysisGroup) {
-        if (analysisGroup == null) throw new IllegalArgumentException("The analysisGroup argument is required");
-        EntityManager em = AnalysisGroupState.entityManager();
-        TypedQuery<AnalysisGroupState> q = em.createQuery("SELECT o FROM AnalysisGroupState AS o WHERE o.analysisGroup = :analysisGroup", AnalysisGroupState.class);
-        q.setParameter("analysisGroup", analysisGroup);
-        return q;
-    }
-    
-    public static TypedQuery<AnalysisGroupState> AnalysisGroupState.findAnalysisGroupStatesByAnalysisGroup(AnalysisGroup analysisGroup, String sortFieldName, String sortOrder) {
-        if (analysisGroup == null) throw new IllegalArgumentException("The analysisGroup argument is required");
-        EntityManager em = AnalysisGroupState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupState AS o WHERE o.analysisGroup = :analysisGroup");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AnalysisGroupState> q = em.createQuery(queryBuilder.toString(), AnalysisGroupState.class);
-        q.setParameter("analysisGroup", analysisGroup);
-        return q;
-    }
-    
-    public static TypedQuery<AnalysisGroupState> AnalysisGroupState.findAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(AnalysisGroup analysisGroup, String lsType, String lsKind, boolean ignored, String sortFieldName, String sortOrder) {
-        if (analysisGroup == null) throw new IllegalArgumentException("The analysisGroup argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = AnalysisGroupState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupState AS o WHERE o.analysisGroup = :analysisGroup AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AnalysisGroupState> q = em.createQuery(queryBuilder.toString(), AnalysisGroupState.class);
-        q.setParameter("analysisGroup", analysisGroup);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<AnalysisGroupState> AnalysisGroupState.findAnalysisGroupStatesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = AnalysisGroupState.entityManager();
-        TypedQuery<AnalysisGroupState> q = em.createQuery("SELECT o FROM AnalysisGroupState AS o WHERE o.lsTransaction = :lsTransaction", AnalysisGroupState.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<AnalysisGroupState> AnalysisGroupState.findAnalysisGroupStatesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = AnalysisGroupState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupState AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AnalysisGroupState> q = em.createQuery(queryBuilder.toString(), AnalysisGroupState.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<AnalysisGroupState> AnalysisGroupState.findAnalysisGroupStatesByLsTypeAndKindEquals(String lsTypeAndKind, String sortFieldName, String sortOrder) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
-        EntityManager em = AnalysisGroupState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AnalysisGroupState> q = em.createQuery(queryBuilder.toString(), AnalysisGroupState.class);
-        q.setParameter("lsTypeAndKind", lsTypeAndKind);
-        return q;
-    }
-    
-    public static TypedQuery<AnalysisGroupState> AnalysisGroupState.findAnalysisGroupStatesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = AnalysisGroupState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AnalysisGroupState> q = em.createQuery(queryBuilder.toString(), AnalysisGroupState.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState_Roo_JavaBean.aj
deleted file mode 100755
index 26a64e623..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState_Roo_JavaBean.aj
+++ /dev/null
@@ -1,29 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import java.util.Set;
-
-privileged aspect AnalysisGroupState_Roo_JavaBean {
-    
-    public AnalysisGroup AnalysisGroupState.getAnalysisGroup() {
-        return this.analysisGroup;
-    }
-    
-    public void AnalysisGroupState.setAnalysisGroup(AnalysisGroup analysisGroup) {
-        this.analysisGroup = analysisGroup;
-    }
-    
-    public Set<AnalysisGroupValue> AnalysisGroupState.getLsValues() {
-        return this.lsValues;
-    }
-    
-    public void AnalysisGroupState.setLsValues(Set<AnalysisGroupValue> lsValues) {
-        this.lsValues = lsValues;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 95e282363..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect AnalysisGroupState_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> AnalysisGroupState.fieldNames4OrderClauseFilter = java.util.Arrays.asList("analysisGroup", "lsValues");
-    
-    public static long AnalysisGroupState.countAnalysisGroupStates() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM AnalysisGroupState o", Long.class).getSingleResult();
-    }
-    
-    public static List<AnalysisGroupState> AnalysisGroupState.findAllAnalysisGroupStates() {
-        return entityManager().createQuery("SELECT o FROM AnalysisGroupState o", AnalysisGroupState.class).getResultList();
-    }
-    
-    public static List<AnalysisGroupState> AnalysisGroupState.findAllAnalysisGroupStates(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AnalysisGroupState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AnalysisGroupState.class).getResultList();
-    }
-    
-    public static AnalysisGroupState AnalysisGroupState.findAnalysisGroupState(Long id) {
-        if (id == null) return null;
-        return entityManager().find(AnalysisGroupState.class, id);
-    }
-    
-    public static List<AnalysisGroupState> AnalysisGroupState.findAnalysisGroupStateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM AnalysisGroupState o", AnalysisGroupState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<AnalysisGroupState> AnalysisGroupState.findAnalysisGroupStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AnalysisGroupState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AnalysisGroupState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public AnalysisGroupState AnalysisGroupState.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        AnalysisGroupState merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState_Roo_Jpa_Entity.aj
deleted file mode 100755
index c87dc652e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,17 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import javax.persistence.Entity;
-
-privileged aspect AnalysisGroupState_Roo_Jpa_Entity {
-    
-    declare @type: AnalysisGroupState: @Entity;
-    
-    public AnalysisGroupState.new() {
-        super();
-    }
-
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState_Roo_ToString.aj
deleted file mode 100755
index d9c91c6b2..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AnalysisGroupState_Roo_ToString {
-    
-    public String AnalysisGroupState.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue.java b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue.java
index da43761c3..5cfab7a24 100755
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue.java
@@ -8,7 +8,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
@@ -21,9 +21,11 @@
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -44,6 +46,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -1492,4 +1496,275 @@ public static CellProcessor[] getProcessors() {
 		return processors;
 	}
 
+
+	public static Long countFindAnalysisGroupValuesByCodeValueEquals(String codeValue) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = AnalysisGroupValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupValue AS o WHERE o.codeValue = :codeValue", Long.class);
+        q.setParameter("codeValue", codeValue);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindAnalysisGroupValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = AnalysisGroupValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", Long.class);
+        q.setParameter("ignored", ignored);
+        q.setParameter("codeValue", codeValue);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindAnalysisGroupValuesByLsState(AnalysisGroupState lsState) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        EntityManager em = AnalysisGroupValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupValue AS o WHERE o.lsState = :lsState", Long.class);
+        q.setParameter("lsState", lsState);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindAnalysisGroupValuesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = AnalysisGroupValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupValue AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = AnalysisGroupValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(String lsType, String lsKind, String stringValue, boolean ignored) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+        stringValue = stringValue.replace('*', '%');
+        if (stringValue.charAt(0) != '%') {
+            stringValue = "%" + stringValue;
+        }
+        if (stringValue.charAt(stringValue.length() - 1) != '%') {
+            stringValue = stringValue + "%";
+        }
+        EntityManager em = AnalysisGroupValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)  AND o.ignored IS NOT :ignored", Long.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("stringValue", stringValue);
+        q.setParameter("ignored", ignored);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByCodeValueEquals(String codeValue) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = AnalysisGroupValue.entityManager();
+        TypedQuery<AnalysisGroupValue> q = em.createQuery("SELECT o FROM AnalysisGroupValue AS o WHERE o.codeValue = :codeValue", AnalysisGroupValue.class);
+        q.setParameter("codeValue", codeValue);
+        return q;
+    }
+
+	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByCodeValueEquals(String codeValue, String sortFieldName, String sortOrder) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = AnalysisGroupValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupValue AS o WHERE o.codeValue = :codeValue");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AnalysisGroupValue> q = em.createQuery(queryBuilder.toString(), AnalysisGroupValue.class);
+        q.setParameter("codeValue", codeValue);
+        return q;
+    }
+
+	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = AnalysisGroupValue.entityManager();
+        TypedQuery<AnalysisGroupValue> q = em.createQuery("SELECT o FROM AnalysisGroupValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", AnalysisGroupValue.class);
+        q.setParameter("ignored", ignored);
+        q.setParameter("codeValue", codeValue);
+        return q;
+    }
+
+	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue, String sortFieldName, String sortOrder) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = AnalysisGroupValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AnalysisGroupValue> q = em.createQuery(queryBuilder.toString(), AnalysisGroupValue.class);
+        q.setParameter("ignored", ignored);
+        q.setParameter("codeValue", codeValue);
+        return q;
+    }
+
+	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByLsState(AnalysisGroupState lsState) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        EntityManager em = AnalysisGroupValue.entityManager();
+        TypedQuery<AnalysisGroupValue> q = em.createQuery("SELECT o FROM AnalysisGroupValue AS o WHERE o.lsState = :lsState", AnalysisGroupValue.class);
+        q.setParameter("lsState", lsState);
+        return q;
+    }
+
+	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByLsState(AnalysisGroupState lsState, String sortFieldName, String sortOrder) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        EntityManager em = AnalysisGroupValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupValue AS o WHERE o.lsState = :lsState");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AnalysisGroupValue> q = em.createQuery(queryBuilder.toString(), AnalysisGroupValue.class);
+        q.setParameter("lsState", lsState);
+        return q;
+    }
+
+	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = AnalysisGroupValue.entityManager();
+        TypedQuery<AnalysisGroupValue> q = em.createQuery("SELECT o FROM AnalysisGroupValue AS o WHERE o.lsTransaction = :lsTransaction", AnalysisGroupValue.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = AnalysisGroupValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupValue AS o WHERE o.lsTransaction = :lsTransaction");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AnalysisGroupValue> q = em.createQuery(queryBuilder.toString(), AnalysisGroupValue.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = AnalysisGroupValue.entityManager();
+        TypedQuery<AnalysisGroupValue> q = em.createQuery("SELECT o FROM AnalysisGroupValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", AnalysisGroupValue.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = AnalysisGroupValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AnalysisGroupValue> q = em.createQuery(queryBuilder.toString(), AnalysisGroupValue.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(String lsType, String lsKind, String stringValue, boolean ignored) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+        stringValue = stringValue.replace('*', '%');
+        if (stringValue.charAt(0) != '%') {
+            stringValue = "%" + stringValue;
+        }
+        if (stringValue.charAt(stringValue.length() - 1) != '%') {
+            stringValue = stringValue + "%";
+        }
+        EntityManager em = AnalysisGroupValue.entityManager();
+        TypedQuery<AnalysisGroupValue> q = em.createQuery("SELECT o FROM AnalysisGroupValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)  AND o.ignored IS NOT :ignored", AnalysisGroupValue.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("stringValue", stringValue);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(String lsType, String lsKind, String stringValue, boolean ignored, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+        stringValue = stringValue.replace('*', '%');
+        if (stringValue.charAt(0) != '%') {
+            stringValue = "%" + stringValue;
+        }
+        if (stringValue.charAt(stringValue.length() - 1) != '%') {
+            stringValue = stringValue + "%";
+        }
+        EntityManager em = AnalysisGroupValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)  AND o.ignored IS NOT :ignored");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AnalysisGroupValue> q = em.createQuery(queryBuilder.toString(), AnalysisGroupValue.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("stringValue", stringValue);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "PARAMETER_LIMIT", "lsState");
+
+	public static List<AnalysisGroupValue> findAllAnalysisGroupValues(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM AnalysisGroupValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, AnalysisGroupValue.class).getResultList();
+    }
+
+	public static List<AnalysisGroupValue> findAnalysisGroupValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM AnalysisGroupValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, AnalysisGroupValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public AnalysisGroupState getLsState() {
+        return this.lsState;
+    }
+
+	public void setLsState(AnalysisGroupState lsState) {
+        this.lsState = lsState;
+    }
+
+	public AnalysisGroupValue() {
+        super();
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue_Roo_Configurable.aj
deleted file mode 100755
index 54e4c4ae9..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect AnalysisGroupValue_Roo_Configurable {
-    
-    declare @type: AnalysisGroupValue: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue_Roo_Finder.aj
deleted file mode 100755
index ef83cfe87..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue_Roo_Finder.aj
+++ /dev/null
@@ -1,244 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect AnalysisGroupValue_Roo_Finder {
-    
-    public static Long AnalysisGroupValue.countFindAnalysisGroupValuesByCodeValueEquals(String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupValue AS o WHERE o.codeValue = :codeValue", Long.class);
-        q.setParameter("codeValue", codeValue);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long AnalysisGroupValue.countFindAnalysisGroupValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", Long.class);
-        q.setParameter("ignored", ignored);
-        q.setParameter("codeValue", codeValue);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long AnalysisGroupValue.countFindAnalysisGroupValuesByLsState(AnalysisGroupState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupValue AS o WHERE o.lsState = :lsState", Long.class);
-        q.setParameter("lsState", lsState);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long AnalysisGroupValue.countFindAnalysisGroupValuesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupValue AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long AnalysisGroupValue.countFindAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long AnalysisGroupValue.countFindAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(String lsType, String lsKind, String stringValue, boolean ignored) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
-        stringValue = stringValue.replace('*', '%');
-        if (stringValue.charAt(0) != '%') {
-            stringValue = "%" + stringValue;
-        }
-        if (stringValue.charAt(stringValue.length() - 1) != '%') {
-            stringValue = stringValue + "%";
-        }
-        EntityManager em = AnalysisGroupValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)  AND o.ignored IS NOT :ignored", Long.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("stringValue", stringValue);
-        q.setParameter("ignored", ignored);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<AnalysisGroupValue> AnalysisGroupValue.findAnalysisGroupValuesByCodeValueEquals(String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        TypedQuery<AnalysisGroupValue> q = em.createQuery("SELECT o FROM AnalysisGroupValue AS o WHERE o.codeValue = :codeValue", AnalysisGroupValue.class);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-    
-    public static TypedQuery<AnalysisGroupValue> AnalysisGroupValue.findAnalysisGroupValuesByCodeValueEquals(String codeValue, String sortFieldName, String sortOrder) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupValue AS o WHERE o.codeValue = :codeValue");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AnalysisGroupValue> q = em.createQuery(queryBuilder.toString(), AnalysisGroupValue.class);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-    
-    public static TypedQuery<AnalysisGroupValue> AnalysisGroupValue.findAnalysisGroupValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        TypedQuery<AnalysisGroupValue> q = em.createQuery("SELECT o FROM AnalysisGroupValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", AnalysisGroupValue.class);
-        q.setParameter("ignored", ignored);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-    
-    public static TypedQuery<AnalysisGroupValue> AnalysisGroupValue.findAnalysisGroupValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue, String sortFieldName, String sortOrder) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AnalysisGroupValue> q = em.createQuery(queryBuilder.toString(), AnalysisGroupValue.class);
-        q.setParameter("ignored", ignored);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-    
-    public static TypedQuery<AnalysisGroupValue> AnalysisGroupValue.findAnalysisGroupValuesByLsState(AnalysisGroupState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        TypedQuery<AnalysisGroupValue> q = em.createQuery("SELECT o FROM AnalysisGroupValue AS o WHERE o.lsState = :lsState", AnalysisGroupValue.class);
-        q.setParameter("lsState", lsState);
-        return q;
-    }
-    
-    public static TypedQuery<AnalysisGroupValue> AnalysisGroupValue.findAnalysisGroupValuesByLsState(AnalysisGroupState lsState, String sortFieldName, String sortOrder) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupValue AS o WHERE o.lsState = :lsState");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AnalysisGroupValue> q = em.createQuery(queryBuilder.toString(), AnalysisGroupValue.class);
-        q.setParameter("lsState", lsState);
-        return q;
-    }
-    
-    public static TypedQuery<AnalysisGroupValue> AnalysisGroupValue.findAnalysisGroupValuesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        TypedQuery<AnalysisGroupValue> q = em.createQuery("SELECT o FROM AnalysisGroupValue AS o WHERE o.lsTransaction = :lsTransaction", AnalysisGroupValue.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<AnalysisGroupValue> AnalysisGroupValue.findAnalysisGroupValuesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupValue AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AnalysisGroupValue> q = em.createQuery(queryBuilder.toString(), AnalysisGroupValue.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<AnalysisGroupValue> AnalysisGroupValue.findAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        TypedQuery<AnalysisGroupValue> q = em.createQuery("SELECT o FROM AnalysisGroupValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", AnalysisGroupValue.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<AnalysisGroupValue> AnalysisGroupValue.findAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AnalysisGroupValue> q = em.createQuery(queryBuilder.toString(), AnalysisGroupValue.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<AnalysisGroupValue> AnalysisGroupValue.findAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(String lsType, String lsKind, String stringValue, boolean ignored) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
-        stringValue = stringValue.replace('*', '%');
-        if (stringValue.charAt(0) != '%') {
-            stringValue = "%" + stringValue;
-        }
-        if (stringValue.charAt(stringValue.length() - 1) != '%') {
-            stringValue = stringValue + "%";
-        }
-        EntityManager em = AnalysisGroupValue.entityManager();
-        TypedQuery<AnalysisGroupValue> q = em.createQuery("SELECT o FROM AnalysisGroupValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)  AND o.ignored IS NOT :ignored", AnalysisGroupValue.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("stringValue", stringValue);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<AnalysisGroupValue> AnalysisGroupValue.findAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(String lsType, String lsKind, String stringValue, boolean ignored, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
-        stringValue = stringValue.replace('*', '%');
-        if (stringValue.charAt(0) != '%') {
-            stringValue = "%" + stringValue;
-        }
-        if (stringValue.charAt(stringValue.length() - 1) != '%') {
-            stringValue = stringValue + "%";
-        }
-        EntityManager em = AnalysisGroupValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)  AND o.ignored IS NOT :ignored");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AnalysisGroupValue> q = em.createQuery(queryBuilder.toString(), AnalysisGroupValue.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("stringValue", stringValue);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue_Roo_JavaBean.aj
deleted file mode 100755
index 94a730ea2..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue_Roo_JavaBean.aj
+++ /dev/null
@@ -1,19 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-
-privileged aspect AnalysisGroupValue_Roo_JavaBean {
-    
-    public AnalysisGroupState AnalysisGroupValue.getLsState() {
-        return this.lsState;
-    }
-    
-    public void AnalysisGroupValue.setLsState(AnalysisGroupState lsState) {
-        this.lsState = lsState;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 26fe48c89..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import java.util.List;
-
-privileged aspect AnalysisGroupValue_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> AnalysisGroupValue.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "PARAMETER_LIMIT", "lsState");
-    
-    public static List<AnalysisGroupValue> AnalysisGroupValue.findAllAnalysisGroupValues(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AnalysisGroupValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AnalysisGroupValue.class).getResultList();
-    }
-    
-    public static List<AnalysisGroupValue> AnalysisGroupValue.findAnalysisGroupValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AnalysisGroupValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AnalysisGroupValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue_Roo_Jpa_Entity.aj
deleted file mode 100755
index 1e8ccc459..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,17 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import javax.persistence.Entity;
-
-privileged aspect AnalysisGroupValue_Roo_Jpa_Entity {
-    
-    declare @type: AnalysisGroupValue: @Entity;
-    
-    public AnalysisGroupValue.new() {
-        super();
-    }
-
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue_Roo_ToString.aj
deleted file mode 100755
index 10ce809c9..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AnalysisGroupValue_Roo_ToString {
-    
-    public String AnalysisGroupValue.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroup_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/AnalysisGroup_Roo_Configurable.aj
deleted file mode 100755
index a35fbdc31..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroup_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect AnalysisGroup_Roo_Configurable {
-    
-    declare @type: AnalysisGroup: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroup_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/AnalysisGroup_Roo_Finder.aj
deleted file mode 100755
index 093c988b7..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroup_Roo_Finder.aj
+++ /dev/null
@@ -1,159 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.Experiment;
-import java.util.Set;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect AnalysisGroup_Roo_Finder {
-    
-    public static Long AnalysisGroup.countFindAnalysisGroupsByExperiments(Set<Experiment> experiments) {
-        if (experiments == null) throw new IllegalArgumentException("The experiments argument is required");
-        EntityManager em = AnalysisGroup.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT COUNT(o) FROM AnalysisGroup AS o WHERE");
-        for (int i = 0; i < experiments.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
-            queryBuilder.append(" :experiments_item").append(i).append(" MEMBER OF o.experiments");
-        }
-        TypedQuery q = em.createQuery(queryBuilder.toString(), Long.class);
-        int experimentsIndex = 0;
-        for (Experiment _experiment: experiments) {
-            q.setParameter("experiments_item" + experimentsIndex++, _experiment);
-        }
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long AnalysisGroup.countFindAnalysisGroupsByExperimentsAndIgnoredNot(Set<Experiment> experiments, boolean ignored) {
-        if (experiments == null) throw new IllegalArgumentException("The experiments argument is required");
-        EntityManager em = AnalysisGroup.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT COUNT(o) FROM AnalysisGroup AS o WHERE o.ignored IS NOT :ignored");
-        queryBuilder.append(" AND");
-        for (int i = 0; i < experiments.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
-            queryBuilder.append(" :experiments_item").append(i).append(" MEMBER OF o.experiments");
-        }
-        TypedQuery q = em.createQuery(queryBuilder.toString(), Long.class);
-        int experimentsIndex = 0;
-        for (Experiment _experiment: experiments) {
-            q.setParameter("experiments_item" + experimentsIndex++, _experiment);
-        }
-        q.setParameter("ignored", ignored);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long AnalysisGroup.countFindAnalysisGroupsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = AnalysisGroup.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroup AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<AnalysisGroup> AnalysisGroup.findAnalysisGroupsByExperiments(Set<Experiment> experiments) {
-        if (experiments == null) throw new IllegalArgumentException("The experiments argument is required");
-        EntityManager em = AnalysisGroup.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroup AS o WHERE");
-        for (int i = 0; i < experiments.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
-            queryBuilder.append(" :experiments_item").append(i).append(" MEMBER OF o.experiments");
-        }
-        TypedQuery<AnalysisGroup> q = em.createQuery(queryBuilder.toString(), AnalysisGroup.class);
-        int experimentsIndex = 0;
-        for (Experiment _experiment: experiments) {
-            q.setParameter("experiments_item" + experimentsIndex++, _experiment);
-        }
-        return q;
-    }
-    
-    public static TypedQuery<AnalysisGroup> AnalysisGroup.findAnalysisGroupsByExperiments(Set<Experiment> experiments, String sortFieldName, String sortOrder) {
-        if (experiments == null) throw new IllegalArgumentException("The experiments argument is required");
-        EntityManager em = AnalysisGroup.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroup AS o WHERE");
-        for (int i = 0; i < experiments.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
-            queryBuilder.append(" :experiments_item").append(i).append(" MEMBER OF o.experiments");
-        }
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" " + sortOrder);
-            }
-        }
-        TypedQuery<AnalysisGroup> q = em.createQuery(queryBuilder.toString(), AnalysisGroup.class);
-        int experimentsIndex = 0;
-        for (Experiment _experiment: experiments) {
-            q.setParameter("experiments_item" + experimentsIndex++, _experiment);
-        }
-        return q;
-    }
-    
-    public static TypedQuery<AnalysisGroup> AnalysisGroup.findAnalysisGroupsByExperimentsAndIgnoredNot(Set<Experiment> experiments, boolean ignored) {
-        if (experiments == null) throw new IllegalArgumentException("The experiments argument is required");
-        EntityManager em = AnalysisGroup.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroup AS o WHERE o.ignored IS NOT :ignored");
-        queryBuilder.append(" AND");
-        for (int i = 0; i < experiments.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
-            queryBuilder.append(" :experiments_item").append(i).append(" MEMBER OF o.experiments");
-        }
-        TypedQuery<AnalysisGroup> q = em.createQuery(queryBuilder.toString(), AnalysisGroup.class);
-        int experimentsIndex = 0;
-        for (Experiment _experiment: experiments) {
-            q.setParameter("experiments_item" + experimentsIndex++, _experiment);
-        }
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<AnalysisGroup> AnalysisGroup.findAnalysisGroupsByExperimentsAndIgnoredNot(Set<Experiment> experiments, boolean ignored, String sortFieldName, String sortOrder) {
-        if (experiments == null) throw new IllegalArgumentException("The experiments argument is required");
-        EntityManager em = AnalysisGroup.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroup AS o WHERE o.ignored IS NOT :ignored");
-        queryBuilder.append(" AND");
-        for (int i = 0; i < experiments.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
-            queryBuilder.append(" :experiments_item").append(i).append(" MEMBER OF o.experiments");
-        }
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" " + sortOrder);
-            }
-        }
-        TypedQuery<AnalysisGroup> q = em.createQuery(queryBuilder.toString(), AnalysisGroup.class);
-        int experimentsIndex = 0;
-        for (Experiment _experiment: experiments) {
-            q.setParameter("experiments_item" + experimentsIndex++, _experiment);
-        }
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<AnalysisGroup> AnalysisGroup.findAnalysisGroupsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = AnalysisGroup.entityManager();
-        TypedQuery<AnalysisGroup> q = em.createQuery("SELECT o FROM AnalysisGroup AS o WHERE o.lsTransaction = :lsTransaction", AnalysisGroup.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<AnalysisGroup> AnalysisGroup.findAnalysisGroupsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = AnalysisGroup.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroup AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AnalysisGroup> q = em.createQuery(queryBuilder.toString(), AnalysisGroup.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroup_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/AnalysisGroup_Roo_JavaBean.aj
deleted file mode 100755
index 4706a974e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroup_Roo_JavaBean.aj
+++ /dev/null
@@ -1,47 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.AnalysisGroupLabel;
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.TreatmentGroup;
-import java.util.Set;
-
-privileged aspect AnalysisGroup_Roo_JavaBean {
-    
-    public Set<Experiment> AnalysisGroup.getExperiments() {
-        return this.experiments;
-    }
-    
-    public void AnalysisGroup.setExperiments(Set<Experiment> experiments) {
-        this.experiments = experiments;
-    }
-    
-    public Set<AnalysisGroupLabel> AnalysisGroup.getLsLabels() {
-        return this.lsLabels;
-    }
-    
-    public void AnalysisGroup.setLsLabels(Set<AnalysisGroupLabel> lsLabels) {
-        this.lsLabels = lsLabels;
-    }
-    
-    public Set<AnalysisGroupState> AnalysisGroup.getLsStates() {
-        return this.lsStates;
-    }
-    
-    public void AnalysisGroup.setLsStates(Set<AnalysisGroupState> lsStates) {
-        this.lsStates = lsStates;
-    }
-    
-    public Set<TreatmentGroup> AnalysisGroup.getTreatmentGroups() {
-        return this.treatmentGroups;
-    }
-    
-    public void AnalysisGroup.setTreatmentGroups(Set<TreatmentGroup> treatmentGroups) {
-        this.treatmentGroups = treatmentGroups;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroup_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/AnalysisGroup_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 21a7b2048..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroup_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect AnalysisGroup_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> AnalysisGroup.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "experiments", "lsLabels", "lsStates", "treatmentGroups");
-    
-    public static long AnalysisGroup.countAnalysisGroups() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM AnalysisGroup o", Long.class).getSingleResult();
-    }
-    
-    public static List<AnalysisGroup> AnalysisGroup.findAllAnalysisGroups() {
-        return entityManager().createQuery("SELECT o FROM AnalysisGroup o", AnalysisGroup.class).getResultList();
-    }
-    
-    public static List<AnalysisGroup> AnalysisGroup.findAllAnalysisGroups(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AnalysisGroup o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AnalysisGroup.class).getResultList();
-    }
-    
-    public static AnalysisGroup AnalysisGroup.findAnalysisGroup(Long id) {
-        if (id == null) return null;
-        return entityManager().find(AnalysisGroup.class, id);
-    }
-    
-    public static List<AnalysisGroup> AnalysisGroup.findAnalysisGroupEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM AnalysisGroup o", AnalysisGroup.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<AnalysisGroup> AnalysisGroup.findAnalysisGroupEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AnalysisGroup o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AnalysisGroup.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public AnalysisGroup AnalysisGroup.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        AnalysisGroup merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroup_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/AnalysisGroup_Roo_Jpa_Entity.aj
deleted file mode 100755
index 1cdd29bc6..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroup_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import javax.persistence.Entity;
-
-privileged aspect AnalysisGroup_Roo_Jpa_Entity {
-    
-    declare @type: AnalysisGroup: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroup_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/AnalysisGroup_Roo_ToString.aj
deleted file mode 100755
index 9890e73d5..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroup_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AnalysisGroup_Roo_ToString {
-    
-    public String AnalysisGroup.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ApplicationSetting.java b/src/main/java/com/labsynch/labseer/domain/ApplicationSetting.java
index 2e852925d..11512b945 100755
--- a/src/main/java/com/labsynch/labseer/domain/ApplicationSetting.java
+++ b/src/main/java/com/labsynch/labseer/domain/ApplicationSetting.java
@@ -1,17 +1,35 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.SequenceGenerator;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
+import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -42,4 +60,256 @@ public class ApplicationSetting {
 //    	this.setPropValue("testingValue201");
 //    	this.persist();
 //    }
+
+	public static Long countFindApplicationSettingsByPropNameEquals(String propName) {
+        if (propName == null || propName.length() == 0) throw new IllegalArgumentException("The propName argument is required");
+        EntityManager em = ApplicationSetting.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ApplicationSetting AS o WHERE o.propName = :propName", Long.class);
+        q.setParameter("propName", propName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindApplicationSettingsByPropNameEqualsAndIgnoredNot(String propName, boolean ignored) {
+        if (propName == null || propName.length() == 0) throw new IllegalArgumentException("The propName argument is required");
+        EntityManager em = ApplicationSetting.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ApplicationSetting AS o WHERE o.propName = :propName  AND o.ignored IS NOT :ignored", Long.class);
+        q.setParameter("propName", propName);
+        q.setParameter("ignored", ignored);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ApplicationSetting> findApplicationSettingsByPropNameEquals(String propName) {
+        if (propName == null || propName.length() == 0) throw new IllegalArgumentException("The propName argument is required");
+        EntityManager em = ApplicationSetting.entityManager();
+        TypedQuery<ApplicationSetting> q = em.createQuery("SELECT o FROM ApplicationSetting AS o WHERE o.propName = :propName", ApplicationSetting.class);
+        q.setParameter("propName", propName);
+        return q;
+    }
+
+	public static TypedQuery<ApplicationSetting> findApplicationSettingsByPropNameEquals(String propName, String sortFieldName, String sortOrder) {
+        if (propName == null || propName.length() == 0) throw new IllegalArgumentException("The propName argument is required");
+        EntityManager em = ApplicationSetting.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ApplicationSetting AS o WHERE o.propName = :propName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ApplicationSetting> q = em.createQuery(queryBuilder.toString(), ApplicationSetting.class);
+        q.setParameter("propName", propName);
+        return q;
+    }
+
+	public static TypedQuery<ApplicationSetting> findApplicationSettingsByPropNameEqualsAndIgnoredNot(String propName, boolean ignored) {
+        if (propName == null || propName.length() == 0) throw new IllegalArgumentException("The propName argument is required");
+        EntityManager em = ApplicationSetting.entityManager();
+        TypedQuery<ApplicationSetting> q = em.createQuery("SELECT o FROM ApplicationSetting AS o WHERE o.propName = :propName  AND o.ignored IS NOT :ignored", ApplicationSetting.class);
+        q.setParameter("propName", propName);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<ApplicationSetting> findApplicationSettingsByPropNameEqualsAndIgnoredNot(String propName, boolean ignored, String sortFieldName, String sortOrder) {
+        if (propName == null || propName.length() == 0) throw new IllegalArgumentException("The propName argument is required");
+        EntityManager em = ApplicationSetting.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ApplicationSetting AS o WHERE o.propName = :propName  AND o.ignored IS NOT :ignored");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ApplicationSetting> q = em.createQuery(queryBuilder.toString(), ApplicationSetting.class);
+        q.setParameter("propName", propName);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("propName", "propValue", "comments", "ignored", "recordedDate");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new ApplicationSetting().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countApplicationSettings() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ApplicationSetting o", Long.class).getSingleResult();
+    }
+
+	public static List<ApplicationSetting> findAllApplicationSettings() {
+        return entityManager().createQuery("SELECT o FROM ApplicationSetting o", ApplicationSetting.class).getResultList();
+    }
+
+	public static List<ApplicationSetting> findAllApplicationSettings(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ApplicationSetting o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ApplicationSetting.class).getResultList();
+    }
+
+	public static ApplicationSetting findApplicationSetting(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ApplicationSetting.class, id);
+    }
+
+	public static List<ApplicationSetting> findApplicationSettingEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ApplicationSetting o", ApplicationSetting.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ApplicationSetting> findApplicationSettingEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ApplicationSetting o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ApplicationSetting.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            ApplicationSetting attached = ApplicationSetting.findApplicationSetting(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public ApplicationSetting merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ApplicationSetting merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ApplicationSetting fromJsonToApplicationSetting(String json) {
+        return new JSONDeserializer<ApplicationSetting>()
+        .use(null, ApplicationSetting.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ApplicationSetting> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ApplicationSetting> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ApplicationSetting> fromJsonArrayToApplicationSettings(String json) {
+        return new JSONDeserializer<List<ApplicationSetting>>()
+        .use("values", ApplicationSetting.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@Id
+    @SequenceGenerator(name = "applicationSettingGen", sequenceName = "APPSETTING_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "applicationSettingGen")
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String getPropName() {
+        return this.propName;
+    }
+
+	public void setPropName(String propName) {
+        this.propName = propName;
+    }
+
+	public String getPropValue() {
+        return this.propValue;
+    }
+
+	public void setPropValue(String propValue) {
+        this.propValue = propValue;
+    }
+
+	public String getComments() {
+        return this.comments;
+    }
+
+	public void setComments(String comments) {
+        this.comments = comments;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public Date getRecordedDate() {
+        return this.recordedDate;
+    }
+
+	public void setRecordedDate(Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ApplicationSetting_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ApplicationSetting_Roo_Configurable.aj
deleted file mode 100755
index ad70c05ea..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ApplicationSetting_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ApplicationSetting;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ApplicationSetting_Roo_Configurable {
-    
-    declare @type: ApplicationSetting: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ApplicationSetting_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ApplicationSetting_Roo_Finder.aj
deleted file mode 100755
index 8c3012f25..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ApplicationSetting_Roo_Finder.aj
+++ /dev/null
@@ -1,77 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ApplicationSetting;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ApplicationSetting_Roo_Finder {
-    
-    public static Long ApplicationSetting.countFindApplicationSettingsByPropNameEquals(String propName) {
-        if (propName == null || propName.length() == 0) throw new IllegalArgumentException("The propName argument is required");
-        EntityManager em = ApplicationSetting.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ApplicationSetting AS o WHERE o.propName = :propName", Long.class);
-        q.setParameter("propName", propName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ApplicationSetting.countFindApplicationSettingsByPropNameEqualsAndIgnoredNot(String propName, boolean ignored) {
-        if (propName == null || propName.length() == 0) throw new IllegalArgumentException("The propName argument is required");
-        EntityManager em = ApplicationSetting.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ApplicationSetting AS o WHERE o.propName = :propName  AND o.ignored IS NOT :ignored", Long.class);
-        q.setParameter("propName", propName);
-        q.setParameter("ignored", ignored);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ApplicationSetting> ApplicationSetting.findApplicationSettingsByPropNameEquals(String propName) {
-        if (propName == null || propName.length() == 0) throw new IllegalArgumentException("The propName argument is required");
-        EntityManager em = ApplicationSetting.entityManager();
-        TypedQuery<ApplicationSetting> q = em.createQuery("SELECT o FROM ApplicationSetting AS o WHERE o.propName = :propName", ApplicationSetting.class);
-        q.setParameter("propName", propName);
-        return q;
-    }
-    
-    public static TypedQuery<ApplicationSetting> ApplicationSetting.findApplicationSettingsByPropNameEquals(String propName, String sortFieldName, String sortOrder) {
-        if (propName == null || propName.length() == 0) throw new IllegalArgumentException("The propName argument is required");
-        EntityManager em = ApplicationSetting.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ApplicationSetting AS o WHERE o.propName = :propName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ApplicationSetting> q = em.createQuery(queryBuilder.toString(), ApplicationSetting.class);
-        q.setParameter("propName", propName);
-        return q;
-    }
-    
-    public static TypedQuery<ApplicationSetting> ApplicationSetting.findApplicationSettingsByPropNameEqualsAndIgnoredNot(String propName, boolean ignored) {
-        if (propName == null || propName.length() == 0) throw new IllegalArgumentException("The propName argument is required");
-        EntityManager em = ApplicationSetting.entityManager();
-        TypedQuery<ApplicationSetting> q = em.createQuery("SELECT o FROM ApplicationSetting AS o WHERE o.propName = :propName  AND o.ignored IS NOT :ignored", ApplicationSetting.class);
-        q.setParameter("propName", propName);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<ApplicationSetting> ApplicationSetting.findApplicationSettingsByPropNameEqualsAndIgnoredNot(String propName, boolean ignored, String sortFieldName, String sortOrder) {
-        if (propName == null || propName.length() == 0) throw new IllegalArgumentException("The propName argument is required");
-        EntityManager em = ApplicationSetting.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ApplicationSetting AS o WHERE o.propName = :propName  AND o.ignored IS NOT :ignored");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ApplicationSetting> q = em.createQuery(queryBuilder.toString(), ApplicationSetting.class);
-        q.setParameter("propName", propName);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ApplicationSetting_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ApplicationSetting_Roo_JavaBean.aj
deleted file mode 100755
index 859852837..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ApplicationSetting_Roo_JavaBean.aj
+++ /dev/null
@@ -1,51 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ApplicationSetting;
-import java.util.Date;
-
-privileged aspect ApplicationSetting_Roo_JavaBean {
-    
-    public String ApplicationSetting.getPropName() {
-        return this.propName;
-    }
-    
-    public void ApplicationSetting.setPropName(String propName) {
-        this.propName = propName;
-    }
-    
-    public String ApplicationSetting.getPropValue() {
-        return this.propValue;
-    }
-    
-    public void ApplicationSetting.setPropValue(String propValue) {
-        this.propValue = propValue;
-    }
-    
-    public String ApplicationSetting.getComments() {
-        return this.comments;
-    }
-    
-    public void ApplicationSetting.setComments(String comments) {
-        this.comments = comments;
-    }
-    
-    public boolean ApplicationSetting.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void ApplicationSetting.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public Date ApplicationSetting.getRecordedDate() {
-        return this.recordedDate;
-    }
-    
-    public void ApplicationSetting.setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ApplicationSetting_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ApplicationSetting_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index c2736d369..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ApplicationSetting_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ApplicationSetting;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ApplicationSetting_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager ApplicationSetting.entityManager;
-    
-    public static final List<String> ApplicationSetting.fieldNames4OrderClauseFilter = java.util.Arrays.asList("propName", "propValue", "comments", "ignored", "recordedDate");
-    
-    public static final EntityManager ApplicationSetting.entityManager() {
-        EntityManager em = new ApplicationSetting().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long ApplicationSetting.countApplicationSettings() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ApplicationSetting o", Long.class).getSingleResult();
-    }
-    
-    public static List<ApplicationSetting> ApplicationSetting.findAllApplicationSettings() {
-        return entityManager().createQuery("SELECT o FROM ApplicationSetting o", ApplicationSetting.class).getResultList();
-    }
-    
-    public static List<ApplicationSetting> ApplicationSetting.findAllApplicationSettings(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ApplicationSetting o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ApplicationSetting.class).getResultList();
-    }
-    
-    public static ApplicationSetting ApplicationSetting.findApplicationSetting(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ApplicationSetting.class, id);
-    }
-    
-    public static List<ApplicationSetting> ApplicationSetting.findApplicationSettingEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ApplicationSetting o", ApplicationSetting.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ApplicationSetting> ApplicationSetting.findApplicationSettingEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ApplicationSetting o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ApplicationSetting.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void ApplicationSetting.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void ApplicationSetting.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            ApplicationSetting attached = ApplicationSetting.findApplicationSetting(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void ApplicationSetting.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void ApplicationSetting.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public ApplicationSetting ApplicationSetting.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ApplicationSetting merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ApplicationSetting_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ApplicationSetting_Roo_Jpa_Entity.aj
deleted file mode 100755
index 0d5e8623a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ApplicationSetting_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ApplicationSetting;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
-
-privileged aspect ApplicationSetting_Roo_Jpa_Entity {
-    
-    declare @type: ApplicationSetting: @Entity;
-    
-    @Id
-    @SequenceGenerator(name = "applicationSettingGen", sequenceName = "APPSETTING_PKSEQ")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "applicationSettingGen")
-    @Column(name = "id")
-    private Long ApplicationSetting.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer ApplicationSetting.version;
-    
-    public Long ApplicationSetting.getId() {
-        return this.id;
-    }
-    
-    public void ApplicationSetting.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer ApplicationSetting.getVersion() {
-        return this.version;
-    }
-    
-    public void ApplicationSetting.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ApplicationSetting_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/ApplicationSetting_Roo_Json.aj
deleted file mode 100755
index bbe447c1a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ApplicationSetting_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ApplicationSetting;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ApplicationSetting_Roo_Json {
-    
-    public String ApplicationSetting.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ApplicationSetting.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ApplicationSetting ApplicationSetting.fromJsonToApplicationSetting(String json) {
-        return new JSONDeserializer<ApplicationSetting>()
-        .use(null, ApplicationSetting.class).deserialize(json);
-    }
-    
-    public static String ApplicationSetting.toJsonArray(Collection<ApplicationSetting> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ApplicationSetting.toJsonArray(Collection<ApplicationSetting> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ApplicationSetting> ApplicationSetting.fromJsonArrayToApplicationSettings(String json) {
-        return new JSONDeserializer<List<ApplicationSetting>>()
-        .use("values", ApplicationSetting.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ApplicationSetting_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ApplicationSetting_Roo_ToString.aj
deleted file mode 100755
index ce0eafb97..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ApplicationSetting_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ApplicationSetting;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ApplicationSetting_Roo_ToString {
-    
-    public String ApplicationSetting.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Author.java b/src/main/java/com/labsynch/labseer/domain/Author.java
index 4e480786e..127495d90 100755
--- a/src/main/java/com/labsynch/labseer/domain/Author.java
+++ b/src/main/java/com/labsynch/labseer/domain/Author.java
@@ -9,6 +9,7 @@
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
 import javax.persistence.OneToMany;
@@ -17,7 +18,7 @@
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
@@ -29,6 +30,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @RooJson
 @RooJavaBean
 //@RooToString(excludeFields = { "password", "modifiedDate", "activationKey", "activationDate", "emailAddress", "recordedDate", "modifiedDate", "enabled", "locked" })
@@ -210,4 +213,222 @@ public static Author update(Author author) {
 
 	public Author() {
     }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("firstName", "lastName", "userName", "emailAddress", "password", "activationDate", "activationKey", "enabled", "locked", "authorRoles", "lsStates", "lsLabels");
+
+	public static long countAuthors() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM Author o", Long.class).getSingleResult();
+    }
+
+	public static List<Author> findAllAuthors() {
+        return entityManager().createQuery("SELECT o FROM Author o", Author.class).getResultList();
+    }
+
+	public static List<Author> findAllAuthors(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM Author o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, Author.class).getResultList();
+    }
+
+	public static Author findAuthor(Long id) {
+        if (id == null) return null;
+        return entityManager().find(Author.class, id);
+    }
+
+	public static List<Author> findAuthorEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM Author o", Author.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<Author> findAuthorEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM Author o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, Author.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public Author merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        Author merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String getFirstName() {
+        return this.firstName;
+    }
+
+	public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+	public String getLastName() {
+        return this.lastName;
+    }
+
+	public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+	public String getUserName() {
+        return this.userName;
+    }
+
+	public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+	public String getEmailAddress() {
+        return this.emailAddress;
+    }
+
+	public void setEmailAddress(String emailAddress) {
+        this.emailAddress = emailAddress;
+    }
+
+	public String getPassword() {
+        return this.password;
+    }
+
+	public void setPassword(String password) {
+        this.password = password;
+    }
+
+	public Date getActivationDate() {
+        return this.activationDate;
+    }
+
+	public void setActivationDate(Date activationDate) {
+        this.activationDate = activationDate;
+    }
+
+	public String getActivationKey() {
+        return this.activationKey;
+    }
+
+	public void setActivationKey(String activationKey) {
+        this.activationKey = activationKey;
+    }
+
+	public Boolean getEnabled() {
+        return this.enabled;
+    }
+
+	public void setEnabled(Boolean enabled) {
+        this.enabled = enabled;
+    }
+
+	public Boolean getLocked() {
+        return this.locked;
+    }
+
+	public void setLocked(Boolean locked) {
+        this.locked = locked;
+    }
+
+	public Set<AuthorRole> getAuthorRoles() {
+        return this.authorRoles;
+    }
+
+	public void setAuthorRoles(Set<AuthorRole> authorRoles) {
+        this.authorRoles = authorRoles;
+    }
+
+	public Set<AuthorState> getLsStates() {
+        return this.lsStates;
+    }
+
+	public void setLsStates(Set<AuthorState> lsStates) {
+        this.lsStates = lsStates;
+    }
+
+	public Set<AuthorLabel> getLsLabels() {
+        return this.lsLabels;
+    }
+
+	public void setLsLabels(Set<AuthorLabel> lsLabels) {
+        this.lsLabels = lsLabels;
+    }
+
+	public static Long countFindAuthorsByActivationKeyAndEmailAddress(String activationKey, String emailAddress) {
+        if (activationKey == null || activationKey.length() == 0) throw new IllegalArgumentException("The activationKey argument is required");
+        if (emailAddress == null || emailAddress.length() == 0) throw new IllegalArgumentException("The emailAddress argument is required");
+        EntityManager em = Author.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Author AS o WHERE o.activationKey = :activationKey AND o.emailAddress = :emailAddress", Long.class);
+        q.setParameter("activationKey", activationKey);
+        q.setParameter("emailAddress", emailAddress);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindAuthorsByEmailAddress(String emailAddress) {
+        if (emailAddress == null || emailAddress.length() == 0) throw new IllegalArgumentException("The emailAddress argument is required");
+        EntityManager em = Author.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Author AS o WHERE o.emailAddress = :emailAddress", Long.class);
+        q.setParameter("emailAddress", emailAddress);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindAuthorsByUserName(String userName) {
+        if (userName == null || userName.length() == 0) throw new IllegalArgumentException("The userName argument is required");
+        EntityManager em = Author.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Author AS o WHERE o.userName = :userName", Long.class);
+        q.setParameter("userName", userName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<Author> findAuthorsByActivationKeyAndEmailAddress(String activationKey, String emailAddress, String sortFieldName, String sortOrder) {
+        if (activationKey == null || activationKey.length() == 0) throw new IllegalArgumentException("The activationKey argument is required");
+        if (emailAddress == null || emailAddress.length() == 0) throw new IllegalArgumentException("The emailAddress argument is required");
+        EntityManager em = Author.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Author AS o WHERE o.activationKey = :activationKey AND o.emailAddress = :emailAddress");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Author> q = em.createQuery(queryBuilder.toString(), Author.class);
+        q.setParameter("activationKey", activationKey);
+        q.setParameter("emailAddress", emailAddress);
+        return q;
+    }
+
+	public static TypedQuery<Author> findAuthorsByEmailAddress(String emailAddress, String sortFieldName, String sortOrder) {
+        if (emailAddress == null || emailAddress.length() == 0) throw new IllegalArgumentException("The emailAddress argument is required");
+        EntityManager em = Author.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Author AS o WHERE o.emailAddress = :emailAddress");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Author> q = em.createQuery(queryBuilder.toString(), Author.class);
+        q.setParameter("emailAddress", emailAddress);
+        return q;
+    }
+
+	public static TypedQuery<Author> findAuthorsByUserName(String userName, String sortFieldName, String sortOrder) {
+        if (userName == null || userName.length() == 0) throw new IllegalArgumentException("The userName argument is required");
+        EntityManager em = Author.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Author AS o WHERE o.userName = :userName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Author> q = em.createQuery(queryBuilder.toString(), Author.class);
+        q.setParameter("userName", userName);
+        return q;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorLabel.java b/src/main/java/com/labsynch/labseer/domain/AuthorLabel.java
index d94fbaca9..6369431bd 100644
--- a/src/main/java/com/labsynch/labseer/domain/AuthorLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/AuthorLabel.java
@@ -5,11 +5,15 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
-
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -17,7 +21,10 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -67,4 +74,156 @@ public static Collection<AuthorLabel> fromJsonArrayToAuthorLabels(Reader json) {
     }
     
     
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static AuthorLabel fromJsonToAuthorLabel(String json) {
+        return new JSONDeserializer<AuthorLabel>()
+        .use(null, AuthorLabel.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<AuthorLabel> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<AuthorLabel> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Long countFindAuthorLabelsByAuthor(Author author) {
+        if (author == null) throw new IllegalArgumentException("The author argument is required");
+        EntityManager em = AuthorLabel.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorLabel AS o WHERE o.author = :author", Long.class);
+        q.setParameter("author", author);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindAuthorLabelsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = AuthorLabel.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorLabel AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<AuthorLabel> findAuthorLabelsByAuthor(Author author) {
+        if (author == null) throw new IllegalArgumentException("The author argument is required");
+        EntityManager em = AuthorLabel.entityManager();
+        TypedQuery<AuthorLabel> q = em.createQuery("SELECT o FROM AuthorLabel AS o WHERE o.author = :author", AuthorLabel.class);
+        q.setParameter("author", author);
+        return q;
+    }
+
+	public static TypedQuery<AuthorLabel> findAuthorLabelsByAuthor(Author author, String sortFieldName, String sortOrder) {
+        if (author == null) throw new IllegalArgumentException("The author argument is required");
+        EntityManager em = AuthorLabel.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorLabel AS o WHERE o.author = :author");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AuthorLabel> q = em.createQuery(queryBuilder.toString(), AuthorLabel.class);
+        q.setParameter("author", author);
+        return q;
+    }
+
+	public static TypedQuery<AuthorLabel> findAuthorLabelsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = AuthorLabel.entityManager();
+        TypedQuery<AuthorLabel> q = em.createQuery("SELECT o FROM AuthorLabel AS o WHERE o.lsTransaction = :lsTransaction", AuthorLabel.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<AuthorLabel> findAuthorLabelsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = AuthorLabel.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorLabel AS o WHERE o.lsTransaction = :lsTransaction");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AuthorLabel> q = em.createQuery(queryBuilder.toString(), AuthorLabel.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public AuthorLabel() {
+        super();
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("author");
+
+	public static long countAuthorLabels() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM AuthorLabel o", Long.class).getSingleResult();
+    }
+
+	public static List<AuthorLabel> findAllAuthorLabels() {
+        return entityManager().createQuery("SELECT o FROM AuthorLabel o", AuthorLabel.class).getResultList();
+    }
+
+	public static List<AuthorLabel> findAllAuthorLabels(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM AuthorLabel o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, AuthorLabel.class).getResultList();
+    }
+
+	public static AuthorLabel findAuthorLabel(Long id) {
+        if (id == null) return null;
+        return entityManager().find(AuthorLabel.class, id);
+    }
+
+	public static List<AuthorLabel> findAuthorLabelEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM AuthorLabel o", AuthorLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<AuthorLabel> findAuthorLabelEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM AuthorLabel o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, AuthorLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public AuthorLabel merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        AuthorLabel merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public Author getAuthor() {
+        return this.author;
+    }
+
+	public void setAuthor(Author author) {
+        this.author = author;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorLabel_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/AuthorLabel_Roo_Configurable.aj
deleted file mode 100644
index 6b13abc6d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AuthorLabel_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AuthorLabel;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect AuthorLabel_Roo_Configurable {
-    
-    declare @type: AuthorLabel: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorLabel_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/AuthorLabel_Roo_Finder.aj
deleted file mode 100644
index b08006747..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AuthorLabel_Roo_Finder.aj
+++ /dev/null
@@ -1,75 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.AuthorLabel;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect AuthorLabel_Roo_Finder {
-    
-    public static Long AuthorLabel.countFindAuthorLabelsByAuthor(Author author) {
-        if (author == null) throw new IllegalArgumentException("The author argument is required");
-        EntityManager em = AuthorLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorLabel AS o WHERE o.author = :author", Long.class);
-        q.setParameter("author", author);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long AuthorLabel.countFindAuthorLabelsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = AuthorLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorLabel AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<AuthorLabel> AuthorLabel.findAuthorLabelsByAuthor(Author author) {
-        if (author == null) throw new IllegalArgumentException("The author argument is required");
-        EntityManager em = AuthorLabel.entityManager();
-        TypedQuery<AuthorLabel> q = em.createQuery("SELECT o FROM AuthorLabel AS o WHERE o.author = :author", AuthorLabel.class);
-        q.setParameter("author", author);
-        return q;
-    }
-    
-    public static TypedQuery<AuthorLabel> AuthorLabel.findAuthorLabelsByAuthor(Author author, String sortFieldName, String sortOrder) {
-        if (author == null) throw new IllegalArgumentException("The author argument is required");
-        EntityManager em = AuthorLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorLabel AS o WHERE o.author = :author");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AuthorLabel> q = em.createQuery(queryBuilder.toString(), AuthorLabel.class);
-        q.setParameter("author", author);
-        return q;
-    }
-    
-    public static TypedQuery<AuthorLabel> AuthorLabel.findAuthorLabelsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = AuthorLabel.entityManager();
-        TypedQuery<AuthorLabel> q = em.createQuery("SELECT o FROM AuthorLabel AS o WHERE o.lsTransaction = :lsTransaction", AuthorLabel.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<AuthorLabel> AuthorLabel.findAuthorLabelsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = AuthorLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorLabel AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AuthorLabel> q = em.createQuery(queryBuilder.toString(), AuthorLabel.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorLabel_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/AuthorLabel_Roo_JavaBean.aj
deleted file mode 100644
index bc21167e8..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AuthorLabel_Roo_JavaBean.aj
+++ /dev/null
@@ -1,19 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.AuthorLabel;
-
-privileged aspect AuthorLabel_Roo_JavaBean {
-    
-    public Author AuthorLabel.getAuthor() {
-        return this.author;
-    }
-    
-    public void AuthorLabel.setAuthor(Author author) {
-        this.author = author;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorLabel_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/AuthorLabel_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index a9a334fcd..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AuthorLabel_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AuthorLabel;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect AuthorLabel_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> AuthorLabel.fieldNames4OrderClauseFilter = java.util.Arrays.asList("author");
-    
-    public static long AuthorLabel.countAuthorLabels() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM AuthorLabel o", Long.class).getSingleResult();
-    }
-    
-    public static List<AuthorLabel> AuthorLabel.findAllAuthorLabels() {
-        return entityManager().createQuery("SELECT o FROM AuthorLabel o", AuthorLabel.class).getResultList();
-    }
-    
-    public static List<AuthorLabel> AuthorLabel.findAllAuthorLabels(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AuthorLabel o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AuthorLabel.class).getResultList();
-    }
-    
-    public static AuthorLabel AuthorLabel.findAuthorLabel(Long id) {
-        if (id == null) return null;
-        return entityManager().find(AuthorLabel.class, id);
-    }
-    
-    public static List<AuthorLabel> AuthorLabel.findAuthorLabelEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM AuthorLabel o", AuthorLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<AuthorLabel> AuthorLabel.findAuthorLabelEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AuthorLabel o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AuthorLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public AuthorLabel AuthorLabel.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        AuthorLabel merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorLabel_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/AuthorLabel_Roo_Jpa_Entity.aj
deleted file mode 100644
index a40bd010d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AuthorLabel_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,17 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AuthorLabel;
-import javax.persistence.Entity;
-
-privileged aspect AuthorLabel_Roo_Jpa_Entity {
-    
-    declare @type: AuthorLabel: @Entity;
-    
-    public AuthorLabel.new() {
-        super();
-    }
-
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorLabel_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/AuthorLabel_Roo_Json.aj
deleted file mode 100644
index 296bdb7cc..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AuthorLabel_Roo_Json.aj
+++ /dev/null
@@ -1,38 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AuthorLabel;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.Collection;
-
-privileged aspect AuthorLabel_Roo_Json {
-    
-    public String AuthorLabel.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String AuthorLabel.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static AuthorLabel AuthorLabel.fromJsonToAuthorLabel(String json) {
-        return new JSONDeserializer<AuthorLabel>()
-        .use(null, AuthorLabel.class).deserialize(json);
-    }
-    
-    public static String AuthorLabel.toJsonArray(Collection<AuthorLabel> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String AuthorLabel.toJsonArray(Collection<AuthorLabel> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorLabel_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/AuthorLabel_Roo_ToString.aj
deleted file mode 100644
index e2659de96..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AuthorLabel_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AuthorLabel;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AuthorLabel_Roo_ToString {
-    
-    public String AuthorLabel.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorRole.java b/src/main/java/com/labsynch/labseer/domain/AuthorRole.java
index b77a90293..d371cb2a0 100755
--- a/src/main/java/com/labsynch/labseer/domain/AuthorRole.java
+++ b/src/main/java/com/labsynch/labseer/domain/AuthorRole.java
@@ -5,24 +5,30 @@
 import java.util.List;
 
 import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
+import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
-
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
-
+import org.springframework.transaction.annotation.Transactional;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Entity
+@Configurable
 @RooJson
 @RooJavaBean
 @RooToString(excludeFields = { "userEntry", "roleEntry", "version" })
@@ -98,4 +104,206 @@ public static AuthorRole getOrCreateAuthorRole(Author author, LsRole userRole) {
 			return authorRoles.get(0);
 		}
 	}
+
+	public static Long countFindAuthorRolesByRoleEntry(LsRole roleEntry) {
+        if (roleEntry == null) throw new IllegalArgumentException("The roleEntry argument is required");
+        EntityManager em = AuthorRole.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorRole AS o WHERE o.roleEntry = :roleEntry", Long.class);
+        q.setParameter("roleEntry", roleEntry);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindAuthorRolesByRoleEntryAndUserEntry(LsRole roleEntry, Author userEntry) {
+        if (roleEntry == null) throw new IllegalArgumentException("The roleEntry argument is required");
+        if (userEntry == null) throw new IllegalArgumentException("The userEntry argument is required");
+        EntityManager em = AuthorRole.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorRole AS o WHERE o.roleEntry = :roleEntry AND o.userEntry = :userEntry", Long.class);
+        q.setParameter("roleEntry", roleEntry);
+        q.setParameter("userEntry", userEntry);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindAuthorRolesByUserEntry(Author userEntry) {
+        if (userEntry == null) throw new IllegalArgumentException("The userEntry argument is required");
+        EntityManager em = AuthorRole.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorRole AS o WHERE o.userEntry = :userEntry", Long.class);
+        q.setParameter("userEntry", userEntry);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<AuthorRole> findAuthorRolesByRoleEntry(LsRole roleEntry) {
+        if (roleEntry == null) throw new IllegalArgumentException("The roleEntry argument is required");
+        EntityManager em = AuthorRole.entityManager();
+        TypedQuery<AuthorRole> q = em.createQuery("SELECT o FROM AuthorRole AS o WHERE o.roleEntry = :roleEntry", AuthorRole.class);
+        q.setParameter("roleEntry", roleEntry);
+        return q;
+    }
+
+	public static TypedQuery<AuthorRole> findAuthorRolesByRoleEntry(LsRole roleEntry, String sortFieldName, String sortOrder) {
+        if (roleEntry == null) throw new IllegalArgumentException("The roleEntry argument is required");
+        EntityManager em = AuthorRole.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorRole AS o WHERE o.roleEntry = :roleEntry");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AuthorRole> q = em.createQuery(queryBuilder.toString(), AuthorRole.class);
+        q.setParameter("roleEntry", roleEntry);
+        return q;
+    }
+
+	public static TypedQuery<AuthorRole> findAuthorRolesByRoleEntryAndUserEntry(LsRole roleEntry, Author userEntry) {
+        if (roleEntry == null) throw new IllegalArgumentException("The roleEntry argument is required");
+        if (userEntry == null) throw new IllegalArgumentException("The userEntry argument is required");
+        EntityManager em = AuthorRole.entityManager();
+        TypedQuery<AuthorRole> q = em.createQuery("SELECT o FROM AuthorRole AS o WHERE o.roleEntry = :roleEntry AND o.userEntry = :userEntry", AuthorRole.class);
+        q.setParameter("roleEntry", roleEntry);
+        q.setParameter("userEntry", userEntry);
+        return q;
+    }
+
+	public static TypedQuery<AuthorRole> findAuthorRolesByRoleEntryAndUserEntry(LsRole roleEntry, Author userEntry, String sortFieldName, String sortOrder) {
+        if (roleEntry == null) throw new IllegalArgumentException("The roleEntry argument is required");
+        if (userEntry == null) throw new IllegalArgumentException("The userEntry argument is required");
+        EntityManager em = AuthorRole.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorRole AS o WHERE o.roleEntry = :roleEntry AND o.userEntry = :userEntry");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AuthorRole> q = em.createQuery(queryBuilder.toString(), AuthorRole.class);
+        q.setParameter("roleEntry", roleEntry);
+        q.setParameter("userEntry", userEntry);
+        return q;
+    }
+
+	public static TypedQuery<AuthorRole> findAuthorRolesByUserEntry(Author userEntry) {
+        if (userEntry == null) throw new IllegalArgumentException("The userEntry argument is required");
+        EntityManager em = AuthorRole.entityManager();
+        TypedQuery<AuthorRole> q = em.createQuery("SELECT o FROM AuthorRole AS o WHERE o.userEntry = :userEntry", AuthorRole.class);
+        q.setParameter("userEntry", userEntry);
+        return q;
+    }
+
+	public static TypedQuery<AuthorRole> findAuthorRolesByUserEntry(Author userEntry, String sortFieldName, String sortOrder) {
+        if (userEntry == null) throw new IllegalArgumentException("The userEntry argument is required");
+        EntityManager em = AuthorRole.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorRole AS o WHERE o.userEntry = :userEntry");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AuthorRole> q = em.createQuery(queryBuilder.toString(), AuthorRole.class);
+        q.setParameter("userEntry", userEntry);
+        return q;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("userEntry", "roleEntry", "id", "version");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new AuthorRole().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countAuthorRoles() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM AuthorRole o", Long.class).getSingleResult();
+    }
+
+	public static List<AuthorRole> findAllAuthorRoles() {
+        return entityManager().createQuery("SELECT o FROM AuthorRole o", AuthorRole.class).getResultList();
+    }
+
+	public static List<AuthorRole> findAllAuthorRoles(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM AuthorRole o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, AuthorRole.class).getResultList();
+    }
+
+	public static AuthorRole findAuthorRole(Long id) {
+        if (id == null) return null;
+        return entityManager().find(AuthorRole.class, id);
+    }
+
+	public static List<AuthorRole> findAuthorRoleEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM AuthorRole o", AuthorRole.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<AuthorRole> findAuthorRoleEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM AuthorRole o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, AuthorRole.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            AuthorRole attached = AuthorRole.findAuthorRole(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public AuthorRole merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        AuthorRole merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public Author getUserEntry() {
+        return this.userEntry;
+    }
+
+	public void setUserEntry(Author userEntry) {
+        this.userEntry = userEntry;
+    }
+
+	public LsRole getRoleEntry() {
+        return this.roleEntry;
+    }
+
+	public void setRoleEntry(LsRole roleEntry) {
+        this.roleEntry = roleEntry;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorRole_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/AuthorRole_Roo_Configurable.aj
deleted file mode 100755
index a7c349ae7..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AuthorRole_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AuthorRole;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect AuthorRole_Roo_Configurable {
-    
-    declare @type: AuthorRole: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorRole_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/AuthorRole_Roo_Finder.aj
deleted file mode 100755
index cc3657f86..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AuthorRole_Roo_Finder.aj
+++ /dev/null
@@ -1,113 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.AuthorRole;
-import com.labsynch.labseer.domain.LsRole;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect AuthorRole_Roo_Finder {
-    
-    public static Long AuthorRole.countFindAuthorRolesByRoleEntry(LsRole roleEntry) {
-        if (roleEntry == null) throw new IllegalArgumentException("The roleEntry argument is required");
-        EntityManager em = AuthorRole.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorRole AS o WHERE o.roleEntry = :roleEntry", Long.class);
-        q.setParameter("roleEntry", roleEntry);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long AuthorRole.countFindAuthorRolesByRoleEntryAndUserEntry(LsRole roleEntry, Author userEntry) {
-        if (roleEntry == null) throw new IllegalArgumentException("The roleEntry argument is required");
-        if (userEntry == null) throw new IllegalArgumentException("The userEntry argument is required");
-        EntityManager em = AuthorRole.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorRole AS o WHERE o.roleEntry = :roleEntry AND o.userEntry = :userEntry", Long.class);
-        q.setParameter("roleEntry", roleEntry);
-        q.setParameter("userEntry", userEntry);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long AuthorRole.countFindAuthorRolesByUserEntry(Author userEntry) {
-        if (userEntry == null) throw new IllegalArgumentException("The userEntry argument is required");
-        EntityManager em = AuthorRole.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorRole AS o WHERE o.userEntry = :userEntry", Long.class);
-        q.setParameter("userEntry", userEntry);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<AuthorRole> AuthorRole.findAuthorRolesByRoleEntry(LsRole roleEntry) {
-        if (roleEntry == null) throw new IllegalArgumentException("The roleEntry argument is required");
-        EntityManager em = AuthorRole.entityManager();
-        TypedQuery<AuthorRole> q = em.createQuery("SELECT o FROM AuthorRole AS o WHERE o.roleEntry = :roleEntry", AuthorRole.class);
-        q.setParameter("roleEntry", roleEntry);
-        return q;
-    }
-    
-    public static TypedQuery<AuthorRole> AuthorRole.findAuthorRolesByRoleEntry(LsRole roleEntry, String sortFieldName, String sortOrder) {
-        if (roleEntry == null) throw new IllegalArgumentException("The roleEntry argument is required");
-        EntityManager em = AuthorRole.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorRole AS o WHERE o.roleEntry = :roleEntry");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AuthorRole> q = em.createQuery(queryBuilder.toString(), AuthorRole.class);
-        q.setParameter("roleEntry", roleEntry);
-        return q;
-    }
-    
-    public static TypedQuery<AuthorRole> AuthorRole.findAuthorRolesByRoleEntryAndUserEntry(LsRole roleEntry, Author userEntry) {
-        if (roleEntry == null) throw new IllegalArgumentException("The roleEntry argument is required");
-        if (userEntry == null) throw new IllegalArgumentException("The userEntry argument is required");
-        EntityManager em = AuthorRole.entityManager();
-        TypedQuery<AuthorRole> q = em.createQuery("SELECT o FROM AuthorRole AS o WHERE o.roleEntry = :roleEntry AND o.userEntry = :userEntry", AuthorRole.class);
-        q.setParameter("roleEntry", roleEntry);
-        q.setParameter("userEntry", userEntry);
-        return q;
-    }
-    
-    public static TypedQuery<AuthorRole> AuthorRole.findAuthorRolesByRoleEntryAndUserEntry(LsRole roleEntry, Author userEntry, String sortFieldName, String sortOrder) {
-        if (roleEntry == null) throw new IllegalArgumentException("The roleEntry argument is required");
-        if (userEntry == null) throw new IllegalArgumentException("The userEntry argument is required");
-        EntityManager em = AuthorRole.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorRole AS o WHERE o.roleEntry = :roleEntry AND o.userEntry = :userEntry");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AuthorRole> q = em.createQuery(queryBuilder.toString(), AuthorRole.class);
-        q.setParameter("roleEntry", roleEntry);
-        q.setParameter("userEntry", userEntry);
-        return q;
-    }
-    
-    public static TypedQuery<AuthorRole> AuthorRole.findAuthorRolesByUserEntry(Author userEntry) {
-        if (userEntry == null) throw new IllegalArgumentException("The userEntry argument is required");
-        EntityManager em = AuthorRole.entityManager();
-        TypedQuery<AuthorRole> q = em.createQuery("SELECT o FROM AuthorRole AS o WHERE o.userEntry = :userEntry", AuthorRole.class);
-        q.setParameter("userEntry", userEntry);
-        return q;
-    }
-    
-    public static TypedQuery<AuthorRole> AuthorRole.findAuthorRolesByUserEntry(Author userEntry, String sortFieldName, String sortOrder) {
-        if (userEntry == null) throw new IllegalArgumentException("The userEntry argument is required");
-        EntityManager em = AuthorRole.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorRole AS o WHERE o.userEntry = :userEntry");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AuthorRole> q = em.createQuery(queryBuilder.toString(), AuthorRole.class);
-        q.setParameter("userEntry", userEntry);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorRole_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/AuthorRole_Roo_JavaBean.aj
deleted file mode 100755
index 715a8fac7..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AuthorRole_Roo_JavaBean.aj
+++ /dev/null
@@ -1,28 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.AuthorRole;
-import com.labsynch.labseer.domain.LsRole;
-
-privileged aspect AuthorRole_Roo_JavaBean {
-    
-    public Author AuthorRole.getUserEntry() {
-        return this.userEntry;
-    }
-    
-    public void AuthorRole.setUserEntry(Author userEntry) {
-        this.userEntry = userEntry;
-    }
-    
-    public LsRole AuthorRole.getRoleEntry() {
-        return this.roleEntry;
-    }
-    
-    public void AuthorRole.setRoleEntry(LsRole roleEntry) {
-        this.roleEntry = roleEntry;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorRole_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/AuthorRole_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 8f9b04716..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AuthorRole_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AuthorRole;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect AuthorRole_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager AuthorRole.entityManager;
-    
-    public static final List<String> AuthorRole.fieldNames4OrderClauseFilter = java.util.Arrays.asList("userEntry", "roleEntry", "id", "version");
-    
-    public static final EntityManager AuthorRole.entityManager() {
-        EntityManager em = new AuthorRole().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long AuthorRole.countAuthorRoles() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM AuthorRole o", Long.class).getSingleResult();
-    }
-    
-    public static List<AuthorRole> AuthorRole.findAllAuthorRoles() {
-        return entityManager().createQuery("SELECT o FROM AuthorRole o", AuthorRole.class).getResultList();
-    }
-    
-    public static List<AuthorRole> AuthorRole.findAllAuthorRoles(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AuthorRole o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AuthorRole.class).getResultList();
-    }
-    
-    public static AuthorRole AuthorRole.findAuthorRole(Long id) {
-        if (id == null) return null;
-        return entityManager().find(AuthorRole.class, id);
-    }
-    
-    public static List<AuthorRole> AuthorRole.findAuthorRoleEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM AuthorRole o", AuthorRole.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<AuthorRole> AuthorRole.findAuthorRoleEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AuthorRole o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AuthorRole.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void AuthorRole.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void AuthorRole.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            AuthorRole attached = AuthorRole.findAuthorRole(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void AuthorRole.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void AuthorRole.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public AuthorRole AuthorRole.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        AuthorRole merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorRole_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/AuthorRole_Roo_Jpa_Entity.aj
deleted file mode 100644
index de604ea2e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AuthorRole_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AuthorRole;
-import javax.persistence.Entity;
-
-privileged aspect AuthorRole_Roo_Jpa_Entity {
-    
-    declare @type: AuthorRole: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorState.java b/src/main/java/com/labsynch/labseer/domain/AuthorState.java
index 7af4c2895..3dbc2205e 100644
--- a/src/main/java/com/labsynch/labseer/domain/AuthorState.java
+++ b/src/main/java/com/labsynch/labseer/domain/AuthorState.java
@@ -9,6 +9,7 @@
 import java.util.Set;
 
 import javax.persistence.CascadeType;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
@@ -16,7 +17,9 @@
 import javax.persistence.OneToMany;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -30,6 +33,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -117,4 +122,253 @@ public static TypedQuery<AuthorState> findAuthorStatesByAuthorIDAndStateTypeKind
 			return q;
 		}
 
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("author", "lsValues");
+
+	public static long countAuthorStates() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM AuthorState o", Long.class).getSingleResult();
+    }
+
+	public static List<AuthorState> findAllAuthorStates() {
+        return entityManager().createQuery("SELECT o FROM AuthorState o", AuthorState.class).getResultList();
+    }
+
+	public static List<AuthorState> findAllAuthorStates(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM AuthorState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, AuthorState.class).getResultList();
+    }
+
+	public static AuthorState findAuthorState(Long id) {
+        if (id == null) return null;
+        return entityManager().find(AuthorState.class, id);
+    }
+
+	public static List<AuthorState> findAuthorStateEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM AuthorState o", AuthorState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<AuthorState> findAuthorStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM AuthorState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, AuthorState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public AuthorState merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        AuthorState merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public AuthorState() {
+        super();
+    }
+
+	public Author getAuthor() {
+        return this.author;
+    }
+
+	public void setAuthor(Author author) {
+        this.author = author;
+    }
+
+	public Set<AuthorValue> getLsValues() {
+        return this.lsValues;
+    }
+
+	public void setLsValues(Set<AuthorValue> lsValues) {
+        this.lsValues = lsValues;
+    }
+
+	public static Long countFindAuthorStatesByAuthor(Author author) {
+        if (author == null) throw new IllegalArgumentException("The author argument is required");
+        EntityManager em = AuthorState.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorState AS o WHERE o.author = :author", Long.class);
+        q.setParameter("author", author);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindAuthorStatesByAuthorAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(Author author, String lsType, String lsKind, boolean ignored) {
+        if (author == null) throw new IllegalArgumentException("The author argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = AuthorState.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorState AS o WHERE o.author = :author AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored", Long.class);
+        q.setParameter("author", author);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("ignored", ignored);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindAuthorStatesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = AuthorState.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorState AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindAuthorStatesByLsTypeAndKindEquals(String lsTypeAndKind) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        EntityManager em = AuthorState.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", Long.class);
+        q.setParameter("lsTypeAndKind", lsTypeAndKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindAuthorStatesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = AuthorState.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<AuthorState> findAuthorStatesByAuthor(Author author) {
+        if (author == null) throw new IllegalArgumentException("The author argument is required");
+        EntityManager em = AuthorState.entityManager();
+        TypedQuery<AuthorState> q = em.createQuery("SELECT o FROM AuthorState AS o WHERE o.author = :author", AuthorState.class);
+        q.setParameter("author", author);
+        return q;
+    }
+
+	public static TypedQuery<AuthorState> findAuthorStatesByAuthor(Author author, String sortFieldName, String sortOrder) {
+        if (author == null) throw new IllegalArgumentException("The author argument is required");
+        EntityManager em = AuthorState.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorState AS o WHERE o.author = :author");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AuthorState> q = em.createQuery(queryBuilder.toString(), AuthorState.class);
+        q.setParameter("author", author);
+        return q;
+    }
+
+	public static TypedQuery<AuthorState> findAuthorStatesByAuthorAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(Author author, String lsType, String lsKind, boolean ignored) {
+        if (author == null) throw new IllegalArgumentException("The author argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = AuthorState.entityManager();
+        TypedQuery<AuthorState> q = em.createQuery("SELECT o FROM AuthorState AS o WHERE o.author = :author AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored", AuthorState.class);
+        q.setParameter("author", author);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<AuthorState> findAuthorStatesByAuthorAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(Author author, String lsType, String lsKind, boolean ignored, String sortFieldName, String sortOrder) {
+        if (author == null) throw new IllegalArgumentException("The author argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = AuthorState.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorState AS o WHERE o.author = :author AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AuthorState> q = em.createQuery(queryBuilder.toString(), AuthorState.class);
+        q.setParameter("author", author);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<AuthorState> findAuthorStatesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = AuthorState.entityManager();
+        TypedQuery<AuthorState> q = em.createQuery("SELECT o FROM AuthorState AS o WHERE o.lsTransaction = :lsTransaction", AuthorState.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<AuthorState> findAuthorStatesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = AuthorState.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorState AS o WHERE o.lsTransaction = :lsTransaction");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AuthorState> q = em.createQuery(queryBuilder.toString(), AuthorState.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<AuthorState> findAuthorStatesByLsTypeAndKindEquals(String lsTypeAndKind) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        EntityManager em = AuthorState.entityManager();
+        TypedQuery<AuthorState> q = em.createQuery("SELECT o FROM AuthorState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", AuthorState.class);
+        q.setParameter("lsTypeAndKind", lsTypeAndKind);
+        return q;
+    }
+
+	public static TypedQuery<AuthorState> findAuthorStatesByLsTypeAndKindEquals(String lsTypeAndKind, String sortFieldName, String sortOrder) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        EntityManager em = AuthorState.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AuthorState> q = em.createQuery(queryBuilder.toString(), AuthorState.class);
+        q.setParameter("lsTypeAndKind", lsTypeAndKind);
+        return q;
+    }
+
+	public static TypedQuery<AuthorState> findAuthorStatesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = AuthorState.entityManager();
+        TypedQuery<AuthorState> q = em.createQuery("SELECT o FROM AuthorState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", AuthorState.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<AuthorState> findAuthorStatesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = AuthorState.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AuthorState> q = em.createQuery(queryBuilder.toString(), AuthorState.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorState_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/AuthorState_Roo_Configurable.aj
deleted file mode 100644
index 178c4445e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AuthorState_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AuthorState;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect AuthorState_Roo_Configurable {
-    
-    declare @type: AuthorState: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorState_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/AuthorState_Roo_Finder.aj
deleted file mode 100644
index 32294fa30..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AuthorState_Roo_Finder.aj
+++ /dev/null
@@ -1,189 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.AuthorState;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect AuthorState_Roo_Finder {
-    
-    public static Long AuthorState.countFindAuthorStatesByAuthor(Author author) {
-        if (author == null) throw new IllegalArgumentException("The author argument is required");
-        EntityManager em = AuthorState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorState AS o WHERE o.author = :author", Long.class);
-        q.setParameter("author", author);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long AuthorState.countFindAuthorStatesByAuthorAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(Author author, String lsType, String lsKind, boolean ignored) {
-        if (author == null) throw new IllegalArgumentException("The author argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = AuthorState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorState AS o WHERE o.author = :author AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored", Long.class);
-        q.setParameter("author", author);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("ignored", ignored);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long AuthorState.countFindAuthorStatesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = AuthorState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorState AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long AuthorState.countFindAuthorStatesByLsTypeAndKindEquals(String lsTypeAndKind) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
-        EntityManager em = AuthorState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", Long.class);
-        q.setParameter("lsTypeAndKind", lsTypeAndKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long AuthorState.countFindAuthorStatesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = AuthorState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<AuthorState> AuthorState.findAuthorStatesByAuthor(Author author) {
-        if (author == null) throw new IllegalArgumentException("The author argument is required");
-        EntityManager em = AuthorState.entityManager();
-        TypedQuery<AuthorState> q = em.createQuery("SELECT o FROM AuthorState AS o WHERE o.author = :author", AuthorState.class);
-        q.setParameter("author", author);
-        return q;
-    }
-    
-    public static TypedQuery<AuthorState> AuthorState.findAuthorStatesByAuthor(Author author, String sortFieldName, String sortOrder) {
-        if (author == null) throw new IllegalArgumentException("The author argument is required");
-        EntityManager em = AuthorState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorState AS o WHERE o.author = :author");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AuthorState> q = em.createQuery(queryBuilder.toString(), AuthorState.class);
-        q.setParameter("author", author);
-        return q;
-    }
-    
-    public static TypedQuery<AuthorState> AuthorState.findAuthorStatesByAuthorAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(Author author, String lsType, String lsKind, boolean ignored) {
-        if (author == null) throw new IllegalArgumentException("The author argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = AuthorState.entityManager();
-        TypedQuery<AuthorState> q = em.createQuery("SELECT o FROM AuthorState AS o WHERE o.author = :author AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored", AuthorState.class);
-        q.setParameter("author", author);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<AuthorState> AuthorState.findAuthorStatesByAuthorAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(Author author, String lsType, String lsKind, boolean ignored, String sortFieldName, String sortOrder) {
-        if (author == null) throw new IllegalArgumentException("The author argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = AuthorState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorState AS o WHERE o.author = :author AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AuthorState> q = em.createQuery(queryBuilder.toString(), AuthorState.class);
-        q.setParameter("author", author);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<AuthorState> AuthorState.findAuthorStatesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = AuthorState.entityManager();
-        TypedQuery<AuthorState> q = em.createQuery("SELECT o FROM AuthorState AS o WHERE o.lsTransaction = :lsTransaction", AuthorState.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<AuthorState> AuthorState.findAuthorStatesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = AuthorState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorState AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AuthorState> q = em.createQuery(queryBuilder.toString(), AuthorState.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<AuthorState> AuthorState.findAuthorStatesByLsTypeAndKindEquals(String lsTypeAndKind) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
-        EntityManager em = AuthorState.entityManager();
-        TypedQuery<AuthorState> q = em.createQuery("SELECT o FROM AuthorState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", AuthorState.class);
-        q.setParameter("lsTypeAndKind", lsTypeAndKind);
-        return q;
-    }
-    
-    public static TypedQuery<AuthorState> AuthorState.findAuthorStatesByLsTypeAndKindEquals(String lsTypeAndKind, String sortFieldName, String sortOrder) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
-        EntityManager em = AuthorState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AuthorState> q = em.createQuery(queryBuilder.toString(), AuthorState.class);
-        q.setParameter("lsTypeAndKind", lsTypeAndKind);
-        return q;
-    }
-    
-    public static TypedQuery<AuthorState> AuthorState.findAuthorStatesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = AuthorState.entityManager();
-        TypedQuery<AuthorState> q = em.createQuery("SELECT o FROM AuthorState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", AuthorState.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<AuthorState> AuthorState.findAuthorStatesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = AuthorState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AuthorState> q = em.createQuery(queryBuilder.toString(), AuthorState.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorState_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/AuthorState_Roo_JavaBean.aj
deleted file mode 100644
index f1c1e1b10..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AuthorState_Roo_JavaBean.aj
+++ /dev/null
@@ -1,29 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.AuthorState;
-import com.labsynch.labseer.domain.AuthorValue;
-import java.util.Set;
-
-privileged aspect AuthorState_Roo_JavaBean {
-    
-    public Author AuthorState.getAuthor() {
-        return this.author;
-    }
-    
-    public void AuthorState.setAuthor(Author author) {
-        this.author = author;
-    }
-    
-    public Set<AuthorValue> AuthorState.getLsValues() {
-        return this.lsValues;
-    }
-    
-    public void AuthorState.setLsValues(Set<AuthorValue> lsValues) {
-        this.lsValues = lsValues;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorState_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/AuthorState_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 7a7aecfb5..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AuthorState_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AuthorState;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect AuthorState_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> AuthorState.fieldNames4OrderClauseFilter = java.util.Arrays.asList("author", "lsValues");
-    
-    public static long AuthorState.countAuthorStates() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM AuthorState o", Long.class).getSingleResult();
-    }
-    
-    public static List<AuthorState> AuthorState.findAllAuthorStates() {
-        return entityManager().createQuery("SELECT o FROM AuthorState o", AuthorState.class).getResultList();
-    }
-    
-    public static List<AuthorState> AuthorState.findAllAuthorStates(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AuthorState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AuthorState.class).getResultList();
-    }
-    
-    public static AuthorState AuthorState.findAuthorState(Long id) {
-        if (id == null) return null;
-        return entityManager().find(AuthorState.class, id);
-    }
-    
-    public static List<AuthorState> AuthorState.findAuthorStateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM AuthorState o", AuthorState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<AuthorState> AuthorState.findAuthorStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AuthorState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AuthorState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public AuthorState AuthorState.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        AuthorState merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorState_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/AuthorState_Roo_Jpa_Entity.aj
deleted file mode 100644
index 7af1a188a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AuthorState_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,17 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AuthorState;
-import javax.persistence.Entity;
-
-privileged aspect AuthorState_Roo_Jpa_Entity {
-    
-    declare @type: AuthorState: @Entity;
-    
-    public AuthorState.new() {
-        super();
-    }
-
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorState_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/AuthorState_Roo_ToString.aj
deleted file mode 100644
index 02e732646..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AuthorState_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AuthorState;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AuthorState_Roo_ToString {
-    
-    public String AuthorState.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorValue.java b/src/main/java/com/labsynch/labseer/domain/AuthorValue.java
index ca890f658..9e4081426 100644
--- a/src/main/java/com/labsynch/labseer/domain/AuthorValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/AuthorValue.java
@@ -2,23 +2,32 @@
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
-
+import org.springframework.transaction.annotation.Transactional;
 import com.labsynch.labseer.utils.CustomBigDecimalFactory;
 
 import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -84,4 +93,322 @@ public static AuthorValue update(AuthorValue authorValue) {
         return updatedAuthorValue;
     }
 	
+
+	public static Long countFindAuthorValuesByCodeValueEquals(String codeValue) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = AuthorValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorValue AS o WHERE o.codeValue = :codeValue", Long.class);
+        q.setParameter("codeValue", codeValue);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindAuthorValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = AuthorValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", Long.class);
+        q.setParameter("ignored", ignored);
+        q.setParameter("codeValue", codeValue);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindAuthorValuesByLsState(AuthorState lsState) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        EntityManager em = AuthorValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorValue AS o WHERE o.lsState = :lsState", Long.class);
+        q.setParameter("lsState", lsState);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindAuthorValuesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = AuthorValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorValue AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindAuthorValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = AuthorValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindAuthorValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(String lsType, String lsKind, String stringValue, boolean ignored) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+        stringValue = stringValue.replace('*', '%');
+        if (stringValue.charAt(0) != '%') {
+            stringValue = "%" + stringValue;
+        }
+        if (stringValue.charAt(stringValue.length() - 1) != '%') {
+            stringValue = stringValue + "%";
+        }
+        EntityManager em = AuthorValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)  AND o.ignored IS NOT :ignored", Long.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("stringValue", stringValue);
+        q.setParameter("ignored", ignored);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<AuthorValue> findAuthorValuesByCodeValueEquals(String codeValue) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = AuthorValue.entityManager();
+        TypedQuery<AuthorValue> q = em.createQuery("SELECT o FROM AuthorValue AS o WHERE o.codeValue = :codeValue", AuthorValue.class);
+        q.setParameter("codeValue", codeValue);
+        return q;
+    }
+
+	public static TypedQuery<AuthorValue> findAuthorValuesByCodeValueEquals(String codeValue, String sortFieldName, String sortOrder) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = AuthorValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorValue AS o WHERE o.codeValue = :codeValue");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AuthorValue> q = em.createQuery(queryBuilder.toString(), AuthorValue.class);
+        q.setParameter("codeValue", codeValue);
+        return q;
+    }
+
+	public static TypedQuery<AuthorValue> findAuthorValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = AuthorValue.entityManager();
+        TypedQuery<AuthorValue> q = em.createQuery("SELECT o FROM AuthorValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", AuthorValue.class);
+        q.setParameter("ignored", ignored);
+        q.setParameter("codeValue", codeValue);
+        return q;
+    }
+
+	public static TypedQuery<AuthorValue> findAuthorValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue, String sortFieldName, String sortOrder) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = AuthorValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AuthorValue> q = em.createQuery(queryBuilder.toString(), AuthorValue.class);
+        q.setParameter("ignored", ignored);
+        q.setParameter("codeValue", codeValue);
+        return q;
+    }
+
+	public static TypedQuery<AuthorValue> findAuthorValuesByLsState(AuthorState lsState) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        EntityManager em = AuthorValue.entityManager();
+        TypedQuery<AuthorValue> q = em.createQuery("SELECT o FROM AuthorValue AS o WHERE o.lsState = :lsState", AuthorValue.class);
+        q.setParameter("lsState", lsState);
+        return q;
+    }
+
+	public static TypedQuery<AuthorValue> findAuthorValuesByLsState(AuthorState lsState, String sortFieldName, String sortOrder) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        EntityManager em = AuthorValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorValue AS o WHERE o.lsState = :lsState");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AuthorValue> q = em.createQuery(queryBuilder.toString(), AuthorValue.class);
+        q.setParameter("lsState", lsState);
+        return q;
+    }
+
+	public static TypedQuery<AuthorValue> findAuthorValuesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = AuthorValue.entityManager();
+        TypedQuery<AuthorValue> q = em.createQuery("SELECT o FROM AuthorValue AS o WHERE o.lsTransaction = :lsTransaction", AuthorValue.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<AuthorValue> findAuthorValuesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = AuthorValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorValue AS o WHERE o.lsTransaction = :lsTransaction");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AuthorValue> q = em.createQuery(queryBuilder.toString(), AuthorValue.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<AuthorValue> findAuthorValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = AuthorValue.entityManager();
+        TypedQuery<AuthorValue> q = em.createQuery("SELECT o FROM AuthorValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", AuthorValue.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<AuthorValue> findAuthorValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = AuthorValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AuthorValue> q = em.createQuery(queryBuilder.toString(), AuthorValue.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<AuthorValue> findAuthorValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(String lsType, String lsKind, String stringValue, boolean ignored) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+        stringValue = stringValue.replace('*', '%');
+        if (stringValue.charAt(0) != '%') {
+            stringValue = "%" + stringValue;
+        }
+        if (stringValue.charAt(stringValue.length() - 1) != '%') {
+            stringValue = stringValue + "%";
+        }
+        EntityManager em = AuthorValue.entityManager();
+        TypedQuery<AuthorValue> q = em.createQuery("SELECT o FROM AuthorValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)  AND o.ignored IS NOT :ignored", AuthorValue.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("stringValue", stringValue);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<AuthorValue> findAuthorValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(String lsType, String lsKind, String stringValue, boolean ignored, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+        stringValue = stringValue.replace('*', '%');
+        if (stringValue.charAt(0) != '%') {
+            stringValue = "%" + stringValue;
+        }
+        if (stringValue.charAt(stringValue.length() - 1) != '%') {
+            stringValue = stringValue + "%";
+        }
+        EntityManager em = AuthorValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)  AND o.ignored IS NOT :ignored");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<AuthorValue> q = em.createQuery(queryBuilder.toString(), AuthorValue.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("stringValue", stringValue);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsState");
+
+	public static List<AuthorValue> findAllAuthorValues() {
+        return entityManager().createQuery("SELECT o FROM AuthorValue o", AuthorValue.class).getResultList();
+    }
+
+	public static List<AuthorValue> findAllAuthorValues(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM AuthorValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, AuthorValue.class).getResultList();
+    }
+
+	public static AuthorValue findAuthorValue(Long id) {
+        if (id == null) return null;
+        return entityManager().find(AuthorValue.class, id);
+    }
+
+	public static List<AuthorValue> findAuthorValueEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM AuthorValue o", AuthorValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<AuthorValue> findAuthorValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM AuthorValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, AuthorValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public AuthorValue merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        AuthorValue merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static AuthorValue fromJsonToAuthorValue(String json) {
+        return new JSONDeserializer<AuthorValue>()
+        .use(null, AuthorValue.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<AuthorValue> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<AuthorValue> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<AuthorValue> fromJsonArrayToAuthorValues(String json) {
+        return new JSONDeserializer<List<AuthorValue>>()
+        .use("values", AuthorValue.class).deserialize(json);
+    }
+
+	public AuthorState getLsState() {
+        return this.lsState;
+    }
+
+	public void setLsState(AuthorState lsState) {
+        this.lsState = lsState;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorValue_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/AuthorValue_Roo_Configurable.aj
deleted file mode 100644
index b1db36dad..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AuthorValue_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AuthorValue;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect AuthorValue_Roo_Configurable {
-    
-    declare @type: AuthorValue: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorValue_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/AuthorValue_Roo_Finder.aj
deleted file mode 100644
index e31c99dc2..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AuthorValue_Roo_Finder.aj
+++ /dev/null
@@ -1,244 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AuthorState;
-import com.labsynch.labseer.domain.AuthorValue;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect AuthorValue_Roo_Finder {
-    
-    public static Long AuthorValue.countFindAuthorValuesByCodeValueEquals(String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = AuthorValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorValue AS o WHERE o.codeValue = :codeValue", Long.class);
-        q.setParameter("codeValue", codeValue);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long AuthorValue.countFindAuthorValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = AuthorValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", Long.class);
-        q.setParameter("ignored", ignored);
-        q.setParameter("codeValue", codeValue);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long AuthorValue.countFindAuthorValuesByLsState(AuthorState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = AuthorValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorValue AS o WHERE o.lsState = :lsState", Long.class);
-        q.setParameter("lsState", lsState);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long AuthorValue.countFindAuthorValuesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = AuthorValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorValue AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long AuthorValue.countFindAuthorValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = AuthorValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long AuthorValue.countFindAuthorValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(String lsType, String lsKind, String stringValue, boolean ignored) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
-        stringValue = stringValue.replace('*', '%');
-        if (stringValue.charAt(0) != '%') {
-            stringValue = "%" + stringValue;
-        }
-        if (stringValue.charAt(stringValue.length() - 1) != '%') {
-            stringValue = stringValue + "%";
-        }
-        EntityManager em = AuthorValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)  AND o.ignored IS NOT :ignored", Long.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("stringValue", stringValue);
-        q.setParameter("ignored", ignored);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<AuthorValue> AuthorValue.findAuthorValuesByCodeValueEquals(String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = AuthorValue.entityManager();
-        TypedQuery<AuthorValue> q = em.createQuery("SELECT o FROM AuthorValue AS o WHERE o.codeValue = :codeValue", AuthorValue.class);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-    
-    public static TypedQuery<AuthorValue> AuthorValue.findAuthorValuesByCodeValueEquals(String codeValue, String sortFieldName, String sortOrder) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = AuthorValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorValue AS o WHERE o.codeValue = :codeValue");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AuthorValue> q = em.createQuery(queryBuilder.toString(), AuthorValue.class);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-    
-    public static TypedQuery<AuthorValue> AuthorValue.findAuthorValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = AuthorValue.entityManager();
-        TypedQuery<AuthorValue> q = em.createQuery("SELECT o FROM AuthorValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", AuthorValue.class);
-        q.setParameter("ignored", ignored);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-    
-    public static TypedQuery<AuthorValue> AuthorValue.findAuthorValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue, String sortFieldName, String sortOrder) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = AuthorValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AuthorValue> q = em.createQuery(queryBuilder.toString(), AuthorValue.class);
-        q.setParameter("ignored", ignored);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-    
-    public static TypedQuery<AuthorValue> AuthorValue.findAuthorValuesByLsState(AuthorState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = AuthorValue.entityManager();
-        TypedQuery<AuthorValue> q = em.createQuery("SELECT o FROM AuthorValue AS o WHERE o.lsState = :lsState", AuthorValue.class);
-        q.setParameter("lsState", lsState);
-        return q;
-    }
-    
-    public static TypedQuery<AuthorValue> AuthorValue.findAuthorValuesByLsState(AuthorState lsState, String sortFieldName, String sortOrder) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = AuthorValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorValue AS o WHERE o.lsState = :lsState");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AuthorValue> q = em.createQuery(queryBuilder.toString(), AuthorValue.class);
-        q.setParameter("lsState", lsState);
-        return q;
-    }
-    
-    public static TypedQuery<AuthorValue> AuthorValue.findAuthorValuesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = AuthorValue.entityManager();
-        TypedQuery<AuthorValue> q = em.createQuery("SELECT o FROM AuthorValue AS o WHERE o.lsTransaction = :lsTransaction", AuthorValue.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<AuthorValue> AuthorValue.findAuthorValuesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = AuthorValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorValue AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AuthorValue> q = em.createQuery(queryBuilder.toString(), AuthorValue.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<AuthorValue> AuthorValue.findAuthorValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = AuthorValue.entityManager();
-        TypedQuery<AuthorValue> q = em.createQuery("SELECT o FROM AuthorValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", AuthorValue.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<AuthorValue> AuthorValue.findAuthorValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = AuthorValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AuthorValue> q = em.createQuery(queryBuilder.toString(), AuthorValue.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<AuthorValue> AuthorValue.findAuthorValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(String lsType, String lsKind, String stringValue, boolean ignored) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
-        stringValue = stringValue.replace('*', '%');
-        if (stringValue.charAt(0) != '%') {
-            stringValue = "%" + stringValue;
-        }
-        if (stringValue.charAt(stringValue.length() - 1) != '%') {
-            stringValue = stringValue + "%";
-        }
-        EntityManager em = AuthorValue.entityManager();
-        TypedQuery<AuthorValue> q = em.createQuery("SELECT o FROM AuthorValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)  AND o.ignored IS NOT :ignored", AuthorValue.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("stringValue", stringValue);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<AuthorValue> AuthorValue.findAuthorValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(String lsType, String lsKind, String stringValue, boolean ignored, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
-        stringValue = stringValue.replace('*', '%');
-        if (stringValue.charAt(0) != '%') {
-            stringValue = "%" + stringValue;
-        }
-        if (stringValue.charAt(stringValue.length() - 1) != '%') {
-            stringValue = stringValue + "%";
-        }
-        EntityManager em = AuthorValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)  AND o.ignored IS NOT :ignored");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AuthorValue> q = em.createQuery(queryBuilder.toString(), AuthorValue.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("stringValue", stringValue);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorValue_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/AuthorValue_Roo_JavaBean.aj
deleted file mode 100644
index 6bf905715..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AuthorValue_Roo_JavaBean.aj
+++ /dev/null
@@ -1,19 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AuthorState;
-import com.labsynch.labseer.domain.AuthorValue;
-
-privileged aspect AuthorValue_Roo_JavaBean {
-    
-    public AuthorState AuthorValue.getLsState() {
-        return this.lsState;
-    }
-    
-    public void AuthorValue.setLsState(AuthorState lsState) {
-        this.lsState = lsState;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorValue_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/AuthorValue_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index abd83a4d0..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AuthorValue_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,57 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AuthorValue;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect AuthorValue_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> AuthorValue.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsState");
-    
-    public static List<AuthorValue> AuthorValue.findAllAuthorValues() {
-        return entityManager().createQuery("SELECT o FROM AuthorValue o", AuthorValue.class).getResultList();
-    }
-    
-    public static List<AuthorValue> AuthorValue.findAllAuthorValues(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AuthorValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AuthorValue.class).getResultList();
-    }
-    
-    public static AuthorValue AuthorValue.findAuthorValue(Long id) {
-        if (id == null) return null;
-        return entityManager().find(AuthorValue.class, id);
-    }
-    
-    public static List<AuthorValue> AuthorValue.findAuthorValueEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM AuthorValue o", AuthorValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<AuthorValue> AuthorValue.findAuthorValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AuthorValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AuthorValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public AuthorValue AuthorValue.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        AuthorValue merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorValue_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/AuthorValue_Roo_Jpa_Entity.aj
deleted file mode 100644
index c69ef2332..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AuthorValue_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AuthorValue;
-import javax.persistence.Entity;
-
-privileged aspect AuthorValue_Roo_Jpa_Entity {
-    
-    declare @type: AuthorValue: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorValue_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/AuthorValue_Roo_Json.aj
deleted file mode 100644
index 453bc8724..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AuthorValue_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AuthorValue;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect AuthorValue_Roo_Json {
-    
-    public String AuthorValue.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String AuthorValue.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static AuthorValue AuthorValue.fromJsonToAuthorValue(String json) {
-        return new JSONDeserializer<AuthorValue>()
-        .use(null, AuthorValue.class).deserialize(json);
-    }
-    
-    public static String AuthorValue.toJsonArray(Collection<AuthorValue> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String AuthorValue.toJsonArray(Collection<AuthorValue> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<AuthorValue> AuthorValue.fromJsonArrayToAuthorValues(String json) {
-        return new JSONDeserializer<List<AuthorValue>>()
-        .use("values", AuthorValue.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorValue_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/AuthorValue_Roo_ToString.aj
deleted file mode 100644
index 6db0f9b5c..000000000
--- a/src/main/java/com/labsynch/labseer/domain/AuthorValue_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AuthorValue;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AuthorValue_Roo_ToString {
-    
-    public String AuthorValue.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Author_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/Author_Roo_Configurable.aj
deleted file mode 100755
index a7b3fb037..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Author_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Author;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect Author_Roo_Configurable {
-    
-    declare @type: Author: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Author_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/Author_Roo_Finder.aj
deleted file mode 100644
index 72189f3c6..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Author_Roo_Finder.aj
+++ /dev/null
@@ -1,85 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Author;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect Author_Roo_Finder {
-    
-    public static Long Author.countFindAuthorsByActivationKeyAndEmailAddress(String activationKey, String emailAddress) {
-        if (activationKey == null || activationKey.length() == 0) throw new IllegalArgumentException("The activationKey argument is required");
-        if (emailAddress == null || emailAddress.length() == 0) throw new IllegalArgumentException("The emailAddress argument is required");
-        EntityManager em = Author.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Author AS o WHERE o.activationKey = :activationKey AND o.emailAddress = :emailAddress", Long.class);
-        q.setParameter("activationKey", activationKey);
-        q.setParameter("emailAddress", emailAddress);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Author.countFindAuthorsByEmailAddress(String emailAddress) {
-        if (emailAddress == null || emailAddress.length() == 0) throw new IllegalArgumentException("The emailAddress argument is required");
-        EntityManager em = Author.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Author AS o WHERE o.emailAddress = :emailAddress", Long.class);
-        q.setParameter("emailAddress", emailAddress);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Author.countFindAuthorsByUserName(String userName) {
-        if (userName == null || userName.length() == 0) throw new IllegalArgumentException("The userName argument is required");
-        EntityManager em = Author.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Author AS o WHERE o.userName = :userName", Long.class);
-        q.setParameter("userName", userName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<Author> Author.findAuthorsByActivationKeyAndEmailAddress(String activationKey, String emailAddress, String sortFieldName, String sortOrder) {
-        if (activationKey == null || activationKey.length() == 0) throw new IllegalArgumentException("The activationKey argument is required");
-        if (emailAddress == null || emailAddress.length() == 0) throw new IllegalArgumentException("The emailAddress argument is required");
-        EntityManager em = Author.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Author AS o WHERE o.activationKey = :activationKey AND o.emailAddress = :emailAddress");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Author> q = em.createQuery(queryBuilder.toString(), Author.class);
-        q.setParameter("activationKey", activationKey);
-        q.setParameter("emailAddress", emailAddress);
-        return q;
-    }
-    
-    public static TypedQuery<Author> Author.findAuthorsByEmailAddress(String emailAddress, String sortFieldName, String sortOrder) {
-        if (emailAddress == null || emailAddress.length() == 0) throw new IllegalArgumentException("The emailAddress argument is required");
-        EntityManager em = Author.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Author AS o WHERE o.emailAddress = :emailAddress");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Author> q = em.createQuery(queryBuilder.toString(), Author.class);
-        q.setParameter("emailAddress", emailAddress);
-        return q;
-    }
-    
-    public static TypedQuery<Author> Author.findAuthorsByUserName(String userName, String sortFieldName, String sortOrder) {
-        if (userName == null || userName.length() == 0) throw new IllegalArgumentException("The userName argument is required");
-        EntityManager em = Author.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Author AS o WHERE o.userName = :userName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Author> q = em.createQuery(queryBuilder.toString(), Author.class);
-        q.setParameter("userName", userName);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Author_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/Author_Roo_JavaBean.aj
deleted file mode 100755
index 3c8558dad..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Author_Roo_JavaBean.aj
+++ /dev/null
@@ -1,111 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.AuthorLabel;
-import com.labsynch.labseer.domain.AuthorRole;
-import com.labsynch.labseer.domain.AuthorState;
-import java.util.Date;
-import java.util.Set;
-
-privileged aspect Author_Roo_JavaBean {
-    
-    public String Author.getFirstName() {
-        return this.firstName;
-    }
-    
-    public void Author.setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-    
-    public String Author.getLastName() {
-        return this.lastName;
-    }
-    
-    public void Author.setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-    
-    public String Author.getUserName() {
-        return this.userName;
-    }
-    
-    public void Author.setUserName(String userName) {
-        this.userName = userName;
-    }
-    
-    public String Author.getEmailAddress() {
-        return this.emailAddress;
-    }
-    
-    public void Author.setEmailAddress(String emailAddress) {
-        this.emailAddress = emailAddress;
-    }
-    
-    public String Author.getPassword() {
-        return this.password;
-    }
-    
-    public void Author.setPassword(String password) {
-        this.password = password;
-    }
-    
-    public Date Author.getActivationDate() {
-        return this.activationDate;
-    }
-    
-    public void Author.setActivationDate(Date activationDate) {
-        this.activationDate = activationDate;
-    }
-    
-    public String Author.getActivationKey() {
-        return this.activationKey;
-    }
-    
-    public void Author.setActivationKey(String activationKey) {
-        this.activationKey = activationKey;
-    }
-    
-    public Boolean Author.getEnabled() {
-        return this.enabled;
-    }
-    
-    public void Author.setEnabled(Boolean enabled) {
-        this.enabled = enabled;
-    }
-    
-    public Boolean Author.getLocked() {
-        return this.locked;
-    }
-    
-    public void Author.setLocked(Boolean locked) {
-        this.locked = locked;
-    }
-    
-    public Set<AuthorRole> Author.getAuthorRoles() {
-        return this.authorRoles;
-    }
-    
-    public void Author.setAuthorRoles(Set<AuthorRole> authorRoles) {
-        this.authorRoles = authorRoles;
-    }
-    
-    public Set<AuthorState> Author.getLsStates() {
-        return this.lsStates;
-    }
-    
-    public void Author.setLsStates(Set<AuthorState> lsStates) {
-        this.lsStates = lsStates;
-    }
-    
-    public Set<AuthorLabel> Author.getLsLabels() {
-        return this.lsLabels;
-    }
-    
-    public void Author.setLsLabels(Set<AuthorLabel> lsLabels) {
-        this.lsLabels = lsLabels;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Author_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/Author_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index cfa97cc01..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Author_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Author;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect Author_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> Author.fieldNames4OrderClauseFilter = java.util.Arrays.asList("firstName", "lastName", "userName", "emailAddress", "password", "activationDate", "activationKey", "enabled", "locked", "authorRoles", "lsStates", "lsLabels");
-    
-    public static long Author.countAuthors() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM Author o", Long.class).getSingleResult();
-    }
-    
-    public static List<Author> Author.findAllAuthors() {
-        return entityManager().createQuery("SELECT o FROM Author o", Author.class).getResultList();
-    }
-    
-    public static List<Author> Author.findAllAuthors(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM Author o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, Author.class).getResultList();
-    }
-    
-    public static Author Author.findAuthor(Long id) {
-        if (id == null) return null;
-        return entityManager().find(Author.class, id);
-    }
-    
-    public static List<Author> Author.findAuthorEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM Author o", Author.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<Author> Author.findAuthorEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM Author o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, Author.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public Author Author.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        Author merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Author_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/Author_Roo_Jpa_Entity.aj
deleted file mode 100644
index 39d9ce44d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Author_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Author;
-import javax.persistence.Entity;
-
-privileged aspect Author_Roo_Jpa_Entity {
-    
-    declare @type: Author: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/BulkLoadFile.java b/src/main/java/com/labsynch/labseer/domain/BulkLoadFile.java
index b00a10285..9ce3245b5 100644
--- a/src/main/java/com/labsynch/labseer/domain/BulkLoadFile.java
+++ b/src/main/java/com/labsynch/labseer/domain/BulkLoadFile.java
@@ -1,16 +1,32 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
 import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -46,4 +62,268 @@ public BulkLoadFile(String fileName, int numberOfMols, int fileSize, String json
 		this.recordedBy = recordedBy;
 		this.recordedDate = recordedDate;
 	}
+
+	public static Long countFindBulkLoadFilesByFileNameEquals(String fileName) {
+        if (fileName == null || fileName.length() == 0) throw new IllegalArgumentException("The fileName argument is required");
+        EntityManager em = BulkLoadFile.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BulkLoadFile AS o WHERE o.fileName = :fileName", Long.class);
+        q.setParameter("fileName", fileName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindBulkLoadFilesByRecordedByEquals(String recordedBy) {
+        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+        EntityManager em = BulkLoadFile.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BulkLoadFile AS o WHERE o.recordedBy = :recordedBy", Long.class);
+        q.setParameter("recordedBy", recordedBy);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<BulkLoadFile> findBulkLoadFilesByFileNameEquals(String fileName) {
+        if (fileName == null || fileName.length() == 0) throw new IllegalArgumentException("The fileName argument is required");
+        EntityManager em = BulkLoadFile.entityManager();
+        TypedQuery<BulkLoadFile> q = em.createQuery("SELECT o FROM BulkLoadFile AS o WHERE o.fileName = :fileName", BulkLoadFile.class);
+        q.setParameter("fileName", fileName);
+        return q;
+    }
+
+	public static TypedQuery<BulkLoadFile> findBulkLoadFilesByFileNameEquals(String fileName, String sortFieldName, String sortOrder) {
+        if (fileName == null || fileName.length() == 0) throw new IllegalArgumentException("The fileName argument is required");
+        EntityManager em = BulkLoadFile.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BulkLoadFile AS o WHERE o.fileName = :fileName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<BulkLoadFile> q = em.createQuery(queryBuilder.toString(), BulkLoadFile.class);
+        q.setParameter("fileName", fileName);
+        return q;
+    }
+
+	public static TypedQuery<BulkLoadFile> findBulkLoadFilesByRecordedByEquals(String recordedBy) {
+        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+        EntityManager em = BulkLoadFile.entityManager();
+        TypedQuery<BulkLoadFile> q = em.createQuery("SELECT o FROM BulkLoadFile AS o WHERE o.recordedBy = :recordedBy", BulkLoadFile.class);
+        q.setParameter("recordedBy", recordedBy);
+        return q;
+    }
+
+	public static TypedQuery<BulkLoadFile> findBulkLoadFilesByRecordedByEquals(String recordedBy, String sortFieldName, String sortOrder) {
+        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+        EntityManager em = BulkLoadFile.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BulkLoadFile AS o WHERE o.recordedBy = :recordedBy");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<BulkLoadFile> q = em.createQuery(queryBuilder.toString(), BulkLoadFile.class);
+        q.setParameter("recordedBy", recordedBy);
+        return q;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("fileName", "numberOfMols", "fileSize", "jsonTemplate", "recordedBy", "fileDate", "recordedDate");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new BulkLoadFile().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countBulkLoadFiles() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM BulkLoadFile o", Long.class).getSingleResult();
+    }
+
+	public static List<BulkLoadFile> findAllBulkLoadFiles() {
+        return entityManager().createQuery("SELECT o FROM BulkLoadFile o", BulkLoadFile.class).getResultList();
+    }
+
+	public static List<BulkLoadFile> findAllBulkLoadFiles(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM BulkLoadFile o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, BulkLoadFile.class).getResultList();
+    }
+
+	public static BulkLoadFile findBulkLoadFile(Long id) {
+        if (id == null) return null;
+        return entityManager().find(BulkLoadFile.class, id);
+    }
+
+	public static List<BulkLoadFile> findBulkLoadFileEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM BulkLoadFile o", BulkLoadFile.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<BulkLoadFile> findBulkLoadFileEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM BulkLoadFile o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, BulkLoadFile.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            BulkLoadFile attached = BulkLoadFile.findBulkLoadFile(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public BulkLoadFile merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        BulkLoadFile merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static BulkLoadFile fromJsonToBulkLoadFile(String json) {
+        return new JSONDeserializer<BulkLoadFile>()
+        .use(null, BulkLoadFile.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<BulkLoadFile> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<BulkLoadFile> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<BulkLoadFile> fromJsonArrayToBulkLoadFiles(String json) {
+        return new JSONDeserializer<List<BulkLoadFile>>()
+        .use("values", BulkLoadFile.class).deserialize(json);
+    }
+
+	public String getFileName() {
+        return this.fileName;
+    }
+
+	public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+	public int getNumberOfMols() {
+        return this.numberOfMols;
+    }
+
+	public void setNumberOfMols(int numberOfMols) {
+        this.numberOfMols = numberOfMols;
+    }
+
+	public int getFileSize() {
+        return this.fileSize;
+    }
+
+	public void setFileSize(int fileSize) {
+        this.fileSize = fileSize;
+    }
+
+	public String getJsonTemplate() {
+        return this.jsonTemplate;
+    }
+
+	public void setJsonTemplate(String jsonTemplate) {
+        this.jsonTemplate = jsonTemplate;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public Date getFileDate() {
+        return this.fileDate;
+    }
+
+	public void setFileDate(Date fileDate) {
+        this.fileDate = fileDate;
+    }
+
+	public Date getRecordedDate() {
+        return this.recordedDate;
+    }
+
+	public void setRecordedDate(Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/BulkLoadFile_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/BulkLoadFile_Roo_Configurable.aj
deleted file mode 100644
index 51f164c6b..000000000
--- a/src/main/java/com/labsynch/labseer/domain/BulkLoadFile_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.BulkLoadFile;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect BulkLoadFile_Roo_Configurable {
-    
-    declare @type: BulkLoadFile: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/BulkLoadFile_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/BulkLoadFile_Roo_Finder.aj
deleted file mode 100644
index f3f5e8f22..000000000
--- a/src/main/java/com/labsynch/labseer/domain/BulkLoadFile_Roo_Finder.aj
+++ /dev/null
@@ -1,74 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.BulkLoadFile;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect BulkLoadFile_Roo_Finder {
-    
-    public static Long BulkLoadFile.countFindBulkLoadFilesByFileNameEquals(String fileName) {
-        if (fileName == null || fileName.length() == 0) throw new IllegalArgumentException("The fileName argument is required");
-        EntityManager em = BulkLoadFile.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BulkLoadFile AS o WHERE o.fileName = :fileName", Long.class);
-        q.setParameter("fileName", fileName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long BulkLoadFile.countFindBulkLoadFilesByRecordedByEquals(String recordedBy) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
-        EntityManager em = BulkLoadFile.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BulkLoadFile AS o WHERE o.recordedBy = :recordedBy", Long.class);
-        q.setParameter("recordedBy", recordedBy);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<BulkLoadFile> BulkLoadFile.findBulkLoadFilesByFileNameEquals(String fileName) {
-        if (fileName == null || fileName.length() == 0) throw new IllegalArgumentException("The fileName argument is required");
-        EntityManager em = BulkLoadFile.entityManager();
-        TypedQuery<BulkLoadFile> q = em.createQuery("SELECT o FROM BulkLoadFile AS o WHERE o.fileName = :fileName", BulkLoadFile.class);
-        q.setParameter("fileName", fileName);
-        return q;
-    }
-    
-    public static TypedQuery<BulkLoadFile> BulkLoadFile.findBulkLoadFilesByFileNameEquals(String fileName, String sortFieldName, String sortOrder) {
-        if (fileName == null || fileName.length() == 0) throw new IllegalArgumentException("The fileName argument is required");
-        EntityManager em = BulkLoadFile.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BulkLoadFile AS o WHERE o.fileName = :fileName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<BulkLoadFile> q = em.createQuery(queryBuilder.toString(), BulkLoadFile.class);
-        q.setParameter("fileName", fileName);
-        return q;
-    }
-    
-    public static TypedQuery<BulkLoadFile> BulkLoadFile.findBulkLoadFilesByRecordedByEquals(String recordedBy) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
-        EntityManager em = BulkLoadFile.entityManager();
-        TypedQuery<BulkLoadFile> q = em.createQuery("SELECT o FROM BulkLoadFile AS o WHERE o.recordedBy = :recordedBy", BulkLoadFile.class);
-        q.setParameter("recordedBy", recordedBy);
-        return q;
-    }
-    
-    public static TypedQuery<BulkLoadFile> BulkLoadFile.findBulkLoadFilesByRecordedByEquals(String recordedBy, String sortFieldName, String sortOrder) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
-        EntityManager em = BulkLoadFile.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BulkLoadFile AS o WHERE o.recordedBy = :recordedBy");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<BulkLoadFile> q = em.createQuery(queryBuilder.toString(), BulkLoadFile.class);
-        q.setParameter("recordedBy", recordedBy);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/BulkLoadFile_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/BulkLoadFile_Roo_JavaBean.aj
deleted file mode 100644
index 6ccf34e62..000000000
--- a/src/main/java/com/labsynch/labseer/domain/BulkLoadFile_Roo_JavaBean.aj
+++ /dev/null
@@ -1,67 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.BulkLoadFile;
-import java.util.Date;
-
-privileged aspect BulkLoadFile_Roo_JavaBean {
-    
-    public String BulkLoadFile.getFileName() {
-        return this.fileName;
-    }
-    
-    public void BulkLoadFile.setFileName(String fileName) {
-        this.fileName = fileName;
-    }
-    
-    public int BulkLoadFile.getNumberOfMols() {
-        return this.numberOfMols;
-    }
-    
-    public void BulkLoadFile.setNumberOfMols(int numberOfMols) {
-        this.numberOfMols = numberOfMols;
-    }
-    
-    public int BulkLoadFile.getFileSize() {
-        return this.fileSize;
-    }
-    
-    public void BulkLoadFile.setFileSize(int fileSize) {
-        this.fileSize = fileSize;
-    }
-    
-    public String BulkLoadFile.getJsonTemplate() {
-        return this.jsonTemplate;
-    }
-    
-    public void BulkLoadFile.setJsonTemplate(String jsonTemplate) {
-        this.jsonTemplate = jsonTemplate;
-    }
-    
-    public String BulkLoadFile.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void BulkLoadFile.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public Date BulkLoadFile.getFileDate() {
-        return this.fileDate;
-    }
-    
-    public void BulkLoadFile.setFileDate(Date fileDate) {
-        this.fileDate = fileDate;
-    }
-    
-    public Date BulkLoadFile.getRecordedDate() {
-        return this.recordedDate;
-    }
-    
-    public void BulkLoadFile.setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/BulkLoadFile_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/BulkLoadFile_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 55d3e9927..000000000
--- a/src/main/java/com/labsynch/labseer/domain/BulkLoadFile_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.BulkLoadFile;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect BulkLoadFile_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager BulkLoadFile.entityManager;
-    
-    public static final List<String> BulkLoadFile.fieldNames4OrderClauseFilter = java.util.Arrays.asList("fileName", "numberOfMols", "fileSize", "jsonTemplate", "recordedBy", "fileDate", "recordedDate");
-    
-    public static final EntityManager BulkLoadFile.entityManager() {
-        EntityManager em = new BulkLoadFile().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long BulkLoadFile.countBulkLoadFiles() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM BulkLoadFile o", Long.class).getSingleResult();
-    }
-    
-    public static List<BulkLoadFile> BulkLoadFile.findAllBulkLoadFiles() {
-        return entityManager().createQuery("SELECT o FROM BulkLoadFile o", BulkLoadFile.class).getResultList();
-    }
-    
-    public static List<BulkLoadFile> BulkLoadFile.findAllBulkLoadFiles(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM BulkLoadFile o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, BulkLoadFile.class).getResultList();
-    }
-    
-    public static BulkLoadFile BulkLoadFile.findBulkLoadFile(Long id) {
-        if (id == null) return null;
-        return entityManager().find(BulkLoadFile.class, id);
-    }
-    
-    public static List<BulkLoadFile> BulkLoadFile.findBulkLoadFileEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM BulkLoadFile o", BulkLoadFile.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<BulkLoadFile> BulkLoadFile.findBulkLoadFileEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM BulkLoadFile o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, BulkLoadFile.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void BulkLoadFile.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void BulkLoadFile.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            BulkLoadFile attached = BulkLoadFile.findBulkLoadFile(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void BulkLoadFile.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void BulkLoadFile.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public BulkLoadFile BulkLoadFile.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        BulkLoadFile merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/BulkLoadFile_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/BulkLoadFile_Roo_Jpa_Entity.aj
deleted file mode 100644
index ee3d11146..000000000
--- a/src/main/java/com/labsynch/labseer/domain/BulkLoadFile_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.BulkLoadFile;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect BulkLoadFile_Roo_Jpa_Entity {
-    
-    declare @type: BulkLoadFile: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long BulkLoadFile.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer BulkLoadFile.version;
-    
-    public Long BulkLoadFile.getId() {
-        return this.id;
-    }
-    
-    public void BulkLoadFile.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer BulkLoadFile.getVersion() {
-        return this.version;
-    }
-    
-    public void BulkLoadFile.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/BulkLoadFile_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/BulkLoadFile_Roo_Json.aj
deleted file mode 100644
index 94418963f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/BulkLoadFile_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.BulkLoadFile;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect BulkLoadFile_Roo_Json {
-    
-    public String BulkLoadFile.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String BulkLoadFile.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static BulkLoadFile BulkLoadFile.fromJsonToBulkLoadFile(String json) {
-        return new JSONDeserializer<BulkLoadFile>()
-        .use(null, BulkLoadFile.class).deserialize(json);
-    }
-    
-    public static String BulkLoadFile.toJsonArray(Collection<BulkLoadFile> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String BulkLoadFile.toJsonArray(Collection<BulkLoadFile> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<BulkLoadFile> BulkLoadFile.fromJsonArrayToBulkLoadFiles(String json) {
-        return new JSONDeserializer<List<BulkLoadFile>>()
-        .use("values", BulkLoadFile.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/BulkLoadFile_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/BulkLoadFile_Roo_ToString.aj
deleted file mode 100644
index b73960621..000000000
--- a/src/main/java/com/labsynch/labseer/domain/BulkLoadFile_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.BulkLoadFile;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect BulkLoadFile_Roo_ToString {
-    
-    public String BulkLoadFile.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate.java b/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate.java
index 79911b2ac..14ca3593e 100644
--- a/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate.java
+++ b/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate.java
@@ -1,17 +1,33 @@
 package com.labsynch.labseer.domain;
 
 import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
-
+import org.springframework.transaction.annotation.Transactional;
 import com.labsynch.labseer.dto.BulkLoadPropertyMappingDTO;
 import com.labsynch.labseer.dto.BulkLoadTemplateDTO;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -56,4 +72,281 @@ public BulkLoadTemplate(BulkLoadTemplateDTO templateDTO){
 		this.ignored = templateDTO.isIgnored();
 	}
 	
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public static Long countFindBulkLoadTemplatesByRecordedByEquals(String recordedBy) {
+        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+        EntityManager em = BulkLoadTemplate.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BulkLoadTemplate AS o WHERE o.recordedBy = :recordedBy", Long.class);
+        q.setParameter("recordedBy", recordedBy);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindBulkLoadTemplatesByTemplateNameEquals(String templateName) {
+        if (templateName == null || templateName.length() == 0) throw new IllegalArgumentException("The templateName argument is required");
+        EntityManager em = BulkLoadTemplate.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BulkLoadTemplate AS o WHERE o.templateName = :templateName", Long.class);
+        q.setParameter("templateName", templateName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals(String templateName, String recordedBy) {
+        if (templateName == null || templateName.length() == 0) throw new IllegalArgumentException("The templateName argument is required");
+        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+        EntityManager em = BulkLoadTemplate.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BulkLoadTemplate AS o WHERE o.templateName = :templateName  AND o.recordedBy = :recordedBy", Long.class);
+        q.setParameter("templateName", templateName);
+        q.setParameter("recordedBy", recordedBy);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<BulkLoadTemplate> findBulkLoadTemplatesByRecordedByEquals(String recordedBy) {
+        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+        EntityManager em = BulkLoadTemplate.entityManager();
+        TypedQuery<BulkLoadTemplate> q = em.createQuery("SELECT o FROM BulkLoadTemplate AS o WHERE o.recordedBy = :recordedBy", BulkLoadTemplate.class);
+        q.setParameter("recordedBy", recordedBy);
+        return q;
+    }
+
+	public static TypedQuery<BulkLoadTemplate> findBulkLoadTemplatesByRecordedByEquals(String recordedBy, String sortFieldName, String sortOrder) {
+        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+        EntityManager em = BulkLoadTemplate.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BulkLoadTemplate AS o WHERE o.recordedBy = :recordedBy");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<BulkLoadTemplate> q = em.createQuery(queryBuilder.toString(), BulkLoadTemplate.class);
+        q.setParameter("recordedBy", recordedBy);
+        return q;
+    }
+
+	public static TypedQuery<BulkLoadTemplate> findBulkLoadTemplatesByTemplateNameEquals(String templateName) {
+        if (templateName == null || templateName.length() == 0) throw new IllegalArgumentException("The templateName argument is required");
+        EntityManager em = BulkLoadTemplate.entityManager();
+        TypedQuery<BulkLoadTemplate> q = em.createQuery("SELECT o FROM BulkLoadTemplate AS o WHERE o.templateName = :templateName", BulkLoadTemplate.class);
+        q.setParameter("templateName", templateName);
+        return q;
+    }
+
+	public static TypedQuery<BulkLoadTemplate> findBulkLoadTemplatesByTemplateNameEquals(String templateName, String sortFieldName, String sortOrder) {
+        if (templateName == null || templateName.length() == 0) throw new IllegalArgumentException("The templateName argument is required");
+        EntityManager em = BulkLoadTemplate.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BulkLoadTemplate AS o WHERE o.templateName = :templateName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<BulkLoadTemplate> q = em.createQuery(queryBuilder.toString(), BulkLoadTemplate.class);
+        q.setParameter("templateName", templateName);
+        return q;
+    }
+
+	public static TypedQuery<BulkLoadTemplate> findBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals(String templateName, String recordedBy) {
+        if (templateName == null || templateName.length() == 0) throw new IllegalArgumentException("The templateName argument is required");
+        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+        EntityManager em = BulkLoadTemplate.entityManager();
+        TypedQuery<BulkLoadTemplate> q = em.createQuery("SELECT o FROM BulkLoadTemplate AS o WHERE o.templateName = :templateName  AND o.recordedBy = :recordedBy", BulkLoadTemplate.class);
+        q.setParameter("templateName", templateName);
+        q.setParameter("recordedBy", recordedBy);
+        return q;
+    }
+
+	public static TypedQuery<BulkLoadTemplate> findBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals(String templateName, String recordedBy, String sortFieldName, String sortOrder) {
+        if (templateName == null || templateName.length() == 0) throw new IllegalArgumentException("The templateName argument is required");
+        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+        EntityManager em = BulkLoadTemplate.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BulkLoadTemplate AS o WHERE o.templateName = :templateName  AND o.recordedBy = :recordedBy");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<BulkLoadTemplate> q = em.createQuery(queryBuilder.toString(), BulkLoadTemplate.class);
+        q.setParameter("templateName", templateName);
+        q.setParameter("recordedBy", recordedBy);
+        return q;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("templateName", "jsonTemplate", "recordedBy", "ignored");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new BulkLoadTemplate().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countBulkLoadTemplates() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM BulkLoadTemplate o", Long.class).getSingleResult();
+    }
+
+	public static List<BulkLoadTemplate> findAllBulkLoadTemplates() {
+        return entityManager().createQuery("SELECT o FROM BulkLoadTemplate o", BulkLoadTemplate.class).getResultList();
+    }
+
+	public static List<BulkLoadTemplate> findAllBulkLoadTemplates(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM BulkLoadTemplate o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, BulkLoadTemplate.class).getResultList();
+    }
+
+	public static BulkLoadTemplate findBulkLoadTemplate(Long id) {
+        if (id == null) return null;
+        return entityManager().find(BulkLoadTemplate.class, id);
+    }
+
+	public static List<BulkLoadTemplate> findBulkLoadTemplateEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM BulkLoadTemplate o", BulkLoadTemplate.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<BulkLoadTemplate> findBulkLoadTemplateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM BulkLoadTemplate o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, BulkLoadTemplate.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            BulkLoadTemplate attached = BulkLoadTemplate.findBulkLoadTemplate(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public BulkLoadTemplate merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        BulkLoadTemplate merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String getTemplateName() {
+        return this.templateName;
+    }
+
+	public void setTemplateName(String templateName) {
+        this.templateName = templateName;
+    }
+
+	public String getJsonTemplate() {
+        return this.jsonTemplate;
+    }
+
+	public void setJsonTemplate(String jsonTemplate) {
+        this.jsonTemplate = jsonTemplate;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static BulkLoadTemplate fromJsonToBulkLoadTemplate(String json) {
+        return new JSONDeserializer<BulkLoadTemplate>()
+        .use(null, BulkLoadTemplate.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<BulkLoadTemplate> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<BulkLoadTemplate> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<BulkLoadTemplate> fromJsonArrayToBulkLoadTemplates(String json) {
+        return new JSONDeserializer<List<BulkLoadTemplate>>()
+        .use("values", BulkLoadTemplate.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate_Roo_Configurable.aj
deleted file mode 100644
index 71fd17a8f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.BulkLoadTemplate;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect BulkLoadTemplate_Roo_Configurable {
-    
-    declare @type: BulkLoadTemplate: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate_Roo_Finder.aj
deleted file mode 100644
index 8e9052606..000000000
--- a/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate_Roo_Finder.aj
+++ /dev/null
@@ -1,111 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.BulkLoadTemplate;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect BulkLoadTemplate_Roo_Finder {
-    
-    public static Long BulkLoadTemplate.countFindBulkLoadTemplatesByRecordedByEquals(String recordedBy) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
-        EntityManager em = BulkLoadTemplate.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BulkLoadTemplate AS o WHERE o.recordedBy = :recordedBy", Long.class);
-        q.setParameter("recordedBy", recordedBy);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long BulkLoadTemplate.countFindBulkLoadTemplatesByTemplateNameEquals(String templateName) {
-        if (templateName == null || templateName.length() == 0) throw new IllegalArgumentException("The templateName argument is required");
-        EntityManager em = BulkLoadTemplate.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BulkLoadTemplate AS o WHERE o.templateName = :templateName", Long.class);
-        q.setParameter("templateName", templateName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long BulkLoadTemplate.countFindBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals(String templateName, String recordedBy) {
-        if (templateName == null || templateName.length() == 0) throw new IllegalArgumentException("The templateName argument is required");
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
-        EntityManager em = BulkLoadTemplate.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BulkLoadTemplate AS o WHERE o.templateName = :templateName  AND o.recordedBy = :recordedBy", Long.class);
-        q.setParameter("templateName", templateName);
-        q.setParameter("recordedBy", recordedBy);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<BulkLoadTemplate> BulkLoadTemplate.findBulkLoadTemplatesByRecordedByEquals(String recordedBy) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
-        EntityManager em = BulkLoadTemplate.entityManager();
-        TypedQuery<BulkLoadTemplate> q = em.createQuery("SELECT o FROM BulkLoadTemplate AS o WHERE o.recordedBy = :recordedBy", BulkLoadTemplate.class);
-        q.setParameter("recordedBy", recordedBy);
-        return q;
-    }
-    
-    public static TypedQuery<BulkLoadTemplate> BulkLoadTemplate.findBulkLoadTemplatesByRecordedByEquals(String recordedBy, String sortFieldName, String sortOrder) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
-        EntityManager em = BulkLoadTemplate.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BulkLoadTemplate AS o WHERE o.recordedBy = :recordedBy");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<BulkLoadTemplate> q = em.createQuery(queryBuilder.toString(), BulkLoadTemplate.class);
-        q.setParameter("recordedBy", recordedBy);
-        return q;
-    }
-    
-    public static TypedQuery<BulkLoadTemplate> BulkLoadTemplate.findBulkLoadTemplatesByTemplateNameEquals(String templateName) {
-        if (templateName == null || templateName.length() == 0) throw new IllegalArgumentException("The templateName argument is required");
-        EntityManager em = BulkLoadTemplate.entityManager();
-        TypedQuery<BulkLoadTemplate> q = em.createQuery("SELECT o FROM BulkLoadTemplate AS o WHERE o.templateName = :templateName", BulkLoadTemplate.class);
-        q.setParameter("templateName", templateName);
-        return q;
-    }
-    
-    public static TypedQuery<BulkLoadTemplate> BulkLoadTemplate.findBulkLoadTemplatesByTemplateNameEquals(String templateName, String sortFieldName, String sortOrder) {
-        if (templateName == null || templateName.length() == 0) throw new IllegalArgumentException("The templateName argument is required");
-        EntityManager em = BulkLoadTemplate.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BulkLoadTemplate AS o WHERE o.templateName = :templateName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<BulkLoadTemplate> q = em.createQuery(queryBuilder.toString(), BulkLoadTemplate.class);
-        q.setParameter("templateName", templateName);
-        return q;
-    }
-    
-    public static TypedQuery<BulkLoadTemplate> BulkLoadTemplate.findBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals(String templateName, String recordedBy) {
-        if (templateName == null || templateName.length() == 0) throw new IllegalArgumentException("The templateName argument is required");
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
-        EntityManager em = BulkLoadTemplate.entityManager();
-        TypedQuery<BulkLoadTemplate> q = em.createQuery("SELECT o FROM BulkLoadTemplate AS o WHERE o.templateName = :templateName  AND o.recordedBy = :recordedBy", BulkLoadTemplate.class);
-        q.setParameter("templateName", templateName);
-        q.setParameter("recordedBy", recordedBy);
-        return q;
-    }
-    
-    public static TypedQuery<BulkLoadTemplate> BulkLoadTemplate.findBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals(String templateName, String recordedBy, String sortFieldName, String sortOrder) {
-        if (templateName == null || templateName.length() == 0) throw new IllegalArgumentException("The templateName argument is required");
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
-        EntityManager em = BulkLoadTemplate.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BulkLoadTemplate AS o WHERE o.templateName = :templateName  AND o.recordedBy = :recordedBy");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<BulkLoadTemplate> q = em.createQuery(queryBuilder.toString(), BulkLoadTemplate.class);
-        q.setParameter("templateName", templateName);
-        q.setParameter("recordedBy", recordedBy);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate_Roo_JavaBean.aj
deleted file mode 100644
index 6cc8b9642..000000000
--- a/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate_Roo_JavaBean.aj
+++ /dev/null
@@ -1,42 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.BulkLoadTemplate;
-
-privileged aspect BulkLoadTemplate_Roo_JavaBean {
-    
-    public String BulkLoadTemplate.getTemplateName() {
-        return this.templateName;
-    }
-    
-    public void BulkLoadTemplate.setTemplateName(String templateName) {
-        this.templateName = templateName;
-    }
-    
-    public String BulkLoadTemplate.getJsonTemplate() {
-        return this.jsonTemplate;
-    }
-    
-    public void BulkLoadTemplate.setJsonTemplate(String jsonTemplate) {
-        this.jsonTemplate = jsonTemplate;
-    }
-    
-    public String BulkLoadTemplate.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void BulkLoadTemplate.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public boolean BulkLoadTemplate.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void BulkLoadTemplate.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 01d4340ec..000000000
--- a/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.BulkLoadTemplate;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect BulkLoadTemplate_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager BulkLoadTemplate.entityManager;
-    
-    public static final List<String> BulkLoadTemplate.fieldNames4OrderClauseFilter = java.util.Arrays.asList("templateName", "jsonTemplate", "recordedBy", "ignored");
-    
-    public static final EntityManager BulkLoadTemplate.entityManager() {
-        EntityManager em = new BulkLoadTemplate().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long BulkLoadTemplate.countBulkLoadTemplates() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM BulkLoadTemplate o", Long.class).getSingleResult();
-    }
-    
-    public static List<BulkLoadTemplate> BulkLoadTemplate.findAllBulkLoadTemplates() {
-        return entityManager().createQuery("SELECT o FROM BulkLoadTemplate o", BulkLoadTemplate.class).getResultList();
-    }
-    
-    public static List<BulkLoadTemplate> BulkLoadTemplate.findAllBulkLoadTemplates(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM BulkLoadTemplate o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, BulkLoadTemplate.class).getResultList();
-    }
-    
-    public static BulkLoadTemplate BulkLoadTemplate.findBulkLoadTemplate(Long id) {
-        if (id == null) return null;
-        return entityManager().find(BulkLoadTemplate.class, id);
-    }
-    
-    public static List<BulkLoadTemplate> BulkLoadTemplate.findBulkLoadTemplateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM BulkLoadTemplate o", BulkLoadTemplate.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<BulkLoadTemplate> BulkLoadTemplate.findBulkLoadTemplateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM BulkLoadTemplate o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, BulkLoadTemplate.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void BulkLoadTemplate.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void BulkLoadTemplate.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            BulkLoadTemplate attached = BulkLoadTemplate.findBulkLoadTemplate(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void BulkLoadTemplate.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void BulkLoadTemplate.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public BulkLoadTemplate BulkLoadTemplate.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        BulkLoadTemplate merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate_Roo_Jpa_Entity.aj
deleted file mode 100644
index 10e4aef6a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.BulkLoadTemplate;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect BulkLoadTemplate_Roo_Jpa_Entity {
-    
-    declare @type: BulkLoadTemplate: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long BulkLoadTemplate.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer BulkLoadTemplate.version;
-    
-    public Long BulkLoadTemplate.getId() {
-        return this.id;
-    }
-    
-    public void BulkLoadTemplate.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer BulkLoadTemplate.getVersion() {
-        return this.version;
-    }
-    
-    public void BulkLoadTemplate.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate_Roo_Json.aj
deleted file mode 100644
index 7be85b70f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.BulkLoadTemplate;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect BulkLoadTemplate_Roo_Json {
-    
-    public String BulkLoadTemplate.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String BulkLoadTemplate.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static BulkLoadTemplate BulkLoadTemplate.fromJsonToBulkLoadTemplate(String json) {
-        return new JSONDeserializer<BulkLoadTemplate>()
-        .use(null, BulkLoadTemplate.class).deserialize(json);
-    }
-    
-    public static String BulkLoadTemplate.toJsonArray(Collection<BulkLoadTemplate> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String BulkLoadTemplate.toJsonArray(Collection<BulkLoadTemplate> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<BulkLoadTemplate> BulkLoadTemplate.fromJsonArrayToBulkLoadTemplates(String json) {
-        return new JSONDeserializer<List<BulkLoadTemplate>>()
-        .use("values", BulkLoadTemplate.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate_Roo_ToString.aj
deleted file mode 100644
index 41eccedf9..000000000
--- a/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.BulkLoadTemplate;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect BulkLoadTemplate_Roo_ToString {
-    
-    public String BulkLoadTemplate.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ChemStructure.java b/src/main/java/com/labsynch/labseer/domain/ChemStructure.java
index 3d16b7bbc..ad54c9121 100644
--- a/src/main/java/com/labsynch/labseer/domain/ChemStructure.java
+++ b/src/main/java/com/labsynch/labseer/domain/ChemStructure.java
@@ -1,23 +1,35 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
 import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -126,4 +138,264 @@ public static com.labsynch.labseer.domain.ChemStructure findStructureByCodeName(
     	ChemStructure result = ChemStructure.findChemStructuresByCodeNameEquals(codeName).getSingleResult();
     	return result;
     }
+
+	public static Long countFindChemStructuresByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = ChemStructure.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ChemStructure AS o WHERE o.codeName = :codeName", Long.class);
+        q.setParameter("codeName", codeName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ChemStructure> findChemStructuresByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = ChemStructure.entityManager();
+        TypedQuery<ChemStructure> q = em.createQuery("SELECT o FROM ChemStructure AS o WHERE o.codeName = :codeName", ChemStructure.class);
+        q.setParameter("codeName", codeName);
+        return q;
+    }
+
+	public static TypedQuery<ChemStructure> findChemStructuresByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = ChemStructure.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ChemStructure AS o WHERE o.codeName = :codeName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ChemStructure> q = em.createQuery(queryBuilder.toString(), ChemStructure.class);
+        q.setParameter("codeName", codeName);
+        return q;
+    }
+
+	public String getCodeName() {
+        return this.codeName;
+    }
+
+	public void setCodeName(String codeName) {
+        this.codeName = codeName;
+    }
+
+	public String getMolStructure() {
+        return this.molStructure;
+    }
+
+	public void setMolStructure(String molStructure) {
+        this.molStructure = molStructure;
+    }
+
+	public String getSmiles() {
+        return this.smiles;
+    }
+
+	public void setSmiles(String smiles) {
+        this.smiles = smiles;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getLsTypeAndKind() {
+        return this.lsTypeAndKind;
+    }
+
+	public void setLsTypeAndKind(String lsTypeAndKind) {
+        this.lsTypeAndKind = lsTypeAndKind;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public boolean isDeleted() {
+        return this.deleted;
+    }
+
+	public void setDeleted(boolean deleted) {
+        this.deleted = deleted;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public Date getRecordedDate() {
+        return this.recordedDate;
+    }
+
+	public void setRecordedDate(Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+	public String getModifiedBy() {
+        return this.modifiedBy;
+    }
+
+	public void setModifiedBy(String modifiedBy) {
+        this.modifiedBy = modifiedBy;
+    }
+
+	public Date getModifiedDate() {
+        return this.modifiedDate;
+    }
+
+	public void setModifiedDate(Date modifiedDate) {
+        this.modifiedDate = modifiedDate;
+    }
+
+	public Long getLsTransaction() {
+        return this.lsTransaction;
+    }
+
+	public void setLsTransaction(Long lsTransaction) {
+        this.lsTransaction = lsTransaction;
+    }
+
+	public ChemStructure() {
+        super();
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "id", "codeName", "version", "molStructure", "smiles", "lsType", "lsKind", "lsTypeAndKind", "ignored", "deleted", "recordedBy", "recordedDate", "modifiedBy", "modifiedDate", "lsTransaction");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new ChemStructure().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countChemStructures() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ChemStructure o", Long.class).getSingleResult();
+    }
+
+	public static List<ChemStructure> findAllChemStructures() {
+        return entityManager().createQuery("SELECT o FROM ChemStructure o", ChemStructure.class).getResultList();
+    }
+
+	public static List<ChemStructure> findAllChemStructures(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ChemStructure o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ChemStructure.class).getResultList();
+    }
+
+	public static ChemStructure findChemStructure(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ChemStructure.class, id);
+    }
+
+	public static List<ChemStructure> findChemStructureEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ChemStructure o", ChemStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ChemStructure> findChemStructureEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ChemStructure o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ChemStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            ChemStructure attached = ChemStructure.findChemStructure(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public ChemStructure merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ChemStructure merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ChemStructure fromJsonToChemStructure(String json) {
+        return new JSONDeserializer<ChemStructure>()
+        .use(null, ChemStructure.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ChemStructure> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ChemStructure> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ChemStructure> fromJsonArrayToChemStructures(String json) {
+        return new JSONDeserializer<List<ChemStructure>>()
+        .use("values", ChemStructure.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ChemStructure_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ChemStructure_Roo_Configurable.aj
deleted file mode 100644
index 675cda98f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ChemStructure_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ChemStructure;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ChemStructure_Roo_Configurable {
-    
-    declare @type: ChemStructure: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ChemStructure_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ChemStructure_Roo_Finder.aj
deleted file mode 100644
index 6dccd1002..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ChemStructure_Roo_Finder.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ChemStructure;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ChemStructure_Roo_Finder {
-    
-    public static Long ChemStructure.countFindChemStructuresByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = ChemStructure.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ChemStructure AS o WHERE o.codeName = :codeName", Long.class);
-        q.setParameter("codeName", codeName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ChemStructure> ChemStructure.findChemStructuresByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = ChemStructure.entityManager();
-        TypedQuery<ChemStructure> q = em.createQuery("SELECT o FROM ChemStructure AS o WHERE o.codeName = :codeName", ChemStructure.class);
-        q.setParameter("codeName", codeName);
-        return q;
-    }
-    
-    public static TypedQuery<ChemStructure> ChemStructure.findChemStructuresByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = ChemStructure.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ChemStructure AS o WHERE o.codeName = :codeName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ChemStructure> q = em.createQuery(queryBuilder.toString(), ChemStructure.class);
-        q.setParameter("codeName", codeName);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ChemStructure_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ChemStructure_Roo_JavaBean.aj
deleted file mode 100644
index 74f07f4b5..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ChemStructure_Roo_JavaBean.aj
+++ /dev/null
@@ -1,115 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ChemStructure;
-import java.util.Date;
-
-privileged aspect ChemStructure_Roo_JavaBean {
-    
-    public String ChemStructure.getCodeName() {
-        return this.codeName;
-    }
-    
-    public void ChemStructure.setCodeName(String codeName) {
-        this.codeName = codeName;
-    }
-    
-    public String ChemStructure.getMolStructure() {
-        return this.molStructure;
-    }
-    
-    public void ChemStructure.setMolStructure(String molStructure) {
-        this.molStructure = molStructure;
-    }
-    
-    public String ChemStructure.getSmiles() {
-        return this.smiles;
-    }
-    
-    public void ChemStructure.setSmiles(String smiles) {
-        this.smiles = smiles;
-    }
-    
-    public String ChemStructure.getLsType() {
-        return this.lsType;
-    }
-    
-    public void ChemStructure.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String ChemStructure.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void ChemStructure.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String ChemStructure.getLsTypeAndKind() {
-        return this.lsTypeAndKind;
-    }
-    
-    public void ChemStructure.setLsTypeAndKind(String lsTypeAndKind) {
-        this.lsTypeAndKind = lsTypeAndKind;
-    }
-    
-    public boolean ChemStructure.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void ChemStructure.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public boolean ChemStructure.isDeleted() {
-        return this.deleted;
-    }
-    
-    public void ChemStructure.setDeleted(boolean deleted) {
-        this.deleted = deleted;
-    }
-    
-    public String ChemStructure.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void ChemStructure.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public Date ChemStructure.getRecordedDate() {
-        return this.recordedDate;
-    }
-    
-    public void ChemStructure.setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
-    
-    public String ChemStructure.getModifiedBy() {
-        return this.modifiedBy;
-    }
-    
-    public void ChemStructure.setModifiedBy(String modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
-    
-    public Date ChemStructure.getModifiedDate() {
-        return this.modifiedDate;
-    }
-    
-    public void ChemStructure.setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
-    
-    public Long ChemStructure.getLsTransaction() {
-        return this.lsTransaction;
-    }
-    
-    public void ChemStructure.setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ChemStructure_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ChemStructure_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 0a7ea0037..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ChemStructure_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ChemStructure;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ChemStructure_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager ChemStructure.entityManager;
-    
-    public static final List<String> ChemStructure.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "id", "codeName", "version", "molStructure", "smiles", "lsType", "lsKind", "lsTypeAndKind", "ignored", "deleted", "recordedBy", "recordedDate", "modifiedBy", "modifiedDate", "lsTransaction");
-    
-    public static final EntityManager ChemStructure.entityManager() {
-        EntityManager em = new ChemStructure().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long ChemStructure.countChemStructures() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ChemStructure o", Long.class).getSingleResult();
-    }
-    
-    public static List<ChemStructure> ChemStructure.findAllChemStructures() {
-        return entityManager().createQuery("SELECT o FROM ChemStructure o", ChemStructure.class).getResultList();
-    }
-    
-    public static List<ChemStructure> ChemStructure.findAllChemStructures(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ChemStructure o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ChemStructure.class).getResultList();
-    }
-    
-    public static ChemStructure ChemStructure.findChemStructure(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ChemStructure.class, id);
-    }
-    
-    public static List<ChemStructure> ChemStructure.findChemStructureEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ChemStructure o", ChemStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ChemStructure> ChemStructure.findChemStructureEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ChemStructure o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ChemStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void ChemStructure.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void ChemStructure.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            ChemStructure attached = ChemStructure.findChemStructure(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void ChemStructure.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void ChemStructure.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public ChemStructure ChemStructure.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ChemStructure merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ChemStructure_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ChemStructure_Roo_Jpa_Entity.aj
deleted file mode 100644
index 4004cbfcc..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ChemStructure_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,17 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ChemStructure;
-import javax.persistence.Entity;
-
-privileged aspect ChemStructure_Roo_Jpa_Entity {
-    
-    declare @type: ChemStructure: @Entity;
-    
-    public ChemStructure.new() {
-        super();
-    }
-
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ChemStructure_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/ChemStructure_Roo_Json.aj
deleted file mode 100644
index 091042172..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ChemStructure_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ChemStructure;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ChemStructure_Roo_Json {
-    
-    public String ChemStructure.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ChemStructure.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ChemStructure ChemStructure.fromJsonToChemStructure(String json) {
-        return new JSONDeserializer<ChemStructure>()
-        .use(null, ChemStructure.class).deserialize(json);
-    }
-    
-    public static String ChemStructure.toJsonArray(Collection<ChemStructure> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ChemStructure.toJsonArray(Collection<ChemStructure> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ChemStructure> ChemStructure.fromJsonArrayToChemStructures(String json) {
-        return new JSONDeserializer<List<ChemStructure>>()
-        .use("values", ChemStructure.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ChemStructure_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ChemStructure_Roo_ToString.aj
deleted file mode 100644
index d6206564f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ChemStructure_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ChemStructure;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ChemStructure_Roo_ToString {
-    
-    public String ChemStructure.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting.java b/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting.java
index 7ce300dd6..80325b330 100755
--- a/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting.java
+++ b/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting.java
@@ -1,17 +1,33 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
+import javax.persistence.Version;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -35,4 +51,190 @@ public class CmpdRegAppSetting {
     private Date recordedDate;
     
     
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static CmpdRegAppSetting fromJsonToCmpdRegAppSetting(String json) {
+        return new JSONDeserializer<CmpdRegAppSetting>()
+        .use(null, CmpdRegAppSetting.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<CmpdRegAppSetting> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<CmpdRegAppSetting> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<CmpdRegAppSetting> fromJsonArrayToCmpdRegAppSettings(String json) {
+        return new JSONDeserializer<List<CmpdRegAppSetting>>()
+        .use("values", CmpdRegAppSetting.class).deserialize(json);
+    }
+
+	public String getPropName() {
+        return this.propName;
+    }
+
+	public void setPropName(String propName) {
+        this.propName = propName;
+    }
+
+	public String getPropValue() {
+        return this.propValue;
+    }
+
+	public void setPropValue(String propValue) {
+        this.propValue = propValue;
+    }
+
+	public String getComments() {
+        return this.comments;
+    }
+
+	public void setComments(String comments) {
+        this.comments = comments;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public Date getRecordedDate() {
+        return this.recordedDate;
+    }
+
+	public void setRecordedDate(Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("propName", "propValue", "comments", "ignored", "recordedDate");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new CmpdRegAppSetting().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countCmpdRegAppSettings() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM CmpdRegAppSetting o", Long.class).getSingleResult();
+    }
+
+	public static List<CmpdRegAppSetting> findAllCmpdRegAppSettings() {
+        return entityManager().createQuery("SELECT o FROM CmpdRegAppSetting o", CmpdRegAppSetting.class).getResultList();
+    }
+
+	public static List<CmpdRegAppSetting> findAllCmpdRegAppSettings(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM CmpdRegAppSetting o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, CmpdRegAppSetting.class).getResultList();
+    }
+
+	public static CmpdRegAppSetting findCmpdRegAppSetting(Long id) {
+        if (id == null) return null;
+        return entityManager().find(CmpdRegAppSetting.class, id);
+    }
+
+	public static List<CmpdRegAppSetting> findCmpdRegAppSettingEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM CmpdRegAppSetting o", CmpdRegAppSetting.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<CmpdRegAppSetting> findCmpdRegAppSettingEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM CmpdRegAppSetting o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, CmpdRegAppSetting.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            CmpdRegAppSetting attached = CmpdRegAppSetting.findCmpdRegAppSetting(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public CmpdRegAppSetting merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        CmpdRegAppSetting merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting_Roo_Configurable.aj
deleted file mode 100644
index edb272b49..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CmpdRegAppSetting;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect CmpdRegAppSetting_Roo_Configurable {
-    
-    declare @type: CmpdRegAppSetting: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting_Roo_JavaBean.aj
deleted file mode 100644
index 6e230b617..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting_Roo_JavaBean.aj
+++ /dev/null
@@ -1,51 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CmpdRegAppSetting;
-import java.util.Date;
-
-privileged aspect CmpdRegAppSetting_Roo_JavaBean {
-    
-    public String CmpdRegAppSetting.getPropName() {
-        return this.propName;
-    }
-    
-    public void CmpdRegAppSetting.setPropName(String propName) {
-        this.propName = propName;
-    }
-    
-    public String CmpdRegAppSetting.getPropValue() {
-        return this.propValue;
-    }
-    
-    public void CmpdRegAppSetting.setPropValue(String propValue) {
-        this.propValue = propValue;
-    }
-    
-    public String CmpdRegAppSetting.getComments() {
-        return this.comments;
-    }
-    
-    public void CmpdRegAppSetting.setComments(String comments) {
-        this.comments = comments;
-    }
-    
-    public boolean CmpdRegAppSetting.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void CmpdRegAppSetting.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public Date CmpdRegAppSetting.getRecordedDate() {
-        return this.recordedDate;
-    }
-    
-    public void CmpdRegAppSetting.setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 68e9af266..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CmpdRegAppSetting;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect CmpdRegAppSetting_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager CmpdRegAppSetting.entityManager;
-    
-    public static final List<String> CmpdRegAppSetting.fieldNames4OrderClauseFilter = java.util.Arrays.asList("propName", "propValue", "comments", "ignored", "recordedDate");
-    
-    public static final EntityManager CmpdRegAppSetting.entityManager() {
-        EntityManager em = new CmpdRegAppSetting().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long CmpdRegAppSetting.countCmpdRegAppSettings() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM CmpdRegAppSetting o", Long.class).getSingleResult();
-    }
-    
-    public static List<CmpdRegAppSetting> CmpdRegAppSetting.findAllCmpdRegAppSettings() {
-        return entityManager().createQuery("SELECT o FROM CmpdRegAppSetting o", CmpdRegAppSetting.class).getResultList();
-    }
-    
-    public static List<CmpdRegAppSetting> CmpdRegAppSetting.findAllCmpdRegAppSettings(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM CmpdRegAppSetting o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, CmpdRegAppSetting.class).getResultList();
-    }
-    
-    public static CmpdRegAppSetting CmpdRegAppSetting.findCmpdRegAppSetting(Long id) {
-        if (id == null) return null;
-        return entityManager().find(CmpdRegAppSetting.class, id);
-    }
-    
-    public static List<CmpdRegAppSetting> CmpdRegAppSetting.findCmpdRegAppSettingEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM CmpdRegAppSetting o", CmpdRegAppSetting.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<CmpdRegAppSetting> CmpdRegAppSetting.findCmpdRegAppSettingEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM CmpdRegAppSetting o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, CmpdRegAppSetting.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void CmpdRegAppSetting.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void CmpdRegAppSetting.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            CmpdRegAppSetting attached = CmpdRegAppSetting.findCmpdRegAppSetting(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void CmpdRegAppSetting.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void CmpdRegAppSetting.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public CmpdRegAppSetting CmpdRegAppSetting.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        CmpdRegAppSetting merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting_Roo_Jpa_Entity.aj
deleted file mode 100644
index b3708786b..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CmpdRegAppSetting;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect CmpdRegAppSetting_Roo_Jpa_Entity {
-    
-    declare @type: CmpdRegAppSetting: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long CmpdRegAppSetting.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer CmpdRegAppSetting.version;
-    
-    public Long CmpdRegAppSetting.getId() {
-        return this.id;
-    }
-    
-    public void CmpdRegAppSetting.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer CmpdRegAppSetting.getVersion() {
-        return this.version;
-    }
-    
-    public void CmpdRegAppSetting.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting_Roo_Json.aj
deleted file mode 100644
index 89e7fca4a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CmpdRegAppSetting;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect CmpdRegAppSetting_Roo_Json {
-    
-    public String CmpdRegAppSetting.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String CmpdRegAppSetting.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static CmpdRegAppSetting CmpdRegAppSetting.fromJsonToCmpdRegAppSetting(String json) {
-        return new JSONDeserializer<CmpdRegAppSetting>()
-        .use(null, CmpdRegAppSetting.class).deserialize(json);
-    }
-    
-    public static String CmpdRegAppSetting.toJsonArray(Collection<CmpdRegAppSetting> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String CmpdRegAppSetting.toJsonArray(Collection<CmpdRegAppSetting> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<CmpdRegAppSetting> CmpdRegAppSetting.fromJsonArrayToCmpdRegAppSettings(String json) {
-        return new JSONDeserializer<List<CmpdRegAppSetting>>()
-        .use("values", CmpdRegAppSetting.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting_Roo_ToString.aj
deleted file mode 100644
index 167f364be..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CmpdRegAppSetting;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect CmpdRegAppSetting_Roo_ToString {
-    
-    public String CmpdRegAppSetting.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeKind.java b/src/main/java/com/labsynch/labseer/domain/CodeKind.java
index fc7b99e6e..2c4dc022f 100755
--- a/src/main/java/com/labsynch/labseer/domain/CodeKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/CodeKind.java
@@ -1,5 +1,8 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.List;
 
 import javax.persistence.Column;
@@ -12,18 +15,22 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
 @Entity
 @RooJavaBean
 @RooToString
@@ -156,4 +163,185 @@ public static CodeKind getOrCreate(CodeType codeType, String kindName) {
 		
 		return codeKind;
 	}
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
+
+	public static List<CodeKind> findAllCodeKinds(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM CodeKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, CodeKind.class).getResultList();
+    }
+
+	public static List<CodeKind> findCodeKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM CodeKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, CodeKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static CodeKind fromJsonToCodeKind(String json) {
+        return new JSONDeserializer<CodeKind>()
+        .use(null, CodeKind.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<CodeKind> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<CodeKind> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<CodeKind> fromJsonArrayToCodeKinds(String json) {
+        return new JSONDeserializer<List<CodeKind>>()
+        .use("values", CodeKind.class).deserialize(json);
+    }
+
+	public CodeType getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(CodeType lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getKindName() {
+        return this.kindName;
+    }
+
+	public void setKindName(String kindName) {
+        this.kindName = kindName;
+    }
+
+	public String getLsTypeAndKind() {
+        return this.lsTypeAndKind;
+    }
+
+	public void setLsTypeAndKind(String lsTypeAndKind) {
+        this.lsTypeAndKind = lsTypeAndKind;
+    }
+
+	public static Long countFindCodeKindsByKindNameEqualsAndLsType(String kindName, CodeType lsType) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = CodeKind.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM CodeKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindCodeKindsByLsType(CodeType lsType) {
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = CodeKind.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM CodeKind AS o WHERE o.lsType = :lsType", Long.class);
+        q.setParameter("lsType", lsType);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindCodeKindsByLsTypeAndKindEquals(String lsTypeAndKind) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        EntityManager em = CodeKind.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM CodeKind AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", Long.class);
+        q.setParameter("lsTypeAndKind", lsTypeAndKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<CodeKind> findCodeKindsByKindNameEqualsAndLsType(String kindName, CodeType lsType) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = CodeKind.entityManager();
+        TypedQuery<CodeKind> q = em.createQuery("SELECT o FROM CodeKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", CodeKind.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<CodeKind> findCodeKindsByKindNameEqualsAndLsType(String kindName, CodeType lsType, String sortFieldName, String sortOrder) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = CodeKind.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM CodeKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<CodeKind> q = em.createQuery(queryBuilder.toString(), CodeKind.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<CodeKind> findCodeKindsByLsType(CodeType lsType) {
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = CodeKind.entityManager();
+        TypedQuery<CodeKind> q = em.createQuery("SELECT o FROM CodeKind AS o WHERE o.lsType = :lsType", CodeKind.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<CodeKind> findCodeKindsByLsType(CodeType lsType, String sortFieldName, String sortOrder) {
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = CodeKind.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM CodeKind AS o WHERE o.lsType = :lsType");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<CodeKind> q = em.createQuery(queryBuilder.toString(), CodeKind.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<CodeKind> findCodeKindsByLsTypeAndKindEquals(String lsTypeAndKind) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        EntityManager em = CodeKind.entityManager();
+        TypedQuery<CodeKind> q = em.createQuery("SELECT o FROM CodeKind AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", CodeKind.class);
+        q.setParameter("lsTypeAndKind", lsTypeAndKind);
+        return q;
+    }
+
+	public static TypedQuery<CodeKind> findCodeKindsByLsTypeAndKindEquals(String lsTypeAndKind, String sortFieldName, String sortOrder) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        EntityManager em = CodeKind.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM CodeKind AS o WHERE o.lsTypeAndKind = :lsTypeAndKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<CodeKind> q = em.createQuery(queryBuilder.toString(), CodeKind.class);
+        q.setParameter("lsTypeAndKind", lsTypeAndKind);
+        return q;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeKind_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/CodeKind_Roo_Configurable.aj
deleted file mode 100755
index eb5730419..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CodeKind_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CodeKind;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect CodeKind_Roo_Configurable {
-    
-    declare @type: CodeKind: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeKind_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/CodeKind_Roo_Finder.aj
deleted file mode 100755
index 65e69973c..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CodeKind_Roo_Finder.aj
+++ /dev/null
@@ -1,112 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CodeKind;
-import com.labsynch.labseer.domain.CodeType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect CodeKind_Roo_Finder {
-    
-    public static Long CodeKind.countFindCodeKindsByKindNameEqualsAndLsType(String kindName, CodeType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = CodeKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM CodeKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long CodeKind.countFindCodeKindsByLsType(CodeType lsType) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = CodeKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM CodeKind AS o WHERE o.lsType = :lsType", Long.class);
-        q.setParameter("lsType", lsType);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long CodeKind.countFindCodeKindsByLsTypeAndKindEquals(String lsTypeAndKind) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
-        EntityManager em = CodeKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM CodeKind AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", Long.class);
-        q.setParameter("lsTypeAndKind", lsTypeAndKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<CodeKind> CodeKind.findCodeKindsByKindNameEqualsAndLsType(String kindName, CodeType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = CodeKind.entityManager();
-        TypedQuery<CodeKind> q = em.createQuery("SELECT o FROM CodeKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", CodeKind.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<CodeKind> CodeKind.findCodeKindsByKindNameEqualsAndLsType(String kindName, CodeType lsType, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = CodeKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM CodeKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<CodeKind> q = em.createQuery(queryBuilder.toString(), CodeKind.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<CodeKind> CodeKind.findCodeKindsByLsType(CodeType lsType) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = CodeKind.entityManager();
-        TypedQuery<CodeKind> q = em.createQuery("SELECT o FROM CodeKind AS o WHERE o.lsType = :lsType", CodeKind.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<CodeKind> CodeKind.findCodeKindsByLsType(CodeType lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = CodeKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM CodeKind AS o WHERE o.lsType = :lsType");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<CodeKind> q = em.createQuery(queryBuilder.toString(), CodeKind.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<CodeKind> CodeKind.findCodeKindsByLsTypeAndKindEquals(String lsTypeAndKind) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
-        EntityManager em = CodeKind.entityManager();
-        TypedQuery<CodeKind> q = em.createQuery("SELECT o FROM CodeKind AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", CodeKind.class);
-        q.setParameter("lsTypeAndKind", lsTypeAndKind);
-        return q;
-    }
-    
-    public static TypedQuery<CodeKind> CodeKind.findCodeKindsByLsTypeAndKindEquals(String lsTypeAndKind, String sortFieldName, String sortOrder) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
-        EntityManager em = CodeKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM CodeKind AS o WHERE o.lsTypeAndKind = :lsTypeAndKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<CodeKind> q = em.createQuery(queryBuilder.toString(), CodeKind.class);
-        q.setParameter("lsTypeAndKind", lsTypeAndKind);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeKind_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/CodeKind_Roo_JavaBean.aj
deleted file mode 100755
index 59b7789c1..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CodeKind_Roo_JavaBean.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CodeKind;
-import com.labsynch.labseer.domain.CodeType;
-
-privileged aspect CodeKind_Roo_JavaBean {
-    
-    public CodeType CodeKind.getLsType() {
-        return this.lsType;
-    }
-    
-    public void CodeKind.setLsType(CodeType lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String CodeKind.getKindName() {
-        return this.kindName;
-    }
-    
-    public void CodeKind.setKindName(String kindName) {
-        this.kindName = kindName;
-    }
-    
-    public String CodeKind.getLsTypeAndKind() {
-        return this.lsTypeAndKind;
-    }
-    
-    public void CodeKind.setLsTypeAndKind(String lsTypeAndKind) {
-        this.lsTypeAndKind = lsTypeAndKind;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeKind_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/CodeKind_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index c5c43f179..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CodeKind_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CodeKind;
-import java.util.List;
-
-privileged aspect CodeKind_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> CodeKind.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
-    
-    public static List<CodeKind> CodeKind.findAllCodeKinds(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM CodeKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, CodeKind.class).getResultList();
-    }
-    
-    public static List<CodeKind> CodeKind.findCodeKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM CodeKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, CodeKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeKind_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/CodeKind_Roo_Json.aj
deleted file mode 100755
index a8c0f8479..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CodeKind_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CodeKind;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect CodeKind_Roo_Json {
-    
-    public String CodeKind.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String CodeKind.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static CodeKind CodeKind.fromJsonToCodeKind(String json) {
-        return new JSONDeserializer<CodeKind>()
-        .use(null, CodeKind.class).deserialize(json);
-    }
-    
-    public static String CodeKind.toJsonArray(Collection<CodeKind> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String CodeKind.toJsonArray(Collection<CodeKind> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<CodeKind> CodeKind.fromJsonArrayToCodeKinds(String json) {
-        return new JSONDeserializer<List<CodeKind>>()
-        .use("values", CodeKind.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeKind_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/CodeKind_Roo_ToString.aj
deleted file mode 100755
index 22672c273..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CodeKind_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CodeKind;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect CodeKind_Roo_ToString {
-    
-    public String CodeKind.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeOrigin.java b/src/main/java/com/labsynch/labseer/domain/CodeOrigin.java
index af1717f4c..93615f497 100644
--- a/src/main/java/com/labsynch/labseer/domain/CodeOrigin.java
+++ b/src/main/java/com/labsynch/labseer/domain/CodeOrigin.java
@@ -1,18 +1,35 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.List;
 
 import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -44,4 +61,190 @@ public static CodeOrigin getOrCreate(String name) {
 
 		return codeOrigin;
 	}
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static CodeOrigin fromJsonToCodeOrigin(String json) {
+        return new JSONDeserializer<CodeOrigin>()
+        .use(null, CodeOrigin.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<CodeOrigin> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<CodeOrigin> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<CodeOrigin> fromJsonArrayToCodeOrigins(String json) {
+        return new JSONDeserializer<List<CodeOrigin>>()
+        .use("values", CodeOrigin.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@Id
+    @SequenceGenerator(name = "codeOriginGen", sequenceName = "CODE_ORIGIN_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "codeOriginGen")
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "name");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new CodeOrigin().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countCodeOrigins() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM CodeOrigin o", Long.class).getSingleResult();
+    }
+
+	public static List<CodeOrigin> findAllCodeOrigins() {
+        return entityManager().createQuery("SELECT o FROM CodeOrigin o", CodeOrigin.class).getResultList();
+    }
+
+	public static List<CodeOrigin> findAllCodeOrigins(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM CodeOrigin o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, CodeOrigin.class).getResultList();
+    }
+
+	public static CodeOrigin findCodeOrigin(Long id) {
+        if (id == null) return null;
+        return entityManager().find(CodeOrigin.class, id);
+    }
+
+	public static List<CodeOrigin> findCodeOriginEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM CodeOrigin o", CodeOrigin.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<CodeOrigin> findCodeOriginEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM CodeOrigin o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, CodeOrigin.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            CodeOrigin attached = CodeOrigin.findCodeOrigin(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public CodeOrigin merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        CodeOrigin merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String getName() {
+        return this.name;
+    }
+
+	public void setName(String name) {
+        this.name = name;
+    }
+
+	public static Long countFindCodeOriginsByNameEquals(String name) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = CodeOrigin.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM CodeOrigin AS o WHERE o.name = :name", Long.class);
+        q.setParameter("name", name);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<CodeOrigin> findCodeOriginsByNameEquals(String name) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = CodeOrigin.entityManager();
+        TypedQuery<CodeOrigin> q = em.createQuery("SELECT o FROM CodeOrigin AS o WHERE o.name = :name", CodeOrigin.class);
+        q.setParameter("name", name);
+        return q;
+    }
+
+	public static TypedQuery<CodeOrigin> findCodeOriginsByNameEquals(String name, String sortFieldName, String sortOrder) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = CodeOrigin.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM CodeOrigin AS o WHERE o.name = :name");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<CodeOrigin> q = em.createQuery(queryBuilder.toString(), CodeOrigin.class);
+        q.setParameter("name", name);
+        return q;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeOrigin_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/CodeOrigin_Roo_Configurable.aj
deleted file mode 100644
index 48b4392fa..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CodeOrigin_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CodeOrigin;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect CodeOrigin_Roo_Configurable {
-    
-    declare @type: CodeOrigin: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeOrigin_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/CodeOrigin_Roo_Finder.aj
deleted file mode 100644
index 2f229cc66..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CodeOrigin_Roo_Finder.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CodeOrigin;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect CodeOrigin_Roo_Finder {
-    
-    public static Long CodeOrigin.countFindCodeOriginsByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = CodeOrigin.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM CodeOrigin AS o WHERE o.name = :name", Long.class);
-        q.setParameter("name", name);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<CodeOrigin> CodeOrigin.findCodeOriginsByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = CodeOrigin.entityManager();
-        TypedQuery<CodeOrigin> q = em.createQuery("SELECT o FROM CodeOrigin AS o WHERE o.name = :name", CodeOrigin.class);
-        q.setParameter("name", name);
-        return q;
-    }
-    
-    public static TypedQuery<CodeOrigin> CodeOrigin.findCodeOriginsByNameEquals(String name, String sortFieldName, String sortOrder) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = CodeOrigin.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM CodeOrigin AS o WHERE o.name = :name");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<CodeOrigin> q = em.createQuery(queryBuilder.toString(), CodeOrigin.class);
-        q.setParameter("name", name);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeOrigin_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/CodeOrigin_Roo_JavaBean.aj
deleted file mode 100644
index 2993a1e4f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CodeOrigin_Roo_JavaBean.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CodeOrigin;
-
-privileged aspect CodeOrigin_Roo_JavaBean {
-    
-    public String CodeOrigin.getName() {
-        return this.name;
-    }
-    
-    public void CodeOrigin.setName(String name) {
-        this.name = name;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeOrigin_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/CodeOrigin_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 935092f37..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CodeOrigin_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CodeOrigin;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect CodeOrigin_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager CodeOrigin.entityManager;
-    
-    public static final List<String> CodeOrigin.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "name");
-    
-    public static final EntityManager CodeOrigin.entityManager() {
-        EntityManager em = new CodeOrigin().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long CodeOrigin.countCodeOrigins() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM CodeOrigin o", Long.class).getSingleResult();
-    }
-    
-    public static List<CodeOrigin> CodeOrigin.findAllCodeOrigins() {
-        return entityManager().createQuery("SELECT o FROM CodeOrigin o", CodeOrigin.class).getResultList();
-    }
-    
-    public static List<CodeOrigin> CodeOrigin.findAllCodeOrigins(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM CodeOrigin o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, CodeOrigin.class).getResultList();
-    }
-    
-    public static CodeOrigin CodeOrigin.findCodeOrigin(Long id) {
-        if (id == null) return null;
-        return entityManager().find(CodeOrigin.class, id);
-    }
-    
-    public static List<CodeOrigin> CodeOrigin.findCodeOriginEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM CodeOrigin o", CodeOrigin.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<CodeOrigin> CodeOrigin.findCodeOriginEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM CodeOrigin o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, CodeOrigin.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void CodeOrigin.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void CodeOrigin.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            CodeOrigin attached = CodeOrigin.findCodeOrigin(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void CodeOrigin.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void CodeOrigin.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public CodeOrigin CodeOrigin.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        CodeOrigin merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeOrigin_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/CodeOrigin_Roo_Jpa_Entity.aj
deleted file mode 100644
index a4954241a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CodeOrigin_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CodeOrigin;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
-
-privileged aspect CodeOrigin_Roo_Jpa_Entity {
-    
-    declare @type: CodeOrigin: @Entity;
-    
-    @Id
-    @SequenceGenerator(name = "codeOriginGen", sequenceName = "CODE_ORIGIN_PKSEQ")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "codeOriginGen")
-    @Column(name = "id")
-    private Long CodeOrigin.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer CodeOrigin.version;
-    
-    public Long CodeOrigin.getId() {
-        return this.id;
-    }
-    
-    public void CodeOrigin.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer CodeOrigin.getVersion() {
-        return this.version;
-    }
-    
-    public void CodeOrigin.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeOrigin_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/CodeOrigin_Roo_Json.aj
deleted file mode 100644
index d5b0660a3..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CodeOrigin_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CodeOrigin;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect CodeOrigin_Roo_Json {
-    
-    public String CodeOrigin.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String CodeOrigin.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static CodeOrigin CodeOrigin.fromJsonToCodeOrigin(String json) {
-        return new JSONDeserializer<CodeOrigin>()
-        .use(null, CodeOrigin.class).deserialize(json);
-    }
-    
-    public static String CodeOrigin.toJsonArray(Collection<CodeOrigin> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String CodeOrigin.toJsonArray(Collection<CodeOrigin> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<CodeOrigin> CodeOrigin.fromJsonArrayToCodeOrigins(String json) {
-        return new JSONDeserializer<List<CodeOrigin>>()
-        .use("values", CodeOrigin.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeOrigin_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/CodeOrigin_Roo_ToString.aj
deleted file mode 100644
index f16edcc73..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CodeOrigin_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CodeOrigin;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect CodeOrigin_Roo_ToString {
-    
-    public String CodeOrigin.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeType.java b/src/main/java/com/labsynch/labseer/domain/CodeType.java
index 24a305e3e..2f5980765 100755
--- a/src/main/java/com/labsynch/labseer/domain/CodeType.java
+++ b/src/main/java/com/labsynch/labseer/domain/CodeType.java
@@ -1,24 +1,34 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.List;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.EntityManager;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
 @Entity
 @RooJavaBean
 @RooToString
@@ -77,4 +87,164 @@ public Integer getVersion() {
 	public void setVersion(Integer version) {
         this.version = version;
     }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static CodeType fromJsonToCodeType(String json) {
+        return new JSONDeserializer<CodeType>()
+        .use(null, CodeType.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<CodeType> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<CodeType> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<CodeType> fromJsonArrayToCodeTypes(String json) {
+        return new JSONDeserializer<List<CodeType>>()
+        .use("values", CodeType.class).deserialize(json);
+    }
+
+	public static Long countFindCodeTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = CodeType.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM CodeType AS o WHERE o.typeName = :typeName", Long.class);
+        q.setParameter("typeName", typeName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<CodeType> findCodeTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = CodeType.entityManager();
+        TypedQuery<CodeType> q = em.createQuery("SELECT o FROM CodeType AS o WHERE o.typeName = :typeName", CodeType.class);
+        q.setParameter("typeName", typeName);
+        return q;
+    }
+
+	public static TypedQuery<CodeType> findCodeTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = CodeType.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM CodeType AS o WHERE o.typeName = :typeName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<CodeType> q = em.createQuery(queryBuilder.toString(), CodeType.class);
+        q.setParameter("typeName", typeName);
+        return q;
+    }
+
+	public String getTypeName() {
+        return this.typeName;
+    }
+
+	public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "typeName", "id", "version");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new CodeType().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countCodeTypes() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM CodeType o", Long.class).getSingleResult();
+    }
+
+	public static List<CodeType> findAllCodeTypes() {
+        return entityManager().createQuery("SELECT o FROM CodeType o", CodeType.class).getResultList();
+    }
+
+	public static List<CodeType> findAllCodeTypes(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM CodeType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, CodeType.class).getResultList();
+    }
+
+	public static CodeType findCodeType(Long id) {
+        if (id == null) return null;
+        return entityManager().find(CodeType.class, id);
+    }
+
+	public static List<CodeType> findCodeTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM CodeType o", CodeType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<CodeType> findCodeTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM CodeType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, CodeType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            CodeType attached = CodeType.findCodeType(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public CodeType merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        CodeType merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeType_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/CodeType_Roo_Configurable.aj
deleted file mode 100755
index f64efac55..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CodeType_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CodeType;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect CodeType_Roo_Configurable {
-    
-    declare @type: CodeType: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeType_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/CodeType_Roo_Finder.aj
deleted file mode 100755
index 6be663b9d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CodeType_Roo_Finder.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CodeType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect CodeType_Roo_Finder {
-    
-    public static Long CodeType.countFindCodeTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = CodeType.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM CodeType AS o WHERE o.typeName = :typeName", Long.class);
-        q.setParameter("typeName", typeName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<CodeType> CodeType.findCodeTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = CodeType.entityManager();
-        TypedQuery<CodeType> q = em.createQuery("SELECT o FROM CodeType AS o WHERE o.typeName = :typeName", CodeType.class);
-        q.setParameter("typeName", typeName);
-        return q;
-    }
-    
-    public static TypedQuery<CodeType> CodeType.findCodeTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = CodeType.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM CodeType AS o WHERE o.typeName = :typeName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<CodeType> q = em.createQuery(queryBuilder.toString(), CodeType.class);
-        q.setParameter("typeName", typeName);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeType_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/CodeType_Roo_JavaBean.aj
deleted file mode 100755
index 5efa653fd..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CodeType_Roo_JavaBean.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CodeType;
-
-privileged aspect CodeType_Roo_JavaBean {
-    
-    public String CodeType.getTypeName() {
-        return this.typeName;
-    }
-    
-    public void CodeType.setTypeName(String typeName) {
-        this.typeName = typeName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeType_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/CodeType_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index c107821cd..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CodeType_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CodeType;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect CodeType_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager CodeType.entityManager;
-    
-    public static final List<String> CodeType.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "typeName", "id", "version");
-    
-    public static final EntityManager CodeType.entityManager() {
-        EntityManager em = new CodeType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long CodeType.countCodeTypes() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM CodeType o", Long.class).getSingleResult();
-    }
-    
-    public static List<CodeType> CodeType.findAllCodeTypes() {
-        return entityManager().createQuery("SELECT o FROM CodeType o", CodeType.class).getResultList();
-    }
-    
-    public static List<CodeType> CodeType.findAllCodeTypes(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM CodeType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, CodeType.class).getResultList();
-    }
-    
-    public static CodeType CodeType.findCodeType(Long id) {
-        if (id == null) return null;
-        return entityManager().find(CodeType.class, id);
-    }
-    
-    public static List<CodeType> CodeType.findCodeTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM CodeType o", CodeType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<CodeType> CodeType.findCodeTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM CodeType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, CodeType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void CodeType.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void CodeType.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            CodeType attached = CodeType.findCodeType(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void CodeType.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void CodeType.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public CodeType CodeType.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        CodeType merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeType_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/CodeType_Roo_Json.aj
deleted file mode 100755
index a9e9eb29e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CodeType_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CodeType;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect CodeType_Roo_Json {
-    
-    public String CodeType.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String CodeType.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static CodeType CodeType.fromJsonToCodeType(String json) {
-        return new JSONDeserializer<CodeType>()
-        .use(null, CodeType.class).deserialize(json);
-    }
-    
-    public static String CodeType.toJsonArray(Collection<CodeType> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String CodeType.toJsonArray(Collection<CodeType> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<CodeType> CodeType.fromJsonArrayToCodeTypes(String json) {
-        return new JSONDeserializer<List<CodeType>>()
-        .use("values", CodeType.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeType_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/CodeType_Roo_ToString.aj
deleted file mode 100755
index dbf8981d7..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CodeType_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CodeType;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect CodeType_Roo_ToString {
-    
-    public String CodeType.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Compound.java b/src/main/java/com/labsynch/labseer/domain/Compound.java
index 817715dc3..62a568450 100644
--- a/src/main/java/com/labsynch/labseer/domain/Compound.java
+++ b/src/main/java/com/labsynch/labseer/domain/Compound.java
@@ -1,10 +1,26 @@
 package com.labsynch.labseer.domain;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.Date;
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
+import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.validation.constraints.Size;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
@@ -12,6 +28,8 @@
 import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @Transactional
 @RooJavaBean
 @RooToString
@@ -40,4 +58,265 @@ public class Compound {
     private Boolean ignored;
 
     private Boolean deleted;
+
+	public static Long countFindCompoundsByCdId(int CdId) {
+        EntityManager em = Compound.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Compound AS o WHERE o.CdId = :CdId", Long.class);
+        q.setParameter("CdId", CdId);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindCompoundsByExternal_idEquals(String external_id) {
+        if (external_id == null || external_id.length() == 0) throw new IllegalArgumentException("The external_id argument is required");
+        EntityManager em = Compound.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Compound AS o WHERE o.external_id = :external_id", Long.class);
+        q.setParameter("external_id", external_id);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<Compound> findCompoundsByCdId(int CdId) {
+        EntityManager em = Compound.entityManager();
+        TypedQuery<Compound> q = em.createQuery("SELECT o FROM Compound AS o WHERE o.CdId = :CdId", Compound.class);
+        q.setParameter("CdId", CdId);
+        return q;
+    }
+
+	public static TypedQuery<Compound> findCompoundsByCdId(int CdId, String sortFieldName, String sortOrder) {
+        EntityManager em = Compound.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Compound AS o WHERE o.CdId = :CdId");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Compound> q = em.createQuery(queryBuilder.toString(), Compound.class);
+        q.setParameter("CdId", CdId);
+        return q;
+    }
+
+	public static TypedQuery<Compound> findCompoundsByExternal_idEquals(String external_id) {
+        if (external_id == null || external_id.length() == 0) throw new IllegalArgumentException("The external_id argument is required");
+        EntityManager em = Compound.entityManager();
+        TypedQuery<Compound> q = em.createQuery("SELECT o FROM Compound AS o WHERE o.external_id = :external_id", Compound.class);
+        q.setParameter("external_id", external_id);
+        return q;
+    }
+
+	public static TypedQuery<Compound> findCompoundsByExternal_idEquals(String external_id, String sortFieldName, String sortOrder) {
+        if (external_id == null || external_id.length() == 0) throw new IllegalArgumentException("The external_id argument is required");
+        EntityManager em = Compound.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Compound AS o WHERE o.external_id = :external_id");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Compound> q = em.createQuery(queryBuilder.toString(), Compound.class);
+        q.setParameter("external_id", external_id);
+        return q;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "corpName", "external_id", "CdId", "createdDate", "modifiedDate", "ignored", "deleted");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new Compound().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countCompounds() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM Compound o", Long.class).getSingleResult();
+    }
+
+	public static List<Compound> findAllCompounds() {
+        return entityManager().createQuery("SELECT o FROM Compound o", Compound.class).getResultList();
+    }
+
+	public static List<Compound> findAllCompounds(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM Compound o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, Compound.class).getResultList();
+    }
+
+	public static Compound findCompound(Long id) {
+        if (id == null) return null;
+        return entityManager().find(Compound.class, id);
+    }
+
+	public static List<Compound> findCompoundEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM Compound o", Compound.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<Compound> findCompoundEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM Compound o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, Compound.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            Compound attached = Compound.findCompound(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public Compound merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        Compound merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String getCorpName() {
+        return this.corpName;
+    }
+
+	public void setCorpName(String corpName) {
+        this.corpName = corpName;
+    }
+
+	public String getExternal_id() {
+        return this.external_id;
+    }
+
+	public void setExternal_id(String external_id) {
+        this.external_id = external_id;
+    }
+
+	public int getCdId() {
+        return this.CdId;
+    }
+
+	public void setCdId(int CdId) {
+        this.CdId = CdId;
+    }
+
+	public Date getCreatedDate() {
+        return this.createdDate;
+    }
+
+	public void setCreatedDate(Date createdDate) {
+        this.createdDate = createdDate;
+    }
+
+	public Date getModifiedDate() {
+        return this.modifiedDate;
+    }
+
+	public void setModifiedDate(Date modifiedDate) {
+        this.modifiedDate = modifiedDate;
+    }
+
+	public Boolean getIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(Boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public Boolean getDeleted() {
+        return this.deleted;
+    }
+
+	public void setDeleted(Boolean deleted) {
+        this.deleted = deleted;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static Compound fromJsonToCompound(String json) {
+        return new JSONDeserializer<Compound>()
+        .use(null, Compound.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<Compound> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<Compound> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<Compound> fromJsonArrayToCompounds(String json) {
+        return new JSONDeserializer<List<Compound>>()
+        .use("values", Compound.class).deserialize(json);
+    }
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/CompoundType.java b/src/main/java/com/labsynch/labseer/domain/CompoundType.java
index 8b0985c77..167e9d688 100644
--- a/src/main/java/com/labsynch/labseer/domain/CompoundType.java
+++ b/src/main/java/com/labsynch/labseer/domain/CompoundType.java
@@ -1,12 +1,30 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -23,4 +41,213 @@ public class CompoundType {
     
     private String comment;
     
+
+	public String getCode() {
+        return this.code;
+    }
+
+	public void setCode(String code) {
+        this.code = code;
+    }
+
+	public String getName() {
+        return this.name;
+    }
+
+	public void setName(String name) {
+        this.name = name;
+    }
+
+	public Integer getDisplayOrder() {
+        return this.displayOrder;
+    }
+
+	public void setDisplayOrder(Integer displayOrder) {
+        this.displayOrder = displayOrder;
+    }
+
+	public String getComment() {
+        return this.comment;
+    }
+
+	public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static CompoundType fromJsonToCompoundType(String json) {
+        return new JSONDeserializer<CompoundType>()
+        .use(null, CompoundType.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<CompoundType> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<CompoundType> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<CompoundType> fromJsonArrayToCompoundTypes(String json) {
+        return new JSONDeserializer<List<CompoundType>>()
+        .use("values", CompoundType.class).deserialize(json);
+    }
+
+	public static Long countFindCompoundTypesByCodeEquals(String code) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = CompoundType.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM CompoundType AS o WHERE o.code = :code", Long.class);
+        q.setParameter("code", code);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<CompoundType> findCompoundTypesByCodeEquals(String code) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = CompoundType.entityManager();
+        TypedQuery<CompoundType> q = em.createQuery("SELECT o FROM CompoundType AS o WHERE o.code = :code", CompoundType.class);
+        q.setParameter("code", code);
+        return q;
+    }
+
+	public static TypedQuery<CompoundType> findCompoundTypesByCodeEquals(String code, String sortFieldName, String sortOrder) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = CompoundType.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM CompoundType AS o WHERE o.code = :code");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<CompoundType> q = em.createQuery(queryBuilder.toString(), CompoundType.class);
+        q.setParameter("code", code);
+        return q;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("code", "name", "displayOrder", "comment");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new CompoundType().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countCompoundTypes() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM CompoundType o", Long.class).getSingleResult();
+    }
+
+	public static List<CompoundType> findAllCompoundTypes() {
+        return entityManager().createQuery("SELECT o FROM CompoundType o", CompoundType.class).getResultList();
+    }
+
+	public static List<CompoundType> findAllCompoundTypes(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM CompoundType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, CompoundType.class).getResultList();
+    }
+
+	public static CompoundType findCompoundType(Long id) {
+        if (id == null) return null;
+        return entityManager().find(CompoundType.class, id);
+    }
+
+	public static List<CompoundType> findCompoundTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM CompoundType o", CompoundType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<CompoundType> findCompoundTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM CompoundType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, CompoundType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            CompoundType attached = CompoundType.findCompoundType(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public CompoundType merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        CompoundType merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/CompoundType_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/CompoundType_Roo_Configurable.aj
deleted file mode 100644
index 6fb36b2b9..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CompoundType_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CompoundType;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect CompoundType_Roo_Configurable {
-    
-    declare @type: CompoundType: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CompoundType_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/CompoundType_Roo_Finder.aj
deleted file mode 100644
index 26ab67dd1..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CompoundType_Roo_Finder.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CompoundType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect CompoundType_Roo_Finder {
-    
-    public static Long CompoundType.countFindCompoundTypesByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = CompoundType.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM CompoundType AS o WHERE o.code = :code", Long.class);
-        q.setParameter("code", code);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<CompoundType> CompoundType.findCompoundTypesByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = CompoundType.entityManager();
-        TypedQuery<CompoundType> q = em.createQuery("SELECT o FROM CompoundType AS o WHERE o.code = :code", CompoundType.class);
-        q.setParameter("code", code);
-        return q;
-    }
-    
-    public static TypedQuery<CompoundType> CompoundType.findCompoundTypesByCodeEquals(String code, String sortFieldName, String sortOrder) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = CompoundType.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM CompoundType AS o WHERE o.code = :code");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<CompoundType> q = em.createQuery(queryBuilder.toString(), CompoundType.class);
-        q.setParameter("code", code);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CompoundType_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/CompoundType_Roo_JavaBean.aj
deleted file mode 100644
index d606fe3f7..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CompoundType_Roo_JavaBean.aj
+++ /dev/null
@@ -1,42 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CompoundType;
-
-privileged aspect CompoundType_Roo_JavaBean {
-    
-    public String CompoundType.getCode() {
-        return this.code;
-    }
-    
-    public void CompoundType.setCode(String code) {
-        this.code = code;
-    }
-    
-    public String CompoundType.getName() {
-        return this.name;
-    }
-    
-    public void CompoundType.setName(String name) {
-        this.name = name;
-    }
-    
-    public Integer CompoundType.getDisplayOrder() {
-        return this.displayOrder;
-    }
-    
-    public void CompoundType.setDisplayOrder(Integer displayOrder) {
-        this.displayOrder = displayOrder;
-    }
-    
-    public String CompoundType.getComment() {
-        return this.comment;
-    }
-    
-    public void CompoundType.setComment(String comment) {
-        this.comment = comment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CompoundType_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/CompoundType_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 1084cd8ae..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CompoundType_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CompoundType;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect CompoundType_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager CompoundType.entityManager;
-    
-    public static final List<String> CompoundType.fieldNames4OrderClauseFilter = java.util.Arrays.asList("code", "name", "displayOrder", "comment");
-    
-    public static final EntityManager CompoundType.entityManager() {
-        EntityManager em = new CompoundType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long CompoundType.countCompoundTypes() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM CompoundType o", Long.class).getSingleResult();
-    }
-    
-    public static List<CompoundType> CompoundType.findAllCompoundTypes() {
-        return entityManager().createQuery("SELECT o FROM CompoundType o", CompoundType.class).getResultList();
-    }
-    
-    public static List<CompoundType> CompoundType.findAllCompoundTypes(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM CompoundType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, CompoundType.class).getResultList();
-    }
-    
-    public static CompoundType CompoundType.findCompoundType(Long id) {
-        if (id == null) return null;
-        return entityManager().find(CompoundType.class, id);
-    }
-    
-    public static List<CompoundType> CompoundType.findCompoundTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM CompoundType o", CompoundType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<CompoundType> CompoundType.findCompoundTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM CompoundType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, CompoundType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void CompoundType.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void CompoundType.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            CompoundType attached = CompoundType.findCompoundType(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void CompoundType.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void CompoundType.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public CompoundType CompoundType.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        CompoundType merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CompoundType_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/CompoundType_Roo_Jpa_Entity.aj
deleted file mode 100644
index bdbf0eb79..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CompoundType_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CompoundType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect CompoundType_Roo_Jpa_Entity {
-    
-    declare @type: CompoundType: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long CompoundType.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer CompoundType.version;
-    
-    public Long CompoundType.getId() {
-        return this.id;
-    }
-    
-    public void CompoundType.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer CompoundType.getVersion() {
-        return this.version;
-    }
-    
-    public void CompoundType.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CompoundType_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/CompoundType_Roo_Json.aj
deleted file mode 100644
index f30d092e4..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CompoundType_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CompoundType;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect CompoundType_Roo_Json {
-    
-    public String CompoundType.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String CompoundType.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static CompoundType CompoundType.fromJsonToCompoundType(String json) {
-        return new JSONDeserializer<CompoundType>()
-        .use(null, CompoundType.class).deserialize(json);
-    }
-    
-    public static String CompoundType.toJsonArray(Collection<CompoundType> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String CompoundType.toJsonArray(Collection<CompoundType> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<CompoundType> CompoundType.fromJsonArrayToCompoundTypes(String json) {
-        return new JSONDeserializer<List<CompoundType>>()
-        .use("values", CompoundType.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CompoundType_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/CompoundType_Roo_ToString.aj
deleted file mode 100644
index bba21e889..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CompoundType_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CompoundType;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect CompoundType_Roo_ToString {
-    
-    public String CompoundType.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Compound_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/Compound_Roo_Configurable.aj
deleted file mode 100644
index 737443495..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Compound_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Compound;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect Compound_Roo_Configurable {
-    
-    declare @type: Compound: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Compound_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/Compound_Roo_Finder.aj
deleted file mode 100644
index 3d98ded01..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Compound_Roo_Finder.aj
+++ /dev/null
@@ -1,71 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Compound;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect Compound_Roo_Finder {
-    
-    public static Long Compound.countFindCompoundsByCdId(int CdId) {
-        EntityManager em = Compound.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Compound AS o WHERE o.CdId = :CdId", Long.class);
-        q.setParameter("CdId", CdId);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Compound.countFindCompoundsByExternal_idEquals(String external_id) {
-        if (external_id == null || external_id.length() == 0) throw new IllegalArgumentException("The external_id argument is required");
-        EntityManager em = Compound.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Compound AS o WHERE o.external_id = :external_id", Long.class);
-        q.setParameter("external_id", external_id);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<Compound> Compound.findCompoundsByCdId(int CdId) {
-        EntityManager em = Compound.entityManager();
-        TypedQuery<Compound> q = em.createQuery("SELECT o FROM Compound AS o WHERE o.CdId = :CdId", Compound.class);
-        q.setParameter("CdId", CdId);
-        return q;
-    }
-    
-    public static TypedQuery<Compound> Compound.findCompoundsByCdId(int CdId, String sortFieldName, String sortOrder) {
-        EntityManager em = Compound.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Compound AS o WHERE o.CdId = :CdId");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Compound> q = em.createQuery(queryBuilder.toString(), Compound.class);
-        q.setParameter("CdId", CdId);
-        return q;
-    }
-    
-    public static TypedQuery<Compound> Compound.findCompoundsByExternal_idEquals(String external_id) {
-        if (external_id == null || external_id.length() == 0) throw new IllegalArgumentException("The external_id argument is required");
-        EntityManager em = Compound.entityManager();
-        TypedQuery<Compound> q = em.createQuery("SELECT o FROM Compound AS o WHERE o.external_id = :external_id", Compound.class);
-        q.setParameter("external_id", external_id);
-        return q;
-    }
-    
-    public static TypedQuery<Compound> Compound.findCompoundsByExternal_idEquals(String external_id, String sortFieldName, String sortOrder) {
-        if (external_id == null || external_id.length() == 0) throw new IllegalArgumentException("The external_id argument is required");
-        EntityManager em = Compound.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Compound AS o WHERE o.external_id = :external_id");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Compound> q = em.createQuery(queryBuilder.toString(), Compound.class);
-        q.setParameter("external_id", external_id);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Compound_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/Compound_Roo_JavaBean.aj
deleted file mode 100644
index 883ffcbea..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Compound_Roo_JavaBean.aj
+++ /dev/null
@@ -1,67 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Compound;
-import java.util.Date;
-
-privileged aspect Compound_Roo_JavaBean {
-    
-    public String Compound.getCorpName() {
-        return this.corpName;
-    }
-    
-    public void Compound.setCorpName(String corpName) {
-        this.corpName = corpName;
-    }
-    
-    public String Compound.getExternal_id() {
-        return this.external_id;
-    }
-    
-    public void Compound.setExternal_id(String external_id) {
-        this.external_id = external_id;
-    }
-    
-    public int Compound.getCdId() {
-        return this.CdId;
-    }
-    
-    public void Compound.setCdId(int CdId) {
-        this.CdId = CdId;
-    }
-    
-    public Date Compound.getCreatedDate() {
-        return this.createdDate;
-    }
-    
-    public void Compound.setCreatedDate(Date createdDate) {
-        this.createdDate = createdDate;
-    }
-    
-    public Date Compound.getModifiedDate() {
-        return this.modifiedDate;
-    }
-    
-    public void Compound.setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
-    
-    public Boolean Compound.getIgnored() {
-        return this.ignored;
-    }
-    
-    public void Compound.setIgnored(Boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public Boolean Compound.getDeleted() {
-        return this.deleted;
-    }
-    
-    public void Compound.setDeleted(Boolean deleted) {
-        this.deleted = deleted;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Compound_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/Compound_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 223aefa7f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Compound_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Compound;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect Compound_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager Compound.entityManager;
-    
-    public static final List<String> Compound.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "corpName", "external_id", "CdId", "createdDate", "modifiedDate", "ignored", "deleted");
-    
-    public static final EntityManager Compound.entityManager() {
-        EntityManager em = new Compound().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long Compound.countCompounds() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM Compound o", Long.class).getSingleResult();
-    }
-    
-    public static List<Compound> Compound.findAllCompounds() {
-        return entityManager().createQuery("SELECT o FROM Compound o", Compound.class).getResultList();
-    }
-    
-    public static List<Compound> Compound.findAllCompounds(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM Compound o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, Compound.class).getResultList();
-    }
-    
-    public static Compound Compound.findCompound(Long id) {
-        if (id == null) return null;
-        return entityManager().find(Compound.class, id);
-    }
-    
-    public static List<Compound> Compound.findCompoundEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM Compound o", Compound.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<Compound> Compound.findCompoundEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM Compound o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, Compound.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void Compound.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void Compound.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            Compound attached = Compound.findCompound(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void Compound.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void Compound.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public Compound Compound.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        Compound merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Compound_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/Compound_Roo_Jpa_Entity.aj
deleted file mode 100644
index 07fcbdaaf..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Compound_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Compound;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect Compound_Roo_Jpa_Entity {
-    
-    declare @type: Compound: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long Compound.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer Compound.version;
-    
-    public Long Compound.getId() {
-        return this.id;
-    }
-    
-    public void Compound.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer Compound.getVersion() {
-        return this.version;
-    }
-    
-    public void Compound.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Compound_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/Compound_Roo_Json.aj
deleted file mode 100644
index 82d49342a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Compound_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Compound;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect Compound_Roo_Json {
-    
-    public String Compound.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String Compound.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static Compound Compound.fromJsonToCompound(String json) {
-        return new JSONDeserializer<Compound>()
-        .use(null, Compound.class).deserialize(json);
-    }
-    
-    public static String Compound.toJsonArray(Collection<Compound> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String Compound.toJsonArray(Collection<Compound> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<Compound> Compound.fromJsonArrayToCompounds(String json) {
-        return new JSONDeserializer<List<Compound>>()
-        .use("values", Compound.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Compound_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/Compound_Roo_ToString.aj
deleted file mode 100644
index 2c4628416..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Compound_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Compound;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect Compound_Roo_ToString {
-    
-    public String Compound.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Container.java b/src/main/java/com/labsynch/labseer/domain/Container.java
index 173451957..0515085ec 100755
--- a/src/main/java/com/labsynch/labseer/domain/Container.java
+++ b/src/main/java/com/labsynch/labseer/domain/Container.java
@@ -12,12 +12,15 @@
 import javax.persistence.CascadeType;
 import javax.persistence.ColumnResult;
 import javax.persistence.ConstructorResult;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
 import javax.persistence.OneToMany;
 import javax.persistence.SqlResultSetMapping;
 import javax.persistence.TypedQuery;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -31,6 +34,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord(finders = { "findContainersByLsTypeEqualsAndLsKindEquals", "findContainersByLsTypeEquals", "findContainersByLsKindEquals" })
@@ -331,4 +336,195 @@ public static TypedQuery<Container> findContainerByLabelTextAndLabelTypeKind(Str
         return q;
 	}
 
+
+	public Long getLocationId() {
+        return this.locationId;
+    }
+
+	public void setLocationId(Long locationId) {
+        this.locationId = locationId;
+    }
+
+	public Integer getRowIndex() {
+        return this.rowIndex;
+    }
+
+	public void setRowIndex(Integer rowIndex) {
+        this.rowIndex = rowIndex;
+    }
+
+	public Integer getColumnIndex() {
+        return this.columnIndex;
+    }
+
+	public void setColumnIndex(Integer columnIndex) {
+        this.columnIndex = columnIndex;
+    }
+
+	public Set<ContainerLabel> getLsLabels() {
+        return this.lsLabels;
+    }
+
+	public void setLsLabels(Set<ContainerLabel> lsLabels) {
+        this.lsLabels = lsLabels;
+    }
+
+	public Set<ContainerState> getLsStates() {
+        return this.lsStates;
+    }
+
+	public void setLsStates(Set<ContainerState> lsStates) {
+        this.lsStates = lsStates;
+    }
+
+	public Set<ItxContainerContainer> getFirstContainers() {
+        return this.firstContainers;
+    }
+
+	public void setFirstContainers(Set<ItxContainerContainer> firstContainers) {
+        this.firstContainers = firstContainers;
+    }
+
+	public Set<ItxContainerContainer> getSecondContainers() {
+        return this.secondContainers;
+    }
+
+	public void setSecondContainers(Set<ItxContainerContainer> secondContainers) {
+        this.secondContainers = secondContainers;
+    }
+
+	public Set<ItxSubjectContainer> getSubjects() {
+        return this.subjects;
+    }
+
+	public void setSubjects(Set<ItxSubjectContainer> subjects) {
+        this.subjects = subjects;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("locationId", "rowIndex", "columnIndex", "lsLabels", "lsStates", "firstContainers", "secondContainers", "subjects");
+
+	public static List<Container> findAllContainers(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM Container o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, Container.class).getResultList();
+    }
+
+	public static List<Container> findContainerEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM Container o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, Container.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static Long countFindContainersByLsKindEquals(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = Container.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Container AS o WHERE o.lsKind = :lsKind", Long.class);
+        q.setParameter("lsKind", lsKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindContainersByLsTypeEquals(String lsType) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = Container.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Container AS o WHERE o.lsType = :lsType", Long.class);
+        q.setParameter("lsType", lsType);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindContainersByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = Container.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Container AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<Container> findContainersByLsKindEquals(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = Container.entityManager();
+        TypedQuery<Container> q = em.createQuery("SELECT o FROM Container AS o WHERE o.lsKind = :lsKind", Container.class);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<Container> findContainersByLsKindEquals(String lsKind, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = Container.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Container AS o WHERE o.lsKind = :lsKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Container> q = em.createQuery(queryBuilder.toString(), Container.class);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<Container> findContainersByLsTypeEquals(String lsType) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = Container.entityManager();
+        TypedQuery<Container> q = em.createQuery("SELECT o FROM Container AS o WHERE o.lsType = :lsType", Container.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<Container> findContainersByLsTypeEquals(String lsType, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = Container.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Container AS o WHERE o.lsType = :lsType");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Container> q = em.createQuery(queryBuilder.toString(), Container.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<Container> findContainersByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = Container.entityManager();
+        TypedQuery<Container> q = em.createQuery("SELECT o FROM Container AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Container.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<Container> findContainersByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = Container.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Container AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Container> q = em.createQuery(queryBuilder.toString(), Container.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerKind.java b/src/main/java/com/labsynch/labseer/domain/ContainerKind.java
index 290b000b6..083a8f8a9 100755
--- a/src/main/java/com/labsynch/labseer/domain/ContainerKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ContainerKind.java
@@ -1,19 +1,34 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.PersistenceContext;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord(sequenceName = "CONTAINER_KIND_PKSEQ", finders={"findContainerKindsByKindNameEqualsAndLsType"})
@@ -59,4 +74,189 @@ public ContainerKind merge() {
 		return merged;
 	}
 
+
+	public static Long countFindContainerKindsByKindNameEqualsAndLsType(String kindName, ContainerType lsType) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = ContainerKind.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ContainerKind> findContainerKindsByKindNameEqualsAndLsType(String kindName, ContainerType lsType) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = ContainerKind.entityManager();
+        TypedQuery<ContainerKind> q = em.createQuery("SELECT o FROM ContainerKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", ContainerKind.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<ContainerKind> findContainerKindsByKindNameEqualsAndLsType(String kindName, ContainerType lsType, String sortFieldName, String sortOrder) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = ContainerKind.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ContainerKind> q = em.createQuery(queryBuilder.toString(), ContainerKind.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	@Id
+    @SequenceGenerator(name = "containerKindGen", sequenceName = "CONTAINER_KIND_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "containerKindGen")
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ContainerKind fromJsonToContainerKind(String json) {
+        return new JSONDeserializer<ContainerKind>()
+        .use(null, ContainerKind.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ContainerKind> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ContainerKind> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ContainerKind> fromJsonArrayToContainerKinds(String json) {
+        return new JSONDeserializer<List<ContainerKind>>()
+        .use("values", ContainerKind.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName", "lsTypeAndKind", "entityManager");
+
+	public static long countContainerKinds() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ContainerKind o", Long.class).getSingleResult();
+    }
+
+	public static List<ContainerKind> findAllContainerKinds() {
+        return entityManager().createQuery("SELECT o FROM ContainerKind o", ContainerKind.class).getResultList();
+    }
+
+	public static List<ContainerKind> findAllContainerKinds(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ContainerKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ContainerKind.class).getResultList();
+    }
+
+	public static ContainerKind findContainerKind(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ContainerKind.class, id);
+    }
+
+	public static List<ContainerKind> findContainerKindEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ContainerKind o", ContainerKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ContainerKind> findContainerKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ContainerKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ContainerKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            ContainerKind attached = ContainerKind.findContainerKind(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	public ContainerType getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(ContainerType lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getKindName() {
+        return this.kindName;
+    }
+
+	public void setKindName(String kindName) {
+        this.kindName = kindName;
+    }
+
+	public String getLsTypeAndKind() {
+        return this.lsTypeAndKind;
+    }
+
+	public void setLsTypeAndKind(String lsTypeAndKind) {
+        this.lsTypeAndKind = lsTypeAndKind;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerKind_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ContainerKind_Roo_Configurable.aj
deleted file mode 100755
index 1b6dd3eb3..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerKind_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerKind;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ContainerKind_Roo_Configurable {
-    
-    declare @type: ContainerKind: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerKind_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ContainerKind_Roo_Finder.aj
deleted file mode 100644
index 62ed109f9..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerKind_Roo_Finder.aj
+++ /dev/null
@@ -1,50 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerKind;
-import com.labsynch.labseer.domain.ContainerType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ContainerKind_Roo_Finder {
-    
-    public static Long ContainerKind.countFindContainerKindsByKindNameEqualsAndLsType(String kindName, ContainerType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = ContainerKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ContainerKind> ContainerKind.findContainerKindsByKindNameEqualsAndLsType(String kindName, ContainerType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = ContainerKind.entityManager();
-        TypedQuery<ContainerKind> q = em.createQuery("SELECT o FROM ContainerKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", ContainerKind.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<ContainerKind> ContainerKind.findContainerKindsByKindNameEqualsAndLsType(String kindName, ContainerType lsType, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = ContainerKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ContainerKind> q = em.createQuery(queryBuilder.toString(), ContainerKind.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerKind_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ContainerKind_Roo_JavaBean.aj
deleted file mode 100755
index 8e06b6f6e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerKind_Roo_JavaBean.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerKind;
-import com.labsynch.labseer.domain.ContainerType;
-
-privileged aspect ContainerKind_Roo_JavaBean {
-    
-    public ContainerType ContainerKind.getLsType() {
-        return this.lsType;
-    }
-    
-    public void ContainerKind.setLsType(ContainerType lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String ContainerKind.getKindName() {
-        return this.kindName;
-    }
-    
-    public void ContainerKind.setKindName(String kindName) {
-        this.kindName = kindName;
-    }
-    
-    public String ContainerKind.getLsTypeAndKind() {
-        return this.lsTypeAndKind;
-    }
-    
-    public void ContainerKind.setLsTypeAndKind(String lsTypeAndKind) {
-        this.lsTypeAndKind = lsTypeAndKind;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerKind_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ContainerKind_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 0b4ec673c..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerKind_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,76 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerKind;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ContainerKind_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ContainerKind.fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName", "lsTypeAndKind", "entityManager");
-    
-    public static long ContainerKind.countContainerKinds() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ContainerKind o", Long.class).getSingleResult();
-    }
-    
-    public static List<ContainerKind> ContainerKind.findAllContainerKinds() {
-        return entityManager().createQuery("SELECT o FROM ContainerKind o", ContainerKind.class).getResultList();
-    }
-    
-    public static List<ContainerKind> ContainerKind.findAllContainerKinds(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ContainerKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ContainerKind.class).getResultList();
-    }
-    
-    public static ContainerKind ContainerKind.findContainerKind(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ContainerKind.class, id);
-    }
-    
-    public static List<ContainerKind> ContainerKind.findContainerKindEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ContainerKind o", ContainerKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ContainerKind> ContainerKind.findContainerKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ContainerKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ContainerKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void ContainerKind.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            ContainerKind attached = ContainerKind.findContainerKind(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void ContainerKind.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void ContainerKind.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerKind_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ContainerKind_Roo_Jpa_Entity.aj
deleted file mode 100755
index e29534b86..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerKind_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerKind;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
-
-privileged aspect ContainerKind_Roo_Jpa_Entity {
-    
-    declare @type: ContainerKind: @Entity;
-    
-    @Id
-    @SequenceGenerator(name = "containerKindGen", sequenceName = "CONTAINER_KIND_PKSEQ")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "containerKindGen")
-    @Column(name = "id")
-    private Long ContainerKind.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer ContainerKind.version;
-    
-    public Long ContainerKind.getId() {
-        return this.id;
-    }
-    
-    public void ContainerKind.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer ContainerKind.getVersion() {
-        return this.version;
-    }
-    
-    public void ContainerKind.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerKind_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/ContainerKind_Roo_Json.aj
deleted file mode 100755
index d90f76a9b..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerKind_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerKind;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ContainerKind_Roo_Json {
-    
-    public String ContainerKind.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ContainerKind.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ContainerKind ContainerKind.fromJsonToContainerKind(String json) {
-        return new JSONDeserializer<ContainerKind>()
-        .use(null, ContainerKind.class).deserialize(json);
-    }
-    
-    public static String ContainerKind.toJsonArray(Collection<ContainerKind> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ContainerKind.toJsonArray(Collection<ContainerKind> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ContainerKind> ContainerKind.fromJsonArrayToContainerKinds(String json) {
-        return new JSONDeserializer<List<ContainerKind>>()
-        .use("values", ContainerKind.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerKind_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ContainerKind_Roo_ToString.aj
deleted file mode 100755
index f06d057ab..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerKind_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerKind;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ContainerKind_Roo_ToString {
-    
-    public String ContainerKind.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerLabel.java b/src/main/java/com/labsynch/labseer/domain/ContainerLabel.java
index 541765090..ec0ded8b5 100755
--- a/src/main/java/com/labsynch/labseer/domain/ContainerLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/ContainerLabel.java
@@ -6,21 +6,25 @@
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
-
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
-
+import org.springframework.transaction.annotation.Transactional;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -141,4 +145,190 @@ public static ContainerLabel pickBestLabel(Collection<ContainerLabel> labels) {
 			}
 		}
 	}
+
+	public Container getContainer() {
+        return this.container;
+    }
+
+	public void setContainer(Container container) {
+        this.container = container;
+    }
+
+	public static Long countFindContainerLabelsByContainerAndIgnoredNot(Container container, boolean ignored) {
+        if (container == null) throw new IllegalArgumentException("The container argument is required");
+        EntityManager em = ContainerLabel.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerLabel AS o WHERE o.container = :container AND o.ignored IS NOT :ignored", Long.class);
+        q.setParameter("container", container);
+        q.setParameter("ignored", ignored);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindContainerLabelsByLabelTextEqualsAndIgnoredNot(String labelText, boolean ignored) {
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        EntityManager em = ContainerLabel.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored", Long.class);
+        q.setParameter("labelText", labelText);
+        q.setParameter("ignored", ignored);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindContainerLabelsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = ContainerLabel.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerLabel AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindContainerLabelsByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot(String lsType, String labelText, boolean ignored) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        EntityManager em = ContainerLabel.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerLabel AS o WHERE o.lsType = :lsType  AND o.labelText = :labelText  AND o.ignored IS NOT :ignored", Long.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("labelText", labelText);
+        q.setParameter("ignored", ignored);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ContainerLabel> findContainerLabelsByContainerAndIgnoredNot(Container container, boolean ignored, String sortFieldName, String sortOrder) {
+        if (container == null) throw new IllegalArgumentException("The container argument is required");
+        EntityManager em = ContainerLabel.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerLabel AS o WHERE o.container = :container AND o.ignored IS NOT :ignored");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ContainerLabel> q = em.createQuery(queryBuilder.toString(), ContainerLabel.class);
+        q.setParameter("container", container);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<ContainerLabel> findContainerLabelsByLabelTextEqualsAndIgnoredNot(String labelText, boolean ignored, String sortFieldName, String sortOrder) {
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        EntityManager em = ContainerLabel.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ContainerLabel> q = em.createQuery(queryBuilder.toString(), ContainerLabel.class);
+        q.setParameter("labelText", labelText);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<ContainerLabel> findContainerLabelsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = ContainerLabel.entityManager();
+        TypedQuery<ContainerLabel> q = em.createQuery("SELECT o FROM ContainerLabel AS o WHERE o.lsTransaction = :lsTransaction", ContainerLabel.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<ContainerLabel> findContainerLabelsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = ContainerLabel.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerLabel AS o WHERE o.lsTransaction = :lsTransaction");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ContainerLabel> q = em.createQuery(queryBuilder.toString(), ContainerLabel.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<ContainerLabel> findContainerLabelsByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot(String lsType, String labelText, boolean ignored) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        EntityManager em = ContainerLabel.entityManager();
+        TypedQuery<ContainerLabel> q = em.createQuery("SELECT o FROM ContainerLabel AS o WHERE o.lsType = :lsType  AND o.labelText = :labelText  AND o.ignored IS NOT :ignored", ContainerLabel.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("labelText", labelText);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<ContainerLabel> findContainerLabelsByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot(String lsType, String labelText, boolean ignored, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        EntityManager em = ContainerLabel.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerLabel AS o WHERE o.lsType = :lsType  AND o.labelText = :labelText  AND o.ignored IS NOT :ignored");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ContainerLabel> q = em.createQuery(queryBuilder.toString(), ContainerLabel.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("labelText", labelText);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("container");
+
+	public static long countContainerLabels() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ContainerLabel o", Long.class).getSingleResult();
+    }
+
+	public static List<ContainerLabel> findAllContainerLabels() {
+        return entityManager().createQuery("SELECT o FROM ContainerLabel o", ContainerLabel.class).getResultList();
+    }
+
+	public static List<ContainerLabel> findAllContainerLabels(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ContainerLabel o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ContainerLabel.class).getResultList();
+    }
+
+	public static ContainerLabel findContainerLabel(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ContainerLabel.class, id);
+    }
+
+	public static List<ContainerLabel> findContainerLabelEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ContainerLabel o", ContainerLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ContainerLabel> findContainerLabelEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ContainerLabel o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ContainerLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public ContainerLabel merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ContainerLabel merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public ContainerLabel() {
+        super();
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerLabel_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ContainerLabel_Roo_Configurable.aj
deleted file mode 100755
index 50a426763..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerLabel_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerLabel;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ContainerLabel_Roo_Configurable {
-    
-    declare @type: ContainerLabel: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerLabel_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ContainerLabel_Roo_Finder.aj
deleted file mode 100755
index ddfce62b2..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerLabel_Roo_Finder.aj
+++ /dev/null
@@ -1,134 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ContainerLabel;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ContainerLabel_Roo_Finder {
-    
-    public static Long ContainerLabel.countFindContainerLabelsByContainerAndIgnoredNot(Container container, boolean ignored) {
-        if (container == null) throw new IllegalArgumentException("The container argument is required");
-        EntityManager em = ContainerLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerLabel AS o WHERE o.container = :container AND o.ignored IS NOT :ignored", Long.class);
-        q.setParameter("container", container);
-        q.setParameter("ignored", ignored);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ContainerLabel.countFindContainerLabelsByLabelTextEqualsAndIgnoredNot(String labelText, boolean ignored) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        EntityManager em = ContainerLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored", Long.class);
-        q.setParameter("labelText", labelText);
-        q.setParameter("ignored", ignored);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ContainerLabel.countFindContainerLabelsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = ContainerLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerLabel AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ContainerLabel.countFindContainerLabelsByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot(String lsType, String labelText, boolean ignored) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        EntityManager em = ContainerLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerLabel AS o WHERE o.lsType = :lsType  AND o.labelText = :labelText  AND o.ignored IS NOT :ignored", Long.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("labelText", labelText);
-        q.setParameter("ignored", ignored);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ContainerLabel> ContainerLabel.findContainerLabelsByContainerAndIgnoredNot(Container container, boolean ignored, String sortFieldName, String sortOrder) {
-        if (container == null) throw new IllegalArgumentException("The container argument is required");
-        EntityManager em = ContainerLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerLabel AS o WHERE o.container = :container AND o.ignored IS NOT :ignored");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ContainerLabel> q = em.createQuery(queryBuilder.toString(), ContainerLabel.class);
-        q.setParameter("container", container);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<ContainerLabel> ContainerLabel.findContainerLabelsByLabelTextEqualsAndIgnoredNot(String labelText, boolean ignored, String sortFieldName, String sortOrder) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        EntityManager em = ContainerLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ContainerLabel> q = em.createQuery(queryBuilder.toString(), ContainerLabel.class);
-        q.setParameter("labelText", labelText);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<ContainerLabel> ContainerLabel.findContainerLabelsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = ContainerLabel.entityManager();
-        TypedQuery<ContainerLabel> q = em.createQuery("SELECT o FROM ContainerLabel AS o WHERE o.lsTransaction = :lsTransaction", ContainerLabel.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<ContainerLabel> ContainerLabel.findContainerLabelsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = ContainerLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerLabel AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ContainerLabel> q = em.createQuery(queryBuilder.toString(), ContainerLabel.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<ContainerLabel> ContainerLabel.findContainerLabelsByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot(String lsType, String labelText, boolean ignored) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        EntityManager em = ContainerLabel.entityManager();
-        TypedQuery<ContainerLabel> q = em.createQuery("SELECT o FROM ContainerLabel AS o WHERE o.lsType = :lsType  AND o.labelText = :labelText  AND o.ignored IS NOT :ignored", ContainerLabel.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("labelText", labelText);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<ContainerLabel> ContainerLabel.findContainerLabelsByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot(String lsType, String labelText, boolean ignored, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        EntityManager em = ContainerLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerLabel AS o WHERE o.lsType = :lsType  AND o.labelText = :labelText  AND o.ignored IS NOT :ignored");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ContainerLabel> q = em.createQuery(queryBuilder.toString(), ContainerLabel.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("labelText", labelText);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerLabel_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ContainerLabel_Roo_JavaBean.aj
deleted file mode 100755
index 74b9cbf25..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerLabel_Roo_JavaBean.aj
+++ /dev/null
@@ -1,19 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ContainerLabel;
-
-privileged aspect ContainerLabel_Roo_JavaBean {
-    
-    public Container ContainerLabel.getContainer() {
-        return this.container;
-    }
-    
-    public void ContainerLabel.setContainer(Container container) {
-        this.container = container;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerLabel_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ContainerLabel_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index fe0e2aa07..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerLabel_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerLabel;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ContainerLabel_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ContainerLabel.fieldNames4OrderClauseFilter = java.util.Arrays.asList("container");
-    
-    public static long ContainerLabel.countContainerLabels() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ContainerLabel o", Long.class).getSingleResult();
-    }
-    
-    public static List<ContainerLabel> ContainerLabel.findAllContainerLabels() {
-        return entityManager().createQuery("SELECT o FROM ContainerLabel o", ContainerLabel.class).getResultList();
-    }
-    
-    public static List<ContainerLabel> ContainerLabel.findAllContainerLabels(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ContainerLabel o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ContainerLabel.class).getResultList();
-    }
-    
-    public static ContainerLabel ContainerLabel.findContainerLabel(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ContainerLabel.class, id);
-    }
-    
-    public static List<ContainerLabel> ContainerLabel.findContainerLabelEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ContainerLabel o", ContainerLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ContainerLabel> ContainerLabel.findContainerLabelEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ContainerLabel o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ContainerLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public ContainerLabel ContainerLabel.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ContainerLabel merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerLabel_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ContainerLabel_Roo_Jpa_Entity.aj
deleted file mode 100755
index bd5ad6355..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerLabel_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,17 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerLabel;
-import javax.persistence.Entity;
-
-privileged aspect ContainerLabel_Roo_Jpa_Entity {
-    
-    declare @type: ContainerLabel: @Entity;
-    
-    public ContainerLabel.new() {
-        super();
-    }
-
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerLabel_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ContainerLabel_Roo_ToString.aj
deleted file mode 100755
index 8b8e9daf9..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerLabel_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerLabel;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ContainerLabel_Roo_ToString {
-    
-    public String ContainerLabel.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerState.java b/src/main/java/com/labsynch/labseer/domain/ContainerState.java
index 90eb3bd81..5e5b8cfb4 100755
--- a/src/main/java/com/labsynch/labseer/domain/ContainerState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ContainerState.java
@@ -10,6 +10,7 @@
 import java.util.Set;
 
 import javax.persistence.CascadeType;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
@@ -18,7 +19,9 @@
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -31,6 +34,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -185,4 +190,176 @@ public static TypedQuery<ContainerState> findContainerStatesByContainerCodeNameA
 		return q;
 	}
 	
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public ContainerState() {
+        super();
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("container", "lsValues");
+
+	public static long countContainerStates() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ContainerState o", Long.class).getSingleResult();
+    }
+
+	public static List<ContainerState> findAllContainerStates() {
+        return entityManager().createQuery("SELECT o FROM ContainerState o", ContainerState.class).getResultList();
+    }
+
+	public static List<ContainerState> findAllContainerStates(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ContainerState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ContainerState.class).getResultList();
+    }
+
+	public static ContainerState findContainerState(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ContainerState.class, id);
+    }
+
+	public static List<ContainerState> findContainerStateEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ContainerState o", ContainerState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ContainerState> findContainerStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ContainerState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ContainerState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public ContainerState merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ContainerState merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public Container getContainer() {
+        return this.container;
+    }
+
+	public void setContainer(Container container) {
+        this.container = container;
+    }
+
+	public Set<ContainerValue> getLsValues() {
+        return this.lsValues;
+    }
+
+	public void setLsValues(Set<ContainerValue> lsValues) {
+        this.lsValues = lsValues;
+    }
+
+	public static Long countFindContainerStatesByContainer(Container container) {
+        if (container == null) throw new IllegalArgumentException("The container argument is required");
+        EntityManager em = ContainerState.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerState AS o WHERE o.container = :container", Long.class);
+        q.setParameter("container", container);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindContainerStatesByContainerAndLsKindEqualsAndIgnoredNot(Container container, String lsKind, boolean ignored) {
+        if (container == null) throw new IllegalArgumentException("The container argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = ContainerState.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerState AS o WHERE o.container = :container AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored", Long.class);
+        q.setParameter("container", container);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("ignored", ignored);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindContainerStatesByIgnoredNot(boolean ignored) {
+        EntityManager em = ContainerState.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerState AS o WHERE o.ignored IS NOT :ignored", Long.class);
+        q.setParameter("ignored", ignored);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ContainerState> findContainerStatesByContainer(Container container) {
+        if (container == null) throw new IllegalArgumentException("The container argument is required");
+        EntityManager em = ContainerState.entityManager();
+        TypedQuery<ContainerState> q = em.createQuery("SELECT o FROM ContainerState AS o WHERE o.container = :container", ContainerState.class);
+        q.setParameter("container", container);
+        return q;
+    }
+
+	public static TypedQuery<ContainerState> findContainerStatesByContainer(Container container, String sortFieldName, String sortOrder) {
+        if (container == null) throw new IllegalArgumentException("The container argument is required");
+        EntityManager em = ContainerState.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerState AS o WHERE o.container = :container");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ContainerState> q = em.createQuery(queryBuilder.toString(), ContainerState.class);
+        q.setParameter("container", container);
+        return q;
+    }
+
+	public static TypedQuery<ContainerState> findContainerStatesByContainerAndLsKindEqualsAndIgnoredNot(Container container, String lsKind, boolean ignored) {
+        if (container == null) throw new IllegalArgumentException("The container argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = ContainerState.entityManager();
+        TypedQuery<ContainerState> q = em.createQuery("SELECT o FROM ContainerState AS o WHERE o.container = :container AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored", ContainerState.class);
+        q.setParameter("container", container);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<ContainerState> findContainerStatesByContainerAndLsKindEqualsAndIgnoredNot(Container container, String lsKind, boolean ignored, String sortFieldName, String sortOrder) {
+        if (container == null) throw new IllegalArgumentException("The container argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = ContainerState.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerState AS o WHERE o.container = :container AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ContainerState> q = em.createQuery(queryBuilder.toString(), ContainerState.class);
+        q.setParameter("container", container);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<ContainerState> findContainerStatesByIgnoredNot(boolean ignored) {
+        EntityManager em = ContainerState.entityManager();
+        TypedQuery<ContainerState> q = em.createQuery("SELECT o FROM ContainerState AS o WHERE o.ignored IS NOT :ignored", ContainerState.class);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<ContainerState> findContainerStatesByIgnoredNot(boolean ignored, String sortFieldName, String sortOrder) {
+        EntityManager em = ContainerState.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerState AS o WHERE o.ignored IS NOT :ignored");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ContainerState> q = em.createQuery(queryBuilder.toString(), ContainerState.class);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerState_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ContainerState_Roo_Configurable.aj
deleted file mode 100755
index 63d83b390..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerState_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerState;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ContainerState_Roo_Configurable {
-    
-    declare @type: ContainerState: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerState_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ContainerState_Roo_Finder.aj
deleted file mode 100755
index 42c502d09..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerState_Roo_Finder.aj
+++ /dev/null
@@ -1,112 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ContainerState;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ContainerState_Roo_Finder {
-    
-    public static Long ContainerState.countFindContainerStatesByContainer(Container container) {
-        if (container == null) throw new IllegalArgumentException("The container argument is required");
-        EntityManager em = ContainerState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerState AS o WHERE o.container = :container", Long.class);
-        q.setParameter("container", container);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ContainerState.countFindContainerStatesByContainerAndLsKindEqualsAndIgnoredNot(Container container, String lsKind, boolean ignored) {
-        if (container == null) throw new IllegalArgumentException("The container argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = ContainerState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerState AS o WHERE o.container = :container AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored", Long.class);
-        q.setParameter("container", container);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("ignored", ignored);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ContainerState.countFindContainerStatesByIgnoredNot(boolean ignored) {
-        EntityManager em = ContainerState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerState AS o WHERE o.ignored IS NOT :ignored", Long.class);
-        q.setParameter("ignored", ignored);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ContainerState> ContainerState.findContainerStatesByContainer(Container container) {
-        if (container == null) throw new IllegalArgumentException("The container argument is required");
-        EntityManager em = ContainerState.entityManager();
-        TypedQuery<ContainerState> q = em.createQuery("SELECT o FROM ContainerState AS o WHERE o.container = :container", ContainerState.class);
-        q.setParameter("container", container);
-        return q;
-    }
-    
-    public static TypedQuery<ContainerState> ContainerState.findContainerStatesByContainer(Container container, String sortFieldName, String sortOrder) {
-        if (container == null) throw new IllegalArgumentException("The container argument is required");
-        EntityManager em = ContainerState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerState AS o WHERE o.container = :container");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ContainerState> q = em.createQuery(queryBuilder.toString(), ContainerState.class);
-        q.setParameter("container", container);
-        return q;
-    }
-    
-    public static TypedQuery<ContainerState> ContainerState.findContainerStatesByContainerAndLsKindEqualsAndIgnoredNot(Container container, String lsKind, boolean ignored) {
-        if (container == null) throw new IllegalArgumentException("The container argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = ContainerState.entityManager();
-        TypedQuery<ContainerState> q = em.createQuery("SELECT o FROM ContainerState AS o WHERE o.container = :container AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored", ContainerState.class);
-        q.setParameter("container", container);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<ContainerState> ContainerState.findContainerStatesByContainerAndLsKindEqualsAndIgnoredNot(Container container, String lsKind, boolean ignored, String sortFieldName, String sortOrder) {
-        if (container == null) throw new IllegalArgumentException("The container argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = ContainerState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerState AS o WHERE o.container = :container AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ContainerState> q = em.createQuery(queryBuilder.toString(), ContainerState.class);
-        q.setParameter("container", container);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<ContainerState> ContainerState.findContainerStatesByIgnoredNot(boolean ignored) {
-        EntityManager em = ContainerState.entityManager();
-        TypedQuery<ContainerState> q = em.createQuery("SELECT o FROM ContainerState AS o WHERE o.ignored IS NOT :ignored", ContainerState.class);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<ContainerState> ContainerState.findContainerStatesByIgnoredNot(boolean ignored, String sortFieldName, String sortOrder) {
-        EntityManager em = ContainerState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerState AS o WHERE o.ignored IS NOT :ignored");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ContainerState> q = em.createQuery(queryBuilder.toString(), ContainerState.class);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerState_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ContainerState_Roo_JavaBean.aj
deleted file mode 100755
index 76d645355..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerState_Roo_JavaBean.aj
+++ /dev/null
@@ -1,29 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ContainerState;
-import com.labsynch.labseer.domain.ContainerValue;
-import java.util.Set;
-
-privileged aspect ContainerState_Roo_JavaBean {
-    
-    public Container ContainerState.getContainer() {
-        return this.container;
-    }
-    
-    public void ContainerState.setContainer(Container container) {
-        this.container = container;
-    }
-    
-    public Set<ContainerValue> ContainerState.getLsValues() {
-        return this.lsValues;
-    }
-    
-    public void ContainerState.setLsValues(Set<ContainerValue> lsValues) {
-        this.lsValues = lsValues;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerState_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ContainerState_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index b1a502763..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerState_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerState;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ContainerState_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ContainerState.fieldNames4OrderClauseFilter = java.util.Arrays.asList("container", "lsValues");
-    
-    public static long ContainerState.countContainerStates() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ContainerState o", Long.class).getSingleResult();
-    }
-    
-    public static List<ContainerState> ContainerState.findAllContainerStates() {
-        return entityManager().createQuery("SELECT o FROM ContainerState o", ContainerState.class).getResultList();
-    }
-    
-    public static List<ContainerState> ContainerState.findAllContainerStates(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ContainerState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ContainerState.class).getResultList();
-    }
-    
-    public static ContainerState ContainerState.findContainerState(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ContainerState.class, id);
-    }
-    
-    public static List<ContainerState> ContainerState.findContainerStateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ContainerState o", ContainerState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ContainerState> ContainerState.findContainerStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ContainerState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ContainerState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public ContainerState ContainerState.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ContainerState merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerState_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ContainerState_Roo_Jpa_Entity.aj
deleted file mode 100755
index 6f50050d4..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerState_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,17 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerState;
-import javax.persistence.Entity;
-
-privileged aspect ContainerState_Roo_Jpa_Entity {
-    
-    declare @type: ContainerState: @Entity;
-    
-    public ContainerState.new() {
-        super();
-    }
-
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerState_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ContainerState_Roo_ToString.aj
deleted file mode 100755
index 39bd8a0ed..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerState_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerState;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ContainerState_Roo_ToString {
-    
-    public String ContainerState.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerType.java b/src/main/java/com/labsynch/labseer/domain/ContainerType.java
index 1185bb478..cbbbcabfb 100755
--- a/src/main/java/com/labsynch/labseer/domain/ContainerType.java
+++ b/src/main/java/com/labsynch/labseer/domain/ContainerType.java
@@ -1,14 +1,32 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord(sequenceName = "CONTAINER_TYPE_PKSEQ" , finders = { "findContainerTypesByTypeNameEquals" })
@@ -19,4 +37,190 @@ public class ContainerType {
     @Column(unique = true)
     @Size(max = 128)
     private String typeName;
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ContainerType fromJsonToContainerType(String json) {
+        return new JSONDeserializer<ContainerType>()
+        .use(null, ContainerType.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ContainerType> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ContainerType> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ContainerType> fromJsonArrayToContainerTypes(String json) {
+        return new JSONDeserializer<List<ContainerType>>()
+        .use("values", ContainerType.class).deserialize(json);
+    }
+
+	public static Long countFindContainerTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = ContainerType.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerType AS o WHERE o.typeName = :typeName", Long.class);
+        q.setParameter("typeName", typeName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ContainerType> findContainerTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = ContainerType.entityManager();
+        TypedQuery<ContainerType> q = em.createQuery("SELECT o FROM ContainerType AS o WHERE o.typeName = :typeName", ContainerType.class);
+        q.setParameter("typeName", typeName);
+        return q;
+    }
+
+	public static TypedQuery<ContainerType> findContainerTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = ContainerType.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerType AS o WHERE o.typeName = :typeName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ContainerType> q = em.createQuery(queryBuilder.toString(), ContainerType.class);
+        q.setParameter("typeName", typeName);
+        return q;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@Id
+    @SequenceGenerator(name = "containerTypeGen", sequenceName = "CONTAINER_TYPE_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "containerTypeGen")
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new ContainerType().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countContainerTypes() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ContainerType o", Long.class).getSingleResult();
+    }
+
+	public static List<ContainerType> findAllContainerTypes() {
+        return entityManager().createQuery("SELECT o FROM ContainerType o", ContainerType.class).getResultList();
+    }
+
+	public static List<ContainerType> findAllContainerTypes(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ContainerType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ContainerType.class).getResultList();
+    }
+
+	public static ContainerType findContainerType(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ContainerType.class, id);
+    }
+
+	public static List<ContainerType> findContainerTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ContainerType o", ContainerType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ContainerType> findContainerTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ContainerType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ContainerType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            ContainerType attached = ContainerType.findContainerType(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public ContainerType merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ContainerType merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String getTypeName() {
+        return this.typeName;
+    }
+
+	public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerType_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ContainerType_Roo_Configurable.aj
deleted file mode 100755
index 03af48ad7..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerType_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerType;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ContainerType_Roo_Configurable {
-    
-    declare @type: ContainerType: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerType_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ContainerType_Roo_Finder.aj
deleted file mode 100755
index 04a183dcf..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerType_Roo_Finder.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ContainerType_Roo_Finder {
-    
-    public static Long ContainerType.countFindContainerTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = ContainerType.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerType AS o WHERE o.typeName = :typeName", Long.class);
-        q.setParameter("typeName", typeName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ContainerType> ContainerType.findContainerTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = ContainerType.entityManager();
-        TypedQuery<ContainerType> q = em.createQuery("SELECT o FROM ContainerType AS o WHERE o.typeName = :typeName", ContainerType.class);
-        q.setParameter("typeName", typeName);
-        return q;
-    }
-    
-    public static TypedQuery<ContainerType> ContainerType.findContainerTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = ContainerType.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerType AS o WHERE o.typeName = :typeName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ContainerType> q = em.createQuery(queryBuilder.toString(), ContainerType.class);
-        q.setParameter("typeName", typeName);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerType_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ContainerType_Roo_JavaBean.aj
deleted file mode 100755
index 38e504aed..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerType_Roo_JavaBean.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerType;
-
-privileged aspect ContainerType_Roo_JavaBean {
-    
-    public String ContainerType.getTypeName() {
-        return this.typeName;
-    }
-    
-    public void ContainerType.setTypeName(String typeName) {
-        this.typeName = typeName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerType_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ContainerType_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 8bfe92e01..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerType_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerType;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ContainerType_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager ContainerType.entityManager;
-    
-    public static final List<String> ContainerType.fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName");
-    
-    public static final EntityManager ContainerType.entityManager() {
-        EntityManager em = new ContainerType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long ContainerType.countContainerTypes() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ContainerType o", Long.class).getSingleResult();
-    }
-    
-    public static List<ContainerType> ContainerType.findAllContainerTypes() {
-        return entityManager().createQuery("SELECT o FROM ContainerType o", ContainerType.class).getResultList();
-    }
-    
-    public static List<ContainerType> ContainerType.findAllContainerTypes(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ContainerType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ContainerType.class).getResultList();
-    }
-    
-    public static ContainerType ContainerType.findContainerType(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ContainerType.class, id);
-    }
-    
-    public static List<ContainerType> ContainerType.findContainerTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ContainerType o", ContainerType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ContainerType> ContainerType.findContainerTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ContainerType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ContainerType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void ContainerType.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void ContainerType.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            ContainerType attached = ContainerType.findContainerType(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void ContainerType.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void ContainerType.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public ContainerType ContainerType.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ContainerType merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerType_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ContainerType_Roo_Jpa_Entity.aj
deleted file mode 100755
index 9b3672903..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerType_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
-
-privileged aspect ContainerType_Roo_Jpa_Entity {
-    
-    declare @type: ContainerType: @Entity;
-    
-    @Id
-    @SequenceGenerator(name = "containerTypeGen", sequenceName = "CONTAINER_TYPE_PKSEQ")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "containerTypeGen")
-    @Column(name = "id")
-    private Long ContainerType.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer ContainerType.version;
-    
-    public Long ContainerType.getId() {
-        return this.id;
-    }
-    
-    public void ContainerType.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer ContainerType.getVersion() {
-        return this.version;
-    }
-    
-    public void ContainerType.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerType_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/ContainerType_Roo_Json.aj
deleted file mode 100755
index 7e1bba855..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerType_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerType;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ContainerType_Roo_Json {
-    
-    public String ContainerType.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ContainerType.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ContainerType ContainerType.fromJsonToContainerType(String json) {
-        return new JSONDeserializer<ContainerType>()
-        .use(null, ContainerType.class).deserialize(json);
-    }
-    
-    public static String ContainerType.toJsonArray(Collection<ContainerType> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ContainerType.toJsonArray(Collection<ContainerType> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ContainerType> ContainerType.fromJsonArrayToContainerTypes(String json) {
-        return new JSONDeserializer<List<ContainerType>>()
-        .use("values", ContainerType.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerType_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ContainerType_Roo_ToString.aj
deleted file mode 100755
index 52a2558ed..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerType_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerType;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ContainerType_Roo_ToString {
-    
-    public String ContainerType.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerValue.java b/src/main/java/com/labsynch/labseer/domain/ContainerValue.java
index 97418c749..eff7fd68f 100755
--- a/src/main/java/com/labsynch/labseer/domain/ContainerValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ContainerValue.java
@@ -7,15 +7,17 @@
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
-
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -27,6 +29,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -332,4 +336,99 @@ public static TypedQuery<ContainerValue> findContainerValuesByContainerCodeNameA
 		
 		return q;
     }
+
+	public ContainerState getLsState() {
+        return this.lsState;
+    }
+
+	public void setLsState(ContainerState lsState) {
+        this.lsState = lsState;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static Long countFindContainerValuesByIgnoredNot(boolean ignored) {
+        EntityManager em = ContainerValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerValue AS o WHERE o.ignored IS NOT :ignored", Long.class);
+        q.setParameter("ignored", ignored);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindContainerValuesByLsState(ContainerState lsState) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        EntityManager em = ContainerValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerValue AS o WHERE o.lsState = :lsState", Long.class);
+        q.setParameter("lsState", lsState);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ContainerValue> findContainerValuesByIgnoredNot(boolean ignored) {
+        EntityManager em = ContainerValue.entityManager();
+        TypedQuery<ContainerValue> q = em.createQuery("SELECT o FROM ContainerValue AS o WHERE o.ignored IS NOT :ignored", ContainerValue.class);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<ContainerValue> findContainerValuesByIgnoredNot(boolean ignored, String sortFieldName, String sortOrder) {
+        EntityManager em = ContainerValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerValue AS o WHERE o.ignored IS NOT :ignored");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ContainerValue> q = em.createQuery(queryBuilder.toString(), ContainerValue.class);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<ContainerValue> findContainerValuesByLsState(ContainerState lsState) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        EntityManager em = ContainerValue.entityManager();
+        TypedQuery<ContainerValue> q = em.createQuery("SELECT o FROM ContainerValue AS o WHERE o.lsState = :lsState", ContainerValue.class);
+        q.setParameter("lsState", lsState);
+        return q;
+    }
+
+	public static TypedQuery<ContainerValue> findContainerValuesByLsState(ContainerState lsState, String sortFieldName, String sortOrder) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        EntityManager em = ContainerValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerValue AS o WHERE o.lsState = :lsState");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ContainerValue> q = em.createQuery(queryBuilder.toString(), ContainerValue.class);
+        q.setParameter("lsState", lsState);
+        return q;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsState");
+
+	public static List<ContainerValue> findAllContainerValues(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ContainerValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ContainerValue.class).getResultList();
+    }
+
+	public static List<ContainerValue> findContainerValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ContainerValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ContainerValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerValue_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ContainerValue_Roo_Configurable.aj
deleted file mode 100755
index c11b41adb..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerValue_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerValue;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ContainerValue_Roo_Configurable {
-    
-    declare @type: ContainerValue: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerValue_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ContainerValue_Roo_Finder.aj
deleted file mode 100755
index eb3020648..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerValue_Roo_Finder.aj
+++ /dev/null
@@ -1,72 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerState;
-import com.labsynch.labseer.domain.ContainerValue;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ContainerValue_Roo_Finder {
-    
-    public static Long ContainerValue.countFindContainerValuesByIgnoredNot(boolean ignored) {
-        EntityManager em = ContainerValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerValue AS o WHERE o.ignored IS NOT :ignored", Long.class);
-        q.setParameter("ignored", ignored);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ContainerValue.countFindContainerValuesByLsState(ContainerState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = ContainerValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerValue AS o WHERE o.lsState = :lsState", Long.class);
-        q.setParameter("lsState", lsState);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ContainerValue> ContainerValue.findContainerValuesByIgnoredNot(boolean ignored) {
-        EntityManager em = ContainerValue.entityManager();
-        TypedQuery<ContainerValue> q = em.createQuery("SELECT o FROM ContainerValue AS o WHERE o.ignored IS NOT :ignored", ContainerValue.class);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<ContainerValue> ContainerValue.findContainerValuesByIgnoredNot(boolean ignored, String sortFieldName, String sortOrder) {
-        EntityManager em = ContainerValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerValue AS o WHERE o.ignored IS NOT :ignored");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ContainerValue> q = em.createQuery(queryBuilder.toString(), ContainerValue.class);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<ContainerValue> ContainerValue.findContainerValuesByLsState(ContainerState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = ContainerValue.entityManager();
-        TypedQuery<ContainerValue> q = em.createQuery("SELECT o FROM ContainerValue AS o WHERE o.lsState = :lsState", ContainerValue.class);
-        q.setParameter("lsState", lsState);
-        return q;
-    }
-    
-    public static TypedQuery<ContainerValue> ContainerValue.findContainerValuesByLsState(ContainerState lsState, String sortFieldName, String sortOrder) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = ContainerValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerValue AS o WHERE o.lsState = :lsState");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ContainerValue> q = em.createQuery(queryBuilder.toString(), ContainerValue.class);
-        q.setParameter("lsState", lsState);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerValue_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ContainerValue_Roo_JavaBean.aj
deleted file mode 100755
index 3a57ab748..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerValue_Roo_JavaBean.aj
+++ /dev/null
@@ -1,19 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerState;
-import com.labsynch.labseer.domain.ContainerValue;
-
-privileged aspect ContainerValue_Roo_JavaBean {
-    
-    public ContainerState ContainerValue.getLsState() {
-        return this.lsState;
-    }
-    
-    public void ContainerValue.setLsState(ContainerState lsState) {
-        this.lsState = lsState;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerValue_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ContainerValue_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 902e10b40..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerValue_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerValue;
-import java.util.List;
-
-privileged aspect ContainerValue_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ContainerValue.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsState");
-    
-    public static List<ContainerValue> ContainerValue.findAllContainerValues(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ContainerValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ContainerValue.class).getResultList();
-    }
-    
-    public static List<ContainerValue> ContainerValue.findContainerValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ContainerValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ContainerValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerValue_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ContainerValue_Roo_Jpa_Entity.aj
deleted file mode 100755
index ea7211427..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerValue_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerValue;
-import javax.persistence.Entity;
-
-privileged aspect ContainerValue_Roo_Jpa_Entity {
-    
-    declare @type: ContainerValue: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerValue_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ContainerValue_Roo_ToString.aj
deleted file mode 100755
index 07da469a5..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ContainerValue_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerValue;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ContainerValue_Roo_ToString {
-    
-    public String ContainerValue.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Container_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/Container_Roo_Configurable.aj
deleted file mode 100755
index 7c9bdde05..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Container_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Container;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect Container_Roo_Configurable {
-    
-    declare @type: Container: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Container_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/Container_Roo_Finder.aj
deleted file mode 100644
index 4b2e95737..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Container_Roo_Finder.aj
+++ /dev/null
@@ -1,111 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Container;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect Container_Roo_Finder {
-    
-    public static Long Container.countFindContainersByLsKindEquals(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = Container.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Container AS o WHERE o.lsKind = :lsKind", Long.class);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Container.countFindContainersByLsTypeEquals(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = Container.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Container AS o WHERE o.lsType = :lsType", Long.class);
-        q.setParameter("lsType", lsType);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Container.countFindContainersByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = Container.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Container AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<Container> Container.findContainersByLsKindEquals(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = Container.entityManager();
-        TypedQuery<Container> q = em.createQuery("SELECT o FROM Container AS o WHERE o.lsKind = :lsKind", Container.class);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<Container> Container.findContainersByLsKindEquals(String lsKind, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = Container.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Container AS o WHERE o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Container> q = em.createQuery(queryBuilder.toString(), Container.class);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<Container> Container.findContainersByLsTypeEquals(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = Container.entityManager();
-        TypedQuery<Container> q = em.createQuery("SELECT o FROM Container AS o WHERE o.lsType = :lsType", Container.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<Container> Container.findContainersByLsTypeEquals(String lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = Container.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Container AS o WHERE o.lsType = :lsType");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Container> q = em.createQuery(queryBuilder.toString(), Container.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<Container> Container.findContainersByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = Container.entityManager();
-        TypedQuery<Container> q = em.createQuery("SELECT o FROM Container AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Container.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<Container> Container.findContainersByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = Container.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Container AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Container> q = em.createQuery(queryBuilder.toString(), Container.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Container_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/Container_Roo_JavaBean.aj
deleted file mode 100755
index 5943e05e0..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Container_Roo_JavaBean.aj
+++ /dev/null
@@ -1,79 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ContainerLabel;
-import com.labsynch.labseer.domain.ContainerState;
-import com.labsynch.labseer.domain.ItxContainerContainer;
-import com.labsynch.labseer.domain.ItxSubjectContainer;
-import java.util.Set;
-
-privileged aspect Container_Roo_JavaBean {
-    
-    public Long Container.getLocationId() {
-        return this.locationId;
-    }
-    
-    public void Container.setLocationId(Long locationId) {
-        this.locationId = locationId;
-    }
-    
-    public Integer Container.getRowIndex() {
-        return this.rowIndex;
-    }
-    
-    public void Container.setRowIndex(Integer rowIndex) {
-        this.rowIndex = rowIndex;
-    }
-    
-    public Integer Container.getColumnIndex() {
-        return this.columnIndex;
-    }
-    
-    public void Container.setColumnIndex(Integer columnIndex) {
-        this.columnIndex = columnIndex;
-    }
-    
-    public Set<ContainerLabel> Container.getLsLabels() {
-        return this.lsLabels;
-    }
-    
-    public void Container.setLsLabels(Set<ContainerLabel> lsLabels) {
-        this.lsLabels = lsLabels;
-    }
-    
-    public Set<ContainerState> Container.getLsStates() {
-        return this.lsStates;
-    }
-    
-    public void Container.setLsStates(Set<ContainerState> lsStates) {
-        this.lsStates = lsStates;
-    }
-    
-    public Set<ItxContainerContainer> Container.getFirstContainers() {
-        return this.firstContainers;
-    }
-    
-    public void Container.setFirstContainers(Set<ItxContainerContainer> firstContainers) {
-        this.firstContainers = firstContainers;
-    }
-    
-    public Set<ItxContainerContainer> Container.getSecondContainers() {
-        return this.secondContainers;
-    }
-    
-    public void Container.setSecondContainers(Set<ItxContainerContainer> secondContainers) {
-        this.secondContainers = secondContainers;
-    }
-    
-    public Set<ItxSubjectContainer> Container.getSubjects() {
-        return this.subjects;
-    }
-    
-    public void Container.setSubjects(Set<ItxSubjectContainer> subjects) {
-        this.subjects = subjects;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Container_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/Container_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index ff8fcf1bd..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Container_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Container;
-import java.util.List;
-
-privileged aspect Container_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> Container.fieldNames4OrderClauseFilter = java.util.Arrays.asList("locationId", "rowIndex", "columnIndex", "lsLabels", "lsStates", "firstContainers", "secondContainers", "subjects");
-    
-    public static List<Container> Container.findAllContainers(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM Container o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, Container.class).getResultList();
-    }
-    
-    public static List<Container> Container.findContainerEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM Container o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, Container.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Container_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/Container_Roo_Jpa_Entity.aj
deleted file mode 100755
index 927c70fe8..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Container_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Container;
-import javax.persistence.Entity;
-
-privileged aspect Container_Roo_Jpa_Entity {
-    
-    declare @type: Container: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Container_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/Container_Roo_ToString.aj
deleted file mode 100755
index 58240e660..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Container_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Container;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect Container_Roo_ToString {
-    
-    public String Container.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CorpName.java b/src/main/java/com/labsynch/labseer/domain/CorpName.java
index 81082c617..9e9c8a6d4 100755
--- a/src/main/java/com/labsynch/labseer/domain/CorpName.java
+++ b/src/main/java/com/labsynch/labseer/domain/CorpName.java
@@ -1,13 +1,30 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Version;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord
@@ -22,4 +39,174 @@ public class CorpName {
 
 	private Boolean ignore;
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String getParentCorpName() {
+        return this.parentCorpName;
+    }
+
+	public void setParentCorpName(String parentCorpName) {
+        this.parentCorpName = parentCorpName;
+    }
+
+	public String getComment() {
+        return this.comment;
+    }
+
+	public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+	public Boolean getIgnore() {
+        return this.ignore;
+    }
+
+	public void setIgnore(Boolean ignore) {
+        this.ignore = ignore;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static CorpName fromJsonToCorpName(String json) {
+        return new JSONDeserializer<CorpName>()
+        .use(null, CorpName.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<CorpName> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<CorpName> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<CorpName> fromJsonArrayToCorpNames(String json) {
+        return new JSONDeserializer<List<CorpName>>()
+        .use("values", CorpName.class).deserialize(json);
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("parentCorpName", "comment", "ignore");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new CorpName().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countCorpNames() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM CorpName o", Long.class).getSingleResult();
+    }
+
+	public static List<CorpName> findAllCorpNames() {
+        return entityManager().createQuery("SELECT o FROM CorpName o", CorpName.class).getResultList();
+    }
+
+	public static List<CorpName> findAllCorpNames(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM CorpName o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, CorpName.class).getResultList();
+    }
+
+	public static CorpName findCorpName(Long id) {
+        if (id == null) return null;
+        return entityManager().find(CorpName.class, id);
+    }
+
+	public static List<CorpName> findCorpNameEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM CorpName o", CorpName.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<CorpName> findCorpNameEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM CorpName o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, CorpName.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            CorpName attached = CorpName.findCorpName(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public CorpName merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        CorpName merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/CorpName_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/CorpName_Roo_Configurable.aj
deleted file mode 100644
index 3378d4b70..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CorpName_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CorpName;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect CorpName_Roo_Configurable {
-    
-    declare @type: CorpName: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CorpName_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/CorpName_Roo_JavaBean.aj
deleted file mode 100644
index 6c6f9193f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CorpName_Roo_JavaBean.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CorpName;
-
-privileged aspect CorpName_Roo_JavaBean {
-    
-    public String CorpName.getParentCorpName() {
-        return this.parentCorpName;
-    }
-    
-    public void CorpName.setParentCorpName(String parentCorpName) {
-        this.parentCorpName = parentCorpName;
-    }
-    
-    public String CorpName.getComment() {
-        return this.comment;
-    }
-    
-    public void CorpName.setComment(String comment) {
-        this.comment = comment;
-    }
-    
-    public Boolean CorpName.getIgnore() {
-        return this.ignore;
-    }
-    
-    public void CorpName.setIgnore(Boolean ignore) {
-        this.ignore = ignore;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CorpName_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/CorpName_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 99e646230..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CorpName_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CorpName;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect CorpName_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager CorpName.entityManager;
-    
-    public static final List<String> CorpName.fieldNames4OrderClauseFilter = java.util.Arrays.asList("parentCorpName", "comment", "ignore");
-    
-    public static final EntityManager CorpName.entityManager() {
-        EntityManager em = new CorpName().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long CorpName.countCorpNames() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM CorpName o", Long.class).getSingleResult();
-    }
-    
-    public static List<CorpName> CorpName.findAllCorpNames() {
-        return entityManager().createQuery("SELECT o FROM CorpName o", CorpName.class).getResultList();
-    }
-    
-    public static List<CorpName> CorpName.findAllCorpNames(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM CorpName o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, CorpName.class).getResultList();
-    }
-    
-    public static CorpName CorpName.findCorpName(Long id) {
-        if (id == null) return null;
-        return entityManager().find(CorpName.class, id);
-    }
-    
-    public static List<CorpName> CorpName.findCorpNameEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM CorpName o", CorpName.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<CorpName> CorpName.findCorpNameEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM CorpName o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, CorpName.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void CorpName.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void CorpName.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            CorpName attached = CorpName.findCorpName(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void CorpName.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void CorpName.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public CorpName CorpName.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        CorpName merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CorpName_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/CorpName_Roo_Jpa_Entity.aj
deleted file mode 100644
index 63cd388a4..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CorpName_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CorpName;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect CorpName_Roo_Jpa_Entity {
-    
-    declare @type: CorpName: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long CorpName.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer CorpName.version;
-    
-    public Long CorpName.getId() {
-        return this.id;
-    }
-    
-    public void CorpName.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer CorpName.getVersion() {
-        return this.version;
-    }
-    
-    public void CorpName.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CorpName_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/CorpName_Roo_Json.aj
deleted file mode 100644
index f3e9d1489..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CorpName_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CorpName;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect CorpName_Roo_Json {
-    
-    public String CorpName.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String CorpName.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static CorpName CorpName.fromJsonToCorpName(String json) {
-        return new JSONDeserializer<CorpName>()
-        .use(null, CorpName.class).deserialize(json);
-    }
-    
-    public static String CorpName.toJsonArray(Collection<CorpName> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String CorpName.toJsonArray(Collection<CorpName> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<CorpName> CorpName.fromJsonArrayToCorpNames(String json) {
-        return new JSONDeserializer<List<CorpName>>()
-        .use("values", CorpName.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CorpName_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/CorpName_Roo_ToString.aj
deleted file mode 100644
index 0e425f176..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CorpName_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CorpName;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect CorpName_Roo_ToString {
-    
-    public String CorpName.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CronJob.java b/src/main/java/com/labsynch/labseer/domain/CronJob.java
index babb0b7cb..4ced4d85d 100644
--- a/src/main/java/com/labsynch/labseer/domain/CronJob.java
+++ b/src/main/java/com/labsynch/labseer/domain/CronJob.java
@@ -1,23 +1,34 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.EntityManager;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -108,4 +119,260 @@ public Integer getVersion() {
 	public void setVersion(Integer version) {
         this.version = version;
     }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "schedule", "scriptType", "scriptFile", "functionName", "scriptJSONData", "active", "ignored", "runUser", "codeName", "lastStartTime", "lastDuration", "lastResultJSON", "numberOfExecutions", "id", "version");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new CronJob().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countCronJobs() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM CronJob o", Long.class).getSingleResult();
+    }
+
+	public static List<CronJob> findAllCronJobs() {
+        return entityManager().createQuery("SELECT o FROM CronJob o", CronJob.class).getResultList();
+    }
+
+	public static List<CronJob> findAllCronJobs(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM CronJob o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, CronJob.class).getResultList();
+    }
+
+	public static CronJob findCronJob(Long id) {
+        if (id == null) return null;
+        return entityManager().find(CronJob.class, id);
+    }
+
+	public static List<CronJob> findCronJobEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM CronJob o", CronJob.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<CronJob> findCronJobEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM CronJob o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, CronJob.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            CronJob attached = CronJob.findCronJob(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public CronJob merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        CronJob merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static CronJob fromJsonToCronJob(String json) {
+        return new JSONDeserializer<CronJob>()
+        .use(null, CronJob.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<CronJob> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<CronJob> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<CronJob> fromJsonArrayToCronJobs(String json) {
+        return new JSONDeserializer<List<CronJob>>()
+        .use("values", CronJob.class).deserialize(json);
+    }
+
+	public String getSchedule() {
+        return this.schedule;
+    }
+
+	public void setSchedule(String schedule) {
+        this.schedule = schedule;
+    }
+
+	public String getScriptType() {
+        return this.scriptType;
+    }
+
+	public void setScriptType(String scriptType) {
+        this.scriptType = scriptType;
+    }
+
+	public String getScriptFile() {
+        return this.scriptFile;
+    }
+
+	public void setScriptFile(String scriptFile) {
+        this.scriptFile = scriptFile;
+    }
+
+	public String getFunctionName() {
+        return this.functionName;
+    }
+
+	public void setFunctionName(String functionName) {
+        this.functionName = functionName;
+    }
+
+	public String getScriptJSONData() {
+        return this.scriptJSONData;
+    }
+
+	public void setScriptJSONData(String scriptJSONData) {
+        this.scriptJSONData = scriptJSONData;
+    }
+
+	public boolean isActive() {
+        return this.active;
+    }
+
+	public void setActive(boolean active) {
+        this.active = active;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public String getRunUser() {
+        return this.runUser;
+    }
+
+	public void setRunUser(String runUser) {
+        this.runUser = runUser;
+    }
+
+	public String getCodeName() {
+        return this.codeName;
+    }
+
+	public void setCodeName(String codeName) {
+        this.codeName = codeName;
+    }
+
+	public Date getLastStartTime() {
+        return this.lastStartTime;
+    }
+
+	public void setLastStartTime(Date lastStartTime) {
+        this.lastStartTime = lastStartTime;
+    }
+
+	public Long getLastDuration() {
+        return this.lastDuration;
+    }
+
+	public void setLastDuration(Long lastDuration) {
+        this.lastDuration = lastDuration;
+    }
+
+	public String getLastResultJSON() {
+        return this.lastResultJSON;
+    }
+
+	public void setLastResultJSON(String lastResultJSON) {
+        this.lastResultJSON = lastResultJSON;
+    }
+
+	public Integer getNumberOfExecutions() {
+        return this.numberOfExecutions;
+    }
+
+	public void setNumberOfExecutions(Integer numberOfExecutions) {
+        this.numberOfExecutions = numberOfExecutions;
+    }
+
+	public static Long countFindCronJobsByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = CronJob.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM CronJob AS o WHERE o.codeName = :codeName", Long.class);
+        q.setParameter("codeName", codeName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<CronJob> findCronJobsByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = CronJob.entityManager();
+        TypedQuery<CronJob> q = em.createQuery("SELECT o FROM CronJob AS o WHERE o.codeName = :codeName", CronJob.class);
+        q.setParameter("codeName", codeName);
+        return q;
+    }
+
+	public static TypedQuery<CronJob> findCronJobsByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = CronJob.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM CronJob AS o WHERE o.codeName = :codeName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<CronJob> q = em.createQuery(queryBuilder.toString(), CronJob.class);
+        q.setParameter("codeName", codeName);
+        return q;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/CronJob_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/CronJob_Roo_Configurable.aj
deleted file mode 100644
index a037937a4..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CronJob_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CronJob;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect CronJob_Roo_Configurable {
-    
-    declare @type: CronJob: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CronJob_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/CronJob_Roo_Finder.aj
deleted file mode 100644
index aab8f421a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CronJob_Roo_Finder.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CronJob;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect CronJob_Roo_Finder {
-    
-    public static Long CronJob.countFindCronJobsByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = CronJob.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM CronJob AS o WHERE o.codeName = :codeName", Long.class);
-        q.setParameter("codeName", codeName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<CronJob> CronJob.findCronJobsByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = CronJob.entityManager();
-        TypedQuery<CronJob> q = em.createQuery("SELECT o FROM CronJob AS o WHERE o.codeName = :codeName", CronJob.class);
-        q.setParameter("codeName", codeName);
-        return q;
-    }
-    
-    public static TypedQuery<CronJob> CronJob.findCronJobsByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = CronJob.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM CronJob AS o WHERE o.codeName = :codeName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<CronJob> q = em.createQuery(queryBuilder.toString(), CronJob.class);
-        q.setParameter("codeName", codeName);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CronJob_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/CronJob_Roo_JavaBean.aj
deleted file mode 100644
index 144c638a9..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CronJob_Roo_JavaBean.aj
+++ /dev/null
@@ -1,115 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CronJob;
-import java.util.Date;
-
-privileged aspect CronJob_Roo_JavaBean {
-    
-    public String CronJob.getSchedule() {
-        return this.schedule;
-    }
-    
-    public void CronJob.setSchedule(String schedule) {
-        this.schedule = schedule;
-    }
-    
-    public String CronJob.getScriptType() {
-        return this.scriptType;
-    }
-    
-    public void CronJob.setScriptType(String scriptType) {
-        this.scriptType = scriptType;
-    }
-    
-    public String CronJob.getScriptFile() {
-        return this.scriptFile;
-    }
-    
-    public void CronJob.setScriptFile(String scriptFile) {
-        this.scriptFile = scriptFile;
-    }
-    
-    public String CronJob.getFunctionName() {
-        return this.functionName;
-    }
-    
-    public void CronJob.setFunctionName(String functionName) {
-        this.functionName = functionName;
-    }
-    
-    public String CronJob.getScriptJSONData() {
-        return this.scriptJSONData;
-    }
-    
-    public void CronJob.setScriptJSONData(String scriptJSONData) {
-        this.scriptJSONData = scriptJSONData;
-    }
-    
-    public boolean CronJob.isActive() {
-        return this.active;
-    }
-    
-    public void CronJob.setActive(boolean active) {
-        this.active = active;
-    }
-    
-    public boolean CronJob.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void CronJob.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public String CronJob.getRunUser() {
-        return this.runUser;
-    }
-    
-    public void CronJob.setRunUser(String runUser) {
-        this.runUser = runUser;
-    }
-    
-    public String CronJob.getCodeName() {
-        return this.codeName;
-    }
-    
-    public void CronJob.setCodeName(String codeName) {
-        this.codeName = codeName;
-    }
-    
-    public Date CronJob.getLastStartTime() {
-        return this.lastStartTime;
-    }
-    
-    public void CronJob.setLastStartTime(Date lastStartTime) {
-        this.lastStartTime = lastStartTime;
-    }
-    
-    public Long CronJob.getLastDuration() {
-        return this.lastDuration;
-    }
-    
-    public void CronJob.setLastDuration(Long lastDuration) {
-        this.lastDuration = lastDuration;
-    }
-    
-    public String CronJob.getLastResultJSON() {
-        return this.lastResultJSON;
-    }
-    
-    public void CronJob.setLastResultJSON(String lastResultJSON) {
-        this.lastResultJSON = lastResultJSON;
-    }
-    
-    public Integer CronJob.getNumberOfExecutions() {
-        return this.numberOfExecutions;
-    }
-    
-    public void CronJob.setNumberOfExecutions(Integer numberOfExecutions) {
-        this.numberOfExecutions = numberOfExecutions;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CronJob_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/CronJob_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 9fbf49b4b..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CronJob_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CronJob;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect CronJob_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager CronJob.entityManager;
-    
-    public static final List<String> CronJob.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "schedule", "scriptType", "scriptFile", "functionName", "scriptJSONData", "active", "ignored", "runUser", "codeName", "lastStartTime", "lastDuration", "lastResultJSON", "numberOfExecutions", "id", "version");
-    
-    public static final EntityManager CronJob.entityManager() {
-        EntityManager em = new CronJob().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long CronJob.countCronJobs() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM CronJob o", Long.class).getSingleResult();
-    }
-    
-    public static List<CronJob> CronJob.findAllCronJobs() {
-        return entityManager().createQuery("SELECT o FROM CronJob o", CronJob.class).getResultList();
-    }
-    
-    public static List<CronJob> CronJob.findAllCronJobs(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM CronJob o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, CronJob.class).getResultList();
-    }
-    
-    public static CronJob CronJob.findCronJob(Long id) {
-        if (id == null) return null;
-        return entityManager().find(CronJob.class, id);
-    }
-    
-    public static List<CronJob> CronJob.findCronJobEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM CronJob o", CronJob.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<CronJob> CronJob.findCronJobEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM CronJob o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, CronJob.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void CronJob.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void CronJob.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            CronJob attached = CronJob.findCronJob(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void CronJob.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void CronJob.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public CronJob CronJob.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        CronJob merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CronJob_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/CronJob_Roo_Jpa_Entity.aj
deleted file mode 100644
index a818b103e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CronJob_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CronJob;
-import javax.persistence.Entity;
-
-privileged aspect CronJob_Roo_Jpa_Entity {
-    
-    declare @type: CronJob: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CronJob_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/CronJob_Roo_Json.aj
deleted file mode 100644
index 4d5e7989b..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CronJob_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CronJob;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect CronJob_Roo_Json {
-    
-    public String CronJob.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String CronJob.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static CronJob CronJob.fromJsonToCronJob(String json) {
-        return new JSONDeserializer<CronJob>()
-        .use(null, CronJob.class).deserialize(json);
-    }
-    
-    public static String CronJob.toJsonArray(Collection<CronJob> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String CronJob.toJsonArray(Collection<CronJob> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<CronJob> CronJob.fromJsonArrayToCronJobs(String json) {
-        return new JSONDeserializer<List<CronJob>>()
-        .use("values", CronJob.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/CronJob_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/CronJob_Roo_ToString.aj
deleted file mode 100644
index 48506b0de..000000000
--- a/src/main/java/com/labsynch/labseer/domain/CronJob_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.CronJob;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect CronJob_Roo_ToString {
-    
-    public String CronJob.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictKind.java b/src/main/java/com/labsynch/labseer/domain/DDictKind.java
index 960700565..81436e776 100644
--- a/src/main/java/com/labsynch/labseer/domain/DDictKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/DDictKind.java
@@ -1,5 +1,8 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.List;
 
 import javax.persistence.Column;
@@ -11,18 +14,22 @@
 import javax.persistence.JoinColumn;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
 @Entity
 @RooJavaBean
 @RooToString
@@ -147,4 +154,155 @@ public DDictKind merge() {
         this.entityManager.flush();
         return merged;
     }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getName() {
+        return this.name;
+    }
+
+	public void setName(String name) {
+        this.name = name;
+    }
+
+	public String getLsTypeAndKind() {
+        return this.lsTypeAndKind;
+    }
+
+	public void setLsTypeAndKind(String lsTypeAndKind) {
+        this.lsTypeAndKind = lsTypeAndKind;
+    }
+
+	public String getDescription() {
+        return this.description;
+    }
+
+	public void setDescription(String description) {
+        this.description = description;
+    }
+
+	public String getComments() {
+        return this.comments;
+    }
+
+	public void setComments(String comments) {
+        this.comments = comments;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public Integer getDisplayOrder() {
+        return this.displayOrder;
+    }
+
+	public void setDisplayOrder(Integer displayOrder) {
+        this.displayOrder = displayOrder;
+    }
+
+	public static Long countFindDDictKindsByLsTypeEqualsAndNameEquals(String lsType, String name) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = DDictKind.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DDictKind AS o WHERE o.lsType = :lsType  AND o.name = :name", Long.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("name", name);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<DDictKind> findDDictKindsByLsTypeEqualsAndNameEquals(String lsType, String name) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = DDictKind.entityManager();
+        TypedQuery<DDictKind> q = em.createQuery("SELECT o FROM DDictKind AS o WHERE o.lsType = :lsType  AND o.name = :name", DDictKind.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("name", name);
+        return q;
+    }
+
+	public static TypedQuery<DDictKind> findDDictKindsByLsTypeEqualsAndNameEquals(String lsType, String name, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = DDictKind.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DDictKind AS o WHERE o.lsType = :lsType  AND o.name = :name");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<DDictKind> q = em.createQuery(queryBuilder.toString(), DDictKind.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("name", name);
+        return q;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType", "name", "lsTypeAndKind", "description", "comments", "ignored", "displayOrder", "id", "version", "entityManager");
+
+	public static List<DDictKind> findAllDDictKinds(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM DDictKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, DDictKind.class).getResultList();
+    }
+
+	public static List<DDictKind> findDDictKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM DDictKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, DDictKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static DDictKind fromJsonToDDictKind(String json) {
+        return new JSONDeserializer<DDictKind>()
+        .use(null, DDictKind.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<DDictKind> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<DDictKind> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<DDictKind> fromJsonArrayToDDictKinds(String json) {
+        return new JSONDeserializer<List<DDictKind>>()
+        .use("values", DDictKind.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictKind_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/DDictKind_Roo_Configurable.aj
deleted file mode 100644
index 0d8cd9919..000000000
--- a/src/main/java/com/labsynch/labseer/domain/DDictKind_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.DDictKind;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect DDictKind_Roo_Configurable {
-    
-    declare @type: DDictKind: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictKind_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/DDictKind_Roo_Finder.aj
deleted file mode 100644
index 7bee0512a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/DDictKind_Roo_Finder.aj
+++ /dev/null
@@ -1,49 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.DDictKind;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect DDictKind_Roo_Finder {
-    
-    public static Long DDictKind.countFindDDictKindsByLsTypeEqualsAndNameEquals(String lsType, String name) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = DDictKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DDictKind AS o WHERE o.lsType = :lsType  AND o.name = :name", Long.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("name", name);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<DDictKind> DDictKind.findDDictKindsByLsTypeEqualsAndNameEquals(String lsType, String name) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = DDictKind.entityManager();
-        TypedQuery<DDictKind> q = em.createQuery("SELECT o FROM DDictKind AS o WHERE o.lsType = :lsType  AND o.name = :name", DDictKind.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("name", name);
-        return q;
-    }
-    
-    public static TypedQuery<DDictKind> DDictKind.findDDictKindsByLsTypeEqualsAndNameEquals(String lsType, String name, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = DDictKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DDictKind AS o WHERE o.lsType = :lsType  AND o.name = :name");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<DDictKind> q = em.createQuery(queryBuilder.toString(), DDictKind.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("name", name);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictKind_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/DDictKind_Roo_JavaBean.aj
deleted file mode 100644
index 293d283c4..000000000
--- a/src/main/java/com/labsynch/labseer/domain/DDictKind_Roo_JavaBean.aj
+++ /dev/null
@@ -1,66 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.DDictKind;
-
-privileged aspect DDictKind_Roo_JavaBean {
-    
-    public String DDictKind.getLsType() {
-        return this.lsType;
-    }
-    
-    public void DDictKind.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String DDictKind.getName() {
-        return this.name;
-    }
-    
-    public void DDictKind.setName(String name) {
-        this.name = name;
-    }
-    
-    public String DDictKind.getLsTypeAndKind() {
-        return this.lsTypeAndKind;
-    }
-    
-    public void DDictKind.setLsTypeAndKind(String lsTypeAndKind) {
-        this.lsTypeAndKind = lsTypeAndKind;
-    }
-    
-    public String DDictKind.getDescription() {
-        return this.description;
-    }
-    
-    public void DDictKind.setDescription(String description) {
-        this.description = description;
-    }
-    
-    public String DDictKind.getComments() {
-        return this.comments;
-    }
-    
-    public void DDictKind.setComments(String comments) {
-        this.comments = comments;
-    }
-    
-    public boolean DDictKind.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void DDictKind.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public Integer DDictKind.getDisplayOrder() {
-        return this.displayOrder;
-    }
-    
-    public void DDictKind.setDisplayOrder(Integer displayOrder) {
-        this.displayOrder = displayOrder;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictKind_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/DDictKind_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 795b3e297..000000000
--- a/src/main/java/com/labsynch/labseer/domain/DDictKind_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.DDictKind;
-import java.util.List;
-
-privileged aspect DDictKind_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> DDictKind.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType", "name", "lsTypeAndKind", "description", "comments", "ignored", "displayOrder", "id", "version", "entityManager");
-    
-    public static List<DDictKind> DDictKind.findAllDDictKinds(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM DDictKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, DDictKind.class).getResultList();
-    }
-    
-    public static List<DDictKind> DDictKind.findDDictKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM DDictKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, DDictKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictKind_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/DDictKind_Roo_Json.aj
deleted file mode 100644
index 74d98fd86..000000000
--- a/src/main/java/com/labsynch/labseer/domain/DDictKind_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.DDictKind;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect DDictKind_Roo_Json {
-    
-    public String DDictKind.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String DDictKind.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static DDictKind DDictKind.fromJsonToDDictKind(String json) {
-        return new JSONDeserializer<DDictKind>()
-        .use(null, DDictKind.class).deserialize(json);
-    }
-    
-    public static String DDictKind.toJsonArray(Collection<DDictKind> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String DDictKind.toJsonArray(Collection<DDictKind> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<DDictKind> DDictKind.fromJsonArrayToDDictKinds(String json) {
-        return new JSONDeserializer<List<DDictKind>>()
-        .use("values", DDictKind.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictKind_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/DDictKind_Roo_ToString.aj
deleted file mode 100644
index 882f3aaa6..000000000
--- a/src/main/java/com/labsynch/labseer/domain/DDictKind_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.DDictKind;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect DDictKind_Roo_ToString {
-    
-    public String DDictKind.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictType.java b/src/main/java/com/labsynch/labseer/domain/DDictType.java
index 2b07efb4c..e661308ef 100644
--- a/src/main/java/com/labsynch/labseer/domain/DDictType.java
+++ b/src/main/java/com/labsynch/labseer/domain/DDictType.java
@@ -1,16 +1,34 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -37,4 +55,222 @@ public class DDictType {
 
 	
 
+
+	public static Long countFindDDictTypesByNameEquals(String name) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = DDictType.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DDictType AS o WHERE o.name = :name", Long.class);
+        q.setParameter("name", name);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<DDictType> findDDictTypesByNameEquals(String name) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = DDictType.entityManager();
+        TypedQuery<DDictType> q = em.createQuery("SELECT o FROM DDictType AS o WHERE o.name = :name", DDictType.class);
+        q.setParameter("name", name);
+        return q;
+    }
+
+	public static TypedQuery<DDictType> findDDictTypesByNameEquals(String name, String sortFieldName, String sortOrder) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = DDictType.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DDictType AS o WHERE o.name = :name");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<DDictType> q = em.createQuery(queryBuilder.toString(), DDictType.class);
+        q.setParameter("name", name);
+        return q;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "name", "description", "comments", "ignored", "displayOrder");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new DDictType().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countDDictTypes() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM DDictType o", Long.class).getSingleResult();
+    }
+
+	public static List<DDictType> findAllDDictTypes() {
+        return entityManager().createQuery("SELECT o FROM DDictType o", DDictType.class).getResultList();
+    }
+
+	public static List<DDictType> findAllDDictTypes(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM DDictType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, DDictType.class).getResultList();
+    }
+
+	public static DDictType findDDictType(Long id) {
+        if (id == null) return null;
+        return entityManager().find(DDictType.class, id);
+    }
+
+	public static List<DDictType> findDDictTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM DDictType o", DDictType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<DDictType> findDDictTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM DDictType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, DDictType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            DDictType attached = DDictType.findDDictType(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public DDictType merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        DDictType merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String getName() {
+        return this.name;
+    }
+
+	public void setName(String name) {
+        this.name = name;
+    }
+
+	public String getDescription() {
+        return this.description;
+    }
+
+	public void setDescription(String description) {
+        this.description = description;
+    }
+
+	public String getComments() {
+        return this.comments;
+    }
+
+	public void setComments(String comments) {
+        this.comments = comments;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public Integer getDisplayOrder() {
+        return this.displayOrder;
+    }
+
+	public void setDisplayOrder(Integer displayOrder) {
+        this.displayOrder = displayOrder;
+    }
+
+	@Id
+    @SequenceGenerator(name = "dDictTypeGen", sequenceName = "DDICT_TYPE_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "dDictTypeGen")
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static DDictType fromJsonToDDictType(String json) {
+        return new JSONDeserializer<DDictType>()
+        .use(null, DDictType.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<DDictType> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<DDictType> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<DDictType> fromJsonArrayToDDictTypes(String json) {
+        return new JSONDeserializer<List<DDictType>>()
+        .use("values", DDictType.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictType_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/DDictType_Roo_Configurable.aj
deleted file mode 100644
index 715c190a6..000000000
--- a/src/main/java/com/labsynch/labseer/domain/DDictType_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.DDictType;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect DDictType_Roo_Configurable {
-    
-    declare @type: DDictType: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictType_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/DDictType_Roo_Finder.aj
deleted file mode 100644
index 22ee11885..000000000
--- a/src/main/java/com/labsynch/labseer/domain/DDictType_Roo_Finder.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.DDictType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect DDictType_Roo_Finder {
-    
-    public static Long DDictType.countFindDDictTypesByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = DDictType.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DDictType AS o WHERE o.name = :name", Long.class);
-        q.setParameter("name", name);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<DDictType> DDictType.findDDictTypesByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = DDictType.entityManager();
-        TypedQuery<DDictType> q = em.createQuery("SELECT o FROM DDictType AS o WHERE o.name = :name", DDictType.class);
-        q.setParameter("name", name);
-        return q;
-    }
-    
-    public static TypedQuery<DDictType> DDictType.findDDictTypesByNameEquals(String name, String sortFieldName, String sortOrder) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = DDictType.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DDictType AS o WHERE o.name = :name");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<DDictType> q = em.createQuery(queryBuilder.toString(), DDictType.class);
-        q.setParameter("name", name);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictType_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/DDictType_Roo_JavaBean.aj
deleted file mode 100644
index fba8b7f9a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/DDictType_Roo_JavaBean.aj
+++ /dev/null
@@ -1,50 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.DDictType;
-
-privileged aspect DDictType_Roo_JavaBean {
-    
-    public String DDictType.getName() {
-        return this.name;
-    }
-    
-    public void DDictType.setName(String name) {
-        this.name = name;
-    }
-    
-    public String DDictType.getDescription() {
-        return this.description;
-    }
-    
-    public void DDictType.setDescription(String description) {
-        this.description = description;
-    }
-    
-    public String DDictType.getComments() {
-        return this.comments;
-    }
-    
-    public void DDictType.setComments(String comments) {
-        this.comments = comments;
-    }
-    
-    public boolean DDictType.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void DDictType.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public Integer DDictType.getDisplayOrder() {
-        return this.displayOrder;
-    }
-    
-    public void DDictType.setDisplayOrder(Integer displayOrder) {
-        this.displayOrder = displayOrder;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictType_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/DDictType_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index c6b2fd927..000000000
--- a/src/main/java/com/labsynch/labseer/domain/DDictType_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.DDictType;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect DDictType_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager DDictType.entityManager;
-    
-    public static final List<String> DDictType.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "name", "description", "comments", "ignored", "displayOrder");
-    
-    public static final EntityManager DDictType.entityManager() {
-        EntityManager em = new DDictType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long DDictType.countDDictTypes() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM DDictType o", Long.class).getSingleResult();
-    }
-    
-    public static List<DDictType> DDictType.findAllDDictTypes() {
-        return entityManager().createQuery("SELECT o FROM DDictType o", DDictType.class).getResultList();
-    }
-    
-    public static List<DDictType> DDictType.findAllDDictTypes(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM DDictType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, DDictType.class).getResultList();
-    }
-    
-    public static DDictType DDictType.findDDictType(Long id) {
-        if (id == null) return null;
-        return entityManager().find(DDictType.class, id);
-    }
-    
-    public static List<DDictType> DDictType.findDDictTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM DDictType o", DDictType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<DDictType> DDictType.findDDictTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM DDictType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, DDictType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void DDictType.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void DDictType.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            DDictType attached = DDictType.findDDictType(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void DDictType.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void DDictType.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public DDictType DDictType.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        DDictType merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictType_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/DDictType_Roo_Jpa_Entity.aj
deleted file mode 100644
index 1fc0ef58d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/DDictType_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.DDictType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
-
-privileged aspect DDictType_Roo_Jpa_Entity {
-    
-    declare @type: DDictType: @Entity;
-    
-    @Id
-    @SequenceGenerator(name = "dDictTypeGen", sequenceName = "DDICT_TYPE_PKSEQ")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "dDictTypeGen")
-    @Column(name = "id")
-    private Long DDictType.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer DDictType.version;
-    
-    public Long DDictType.getId() {
-        return this.id;
-    }
-    
-    public void DDictType.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer DDictType.getVersion() {
-        return this.version;
-    }
-    
-    public void DDictType.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictType_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/DDictType_Roo_Json.aj
deleted file mode 100644
index 48c903a5e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/DDictType_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.DDictType;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect DDictType_Roo_Json {
-    
-    public String DDictType.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String DDictType.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static DDictType DDictType.fromJsonToDDictType(String json) {
-        return new JSONDeserializer<DDictType>()
-        .use(null, DDictType.class).deserialize(json);
-    }
-    
-    public static String DDictType.toJsonArray(Collection<DDictType> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String DDictType.toJsonArray(Collection<DDictType> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<DDictType> DDictType.fromJsonArrayToDDictTypes(String json) {
-        return new JSONDeserializer<List<DDictType>>()
-        .use("values", DDictType.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictType_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/DDictType_Roo_ToString.aj
deleted file mode 100644
index ac9560295..000000000
--- a/src/main/java/com/labsynch/labseer/domain/DDictType_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.DDictType;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect DDictType_Roo_ToString {
-    
-    public String DDictType.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictValue.java b/src/main/java/com/labsynch/labseer/domain/DDictValue.java
index 80291fc2d..bbaef5c37 100644
--- a/src/main/java/com/labsynch/labseer/domain/DDictValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/DDictValue.java
@@ -16,9 +16,11 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -32,6 +34,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Configurable
 @Entity
 @RooJavaBean
 @RooToString
@@ -298,4 +301,349 @@ private static boolean validateLsType(String lsType) {
 			return false;
 		}
 	}
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType", "lsKind", "lsTypeAndKind", "shortName", "labelText", "description", "comments", "ignored", "displayOrder", "codeName", "id", "version", "entityManager");
+
+	public static List<DDictValue> findAllDDictValues(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM DDictValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, DDictValue.class).getResultList();
+    }
+
+	public static List<DDictValue> findDDictValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM DDictValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, DDictValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static Long countFindDDictValuesByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = DDictValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DDictValue AS o WHERE o.codeName = :codeName", Long.class);
+        q.setParameter("codeName", codeName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindDDictValuesByIgnoredNot(boolean ignored) {
+        EntityManager em = DDictValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DDictValue AS o WHERE o.ignored IS NOT :ignored", Long.class);
+        q.setParameter("ignored", ignored);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindDDictValuesByLabelTextLike(String labelText) {
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        labelText = labelText.replace('*', '%');
+        if (labelText.charAt(0) != '%') {
+            labelText = "%" + labelText;
+        }
+        if (labelText.charAt(labelText.length() - 1) != '%') {
+            labelText = labelText + "%";
+        }
+        EntityManager em = DDictValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DDictValue AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", Long.class);
+        q.setParameter("labelText", labelText);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindDDictValuesByLsKindEquals(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = DDictValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DDictValue AS o WHERE o.lsKind = :lsKind", Long.class);
+        q.setParameter("lsKind", lsKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindDDictValuesByLsTypeEquals(String lsType) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = DDictValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DDictValue AS o WHERE o.lsType = :lsType", Long.class);
+        q.setParameter("lsType", lsType);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindDDictValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = DDictValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DDictValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals(String lsType, String lsKind, String shortName) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (shortName == null || shortName.length() == 0) throw new IllegalArgumentException("The shortName argument is required");
+        EntityManager em = DDictValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DDictValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.shortName = :shortName", Long.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("shortName", shortName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<DDictValue> findDDictValuesByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = DDictValue.entityManager();
+        TypedQuery<DDictValue> q = em.createQuery("SELECT o FROM DDictValue AS o WHERE o.codeName = :codeName", DDictValue.class);
+        q.setParameter("codeName", codeName);
+        return q;
+    }
+
+	public static TypedQuery<DDictValue> findDDictValuesByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = DDictValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DDictValue AS o WHERE o.codeName = :codeName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<DDictValue> q = em.createQuery(queryBuilder.toString(), DDictValue.class);
+        q.setParameter("codeName", codeName);
+        return q;
+    }
+
+	public static TypedQuery<DDictValue> findDDictValuesByIgnoredNot(boolean ignored) {
+        EntityManager em = DDictValue.entityManager();
+        TypedQuery<DDictValue> q = em.createQuery("SELECT o FROM DDictValue AS o WHERE o.ignored IS NOT :ignored", DDictValue.class);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<DDictValue> findDDictValuesByIgnoredNot(boolean ignored, String sortFieldName, String sortOrder) {
+        EntityManager em = DDictValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DDictValue AS o WHERE o.ignored IS NOT :ignored");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<DDictValue> q = em.createQuery(queryBuilder.toString(), DDictValue.class);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<DDictValue> findDDictValuesByLabelTextLike(String labelText) {
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        labelText = labelText.replace('*', '%');
+        if (labelText.charAt(0) != '%') {
+            labelText = "%" + labelText;
+        }
+        if (labelText.charAt(labelText.length() - 1) != '%') {
+            labelText = labelText + "%";
+        }
+        EntityManager em = DDictValue.entityManager();
+        TypedQuery<DDictValue> q = em.createQuery("SELECT o FROM DDictValue AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", DDictValue.class);
+        q.setParameter("labelText", labelText);
+        return q;
+    }
+
+	public static TypedQuery<DDictValue> findDDictValuesByLabelTextLike(String labelText, String sortFieldName, String sortOrder) {
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        labelText = labelText.replace('*', '%');
+        if (labelText.charAt(0) != '%') {
+            labelText = "%" + labelText;
+        }
+        if (labelText.charAt(labelText.length() - 1) != '%') {
+            labelText = labelText + "%";
+        }
+        EntityManager em = DDictValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DDictValue AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<DDictValue> q = em.createQuery(queryBuilder.toString(), DDictValue.class);
+        q.setParameter("labelText", labelText);
+        return q;
+    }
+
+	public static TypedQuery<DDictValue> findDDictValuesByLsKindEquals(String lsKind, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = DDictValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DDictValue AS o WHERE o.lsKind = :lsKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<DDictValue> q = em.createQuery(queryBuilder.toString(), DDictValue.class);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<DDictValue> findDDictValuesByLsTypeEquals(String lsType) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = DDictValue.entityManager();
+        TypedQuery<DDictValue> q = em.createQuery("SELECT o FROM DDictValue AS o WHERE o.lsType = :lsType", DDictValue.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<DDictValue> findDDictValuesByLsTypeEquals(String lsType, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = DDictValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DDictValue AS o WHERE o.lsType = :lsType");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<DDictValue> q = em.createQuery(queryBuilder.toString(), DDictValue.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<DDictValue> findDDictValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = DDictValue.entityManager();
+        TypedQuery<DDictValue> q = em.createQuery("SELECT o FROM DDictValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", DDictValue.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<DDictValue> findDDictValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = DDictValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DDictValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<DDictValue> q = em.createQuery(queryBuilder.toString(), DDictValue.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<DDictValue> findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals(String lsType, String lsKind, String shortName) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (shortName == null || shortName.length() == 0) throw new IllegalArgumentException("The shortName argument is required");
+        EntityManager em = DDictValue.entityManager();
+        TypedQuery<DDictValue> q = em.createQuery("SELECT o FROM DDictValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.shortName = :shortName", DDictValue.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("shortName", shortName);
+        return q;
+    }
+
+	public static TypedQuery<DDictValue> findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals(String lsType, String lsKind, String shortName, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (shortName == null || shortName.length() == 0) throw new IllegalArgumentException("The shortName argument is required");
+        EntityManager em = DDictValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DDictValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.shortName = :shortName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<DDictValue> q = em.createQuery(queryBuilder.toString(), DDictValue.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("shortName", shortName);
+        return q;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getLsTypeAndKind() {
+        return this.lsTypeAndKind;
+    }
+
+	public void setLsTypeAndKind(String lsTypeAndKind) {
+        this.lsTypeAndKind = lsTypeAndKind;
+    }
+
+	public String getShortName() {
+        return this.shortName;
+    }
+
+	public void setShortName(String shortName) {
+        this.shortName = shortName;
+    }
+
+	public String getLabelText() {
+        return this.labelText;
+    }
+
+	public void setLabelText(String labelText) {
+        this.labelText = labelText;
+    }
+
+	public String getDescription() {
+        return this.description;
+    }
+
+	public void setDescription(String description) {
+        this.description = description;
+    }
+
+	public String getComments() {
+        return this.comments;
+    }
+
+	public void setComments(String comments) {
+        this.comments = comments;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public Integer getDisplayOrder() {
+        return this.displayOrder;
+    }
+
+	public void setDisplayOrder(Integer displayOrder) {
+        this.displayOrder = displayOrder;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictValue_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/DDictValue_Roo_Configurable.aj
deleted file mode 100644
index ba1a6b5bc..000000000
--- a/src/main/java/com/labsynch/labseer/domain/DDictValue_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.DDictValue;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect DDictValue_Roo_Configurable {
-    
-    declare @type: DDictValue: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictValue_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/DDictValue_Roo_Finder.aj
deleted file mode 100644
index b08b2a698..000000000
--- a/src/main/java/com/labsynch/labseer/domain/DDictValue_Roo_Finder.aj
+++ /dev/null
@@ -1,257 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.DDictValue;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect DDictValue_Roo_Finder {
-    
-    public static Long DDictValue.countFindDDictValuesByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = DDictValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DDictValue AS o WHERE o.codeName = :codeName", Long.class);
-        q.setParameter("codeName", codeName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long DDictValue.countFindDDictValuesByIgnoredNot(boolean ignored) {
-        EntityManager em = DDictValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DDictValue AS o WHERE o.ignored IS NOT :ignored", Long.class);
-        q.setParameter("ignored", ignored);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long DDictValue.countFindDDictValuesByLabelTextLike(String labelText) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        labelText = labelText.replace('*', '%');
-        if (labelText.charAt(0) != '%') {
-            labelText = "%" + labelText;
-        }
-        if (labelText.charAt(labelText.length() - 1) != '%') {
-            labelText = labelText + "%";
-        }
-        EntityManager em = DDictValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DDictValue AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", Long.class);
-        q.setParameter("labelText", labelText);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long DDictValue.countFindDDictValuesByLsKindEquals(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = DDictValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DDictValue AS o WHERE o.lsKind = :lsKind", Long.class);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long DDictValue.countFindDDictValuesByLsTypeEquals(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = DDictValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DDictValue AS o WHERE o.lsType = :lsType", Long.class);
-        q.setParameter("lsType", lsType);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long DDictValue.countFindDDictValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = DDictValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DDictValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long DDictValue.countFindDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals(String lsType, String lsKind, String shortName) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (shortName == null || shortName.length() == 0) throw new IllegalArgumentException("The shortName argument is required");
-        EntityManager em = DDictValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DDictValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.shortName = :shortName", Long.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("shortName", shortName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<DDictValue> DDictValue.findDDictValuesByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = DDictValue.entityManager();
-        TypedQuery<DDictValue> q = em.createQuery("SELECT o FROM DDictValue AS o WHERE o.codeName = :codeName", DDictValue.class);
-        q.setParameter("codeName", codeName);
-        return q;
-    }
-    
-    public static TypedQuery<DDictValue> DDictValue.findDDictValuesByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = DDictValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DDictValue AS o WHERE o.codeName = :codeName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<DDictValue> q = em.createQuery(queryBuilder.toString(), DDictValue.class);
-        q.setParameter("codeName", codeName);
-        return q;
-    }
-    
-    public static TypedQuery<DDictValue> DDictValue.findDDictValuesByIgnoredNot(boolean ignored) {
-        EntityManager em = DDictValue.entityManager();
-        TypedQuery<DDictValue> q = em.createQuery("SELECT o FROM DDictValue AS o WHERE o.ignored IS NOT :ignored", DDictValue.class);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<DDictValue> DDictValue.findDDictValuesByIgnoredNot(boolean ignored, String sortFieldName, String sortOrder) {
-        EntityManager em = DDictValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DDictValue AS o WHERE o.ignored IS NOT :ignored");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<DDictValue> q = em.createQuery(queryBuilder.toString(), DDictValue.class);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<DDictValue> DDictValue.findDDictValuesByLabelTextLike(String labelText) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        labelText = labelText.replace('*', '%');
-        if (labelText.charAt(0) != '%') {
-            labelText = "%" + labelText;
-        }
-        if (labelText.charAt(labelText.length() - 1) != '%') {
-            labelText = labelText + "%";
-        }
-        EntityManager em = DDictValue.entityManager();
-        TypedQuery<DDictValue> q = em.createQuery("SELECT o FROM DDictValue AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", DDictValue.class);
-        q.setParameter("labelText", labelText);
-        return q;
-    }
-    
-    public static TypedQuery<DDictValue> DDictValue.findDDictValuesByLabelTextLike(String labelText, String sortFieldName, String sortOrder) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        labelText = labelText.replace('*', '%');
-        if (labelText.charAt(0) != '%') {
-            labelText = "%" + labelText;
-        }
-        if (labelText.charAt(labelText.length() - 1) != '%') {
-            labelText = labelText + "%";
-        }
-        EntityManager em = DDictValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DDictValue AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<DDictValue> q = em.createQuery(queryBuilder.toString(), DDictValue.class);
-        q.setParameter("labelText", labelText);
-        return q;
-    }
-    
-    public static TypedQuery<DDictValue> DDictValue.findDDictValuesByLsKindEquals(String lsKind, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = DDictValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DDictValue AS o WHERE o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<DDictValue> q = em.createQuery(queryBuilder.toString(), DDictValue.class);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<DDictValue> DDictValue.findDDictValuesByLsTypeEquals(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = DDictValue.entityManager();
-        TypedQuery<DDictValue> q = em.createQuery("SELECT o FROM DDictValue AS o WHERE o.lsType = :lsType", DDictValue.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<DDictValue> DDictValue.findDDictValuesByLsTypeEquals(String lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = DDictValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DDictValue AS o WHERE o.lsType = :lsType");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<DDictValue> q = em.createQuery(queryBuilder.toString(), DDictValue.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<DDictValue> DDictValue.findDDictValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = DDictValue.entityManager();
-        TypedQuery<DDictValue> q = em.createQuery("SELECT o FROM DDictValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", DDictValue.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<DDictValue> DDictValue.findDDictValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = DDictValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DDictValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<DDictValue> q = em.createQuery(queryBuilder.toString(), DDictValue.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<DDictValue> DDictValue.findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals(String lsType, String lsKind, String shortName) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (shortName == null || shortName.length() == 0) throw new IllegalArgumentException("The shortName argument is required");
-        EntityManager em = DDictValue.entityManager();
-        TypedQuery<DDictValue> q = em.createQuery("SELECT o FROM DDictValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.shortName = :shortName", DDictValue.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("shortName", shortName);
-        return q;
-    }
-    
-    public static TypedQuery<DDictValue> DDictValue.findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals(String lsType, String lsKind, String shortName, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (shortName == null || shortName.length() == 0) throw new IllegalArgumentException("The shortName argument is required");
-        EntityManager em = DDictValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DDictValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.shortName = :shortName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<DDictValue> q = em.createQuery(queryBuilder.toString(), DDictValue.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("shortName", shortName);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictValue_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/DDictValue_Roo_JavaBean.aj
deleted file mode 100644
index 15b5954e0..000000000
--- a/src/main/java/com/labsynch/labseer/domain/DDictValue_Roo_JavaBean.aj
+++ /dev/null
@@ -1,82 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.DDictValue;
-
-privileged aspect DDictValue_Roo_JavaBean {
-    
-    public String DDictValue.getLsType() {
-        return this.lsType;
-    }
-    
-    public void DDictValue.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String DDictValue.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void DDictValue.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String DDictValue.getLsTypeAndKind() {
-        return this.lsTypeAndKind;
-    }
-    
-    public void DDictValue.setLsTypeAndKind(String lsTypeAndKind) {
-        this.lsTypeAndKind = lsTypeAndKind;
-    }
-    
-    public String DDictValue.getShortName() {
-        return this.shortName;
-    }
-    
-    public void DDictValue.setShortName(String shortName) {
-        this.shortName = shortName;
-    }
-    
-    public String DDictValue.getLabelText() {
-        return this.labelText;
-    }
-    
-    public void DDictValue.setLabelText(String labelText) {
-        this.labelText = labelText;
-    }
-    
-    public String DDictValue.getDescription() {
-        return this.description;
-    }
-    
-    public void DDictValue.setDescription(String description) {
-        this.description = description;
-    }
-    
-    public String DDictValue.getComments() {
-        return this.comments;
-    }
-    
-    public void DDictValue.setComments(String comments) {
-        this.comments = comments;
-    }
-    
-    public boolean DDictValue.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void DDictValue.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public Integer DDictValue.getDisplayOrder() {
-        return this.displayOrder;
-    }
-    
-    public void DDictValue.setDisplayOrder(Integer displayOrder) {
-        this.displayOrder = displayOrder;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictValue_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/DDictValue_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 111593fff..000000000
--- a/src/main/java/com/labsynch/labseer/domain/DDictValue_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.DDictValue;
-import java.util.List;
-
-privileged aspect DDictValue_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> DDictValue.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType", "lsKind", "lsTypeAndKind", "shortName", "labelText", "description", "comments", "ignored", "displayOrder", "codeName", "id", "version", "entityManager");
-    
-    public static List<DDictValue> DDictValue.findAllDDictValues(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM DDictValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, DDictValue.class).getResultList();
-    }
-    
-    public static List<DDictValue> DDictValue.findDDictValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM DDictValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, DDictValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictValue_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/DDictValue_Roo_ToString.aj
deleted file mode 100644
index fc51822cc..000000000
--- a/src/main/java/com/labsynch/labseer/domain/DDictValue_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.DDictValue;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect DDictValue_Roo_ToString {
-    
-    public String DDictValue.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/DryRunCompound.java b/src/main/java/com/labsynch/labseer/domain/DryRunCompound.java
index c3ec32e4e..98530dec3 100644
--- a/src/main/java/com/labsynch/labseer/domain/DryRunCompound.java
+++ b/src/main/java/com/labsynch/labseer/domain/DryRunCompound.java
@@ -1,14 +1,29 @@
 package com.labsynch.labseer.domain;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
+import javax.persistence.Version;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -37,4 +52,257 @@ public void truncateTable() {
 	}
 
 
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("corpName", "stereoCategory", "stereoComment", "CdId", "RecordNumber", "molStructure");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new DryRunCompound().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countDryRunCompounds() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM DryRunCompound o", Long.class).getSingleResult();
+    }
+
+	public static List<DryRunCompound> findAllDryRunCompounds() {
+        return entityManager().createQuery("SELECT o FROM DryRunCompound o", DryRunCompound.class).getResultList();
+    }
+
+	public static List<DryRunCompound> findAllDryRunCompounds(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM DryRunCompound o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, DryRunCompound.class).getResultList();
+    }
+
+	public static DryRunCompound findDryRunCompound(Long id) {
+        if (id == null) return null;
+        return entityManager().find(DryRunCompound.class, id);
+    }
+
+	public static List<DryRunCompound> findDryRunCompoundEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM DryRunCompound o", DryRunCompound.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<DryRunCompound> findDryRunCompoundEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM DryRunCompound o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, DryRunCompound.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            DryRunCompound attached = DryRunCompound.findDryRunCompound(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public DryRunCompound merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        DryRunCompound merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String getCorpName() {
+        return this.corpName;
+    }
+
+	public void setCorpName(String corpName) {
+        this.corpName = corpName;
+    }
+
+	public String getStereoCategory() {
+        return this.stereoCategory;
+    }
+
+	public void setStereoCategory(String stereoCategory) {
+        this.stereoCategory = stereoCategory;
+    }
+
+	public String getStereoComment() {
+        return this.stereoComment;
+    }
+
+	public void setStereoComment(String stereoComment) {
+        this.stereoComment = stereoComment;
+    }
+
+	public int getCdId() {
+        return this.CdId;
+    }
+
+	public void setCdId(int CdId) {
+        this.CdId = CdId;
+    }
+
+	public int getRecordNumber() {
+        return this.RecordNumber;
+    }
+
+	public void setRecordNumber(int RecordNumber) {
+        this.RecordNumber = RecordNumber;
+    }
+
+	public String getMolStructure() {
+        return this.molStructure;
+    }
+
+	public void setMolStructure(String molStructure) {
+        this.molStructure = molStructure;
+    }
+
+	public static Long countFindDryRunCompoundsByCdId(int CdId) {
+        EntityManager em = DryRunCompound.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DryRunCompound AS o WHERE o.CdId = :CdId", Long.class);
+        q.setParameter("CdId", CdId);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindDryRunCompoundsByCorpNameEquals(String corpName) {
+        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+        EntityManager em = DryRunCompound.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DryRunCompound AS o WHERE o.corpName = :corpName", Long.class);
+        q.setParameter("corpName", corpName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<DryRunCompound> findDryRunCompoundsByCdId(int CdId) {
+        EntityManager em = DryRunCompound.entityManager();
+        TypedQuery<DryRunCompound> q = em.createQuery("SELECT o FROM DryRunCompound AS o WHERE o.CdId = :CdId", DryRunCompound.class);
+        q.setParameter("CdId", CdId);
+        return q;
+    }
+
+	public static TypedQuery<DryRunCompound> findDryRunCompoundsByCdId(int CdId, String sortFieldName, String sortOrder) {
+        EntityManager em = DryRunCompound.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DryRunCompound AS o WHERE o.CdId = :CdId");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<DryRunCompound> q = em.createQuery(queryBuilder.toString(), DryRunCompound.class);
+        q.setParameter("CdId", CdId);
+        return q;
+    }
+
+	public static TypedQuery<DryRunCompound> findDryRunCompoundsByCorpNameEquals(String corpName) {
+        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+        EntityManager em = DryRunCompound.entityManager();
+        TypedQuery<DryRunCompound> q = em.createQuery("SELECT o FROM DryRunCompound AS o WHERE o.corpName = :corpName", DryRunCompound.class);
+        q.setParameter("corpName", corpName);
+        return q;
+    }
+
+	public static TypedQuery<DryRunCompound> findDryRunCompoundsByCorpNameEquals(String corpName, String sortFieldName, String sortOrder) {
+        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+        EntityManager em = DryRunCompound.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DryRunCompound AS o WHERE o.corpName = :corpName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<DryRunCompound> q = em.createQuery(queryBuilder.toString(), DryRunCompound.class);
+        q.setParameter("corpName", corpName);
+        return q;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static DryRunCompound fromJsonToDryRunCompound(String json) {
+        return new JSONDeserializer<DryRunCompound>()
+        .use(null, DryRunCompound.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<DryRunCompound> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<DryRunCompound> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<DryRunCompound> fromJsonArrayToDryRunCompounds(String json) {
+        return new JSONDeserializer<List<DryRunCompound>>()
+        .use("values", DryRunCompound.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/DryRunCompound_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/DryRunCompound_Roo_Configurable.aj
deleted file mode 100644
index c5b197539..000000000
--- a/src/main/java/com/labsynch/labseer/domain/DryRunCompound_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.DryRunCompound;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect DryRunCompound_Roo_Configurable {
-    
-    declare @type: DryRunCompound: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/DryRunCompound_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/DryRunCompound_Roo_Finder.aj
deleted file mode 100644
index b0980b418..000000000
--- a/src/main/java/com/labsynch/labseer/domain/DryRunCompound_Roo_Finder.aj
+++ /dev/null
@@ -1,71 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.DryRunCompound;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect DryRunCompound_Roo_Finder {
-    
-    public static Long DryRunCompound.countFindDryRunCompoundsByCdId(int CdId) {
-        EntityManager em = DryRunCompound.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DryRunCompound AS o WHERE o.CdId = :CdId", Long.class);
-        q.setParameter("CdId", CdId);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long DryRunCompound.countFindDryRunCompoundsByCorpNameEquals(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        EntityManager em = DryRunCompound.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DryRunCompound AS o WHERE o.corpName = :corpName", Long.class);
-        q.setParameter("corpName", corpName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<DryRunCompound> DryRunCompound.findDryRunCompoundsByCdId(int CdId) {
-        EntityManager em = DryRunCompound.entityManager();
-        TypedQuery<DryRunCompound> q = em.createQuery("SELECT o FROM DryRunCompound AS o WHERE o.CdId = :CdId", DryRunCompound.class);
-        q.setParameter("CdId", CdId);
-        return q;
-    }
-    
-    public static TypedQuery<DryRunCompound> DryRunCompound.findDryRunCompoundsByCdId(int CdId, String sortFieldName, String sortOrder) {
-        EntityManager em = DryRunCompound.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DryRunCompound AS o WHERE o.CdId = :CdId");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<DryRunCompound> q = em.createQuery(queryBuilder.toString(), DryRunCompound.class);
-        q.setParameter("CdId", CdId);
-        return q;
-    }
-    
-    public static TypedQuery<DryRunCompound> DryRunCompound.findDryRunCompoundsByCorpNameEquals(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        EntityManager em = DryRunCompound.entityManager();
-        TypedQuery<DryRunCompound> q = em.createQuery("SELECT o FROM DryRunCompound AS o WHERE o.corpName = :corpName", DryRunCompound.class);
-        q.setParameter("corpName", corpName);
-        return q;
-    }
-    
-    public static TypedQuery<DryRunCompound> DryRunCompound.findDryRunCompoundsByCorpNameEquals(String corpName, String sortFieldName, String sortOrder) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        EntityManager em = DryRunCompound.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DryRunCompound AS o WHERE o.corpName = :corpName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<DryRunCompound> q = em.createQuery(queryBuilder.toString(), DryRunCompound.class);
-        q.setParameter("corpName", corpName);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/DryRunCompound_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/DryRunCompound_Roo_JavaBean.aj
deleted file mode 100644
index 7bcf2eaed..000000000
--- a/src/main/java/com/labsynch/labseer/domain/DryRunCompound_Roo_JavaBean.aj
+++ /dev/null
@@ -1,58 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.DryRunCompound;
-
-privileged aspect DryRunCompound_Roo_JavaBean {
-    
-    public String DryRunCompound.getCorpName() {
-        return this.corpName;
-    }
-    
-    public void DryRunCompound.setCorpName(String corpName) {
-        this.corpName = corpName;
-    }
-    
-    public String DryRunCompound.getStereoCategory() {
-        return this.stereoCategory;
-    }
-    
-    public void DryRunCompound.setStereoCategory(String stereoCategory) {
-        this.stereoCategory = stereoCategory;
-    }
-    
-    public String DryRunCompound.getStereoComment() {
-        return this.stereoComment;
-    }
-    
-    public void DryRunCompound.setStereoComment(String stereoComment) {
-        this.stereoComment = stereoComment;
-    }
-    
-    public int DryRunCompound.getCdId() {
-        return this.CdId;
-    }
-    
-    public void DryRunCompound.setCdId(int CdId) {
-        this.CdId = CdId;
-    }
-    
-    public int DryRunCompound.getRecordNumber() {
-        return this.RecordNumber;
-    }
-    
-    public void DryRunCompound.setRecordNumber(int RecordNumber) {
-        this.RecordNumber = RecordNumber;
-    }
-    
-    public String DryRunCompound.getMolStructure() {
-        return this.molStructure;
-    }
-    
-    public void DryRunCompound.setMolStructure(String molStructure) {
-        this.molStructure = molStructure;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/DryRunCompound_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/DryRunCompound_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index b6282de92..000000000
--- a/src/main/java/com/labsynch/labseer/domain/DryRunCompound_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.DryRunCompound;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect DryRunCompound_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager DryRunCompound.entityManager;
-    
-    public static final List<String> DryRunCompound.fieldNames4OrderClauseFilter = java.util.Arrays.asList("corpName", "stereoCategory", "stereoComment", "CdId", "RecordNumber", "molStructure");
-    
-    public static final EntityManager DryRunCompound.entityManager() {
-        EntityManager em = new DryRunCompound().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long DryRunCompound.countDryRunCompounds() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM DryRunCompound o", Long.class).getSingleResult();
-    }
-    
-    public static List<DryRunCompound> DryRunCompound.findAllDryRunCompounds() {
-        return entityManager().createQuery("SELECT o FROM DryRunCompound o", DryRunCompound.class).getResultList();
-    }
-    
-    public static List<DryRunCompound> DryRunCompound.findAllDryRunCompounds(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM DryRunCompound o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, DryRunCompound.class).getResultList();
-    }
-    
-    public static DryRunCompound DryRunCompound.findDryRunCompound(Long id) {
-        if (id == null) return null;
-        return entityManager().find(DryRunCompound.class, id);
-    }
-    
-    public static List<DryRunCompound> DryRunCompound.findDryRunCompoundEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM DryRunCompound o", DryRunCompound.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<DryRunCompound> DryRunCompound.findDryRunCompoundEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM DryRunCompound o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, DryRunCompound.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void DryRunCompound.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void DryRunCompound.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            DryRunCompound attached = DryRunCompound.findDryRunCompound(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void DryRunCompound.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void DryRunCompound.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public DryRunCompound DryRunCompound.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        DryRunCompound merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/DryRunCompound_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/DryRunCompound_Roo_Jpa_Entity.aj
deleted file mode 100644
index 7632ccf36..000000000
--- a/src/main/java/com/labsynch/labseer/domain/DryRunCompound_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.DryRunCompound;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect DryRunCompound_Roo_Jpa_Entity {
-    
-    declare @type: DryRunCompound: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long DryRunCompound.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer DryRunCompound.version;
-    
-    public Long DryRunCompound.getId() {
-        return this.id;
-    }
-    
-    public void DryRunCompound.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer DryRunCompound.getVersion() {
-        return this.version;
-    }
-    
-    public void DryRunCompound.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/DryRunCompound_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/DryRunCompound_Roo_Json.aj
deleted file mode 100644
index 0ddeeea43..000000000
--- a/src/main/java/com/labsynch/labseer/domain/DryRunCompound_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.DryRunCompound;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect DryRunCompound_Roo_Json {
-    
-    public String DryRunCompound.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String DryRunCompound.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static DryRunCompound DryRunCompound.fromJsonToDryRunCompound(String json) {
-        return new JSONDeserializer<DryRunCompound>()
-        .use(null, DryRunCompound.class).deserialize(json);
-    }
-    
-    public static String DryRunCompound.toJsonArray(Collection<DryRunCompound> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String DryRunCompound.toJsonArray(Collection<DryRunCompound> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<DryRunCompound> DryRunCompound.fromJsonArrayToDryRunCompounds(String json) {
-        return new JSONDeserializer<List<DryRunCompound>>()
-        .use("values", DryRunCompound.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/DryRunCompound_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/DryRunCompound_Roo_ToString.aj
deleted file mode 100644
index cca70f7bb..000000000
--- a/src/main/java/com/labsynch/labseer/domain/DryRunCompound_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.DryRunCompound;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect DryRunCompound_Roo_ToString {
-    
-    public String DryRunCompound.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Experiment.java b/src/main/java/com/labsynch/labseer/domain/Experiment.java
index 154705854..e6b3e72bf 100755
--- a/src/main/java/com/labsynch/labseer/domain/Experiment.java
+++ b/src/main/java/com/labsynch/labseer/domain/Experiment.java
@@ -10,6 +10,7 @@
 import java.util.Set;
 
 import javax.persistence.CascadeType;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
@@ -21,9 +22,11 @@
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -36,6 +39,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString(excludeFields = { "lsTags", "lsStates", "analysisGroups", "lsLabels" })
 @RooJson
@@ -579,4 +584,472 @@ public static TypedQuery<Experiment> findExperimentByLabelText(String experiment
         
         return q;
 	}
+
+	public String toString() {
+        return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).setExcludeFieldNames("lsTags", "lsStates", "analysisGroups", "lsLabels").toString();
+    }
+
+	public static Long countFindExperimentsByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = Experiment.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE o.codeName = :codeName", Long.class);
+        q.setParameter("codeName", codeName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindExperimentsByCodeNameLike(String codeName) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        codeName = codeName.replace('*', '%');
+        if (codeName.charAt(0) != '%') {
+            codeName = "%" + codeName;
+        }
+        if (codeName.charAt(codeName.length() - 1) != '%') {
+            codeName = codeName + "%";
+        }
+        EntityManager em = Experiment.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)", Long.class);
+        q.setParameter("codeName", codeName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindExperimentsByLsKindEquals(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = Experiment.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE o.lsKind = :lsKind", Long.class);
+        q.setParameter("lsKind", lsKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindExperimentsByLsKindLike(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        lsKind = lsKind.replace('*', '%');
+        if (lsKind.charAt(0) != '%') {
+            lsKind = "%" + lsKind;
+        }
+        if (lsKind.charAt(lsKind.length() - 1) != '%') {
+            lsKind = lsKind + "%";
+        }
+        EntityManager em = Experiment.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)", Long.class);
+        q.setParameter("lsKind", lsKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindExperimentsByLsTransaction(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = Experiment.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindExperimentsByLsTypeEquals(String lsType) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = Experiment.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE o.lsType = :lsType", Long.class);
+        q.setParameter("lsType", lsType);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindExperimentsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = Experiment.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindExperimentsByLsTypeLike(String lsType) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        lsType = lsType.replace('*', '%');
+        if (lsType.charAt(0) != '%') {
+            lsType = "%" + lsType;
+        }
+        if (lsType.charAt(lsType.length() - 1) != '%') {
+            lsType = lsType + "%";
+        }
+        EntityManager em = Experiment.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE LOWER(o.lsType) LIKE LOWER(:lsType)", Long.class);
+        q.setParameter("lsType", lsType);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindExperimentsByProtocol(Protocol protocol) {
+        if (protocol == null) throw new IllegalArgumentException("The protocol argument is required");
+        EntityManager em = Experiment.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE o.protocol = :protocol", Long.class);
+        q.setParameter("protocol", protocol);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindExperimentsByRecordedByLike(String recordedBy) {
+        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+        recordedBy = recordedBy.replace('*', '%');
+        if (recordedBy.charAt(0) != '%') {
+            recordedBy = "%" + recordedBy;
+        }
+        if (recordedBy.charAt(recordedBy.length() - 1) != '%') {
+            recordedBy = recordedBy + "%";
+        }
+        EntityManager em = Experiment.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)", Long.class);
+        q.setParameter("recordedBy", recordedBy);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<Experiment> findExperimentsByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = Experiment.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE o.codeName = :codeName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Experiment> q = em.createQuery(queryBuilder.toString(), Experiment.class);
+        q.setParameter("codeName", codeName);
+        return q;
+    }
+
+	public static TypedQuery<Experiment> findExperimentsByCodeNameLike(String codeName) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        codeName = codeName.replace('*', '%');
+        if (codeName.charAt(0) != '%') {
+            codeName = "%" + codeName;
+        }
+        if (codeName.charAt(codeName.length() - 1) != '%') {
+            codeName = codeName + "%";
+        }
+        EntityManager em = Experiment.entityManager();
+        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)", Experiment.class);
+        q.setParameter("codeName", codeName);
+        return q;
+    }
+
+	public static TypedQuery<Experiment> findExperimentsByCodeNameLike(String codeName, String sortFieldName, String sortOrder) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        codeName = codeName.replace('*', '%');
+        if (codeName.charAt(0) != '%') {
+            codeName = "%" + codeName;
+        }
+        if (codeName.charAt(codeName.length() - 1) != '%') {
+            codeName = codeName + "%";
+        }
+        EntityManager em = Experiment.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Experiment> q = em.createQuery(queryBuilder.toString(), Experiment.class);
+        q.setParameter("codeName", codeName);
+        return q;
+    }
+
+	public static TypedQuery<Experiment> findExperimentsByLsKindEquals(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = Experiment.entityManager();
+        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE o.lsKind = :lsKind", Experiment.class);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<Experiment> findExperimentsByLsKindEquals(String lsKind, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = Experiment.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE o.lsKind = :lsKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Experiment> q = em.createQuery(queryBuilder.toString(), Experiment.class);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<Experiment> findExperimentsByLsKindLike(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        lsKind = lsKind.replace('*', '%');
+        if (lsKind.charAt(0) != '%') {
+            lsKind = "%" + lsKind;
+        }
+        if (lsKind.charAt(lsKind.length() - 1) != '%') {
+            lsKind = lsKind + "%";
+        }
+        EntityManager em = Experiment.entityManager();
+        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)", Experiment.class);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<Experiment> findExperimentsByLsKindLike(String lsKind, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        lsKind = lsKind.replace('*', '%');
+        if (lsKind.charAt(0) != '%') {
+            lsKind = "%" + lsKind;
+        }
+        if (lsKind.charAt(lsKind.length() - 1) != '%') {
+            lsKind = lsKind + "%";
+        }
+        EntityManager em = Experiment.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Experiment> q = em.createQuery(queryBuilder.toString(), Experiment.class);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<Experiment> findExperimentsByLsTransaction(Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = Experiment.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE o.lsTransaction = :lsTransaction");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Experiment> q = em.createQuery(queryBuilder.toString(), Experiment.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<Experiment> findExperimentsByLsTypeEquals(String lsType) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = Experiment.entityManager();
+        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE o.lsType = :lsType", Experiment.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<Experiment> findExperimentsByLsTypeEquals(String lsType, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = Experiment.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE o.lsType = :lsType");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Experiment> q = em.createQuery(queryBuilder.toString(), Experiment.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<Experiment> findExperimentsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = Experiment.entityManager();
+        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Experiment.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<Experiment> findExperimentsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = Experiment.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Experiment> q = em.createQuery(queryBuilder.toString(), Experiment.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<Experiment> findExperimentsByLsTypeLike(String lsType) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        lsType = lsType.replace('*', '%');
+        if (lsType.charAt(0) != '%') {
+            lsType = "%" + lsType;
+        }
+        if (lsType.charAt(lsType.length() - 1) != '%') {
+            lsType = lsType + "%";
+        }
+        EntityManager em = Experiment.entityManager();
+        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE LOWER(o.lsType) LIKE LOWER(:lsType)", Experiment.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<Experiment> findExperimentsByLsTypeLike(String lsType, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        lsType = lsType.replace('*', '%');
+        if (lsType.charAt(0) != '%') {
+            lsType = "%" + lsType;
+        }
+        if (lsType.charAt(lsType.length() - 1) != '%') {
+            lsType = lsType + "%";
+        }
+        EntityManager em = Experiment.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE LOWER(o.lsType) LIKE LOWER(:lsType)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Experiment> q = em.createQuery(queryBuilder.toString(), Experiment.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<Experiment> findExperimentsByProtocol(Protocol protocol, String sortFieldName, String sortOrder) {
+        if (protocol == null) throw new IllegalArgumentException("The protocol argument is required");
+        EntityManager em = Experiment.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE o.protocol = :protocol");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Experiment> q = em.createQuery(queryBuilder.toString(), Experiment.class);
+        q.setParameter("protocol", protocol);
+        return q;
+    }
+
+	public static TypedQuery<Experiment> findExperimentsByRecordedByLike(String recordedBy) {
+        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+        recordedBy = recordedBy.replace('*', '%');
+        if (recordedBy.charAt(0) != '%') {
+            recordedBy = "%" + recordedBy;
+        }
+        if (recordedBy.charAt(recordedBy.length() - 1) != '%') {
+            recordedBy = recordedBy + "%";
+        }
+        EntityManager em = Experiment.entityManager();
+        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)", Experiment.class);
+        q.setParameter("recordedBy", recordedBy);
+        return q;
+    }
+
+	public static TypedQuery<Experiment> findExperimentsByRecordedByLike(String recordedBy, String sortFieldName, String sortOrder) {
+        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+        recordedBy = recordedBy.replace('*', '%');
+        if (recordedBy.charAt(0) != '%') {
+            recordedBy = "%" + recordedBy;
+        }
+        if (recordedBy.charAt(recordedBy.length() - 1) != '%') {
+            recordedBy = recordedBy + "%";
+        }
+        EntityManager em = Experiment.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Experiment> q = em.createQuery(queryBuilder.toString(), Experiment.class);
+        q.setParameter("recordedBy", recordedBy);
+        return q;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "shortDescription", "protocol", "lsStates", "firstExperiments", "secondExperiments", "analysisGroups", "lsLabels", "lsTags");
+
+	public static List<Experiment> findAllExperiments(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM Experiment o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, Experiment.class).getResultList();
+    }
+
+	public static List<Experiment> findExperimentEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM Experiment o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, Experiment.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public String getShortDescription() {
+        return this.shortDescription;
+    }
+
+	public void setShortDescription(String shortDescription) {
+        this.shortDescription = shortDescription;
+    }
+
+	public Protocol getProtocol() {
+        return this.protocol;
+    }
+
+	public void setProtocol(Protocol protocol) {
+        this.protocol = protocol;
+    }
+
+	public Set<ExperimentState> getLsStates() {
+        return this.lsStates;
+    }
+
+	public void setLsStates(Set<ExperimentState> lsStates) {
+        this.lsStates = lsStates;
+    }
+
+	public Set<ItxExperimentExperiment> getFirstExperiments() {
+        return this.firstExperiments;
+    }
+
+	public void setFirstExperiments(Set<ItxExperimentExperiment> firstExperiments) {
+        this.firstExperiments = firstExperiments;
+    }
+
+	public Set<ItxExperimentExperiment> getSecondExperiments() {
+        return this.secondExperiments;
+    }
+
+	public void setSecondExperiments(Set<ItxExperimentExperiment> secondExperiments) {
+        this.secondExperiments = secondExperiments;
+    }
+
+	public Set<AnalysisGroup> getAnalysisGroups() {
+        return this.analysisGroups;
+    }
+
+	public void setAnalysisGroups(Set<AnalysisGroup> analysisGroups) {
+        this.analysisGroups = analysisGroups;
+    }
+
+	public Set<ExperimentLabel> getLsLabels() {
+        return this.lsLabels;
+    }
+
+	public void setLsLabels(Set<ExperimentLabel> lsLabels) {
+        this.lsLabels = lsLabels;
+    }
+
+	public Set<LsTag> getLsTags() {
+        return this.lsTags;
+    }
+
+	public void setLsTags(Set<LsTag> lsTags) {
+        this.lsTags = lsTags;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentKind.java b/src/main/java/com/labsynch/labseer/domain/ExperimentKind.java
index 7651011c2..617b40b42 100755
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ExperimentKind.java
@@ -1,8 +1,12 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.List;
 
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
@@ -11,16 +15,21 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord(sequenceName = "EXPERIMENT_KIND_PKSEQ", finders={"findExperimentKindsByLsTypeEqualsAndKindNameEquals"})
@@ -131,4 +140,123 @@ public com.labsynch.labseer.domain.ExperimentKind merge() {
         this.entityManager.flush();
         return merged;
     }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
+
+	public static List<ExperimentKind> findAllExperimentKinds(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ExperimentKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ExperimentKind.class).getResultList();
+    }
+
+	public static List<ExperimentKind> findExperimentKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ExperimentKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ExperimentKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public ExperimentType getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(ExperimentType lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getKindName() {
+        return this.kindName;
+    }
+
+	public void setKindName(String kindName) {
+        this.kindName = kindName;
+    }
+
+	public String getLsTypeAndKind() {
+        return this.lsTypeAndKind;
+    }
+
+	public void setLsTypeAndKind(String lsTypeAndKind) {
+        this.lsTypeAndKind = lsTypeAndKind;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static Long countFindExperimentKindsByLsTypeEqualsAndKindNameEquals(ExperimentType lsType, String kindName) {
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        EntityManager em = ExperimentKind.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentKind AS o WHERE o.lsType = :lsType  AND o.kindName = :kindName", Long.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("kindName", kindName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ExperimentKind> findExperimentKindsByLsTypeEqualsAndKindNameEquals(ExperimentType lsType, String kindName) {
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        EntityManager em = ExperimentKind.entityManager();
+        TypedQuery<ExperimentKind> q = em.createQuery("SELECT o FROM ExperimentKind AS o WHERE o.lsType = :lsType  AND o.kindName = :kindName", ExperimentKind.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("kindName", kindName);
+        return q;
+    }
+
+	public static TypedQuery<ExperimentKind> findExperimentKindsByLsTypeEqualsAndKindNameEquals(ExperimentType lsType, String kindName, String sortFieldName, String sortOrder) {
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        EntityManager em = ExperimentKind.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentKind AS o WHERE o.lsType = :lsType  AND o.kindName = :kindName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ExperimentKind> q = em.createQuery(queryBuilder.toString(), ExperimentKind.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("kindName", kindName);
+        return q;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ExperimentKind fromJsonToExperimentKind(String json) {
+        return new JSONDeserializer<ExperimentKind>()
+        .use(null, ExperimentKind.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ExperimentKind> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ExperimentKind> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ExperimentKind> fromJsonArrayToExperimentKinds(String json) {
+        return new JSONDeserializer<List<ExperimentKind>>()
+        .use("values", ExperimentKind.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentKind_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentKind_Roo_Configurable.aj
deleted file mode 100755
index 64b2a1f8c..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentKind_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentKind;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ExperimentKind_Roo_Configurable {
-    
-    declare @type: ExperimentKind: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentKind_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentKind_Roo_Finder.aj
deleted file mode 100644
index 2f14c7fc0..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentKind_Roo_Finder.aj
+++ /dev/null
@@ -1,50 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentKind;
-import com.labsynch.labseer.domain.ExperimentType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ExperimentKind_Roo_Finder {
-    
-    public static Long ExperimentKind.countFindExperimentKindsByLsTypeEqualsAndKindNameEquals(ExperimentType lsType, String kindName) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        EntityManager em = ExperimentKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentKind AS o WHERE o.lsType = :lsType  AND o.kindName = :kindName", Long.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("kindName", kindName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ExperimentKind> ExperimentKind.findExperimentKindsByLsTypeEqualsAndKindNameEquals(ExperimentType lsType, String kindName) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        EntityManager em = ExperimentKind.entityManager();
-        TypedQuery<ExperimentKind> q = em.createQuery("SELECT o FROM ExperimentKind AS o WHERE o.lsType = :lsType  AND o.kindName = :kindName", ExperimentKind.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("kindName", kindName);
-        return q;
-    }
-    
-    public static TypedQuery<ExperimentKind> ExperimentKind.findExperimentKindsByLsTypeEqualsAndKindNameEquals(ExperimentType lsType, String kindName, String sortFieldName, String sortOrder) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        EntityManager em = ExperimentKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentKind AS o WHERE o.lsType = :lsType  AND o.kindName = :kindName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ExperimentKind> q = em.createQuery(queryBuilder.toString(), ExperimentKind.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("kindName", kindName);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentKind_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentKind_Roo_JavaBean.aj
deleted file mode 100755
index 71f0d66ad..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentKind_Roo_JavaBean.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentKind;
-import com.labsynch.labseer.domain.ExperimentType;
-
-privileged aspect ExperimentKind_Roo_JavaBean {
-    
-    public ExperimentType ExperimentKind.getLsType() {
-        return this.lsType;
-    }
-    
-    public void ExperimentKind.setLsType(ExperimentType lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String ExperimentKind.getKindName() {
-        return this.kindName;
-    }
-    
-    public void ExperimentKind.setKindName(String kindName) {
-        this.kindName = kindName;
-    }
-    
-    public String ExperimentKind.getLsTypeAndKind() {
-        return this.lsTypeAndKind;
-    }
-    
-    public void ExperimentKind.setLsTypeAndKind(String lsTypeAndKind) {
-        this.lsTypeAndKind = lsTypeAndKind;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentKind_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentKind_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index ddee57d0c..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentKind_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentKind;
-import java.util.List;
-
-privileged aspect ExperimentKind_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ExperimentKind.fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
-    
-    public static List<ExperimentKind> ExperimentKind.findAllExperimentKinds(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ExperimentKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ExperimentKind.class).getResultList();
-    }
-    
-    public static List<ExperimentKind> ExperimentKind.findExperimentKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ExperimentKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ExperimentKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentKind_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentKind_Roo_Jpa_Entity.aj
deleted file mode 100644
index 5554ad3bd..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentKind_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentKind;
-import javax.persistence.Entity;
-
-privileged aspect ExperimentKind_Roo_Jpa_Entity {
-    
-    declare @type: ExperimentKind: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentKind_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentKind_Roo_Json.aj
deleted file mode 100755
index 346e0e9ab..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentKind_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentKind;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ExperimentKind_Roo_Json {
-    
-    public String ExperimentKind.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ExperimentKind.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ExperimentKind ExperimentKind.fromJsonToExperimentKind(String json) {
-        return new JSONDeserializer<ExperimentKind>()
-        .use(null, ExperimentKind.class).deserialize(json);
-    }
-    
-    public static String ExperimentKind.toJsonArray(Collection<ExperimentKind> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ExperimentKind.toJsonArray(Collection<ExperimentKind> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ExperimentKind> ExperimentKind.fromJsonArrayToExperimentKinds(String json) {
-        return new JSONDeserializer<List<ExperimentKind>>()
-        .use("values", ExperimentKind.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentKind_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentKind_Roo_ToString.aj
deleted file mode 100755
index 812a41804..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentKind_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentKind;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ExperimentKind_Roo_ToString {
-    
-    public String ExperimentKind.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentLabel.java b/src/main/java/com/labsynch/labseer/domain/ExperimentLabel.java
index 2fe9b747c..f0ae7e068 100755
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/ExperimentLabel.java
@@ -7,15 +7,17 @@
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
-
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -28,6 +30,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -232,4 +236,287 @@ public static Collection<com.labsynch.labseer.domain.ExperimentLabel> fromJsonAr
     public static Collection<com.labsynch.labseer.domain.ExperimentLabel> fromJsonArrayToExperimentLabels(Reader json) {
         return new JSONDeserializer<List<ExperimentLabel>>().use(null, ArrayList.class).use("values", ExperimentLabel.class).deserialize(json);
     }
+
+	public ExperimentLabel() {
+        super();
+    }
+
+	public Experiment getExperiment() {
+        return this.experiment;
+    }
+
+	public void setExperiment(Experiment experiment) {
+        this.experiment = experiment;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "experiment");
+
+	public static long countExperimentLabels() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ExperimentLabel o", Long.class).getSingleResult();
+    }
+
+	public static List<ExperimentLabel> findAllExperimentLabels() {
+        return entityManager().createQuery("SELECT o FROM ExperimentLabel o", ExperimentLabel.class).getResultList();
+    }
+
+	public static List<ExperimentLabel> findAllExperimentLabels(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ExperimentLabel o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ExperimentLabel.class).getResultList();
+    }
+
+	public static ExperimentLabel findExperimentLabel(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ExperimentLabel.class, id);
+    }
+
+	public static List<ExperimentLabel> findExperimentLabelEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ExperimentLabel o", ExperimentLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ExperimentLabel> findExperimentLabelEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ExperimentLabel o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ExperimentLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public ExperimentLabel merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ExperimentLabel merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public static Long countFindExperimentLabelsByExperiment(Experiment experiment) {
+        if (experiment == null) throw new IllegalArgumentException("The experiment argument is required");
+        EntityManager em = ExperimentLabel.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentLabel AS o WHERE o.experiment = :experiment", Long.class);
+        q.setParameter("experiment", experiment);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindExperimentLabelsByExperimentAndIgnoredNot(Experiment experiment, boolean ignored) {
+        if (experiment == null) throw new IllegalArgumentException("The experiment argument is required");
+        EntityManager em = ExperimentLabel.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentLabel AS o WHERE o.experiment = :experiment AND o.ignored IS NOT :ignored", Long.class);
+        q.setParameter("experiment", experiment);
+        q.setParameter("ignored", ignored);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindExperimentLabelsByLabelTextLike(String labelText) {
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        labelText = labelText.replace('*', '%');
+        if (labelText.charAt(0) != '%') {
+            labelText = "%" + labelText;
+        }
+        if (labelText.charAt(labelText.length() - 1) != '%') {
+            labelText = labelText + "%";
+        }
+        EntityManager em = ExperimentLabel.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", Long.class);
+        q.setParameter("labelText", labelText);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(String labelText, String lsTypeAndKind, boolean preferred, boolean ignored) {
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        labelText = labelText.replace('*', '%');
+        if (labelText.charAt(0) != '%') {
+            labelText = "%" + labelText;
+        }
+        if (labelText.charAt(labelText.length() - 1) != '%') {
+            labelText = labelText + "%";
+        }
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        EntityManager em = ExperimentLabel.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)  AND o.lsTypeAndKind = :lsTypeAndKind  AND o.preferred IS NOT :preferred  AND o.ignored IS NOT :ignored", Long.class);
+        q.setParameter("labelText", labelText);
+        q.setParameter("lsTypeAndKind", lsTypeAndKind);
+        q.setParameter("preferred", preferred);
+        q.setParameter("ignored", ignored);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindExperimentLabelsByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(String lsTypeAndKind, boolean preferred, boolean ignored) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        EntityManager em = ExperimentLabel.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentLabel AS o WHERE o.lsTypeAndKind = :lsTypeAndKind  AND o.preferred IS NOT :preferred  AND o.ignored IS NOT :ignored", Long.class);
+        q.setParameter("lsTypeAndKind", lsTypeAndKind);
+        q.setParameter("preferred", preferred);
+        q.setParameter("ignored", ignored);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ExperimentLabel> findExperimentLabelsByExperiment(Experiment experiment) {
+        if (experiment == null) throw new IllegalArgumentException("The experiment argument is required");
+        EntityManager em = ExperimentLabel.entityManager();
+        TypedQuery<ExperimentLabel> q = em.createQuery("SELECT o FROM ExperimentLabel AS o WHERE o.experiment = :experiment", ExperimentLabel.class);
+        q.setParameter("experiment", experiment);
+        return q;
+    }
+
+	public static TypedQuery<ExperimentLabel> findExperimentLabelsByExperiment(Experiment experiment, String sortFieldName, String sortOrder) {
+        if (experiment == null) throw new IllegalArgumentException("The experiment argument is required");
+        EntityManager em = ExperimentLabel.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentLabel AS o WHERE o.experiment = :experiment");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ExperimentLabel> q = em.createQuery(queryBuilder.toString(), ExperimentLabel.class);
+        q.setParameter("experiment", experiment);
+        return q;
+    }
+
+	public static TypedQuery<ExperimentLabel> findExperimentLabelsByExperimentAndIgnoredNot(Experiment experiment, boolean ignored) {
+        if (experiment == null) throw new IllegalArgumentException("The experiment argument is required");
+        EntityManager em = ExperimentLabel.entityManager();
+        TypedQuery<ExperimentLabel> q = em.createQuery("SELECT o FROM ExperimentLabel AS o WHERE o.experiment = :experiment AND o.ignored IS NOT :ignored", ExperimentLabel.class);
+        q.setParameter("experiment", experiment);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<ExperimentLabel> findExperimentLabelsByExperimentAndIgnoredNot(Experiment experiment, boolean ignored, String sortFieldName, String sortOrder) {
+        if (experiment == null) throw new IllegalArgumentException("The experiment argument is required");
+        EntityManager em = ExperimentLabel.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentLabel AS o WHERE o.experiment = :experiment AND o.ignored IS NOT :ignored");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ExperimentLabel> q = em.createQuery(queryBuilder.toString(), ExperimentLabel.class);
+        q.setParameter("experiment", experiment);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<ExperimentLabel> findExperimentLabelsByLabelTextLike(String labelText) {
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        labelText = labelText.replace('*', '%');
+        if (labelText.charAt(0) != '%') {
+            labelText = "%" + labelText;
+        }
+        if (labelText.charAt(labelText.length() - 1) != '%') {
+            labelText = labelText + "%";
+        }
+        EntityManager em = ExperimentLabel.entityManager();
+        TypedQuery<ExperimentLabel> q = em.createQuery("SELECT o FROM ExperimentLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", ExperimentLabel.class);
+        q.setParameter("labelText", labelText);
+        return q;
+    }
+
+	public static TypedQuery<ExperimentLabel> findExperimentLabelsByLabelTextLike(String labelText, String sortFieldName, String sortOrder) {
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        labelText = labelText.replace('*', '%');
+        if (labelText.charAt(0) != '%') {
+            labelText = "%" + labelText;
+        }
+        if (labelText.charAt(labelText.length() - 1) != '%') {
+            labelText = labelText + "%";
+        }
+        EntityManager em = ExperimentLabel.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ExperimentLabel> q = em.createQuery(queryBuilder.toString(), ExperimentLabel.class);
+        q.setParameter("labelText", labelText);
+        return q;
+    }
+
+	public static TypedQuery<ExperimentLabel> findExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(String labelText, String lsTypeAndKind, boolean preferred, boolean ignored) {
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        labelText = labelText.replace('*', '%');
+        if (labelText.charAt(0) != '%') {
+            labelText = "%" + labelText;
+        }
+        if (labelText.charAt(labelText.length() - 1) != '%') {
+            labelText = labelText + "%";
+        }
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        EntityManager em = ExperimentLabel.entityManager();
+        TypedQuery<ExperimentLabel> q = em.createQuery("SELECT o FROM ExperimentLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)  AND o.lsTypeAndKind = :lsTypeAndKind  AND o.preferred IS NOT :preferred  AND o.ignored IS NOT :ignored", ExperimentLabel.class);
+        q.setParameter("labelText", labelText);
+        q.setParameter("lsTypeAndKind", lsTypeAndKind);
+        q.setParameter("preferred", preferred);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<ExperimentLabel> findExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(String labelText, String lsTypeAndKind, boolean preferred, boolean ignored, String sortFieldName, String sortOrder) {
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        labelText = labelText.replace('*', '%');
+        if (labelText.charAt(0) != '%') {
+            labelText = "%" + labelText;
+        }
+        if (labelText.charAt(labelText.length() - 1) != '%') {
+            labelText = labelText + "%";
+        }
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        EntityManager em = ExperimentLabel.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)  AND o.lsTypeAndKind = :lsTypeAndKind  AND o.preferred IS NOT :preferred  AND o.ignored IS NOT :ignored");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ExperimentLabel> q = em.createQuery(queryBuilder.toString(), ExperimentLabel.class);
+        q.setParameter("labelText", labelText);
+        q.setParameter("lsTypeAndKind", lsTypeAndKind);
+        q.setParameter("preferred", preferred);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<ExperimentLabel> findExperimentLabelsByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(String lsTypeAndKind, boolean preferred, boolean ignored) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        EntityManager em = ExperimentLabel.entityManager();
+        TypedQuery<ExperimentLabel> q = em.createQuery("SELECT o FROM ExperimentLabel AS o WHERE o.lsTypeAndKind = :lsTypeAndKind  AND o.preferred IS NOT :preferred  AND o.ignored IS NOT :ignored", ExperimentLabel.class);
+        q.setParameter("lsTypeAndKind", lsTypeAndKind);
+        q.setParameter("preferred", preferred);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<ExperimentLabel> findExperimentLabelsByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(String lsTypeAndKind, boolean preferred, boolean ignored, String sortFieldName, String sortOrder) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        EntityManager em = ExperimentLabel.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentLabel AS o WHERE o.lsTypeAndKind = :lsTypeAndKind  AND o.preferred IS NOT :preferred  AND o.ignored IS NOT :ignored");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ExperimentLabel> q = em.createQuery(queryBuilder.toString(), ExperimentLabel.class);
+        q.setParameter("lsTypeAndKind", lsTypeAndKind);
+        q.setParameter("preferred", preferred);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentLabel_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentLabel_Roo_Configurable.aj
deleted file mode 100755
index 69604fdf4..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentLabel_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentLabel;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ExperimentLabel_Roo_Configurable {
-    
-    declare @type: ExperimentLabel: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentLabel_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentLabel_Roo_Finder.aj
deleted file mode 100755
index 4627ebb8f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentLabel_Roo_Finder.aj
+++ /dev/null
@@ -1,231 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentLabel;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ExperimentLabel_Roo_Finder {
-    
-    public static Long ExperimentLabel.countFindExperimentLabelsByExperiment(Experiment experiment) {
-        if (experiment == null) throw new IllegalArgumentException("The experiment argument is required");
-        EntityManager em = ExperimentLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentLabel AS o WHERE o.experiment = :experiment", Long.class);
-        q.setParameter("experiment", experiment);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ExperimentLabel.countFindExperimentLabelsByExperimentAndIgnoredNot(Experiment experiment, boolean ignored) {
-        if (experiment == null) throw new IllegalArgumentException("The experiment argument is required");
-        EntityManager em = ExperimentLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentLabel AS o WHERE o.experiment = :experiment AND o.ignored IS NOT :ignored", Long.class);
-        q.setParameter("experiment", experiment);
-        q.setParameter("ignored", ignored);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ExperimentLabel.countFindExperimentLabelsByLabelTextLike(String labelText) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        labelText = labelText.replace('*', '%');
-        if (labelText.charAt(0) != '%') {
-            labelText = "%" + labelText;
-        }
-        if (labelText.charAt(labelText.length() - 1) != '%') {
-            labelText = labelText + "%";
-        }
-        EntityManager em = ExperimentLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", Long.class);
-        q.setParameter("labelText", labelText);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ExperimentLabel.countFindExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(String labelText, String lsTypeAndKind, boolean preferred, boolean ignored) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        labelText = labelText.replace('*', '%');
-        if (labelText.charAt(0) != '%') {
-            labelText = "%" + labelText;
-        }
-        if (labelText.charAt(labelText.length() - 1) != '%') {
-            labelText = labelText + "%";
-        }
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
-        EntityManager em = ExperimentLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)  AND o.lsTypeAndKind = :lsTypeAndKind  AND o.preferred IS NOT :preferred  AND o.ignored IS NOT :ignored", Long.class);
-        q.setParameter("labelText", labelText);
-        q.setParameter("lsTypeAndKind", lsTypeAndKind);
-        q.setParameter("preferred", preferred);
-        q.setParameter("ignored", ignored);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ExperimentLabel.countFindExperimentLabelsByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(String lsTypeAndKind, boolean preferred, boolean ignored) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
-        EntityManager em = ExperimentLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentLabel AS o WHERE o.lsTypeAndKind = :lsTypeAndKind  AND o.preferred IS NOT :preferred  AND o.ignored IS NOT :ignored", Long.class);
-        q.setParameter("lsTypeAndKind", lsTypeAndKind);
-        q.setParameter("preferred", preferred);
-        q.setParameter("ignored", ignored);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ExperimentLabel> ExperimentLabel.findExperimentLabelsByExperiment(Experiment experiment) {
-        if (experiment == null) throw new IllegalArgumentException("The experiment argument is required");
-        EntityManager em = ExperimentLabel.entityManager();
-        TypedQuery<ExperimentLabel> q = em.createQuery("SELECT o FROM ExperimentLabel AS o WHERE o.experiment = :experiment", ExperimentLabel.class);
-        q.setParameter("experiment", experiment);
-        return q;
-    }
-    
-    public static TypedQuery<ExperimentLabel> ExperimentLabel.findExperimentLabelsByExperiment(Experiment experiment, String sortFieldName, String sortOrder) {
-        if (experiment == null) throw new IllegalArgumentException("The experiment argument is required");
-        EntityManager em = ExperimentLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentLabel AS o WHERE o.experiment = :experiment");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ExperimentLabel> q = em.createQuery(queryBuilder.toString(), ExperimentLabel.class);
-        q.setParameter("experiment", experiment);
-        return q;
-    }
-    
-    public static TypedQuery<ExperimentLabel> ExperimentLabel.findExperimentLabelsByExperimentAndIgnoredNot(Experiment experiment, boolean ignored) {
-        if (experiment == null) throw new IllegalArgumentException("The experiment argument is required");
-        EntityManager em = ExperimentLabel.entityManager();
-        TypedQuery<ExperimentLabel> q = em.createQuery("SELECT o FROM ExperimentLabel AS o WHERE o.experiment = :experiment AND o.ignored IS NOT :ignored", ExperimentLabel.class);
-        q.setParameter("experiment", experiment);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<ExperimentLabel> ExperimentLabel.findExperimentLabelsByExperimentAndIgnoredNot(Experiment experiment, boolean ignored, String sortFieldName, String sortOrder) {
-        if (experiment == null) throw new IllegalArgumentException("The experiment argument is required");
-        EntityManager em = ExperimentLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentLabel AS o WHERE o.experiment = :experiment AND o.ignored IS NOT :ignored");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ExperimentLabel> q = em.createQuery(queryBuilder.toString(), ExperimentLabel.class);
-        q.setParameter("experiment", experiment);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<ExperimentLabel> ExperimentLabel.findExperimentLabelsByLabelTextLike(String labelText) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        labelText = labelText.replace('*', '%');
-        if (labelText.charAt(0) != '%') {
-            labelText = "%" + labelText;
-        }
-        if (labelText.charAt(labelText.length() - 1) != '%') {
-            labelText = labelText + "%";
-        }
-        EntityManager em = ExperimentLabel.entityManager();
-        TypedQuery<ExperimentLabel> q = em.createQuery("SELECT o FROM ExperimentLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", ExperimentLabel.class);
-        q.setParameter("labelText", labelText);
-        return q;
-    }
-    
-    public static TypedQuery<ExperimentLabel> ExperimentLabel.findExperimentLabelsByLabelTextLike(String labelText, String sortFieldName, String sortOrder) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        labelText = labelText.replace('*', '%');
-        if (labelText.charAt(0) != '%') {
-            labelText = "%" + labelText;
-        }
-        if (labelText.charAt(labelText.length() - 1) != '%') {
-            labelText = labelText + "%";
-        }
-        EntityManager em = ExperimentLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ExperimentLabel> q = em.createQuery(queryBuilder.toString(), ExperimentLabel.class);
-        q.setParameter("labelText", labelText);
-        return q;
-    }
-    
-    public static TypedQuery<ExperimentLabel> ExperimentLabel.findExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(String labelText, String lsTypeAndKind, boolean preferred, boolean ignored) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        labelText = labelText.replace('*', '%');
-        if (labelText.charAt(0) != '%') {
-            labelText = "%" + labelText;
-        }
-        if (labelText.charAt(labelText.length() - 1) != '%') {
-            labelText = labelText + "%";
-        }
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
-        EntityManager em = ExperimentLabel.entityManager();
-        TypedQuery<ExperimentLabel> q = em.createQuery("SELECT o FROM ExperimentLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)  AND o.lsTypeAndKind = :lsTypeAndKind  AND o.preferred IS NOT :preferred  AND o.ignored IS NOT :ignored", ExperimentLabel.class);
-        q.setParameter("labelText", labelText);
-        q.setParameter("lsTypeAndKind", lsTypeAndKind);
-        q.setParameter("preferred", preferred);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<ExperimentLabel> ExperimentLabel.findExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(String labelText, String lsTypeAndKind, boolean preferred, boolean ignored, String sortFieldName, String sortOrder) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        labelText = labelText.replace('*', '%');
-        if (labelText.charAt(0) != '%') {
-            labelText = "%" + labelText;
-        }
-        if (labelText.charAt(labelText.length() - 1) != '%') {
-            labelText = labelText + "%";
-        }
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
-        EntityManager em = ExperimentLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)  AND o.lsTypeAndKind = :lsTypeAndKind  AND o.preferred IS NOT :preferred  AND o.ignored IS NOT :ignored");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ExperimentLabel> q = em.createQuery(queryBuilder.toString(), ExperimentLabel.class);
-        q.setParameter("labelText", labelText);
-        q.setParameter("lsTypeAndKind", lsTypeAndKind);
-        q.setParameter("preferred", preferred);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<ExperimentLabel> ExperimentLabel.findExperimentLabelsByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(String lsTypeAndKind, boolean preferred, boolean ignored) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
-        EntityManager em = ExperimentLabel.entityManager();
-        TypedQuery<ExperimentLabel> q = em.createQuery("SELECT o FROM ExperimentLabel AS o WHERE o.lsTypeAndKind = :lsTypeAndKind  AND o.preferred IS NOT :preferred  AND o.ignored IS NOT :ignored", ExperimentLabel.class);
-        q.setParameter("lsTypeAndKind", lsTypeAndKind);
-        q.setParameter("preferred", preferred);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<ExperimentLabel> ExperimentLabel.findExperimentLabelsByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(String lsTypeAndKind, boolean preferred, boolean ignored, String sortFieldName, String sortOrder) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
-        EntityManager em = ExperimentLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentLabel AS o WHERE o.lsTypeAndKind = :lsTypeAndKind  AND o.preferred IS NOT :preferred  AND o.ignored IS NOT :ignored");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ExperimentLabel> q = em.createQuery(queryBuilder.toString(), ExperimentLabel.class);
-        q.setParameter("lsTypeAndKind", lsTypeAndKind);
-        q.setParameter("preferred", preferred);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentLabel_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentLabel_Roo_JavaBean.aj
deleted file mode 100755
index 1c17d7b2f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentLabel_Roo_JavaBean.aj
+++ /dev/null
@@ -1,19 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentLabel;
-
-privileged aspect ExperimentLabel_Roo_JavaBean {
-    
-    public Experiment ExperimentLabel.getExperiment() {
-        return this.experiment;
-    }
-    
-    public void ExperimentLabel.setExperiment(Experiment experiment) {
-        this.experiment = experiment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentLabel_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentLabel_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 9b83d7677..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentLabel_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentLabel;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ExperimentLabel_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ExperimentLabel.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "experiment");
-    
-    public static long ExperimentLabel.countExperimentLabels() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ExperimentLabel o", Long.class).getSingleResult();
-    }
-    
-    public static List<ExperimentLabel> ExperimentLabel.findAllExperimentLabels() {
-        return entityManager().createQuery("SELECT o FROM ExperimentLabel o", ExperimentLabel.class).getResultList();
-    }
-    
-    public static List<ExperimentLabel> ExperimentLabel.findAllExperimentLabels(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ExperimentLabel o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ExperimentLabel.class).getResultList();
-    }
-    
-    public static ExperimentLabel ExperimentLabel.findExperimentLabel(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ExperimentLabel.class, id);
-    }
-    
-    public static List<ExperimentLabel> ExperimentLabel.findExperimentLabelEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ExperimentLabel o", ExperimentLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ExperimentLabel> ExperimentLabel.findExperimentLabelEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ExperimentLabel o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ExperimentLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public ExperimentLabel ExperimentLabel.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ExperimentLabel merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentLabel_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentLabel_Roo_Jpa_Entity.aj
deleted file mode 100755
index 62c826186..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentLabel_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,17 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentLabel;
-import javax.persistence.Entity;
-
-privileged aspect ExperimentLabel_Roo_Jpa_Entity {
-    
-    declare @type: ExperimentLabel: @Entity;
-    
-    public ExperimentLabel.new() {
-        super();
-    }
-
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentLabel_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentLabel_Roo_ToString.aj
deleted file mode 100755
index 199492def..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentLabel_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentLabel;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ExperimentLabel_Roo_ToString {
-    
-    public String ExperimentLabel.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentState.java b/src/main/java/com/labsynch/labseer/domain/ExperimentState.java
index 580a4413d..e66befc57 100755
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ExperimentState.java
@@ -10,6 +10,7 @@
 import java.util.Set;
 
 import javax.persistence.CascadeType;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
@@ -20,6 +21,7 @@
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -32,6 +34,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord(finders = { "findExperimentStatesByExperiment" })
@@ -141,4 +145,100 @@ public static TypedQuery<ExperimentState> findExperimentStatesByExperimentCodeNa
 		q.setParameter("ignored", true);
 		return q;
 	}
+
+	public static Long countFindExperimentStatesByExperiment(Experiment experiment) {
+        if (experiment == null) throw new IllegalArgumentException("The experiment argument is required");
+        EntityManager em = ExperimentState.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentState AS o WHERE o.experiment = :experiment", Long.class);
+        q.setParameter("experiment", experiment);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ExperimentState> findExperimentStatesByExperiment(Experiment experiment) {
+        if (experiment == null) throw new IllegalArgumentException("The experiment argument is required");
+        EntityManager em = ExperimentState.entityManager();
+        TypedQuery<ExperimentState> q = em.createQuery("SELECT o FROM ExperimentState AS o WHERE o.experiment = :experiment", ExperimentState.class);
+        q.setParameter("experiment", experiment);
+        return q;
+    }
+
+	public static TypedQuery<ExperimentState> findExperimentStatesByExperiment(Experiment experiment, String sortFieldName, String sortOrder) {
+        if (experiment == null) throw new IllegalArgumentException("The experiment argument is required");
+        EntityManager em = ExperimentState.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentState AS o WHERE o.experiment = :experiment");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ExperimentState> q = em.createQuery(queryBuilder.toString(), ExperimentState.class);
+        q.setParameter("experiment", experiment);
+        return q;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("experiment", "lsValues");
+
+	public static long countExperimentStates() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ExperimentState o", Long.class).getSingleResult();
+    }
+
+	public static List<ExperimentState> findAllExperimentStates() {
+        return entityManager().createQuery("SELECT o FROM ExperimentState o", ExperimentState.class).getResultList();
+    }
+
+	public static List<ExperimentState> findAllExperimentStates(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ExperimentState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ExperimentState.class).getResultList();
+    }
+
+	public static ExperimentState findExperimentState(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ExperimentState.class, id);
+    }
+
+	public static List<ExperimentState> findExperimentStateEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ExperimentState o", ExperimentState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ExperimentState> findExperimentStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ExperimentState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ExperimentState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public ExperimentState merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ExperimentState merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public Experiment getExperiment() {
+        return this.experiment;
+    }
+
+	public void setExperiment(Experiment experiment) {
+        this.experiment = experiment;
+    }
+
+	public Set<ExperimentValue> getLsValues() {
+        return this.lsValues;
+    }
+
+	public void setLsValues(Set<ExperimentValue> lsValues) {
+        this.lsValues = lsValues;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentState_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentState_Roo_Configurable.aj
deleted file mode 100755
index 776c7f6c4..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentState_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentState;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ExperimentState_Roo_Configurable {
-    
-    declare @type: ExperimentState: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentState_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentState_Roo_Finder.aj
deleted file mode 100755
index 4c841523a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentState_Roo_Finder.aj
+++ /dev/null
@@ -1,44 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentState;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ExperimentState_Roo_Finder {
-    
-    public static Long ExperimentState.countFindExperimentStatesByExperiment(Experiment experiment) {
-        if (experiment == null) throw new IllegalArgumentException("The experiment argument is required");
-        EntityManager em = ExperimentState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentState AS o WHERE o.experiment = :experiment", Long.class);
-        q.setParameter("experiment", experiment);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ExperimentState> ExperimentState.findExperimentStatesByExperiment(Experiment experiment) {
-        if (experiment == null) throw new IllegalArgumentException("The experiment argument is required");
-        EntityManager em = ExperimentState.entityManager();
-        TypedQuery<ExperimentState> q = em.createQuery("SELECT o FROM ExperimentState AS o WHERE o.experiment = :experiment", ExperimentState.class);
-        q.setParameter("experiment", experiment);
-        return q;
-    }
-    
-    public static TypedQuery<ExperimentState> ExperimentState.findExperimentStatesByExperiment(Experiment experiment, String sortFieldName, String sortOrder) {
-        if (experiment == null) throw new IllegalArgumentException("The experiment argument is required");
-        EntityManager em = ExperimentState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentState AS o WHERE o.experiment = :experiment");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ExperimentState> q = em.createQuery(queryBuilder.toString(), ExperimentState.class);
-        q.setParameter("experiment", experiment);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentState_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentState_Roo_JavaBean.aj
deleted file mode 100755
index fdcbb5c60..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentState_Roo_JavaBean.aj
+++ /dev/null
@@ -1,29 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentState;
-import com.labsynch.labseer.domain.ExperimentValue;
-import java.util.Set;
-
-privileged aspect ExperimentState_Roo_JavaBean {
-    
-    public Experiment ExperimentState.getExperiment() {
-        return this.experiment;
-    }
-    
-    public void ExperimentState.setExperiment(Experiment experiment) {
-        this.experiment = experiment;
-    }
-    
-    public Set<ExperimentValue> ExperimentState.getLsValues() {
-        return this.lsValues;
-    }
-    
-    public void ExperimentState.setLsValues(Set<ExperimentValue> lsValues) {
-        this.lsValues = lsValues;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentState_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentState_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index e0f55c6fa..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentState_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentState;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ExperimentState_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ExperimentState.fieldNames4OrderClauseFilter = java.util.Arrays.asList("experiment", "lsValues");
-    
-    public static long ExperimentState.countExperimentStates() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ExperimentState o", Long.class).getSingleResult();
-    }
-    
-    public static List<ExperimentState> ExperimentState.findAllExperimentStates() {
-        return entityManager().createQuery("SELECT o FROM ExperimentState o", ExperimentState.class).getResultList();
-    }
-    
-    public static List<ExperimentState> ExperimentState.findAllExperimentStates(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ExperimentState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ExperimentState.class).getResultList();
-    }
-    
-    public static ExperimentState ExperimentState.findExperimentState(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ExperimentState.class, id);
-    }
-    
-    public static List<ExperimentState> ExperimentState.findExperimentStateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ExperimentState o", ExperimentState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ExperimentState> ExperimentState.findExperimentStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ExperimentState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ExperimentState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public ExperimentState ExperimentState.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ExperimentState merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentState_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentState_Roo_Jpa_Entity.aj
deleted file mode 100755
index f5bceaeae..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentState_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentState;
-import javax.persistence.Entity;
-
-privileged aspect ExperimentState_Roo_Jpa_Entity {
-    
-    declare @type: ExperimentState: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentType.java b/src/main/java/com/labsynch/labseer/domain/ExperimentType.java
index 9a84cc47f..eea4b8634 100755
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentType.java
+++ b/src/main/java/com/labsynch/labseer/domain/ExperimentType.java
@@ -1,14 +1,32 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord(sequenceName = "EXPERIMENT_TYPE_PKSEQ", finders = { "findExperimentTypesByTypeNameEquals" })
@@ -19,4 +37,190 @@ public class ExperimentType {
     @Column(unique = true)
     @Size(max = 128)
     private String typeName;
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ExperimentType fromJsonToExperimentType(String json) {
+        return new JSONDeserializer<ExperimentType>()
+        .use(null, ExperimentType.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ExperimentType> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ExperimentType> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ExperimentType> fromJsonArrayToExperimentTypes(String json) {
+        return new JSONDeserializer<List<ExperimentType>>()
+        .use("values", ExperimentType.class).deserialize(json);
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new ExperimentType().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countExperimentTypes() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ExperimentType o", Long.class).getSingleResult();
+    }
+
+	public static List<ExperimentType> findAllExperimentTypes() {
+        return entityManager().createQuery("SELECT o FROM ExperimentType o", ExperimentType.class).getResultList();
+    }
+
+	public static List<ExperimentType> findAllExperimentTypes(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ExperimentType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ExperimentType.class).getResultList();
+    }
+
+	public static ExperimentType findExperimentType(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ExperimentType.class, id);
+    }
+
+	public static List<ExperimentType> findExperimentTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ExperimentType o", ExperimentType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ExperimentType> findExperimentTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ExperimentType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ExperimentType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            ExperimentType attached = ExperimentType.findExperimentType(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public ExperimentType merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ExperimentType merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public static Long countFindExperimentTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = ExperimentType.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentType AS o WHERE o.typeName = :typeName", Long.class);
+        q.setParameter("typeName", typeName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ExperimentType> findExperimentTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = ExperimentType.entityManager();
+        TypedQuery<ExperimentType> q = em.createQuery("SELECT o FROM ExperimentType AS o WHERE o.typeName = :typeName", ExperimentType.class);
+        q.setParameter("typeName", typeName);
+        return q;
+    }
+
+	public static TypedQuery<ExperimentType> findExperimentTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = ExperimentType.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentType AS o WHERE o.typeName = :typeName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ExperimentType> q = em.createQuery(queryBuilder.toString(), ExperimentType.class);
+        q.setParameter("typeName", typeName);
+        return q;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@Id
+    @SequenceGenerator(name = "experimentTypeGen", sequenceName = "EXPERIMENT_TYPE_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "experimentTypeGen")
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String getTypeName() {
+        return this.typeName;
+    }
+
+	public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentType_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentType_Roo_Configurable.aj
deleted file mode 100755
index 552a60793..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentType_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentType;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ExperimentType_Roo_Configurable {
-    
-    declare @type: ExperimentType: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentType_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentType_Roo_Finder.aj
deleted file mode 100755
index 7ded96002..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentType_Roo_Finder.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ExperimentType_Roo_Finder {
-    
-    public static Long ExperimentType.countFindExperimentTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = ExperimentType.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentType AS o WHERE o.typeName = :typeName", Long.class);
-        q.setParameter("typeName", typeName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ExperimentType> ExperimentType.findExperimentTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = ExperimentType.entityManager();
-        TypedQuery<ExperimentType> q = em.createQuery("SELECT o FROM ExperimentType AS o WHERE o.typeName = :typeName", ExperimentType.class);
-        q.setParameter("typeName", typeName);
-        return q;
-    }
-    
-    public static TypedQuery<ExperimentType> ExperimentType.findExperimentTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = ExperimentType.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentType AS o WHERE o.typeName = :typeName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ExperimentType> q = em.createQuery(queryBuilder.toString(), ExperimentType.class);
-        q.setParameter("typeName", typeName);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentType_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentType_Roo_JavaBean.aj
deleted file mode 100755
index 248fe9261..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentType_Roo_JavaBean.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentType;
-
-privileged aspect ExperimentType_Roo_JavaBean {
-    
-    public String ExperimentType.getTypeName() {
-        return this.typeName;
-    }
-    
-    public void ExperimentType.setTypeName(String typeName) {
-        this.typeName = typeName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentType_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentType_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 782aec751..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentType_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentType;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ExperimentType_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager ExperimentType.entityManager;
-    
-    public static final List<String> ExperimentType.fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName");
-    
-    public static final EntityManager ExperimentType.entityManager() {
-        EntityManager em = new ExperimentType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long ExperimentType.countExperimentTypes() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ExperimentType o", Long.class).getSingleResult();
-    }
-    
-    public static List<ExperimentType> ExperimentType.findAllExperimentTypes() {
-        return entityManager().createQuery("SELECT o FROM ExperimentType o", ExperimentType.class).getResultList();
-    }
-    
-    public static List<ExperimentType> ExperimentType.findAllExperimentTypes(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ExperimentType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ExperimentType.class).getResultList();
-    }
-    
-    public static ExperimentType ExperimentType.findExperimentType(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ExperimentType.class, id);
-    }
-    
-    public static List<ExperimentType> ExperimentType.findExperimentTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ExperimentType o", ExperimentType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ExperimentType> ExperimentType.findExperimentTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ExperimentType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ExperimentType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void ExperimentType.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void ExperimentType.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            ExperimentType attached = ExperimentType.findExperimentType(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void ExperimentType.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void ExperimentType.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public ExperimentType ExperimentType.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ExperimentType merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentType_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentType_Roo_Jpa_Entity.aj
deleted file mode 100755
index 2f9a3d159..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentType_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
-
-privileged aspect ExperimentType_Roo_Jpa_Entity {
-    
-    declare @type: ExperimentType: @Entity;
-    
-    @Id
-    @SequenceGenerator(name = "experimentTypeGen", sequenceName = "EXPERIMENT_TYPE_PKSEQ")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "experimentTypeGen")
-    @Column(name = "id")
-    private Long ExperimentType.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer ExperimentType.version;
-    
-    public Long ExperimentType.getId() {
-        return this.id;
-    }
-    
-    public void ExperimentType.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer ExperimentType.getVersion() {
-        return this.version;
-    }
-    
-    public void ExperimentType.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentType_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentType_Roo_Json.aj
deleted file mode 100755
index ca105a4dc..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentType_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentType;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ExperimentType_Roo_Json {
-    
-    public String ExperimentType.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ExperimentType.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ExperimentType ExperimentType.fromJsonToExperimentType(String json) {
-        return new JSONDeserializer<ExperimentType>()
-        .use(null, ExperimentType.class).deserialize(json);
-    }
-    
-    public static String ExperimentType.toJsonArray(Collection<ExperimentType> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ExperimentType.toJsonArray(Collection<ExperimentType> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ExperimentType> ExperimentType.fromJsonArrayToExperimentTypes(String json) {
-        return new JSONDeserializer<List<ExperimentType>>()
-        .use("values", ExperimentType.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentType_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentType_Roo_ToString.aj
deleted file mode 100755
index 247aaa515..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentType_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentType;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ExperimentType_Roo_ToString {
-    
-    public String ExperimentType.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentValue.java b/src/main/java/com/labsynch/labseer/domain/ExperimentValue.java
index 5fbf18dca..ccac8d23a 100755
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ExperimentValue.java
@@ -7,16 +7,18 @@
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
-
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -26,7 +28,10 @@
 import org.supercsv.cellprocessor.ift.CellProcessor;
 
 import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -294,4 +299,259 @@ public static CellProcessor[] getAllProcessors() {
 	}
 	
 
+
+	public ExperimentState getLsState() {
+        return this.lsState;
+    }
+
+	public void setLsState(ExperimentState lsState) {
+        this.lsState = lsState;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsState");
+
+	public static List<ExperimentValue> findAllExperimentValues(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ExperimentValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ExperimentValue.class).getResultList();
+    }
+
+	public static List<ExperimentValue> findExperimentValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ExperimentValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ExperimentValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static Long countFindExperimentValuesByLsKindEqualsAndCodeValueLike(String lsKind, String codeValue) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        codeValue = codeValue.replace('*', '%');
+        if (codeValue.charAt(0) != '%') {
+            codeValue = "%" + codeValue;
+        }
+        if (codeValue.charAt(codeValue.length() - 1) != '%') {
+            codeValue = codeValue + "%";
+        }
+        EntityManager em = ExperimentValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)", Long.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("codeValue", codeValue);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindExperimentValuesByLsKindEqualsAndStringValueLike(String lsKind, String stringValue) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+        stringValue = stringValue.replace('*', '%');
+        if (stringValue.charAt(0) != '%') {
+            stringValue = "%" + stringValue;
+        }
+        if (stringValue.charAt(stringValue.length() - 1) != '%') {
+            stringValue = stringValue + "%";
+        }
+        EntityManager em = ExperimentValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)", Long.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("stringValue", stringValue);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindExperimentValuesByLsState(ExperimentState lsState) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        EntityManager em = ExperimentValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentValue AS o WHERE o.lsState = :lsState", Long.class);
+        q.setParameter("lsState", lsState);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindExperimentValuesByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals(ExperimentState lsState, boolean ignored, String lsKind, String lsType, String stringValue) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+        EntityManager em = ExperimentValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentValue AS o WHERE o.lsState = :lsState AND o.ignored IS NOT :ignored  AND o.lsKind = :lsKind  AND o.lsType = :lsType  AND o.stringValue = :stringValue", Long.class);
+        q.setParameter("lsState", lsState);
+        q.setParameter("ignored", ignored);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("lsType", lsType);
+        q.setParameter("stringValue", stringValue);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ExperimentValue> findExperimentValuesByLsKindEqualsAndCodeValueLike(String lsKind, String codeValue) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        codeValue = codeValue.replace('*', '%');
+        if (codeValue.charAt(0) != '%') {
+            codeValue = "%" + codeValue;
+        }
+        if (codeValue.charAt(codeValue.length() - 1) != '%') {
+            codeValue = codeValue + "%";
+        }
+        EntityManager em = ExperimentValue.entityManager();
+        TypedQuery<ExperimentValue> q = em.createQuery("SELECT o FROM ExperimentValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)", ExperimentValue.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("codeValue", codeValue);
+        return q;
+    }
+
+	public static TypedQuery<ExperimentValue> findExperimentValuesByLsKindEqualsAndCodeValueLike(String lsKind, String codeValue, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        codeValue = codeValue.replace('*', '%');
+        if (codeValue.charAt(0) != '%') {
+            codeValue = "%" + codeValue;
+        }
+        if (codeValue.charAt(codeValue.length() - 1) != '%') {
+            codeValue = codeValue + "%";
+        }
+        EntityManager em = ExperimentValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ExperimentValue> q = em.createQuery(queryBuilder.toString(), ExperimentValue.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("codeValue", codeValue);
+        return q;
+    }
+
+	public static TypedQuery<ExperimentValue> findExperimentValuesByLsKindEqualsAndStringValueLike(String lsKind, String stringValue) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+        stringValue = stringValue.replace('*', '%');
+        if (stringValue.charAt(0) != '%') {
+            stringValue = "%" + stringValue;
+        }
+        if (stringValue.charAt(stringValue.length() - 1) != '%') {
+            stringValue = stringValue + "%";
+        }
+        EntityManager em = ExperimentValue.entityManager();
+        TypedQuery<ExperimentValue> q = em.createQuery("SELECT o FROM ExperimentValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)", ExperimentValue.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("stringValue", stringValue);
+        return q;
+    }
+
+	public static TypedQuery<ExperimentValue> findExperimentValuesByLsKindEqualsAndStringValueLike(String lsKind, String stringValue, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+        stringValue = stringValue.replace('*', '%');
+        if (stringValue.charAt(0) != '%') {
+            stringValue = "%" + stringValue;
+        }
+        if (stringValue.charAt(stringValue.length() - 1) != '%') {
+            stringValue = stringValue + "%";
+        }
+        EntityManager em = ExperimentValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ExperimentValue> q = em.createQuery(queryBuilder.toString(), ExperimentValue.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("stringValue", stringValue);
+        return q;
+    }
+
+	public static TypedQuery<ExperimentValue> findExperimentValuesByLsState(ExperimentState lsState) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        EntityManager em = ExperimentValue.entityManager();
+        TypedQuery<ExperimentValue> q = em.createQuery("SELECT o FROM ExperimentValue AS o WHERE o.lsState = :lsState", ExperimentValue.class);
+        q.setParameter("lsState", lsState);
+        return q;
+    }
+
+	public static TypedQuery<ExperimentValue> findExperimentValuesByLsState(ExperimentState lsState, String sortFieldName, String sortOrder) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        EntityManager em = ExperimentValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentValue AS o WHERE o.lsState = :lsState");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ExperimentValue> q = em.createQuery(queryBuilder.toString(), ExperimentValue.class);
+        q.setParameter("lsState", lsState);
+        return q;
+    }
+
+	public static TypedQuery<ExperimentValue> findExperimentValuesByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals(ExperimentState lsState, boolean ignored, String lsKind, String lsType, String stringValue) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+        EntityManager em = ExperimentValue.entityManager();
+        TypedQuery<ExperimentValue> q = em.createQuery("SELECT o FROM ExperimentValue AS o WHERE o.lsState = :lsState AND o.ignored IS NOT :ignored  AND o.lsKind = :lsKind  AND o.lsType = :lsType  AND o.stringValue = :stringValue", ExperimentValue.class);
+        q.setParameter("lsState", lsState);
+        q.setParameter("ignored", ignored);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("lsType", lsType);
+        q.setParameter("stringValue", stringValue);
+        return q;
+    }
+
+	public static TypedQuery<ExperimentValue> findExperimentValuesByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals(ExperimentState lsState, boolean ignored, String lsKind, String lsType, String stringValue, String sortFieldName, String sortOrder) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+        EntityManager em = ExperimentValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentValue AS o WHERE o.lsState = :lsState AND o.ignored IS NOT :ignored  AND o.lsKind = :lsKind  AND o.lsType = :lsType  AND o.stringValue = :stringValue");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ExperimentValue> q = em.createQuery(queryBuilder.toString(), ExperimentValue.class);
+        q.setParameter("lsState", lsState);
+        q.setParameter("ignored", ignored);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("lsType", lsType);
+        q.setParameter("stringValue", stringValue);
+        return q;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static String toJsonArray(Collection<ExperimentValue> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ExperimentValue> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentValue_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentValue_Roo_Configurable.aj
deleted file mode 100755
index bbe9e4439..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentValue_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentValue;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ExperimentValue_Roo_Configurable {
-    
-    declare @type: ExperimentValue: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentValue_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentValue_Roo_Finder.aj
deleted file mode 100755
index 8b783545a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentValue_Roo_Finder.aj
+++ /dev/null
@@ -1,212 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentState;
-import com.labsynch.labseer.domain.ExperimentValue;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ExperimentValue_Roo_Finder {
-    
-    public static Long ExperimentValue.countFindExperimentValuesByLsKindEqualsAndCodeValueLike(String lsKind, String codeValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        codeValue = codeValue.replace('*', '%');
-        if (codeValue.charAt(0) != '%') {
-            codeValue = "%" + codeValue;
-        }
-        if (codeValue.charAt(codeValue.length() - 1) != '%') {
-            codeValue = codeValue + "%";
-        }
-        EntityManager em = ExperimentValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)", Long.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("codeValue", codeValue);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ExperimentValue.countFindExperimentValuesByLsKindEqualsAndStringValueLike(String lsKind, String stringValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
-        stringValue = stringValue.replace('*', '%');
-        if (stringValue.charAt(0) != '%') {
-            stringValue = "%" + stringValue;
-        }
-        if (stringValue.charAt(stringValue.length() - 1) != '%') {
-            stringValue = stringValue + "%";
-        }
-        EntityManager em = ExperimentValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)", Long.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("stringValue", stringValue);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ExperimentValue.countFindExperimentValuesByLsState(ExperimentState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = ExperimentValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentValue AS o WHERE o.lsState = :lsState", Long.class);
-        q.setParameter("lsState", lsState);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ExperimentValue.countFindExperimentValuesByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals(ExperimentState lsState, boolean ignored, String lsKind, String lsType, String stringValue) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
-        EntityManager em = ExperimentValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentValue AS o WHERE o.lsState = :lsState AND o.ignored IS NOT :ignored  AND o.lsKind = :lsKind  AND o.lsType = :lsType  AND o.stringValue = :stringValue", Long.class);
-        q.setParameter("lsState", lsState);
-        q.setParameter("ignored", ignored);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("lsType", lsType);
-        q.setParameter("stringValue", stringValue);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ExperimentValue> ExperimentValue.findExperimentValuesByLsKindEqualsAndCodeValueLike(String lsKind, String codeValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        codeValue = codeValue.replace('*', '%');
-        if (codeValue.charAt(0) != '%') {
-            codeValue = "%" + codeValue;
-        }
-        if (codeValue.charAt(codeValue.length() - 1) != '%') {
-            codeValue = codeValue + "%";
-        }
-        EntityManager em = ExperimentValue.entityManager();
-        TypedQuery<ExperimentValue> q = em.createQuery("SELECT o FROM ExperimentValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)", ExperimentValue.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-    
-    public static TypedQuery<ExperimentValue> ExperimentValue.findExperimentValuesByLsKindEqualsAndCodeValueLike(String lsKind, String codeValue, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        codeValue = codeValue.replace('*', '%');
-        if (codeValue.charAt(0) != '%') {
-            codeValue = "%" + codeValue;
-        }
-        if (codeValue.charAt(codeValue.length() - 1) != '%') {
-            codeValue = codeValue + "%";
-        }
-        EntityManager em = ExperimentValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ExperimentValue> q = em.createQuery(queryBuilder.toString(), ExperimentValue.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-    
-    public static TypedQuery<ExperimentValue> ExperimentValue.findExperimentValuesByLsKindEqualsAndStringValueLike(String lsKind, String stringValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
-        stringValue = stringValue.replace('*', '%');
-        if (stringValue.charAt(0) != '%') {
-            stringValue = "%" + stringValue;
-        }
-        if (stringValue.charAt(stringValue.length() - 1) != '%') {
-            stringValue = stringValue + "%";
-        }
-        EntityManager em = ExperimentValue.entityManager();
-        TypedQuery<ExperimentValue> q = em.createQuery("SELECT o FROM ExperimentValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)", ExperimentValue.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("stringValue", stringValue);
-        return q;
-    }
-    
-    public static TypedQuery<ExperimentValue> ExperimentValue.findExperimentValuesByLsKindEqualsAndStringValueLike(String lsKind, String stringValue, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
-        stringValue = stringValue.replace('*', '%');
-        if (stringValue.charAt(0) != '%') {
-            stringValue = "%" + stringValue;
-        }
-        if (stringValue.charAt(stringValue.length() - 1) != '%') {
-            stringValue = stringValue + "%";
-        }
-        EntityManager em = ExperimentValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ExperimentValue> q = em.createQuery(queryBuilder.toString(), ExperimentValue.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("stringValue", stringValue);
-        return q;
-    }
-    
-    public static TypedQuery<ExperimentValue> ExperimentValue.findExperimentValuesByLsState(ExperimentState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = ExperimentValue.entityManager();
-        TypedQuery<ExperimentValue> q = em.createQuery("SELECT o FROM ExperimentValue AS o WHERE o.lsState = :lsState", ExperimentValue.class);
-        q.setParameter("lsState", lsState);
-        return q;
-    }
-    
-    public static TypedQuery<ExperimentValue> ExperimentValue.findExperimentValuesByLsState(ExperimentState lsState, String sortFieldName, String sortOrder) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = ExperimentValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentValue AS o WHERE o.lsState = :lsState");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ExperimentValue> q = em.createQuery(queryBuilder.toString(), ExperimentValue.class);
-        q.setParameter("lsState", lsState);
-        return q;
-    }
-    
-    public static TypedQuery<ExperimentValue> ExperimentValue.findExperimentValuesByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals(ExperimentState lsState, boolean ignored, String lsKind, String lsType, String stringValue) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
-        EntityManager em = ExperimentValue.entityManager();
-        TypedQuery<ExperimentValue> q = em.createQuery("SELECT o FROM ExperimentValue AS o WHERE o.lsState = :lsState AND o.ignored IS NOT :ignored  AND o.lsKind = :lsKind  AND o.lsType = :lsType  AND o.stringValue = :stringValue", ExperimentValue.class);
-        q.setParameter("lsState", lsState);
-        q.setParameter("ignored", ignored);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("lsType", lsType);
-        q.setParameter("stringValue", stringValue);
-        return q;
-    }
-    
-    public static TypedQuery<ExperimentValue> ExperimentValue.findExperimentValuesByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals(ExperimentState lsState, boolean ignored, String lsKind, String lsType, String stringValue, String sortFieldName, String sortOrder) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
-        EntityManager em = ExperimentValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentValue AS o WHERE o.lsState = :lsState AND o.ignored IS NOT :ignored  AND o.lsKind = :lsKind  AND o.lsType = :lsType  AND o.stringValue = :stringValue");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ExperimentValue> q = em.createQuery(queryBuilder.toString(), ExperimentValue.class);
-        q.setParameter("lsState", lsState);
-        q.setParameter("ignored", ignored);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("lsType", lsType);
-        q.setParameter("stringValue", stringValue);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentValue_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentValue_Roo_JavaBean.aj
deleted file mode 100755
index 5a1eefbf3..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentValue_Roo_JavaBean.aj
+++ /dev/null
@@ -1,19 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentState;
-import com.labsynch.labseer.domain.ExperimentValue;
-
-privileged aspect ExperimentValue_Roo_JavaBean {
-    
-    public ExperimentState ExperimentValue.getLsState() {
-        return this.lsState;
-    }
-    
-    public void ExperimentValue.setLsState(ExperimentState lsState) {
-        this.lsState = lsState;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentValue_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentValue_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 5b805ad84..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentValue_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentValue;
-import java.util.List;
-
-privileged aspect ExperimentValue_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ExperimentValue.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsState");
-    
-    public static List<ExperimentValue> ExperimentValue.findAllExperimentValues(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ExperimentValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ExperimentValue.class).getResultList();
-    }
-    
-    public static List<ExperimentValue> ExperimentValue.findExperimentValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ExperimentValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ExperimentValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentValue_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentValue_Roo_Jpa_Entity.aj
deleted file mode 100755
index 9d5da4d01..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentValue_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentValue;
-import javax.persistence.Entity;
-
-privileged aspect ExperimentValue_Roo_Jpa_Entity {
-    
-    declare @type: ExperimentValue: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentValue_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentValue_Roo_Json.aj
deleted file mode 100755
index 9229122b9..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentValue_Roo_Json.aj
+++ /dev/null
@@ -1,32 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentValue;
-import flexjson.JSONSerializer;
-import java.util.Collection;
-
-privileged aspect ExperimentValue_Roo_Json {
-    
-    public String ExperimentValue.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ExperimentValue.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static String ExperimentValue.toJsonArray(Collection<ExperimentValue> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ExperimentValue.toJsonArray(Collection<ExperimentValue> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentValue_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ExperimentValue_Roo_ToString.aj
deleted file mode 100755
index 5f0b384b2..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentValue_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentValue;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ExperimentValue_Roo_ToString {
-    
-    public String ExperimentValue.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Experiment_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/Experiment_Roo_Configurable.aj
deleted file mode 100755
index d74ed73ec..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Experiment_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Experiment;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect Experiment_Roo_Configurable {
-    
-    declare @type: Experiment: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Experiment_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/Experiment_Roo_Finder.aj
deleted file mode 100644
index 8ba3bfcc2..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Experiment_Roo_Finder.aj
+++ /dev/null
@@ -1,389 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.Protocol;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect Experiment_Roo_Finder {
-    
-    public static Long Experiment.countFindExperimentsByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = Experiment.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE o.codeName = :codeName", Long.class);
-        q.setParameter("codeName", codeName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Experiment.countFindExperimentsByCodeNameLike(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        codeName = codeName.replace('*', '%');
-        if (codeName.charAt(0) != '%') {
-            codeName = "%" + codeName;
-        }
-        if (codeName.charAt(codeName.length() - 1) != '%') {
-            codeName = codeName + "%";
-        }
-        EntityManager em = Experiment.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)", Long.class);
-        q.setParameter("codeName", codeName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Experiment.countFindExperimentsByLsKindEquals(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = Experiment.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE o.lsKind = :lsKind", Long.class);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Experiment.countFindExperimentsByLsKindLike(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        lsKind = lsKind.replace('*', '%');
-        if (lsKind.charAt(0) != '%') {
-            lsKind = "%" + lsKind;
-        }
-        if (lsKind.charAt(lsKind.length() - 1) != '%') {
-            lsKind = lsKind + "%";
-        }
-        EntityManager em = Experiment.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)", Long.class);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Experiment.countFindExperimentsByLsTransaction(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = Experiment.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Experiment.countFindExperimentsByLsTypeEquals(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = Experiment.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE o.lsType = :lsType", Long.class);
-        q.setParameter("lsType", lsType);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Experiment.countFindExperimentsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = Experiment.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Experiment.countFindExperimentsByLsTypeLike(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        lsType = lsType.replace('*', '%');
-        if (lsType.charAt(0) != '%') {
-            lsType = "%" + lsType;
-        }
-        if (lsType.charAt(lsType.length() - 1) != '%') {
-            lsType = lsType + "%";
-        }
-        EntityManager em = Experiment.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE LOWER(o.lsType) LIKE LOWER(:lsType)", Long.class);
-        q.setParameter("lsType", lsType);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Experiment.countFindExperimentsByProtocol(Protocol protocol) {
-        if (protocol == null) throw new IllegalArgumentException("The protocol argument is required");
-        EntityManager em = Experiment.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE o.protocol = :protocol", Long.class);
-        q.setParameter("protocol", protocol);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Experiment.countFindExperimentsByRecordedByLike(String recordedBy) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
-        recordedBy = recordedBy.replace('*', '%');
-        if (recordedBy.charAt(0) != '%') {
-            recordedBy = "%" + recordedBy;
-        }
-        if (recordedBy.charAt(recordedBy.length() - 1) != '%') {
-            recordedBy = recordedBy + "%";
-        }
-        EntityManager em = Experiment.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)", Long.class);
-        q.setParameter("recordedBy", recordedBy);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<Experiment> Experiment.findExperimentsByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = Experiment.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE o.codeName = :codeName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Experiment> q = em.createQuery(queryBuilder.toString(), Experiment.class);
-        q.setParameter("codeName", codeName);
-        return q;
-    }
-    
-    public static TypedQuery<Experiment> Experiment.findExperimentsByCodeNameLike(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        codeName = codeName.replace('*', '%');
-        if (codeName.charAt(0) != '%') {
-            codeName = "%" + codeName;
-        }
-        if (codeName.charAt(codeName.length() - 1) != '%') {
-            codeName = codeName + "%";
-        }
-        EntityManager em = Experiment.entityManager();
-        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)", Experiment.class);
-        q.setParameter("codeName", codeName);
-        return q;
-    }
-    
-    public static TypedQuery<Experiment> Experiment.findExperimentsByCodeNameLike(String codeName, String sortFieldName, String sortOrder) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        codeName = codeName.replace('*', '%');
-        if (codeName.charAt(0) != '%') {
-            codeName = "%" + codeName;
-        }
-        if (codeName.charAt(codeName.length() - 1) != '%') {
-            codeName = codeName + "%";
-        }
-        EntityManager em = Experiment.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Experiment> q = em.createQuery(queryBuilder.toString(), Experiment.class);
-        q.setParameter("codeName", codeName);
-        return q;
-    }
-    
-    public static TypedQuery<Experiment> Experiment.findExperimentsByLsKindEquals(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = Experiment.entityManager();
-        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE o.lsKind = :lsKind", Experiment.class);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<Experiment> Experiment.findExperimentsByLsKindEquals(String lsKind, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = Experiment.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Experiment> q = em.createQuery(queryBuilder.toString(), Experiment.class);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<Experiment> Experiment.findExperimentsByLsKindLike(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        lsKind = lsKind.replace('*', '%');
-        if (lsKind.charAt(0) != '%') {
-            lsKind = "%" + lsKind;
-        }
-        if (lsKind.charAt(lsKind.length() - 1) != '%') {
-            lsKind = lsKind + "%";
-        }
-        EntityManager em = Experiment.entityManager();
-        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)", Experiment.class);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<Experiment> Experiment.findExperimentsByLsKindLike(String lsKind, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        lsKind = lsKind.replace('*', '%');
-        if (lsKind.charAt(0) != '%') {
-            lsKind = "%" + lsKind;
-        }
-        if (lsKind.charAt(lsKind.length() - 1) != '%') {
-            lsKind = lsKind + "%";
-        }
-        EntityManager em = Experiment.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Experiment> q = em.createQuery(queryBuilder.toString(), Experiment.class);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<Experiment> Experiment.findExperimentsByLsTransaction(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = Experiment.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Experiment> q = em.createQuery(queryBuilder.toString(), Experiment.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<Experiment> Experiment.findExperimentsByLsTypeEquals(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = Experiment.entityManager();
-        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE o.lsType = :lsType", Experiment.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<Experiment> Experiment.findExperimentsByLsTypeEquals(String lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = Experiment.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE o.lsType = :lsType");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Experiment> q = em.createQuery(queryBuilder.toString(), Experiment.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<Experiment> Experiment.findExperimentsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = Experiment.entityManager();
-        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Experiment.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<Experiment> Experiment.findExperimentsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = Experiment.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Experiment> q = em.createQuery(queryBuilder.toString(), Experiment.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<Experiment> Experiment.findExperimentsByLsTypeLike(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        lsType = lsType.replace('*', '%');
-        if (lsType.charAt(0) != '%') {
-            lsType = "%" + lsType;
-        }
-        if (lsType.charAt(lsType.length() - 1) != '%') {
-            lsType = lsType + "%";
-        }
-        EntityManager em = Experiment.entityManager();
-        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE LOWER(o.lsType) LIKE LOWER(:lsType)", Experiment.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<Experiment> Experiment.findExperimentsByLsTypeLike(String lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        lsType = lsType.replace('*', '%');
-        if (lsType.charAt(0) != '%') {
-            lsType = "%" + lsType;
-        }
-        if (lsType.charAt(lsType.length() - 1) != '%') {
-            lsType = lsType + "%";
-        }
-        EntityManager em = Experiment.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE LOWER(o.lsType) LIKE LOWER(:lsType)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Experiment> q = em.createQuery(queryBuilder.toString(), Experiment.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<Experiment> Experiment.findExperimentsByProtocol(Protocol protocol, String sortFieldName, String sortOrder) {
-        if (protocol == null) throw new IllegalArgumentException("The protocol argument is required");
-        EntityManager em = Experiment.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE o.protocol = :protocol");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Experiment> q = em.createQuery(queryBuilder.toString(), Experiment.class);
-        q.setParameter("protocol", protocol);
-        return q;
-    }
-    
-    public static TypedQuery<Experiment> Experiment.findExperimentsByRecordedByLike(String recordedBy) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
-        recordedBy = recordedBy.replace('*', '%');
-        if (recordedBy.charAt(0) != '%') {
-            recordedBy = "%" + recordedBy;
-        }
-        if (recordedBy.charAt(recordedBy.length() - 1) != '%') {
-            recordedBy = recordedBy + "%";
-        }
-        EntityManager em = Experiment.entityManager();
-        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)", Experiment.class);
-        q.setParameter("recordedBy", recordedBy);
-        return q;
-    }
-    
-    public static TypedQuery<Experiment> Experiment.findExperimentsByRecordedByLike(String recordedBy, String sortFieldName, String sortOrder) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
-        recordedBy = recordedBy.replace('*', '%');
-        if (recordedBy.charAt(0) != '%') {
-            recordedBy = "%" + recordedBy;
-        }
-        if (recordedBy.charAt(recordedBy.length() - 1) != '%') {
-            recordedBy = recordedBy + "%";
-        }
-        EntityManager em = Experiment.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Experiment> q = em.createQuery(queryBuilder.toString(), Experiment.class);
-        q.setParameter("recordedBy", recordedBy);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Experiment_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/Experiment_Roo_JavaBean.aj
deleted file mode 100755
index da8ee8f04..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Experiment_Roo_JavaBean.aj
+++ /dev/null
@@ -1,81 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentLabel;
-import com.labsynch.labseer.domain.ExperimentState;
-import com.labsynch.labseer.domain.ItxExperimentExperiment;
-import com.labsynch.labseer.domain.LsTag;
-import com.labsynch.labseer.domain.Protocol;
-import java.util.Set;
-
-privileged aspect Experiment_Roo_JavaBean {
-    
-    public String Experiment.getShortDescription() {
-        return this.shortDescription;
-    }
-    
-    public void Experiment.setShortDescription(String shortDescription) {
-        this.shortDescription = shortDescription;
-    }
-    
-    public Protocol Experiment.getProtocol() {
-        return this.protocol;
-    }
-    
-    public void Experiment.setProtocol(Protocol protocol) {
-        this.protocol = protocol;
-    }
-    
-    public Set<ExperimentState> Experiment.getLsStates() {
-        return this.lsStates;
-    }
-    
-    public void Experiment.setLsStates(Set<ExperimentState> lsStates) {
-        this.lsStates = lsStates;
-    }
-    
-    public Set<ItxExperimentExperiment> Experiment.getFirstExperiments() {
-        return this.firstExperiments;
-    }
-    
-    public void Experiment.setFirstExperiments(Set<ItxExperimentExperiment> firstExperiments) {
-        this.firstExperiments = firstExperiments;
-    }
-    
-    public Set<ItxExperimentExperiment> Experiment.getSecondExperiments() {
-        return this.secondExperiments;
-    }
-    
-    public void Experiment.setSecondExperiments(Set<ItxExperimentExperiment> secondExperiments) {
-        this.secondExperiments = secondExperiments;
-    }
-    
-    public Set<AnalysisGroup> Experiment.getAnalysisGroups() {
-        return this.analysisGroups;
-    }
-    
-    public void Experiment.setAnalysisGroups(Set<AnalysisGroup> analysisGroups) {
-        this.analysisGroups = analysisGroups;
-    }
-    
-    public Set<ExperimentLabel> Experiment.getLsLabels() {
-        return this.lsLabels;
-    }
-    
-    public void Experiment.setLsLabels(Set<ExperimentLabel> lsLabels) {
-        this.lsLabels = lsLabels;
-    }
-    
-    public Set<LsTag> Experiment.getLsTags() {
-        return this.lsTags;
-    }
-    
-    public void Experiment.setLsTags(Set<LsTag> lsTags) {
-        this.lsTags = lsTags;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Experiment_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/Experiment_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 1ff0fbef3..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Experiment_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Experiment;
-import java.util.List;
-
-privileged aspect Experiment_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> Experiment.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "shortDescription", "protocol", "lsStates", "firstExperiments", "secondExperiments", "analysisGroups", "lsLabels", "lsTags");
-    
-    public static List<Experiment> Experiment.findAllExperiments(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM Experiment o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, Experiment.class).getResultList();
-    }
-    
-    public static List<Experiment> Experiment.findExperimentEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM Experiment o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, Experiment.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Experiment_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/Experiment_Roo_Jpa_Entity.aj
deleted file mode 100755
index 28e865524..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Experiment_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Experiment;
-import javax.persistence.Entity;
-
-privileged aspect Experiment_Roo_Jpa_Entity {
-    
-    declare @type: Experiment: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Experiment_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/Experiment_Roo_ToString.aj
deleted file mode 100755
index 3d73ad4f8..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Experiment_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Experiment;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect Experiment_Roo_ToString {
-    
-    public String Experiment.toString() {
-        return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).setExcludeFieldNames("lsTags", "lsStates", "analysisGroups", "lsLabels").toString();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/FileList.java b/src/main/java/com/labsynch/labseer/domain/FileList.java
index 8d1132cd4..fa79c449b 100755
--- a/src/main/java/com/labsynch/labseer/domain/FileList.java
+++ b/src/main/java/com/labsynch/labseer/domain/FileList.java
@@ -1,27 +1,42 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-
+import java.util.Collection;
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.PersistenceContext;
 import javax.persistence.Transient;
 import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -193,4 +208,204 @@ public static TypedQuery<FileList> findFileListsByUrlEquals(String url) {
         return q;
     }
     
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public static Long countFindFileListsByLot(Lot lot) {
+        if (lot == null) throw new IllegalArgumentException("The lot argument is required");
+        EntityManager em = FileList.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM FileList AS o WHERE o.lot = :lot", Long.class);
+        q.setParameter("lot", lot);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindFileListsByUrlEquals(String url) {
+        if (url == null || url.length() == 0) throw new IllegalArgumentException("The url argument is required");
+        EntityManager em = FileList.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM FileList AS o WHERE o.url = :url", Long.class);
+        q.setParameter("url", url);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<FileList> findFileListsByLot(Lot lot, String sortFieldName, String sortOrder) {
+        if (lot == null) throw new IllegalArgumentException("The lot argument is required");
+        EntityManager em = FileList.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM FileList AS o WHERE o.lot = :lot");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<FileList> q = em.createQuery(queryBuilder.toString(), FileList.class);
+        q.setParameter("lot", lot);
+        return q;
+    }
+
+	public static TypedQuery<FileList> findFileListsByUrlEquals(String url, String sortFieldName, String sortOrder) {
+        if (url == null || url.length() == 0) throw new IllegalArgumentException("The url argument is required");
+        EntityManager em = FileList.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM FileList AS o WHERE o.url = :url");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<FileList> q = em.createQuery(queryBuilder.toString(), FileList.class);
+        q.setParameter("url", url);
+        return q;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static FileList fromJsonToFileList(String json) {
+        return new JSONDeserializer<FileList>()
+        .use(null, FileList.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<FileList> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<FileList> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<FileList> fromJsonArrayToFileLists(String json) {
+        return new JSONDeserializer<List<FileList>>()
+        .use("values", FileList.class).deserialize(json);
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lot", "description", "name", "type", "size", "url", "ie", "uploaded", "file", "fileName", "subdir", "filePath");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new FileList().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countFileLists() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM FileList o", Long.class).getSingleResult();
+    }
+
+	public static List<FileList> findAllFileLists() {
+        return entityManager().createQuery("SELECT o FROM FileList o", FileList.class).getResultList();
+    }
+
+	public static List<FileList> findAllFileLists(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM FileList o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, FileList.class).getResultList();
+    }
+
+	public static FileList findFileList(Long id) {
+        if (id == null) return null;
+        return entityManager().find(FileList.class, id);
+    }
+
+	public static List<FileList> findFileListEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM FileList o", FileList.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<FileList> findFileListEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM FileList o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, FileList.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            FileList attached = FileList.findFileList(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public FileList merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        FileList merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getFilePath() {
+        return this.filePath;
+    }
+
+	public void setFilePath(String filePath) {
+        this.filePath = filePath;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/FileList_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/FileList_Roo_Configurable.aj
deleted file mode 100644
index 89c3384c1..000000000
--- a/src/main/java/com/labsynch/labseer/domain/FileList_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.FileList;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect FileList_Roo_Configurable {
-    
-    declare @type: FileList: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/FileList_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/FileList_Roo_Finder.aj
deleted file mode 100644
index 5b8938cf0..000000000
--- a/src/main/java/com/labsynch/labseer/domain/FileList_Roo_Finder.aj
+++ /dev/null
@@ -1,59 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.FileList;
-import com.labsynch.labseer.domain.Lot;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect FileList_Roo_Finder {
-    
-    public static Long FileList.countFindFileListsByLot(Lot lot) {
-        if (lot == null) throw new IllegalArgumentException("The lot argument is required");
-        EntityManager em = FileList.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM FileList AS o WHERE o.lot = :lot", Long.class);
-        q.setParameter("lot", lot);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long FileList.countFindFileListsByUrlEquals(String url) {
-        if (url == null || url.length() == 0) throw new IllegalArgumentException("The url argument is required");
-        EntityManager em = FileList.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM FileList AS o WHERE o.url = :url", Long.class);
-        q.setParameter("url", url);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<FileList> FileList.findFileListsByLot(Lot lot, String sortFieldName, String sortOrder) {
-        if (lot == null) throw new IllegalArgumentException("The lot argument is required");
-        EntityManager em = FileList.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM FileList AS o WHERE o.lot = :lot");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<FileList> q = em.createQuery(queryBuilder.toString(), FileList.class);
-        q.setParameter("lot", lot);
-        return q;
-    }
-    
-    public static TypedQuery<FileList> FileList.findFileListsByUrlEquals(String url, String sortFieldName, String sortOrder) {
-        if (url == null || url.length() == 0) throw new IllegalArgumentException("The url argument is required");
-        EntityManager em = FileList.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM FileList AS o WHERE o.url = :url");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<FileList> q = em.createQuery(queryBuilder.toString(), FileList.class);
-        q.setParameter("url", url);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/FileList_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/FileList_Roo_JavaBean.aj
deleted file mode 100644
index a149e8771..000000000
--- a/src/main/java/com/labsynch/labseer/domain/FileList_Roo_JavaBean.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.FileList;
-
-privileged aspect FileList_Roo_JavaBean {
-    
-    public String FileList.getFilePath() {
-        return this.filePath;
-    }
-    
-    public void FileList.setFilePath(String filePath) {
-        this.filePath = filePath;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/FileList_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/FileList_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index d3d1da8a4..000000000
--- a/src/main/java/com/labsynch/labseer/domain/FileList_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.FileList;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect FileList_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager FileList.entityManager;
-    
-    public static final List<String> FileList.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lot", "description", "name", "type", "size", "url", "ie", "uploaded", "file", "fileName", "subdir", "filePath");
-    
-    public static final EntityManager FileList.entityManager() {
-        EntityManager em = new FileList().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long FileList.countFileLists() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM FileList o", Long.class).getSingleResult();
-    }
-    
-    public static List<FileList> FileList.findAllFileLists() {
-        return entityManager().createQuery("SELECT o FROM FileList o", FileList.class).getResultList();
-    }
-    
-    public static List<FileList> FileList.findAllFileLists(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM FileList o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, FileList.class).getResultList();
-    }
-    
-    public static FileList FileList.findFileList(Long id) {
-        if (id == null) return null;
-        return entityManager().find(FileList.class, id);
-    }
-    
-    public static List<FileList> FileList.findFileListEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM FileList o", FileList.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<FileList> FileList.findFileListEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM FileList o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, FileList.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void FileList.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void FileList.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            FileList attached = FileList.findFileList(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void FileList.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void FileList.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public FileList FileList.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        FileList merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/FileList_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/FileList_Roo_Jpa_Entity.aj
deleted file mode 100644
index 65c3679f6..000000000
--- a/src/main/java/com/labsynch/labseer/domain/FileList_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.FileList;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect FileList_Roo_Jpa_Entity {
-    
-    declare @type: FileList: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long FileList.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer FileList.version;
-    
-    public Long FileList.getId() {
-        return this.id;
-    }
-    
-    public void FileList.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer FileList.getVersion() {
-        return this.version;
-    }
-    
-    public void FileList.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/FileList_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/FileList_Roo_Json.aj
deleted file mode 100644
index 3bad585e3..000000000
--- a/src/main/java/com/labsynch/labseer/domain/FileList_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.FileList;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect FileList_Roo_Json {
-    
-    public String FileList.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String FileList.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static FileList FileList.fromJsonToFileList(String json) {
-        return new JSONDeserializer<FileList>()
-        .use(null, FileList.class).deserialize(json);
-    }
-    
-    public static String FileList.toJsonArray(Collection<FileList> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String FileList.toJsonArray(Collection<FileList> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<FileList> FileList.fromJsonArrayToFileLists(String json) {
-        return new JSONDeserializer<List<FileList>>()
-        .use("values", FileList.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/FileList_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/FileList_Roo_ToString.aj
deleted file mode 100644
index 951185ee5..000000000
--- a/src/main/java/com/labsynch/labseer/domain/FileList_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.FileList;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect FileList_Roo_ToString {
-    
-    public String FileList.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/FileThing.java b/src/main/java/com/labsynch/labseer/domain/FileThing.java
index 6b2b79fe5..a3a709309 100755
--- a/src/main/java/com/labsynch/labseer/domain/FileThing.java
+++ b/src/main/java/com/labsynch/labseer/domain/FileThing.java
@@ -1,12 +1,22 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import javax.persistence.Entity;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord(sequenceName = "FILE_PKSEQ")
@@ -54,4 +64,147 @@ public FileThing(FileThing fileThing) {
 
 
 	
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static FileThing fromJsonToFileThing(String json) {
+        return new JSONDeserializer<FileThing>()
+        .use(null, FileThing.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<FileThing> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<FileThing> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<FileThing> fromJsonArrayToFileThings(String json) {
+        return new JSONDeserializer<List<FileThing>>()
+        .use("values", FileThing.class).deserialize(json);
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "description", "fileExtension", "applicationType", "mimeType", "fileURL", "fileSize");
+
+	public static long countFileThings() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM FileThing o", Long.class).getSingleResult();
+    }
+
+	public static List<FileThing> findAllFileThings() {
+        return entityManager().createQuery("SELECT o FROM FileThing o", FileThing.class).getResultList();
+    }
+
+	public static List<FileThing> findAllFileThings(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM FileThing o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, FileThing.class).getResultList();
+    }
+
+	public static FileThing findFileThing(Long id) {
+        if (id == null) return null;
+        return entityManager().find(FileThing.class, id);
+    }
+
+	public static List<FileThing> findFileThingEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM FileThing o", FileThing.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<FileThing> findFileThingEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM FileThing o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, FileThing.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public FileThing merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        FileThing merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public FileThing() {
+        super();
+    }
+
+	public String getName() {
+        return this.name;
+    }
+
+	public void setName(String name) {
+        this.name = name;
+    }
+
+	public String getDescription() {
+        return this.description;
+    }
+
+	public void setDescription(String description) {
+        this.description = description;
+    }
+
+	public String getFileExtension() {
+        return this.fileExtension;
+    }
+
+	public void setFileExtension(String fileExtension) {
+        this.fileExtension = fileExtension;
+    }
+
+	public String getApplicationType() {
+        return this.applicationType;
+    }
+
+	public void setApplicationType(String applicationType) {
+        this.applicationType = applicationType;
+    }
+
+	public String getMimeType() {
+        return this.mimeType;
+    }
+
+	public void setMimeType(String mimeType) {
+        this.mimeType = mimeType;
+    }
+
+	public String getFileURL() {
+        return this.fileURL;
+    }
+
+	public void setFileURL(String fileURL) {
+        this.fileURL = fileURL;
+    }
+
+	public Long getFileSize() {
+        return this.fileSize;
+    }
+
+	public void setFileSize(Long fileSize) {
+        this.fileSize = fileSize;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/FileThing_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/FileThing_Roo_Configurable.aj
deleted file mode 100755
index 780fcfe25..000000000
--- a/src/main/java/com/labsynch/labseer/domain/FileThing_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.FileThing;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect FileThing_Roo_Configurable {
-    
-    declare @type: FileThing: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/FileThing_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/FileThing_Roo_JavaBean.aj
deleted file mode 100755
index 4028188e4..000000000
--- a/src/main/java/com/labsynch/labseer/domain/FileThing_Roo_JavaBean.aj
+++ /dev/null
@@ -1,66 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.FileThing;
-
-privileged aspect FileThing_Roo_JavaBean {
-    
-    public String FileThing.getName() {
-        return this.name;
-    }
-    
-    public void FileThing.setName(String name) {
-        this.name = name;
-    }
-    
-    public String FileThing.getDescription() {
-        return this.description;
-    }
-    
-    public void FileThing.setDescription(String description) {
-        this.description = description;
-    }
-    
-    public String FileThing.getFileExtension() {
-        return this.fileExtension;
-    }
-    
-    public void FileThing.setFileExtension(String fileExtension) {
-        this.fileExtension = fileExtension;
-    }
-    
-    public String FileThing.getApplicationType() {
-        return this.applicationType;
-    }
-    
-    public void FileThing.setApplicationType(String applicationType) {
-        this.applicationType = applicationType;
-    }
-    
-    public String FileThing.getMimeType() {
-        return this.mimeType;
-    }
-    
-    public void FileThing.setMimeType(String mimeType) {
-        this.mimeType = mimeType;
-    }
-    
-    public String FileThing.getFileURL() {
-        return this.fileURL;
-    }
-    
-    public void FileThing.setFileURL(String fileURL) {
-        this.fileURL = fileURL;
-    }
-    
-    public Long FileThing.getFileSize() {
-        return this.fileSize;
-    }
-    
-    public void FileThing.setFileSize(Long fileSize) {
-        this.fileSize = fileSize;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/FileThing_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/FileThing_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index fa0c6c7c6..000000000
--- a/src/main/java/com/labsynch/labseer/domain/FileThing_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.FileThing;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect FileThing_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> FileThing.fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "description", "fileExtension", "applicationType", "mimeType", "fileURL", "fileSize");
-    
-    public static long FileThing.countFileThings() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM FileThing o", Long.class).getSingleResult();
-    }
-    
-    public static List<FileThing> FileThing.findAllFileThings() {
-        return entityManager().createQuery("SELECT o FROM FileThing o", FileThing.class).getResultList();
-    }
-    
-    public static List<FileThing> FileThing.findAllFileThings(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM FileThing o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, FileThing.class).getResultList();
-    }
-    
-    public static FileThing FileThing.findFileThing(Long id) {
-        if (id == null) return null;
-        return entityManager().find(FileThing.class, id);
-    }
-    
-    public static List<FileThing> FileThing.findFileThingEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM FileThing o", FileThing.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<FileThing> FileThing.findFileThingEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM FileThing o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, FileThing.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public FileThing FileThing.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        FileThing merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/FileThing_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/FileThing_Roo_Jpa_Entity.aj
deleted file mode 100755
index 090e8c9d9..000000000
--- a/src/main/java/com/labsynch/labseer/domain/FileThing_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,17 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.FileThing;
-import javax.persistence.Entity;
-
-privileged aspect FileThing_Roo_Jpa_Entity {
-    
-    declare @type: FileThing: @Entity;
-    
-    public FileThing.new() {
-        super();
-    }
-
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/FileThing_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/FileThing_Roo_Json.aj
deleted file mode 100755
index 146e83104..000000000
--- a/src/main/java/com/labsynch/labseer/domain/FileThing_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.FileThing;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect FileThing_Roo_Json {
-    
-    public String FileThing.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String FileThing.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static FileThing FileThing.fromJsonToFileThing(String json) {
-        return new JSONDeserializer<FileThing>()
-        .use(null, FileThing.class).deserialize(json);
-    }
-    
-    public static String FileThing.toJsonArray(Collection<FileThing> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String FileThing.toJsonArray(Collection<FileThing> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<FileThing> FileThing.fromJsonArrayToFileThings(String json) {
-        return new JSONDeserializer<List<FileThing>>()
-        .use("values", FileThing.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/FileThing_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/FileThing_Roo_ToString.aj
deleted file mode 100755
index 121f72cc3..000000000
--- a/src/main/java/com/labsynch/labseer/domain/FileThing_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.FileThing;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect FileThing_Roo_ToString {
-    
-    public String FileThing.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/FileType.java b/src/main/java/com/labsynch/labseer/domain/FileType.java
index c9dfe4769..dfe3a5906 100755
--- a/src/main/java/com/labsynch/labseer/domain/FileType.java
+++ b/src/main/java/com/labsynch/labseer/domain/FileType.java
@@ -1,12 +1,30 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord(finders = { "findFileTypesByCodeEquals" })
@@ -19,4 +37,197 @@ public class FileType {
 
     @Size(max = 255)
     private String code;
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new FileType().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countFileTypes() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM FileType o", Long.class).getSingleResult();
+    }
+
+	public static List<FileType> findAllFileTypes() {
+        return entityManager().createQuery("SELECT o FROM FileType o", FileType.class).getResultList();
+    }
+
+	public static List<FileType> findAllFileTypes(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM FileType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, FileType.class).getResultList();
+    }
+
+	public static FileType findFileType(Long id) {
+        if (id == null) return null;
+        return entityManager().find(FileType.class, id);
+    }
+
+	public static List<FileType> findFileTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM FileType o", FileType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<FileType> findFileTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM FileType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, FileType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            FileType attached = FileType.findFileType(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public FileType merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        FileType merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public static Long countFindFileTypesByCodeEquals(String code) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = FileType.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM FileType AS o WHERE o.code = :code", Long.class);
+        q.setParameter("code", code);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<FileType> findFileTypesByCodeEquals(String code) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = FileType.entityManager();
+        TypedQuery<FileType> q = em.createQuery("SELECT o FROM FileType AS o WHERE o.code = :code", FileType.class);
+        q.setParameter("code", code);
+        return q;
+    }
+
+	public static TypedQuery<FileType> findFileTypesByCodeEquals(String code, String sortFieldName, String sortOrder) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = FileType.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM FileType AS o WHERE o.code = :code");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<FileType> q = em.createQuery(queryBuilder.toString(), FileType.class);
+        q.setParameter("code", code);
+        return q;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static FileType fromJsonToFileType(String json) {
+        return new JSONDeserializer<FileType>()
+        .use(null, FileType.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<FileType> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<FileType> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<FileType> fromJsonArrayToFileTypes(String json) {
+        return new JSONDeserializer<List<FileType>>()
+        .use("values", FileType.class).deserialize(json);
+    }
+
+	public String getName() {
+        return this.name;
+    }
+
+	public void setName(String name) {
+        this.name = name;
+    }
+
+	public String getCode() {
+        return this.code;
+    }
+
+	public void setCode(String code) {
+        this.code = code;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/FileType_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/FileType_Roo_Configurable.aj
deleted file mode 100644
index c0035eb86..000000000
--- a/src/main/java/com/labsynch/labseer/domain/FileType_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.FileType;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect FileType_Roo_Configurable {
-    
-    declare @type: FileType: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/FileType_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/FileType_Roo_Finder.aj
deleted file mode 100644
index 05b13f6e3..000000000
--- a/src/main/java/com/labsynch/labseer/domain/FileType_Roo_Finder.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.FileType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect FileType_Roo_Finder {
-    
-    public static Long FileType.countFindFileTypesByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = FileType.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM FileType AS o WHERE o.code = :code", Long.class);
-        q.setParameter("code", code);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<FileType> FileType.findFileTypesByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = FileType.entityManager();
-        TypedQuery<FileType> q = em.createQuery("SELECT o FROM FileType AS o WHERE o.code = :code", FileType.class);
-        q.setParameter("code", code);
-        return q;
-    }
-    
-    public static TypedQuery<FileType> FileType.findFileTypesByCodeEquals(String code, String sortFieldName, String sortOrder) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = FileType.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM FileType AS o WHERE o.code = :code");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<FileType> q = em.createQuery(queryBuilder.toString(), FileType.class);
-        q.setParameter("code", code);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/FileType_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/FileType_Roo_JavaBean.aj
deleted file mode 100644
index 040839699..000000000
--- a/src/main/java/com/labsynch/labseer/domain/FileType_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.FileType;
-
-privileged aspect FileType_Roo_JavaBean {
-    
-    public String FileType.getName() {
-        return this.name;
-    }
-    
-    public void FileType.setName(String name) {
-        this.name = name;
-    }
-    
-    public String FileType.getCode() {
-        return this.code;
-    }
-    
-    public void FileType.setCode(String code) {
-        this.code = code;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/FileType_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/FileType_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index de258069c..000000000
--- a/src/main/java/com/labsynch/labseer/domain/FileType_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.FileType;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect FileType_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager FileType.entityManager;
-    
-    public static final List<String> FileType.fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
-    
-    public static final EntityManager FileType.entityManager() {
-        EntityManager em = new FileType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long FileType.countFileTypes() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM FileType o", Long.class).getSingleResult();
-    }
-    
-    public static List<FileType> FileType.findAllFileTypes() {
-        return entityManager().createQuery("SELECT o FROM FileType o", FileType.class).getResultList();
-    }
-    
-    public static List<FileType> FileType.findAllFileTypes(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM FileType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, FileType.class).getResultList();
-    }
-    
-    public static FileType FileType.findFileType(Long id) {
-        if (id == null) return null;
-        return entityManager().find(FileType.class, id);
-    }
-    
-    public static List<FileType> FileType.findFileTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM FileType o", FileType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<FileType> FileType.findFileTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM FileType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, FileType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void FileType.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void FileType.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            FileType attached = FileType.findFileType(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void FileType.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void FileType.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public FileType FileType.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        FileType merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/FileType_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/FileType_Roo_Jpa_Entity.aj
deleted file mode 100644
index a612f9f24..000000000
--- a/src/main/java/com/labsynch/labseer/domain/FileType_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.FileType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect FileType_Roo_Jpa_Entity {
-    
-    declare @type: FileType: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long FileType.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer FileType.version;
-    
-    public Long FileType.getId() {
-        return this.id;
-    }
-    
-    public void FileType.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer FileType.getVersion() {
-        return this.version;
-    }
-    
-    public void FileType.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/FileType_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/FileType_Roo_Json.aj
deleted file mode 100644
index 36be7df04..000000000
--- a/src/main/java/com/labsynch/labseer/domain/FileType_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.FileType;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect FileType_Roo_Json {
-    
-    public String FileType.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String FileType.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static FileType FileType.fromJsonToFileType(String json) {
-        return new JSONDeserializer<FileType>()
-        .use(null, FileType.class).deserialize(json);
-    }
-    
-    public static String FileType.toJsonArray(Collection<FileType> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String FileType.toJsonArray(Collection<FileType> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<FileType> FileType.fromJsonArrayToFileTypes(String json) {
-        return new JSONDeserializer<List<FileType>>()
-        .use("values", FileType.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/FileType_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/FileType_Roo_ToString.aj
deleted file mode 100644
index f9cea9ce0..000000000
--- a/src/main/java/com/labsynch/labseer/domain/FileType_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.FileType;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect FileType_Roo_ToString {
-    
-    public String FileType.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/InteractionKind.java b/src/main/java/com/labsynch/labseer/domain/InteractionKind.java
index 0de826034..d09a1d06f 100755
--- a/src/main/java/com/labsynch/labseer/domain/InteractionKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/InteractionKind.java
@@ -1,8 +1,12 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.List;
 
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
@@ -11,18 +15,23 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -156,4 +165,154 @@ public static InteractionKind getOrCreate(String typeName, String kindName) {
         
         return itxKind;
     }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
+
+	public static List<InteractionKind> findAllInteractionKinds(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM InteractionKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, InteractionKind.class).getResultList();
+    }
+
+	public static List<InteractionKind> findInteractionKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM InteractionKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, InteractionKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static Long countFindInteractionKindsByKindNameEquals(String kindName) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        EntityManager em = InteractionKind.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM InteractionKind AS o WHERE o.kindName = :kindName", Long.class);
+        q.setParameter("kindName", kindName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindInteractionKindsByKindNameEqualsAndLsType(String kindName, InteractionType lsType) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = InteractionKind.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM InteractionKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<InteractionKind> findInteractionKindsByKindNameEquals(String kindName) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        EntityManager em = InteractionKind.entityManager();
+        TypedQuery<InteractionKind> q = em.createQuery("SELECT o FROM InteractionKind AS o WHERE o.kindName = :kindName", InteractionKind.class);
+        q.setParameter("kindName", kindName);
+        return q;
+    }
+
+	public static TypedQuery<InteractionKind> findInteractionKindsByKindNameEquals(String kindName, String sortFieldName, String sortOrder) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        EntityManager em = InteractionKind.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM InteractionKind AS o WHERE o.kindName = :kindName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<InteractionKind> q = em.createQuery(queryBuilder.toString(), InteractionKind.class);
+        q.setParameter("kindName", kindName);
+        return q;
+    }
+
+	public static TypedQuery<InteractionKind> findInteractionKindsByKindNameEqualsAndLsType(String kindName, InteractionType lsType) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = InteractionKind.entityManager();
+        TypedQuery<InteractionKind> q = em.createQuery("SELECT o FROM InteractionKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", InteractionKind.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<InteractionKind> findInteractionKindsByKindNameEqualsAndLsType(String kindName, InteractionType lsType, String sortFieldName, String sortOrder) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = InteractionKind.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM InteractionKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<InteractionKind> q = em.createQuery(queryBuilder.toString(), InteractionKind.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static InteractionKind fromJsonToInteractionKind(String json) {
+        return new JSONDeserializer<InteractionKind>()
+        .use(null, InteractionKind.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<InteractionKind> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<InteractionKind> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<InteractionKind> fromJsonArrayToInteractionKinds(String json) {
+        return new JSONDeserializer<List<InteractionKind>>()
+        .use("values", InteractionKind.class).deserialize(json);
+    }
+
+	public InteractionType getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(InteractionType lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getKindName() {
+        return this.kindName;
+    }
+
+	public void setKindName(String kindName) {
+        this.kindName = kindName;
+    }
+
+	public String getLsTypeAndKind() {
+        return this.lsTypeAndKind;
+    }
+
+	public void setLsTypeAndKind(String lsTypeAndKind) {
+        this.lsTypeAndKind = lsTypeAndKind;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/InteractionKind_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/InteractionKind_Roo_Configurable.aj
deleted file mode 100755
index e2528a0a4..000000000
--- a/src/main/java/com/labsynch/labseer/domain/InteractionKind_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.InteractionKind;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect InteractionKind_Roo_Configurable {
-    
-    declare @type: InteractionKind: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/InteractionKind_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/InteractionKind_Roo_Finder.aj
deleted file mode 100644
index 1449217cf..000000000
--- a/src/main/java/com/labsynch/labseer/domain/InteractionKind_Roo_Finder.aj
+++ /dev/null
@@ -1,81 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.InteractionKind;
-import com.labsynch.labseer.domain.InteractionType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect InteractionKind_Roo_Finder {
-    
-    public static Long InteractionKind.countFindInteractionKindsByKindNameEquals(String kindName) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        EntityManager em = InteractionKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM InteractionKind AS o WHERE o.kindName = :kindName", Long.class);
-        q.setParameter("kindName", kindName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long InteractionKind.countFindInteractionKindsByKindNameEqualsAndLsType(String kindName, InteractionType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = InteractionKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM InteractionKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<InteractionKind> InteractionKind.findInteractionKindsByKindNameEquals(String kindName) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        EntityManager em = InteractionKind.entityManager();
-        TypedQuery<InteractionKind> q = em.createQuery("SELECT o FROM InteractionKind AS o WHERE o.kindName = :kindName", InteractionKind.class);
-        q.setParameter("kindName", kindName);
-        return q;
-    }
-    
-    public static TypedQuery<InteractionKind> InteractionKind.findInteractionKindsByKindNameEquals(String kindName, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        EntityManager em = InteractionKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM InteractionKind AS o WHERE o.kindName = :kindName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<InteractionKind> q = em.createQuery(queryBuilder.toString(), InteractionKind.class);
-        q.setParameter("kindName", kindName);
-        return q;
-    }
-    
-    public static TypedQuery<InteractionKind> InteractionKind.findInteractionKindsByKindNameEqualsAndLsType(String kindName, InteractionType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = InteractionKind.entityManager();
-        TypedQuery<InteractionKind> q = em.createQuery("SELECT o FROM InteractionKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", InteractionKind.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<InteractionKind> InteractionKind.findInteractionKindsByKindNameEqualsAndLsType(String kindName, InteractionType lsType, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = InteractionKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM InteractionKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<InteractionKind> q = em.createQuery(queryBuilder.toString(), InteractionKind.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/InteractionKind_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/InteractionKind_Roo_JavaBean.aj
deleted file mode 100755
index 0f981a811..000000000
--- a/src/main/java/com/labsynch/labseer/domain/InteractionKind_Roo_JavaBean.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.InteractionKind;
-import com.labsynch.labseer.domain.InteractionType;
-
-privileged aspect InteractionKind_Roo_JavaBean {
-    
-    public InteractionType InteractionKind.getLsType() {
-        return this.lsType;
-    }
-    
-    public void InteractionKind.setLsType(InteractionType lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String InteractionKind.getKindName() {
-        return this.kindName;
-    }
-    
-    public void InteractionKind.setKindName(String kindName) {
-        this.kindName = kindName;
-    }
-    
-    public String InteractionKind.getLsTypeAndKind() {
-        return this.lsTypeAndKind;
-    }
-    
-    public void InteractionKind.setLsTypeAndKind(String lsTypeAndKind) {
-        this.lsTypeAndKind = lsTypeAndKind;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/InteractionKind_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/InteractionKind_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 564447931..000000000
--- a/src/main/java/com/labsynch/labseer/domain/InteractionKind_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.InteractionKind;
-import java.util.List;
-
-privileged aspect InteractionKind_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> InteractionKind.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
-    
-    public static List<InteractionKind> InteractionKind.findAllInteractionKinds(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM InteractionKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, InteractionKind.class).getResultList();
-    }
-    
-    public static List<InteractionKind> InteractionKind.findInteractionKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM InteractionKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, InteractionKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/InteractionKind_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/InteractionKind_Roo_Jpa_Entity.aj
deleted file mode 100644
index dc23d4aed..000000000
--- a/src/main/java/com/labsynch/labseer/domain/InteractionKind_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.InteractionKind;
-import javax.persistence.Entity;
-
-privileged aspect InteractionKind_Roo_Jpa_Entity {
-    
-    declare @type: InteractionKind: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/InteractionKind_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/InteractionKind_Roo_Json.aj
deleted file mode 100755
index d4384bbed..000000000
--- a/src/main/java/com/labsynch/labseer/domain/InteractionKind_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.InteractionKind;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect InteractionKind_Roo_Json {
-    
-    public String InteractionKind.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String InteractionKind.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static InteractionKind InteractionKind.fromJsonToInteractionKind(String json) {
-        return new JSONDeserializer<InteractionKind>()
-        .use(null, InteractionKind.class).deserialize(json);
-    }
-    
-    public static String InteractionKind.toJsonArray(Collection<InteractionKind> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String InteractionKind.toJsonArray(Collection<InteractionKind> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<InteractionKind> InteractionKind.fromJsonArrayToInteractionKinds(String json) {
-        return new JSONDeserializer<List<InteractionKind>>()
-        .use("values", InteractionKind.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/InteractionKind_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/InteractionKind_Roo_ToString.aj
deleted file mode 100755
index 341f480f6..000000000
--- a/src/main/java/com/labsynch/labseer/domain/InteractionKind_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.InteractionKind;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect InteractionKind_Roo_ToString {
-    
-    public String InteractionKind.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/InteractionType.java b/src/main/java/com/labsynch/labseer/domain/InteractionType.java
index 2d5b9ec70..6c36a12e2 100755
--- a/src/main/java/com/labsynch/labseer/domain/InteractionType.java
+++ b/src/main/java/com/labsynch/labseer/domain/InteractionType.java
@@ -1,17 +1,34 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.List;
 import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord(sequenceName = "INTERACTION_TYPE_PKSEQ", finders = { "findInteractionTypesByTypeNameEquals", "findInteractionTypesByTypeNameEqualsAndTypeVerbEquals" })
@@ -46,4 +63,235 @@ public static com.labsynch.labseer.domain.InteractionType getOrCreate(String typ
         }
         return itxType;
     }
+
+	@Id
+    @SequenceGenerator(name = "interactionTypeGen", sequenceName = "INTERACTION_TYPE_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "interactionTypeGen")
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "typeName", "typeVerb");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new InteractionType().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countInteractionTypes() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM InteractionType o", Long.class).getSingleResult();
+    }
+
+	public static List<InteractionType> findAllInteractionTypes() {
+        return entityManager().createQuery("SELECT o FROM InteractionType o", InteractionType.class).getResultList();
+    }
+
+	public static List<InteractionType> findAllInteractionTypes(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM InteractionType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, InteractionType.class).getResultList();
+    }
+
+	public static InteractionType findInteractionType(Long id) {
+        if (id == null) return null;
+        return entityManager().find(InteractionType.class, id);
+    }
+
+	public static List<InteractionType> findInteractionTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM InteractionType o", InteractionType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<InteractionType> findInteractionTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM InteractionType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, InteractionType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            InteractionType attached = InteractionType.findInteractionType(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public InteractionType merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        InteractionType merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String getTypeName() {
+        return this.typeName;
+    }
+
+	public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+	public String getTypeVerb() {
+        return this.typeVerb;
+    }
+
+	public void setTypeVerb(String typeVerb) {
+        this.typeVerb = typeVerb;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static InteractionType fromJsonToInteractionType(String json) {
+        return new JSONDeserializer<InteractionType>()
+        .use(null, InteractionType.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<InteractionType> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<InteractionType> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<InteractionType> fromJsonArrayToInteractionTypes(String json) {
+        return new JSONDeserializer<List<InteractionType>>()
+        .use("values", InteractionType.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static Long countFindInteractionTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = InteractionType.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM InteractionType AS o WHERE o.typeName = :typeName", Long.class);
+        q.setParameter("typeName", typeName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindInteractionTypesByTypeNameEqualsAndTypeVerbEquals(String typeName, String typeVerb) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        if (typeVerb == null || typeVerb.length() == 0) throw new IllegalArgumentException("The typeVerb argument is required");
+        EntityManager em = InteractionType.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM InteractionType AS o WHERE o.typeName = :typeName  AND o.typeVerb = :typeVerb", Long.class);
+        q.setParameter("typeName", typeName);
+        q.setParameter("typeVerb", typeVerb);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<InteractionType> findInteractionTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = InteractionType.entityManager();
+        TypedQuery<InteractionType> q = em.createQuery("SELECT o FROM InteractionType AS o WHERE o.typeName = :typeName", InteractionType.class);
+        q.setParameter("typeName", typeName);
+        return q;
+    }
+
+	public static TypedQuery<InteractionType> findInteractionTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = InteractionType.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM InteractionType AS o WHERE o.typeName = :typeName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<InteractionType> q = em.createQuery(queryBuilder.toString(), InteractionType.class);
+        q.setParameter("typeName", typeName);
+        return q;
+    }
+
+	public static TypedQuery<InteractionType> findInteractionTypesByTypeNameEqualsAndTypeVerbEquals(String typeName, String typeVerb) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        if (typeVerb == null || typeVerb.length() == 0) throw new IllegalArgumentException("The typeVerb argument is required");
+        EntityManager em = InteractionType.entityManager();
+        TypedQuery<InteractionType> q = em.createQuery("SELECT o FROM InteractionType AS o WHERE o.typeName = :typeName  AND o.typeVerb = :typeVerb", InteractionType.class);
+        q.setParameter("typeName", typeName);
+        q.setParameter("typeVerb", typeVerb);
+        return q;
+    }
+
+	public static TypedQuery<InteractionType> findInteractionTypesByTypeNameEqualsAndTypeVerbEquals(String typeName, String typeVerb, String sortFieldName, String sortOrder) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        if (typeVerb == null || typeVerb.length() == 0) throw new IllegalArgumentException("The typeVerb argument is required");
+        EntityManager em = InteractionType.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM InteractionType AS o WHERE o.typeName = :typeName  AND o.typeVerb = :typeVerb");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<InteractionType> q = em.createQuery(queryBuilder.toString(), InteractionType.class);
+        q.setParameter("typeName", typeName);
+        q.setParameter("typeVerb", typeVerb);
+        return q;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/InteractionType_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/InteractionType_Roo_Configurable.aj
deleted file mode 100755
index 2d1047fbf..000000000
--- a/src/main/java/com/labsynch/labseer/domain/InteractionType_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.InteractionType;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect InteractionType_Roo_Configurable {
-    
-    declare @type: InteractionType: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/InteractionType_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/InteractionType_Roo_Finder.aj
deleted file mode 100644
index 6f845f324..000000000
--- a/src/main/java/com/labsynch/labseer/domain/InteractionType_Roo_Finder.aj
+++ /dev/null
@@ -1,80 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.InteractionType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect InteractionType_Roo_Finder {
-    
-    public static Long InteractionType.countFindInteractionTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = InteractionType.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM InteractionType AS o WHERE o.typeName = :typeName", Long.class);
-        q.setParameter("typeName", typeName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long InteractionType.countFindInteractionTypesByTypeNameEqualsAndTypeVerbEquals(String typeName, String typeVerb) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        if (typeVerb == null || typeVerb.length() == 0) throw new IllegalArgumentException("The typeVerb argument is required");
-        EntityManager em = InteractionType.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM InteractionType AS o WHERE o.typeName = :typeName  AND o.typeVerb = :typeVerb", Long.class);
-        q.setParameter("typeName", typeName);
-        q.setParameter("typeVerb", typeVerb);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<InteractionType> InteractionType.findInteractionTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = InteractionType.entityManager();
-        TypedQuery<InteractionType> q = em.createQuery("SELECT o FROM InteractionType AS o WHERE o.typeName = :typeName", InteractionType.class);
-        q.setParameter("typeName", typeName);
-        return q;
-    }
-    
-    public static TypedQuery<InteractionType> InteractionType.findInteractionTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = InteractionType.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM InteractionType AS o WHERE o.typeName = :typeName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<InteractionType> q = em.createQuery(queryBuilder.toString(), InteractionType.class);
-        q.setParameter("typeName", typeName);
-        return q;
-    }
-    
-    public static TypedQuery<InteractionType> InteractionType.findInteractionTypesByTypeNameEqualsAndTypeVerbEquals(String typeName, String typeVerb) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        if (typeVerb == null || typeVerb.length() == 0) throw new IllegalArgumentException("The typeVerb argument is required");
-        EntityManager em = InteractionType.entityManager();
-        TypedQuery<InteractionType> q = em.createQuery("SELECT o FROM InteractionType AS o WHERE o.typeName = :typeName  AND o.typeVerb = :typeVerb", InteractionType.class);
-        q.setParameter("typeName", typeName);
-        q.setParameter("typeVerb", typeVerb);
-        return q;
-    }
-    
-    public static TypedQuery<InteractionType> InteractionType.findInteractionTypesByTypeNameEqualsAndTypeVerbEquals(String typeName, String typeVerb, String sortFieldName, String sortOrder) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        if (typeVerb == null || typeVerb.length() == 0) throw new IllegalArgumentException("The typeVerb argument is required");
-        EntityManager em = InteractionType.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM InteractionType AS o WHERE o.typeName = :typeName  AND o.typeVerb = :typeVerb");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<InteractionType> q = em.createQuery(queryBuilder.toString(), InteractionType.class);
-        q.setParameter("typeName", typeName);
-        q.setParameter("typeVerb", typeVerb);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/InteractionType_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/InteractionType_Roo_JavaBean.aj
deleted file mode 100755
index b80bfeb76..000000000
--- a/src/main/java/com/labsynch/labseer/domain/InteractionType_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.InteractionType;
-
-privileged aspect InteractionType_Roo_JavaBean {
-    
-    public String InteractionType.getTypeName() {
-        return this.typeName;
-    }
-    
-    public void InteractionType.setTypeName(String typeName) {
-        this.typeName = typeName;
-    }
-    
-    public String InteractionType.getTypeVerb() {
-        return this.typeVerb;
-    }
-    
-    public void InteractionType.setTypeVerb(String typeVerb) {
-        this.typeVerb = typeVerb;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/InteractionType_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/InteractionType_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 302e016a4..000000000
--- a/src/main/java/com/labsynch/labseer/domain/InteractionType_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.InteractionType;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect InteractionType_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager InteractionType.entityManager;
-    
-    public static final List<String> InteractionType.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "typeName", "typeVerb");
-    
-    public static final EntityManager InteractionType.entityManager() {
-        EntityManager em = new InteractionType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long InteractionType.countInteractionTypes() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM InteractionType o", Long.class).getSingleResult();
-    }
-    
-    public static List<InteractionType> InteractionType.findAllInteractionTypes() {
-        return entityManager().createQuery("SELECT o FROM InteractionType o", InteractionType.class).getResultList();
-    }
-    
-    public static List<InteractionType> InteractionType.findAllInteractionTypes(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM InteractionType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, InteractionType.class).getResultList();
-    }
-    
-    public static InteractionType InteractionType.findInteractionType(Long id) {
-        if (id == null) return null;
-        return entityManager().find(InteractionType.class, id);
-    }
-    
-    public static List<InteractionType> InteractionType.findInteractionTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM InteractionType o", InteractionType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<InteractionType> InteractionType.findInteractionTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM InteractionType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, InteractionType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void InteractionType.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void InteractionType.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            InteractionType attached = InteractionType.findInteractionType(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void InteractionType.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void InteractionType.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public InteractionType InteractionType.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        InteractionType merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/InteractionType_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/InteractionType_Roo_Jpa_Entity.aj
deleted file mode 100755
index 19bed45c0..000000000
--- a/src/main/java/com/labsynch/labseer/domain/InteractionType_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.InteractionType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
-
-privileged aspect InteractionType_Roo_Jpa_Entity {
-    
-    declare @type: InteractionType: @Entity;
-    
-    @Id
-    @SequenceGenerator(name = "interactionTypeGen", sequenceName = "INTERACTION_TYPE_PKSEQ")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "interactionTypeGen")
-    @Column(name = "id")
-    private Long InteractionType.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer InteractionType.version;
-    
-    public Long InteractionType.getId() {
-        return this.id;
-    }
-    
-    public void InteractionType.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer InteractionType.getVersion() {
-        return this.version;
-    }
-    
-    public void InteractionType.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/InteractionType_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/InteractionType_Roo_Json.aj
deleted file mode 100755
index 856d87a16..000000000
--- a/src/main/java/com/labsynch/labseer/domain/InteractionType_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.InteractionType;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect InteractionType_Roo_Json {
-    
-    public String InteractionType.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String InteractionType.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static InteractionType InteractionType.fromJsonToInteractionType(String json) {
-        return new JSONDeserializer<InteractionType>()
-        .use(null, InteractionType.class).deserialize(json);
-    }
-    
-    public static String InteractionType.toJsonArray(Collection<InteractionType> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String InteractionType.toJsonArray(Collection<InteractionType> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<InteractionType> InteractionType.fromJsonArrayToInteractionTypes(String json) {
-        return new JSONDeserializer<List<InteractionType>>()
-        .use("values", InteractionType.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/InteractionType_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/InteractionType_Roo_ToString.aj
deleted file mode 100755
index 836fff699..000000000
--- a/src/main/java/com/labsynch/labseer/domain/InteractionType_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.InteractionType;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect InteractionType_Roo_ToString {
-    
-    public String InteractionType.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/IsoSalt.java b/src/main/java/com/labsynch/labseer/domain/IsoSalt.java
index 15742f8bf..286fbb804 100755
--- a/src/main/java/com/labsynch/labseer/domain/IsoSalt.java
+++ b/src/main/java/com/labsynch/labseer/domain/IsoSalt.java
@@ -3,13 +3,23 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -19,6 +29,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @Transactional
 @RooJavaBean
 @RooToString
@@ -64,4 +76,236 @@ public static Collection<IsoSalt> fromJsonArrayToIsoSalts(String json) {
         return new JSONDeserializer<List<IsoSalt>>().use(null, ArrayList.class).use("values", IsoSalt.class).deserialize(json);
     }
     
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "isotope", "salt", "type", "equivalents", "ignore", "saltForm");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new IsoSalt().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countIsoSalts() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM IsoSalt o", Long.class).getSingleResult();
+    }
+
+	public static List<IsoSalt> findAllIsoSalts() {
+        return entityManager().createQuery("SELECT o FROM IsoSalt o", IsoSalt.class).getResultList();
+    }
+
+	public static List<IsoSalt> findAllIsoSalts(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM IsoSalt o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, IsoSalt.class).getResultList();
+    }
+
+	public static IsoSalt findIsoSalt(Long id) {
+        if (id == null) return null;
+        return entityManager().find(IsoSalt.class, id);
+    }
+
+	public static List<IsoSalt> findIsoSaltEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM IsoSalt o", IsoSalt.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<IsoSalt> findIsoSaltEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM IsoSalt o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, IsoSalt.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            IsoSalt attached = IsoSalt.findIsoSalt(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public IsoSalt merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        IsoSalt merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public Isotope getIsotope() {
+        return this.isotope;
+    }
+
+	public void setIsotope(Isotope isotope) {
+        this.isotope = isotope;
+    }
+
+	public Salt getSalt() {
+        return this.salt;
+    }
+
+	public void setSalt(Salt salt) {
+        this.salt = salt;
+    }
+
+	public String getType() {
+        return this.type;
+    }
+
+	public void setType(String type) {
+        this.type = type;
+    }
+
+	public Double getEquivalents() {
+        return this.equivalents;
+    }
+
+	public void setEquivalents(Double equivalents) {
+        this.equivalents = equivalents;
+    }
+
+	public Boolean getIgnore() {
+        return this.ignore;
+    }
+
+	public void setIgnore(Boolean ignore) {
+        this.ignore = ignore;
+    }
+
+	public SaltForm getSaltForm() {
+        return this.saltForm;
+    }
+
+	public void setSaltForm(SaltForm saltForm) {
+        this.saltForm = saltForm;
+    }
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static Long countFindIsoSaltsBySaltForm(SaltForm saltForm) {
+        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
+        EntityManager em = IsoSalt.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM IsoSalt AS o WHERE o.saltForm = :saltForm", Long.class);
+        q.setParameter("saltForm", saltForm);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindIsoSaltsBySaltFormAndType(SaltForm saltForm, String type) {
+        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
+        if (type == null || type.length() == 0) throw new IllegalArgumentException("The type argument is required");
+        EntityManager em = IsoSalt.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM IsoSalt AS o WHERE o.saltForm = :saltForm AND o.type = :type", Long.class);
+        q.setParameter("saltForm", saltForm);
+        q.setParameter("type", type);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<IsoSalt> findIsoSaltsBySaltForm(SaltForm saltForm) {
+        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
+        EntityManager em = IsoSalt.entityManager();
+        TypedQuery<IsoSalt> q = em.createQuery("SELECT o FROM IsoSalt AS o WHERE o.saltForm = :saltForm", IsoSalt.class);
+        q.setParameter("saltForm", saltForm);
+        return q;
+    }
+
+	public static TypedQuery<IsoSalt> findIsoSaltsBySaltForm(SaltForm saltForm, String sortFieldName, String sortOrder) {
+        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
+        EntityManager em = IsoSalt.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM IsoSalt AS o WHERE o.saltForm = :saltForm");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<IsoSalt> q = em.createQuery(queryBuilder.toString(), IsoSalt.class);
+        q.setParameter("saltForm", saltForm);
+        return q;
+    }
+
+	public static TypedQuery<IsoSalt> findIsoSaltsBySaltFormAndType(SaltForm saltForm, String type) {
+        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
+        if (type == null || type.length() == 0) throw new IllegalArgumentException("The type argument is required");
+        EntityManager em = IsoSalt.entityManager();
+        TypedQuery<IsoSalt> q = em.createQuery("SELECT o FROM IsoSalt AS o WHERE o.saltForm = :saltForm AND o.type = :type", IsoSalt.class);
+        q.setParameter("saltForm", saltForm);
+        q.setParameter("type", type);
+        return q;
+    }
+
+	public static TypedQuery<IsoSalt> findIsoSaltsBySaltFormAndType(SaltForm saltForm, String type, String sortFieldName, String sortOrder) {
+        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
+        if (type == null || type.length() == 0) throw new IllegalArgumentException("The type argument is required");
+        EntityManager em = IsoSalt.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM IsoSalt AS o WHERE o.saltForm = :saltForm AND o.type = :type");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<IsoSalt> q = em.createQuery(queryBuilder.toString(), IsoSalt.class);
+        q.setParameter("saltForm", saltForm);
+        q.setParameter("type", type);
+        return q;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/IsoSalt_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/IsoSalt_Roo_Configurable.aj
deleted file mode 100644
index e110210f9..000000000
--- a/src/main/java/com/labsynch/labseer/domain/IsoSalt_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.IsoSalt;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect IsoSalt_Roo_Configurable {
-    
-    declare @type: IsoSalt: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/IsoSalt_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/IsoSalt_Roo_Finder.aj
deleted file mode 100644
index 31310857b..000000000
--- a/src/main/java/com/labsynch/labseer/domain/IsoSalt_Roo_Finder.aj
+++ /dev/null
@@ -1,81 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.IsoSalt;
-import com.labsynch.labseer.domain.SaltForm;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect IsoSalt_Roo_Finder {
-    
-    public static Long IsoSalt.countFindIsoSaltsBySaltForm(SaltForm saltForm) {
-        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
-        EntityManager em = IsoSalt.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM IsoSalt AS o WHERE o.saltForm = :saltForm", Long.class);
-        q.setParameter("saltForm", saltForm);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long IsoSalt.countFindIsoSaltsBySaltFormAndType(SaltForm saltForm, String type) {
-        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
-        if (type == null || type.length() == 0) throw new IllegalArgumentException("The type argument is required");
-        EntityManager em = IsoSalt.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM IsoSalt AS o WHERE o.saltForm = :saltForm AND o.type = :type", Long.class);
-        q.setParameter("saltForm", saltForm);
-        q.setParameter("type", type);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<IsoSalt> IsoSalt.findIsoSaltsBySaltForm(SaltForm saltForm) {
-        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
-        EntityManager em = IsoSalt.entityManager();
-        TypedQuery<IsoSalt> q = em.createQuery("SELECT o FROM IsoSalt AS o WHERE o.saltForm = :saltForm", IsoSalt.class);
-        q.setParameter("saltForm", saltForm);
-        return q;
-    }
-    
-    public static TypedQuery<IsoSalt> IsoSalt.findIsoSaltsBySaltForm(SaltForm saltForm, String sortFieldName, String sortOrder) {
-        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
-        EntityManager em = IsoSalt.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM IsoSalt AS o WHERE o.saltForm = :saltForm");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<IsoSalt> q = em.createQuery(queryBuilder.toString(), IsoSalt.class);
-        q.setParameter("saltForm", saltForm);
-        return q;
-    }
-    
-    public static TypedQuery<IsoSalt> IsoSalt.findIsoSaltsBySaltFormAndType(SaltForm saltForm, String type) {
-        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
-        if (type == null || type.length() == 0) throw new IllegalArgumentException("The type argument is required");
-        EntityManager em = IsoSalt.entityManager();
-        TypedQuery<IsoSalt> q = em.createQuery("SELECT o FROM IsoSalt AS o WHERE o.saltForm = :saltForm AND o.type = :type", IsoSalt.class);
-        q.setParameter("saltForm", saltForm);
-        q.setParameter("type", type);
-        return q;
-    }
-    
-    public static TypedQuery<IsoSalt> IsoSalt.findIsoSaltsBySaltFormAndType(SaltForm saltForm, String type, String sortFieldName, String sortOrder) {
-        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
-        if (type == null || type.length() == 0) throw new IllegalArgumentException("The type argument is required");
-        EntityManager em = IsoSalt.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM IsoSalt AS o WHERE o.saltForm = :saltForm AND o.type = :type");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<IsoSalt> q = em.createQuery(queryBuilder.toString(), IsoSalt.class);
-        q.setParameter("saltForm", saltForm);
-        q.setParameter("type", type);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/IsoSalt_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/IsoSalt_Roo_JavaBean.aj
deleted file mode 100644
index 86c042dc9..000000000
--- a/src/main/java/com/labsynch/labseer/domain/IsoSalt_Roo_JavaBean.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.IsoSalt;
-import com.labsynch.labseer.domain.Isotope;
-import com.labsynch.labseer.domain.Salt;
-import com.labsynch.labseer.domain.SaltForm;
-
-privileged aspect IsoSalt_Roo_JavaBean {
-    
-    public Isotope IsoSalt.getIsotope() {
-        return this.isotope;
-    }
-    
-    public void IsoSalt.setIsotope(Isotope isotope) {
-        this.isotope = isotope;
-    }
-    
-    public Salt IsoSalt.getSalt() {
-        return this.salt;
-    }
-    
-    public void IsoSalt.setSalt(Salt salt) {
-        this.salt = salt;
-    }
-    
-    public String IsoSalt.getType() {
-        return this.type;
-    }
-    
-    public void IsoSalt.setType(String type) {
-        this.type = type;
-    }
-    
-    public Double IsoSalt.getEquivalents() {
-        return this.equivalents;
-    }
-    
-    public void IsoSalt.setEquivalents(Double equivalents) {
-        this.equivalents = equivalents;
-    }
-    
-    public Boolean IsoSalt.getIgnore() {
-        return this.ignore;
-    }
-    
-    public void IsoSalt.setIgnore(Boolean ignore) {
-        this.ignore = ignore;
-    }
-    
-    public SaltForm IsoSalt.getSaltForm() {
-        return this.saltForm;
-    }
-    
-    public void IsoSalt.setSaltForm(SaltForm saltForm) {
-        this.saltForm = saltForm;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/IsoSalt_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/IsoSalt_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 1ed417cb4..000000000
--- a/src/main/java/com/labsynch/labseer/domain/IsoSalt_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.IsoSalt;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect IsoSalt_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager IsoSalt.entityManager;
-    
-    public static final List<String> IsoSalt.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "isotope", "salt", "type", "equivalents", "ignore", "saltForm");
-    
-    public static final EntityManager IsoSalt.entityManager() {
-        EntityManager em = new IsoSalt().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long IsoSalt.countIsoSalts() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM IsoSalt o", Long.class).getSingleResult();
-    }
-    
-    public static List<IsoSalt> IsoSalt.findAllIsoSalts() {
-        return entityManager().createQuery("SELECT o FROM IsoSalt o", IsoSalt.class).getResultList();
-    }
-    
-    public static List<IsoSalt> IsoSalt.findAllIsoSalts(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM IsoSalt o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, IsoSalt.class).getResultList();
-    }
-    
-    public static IsoSalt IsoSalt.findIsoSalt(Long id) {
-        if (id == null) return null;
-        return entityManager().find(IsoSalt.class, id);
-    }
-    
-    public static List<IsoSalt> IsoSalt.findIsoSaltEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM IsoSalt o", IsoSalt.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<IsoSalt> IsoSalt.findIsoSaltEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM IsoSalt o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, IsoSalt.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void IsoSalt.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void IsoSalt.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            IsoSalt attached = IsoSalt.findIsoSalt(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void IsoSalt.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void IsoSalt.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public IsoSalt IsoSalt.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        IsoSalt merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/IsoSalt_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/IsoSalt_Roo_Jpa_Entity.aj
deleted file mode 100644
index ad91a5534..000000000
--- a/src/main/java/com/labsynch/labseer/domain/IsoSalt_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.IsoSalt;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect IsoSalt_Roo_Jpa_Entity {
-    
-    declare @type: IsoSalt: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long IsoSalt.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer IsoSalt.version;
-    
-    public Long IsoSalt.getId() {
-        return this.id;
-    }
-    
-    public void IsoSalt.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer IsoSalt.getVersion() {
-        return this.version;
-    }
-    
-    public void IsoSalt.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/IsoSalt_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/IsoSalt_Roo_ToString.aj
deleted file mode 100644
index 04f2062e1..000000000
--- a/src/main/java/com/labsynch/labseer/domain/IsoSalt_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.IsoSalt;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect IsoSalt_Roo_ToString {
-    
-    public String IsoSalt.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Isotope.java b/src/main/java/com/labsynch/labseer/domain/Isotope.java
index 11f1a47d6..c5d0f5612 100755
--- a/src/main/java/com/labsynch/labseer/domain/Isotope.java
+++ b/src/main/java/com/labsynch/labseer/domain/Isotope.java
@@ -1,21 +1,35 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
-
+import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -78,4 +92,255 @@ public static TypedQuery<Isotope> findIsotopesByNameEquals(String name) {
         TypedQuery<Isotope> q = em.createQuery(criteria);
         return q;
     }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String getName() {
+        return this.name;
+    }
+
+	public void setName(String name) {
+        this.name = name;
+    }
+
+	public String getAbbrev() {
+        return this.abbrev;
+    }
+
+	public void setAbbrev(String abbrev) {
+        this.abbrev = abbrev;
+    }
+
+	public Double getMassChange() {
+        return this.massChange;
+    }
+
+	public void setMassChange(Double massChange) {
+        this.massChange = massChange;
+    }
+
+	public Boolean getIgnore() {
+        return this.ignore;
+    }
+
+	public void setIgnore(Boolean ignore) {
+        this.ignore = ignore;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static Isotope fromJsonToIsotope(String json) {
+        return new JSONDeserializer<Isotope>()
+        .use(null, Isotope.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<Isotope> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<Isotope> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<Isotope> fromJsonArrayToIsotopes(String json) {
+        return new JSONDeserializer<List<Isotope>>()
+        .use("values", Isotope.class).deserialize(json);
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "abbrev", "massChange", "ignore");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new Isotope().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countIsotopes() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM Isotope o", Long.class).getSingleResult();
+    }
+
+	public static List<Isotope> findAllIsotopes() {
+        return entityManager().createQuery("SELECT o FROM Isotope o", Isotope.class).getResultList();
+    }
+
+	public static List<Isotope> findAllIsotopes(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM Isotope o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, Isotope.class).getResultList();
+    }
+
+	public static Isotope findIsotope(Long id) {
+        if (id == null) return null;
+        return entityManager().find(Isotope.class, id);
+    }
+
+	public static List<Isotope> findIsotopeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM Isotope o", Isotope.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<Isotope> findIsotopeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM Isotope o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, Isotope.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            Isotope attached = Isotope.findIsotope(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public Isotope merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        Isotope merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public static Long countFindIsotopesByAbbrevEquals(String abbrev) {
+        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
+        EntityManager em = Isotope.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Isotope AS o WHERE o.abbrev = :abbrev", Long.class);
+        q.setParameter("abbrev", abbrev);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindIsotopesByAbbrevEqualsAndNameEquals(String abbrev, String name) {
+        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = Isotope.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Isotope AS o WHERE o.abbrev = :abbrev  AND o.name = :name", Long.class);
+        q.setParameter("abbrev", abbrev);
+        q.setParameter("name", name);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindIsotopesByNameEquals(String name) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = Isotope.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Isotope AS o WHERE o.name = :name", Long.class);
+        q.setParameter("name", name);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<Isotope> findIsotopesByAbbrevEquals(String abbrev, String sortFieldName, String sortOrder) {
+        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
+        EntityManager em = Isotope.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Isotope AS o WHERE o.abbrev = :abbrev");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Isotope> q = em.createQuery(queryBuilder.toString(), Isotope.class);
+        q.setParameter("abbrev", abbrev);
+        return q;
+    }
+
+	public static TypedQuery<Isotope> findIsotopesByAbbrevEqualsAndNameEquals(String abbrev, String name, String sortFieldName, String sortOrder) {
+        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = Isotope.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Isotope AS o WHERE o.abbrev = :abbrev  AND o.name = :name");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Isotope> q = em.createQuery(queryBuilder.toString(), Isotope.class);
+        q.setParameter("abbrev", abbrev);
+        q.setParameter("name", name);
+        return q;
+    }
+
+	public static TypedQuery<Isotope> findIsotopesByNameEquals(String name, String sortFieldName, String sortOrder) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = Isotope.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Isotope AS o WHERE o.name = :name");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Isotope> q = em.createQuery(queryBuilder.toString(), Isotope.class);
+        q.setParameter("name", name);
+        return q;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/Isotope_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/Isotope_Roo_Configurable.aj
deleted file mode 100644
index 2e7a20020..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Isotope_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Isotope;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect Isotope_Roo_Configurable {
-    
-    declare @type: Isotope: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Isotope_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/Isotope_Roo_Finder.aj
deleted file mode 100644
index a7bac14bf..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Isotope_Roo_Finder.aj
+++ /dev/null
@@ -1,85 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Isotope;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect Isotope_Roo_Finder {
-    
-    public static Long Isotope.countFindIsotopesByAbbrevEquals(String abbrev) {
-        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
-        EntityManager em = Isotope.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Isotope AS o WHERE o.abbrev = :abbrev", Long.class);
-        q.setParameter("abbrev", abbrev);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Isotope.countFindIsotopesByAbbrevEqualsAndNameEquals(String abbrev, String name) {
-        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = Isotope.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Isotope AS o WHERE o.abbrev = :abbrev  AND o.name = :name", Long.class);
-        q.setParameter("abbrev", abbrev);
-        q.setParameter("name", name);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Isotope.countFindIsotopesByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = Isotope.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Isotope AS o WHERE o.name = :name", Long.class);
-        q.setParameter("name", name);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<Isotope> Isotope.findIsotopesByAbbrevEquals(String abbrev, String sortFieldName, String sortOrder) {
-        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
-        EntityManager em = Isotope.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Isotope AS o WHERE o.abbrev = :abbrev");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Isotope> q = em.createQuery(queryBuilder.toString(), Isotope.class);
-        q.setParameter("abbrev", abbrev);
-        return q;
-    }
-    
-    public static TypedQuery<Isotope> Isotope.findIsotopesByAbbrevEqualsAndNameEquals(String abbrev, String name, String sortFieldName, String sortOrder) {
-        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = Isotope.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Isotope AS o WHERE o.abbrev = :abbrev  AND o.name = :name");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Isotope> q = em.createQuery(queryBuilder.toString(), Isotope.class);
-        q.setParameter("abbrev", abbrev);
-        q.setParameter("name", name);
-        return q;
-    }
-    
-    public static TypedQuery<Isotope> Isotope.findIsotopesByNameEquals(String name, String sortFieldName, String sortOrder) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = Isotope.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Isotope AS o WHERE o.name = :name");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Isotope> q = em.createQuery(queryBuilder.toString(), Isotope.class);
-        q.setParameter("name", name);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Isotope_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/Isotope_Roo_JavaBean.aj
deleted file mode 100644
index 4ef5b182c..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Isotope_Roo_JavaBean.aj
+++ /dev/null
@@ -1,42 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Isotope;
-
-privileged aspect Isotope_Roo_JavaBean {
-    
-    public String Isotope.getName() {
-        return this.name;
-    }
-    
-    public void Isotope.setName(String name) {
-        this.name = name;
-    }
-    
-    public String Isotope.getAbbrev() {
-        return this.abbrev;
-    }
-    
-    public void Isotope.setAbbrev(String abbrev) {
-        this.abbrev = abbrev;
-    }
-    
-    public Double Isotope.getMassChange() {
-        return this.massChange;
-    }
-    
-    public void Isotope.setMassChange(Double massChange) {
-        this.massChange = massChange;
-    }
-    
-    public Boolean Isotope.getIgnore() {
-        return this.ignore;
-    }
-    
-    public void Isotope.setIgnore(Boolean ignore) {
-        this.ignore = ignore;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Isotope_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/Isotope_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index dbc30f54d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Isotope_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Isotope;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect Isotope_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager Isotope.entityManager;
-    
-    public static final List<String> Isotope.fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "abbrev", "massChange", "ignore");
-    
-    public static final EntityManager Isotope.entityManager() {
-        EntityManager em = new Isotope().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long Isotope.countIsotopes() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM Isotope o", Long.class).getSingleResult();
-    }
-    
-    public static List<Isotope> Isotope.findAllIsotopes() {
-        return entityManager().createQuery("SELECT o FROM Isotope o", Isotope.class).getResultList();
-    }
-    
-    public static List<Isotope> Isotope.findAllIsotopes(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM Isotope o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, Isotope.class).getResultList();
-    }
-    
-    public static Isotope Isotope.findIsotope(Long id) {
-        if (id == null) return null;
-        return entityManager().find(Isotope.class, id);
-    }
-    
-    public static List<Isotope> Isotope.findIsotopeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM Isotope o", Isotope.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<Isotope> Isotope.findIsotopeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM Isotope o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, Isotope.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void Isotope.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void Isotope.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            Isotope attached = Isotope.findIsotope(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void Isotope.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void Isotope.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public Isotope Isotope.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        Isotope merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Isotope_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/Isotope_Roo_Jpa_Entity.aj
deleted file mode 100644
index a04165442..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Isotope_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Isotope;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect Isotope_Roo_Jpa_Entity {
-    
-    declare @type: Isotope: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long Isotope.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer Isotope.version;
-    
-    public Long Isotope.getId() {
-        return this.id;
-    }
-    
-    public void Isotope.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer Isotope.getVersion() {
-        return this.version;
-    }
-    
-    public void Isotope.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Isotope_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/Isotope_Roo_Json.aj
deleted file mode 100644
index 581ded1a8..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Isotope_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Isotope;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect Isotope_Roo_Json {
-    
-    public String Isotope.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String Isotope.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static Isotope Isotope.fromJsonToIsotope(String json) {
-        return new JSONDeserializer<Isotope>()
-        .use(null, Isotope.class).deserialize(json);
-    }
-    
-    public static String Isotope.toJsonArray(Collection<Isotope> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String Isotope.toJsonArray(Collection<Isotope> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<Isotope> Isotope.fromJsonArrayToIsotopes(String json) {
-        return new JSONDeserializer<List<Isotope>>()
-        .use("values", Isotope.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Isotope_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/Isotope_Roo_ToString.aj
deleted file mode 100644
index 9abdbd03e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Isotope_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Isotope;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect Isotope_Roo_ToString {
-    
-    public String Isotope.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer.java b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer.java
index cf1fc6c0a..60fa5f705 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer.java
@@ -10,6 +10,7 @@
 import java.util.Set;
 
 import javax.persistence.CascadeType;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
@@ -17,20 +18,24 @@
 import javax.persistence.OneToMany;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
-
+import org.springframework.transaction.annotation.Transactional;
 import com.labsynch.labseer.utils.CustomBigDecimalFactory;
 import com.labsynch.labseer.utils.ExcludeNulls;
 
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -228,4 +233,190 @@ public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTy
         
         return q;
     }
+
+	public static Long countFindItxContainerContainersByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = ItxContainerContainer.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxContainerContainer AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindItxContainerContainersByLsTypeEqualsAndFirstContainerEquals(String lsType, Container firstContainer) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (firstContainer == null) throw new IllegalArgumentException("The firstContainer argument is required");
+        EntityManager em = ItxContainerContainer.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxContainerContainer AS o WHERE o.lsType = :lsType  AND o.firstContainer = :firstContainer", Long.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("firstContainer", firstContainer);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindItxContainerContainersByLsTypeEqualsAndSecondContainerEquals(String lsType, Container secondContainer) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (secondContainer == null) throw new IllegalArgumentException("The secondContainer argument is required");
+        EntityManager em = ItxContainerContainer.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxContainerContainer AS o WHERE o.lsType = :lsType  AND o.secondContainer = :secondContainer", Long.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("secondContainer", secondContainer);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = ItxContainerContainer.entityManager();
+        TypedQuery<ItxContainerContainer> q = em.createQuery("SELECT o FROM ItxContainerContainer AS o WHERE o.lsTransaction = :lsTransaction", ItxContainerContainer.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = ItxContainerContainer.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxContainerContainer AS o WHERE o.lsTransaction = :lsTransaction");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ItxContainerContainer> q = em.createQuery(queryBuilder.toString(), ItxContainerContainer.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTypeEqualsAndFirstContainerEquals(String lsType, Container firstContainer) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (firstContainer == null) throw new IllegalArgumentException("The firstContainer argument is required");
+        EntityManager em = ItxContainerContainer.entityManager();
+        TypedQuery<ItxContainerContainer> q = em.createQuery("SELECT o FROM ItxContainerContainer AS o WHERE o.lsType = :lsType  AND o.firstContainer = :firstContainer", ItxContainerContainer.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("firstContainer", firstContainer);
+        return q;
+    }
+
+	public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTypeEqualsAndFirstContainerEquals(String lsType, Container firstContainer, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (firstContainer == null) throw new IllegalArgumentException("The firstContainer argument is required");
+        EntityManager em = ItxContainerContainer.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxContainerContainer AS o WHERE o.lsType = :lsType  AND o.firstContainer = :firstContainer");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ItxContainerContainer> q = em.createQuery(queryBuilder.toString(), ItxContainerContainer.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("firstContainer", firstContainer);
+        return q;
+    }
+
+	public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTypeEqualsAndSecondContainerEquals(String lsType, Container secondContainer) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (secondContainer == null) throw new IllegalArgumentException("The secondContainer argument is required");
+        EntityManager em = ItxContainerContainer.entityManager();
+        TypedQuery<ItxContainerContainer> q = em.createQuery("SELECT o FROM ItxContainerContainer AS o WHERE o.lsType = :lsType  AND o.secondContainer = :secondContainer", ItxContainerContainer.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("secondContainer", secondContainer);
+        return q;
+    }
+
+	public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTypeEqualsAndSecondContainerEquals(String lsType, Container secondContainer, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (secondContainer == null) throw new IllegalArgumentException("The secondContainer argument is required");
+        EntityManager em = ItxContainerContainer.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxContainerContainer AS o WHERE o.lsType = :lsType  AND o.secondContainer = :secondContainer");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ItxContainerContainer> q = em.createQuery(queryBuilder.toString(), ItxContainerContainer.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("secondContainer", secondContainer);
+        return q;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public ItxContainerContainer() {
+        super();
+    }
+
+	public Container getFirstContainer() {
+        return this.firstContainer;
+    }
+
+	public void setFirstContainer(Container firstContainer) {
+        this.firstContainer = firstContainer;
+    }
+
+	public Container getSecondContainer() {
+        return this.secondContainer;
+    }
+
+	public void setSecondContainer(Container secondContainer) {
+        this.secondContainer = secondContainer;
+    }
+
+	public Set<ItxContainerContainerState> getLsStates() {
+        return this.lsStates;
+    }
+
+	public void setLsStates(Set<ItxContainerContainerState> lsStates) {
+        this.lsStates = lsStates;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "firstContainer", "secondContainer", "lsStates");
+
+	public static long countItxContainerContainers() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ItxContainerContainer o", Long.class).getSingleResult();
+    }
+
+	public static List<ItxContainerContainer> findAllItxContainerContainers() {
+        return entityManager().createQuery("SELECT o FROM ItxContainerContainer o", ItxContainerContainer.class).getResultList();
+    }
+
+	public static List<ItxContainerContainer> findAllItxContainerContainers(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxContainerContainer o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxContainerContainer.class).getResultList();
+    }
+
+	public static ItxContainerContainer findItxContainerContainer(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ItxContainerContainer.class, id);
+    }
+
+	public static List<ItxContainerContainer> findItxContainerContainerEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ItxContainerContainer o", ItxContainerContainer.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ItxContainerContainer> findItxContainerContainerEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxContainerContainer o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxContainerContainer.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public ItxContainerContainer merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ItxContainerContainer merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState.java b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState.java
index 38be744dd..0a654b9dc 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState.java
@@ -10,11 +10,14 @@
 import java.util.Set;
 
 import javax.persistence.CascadeType;
+import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -27,6 +30,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord
@@ -110,4 +115,77 @@ public static Collection<ItxContainerContainerState> fromJsonArrayToItxContainer
     }
 
 
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("itxContainerContainer", "lsValues");
+
+	public static long countItxContainerContainerStates() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ItxContainerContainerState o", Long.class).getSingleResult();
+    }
+
+	public static List<ItxContainerContainerState> findAllItxContainerContainerStates() {
+        return entityManager().createQuery("SELECT o FROM ItxContainerContainerState o", ItxContainerContainerState.class).getResultList();
+    }
+
+	public static List<ItxContainerContainerState> findAllItxContainerContainerStates(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxContainerContainerState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxContainerContainerState.class).getResultList();
+    }
+
+	public static ItxContainerContainerState findItxContainerContainerState(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ItxContainerContainerState.class, id);
+    }
+
+	public static List<ItxContainerContainerState> findItxContainerContainerStateEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ItxContainerContainerState o", ItxContainerContainerState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ItxContainerContainerState> findItxContainerContainerStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxContainerContainerState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxContainerContainerState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public ItxContainerContainerState merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ItxContainerContainerState merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public ItxContainerContainerState() {
+        super();
+    }
+
+	public ItxContainerContainer getItxContainerContainer() {
+        return this.itxContainerContainer;
+    }
+
+	public void setItxContainerContainer(ItxContainerContainer itxContainerContainer) {
+        this.itxContainerContainer = itxContainerContainer;
+    }
+
+	public Set<ItxContainerContainerValue> getLsValues() {
+        return this.lsValues;
+    }
+
+	public void setLsValues(Set<ItxContainerContainerValue> lsValues) {
+        this.lsValues = lsValues;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState_Roo_Configurable.aj
deleted file mode 100755
index 445edf760..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxContainerContainerState;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ItxContainerContainerState_Roo_Configurable {
-    
-    declare @type: ItxContainerContainerState: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState_Roo_JavaBean.aj
deleted file mode 100755
index 3221e5f3f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState_Roo_JavaBean.aj
+++ /dev/null
@@ -1,29 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxContainerContainer;
-import com.labsynch.labseer.domain.ItxContainerContainerState;
-import com.labsynch.labseer.domain.ItxContainerContainerValue;
-import java.util.Set;
-
-privileged aspect ItxContainerContainerState_Roo_JavaBean {
-    
-    public ItxContainerContainer ItxContainerContainerState.getItxContainerContainer() {
-        return this.itxContainerContainer;
-    }
-    
-    public void ItxContainerContainerState.setItxContainerContainer(ItxContainerContainer itxContainerContainer) {
-        this.itxContainerContainer = itxContainerContainer;
-    }
-    
-    public Set<ItxContainerContainerValue> ItxContainerContainerState.getLsValues() {
-        return this.lsValues;
-    }
-    
-    public void ItxContainerContainerState.setLsValues(Set<ItxContainerContainerValue> lsValues) {
-        this.lsValues = lsValues;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 63ffef07f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxContainerContainerState;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ItxContainerContainerState_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ItxContainerContainerState.fieldNames4OrderClauseFilter = java.util.Arrays.asList("itxContainerContainer", "lsValues");
-    
-    public static long ItxContainerContainerState.countItxContainerContainerStates() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ItxContainerContainerState o", Long.class).getSingleResult();
-    }
-    
-    public static List<ItxContainerContainerState> ItxContainerContainerState.findAllItxContainerContainerStates() {
-        return entityManager().createQuery("SELECT o FROM ItxContainerContainerState o", ItxContainerContainerState.class).getResultList();
-    }
-    
-    public static List<ItxContainerContainerState> ItxContainerContainerState.findAllItxContainerContainerStates(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxContainerContainerState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxContainerContainerState.class).getResultList();
-    }
-    
-    public static ItxContainerContainerState ItxContainerContainerState.findItxContainerContainerState(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ItxContainerContainerState.class, id);
-    }
-    
-    public static List<ItxContainerContainerState> ItxContainerContainerState.findItxContainerContainerStateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxContainerContainerState o", ItxContainerContainerState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ItxContainerContainerState> ItxContainerContainerState.findItxContainerContainerStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxContainerContainerState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxContainerContainerState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public ItxContainerContainerState ItxContainerContainerState.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ItxContainerContainerState merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState_Roo_Jpa_Entity.aj
deleted file mode 100755
index b267d20bc..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,17 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxContainerContainerState;
-import javax.persistence.Entity;
-
-privileged aspect ItxContainerContainerState_Roo_Jpa_Entity {
-    
-    declare @type: ItxContainerContainerState: @Entity;
-    
-    public ItxContainerContainerState.new() {
-        super();
-    }
-
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState_Roo_ToString.aj
deleted file mode 100755
index e1aeaa347..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxContainerContainerState;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ItxContainerContainerState_Roo_ToString {
-    
-    public String ItxContainerContainerState.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue.java b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue.java
index 008e9501b..d6354675e 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue.java
@@ -6,10 +6,12 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
-
+import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -22,6 +24,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord
@@ -137,4 +141,65 @@ public static com.labsynch.labseer.domain.ItxContainerContainerValue create(com.
         ItxContainerContainerValue newItxContainerContainerValue = new JSONDeserializer<ItxContainerContainerValue>().use(null, ItxContainerContainerValue.class).deserializeInto(lsThingValue.toJson(), new ItxContainerContainerValue());
         return newItxContainerContainerValue;
     }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsState");
+
+	public static long countItxContainerContainerValues() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ItxContainerContainerValue o", Long.class).getSingleResult();
+    }
+
+	public static List<ItxContainerContainerValue> findAllItxContainerContainerValues() {
+        return entityManager().createQuery("SELECT o FROM ItxContainerContainerValue o", ItxContainerContainerValue.class).getResultList();
+    }
+
+	public static List<ItxContainerContainerValue> findAllItxContainerContainerValues(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxContainerContainerValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxContainerContainerValue.class).getResultList();
+    }
+
+	public static ItxContainerContainerValue findItxContainerContainerValue(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ItxContainerContainerValue.class, id);
+    }
+
+	public static List<ItxContainerContainerValue> findItxContainerContainerValueEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ItxContainerContainerValue o", ItxContainerContainerValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ItxContainerContainerValue> findItxContainerContainerValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxContainerContainerValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxContainerContainerValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public ItxContainerContainerValue merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ItxContainerContainerValue merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public ItxContainerContainerState getLsState() {
+        return this.lsState;
+    }
+
+	public void setLsState(ItxContainerContainerState lsState) {
+        this.lsState = lsState;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue_Roo_Configurable.aj
deleted file mode 100755
index cc0c184a0..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxContainerContainerValue;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ItxContainerContainerValue_Roo_Configurable {
-    
-    declare @type: ItxContainerContainerValue: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue_Roo_JavaBean.aj
deleted file mode 100755
index cb441a6ba..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue_Roo_JavaBean.aj
+++ /dev/null
@@ -1,19 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxContainerContainerState;
-import com.labsynch.labseer.domain.ItxContainerContainerValue;
-
-privileged aspect ItxContainerContainerValue_Roo_JavaBean {
-    
-    public ItxContainerContainerState ItxContainerContainerValue.getLsState() {
-        return this.lsState;
-    }
-    
-    public void ItxContainerContainerValue.setLsState(ItxContainerContainerState lsState) {
-        this.lsState = lsState;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 05522cfd5..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxContainerContainerValue;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ItxContainerContainerValue_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ItxContainerContainerValue.fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsState");
-    
-    public static long ItxContainerContainerValue.countItxContainerContainerValues() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ItxContainerContainerValue o", Long.class).getSingleResult();
-    }
-    
-    public static List<ItxContainerContainerValue> ItxContainerContainerValue.findAllItxContainerContainerValues() {
-        return entityManager().createQuery("SELECT o FROM ItxContainerContainerValue o", ItxContainerContainerValue.class).getResultList();
-    }
-    
-    public static List<ItxContainerContainerValue> ItxContainerContainerValue.findAllItxContainerContainerValues(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxContainerContainerValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxContainerContainerValue.class).getResultList();
-    }
-    
-    public static ItxContainerContainerValue ItxContainerContainerValue.findItxContainerContainerValue(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ItxContainerContainerValue.class, id);
-    }
-    
-    public static List<ItxContainerContainerValue> ItxContainerContainerValue.findItxContainerContainerValueEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxContainerContainerValue o", ItxContainerContainerValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ItxContainerContainerValue> ItxContainerContainerValue.findItxContainerContainerValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxContainerContainerValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxContainerContainerValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public ItxContainerContainerValue ItxContainerContainerValue.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ItxContainerContainerValue merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue_Roo_Jpa_Entity.aj
deleted file mode 100755
index 8773c2a2b..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxContainerContainerValue;
-import javax.persistence.Entity;
-
-privileged aspect ItxContainerContainerValue_Roo_Jpa_Entity {
-    
-    declare @type: ItxContainerContainerValue: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue_Roo_ToString.aj
deleted file mode 100755
index 2e3635163..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxContainerContainerValue;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ItxContainerContainerValue_Roo_ToString {
-    
-    public String ItxContainerContainerValue.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer_Roo_Configurable.aj
deleted file mode 100755
index 0e00cb514..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxContainerContainer;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ItxContainerContainer_Roo_Configurable {
-    
-    declare @type: ItxContainerContainer: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer_Roo_Finder.aj
deleted file mode 100755
index 3902d86b5..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer_Roo_Finder.aj
+++ /dev/null
@@ -1,118 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ItxContainerContainer;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ItxContainerContainer_Roo_Finder {
-    
-    public static Long ItxContainerContainer.countFindItxContainerContainersByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = ItxContainerContainer.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxContainerContainer AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ItxContainerContainer.countFindItxContainerContainersByLsTypeEqualsAndFirstContainerEquals(String lsType, Container firstContainer) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (firstContainer == null) throw new IllegalArgumentException("The firstContainer argument is required");
-        EntityManager em = ItxContainerContainer.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxContainerContainer AS o WHERE o.lsType = :lsType  AND o.firstContainer = :firstContainer", Long.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("firstContainer", firstContainer);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ItxContainerContainer.countFindItxContainerContainersByLsTypeEqualsAndSecondContainerEquals(String lsType, Container secondContainer) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (secondContainer == null) throw new IllegalArgumentException("The secondContainer argument is required");
-        EntityManager em = ItxContainerContainer.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxContainerContainer AS o WHERE o.lsType = :lsType  AND o.secondContainer = :secondContainer", Long.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("secondContainer", secondContainer);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ItxContainerContainer> ItxContainerContainer.findItxContainerContainersByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = ItxContainerContainer.entityManager();
-        TypedQuery<ItxContainerContainer> q = em.createQuery("SELECT o FROM ItxContainerContainer AS o WHERE o.lsTransaction = :lsTransaction", ItxContainerContainer.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<ItxContainerContainer> ItxContainerContainer.findItxContainerContainersByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = ItxContainerContainer.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxContainerContainer AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ItxContainerContainer> q = em.createQuery(queryBuilder.toString(), ItxContainerContainer.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<ItxContainerContainer> ItxContainerContainer.findItxContainerContainersByLsTypeEqualsAndFirstContainerEquals(String lsType, Container firstContainer) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (firstContainer == null) throw new IllegalArgumentException("The firstContainer argument is required");
-        EntityManager em = ItxContainerContainer.entityManager();
-        TypedQuery<ItxContainerContainer> q = em.createQuery("SELECT o FROM ItxContainerContainer AS o WHERE o.lsType = :lsType  AND o.firstContainer = :firstContainer", ItxContainerContainer.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("firstContainer", firstContainer);
-        return q;
-    }
-    
-    public static TypedQuery<ItxContainerContainer> ItxContainerContainer.findItxContainerContainersByLsTypeEqualsAndFirstContainerEquals(String lsType, Container firstContainer, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (firstContainer == null) throw new IllegalArgumentException("The firstContainer argument is required");
-        EntityManager em = ItxContainerContainer.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxContainerContainer AS o WHERE o.lsType = :lsType  AND o.firstContainer = :firstContainer");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ItxContainerContainer> q = em.createQuery(queryBuilder.toString(), ItxContainerContainer.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("firstContainer", firstContainer);
-        return q;
-    }
-    
-    public static TypedQuery<ItxContainerContainer> ItxContainerContainer.findItxContainerContainersByLsTypeEqualsAndSecondContainerEquals(String lsType, Container secondContainer) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (secondContainer == null) throw new IllegalArgumentException("The secondContainer argument is required");
-        EntityManager em = ItxContainerContainer.entityManager();
-        TypedQuery<ItxContainerContainer> q = em.createQuery("SELECT o FROM ItxContainerContainer AS o WHERE o.lsType = :lsType  AND o.secondContainer = :secondContainer", ItxContainerContainer.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("secondContainer", secondContainer);
-        return q;
-    }
-    
-    public static TypedQuery<ItxContainerContainer> ItxContainerContainer.findItxContainerContainersByLsTypeEqualsAndSecondContainerEquals(String lsType, Container secondContainer, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (secondContainer == null) throw new IllegalArgumentException("The secondContainer argument is required");
-        EntityManager em = ItxContainerContainer.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxContainerContainer AS o WHERE o.lsType = :lsType  AND o.secondContainer = :secondContainer");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ItxContainerContainer> q = em.createQuery(queryBuilder.toString(), ItxContainerContainer.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("secondContainer", secondContainer);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer_Roo_JavaBean.aj
deleted file mode 100755
index 60770a4d9..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer_Roo_JavaBean.aj
+++ /dev/null
@@ -1,37 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ItxContainerContainer;
-import com.labsynch.labseer.domain.ItxContainerContainerState;
-import java.util.Set;
-
-privileged aspect ItxContainerContainer_Roo_JavaBean {
-    
-    public Container ItxContainerContainer.getFirstContainer() {
-        return this.firstContainer;
-    }
-    
-    public void ItxContainerContainer.setFirstContainer(Container firstContainer) {
-        this.firstContainer = firstContainer;
-    }
-    
-    public Container ItxContainerContainer.getSecondContainer() {
-        return this.secondContainer;
-    }
-    
-    public void ItxContainerContainer.setSecondContainer(Container secondContainer) {
-        this.secondContainer = secondContainer;
-    }
-    
-    public Set<ItxContainerContainerState> ItxContainerContainer.getLsStates() {
-        return this.lsStates;
-    }
-    
-    public void ItxContainerContainer.setLsStates(Set<ItxContainerContainerState> lsStates) {
-        this.lsStates = lsStates;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index df7fd93fc..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxContainerContainer;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ItxContainerContainer_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ItxContainerContainer.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "firstContainer", "secondContainer", "lsStates");
-    
-    public static long ItxContainerContainer.countItxContainerContainers() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ItxContainerContainer o", Long.class).getSingleResult();
-    }
-    
-    public static List<ItxContainerContainer> ItxContainerContainer.findAllItxContainerContainers() {
-        return entityManager().createQuery("SELECT o FROM ItxContainerContainer o", ItxContainerContainer.class).getResultList();
-    }
-    
-    public static List<ItxContainerContainer> ItxContainerContainer.findAllItxContainerContainers(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxContainerContainer o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxContainerContainer.class).getResultList();
-    }
-    
-    public static ItxContainerContainer ItxContainerContainer.findItxContainerContainer(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ItxContainerContainer.class, id);
-    }
-    
-    public static List<ItxContainerContainer> ItxContainerContainer.findItxContainerContainerEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxContainerContainer o", ItxContainerContainer.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ItxContainerContainer> ItxContainerContainer.findItxContainerContainerEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxContainerContainer o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxContainerContainer.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public ItxContainerContainer ItxContainerContainer.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ItxContainerContainer merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer_Roo_Jpa_Entity.aj
deleted file mode 100755
index 1d3853bbd..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,17 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxContainerContainer;
-import javax.persistence.Entity;
-
-privileged aspect ItxContainerContainer_Roo_Jpa_Entity {
-    
-    declare @type: ItxContainerContainer: @Entity;
-    
-    public ItxContainerContainer.new() {
-        super();
-    }
-
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer_Roo_ToString.aj
deleted file mode 100755
index d3f38cb05..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxContainerContainer;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ItxContainerContainer_Roo_ToString {
-    
-    public String ItxContainerContainer.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment.java b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment.java
index 6dbc37298..f9ef186c0 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment.java
@@ -10,26 +10,33 @@
 import java.util.Set;
 
 import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
+import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
-
+import org.springframework.transaction.annotation.Transactional;
 import com.labsynch.labseer.utils.CustomBigDecimalFactory;
 import com.labsynch.labseer.utils.ExcludeNulls;
 
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -133,4 +140,178 @@ public static ItxExperimentExperiment updateNoStates(ItxExperimentExperiment itx
     	
         return updatedItxExperimentExperiment;
     }
+
+	public static Long countFindItxExperimentExperimentsByFirstExperiment(Experiment firstExperiment) {
+        if (firstExperiment == null) throw new IllegalArgumentException("The firstExperiment argument is required");
+        EntityManager em = ItxExperimentExperiment.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxExperimentExperiment AS o WHERE o.firstExperiment = :firstExperiment", Long.class);
+        q.setParameter("firstExperiment", firstExperiment);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindItxExperimentExperimentsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = ItxExperimentExperiment.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxExperimentExperiment AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindItxExperimentExperimentsBySecondExperiment(Experiment secondExperiment) {
+        if (secondExperiment == null) throw new IllegalArgumentException("The secondExperiment argument is required");
+        EntityManager em = ItxExperimentExperiment.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxExperimentExperiment AS o WHERE o.secondExperiment = :secondExperiment", Long.class);
+        q.setParameter("secondExperiment", secondExperiment);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ItxExperimentExperiment> findItxExperimentExperimentsByFirstExperiment(Experiment firstExperiment) {
+        if (firstExperiment == null) throw new IllegalArgumentException("The firstExperiment argument is required");
+        EntityManager em = ItxExperimentExperiment.entityManager();
+        TypedQuery<ItxExperimentExperiment> q = em.createQuery("SELECT o FROM ItxExperimentExperiment AS o WHERE o.firstExperiment = :firstExperiment", ItxExperimentExperiment.class);
+        q.setParameter("firstExperiment", firstExperiment);
+        return q;
+    }
+
+	public static TypedQuery<ItxExperimentExperiment> findItxExperimentExperimentsByFirstExperiment(Experiment firstExperiment, String sortFieldName, String sortOrder) {
+        if (firstExperiment == null) throw new IllegalArgumentException("The firstExperiment argument is required");
+        EntityManager em = ItxExperimentExperiment.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxExperimentExperiment AS o WHERE o.firstExperiment = :firstExperiment");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ItxExperimentExperiment> q = em.createQuery(queryBuilder.toString(), ItxExperimentExperiment.class);
+        q.setParameter("firstExperiment", firstExperiment);
+        return q;
+    }
+
+	public static TypedQuery<ItxExperimentExperiment> findItxExperimentExperimentsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = ItxExperimentExperiment.entityManager();
+        TypedQuery<ItxExperimentExperiment> q = em.createQuery("SELECT o FROM ItxExperimentExperiment AS o WHERE o.lsTransaction = :lsTransaction", ItxExperimentExperiment.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<ItxExperimentExperiment> findItxExperimentExperimentsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = ItxExperimentExperiment.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxExperimentExperiment AS o WHERE o.lsTransaction = :lsTransaction");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ItxExperimentExperiment> q = em.createQuery(queryBuilder.toString(), ItxExperimentExperiment.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<ItxExperimentExperiment> findItxExperimentExperimentsBySecondExperiment(Experiment secondExperiment) {
+        if (secondExperiment == null) throw new IllegalArgumentException("The secondExperiment argument is required");
+        EntityManager em = ItxExperimentExperiment.entityManager();
+        TypedQuery<ItxExperimentExperiment> q = em.createQuery("SELECT o FROM ItxExperimentExperiment AS o WHERE o.secondExperiment = :secondExperiment", ItxExperimentExperiment.class);
+        q.setParameter("secondExperiment", secondExperiment);
+        return q;
+    }
+
+	public static TypedQuery<ItxExperimentExperiment> findItxExperimentExperimentsBySecondExperiment(Experiment secondExperiment, String sortFieldName, String sortOrder) {
+        if (secondExperiment == null) throw new IllegalArgumentException("The secondExperiment argument is required");
+        EntityManager em = ItxExperimentExperiment.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxExperimentExperiment AS o WHERE o.secondExperiment = :secondExperiment");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ItxExperimentExperiment> q = em.createQuery(queryBuilder.toString(), ItxExperimentExperiment.class);
+        q.setParameter("secondExperiment", secondExperiment);
+        return q;
+    }
+
+	public Experiment getFirstExperiment() {
+        return this.firstExperiment;
+    }
+
+	public void setFirstExperiment(Experiment firstExperiment) {
+        this.firstExperiment = firstExperiment;
+    }
+
+	public Experiment getSecondExperiment() {
+        return this.secondExperiment;
+    }
+
+	public void setSecondExperiment(Experiment secondExperiment) {
+        this.secondExperiment = secondExperiment;
+    }
+
+	public Set<ItxExperimentExperimentState> getLsStates() {
+        return this.lsStates;
+    }
+
+	public void setLsStates(Set<ItxExperimentExperimentState> lsStates) {
+        this.lsStates = lsStates;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "firstExperiment", "secondExperiment", "lsStates");
+
+	public static long countItxExperimentExperiments() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ItxExperimentExperiment o", Long.class).getSingleResult();
+    }
+
+	public static List<ItxExperimentExperiment> findAllItxExperimentExperiments() {
+        return entityManager().createQuery("SELECT o FROM ItxExperimentExperiment o", ItxExperimentExperiment.class).getResultList();
+    }
+
+	public static List<ItxExperimentExperiment> findAllItxExperimentExperiments(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxExperimentExperiment o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxExperimentExperiment.class).getResultList();
+    }
+
+	public static ItxExperimentExperiment findItxExperimentExperiment(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ItxExperimentExperiment.class, id);
+    }
+
+	public static List<ItxExperimentExperiment> findItxExperimentExperimentEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ItxExperimentExperiment o", ItxExperimentExperiment.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ItxExperimentExperiment> findItxExperimentExperimentEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxExperimentExperiment o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxExperimentExperiment.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public ItxExperimentExperiment merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ItxExperimentExperiment merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public ItxExperimentExperiment() {
+        super();
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState.java b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState.java
index e4740a5b0..9c09e677d 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState.java
@@ -10,12 +10,15 @@
 import java.util.Set;
 
 import javax.persistence.CascadeType;
+import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -28,6 +31,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord
@@ -110,4 +115,82 @@ public static Collection<ItxExperimentExperimentState> fromJsonArrayToItxExperim
     }
 
 
+
+	public ItxExperimentExperiment getItxExperimentExperiment() {
+        return this.itxExperimentExperiment;
+    }
+
+	public void setItxExperimentExperiment(ItxExperimentExperiment itxExperimentExperiment) {
+        this.itxExperimentExperiment = itxExperimentExperiment;
+    }
+
+	public Set<ItxExperimentExperimentValue> getLsValues() {
+        return this.lsValues;
+    }
+
+	public void setLsValues(Set<ItxExperimentExperimentValue> lsValues) {
+        this.lsValues = lsValues;
+    }
+
+	public ItxExperimentExperimentState() {
+        super();
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("itxExperimentExperiment", "lsValues");
+
+	public static long countItxExperimentExperimentStates() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ItxExperimentExperimentState o", Long.class).getSingleResult();
+    }
+
+	public static List<ItxExperimentExperimentState> findAllItxExperimentExperimentStates() {
+        return entityManager().createQuery("SELECT o FROM ItxExperimentExperimentState o", ItxExperimentExperimentState.class).getResultList();
+    }
+
+	public static List<ItxExperimentExperimentState> findAllItxExperimentExperimentStates(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxExperimentExperimentState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxExperimentExperimentState.class).getResultList();
+    }
+
+	public static ItxExperimentExperimentState findItxExperimentExperimentState(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ItxExperimentExperimentState.class, id);
+    }
+
+	public static List<ItxExperimentExperimentState> findItxExperimentExperimentStateEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ItxExperimentExperimentState o", ItxExperimentExperimentState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ItxExperimentExperimentState> findItxExperimentExperimentStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxExperimentExperimentState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxExperimentExperimentState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public ItxExperimentExperimentState merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ItxExperimentExperimentState merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public static ItxExperimentExperimentState fromJsonToItxExperimentExperimentState(String json) {
+        return new JSONDeserializer<ItxExperimentExperimentState>()
+        .use(null, ItxExperimentExperimentState.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState_Roo_Configurable.aj
deleted file mode 100644
index ebeb087ec..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxExperimentExperimentState;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ItxExperimentExperimentState_Roo_Configurable {
-    
-    declare @type: ItxExperimentExperimentState: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState_Roo_JavaBean.aj
deleted file mode 100644
index 61a2b456e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState_Roo_JavaBean.aj
+++ /dev/null
@@ -1,29 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxExperimentExperiment;
-import com.labsynch.labseer.domain.ItxExperimentExperimentState;
-import com.labsynch.labseer.domain.ItxExperimentExperimentValue;
-import java.util.Set;
-
-privileged aspect ItxExperimentExperimentState_Roo_JavaBean {
-    
-    public ItxExperimentExperiment ItxExperimentExperimentState.getItxExperimentExperiment() {
-        return this.itxExperimentExperiment;
-    }
-    
-    public void ItxExperimentExperimentState.setItxExperimentExperiment(ItxExperimentExperiment itxExperimentExperiment) {
-        this.itxExperimentExperiment = itxExperimentExperiment;
-    }
-    
-    public Set<ItxExperimentExperimentValue> ItxExperimentExperimentState.getLsValues() {
-        return this.lsValues;
-    }
-    
-    public void ItxExperimentExperimentState.setLsValues(Set<ItxExperimentExperimentValue> lsValues) {
-        this.lsValues = lsValues;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index c42733451..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxExperimentExperimentState;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ItxExperimentExperimentState_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ItxExperimentExperimentState.fieldNames4OrderClauseFilter = java.util.Arrays.asList("itxExperimentExperiment", "lsValues");
-    
-    public static long ItxExperimentExperimentState.countItxExperimentExperimentStates() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ItxExperimentExperimentState o", Long.class).getSingleResult();
-    }
-    
-    public static List<ItxExperimentExperimentState> ItxExperimentExperimentState.findAllItxExperimentExperimentStates() {
-        return entityManager().createQuery("SELECT o FROM ItxExperimentExperimentState o", ItxExperimentExperimentState.class).getResultList();
-    }
-    
-    public static List<ItxExperimentExperimentState> ItxExperimentExperimentState.findAllItxExperimentExperimentStates(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxExperimentExperimentState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxExperimentExperimentState.class).getResultList();
-    }
-    
-    public static ItxExperimentExperimentState ItxExperimentExperimentState.findItxExperimentExperimentState(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ItxExperimentExperimentState.class, id);
-    }
-    
-    public static List<ItxExperimentExperimentState> ItxExperimentExperimentState.findItxExperimentExperimentStateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxExperimentExperimentState o", ItxExperimentExperimentState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ItxExperimentExperimentState> ItxExperimentExperimentState.findItxExperimentExperimentStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxExperimentExperimentState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxExperimentExperimentState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public ItxExperimentExperimentState ItxExperimentExperimentState.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ItxExperimentExperimentState merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState_Roo_Jpa_Entity.aj
deleted file mode 100644
index 5260bc45e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,17 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxExperimentExperimentState;
-import javax.persistence.Entity;
-
-privileged aspect ItxExperimentExperimentState_Roo_Jpa_Entity {
-    
-    declare @type: ItxExperimentExperimentState: @Entity;
-    
-    public ItxExperimentExperimentState.new() {
-        super();
-    }
-
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState_Roo_Json.aj
deleted file mode 100644
index 065c4f350..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState_Roo_Json.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxExperimentExperimentState;
-import flexjson.JSONDeserializer;
-
-privileged aspect ItxExperimentExperimentState_Roo_Json {
-    
-    public static ItxExperimentExperimentState ItxExperimentExperimentState.fromJsonToItxExperimentExperimentState(String json) {
-        return new JSONDeserializer<ItxExperimentExperimentState>()
-        .use(null, ItxExperimentExperimentState.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState_Roo_ToString.aj
deleted file mode 100644
index 3b9d5ec3e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxExperimentExperimentState;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ItxExperimentExperimentState_Roo_ToString {
-    
-    public String ItxExperimentExperimentState.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue.java b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue.java
index 8812fe763..689d031d6 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue.java
@@ -6,11 +6,13 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
-
+import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -23,6 +25,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord
@@ -92,4 +96,65 @@ public static ItxExperimentExperimentValue create(ItxExperimentExperimentValue l
         ItxExperimentExperimentValue newItxExperimentExperimentValue = new JSONDeserializer<ItxExperimentExperimentValue>().use(null, ItxExperimentExperimentValue.class).deserializeInto(lsThingValue.toJson(), new ItxExperimentExperimentValue());
         return newItxExperimentExperimentValue;
     }
+
+	public ItxExperimentExperimentState getLsState() {
+        return this.lsState;
+    }
+
+	public void setLsState(ItxExperimentExperimentState lsState) {
+        this.lsState = lsState;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsState");
+
+	public static long countItxExperimentExperimentValues() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ItxExperimentExperimentValue o", Long.class).getSingleResult();
+    }
+
+	public static List<ItxExperimentExperimentValue> findAllItxExperimentExperimentValues() {
+        return entityManager().createQuery("SELECT o FROM ItxExperimentExperimentValue o", ItxExperimentExperimentValue.class).getResultList();
+    }
+
+	public static List<ItxExperimentExperimentValue> findAllItxExperimentExperimentValues(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxExperimentExperimentValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxExperimentExperimentValue.class).getResultList();
+    }
+
+	public static ItxExperimentExperimentValue findItxExperimentExperimentValue(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ItxExperimentExperimentValue.class, id);
+    }
+
+	public static List<ItxExperimentExperimentValue> findItxExperimentExperimentValueEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ItxExperimentExperimentValue o", ItxExperimentExperimentValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ItxExperimentExperimentValue> findItxExperimentExperimentValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxExperimentExperimentValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxExperimentExperimentValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public ItxExperimentExperimentValue merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ItxExperimentExperimentValue merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue_Roo_Configurable.aj
deleted file mode 100644
index 2888d93c6..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxExperimentExperimentValue;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ItxExperimentExperimentValue_Roo_Configurable {
-    
-    declare @type: ItxExperimentExperimentValue: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue_Roo_JavaBean.aj
deleted file mode 100644
index 1cee0d2a5..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue_Roo_JavaBean.aj
+++ /dev/null
@@ -1,19 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxExperimentExperimentState;
-import com.labsynch.labseer.domain.ItxExperimentExperimentValue;
-
-privileged aspect ItxExperimentExperimentValue_Roo_JavaBean {
-    
-    public ItxExperimentExperimentState ItxExperimentExperimentValue.getLsState() {
-        return this.lsState;
-    }
-    
-    public void ItxExperimentExperimentValue.setLsState(ItxExperimentExperimentState lsState) {
-        this.lsState = lsState;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 8c78dfcd4..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxExperimentExperimentValue;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ItxExperimentExperimentValue_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ItxExperimentExperimentValue.fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsState");
-    
-    public static long ItxExperimentExperimentValue.countItxExperimentExperimentValues() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ItxExperimentExperimentValue o", Long.class).getSingleResult();
-    }
-    
-    public static List<ItxExperimentExperimentValue> ItxExperimentExperimentValue.findAllItxExperimentExperimentValues() {
-        return entityManager().createQuery("SELECT o FROM ItxExperimentExperimentValue o", ItxExperimentExperimentValue.class).getResultList();
-    }
-    
-    public static List<ItxExperimentExperimentValue> ItxExperimentExperimentValue.findAllItxExperimentExperimentValues(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxExperimentExperimentValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxExperimentExperimentValue.class).getResultList();
-    }
-    
-    public static ItxExperimentExperimentValue ItxExperimentExperimentValue.findItxExperimentExperimentValue(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ItxExperimentExperimentValue.class, id);
-    }
-    
-    public static List<ItxExperimentExperimentValue> ItxExperimentExperimentValue.findItxExperimentExperimentValueEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxExperimentExperimentValue o", ItxExperimentExperimentValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ItxExperimentExperimentValue> ItxExperimentExperimentValue.findItxExperimentExperimentValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxExperimentExperimentValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxExperimentExperimentValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public ItxExperimentExperimentValue ItxExperimentExperimentValue.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ItxExperimentExperimentValue merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue_Roo_Jpa_Entity.aj
deleted file mode 100644
index 59994e77f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxExperimentExperimentValue;
-import javax.persistence.Entity;
-
-privileged aspect ItxExperimentExperimentValue_Roo_Jpa_Entity {
-    
-    declare @type: ItxExperimentExperimentValue: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue_Roo_ToString.aj
deleted file mode 100644
index 331b3ff32..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxExperimentExperimentValue;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ItxExperimentExperimentValue_Roo_ToString {
-    
-    public String ItxExperimentExperimentValue.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment_Roo_Configurable.aj
deleted file mode 100644
index e9b88bcea..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxExperimentExperiment;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ItxExperimentExperiment_Roo_Configurable {
-    
-    declare @type: ItxExperimentExperiment: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment_Roo_Finder.aj
deleted file mode 100644
index 98399d4ae..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment_Roo_Finder.aj
+++ /dev/null
@@ -1,106 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ItxExperimentExperiment;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ItxExperimentExperiment_Roo_Finder {
-    
-    public static Long ItxExperimentExperiment.countFindItxExperimentExperimentsByFirstExperiment(Experiment firstExperiment) {
-        if (firstExperiment == null) throw new IllegalArgumentException("The firstExperiment argument is required");
-        EntityManager em = ItxExperimentExperiment.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxExperimentExperiment AS o WHERE o.firstExperiment = :firstExperiment", Long.class);
-        q.setParameter("firstExperiment", firstExperiment);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ItxExperimentExperiment.countFindItxExperimentExperimentsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = ItxExperimentExperiment.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxExperimentExperiment AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ItxExperimentExperiment.countFindItxExperimentExperimentsBySecondExperiment(Experiment secondExperiment) {
-        if (secondExperiment == null) throw new IllegalArgumentException("The secondExperiment argument is required");
-        EntityManager em = ItxExperimentExperiment.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxExperimentExperiment AS o WHERE o.secondExperiment = :secondExperiment", Long.class);
-        q.setParameter("secondExperiment", secondExperiment);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ItxExperimentExperiment> ItxExperimentExperiment.findItxExperimentExperimentsByFirstExperiment(Experiment firstExperiment) {
-        if (firstExperiment == null) throw new IllegalArgumentException("The firstExperiment argument is required");
-        EntityManager em = ItxExperimentExperiment.entityManager();
-        TypedQuery<ItxExperimentExperiment> q = em.createQuery("SELECT o FROM ItxExperimentExperiment AS o WHERE o.firstExperiment = :firstExperiment", ItxExperimentExperiment.class);
-        q.setParameter("firstExperiment", firstExperiment);
-        return q;
-    }
-    
-    public static TypedQuery<ItxExperimentExperiment> ItxExperimentExperiment.findItxExperimentExperimentsByFirstExperiment(Experiment firstExperiment, String sortFieldName, String sortOrder) {
-        if (firstExperiment == null) throw new IllegalArgumentException("The firstExperiment argument is required");
-        EntityManager em = ItxExperimentExperiment.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxExperimentExperiment AS o WHERE o.firstExperiment = :firstExperiment");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ItxExperimentExperiment> q = em.createQuery(queryBuilder.toString(), ItxExperimentExperiment.class);
-        q.setParameter("firstExperiment", firstExperiment);
-        return q;
-    }
-    
-    public static TypedQuery<ItxExperimentExperiment> ItxExperimentExperiment.findItxExperimentExperimentsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = ItxExperimentExperiment.entityManager();
-        TypedQuery<ItxExperimentExperiment> q = em.createQuery("SELECT o FROM ItxExperimentExperiment AS o WHERE o.lsTransaction = :lsTransaction", ItxExperimentExperiment.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<ItxExperimentExperiment> ItxExperimentExperiment.findItxExperimentExperimentsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = ItxExperimentExperiment.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxExperimentExperiment AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ItxExperimentExperiment> q = em.createQuery(queryBuilder.toString(), ItxExperimentExperiment.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<ItxExperimentExperiment> ItxExperimentExperiment.findItxExperimentExperimentsBySecondExperiment(Experiment secondExperiment) {
-        if (secondExperiment == null) throw new IllegalArgumentException("The secondExperiment argument is required");
-        EntityManager em = ItxExperimentExperiment.entityManager();
-        TypedQuery<ItxExperimentExperiment> q = em.createQuery("SELECT o FROM ItxExperimentExperiment AS o WHERE o.secondExperiment = :secondExperiment", ItxExperimentExperiment.class);
-        q.setParameter("secondExperiment", secondExperiment);
-        return q;
-    }
-    
-    public static TypedQuery<ItxExperimentExperiment> ItxExperimentExperiment.findItxExperimentExperimentsBySecondExperiment(Experiment secondExperiment, String sortFieldName, String sortOrder) {
-        if (secondExperiment == null) throw new IllegalArgumentException("The secondExperiment argument is required");
-        EntityManager em = ItxExperimentExperiment.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxExperimentExperiment AS o WHERE o.secondExperiment = :secondExperiment");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ItxExperimentExperiment> q = em.createQuery(queryBuilder.toString(), ItxExperimentExperiment.class);
-        q.setParameter("secondExperiment", secondExperiment);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment_Roo_JavaBean.aj
deleted file mode 100644
index 0e226d49d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment_Roo_JavaBean.aj
+++ /dev/null
@@ -1,37 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ItxExperimentExperiment;
-import com.labsynch.labseer.domain.ItxExperimentExperimentState;
-import java.util.Set;
-
-privileged aspect ItxExperimentExperiment_Roo_JavaBean {
-    
-    public Experiment ItxExperimentExperiment.getFirstExperiment() {
-        return this.firstExperiment;
-    }
-    
-    public void ItxExperimentExperiment.setFirstExperiment(Experiment firstExperiment) {
-        this.firstExperiment = firstExperiment;
-    }
-    
-    public Experiment ItxExperimentExperiment.getSecondExperiment() {
-        return this.secondExperiment;
-    }
-    
-    public void ItxExperimentExperiment.setSecondExperiment(Experiment secondExperiment) {
-        this.secondExperiment = secondExperiment;
-    }
-    
-    public Set<ItxExperimentExperimentState> ItxExperimentExperiment.getLsStates() {
-        return this.lsStates;
-    }
-    
-    public void ItxExperimentExperiment.setLsStates(Set<ItxExperimentExperimentState> lsStates) {
-        this.lsStates = lsStates;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 142e54e5b..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxExperimentExperiment;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ItxExperimentExperiment_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ItxExperimentExperiment.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "firstExperiment", "secondExperiment", "lsStates");
-    
-    public static long ItxExperimentExperiment.countItxExperimentExperiments() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ItxExperimentExperiment o", Long.class).getSingleResult();
-    }
-    
-    public static List<ItxExperimentExperiment> ItxExperimentExperiment.findAllItxExperimentExperiments() {
-        return entityManager().createQuery("SELECT o FROM ItxExperimentExperiment o", ItxExperimentExperiment.class).getResultList();
-    }
-    
-    public static List<ItxExperimentExperiment> ItxExperimentExperiment.findAllItxExperimentExperiments(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxExperimentExperiment o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxExperimentExperiment.class).getResultList();
-    }
-    
-    public static ItxExperimentExperiment ItxExperimentExperiment.findItxExperimentExperiment(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ItxExperimentExperiment.class, id);
-    }
-    
-    public static List<ItxExperimentExperiment> ItxExperimentExperiment.findItxExperimentExperimentEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxExperimentExperiment o", ItxExperimentExperiment.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ItxExperimentExperiment> ItxExperimentExperiment.findItxExperimentExperimentEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxExperimentExperiment o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxExperimentExperiment.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public ItxExperimentExperiment ItxExperimentExperiment.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ItxExperimentExperiment merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment_Roo_Jpa_Entity.aj
deleted file mode 100644
index 72a85c6a5..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,17 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxExperimentExperiment;
-import javax.persistence.Entity;
-
-privileged aspect ItxExperimentExperiment_Roo_Jpa_Entity {
-    
-    declare @type: ItxExperimentExperiment: @Entity;
-    
-    public ItxExperimentExperiment.new() {
-        super();
-    }
-
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment_Roo_ToString.aj
deleted file mode 100644
index 1c28371b3..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxExperimentExperiment;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ItxExperimentExperiment_Roo_ToString {
-    
-    public String ItxExperimentExperiment.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing.java b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing.java
index 438933142..2ac76a31d 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing.java
@@ -10,6 +10,7 @@
 import java.util.Set;
 
 import javax.persistence.CascadeType;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
@@ -17,21 +18,25 @@
 import javax.persistence.OneToMany;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import javax.persistence.NoResultException;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
-
+import org.springframework.transaction.annotation.Transactional;
 import com.labsynch.labseer.utils.CustomBigDecimalFactory;
 import com.labsynch.labseer.utils.ExcludeNulls;
 
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -482,4 +487,154 @@ public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsBySecondLsThin
         q.setParameter("secondLsThing", secondLsThing);
         return q;
     }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "firstLsThing", "secondLsThing", "lsStates");
+
+	public static long countItxLsThingLsThings() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ItxLsThingLsThing o", Long.class).getSingleResult();
+    }
+
+	public static List<ItxLsThingLsThing> findAllItxLsThingLsThings() {
+        return entityManager().createQuery("SELECT o FROM ItxLsThingLsThing o", ItxLsThingLsThing.class).getResultList();
+    }
+
+	public static List<ItxLsThingLsThing> findAllItxLsThingLsThings(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxLsThingLsThing o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxLsThingLsThing.class).getResultList();
+    }
+
+	public static ItxLsThingLsThing findItxLsThingLsThing(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ItxLsThingLsThing.class, id);
+    }
+
+	public static List<ItxLsThingLsThing> findItxLsThingLsThingEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ItxLsThingLsThing o", ItxLsThingLsThing.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ItxLsThingLsThing> findItxLsThingLsThingEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxLsThingLsThing o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxLsThingLsThing.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public ItxLsThingLsThing merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ItxLsThingLsThing merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static Long countFindItxLsThingLsThingsByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = ItxLsThingLsThing.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxLsThingLsThing AS o WHERE o.codeName = :codeName", Long.class);
+        q.setParameter("codeName", codeName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindItxLsThingLsThingsByFirstLsThing(LsThing firstLsThing) {
+        if (firstLsThing == null) throw new IllegalArgumentException("The firstLsThing argument is required");
+        EntityManager em = ItxLsThingLsThing.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxLsThingLsThing AS o WHERE o.firstLsThing = :firstLsThing", Long.class);
+        q.setParameter("firstLsThing", firstLsThing);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindItxLsThingLsThingsBySecondLsThing(LsThing secondLsThing) {
+        if (secondLsThing == null) throw new IllegalArgumentException("The secondLsThing argument is required");
+        EntityManager em = ItxLsThingLsThing.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxLsThingLsThing AS o WHERE o.secondLsThing = :secondLsThing", Long.class);
+        q.setParameter("secondLsThing", secondLsThing);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = ItxLsThingLsThing.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxLsThingLsThing AS o WHERE o.codeName = :codeName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ItxLsThingLsThing> q = em.createQuery(queryBuilder.toString(), ItxLsThingLsThing.class);
+        q.setParameter("codeName", codeName);
+        return q;
+    }
+
+	public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsByFirstLsThing(LsThing firstLsThing, String sortFieldName, String sortOrder) {
+        if (firstLsThing == null) throw new IllegalArgumentException("The firstLsThing argument is required");
+        EntityManager em = ItxLsThingLsThing.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxLsThingLsThing AS o WHERE o.firstLsThing = :firstLsThing");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ItxLsThingLsThing> q = em.createQuery(queryBuilder.toString(), ItxLsThingLsThing.class);
+        q.setParameter("firstLsThing", firstLsThing);
+        return q;
+    }
+
+	public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsBySecondLsThing(LsThing secondLsThing, String sortFieldName, String sortOrder) {
+        if (secondLsThing == null) throw new IllegalArgumentException("The secondLsThing argument is required");
+        EntityManager em = ItxLsThingLsThing.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxLsThingLsThing AS o WHERE o.secondLsThing = :secondLsThing");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ItxLsThingLsThing> q = em.createQuery(queryBuilder.toString(), ItxLsThingLsThing.class);
+        q.setParameter("secondLsThing", secondLsThing);
+        return q;
+    }
+
+	public LsThing getFirstLsThing() {
+        return this.firstLsThing;
+    }
+
+	public void setFirstLsThing(LsThing firstLsThing) {
+        this.firstLsThing = firstLsThing;
+    }
+
+	public LsThing getSecondLsThing() {
+        return this.secondLsThing;
+    }
+
+	public void setSecondLsThing(LsThing secondLsThing) {
+        this.secondLsThing = secondLsThing;
+    }
+
+	public Set<ItxLsThingLsThingState> getLsStates() {
+        return this.lsStates;
+    }
+
+	public void setLsStates(Set<ItxLsThingLsThingState> lsStates) {
+        this.lsStates = lsStates;
+    }
+
+	public ItxLsThingLsThing() {
+        super();
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState.java b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState.java
index 3f3ef2f27..f7d41e138 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState.java
@@ -10,13 +10,16 @@
 import java.util.Set;
 
 import javax.persistence.CascadeType;
+import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -29,6 +32,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord
@@ -142,4 +147,77 @@ public static Collection<ItxLsThingLsThingState> fromJsonArrayToItxLsThingLsThin
 
 
 
+
+	public ItxLsThingLsThingState() {
+        super();
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "itxLsThingLsThing", "lsValues");
+
+	public static long countItxLsThingLsThingStates() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ItxLsThingLsThingState o", Long.class).getSingleResult();
+    }
+
+	public static List<ItxLsThingLsThingState> findAllItxLsThingLsThingStates() {
+        return entityManager().createQuery("SELECT o FROM ItxLsThingLsThingState o", ItxLsThingLsThingState.class).getResultList();
+    }
+
+	public static List<ItxLsThingLsThingState> findAllItxLsThingLsThingStates(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxLsThingLsThingState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxLsThingLsThingState.class).getResultList();
+    }
+
+	public static ItxLsThingLsThingState findItxLsThingLsThingState(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ItxLsThingLsThingState.class, id);
+    }
+
+	public static List<ItxLsThingLsThingState> findItxLsThingLsThingStateEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ItxLsThingLsThingState o", ItxLsThingLsThingState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ItxLsThingLsThingState> findItxLsThingLsThingStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxLsThingLsThingState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxLsThingLsThingState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public ItxLsThingLsThingState merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ItxLsThingLsThingState merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public ItxLsThingLsThing getItxLsThingLsThing() {
+        return this.itxLsThingLsThing;
+    }
+
+	public void setItxLsThingLsThing(ItxLsThingLsThing itxLsThingLsThing) {
+        this.itxLsThingLsThing = itxLsThingLsThing;
+    }
+
+	public Set<ItxLsThingLsThingValue> getLsValues() {
+        return this.lsValues;
+    }
+
+	public void setLsValues(Set<ItxLsThingLsThingValue> lsValues) {
+        this.lsValues = lsValues;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState_Roo_Configurable.aj
deleted file mode 100644
index c8d1704e6..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThingState;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ItxLsThingLsThingState_Roo_Configurable {
-    
-    declare @type: ItxLsThingLsThingState: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState_Roo_JavaBean.aj
deleted file mode 100644
index ed48f6b89..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState_Roo_JavaBean.aj
+++ /dev/null
@@ -1,29 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThing;
-import com.labsynch.labseer.domain.ItxLsThingLsThingState;
-import com.labsynch.labseer.domain.ItxLsThingLsThingValue;
-import java.util.Set;
-
-privileged aspect ItxLsThingLsThingState_Roo_JavaBean {
-    
-    public ItxLsThingLsThing ItxLsThingLsThingState.getItxLsThingLsThing() {
-        return this.itxLsThingLsThing;
-    }
-    
-    public void ItxLsThingLsThingState.setItxLsThingLsThing(ItxLsThingLsThing itxLsThingLsThing) {
-        this.itxLsThingLsThing = itxLsThingLsThing;
-    }
-    
-    public Set<ItxLsThingLsThingValue> ItxLsThingLsThingState.getLsValues() {
-        return this.lsValues;
-    }
-    
-    public void ItxLsThingLsThingState.setLsValues(Set<ItxLsThingLsThingValue> lsValues) {
-        this.lsValues = lsValues;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 4ca1f5cb3..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThingState;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ItxLsThingLsThingState_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ItxLsThingLsThingState.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "itxLsThingLsThing", "lsValues");
-    
-    public static long ItxLsThingLsThingState.countItxLsThingLsThingStates() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ItxLsThingLsThingState o", Long.class).getSingleResult();
-    }
-    
-    public static List<ItxLsThingLsThingState> ItxLsThingLsThingState.findAllItxLsThingLsThingStates() {
-        return entityManager().createQuery("SELECT o FROM ItxLsThingLsThingState o", ItxLsThingLsThingState.class).getResultList();
-    }
-    
-    public static List<ItxLsThingLsThingState> ItxLsThingLsThingState.findAllItxLsThingLsThingStates(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxLsThingLsThingState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxLsThingLsThingState.class).getResultList();
-    }
-    
-    public static ItxLsThingLsThingState ItxLsThingLsThingState.findItxLsThingLsThingState(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ItxLsThingLsThingState.class, id);
-    }
-    
-    public static List<ItxLsThingLsThingState> ItxLsThingLsThingState.findItxLsThingLsThingStateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxLsThingLsThingState o", ItxLsThingLsThingState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ItxLsThingLsThingState> ItxLsThingLsThingState.findItxLsThingLsThingStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxLsThingLsThingState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxLsThingLsThingState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public ItxLsThingLsThingState ItxLsThingLsThingState.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ItxLsThingLsThingState merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState_Roo_Jpa_Entity.aj
deleted file mode 100644
index 1aeb7843f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,17 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThingState;
-import javax.persistence.Entity;
-
-privileged aspect ItxLsThingLsThingState_Roo_Jpa_Entity {
-    
-    declare @type: ItxLsThingLsThingState: @Entity;
-    
-    public ItxLsThingLsThingState.new() {
-        super();
-    }
-
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState_Roo_ToString.aj
deleted file mode 100644
index e8b0dab6f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThingState;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ItxLsThingLsThingState_Roo_ToString {
-    
-    public String ItxLsThingLsThingState.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue.java b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue.java
index f6f277a2e..8a96a95a4 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue.java
@@ -10,17 +10,22 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
-
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.TypedQuery;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -156,4 +161,111 @@ public static TypedQuery<ItxLsThingLsThingValue> findItxLsThingLsThingValuesByLs
         return q;
     }
     
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsState");
+
+	public static long countItxLsThingLsThingValues() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ItxLsThingLsThingValue o", Long.class).getSingleResult();
+    }
+
+	public static List<ItxLsThingLsThingValue> findAllItxLsThingLsThingValues() {
+        return entityManager().createQuery("SELECT o FROM ItxLsThingLsThingValue o", ItxLsThingLsThingValue.class).getResultList();
+    }
+
+	public static List<ItxLsThingLsThingValue> findAllItxLsThingLsThingValues(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxLsThingLsThingValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxLsThingLsThingValue.class).getResultList();
+    }
+
+	public static ItxLsThingLsThingValue findItxLsThingLsThingValue(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ItxLsThingLsThingValue.class, id);
+    }
+
+	public static List<ItxLsThingLsThingValue> findItxLsThingLsThingValueEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ItxLsThingLsThingValue o", ItxLsThingLsThingValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ItxLsThingLsThingValue> findItxLsThingLsThingValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxLsThingLsThingValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxLsThingLsThingValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public ItxLsThingLsThingValue merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ItxLsThingLsThingValue merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public static Long countFindItxLsThingLsThingValuesByLsKindEquals(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = ItxLsThingLsThingValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxLsThingLsThingValue AS o WHERE o.lsKind = :lsKind", Long.class);
+        q.setParameter("lsKind", lsKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindItxLsThingLsThingValuesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = ItxLsThingLsThingValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxLsThingLsThingValue AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ItxLsThingLsThingValue> findItxLsThingLsThingValuesByLsKindEquals(String lsKind, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = ItxLsThingLsThingValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxLsThingLsThingValue AS o WHERE o.lsKind = :lsKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ItxLsThingLsThingValue> q = em.createQuery(queryBuilder.toString(), ItxLsThingLsThingValue.class);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<ItxLsThingLsThingValue> findItxLsThingLsThingValuesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = ItxLsThingLsThingValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxLsThingLsThingValue AS o WHERE o.lsTransaction = :lsTransaction");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ItxLsThingLsThingValue> q = em.createQuery(queryBuilder.toString(), ItxLsThingLsThingValue.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public ItxLsThingLsThingState getLsState() {
+        return this.lsState;
+    }
+
+	public void setLsState(ItxLsThingLsThingState lsState) {
+        this.lsState = lsState;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue_Roo_Configurable.aj
deleted file mode 100644
index 15b168d92..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThingValue;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ItxLsThingLsThingValue_Roo_Configurable {
-    
-    declare @type: ItxLsThingLsThingValue: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue_Roo_Finder.aj
deleted file mode 100644
index 4a591b12b..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue_Roo_Finder.aj
+++ /dev/null
@@ -1,58 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThingValue;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ItxLsThingLsThingValue_Roo_Finder {
-    
-    public static Long ItxLsThingLsThingValue.countFindItxLsThingLsThingValuesByLsKindEquals(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = ItxLsThingLsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxLsThingLsThingValue AS o WHERE o.lsKind = :lsKind", Long.class);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ItxLsThingLsThingValue.countFindItxLsThingLsThingValuesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = ItxLsThingLsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxLsThingLsThingValue AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ItxLsThingLsThingValue> ItxLsThingLsThingValue.findItxLsThingLsThingValuesByLsKindEquals(String lsKind, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = ItxLsThingLsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxLsThingLsThingValue AS o WHERE o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ItxLsThingLsThingValue> q = em.createQuery(queryBuilder.toString(), ItxLsThingLsThingValue.class);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<ItxLsThingLsThingValue> ItxLsThingLsThingValue.findItxLsThingLsThingValuesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = ItxLsThingLsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxLsThingLsThingValue AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ItxLsThingLsThingValue> q = em.createQuery(queryBuilder.toString(), ItxLsThingLsThingValue.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue_Roo_JavaBean.aj
deleted file mode 100644
index 47165eb15..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue_Roo_JavaBean.aj
+++ /dev/null
@@ -1,19 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThingState;
-import com.labsynch.labseer.domain.ItxLsThingLsThingValue;
-
-privileged aspect ItxLsThingLsThingValue_Roo_JavaBean {
-    
-    public ItxLsThingLsThingState ItxLsThingLsThingValue.getLsState() {
-        return this.lsState;
-    }
-    
-    public void ItxLsThingLsThingValue.setLsState(ItxLsThingLsThingState lsState) {
-        this.lsState = lsState;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 4c14952a1..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThingValue;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ItxLsThingLsThingValue_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ItxLsThingLsThingValue.fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsState");
-    
-    public static long ItxLsThingLsThingValue.countItxLsThingLsThingValues() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ItxLsThingLsThingValue o", Long.class).getSingleResult();
-    }
-    
-    public static List<ItxLsThingLsThingValue> ItxLsThingLsThingValue.findAllItxLsThingLsThingValues() {
-        return entityManager().createQuery("SELECT o FROM ItxLsThingLsThingValue o", ItxLsThingLsThingValue.class).getResultList();
-    }
-    
-    public static List<ItxLsThingLsThingValue> ItxLsThingLsThingValue.findAllItxLsThingLsThingValues(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxLsThingLsThingValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxLsThingLsThingValue.class).getResultList();
-    }
-    
-    public static ItxLsThingLsThingValue ItxLsThingLsThingValue.findItxLsThingLsThingValue(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ItxLsThingLsThingValue.class, id);
-    }
-    
-    public static List<ItxLsThingLsThingValue> ItxLsThingLsThingValue.findItxLsThingLsThingValueEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxLsThingLsThingValue o", ItxLsThingLsThingValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ItxLsThingLsThingValue> ItxLsThingLsThingValue.findItxLsThingLsThingValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxLsThingLsThingValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxLsThingLsThingValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public ItxLsThingLsThingValue ItxLsThingLsThingValue.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ItxLsThingLsThingValue merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue_Roo_Jpa_Entity.aj
deleted file mode 100644
index 4213251b2..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThingValue;
-import javax.persistence.Entity;
-
-privileged aspect ItxLsThingLsThingValue_Roo_Jpa_Entity {
-    
-    declare @type: ItxLsThingLsThingValue: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue_Roo_ToString.aj
deleted file mode 100644
index 78ea9a4ba..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThingValue;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ItxLsThingLsThingValue_Roo_ToString {
-    
-    public String ItxLsThingLsThingValue.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing_Roo_Configurable.aj
deleted file mode 100644
index 72271a7d4..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThing;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ItxLsThingLsThing_Roo_Configurable {
-    
-    declare @type: ItxLsThingLsThing: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing_Roo_Finder.aj
deleted file mode 100644
index 92d7177a8..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing_Roo_Finder.aj
+++ /dev/null
@@ -1,82 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThing;
-import com.labsynch.labseer.domain.LsThing;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ItxLsThingLsThing_Roo_Finder {
-    
-    public static Long ItxLsThingLsThing.countFindItxLsThingLsThingsByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = ItxLsThingLsThing.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxLsThingLsThing AS o WHERE o.codeName = :codeName", Long.class);
-        q.setParameter("codeName", codeName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ItxLsThingLsThing.countFindItxLsThingLsThingsByFirstLsThing(LsThing firstLsThing) {
-        if (firstLsThing == null) throw new IllegalArgumentException("The firstLsThing argument is required");
-        EntityManager em = ItxLsThingLsThing.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxLsThingLsThing AS o WHERE o.firstLsThing = :firstLsThing", Long.class);
-        q.setParameter("firstLsThing", firstLsThing);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ItxLsThingLsThing.countFindItxLsThingLsThingsBySecondLsThing(LsThing secondLsThing) {
-        if (secondLsThing == null) throw new IllegalArgumentException("The secondLsThing argument is required");
-        EntityManager em = ItxLsThingLsThing.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxLsThingLsThing AS o WHERE o.secondLsThing = :secondLsThing", Long.class);
-        q.setParameter("secondLsThing", secondLsThing);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ItxLsThingLsThing> ItxLsThingLsThing.findItxLsThingLsThingsByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = ItxLsThingLsThing.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxLsThingLsThing AS o WHERE o.codeName = :codeName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ItxLsThingLsThing> q = em.createQuery(queryBuilder.toString(), ItxLsThingLsThing.class);
-        q.setParameter("codeName", codeName);
-        return q;
-    }
-    
-    public static TypedQuery<ItxLsThingLsThing> ItxLsThingLsThing.findItxLsThingLsThingsByFirstLsThing(LsThing firstLsThing, String sortFieldName, String sortOrder) {
-        if (firstLsThing == null) throw new IllegalArgumentException("The firstLsThing argument is required");
-        EntityManager em = ItxLsThingLsThing.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxLsThingLsThing AS o WHERE o.firstLsThing = :firstLsThing");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ItxLsThingLsThing> q = em.createQuery(queryBuilder.toString(), ItxLsThingLsThing.class);
-        q.setParameter("firstLsThing", firstLsThing);
-        return q;
-    }
-    
-    public static TypedQuery<ItxLsThingLsThing> ItxLsThingLsThing.findItxLsThingLsThingsBySecondLsThing(LsThing secondLsThing, String sortFieldName, String sortOrder) {
-        if (secondLsThing == null) throw new IllegalArgumentException("The secondLsThing argument is required");
-        EntityManager em = ItxLsThingLsThing.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxLsThingLsThing AS o WHERE o.secondLsThing = :secondLsThing");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ItxLsThingLsThing> q = em.createQuery(queryBuilder.toString(), ItxLsThingLsThing.class);
-        q.setParameter("secondLsThing", secondLsThing);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing_Roo_JavaBean.aj
deleted file mode 100644
index 03f30739c..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing_Roo_JavaBean.aj
+++ /dev/null
@@ -1,37 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThing;
-import com.labsynch.labseer.domain.ItxLsThingLsThingState;
-import com.labsynch.labseer.domain.LsThing;
-import java.util.Set;
-
-privileged aspect ItxLsThingLsThing_Roo_JavaBean {
-    
-    public LsThing ItxLsThingLsThing.getFirstLsThing() {
-        return this.firstLsThing;
-    }
-    
-    public void ItxLsThingLsThing.setFirstLsThing(LsThing firstLsThing) {
-        this.firstLsThing = firstLsThing;
-    }
-    
-    public LsThing ItxLsThingLsThing.getSecondLsThing() {
-        return this.secondLsThing;
-    }
-    
-    public void ItxLsThingLsThing.setSecondLsThing(LsThing secondLsThing) {
-        this.secondLsThing = secondLsThing;
-    }
-    
-    public Set<ItxLsThingLsThingState> ItxLsThingLsThing.getLsStates() {
-        return this.lsStates;
-    }
-    
-    public void ItxLsThingLsThing.setLsStates(Set<ItxLsThingLsThingState> lsStates) {
-        this.lsStates = lsStates;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 555385dee..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThing;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ItxLsThingLsThing_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ItxLsThingLsThing.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "firstLsThing", "secondLsThing", "lsStates");
-    
-    public static long ItxLsThingLsThing.countItxLsThingLsThings() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ItxLsThingLsThing o", Long.class).getSingleResult();
-    }
-    
-    public static List<ItxLsThingLsThing> ItxLsThingLsThing.findAllItxLsThingLsThings() {
-        return entityManager().createQuery("SELECT o FROM ItxLsThingLsThing o", ItxLsThingLsThing.class).getResultList();
-    }
-    
-    public static List<ItxLsThingLsThing> ItxLsThingLsThing.findAllItxLsThingLsThings(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxLsThingLsThing o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxLsThingLsThing.class).getResultList();
-    }
-    
-    public static ItxLsThingLsThing ItxLsThingLsThing.findItxLsThingLsThing(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ItxLsThingLsThing.class, id);
-    }
-    
-    public static List<ItxLsThingLsThing> ItxLsThingLsThing.findItxLsThingLsThingEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxLsThingLsThing o", ItxLsThingLsThing.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ItxLsThingLsThing> ItxLsThingLsThing.findItxLsThingLsThingEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxLsThingLsThing o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxLsThingLsThing.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public ItxLsThingLsThing ItxLsThingLsThing.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ItxLsThingLsThing merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing_Roo_Jpa_Entity.aj
deleted file mode 100644
index 564ccb5dd..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,17 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThing;
-import javax.persistence.Entity;
-
-privileged aspect ItxLsThingLsThing_Roo_Jpa_Entity {
-    
-    declare @type: ItxLsThingLsThing: @Entity;
-    
-    public ItxLsThingLsThing.new() {
-        super();
-    }
-
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing_Roo_ToString.aj
deleted file mode 100644
index 06709e036..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThing;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ItxLsThingLsThing_Roo_ToString {
-    
-    public String ItxLsThingLsThing.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol.java b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol.java
index 7d078ce09..f440c1e5f 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol.java
@@ -10,6 +10,7 @@
 import java.util.Set;
 
 import javax.persistence.CascadeType;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
@@ -17,9 +18,11 @@
 import javax.persistence.OneToMany;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -32,6 +35,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -162,4 +167,154 @@ public static TypedQuery<ItxProtocolProtocol> findItxProtocolProtocolsBySecondPr
         q.setParameter("secondProtocol", secondProtocol);
         return q;
     }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static Long countFindItxProtocolProtocolsByFirstProtocol(Protocol firstProtocol) {
+        if (firstProtocol == null) throw new IllegalArgumentException("The firstProtocol argument is required");
+        EntityManager em = ItxProtocolProtocol.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxProtocolProtocol AS o WHERE o.firstProtocol = :firstProtocol", Long.class);
+        q.setParameter("firstProtocol", firstProtocol);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindItxProtocolProtocolsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = ItxProtocolProtocol.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxProtocolProtocol AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindItxProtocolProtocolsBySecondProtocol(Protocol secondProtocol) {
+        if (secondProtocol == null) throw new IllegalArgumentException("The secondProtocol argument is required");
+        EntityManager em = ItxProtocolProtocol.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxProtocolProtocol AS o WHERE o.secondProtocol = :secondProtocol", Long.class);
+        q.setParameter("secondProtocol", secondProtocol);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ItxProtocolProtocol> findItxProtocolProtocolsByFirstProtocol(Protocol firstProtocol, String sortFieldName, String sortOrder) {
+        if (firstProtocol == null) throw new IllegalArgumentException("The firstProtocol argument is required");
+        EntityManager em = ItxProtocolProtocol.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxProtocolProtocol AS o WHERE o.firstProtocol = :firstProtocol");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ItxProtocolProtocol> q = em.createQuery(queryBuilder.toString(), ItxProtocolProtocol.class);
+        q.setParameter("firstProtocol", firstProtocol);
+        return q;
+    }
+
+	public static TypedQuery<ItxProtocolProtocol> findItxProtocolProtocolsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = ItxProtocolProtocol.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxProtocolProtocol AS o WHERE o.lsTransaction = :lsTransaction");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ItxProtocolProtocol> q = em.createQuery(queryBuilder.toString(), ItxProtocolProtocol.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<ItxProtocolProtocol> findItxProtocolProtocolsBySecondProtocol(Protocol secondProtocol, String sortFieldName, String sortOrder) {
+        if (secondProtocol == null) throw new IllegalArgumentException("The secondProtocol argument is required");
+        EntityManager em = ItxProtocolProtocol.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxProtocolProtocol AS o WHERE o.secondProtocol = :secondProtocol");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ItxProtocolProtocol> q = em.createQuery(queryBuilder.toString(), ItxProtocolProtocol.class);
+        q.setParameter("secondProtocol", secondProtocol);
+        return q;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "firstProtocol", "secondProtocol", "lsStates");
+
+	public static long countItxProtocolProtocols() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ItxProtocolProtocol o", Long.class).getSingleResult();
+    }
+
+	public static List<ItxProtocolProtocol> findAllItxProtocolProtocols() {
+        return entityManager().createQuery("SELECT o FROM ItxProtocolProtocol o", ItxProtocolProtocol.class).getResultList();
+    }
+
+	public static List<ItxProtocolProtocol> findAllItxProtocolProtocols(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxProtocolProtocol o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxProtocolProtocol.class).getResultList();
+    }
+
+	public static ItxProtocolProtocol findItxProtocolProtocol(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ItxProtocolProtocol.class, id);
+    }
+
+	public static List<ItxProtocolProtocol> findItxProtocolProtocolEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ItxProtocolProtocol o", ItxProtocolProtocol.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ItxProtocolProtocol> findItxProtocolProtocolEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxProtocolProtocol o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxProtocolProtocol.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public ItxProtocolProtocol merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ItxProtocolProtocol merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public ItxProtocolProtocol() {
+        super();
+    }
+
+	public Protocol getFirstProtocol() {
+        return this.firstProtocol;
+    }
+
+	public void setFirstProtocol(Protocol firstProtocol) {
+        this.firstProtocol = firstProtocol;
+    }
+
+	public Protocol getSecondProtocol() {
+        return this.secondProtocol;
+    }
+
+	public void setSecondProtocol(Protocol secondProtocol) {
+        this.secondProtocol = secondProtocol;
+    }
+
+	public Set<ItxProtocolProtocolState> getLsStates() {
+        return this.lsStates;
+    }
+
+	public void setLsStates(Set<ItxProtocolProtocolState> lsStates) {
+        this.lsStates = lsStates;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState.java b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState.java
index d3a412591..8c6c2d021 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState.java
@@ -10,11 +10,14 @@
 import java.util.Set;
 
 import javax.persistence.CascadeType;
+import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -27,6 +30,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord
@@ -108,4 +113,82 @@ public static Collection<ItxProtocolProtocolState> fromJsonArrayToItxProtocolPro
     }
 
 
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("itxProtocolProtocol", "lsValues");
+
+	public static long countItxProtocolProtocolStates() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ItxProtocolProtocolState o", Long.class).getSingleResult();
+    }
+
+	public static List<ItxProtocolProtocolState> findAllItxProtocolProtocolStates() {
+        return entityManager().createQuery("SELECT o FROM ItxProtocolProtocolState o", ItxProtocolProtocolState.class).getResultList();
+    }
+
+	public static List<ItxProtocolProtocolState> findAllItxProtocolProtocolStates(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxProtocolProtocolState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxProtocolProtocolState.class).getResultList();
+    }
+
+	public static ItxProtocolProtocolState findItxProtocolProtocolState(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ItxProtocolProtocolState.class, id);
+    }
+
+	public static List<ItxProtocolProtocolState> findItxProtocolProtocolStateEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ItxProtocolProtocolState o", ItxProtocolProtocolState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ItxProtocolProtocolState> findItxProtocolProtocolStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxProtocolProtocolState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxProtocolProtocolState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public ItxProtocolProtocolState merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ItxProtocolProtocolState merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public ItxProtocolProtocolState() {
+        super();
+    }
+
+	public ItxProtocolProtocol getItxProtocolProtocol() {
+        return this.itxProtocolProtocol;
+    }
+
+	public void setItxProtocolProtocol(ItxProtocolProtocol itxProtocolProtocol) {
+        this.itxProtocolProtocol = itxProtocolProtocol;
+    }
+
+	public Set<ItxProtocolProtocolValue> getLsValues() {
+        return this.lsValues;
+    }
+
+	public void setLsValues(Set<ItxProtocolProtocolValue> lsValues) {
+        this.lsValues = lsValues;
+    }
+
+	public static ItxProtocolProtocolState fromJsonToItxProtocolProtocolState(String json) {
+        return new JSONDeserializer<ItxProtocolProtocolState>()
+        .use(null, ItxProtocolProtocolState.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState_Roo_Configurable.aj
deleted file mode 100755
index 1c41cf0bd..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxProtocolProtocolState;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ItxProtocolProtocolState_Roo_Configurable {
-    
-    declare @type: ItxProtocolProtocolState: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState_Roo_JavaBean.aj
deleted file mode 100755
index 53d7abeec..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState_Roo_JavaBean.aj
+++ /dev/null
@@ -1,29 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxProtocolProtocol;
-import com.labsynch.labseer.domain.ItxProtocolProtocolState;
-import com.labsynch.labseer.domain.ItxProtocolProtocolValue;
-import java.util.Set;
-
-privileged aspect ItxProtocolProtocolState_Roo_JavaBean {
-    
-    public ItxProtocolProtocol ItxProtocolProtocolState.getItxProtocolProtocol() {
-        return this.itxProtocolProtocol;
-    }
-    
-    public void ItxProtocolProtocolState.setItxProtocolProtocol(ItxProtocolProtocol itxProtocolProtocol) {
-        this.itxProtocolProtocol = itxProtocolProtocol;
-    }
-    
-    public Set<ItxProtocolProtocolValue> ItxProtocolProtocolState.getLsValues() {
-        return this.lsValues;
-    }
-    
-    public void ItxProtocolProtocolState.setLsValues(Set<ItxProtocolProtocolValue> lsValues) {
-        this.lsValues = lsValues;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index c6158c256..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxProtocolProtocolState;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ItxProtocolProtocolState_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ItxProtocolProtocolState.fieldNames4OrderClauseFilter = java.util.Arrays.asList("itxProtocolProtocol", "lsValues");
-    
-    public static long ItxProtocolProtocolState.countItxProtocolProtocolStates() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ItxProtocolProtocolState o", Long.class).getSingleResult();
-    }
-    
-    public static List<ItxProtocolProtocolState> ItxProtocolProtocolState.findAllItxProtocolProtocolStates() {
-        return entityManager().createQuery("SELECT o FROM ItxProtocolProtocolState o", ItxProtocolProtocolState.class).getResultList();
-    }
-    
-    public static List<ItxProtocolProtocolState> ItxProtocolProtocolState.findAllItxProtocolProtocolStates(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxProtocolProtocolState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxProtocolProtocolState.class).getResultList();
-    }
-    
-    public static ItxProtocolProtocolState ItxProtocolProtocolState.findItxProtocolProtocolState(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ItxProtocolProtocolState.class, id);
-    }
-    
-    public static List<ItxProtocolProtocolState> ItxProtocolProtocolState.findItxProtocolProtocolStateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxProtocolProtocolState o", ItxProtocolProtocolState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ItxProtocolProtocolState> ItxProtocolProtocolState.findItxProtocolProtocolStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxProtocolProtocolState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxProtocolProtocolState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public ItxProtocolProtocolState ItxProtocolProtocolState.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ItxProtocolProtocolState merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState_Roo_Jpa_Entity.aj
deleted file mode 100755
index a535da466..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,17 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxProtocolProtocolState;
-import javax.persistence.Entity;
-
-privileged aspect ItxProtocolProtocolState_Roo_Jpa_Entity {
-    
-    declare @type: ItxProtocolProtocolState: @Entity;
-    
-    public ItxProtocolProtocolState.new() {
-        super();
-    }
-
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState_Roo_Json.aj
deleted file mode 100755
index 01e0e35b6..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState_Roo_Json.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxProtocolProtocolState;
-import flexjson.JSONDeserializer;
-
-privileged aspect ItxProtocolProtocolState_Roo_Json {
-    
-    public static ItxProtocolProtocolState ItxProtocolProtocolState.fromJsonToItxProtocolProtocolState(String json) {
-        return new JSONDeserializer<ItxProtocolProtocolState>()
-        .use(null, ItxProtocolProtocolState.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState_Roo_ToString.aj
deleted file mode 100755
index de3c3943e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxProtocolProtocolState;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ItxProtocolProtocolState_Roo_ToString {
-    
-    public String ItxProtocolProtocolState.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue.java b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue.java
index 9d13fd8b7..7aaed18f6 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue.java
@@ -6,10 +6,12 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
-
+import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -22,6 +24,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord
@@ -90,4 +94,65 @@ public static ItxProtocolProtocolValue create(ItxProtocolProtocolValue lsThingVa
         ItxProtocolProtocolValue newItxProtocolProtocolValue = new JSONDeserializer<ItxProtocolProtocolValue>().use(null, ItxProtocolProtocolValue.class).deserializeInto(lsThingValue.toJson(), new ItxProtocolProtocolValue());
         return newItxProtocolProtocolValue;
     }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsState");
+
+	public static long countItxProtocolProtocolValues() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ItxProtocolProtocolValue o", Long.class).getSingleResult();
+    }
+
+	public static List<ItxProtocolProtocolValue> findAllItxProtocolProtocolValues() {
+        return entityManager().createQuery("SELECT o FROM ItxProtocolProtocolValue o", ItxProtocolProtocolValue.class).getResultList();
+    }
+
+	public static List<ItxProtocolProtocolValue> findAllItxProtocolProtocolValues(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxProtocolProtocolValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxProtocolProtocolValue.class).getResultList();
+    }
+
+	public static ItxProtocolProtocolValue findItxProtocolProtocolValue(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ItxProtocolProtocolValue.class, id);
+    }
+
+	public static List<ItxProtocolProtocolValue> findItxProtocolProtocolValueEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ItxProtocolProtocolValue o", ItxProtocolProtocolValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ItxProtocolProtocolValue> findItxProtocolProtocolValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxProtocolProtocolValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxProtocolProtocolValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public ItxProtocolProtocolValue merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ItxProtocolProtocolValue merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public ItxProtocolProtocolState getLsState() {
+        return this.lsState;
+    }
+
+	public void setLsState(ItxProtocolProtocolState lsState) {
+        this.lsState = lsState;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue_Roo_Configurable.aj
deleted file mode 100755
index d976a5c27..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxProtocolProtocolValue;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ItxProtocolProtocolValue_Roo_Configurable {
-    
-    declare @type: ItxProtocolProtocolValue: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue_Roo_JavaBean.aj
deleted file mode 100755
index ccb79ebb2..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue_Roo_JavaBean.aj
+++ /dev/null
@@ -1,19 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxProtocolProtocolState;
-import com.labsynch.labseer.domain.ItxProtocolProtocolValue;
-
-privileged aspect ItxProtocolProtocolValue_Roo_JavaBean {
-    
-    public ItxProtocolProtocolState ItxProtocolProtocolValue.getLsState() {
-        return this.lsState;
-    }
-    
-    public void ItxProtocolProtocolValue.setLsState(ItxProtocolProtocolState lsState) {
-        this.lsState = lsState;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index e299cc708..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxProtocolProtocolValue;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ItxProtocolProtocolValue_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ItxProtocolProtocolValue.fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsState");
-    
-    public static long ItxProtocolProtocolValue.countItxProtocolProtocolValues() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ItxProtocolProtocolValue o", Long.class).getSingleResult();
-    }
-    
-    public static List<ItxProtocolProtocolValue> ItxProtocolProtocolValue.findAllItxProtocolProtocolValues() {
-        return entityManager().createQuery("SELECT o FROM ItxProtocolProtocolValue o", ItxProtocolProtocolValue.class).getResultList();
-    }
-    
-    public static List<ItxProtocolProtocolValue> ItxProtocolProtocolValue.findAllItxProtocolProtocolValues(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxProtocolProtocolValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxProtocolProtocolValue.class).getResultList();
-    }
-    
-    public static ItxProtocolProtocolValue ItxProtocolProtocolValue.findItxProtocolProtocolValue(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ItxProtocolProtocolValue.class, id);
-    }
-    
-    public static List<ItxProtocolProtocolValue> ItxProtocolProtocolValue.findItxProtocolProtocolValueEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxProtocolProtocolValue o", ItxProtocolProtocolValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ItxProtocolProtocolValue> ItxProtocolProtocolValue.findItxProtocolProtocolValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxProtocolProtocolValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxProtocolProtocolValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public ItxProtocolProtocolValue ItxProtocolProtocolValue.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ItxProtocolProtocolValue merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue_Roo_Jpa_Entity.aj
deleted file mode 100755
index ac65ee744..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxProtocolProtocolValue;
-import javax.persistence.Entity;
-
-privileged aspect ItxProtocolProtocolValue_Roo_Jpa_Entity {
-    
-    declare @type: ItxProtocolProtocolValue: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue_Roo_ToString.aj
deleted file mode 100755
index 6a07ce045..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxProtocolProtocolValue;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ItxProtocolProtocolValue_Roo_ToString {
-    
-    public String ItxProtocolProtocolValue.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol_Roo_Configurable.aj
deleted file mode 100755
index 678a22bcb..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxProtocolProtocol;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ItxProtocolProtocol_Roo_Configurable {
-    
-    declare @type: ItxProtocolProtocol: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol_Roo_Finder.aj
deleted file mode 100644
index ee531d597..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol_Roo_Finder.aj
+++ /dev/null
@@ -1,82 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxProtocolProtocol;
-import com.labsynch.labseer.domain.Protocol;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ItxProtocolProtocol_Roo_Finder {
-    
-    public static Long ItxProtocolProtocol.countFindItxProtocolProtocolsByFirstProtocol(Protocol firstProtocol) {
-        if (firstProtocol == null) throw new IllegalArgumentException("The firstProtocol argument is required");
-        EntityManager em = ItxProtocolProtocol.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxProtocolProtocol AS o WHERE o.firstProtocol = :firstProtocol", Long.class);
-        q.setParameter("firstProtocol", firstProtocol);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ItxProtocolProtocol.countFindItxProtocolProtocolsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = ItxProtocolProtocol.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxProtocolProtocol AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ItxProtocolProtocol.countFindItxProtocolProtocolsBySecondProtocol(Protocol secondProtocol) {
-        if (secondProtocol == null) throw new IllegalArgumentException("The secondProtocol argument is required");
-        EntityManager em = ItxProtocolProtocol.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxProtocolProtocol AS o WHERE o.secondProtocol = :secondProtocol", Long.class);
-        q.setParameter("secondProtocol", secondProtocol);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ItxProtocolProtocol> ItxProtocolProtocol.findItxProtocolProtocolsByFirstProtocol(Protocol firstProtocol, String sortFieldName, String sortOrder) {
-        if (firstProtocol == null) throw new IllegalArgumentException("The firstProtocol argument is required");
-        EntityManager em = ItxProtocolProtocol.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxProtocolProtocol AS o WHERE o.firstProtocol = :firstProtocol");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ItxProtocolProtocol> q = em.createQuery(queryBuilder.toString(), ItxProtocolProtocol.class);
-        q.setParameter("firstProtocol", firstProtocol);
-        return q;
-    }
-    
-    public static TypedQuery<ItxProtocolProtocol> ItxProtocolProtocol.findItxProtocolProtocolsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = ItxProtocolProtocol.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxProtocolProtocol AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ItxProtocolProtocol> q = em.createQuery(queryBuilder.toString(), ItxProtocolProtocol.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<ItxProtocolProtocol> ItxProtocolProtocol.findItxProtocolProtocolsBySecondProtocol(Protocol secondProtocol, String sortFieldName, String sortOrder) {
-        if (secondProtocol == null) throw new IllegalArgumentException("The secondProtocol argument is required");
-        EntityManager em = ItxProtocolProtocol.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxProtocolProtocol AS o WHERE o.secondProtocol = :secondProtocol");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ItxProtocolProtocol> q = em.createQuery(queryBuilder.toString(), ItxProtocolProtocol.class);
-        q.setParameter("secondProtocol", secondProtocol);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol_Roo_JavaBean.aj
deleted file mode 100755
index 37f87f883..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol_Roo_JavaBean.aj
+++ /dev/null
@@ -1,37 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxProtocolProtocol;
-import com.labsynch.labseer.domain.ItxProtocolProtocolState;
-import com.labsynch.labseer.domain.Protocol;
-import java.util.Set;
-
-privileged aspect ItxProtocolProtocol_Roo_JavaBean {
-    
-    public Protocol ItxProtocolProtocol.getFirstProtocol() {
-        return this.firstProtocol;
-    }
-    
-    public void ItxProtocolProtocol.setFirstProtocol(Protocol firstProtocol) {
-        this.firstProtocol = firstProtocol;
-    }
-    
-    public Protocol ItxProtocolProtocol.getSecondProtocol() {
-        return this.secondProtocol;
-    }
-    
-    public void ItxProtocolProtocol.setSecondProtocol(Protocol secondProtocol) {
-        this.secondProtocol = secondProtocol;
-    }
-    
-    public Set<ItxProtocolProtocolState> ItxProtocolProtocol.getLsStates() {
-        return this.lsStates;
-    }
-    
-    public void ItxProtocolProtocol.setLsStates(Set<ItxProtocolProtocolState> lsStates) {
-        this.lsStates = lsStates;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index c0c7f49c9..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxProtocolProtocol;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ItxProtocolProtocol_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ItxProtocolProtocol.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "firstProtocol", "secondProtocol", "lsStates");
-    
-    public static long ItxProtocolProtocol.countItxProtocolProtocols() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ItxProtocolProtocol o", Long.class).getSingleResult();
-    }
-    
-    public static List<ItxProtocolProtocol> ItxProtocolProtocol.findAllItxProtocolProtocols() {
-        return entityManager().createQuery("SELECT o FROM ItxProtocolProtocol o", ItxProtocolProtocol.class).getResultList();
-    }
-    
-    public static List<ItxProtocolProtocol> ItxProtocolProtocol.findAllItxProtocolProtocols(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxProtocolProtocol o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxProtocolProtocol.class).getResultList();
-    }
-    
-    public static ItxProtocolProtocol ItxProtocolProtocol.findItxProtocolProtocol(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ItxProtocolProtocol.class, id);
-    }
-    
-    public static List<ItxProtocolProtocol> ItxProtocolProtocol.findItxProtocolProtocolEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxProtocolProtocol o", ItxProtocolProtocol.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ItxProtocolProtocol> ItxProtocolProtocol.findItxProtocolProtocolEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxProtocolProtocol o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxProtocolProtocol.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public ItxProtocolProtocol ItxProtocolProtocol.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ItxProtocolProtocol merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol_Roo_Jpa_Entity.aj
deleted file mode 100755
index 065e68308..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,17 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxProtocolProtocol;
-import javax.persistence.Entity;
-
-privileged aspect ItxProtocolProtocol_Roo_Jpa_Entity {
-    
-    declare @type: ItxProtocolProtocol: @Entity;
-    
-    public ItxProtocolProtocol.new() {
-        super();
-    }
-
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol_Roo_ToString.aj
deleted file mode 100755
index 47a40fa1b..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxProtocolProtocol;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ItxProtocolProtocol_Roo_ToString {
-    
-    public String ItxProtocolProtocol.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer.java b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer.java
index 493a6ef71..8526fe7e0 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer.java
@@ -10,6 +10,7 @@
 import java.util.Set;
 
 import javax.persistence.CascadeType;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
@@ -18,9 +19,11 @@
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -33,6 +36,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -180,4 +185,180 @@ public static ItxSubjectContainer updateNoStates(ItxSubjectContainer itxSubjectC
         return updatedItxSubjectContainer;
     }
 
+
+	public Subject getSubject() {
+        return this.subject;
+    }
+
+	public void setSubject(Subject subject) {
+        this.subject = subject;
+    }
+
+	public Container getContainer() {
+        return this.container;
+    }
+
+	public void setContainer(Container container) {
+        this.container = container;
+    }
+
+	public Set<ItxSubjectContainerState> getLsStates() {
+        return this.lsStates;
+    }
+
+	public void setLsStates(Set<ItxSubjectContainerState> lsStates) {
+        this.lsStates = lsStates;
+    }
+
+	public static Long countFindItxSubjectContainersByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = ItxSubjectContainer.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxSubjectContainer AS o WHERE o.codeName = :codeName", Long.class);
+        q.setParameter("codeName", codeName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindItxSubjectContainersByContainer(Container container) {
+        if (container == null) throw new IllegalArgumentException("The container argument is required");
+        EntityManager em = ItxSubjectContainer.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxSubjectContainer AS o WHERE o.container = :container", Long.class);
+        q.setParameter("container", container);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindItxSubjectContainersByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = ItxSubjectContainer.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxSubjectContainer AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindItxSubjectContainersBySubject(Subject subject) {
+        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
+        EntityManager em = ItxSubjectContainer.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxSubjectContainer AS o WHERE o.subject = :subject", Long.class);
+        q.setParameter("subject", subject);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ItxSubjectContainer> findItxSubjectContainersByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = ItxSubjectContainer.entityManager();
+        TypedQuery<ItxSubjectContainer> q = em.createQuery("SELECT o FROM ItxSubjectContainer AS o WHERE o.codeName = :codeName", ItxSubjectContainer.class);
+        q.setParameter("codeName", codeName);
+        return q;
+    }
+
+	public static TypedQuery<ItxSubjectContainer> findItxSubjectContainersByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = ItxSubjectContainer.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxSubjectContainer AS o WHERE o.codeName = :codeName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ItxSubjectContainer> q = em.createQuery(queryBuilder.toString(), ItxSubjectContainer.class);
+        q.setParameter("codeName", codeName);
+        return q;
+    }
+
+	public static TypedQuery<ItxSubjectContainer> findItxSubjectContainersByContainer(Container container) {
+        if (container == null) throw new IllegalArgumentException("The container argument is required");
+        EntityManager em = ItxSubjectContainer.entityManager();
+        TypedQuery<ItxSubjectContainer> q = em.createQuery("SELECT o FROM ItxSubjectContainer AS o WHERE o.container = :container", ItxSubjectContainer.class);
+        q.setParameter("container", container);
+        return q;
+    }
+
+	public static TypedQuery<ItxSubjectContainer> findItxSubjectContainersByContainer(Container container, String sortFieldName, String sortOrder) {
+        if (container == null) throw new IllegalArgumentException("The container argument is required");
+        EntityManager em = ItxSubjectContainer.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxSubjectContainer AS o WHERE o.container = :container");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ItxSubjectContainer> q = em.createQuery(queryBuilder.toString(), ItxSubjectContainer.class);
+        q.setParameter("container", container);
+        return q;
+    }
+
+	public static TypedQuery<ItxSubjectContainer> findItxSubjectContainersByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = ItxSubjectContainer.entityManager();
+        TypedQuery<ItxSubjectContainer> q = em.createQuery("SELECT o FROM ItxSubjectContainer AS o WHERE o.lsTransaction = :lsTransaction", ItxSubjectContainer.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<ItxSubjectContainer> findItxSubjectContainersByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = ItxSubjectContainer.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxSubjectContainer AS o WHERE o.lsTransaction = :lsTransaction");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ItxSubjectContainer> q = em.createQuery(queryBuilder.toString(), ItxSubjectContainer.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<ItxSubjectContainer> findItxSubjectContainersBySubject(Subject subject) {
+        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
+        EntityManager em = ItxSubjectContainer.entityManager();
+        TypedQuery<ItxSubjectContainer> q = em.createQuery("SELECT o FROM ItxSubjectContainer AS o WHERE o.subject = :subject", ItxSubjectContainer.class);
+        q.setParameter("subject", subject);
+        return q;
+    }
+
+	public static TypedQuery<ItxSubjectContainer> findItxSubjectContainersBySubject(Subject subject, String sortFieldName, String sortOrder) {
+        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
+        EntityManager em = ItxSubjectContainer.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxSubjectContainer AS o WHERE o.subject = :subject");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ItxSubjectContainer> q = em.createQuery(queryBuilder.toString(), ItxSubjectContainer.class);
+        q.setParameter("subject", subject);
+        return q;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "subject", "container", "lsStates");
+
+	public static List<ItxSubjectContainer> findAllItxSubjectContainers(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxSubjectContainer o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxSubjectContainer.class).getResultList();
+    }
+
+	public static List<ItxSubjectContainer> findItxSubjectContainerEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxSubjectContainer o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxSubjectContainer.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState.java b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState.java
index 476ec4ca7..3ecf5f45b 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState.java
@@ -10,12 +10,15 @@
 import java.util.Set;
 
 import javax.persistence.CascadeType;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Query;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -28,6 +31,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord
@@ -118,4 +123,73 @@ public static int deleteByExperimentID(Long experimentId) {
 		int numberOfDeletedEntities = q.executeUpdate();
 		return numberOfDeletedEntities;
 	}
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public ItxSubjectContainer getItxSubjectContainer() {
+        return this.itxSubjectContainer;
+    }
+
+	public void setItxSubjectContainer(ItxSubjectContainer itxSubjectContainer) {
+        this.itxSubjectContainer = itxSubjectContainer;
+    }
+
+	public Set<ItxSubjectContainerValue> getLsValues() {
+        return this.lsValues;
+    }
+
+	public void setLsValues(Set<ItxSubjectContainerValue> lsValues) {
+        this.lsValues = lsValues;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("itxSubjectContainer", "lsValues");
+
+	public static long countItxSubjectContainerStates() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ItxSubjectContainerState o", Long.class).getSingleResult();
+    }
+
+	public static List<ItxSubjectContainerState> findAllItxSubjectContainerStates() {
+        return entityManager().createQuery("SELECT o FROM ItxSubjectContainerState o", ItxSubjectContainerState.class).getResultList();
+    }
+
+	public static List<ItxSubjectContainerState> findAllItxSubjectContainerStates(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxSubjectContainerState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxSubjectContainerState.class).getResultList();
+    }
+
+	public static ItxSubjectContainerState findItxSubjectContainerState(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ItxSubjectContainerState.class, id);
+    }
+
+	public static List<ItxSubjectContainerState> findItxSubjectContainerStateEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ItxSubjectContainerState o", ItxSubjectContainerState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ItxSubjectContainerState> findItxSubjectContainerStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxSubjectContainerState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxSubjectContainerState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public ItxSubjectContainerState merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ItxSubjectContainerState merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState_Roo_Configurable.aj
deleted file mode 100755
index f16314c1d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxSubjectContainerState;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ItxSubjectContainerState_Roo_Configurable {
-    
-    declare @type: ItxSubjectContainerState: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState_Roo_JavaBean.aj
deleted file mode 100755
index c9490d33c..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState_Roo_JavaBean.aj
+++ /dev/null
@@ -1,29 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxSubjectContainer;
-import com.labsynch.labseer.domain.ItxSubjectContainerState;
-import com.labsynch.labseer.domain.ItxSubjectContainerValue;
-import java.util.Set;
-
-privileged aspect ItxSubjectContainerState_Roo_JavaBean {
-    
-    public ItxSubjectContainer ItxSubjectContainerState.getItxSubjectContainer() {
-        return this.itxSubjectContainer;
-    }
-    
-    public void ItxSubjectContainerState.setItxSubjectContainer(ItxSubjectContainer itxSubjectContainer) {
-        this.itxSubjectContainer = itxSubjectContainer;
-    }
-    
-    public Set<ItxSubjectContainerValue> ItxSubjectContainerState.getLsValues() {
-        return this.lsValues;
-    }
-    
-    public void ItxSubjectContainerState.setLsValues(Set<ItxSubjectContainerValue> lsValues) {
-        this.lsValues = lsValues;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 31f92e23d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxSubjectContainerState;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ItxSubjectContainerState_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ItxSubjectContainerState.fieldNames4OrderClauseFilter = java.util.Arrays.asList("itxSubjectContainer", "lsValues");
-    
-    public static long ItxSubjectContainerState.countItxSubjectContainerStates() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ItxSubjectContainerState o", Long.class).getSingleResult();
-    }
-    
-    public static List<ItxSubjectContainerState> ItxSubjectContainerState.findAllItxSubjectContainerStates() {
-        return entityManager().createQuery("SELECT o FROM ItxSubjectContainerState o", ItxSubjectContainerState.class).getResultList();
-    }
-    
-    public static List<ItxSubjectContainerState> ItxSubjectContainerState.findAllItxSubjectContainerStates(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxSubjectContainerState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxSubjectContainerState.class).getResultList();
-    }
-    
-    public static ItxSubjectContainerState ItxSubjectContainerState.findItxSubjectContainerState(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ItxSubjectContainerState.class, id);
-    }
-    
-    public static List<ItxSubjectContainerState> ItxSubjectContainerState.findItxSubjectContainerStateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxSubjectContainerState o", ItxSubjectContainerState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ItxSubjectContainerState> ItxSubjectContainerState.findItxSubjectContainerStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxSubjectContainerState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxSubjectContainerState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public ItxSubjectContainerState ItxSubjectContainerState.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ItxSubjectContainerState merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState_Roo_Jpa_Entity.aj
deleted file mode 100755
index 9d70bdc92..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxSubjectContainerState;
-import javax.persistence.Entity;
-
-privileged aspect ItxSubjectContainerState_Roo_Jpa_Entity {
-    
-    declare @type: ItxSubjectContainerState: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState_Roo_ToString.aj
deleted file mode 100755
index 74bab4a89..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxSubjectContainerState;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ItxSubjectContainerState_Roo_ToString {
-    
-    public String ItxSubjectContainerState.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue.java b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue.java
index 6e8eb273b..1a1223a69 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue.java
@@ -6,12 +6,14 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
-
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Query;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -24,6 +26,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord
@@ -106,4 +110,65 @@ public static ItxSubjectContainerValue create(
 		ItxSubjectContainerValue newItxSubjectContainerValue = new JSONDeserializer<ItxSubjectContainerValue>().use(null, ItxSubjectContainerValue.class).deserializeInto(itxSubjectContainerValue.toJson(), new ItxSubjectContainerValue());
         return newItxSubjectContainerValue;
 	}
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsState");
+
+	public static long countItxSubjectContainerValues() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ItxSubjectContainerValue o", Long.class).getSingleResult();
+    }
+
+	public static List<ItxSubjectContainerValue> findAllItxSubjectContainerValues() {
+        return entityManager().createQuery("SELECT o FROM ItxSubjectContainerValue o", ItxSubjectContainerValue.class).getResultList();
+    }
+
+	public static List<ItxSubjectContainerValue> findAllItxSubjectContainerValues(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxSubjectContainerValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxSubjectContainerValue.class).getResultList();
+    }
+
+	public static ItxSubjectContainerValue findItxSubjectContainerValue(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ItxSubjectContainerValue.class, id);
+    }
+
+	public static List<ItxSubjectContainerValue> findItxSubjectContainerValueEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ItxSubjectContainerValue o", ItxSubjectContainerValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ItxSubjectContainerValue> findItxSubjectContainerValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ItxSubjectContainerValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ItxSubjectContainerValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public ItxSubjectContainerValue merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ItxSubjectContainerValue merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public ItxSubjectContainerState getLsState() {
+        return this.lsState;
+    }
+
+	public void setLsState(ItxSubjectContainerState lsState) {
+        this.lsState = lsState;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue_Roo_Configurable.aj
deleted file mode 100755
index 3c1b20a35..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxSubjectContainerValue;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ItxSubjectContainerValue_Roo_Configurable {
-    
-    declare @type: ItxSubjectContainerValue: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue_Roo_JavaBean.aj
deleted file mode 100755
index a29aa956a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue_Roo_JavaBean.aj
+++ /dev/null
@@ -1,19 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxSubjectContainerState;
-import com.labsynch.labseer.domain.ItxSubjectContainerValue;
-
-privileged aspect ItxSubjectContainerValue_Roo_JavaBean {
-    
-    public ItxSubjectContainerState ItxSubjectContainerValue.getLsState() {
-        return this.lsState;
-    }
-    
-    public void ItxSubjectContainerValue.setLsState(ItxSubjectContainerState lsState) {
-        this.lsState = lsState;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 7b2c95e0c..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxSubjectContainerValue;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ItxSubjectContainerValue_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ItxSubjectContainerValue.fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsState");
-    
-    public static long ItxSubjectContainerValue.countItxSubjectContainerValues() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ItxSubjectContainerValue o", Long.class).getSingleResult();
-    }
-    
-    public static List<ItxSubjectContainerValue> ItxSubjectContainerValue.findAllItxSubjectContainerValues() {
-        return entityManager().createQuery("SELECT o FROM ItxSubjectContainerValue o", ItxSubjectContainerValue.class).getResultList();
-    }
-    
-    public static List<ItxSubjectContainerValue> ItxSubjectContainerValue.findAllItxSubjectContainerValues(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxSubjectContainerValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxSubjectContainerValue.class).getResultList();
-    }
-    
-    public static ItxSubjectContainerValue ItxSubjectContainerValue.findItxSubjectContainerValue(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ItxSubjectContainerValue.class, id);
-    }
-    
-    public static List<ItxSubjectContainerValue> ItxSubjectContainerValue.findItxSubjectContainerValueEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxSubjectContainerValue o", ItxSubjectContainerValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ItxSubjectContainerValue> ItxSubjectContainerValue.findItxSubjectContainerValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxSubjectContainerValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxSubjectContainerValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public ItxSubjectContainerValue ItxSubjectContainerValue.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ItxSubjectContainerValue merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue_Roo_Jpa_Entity.aj
deleted file mode 100755
index aaece803f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxSubjectContainerValue;
-import javax.persistence.Entity;
-
-privileged aspect ItxSubjectContainerValue_Roo_Jpa_Entity {
-    
-    declare @type: ItxSubjectContainerValue: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue_Roo_ToString.aj
deleted file mode 100755
index 3126bebc6..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxSubjectContainerValue;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ItxSubjectContainerValue_Roo_ToString {
-    
-    public String ItxSubjectContainerValue.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer_Roo_Configurable.aj
deleted file mode 100755
index 3f5a92abc..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxSubjectContainer;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ItxSubjectContainer_Roo_Configurable {
-    
-    declare @type: ItxSubjectContainer: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer_Roo_Finder.aj
deleted file mode 100755
index 5a5ac5fc7..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer_Roo_Finder.aj
+++ /dev/null
@@ -1,138 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ItxSubjectContainer;
-import com.labsynch.labseer.domain.Subject;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ItxSubjectContainer_Roo_Finder {
-    
-    public static Long ItxSubjectContainer.countFindItxSubjectContainersByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = ItxSubjectContainer.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxSubjectContainer AS o WHERE o.codeName = :codeName", Long.class);
-        q.setParameter("codeName", codeName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ItxSubjectContainer.countFindItxSubjectContainersByContainer(Container container) {
-        if (container == null) throw new IllegalArgumentException("The container argument is required");
-        EntityManager em = ItxSubjectContainer.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxSubjectContainer AS o WHERE o.container = :container", Long.class);
-        q.setParameter("container", container);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ItxSubjectContainer.countFindItxSubjectContainersByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = ItxSubjectContainer.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxSubjectContainer AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ItxSubjectContainer.countFindItxSubjectContainersBySubject(Subject subject) {
-        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
-        EntityManager em = ItxSubjectContainer.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxSubjectContainer AS o WHERE o.subject = :subject", Long.class);
-        q.setParameter("subject", subject);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ItxSubjectContainer> ItxSubjectContainer.findItxSubjectContainersByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = ItxSubjectContainer.entityManager();
-        TypedQuery<ItxSubjectContainer> q = em.createQuery("SELECT o FROM ItxSubjectContainer AS o WHERE o.codeName = :codeName", ItxSubjectContainer.class);
-        q.setParameter("codeName", codeName);
-        return q;
-    }
-    
-    public static TypedQuery<ItxSubjectContainer> ItxSubjectContainer.findItxSubjectContainersByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = ItxSubjectContainer.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxSubjectContainer AS o WHERE o.codeName = :codeName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ItxSubjectContainer> q = em.createQuery(queryBuilder.toString(), ItxSubjectContainer.class);
-        q.setParameter("codeName", codeName);
-        return q;
-    }
-    
-    public static TypedQuery<ItxSubjectContainer> ItxSubjectContainer.findItxSubjectContainersByContainer(Container container) {
-        if (container == null) throw new IllegalArgumentException("The container argument is required");
-        EntityManager em = ItxSubjectContainer.entityManager();
-        TypedQuery<ItxSubjectContainer> q = em.createQuery("SELECT o FROM ItxSubjectContainer AS o WHERE o.container = :container", ItxSubjectContainer.class);
-        q.setParameter("container", container);
-        return q;
-    }
-    
-    public static TypedQuery<ItxSubjectContainer> ItxSubjectContainer.findItxSubjectContainersByContainer(Container container, String sortFieldName, String sortOrder) {
-        if (container == null) throw new IllegalArgumentException("The container argument is required");
-        EntityManager em = ItxSubjectContainer.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxSubjectContainer AS o WHERE o.container = :container");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ItxSubjectContainer> q = em.createQuery(queryBuilder.toString(), ItxSubjectContainer.class);
-        q.setParameter("container", container);
-        return q;
-    }
-    
-    public static TypedQuery<ItxSubjectContainer> ItxSubjectContainer.findItxSubjectContainersByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = ItxSubjectContainer.entityManager();
-        TypedQuery<ItxSubjectContainer> q = em.createQuery("SELECT o FROM ItxSubjectContainer AS o WHERE o.lsTransaction = :lsTransaction", ItxSubjectContainer.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<ItxSubjectContainer> ItxSubjectContainer.findItxSubjectContainersByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = ItxSubjectContainer.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxSubjectContainer AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ItxSubjectContainer> q = em.createQuery(queryBuilder.toString(), ItxSubjectContainer.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<ItxSubjectContainer> ItxSubjectContainer.findItxSubjectContainersBySubject(Subject subject) {
-        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
-        EntityManager em = ItxSubjectContainer.entityManager();
-        TypedQuery<ItxSubjectContainer> q = em.createQuery("SELECT o FROM ItxSubjectContainer AS o WHERE o.subject = :subject", ItxSubjectContainer.class);
-        q.setParameter("subject", subject);
-        return q;
-    }
-    
-    public static TypedQuery<ItxSubjectContainer> ItxSubjectContainer.findItxSubjectContainersBySubject(Subject subject, String sortFieldName, String sortOrder) {
-        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
-        EntityManager em = ItxSubjectContainer.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxSubjectContainer AS o WHERE o.subject = :subject");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ItxSubjectContainer> q = em.createQuery(queryBuilder.toString(), ItxSubjectContainer.class);
-        q.setParameter("subject", subject);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer_Roo_JavaBean.aj
deleted file mode 100755
index 25051e6f8..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer_Roo_JavaBean.aj
+++ /dev/null
@@ -1,38 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ItxSubjectContainer;
-import com.labsynch.labseer.domain.ItxSubjectContainerState;
-import com.labsynch.labseer.domain.Subject;
-import java.util.Set;
-
-privileged aspect ItxSubjectContainer_Roo_JavaBean {
-    
-    public Subject ItxSubjectContainer.getSubject() {
-        return this.subject;
-    }
-    
-    public void ItxSubjectContainer.setSubject(Subject subject) {
-        this.subject = subject;
-    }
-    
-    public Container ItxSubjectContainer.getContainer() {
-        return this.container;
-    }
-    
-    public void ItxSubjectContainer.setContainer(Container container) {
-        this.container = container;
-    }
-    
-    public Set<ItxSubjectContainerState> ItxSubjectContainer.getLsStates() {
-        return this.lsStates;
-    }
-    
-    public void ItxSubjectContainer.setLsStates(Set<ItxSubjectContainerState> lsStates) {
-        this.lsStates = lsStates;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index f0950c9a0..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxSubjectContainer;
-import java.util.List;
-
-privileged aspect ItxSubjectContainer_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ItxSubjectContainer.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "subject", "container", "lsStates");
-    
-    public static List<ItxSubjectContainer> ItxSubjectContainer.findAllItxSubjectContainers(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxSubjectContainer o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxSubjectContainer.class).getResultList();
-    }
-    
-    public static List<ItxSubjectContainer> ItxSubjectContainer.findItxSubjectContainerEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ItxSubjectContainer o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ItxSubjectContainer.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer_Roo_Jpa_Entity.aj
deleted file mode 100755
index 42f67638b..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxSubjectContainer;
-import javax.persistence.Entity;
-
-privileged aspect ItxSubjectContainer_Roo_Jpa_Entity {
-    
-    declare @type: ItxSubjectContainer: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer_Roo_ToString.aj
deleted file mode 100755
index 6285df8b7..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxSubjectContainer;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ItxSubjectContainer_Roo_ToString {
-    
-    public String ItxSubjectContainer.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelKind.java b/src/main/java/com/labsynch/labseer/domain/LabelKind.java
index 9417f431b..790549282 100755
--- a/src/main/java/com/labsynch/labseer/domain/LabelKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/LabelKind.java
@@ -1,5 +1,8 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.List;
 
 import javax.persistence.Column;
@@ -12,18 +15,22 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
 @Entity
 @RooJavaBean
 @RooToString
@@ -157,4 +164,185 @@ public static LabelKind getOrCreate(LabelType lsType, String kindName) {
 		
 		return lsKind;
 	}
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
+
+	public static List<LabelKind> findAllLabelKinds(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LabelKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LabelKind.class).getResultList();
+    }
+
+	public static List<LabelKind> findLabelKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LabelKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LabelKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static LabelKind fromJsonToLabelKind(String json) {
+        return new JSONDeserializer<LabelKind>()
+        .use(null, LabelKind.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<LabelKind> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<LabelKind> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<LabelKind> fromJsonArrayToLabelKinds(String json) {
+        return new JSONDeserializer<List<LabelKind>>()
+        .use("values", LabelKind.class).deserialize(json);
+    }
+
+	public static Long countFindLabelKindsByKindNameEquals(String kindName) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        EntityManager em = LabelKind.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LabelKind AS o WHERE o.kindName = :kindName", Long.class);
+        q.setParameter("kindName", kindName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLabelKindsByKindNameEqualsAndLsType(String kindName, LabelType lsType) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = LabelKind.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LabelKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLabelKindsByLsType(LabelType lsType) {
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = LabelKind.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LabelKind AS o WHERE o.lsType = :lsType", Long.class);
+        q.setParameter("lsType", lsType);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<LabelKind> findLabelKindsByKindNameEquals(String kindName) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        EntityManager em = LabelKind.entityManager();
+        TypedQuery<LabelKind> q = em.createQuery("SELECT o FROM LabelKind AS o WHERE o.kindName = :kindName", LabelKind.class);
+        q.setParameter("kindName", kindName);
+        return q;
+    }
+
+	public static TypedQuery<LabelKind> findLabelKindsByKindNameEquals(String kindName, String sortFieldName, String sortOrder) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        EntityManager em = LabelKind.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LabelKind AS o WHERE o.kindName = :kindName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LabelKind> q = em.createQuery(queryBuilder.toString(), LabelKind.class);
+        q.setParameter("kindName", kindName);
+        return q;
+    }
+
+	public static TypedQuery<LabelKind> findLabelKindsByKindNameEqualsAndLsType(String kindName, LabelType lsType) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = LabelKind.entityManager();
+        TypedQuery<LabelKind> q = em.createQuery("SELECT o FROM LabelKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", LabelKind.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<LabelKind> findLabelKindsByKindNameEqualsAndLsType(String kindName, LabelType lsType, String sortFieldName, String sortOrder) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = LabelKind.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LabelKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LabelKind> q = em.createQuery(queryBuilder.toString(), LabelKind.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<LabelKind> findLabelKindsByLsType(LabelType lsType) {
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = LabelKind.entityManager();
+        TypedQuery<LabelKind> q = em.createQuery("SELECT o FROM LabelKind AS o WHERE o.lsType = :lsType", LabelKind.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<LabelKind> findLabelKindsByLsType(LabelType lsType, String sortFieldName, String sortOrder) {
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = LabelKind.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LabelKind AS o WHERE o.lsType = :lsType");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LabelKind> q = em.createQuery(queryBuilder.toString(), LabelKind.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public LabelType getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(LabelType lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getKindName() {
+        return this.kindName;
+    }
+
+	public void setKindName(String kindName) {
+        this.kindName = kindName;
+    }
+
+	public String getLsTypeAndKind() {
+        return this.lsTypeAndKind;
+    }
+
+	public void setLsTypeAndKind(String lsTypeAndKind) {
+        this.lsTypeAndKind = lsTypeAndKind;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelKind_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/LabelKind_Roo_Configurable.aj
deleted file mode 100755
index b03cde3a9..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LabelKind_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelKind;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LabelKind_Roo_Configurable {
-    
-    declare @type: LabelKind: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelKind_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/LabelKind_Roo_Finder.aj
deleted file mode 100755
index 6b130123b..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LabelKind_Roo_Finder.aj
+++ /dev/null
@@ -1,112 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelKind;
-import com.labsynch.labseer.domain.LabelType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect LabelKind_Roo_Finder {
-    
-    public static Long LabelKind.countFindLabelKindsByKindNameEquals(String kindName) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        EntityManager em = LabelKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LabelKind AS o WHERE o.kindName = :kindName", Long.class);
-        q.setParameter("kindName", kindName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LabelKind.countFindLabelKindsByKindNameEqualsAndLsType(String kindName, LabelType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = LabelKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LabelKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LabelKind.countFindLabelKindsByLsType(LabelType lsType) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = LabelKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LabelKind AS o WHERE o.lsType = :lsType", Long.class);
-        q.setParameter("lsType", lsType);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<LabelKind> LabelKind.findLabelKindsByKindNameEquals(String kindName) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        EntityManager em = LabelKind.entityManager();
-        TypedQuery<LabelKind> q = em.createQuery("SELECT o FROM LabelKind AS o WHERE o.kindName = :kindName", LabelKind.class);
-        q.setParameter("kindName", kindName);
-        return q;
-    }
-    
-    public static TypedQuery<LabelKind> LabelKind.findLabelKindsByKindNameEquals(String kindName, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        EntityManager em = LabelKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LabelKind AS o WHERE o.kindName = :kindName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LabelKind> q = em.createQuery(queryBuilder.toString(), LabelKind.class);
-        q.setParameter("kindName", kindName);
-        return q;
-    }
-    
-    public static TypedQuery<LabelKind> LabelKind.findLabelKindsByKindNameEqualsAndLsType(String kindName, LabelType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = LabelKind.entityManager();
-        TypedQuery<LabelKind> q = em.createQuery("SELECT o FROM LabelKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", LabelKind.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<LabelKind> LabelKind.findLabelKindsByKindNameEqualsAndLsType(String kindName, LabelType lsType, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = LabelKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LabelKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LabelKind> q = em.createQuery(queryBuilder.toString(), LabelKind.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<LabelKind> LabelKind.findLabelKindsByLsType(LabelType lsType) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = LabelKind.entityManager();
-        TypedQuery<LabelKind> q = em.createQuery("SELECT o FROM LabelKind AS o WHERE o.lsType = :lsType", LabelKind.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<LabelKind> LabelKind.findLabelKindsByLsType(LabelType lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = LabelKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LabelKind AS o WHERE o.lsType = :lsType");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LabelKind> q = em.createQuery(queryBuilder.toString(), LabelKind.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelKind_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/LabelKind_Roo_JavaBean.aj
deleted file mode 100755
index 2cfa6d354..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LabelKind_Roo_JavaBean.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelKind;
-import com.labsynch.labseer.domain.LabelType;
-
-privileged aspect LabelKind_Roo_JavaBean {
-    
-    public LabelType LabelKind.getLsType() {
-        return this.lsType;
-    }
-    
-    public void LabelKind.setLsType(LabelType lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String LabelKind.getKindName() {
-        return this.kindName;
-    }
-    
-    public void LabelKind.setKindName(String kindName) {
-        this.kindName = kindName;
-    }
-    
-    public String LabelKind.getLsTypeAndKind() {
-        return this.lsTypeAndKind;
-    }
-    
-    public void LabelKind.setLsTypeAndKind(String lsTypeAndKind) {
-        this.lsTypeAndKind = lsTypeAndKind;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelKind_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/LabelKind_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 7de8b40be..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LabelKind_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelKind;
-import java.util.List;
-
-privileged aspect LabelKind_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> LabelKind.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
-    
-    public static List<LabelKind> LabelKind.findAllLabelKinds(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LabelKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LabelKind.class).getResultList();
-    }
-    
-    public static List<LabelKind> LabelKind.findLabelKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LabelKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LabelKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelKind_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/LabelKind_Roo_Json.aj
deleted file mode 100755
index 31cab0b85..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LabelKind_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelKind;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect LabelKind_Roo_Json {
-    
-    public String LabelKind.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String LabelKind.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static LabelKind LabelKind.fromJsonToLabelKind(String json) {
-        return new JSONDeserializer<LabelKind>()
-        .use(null, LabelKind.class).deserialize(json);
-    }
-    
-    public static String LabelKind.toJsonArray(Collection<LabelKind> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String LabelKind.toJsonArray(Collection<LabelKind> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<LabelKind> LabelKind.fromJsonArrayToLabelKinds(String json) {
-        return new JSONDeserializer<List<LabelKind>>()
-        .use("values", LabelKind.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelKind_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/LabelKind_Roo_ToString.aj
deleted file mode 100755
index 928a599f2..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LabelKind_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelKind;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect LabelKind_Roo_ToString {
-    
-    public String LabelKind.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelSequence.java b/src/main/java/com/labsynch/labseer/domain/LabelSequence.java
index 49d227b2c..21b8f98a6 100755
--- a/src/main/java/com/labsynch/labseer/domain/LabelSequence.java
+++ b/src/main/java/com/labsynch/labseer/domain/LabelSequence.java
@@ -12,21 +12,32 @@
 import java.util.Set;
 
 import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.OneToMany;
+import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
+import javax.persistence.SequenceGenerator;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
+import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.hibernate.Session;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.jdbc.dialect.internal.StandardDialectResolver;
 import org.hibernate.engine.jdbc.dialect.spi.DatabaseMetaDataDialectResolutionInfoAdapter;
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolver;
 import org.hibernate.jdbc.ReturningWork;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
@@ -38,9 +49,11 @@
 import com.labsynch.labseer.utils.ExcludeNulls;
 import com.labsynch.labseer.utils.SimpleUtil;
 import com.labsynch.labseer.utils.SimpleUtil.DbType;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -255,4 +268,361 @@ public static String toJsonArray(Collection<LabelSequence> collection) {
 
 
 
+
+	public static Long countFindLabelSequencesByLabelTypeAndKindEquals(String labelTypeAndKind) {
+        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0) throw new IllegalArgumentException("The labelTypeAndKind argument is required");
+        EntityManager em = LabelSequence.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LabelSequence AS o WHERE o.labelTypeAndKind = :labelTypeAndKind", Long.class);
+        q.setParameter("labelTypeAndKind", labelTypeAndKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLabelSequencesByThingTypeAndKindEquals(String thingTypeAndKind) {
+        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0) throw new IllegalArgumentException("The thingTypeAndKind argument is required");
+        EntityManager em = LabelSequence.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind", Long.class);
+        q.setParameter("thingTypeAndKind", thingTypeAndKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(String thingTypeAndKind, String labelTypeAndKind) {
+        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0) throw new IllegalArgumentException("The thingTypeAndKind argument is required");
+        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0) throw new IllegalArgumentException("The labelTypeAndKind argument is required");
+        EntityManager em = LabelSequence.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind  AND o.labelTypeAndKind = :labelTypeAndKind", Long.class);
+        q.setParameter("thingTypeAndKind", thingTypeAndKind);
+        q.setParameter("labelTypeAndKind", labelTypeAndKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals(String thingTypeAndKind, String labelTypeAndKind, String labelPrefix) {
+        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0) throw new IllegalArgumentException("The thingTypeAndKind argument is required");
+        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0) throw new IllegalArgumentException("The labelTypeAndKind argument is required");
+        if (labelPrefix == null || labelPrefix.length() == 0) throw new IllegalArgumentException("The labelPrefix argument is required");
+        EntityManager em = LabelSequence.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind  AND o.labelTypeAndKind = :labelTypeAndKind  AND o.labelPrefix = :labelPrefix", Long.class);
+        q.setParameter("thingTypeAndKind", thingTypeAndKind);
+        q.setParameter("labelTypeAndKind", labelTypeAndKind);
+        q.setParameter("labelPrefix", labelPrefix);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<LabelSequence> findLabelSequencesByLabelTypeAndKindEquals(String labelTypeAndKind) {
+        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0) throw new IllegalArgumentException("The labelTypeAndKind argument is required");
+        EntityManager em = LabelSequence.entityManager();
+        TypedQuery<LabelSequence> q = em.createQuery("SELECT o FROM LabelSequence AS o WHERE o.labelTypeAndKind = :labelTypeAndKind", LabelSequence.class);
+        q.setParameter("labelTypeAndKind", labelTypeAndKind);
+        return q;
+    }
+
+	public static TypedQuery<LabelSequence> findLabelSequencesByLabelTypeAndKindEquals(String labelTypeAndKind, String sortFieldName, String sortOrder) {
+        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0) throw new IllegalArgumentException("The labelTypeAndKind argument is required");
+        EntityManager em = LabelSequence.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LabelSequence AS o WHERE o.labelTypeAndKind = :labelTypeAndKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LabelSequence> q = em.createQuery(queryBuilder.toString(), LabelSequence.class);
+        q.setParameter("labelTypeAndKind", labelTypeAndKind);
+        return q;
+    }
+
+	public static TypedQuery<LabelSequence> findLabelSequencesByThingTypeAndKindEquals(String thingTypeAndKind) {
+        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0) throw new IllegalArgumentException("The thingTypeAndKind argument is required");
+        EntityManager em = LabelSequence.entityManager();
+        TypedQuery<LabelSequence> q = em.createQuery("SELECT o FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind", LabelSequence.class);
+        q.setParameter("thingTypeAndKind", thingTypeAndKind);
+        return q;
+    }
+
+	public static TypedQuery<LabelSequence> findLabelSequencesByThingTypeAndKindEquals(String thingTypeAndKind, String sortFieldName, String sortOrder) {
+        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0) throw new IllegalArgumentException("The thingTypeAndKind argument is required");
+        EntityManager em = LabelSequence.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LabelSequence> q = em.createQuery(queryBuilder.toString(), LabelSequence.class);
+        q.setParameter("thingTypeAndKind", thingTypeAndKind);
+        return q;
+    }
+
+	public static TypedQuery<LabelSequence> findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(String thingTypeAndKind, String labelTypeAndKind) {
+        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0) throw new IllegalArgumentException("The thingTypeAndKind argument is required");
+        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0) throw new IllegalArgumentException("The labelTypeAndKind argument is required");
+        EntityManager em = LabelSequence.entityManager();
+        TypedQuery<LabelSequence> q = em.createQuery("SELECT o FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind  AND o.labelTypeAndKind = :labelTypeAndKind", LabelSequence.class);
+        q.setParameter("thingTypeAndKind", thingTypeAndKind);
+        q.setParameter("labelTypeAndKind", labelTypeAndKind);
+        return q;
+    }
+
+	public static TypedQuery<LabelSequence> findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(String thingTypeAndKind, String labelTypeAndKind, String sortFieldName, String sortOrder) {
+        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0) throw new IllegalArgumentException("The thingTypeAndKind argument is required");
+        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0) throw new IllegalArgumentException("The labelTypeAndKind argument is required");
+        EntityManager em = LabelSequence.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind  AND o.labelTypeAndKind = :labelTypeAndKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LabelSequence> q = em.createQuery(queryBuilder.toString(), LabelSequence.class);
+        q.setParameter("thingTypeAndKind", thingTypeAndKind);
+        q.setParameter("labelTypeAndKind", labelTypeAndKind);
+        return q;
+    }
+
+	public static TypedQuery<LabelSequence> findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals(String thingTypeAndKind, String labelTypeAndKind, String labelPrefix) {
+        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0) throw new IllegalArgumentException("The thingTypeAndKind argument is required");
+        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0) throw new IllegalArgumentException("The labelTypeAndKind argument is required");
+        if (labelPrefix == null || labelPrefix.length() == 0) throw new IllegalArgumentException("The labelPrefix argument is required");
+        EntityManager em = LabelSequence.entityManager();
+        TypedQuery<LabelSequence> q = em.createQuery("SELECT o FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind  AND o.labelTypeAndKind = :labelTypeAndKind  AND o.labelPrefix = :labelPrefix", LabelSequence.class);
+        q.setParameter("thingTypeAndKind", thingTypeAndKind);
+        q.setParameter("labelTypeAndKind", labelTypeAndKind);
+        q.setParameter("labelPrefix", labelPrefix);
+        return q;
+    }
+
+	public static TypedQuery<LabelSequence> findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals(String thingTypeAndKind, String labelTypeAndKind, String labelPrefix, String sortFieldName, String sortOrder) {
+        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0) throw new IllegalArgumentException("The thingTypeAndKind argument is required");
+        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0) throw new IllegalArgumentException("The labelTypeAndKind argument is required");
+        if (labelPrefix == null || labelPrefix.length() == 0) throw new IllegalArgumentException("The labelPrefix argument is required");
+        EntityManager em = LabelSequence.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind  AND o.labelTypeAndKind = :labelTypeAndKind  AND o.labelPrefix = :labelPrefix");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LabelSequence> q = em.createQuery(queryBuilder.toString(), LabelSequence.class);
+        q.setParameter("thingTypeAndKind", thingTypeAndKind);
+        q.setParameter("labelTypeAndKind", labelTypeAndKind);
+        q.setParameter("labelPrefix", labelPrefix);
+        return q;
+    }
+
+	@Id
+    @SequenceGenerator(name = "labelSequenceGen", sequenceName = "LABEL_SEQUENCE_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "labelSequenceGen")
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getThingTypeAndKind() {
+        return this.thingTypeAndKind;
+    }
+
+	public void setThingTypeAndKind(String thingTypeAndKind) {
+        this.thingTypeAndKind = thingTypeAndKind;
+    }
+
+	public String getLabelTypeAndKind() {
+        return this.labelTypeAndKind;
+    }
+
+	public void setLabelTypeAndKind(String labelTypeAndKind) {
+        this.labelTypeAndKind = labelTypeAndKind;
+    }
+
+	public String getLabelPrefix() {
+        return this.labelPrefix;
+    }
+
+	public void setLabelPrefix(String labelPrefix) {
+        this.labelPrefix = labelPrefix;
+    }
+
+	public String getLabelSeparator() {
+        return this.labelSeparator;
+    }
+
+	public void setLabelSeparator(String labelSeparator) {
+        this.labelSeparator = labelSeparator;
+    }
+
+	public boolean isGroupDigits() {
+        return this.groupDigits;
+    }
+
+	public void setGroupDigits(boolean groupDigits) {
+        this.groupDigits = groupDigits;
+    }
+
+	public Integer getDigits() {
+        return this.digits;
+    }
+
+	public void setDigits(Integer digits) {
+        this.digits = digits;
+    }
+
+	public Long getStartingNumber() {
+        return this.startingNumber;
+    }
+
+	public void setStartingNumber(Long startingNumber) {
+        this.startingNumber = startingNumber;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public Date getModifiedDate() {
+        return this.modifiedDate;
+    }
+
+	public void setModifiedDate(Date modifiedDate) {
+        this.modifiedDate = modifiedDate;
+    }
+
+	public String getDbSequence() {
+        return this.dbSequence;
+    }
+
+	public void setDbSequence(String dbSequence) {
+        this.dbSequence = dbSequence;
+    }
+
+	public Set<LabelSequenceRole> getLabelSequenceRoles() {
+        return this.labelSequenceRoles;
+    }
+
+	public void setLabelSequenceRoles(Set<LabelSequenceRole> labelSequenceRoles) {
+        this.labelSequenceRoles = labelSequenceRoles;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("thingTypeAndKind", "labelTypeAndKind", "labelPrefix", "labelSeparator", "groupDigits", "digits", "startingNumber", "ignored", "modifiedDate", "dbSequence", "labelSequenceRoles");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new LabelSequence().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countLabelSequences() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM LabelSequence o", Long.class).getSingleResult();
+    }
+
+	public static List<LabelSequence> findAllLabelSequences() {
+        return entityManager().createQuery("SELECT o FROM LabelSequence o", LabelSequence.class).getResultList();
+    }
+
+	public static List<LabelSequence> findAllLabelSequences(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LabelSequence o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LabelSequence.class).getResultList();
+    }
+
+	public static LabelSequence findLabelSequence(Long id) {
+        if (id == null) return null;
+        return entityManager().find(LabelSequence.class, id);
+    }
+
+	public static List<LabelSequence> findLabelSequenceEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LabelSequence o", LabelSequence.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<LabelSequence> findLabelSequenceEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LabelSequence o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LabelSequence.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            LabelSequence attached = LabelSequence.findLabelSequence(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public LabelSequence merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        LabelSequence merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public static LabelSequence fromJsonToLabelSequence(String json) {
+        return new JSONDeserializer<LabelSequence>()
+        .use(null, LabelSequence.class).deserialize(json);
+    }
+
+	public static Collection<LabelSequence> fromJsonArrayToLabelSequences(String json) {
+        return new JSONDeserializer<List<LabelSequence>>()
+        .use("values", LabelSequence.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole.java b/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole.java
index 86b284d4c..9a2c84638 100644
--- a/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole.java
+++ b/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole.java
@@ -1,26 +1,36 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.List;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
+import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
-
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
 
+@Configurable
+@Entity
 @RooJson
 @RooJavaBean
 @RooToString(excludeFields = { "labelSequenceEntry", "roleEntry", "version" })
@@ -80,4 +90,174 @@ public static LabelSequenceRole getOrCreateLabelSequenceRole(LabelSequence label
 			return labelSequenceRoles.get(0);
 		}
 	}
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static LabelSequenceRole fromJsonToLabelSequenceRole(String json) {
+        return new JSONDeserializer<LabelSequenceRole>()
+        .use(null, LabelSequenceRole.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<LabelSequenceRole> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<LabelSequenceRole> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<LabelSequenceRole> fromJsonArrayToLabelSequenceRoles(String json) {
+        return new JSONDeserializer<List<LabelSequenceRole>>()
+        .use("values", LabelSequenceRole.class).deserialize(json);
+    }
+
+	public LabelSequence getLabelSequenceEntry() {
+        return this.labelSequenceEntry;
+    }
+
+	public void setLabelSequenceEntry(LabelSequence labelSequenceEntry) {
+        this.labelSequenceEntry = labelSequenceEntry;
+    }
+
+	public LsRole getRoleEntry() {
+        return this.roleEntry;
+    }
+
+	public void setRoleEntry(LsRole roleEntry) {
+        this.roleEntry = roleEntry;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("labelSequenceEntry", "roleEntry", "id", "version");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new LabelSequenceRole().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countLabelSequenceRoles() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM LabelSequenceRole o", Long.class).getSingleResult();
+    }
+
+	public static List<LabelSequenceRole> findAllLabelSequenceRoles() {
+        return entityManager().createQuery("SELECT o FROM LabelSequenceRole o", LabelSequenceRole.class).getResultList();
+    }
+
+	public static List<LabelSequenceRole> findAllLabelSequenceRoles(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LabelSequenceRole o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LabelSequenceRole.class).getResultList();
+    }
+
+	public static LabelSequenceRole findLabelSequenceRole(Long id) {
+        if (id == null) return null;
+        return entityManager().find(LabelSequenceRole.class, id);
+    }
+
+	public static List<LabelSequenceRole> findLabelSequenceRoleEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LabelSequenceRole o", LabelSequenceRole.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<LabelSequenceRole> findLabelSequenceRoleEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LabelSequenceRole o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LabelSequenceRole.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            LabelSequenceRole attached = LabelSequenceRole.findLabelSequenceRole(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public LabelSequenceRole merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        LabelSequenceRole merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public static Long countFindLabelSequenceRolesByRoleEntryAndLabelSequenceEntry(LsRole roleEntry, LabelSequence labelSequenceEntry) {
+        if (roleEntry == null) throw new IllegalArgumentException("The roleEntry argument is required");
+        if (labelSequenceEntry == null) throw new IllegalArgumentException("The labelSequenceEntry argument is required");
+        EntityManager em = LabelSequenceRole.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LabelSequenceRole AS o WHERE o.roleEntry = :roleEntry AND o.labelSequenceEntry = :labelSequenceEntry", Long.class);
+        q.setParameter("roleEntry", roleEntry);
+        q.setParameter("labelSequenceEntry", labelSequenceEntry);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<LabelSequenceRole> findLabelSequenceRolesByRoleEntryAndLabelSequenceEntry(LsRole roleEntry, LabelSequence labelSequenceEntry) {
+        if (roleEntry == null) throw new IllegalArgumentException("The roleEntry argument is required");
+        if (labelSequenceEntry == null) throw new IllegalArgumentException("The labelSequenceEntry argument is required");
+        EntityManager em = LabelSequenceRole.entityManager();
+        TypedQuery<LabelSequenceRole> q = em.createQuery("SELECT o FROM LabelSequenceRole AS o WHERE o.roleEntry = :roleEntry AND o.labelSequenceEntry = :labelSequenceEntry", LabelSequenceRole.class);
+        q.setParameter("roleEntry", roleEntry);
+        q.setParameter("labelSequenceEntry", labelSequenceEntry);
+        return q;
+    }
+
+	public static TypedQuery<LabelSequenceRole> findLabelSequenceRolesByRoleEntryAndLabelSequenceEntry(LsRole roleEntry, LabelSequence labelSequenceEntry, String sortFieldName, String sortOrder) {
+        if (roleEntry == null) throw new IllegalArgumentException("The roleEntry argument is required");
+        if (labelSequenceEntry == null) throw new IllegalArgumentException("The labelSequenceEntry argument is required");
+        EntityManager em = LabelSequenceRole.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LabelSequenceRole AS o WHERE o.roleEntry = :roleEntry AND o.labelSequenceEntry = :labelSequenceEntry");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LabelSequenceRole> q = em.createQuery(queryBuilder.toString(), LabelSequenceRole.class);
+        q.setParameter("roleEntry", roleEntry);
+        q.setParameter("labelSequenceEntry", labelSequenceEntry);
+        return q;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole_Roo_Configurable.aj
deleted file mode 100644
index 03007b263..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelSequenceRole;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LabelSequenceRole_Roo_Configurable {
-    
-    declare @type: LabelSequenceRole: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole_Roo_Finder.aj
deleted file mode 100644
index db31562af..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole_Roo_Finder.aj
+++ /dev/null
@@ -1,51 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelSequence;
-import com.labsynch.labseer.domain.LabelSequenceRole;
-import com.labsynch.labseer.domain.LsRole;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect LabelSequenceRole_Roo_Finder {
-    
-    public static Long LabelSequenceRole.countFindLabelSequenceRolesByRoleEntryAndLabelSequenceEntry(LsRole roleEntry, LabelSequence labelSequenceEntry) {
-        if (roleEntry == null) throw new IllegalArgumentException("The roleEntry argument is required");
-        if (labelSequenceEntry == null) throw new IllegalArgumentException("The labelSequenceEntry argument is required");
-        EntityManager em = LabelSequenceRole.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LabelSequenceRole AS o WHERE o.roleEntry = :roleEntry AND o.labelSequenceEntry = :labelSequenceEntry", Long.class);
-        q.setParameter("roleEntry", roleEntry);
-        q.setParameter("labelSequenceEntry", labelSequenceEntry);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<LabelSequenceRole> LabelSequenceRole.findLabelSequenceRolesByRoleEntryAndLabelSequenceEntry(LsRole roleEntry, LabelSequence labelSequenceEntry) {
-        if (roleEntry == null) throw new IllegalArgumentException("The roleEntry argument is required");
-        if (labelSequenceEntry == null) throw new IllegalArgumentException("The labelSequenceEntry argument is required");
-        EntityManager em = LabelSequenceRole.entityManager();
-        TypedQuery<LabelSequenceRole> q = em.createQuery("SELECT o FROM LabelSequenceRole AS o WHERE o.roleEntry = :roleEntry AND o.labelSequenceEntry = :labelSequenceEntry", LabelSequenceRole.class);
-        q.setParameter("roleEntry", roleEntry);
-        q.setParameter("labelSequenceEntry", labelSequenceEntry);
-        return q;
-    }
-    
-    public static TypedQuery<LabelSequenceRole> LabelSequenceRole.findLabelSequenceRolesByRoleEntryAndLabelSequenceEntry(LsRole roleEntry, LabelSequence labelSequenceEntry, String sortFieldName, String sortOrder) {
-        if (roleEntry == null) throw new IllegalArgumentException("The roleEntry argument is required");
-        if (labelSequenceEntry == null) throw new IllegalArgumentException("The labelSequenceEntry argument is required");
-        EntityManager em = LabelSequenceRole.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LabelSequenceRole AS o WHERE o.roleEntry = :roleEntry AND o.labelSequenceEntry = :labelSequenceEntry");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LabelSequenceRole> q = em.createQuery(queryBuilder.toString(), LabelSequenceRole.class);
-        q.setParameter("roleEntry", roleEntry);
-        q.setParameter("labelSequenceEntry", labelSequenceEntry);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole_Roo_JavaBean.aj
deleted file mode 100644
index b7432315c..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole_Roo_JavaBean.aj
+++ /dev/null
@@ -1,28 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelSequence;
-import com.labsynch.labseer.domain.LabelSequenceRole;
-import com.labsynch.labseer.domain.LsRole;
-
-privileged aspect LabelSequenceRole_Roo_JavaBean {
-    
-    public LabelSequence LabelSequenceRole.getLabelSequenceEntry() {
-        return this.labelSequenceEntry;
-    }
-    
-    public void LabelSequenceRole.setLabelSequenceEntry(LabelSequence labelSequenceEntry) {
-        this.labelSequenceEntry = labelSequenceEntry;
-    }
-    
-    public LsRole LabelSequenceRole.getRoleEntry() {
-        return this.roleEntry;
-    }
-    
-    public void LabelSequenceRole.setRoleEntry(LsRole roleEntry) {
-        this.roleEntry = roleEntry;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 2c1dc5e99..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelSequenceRole;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LabelSequenceRole_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager LabelSequenceRole.entityManager;
-    
-    public static final List<String> LabelSequenceRole.fieldNames4OrderClauseFilter = java.util.Arrays.asList("labelSequenceEntry", "roleEntry", "id", "version");
-    
-    public static final EntityManager LabelSequenceRole.entityManager() {
-        EntityManager em = new LabelSequenceRole().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long LabelSequenceRole.countLabelSequenceRoles() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LabelSequenceRole o", Long.class).getSingleResult();
-    }
-    
-    public static List<LabelSequenceRole> LabelSequenceRole.findAllLabelSequenceRoles() {
-        return entityManager().createQuery("SELECT o FROM LabelSequenceRole o", LabelSequenceRole.class).getResultList();
-    }
-    
-    public static List<LabelSequenceRole> LabelSequenceRole.findAllLabelSequenceRoles(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LabelSequenceRole o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LabelSequenceRole.class).getResultList();
-    }
-    
-    public static LabelSequenceRole LabelSequenceRole.findLabelSequenceRole(Long id) {
-        if (id == null) return null;
-        return entityManager().find(LabelSequenceRole.class, id);
-    }
-    
-    public static List<LabelSequenceRole> LabelSequenceRole.findLabelSequenceRoleEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LabelSequenceRole o", LabelSequenceRole.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<LabelSequenceRole> LabelSequenceRole.findLabelSequenceRoleEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LabelSequenceRole o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LabelSequenceRole.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void LabelSequenceRole.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void LabelSequenceRole.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            LabelSequenceRole attached = LabelSequenceRole.findLabelSequenceRole(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void LabelSequenceRole.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void LabelSequenceRole.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public LabelSequenceRole LabelSequenceRole.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        LabelSequenceRole merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole_Roo_Jpa_Entity.aj
deleted file mode 100644
index 681ed8974..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelSequenceRole;
-import javax.persistence.Entity;
-
-privileged aspect LabelSequenceRole_Roo_Jpa_Entity {
-    
-    declare @type: LabelSequenceRole: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole_Roo_Json.aj
deleted file mode 100644
index 7582fcc20..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelSequenceRole;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect LabelSequenceRole_Roo_Json {
-    
-    public String LabelSequenceRole.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String LabelSequenceRole.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static LabelSequenceRole LabelSequenceRole.fromJsonToLabelSequenceRole(String json) {
-        return new JSONDeserializer<LabelSequenceRole>()
-        .use(null, LabelSequenceRole.class).deserialize(json);
-    }
-    
-    public static String LabelSequenceRole.toJsonArray(Collection<LabelSequenceRole> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String LabelSequenceRole.toJsonArray(Collection<LabelSequenceRole> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<LabelSequenceRole> LabelSequenceRole.fromJsonArrayToLabelSequenceRoles(String json) {
-        return new JSONDeserializer<List<LabelSequenceRole>>()
-        .use("values", LabelSequenceRole.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelSequence_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/LabelSequence_Roo_Configurable.aj
deleted file mode 100755
index 101e4fff3..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LabelSequence_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelSequence;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LabelSequence_Roo_Configurable {
-    
-    declare @type: LabelSequence: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelSequence_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/LabelSequence_Roo_Finder.aj
deleted file mode 100755
index d52e9f699..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LabelSequence_Roo_Finder.aj
+++ /dev/null
@@ -1,154 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelSequence;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect LabelSequence_Roo_Finder {
-    
-    public static Long LabelSequence.countFindLabelSequencesByLabelTypeAndKindEquals(String labelTypeAndKind) {
-        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0) throw new IllegalArgumentException("The labelTypeAndKind argument is required");
-        EntityManager em = LabelSequence.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LabelSequence AS o WHERE o.labelTypeAndKind = :labelTypeAndKind", Long.class);
-        q.setParameter("labelTypeAndKind", labelTypeAndKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LabelSequence.countFindLabelSequencesByThingTypeAndKindEquals(String thingTypeAndKind) {
-        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0) throw new IllegalArgumentException("The thingTypeAndKind argument is required");
-        EntityManager em = LabelSequence.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind", Long.class);
-        q.setParameter("thingTypeAndKind", thingTypeAndKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LabelSequence.countFindLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(String thingTypeAndKind, String labelTypeAndKind) {
-        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0) throw new IllegalArgumentException("The thingTypeAndKind argument is required");
-        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0) throw new IllegalArgumentException("The labelTypeAndKind argument is required");
-        EntityManager em = LabelSequence.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind  AND o.labelTypeAndKind = :labelTypeAndKind", Long.class);
-        q.setParameter("thingTypeAndKind", thingTypeAndKind);
-        q.setParameter("labelTypeAndKind", labelTypeAndKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LabelSequence.countFindLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals(String thingTypeAndKind, String labelTypeAndKind, String labelPrefix) {
-        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0) throw new IllegalArgumentException("The thingTypeAndKind argument is required");
-        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0) throw new IllegalArgumentException("The labelTypeAndKind argument is required");
-        if (labelPrefix == null || labelPrefix.length() == 0) throw new IllegalArgumentException("The labelPrefix argument is required");
-        EntityManager em = LabelSequence.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind  AND o.labelTypeAndKind = :labelTypeAndKind  AND o.labelPrefix = :labelPrefix", Long.class);
-        q.setParameter("thingTypeAndKind", thingTypeAndKind);
-        q.setParameter("labelTypeAndKind", labelTypeAndKind);
-        q.setParameter("labelPrefix", labelPrefix);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<LabelSequence> LabelSequence.findLabelSequencesByLabelTypeAndKindEquals(String labelTypeAndKind) {
-        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0) throw new IllegalArgumentException("The labelTypeAndKind argument is required");
-        EntityManager em = LabelSequence.entityManager();
-        TypedQuery<LabelSequence> q = em.createQuery("SELECT o FROM LabelSequence AS o WHERE o.labelTypeAndKind = :labelTypeAndKind", LabelSequence.class);
-        q.setParameter("labelTypeAndKind", labelTypeAndKind);
-        return q;
-    }
-    
-    public static TypedQuery<LabelSequence> LabelSequence.findLabelSequencesByLabelTypeAndKindEquals(String labelTypeAndKind, String sortFieldName, String sortOrder) {
-        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0) throw new IllegalArgumentException("The labelTypeAndKind argument is required");
-        EntityManager em = LabelSequence.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LabelSequence AS o WHERE o.labelTypeAndKind = :labelTypeAndKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LabelSequence> q = em.createQuery(queryBuilder.toString(), LabelSequence.class);
-        q.setParameter("labelTypeAndKind", labelTypeAndKind);
-        return q;
-    }
-    
-    public static TypedQuery<LabelSequence> LabelSequence.findLabelSequencesByThingTypeAndKindEquals(String thingTypeAndKind) {
-        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0) throw new IllegalArgumentException("The thingTypeAndKind argument is required");
-        EntityManager em = LabelSequence.entityManager();
-        TypedQuery<LabelSequence> q = em.createQuery("SELECT o FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind", LabelSequence.class);
-        q.setParameter("thingTypeAndKind", thingTypeAndKind);
-        return q;
-    }
-    
-    public static TypedQuery<LabelSequence> LabelSequence.findLabelSequencesByThingTypeAndKindEquals(String thingTypeAndKind, String sortFieldName, String sortOrder) {
-        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0) throw new IllegalArgumentException("The thingTypeAndKind argument is required");
-        EntityManager em = LabelSequence.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LabelSequence> q = em.createQuery(queryBuilder.toString(), LabelSequence.class);
-        q.setParameter("thingTypeAndKind", thingTypeAndKind);
-        return q;
-    }
-    
-    public static TypedQuery<LabelSequence> LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(String thingTypeAndKind, String labelTypeAndKind) {
-        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0) throw new IllegalArgumentException("The thingTypeAndKind argument is required");
-        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0) throw new IllegalArgumentException("The labelTypeAndKind argument is required");
-        EntityManager em = LabelSequence.entityManager();
-        TypedQuery<LabelSequence> q = em.createQuery("SELECT o FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind  AND o.labelTypeAndKind = :labelTypeAndKind", LabelSequence.class);
-        q.setParameter("thingTypeAndKind", thingTypeAndKind);
-        q.setParameter("labelTypeAndKind", labelTypeAndKind);
-        return q;
-    }
-    
-    public static TypedQuery<LabelSequence> LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(String thingTypeAndKind, String labelTypeAndKind, String sortFieldName, String sortOrder) {
-        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0) throw new IllegalArgumentException("The thingTypeAndKind argument is required");
-        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0) throw new IllegalArgumentException("The labelTypeAndKind argument is required");
-        EntityManager em = LabelSequence.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind  AND o.labelTypeAndKind = :labelTypeAndKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LabelSequence> q = em.createQuery(queryBuilder.toString(), LabelSequence.class);
-        q.setParameter("thingTypeAndKind", thingTypeAndKind);
-        q.setParameter("labelTypeAndKind", labelTypeAndKind);
-        return q;
-    }
-    
-    public static TypedQuery<LabelSequence> LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals(String thingTypeAndKind, String labelTypeAndKind, String labelPrefix) {
-        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0) throw new IllegalArgumentException("The thingTypeAndKind argument is required");
-        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0) throw new IllegalArgumentException("The labelTypeAndKind argument is required");
-        if (labelPrefix == null || labelPrefix.length() == 0) throw new IllegalArgumentException("The labelPrefix argument is required");
-        EntityManager em = LabelSequence.entityManager();
-        TypedQuery<LabelSequence> q = em.createQuery("SELECT o FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind  AND o.labelTypeAndKind = :labelTypeAndKind  AND o.labelPrefix = :labelPrefix", LabelSequence.class);
-        q.setParameter("thingTypeAndKind", thingTypeAndKind);
-        q.setParameter("labelTypeAndKind", labelTypeAndKind);
-        q.setParameter("labelPrefix", labelPrefix);
-        return q;
-    }
-    
-    public static TypedQuery<LabelSequence> LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals(String thingTypeAndKind, String labelTypeAndKind, String labelPrefix, String sortFieldName, String sortOrder) {
-        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0) throw new IllegalArgumentException("The thingTypeAndKind argument is required");
-        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0) throw new IllegalArgumentException("The labelTypeAndKind argument is required");
-        if (labelPrefix == null || labelPrefix.length() == 0) throw new IllegalArgumentException("The labelPrefix argument is required");
-        EntityManager em = LabelSequence.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind  AND o.labelTypeAndKind = :labelTypeAndKind  AND o.labelPrefix = :labelPrefix");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LabelSequence> q = em.createQuery(queryBuilder.toString(), LabelSequence.class);
-        q.setParameter("thingTypeAndKind", thingTypeAndKind);
-        q.setParameter("labelTypeAndKind", labelTypeAndKind);
-        q.setParameter("labelPrefix", labelPrefix);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelSequence_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/LabelSequence_Roo_JavaBean.aj
deleted file mode 100755
index e2d870ec1..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LabelSequence_Roo_JavaBean.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelSequence;
-import com.labsynch.labseer.domain.LabelSequenceRole;
-import java.util.Date;
-import java.util.Set;
-
-privileged aspect LabelSequence_Roo_JavaBean {
-    
-    public String LabelSequence.getThingTypeAndKind() {
-        return this.thingTypeAndKind;
-    }
-    
-    public void LabelSequence.setThingTypeAndKind(String thingTypeAndKind) {
-        this.thingTypeAndKind = thingTypeAndKind;
-    }
-    
-    public String LabelSequence.getLabelTypeAndKind() {
-        return this.labelTypeAndKind;
-    }
-    
-    public void LabelSequence.setLabelTypeAndKind(String labelTypeAndKind) {
-        this.labelTypeAndKind = labelTypeAndKind;
-    }
-    
-    public String LabelSequence.getLabelPrefix() {
-        return this.labelPrefix;
-    }
-    
-    public void LabelSequence.setLabelPrefix(String labelPrefix) {
-        this.labelPrefix = labelPrefix;
-    }
-    
-    public String LabelSequence.getLabelSeparator() {
-        return this.labelSeparator;
-    }
-    
-    public void LabelSequence.setLabelSeparator(String labelSeparator) {
-        this.labelSeparator = labelSeparator;
-    }
-    
-    public boolean LabelSequence.isGroupDigits() {
-        return this.groupDigits;
-    }
-    
-    public void LabelSequence.setGroupDigits(boolean groupDigits) {
-        this.groupDigits = groupDigits;
-    }
-    
-    public Integer LabelSequence.getDigits() {
-        return this.digits;
-    }
-    
-    public void LabelSequence.setDigits(Integer digits) {
-        this.digits = digits;
-    }
-    
-    public Long LabelSequence.getStartingNumber() {
-        return this.startingNumber;
-    }
-    
-    public void LabelSequence.setStartingNumber(Long startingNumber) {
-        this.startingNumber = startingNumber;
-    }
-    
-    public boolean LabelSequence.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void LabelSequence.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public Date LabelSequence.getModifiedDate() {
-        return this.modifiedDate;
-    }
-    
-    public void LabelSequence.setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
-    
-    public String LabelSequence.getDbSequence() {
-        return this.dbSequence;
-    }
-    
-    public void LabelSequence.setDbSequence(String dbSequence) {
-        this.dbSequence = dbSequence;
-    }
-    
-    public Set<LabelSequenceRole> LabelSequence.getLabelSequenceRoles() {
-        return this.labelSequenceRoles;
-    }
-    
-    public void LabelSequence.setLabelSequenceRoles(Set<LabelSequenceRole> labelSequenceRoles) {
-        this.labelSequenceRoles = labelSequenceRoles;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelSequence_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/LabelSequence_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 1ea1ad4e6..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LabelSequence_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelSequence;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LabelSequence_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager LabelSequence.entityManager;
-    
-    public static final List<String> LabelSequence.fieldNames4OrderClauseFilter = java.util.Arrays.asList("thingTypeAndKind", "labelTypeAndKind", "labelPrefix", "labelSeparator", "groupDigits", "digits", "startingNumber", "ignored", "modifiedDate", "dbSequence", "labelSequenceRoles");
-    
-    public static final EntityManager LabelSequence.entityManager() {
-        EntityManager em = new LabelSequence().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long LabelSequence.countLabelSequences() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LabelSequence o", Long.class).getSingleResult();
-    }
-    
-    public static List<LabelSequence> LabelSequence.findAllLabelSequences() {
-        return entityManager().createQuery("SELECT o FROM LabelSequence o", LabelSequence.class).getResultList();
-    }
-    
-    public static List<LabelSequence> LabelSequence.findAllLabelSequences(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LabelSequence o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LabelSequence.class).getResultList();
-    }
-    
-    public static LabelSequence LabelSequence.findLabelSequence(Long id) {
-        if (id == null) return null;
-        return entityManager().find(LabelSequence.class, id);
-    }
-    
-    public static List<LabelSequence> LabelSequence.findLabelSequenceEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LabelSequence o", LabelSequence.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<LabelSequence> LabelSequence.findLabelSequenceEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LabelSequence o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LabelSequence.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void LabelSequence.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void LabelSequence.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            LabelSequence attached = LabelSequence.findLabelSequence(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void LabelSequence.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void LabelSequence.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public LabelSequence LabelSequence.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        LabelSequence merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelSequence_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/LabelSequence_Roo_Jpa_Entity.aj
deleted file mode 100755
index 29bd11170..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LabelSequence_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelSequence;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
-
-privileged aspect LabelSequence_Roo_Jpa_Entity {
-    
-    declare @type: LabelSequence: @Entity;
-    
-    @Id
-    @SequenceGenerator(name = "labelSequenceGen", sequenceName = "LABEL_SEQUENCE_PKSEQ")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "labelSequenceGen")
-    @Column(name = "id")
-    private Long LabelSequence.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer LabelSequence.version;
-    
-    public Long LabelSequence.getId() {
-        return this.id;
-    }
-    
-    public void LabelSequence.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer LabelSequence.getVersion() {
-        return this.version;
-    }
-    
-    public void LabelSequence.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelSequence_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/LabelSequence_Roo_Json.aj
deleted file mode 100755
index d8e7e7df1..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LabelSequence_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelSequence;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect LabelSequence_Roo_Json {
-    
-    public static LabelSequence LabelSequence.fromJsonToLabelSequence(String json) {
-        return new JSONDeserializer<LabelSequence>()
-        .use(null, LabelSequence.class).deserialize(json);
-    }
-    
-    public static Collection<LabelSequence> LabelSequence.fromJsonArrayToLabelSequences(String json) {
-        return new JSONDeserializer<List<LabelSequence>>()
-        .use("values", LabelSequence.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelSequence_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/LabelSequence_Roo_ToString.aj
deleted file mode 100755
index b3325b546..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LabelSequence_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelSequence;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect LabelSequence_Roo_ToString {
-    
-    public String LabelSequence.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelType.java b/src/main/java/com/labsynch/labseer/domain/LabelType.java
index d50afc927..27ac76a2e 100755
--- a/src/main/java/com/labsynch/labseer/domain/LabelType.java
+++ b/src/main/java/com/labsynch/labseer/domain/LabelType.java
@@ -1,24 +1,34 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.List;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.EntityManager;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
 @Entity
 @RooJavaBean
 @RooToString
@@ -75,4 +85,164 @@ public Integer getVersion() {
 	public void setVersion(Integer version) {
         this.version = version;
     }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "typeName", "id", "version");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new LabelType().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countLabelTypes() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM LabelType o", Long.class).getSingleResult();
+    }
+
+	public static List<LabelType> findAllLabelTypes() {
+        return entityManager().createQuery("SELECT o FROM LabelType o", LabelType.class).getResultList();
+    }
+
+	public static List<LabelType> findAllLabelTypes(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LabelType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LabelType.class).getResultList();
+    }
+
+	public static LabelType findLabelType(Long id) {
+        if (id == null) return null;
+        return entityManager().find(LabelType.class, id);
+    }
+
+	public static List<LabelType> findLabelTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LabelType o", LabelType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<LabelType> findLabelTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LabelType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LabelType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            LabelType attached = LabelType.findLabelType(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public LabelType merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        LabelType merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String getTypeName() {
+        return this.typeName;
+    }
+
+	public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static LabelType fromJsonToLabelType(String json) {
+        return new JSONDeserializer<LabelType>()
+        .use(null, LabelType.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<LabelType> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<LabelType> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<LabelType> fromJsonArrayToLabelTypes(String json) {
+        return new JSONDeserializer<List<LabelType>>()
+        .use("values", LabelType.class).deserialize(json);
+    }
+
+	public static Long countFindLabelTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = LabelType.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LabelType AS o WHERE o.typeName = :typeName", Long.class);
+        q.setParameter("typeName", typeName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<LabelType> findLabelTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = LabelType.entityManager();
+        TypedQuery<LabelType> q = em.createQuery("SELECT o FROM LabelType AS o WHERE o.typeName = :typeName", LabelType.class);
+        q.setParameter("typeName", typeName);
+        return q;
+    }
+
+	public static TypedQuery<LabelType> findLabelTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = LabelType.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LabelType AS o WHERE o.typeName = :typeName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LabelType> q = em.createQuery(queryBuilder.toString(), LabelType.class);
+        q.setParameter("typeName", typeName);
+        return q;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelType_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/LabelType_Roo_Configurable.aj
deleted file mode 100755
index 2c4da715f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LabelType_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelType;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LabelType_Roo_Configurable {
-    
-    declare @type: LabelType: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelType_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/LabelType_Roo_Finder.aj
deleted file mode 100755
index 56fd753d9..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LabelType_Roo_Finder.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect LabelType_Roo_Finder {
-    
-    public static Long LabelType.countFindLabelTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = LabelType.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LabelType AS o WHERE o.typeName = :typeName", Long.class);
-        q.setParameter("typeName", typeName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<LabelType> LabelType.findLabelTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = LabelType.entityManager();
-        TypedQuery<LabelType> q = em.createQuery("SELECT o FROM LabelType AS o WHERE o.typeName = :typeName", LabelType.class);
-        q.setParameter("typeName", typeName);
-        return q;
-    }
-    
-    public static TypedQuery<LabelType> LabelType.findLabelTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = LabelType.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LabelType AS o WHERE o.typeName = :typeName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LabelType> q = em.createQuery(queryBuilder.toString(), LabelType.class);
-        q.setParameter("typeName", typeName);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelType_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/LabelType_Roo_JavaBean.aj
deleted file mode 100755
index 9c57ce456..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LabelType_Roo_JavaBean.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelType;
-
-privileged aspect LabelType_Roo_JavaBean {
-    
-    public String LabelType.getTypeName() {
-        return this.typeName;
-    }
-    
-    public void LabelType.setTypeName(String typeName) {
-        this.typeName = typeName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelType_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/LabelType_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 21a88de50..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LabelType_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelType;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LabelType_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager LabelType.entityManager;
-    
-    public static final List<String> LabelType.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "typeName", "id", "version");
-    
-    public static final EntityManager LabelType.entityManager() {
-        EntityManager em = new LabelType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long LabelType.countLabelTypes() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LabelType o", Long.class).getSingleResult();
-    }
-    
-    public static List<LabelType> LabelType.findAllLabelTypes() {
-        return entityManager().createQuery("SELECT o FROM LabelType o", LabelType.class).getResultList();
-    }
-    
-    public static List<LabelType> LabelType.findAllLabelTypes(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LabelType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LabelType.class).getResultList();
-    }
-    
-    public static LabelType LabelType.findLabelType(Long id) {
-        if (id == null) return null;
-        return entityManager().find(LabelType.class, id);
-    }
-    
-    public static List<LabelType> LabelType.findLabelTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LabelType o", LabelType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<LabelType> LabelType.findLabelTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LabelType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LabelType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void LabelType.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void LabelType.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            LabelType attached = LabelType.findLabelType(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void LabelType.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void LabelType.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public LabelType LabelType.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        LabelType merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelType_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/LabelType_Roo_Json.aj
deleted file mode 100755
index 16f57f428..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LabelType_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelType;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect LabelType_Roo_Json {
-    
-    public String LabelType.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String LabelType.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static LabelType LabelType.fromJsonToLabelType(String json) {
-        return new JSONDeserializer<LabelType>()
-        .use(null, LabelType.class).deserialize(json);
-    }
-    
-    public static String LabelType.toJsonArray(Collection<LabelType> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String LabelType.toJsonArray(Collection<LabelType> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<LabelType> LabelType.fromJsonArrayToLabelTypes(String json) {
-        return new JSONDeserializer<List<LabelType>>()
-        .use("values", LabelType.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelType_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/LabelType_Roo_ToString.aj
deleted file mode 100755
index 607bc57e1..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LabelType_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelType;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect LabelType_Roo_ToString {
-    
-    public String LabelType.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Lot.java b/src/main/java/com/labsynch/labseer/domain/Lot.java
index 4018bca16..6d7e7066a 100755
--- a/src/main/java/com/labsynch/labseer/domain/Lot.java
+++ b/src/main/java/com/labsynch/labseer/domain/Lot.java
@@ -1,6 +1,7 @@
 package com.labsynch.labseer.domain;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
@@ -11,16 +12,22 @@
 import javax.annotation.PostConstruct;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
+import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
 import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Join;
@@ -30,9 +37,11 @@
 import javax.persistence.criteria.Root;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
@@ -43,9 +52,11 @@
 
 import com.labsynch.labseer.dto.LotsByProjectDTO;
 import com.labsynch.labseer.dto.SearchFormDTO;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Entity
+@Configurable
 @Transactional
 @RooJavaBean
 @RooToString
@@ -613,4 +624,942 @@ public String toJsonIncludeAliases() {
     }
 
     
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String getAsDrawnStruct() {
+        return this.asDrawnStruct;
+    }
+
+	public void setAsDrawnStruct(String asDrawnStruct) {
+        this.asDrawnStruct = asDrawnStruct;
+    }
+
+	public int getLotAsDrawnCdId() {
+        return this.lotAsDrawnCdId;
+    }
+
+	public void setLotAsDrawnCdId(int lotAsDrawnCdId) {
+        this.lotAsDrawnCdId = lotAsDrawnCdId;
+    }
+
+	public void setBuid(Long buid) {
+        this.buid = buid;
+    }
+
+	public String getCorpName() {
+        return this.corpName;
+    }
+
+	public void setCorpName(String corpName) {
+        this.corpName = corpName;
+    }
+
+	public Integer getLotNumber() {
+        return this.lotNumber;
+    }
+
+	public void setLotNumber(Integer lotNumber) {
+        this.lotNumber = lotNumber;
+    }
+
+	public Double getLotMolWeight() {
+        return this.lotMolWeight;
+    }
+
+	public void setLotMolWeight(Double lotMolWeight) {
+        this.lotMolWeight = lotMolWeight;
+    }
+
+	public Date getSynthesisDate() {
+        return this.synthesisDate;
+    }
+
+	public void setSynthesisDate(Date synthesisDate) {
+        this.synthesisDate = synthesisDate;
+    }
+
+	public Date getRegistrationDate() {
+        return this.registrationDate;
+    }
+
+	public void setRegistrationDate(Date registrationDate) {
+        this.registrationDate = registrationDate;
+    }
+
+	public String getRegisteredBy() {
+        return this.registeredBy;
+    }
+
+	public void setRegisteredBy(String registeredBy) {
+        this.registeredBy = registeredBy;
+    }
+
+	public Date getModifiedDate() {
+        return this.modifiedDate;
+    }
+
+	public void setModifiedDate(Date modifiedDate) {
+        this.modifiedDate = modifiedDate;
+    }
+
+	public String getModifiedBy() {
+        return this.modifiedBy;
+    }
+
+	public void setModifiedBy(String modifiedBy) {
+        this.modifiedBy = modifiedBy;
+    }
+
+	public String getBarcode() {
+        return this.barcode;
+    }
+
+	public void setBarcode(String barcode) {
+        this.barcode = barcode;
+    }
+
+	public String getColor() {
+        return this.color;
+    }
+
+	public void setColor(String color) {
+        this.color = color;
+    }
+
+	public String getNotebookPage() {
+        return this.notebookPage;
+    }
+
+	public void setNotebookPage(String notebookPage) {
+        this.notebookPage = notebookPage;
+    }
+
+	public Double getAmount() {
+        return this.amount;
+    }
+
+	public void setAmount(Double amount) {
+        this.amount = amount;
+    }
+
+	public Unit getAmountUnits() {
+        return this.amountUnits;
+    }
+
+	public void setAmountUnits(Unit amountUnits) {
+        this.amountUnits = amountUnits;
+    }
+
+	public Double getSolutionAmount() {
+        return this.solutionAmount;
+    }
+
+	public void setSolutionAmount(Double solutionAmount) {
+        this.solutionAmount = solutionAmount;
+    }
+
+	public SolutionUnit getSolutionAmountUnits() {
+        return this.solutionAmountUnits;
+    }
+
+	public void setSolutionAmountUnits(SolutionUnit solutionAmountUnits) {
+        this.solutionAmountUnits = solutionAmountUnits;
+    }
+
+	public String getSupplier() {
+        return this.supplier;
+    }
+
+	public void setSupplier(String supplier) {
+        this.supplier = supplier;
+    }
+
+	public String getSupplierID() {
+        return this.supplierID;
+    }
+
+	public void setSupplierID(String supplierID) {
+        this.supplierID = supplierID;
+    }
+
+	public Double getPurity() {
+        return this.purity;
+    }
+
+	public void setPurity(Double purity) {
+        this.purity = purity;
+    }
+
+	public Operator getPurityOperator() {
+        return this.purityOperator;
+    }
+
+	public void setPurityOperator(Operator purityOperator) {
+        this.purityOperator = purityOperator;
+    }
+
+	public PurityMeasuredBy getPurityMeasuredBy() {
+        return this.purityMeasuredBy;
+    }
+
+	public void setPurityMeasuredBy(PurityMeasuredBy purityMeasuredBy) {
+        this.purityMeasuredBy = purityMeasuredBy;
+    }
+
+	public String getChemist() {
+        return this.chemist;
+    }
+
+	public void setChemist(String chemist) {
+        this.chemist = chemist;
+    }
+
+	public Double getPercentEE() {
+        return this.percentEE;
+    }
+
+	public void setPercentEE(Double percentEE) {
+        this.percentEE = percentEE;
+    }
+
+	public String getComments() {
+        return this.comments;
+    }
+
+	public void setComments(String comments) {
+        this.comments = comments;
+    }
+
+	public Boolean getIsVirtual() {
+        return this.isVirtual;
+    }
+
+	public void setIsVirtual(Boolean isVirtual) {
+        this.isVirtual = isVirtual;
+    }
+
+	public Boolean getIgnore() {
+        return this.ignore;
+    }
+
+	public void setIgnore(Boolean ignore) {
+        this.ignore = ignore;
+    }
+
+	public PhysicalState getPhysicalState() {
+        return this.physicalState;
+    }
+
+	public void setPhysicalState(PhysicalState physicalState) {
+        this.physicalState = physicalState;
+    }
+
+	public Vendor getVendor() {
+        return this.vendor;
+    }
+
+	public void setVendor(Vendor vendor) {
+        this.vendor = vendor;
+    }
+
+	public String getVendorId() {
+        return this.vendorId;
+    }
+
+	public void setVendorId(String vendorId) {
+        this.vendorId = vendorId;
+    }
+
+	public Set<FileList> getFileLists() {
+        return this.fileLists;
+    }
+
+	public void setFileLists(Set<FileList> fileLists) {
+        this.fileLists = fileLists;
+    }
+
+	public Double getRetain() {
+        return this.retain;
+    }
+
+	public void setRetain(Double retain) {
+        this.retain = retain;
+    }
+
+	public Unit getRetainUnits() {
+        return this.retainUnits;
+    }
+
+	public void setRetainUnits(Unit retainUnits) {
+        this.retainUnits = retainUnits;
+    }
+
+	public String getRetainLocation() {
+        return this.retainLocation;
+    }
+
+	public void setRetainLocation(String retainLocation) {
+        this.retainLocation = retainLocation;
+    }
+
+	public Double getMeltingPoint() {
+        return this.meltingPoint;
+    }
+
+	public void setMeltingPoint(Double meltingPoint) {
+        this.meltingPoint = meltingPoint;
+    }
+
+	public Double getBoilingPoint() {
+        return this.boilingPoint;
+    }
+
+	public void setBoilingPoint(Double boilingPoint) {
+        this.boilingPoint = boilingPoint;
+    }
+
+	public String getSupplierLot() {
+        return this.supplierLot;
+    }
+
+	public void setSupplierLot(String supplierLot) {
+        this.supplierLot = supplierLot;
+    }
+
+	public String getProject() {
+        return this.project;
+    }
+
+	public void setProject(String project) {
+        this.project = project;
+    }
+
+	public BulkLoadFile getBulkLoadFile() {
+        return this.bulkLoadFile;
+    }
+
+	public void setBulkLoadFile(BulkLoadFile bulkLoadFile) {
+        this.bulkLoadFile = bulkLoadFile;
+    }
+
+	public Double getLambda() {
+        return this.lambda;
+    }
+
+	public void setLambda(Double lambda) {
+        this.lambda = lambda;
+    }
+
+	public Double getAbsorbance() {
+        return this.absorbance;
+    }
+
+	public void setAbsorbance(Double absorbance) {
+        this.absorbance = absorbance;
+    }
+
+	public String getStockSolvent() {
+        return this.stockSolvent;
+    }
+
+	public void setStockSolvent(String stockSolvent) {
+        this.stockSolvent = stockSolvent;
+    }
+
+	public String getStockLocation() {
+        return this.stockLocation;
+    }
+
+	public void setStockLocation(String stockLocation) {
+        this.stockLocation = stockLocation;
+    }
+
+	public Double getObservedMassOne() {
+        return this.observedMassOne;
+    }
+
+	public void setObservedMassOne(Double observedMassOne) {
+        this.observedMassOne = observedMassOne;
+    }
+
+	public Double getObservedMassTwo() {
+        return this.observedMassTwo;
+    }
+
+	public void setObservedMassTwo(Double observedMassTwo) {
+        this.observedMassTwo = observedMassTwo;
+    }
+
+	public Double getTareWeight() {
+        return this.tareWeight;
+    }
+
+	public void setTareWeight(Double tareWeight) {
+        this.tareWeight = tareWeight;
+    }
+
+	public Unit getTareWeightUnits() {
+        return this.tareWeightUnits;
+    }
+
+	public void setTareWeightUnits(Unit tareWeightUnits) {
+        this.tareWeightUnits = tareWeightUnits;
+    }
+
+	public Double getTotalAmountStored() {
+        return this.totalAmountStored;
+    }
+
+	public void setTotalAmountStored(Double totalAmountStored) {
+        this.totalAmountStored = totalAmountStored;
+    }
+
+	public Unit getTotalAmountStoredUnits() {
+        return this.totalAmountStoredUnits;
+    }
+
+	public void setTotalAmountStoredUnits(Unit totalAmountStoredUnits) {
+        this.totalAmountStoredUnits = totalAmountStoredUnits;
+    }
+
+	public Set<LotAlias> getLotAliases() {
+        return this.lotAliases;
+    }
+
+	public void setLotAliases(Set<LotAlias> lotAliases) {
+        this.lotAliases = lotAliases;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "asDrawnStruct", "lotAsDrawnCdId", "buid", "corpName", "lotNumber", "lotMolWeight", "synthesisDate", "registrationDate", "registeredBy", "modifiedDate", "modifiedBy", "barcode", "color", "notebookPage", "amount", "amountUnits", "solutionAmount", "solutionAmountUnits", "supplier", "supplierID", "purity", "purityOperator", "purityMeasuredBy", "chemist", "percentEE", "comments", "isVirtual", "ignore", "physicalState", "vendor", "vendorId", "saltForm", "fileLists", "retain", "retainUnits", "retainLocation", "meltingPoint", "boilingPoint", "supplierLot", "project", "parent", "bulkLoadFile", "lambda", "absorbance", "stockSolvent", "stockLocation", "observedMassOne", "observedMassTwo", "tareWeight", "tareWeightUnits", "totalAmountStored", "totalAmountStoredUnits", "lotAliases", "storageLocation");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new Lot().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countLots() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM Lot o", Long.class).getSingleResult();
+    }
+
+	public static List<Lot> findAllLots(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM Lot o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, Lot.class).getResultList();
+    }
+
+	public static List<Lot> findLotEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM Lot o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, Lot.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            Lot attached = Lot.findLot(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public Lot merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        Lot merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public static Long countFindLotsByBuid(Long buid) {
+        if (buid == null) throw new IllegalArgumentException("The buid argument is required");
+        EntityManager em = Lot.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.buid = :buid", Long.class);
+        q.setParameter("buid", buid);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLotsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile) {
+        if (bulkLoadFile == null) throw new IllegalArgumentException("The bulkLoadFile argument is required");
+        EntityManager em = Lot.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.bulkLoadFile = :bulkLoadFile", Long.class);
+        q.setParameter("bulkLoadFile", bulkLoadFile);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLotsByChemistAndSynthesisDateBetween(String chemist, Date minSynthesisDate, Date maxSynthesisDate) {
+        if (chemist == null || chemist.length() == 0) throw new IllegalArgumentException("The chemist argument is required");
+        if (minSynthesisDate == null) throw new IllegalArgumentException("The minSynthesisDate argument is required");
+        if (maxSynthesisDate == null) throw new IllegalArgumentException("The maxSynthesisDate argument is required");
+        EntityManager em = Lot.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.chemist = :chemist AND o.synthesisDate BETWEEN :minSynthesisDate AND :maxSynthesisDate", Long.class);
+        q.setParameter("chemist", chemist);
+        q.setParameter("minSynthesisDate", minSynthesisDate);
+        q.setParameter("maxSynthesisDate", maxSynthesisDate);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLotsByCorpNameEquals(String corpName) {
+        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+        EntityManager em = Lot.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.corpName = :corpName", Long.class);
+        q.setParameter("corpName", corpName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLotsByCorpNameLike(String corpName) {
+        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+        corpName = corpName.replace('*', '%');
+        if (corpName.charAt(0) != '%') {
+            corpName = "%" + corpName;
+        }
+        if (corpName.charAt(corpName.length() - 1) != '%') {
+            corpName = corpName + "%";
+        }
+        EntityManager em = Lot.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)", Long.class);
+        q.setParameter("corpName", corpName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLotsByIsVirtualNot(Boolean isVirtual) {
+        if (isVirtual == null) throw new IllegalArgumentException("The isVirtual argument is required");
+        EntityManager em = Lot.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.isVirtual IS NOT :isVirtual", Long.class);
+        q.setParameter("isVirtual", isVirtual);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLotsByNotebookPageEquals(String notebookPage) {
+        if (notebookPage == null || notebookPage.length() == 0) throw new IllegalArgumentException("The notebookPage argument is required");
+        EntityManager em = Lot.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.notebookPage = :notebookPage", Long.class);
+        q.setParameter("notebookPage", notebookPage);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLotsByNotebookPageEqualsAndIgnoreNot(String notebookPage, Boolean ignore) {
+        if (notebookPage == null || notebookPage.length() == 0) throw new IllegalArgumentException("The notebookPage argument is required");
+        if (ignore == null) throw new IllegalArgumentException("The ignore argument is required");
+        EntityManager em = Lot.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.notebookPage = :notebookPage  AND o.ignore IS NOT :ignore", Long.class);
+        q.setParameter("notebookPage", notebookPage);
+        q.setParameter("ignore", ignore);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLotsBySaltForm(SaltForm saltForm) {
+        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
+        EntityManager em = Lot.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.saltForm = :saltForm", Long.class);
+        q.setParameter("saltForm", saltForm);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLotsBySynthesisDateBetween(Date minSynthesisDate, Date maxSynthesisDate) {
+        if (minSynthesisDate == null) throw new IllegalArgumentException("The minSynthesisDate argument is required");
+        if (maxSynthesisDate == null) throw new IllegalArgumentException("The maxSynthesisDate argument is required");
+        EntityManager em = Lot.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.synthesisDate BETWEEN :minSynthesisDate AND :maxSynthesisDate", Long.class);
+        q.setParameter("minSynthesisDate", minSynthesisDate);
+        q.setParameter("maxSynthesisDate", maxSynthesisDate);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLotsBySynthesisDateGreaterThan(Date synthesisDate) {
+        if (synthesisDate == null) throw new IllegalArgumentException("The synthesisDate argument is required");
+        EntityManager em = Lot.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.synthesisDate > :synthesisDate", Long.class);
+        q.setParameter("synthesisDate", synthesisDate);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLotsBySynthesisDateLessThan(Date synthesisDate) {
+        if (synthesisDate == null) throw new IllegalArgumentException("The synthesisDate argument is required");
+        EntityManager em = Lot.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.synthesisDate < :synthesisDate", Long.class);
+        q.setParameter("synthesisDate", synthesisDate);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<Lot> findLotsByBuid(Long buid) {
+        if (buid == null) throw new IllegalArgumentException("The buid argument is required");
+        EntityManager em = Lot.entityManager();
+        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.buid = :buid", Lot.class);
+        q.setParameter("buid", buid);
+        return q;
+    }
+
+	public static TypedQuery<Lot> findLotsByBuid(Long buid, String sortFieldName, String sortOrder) {
+        if (buid == null) throw new IllegalArgumentException("The buid argument is required");
+        EntityManager em = Lot.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.buid = :buid");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Lot> q = em.createQuery(queryBuilder.toString(), Lot.class);
+        q.setParameter("buid", buid);
+        return q;
+    }
+
+	public static TypedQuery<Lot> findLotsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile) {
+        if (bulkLoadFile == null) throw new IllegalArgumentException("The bulkLoadFile argument is required");
+        EntityManager em = Lot.entityManager();
+        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.bulkLoadFile = :bulkLoadFile", Lot.class);
+        q.setParameter("bulkLoadFile", bulkLoadFile);
+        return q;
+    }
+
+	public static TypedQuery<Lot> findLotsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile, String sortFieldName, String sortOrder) {
+        if (bulkLoadFile == null) throw new IllegalArgumentException("The bulkLoadFile argument is required");
+        EntityManager em = Lot.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.bulkLoadFile = :bulkLoadFile");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Lot> q = em.createQuery(queryBuilder.toString(), Lot.class);
+        q.setParameter("bulkLoadFile", bulkLoadFile);
+        return q;
+    }
+
+	public static TypedQuery<Lot> findLotsByChemistAndSynthesisDateBetween(String chemist, Date minSynthesisDate, Date maxSynthesisDate) {
+        if (chemist == null || chemist.length() == 0) throw new IllegalArgumentException("The chemist argument is required");
+        if (minSynthesisDate == null) throw new IllegalArgumentException("The minSynthesisDate argument is required");
+        if (maxSynthesisDate == null) throw new IllegalArgumentException("The maxSynthesisDate argument is required");
+        EntityManager em = Lot.entityManager();
+        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.chemist = :chemist AND o.synthesisDate BETWEEN :minSynthesisDate AND :maxSynthesisDate", Lot.class);
+        q.setParameter("chemist", chemist);
+        q.setParameter("minSynthesisDate", minSynthesisDate);
+        q.setParameter("maxSynthesisDate", maxSynthesisDate);
+        return q;
+    }
+
+	public static TypedQuery<Lot> findLotsByChemistAndSynthesisDateBetween(String chemist, Date minSynthesisDate, Date maxSynthesisDate, String sortFieldName, String sortOrder) {
+        if (chemist == null || chemist.length() == 0) throw new IllegalArgumentException("The chemist argument is required");
+        if (minSynthesisDate == null) throw new IllegalArgumentException("The minSynthesisDate argument is required");
+        if (maxSynthesisDate == null) throw new IllegalArgumentException("The maxSynthesisDate argument is required");
+        EntityManager em = Lot.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.chemist = :chemist AND o.synthesisDate BETWEEN :minSynthesisDate AND :maxSynthesisDate");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Lot> q = em.createQuery(queryBuilder.toString(), Lot.class);
+        q.setParameter("chemist", chemist);
+        q.setParameter("minSynthesisDate", minSynthesisDate);
+        q.setParameter("maxSynthesisDate", maxSynthesisDate);
+        return q;
+    }
+
+	public static TypedQuery<Lot> findLotsByCorpNameEquals(String corpName) {
+        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+        EntityManager em = Lot.entityManager();
+        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.corpName = :corpName", Lot.class);
+        q.setParameter("corpName", corpName);
+        return q;
+    }
+
+	public static TypedQuery<Lot> findLotsByCorpNameEquals(String corpName, String sortFieldName, String sortOrder) {
+        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+        EntityManager em = Lot.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.corpName = :corpName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Lot> q = em.createQuery(queryBuilder.toString(), Lot.class);
+        q.setParameter("corpName", corpName);
+        return q;
+    }
+
+	public static TypedQuery<Lot> findLotsByCorpNameLike(String corpName) {
+        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+        corpName = corpName.replace('*', '%');
+        if (corpName.charAt(0) != '%') {
+            corpName = "%" + corpName;
+        }
+        if (corpName.charAt(corpName.length() - 1) != '%') {
+            corpName = corpName + "%";
+        }
+        EntityManager em = Lot.entityManager();
+        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)", Lot.class);
+        q.setParameter("corpName", corpName);
+        return q;
+    }
+
+	public static TypedQuery<Lot> findLotsByCorpNameLike(String corpName, String sortFieldName, String sortOrder) {
+        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+        corpName = corpName.replace('*', '%');
+        if (corpName.charAt(0) != '%') {
+            corpName = "%" + corpName;
+        }
+        if (corpName.charAt(corpName.length() - 1) != '%') {
+            corpName = corpName + "%";
+        }
+        EntityManager em = Lot.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Lot> q = em.createQuery(queryBuilder.toString(), Lot.class);
+        q.setParameter("corpName", corpName);
+        return q;
+    }
+
+	public static TypedQuery<Lot> findLotsByIsVirtualNot(Boolean isVirtual) {
+        if (isVirtual == null) throw new IllegalArgumentException("The isVirtual argument is required");
+        EntityManager em = Lot.entityManager();
+        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.isVirtual IS NOT :isVirtual", Lot.class);
+        q.setParameter("isVirtual", isVirtual);
+        return q;
+    }
+
+	public static TypedQuery<Lot> findLotsByIsVirtualNot(Boolean isVirtual, String sortFieldName, String sortOrder) {
+        if (isVirtual == null) throw new IllegalArgumentException("The isVirtual argument is required");
+        EntityManager em = Lot.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.isVirtual IS NOT :isVirtual");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Lot> q = em.createQuery(queryBuilder.toString(), Lot.class);
+        q.setParameter("isVirtual", isVirtual);
+        return q;
+    }
+
+	public static TypedQuery<Lot> findLotsByNotebookPageEquals(String notebookPage, String sortFieldName, String sortOrder) {
+        if (notebookPage == null || notebookPage.length() == 0) throw new IllegalArgumentException("The notebookPage argument is required");
+        EntityManager em = Lot.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.notebookPage = :notebookPage");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Lot> q = em.createQuery(queryBuilder.toString(), Lot.class);
+        q.setParameter("notebookPage", notebookPage);
+        return q;
+    }
+
+	public static TypedQuery<Lot> findLotsByNotebookPageEqualsAndIgnoreNot(String notebookPage, Boolean ignore) {
+        if (notebookPage == null || notebookPage.length() == 0) throw new IllegalArgumentException("The notebookPage argument is required");
+        if (ignore == null) throw new IllegalArgumentException("The ignore argument is required");
+        EntityManager em = Lot.entityManager();
+        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.notebookPage = :notebookPage  AND o.ignore IS NOT :ignore", Lot.class);
+        q.setParameter("notebookPage", notebookPage);
+        q.setParameter("ignore", ignore);
+        return q;
+    }
+
+	public static TypedQuery<Lot> findLotsByNotebookPageEqualsAndIgnoreNot(String notebookPage, Boolean ignore, String sortFieldName, String sortOrder) {
+        if (notebookPage == null || notebookPage.length() == 0) throw new IllegalArgumentException("The notebookPage argument is required");
+        if (ignore == null) throw new IllegalArgumentException("The ignore argument is required");
+        EntityManager em = Lot.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.notebookPage = :notebookPage  AND o.ignore IS NOT :ignore");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Lot> q = em.createQuery(queryBuilder.toString(), Lot.class);
+        q.setParameter("notebookPage", notebookPage);
+        q.setParameter("ignore", ignore);
+        return q;
+    }
+
+	public static TypedQuery<Lot> findLotsBySaltForm(SaltForm saltForm, String sortFieldName, String sortOrder) {
+        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
+        EntityManager em = Lot.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.saltForm = :saltForm");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Lot> q = em.createQuery(queryBuilder.toString(), Lot.class);
+        q.setParameter("saltForm", saltForm);
+        return q;
+    }
+
+	public static TypedQuery<Lot> findLotsBySynthesisDateBetween(Date minSynthesisDate, Date maxSynthesisDate) {
+        if (minSynthesisDate == null) throw new IllegalArgumentException("The minSynthesisDate argument is required");
+        if (maxSynthesisDate == null) throw new IllegalArgumentException("The maxSynthesisDate argument is required");
+        EntityManager em = Lot.entityManager();
+        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.synthesisDate BETWEEN :minSynthesisDate AND :maxSynthesisDate", Lot.class);
+        q.setParameter("minSynthesisDate", minSynthesisDate);
+        q.setParameter("maxSynthesisDate", maxSynthesisDate);
+        return q;
+    }
+
+	public static TypedQuery<Lot> findLotsBySynthesisDateBetween(Date minSynthesisDate, Date maxSynthesisDate, String sortFieldName, String sortOrder) {
+        if (minSynthesisDate == null) throw new IllegalArgumentException("The minSynthesisDate argument is required");
+        if (maxSynthesisDate == null) throw new IllegalArgumentException("The maxSynthesisDate argument is required");
+        EntityManager em = Lot.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.synthesisDate BETWEEN :minSynthesisDate AND :maxSynthesisDate");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Lot> q = em.createQuery(queryBuilder.toString(), Lot.class);
+        q.setParameter("minSynthesisDate", minSynthesisDate);
+        q.setParameter("maxSynthesisDate", maxSynthesisDate);
+        return q;
+    }
+
+	public static TypedQuery<Lot> findLotsBySynthesisDateGreaterThan(Date synthesisDate) {
+        if (synthesisDate == null) throw new IllegalArgumentException("The synthesisDate argument is required");
+        EntityManager em = Lot.entityManager();
+        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.synthesisDate > :synthesisDate", Lot.class);
+        q.setParameter("synthesisDate", synthesisDate);
+        return q;
+    }
+
+	public static TypedQuery<Lot> findLotsBySynthesisDateGreaterThan(Date synthesisDate, String sortFieldName, String sortOrder) {
+        if (synthesisDate == null) throw new IllegalArgumentException("The synthesisDate argument is required");
+        EntityManager em = Lot.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.synthesisDate > :synthesisDate");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Lot> q = em.createQuery(queryBuilder.toString(), Lot.class);
+        q.setParameter("synthesisDate", synthesisDate);
+        return q;
+    }
+
+	public static TypedQuery<Lot> findLotsBySynthesisDateLessThan(Date synthesisDate) {
+        if (synthesisDate == null) throw new IllegalArgumentException("The synthesisDate argument is required");
+        EntityManager em = Lot.entityManager();
+        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.synthesisDate < :synthesisDate", Lot.class);
+        q.setParameter("synthesisDate", synthesisDate);
+        return q;
+    }
+
+	public static TypedQuery<Lot> findLotsBySynthesisDateLessThan(Date synthesisDate, String sortFieldName, String sortOrder) {
+        if (synthesisDate == null) throw new IllegalArgumentException("The synthesisDate argument is required");
+        EntityManager em = Lot.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.synthesisDate < :synthesisDate");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Lot> q = em.createQuery(queryBuilder.toString(), Lot.class);
+        q.setParameter("synthesisDate", synthesisDate);
+        return q;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static Lot fromJsonToLot(String json) {
+        return new JSONDeserializer<Lot>()
+        .use(null, Lot.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<Lot> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<Lot> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<Lot> fromJsonArrayToLots(String json) {
+        return new JSONDeserializer<List<Lot>>()
+        .use("values", Lot.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAlias.java b/src/main/java/com/labsynch/labseer/domain/LotAlias.java
index 83a2604a0..34068fd72 100644
--- a/src/main/java/com/labsynch/labseer/domain/LotAlias.java
+++ b/src/main/java/com/labsynch/labseer/domain/LotAlias.java
@@ -1,18 +1,35 @@
 package com.labsynch.labseer.domain;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+import javax.persistence.Version;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
-
+import org.springframework.transaction.annotation.Transactional;
 import com.labsynch.labseer.dto.LotAliasDTO;
 import com.labsynch.labseer.exceptions.LotNotFoundException;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -64,4 +81,323 @@ public LotAlias(LotAliasDTO lotAliasDTO) throws LotNotFoundException{
 		this.aliasName = lotAliasDTO.getAliasName();
 		this.preferred = lotAliasDTO.isPreferred();
 	}
+
+	public Lot getLot() {
+        return this.lot;
+    }
+
+	public void setLot(Lot lot) {
+        this.lot = lot;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getAliasName() {
+        return this.aliasName;
+    }
+
+	public void setAliasName(String aliasName) {
+        this.aliasName = aliasName;
+    }
+
+	public boolean isPreferred() {
+        return this.preferred;
+    }
+
+	public void setPreferred(boolean preferred) {
+        this.preferred = preferred;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public boolean isDeleted() {
+        return this.deleted;
+    }
+
+	public void setDeleted(boolean deleted) {
+        this.deleted = deleted;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static LotAlias fromJsonToLotAlias(String json) {
+        return new JSONDeserializer<LotAlias>()
+        .use(null, LotAlias.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<LotAlias> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<LotAlias> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<LotAlias> fromJsonArrayToLotAliases(String json) {
+        return new JSONDeserializer<List<LotAlias>>()
+        .use("values", LotAlias.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lot", "lsType", "lsKind", "aliasName", "preferred", "ignored", "deleted");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new LotAlias().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countLotAliases() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM LotAlias o", Long.class).getSingleResult();
+    }
+
+	public static List<LotAlias> findAllLotAliases() {
+        return entityManager().createQuery("SELECT o FROM LotAlias o", LotAlias.class).getResultList();
+    }
+
+	public static List<LotAlias> findAllLotAliases(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LotAlias o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LotAlias.class).getResultList();
+    }
+
+	public static LotAlias findLotAlias(Long id) {
+        if (id == null) return null;
+        return entityManager().find(LotAlias.class, id);
+    }
+
+	public static List<LotAlias> findLotAliasEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LotAlias o", LotAlias.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<LotAlias> findLotAliasEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LotAlias o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LotAlias.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            LotAlias attached = LotAlias.findLotAlias(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public LotAlias merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        LotAlias merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public static Long countFindLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName, String lsType, String lsKind) {
+        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = LotAlias.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LotAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        q.setParameter("aliasName", aliasName);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLotAliasesByLot(Lot lot) {
+        if (lot == null) throw new IllegalArgumentException("The lot argument is required");
+        EntityManager em = LotAlias.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LotAlias AS o WHERE o.lot = :lot", Long.class);
+        q.setParameter("lot", lot);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLotAliasesByLotAndLsTypeEqualsAndLsKindEquals(Lot lot, String lsType, String lsKind) {
+        if (lot == null) throw new IllegalArgumentException("The lot argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = LotAlias.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LotAlias AS o WHERE o.lot = :lot AND o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        q.setParameter("lot", lot);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<LotAlias> findLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName, String lsType, String lsKind) {
+        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = LotAlias.entityManager();
+        TypedQuery<LotAlias> q = em.createQuery("SELECT o FROM LotAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind", LotAlias.class);
+        q.setParameter("aliasName", aliasName);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<LotAlias> findLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName, String lsType, String lsKind, String sortFieldName, String sortOrder) {
+        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = LotAlias.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LotAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LotAlias> q = em.createQuery(queryBuilder.toString(), LotAlias.class);
+        q.setParameter("aliasName", aliasName);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<LotAlias> findLotAliasesByLot(Lot lot) {
+        if (lot == null) throw new IllegalArgumentException("The lot argument is required");
+        EntityManager em = LotAlias.entityManager();
+        TypedQuery<LotAlias> q = em.createQuery("SELECT o FROM LotAlias AS o WHERE o.lot = :lot", LotAlias.class);
+        q.setParameter("lot", lot);
+        return q;
+    }
+
+	public static TypedQuery<LotAlias> findLotAliasesByLot(Lot lot, String sortFieldName, String sortOrder) {
+        if (lot == null) throw new IllegalArgumentException("The lot argument is required");
+        EntityManager em = LotAlias.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LotAlias AS o WHERE o.lot = :lot");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LotAlias> q = em.createQuery(queryBuilder.toString(), LotAlias.class);
+        q.setParameter("lot", lot);
+        return q;
+    }
+
+	public static TypedQuery<LotAlias> findLotAliasesByLotAndLsTypeEqualsAndLsKindEquals(Lot lot, String lsType, String lsKind) {
+        if (lot == null) throw new IllegalArgumentException("The lot argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = LotAlias.entityManager();
+        TypedQuery<LotAlias> q = em.createQuery("SELECT o FROM LotAlias AS o WHERE o.lot = :lot AND o.lsType = :lsType  AND o.lsKind = :lsKind", LotAlias.class);
+        q.setParameter("lot", lot);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<LotAlias> findLotAliasesByLotAndLsTypeEqualsAndLsKindEquals(Lot lot, String lsType, String lsKind, String sortFieldName, String sortOrder) {
+        if (lot == null) throw new IllegalArgumentException("The lot argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = LotAlias.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LotAlias AS o WHERE o.lot = :lot AND o.lsType = :lsType  AND o.lsKind = :lsKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LotAlias> q = em.createQuery(queryBuilder.toString(), LotAlias.class);
+        q.setParameter("lot", lot);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAliasKind.java b/src/main/java/com/labsynch/labseer/domain/LotAliasKind.java
index 9164d1ae3..dc4d0949b 100644
--- a/src/main/java/com/labsynch/labseer/domain/LotAliasKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/LotAliasKind.java
@@ -1,15 +1,32 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -25,4 +42,166 @@ public class LotAliasKind {
     private String kindName;
  
     
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new LotAliasKind().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countLotAliasKinds() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM LotAliasKind o", Long.class).getSingleResult();
+    }
+
+	public static List<LotAliasKind> findAllLotAliasKinds() {
+        return entityManager().createQuery("SELECT o FROM LotAliasKind o", LotAliasKind.class).getResultList();
+    }
+
+	public static List<LotAliasKind> findAllLotAliasKinds(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LotAliasKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LotAliasKind.class).getResultList();
+    }
+
+	public static LotAliasKind findLotAliasKind(Long id) {
+        if (id == null) return null;
+        return entityManager().find(LotAliasKind.class, id);
+    }
+
+	public static List<LotAliasKind> findLotAliasKindEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LotAliasKind o", LotAliasKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<LotAliasKind> findLotAliasKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LotAliasKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LotAliasKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            LotAliasKind attached = LotAliasKind.findLotAliasKind(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public LotAliasKind merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        LotAliasKind merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public LotAliasType getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(LotAliasType lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getKindName() {
+        return this.kindName;
+    }
+
+	public void setKindName(String kindName) {
+        this.kindName = kindName;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static LotAliasKind fromJsonToLotAliasKind(String json) {
+        return new JSONDeserializer<LotAliasKind>()
+        .use(null, LotAliasKind.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<LotAliasKind> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<LotAliasKind> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<LotAliasKind> fromJsonArrayToLotAliasKinds(String json) {
+        return new JSONDeserializer<List<LotAliasKind>>()
+        .use("values", LotAliasKind.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAliasKind_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/LotAliasKind_Roo_Configurable.aj
deleted file mode 100644
index 4a5a34a16..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LotAliasKind_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LotAliasKind;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LotAliasKind_Roo_Configurable {
-    
-    declare @type: LotAliasKind: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAliasKind_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/LotAliasKind_Roo_JavaBean.aj
deleted file mode 100644
index 3f2792d46..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LotAliasKind_Roo_JavaBean.aj
+++ /dev/null
@@ -1,27 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LotAliasKind;
-import com.labsynch.labseer.domain.LotAliasType;
-
-privileged aspect LotAliasKind_Roo_JavaBean {
-    
-    public LotAliasType LotAliasKind.getLsType() {
-        return this.lsType;
-    }
-    
-    public void LotAliasKind.setLsType(LotAliasType lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String LotAliasKind.getKindName() {
-        return this.kindName;
-    }
-    
-    public void LotAliasKind.setKindName(String kindName) {
-        this.kindName = kindName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAliasKind_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/LotAliasKind_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index ba578397d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LotAliasKind_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LotAliasKind;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LotAliasKind_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager LotAliasKind.entityManager;
-    
-    public static final List<String> LotAliasKind.fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName");
-    
-    public static final EntityManager LotAliasKind.entityManager() {
-        EntityManager em = new LotAliasKind().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long LotAliasKind.countLotAliasKinds() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LotAliasKind o", Long.class).getSingleResult();
-    }
-    
-    public static List<LotAliasKind> LotAliasKind.findAllLotAliasKinds() {
-        return entityManager().createQuery("SELECT o FROM LotAliasKind o", LotAliasKind.class).getResultList();
-    }
-    
-    public static List<LotAliasKind> LotAliasKind.findAllLotAliasKinds(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LotAliasKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LotAliasKind.class).getResultList();
-    }
-    
-    public static LotAliasKind LotAliasKind.findLotAliasKind(Long id) {
-        if (id == null) return null;
-        return entityManager().find(LotAliasKind.class, id);
-    }
-    
-    public static List<LotAliasKind> LotAliasKind.findLotAliasKindEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LotAliasKind o", LotAliasKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<LotAliasKind> LotAliasKind.findLotAliasKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LotAliasKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LotAliasKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void LotAliasKind.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void LotAliasKind.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            LotAliasKind attached = LotAliasKind.findLotAliasKind(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void LotAliasKind.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void LotAliasKind.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public LotAliasKind LotAliasKind.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        LotAliasKind merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAliasKind_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/LotAliasKind_Roo_Jpa_Entity.aj
deleted file mode 100644
index 3763ec00f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LotAliasKind_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LotAliasKind;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect LotAliasKind_Roo_Jpa_Entity {
-    
-    declare @type: LotAliasKind: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long LotAliasKind.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer LotAliasKind.version;
-    
-    public Long LotAliasKind.getId() {
-        return this.id;
-    }
-    
-    public void LotAliasKind.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer LotAliasKind.getVersion() {
-        return this.version;
-    }
-    
-    public void LotAliasKind.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAliasKind_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/LotAliasKind_Roo_Json.aj
deleted file mode 100644
index 8b3e29bb9..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LotAliasKind_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LotAliasKind;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect LotAliasKind_Roo_Json {
-    
-    public String LotAliasKind.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String LotAliasKind.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static LotAliasKind LotAliasKind.fromJsonToLotAliasKind(String json) {
-        return new JSONDeserializer<LotAliasKind>()
-        .use(null, LotAliasKind.class).deserialize(json);
-    }
-    
-    public static String LotAliasKind.toJsonArray(Collection<LotAliasKind> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String LotAliasKind.toJsonArray(Collection<LotAliasKind> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<LotAliasKind> LotAliasKind.fromJsonArrayToLotAliasKinds(String json) {
-        return new JSONDeserializer<List<LotAliasKind>>()
-        .use("values", LotAliasKind.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAliasKind_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/LotAliasKind_Roo_ToString.aj
deleted file mode 100644
index e7ddd2394..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LotAliasKind_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LotAliasKind;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect LotAliasKind_Roo_ToString {
-    
-    public String LotAliasKind.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAliasType.java b/src/main/java/com/labsynch/labseer/domain/LotAliasType.java
index 4415340f0..486561fcc 100644
--- a/src/main/java/com/labsynch/labseer/domain/LotAliasType.java
+++ b/src/main/java/com/labsynch/labseer/domain/LotAliasType.java
@@ -1,12 +1,29 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Version;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -16,4 +33,158 @@ public class LotAliasType {
     @Size(max = 255)
     private String typeName;
         
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static LotAliasType fromJsonToLotAliasType(String json) {
+        return new JSONDeserializer<LotAliasType>()
+        .use(null, LotAliasType.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<LotAliasType> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<LotAliasType> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<LotAliasType> fromJsonArrayToLotAliasTypes(String json) {
+        return new JSONDeserializer<List<LotAliasType>>()
+        .use("values", LotAliasType.class).deserialize(json);
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new LotAliasType().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countLotAliasTypes() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM LotAliasType o", Long.class).getSingleResult();
+    }
+
+	public static List<LotAliasType> findAllLotAliasTypes() {
+        return entityManager().createQuery("SELECT o FROM LotAliasType o", LotAliasType.class).getResultList();
+    }
+
+	public static List<LotAliasType> findAllLotAliasTypes(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LotAliasType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LotAliasType.class).getResultList();
+    }
+
+	public static LotAliasType findLotAliasType(Long id) {
+        if (id == null) return null;
+        return entityManager().find(LotAliasType.class, id);
+    }
+
+	public static List<LotAliasType> findLotAliasTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LotAliasType o", LotAliasType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<LotAliasType> findLotAliasTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LotAliasType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LotAliasType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            LotAliasType attached = LotAliasType.findLotAliasType(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public LotAliasType merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        LotAliasType merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String getTypeName() {
+        return this.typeName;
+    }
+
+	public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAliasType_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/LotAliasType_Roo_Configurable.aj
deleted file mode 100644
index b88ca0166..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LotAliasType_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LotAliasType;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LotAliasType_Roo_Configurable {
-    
-    declare @type: LotAliasType: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAliasType_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/LotAliasType_Roo_JavaBean.aj
deleted file mode 100644
index bcfa4ba41..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LotAliasType_Roo_JavaBean.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LotAliasType;
-
-privileged aspect LotAliasType_Roo_JavaBean {
-    
-    public String LotAliasType.getTypeName() {
-        return this.typeName;
-    }
-    
-    public void LotAliasType.setTypeName(String typeName) {
-        this.typeName = typeName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAliasType_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/LotAliasType_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 7b30d72f4..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LotAliasType_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LotAliasType;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LotAliasType_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager LotAliasType.entityManager;
-    
-    public static final List<String> LotAliasType.fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName");
-    
-    public static final EntityManager LotAliasType.entityManager() {
-        EntityManager em = new LotAliasType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long LotAliasType.countLotAliasTypes() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LotAliasType o", Long.class).getSingleResult();
-    }
-    
-    public static List<LotAliasType> LotAliasType.findAllLotAliasTypes() {
-        return entityManager().createQuery("SELECT o FROM LotAliasType o", LotAliasType.class).getResultList();
-    }
-    
-    public static List<LotAliasType> LotAliasType.findAllLotAliasTypes(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LotAliasType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LotAliasType.class).getResultList();
-    }
-    
-    public static LotAliasType LotAliasType.findLotAliasType(Long id) {
-        if (id == null) return null;
-        return entityManager().find(LotAliasType.class, id);
-    }
-    
-    public static List<LotAliasType> LotAliasType.findLotAliasTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LotAliasType o", LotAliasType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<LotAliasType> LotAliasType.findLotAliasTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LotAliasType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LotAliasType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void LotAliasType.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void LotAliasType.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            LotAliasType attached = LotAliasType.findLotAliasType(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void LotAliasType.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void LotAliasType.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public LotAliasType LotAliasType.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        LotAliasType merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAliasType_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/LotAliasType_Roo_Jpa_Entity.aj
deleted file mode 100644
index 77bba6c40..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LotAliasType_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LotAliasType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect LotAliasType_Roo_Jpa_Entity {
-    
-    declare @type: LotAliasType: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long LotAliasType.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer LotAliasType.version;
-    
-    public Long LotAliasType.getId() {
-        return this.id;
-    }
-    
-    public void LotAliasType.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer LotAliasType.getVersion() {
-        return this.version;
-    }
-    
-    public void LotAliasType.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAliasType_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/LotAliasType_Roo_Json.aj
deleted file mode 100644
index f8d884da9..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LotAliasType_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LotAliasType;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect LotAliasType_Roo_Json {
-    
-    public String LotAliasType.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String LotAliasType.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static LotAliasType LotAliasType.fromJsonToLotAliasType(String json) {
-        return new JSONDeserializer<LotAliasType>()
-        .use(null, LotAliasType.class).deserialize(json);
-    }
-    
-    public static String LotAliasType.toJsonArray(Collection<LotAliasType> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String LotAliasType.toJsonArray(Collection<LotAliasType> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<LotAliasType> LotAliasType.fromJsonArrayToLotAliasTypes(String json) {
-        return new JSONDeserializer<List<LotAliasType>>()
-        .use("values", LotAliasType.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAliasType_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/LotAliasType_Roo_ToString.aj
deleted file mode 100644
index 35f234f54..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LotAliasType_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LotAliasType;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect LotAliasType_Roo_ToString {
-    
-    public String LotAliasType.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAlias_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/LotAlias_Roo_Configurable.aj
deleted file mode 100644
index 11195d473..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LotAlias_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LotAlias;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LotAlias_Roo_Configurable {
-    
-    declare @type: LotAlias: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAlias_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/LotAlias_Roo_Finder.aj
deleted file mode 100644
index 80ab96275..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LotAlias_Roo_Finder.aj
+++ /dev/null
@@ -1,130 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.domain.LotAlias;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect LotAlias_Roo_Finder {
-    
-    public static Long LotAlias.countFindLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName, String lsType, String lsKind) {
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = LotAlias.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LotAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
-        q.setParameter("aliasName", aliasName);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LotAlias.countFindLotAliasesByLot(Lot lot) {
-        if (lot == null) throw new IllegalArgumentException("The lot argument is required");
-        EntityManager em = LotAlias.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LotAlias AS o WHERE o.lot = :lot", Long.class);
-        q.setParameter("lot", lot);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LotAlias.countFindLotAliasesByLotAndLsTypeEqualsAndLsKindEquals(Lot lot, String lsType, String lsKind) {
-        if (lot == null) throw new IllegalArgumentException("The lot argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = LotAlias.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LotAlias AS o WHERE o.lot = :lot AND o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
-        q.setParameter("lot", lot);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<LotAlias> LotAlias.findLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName, String lsType, String lsKind) {
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = LotAlias.entityManager();
-        TypedQuery<LotAlias> q = em.createQuery("SELECT o FROM LotAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind", LotAlias.class);
-        q.setParameter("aliasName", aliasName);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<LotAlias> LotAlias.findLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName, String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = LotAlias.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LotAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LotAlias> q = em.createQuery(queryBuilder.toString(), LotAlias.class);
-        q.setParameter("aliasName", aliasName);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<LotAlias> LotAlias.findLotAliasesByLot(Lot lot) {
-        if (lot == null) throw new IllegalArgumentException("The lot argument is required");
-        EntityManager em = LotAlias.entityManager();
-        TypedQuery<LotAlias> q = em.createQuery("SELECT o FROM LotAlias AS o WHERE o.lot = :lot", LotAlias.class);
-        q.setParameter("lot", lot);
-        return q;
-    }
-    
-    public static TypedQuery<LotAlias> LotAlias.findLotAliasesByLot(Lot lot, String sortFieldName, String sortOrder) {
-        if (lot == null) throw new IllegalArgumentException("The lot argument is required");
-        EntityManager em = LotAlias.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LotAlias AS o WHERE o.lot = :lot");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LotAlias> q = em.createQuery(queryBuilder.toString(), LotAlias.class);
-        q.setParameter("lot", lot);
-        return q;
-    }
-    
-    public static TypedQuery<LotAlias> LotAlias.findLotAliasesByLotAndLsTypeEqualsAndLsKindEquals(Lot lot, String lsType, String lsKind) {
-        if (lot == null) throw new IllegalArgumentException("The lot argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = LotAlias.entityManager();
-        TypedQuery<LotAlias> q = em.createQuery("SELECT o FROM LotAlias AS o WHERE o.lot = :lot AND o.lsType = :lsType  AND o.lsKind = :lsKind", LotAlias.class);
-        q.setParameter("lot", lot);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<LotAlias> LotAlias.findLotAliasesByLotAndLsTypeEqualsAndLsKindEquals(Lot lot, String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (lot == null) throw new IllegalArgumentException("The lot argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = LotAlias.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LotAlias AS o WHERE o.lot = :lot AND o.lsType = :lsType  AND o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LotAlias> q = em.createQuery(queryBuilder.toString(), LotAlias.class);
-        q.setParameter("lot", lot);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAlias_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/LotAlias_Roo_JavaBean.aj
deleted file mode 100644
index ba4ce8313..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LotAlias_Roo_JavaBean.aj
+++ /dev/null
@@ -1,67 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.domain.LotAlias;
-
-privileged aspect LotAlias_Roo_JavaBean {
-    
-    public Lot LotAlias.getLot() {
-        return this.lot;
-    }
-    
-    public void LotAlias.setLot(Lot lot) {
-        this.lot = lot;
-    }
-    
-    public String LotAlias.getLsType() {
-        return this.lsType;
-    }
-    
-    public void LotAlias.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String LotAlias.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void LotAlias.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String LotAlias.getAliasName() {
-        return this.aliasName;
-    }
-    
-    public void LotAlias.setAliasName(String aliasName) {
-        this.aliasName = aliasName;
-    }
-    
-    public boolean LotAlias.isPreferred() {
-        return this.preferred;
-    }
-    
-    public void LotAlias.setPreferred(boolean preferred) {
-        this.preferred = preferred;
-    }
-    
-    public boolean LotAlias.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void LotAlias.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public boolean LotAlias.isDeleted() {
-        return this.deleted;
-    }
-    
-    public void LotAlias.setDeleted(boolean deleted) {
-        this.deleted = deleted;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAlias_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/LotAlias_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 8d5492592..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LotAlias_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LotAlias;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LotAlias_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager LotAlias.entityManager;
-    
-    public static final List<String> LotAlias.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lot", "lsType", "lsKind", "aliasName", "preferred", "ignored", "deleted");
-    
-    public static final EntityManager LotAlias.entityManager() {
-        EntityManager em = new LotAlias().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long LotAlias.countLotAliases() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LotAlias o", Long.class).getSingleResult();
-    }
-    
-    public static List<LotAlias> LotAlias.findAllLotAliases() {
-        return entityManager().createQuery("SELECT o FROM LotAlias o", LotAlias.class).getResultList();
-    }
-    
-    public static List<LotAlias> LotAlias.findAllLotAliases(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LotAlias o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LotAlias.class).getResultList();
-    }
-    
-    public static LotAlias LotAlias.findLotAlias(Long id) {
-        if (id == null) return null;
-        return entityManager().find(LotAlias.class, id);
-    }
-    
-    public static List<LotAlias> LotAlias.findLotAliasEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LotAlias o", LotAlias.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<LotAlias> LotAlias.findLotAliasEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LotAlias o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LotAlias.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void LotAlias.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void LotAlias.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            LotAlias attached = LotAlias.findLotAlias(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void LotAlias.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void LotAlias.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public LotAlias LotAlias.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        LotAlias merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAlias_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/LotAlias_Roo_Jpa_Entity.aj
deleted file mode 100644
index 299d5dee3..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LotAlias_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LotAlias;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect LotAlias_Roo_Jpa_Entity {
-    
-    declare @type: LotAlias: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long LotAlias.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer LotAlias.version;
-    
-    public Long LotAlias.getId() {
-        return this.id;
-    }
-    
-    public void LotAlias.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer LotAlias.getVersion() {
-        return this.version;
-    }
-    
-    public void LotAlias.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAlias_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/LotAlias_Roo_Json.aj
deleted file mode 100644
index 72db5c25d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LotAlias_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LotAlias;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect LotAlias_Roo_Json {
-    
-    public String LotAlias.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String LotAlias.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static LotAlias LotAlias.fromJsonToLotAlias(String json) {
-        return new JSONDeserializer<LotAlias>()
-        .use(null, LotAlias.class).deserialize(json);
-    }
-    
-    public static String LotAlias.toJsonArray(Collection<LotAlias> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String LotAlias.toJsonArray(Collection<LotAlias> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<LotAlias> LotAlias.fromJsonArrayToLotAliases(String json) {
-        return new JSONDeserializer<List<LotAlias>>()
-        .use("values", LotAlias.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAlias_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/LotAlias_Roo_ToString.aj
deleted file mode 100644
index fb4e769cb..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LotAlias_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LotAlias;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect LotAlias_Roo_ToString {
-    
-    public String LotAlias.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Lot_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/Lot_Roo_Configurable.aj
deleted file mode 100644
index 3d7240b0d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Lot_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Lot;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect Lot_Roo_Configurable {
-    
-    declare @type: Lot: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Lot_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/Lot_Roo_Finder.aj
deleted file mode 100644
index 4a3af63aa..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Lot_Roo_Finder.aj
+++ /dev/null
@@ -1,416 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.BulkLoadFile;
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.domain.SaltForm;
-import java.util.Date;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect Lot_Roo_Finder {
-    
-    public static Long Lot.countFindLotsByBuid(Long buid) {
-        if (buid == null) throw new IllegalArgumentException("The buid argument is required");
-        EntityManager em = Lot.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.buid = :buid", Long.class);
-        q.setParameter("buid", buid);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Lot.countFindLotsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile) {
-        if (bulkLoadFile == null) throw new IllegalArgumentException("The bulkLoadFile argument is required");
-        EntityManager em = Lot.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.bulkLoadFile = :bulkLoadFile", Long.class);
-        q.setParameter("bulkLoadFile", bulkLoadFile);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Lot.countFindLotsByChemistAndSynthesisDateBetween(String chemist, Date minSynthesisDate, Date maxSynthesisDate) {
-        if (chemist == null || chemist.length() == 0) throw new IllegalArgumentException("The chemist argument is required");
-        if (minSynthesisDate == null) throw new IllegalArgumentException("The minSynthesisDate argument is required");
-        if (maxSynthesisDate == null) throw new IllegalArgumentException("The maxSynthesisDate argument is required");
-        EntityManager em = Lot.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.chemist = :chemist AND o.synthesisDate BETWEEN :minSynthesisDate AND :maxSynthesisDate", Long.class);
-        q.setParameter("chemist", chemist);
-        q.setParameter("minSynthesisDate", minSynthesisDate);
-        q.setParameter("maxSynthesisDate", maxSynthesisDate);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Lot.countFindLotsByCorpNameEquals(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        EntityManager em = Lot.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.corpName = :corpName", Long.class);
-        q.setParameter("corpName", corpName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Lot.countFindLotsByCorpNameLike(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        corpName = corpName.replace('*', '%');
-        if (corpName.charAt(0) != '%') {
-            corpName = "%" + corpName;
-        }
-        if (corpName.charAt(corpName.length() - 1) != '%') {
-            corpName = corpName + "%";
-        }
-        EntityManager em = Lot.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)", Long.class);
-        q.setParameter("corpName", corpName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Lot.countFindLotsByIsVirtualNot(Boolean isVirtual) {
-        if (isVirtual == null) throw new IllegalArgumentException("The isVirtual argument is required");
-        EntityManager em = Lot.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.isVirtual IS NOT :isVirtual", Long.class);
-        q.setParameter("isVirtual", isVirtual);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Lot.countFindLotsByNotebookPageEquals(String notebookPage) {
-        if (notebookPage == null || notebookPage.length() == 0) throw new IllegalArgumentException("The notebookPage argument is required");
-        EntityManager em = Lot.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.notebookPage = :notebookPage", Long.class);
-        q.setParameter("notebookPage", notebookPage);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Lot.countFindLotsByNotebookPageEqualsAndIgnoreNot(String notebookPage, Boolean ignore) {
-        if (notebookPage == null || notebookPage.length() == 0) throw new IllegalArgumentException("The notebookPage argument is required");
-        if (ignore == null) throw new IllegalArgumentException("The ignore argument is required");
-        EntityManager em = Lot.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.notebookPage = :notebookPage  AND o.ignore IS NOT :ignore", Long.class);
-        q.setParameter("notebookPage", notebookPage);
-        q.setParameter("ignore", ignore);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Lot.countFindLotsBySaltForm(SaltForm saltForm) {
-        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
-        EntityManager em = Lot.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.saltForm = :saltForm", Long.class);
-        q.setParameter("saltForm", saltForm);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Lot.countFindLotsBySynthesisDateBetween(Date minSynthesisDate, Date maxSynthesisDate) {
-        if (minSynthesisDate == null) throw new IllegalArgumentException("The minSynthesisDate argument is required");
-        if (maxSynthesisDate == null) throw new IllegalArgumentException("The maxSynthesisDate argument is required");
-        EntityManager em = Lot.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.synthesisDate BETWEEN :minSynthesisDate AND :maxSynthesisDate", Long.class);
-        q.setParameter("minSynthesisDate", minSynthesisDate);
-        q.setParameter("maxSynthesisDate", maxSynthesisDate);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Lot.countFindLotsBySynthesisDateGreaterThan(Date synthesisDate) {
-        if (synthesisDate == null) throw new IllegalArgumentException("The synthesisDate argument is required");
-        EntityManager em = Lot.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.synthesisDate > :synthesisDate", Long.class);
-        q.setParameter("synthesisDate", synthesisDate);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Lot.countFindLotsBySynthesisDateLessThan(Date synthesisDate) {
-        if (synthesisDate == null) throw new IllegalArgumentException("The synthesisDate argument is required");
-        EntityManager em = Lot.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.synthesisDate < :synthesisDate", Long.class);
-        q.setParameter("synthesisDate", synthesisDate);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<Lot> Lot.findLotsByBuid(Long buid) {
-        if (buid == null) throw new IllegalArgumentException("The buid argument is required");
-        EntityManager em = Lot.entityManager();
-        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.buid = :buid", Lot.class);
-        q.setParameter("buid", buid);
-        return q;
-    }
-    
-    public static TypedQuery<Lot> Lot.findLotsByBuid(Long buid, String sortFieldName, String sortOrder) {
-        if (buid == null) throw new IllegalArgumentException("The buid argument is required");
-        EntityManager em = Lot.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.buid = :buid");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Lot> q = em.createQuery(queryBuilder.toString(), Lot.class);
-        q.setParameter("buid", buid);
-        return q;
-    }
-    
-    public static TypedQuery<Lot> Lot.findLotsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile) {
-        if (bulkLoadFile == null) throw new IllegalArgumentException("The bulkLoadFile argument is required");
-        EntityManager em = Lot.entityManager();
-        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.bulkLoadFile = :bulkLoadFile", Lot.class);
-        q.setParameter("bulkLoadFile", bulkLoadFile);
-        return q;
-    }
-    
-    public static TypedQuery<Lot> Lot.findLotsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile, String sortFieldName, String sortOrder) {
-        if (bulkLoadFile == null) throw new IllegalArgumentException("The bulkLoadFile argument is required");
-        EntityManager em = Lot.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.bulkLoadFile = :bulkLoadFile");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Lot> q = em.createQuery(queryBuilder.toString(), Lot.class);
-        q.setParameter("bulkLoadFile", bulkLoadFile);
-        return q;
-    }
-    
-    public static TypedQuery<Lot> Lot.findLotsByChemistAndSynthesisDateBetween(String chemist, Date minSynthesisDate, Date maxSynthesisDate) {
-        if (chemist == null || chemist.length() == 0) throw new IllegalArgumentException("The chemist argument is required");
-        if (minSynthesisDate == null) throw new IllegalArgumentException("The minSynthesisDate argument is required");
-        if (maxSynthesisDate == null) throw new IllegalArgumentException("The maxSynthesisDate argument is required");
-        EntityManager em = Lot.entityManager();
-        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.chemist = :chemist AND o.synthesisDate BETWEEN :minSynthesisDate AND :maxSynthesisDate", Lot.class);
-        q.setParameter("chemist", chemist);
-        q.setParameter("minSynthesisDate", minSynthesisDate);
-        q.setParameter("maxSynthesisDate", maxSynthesisDate);
-        return q;
-    }
-    
-    public static TypedQuery<Lot> Lot.findLotsByChemistAndSynthesisDateBetween(String chemist, Date minSynthesisDate, Date maxSynthesisDate, String sortFieldName, String sortOrder) {
-        if (chemist == null || chemist.length() == 0) throw new IllegalArgumentException("The chemist argument is required");
-        if (minSynthesisDate == null) throw new IllegalArgumentException("The minSynthesisDate argument is required");
-        if (maxSynthesisDate == null) throw new IllegalArgumentException("The maxSynthesisDate argument is required");
-        EntityManager em = Lot.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.chemist = :chemist AND o.synthesisDate BETWEEN :minSynthesisDate AND :maxSynthesisDate");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Lot> q = em.createQuery(queryBuilder.toString(), Lot.class);
-        q.setParameter("chemist", chemist);
-        q.setParameter("minSynthesisDate", minSynthesisDate);
-        q.setParameter("maxSynthesisDate", maxSynthesisDate);
-        return q;
-    }
-    
-    public static TypedQuery<Lot> Lot.findLotsByCorpNameEquals(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        EntityManager em = Lot.entityManager();
-        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.corpName = :corpName", Lot.class);
-        q.setParameter("corpName", corpName);
-        return q;
-    }
-    
-    public static TypedQuery<Lot> Lot.findLotsByCorpNameEquals(String corpName, String sortFieldName, String sortOrder) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        EntityManager em = Lot.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.corpName = :corpName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Lot> q = em.createQuery(queryBuilder.toString(), Lot.class);
-        q.setParameter("corpName", corpName);
-        return q;
-    }
-    
-    public static TypedQuery<Lot> Lot.findLotsByCorpNameLike(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        corpName = corpName.replace('*', '%');
-        if (corpName.charAt(0) != '%') {
-            corpName = "%" + corpName;
-        }
-        if (corpName.charAt(corpName.length() - 1) != '%') {
-            corpName = corpName + "%";
-        }
-        EntityManager em = Lot.entityManager();
-        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)", Lot.class);
-        q.setParameter("corpName", corpName);
-        return q;
-    }
-    
-    public static TypedQuery<Lot> Lot.findLotsByCorpNameLike(String corpName, String sortFieldName, String sortOrder) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        corpName = corpName.replace('*', '%');
-        if (corpName.charAt(0) != '%') {
-            corpName = "%" + corpName;
-        }
-        if (corpName.charAt(corpName.length() - 1) != '%') {
-            corpName = corpName + "%";
-        }
-        EntityManager em = Lot.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Lot> q = em.createQuery(queryBuilder.toString(), Lot.class);
-        q.setParameter("corpName", corpName);
-        return q;
-    }
-    
-    public static TypedQuery<Lot> Lot.findLotsByIsVirtualNot(Boolean isVirtual) {
-        if (isVirtual == null) throw new IllegalArgumentException("The isVirtual argument is required");
-        EntityManager em = Lot.entityManager();
-        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.isVirtual IS NOT :isVirtual", Lot.class);
-        q.setParameter("isVirtual", isVirtual);
-        return q;
-    }
-    
-    public static TypedQuery<Lot> Lot.findLotsByIsVirtualNot(Boolean isVirtual, String sortFieldName, String sortOrder) {
-        if (isVirtual == null) throw new IllegalArgumentException("The isVirtual argument is required");
-        EntityManager em = Lot.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.isVirtual IS NOT :isVirtual");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Lot> q = em.createQuery(queryBuilder.toString(), Lot.class);
-        q.setParameter("isVirtual", isVirtual);
-        return q;
-    }
-    
-    public static TypedQuery<Lot> Lot.findLotsByNotebookPageEquals(String notebookPage, String sortFieldName, String sortOrder) {
-        if (notebookPage == null || notebookPage.length() == 0) throw new IllegalArgumentException("The notebookPage argument is required");
-        EntityManager em = Lot.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.notebookPage = :notebookPage");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Lot> q = em.createQuery(queryBuilder.toString(), Lot.class);
-        q.setParameter("notebookPage", notebookPage);
-        return q;
-    }
-    
-    public static TypedQuery<Lot> Lot.findLotsByNotebookPageEqualsAndIgnoreNot(String notebookPage, Boolean ignore) {
-        if (notebookPage == null || notebookPage.length() == 0) throw new IllegalArgumentException("The notebookPage argument is required");
-        if (ignore == null) throw new IllegalArgumentException("The ignore argument is required");
-        EntityManager em = Lot.entityManager();
-        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.notebookPage = :notebookPage  AND o.ignore IS NOT :ignore", Lot.class);
-        q.setParameter("notebookPage", notebookPage);
-        q.setParameter("ignore", ignore);
-        return q;
-    }
-    
-    public static TypedQuery<Lot> Lot.findLotsByNotebookPageEqualsAndIgnoreNot(String notebookPage, Boolean ignore, String sortFieldName, String sortOrder) {
-        if (notebookPage == null || notebookPage.length() == 0) throw new IllegalArgumentException("The notebookPage argument is required");
-        if (ignore == null) throw new IllegalArgumentException("The ignore argument is required");
-        EntityManager em = Lot.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.notebookPage = :notebookPage  AND o.ignore IS NOT :ignore");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Lot> q = em.createQuery(queryBuilder.toString(), Lot.class);
-        q.setParameter("notebookPage", notebookPage);
-        q.setParameter("ignore", ignore);
-        return q;
-    }
-    
-    public static TypedQuery<Lot> Lot.findLotsBySaltForm(SaltForm saltForm, String sortFieldName, String sortOrder) {
-        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
-        EntityManager em = Lot.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.saltForm = :saltForm");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Lot> q = em.createQuery(queryBuilder.toString(), Lot.class);
-        q.setParameter("saltForm", saltForm);
-        return q;
-    }
-    
-    public static TypedQuery<Lot> Lot.findLotsBySynthesisDateBetween(Date minSynthesisDate, Date maxSynthesisDate) {
-        if (minSynthesisDate == null) throw new IllegalArgumentException("The minSynthesisDate argument is required");
-        if (maxSynthesisDate == null) throw new IllegalArgumentException("The maxSynthesisDate argument is required");
-        EntityManager em = Lot.entityManager();
-        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.synthesisDate BETWEEN :minSynthesisDate AND :maxSynthesisDate", Lot.class);
-        q.setParameter("minSynthesisDate", minSynthesisDate);
-        q.setParameter("maxSynthesisDate", maxSynthesisDate);
-        return q;
-    }
-    
-    public static TypedQuery<Lot> Lot.findLotsBySynthesisDateBetween(Date minSynthesisDate, Date maxSynthesisDate, String sortFieldName, String sortOrder) {
-        if (minSynthesisDate == null) throw new IllegalArgumentException("The minSynthesisDate argument is required");
-        if (maxSynthesisDate == null) throw new IllegalArgumentException("The maxSynthesisDate argument is required");
-        EntityManager em = Lot.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.synthesisDate BETWEEN :minSynthesisDate AND :maxSynthesisDate");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Lot> q = em.createQuery(queryBuilder.toString(), Lot.class);
-        q.setParameter("minSynthesisDate", minSynthesisDate);
-        q.setParameter("maxSynthesisDate", maxSynthesisDate);
-        return q;
-    }
-    
-    public static TypedQuery<Lot> Lot.findLotsBySynthesisDateGreaterThan(Date synthesisDate) {
-        if (synthesisDate == null) throw new IllegalArgumentException("The synthesisDate argument is required");
-        EntityManager em = Lot.entityManager();
-        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.synthesisDate > :synthesisDate", Lot.class);
-        q.setParameter("synthesisDate", synthesisDate);
-        return q;
-    }
-    
-    public static TypedQuery<Lot> Lot.findLotsBySynthesisDateGreaterThan(Date synthesisDate, String sortFieldName, String sortOrder) {
-        if (synthesisDate == null) throw new IllegalArgumentException("The synthesisDate argument is required");
-        EntityManager em = Lot.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.synthesisDate > :synthesisDate");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Lot> q = em.createQuery(queryBuilder.toString(), Lot.class);
-        q.setParameter("synthesisDate", synthesisDate);
-        return q;
-    }
-    
-    public static TypedQuery<Lot> Lot.findLotsBySynthesisDateLessThan(Date synthesisDate) {
-        if (synthesisDate == null) throw new IllegalArgumentException("The synthesisDate argument is required");
-        EntityManager em = Lot.entityManager();
-        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.synthesisDate < :synthesisDate", Lot.class);
-        q.setParameter("synthesisDate", synthesisDate);
-        return q;
-    }
-    
-    public static TypedQuery<Lot> Lot.findLotsBySynthesisDateLessThan(Date synthesisDate, String sortFieldName, String sortOrder) {
-        if (synthesisDate == null) throw new IllegalArgumentException("The synthesisDate argument is required");
-        EntityManager em = Lot.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.synthesisDate < :synthesisDate");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Lot> q = em.createQuery(queryBuilder.toString(), Lot.class);
-        q.setParameter("synthesisDate", synthesisDate);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Lot_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/Lot_Roo_JavaBean.aj
deleted file mode 100644
index 128da2cd4..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Lot_Roo_JavaBean.aj
+++ /dev/null
@@ -1,425 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.BulkLoadFile;
-import com.labsynch.labseer.domain.FileList;
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.domain.LotAlias;
-import com.labsynch.labseer.domain.Operator;
-import com.labsynch.labseer.domain.PhysicalState;
-import com.labsynch.labseer.domain.PurityMeasuredBy;
-import com.labsynch.labseer.domain.SolutionUnit;
-import com.labsynch.labseer.domain.Unit;
-import com.labsynch.labseer.domain.Vendor;
-import java.util.Date;
-import java.util.Set;
-
-privileged aspect Lot_Roo_JavaBean {
-    
-    public String Lot.getAsDrawnStruct() {
-        return this.asDrawnStruct;
-    }
-    
-    public void Lot.setAsDrawnStruct(String asDrawnStruct) {
-        this.asDrawnStruct = asDrawnStruct;
-    }
-    
-    public int Lot.getLotAsDrawnCdId() {
-        return this.lotAsDrawnCdId;
-    }
-    
-    public void Lot.setLotAsDrawnCdId(int lotAsDrawnCdId) {
-        this.lotAsDrawnCdId = lotAsDrawnCdId;
-    }
-    
-    public void Lot.setBuid(Long buid) {
-        this.buid = buid;
-    }
-    
-    public String Lot.getCorpName() {
-        return this.corpName;
-    }
-    
-    public void Lot.setCorpName(String corpName) {
-        this.corpName = corpName;
-    }
-    
-    public Integer Lot.getLotNumber() {
-        return this.lotNumber;
-    }
-    
-    public void Lot.setLotNumber(Integer lotNumber) {
-        this.lotNumber = lotNumber;
-    }
-    
-    public Double Lot.getLotMolWeight() {
-        return this.lotMolWeight;
-    }
-    
-    public void Lot.setLotMolWeight(Double lotMolWeight) {
-        this.lotMolWeight = lotMolWeight;
-    }
-    
-    public Date Lot.getSynthesisDate() {
-        return this.synthesisDate;
-    }
-    
-    public void Lot.setSynthesisDate(Date synthesisDate) {
-        this.synthesisDate = synthesisDate;
-    }
-    
-    public Date Lot.getRegistrationDate() {
-        return this.registrationDate;
-    }
-    
-    public void Lot.setRegistrationDate(Date registrationDate) {
-        this.registrationDate = registrationDate;
-    }
-    
-    public String Lot.getRegisteredBy() {
-        return this.registeredBy;
-    }
-    
-    public void Lot.setRegisteredBy(String registeredBy) {
-        this.registeredBy = registeredBy;
-    }
-    
-    public Date Lot.getModifiedDate() {
-        return this.modifiedDate;
-    }
-    
-    public void Lot.setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
-    
-    public String Lot.getModifiedBy() {
-        return this.modifiedBy;
-    }
-    
-    public void Lot.setModifiedBy(String modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
-    
-    public String Lot.getBarcode() {
-        return this.barcode;
-    }
-    
-    public void Lot.setBarcode(String barcode) {
-        this.barcode = barcode;
-    }
-    
-    public String Lot.getColor() {
-        return this.color;
-    }
-    
-    public void Lot.setColor(String color) {
-        this.color = color;
-    }
-    
-    public String Lot.getNotebookPage() {
-        return this.notebookPage;
-    }
-    
-    public void Lot.setNotebookPage(String notebookPage) {
-        this.notebookPage = notebookPage;
-    }
-    
-    public Double Lot.getAmount() {
-        return this.amount;
-    }
-    
-    public void Lot.setAmount(Double amount) {
-        this.amount = amount;
-    }
-    
-    public Unit Lot.getAmountUnits() {
-        return this.amountUnits;
-    }
-    
-    public void Lot.setAmountUnits(Unit amountUnits) {
-        this.amountUnits = amountUnits;
-    }
-    
-    public Double Lot.getSolutionAmount() {
-        return this.solutionAmount;
-    }
-    
-    public void Lot.setSolutionAmount(Double solutionAmount) {
-        this.solutionAmount = solutionAmount;
-    }
-    
-    public SolutionUnit Lot.getSolutionAmountUnits() {
-        return this.solutionAmountUnits;
-    }
-    
-    public void Lot.setSolutionAmountUnits(SolutionUnit solutionAmountUnits) {
-        this.solutionAmountUnits = solutionAmountUnits;
-    }
-    
-    public String Lot.getSupplier() {
-        return this.supplier;
-    }
-    
-    public void Lot.setSupplier(String supplier) {
-        this.supplier = supplier;
-    }
-    
-    public String Lot.getSupplierID() {
-        return this.supplierID;
-    }
-    
-    public void Lot.setSupplierID(String supplierID) {
-        this.supplierID = supplierID;
-    }
-    
-    public Double Lot.getPurity() {
-        return this.purity;
-    }
-    
-    public void Lot.setPurity(Double purity) {
-        this.purity = purity;
-    }
-    
-    public Operator Lot.getPurityOperator() {
-        return this.purityOperator;
-    }
-    
-    public void Lot.setPurityOperator(Operator purityOperator) {
-        this.purityOperator = purityOperator;
-    }
-    
-    public PurityMeasuredBy Lot.getPurityMeasuredBy() {
-        return this.purityMeasuredBy;
-    }
-    
-    public void Lot.setPurityMeasuredBy(PurityMeasuredBy purityMeasuredBy) {
-        this.purityMeasuredBy = purityMeasuredBy;
-    }
-    
-    public String Lot.getChemist() {
-        return this.chemist;
-    }
-    
-    public void Lot.setChemist(String chemist) {
-        this.chemist = chemist;
-    }
-    
-    public Double Lot.getPercentEE() {
-        return this.percentEE;
-    }
-    
-    public void Lot.setPercentEE(Double percentEE) {
-        this.percentEE = percentEE;
-    }
-    
-    public String Lot.getComments() {
-        return this.comments;
-    }
-    
-    public void Lot.setComments(String comments) {
-        this.comments = comments;
-    }
-    
-    public Boolean Lot.getIsVirtual() {
-        return this.isVirtual;
-    }
-    
-    public void Lot.setIsVirtual(Boolean isVirtual) {
-        this.isVirtual = isVirtual;
-    }
-    
-    public Boolean Lot.getIgnore() {
-        return this.ignore;
-    }
-    
-    public void Lot.setIgnore(Boolean ignore) {
-        this.ignore = ignore;
-    }
-    
-    public PhysicalState Lot.getPhysicalState() {
-        return this.physicalState;
-    }
-    
-    public void Lot.setPhysicalState(PhysicalState physicalState) {
-        this.physicalState = physicalState;
-    }
-    
-    public Vendor Lot.getVendor() {
-        return this.vendor;
-    }
-    
-    public void Lot.setVendor(Vendor vendor) {
-        this.vendor = vendor;
-    }
-    
-    public String Lot.getVendorId() {
-        return this.vendorId;
-    }
-    
-    public void Lot.setVendorId(String vendorId) {
-        this.vendorId = vendorId;
-    }
-    
-    public Set<FileList> Lot.getFileLists() {
-        return this.fileLists;
-    }
-    
-    public void Lot.setFileLists(Set<FileList> fileLists) {
-        this.fileLists = fileLists;
-    }
-    
-    public Double Lot.getRetain() {
-        return this.retain;
-    }
-    
-    public void Lot.setRetain(Double retain) {
-        this.retain = retain;
-    }
-    
-    public Unit Lot.getRetainUnits() {
-        return this.retainUnits;
-    }
-    
-    public void Lot.setRetainUnits(Unit retainUnits) {
-        this.retainUnits = retainUnits;
-    }
-    
-    public String Lot.getRetainLocation() {
-        return this.retainLocation;
-    }
-    
-    public void Lot.setRetainLocation(String retainLocation) {
-        this.retainLocation = retainLocation;
-    }
-    
-    public Double Lot.getMeltingPoint() {
-        return this.meltingPoint;
-    }
-    
-    public void Lot.setMeltingPoint(Double meltingPoint) {
-        this.meltingPoint = meltingPoint;
-    }
-    
-    public Double Lot.getBoilingPoint() {
-        return this.boilingPoint;
-    }
-    
-    public void Lot.setBoilingPoint(Double boilingPoint) {
-        this.boilingPoint = boilingPoint;
-    }
-    
-    public String Lot.getSupplierLot() {
-        return this.supplierLot;
-    }
-    
-    public void Lot.setSupplierLot(String supplierLot) {
-        this.supplierLot = supplierLot;
-    }
-    
-    public String Lot.getProject() {
-        return this.project;
-    }
-    
-    public void Lot.setProject(String project) {
-        this.project = project;
-    }
-    
-    public BulkLoadFile Lot.getBulkLoadFile() {
-        return this.bulkLoadFile;
-    }
-    
-    public void Lot.setBulkLoadFile(BulkLoadFile bulkLoadFile) {
-        this.bulkLoadFile = bulkLoadFile;
-    }
-    
-    public Double Lot.getLambda() {
-        return this.lambda;
-    }
-    
-    public void Lot.setLambda(Double lambda) {
-        this.lambda = lambda;
-    }
-    
-    public Double Lot.getAbsorbance() {
-        return this.absorbance;
-    }
-    
-    public void Lot.setAbsorbance(Double absorbance) {
-        this.absorbance = absorbance;
-    }
-    
-    public String Lot.getStockSolvent() {
-        return this.stockSolvent;
-    }
-    
-    public void Lot.setStockSolvent(String stockSolvent) {
-        this.stockSolvent = stockSolvent;
-    }
-    
-    public String Lot.getStockLocation() {
-        return this.stockLocation;
-    }
-    
-    public void Lot.setStockLocation(String stockLocation) {
-        this.stockLocation = stockLocation;
-    }
-    
-    public Double Lot.getObservedMassOne() {
-        return this.observedMassOne;
-    }
-    
-    public void Lot.setObservedMassOne(Double observedMassOne) {
-        this.observedMassOne = observedMassOne;
-    }
-    
-    public Double Lot.getObservedMassTwo() {
-        return this.observedMassTwo;
-    }
-    
-    public void Lot.setObservedMassTwo(Double observedMassTwo) {
-        this.observedMassTwo = observedMassTwo;
-    }
-    
-    public Double Lot.getTareWeight() {
-        return this.tareWeight;
-    }
-    
-    public void Lot.setTareWeight(Double tareWeight) {
-        this.tareWeight = tareWeight;
-    }
-    
-    public Unit Lot.getTareWeightUnits() {
-        return this.tareWeightUnits;
-    }
-    
-    public void Lot.setTareWeightUnits(Unit tareWeightUnits) {
-        this.tareWeightUnits = tareWeightUnits;
-    }
-    
-    public Double Lot.getTotalAmountStored() {
-        return this.totalAmountStored;
-    }
-    
-    public void Lot.setTotalAmountStored(Double totalAmountStored) {
-        this.totalAmountStored = totalAmountStored;
-    }
-    
-    public Unit Lot.getTotalAmountStoredUnits() {
-        return this.totalAmountStoredUnits;
-    }
-    
-    public void Lot.setTotalAmountStoredUnits(Unit totalAmountStoredUnits) {
-        this.totalAmountStoredUnits = totalAmountStoredUnits;
-    }
-    
-    public Set<LotAlias> Lot.getLotAliases() {
-        return this.lotAliases;
-    }
-    
-    public void Lot.setLotAliases(Set<LotAlias> lotAliases) {
-        this.lotAliases = lotAliases;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Lot_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/Lot_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 8ca98a622..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Lot_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,88 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Lot;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect Lot_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager Lot.entityManager;
-    
-    public static final List<String> Lot.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "asDrawnStruct", "lotAsDrawnCdId", "buid", "corpName", "lotNumber", "lotMolWeight", "synthesisDate", "registrationDate", "registeredBy", "modifiedDate", "modifiedBy", "barcode", "color", "notebookPage", "amount", "amountUnits", "solutionAmount", "solutionAmountUnits", "supplier", "supplierID", "purity", "purityOperator", "purityMeasuredBy", "chemist", "percentEE", "comments", "isVirtual", "ignore", "physicalState", "vendor", "vendorId", "saltForm", "fileLists", "retain", "retainUnits", "retainLocation", "meltingPoint", "boilingPoint", "supplierLot", "project", "parent", "bulkLoadFile", "lambda", "absorbance", "stockSolvent", "stockLocation", "observedMassOne", "observedMassTwo", "tareWeight", "tareWeightUnits", "totalAmountStored", "totalAmountStoredUnits", "lotAliases", "storageLocation");
-    
-    public static final EntityManager Lot.entityManager() {
-        EntityManager em = new Lot().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long Lot.countLots() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM Lot o", Long.class).getSingleResult();
-    }
-    
-    public static List<Lot> Lot.findAllLots(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM Lot o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, Lot.class).getResultList();
-    }
-    
-    public static List<Lot> Lot.findLotEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM Lot o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, Lot.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void Lot.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void Lot.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            Lot attached = Lot.findLot(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void Lot.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void Lot.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public Lot Lot.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        Lot merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Lot_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/Lot_Roo_Jpa_Entity.aj
deleted file mode 100644
index 14e367c49..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Lot_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Lot;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect Lot_Roo_Jpa_Entity {
-    
-    declare @type: Lot: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long Lot.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer Lot.version;
-    
-    public Long Lot.getId() {
-        return this.id;
-    }
-    
-    public void Lot.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer Lot.getVersion() {
-        return this.version;
-    }
-    
-    public void Lot.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Lot_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/Lot_Roo_Json.aj
deleted file mode 100644
index 864b83b90..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Lot_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Lot;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect Lot_Roo_Json {
-    
-    public String Lot.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String Lot.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static Lot Lot.fromJsonToLot(String json) {
-        return new JSONDeserializer<Lot>()
-        .use(null, Lot.class).deserialize(json);
-    }
-    
-    public static String Lot.toJsonArray(Collection<Lot> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String Lot.toJsonArray(Collection<Lot> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<Lot> Lot.fromJsonArrayToLots(String json) {
-        return new JSONDeserializer<List<Lot>>()
-        .use("values", Lot.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Lot_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/Lot_Roo_ToString.aj
deleted file mode 100644
index aaf758b69..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Lot_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Lot;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect Lot_Roo_ToString {
-    
-    public String Lot.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsInteraction.java b/src/main/java/com/labsynch/labseer/domain/LsInteraction.java
index 01e389a4d..0c15832e8 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsInteraction.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsInteraction.java
@@ -1,13 +1,23 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord
@@ -21,4 +31,103 @@ public class LsInteraction extends AbstractThing {
     @NotNull
     @Column(name = "second_thing_id")
     private Long secondThing;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("firstThing", "secondThing");
+
+	public static long countLsInteractions() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM LsInteraction o", Long.class).getSingleResult();
+    }
+
+	public static List<LsInteraction> findAllLsInteractions() {
+        return entityManager().createQuery("SELECT o FROM LsInteraction o", LsInteraction.class).getResultList();
+    }
+
+	public static List<LsInteraction> findAllLsInteractions(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsInteraction o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsInteraction.class).getResultList();
+    }
+
+	public static LsInteraction findLsInteraction(Long id) {
+        if (id == null) return null;
+        return entityManager().find(LsInteraction.class, id);
+    }
+
+	public static List<LsInteraction> findLsInteractionEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsInteraction o", LsInteraction.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<LsInteraction> findLsInteractionEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsInteraction o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsInteraction.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public LsInteraction merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        LsInteraction merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static LsInteraction fromJsonToLsInteraction(String json) {
+        return new JSONDeserializer<LsInteraction>()
+        .use(null, LsInteraction.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<LsInteraction> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<LsInteraction> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<LsInteraction> fromJsonArrayToLsInteractions(String json) {
+        return new JSONDeserializer<List<LsInteraction>>()
+        .use("values", LsInteraction.class).deserialize(json);
+    }
+
+	public Long getFirstThing() {
+        return this.firstThing;
+    }
+
+	public void setFirstThing(Long firstThing) {
+        this.firstThing = firstThing;
+    }
+
+	public Long getSecondThing() {
+        return this.secondThing;
+    }
+
+	public void setSecondThing(Long secondThing) {
+        this.secondThing = secondThing;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LsInteraction_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/LsInteraction_Roo_Configurable.aj
deleted file mode 100755
index 2f0761573..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsInteraction_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsInteraction;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LsInteraction_Roo_Configurable {
-    
-    declare @type: LsInteraction: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsInteraction_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/LsInteraction_Roo_JavaBean.aj
deleted file mode 100755
index bda83feb4..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsInteraction_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsInteraction;
-
-privileged aspect LsInteraction_Roo_JavaBean {
-    
-    public Long LsInteraction.getFirstThing() {
-        return this.firstThing;
-    }
-    
-    public void LsInteraction.setFirstThing(Long firstThing) {
-        this.firstThing = firstThing;
-    }
-    
-    public Long LsInteraction.getSecondThing() {
-        return this.secondThing;
-    }
-    
-    public void LsInteraction.setSecondThing(Long secondThing) {
-        this.secondThing = secondThing;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsInteraction_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/LsInteraction_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 10f042339..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsInteraction_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsInteraction;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LsInteraction_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> LsInteraction.fieldNames4OrderClauseFilter = java.util.Arrays.asList("firstThing", "secondThing");
-    
-    public static long LsInteraction.countLsInteractions() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LsInteraction o", Long.class).getSingleResult();
-    }
-    
-    public static List<LsInteraction> LsInteraction.findAllLsInteractions() {
-        return entityManager().createQuery("SELECT o FROM LsInteraction o", LsInteraction.class).getResultList();
-    }
-    
-    public static List<LsInteraction> LsInteraction.findAllLsInteractions(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsInteraction o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsInteraction.class).getResultList();
-    }
-    
-    public static LsInteraction LsInteraction.findLsInteraction(Long id) {
-        if (id == null) return null;
-        return entityManager().find(LsInteraction.class, id);
-    }
-    
-    public static List<LsInteraction> LsInteraction.findLsInteractionEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsInteraction o", LsInteraction.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<LsInteraction> LsInteraction.findLsInteractionEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsInteraction o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsInteraction.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public LsInteraction LsInteraction.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        LsInteraction merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsInteraction_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/LsInteraction_Roo_Jpa_Entity.aj
deleted file mode 100755
index e807854d2..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsInteraction_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsInteraction;
-import javax.persistence.Entity;
-
-privileged aspect LsInteraction_Roo_Jpa_Entity {
-    
-    declare @type: LsInteraction: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsInteraction_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/LsInteraction_Roo_Json.aj
deleted file mode 100755
index db39ee482..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsInteraction_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsInteraction;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect LsInteraction_Roo_Json {
-    
-    public String LsInteraction.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String LsInteraction.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static LsInteraction LsInteraction.fromJsonToLsInteraction(String json) {
-        return new JSONDeserializer<LsInteraction>()
-        .use(null, LsInteraction.class).deserialize(json);
-    }
-    
-    public static String LsInteraction.toJsonArray(Collection<LsInteraction> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String LsInteraction.toJsonArray(Collection<LsInteraction> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<LsInteraction> LsInteraction.fromJsonArrayToLsInteractions(String json) {
-        return new JSONDeserializer<List<LsInteraction>>()
-        .use("values", LsInteraction.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsInteraction_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/LsInteraction_Roo_ToString.aj
deleted file mode 100755
index 1a4a1104b..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsInteraction_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsInteraction;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect LsInteraction_Roo_ToString {
-    
-    public String LsInteraction.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsRole.java b/src/main/java/com/labsynch/labseer/domain/LsRole.java
index 53fa753c8..710428d31 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsRole.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsRole.java
@@ -8,25 +8,31 @@
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
+import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.dto.CodeTableDTO;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @RooJson
 @RooJavaBean
 @RooJpaActiveRecord(sequenceName = "LSROLE_PKSEQ", finders = { 
@@ -154,4 +160,365 @@ public static Collection<CodeTableDTO> toCodeTables(List<LsRole> lsRoles) {
 		}
 		return codeTables;
 	}
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "lsKind", "roleName", "roleDescription", "lsTypeAndKind", "authorRoles", "id", "version");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new LsRole().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countLsRoles() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM LsRole o", Long.class).getSingleResult();
+    }
+
+	public static List<LsRole> findAllLsRoles() {
+        return entityManager().createQuery("SELECT o FROM LsRole o", LsRole.class).getResultList();
+    }
+
+	public static List<LsRole> findAllLsRoles(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsRole o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsRole.class).getResultList();
+    }
+
+	public static LsRole findLsRole(Long id) {
+        if (id == null) return null;
+        return entityManager().find(LsRole.class, id);
+    }
+
+	public static List<LsRole> findLsRoleEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsRole o", LsRole.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<LsRole> findLsRoleEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsRole o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsRole.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            LsRole attached = LsRole.findLsRole(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public LsRole merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        LsRole merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static LsRole fromJsonToLsRole(String json) {
+        return new JSONDeserializer<LsRole>()
+        .use(null, LsRole.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<LsRole> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<LsRole> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<LsRole> fromJsonArrayToLsRoles(String json) {
+        return new JSONDeserializer<List<LsRole>>()
+        .use("values", LsRole.class).deserialize(json);
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getRoleName() {
+        return this.roleName;
+    }
+
+	public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+
+	public String getRoleDescription() {
+        return this.roleDescription;
+    }
+
+	public void setRoleDescription(String roleDescription) {
+        this.roleDescription = roleDescription;
+    }
+
+	public String getLsTypeAndKind() {
+        return this.lsTypeAndKind;
+    }
+
+	public void setLsTypeAndKind(String lsTypeAndKind) {
+        this.lsTypeAndKind = lsTypeAndKind;
+    }
+
+	public Set<AuthorRole> getAuthorRoles() {
+        return this.authorRoles;
+    }
+
+	public void setAuthorRoles(Set<AuthorRole> authorRoles) {
+        this.authorRoles = authorRoles;
+    }
+
+	public static Long countFindLsRolesByLsKindEquals(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = LsRole.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsRole AS o WHERE o.lsKind = :lsKind", Long.class);
+        q.setParameter("lsKind", lsKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsRolesByLsTypeEquals(String lsType) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = LsRole.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsRole AS o WHERE o.lsType = :lsType", Long.class);
+        q.setParameter("lsType", lsType);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsRolesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = LsRole.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsRole AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals(String lsType, String lsKind, String roleName) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (roleName == null || roleName.length() == 0) throw new IllegalArgumentException("The roleName argument is required");
+        EntityManager em = LsRole.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsRole AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.roleName = :roleName", Long.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("roleName", roleName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsRolesByLsTypeEqualsAndRoleNameEquals(String lsType, String roleName) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (roleName == null || roleName.length() == 0) throw new IllegalArgumentException("The roleName argument is required");
+        EntityManager em = LsRole.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsRole AS o WHERE o.lsType = :lsType  AND o.roleName = :roleName", Long.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("roleName", roleName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsRolesByRoleNameEquals(String roleName) {
+        if (roleName == null || roleName.length() == 0) throw new IllegalArgumentException("The roleName argument is required");
+        EntityManager em = LsRole.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsRole AS o WHERE o.roleName = :roleName", Long.class);
+        q.setParameter("roleName", roleName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<LsRole> findLsRolesByLsKindEquals(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = LsRole.entityManager();
+        TypedQuery<LsRole> q = em.createQuery("SELECT o FROM LsRole AS o WHERE o.lsKind = :lsKind", LsRole.class);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<LsRole> findLsRolesByLsKindEquals(String lsKind, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = LsRole.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsRole AS o WHERE o.lsKind = :lsKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsRole> q = em.createQuery(queryBuilder.toString(), LsRole.class);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<LsRole> findLsRolesByLsTypeEquals(String lsType) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = LsRole.entityManager();
+        TypedQuery<LsRole> q = em.createQuery("SELECT o FROM LsRole AS o WHERE o.lsType = :lsType", LsRole.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<LsRole> findLsRolesByLsTypeEquals(String lsType, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = LsRole.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsRole AS o WHERE o.lsType = :lsType");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsRole> q = em.createQuery(queryBuilder.toString(), LsRole.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<LsRole> findLsRolesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = LsRole.entityManager();
+        TypedQuery<LsRole> q = em.createQuery("SELECT o FROM LsRole AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", LsRole.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<LsRole> findLsRolesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = LsRole.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsRole AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsRole> q = em.createQuery(queryBuilder.toString(), LsRole.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<LsRole> findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals(String lsType, String lsKind, String roleName) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (roleName == null || roleName.length() == 0) throw new IllegalArgumentException("The roleName argument is required");
+        EntityManager em = LsRole.entityManager();
+        TypedQuery<LsRole> q = em.createQuery("SELECT o FROM LsRole AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.roleName = :roleName", LsRole.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("roleName", roleName);
+        return q;
+    }
+
+	public static TypedQuery<LsRole> findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals(String lsType, String lsKind, String roleName, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (roleName == null || roleName.length() == 0) throw new IllegalArgumentException("The roleName argument is required");
+        EntityManager em = LsRole.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsRole AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.roleName = :roleName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsRole> q = em.createQuery(queryBuilder.toString(), LsRole.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("roleName", roleName);
+        return q;
+    }
+
+	public static TypedQuery<LsRole> findLsRolesByLsTypeEqualsAndRoleNameEquals(String lsType, String roleName) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (roleName == null || roleName.length() == 0) throw new IllegalArgumentException("The roleName argument is required");
+        EntityManager em = LsRole.entityManager();
+        TypedQuery<LsRole> q = em.createQuery("SELECT o FROM LsRole AS o WHERE o.lsType = :lsType  AND o.roleName = :roleName", LsRole.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("roleName", roleName);
+        return q;
+    }
+
+	public static TypedQuery<LsRole> findLsRolesByLsTypeEqualsAndRoleNameEquals(String lsType, String roleName, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (roleName == null || roleName.length() == 0) throw new IllegalArgumentException("The roleName argument is required");
+        EntityManager em = LsRole.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsRole AS o WHERE o.lsType = :lsType  AND o.roleName = :roleName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsRole> q = em.createQuery(queryBuilder.toString(), LsRole.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("roleName", roleName);
+        return q;
+    }
+
+	public static TypedQuery<LsRole> findLsRolesByRoleNameEquals(String roleName, String sortFieldName, String sortOrder) {
+        if (roleName == null || roleName.length() == 0) throw new IllegalArgumentException("The roleName argument is required");
+        EntityManager em = LsRole.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsRole AS o WHERE o.roleName = :roleName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsRole> q = em.createQuery(queryBuilder.toString(), LsRole.class);
+        q.setParameter("roleName", roleName);
+        return q;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LsRole_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/LsRole_Roo_Configurable.aj
deleted file mode 100755
index 0dc1ea900..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsRole_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsRole;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LsRole_Roo_Configurable {
-    
-    declare @type: LsRole: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsRole_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/LsRole_Roo_Finder.aj
deleted file mode 100644
index 5bddbfeeb..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsRole_Roo_Finder.aj
+++ /dev/null
@@ -1,214 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsRole;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect LsRole_Roo_Finder {
-    
-    public static Long LsRole.countFindLsRolesByLsKindEquals(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = LsRole.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsRole AS o WHERE o.lsKind = :lsKind", Long.class);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsRole.countFindLsRolesByLsTypeEquals(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = LsRole.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsRole AS o WHERE o.lsType = :lsType", Long.class);
-        q.setParameter("lsType", lsType);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsRole.countFindLsRolesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = LsRole.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsRole AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsRole.countFindLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals(String lsType, String lsKind, String roleName) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (roleName == null || roleName.length() == 0) throw new IllegalArgumentException("The roleName argument is required");
-        EntityManager em = LsRole.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsRole AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.roleName = :roleName", Long.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("roleName", roleName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsRole.countFindLsRolesByLsTypeEqualsAndRoleNameEquals(String lsType, String roleName) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (roleName == null || roleName.length() == 0) throw new IllegalArgumentException("The roleName argument is required");
-        EntityManager em = LsRole.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsRole AS o WHERE o.lsType = :lsType  AND o.roleName = :roleName", Long.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("roleName", roleName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsRole.countFindLsRolesByRoleNameEquals(String roleName) {
-        if (roleName == null || roleName.length() == 0) throw new IllegalArgumentException("The roleName argument is required");
-        EntityManager em = LsRole.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsRole AS o WHERE o.roleName = :roleName", Long.class);
-        q.setParameter("roleName", roleName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<LsRole> LsRole.findLsRolesByLsKindEquals(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = LsRole.entityManager();
-        TypedQuery<LsRole> q = em.createQuery("SELECT o FROM LsRole AS o WHERE o.lsKind = :lsKind", LsRole.class);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<LsRole> LsRole.findLsRolesByLsKindEquals(String lsKind, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = LsRole.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsRole AS o WHERE o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsRole> q = em.createQuery(queryBuilder.toString(), LsRole.class);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<LsRole> LsRole.findLsRolesByLsTypeEquals(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = LsRole.entityManager();
-        TypedQuery<LsRole> q = em.createQuery("SELECT o FROM LsRole AS o WHERE o.lsType = :lsType", LsRole.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<LsRole> LsRole.findLsRolesByLsTypeEquals(String lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = LsRole.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsRole AS o WHERE o.lsType = :lsType");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsRole> q = em.createQuery(queryBuilder.toString(), LsRole.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<LsRole> LsRole.findLsRolesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = LsRole.entityManager();
-        TypedQuery<LsRole> q = em.createQuery("SELECT o FROM LsRole AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", LsRole.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<LsRole> LsRole.findLsRolesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = LsRole.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsRole AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsRole> q = em.createQuery(queryBuilder.toString(), LsRole.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<LsRole> LsRole.findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals(String lsType, String lsKind, String roleName) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (roleName == null || roleName.length() == 0) throw new IllegalArgumentException("The roleName argument is required");
-        EntityManager em = LsRole.entityManager();
-        TypedQuery<LsRole> q = em.createQuery("SELECT o FROM LsRole AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.roleName = :roleName", LsRole.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("roleName", roleName);
-        return q;
-    }
-    
-    public static TypedQuery<LsRole> LsRole.findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals(String lsType, String lsKind, String roleName, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (roleName == null || roleName.length() == 0) throw new IllegalArgumentException("The roleName argument is required");
-        EntityManager em = LsRole.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsRole AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.roleName = :roleName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsRole> q = em.createQuery(queryBuilder.toString(), LsRole.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("roleName", roleName);
-        return q;
-    }
-    
-    public static TypedQuery<LsRole> LsRole.findLsRolesByLsTypeEqualsAndRoleNameEquals(String lsType, String roleName) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (roleName == null || roleName.length() == 0) throw new IllegalArgumentException("The roleName argument is required");
-        EntityManager em = LsRole.entityManager();
-        TypedQuery<LsRole> q = em.createQuery("SELECT o FROM LsRole AS o WHERE o.lsType = :lsType  AND o.roleName = :roleName", LsRole.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("roleName", roleName);
-        return q;
-    }
-    
-    public static TypedQuery<LsRole> LsRole.findLsRolesByLsTypeEqualsAndRoleNameEquals(String lsType, String roleName, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (roleName == null || roleName.length() == 0) throw new IllegalArgumentException("The roleName argument is required");
-        EntityManager em = LsRole.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsRole AS o WHERE o.lsType = :lsType  AND o.roleName = :roleName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsRole> q = em.createQuery(queryBuilder.toString(), LsRole.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("roleName", roleName);
-        return q;
-    }
-    
-    public static TypedQuery<LsRole> LsRole.findLsRolesByRoleNameEquals(String roleName, String sortFieldName, String sortOrder) {
-        if (roleName == null || roleName.length() == 0) throw new IllegalArgumentException("The roleName argument is required");
-        EntityManager em = LsRole.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsRole AS o WHERE o.roleName = :roleName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsRole> q = em.createQuery(queryBuilder.toString(), LsRole.class);
-        q.setParameter("roleName", roleName);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsRole_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/LsRole_Roo_JavaBean.aj
deleted file mode 100755
index d9895f836..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsRole_Roo_JavaBean.aj
+++ /dev/null
@@ -1,60 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AuthorRole;
-import com.labsynch.labseer.domain.LsRole;
-import java.util.Set;
-
-privileged aspect LsRole_Roo_JavaBean {
-    
-    public String LsRole.getLsType() {
-        return this.lsType;
-    }
-    
-    public void LsRole.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String LsRole.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void LsRole.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String LsRole.getRoleName() {
-        return this.roleName;
-    }
-    
-    public void LsRole.setRoleName(String roleName) {
-        this.roleName = roleName;
-    }
-    
-    public String LsRole.getRoleDescription() {
-        return this.roleDescription;
-    }
-    
-    public void LsRole.setRoleDescription(String roleDescription) {
-        this.roleDescription = roleDescription;
-    }
-    
-    public String LsRole.getLsTypeAndKind() {
-        return this.lsTypeAndKind;
-    }
-    
-    public void LsRole.setLsTypeAndKind(String lsTypeAndKind) {
-        this.lsTypeAndKind = lsTypeAndKind;
-    }
-    
-    public Set<AuthorRole> LsRole.getAuthorRoles() {
-        return this.authorRoles;
-    }
-    
-    public void LsRole.setAuthorRoles(Set<AuthorRole> authorRoles) {
-        this.authorRoles = authorRoles;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsRole_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/LsRole_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index a1f9b6809..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsRole_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,95 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsRole;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LsRole_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager LsRole.entityManager;
-    
-    public static final List<String> LsRole.fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "lsKind", "roleName", "roleDescription", "lsTypeAndKind", "authorRoles", "id", "version");
-    
-    public static final EntityManager LsRole.entityManager() {
-        EntityManager em = new LsRole().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long LsRole.countLsRoles() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LsRole o", Long.class).getSingleResult();
-    }
-    
-    public static List<LsRole> LsRole.findAllLsRoles() {
-        return entityManager().createQuery("SELECT o FROM LsRole o", LsRole.class).getResultList();
-    }
-    
-    public static List<LsRole> LsRole.findAllLsRoles(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsRole o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsRole.class).getResultList();
-    }
-    
-    public static LsRole LsRole.findLsRole(Long id) {
-        if (id == null) return null;
-        return entityManager().find(LsRole.class, id);
-    }
-    
-    public static List<LsRole> LsRole.findLsRoleEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsRole o", LsRole.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<LsRole> LsRole.findLsRoleEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsRole o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsRole.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void LsRole.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            LsRole attached = LsRole.findLsRole(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void LsRole.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void LsRole.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public LsRole LsRole.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        LsRole merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsRole_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/LsRole_Roo_Jpa_Entity.aj
deleted file mode 100644
index 6c7bbfa66..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsRole_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsRole;
-import javax.persistence.Entity;
-
-privileged aspect LsRole_Roo_Jpa_Entity {
-    
-    declare @type: LsRole: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsRole_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/LsRole_Roo_Json.aj
deleted file mode 100755
index 0862fe6cc..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsRole_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsRole;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect LsRole_Roo_Json {
-    
-    public String LsRole.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String LsRole.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static LsRole LsRole.fromJsonToLsRole(String json) {
-        return new JSONDeserializer<LsRole>()
-        .use(null, LsRole.class).deserialize(json);
-    }
-    
-    public static String LsRole.toJsonArray(Collection<LsRole> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String LsRole.toJsonArray(Collection<LsRole> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<LsRole> LsRole.fromJsonArrayToLsRoles(String json) {
-        return new JSONDeserializer<List<LsRole>>()
-        .use("values", LsRole.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqAnlGrp.java b/src/main/java/com/labsynch/labseer/domain/LsSeqAnlGrp.java
index 2e85badc3..79524d49b 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqAnlGrp.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqAnlGrp.java
@@ -1,11 +1,138 @@
 package com.labsynch.labseer.domain;
 
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Version;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
+import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooJpaActiveRecord(sequenceName = "LSSEQ_ANLGRP_PKSEQ" )
 public class LsSeqAnlGrp {
 	
 	
+
+	@Id
+    @SequenceGenerator(name = "lsSeqAnlGrpGen", sequenceName = "LSSEQ_ANLGRP_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqAnlGrpGen")
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new LsSeqAnlGrp().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countLsSeqAnlGrps() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqAnlGrp o", Long.class).getSingleResult();
+    }
+
+	public static List<LsSeqAnlGrp> findAllLsSeqAnlGrps() {
+        return entityManager().createQuery("SELECT o FROM LsSeqAnlGrp o", LsSeqAnlGrp.class).getResultList();
+    }
+
+	public static List<LsSeqAnlGrp> findAllLsSeqAnlGrps(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsSeqAnlGrp o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsSeqAnlGrp.class).getResultList();
+    }
+
+	public static LsSeqAnlGrp findLsSeqAnlGrp(Long id) {
+        if (id == null) return null;
+        return entityManager().find(LsSeqAnlGrp.class, id);
+    }
+
+	public static List<LsSeqAnlGrp> findLsSeqAnlGrpEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsSeqAnlGrp o", LsSeqAnlGrp.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<LsSeqAnlGrp> findLsSeqAnlGrpEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsSeqAnlGrp o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsSeqAnlGrp.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            LsSeqAnlGrp attached = LsSeqAnlGrp.findLsSeqAnlGrp(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public LsSeqAnlGrp merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        LsSeqAnlGrp merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqAnlGrp_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqAnlGrp_Roo_Configurable.aj
deleted file mode 100644
index 2174d8b79..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqAnlGrp_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqAnlGrp;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LsSeqAnlGrp_Roo_Configurable {
-    
-    declare @type: LsSeqAnlGrp: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqAnlGrp_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqAnlGrp_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index b42b39b63..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqAnlGrp_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqAnlGrp;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LsSeqAnlGrp_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager LsSeqAnlGrp.entityManager;
-    
-    public static final List<String> LsSeqAnlGrp.fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
-    
-    public static final EntityManager LsSeqAnlGrp.entityManager() {
-        EntityManager em = new LsSeqAnlGrp().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long LsSeqAnlGrp.countLsSeqAnlGrps() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqAnlGrp o", Long.class).getSingleResult();
-    }
-    
-    public static List<LsSeqAnlGrp> LsSeqAnlGrp.findAllLsSeqAnlGrps() {
-        return entityManager().createQuery("SELECT o FROM LsSeqAnlGrp o", LsSeqAnlGrp.class).getResultList();
-    }
-    
-    public static List<LsSeqAnlGrp> LsSeqAnlGrp.findAllLsSeqAnlGrps(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsSeqAnlGrp o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsSeqAnlGrp.class).getResultList();
-    }
-    
-    public static LsSeqAnlGrp LsSeqAnlGrp.findLsSeqAnlGrp(Long id) {
-        if (id == null) return null;
-        return entityManager().find(LsSeqAnlGrp.class, id);
-    }
-    
-    public static List<LsSeqAnlGrp> LsSeqAnlGrp.findLsSeqAnlGrpEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsSeqAnlGrp o", LsSeqAnlGrp.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<LsSeqAnlGrp> LsSeqAnlGrp.findLsSeqAnlGrpEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsSeqAnlGrp o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsSeqAnlGrp.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void LsSeqAnlGrp.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void LsSeqAnlGrp.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            LsSeqAnlGrp attached = LsSeqAnlGrp.findLsSeqAnlGrp(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void LsSeqAnlGrp.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void LsSeqAnlGrp.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public LsSeqAnlGrp LsSeqAnlGrp.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        LsSeqAnlGrp merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqAnlGrp_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqAnlGrp_Roo_Jpa_Entity.aj
deleted file mode 100644
index cc389bd96..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqAnlGrp_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqAnlGrp;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
-
-privileged aspect LsSeqAnlGrp_Roo_Jpa_Entity {
-    
-    declare @type: LsSeqAnlGrp: @Entity;
-    
-    @Id
-    @SequenceGenerator(name = "lsSeqAnlGrpGen", sequenceName = "LSSEQ_ANLGRP_PKSEQ")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqAnlGrpGen")
-    @Column(name = "id")
-    private Long LsSeqAnlGrp.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer LsSeqAnlGrp.version;
-    
-    public Long LsSeqAnlGrp.getId() {
-        return this.id;
-    }
-    
-    public void LsSeqAnlGrp.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer LsSeqAnlGrp.getVersion() {
-        return this.version;
-    }
-    
-    public void LsSeqAnlGrp.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqContainer.java b/src/main/java/com/labsynch/labseer/domain/LsSeqContainer.java
index 67c20418f..8ea0b9998 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqContainer.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqContainer.java
@@ -1,12 +1,139 @@
 package com.labsynch.labseer.domain;
 
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Version;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
 @RooJavaBean
 
 @RooJpaActiveRecord(sequenceName = "LSSEQ_CONTAINER_PKSEQ" )
 public class LsSeqContainer {
 	
 	
+
+	@Id
+    @SequenceGenerator(name = "lsSeqContainerGen", sequenceName = "LSSEQ_CONTAINER_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqContainerGen")
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new LsSeqContainer().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countLsSeqContainers() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqContainer o", Long.class).getSingleResult();
+    }
+
+	public static List<LsSeqContainer> findAllLsSeqContainers() {
+        return entityManager().createQuery("SELECT o FROM LsSeqContainer o", LsSeqContainer.class).getResultList();
+    }
+
+	public static List<LsSeqContainer> findAllLsSeqContainers(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsSeqContainer o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsSeqContainer.class).getResultList();
+    }
+
+	public static LsSeqContainer findLsSeqContainer(Long id) {
+        if (id == null) return null;
+        return entityManager().find(LsSeqContainer.class, id);
+    }
+
+	public static List<LsSeqContainer> findLsSeqContainerEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsSeqContainer o", LsSeqContainer.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<LsSeqContainer> findLsSeqContainerEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsSeqContainer o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsSeqContainer.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            LsSeqContainer attached = LsSeqContainer.findLsSeqContainer(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public LsSeqContainer merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        LsSeqContainer merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqContainer_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqContainer_Roo_Configurable.aj
deleted file mode 100644
index 83afad079..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqContainer_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqContainer;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LsSeqContainer_Roo_Configurable {
-    
-    declare @type: LsSeqContainer: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqContainer_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqContainer_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index fcc4a49c1..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqContainer_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqContainer;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LsSeqContainer_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager LsSeqContainer.entityManager;
-    
-    public static final List<String> LsSeqContainer.fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
-    
-    public static final EntityManager LsSeqContainer.entityManager() {
-        EntityManager em = new LsSeqContainer().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long LsSeqContainer.countLsSeqContainers() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqContainer o", Long.class).getSingleResult();
-    }
-    
-    public static List<LsSeqContainer> LsSeqContainer.findAllLsSeqContainers() {
-        return entityManager().createQuery("SELECT o FROM LsSeqContainer o", LsSeqContainer.class).getResultList();
-    }
-    
-    public static List<LsSeqContainer> LsSeqContainer.findAllLsSeqContainers(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsSeqContainer o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsSeqContainer.class).getResultList();
-    }
-    
-    public static LsSeqContainer LsSeqContainer.findLsSeqContainer(Long id) {
-        if (id == null) return null;
-        return entityManager().find(LsSeqContainer.class, id);
-    }
-    
-    public static List<LsSeqContainer> LsSeqContainer.findLsSeqContainerEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsSeqContainer o", LsSeqContainer.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<LsSeqContainer> LsSeqContainer.findLsSeqContainerEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsSeqContainer o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsSeqContainer.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void LsSeqContainer.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void LsSeqContainer.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            LsSeqContainer attached = LsSeqContainer.findLsSeqContainer(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void LsSeqContainer.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void LsSeqContainer.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public LsSeqContainer LsSeqContainer.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        LsSeqContainer merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqContainer_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqContainer_Roo_Jpa_Entity.aj
deleted file mode 100644
index 1c0d34489..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqContainer_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqContainer;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
-
-privileged aspect LsSeqContainer_Roo_Jpa_Entity {
-    
-    declare @type: LsSeqContainer: @Entity;
-    
-    @Id
-    @SequenceGenerator(name = "lsSeqContainerGen", sequenceName = "LSSEQ_CONTAINER_PKSEQ")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqContainerGen")
-    @Column(name = "id")
-    private Long LsSeqContainer.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer LsSeqContainer.version;
-    
-    public Long LsSeqContainer.getId() {
-        return this.id;
-    }
-    
-    public void LsSeqContainer.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer LsSeqContainer.getVersion() {
-        return this.version;
-    }
-    
-    public void LsSeqContainer.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqExpt.java b/src/main/java/com/labsynch/labseer/domain/LsSeqExpt.java
index 84e74cac9..407f0b7d8 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqExpt.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqExpt.java
@@ -1,12 +1,139 @@
 package com.labsynch.labseer.domain;
 
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Version;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
 @RooJavaBean
 
 @RooJpaActiveRecord(sequenceName = "LSSEQ_EXPT_PKSEQ" )
 public class LsSeqExpt {
 	
 	
+
+	@Id
+    @SequenceGenerator(name = "lsSeqExptGen", sequenceName = "LSSEQ_EXPT_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqExptGen")
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new LsSeqExpt().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countLsSeqExpts() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqExpt o", Long.class).getSingleResult();
+    }
+
+	public static List<LsSeqExpt> findAllLsSeqExpts() {
+        return entityManager().createQuery("SELECT o FROM LsSeqExpt o", LsSeqExpt.class).getResultList();
+    }
+
+	public static List<LsSeqExpt> findAllLsSeqExpts(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsSeqExpt o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsSeqExpt.class).getResultList();
+    }
+
+	public static LsSeqExpt findLsSeqExpt(Long id) {
+        if (id == null) return null;
+        return entityManager().find(LsSeqExpt.class, id);
+    }
+
+	public static List<LsSeqExpt> findLsSeqExptEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsSeqExpt o", LsSeqExpt.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<LsSeqExpt> findLsSeqExptEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsSeqExpt o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsSeqExpt.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            LsSeqExpt attached = LsSeqExpt.findLsSeqExpt(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public LsSeqExpt merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        LsSeqExpt merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqExpt_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqExpt_Roo_Configurable.aj
deleted file mode 100644
index e327aafec..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqExpt_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqExpt;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LsSeqExpt_Roo_Configurable {
-    
-    declare @type: LsSeqExpt: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqExpt_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqExpt_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 8ad06f87c..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqExpt_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqExpt;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LsSeqExpt_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager LsSeqExpt.entityManager;
-    
-    public static final List<String> LsSeqExpt.fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
-    
-    public static final EntityManager LsSeqExpt.entityManager() {
-        EntityManager em = new LsSeqExpt().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long LsSeqExpt.countLsSeqExpts() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqExpt o", Long.class).getSingleResult();
-    }
-    
-    public static List<LsSeqExpt> LsSeqExpt.findAllLsSeqExpts() {
-        return entityManager().createQuery("SELECT o FROM LsSeqExpt o", LsSeqExpt.class).getResultList();
-    }
-    
-    public static List<LsSeqExpt> LsSeqExpt.findAllLsSeqExpts(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsSeqExpt o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsSeqExpt.class).getResultList();
-    }
-    
-    public static LsSeqExpt LsSeqExpt.findLsSeqExpt(Long id) {
-        if (id == null) return null;
-        return entityManager().find(LsSeqExpt.class, id);
-    }
-    
-    public static List<LsSeqExpt> LsSeqExpt.findLsSeqExptEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsSeqExpt o", LsSeqExpt.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<LsSeqExpt> LsSeqExpt.findLsSeqExptEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsSeqExpt o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsSeqExpt.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void LsSeqExpt.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void LsSeqExpt.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            LsSeqExpt attached = LsSeqExpt.findLsSeqExpt(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void LsSeqExpt.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void LsSeqExpt.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public LsSeqExpt LsSeqExpt.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        LsSeqExpt merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqExpt_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqExpt_Roo_Jpa_Entity.aj
deleted file mode 100644
index 19429a96d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqExpt_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqExpt;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
-
-privileged aspect LsSeqExpt_Roo_Jpa_Entity {
-    
-    declare @type: LsSeqExpt: @Entity;
-    
-    @Id
-    @SequenceGenerator(name = "lsSeqExptGen", sequenceName = "LSSEQ_EXPT_PKSEQ")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqExptGen")
-    @Column(name = "id")
-    private Long LsSeqExpt.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer LsSeqExpt.version;
-    
-    public Long LsSeqExpt.getId() {
-        return this.id;
-    }
-    
-    public void LsSeqExpt.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer LsSeqExpt.getVersion() {
-        return this.version;
-    }
-    
-    public void LsSeqExpt.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxCntrCntr.java b/src/main/java/com/labsynch/labseer/domain/LsSeqItxCntrCntr.java
index 7edc8f242..44c6cca66 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxCntrCntr.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqItxCntrCntr.java
@@ -1,13 +1,140 @@
 package com.labsynch.labseer.domain;
 
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Version;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
+import org.springframework.transaction.annotation.Transactional;
 
 
+@Entity
+@Configurable
 @RooJavaBean
 
 @RooJpaActiveRecord(sequenceName = "LSSEQ_ITXCNTRCNTR_PKSEQ" )
 public class LsSeqItxCntrCntr {
 	
 	
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new LsSeqItxCntrCntr().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countLsSeqItxCntrCntrs() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqItxCntrCntr o", Long.class).getSingleResult();
+    }
+
+	public static List<LsSeqItxCntrCntr> findAllLsSeqItxCntrCntrs() {
+        return entityManager().createQuery("SELECT o FROM LsSeqItxCntrCntr o", LsSeqItxCntrCntr.class).getResultList();
+    }
+
+	public static List<LsSeqItxCntrCntr> findAllLsSeqItxCntrCntrs(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsSeqItxCntrCntr o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsSeqItxCntrCntr.class).getResultList();
+    }
+
+	public static LsSeqItxCntrCntr findLsSeqItxCntrCntr(Long id) {
+        if (id == null) return null;
+        return entityManager().find(LsSeqItxCntrCntr.class, id);
+    }
+
+	public static List<LsSeqItxCntrCntr> findLsSeqItxCntrCntrEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsSeqItxCntrCntr o", LsSeqItxCntrCntr.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<LsSeqItxCntrCntr> findLsSeqItxCntrCntrEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsSeqItxCntrCntr o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsSeqItxCntrCntr.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            LsSeqItxCntrCntr attached = LsSeqItxCntrCntr.findLsSeqItxCntrCntr(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public LsSeqItxCntrCntr merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        LsSeqItxCntrCntr merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	@Id
+    @SequenceGenerator(name = "lsSeqItxCntrCntrGen", sequenceName = "LSSEQ_ITXCNTRCNTR_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqItxCntrCntrGen")
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxCntrCntr_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqItxCntrCntr_Roo_Configurable.aj
deleted file mode 100644
index 955235c1b..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxCntrCntr_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqItxCntrCntr;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LsSeqItxCntrCntr_Roo_Configurable {
-    
-    declare @type: LsSeqItxCntrCntr: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxCntrCntr_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqItxCntrCntr_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index d3fd34d98..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxCntrCntr_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqItxCntrCntr;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LsSeqItxCntrCntr_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager LsSeqItxCntrCntr.entityManager;
-    
-    public static final List<String> LsSeqItxCntrCntr.fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
-    
-    public static final EntityManager LsSeqItxCntrCntr.entityManager() {
-        EntityManager em = new LsSeqItxCntrCntr().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long LsSeqItxCntrCntr.countLsSeqItxCntrCntrs() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqItxCntrCntr o", Long.class).getSingleResult();
-    }
-    
-    public static List<LsSeqItxCntrCntr> LsSeqItxCntrCntr.findAllLsSeqItxCntrCntrs() {
-        return entityManager().createQuery("SELECT o FROM LsSeqItxCntrCntr o", LsSeqItxCntrCntr.class).getResultList();
-    }
-    
-    public static List<LsSeqItxCntrCntr> LsSeqItxCntrCntr.findAllLsSeqItxCntrCntrs(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsSeqItxCntrCntr o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsSeqItxCntrCntr.class).getResultList();
-    }
-    
-    public static LsSeqItxCntrCntr LsSeqItxCntrCntr.findLsSeqItxCntrCntr(Long id) {
-        if (id == null) return null;
-        return entityManager().find(LsSeqItxCntrCntr.class, id);
-    }
-    
-    public static List<LsSeqItxCntrCntr> LsSeqItxCntrCntr.findLsSeqItxCntrCntrEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsSeqItxCntrCntr o", LsSeqItxCntrCntr.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<LsSeqItxCntrCntr> LsSeqItxCntrCntr.findLsSeqItxCntrCntrEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsSeqItxCntrCntr o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsSeqItxCntrCntr.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void LsSeqItxCntrCntr.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void LsSeqItxCntrCntr.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            LsSeqItxCntrCntr attached = LsSeqItxCntrCntr.findLsSeqItxCntrCntr(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void LsSeqItxCntrCntr.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void LsSeqItxCntrCntr.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public LsSeqItxCntrCntr LsSeqItxCntrCntr.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        LsSeqItxCntrCntr merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxCntrCntr_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqItxCntrCntr_Roo_Jpa_Entity.aj
deleted file mode 100644
index 177124bdf..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxCntrCntr_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqItxCntrCntr;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
-
-privileged aspect LsSeqItxCntrCntr_Roo_Jpa_Entity {
-    
-    declare @type: LsSeqItxCntrCntr: @Entity;
-    
-    @Id
-    @SequenceGenerator(name = "lsSeqItxCntrCntrGen", sequenceName = "LSSEQ_ITXCNTRCNTR_PKSEQ")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqItxCntrCntrGen")
-    @Column(name = "id")
-    private Long LsSeqItxCntrCntr.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer LsSeqItxCntrCntr.version;
-    
-    public Long LsSeqItxCntrCntr.getId() {
-        return this.id;
-    }
-    
-    public void LsSeqItxCntrCntr.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer LsSeqItxCntrCntr.getVersion() {
-        return this.version;
-    }
-    
-    public void LsSeqItxCntrCntr.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxExperimentExperiment.java b/src/main/java/com/labsynch/labseer/domain/LsSeqItxExperimentExperiment.java
index 9436adcb6..903e0a582 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxExperimentExperiment.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqItxExperimentExperiment.java
@@ -1,14 +1,140 @@
 package com.labsynch.labseer.domain;
 
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
-
+import javax.persistence.Version;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooJpaActiveRecord(sequenceName = "LSSEQ_ITXEXPTEXPT_PKSEQ" )
 @Table(name="LS_SEQ_ITX_EXPT_EXPT")
 public class LsSeqItxExperimentExperiment {
 	
 	
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new LsSeqItxExperimentExperiment().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countLsSeqItxExperimentExperiments() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqItxExperimentExperiment o", Long.class).getSingleResult();
+    }
+
+	public static List<LsSeqItxExperimentExperiment> findAllLsSeqItxExperimentExperiments() {
+        return entityManager().createQuery("SELECT o FROM LsSeqItxExperimentExperiment o", LsSeqItxExperimentExperiment.class).getResultList();
+    }
+
+	public static List<LsSeqItxExperimentExperiment> findAllLsSeqItxExperimentExperiments(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsSeqItxExperimentExperiment o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsSeqItxExperimentExperiment.class).getResultList();
+    }
+
+	public static LsSeqItxExperimentExperiment findLsSeqItxExperimentExperiment(Long id) {
+        if (id == null) return null;
+        return entityManager().find(LsSeqItxExperimentExperiment.class, id);
+    }
+
+	public static List<LsSeqItxExperimentExperiment> findLsSeqItxExperimentExperimentEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsSeqItxExperimentExperiment o", LsSeqItxExperimentExperiment.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<LsSeqItxExperimentExperiment> findLsSeqItxExperimentExperimentEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsSeqItxExperimentExperiment o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsSeqItxExperimentExperiment.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            LsSeqItxExperimentExperiment attached = LsSeqItxExperimentExperiment.findLsSeqItxExperimentExperiment(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public LsSeqItxExperimentExperiment merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        LsSeqItxExperimentExperiment merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	@Id
+    @SequenceGenerator(name = "lsSeqItxExperimentExperimentGen", sequenceName = "LSSEQ_ITXEXPTEXPT_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqItxExperimentExperimentGen")
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxExperimentExperiment_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqItxExperimentExperiment_Roo_Configurable.aj
deleted file mode 100644
index 84ee5f9ce..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxExperimentExperiment_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqItxExperimentExperiment;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LsSeqItxExperimentExperiment_Roo_Configurable {
-    
-    declare @type: LsSeqItxExperimentExperiment: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxExperimentExperiment_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqItxExperimentExperiment_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 54033e940..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxExperimentExperiment_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqItxExperimentExperiment;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LsSeqItxExperimentExperiment_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager LsSeqItxExperimentExperiment.entityManager;
-    
-    public static final List<String> LsSeqItxExperimentExperiment.fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
-    
-    public static final EntityManager LsSeqItxExperimentExperiment.entityManager() {
-        EntityManager em = new LsSeqItxExperimentExperiment().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long LsSeqItxExperimentExperiment.countLsSeqItxExperimentExperiments() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqItxExperimentExperiment o", Long.class).getSingleResult();
-    }
-    
-    public static List<LsSeqItxExperimentExperiment> LsSeqItxExperimentExperiment.findAllLsSeqItxExperimentExperiments() {
-        return entityManager().createQuery("SELECT o FROM LsSeqItxExperimentExperiment o", LsSeqItxExperimentExperiment.class).getResultList();
-    }
-    
-    public static List<LsSeqItxExperimentExperiment> LsSeqItxExperimentExperiment.findAllLsSeqItxExperimentExperiments(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsSeqItxExperimentExperiment o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsSeqItxExperimentExperiment.class).getResultList();
-    }
-    
-    public static LsSeqItxExperimentExperiment LsSeqItxExperimentExperiment.findLsSeqItxExperimentExperiment(Long id) {
-        if (id == null) return null;
-        return entityManager().find(LsSeqItxExperimentExperiment.class, id);
-    }
-    
-    public static List<LsSeqItxExperimentExperiment> LsSeqItxExperimentExperiment.findLsSeqItxExperimentExperimentEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsSeqItxExperimentExperiment o", LsSeqItxExperimentExperiment.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<LsSeqItxExperimentExperiment> LsSeqItxExperimentExperiment.findLsSeqItxExperimentExperimentEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsSeqItxExperimentExperiment o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsSeqItxExperimentExperiment.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void LsSeqItxExperimentExperiment.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void LsSeqItxExperimentExperiment.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            LsSeqItxExperimentExperiment attached = LsSeqItxExperimentExperiment.findLsSeqItxExperimentExperiment(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void LsSeqItxExperimentExperiment.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void LsSeqItxExperimentExperiment.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public LsSeqItxExperimentExperiment LsSeqItxExperimentExperiment.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        LsSeqItxExperimentExperiment merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxExperimentExperiment_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqItxExperimentExperiment_Roo_Jpa_Entity.aj
deleted file mode 100644
index 51e4e57b9..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxExperimentExperiment_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqItxExperimentExperiment;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
-
-privileged aspect LsSeqItxExperimentExperiment_Roo_Jpa_Entity {
-    
-    declare @type: LsSeqItxExperimentExperiment: @Entity;
-    
-    @Id
-    @SequenceGenerator(name = "lsSeqItxExperimentExperimentGen", sequenceName = "LSSEQ_ITXEXPTEXPT_PKSEQ")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqItxExperimentExperimentGen")
-    @Column(name = "id")
-    private Long LsSeqItxExperimentExperiment.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer LsSeqItxExperimentExperiment.version;
-    
-    public Long LsSeqItxExperimentExperiment.getId() {
-        return this.id;
-    }
-    
-    public void LsSeqItxExperimentExperiment.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer LsSeqItxExperimentExperiment.getVersion() {
-        return this.version;
-    }
-    
-    public void LsSeqItxExperimentExperiment.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxLsThingLsThing.java b/src/main/java/com/labsynch/labseer/domain/LsSeqItxLsThingLsThing.java
index 060e19c49..469c2d987 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxLsThingLsThing.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqItxLsThingLsThing.java
@@ -1,10 +1,137 @@
 package com.labsynch.labseer.domain;
 
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Version;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooJpaActiveRecord(sequenceName = "LSSEQ_ITXTHGTHG_PKSEQ" )
 public class LsSeqItxLsThingLsThing {
 	
+
+	@Id
+    @SequenceGenerator(name = "lsSeqItxLsThingLsThingGen", sequenceName = "LSSEQ_ITXTHGTHG_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqItxLsThingLsThingGen")
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new LsSeqItxLsThingLsThing().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countLsSeqItxLsThingLsThings() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqItxLsThingLsThing o", Long.class).getSingleResult();
+    }
+
+	public static List<LsSeqItxLsThingLsThing> findAllLsSeqItxLsThingLsThings() {
+        return entityManager().createQuery("SELECT o FROM LsSeqItxLsThingLsThing o", LsSeqItxLsThingLsThing.class).getResultList();
+    }
+
+	public static List<LsSeqItxLsThingLsThing> findAllLsSeqItxLsThingLsThings(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsSeqItxLsThingLsThing o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsSeqItxLsThingLsThing.class).getResultList();
+    }
+
+	public static LsSeqItxLsThingLsThing findLsSeqItxLsThingLsThing(Long id) {
+        if (id == null) return null;
+        return entityManager().find(LsSeqItxLsThingLsThing.class, id);
+    }
+
+	public static List<LsSeqItxLsThingLsThing> findLsSeqItxLsThingLsThingEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsSeqItxLsThingLsThing o", LsSeqItxLsThingLsThing.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<LsSeqItxLsThingLsThing> findLsSeqItxLsThingLsThingEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsSeqItxLsThingLsThing o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsSeqItxLsThingLsThing.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            LsSeqItxLsThingLsThing attached = LsSeqItxLsThingLsThing.findLsSeqItxLsThingLsThing(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public LsSeqItxLsThingLsThing merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        LsSeqItxLsThingLsThing merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxLsThingLsThing_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqItxLsThingLsThing_Roo_Configurable.aj
deleted file mode 100644
index 9a37a7e99..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxLsThingLsThing_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqItxLsThingLsThing;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LsSeqItxLsThingLsThing_Roo_Configurable {
-    
-    declare @type: LsSeqItxLsThingLsThing: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxLsThingLsThing_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqItxLsThingLsThing_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index c5e217baf..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxLsThingLsThing_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqItxLsThingLsThing;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LsSeqItxLsThingLsThing_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager LsSeqItxLsThingLsThing.entityManager;
-    
-    public static final List<String> LsSeqItxLsThingLsThing.fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
-    
-    public static final EntityManager LsSeqItxLsThingLsThing.entityManager() {
-        EntityManager em = new LsSeqItxLsThingLsThing().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long LsSeqItxLsThingLsThing.countLsSeqItxLsThingLsThings() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqItxLsThingLsThing o", Long.class).getSingleResult();
-    }
-    
-    public static List<LsSeqItxLsThingLsThing> LsSeqItxLsThingLsThing.findAllLsSeqItxLsThingLsThings() {
-        return entityManager().createQuery("SELECT o FROM LsSeqItxLsThingLsThing o", LsSeqItxLsThingLsThing.class).getResultList();
-    }
-    
-    public static List<LsSeqItxLsThingLsThing> LsSeqItxLsThingLsThing.findAllLsSeqItxLsThingLsThings(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsSeqItxLsThingLsThing o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsSeqItxLsThingLsThing.class).getResultList();
-    }
-    
-    public static LsSeqItxLsThingLsThing LsSeqItxLsThingLsThing.findLsSeqItxLsThingLsThing(Long id) {
-        if (id == null) return null;
-        return entityManager().find(LsSeqItxLsThingLsThing.class, id);
-    }
-    
-    public static List<LsSeqItxLsThingLsThing> LsSeqItxLsThingLsThing.findLsSeqItxLsThingLsThingEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsSeqItxLsThingLsThing o", LsSeqItxLsThingLsThing.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<LsSeqItxLsThingLsThing> LsSeqItxLsThingLsThing.findLsSeqItxLsThingLsThingEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsSeqItxLsThingLsThing o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsSeqItxLsThingLsThing.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void LsSeqItxLsThingLsThing.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void LsSeqItxLsThingLsThing.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            LsSeqItxLsThingLsThing attached = LsSeqItxLsThingLsThing.findLsSeqItxLsThingLsThing(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void LsSeqItxLsThingLsThing.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void LsSeqItxLsThingLsThing.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public LsSeqItxLsThingLsThing LsSeqItxLsThingLsThing.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        LsSeqItxLsThingLsThing merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxLsThingLsThing_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqItxLsThingLsThing_Roo_Jpa_Entity.aj
deleted file mode 100644
index 8a09aed8e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxLsThingLsThing_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqItxLsThingLsThing;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
-
-privileged aspect LsSeqItxLsThingLsThing_Roo_Jpa_Entity {
-    
-    declare @type: LsSeqItxLsThingLsThing: @Entity;
-    
-    @Id
-    @SequenceGenerator(name = "lsSeqItxLsThingLsThingGen", sequenceName = "LSSEQ_ITXTHGTHG_PKSEQ")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqItxLsThingLsThingGen")
-    @Column(name = "id")
-    private Long LsSeqItxLsThingLsThing.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer LsSeqItxLsThingLsThing.version;
-    
-    public Long LsSeqItxLsThingLsThing.getId() {
-        return this.id;
-    }
-    
-    public void LsSeqItxLsThingLsThing.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer LsSeqItxLsThingLsThing.getVersion() {
-        return this.version;
-    }
-    
-    public void LsSeqItxLsThingLsThing.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxProtocolProtocol.java b/src/main/java/com/labsynch/labseer/domain/LsSeqItxProtocolProtocol.java
index 08300fbfd..016407a68 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxProtocolProtocol.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqItxProtocolProtocol.java
@@ -1,13 +1,140 @@
 package com.labsynch.labseer.domain;
 
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Version;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
+import org.springframework.transaction.annotation.Transactional;
 
 
+@Entity
+@Configurable
 @RooJavaBean
 
 @RooJpaActiveRecord(sequenceName = "LSSEQ_ITXPROTPROT_PKSEQ" )
 public class LsSeqItxProtocolProtocol {
 	
 	
+
+	@Id
+    @SequenceGenerator(name = "lsSeqItxProtocolProtocolGen", sequenceName = "LSSEQ_ITXPROTPROT_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqItxProtocolProtocolGen")
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new LsSeqItxProtocolProtocol().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countLsSeqItxProtocolProtocols() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqItxProtocolProtocol o", Long.class).getSingleResult();
+    }
+
+	public static List<LsSeqItxProtocolProtocol> findAllLsSeqItxProtocolProtocols() {
+        return entityManager().createQuery("SELECT o FROM LsSeqItxProtocolProtocol o", LsSeqItxProtocolProtocol.class).getResultList();
+    }
+
+	public static List<LsSeqItxProtocolProtocol> findAllLsSeqItxProtocolProtocols(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsSeqItxProtocolProtocol o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsSeqItxProtocolProtocol.class).getResultList();
+    }
+
+	public static LsSeqItxProtocolProtocol findLsSeqItxProtocolProtocol(Long id) {
+        if (id == null) return null;
+        return entityManager().find(LsSeqItxProtocolProtocol.class, id);
+    }
+
+	public static List<LsSeqItxProtocolProtocol> findLsSeqItxProtocolProtocolEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsSeqItxProtocolProtocol o", LsSeqItxProtocolProtocol.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<LsSeqItxProtocolProtocol> findLsSeqItxProtocolProtocolEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsSeqItxProtocolProtocol o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsSeqItxProtocolProtocol.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            LsSeqItxProtocolProtocol attached = LsSeqItxProtocolProtocol.findLsSeqItxProtocolProtocol(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public LsSeqItxProtocolProtocol merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        LsSeqItxProtocolProtocol merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxProtocolProtocol_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqItxProtocolProtocol_Roo_Configurable.aj
deleted file mode 100644
index d19bba417..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxProtocolProtocol_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqItxProtocolProtocol;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LsSeqItxProtocolProtocol_Roo_Configurable {
-    
-    declare @type: LsSeqItxProtocolProtocol: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxProtocolProtocol_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqItxProtocolProtocol_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index f936eb648..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxProtocolProtocol_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqItxProtocolProtocol;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LsSeqItxProtocolProtocol_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager LsSeqItxProtocolProtocol.entityManager;
-    
-    public static final List<String> LsSeqItxProtocolProtocol.fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
-    
-    public static final EntityManager LsSeqItxProtocolProtocol.entityManager() {
-        EntityManager em = new LsSeqItxProtocolProtocol().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long LsSeqItxProtocolProtocol.countLsSeqItxProtocolProtocols() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqItxProtocolProtocol o", Long.class).getSingleResult();
-    }
-    
-    public static List<LsSeqItxProtocolProtocol> LsSeqItxProtocolProtocol.findAllLsSeqItxProtocolProtocols() {
-        return entityManager().createQuery("SELECT o FROM LsSeqItxProtocolProtocol o", LsSeqItxProtocolProtocol.class).getResultList();
-    }
-    
-    public static List<LsSeqItxProtocolProtocol> LsSeqItxProtocolProtocol.findAllLsSeqItxProtocolProtocols(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsSeqItxProtocolProtocol o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsSeqItxProtocolProtocol.class).getResultList();
-    }
-    
-    public static LsSeqItxProtocolProtocol LsSeqItxProtocolProtocol.findLsSeqItxProtocolProtocol(Long id) {
-        if (id == null) return null;
-        return entityManager().find(LsSeqItxProtocolProtocol.class, id);
-    }
-    
-    public static List<LsSeqItxProtocolProtocol> LsSeqItxProtocolProtocol.findLsSeqItxProtocolProtocolEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsSeqItxProtocolProtocol o", LsSeqItxProtocolProtocol.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<LsSeqItxProtocolProtocol> LsSeqItxProtocolProtocol.findLsSeqItxProtocolProtocolEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsSeqItxProtocolProtocol o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsSeqItxProtocolProtocol.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void LsSeqItxProtocolProtocol.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void LsSeqItxProtocolProtocol.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            LsSeqItxProtocolProtocol attached = LsSeqItxProtocolProtocol.findLsSeqItxProtocolProtocol(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void LsSeqItxProtocolProtocol.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void LsSeqItxProtocolProtocol.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public LsSeqItxProtocolProtocol LsSeqItxProtocolProtocol.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        LsSeqItxProtocolProtocol merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxProtocolProtocol_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqItxProtocolProtocol_Roo_Jpa_Entity.aj
deleted file mode 100644
index 1d29704bd..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxProtocolProtocol_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqItxProtocolProtocol;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
-
-privileged aspect LsSeqItxProtocolProtocol_Roo_Jpa_Entity {
-    
-    declare @type: LsSeqItxProtocolProtocol: @Entity;
-    
-    @Id
-    @SequenceGenerator(name = "lsSeqItxProtocolProtocolGen", sequenceName = "LSSEQ_ITXPROTPROT_PKSEQ")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqItxProtocolProtocolGen")
-    @Column(name = "id")
-    private Long LsSeqItxProtocolProtocol.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer LsSeqItxProtocolProtocol.version;
-    
-    public Long LsSeqItxProtocolProtocol.getId() {
-        return this.id;
-    }
-    
-    public void LsSeqItxProtocolProtocol.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer LsSeqItxProtocolProtocol.getVersion() {
-        return this.version;
-    }
-    
-    public void LsSeqItxProtocolProtocol.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxSubjCntr.java b/src/main/java/com/labsynch/labseer/domain/LsSeqItxSubjCntr.java
index b866aca2c..8f4e5832e 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxSubjCntr.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqItxSubjCntr.java
@@ -1,12 +1,139 @@
 package com.labsynch.labseer.domain;
 
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Version;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
+import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 
 @RooJpaActiveRecord(sequenceName = "LSSEQ_ITXSUBJCNTR_PKSEQ" )
 public class LsSeqItxSubjCntr {
 	
 	
+
+	@Id
+    @SequenceGenerator(name = "lsSeqItxSubjCntrGen", sequenceName = "LSSEQ_ITXSUBJCNTR_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqItxSubjCntrGen")
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new LsSeqItxSubjCntr().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countLsSeqItxSubjCntrs() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqItxSubjCntr o", Long.class).getSingleResult();
+    }
+
+	public static List<LsSeqItxSubjCntr> findAllLsSeqItxSubjCntrs() {
+        return entityManager().createQuery("SELECT o FROM LsSeqItxSubjCntr o", LsSeqItxSubjCntr.class).getResultList();
+    }
+
+	public static List<LsSeqItxSubjCntr> findAllLsSeqItxSubjCntrs(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsSeqItxSubjCntr o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsSeqItxSubjCntr.class).getResultList();
+    }
+
+	public static LsSeqItxSubjCntr findLsSeqItxSubjCntr(Long id) {
+        if (id == null) return null;
+        return entityManager().find(LsSeqItxSubjCntr.class, id);
+    }
+
+	public static List<LsSeqItxSubjCntr> findLsSeqItxSubjCntrEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsSeqItxSubjCntr o", LsSeqItxSubjCntr.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<LsSeqItxSubjCntr> findLsSeqItxSubjCntrEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsSeqItxSubjCntr o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsSeqItxSubjCntr.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            LsSeqItxSubjCntr attached = LsSeqItxSubjCntr.findLsSeqItxSubjCntr(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public LsSeqItxSubjCntr merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        LsSeqItxSubjCntr merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxSubjCntr_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqItxSubjCntr_Roo_Configurable.aj
deleted file mode 100644
index 24b73d909..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxSubjCntr_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqItxSubjCntr;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LsSeqItxSubjCntr_Roo_Configurable {
-    
-    declare @type: LsSeqItxSubjCntr: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxSubjCntr_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqItxSubjCntr_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index e66fcf59f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxSubjCntr_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqItxSubjCntr;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LsSeqItxSubjCntr_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager LsSeqItxSubjCntr.entityManager;
-    
-    public static final List<String> LsSeqItxSubjCntr.fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
-    
-    public static final EntityManager LsSeqItxSubjCntr.entityManager() {
-        EntityManager em = new LsSeqItxSubjCntr().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long LsSeqItxSubjCntr.countLsSeqItxSubjCntrs() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqItxSubjCntr o", Long.class).getSingleResult();
-    }
-    
-    public static List<LsSeqItxSubjCntr> LsSeqItxSubjCntr.findAllLsSeqItxSubjCntrs() {
-        return entityManager().createQuery("SELECT o FROM LsSeqItxSubjCntr o", LsSeqItxSubjCntr.class).getResultList();
-    }
-    
-    public static List<LsSeqItxSubjCntr> LsSeqItxSubjCntr.findAllLsSeqItxSubjCntrs(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsSeqItxSubjCntr o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsSeqItxSubjCntr.class).getResultList();
-    }
-    
-    public static LsSeqItxSubjCntr LsSeqItxSubjCntr.findLsSeqItxSubjCntr(Long id) {
-        if (id == null) return null;
-        return entityManager().find(LsSeqItxSubjCntr.class, id);
-    }
-    
-    public static List<LsSeqItxSubjCntr> LsSeqItxSubjCntr.findLsSeqItxSubjCntrEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsSeqItxSubjCntr o", LsSeqItxSubjCntr.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<LsSeqItxSubjCntr> LsSeqItxSubjCntr.findLsSeqItxSubjCntrEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsSeqItxSubjCntr o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsSeqItxSubjCntr.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void LsSeqItxSubjCntr.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void LsSeqItxSubjCntr.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            LsSeqItxSubjCntr attached = LsSeqItxSubjCntr.findLsSeqItxSubjCntr(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void LsSeqItxSubjCntr.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void LsSeqItxSubjCntr.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public LsSeqItxSubjCntr LsSeqItxSubjCntr.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        LsSeqItxSubjCntr merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxSubjCntr_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqItxSubjCntr_Roo_Jpa_Entity.aj
deleted file mode 100644
index fb27d4500..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxSubjCntr_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqItxSubjCntr;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
-
-privileged aspect LsSeqItxSubjCntr_Roo_Jpa_Entity {
-    
-    declare @type: LsSeqItxSubjCntr: @Entity;
-    
-    @Id
-    @SequenceGenerator(name = "lsSeqItxSubjCntrGen", sequenceName = "LSSEQ_ITXSUBJCNTR_PKSEQ")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqItxSubjCntrGen")
-    @Column(name = "id")
-    private Long LsSeqItxSubjCntr.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer LsSeqItxSubjCntr.version;
-    
-    public Long LsSeqItxSubjCntr.getId() {
-        return this.id;
-    }
-    
-    public void LsSeqItxSubjCntr.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer LsSeqItxSubjCntr.getVersion() {
-        return this.version;
-    }
-    
-    public void LsSeqItxSubjCntr.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqProtocol.java b/src/main/java/com/labsynch/labseer/domain/LsSeqProtocol.java
index 91bc24606..12893f59e 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqProtocol.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqProtocol.java
@@ -1,11 +1,138 @@
 package com.labsynch.labseer.domain;
 
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Version;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
+import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooJpaActiveRecord(sequenceName = "LSSEQ_PROT_PKSEQ" )
 public class LsSeqProtocol {
 	
 	
+
+	@Id
+    @SequenceGenerator(name = "lsSeqProtocolGen", sequenceName = "LSSEQ_PROT_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqProtocolGen")
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new LsSeqProtocol().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countLsSeqProtocols() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqProtocol o", Long.class).getSingleResult();
+    }
+
+	public static List<LsSeqProtocol> findAllLsSeqProtocols() {
+        return entityManager().createQuery("SELECT o FROM LsSeqProtocol o", LsSeqProtocol.class).getResultList();
+    }
+
+	public static List<LsSeqProtocol> findAllLsSeqProtocols(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsSeqProtocol o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsSeqProtocol.class).getResultList();
+    }
+
+	public static LsSeqProtocol findLsSeqProtocol(Long id) {
+        if (id == null) return null;
+        return entityManager().find(LsSeqProtocol.class, id);
+    }
+
+	public static List<LsSeqProtocol> findLsSeqProtocolEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsSeqProtocol o", LsSeqProtocol.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<LsSeqProtocol> findLsSeqProtocolEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsSeqProtocol o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsSeqProtocol.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            LsSeqProtocol attached = LsSeqProtocol.findLsSeqProtocol(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public LsSeqProtocol merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        LsSeqProtocol merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqProtocol_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqProtocol_Roo_Configurable.aj
deleted file mode 100644
index 5eb3c0b79..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqProtocol_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqProtocol;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LsSeqProtocol_Roo_Configurable {
-    
-    declare @type: LsSeqProtocol: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqProtocol_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqProtocol_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index dfdcbce26..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqProtocol_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqProtocol;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LsSeqProtocol_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager LsSeqProtocol.entityManager;
-    
-    public static final List<String> LsSeqProtocol.fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
-    
-    public static final EntityManager LsSeqProtocol.entityManager() {
-        EntityManager em = new LsSeqProtocol().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long LsSeqProtocol.countLsSeqProtocols() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqProtocol o", Long.class).getSingleResult();
-    }
-    
-    public static List<LsSeqProtocol> LsSeqProtocol.findAllLsSeqProtocols() {
-        return entityManager().createQuery("SELECT o FROM LsSeqProtocol o", LsSeqProtocol.class).getResultList();
-    }
-    
-    public static List<LsSeqProtocol> LsSeqProtocol.findAllLsSeqProtocols(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsSeqProtocol o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsSeqProtocol.class).getResultList();
-    }
-    
-    public static LsSeqProtocol LsSeqProtocol.findLsSeqProtocol(Long id) {
-        if (id == null) return null;
-        return entityManager().find(LsSeqProtocol.class, id);
-    }
-    
-    public static List<LsSeqProtocol> LsSeqProtocol.findLsSeqProtocolEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsSeqProtocol o", LsSeqProtocol.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<LsSeqProtocol> LsSeqProtocol.findLsSeqProtocolEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsSeqProtocol o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsSeqProtocol.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void LsSeqProtocol.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void LsSeqProtocol.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            LsSeqProtocol attached = LsSeqProtocol.findLsSeqProtocol(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void LsSeqProtocol.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void LsSeqProtocol.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public LsSeqProtocol LsSeqProtocol.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        LsSeqProtocol merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqProtocol_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqProtocol_Roo_Jpa_Entity.aj
deleted file mode 100644
index 3a7ea839b..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqProtocol_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqProtocol;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
-
-privileged aspect LsSeqProtocol_Roo_Jpa_Entity {
-    
-    declare @type: LsSeqProtocol: @Entity;
-    
-    @Id
-    @SequenceGenerator(name = "lsSeqProtocolGen", sequenceName = "LSSEQ_PROT_PKSEQ")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqProtocolGen")
-    @Column(name = "id")
-    private Long LsSeqProtocol.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer LsSeqProtocol.version;
-    
-    public Long LsSeqProtocol.getId() {
-        return this.id;
-    }
-    
-    public void LsSeqProtocol.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer LsSeqProtocol.getVersion() {
-        return this.version;
-    }
-    
-    public void LsSeqProtocol.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqSubject.java b/src/main/java/com/labsynch/labseer/domain/LsSeqSubject.java
index d5feb8c17..dfe9e42ac 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqSubject.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqSubject.java
@@ -1,11 +1,138 @@
 package com.labsynch.labseer.domain;
 
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Version;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooJpaActiveRecord(sequenceName = "LSSEQ_SUBJ_PKSEQ" )
 public class LsSeqSubject {
 	
 	
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new LsSeqSubject().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countLsSeqSubjects() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqSubject o", Long.class).getSingleResult();
+    }
+
+	public static List<LsSeqSubject> findAllLsSeqSubjects() {
+        return entityManager().createQuery("SELECT o FROM LsSeqSubject o", LsSeqSubject.class).getResultList();
+    }
+
+	public static List<LsSeqSubject> findAllLsSeqSubjects(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsSeqSubject o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsSeqSubject.class).getResultList();
+    }
+
+	public static LsSeqSubject findLsSeqSubject(Long id) {
+        if (id == null) return null;
+        return entityManager().find(LsSeqSubject.class, id);
+    }
+
+	public static List<LsSeqSubject> findLsSeqSubjectEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsSeqSubject o", LsSeqSubject.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<LsSeqSubject> findLsSeqSubjectEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsSeqSubject o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsSeqSubject.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            LsSeqSubject attached = LsSeqSubject.findLsSeqSubject(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public LsSeqSubject merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        LsSeqSubject merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	@Id
+    @SequenceGenerator(name = "lsSeqSubjectGen", sequenceName = "LSSEQ_SUBJ_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqSubjectGen")
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqSubject_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqSubject_Roo_Configurable.aj
deleted file mode 100644
index 9a01e1149..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqSubject_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqSubject;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LsSeqSubject_Roo_Configurable {
-    
-    declare @type: LsSeqSubject: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqSubject_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqSubject_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 34df06858..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqSubject_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqSubject;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LsSeqSubject_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager LsSeqSubject.entityManager;
-    
-    public static final List<String> LsSeqSubject.fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
-    
-    public static final EntityManager LsSeqSubject.entityManager() {
-        EntityManager em = new LsSeqSubject().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long LsSeqSubject.countLsSeqSubjects() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqSubject o", Long.class).getSingleResult();
-    }
-    
-    public static List<LsSeqSubject> LsSeqSubject.findAllLsSeqSubjects() {
-        return entityManager().createQuery("SELECT o FROM LsSeqSubject o", LsSeqSubject.class).getResultList();
-    }
-    
-    public static List<LsSeqSubject> LsSeqSubject.findAllLsSeqSubjects(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsSeqSubject o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsSeqSubject.class).getResultList();
-    }
-    
-    public static LsSeqSubject LsSeqSubject.findLsSeqSubject(Long id) {
-        if (id == null) return null;
-        return entityManager().find(LsSeqSubject.class, id);
-    }
-    
-    public static List<LsSeqSubject> LsSeqSubject.findLsSeqSubjectEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsSeqSubject o", LsSeqSubject.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<LsSeqSubject> LsSeqSubject.findLsSeqSubjectEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsSeqSubject o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsSeqSubject.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void LsSeqSubject.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void LsSeqSubject.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            LsSeqSubject attached = LsSeqSubject.findLsSeqSubject(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void LsSeqSubject.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void LsSeqSubject.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public LsSeqSubject LsSeqSubject.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        LsSeqSubject merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqSubject_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqSubject_Roo_Jpa_Entity.aj
deleted file mode 100644
index 55a52a821..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqSubject_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqSubject;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
-
-privileged aspect LsSeqSubject_Roo_Jpa_Entity {
-    
-    declare @type: LsSeqSubject: @Entity;
-    
-    @Id
-    @SequenceGenerator(name = "lsSeqSubjectGen", sequenceName = "LSSEQ_SUBJ_PKSEQ")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqSubjectGen")
-    @Column(name = "id")
-    private Long LsSeqSubject.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer LsSeqSubject.version;
-    
-    public Long LsSeqSubject.getId() {
-        return this.id;
-    }
-    
-    public void LsSeqSubject.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer LsSeqSubject.getVersion() {
-        return this.version;
-    }
-    
-    public void LsSeqSubject.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqTrtGrp.java b/src/main/java/com/labsynch/labseer/domain/LsSeqTrtGrp.java
index 3dbd375ad..947569aba 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqTrtGrp.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqTrtGrp.java
@@ -1,11 +1,138 @@
 package com.labsynch.labseer.domain;
 
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Version;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooJpaActiveRecord(sequenceName = "LSSEQ_TRTGRP_PKSEQ" )
 public class LsSeqTrtGrp {
 	
 	
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new LsSeqTrtGrp().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countLsSeqTrtGrps() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqTrtGrp o", Long.class).getSingleResult();
+    }
+
+	public static List<LsSeqTrtGrp> findAllLsSeqTrtGrps() {
+        return entityManager().createQuery("SELECT o FROM LsSeqTrtGrp o", LsSeqTrtGrp.class).getResultList();
+    }
+
+	public static List<LsSeqTrtGrp> findAllLsSeqTrtGrps(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsSeqTrtGrp o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsSeqTrtGrp.class).getResultList();
+    }
+
+	public static LsSeqTrtGrp findLsSeqTrtGrp(Long id) {
+        if (id == null) return null;
+        return entityManager().find(LsSeqTrtGrp.class, id);
+    }
+
+	public static List<LsSeqTrtGrp> findLsSeqTrtGrpEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsSeqTrtGrp o", LsSeqTrtGrp.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<LsSeqTrtGrp> findLsSeqTrtGrpEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsSeqTrtGrp o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsSeqTrtGrp.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            LsSeqTrtGrp attached = LsSeqTrtGrp.findLsSeqTrtGrp(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public LsSeqTrtGrp merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        LsSeqTrtGrp merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	@Id
+    @SequenceGenerator(name = "lsSeqTrtGrpGen", sequenceName = "LSSEQ_TRTGRP_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqTrtGrpGen")
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqTrtGrp_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqTrtGrp_Roo_Configurable.aj
deleted file mode 100644
index 6d53c263e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqTrtGrp_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqTrtGrp;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LsSeqTrtGrp_Roo_Configurable {
-    
-    declare @type: LsSeqTrtGrp: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqTrtGrp_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqTrtGrp_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 8310f47d5..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqTrtGrp_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqTrtGrp;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LsSeqTrtGrp_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager LsSeqTrtGrp.entityManager;
-    
-    public static final List<String> LsSeqTrtGrp.fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
-    
-    public static final EntityManager LsSeqTrtGrp.entityManager() {
-        EntityManager em = new LsSeqTrtGrp().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long LsSeqTrtGrp.countLsSeqTrtGrps() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqTrtGrp o", Long.class).getSingleResult();
-    }
-    
-    public static List<LsSeqTrtGrp> LsSeqTrtGrp.findAllLsSeqTrtGrps() {
-        return entityManager().createQuery("SELECT o FROM LsSeqTrtGrp o", LsSeqTrtGrp.class).getResultList();
-    }
-    
-    public static List<LsSeqTrtGrp> LsSeqTrtGrp.findAllLsSeqTrtGrps(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsSeqTrtGrp o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsSeqTrtGrp.class).getResultList();
-    }
-    
-    public static LsSeqTrtGrp LsSeqTrtGrp.findLsSeqTrtGrp(Long id) {
-        if (id == null) return null;
-        return entityManager().find(LsSeqTrtGrp.class, id);
-    }
-    
-    public static List<LsSeqTrtGrp> LsSeqTrtGrp.findLsSeqTrtGrpEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsSeqTrtGrp o", LsSeqTrtGrp.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<LsSeqTrtGrp> LsSeqTrtGrp.findLsSeqTrtGrpEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsSeqTrtGrp o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsSeqTrtGrp.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void LsSeqTrtGrp.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void LsSeqTrtGrp.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            LsSeqTrtGrp attached = LsSeqTrtGrp.findLsSeqTrtGrp(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void LsSeqTrtGrp.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void LsSeqTrtGrp.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public LsSeqTrtGrp LsSeqTrtGrp.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        LsSeqTrtGrp merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqTrtGrp_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/LsSeqTrtGrp_Roo_Jpa_Entity.aj
deleted file mode 100644
index 9ff53b83f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqTrtGrp_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsSeqTrtGrp;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
-
-privileged aspect LsSeqTrtGrp_Roo_Jpa_Entity {
-    
-    declare @type: LsSeqTrtGrp: @Entity;
-    
-    @Id
-    @SequenceGenerator(name = "lsSeqTrtGrpGen", sequenceName = "LSSEQ_TRTGRP_PKSEQ")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqTrtGrpGen")
-    @Column(name = "id")
-    private Long LsSeqTrtGrp.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer LsSeqTrtGrp.version;
-    
-    public Long LsSeqTrtGrp.getId() {
-        return this.id;
-    }
-    
-    public void LsSeqTrtGrp.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer LsSeqTrtGrp.getVersion() {
-        return this.version;
-    }
-    
-    public void LsSeqTrtGrp.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsTag.java b/src/main/java/com/labsynch/labseer/domain/LsTag.java
index 9702850d0..58f04df4b 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsTag.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsTag.java
@@ -8,20 +8,34 @@
 import java.util.Set;
 
 import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.ManyToMany;
+import javax.persistence.PersistenceContext;
+import javax.persistence.SequenceGenerator;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
+import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
-
+import org.springframework.transaction.annotation.Transactional;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString(excludeFields = { "experiments", "protocols", "recordedDate", "version" })
 @RooJson
@@ -72,4 +86,244 @@ public static String toJsonArray(Collection<com.labsynch.labseer.domain.LsTag> c
     public static Collection<com.labsynch.labseer.domain.LsTag> fromJsonArrayToLsTags(String json) {
         return new JSONDeserializer<List<LsTag>>().use(null, ArrayList.class).use("values", LsTag.class).deserialize(json);
     }
+
+	public static Long countFindLsTagsByTagTextEquals(String tagText) {
+        if (tagText == null || tagText.length() == 0) throw new IllegalArgumentException("The tagText argument is required");
+        EntityManager em = LsTag.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsTag AS o WHERE o.tagText = :tagText", Long.class);
+        q.setParameter("tagText", tagText);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsTagsByTagTextLike(String tagText) {
+        if (tagText == null || tagText.length() == 0) throw new IllegalArgumentException("The tagText argument is required");
+        tagText = tagText.replace('*', '%');
+        if (tagText.charAt(0) != '%') {
+            tagText = "%" + tagText;
+        }
+        if (tagText.charAt(tagText.length() - 1) != '%') {
+            tagText = tagText + "%";
+        }
+        EntityManager em = LsTag.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsTag AS o WHERE LOWER(o.tagText) LIKE LOWER(:tagText)", Long.class);
+        q.setParameter("tagText", tagText);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<LsTag> findLsTagsByTagTextEquals(String tagText) {
+        if (tagText == null || tagText.length() == 0) throw new IllegalArgumentException("The tagText argument is required");
+        EntityManager em = LsTag.entityManager();
+        TypedQuery<LsTag> q = em.createQuery("SELECT o FROM LsTag AS o WHERE o.tagText = :tagText", LsTag.class);
+        q.setParameter("tagText", tagText);
+        return q;
+    }
+
+	public static TypedQuery<LsTag> findLsTagsByTagTextEquals(String tagText, String sortFieldName, String sortOrder) {
+        if (tagText == null || tagText.length() == 0) throw new IllegalArgumentException("The tagText argument is required");
+        EntityManager em = LsTag.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsTag AS o WHERE o.tagText = :tagText");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsTag> q = em.createQuery(queryBuilder.toString(), LsTag.class);
+        q.setParameter("tagText", tagText);
+        return q;
+    }
+
+	public static TypedQuery<LsTag> findLsTagsByTagTextLike(String tagText) {
+        if (tagText == null || tagText.length() == 0) throw new IllegalArgumentException("The tagText argument is required");
+        tagText = tagText.replace('*', '%');
+        if (tagText.charAt(0) != '%') {
+            tagText = "%" + tagText;
+        }
+        if (tagText.charAt(tagText.length() - 1) != '%') {
+            tagText = tagText + "%";
+        }
+        EntityManager em = LsTag.entityManager();
+        TypedQuery<LsTag> q = em.createQuery("SELECT o FROM LsTag AS o WHERE LOWER(o.tagText) LIKE LOWER(:tagText)", LsTag.class);
+        q.setParameter("tagText", tagText);
+        return q;
+    }
+
+	public static TypedQuery<LsTag> findLsTagsByTagTextLike(String tagText, String sortFieldName, String sortOrder) {
+        if (tagText == null || tagText.length() == 0) throw new IllegalArgumentException("The tagText argument is required");
+        tagText = tagText.replace('*', '%');
+        if (tagText.charAt(0) != '%') {
+            tagText = "%" + tagText;
+        }
+        if (tagText.charAt(tagText.length() - 1) != '%') {
+            tagText = tagText + "%";
+        }
+        EntityManager em = LsTag.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsTag AS o WHERE LOWER(o.tagText) LIKE LOWER(:tagText)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsTag> q = em.createQuery(queryBuilder.toString(), LsTag.class);
+        q.setParameter("tagText", tagText);
+        return q;
+    }
+
+	public String toString() {
+        return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).setExcludeFieldNames("experiments", "protocols", "recordedDate", "version").toString();
+    }
+
+	public String getTagText() {
+        return this.tagText;
+    }
+
+	public void setTagText(String tagText) {
+        this.tagText = tagText;
+    }
+
+	public Date getRecordedDate() {
+        return this.recordedDate;
+    }
+
+	public void setRecordedDate(Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+	public Set<Experiment> getExperiments() {
+        return this.experiments;
+    }
+
+	public void setExperiments(Set<Experiment> experiments) {
+        this.experiments = experiments;
+    }
+
+	public Set<Protocol> getProtocols() {
+        return this.protocols;
+    }
+
+	public void setProtocols(Set<Protocol> protocols) {
+        this.protocols = protocols;
+    }
+
+	public Set<LsThing> getLsThings() {
+        return this.lsThings;
+    }
+
+	public void setLsThings(Set<LsThing> lsThings) {
+        this.lsThings = lsThings;
+    }
+
+	@Id
+    @SequenceGenerator(name = "lsTagGen", sequenceName = "LS_TAG_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsTagGen")
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("tagText", "recordedDate", "experiments", "protocols", "lsThings");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new LsTag().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countLsTags() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM LsTag o", Long.class).getSingleResult();
+    }
+
+	public static List<LsTag> findAllLsTags() {
+        return entityManager().createQuery("SELECT o FROM LsTag o", LsTag.class).getResultList();
+    }
+
+	public static List<LsTag> findAllLsTags(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsTag o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsTag.class).getResultList();
+    }
+
+	public static LsTag findLsTag(Long id) {
+        if (id == null) return null;
+        return entityManager().find(LsTag.class, id);
+    }
+
+	public static List<LsTag> findLsTagEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsTag o", LsTag.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<LsTag> findLsTagEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsTag o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsTag.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            LsTag attached = LsTag.findLsTag(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public LsTag merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        LsTag merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LsTag_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/LsTag_Roo_Configurable.aj
deleted file mode 100755
index 036e15c9d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsTag_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsTag;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LsTag_Roo_Configurable {
-    
-    declare @type: LsTag: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsTag_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/LsTag_Roo_Finder.aj
deleted file mode 100755
index 28a8e7ee9..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsTag_Roo_Finder.aj
+++ /dev/null
@@ -1,95 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsTag;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect LsTag_Roo_Finder {
-    
-    public static Long LsTag.countFindLsTagsByTagTextEquals(String tagText) {
-        if (tagText == null || tagText.length() == 0) throw new IllegalArgumentException("The tagText argument is required");
-        EntityManager em = LsTag.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsTag AS o WHERE o.tagText = :tagText", Long.class);
-        q.setParameter("tagText", tagText);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsTag.countFindLsTagsByTagTextLike(String tagText) {
-        if (tagText == null || tagText.length() == 0) throw new IllegalArgumentException("The tagText argument is required");
-        tagText = tagText.replace('*', '%');
-        if (tagText.charAt(0) != '%') {
-            tagText = "%" + tagText;
-        }
-        if (tagText.charAt(tagText.length() - 1) != '%') {
-            tagText = tagText + "%";
-        }
-        EntityManager em = LsTag.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsTag AS o WHERE LOWER(o.tagText) LIKE LOWER(:tagText)", Long.class);
-        q.setParameter("tagText", tagText);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<LsTag> LsTag.findLsTagsByTagTextEquals(String tagText) {
-        if (tagText == null || tagText.length() == 0) throw new IllegalArgumentException("The tagText argument is required");
-        EntityManager em = LsTag.entityManager();
-        TypedQuery<LsTag> q = em.createQuery("SELECT o FROM LsTag AS o WHERE o.tagText = :tagText", LsTag.class);
-        q.setParameter("tagText", tagText);
-        return q;
-    }
-    
-    public static TypedQuery<LsTag> LsTag.findLsTagsByTagTextEquals(String tagText, String sortFieldName, String sortOrder) {
-        if (tagText == null || tagText.length() == 0) throw new IllegalArgumentException("The tagText argument is required");
-        EntityManager em = LsTag.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsTag AS o WHERE o.tagText = :tagText");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsTag> q = em.createQuery(queryBuilder.toString(), LsTag.class);
-        q.setParameter("tagText", tagText);
-        return q;
-    }
-    
-    public static TypedQuery<LsTag> LsTag.findLsTagsByTagTextLike(String tagText) {
-        if (tagText == null || tagText.length() == 0) throw new IllegalArgumentException("The tagText argument is required");
-        tagText = tagText.replace('*', '%');
-        if (tagText.charAt(0) != '%') {
-            tagText = "%" + tagText;
-        }
-        if (tagText.charAt(tagText.length() - 1) != '%') {
-            tagText = tagText + "%";
-        }
-        EntityManager em = LsTag.entityManager();
-        TypedQuery<LsTag> q = em.createQuery("SELECT o FROM LsTag AS o WHERE LOWER(o.tagText) LIKE LOWER(:tagText)", LsTag.class);
-        q.setParameter("tagText", tagText);
-        return q;
-    }
-    
-    public static TypedQuery<LsTag> LsTag.findLsTagsByTagTextLike(String tagText, String sortFieldName, String sortOrder) {
-        if (tagText == null || tagText.length() == 0) throw new IllegalArgumentException("The tagText argument is required");
-        tagText = tagText.replace('*', '%');
-        if (tagText.charAt(0) != '%') {
-            tagText = "%" + tagText;
-        }
-        if (tagText.charAt(tagText.length() - 1) != '%') {
-            tagText = tagText + "%";
-        }
-        EntityManager em = LsTag.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsTag AS o WHERE LOWER(o.tagText) LIKE LOWER(:tagText)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsTag> q = em.createQuery(queryBuilder.toString(), LsTag.class);
-        q.setParameter("tagText", tagText);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsTag_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/LsTag_Roo_JavaBean.aj
deleted file mode 100755
index a3a318c46..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsTag_Roo_JavaBean.aj
+++ /dev/null
@@ -1,55 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.LsTag;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.Protocol;
-import java.util.Date;
-import java.util.Set;
-
-privileged aspect LsTag_Roo_JavaBean {
-    
-    public String LsTag.getTagText() {
-        return this.tagText;
-    }
-    
-    public void LsTag.setTagText(String tagText) {
-        this.tagText = tagText;
-    }
-    
-    public Date LsTag.getRecordedDate() {
-        return this.recordedDate;
-    }
-    
-    public void LsTag.setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
-    
-    public Set<Experiment> LsTag.getExperiments() {
-        return this.experiments;
-    }
-    
-    public void LsTag.setExperiments(Set<Experiment> experiments) {
-        this.experiments = experiments;
-    }
-    
-    public Set<Protocol> LsTag.getProtocols() {
-        return this.protocols;
-    }
-    
-    public void LsTag.setProtocols(Set<Protocol> protocols) {
-        this.protocols = protocols;
-    }
-    
-    public Set<LsThing> LsTag.getLsThings() {
-        return this.lsThings;
-    }
-    
-    public void LsTag.setLsThings(Set<LsThing> lsThings) {
-        this.lsThings = lsThings;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsTag_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/LsTag_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 6b6b01c02..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsTag_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsTag;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LsTag_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager LsTag.entityManager;
-    
-    public static final List<String> LsTag.fieldNames4OrderClauseFilter = java.util.Arrays.asList("tagText", "recordedDate", "experiments", "protocols", "lsThings");
-    
-    public static final EntityManager LsTag.entityManager() {
-        EntityManager em = new LsTag().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long LsTag.countLsTags() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LsTag o", Long.class).getSingleResult();
-    }
-    
-    public static List<LsTag> LsTag.findAllLsTags() {
-        return entityManager().createQuery("SELECT o FROM LsTag o", LsTag.class).getResultList();
-    }
-    
-    public static List<LsTag> LsTag.findAllLsTags(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsTag o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsTag.class).getResultList();
-    }
-    
-    public static LsTag LsTag.findLsTag(Long id) {
-        if (id == null) return null;
-        return entityManager().find(LsTag.class, id);
-    }
-    
-    public static List<LsTag> LsTag.findLsTagEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsTag o", LsTag.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<LsTag> LsTag.findLsTagEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsTag o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsTag.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void LsTag.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void LsTag.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            LsTag attached = LsTag.findLsTag(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void LsTag.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void LsTag.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public LsTag LsTag.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        LsTag merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsTag_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/LsTag_Roo_Jpa_Entity.aj
deleted file mode 100755
index d971c72c2..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsTag_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsTag;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
-
-privileged aspect LsTag_Roo_Jpa_Entity {
-    
-    declare @type: LsTag: @Entity;
-    
-    @Id
-    @SequenceGenerator(name = "lsTagGen", sequenceName = "LS_TAG_PKSEQ")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsTagGen")
-    @Column(name = "id")
-    private Long LsTag.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer LsTag.version;
-    
-    public Long LsTag.getId() {
-        return this.id;
-    }
-    
-    public void LsTag.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer LsTag.getVersion() {
-        return this.version;
-    }
-    
-    public void LsTag.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsTag_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/LsTag_Roo_ToString.aj
deleted file mode 100755
index 29b5de71b..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsTag_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsTag;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect LsTag_Roo_ToString {
-    
-    public String LsTag.toString() {
-        return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).setExcludeFieldNames("experiments", "protocols", "recordedDate", "version").toString();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThing.java b/src/main/java/com/labsynch/labseer/domain/LsThing.java
index 3f16c8d37..fcdcb0050 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsThing.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsThing.java
@@ -10,6 +10,7 @@
 import java.util.Set;
 
 import javax.persistence.CascadeType;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
@@ -18,10 +19,12 @@
 import javax.persistence.OneToMany;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.hibernate.StaleObjectStateException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -37,6 +40,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString(excludeFields = { "lsTags", "lsStates", "lsLabels" })
 @RooJson
@@ -980,4 +985,517 @@ public static TypedQuery<LsThing> findLsThingByAllLabelText(String thingType,
 	
 	}
 
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsStates", "lsLabels", "lsTags", "firstLsThings", "secondLsThings");
+
+	public static long countLsThings() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM LsThing o", Long.class).getSingleResult();
+    }
+
+	public static List<LsThing> findAllLsThings() {
+        return entityManager().createQuery("SELECT o FROM LsThing o", LsThing.class).getResultList();
+    }
+
+	public static List<LsThing> findAllLsThings(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsThing o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsThing.class).getResultList();
+    }
+
+	public static LsThing findLsThing(Long id) {
+        if (id == null) return null;
+        return entityManager().find(LsThing.class, id);
+    }
+
+	public static List<LsThing> findLsThingEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsThing o", LsThing.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<LsThing> findLsThingEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsThing o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsThing.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public LsThing merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        LsThing merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public static LsThing fromJsonToLsThing(String json) {
+        return new JSONDeserializer<LsThing>()
+        .use(null, LsThing.class).deserialize(json);
+    }
+
+	public static Collection<LsThing> fromJsonArrayToLsThings(String json) {
+        return new JSONDeserializer<List<LsThing>>()
+        .use("values", LsThing.class).deserialize(json);
+    }
+
+	public String toString() {
+        return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).setExcludeFieldNames("lsTags", "lsStates", "lsLabels").toString();
+    }
+
+	public static Long countFindLsThingsByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = LsThing.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE o.codeName = :codeName", Long.class);
+        q.setParameter("codeName", codeName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsThingsByCodeNameLike(String codeName) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        codeName = codeName.replace('*', '%');
+        if (codeName.charAt(0) != '%') {
+            codeName = "%" + codeName;
+        }
+        if (codeName.charAt(codeName.length() - 1) != '%') {
+            codeName = codeName + "%";
+        }
+        EntityManager em = LsThing.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)", Long.class);
+        q.setParameter("codeName", codeName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsThingsByLsKindEquals(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = LsThing.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE o.lsKind = :lsKind", Long.class);
+        q.setParameter("lsKind", lsKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsThingsByLsKindLike(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        lsKind = lsKind.replace('*', '%');
+        if (lsKind.charAt(0) != '%') {
+            lsKind = "%" + lsKind;
+        }
+        if (lsKind.charAt(lsKind.length() - 1) != '%') {
+            lsKind = lsKind + "%";
+        }
+        EntityManager em = LsThing.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)", Long.class);
+        q.setParameter("lsKind", lsKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsThingsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = LsThing.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsThingsByLsTypeAndKindEquals(String lsTypeAndKind) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        EntityManager em = LsThing.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", Long.class);
+        q.setParameter("lsTypeAndKind", lsTypeAndKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsThingsByLsTypeEquals(String lsType) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = LsThing.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE o.lsType = :lsType", Long.class);
+        q.setParameter("lsType", lsType);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsThingsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = LsThing.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsThingsByRecordedByLike(String recordedBy) {
+        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+        recordedBy = recordedBy.replace('*', '%');
+        if (recordedBy.charAt(0) != '%') {
+            recordedBy = "%" + recordedBy;
+        }
+        if (recordedBy.charAt(recordedBy.length() - 1) != '%') {
+            recordedBy = recordedBy + "%";
+        }
+        EntityManager em = LsThing.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)", Long.class);
+        q.setParameter("recordedBy", recordedBy);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsThingsByRecordedDateGreaterThan(Date recordedDate) {
+        if (recordedDate == null) throw new IllegalArgumentException("The recordedDate argument is required");
+        EntityManager em = LsThing.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE o.recordedDate > :recordedDate", Long.class);
+        q.setParameter("recordedDate", recordedDate);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsThingsByRecordedDateLessThan(Date recordedDate) {
+        if (recordedDate == null) throw new IllegalArgumentException("The recordedDate argument is required");
+        EntityManager em = LsThing.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE o.recordedDate < :recordedDate", Long.class);
+        q.setParameter("recordedDate", recordedDate);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<LsThing> findLsThingsByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = LsThing.entityManager();
+        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.codeName = :codeName", LsThing.class);
+        q.setParameter("codeName", codeName);
+        return q;
+    }
+
+	public static TypedQuery<LsThing> findLsThingsByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = LsThing.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE o.codeName = :codeName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThing> q = em.createQuery(queryBuilder.toString(), LsThing.class);
+        q.setParameter("codeName", codeName);
+        return q;
+    }
+
+	public static TypedQuery<LsThing> findLsThingsByCodeNameLike(String codeName) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        codeName = codeName.replace('*', '%');
+        if (codeName.charAt(0) != '%') {
+            codeName = "%" + codeName;
+        }
+        if (codeName.charAt(codeName.length() - 1) != '%') {
+            codeName = codeName + "%";
+        }
+        EntityManager em = LsThing.entityManager();
+        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)", LsThing.class);
+        q.setParameter("codeName", codeName);
+        return q;
+    }
+
+	public static TypedQuery<LsThing> findLsThingsByCodeNameLike(String codeName, String sortFieldName, String sortOrder) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        codeName = codeName.replace('*', '%');
+        if (codeName.charAt(0) != '%') {
+            codeName = "%" + codeName;
+        }
+        if (codeName.charAt(codeName.length() - 1) != '%') {
+            codeName = codeName + "%";
+        }
+        EntityManager em = LsThing.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThing> q = em.createQuery(queryBuilder.toString(), LsThing.class);
+        q.setParameter("codeName", codeName);
+        return q;
+    }
+
+	public static TypedQuery<LsThing> findLsThingsByLsKindEquals(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = LsThing.entityManager();
+        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.lsKind = :lsKind", LsThing.class);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<LsThing> findLsThingsByLsKindEquals(String lsKind, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = LsThing.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE o.lsKind = :lsKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThing> q = em.createQuery(queryBuilder.toString(), LsThing.class);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<LsThing> findLsThingsByLsKindLike(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        lsKind = lsKind.replace('*', '%');
+        if (lsKind.charAt(0) != '%') {
+            lsKind = "%" + lsKind;
+        }
+        if (lsKind.charAt(lsKind.length() - 1) != '%') {
+            lsKind = lsKind + "%";
+        }
+        EntityManager em = LsThing.entityManager();
+        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)", LsThing.class);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<LsThing> findLsThingsByLsKindLike(String lsKind, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        lsKind = lsKind.replace('*', '%');
+        if (lsKind.charAt(0) != '%') {
+            lsKind = "%" + lsKind;
+        }
+        if (lsKind.charAt(lsKind.length() - 1) != '%') {
+            lsKind = lsKind + "%";
+        }
+        EntityManager em = LsThing.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThing> q = em.createQuery(queryBuilder.toString(), LsThing.class);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<LsThing> findLsThingsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = LsThing.entityManager();
+        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.lsTransaction = :lsTransaction", LsThing.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<LsThing> findLsThingsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = LsThing.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE o.lsTransaction = :lsTransaction");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThing> q = em.createQuery(queryBuilder.toString(), LsThing.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<LsThing> findLsThingsByLsTypeAndKindEquals(String lsTypeAndKind) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        EntityManager em = LsThing.entityManager();
+        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", LsThing.class);
+        q.setParameter("lsTypeAndKind", lsTypeAndKind);
+        return q;
+    }
+
+	public static TypedQuery<LsThing> findLsThingsByLsTypeAndKindEquals(String lsTypeAndKind, String sortFieldName, String sortOrder) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        EntityManager em = LsThing.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE o.lsTypeAndKind = :lsTypeAndKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThing> q = em.createQuery(queryBuilder.toString(), LsThing.class);
+        q.setParameter("lsTypeAndKind", lsTypeAndKind);
+        return q;
+    }
+
+	public static TypedQuery<LsThing> findLsThingsByLsTypeEquals(String lsType) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = LsThing.entityManager();
+        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.lsType = :lsType", LsThing.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<LsThing> findLsThingsByLsTypeEquals(String lsType, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = LsThing.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE o.lsType = :lsType");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThing> q = em.createQuery(queryBuilder.toString(), LsThing.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<LsThing> findLsThingsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = LsThing.entityManager();
+        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", LsThing.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<LsThing> findLsThingsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = LsThing.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThing> q = em.createQuery(queryBuilder.toString(), LsThing.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<LsThing> findLsThingsByRecordedByLike(String recordedBy) {
+        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+        recordedBy = recordedBy.replace('*', '%');
+        if (recordedBy.charAt(0) != '%') {
+            recordedBy = "%" + recordedBy;
+        }
+        if (recordedBy.charAt(recordedBy.length() - 1) != '%') {
+            recordedBy = recordedBy + "%";
+        }
+        EntityManager em = LsThing.entityManager();
+        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)", LsThing.class);
+        q.setParameter("recordedBy", recordedBy);
+        return q;
+    }
+
+	public static TypedQuery<LsThing> findLsThingsByRecordedByLike(String recordedBy, String sortFieldName, String sortOrder) {
+        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+        recordedBy = recordedBy.replace('*', '%');
+        if (recordedBy.charAt(0) != '%') {
+            recordedBy = "%" + recordedBy;
+        }
+        if (recordedBy.charAt(recordedBy.length() - 1) != '%') {
+            recordedBy = recordedBy + "%";
+        }
+        EntityManager em = LsThing.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThing> q = em.createQuery(queryBuilder.toString(), LsThing.class);
+        q.setParameter("recordedBy", recordedBy);
+        return q;
+    }
+
+	public static TypedQuery<LsThing> findLsThingsByRecordedDateGreaterThan(Date recordedDate) {
+        if (recordedDate == null) throw new IllegalArgumentException("The recordedDate argument is required");
+        EntityManager em = LsThing.entityManager();
+        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.recordedDate > :recordedDate", LsThing.class);
+        q.setParameter("recordedDate", recordedDate);
+        return q;
+    }
+
+	public static TypedQuery<LsThing> findLsThingsByRecordedDateGreaterThan(Date recordedDate, String sortFieldName, String sortOrder) {
+        if (recordedDate == null) throw new IllegalArgumentException("The recordedDate argument is required");
+        EntityManager em = LsThing.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE o.recordedDate > :recordedDate");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThing> q = em.createQuery(queryBuilder.toString(), LsThing.class);
+        q.setParameter("recordedDate", recordedDate);
+        return q;
+    }
+
+	public static TypedQuery<LsThing> findLsThingsByRecordedDateLessThan(Date recordedDate) {
+        if (recordedDate == null) throw new IllegalArgumentException("The recordedDate argument is required");
+        EntityManager em = LsThing.entityManager();
+        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.recordedDate < :recordedDate", LsThing.class);
+        q.setParameter("recordedDate", recordedDate);
+        return q;
+    }
+
+	public static TypedQuery<LsThing> findLsThingsByRecordedDateLessThan(Date recordedDate, String sortFieldName, String sortOrder) {
+        if (recordedDate == null) throw new IllegalArgumentException("The recordedDate argument is required");
+        EntityManager em = LsThing.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE o.recordedDate < :recordedDate");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThing> q = em.createQuery(queryBuilder.toString(), LsThing.class);
+        q.setParameter("recordedDate", recordedDate);
+        return q;
+    }
+
+	public Set<LsThingState> getLsStates() {
+        return this.lsStates;
+    }
+
+	public void setLsStates(Set<LsThingState> lsStates) {
+        this.lsStates = lsStates;
+    }
+
+	public Set<LsThingLabel> getLsLabels() {
+        return this.lsLabels;
+    }
+
+	public void setLsLabels(Set<LsThingLabel> lsLabels) {
+        this.lsLabels = lsLabels;
+    }
+
+	public Set<LsTag> getLsTags() {
+        return this.lsTags;
+    }
+
+	public void setLsTags(Set<LsTag> lsTags) {
+        this.lsTags = lsTags;
+    }
+
+	public Set<ItxLsThingLsThing> getFirstLsThings() {
+        return this.firstLsThings;
+    }
+
+	public void setFirstLsThings(Set<ItxLsThingLsThing> firstLsThings) {
+        this.firstLsThings = firstLsThings;
+    }
+
+	public Set<ItxLsThingLsThing> getSecondLsThings() {
+        return this.secondLsThings;
+    }
+
+	public void setSecondLsThings(Set<ItxLsThingLsThing> secondLsThings) {
+        this.secondLsThings = secondLsThings;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingLabel.java b/src/main/java/com/labsynch/labseer/domain/LsThingLabel.java
index 196855275..d7368f0d4 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsThingLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsThingLabel.java
@@ -7,16 +7,18 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -28,6 +30,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -603,4 +607,252 @@ public static TypedQuery<LsThingLabel> findLsThingLabelsByLsThingAndLsTypeAndLsK
 
 
 	
+
+	public LsThing getLsThing() {
+        return this.lsThing;
+    }
+
+	public void setLsThing(LsThing lsThing) {
+        this.lsThing = lsThing;
+    }
+
+	public String getLsThingTypeAndKind() {
+        return this.lsThingTypeAndKind;
+    }
+
+	public void setLsThingTypeAndKind(String lsThingTypeAndKind) {
+        this.lsThingTypeAndKind = lsThingTypeAndKind;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsThing", "lsThingTypeAndKind");
+
+	public static long countLsThingLabels() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM LsThingLabel o", Long.class).getSingleResult();
+    }
+
+	public static List<LsThingLabel> findAllLsThingLabels() {
+        return entityManager().createQuery("SELECT o FROM LsThingLabel o", LsThingLabel.class).getResultList();
+    }
+
+	public static List<LsThingLabel> findAllLsThingLabels(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsThingLabel o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsThingLabel.class).getResultList();
+    }
+
+	public static LsThingLabel findLsThingLabel(Long id) {
+        if (id == null) return null;
+        return entityManager().find(LsThingLabel.class, id);
+    }
+
+	public static List<LsThingLabel> findLsThingLabelEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsThingLabel o", LsThingLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<LsThingLabel> findLsThingLabelEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsThingLabel o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsThingLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public LsThingLabel merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        LsThingLabel merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public static Long countFindLsThingLabelsByLabelTextEquals(String labelText) {
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        EntityManager em = LsThingLabel.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingLabel AS o WHERE o.labelText = :labelText", Long.class);
+        q.setParameter("labelText", labelText);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsThingLabelsByLabelTextEqualsAndIgnoredNot(String labelText, boolean ignored) {
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        EntityManager em = LsThingLabel.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored", Long.class);
+        q.setParameter("labelText", labelText);
+        q.setParameter("ignored", ignored);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsThingLabelsByLabelTextLike(String labelText) {
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        labelText = labelText.replace('*', '%');
+        if (labelText.charAt(0) != '%') {
+            labelText = "%" + labelText;
+        }
+        if (labelText.charAt(labelText.length() - 1) != '%') {
+            labelText = labelText + "%";
+        }
+        EntityManager em = LsThingLabel.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", Long.class);
+        q.setParameter("labelText", labelText);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsThingLabelsByLsThing(LsThing lsThing) {
+        if (lsThing == null) throw new IllegalArgumentException("The lsThing argument is required");
+        EntityManager em = LsThingLabel.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingLabel AS o WHERE o.lsThing = :lsThing", Long.class);
+        q.setParameter("lsThing", lsThing);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsThingLabelsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = LsThingLabel.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingLabel AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<LsThingLabel> findLsThingLabelsByLabelTextEquals(String labelText) {
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        EntityManager em = LsThingLabel.entityManager();
+        TypedQuery<LsThingLabel> q = em.createQuery("SELECT o FROM LsThingLabel AS o WHERE o.labelText = :labelText", LsThingLabel.class);
+        q.setParameter("labelText", labelText);
+        return q;
+    }
+
+	public static TypedQuery<LsThingLabel> findLsThingLabelsByLabelTextEquals(String labelText, String sortFieldName, String sortOrder) {
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        EntityManager em = LsThingLabel.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingLabel AS o WHERE o.labelText = :labelText");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThingLabel> q = em.createQuery(queryBuilder.toString(), LsThingLabel.class);
+        q.setParameter("labelText", labelText);
+        return q;
+    }
+
+	public static TypedQuery<LsThingLabel> findLsThingLabelsByLabelTextEqualsAndIgnoredNot(String labelText, boolean ignored) {
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        EntityManager em = LsThingLabel.entityManager();
+        TypedQuery<LsThingLabel> q = em.createQuery("SELECT o FROM LsThingLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored", LsThingLabel.class);
+        q.setParameter("labelText", labelText);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<LsThingLabel> findLsThingLabelsByLabelTextEqualsAndIgnoredNot(String labelText, boolean ignored, String sortFieldName, String sortOrder) {
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        EntityManager em = LsThingLabel.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThingLabel> q = em.createQuery(queryBuilder.toString(), LsThingLabel.class);
+        q.setParameter("labelText", labelText);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<LsThingLabel> findLsThingLabelsByLabelTextLike(String labelText) {
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        labelText = labelText.replace('*', '%');
+        if (labelText.charAt(0) != '%') {
+            labelText = "%" + labelText;
+        }
+        if (labelText.charAt(labelText.length() - 1) != '%') {
+            labelText = labelText + "%";
+        }
+        EntityManager em = LsThingLabel.entityManager();
+        TypedQuery<LsThingLabel> q = em.createQuery("SELECT o FROM LsThingLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", LsThingLabel.class);
+        q.setParameter("labelText", labelText);
+        return q;
+    }
+
+	public static TypedQuery<LsThingLabel> findLsThingLabelsByLabelTextLike(String labelText, String sortFieldName, String sortOrder) {
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        labelText = labelText.replace('*', '%');
+        if (labelText.charAt(0) != '%') {
+            labelText = "%" + labelText;
+        }
+        if (labelText.charAt(labelText.length() - 1) != '%') {
+            labelText = labelText + "%";
+        }
+        EntityManager em = LsThingLabel.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThingLabel> q = em.createQuery(queryBuilder.toString(), LsThingLabel.class);
+        q.setParameter("labelText", labelText);
+        return q;
+    }
+
+	public static TypedQuery<LsThingLabel> findLsThingLabelsByLsThing(LsThing lsThing) {
+        if (lsThing == null) throw new IllegalArgumentException("The lsThing argument is required");
+        EntityManager em = LsThingLabel.entityManager();
+        TypedQuery<LsThingLabel> q = em.createQuery("SELECT o FROM LsThingLabel AS o WHERE o.lsThing = :lsThing", LsThingLabel.class);
+        q.setParameter("lsThing", lsThing);
+        return q;
+    }
+
+	public static TypedQuery<LsThingLabel> findLsThingLabelsByLsThing(LsThing lsThing, String sortFieldName, String sortOrder) {
+        if (lsThing == null) throw new IllegalArgumentException("The lsThing argument is required");
+        EntityManager em = LsThingLabel.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingLabel AS o WHERE o.lsThing = :lsThing");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThingLabel> q = em.createQuery(queryBuilder.toString(), LsThingLabel.class);
+        q.setParameter("lsThing", lsThing);
+        return q;
+    }
+
+	public static TypedQuery<LsThingLabel> findLsThingLabelsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = LsThingLabel.entityManager();
+        TypedQuery<LsThingLabel> q = em.createQuery("SELECT o FROM LsThingLabel AS o WHERE o.lsTransaction = :lsTransaction", LsThingLabel.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<LsThingLabel> findLsThingLabelsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = LsThingLabel.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingLabel AS o WHERE o.lsTransaction = :lsTransaction");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThingLabel> q = em.createQuery(queryBuilder.toString(), LsThingLabel.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingLabel_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/LsThingLabel_Roo_Configurable.aj
deleted file mode 100755
index 7e5d85a6b..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsThingLabel_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsThingLabel;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LsThingLabel_Roo_Configurable {
-    
-    declare @type: LsThingLabel: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingLabel_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/LsThingLabel_Roo_Finder.aj
deleted file mode 100755
index 913ec371f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsThingLabel_Roo_Finder.aj
+++ /dev/null
@@ -1,192 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.LsThingLabel;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect LsThingLabel_Roo_Finder {
-    
-    public static Long LsThingLabel.countFindLsThingLabelsByLabelTextEquals(String labelText) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        EntityManager em = LsThingLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingLabel AS o WHERE o.labelText = :labelText", Long.class);
-        q.setParameter("labelText", labelText);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsThingLabel.countFindLsThingLabelsByLabelTextEqualsAndIgnoredNot(String labelText, boolean ignored) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        EntityManager em = LsThingLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored", Long.class);
-        q.setParameter("labelText", labelText);
-        q.setParameter("ignored", ignored);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsThingLabel.countFindLsThingLabelsByLabelTextLike(String labelText) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        labelText = labelText.replace('*', '%');
-        if (labelText.charAt(0) != '%') {
-            labelText = "%" + labelText;
-        }
-        if (labelText.charAt(labelText.length() - 1) != '%') {
-            labelText = labelText + "%";
-        }
-        EntityManager em = LsThingLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", Long.class);
-        q.setParameter("labelText", labelText);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsThingLabel.countFindLsThingLabelsByLsThing(LsThing lsThing) {
-        if (lsThing == null) throw new IllegalArgumentException("The lsThing argument is required");
-        EntityManager em = LsThingLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingLabel AS o WHERE o.lsThing = :lsThing", Long.class);
-        q.setParameter("lsThing", lsThing);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsThingLabel.countFindLsThingLabelsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = LsThingLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingLabel AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<LsThingLabel> LsThingLabel.findLsThingLabelsByLabelTextEquals(String labelText) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        EntityManager em = LsThingLabel.entityManager();
-        TypedQuery<LsThingLabel> q = em.createQuery("SELECT o FROM LsThingLabel AS o WHERE o.labelText = :labelText", LsThingLabel.class);
-        q.setParameter("labelText", labelText);
-        return q;
-    }
-    
-    public static TypedQuery<LsThingLabel> LsThingLabel.findLsThingLabelsByLabelTextEquals(String labelText, String sortFieldName, String sortOrder) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        EntityManager em = LsThingLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingLabel AS o WHERE o.labelText = :labelText");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThingLabel> q = em.createQuery(queryBuilder.toString(), LsThingLabel.class);
-        q.setParameter("labelText", labelText);
-        return q;
-    }
-    
-    public static TypedQuery<LsThingLabel> LsThingLabel.findLsThingLabelsByLabelTextEqualsAndIgnoredNot(String labelText, boolean ignored) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        EntityManager em = LsThingLabel.entityManager();
-        TypedQuery<LsThingLabel> q = em.createQuery("SELECT o FROM LsThingLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored", LsThingLabel.class);
-        q.setParameter("labelText", labelText);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<LsThingLabel> LsThingLabel.findLsThingLabelsByLabelTextEqualsAndIgnoredNot(String labelText, boolean ignored, String sortFieldName, String sortOrder) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        EntityManager em = LsThingLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThingLabel> q = em.createQuery(queryBuilder.toString(), LsThingLabel.class);
-        q.setParameter("labelText", labelText);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<LsThingLabel> LsThingLabel.findLsThingLabelsByLabelTextLike(String labelText) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        labelText = labelText.replace('*', '%');
-        if (labelText.charAt(0) != '%') {
-            labelText = "%" + labelText;
-        }
-        if (labelText.charAt(labelText.length() - 1) != '%') {
-            labelText = labelText + "%";
-        }
-        EntityManager em = LsThingLabel.entityManager();
-        TypedQuery<LsThingLabel> q = em.createQuery("SELECT o FROM LsThingLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", LsThingLabel.class);
-        q.setParameter("labelText", labelText);
-        return q;
-    }
-    
-    public static TypedQuery<LsThingLabel> LsThingLabel.findLsThingLabelsByLabelTextLike(String labelText, String sortFieldName, String sortOrder) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        labelText = labelText.replace('*', '%');
-        if (labelText.charAt(0) != '%') {
-            labelText = "%" + labelText;
-        }
-        if (labelText.charAt(labelText.length() - 1) != '%') {
-            labelText = labelText + "%";
-        }
-        EntityManager em = LsThingLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThingLabel> q = em.createQuery(queryBuilder.toString(), LsThingLabel.class);
-        q.setParameter("labelText", labelText);
-        return q;
-    }
-    
-    public static TypedQuery<LsThingLabel> LsThingLabel.findLsThingLabelsByLsThing(LsThing lsThing) {
-        if (lsThing == null) throw new IllegalArgumentException("The lsThing argument is required");
-        EntityManager em = LsThingLabel.entityManager();
-        TypedQuery<LsThingLabel> q = em.createQuery("SELECT o FROM LsThingLabel AS o WHERE o.lsThing = :lsThing", LsThingLabel.class);
-        q.setParameter("lsThing", lsThing);
-        return q;
-    }
-    
-    public static TypedQuery<LsThingLabel> LsThingLabel.findLsThingLabelsByLsThing(LsThing lsThing, String sortFieldName, String sortOrder) {
-        if (lsThing == null) throw new IllegalArgumentException("The lsThing argument is required");
-        EntityManager em = LsThingLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingLabel AS o WHERE o.lsThing = :lsThing");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThingLabel> q = em.createQuery(queryBuilder.toString(), LsThingLabel.class);
-        q.setParameter("lsThing", lsThing);
-        return q;
-    }
-    
-    public static TypedQuery<LsThingLabel> LsThingLabel.findLsThingLabelsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = LsThingLabel.entityManager();
-        TypedQuery<LsThingLabel> q = em.createQuery("SELECT o FROM LsThingLabel AS o WHERE o.lsTransaction = :lsTransaction", LsThingLabel.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<LsThingLabel> LsThingLabel.findLsThingLabelsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = LsThingLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingLabel AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThingLabel> q = em.createQuery(queryBuilder.toString(), LsThingLabel.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingLabel_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/LsThingLabel_Roo_JavaBean.aj
deleted file mode 100755
index 7a1dbae67..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsThingLabel_Roo_JavaBean.aj
+++ /dev/null
@@ -1,27 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.LsThingLabel;
-
-privileged aspect LsThingLabel_Roo_JavaBean {
-    
-    public LsThing LsThingLabel.getLsThing() {
-        return this.lsThing;
-    }
-    
-    public void LsThingLabel.setLsThing(LsThing lsThing) {
-        this.lsThing = lsThing;
-    }
-    
-    public String LsThingLabel.getLsThingTypeAndKind() {
-        return this.lsThingTypeAndKind;
-    }
-    
-    public void LsThingLabel.setLsThingTypeAndKind(String lsThingTypeAndKind) {
-        this.lsThingTypeAndKind = lsThingTypeAndKind;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingLabel_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/LsThingLabel_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index d18e1358c..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsThingLabel_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsThingLabel;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LsThingLabel_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> LsThingLabel.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsThing", "lsThingTypeAndKind");
-    
-    public static long LsThingLabel.countLsThingLabels() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LsThingLabel o", Long.class).getSingleResult();
-    }
-    
-    public static List<LsThingLabel> LsThingLabel.findAllLsThingLabels() {
-        return entityManager().createQuery("SELECT o FROM LsThingLabel o", LsThingLabel.class).getResultList();
-    }
-    
-    public static List<LsThingLabel> LsThingLabel.findAllLsThingLabels(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsThingLabel o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsThingLabel.class).getResultList();
-    }
-    
-    public static LsThingLabel LsThingLabel.findLsThingLabel(Long id) {
-        if (id == null) return null;
-        return entityManager().find(LsThingLabel.class, id);
-    }
-    
-    public static List<LsThingLabel> LsThingLabel.findLsThingLabelEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsThingLabel o", LsThingLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<LsThingLabel> LsThingLabel.findLsThingLabelEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsThingLabel o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsThingLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public LsThingLabel LsThingLabel.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        LsThingLabel merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingLabel_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/LsThingLabel_Roo_Jpa_Entity.aj
deleted file mode 100755
index e9341b8c8..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsThingLabel_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsThingLabel;
-import javax.persistence.Entity;
-
-privileged aspect LsThingLabel_Roo_Jpa_Entity {
-    
-    declare @type: LsThingLabel: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingLabel_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/LsThingLabel_Roo_ToString.aj
deleted file mode 100755
index cd5177bd0..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsThingLabel_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsThingLabel;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect LsThingLabel_Roo_ToString {
-    
-    public String LsThingLabel.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingState.java b/src/main/java/com/labsynch/labseer/domain/LsThingState.java
index 28f49a6d6..687559e2a 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsThingState.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsThingState.java
@@ -10,6 +10,7 @@
 import java.util.Set;
 
 import javax.persistence.CascadeType;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
@@ -17,7 +18,9 @@
 import javax.persistence.OneToMany;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -30,6 +33,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -133,4 +138,135 @@ public static TypedQuery<LsThingState> findLsThingStatesByLsThingCodeNameAndStat
 		q.setParameter("ignored", true);
 		return q;
 	}
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsThing", "lsValues");
+
+	public static long countLsThingStates() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM LsThingState o", Long.class).getSingleResult();
+    }
+
+	public static List<LsThingState> findAllLsThingStates() {
+        return entityManager().createQuery("SELECT o FROM LsThingState o", LsThingState.class).getResultList();
+    }
+
+	public static List<LsThingState> findAllLsThingStates(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsThingState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsThingState.class).getResultList();
+    }
+
+	public static LsThingState findLsThingState(Long id) {
+        if (id == null) return null;
+        return entityManager().find(LsThingState.class, id);
+    }
+
+	public static List<LsThingState> findLsThingStateEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsThingState o", LsThingState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<LsThingState> findLsThingStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsThingState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsThingState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public LsThingState merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        LsThingState merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static Long countFindLsThingStatesByLsThing(LsThing lsThing) {
+        if (lsThing == null) throw new IllegalArgumentException("The lsThing argument is required");
+        EntityManager em = LsThingState.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingState AS o WHERE o.lsThing = :lsThing", Long.class);
+        q.setParameter("lsThing", lsThing);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsThingStatesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = LsThingState.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingState AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<LsThingState> findLsThingStatesByLsThing(LsThing lsThing) {
+        if (lsThing == null) throw new IllegalArgumentException("The lsThing argument is required");
+        EntityManager em = LsThingState.entityManager();
+        TypedQuery<LsThingState> q = em.createQuery("SELECT o FROM LsThingState AS o WHERE o.lsThing = :lsThing", LsThingState.class);
+        q.setParameter("lsThing", lsThing);
+        return q;
+    }
+
+	public static TypedQuery<LsThingState> findLsThingStatesByLsThing(LsThing lsThing, String sortFieldName, String sortOrder) {
+        if (lsThing == null) throw new IllegalArgumentException("The lsThing argument is required");
+        EntityManager em = LsThingState.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingState AS o WHERE o.lsThing = :lsThing");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThingState> q = em.createQuery(queryBuilder.toString(), LsThingState.class);
+        q.setParameter("lsThing", lsThing);
+        return q;
+    }
+
+	public static TypedQuery<LsThingState> findLsThingStatesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = LsThingState.entityManager();
+        TypedQuery<LsThingState> q = em.createQuery("SELECT o FROM LsThingState AS o WHERE o.lsTransaction = :lsTransaction", LsThingState.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<LsThingState> findLsThingStatesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = LsThingState.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingState AS o WHERE o.lsTransaction = :lsTransaction");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThingState> q = em.createQuery(queryBuilder.toString(), LsThingState.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public LsThing getLsThing() {
+        return this.lsThing;
+    }
+
+	public void setLsThing(LsThing lsThing) {
+        this.lsThing = lsThing;
+    }
+
+	public Set<LsThingValue> getLsValues() {
+        return this.lsValues;
+    }
+
+	public void setLsValues(Set<LsThingValue> lsValues) {
+        this.lsValues = lsValues;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingState_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/LsThingState_Roo_Configurable.aj
deleted file mode 100755
index 13b4b37e5..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsThingState_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsThingState;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LsThingState_Roo_Configurable {
-    
-    declare @type: LsThingState: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingState_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/LsThingState_Roo_Finder.aj
deleted file mode 100755
index 5f2dde4d4..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsThingState_Roo_Finder.aj
+++ /dev/null
@@ -1,75 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.LsThingState;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect LsThingState_Roo_Finder {
-    
-    public static Long LsThingState.countFindLsThingStatesByLsThing(LsThing lsThing) {
-        if (lsThing == null) throw new IllegalArgumentException("The lsThing argument is required");
-        EntityManager em = LsThingState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingState AS o WHERE o.lsThing = :lsThing", Long.class);
-        q.setParameter("lsThing", lsThing);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsThingState.countFindLsThingStatesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = LsThingState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingState AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<LsThingState> LsThingState.findLsThingStatesByLsThing(LsThing lsThing) {
-        if (lsThing == null) throw new IllegalArgumentException("The lsThing argument is required");
-        EntityManager em = LsThingState.entityManager();
-        TypedQuery<LsThingState> q = em.createQuery("SELECT o FROM LsThingState AS o WHERE o.lsThing = :lsThing", LsThingState.class);
-        q.setParameter("lsThing", lsThing);
-        return q;
-    }
-    
-    public static TypedQuery<LsThingState> LsThingState.findLsThingStatesByLsThing(LsThing lsThing, String sortFieldName, String sortOrder) {
-        if (lsThing == null) throw new IllegalArgumentException("The lsThing argument is required");
-        EntityManager em = LsThingState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingState AS o WHERE o.lsThing = :lsThing");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThingState> q = em.createQuery(queryBuilder.toString(), LsThingState.class);
-        q.setParameter("lsThing", lsThing);
-        return q;
-    }
-    
-    public static TypedQuery<LsThingState> LsThingState.findLsThingStatesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = LsThingState.entityManager();
-        TypedQuery<LsThingState> q = em.createQuery("SELECT o FROM LsThingState AS o WHERE o.lsTransaction = :lsTransaction", LsThingState.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<LsThingState> LsThingState.findLsThingStatesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = LsThingState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingState AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThingState> q = em.createQuery(queryBuilder.toString(), LsThingState.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingState_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/LsThingState_Roo_JavaBean.aj
deleted file mode 100755
index 46537bee1..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsThingState_Roo_JavaBean.aj
+++ /dev/null
@@ -1,29 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.LsThingState;
-import com.labsynch.labseer.domain.LsThingValue;
-import java.util.Set;
-
-privileged aspect LsThingState_Roo_JavaBean {
-    
-    public LsThing LsThingState.getLsThing() {
-        return this.lsThing;
-    }
-    
-    public void LsThingState.setLsThing(LsThing lsThing) {
-        this.lsThing = lsThing;
-    }
-    
-    public Set<LsThingValue> LsThingState.getLsValues() {
-        return this.lsValues;
-    }
-    
-    public void LsThingState.setLsValues(Set<LsThingValue> lsValues) {
-        this.lsValues = lsValues;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingState_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/LsThingState_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 4e676cc99..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsThingState_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsThingState;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LsThingState_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> LsThingState.fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsThing", "lsValues");
-    
-    public static long LsThingState.countLsThingStates() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LsThingState o", Long.class).getSingleResult();
-    }
-    
-    public static List<LsThingState> LsThingState.findAllLsThingStates() {
-        return entityManager().createQuery("SELECT o FROM LsThingState o", LsThingState.class).getResultList();
-    }
-    
-    public static List<LsThingState> LsThingState.findAllLsThingStates(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsThingState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsThingState.class).getResultList();
-    }
-    
-    public static LsThingState LsThingState.findLsThingState(Long id) {
-        if (id == null) return null;
-        return entityManager().find(LsThingState.class, id);
-    }
-    
-    public static List<LsThingState> LsThingState.findLsThingStateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsThingState o", LsThingState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<LsThingState> LsThingState.findLsThingStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsThingState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsThingState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public LsThingState LsThingState.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        LsThingState merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingState_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/LsThingState_Roo_Jpa_Entity.aj
deleted file mode 100755
index 9dc0f4f68..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsThingState_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsThingState;
-import javax.persistence.Entity;
-
-privileged aspect LsThingState_Roo_Jpa_Entity {
-    
-    declare @type: LsThingState: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingState_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/LsThingState_Roo_ToString.aj
deleted file mode 100755
index 8b877f637..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsThingState_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsThingState;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect LsThingState_Roo_ToString {
-    
-    public String LsThingState.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingValue.java b/src/main/java/com/labsynch/labseer/domain/LsThingValue.java
index a4b8f8495..3e6e2ef5c 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsThingValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsThingValue.java
@@ -6,15 +6,17 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
-
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -28,6 +30,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -386,4 +390,483 @@ public String toJsonWithBlobValue() {
                 transform(new ByteArrayTransformer(), "blobValue").
                 serialize(this);
      }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static String toJsonArray(Collection<LsThingValue> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<LsThingValue> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsState");
+
+	public static long countLsThingValues() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM LsThingValue o", Long.class).getSingleResult();
+    }
+
+	public static List<LsThingValue> findAllLsThingValues() {
+        return entityManager().createQuery("SELECT o FROM LsThingValue o", LsThingValue.class).getResultList();
+    }
+
+	public static List<LsThingValue> findAllLsThingValues(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsThingValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsThingValue.class).getResultList();
+    }
+
+	public static LsThingValue findLsThingValue(Long id) {
+        if (id == null) return null;
+        return entityManager().find(LsThingValue.class, id);
+    }
+
+	public static List<LsThingValue> findLsThingValueEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsThingValue o", LsThingValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<LsThingValue> findLsThingValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsThingValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsThingValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public LsThingValue merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        LsThingValue merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public static Long countFindLsThingValuesByCodeValueEquals(String codeValue) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = LsThingValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.codeValue = :codeValue", Long.class);
+        q.setParameter("codeValue", codeValue);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsThingValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = LsThingValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", Long.class);
+        q.setParameter("ignored", ignored);
+        q.setParameter("codeValue", codeValue);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsThingValuesByLsKindEqualsAndCodeValueLike(String lsKind, String codeValue) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        codeValue = codeValue.replace('*', '%');
+        if (codeValue.charAt(0) != '%') {
+            codeValue = "%" + codeValue;
+        }
+        if (codeValue.charAt(codeValue.length() - 1) != '%') {
+            codeValue = codeValue + "%";
+        }
+        EntityManager em = LsThingValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)", Long.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("codeValue", codeValue);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsThingValuesByLsKindEqualsAndDateValueGreaterThanEquals(String lsKind, Date dateValue) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (dateValue == null) throw new IllegalArgumentException("The dateValue argument is required");
+        EntityManager em = LsThingValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.dateValue >= :dateValue", Long.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("dateValue", dateValue);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsThingValuesByLsKindEqualsAndDateValueLessThanEquals(String lsKind, Date dateValue) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (dateValue == null) throw new IllegalArgumentException("The dateValue argument is required");
+        EntityManager em = LsThingValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.dateValue <= :dateValue", Long.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("dateValue", dateValue);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsThingValuesByLsKindEqualsAndDateValueLike(String lsKind, Date dateValue) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (dateValue == null) throw new IllegalArgumentException("The dateValue argument is required");
+        EntityManager em = LsThingValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.dateValue) LIKE LOWER(:dateValue)", Long.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("dateValue", dateValue);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsThingValuesByLsKindEqualsAndNumericValueEquals(String lsKind, BigDecimal numericValue) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (numericValue == null) throw new IllegalArgumentException("The numericValue argument is required");
+        EntityManager em = LsThingValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.numericValue = :numericValue", Long.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("numericValue", numericValue);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsThingValuesByLsKindEqualsAndNumericValueGreaterThanEquals(String lsKind, BigDecimal numericValue) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (numericValue == null) throw new IllegalArgumentException("The numericValue argument is required");
+        EntityManager em = LsThingValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.numericValue >= :numericValue", Long.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("numericValue", numericValue);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsThingValuesByLsKindEqualsAndNumericValueLessThanEquals(String lsKind, BigDecimal numericValue) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (numericValue == null) throw new IllegalArgumentException("The numericValue argument is required");
+        EntityManager em = LsThingValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.numericValue <= :numericValue", Long.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("numericValue", numericValue);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsThingValuesByLsKindEqualsAndStringValueEquals(String lsKind, String stringValue) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+        EntityManager em = LsThingValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.stringValue = :stringValue", Long.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("stringValue", stringValue);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsThingValuesByLsKindEqualsAndStringValueLike(String lsKind, String stringValue) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+        stringValue = stringValue.replace('*', '%');
+        if (stringValue.charAt(0) != '%') {
+            stringValue = "%" + stringValue;
+        }
+        if (stringValue.charAt(stringValue.length() - 1) != '%') {
+            stringValue = stringValue + "%";
+        }
+        EntityManager em = LsThingValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)", Long.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("stringValue", stringValue);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsThingValuesByLsState(LsThingState lsState) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        EntityManager em = LsThingValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsState = :lsState", Long.class);
+        q.setParameter("lsState", lsState);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindLsThingValuesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = LsThingValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<LsThingValue> findLsThingValuesByCodeValueEquals(String codeValue) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = LsThingValue.entityManager();
+        TypedQuery<LsThingValue> q = em.createQuery("SELECT o FROM LsThingValue AS o WHERE o.codeValue = :codeValue", LsThingValue.class);
+        q.setParameter("codeValue", codeValue);
+        return q;
+    }
+
+	public static TypedQuery<LsThingValue> findLsThingValuesByCodeValueEquals(String codeValue, String sortFieldName, String sortOrder) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = LsThingValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.codeValue = :codeValue");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThingValue> q = em.createQuery(queryBuilder.toString(), LsThingValue.class);
+        q.setParameter("codeValue", codeValue);
+        return q;
+    }
+
+	public static TypedQuery<LsThingValue> findLsThingValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = LsThingValue.entityManager();
+        TypedQuery<LsThingValue> q = em.createQuery("SELECT o FROM LsThingValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", LsThingValue.class);
+        q.setParameter("ignored", ignored);
+        q.setParameter("codeValue", codeValue);
+        return q;
+    }
+
+	public static TypedQuery<LsThingValue> findLsThingValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue, String sortFieldName, String sortOrder) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = LsThingValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThingValue> q = em.createQuery(queryBuilder.toString(), LsThingValue.class);
+        q.setParameter("ignored", ignored);
+        q.setParameter("codeValue", codeValue);
+        return q;
+    }
+
+	public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndCodeValueLike(String lsKind, String codeValue, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        codeValue = codeValue.replace('*', '%');
+        if (codeValue.charAt(0) != '%') {
+            codeValue = "%" + codeValue;
+        }
+        if (codeValue.charAt(codeValue.length() - 1) != '%') {
+            codeValue = codeValue + "%";
+        }
+        EntityManager em = LsThingValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThingValue> q = em.createQuery(queryBuilder.toString(), LsThingValue.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("codeValue", codeValue);
+        return q;
+    }
+
+	public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndDateValueGreaterThanEquals(String lsKind, Date dateValue, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (dateValue == null) throw new IllegalArgumentException("The dateValue argument is required");
+        EntityManager em = LsThingValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.dateValue >= :dateValue");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThingValue> q = em.createQuery(queryBuilder.toString(), LsThingValue.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("dateValue", dateValue);
+        return q;
+    }
+
+	public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndDateValueLessThanEquals(String lsKind, Date dateValue, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (dateValue == null) throw new IllegalArgumentException("The dateValue argument is required");
+        EntityManager em = LsThingValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.dateValue <= :dateValue");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThingValue> q = em.createQuery(queryBuilder.toString(), LsThingValue.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("dateValue", dateValue);
+        return q;
+    }
+
+	public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndDateValueLike(String lsKind, Date dateValue, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (dateValue == null) throw new IllegalArgumentException("The dateValue argument is required");
+        EntityManager em = LsThingValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.dateValue) LIKE LOWER(:dateValue)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThingValue> q = em.createQuery(queryBuilder.toString(), LsThingValue.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("dateValue", dateValue);
+        return q;
+    }
+
+	public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndNumericValueEquals(String lsKind, BigDecimal numericValue, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (numericValue == null) throw new IllegalArgumentException("The numericValue argument is required");
+        EntityManager em = LsThingValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.numericValue = :numericValue");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThingValue> q = em.createQuery(queryBuilder.toString(), LsThingValue.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("numericValue", numericValue);
+        return q;
+    }
+
+	public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndNumericValueGreaterThanEquals(String lsKind, BigDecimal numericValue, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (numericValue == null) throw new IllegalArgumentException("The numericValue argument is required");
+        EntityManager em = LsThingValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.numericValue >= :numericValue");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThingValue> q = em.createQuery(queryBuilder.toString(), LsThingValue.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("numericValue", numericValue);
+        return q;
+    }
+
+	public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndNumericValueLessThanEquals(String lsKind, BigDecimal numericValue, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (numericValue == null) throw new IllegalArgumentException("The numericValue argument is required");
+        EntityManager em = LsThingValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.numericValue <= :numericValue");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThingValue> q = em.createQuery(queryBuilder.toString(), LsThingValue.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("numericValue", numericValue);
+        return q;
+    }
+
+	public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndStringValueEquals(String lsKind, String stringValue, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+        EntityManager em = LsThingValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.stringValue = :stringValue");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThingValue> q = em.createQuery(queryBuilder.toString(), LsThingValue.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("stringValue", stringValue);
+        return q;
+    }
+
+	public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndStringValueLike(String lsKind, String stringValue, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+        stringValue = stringValue.replace('*', '%');
+        if (stringValue.charAt(0) != '%') {
+            stringValue = "%" + stringValue;
+        }
+        if (stringValue.charAt(stringValue.length() - 1) != '%') {
+            stringValue = stringValue + "%";
+        }
+        EntityManager em = LsThingValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThingValue> q = em.createQuery(queryBuilder.toString(), LsThingValue.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("stringValue", stringValue);
+        return q;
+    }
+
+	public static TypedQuery<LsThingValue> findLsThingValuesByLsState(LsThingState lsState) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        EntityManager em = LsThingValue.entityManager();
+        TypedQuery<LsThingValue> q = em.createQuery("SELECT o FROM LsThingValue AS o WHERE o.lsState = :lsState", LsThingValue.class);
+        q.setParameter("lsState", lsState);
+        return q;
+    }
+
+	public static TypedQuery<LsThingValue> findLsThingValuesByLsState(LsThingState lsState, String sortFieldName, String sortOrder) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        EntityManager em = LsThingValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsState = :lsState");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThingValue> q = em.createQuery(queryBuilder.toString(), LsThingValue.class);
+        q.setParameter("lsState", lsState);
+        return q;
+    }
+
+	public static TypedQuery<LsThingValue> findLsThingValuesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = LsThingValue.entityManager();
+        TypedQuery<LsThingValue> q = em.createQuery("SELECT o FROM LsThingValue AS o WHERE o.lsTransaction = :lsTransaction", LsThingValue.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<LsThingValue> findLsThingValuesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = LsThingValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsTransaction = :lsTransaction");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<LsThingValue> q = em.createQuery(queryBuilder.toString(), LsThingValue.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public LsThingState getLsState() {
+        return this.lsState;
+    }
+
+	public void setLsState(LsThingState lsState) {
+        this.lsState = lsState;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingValue_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/LsThingValue_Roo_Configurable.aj
deleted file mode 100755
index efafc8db3..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsThingValue_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsThingValue;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LsThingValue_Roo_Configurable {
-    
-    declare @type: LsThingValue: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingValue_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/LsThingValue_Roo_Finder.aj
deleted file mode 100755
index 9c1c44269..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsThingValue_Roo_Finder.aj
+++ /dev/null
@@ -1,413 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsThingState;
-import com.labsynch.labseer.domain.LsThingValue;
-import java.math.BigDecimal;
-import java.util.Date;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect LsThingValue_Roo_Finder {
-    
-    public static Long LsThingValue.countFindLsThingValuesByCodeValueEquals(String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = LsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.codeValue = :codeValue", Long.class);
-        q.setParameter("codeValue", codeValue);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsThingValue.countFindLsThingValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = LsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", Long.class);
-        q.setParameter("ignored", ignored);
-        q.setParameter("codeValue", codeValue);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsThingValue.countFindLsThingValuesByLsKindEqualsAndCodeValueLike(String lsKind, String codeValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        codeValue = codeValue.replace('*', '%');
-        if (codeValue.charAt(0) != '%') {
-            codeValue = "%" + codeValue;
-        }
-        if (codeValue.charAt(codeValue.length() - 1) != '%') {
-            codeValue = codeValue + "%";
-        }
-        EntityManager em = LsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)", Long.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("codeValue", codeValue);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsThingValue.countFindLsThingValuesByLsKindEqualsAndDateValueGreaterThanEquals(String lsKind, Date dateValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (dateValue == null) throw new IllegalArgumentException("The dateValue argument is required");
-        EntityManager em = LsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.dateValue >= :dateValue", Long.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("dateValue", dateValue);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsThingValue.countFindLsThingValuesByLsKindEqualsAndDateValueLessThanEquals(String lsKind, Date dateValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (dateValue == null) throw new IllegalArgumentException("The dateValue argument is required");
-        EntityManager em = LsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.dateValue <= :dateValue", Long.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("dateValue", dateValue);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsThingValue.countFindLsThingValuesByLsKindEqualsAndDateValueLike(String lsKind, Date dateValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (dateValue == null) throw new IllegalArgumentException("The dateValue argument is required");
-        EntityManager em = LsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.dateValue) LIKE LOWER(:dateValue)", Long.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("dateValue", dateValue);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsThingValue.countFindLsThingValuesByLsKindEqualsAndNumericValueEquals(String lsKind, BigDecimal numericValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (numericValue == null) throw new IllegalArgumentException("The numericValue argument is required");
-        EntityManager em = LsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.numericValue = :numericValue", Long.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("numericValue", numericValue);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsThingValue.countFindLsThingValuesByLsKindEqualsAndNumericValueGreaterThanEquals(String lsKind, BigDecimal numericValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (numericValue == null) throw new IllegalArgumentException("The numericValue argument is required");
-        EntityManager em = LsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.numericValue >= :numericValue", Long.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("numericValue", numericValue);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsThingValue.countFindLsThingValuesByLsKindEqualsAndNumericValueLessThanEquals(String lsKind, BigDecimal numericValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (numericValue == null) throw new IllegalArgumentException("The numericValue argument is required");
-        EntityManager em = LsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.numericValue <= :numericValue", Long.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("numericValue", numericValue);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsThingValue.countFindLsThingValuesByLsKindEqualsAndStringValueEquals(String lsKind, String stringValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
-        EntityManager em = LsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.stringValue = :stringValue", Long.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("stringValue", stringValue);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsThingValue.countFindLsThingValuesByLsKindEqualsAndStringValueLike(String lsKind, String stringValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
-        stringValue = stringValue.replace('*', '%');
-        if (stringValue.charAt(0) != '%') {
-            stringValue = "%" + stringValue;
-        }
-        if (stringValue.charAt(stringValue.length() - 1) != '%') {
-            stringValue = stringValue + "%";
-        }
-        EntityManager em = LsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)", Long.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("stringValue", stringValue);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsThingValue.countFindLsThingValuesByLsState(LsThingState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = LsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsState = :lsState", Long.class);
-        q.setParameter("lsState", lsState);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsThingValue.countFindLsThingValuesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = LsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<LsThingValue> LsThingValue.findLsThingValuesByCodeValueEquals(String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = LsThingValue.entityManager();
-        TypedQuery<LsThingValue> q = em.createQuery("SELECT o FROM LsThingValue AS o WHERE o.codeValue = :codeValue", LsThingValue.class);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-    
-    public static TypedQuery<LsThingValue> LsThingValue.findLsThingValuesByCodeValueEquals(String codeValue, String sortFieldName, String sortOrder) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = LsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.codeValue = :codeValue");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThingValue> q = em.createQuery(queryBuilder.toString(), LsThingValue.class);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-    
-    public static TypedQuery<LsThingValue> LsThingValue.findLsThingValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = LsThingValue.entityManager();
-        TypedQuery<LsThingValue> q = em.createQuery("SELECT o FROM LsThingValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", LsThingValue.class);
-        q.setParameter("ignored", ignored);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-    
-    public static TypedQuery<LsThingValue> LsThingValue.findLsThingValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue, String sortFieldName, String sortOrder) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = LsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThingValue> q = em.createQuery(queryBuilder.toString(), LsThingValue.class);
-        q.setParameter("ignored", ignored);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-    
-    public static TypedQuery<LsThingValue> LsThingValue.findLsThingValuesByLsKindEqualsAndCodeValueLike(String lsKind, String codeValue, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        codeValue = codeValue.replace('*', '%');
-        if (codeValue.charAt(0) != '%') {
-            codeValue = "%" + codeValue;
-        }
-        if (codeValue.charAt(codeValue.length() - 1) != '%') {
-            codeValue = codeValue + "%";
-        }
-        EntityManager em = LsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThingValue> q = em.createQuery(queryBuilder.toString(), LsThingValue.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-    
-    public static TypedQuery<LsThingValue> LsThingValue.findLsThingValuesByLsKindEqualsAndDateValueGreaterThanEquals(String lsKind, Date dateValue, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (dateValue == null) throw new IllegalArgumentException("The dateValue argument is required");
-        EntityManager em = LsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.dateValue >= :dateValue");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThingValue> q = em.createQuery(queryBuilder.toString(), LsThingValue.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("dateValue", dateValue);
-        return q;
-    }
-    
-    public static TypedQuery<LsThingValue> LsThingValue.findLsThingValuesByLsKindEqualsAndDateValueLessThanEquals(String lsKind, Date dateValue, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (dateValue == null) throw new IllegalArgumentException("The dateValue argument is required");
-        EntityManager em = LsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.dateValue <= :dateValue");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThingValue> q = em.createQuery(queryBuilder.toString(), LsThingValue.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("dateValue", dateValue);
-        return q;
-    }
-    
-    public static TypedQuery<LsThingValue> LsThingValue.findLsThingValuesByLsKindEqualsAndDateValueLike(String lsKind, Date dateValue, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (dateValue == null) throw new IllegalArgumentException("The dateValue argument is required");
-        EntityManager em = LsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.dateValue) LIKE LOWER(:dateValue)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThingValue> q = em.createQuery(queryBuilder.toString(), LsThingValue.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("dateValue", dateValue);
-        return q;
-    }
-    
-    public static TypedQuery<LsThingValue> LsThingValue.findLsThingValuesByLsKindEqualsAndNumericValueEquals(String lsKind, BigDecimal numericValue, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (numericValue == null) throw new IllegalArgumentException("The numericValue argument is required");
-        EntityManager em = LsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.numericValue = :numericValue");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThingValue> q = em.createQuery(queryBuilder.toString(), LsThingValue.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("numericValue", numericValue);
-        return q;
-    }
-    
-    public static TypedQuery<LsThingValue> LsThingValue.findLsThingValuesByLsKindEqualsAndNumericValueGreaterThanEquals(String lsKind, BigDecimal numericValue, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (numericValue == null) throw new IllegalArgumentException("The numericValue argument is required");
-        EntityManager em = LsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.numericValue >= :numericValue");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThingValue> q = em.createQuery(queryBuilder.toString(), LsThingValue.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("numericValue", numericValue);
-        return q;
-    }
-    
-    public static TypedQuery<LsThingValue> LsThingValue.findLsThingValuesByLsKindEqualsAndNumericValueLessThanEquals(String lsKind, BigDecimal numericValue, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (numericValue == null) throw new IllegalArgumentException("The numericValue argument is required");
-        EntityManager em = LsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.numericValue <= :numericValue");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThingValue> q = em.createQuery(queryBuilder.toString(), LsThingValue.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("numericValue", numericValue);
-        return q;
-    }
-    
-    public static TypedQuery<LsThingValue> LsThingValue.findLsThingValuesByLsKindEqualsAndStringValueEquals(String lsKind, String stringValue, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
-        EntityManager em = LsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.stringValue = :stringValue");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThingValue> q = em.createQuery(queryBuilder.toString(), LsThingValue.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("stringValue", stringValue);
-        return q;
-    }
-    
-    public static TypedQuery<LsThingValue> LsThingValue.findLsThingValuesByLsKindEqualsAndStringValueLike(String lsKind, String stringValue, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
-        stringValue = stringValue.replace('*', '%');
-        if (stringValue.charAt(0) != '%') {
-            stringValue = "%" + stringValue;
-        }
-        if (stringValue.charAt(stringValue.length() - 1) != '%') {
-            stringValue = stringValue + "%";
-        }
-        EntityManager em = LsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThingValue> q = em.createQuery(queryBuilder.toString(), LsThingValue.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("stringValue", stringValue);
-        return q;
-    }
-    
-    public static TypedQuery<LsThingValue> LsThingValue.findLsThingValuesByLsState(LsThingState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = LsThingValue.entityManager();
-        TypedQuery<LsThingValue> q = em.createQuery("SELECT o FROM LsThingValue AS o WHERE o.lsState = :lsState", LsThingValue.class);
-        q.setParameter("lsState", lsState);
-        return q;
-    }
-    
-    public static TypedQuery<LsThingValue> LsThingValue.findLsThingValuesByLsState(LsThingState lsState, String sortFieldName, String sortOrder) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = LsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsState = :lsState");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThingValue> q = em.createQuery(queryBuilder.toString(), LsThingValue.class);
-        q.setParameter("lsState", lsState);
-        return q;
-    }
-    
-    public static TypedQuery<LsThingValue> LsThingValue.findLsThingValuesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = LsThingValue.entityManager();
-        TypedQuery<LsThingValue> q = em.createQuery("SELECT o FROM LsThingValue AS o WHERE o.lsTransaction = :lsTransaction", LsThingValue.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<LsThingValue> LsThingValue.findLsThingValuesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = LsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThingValue> q = em.createQuery(queryBuilder.toString(), LsThingValue.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingValue_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/LsThingValue_Roo_JavaBean.aj
deleted file mode 100755
index 25f71aa6f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsThingValue_Roo_JavaBean.aj
+++ /dev/null
@@ -1,19 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsThingState;
-import com.labsynch.labseer.domain.LsThingValue;
-
-privileged aspect LsThingValue_Roo_JavaBean {
-    
-    public LsThingState LsThingValue.getLsState() {
-        return this.lsState;
-    }
-    
-    public void LsThingValue.setLsState(LsThingState lsState) {
-        this.lsState = lsState;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingValue_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/LsThingValue_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 9c1d3be49..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsThingValue_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsThingValue;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LsThingValue_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> LsThingValue.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsState");
-    
-    public static long LsThingValue.countLsThingValues() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LsThingValue o", Long.class).getSingleResult();
-    }
-    
-    public static List<LsThingValue> LsThingValue.findAllLsThingValues() {
-        return entityManager().createQuery("SELECT o FROM LsThingValue o", LsThingValue.class).getResultList();
-    }
-    
-    public static List<LsThingValue> LsThingValue.findAllLsThingValues(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsThingValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsThingValue.class).getResultList();
-    }
-    
-    public static LsThingValue LsThingValue.findLsThingValue(Long id) {
-        if (id == null) return null;
-        return entityManager().find(LsThingValue.class, id);
-    }
-    
-    public static List<LsThingValue> LsThingValue.findLsThingValueEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsThingValue o", LsThingValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<LsThingValue> LsThingValue.findLsThingValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsThingValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsThingValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public LsThingValue LsThingValue.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        LsThingValue merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingValue_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/LsThingValue_Roo_Jpa_Entity.aj
deleted file mode 100755
index b2d307556..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsThingValue_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsThingValue;
-import javax.persistence.Entity;
-
-privileged aspect LsThingValue_Roo_Jpa_Entity {
-    
-    declare @type: LsThingValue: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingValue_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/LsThingValue_Roo_Json.aj
deleted file mode 100755
index 9c1733742..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsThingValue_Roo_Json.aj
+++ /dev/null
@@ -1,32 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsThingValue;
-import flexjson.JSONSerializer;
-import java.util.Collection;
-
-privileged aspect LsThingValue_Roo_Json {
-    
-    public String LsThingValue.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String LsThingValue.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static String LsThingValue.toJsonArray(Collection<LsThingValue> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String LsThingValue.toJsonArray(Collection<LsThingValue> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingValue_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/LsThingValue_Roo_ToString.aj
deleted file mode 100755
index 4213aaa52..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsThingValue_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsThingValue;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect LsThingValue_Roo_ToString {
-    
-    public String LsThingValue.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThing_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/LsThing_Roo_Configurable.aj
deleted file mode 100755
index 215a877a7..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsThing_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsThing;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LsThing_Roo_Configurable {
-    
-    declare @type: LsThing: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThing_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/LsThing_Roo_Finder.aj
deleted file mode 100755
index 214299958..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsThing_Roo_Finder.aj
+++ /dev/null
@@ -1,423 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsThing;
-import java.util.Date;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect LsThing_Roo_Finder {
-    
-    public static Long LsThing.countFindLsThingsByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = LsThing.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE o.codeName = :codeName", Long.class);
-        q.setParameter("codeName", codeName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsThing.countFindLsThingsByCodeNameLike(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        codeName = codeName.replace('*', '%');
-        if (codeName.charAt(0) != '%') {
-            codeName = "%" + codeName;
-        }
-        if (codeName.charAt(codeName.length() - 1) != '%') {
-            codeName = codeName + "%";
-        }
-        EntityManager em = LsThing.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)", Long.class);
-        q.setParameter("codeName", codeName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsThing.countFindLsThingsByLsKindEquals(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = LsThing.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE o.lsKind = :lsKind", Long.class);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsThing.countFindLsThingsByLsKindLike(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        lsKind = lsKind.replace('*', '%');
-        if (lsKind.charAt(0) != '%') {
-            lsKind = "%" + lsKind;
-        }
-        if (lsKind.charAt(lsKind.length() - 1) != '%') {
-            lsKind = lsKind + "%";
-        }
-        EntityManager em = LsThing.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)", Long.class);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsThing.countFindLsThingsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = LsThing.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsThing.countFindLsThingsByLsTypeAndKindEquals(String lsTypeAndKind) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
-        EntityManager em = LsThing.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", Long.class);
-        q.setParameter("lsTypeAndKind", lsTypeAndKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsThing.countFindLsThingsByLsTypeEquals(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = LsThing.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE o.lsType = :lsType", Long.class);
-        q.setParameter("lsType", lsType);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsThing.countFindLsThingsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = LsThing.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsThing.countFindLsThingsByRecordedByLike(String recordedBy) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
-        recordedBy = recordedBy.replace('*', '%');
-        if (recordedBy.charAt(0) != '%') {
-            recordedBy = "%" + recordedBy;
-        }
-        if (recordedBy.charAt(recordedBy.length() - 1) != '%') {
-            recordedBy = recordedBy + "%";
-        }
-        EntityManager em = LsThing.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)", Long.class);
-        q.setParameter("recordedBy", recordedBy);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsThing.countFindLsThingsByRecordedDateGreaterThan(Date recordedDate) {
-        if (recordedDate == null) throw new IllegalArgumentException("The recordedDate argument is required");
-        EntityManager em = LsThing.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE o.recordedDate > :recordedDate", Long.class);
-        q.setParameter("recordedDate", recordedDate);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long LsThing.countFindLsThingsByRecordedDateLessThan(Date recordedDate) {
-        if (recordedDate == null) throw new IllegalArgumentException("The recordedDate argument is required");
-        EntityManager em = LsThing.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE o.recordedDate < :recordedDate", Long.class);
-        q.setParameter("recordedDate", recordedDate);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<LsThing> LsThing.findLsThingsByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = LsThing.entityManager();
-        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.codeName = :codeName", LsThing.class);
-        q.setParameter("codeName", codeName);
-        return q;
-    }
-    
-    public static TypedQuery<LsThing> LsThing.findLsThingsByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = LsThing.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE o.codeName = :codeName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThing> q = em.createQuery(queryBuilder.toString(), LsThing.class);
-        q.setParameter("codeName", codeName);
-        return q;
-    }
-    
-    public static TypedQuery<LsThing> LsThing.findLsThingsByCodeNameLike(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        codeName = codeName.replace('*', '%');
-        if (codeName.charAt(0) != '%') {
-            codeName = "%" + codeName;
-        }
-        if (codeName.charAt(codeName.length() - 1) != '%') {
-            codeName = codeName + "%";
-        }
-        EntityManager em = LsThing.entityManager();
-        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)", LsThing.class);
-        q.setParameter("codeName", codeName);
-        return q;
-    }
-    
-    public static TypedQuery<LsThing> LsThing.findLsThingsByCodeNameLike(String codeName, String sortFieldName, String sortOrder) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        codeName = codeName.replace('*', '%');
-        if (codeName.charAt(0) != '%') {
-            codeName = "%" + codeName;
-        }
-        if (codeName.charAt(codeName.length() - 1) != '%') {
-            codeName = codeName + "%";
-        }
-        EntityManager em = LsThing.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThing> q = em.createQuery(queryBuilder.toString(), LsThing.class);
-        q.setParameter("codeName", codeName);
-        return q;
-    }
-    
-    public static TypedQuery<LsThing> LsThing.findLsThingsByLsKindEquals(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = LsThing.entityManager();
-        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.lsKind = :lsKind", LsThing.class);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<LsThing> LsThing.findLsThingsByLsKindEquals(String lsKind, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = LsThing.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThing> q = em.createQuery(queryBuilder.toString(), LsThing.class);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<LsThing> LsThing.findLsThingsByLsKindLike(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        lsKind = lsKind.replace('*', '%');
-        if (lsKind.charAt(0) != '%') {
-            lsKind = "%" + lsKind;
-        }
-        if (lsKind.charAt(lsKind.length() - 1) != '%') {
-            lsKind = lsKind + "%";
-        }
-        EntityManager em = LsThing.entityManager();
-        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)", LsThing.class);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<LsThing> LsThing.findLsThingsByLsKindLike(String lsKind, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        lsKind = lsKind.replace('*', '%');
-        if (lsKind.charAt(0) != '%') {
-            lsKind = "%" + lsKind;
-        }
-        if (lsKind.charAt(lsKind.length() - 1) != '%') {
-            lsKind = lsKind + "%";
-        }
-        EntityManager em = LsThing.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThing> q = em.createQuery(queryBuilder.toString(), LsThing.class);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<LsThing> LsThing.findLsThingsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = LsThing.entityManager();
-        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.lsTransaction = :lsTransaction", LsThing.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<LsThing> LsThing.findLsThingsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = LsThing.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThing> q = em.createQuery(queryBuilder.toString(), LsThing.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<LsThing> LsThing.findLsThingsByLsTypeAndKindEquals(String lsTypeAndKind) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
-        EntityManager em = LsThing.entityManager();
-        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", LsThing.class);
-        q.setParameter("lsTypeAndKind", lsTypeAndKind);
-        return q;
-    }
-    
-    public static TypedQuery<LsThing> LsThing.findLsThingsByLsTypeAndKindEquals(String lsTypeAndKind, String sortFieldName, String sortOrder) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
-        EntityManager em = LsThing.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE o.lsTypeAndKind = :lsTypeAndKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThing> q = em.createQuery(queryBuilder.toString(), LsThing.class);
-        q.setParameter("lsTypeAndKind", lsTypeAndKind);
-        return q;
-    }
-    
-    public static TypedQuery<LsThing> LsThing.findLsThingsByLsTypeEquals(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = LsThing.entityManager();
-        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.lsType = :lsType", LsThing.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<LsThing> LsThing.findLsThingsByLsTypeEquals(String lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = LsThing.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE o.lsType = :lsType");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThing> q = em.createQuery(queryBuilder.toString(), LsThing.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<LsThing> LsThing.findLsThingsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = LsThing.entityManager();
-        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", LsThing.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<LsThing> LsThing.findLsThingsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = LsThing.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThing> q = em.createQuery(queryBuilder.toString(), LsThing.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<LsThing> LsThing.findLsThingsByRecordedByLike(String recordedBy) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
-        recordedBy = recordedBy.replace('*', '%');
-        if (recordedBy.charAt(0) != '%') {
-            recordedBy = "%" + recordedBy;
-        }
-        if (recordedBy.charAt(recordedBy.length() - 1) != '%') {
-            recordedBy = recordedBy + "%";
-        }
-        EntityManager em = LsThing.entityManager();
-        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)", LsThing.class);
-        q.setParameter("recordedBy", recordedBy);
-        return q;
-    }
-    
-    public static TypedQuery<LsThing> LsThing.findLsThingsByRecordedByLike(String recordedBy, String sortFieldName, String sortOrder) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
-        recordedBy = recordedBy.replace('*', '%');
-        if (recordedBy.charAt(0) != '%') {
-            recordedBy = "%" + recordedBy;
-        }
-        if (recordedBy.charAt(recordedBy.length() - 1) != '%') {
-            recordedBy = recordedBy + "%";
-        }
-        EntityManager em = LsThing.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThing> q = em.createQuery(queryBuilder.toString(), LsThing.class);
-        q.setParameter("recordedBy", recordedBy);
-        return q;
-    }
-    
-    public static TypedQuery<LsThing> LsThing.findLsThingsByRecordedDateGreaterThan(Date recordedDate) {
-        if (recordedDate == null) throw new IllegalArgumentException("The recordedDate argument is required");
-        EntityManager em = LsThing.entityManager();
-        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.recordedDate > :recordedDate", LsThing.class);
-        q.setParameter("recordedDate", recordedDate);
-        return q;
-    }
-    
-    public static TypedQuery<LsThing> LsThing.findLsThingsByRecordedDateGreaterThan(Date recordedDate, String sortFieldName, String sortOrder) {
-        if (recordedDate == null) throw new IllegalArgumentException("The recordedDate argument is required");
-        EntityManager em = LsThing.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE o.recordedDate > :recordedDate");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThing> q = em.createQuery(queryBuilder.toString(), LsThing.class);
-        q.setParameter("recordedDate", recordedDate);
-        return q;
-    }
-    
-    public static TypedQuery<LsThing> LsThing.findLsThingsByRecordedDateLessThan(Date recordedDate) {
-        if (recordedDate == null) throw new IllegalArgumentException("The recordedDate argument is required");
-        EntityManager em = LsThing.entityManager();
-        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.recordedDate < :recordedDate", LsThing.class);
-        q.setParameter("recordedDate", recordedDate);
-        return q;
-    }
-    
-    public static TypedQuery<LsThing> LsThing.findLsThingsByRecordedDateLessThan(Date recordedDate, String sortFieldName, String sortOrder) {
-        if (recordedDate == null) throw new IllegalArgumentException("The recordedDate argument is required");
-        EntityManager em = LsThing.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE o.recordedDate < :recordedDate");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThing> q = em.createQuery(queryBuilder.toString(), LsThing.class);
-        q.setParameter("recordedDate", recordedDate);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThing_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/LsThing_Roo_JavaBean.aj
deleted file mode 100755
index 81bdf1c87..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsThing_Roo_JavaBean.aj
+++ /dev/null
@@ -1,55 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxLsThingLsThing;
-import com.labsynch.labseer.domain.LsTag;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.LsThingLabel;
-import com.labsynch.labseer.domain.LsThingState;
-import java.util.Set;
-
-privileged aspect LsThing_Roo_JavaBean {
-    
-    public Set<LsThingState> LsThing.getLsStates() {
-        return this.lsStates;
-    }
-    
-    public void LsThing.setLsStates(Set<LsThingState> lsStates) {
-        this.lsStates = lsStates;
-    }
-    
-    public Set<LsThingLabel> LsThing.getLsLabels() {
-        return this.lsLabels;
-    }
-    
-    public void LsThing.setLsLabels(Set<LsThingLabel> lsLabels) {
-        this.lsLabels = lsLabels;
-    }
-    
-    public Set<LsTag> LsThing.getLsTags() {
-        return this.lsTags;
-    }
-    
-    public void LsThing.setLsTags(Set<LsTag> lsTags) {
-        this.lsTags = lsTags;
-    }
-    
-    public Set<ItxLsThingLsThing> LsThing.getFirstLsThings() {
-        return this.firstLsThings;
-    }
-    
-    public void LsThing.setFirstLsThings(Set<ItxLsThingLsThing> firstLsThings) {
-        this.firstLsThings = firstLsThings;
-    }
-    
-    public Set<ItxLsThingLsThing> LsThing.getSecondLsThings() {
-        return this.secondLsThings;
-    }
-    
-    public void LsThing.setSecondLsThings(Set<ItxLsThingLsThing> secondLsThings) {
-        this.secondLsThings = secondLsThings;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThing_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/LsThing_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index a7118d761..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsThing_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsThing;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LsThing_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> LsThing.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsStates", "lsLabels", "lsTags", "firstLsThings", "secondLsThings");
-    
-    public static long LsThing.countLsThings() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LsThing o", Long.class).getSingleResult();
-    }
-    
-    public static List<LsThing> LsThing.findAllLsThings() {
-        return entityManager().createQuery("SELECT o FROM LsThing o", LsThing.class).getResultList();
-    }
-    
-    public static List<LsThing> LsThing.findAllLsThings(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsThing o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsThing.class).getResultList();
-    }
-    
-    public static LsThing LsThing.findLsThing(Long id) {
-        if (id == null) return null;
-        return entityManager().find(LsThing.class, id);
-    }
-    
-    public static List<LsThing> LsThing.findLsThingEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsThing o", LsThing.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<LsThing> LsThing.findLsThingEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsThing o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsThing.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public LsThing LsThing.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        LsThing merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThing_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/LsThing_Roo_Jpa_Entity.aj
deleted file mode 100755
index 62fee703b..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsThing_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsThing;
-import javax.persistence.Entity;
-
-privileged aspect LsThing_Roo_Jpa_Entity {
-    
-    declare @type: LsThing: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThing_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/LsThing_Roo_Json.aj
deleted file mode 100755
index 3ee37ff93..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsThing_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsThing;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect LsThing_Roo_Json {
-    
-    public static LsThing LsThing.fromJsonToLsThing(String json) {
-        return new JSONDeserializer<LsThing>()
-        .use(null, LsThing.class).deserialize(json);
-    }
-    
-    public static Collection<LsThing> LsThing.fromJsonArrayToLsThings(String json) {
-        return new JSONDeserializer<List<LsThing>>()
-        .use("values", LsThing.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThing_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/LsThing_Roo_ToString.aj
deleted file mode 100755
index 7bbf7177d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsThing_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsThing;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect LsThing_Roo_ToString {
-    
-    public String LsThing.toString() {
-        return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).setExcludeFieldNames("lsTags", "lsStates", "lsLabels").toString();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsTransaction.java b/src/main/java/com/labsynch/labseer/domain/LsTransaction.java
index fe93b1575..c43203a14 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsTransaction.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsTransaction.java
@@ -1,20 +1,37 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.SequenceGenerator;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
+import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord(sequenceName = "LS_TRANSACTION_PKSEQ")
@@ -37,4 +54,191 @@ public class LsTransaction {
     
     @Enumerated(EnumType.STRING)
 	private LsTransactionType type;
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static LsTransaction fromJsonToLsTransaction(String json) {
+        return new JSONDeserializer<LsTransaction>()
+        .use(null, LsTransaction.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<LsTransaction> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<LsTransaction> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<LsTransaction> fromJsonArrayToLsTransactions(String json) {
+        return new JSONDeserializer<List<LsTransaction>>()
+        .use("values", LsTransaction.class).deserialize(json);
+    }
+
+	@Id
+    @SequenceGenerator(name = "lsTransactionGen", sequenceName = "LS_TRANSACTION_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsTransactionGen")
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String getComments() {
+        return this.comments;
+    }
+
+	public void setComments(String comments) {
+        this.comments = comments;
+    }
+
+	public Date getRecordedDate() {
+        return this.recordedDate;
+    }
+
+	public void setRecordedDate(Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public LsTransactionStatus getStatus() {
+        return this.status;
+    }
+
+	public void setStatus(LsTransactionStatus status) {
+        this.status = status;
+    }
+
+	public LsTransactionType getType() {
+        return this.type;
+    }
+
+	public void setType(LsTransactionType type) {
+        this.type = type;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("comments", "recordedDate", "recordedBy", "status", "type");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new LsTransaction().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countLsTransactions() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM LsTransaction o", Long.class).getSingleResult();
+    }
+
+	public static List<LsTransaction> findAllLsTransactions() {
+        return entityManager().createQuery("SELECT o FROM LsTransaction o", LsTransaction.class).getResultList();
+    }
+
+	public static List<LsTransaction> findAllLsTransactions(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsTransaction o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsTransaction.class).getResultList();
+    }
+
+	public static LsTransaction findLsTransaction(Long id) {
+        if (id == null) return null;
+        return entityManager().find(LsTransaction.class, id);
+    }
+
+	public static List<LsTransaction> findLsTransactionEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsTransaction o", LsTransaction.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<LsTransaction> findLsTransactionEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM LsTransaction o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, LsTransaction.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            LsTransaction attached = LsTransaction.findLsTransaction(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public LsTransaction merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        LsTransaction merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/domain/LsTransaction_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/LsTransaction_Roo_Configurable.aj
deleted file mode 100755
index 8c42c6240..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsTransaction_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsTransaction;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LsTransaction_Roo_Configurable {
-    
-    declare @type: LsTransaction: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsTransaction_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/LsTransaction_Roo_JavaBean.aj
deleted file mode 100755
index 37d9b44fe..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsTransaction_Roo_JavaBean.aj
+++ /dev/null
@@ -1,53 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsTransaction;
-import com.labsynch.labseer.domain.LsTransactionStatus;
-import com.labsynch.labseer.domain.LsTransactionType;
-import java.util.Date;
-
-privileged aspect LsTransaction_Roo_JavaBean {
-    
-    public String LsTransaction.getComments() {
-        return this.comments;
-    }
-    
-    public void LsTransaction.setComments(String comments) {
-        this.comments = comments;
-    }
-    
-    public Date LsTransaction.getRecordedDate() {
-        return this.recordedDate;
-    }
-    
-    public void LsTransaction.setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
-    
-    public String LsTransaction.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void LsTransaction.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public LsTransactionStatus LsTransaction.getStatus() {
-        return this.status;
-    }
-    
-    public void LsTransaction.setStatus(LsTransactionStatus status) {
-        this.status = status;
-    }
-    
-    public LsTransactionType LsTransaction.getType() {
-        return this.type;
-    }
-    
-    public void LsTransaction.setType(LsTransactionType type) {
-        this.type = type;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsTransaction_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/LsTransaction_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index faad7fec0..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsTransaction_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsTransaction;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LsTransaction_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager LsTransaction.entityManager;
-    
-    public static final List<String> LsTransaction.fieldNames4OrderClauseFilter = java.util.Arrays.asList("comments", "recordedDate", "recordedBy", "status", "type");
-    
-    public static final EntityManager LsTransaction.entityManager() {
-        EntityManager em = new LsTransaction().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long LsTransaction.countLsTransactions() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LsTransaction o", Long.class).getSingleResult();
-    }
-    
-    public static List<LsTransaction> LsTransaction.findAllLsTransactions() {
-        return entityManager().createQuery("SELECT o FROM LsTransaction o", LsTransaction.class).getResultList();
-    }
-    
-    public static List<LsTransaction> LsTransaction.findAllLsTransactions(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsTransaction o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsTransaction.class).getResultList();
-    }
-    
-    public static LsTransaction LsTransaction.findLsTransaction(Long id) {
-        if (id == null) return null;
-        return entityManager().find(LsTransaction.class, id);
-    }
-    
-    public static List<LsTransaction> LsTransaction.findLsTransactionEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsTransaction o", LsTransaction.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<LsTransaction> LsTransaction.findLsTransactionEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsTransaction o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsTransaction.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void LsTransaction.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void LsTransaction.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            LsTransaction attached = LsTransaction.findLsTransaction(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void LsTransaction.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void LsTransaction.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public LsTransaction LsTransaction.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        LsTransaction merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsTransaction_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/LsTransaction_Roo_Jpa_Entity.aj
deleted file mode 100755
index 280cf8306..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsTransaction_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsTransaction;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
-
-privileged aspect LsTransaction_Roo_Jpa_Entity {
-    
-    declare @type: LsTransaction: @Entity;
-    
-    @Id
-    @SequenceGenerator(name = "lsTransactionGen", sequenceName = "LS_TRANSACTION_PKSEQ")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsTransactionGen")
-    @Column(name = "id")
-    private Long LsTransaction.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer LsTransaction.version;
-    
-    public Long LsTransaction.getId() {
-        return this.id;
-    }
-    
-    public void LsTransaction.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer LsTransaction.getVersion() {
-        return this.version;
-    }
-    
-    public void LsTransaction.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsTransaction_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/LsTransaction_Roo_Json.aj
deleted file mode 100755
index afd70d0f5..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsTransaction_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsTransaction;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect LsTransaction_Roo_Json {
-    
-    public String LsTransaction.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String LsTransaction.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static LsTransaction LsTransaction.fromJsonToLsTransaction(String json) {
-        return new JSONDeserializer<LsTransaction>()
-        .use(null, LsTransaction.class).deserialize(json);
-    }
-    
-    public static String LsTransaction.toJsonArray(Collection<LsTransaction> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String LsTransaction.toJsonArray(Collection<LsTransaction> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<LsTransaction> LsTransaction.fromJsonArrayToLsTransactions(String json) {
-        return new JSONDeserializer<List<LsTransaction>>()
-        .use("values", LsTransaction.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/LsTransaction_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/LsTransaction_Roo_ToString.aj
deleted file mode 100755
index 0487b104c..000000000
--- a/src/main/java/com/labsynch/labseer/domain/LsTransaction_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsTransaction;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect LsTransaction_Roo_ToString {
-    
-    public String LsTransaction.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Operator.java b/src/main/java/com/labsynch/labseer/domain/Operator.java
index 1804b16c5..f97a25b68 100755
--- a/src/main/java/com/labsynch/labseer/domain/Operator.java
+++ b/src/main/java/com/labsynch/labseer/domain/Operator.java
@@ -1,12 +1,30 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -19,4 +37,228 @@ public class Operator {
     @Size(max = 255)
     private String code;
     
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static Operator fromJsonToOperator(String json) {
+        return new JSONDeserializer<Operator>()
+        .use(null, Operator.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<Operator> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<Operator> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<Operator> fromJsonArrayToOperators(String json) {
+        return new JSONDeserializer<List<Operator>>()
+        .use("values", Operator.class).deserialize(json);
+    }
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String getName() {
+        return this.name;
+    }
+
+	public void setName(String name) {
+        this.name = name;
+    }
+
+	public String getCode() {
+        return this.code;
+    }
+
+	public void setCode(String code) {
+        this.code = code;
+    }
+
+	public static Long countFindOperatorsByCodeEquals(String code) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = Operator.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Operator AS o WHERE o.code = :code", Long.class);
+        q.setParameter("code", code);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindOperatorsByNameEquals(String name) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = Operator.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Operator AS o WHERE o.name = :name", Long.class);
+        q.setParameter("name", name);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<Operator> findOperatorsByCodeEquals(String code) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = Operator.entityManager();
+        TypedQuery<Operator> q = em.createQuery("SELECT o FROM Operator AS o WHERE o.code = :code", Operator.class);
+        q.setParameter("code", code);
+        return q;
+    }
+
+	public static TypedQuery<Operator> findOperatorsByCodeEquals(String code, String sortFieldName, String sortOrder) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = Operator.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Operator AS o WHERE o.code = :code");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Operator> q = em.createQuery(queryBuilder.toString(), Operator.class);
+        q.setParameter("code", code);
+        return q;
+    }
+
+	public static TypedQuery<Operator> findOperatorsByNameEquals(String name) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = Operator.entityManager();
+        TypedQuery<Operator> q = em.createQuery("SELECT o FROM Operator AS o WHERE o.name = :name", Operator.class);
+        q.setParameter("name", name);
+        return q;
+    }
+
+	public static TypedQuery<Operator> findOperatorsByNameEquals(String name, String sortFieldName, String sortOrder) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = Operator.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Operator AS o WHERE o.name = :name");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Operator> q = em.createQuery(queryBuilder.toString(), Operator.class);
+        q.setParameter("name", name);
+        return q;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new Operator().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countOperators() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM Operator o", Long.class).getSingleResult();
+    }
+
+	public static List<Operator> findAllOperators() {
+        return entityManager().createQuery("SELECT o FROM Operator o", Operator.class).getResultList();
+    }
+
+	public static List<Operator> findAllOperators(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM Operator o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, Operator.class).getResultList();
+    }
+
+	public static Operator findOperator(Long id) {
+        if (id == null) return null;
+        return entityManager().find(Operator.class, id);
+    }
+
+	public static List<Operator> findOperatorEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM Operator o", Operator.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<Operator> findOperatorEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM Operator o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, Operator.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            Operator attached = Operator.findOperator(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public Operator merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        Operator merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/OperatorKind.java b/src/main/java/com/labsynch/labseer/domain/OperatorKind.java
index f5b147a57..12dc957f4 100755
--- a/src/main/java/com/labsynch/labseer/domain/OperatorKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/OperatorKind.java
@@ -1,5 +1,8 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.List;
 
 import javax.persistence.Column;
@@ -12,16 +15,20 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
 @Entity
 @RooJavaBean
 @RooToString
@@ -133,4 +140,123 @@ public OperatorKind merge() {
         this.entityManager.flush();
         return merged;
     }
+
+	public static Long countFindOperatorKindsByKindNameEqualsAndLsType(String kindName, OperatorType lsType) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = OperatorKind.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM OperatorKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<OperatorKind> findOperatorKindsByKindNameEqualsAndLsType(String kindName, OperatorType lsType) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = OperatorKind.entityManager();
+        TypedQuery<OperatorKind> q = em.createQuery("SELECT o FROM OperatorKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", OperatorKind.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<OperatorKind> findOperatorKindsByKindNameEqualsAndLsType(String kindName, OperatorType lsType, String sortFieldName, String sortOrder) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = OperatorKind.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM OperatorKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<OperatorKind> q = em.createQuery(queryBuilder.toString(), OperatorKind.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public OperatorType getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(OperatorType lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getKindName() {
+        return this.kindName;
+    }
+
+	public void setKindName(String kindName) {
+        this.kindName = kindName;
+    }
+
+	public String getLsTypeAndKind() {
+        return this.lsTypeAndKind;
+    }
+
+	public void setLsTypeAndKind(String lsTypeAndKind) {
+        this.lsTypeAndKind = lsTypeAndKind;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
+
+	public static List<OperatorKind> findAllOperatorKinds(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM OperatorKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, OperatorKind.class).getResultList();
+    }
+
+	public static List<OperatorKind> findOperatorKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM OperatorKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, OperatorKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static OperatorKind fromJsonToOperatorKind(String json) {
+        return new JSONDeserializer<OperatorKind>()
+        .use(null, OperatorKind.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<OperatorKind> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<OperatorKind> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<OperatorKind> fromJsonArrayToOperatorKinds(String json) {
+        return new JSONDeserializer<List<OperatorKind>>()
+        .use("values", OperatorKind.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/OperatorKind_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/OperatorKind_Roo_Configurable.aj
deleted file mode 100755
index 51da0a523..000000000
--- a/src/main/java/com/labsynch/labseer/domain/OperatorKind_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.OperatorKind;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect OperatorKind_Roo_Configurable {
-    
-    declare @type: OperatorKind: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/OperatorKind_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/OperatorKind_Roo_Finder.aj
deleted file mode 100644
index 8c0992d23..000000000
--- a/src/main/java/com/labsynch/labseer/domain/OperatorKind_Roo_Finder.aj
+++ /dev/null
@@ -1,50 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.OperatorKind;
-import com.labsynch.labseer.domain.OperatorType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect OperatorKind_Roo_Finder {
-    
-    public static Long OperatorKind.countFindOperatorKindsByKindNameEqualsAndLsType(String kindName, OperatorType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = OperatorKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM OperatorKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<OperatorKind> OperatorKind.findOperatorKindsByKindNameEqualsAndLsType(String kindName, OperatorType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = OperatorKind.entityManager();
-        TypedQuery<OperatorKind> q = em.createQuery("SELECT o FROM OperatorKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", OperatorKind.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<OperatorKind> OperatorKind.findOperatorKindsByKindNameEqualsAndLsType(String kindName, OperatorType lsType, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = OperatorKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM OperatorKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<OperatorKind> q = em.createQuery(queryBuilder.toString(), OperatorKind.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/OperatorKind_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/OperatorKind_Roo_JavaBean.aj
deleted file mode 100755
index 500c263fd..000000000
--- a/src/main/java/com/labsynch/labseer/domain/OperatorKind_Roo_JavaBean.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.OperatorKind;
-import com.labsynch.labseer.domain.OperatorType;
-
-privileged aspect OperatorKind_Roo_JavaBean {
-    
-    public OperatorType OperatorKind.getLsType() {
-        return this.lsType;
-    }
-    
-    public void OperatorKind.setLsType(OperatorType lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String OperatorKind.getKindName() {
-        return this.kindName;
-    }
-    
-    public void OperatorKind.setKindName(String kindName) {
-        this.kindName = kindName;
-    }
-    
-    public String OperatorKind.getLsTypeAndKind() {
-        return this.lsTypeAndKind;
-    }
-    
-    public void OperatorKind.setLsTypeAndKind(String lsTypeAndKind) {
-        this.lsTypeAndKind = lsTypeAndKind;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/OperatorKind_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/OperatorKind_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 8ea54548e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/OperatorKind_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.OperatorKind;
-import java.util.List;
-
-privileged aspect OperatorKind_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> OperatorKind.fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
-    
-    public static List<OperatorKind> OperatorKind.findAllOperatorKinds(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM OperatorKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, OperatorKind.class).getResultList();
-    }
-    
-    public static List<OperatorKind> OperatorKind.findOperatorKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM OperatorKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, OperatorKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/OperatorKind_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/OperatorKind_Roo_Json.aj
deleted file mode 100755
index 9f816f24d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/OperatorKind_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.OperatorKind;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect OperatorKind_Roo_Json {
-    
-    public String OperatorKind.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String OperatorKind.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static OperatorKind OperatorKind.fromJsonToOperatorKind(String json) {
-        return new JSONDeserializer<OperatorKind>()
-        .use(null, OperatorKind.class).deserialize(json);
-    }
-    
-    public static String OperatorKind.toJsonArray(Collection<OperatorKind> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String OperatorKind.toJsonArray(Collection<OperatorKind> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<OperatorKind> OperatorKind.fromJsonArrayToOperatorKinds(String json) {
-        return new JSONDeserializer<List<OperatorKind>>()
-        .use("values", OperatorKind.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/OperatorKind_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/OperatorKind_Roo_ToString.aj
deleted file mode 100755
index b59d1d961..000000000
--- a/src/main/java/com/labsynch/labseer/domain/OperatorKind_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.OperatorKind;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect OperatorKind_Roo_ToString {
-    
-    public String OperatorKind.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/OperatorType.java b/src/main/java/com/labsynch/labseer/domain/OperatorType.java
index 68b8a09d8..81748765b 100755
--- a/src/main/java/com/labsynch/labseer/domain/OperatorType.java
+++ b/src/main/java/com/labsynch/labseer/domain/OperatorType.java
@@ -1,20 +1,31 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.EntityManager;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
 @Entity
 @RooJavaBean
 @RooToString
@@ -52,4 +63,164 @@ public Integer getVersion() {
 	public void setVersion(Integer version) {
         this.version = version;
     }
+
+	public static Long countFindOperatorTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = OperatorType.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM OperatorType AS o WHERE o.typeName = :typeName", Long.class);
+        q.setParameter("typeName", typeName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<OperatorType> findOperatorTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = OperatorType.entityManager();
+        TypedQuery<OperatorType> q = em.createQuery("SELECT o FROM OperatorType AS o WHERE o.typeName = :typeName", OperatorType.class);
+        q.setParameter("typeName", typeName);
+        return q;
+    }
+
+	public static TypedQuery<OperatorType> findOperatorTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = OperatorType.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM OperatorType AS o WHERE o.typeName = :typeName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<OperatorType> q = em.createQuery(queryBuilder.toString(), OperatorType.class);
+        q.setParameter("typeName", typeName);
+        return q;
+    }
+
+	public String getTypeName() {
+        return this.typeName;
+    }
+
+	public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName", "id", "version");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new OperatorType().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countOperatorTypes() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM OperatorType o", Long.class).getSingleResult();
+    }
+
+	public static List<OperatorType> findAllOperatorTypes() {
+        return entityManager().createQuery("SELECT o FROM OperatorType o", OperatorType.class).getResultList();
+    }
+
+	public static List<OperatorType> findAllOperatorTypes(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM OperatorType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, OperatorType.class).getResultList();
+    }
+
+	public static OperatorType findOperatorType(Long id) {
+        if (id == null) return null;
+        return entityManager().find(OperatorType.class, id);
+    }
+
+	public static List<OperatorType> findOperatorTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM OperatorType o", OperatorType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<OperatorType> findOperatorTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM OperatorType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, OperatorType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            OperatorType attached = OperatorType.findOperatorType(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public OperatorType merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        OperatorType merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static OperatorType fromJsonToOperatorType(String json) {
+        return new JSONDeserializer<OperatorType>()
+        .use(null, OperatorType.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<OperatorType> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<OperatorType> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<OperatorType> fromJsonArrayToOperatorTypes(String json) {
+        return new JSONDeserializer<List<OperatorType>>()
+        .use("values", OperatorType.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/OperatorType_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/OperatorType_Roo_Configurable.aj
deleted file mode 100755
index 136521a72..000000000
--- a/src/main/java/com/labsynch/labseer/domain/OperatorType_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.OperatorType;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect OperatorType_Roo_Configurable {
-    
-    declare @type: OperatorType: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/OperatorType_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/OperatorType_Roo_Finder.aj
deleted file mode 100755
index b9fa5121a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/OperatorType_Roo_Finder.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.OperatorType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect OperatorType_Roo_Finder {
-    
-    public static Long OperatorType.countFindOperatorTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = OperatorType.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM OperatorType AS o WHERE o.typeName = :typeName", Long.class);
-        q.setParameter("typeName", typeName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<OperatorType> OperatorType.findOperatorTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = OperatorType.entityManager();
-        TypedQuery<OperatorType> q = em.createQuery("SELECT o FROM OperatorType AS o WHERE o.typeName = :typeName", OperatorType.class);
-        q.setParameter("typeName", typeName);
-        return q;
-    }
-    
-    public static TypedQuery<OperatorType> OperatorType.findOperatorTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = OperatorType.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM OperatorType AS o WHERE o.typeName = :typeName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<OperatorType> q = em.createQuery(queryBuilder.toString(), OperatorType.class);
-        q.setParameter("typeName", typeName);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/OperatorType_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/OperatorType_Roo_JavaBean.aj
deleted file mode 100755
index 3ff1fffb9..000000000
--- a/src/main/java/com/labsynch/labseer/domain/OperatorType_Roo_JavaBean.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.OperatorType;
-
-privileged aspect OperatorType_Roo_JavaBean {
-    
-    public String OperatorType.getTypeName() {
-        return this.typeName;
-    }
-    
-    public void OperatorType.setTypeName(String typeName) {
-        this.typeName = typeName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/OperatorType_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/OperatorType_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 54a46cdac..000000000
--- a/src/main/java/com/labsynch/labseer/domain/OperatorType_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.OperatorType;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect OperatorType_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager OperatorType.entityManager;
-    
-    public static final List<String> OperatorType.fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName", "id", "version");
-    
-    public static final EntityManager OperatorType.entityManager() {
-        EntityManager em = new OperatorType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long OperatorType.countOperatorTypes() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM OperatorType o", Long.class).getSingleResult();
-    }
-    
-    public static List<OperatorType> OperatorType.findAllOperatorTypes() {
-        return entityManager().createQuery("SELECT o FROM OperatorType o", OperatorType.class).getResultList();
-    }
-    
-    public static List<OperatorType> OperatorType.findAllOperatorTypes(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM OperatorType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, OperatorType.class).getResultList();
-    }
-    
-    public static OperatorType OperatorType.findOperatorType(Long id) {
-        if (id == null) return null;
-        return entityManager().find(OperatorType.class, id);
-    }
-    
-    public static List<OperatorType> OperatorType.findOperatorTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM OperatorType o", OperatorType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<OperatorType> OperatorType.findOperatorTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM OperatorType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, OperatorType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void OperatorType.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void OperatorType.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            OperatorType attached = OperatorType.findOperatorType(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void OperatorType.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void OperatorType.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public OperatorType OperatorType.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        OperatorType merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/OperatorType_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/OperatorType_Roo_Json.aj
deleted file mode 100755
index 977bfe6f5..000000000
--- a/src/main/java/com/labsynch/labseer/domain/OperatorType_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.OperatorType;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect OperatorType_Roo_Json {
-    
-    public String OperatorType.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String OperatorType.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static OperatorType OperatorType.fromJsonToOperatorType(String json) {
-        return new JSONDeserializer<OperatorType>()
-        .use(null, OperatorType.class).deserialize(json);
-    }
-    
-    public static String OperatorType.toJsonArray(Collection<OperatorType> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String OperatorType.toJsonArray(Collection<OperatorType> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<OperatorType> OperatorType.fromJsonArrayToOperatorTypes(String json) {
-        return new JSONDeserializer<List<OperatorType>>()
-        .use("values", OperatorType.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/OperatorType_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/OperatorType_Roo_ToString.aj
deleted file mode 100755
index 09bb9d86e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/OperatorType_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.OperatorType;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect OperatorType_Roo_ToString {
-    
-    public String OperatorType.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Operator_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/Operator_Roo_Configurable.aj
deleted file mode 100644
index f234c636c..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Operator_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Operator;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect Operator_Roo_Configurable {
-    
-    declare @type: Operator: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Operator_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/Operator_Roo_Finder.aj
deleted file mode 100644
index a2787114a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Operator_Roo_Finder.aj
+++ /dev/null
@@ -1,74 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Operator;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect Operator_Roo_Finder {
-    
-    public static Long Operator.countFindOperatorsByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = Operator.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Operator AS o WHERE o.code = :code", Long.class);
-        q.setParameter("code", code);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Operator.countFindOperatorsByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = Operator.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Operator AS o WHERE o.name = :name", Long.class);
-        q.setParameter("name", name);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<Operator> Operator.findOperatorsByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = Operator.entityManager();
-        TypedQuery<Operator> q = em.createQuery("SELECT o FROM Operator AS o WHERE o.code = :code", Operator.class);
-        q.setParameter("code", code);
-        return q;
-    }
-    
-    public static TypedQuery<Operator> Operator.findOperatorsByCodeEquals(String code, String sortFieldName, String sortOrder) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = Operator.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Operator AS o WHERE o.code = :code");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Operator> q = em.createQuery(queryBuilder.toString(), Operator.class);
-        q.setParameter("code", code);
-        return q;
-    }
-    
-    public static TypedQuery<Operator> Operator.findOperatorsByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = Operator.entityManager();
-        TypedQuery<Operator> q = em.createQuery("SELECT o FROM Operator AS o WHERE o.name = :name", Operator.class);
-        q.setParameter("name", name);
-        return q;
-    }
-    
-    public static TypedQuery<Operator> Operator.findOperatorsByNameEquals(String name, String sortFieldName, String sortOrder) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = Operator.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Operator AS o WHERE o.name = :name");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Operator> q = em.createQuery(queryBuilder.toString(), Operator.class);
-        q.setParameter("name", name);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Operator_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/Operator_Roo_JavaBean.aj
deleted file mode 100644
index 34fa9135a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Operator_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Operator;
-
-privileged aspect Operator_Roo_JavaBean {
-    
-    public String Operator.getName() {
-        return this.name;
-    }
-    
-    public void Operator.setName(String name) {
-        this.name = name;
-    }
-    
-    public String Operator.getCode() {
-        return this.code;
-    }
-    
-    public void Operator.setCode(String code) {
-        this.code = code;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Operator_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/Operator_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index dc92acf60..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Operator_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Operator;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect Operator_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager Operator.entityManager;
-    
-    public static final List<String> Operator.fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
-    
-    public static final EntityManager Operator.entityManager() {
-        EntityManager em = new Operator().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long Operator.countOperators() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM Operator o", Long.class).getSingleResult();
-    }
-    
-    public static List<Operator> Operator.findAllOperators() {
-        return entityManager().createQuery("SELECT o FROM Operator o", Operator.class).getResultList();
-    }
-    
-    public static List<Operator> Operator.findAllOperators(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM Operator o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, Operator.class).getResultList();
-    }
-    
-    public static Operator Operator.findOperator(Long id) {
-        if (id == null) return null;
-        return entityManager().find(Operator.class, id);
-    }
-    
-    public static List<Operator> Operator.findOperatorEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM Operator o", Operator.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<Operator> Operator.findOperatorEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM Operator o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, Operator.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void Operator.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void Operator.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            Operator attached = Operator.findOperator(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void Operator.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void Operator.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public Operator Operator.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        Operator merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Operator_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/Operator_Roo_Jpa_Entity.aj
deleted file mode 100644
index 17b46d484..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Operator_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Operator;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect Operator_Roo_Jpa_Entity {
-    
-    declare @type: Operator: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long Operator.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer Operator.version;
-    
-    public Long Operator.getId() {
-        return this.id;
-    }
-    
-    public void Operator.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer Operator.getVersion() {
-        return this.version;
-    }
-    
-    public void Operator.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Operator_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/Operator_Roo_Json.aj
deleted file mode 100644
index 141770651..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Operator_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Operator;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect Operator_Roo_Json {
-    
-    public String Operator.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String Operator.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static Operator Operator.fromJsonToOperator(String json) {
-        return new JSONDeserializer<Operator>()
-        .use(null, Operator.class).deserialize(json);
-    }
-    
-    public static String Operator.toJsonArray(Collection<Operator> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String Operator.toJsonArray(Collection<Operator> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<Operator> Operator.fromJsonArrayToOperators(String json) {
-        return new JSONDeserializer<List<Operator>>()
-        .use("values", Operator.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Operator_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/Operator_Roo_ToString.aj
deleted file mode 100644
index d5dbf1384..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Operator_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Operator;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect Operator_Roo_ToString {
-    
-    public String Operator.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Parent.java b/src/main/java/com/labsynch/labseer/domain/Parent.java
index 2d4a6737d..ad940f336 100755
--- a/src/main/java/com/labsynch/labseer/domain/Parent.java
+++ b/src/main/java/com/labsynch/labseer/domain/Parent.java
@@ -1,6 +1,7 @@
 package com.labsynch.labseer.domain;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
@@ -8,15 +9,21 @@
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
+import javax.persistence.PersistenceContext;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
 import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Join;
@@ -26,10 +33,12 @@
 import javax.persistence.criteria.Root;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
@@ -41,7 +50,11 @@
 import com.labsynch.labseer.dto.SearchFormDTO;
 import com.labsynch.labseer.service.ChemStructureService;
 import com.labsynch.labseer.service.ParentService;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
+@Entity
+@Configurable
 @Transactional
 @RooJavaBean
 @RooToString
@@ -375,4 +388,562 @@ public static Long countParentsByStereoCategory(StereoCategory stereoCategory) {
     }
     
 
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static Long countFindParentsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile) {
+        if (bulkLoadFile == null) throw new IllegalArgumentException("The bulkLoadFile argument is required");
+        EntityManager em = Parent.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Parent AS o WHERE o.bulkLoadFile = :bulkLoadFile", Long.class);
+        q.setParameter("bulkLoadFile", bulkLoadFile);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindParentsByCdId(int CdId) {
+        EntityManager em = Parent.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Parent AS o WHERE o.CdId = :CdId", Long.class);
+        q.setParameter("CdId", CdId);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindParentsByCommonNameLike(String commonName) {
+        if (commonName == null || commonName.length() == 0) throw new IllegalArgumentException("The commonName argument is required");
+        commonName = commonName.replace('*', '%');
+        if (commonName.charAt(0) != '%') {
+            commonName = "%" + commonName;
+        }
+        if (commonName.charAt(commonName.length() - 1) != '%') {
+            commonName = commonName + "%";
+        }
+        EntityManager em = Parent.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Parent AS o WHERE LOWER(o.commonName) LIKE LOWER(:commonName)", Long.class);
+        q.setParameter("commonName", commonName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindParentsByCorpNameEquals(String corpName) {
+        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+        EntityManager em = Parent.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Parent AS o WHERE o.corpName = :corpName", Long.class);
+        q.setParameter("corpName", corpName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindParentsByCorpNameLike(String corpName) {
+        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+        corpName = corpName.replace('*', '%');
+        if (corpName.charAt(0) != '%') {
+            corpName = "%" + corpName;
+        }
+        if (corpName.charAt(corpName.length() - 1) != '%') {
+            corpName = corpName + "%";
+        }
+        EntityManager em = Parent.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Parent AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)", Long.class);
+        q.setParameter("corpName", corpName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindParentsBySaltForms(Set<SaltForm> saltForms) {
+        if (saltForms == null) throw new IllegalArgumentException("The saltForms argument is required");
+        EntityManager em = Parent.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT COUNT(o) FROM Parent AS o WHERE");
+        for (int i = 0; i < saltForms.size(); i++) {
+            if (i > 0) queryBuilder.append(" AND");
+            queryBuilder.append(" :saltForms_item").append(i).append(" MEMBER OF o.saltForms");
+        }
+        TypedQuery q = em.createQuery(queryBuilder.toString(), Long.class);
+        int saltFormsIndex = 0;
+        for (SaltForm _saltform: saltForms) {
+            q.setParameter("saltForms_item" + saltFormsIndex++, _saltform);
+        }
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<Parent> findParentsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile) {
+        if (bulkLoadFile == null) throw new IllegalArgumentException("The bulkLoadFile argument is required");
+        EntityManager em = Parent.entityManager();
+        TypedQuery<Parent> q = em.createQuery("SELECT o FROM Parent AS o WHERE o.bulkLoadFile = :bulkLoadFile", Parent.class);
+        q.setParameter("bulkLoadFile", bulkLoadFile);
+        return q;
+    }
+
+	public static TypedQuery<Parent> findParentsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile, String sortFieldName, String sortOrder) {
+        if (bulkLoadFile == null) throw new IllegalArgumentException("The bulkLoadFile argument is required");
+        EntityManager em = Parent.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Parent AS o WHERE o.bulkLoadFile = :bulkLoadFile");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Parent> q = em.createQuery(queryBuilder.toString(), Parent.class);
+        q.setParameter("bulkLoadFile", bulkLoadFile);
+        return q;
+    }
+
+	public static TypedQuery<Parent> findParentsByCdId(int CdId, String sortFieldName, String sortOrder) {
+        EntityManager em = Parent.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Parent AS o WHERE o.CdId = :CdId");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Parent> q = em.createQuery(queryBuilder.toString(), Parent.class);
+        q.setParameter("CdId", CdId);
+        return q;
+    }
+
+	public static TypedQuery<Parent> findParentsByCommonNameLike(String commonName) {
+        if (commonName == null || commonName.length() == 0) throw new IllegalArgumentException("The commonName argument is required");
+        commonName = commonName.replace('*', '%');
+        if (commonName.charAt(0) != '%') {
+            commonName = "%" + commonName;
+        }
+        if (commonName.charAt(commonName.length() - 1) != '%') {
+            commonName = commonName + "%";
+        }
+        EntityManager em = Parent.entityManager();
+        TypedQuery<Parent> q = em.createQuery("SELECT o FROM Parent AS o WHERE LOWER(o.commonName) LIKE LOWER(:commonName)", Parent.class);
+        q.setParameter("commonName", commonName);
+        return q;
+    }
+
+	public static TypedQuery<Parent> findParentsByCommonNameLike(String commonName, String sortFieldName, String sortOrder) {
+        if (commonName == null || commonName.length() == 0) throw new IllegalArgumentException("The commonName argument is required");
+        commonName = commonName.replace('*', '%');
+        if (commonName.charAt(0) != '%') {
+            commonName = "%" + commonName;
+        }
+        if (commonName.charAt(commonName.length() - 1) != '%') {
+            commonName = commonName + "%";
+        }
+        EntityManager em = Parent.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Parent AS o WHERE LOWER(o.commonName) LIKE LOWER(:commonName)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Parent> q = em.createQuery(queryBuilder.toString(), Parent.class);
+        q.setParameter("commonName", commonName);
+        return q;
+    }
+
+	public static TypedQuery<Parent> findParentsByCorpNameEquals(String corpName) {
+        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+        EntityManager em = Parent.entityManager();
+        TypedQuery<Parent> q = em.createQuery("SELECT o FROM Parent AS o WHERE o.corpName = :corpName", Parent.class);
+        q.setParameter("corpName", corpName);
+        return q;
+    }
+
+	public static TypedQuery<Parent> findParentsByCorpNameEquals(String corpName, String sortFieldName, String sortOrder) {
+        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+        EntityManager em = Parent.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Parent AS o WHERE o.corpName = :corpName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Parent> q = em.createQuery(queryBuilder.toString(), Parent.class);
+        q.setParameter("corpName", corpName);
+        return q;
+    }
+
+	public static TypedQuery<Parent> findParentsByCorpNameLike(String corpName) {
+        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+        corpName = corpName.replace('*', '%');
+        if (corpName.charAt(0) != '%') {
+            corpName = "%" + corpName;
+        }
+        if (corpName.charAt(corpName.length() - 1) != '%') {
+            corpName = corpName + "%";
+        }
+        EntityManager em = Parent.entityManager();
+        TypedQuery<Parent> q = em.createQuery("SELECT o FROM Parent AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)", Parent.class);
+        q.setParameter("corpName", corpName);
+        return q;
+    }
+
+	public static TypedQuery<Parent> findParentsByCorpNameLike(String corpName, String sortFieldName, String sortOrder) {
+        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+        corpName = corpName.replace('*', '%');
+        if (corpName.charAt(0) != '%') {
+            corpName = "%" + corpName;
+        }
+        if (corpName.charAt(corpName.length() - 1) != '%') {
+            corpName = corpName + "%";
+        }
+        EntityManager em = Parent.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Parent AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Parent> q = em.createQuery(queryBuilder.toString(), Parent.class);
+        q.setParameter("corpName", corpName);
+        return q;
+    }
+
+	public static TypedQuery<Parent> findParentsBySaltForms(Set<SaltForm> saltForms) {
+        if (saltForms == null) throw new IllegalArgumentException("The saltForms argument is required");
+        EntityManager em = Parent.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Parent AS o WHERE");
+        for (int i = 0; i < saltForms.size(); i++) {
+            if (i > 0) queryBuilder.append(" AND");
+            queryBuilder.append(" :saltForms_item").append(i).append(" MEMBER OF o.saltForms");
+        }
+        TypedQuery<Parent> q = em.createQuery(queryBuilder.toString(), Parent.class);
+        int saltFormsIndex = 0;
+        for (SaltForm _saltform: saltForms) {
+            q.setParameter("saltForms_item" + saltFormsIndex++, _saltform);
+        }
+        return q;
+    }
+
+	public static TypedQuery<Parent> findParentsBySaltForms(Set<SaltForm> saltForms, String sortFieldName, String sortOrder) {
+        if (saltForms == null) throw new IllegalArgumentException("The saltForms argument is required");
+        EntityManager em = Parent.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Parent AS o WHERE");
+        for (int i = 0; i < saltForms.size(); i++) {
+            if (i > 0) queryBuilder.append(" AND");
+            queryBuilder.append(" :saltForms_item").append(i).append(" MEMBER OF o.saltForms");
+        }
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" " + sortOrder);
+            }
+        }
+        TypedQuery<Parent> q = em.createQuery(queryBuilder.toString(), Parent.class);
+        int saltFormsIndex = 0;
+        for (SaltForm _saltform: saltForms) {
+            q.setParameter("saltForms_item" + saltFormsIndex++, _saltform);
+        }
+        return q;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static Parent fromJsonToParent(String json) {
+        return new JSONDeserializer<Parent>()
+        .use(null, Parent.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<Parent> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<Parent> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<Parent> fromJsonArrayToParents(String json) {
+        return new JSONDeserializer<List<Parent>>()
+        .use("values", Parent.class).deserialize(json);
+    }
+
+	public String getCorpName() {
+        return this.corpName;
+    }
+
+	public void setCorpName(String corpName) {
+        this.corpName = corpName;
+    }
+
+	public long getParentNumber() {
+        return this.parentNumber;
+    }
+
+	public void setParentNumber(long parentNumber) {
+        this.parentNumber = parentNumber;
+    }
+
+	public String getChemist() {
+        return this.chemist;
+    }
+
+	public void setChemist(String chemist) {
+        this.chemist = chemist;
+    }
+
+	public String getCommonName() {
+        return this.commonName;
+    }
+
+	public void setCommonName(String commonName) {
+        this.commonName = commonName;
+    }
+
+	public StereoCategory getStereoCategory() {
+        return this.stereoCategory;
+    }
+
+	public void setStereoCategory(StereoCategory stereoCategory) {
+        this.stereoCategory = stereoCategory;
+    }
+
+	public String getStereoComment() {
+        return this.stereoComment;
+    }
+
+	public void setStereoComment(String stereoComment) {
+        this.stereoComment = stereoComment;
+    }
+
+	public String getMolStructure() {
+        return this.molStructure;
+    }
+
+	public void setMolStructure(String molStructure) {
+        this.molStructure = molStructure;
+    }
+
+	public Double getMolWeight() {
+        return this.molWeight;
+    }
+
+	public void setMolWeight(Double molWeight) {
+        this.molWeight = molWeight;
+    }
+
+	public Double getExactMass() {
+        return this.exactMass;
+    }
+
+	public void setExactMass(Double exactMass) {
+        this.exactMass = exactMass;
+    }
+
+	public String getMolFormula() {
+        return this.molFormula;
+    }
+
+	public void setMolFormula(String molFormula) {
+        this.molFormula = molFormula;
+    }
+
+	public int getCdId() {
+        return this.CdId;
+    }
+
+	public void setCdId(int CdId) {
+        this.CdId = CdId;
+    }
+
+	public Date getRegistrationDate() {
+        return this.registrationDate;
+    }
+
+	public void setRegistrationDate(Date registrationDate) {
+        this.registrationDate = registrationDate;
+    }
+
+	public String getRegisteredBy() {
+        return this.registeredBy;
+    }
+
+	public void setRegisteredBy(String registeredBy) {
+        this.registeredBy = registeredBy;
+    }
+
+	public Date getModifiedDate() {
+        return this.modifiedDate;
+    }
+
+	public void setModifiedDate(Date modifiedDate) {
+        this.modifiedDate = modifiedDate;
+    }
+
+	public String getModifiedBy() {
+        return this.modifiedBy;
+    }
+
+	public void setModifiedBy(String modifiedBy) {
+        this.modifiedBy = modifiedBy;
+    }
+
+	public Boolean getIgnore() {
+        return this.ignore;
+    }
+
+	public void setIgnore(Boolean ignore) {
+        this.ignore = ignore;
+    }
+
+	public Set<SaltForm> getSaltForms() {
+        return this.saltForms;
+    }
+
+	public void setSaltForms(Set<SaltForm> saltForms) {
+        this.saltForms = saltForms;
+    }
+
+	public Set<ParentAlias> getParentAliases() {
+        return this.parentAliases;
+    }
+
+	public void setParentAliases(Set<ParentAlias> parentAliases) {
+        this.parentAliases = parentAliases;
+    }
+
+	public BulkLoadFile getBulkLoadFile() {
+        return this.bulkLoadFile;
+    }
+
+	public void setBulkLoadFile(BulkLoadFile bulkLoadFile) {
+        this.bulkLoadFile = bulkLoadFile;
+    }
+
+	public ParentAnnotation getParentAnnotation() {
+        return this.parentAnnotation;
+    }
+
+	public void setParentAnnotation(ParentAnnotation parentAnnotation) {
+        this.parentAnnotation = parentAnnotation;
+    }
+
+	public CompoundType getCompoundType() {
+        return this.compoundType;
+    }
+
+	public void setCompoundType(CompoundType compoundType) {
+        this.compoundType = compoundType;
+    }
+
+	public String getComment() {
+        return this.comment;
+    }
+
+	public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+	public Boolean getIsMixture() {
+        return this.isMixture;
+    }
+
+	public void setIsMixture(Boolean isMixture) {
+        this.isMixture = isMixture;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "corpName", "parentNumber", "chemist", "commonName", "stereoCategory", "stereoComment", "molStructure", "molWeight", "exactMass", "molFormula", "CdId", "registrationDate", "registeredBy", "modifiedDate", "modifiedBy", "ignore", "saltForms", "parentAliases", "bulkLoadFile", "parentAnnotation", "compoundType", "comment", "isMixture", "labelPrefix");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new Parent().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countParents() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM Parent o", Long.class).getSingleResult();
+    }
+
+	public static List<Parent> findAllParents(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM Parent o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, Parent.class).getResultList();
+    }
+
+	public static List<Parent> findParentEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM Parent o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, Parent.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            Parent attached = Parent.findParent(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public Parent merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        Parent merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAlias.java b/src/main/java/com/labsynch/labseer/domain/ParentAlias.java
index ab60074a1..5bec1c47d 100644
--- a/src/main/java/com/labsynch/labseer/domain/ParentAlias.java
+++ b/src/main/java/com/labsynch/labseer/domain/ParentAlias.java
@@ -1,18 +1,35 @@
 package com.labsynch.labseer.domain;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+import javax.persistence.Version;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
-
+import org.springframework.transaction.annotation.Transactional;
 import com.labsynch.labseer.dto.ParentAliasDTO;
 import com.labsynch.labseer.exceptions.ParentNotFoundException;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -71,4 +88,411 @@ public ParentAlias(ParentAliasDTO parentAliasDTO) throws ParentNotFoundException
 		this.setId(parentAliasDTO.getId());
 		this.setVersion(parentAliasDTO.getVersion());
 	}
+
+	public static Long countFindParentAliasesByAliasNameEquals(String aliasName) {
+        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
+        EntityManager em = ParentAlias.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ParentAlias AS o WHERE o.aliasName = :aliasName", Long.class);
+        q.setParameter("aliasName", aliasName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName, String lsType, String lsKind) {
+        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = ParentAlias.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ParentAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        q.setParameter("aliasName", aliasName);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindParentAliasesByParent(Parent parent) {
+        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
+        EntityManager em = ParentAlias.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ParentAlias AS o WHERE o.parent = :parent", Long.class);
+        q.setParameter("parent", parent);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindParentAliasesByParentAndLsTypeEqualsAndLsKindEquals(Parent parent, String lsType, String lsKind) {
+        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = ParentAlias.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ParentAlias AS o WHERE o.parent = :parent AND o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        q.setParameter("parent", parent);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals(Parent parent, String lsType, String lsKind, String aliasName) {
+        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
+        EntityManager em = ParentAlias.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ParentAlias AS o WHERE o.parent = :parent AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.aliasName = :aliasName", Long.class);
+        q.setParameter("parent", parent);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("aliasName", aliasName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ParentAlias> findParentAliasesByAliasNameEquals(String aliasName) {
+        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
+        EntityManager em = ParentAlias.entityManager();
+        TypedQuery<ParentAlias> q = em.createQuery("SELECT o FROM ParentAlias AS o WHERE o.aliasName = :aliasName", ParentAlias.class);
+        q.setParameter("aliasName", aliasName);
+        return q;
+    }
+
+	public static TypedQuery<ParentAlias> findParentAliasesByAliasNameEquals(String aliasName, String sortFieldName, String sortOrder) {
+        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
+        EntityManager em = ParentAlias.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ParentAlias AS o WHERE o.aliasName = :aliasName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ParentAlias> q = em.createQuery(queryBuilder.toString(), ParentAlias.class);
+        q.setParameter("aliasName", aliasName);
+        return q;
+    }
+
+	public static TypedQuery<ParentAlias> findParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName, String lsType, String lsKind) {
+        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = ParentAlias.entityManager();
+        TypedQuery<ParentAlias> q = em.createQuery("SELECT o FROM ParentAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind", ParentAlias.class);
+        q.setParameter("aliasName", aliasName);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<ParentAlias> findParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName, String lsType, String lsKind, String sortFieldName, String sortOrder) {
+        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = ParentAlias.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ParentAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ParentAlias> q = em.createQuery(queryBuilder.toString(), ParentAlias.class);
+        q.setParameter("aliasName", aliasName);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<ParentAlias> findParentAliasesByParent(Parent parent) {
+        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
+        EntityManager em = ParentAlias.entityManager();
+        TypedQuery<ParentAlias> q = em.createQuery("SELECT o FROM ParentAlias AS o WHERE o.parent = :parent", ParentAlias.class);
+        q.setParameter("parent", parent);
+        return q;
+    }
+
+	public static TypedQuery<ParentAlias> findParentAliasesByParent(Parent parent, String sortFieldName, String sortOrder) {
+        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
+        EntityManager em = ParentAlias.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ParentAlias AS o WHERE o.parent = :parent");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ParentAlias> q = em.createQuery(queryBuilder.toString(), ParentAlias.class);
+        q.setParameter("parent", parent);
+        return q;
+    }
+
+	public static TypedQuery<ParentAlias> findParentAliasesByParentAndLsTypeEqualsAndLsKindEquals(Parent parent, String lsType, String lsKind) {
+        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = ParentAlias.entityManager();
+        TypedQuery<ParentAlias> q = em.createQuery("SELECT o FROM ParentAlias AS o WHERE o.parent = :parent AND o.lsType = :lsType  AND o.lsKind = :lsKind", ParentAlias.class);
+        q.setParameter("parent", parent);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<ParentAlias> findParentAliasesByParentAndLsTypeEqualsAndLsKindEquals(Parent parent, String lsType, String lsKind, String sortFieldName, String sortOrder) {
+        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = ParentAlias.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ParentAlias AS o WHERE o.parent = :parent AND o.lsType = :lsType  AND o.lsKind = :lsKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ParentAlias> q = em.createQuery(queryBuilder.toString(), ParentAlias.class);
+        q.setParameter("parent", parent);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<ParentAlias> findParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals(Parent parent, String lsType, String lsKind, String aliasName) {
+        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
+        EntityManager em = ParentAlias.entityManager();
+        TypedQuery<ParentAlias> q = em.createQuery("SELECT o FROM ParentAlias AS o WHERE o.parent = :parent AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.aliasName = :aliasName", ParentAlias.class);
+        q.setParameter("parent", parent);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("aliasName", aliasName);
+        return q;
+    }
+
+	public static TypedQuery<ParentAlias> findParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals(Parent parent, String lsType, String lsKind, String aliasName, String sortFieldName, String sortOrder) {
+        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
+        EntityManager em = ParentAlias.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ParentAlias AS o WHERE o.parent = :parent AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.aliasName = :aliasName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ParentAlias> q = em.createQuery(queryBuilder.toString(), ParentAlias.class);
+        q.setParameter("parent", parent);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("aliasName", aliasName);
+        return q;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "parent", "lsType", "lsKind", "aliasName", "preferred", "ignored", "deleted", "sortId");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new ParentAlias().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countParentAliases() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ParentAlias o", Long.class).getSingleResult();
+    }
+
+	public static List<ParentAlias> findAllParentAliases() {
+        return entityManager().createQuery("SELECT o FROM ParentAlias o", ParentAlias.class).getResultList();
+    }
+
+	public static List<ParentAlias> findAllParentAliases(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ParentAlias o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ParentAlias.class).getResultList();
+    }
+
+	public static ParentAlias findParentAlias(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ParentAlias.class, id);
+    }
+
+	public static List<ParentAlias> findParentAliasEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ParentAlias o", ParentAlias.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ParentAlias> findParentAliasEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ParentAlias o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ParentAlias.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            ParentAlias attached = ParentAlias.findParentAlias(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public ParentAlias merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ParentAlias merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ParentAlias fromJsonToParentAlias(String json) {
+        return new JSONDeserializer<ParentAlias>()
+        .use(null, ParentAlias.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ParentAlias> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ParentAlias> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ParentAlias> fromJsonArrayToParentAliases(String json) {
+        return new JSONDeserializer<List<ParentAlias>>()
+        .use("values", ParentAlias.class).deserialize(json);
+    }
+
+	public Parent getParent() {
+        return this.parent;
+    }
+
+	public void setParent(Parent parent) {
+        this.parent = parent;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getAliasName() {
+        return this.aliasName;
+    }
+
+	public void setAliasName(String aliasName) {
+        this.aliasName = aliasName;
+    }
+
+	public boolean isPreferred() {
+        return this.preferred;
+    }
+
+	public void setPreferred(boolean preferred) {
+        this.preferred = preferred;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public boolean isDeleted() {
+        return this.deleted;
+    }
+
+	public void setDeleted(boolean deleted) {
+        this.deleted = deleted;
+    }
+
+	public Integer getSortId() {
+        return this.sortId;
+    }
+
+	public void setSortId(Integer sortId) {
+        this.sortId = sortId;
+    }
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAliasKind.java b/src/main/java/com/labsynch/labseer/domain/ParentAliasKind.java
index 083cd98e1..5fe455bb3 100644
--- a/src/main/java/com/labsynch/labseer/domain/ParentAliasKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ParentAliasKind.java
@@ -1,15 +1,32 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -25,4 +42,166 @@ public class ParentAliasKind {
     private String kindName;
     
     
+
+	public ParentAliasType getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(ParentAliasType lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getKindName() {
+        return this.kindName;
+    }
+
+	public void setKindName(String kindName) {
+        this.kindName = kindName;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ParentAliasKind fromJsonToParentAliasKind(String json) {
+        return new JSONDeserializer<ParentAliasKind>()
+        .use(null, ParentAliasKind.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ParentAliasKind> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ParentAliasKind> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ParentAliasKind> fromJsonArrayToParentAliasKinds(String json) {
+        return new JSONDeserializer<List<ParentAliasKind>>()
+        .use("values", ParentAliasKind.class).deserialize(json);
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new ParentAliasKind().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countParentAliasKinds() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ParentAliasKind o", Long.class).getSingleResult();
+    }
+
+	public static List<ParentAliasKind> findAllParentAliasKinds() {
+        return entityManager().createQuery("SELECT o FROM ParentAliasKind o", ParentAliasKind.class).getResultList();
+    }
+
+	public static List<ParentAliasKind> findAllParentAliasKinds(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ParentAliasKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ParentAliasKind.class).getResultList();
+    }
+
+	public static ParentAliasKind findParentAliasKind(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ParentAliasKind.class, id);
+    }
+
+	public static List<ParentAliasKind> findParentAliasKindEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ParentAliasKind o", ParentAliasKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ParentAliasKind> findParentAliasKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ParentAliasKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ParentAliasKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            ParentAliasKind attached = ParentAliasKind.findParentAliasKind(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public ParentAliasKind merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ParentAliasKind merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAliasKind_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ParentAliasKind_Roo_Configurable.aj
deleted file mode 100644
index ecd018c40..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ParentAliasKind_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ParentAliasKind;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ParentAliasKind_Roo_Configurable {
-    
-    declare @type: ParentAliasKind: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAliasKind_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ParentAliasKind_Roo_JavaBean.aj
deleted file mode 100644
index 2d1d97b16..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ParentAliasKind_Roo_JavaBean.aj
+++ /dev/null
@@ -1,27 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ParentAliasKind;
-import com.labsynch.labseer.domain.ParentAliasType;
-
-privileged aspect ParentAliasKind_Roo_JavaBean {
-    
-    public ParentAliasType ParentAliasKind.getLsType() {
-        return this.lsType;
-    }
-    
-    public void ParentAliasKind.setLsType(ParentAliasType lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String ParentAliasKind.getKindName() {
-        return this.kindName;
-    }
-    
-    public void ParentAliasKind.setKindName(String kindName) {
-        this.kindName = kindName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAliasKind_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ParentAliasKind_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index aa96b0d97..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ParentAliasKind_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ParentAliasKind;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ParentAliasKind_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager ParentAliasKind.entityManager;
-    
-    public static final List<String> ParentAliasKind.fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName");
-    
-    public static final EntityManager ParentAliasKind.entityManager() {
-        EntityManager em = new ParentAliasKind().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long ParentAliasKind.countParentAliasKinds() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ParentAliasKind o", Long.class).getSingleResult();
-    }
-    
-    public static List<ParentAliasKind> ParentAliasKind.findAllParentAliasKinds() {
-        return entityManager().createQuery("SELECT o FROM ParentAliasKind o", ParentAliasKind.class).getResultList();
-    }
-    
-    public static List<ParentAliasKind> ParentAliasKind.findAllParentAliasKinds(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ParentAliasKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ParentAliasKind.class).getResultList();
-    }
-    
-    public static ParentAliasKind ParentAliasKind.findParentAliasKind(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ParentAliasKind.class, id);
-    }
-    
-    public static List<ParentAliasKind> ParentAliasKind.findParentAliasKindEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ParentAliasKind o", ParentAliasKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ParentAliasKind> ParentAliasKind.findParentAliasKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ParentAliasKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ParentAliasKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void ParentAliasKind.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void ParentAliasKind.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            ParentAliasKind attached = ParentAliasKind.findParentAliasKind(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void ParentAliasKind.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void ParentAliasKind.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public ParentAliasKind ParentAliasKind.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ParentAliasKind merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAliasKind_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ParentAliasKind_Roo_Jpa_Entity.aj
deleted file mode 100644
index 95df8588e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ParentAliasKind_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ParentAliasKind;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect ParentAliasKind_Roo_Jpa_Entity {
-    
-    declare @type: ParentAliasKind: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long ParentAliasKind.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer ParentAliasKind.version;
-    
-    public Long ParentAliasKind.getId() {
-        return this.id;
-    }
-    
-    public void ParentAliasKind.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer ParentAliasKind.getVersion() {
-        return this.version;
-    }
-    
-    public void ParentAliasKind.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAliasKind_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/ParentAliasKind_Roo_Json.aj
deleted file mode 100644
index 3db63dc57..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ParentAliasKind_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ParentAliasKind;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ParentAliasKind_Roo_Json {
-    
-    public String ParentAliasKind.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ParentAliasKind.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ParentAliasKind ParentAliasKind.fromJsonToParentAliasKind(String json) {
-        return new JSONDeserializer<ParentAliasKind>()
-        .use(null, ParentAliasKind.class).deserialize(json);
-    }
-    
-    public static String ParentAliasKind.toJsonArray(Collection<ParentAliasKind> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ParentAliasKind.toJsonArray(Collection<ParentAliasKind> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ParentAliasKind> ParentAliasKind.fromJsonArrayToParentAliasKinds(String json) {
-        return new JSONDeserializer<List<ParentAliasKind>>()
-        .use("values", ParentAliasKind.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAliasKind_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ParentAliasKind_Roo_ToString.aj
deleted file mode 100644
index 360494876..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ParentAliasKind_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ParentAliasKind;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ParentAliasKind_Roo_ToString {
-    
-    public String ParentAliasKind.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAliasType.java b/src/main/java/com/labsynch/labseer/domain/ParentAliasType.java
index ce2ba4f0b..8a37f47ca 100644
--- a/src/main/java/com/labsynch/labseer/domain/ParentAliasType.java
+++ b/src/main/java/com/labsynch/labseer/domain/ParentAliasType.java
@@ -1,12 +1,29 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Version;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -16,4 +33,158 @@ public class ParentAliasType {
     @Size(max = 255)
     private String typeName;
        
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ParentAliasType fromJsonToParentAliasType(String json) {
+        return new JSONDeserializer<ParentAliasType>()
+        .use(null, ParentAliasType.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ParentAliasType> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ParentAliasType> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ParentAliasType> fromJsonArrayToParentAliasTypes(String json) {
+        return new JSONDeserializer<List<ParentAliasType>>()
+        .use("values", ParentAliasType.class).deserialize(json);
+    }
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new ParentAliasType().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countParentAliasTypes() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ParentAliasType o", Long.class).getSingleResult();
+    }
+
+	public static List<ParentAliasType> findAllParentAliasTypes() {
+        return entityManager().createQuery("SELECT o FROM ParentAliasType o", ParentAliasType.class).getResultList();
+    }
+
+	public static List<ParentAliasType> findAllParentAliasTypes(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ParentAliasType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ParentAliasType.class).getResultList();
+    }
+
+	public static ParentAliasType findParentAliasType(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ParentAliasType.class, id);
+    }
+
+	public static List<ParentAliasType> findParentAliasTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ParentAliasType o", ParentAliasType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ParentAliasType> findParentAliasTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ParentAliasType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ParentAliasType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            ParentAliasType attached = ParentAliasType.findParentAliasType(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public ParentAliasType merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ParentAliasType merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String getTypeName() {
+        return this.typeName;
+    }
+
+	public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAliasType_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ParentAliasType_Roo_Configurable.aj
deleted file mode 100644
index a4bf050d4..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ParentAliasType_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ParentAliasType;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ParentAliasType_Roo_Configurable {
-    
-    declare @type: ParentAliasType: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAliasType_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ParentAliasType_Roo_JavaBean.aj
deleted file mode 100644
index 8dab0b136..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ParentAliasType_Roo_JavaBean.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ParentAliasType;
-
-privileged aspect ParentAliasType_Roo_JavaBean {
-    
-    public String ParentAliasType.getTypeName() {
-        return this.typeName;
-    }
-    
-    public void ParentAliasType.setTypeName(String typeName) {
-        this.typeName = typeName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAliasType_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ParentAliasType_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 43a7a9dc9..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ParentAliasType_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ParentAliasType;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ParentAliasType_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager ParentAliasType.entityManager;
-    
-    public static final List<String> ParentAliasType.fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName");
-    
-    public static final EntityManager ParentAliasType.entityManager() {
-        EntityManager em = new ParentAliasType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long ParentAliasType.countParentAliasTypes() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ParentAliasType o", Long.class).getSingleResult();
-    }
-    
-    public static List<ParentAliasType> ParentAliasType.findAllParentAliasTypes() {
-        return entityManager().createQuery("SELECT o FROM ParentAliasType o", ParentAliasType.class).getResultList();
-    }
-    
-    public static List<ParentAliasType> ParentAliasType.findAllParentAliasTypes(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ParentAliasType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ParentAliasType.class).getResultList();
-    }
-    
-    public static ParentAliasType ParentAliasType.findParentAliasType(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ParentAliasType.class, id);
-    }
-    
-    public static List<ParentAliasType> ParentAliasType.findParentAliasTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ParentAliasType o", ParentAliasType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ParentAliasType> ParentAliasType.findParentAliasTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ParentAliasType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ParentAliasType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void ParentAliasType.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void ParentAliasType.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            ParentAliasType attached = ParentAliasType.findParentAliasType(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void ParentAliasType.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void ParentAliasType.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public ParentAliasType ParentAliasType.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ParentAliasType merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAliasType_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ParentAliasType_Roo_Jpa_Entity.aj
deleted file mode 100644
index c623518aa..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ParentAliasType_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ParentAliasType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect ParentAliasType_Roo_Jpa_Entity {
-    
-    declare @type: ParentAliasType: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long ParentAliasType.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer ParentAliasType.version;
-    
-    public Long ParentAliasType.getId() {
-        return this.id;
-    }
-    
-    public void ParentAliasType.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer ParentAliasType.getVersion() {
-        return this.version;
-    }
-    
-    public void ParentAliasType.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAliasType_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/ParentAliasType_Roo_Json.aj
deleted file mode 100644
index 86124ebc8..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ParentAliasType_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ParentAliasType;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ParentAliasType_Roo_Json {
-    
-    public String ParentAliasType.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ParentAliasType.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ParentAliasType ParentAliasType.fromJsonToParentAliasType(String json) {
-        return new JSONDeserializer<ParentAliasType>()
-        .use(null, ParentAliasType.class).deserialize(json);
-    }
-    
-    public static String ParentAliasType.toJsonArray(Collection<ParentAliasType> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ParentAliasType.toJsonArray(Collection<ParentAliasType> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ParentAliasType> ParentAliasType.fromJsonArrayToParentAliasTypes(String json) {
-        return new JSONDeserializer<List<ParentAliasType>>()
-        .use("values", ParentAliasType.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAliasType_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ParentAliasType_Roo_ToString.aj
deleted file mode 100644
index ddcedbb31..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ParentAliasType_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ParentAliasType;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ParentAliasType_Roo_ToString {
-    
-    public String ParentAliasType.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAlias_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ParentAlias_Roo_Configurable.aj
deleted file mode 100644
index 8cdea9e60..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ParentAlias_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ParentAlias;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ParentAlias_Roo_Configurable {
-    
-    declare @type: ParentAlias: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAlias_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ParentAlias_Roo_Finder.aj
deleted file mode 100644
index d480ebfb3..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ParentAlias_Roo_Finder.aj
+++ /dev/null
@@ -1,210 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.domain.ParentAlias;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ParentAlias_Roo_Finder {
-    
-    public static Long ParentAlias.countFindParentAliasesByAliasNameEquals(String aliasName) {
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
-        EntityManager em = ParentAlias.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ParentAlias AS o WHERE o.aliasName = :aliasName", Long.class);
-        q.setParameter("aliasName", aliasName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ParentAlias.countFindParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName, String lsType, String lsKind) {
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = ParentAlias.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ParentAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
-        q.setParameter("aliasName", aliasName);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ParentAlias.countFindParentAliasesByParent(Parent parent) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
-        EntityManager em = ParentAlias.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ParentAlias AS o WHERE o.parent = :parent", Long.class);
-        q.setParameter("parent", parent);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ParentAlias.countFindParentAliasesByParentAndLsTypeEqualsAndLsKindEquals(Parent parent, String lsType, String lsKind) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = ParentAlias.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ParentAlias AS o WHERE o.parent = :parent AND o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
-        q.setParameter("parent", parent);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ParentAlias.countFindParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals(Parent parent, String lsType, String lsKind, String aliasName) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
-        EntityManager em = ParentAlias.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ParentAlias AS o WHERE o.parent = :parent AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.aliasName = :aliasName", Long.class);
-        q.setParameter("parent", parent);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("aliasName", aliasName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ParentAlias> ParentAlias.findParentAliasesByAliasNameEquals(String aliasName) {
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
-        EntityManager em = ParentAlias.entityManager();
-        TypedQuery<ParentAlias> q = em.createQuery("SELECT o FROM ParentAlias AS o WHERE o.aliasName = :aliasName", ParentAlias.class);
-        q.setParameter("aliasName", aliasName);
-        return q;
-    }
-    
-    public static TypedQuery<ParentAlias> ParentAlias.findParentAliasesByAliasNameEquals(String aliasName, String sortFieldName, String sortOrder) {
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
-        EntityManager em = ParentAlias.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ParentAlias AS o WHERE o.aliasName = :aliasName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ParentAlias> q = em.createQuery(queryBuilder.toString(), ParentAlias.class);
-        q.setParameter("aliasName", aliasName);
-        return q;
-    }
-    
-    public static TypedQuery<ParentAlias> ParentAlias.findParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName, String lsType, String lsKind) {
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = ParentAlias.entityManager();
-        TypedQuery<ParentAlias> q = em.createQuery("SELECT o FROM ParentAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind", ParentAlias.class);
-        q.setParameter("aliasName", aliasName);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<ParentAlias> ParentAlias.findParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName, String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = ParentAlias.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ParentAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ParentAlias> q = em.createQuery(queryBuilder.toString(), ParentAlias.class);
-        q.setParameter("aliasName", aliasName);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<ParentAlias> ParentAlias.findParentAliasesByParent(Parent parent) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
-        EntityManager em = ParentAlias.entityManager();
-        TypedQuery<ParentAlias> q = em.createQuery("SELECT o FROM ParentAlias AS o WHERE o.parent = :parent", ParentAlias.class);
-        q.setParameter("parent", parent);
-        return q;
-    }
-    
-    public static TypedQuery<ParentAlias> ParentAlias.findParentAliasesByParent(Parent parent, String sortFieldName, String sortOrder) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
-        EntityManager em = ParentAlias.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ParentAlias AS o WHERE o.parent = :parent");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ParentAlias> q = em.createQuery(queryBuilder.toString(), ParentAlias.class);
-        q.setParameter("parent", parent);
-        return q;
-    }
-    
-    public static TypedQuery<ParentAlias> ParentAlias.findParentAliasesByParentAndLsTypeEqualsAndLsKindEquals(Parent parent, String lsType, String lsKind) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = ParentAlias.entityManager();
-        TypedQuery<ParentAlias> q = em.createQuery("SELECT o FROM ParentAlias AS o WHERE o.parent = :parent AND o.lsType = :lsType  AND o.lsKind = :lsKind", ParentAlias.class);
-        q.setParameter("parent", parent);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<ParentAlias> ParentAlias.findParentAliasesByParentAndLsTypeEqualsAndLsKindEquals(Parent parent, String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = ParentAlias.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ParentAlias AS o WHERE o.parent = :parent AND o.lsType = :lsType  AND o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ParentAlias> q = em.createQuery(queryBuilder.toString(), ParentAlias.class);
-        q.setParameter("parent", parent);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<ParentAlias> ParentAlias.findParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals(Parent parent, String lsType, String lsKind, String aliasName) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
-        EntityManager em = ParentAlias.entityManager();
-        TypedQuery<ParentAlias> q = em.createQuery("SELECT o FROM ParentAlias AS o WHERE o.parent = :parent AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.aliasName = :aliasName", ParentAlias.class);
-        q.setParameter("parent", parent);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("aliasName", aliasName);
-        return q;
-    }
-    
-    public static TypedQuery<ParentAlias> ParentAlias.findParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals(Parent parent, String lsType, String lsKind, String aliasName, String sortFieldName, String sortOrder) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
-        EntityManager em = ParentAlias.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ParentAlias AS o WHERE o.parent = :parent AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.aliasName = :aliasName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ParentAlias> q = em.createQuery(queryBuilder.toString(), ParentAlias.class);
-        q.setParameter("parent", parent);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("aliasName", aliasName);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAlias_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ParentAlias_Roo_JavaBean.aj
deleted file mode 100644
index 3bf9cfaff..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ParentAlias_Roo_JavaBean.aj
+++ /dev/null
@@ -1,75 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.domain.ParentAlias;
-
-privileged aspect ParentAlias_Roo_JavaBean {
-    
-    public Parent ParentAlias.getParent() {
-        return this.parent;
-    }
-    
-    public void ParentAlias.setParent(Parent parent) {
-        this.parent = parent;
-    }
-    
-    public String ParentAlias.getLsType() {
-        return this.lsType;
-    }
-    
-    public void ParentAlias.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String ParentAlias.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void ParentAlias.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String ParentAlias.getAliasName() {
-        return this.aliasName;
-    }
-    
-    public void ParentAlias.setAliasName(String aliasName) {
-        this.aliasName = aliasName;
-    }
-    
-    public boolean ParentAlias.isPreferred() {
-        return this.preferred;
-    }
-    
-    public void ParentAlias.setPreferred(boolean preferred) {
-        this.preferred = preferred;
-    }
-    
-    public boolean ParentAlias.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void ParentAlias.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public boolean ParentAlias.isDeleted() {
-        return this.deleted;
-    }
-    
-    public void ParentAlias.setDeleted(boolean deleted) {
-        this.deleted = deleted;
-    }
-    
-    public Integer ParentAlias.getSortId() {
-        return this.sortId;
-    }
-    
-    public void ParentAlias.setSortId(Integer sortId) {
-        this.sortId = sortId;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAlias_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ParentAlias_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 943632059..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ParentAlias_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ParentAlias;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ParentAlias_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager ParentAlias.entityManager;
-    
-    public static final List<String> ParentAlias.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "parent", "lsType", "lsKind", "aliasName", "preferred", "ignored", "deleted", "sortId");
-    
-    public static final EntityManager ParentAlias.entityManager() {
-        EntityManager em = new ParentAlias().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long ParentAlias.countParentAliases() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ParentAlias o", Long.class).getSingleResult();
-    }
-    
-    public static List<ParentAlias> ParentAlias.findAllParentAliases() {
-        return entityManager().createQuery("SELECT o FROM ParentAlias o", ParentAlias.class).getResultList();
-    }
-    
-    public static List<ParentAlias> ParentAlias.findAllParentAliases(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ParentAlias o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ParentAlias.class).getResultList();
-    }
-    
-    public static ParentAlias ParentAlias.findParentAlias(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ParentAlias.class, id);
-    }
-    
-    public static List<ParentAlias> ParentAlias.findParentAliasEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ParentAlias o", ParentAlias.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ParentAlias> ParentAlias.findParentAliasEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ParentAlias o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ParentAlias.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void ParentAlias.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void ParentAlias.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            ParentAlias attached = ParentAlias.findParentAlias(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void ParentAlias.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void ParentAlias.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public ParentAlias ParentAlias.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ParentAlias merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAlias_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ParentAlias_Roo_Jpa_Entity.aj
deleted file mode 100644
index c445d0b7e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ParentAlias_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ParentAlias;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect ParentAlias_Roo_Jpa_Entity {
-    
-    declare @type: ParentAlias: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long ParentAlias.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer ParentAlias.version;
-    
-    public Long ParentAlias.getId() {
-        return this.id;
-    }
-    
-    public void ParentAlias.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer ParentAlias.getVersion() {
-        return this.version;
-    }
-    
-    public void ParentAlias.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAlias_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/ParentAlias_Roo_Json.aj
deleted file mode 100644
index 6faa12cc0..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ParentAlias_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ParentAlias;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ParentAlias_Roo_Json {
-    
-    public String ParentAlias.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ParentAlias.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ParentAlias ParentAlias.fromJsonToParentAlias(String json) {
-        return new JSONDeserializer<ParentAlias>()
-        .use(null, ParentAlias.class).deserialize(json);
-    }
-    
-    public static String ParentAlias.toJsonArray(Collection<ParentAlias> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ParentAlias.toJsonArray(Collection<ParentAlias> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ParentAlias> ParentAlias.fromJsonArrayToParentAliases(String json) {
-        return new JSONDeserializer<List<ParentAlias>>()
-        .use("values", ParentAlias.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAlias_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ParentAlias_Roo_ToString.aj
deleted file mode 100644
index 82d811084..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ParentAlias_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ParentAlias;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ParentAlias_Roo_ToString {
-    
-    public String ParentAlias.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAnnotation.java b/src/main/java/com/labsynch/labseer/domain/ParentAnnotation.java
index 33860e4a0..b85ff85b2 100644
--- a/src/main/java/com/labsynch/labseer/domain/ParentAnnotation.java
+++ b/src/main/java/com/labsynch/labseer/domain/ParentAnnotation.java
@@ -1,12 +1,30 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -24,4 +42,213 @@ public class ParentAnnotation {
     private String comment;
   
     
+
+	public static Long countFindParentAnnotationsByCodeEquals(String code) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = ParentAnnotation.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ParentAnnotation AS o WHERE o.code = :code", Long.class);
+        q.setParameter("code", code);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ParentAnnotation> findParentAnnotationsByCodeEquals(String code) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = ParentAnnotation.entityManager();
+        TypedQuery<ParentAnnotation> q = em.createQuery("SELECT o FROM ParentAnnotation AS o WHERE o.code = :code", ParentAnnotation.class);
+        q.setParameter("code", code);
+        return q;
+    }
+
+	public static TypedQuery<ParentAnnotation> findParentAnnotationsByCodeEquals(String code, String sortFieldName, String sortOrder) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = ParentAnnotation.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ParentAnnotation AS o WHERE o.code = :code");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ParentAnnotation> q = em.createQuery(queryBuilder.toString(), ParentAnnotation.class);
+        q.setParameter("code", code);
+        return q;
+    }
+
+	public String getCode() {
+        return this.code;
+    }
+
+	public void setCode(String code) {
+        this.code = code;
+    }
+
+	public String getName() {
+        return this.name;
+    }
+
+	public void setName(String name) {
+        this.name = name;
+    }
+
+	public Integer getDisplayOrder() {
+        return this.displayOrder;
+    }
+
+	public void setDisplayOrder(Integer displayOrder) {
+        this.displayOrder = displayOrder;
+    }
+
+	public String getComment() {
+        return this.comment;
+    }
+
+	public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ParentAnnotation fromJsonToParentAnnotation(String json) {
+        return new JSONDeserializer<ParentAnnotation>()
+        .use(null, ParentAnnotation.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ParentAnnotation> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ParentAnnotation> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ParentAnnotation> fromJsonArrayToParentAnnotations(String json) {
+        return new JSONDeserializer<List<ParentAnnotation>>()
+        .use("values", ParentAnnotation.class).deserialize(json);
+    }
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("code", "name", "displayOrder", "comment");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new ParentAnnotation().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countParentAnnotations() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ParentAnnotation o", Long.class).getSingleResult();
+    }
+
+	public static List<ParentAnnotation> findAllParentAnnotations() {
+        return entityManager().createQuery("SELECT o FROM ParentAnnotation o", ParentAnnotation.class).getResultList();
+    }
+
+	public static List<ParentAnnotation> findAllParentAnnotations(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ParentAnnotation o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ParentAnnotation.class).getResultList();
+    }
+
+	public static ParentAnnotation findParentAnnotation(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ParentAnnotation.class, id);
+    }
+
+	public static List<ParentAnnotation> findParentAnnotationEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ParentAnnotation o", ParentAnnotation.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ParentAnnotation> findParentAnnotationEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ParentAnnotation o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ParentAnnotation.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            ParentAnnotation attached = ParentAnnotation.findParentAnnotation(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public ParentAnnotation merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ParentAnnotation merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAnnotation_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ParentAnnotation_Roo_Configurable.aj
deleted file mode 100644
index 581314238..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ParentAnnotation_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ParentAnnotation;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ParentAnnotation_Roo_Configurable {
-    
-    declare @type: ParentAnnotation: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAnnotation_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ParentAnnotation_Roo_Finder.aj
deleted file mode 100644
index 17c0d678a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ParentAnnotation_Roo_Finder.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ParentAnnotation;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ParentAnnotation_Roo_Finder {
-    
-    public static Long ParentAnnotation.countFindParentAnnotationsByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = ParentAnnotation.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ParentAnnotation AS o WHERE o.code = :code", Long.class);
-        q.setParameter("code", code);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ParentAnnotation> ParentAnnotation.findParentAnnotationsByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = ParentAnnotation.entityManager();
-        TypedQuery<ParentAnnotation> q = em.createQuery("SELECT o FROM ParentAnnotation AS o WHERE o.code = :code", ParentAnnotation.class);
-        q.setParameter("code", code);
-        return q;
-    }
-    
-    public static TypedQuery<ParentAnnotation> ParentAnnotation.findParentAnnotationsByCodeEquals(String code, String sortFieldName, String sortOrder) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = ParentAnnotation.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ParentAnnotation AS o WHERE o.code = :code");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ParentAnnotation> q = em.createQuery(queryBuilder.toString(), ParentAnnotation.class);
-        q.setParameter("code", code);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAnnotation_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ParentAnnotation_Roo_JavaBean.aj
deleted file mode 100644
index cbca90983..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ParentAnnotation_Roo_JavaBean.aj
+++ /dev/null
@@ -1,42 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ParentAnnotation;
-
-privileged aspect ParentAnnotation_Roo_JavaBean {
-    
-    public String ParentAnnotation.getCode() {
-        return this.code;
-    }
-    
-    public void ParentAnnotation.setCode(String code) {
-        this.code = code;
-    }
-    
-    public String ParentAnnotation.getName() {
-        return this.name;
-    }
-    
-    public void ParentAnnotation.setName(String name) {
-        this.name = name;
-    }
-    
-    public Integer ParentAnnotation.getDisplayOrder() {
-        return this.displayOrder;
-    }
-    
-    public void ParentAnnotation.setDisplayOrder(Integer displayOrder) {
-        this.displayOrder = displayOrder;
-    }
-    
-    public String ParentAnnotation.getComment() {
-        return this.comment;
-    }
-    
-    public void ParentAnnotation.setComment(String comment) {
-        this.comment = comment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAnnotation_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ParentAnnotation_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 4e55baf32..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ParentAnnotation_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ParentAnnotation;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ParentAnnotation_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager ParentAnnotation.entityManager;
-    
-    public static final List<String> ParentAnnotation.fieldNames4OrderClauseFilter = java.util.Arrays.asList("code", "name", "displayOrder", "comment");
-    
-    public static final EntityManager ParentAnnotation.entityManager() {
-        EntityManager em = new ParentAnnotation().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long ParentAnnotation.countParentAnnotations() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ParentAnnotation o", Long.class).getSingleResult();
-    }
-    
-    public static List<ParentAnnotation> ParentAnnotation.findAllParentAnnotations() {
-        return entityManager().createQuery("SELECT o FROM ParentAnnotation o", ParentAnnotation.class).getResultList();
-    }
-    
-    public static List<ParentAnnotation> ParentAnnotation.findAllParentAnnotations(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ParentAnnotation o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ParentAnnotation.class).getResultList();
-    }
-    
-    public static ParentAnnotation ParentAnnotation.findParentAnnotation(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ParentAnnotation.class, id);
-    }
-    
-    public static List<ParentAnnotation> ParentAnnotation.findParentAnnotationEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ParentAnnotation o", ParentAnnotation.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ParentAnnotation> ParentAnnotation.findParentAnnotationEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ParentAnnotation o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ParentAnnotation.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void ParentAnnotation.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void ParentAnnotation.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            ParentAnnotation attached = ParentAnnotation.findParentAnnotation(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void ParentAnnotation.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void ParentAnnotation.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public ParentAnnotation ParentAnnotation.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ParentAnnotation merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAnnotation_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ParentAnnotation_Roo_Jpa_Entity.aj
deleted file mode 100644
index 6753c1ad9..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ParentAnnotation_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ParentAnnotation;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect ParentAnnotation_Roo_Jpa_Entity {
-    
-    declare @type: ParentAnnotation: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long ParentAnnotation.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer ParentAnnotation.version;
-    
-    public Long ParentAnnotation.getId() {
-        return this.id;
-    }
-    
-    public void ParentAnnotation.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer ParentAnnotation.getVersion() {
-        return this.version;
-    }
-    
-    public void ParentAnnotation.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAnnotation_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/ParentAnnotation_Roo_Json.aj
deleted file mode 100644
index 0c3aac5a0..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ParentAnnotation_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ParentAnnotation;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ParentAnnotation_Roo_Json {
-    
-    public String ParentAnnotation.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ParentAnnotation.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ParentAnnotation ParentAnnotation.fromJsonToParentAnnotation(String json) {
-        return new JSONDeserializer<ParentAnnotation>()
-        .use(null, ParentAnnotation.class).deserialize(json);
-    }
-    
-    public static String ParentAnnotation.toJsonArray(Collection<ParentAnnotation> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ParentAnnotation.toJsonArray(Collection<ParentAnnotation> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ParentAnnotation> ParentAnnotation.fromJsonArrayToParentAnnotations(String json) {
-        return new JSONDeserializer<List<ParentAnnotation>>()
-        .use("values", ParentAnnotation.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAnnotation_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ParentAnnotation_Roo_ToString.aj
deleted file mode 100644
index 5e619684e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ParentAnnotation_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ParentAnnotation;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ParentAnnotation_Roo_ToString {
-    
-    public String ParentAnnotation.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Parent_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/Parent_Roo_Configurable.aj
deleted file mode 100644
index 4c1914e75..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Parent_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Parent;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect Parent_Roo_Configurable {
-    
-    declare @type: Parent: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Parent_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/Parent_Roo_Finder.aj
deleted file mode 100644
index 98ee898bd..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Parent_Roo_Finder.aj
+++ /dev/null
@@ -1,256 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.BulkLoadFile;
-import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.domain.SaltForm;
-import java.util.Set;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect Parent_Roo_Finder {
-    
-    public static Long Parent.countFindParentsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile) {
-        if (bulkLoadFile == null) throw new IllegalArgumentException("The bulkLoadFile argument is required");
-        EntityManager em = Parent.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Parent AS o WHERE o.bulkLoadFile = :bulkLoadFile", Long.class);
-        q.setParameter("bulkLoadFile", bulkLoadFile);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Parent.countFindParentsByCdId(int CdId) {
-        EntityManager em = Parent.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Parent AS o WHERE o.CdId = :CdId", Long.class);
-        q.setParameter("CdId", CdId);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Parent.countFindParentsByCommonNameLike(String commonName) {
-        if (commonName == null || commonName.length() == 0) throw new IllegalArgumentException("The commonName argument is required");
-        commonName = commonName.replace('*', '%');
-        if (commonName.charAt(0) != '%') {
-            commonName = "%" + commonName;
-        }
-        if (commonName.charAt(commonName.length() - 1) != '%') {
-            commonName = commonName + "%";
-        }
-        EntityManager em = Parent.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Parent AS o WHERE LOWER(o.commonName) LIKE LOWER(:commonName)", Long.class);
-        q.setParameter("commonName", commonName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Parent.countFindParentsByCorpNameEquals(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        EntityManager em = Parent.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Parent AS o WHERE o.corpName = :corpName", Long.class);
-        q.setParameter("corpName", corpName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Parent.countFindParentsByCorpNameLike(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        corpName = corpName.replace('*', '%');
-        if (corpName.charAt(0) != '%') {
-            corpName = "%" + corpName;
-        }
-        if (corpName.charAt(corpName.length() - 1) != '%') {
-            corpName = corpName + "%";
-        }
-        EntityManager em = Parent.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Parent AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)", Long.class);
-        q.setParameter("corpName", corpName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Parent.countFindParentsBySaltForms(Set<SaltForm> saltForms) {
-        if (saltForms == null) throw new IllegalArgumentException("The saltForms argument is required");
-        EntityManager em = Parent.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT COUNT(o) FROM Parent AS o WHERE");
-        for (int i = 0; i < saltForms.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
-            queryBuilder.append(" :saltForms_item").append(i).append(" MEMBER OF o.saltForms");
-        }
-        TypedQuery q = em.createQuery(queryBuilder.toString(), Long.class);
-        int saltFormsIndex = 0;
-        for (SaltForm _saltform: saltForms) {
-            q.setParameter("saltForms_item" + saltFormsIndex++, _saltform);
-        }
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<Parent> Parent.findParentsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile) {
-        if (bulkLoadFile == null) throw new IllegalArgumentException("The bulkLoadFile argument is required");
-        EntityManager em = Parent.entityManager();
-        TypedQuery<Parent> q = em.createQuery("SELECT o FROM Parent AS o WHERE o.bulkLoadFile = :bulkLoadFile", Parent.class);
-        q.setParameter("bulkLoadFile", bulkLoadFile);
-        return q;
-    }
-    
-    public static TypedQuery<Parent> Parent.findParentsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile, String sortFieldName, String sortOrder) {
-        if (bulkLoadFile == null) throw new IllegalArgumentException("The bulkLoadFile argument is required");
-        EntityManager em = Parent.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Parent AS o WHERE o.bulkLoadFile = :bulkLoadFile");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Parent> q = em.createQuery(queryBuilder.toString(), Parent.class);
-        q.setParameter("bulkLoadFile", bulkLoadFile);
-        return q;
-    }
-    
-    public static TypedQuery<Parent> Parent.findParentsByCdId(int CdId, String sortFieldName, String sortOrder) {
-        EntityManager em = Parent.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Parent AS o WHERE o.CdId = :CdId");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Parent> q = em.createQuery(queryBuilder.toString(), Parent.class);
-        q.setParameter("CdId", CdId);
-        return q;
-    }
-    
-    public static TypedQuery<Parent> Parent.findParentsByCommonNameLike(String commonName) {
-        if (commonName == null || commonName.length() == 0) throw new IllegalArgumentException("The commonName argument is required");
-        commonName = commonName.replace('*', '%');
-        if (commonName.charAt(0) != '%') {
-            commonName = "%" + commonName;
-        }
-        if (commonName.charAt(commonName.length() - 1) != '%') {
-            commonName = commonName + "%";
-        }
-        EntityManager em = Parent.entityManager();
-        TypedQuery<Parent> q = em.createQuery("SELECT o FROM Parent AS o WHERE LOWER(o.commonName) LIKE LOWER(:commonName)", Parent.class);
-        q.setParameter("commonName", commonName);
-        return q;
-    }
-    
-    public static TypedQuery<Parent> Parent.findParentsByCommonNameLike(String commonName, String sortFieldName, String sortOrder) {
-        if (commonName == null || commonName.length() == 0) throw new IllegalArgumentException("The commonName argument is required");
-        commonName = commonName.replace('*', '%');
-        if (commonName.charAt(0) != '%') {
-            commonName = "%" + commonName;
-        }
-        if (commonName.charAt(commonName.length() - 1) != '%') {
-            commonName = commonName + "%";
-        }
-        EntityManager em = Parent.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Parent AS o WHERE LOWER(o.commonName) LIKE LOWER(:commonName)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Parent> q = em.createQuery(queryBuilder.toString(), Parent.class);
-        q.setParameter("commonName", commonName);
-        return q;
-    }
-    
-    public static TypedQuery<Parent> Parent.findParentsByCorpNameEquals(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        EntityManager em = Parent.entityManager();
-        TypedQuery<Parent> q = em.createQuery("SELECT o FROM Parent AS o WHERE o.corpName = :corpName", Parent.class);
-        q.setParameter("corpName", corpName);
-        return q;
-    }
-    
-    public static TypedQuery<Parent> Parent.findParentsByCorpNameEquals(String corpName, String sortFieldName, String sortOrder) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        EntityManager em = Parent.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Parent AS o WHERE o.corpName = :corpName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Parent> q = em.createQuery(queryBuilder.toString(), Parent.class);
-        q.setParameter("corpName", corpName);
-        return q;
-    }
-    
-    public static TypedQuery<Parent> Parent.findParentsByCorpNameLike(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        corpName = corpName.replace('*', '%');
-        if (corpName.charAt(0) != '%') {
-            corpName = "%" + corpName;
-        }
-        if (corpName.charAt(corpName.length() - 1) != '%') {
-            corpName = corpName + "%";
-        }
-        EntityManager em = Parent.entityManager();
-        TypedQuery<Parent> q = em.createQuery("SELECT o FROM Parent AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)", Parent.class);
-        q.setParameter("corpName", corpName);
-        return q;
-    }
-    
-    public static TypedQuery<Parent> Parent.findParentsByCorpNameLike(String corpName, String sortFieldName, String sortOrder) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        corpName = corpName.replace('*', '%');
-        if (corpName.charAt(0) != '%') {
-            corpName = "%" + corpName;
-        }
-        if (corpName.charAt(corpName.length() - 1) != '%') {
-            corpName = corpName + "%";
-        }
-        EntityManager em = Parent.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Parent AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Parent> q = em.createQuery(queryBuilder.toString(), Parent.class);
-        q.setParameter("corpName", corpName);
-        return q;
-    }
-    
-    public static TypedQuery<Parent> Parent.findParentsBySaltForms(Set<SaltForm> saltForms) {
-        if (saltForms == null) throw new IllegalArgumentException("The saltForms argument is required");
-        EntityManager em = Parent.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Parent AS o WHERE");
-        for (int i = 0; i < saltForms.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
-            queryBuilder.append(" :saltForms_item").append(i).append(" MEMBER OF o.saltForms");
-        }
-        TypedQuery<Parent> q = em.createQuery(queryBuilder.toString(), Parent.class);
-        int saltFormsIndex = 0;
-        for (SaltForm _saltform: saltForms) {
-            q.setParameter("saltForms_item" + saltFormsIndex++, _saltform);
-        }
-        return q;
-    }
-    
-    public static TypedQuery<Parent> Parent.findParentsBySaltForms(Set<SaltForm> saltForms, String sortFieldName, String sortOrder) {
-        if (saltForms == null) throw new IllegalArgumentException("The saltForms argument is required");
-        EntityManager em = Parent.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Parent AS o WHERE");
-        for (int i = 0; i < saltForms.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
-            queryBuilder.append(" :saltForms_item").append(i).append(" MEMBER OF o.saltForms");
-        }
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" " + sortOrder);
-            }
-        }
-        TypedQuery<Parent> q = em.createQuery(queryBuilder.toString(), Parent.class);
-        int saltFormsIndex = 0;
-        for (SaltForm _saltform: saltForms) {
-            q.setParameter("saltForms_item" + saltFormsIndex++, _saltform);
-        }
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Parent_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/Parent_Roo_JavaBean.aj
deleted file mode 100644
index 04921c59c..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Parent_Roo_JavaBean.aj
+++ /dev/null
@@ -1,202 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.BulkLoadFile;
-import com.labsynch.labseer.domain.CompoundType;
-import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.domain.ParentAlias;
-import com.labsynch.labseer.domain.ParentAnnotation;
-import com.labsynch.labseer.domain.SaltForm;
-import com.labsynch.labseer.domain.StereoCategory;
-import java.util.Date;
-import java.util.Set;
-
-privileged aspect Parent_Roo_JavaBean {
-    
-    public String Parent.getCorpName() {
-        return this.corpName;
-    }
-    
-    public void Parent.setCorpName(String corpName) {
-        this.corpName = corpName;
-    }
-    
-    public long Parent.getParentNumber() {
-        return this.parentNumber;
-    }
-    
-    public void Parent.setParentNumber(long parentNumber) {
-        this.parentNumber = parentNumber;
-    }
-    
-    public String Parent.getChemist() {
-        return this.chemist;
-    }
-    
-    public void Parent.setChemist(String chemist) {
-        this.chemist = chemist;
-    }
-    
-    public String Parent.getCommonName() {
-        return this.commonName;
-    }
-    
-    public void Parent.setCommonName(String commonName) {
-        this.commonName = commonName;
-    }
-    
-    public StereoCategory Parent.getStereoCategory() {
-        return this.stereoCategory;
-    }
-    
-    public void Parent.setStereoCategory(StereoCategory stereoCategory) {
-        this.stereoCategory = stereoCategory;
-    }
-    
-    public String Parent.getStereoComment() {
-        return this.stereoComment;
-    }
-    
-    public void Parent.setStereoComment(String stereoComment) {
-        this.stereoComment = stereoComment;
-    }
-    
-    public String Parent.getMolStructure() {
-        return this.molStructure;
-    }
-    
-    public void Parent.setMolStructure(String molStructure) {
-        this.molStructure = molStructure;
-    }
-    
-    public Double Parent.getMolWeight() {
-        return this.molWeight;
-    }
-    
-    public void Parent.setMolWeight(Double molWeight) {
-        this.molWeight = molWeight;
-    }
-    
-    public Double Parent.getExactMass() {
-        return this.exactMass;
-    }
-    
-    public void Parent.setExactMass(Double exactMass) {
-        this.exactMass = exactMass;
-    }
-    
-    public String Parent.getMolFormula() {
-        return this.molFormula;
-    }
-    
-    public void Parent.setMolFormula(String molFormula) {
-        this.molFormula = molFormula;
-    }
-    
-    public int Parent.getCdId() {
-        return this.CdId;
-    }
-    
-    public void Parent.setCdId(int CdId) {
-        this.CdId = CdId;
-    }
-    
-    public Date Parent.getRegistrationDate() {
-        return this.registrationDate;
-    }
-    
-    public void Parent.setRegistrationDate(Date registrationDate) {
-        this.registrationDate = registrationDate;
-    }
-    
-    public String Parent.getRegisteredBy() {
-        return this.registeredBy;
-    }
-    
-    public void Parent.setRegisteredBy(String registeredBy) {
-        this.registeredBy = registeredBy;
-    }
-    
-    public Date Parent.getModifiedDate() {
-        return this.modifiedDate;
-    }
-    
-    public void Parent.setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
-    
-    public String Parent.getModifiedBy() {
-        return this.modifiedBy;
-    }
-    
-    public void Parent.setModifiedBy(String modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
-    
-    public Boolean Parent.getIgnore() {
-        return this.ignore;
-    }
-    
-    public void Parent.setIgnore(Boolean ignore) {
-        this.ignore = ignore;
-    }
-    
-    public Set<SaltForm> Parent.getSaltForms() {
-        return this.saltForms;
-    }
-    
-    public void Parent.setSaltForms(Set<SaltForm> saltForms) {
-        this.saltForms = saltForms;
-    }
-    
-    public Set<ParentAlias> Parent.getParentAliases() {
-        return this.parentAliases;
-    }
-    
-    public void Parent.setParentAliases(Set<ParentAlias> parentAliases) {
-        this.parentAliases = parentAliases;
-    }
-    
-    public BulkLoadFile Parent.getBulkLoadFile() {
-        return this.bulkLoadFile;
-    }
-    
-    public void Parent.setBulkLoadFile(BulkLoadFile bulkLoadFile) {
-        this.bulkLoadFile = bulkLoadFile;
-    }
-    
-    public ParentAnnotation Parent.getParentAnnotation() {
-        return this.parentAnnotation;
-    }
-    
-    public void Parent.setParentAnnotation(ParentAnnotation parentAnnotation) {
-        this.parentAnnotation = parentAnnotation;
-    }
-    
-    public CompoundType Parent.getCompoundType() {
-        return this.compoundType;
-    }
-    
-    public void Parent.setCompoundType(CompoundType compoundType) {
-        this.compoundType = compoundType;
-    }
-    
-    public String Parent.getComment() {
-        return this.comment;
-    }
-    
-    public void Parent.setComment(String comment) {
-        this.comment = comment;
-    }
-    
-    public Boolean Parent.getIsMixture() {
-        return this.isMixture;
-    }
-    
-    public void Parent.setIsMixture(Boolean isMixture) {
-        this.isMixture = isMixture;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Parent_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/Parent_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index b72755fc5..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Parent_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,88 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Parent;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect Parent_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager Parent.entityManager;
-    
-    public static final List<String> Parent.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "corpName", "parentNumber", "chemist", "commonName", "stereoCategory", "stereoComment", "molStructure", "molWeight", "exactMass", "molFormula", "CdId", "registrationDate", "registeredBy", "modifiedDate", "modifiedBy", "ignore", "saltForms", "parentAliases", "bulkLoadFile", "parentAnnotation", "compoundType", "comment", "isMixture", "labelPrefix");
-    
-    public static final EntityManager Parent.entityManager() {
-        EntityManager em = new Parent().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long Parent.countParents() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM Parent o", Long.class).getSingleResult();
-    }
-    
-    public static List<Parent> Parent.findAllParents(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM Parent o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, Parent.class).getResultList();
-    }
-    
-    public static List<Parent> Parent.findParentEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM Parent o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, Parent.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void Parent.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void Parent.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            Parent attached = Parent.findParent(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void Parent.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void Parent.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public Parent Parent.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        Parent merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Parent_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/Parent_Roo_Jpa_Entity.aj
deleted file mode 100644
index 13a0673c6..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Parent_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Parent;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect Parent_Roo_Jpa_Entity {
-    
-    declare @type: Parent: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long Parent.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer Parent.version;
-    
-    public Long Parent.getId() {
-        return this.id;
-    }
-    
-    public void Parent.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer Parent.getVersion() {
-        return this.version;
-    }
-    
-    public void Parent.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Parent_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/Parent_Roo_Json.aj
deleted file mode 100644
index c4ea05d2a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Parent_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Parent;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect Parent_Roo_Json {
-    
-    public String Parent.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String Parent.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static Parent Parent.fromJsonToParent(String json) {
-        return new JSONDeserializer<Parent>()
-        .use(null, Parent.class).deserialize(json);
-    }
-    
-    public static String Parent.toJsonArray(Collection<Parent> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String Parent.toJsonArray(Collection<Parent> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<Parent> Parent.fromJsonArrayToParents(String json) {
-        return new JSONDeserializer<List<Parent>>()
-        .use("values", Parent.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Parent_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/Parent_Roo_ToString.aj
deleted file mode 100644
index 645a9002a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Parent_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Parent;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect Parent_Roo_ToString {
-    
-    public String Parent.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/PhysicalState.java b/src/main/java/com/labsynch/labseer/domain/PhysicalState.java
index 1e7fd149a..909cd7222 100755
--- a/src/main/java/com/labsynch/labseer/domain/PhysicalState.java
+++ b/src/main/java/com/labsynch/labseer/domain/PhysicalState.java
@@ -1,12 +1,30 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -19,4 +37,280 @@ public class PhysicalState {
 
     @Size(max = 100)
     private String code;
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new PhysicalState().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countPhysicalStates() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM PhysicalState o", Long.class).getSingleResult();
+    }
+
+	public static List<PhysicalState> findAllPhysicalStates() {
+        return entityManager().createQuery("SELECT o FROM PhysicalState o", PhysicalState.class).getResultList();
+    }
+
+	public static List<PhysicalState> findAllPhysicalStates(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM PhysicalState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, PhysicalState.class).getResultList();
+    }
+
+	public static PhysicalState findPhysicalState(Long id) {
+        if (id == null) return null;
+        return entityManager().find(PhysicalState.class, id);
+    }
+
+	public static List<PhysicalState> findPhysicalStateEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM PhysicalState o", PhysicalState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<PhysicalState> findPhysicalStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM PhysicalState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, PhysicalState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            PhysicalState attached = PhysicalState.findPhysicalState(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public PhysicalState merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        PhysicalState merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public static Long countFindPhysicalStatesByCodeEquals(String code) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = PhysicalState.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM PhysicalState AS o WHERE o.code = :code", Long.class);
+        q.setParameter("code", code);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindPhysicalStatesByNameEquals(String name) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = PhysicalState.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM PhysicalState AS o WHERE o.name = :name", Long.class);
+        q.setParameter("name", name);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindPhysicalStatesByNameLike(String name) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        name = name.replace('*', '%');
+        if (name.charAt(0) != '%') {
+            name = "%" + name;
+        }
+        if (name.charAt(name.length() - 1) != '%') {
+            name = name + "%";
+        }
+        EntityManager em = PhysicalState.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM PhysicalState AS o WHERE LOWER(o.name) LIKE LOWER(:name)", Long.class);
+        q.setParameter("name", name);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<PhysicalState> findPhysicalStatesByCodeEquals(String code) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = PhysicalState.entityManager();
+        TypedQuery<PhysicalState> q = em.createQuery("SELECT o FROM PhysicalState AS o WHERE o.code = :code", PhysicalState.class);
+        q.setParameter("code", code);
+        return q;
+    }
+
+	public static TypedQuery<PhysicalState> findPhysicalStatesByCodeEquals(String code, String sortFieldName, String sortOrder) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = PhysicalState.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM PhysicalState AS o WHERE o.code = :code");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<PhysicalState> q = em.createQuery(queryBuilder.toString(), PhysicalState.class);
+        q.setParameter("code", code);
+        return q;
+    }
+
+	public static TypedQuery<PhysicalState> findPhysicalStatesByNameEquals(String name) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = PhysicalState.entityManager();
+        TypedQuery<PhysicalState> q = em.createQuery("SELECT o FROM PhysicalState AS o WHERE o.name = :name", PhysicalState.class);
+        q.setParameter("name", name);
+        return q;
+    }
+
+	public static TypedQuery<PhysicalState> findPhysicalStatesByNameEquals(String name, String sortFieldName, String sortOrder) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = PhysicalState.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM PhysicalState AS o WHERE o.name = :name");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<PhysicalState> q = em.createQuery(queryBuilder.toString(), PhysicalState.class);
+        q.setParameter("name", name);
+        return q;
+    }
+
+	public static TypedQuery<PhysicalState> findPhysicalStatesByNameLike(String name) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        name = name.replace('*', '%');
+        if (name.charAt(0) != '%') {
+            name = "%" + name;
+        }
+        if (name.charAt(name.length() - 1) != '%') {
+            name = name + "%";
+        }
+        EntityManager em = PhysicalState.entityManager();
+        TypedQuery<PhysicalState> q = em.createQuery("SELECT o FROM PhysicalState AS o WHERE LOWER(o.name) LIKE LOWER(:name)", PhysicalState.class);
+        q.setParameter("name", name);
+        return q;
+    }
+
+	public static TypedQuery<PhysicalState> findPhysicalStatesByNameLike(String name, String sortFieldName, String sortOrder) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        name = name.replace('*', '%');
+        if (name.charAt(0) != '%') {
+            name = "%" + name;
+        }
+        if (name.charAt(name.length() - 1) != '%') {
+            name = name + "%";
+        }
+        EntityManager em = PhysicalState.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM PhysicalState AS o WHERE LOWER(o.name) LIKE LOWER(:name)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<PhysicalState> q = em.createQuery(queryBuilder.toString(), PhysicalState.class);
+        q.setParameter("name", name);
+        return q;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static PhysicalState fromJsonToPhysicalState(String json) {
+        return new JSONDeserializer<PhysicalState>()
+        .use(null, PhysicalState.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<PhysicalState> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<PhysicalState> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<PhysicalState> fromJsonArrayToPhysicalStates(String json) {
+        return new JSONDeserializer<List<PhysicalState>>()
+        .use("values", PhysicalState.class).deserialize(json);
+    }
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getName() {
+        return this.name;
+    }
+
+	public void setName(String name) {
+        this.name = name;
+    }
+
+	public String getCode() {
+        return this.code;
+    }
+
+	public void setCode(String code) {
+        this.code = code;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/PhysicalState_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/PhysicalState_Roo_Configurable.aj
deleted file mode 100644
index fa967f971..000000000
--- a/src/main/java/com/labsynch/labseer/domain/PhysicalState_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.PhysicalState;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect PhysicalState_Roo_Configurable {
-    
-    declare @type: PhysicalState: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/PhysicalState_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/PhysicalState_Roo_Finder.aj
deleted file mode 100644
index d60484582..000000000
--- a/src/main/java/com/labsynch/labseer/domain/PhysicalState_Roo_Finder.aj
+++ /dev/null
@@ -1,126 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.PhysicalState;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect PhysicalState_Roo_Finder {
-    
-    public static Long PhysicalState.countFindPhysicalStatesByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = PhysicalState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM PhysicalState AS o WHERE o.code = :code", Long.class);
-        q.setParameter("code", code);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long PhysicalState.countFindPhysicalStatesByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = PhysicalState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM PhysicalState AS o WHERE o.name = :name", Long.class);
-        q.setParameter("name", name);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long PhysicalState.countFindPhysicalStatesByNameLike(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        name = name.replace('*', '%');
-        if (name.charAt(0) != '%') {
-            name = "%" + name;
-        }
-        if (name.charAt(name.length() - 1) != '%') {
-            name = name + "%";
-        }
-        EntityManager em = PhysicalState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM PhysicalState AS o WHERE LOWER(o.name) LIKE LOWER(:name)", Long.class);
-        q.setParameter("name", name);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<PhysicalState> PhysicalState.findPhysicalStatesByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = PhysicalState.entityManager();
-        TypedQuery<PhysicalState> q = em.createQuery("SELECT o FROM PhysicalState AS o WHERE o.code = :code", PhysicalState.class);
-        q.setParameter("code", code);
-        return q;
-    }
-    
-    public static TypedQuery<PhysicalState> PhysicalState.findPhysicalStatesByCodeEquals(String code, String sortFieldName, String sortOrder) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = PhysicalState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM PhysicalState AS o WHERE o.code = :code");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<PhysicalState> q = em.createQuery(queryBuilder.toString(), PhysicalState.class);
-        q.setParameter("code", code);
-        return q;
-    }
-    
-    public static TypedQuery<PhysicalState> PhysicalState.findPhysicalStatesByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = PhysicalState.entityManager();
-        TypedQuery<PhysicalState> q = em.createQuery("SELECT o FROM PhysicalState AS o WHERE o.name = :name", PhysicalState.class);
-        q.setParameter("name", name);
-        return q;
-    }
-    
-    public static TypedQuery<PhysicalState> PhysicalState.findPhysicalStatesByNameEquals(String name, String sortFieldName, String sortOrder) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = PhysicalState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM PhysicalState AS o WHERE o.name = :name");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<PhysicalState> q = em.createQuery(queryBuilder.toString(), PhysicalState.class);
-        q.setParameter("name", name);
-        return q;
-    }
-    
-    public static TypedQuery<PhysicalState> PhysicalState.findPhysicalStatesByNameLike(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        name = name.replace('*', '%');
-        if (name.charAt(0) != '%') {
-            name = "%" + name;
-        }
-        if (name.charAt(name.length() - 1) != '%') {
-            name = name + "%";
-        }
-        EntityManager em = PhysicalState.entityManager();
-        TypedQuery<PhysicalState> q = em.createQuery("SELECT o FROM PhysicalState AS o WHERE LOWER(o.name) LIKE LOWER(:name)", PhysicalState.class);
-        q.setParameter("name", name);
-        return q;
-    }
-    
-    public static TypedQuery<PhysicalState> PhysicalState.findPhysicalStatesByNameLike(String name, String sortFieldName, String sortOrder) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        name = name.replace('*', '%');
-        if (name.charAt(0) != '%') {
-            name = "%" + name;
-        }
-        if (name.charAt(name.length() - 1) != '%') {
-            name = name + "%";
-        }
-        EntityManager em = PhysicalState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM PhysicalState AS o WHERE LOWER(o.name) LIKE LOWER(:name)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<PhysicalState> q = em.createQuery(queryBuilder.toString(), PhysicalState.class);
-        q.setParameter("name", name);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/PhysicalState_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/PhysicalState_Roo_JavaBean.aj
deleted file mode 100644
index 6b87fef68..000000000
--- a/src/main/java/com/labsynch/labseer/domain/PhysicalState_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.PhysicalState;
-
-privileged aspect PhysicalState_Roo_JavaBean {
-    
-    public String PhysicalState.getName() {
-        return this.name;
-    }
-    
-    public void PhysicalState.setName(String name) {
-        this.name = name;
-    }
-    
-    public String PhysicalState.getCode() {
-        return this.code;
-    }
-    
-    public void PhysicalState.setCode(String code) {
-        this.code = code;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/PhysicalState_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/PhysicalState_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 833dd3eb4..000000000
--- a/src/main/java/com/labsynch/labseer/domain/PhysicalState_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.PhysicalState;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect PhysicalState_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager PhysicalState.entityManager;
-    
-    public static final List<String> PhysicalState.fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
-    
-    public static final EntityManager PhysicalState.entityManager() {
-        EntityManager em = new PhysicalState().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long PhysicalState.countPhysicalStates() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM PhysicalState o", Long.class).getSingleResult();
-    }
-    
-    public static List<PhysicalState> PhysicalState.findAllPhysicalStates() {
-        return entityManager().createQuery("SELECT o FROM PhysicalState o", PhysicalState.class).getResultList();
-    }
-    
-    public static List<PhysicalState> PhysicalState.findAllPhysicalStates(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM PhysicalState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, PhysicalState.class).getResultList();
-    }
-    
-    public static PhysicalState PhysicalState.findPhysicalState(Long id) {
-        if (id == null) return null;
-        return entityManager().find(PhysicalState.class, id);
-    }
-    
-    public static List<PhysicalState> PhysicalState.findPhysicalStateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM PhysicalState o", PhysicalState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<PhysicalState> PhysicalState.findPhysicalStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM PhysicalState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, PhysicalState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void PhysicalState.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void PhysicalState.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            PhysicalState attached = PhysicalState.findPhysicalState(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void PhysicalState.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void PhysicalState.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public PhysicalState PhysicalState.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        PhysicalState merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/PhysicalState_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/PhysicalState_Roo_Jpa_Entity.aj
deleted file mode 100644
index e457f58ae..000000000
--- a/src/main/java/com/labsynch/labseer/domain/PhysicalState_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.PhysicalState;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect PhysicalState_Roo_Jpa_Entity {
-    
-    declare @type: PhysicalState: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long PhysicalState.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer PhysicalState.version;
-    
-    public Long PhysicalState.getId() {
-        return this.id;
-    }
-    
-    public void PhysicalState.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer PhysicalState.getVersion() {
-        return this.version;
-    }
-    
-    public void PhysicalState.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/PhysicalState_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/PhysicalState_Roo_Json.aj
deleted file mode 100644
index efbb87d0b..000000000
--- a/src/main/java/com/labsynch/labseer/domain/PhysicalState_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.PhysicalState;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect PhysicalState_Roo_Json {
-    
-    public String PhysicalState.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String PhysicalState.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static PhysicalState PhysicalState.fromJsonToPhysicalState(String json) {
-        return new JSONDeserializer<PhysicalState>()
-        .use(null, PhysicalState.class).deserialize(json);
-    }
-    
-    public static String PhysicalState.toJsonArray(Collection<PhysicalState> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String PhysicalState.toJsonArray(Collection<PhysicalState> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<PhysicalState> PhysicalState.fromJsonArrayToPhysicalStates(String json) {
-        return new JSONDeserializer<List<PhysicalState>>()
-        .use("values", PhysicalState.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/PhysicalState_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/PhysicalState_Roo_ToString.aj
deleted file mode 100644
index f270ccbc6..000000000
--- a/src/main/java/com/labsynch/labseer/domain/PhysicalState_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.PhysicalState;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect PhysicalState_Roo_ToString {
-    
-    public String PhysicalState.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName.java b/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName.java
index 82db71b96..9a3cda71c 100755
--- a/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName.java
+++ b/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName.java
@@ -1,16 +1,32 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord
@@ -44,4 +60,190 @@ public static PreDef_CorpName findNextCorpName(){
     	
     }
 
+
+	public long getCorpNumber() {
+        return this.corpNumber;
+    }
+
+	public void setCorpNumber(long corpNumber) {
+        this.corpNumber = corpNumber;
+    }
+
+	public String getCorpName() {
+        return this.corpName;
+    }
+
+	public void setCorpName(String corpName) {
+        this.corpName = corpName;
+    }
+
+	public String getComment() {
+        return this.comment;
+    }
+
+	public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+	public Boolean getUsed() {
+        return this.used;
+    }
+
+	public void setUsed(Boolean used) {
+        this.used = used;
+    }
+
+	public Boolean getSkip() {
+        return this.skip;
+    }
+
+	public void setSkip(Boolean skip) {
+        this.skip = skip;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static PreDef_CorpName fromJsonToPreDef_CorpName(String json) {
+        return new JSONDeserializer<PreDef_CorpName>()
+        .use(null, PreDef_CorpName.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<PreDef_CorpName> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<PreDef_CorpName> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<PreDef_CorpName> fromJsonArrayToPreDef_CorpNames(String json) {
+        return new JSONDeserializer<List<PreDef_CorpName>>()
+        .use("values", PreDef_CorpName.class).deserialize(json);
+    }
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "corpNumber", "corpName", "comment", "used", "skip");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new PreDef_CorpName().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countPreDef_CorpNames() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM PreDef_CorpName o", Long.class).getSingleResult();
+    }
+
+	public static List<PreDef_CorpName> findAllPreDef_CorpNames() {
+        return entityManager().createQuery("SELECT o FROM PreDef_CorpName o", PreDef_CorpName.class).getResultList();
+    }
+
+	public static List<PreDef_CorpName> findAllPreDef_CorpNames(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM PreDef_CorpName o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, PreDef_CorpName.class).getResultList();
+    }
+
+	public static PreDef_CorpName findPreDef_CorpName(Long id) {
+        if (id == null) return null;
+        return entityManager().find(PreDef_CorpName.class, id);
+    }
+
+	public static List<PreDef_CorpName> findPreDef_CorpNameEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM PreDef_CorpName o", PreDef_CorpName.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<PreDef_CorpName> findPreDef_CorpNameEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM PreDef_CorpName o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, PreDef_CorpName.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            PreDef_CorpName attached = PreDef_CorpName.findPreDef_CorpName(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public PreDef_CorpName merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        PreDef_CorpName merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName_Roo_Configurable.aj
deleted file mode 100644
index 913878791..000000000
--- a/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.PreDef_CorpName;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect PreDef_CorpName_Roo_Configurable {
-    
-    declare @type: PreDef_CorpName: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName_Roo_JavaBean.aj
deleted file mode 100644
index b58b4e996..000000000
--- a/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName_Roo_JavaBean.aj
+++ /dev/null
@@ -1,50 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.PreDef_CorpName;
-
-privileged aspect PreDef_CorpName_Roo_JavaBean {
-    
-    public long PreDef_CorpName.getCorpNumber() {
-        return this.corpNumber;
-    }
-    
-    public void PreDef_CorpName.setCorpNumber(long corpNumber) {
-        this.corpNumber = corpNumber;
-    }
-    
-    public String PreDef_CorpName.getCorpName() {
-        return this.corpName;
-    }
-    
-    public void PreDef_CorpName.setCorpName(String corpName) {
-        this.corpName = corpName;
-    }
-    
-    public String PreDef_CorpName.getComment() {
-        return this.comment;
-    }
-    
-    public void PreDef_CorpName.setComment(String comment) {
-        this.comment = comment;
-    }
-    
-    public Boolean PreDef_CorpName.getUsed() {
-        return this.used;
-    }
-    
-    public void PreDef_CorpName.setUsed(Boolean used) {
-        this.used = used;
-    }
-    
-    public Boolean PreDef_CorpName.getSkip() {
-        return this.skip;
-    }
-    
-    public void PreDef_CorpName.setSkip(Boolean skip) {
-        this.skip = skip;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 6088fcf73..000000000
--- a/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.PreDef_CorpName;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect PreDef_CorpName_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager PreDef_CorpName.entityManager;
-    
-    public static final List<String> PreDef_CorpName.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "corpNumber", "corpName", "comment", "used", "skip");
-    
-    public static final EntityManager PreDef_CorpName.entityManager() {
-        EntityManager em = new PreDef_CorpName().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long PreDef_CorpName.countPreDef_CorpNames() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM PreDef_CorpName o", Long.class).getSingleResult();
-    }
-    
-    public static List<PreDef_CorpName> PreDef_CorpName.findAllPreDef_CorpNames() {
-        return entityManager().createQuery("SELECT o FROM PreDef_CorpName o", PreDef_CorpName.class).getResultList();
-    }
-    
-    public static List<PreDef_CorpName> PreDef_CorpName.findAllPreDef_CorpNames(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM PreDef_CorpName o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, PreDef_CorpName.class).getResultList();
-    }
-    
-    public static PreDef_CorpName PreDef_CorpName.findPreDef_CorpName(Long id) {
-        if (id == null) return null;
-        return entityManager().find(PreDef_CorpName.class, id);
-    }
-    
-    public static List<PreDef_CorpName> PreDef_CorpName.findPreDef_CorpNameEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM PreDef_CorpName o", PreDef_CorpName.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<PreDef_CorpName> PreDef_CorpName.findPreDef_CorpNameEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM PreDef_CorpName o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, PreDef_CorpName.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void PreDef_CorpName.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void PreDef_CorpName.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            PreDef_CorpName attached = PreDef_CorpName.findPreDef_CorpName(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void PreDef_CorpName.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void PreDef_CorpName.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public PreDef_CorpName PreDef_CorpName.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        PreDef_CorpName merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName_Roo_Jpa_Entity.aj
deleted file mode 100644
index c86fb594e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.PreDef_CorpName;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect PreDef_CorpName_Roo_Jpa_Entity {
-    
-    declare @type: PreDef_CorpName: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long PreDef_CorpName.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer PreDef_CorpName.version;
-    
-    public Long PreDef_CorpName.getId() {
-        return this.id;
-    }
-    
-    public void PreDef_CorpName.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer PreDef_CorpName.getVersion() {
-        return this.version;
-    }
-    
-    public void PreDef_CorpName.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName_Roo_Json.aj
deleted file mode 100644
index e761104dd..000000000
--- a/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.PreDef_CorpName;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect PreDef_CorpName_Roo_Json {
-    
-    public String PreDef_CorpName.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String PreDef_CorpName.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static PreDef_CorpName PreDef_CorpName.fromJsonToPreDef_CorpName(String json) {
-        return new JSONDeserializer<PreDef_CorpName>()
-        .use(null, PreDef_CorpName.class).deserialize(json);
-    }
-    
-    public static String PreDef_CorpName.toJsonArray(Collection<PreDef_CorpName> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String PreDef_CorpName.toJsonArray(Collection<PreDef_CorpName> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<PreDef_CorpName> PreDef_CorpName.fromJsonArrayToPreDef_CorpNames(String json) {
-        return new JSONDeserializer<List<PreDef_CorpName>>()
-        .use("values", PreDef_CorpName.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName_Roo_ToString.aj
deleted file mode 100644
index 3f783f58a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.PreDef_CorpName;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect PreDef_CorpName_Roo_ToString {
-    
-    public String PreDef_CorpName.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Protocol.java b/src/main/java/com/labsynch/labseer/domain/Protocol.java
index 767d7ba77..22adc1ed2 100755
--- a/src/main/java/com/labsynch/labseer/domain/Protocol.java
+++ b/src/main/java/com/labsynch/labseer/domain/Protocol.java
@@ -10,14 +10,19 @@
 import java.util.Set;
 
 import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
 import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
 import javax.persistence.OneToMany;
+import javax.persistence.TypedQuery;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -31,6 +36,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString(excludeFields = { "lsTags", "lsStates", "experiments", "lsLabels" })
 @RooJson
@@ -290,4 +297,570 @@ public String findPreferredName() {
             }
         }
     }
+
+	public static Long countFindProtocolsByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = Protocol.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE o.codeName = :codeName", Long.class);
+        q.setParameter("codeName", codeName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindProtocolsByCodeNameEqualsAndIgnoredNot(String codeName, boolean ignored) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = Protocol.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE o.codeName = :codeName  AND o.ignored IS NOT :ignored", Long.class);
+        q.setParameter("codeName", codeName);
+        q.setParameter("ignored", ignored);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindProtocolsByCodeNameLike(String codeName) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        codeName = codeName.replace('*', '%');
+        if (codeName.charAt(0) != '%') {
+            codeName = "%" + codeName;
+        }
+        if (codeName.charAt(codeName.length() - 1) != '%') {
+            codeName = codeName + "%";
+        }
+        EntityManager em = Protocol.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)", Long.class);
+        q.setParameter("codeName", codeName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindProtocolsByIgnoredNot(boolean ignored) {
+        EntityManager em = Protocol.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE o.ignored IS NOT :ignored", Long.class);
+        q.setParameter("ignored", ignored);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindProtocolsByLsKindEquals(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = Protocol.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE o.lsKind = :lsKind", Long.class);
+        q.setParameter("lsKind", lsKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindProtocolsByLsKindLike(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        lsKind = lsKind.replace('*', '%');
+        if (lsKind.charAt(0) != '%') {
+            lsKind = "%" + lsKind;
+        }
+        if (lsKind.charAt(lsKind.length() - 1) != '%') {
+            lsKind = lsKind + "%";
+        }
+        EntityManager em = Protocol.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)", Long.class);
+        q.setParameter("lsKind", lsKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindProtocolsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = Protocol.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindProtocolsByLsTypeAndKindEquals(String lsTypeAndKind) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        EntityManager em = Protocol.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", Long.class);
+        q.setParameter("lsTypeAndKind", lsTypeAndKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindProtocolsByLsTypeEquals(String lsType) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = Protocol.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE o.lsType = :lsType", Long.class);
+        q.setParameter("lsType", lsType);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindProtocolsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = Protocol.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindProtocolsByLsTypeLike(String lsType) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        lsType = lsType.replace('*', '%');
+        if (lsType.charAt(0) != '%') {
+            lsType = "%" + lsType;
+        }
+        if (lsType.charAt(lsType.length() - 1) != '%') {
+            lsType = lsType + "%";
+        }
+        EntityManager em = Protocol.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE LOWER(o.lsType) LIKE LOWER(:lsType)", Long.class);
+        q.setParameter("lsType", lsType);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindProtocolsByRecordedByLike(String recordedBy) {
+        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+        recordedBy = recordedBy.replace('*', '%');
+        if (recordedBy.charAt(0) != '%') {
+            recordedBy = "%" + recordedBy;
+        }
+        if (recordedBy.charAt(recordedBy.length() - 1) != '%') {
+            recordedBy = recordedBy + "%";
+        }
+        EntityManager em = Protocol.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)", Long.class);
+        q.setParameter("recordedBy", recordedBy);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<Protocol> findProtocolsByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = Protocol.entityManager();
+        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE o.codeName = :codeName", Protocol.class);
+        q.setParameter("codeName", codeName);
+        return q;
+    }
+
+	public static TypedQuery<Protocol> findProtocolsByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = Protocol.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE o.codeName = :codeName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Protocol> q = em.createQuery(queryBuilder.toString(), Protocol.class);
+        q.setParameter("codeName", codeName);
+        return q;
+    }
+
+	public static TypedQuery<Protocol> findProtocolsByCodeNameEqualsAndIgnoredNot(String codeName, boolean ignored) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = Protocol.entityManager();
+        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE o.codeName = :codeName  AND o.ignored IS NOT :ignored", Protocol.class);
+        q.setParameter("codeName", codeName);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<Protocol> findProtocolsByCodeNameEqualsAndIgnoredNot(String codeName, boolean ignored, String sortFieldName, String sortOrder) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = Protocol.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE o.codeName = :codeName  AND o.ignored IS NOT :ignored");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Protocol> q = em.createQuery(queryBuilder.toString(), Protocol.class);
+        q.setParameter("codeName", codeName);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<Protocol> findProtocolsByCodeNameLike(String codeName) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        codeName = codeName.replace('*', '%');
+        if (codeName.charAt(0) != '%') {
+            codeName = "%" + codeName;
+        }
+        if (codeName.charAt(codeName.length() - 1) != '%') {
+            codeName = codeName + "%";
+        }
+        EntityManager em = Protocol.entityManager();
+        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)", Protocol.class);
+        q.setParameter("codeName", codeName);
+        return q;
+    }
+
+	public static TypedQuery<Protocol> findProtocolsByCodeNameLike(String codeName, String sortFieldName, String sortOrder) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        codeName = codeName.replace('*', '%');
+        if (codeName.charAt(0) != '%') {
+            codeName = "%" + codeName;
+        }
+        if (codeName.charAt(codeName.length() - 1) != '%') {
+            codeName = codeName + "%";
+        }
+        EntityManager em = Protocol.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Protocol> q = em.createQuery(queryBuilder.toString(), Protocol.class);
+        q.setParameter("codeName", codeName);
+        return q;
+    }
+
+	public static TypedQuery<Protocol> findProtocolsByIgnoredNot(boolean ignored) {
+        EntityManager em = Protocol.entityManager();
+        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE o.ignored IS NOT :ignored", Protocol.class);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<Protocol> findProtocolsByIgnoredNot(boolean ignored, String sortFieldName, String sortOrder) {
+        EntityManager em = Protocol.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE o.ignored IS NOT :ignored");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Protocol> q = em.createQuery(queryBuilder.toString(), Protocol.class);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<Protocol> findProtocolsByLsKindEquals(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = Protocol.entityManager();
+        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE o.lsKind = :lsKind", Protocol.class);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<Protocol> findProtocolsByLsKindEquals(String lsKind, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = Protocol.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE o.lsKind = :lsKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Protocol> q = em.createQuery(queryBuilder.toString(), Protocol.class);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<Protocol> findProtocolsByLsKindLike(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        lsKind = lsKind.replace('*', '%');
+        if (lsKind.charAt(0) != '%') {
+            lsKind = "%" + lsKind;
+        }
+        if (lsKind.charAt(lsKind.length() - 1) != '%') {
+            lsKind = lsKind + "%";
+        }
+        EntityManager em = Protocol.entityManager();
+        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)", Protocol.class);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<Protocol> findProtocolsByLsKindLike(String lsKind, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        lsKind = lsKind.replace('*', '%');
+        if (lsKind.charAt(0) != '%') {
+            lsKind = "%" + lsKind;
+        }
+        if (lsKind.charAt(lsKind.length() - 1) != '%') {
+            lsKind = lsKind + "%";
+        }
+        EntityManager em = Protocol.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Protocol> q = em.createQuery(queryBuilder.toString(), Protocol.class);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<Protocol> findProtocolsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = Protocol.entityManager();
+        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE o.lsTransaction = :lsTransaction", Protocol.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<Protocol> findProtocolsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = Protocol.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE o.lsTransaction = :lsTransaction");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Protocol> q = em.createQuery(queryBuilder.toString(), Protocol.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<Protocol> findProtocolsByLsTypeAndKindEquals(String lsTypeAndKind) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        EntityManager em = Protocol.entityManager();
+        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", Protocol.class);
+        q.setParameter("lsTypeAndKind", lsTypeAndKind);
+        return q;
+    }
+
+	public static TypedQuery<Protocol> findProtocolsByLsTypeAndKindEquals(String lsTypeAndKind, String sortFieldName, String sortOrder) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        EntityManager em = Protocol.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE o.lsTypeAndKind = :lsTypeAndKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Protocol> q = em.createQuery(queryBuilder.toString(), Protocol.class);
+        q.setParameter("lsTypeAndKind", lsTypeAndKind);
+        return q;
+    }
+
+	public static TypedQuery<Protocol> findProtocolsByLsTypeEquals(String lsType) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = Protocol.entityManager();
+        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE o.lsType = :lsType", Protocol.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<Protocol> findProtocolsByLsTypeEquals(String lsType, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = Protocol.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE o.lsType = :lsType");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Protocol> q = em.createQuery(queryBuilder.toString(), Protocol.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<Protocol> findProtocolsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = Protocol.entityManager();
+        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Protocol.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<Protocol> findProtocolsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = Protocol.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Protocol> q = em.createQuery(queryBuilder.toString(), Protocol.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<Protocol> findProtocolsByLsTypeLike(String lsType) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        lsType = lsType.replace('*', '%');
+        if (lsType.charAt(0) != '%') {
+            lsType = "%" + lsType;
+        }
+        if (lsType.charAt(lsType.length() - 1) != '%') {
+            lsType = lsType + "%";
+        }
+        EntityManager em = Protocol.entityManager();
+        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE LOWER(o.lsType) LIKE LOWER(:lsType)", Protocol.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<Protocol> findProtocolsByLsTypeLike(String lsType, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        lsType = lsType.replace('*', '%');
+        if (lsType.charAt(0) != '%') {
+            lsType = "%" + lsType;
+        }
+        if (lsType.charAt(lsType.length() - 1) != '%') {
+            lsType = lsType + "%";
+        }
+        EntityManager em = Protocol.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE LOWER(o.lsType) LIKE LOWER(:lsType)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Protocol> q = em.createQuery(queryBuilder.toString(), Protocol.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<Protocol> findProtocolsByRecordedByLike(String recordedBy) {
+        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+        recordedBy = recordedBy.replace('*', '%');
+        if (recordedBy.charAt(0) != '%') {
+            recordedBy = "%" + recordedBy;
+        }
+        if (recordedBy.charAt(recordedBy.length() - 1) != '%') {
+            recordedBy = recordedBy + "%";
+        }
+        EntityManager em = Protocol.entityManager();
+        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)", Protocol.class);
+        q.setParameter("recordedBy", recordedBy);
+        return q;
+    }
+
+	public static TypedQuery<Protocol> findProtocolsByRecordedByLike(String recordedBy, String sortFieldName, String sortOrder) {
+        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+        recordedBy = recordedBy.replace('*', '%');
+        if (recordedBy.charAt(0) != '%') {
+            recordedBy = "%" + recordedBy;
+        }
+        if (recordedBy.charAt(recordedBy.length() - 1) != '%') {
+            recordedBy = recordedBy + "%";
+        }
+        EntityManager em = Protocol.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Protocol> q = em.createQuery(queryBuilder.toString(), Protocol.class);
+        q.setParameter("recordedBy", recordedBy);
+        return q;
+    }
+
+	public String toString() {
+        return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).setExcludeFieldNames("lsTags", "lsStates", "experiments", "lsLabels").toString();
+    }
+
+	public String getShortDescription() {
+        return this.shortDescription;
+    }
+
+	public void setShortDescription(String shortDescription) {
+        this.shortDescription = shortDescription;
+    }
+
+	public Set<ProtocolState> getLsStates() {
+        return this.lsStates;
+    }
+
+	public void setLsStates(Set<ProtocolState> lsStates) {
+        this.lsStates = lsStates;
+    }
+
+	public Set<Experiment> getExperiments() {
+        return this.experiments;
+    }
+
+	public void setExperiments(Set<Experiment> experiments) {
+        this.experiments = experiments;
+    }
+
+	public Set<ProtocolLabel> getLsLabels() {
+        return this.lsLabels;
+    }
+
+	public void setLsLabels(Set<ProtocolLabel> lsLabels) {
+        this.lsLabels = lsLabels;
+    }
+
+	public Set<LsTag> getLsTags() {
+        return this.lsTags;
+    }
+
+	public void setLsTags(Set<LsTag> lsTags) {
+        this.lsTags = lsTags;
+    }
+
+	public Set<ItxProtocolProtocol> getFirstProtocols() {
+        return this.firstProtocols;
+    }
+
+	public void setFirstProtocols(Set<ItxProtocolProtocol> firstProtocols) {
+        this.firstProtocols = firstProtocols;
+    }
+
+	public Set<ItxProtocolProtocol> getSecondProtocols() {
+        return this.secondProtocols;
+    }
+
+	public void setSecondProtocols(Set<ItxProtocolProtocol> secondProtocols) {
+        this.secondProtocols = secondProtocols;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "shortDescription", "lsStates", "experiments", "lsLabels", "lsTags", "firstProtocols", "secondProtocols");
+
+	public static long countProtocols() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM Protocol o", Long.class).getSingleResult();
+    }
+
+	public static List<Protocol> findAllProtocols() {
+        return entityManager().createQuery("SELECT o FROM Protocol o", Protocol.class).getResultList();
+    }
+
+	public static List<Protocol> findAllProtocols(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM Protocol o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, Protocol.class).getResultList();
+    }
+
+	public static List<Protocol> findProtocolEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM Protocol o", Protocol.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<Protocol> findProtocolEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM Protocol o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, Protocol.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public Protocol merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        Protocol merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolKind.java b/src/main/java/com/labsynch/labseer/domain/ProtocolKind.java
index 8916519b6..c617e8c3a 100755
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ProtocolKind.java
@@ -1,5 +1,8 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.List;
 
 import javax.persistence.Column;
@@ -12,16 +15,20 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
 @Entity
 @RooJavaBean
 @RooToString
@@ -117,4 +124,139 @@ public com.labsynch.labseer.domain.ProtocolKind merge() {
         this.entityManager.flush();
         return merged;
     }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ProtocolKind fromJsonToProtocolKind(String json) {
+        return new JSONDeserializer<ProtocolKind>()
+        .use(null, ProtocolKind.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ProtocolKind> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ProtocolKind> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ProtocolKind> fromJsonArrayToProtocolKinds(String json) {
+        return new JSONDeserializer<List<ProtocolKind>>()
+        .use("values", ProtocolKind.class).deserialize(json);
+    }
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public ProtocolType getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(ProtocolType lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getKindName() {
+        return this.kindName;
+    }
+
+	public void setKindName(String kindName) {
+        this.kindName = kindName;
+    }
+
+	public String getLsTypeAndKind() {
+        return this.lsTypeAndKind;
+    }
+
+	public void setLsTypeAndKind(String lsTypeAndKind) {
+        this.lsTypeAndKind = lsTypeAndKind;
+    }
+
+	public static Long countFindProtocolKindsByLsTypeEqualsAndKindNameEquals(ProtocolType lsType, String kindName) {
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        EntityManager em = ProtocolKind.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolKind AS o WHERE o.lsType = :lsType  AND o.kindName = :kindName", Long.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("kindName", kindName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ProtocolKind> findProtocolKindsByLsTypeEqualsAndKindNameEquals(ProtocolType lsType, String kindName) {
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        EntityManager em = ProtocolKind.entityManager();
+        TypedQuery<ProtocolKind> q = em.createQuery("SELECT o FROM ProtocolKind AS o WHERE o.lsType = :lsType  AND o.kindName = :kindName", ProtocolKind.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("kindName", kindName);
+        return q;
+    }
+
+	public static TypedQuery<ProtocolKind> findProtocolKindsByLsTypeEqualsAndKindNameEquals(ProtocolType lsType, String kindName, String sortFieldName, String sortOrder) {
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        EntityManager em = ProtocolKind.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolKind AS o WHERE o.lsType = :lsType  AND o.kindName = :kindName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ProtocolKind> q = em.createQuery(queryBuilder.toString(), ProtocolKind.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("kindName", kindName);
+        return q;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("id", "version", "lsType", "kindName", "lsTypeAndKind", "entityManager");
+
+	public static List<ProtocolKind> findAllProtocolKinds(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ProtocolKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ProtocolKind.class).getResultList();
+    }
+
+	public static List<ProtocolKind> findProtocolKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ProtocolKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ProtocolKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolKind_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolKind_Roo_Configurable.aj
deleted file mode 100755
index 256b27378..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolKind_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolKind;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ProtocolKind_Roo_Configurable {
-    
-    declare @type: ProtocolKind: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolKind_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolKind_Roo_Finder.aj
deleted file mode 100644
index 713592f24..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolKind_Roo_Finder.aj
+++ /dev/null
@@ -1,50 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolKind;
-import com.labsynch.labseer.domain.ProtocolType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ProtocolKind_Roo_Finder {
-    
-    public static Long ProtocolKind.countFindProtocolKindsByLsTypeEqualsAndKindNameEquals(ProtocolType lsType, String kindName) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        EntityManager em = ProtocolKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolKind AS o WHERE o.lsType = :lsType  AND o.kindName = :kindName", Long.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("kindName", kindName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ProtocolKind> ProtocolKind.findProtocolKindsByLsTypeEqualsAndKindNameEquals(ProtocolType lsType, String kindName) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        EntityManager em = ProtocolKind.entityManager();
-        TypedQuery<ProtocolKind> q = em.createQuery("SELECT o FROM ProtocolKind AS o WHERE o.lsType = :lsType  AND o.kindName = :kindName", ProtocolKind.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("kindName", kindName);
-        return q;
-    }
-    
-    public static TypedQuery<ProtocolKind> ProtocolKind.findProtocolKindsByLsTypeEqualsAndKindNameEquals(ProtocolType lsType, String kindName, String sortFieldName, String sortOrder) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        EntityManager em = ProtocolKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolKind AS o WHERE o.lsType = :lsType  AND o.kindName = :kindName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ProtocolKind> q = em.createQuery(queryBuilder.toString(), ProtocolKind.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("kindName", kindName);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolKind_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolKind_Roo_JavaBean.aj
deleted file mode 100755
index d71875efd..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolKind_Roo_JavaBean.aj
+++ /dev/null
@@ -1,51 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolKind;
-import com.labsynch.labseer.domain.ProtocolType;
-
-privileged aspect ProtocolKind_Roo_JavaBean {
-    
-    public Long ProtocolKind.getId() {
-        return this.id;
-    }
-    
-    public void ProtocolKind.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer ProtocolKind.getVersion() {
-        return this.version;
-    }
-    
-    public void ProtocolKind.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-    public ProtocolType ProtocolKind.getLsType() {
-        return this.lsType;
-    }
-    
-    public void ProtocolKind.setLsType(ProtocolType lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String ProtocolKind.getKindName() {
-        return this.kindName;
-    }
-    
-    public void ProtocolKind.setKindName(String kindName) {
-        this.kindName = kindName;
-    }
-    
-    public String ProtocolKind.getLsTypeAndKind() {
-        return this.lsTypeAndKind;
-    }
-    
-    public void ProtocolKind.setLsTypeAndKind(String lsTypeAndKind) {
-        this.lsTypeAndKind = lsTypeAndKind;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolKind_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolKind_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index c88a3f8a4..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolKind_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolKind;
-import java.util.List;
-
-privileged aspect ProtocolKind_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ProtocolKind.fieldNames4OrderClauseFilter = java.util.Arrays.asList("id", "version", "lsType", "kindName", "lsTypeAndKind", "entityManager");
-    
-    public static List<ProtocolKind> ProtocolKind.findAllProtocolKinds(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ProtocolKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ProtocolKind.class).getResultList();
-    }
-    
-    public static List<ProtocolKind> ProtocolKind.findProtocolKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ProtocolKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ProtocolKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolKind_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolKind_Roo_Json.aj
deleted file mode 100755
index 7f9f33e63..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolKind_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolKind;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ProtocolKind_Roo_Json {
-    
-    public String ProtocolKind.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ProtocolKind.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ProtocolKind ProtocolKind.fromJsonToProtocolKind(String json) {
-        return new JSONDeserializer<ProtocolKind>()
-        .use(null, ProtocolKind.class).deserialize(json);
-    }
-    
-    public static String ProtocolKind.toJsonArray(Collection<ProtocolKind> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ProtocolKind.toJsonArray(Collection<ProtocolKind> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ProtocolKind> ProtocolKind.fromJsonArrayToProtocolKinds(String json) {
-        return new JSONDeserializer<List<ProtocolKind>>()
-        .use("values", ProtocolKind.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolKind_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolKind_Roo_ToString.aj
deleted file mode 100755
index 85d234902..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolKind_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolKind;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ProtocolKind_Roo_ToString {
-    
-    public String ProtocolKind.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolLabel.java b/src/main/java/com/labsynch/labseer/domain/ProtocolLabel.java
index d6d1b0a5b..ce734a9ca 100755
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/ProtocolLabel.java
@@ -5,23 +5,27 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
-
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
-
+import org.springframework.transaction.annotation.Transactional;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -217,4 +221,212 @@ public static TypedQuery<ProtocolLabel> findProtocolLabelsByNameLike(String labe
         q.setParameter("ignored", ignored);
         return q;
     }
+
+	public Protocol getProtocol() {
+        return this.protocol;
+    }
+
+	public void setProtocol(Protocol protocol) {
+        this.protocol = protocol;
+    }
+
+	public ProtocolLabel() {
+        super();
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "protocol");
+
+	public static long countProtocolLabels() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ProtocolLabel o", Long.class).getSingleResult();
+    }
+
+	public static List<ProtocolLabel> findAllProtocolLabels() {
+        return entityManager().createQuery("SELECT o FROM ProtocolLabel o", ProtocolLabel.class).getResultList();
+    }
+
+	public static List<ProtocolLabel> findAllProtocolLabels(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ProtocolLabel o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ProtocolLabel.class).getResultList();
+    }
+
+	public static List<ProtocolLabel> findProtocolLabelEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ProtocolLabel o", ProtocolLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ProtocolLabel> findProtocolLabelEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ProtocolLabel o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ProtocolLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public ProtocolLabel merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ProtocolLabel merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public static Long countFindProtocolLabelsByLabelTextEqualsAndIgnoredNot(String labelText, boolean ignored) {
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        EntityManager em = ProtocolLabel.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored", Long.class);
+        q.setParameter("labelText", labelText);
+        q.setParameter("ignored", ignored);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindProtocolLabelsByLabelTextLike(String labelText) {
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        labelText = labelText.replace('*', '%');
+        if (labelText.charAt(0) != '%') {
+            labelText = "%" + labelText;
+        }
+        if (labelText.charAt(labelText.length() - 1) != '%') {
+            labelText = labelText + "%";
+        }
+        EntityManager em = ProtocolLabel.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", Long.class);
+        q.setParameter("labelText", labelText);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindProtocolLabelsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = ProtocolLabel.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolLabel AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindProtocolLabelsByProtocol(Protocol protocol) {
+        if (protocol == null) throw new IllegalArgumentException("The protocol argument is required");
+        EntityManager em = ProtocolLabel.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolLabel AS o WHERE o.protocol = :protocol", Long.class);
+        q.setParameter("protocol", protocol);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ProtocolLabel> findProtocolLabelsByLabelTextEqualsAndIgnoredNot(String labelText, boolean ignored) {
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        EntityManager em = ProtocolLabel.entityManager();
+        TypedQuery<ProtocolLabel> q = em.createQuery("SELECT o FROM ProtocolLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored", ProtocolLabel.class);
+        q.setParameter("labelText", labelText);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<ProtocolLabel> findProtocolLabelsByLabelTextEqualsAndIgnoredNot(String labelText, boolean ignored, String sortFieldName, String sortOrder) {
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        EntityManager em = ProtocolLabel.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ProtocolLabel> q = em.createQuery(queryBuilder.toString(), ProtocolLabel.class);
+        q.setParameter("labelText", labelText);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
+	public static TypedQuery<ProtocolLabel> findProtocolLabelsByLabelTextLike(String labelText) {
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        labelText = labelText.replace('*', '%');
+        if (labelText.charAt(0) != '%') {
+            labelText = "%" + labelText;
+        }
+        if (labelText.charAt(labelText.length() - 1) != '%') {
+            labelText = labelText + "%";
+        }
+        EntityManager em = ProtocolLabel.entityManager();
+        TypedQuery<ProtocolLabel> q = em.createQuery("SELECT o FROM ProtocolLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", ProtocolLabel.class);
+        q.setParameter("labelText", labelText);
+        return q;
+    }
+
+	public static TypedQuery<ProtocolLabel> findProtocolLabelsByLabelTextLike(String labelText, String sortFieldName, String sortOrder) {
+        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        labelText = labelText.replace('*', '%');
+        if (labelText.charAt(0) != '%') {
+            labelText = "%" + labelText;
+        }
+        if (labelText.charAt(labelText.length() - 1) != '%') {
+            labelText = labelText + "%";
+        }
+        EntityManager em = ProtocolLabel.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ProtocolLabel> q = em.createQuery(queryBuilder.toString(), ProtocolLabel.class);
+        q.setParameter("labelText", labelText);
+        return q;
+    }
+
+	public static TypedQuery<ProtocolLabel> findProtocolLabelsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = ProtocolLabel.entityManager();
+        TypedQuery<ProtocolLabel> q = em.createQuery("SELECT o FROM ProtocolLabel AS o WHERE o.lsTransaction = :lsTransaction", ProtocolLabel.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<ProtocolLabel> findProtocolLabelsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = ProtocolLabel.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolLabel AS o WHERE o.lsTransaction = :lsTransaction");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ProtocolLabel> q = em.createQuery(queryBuilder.toString(), ProtocolLabel.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<ProtocolLabel> findProtocolLabelsByProtocol(Protocol protocol) {
+        if (protocol == null) throw new IllegalArgumentException("The protocol argument is required");
+        EntityManager em = ProtocolLabel.entityManager();
+        TypedQuery<ProtocolLabel> q = em.createQuery("SELECT o FROM ProtocolLabel AS o WHERE o.protocol = :protocol", ProtocolLabel.class);
+        q.setParameter("protocol", protocol);
+        return q;
+    }
+
+	public static TypedQuery<ProtocolLabel> findProtocolLabelsByProtocol(Protocol protocol, String sortFieldName, String sortOrder) {
+        if (protocol == null) throw new IllegalArgumentException("The protocol argument is required");
+        EntityManager em = ProtocolLabel.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolLabel AS o WHERE o.protocol = :protocol");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ProtocolLabel> q = em.createQuery(queryBuilder.toString(), ProtocolLabel.class);
+        q.setParameter("protocol", protocol);
+        return q;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolLabel_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolLabel_Roo_Configurable.aj
deleted file mode 100755
index 295ca2fbd..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolLabel_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolLabel;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ProtocolLabel_Roo_Configurable {
-    
-    declare @type: ProtocolLabel: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolLabel_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolLabel_Roo_Finder.aj
deleted file mode 100755
index 70a08ebdb..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolLabel_Roo_Finder.aj
+++ /dev/null
@@ -1,161 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ProtocolLabel;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ProtocolLabel_Roo_Finder {
-    
-    public static Long ProtocolLabel.countFindProtocolLabelsByLabelTextEqualsAndIgnoredNot(String labelText, boolean ignored) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        EntityManager em = ProtocolLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored", Long.class);
-        q.setParameter("labelText", labelText);
-        q.setParameter("ignored", ignored);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ProtocolLabel.countFindProtocolLabelsByLabelTextLike(String labelText) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        labelText = labelText.replace('*', '%');
-        if (labelText.charAt(0) != '%') {
-            labelText = "%" + labelText;
-        }
-        if (labelText.charAt(labelText.length() - 1) != '%') {
-            labelText = labelText + "%";
-        }
-        EntityManager em = ProtocolLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", Long.class);
-        q.setParameter("labelText", labelText);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ProtocolLabel.countFindProtocolLabelsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = ProtocolLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolLabel AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ProtocolLabel.countFindProtocolLabelsByProtocol(Protocol protocol) {
-        if (protocol == null) throw new IllegalArgumentException("The protocol argument is required");
-        EntityManager em = ProtocolLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolLabel AS o WHERE o.protocol = :protocol", Long.class);
-        q.setParameter("protocol", protocol);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ProtocolLabel> ProtocolLabel.findProtocolLabelsByLabelTextEqualsAndIgnoredNot(String labelText, boolean ignored) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        EntityManager em = ProtocolLabel.entityManager();
-        TypedQuery<ProtocolLabel> q = em.createQuery("SELECT o FROM ProtocolLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored", ProtocolLabel.class);
-        q.setParameter("labelText", labelText);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<ProtocolLabel> ProtocolLabel.findProtocolLabelsByLabelTextEqualsAndIgnoredNot(String labelText, boolean ignored, String sortFieldName, String sortOrder) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        EntityManager em = ProtocolLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ProtocolLabel> q = em.createQuery(queryBuilder.toString(), ProtocolLabel.class);
-        q.setParameter("labelText", labelText);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<ProtocolLabel> ProtocolLabel.findProtocolLabelsByLabelTextLike(String labelText) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        labelText = labelText.replace('*', '%');
-        if (labelText.charAt(0) != '%') {
-            labelText = "%" + labelText;
-        }
-        if (labelText.charAt(labelText.length() - 1) != '%') {
-            labelText = labelText + "%";
-        }
-        EntityManager em = ProtocolLabel.entityManager();
-        TypedQuery<ProtocolLabel> q = em.createQuery("SELECT o FROM ProtocolLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", ProtocolLabel.class);
-        q.setParameter("labelText", labelText);
-        return q;
-    }
-    
-    public static TypedQuery<ProtocolLabel> ProtocolLabel.findProtocolLabelsByLabelTextLike(String labelText, String sortFieldName, String sortOrder) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        labelText = labelText.replace('*', '%');
-        if (labelText.charAt(0) != '%') {
-            labelText = "%" + labelText;
-        }
-        if (labelText.charAt(labelText.length() - 1) != '%') {
-            labelText = labelText + "%";
-        }
-        EntityManager em = ProtocolLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ProtocolLabel> q = em.createQuery(queryBuilder.toString(), ProtocolLabel.class);
-        q.setParameter("labelText", labelText);
-        return q;
-    }
-    
-    public static TypedQuery<ProtocolLabel> ProtocolLabel.findProtocolLabelsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = ProtocolLabel.entityManager();
-        TypedQuery<ProtocolLabel> q = em.createQuery("SELECT o FROM ProtocolLabel AS o WHERE o.lsTransaction = :lsTransaction", ProtocolLabel.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<ProtocolLabel> ProtocolLabel.findProtocolLabelsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = ProtocolLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolLabel AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ProtocolLabel> q = em.createQuery(queryBuilder.toString(), ProtocolLabel.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<ProtocolLabel> ProtocolLabel.findProtocolLabelsByProtocol(Protocol protocol) {
-        if (protocol == null) throw new IllegalArgumentException("The protocol argument is required");
-        EntityManager em = ProtocolLabel.entityManager();
-        TypedQuery<ProtocolLabel> q = em.createQuery("SELECT o FROM ProtocolLabel AS o WHERE o.protocol = :protocol", ProtocolLabel.class);
-        q.setParameter("protocol", protocol);
-        return q;
-    }
-    
-    public static TypedQuery<ProtocolLabel> ProtocolLabel.findProtocolLabelsByProtocol(Protocol protocol, String sortFieldName, String sortOrder) {
-        if (protocol == null) throw new IllegalArgumentException("The protocol argument is required");
-        EntityManager em = ProtocolLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolLabel AS o WHERE o.protocol = :protocol");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ProtocolLabel> q = em.createQuery(queryBuilder.toString(), ProtocolLabel.class);
-        q.setParameter("protocol", protocol);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolLabel_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolLabel_Roo_JavaBean.aj
deleted file mode 100755
index 0c9183b47..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolLabel_Roo_JavaBean.aj
+++ /dev/null
@@ -1,19 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ProtocolLabel;
-
-privileged aspect ProtocolLabel_Roo_JavaBean {
-    
-    public Protocol ProtocolLabel.getProtocol() {
-        return this.protocol;
-    }
-    
-    public void ProtocolLabel.setProtocol(Protocol protocol) {
-        this.protocol = protocol;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolLabel_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolLabel_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index ff48104bc..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolLabel_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,56 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolLabel;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ProtocolLabel_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ProtocolLabel.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "protocol");
-    
-    public static long ProtocolLabel.countProtocolLabels() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ProtocolLabel o", Long.class).getSingleResult();
-    }
-    
-    public static List<ProtocolLabel> ProtocolLabel.findAllProtocolLabels() {
-        return entityManager().createQuery("SELECT o FROM ProtocolLabel o", ProtocolLabel.class).getResultList();
-    }
-    
-    public static List<ProtocolLabel> ProtocolLabel.findAllProtocolLabels(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ProtocolLabel o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ProtocolLabel.class).getResultList();
-    }
-    
-    public static List<ProtocolLabel> ProtocolLabel.findProtocolLabelEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ProtocolLabel o", ProtocolLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ProtocolLabel> ProtocolLabel.findProtocolLabelEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ProtocolLabel o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ProtocolLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public ProtocolLabel ProtocolLabel.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ProtocolLabel merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolLabel_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolLabel_Roo_Jpa_Entity.aj
deleted file mode 100755
index bed25b72c..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolLabel_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,17 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolLabel;
-import javax.persistence.Entity;
-
-privileged aspect ProtocolLabel_Roo_Jpa_Entity {
-    
-    declare @type: ProtocolLabel: @Entity;
-    
-    public ProtocolLabel.new() {
-        super();
-    }
-
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolLabel_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolLabel_Roo_ToString.aj
deleted file mode 100755
index 9bdddd3d2..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolLabel_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolLabel;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ProtocolLabel_Roo_ToString {
-    
-    public String ProtocolLabel.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolState.java b/src/main/java/com/labsynch/labseer/domain/ProtocolState.java
index e702d88ce..5dbe07c92 100755
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ProtocolState.java
@@ -10,6 +10,7 @@
 import java.util.Set;
 
 import javax.persistence.CascadeType;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
@@ -20,6 +21,7 @@
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -32,6 +34,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -138,4 +142,135 @@ public static TypedQuery<ProtocolState> findProtocolStatesByProtocolCodeNameAndS
 		q.setParameter("ignored", true);
 		return q;
 	}
+
+	public Protocol getProtocol() {
+        return this.protocol;
+    }
+
+	public void setProtocol(Protocol protocol) {
+        this.protocol = protocol;
+    }
+
+	public Set<ProtocolValue> getLsValues() {
+        return this.lsValues;
+    }
+
+	public void setLsValues(Set<ProtocolValue> lsValues) {
+        this.lsValues = lsValues;
+    }
+
+	public static Long countFindProtocolStatesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = ProtocolState.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolState AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindProtocolStatesByProtocol(Protocol protocol) {
+        if (protocol == null) throw new IllegalArgumentException("The protocol argument is required");
+        EntityManager em = ProtocolState.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolState AS o WHERE o.protocol = :protocol", Long.class);
+        q.setParameter("protocol", protocol);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ProtocolState> findProtocolStatesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = ProtocolState.entityManager();
+        TypedQuery<ProtocolState> q = em.createQuery("SELECT o FROM ProtocolState AS o WHERE o.lsTransaction = :lsTransaction", ProtocolState.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<ProtocolState> findProtocolStatesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = ProtocolState.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolState AS o WHERE o.lsTransaction = :lsTransaction");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ProtocolState> q = em.createQuery(queryBuilder.toString(), ProtocolState.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<ProtocolState> findProtocolStatesByProtocol(Protocol protocol) {
+        if (protocol == null) throw new IllegalArgumentException("The protocol argument is required");
+        EntityManager em = ProtocolState.entityManager();
+        TypedQuery<ProtocolState> q = em.createQuery("SELECT o FROM ProtocolState AS o WHERE o.protocol = :protocol", ProtocolState.class);
+        q.setParameter("protocol", protocol);
+        return q;
+    }
+
+	public static TypedQuery<ProtocolState> findProtocolStatesByProtocol(Protocol protocol, String sortFieldName, String sortOrder) {
+        if (protocol == null) throw new IllegalArgumentException("The protocol argument is required");
+        EntityManager em = ProtocolState.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolState AS o WHERE o.protocol = :protocol");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ProtocolState> q = em.createQuery(queryBuilder.toString(), ProtocolState.class);
+        q.setParameter("protocol", protocol);
+        return q;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("protocol", "lsValues");
+
+	public static long countProtocolStates() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ProtocolState o", Long.class).getSingleResult();
+    }
+
+	public static List<ProtocolState> findAllProtocolStates() {
+        return entityManager().createQuery("SELECT o FROM ProtocolState o", ProtocolState.class).getResultList();
+    }
+
+	public static List<ProtocolState> findAllProtocolStates(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ProtocolState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ProtocolState.class).getResultList();
+    }
+
+	public static ProtocolState findProtocolState(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ProtocolState.class, id);
+    }
+
+	public static List<ProtocolState> findProtocolStateEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ProtocolState o", ProtocolState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ProtocolState> findProtocolStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ProtocolState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ProtocolState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public ProtocolState merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ProtocolState merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public ProtocolState() {
+        super();
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolState_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolState_Roo_Configurable.aj
deleted file mode 100755
index 0c19cd733..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolState_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolState;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ProtocolState_Roo_Configurable {
-    
-    declare @type: ProtocolState: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolState_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolState_Roo_Finder.aj
deleted file mode 100755
index dca81d33b..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolState_Roo_Finder.aj
+++ /dev/null
@@ -1,75 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ProtocolState;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ProtocolState_Roo_Finder {
-    
-    public static Long ProtocolState.countFindProtocolStatesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = ProtocolState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolState AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ProtocolState.countFindProtocolStatesByProtocol(Protocol protocol) {
-        if (protocol == null) throw new IllegalArgumentException("The protocol argument is required");
-        EntityManager em = ProtocolState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolState AS o WHERE o.protocol = :protocol", Long.class);
-        q.setParameter("protocol", protocol);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ProtocolState> ProtocolState.findProtocolStatesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = ProtocolState.entityManager();
-        TypedQuery<ProtocolState> q = em.createQuery("SELECT o FROM ProtocolState AS o WHERE o.lsTransaction = :lsTransaction", ProtocolState.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<ProtocolState> ProtocolState.findProtocolStatesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = ProtocolState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolState AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ProtocolState> q = em.createQuery(queryBuilder.toString(), ProtocolState.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<ProtocolState> ProtocolState.findProtocolStatesByProtocol(Protocol protocol) {
-        if (protocol == null) throw new IllegalArgumentException("The protocol argument is required");
-        EntityManager em = ProtocolState.entityManager();
-        TypedQuery<ProtocolState> q = em.createQuery("SELECT o FROM ProtocolState AS o WHERE o.protocol = :protocol", ProtocolState.class);
-        q.setParameter("protocol", protocol);
-        return q;
-    }
-    
-    public static TypedQuery<ProtocolState> ProtocolState.findProtocolStatesByProtocol(Protocol protocol, String sortFieldName, String sortOrder) {
-        if (protocol == null) throw new IllegalArgumentException("The protocol argument is required");
-        EntityManager em = ProtocolState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolState AS o WHERE o.protocol = :protocol");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ProtocolState> q = em.createQuery(queryBuilder.toString(), ProtocolState.class);
-        q.setParameter("protocol", protocol);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolState_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolState_Roo_JavaBean.aj
deleted file mode 100755
index 92a46cb92..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolState_Roo_JavaBean.aj
+++ /dev/null
@@ -1,29 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ProtocolState;
-import com.labsynch.labseer.domain.ProtocolValue;
-import java.util.Set;
-
-privileged aspect ProtocolState_Roo_JavaBean {
-    
-    public Protocol ProtocolState.getProtocol() {
-        return this.protocol;
-    }
-    
-    public void ProtocolState.setProtocol(Protocol protocol) {
-        this.protocol = protocol;
-    }
-    
-    public Set<ProtocolValue> ProtocolState.getLsValues() {
-        return this.lsValues;
-    }
-    
-    public void ProtocolState.setLsValues(Set<ProtocolValue> lsValues) {
-        this.lsValues = lsValues;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolState_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolState_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index b3933759d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolState_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolState;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ProtocolState_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ProtocolState.fieldNames4OrderClauseFilter = java.util.Arrays.asList("protocol", "lsValues");
-    
-    public static long ProtocolState.countProtocolStates() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ProtocolState o", Long.class).getSingleResult();
-    }
-    
-    public static List<ProtocolState> ProtocolState.findAllProtocolStates() {
-        return entityManager().createQuery("SELECT o FROM ProtocolState o", ProtocolState.class).getResultList();
-    }
-    
-    public static List<ProtocolState> ProtocolState.findAllProtocolStates(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ProtocolState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ProtocolState.class).getResultList();
-    }
-    
-    public static ProtocolState ProtocolState.findProtocolState(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ProtocolState.class, id);
-    }
-    
-    public static List<ProtocolState> ProtocolState.findProtocolStateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ProtocolState o", ProtocolState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ProtocolState> ProtocolState.findProtocolStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ProtocolState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ProtocolState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public ProtocolState ProtocolState.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ProtocolState merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolState_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolState_Roo_Jpa_Entity.aj
deleted file mode 100755
index 71a7ec5cc..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolState_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,17 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolState;
-import javax.persistence.Entity;
-
-privileged aspect ProtocolState_Roo_Jpa_Entity {
-    
-    declare @type: ProtocolState: @Entity;
-    
-    public ProtocolState.new() {
-        super();
-    }
-
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolType.java b/src/main/java/com/labsynch/labseer/domain/ProtocolType.java
index e92b341e7..8e7f07722 100755
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolType.java
+++ b/src/main/java/com/labsynch/labseer/domain/ProtocolType.java
@@ -1,20 +1,31 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.EntityManager;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
 @Entity
 @RooJavaBean
 @RooToString
@@ -52,4 +63,164 @@ public Integer getVersion() {
 	public void setVersion(Integer version) {
         this.version = version;
     }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName", "id", "version");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new ProtocolType().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countProtocolTypes() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ProtocolType o", Long.class).getSingleResult();
+    }
+
+	public static List<ProtocolType> findAllProtocolTypes() {
+        return entityManager().createQuery("SELECT o FROM ProtocolType o", ProtocolType.class).getResultList();
+    }
+
+	public static List<ProtocolType> findAllProtocolTypes(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ProtocolType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ProtocolType.class).getResultList();
+    }
+
+	public static ProtocolType findProtocolType(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ProtocolType.class, id);
+    }
+
+	public static List<ProtocolType> findProtocolTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ProtocolType o", ProtocolType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ProtocolType> findProtocolTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ProtocolType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ProtocolType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            ProtocolType attached = ProtocolType.findProtocolType(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public ProtocolType merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ProtocolType merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static Long countFindProtocolTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = ProtocolType.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolType AS o WHERE o.typeName = :typeName", Long.class);
+        q.setParameter("typeName", typeName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ProtocolType> findProtocolTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = ProtocolType.entityManager();
+        TypedQuery<ProtocolType> q = em.createQuery("SELECT o FROM ProtocolType AS o WHERE o.typeName = :typeName", ProtocolType.class);
+        q.setParameter("typeName", typeName);
+        return q;
+    }
+
+	public static TypedQuery<ProtocolType> findProtocolTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = ProtocolType.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolType AS o WHERE o.typeName = :typeName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ProtocolType> q = em.createQuery(queryBuilder.toString(), ProtocolType.class);
+        q.setParameter("typeName", typeName);
+        return q;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ProtocolType fromJsonToProtocolType(String json) {
+        return new JSONDeserializer<ProtocolType>()
+        .use(null, ProtocolType.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ProtocolType> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ProtocolType> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ProtocolType> fromJsonArrayToProtocolTypes(String json) {
+        return new JSONDeserializer<List<ProtocolType>>()
+        .use("values", ProtocolType.class).deserialize(json);
+    }
+
+	public String getTypeName() {
+        return this.typeName;
+    }
+
+	public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolType_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolType_Roo_Configurable.aj
deleted file mode 100755
index 3933b0955..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolType_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolType;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ProtocolType_Roo_Configurable {
-    
-    declare @type: ProtocolType: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolType_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolType_Roo_Finder.aj
deleted file mode 100755
index 105f7c733..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolType_Roo_Finder.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ProtocolType_Roo_Finder {
-    
-    public static Long ProtocolType.countFindProtocolTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = ProtocolType.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolType AS o WHERE o.typeName = :typeName", Long.class);
-        q.setParameter("typeName", typeName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ProtocolType> ProtocolType.findProtocolTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = ProtocolType.entityManager();
-        TypedQuery<ProtocolType> q = em.createQuery("SELECT o FROM ProtocolType AS o WHERE o.typeName = :typeName", ProtocolType.class);
-        q.setParameter("typeName", typeName);
-        return q;
-    }
-    
-    public static TypedQuery<ProtocolType> ProtocolType.findProtocolTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = ProtocolType.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolType AS o WHERE o.typeName = :typeName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ProtocolType> q = em.createQuery(queryBuilder.toString(), ProtocolType.class);
-        q.setParameter("typeName", typeName);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolType_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolType_Roo_JavaBean.aj
deleted file mode 100755
index 7ce4d2c56..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolType_Roo_JavaBean.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolType;
-
-privileged aspect ProtocolType_Roo_JavaBean {
-    
-    public String ProtocolType.getTypeName() {
-        return this.typeName;
-    }
-    
-    public void ProtocolType.setTypeName(String typeName) {
-        this.typeName = typeName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolType_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolType_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 470eee8f6..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolType_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolType;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ProtocolType_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager ProtocolType.entityManager;
-    
-    public static final List<String> ProtocolType.fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName", "id", "version");
-    
-    public static final EntityManager ProtocolType.entityManager() {
-        EntityManager em = new ProtocolType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long ProtocolType.countProtocolTypes() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ProtocolType o", Long.class).getSingleResult();
-    }
-    
-    public static List<ProtocolType> ProtocolType.findAllProtocolTypes() {
-        return entityManager().createQuery("SELECT o FROM ProtocolType o", ProtocolType.class).getResultList();
-    }
-    
-    public static List<ProtocolType> ProtocolType.findAllProtocolTypes(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ProtocolType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ProtocolType.class).getResultList();
-    }
-    
-    public static ProtocolType ProtocolType.findProtocolType(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ProtocolType.class, id);
-    }
-    
-    public static List<ProtocolType> ProtocolType.findProtocolTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ProtocolType o", ProtocolType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ProtocolType> ProtocolType.findProtocolTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ProtocolType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ProtocolType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void ProtocolType.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void ProtocolType.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            ProtocolType attached = ProtocolType.findProtocolType(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void ProtocolType.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void ProtocolType.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public ProtocolType ProtocolType.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ProtocolType merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolType_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolType_Roo_Json.aj
deleted file mode 100755
index 0ad25548a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolType_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolType;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ProtocolType_Roo_Json {
-    
-    public String ProtocolType.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ProtocolType.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ProtocolType ProtocolType.fromJsonToProtocolType(String json) {
-        return new JSONDeserializer<ProtocolType>()
-        .use(null, ProtocolType.class).deserialize(json);
-    }
-    
-    public static String ProtocolType.toJsonArray(Collection<ProtocolType> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ProtocolType.toJsonArray(Collection<ProtocolType> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ProtocolType> ProtocolType.fromJsonArrayToProtocolTypes(String json) {
-        return new JSONDeserializer<List<ProtocolType>>()
-        .use("values", ProtocolType.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolType_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolType_Roo_ToString.aj
deleted file mode 100755
index d380b5503..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolType_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolType;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ProtocolType_Roo_ToString {
-    
-    public String ProtocolType.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolValue.java b/src/main/java/com/labsynch/labseer/domain/ProtocolValue.java
index 81fe1f90a..204e7cdae 100755
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ProtocolValue.java
@@ -7,22 +7,27 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
-
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
-
+import org.springframework.transaction.annotation.Transactional;
 import com.labsynch.labseer.utils.CustomBigDecimalFactory;
 
 import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -164,4 +169,267 @@ public static TypedQuery<ProtocolValue> findProtocolValuesByLsKindEqualsAndDateV
 	        
 	        return q;
 	    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsState");
+
+	public static long countProtocolValues() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ProtocolValue o", Long.class).getSingleResult();
+    }
+
+	public static List<ProtocolValue> findAllProtocolValues() {
+        return entityManager().createQuery("SELECT o FROM ProtocolValue o", ProtocolValue.class).getResultList();
+    }
+
+	public static List<ProtocolValue> findAllProtocolValues(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ProtocolValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ProtocolValue.class).getResultList();
+    }
+
+	public static ProtocolValue findProtocolValue(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ProtocolValue.class, id);
+    }
+
+	public static List<ProtocolValue> findProtocolValueEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ProtocolValue o", ProtocolValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ProtocolValue> findProtocolValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ProtocolValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ProtocolValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public ProtocolValue merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ProtocolValue merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public ProtocolState getLsState() {
+        return this.lsState;
+    }
+
+	public void setLsState(ProtocolState lsState) {
+        this.lsState = lsState;
+    }
+
+	public static Long countFindProtocolValuesByLsKindEqualsAndCodeValueLike(String lsKind, String codeValue) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        codeValue = codeValue.replace('*', '%');
+        if (codeValue.charAt(0) != '%') {
+            codeValue = "%" + codeValue;
+        }
+        if (codeValue.charAt(codeValue.length() - 1) != '%') {
+            codeValue = codeValue + "%";
+        }
+        EntityManager em = ProtocolValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)", Long.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("codeValue", codeValue);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindProtocolValuesByLsKindEqualsAndStringValueLike(String lsKind, String stringValue) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+        stringValue = stringValue.replace('*', '%');
+        if (stringValue.charAt(0) != '%') {
+            stringValue = "%" + stringValue;
+        }
+        if (stringValue.charAt(stringValue.length() - 1) != '%') {
+            stringValue = stringValue + "%";
+        }
+        EntityManager em = ProtocolValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)", Long.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("stringValue", stringValue);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindProtocolValuesByLsState(ProtocolState lsState) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        EntityManager em = ProtocolValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolValue AS o WHERE o.lsState = :lsState", Long.class);
+        q.setParameter("lsState", lsState);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindProtocolValuesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = ProtocolValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolValue AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ProtocolValue> findProtocolValuesByLsKindEqualsAndCodeValueLike(String lsKind, String codeValue) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        codeValue = codeValue.replace('*', '%');
+        if (codeValue.charAt(0) != '%') {
+            codeValue = "%" + codeValue;
+        }
+        if (codeValue.charAt(codeValue.length() - 1) != '%') {
+            codeValue = codeValue + "%";
+        }
+        EntityManager em = ProtocolValue.entityManager();
+        TypedQuery<ProtocolValue> q = em.createQuery("SELECT o FROM ProtocolValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)", ProtocolValue.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("codeValue", codeValue);
+        return q;
+    }
+
+	public static TypedQuery<ProtocolValue> findProtocolValuesByLsKindEqualsAndCodeValueLike(String lsKind, String codeValue, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        codeValue = codeValue.replace('*', '%');
+        if (codeValue.charAt(0) != '%') {
+            codeValue = "%" + codeValue;
+        }
+        if (codeValue.charAt(codeValue.length() - 1) != '%') {
+            codeValue = codeValue + "%";
+        }
+        EntityManager em = ProtocolValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ProtocolValue> q = em.createQuery(queryBuilder.toString(), ProtocolValue.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("codeValue", codeValue);
+        return q;
+    }
+
+	public static TypedQuery<ProtocolValue> findProtocolValuesByLsKindEqualsAndStringValueLike(String lsKind, String stringValue) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+        stringValue = stringValue.replace('*', '%');
+        if (stringValue.charAt(0) != '%') {
+            stringValue = "%" + stringValue;
+        }
+        if (stringValue.charAt(stringValue.length() - 1) != '%') {
+            stringValue = stringValue + "%";
+        }
+        EntityManager em = ProtocolValue.entityManager();
+        TypedQuery<ProtocolValue> q = em.createQuery("SELECT o FROM ProtocolValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)", ProtocolValue.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("stringValue", stringValue);
+        return q;
+    }
+
+	public static TypedQuery<ProtocolValue> findProtocolValuesByLsKindEqualsAndStringValueLike(String lsKind, String stringValue, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+        stringValue = stringValue.replace('*', '%');
+        if (stringValue.charAt(0) != '%') {
+            stringValue = "%" + stringValue;
+        }
+        if (stringValue.charAt(stringValue.length() - 1) != '%') {
+            stringValue = stringValue + "%";
+        }
+        EntityManager em = ProtocolValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ProtocolValue> q = em.createQuery(queryBuilder.toString(), ProtocolValue.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("stringValue", stringValue);
+        return q;
+    }
+
+	public static TypedQuery<ProtocolValue> findProtocolValuesByLsState(ProtocolState lsState) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        EntityManager em = ProtocolValue.entityManager();
+        TypedQuery<ProtocolValue> q = em.createQuery("SELECT o FROM ProtocolValue AS o WHERE o.lsState = :lsState", ProtocolValue.class);
+        q.setParameter("lsState", lsState);
+        return q;
+    }
+
+	public static TypedQuery<ProtocolValue> findProtocolValuesByLsState(ProtocolState lsState, String sortFieldName, String sortOrder) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        EntityManager em = ProtocolValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolValue AS o WHERE o.lsState = :lsState");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ProtocolValue> q = em.createQuery(queryBuilder.toString(), ProtocolValue.class);
+        q.setParameter("lsState", lsState);
+        return q;
+    }
+
+	public static TypedQuery<ProtocolValue> findProtocolValuesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = ProtocolValue.entityManager();
+        TypedQuery<ProtocolValue> q = em.createQuery("SELECT o FROM ProtocolValue AS o WHERE o.lsTransaction = :lsTransaction", ProtocolValue.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<ProtocolValue> findProtocolValuesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = ProtocolValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolValue AS o WHERE o.lsTransaction = :lsTransaction");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ProtocolValue> q = em.createQuery(queryBuilder.toString(), ProtocolValue.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public ProtocolValue() {
+        super();
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static String toJsonArray(Collection<ProtocolValue> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ProtocolValue> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolValue_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolValue_Roo_Configurable.aj
deleted file mode 100755
index b8389c2ca..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolValue_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolValue;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ProtocolValue_Roo_Configurable {
-    
-    declare @type: ProtocolValue: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolValue_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolValue_Roo_Finder.aj
deleted file mode 100755
index 423fd4fb8..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolValue_Roo_Finder.aj
+++ /dev/null
@@ -1,191 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolState;
-import com.labsynch.labseer.domain.ProtocolValue;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ProtocolValue_Roo_Finder {
-    
-    public static Long ProtocolValue.countFindProtocolValuesByLsKindEqualsAndCodeValueLike(String lsKind, String codeValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        codeValue = codeValue.replace('*', '%');
-        if (codeValue.charAt(0) != '%') {
-            codeValue = "%" + codeValue;
-        }
-        if (codeValue.charAt(codeValue.length() - 1) != '%') {
-            codeValue = codeValue + "%";
-        }
-        EntityManager em = ProtocolValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)", Long.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("codeValue", codeValue);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ProtocolValue.countFindProtocolValuesByLsKindEqualsAndStringValueLike(String lsKind, String stringValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
-        stringValue = stringValue.replace('*', '%');
-        if (stringValue.charAt(0) != '%') {
-            stringValue = "%" + stringValue;
-        }
-        if (stringValue.charAt(stringValue.length() - 1) != '%') {
-            stringValue = stringValue + "%";
-        }
-        EntityManager em = ProtocolValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)", Long.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("stringValue", stringValue);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ProtocolValue.countFindProtocolValuesByLsState(ProtocolState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = ProtocolValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolValue AS o WHERE o.lsState = :lsState", Long.class);
-        q.setParameter("lsState", lsState);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ProtocolValue.countFindProtocolValuesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = ProtocolValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolValue AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ProtocolValue> ProtocolValue.findProtocolValuesByLsKindEqualsAndCodeValueLike(String lsKind, String codeValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        codeValue = codeValue.replace('*', '%');
-        if (codeValue.charAt(0) != '%') {
-            codeValue = "%" + codeValue;
-        }
-        if (codeValue.charAt(codeValue.length() - 1) != '%') {
-            codeValue = codeValue + "%";
-        }
-        EntityManager em = ProtocolValue.entityManager();
-        TypedQuery<ProtocolValue> q = em.createQuery("SELECT o FROM ProtocolValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)", ProtocolValue.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-    
-    public static TypedQuery<ProtocolValue> ProtocolValue.findProtocolValuesByLsKindEqualsAndCodeValueLike(String lsKind, String codeValue, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        codeValue = codeValue.replace('*', '%');
-        if (codeValue.charAt(0) != '%') {
-            codeValue = "%" + codeValue;
-        }
-        if (codeValue.charAt(codeValue.length() - 1) != '%') {
-            codeValue = codeValue + "%";
-        }
-        EntityManager em = ProtocolValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ProtocolValue> q = em.createQuery(queryBuilder.toString(), ProtocolValue.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-    
-    public static TypedQuery<ProtocolValue> ProtocolValue.findProtocolValuesByLsKindEqualsAndStringValueLike(String lsKind, String stringValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
-        stringValue = stringValue.replace('*', '%');
-        if (stringValue.charAt(0) != '%') {
-            stringValue = "%" + stringValue;
-        }
-        if (stringValue.charAt(stringValue.length() - 1) != '%') {
-            stringValue = stringValue + "%";
-        }
-        EntityManager em = ProtocolValue.entityManager();
-        TypedQuery<ProtocolValue> q = em.createQuery("SELECT o FROM ProtocolValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)", ProtocolValue.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("stringValue", stringValue);
-        return q;
-    }
-    
-    public static TypedQuery<ProtocolValue> ProtocolValue.findProtocolValuesByLsKindEqualsAndStringValueLike(String lsKind, String stringValue, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
-        stringValue = stringValue.replace('*', '%');
-        if (stringValue.charAt(0) != '%') {
-            stringValue = "%" + stringValue;
-        }
-        if (stringValue.charAt(stringValue.length() - 1) != '%') {
-            stringValue = stringValue + "%";
-        }
-        EntityManager em = ProtocolValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ProtocolValue> q = em.createQuery(queryBuilder.toString(), ProtocolValue.class);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("stringValue", stringValue);
-        return q;
-    }
-    
-    public static TypedQuery<ProtocolValue> ProtocolValue.findProtocolValuesByLsState(ProtocolState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = ProtocolValue.entityManager();
-        TypedQuery<ProtocolValue> q = em.createQuery("SELECT o FROM ProtocolValue AS o WHERE o.lsState = :lsState", ProtocolValue.class);
-        q.setParameter("lsState", lsState);
-        return q;
-    }
-    
-    public static TypedQuery<ProtocolValue> ProtocolValue.findProtocolValuesByLsState(ProtocolState lsState, String sortFieldName, String sortOrder) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = ProtocolValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolValue AS o WHERE o.lsState = :lsState");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ProtocolValue> q = em.createQuery(queryBuilder.toString(), ProtocolValue.class);
-        q.setParameter("lsState", lsState);
-        return q;
-    }
-    
-    public static TypedQuery<ProtocolValue> ProtocolValue.findProtocolValuesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = ProtocolValue.entityManager();
-        TypedQuery<ProtocolValue> q = em.createQuery("SELECT o FROM ProtocolValue AS o WHERE o.lsTransaction = :lsTransaction", ProtocolValue.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<ProtocolValue> ProtocolValue.findProtocolValuesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = ProtocolValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolValue AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ProtocolValue> q = em.createQuery(queryBuilder.toString(), ProtocolValue.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolValue_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolValue_Roo_JavaBean.aj
deleted file mode 100755
index 7dd0abb5e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolValue_Roo_JavaBean.aj
+++ /dev/null
@@ -1,19 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolState;
-import com.labsynch.labseer.domain.ProtocolValue;
-
-privileged aspect ProtocolValue_Roo_JavaBean {
-    
-    public ProtocolState ProtocolValue.getLsState() {
-        return this.lsState;
-    }
-    
-    public void ProtocolValue.setLsState(ProtocolState lsState) {
-        this.lsState = lsState;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolValue_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolValue_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index df22f9756..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolValue_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolValue;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ProtocolValue_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ProtocolValue.fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsState");
-    
-    public static long ProtocolValue.countProtocolValues() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ProtocolValue o", Long.class).getSingleResult();
-    }
-    
-    public static List<ProtocolValue> ProtocolValue.findAllProtocolValues() {
-        return entityManager().createQuery("SELECT o FROM ProtocolValue o", ProtocolValue.class).getResultList();
-    }
-    
-    public static List<ProtocolValue> ProtocolValue.findAllProtocolValues(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ProtocolValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ProtocolValue.class).getResultList();
-    }
-    
-    public static ProtocolValue ProtocolValue.findProtocolValue(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ProtocolValue.class, id);
-    }
-    
-    public static List<ProtocolValue> ProtocolValue.findProtocolValueEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ProtocolValue o", ProtocolValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ProtocolValue> ProtocolValue.findProtocolValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ProtocolValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ProtocolValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public ProtocolValue ProtocolValue.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ProtocolValue merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolValue_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolValue_Roo_Jpa_Entity.aj
deleted file mode 100755
index 64286d009..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolValue_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,17 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolValue;
-import javax.persistence.Entity;
-
-privileged aspect ProtocolValue_Roo_Jpa_Entity {
-    
-    declare @type: ProtocolValue: @Entity;
-    
-    public ProtocolValue.new() {
-        super();
-    }
-
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolValue_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolValue_Roo_Json.aj
deleted file mode 100755
index 6f6476781..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolValue_Roo_Json.aj
+++ /dev/null
@@ -1,32 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolValue;
-import flexjson.JSONSerializer;
-import java.util.Collection;
-
-privileged aspect ProtocolValue_Roo_Json {
-    
-    public String ProtocolValue.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ProtocolValue.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static String ProtocolValue.toJsonArray(Collection<ProtocolValue> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ProtocolValue.toJsonArray(Collection<ProtocolValue> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolValue_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ProtocolValue_Roo_ToString.aj
deleted file mode 100755
index e7788a58a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolValue_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolValue;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ProtocolValue_Roo_ToString {
-    
-    public String ProtocolValue.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Protocol_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/Protocol_Roo_Configurable.aj
deleted file mode 100755
index fd361efee..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Protocol_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Protocol;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect Protocol_Roo_Configurable {
-    
-    declare @type: Protocol: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Protocol_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/Protocol_Roo_Finder.aj
deleted file mode 100755
index d139f6a77..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Protocol_Roo_Finder.aj
+++ /dev/null
@@ -1,474 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Protocol;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect Protocol_Roo_Finder {
-    
-    public static Long Protocol.countFindProtocolsByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = Protocol.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE o.codeName = :codeName", Long.class);
-        q.setParameter("codeName", codeName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Protocol.countFindProtocolsByCodeNameEqualsAndIgnoredNot(String codeName, boolean ignored) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = Protocol.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE o.codeName = :codeName  AND o.ignored IS NOT :ignored", Long.class);
-        q.setParameter("codeName", codeName);
-        q.setParameter("ignored", ignored);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Protocol.countFindProtocolsByCodeNameLike(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        codeName = codeName.replace('*', '%');
-        if (codeName.charAt(0) != '%') {
-            codeName = "%" + codeName;
-        }
-        if (codeName.charAt(codeName.length() - 1) != '%') {
-            codeName = codeName + "%";
-        }
-        EntityManager em = Protocol.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)", Long.class);
-        q.setParameter("codeName", codeName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Protocol.countFindProtocolsByIgnoredNot(boolean ignored) {
-        EntityManager em = Protocol.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE o.ignored IS NOT :ignored", Long.class);
-        q.setParameter("ignored", ignored);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Protocol.countFindProtocolsByLsKindEquals(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = Protocol.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE o.lsKind = :lsKind", Long.class);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Protocol.countFindProtocolsByLsKindLike(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        lsKind = lsKind.replace('*', '%');
-        if (lsKind.charAt(0) != '%') {
-            lsKind = "%" + lsKind;
-        }
-        if (lsKind.charAt(lsKind.length() - 1) != '%') {
-            lsKind = lsKind + "%";
-        }
-        EntityManager em = Protocol.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)", Long.class);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Protocol.countFindProtocolsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = Protocol.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Protocol.countFindProtocolsByLsTypeAndKindEquals(String lsTypeAndKind) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
-        EntityManager em = Protocol.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", Long.class);
-        q.setParameter("lsTypeAndKind", lsTypeAndKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Protocol.countFindProtocolsByLsTypeEquals(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = Protocol.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE o.lsType = :lsType", Long.class);
-        q.setParameter("lsType", lsType);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Protocol.countFindProtocolsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = Protocol.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Protocol.countFindProtocolsByLsTypeLike(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        lsType = lsType.replace('*', '%');
-        if (lsType.charAt(0) != '%') {
-            lsType = "%" + lsType;
-        }
-        if (lsType.charAt(lsType.length() - 1) != '%') {
-            lsType = lsType + "%";
-        }
-        EntityManager em = Protocol.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE LOWER(o.lsType) LIKE LOWER(:lsType)", Long.class);
-        q.setParameter("lsType", lsType);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Protocol.countFindProtocolsByRecordedByLike(String recordedBy) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
-        recordedBy = recordedBy.replace('*', '%');
-        if (recordedBy.charAt(0) != '%') {
-            recordedBy = "%" + recordedBy;
-        }
-        if (recordedBy.charAt(recordedBy.length() - 1) != '%') {
-            recordedBy = recordedBy + "%";
-        }
-        EntityManager em = Protocol.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)", Long.class);
-        q.setParameter("recordedBy", recordedBy);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<Protocol> Protocol.findProtocolsByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = Protocol.entityManager();
-        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE o.codeName = :codeName", Protocol.class);
-        q.setParameter("codeName", codeName);
-        return q;
-    }
-    
-    public static TypedQuery<Protocol> Protocol.findProtocolsByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = Protocol.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE o.codeName = :codeName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Protocol> q = em.createQuery(queryBuilder.toString(), Protocol.class);
-        q.setParameter("codeName", codeName);
-        return q;
-    }
-    
-    public static TypedQuery<Protocol> Protocol.findProtocolsByCodeNameEqualsAndIgnoredNot(String codeName, boolean ignored) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = Protocol.entityManager();
-        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE o.codeName = :codeName  AND o.ignored IS NOT :ignored", Protocol.class);
-        q.setParameter("codeName", codeName);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<Protocol> Protocol.findProtocolsByCodeNameEqualsAndIgnoredNot(String codeName, boolean ignored, String sortFieldName, String sortOrder) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = Protocol.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE o.codeName = :codeName  AND o.ignored IS NOT :ignored");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Protocol> q = em.createQuery(queryBuilder.toString(), Protocol.class);
-        q.setParameter("codeName", codeName);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<Protocol> Protocol.findProtocolsByCodeNameLike(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        codeName = codeName.replace('*', '%');
-        if (codeName.charAt(0) != '%') {
-            codeName = "%" + codeName;
-        }
-        if (codeName.charAt(codeName.length() - 1) != '%') {
-            codeName = codeName + "%";
-        }
-        EntityManager em = Protocol.entityManager();
-        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)", Protocol.class);
-        q.setParameter("codeName", codeName);
-        return q;
-    }
-    
-    public static TypedQuery<Protocol> Protocol.findProtocolsByCodeNameLike(String codeName, String sortFieldName, String sortOrder) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        codeName = codeName.replace('*', '%');
-        if (codeName.charAt(0) != '%') {
-            codeName = "%" + codeName;
-        }
-        if (codeName.charAt(codeName.length() - 1) != '%') {
-            codeName = codeName + "%";
-        }
-        EntityManager em = Protocol.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Protocol> q = em.createQuery(queryBuilder.toString(), Protocol.class);
-        q.setParameter("codeName", codeName);
-        return q;
-    }
-    
-    public static TypedQuery<Protocol> Protocol.findProtocolsByIgnoredNot(boolean ignored) {
-        EntityManager em = Protocol.entityManager();
-        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE o.ignored IS NOT :ignored", Protocol.class);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<Protocol> Protocol.findProtocolsByIgnoredNot(boolean ignored, String sortFieldName, String sortOrder) {
-        EntityManager em = Protocol.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE o.ignored IS NOT :ignored");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Protocol> q = em.createQuery(queryBuilder.toString(), Protocol.class);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-    
-    public static TypedQuery<Protocol> Protocol.findProtocolsByLsKindEquals(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = Protocol.entityManager();
-        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE o.lsKind = :lsKind", Protocol.class);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<Protocol> Protocol.findProtocolsByLsKindEquals(String lsKind, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = Protocol.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Protocol> q = em.createQuery(queryBuilder.toString(), Protocol.class);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<Protocol> Protocol.findProtocolsByLsKindLike(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        lsKind = lsKind.replace('*', '%');
-        if (lsKind.charAt(0) != '%') {
-            lsKind = "%" + lsKind;
-        }
-        if (lsKind.charAt(lsKind.length() - 1) != '%') {
-            lsKind = lsKind + "%";
-        }
-        EntityManager em = Protocol.entityManager();
-        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)", Protocol.class);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<Protocol> Protocol.findProtocolsByLsKindLike(String lsKind, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        lsKind = lsKind.replace('*', '%');
-        if (lsKind.charAt(0) != '%') {
-            lsKind = "%" + lsKind;
-        }
-        if (lsKind.charAt(lsKind.length() - 1) != '%') {
-            lsKind = lsKind + "%";
-        }
-        EntityManager em = Protocol.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Protocol> q = em.createQuery(queryBuilder.toString(), Protocol.class);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<Protocol> Protocol.findProtocolsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = Protocol.entityManager();
-        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE o.lsTransaction = :lsTransaction", Protocol.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<Protocol> Protocol.findProtocolsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = Protocol.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Protocol> q = em.createQuery(queryBuilder.toString(), Protocol.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<Protocol> Protocol.findProtocolsByLsTypeAndKindEquals(String lsTypeAndKind) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
-        EntityManager em = Protocol.entityManager();
-        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", Protocol.class);
-        q.setParameter("lsTypeAndKind", lsTypeAndKind);
-        return q;
-    }
-    
-    public static TypedQuery<Protocol> Protocol.findProtocolsByLsTypeAndKindEquals(String lsTypeAndKind, String sortFieldName, String sortOrder) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
-        EntityManager em = Protocol.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE o.lsTypeAndKind = :lsTypeAndKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Protocol> q = em.createQuery(queryBuilder.toString(), Protocol.class);
-        q.setParameter("lsTypeAndKind", lsTypeAndKind);
-        return q;
-    }
-    
-    public static TypedQuery<Protocol> Protocol.findProtocolsByLsTypeEquals(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = Protocol.entityManager();
-        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE o.lsType = :lsType", Protocol.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<Protocol> Protocol.findProtocolsByLsTypeEquals(String lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = Protocol.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE o.lsType = :lsType");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Protocol> q = em.createQuery(queryBuilder.toString(), Protocol.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<Protocol> Protocol.findProtocolsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = Protocol.entityManager();
-        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Protocol.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<Protocol> Protocol.findProtocolsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = Protocol.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Protocol> q = em.createQuery(queryBuilder.toString(), Protocol.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<Protocol> Protocol.findProtocolsByLsTypeLike(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        lsType = lsType.replace('*', '%');
-        if (lsType.charAt(0) != '%') {
-            lsType = "%" + lsType;
-        }
-        if (lsType.charAt(lsType.length() - 1) != '%') {
-            lsType = lsType + "%";
-        }
-        EntityManager em = Protocol.entityManager();
-        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE LOWER(o.lsType) LIKE LOWER(:lsType)", Protocol.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<Protocol> Protocol.findProtocolsByLsTypeLike(String lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        lsType = lsType.replace('*', '%');
-        if (lsType.charAt(0) != '%') {
-            lsType = "%" + lsType;
-        }
-        if (lsType.charAt(lsType.length() - 1) != '%') {
-            lsType = lsType + "%";
-        }
-        EntityManager em = Protocol.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE LOWER(o.lsType) LIKE LOWER(:lsType)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Protocol> q = em.createQuery(queryBuilder.toString(), Protocol.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<Protocol> Protocol.findProtocolsByRecordedByLike(String recordedBy) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
-        recordedBy = recordedBy.replace('*', '%');
-        if (recordedBy.charAt(0) != '%') {
-            recordedBy = "%" + recordedBy;
-        }
-        if (recordedBy.charAt(recordedBy.length() - 1) != '%') {
-            recordedBy = recordedBy + "%";
-        }
-        EntityManager em = Protocol.entityManager();
-        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)", Protocol.class);
-        q.setParameter("recordedBy", recordedBy);
-        return q;
-    }
-    
-    public static TypedQuery<Protocol> Protocol.findProtocolsByRecordedByLike(String recordedBy, String sortFieldName, String sortOrder) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
-        recordedBy = recordedBy.replace('*', '%');
-        if (recordedBy.charAt(0) != '%') {
-            recordedBy = "%" + recordedBy;
-        }
-        if (recordedBy.charAt(recordedBy.length() - 1) != '%') {
-            recordedBy = recordedBy + "%";
-        }
-        EntityManager em = Protocol.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Protocol> q = em.createQuery(queryBuilder.toString(), Protocol.class);
-        q.setParameter("recordedBy", recordedBy);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Protocol_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/Protocol_Roo_JavaBean.aj
deleted file mode 100755
index 448c3c5b2..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Protocol_Roo_JavaBean.aj
+++ /dev/null
@@ -1,72 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ItxProtocolProtocol;
-import com.labsynch.labseer.domain.LsTag;
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ProtocolLabel;
-import com.labsynch.labseer.domain.ProtocolState;
-import java.util.Set;
-
-privileged aspect Protocol_Roo_JavaBean {
-    
-    public String Protocol.getShortDescription() {
-        return this.shortDescription;
-    }
-    
-    public void Protocol.setShortDescription(String shortDescription) {
-        this.shortDescription = shortDescription;
-    }
-    
-    public Set<ProtocolState> Protocol.getLsStates() {
-        return this.lsStates;
-    }
-    
-    public void Protocol.setLsStates(Set<ProtocolState> lsStates) {
-        this.lsStates = lsStates;
-    }
-    
-    public Set<Experiment> Protocol.getExperiments() {
-        return this.experiments;
-    }
-    
-    public void Protocol.setExperiments(Set<Experiment> experiments) {
-        this.experiments = experiments;
-    }
-    
-    public Set<ProtocolLabel> Protocol.getLsLabels() {
-        return this.lsLabels;
-    }
-    
-    public void Protocol.setLsLabels(Set<ProtocolLabel> lsLabels) {
-        this.lsLabels = lsLabels;
-    }
-    
-    public Set<LsTag> Protocol.getLsTags() {
-        return this.lsTags;
-    }
-    
-    public void Protocol.setLsTags(Set<LsTag> lsTags) {
-        this.lsTags = lsTags;
-    }
-    
-    public Set<ItxProtocolProtocol> Protocol.getFirstProtocols() {
-        return this.firstProtocols;
-    }
-    
-    public void Protocol.setFirstProtocols(Set<ItxProtocolProtocol> firstProtocols) {
-        this.firstProtocols = firstProtocols;
-    }
-    
-    public Set<ItxProtocolProtocol> Protocol.getSecondProtocols() {
-        return this.secondProtocols;
-    }
-    
-    public void Protocol.setSecondProtocols(Set<ItxProtocolProtocol> secondProtocols) {
-        this.secondProtocols = secondProtocols;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Protocol_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/Protocol_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 2a52ccb4d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Protocol_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,56 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Protocol;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect Protocol_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> Protocol.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "shortDescription", "lsStates", "experiments", "lsLabels", "lsTags", "firstProtocols", "secondProtocols");
-    
-    public static long Protocol.countProtocols() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM Protocol o", Long.class).getSingleResult();
-    }
-    
-    public static List<Protocol> Protocol.findAllProtocols() {
-        return entityManager().createQuery("SELECT o FROM Protocol o", Protocol.class).getResultList();
-    }
-    
-    public static List<Protocol> Protocol.findAllProtocols(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM Protocol o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, Protocol.class).getResultList();
-    }
-    
-    public static List<Protocol> Protocol.findProtocolEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM Protocol o", Protocol.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<Protocol> Protocol.findProtocolEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM Protocol o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, Protocol.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public Protocol Protocol.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        Protocol merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Protocol_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/Protocol_Roo_Jpa_Entity.aj
deleted file mode 100755
index a50240931..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Protocol_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Protocol;
-import javax.persistence.Entity;
-
-privileged aspect Protocol_Roo_Jpa_Entity {
-    
-    declare @type: Protocol: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Protocol_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/Protocol_Roo_ToString.aj
deleted file mode 100755
index 5872615d3..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Protocol_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Protocol;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect Protocol_Roo_ToString {
-    
-    public String Protocol.toString() {
-        return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).setExcludeFieldNames("lsTags", "lsStates", "experiments", "lsLabels").toString();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy.java b/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy.java
index b2e3d0af6..0d076e3b1 100755
--- a/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy.java
+++ b/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy.java
@@ -1,12 +1,30 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord(finders = { "findPurityMeasuredBysByCodeEquals", "findPurityMeasuredBysByNameEquals", "findPurityMeasuredBysByNameLike" })
@@ -19,4 +37,280 @@ public class PurityMeasuredBy {
 
     @Size(max = 255)
     private String code;
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static PurityMeasuredBy fromJsonToPurityMeasuredBy(String json) {
+        return new JSONDeserializer<PurityMeasuredBy>()
+        .use(null, PurityMeasuredBy.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<PurityMeasuredBy> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<PurityMeasuredBy> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<PurityMeasuredBy> fromJsonArrayToPurityMeasuredBys(String json) {
+        return new JSONDeserializer<List<PurityMeasuredBy>>()
+        .use("values", PurityMeasuredBy.class).deserialize(json);
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new PurityMeasuredBy().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countPurityMeasuredBys() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM PurityMeasuredBy o", Long.class).getSingleResult();
+    }
+
+	public static List<PurityMeasuredBy> findAllPurityMeasuredBys() {
+        return entityManager().createQuery("SELECT o FROM PurityMeasuredBy o", PurityMeasuredBy.class).getResultList();
+    }
+
+	public static List<PurityMeasuredBy> findAllPurityMeasuredBys(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM PurityMeasuredBy o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, PurityMeasuredBy.class).getResultList();
+    }
+
+	public static PurityMeasuredBy findPurityMeasuredBy(Long id) {
+        if (id == null) return null;
+        return entityManager().find(PurityMeasuredBy.class, id);
+    }
+
+	public static List<PurityMeasuredBy> findPurityMeasuredByEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM PurityMeasuredBy o", PurityMeasuredBy.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<PurityMeasuredBy> findPurityMeasuredByEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM PurityMeasuredBy o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, PurityMeasuredBy.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            PurityMeasuredBy attached = PurityMeasuredBy.findPurityMeasuredBy(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public PurityMeasuredBy merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        PurityMeasuredBy merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String getName() {
+        return this.name;
+    }
+
+	public void setName(String name) {
+        this.name = name;
+    }
+
+	public String getCode() {
+        return this.code;
+    }
+
+	public void setCode(String code) {
+        this.code = code;
+    }
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public static Long countFindPurityMeasuredBysByCodeEquals(String code) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = PurityMeasuredBy.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM PurityMeasuredBy AS o WHERE o.code = :code", Long.class);
+        q.setParameter("code", code);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindPurityMeasuredBysByNameEquals(String name) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = PurityMeasuredBy.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM PurityMeasuredBy AS o WHERE o.name = :name", Long.class);
+        q.setParameter("name", name);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindPurityMeasuredBysByNameLike(String name) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        name = name.replace('*', '%');
+        if (name.charAt(0) != '%') {
+            name = "%" + name;
+        }
+        if (name.charAt(name.length() - 1) != '%') {
+            name = name + "%";
+        }
+        EntityManager em = PurityMeasuredBy.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM PurityMeasuredBy AS o WHERE LOWER(o.name) LIKE LOWER(:name)", Long.class);
+        q.setParameter("name", name);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<PurityMeasuredBy> findPurityMeasuredBysByCodeEquals(String code) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = PurityMeasuredBy.entityManager();
+        TypedQuery<PurityMeasuredBy> q = em.createQuery("SELECT o FROM PurityMeasuredBy AS o WHERE o.code = :code", PurityMeasuredBy.class);
+        q.setParameter("code", code);
+        return q;
+    }
+
+	public static TypedQuery<PurityMeasuredBy> findPurityMeasuredBysByCodeEquals(String code, String sortFieldName, String sortOrder) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = PurityMeasuredBy.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM PurityMeasuredBy AS o WHERE o.code = :code");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<PurityMeasuredBy> q = em.createQuery(queryBuilder.toString(), PurityMeasuredBy.class);
+        q.setParameter("code", code);
+        return q;
+    }
+
+	public static TypedQuery<PurityMeasuredBy> findPurityMeasuredBysByNameEquals(String name) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = PurityMeasuredBy.entityManager();
+        TypedQuery<PurityMeasuredBy> q = em.createQuery("SELECT o FROM PurityMeasuredBy AS o WHERE o.name = :name", PurityMeasuredBy.class);
+        q.setParameter("name", name);
+        return q;
+    }
+
+	public static TypedQuery<PurityMeasuredBy> findPurityMeasuredBysByNameEquals(String name, String sortFieldName, String sortOrder) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = PurityMeasuredBy.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM PurityMeasuredBy AS o WHERE o.name = :name");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<PurityMeasuredBy> q = em.createQuery(queryBuilder.toString(), PurityMeasuredBy.class);
+        q.setParameter("name", name);
+        return q;
+    }
+
+	public static TypedQuery<PurityMeasuredBy> findPurityMeasuredBysByNameLike(String name) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        name = name.replace('*', '%');
+        if (name.charAt(0) != '%') {
+            name = "%" + name;
+        }
+        if (name.charAt(name.length() - 1) != '%') {
+            name = name + "%";
+        }
+        EntityManager em = PurityMeasuredBy.entityManager();
+        TypedQuery<PurityMeasuredBy> q = em.createQuery("SELECT o FROM PurityMeasuredBy AS o WHERE LOWER(o.name) LIKE LOWER(:name)", PurityMeasuredBy.class);
+        q.setParameter("name", name);
+        return q;
+    }
+
+	public static TypedQuery<PurityMeasuredBy> findPurityMeasuredBysByNameLike(String name, String sortFieldName, String sortOrder) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        name = name.replace('*', '%');
+        if (name.charAt(0) != '%') {
+            name = "%" + name;
+        }
+        if (name.charAt(name.length() - 1) != '%') {
+            name = name + "%";
+        }
+        EntityManager em = PurityMeasuredBy.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM PurityMeasuredBy AS o WHERE LOWER(o.name) LIKE LOWER(:name)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<PurityMeasuredBy> q = em.createQuery(queryBuilder.toString(), PurityMeasuredBy.class);
+        q.setParameter("name", name);
+        return q;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy_Roo_Configurable.aj
deleted file mode 100644
index 4a37328cf..000000000
--- a/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.PurityMeasuredBy;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect PurityMeasuredBy_Roo_Configurable {
-    
-    declare @type: PurityMeasuredBy: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy_Roo_Finder.aj
deleted file mode 100644
index 3b82bfb2a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy_Roo_Finder.aj
+++ /dev/null
@@ -1,126 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.PurityMeasuredBy;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect PurityMeasuredBy_Roo_Finder {
-    
-    public static Long PurityMeasuredBy.countFindPurityMeasuredBysByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = PurityMeasuredBy.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM PurityMeasuredBy AS o WHERE o.code = :code", Long.class);
-        q.setParameter("code", code);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long PurityMeasuredBy.countFindPurityMeasuredBysByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = PurityMeasuredBy.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM PurityMeasuredBy AS o WHERE o.name = :name", Long.class);
-        q.setParameter("name", name);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long PurityMeasuredBy.countFindPurityMeasuredBysByNameLike(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        name = name.replace('*', '%');
-        if (name.charAt(0) != '%') {
-            name = "%" + name;
-        }
-        if (name.charAt(name.length() - 1) != '%') {
-            name = name + "%";
-        }
-        EntityManager em = PurityMeasuredBy.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM PurityMeasuredBy AS o WHERE LOWER(o.name) LIKE LOWER(:name)", Long.class);
-        q.setParameter("name", name);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<PurityMeasuredBy> PurityMeasuredBy.findPurityMeasuredBysByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = PurityMeasuredBy.entityManager();
-        TypedQuery<PurityMeasuredBy> q = em.createQuery("SELECT o FROM PurityMeasuredBy AS o WHERE o.code = :code", PurityMeasuredBy.class);
-        q.setParameter("code", code);
-        return q;
-    }
-    
-    public static TypedQuery<PurityMeasuredBy> PurityMeasuredBy.findPurityMeasuredBysByCodeEquals(String code, String sortFieldName, String sortOrder) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = PurityMeasuredBy.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM PurityMeasuredBy AS o WHERE o.code = :code");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<PurityMeasuredBy> q = em.createQuery(queryBuilder.toString(), PurityMeasuredBy.class);
-        q.setParameter("code", code);
-        return q;
-    }
-    
-    public static TypedQuery<PurityMeasuredBy> PurityMeasuredBy.findPurityMeasuredBysByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = PurityMeasuredBy.entityManager();
-        TypedQuery<PurityMeasuredBy> q = em.createQuery("SELECT o FROM PurityMeasuredBy AS o WHERE o.name = :name", PurityMeasuredBy.class);
-        q.setParameter("name", name);
-        return q;
-    }
-    
-    public static TypedQuery<PurityMeasuredBy> PurityMeasuredBy.findPurityMeasuredBysByNameEquals(String name, String sortFieldName, String sortOrder) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = PurityMeasuredBy.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM PurityMeasuredBy AS o WHERE o.name = :name");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<PurityMeasuredBy> q = em.createQuery(queryBuilder.toString(), PurityMeasuredBy.class);
-        q.setParameter("name", name);
-        return q;
-    }
-    
-    public static TypedQuery<PurityMeasuredBy> PurityMeasuredBy.findPurityMeasuredBysByNameLike(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        name = name.replace('*', '%');
-        if (name.charAt(0) != '%') {
-            name = "%" + name;
-        }
-        if (name.charAt(name.length() - 1) != '%') {
-            name = name + "%";
-        }
-        EntityManager em = PurityMeasuredBy.entityManager();
-        TypedQuery<PurityMeasuredBy> q = em.createQuery("SELECT o FROM PurityMeasuredBy AS o WHERE LOWER(o.name) LIKE LOWER(:name)", PurityMeasuredBy.class);
-        q.setParameter("name", name);
-        return q;
-    }
-    
-    public static TypedQuery<PurityMeasuredBy> PurityMeasuredBy.findPurityMeasuredBysByNameLike(String name, String sortFieldName, String sortOrder) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        name = name.replace('*', '%');
-        if (name.charAt(0) != '%') {
-            name = "%" + name;
-        }
-        if (name.charAt(name.length() - 1) != '%') {
-            name = name + "%";
-        }
-        EntityManager em = PurityMeasuredBy.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM PurityMeasuredBy AS o WHERE LOWER(o.name) LIKE LOWER(:name)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<PurityMeasuredBy> q = em.createQuery(queryBuilder.toString(), PurityMeasuredBy.class);
-        q.setParameter("name", name);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy_Roo_JavaBean.aj
deleted file mode 100644
index 283b50a75..000000000
--- a/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.PurityMeasuredBy;
-
-privileged aspect PurityMeasuredBy_Roo_JavaBean {
-    
-    public String PurityMeasuredBy.getName() {
-        return this.name;
-    }
-    
-    public void PurityMeasuredBy.setName(String name) {
-        this.name = name;
-    }
-    
-    public String PurityMeasuredBy.getCode() {
-        return this.code;
-    }
-    
-    public void PurityMeasuredBy.setCode(String code) {
-        this.code = code;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 2482e9aee..000000000
--- a/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.PurityMeasuredBy;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect PurityMeasuredBy_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager PurityMeasuredBy.entityManager;
-    
-    public static final List<String> PurityMeasuredBy.fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
-    
-    public static final EntityManager PurityMeasuredBy.entityManager() {
-        EntityManager em = new PurityMeasuredBy().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long PurityMeasuredBy.countPurityMeasuredBys() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM PurityMeasuredBy o", Long.class).getSingleResult();
-    }
-    
-    public static List<PurityMeasuredBy> PurityMeasuredBy.findAllPurityMeasuredBys() {
-        return entityManager().createQuery("SELECT o FROM PurityMeasuredBy o", PurityMeasuredBy.class).getResultList();
-    }
-    
-    public static List<PurityMeasuredBy> PurityMeasuredBy.findAllPurityMeasuredBys(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM PurityMeasuredBy o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, PurityMeasuredBy.class).getResultList();
-    }
-    
-    public static PurityMeasuredBy PurityMeasuredBy.findPurityMeasuredBy(Long id) {
-        if (id == null) return null;
-        return entityManager().find(PurityMeasuredBy.class, id);
-    }
-    
-    public static List<PurityMeasuredBy> PurityMeasuredBy.findPurityMeasuredByEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM PurityMeasuredBy o", PurityMeasuredBy.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<PurityMeasuredBy> PurityMeasuredBy.findPurityMeasuredByEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM PurityMeasuredBy o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, PurityMeasuredBy.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void PurityMeasuredBy.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void PurityMeasuredBy.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            PurityMeasuredBy attached = PurityMeasuredBy.findPurityMeasuredBy(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void PurityMeasuredBy.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void PurityMeasuredBy.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public PurityMeasuredBy PurityMeasuredBy.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        PurityMeasuredBy merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy_Roo_Jpa_Entity.aj
deleted file mode 100644
index 41fae42b5..000000000
--- a/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.PurityMeasuredBy;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect PurityMeasuredBy_Roo_Jpa_Entity {
-    
-    declare @type: PurityMeasuredBy: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long PurityMeasuredBy.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer PurityMeasuredBy.version;
-    
-    public Long PurityMeasuredBy.getId() {
-        return this.id;
-    }
-    
-    public void PurityMeasuredBy.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer PurityMeasuredBy.getVersion() {
-        return this.version;
-    }
-    
-    public void PurityMeasuredBy.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy_Roo_Json.aj
deleted file mode 100644
index da09e2c7f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.PurityMeasuredBy;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect PurityMeasuredBy_Roo_Json {
-    
-    public String PurityMeasuredBy.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String PurityMeasuredBy.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static PurityMeasuredBy PurityMeasuredBy.fromJsonToPurityMeasuredBy(String json) {
-        return new JSONDeserializer<PurityMeasuredBy>()
-        .use(null, PurityMeasuredBy.class).deserialize(json);
-    }
-    
-    public static String PurityMeasuredBy.toJsonArray(Collection<PurityMeasuredBy> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String PurityMeasuredBy.toJsonArray(Collection<PurityMeasuredBy> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<PurityMeasuredBy> PurityMeasuredBy.fromJsonArrayToPurityMeasuredBys(String json) {
-        return new JSONDeserializer<List<PurityMeasuredBy>>()
-        .use("values", PurityMeasuredBy.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy_Roo_ToString.aj
deleted file mode 100644
index a0f31fbf6..000000000
--- a/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.PurityMeasuredBy;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect PurityMeasuredBy_Roo_ToString {
-    
-    public String PurityMeasuredBy.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/RegSearch.java b/src/main/java/com/labsynch/labseer/domain/RegSearch.java
index bb8755cb4..d840dad89 100755
--- a/src/main/java/com/labsynch/labseer/domain/RegSearch.java
+++ b/src/main/java/com/labsynch/labseer/domain/RegSearch.java
@@ -1,7 +1,12 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 import javax.persistence.Lob;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -18,4 +23,54 @@ public class RegSearch {
     //@Size(max = 10485760)
     private String molStructure;
 
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static RegSearch fromJsonToRegSearch(String json) {
+        return new JSONDeserializer<RegSearch>()
+        .use(null, RegSearch.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<RegSearch> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<RegSearch> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<RegSearch> fromJsonArrayToRegSearches(String json) {
+        return new JSONDeserializer<List<RegSearch>>()
+        .use("values", RegSearch.class).deserialize(json);
+    }
+
+	public String getCorpName() {
+        return this.corpName;
+    }
+
+	public void setCorpName(String corpName) {
+        this.corpName = corpName;
+    }
+
+	public String getMolStructure() {
+        return this.molStructure;
+    }
+
+	public void setMolStructure(String molStructure) {
+        this.molStructure = molStructure;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/RegSearch_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/RegSearch_Roo_JavaBean.aj
deleted file mode 100644
index e207cac44..000000000
--- a/src/main/java/com/labsynch/labseer/domain/RegSearch_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.RegSearch;
-
-privileged aspect RegSearch_Roo_JavaBean {
-    
-    public String RegSearch.getCorpName() {
-        return this.corpName;
-    }
-    
-    public void RegSearch.setCorpName(String corpName) {
-        this.corpName = corpName;
-    }
-    
-    public String RegSearch.getMolStructure() {
-        return this.molStructure;
-    }
-    
-    public void RegSearch.setMolStructure(String molStructure) {
-        this.molStructure = molStructure;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/RegSearch_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/RegSearch_Roo_Json.aj
deleted file mode 100644
index 0a84e4714..000000000
--- a/src/main/java/com/labsynch/labseer/domain/RegSearch_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.RegSearch;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect RegSearch_Roo_Json {
-    
-    public String RegSearch.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String RegSearch.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static RegSearch RegSearch.fromJsonToRegSearch(String json) {
-        return new JSONDeserializer<RegSearch>()
-        .use(null, RegSearch.class).deserialize(json);
-    }
-    
-    public static String RegSearch.toJsonArray(Collection<RegSearch> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String RegSearch.toJsonArray(Collection<RegSearch> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<RegSearch> RegSearch.fromJsonArrayToRegSearches(String json) {
-        return new JSONDeserializer<List<RegSearch>>()
-        .use("values", RegSearch.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/RegSearch_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/RegSearch_Roo_ToString.aj
deleted file mode 100644
index e1f24947f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/RegSearch_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.RegSearch;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect RegSearch_Roo_ToString {
-    
-    public String RegSearch.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/RoleKind.java b/src/main/java/com/labsynch/labseer/domain/RoleKind.java
index 820ce9b65..197569bd6 100644
--- a/src/main/java/com/labsynch/labseer/domain/RoleKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/RoleKind.java
@@ -1,11 +1,26 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.PersistenceContext;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -13,6 +28,8 @@
 import org.springframework.transaction.annotation.Transactional;
 
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord(sequenceName = "ROLE_KIND_PKSEQ", finders={"findRoleKindsByLsType", 
@@ -40,4 +57,237 @@ public void persist() {
 		this.entityManager.persist(this);
 	}
  
+
+	public RoleType getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(RoleType lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getKindName() {
+        return this.kindName;
+    }
+
+	public void setKindName(String kindName) {
+        this.kindName = kindName;
+    }
+
+	public String getLsTypeAndKind() {
+        return this.lsTypeAndKind;
+    }
+
+	public void setLsTypeAndKind(String lsTypeAndKind) {
+        this.lsTypeAndKind = lsTypeAndKind;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static RoleKind fromJsonToRoleKind(String json) {
+        return new JSONDeserializer<RoleKind>()
+        .use(null, RoleKind.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<RoleKind> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<RoleKind> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<RoleKind> fromJsonArrayToRoleKinds(String json) {
+        return new JSONDeserializer<List<RoleKind>>()
+        .use("values", RoleKind.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName", "lsTypeAndKind");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new RoleKind().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countRoleKinds() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM RoleKind o", Long.class).getSingleResult();
+    }
+
+	public static List<RoleKind> findAllRoleKinds() {
+        return entityManager().createQuery("SELECT o FROM RoleKind o", RoleKind.class).getResultList();
+    }
+
+	public static List<RoleKind> findAllRoleKinds(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM RoleKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, RoleKind.class).getResultList();
+    }
+
+	public static RoleKind findRoleKind(Long id) {
+        if (id == null) return null;
+        return entityManager().find(RoleKind.class, id);
+    }
+
+	public static List<RoleKind> findRoleKindEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM RoleKind o", RoleKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<RoleKind> findRoleKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM RoleKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, RoleKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            RoleKind attached = RoleKind.findRoleKind(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public RoleKind merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        RoleKind merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public static Long countFindRoleKindsByKindNameEqualsAndLsType(String kindName, RoleType lsType) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = RoleKind.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM RoleKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindRoleKindsByLsType(RoleType lsType) {
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = RoleKind.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM RoleKind AS o WHERE o.lsType = :lsType", Long.class);
+        q.setParameter("lsType", lsType);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<RoleKind> findRoleKindsByKindNameEqualsAndLsType(String kindName, RoleType lsType) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = RoleKind.entityManager();
+        TypedQuery<RoleKind> q = em.createQuery("SELECT o FROM RoleKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", RoleKind.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<RoleKind> findRoleKindsByKindNameEqualsAndLsType(String kindName, RoleType lsType, String sortFieldName, String sortOrder) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = RoleKind.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM RoleKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<RoleKind> q = em.createQuery(queryBuilder.toString(), RoleKind.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<RoleKind> findRoleKindsByLsType(RoleType lsType) {
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = RoleKind.entityManager();
+        TypedQuery<RoleKind> q = em.createQuery("SELECT o FROM RoleKind AS o WHERE o.lsType = :lsType", RoleKind.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<RoleKind> findRoleKindsByLsType(RoleType lsType, String sortFieldName, String sortOrder) {
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = RoleKind.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM RoleKind AS o WHERE o.lsType = :lsType");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<RoleKind> q = em.createQuery(queryBuilder.toString(), RoleKind.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	@Id
+    @SequenceGenerator(name = "roleKindGen", sequenceName = "ROLE_KIND_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "roleKindGen")
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/RoleKind_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/RoleKind_Roo_Configurable.aj
deleted file mode 100644
index 39e597268..000000000
--- a/src/main/java/com/labsynch/labseer/domain/RoleKind_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.RoleKind;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect RoleKind_Roo_Configurable {
-    
-    declare @type: RoleKind: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/RoleKind_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/RoleKind_Roo_Finder.aj
deleted file mode 100644
index 4d33d51dc..000000000
--- a/src/main/java/com/labsynch/labseer/domain/RoleKind_Roo_Finder.aj
+++ /dev/null
@@ -1,81 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.RoleKind;
-import com.labsynch.labseer.domain.RoleType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect RoleKind_Roo_Finder {
-    
-    public static Long RoleKind.countFindRoleKindsByKindNameEqualsAndLsType(String kindName, RoleType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = RoleKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM RoleKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long RoleKind.countFindRoleKindsByLsType(RoleType lsType) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = RoleKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM RoleKind AS o WHERE o.lsType = :lsType", Long.class);
-        q.setParameter("lsType", lsType);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<RoleKind> RoleKind.findRoleKindsByKindNameEqualsAndLsType(String kindName, RoleType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = RoleKind.entityManager();
-        TypedQuery<RoleKind> q = em.createQuery("SELECT o FROM RoleKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", RoleKind.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<RoleKind> RoleKind.findRoleKindsByKindNameEqualsAndLsType(String kindName, RoleType lsType, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = RoleKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM RoleKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<RoleKind> q = em.createQuery(queryBuilder.toString(), RoleKind.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<RoleKind> RoleKind.findRoleKindsByLsType(RoleType lsType) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = RoleKind.entityManager();
-        TypedQuery<RoleKind> q = em.createQuery("SELECT o FROM RoleKind AS o WHERE o.lsType = :lsType", RoleKind.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<RoleKind> RoleKind.findRoleKindsByLsType(RoleType lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = RoleKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM RoleKind AS o WHERE o.lsType = :lsType");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<RoleKind> q = em.createQuery(queryBuilder.toString(), RoleKind.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/RoleKind_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/RoleKind_Roo_JavaBean.aj
deleted file mode 100644
index 7be1eb553..000000000
--- a/src/main/java/com/labsynch/labseer/domain/RoleKind_Roo_JavaBean.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.RoleKind;
-import com.labsynch.labseer.domain.RoleType;
-
-privileged aspect RoleKind_Roo_JavaBean {
-    
-    public RoleType RoleKind.getLsType() {
-        return this.lsType;
-    }
-    
-    public void RoleKind.setLsType(RoleType lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String RoleKind.getKindName() {
-        return this.kindName;
-    }
-    
-    public void RoleKind.setKindName(String kindName) {
-        this.kindName = kindName;
-    }
-    
-    public String RoleKind.getLsTypeAndKind() {
-        return this.lsTypeAndKind;
-    }
-    
-    public void RoleKind.setLsTypeAndKind(String lsTypeAndKind) {
-        this.lsTypeAndKind = lsTypeAndKind;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/RoleKind_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/RoleKind_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index ee8707fee..000000000
--- a/src/main/java/com/labsynch/labseer/domain/RoleKind_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,95 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.RoleKind;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect RoleKind_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager RoleKind.entityManager;
-    
-    public static final List<String> RoleKind.fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName", "lsTypeAndKind");
-    
-    public static final EntityManager RoleKind.entityManager() {
-        EntityManager em = new RoleKind().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long RoleKind.countRoleKinds() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM RoleKind o", Long.class).getSingleResult();
-    }
-    
-    public static List<RoleKind> RoleKind.findAllRoleKinds() {
-        return entityManager().createQuery("SELECT o FROM RoleKind o", RoleKind.class).getResultList();
-    }
-    
-    public static List<RoleKind> RoleKind.findAllRoleKinds(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM RoleKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, RoleKind.class).getResultList();
-    }
-    
-    public static RoleKind RoleKind.findRoleKind(Long id) {
-        if (id == null) return null;
-        return entityManager().find(RoleKind.class, id);
-    }
-    
-    public static List<RoleKind> RoleKind.findRoleKindEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM RoleKind o", RoleKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<RoleKind> RoleKind.findRoleKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM RoleKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, RoleKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void RoleKind.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            RoleKind attached = RoleKind.findRoleKind(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void RoleKind.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void RoleKind.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public RoleKind RoleKind.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        RoleKind merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/RoleKind_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/RoleKind_Roo_Jpa_Entity.aj
deleted file mode 100644
index 3a78febde..000000000
--- a/src/main/java/com/labsynch/labseer/domain/RoleKind_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.RoleKind;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
-
-privileged aspect RoleKind_Roo_Jpa_Entity {
-    
-    declare @type: RoleKind: @Entity;
-    
-    @Id
-    @SequenceGenerator(name = "roleKindGen", sequenceName = "ROLE_KIND_PKSEQ")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "roleKindGen")
-    @Column(name = "id")
-    private Long RoleKind.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer RoleKind.version;
-    
-    public Long RoleKind.getId() {
-        return this.id;
-    }
-    
-    public void RoleKind.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer RoleKind.getVersion() {
-        return this.version;
-    }
-    
-    public void RoleKind.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/RoleKind_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/RoleKind_Roo_Json.aj
deleted file mode 100644
index 80637fd63..000000000
--- a/src/main/java/com/labsynch/labseer/domain/RoleKind_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.RoleKind;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect RoleKind_Roo_Json {
-    
-    public String RoleKind.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String RoleKind.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static RoleKind RoleKind.fromJsonToRoleKind(String json) {
-        return new JSONDeserializer<RoleKind>()
-        .use(null, RoleKind.class).deserialize(json);
-    }
-    
-    public static String RoleKind.toJsonArray(Collection<RoleKind> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String RoleKind.toJsonArray(Collection<RoleKind> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<RoleKind> RoleKind.fromJsonArrayToRoleKinds(String json) {
-        return new JSONDeserializer<List<RoleKind>>()
-        .use("values", RoleKind.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/RoleKind_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/RoleKind_Roo_ToString.aj
deleted file mode 100644
index 80237400d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/RoleKind_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.RoleKind;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect RoleKind_Roo_ToString {
-    
-    public String RoleKind.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/RoleType.java b/src/main/java/com/labsynch/labseer/domain/RoleType.java
index 71217f0f0..41d0be087 100644
--- a/src/main/java/com/labsynch/labseer/domain/RoleType.java
+++ b/src/main/java/com/labsynch/labseer/domain/RoleType.java
@@ -1,14 +1,32 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord(sequenceName = "ROLE_TYPE_PKSEQ", finders = { "findRoleTypesByTypeNameEquals" })
@@ -20,4 +38,190 @@ public class RoleType {
     @Size(max = 128)
     private String typeName;
     
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static RoleType fromJsonToRoleType(String json) {
+        return new JSONDeserializer<RoleType>()
+        .use(null, RoleType.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<RoleType> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<RoleType> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<RoleType> fromJsonArrayToRoleTypes(String json) {
+        return new JSONDeserializer<List<RoleType>>()
+        .use("values", RoleType.class).deserialize(json);
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new RoleType().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countRoleTypes() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM RoleType o", Long.class).getSingleResult();
+    }
+
+	public static List<RoleType> findAllRoleTypes() {
+        return entityManager().createQuery("SELECT o FROM RoleType o", RoleType.class).getResultList();
+    }
+
+	public static List<RoleType> findAllRoleTypes(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM RoleType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, RoleType.class).getResultList();
+    }
+
+	public static RoleType findRoleType(Long id) {
+        if (id == null) return null;
+        return entityManager().find(RoleType.class, id);
+    }
+
+	public static List<RoleType> findRoleTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM RoleType o", RoleType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<RoleType> findRoleTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM RoleType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, RoleType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            RoleType attached = RoleType.findRoleType(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public RoleType merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        RoleType merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String getTypeName() {
+        return this.typeName;
+    }
+
+	public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+	@Id
+    @SequenceGenerator(name = "roleTypeGen", sequenceName = "ROLE_TYPE_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "roleTypeGen")
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public static Long countFindRoleTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = RoleType.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM RoleType AS o WHERE o.typeName = :typeName", Long.class);
+        q.setParameter("typeName", typeName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<RoleType> findRoleTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = RoleType.entityManager();
+        TypedQuery<RoleType> q = em.createQuery("SELECT o FROM RoleType AS o WHERE o.typeName = :typeName", RoleType.class);
+        q.setParameter("typeName", typeName);
+        return q;
+    }
+
+	public static TypedQuery<RoleType> findRoleTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = RoleType.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM RoleType AS o WHERE o.typeName = :typeName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<RoleType> q = em.createQuery(queryBuilder.toString(), RoleType.class);
+        q.setParameter("typeName", typeName);
+        return q;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/RoleType_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/RoleType_Roo_Configurable.aj
deleted file mode 100644
index ad9bb949a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/RoleType_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.RoleType;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect RoleType_Roo_Configurable {
-    
-    declare @type: RoleType: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/RoleType_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/RoleType_Roo_Finder.aj
deleted file mode 100644
index 468bf7dba..000000000
--- a/src/main/java/com/labsynch/labseer/domain/RoleType_Roo_Finder.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.RoleType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect RoleType_Roo_Finder {
-    
-    public static Long RoleType.countFindRoleTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = RoleType.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM RoleType AS o WHERE o.typeName = :typeName", Long.class);
-        q.setParameter("typeName", typeName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<RoleType> RoleType.findRoleTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = RoleType.entityManager();
-        TypedQuery<RoleType> q = em.createQuery("SELECT o FROM RoleType AS o WHERE o.typeName = :typeName", RoleType.class);
-        q.setParameter("typeName", typeName);
-        return q;
-    }
-    
-    public static TypedQuery<RoleType> RoleType.findRoleTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = RoleType.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM RoleType AS o WHERE o.typeName = :typeName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<RoleType> q = em.createQuery(queryBuilder.toString(), RoleType.class);
-        q.setParameter("typeName", typeName);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/RoleType_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/RoleType_Roo_JavaBean.aj
deleted file mode 100644
index 05b429c20..000000000
--- a/src/main/java/com/labsynch/labseer/domain/RoleType_Roo_JavaBean.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.RoleType;
-
-privileged aspect RoleType_Roo_JavaBean {
-    
-    public String RoleType.getTypeName() {
-        return this.typeName;
-    }
-    
-    public void RoleType.setTypeName(String typeName) {
-        this.typeName = typeName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/RoleType_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/RoleType_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index e95d45f48..000000000
--- a/src/main/java/com/labsynch/labseer/domain/RoleType_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.RoleType;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect RoleType_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager RoleType.entityManager;
-    
-    public static final List<String> RoleType.fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName");
-    
-    public static final EntityManager RoleType.entityManager() {
-        EntityManager em = new RoleType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long RoleType.countRoleTypes() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM RoleType o", Long.class).getSingleResult();
-    }
-    
-    public static List<RoleType> RoleType.findAllRoleTypes() {
-        return entityManager().createQuery("SELECT o FROM RoleType o", RoleType.class).getResultList();
-    }
-    
-    public static List<RoleType> RoleType.findAllRoleTypes(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM RoleType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, RoleType.class).getResultList();
-    }
-    
-    public static RoleType RoleType.findRoleType(Long id) {
-        if (id == null) return null;
-        return entityManager().find(RoleType.class, id);
-    }
-    
-    public static List<RoleType> RoleType.findRoleTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM RoleType o", RoleType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<RoleType> RoleType.findRoleTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM RoleType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, RoleType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void RoleType.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void RoleType.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            RoleType attached = RoleType.findRoleType(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void RoleType.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void RoleType.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public RoleType RoleType.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        RoleType merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/RoleType_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/RoleType_Roo_Jpa_Entity.aj
deleted file mode 100644
index ebfd68f52..000000000
--- a/src/main/java/com/labsynch/labseer/domain/RoleType_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.RoleType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
-
-privileged aspect RoleType_Roo_Jpa_Entity {
-    
-    declare @type: RoleType: @Entity;
-    
-    @Id
-    @SequenceGenerator(name = "roleTypeGen", sequenceName = "ROLE_TYPE_PKSEQ")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "roleTypeGen")
-    @Column(name = "id")
-    private Long RoleType.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer RoleType.version;
-    
-    public Long RoleType.getId() {
-        return this.id;
-    }
-    
-    public void RoleType.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer RoleType.getVersion() {
-        return this.version;
-    }
-    
-    public void RoleType.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/RoleType_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/RoleType_Roo_Json.aj
deleted file mode 100644
index 74ad6cf49..000000000
--- a/src/main/java/com/labsynch/labseer/domain/RoleType_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.RoleType;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect RoleType_Roo_Json {
-    
-    public String RoleType.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String RoleType.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static RoleType RoleType.fromJsonToRoleType(String json) {
-        return new JSONDeserializer<RoleType>()
-        .use(null, RoleType.class).deserialize(json);
-    }
-    
-    public static String RoleType.toJsonArray(Collection<RoleType> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String RoleType.toJsonArray(Collection<RoleType> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<RoleType> RoleType.fromJsonArrayToRoleTypes(String json) {
-        return new JSONDeserializer<List<RoleType>>()
-        .use("values", RoleType.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/RoleType_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/RoleType_Roo_ToString.aj
deleted file mode 100644
index ee7239d6a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/RoleType_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.RoleType;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect RoleType_Roo_ToString {
-    
-    public String RoleType.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Salt.java b/src/main/java/com/labsynch/labseer/domain/Salt.java
index ae5156337..b4da84879 100755
--- a/src/main/java/com/labsynch/labseer/domain/Salt.java
+++ b/src/main/java/com/labsynch/labseer/domain/Salt.java
@@ -1,24 +1,37 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.Lob;
+import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @Transactional
 @RooJavaBean
 @RooToString
@@ -117,4 +130,353 @@ public static TypedQuery<Salt> findSaltsByNameEquals(String name) {
         TypedQuery<Salt> q = em.createQuery(criteria);
         return q;
     }
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public static Long countFindSaltsByAbbrevEquals(String abbrev) {
+        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
+        EntityManager em = Salt.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Salt AS o WHERE o.abbrev = :abbrev", Long.class);
+        q.setParameter("abbrev", abbrev);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindSaltsByAbbrevEqualsAndNameEquals(String abbrev, String name) {
+        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = Salt.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Salt AS o WHERE o.abbrev = :abbrev  AND o.name = :name", Long.class);
+        q.setParameter("abbrev", abbrev);
+        q.setParameter("name", name);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindSaltsByAbbrevLike(String abbrev) {
+        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
+        abbrev = abbrev.replace('*', '%');
+        if (abbrev.charAt(0) != '%') {
+            abbrev = "%" + abbrev;
+        }
+        if (abbrev.charAt(abbrev.length() - 1) != '%') {
+            abbrev = abbrev + "%";
+        }
+        EntityManager em = Salt.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Salt AS o WHERE LOWER(o.abbrev) LIKE LOWER(:abbrev)", Long.class);
+        q.setParameter("abbrev", abbrev);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindSaltsByCdId(int cdId) {
+        EntityManager em = Salt.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Salt AS o WHERE o.cdId = :cdId", Long.class);
+        q.setParameter("cdId", cdId);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindSaltsByNameEquals(String name) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = Salt.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Salt AS o WHERE o.name = :name", Long.class);
+        q.setParameter("name", name);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<Salt> findSaltsByAbbrevEquals(String abbrev, String sortFieldName, String sortOrder) {
+        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
+        EntityManager em = Salt.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Salt AS o WHERE o.abbrev = :abbrev");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Salt> q = em.createQuery(queryBuilder.toString(), Salt.class);
+        q.setParameter("abbrev", abbrev);
+        return q;
+    }
+
+	public static TypedQuery<Salt> findSaltsByAbbrevEqualsAndNameEquals(String abbrev, String name, String sortFieldName, String sortOrder) {
+        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = Salt.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Salt AS o WHERE o.abbrev = :abbrev  AND o.name = :name");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Salt> q = em.createQuery(queryBuilder.toString(), Salt.class);
+        q.setParameter("abbrev", abbrev);
+        q.setParameter("name", name);
+        return q;
+    }
+
+	public static TypedQuery<Salt> findSaltsByAbbrevLike(String abbrev, String sortFieldName, String sortOrder) {
+        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
+        abbrev = abbrev.replace('*', '%');
+        if (abbrev.charAt(0) != '%') {
+            abbrev = "%" + abbrev;
+        }
+        if (abbrev.charAt(abbrev.length() - 1) != '%') {
+            abbrev = abbrev + "%";
+        }
+        EntityManager em = Salt.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Salt AS o WHERE LOWER(o.abbrev) LIKE LOWER(:abbrev)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Salt> q = em.createQuery(queryBuilder.toString(), Salt.class);
+        q.setParameter("abbrev", abbrev);
+        return q;
+    }
+
+	public static TypedQuery<Salt> findSaltsByCdId(int cdId, String sortFieldName, String sortOrder) {
+        EntityManager em = Salt.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Salt AS o WHERE o.cdId = :cdId");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Salt> q = em.createQuery(queryBuilder.toString(), Salt.class);
+        q.setParameter("cdId", cdId);
+        return q;
+    }
+
+	public static TypedQuery<Salt> findSaltsByNameEquals(String name, String sortFieldName, String sortOrder) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = Salt.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Salt AS o WHERE o.name = :name");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Salt> q = em.createQuery(queryBuilder.toString(), Salt.class);
+        q.setParameter("name", name);
+        return q;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("molStructure", "name", "originalStructure", "abbrev", "molWeight", "formula", "cdId", "ignore", "charge");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new Salt().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countSalts() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM Salt o", Long.class).getSingleResult();
+    }
+
+	public static List<Salt> findAllSalts() {
+        return entityManager().createQuery("SELECT o FROM Salt o", Salt.class).getResultList();
+    }
+
+	public static List<Salt> findAllSalts(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM Salt o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, Salt.class).getResultList();
+    }
+
+	public static Salt findSalt(Long id) {
+        if (id == null) return null;
+        return entityManager().find(Salt.class, id);
+    }
+
+	public static List<Salt> findSaltEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM Salt o", Salt.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<Salt> findSaltEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM Salt o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, Salt.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            Salt attached = Salt.findSalt(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public Salt merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        Salt merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String getMolStructure() {
+        return this.molStructure;
+    }
+
+	public void setMolStructure(String molStructure) {
+        this.molStructure = molStructure;
+    }
+
+	public String getName() {
+        return this.name;
+    }
+
+	public void setName(String name) {
+        this.name = name;
+    }
+
+	public String getOriginalStructure() {
+        return this.originalStructure;
+    }
+
+	public void setOriginalStructure(String originalStructure) {
+        this.originalStructure = originalStructure;
+    }
+
+	public String getAbbrev() {
+        return this.abbrev;
+    }
+
+	public void setAbbrev(String abbrev) {
+        this.abbrev = abbrev;
+    }
+
+	public Double getMolWeight() {
+        return this.molWeight;
+    }
+
+	public void setMolWeight(Double molWeight) {
+        this.molWeight = molWeight;
+    }
+
+	public String getFormula() {
+        return this.formula;
+    }
+
+	public void setFormula(String formula) {
+        this.formula = formula;
+    }
+
+	public int getCdId() {
+        return this.cdId;
+    }
+
+	public void setCdId(int cdId) {
+        this.cdId = cdId;
+    }
+
+	public Boolean getIgnore() {
+        return this.ignore;
+    }
+
+	public void setIgnore(Boolean ignore) {
+        this.ignore = ignore;
+    }
+
+	public int getCharge() {
+        return this.charge;
+    }
+
+	public void setCharge(int charge) {
+        this.charge = charge;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static Salt fromJsonToSalt(String json) {
+        return new JSONDeserializer<Salt>()
+        .use(null, Salt.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<Salt> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<Salt> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<Salt> fromJsonArrayToSalts(String json) {
+        return new JSONDeserializer<List<Salt>>()
+        .use("values", Salt.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltForm.java b/src/main/java/com/labsynch/labseer/domain/SaltForm.java
index 1f13d4743..688f43add 100755
--- a/src/main/java/com/labsynch/labseer/domain/SaltForm.java
+++ b/src/main/java/com/labsynch/labseer/domain/SaltForm.java
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
@@ -9,15 +10,21 @@
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
+import javax.persistence.PersistenceContext;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Join;
@@ -26,9 +33,11 @@
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
@@ -37,7 +46,11 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.dto.SearchFormDTO;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
+@Entity
+@Configurable
 @Transactional
 @RooJavaBean
 @RooToString
@@ -550,4 +563,400 @@ else if ( this.getId() < salt2 )
             return 0;
 	}
 
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static SaltForm fromJsonToSaltForm(String json) {
+        return new JSONDeserializer<SaltForm>()
+        .use(null, SaltForm.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<SaltForm> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<SaltForm> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<SaltForm> fromJsonArrayToSaltForms(String json) {
+        return new JSONDeserializer<List<SaltForm>>()
+        .use("values", SaltForm.class).deserialize(json);
+    }
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new SaltForm().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static List<SaltForm> findAllSaltForms(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM SaltForm o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, SaltForm.class).getResultList();
+    }
+
+	public static List<SaltForm> findSaltFormEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM SaltForm o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, SaltForm.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            SaltForm attached = SaltForm.findSaltForm(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public SaltForm merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        SaltForm merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String getMolStructure() {
+        return this.molStructure;
+    }
+
+	public void setMolStructure(String molStructure) {
+        this.molStructure = molStructure;
+    }
+
+	public String getCorpName() {
+        return this.corpName;
+    }
+
+	public void setCorpName(String corpName) {
+        this.corpName = corpName;
+    }
+
+	public String getCasNumber() {
+        return this.casNumber;
+    }
+
+	public void setCasNumber(String casNumber) {
+        this.casNumber = casNumber;
+    }
+
+	public String getChemist() {
+        return this.chemist;
+    }
+
+	public void setChemist(String chemist) {
+        this.chemist = chemist;
+    }
+
+	public Date getRegistrationDate() {
+        return this.registrationDate;
+    }
+
+	public void setRegistrationDate(Date registrationDate) {
+        this.registrationDate = registrationDate;
+    }
+
+	public int getCdId() {
+        return this.CdId;
+    }
+
+	public void setCdId(int CdId) {
+        this.CdId = CdId;
+    }
+
+	public Boolean getIgnore() {
+        return this.ignore;
+    }
+
+	public void setIgnore(Boolean ignore) {
+        this.ignore = ignore;
+    }
+
+	public Double getSaltWeight() {
+        return this.saltWeight;
+    }
+
+	public void setSaltWeight(Double saltWeight) {
+        this.saltWeight = saltWeight;
+    }
+
+	public Parent getParent() {
+        return this.parent;
+    }
+
+	public void setParent(Parent parent) {
+        this.parent = parent;
+    }
+
+	public Set<Lot> getLots() {
+        return this.lots;
+    }
+
+	public void setLots(Set<Lot> lots) {
+        this.lots = lots;
+    }
+
+	public Set<IsoSalt> getIsoSalts() {
+        return this.isoSalts;
+    }
+
+	public void setIsoSalts(Set<IsoSalt> isoSalts) {
+        this.isoSalts = isoSalts;
+    }
+
+	public BulkLoadFile getBulkLoadFile() {
+        return this.bulkLoadFile;
+    }
+
+	public void setBulkLoadFile(BulkLoadFile bulkLoadFile) {
+        this.bulkLoadFile = bulkLoadFile;
+    }
+
+	public static Long countFindSaltFormsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile) {
+        if (bulkLoadFile == null) throw new IllegalArgumentException("The bulkLoadFile argument is required");
+        EntityManager em = SaltForm.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SaltForm AS o WHERE o.bulkLoadFile = :bulkLoadFile", Long.class);
+        q.setParameter("bulkLoadFile", bulkLoadFile);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindSaltFormsByCdId(int CdId) {
+        EntityManager em = SaltForm.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SaltForm AS o WHERE o.CdId = :CdId", Long.class);
+        q.setParameter("CdId", CdId);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindSaltFormsByCorpNameEquals(String corpName) {
+        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+        EntityManager em = SaltForm.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SaltForm AS o WHERE o.corpName = :corpName", Long.class);
+        q.setParameter("corpName", corpName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindSaltFormsByCorpNameLike(String corpName) {
+        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+        corpName = corpName.replace('*', '%');
+        if (corpName.charAt(0) != '%') {
+            corpName = "%" + corpName;
+        }
+        if (corpName.charAt(corpName.length() - 1) != '%') {
+            corpName = corpName + "%";
+        }
+        EntityManager em = SaltForm.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SaltForm AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)", Long.class);
+        q.setParameter("corpName", corpName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindSaltFormsByParent(Parent parent) {
+        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
+        EntityManager em = SaltForm.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SaltForm AS o WHERE o.parent = :parent", Long.class);
+        q.setParameter("parent", parent);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<SaltForm> findSaltFormsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile) {
+        if (bulkLoadFile == null) throw new IllegalArgumentException("The bulkLoadFile argument is required");
+        EntityManager em = SaltForm.entityManager();
+        TypedQuery<SaltForm> q = em.createQuery("SELECT o FROM SaltForm AS o WHERE o.bulkLoadFile = :bulkLoadFile", SaltForm.class);
+        q.setParameter("bulkLoadFile", bulkLoadFile);
+        return q;
+    }
+
+	public static TypedQuery<SaltForm> findSaltFormsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile, String sortFieldName, String sortOrder) {
+        if (bulkLoadFile == null) throw new IllegalArgumentException("The bulkLoadFile argument is required");
+        EntityManager em = SaltForm.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SaltForm AS o WHERE o.bulkLoadFile = :bulkLoadFile");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<SaltForm> q = em.createQuery(queryBuilder.toString(), SaltForm.class);
+        q.setParameter("bulkLoadFile", bulkLoadFile);
+        return q;
+    }
+
+	public static TypedQuery<SaltForm> findSaltFormsByCdId(int CdId) {
+        EntityManager em = SaltForm.entityManager();
+        TypedQuery<SaltForm> q = em.createQuery("SELECT o FROM SaltForm AS o WHERE o.CdId = :CdId", SaltForm.class);
+        q.setParameter("CdId", CdId);
+        return q;
+    }
+
+	public static TypedQuery<SaltForm> findSaltFormsByCdId(int CdId, String sortFieldName, String sortOrder) {
+        EntityManager em = SaltForm.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SaltForm AS o WHERE o.CdId = :CdId");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<SaltForm> q = em.createQuery(queryBuilder.toString(), SaltForm.class);
+        q.setParameter("CdId", CdId);
+        return q;
+    }
+
+	public static TypedQuery<SaltForm> findSaltFormsByCorpNameEquals(String corpName) {
+        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+        EntityManager em = SaltForm.entityManager();
+        TypedQuery<SaltForm> q = em.createQuery("SELECT o FROM SaltForm AS o WHERE o.corpName = :corpName", SaltForm.class);
+        q.setParameter("corpName", corpName);
+        return q;
+    }
+
+	public static TypedQuery<SaltForm> findSaltFormsByCorpNameEquals(String corpName, String sortFieldName, String sortOrder) {
+        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+        EntityManager em = SaltForm.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SaltForm AS o WHERE o.corpName = :corpName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<SaltForm> q = em.createQuery(queryBuilder.toString(), SaltForm.class);
+        q.setParameter("corpName", corpName);
+        return q;
+    }
+
+	public static TypedQuery<SaltForm> findSaltFormsByCorpNameLike(String corpName) {
+        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+        corpName = corpName.replace('*', '%');
+        if (corpName.charAt(0) != '%') {
+            corpName = "%" + corpName;
+        }
+        if (corpName.charAt(corpName.length() - 1) != '%') {
+            corpName = corpName + "%";
+        }
+        EntityManager em = SaltForm.entityManager();
+        TypedQuery<SaltForm> q = em.createQuery("SELECT o FROM SaltForm AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)", SaltForm.class);
+        q.setParameter("corpName", corpName);
+        return q;
+    }
+
+	public static TypedQuery<SaltForm> findSaltFormsByCorpNameLike(String corpName, String sortFieldName, String sortOrder) {
+        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+        corpName = corpName.replace('*', '%');
+        if (corpName.charAt(0) != '%') {
+            corpName = "%" + corpName;
+        }
+        if (corpName.charAt(corpName.length() - 1) != '%') {
+            corpName = corpName + "%";
+        }
+        EntityManager em = SaltForm.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SaltForm AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<SaltForm> q = em.createQuery(queryBuilder.toString(), SaltForm.class);
+        q.setParameter("corpName", corpName);
+        return q;
+    }
+
+	public static TypedQuery<SaltForm> findSaltFormsByParent(Parent parent) {
+        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
+        EntityManager em = SaltForm.entityManager();
+        TypedQuery<SaltForm> q = em.createQuery("SELECT o FROM SaltForm AS o WHERE o.parent = :parent", SaltForm.class);
+        q.setParameter("parent", parent);
+        return q;
+    }
+
+	public static TypedQuery<SaltForm> findSaltFormsByParent(Parent parent, String sortFieldName, String sortOrder) {
+        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
+        EntityManager em = SaltForm.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SaltForm AS o WHERE o.parent = :parent");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<SaltForm> q = em.createQuery(queryBuilder.toString(), SaltForm.class);
+        q.setParameter("parent", parent);
+        return q;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAlias.java b/src/main/java/com/labsynch/labseer/domain/SaltFormAlias.java
index 4015023e7..1e3b152a9 100644
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAlias.java
+++ b/src/main/java/com/labsynch/labseer/domain/SaltFormAlias.java
@@ -1,19 +1,36 @@
 package com.labsynch.labseer.domain;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+import javax.persistence.Version;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
-
+import org.springframework.transaction.annotation.Transactional;
 import com.labsynch.labseer.dto.SaltFormAliasDTO;
 import com.labsynch.labseer.exceptions.ParentNotFoundException;
 import com.labsynch.labseer.exceptions.SaltFormNotFoundException;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -63,4 +80,280 @@ public SaltFormAlias(SaltFormAliasDTO saltFormAliasDTO) throws SaltFormNotFoundE
 		this.aliasName = saltFormAliasDTO.getAliasName();
 		this.preferred = saltFormAliasDTO.isPreferred();
 	}
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static SaltFormAlias fromJsonToSaltFormAlias(String json) {
+        return new JSONDeserializer<SaltFormAlias>()
+        .use(null, SaltFormAlias.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<SaltFormAlias> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<SaltFormAlias> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<SaltFormAlias> fromJsonArrayToSaltFormAliases(String json) {
+        return new JSONDeserializer<List<SaltFormAlias>>()
+        .use("values", SaltFormAlias.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static Long countFindSaltFormAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName, String lsType, String lsKind) {
+        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = SaltFormAlias.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SaltFormAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        q.setParameter("aliasName", aliasName);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindSaltFormAliasesBySaltForm(SaltForm saltForm) {
+        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
+        EntityManager em = SaltFormAlias.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SaltFormAlias AS o WHERE o.saltForm = :saltForm", Long.class);
+        q.setParameter("saltForm", saltForm);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<SaltFormAlias> findSaltFormAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName, String lsType, String lsKind) {
+        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = SaltFormAlias.entityManager();
+        TypedQuery<SaltFormAlias> q = em.createQuery("SELECT o FROM SaltFormAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind", SaltFormAlias.class);
+        q.setParameter("aliasName", aliasName);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<SaltFormAlias> findSaltFormAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName, String lsType, String lsKind, String sortFieldName, String sortOrder) {
+        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = SaltFormAlias.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SaltFormAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<SaltFormAlias> q = em.createQuery(queryBuilder.toString(), SaltFormAlias.class);
+        q.setParameter("aliasName", aliasName);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<SaltFormAlias> findSaltFormAliasesBySaltForm(SaltForm saltForm) {
+        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
+        EntityManager em = SaltFormAlias.entityManager();
+        TypedQuery<SaltFormAlias> q = em.createQuery("SELECT o FROM SaltFormAlias AS o WHERE o.saltForm = :saltForm", SaltFormAlias.class);
+        q.setParameter("saltForm", saltForm);
+        return q;
+    }
+
+	public static TypedQuery<SaltFormAlias> findSaltFormAliasesBySaltForm(SaltForm saltForm, String sortFieldName, String sortOrder) {
+        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
+        EntityManager em = SaltFormAlias.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SaltFormAlias AS o WHERE o.saltForm = :saltForm");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<SaltFormAlias> q = em.createQuery(queryBuilder.toString(), SaltFormAlias.class);
+        q.setParameter("saltForm", saltForm);
+        return q;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "saltForm", "lsType", "lsKind", "aliasName", "preferred", "ignored", "deleted");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new SaltFormAlias().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countSaltFormAliases() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM SaltFormAlias o", Long.class).getSingleResult();
+    }
+
+	public static List<SaltFormAlias> findAllSaltFormAliases() {
+        return entityManager().createQuery("SELECT o FROM SaltFormAlias o", SaltFormAlias.class).getResultList();
+    }
+
+	public static List<SaltFormAlias> findAllSaltFormAliases(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM SaltFormAlias o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, SaltFormAlias.class).getResultList();
+    }
+
+	public static SaltFormAlias findSaltFormAlias(Long id) {
+        if (id == null) return null;
+        return entityManager().find(SaltFormAlias.class, id);
+    }
+
+	public static List<SaltFormAlias> findSaltFormAliasEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM SaltFormAlias o", SaltFormAlias.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<SaltFormAlias> findSaltFormAliasEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM SaltFormAlias o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, SaltFormAlias.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            SaltFormAlias attached = SaltFormAlias.findSaltFormAlias(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public SaltFormAlias merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        SaltFormAlias merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public SaltForm getSaltForm() {
+        return this.saltForm;
+    }
+
+	public void setSaltForm(SaltForm saltForm) {
+        this.saltForm = saltForm;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getAliasName() {
+        return this.aliasName;
+    }
+
+	public void setAliasName(String aliasName) {
+        this.aliasName = aliasName;
+    }
+
+	public boolean isPreferred() {
+        return this.preferred;
+    }
+
+	public void setPreferred(boolean preferred) {
+        this.preferred = preferred;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public boolean isDeleted() {
+        return this.deleted;
+    }
+
+	public void setDeleted(boolean deleted) {
+        this.deleted = deleted;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind.java b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind.java
index 4596f12e8..57e48a474 100644
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind.java
@@ -1,15 +1,32 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -24,4 +41,166 @@ public class SaltFormAliasKind {
     @Size(max = 255)
     private String kindName;
     
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new SaltFormAliasKind().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countSaltFormAliasKinds() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM SaltFormAliasKind o", Long.class).getSingleResult();
+    }
+
+	public static List<SaltFormAliasKind> findAllSaltFormAliasKinds() {
+        return entityManager().createQuery("SELECT o FROM SaltFormAliasKind o", SaltFormAliasKind.class).getResultList();
+    }
+
+	public static List<SaltFormAliasKind> findAllSaltFormAliasKinds(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM SaltFormAliasKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, SaltFormAliasKind.class).getResultList();
+    }
+
+	public static SaltFormAliasKind findSaltFormAliasKind(Long id) {
+        if (id == null) return null;
+        return entityManager().find(SaltFormAliasKind.class, id);
+    }
+
+	public static List<SaltFormAliasKind> findSaltFormAliasKindEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM SaltFormAliasKind o", SaltFormAliasKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<SaltFormAliasKind> findSaltFormAliasKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM SaltFormAliasKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, SaltFormAliasKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            SaltFormAliasKind attached = SaltFormAliasKind.findSaltFormAliasKind(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public SaltFormAliasKind merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        SaltFormAliasKind merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static SaltFormAliasKind fromJsonToSaltFormAliasKind(String json) {
+        return new JSONDeserializer<SaltFormAliasKind>()
+        .use(null, SaltFormAliasKind.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<SaltFormAliasKind> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<SaltFormAliasKind> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<SaltFormAliasKind> fromJsonArrayToSaltFormAliasKinds(String json) {
+        return new JSONDeserializer<List<SaltFormAliasKind>>()
+        .use("values", SaltFormAliasKind.class).deserialize(json);
+    }
+
+	public SaltFormAliasType getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(SaltFormAliasType lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getKindName() {
+        return this.kindName;
+    }
+
+	public void setKindName(String kindName) {
+        this.kindName = kindName;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind_Roo_Configurable.aj
deleted file mode 100644
index d159811ee..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SaltFormAliasKind;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect SaltFormAliasKind_Roo_Configurable {
-    
-    declare @type: SaltFormAliasKind: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind_Roo_JavaBean.aj
deleted file mode 100644
index 20d9f7684..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind_Roo_JavaBean.aj
+++ /dev/null
@@ -1,27 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SaltFormAliasKind;
-import com.labsynch.labseer.domain.SaltFormAliasType;
-
-privileged aspect SaltFormAliasKind_Roo_JavaBean {
-    
-    public SaltFormAliasType SaltFormAliasKind.getLsType() {
-        return this.lsType;
-    }
-    
-    public void SaltFormAliasKind.setLsType(SaltFormAliasType lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String SaltFormAliasKind.getKindName() {
-        return this.kindName;
-    }
-    
-    public void SaltFormAliasKind.setKindName(String kindName) {
-        this.kindName = kindName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 8e8bb66cd..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SaltFormAliasKind;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect SaltFormAliasKind_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager SaltFormAliasKind.entityManager;
-    
-    public static final List<String> SaltFormAliasKind.fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName");
-    
-    public static final EntityManager SaltFormAliasKind.entityManager() {
-        EntityManager em = new SaltFormAliasKind().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long SaltFormAliasKind.countSaltFormAliasKinds() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM SaltFormAliasKind o", Long.class).getSingleResult();
-    }
-    
-    public static List<SaltFormAliasKind> SaltFormAliasKind.findAllSaltFormAliasKinds() {
-        return entityManager().createQuery("SELECT o FROM SaltFormAliasKind o", SaltFormAliasKind.class).getResultList();
-    }
-    
-    public static List<SaltFormAliasKind> SaltFormAliasKind.findAllSaltFormAliasKinds(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM SaltFormAliasKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, SaltFormAliasKind.class).getResultList();
-    }
-    
-    public static SaltFormAliasKind SaltFormAliasKind.findSaltFormAliasKind(Long id) {
-        if (id == null) return null;
-        return entityManager().find(SaltFormAliasKind.class, id);
-    }
-    
-    public static List<SaltFormAliasKind> SaltFormAliasKind.findSaltFormAliasKindEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM SaltFormAliasKind o", SaltFormAliasKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<SaltFormAliasKind> SaltFormAliasKind.findSaltFormAliasKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM SaltFormAliasKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, SaltFormAliasKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void SaltFormAliasKind.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void SaltFormAliasKind.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            SaltFormAliasKind attached = SaltFormAliasKind.findSaltFormAliasKind(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void SaltFormAliasKind.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void SaltFormAliasKind.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public SaltFormAliasKind SaltFormAliasKind.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        SaltFormAliasKind merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind_Roo_Jpa_Entity.aj
deleted file mode 100644
index 073626e34..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SaltFormAliasKind;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect SaltFormAliasKind_Roo_Jpa_Entity {
-    
-    declare @type: SaltFormAliasKind: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long SaltFormAliasKind.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer SaltFormAliasKind.version;
-    
-    public Long SaltFormAliasKind.getId() {
-        return this.id;
-    }
-    
-    public void SaltFormAliasKind.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer SaltFormAliasKind.getVersion() {
-        return this.version;
-    }
-    
-    public void SaltFormAliasKind.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind_Roo_Json.aj
deleted file mode 100644
index 82816b35d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SaltFormAliasKind;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect SaltFormAliasKind_Roo_Json {
-    
-    public String SaltFormAliasKind.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String SaltFormAliasKind.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static SaltFormAliasKind SaltFormAliasKind.fromJsonToSaltFormAliasKind(String json) {
-        return new JSONDeserializer<SaltFormAliasKind>()
-        .use(null, SaltFormAliasKind.class).deserialize(json);
-    }
-    
-    public static String SaltFormAliasKind.toJsonArray(Collection<SaltFormAliasKind> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String SaltFormAliasKind.toJsonArray(Collection<SaltFormAliasKind> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<SaltFormAliasKind> SaltFormAliasKind.fromJsonArrayToSaltFormAliasKinds(String json) {
-        return new JSONDeserializer<List<SaltFormAliasKind>>()
-        .use("values", SaltFormAliasKind.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind_Roo_ToString.aj
deleted file mode 100644
index bc905ca8e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SaltFormAliasKind;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SaltFormAliasKind_Roo_ToString {
-    
-    public String SaltFormAliasKind.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType.java b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType.java
index 8b1be49c6..006a7c725 100644
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType.java
+++ b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType.java
@@ -1,12 +1,29 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Version;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -16,4 +33,158 @@ public class SaltFormAliasType {
     @Size(max = 255)
     private String typeName;
     
+
+	public String getTypeName() {
+        return this.typeName;
+    }
+
+	public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new SaltFormAliasType().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countSaltFormAliasTypes() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM SaltFormAliasType o", Long.class).getSingleResult();
+    }
+
+	public static List<SaltFormAliasType> findAllSaltFormAliasTypes() {
+        return entityManager().createQuery("SELECT o FROM SaltFormAliasType o", SaltFormAliasType.class).getResultList();
+    }
+
+	public static List<SaltFormAliasType> findAllSaltFormAliasTypes(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM SaltFormAliasType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, SaltFormAliasType.class).getResultList();
+    }
+
+	public static SaltFormAliasType findSaltFormAliasType(Long id) {
+        if (id == null) return null;
+        return entityManager().find(SaltFormAliasType.class, id);
+    }
+
+	public static List<SaltFormAliasType> findSaltFormAliasTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM SaltFormAliasType o", SaltFormAliasType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<SaltFormAliasType> findSaltFormAliasTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM SaltFormAliasType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, SaltFormAliasType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            SaltFormAliasType attached = SaltFormAliasType.findSaltFormAliasType(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public SaltFormAliasType merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        SaltFormAliasType merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static SaltFormAliasType fromJsonToSaltFormAliasType(String json) {
+        return new JSONDeserializer<SaltFormAliasType>()
+        .use(null, SaltFormAliasType.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<SaltFormAliasType> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<SaltFormAliasType> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<SaltFormAliasType> fromJsonArrayToSaltFormAliasTypes(String json) {
+        return new JSONDeserializer<List<SaltFormAliasType>>()
+        .use("values", SaltFormAliasType.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType_Roo_Configurable.aj
deleted file mode 100644
index d384e717f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SaltFormAliasType;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect SaltFormAliasType_Roo_Configurable {
-    
-    declare @type: SaltFormAliasType: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType_Roo_JavaBean.aj
deleted file mode 100644
index 33c359615..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType_Roo_JavaBean.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SaltFormAliasType;
-
-privileged aspect SaltFormAliasType_Roo_JavaBean {
-    
-    public String SaltFormAliasType.getTypeName() {
-        return this.typeName;
-    }
-    
-    public void SaltFormAliasType.setTypeName(String typeName) {
-        this.typeName = typeName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 4cd7bb0ad..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SaltFormAliasType;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect SaltFormAliasType_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager SaltFormAliasType.entityManager;
-    
-    public static final List<String> SaltFormAliasType.fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName");
-    
-    public static final EntityManager SaltFormAliasType.entityManager() {
-        EntityManager em = new SaltFormAliasType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long SaltFormAliasType.countSaltFormAliasTypes() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM SaltFormAliasType o", Long.class).getSingleResult();
-    }
-    
-    public static List<SaltFormAliasType> SaltFormAliasType.findAllSaltFormAliasTypes() {
-        return entityManager().createQuery("SELECT o FROM SaltFormAliasType o", SaltFormAliasType.class).getResultList();
-    }
-    
-    public static List<SaltFormAliasType> SaltFormAliasType.findAllSaltFormAliasTypes(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM SaltFormAliasType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, SaltFormAliasType.class).getResultList();
-    }
-    
-    public static SaltFormAliasType SaltFormAliasType.findSaltFormAliasType(Long id) {
-        if (id == null) return null;
-        return entityManager().find(SaltFormAliasType.class, id);
-    }
-    
-    public static List<SaltFormAliasType> SaltFormAliasType.findSaltFormAliasTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM SaltFormAliasType o", SaltFormAliasType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<SaltFormAliasType> SaltFormAliasType.findSaltFormAliasTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM SaltFormAliasType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, SaltFormAliasType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void SaltFormAliasType.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void SaltFormAliasType.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            SaltFormAliasType attached = SaltFormAliasType.findSaltFormAliasType(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void SaltFormAliasType.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void SaltFormAliasType.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public SaltFormAliasType SaltFormAliasType.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        SaltFormAliasType merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType_Roo_Jpa_Entity.aj
deleted file mode 100644
index 9e1077446..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SaltFormAliasType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect SaltFormAliasType_Roo_Jpa_Entity {
-    
-    declare @type: SaltFormAliasType: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long SaltFormAliasType.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer SaltFormAliasType.version;
-    
-    public Long SaltFormAliasType.getId() {
-        return this.id;
-    }
-    
-    public void SaltFormAliasType.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer SaltFormAliasType.getVersion() {
-        return this.version;
-    }
-    
-    public void SaltFormAliasType.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType_Roo_Json.aj
deleted file mode 100644
index 91c8ecb78..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SaltFormAliasType;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect SaltFormAliasType_Roo_Json {
-    
-    public String SaltFormAliasType.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String SaltFormAliasType.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static SaltFormAliasType SaltFormAliasType.fromJsonToSaltFormAliasType(String json) {
-        return new JSONDeserializer<SaltFormAliasType>()
-        .use(null, SaltFormAliasType.class).deserialize(json);
-    }
-    
-    public static String SaltFormAliasType.toJsonArray(Collection<SaltFormAliasType> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String SaltFormAliasType.toJsonArray(Collection<SaltFormAliasType> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<SaltFormAliasType> SaltFormAliasType.fromJsonArrayToSaltFormAliasTypes(String json) {
-        return new JSONDeserializer<List<SaltFormAliasType>>()
-        .use("values", SaltFormAliasType.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType_Roo_ToString.aj
deleted file mode 100644
index ad5678960..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SaltFormAliasType;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SaltFormAliasType_Roo_ToString {
-    
-    public String SaltFormAliasType.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAlias_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/SaltFormAlias_Roo_Configurable.aj
deleted file mode 100644
index 7f5a34185..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAlias_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SaltFormAlias;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect SaltFormAlias_Roo_Configurable {
-    
-    declare @type: SaltFormAlias: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAlias_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/SaltFormAlias_Roo_Finder.aj
deleted file mode 100644
index 4d1e49f8e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAlias_Roo_Finder.aj
+++ /dev/null
@@ -1,87 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SaltForm;
-import com.labsynch.labseer.domain.SaltFormAlias;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect SaltFormAlias_Roo_Finder {
-    
-    public static Long SaltFormAlias.countFindSaltFormAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName, String lsType, String lsKind) {
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = SaltFormAlias.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SaltFormAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
-        q.setParameter("aliasName", aliasName);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long SaltFormAlias.countFindSaltFormAliasesBySaltForm(SaltForm saltForm) {
-        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
-        EntityManager em = SaltFormAlias.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SaltFormAlias AS o WHERE o.saltForm = :saltForm", Long.class);
-        q.setParameter("saltForm", saltForm);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<SaltFormAlias> SaltFormAlias.findSaltFormAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName, String lsType, String lsKind) {
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = SaltFormAlias.entityManager();
-        TypedQuery<SaltFormAlias> q = em.createQuery("SELECT o FROM SaltFormAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind", SaltFormAlias.class);
-        q.setParameter("aliasName", aliasName);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<SaltFormAlias> SaltFormAlias.findSaltFormAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName, String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = SaltFormAlias.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SaltFormAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<SaltFormAlias> q = em.createQuery(queryBuilder.toString(), SaltFormAlias.class);
-        q.setParameter("aliasName", aliasName);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<SaltFormAlias> SaltFormAlias.findSaltFormAliasesBySaltForm(SaltForm saltForm) {
-        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
-        EntityManager em = SaltFormAlias.entityManager();
-        TypedQuery<SaltFormAlias> q = em.createQuery("SELECT o FROM SaltFormAlias AS o WHERE o.saltForm = :saltForm", SaltFormAlias.class);
-        q.setParameter("saltForm", saltForm);
-        return q;
-    }
-    
-    public static TypedQuery<SaltFormAlias> SaltFormAlias.findSaltFormAliasesBySaltForm(SaltForm saltForm, String sortFieldName, String sortOrder) {
-        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
-        EntityManager em = SaltFormAlias.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SaltFormAlias AS o WHERE o.saltForm = :saltForm");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<SaltFormAlias> q = em.createQuery(queryBuilder.toString(), SaltFormAlias.class);
-        q.setParameter("saltForm", saltForm);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAlias_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/SaltFormAlias_Roo_JavaBean.aj
deleted file mode 100644
index f068f39fc..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAlias_Roo_JavaBean.aj
+++ /dev/null
@@ -1,67 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SaltForm;
-import com.labsynch.labseer.domain.SaltFormAlias;
-
-privileged aspect SaltFormAlias_Roo_JavaBean {
-    
-    public SaltForm SaltFormAlias.getSaltForm() {
-        return this.saltForm;
-    }
-    
-    public void SaltFormAlias.setSaltForm(SaltForm saltForm) {
-        this.saltForm = saltForm;
-    }
-    
-    public String SaltFormAlias.getLsType() {
-        return this.lsType;
-    }
-    
-    public void SaltFormAlias.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String SaltFormAlias.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void SaltFormAlias.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String SaltFormAlias.getAliasName() {
-        return this.aliasName;
-    }
-    
-    public void SaltFormAlias.setAliasName(String aliasName) {
-        this.aliasName = aliasName;
-    }
-    
-    public boolean SaltFormAlias.isPreferred() {
-        return this.preferred;
-    }
-    
-    public void SaltFormAlias.setPreferred(boolean preferred) {
-        this.preferred = preferred;
-    }
-    
-    public boolean SaltFormAlias.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void SaltFormAlias.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public boolean SaltFormAlias.isDeleted() {
-        return this.deleted;
-    }
-    
-    public void SaltFormAlias.setDeleted(boolean deleted) {
-        this.deleted = deleted;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAlias_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/SaltFormAlias_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 13b045829..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAlias_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SaltFormAlias;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect SaltFormAlias_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager SaltFormAlias.entityManager;
-    
-    public static final List<String> SaltFormAlias.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "saltForm", "lsType", "lsKind", "aliasName", "preferred", "ignored", "deleted");
-    
-    public static final EntityManager SaltFormAlias.entityManager() {
-        EntityManager em = new SaltFormAlias().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long SaltFormAlias.countSaltFormAliases() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM SaltFormAlias o", Long.class).getSingleResult();
-    }
-    
-    public static List<SaltFormAlias> SaltFormAlias.findAllSaltFormAliases() {
-        return entityManager().createQuery("SELECT o FROM SaltFormAlias o", SaltFormAlias.class).getResultList();
-    }
-    
-    public static List<SaltFormAlias> SaltFormAlias.findAllSaltFormAliases(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM SaltFormAlias o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, SaltFormAlias.class).getResultList();
-    }
-    
-    public static SaltFormAlias SaltFormAlias.findSaltFormAlias(Long id) {
-        if (id == null) return null;
-        return entityManager().find(SaltFormAlias.class, id);
-    }
-    
-    public static List<SaltFormAlias> SaltFormAlias.findSaltFormAliasEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM SaltFormAlias o", SaltFormAlias.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<SaltFormAlias> SaltFormAlias.findSaltFormAliasEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM SaltFormAlias o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, SaltFormAlias.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void SaltFormAlias.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void SaltFormAlias.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            SaltFormAlias attached = SaltFormAlias.findSaltFormAlias(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void SaltFormAlias.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void SaltFormAlias.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public SaltFormAlias SaltFormAlias.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        SaltFormAlias merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAlias_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/SaltFormAlias_Roo_Jpa_Entity.aj
deleted file mode 100644
index 3fedbe417..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAlias_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SaltFormAlias;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect SaltFormAlias_Roo_Jpa_Entity {
-    
-    declare @type: SaltFormAlias: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long SaltFormAlias.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer SaltFormAlias.version;
-    
-    public Long SaltFormAlias.getId() {
-        return this.id;
-    }
-    
-    public void SaltFormAlias.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer SaltFormAlias.getVersion() {
-        return this.version;
-    }
-    
-    public void SaltFormAlias.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAlias_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/SaltFormAlias_Roo_Json.aj
deleted file mode 100644
index d36b8f8db..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAlias_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SaltFormAlias;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect SaltFormAlias_Roo_Json {
-    
-    public String SaltFormAlias.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String SaltFormAlias.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static SaltFormAlias SaltFormAlias.fromJsonToSaltFormAlias(String json) {
-        return new JSONDeserializer<SaltFormAlias>()
-        .use(null, SaltFormAlias.class).deserialize(json);
-    }
-    
-    public static String SaltFormAlias.toJsonArray(Collection<SaltFormAlias> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String SaltFormAlias.toJsonArray(Collection<SaltFormAlias> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<SaltFormAlias> SaltFormAlias.fromJsonArrayToSaltFormAliases(String json) {
-        return new JSONDeserializer<List<SaltFormAlias>>()
-        .use("values", SaltFormAlias.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAlias_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/SaltFormAlias_Roo_ToString.aj
deleted file mode 100644
index aeed988ee..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAlias_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SaltFormAlias;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SaltFormAlias_Roo_ToString {
-    
-    public String SaltFormAlias.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltForm_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/SaltForm_Roo_Configurable.aj
deleted file mode 100644
index 7a97fb3c8..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SaltForm_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SaltForm;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect SaltForm_Roo_Configurable {
-    
-    declare @type: SaltForm: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltForm_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/SaltForm_Roo_Finder.aj
deleted file mode 100644
index 3f9153b86..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SaltForm_Roo_Finder.aj
+++ /dev/null
@@ -1,187 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.BulkLoadFile;
-import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.domain.SaltForm;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect SaltForm_Roo_Finder {
-    
-    public static Long SaltForm.countFindSaltFormsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile) {
-        if (bulkLoadFile == null) throw new IllegalArgumentException("The bulkLoadFile argument is required");
-        EntityManager em = SaltForm.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SaltForm AS o WHERE o.bulkLoadFile = :bulkLoadFile", Long.class);
-        q.setParameter("bulkLoadFile", bulkLoadFile);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long SaltForm.countFindSaltFormsByCdId(int CdId) {
-        EntityManager em = SaltForm.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SaltForm AS o WHERE o.CdId = :CdId", Long.class);
-        q.setParameter("CdId", CdId);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long SaltForm.countFindSaltFormsByCorpNameEquals(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        EntityManager em = SaltForm.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SaltForm AS o WHERE o.corpName = :corpName", Long.class);
-        q.setParameter("corpName", corpName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long SaltForm.countFindSaltFormsByCorpNameLike(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        corpName = corpName.replace('*', '%');
-        if (corpName.charAt(0) != '%') {
-            corpName = "%" + corpName;
-        }
-        if (corpName.charAt(corpName.length() - 1) != '%') {
-            corpName = corpName + "%";
-        }
-        EntityManager em = SaltForm.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SaltForm AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)", Long.class);
-        q.setParameter("corpName", corpName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long SaltForm.countFindSaltFormsByParent(Parent parent) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
-        EntityManager em = SaltForm.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SaltForm AS o WHERE o.parent = :parent", Long.class);
-        q.setParameter("parent", parent);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<SaltForm> SaltForm.findSaltFormsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile) {
-        if (bulkLoadFile == null) throw new IllegalArgumentException("The bulkLoadFile argument is required");
-        EntityManager em = SaltForm.entityManager();
-        TypedQuery<SaltForm> q = em.createQuery("SELECT o FROM SaltForm AS o WHERE o.bulkLoadFile = :bulkLoadFile", SaltForm.class);
-        q.setParameter("bulkLoadFile", bulkLoadFile);
-        return q;
-    }
-    
-    public static TypedQuery<SaltForm> SaltForm.findSaltFormsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile, String sortFieldName, String sortOrder) {
-        if (bulkLoadFile == null) throw new IllegalArgumentException("The bulkLoadFile argument is required");
-        EntityManager em = SaltForm.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SaltForm AS o WHERE o.bulkLoadFile = :bulkLoadFile");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<SaltForm> q = em.createQuery(queryBuilder.toString(), SaltForm.class);
-        q.setParameter("bulkLoadFile", bulkLoadFile);
-        return q;
-    }
-    
-    public static TypedQuery<SaltForm> SaltForm.findSaltFormsByCdId(int CdId) {
-        EntityManager em = SaltForm.entityManager();
-        TypedQuery<SaltForm> q = em.createQuery("SELECT o FROM SaltForm AS o WHERE o.CdId = :CdId", SaltForm.class);
-        q.setParameter("CdId", CdId);
-        return q;
-    }
-    
-    public static TypedQuery<SaltForm> SaltForm.findSaltFormsByCdId(int CdId, String sortFieldName, String sortOrder) {
-        EntityManager em = SaltForm.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SaltForm AS o WHERE o.CdId = :CdId");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<SaltForm> q = em.createQuery(queryBuilder.toString(), SaltForm.class);
-        q.setParameter("CdId", CdId);
-        return q;
-    }
-    
-    public static TypedQuery<SaltForm> SaltForm.findSaltFormsByCorpNameEquals(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        EntityManager em = SaltForm.entityManager();
-        TypedQuery<SaltForm> q = em.createQuery("SELECT o FROM SaltForm AS o WHERE o.corpName = :corpName", SaltForm.class);
-        q.setParameter("corpName", corpName);
-        return q;
-    }
-    
-    public static TypedQuery<SaltForm> SaltForm.findSaltFormsByCorpNameEquals(String corpName, String sortFieldName, String sortOrder) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        EntityManager em = SaltForm.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SaltForm AS o WHERE o.corpName = :corpName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<SaltForm> q = em.createQuery(queryBuilder.toString(), SaltForm.class);
-        q.setParameter("corpName", corpName);
-        return q;
-    }
-    
-    public static TypedQuery<SaltForm> SaltForm.findSaltFormsByCorpNameLike(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        corpName = corpName.replace('*', '%');
-        if (corpName.charAt(0) != '%') {
-            corpName = "%" + corpName;
-        }
-        if (corpName.charAt(corpName.length() - 1) != '%') {
-            corpName = corpName + "%";
-        }
-        EntityManager em = SaltForm.entityManager();
-        TypedQuery<SaltForm> q = em.createQuery("SELECT o FROM SaltForm AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)", SaltForm.class);
-        q.setParameter("corpName", corpName);
-        return q;
-    }
-    
-    public static TypedQuery<SaltForm> SaltForm.findSaltFormsByCorpNameLike(String corpName, String sortFieldName, String sortOrder) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        corpName = corpName.replace('*', '%');
-        if (corpName.charAt(0) != '%') {
-            corpName = "%" + corpName;
-        }
-        if (corpName.charAt(corpName.length() - 1) != '%') {
-            corpName = corpName + "%";
-        }
-        EntityManager em = SaltForm.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SaltForm AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<SaltForm> q = em.createQuery(queryBuilder.toString(), SaltForm.class);
-        q.setParameter("corpName", corpName);
-        return q;
-    }
-    
-    public static TypedQuery<SaltForm> SaltForm.findSaltFormsByParent(Parent parent) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
-        EntityManager em = SaltForm.entityManager();
-        TypedQuery<SaltForm> q = em.createQuery("SELECT o FROM SaltForm AS o WHERE o.parent = :parent", SaltForm.class);
-        q.setParameter("parent", parent);
-        return q;
-    }
-    
-    public static TypedQuery<SaltForm> SaltForm.findSaltFormsByParent(Parent parent, String sortFieldName, String sortOrder) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
-        EntityManager em = SaltForm.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SaltForm AS o WHERE o.parent = :parent");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<SaltForm> q = em.createQuery(queryBuilder.toString(), SaltForm.class);
-        q.setParameter("parent", parent);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltForm_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/SaltForm_Roo_JavaBean.aj
deleted file mode 100644
index c71b8123c..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SaltForm_Roo_JavaBean.aj
+++ /dev/null
@@ -1,112 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.BulkLoadFile;
-import com.labsynch.labseer.domain.IsoSalt;
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.domain.SaltForm;
-import java.util.Date;
-import java.util.Set;
-
-privileged aspect SaltForm_Roo_JavaBean {
-    
-    public String SaltForm.getMolStructure() {
-        return this.molStructure;
-    }
-    
-    public void SaltForm.setMolStructure(String molStructure) {
-        this.molStructure = molStructure;
-    }
-    
-    public String SaltForm.getCorpName() {
-        return this.corpName;
-    }
-    
-    public void SaltForm.setCorpName(String corpName) {
-        this.corpName = corpName;
-    }
-    
-    public String SaltForm.getCasNumber() {
-        return this.casNumber;
-    }
-    
-    public void SaltForm.setCasNumber(String casNumber) {
-        this.casNumber = casNumber;
-    }
-    
-    public String SaltForm.getChemist() {
-        return this.chemist;
-    }
-    
-    public void SaltForm.setChemist(String chemist) {
-        this.chemist = chemist;
-    }
-    
-    public Date SaltForm.getRegistrationDate() {
-        return this.registrationDate;
-    }
-    
-    public void SaltForm.setRegistrationDate(Date registrationDate) {
-        this.registrationDate = registrationDate;
-    }
-    
-    public int SaltForm.getCdId() {
-        return this.CdId;
-    }
-    
-    public void SaltForm.setCdId(int CdId) {
-        this.CdId = CdId;
-    }
-    
-    public Boolean SaltForm.getIgnore() {
-        return this.ignore;
-    }
-    
-    public void SaltForm.setIgnore(Boolean ignore) {
-        this.ignore = ignore;
-    }
-    
-    public Double SaltForm.getSaltWeight() {
-        return this.saltWeight;
-    }
-    
-    public void SaltForm.setSaltWeight(Double saltWeight) {
-        this.saltWeight = saltWeight;
-    }
-    
-    public Parent SaltForm.getParent() {
-        return this.parent;
-    }
-    
-    public void SaltForm.setParent(Parent parent) {
-        this.parent = parent;
-    }
-    
-    public Set<Lot> SaltForm.getLots() {
-        return this.lots;
-    }
-    
-    public void SaltForm.setLots(Set<Lot> lots) {
-        this.lots = lots;
-    }
-    
-    public Set<IsoSalt> SaltForm.getIsoSalts() {
-        return this.isoSalts;
-    }
-    
-    public void SaltForm.setIsoSalts(Set<IsoSalt> isoSalts) {
-        this.isoSalts = isoSalts;
-    }
-    
-    public BulkLoadFile SaltForm.getBulkLoadFile() {
-        return this.bulkLoadFile;
-    }
-    
-    public void SaltForm.setBulkLoadFile(BulkLoadFile bulkLoadFile) {
-        this.bulkLoadFile = bulkLoadFile;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltForm_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/SaltForm_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 02563cb27..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SaltForm_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,82 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SaltForm;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect SaltForm_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager SaltForm.entityManager;
-    
-    public static final EntityManager SaltForm.entityManager() {
-        EntityManager em = new SaltForm().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static List<SaltForm> SaltForm.findAllSaltForms(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM SaltForm o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, SaltForm.class).getResultList();
-    }
-    
-    public static List<SaltForm> SaltForm.findSaltFormEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM SaltForm o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, SaltForm.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void SaltForm.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void SaltForm.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            SaltForm attached = SaltForm.findSaltForm(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void SaltForm.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void SaltForm.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public SaltForm SaltForm.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        SaltForm merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltForm_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/SaltForm_Roo_Jpa_Entity.aj
deleted file mode 100644
index 1bded4f50..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SaltForm_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SaltForm;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect SaltForm_Roo_Jpa_Entity {
-    
-    declare @type: SaltForm: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long SaltForm.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer SaltForm.version;
-    
-    public Long SaltForm.getId() {
-        return this.id;
-    }
-    
-    public void SaltForm.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer SaltForm.getVersion() {
-        return this.version;
-    }
-    
-    public void SaltForm.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltForm_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/SaltForm_Roo_Json.aj
deleted file mode 100644
index ee46b6452..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SaltForm_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SaltForm;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect SaltForm_Roo_Json {
-    
-    public String SaltForm.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String SaltForm.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static SaltForm SaltForm.fromJsonToSaltForm(String json) {
-        return new JSONDeserializer<SaltForm>()
-        .use(null, SaltForm.class).deserialize(json);
-    }
-    
-    public static String SaltForm.toJsonArray(Collection<SaltForm> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String SaltForm.toJsonArray(Collection<SaltForm> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<SaltForm> SaltForm.fromJsonArrayToSaltForms(String json) {
-        return new JSONDeserializer<List<SaltForm>>()
-        .use("values", SaltForm.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltForm_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/SaltForm_Roo_ToString.aj
deleted file mode 100644
index fc50c91ac..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SaltForm_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SaltForm;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SaltForm_Roo_ToString {
-    
-    public String SaltForm.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Salt_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/Salt_Roo_Configurable.aj
deleted file mode 100644
index 6b60d751b..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Salt_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Salt;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect Salt_Roo_Configurable {
-    
-    declare @type: Salt: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Salt_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/Salt_Roo_Finder.aj
deleted file mode 100644
index 555c80b83..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Salt_Roo_Finder.aj
+++ /dev/null
@@ -1,143 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Salt;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect Salt_Roo_Finder {
-    
-    public static Long Salt.countFindSaltsByAbbrevEquals(String abbrev) {
-        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
-        EntityManager em = Salt.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Salt AS o WHERE o.abbrev = :abbrev", Long.class);
-        q.setParameter("abbrev", abbrev);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Salt.countFindSaltsByAbbrevEqualsAndNameEquals(String abbrev, String name) {
-        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = Salt.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Salt AS o WHERE o.abbrev = :abbrev  AND o.name = :name", Long.class);
-        q.setParameter("abbrev", abbrev);
-        q.setParameter("name", name);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Salt.countFindSaltsByAbbrevLike(String abbrev) {
-        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
-        abbrev = abbrev.replace('*', '%');
-        if (abbrev.charAt(0) != '%') {
-            abbrev = "%" + abbrev;
-        }
-        if (abbrev.charAt(abbrev.length() - 1) != '%') {
-            abbrev = abbrev + "%";
-        }
-        EntityManager em = Salt.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Salt AS o WHERE LOWER(o.abbrev) LIKE LOWER(:abbrev)", Long.class);
-        q.setParameter("abbrev", abbrev);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Salt.countFindSaltsByCdId(int cdId) {
-        EntityManager em = Salt.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Salt AS o WHERE o.cdId = :cdId", Long.class);
-        q.setParameter("cdId", cdId);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Salt.countFindSaltsByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = Salt.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Salt AS o WHERE o.name = :name", Long.class);
-        q.setParameter("name", name);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<Salt> Salt.findSaltsByAbbrevEquals(String abbrev, String sortFieldName, String sortOrder) {
-        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
-        EntityManager em = Salt.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Salt AS o WHERE o.abbrev = :abbrev");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Salt> q = em.createQuery(queryBuilder.toString(), Salt.class);
-        q.setParameter("abbrev", abbrev);
-        return q;
-    }
-    
-    public static TypedQuery<Salt> Salt.findSaltsByAbbrevEqualsAndNameEquals(String abbrev, String name, String sortFieldName, String sortOrder) {
-        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = Salt.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Salt AS o WHERE o.abbrev = :abbrev  AND o.name = :name");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Salt> q = em.createQuery(queryBuilder.toString(), Salt.class);
-        q.setParameter("abbrev", abbrev);
-        q.setParameter("name", name);
-        return q;
-    }
-    
-    public static TypedQuery<Salt> Salt.findSaltsByAbbrevLike(String abbrev, String sortFieldName, String sortOrder) {
-        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
-        abbrev = abbrev.replace('*', '%');
-        if (abbrev.charAt(0) != '%') {
-            abbrev = "%" + abbrev;
-        }
-        if (abbrev.charAt(abbrev.length() - 1) != '%') {
-            abbrev = abbrev + "%";
-        }
-        EntityManager em = Salt.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Salt AS o WHERE LOWER(o.abbrev) LIKE LOWER(:abbrev)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Salt> q = em.createQuery(queryBuilder.toString(), Salt.class);
-        q.setParameter("abbrev", abbrev);
-        return q;
-    }
-    
-    public static TypedQuery<Salt> Salt.findSaltsByCdId(int cdId, String sortFieldName, String sortOrder) {
-        EntityManager em = Salt.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Salt AS o WHERE o.cdId = :cdId");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Salt> q = em.createQuery(queryBuilder.toString(), Salt.class);
-        q.setParameter("cdId", cdId);
-        return q;
-    }
-    
-    public static TypedQuery<Salt> Salt.findSaltsByNameEquals(String name, String sortFieldName, String sortOrder) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = Salt.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Salt AS o WHERE o.name = :name");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Salt> q = em.createQuery(queryBuilder.toString(), Salt.class);
-        q.setParameter("name", name);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Salt_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/Salt_Roo_JavaBean.aj
deleted file mode 100644
index 9b0912edb..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Salt_Roo_JavaBean.aj
+++ /dev/null
@@ -1,82 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Salt;
-
-privileged aspect Salt_Roo_JavaBean {
-    
-    public String Salt.getMolStructure() {
-        return this.molStructure;
-    }
-    
-    public void Salt.setMolStructure(String molStructure) {
-        this.molStructure = molStructure;
-    }
-    
-    public String Salt.getName() {
-        return this.name;
-    }
-    
-    public void Salt.setName(String name) {
-        this.name = name;
-    }
-    
-    public String Salt.getOriginalStructure() {
-        return this.originalStructure;
-    }
-    
-    public void Salt.setOriginalStructure(String originalStructure) {
-        this.originalStructure = originalStructure;
-    }
-    
-    public String Salt.getAbbrev() {
-        return this.abbrev;
-    }
-    
-    public void Salt.setAbbrev(String abbrev) {
-        this.abbrev = abbrev;
-    }
-    
-    public Double Salt.getMolWeight() {
-        return this.molWeight;
-    }
-    
-    public void Salt.setMolWeight(Double molWeight) {
-        this.molWeight = molWeight;
-    }
-    
-    public String Salt.getFormula() {
-        return this.formula;
-    }
-    
-    public void Salt.setFormula(String formula) {
-        this.formula = formula;
-    }
-    
-    public int Salt.getCdId() {
-        return this.cdId;
-    }
-    
-    public void Salt.setCdId(int cdId) {
-        this.cdId = cdId;
-    }
-    
-    public Boolean Salt.getIgnore() {
-        return this.ignore;
-    }
-    
-    public void Salt.setIgnore(Boolean ignore) {
-        this.ignore = ignore;
-    }
-    
-    public int Salt.getCharge() {
-        return this.charge;
-    }
-    
-    public void Salt.setCharge(int charge) {
-        this.charge = charge;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Salt_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/Salt_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 6ab0b6a76..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Salt_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Salt;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect Salt_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager Salt.entityManager;
-    
-    public static final List<String> Salt.fieldNames4OrderClauseFilter = java.util.Arrays.asList("molStructure", "name", "originalStructure", "abbrev", "molWeight", "formula", "cdId", "ignore", "charge");
-    
-    public static final EntityManager Salt.entityManager() {
-        EntityManager em = new Salt().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long Salt.countSalts() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM Salt o", Long.class).getSingleResult();
-    }
-    
-    public static List<Salt> Salt.findAllSalts() {
-        return entityManager().createQuery("SELECT o FROM Salt o", Salt.class).getResultList();
-    }
-    
-    public static List<Salt> Salt.findAllSalts(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM Salt o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, Salt.class).getResultList();
-    }
-    
-    public static Salt Salt.findSalt(Long id) {
-        if (id == null) return null;
-        return entityManager().find(Salt.class, id);
-    }
-    
-    public static List<Salt> Salt.findSaltEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM Salt o", Salt.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<Salt> Salt.findSaltEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM Salt o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, Salt.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void Salt.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void Salt.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            Salt attached = Salt.findSalt(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void Salt.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void Salt.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public Salt Salt.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        Salt merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Salt_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/Salt_Roo_Jpa_Entity.aj
deleted file mode 100644
index 4918ddd48..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Salt_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Salt;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect Salt_Roo_Jpa_Entity {
-    
-    declare @type: Salt: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long Salt.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer Salt.version;
-    
-    public Long Salt.getId() {
-        return this.id;
-    }
-    
-    public void Salt.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer Salt.getVersion() {
-        return this.version;
-    }
-    
-    public void Salt.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Salt_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/Salt_Roo_Json.aj
deleted file mode 100644
index ed36d9aa9..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Salt_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Salt;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect Salt_Roo_Json {
-    
-    public String Salt.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String Salt.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static Salt Salt.fromJsonToSalt(String json) {
-        return new JSONDeserializer<Salt>()
-        .use(null, Salt.class).deserialize(json);
-    }
-    
-    public static String Salt.toJsonArray(Collection<Salt> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String Salt.toJsonArray(Collection<Salt> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<Salt> Salt.fromJsonArrayToSalts(String json) {
-        return new JSONDeserializer<List<Salt>>()
-        .use("values", Salt.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Salt_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/Salt_Roo_ToString.aj
deleted file mode 100644
index e0c4583e7..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Salt_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Salt;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect Salt_Roo_ToString {
-    
-    public String Salt.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SolutionUnit.java b/src/main/java/com/labsynch/labseer/domain/SolutionUnit.java
index 0f4586115..ad78879f8 100755
--- a/src/main/java/com/labsynch/labseer/domain/SolutionUnit.java
+++ b/src/main/java/com/labsynch/labseer/domain/SolutionUnit.java
@@ -1,12 +1,30 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -19,4 +37,280 @@ public class SolutionUnit {
     @Size(max = 255)
     private String code; 
     
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String getName() {
+        return this.name;
+    }
+
+	public void setName(String name) {
+        this.name = name;
+    }
+
+	public String getCode() {
+        return this.code;
+    }
+
+	public void setCode(String code) {
+        this.code = code;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new SolutionUnit().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countSolutionUnits() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM SolutionUnit o", Long.class).getSingleResult();
+    }
+
+	public static List<SolutionUnit> findAllSolutionUnits() {
+        return entityManager().createQuery("SELECT o FROM SolutionUnit o", SolutionUnit.class).getResultList();
+    }
+
+	public static List<SolutionUnit> findAllSolutionUnits(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM SolutionUnit o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, SolutionUnit.class).getResultList();
+    }
+
+	public static SolutionUnit findSolutionUnit(Long id) {
+        if (id == null) return null;
+        return entityManager().find(SolutionUnit.class, id);
+    }
+
+	public static List<SolutionUnit> findSolutionUnitEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM SolutionUnit o", SolutionUnit.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<SolutionUnit> findSolutionUnitEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM SolutionUnit o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, SolutionUnit.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            SolutionUnit attached = SolutionUnit.findSolutionUnit(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public SolutionUnit merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        SolutionUnit merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static Long countFindSolutionUnitsByCodeEquals(String code) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = SolutionUnit.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SolutionUnit AS o WHERE o.code = :code", Long.class);
+        q.setParameter("code", code);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindSolutionUnitsByCodeLike(String code) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        code = code.replace('*', '%');
+        if (code.charAt(0) != '%') {
+            code = "%" + code;
+        }
+        if (code.charAt(code.length() - 1) != '%') {
+            code = code + "%";
+        }
+        EntityManager em = SolutionUnit.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SolutionUnit AS o WHERE LOWER(o.code) LIKE LOWER(:code)", Long.class);
+        q.setParameter("code", code);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindSolutionUnitsByNameEquals(String name) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = SolutionUnit.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SolutionUnit AS o WHERE o.name = :name", Long.class);
+        q.setParameter("name", name);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<SolutionUnit> findSolutionUnitsByCodeEquals(String code) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = SolutionUnit.entityManager();
+        TypedQuery<SolutionUnit> q = em.createQuery("SELECT o FROM SolutionUnit AS o WHERE o.code = :code", SolutionUnit.class);
+        q.setParameter("code", code);
+        return q;
+    }
+
+	public static TypedQuery<SolutionUnit> findSolutionUnitsByCodeEquals(String code, String sortFieldName, String sortOrder) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = SolutionUnit.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SolutionUnit AS o WHERE o.code = :code");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<SolutionUnit> q = em.createQuery(queryBuilder.toString(), SolutionUnit.class);
+        q.setParameter("code", code);
+        return q;
+    }
+
+	public static TypedQuery<SolutionUnit> findSolutionUnitsByCodeLike(String code) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        code = code.replace('*', '%');
+        if (code.charAt(0) != '%') {
+            code = "%" + code;
+        }
+        if (code.charAt(code.length() - 1) != '%') {
+            code = code + "%";
+        }
+        EntityManager em = SolutionUnit.entityManager();
+        TypedQuery<SolutionUnit> q = em.createQuery("SELECT o FROM SolutionUnit AS o WHERE LOWER(o.code) LIKE LOWER(:code)", SolutionUnit.class);
+        q.setParameter("code", code);
+        return q;
+    }
+
+	public static TypedQuery<SolutionUnit> findSolutionUnitsByCodeLike(String code, String sortFieldName, String sortOrder) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        code = code.replace('*', '%');
+        if (code.charAt(0) != '%') {
+            code = "%" + code;
+        }
+        if (code.charAt(code.length() - 1) != '%') {
+            code = code + "%";
+        }
+        EntityManager em = SolutionUnit.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SolutionUnit AS o WHERE LOWER(o.code) LIKE LOWER(:code)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<SolutionUnit> q = em.createQuery(queryBuilder.toString(), SolutionUnit.class);
+        q.setParameter("code", code);
+        return q;
+    }
+
+	public static TypedQuery<SolutionUnit> findSolutionUnitsByNameEquals(String name) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = SolutionUnit.entityManager();
+        TypedQuery<SolutionUnit> q = em.createQuery("SELECT o FROM SolutionUnit AS o WHERE o.name = :name", SolutionUnit.class);
+        q.setParameter("name", name);
+        return q;
+    }
+
+	public static TypedQuery<SolutionUnit> findSolutionUnitsByNameEquals(String name, String sortFieldName, String sortOrder) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = SolutionUnit.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SolutionUnit AS o WHERE o.name = :name");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<SolutionUnit> q = em.createQuery(queryBuilder.toString(), SolutionUnit.class);
+        q.setParameter("name", name);
+        return q;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static SolutionUnit fromJsonToSolutionUnit(String json) {
+        return new JSONDeserializer<SolutionUnit>()
+        .use(null, SolutionUnit.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<SolutionUnit> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<SolutionUnit> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<SolutionUnit> fromJsonArrayToSolutionUnits(String json) {
+        return new JSONDeserializer<List<SolutionUnit>>()
+        .use("values", SolutionUnit.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/SolutionUnit_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/SolutionUnit_Roo_Configurable.aj
deleted file mode 100644
index 733f7d323..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SolutionUnit_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SolutionUnit;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect SolutionUnit_Roo_Configurable {
-    
-    declare @type: SolutionUnit: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SolutionUnit_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/SolutionUnit_Roo_Finder.aj
deleted file mode 100644
index ff5c1fede..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SolutionUnit_Roo_Finder.aj
+++ /dev/null
@@ -1,126 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SolutionUnit;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect SolutionUnit_Roo_Finder {
-    
-    public static Long SolutionUnit.countFindSolutionUnitsByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = SolutionUnit.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SolutionUnit AS o WHERE o.code = :code", Long.class);
-        q.setParameter("code", code);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long SolutionUnit.countFindSolutionUnitsByCodeLike(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        code = code.replace('*', '%');
-        if (code.charAt(0) != '%') {
-            code = "%" + code;
-        }
-        if (code.charAt(code.length() - 1) != '%') {
-            code = code + "%";
-        }
-        EntityManager em = SolutionUnit.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SolutionUnit AS o WHERE LOWER(o.code) LIKE LOWER(:code)", Long.class);
-        q.setParameter("code", code);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long SolutionUnit.countFindSolutionUnitsByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = SolutionUnit.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SolutionUnit AS o WHERE o.name = :name", Long.class);
-        q.setParameter("name", name);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<SolutionUnit> SolutionUnit.findSolutionUnitsByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = SolutionUnit.entityManager();
-        TypedQuery<SolutionUnit> q = em.createQuery("SELECT o FROM SolutionUnit AS o WHERE o.code = :code", SolutionUnit.class);
-        q.setParameter("code", code);
-        return q;
-    }
-    
-    public static TypedQuery<SolutionUnit> SolutionUnit.findSolutionUnitsByCodeEquals(String code, String sortFieldName, String sortOrder) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = SolutionUnit.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SolutionUnit AS o WHERE o.code = :code");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<SolutionUnit> q = em.createQuery(queryBuilder.toString(), SolutionUnit.class);
-        q.setParameter("code", code);
-        return q;
-    }
-    
-    public static TypedQuery<SolutionUnit> SolutionUnit.findSolutionUnitsByCodeLike(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        code = code.replace('*', '%');
-        if (code.charAt(0) != '%') {
-            code = "%" + code;
-        }
-        if (code.charAt(code.length() - 1) != '%') {
-            code = code + "%";
-        }
-        EntityManager em = SolutionUnit.entityManager();
-        TypedQuery<SolutionUnit> q = em.createQuery("SELECT o FROM SolutionUnit AS o WHERE LOWER(o.code) LIKE LOWER(:code)", SolutionUnit.class);
-        q.setParameter("code", code);
-        return q;
-    }
-    
-    public static TypedQuery<SolutionUnit> SolutionUnit.findSolutionUnitsByCodeLike(String code, String sortFieldName, String sortOrder) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        code = code.replace('*', '%');
-        if (code.charAt(0) != '%') {
-            code = "%" + code;
-        }
-        if (code.charAt(code.length() - 1) != '%') {
-            code = code + "%";
-        }
-        EntityManager em = SolutionUnit.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SolutionUnit AS o WHERE LOWER(o.code) LIKE LOWER(:code)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<SolutionUnit> q = em.createQuery(queryBuilder.toString(), SolutionUnit.class);
-        q.setParameter("code", code);
-        return q;
-    }
-    
-    public static TypedQuery<SolutionUnit> SolutionUnit.findSolutionUnitsByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = SolutionUnit.entityManager();
-        TypedQuery<SolutionUnit> q = em.createQuery("SELECT o FROM SolutionUnit AS o WHERE o.name = :name", SolutionUnit.class);
-        q.setParameter("name", name);
-        return q;
-    }
-    
-    public static TypedQuery<SolutionUnit> SolutionUnit.findSolutionUnitsByNameEquals(String name, String sortFieldName, String sortOrder) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = SolutionUnit.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SolutionUnit AS o WHERE o.name = :name");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<SolutionUnit> q = em.createQuery(queryBuilder.toString(), SolutionUnit.class);
-        q.setParameter("name", name);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SolutionUnit_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/SolutionUnit_Roo_JavaBean.aj
deleted file mode 100644
index e26a29185..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SolutionUnit_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SolutionUnit;
-
-privileged aspect SolutionUnit_Roo_JavaBean {
-    
-    public String SolutionUnit.getName() {
-        return this.name;
-    }
-    
-    public void SolutionUnit.setName(String name) {
-        this.name = name;
-    }
-    
-    public String SolutionUnit.getCode() {
-        return this.code;
-    }
-    
-    public void SolutionUnit.setCode(String code) {
-        this.code = code;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SolutionUnit_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/SolutionUnit_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 825915b3c..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SolutionUnit_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SolutionUnit;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect SolutionUnit_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager SolutionUnit.entityManager;
-    
-    public static final List<String> SolutionUnit.fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
-    
-    public static final EntityManager SolutionUnit.entityManager() {
-        EntityManager em = new SolutionUnit().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long SolutionUnit.countSolutionUnits() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM SolutionUnit o", Long.class).getSingleResult();
-    }
-    
-    public static List<SolutionUnit> SolutionUnit.findAllSolutionUnits() {
-        return entityManager().createQuery("SELECT o FROM SolutionUnit o", SolutionUnit.class).getResultList();
-    }
-    
-    public static List<SolutionUnit> SolutionUnit.findAllSolutionUnits(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM SolutionUnit o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, SolutionUnit.class).getResultList();
-    }
-    
-    public static SolutionUnit SolutionUnit.findSolutionUnit(Long id) {
-        if (id == null) return null;
-        return entityManager().find(SolutionUnit.class, id);
-    }
-    
-    public static List<SolutionUnit> SolutionUnit.findSolutionUnitEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM SolutionUnit o", SolutionUnit.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<SolutionUnit> SolutionUnit.findSolutionUnitEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM SolutionUnit o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, SolutionUnit.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void SolutionUnit.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void SolutionUnit.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            SolutionUnit attached = SolutionUnit.findSolutionUnit(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void SolutionUnit.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void SolutionUnit.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public SolutionUnit SolutionUnit.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        SolutionUnit merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SolutionUnit_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/SolutionUnit_Roo_Jpa_Entity.aj
deleted file mode 100644
index b4ee8e502..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SolutionUnit_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SolutionUnit;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect SolutionUnit_Roo_Jpa_Entity {
-    
-    declare @type: SolutionUnit: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long SolutionUnit.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer SolutionUnit.version;
-    
-    public Long SolutionUnit.getId() {
-        return this.id;
-    }
-    
-    public void SolutionUnit.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer SolutionUnit.getVersion() {
-        return this.version;
-    }
-    
-    public void SolutionUnit.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SolutionUnit_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/SolutionUnit_Roo_Json.aj
deleted file mode 100644
index f8641b63e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SolutionUnit_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SolutionUnit;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect SolutionUnit_Roo_Json {
-    
-    public String SolutionUnit.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String SolutionUnit.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static SolutionUnit SolutionUnit.fromJsonToSolutionUnit(String json) {
-        return new JSONDeserializer<SolutionUnit>()
-        .use(null, SolutionUnit.class).deserialize(json);
-    }
-    
-    public static String SolutionUnit.toJsonArray(Collection<SolutionUnit> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String SolutionUnit.toJsonArray(Collection<SolutionUnit> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<SolutionUnit> SolutionUnit.fromJsonArrayToSolutionUnits(String json) {
-        return new JSONDeserializer<List<SolutionUnit>>()
-        .use("values", SolutionUnit.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SolutionUnit_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/SolutionUnit_Roo_ToString.aj
deleted file mode 100644
index 57b30233f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SolutionUnit_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SolutionUnit;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SolutionUnit_Roo_ToString {
-    
-    public String SolutionUnit.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound.java b/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound.java
index 178d2db4b..09a526d96 100644
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound.java
+++ b/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound.java
@@ -1,13 +1,20 @@
 package com.labsynch.labseer.domain;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
 import javax.persistence.Transient;
 import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
@@ -15,6 +22,8 @@
 
 import static java.lang.Math.toIntExact;
 
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
@@ -28,7 +37,10 @@
 import com.labsynch.labseer.chemclasses.CmpdRegMolecule.StandardizationStatus;
 import com.labsynch.labseer.dto.StandardizationDryRunSearchDTO;
 import com.labsynch.labseer.dto.configuration.StandardizerSettingsConfigDTO;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -311,4 +323,409 @@ public static StandardizationHistory addStatsToHistory(StandardizationHistory st
 
 		return(standardizationHistory);
 	}
+
+	public int getRunNumber() {
+        return this.runNumber;
+    }
+
+	public void setRunNumber(int runNumber) {
+        this.runNumber = runNumber;
+    }
+
+	public Date getQcDate() {
+        return this.qcDate;
+    }
+
+	public void setQcDate(Date qcDate) {
+        this.qcDate = qcDate;
+    }
+
+	public Long getParentId() {
+        return this.parentId;
+    }
+
+	public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+	public String getCorpName() {
+        return this.corpName;
+    }
+
+	public void setCorpName(String corpName) {
+        this.corpName = corpName;
+    }
+
+	public String getNewDuplicates() {
+        return this.newDuplicates;
+    }
+
+	public void setNewDuplicates(String newDuplicates) {
+        this.newDuplicates = newDuplicates;
+    }
+
+	public String getExistingDuplicates() {
+        return this.existingDuplicates;
+    }
+
+	public void setExistingDuplicates(String existingDuplicates) {
+        this.existingDuplicates = existingDuplicates;
+    }
+
+	public boolean isChangedStructure() {
+        return this.changedStructure;
+    }
+
+	public void setChangedStructure(boolean changedStructure) {
+        this.changedStructure = changedStructure;
+    }
+
+	public Double getOldMolWeight() {
+        return this.oldMolWeight;
+    }
+
+	public void setOldMolWeight(Double oldMolWeight) {
+        this.oldMolWeight = oldMolWeight;
+    }
+
+	public Double getNewMolWeight() {
+        return this.newMolWeight;
+    }
+
+	public void setNewMolWeight(Double newMolWeight) {
+        this.newMolWeight = newMolWeight;
+    }
+
+	public Double getDeltaMolWeight() {
+        return this.deltaMolWeight;
+    }
+
+	public void setDeltaMolWeight(Double deltaMolWeight) {
+        this.deltaMolWeight = deltaMolWeight;
+    }
+
+	public boolean isDisplayChange() {
+        return this.displayChange;
+    }
+
+	public void setDisplayChange(boolean displayChange) {
+        this.displayChange = displayChange;
+    }
+
+	public boolean isAsDrawnDisplayChange() {
+        return this.asDrawnDisplayChange;
+    }
+
+	public void setAsDrawnDisplayChange(boolean asDrawnDisplayChange) {
+        this.asDrawnDisplayChange = asDrawnDisplayChange;
+    }
+
+	public int getNewDuplicateCount() {
+        return this.newDuplicateCount;
+    }
+
+	public void setNewDuplicateCount(int newDuplicateCount) {
+        this.newDuplicateCount = newDuplicateCount;
+    }
+
+	public int getExistingDuplicateCount() {
+        return this.existingDuplicateCount;
+    }
+
+	public void setExistingDuplicateCount(int existingDuplicateCount) {
+        this.existingDuplicateCount = existingDuplicateCount;
+    }
+
+	public String getAlias() {
+        return this.alias;
+    }
+
+	public void setAlias(String alias) {
+        this.alias = alias;
+    }
+
+	public String getStereoCategory() {
+        return this.stereoCategory;
+    }
+
+	public void setStereoCategory(String stereoCategory) {
+        this.stereoCategory = stereoCategory;
+    }
+
+	public String getStereoComment() {
+        return this.stereoComment;
+    }
+
+	public void setStereoComment(String stereoComment) {
+        this.stereoComment = stereoComment;
+    }
+
+	public int getCdId() {
+        return this.CdId;
+    }
+
+	public void setCdId(int CdId) {
+        this.CdId = CdId;
+    }
+
+	public String getMolStructure() {
+        return this.molStructure;
+    }
+
+	public void setMolStructure(String molStructure) {
+        this.molStructure = molStructure;
+    }
+
+	public String getComment() {
+        return this.comment;
+    }
+
+	public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+	public boolean isIgnore() {
+        return this.ignore;
+    }
+
+	public void setIgnore(boolean ignore) {
+        this.ignore = ignore;
+    }
+
+	public StandardizationStatus getStandardizationStatus() {
+        return this.standardizationStatus;
+    }
+
+	public void setStandardizationStatus(StandardizationStatus standardizationStatus) {
+        this.standardizationStatus = standardizationStatus;
+    }
+
+	public String getStandardizationComment() {
+        return this.standardizationComment;
+    }
+
+	public void setStandardizationComment(String standardizationComment) {
+        this.standardizationComment = standardizationComment;
+    }
+
+	public RegistrationStatus getRegistrationStatus() {
+        return this.registrationStatus;
+    }
+
+	public void setRegistrationStatus(RegistrationStatus registrationStatus) {
+        this.registrationStatus = registrationStatus;
+    }
+
+	public String getRegistrationComment() {
+        return this.registrationComment;
+    }
+
+	public void setRegistrationComment(String registrationComment) {
+        this.registrationComment = registrationComment;
+    }
+
+	public static Long countFindStandardizationDryRunCompoundsByCdId(int CdId) {
+        EntityManager em = StandardizationDryRunCompound.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StandardizationDryRunCompound AS o WHERE o.CdId = :CdId", Long.class);
+        q.setParameter("CdId", CdId);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindStandardizationDryRunCompoundsByCorpNameEquals(String corpName) {
+        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+        EntityManager em = StandardizationDryRunCompound.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StandardizationDryRunCompound AS o WHERE o.corpName = :corpName", Long.class);
+        q.setParameter("corpName", corpName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<StandardizationDryRunCompound> findStandardizationDryRunCompoundsByCdId(int CdId) {
+        EntityManager em = StandardizationDryRunCompound.entityManager();
+        TypedQuery<StandardizationDryRunCompound> q = em.createQuery("SELECT o FROM StandardizationDryRunCompound AS o WHERE o.CdId = :CdId", StandardizationDryRunCompound.class);
+        q.setParameter("CdId", CdId);
+        return q;
+    }
+
+	public static TypedQuery<StandardizationDryRunCompound> findStandardizationDryRunCompoundsByCdId(int CdId, String sortFieldName, String sortOrder) {
+        EntityManager em = StandardizationDryRunCompound.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StandardizationDryRunCompound AS o WHERE o.CdId = :CdId");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<StandardizationDryRunCompound> q = em.createQuery(queryBuilder.toString(), StandardizationDryRunCompound.class);
+        q.setParameter("CdId", CdId);
+        return q;
+    }
+
+	public static TypedQuery<StandardizationDryRunCompound> findStandardizationDryRunCompoundsByCorpNameEquals(String corpName) {
+        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+        EntityManager em = StandardizationDryRunCompound.entityManager();
+        TypedQuery<StandardizationDryRunCompound> q = em.createQuery("SELECT o FROM StandardizationDryRunCompound AS o WHERE o.corpName = :corpName", StandardizationDryRunCompound.class);
+        q.setParameter("corpName", corpName);
+        return q;
+    }
+
+	public static TypedQuery<StandardizationDryRunCompound> findStandardizationDryRunCompoundsByCorpNameEquals(String corpName, String sortFieldName, String sortOrder) {
+        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+        EntityManager em = StandardizationDryRunCompound.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StandardizationDryRunCompound AS o WHERE o.corpName = :corpName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<StandardizationDryRunCompound> q = em.createQuery(queryBuilder.toString(), StandardizationDryRunCompound.class);
+        q.setParameter("corpName", corpName);
+        return q;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("runNumber", "qcDate", "parentId", "corpName", "newDuplicates", "existingDuplicates", "changedStructure", "oldMolWeight", "newMolWeight", "deltaMolWeight", "displayChange", "asDrawnDisplayChange", "newDuplicateCount", "existingDuplicateCount", "alias", "stereoCategory", "stereoComment", "CdId", "molStructure", "comment", "ignore", "standardizationStatus", "standardizationComment", "registrationStatus", "registrationComment");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new StandardizationDryRunCompound().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countStandardizationDryRunCompounds() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM StandardizationDryRunCompound o", Long.class).getSingleResult();
+    }
+
+	public static List<StandardizationDryRunCompound> findAllStandardizationDryRunCompounds() {
+        return entityManager().createQuery("SELECT o FROM StandardizationDryRunCompound o", StandardizationDryRunCompound.class).getResultList();
+    }
+
+	public static List<StandardizationDryRunCompound> findAllStandardizationDryRunCompounds(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM StandardizationDryRunCompound o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, StandardizationDryRunCompound.class).getResultList();
+    }
+
+	public static StandardizationDryRunCompound findStandardizationDryRunCompound(Long id) {
+        if (id == null) return null;
+        return entityManager().find(StandardizationDryRunCompound.class, id);
+    }
+
+	public static List<StandardizationDryRunCompound> findStandardizationDryRunCompoundEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM StandardizationDryRunCompound o", StandardizationDryRunCompound.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<StandardizationDryRunCompound> findStandardizationDryRunCompoundEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM StandardizationDryRunCompound o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, StandardizationDryRunCompound.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            StandardizationDryRunCompound attached = StandardizationDryRunCompound.findStandardizationDryRunCompound(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public StandardizationDryRunCompound merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        StandardizationDryRunCompound merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static StandardizationDryRunCompound fromJsonToStandardizationDryRunCompound(String json) {
+        return new JSONDeserializer<StandardizationDryRunCompound>()
+        .use(null, StandardizationDryRunCompound.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<StandardizationDryRunCompound> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<StandardizationDryRunCompound> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<StandardizationDryRunCompound> fromJsonArrayToStandardizationDryRunCompounds(String json) {
+        return new JSONDeserializer<List<StandardizationDryRunCompound>>()
+        .use("values", StandardizationDryRunCompound.class).deserialize(json);
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound_Roo_Finder.aj
deleted file mode 100644
index 0cfcfac3c..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound_Roo_Finder.aj
+++ /dev/null
@@ -1,71 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StandardizationDryRunCompound;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect StandardizationDryRunCompound_Roo_Finder {
-    
-    public static Long StandardizationDryRunCompound.countFindStandardizationDryRunCompoundsByCdId(int CdId) {
-        EntityManager em = StandardizationDryRunCompound.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StandardizationDryRunCompound AS o WHERE o.CdId = :CdId", Long.class);
-        q.setParameter("CdId", CdId);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long StandardizationDryRunCompound.countFindStandardizationDryRunCompoundsByCorpNameEquals(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        EntityManager em = StandardizationDryRunCompound.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StandardizationDryRunCompound AS o WHERE o.corpName = :corpName", Long.class);
-        q.setParameter("corpName", corpName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<StandardizationDryRunCompound> StandardizationDryRunCompound.findStandardizationDryRunCompoundsByCdId(int CdId) {
-        EntityManager em = StandardizationDryRunCompound.entityManager();
-        TypedQuery<StandardizationDryRunCompound> q = em.createQuery("SELECT o FROM StandardizationDryRunCompound AS o WHERE o.CdId = :CdId", StandardizationDryRunCompound.class);
-        q.setParameter("CdId", CdId);
-        return q;
-    }
-    
-    public static TypedQuery<StandardizationDryRunCompound> StandardizationDryRunCompound.findStandardizationDryRunCompoundsByCdId(int CdId, String sortFieldName, String sortOrder) {
-        EntityManager em = StandardizationDryRunCompound.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StandardizationDryRunCompound AS o WHERE o.CdId = :CdId");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<StandardizationDryRunCompound> q = em.createQuery(queryBuilder.toString(), StandardizationDryRunCompound.class);
-        q.setParameter("CdId", CdId);
-        return q;
-    }
-    
-    public static TypedQuery<StandardizationDryRunCompound> StandardizationDryRunCompound.findStandardizationDryRunCompoundsByCorpNameEquals(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        EntityManager em = StandardizationDryRunCompound.entityManager();
-        TypedQuery<StandardizationDryRunCompound> q = em.createQuery("SELECT o FROM StandardizationDryRunCompound AS o WHERE o.corpName = :corpName", StandardizationDryRunCompound.class);
-        q.setParameter("corpName", corpName);
-        return q;
-    }
-    
-    public static TypedQuery<StandardizationDryRunCompound> StandardizationDryRunCompound.findStandardizationDryRunCompoundsByCorpNameEquals(String corpName, String sortFieldName, String sortOrder) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        EntityManager em = StandardizationDryRunCompound.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StandardizationDryRunCompound AS o WHERE o.corpName = :corpName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<StandardizationDryRunCompound> q = em.createQuery(queryBuilder.toString(), StandardizationDryRunCompound.class);
-        q.setParameter("corpName", corpName);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound_Roo_JavaBean.aj
deleted file mode 100644
index a1efa8cb1..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound_Roo_JavaBean.aj
+++ /dev/null
@@ -1,213 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.chemclasses.CmpdRegMolecule.RegistrationStatus;
-import com.labsynch.labseer.chemclasses.CmpdRegMolecule.StandardizationStatus;
-import com.labsynch.labseer.domain.StandardizationDryRunCompound;
-import java.util.Date;
-
-privileged aspect StandardizationDryRunCompound_Roo_JavaBean {
-    
-    public int StandardizationDryRunCompound.getRunNumber() {
-        return this.runNumber;
-    }
-    
-    public void StandardizationDryRunCompound.setRunNumber(int runNumber) {
-        this.runNumber = runNumber;
-    }
-    
-    public Date StandardizationDryRunCompound.getQcDate() {
-        return this.qcDate;
-    }
-    
-    public void StandardizationDryRunCompound.setQcDate(Date qcDate) {
-        this.qcDate = qcDate;
-    }
-    
-    public Long StandardizationDryRunCompound.getParentId() {
-        return this.parentId;
-    }
-    
-    public void StandardizationDryRunCompound.setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-    
-    public String StandardizationDryRunCompound.getCorpName() {
-        return this.corpName;
-    }
-    
-    public void StandardizationDryRunCompound.setCorpName(String corpName) {
-        this.corpName = corpName;
-    }
-    
-    public String StandardizationDryRunCompound.getNewDuplicates() {
-        return this.newDuplicates;
-    }
-    
-    public void StandardizationDryRunCompound.setNewDuplicates(String newDuplicates) {
-        this.newDuplicates = newDuplicates;
-    }
-    
-    public String StandardizationDryRunCompound.getExistingDuplicates() {
-        return this.existingDuplicates;
-    }
-    
-    public void StandardizationDryRunCompound.setExistingDuplicates(String existingDuplicates) {
-        this.existingDuplicates = existingDuplicates;
-    }
-    
-    public boolean StandardizationDryRunCompound.isChangedStructure() {
-        return this.changedStructure;
-    }
-    
-    public void StandardizationDryRunCompound.setChangedStructure(boolean changedStructure) {
-        this.changedStructure = changedStructure;
-    }
-    
-    public Double StandardizationDryRunCompound.getOldMolWeight() {
-        return this.oldMolWeight;
-    }
-    
-    public void StandardizationDryRunCompound.setOldMolWeight(Double oldMolWeight) {
-        this.oldMolWeight = oldMolWeight;
-    }
-    
-    public Double StandardizationDryRunCompound.getNewMolWeight() {
-        return this.newMolWeight;
-    }
-    
-    public void StandardizationDryRunCompound.setNewMolWeight(Double newMolWeight) {
-        this.newMolWeight = newMolWeight;
-    }
-    
-    public Double StandardizationDryRunCompound.getDeltaMolWeight() {
-        return this.deltaMolWeight;
-    }
-    
-    public void StandardizationDryRunCompound.setDeltaMolWeight(Double deltaMolWeight) {
-        this.deltaMolWeight = deltaMolWeight;
-    }
-    
-    public boolean StandardizationDryRunCompound.isDisplayChange() {
-        return this.displayChange;
-    }
-    
-    public void StandardizationDryRunCompound.setDisplayChange(boolean displayChange) {
-        this.displayChange = displayChange;
-    }
-    
-    public boolean StandardizationDryRunCompound.isAsDrawnDisplayChange() {
-        return this.asDrawnDisplayChange;
-    }
-    
-    public void StandardizationDryRunCompound.setAsDrawnDisplayChange(boolean asDrawnDisplayChange) {
-        this.asDrawnDisplayChange = asDrawnDisplayChange;
-    }
-    
-    public int StandardizationDryRunCompound.getNewDuplicateCount() {
-        return this.newDuplicateCount;
-    }
-    
-    public void StandardizationDryRunCompound.setNewDuplicateCount(int newDuplicateCount) {
-        this.newDuplicateCount = newDuplicateCount;
-    }
-    
-    public int StandardizationDryRunCompound.getExistingDuplicateCount() {
-        return this.existingDuplicateCount;
-    }
-    
-    public void StandardizationDryRunCompound.setExistingDuplicateCount(int existingDuplicateCount) {
-        this.existingDuplicateCount = existingDuplicateCount;
-    }
-    
-    public String StandardizationDryRunCompound.getAlias() {
-        return this.alias;
-    }
-    
-    public void StandardizationDryRunCompound.setAlias(String alias) {
-        this.alias = alias;
-    }
-    
-    public String StandardizationDryRunCompound.getStereoCategory() {
-        return this.stereoCategory;
-    }
-    
-    public void StandardizationDryRunCompound.setStereoCategory(String stereoCategory) {
-        this.stereoCategory = stereoCategory;
-    }
-    
-    public String StandardizationDryRunCompound.getStereoComment() {
-        return this.stereoComment;
-    }
-    
-    public void StandardizationDryRunCompound.setStereoComment(String stereoComment) {
-        this.stereoComment = stereoComment;
-    }
-    
-    public int StandardizationDryRunCompound.getCdId() {
-        return this.CdId;
-    }
-    
-    public void StandardizationDryRunCompound.setCdId(int CdId) {
-        this.CdId = CdId;
-    }
-    
-    public String StandardizationDryRunCompound.getMolStructure() {
-        return this.molStructure;
-    }
-    
-    public void StandardizationDryRunCompound.setMolStructure(String molStructure) {
-        this.molStructure = molStructure;
-    }
-    
-    public String StandardizationDryRunCompound.getComment() {
-        return this.comment;
-    }
-    
-    public void StandardizationDryRunCompound.setComment(String comment) {
-        this.comment = comment;
-    }
-    
-    public boolean StandardizationDryRunCompound.isIgnore() {
-        return this.ignore;
-    }
-    
-    public void StandardizationDryRunCompound.setIgnore(boolean ignore) {
-        this.ignore = ignore;
-    }
-    
-    public StandardizationStatus StandardizationDryRunCompound.getStandardizationStatus() {
-        return this.standardizationStatus;
-    }
-    
-    public void StandardizationDryRunCompound.setStandardizationStatus(StandardizationStatus standardizationStatus) {
-        this.standardizationStatus = standardizationStatus;
-    }
-    
-    public String StandardizationDryRunCompound.getStandardizationComment() {
-        return this.standardizationComment;
-    }
-    
-    public void StandardizationDryRunCompound.setStandardizationComment(String standardizationComment) {
-        this.standardizationComment = standardizationComment;
-    }
-    
-    public RegistrationStatus StandardizationDryRunCompound.getRegistrationStatus() {
-        return this.registrationStatus;
-    }
-    
-    public void StandardizationDryRunCompound.setRegistrationStatus(RegistrationStatus registrationStatus) {
-        this.registrationStatus = registrationStatus;
-    }
-    
-    public String StandardizationDryRunCompound.getRegistrationComment() {
-        return this.registrationComment;
-    }
-    
-    public void StandardizationDryRunCompound.setRegistrationComment(String registrationComment) {
-        this.registrationComment = registrationComment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index aa5fdbeca..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StandardizationDryRunCompound;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect StandardizationDryRunCompound_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager StandardizationDryRunCompound.entityManager;
-    
-    public static final List<String> StandardizationDryRunCompound.fieldNames4OrderClauseFilter = java.util.Arrays.asList("runNumber", "qcDate", "parentId", "corpName", "newDuplicates", "existingDuplicates", "changedStructure", "oldMolWeight", "newMolWeight", "deltaMolWeight", "displayChange", "asDrawnDisplayChange", "newDuplicateCount", "existingDuplicateCount", "alias", "stereoCategory", "stereoComment", "CdId", "molStructure", "comment", "ignore", "standardizationStatus", "standardizationComment", "registrationStatus", "registrationComment");
-    
-    public static final EntityManager StandardizationDryRunCompound.entityManager() {
-        EntityManager em = new StandardizationDryRunCompound().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long StandardizationDryRunCompound.countStandardizationDryRunCompounds() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM StandardizationDryRunCompound o", Long.class).getSingleResult();
-    }
-    
-    public static List<StandardizationDryRunCompound> StandardizationDryRunCompound.findAllStandardizationDryRunCompounds() {
-        return entityManager().createQuery("SELECT o FROM StandardizationDryRunCompound o", StandardizationDryRunCompound.class).getResultList();
-    }
-    
-    public static List<StandardizationDryRunCompound> StandardizationDryRunCompound.findAllStandardizationDryRunCompounds(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM StandardizationDryRunCompound o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, StandardizationDryRunCompound.class).getResultList();
-    }
-    
-    public static StandardizationDryRunCompound StandardizationDryRunCompound.findStandardizationDryRunCompound(Long id) {
-        if (id == null) return null;
-        return entityManager().find(StandardizationDryRunCompound.class, id);
-    }
-    
-    public static List<StandardizationDryRunCompound> StandardizationDryRunCompound.findStandardizationDryRunCompoundEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM StandardizationDryRunCompound o", StandardizationDryRunCompound.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<StandardizationDryRunCompound> StandardizationDryRunCompound.findStandardizationDryRunCompoundEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM StandardizationDryRunCompound o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, StandardizationDryRunCompound.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void StandardizationDryRunCompound.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void StandardizationDryRunCompound.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            StandardizationDryRunCompound attached = StandardizationDryRunCompound.findStandardizationDryRunCompound(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void StandardizationDryRunCompound.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void StandardizationDryRunCompound.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public StandardizationDryRunCompound StandardizationDryRunCompound.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        StandardizationDryRunCompound merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound_Roo_Jpa_Entity.aj
deleted file mode 100644
index 4c4ea3d78..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StandardizationDryRunCompound;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect StandardizationDryRunCompound_Roo_Jpa_Entity {
-    
-    declare @type: StandardizationDryRunCompound: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long StandardizationDryRunCompound.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer StandardizationDryRunCompound.version;
-    
-    public Long StandardizationDryRunCompound.getId() {
-        return this.id;
-    }
-    
-    public void StandardizationDryRunCompound.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer StandardizationDryRunCompound.getVersion() {
-        return this.version;
-    }
-    
-    public void StandardizationDryRunCompound.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound_Roo_Json.aj
deleted file mode 100644
index 87c9b601f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StandardizationDryRunCompound;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect StandardizationDryRunCompound_Roo_Json {
-    
-    public String StandardizationDryRunCompound.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String StandardizationDryRunCompound.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static StandardizationDryRunCompound StandardizationDryRunCompound.fromJsonToStandardizationDryRunCompound(String json) {
-        return new JSONDeserializer<StandardizationDryRunCompound>()
-        .use(null, StandardizationDryRunCompound.class).deserialize(json);
-    }
-    
-    public static String StandardizationDryRunCompound.toJsonArray(Collection<StandardizationDryRunCompound> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String StandardizationDryRunCompound.toJsonArray(Collection<StandardizationDryRunCompound> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<StandardizationDryRunCompound> StandardizationDryRunCompound.fromJsonArrayToStandardizationDryRunCompounds(String json) {
-        return new JSONDeserializer<List<StandardizationDryRunCompound>>()
-        .use("values", StandardizationDryRunCompound.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound_Roo_ToString.aj
deleted file mode 100644
index 7eb5e688d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StandardizationDryRunCompound;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect StandardizationDryRunCompound_Roo_ToString {
-    
-    public String StandardizationDryRunCompound.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationHistory.java b/src/main/java/com/labsynch/labseer/domain/StandardizationHistory.java
index 03cf82cb8..bf02e56d7 100644
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationHistory.java
+++ b/src/main/java/com/labsynch/labseer/domain/StandardizationHistory.java
@@ -1,18 +1,30 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
 import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
-
+import javax.persistence.Version;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -70,4 +82,313 @@ public class StandardizationHistory {
 	public StandardizationHistory() {
 	}
 
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("id", "recordedDate", "settings", "settingsHash", "dryRunStatus", "dryRunStart", "dryRunComplete", "standardizationStatus", "standardizationUser", "standardizationReason", "standardizationStart", "standardizationComplete", "structuresStandardizedCount", "structuresUpdatedCount", "newDuplicateCount", "existingDuplicateCount", "displayChangeCount", "asDrawnDisplayChangeCount", "changedStructureCount", "dryRunStandardizationChangesCount", "standardizationErrorCount", "registrationErrorCount");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new StandardizationHistory().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countStandardizationHistorys() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM StandardizationHistory o", Long.class).getSingleResult();
+    }
+
+	public static List<StandardizationHistory> findAllStandardizationHistorys() {
+        return entityManager().createQuery("SELECT o FROM StandardizationHistory o", StandardizationHistory.class).getResultList();
+    }
+
+	public static List<StandardizationHistory> findAllStandardizationHistorys(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM StandardizationHistory o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, StandardizationHistory.class).getResultList();
+    }
+
+	public static StandardizationHistory findStandardizationHistory(Long id) {
+        if (id == null) return null;
+        return entityManager().find(StandardizationHistory.class, id);
+    }
+
+	public static List<StandardizationHistory> findStandardizationHistoryEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM StandardizationHistory o", StandardizationHistory.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<StandardizationHistory> findStandardizationHistoryEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM StandardizationHistory o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, StandardizationHistory.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            StandardizationHistory attached = StandardizationHistory.findStandardizationHistory(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public StandardizationHistory merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        StandardizationHistory merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static StandardizationHistory fromJsonToStandardizationHistory(String json) {
+        return new JSONDeserializer<StandardizationHistory>()
+        .use(null, StandardizationHistory.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<StandardizationHistory> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<StandardizationHistory> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<StandardizationHistory> fromJsonArrayToStandardizationHistorys(String json) {
+        return new JSONDeserializer<List<StandardizationHistory>>()
+        .use("values", StandardizationHistory.class).deserialize(json);
+    }
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Date getRecordedDate() {
+        return this.recordedDate;
+    }
+
+	public void setRecordedDate(Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+	public String getSettings() {
+        return this.settings;
+    }
+
+	public void setSettings(String settings) {
+        this.settings = settings;
+    }
+
+	public int getSettingsHash() {
+        return this.settingsHash;
+    }
+
+	public void setSettingsHash(int settingsHash) {
+        this.settingsHash = settingsHash;
+    }
+
+	public String getDryRunStatus() {
+        return this.dryRunStatus;
+    }
+
+	public void setDryRunStatus(String dryRunStatus) {
+        this.dryRunStatus = dryRunStatus;
+    }
+
+	public Date getDryRunStart() {
+        return this.dryRunStart;
+    }
+
+	public void setDryRunStart(Date dryRunStart) {
+        this.dryRunStart = dryRunStart;
+    }
+
+	public Date getDryRunComplete() {
+        return this.dryRunComplete;
+    }
+
+	public void setDryRunComplete(Date dryRunComplete) {
+        this.dryRunComplete = dryRunComplete;
+    }
+
+	public String getStandardizationStatus() {
+        return this.standardizationStatus;
+    }
+
+	public void setStandardizationStatus(String standardizationStatus) {
+        this.standardizationStatus = standardizationStatus;
+    }
+
+	public String getStandardizationUser() {
+        return this.standardizationUser;
+    }
+
+	public void setStandardizationUser(String standardizationUser) {
+        this.standardizationUser = standardizationUser;
+    }
+
+	public String getStandardizationReason() {
+        return this.standardizationReason;
+    }
+
+	public void setStandardizationReason(String standardizationReason) {
+        this.standardizationReason = standardizationReason;
+    }
+
+	public Date getStandardizationStart() {
+        return this.standardizationStart;
+    }
+
+	public void setStandardizationStart(Date standardizationStart) {
+        this.standardizationStart = standardizationStart;
+    }
+
+	public Date getStandardizationComplete() {
+        return this.standardizationComplete;
+    }
+
+	public void setStandardizationComplete(Date standardizationComplete) {
+        this.standardizationComplete = standardizationComplete;
+    }
+
+	public Integer getStructuresStandardizedCount() {
+        return this.structuresStandardizedCount;
+    }
+
+	public void setStructuresStandardizedCount(Integer structuresStandardizedCount) {
+        this.structuresStandardizedCount = structuresStandardizedCount;
+    }
+
+	public Integer getStructuresUpdatedCount() {
+        return this.structuresUpdatedCount;
+    }
+
+	public void setStructuresUpdatedCount(Integer structuresUpdatedCount) {
+        this.structuresUpdatedCount = structuresUpdatedCount;
+    }
+
+	public Integer getNewDuplicateCount() {
+        return this.newDuplicateCount;
+    }
+
+	public void setNewDuplicateCount(Integer newDuplicateCount) {
+        this.newDuplicateCount = newDuplicateCount;
+    }
+
+	public Integer getExistingDuplicateCount() {
+        return this.existingDuplicateCount;
+    }
+
+	public void setExistingDuplicateCount(Integer existingDuplicateCount) {
+        this.existingDuplicateCount = existingDuplicateCount;
+    }
+
+	public Integer getDisplayChangeCount() {
+        return this.displayChangeCount;
+    }
+
+	public void setDisplayChangeCount(Integer displayChangeCount) {
+        this.displayChangeCount = displayChangeCount;
+    }
+
+	public Integer getAsDrawnDisplayChangeCount() {
+        return this.asDrawnDisplayChangeCount;
+    }
+
+	public void setAsDrawnDisplayChangeCount(Integer asDrawnDisplayChangeCount) {
+        this.asDrawnDisplayChangeCount = asDrawnDisplayChangeCount;
+    }
+
+	public Integer getChangedStructureCount() {
+        return this.changedStructureCount;
+    }
+
+	public void setChangedStructureCount(Integer changedStructureCount) {
+        this.changedStructureCount = changedStructureCount;
+    }
+
+	public Integer getDryRunStandardizationChangesCount() {
+        return this.dryRunStandardizationChangesCount;
+    }
+
+	public void setDryRunStandardizationChangesCount(Integer dryRunStandardizationChangesCount) {
+        this.dryRunStandardizationChangesCount = dryRunStandardizationChangesCount;
+    }
+
+	public Integer getStandardizationErrorCount() {
+        return this.standardizationErrorCount;
+    }
+
+	public void setStandardizationErrorCount(Integer standardizationErrorCount) {
+        this.standardizationErrorCount = standardizationErrorCount;
+    }
+
+	public Integer getRegistrationErrorCount() {
+        return this.registrationErrorCount;
+    }
+
+	public void setRegistrationErrorCount(Integer registrationErrorCount) {
+        this.registrationErrorCount = registrationErrorCount;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationHistory_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/StandardizationHistory_Roo_Configurable.aj
deleted file mode 100644
index dba4166c6..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationHistory_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StandardizationHistory;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect StandardizationHistory_Roo_Configurable {
-    
-    declare @type: StandardizationHistory: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationHistory_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/StandardizationHistory_Roo_JavaBean.aj
deleted file mode 100644
index cd2d094a6..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationHistory_Roo_JavaBean.aj
+++ /dev/null
@@ -1,187 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StandardizationHistory;
-import java.util.Date;
-
-privileged aspect StandardizationHistory_Roo_JavaBean {
-    
-    public Long StandardizationHistory.getId() {
-        return this.id;
-    }
-    
-    public void StandardizationHistory.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Date StandardizationHistory.getRecordedDate() {
-        return this.recordedDate;
-    }
-    
-    public void StandardizationHistory.setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
-    
-    public String StandardizationHistory.getSettings() {
-        return this.settings;
-    }
-    
-    public void StandardizationHistory.setSettings(String settings) {
-        this.settings = settings;
-    }
-    
-    public int StandardizationHistory.getSettingsHash() {
-        return this.settingsHash;
-    }
-    
-    public void StandardizationHistory.setSettingsHash(int settingsHash) {
-        this.settingsHash = settingsHash;
-    }
-    
-    public String StandardizationHistory.getDryRunStatus() {
-        return this.dryRunStatus;
-    }
-    
-    public void StandardizationHistory.setDryRunStatus(String dryRunStatus) {
-        this.dryRunStatus = dryRunStatus;
-    }
-    
-    public Date StandardizationHistory.getDryRunStart() {
-        return this.dryRunStart;
-    }
-    
-    public void StandardizationHistory.setDryRunStart(Date dryRunStart) {
-        this.dryRunStart = dryRunStart;
-    }
-    
-    public Date StandardizationHistory.getDryRunComplete() {
-        return this.dryRunComplete;
-    }
-    
-    public void StandardizationHistory.setDryRunComplete(Date dryRunComplete) {
-        this.dryRunComplete = dryRunComplete;
-    }
-    
-    public String StandardizationHistory.getStandardizationStatus() {
-        return this.standardizationStatus;
-    }
-    
-    public void StandardizationHistory.setStandardizationStatus(String standardizationStatus) {
-        this.standardizationStatus = standardizationStatus;
-    }
-    
-    public String StandardizationHistory.getStandardizationUser() {
-        return this.standardizationUser;
-    }
-    
-    public void StandardizationHistory.setStandardizationUser(String standardizationUser) {
-        this.standardizationUser = standardizationUser;
-    }
-    
-    public String StandardizationHistory.getStandardizationReason() {
-        return this.standardizationReason;
-    }
-    
-    public void StandardizationHistory.setStandardizationReason(String standardizationReason) {
-        this.standardizationReason = standardizationReason;
-    }
-    
-    public Date StandardizationHistory.getStandardizationStart() {
-        return this.standardizationStart;
-    }
-    
-    public void StandardizationHistory.setStandardizationStart(Date standardizationStart) {
-        this.standardizationStart = standardizationStart;
-    }
-    
-    public Date StandardizationHistory.getStandardizationComplete() {
-        return this.standardizationComplete;
-    }
-    
-    public void StandardizationHistory.setStandardizationComplete(Date standardizationComplete) {
-        this.standardizationComplete = standardizationComplete;
-    }
-    
-    public Integer StandardizationHistory.getStructuresStandardizedCount() {
-        return this.structuresStandardizedCount;
-    }
-    
-    public void StandardizationHistory.setStructuresStandardizedCount(Integer structuresStandardizedCount) {
-        this.structuresStandardizedCount = structuresStandardizedCount;
-    }
-    
-    public Integer StandardizationHistory.getStructuresUpdatedCount() {
-        return this.structuresUpdatedCount;
-    }
-    
-    public void StandardizationHistory.setStructuresUpdatedCount(Integer structuresUpdatedCount) {
-        this.structuresUpdatedCount = structuresUpdatedCount;
-    }
-    
-    public Integer StandardizationHistory.getNewDuplicateCount() {
-        return this.newDuplicateCount;
-    }
-    
-    public void StandardizationHistory.setNewDuplicateCount(Integer newDuplicateCount) {
-        this.newDuplicateCount = newDuplicateCount;
-    }
-    
-    public Integer StandardizationHistory.getExistingDuplicateCount() {
-        return this.existingDuplicateCount;
-    }
-    
-    public void StandardizationHistory.setExistingDuplicateCount(Integer existingDuplicateCount) {
-        this.existingDuplicateCount = existingDuplicateCount;
-    }
-    
-    public Integer StandardizationHistory.getDisplayChangeCount() {
-        return this.displayChangeCount;
-    }
-    
-    public void StandardizationHistory.setDisplayChangeCount(Integer displayChangeCount) {
-        this.displayChangeCount = displayChangeCount;
-    }
-    
-    public Integer StandardizationHistory.getAsDrawnDisplayChangeCount() {
-        return this.asDrawnDisplayChangeCount;
-    }
-    
-    public void StandardizationHistory.setAsDrawnDisplayChangeCount(Integer asDrawnDisplayChangeCount) {
-        this.asDrawnDisplayChangeCount = asDrawnDisplayChangeCount;
-    }
-    
-    public Integer StandardizationHistory.getChangedStructureCount() {
-        return this.changedStructureCount;
-    }
-    
-    public void StandardizationHistory.setChangedStructureCount(Integer changedStructureCount) {
-        this.changedStructureCount = changedStructureCount;
-    }
-    
-    public Integer StandardizationHistory.getDryRunStandardizationChangesCount() {
-        return this.dryRunStandardizationChangesCount;
-    }
-    
-    public void StandardizationHistory.setDryRunStandardizationChangesCount(Integer dryRunStandardizationChangesCount) {
-        this.dryRunStandardizationChangesCount = dryRunStandardizationChangesCount;
-    }
-    
-    public Integer StandardizationHistory.getStandardizationErrorCount() {
-        return this.standardizationErrorCount;
-    }
-    
-    public void StandardizationHistory.setStandardizationErrorCount(Integer standardizationErrorCount) {
-        this.standardizationErrorCount = standardizationErrorCount;
-    }
-    
-    public Integer StandardizationHistory.getRegistrationErrorCount() {
-        return this.registrationErrorCount;
-    }
-    
-    public void StandardizationHistory.setRegistrationErrorCount(Integer registrationErrorCount) {
-        this.registrationErrorCount = registrationErrorCount;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationHistory_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/StandardizationHistory_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 6a47c036f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationHistory_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StandardizationHistory;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect StandardizationHistory_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager StandardizationHistory.entityManager;
-    
-    public static final List<String> StandardizationHistory.fieldNames4OrderClauseFilter = java.util.Arrays.asList("id", "recordedDate", "settings", "settingsHash", "dryRunStatus", "dryRunStart", "dryRunComplete", "standardizationStatus", "standardizationUser", "standardizationReason", "standardizationStart", "standardizationComplete", "structuresStandardizedCount", "structuresUpdatedCount", "newDuplicateCount", "existingDuplicateCount", "displayChangeCount", "asDrawnDisplayChangeCount", "changedStructureCount", "dryRunStandardizationChangesCount", "standardizationErrorCount", "registrationErrorCount");
-    
-    public static final EntityManager StandardizationHistory.entityManager() {
-        EntityManager em = new StandardizationHistory().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long StandardizationHistory.countStandardizationHistorys() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM StandardizationHistory o", Long.class).getSingleResult();
-    }
-    
-    public static List<StandardizationHistory> StandardizationHistory.findAllStandardizationHistorys() {
-        return entityManager().createQuery("SELECT o FROM StandardizationHistory o", StandardizationHistory.class).getResultList();
-    }
-    
-    public static List<StandardizationHistory> StandardizationHistory.findAllStandardizationHistorys(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM StandardizationHistory o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, StandardizationHistory.class).getResultList();
-    }
-    
-    public static StandardizationHistory StandardizationHistory.findStandardizationHistory(Long id) {
-        if (id == null) return null;
-        return entityManager().find(StandardizationHistory.class, id);
-    }
-    
-    public static List<StandardizationHistory> StandardizationHistory.findStandardizationHistoryEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM StandardizationHistory o", StandardizationHistory.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<StandardizationHistory> StandardizationHistory.findStandardizationHistoryEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM StandardizationHistory o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, StandardizationHistory.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void StandardizationHistory.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void StandardizationHistory.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            StandardizationHistory attached = StandardizationHistory.findStandardizationHistory(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void StandardizationHistory.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void StandardizationHistory.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public StandardizationHistory StandardizationHistory.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        StandardizationHistory merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationHistory_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/StandardizationHistory_Roo_Jpa_Entity.aj
deleted file mode 100644
index ed9e0d9c7..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationHistory_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,27 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StandardizationHistory;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Version;
-
-privileged aspect StandardizationHistory_Roo_Jpa_Entity {
-    
-    declare @type: StandardizationHistory: @Entity;
-    
-    @Version
-    @Column(name = "version")
-    private Integer StandardizationHistory.version;
-    
-    public Integer StandardizationHistory.getVersion() {
-        return this.version;
-    }
-    
-    public void StandardizationHistory.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationHistory_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/StandardizationHistory_Roo_Json.aj
deleted file mode 100644
index ec79badb5..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationHistory_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StandardizationHistory;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect StandardizationHistory_Roo_Json {
-    
-    public String StandardizationHistory.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String StandardizationHistory.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static StandardizationHistory StandardizationHistory.fromJsonToStandardizationHistory(String json) {
-        return new JSONDeserializer<StandardizationHistory>()
-        .use(null, StandardizationHistory.class).deserialize(json);
-    }
-    
-    public static String StandardizationHistory.toJsonArray(Collection<StandardizationHistory> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String StandardizationHistory.toJsonArray(Collection<StandardizationHistory> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<StandardizationHistory> StandardizationHistory.fromJsonArrayToStandardizationHistorys(String json) {
-        return new JSONDeserializer<List<StandardizationHistory>>()
-        .use("values", StandardizationHistory.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationHistory_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/StandardizationHistory_Roo_ToString.aj
deleted file mode 100644
index 1fd92c6e6..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationHistory_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StandardizationHistory;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect StandardizationHistory_Roo_ToString {
-    
-    public String StandardizationHistory.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationSettings.java b/src/main/java/com/labsynch/labseer/domain/StandardizationSettings.java
index ead339c9c..c6eb74b0e 100644
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationSettings.java
+++ b/src/main/java/com/labsynch/labseer/domain/StandardizationSettings.java
@@ -3,14 +3,30 @@
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
-
-
+import org.springframework.transaction.annotation.Transactional;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
+import javax.persistence.TypedQuery;
+import javax.persistence.Version;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -27,4 +43,197 @@ public class StandardizationSettings {
      */
     private Boolean needsStandardization;
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static StandardizationSettings fromJsonToStandardizationSettings(String json) {
+        return new JSONDeserializer<StandardizationSettings>()
+        .use(null, StandardizationSettings.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<StandardizationSettings> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<StandardizationSettings> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<StandardizationSettings> fromJsonArrayToStandardizationSettingses(String json) {
+        return new JSONDeserializer<List<StandardizationSettings>>()
+        .use("values", StandardizationSettings.class).deserialize(json);
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("modifiedDate", "needsStandardization");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new StandardizationSettings().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countStandardizationSettingses() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM StandardizationSettings o", Long.class).getSingleResult();
+    }
+
+	public static List<StandardizationSettings> findAllStandardizationSettingses() {
+        return entityManager().createQuery("SELECT o FROM StandardizationSettings o", StandardizationSettings.class).getResultList();
+    }
+
+	public static List<StandardizationSettings> findAllStandardizationSettingses(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM StandardizationSettings o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, StandardizationSettings.class).getResultList();
+    }
+
+	public static StandardizationSettings findStandardizationSettings(Long id) {
+        if (id == null) return null;
+        return entityManager().find(StandardizationSettings.class, id);
+    }
+
+	public static List<StandardizationSettings> findStandardizationSettingsEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM StandardizationSettings o", StandardizationSettings.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<StandardizationSettings> findStandardizationSettingsEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM StandardizationSettings o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, StandardizationSettings.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            StandardizationSettings attached = StandardizationSettings.findStandardizationSettings(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public StandardizationSettings merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        StandardizationSettings merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public static Long countFindStandardizationSettingsesByNeedsStandardization(Boolean needsStandardization) {
+        if (needsStandardization == null) throw new IllegalArgumentException("The needsStandardization argument is required");
+        EntityManager em = StandardizationSettings.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StandardizationSettings AS o WHERE o.needsStandardization = :needsStandardization", Long.class);
+        q.setParameter("needsStandardization", needsStandardization);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<StandardizationSettings> findStandardizationSettingsesByNeedsStandardization(Boolean needsStandardization) {
+        if (needsStandardization == null) throw new IllegalArgumentException("The needsStandardization argument is required");
+        EntityManager em = StandardizationSettings.entityManager();
+        TypedQuery<StandardizationSettings> q = em.createQuery("SELECT o FROM StandardizationSettings AS o WHERE o.needsStandardization = :needsStandardization", StandardizationSettings.class);
+        q.setParameter("needsStandardization", needsStandardization);
+        return q;
+    }
+
+	public static TypedQuery<StandardizationSettings> findStandardizationSettingsesByNeedsStandardization(Boolean needsStandardization, String sortFieldName, String sortOrder) {
+        if (needsStandardization == null) throw new IllegalArgumentException("The needsStandardization argument is required");
+        EntityManager em = StandardizationSettings.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StandardizationSettings AS o WHERE o.needsStandardization = :needsStandardization");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<StandardizationSettings> q = em.createQuery(queryBuilder.toString(), StandardizationSettings.class);
+        q.setParameter("needsStandardization", needsStandardization);
+        return q;
+    }
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public Date getModifiedDate() {
+        return this.modifiedDate;
+    }
+
+	public void setModifiedDate(Date modifiedDate) {
+        this.modifiedDate = modifiedDate;
+    }
+
+	public Boolean getNeedsStandardization() {
+        return this.needsStandardization;
+    }
+
+	public void setNeedsStandardization(Boolean needsStandardization) {
+        this.needsStandardization = needsStandardization;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationSettings_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/StandardizationSettings_Roo_Configurable.aj
deleted file mode 100644
index 6c370597e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationSettings_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StandardizationSettings;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect StandardizationSettings_Roo_Configurable {
-    
-    declare @type: StandardizationSettings: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationSettings_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/StandardizationSettings_Roo_Finder.aj
deleted file mode 100644
index 6e46c51b8..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationSettings_Roo_Finder.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StandardizationSettings;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect StandardizationSettings_Roo_Finder {
-    
-    public static Long StandardizationSettings.countFindStandardizationSettingsesByNeedsStandardization(Boolean needsStandardization) {
-        if (needsStandardization == null) throw new IllegalArgumentException("The needsStandardization argument is required");
-        EntityManager em = StandardizationSettings.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StandardizationSettings AS o WHERE o.needsStandardization = :needsStandardization", Long.class);
-        q.setParameter("needsStandardization", needsStandardization);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<StandardizationSettings> StandardizationSettings.findStandardizationSettingsesByNeedsStandardization(Boolean needsStandardization) {
-        if (needsStandardization == null) throw new IllegalArgumentException("The needsStandardization argument is required");
-        EntityManager em = StandardizationSettings.entityManager();
-        TypedQuery<StandardizationSettings> q = em.createQuery("SELECT o FROM StandardizationSettings AS o WHERE o.needsStandardization = :needsStandardization", StandardizationSettings.class);
-        q.setParameter("needsStandardization", needsStandardization);
-        return q;
-    }
-    
-    public static TypedQuery<StandardizationSettings> StandardizationSettings.findStandardizationSettingsesByNeedsStandardization(Boolean needsStandardization, String sortFieldName, String sortOrder) {
-        if (needsStandardization == null) throw new IllegalArgumentException("The needsStandardization argument is required");
-        EntityManager em = StandardizationSettings.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StandardizationSettings AS o WHERE o.needsStandardization = :needsStandardization");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<StandardizationSettings> q = em.createQuery(queryBuilder.toString(), StandardizationSettings.class);
-        q.setParameter("needsStandardization", needsStandardization);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationSettings_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/StandardizationSettings_Roo_JavaBean.aj
deleted file mode 100644
index 58bd1a79f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationSettings_Roo_JavaBean.aj
+++ /dev/null
@@ -1,27 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StandardizationSettings;
-import java.util.Date;
-
-privileged aspect StandardizationSettings_Roo_JavaBean {
-    
-    public Date StandardizationSettings.getModifiedDate() {
-        return this.modifiedDate;
-    }
-    
-    public void StandardizationSettings.setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
-    
-    public Boolean StandardizationSettings.getNeedsStandardization() {
-        return this.needsStandardization;
-    }
-    
-    public void StandardizationSettings.setNeedsStandardization(Boolean needsStandardization) {
-        this.needsStandardization = needsStandardization;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationSettings_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/StandardizationSettings_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index a106942de..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationSettings_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StandardizationSettings;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect StandardizationSettings_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager StandardizationSettings.entityManager;
-    
-    public static final List<String> StandardizationSettings.fieldNames4OrderClauseFilter = java.util.Arrays.asList("modifiedDate", "needsStandardization");
-    
-    public static final EntityManager StandardizationSettings.entityManager() {
-        EntityManager em = new StandardizationSettings().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long StandardizationSettings.countStandardizationSettingses() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM StandardizationSettings o", Long.class).getSingleResult();
-    }
-    
-    public static List<StandardizationSettings> StandardizationSettings.findAllStandardizationSettingses() {
-        return entityManager().createQuery("SELECT o FROM StandardizationSettings o", StandardizationSettings.class).getResultList();
-    }
-    
-    public static List<StandardizationSettings> StandardizationSettings.findAllStandardizationSettingses(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM StandardizationSettings o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, StandardizationSettings.class).getResultList();
-    }
-    
-    public static StandardizationSettings StandardizationSettings.findStandardizationSettings(Long id) {
-        if (id == null) return null;
-        return entityManager().find(StandardizationSettings.class, id);
-    }
-    
-    public static List<StandardizationSettings> StandardizationSettings.findStandardizationSettingsEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM StandardizationSettings o", StandardizationSettings.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<StandardizationSettings> StandardizationSettings.findStandardizationSettingsEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM StandardizationSettings o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, StandardizationSettings.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void StandardizationSettings.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void StandardizationSettings.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            StandardizationSettings attached = StandardizationSettings.findStandardizationSettings(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void StandardizationSettings.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void StandardizationSettings.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public StandardizationSettings StandardizationSettings.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        StandardizationSettings merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationSettings_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/StandardizationSettings_Roo_Jpa_Entity.aj
deleted file mode 100644
index 277d53432..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationSettings_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StandardizationSettings;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect StandardizationSettings_Roo_Jpa_Entity {
-    
-    declare @type: StandardizationSettings: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long StandardizationSettings.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer StandardizationSettings.version;
-    
-    public Long StandardizationSettings.getId() {
-        return this.id;
-    }
-    
-    public void StandardizationSettings.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer StandardizationSettings.getVersion() {
-        return this.version;
-    }
-    
-    public void StandardizationSettings.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationSettings_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/StandardizationSettings_Roo_Json.aj
deleted file mode 100644
index f09a6995a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationSettings_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StandardizationSettings;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect StandardizationSettings_Roo_Json {
-    
-    public String StandardizationSettings.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String StandardizationSettings.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static StandardizationSettings StandardizationSettings.fromJsonToStandardizationSettings(String json) {
-        return new JSONDeserializer<StandardizationSettings>()
-        .use(null, StandardizationSettings.class).deserialize(json);
-    }
-    
-    public static String StandardizationSettings.toJsonArray(Collection<StandardizationSettings> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String StandardizationSettings.toJsonArray(Collection<StandardizationSettings> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<StandardizationSettings> StandardizationSettings.fromJsonArrayToStandardizationSettingses(String json) {
-        return new JSONDeserializer<List<StandardizationSettings>>()
-        .use("values", StandardizationSettings.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationSettings_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/StandardizationSettings_Roo_ToString.aj
deleted file mode 100644
index df1d4facb..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationSettings_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StandardizationSettings;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect StandardizationSettings_Roo_ToString {
-    
-    public String StandardizationSettings.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StateKind.java b/src/main/java/com/labsynch/labseer/domain/StateKind.java
index f2c5e29d1..59782fdc0 100755
--- a/src/main/java/com/labsynch/labseer/domain/StateKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/StateKind.java
@@ -1,5 +1,8 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.List;
 
 import javax.persistence.Column;
@@ -12,18 +15,22 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
 @Entity
 @RooJavaBean
 @RooToString
@@ -155,4 +162,185 @@ public static StateKind getOrCreate(StateType lsType, String kindName) {
 		
 		return lsKind;
 	}
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static StateKind fromJsonToStateKind(String json) {
+        return new JSONDeserializer<StateKind>()
+        .use(null, StateKind.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<StateKind> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<StateKind> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<StateKind> fromJsonArrayToStateKinds(String json) {
+        return new JSONDeserializer<List<StateKind>>()
+        .use("values", StateKind.class).deserialize(json);
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
+
+	public static List<StateKind> findAllStateKinds(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM StateKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, StateKind.class).getResultList();
+    }
+
+	public static List<StateKind> findStateKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM StateKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, StateKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static Long countFindStateKindsByKindNameEquals(String kindName) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        EntityManager em = StateKind.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StateKind AS o WHERE o.kindName = :kindName", Long.class);
+        q.setParameter("kindName", kindName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindStateKindsByKindNameEqualsAndLsType(String kindName, StateType lsType) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = StateKind.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StateKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindStateKindsByLsType(StateType lsType) {
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = StateKind.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StateKind AS o WHERE o.lsType = :lsType", Long.class);
+        q.setParameter("lsType", lsType);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<StateKind> findStateKindsByKindNameEquals(String kindName) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        EntityManager em = StateKind.entityManager();
+        TypedQuery<StateKind> q = em.createQuery("SELECT o FROM StateKind AS o WHERE o.kindName = :kindName", StateKind.class);
+        q.setParameter("kindName", kindName);
+        return q;
+    }
+
+	public static TypedQuery<StateKind> findStateKindsByKindNameEquals(String kindName, String sortFieldName, String sortOrder) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        EntityManager em = StateKind.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StateKind AS o WHERE o.kindName = :kindName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<StateKind> q = em.createQuery(queryBuilder.toString(), StateKind.class);
+        q.setParameter("kindName", kindName);
+        return q;
+    }
+
+	public static TypedQuery<StateKind> findStateKindsByKindNameEqualsAndLsType(String kindName, StateType lsType) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = StateKind.entityManager();
+        TypedQuery<StateKind> q = em.createQuery("SELECT o FROM StateKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", StateKind.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<StateKind> findStateKindsByKindNameEqualsAndLsType(String kindName, StateType lsType, String sortFieldName, String sortOrder) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = StateKind.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StateKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<StateKind> q = em.createQuery(queryBuilder.toString(), StateKind.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<StateKind> findStateKindsByLsType(StateType lsType) {
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = StateKind.entityManager();
+        TypedQuery<StateKind> q = em.createQuery("SELECT o FROM StateKind AS o WHERE o.lsType = :lsType", StateKind.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<StateKind> findStateKindsByLsType(StateType lsType, String sortFieldName, String sortOrder) {
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = StateKind.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StateKind AS o WHERE o.lsType = :lsType");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<StateKind> q = em.createQuery(queryBuilder.toString(), StateKind.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public StateType getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(StateType lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getKindName() {
+        return this.kindName;
+    }
+
+	public void setKindName(String kindName) {
+        this.kindName = kindName;
+    }
+
+	public String getLsTypeAndKind() {
+        return this.lsTypeAndKind;
+    }
+
+	public void setLsTypeAndKind(String lsTypeAndKind) {
+        this.lsTypeAndKind = lsTypeAndKind;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/StateKind_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/StateKind_Roo_Configurable.aj
deleted file mode 100755
index 4062d4f82..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StateKind_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StateKind;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect StateKind_Roo_Configurable {
-    
-    declare @type: StateKind: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StateKind_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/StateKind_Roo_Finder.aj
deleted file mode 100755
index b4305ec2b..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StateKind_Roo_Finder.aj
+++ /dev/null
@@ -1,112 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StateKind;
-import com.labsynch.labseer.domain.StateType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect StateKind_Roo_Finder {
-    
-    public static Long StateKind.countFindStateKindsByKindNameEquals(String kindName) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        EntityManager em = StateKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StateKind AS o WHERE o.kindName = :kindName", Long.class);
-        q.setParameter("kindName", kindName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long StateKind.countFindStateKindsByKindNameEqualsAndLsType(String kindName, StateType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = StateKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StateKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long StateKind.countFindStateKindsByLsType(StateType lsType) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = StateKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StateKind AS o WHERE o.lsType = :lsType", Long.class);
-        q.setParameter("lsType", lsType);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<StateKind> StateKind.findStateKindsByKindNameEquals(String kindName) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        EntityManager em = StateKind.entityManager();
-        TypedQuery<StateKind> q = em.createQuery("SELECT o FROM StateKind AS o WHERE o.kindName = :kindName", StateKind.class);
-        q.setParameter("kindName", kindName);
-        return q;
-    }
-    
-    public static TypedQuery<StateKind> StateKind.findStateKindsByKindNameEquals(String kindName, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        EntityManager em = StateKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StateKind AS o WHERE o.kindName = :kindName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<StateKind> q = em.createQuery(queryBuilder.toString(), StateKind.class);
-        q.setParameter("kindName", kindName);
-        return q;
-    }
-    
-    public static TypedQuery<StateKind> StateKind.findStateKindsByKindNameEqualsAndLsType(String kindName, StateType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = StateKind.entityManager();
-        TypedQuery<StateKind> q = em.createQuery("SELECT o FROM StateKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", StateKind.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<StateKind> StateKind.findStateKindsByKindNameEqualsAndLsType(String kindName, StateType lsType, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = StateKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StateKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<StateKind> q = em.createQuery(queryBuilder.toString(), StateKind.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<StateKind> StateKind.findStateKindsByLsType(StateType lsType) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = StateKind.entityManager();
-        TypedQuery<StateKind> q = em.createQuery("SELECT o FROM StateKind AS o WHERE o.lsType = :lsType", StateKind.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<StateKind> StateKind.findStateKindsByLsType(StateType lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = StateKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StateKind AS o WHERE o.lsType = :lsType");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<StateKind> q = em.createQuery(queryBuilder.toString(), StateKind.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StateKind_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/StateKind_Roo_JavaBean.aj
deleted file mode 100755
index 121637c0d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StateKind_Roo_JavaBean.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StateKind;
-import com.labsynch.labseer.domain.StateType;
-
-privileged aspect StateKind_Roo_JavaBean {
-    
-    public StateType StateKind.getLsType() {
-        return this.lsType;
-    }
-    
-    public void StateKind.setLsType(StateType lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String StateKind.getKindName() {
-        return this.kindName;
-    }
-    
-    public void StateKind.setKindName(String kindName) {
-        this.kindName = kindName;
-    }
-    
-    public String StateKind.getLsTypeAndKind() {
-        return this.lsTypeAndKind;
-    }
-    
-    public void StateKind.setLsTypeAndKind(String lsTypeAndKind) {
-        this.lsTypeAndKind = lsTypeAndKind;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StateKind_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/StateKind_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 336156730..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StateKind_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StateKind;
-import java.util.List;
-
-privileged aspect StateKind_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> StateKind.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
-    
-    public static List<StateKind> StateKind.findAllStateKinds(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM StateKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, StateKind.class).getResultList();
-    }
-    
-    public static List<StateKind> StateKind.findStateKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM StateKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, StateKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StateKind_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/StateKind_Roo_Json.aj
deleted file mode 100755
index c93d5c1db..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StateKind_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StateKind;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect StateKind_Roo_Json {
-    
-    public String StateKind.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String StateKind.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static StateKind StateKind.fromJsonToStateKind(String json) {
-        return new JSONDeserializer<StateKind>()
-        .use(null, StateKind.class).deserialize(json);
-    }
-    
-    public static String StateKind.toJsonArray(Collection<StateKind> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String StateKind.toJsonArray(Collection<StateKind> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<StateKind> StateKind.fromJsonArrayToStateKinds(String json) {
-        return new JSONDeserializer<List<StateKind>>()
-        .use("values", StateKind.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StateKind_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/StateKind_Roo_ToString.aj
deleted file mode 100755
index 26e447b83..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StateKind_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StateKind;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect StateKind_Roo_ToString {
-    
-    public String StateKind.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StateType.java b/src/main/java/com/labsynch/labseer/domain/StateType.java
index f50626547..40511ac9c 100755
--- a/src/main/java/com/labsynch/labseer/domain/StateType.java
+++ b/src/main/java/com/labsynch/labseer/domain/StateType.java
@@ -1,24 +1,34 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.List;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.EntityManager;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
 @Entity
 @RooJavaBean
 @RooToString
@@ -73,4 +83,164 @@ public Integer getVersion() {
 	public void setVersion(Integer version) {
         this.version = version;
     }
+
+	public String getTypeName() {
+        return this.typeName;
+    }
+
+	public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "typeName", "id", "version");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new StateType().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countStateTypes() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM StateType o", Long.class).getSingleResult();
+    }
+
+	public static List<StateType> findAllStateTypes() {
+        return entityManager().createQuery("SELECT o FROM StateType o", StateType.class).getResultList();
+    }
+
+	public static List<StateType> findAllStateTypes(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM StateType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, StateType.class).getResultList();
+    }
+
+	public static StateType findStateType(Long id) {
+        if (id == null) return null;
+        return entityManager().find(StateType.class, id);
+    }
+
+	public static List<StateType> findStateTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM StateType o", StateType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<StateType> findStateTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM StateType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, StateType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            StateType attached = StateType.findStateType(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public StateType merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        StateType merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static StateType fromJsonToStateType(String json) {
+        return new JSONDeserializer<StateType>()
+        .use(null, StateType.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<StateType> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<StateType> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<StateType> fromJsonArrayToStateTypes(String json) {
+        return new JSONDeserializer<List<StateType>>()
+        .use("values", StateType.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static Long countFindStateTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = StateType.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StateType AS o WHERE o.typeName = :typeName", Long.class);
+        q.setParameter("typeName", typeName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<StateType> findStateTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = StateType.entityManager();
+        TypedQuery<StateType> q = em.createQuery("SELECT o FROM StateType AS o WHERE o.typeName = :typeName", StateType.class);
+        q.setParameter("typeName", typeName);
+        return q;
+    }
+
+	public static TypedQuery<StateType> findStateTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = StateType.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StateType AS o WHERE o.typeName = :typeName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<StateType> q = em.createQuery(queryBuilder.toString(), StateType.class);
+        q.setParameter("typeName", typeName);
+        return q;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/StateType_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/StateType_Roo_Configurable.aj
deleted file mode 100755
index fde4197ba..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StateType_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StateType;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect StateType_Roo_Configurable {
-    
-    declare @type: StateType: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StateType_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/StateType_Roo_Finder.aj
deleted file mode 100755
index da646805e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StateType_Roo_Finder.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StateType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect StateType_Roo_Finder {
-    
-    public static Long StateType.countFindStateTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = StateType.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StateType AS o WHERE o.typeName = :typeName", Long.class);
-        q.setParameter("typeName", typeName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<StateType> StateType.findStateTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = StateType.entityManager();
-        TypedQuery<StateType> q = em.createQuery("SELECT o FROM StateType AS o WHERE o.typeName = :typeName", StateType.class);
-        q.setParameter("typeName", typeName);
-        return q;
-    }
-    
-    public static TypedQuery<StateType> StateType.findStateTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = StateType.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StateType AS o WHERE o.typeName = :typeName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<StateType> q = em.createQuery(queryBuilder.toString(), StateType.class);
-        q.setParameter("typeName", typeName);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StateType_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/StateType_Roo_JavaBean.aj
deleted file mode 100755
index 756b0cefa..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StateType_Roo_JavaBean.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StateType;
-
-privileged aspect StateType_Roo_JavaBean {
-    
-    public String StateType.getTypeName() {
-        return this.typeName;
-    }
-    
-    public void StateType.setTypeName(String typeName) {
-        this.typeName = typeName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StateType_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/StateType_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index fbb84fe31..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StateType_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StateType;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect StateType_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager StateType.entityManager;
-    
-    public static final List<String> StateType.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "typeName", "id", "version");
-    
-    public static final EntityManager StateType.entityManager() {
-        EntityManager em = new StateType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long StateType.countStateTypes() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM StateType o", Long.class).getSingleResult();
-    }
-    
-    public static List<StateType> StateType.findAllStateTypes() {
-        return entityManager().createQuery("SELECT o FROM StateType o", StateType.class).getResultList();
-    }
-    
-    public static List<StateType> StateType.findAllStateTypes(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM StateType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, StateType.class).getResultList();
-    }
-    
-    public static StateType StateType.findStateType(Long id) {
-        if (id == null) return null;
-        return entityManager().find(StateType.class, id);
-    }
-    
-    public static List<StateType> StateType.findStateTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM StateType o", StateType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<StateType> StateType.findStateTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM StateType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, StateType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void StateType.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void StateType.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            StateType attached = StateType.findStateType(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void StateType.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void StateType.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public StateType StateType.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        StateType merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StateType_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/StateType_Roo_Json.aj
deleted file mode 100755
index 448e18794..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StateType_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StateType;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect StateType_Roo_Json {
-    
-    public String StateType.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String StateType.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static StateType StateType.fromJsonToStateType(String json) {
-        return new JSONDeserializer<StateType>()
-        .use(null, StateType.class).deserialize(json);
-    }
-    
-    public static String StateType.toJsonArray(Collection<StateType> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String StateType.toJsonArray(Collection<StateType> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<StateType> StateType.fromJsonArrayToStateTypes(String json) {
-        return new JSONDeserializer<List<StateType>>()
-        .use("values", StateType.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StateType_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/StateType_Roo_ToString.aj
deleted file mode 100755
index ad073f2b0..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StateType_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StateType;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect StateType_Roo_ToString {
-    
-    public String StateType.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StereoCategory.java b/src/main/java/com/labsynch/labseer/domain/StereoCategory.java
index 7e44eeec0..824cb607c 100755
--- a/src/main/java/com/labsynch/labseer/domain/StereoCategory.java
+++ b/src/main/java/com/labsynch/labseer/domain/StereoCategory.java
@@ -1,14 +1,30 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -36,4 +52,249 @@ public static TypedQuery<StereoCategory> findStereoCategoriesBySearchTerm(String
         return q;
     }
     
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new StereoCategory().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countStereoCategorys() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM StereoCategory o", Long.class).getSingleResult();
+    }
+
+	public static List<StereoCategory> findAllStereoCategorys() {
+        return entityManager().createQuery("SELECT o FROM StereoCategory o", StereoCategory.class).getResultList();
+    }
+
+	public static List<StereoCategory> findAllStereoCategorys(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM StereoCategory o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, StereoCategory.class).getResultList();
+    }
+
+	public static StereoCategory findStereoCategory(Long id) {
+        if (id == null) return null;
+        return entityManager().find(StereoCategory.class, id);
+    }
+
+	public static List<StereoCategory> findStereoCategoryEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM StereoCategory o", StereoCategory.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<StereoCategory> findStereoCategoryEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM StereoCategory o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, StereoCategory.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            StereoCategory attached = StereoCategory.findStereoCategory(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public StereoCategory merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        StereoCategory merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public static Long countFindStereoCategorysByCodeEquals(String code) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = StereoCategory.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StereoCategory AS o WHERE o.code = :code", Long.class);
+        q.setParameter("code", code);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindStereoCategorysByCodeLike(String code) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        code = code.replace('*', '%');
+        if (code.charAt(0) != '%') {
+            code = "%" + code;
+        }
+        if (code.charAt(code.length() - 1) != '%') {
+            code = code + "%";
+        }
+        EntityManager em = StereoCategory.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StereoCategory AS o WHERE LOWER(o.code) LIKE LOWER(:code)", Long.class);
+        q.setParameter("code", code);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<StereoCategory> findStereoCategorysByCodeEquals(String code) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = StereoCategory.entityManager();
+        TypedQuery<StereoCategory> q = em.createQuery("SELECT o FROM StereoCategory AS o WHERE o.code = :code", StereoCategory.class);
+        q.setParameter("code", code);
+        return q;
+    }
+
+	public static TypedQuery<StereoCategory> findStereoCategorysByCodeEquals(String code, String sortFieldName, String sortOrder) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = StereoCategory.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StereoCategory AS o WHERE o.code = :code");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<StereoCategory> q = em.createQuery(queryBuilder.toString(), StereoCategory.class);
+        q.setParameter("code", code);
+        return q;
+    }
+
+	public static TypedQuery<StereoCategory> findStereoCategorysByCodeLike(String code) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        code = code.replace('*', '%');
+        if (code.charAt(0) != '%') {
+            code = "%" + code;
+        }
+        if (code.charAt(code.length() - 1) != '%') {
+            code = code + "%";
+        }
+        EntityManager em = StereoCategory.entityManager();
+        TypedQuery<StereoCategory> q = em.createQuery("SELECT o FROM StereoCategory AS o WHERE LOWER(o.code) LIKE LOWER(:code)", StereoCategory.class);
+        q.setParameter("code", code);
+        return q;
+    }
+
+	public static TypedQuery<StereoCategory> findStereoCategorysByCodeLike(String code, String sortFieldName, String sortOrder) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        code = code.replace('*', '%');
+        if (code.charAt(0) != '%') {
+            code = "%" + code;
+        }
+        if (code.charAt(code.length() - 1) != '%') {
+            code = code + "%";
+        }
+        EntityManager em = StereoCategory.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StereoCategory AS o WHERE LOWER(o.code) LIKE LOWER(:code)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<StereoCategory> q = em.createQuery(queryBuilder.toString(), StereoCategory.class);
+        q.setParameter("code", code);
+        return q;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static StereoCategory fromJsonToStereoCategory(String json) {
+        return new JSONDeserializer<StereoCategory>()
+        .use(null, StereoCategory.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<StereoCategory> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<StereoCategory> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<StereoCategory> fromJsonArrayToStereoCategorys(String json) {
+        return new JSONDeserializer<List<StereoCategory>>()
+        .use("values", StereoCategory.class).deserialize(json);
+    }
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String getName() {
+        return this.name;
+    }
+
+	public void setName(String name) {
+        this.name = name;
+    }
+
+	public String getCode() {
+        return this.code;
+    }
+
+	public void setCode(String code) {
+        this.code = code;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/StereoCategory_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/StereoCategory_Roo_Configurable.aj
deleted file mode 100644
index 8d5d6ca60..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StereoCategory_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StereoCategory;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect StereoCategory_Roo_Configurable {
-    
-    declare @type: StereoCategory: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StereoCategory_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/StereoCategory_Roo_Finder.aj
deleted file mode 100644
index 2be18e37f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StereoCategory_Roo_Finder.aj
+++ /dev/null
@@ -1,95 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StereoCategory;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect StereoCategory_Roo_Finder {
-    
-    public static Long StereoCategory.countFindStereoCategorysByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = StereoCategory.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StereoCategory AS o WHERE o.code = :code", Long.class);
-        q.setParameter("code", code);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long StereoCategory.countFindStereoCategorysByCodeLike(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        code = code.replace('*', '%');
-        if (code.charAt(0) != '%') {
-            code = "%" + code;
-        }
-        if (code.charAt(code.length() - 1) != '%') {
-            code = code + "%";
-        }
-        EntityManager em = StereoCategory.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StereoCategory AS o WHERE LOWER(o.code) LIKE LOWER(:code)", Long.class);
-        q.setParameter("code", code);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<StereoCategory> StereoCategory.findStereoCategorysByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = StereoCategory.entityManager();
-        TypedQuery<StereoCategory> q = em.createQuery("SELECT o FROM StereoCategory AS o WHERE o.code = :code", StereoCategory.class);
-        q.setParameter("code", code);
-        return q;
-    }
-    
-    public static TypedQuery<StereoCategory> StereoCategory.findStereoCategorysByCodeEquals(String code, String sortFieldName, String sortOrder) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = StereoCategory.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StereoCategory AS o WHERE o.code = :code");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<StereoCategory> q = em.createQuery(queryBuilder.toString(), StereoCategory.class);
-        q.setParameter("code", code);
-        return q;
-    }
-    
-    public static TypedQuery<StereoCategory> StereoCategory.findStereoCategorysByCodeLike(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        code = code.replace('*', '%');
-        if (code.charAt(0) != '%') {
-            code = "%" + code;
-        }
-        if (code.charAt(code.length() - 1) != '%') {
-            code = code + "%";
-        }
-        EntityManager em = StereoCategory.entityManager();
-        TypedQuery<StereoCategory> q = em.createQuery("SELECT o FROM StereoCategory AS o WHERE LOWER(o.code) LIKE LOWER(:code)", StereoCategory.class);
-        q.setParameter("code", code);
-        return q;
-    }
-    
-    public static TypedQuery<StereoCategory> StereoCategory.findStereoCategorysByCodeLike(String code, String sortFieldName, String sortOrder) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        code = code.replace('*', '%');
-        if (code.charAt(0) != '%') {
-            code = "%" + code;
-        }
-        if (code.charAt(code.length() - 1) != '%') {
-            code = code + "%";
-        }
-        EntityManager em = StereoCategory.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StereoCategory AS o WHERE LOWER(o.code) LIKE LOWER(:code)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<StereoCategory> q = em.createQuery(queryBuilder.toString(), StereoCategory.class);
-        q.setParameter("code", code);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StereoCategory_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/StereoCategory_Roo_JavaBean.aj
deleted file mode 100644
index 97d651ce2..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StereoCategory_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StereoCategory;
-
-privileged aspect StereoCategory_Roo_JavaBean {
-    
-    public String StereoCategory.getName() {
-        return this.name;
-    }
-    
-    public void StereoCategory.setName(String name) {
-        this.name = name;
-    }
-    
-    public String StereoCategory.getCode() {
-        return this.code;
-    }
-    
-    public void StereoCategory.setCode(String code) {
-        this.code = code;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StereoCategory_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/StereoCategory_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 8ae49989a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StereoCategory_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StereoCategory;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect StereoCategory_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager StereoCategory.entityManager;
-    
-    public static final List<String> StereoCategory.fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
-    
-    public static final EntityManager StereoCategory.entityManager() {
-        EntityManager em = new StereoCategory().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long StereoCategory.countStereoCategorys() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM StereoCategory o", Long.class).getSingleResult();
-    }
-    
-    public static List<StereoCategory> StereoCategory.findAllStereoCategorys() {
-        return entityManager().createQuery("SELECT o FROM StereoCategory o", StereoCategory.class).getResultList();
-    }
-    
-    public static List<StereoCategory> StereoCategory.findAllStereoCategorys(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM StereoCategory o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, StereoCategory.class).getResultList();
-    }
-    
-    public static StereoCategory StereoCategory.findStereoCategory(Long id) {
-        if (id == null) return null;
-        return entityManager().find(StereoCategory.class, id);
-    }
-    
-    public static List<StereoCategory> StereoCategory.findStereoCategoryEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM StereoCategory o", StereoCategory.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<StereoCategory> StereoCategory.findStereoCategoryEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM StereoCategory o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, StereoCategory.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void StereoCategory.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void StereoCategory.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            StereoCategory attached = StereoCategory.findStereoCategory(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void StereoCategory.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void StereoCategory.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public StereoCategory StereoCategory.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        StereoCategory merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StereoCategory_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/StereoCategory_Roo_Jpa_Entity.aj
deleted file mode 100644
index e1ed6b293..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StereoCategory_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StereoCategory;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect StereoCategory_Roo_Jpa_Entity {
-    
-    declare @type: StereoCategory: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long StereoCategory.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer StereoCategory.version;
-    
-    public Long StereoCategory.getId() {
-        return this.id;
-    }
-    
-    public void StereoCategory.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer StereoCategory.getVersion() {
-        return this.version;
-    }
-    
-    public void StereoCategory.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StereoCategory_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/StereoCategory_Roo_Json.aj
deleted file mode 100644
index f49945a48..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StereoCategory_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StereoCategory;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect StereoCategory_Roo_Json {
-    
-    public String StereoCategory.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String StereoCategory.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static StereoCategory StereoCategory.fromJsonToStereoCategory(String json) {
-        return new JSONDeserializer<StereoCategory>()
-        .use(null, StereoCategory.class).deserialize(json);
-    }
-    
-    public static String StereoCategory.toJsonArray(Collection<StereoCategory> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String StereoCategory.toJsonArray(Collection<StereoCategory> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<StereoCategory> StereoCategory.fromJsonArrayToStereoCategorys(String json) {
-        return new JSONDeserializer<List<StereoCategory>>()
-        .use("values", StereoCategory.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StereoCategory_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/StereoCategory_Roo_ToString.aj
deleted file mode 100644
index 0425cd624..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StereoCategory_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StereoCategory;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect StereoCategory_Roo_ToString {
-    
-    public String StereoCategory.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StructureKind.java b/src/main/java/com/labsynch/labseer/domain/StructureKind.java
index e3a0b7f03..038c320b7 100644
--- a/src/main/java/com/labsynch/labseer/domain/StructureKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/StructureKind.java
@@ -1,5 +1,8 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.List;
 
 import javax.persistence.Column;
@@ -12,18 +15,22 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
 @Entity
 @RooJavaBean
 @RooToString
@@ -156,4 +163,185 @@ public static StructureKind getOrCreate(StructureType lsType, String kindName) {
 		
 		return lsKind;
 	}
+
+	public static Long countFindStructureKindsByKindNameEquals(String kindName) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        EntityManager em = StructureKind.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StructureKind AS o WHERE o.kindName = :kindName", Long.class);
+        q.setParameter("kindName", kindName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindStructureKindsByKindNameEqualsAndLsType(String kindName, StructureType lsType) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = StructureKind.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StructureKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindStructureKindsByLsType(StructureType lsType) {
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = StructureKind.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StructureKind AS o WHERE o.lsType = :lsType", Long.class);
+        q.setParameter("lsType", lsType);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<StructureKind> findStructureKindsByKindNameEquals(String kindName) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        EntityManager em = StructureKind.entityManager();
+        TypedQuery<StructureKind> q = em.createQuery("SELECT o FROM StructureKind AS o WHERE o.kindName = :kindName", StructureKind.class);
+        q.setParameter("kindName", kindName);
+        return q;
+    }
+
+	public static TypedQuery<StructureKind> findStructureKindsByKindNameEquals(String kindName, String sortFieldName, String sortOrder) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        EntityManager em = StructureKind.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StructureKind AS o WHERE o.kindName = :kindName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<StructureKind> q = em.createQuery(queryBuilder.toString(), StructureKind.class);
+        q.setParameter("kindName", kindName);
+        return q;
+    }
+
+	public static TypedQuery<StructureKind> findStructureKindsByKindNameEqualsAndLsType(String kindName, StructureType lsType) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = StructureKind.entityManager();
+        TypedQuery<StructureKind> q = em.createQuery("SELECT o FROM StructureKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", StructureKind.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<StructureKind> findStructureKindsByKindNameEqualsAndLsType(String kindName, StructureType lsType, String sortFieldName, String sortOrder) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = StructureKind.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StructureKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<StructureKind> q = em.createQuery(queryBuilder.toString(), StructureKind.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<StructureKind> findStructureKindsByLsType(StructureType lsType) {
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = StructureKind.entityManager();
+        TypedQuery<StructureKind> q = em.createQuery("SELECT o FROM StructureKind AS o WHERE o.lsType = :lsType", StructureKind.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<StructureKind> findStructureKindsByLsType(StructureType lsType, String sortFieldName, String sortOrder) {
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = StructureKind.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StructureKind AS o WHERE o.lsType = :lsType");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<StructureKind> q = em.createQuery(queryBuilder.toString(), StructureKind.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public StructureType getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(StructureType lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getKindName() {
+        return this.kindName;
+    }
+
+	public void setKindName(String kindName) {
+        this.kindName = kindName;
+    }
+
+	public String getLsTypeAndKind() {
+        return this.lsTypeAndKind;
+    }
+
+	public void setLsTypeAndKind(String lsTypeAndKind) {
+        this.lsTypeAndKind = lsTypeAndKind;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
+
+	public static List<StructureKind> findAllStructureKinds(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM StructureKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, StructureKind.class).getResultList();
+    }
+
+	public static List<StructureKind> findStructureKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM StructureKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, StructureKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static StructureKind fromJsonToStructureKind(String json) {
+        return new JSONDeserializer<StructureKind>()
+        .use(null, StructureKind.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<StructureKind> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<StructureKind> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<StructureKind> fromJsonArrayToStructureKinds(String json) {
+        return new JSONDeserializer<List<StructureKind>>()
+        .use("values", StructureKind.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/StructureKind_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/StructureKind_Roo_Configurable.aj
deleted file mode 100644
index 3febb1ea1..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StructureKind_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StructureKind;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect StructureKind_Roo_Configurable {
-    
-    declare @type: StructureKind: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StructureKind_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/StructureKind_Roo_Finder.aj
deleted file mode 100644
index 6905550f8..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StructureKind_Roo_Finder.aj
+++ /dev/null
@@ -1,112 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StructureKind;
-import com.labsynch.labseer.domain.StructureType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect StructureKind_Roo_Finder {
-    
-    public static Long StructureKind.countFindStructureKindsByKindNameEquals(String kindName) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        EntityManager em = StructureKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StructureKind AS o WHERE o.kindName = :kindName", Long.class);
-        q.setParameter("kindName", kindName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long StructureKind.countFindStructureKindsByKindNameEqualsAndLsType(String kindName, StructureType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = StructureKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StructureKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long StructureKind.countFindStructureKindsByLsType(StructureType lsType) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = StructureKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StructureKind AS o WHERE o.lsType = :lsType", Long.class);
-        q.setParameter("lsType", lsType);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<StructureKind> StructureKind.findStructureKindsByKindNameEquals(String kindName) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        EntityManager em = StructureKind.entityManager();
-        TypedQuery<StructureKind> q = em.createQuery("SELECT o FROM StructureKind AS o WHERE o.kindName = :kindName", StructureKind.class);
-        q.setParameter("kindName", kindName);
-        return q;
-    }
-    
-    public static TypedQuery<StructureKind> StructureKind.findStructureKindsByKindNameEquals(String kindName, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        EntityManager em = StructureKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StructureKind AS o WHERE o.kindName = :kindName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<StructureKind> q = em.createQuery(queryBuilder.toString(), StructureKind.class);
-        q.setParameter("kindName", kindName);
-        return q;
-    }
-    
-    public static TypedQuery<StructureKind> StructureKind.findStructureKindsByKindNameEqualsAndLsType(String kindName, StructureType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = StructureKind.entityManager();
-        TypedQuery<StructureKind> q = em.createQuery("SELECT o FROM StructureKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", StructureKind.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<StructureKind> StructureKind.findStructureKindsByKindNameEqualsAndLsType(String kindName, StructureType lsType, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = StructureKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StructureKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<StructureKind> q = em.createQuery(queryBuilder.toString(), StructureKind.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<StructureKind> StructureKind.findStructureKindsByLsType(StructureType lsType) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = StructureKind.entityManager();
-        TypedQuery<StructureKind> q = em.createQuery("SELECT o FROM StructureKind AS o WHERE o.lsType = :lsType", StructureKind.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<StructureKind> StructureKind.findStructureKindsByLsType(StructureType lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = StructureKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StructureKind AS o WHERE o.lsType = :lsType");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<StructureKind> q = em.createQuery(queryBuilder.toString(), StructureKind.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StructureKind_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/StructureKind_Roo_JavaBean.aj
deleted file mode 100644
index 55dc98cd5..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StructureKind_Roo_JavaBean.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StructureKind;
-import com.labsynch.labseer.domain.StructureType;
-
-privileged aspect StructureKind_Roo_JavaBean {
-    
-    public StructureType StructureKind.getLsType() {
-        return this.lsType;
-    }
-    
-    public void StructureKind.setLsType(StructureType lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String StructureKind.getKindName() {
-        return this.kindName;
-    }
-    
-    public void StructureKind.setKindName(String kindName) {
-        this.kindName = kindName;
-    }
-    
-    public String StructureKind.getLsTypeAndKind() {
-        return this.lsTypeAndKind;
-    }
-    
-    public void StructureKind.setLsTypeAndKind(String lsTypeAndKind) {
-        this.lsTypeAndKind = lsTypeAndKind;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StructureKind_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/StructureKind_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 12f9a5526..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StructureKind_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StructureKind;
-import java.util.List;
-
-privileged aspect StructureKind_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> StructureKind.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
-    
-    public static List<StructureKind> StructureKind.findAllStructureKinds(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM StructureKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, StructureKind.class).getResultList();
-    }
-    
-    public static List<StructureKind> StructureKind.findStructureKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM StructureKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, StructureKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StructureKind_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/StructureKind_Roo_Json.aj
deleted file mode 100644
index 71ba029c1..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StructureKind_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StructureKind;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect StructureKind_Roo_Json {
-    
-    public String StructureKind.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String StructureKind.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static StructureKind StructureKind.fromJsonToStructureKind(String json) {
-        return new JSONDeserializer<StructureKind>()
-        .use(null, StructureKind.class).deserialize(json);
-    }
-    
-    public static String StructureKind.toJsonArray(Collection<StructureKind> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String StructureKind.toJsonArray(Collection<StructureKind> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<StructureKind> StructureKind.fromJsonArrayToStructureKinds(String json) {
-        return new JSONDeserializer<List<StructureKind>>()
-        .use("values", StructureKind.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StructureKind_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/StructureKind_Roo_ToString.aj
deleted file mode 100644
index 74c47b39a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StructureKind_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StructureKind;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect StructureKind_Roo_ToString {
-    
-    public String StructureKind.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StructureType.java b/src/main/java/com/labsynch/labseer/domain/StructureType.java
index 2218489a7..962c84882 100644
--- a/src/main/java/com/labsynch/labseer/domain/StructureType.java
+++ b/src/main/java/com/labsynch/labseer/domain/StructureType.java
@@ -1,24 +1,34 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.List;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.EntityManager;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
 @Entity
 @RooJavaBean
 @RooToString
@@ -73,4 +83,164 @@ public Integer getVersion() {
 	public void setVersion(Integer version) {
         this.version = version;
     }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static StructureType fromJsonToStructureType(String json) {
+        return new JSONDeserializer<StructureType>()
+        .use(null, StructureType.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<StructureType> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<StructureType> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<StructureType> fromJsonArrayToStructureTypes(String json) {
+        return new JSONDeserializer<List<StructureType>>()
+        .use("values", StructureType.class).deserialize(json);
+    }
+
+	public String getTypeName() {
+        return this.typeName;
+    }
+
+	public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+	public static Long countFindStructureTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = StructureType.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StructureType AS o WHERE o.typeName = :typeName", Long.class);
+        q.setParameter("typeName", typeName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<StructureType> findStructureTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = StructureType.entityManager();
+        TypedQuery<StructureType> q = em.createQuery("SELECT o FROM StructureType AS o WHERE o.typeName = :typeName", StructureType.class);
+        q.setParameter("typeName", typeName);
+        return q;
+    }
+
+	public static TypedQuery<StructureType> findStructureTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = StructureType.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StructureType AS o WHERE o.typeName = :typeName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<StructureType> q = em.createQuery(queryBuilder.toString(), StructureType.class);
+        q.setParameter("typeName", typeName);
+        return q;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "typeName", "id", "version");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new StructureType().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countStructureTypes() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM StructureType o", Long.class).getSingleResult();
+    }
+
+	public static List<StructureType> findAllStructureTypes() {
+        return entityManager().createQuery("SELECT o FROM StructureType o", StructureType.class).getResultList();
+    }
+
+	public static List<StructureType> findAllStructureTypes(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM StructureType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, StructureType.class).getResultList();
+    }
+
+	public static StructureType findStructureType(Long id) {
+        if (id == null) return null;
+        return entityManager().find(StructureType.class, id);
+    }
+
+	public static List<StructureType> findStructureTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM StructureType o", StructureType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<StructureType> findStructureTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM StructureType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, StructureType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            StructureType attached = StructureType.findStructureType(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public StructureType merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        StructureType merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/StructureType_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/StructureType_Roo_Configurable.aj
deleted file mode 100644
index 951ee9067..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StructureType_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StructureType;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect StructureType_Roo_Configurable {
-    
-    declare @type: StructureType: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StructureType_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/StructureType_Roo_Finder.aj
deleted file mode 100644
index 4f1d296ba..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StructureType_Roo_Finder.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StructureType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect StructureType_Roo_Finder {
-    
-    public static Long StructureType.countFindStructureTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = StructureType.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StructureType AS o WHERE o.typeName = :typeName", Long.class);
-        q.setParameter("typeName", typeName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<StructureType> StructureType.findStructureTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = StructureType.entityManager();
-        TypedQuery<StructureType> q = em.createQuery("SELECT o FROM StructureType AS o WHERE o.typeName = :typeName", StructureType.class);
-        q.setParameter("typeName", typeName);
-        return q;
-    }
-    
-    public static TypedQuery<StructureType> StructureType.findStructureTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = StructureType.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StructureType AS o WHERE o.typeName = :typeName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<StructureType> q = em.createQuery(queryBuilder.toString(), StructureType.class);
-        q.setParameter("typeName", typeName);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StructureType_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/StructureType_Roo_JavaBean.aj
deleted file mode 100644
index a8ee445f9..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StructureType_Roo_JavaBean.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StructureType;
-
-privileged aspect StructureType_Roo_JavaBean {
-    
-    public String StructureType.getTypeName() {
-        return this.typeName;
-    }
-    
-    public void StructureType.setTypeName(String typeName) {
-        this.typeName = typeName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StructureType_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/StructureType_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 399aa061a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StructureType_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StructureType;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect StructureType_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager StructureType.entityManager;
-    
-    public static final List<String> StructureType.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "typeName", "id", "version");
-    
-    public static final EntityManager StructureType.entityManager() {
-        EntityManager em = new StructureType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long StructureType.countStructureTypes() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM StructureType o", Long.class).getSingleResult();
-    }
-    
-    public static List<StructureType> StructureType.findAllStructureTypes() {
-        return entityManager().createQuery("SELECT o FROM StructureType o", StructureType.class).getResultList();
-    }
-    
-    public static List<StructureType> StructureType.findAllStructureTypes(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM StructureType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, StructureType.class).getResultList();
-    }
-    
-    public static StructureType StructureType.findStructureType(Long id) {
-        if (id == null) return null;
-        return entityManager().find(StructureType.class, id);
-    }
-    
-    public static List<StructureType> StructureType.findStructureTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM StructureType o", StructureType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<StructureType> StructureType.findStructureTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM StructureType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, StructureType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void StructureType.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void StructureType.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            StructureType attached = StructureType.findStructureType(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void StructureType.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void StructureType.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public StructureType StructureType.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        StructureType merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StructureType_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/StructureType_Roo_Json.aj
deleted file mode 100644
index da0928da5..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StructureType_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StructureType;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect StructureType_Roo_Json {
-    
-    public String StructureType.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String StructureType.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static StructureType StructureType.fromJsonToStructureType(String json) {
-        return new JSONDeserializer<StructureType>()
-        .use(null, StructureType.class).deserialize(json);
-    }
-    
-    public static String StructureType.toJsonArray(Collection<StructureType> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String StructureType.toJsonArray(Collection<StructureType> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<StructureType> StructureType.fromJsonArrayToStructureTypes(String json) {
-        return new JSONDeserializer<List<StructureType>>()
-        .use("values", StructureType.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/StructureType_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/StructureType_Roo_ToString.aj
deleted file mode 100644
index beaa65da9..000000000
--- a/src/main/java/com/labsynch/labseer/domain/StructureType_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StructureType;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect StructureType_Roo_ToString {
-    
-    public String StructureType.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Subject.java b/src/main/java/com/labsynch/labseer/domain/Subject.java
index 20c1cf811..d1361028f 100755
--- a/src/main/java/com/labsynch/labseer/domain/Subject.java
+++ b/src/main/java/com/labsynch/labseer/domain/Subject.java
@@ -10,6 +10,7 @@
 import java.util.Set;
 
 import javax.persistence.CascadeType;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
@@ -18,9 +19,11 @@
 import javax.persistence.OneToMany;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -34,6 +37,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord(finders = { "findSubjectsByTreatmentGroups", "findSubjectsByLsTransactionEquals", "findSubjectsByCodeNameEquals" })
@@ -232,4 +237,205 @@ public static Subject findSubjectByCodeNameEquals(String codeName) {
         q.setParameter("codeName", codeName);
         return q.getSingleResult();
     }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "treatmentGroups", "lsLabels", "lsStates", "containers");
+
+	public static long countSubjects() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM Subject o", Long.class).getSingleResult();
+    }
+
+	public static List<Subject> findAllSubjects() {
+        return entityManager().createQuery("SELECT o FROM Subject o", Subject.class).getResultList();
+    }
+
+	public static List<Subject> findAllSubjects(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM Subject o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, Subject.class).getResultList();
+    }
+
+	public static Subject findSubject(Long id) {
+        if (id == null) return null;
+        return entityManager().find(Subject.class, id);
+    }
+
+	public static List<Subject> findSubjectEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM Subject o", Subject.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<Subject> findSubjectEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM Subject o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, Subject.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public Subject merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        Subject merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public Set<TreatmentGroup> getTreatmentGroups() {
+        return this.treatmentGroups;
+    }
+
+	public void setTreatmentGroups(Set<TreatmentGroup> treatmentGroups) {
+        this.treatmentGroups = treatmentGroups;
+    }
+
+	public Set<SubjectLabel> getLsLabels() {
+        return this.lsLabels;
+    }
+
+	public void setLsLabels(Set<SubjectLabel> lsLabels) {
+        this.lsLabels = lsLabels;
+    }
+
+	public Set<SubjectState> getLsStates() {
+        return this.lsStates;
+    }
+
+	public void setLsStates(Set<SubjectState> lsStates) {
+        this.lsStates = lsStates;
+    }
+
+	public Set<ItxSubjectContainer> getContainers() {
+        return this.containers;
+    }
+
+	public void setContainers(Set<ItxSubjectContainer> containers) {
+        this.containers = containers;
+    }
+
+	public static Long countFindSubjectsByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = Subject.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Subject AS o WHERE o.codeName = :codeName", Long.class);
+        q.setParameter("codeName", codeName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindSubjectsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = Subject.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Subject AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindSubjectsByTreatmentGroups(Set<TreatmentGroup> treatmentGroups) {
+        if (treatmentGroups == null) throw new IllegalArgumentException("The treatmentGroups argument is required");
+        EntityManager em = Subject.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT COUNT(o) FROM Subject AS o WHERE");
+        for (int i = 0; i < treatmentGroups.size(); i++) {
+            if (i > 0) queryBuilder.append(" AND");
+            queryBuilder.append(" :treatmentGroups_item").append(i).append(" MEMBER OF o.treatmentGroups");
+        }
+        TypedQuery q = em.createQuery(queryBuilder.toString(), Long.class);
+        int treatmentGroupsIndex = 0;
+        for (TreatmentGroup _treatmentgroup: treatmentGroups) {
+            q.setParameter("treatmentGroups_item" + treatmentGroupsIndex++, _treatmentgroup);
+        }
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<Subject> findSubjectsByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = Subject.entityManager();
+        TypedQuery<Subject> q = em.createQuery("SELECT o FROM Subject AS o WHERE o.codeName = :codeName", Subject.class);
+        q.setParameter("codeName", codeName);
+        return q;
+    }
+
+	public static TypedQuery<Subject> findSubjectsByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = Subject.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Subject AS o WHERE o.codeName = :codeName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Subject> q = em.createQuery(queryBuilder.toString(), Subject.class);
+        q.setParameter("codeName", codeName);
+        return q;
+    }
+
+	public static TypedQuery<Subject> findSubjectsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = Subject.entityManager();
+        TypedQuery<Subject> q = em.createQuery("SELECT o FROM Subject AS o WHERE o.lsTransaction = :lsTransaction", Subject.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<Subject> findSubjectsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = Subject.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Subject AS o WHERE o.lsTransaction = :lsTransaction");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Subject> q = em.createQuery(queryBuilder.toString(), Subject.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<Subject> findSubjectsByTreatmentGroups(Set<TreatmentGroup> treatmentGroups) {
+        if (treatmentGroups == null) throw new IllegalArgumentException("The treatmentGroups argument is required");
+        EntityManager em = Subject.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Subject AS o WHERE");
+        for (int i = 0; i < treatmentGroups.size(); i++) {
+            if (i > 0) queryBuilder.append(" AND");
+            queryBuilder.append(" :treatmentGroups_item").append(i).append(" MEMBER OF o.treatmentGroups");
+        }
+        TypedQuery<Subject> q = em.createQuery(queryBuilder.toString(), Subject.class);
+        int treatmentGroupsIndex = 0;
+        for (TreatmentGroup _treatmentgroup: treatmentGroups) {
+            q.setParameter("treatmentGroups_item" + treatmentGroupsIndex++, _treatmentgroup);
+        }
+        return q;
+    }
+
+	public static TypedQuery<Subject> findSubjectsByTreatmentGroups(Set<TreatmentGroup> treatmentGroups, String sortFieldName, String sortOrder) {
+        if (treatmentGroups == null) throw new IllegalArgumentException("The treatmentGroups argument is required");
+        EntityManager em = Subject.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Subject AS o WHERE");
+        for (int i = 0; i < treatmentGroups.size(); i++) {
+            if (i > 0) queryBuilder.append(" AND");
+            queryBuilder.append(" :treatmentGroups_item").append(i).append(" MEMBER OF o.treatmentGroups");
+        }
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" " + sortOrder);
+            }
+        }
+        TypedQuery<Subject> q = em.createQuery(queryBuilder.toString(), Subject.class);
+        int treatmentGroupsIndex = 0;
+        for (TreatmentGroup _treatmentgroup: treatmentGroups) {
+            q.setParameter("treatmentGroups_item" + treatmentGroupsIndex++, _treatmentgroup);
+        }
+        return q;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectLabel.java b/src/main/java/com/labsynch/labseer/domain/SubjectLabel.java
index 5b0a357c8..4ea3adeff 100755
--- a/src/main/java/com/labsynch/labseer/domain/SubjectLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/SubjectLabel.java
@@ -5,13 +5,16 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
-
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Query;
+import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -19,7 +22,10 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -82,4 +88,121 @@ public static Collection<SubjectLabel> fromJsonArrayToSubjectLabels(Reader json)
         return new JSONDeserializer<List<SubjectLabel>>().use(null, ArrayList.class).use("values", SubjectLabel.class).deserialize(json);
     }
     
+
+	public static Long countFindSubjectLabelsBySubject(Subject subject) {
+        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
+        EntityManager em = SubjectLabel.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SubjectLabel AS o WHERE o.subject = :subject", Long.class);
+        q.setParameter("subject", subject);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<SubjectLabel> findSubjectLabelsBySubject(Subject subject) {
+        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
+        EntityManager em = SubjectLabel.entityManager();
+        TypedQuery<SubjectLabel> q = em.createQuery("SELECT o FROM SubjectLabel AS o WHERE o.subject = :subject", SubjectLabel.class);
+        q.setParameter("subject", subject);
+        return q;
+    }
+
+	public static TypedQuery<SubjectLabel> findSubjectLabelsBySubject(Subject subject, String sortFieldName, String sortOrder) {
+        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
+        EntityManager em = SubjectLabel.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SubjectLabel AS o WHERE o.subject = :subject");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<SubjectLabel> q = em.createQuery(queryBuilder.toString(), SubjectLabel.class);
+        q.setParameter("subject", subject);
+        return q;
+    }
+
+	public Subject getSubject() {
+        return this.subject;
+    }
+
+	public void setSubject(Subject subject) {
+        this.subject = subject;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("subject");
+
+	public static long countSubjectLabels() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM SubjectLabel o", Long.class).getSingleResult();
+    }
+
+	public static List<SubjectLabel> findAllSubjectLabels() {
+        return entityManager().createQuery("SELECT o FROM SubjectLabel o", SubjectLabel.class).getResultList();
+    }
+
+	public static List<SubjectLabel> findAllSubjectLabels(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM SubjectLabel o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, SubjectLabel.class).getResultList();
+    }
+
+	public static SubjectLabel findSubjectLabel(Long id) {
+        if (id == null) return null;
+        return entityManager().find(SubjectLabel.class, id);
+    }
+
+	public static List<SubjectLabel> findSubjectLabelEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM SubjectLabel o", SubjectLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<SubjectLabel> findSubjectLabelEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM SubjectLabel o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, SubjectLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public SubjectLabel merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        SubjectLabel merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static SubjectLabel fromJsonToSubjectLabel(String json) {
+        return new JSONDeserializer<SubjectLabel>()
+        .use(null, SubjectLabel.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<SubjectLabel> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<SubjectLabel> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectLabel_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/SubjectLabel_Roo_Configurable.aj
deleted file mode 100755
index f63bc38eb..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SubjectLabel_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SubjectLabel;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect SubjectLabel_Roo_Configurable {
-    
-    declare @type: SubjectLabel: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectLabel_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/SubjectLabel_Roo_Finder.aj
deleted file mode 100755
index 09d9d2416..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SubjectLabel_Roo_Finder.aj
+++ /dev/null
@@ -1,44 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.SubjectLabel;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect SubjectLabel_Roo_Finder {
-    
-    public static Long SubjectLabel.countFindSubjectLabelsBySubject(Subject subject) {
-        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
-        EntityManager em = SubjectLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SubjectLabel AS o WHERE o.subject = :subject", Long.class);
-        q.setParameter("subject", subject);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<SubjectLabel> SubjectLabel.findSubjectLabelsBySubject(Subject subject) {
-        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
-        EntityManager em = SubjectLabel.entityManager();
-        TypedQuery<SubjectLabel> q = em.createQuery("SELECT o FROM SubjectLabel AS o WHERE o.subject = :subject", SubjectLabel.class);
-        q.setParameter("subject", subject);
-        return q;
-    }
-    
-    public static TypedQuery<SubjectLabel> SubjectLabel.findSubjectLabelsBySubject(Subject subject, String sortFieldName, String sortOrder) {
-        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
-        EntityManager em = SubjectLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SubjectLabel AS o WHERE o.subject = :subject");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<SubjectLabel> q = em.createQuery(queryBuilder.toString(), SubjectLabel.class);
-        q.setParameter("subject", subject);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectLabel_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/SubjectLabel_Roo_JavaBean.aj
deleted file mode 100755
index 16111b118..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SubjectLabel_Roo_JavaBean.aj
+++ /dev/null
@@ -1,19 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.SubjectLabel;
-
-privileged aspect SubjectLabel_Roo_JavaBean {
-    
-    public Subject SubjectLabel.getSubject() {
-        return this.subject;
-    }
-    
-    public void SubjectLabel.setSubject(Subject subject) {
-        this.subject = subject;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectLabel_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/SubjectLabel_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index c50f5bf9d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SubjectLabel_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SubjectLabel;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect SubjectLabel_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> SubjectLabel.fieldNames4OrderClauseFilter = java.util.Arrays.asList("subject");
-    
-    public static long SubjectLabel.countSubjectLabels() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM SubjectLabel o", Long.class).getSingleResult();
-    }
-    
-    public static List<SubjectLabel> SubjectLabel.findAllSubjectLabels() {
-        return entityManager().createQuery("SELECT o FROM SubjectLabel o", SubjectLabel.class).getResultList();
-    }
-    
-    public static List<SubjectLabel> SubjectLabel.findAllSubjectLabels(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM SubjectLabel o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, SubjectLabel.class).getResultList();
-    }
-    
-    public static SubjectLabel SubjectLabel.findSubjectLabel(Long id) {
-        if (id == null) return null;
-        return entityManager().find(SubjectLabel.class, id);
-    }
-    
-    public static List<SubjectLabel> SubjectLabel.findSubjectLabelEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM SubjectLabel o", SubjectLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<SubjectLabel> SubjectLabel.findSubjectLabelEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM SubjectLabel o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, SubjectLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public SubjectLabel SubjectLabel.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        SubjectLabel merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectLabel_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/SubjectLabel_Roo_Jpa_Entity.aj
deleted file mode 100755
index 60b814152..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SubjectLabel_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SubjectLabel;
-import javax.persistence.Entity;
-
-privileged aspect SubjectLabel_Roo_Jpa_Entity {
-    
-    declare @type: SubjectLabel: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectLabel_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/SubjectLabel_Roo_Json.aj
deleted file mode 100755
index eedf18b59..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SubjectLabel_Roo_Json.aj
+++ /dev/null
@@ -1,38 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SubjectLabel;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.Collection;
-
-privileged aspect SubjectLabel_Roo_Json {
-    
-    public String SubjectLabel.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String SubjectLabel.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static SubjectLabel SubjectLabel.fromJsonToSubjectLabel(String json) {
-        return new JSONDeserializer<SubjectLabel>()
-        .use(null, SubjectLabel.class).deserialize(json);
-    }
-    
-    public static String SubjectLabel.toJsonArray(Collection<SubjectLabel> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String SubjectLabel.toJsonArray(Collection<SubjectLabel> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectLabel_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/SubjectLabel_Roo_ToString.aj
deleted file mode 100755
index 2a9eb3474..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SubjectLabel_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SubjectLabel;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SubjectLabel_Roo_ToString {
-    
-    public String SubjectLabel.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectState.java b/src/main/java/com/labsynch/labseer/domain/SubjectState.java
index d10777b2d..0b09b0f8b 100755
--- a/src/main/java/com/labsynch/labseer/domain/SubjectState.java
+++ b/src/main/java/com/labsynch/labseer/domain/SubjectState.java
@@ -10,6 +10,7 @@
 import java.util.Set;
 
 import javax.persistence.CascadeType;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
@@ -18,9 +19,11 @@
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -34,6 +37,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString(excludeFields = { "subject", "lsValues" })
 @RooJson
@@ -258,4 +263,114 @@ public static TypedQuery<SubjectState> findSubjectStatesBySubjectCodeNameAndStat
 		q.setParameter("ignored", true);
 		return q;
 	}
+
+	public static Long countFindSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject(String lsType, String lsKind, Subject subject) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
+        EntityManager em = SubjectState.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SubjectState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.subject = :subject", Long.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("subject", subject);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindSubjectStatesBySubject(Subject subject) {
+        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
+        EntityManager em = SubjectState.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SubjectState AS o WHERE o.subject = :subject", Long.class);
+        q.setParameter("subject", subject);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<SubjectState> findSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject(String lsType, String lsKind, Subject subject) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
+        EntityManager em = SubjectState.entityManager();
+        TypedQuery<SubjectState> q = em.createQuery("SELECT o FROM SubjectState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.subject = :subject", SubjectState.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("subject", subject);
+        return q;
+    }
+
+	public static TypedQuery<SubjectState> findSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject(String lsType, String lsKind, Subject subject, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
+        EntityManager em = SubjectState.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SubjectState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.subject = :subject");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<SubjectState> q = em.createQuery(queryBuilder.toString(), SubjectState.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("subject", subject);
+        return q;
+    }
+
+	public static TypedQuery<SubjectState> findSubjectStatesBySubject(Subject subject, String sortFieldName, String sortOrder) {
+        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
+        EntityManager em = SubjectState.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SubjectState AS o WHERE o.subject = :subject");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<SubjectState> q = em.createQuery(queryBuilder.toString(), SubjectState.class);
+        q.setParameter("subject", subject);
+        return q;
+    }
+
+	public Subject getSubject() {
+        return this.subject;
+    }
+
+	public void setSubject(Subject subject) {
+        this.subject = subject;
+    }
+
+	public Set<SubjectValue> getLsValues() {
+        return this.lsValues;
+    }
+
+	public void setLsValues(Set<SubjectValue> lsValues) {
+        this.lsValues = lsValues;
+    }
+
+	public String toString() {
+        return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).setExcludeFieldNames("subject", "lsValues").toString();
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "subject", "lsValues");
+
+	public static List<SubjectState> findAllSubjectStates(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM SubjectState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, SubjectState.class).getResultList();
+    }
+
+	public static List<SubjectState> findSubjectStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM SubjectState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, SubjectState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectState_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/SubjectState_Roo_Configurable.aj
deleted file mode 100755
index 0658af757..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SubjectState_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SubjectState;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect SubjectState_Roo_Configurable {
-    
-    declare @type: SubjectState: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectState_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/SubjectState_Roo_Finder.aj
deleted file mode 100644
index d35bd24a1..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SubjectState_Roo_Finder.aj
+++ /dev/null
@@ -1,79 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.SubjectState;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect SubjectState_Roo_Finder {
-    
-    public static Long SubjectState.countFindSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject(String lsType, String lsKind, Subject subject) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
-        EntityManager em = SubjectState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SubjectState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.subject = :subject", Long.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("subject", subject);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long SubjectState.countFindSubjectStatesBySubject(Subject subject) {
-        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
-        EntityManager em = SubjectState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SubjectState AS o WHERE o.subject = :subject", Long.class);
-        q.setParameter("subject", subject);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<SubjectState> SubjectState.findSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject(String lsType, String lsKind, Subject subject) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
-        EntityManager em = SubjectState.entityManager();
-        TypedQuery<SubjectState> q = em.createQuery("SELECT o FROM SubjectState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.subject = :subject", SubjectState.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("subject", subject);
-        return q;
-    }
-    
-    public static TypedQuery<SubjectState> SubjectState.findSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject(String lsType, String lsKind, Subject subject, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
-        EntityManager em = SubjectState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SubjectState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.subject = :subject");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<SubjectState> q = em.createQuery(queryBuilder.toString(), SubjectState.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("subject", subject);
-        return q;
-    }
-    
-    public static TypedQuery<SubjectState> SubjectState.findSubjectStatesBySubject(Subject subject, String sortFieldName, String sortOrder) {
-        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
-        EntityManager em = SubjectState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SubjectState AS o WHERE o.subject = :subject");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<SubjectState> q = em.createQuery(queryBuilder.toString(), SubjectState.class);
-        q.setParameter("subject", subject);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectState_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/SubjectState_Roo_JavaBean.aj
deleted file mode 100755
index 49e4509ef..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SubjectState_Roo_JavaBean.aj
+++ /dev/null
@@ -1,29 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.SubjectState;
-import com.labsynch.labseer.domain.SubjectValue;
-import java.util.Set;
-
-privileged aspect SubjectState_Roo_JavaBean {
-    
-    public Subject SubjectState.getSubject() {
-        return this.subject;
-    }
-    
-    public void SubjectState.setSubject(Subject subject) {
-        this.subject = subject;
-    }
-    
-    public Set<SubjectValue> SubjectState.getLsValues() {
-        return this.lsValues;
-    }
-    
-    public void SubjectState.setLsValues(Set<SubjectValue> lsValues) {
-        this.lsValues = lsValues;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectState_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/SubjectState_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index cdafbba4c..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SubjectState_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SubjectState;
-import java.util.List;
-
-privileged aspect SubjectState_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> SubjectState.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "subject", "lsValues");
-    
-    public static List<SubjectState> SubjectState.findAllSubjectStates(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM SubjectState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, SubjectState.class).getResultList();
-    }
-    
-    public static List<SubjectState> SubjectState.findSubjectStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM SubjectState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, SubjectState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectState_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/SubjectState_Roo_Jpa_Entity.aj
deleted file mode 100644
index abf151a75..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SubjectState_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SubjectState;
-import javax.persistence.Entity;
-
-privileged aspect SubjectState_Roo_Jpa_Entity {
-    
-    declare @type: SubjectState: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectState_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/SubjectState_Roo_ToString.aj
deleted file mode 100755
index a91abdb55..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SubjectState_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SubjectState;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SubjectState_Roo_ToString {
-    
-    public String SubjectState.toString() {
-        return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).setExcludeFieldNames("subject", "lsValues").toString();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectValue.java b/src/main/java/com/labsynch/labseer/domain/SubjectValue.java
index f6596e0d7..c548c6eae 100755
--- a/src/main/java/com/labsynch/labseer/domain/SubjectValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/SubjectValue.java
@@ -6,16 +6,18 @@
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
-
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -32,6 +34,8 @@
 import flexjson.JSONSerializer;
 
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString(excludeFields = { "lsState" })
 @RooJson
@@ -514,4 +518,216 @@ public static TypedQuery<SubjectValue> findSubjectValuesBySubjectCodeNameAndStat
 		return q;
 	}
 
+
+	public SubjectState getLsState() {
+        return this.lsState;
+    }
+
+	public void setLsState(SubjectState lsState) {
+        this.lsState = lsState;
+    }
+
+	public static Long countFindSubjectValuesByCodeValueEquals(String codeValue) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = SubjectValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SubjectValue AS o WHERE o.codeValue = :codeValue", Long.class);
+        q.setParameter("codeValue", codeValue);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindSubjectValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = SubjectValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SubjectValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", Long.class);
+        q.setParameter("ignored", ignored);
+        q.setParameter("codeValue", codeValue);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindSubjectValuesByLsState(SubjectState lsState) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        EntityManager em = SubjectValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SubjectValue AS o WHERE o.lsState = :lsState", Long.class);
+        q.setParameter("lsState", lsState);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals(SubjectState lsState, String lsType, String lsKind) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = SubjectValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SubjectValue AS o WHERE o.lsState = :lsState AND o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        q.setParameter("lsState", lsState);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindSubjectValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = SubjectValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SubjectValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<SubjectValue> findSubjectValuesByCodeValueEquals(String codeValue) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = SubjectValue.entityManager();
+        TypedQuery<SubjectValue> q = em.createQuery("SELECT o FROM SubjectValue AS o WHERE o.codeValue = :codeValue", SubjectValue.class);
+        q.setParameter("codeValue", codeValue);
+        return q;
+    }
+
+	public static TypedQuery<SubjectValue> findSubjectValuesByCodeValueEquals(String codeValue, String sortFieldName, String sortOrder) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = SubjectValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SubjectValue AS o WHERE o.codeValue = :codeValue");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<SubjectValue> q = em.createQuery(queryBuilder.toString(), SubjectValue.class);
+        q.setParameter("codeValue", codeValue);
+        return q;
+    }
+
+	public static TypedQuery<SubjectValue> findSubjectValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = SubjectValue.entityManager();
+        TypedQuery<SubjectValue> q = em.createQuery("SELECT o FROM SubjectValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", SubjectValue.class);
+        q.setParameter("ignored", ignored);
+        q.setParameter("codeValue", codeValue);
+        return q;
+    }
+
+	public static TypedQuery<SubjectValue> findSubjectValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue, String sortFieldName, String sortOrder) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = SubjectValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SubjectValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<SubjectValue> q = em.createQuery(queryBuilder.toString(), SubjectValue.class);
+        q.setParameter("ignored", ignored);
+        q.setParameter("codeValue", codeValue);
+        return q;
+    }
+
+	public static TypedQuery<SubjectValue> findSubjectValuesByLsState(SubjectState lsState) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        EntityManager em = SubjectValue.entityManager();
+        TypedQuery<SubjectValue> q = em.createQuery("SELECT o FROM SubjectValue AS o WHERE o.lsState = :lsState", SubjectValue.class);
+        q.setParameter("lsState", lsState);
+        return q;
+    }
+
+	public static TypedQuery<SubjectValue> findSubjectValuesByLsState(SubjectState lsState, String sortFieldName, String sortOrder) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        EntityManager em = SubjectValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SubjectValue AS o WHERE o.lsState = :lsState");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<SubjectValue> q = em.createQuery(queryBuilder.toString(), SubjectValue.class);
+        q.setParameter("lsState", lsState);
+        return q;
+    }
+
+	public static TypedQuery<SubjectValue> findSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals(SubjectState lsState, String lsType, String lsKind) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = SubjectValue.entityManager();
+        TypedQuery<SubjectValue> q = em.createQuery("SELECT o FROM SubjectValue AS o WHERE o.lsState = :lsState AND o.lsType = :lsType  AND o.lsKind = :lsKind", SubjectValue.class);
+        q.setParameter("lsState", lsState);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<SubjectValue> findSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals(SubjectState lsState, String lsType, String lsKind, String sortFieldName, String sortOrder) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = SubjectValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SubjectValue AS o WHERE o.lsState = :lsState AND o.lsType = :lsType  AND o.lsKind = :lsKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<SubjectValue> q = em.createQuery(queryBuilder.toString(), SubjectValue.class);
+        q.setParameter("lsState", lsState);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<SubjectValue> findSubjectValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = SubjectValue.entityManager();
+        TypedQuery<SubjectValue> q = em.createQuery("SELECT o FROM SubjectValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", SubjectValue.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public static TypedQuery<SubjectValue> findSubjectValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        EntityManager em = SubjectValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SubjectValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<SubjectValue> q = em.createQuery(queryBuilder.toString(), SubjectValue.class);
+        q.setParameter("lsType", lsType);
+        q.setParameter("lsKind", lsKind);
+        return q;
+    }
+
+	public String toString() {
+        return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).setExcludeFieldNames("lsState").toString();
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsState");
+
+	public static List<SubjectValue> findAllSubjectValues(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM SubjectValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, SubjectValue.class).getResultList();
+    }
+
+	public static List<SubjectValue> findSubjectValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM SubjectValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, SubjectValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectValue_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/SubjectValue_Roo_Configurable.aj
deleted file mode 100755
index ba81c89bf..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SubjectValue_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SubjectValue;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect SubjectValue_Roo_Configurable {
-    
-    declare @type: SubjectValue: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectValue_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/SubjectValue_Roo_Finder.aj
deleted file mode 100755
index 838ad8f60..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SubjectValue_Roo_Finder.aj
+++ /dev/null
@@ -1,189 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SubjectState;
-import com.labsynch.labseer.domain.SubjectValue;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect SubjectValue_Roo_Finder {
-    
-    public static Long SubjectValue.countFindSubjectValuesByCodeValueEquals(String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SubjectValue AS o WHERE o.codeValue = :codeValue", Long.class);
-        q.setParameter("codeValue", codeValue);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long SubjectValue.countFindSubjectValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SubjectValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", Long.class);
-        q.setParameter("ignored", ignored);
-        q.setParameter("codeValue", codeValue);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long SubjectValue.countFindSubjectValuesByLsState(SubjectState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SubjectValue AS o WHERE o.lsState = :lsState", Long.class);
-        q.setParameter("lsState", lsState);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long SubjectValue.countFindSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals(SubjectState lsState, String lsType, String lsKind) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SubjectValue AS o WHERE o.lsState = :lsState AND o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
-        q.setParameter("lsState", lsState);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long SubjectValue.countFindSubjectValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SubjectValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<SubjectValue> SubjectValue.findSubjectValuesByCodeValueEquals(String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        TypedQuery<SubjectValue> q = em.createQuery("SELECT o FROM SubjectValue AS o WHERE o.codeValue = :codeValue", SubjectValue.class);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-    
-    public static TypedQuery<SubjectValue> SubjectValue.findSubjectValuesByCodeValueEquals(String codeValue, String sortFieldName, String sortOrder) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SubjectValue AS o WHERE o.codeValue = :codeValue");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<SubjectValue> q = em.createQuery(queryBuilder.toString(), SubjectValue.class);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-    
-    public static TypedQuery<SubjectValue> SubjectValue.findSubjectValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        TypedQuery<SubjectValue> q = em.createQuery("SELECT o FROM SubjectValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", SubjectValue.class);
-        q.setParameter("ignored", ignored);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-    
-    public static TypedQuery<SubjectValue> SubjectValue.findSubjectValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue, String sortFieldName, String sortOrder) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SubjectValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<SubjectValue> q = em.createQuery(queryBuilder.toString(), SubjectValue.class);
-        q.setParameter("ignored", ignored);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-    
-    public static TypedQuery<SubjectValue> SubjectValue.findSubjectValuesByLsState(SubjectState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        TypedQuery<SubjectValue> q = em.createQuery("SELECT o FROM SubjectValue AS o WHERE o.lsState = :lsState", SubjectValue.class);
-        q.setParameter("lsState", lsState);
-        return q;
-    }
-    
-    public static TypedQuery<SubjectValue> SubjectValue.findSubjectValuesByLsState(SubjectState lsState, String sortFieldName, String sortOrder) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SubjectValue AS o WHERE o.lsState = :lsState");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<SubjectValue> q = em.createQuery(queryBuilder.toString(), SubjectValue.class);
-        q.setParameter("lsState", lsState);
-        return q;
-    }
-    
-    public static TypedQuery<SubjectValue> SubjectValue.findSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals(SubjectState lsState, String lsType, String lsKind) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        TypedQuery<SubjectValue> q = em.createQuery("SELECT o FROM SubjectValue AS o WHERE o.lsState = :lsState AND o.lsType = :lsType  AND o.lsKind = :lsKind", SubjectValue.class);
-        q.setParameter("lsState", lsState);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<SubjectValue> SubjectValue.findSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals(SubjectState lsState, String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SubjectValue AS o WHERE o.lsState = :lsState AND o.lsType = :lsType  AND o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<SubjectValue> q = em.createQuery(queryBuilder.toString(), SubjectValue.class);
-        q.setParameter("lsState", lsState);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<SubjectValue> SubjectValue.findSubjectValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        TypedQuery<SubjectValue> q = em.createQuery("SELECT o FROM SubjectValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", SubjectValue.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-    public static TypedQuery<SubjectValue> SubjectValue.findSubjectValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SubjectValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<SubjectValue> q = em.createQuery(queryBuilder.toString(), SubjectValue.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectValue_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/SubjectValue_Roo_JavaBean.aj
deleted file mode 100755
index 965a07cca..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SubjectValue_Roo_JavaBean.aj
+++ /dev/null
@@ -1,19 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SubjectState;
-import com.labsynch.labseer.domain.SubjectValue;
-
-privileged aspect SubjectValue_Roo_JavaBean {
-    
-    public SubjectState SubjectValue.getLsState() {
-        return this.lsState;
-    }
-    
-    public void SubjectValue.setLsState(SubjectState lsState) {
-        this.lsState = lsState;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectValue_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/SubjectValue_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 707836025..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SubjectValue_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SubjectValue;
-import java.util.List;
-
-privileged aspect SubjectValue_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> SubjectValue.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsState");
-    
-    public static List<SubjectValue> SubjectValue.findAllSubjectValues(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM SubjectValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, SubjectValue.class).getResultList();
-    }
-    
-    public static List<SubjectValue> SubjectValue.findSubjectValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM SubjectValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, SubjectValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectValue_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/SubjectValue_Roo_Jpa_Entity.aj
deleted file mode 100644
index 7fbbacaf7..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SubjectValue_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SubjectValue;
-import javax.persistence.Entity;
-
-privileged aspect SubjectValue_Roo_Jpa_Entity {
-    
-    declare @type: SubjectValue: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectValue_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/SubjectValue_Roo_ToString.aj
deleted file mode 100755
index a8746a737..000000000
--- a/src/main/java/com/labsynch/labseer/domain/SubjectValue_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SubjectValue;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SubjectValue_Roo_ToString {
-    
-    public String SubjectValue.toString() {
-        return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).setExcludeFieldNames("lsState").toString();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Subject_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/Subject_Roo_Configurable.aj
deleted file mode 100755
index d89f7dd8f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Subject_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Subject;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect Subject_Roo_Configurable {
-    
-    declare @type: Subject: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Subject_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/Subject_Roo_Finder.aj
deleted file mode 100755
index 2486d271c..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Subject_Roo_Finder.aj
+++ /dev/null
@@ -1,130 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.TreatmentGroup;
-import java.util.Set;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect Subject_Roo_Finder {
-    
-    public static Long Subject.countFindSubjectsByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = Subject.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Subject AS o WHERE o.codeName = :codeName", Long.class);
-        q.setParameter("codeName", codeName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Subject.countFindSubjectsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = Subject.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Subject AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Subject.countFindSubjectsByTreatmentGroups(Set<TreatmentGroup> treatmentGroups) {
-        if (treatmentGroups == null) throw new IllegalArgumentException("The treatmentGroups argument is required");
-        EntityManager em = Subject.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT COUNT(o) FROM Subject AS o WHERE");
-        for (int i = 0; i < treatmentGroups.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
-            queryBuilder.append(" :treatmentGroups_item").append(i).append(" MEMBER OF o.treatmentGroups");
-        }
-        TypedQuery q = em.createQuery(queryBuilder.toString(), Long.class);
-        int treatmentGroupsIndex = 0;
-        for (TreatmentGroup _treatmentgroup: treatmentGroups) {
-            q.setParameter("treatmentGroups_item" + treatmentGroupsIndex++, _treatmentgroup);
-        }
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<Subject> Subject.findSubjectsByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = Subject.entityManager();
-        TypedQuery<Subject> q = em.createQuery("SELECT o FROM Subject AS o WHERE o.codeName = :codeName", Subject.class);
-        q.setParameter("codeName", codeName);
-        return q;
-    }
-    
-    public static TypedQuery<Subject> Subject.findSubjectsByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = Subject.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Subject AS o WHERE o.codeName = :codeName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Subject> q = em.createQuery(queryBuilder.toString(), Subject.class);
-        q.setParameter("codeName", codeName);
-        return q;
-    }
-    
-    public static TypedQuery<Subject> Subject.findSubjectsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = Subject.entityManager();
-        TypedQuery<Subject> q = em.createQuery("SELECT o FROM Subject AS o WHERE o.lsTransaction = :lsTransaction", Subject.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<Subject> Subject.findSubjectsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = Subject.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Subject AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Subject> q = em.createQuery(queryBuilder.toString(), Subject.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<Subject> Subject.findSubjectsByTreatmentGroups(Set<TreatmentGroup> treatmentGroups) {
-        if (treatmentGroups == null) throw new IllegalArgumentException("The treatmentGroups argument is required");
-        EntityManager em = Subject.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Subject AS o WHERE");
-        for (int i = 0; i < treatmentGroups.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
-            queryBuilder.append(" :treatmentGroups_item").append(i).append(" MEMBER OF o.treatmentGroups");
-        }
-        TypedQuery<Subject> q = em.createQuery(queryBuilder.toString(), Subject.class);
-        int treatmentGroupsIndex = 0;
-        for (TreatmentGroup _treatmentgroup: treatmentGroups) {
-            q.setParameter("treatmentGroups_item" + treatmentGroupsIndex++, _treatmentgroup);
-        }
-        return q;
-    }
-    
-    public static TypedQuery<Subject> Subject.findSubjectsByTreatmentGroups(Set<TreatmentGroup> treatmentGroups, String sortFieldName, String sortOrder) {
-        if (treatmentGroups == null) throw new IllegalArgumentException("The treatmentGroups argument is required");
-        EntityManager em = Subject.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Subject AS o WHERE");
-        for (int i = 0; i < treatmentGroups.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
-            queryBuilder.append(" :treatmentGroups_item").append(i).append(" MEMBER OF o.treatmentGroups");
-        }
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" " + sortOrder);
-            }
-        }
-        TypedQuery<Subject> q = em.createQuery(queryBuilder.toString(), Subject.class);
-        int treatmentGroupsIndex = 0;
-        for (TreatmentGroup _treatmentgroup: treatmentGroups) {
-            q.setParameter("treatmentGroups_item" + treatmentGroupsIndex++, _treatmentgroup);
-        }
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Subject_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/Subject_Roo_JavaBean.aj
deleted file mode 100755
index 0f4109c4d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Subject_Roo_JavaBean.aj
+++ /dev/null
@@ -1,47 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxSubjectContainer;
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.SubjectLabel;
-import com.labsynch.labseer.domain.SubjectState;
-import com.labsynch.labseer.domain.TreatmentGroup;
-import java.util.Set;
-
-privileged aspect Subject_Roo_JavaBean {
-    
-    public Set<TreatmentGroup> Subject.getTreatmentGroups() {
-        return this.treatmentGroups;
-    }
-    
-    public void Subject.setTreatmentGroups(Set<TreatmentGroup> treatmentGroups) {
-        this.treatmentGroups = treatmentGroups;
-    }
-    
-    public Set<SubjectLabel> Subject.getLsLabels() {
-        return this.lsLabels;
-    }
-    
-    public void Subject.setLsLabels(Set<SubjectLabel> lsLabels) {
-        this.lsLabels = lsLabels;
-    }
-    
-    public Set<SubjectState> Subject.getLsStates() {
-        return this.lsStates;
-    }
-    
-    public void Subject.setLsStates(Set<SubjectState> lsStates) {
-        this.lsStates = lsStates;
-    }
-    
-    public Set<ItxSubjectContainer> Subject.getContainers() {
-        return this.containers;
-    }
-    
-    public void Subject.setContainers(Set<ItxSubjectContainer> containers) {
-        this.containers = containers;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Subject_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/Subject_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 11a5320ae..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Subject_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Subject;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect Subject_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> Subject.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "treatmentGroups", "lsLabels", "lsStates", "containers");
-    
-    public static long Subject.countSubjects() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM Subject o", Long.class).getSingleResult();
-    }
-    
-    public static List<Subject> Subject.findAllSubjects() {
-        return entityManager().createQuery("SELECT o FROM Subject o", Subject.class).getResultList();
-    }
-    
-    public static List<Subject> Subject.findAllSubjects(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM Subject o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, Subject.class).getResultList();
-    }
-    
-    public static Subject Subject.findSubject(Long id) {
-        if (id == null) return null;
-        return entityManager().find(Subject.class, id);
-    }
-    
-    public static List<Subject> Subject.findSubjectEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM Subject o", Subject.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<Subject> Subject.findSubjectEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM Subject o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, Subject.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public Subject Subject.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        Subject merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Subject_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/Subject_Roo_Jpa_Entity.aj
deleted file mode 100644
index 66ab62205..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Subject_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Subject;
-import javax.persistence.Entity;
-
-privileged aspect Subject_Roo_Jpa_Entity {
-    
-    declare @type: Subject: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Subject_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/Subject_Roo_ToString.aj
deleted file mode 100755
index 56a0c9143..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Subject_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Subject;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect Subject_Roo_ToString {
-    
-    public String Subject.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TempSelectTable.java b/src/main/java/com/labsynch/labseer/domain/TempSelectTable.java
index a179ff038..d7496b99b 100644
--- a/src/main/java/com/labsynch/labseer/domain/TempSelectTable.java
+++ b/src/main/java/com/labsynch/labseer/domain/TempSelectTable.java
@@ -1,24 +1,35 @@
 package com.labsynch.labseer.domain;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Set;
-
+import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
+import javax.persistence.SequenceGenerator;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
+import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord(sequenceName = "TEMP_SELECT_PKSEQ")
@@ -122,4 +133,152 @@ public static Long saveNumbers(Set<Long> numericList, String recordedBy, Date re
 	}
 
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@Id
+    @SequenceGenerator(name = "tempSelectTableGen", sequenceName = "TEMP_SELECT_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "tempSelectTableGen")
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public Long getNumberVar() {
+        return this.numberVar;
+    }
+
+	public void setNumberVar(Long numberVar) {
+        this.numberVar = numberVar;
+    }
+
+	public String getStringVar() {
+        return this.stringVar;
+    }
+
+	public void setStringVar(String stringVar) {
+        this.stringVar = stringVar;
+    }
+
+	public Long getLsTransaction() {
+        return this.lsTransaction;
+    }
+
+	public void setLsTransaction(Long lsTransaction) {
+        this.lsTransaction = lsTransaction;
+    }
+
+	public Date getRecordedDate() {
+        return this.recordedDate;
+    }
+
+	public void setRecordedDate(Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "numberVar", "stringVar", "lsTransaction", "recordedDate", "recordedBy", "entityManager");
+
+	public static long countTempSelectTables() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM TempSelectTable o", Long.class).getSingleResult();
+    }
+
+	public static List<TempSelectTable> findAllTempSelectTables() {
+        return entityManager().createQuery("SELECT o FROM TempSelectTable o", TempSelectTable.class).getResultList();
+    }
+
+	public static List<TempSelectTable> findAllTempSelectTables(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM TempSelectTable o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, TempSelectTable.class).getResultList();
+    }
+
+	public static TempSelectTable findTempSelectTable(Long id) {
+        if (id == null) return null;
+        return entityManager().find(TempSelectTable.class, id);
+    }
+
+	public static List<TempSelectTable> findTempSelectTableEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM TempSelectTable o", TempSelectTable.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<TempSelectTable> findTempSelectTableEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM TempSelectTable o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, TempSelectTable.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            TempSelectTable attached = TempSelectTable.findTempSelectTable(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public TempSelectTable merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        TempSelectTable merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/TempSelectTable_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/TempSelectTable_Roo_Configurable.aj
deleted file mode 100644
index 8e09ef399..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TempSelectTable_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TempSelectTable;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect TempSelectTable_Roo_Configurable {
-    
-    declare @type: TempSelectTable: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TempSelectTable_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/TempSelectTable_Roo_JavaBean.aj
deleted file mode 100644
index 6780a1486..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TempSelectTable_Roo_JavaBean.aj
+++ /dev/null
@@ -1,51 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TempSelectTable;
-import java.util.Date;
-
-privileged aspect TempSelectTable_Roo_JavaBean {
-    
-    public Long TempSelectTable.getNumberVar() {
-        return this.numberVar;
-    }
-    
-    public void TempSelectTable.setNumberVar(Long numberVar) {
-        this.numberVar = numberVar;
-    }
-    
-    public String TempSelectTable.getStringVar() {
-        return this.stringVar;
-    }
-    
-    public void TempSelectTable.setStringVar(String stringVar) {
-        this.stringVar = stringVar;
-    }
-    
-    public Long TempSelectTable.getLsTransaction() {
-        return this.lsTransaction;
-    }
-    
-    public void TempSelectTable.setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
-    
-    public Date TempSelectTable.getRecordedDate() {
-        return this.recordedDate;
-    }
-    
-    public void TempSelectTable.setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
-    
-    public String TempSelectTable.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void TempSelectTable.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TempSelectTable_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/TempSelectTable_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 0f92cc47f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TempSelectTable_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,90 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TempSelectTable;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect TempSelectTable_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> TempSelectTable.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "numberVar", "stringVar", "lsTransaction", "recordedDate", "recordedBy", "entityManager");
-    
-    public static long TempSelectTable.countTempSelectTables() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM TempSelectTable o", Long.class).getSingleResult();
-    }
-    
-    public static List<TempSelectTable> TempSelectTable.findAllTempSelectTables() {
-        return entityManager().createQuery("SELECT o FROM TempSelectTable o", TempSelectTable.class).getResultList();
-    }
-    
-    public static List<TempSelectTable> TempSelectTable.findAllTempSelectTables(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM TempSelectTable o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, TempSelectTable.class).getResultList();
-    }
-    
-    public static TempSelectTable TempSelectTable.findTempSelectTable(Long id) {
-        if (id == null) return null;
-        return entityManager().find(TempSelectTable.class, id);
-    }
-    
-    public static List<TempSelectTable> TempSelectTable.findTempSelectTableEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM TempSelectTable o", TempSelectTable.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<TempSelectTable> TempSelectTable.findTempSelectTableEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM TempSelectTable o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, TempSelectTable.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void TempSelectTable.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void TempSelectTable.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            TempSelectTable attached = TempSelectTable.findTempSelectTable(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void TempSelectTable.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void TempSelectTable.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public TempSelectTable TempSelectTable.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        TempSelectTable merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TempSelectTable_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/TempSelectTable_Roo_Jpa_Entity.aj
deleted file mode 100644
index b7091c1eb..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TempSelectTable_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TempSelectTable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
-
-privileged aspect TempSelectTable_Roo_Jpa_Entity {
-    
-    declare @type: TempSelectTable: @Entity;
-    
-    @Id
-    @SequenceGenerator(name = "tempSelectTableGen", sequenceName = "TEMP_SELECT_PKSEQ")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "tempSelectTableGen")
-    @Column(name = "id")
-    private Long TempSelectTable.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer TempSelectTable.version;
-    
-    public Long TempSelectTable.getId() {
-        return this.id;
-    }
-    
-    public void TempSelectTable.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer TempSelectTable.getVersion() {
-        return this.version;
-    }
-    
-    public void TempSelectTable.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TempSelectTable_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/TempSelectTable_Roo_ToString.aj
deleted file mode 100644
index 7aebffde3..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TempSelectTable_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TempSelectTable;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect TempSelectTable_Roo_ToString {
-    
-    public String TempSelectTable.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingKind.java b/src/main/java/com/labsynch/labseer/domain/ThingKind.java
index d115ab164..6527a5f12 100755
--- a/src/main/java/com/labsynch/labseer/domain/ThingKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ThingKind.java
@@ -1,5 +1,8 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.List;
 
 import javax.persistence.Column;
@@ -12,18 +15,22 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
 @Entity
 @RooJavaBean
 @RooToString
@@ -156,4 +163,185 @@ public static ThingKind getOrCreate(ThingType thingType, String kindName) {
 		
 		return thingKind;
 	}
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ThingKind fromJsonToThingKind(String json) {
+        return new JSONDeserializer<ThingKind>()
+        .use(null, ThingKind.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ThingKind> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ThingKind> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ThingKind> fromJsonArrayToThingKinds(String json) {
+        return new JSONDeserializer<List<ThingKind>>()
+        .use("values", ThingKind.class).deserialize(json);
+    }
+
+	public ThingType getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(ThingType lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getKindName() {
+        return this.kindName;
+    }
+
+	public void setKindName(String kindName) {
+        this.kindName = kindName;
+    }
+
+	public String getLsTypeAndKind() {
+        return this.lsTypeAndKind;
+    }
+
+	public void setLsTypeAndKind(String lsTypeAndKind) {
+        this.lsTypeAndKind = lsTypeAndKind;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
+
+	public static List<ThingKind> findAllThingKinds(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ThingKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ThingKind.class).getResultList();
+    }
+
+	public static List<ThingKind> findThingKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ThingKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ThingKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static Long countFindThingKindsByKindNameEqualsAndLsType(String kindName, ThingType lsType) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = ThingKind.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ThingKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindThingKindsByLsType(ThingType lsType) {
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = ThingKind.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ThingKind AS o WHERE o.lsType = :lsType", Long.class);
+        q.setParameter("lsType", lsType);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindThingKindsByLsTypeAndKindEquals(String lsTypeAndKind) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        EntityManager em = ThingKind.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ThingKind AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", Long.class);
+        q.setParameter("lsTypeAndKind", lsTypeAndKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ThingKind> findThingKindsByKindNameEqualsAndLsType(String kindName, ThingType lsType) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = ThingKind.entityManager();
+        TypedQuery<ThingKind> q = em.createQuery("SELECT o FROM ThingKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", ThingKind.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<ThingKind> findThingKindsByKindNameEqualsAndLsType(String kindName, ThingType lsType, String sortFieldName, String sortOrder) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = ThingKind.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ThingKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ThingKind> q = em.createQuery(queryBuilder.toString(), ThingKind.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<ThingKind> findThingKindsByLsType(ThingType lsType) {
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = ThingKind.entityManager();
+        TypedQuery<ThingKind> q = em.createQuery("SELECT o FROM ThingKind AS o WHERE o.lsType = :lsType", ThingKind.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<ThingKind> findThingKindsByLsType(ThingType lsType, String sortFieldName, String sortOrder) {
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = ThingKind.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ThingKind AS o WHERE o.lsType = :lsType");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ThingKind> q = em.createQuery(queryBuilder.toString(), ThingKind.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<ThingKind> findThingKindsByLsTypeAndKindEquals(String lsTypeAndKind) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        EntityManager em = ThingKind.entityManager();
+        TypedQuery<ThingKind> q = em.createQuery("SELECT o FROM ThingKind AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", ThingKind.class);
+        q.setParameter("lsTypeAndKind", lsTypeAndKind);
+        return q;
+    }
+
+	public static TypedQuery<ThingKind> findThingKindsByLsTypeAndKindEquals(String lsTypeAndKind, String sortFieldName, String sortOrder) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        EntityManager em = ThingKind.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ThingKind AS o WHERE o.lsTypeAndKind = :lsTypeAndKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ThingKind> q = em.createQuery(queryBuilder.toString(), ThingKind.class);
+        q.setParameter("lsTypeAndKind", lsTypeAndKind);
+        return q;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingKind_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ThingKind_Roo_Configurable.aj
deleted file mode 100755
index 385dbe4a3..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ThingKind_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingKind;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ThingKind_Roo_Configurable {
-    
-    declare @type: ThingKind: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingKind_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ThingKind_Roo_Finder.aj
deleted file mode 100755
index 2d4652680..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ThingKind_Roo_Finder.aj
+++ /dev/null
@@ -1,112 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingKind;
-import com.labsynch.labseer.domain.ThingType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ThingKind_Roo_Finder {
-    
-    public static Long ThingKind.countFindThingKindsByKindNameEqualsAndLsType(String kindName, ThingType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = ThingKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ThingKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ThingKind.countFindThingKindsByLsType(ThingType lsType) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = ThingKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ThingKind AS o WHERE o.lsType = :lsType", Long.class);
-        q.setParameter("lsType", lsType);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ThingKind.countFindThingKindsByLsTypeAndKindEquals(String lsTypeAndKind) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
-        EntityManager em = ThingKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ThingKind AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", Long.class);
-        q.setParameter("lsTypeAndKind", lsTypeAndKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ThingKind> ThingKind.findThingKindsByKindNameEqualsAndLsType(String kindName, ThingType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = ThingKind.entityManager();
-        TypedQuery<ThingKind> q = em.createQuery("SELECT o FROM ThingKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", ThingKind.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<ThingKind> ThingKind.findThingKindsByKindNameEqualsAndLsType(String kindName, ThingType lsType, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = ThingKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ThingKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ThingKind> q = em.createQuery(queryBuilder.toString(), ThingKind.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<ThingKind> ThingKind.findThingKindsByLsType(ThingType lsType) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = ThingKind.entityManager();
-        TypedQuery<ThingKind> q = em.createQuery("SELECT o FROM ThingKind AS o WHERE o.lsType = :lsType", ThingKind.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<ThingKind> ThingKind.findThingKindsByLsType(ThingType lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = ThingKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ThingKind AS o WHERE o.lsType = :lsType");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ThingKind> q = em.createQuery(queryBuilder.toString(), ThingKind.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<ThingKind> ThingKind.findThingKindsByLsTypeAndKindEquals(String lsTypeAndKind) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
-        EntityManager em = ThingKind.entityManager();
-        TypedQuery<ThingKind> q = em.createQuery("SELECT o FROM ThingKind AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", ThingKind.class);
-        q.setParameter("lsTypeAndKind", lsTypeAndKind);
-        return q;
-    }
-    
-    public static TypedQuery<ThingKind> ThingKind.findThingKindsByLsTypeAndKindEquals(String lsTypeAndKind, String sortFieldName, String sortOrder) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
-        EntityManager em = ThingKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ThingKind AS o WHERE o.lsTypeAndKind = :lsTypeAndKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ThingKind> q = em.createQuery(queryBuilder.toString(), ThingKind.class);
-        q.setParameter("lsTypeAndKind", lsTypeAndKind);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingKind_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ThingKind_Roo_JavaBean.aj
deleted file mode 100755
index 8a85480f4..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ThingKind_Roo_JavaBean.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingKind;
-import com.labsynch.labseer.domain.ThingType;
-
-privileged aspect ThingKind_Roo_JavaBean {
-    
-    public ThingType ThingKind.getLsType() {
-        return this.lsType;
-    }
-    
-    public void ThingKind.setLsType(ThingType lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String ThingKind.getKindName() {
-        return this.kindName;
-    }
-    
-    public void ThingKind.setKindName(String kindName) {
-        this.kindName = kindName;
-    }
-    
-    public String ThingKind.getLsTypeAndKind() {
-        return this.lsTypeAndKind;
-    }
-    
-    public void ThingKind.setLsTypeAndKind(String lsTypeAndKind) {
-        this.lsTypeAndKind = lsTypeAndKind;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingKind_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ThingKind_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index c30e10c65..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ThingKind_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingKind;
-import java.util.List;
-
-privileged aspect ThingKind_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ThingKind.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
-    
-    public static List<ThingKind> ThingKind.findAllThingKinds(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ThingKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ThingKind.class).getResultList();
-    }
-    
-    public static List<ThingKind> ThingKind.findThingKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ThingKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ThingKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingKind_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/ThingKind_Roo_Json.aj
deleted file mode 100755
index 65b24412d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ThingKind_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingKind;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ThingKind_Roo_Json {
-    
-    public String ThingKind.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ThingKind.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ThingKind ThingKind.fromJsonToThingKind(String json) {
-        return new JSONDeserializer<ThingKind>()
-        .use(null, ThingKind.class).deserialize(json);
-    }
-    
-    public static String ThingKind.toJsonArray(Collection<ThingKind> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ThingKind.toJsonArray(Collection<ThingKind> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ThingKind> ThingKind.fromJsonArrayToThingKinds(String json) {
-        return new JSONDeserializer<List<ThingKind>>()
-        .use("values", ThingKind.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingKind_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ThingKind_Roo_ToString.aj
deleted file mode 100755
index de9d583e7..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ThingKind_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingKind;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ThingKind_Roo_ToString {
-    
-    public String ThingKind.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingPage.java b/src/main/java/com/labsynch/labseer/domain/ThingPage.java
index 54e1afee7..946e3e975 100755
--- a/src/main/java/com/labsynch/labseer/domain/ThingPage.java
+++ b/src/main/java/com/labsynch/labseer/domain/ThingPage.java
@@ -1,23 +1,39 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
 import javax.persistence.Basic;
 import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.PersistenceContext;
+import javax.persistence.SequenceGenerator;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
+import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord(sequenceName = "THING_PAGE_PKSEQ")
@@ -67,4 +83,239 @@ public class ThingPage {
     @ManyToOne
     @JoinColumn(name = "thing_id")
     private AbstractThing thing;
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ThingPage fromJsonToThingPage(String json) {
+        return new JSONDeserializer<ThingPage>()
+        .use(null, ThingPage.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ThingPage> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ThingPage> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ThingPage> fromJsonArrayToThingPages(String json) {
+        return new JSONDeserializer<List<ThingPage>>()
+        .use("values", ThingPage.class).deserialize(json);
+    }
+
+	public String getPageName() {
+        return this.pageName;
+    }
+
+	public void setPageName(String pageName) {
+        this.pageName = pageName;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public Date getRecordedDate() {
+        return this.recordedDate;
+    }
+
+	public void setRecordedDate(Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+	public String getPageContent() {
+        return this.pageContent;
+    }
+
+	public void setPageContent(String pageContent) {
+        this.pageContent = pageContent;
+    }
+
+	public String getModifiedBy() {
+        return this.modifiedBy;
+    }
+
+	public void setModifiedBy(String modifiedBy) {
+        this.modifiedBy = modifiedBy;
+    }
+
+	public Date getModifiedDate() {
+        return this.modifiedDate;
+    }
+
+	public void setModifiedDate(Date modifiedDate) {
+        this.modifiedDate = modifiedDate;
+    }
+
+	public String getCurrentEditor() {
+        return this.currentEditor;
+    }
+
+	public void setCurrentEditor(String currentEditor) {
+        this.currentEditor = currentEditor;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public boolean isArchived() {
+        return this.archived;
+    }
+
+	public void setArchived(boolean archived) {
+        this.archived = archived;
+    }
+
+	public LsTransaction getLsTransaction() {
+        return this.lsTransaction;
+    }
+
+	public void setLsTransaction(LsTransaction lsTransaction) {
+        this.lsTransaction = lsTransaction;
+    }
+
+	public AbstractThing getThing() {
+        return this.thing;
+    }
+
+	public void setThing(AbstractThing thing) {
+        this.thing = thing;
+    }
+
+	@Id
+    @SequenceGenerator(name = "thingPageGen", sequenceName = "THING_PAGE_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "thingPageGen")
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("pageName", "recordedBy", "recordedDate", "pageContent", "modifiedBy", "modifiedDate", "currentEditor", "ignored", "archived", "lsTransaction", "thing");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new ThingPage().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countThingPages() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ThingPage o", Long.class).getSingleResult();
+    }
+
+	public static List<ThingPage> findAllThingPages() {
+        return entityManager().createQuery("SELECT o FROM ThingPage o", ThingPage.class).getResultList();
+    }
+
+	public static List<ThingPage> findAllThingPages(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ThingPage o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ThingPage.class).getResultList();
+    }
+
+	public static ThingPage findThingPage(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ThingPage.class, id);
+    }
+
+	public static List<ThingPage> findThingPageEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ThingPage o", ThingPage.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ThingPage> findThingPageEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ThingPage o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ThingPage.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            ThingPage attached = ThingPage.findThingPage(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public ThingPage merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ThingPage merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingPageArchive.java b/src/main/java/com/labsynch/labseer/domain/ThingPageArchive.java
index 6e5bdb032..c06f9216f 100755
--- a/src/main/java/com/labsynch/labseer/domain/ThingPageArchive.java
+++ b/src/main/java/com/labsynch/labseer/domain/ThingPageArchive.java
@@ -1,21 +1,37 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
 import javax.persistence.Basic;
 import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.SequenceGenerator;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
+import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord(sequenceName = "THING_PAGE_ARCHIVE_PKSEQ")
@@ -61,4 +77,247 @@ public class ThingPageArchive {
     private Long thing;
 
     private Integer pageVersion;
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ThingPageArchive fromJsonToThingPageArchive(String json) {
+        return new JSONDeserializer<ThingPageArchive>()
+        .use(null, ThingPageArchive.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ThingPageArchive> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ThingPageArchive> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ThingPageArchive> fromJsonArrayToThingPageArchives(String json) {
+        return new JSONDeserializer<List<ThingPageArchive>>()
+        .use("values", ThingPageArchive.class).deserialize(json);
+    }
+
+	@Id
+    @SequenceGenerator(name = "thingPageArchiveGen", sequenceName = "THING_PAGE_ARCHIVE_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "thingPageArchiveGen")
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String getPageName() {
+        return this.pageName;
+    }
+
+	public void setPageName(String pageName) {
+        this.pageName = pageName;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public Date getRecordedDate() {
+        return this.recordedDate;
+    }
+
+	public void setRecordedDate(Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+	public String getPageContent() {
+        return this.pageContent;
+    }
+
+	public void setPageContent(String pageContent) {
+        this.pageContent = pageContent;
+    }
+
+	public String getModifiedBy() {
+        return this.modifiedBy;
+    }
+
+	public void setModifiedBy(String modifiedBy) {
+        this.modifiedBy = modifiedBy;
+    }
+
+	public Date getModifiedDate() {
+        return this.modifiedDate;
+    }
+
+	public void setModifiedDate(Date modifiedDate) {
+        this.modifiedDate = modifiedDate;
+    }
+
+	public String getCurrentEditor() {
+        return this.currentEditor;
+    }
+
+	public void setCurrentEditor(String currentEditor) {
+        this.currentEditor = currentEditor;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public boolean isArchived() {
+        return this.archived;
+    }
+
+	public void setArchived(boolean archived) {
+        this.archived = archived;
+    }
+
+	public Long getLsTransaction() {
+        return this.lsTransaction;
+    }
+
+	public void setLsTransaction(Long lsTransaction) {
+        this.lsTransaction = lsTransaction;
+    }
+
+	public Long getThing() {
+        return this.thing;
+    }
+
+	public void setThing(Long thing) {
+        this.thing = thing;
+    }
+
+	public Integer getPageVersion() {
+        return this.pageVersion;
+    }
+
+	public void setPageVersion(Integer pageVersion) {
+        this.pageVersion = pageVersion;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("pageName", "recordedBy", "recordedDate", "pageContent", "modifiedBy", "modifiedDate", "currentEditor", "ignored", "archived", "lsTransaction", "thing", "pageVersion");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new ThingPageArchive().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countThingPageArchives() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ThingPageArchive o", Long.class).getSingleResult();
+    }
+
+	public static List<ThingPageArchive> findAllThingPageArchives() {
+        return entityManager().createQuery("SELECT o FROM ThingPageArchive o", ThingPageArchive.class).getResultList();
+    }
+
+	public static List<ThingPageArchive> findAllThingPageArchives(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ThingPageArchive o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ThingPageArchive.class).getResultList();
+    }
+
+	public static ThingPageArchive findThingPageArchive(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ThingPageArchive.class, id);
+    }
+
+	public static List<ThingPageArchive> findThingPageArchiveEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ThingPageArchive o", ThingPageArchive.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ThingPageArchive> findThingPageArchiveEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ThingPageArchive o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ThingPageArchive.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            ThingPageArchive attached = ThingPageArchive.findThingPageArchive(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public ThingPageArchive merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ThingPageArchive merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingPageArchive_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ThingPageArchive_Roo_Configurable.aj
deleted file mode 100755
index 7a555934c..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ThingPageArchive_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingPageArchive;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ThingPageArchive_Roo_Configurable {
-    
-    declare @type: ThingPageArchive: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingPageArchive_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ThingPageArchive_Roo_JavaBean.aj
deleted file mode 100755
index ac9c927be..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ThingPageArchive_Roo_JavaBean.aj
+++ /dev/null
@@ -1,107 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingPageArchive;
-import java.util.Date;
-
-privileged aspect ThingPageArchive_Roo_JavaBean {
-    
-    public String ThingPageArchive.getPageName() {
-        return this.pageName;
-    }
-    
-    public void ThingPageArchive.setPageName(String pageName) {
-        this.pageName = pageName;
-    }
-    
-    public String ThingPageArchive.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void ThingPageArchive.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public Date ThingPageArchive.getRecordedDate() {
-        return this.recordedDate;
-    }
-    
-    public void ThingPageArchive.setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
-    
-    public String ThingPageArchive.getPageContent() {
-        return this.pageContent;
-    }
-    
-    public void ThingPageArchive.setPageContent(String pageContent) {
-        this.pageContent = pageContent;
-    }
-    
-    public String ThingPageArchive.getModifiedBy() {
-        return this.modifiedBy;
-    }
-    
-    public void ThingPageArchive.setModifiedBy(String modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
-    
-    public Date ThingPageArchive.getModifiedDate() {
-        return this.modifiedDate;
-    }
-    
-    public void ThingPageArchive.setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
-    
-    public String ThingPageArchive.getCurrentEditor() {
-        return this.currentEditor;
-    }
-    
-    public void ThingPageArchive.setCurrentEditor(String currentEditor) {
-        this.currentEditor = currentEditor;
-    }
-    
-    public boolean ThingPageArchive.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void ThingPageArchive.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public boolean ThingPageArchive.isArchived() {
-        return this.archived;
-    }
-    
-    public void ThingPageArchive.setArchived(boolean archived) {
-        this.archived = archived;
-    }
-    
-    public Long ThingPageArchive.getLsTransaction() {
-        return this.lsTransaction;
-    }
-    
-    public void ThingPageArchive.setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
-    
-    public Long ThingPageArchive.getThing() {
-        return this.thing;
-    }
-    
-    public void ThingPageArchive.setThing(Long thing) {
-        this.thing = thing;
-    }
-    
-    public Integer ThingPageArchive.getPageVersion() {
-        return this.pageVersion;
-    }
-    
-    public void ThingPageArchive.setPageVersion(Integer pageVersion) {
-        this.pageVersion = pageVersion;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingPageArchive_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ThingPageArchive_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 6aba02272..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ThingPageArchive_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingPageArchive;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ThingPageArchive_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager ThingPageArchive.entityManager;
-    
-    public static final List<String> ThingPageArchive.fieldNames4OrderClauseFilter = java.util.Arrays.asList("pageName", "recordedBy", "recordedDate", "pageContent", "modifiedBy", "modifiedDate", "currentEditor", "ignored", "archived", "lsTransaction", "thing", "pageVersion");
-    
-    public static final EntityManager ThingPageArchive.entityManager() {
-        EntityManager em = new ThingPageArchive().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long ThingPageArchive.countThingPageArchives() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ThingPageArchive o", Long.class).getSingleResult();
-    }
-    
-    public static List<ThingPageArchive> ThingPageArchive.findAllThingPageArchives() {
-        return entityManager().createQuery("SELECT o FROM ThingPageArchive o", ThingPageArchive.class).getResultList();
-    }
-    
-    public static List<ThingPageArchive> ThingPageArchive.findAllThingPageArchives(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ThingPageArchive o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ThingPageArchive.class).getResultList();
-    }
-    
-    public static ThingPageArchive ThingPageArchive.findThingPageArchive(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ThingPageArchive.class, id);
-    }
-    
-    public static List<ThingPageArchive> ThingPageArchive.findThingPageArchiveEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ThingPageArchive o", ThingPageArchive.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ThingPageArchive> ThingPageArchive.findThingPageArchiveEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ThingPageArchive o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ThingPageArchive.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void ThingPageArchive.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void ThingPageArchive.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            ThingPageArchive attached = ThingPageArchive.findThingPageArchive(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void ThingPageArchive.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void ThingPageArchive.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public ThingPageArchive ThingPageArchive.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ThingPageArchive merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingPageArchive_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ThingPageArchive_Roo_Jpa_Entity.aj
deleted file mode 100755
index 49c9dcf33..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ThingPageArchive_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingPageArchive;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
-
-privileged aspect ThingPageArchive_Roo_Jpa_Entity {
-    
-    declare @type: ThingPageArchive: @Entity;
-    
-    @Id
-    @SequenceGenerator(name = "thingPageArchiveGen", sequenceName = "THING_PAGE_ARCHIVE_PKSEQ")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "thingPageArchiveGen")
-    @Column(name = "id")
-    private Long ThingPageArchive.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer ThingPageArchive.version;
-    
-    public Long ThingPageArchive.getId() {
-        return this.id;
-    }
-    
-    public void ThingPageArchive.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer ThingPageArchive.getVersion() {
-        return this.version;
-    }
-    
-    public void ThingPageArchive.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingPageArchive_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/ThingPageArchive_Roo_Json.aj
deleted file mode 100755
index d582e7e94..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ThingPageArchive_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingPageArchive;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ThingPageArchive_Roo_Json {
-    
-    public String ThingPageArchive.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ThingPageArchive.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ThingPageArchive ThingPageArchive.fromJsonToThingPageArchive(String json) {
-        return new JSONDeserializer<ThingPageArchive>()
-        .use(null, ThingPageArchive.class).deserialize(json);
-    }
-    
-    public static String ThingPageArchive.toJsonArray(Collection<ThingPageArchive> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ThingPageArchive.toJsonArray(Collection<ThingPageArchive> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ThingPageArchive> ThingPageArchive.fromJsonArrayToThingPageArchives(String json) {
-        return new JSONDeserializer<List<ThingPageArchive>>()
-        .use("values", ThingPageArchive.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingPageArchive_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ThingPageArchive_Roo_ToString.aj
deleted file mode 100755
index 378a4bd5e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ThingPageArchive_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingPageArchive;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ThingPageArchive_Roo_ToString {
-    
-    public String ThingPageArchive.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingPage_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ThingPage_Roo_Configurable.aj
deleted file mode 100755
index 2f4df42a0..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ThingPage_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingPage;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ThingPage_Roo_Configurable {
-    
-    declare @type: ThingPage: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingPage_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ThingPage_Roo_JavaBean.aj
deleted file mode 100755
index 6d7ae4dc3..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ThingPage_Roo_JavaBean.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AbstractThing;
-import com.labsynch.labseer.domain.LsTransaction;
-import com.labsynch.labseer.domain.ThingPage;
-import java.util.Date;
-
-privileged aspect ThingPage_Roo_JavaBean {
-    
-    public String ThingPage.getPageName() {
-        return this.pageName;
-    }
-    
-    public void ThingPage.setPageName(String pageName) {
-        this.pageName = pageName;
-    }
-    
-    public String ThingPage.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void ThingPage.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public Date ThingPage.getRecordedDate() {
-        return this.recordedDate;
-    }
-    
-    public void ThingPage.setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
-    
-    public String ThingPage.getPageContent() {
-        return this.pageContent;
-    }
-    
-    public void ThingPage.setPageContent(String pageContent) {
-        this.pageContent = pageContent;
-    }
-    
-    public String ThingPage.getModifiedBy() {
-        return this.modifiedBy;
-    }
-    
-    public void ThingPage.setModifiedBy(String modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
-    
-    public Date ThingPage.getModifiedDate() {
-        return this.modifiedDate;
-    }
-    
-    public void ThingPage.setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
-    
-    public String ThingPage.getCurrentEditor() {
-        return this.currentEditor;
-    }
-    
-    public void ThingPage.setCurrentEditor(String currentEditor) {
-        this.currentEditor = currentEditor;
-    }
-    
-    public boolean ThingPage.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void ThingPage.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public boolean ThingPage.isArchived() {
-        return this.archived;
-    }
-    
-    public void ThingPage.setArchived(boolean archived) {
-        this.archived = archived;
-    }
-    
-    public LsTransaction ThingPage.getLsTransaction() {
-        return this.lsTransaction;
-    }
-    
-    public void ThingPage.setLsTransaction(LsTransaction lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
-    
-    public AbstractThing ThingPage.getThing() {
-        return this.thing;
-    }
-    
-    public void ThingPage.setThing(AbstractThing thing) {
-        this.thing = thing;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingPage_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ThingPage_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 807fad878..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ThingPage_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingPage;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ThingPage_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager ThingPage.entityManager;
-    
-    public static final List<String> ThingPage.fieldNames4OrderClauseFilter = java.util.Arrays.asList("pageName", "recordedBy", "recordedDate", "pageContent", "modifiedBy", "modifiedDate", "currentEditor", "ignored", "archived", "lsTransaction", "thing");
-    
-    public static final EntityManager ThingPage.entityManager() {
-        EntityManager em = new ThingPage().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long ThingPage.countThingPages() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ThingPage o", Long.class).getSingleResult();
-    }
-    
-    public static List<ThingPage> ThingPage.findAllThingPages() {
-        return entityManager().createQuery("SELECT o FROM ThingPage o", ThingPage.class).getResultList();
-    }
-    
-    public static List<ThingPage> ThingPage.findAllThingPages(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ThingPage o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ThingPage.class).getResultList();
-    }
-    
-    public static ThingPage ThingPage.findThingPage(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ThingPage.class, id);
-    }
-    
-    public static List<ThingPage> ThingPage.findThingPageEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ThingPage o", ThingPage.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ThingPage> ThingPage.findThingPageEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ThingPage o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ThingPage.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void ThingPage.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void ThingPage.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            ThingPage attached = ThingPage.findThingPage(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void ThingPage.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void ThingPage.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public ThingPage ThingPage.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ThingPage merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingPage_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/ThingPage_Roo_Jpa_Entity.aj
deleted file mode 100755
index db5dbaa40..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ThingPage_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingPage;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
-
-privileged aspect ThingPage_Roo_Jpa_Entity {
-    
-    declare @type: ThingPage: @Entity;
-    
-    @Id
-    @SequenceGenerator(name = "thingPageGen", sequenceName = "THING_PAGE_PKSEQ")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "thingPageGen")
-    @Column(name = "id")
-    private Long ThingPage.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer ThingPage.version;
-    
-    public Long ThingPage.getId() {
-        return this.id;
-    }
-    
-    public void ThingPage.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer ThingPage.getVersion() {
-        return this.version;
-    }
-    
-    public void ThingPage.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingPage_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/ThingPage_Roo_Json.aj
deleted file mode 100755
index b327ddada..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ThingPage_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingPage;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ThingPage_Roo_Json {
-    
-    public String ThingPage.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ThingPage.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ThingPage ThingPage.fromJsonToThingPage(String json) {
-        return new JSONDeserializer<ThingPage>()
-        .use(null, ThingPage.class).deserialize(json);
-    }
-    
-    public static String ThingPage.toJsonArray(Collection<ThingPage> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ThingPage.toJsonArray(Collection<ThingPage> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ThingPage> ThingPage.fromJsonArrayToThingPages(String json) {
-        return new JSONDeserializer<List<ThingPage>>()
-        .use("values", ThingPage.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingPage_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ThingPage_Roo_ToString.aj
deleted file mode 100755
index 32fd4e461..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ThingPage_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingPage;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ThingPage_Roo_ToString {
-    
-    public String ThingPage.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingType.java b/src/main/java/com/labsynch/labseer/domain/ThingType.java
index 307a84c12..0e7a407b4 100755
--- a/src/main/java/com/labsynch/labseer/domain/ThingType.java
+++ b/src/main/java/com/labsynch/labseer/domain/ThingType.java
@@ -1,24 +1,34 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.List;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.EntityManager;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
 @Entity
 @RooJavaBean
 @RooToString
@@ -77,4 +87,164 @@ public Integer getVersion() {
 	public void setVersion(Integer version) {
         this.version = version;
     }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "typeName", "id", "version");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new ThingType().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countThingTypes() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ThingType o", Long.class).getSingleResult();
+    }
+
+	public static List<ThingType> findAllThingTypes() {
+        return entityManager().createQuery("SELECT o FROM ThingType o", ThingType.class).getResultList();
+    }
+
+	public static List<ThingType> findAllThingTypes(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ThingType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ThingType.class).getResultList();
+    }
+
+	public static ThingType findThingType(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ThingType.class, id);
+    }
+
+	public static List<ThingType> findThingTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ThingType o", ThingType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ThingType> findThingTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ThingType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ThingType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            ThingType attached = ThingType.findThingType(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public ThingType merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ThingType merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public static Long countFindThingTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = ThingType.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ThingType AS o WHERE o.typeName = :typeName", Long.class);
+        q.setParameter("typeName", typeName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ThingType> findThingTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = ThingType.entityManager();
+        TypedQuery<ThingType> q = em.createQuery("SELECT o FROM ThingType AS o WHERE o.typeName = :typeName", ThingType.class);
+        q.setParameter("typeName", typeName);
+        return q;
+    }
+
+	public static TypedQuery<ThingType> findThingTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = ThingType.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ThingType AS o WHERE o.typeName = :typeName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ThingType> q = em.createQuery(queryBuilder.toString(), ThingType.class);
+        q.setParameter("typeName", typeName);
+        return q;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ThingType fromJsonToThingType(String json) {
+        return new JSONDeserializer<ThingType>()
+        .use(null, ThingType.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ThingType> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ThingType> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ThingType> fromJsonArrayToThingTypes(String json) {
+        return new JSONDeserializer<List<ThingType>>()
+        .use("values", ThingType.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getTypeName() {
+        return this.typeName;
+    }
+
+	public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingType_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ThingType_Roo_Configurable.aj
deleted file mode 100755
index 82a2a12ce..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ThingType_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingType;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ThingType_Roo_Configurable {
-    
-    declare @type: ThingType: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingType_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ThingType_Roo_Finder.aj
deleted file mode 100755
index 81387ee7b..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ThingType_Roo_Finder.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ThingType_Roo_Finder {
-    
-    public static Long ThingType.countFindThingTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = ThingType.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ThingType AS o WHERE o.typeName = :typeName", Long.class);
-        q.setParameter("typeName", typeName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ThingType> ThingType.findThingTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = ThingType.entityManager();
-        TypedQuery<ThingType> q = em.createQuery("SELECT o FROM ThingType AS o WHERE o.typeName = :typeName", ThingType.class);
-        q.setParameter("typeName", typeName);
-        return q;
-    }
-    
-    public static TypedQuery<ThingType> ThingType.findThingTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = ThingType.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ThingType AS o WHERE o.typeName = :typeName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ThingType> q = em.createQuery(queryBuilder.toString(), ThingType.class);
-        q.setParameter("typeName", typeName);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingType_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ThingType_Roo_JavaBean.aj
deleted file mode 100755
index 95ffb7801..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ThingType_Roo_JavaBean.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingType;
-
-privileged aspect ThingType_Roo_JavaBean {
-    
-    public String ThingType.getTypeName() {
-        return this.typeName;
-    }
-    
-    public void ThingType.setTypeName(String typeName) {
-        this.typeName = typeName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingType_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ThingType_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 792e4a14f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ThingType_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingType;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ThingType_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager ThingType.entityManager;
-    
-    public static final List<String> ThingType.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "typeName", "id", "version");
-    
-    public static final EntityManager ThingType.entityManager() {
-        EntityManager em = new ThingType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long ThingType.countThingTypes() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ThingType o", Long.class).getSingleResult();
-    }
-    
-    public static List<ThingType> ThingType.findAllThingTypes() {
-        return entityManager().createQuery("SELECT o FROM ThingType o", ThingType.class).getResultList();
-    }
-    
-    public static List<ThingType> ThingType.findAllThingTypes(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ThingType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ThingType.class).getResultList();
-    }
-    
-    public static ThingType ThingType.findThingType(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ThingType.class, id);
-    }
-    
-    public static List<ThingType> ThingType.findThingTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ThingType o", ThingType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ThingType> ThingType.findThingTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ThingType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ThingType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void ThingType.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void ThingType.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            ThingType attached = ThingType.findThingType(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void ThingType.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void ThingType.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public ThingType ThingType.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ThingType merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingType_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/ThingType_Roo_Json.aj
deleted file mode 100755
index 11bbe2226..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ThingType_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingType;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ThingType_Roo_Json {
-    
-    public String ThingType.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ThingType.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ThingType ThingType.fromJsonToThingType(String json) {
-        return new JSONDeserializer<ThingType>()
-        .use(null, ThingType.class).deserialize(json);
-    }
-    
-    public static String ThingType.toJsonArray(Collection<ThingType> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ThingType.toJsonArray(Collection<ThingType> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ThingType> ThingType.fromJsonArrayToThingTypes(String json) {
-        return new JSONDeserializer<List<ThingType>>()
-        .use("values", ThingType.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingType_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ThingType_Roo_ToString.aj
deleted file mode 100755
index a643f8781..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ThingType_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingType;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ThingType_Roo_ToString {
-    
-    public String ThingType.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroup.java b/src/main/java/com/labsynch/labseer/domain/TreatmentGroup.java
index d092cecca..907121d14 100755
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroup.java
+++ b/src/main/java/com/labsynch/labseer/domain/TreatmentGroup.java
@@ -10,13 +10,17 @@
 import java.util.Set;
 
 import javax.persistence.CascadeType;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
 import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
 import javax.persistence.OneToMany;
 import javax.persistence.Query;
-
+import javax.persistence.TypedQuery;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -29,6 +33,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -148,4 +154,205 @@ private static Collection<java.lang.Long> removeCascadeAware(Long id) {
         treatmentGroup.remove();
         return subjectIds;
     }
+
+	public static Long countFindTreatmentGroupsByAnalysisGroups(Set<AnalysisGroup> analysisGroups) {
+        if (analysisGroups == null) throw new IllegalArgumentException("The analysisGroups argument is required");
+        EntityManager em = TreatmentGroup.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT COUNT(o) FROM TreatmentGroup AS o WHERE");
+        for (int i = 0; i < analysisGroups.size(); i++) {
+            if (i > 0) queryBuilder.append(" AND");
+            queryBuilder.append(" :analysisGroups_item").append(i).append(" MEMBER OF o.analysisGroups");
+        }
+        TypedQuery q = em.createQuery(queryBuilder.toString(), Long.class);
+        int analysisGroupsIndex = 0;
+        for (AnalysisGroup _analysisgroup: analysisGroups) {
+            q.setParameter("analysisGroups_item" + analysisGroupsIndex++, _analysisgroup);
+        }
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindTreatmentGroupsByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = TreatmentGroup.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroup AS o WHERE o.codeName = :codeName", Long.class);
+        q.setParameter("codeName", codeName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindTreatmentGroupsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = TreatmentGroup.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroup AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<TreatmentGroup> findTreatmentGroupsByAnalysisGroups(Set<AnalysisGroup> analysisGroups) {
+        if (analysisGroups == null) throw new IllegalArgumentException("The analysisGroups argument is required");
+        EntityManager em = TreatmentGroup.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroup AS o WHERE");
+        for (int i = 0; i < analysisGroups.size(); i++) {
+            if (i > 0) queryBuilder.append(" AND");
+            queryBuilder.append(" :analysisGroups_item").append(i).append(" MEMBER OF o.analysisGroups");
+        }
+        TypedQuery<TreatmentGroup> q = em.createQuery(queryBuilder.toString(), TreatmentGroup.class);
+        int analysisGroupsIndex = 0;
+        for (AnalysisGroup _analysisgroup: analysisGroups) {
+            q.setParameter("analysisGroups_item" + analysisGroupsIndex++, _analysisgroup);
+        }
+        return q;
+    }
+
+	public static TypedQuery<TreatmentGroup> findTreatmentGroupsByAnalysisGroups(Set<AnalysisGroup> analysisGroups, String sortFieldName, String sortOrder) {
+        if (analysisGroups == null) throw new IllegalArgumentException("The analysisGroups argument is required");
+        EntityManager em = TreatmentGroup.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroup AS o WHERE");
+        for (int i = 0; i < analysisGroups.size(); i++) {
+            if (i > 0) queryBuilder.append(" AND");
+            queryBuilder.append(" :analysisGroups_item").append(i).append(" MEMBER OF o.analysisGroups");
+        }
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" " + sortOrder);
+            }
+        }
+        TypedQuery<TreatmentGroup> q = em.createQuery(queryBuilder.toString(), TreatmentGroup.class);
+        int analysisGroupsIndex = 0;
+        for (AnalysisGroup _analysisgroup: analysisGroups) {
+            q.setParameter("analysisGroups_item" + analysisGroupsIndex++, _analysisgroup);
+        }
+        return q;
+    }
+
+	public static TypedQuery<TreatmentGroup> findTreatmentGroupsByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = TreatmentGroup.entityManager();
+        TypedQuery<TreatmentGroup> q = em.createQuery("SELECT o FROM TreatmentGroup AS o WHERE o.codeName = :codeName", TreatmentGroup.class);
+        q.setParameter("codeName", codeName);
+        return q;
+    }
+
+	public static TypedQuery<TreatmentGroup> findTreatmentGroupsByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
+        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        EntityManager em = TreatmentGroup.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroup AS o WHERE o.codeName = :codeName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<TreatmentGroup> q = em.createQuery(queryBuilder.toString(), TreatmentGroup.class);
+        q.setParameter("codeName", codeName);
+        return q;
+    }
+
+	public static TypedQuery<TreatmentGroup> findTreatmentGroupsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = TreatmentGroup.entityManager();
+        TypedQuery<TreatmentGroup> q = em.createQuery("SELECT o FROM TreatmentGroup AS o WHERE o.lsTransaction = :lsTransaction", TreatmentGroup.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<TreatmentGroup> findTreatmentGroupsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = TreatmentGroup.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroup AS o WHERE o.lsTransaction = :lsTransaction");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<TreatmentGroup> q = em.createQuery(queryBuilder.toString(), TreatmentGroup.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsLabels", "lsStates", "subjects", "analysisGroups");
+
+	public static long countTreatmentGroups() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM TreatmentGroup o", Long.class).getSingleResult();
+    }
+
+	public static List<TreatmentGroup> findAllTreatmentGroups() {
+        return entityManager().createQuery("SELECT o FROM TreatmentGroup o", TreatmentGroup.class).getResultList();
+    }
+
+	public static List<TreatmentGroup> findAllTreatmentGroups(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM TreatmentGroup o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, TreatmentGroup.class).getResultList();
+    }
+
+	public static TreatmentGroup findTreatmentGroup(Long id) {
+        if (id == null) return null;
+        return entityManager().find(TreatmentGroup.class, id);
+    }
+
+	public static List<TreatmentGroup> findTreatmentGroupEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM TreatmentGroup o", TreatmentGroup.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<TreatmentGroup> findTreatmentGroupEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM TreatmentGroup o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, TreatmentGroup.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public TreatmentGroup merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        TreatmentGroup merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public Set<TreatmentGroupLabel> getLsLabels() {
+        return this.lsLabels;
+    }
+
+	public void setLsLabels(Set<TreatmentGroupLabel> lsLabels) {
+        this.lsLabels = lsLabels;
+    }
+
+	public Set<TreatmentGroupState> getLsStates() {
+        return this.lsStates;
+    }
+
+	public void setLsStates(Set<TreatmentGroupState> lsStates) {
+        this.lsStates = lsStates;
+    }
+
+	public Set<Subject> getSubjects() {
+        return this.subjects;
+    }
+
+	public void setSubjects(Set<Subject> subjects) {
+        this.subjects = subjects;
+    }
+
+	public Set<AnalysisGroup> getAnalysisGroups() {
+        return this.analysisGroups;
+    }
+
+	public void setAnalysisGroups(Set<AnalysisGroup> analysisGroups) {
+        this.analysisGroups = analysisGroups;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel.java b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel.java
index a3095d1d8..392fe97ec 100755
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel.java
@@ -5,13 +5,16 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
-
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Query;
+import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -21,6 +24,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJson
@@ -94,4 +99,127 @@ public static int deleteByExperimentID(Long experimentId) {
 		int numberOfDeletedEntities = q.executeUpdate();
 		return numberOfDeletedEntities;
 	}
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static Long countFindTreatmentGroupLabelsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = TreatmentGroupLabel.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupLabel AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindTreatmentGroupLabelsByTreatmentGroup(TreatmentGroup treatmentGroup) {
+        if (treatmentGroup == null) throw new IllegalArgumentException("The treatmentGroup argument is required");
+        EntityManager em = TreatmentGroupLabel.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupLabel AS o WHERE o.treatmentGroup = :treatmentGroup", Long.class);
+        q.setParameter("treatmentGroup", treatmentGroup);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<TreatmentGroupLabel> findTreatmentGroupLabelsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = TreatmentGroupLabel.entityManager();
+        TypedQuery<TreatmentGroupLabel> q = em.createQuery("SELECT o FROM TreatmentGroupLabel AS o WHERE o.lsTransaction = :lsTransaction", TreatmentGroupLabel.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<TreatmentGroupLabel> findTreatmentGroupLabelsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = TreatmentGroupLabel.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroupLabel AS o WHERE o.lsTransaction = :lsTransaction");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<TreatmentGroupLabel> q = em.createQuery(queryBuilder.toString(), TreatmentGroupLabel.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<TreatmentGroupLabel> findTreatmentGroupLabelsByTreatmentGroup(TreatmentGroup treatmentGroup) {
+        if (treatmentGroup == null) throw new IllegalArgumentException("The treatmentGroup argument is required");
+        EntityManager em = TreatmentGroupLabel.entityManager();
+        TypedQuery<TreatmentGroupLabel> q = em.createQuery("SELECT o FROM TreatmentGroupLabel AS o WHERE o.treatmentGroup = :treatmentGroup", TreatmentGroupLabel.class);
+        q.setParameter("treatmentGroup", treatmentGroup);
+        return q;
+    }
+
+	public static TypedQuery<TreatmentGroupLabel> findTreatmentGroupLabelsByTreatmentGroup(TreatmentGroup treatmentGroup, String sortFieldName, String sortOrder) {
+        if (treatmentGroup == null) throw new IllegalArgumentException("The treatmentGroup argument is required");
+        EntityManager em = TreatmentGroupLabel.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroupLabel AS o WHERE o.treatmentGroup = :treatmentGroup");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<TreatmentGroupLabel> q = em.createQuery(queryBuilder.toString(), TreatmentGroupLabel.class);
+        q.setParameter("treatmentGroup", treatmentGroup);
+        return q;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("treatmentGroup");
+
+	public static long countTreatmentGroupLabels() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM TreatmentGroupLabel o", Long.class).getSingleResult();
+    }
+
+	public static List<TreatmentGroupLabel> findAllTreatmentGroupLabels() {
+        return entityManager().createQuery("SELECT o FROM TreatmentGroupLabel o", TreatmentGroupLabel.class).getResultList();
+    }
+
+	public static List<TreatmentGroupLabel> findAllTreatmentGroupLabels(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM TreatmentGroupLabel o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, TreatmentGroupLabel.class).getResultList();
+    }
+
+	public static TreatmentGroupLabel findTreatmentGroupLabel(Long id) {
+        if (id == null) return null;
+        return entityManager().find(TreatmentGroupLabel.class, id);
+    }
+
+	public static List<TreatmentGroupLabel> findTreatmentGroupLabelEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM TreatmentGroupLabel o", TreatmentGroupLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<TreatmentGroupLabel> findTreatmentGroupLabelEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM TreatmentGroupLabel o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, TreatmentGroupLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public TreatmentGroupLabel merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        TreatmentGroupLabel merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public TreatmentGroup getTreatmentGroup() {
+        return this.treatmentGroup;
+    }
+
+	public void setTreatmentGroup(TreatmentGroup treatmentGroup) {
+        this.treatmentGroup = treatmentGroup;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel_Roo_Configurable.aj
deleted file mode 100755
index 909ed5780..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroupLabel;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect TreatmentGroupLabel_Roo_Configurable {
-    
-    declare @type: TreatmentGroupLabel: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel_Roo_Finder.aj
deleted file mode 100755
index bbcf08e4f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel_Roo_Finder.aj
+++ /dev/null
@@ -1,75 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.domain.TreatmentGroupLabel;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect TreatmentGroupLabel_Roo_Finder {
-    
-    public static Long TreatmentGroupLabel.countFindTreatmentGroupLabelsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = TreatmentGroupLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupLabel AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long TreatmentGroupLabel.countFindTreatmentGroupLabelsByTreatmentGroup(TreatmentGroup treatmentGroup) {
-        if (treatmentGroup == null) throw new IllegalArgumentException("The treatmentGroup argument is required");
-        EntityManager em = TreatmentGroupLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupLabel AS o WHERE o.treatmentGroup = :treatmentGroup", Long.class);
-        q.setParameter("treatmentGroup", treatmentGroup);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<TreatmentGroupLabel> TreatmentGroupLabel.findTreatmentGroupLabelsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = TreatmentGroupLabel.entityManager();
-        TypedQuery<TreatmentGroupLabel> q = em.createQuery("SELECT o FROM TreatmentGroupLabel AS o WHERE o.lsTransaction = :lsTransaction", TreatmentGroupLabel.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<TreatmentGroupLabel> TreatmentGroupLabel.findTreatmentGroupLabelsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = TreatmentGroupLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroupLabel AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<TreatmentGroupLabel> q = em.createQuery(queryBuilder.toString(), TreatmentGroupLabel.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<TreatmentGroupLabel> TreatmentGroupLabel.findTreatmentGroupLabelsByTreatmentGroup(TreatmentGroup treatmentGroup) {
-        if (treatmentGroup == null) throw new IllegalArgumentException("The treatmentGroup argument is required");
-        EntityManager em = TreatmentGroupLabel.entityManager();
-        TypedQuery<TreatmentGroupLabel> q = em.createQuery("SELECT o FROM TreatmentGroupLabel AS o WHERE o.treatmentGroup = :treatmentGroup", TreatmentGroupLabel.class);
-        q.setParameter("treatmentGroup", treatmentGroup);
-        return q;
-    }
-    
-    public static TypedQuery<TreatmentGroupLabel> TreatmentGroupLabel.findTreatmentGroupLabelsByTreatmentGroup(TreatmentGroup treatmentGroup, String sortFieldName, String sortOrder) {
-        if (treatmentGroup == null) throw new IllegalArgumentException("The treatmentGroup argument is required");
-        EntityManager em = TreatmentGroupLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroupLabel AS o WHERE o.treatmentGroup = :treatmentGroup");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<TreatmentGroupLabel> q = em.createQuery(queryBuilder.toString(), TreatmentGroupLabel.class);
-        q.setParameter("treatmentGroup", treatmentGroup);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel_Roo_JavaBean.aj
deleted file mode 100755
index b32fb552d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel_Roo_JavaBean.aj
+++ /dev/null
@@ -1,19 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.domain.TreatmentGroupLabel;
-
-privileged aspect TreatmentGroupLabel_Roo_JavaBean {
-    
-    public TreatmentGroup TreatmentGroupLabel.getTreatmentGroup() {
-        return this.treatmentGroup;
-    }
-    
-    public void TreatmentGroupLabel.setTreatmentGroup(TreatmentGroup treatmentGroup) {
-        this.treatmentGroup = treatmentGroup;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 3d4e6e8fb..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroupLabel;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect TreatmentGroupLabel_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> TreatmentGroupLabel.fieldNames4OrderClauseFilter = java.util.Arrays.asList("treatmentGroup");
-    
-    public static long TreatmentGroupLabel.countTreatmentGroupLabels() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM TreatmentGroupLabel o", Long.class).getSingleResult();
-    }
-    
-    public static List<TreatmentGroupLabel> TreatmentGroupLabel.findAllTreatmentGroupLabels() {
-        return entityManager().createQuery("SELECT o FROM TreatmentGroupLabel o", TreatmentGroupLabel.class).getResultList();
-    }
-    
-    public static List<TreatmentGroupLabel> TreatmentGroupLabel.findAllTreatmentGroupLabels(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM TreatmentGroupLabel o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, TreatmentGroupLabel.class).getResultList();
-    }
-    
-    public static TreatmentGroupLabel TreatmentGroupLabel.findTreatmentGroupLabel(Long id) {
-        if (id == null) return null;
-        return entityManager().find(TreatmentGroupLabel.class, id);
-    }
-    
-    public static List<TreatmentGroupLabel> TreatmentGroupLabel.findTreatmentGroupLabelEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM TreatmentGroupLabel o", TreatmentGroupLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<TreatmentGroupLabel> TreatmentGroupLabel.findTreatmentGroupLabelEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM TreatmentGroupLabel o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, TreatmentGroupLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public TreatmentGroupLabel TreatmentGroupLabel.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        TreatmentGroupLabel merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel_Roo_Jpa_Entity.aj
deleted file mode 100755
index eced33b88..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroupLabel;
-import javax.persistence.Entity;
-
-privileged aspect TreatmentGroupLabel_Roo_Jpa_Entity {
-    
-    declare @type: TreatmentGroupLabel: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel_Roo_ToString.aj
deleted file mode 100755
index 07d0882d4..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroupLabel;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect TreatmentGroupLabel_Roo_ToString {
-    
-    public String TreatmentGroupLabel.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState.java b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState.java
index c461194f7..f8c1db036 100755
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState.java
+++ b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState.java
@@ -10,6 +10,7 @@
 import java.util.Set;
 
 import javax.persistence.CascadeType;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
@@ -18,7 +19,9 @@
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -32,6 +35,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -230,4 +235,141 @@ public static TypedQuery<TreatmentGroupState> findTreatmentGroupStatesByTreatmen
 		return q;
 	}
 	
+
+	public TreatmentGroup getTreatmentGroup() {
+        return this.treatmentGroup;
+    }
+
+	public void setTreatmentGroup(TreatmentGroup treatmentGroup) {
+        this.treatmentGroup = treatmentGroup;
+    }
+
+	public Set<TreatmentGroupValue> getLsValues() {
+        return this.lsValues;
+    }
+
+	public void setLsValues(Set<TreatmentGroupValue> lsValues) {
+        this.lsValues = lsValues;
+    }
+
+	public static Long countFindTreatmentGroupStatesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = TreatmentGroupState.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupState AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindTreatmentGroupStatesByLsTypeAndKindEquals(String lsTypeAndKind) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        EntityManager em = TreatmentGroupState.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", Long.class);
+        q.setParameter("lsTypeAndKind", lsTypeAndKind);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindTreatmentGroupStatesByTreatmentGroup(TreatmentGroup treatmentGroup) {
+        if (treatmentGroup == null) throw new IllegalArgumentException("The treatmentGroup argument is required");
+        EntityManager em = TreatmentGroupState.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupState AS o WHERE o.treatmentGroup = :treatmentGroup", Long.class);
+        q.setParameter("treatmentGroup", treatmentGroup);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<TreatmentGroupState> findTreatmentGroupStatesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = TreatmentGroupState.entityManager();
+        TypedQuery<TreatmentGroupState> q = em.createQuery("SELECT o FROM TreatmentGroupState AS o WHERE o.lsTransaction = :lsTransaction", TreatmentGroupState.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<TreatmentGroupState> findTreatmentGroupStatesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = TreatmentGroupState.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroupState AS o WHERE o.lsTransaction = :lsTransaction");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<TreatmentGroupState> q = em.createQuery(queryBuilder.toString(), TreatmentGroupState.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<TreatmentGroupState> findTreatmentGroupStatesByLsTypeAndKindEquals(String lsTypeAndKind) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        EntityManager em = TreatmentGroupState.entityManager();
+        TypedQuery<TreatmentGroupState> q = em.createQuery("SELECT o FROM TreatmentGroupState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", TreatmentGroupState.class);
+        q.setParameter("lsTypeAndKind", lsTypeAndKind);
+        return q;
+    }
+
+	public static TypedQuery<TreatmentGroupState> findTreatmentGroupStatesByLsTypeAndKindEquals(String lsTypeAndKind, String sortFieldName, String sortOrder) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        EntityManager em = TreatmentGroupState.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroupState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<TreatmentGroupState> q = em.createQuery(queryBuilder.toString(), TreatmentGroupState.class);
+        q.setParameter("lsTypeAndKind", lsTypeAndKind);
+        return q;
+    }
+
+	public static TypedQuery<TreatmentGroupState> findTreatmentGroupStatesByTreatmentGroup(TreatmentGroup treatmentGroup) {
+        if (treatmentGroup == null) throw new IllegalArgumentException("The treatmentGroup argument is required");
+        EntityManager em = TreatmentGroupState.entityManager();
+        TypedQuery<TreatmentGroupState> q = em.createQuery("SELECT o FROM TreatmentGroupState AS o WHERE o.treatmentGroup = :treatmentGroup", TreatmentGroupState.class);
+        q.setParameter("treatmentGroup", treatmentGroup);
+        return q;
+    }
+
+	public static TypedQuery<TreatmentGroupState> findTreatmentGroupStatesByTreatmentGroup(TreatmentGroup treatmentGroup, String sortFieldName, String sortOrder) {
+        if (treatmentGroup == null) throw new IllegalArgumentException("The treatmentGroup argument is required");
+        EntityManager em = TreatmentGroupState.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroupState AS o WHERE o.treatmentGroup = :treatmentGroup");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<TreatmentGroupState> q = em.createQuery(queryBuilder.toString(), TreatmentGroupState.class);
+        q.setParameter("treatmentGroup", treatmentGroup);
+        return q;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("treatmentGroup", "lsValues");
+
+	public static List<TreatmentGroupState> findAllTreatmentGroupStates(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM TreatmentGroupState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, TreatmentGroupState.class).getResultList();
+    }
+
+	public static List<TreatmentGroupState> findTreatmentGroupStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM TreatmentGroupState o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, TreatmentGroupState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState_Roo_Configurable.aj
deleted file mode 100755
index 25fdef305..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroupState;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect TreatmentGroupState_Roo_Configurable {
-    
-    declare @type: TreatmentGroupState: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState_Roo_Finder.aj
deleted file mode 100755
index 796c82cf4..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState_Roo_Finder.aj
+++ /dev/null
@@ -1,106 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.domain.TreatmentGroupState;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect TreatmentGroupState_Roo_Finder {
-    
-    public static Long TreatmentGroupState.countFindTreatmentGroupStatesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = TreatmentGroupState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupState AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long TreatmentGroupState.countFindTreatmentGroupStatesByLsTypeAndKindEquals(String lsTypeAndKind) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
-        EntityManager em = TreatmentGroupState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", Long.class);
-        q.setParameter("lsTypeAndKind", lsTypeAndKind);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long TreatmentGroupState.countFindTreatmentGroupStatesByTreatmentGroup(TreatmentGroup treatmentGroup) {
-        if (treatmentGroup == null) throw new IllegalArgumentException("The treatmentGroup argument is required");
-        EntityManager em = TreatmentGroupState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupState AS o WHERE o.treatmentGroup = :treatmentGroup", Long.class);
-        q.setParameter("treatmentGroup", treatmentGroup);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<TreatmentGroupState> TreatmentGroupState.findTreatmentGroupStatesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = TreatmentGroupState.entityManager();
-        TypedQuery<TreatmentGroupState> q = em.createQuery("SELECT o FROM TreatmentGroupState AS o WHERE o.lsTransaction = :lsTransaction", TreatmentGroupState.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<TreatmentGroupState> TreatmentGroupState.findTreatmentGroupStatesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = TreatmentGroupState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroupState AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<TreatmentGroupState> q = em.createQuery(queryBuilder.toString(), TreatmentGroupState.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<TreatmentGroupState> TreatmentGroupState.findTreatmentGroupStatesByLsTypeAndKindEquals(String lsTypeAndKind) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
-        EntityManager em = TreatmentGroupState.entityManager();
-        TypedQuery<TreatmentGroupState> q = em.createQuery("SELECT o FROM TreatmentGroupState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", TreatmentGroupState.class);
-        q.setParameter("lsTypeAndKind", lsTypeAndKind);
-        return q;
-    }
-    
-    public static TypedQuery<TreatmentGroupState> TreatmentGroupState.findTreatmentGroupStatesByLsTypeAndKindEquals(String lsTypeAndKind, String sortFieldName, String sortOrder) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
-        EntityManager em = TreatmentGroupState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroupState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<TreatmentGroupState> q = em.createQuery(queryBuilder.toString(), TreatmentGroupState.class);
-        q.setParameter("lsTypeAndKind", lsTypeAndKind);
-        return q;
-    }
-    
-    public static TypedQuery<TreatmentGroupState> TreatmentGroupState.findTreatmentGroupStatesByTreatmentGroup(TreatmentGroup treatmentGroup) {
-        if (treatmentGroup == null) throw new IllegalArgumentException("The treatmentGroup argument is required");
-        EntityManager em = TreatmentGroupState.entityManager();
-        TypedQuery<TreatmentGroupState> q = em.createQuery("SELECT o FROM TreatmentGroupState AS o WHERE o.treatmentGroup = :treatmentGroup", TreatmentGroupState.class);
-        q.setParameter("treatmentGroup", treatmentGroup);
-        return q;
-    }
-    
-    public static TypedQuery<TreatmentGroupState> TreatmentGroupState.findTreatmentGroupStatesByTreatmentGroup(TreatmentGroup treatmentGroup, String sortFieldName, String sortOrder) {
-        if (treatmentGroup == null) throw new IllegalArgumentException("The treatmentGroup argument is required");
-        EntityManager em = TreatmentGroupState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroupState AS o WHERE o.treatmentGroup = :treatmentGroup");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<TreatmentGroupState> q = em.createQuery(queryBuilder.toString(), TreatmentGroupState.class);
-        q.setParameter("treatmentGroup", treatmentGroup);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState_Roo_JavaBean.aj
deleted file mode 100755
index 62c99dce7..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState_Roo_JavaBean.aj
+++ /dev/null
@@ -1,29 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.domain.TreatmentGroupState;
-import com.labsynch.labseer.domain.TreatmentGroupValue;
-import java.util.Set;
-
-privileged aspect TreatmentGroupState_Roo_JavaBean {
-    
-    public TreatmentGroup TreatmentGroupState.getTreatmentGroup() {
-        return this.treatmentGroup;
-    }
-    
-    public void TreatmentGroupState.setTreatmentGroup(TreatmentGroup treatmentGroup) {
-        this.treatmentGroup = treatmentGroup;
-    }
-    
-    public Set<TreatmentGroupValue> TreatmentGroupState.getLsValues() {
-        return this.lsValues;
-    }
-    
-    public void TreatmentGroupState.setLsValues(Set<TreatmentGroupValue> lsValues) {
-        this.lsValues = lsValues;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index c81420ae0..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroupState;
-import java.util.List;
-
-privileged aspect TreatmentGroupState_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> TreatmentGroupState.fieldNames4OrderClauseFilter = java.util.Arrays.asList("treatmentGroup", "lsValues");
-    
-    public static List<TreatmentGroupState> TreatmentGroupState.findAllTreatmentGroupStates(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM TreatmentGroupState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, TreatmentGroupState.class).getResultList();
-    }
-    
-    public static List<TreatmentGroupState> TreatmentGroupState.findTreatmentGroupStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM TreatmentGroupState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, TreatmentGroupState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState_Roo_Jpa_Entity.aj
deleted file mode 100755
index 1123cdc67..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroupState;
-import javax.persistence.Entity;
-
-privileged aspect TreatmentGroupState_Roo_Jpa_Entity {
-    
-    declare @type: TreatmentGroupState: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState_Roo_ToString.aj
deleted file mode 100755
index d861f9a39..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroupState;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect TreatmentGroupState_Roo_ToString {
-    
-    public String TreatmentGroupState.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue.java b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue.java
index 12e5802b7..3235b62fc 100755
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue.java
@@ -7,16 +7,18 @@
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
-
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
@@ -33,6 +35,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -468,4 +472,167 @@ public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByTreatmen
 	}
 
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static Long countFindTreatmentGroupValuesByCodeValueEquals(String codeValue) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = TreatmentGroupValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupValue AS o WHERE o.codeValue = :codeValue", Long.class);
+        q.setParameter("codeValue", codeValue);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindTreatmentGroupValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = TreatmentGroupValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", Long.class);
+        q.setParameter("ignored", ignored);
+        q.setParameter("codeValue", codeValue);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindTreatmentGroupValuesByLsState(TreatmentGroupState lsState) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        EntityManager em = TreatmentGroupValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupValue AS o WHERE o.lsState = :lsState", Long.class);
+        q.setParameter("lsState", lsState);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindTreatmentGroupValuesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = TreatmentGroupValue.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupValue AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByCodeValueEquals(String codeValue) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = TreatmentGroupValue.entityManager();
+        TypedQuery<TreatmentGroupValue> q = em.createQuery("SELECT o FROM TreatmentGroupValue AS o WHERE o.codeValue = :codeValue", TreatmentGroupValue.class);
+        q.setParameter("codeValue", codeValue);
+        return q;
+    }
+
+	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByCodeValueEquals(String codeValue, String sortFieldName, String sortOrder) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = TreatmentGroupValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroupValue AS o WHERE o.codeValue = :codeValue");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<TreatmentGroupValue> q = em.createQuery(queryBuilder.toString(), TreatmentGroupValue.class);
+        q.setParameter("codeValue", codeValue);
+        return q;
+    }
+
+	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = TreatmentGroupValue.entityManager();
+        TypedQuery<TreatmentGroupValue> q = em.createQuery("SELECT o FROM TreatmentGroupValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", TreatmentGroupValue.class);
+        q.setParameter("ignored", ignored);
+        q.setParameter("codeValue", codeValue);
+        return q;
+    }
+
+	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue, String sortFieldName, String sortOrder) {
+        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+        EntityManager em = TreatmentGroupValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroupValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<TreatmentGroupValue> q = em.createQuery(queryBuilder.toString(), TreatmentGroupValue.class);
+        q.setParameter("ignored", ignored);
+        q.setParameter("codeValue", codeValue);
+        return q;
+    }
+
+	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByLsState(TreatmentGroupState lsState) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        EntityManager em = TreatmentGroupValue.entityManager();
+        TypedQuery<TreatmentGroupValue> q = em.createQuery("SELECT o FROM TreatmentGroupValue AS o WHERE o.lsState = :lsState", TreatmentGroupValue.class);
+        q.setParameter("lsState", lsState);
+        return q;
+    }
+
+	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByLsState(TreatmentGroupState lsState, String sortFieldName, String sortOrder) {
+        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        EntityManager em = TreatmentGroupValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroupValue AS o WHERE o.lsState = :lsState");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<TreatmentGroupValue> q = em.createQuery(queryBuilder.toString(), TreatmentGroupValue.class);
+        q.setParameter("lsState", lsState);
+        return q;
+    }
+
+	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = TreatmentGroupValue.entityManager();
+        TypedQuery<TreatmentGroupValue> q = em.createQuery("SELECT o FROM TreatmentGroupValue AS o WHERE o.lsTransaction = :lsTransaction", TreatmentGroupValue.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        EntityManager em = TreatmentGroupValue.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroupValue AS o WHERE o.lsTransaction = :lsTransaction");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<TreatmentGroupValue> q = em.createQuery(queryBuilder.toString(), TreatmentGroupValue.class);
+        q.setParameter("lsTransaction", lsTransaction);
+        return q;
+    }
+
+	public TreatmentGroupState getLsState() {
+        return this.lsState;
+    }
+
+	public void setLsState(TreatmentGroupState lsState) {
+        this.lsState = lsState;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsState");
+
+	public static List<TreatmentGroupValue> findAllTreatmentGroupValues(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM TreatmentGroupValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, TreatmentGroupValue.class).getResultList();
+    }
+
+	public static List<TreatmentGroupValue> findTreatmentGroupValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM TreatmentGroupValue o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, TreatmentGroupValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue_Roo_Configurable.aj
deleted file mode 100755
index f229640b8..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroupValue;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect TreatmentGroupValue_Roo_Configurable {
-    
-    declare @type: TreatmentGroupValue: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue_Roo_Finder.aj
deleted file mode 100755
index d5802de0d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue_Roo_Finder.aj
+++ /dev/null
@@ -1,140 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroupState;
-import com.labsynch.labseer.domain.TreatmentGroupValue;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect TreatmentGroupValue_Roo_Finder {
-    
-    public static Long TreatmentGroupValue.countFindTreatmentGroupValuesByCodeValueEquals(String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = TreatmentGroupValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupValue AS o WHERE o.codeValue = :codeValue", Long.class);
-        q.setParameter("codeValue", codeValue);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long TreatmentGroupValue.countFindTreatmentGroupValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = TreatmentGroupValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", Long.class);
-        q.setParameter("ignored", ignored);
-        q.setParameter("codeValue", codeValue);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long TreatmentGroupValue.countFindTreatmentGroupValuesByLsState(TreatmentGroupState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = TreatmentGroupValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupValue AS o WHERE o.lsState = :lsState", Long.class);
-        q.setParameter("lsState", lsState);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long TreatmentGroupValue.countFindTreatmentGroupValuesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = TreatmentGroupValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupValue AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<TreatmentGroupValue> TreatmentGroupValue.findTreatmentGroupValuesByCodeValueEquals(String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = TreatmentGroupValue.entityManager();
-        TypedQuery<TreatmentGroupValue> q = em.createQuery("SELECT o FROM TreatmentGroupValue AS o WHERE o.codeValue = :codeValue", TreatmentGroupValue.class);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-    
-    public static TypedQuery<TreatmentGroupValue> TreatmentGroupValue.findTreatmentGroupValuesByCodeValueEquals(String codeValue, String sortFieldName, String sortOrder) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = TreatmentGroupValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroupValue AS o WHERE o.codeValue = :codeValue");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<TreatmentGroupValue> q = em.createQuery(queryBuilder.toString(), TreatmentGroupValue.class);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-    
-    public static TypedQuery<TreatmentGroupValue> TreatmentGroupValue.findTreatmentGroupValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = TreatmentGroupValue.entityManager();
-        TypedQuery<TreatmentGroupValue> q = em.createQuery("SELECT o FROM TreatmentGroupValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", TreatmentGroupValue.class);
-        q.setParameter("ignored", ignored);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-    
-    public static TypedQuery<TreatmentGroupValue> TreatmentGroupValue.findTreatmentGroupValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue, String sortFieldName, String sortOrder) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = TreatmentGroupValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroupValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<TreatmentGroupValue> q = em.createQuery(queryBuilder.toString(), TreatmentGroupValue.class);
-        q.setParameter("ignored", ignored);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-    
-    public static TypedQuery<TreatmentGroupValue> TreatmentGroupValue.findTreatmentGroupValuesByLsState(TreatmentGroupState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = TreatmentGroupValue.entityManager();
-        TypedQuery<TreatmentGroupValue> q = em.createQuery("SELECT o FROM TreatmentGroupValue AS o WHERE o.lsState = :lsState", TreatmentGroupValue.class);
-        q.setParameter("lsState", lsState);
-        return q;
-    }
-    
-    public static TypedQuery<TreatmentGroupValue> TreatmentGroupValue.findTreatmentGroupValuesByLsState(TreatmentGroupState lsState, String sortFieldName, String sortOrder) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = TreatmentGroupValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroupValue AS o WHERE o.lsState = :lsState");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<TreatmentGroupValue> q = em.createQuery(queryBuilder.toString(), TreatmentGroupValue.class);
-        q.setParameter("lsState", lsState);
-        return q;
-    }
-    
-    public static TypedQuery<TreatmentGroupValue> TreatmentGroupValue.findTreatmentGroupValuesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = TreatmentGroupValue.entityManager();
-        TypedQuery<TreatmentGroupValue> q = em.createQuery("SELECT o FROM TreatmentGroupValue AS o WHERE o.lsTransaction = :lsTransaction", TreatmentGroupValue.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<TreatmentGroupValue> TreatmentGroupValue.findTreatmentGroupValuesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = TreatmentGroupValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroupValue AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<TreatmentGroupValue> q = em.createQuery(queryBuilder.toString(), TreatmentGroupValue.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue_Roo_JavaBean.aj
deleted file mode 100755
index ead05fa8f..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue_Roo_JavaBean.aj
+++ /dev/null
@@ -1,19 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroupState;
-import com.labsynch.labseer.domain.TreatmentGroupValue;
-
-privileged aspect TreatmentGroupValue_Roo_JavaBean {
-    
-    public TreatmentGroupState TreatmentGroupValue.getLsState() {
-        return this.lsState;
-    }
-    
-    public void TreatmentGroupValue.setLsState(TreatmentGroupState lsState) {
-        this.lsState = lsState;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 6500edb79..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroupValue;
-import java.util.List;
-
-privileged aspect TreatmentGroupValue_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> TreatmentGroupValue.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsState");
-    
-    public static List<TreatmentGroupValue> TreatmentGroupValue.findAllTreatmentGroupValues(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM TreatmentGroupValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, TreatmentGroupValue.class).getResultList();
-    }
-    
-    public static List<TreatmentGroupValue> TreatmentGroupValue.findTreatmentGroupValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM TreatmentGroupValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, TreatmentGroupValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue_Roo_Jpa_Entity.aj
deleted file mode 100755
index ea006c156..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroupValue;
-import javax.persistence.Entity;
-
-privileged aspect TreatmentGroupValue_Roo_Jpa_Entity {
-    
-    declare @type: TreatmentGroupValue: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue_Roo_ToString.aj
deleted file mode 100755
index c504a31f9..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroupValue;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect TreatmentGroupValue_Roo_ToString {
-    
-    public String TreatmentGroupValue.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroup_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/TreatmentGroup_Roo_Configurable.aj
deleted file mode 100755
index 7419c5bc4..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroup_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroup;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect TreatmentGroup_Roo_Configurable {
-    
-    declare @type: TreatmentGroup: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroup_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/TreatmentGroup_Roo_Finder.aj
deleted file mode 100755
index 34206a850..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroup_Roo_Finder.aj
+++ /dev/null
@@ -1,130 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.TreatmentGroup;
-import java.util.Set;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect TreatmentGroup_Roo_Finder {
-    
-    public static Long TreatmentGroup.countFindTreatmentGroupsByAnalysisGroups(Set<AnalysisGroup> analysisGroups) {
-        if (analysisGroups == null) throw new IllegalArgumentException("The analysisGroups argument is required");
-        EntityManager em = TreatmentGroup.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT COUNT(o) FROM TreatmentGroup AS o WHERE");
-        for (int i = 0; i < analysisGroups.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
-            queryBuilder.append(" :analysisGroups_item").append(i).append(" MEMBER OF o.analysisGroups");
-        }
-        TypedQuery q = em.createQuery(queryBuilder.toString(), Long.class);
-        int analysisGroupsIndex = 0;
-        for (AnalysisGroup _analysisgroup: analysisGroups) {
-            q.setParameter("analysisGroups_item" + analysisGroupsIndex++, _analysisgroup);
-        }
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long TreatmentGroup.countFindTreatmentGroupsByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = TreatmentGroup.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroup AS o WHERE o.codeName = :codeName", Long.class);
-        q.setParameter("codeName", codeName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long TreatmentGroup.countFindTreatmentGroupsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = TreatmentGroup.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroup AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<TreatmentGroup> TreatmentGroup.findTreatmentGroupsByAnalysisGroups(Set<AnalysisGroup> analysisGroups) {
-        if (analysisGroups == null) throw new IllegalArgumentException("The analysisGroups argument is required");
-        EntityManager em = TreatmentGroup.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroup AS o WHERE");
-        for (int i = 0; i < analysisGroups.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
-            queryBuilder.append(" :analysisGroups_item").append(i).append(" MEMBER OF o.analysisGroups");
-        }
-        TypedQuery<TreatmentGroup> q = em.createQuery(queryBuilder.toString(), TreatmentGroup.class);
-        int analysisGroupsIndex = 0;
-        for (AnalysisGroup _analysisgroup: analysisGroups) {
-            q.setParameter("analysisGroups_item" + analysisGroupsIndex++, _analysisgroup);
-        }
-        return q;
-    }
-    
-    public static TypedQuery<TreatmentGroup> TreatmentGroup.findTreatmentGroupsByAnalysisGroups(Set<AnalysisGroup> analysisGroups, String sortFieldName, String sortOrder) {
-        if (analysisGroups == null) throw new IllegalArgumentException("The analysisGroups argument is required");
-        EntityManager em = TreatmentGroup.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroup AS o WHERE");
-        for (int i = 0; i < analysisGroups.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
-            queryBuilder.append(" :analysisGroups_item").append(i).append(" MEMBER OF o.analysisGroups");
-        }
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" " + sortOrder);
-            }
-        }
-        TypedQuery<TreatmentGroup> q = em.createQuery(queryBuilder.toString(), TreatmentGroup.class);
-        int analysisGroupsIndex = 0;
-        for (AnalysisGroup _analysisgroup: analysisGroups) {
-            q.setParameter("analysisGroups_item" + analysisGroupsIndex++, _analysisgroup);
-        }
-        return q;
-    }
-    
-    public static TypedQuery<TreatmentGroup> TreatmentGroup.findTreatmentGroupsByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = TreatmentGroup.entityManager();
-        TypedQuery<TreatmentGroup> q = em.createQuery("SELECT o FROM TreatmentGroup AS o WHERE o.codeName = :codeName", TreatmentGroup.class);
-        q.setParameter("codeName", codeName);
-        return q;
-    }
-    
-    public static TypedQuery<TreatmentGroup> TreatmentGroup.findTreatmentGroupsByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = TreatmentGroup.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroup AS o WHERE o.codeName = :codeName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<TreatmentGroup> q = em.createQuery(queryBuilder.toString(), TreatmentGroup.class);
-        q.setParameter("codeName", codeName);
-        return q;
-    }
-    
-    public static TypedQuery<TreatmentGroup> TreatmentGroup.findTreatmentGroupsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = TreatmentGroup.entityManager();
-        TypedQuery<TreatmentGroup> q = em.createQuery("SELECT o FROM TreatmentGroup AS o WHERE o.lsTransaction = :lsTransaction", TreatmentGroup.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-    public static TypedQuery<TreatmentGroup> TreatmentGroup.findTreatmentGroupsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = TreatmentGroup.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroup AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<TreatmentGroup> q = em.createQuery(queryBuilder.toString(), TreatmentGroup.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroup_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/TreatmentGroup_Roo_JavaBean.aj
deleted file mode 100755
index fe4e73ecd..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroup_Roo_JavaBean.aj
+++ /dev/null
@@ -1,47 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.domain.TreatmentGroupLabel;
-import com.labsynch.labseer.domain.TreatmentGroupState;
-import java.util.Set;
-
-privileged aspect TreatmentGroup_Roo_JavaBean {
-    
-    public Set<TreatmentGroupLabel> TreatmentGroup.getLsLabels() {
-        return this.lsLabels;
-    }
-    
-    public void TreatmentGroup.setLsLabels(Set<TreatmentGroupLabel> lsLabels) {
-        this.lsLabels = lsLabels;
-    }
-    
-    public Set<TreatmentGroupState> TreatmentGroup.getLsStates() {
-        return this.lsStates;
-    }
-    
-    public void TreatmentGroup.setLsStates(Set<TreatmentGroupState> lsStates) {
-        this.lsStates = lsStates;
-    }
-    
-    public Set<Subject> TreatmentGroup.getSubjects() {
-        return this.subjects;
-    }
-    
-    public void TreatmentGroup.setSubjects(Set<Subject> subjects) {
-        this.subjects = subjects;
-    }
-    
-    public Set<AnalysisGroup> TreatmentGroup.getAnalysisGroups() {
-        return this.analysisGroups;
-    }
-    
-    public void TreatmentGroup.setAnalysisGroups(Set<AnalysisGroup> analysisGroups) {
-        this.analysisGroups = analysisGroups;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroup_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/TreatmentGroup_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 1dfcd2f12..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroup_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroup;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect TreatmentGroup_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> TreatmentGroup.fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsLabels", "lsStates", "subjects", "analysisGroups");
-    
-    public static long TreatmentGroup.countTreatmentGroups() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM TreatmentGroup o", Long.class).getSingleResult();
-    }
-    
-    public static List<TreatmentGroup> TreatmentGroup.findAllTreatmentGroups() {
-        return entityManager().createQuery("SELECT o FROM TreatmentGroup o", TreatmentGroup.class).getResultList();
-    }
-    
-    public static List<TreatmentGroup> TreatmentGroup.findAllTreatmentGroups(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM TreatmentGroup o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, TreatmentGroup.class).getResultList();
-    }
-    
-    public static TreatmentGroup TreatmentGroup.findTreatmentGroup(Long id) {
-        if (id == null) return null;
-        return entityManager().find(TreatmentGroup.class, id);
-    }
-    
-    public static List<TreatmentGroup> TreatmentGroup.findTreatmentGroupEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM TreatmentGroup o", TreatmentGroup.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<TreatmentGroup> TreatmentGroup.findTreatmentGroupEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM TreatmentGroup o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, TreatmentGroup.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public TreatmentGroup TreatmentGroup.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        TreatmentGroup merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroup_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/TreatmentGroup_Roo_Jpa_Entity.aj
deleted file mode 100755
index 536a85e1d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroup_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroup;
-import javax.persistence.Entity;
-
-privileged aspect TreatmentGroup_Roo_Jpa_Entity {
-    
-    declare @type: TreatmentGroup: @Entity;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroup_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/TreatmentGroup_Roo_ToString.aj
deleted file mode 100755
index e8508c23e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroup_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroup;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect TreatmentGroup_Roo_ToString {
-    
-    public String TreatmentGroup.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/UncertaintyKind.java b/src/main/java/com/labsynch/labseer/domain/UncertaintyKind.java
index 50316cf9e..2daa60183 100755
--- a/src/main/java/com/labsynch/labseer/domain/UncertaintyKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/UncertaintyKind.java
@@ -1,15 +1,32 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.JoinColumn;
+import javax.persistence.PersistenceContext;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord(sequenceName = "UNCERTAINTY_KIND_PKSEQ")
@@ -21,4 +38,159 @@ public class UncertaintyKind {
     @Size(max = 255)
     @JoinColumn(name = "ls_type")
     private String kindName;
+
+	@Id
+    @SequenceGenerator(name = "uncertaintyKindGen", sequenceName = "UNCERTAINTY_KIND_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "uncertaintyKindGen")
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String getKindName() {
+        return this.kindName;
+    }
+
+	public void setKindName(String kindName) {
+        this.kindName = kindName;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("kindName");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new UncertaintyKind().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countUncertaintyKinds() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM UncertaintyKind o", Long.class).getSingleResult();
+    }
+
+	public static List<UncertaintyKind> findAllUncertaintyKinds() {
+        return entityManager().createQuery("SELECT o FROM UncertaintyKind o", UncertaintyKind.class).getResultList();
+    }
+
+	public static List<UncertaintyKind> findAllUncertaintyKinds(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM UncertaintyKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, UncertaintyKind.class).getResultList();
+    }
+
+	public static UncertaintyKind findUncertaintyKind(Long id) {
+        if (id == null) return null;
+        return entityManager().find(UncertaintyKind.class, id);
+    }
+
+	public static List<UncertaintyKind> findUncertaintyKindEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM UncertaintyKind o", UncertaintyKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<UncertaintyKind> findUncertaintyKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM UncertaintyKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, UncertaintyKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            UncertaintyKind attached = UncertaintyKind.findUncertaintyKind(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public UncertaintyKind merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        UncertaintyKind merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static UncertaintyKind fromJsonToUncertaintyKind(String json) {
+        return new JSONDeserializer<UncertaintyKind>()
+        .use(null, UncertaintyKind.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<UncertaintyKind> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<UncertaintyKind> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<UncertaintyKind> fromJsonArrayToUncertaintyKinds(String json) {
+        return new JSONDeserializer<List<UncertaintyKind>>()
+        .use("values", UncertaintyKind.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/UncertaintyKind_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/UncertaintyKind_Roo_Configurable.aj
deleted file mode 100755
index 31b28a946..000000000
--- a/src/main/java/com/labsynch/labseer/domain/UncertaintyKind_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UncertaintyKind;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect UncertaintyKind_Roo_Configurable {
-    
-    declare @type: UncertaintyKind: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/UncertaintyKind_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/UncertaintyKind_Roo_JavaBean.aj
deleted file mode 100755
index 72ffa4d11..000000000
--- a/src/main/java/com/labsynch/labseer/domain/UncertaintyKind_Roo_JavaBean.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UncertaintyKind;
-
-privileged aspect UncertaintyKind_Roo_JavaBean {
-    
-    public String UncertaintyKind.getKindName() {
-        return this.kindName;
-    }
-    
-    public void UncertaintyKind.setKindName(String kindName) {
-        this.kindName = kindName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/UncertaintyKind_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/UncertaintyKind_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 6c9255871..000000000
--- a/src/main/java/com/labsynch/labseer/domain/UncertaintyKind_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UncertaintyKind;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect UncertaintyKind_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager UncertaintyKind.entityManager;
-    
-    public static final List<String> UncertaintyKind.fieldNames4OrderClauseFilter = java.util.Arrays.asList("kindName");
-    
-    public static final EntityManager UncertaintyKind.entityManager() {
-        EntityManager em = new UncertaintyKind().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long UncertaintyKind.countUncertaintyKinds() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM UncertaintyKind o", Long.class).getSingleResult();
-    }
-    
-    public static List<UncertaintyKind> UncertaintyKind.findAllUncertaintyKinds() {
-        return entityManager().createQuery("SELECT o FROM UncertaintyKind o", UncertaintyKind.class).getResultList();
-    }
-    
-    public static List<UncertaintyKind> UncertaintyKind.findAllUncertaintyKinds(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM UncertaintyKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, UncertaintyKind.class).getResultList();
-    }
-    
-    public static UncertaintyKind UncertaintyKind.findUncertaintyKind(Long id) {
-        if (id == null) return null;
-        return entityManager().find(UncertaintyKind.class, id);
-    }
-    
-    public static List<UncertaintyKind> UncertaintyKind.findUncertaintyKindEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM UncertaintyKind o", UncertaintyKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<UncertaintyKind> UncertaintyKind.findUncertaintyKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM UncertaintyKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, UncertaintyKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void UncertaintyKind.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void UncertaintyKind.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            UncertaintyKind attached = UncertaintyKind.findUncertaintyKind(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void UncertaintyKind.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void UncertaintyKind.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public UncertaintyKind UncertaintyKind.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        UncertaintyKind merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/UncertaintyKind_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/UncertaintyKind_Roo_Jpa_Entity.aj
deleted file mode 100755
index eea5cf284..000000000
--- a/src/main/java/com/labsynch/labseer/domain/UncertaintyKind_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UncertaintyKind;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
-
-privileged aspect UncertaintyKind_Roo_Jpa_Entity {
-    
-    declare @type: UncertaintyKind: @Entity;
-    
-    @Id
-    @SequenceGenerator(name = "uncertaintyKindGen", sequenceName = "UNCERTAINTY_KIND_PKSEQ")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "uncertaintyKindGen")
-    @Column(name = "id")
-    private Long UncertaintyKind.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer UncertaintyKind.version;
-    
-    public Long UncertaintyKind.getId() {
-        return this.id;
-    }
-    
-    public void UncertaintyKind.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer UncertaintyKind.getVersion() {
-        return this.version;
-    }
-    
-    public void UncertaintyKind.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/UncertaintyKind_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/UncertaintyKind_Roo_Json.aj
deleted file mode 100755
index 1f471b058..000000000
--- a/src/main/java/com/labsynch/labseer/domain/UncertaintyKind_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UncertaintyKind;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect UncertaintyKind_Roo_Json {
-    
-    public String UncertaintyKind.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String UncertaintyKind.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static UncertaintyKind UncertaintyKind.fromJsonToUncertaintyKind(String json) {
-        return new JSONDeserializer<UncertaintyKind>()
-        .use(null, UncertaintyKind.class).deserialize(json);
-    }
-    
-    public static String UncertaintyKind.toJsonArray(Collection<UncertaintyKind> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String UncertaintyKind.toJsonArray(Collection<UncertaintyKind> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<UncertaintyKind> UncertaintyKind.fromJsonArrayToUncertaintyKinds(String json) {
-        return new JSONDeserializer<List<UncertaintyKind>>()
-        .use("values", UncertaintyKind.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/UncertaintyKind_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/UncertaintyKind_Roo_ToString.aj
deleted file mode 100755
index 4a4bc87bf..000000000
--- a/src/main/java/com/labsynch/labseer/domain/UncertaintyKind_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UncertaintyKind;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect UncertaintyKind_Roo_ToString {
-    
-    public String UncertaintyKind.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Unit.java b/src/main/java/com/labsynch/labseer/domain/Unit.java
index 88fb6edbd..1750ca019 100755
--- a/src/main/java/com/labsynch/labseer/domain/Unit.java
+++ b/src/main/java/com/labsynch/labseer/domain/Unit.java
@@ -1,12 +1,30 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -19,4 +37,280 @@ public class Unit {
     @Size(max = 255)
     private String code;
     
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public static Long countFindUnitsByCodeEquals(String code) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = Unit.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Unit AS o WHERE o.code = :code", Long.class);
+        q.setParameter("code", code);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindUnitsByCodeLike(String code) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        code = code.replace('*', '%');
+        if (code.charAt(0) != '%') {
+            code = "%" + code;
+        }
+        if (code.charAt(code.length() - 1) != '%') {
+            code = code + "%";
+        }
+        EntityManager em = Unit.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Unit AS o WHERE LOWER(o.code) LIKE LOWER(:code)", Long.class);
+        q.setParameter("code", code);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindUnitsByNameEquals(String name) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = Unit.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Unit AS o WHERE o.name = :name", Long.class);
+        q.setParameter("name", name);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<Unit> findUnitsByCodeEquals(String code) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = Unit.entityManager();
+        TypedQuery<Unit> q = em.createQuery("SELECT o FROM Unit AS o WHERE o.code = :code", Unit.class);
+        q.setParameter("code", code);
+        return q;
+    }
+
+	public static TypedQuery<Unit> findUnitsByCodeEquals(String code, String sortFieldName, String sortOrder) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = Unit.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Unit AS o WHERE o.code = :code");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Unit> q = em.createQuery(queryBuilder.toString(), Unit.class);
+        q.setParameter("code", code);
+        return q;
+    }
+
+	public static TypedQuery<Unit> findUnitsByCodeLike(String code) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        code = code.replace('*', '%');
+        if (code.charAt(0) != '%') {
+            code = "%" + code;
+        }
+        if (code.charAt(code.length() - 1) != '%') {
+            code = code + "%";
+        }
+        EntityManager em = Unit.entityManager();
+        TypedQuery<Unit> q = em.createQuery("SELECT o FROM Unit AS o WHERE LOWER(o.code) LIKE LOWER(:code)", Unit.class);
+        q.setParameter("code", code);
+        return q;
+    }
+
+	public static TypedQuery<Unit> findUnitsByCodeLike(String code, String sortFieldName, String sortOrder) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        code = code.replace('*', '%');
+        if (code.charAt(0) != '%') {
+            code = "%" + code;
+        }
+        if (code.charAt(code.length() - 1) != '%') {
+            code = code + "%";
+        }
+        EntityManager em = Unit.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Unit AS o WHERE LOWER(o.code) LIKE LOWER(:code)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Unit> q = em.createQuery(queryBuilder.toString(), Unit.class);
+        q.setParameter("code", code);
+        return q;
+    }
+
+	public static TypedQuery<Unit> findUnitsByNameEquals(String name) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = Unit.entityManager();
+        TypedQuery<Unit> q = em.createQuery("SELECT o FROM Unit AS o WHERE o.name = :name", Unit.class);
+        q.setParameter("name", name);
+        return q;
+    }
+
+	public static TypedQuery<Unit> findUnitsByNameEquals(String name, String sortFieldName, String sortOrder) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = Unit.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Unit AS o WHERE o.name = :name");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Unit> q = em.createQuery(queryBuilder.toString(), Unit.class);
+        q.setParameter("name", name);
+        return q;
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new Unit().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countUnits() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM Unit o", Long.class).getSingleResult();
+    }
+
+	public static List<Unit> findAllUnits() {
+        return entityManager().createQuery("SELECT o FROM Unit o", Unit.class).getResultList();
+    }
+
+	public static List<Unit> findAllUnits(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM Unit o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, Unit.class).getResultList();
+    }
+
+	public static Unit findUnit(Long id) {
+        if (id == null) return null;
+        return entityManager().find(Unit.class, id);
+    }
+
+	public static List<Unit> findUnitEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM Unit o", Unit.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<Unit> findUnitEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM Unit o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, Unit.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            Unit attached = Unit.findUnit(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public Unit merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        Unit merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String getName() {
+        return this.name;
+    }
+
+	public void setName(String name) {
+        this.name = name;
+    }
+
+	public String getCode() {
+        return this.code;
+    }
+
+	public void setCode(String code) {
+        this.code = code;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static Unit fromJsonToUnit(String json) {
+        return new JSONDeserializer<Unit>()
+        .use(null, Unit.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<Unit> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<Unit> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<Unit> fromJsonArrayToUnits(String json) {
+        return new JSONDeserializer<List<Unit>>()
+        .use("values", Unit.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/UnitKind.java b/src/main/java/com/labsynch/labseer/domain/UnitKind.java
index cb727a3b8..adc3b5e2c 100755
--- a/src/main/java/com/labsynch/labseer/domain/UnitKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/UnitKind.java
@@ -1,5 +1,8 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.List;
 
 import javax.persistence.Column;
@@ -12,16 +15,20 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
 @Entity
 @RooJavaBean
 @RooToString
@@ -133,4 +140,123 @@ public UnitKind merge() {
         this.entityManager.flush();
         return merged;
     }
+
+	public UnitType getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(UnitType lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getKindName() {
+        return this.kindName;
+    }
+
+	public void setKindName(String kindName) {
+        this.kindName = kindName;
+    }
+
+	public String getLsTypeAndKind() {
+        return this.lsTypeAndKind;
+    }
+
+	public void setLsTypeAndKind(String lsTypeAndKind) {
+        this.lsTypeAndKind = lsTypeAndKind;
+    }
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
+
+	public static List<UnitKind> findAllUnitKinds(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM UnitKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, UnitKind.class).getResultList();
+    }
+
+	public static List<UnitKind> findUnitKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM UnitKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, UnitKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static UnitKind fromJsonToUnitKind(String json) {
+        return new JSONDeserializer<UnitKind>()
+        .use(null, UnitKind.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<UnitKind> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<UnitKind> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<UnitKind> fromJsonArrayToUnitKinds(String json) {
+        return new JSONDeserializer<List<UnitKind>>()
+        .use("values", UnitKind.class).deserialize(json);
+    }
+
+	public static Long countFindUnitKindsByKindNameEqualsAndLsType(String kindName, UnitType lsType) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = UnitKind.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM UnitKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<UnitKind> findUnitKindsByKindNameEqualsAndLsType(String kindName, UnitType lsType) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = UnitKind.entityManager();
+        TypedQuery<UnitKind> q = em.createQuery("SELECT o FROM UnitKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", UnitKind.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<UnitKind> findUnitKindsByKindNameEqualsAndLsType(String kindName, UnitType lsType, String sortFieldName, String sortOrder) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = UnitKind.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM UnitKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<UnitKind> q = em.createQuery(queryBuilder.toString(), UnitKind.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/UnitKind_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/UnitKind_Roo_Configurable.aj
deleted file mode 100755
index 9c9eddd63..000000000
--- a/src/main/java/com/labsynch/labseer/domain/UnitKind_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UnitKind;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect UnitKind_Roo_Configurable {
-    
-    declare @type: UnitKind: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/UnitKind_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/UnitKind_Roo_Finder.aj
deleted file mode 100644
index 9dc394dc0..000000000
--- a/src/main/java/com/labsynch/labseer/domain/UnitKind_Roo_Finder.aj
+++ /dev/null
@@ -1,50 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UnitKind;
-import com.labsynch.labseer.domain.UnitType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect UnitKind_Roo_Finder {
-    
-    public static Long UnitKind.countFindUnitKindsByKindNameEqualsAndLsType(String kindName, UnitType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = UnitKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM UnitKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<UnitKind> UnitKind.findUnitKindsByKindNameEqualsAndLsType(String kindName, UnitType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = UnitKind.entityManager();
-        TypedQuery<UnitKind> q = em.createQuery("SELECT o FROM UnitKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", UnitKind.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<UnitKind> UnitKind.findUnitKindsByKindNameEqualsAndLsType(String kindName, UnitType lsType, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = UnitKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM UnitKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<UnitKind> q = em.createQuery(queryBuilder.toString(), UnitKind.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/UnitKind_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/UnitKind_Roo_JavaBean.aj
deleted file mode 100755
index 7b7e65bbc..000000000
--- a/src/main/java/com/labsynch/labseer/domain/UnitKind_Roo_JavaBean.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UnitKind;
-import com.labsynch.labseer.domain.UnitType;
-
-privileged aspect UnitKind_Roo_JavaBean {
-    
-    public UnitType UnitKind.getLsType() {
-        return this.lsType;
-    }
-    
-    public void UnitKind.setLsType(UnitType lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String UnitKind.getKindName() {
-        return this.kindName;
-    }
-    
-    public void UnitKind.setKindName(String kindName) {
-        this.kindName = kindName;
-    }
-    
-    public String UnitKind.getLsTypeAndKind() {
-        return this.lsTypeAndKind;
-    }
-    
-    public void UnitKind.setLsTypeAndKind(String lsTypeAndKind) {
-        this.lsTypeAndKind = lsTypeAndKind;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/UnitKind_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/UnitKind_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index f9e702220..000000000
--- a/src/main/java/com/labsynch/labseer/domain/UnitKind_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UnitKind;
-import java.util.List;
-
-privileged aspect UnitKind_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> UnitKind.fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
-    
-    public static List<UnitKind> UnitKind.findAllUnitKinds(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM UnitKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, UnitKind.class).getResultList();
-    }
-    
-    public static List<UnitKind> UnitKind.findUnitKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM UnitKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, UnitKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/UnitKind_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/UnitKind_Roo_Json.aj
deleted file mode 100755
index 81999469d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/UnitKind_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UnitKind;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect UnitKind_Roo_Json {
-    
-    public String UnitKind.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String UnitKind.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static UnitKind UnitKind.fromJsonToUnitKind(String json) {
-        return new JSONDeserializer<UnitKind>()
-        .use(null, UnitKind.class).deserialize(json);
-    }
-    
-    public static String UnitKind.toJsonArray(Collection<UnitKind> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String UnitKind.toJsonArray(Collection<UnitKind> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<UnitKind> UnitKind.fromJsonArrayToUnitKinds(String json) {
-        return new JSONDeserializer<List<UnitKind>>()
-        .use("values", UnitKind.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/UnitKind_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/UnitKind_Roo_ToString.aj
deleted file mode 100755
index e7d9d4c4b..000000000
--- a/src/main/java/com/labsynch/labseer/domain/UnitKind_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UnitKind;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect UnitKind_Roo_ToString {
-    
-    public String UnitKind.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/UnitType.java b/src/main/java/com/labsynch/labseer/domain/UnitType.java
index ed32a065a..de569540e 100755
--- a/src/main/java/com/labsynch/labseer/domain/UnitType.java
+++ b/src/main/java/com/labsynch/labseer/domain/UnitType.java
@@ -1,20 +1,31 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.EntityManager;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
 @Entity
 @RooJavaBean
 @RooToString
@@ -52,4 +63,164 @@ public Integer getVersion() {
 	public void setVersion(Integer version) {
         this.version = version;
     }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName", "id", "version");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new UnitType().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countUnitTypes() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM UnitType o", Long.class).getSingleResult();
+    }
+
+	public static List<UnitType> findAllUnitTypes() {
+        return entityManager().createQuery("SELECT o FROM UnitType o", UnitType.class).getResultList();
+    }
+
+	public static List<UnitType> findAllUnitTypes(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM UnitType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, UnitType.class).getResultList();
+    }
+
+	public static UnitType findUnitType(Long id) {
+        if (id == null) return null;
+        return entityManager().find(UnitType.class, id);
+    }
+
+	public static List<UnitType> findUnitTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM UnitType o", UnitType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<UnitType> findUnitTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM UnitType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, UnitType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            UnitType attached = UnitType.findUnitType(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public UnitType merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        UnitType merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public static Long countFindUnitTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = UnitType.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM UnitType AS o WHERE o.typeName = :typeName", Long.class);
+        q.setParameter("typeName", typeName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<UnitType> findUnitTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = UnitType.entityManager();
+        TypedQuery<UnitType> q = em.createQuery("SELECT o FROM UnitType AS o WHERE o.typeName = :typeName", UnitType.class);
+        q.setParameter("typeName", typeName);
+        return q;
+    }
+
+	public static TypedQuery<UnitType> findUnitTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = UnitType.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM UnitType AS o WHERE o.typeName = :typeName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<UnitType> q = em.createQuery(queryBuilder.toString(), UnitType.class);
+        q.setParameter("typeName", typeName);
+        return q;
+    }
+
+	public String getTypeName() {
+        return this.typeName;
+    }
+
+	public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static UnitType fromJsonToUnitType(String json) {
+        return new JSONDeserializer<UnitType>()
+        .use(null, UnitType.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<UnitType> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<UnitType> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<UnitType> fromJsonArrayToUnitTypes(String json) {
+        return new JSONDeserializer<List<UnitType>>()
+        .use("values", UnitType.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/UnitType_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/UnitType_Roo_Configurable.aj
deleted file mode 100755
index 37062a58e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/UnitType_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UnitType;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect UnitType_Roo_Configurable {
-    
-    declare @type: UnitType: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/UnitType_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/UnitType_Roo_Finder.aj
deleted file mode 100755
index 5e033c56e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/UnitType_Roo_Finder.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UnitType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect UnitType_Roo_Finder {
-    
-    public static Long UnitType.countFindUnitTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = UnitType.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM UnitType AS o WHERE o.typeName = :typeName", Long.class);
-        q.setParameter("typeName", typeName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<UnitType> UnitType.findUnitTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = UnitType.entityManager();
-        TypedQuery<UnitType> q = em.createQuery("SELECT o FROM UnitType AS o WHERE o.typeName = :typeName", UnitType.class);
-        q.setParameter("typeName", typeName);
-        return q;
-    }
-    
-    public static TypedQuery<UnitType> UnitType.findUnitTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = UnitType.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM UnitType AS o WHERE o.typeName = :typeName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<UnitType> q = em.createQuery(queryBuilder.toString(), UnitType.class);
-        q.setParameter("typeName", typeName);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/UnitType_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/UnitType_Roo_JavaBean.aj
deleted file mode 100755
index 7f6ef50ce..000000000
--- a/src/main/java/com/labsynch/labseer/domain/UnitType_Roo_JavaBean.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UnitType;
-
-privileged aspect UnitType_Roo_JavaBean {
-    
-    public String UnitType.getTypeName() {
-        return this.typeName;
-    }
-    
-    public void UnitType.setTypeName(String typeName) {
-        this.typeName = typeName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/UnitType_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/UnitType_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 56c31c95e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/UnitType_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UnitType;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect UnitType_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager UnitType.entityManager;
-    
-    public static final List<String> UnitType.fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName", "id", "version");
-    
-    public static final EntityManager UnitType.entityManager() {
-        EntityManager em = new UnitType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long UnitType.countUnitTypes() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM UnitType o", Long.class).getSingleResult();
-    }
-    
-    public static List<UnitType> UnitType.findAllUnitTypes() {
-        return entityManager().createQuery("SELECT o FROM UnitType o", UnitType.class).getResultList();
-    }
-    
-    public static List<UnitType> UnitType.findAllUnitTypes(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM UnitType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, UnitType.class).getResultList();
-    }
-    
-    public static UnitType UnitType.findUnitType(Long id) {
-        if (id == null) return null;
-        return entityManager().find(UnitType.class, id);
-    }
-    
-    public static List<UnitType> UnitType.findUnitTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM UnitType o", UnitType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<UnitType> UnitType.findUnitTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM UnitType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, UnitType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void UnitType.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void UnitType.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            UnitType attached = UnitType.findUnitType(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void UnitType.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void UnitType.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public UnitType UnitType.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        UnitType merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/UnitType_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/UnitType_Roo_Json.aj
deleted file mode 100755
index bbc87a142..000000000
--- a/src/main/java/com/labsynch/labseer/domain/UnitType_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UnitType;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect UnitType_Roo_Json {
-    
-    public String UnitType.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String UnitType.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static UnitType UnitType.fromJsonToUnitType(String json) {
-        return new JSONDeserializer<UnitType>()
-        .use(null, UnitType.class).deserialize(json);
-    }
-    
-    public static String UnitType.toJsonArray(Collection<UnitType> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String UnitType.toJsonArray(Collection<UnitType> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<UnitType> UnitType.fromJsonArrayToUnitTypes(String json) {
-        return new JSONDeserializer<List<UnitType>>()
-        .use("values", UnitType.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/UnitType_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/UnitType_Roo_ToString.aj
deleted file mode 100755
index 3e3258b75..000000000
--- a/src/main/java/com/labsynch/labseer/domain/UnitType_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UnitType;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect UnitType_Roo_ToString {
-    
-    public String UnitType.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Unit_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/Unit_Roo_Configurable.aj
deleted file mode 100644
index 732e6b8e6..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Unit_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Unit;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect Unit_Roo_Configurable {
-    
-    declare @type: Unit: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Unit_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/Unit_Roo_Finder.aj
deleted file mode 100644
index 1d59f40f8..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Unit_Roo_Finder.aj
+++ /dev/null
@@ -1,126 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Unit;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect Unit_Roo_Finder {
-    
-    public static Long Unit.countFindUnitsByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = Unit.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Unit AS o WHERE o.code = :code", Long.class);
-        q.setParameter("code", code);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Unit.countFindUnitsByCodeLike(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        code = code.replace('*', '%');
-        if (code.charAt(0) != '%') {
-            code = "%" + code;
-        }
-        if (code.charAt(code.length() - 1) != '%') {
-            code = code + "%";
-        }
-        EntityManager em = Unit.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Unit AS o WHERE LOWER(o.code) LIKE LOWER(:code)", Long.class);
-        q.setParameter("code", code);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Unit.countFindUnitsByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = Unit.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Unit AS o WHERE o.name = :name", Long.class);
-        q.setParameter("name", name);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<Unit> Unit.findUnitsByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = Unit.entityManager();
-        TypedQuery<Unit> q = em.createQuery("SELECT o FROM Unit AS o WHERE o.code = :code", Unit.class);
-        q.setParameter("code", code);
-        return q;
-    }
-    
-    public static TypedQuery<Unit> Unit.findUnitsByCodeEquals(String code, String sortFieldName, String sortOrder) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = Unit.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Unit AS o WHERE o.code = :code");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Unit> q = em.createQuery(queryBuilder.toString(), Unit.class);
-        q.setParameter("code", code);
-        return q;
-    }
-    
-    public static TypedQuery<Unit> Unit.findUnitsByCodeLike(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        code = code.replace('*', '%');
-        if (code.charAt(0) != '%') {
-            code = "%" + code;
-        }
-        if (code.charAt(code.length() - 1) != '%') {
-            code = code + "%";
-        }
-        EntityManager em = Unit.entityManager();
-        TypedQuery<Unit> q = em.createQuery("SELECT o FROM Unit AS o WHERE LOWER(o.code) LIKE LOWER(:code)", Unit.class);
-        q.setParameter("code", code);
-        return q;
-    }
-    
-    public static TypedQuery<Unit> Unit.findUnitsByCodeLike(String code, String sortFieldName, String sortOrder) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        code = code.replace('*', '%');
-        if (code.charAt(0) != '%') {
-            code = "%" + code;
-        }
-        if (code.charAt(code.length() - 1) != '%') {
-            code = code + "%";
-        }
-        EntityManager em = Unit.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Unit AS o WHERE LOWER(o.code) LIKE LOWER(:code)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Unit> q = em.createQuery(queryBuilder.toString(), Unit.class);
-        q.setParameter("code", code);
-        return q;
-    }
-    
-    public static TypedQuery<Unit> Unit.findUnitsByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = Unit.entityManager();
-        TypedQuery<Unit> q = em.createQuery("SELECT o FROM Unit AS o WHERE o.name = :name", Unit.class);
-        q.setParameter("name", name);
-        return q;
-    }
-    
-    public static TypedQuery<Unit> Unit.findUnitsByNameEquals(String name, String sortFieldName, String sortOrder) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = Unit.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Unit AS o WHERE o.name = :name");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Unit> q = em.createQuery(queryBuilder.toString(), Unit.class);
-        q.setParameter("name", name);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Unit_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/Unit_Roo_JavaBean.aj
deleted file mode 100644
index e9d553bcc..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Unit_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Unit;
-
-privileged aspect Unit_Roo_JavaBean {
-    
-    public String Unit.getName() {
-        return this.name;
-    }
-    
-    public void Unit.setName(String name) {
-        this.name = name;
-    }
-    
-    public String Unit.getCode() {
-        return this.code;
-    }
-    
-    public void Unit.setCode(String code) {
-        this.code = code;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Unit_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/Unit_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 53aa08c72..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Unit_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Unit;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect Unit_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager Unit.entityManager;
-    
-    public static final List<String> Unit.fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
-    
-    public static final EntityManager Unit.entityManager() {
-        EntityManager em = new Unit().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long Unit.countUnits() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM Unit o", Long.class).getSingleResult();
-    }
-    
-    public static List<Unit> Unit.findAllUnits() {
-        return entityManager().createQuery("SELECT o FROM Unit o", Unit.class).getResultList();
-    }
-    
-    public static List<Unit> Unit.findAllUnits(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM Unit o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, Unit.class).getResultList();
-    }
-    
-    public static Unit Unit.findUnit(Long id) {
-        if (id == null) return null;
-        return entityManager().find(Unit.class, id);
-    }
-    
-    public static List<Unit> Unit.findUnitEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM Unit o", Unit.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<Unit> Unit.findUnitEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM Unit o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, Unit.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void Unit.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void Unit.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            Unit attached = Unit.findUnit(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void Unit.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void Unit.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public Unit Unit.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        Unit merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Unit_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/Unit_Roo_Jpa_Entity.aj
deleted file mode 100644
index b75e1fd4e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Unit_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Unit;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect Unit_Roo_Jpa_Entity {
-    
-    declare @type: Unit: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long Unit.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer Unit.version;
-    
-    public Long Unit.getId() {
-        return this.id;
-    }
-    
-    public void Unit.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer Unit.getVersion() {
-        return this.version;
-    }
-    
-    public void Unit.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Unit_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/Unit_Roo_Json.aj
deleted file mode 100644
index 6636b2fe0..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Unit_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Unit;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect Unit_Roo_Json {
-    
-    public String Unit.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String Unit.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static Unit Unit.fromJsonToUnit(String json) {
-        return new JSONDeserializer<Unit>()
-        .use(null, Unit.class).deserialize(json);
-    }
-    
-    public static String Unit.toJsonArray(Collection<Unit> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String Unit.toJsonArray(Collection<Unit> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<Unit> Unit.fromJsonArrayToUnits(String json) {
-        return new JSONDeserializer<List<Unit>>()
-        .use("values", Unit.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Unit_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/Unit_Roo_ToString.aj
deleted file mode 100644
index 4ef1452a9..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Unit_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Unit;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect Unit_Roo_ToString {
-    
-    public String Unit.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/UpdateLog.java b/src/main/java/com/labsynch/labseer/domain/UpdateLog.java
index 39b58bba1..98102be78 100755
--- a/src/main/java/com/labsynch/labseer/domain/UpdateLog.java
+++ b/src/main/java/com/labsynch/labseer/domain/UpdateLog.java
@@ -1,17 +1,31 @@
 package com.labsynch.labseer.domain;
 
 import java.util.Date;
-
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import javax.persistence.SequenceGenerator;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
+import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@Entity
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord(sequenceName = "UPDATE_LOG_PKSEQ")
@@ -36,4 +50,169 @@ public class UpdateLog {
 	private String recordedBy;
     
     
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("thing", "updateAction", "comments", "lsTransaction", "recordedDate", "recordedBy");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new UpdateLog().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countUpdateLogs() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM UpdateLog o", Long.class).getSingleResult();
+    }
+
+	public static List<UpdateLog> findAllUpdateLogs() {
+        return entityManager().createQuery("SELECT o FROM UpdateLog o", UpdateLog.class).getResultList();
+    }
+
+	public static List<UpdateLog> findAllUpdateLogs(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM UpdateLog o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, UpdateLog.class).getResultList();
+    }
+
+	public static UpdateLog findUpdateLog(Long id) {
+        if (id == null) return null;
+        return entityManager().find(UpdateLog.class, id);
+    }
+
+	public static List<UpdateLog> findUpdateLogEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM UpdateLog o", UpdateLog.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<UpdateLog> findUpdateLogEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM UpdateLog o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, UpdateLog.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            UpdateLog attached = UpdateLog.findUpdateLog(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public UpdateLog merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        UpdateLog merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@Id
+    @SequenceGenerator(name = "updateLogGen", sequenceName = "UPDATE_LOG_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "updateLogGen")
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public Long getThing() {
+        return this.thing;
+    }
+
+	public void setThing(Long thing) {
+        this.thing = thing;
+    }
+
+	public String getUpdateAction() {
+        return this.updateAction;
+    }
+
+	public void setUpdateAction(String updateAction) {
+        this.updateAction = updateAction;
+    }
+
+	public String getComments() {
+        return this.comments;
+    }
+
+	public void setComments(String comments) {
+        this.comments = comments;
+    }
+
+	public Long getLsTransaction() {
+        return this.lsTransaction;
+    }
+
+	public void setLsTransaction(Long lsTransaction) {
+        this.lsTransaction = lsTransaction;
+    }
+
+	public Date getRecordedDate() {
+        return this.recordedDate;
+    }
+
+	public void setRecordedDate(Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/UpdateLog_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/UpdateLog_Roo_Configurable.aj
deleted file mode 100755
index 0f0f25aaa..000000000
--- a/src/main/java/com/labsynch/labseer/domain/UpdateLog_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UpdateLog;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect UpdateLog_Roo_Configurable {
-    
-    declare @type: UpdateLog: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/UpdateLog_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/UpdateLog_Roo_JavaBean.aj
deleted file mode 100755
index abfd784ac..000000000
--- a/src/main/java/com/labsynch/labseer/domain/UpdateLog_Roo_JavaBean.aj
+++ /dev/null
@@ -1,59 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UpdateLog;
-import java.util.Date;
-
-privileged aspect UpdateLog_Roo_JavaBean {
-    
-    public Long UpdateLog.getThing() {
-        return this.thing;
-    }
-    
-    public void UpdateLog.setThing(Long thing) {
-        this.thing = thing;
-    }
-    
-    public String UpdateLog.getUpdateAction() {
-        return this.updateAction;
-    }
-    
-    public void UpdateLog.setUpdateAction(String updateAction) {
-        this.updateAction = updateAction;
-    }
-    
-    public String UpdateLog.getComments() {
-        return this.comments;
-    }
-    
-    public void UpdateLog.setComments(String comments) {
-        this.comments = comments;
-    }
-    
-    public Long UpdateLog.getLsTransaction() {
-        return this.lsTransaction;
-    }
-    
-    public void UpdateLog.setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
-    
-    public Date UpdateLog.getRecordedDate() {
-        return this.recordedDate;
-    }
-    
-    public void UpdateLog.setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
-    
-    public String UpdateLog.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void UpdateLog.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/UpdateLog_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/UpdateLog_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 40b737ebc..000000000
--- a/src/main/java/com/labsynch/labseer/domain/UpdateLog_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UpdateLog;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect UpdateLog_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager UpdateLog.entityManager;
-    
-    public static final List<String> UpdateLog.fieldNames4OrderClauseFilter = java.util.Arrays.asList("thing", "updateAction", "comments", "lsTransaction", "recordedDate", "recordedBy");
-    
-    public static final EntityManager UpdateLog.entityManager() {
-        EntityManager em = new UpdateLog().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long UpdateLog.countUpdateLogs() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM UpdateLog o", Long.class).getSingleResult();
-    }
-    
-    public static List<UpdateLog> UpdateLog.findAllUpdateLogs() {
-        return entityManager().createQuery("SELECT o FROM UpdateLog o", UpdateLog.class).getResultList();
-    }
-    
-    public static List<UpdateLog> UpdateLog.findAllUpdateLogs(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM UpdateLog o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, UpdateLog.class).getResultList();
-    }
-    
-    public static UpdateLog UpdateLog.findUpdateLog(Long id) {
-        if (id == null) return null;
-        return entityManager().find(UpdateLog.class, id);
-    }
-    
-    public static List<UpdateLog> UpdateLog.findUpdateLogEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM UpdateLog o", UpdateLog.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<UpdateLog> UpdateLog.findUpdateLogEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM UpdateLog o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, UpdateLog.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void UpdateLog.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void UpdateLog.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            UpdateLog attached = UpdateLog.findUpdateLog(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void UpdateLog.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void UpdateLog.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public UpdateLog UpdateLog.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        UpdateLog merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/UpdateLog_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/UpdateLog_Roo_Jpa_Entity.aj
deleted file mode 100755
index a3ae86e36..000000000
--- a/src/main/java/com/labsynch/labseer/domain/UpdateLog_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UpdateLog;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Version;
-
-privileged aspect UpdateLog_Roo_Jpa_Entity {
-    
-    declare @type: UpdateLog: @Entity;
-    
-    @Id
-    @SequenceGenerator(name = "updateLogGen", sequenceName = "UPDATE_LOG_PKSEQ")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "updateLogGen")
-    @Column(name = "id")
-    private Long UpdateLog.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer UpdateLog.version;
-    
-    public Long UpdateLog.getId() {
-        return this.id;
-    }
-    
-    public void UpdateLog.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer UpdateLog.getVersion() {
-        return this.version;
-    }
-    
-    public void UpdateLog.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/UpdateLog_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/UpdateLog_Roo_ToString.aj
deleted file mode 100755
index 620a0934a..000000000
--- a/src/main/java/com/labsynch/labseer/domain/UpdateLog_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UpdateLog;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect UpdateLog_Roo_ToString {
-    
-    public String UpdateLog.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ValueKind.java b/src/main/java/com/labsynch/labseer/domain/ValueKind.java
index 2c3e20f05..ef2d74c32 100755
--- a/src/main/java/com/labsynch/labseer/domain/ValueKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ValueKind.java
@@ -1,5 +1,8 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.List;
 
 import javax.persistence.Column;
@@ -12,18 +15,22 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
 @Entity
 @RooJavaBean
 @RooToString
@@ -155,4 +162,154 @@ public static ValueKind getOrCreate(ValueType lsType, String kindName) {
 		
 		return lsKind;
 	}
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
+
+	public static List<ValueKind> findAllValueKinds(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ValueKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ValueKind.class).getResultList();
+    }
+
+	public static List<ValueKind> findValueKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ValueKind o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ValueKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ValueKind fromJsonToValueKind(String json) {
+        return new JSONDeserializer<ValueKind>()
+        .use(null, ValueKind.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ValueKind> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ValueKind> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ValueKind> fromJsonArrayToValueKinds(String json) {
+        return new JSONDeserializer<List<ValueKind>>()
+        .use("values", ValueKind.class).deserialize(json);
+    }
+
+	public static Long countFindValueKindsByKindNameEqualsAndLsType(String kindName, ValueType lsType) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = ValueKind.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ValueKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindValueKindsByLsType(ValueType lsType) {
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = ValueKind.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ValueKind AS o WHERE o.lsType = :lsType", Long.class);
+        q.setParameter("lsType", lsType);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ValueKind> findValueKindsByKindNameEqualsAndLsType(String kindName, ValueType lsType) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = ValueKind.entityManager();
+        TypedQuery<ValueKind> q = em.createQuery("SELECT o FROM ValueKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", ValueKind.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<ValueKind> findValueKindsByKindNameEqualsAndLsType(String kindName, ValueType lsType, String sortFieldName, String sortOrder) {
+        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = ValueKind.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ValueKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ValueKind> q = em.createQuery(queryBuilder.toString(), ValueKind.class);
+        q.setParameter("kindName", kindName);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<ValueKind> findValueKindsByLsType(ValueType lsType) {
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = ValueKind.entityManager();
+        TypedQuery<ValueKind> q = em.createQuery("SELECT o FROM ValueKind AS o WHERE o.lsType = :lsType", ValueKind.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public static TypedQuery<ValueKind> findValueKindsByLsType(ValueType lsType, String sortFieldName, String sortOrder) {
+        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+        EntityManager em = ValueKind.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ValueKind AS o WHERE o.lsType = :lsType");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ValueKind> q = em.createQuery(queryBuilder.toString(), ValueKind.class);
+        q.setParameter("lsType", lsType);
+        return q;
+    }
+
+	public ValueType getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(ValueType lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getKindName() {
+        return this.kindName;
+    }
+
+	public void setKindName(String kindName) {
+        this.kindName = kindName;
+    }
+
+	public String getLsTypeAndKind() {
+        return this.lsTypeAndKind;
+    }
+
+	public void setLsTypeAndKind(String lsTypeAndKind) {
+        this.lsTypeAndKind = lsTypeAndKind;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ValueKind_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ValueKind_Roo_Configurable.aj
deleted file mode 100755
index 143f9e9a1..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ValueKind_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ValueKind;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ValueKind_Roo_Configurable {
-    
-    declare @type: ValueKind: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ValueKind_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ValueKind_Roo_Finder.aj
deleted file mode 100755
index 756592fae..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ValueKind_Roo_Finder.aj
+++ /dev/null
@@ -1,81 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ValueKind;
-import com.labsynch.labseer.domain.ValueType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ValueKind_Roo_Finder {
-    
-    public static Long ValueKind.countFindValueKindsByKindNameEqualsAndLsType(String kindName, ValueType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = ValueKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ValueKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long ValueKind.countFindValueKindsByLsType(ValueType lsType) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = ValueKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ValueKind AS o WHERE o.lsType = :lsType", Long.class);
-        q.setParameter("lsType", lsType);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ValueKind> ValueKind.findValueKindsByKindNameEqualsAndLsType(String kindName, ValueType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = ValueKind.entityManager();
-        TypedQuery<ValueKind> q = em.createQuery("SELECT o FROM ValueKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", ValueKind.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<ValueKind> ValueKind.findValueKindsByKindNameEqualsAndLsType(String kindName, ValueType lsType, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = ValueKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ValueKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ValueKind> q = em.createQuery(queryBuilder.toString(), ValueKind.class);
-        q.setParameter("kindName", kindName);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<ValueKind> ValueKind.findValueKindsByLsType(ValueType lsType) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = ValueKind.entityManager();
-        TypedQuery<ValueKind> q = em.createQuery("SELECT o FROM ValueKind AS o WHERE o.lsType = :lsType", ValueKind.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-    public static TypedQuery<ValueKind> ValueKind.findValueKindsByLsType(ValueType lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = ValueKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ValueKind AS o WHERE o.lsType = :lsType");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ValueKind> q = em.createQuery(queryBuilder.toString(), ValueKind.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ValueKind_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ValueKind_Roo_JavaBean.aj
deleted file mode 100755
index ebb494dda..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ValueKind_Roo_JavaBean.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ValueKind;
-import com.labsynch.labseer.domain.ValueType;
-
-privileged aspect ValueKind_Roo_JavaBean {
-    
-    public ValueType ValueKind.getLsType() {
-        return this.lsType;
-    }
-    
-    public void ValueKind.setLsType(ValueType lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String ValueKind.getKindName() {
-        return this.kindName;
-    }
-    
-    public void ValueKind.setKindName(String kindName) {
-        this.kindName = kindName;
-    }
-    
-    public String ValueKind.getLsTypeAndKind() {
-        return this.lsTypeAndKind;
-    }
-    
-    public void ValueKind.setLsTypeAndKind(String lsTypeAndKind) {
-        this.lsTypeAndKind = lsTypeAndKind;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ValueKind_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ValueKind_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 3b309353e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ValueKind_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ValueKind;
-import java.util.List;
-
-privileged aspect ValueKind_Roo_Jpa_ActiveRecord {
-    
-    public static final List<String> ValueKind.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
-    
-    public static List<ValueKind> ValueKind.findAllValueKinds(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ValueKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ValueKind.class).getResultList();
-    }
-    
-    public static List<ValueKind> ValueKind.findValueKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ValueKind o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ValueKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ValueKind_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/ValueKind_Roo_Json.aj
deleted file mode 100755
index 3945880a1..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ValueKind_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ValueKind;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ValueKind_Roo_Json {
-    
-    public String ValueKind.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ValueKind.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ValueKind ValueKind.fromJsonToValueKind(String json) {
-        return new JSONDeserializer<ValueKind>()
-        .use(null, ValueKind.class).deserialize(json);
-    }
-    
-    public static String ValueKind.toJsonArray(Collection<ValueKind> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ValueKind.toJsonArray(Collection<ValueKind> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ValueKind> ValueKind.fromJsonArrayToValueKinds(String json) {
-        return new JSONDeserializer<List<ValueKind>>()
-        .use("values", ValueKind.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ValueKind_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ValueKind_Roo_ToString.aj
deleted file mode 100755
index 3a9c048d4..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ValueKind_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ValueKind;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ValueKind_Roo_ToString {
-    
-    public String ValueKind.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ValueType.java b/src/main/java/com/labsynch/labseer/domain/ValueType.java
index c4a4cf85d..15b7be965 100755
--- a/src/main/java/com/labsynch/labseer/domain/ValueType.java
+++ b/src/main/java/com/labsynch/labseer/domain/ValueType.java
@@ -1,24 +1,34 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.List;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.EntityManager;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
+import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
 @Entity
 @RooJavaBean
 @RooToString
@@ -73,4 +83,164 @@ public Integer getVersion() {
 	public void setVersion(Integer version) {
         this.version = version;
     }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "typeName", "id", "version");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new ValueType().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countValueTypes() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ValueType o", Long.class).getSingleResult();
+    }
+
+	public static List<ValueType> findAllValueTypes() {
+        return entityManager().createQuery("SELECT o FROM ValueType o", ValueType.class).getResultList();
+    }
+
+	public static List<ValueType> findAllValueTypes(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ValueType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ValueType.class).getResultList();
+    }
+
+	public static ValueType findValueType(Long id) {
+        if (id == null) return null;
+        return entityManager().find(ValueType.class, id);
+    }
+
+	public static List<ValueType> findValueTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ValueType o", ValueType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<ValueType> findValueTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM ValueType o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, ValueType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            ValueType attached = ValueType.findValueType(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public ValueType merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        ValueType merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static Long countFindValueTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = ValueType.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ValueType AS o WHERE o.typeName = :typeName", Long.class);
+        q.setParameter("typeName", typeName);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<ValueType> findValueTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = ValueType.entityManager();
+        TypedQuery<ValueType> q = em.createQuery("SELECT o FROM ValueType AS o WHERE o.typeName = :typeName", ValueType.class);
+        q.setParameter("typeName", typeName);
+        return q;
+    }
+
+	public static TypedQuery<ValueType> findValueTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
+        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+        EntityManager em = ValueType.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ValueType AS o WHERE o.typeName = :typeName");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<ValueType> q = em.createQuery(queryBuilder.toString(), ValueType.class);
+        q.setParameter("typeName", typeName);
+        return q;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ValueType fromJsonToValueType(String json) {
+        return new JSONDeserializer<ValueType>()
+        .use(null, ValueType.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ValueType> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ValueType> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ValueType> fromJsonArrayToValueTypes(String json) {
+        return new JSONDeserializer<List<ValueType>>()
+        .use("values", ValueType.class).deserialize(json);
+    }
+
+	public String getTypeName() {
+        return this.typeName;
+    }
+
+	public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_Configurable.aj
deleted file mode 100755
index c9aad2200..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ValueType;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ValueType_Roo_Configurable {
-    
-    declare @type: ValueType: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_Finder.aj
deleted file mode 100755
index 419458901..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_Finder.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ValueType;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect ValueType_Roo_Finder {
-    
-    public static Long ValueType.countFindValueTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = ValueType.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ValueType AS o WHERE o.typeName = :typeName", Long.class);
-        q.setParameter("typeName", typeName);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<ValueType> ValueType.findValueTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = ValueType.entityManager();
-        TypedQuery<ValueType> q = em.createQuery("SELECT o FROM ValueType AS o WHERE o.typeName = :typeName", ValueType.class);
-        q.setParameter("typeName", typeName);
-        return q;
-    }
-    
-    public static TypedQuery<ValueType> ValueType.findValueTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        EntityManager em = ValueType.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ValueType AS o WHERE o.typeName = :typeName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ValueType> q = em.createQuery(queryBuilder.toString(), ValueType.class);
-        q.setParameter("typeName", typeName);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_JavaBean.aj
deleted file mode 100755
index c5de5b889..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_JavaBean.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ValueType;
-
-privileged aspect ValueType_Roo_JavaBean {
-    
-    public String ValueType.getTypeName() {
-        return this.typeName;
-    }
-    
-    public void ValueType.setTypeName(String typeName) {
-        this.typeName = typeName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_Jpa_ActiveRecord.aj
deleted file mode 100755
index 4841cd704..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ValueType;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ValueType_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager ValueType.entityManager;
-    
-    public static final List<String> ValueType.fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "typeName", "id", "version");
-    
-    public static final EntityManager ValueType.entityManager() {
-        EntityManager em = new ValueType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long ValueType.countValueTypes() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ValueType o", Long.class).getSingleResult();
-    }
-    
-    public static List<ValueType> ValueType.findAllValueTypes() {
-        return entityManager().createQuery("SELECT o FROM ValueType o", ValueType.class).getResultList();
-    }
-    
-    public static List<ValueType> ValueType.findAllValueTypes(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ValueType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ValueType.class).getResultList();
-    }
-    
-    public static ValueType ValueType.findValueType(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ValueType.class, id);
-    }
-    
-    public static List<ValueType> ValueType.findValueTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ValueType o", ValueType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<ValueType> ValueType.findValueTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ValueType o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ValueType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void ValueType.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void ValueType.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            ValueType attached = ValueType.findValueType(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void ValueType.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void ValueType.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public ValueType ValueType.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ValueType merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_Json.aj
deleted file mode 100755
index 23482839d..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ValueType;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ValueType_Roo_Json {
-    
-    public String ValueType.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ValueType.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ValueType ValueType.fromJsonToValueType(String json) {
-        return new JSONDeserializer<ValueType>()
-        .use(null, ValueType.class).deserialize(json);
-    }
-    
-    public static String ValueType.toJsonArray(Collection<ValueType> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ValueType.toJsonArray(Collection<ValueType> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ValueType> ValueType.fromJsonArrayToValueTypes(String json) {
-        return new JSONDeserializer<List<ValueType>>()
-        .use("values", ValueType.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_ToString.aj
deleted file mode 100755
index e1990320e..000000000
--- a/src/main/java/com/labsynch/labseer/domain/ValueType_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ValueType;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ValueType_Roo_ToString {
-    
-    public String ValueType.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Vendor.java b/src/main/java/com/labsynch/labseer/domain/Vendor.java
index 9a636dffe..71920e95e 100755
--- a/src/main/java/com/labsynch/labseer/domain/Vendor.java
+++ b/src/main/java/com/labsynch/labseer/domain/Vendor.java
@@ -1,14 +1,30 @@
 package com.labsynch.labseer.domain;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
+import javax.persistence.Version;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJson
@@ -36,4 +52,332 @@ public static TypedQuery<Vendor> findVendorsBySearchTerm(String searchTerm) {
         q.setParameter("searchTerm", searchTerm);
         return q;
     }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static Vendor fromJsonToVendor(String json) {
+        return new JSONDeserializer<Vendor>()
+        .use(null, Vendor.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<Vendor> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<Vendor> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<Vendor> fromJsonArrayToVendors(String json) {
+        return new JSONDeserializer<List<Vendor>>()
+        .use("values", Vendor.class).deserialize(json);
+    }
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new Vendor().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countVendors() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM Vendor o", Long.class).getSingleResult();
+    }
+
+	public static List<Vendor> findAllVendors() {
+        return entityManager().createQuery("SELECT o FROM Vendor o", Vendor.class).getResultList();
+    }
+
+	public static List<Vendor> findAllVendors(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM Vendor o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, Vendor.class).getResultList();
+    }
+
+	public static Vendor findVendor(Long id) {
+        if (id == null) return null;
+        return entityManager().find(Vendor.class, id);
+    }
+
+	public static List<Vendor> findVendorEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM Vendor o", Vendor.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<Vendor> findVendorEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM Vendor o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, Vendor.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            Vendor attached = Vendor.findVendor(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public Vendor merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        Vendor merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String getName() {
+        return this.name;
+    }
+
+	public void setName(String name) {
+        this.name = name;
+    }
+
+	public String getCode() {
+        return this.code;
+    }
+
+	public void setCode(String code) {
+        this.code = code;
+    }
+
+	public static Long countFindVendorsByCodeEquals(String code) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = Vendor.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Vendor AS o WHERE o.code = :code", Long.class);
+        q.setParameter("code", code);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindVendorsByCodeLike(String code) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        code = code.replace('*', '%');
+        if (code.charAt(0) != '%') {
+            code = "%" + code;
+        }
+        if (code.charAt(code.length() - 1) != '%') {
+            code = code + "%";
+        }
+        EntityManager em = Vendor.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Vendor AS o WHERE LOWER(o.code) LIKE LOWER(:code)", Long.class);
+        q.setParameter("code", code);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindVendorsByNameEquals(String name) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = Vendor.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Vendor AS o WHERE o.name = :name", Long.class);
+        q.setParameter("name", name);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static Long countFindVendorsByNameLike(String name) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        name = name.replace('*', '%');
+        if (name.charAt(0) != '%') {
+            name = "%" + name;
+        }
+        if (name.charAt(name.length() - 1) != '%') {
+            name = name + "%";
+        }
+        EntityManager em = Vendor.entityManager();
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Vendor AS o WHERE LOWER(o.name) LIKE LOWER(:name)", Long.class);
+        q.setParameter("name", name);
+        return ((Long) q.getSingleResult());
+    }
+
+	public static TypedQuery<Vendor> findVendorsByCodeEquals(String code) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = Vendor.entityManager();
+        TypedQuery<Vendor> q = em.createQuery("SELECT o FROM Vendor AS o WHERE o.code = :code", Vendor.class);
+        q.setParameter("code", code);
+        return q;
+    }
+
+	public static TypedQuery<Vendor> findVendorsByCodeEquals(String code, String sortFieldName, String sortOrder) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        EntityManager em = Vendor.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Vendor AS o WHERE o.code = :code");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Vendor> q = em.createQuery(queryBuilder.toString(), Vendor.class);
+        q.setParameter("code", code);
+        return q;
+    }
+
+	public static TypedQuery<Vendor> findVendorsByCodeLike(String code) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        code = code.replace('*', '%');
+        if (code.charAt(0) != '%') {
+            code = "%" + code;
+        }
+        if (code.charAt(code.length() - 1) != '%') {
+            code = code + "%";
+        }
+        EntityManager em = Vendor.entityManager();
+        TypedQuery<Vendor> q = em.createQuery("SELECT o FROM Vendor AS o WHERE LOWER(o.code) LIKE LOWER(:code)", Vendor.class);
+        q.setParameter("code", code);
+        return q;
+    }
+
+	public static TypedQuery<Vendor> findVendorsByCodeLike(String code, String sortFieldName, String sortOrder) {
+        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+        code = code.replace('*', '%');
+        if (code.charAt(0) != '%') {
+            code = "%" + code;
+        }
+        if (code.charAt(code.length() - 1) != '%') {
+            code = code + "%";
+        }
+        EntityManager em = Vendor.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Vendor AS o WHERE LOWER(o.code) LIKE LOWER(:code)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Vendor> q = em.createQuery(queryBuilder.toString(), Vendor.class);
+        q.setParameter("code", code);
+        return q;
+    }
+
+	public static TypedQuery<Vendor> findVendorsByNameEquals(String name) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = Vendor.entityManager();
+        TypedQuery<Vendor> q = em.createQuery("SELECT o FROM Vendor AS o WHERE o.name = :name", Vendor.class);
+        q.setParameter("name", name);
+        return q;
+    }
+
+	public static TypedQuery<Vendor> findVendorsByNameEquals(String name, String sortFieldName, String sortOrder) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        EntityManager em = Vendor.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Vendor AS o WHERE o.name = :name");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Vendor> q = em.createQuery(queryBuilder.toString(), Vendor.class);
+        q.setParameter("name", name);
+        return q;
+    }
+
+	public static TypedQuery<Vendor> findVendorsByNameLike(String name) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        name = name.replace('*', '%');
+        if (name.charAt(0) != '%') {
+            name = "%" + name;
+        }
+        if (name.charAt(name.length() - 1) != '%') {
+            name = name + "%";
+        }
+        EntityManager em = Vendor.entityManager();
+        TypedQuery<Vendor> q = em.createQuery("SELECT o FROM Vendor AS o WHERE LOWER(o.name) LIKE LOWER(:name)", Vendor.class);
+        q.setParameter("name", name);
+        return q;
+    }
+
+	public static TypedQuery<Vendor> findVendorsByNameLike(String name, String sortFieldName, String sortOrder) {
+        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        name = name.replace('*', '%');
+        if (name.charAt(0) != '%') {
+            name = "%" + name;
+        }
+        if (name.charAt(name.length() - 1) != '%') {
+            name = name + "%";
+        }
+        EntityManager em = Vendor.entityManager();
+        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Vendor AS o WHERE LOWER(o.name) LIKE LOWER(:name)");
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            queryBuilder.append(" ORDER BY ").append(sortFieldName);
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                queryBuilder.append(" ").append(sortOrder);
+            }
+        }
+        TypedQuery<Vendor> q = em.createQuery(queryBuilder.toString(), Vendor.class);
+        q.setParameter("name", name);
+        return q;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/Vendor_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/domain/Vendor_Roo_Configurable.aj
deleted file mode 100644
index 860ac0cdc..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Vendor_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Vendor;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect Vendor_Roo_Configurable {
-    
-    declare @type: Vendor: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Vendor_Roo_Finder.aj b/src/main/java/com/labsynch/labseer/domain/Vendor_Roo_Finder.aj
deleted file mode 100644
index 9b18321b8..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Vendor_Roo_Finder.aj
+++ /dev/null
@@ -1,178 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Vendor;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-privileged aspect Vendor_Roo_Finder {
-    
-    public static Long Vendor.countFindVendorsByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = Vendor.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Vendor AS o WHERE o.code = :code", Long.class);
-        q.setParameter("code", code);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Vendor.countFindVendorsByCodeLike(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        code = code.replace('*', '%');
-        if (code.charAt(0) != '%') {
-            code = "%" + code;
-        }
-        if (code.charAt(code.length() - 1) != '%') {
-            code = code + "%";
-        }
-        EntityManager em = Vendor.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Vendor AS o WHERE LOWER(o.code) LIKE LOWER(:code)", Long.class);
-        q.setParameter("code", code);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Vendor.countFindVendorsByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = Vendor.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Vendor AS o WHERE o.name = :name", Long.class);
-        q.setParameter("name", name);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static Long Vendor.countFindVendorsByNameLike(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        name = name.replace('*', '%');
-        if (name.charAt(0) != '%') {
-            name = "%" + name;
-        }
-        if (name.charAt(name.length() - 1) != '%') {
-            name = name + "%";
-        }
-        EntityManager em = Vendor.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Vendor AS o WHERE LOWER(o.name) LIKE LOWER(:name)", Long.class);
-        q.setParameter("name", name);
-        return ((Long) q.getSingleResult());
-    }
-    
-    public static TypedQuery<Vendor> Vendor.findVendorsByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = Vendor.entityManager();
-        TypedQuery<Vendor> q = em.createQuery("SELECT o FROM Vendor AS o WHERE o.code = :code", Vendor.class);
-        q.setParameter("code", code);
-        return q;
-    }
-    
-    public static TypedQuery<Vendor> Vendor.findVendorsByCodeEquals(String code, String sortFieldName, String sortOrder) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        EntityManager em = Vendor.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Vendor AS o WHERE o.code = :code");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Vendor> q = em.createQuery(queryBuilder.toString(), Vendor.class);
-        q.setParameter("code", code);
-        return q;
-    }
-    
-    public static TypedQuery<Vendor> Vendor.findVendorsByCodeLike(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        code = code.replace('*', '%');
-        if (code.charAt(0) != '%') {
-            code = "%" + code;
-        }
-        if (code.charAt(code.length() - 1) != '%') {
-            code = code + "%";
-        }
-        EntityManager em = Vendor.entityManager();
-        TypedQuery<Vendor> q = em.createQuery("SELECT o FROM Vendor AS o WHERE LOWER(o.code) LIKE LOWER(:code)", Vendor.class);
-        q.setParameter("code", code);
-        return q;
-    }
-    
-    public static TypedQuery<Vendor> Vendor.findVendorsByCodeLike(String code, String sortFieldName, String sortOrder) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
-        code = code.replace('*', '%');
-        if (code.charAt(0) != '%') {
-            code = "%" + code;
-        }
-        if (code.charAt(code.length() - 1) != '%') {
-            code = code + "%";
-        }
-        EntityManager em = Vendor.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Vendor AS o WHERE LOWER(o.code) LIKE LOWER(:code)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Vendor> q = em.createQuery(queryBuilder.toString(), Vendor.class);
-        q.setParameter("code", code);
-        return q;
-    }
-    
-    public static TypedQuery<Vendor> Vendor.findVendorsByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = Vendor.entityManager();
-        TypedQuery<Vendor> q = em.createQuery("SELECT o FROM Vendor AS o WHERE o.name = :name", Vendor.class);
-        q.setParameter("name", name);
-        return q;
-    }
-    
-    public static TypedQuery<Vendor> Vendor.findVendorsByNameEquals(String name, String sortFieldName, String sortOrder) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        EntityManager em = Vendor.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Vendor AS o WHERE o.name = :name");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Vendor> q = em.createQuery(queryBuilder.toString(), Vendor.class);
-        q.setParameter("name", name);
-        return q;
-    }
-    
-    public static TypedQuery<Vendor> Vendor.findVendorsByNameLike(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        name = name.replace('*', '%');
-        if (name.charAt(0) != '%') {
-            name = "%" + name;
-        }
-        if (name.charAt(name.length() - 1) != '%') {
-            name = name + "%";
-        }
-        EntityManager em = Vendor.entityManager();
-        TypedQuery<Vendor> q = em.createQuery("SELECT o FROM Vendor AS o WHERE LOWER(o.name) LIKE LOWER(:name)", Vendor.class);
-        q.setParameter("name", name);
-        return q;
-    }
-    
-    public static TypedQuery<Vendor> Vendor.findVendorsByNameLike(String name, String sortFieldName, String sortOrder) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
-        name = name.replace('*', '%');
-        if (name.charAt(0) != '%') {
-            name = "%" + name;
-        }
-        if (name.charAt(name.length() - 1) != '%') {
-            name = name + "%";
-        }
-        EntityManager em = Vendor.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Vendor AS o WHERE LOWER(o.name) LIKE LOWER(:name)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Vendor> q = em.createQuery(queryBuilder.toString(), Vendor.class);
-        q.setParameter("name", name);
-        return q;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Vendor_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/domain/Vendor_Roo_JavaBean.aj
deleted file mode 100644
index be318f3ba..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Vendor_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Vendor;
-
-privileged aspect Vendor_Roo_JavaBean {
-    
-    public String Vendor.getName() {
-        return this.name;
-    }
-    
-    public void Vendor.setName(String name) {
-        this.name = name;
-    }
-    
-    public String Vendor.getCode() {
-        return this.code;
-    }
-    
-    public void Vendor.setCode(String code) {
-        this.code = code;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Vendor_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/domain/Vendor_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index 934cc6646..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Vendor_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Vendor;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect Vendor_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager Vendor.entityManager;
-    
-    public static final List<String> Vendor.fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
-    
-    public static final EntityManager Vendor.entityManager() {
-        EntityManager em = new Vendor().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long Vendor.countVendors() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM Vendor o", Long.class).getSingleResult();
-    }
-    
-    public static List<Vendor> Vendor.findAllVendors() {
-        return entityManager().createQuery("SELECT o FROM Vendor o", Vendor.class).getResultList();
-    }
-    
-    public static List<Vendor> Vendor.findAllVendors(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM Vendor o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, Vendor.class).getResultList();
-    }
-    
-    public static Vendor Vendor.findVendor(Long id) {
-        if (id == null) return null;
-        return entityManager().find(Vendor.class, id);
-    }
-    
-    public static List<Vendor> Vendor.findVendorEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM Vendor o", Vendor.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<Vendor> Vendor.findVendorEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM Vendor o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, Vendor.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void Vendor.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void Vendor.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            Vendor attached = Vendor.findVendor(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void Vendor.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void Vendor.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public Vendor Vendor.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        Vendor merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Vendor_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/domain/Vendor_Roo_Jpa_Entity.aj
deleted file mode 100644
index 1531d79d0..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Vendor_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Vendor;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect Vendor_Roo_Jpa_Entity {
-    
-    declare @type: Vendor: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long Vendor.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer Vendor.version;
-    
-    public Long Vendor.getId() {
-        return this.id;
-    }
-    
-    public void Vendor.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer Vendor.getVersion() {
-        return this.version;
-    }
-    
-    public void Vendor.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Vendor_Roo_Json.aj b/src/main/java/com/labsynch/labseer/domain/Vendor_Roo_Json.aj
deleted file mode 100644
index af0905906..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Vendor_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Vendor;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect Vendor_Roo_Json {
-    
-    public String Vendor.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String Vendor.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static Vendor Vendor.fromJsonToVendor(String json) {
-        return new JSONDeserializer<Vendor>()
-        .use(null, Vendor.class).deserialize(json);
-    }
-    
-    public static String Vendor.toJsonArray(Collection<Vendor> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String Vendor.toJsonArray(Collection<Vendor> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<Vendor> Vendor.fromJsonArrayToVendors(String json) {
-        return new JSONDeserializer<List<Vendor>>()
-        .use("values", Vendor.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/domain/Vendor_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/domain/Vendor_Roo_ToString.aj
deleted file mode 100644
index d16b767bf..000000000
--- a/src/main/java/com/labsynch/labseer/domain/Vendor_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Vendor;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect Vendor_Roo_ToString {
-    
-    public String Vendor.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCodeDTO.java
index a0d51777a..7c3e2c254 100644
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCodeDTO.java
@@ -1,7 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -17,6 +21,56 @@ public class AnalysisGroupCodeDTO {
 	public AnalysisGroupCodeDTO(){
 	}
 	
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getAnalysisGroupCode() {
+        return this.analysisGroupCode;
+    }
+
+	public void setAnalysisGroupCode(String analysisGroupCode) {
+        this.analysisGroupCode = analysisGroupCode;
+    }
+
+	public Collection<ExperimentCodeDTO> getExperimentCodes() {
+        return this.experimentCodes;
+    }
+
+	public void setExperimentCodes(Collection<ExperimentCodeDTO> experimentCodes) {
+        this.experimentCodes = experimentCodes;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static AnalysisGroupCodeDTO fromJsonToAnalysisGroupCodeDTO(String json) {
+        return new JSONDeserializer<AnalysisGroupCodeDTO>()
+        .use(null, AnalysisGroupCodeDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<AnalysisGroupCodeDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<AnalysisGroupCodeDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<AnalysisGroupCodeDTO> fromJsonArrayToAnalysisGroupCoes(String json) {
+        return new JSONDeserializer<List<AnalysisGroupCodeDTO>>()
+        .use("values", AnalysisGroupCodeDTO.class).deserialize(json);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCodeDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCodeDTO_Roo_JavaBean.aj
deleted file mode 100644
index 310d33660..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCodeDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,28 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AnalysisGroupCodeDTO;
-import com.labsynch.labseer.dto.ExperimentCodeDTO;
-import java.util.Collection;
-
-privileged aspect AnalysisGroupCodeDTO_Roo_JavaBean {
-    
-    public String AnalysisGroupCodeDTO.getAnalysisGroupCode() {
-        return this.analysisGroupCode;
-    }
-    
-    public void AnalysisGroupCodeDTO.setAnalysisGroupCode(String analysisGroupCode) {
-        this.analysisGroupCode = analysisGroupCode;
-    }
-    
-    public Collection<ExperimentCodeDTO> AnalysisGroupCodeDTO.getExperimentCodes() {
-        return this.experimentCodes;
-    }
-    
-    public void AnalysisGroupCodeDTO.setExperimentCodes(Collection<ExperimentCodeDTO> experimentCodes) {
-        this.experimentCodes = experimentCodes;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCodeDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCodeDTO_Roo_Json.aj
deleted file mode 100644
index a43c95146..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCodeDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AnalysisGroupCodeDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect AnalysisGroupCodeDTO_Roo_Json {
-    
-    public String AnalysisGroupCodeDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String AnalysisGroupCodeDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static AnalysisGroupCodeDTO AnalysisGroupCodeDTO.fromJsonToAnalysisGroupCodeDTO(String json) {
-        return new JSONDeserializer<AnalysisGroupCodeDTO>()
-        .use(null, AnalysisGroupCodeDTO.class).deserialize(json);
-    }
-    
-    public static String AnalysisGroupCodeDTO.toJsonArray(Collection<AnalysisGroupCodeDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String AnalysisGroupCodeDTO.toJsonArray(Collection<AnalysisGroupCodeDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<AnalysisGroupCodeDTO> AnalysisGroupCodeDTO.fromJsonArrayToAnalysisGroupCoes(String json) {
-        return new JSONDeserializer<List<AnalysisGroupCodeDTO>>()
-        .use("values", AnalysisGroupCodeDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCodeDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCodeDTO_Roo_ToString.aj
deleted file mode 100644
index 6f258ba92..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCodeDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AnalysisGroupCodeDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AnalysisGroupCodeDTO_Roo_ToString {
-    
-    public String AnalysisGroupCodeDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCsvDTO.java b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCsvDTO.java
index fa058624b..81e0f5212 100644
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCsvDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCsvDTO.java
@@ -1,11 +1,16 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.roo.addon.javabean.RooJavaBean;
@@ -177,6 +182,368 @@ public static CellProcessor[] getProcessors() {
 	}
 
 
+
+	public Long getExperimentID() {
+        return this.experimentID;
+    }
+
+	public void setExperimentID(Long experimentID) {
+        this.experimentID = experimentID;
+    }
+
+	public String getExperimentCodeName() {
+        return this.experimentCodeName;
+    }
+
+	public void setExperimentCodeName(String experimentCodeName) {
+        this.experimentCodeName = experimentCodeName;
+    }
+
+	public Integer getExperimentVersion() {
+        return this.experimentVersion;
+    }
+
+	public void setExperimentVersion(Integer experimentVersion) {
+        this.experimentVersion = experimentVersion;
+    }
+
+	public String getAnalysisGroupID() {
+        return this.analysisGroupID;
+    }
+
+	public void setAnalysisGroupID(String analysisGroupID) {
+        this.analysisGroupID = analysisGroupID;
+    }
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getCodeName() {
+        return this.codeName;
+    }
+
+	public void setCodeName(String codeName) {
+        this.codeName = codeName;
+    }
+
+	public Long getStateID() {
+        return this.stateID;
+    }
+
+	public void setStateID(Long stateID) {
+        this.stateID = stateID;
+    }
+
+	public String getStateType() {
+        return this.stateType;
+    }
+
+	public void setStateType(String stateType) {
+        this.stateType = stateType;
+    }
+
+	public String getStateKind() {
+        return this.stateKind;
+    }
+
+	public void setStateKind(String stateKind) {
+        this.stateKind = stateKind;
+    }
+
+	public Long getValueId() {
+        return this.valueId;
+    }
+
+	public void setValueId(Long valueId) {
+        this.valueId = valueId;
+    }
+
+	public String getValueType() {
+        return this.valueType;
+    }
+
+	public void setValueType(String valueType) {
+        this.valueType = valueType;
+    }
+
+	public String getValueKind() {
+        return this.valueKind;
+    }
+
+	public void setValueKind(String valueKind) {
+        this.valueKind = valueKind;
+    }
+
+	public String getCodeOrigin() {
+        return this.codeOrigin;
+    }
+
+	public void setCodeOrigin(String codeOrigin) {
+        this.codeOrigin = codeOrigin;
+    }
+
+	public String getCodeType() {
+        return this.codeType;
+    }
+
+	public void setCodeType(String codeType) {
+        this.codeType = codeType;
+    }
+
+	public String getCodeKind() {
+        return this.codeKind;
+    }
+
+	public void setCodeKind(String codeKind) {
+        this.codeKind = codeKind;
+    }
+
+	public String getStringValue() {
+        return this.stringValue;
+    }
+
+	public void setStringValue(String stringValue) {
+        this.stringValue = stringValue;
+    }
+
+	public String getCodeValue() {
+        return this.codeValue;
+    }
+
+	public void setCodeValue(String codeValue) {
+        this.codeValue = codeValue;
+    }
+
+	public String getFileValue() {
+        return this.fileValue;
+    }
+
+	public void setFileValue(String fileValue) {
+        this.fileValue = fileValue;
+    }
+
+	public String getUrlValue() {
+        return this.urlValue;
+    }
+
+	public void setUrlValue(String urlValue) {
+        this.urlValue = urlValue;
+    }
+
+	public Date getDateValue() {
+        return this.dateValue;
+    }
+
+	public void setDateValue(Date dateValue) {
+        this.dateValue = dateValue;
+    }
+
+	public String getClobValue() {
+        return this.clobValue;
+    }
+
+	public void setClobValue(String clobValue) {
+        this.clobValue = clobValue;
+    }
+
+	public String getValueOperator() {
+        return this.valueOperator;
+    }
+
+	public void setValueOperator(String valueOperator) {
+        this.valueOperator = valueOperator;
+    }
+
+	public BigDecimal getNumericValue() {
+        return this.numericValue;
+    }
+
+	public void setNumericValue(BigDecimal numericValue) {
+        this.numericValue = numericValue;
+    }
+
+	public Integer getSigFigs() {
+        return this.sigFigs;
+    }
+
+	public void setSigFigs(Integer sigFigs) {
+        this.sigFigs = sigFigs;
+    }
+
+	public BigDecimal getUncertainty() {
+        return this.uncertainty;
+    }
+
+	public void setUncertainty(BigDecimal uncertainty) {
+        this.uncertainty = uncertainty;
+    }
+
+	public Integer getNumberOfReplicates() {
+        return this.numberOfReplicates;
+    }
+
+	public void setNumberOfReplicates(Integer numberOfReplicates) {
+        this.numberOfReplicates = numberOfReplicates;
+    }
+
+	public String getUncertaintyType() {
+        return this.uncertaintyType;
+    }
+
+	public void setUncertaintyType(String uncertaintyType) {
+        this.uncertaintyType = uncertaintyType;
+    }
+
+	public String getValueUnit() {
+        return this.valueUnit;
+    }
+
+	public void setValueUnit(String valueUnit) {
+        this.valueUnit = valueUnit;
+    }
+
+	public Double getConcentration() {
+        return this.concentration;
+    }
+
+	public void setConcentration(Double concentration) {
+        this.concentration = concentration;
+    }
+
+	public String getConcUnit() {
+        return this.concUnit;
+    }
+
+	public void setConcUnit(String concUnit) {
+        this.concUnit = concUnit;
+    }
+
+	public String getComments() {
+        return this.comments;
+    }
+
+	public void setComments(String comments) {
+        this.comments = comments;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public Long getLsTransaction() {
+        return this.lsTransaction;
+    }
+
+	public void setLsTransaction(Long lsTransaction) {
+        this.lsTransaction = lsTransaction;
+    }
+
+	public Date getRecordedDate() {
+        return this.recordedDate;
+    }
+
+	public void setRecordedDate(Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public Date getModifiedDate() {
+        return this.modifiedDate;
+    }
+
+	public void setModifiedDate(Date modifiedDate) {
+        this.modifiedDate = modifiedDate;
+    }
+
+	public String getModifiedBy() {
+        return this.modifiedBy;
+    }
+
+	public void setModifiedBy(String modifiedBy) {
+        this.modifiedBy = modifiedBy;
+    }
+
+	public boolean isPublicData() {
+        return this.publicData;
+    }
+
+	public void setPublicData(boolean publicData) {
+        this.publicData = publicData;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static AnalysisGroupCsvDTO fromJsonToAnalysisGroupCsvDTO(String json) {
+        return new JSONDeserializer<AnalysisGroupCsvDTO>()
+        .use(null, AnalysisGroupCsvDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<AnalysisGroupCsvDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<AnalysisGroupCsvDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<AnalysisGroupCsvDTO> fromJsonArrayToAnalysisGroes(String json) {
+        return new JSONDeserializer<List<AnalysisGroupCsvDTO>>()
+        .use("values", AnalysisGroupCsvDTO.class).deserialize(json);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCsvDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCsvDTO_Roo_JavaBean.aj
deleted file mode 100644
index 525593845..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCsvDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,340 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AnalysisGroupCsvDTO;
-import java.math.BigDecimal;
-import java.util.Date;
-
-privileged aspect AnalysisGroupCsvDTO_Roo_JavaBean {
-    
-    public Long AnalysisGroupCsvDTO.getExperimentID() {
-        return this.experimentID;
-    }
-    
-    public void AnalysisGroupCsvDTO.setExperimentID(Long experimentID) {
-        this.experimentID = experimentID;
-    }
-    
-    public String AnalysisGroupCsvDTO.getExperimentCodeName() {
-        return this.experimentCodeName;
-    }
-    
-    public void AnalysisGroupCsvDTO.setExperimentCodeName(String experimentCodeName) {
-        this.experimentCodeName = experimentCodeName;
-    }
-    
-    public Integer AnalysisGroupCsvDTO.getExperimentVersion() {
-        return this.experimentVersion;
-    }
-    
-    public void AnalysisGroupCsvDTO.setExperimentVersion(Integer experimentVersion) {
-        this.experimentVersion = experimentVersion;
-    }
-    
-    public String AnalysisGroupCsvDTO.getAnalysisGroupID() {
-        return this.analysisGroupID;
-    }
-    
-    public void AnalysisGroupCsvDTO.setAnalysisGroupID(String analysisGroupID) {
-        this.analysisGroupID = analysisGroupID;
-    }
-    
-    public Long AnalysisGroupCsvDTO.getId() {
-        return this.id;
-    }
-    
-    public void AnalysisGroupCsvDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer AnalysisGroupCsvDTO.getVersion() {
-        return this.version;
-    }
-    
-    public void AnalysisGroupCsvDTO.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-    public String AnalysisGroupCsvDTO.getLsType() {
-        return this.lsType;
-    }
-    
-    public void AnalysisGroupCsvDTO.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String AnalysisGroupCsvDTO.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void AnalysisGroupCsvDTO.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String AnalysisGroupCsvDTO.getCodeName() {
-        return this.codeName;
-    }
-    
-    public void AnalysisGroupCsvDTO.setCodeName(String codeName) {
-        this.codeName = codeName;
-    }
-    
-    public Long AnalysisGroupCsvDTO.getStateID() {
-        return this.stateID;
-    }
-    
-    public void AnalysisGroupCsvDTO.setStateID(Long stateID) {
-        this.stateID = stateID;
-    }
-    
-    public String AnalysisGroupCsvDTO.getStateType() {
-        return this.stateType;
-    }
-    
-    public void AnalysisGroupCsvDTO.setStateType(String stateType) {
-        this.stateType = stateType;
-    }
-    
-    public String AnalysisGroupCsvDTO.getStateKind() {
-        return this.stateKind;
-    }
-    
-    public void AnalysisGroupCsvDTO.setStateKind(String stateKind) {
-        this.stateKind = stateKind;
-    }
-    
-    public Long AnalysisGroupCsvDTO.getValueId() {
-        return this.valueId;
-    }
-    
-    public void AnalysisGroupCsvDTO.setValueId(Long valueId) {
-        this.valueId = valueId;
-    }
-    
-    public String AnalysisGroupCsvDTO.getValueType() {
-        return this.valueType;
-    }
-    
-    public void AnalysisGroupCsvDTO.setValueType(String valueType) {
-        this.valueType = valueType;
-    }
-    
-    public String AnalysisGroupCsvDTO.getValueKind() {
-        return this.valueKind;
-    }
-    
-    public void AnalysisGroupCsvDTO.setValueKind(String valueKind) {
-        this.valueKind = valueKind;
-    }
-    
-    public String AnalysisGroupCsvDTO.getCodeOrigin() {
-        return this.codeOrigin;
-    }
-    
-    public void AnalysisGroupCsvDTO.setCodeOrigin(String codeOrigin) {
-        this.codeOrigin = codeOrigin;
-    }
-    
-    public String AnalysisGroupCsvDTO.getCodeType() {
-        return this.codeType;
-    }
-    
-    public void AnalysisGroupCsvDTO.setCodeType(String codeType) {
-        this.codeType = codeType;
-    }
-    
-    public String AnalysisGroupCsvDTO.getCodeKind() {
-        return this.codeKind;
-    }
-    
-    public void AnalysisGroupCsvDTO.setCodeKind(String codeKind) {
-        this.codeKind = codeKind;
-    }
-    
-    public String AnalysisGroupCsvDTO.getStringValue() {
-        return this.stringValue;
-    }
-    
-    public void AnalysisGroupCsvDTO.setStringValue(String stringValue) {
-        this.stringValue = stringValue;
-    }
-    
-    public String AnalysisGroupCsvDTO.getCodeValue() {
-        return this.codeValue;
-    }
-    
-    public void AnalysisGroupCsvDTO.setCodeValue(String codeValue) {
-        this.codeValue = codeValue;
-    }
-    
-    public String AnalysisGroupCsvDTO.getFileValue() {
-        return this.fileValue;
-    }
-    
-    public void AnalysisGroupCsvDTO.setFileValue(String fileValue) {
-        this.fileValue = fileValue;
-    }
-    
-    public String AnalysisGroupCsvDTO.getUrlValue() {
-        return this.urlValue;
-    }
-    
-    public void AnalysisGroupCsvDTO.setUrlValue(String urlValue) {
-        this.urlValue = urlValue;
-    }
-    
-    public Date AnalysisGroupCsvDTO.getDateValue() {
-        return this.dateValue;
-    }
-    
-    public void AnalysisGroupCsvDTO.setDateValue(Date dateValue) {
-        this.dateValue = dateValue;
-    }
-    
-    public String AnalysisGroupCsvDTO.getClobValue() {
-        return this.clobValue;
-    }
-    
-    public void AnalysisGroupCsvDTO.setClobValue(String clobValue) {
-        this.clobValue = clobValue;
-    }
-    
-    public String AnalysisGroupCsvDTO.getValueOperator() {
-        return this.valueOperator;
-    }
-    
-    public void AnalysisGroupCsvDTO.setValueOperator(String valueOperator) {
-        this.valueOperator = valueOperator;
-    }
-    
-    public BigDecimal AnalysisGroupCsvDTO.getNumericValue() {
-        return this.numericValue;
-    }
-    
-    public void AnalysisGroupCsvDTO.setNumericValue(BigDecimal numericValue) {
-        this.numericValue = numericValue;
-    }
-    
-    public Integer AnalysisGroupCsvDTO.getSigFigs() {
-        return this.sigFigs;
-    }
-    
-    public void AnalysisGroupCsvDTO.setSigFigs(Integer sigFigs) {
-        this.sigFigs = sigFigs;
-    }
-    
-    public BigDecimal AnalysisGroupCsvDTO.getUncertainty() {
-        return this.uncertainty;
-    }
-    
-    public void AnalysisGroupCsvDTO.setUncertainty(BigDecimal uncertainty) {
-        this.uncertainty = uncertainty;
-    }
-    
-    public Integer AnalysisGroupCsvDTO.getNumberOfReplicates() {
-        return this.numberOfReplicates;
-    }
-    
-    public void AnalysisGroupCsvDTO.setNumberOfReplicates(Integer numberOfReplicates) {
-        this.numberOfReplicates = numberOfReplicates;
-    }
-    
-    public String AnalysisGroupCsvDTO.getUncertaintyType() {
-        return this.uncertaintyType;
-    }
-    
-    public void AnalysisGroupCsvDTO.setUncertaintyType(String uncertaintyType) {
-        this.uncertaintyType = uncertaintyType;
-    }
-    
-    public String AnalysisGroupCsvDTO.getValueUnit() {
-        return this.valueUnit;
-    }
-    
-    public void AnalysisGroupCsvDTO.setValueUnit(String valueUnit) {
-        this.valueUnit = valueUnit;
-    }
-    
-    public Double AnalysisGroupCsvDTO.getConcentration() {
-        return this.concentration;
-    }
-    
-    public void AnalysisGroupCsvDTO.setConcentration(Double concentration) {
-        this.concentration = concentration;
-    }
-    
-    public String AnalysisGroupCsvDTO.getConcUnit() {
-        return this.concUnit;
-    }
-    
-    public void AnalysisGroupCsvDTO.setConcUnit(String concUnit) {
-        this.concUnit = concUnit;
-    }
-    
-    public String AnalysisGroupCsvDTO.getComments() {
-        return this.comments;
-    }
-    
-    public void AnalysisGroupCsvDTO.setComments(String comments) {
-        this.comments = comments;
-    }
-    
-    public boolean AnalysisGroupCsvDTO.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void AnalysisGroupCsvDTO.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public Long AnalysisGroupCsvDTO.getLsTransaction() {
-        return this.lsTransaction;
-    }
-    
-    public void AnalysisGroupCsvDTO.setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
-    
-    public Date AnalysisGroupCsvDTO.getRecordedDate() {
-        return this.recordedDate;
-    }
-    
-    public void AnalysisGroupCsvDTO.setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
-    
-    public String AnalysisGroupCsvDTO.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void AnalysisGroupCsvDTO.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public Date AnalysisGroupCsvDTO.getModifiedDate() {
-        return this.modifiedDate;
-    }
-    
-    public void AnalysisGroupCsvDTO.setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
-    
-    public String AnalysisGroupCsvDTO.getModifiedBy() {
-        return this.modifiedBy;
-    }
-    
-    public void AnalysisGroupCsvDTO.setModifiedBy(String modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
-    
-    public boolean AnalysisGroupCsvDTO.isPublicData() {
-        return this.publicData;
-    }
-    
-    public void AnalysisGroupCsvDTO.setPublicData(boolean publicData) {
-        this.publicData = publicData;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCsvDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCsvDTO_Roo_Json.aj
deleted file mode 100644
index e79b03a69..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCsvDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AnalysisGroupCsvDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect AnalysisGroupCsvDTO_Roo_Json {
-    
-    public String AnalysisGroupCsvDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String AnalysisGroupCsvDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static AnalysisGroupCsvDTO AnalysisGroupCsvDTO.fromJsonToAnalysisGroupCsvDTO(String json) {
-        return new JSONDeserializer<AnalysisGroupCsvDTO>()
-        .use(null, AnalysisGroupCsvDTO.class).deserialize(json);
-    }
-    
-    public static String AnalysisGroupCsvDTO.toJsonArray(Collection<AnalysisGroupCsvDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String AnalysisGroupCsvDTO.toJsonArray(Collection<AnalysisGroupCsvDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<AnalysisGroupCsvDTO> AnalysisGroupCsvDTO.fromJsonArrayToAnalysisGroes(String json) {
-        return new JSONDeserializer<List<AnalysisGroupCsvDTO>>()
-        .use("values", AnalysisGroupCsvDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCsvDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCsvDTO_Roo_ToString.aj
deleted file mode 100644
index 904cbdf07..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCsvDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AnalysisGroupCsvDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AnalysisGroupCsvDTO_Roo_ToString {
-    
-    public String AnalysisGroupCsvDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupStatePathDTO.java b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupStatePathDTO.java
index bffb97078..19ee88290 100644
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupStatePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupStatePathDTO.java
@@ -1,14 +1,16 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.AnalysisGroupState;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -34,6 +36,52 @@ public String toJson() {
 	public static String toJsonArray(Collection<AnalysisGroupStatePathDTO> collection) {
         return new JSONSerializer().include("states.lsValues").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
     }
+
+	public static AnalysisGroupStatePathDTO fromJsonToAnalysisGroupStatePathDTO(String json) {
+        return new JSONDeserializer<AnalysisGroupStatePathDTO>()
+        .use(null, AnalysisGroupStatePathDTO.class).deserialize(json);
+    }
+
+	public static Collection<AnalysisGroupStatePathDTO> fromJsonArrayToAnalysisGroes(String json) {
+        return new JSONDeserializer<List<AnalysisGroupStatePathDTO>>()
+        .use("values", AnalysisGroupStatePathDTO.class).deserialize(json);
+    }
+
+	public String getIdOrCodeName() {
+        return this.idOrCodeName;
+    }
+
+	public void setIdOrCodeName(String idOrCodeName) {
+        this.idOrCodeName = idOrCodeName;
+    }
+
+	public String getStateType() {
+        return this.stateType;
+    }
+
+	public void setStateType(String stateType) {
+        this.stateType = stateType;
+    }
+
+	public String getStateKind() {
+        return this.stateKind;
+    }
+
+	public void setStateKind(String stateKind) {
+        this.stateKind = stateKind;
+    }
+
+	public Collection<AnalysisGroupState> getStates() {
+        return this.states;
+    }
+
+	public void setStates(Collection<AnalysisGroupState> states) {
+        this.states = states;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupStatePathDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupStatePathDTO_Roo_JavaBean.aj
deleted file mode 100644
index 087c8738a..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupStatePathDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,44 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import com.labsynch.labseer.dto.AnalysisGroupStatePathDTO;
-import java.util.Collection;
-
-privileged aspect AnalysisGroupStatePathDTO_Roo_JavaBean {
-    
-    public String AnalysisGroupStatePathDTO.getIdOrCodeName() {
-        return this.idOrCodeName;
-    }
-    
-    public void AnalysisGroupStatePathDTO.setIdOrCodeName(String idOrCodeName) {
-        this.idOrCodeName = idOrCodeName;
-    }
-    
-    public String AnalysisGroupStatePathDTO.getStateType() {
-        return this.stateType;
-    }
-    
-    public void AnalysisGroupStatePathDTO.setStateType(String stateType) {
-        this.stateType = stateType;
-    }
-    
-    public String AnalysisGroupStatePathDTO.getStateKind() {
-        return this.stateKind;
-    }
-    
-    public void AnalysisGroupStatePathDTO.setStateKind(String stateKind) {
-        this.stateKind = stateKind;
-    }
-    
-    public Collection<AnalysisGroupState> AnalysisGroupStatePathDTO.getStates() {
-        return this.states;
-    }
-    
-    public void AnalysisGroupStatePathDTO.setStates(Collection<AnalysisGroupState> states) {
-        this.states = states;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupStatePathDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupStatePathDTO_Roo_Json.aj
deleted file mode 100644
index 441e0f816..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupStatePathDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AnalysisGroupStatePathDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect AnalysisGroupStatePathDTO_Roo_Json {
-    
-    public static AnalysisGroupStatePathDTO AnalysisGroupStatePathDTO.fromJsonToAnalysisGroupStatePathDTO(String json) {
-        return new JSONDeserializer<AnalysisGroupStatePathDTO>()
-        .use(null, AnalysisGroupStatePathDTO.class).deserialize(json);
-    }
-    
-    public static Collection<AnalysisGroupStatePathDTO> AnalysisGroupStatePathDTO.fromJsonArrayToAnalysisGroes(String json) {
-        return new JSONDeserializer<List<AnalysisGroupStatePathDTO>>()
-        .use("values", AnalysisGroupStatePathDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupStatePathDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupStatePathDTO_Roo_ToString.aj
deleted file mode 100644
index 2ab6f0d33..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupStatePathDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AnalysisGroupStatePathDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AnalysisGroupStatePathDTO_Roo_ToString {
-    
-    public String AnalysisGroupStatePathDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueBaseDTO.java b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueBaseDTO.java
index c9bf4d4ea..0155653a8 100755
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueBaseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueBaseDTO.java
@@ -1,8 +1,13 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 import java.math.BigDecimal;
+import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.roo.addon.javabean.RooJavaBean;
@@ -99,6 +104,232 @@ public AnalysisGroupValueBaseDTO(
 	private Long lsTransaction;
 	private boolean publicData;
 	
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static AnalysisGroupValueBaseDTO fromJsonToAnalysisGroupValueBaseDTO(String json) {
+        return new JSONDeserializer<AnalysisGroupValueBaseDTO>()
+        .use(null, AnalysisGroupValueBaseDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<AnalysisGroupValueBaseDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<AnalysisGroupValueBaseDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<AnalysisGroupValueBaseDTO> fromJsonArrayToAnalysisGroes(String json) {
+        return new JSONDeserializer<List<AnalysisGroupValueBaseDTO>>()
+        .use("values", AnalysisGroupValueBaseDTO.class).deserialize(json);
+    }
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Long getStateId() {
+        return this.stateId;
+    }
+
+	public void setStateId(Long stateId) {
+        this.stateId = stateId;
+    }
+
+	public String getAgCodeName() {
+        return this.agCodeName;
+    }
+
+	public void setAgCodeName(String agCodeName) {
+        this.agCodeName = agCodeName;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getStringValue() {
+        return this.stringValue;
+    }
+
+	public void setStringValue(String stringValue) {
+        this.stringValue = stringValue;
+    }
+
+	public String getCodeValue() {
+        return this.codeValue;
+    }
+
+	public void setCodeValue(String codeValue) {
+        this.codeValue = codeValue;
+    }
+
+	public String getFileValue() {
+        return this.fileValue;
+    }
+
+	public void setFileValue(String fileValue) {
+        this.fileValue = fileValue;
+    }
+
+	public String getUrlValue() {
+        return this.urlValue;
+    }
+
+	public void setUrlValue(String urlValue) {
+        this.urlValue = urlValue;
+    }
+
+	public Date getDateValue() {
+        return this.dateValue;
+    }
+
+	public void setDateValue(Date dateValue) {
+        this.dateValue = dateValue;
+    }
+
+	public String getClobValue() {
+        return this.clobValue;
+    }
+
+	public void setClobValue(String clobValue) {
+        this.clobValue = clobValue;
+    }
+
+	public String getOperatorType() {
+        return this.operatorType;
+    }
+
+	public void setOperatorType(String operatorType) {
+        this.operatorType = operatorType;
+    }
+
+	public String getOperatorKind() {
+        return this.operatorKind;
+    }
+
+	public void setOperatorKind(String operatorKind) {
+        this.operatorKind = operatorKind;
+    }
+
+	public BigDecimal getNumericValue() {
+        return this.numericValue;
+    }
+
+	public void setNumericValue(BigDecimal numericValue) {
+        this.numericValue = numericValue;
+    }
+
+	public Integer getSigFigs() {
+        return this.sigFigs;
+    }
+
+	public void setSigFigs(Integer sigFigs) {
+        this.sigFigs = sigFigs;
+    }
+
+	public BigDecimal getUncertainty() {
+        return this.uncertainty;
+    }
+
+	public void setUncertainty(BigDecimal uncertainty) {
+        this.uncertainty = uncertainty;
+    }
+
+	public Integer getNumberOfReplicates() {
+        return this.numberOfReplicates;
+    }
+
+	public void setNumberOfReplicates(Integer numberOfReplicates) {
+        this.numberOfReplicates = numberOfReplicates;
+    }
+
+	public String getUncertaintyType() {
+        return this.uncertaintyType;
+    }
+
+	public void setUncertaintyType(String uncertaintyType) {
+        this.uncertaintyType = uncertaintyType;
+    }
+
+	public String getUnitType() {
+        return this.unitType;
+    }
+
+	public void setUnitType(String unitType) {
+        this.unitType = unitType;
+    }
+
+	public String getUnitKind() {
+        return this.unitKind;
+    }
+
+	public void setUnitKind(String unitKind) {
+        this.unitKind = unitKind;
+    }
+
+	public String getComments() {
+        return this.comments;
+    }
+
+	public void setComments(String comments) {
+        this.comments = comments;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public Long getLsTransaction() {
+        return this.lsTransaction;
+    }
+
+	public void setLsTransaction(Long lsTransaction) {
+        this.lsTransaction = lsTransaction;
+    }
+
+	public boolean isPublicData() {
+        return this.publicData;
+    }
+
+	public void setPublicData(boolean publicData) {
+        this.publicData = publicData;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueBaseDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueBaseDTO_Roo_JavaBean.aj
deleted file mode 100755
index 2006eae18..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueBaseDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,204 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AnalysisGroupValueBaseDTO;
-import java.math.BigDecimal;
-import java.util.Date;
-
-privileged aspect AnalysisGroupValueBaseDTO_Roo_JavaBean {
-    
-    public Long AnalysisGroupValueBaseDTO.getId() {
-        return this.id;
-    }
-    
-    public void AnalysisGroupValueBaseDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Long AnalysisGroupValueBaseDTO.getStateId() {
-        return this.stateId;
-    }
-    
-    public void AnalysisGroupValueBaseDTO.setStateId(Long stateId) {
-        this.stateId = stateId;
-    }
-    
-    public String AnalysisGroupValueBaseDTO.getAgCodeName() {
-        return this.agCodeName;
-    }
-    
-    public void AnalysisGroupValueBaseDTO.setAgCodeName(String agCodeName) {
-        this.agCodeName = agCodeName;
-    }
-    
-    public String AnalysisGroupValueBaseDTO.getLsType() {
-        return this.lsType;
-    }
-    
-    public void AnalysisGroupValueBaseDTO.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String AnalysisGroupValueBaseDTO.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void AnalysisGroupValueBaseDTO.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String AnalysisGroupValueBaseDTO.getStringValue() {
-        return this.stringValue;
-    }
-    
-    public void AnalysisGroupValueBaseDTO.setStringValue(String stringValue) {
-        this.stringValue = stringValue;
-    }
-    
-    public String AnalysisGroupValueBaseDTO.getCodeValue() {
-        return this.codeValue;
-    }
-    
-    public void AnalysisGroupValueBaseDTO.setCodeValue(String codeValue) {
-        this.codeValue = codeValue;
-    }
-    
-    public String AnalysisGroupValueBaseDTO.getFileValue() {
-        return this.fileValue;
-    }
-    
-    public void AnalysisGroupValueBaseDTO.setFileValue(String fileValue) {
-        this.fileValue = fileValue;
-    }
-    
-    public String AnalysisGroupValueBaseDTO.getUrlValue() {
-        return this.urlValue;
-    }
-    
-    public void AnalysisGroupValueBaseDTO.setUrlValue(String urlValue) {
-        this.urlValue = urlValue;
-    }
-    
-    public Date AnalysisGroupValueBaseDTO.getDateValue() {
-        return this.dateValue;
-    }
-    
-    public void AnalysisGroupValueBaseDTO.setDateValue(Date dateValue) {
-        this.dateValue = dateValue;
-    }
-    
-    public String AnalysisGroupValueBaseDTO.getClobValue() {
-        return this.clobValue;
-    }
-    
-    public void AnalysisGroupValueBaseDTO.setClobValue(String clobValue) {
-        this.clobValue = clobValue;
-    }
-    
-    public String AnalysisGroupValueBaseDTO.getOperatorType() {
-        return this.operatorType;
-    }
-    
-    public void AnalysisGroupValueBaseDTO.setOperatorType(String operatorType) {
-        this.operatorType = operatorType;
-    }
-    
-    public String AnalysisGroupValueBaseDTO.getOperatorKind() {
-        return this.operatorKind;
-    }
-    
-    public void AnalysisGroupValueBaseDTO.setOperatorKind(String operatorKind) {
-        this.operatorKind = operatorKind;
-    }
-    
-    public BigDecimal AnalysisGroupValueBaseDTO.getNumericValue() {
-        return this.numericValue;
-    }
-    
-    public void AnalysisGroupValueBaseDTO.setNumericValue(BigDecimal numericValue) {
-        this.numericValue = numericValue;
-    }
-    
-    public Integer AnalysisGroupValueBaseDTO.getSigFigs() {
-        return this.sigFigs;
-    }
-    
-    public void AnalysisGroupValueBaseDTO.setSigFigs(Integer sigFigs) {
-        this.sigFigs = sigFigs;
-    }
-    
-    public BigDecimal AnalysisGroupValueBaseDTO.getUncertainty() {
-        return this.uncertainty;
-    }
-    
-    public void AnalysisGroupValueBaseDTO.setUncertainty(BigDecimal uncertainty) {
-        this.uncertainty = uncertainty;
-    }
-    
-    public Integer AnalysisGroupValueBaseDTO.getNumberOfReplicates() {
-        return this.numberOfReplicates;
-    }
-    
-    public void AnalysisGroupValueBaseDTO.setNumberOfReplicates(Integer numberOfReplicates) {
-        this.numberOfReplicates = numberOfReplicates;
-    }
-    
-    public String AnalysisGroupValueBaseDTO.getUncertaintyType() {
-        return this.uncertaintyType;
-    }
-    
-    public void AnalysisGroupValueBaseDTO.setUncertaintyType(String uncertaintyType) {
-        this.uncertaintyType = uncertaintyType;
-    }
-    
-    public String AnalysisGroupValueBaseDTO.getUnitType() {
-        return this.unitType;
-    }
-    
-    public void AnalysisGroupValueBaseDTO.setUnitType(String unitType) {
-        this.unitType = unitType;
-    }
-    
-    public String AnalysisGroupValueBaseDTO.getUnitKind() {
-        return this.unitKind;
-    }
-    
-    public void AnalysisGroupValueBaseDTO.setUnitKind(String unitKind) {
-        this.unitKind = unitKind;
-    }
-    
-    public String AnalysisGroupValueBaseDTO.getComments() {
-        return this.comments;
-    }
-    
-    public void AnalysisGroupValueBaseDTO.setComments(String comments) {
-        this.comments = comments;
-    }
-    
-    public boolean AnalysisGroupValueBaseDTO.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void AnalysisGroupValueBaseDTO.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public Long AnalysisGroupValueBaseDTO.getLsTransaction() {
-        return this.lsTransaction;
-    }
-    
-    public void AnalysisGroupValueBaseDTO.setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
-    
-    public boolean AnalysisGroupValueBaseDTO.isPublicData() {
-        return this.publicData;
-    }
-    
-    public void AnalysisGroupValueBaseDTO.setPublicData(boolean publicData) {
-        this.publicData = publicData;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueBaseDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueBaseDTO_Roo_Json.aj
deleted file mode 100755
index aee2a8ced..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueBaseDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AnalysisGroupValueBaseDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect AnalysisGroupValueBaseDTO_Roo_Json {
-    
-    public String AnalysisGroupValueBaseDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String AnalysisGroupValueBaseDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static AnalysisGroupValueBaseDTO AnalysisGroupValueBaseDTO.fromJsonToAnalysisGroupValueBaseDTO(String json) {
-        return new JSONDeserializer<AnalysisGroupValueBaseDTO>()
-        .use(null, AnalysisGroupValueBaseDTO.class).deserialize(json);
-    }
-    
-    public static String AnalysisGroupValueBaseDTO.toJsonArray(Collection<AnalysisGroupValueBaseDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String AnalysisGroupValueBaseDTO.toJsonArray(Collection<AnalysisGroupValueBaseDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<AnalysisGroupValueBaseDTO> AnalysisGroupValueBaseDTO.fromJsonArrayToAnalysisGroes(String json) {
-        return new JSONDeserializer<List<AnalysisGroupValueBaseDTO>>()
-        .use("values", AnalysisGroupValueBaseDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueBaseDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueBaseDTO_Roo_ToString.aj
deleted file mode 100755
index 9c58d7596..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueBaseDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AnalysisGroupValueBaseDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AnalysisGroupValueBaseDTO_Roo_ToString {
-    
-    public String AnalysisGroupValueBaseDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueDTO.java b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueDTO.java
index 2ede5aaae..6745b2522 100755
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueDTO.java
@@ -6,7 +6,8 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Date;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.roo.addon.javabean.RooJavaBean;
@@ -295,5 +296,177 @@ public static String toPrettyJsonArray(Collection<AnalysisGroupValueDTO> collect
 	public static Collection<AnalysisGroupValueDTO> fromJsonArrayToAnalysisGroes(String json) {
 		return new JSONDeserializer<List<AnalysisGroupValueDTO>>().use(null, ArrayList.class).use("values", AnalysisGroupValueDTO.class).deserialize(json);
 	}
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Long getProtocolId() {
+        return this.protocolId;
+    }
+
+	public void setProtocolId(Long protocolId) {
+        this.protocolId = protocolId;
+    }
+
+	public String getProtocolName() {
+        return this.protocolName;
+    }
+
+	public void setProtocolName(String protocolName) {
+        this.protocolName = protocolName;
+    }
+
+	public Long getExperimentId() {
+        return this.experimentId;
+    }
+
+	public void setExperimentId(Long experimentId) {
+        this.experimentId = experimentId;
+    }
+
+	public String getExperimentCodeName() {
+        return this.experimentCodeName;
+    }
+
+	public void setExperimentCodeName(String experimentCodeName) {
+        this.experimentCodeName = experimentCodeName;
+    }
+
+	public String getExperimentName() {
+        return this.experimentName;
+    }
+
+	public void setExperimentName(String experimentName) {
+        this.experimentName = experimentName;
+    }
+
+	public Long getAgId() {
+        return this.agId;
+    }
+
+	public void setAgId(Long agId) {
+        this.agId = agId;
+    }
+
+	public Long getAgStateId() {
+        return this.agStateId;
+    }
+
+	public void setAgStateId(Long agStateId) {
+        this.agStateId = agStateId;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getTestedLot() {
+        return this.testedLot;
+    }
+
+	public void setTestedLot(String testedLot) {
+        this.testedLot = testedLot;
+    }
+
+	public String getGeneId() {
+        return this.geneId;
+    }
+
+	public void setGeneId(String geneId) {
+        this.geneId = geneId;
+    }
+
+	public String getResult() {
+        return this.result;
+    }
+
+	public void setResult(String result) {
+        this.result = result;
+    }
+
+	public String getResultUnit() {
+        return this.resultUnit;
+    }
+
+	public void setResultUnit(String resultUnit) {
+        this.resultUnit = resultUnit;
+    }
+
+	public String getOperator() {
+        return this.operator;
+    }
+
+	public void setOperator(String operator) {
+        this.operator = operator;
+    }
+
+	public String getTestedConcentration() {
+        return this.testedConcentration;
+    }
+
+	public void setTestedConcentration(String testedConcentration) {
+        this.testedConcentration = testedConcentration;
+    }
+
+	public String getTestedConcentrationUnit() {
+        return this.testedConcentrationUnit;
+    }
+
+	public void setTestedConcentrationUnit(String testedConcentrationUnit) {
+        this.testedConcentrationUnit = testedConcentrationUnit;
+    }
+
+	public String getUncertainty() {
+        return this.uncertainty;
+    }
+
+	public void setUncertainty(String uncertainty) {
+        this.uncertainty = uncertainty;
+    }
+
+	public String getUncertaintyUnit() {
+        return this.uncertaintyUnit;
+    }
+
+	public void setUncertaintyUnit(String uncertaintyUnit) {
+        this.uncertaintyUnit = uncertaintyUnit;
+    }
+
+	public String getTestedTime() {
+        return this.testedTime;
+    }
+
+	public void setTestedTime(String testedTime) {
+        this.testedTime = testedTime;
+    }
+
+	public String getTestedTimeUnit() {
+        return this.testedTimeUnit;
+    }
+
+	public void setTestedTimeUnit(String testedTimeUnit) {
+        this.testedTimeUnit = testedTimeUnit;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueDTO_Roo_JavaBean.aj
deleted file mode 100755
index 8f2cc9f66..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,178 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AnalysisGroupValueDTO;
-
-privileged aspect AnalysisGroupValueDTO_Roo_JavaBean {
-    
-    public Long AnalysisGroupValueDTO.getId() {
-        return this.id;
-    }
-    
-    public void AnalysisGroupValueDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Long AnalysisGroupValueDTO.getProtocolId() {
-        return this.protocolId;
-    }
-    
-    public void AnalysisGroupValueDTO.setProtocolId(Long protocolId) {
-        this.protocolId = protocolId;
-    }
-    
-    public String AnalysisGroupValueDTO.getProtocolName() {
-        return this.protocolName;
-    }
-    
-    public void AnalysisGroupValueDTO.setProtocolName(String protocolName) {
-        this.protocolName = protocolName;
-    }
-    
-    public Long AnalysisGroupValueDTO.getExperimentId() {
-        return this.experimentId;
-    }
-    
-    public void AnalysisGroupValueDTO.setExperimentId(Long experimentId) {
-        this.experimentId = experimentId;
-    }
-    
-    public String AnalysisGroupValueDTO.getExperimentCodeName() {
-        return this.experimentCodeName;
-    }
-    
-    public void AnalysisGroupValueDTO.setExperimentCodeName(String experimentCodeName) {
-        this.experimentCodeName = experimentCodeName;
-    }
-    
-    public String AnalysisGroupValueDTO.getExperimentName() {
-        return this.experimentName;
-    }
-    
-    public void AnalysisGroupValueDTO.setExperimentName(String experimentName) {
-        this.experimentName = experimentName;
-    }
-    
-    public Long AnalysisGroupValueDTO.getAgId() {
-        return this.agId;
-    }
-    
-    public void AnalysisGroupValueDTO.setAgId(Long agId) {
-        this.agId = agId;
-    }
-    
-    public Long AnalysisGroupValueDTO.getAgStateId() {
-        return this.agStateId;
-    }
-    
-    public void AnalysisGroupValueDTO.setAgStateId(Long agStateId) {
-        this.agStateId = agStateId;
-    }
-    
-    public String AnalysisGroupValueDTO.getLsType() {
-        return this.lsType;
-    }
-    
-    public void AnalysisGroupValueDTO.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String AnalysisGroupValueDTO.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void AnalysisGroupValueDTO.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String AnalysisGroupValueDTO.getTestedLot() {
-        return this.testedLot;
-    }
-    
-    public void AnalysisGroupValueDTO.setTestedLot(String testedLot) {
-        this.testedLot = testedLot;
-    }
-    
-    public String AnalysisGroupValueDTO.getGeneId() {
-        return this.geneId;
-    }
-    
-    public void AnalysisGroupValueDTO.setGeneId(String geneId) {
-        this.geneId = geneId;
-    }
-    
-    public String AnalysisGroupValueDTO.getResult() {
-        return this.result;
-    }
-    
-    public void AnalysisGroupValueDTO.setResult(String result) {
-        this.result = result;
-    }
-    
-    public String AnalysisGroupValueDTO.getResultUnit() {
-        return this.resultUnit;
-    }
-    
-    public void AnalysisGroupValueDTO.setResultUnit(String resultUnit) {
-        this.resultUnit = resultUnit;
-    }
-    
-    public String AnalysisGroupValueDTO.getOperator() {
-        return this.operator;
-    }
-    
-    public void AnalysisGroupValueDTO.setOperator(String operator) {
-        this.operator = operator;
-    }
-    
-    public String AnalysisGroupValueDTO.getTestedConcentration() {
-        return this.testedConcentration;
-    }
-    
-    public void AnalysisGroupValueDTO.setTestedConcentration(String testedConcentration) {
-        this.testedConcentration = testedConcentration;
-    }
-    
-    public String AnalysisGroupValueDTO.getTestedConcentrationUnit() {
-        return this.testedConcentrationUnit;
-    }
-    
-    public void AnalysisGroupValueDTO.setTestedConcentrationUnit(String testedConcentrationUnit) {
-        this.testedConcentrationUnit = testedConcentrationUnit;
-    }
-    
-    public String AnalysisGroupValueDTO.getUncertainty() {
-        return this.uncertainty;
-    }
-    
-    public void AnalysisGroupValueDTO.setUncertainty(String uncertainty) {
-        this.uncertainty = uncertainty;
-    }
-    
-    public String AnalysisGroupValueDTO.getUncertaintyUnit() {
-        return this.uncertaintyUnit;
-    }
-    
-    public void AnalysisGroupValueDTO.setUncertaintyUnit(String uncertaintyUnit) {
-        this.uncertaintyUnit = uncertaintyUnit;
-    }
-    
-    public String AnalysisGroupValueDTO.getTestedTime() {
-        return this.testedTime;
-    }
-    
-    public void AnalysisGroupValueDTO.setTestedTime(String testedTime) {
-        this.testedTime = testedTime;
-    }
-    
-    public String AnalysisGroupValueDTO.getTestedTimeUnit() {
-        return this.testedTimeUnit;
-    }
-    
-    public void AnalysisGroupValueDTO.setTestedTimeUnit(String testedTimeUnit) {
-        this.testedTimeUnit = testedTimeUnit;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueDTO_Roo_ToString.aj
deleted file mode 100755
index 35e9062a8..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AnalysisGroupValueDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AnalysisGroupValueDTO_Roo_ToString {
-    
-    public String AnalysisGroupValueDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValuePathDTO.java
index 42ec1b714..2cde5a211 100644
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValuePathDTO.java
@@ -1,14 +1,16 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.AnalysisGroupValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -38,6 +40,68 @@ public String toJson() {
 	public static String toJsonArray(Collection<AnalysisGroupValuePathDTO> collection) {
         return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
     }
+
+	public String getIdOrCodeName() {
+        return this.idOrCodeName;
+    }
+
+	public void setIdOrCodeName(String idOrCodeName) {
+        this.idOrCodeName = idOrCodeName;
+    }
+
+	public String getStateType() {
+        return this.stateType;
+    }
+
+	public void setStateType(String stateType) {
+        this.stateType = stateType;
+    }
+
+	public String getStateKind() {
+        return this.stateKind;
+    }
+
+	public void setStateKind(String stateKind) {
+        this.stateKind = stateKind;
+    }
+
+	public String getValueType() {
+        return this.valueType;
+    }
+
+	public void setValueType(String valueType) {
+        this.valueType = valueType;
+    }
+
+	public String getValueKind() {
+        return this.valueKind;
+    }
+
+	public void setValueKind(String valueKind) {
+        this.valueKind = valueKind;
+    }
+
+	public Collection<AnalysisGroupValue> getValues() {
+        return this.values;
+    }
+
+	public void setValues(Collection<AnalysisGroupValue> values) {
+        this.values = values;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static AnalysisGroupValuePathDTO fromJsonToAnalysisGroupValuePathDTO(String json) {
+        return new JSONDeserializer<AnalysisGroupValuePathDTO>()
+        .use(null, AnalysisGroupValuePathDTO.class).deserialize(json);
+    }
+
+	public static Collection<AnalysisGroupValuePathDTO> fromJsonArrayToAnalysisGroes(String json) {
+        return new JSONDeserializer<List<AnalysisGroupValuePathDTO>>()
+        .use("values", AnalysisGroupValuePathDTO.class).deserialize(json);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValuePathDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValuePathDTO_Roo_JavaBean.aj
deleted file mode 100644
index 8768116b8..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValuePathDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,60 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.dto.AnalysisGroupValuePathDTO;
-import java.util.Collection;
-
-privileged aspect AnalysisGroupValuePathDTO_Roo_JavaBean {
-    
-    public String AnalysisGroupValuePathDTO.getIdOrCodeName() {
-        return this.idOrCodeName;
-    }
-    
-    public void AnalysisGroupValuePathDTO.setIdOrCodeName(String idOrCodeName) {
-        this.idOrCodeName = idOrCodeName;
-    }
-    
-    public String AnalysisGroupValuePathDTO.getStateType() {
-        return this.stateType;
-    }
-    
-    public void AnalysisGroupValuePathDTO.setStateType(String stateType) {
-        this.stateType = stateType;
-    }
-    
-    public String AnalysisGroupValuePathDTO.getStateKind() {
-        return this.stateKind;
-    }
-    
-    public void AnalysisGroupValuePathDTO.setStateKind(String stateKind) {
-        this.stateKind = stateKind;
-    }
-    
-    public String AnalysisGroupValuePathDTO.getValueType() {
-        return this.valueType;
-    }
-    
-    public void AnalysisGroupValuePathDTO.setValueType(String valueType) {
-        this.valueType = valueType;
-    }
-    
-    public String AnalysisGroupValuePathDTO.getValueKind() {
-        return this.valueKind;
-    }
-    
-    public void AnalysisGroupValuePathDTO.setValueKind(String valueKind) {
-        this.valueKind = valueKind;
-    }
-    
-    public Collection<AnalysisGroupValue> AnalysisGroupValuePathDTO.getValues() {
-        return this.values;
-    }
-    
-    public void AnalysisGroupValuePathDTO.setValues(Collection<AnalysisGroupValue> values) {
-        this.values = values;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValuePathDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValuePathDTO_Roo_Json.aj
deleted file mode 100644
index b74000843..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValuePathDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AnalysisGroupValuePathDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect AnalysisGroupValuePathDTO_Roo_Json {
-    
-    public static AnalysisGroupValuePathDTO AnalysisGroupValuePathDTO.fromJsonToAnalysisGroupValuePathDTO(String json) {
-        return new JSONDeserializer<AnalysisGroupValuePathDTO>()
-        .use(null, AnalysisGroupValuePathDTO.class).deserialize(json);
-    }
-    
-    public static Collection<AnalysisGroupValuePathDTO> AnalysisGroupValuePathDTO.fromJsonArrayToAnalysisGroes(String json) {
-        return new JSONDeserializer<List<AnalysisGroupValuePathDTO>>()
-        .use("values", AnalysisGroupValuePathDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValuePathDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValuePathDTO_Roo_ToString.aj
deleted file mode 100644
index 3a390d1f4..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValuePathDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AnalysisGroupValuePathDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AnalysisGroupValuePathDTO_Roo_ToString {
-    
-    public String AnalysisGroupValuePathDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthGroupsAndProjectsDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthGroupsAndProjectsDTO.java
index 4f21175ac..4a4a6968a 100644
--- a/src/main/java/com/labsynch/labseer/dto/AuthGroupsAndProjectsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthGroupsAndProjectsDTO.java
@@ -3,7 +3,8 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -47,6 +48,36 @@ public static String toJsonArray(Collection<AuthGroupsAndProjectsDTO> collection
 	public static Collection<AuthGroupsAndProjectsDTO> fromJsonArrayToAuthProes(String json) {
         return new JSONDeserializer<List<AuthGroupsAndProjectsDTO>>().use(null, ArrayList.class).use("values", AuthGroupsAndProjectsDTO.class).deserialize(json);
     }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static AuthGroupsAndProjectsDTO fromJsonToAuthGroupsAndProjectsDTO(String json) {
+        return new JSONDeserializer<AuthGroupsAndProjectsDTO>()
+        .use(null, AuthGroupsAndProjectsDTO.class).deserialize(json);
+    }
+
+	public static Collection<AuthGroupsAndProjectsDTO> fromJsonArrayToAuthGroupsAndProes(String json) {
+        return new JSONDeserializer<List<AuthGroupsAndProjectsDTO>>()
+        .use("values", AuthGroupsAndProjectsDTO.class).deserialize(json);
+    }
+
+	public Collection<AuthGroupsDTO> getGroups() {
+        return this.groups;
+    }
+
+	public void setGroups(Collection<AuthGroupsDTO> groups) {
+        this.groups = groups;
+    }
+
+	public Collection<AuthProjectGroupsDTO> getProjects() {
+        return this.projects;
+    }
+
+	public void setProjects(Collection<AuthProjectGroupsDTO> projects) {
+        this.projects = projects;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthGroupsAndProjectsDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/AuthGroupsAndProjectsDTO_Roo_JavaBean.aj
deleted file mode 100644
index 345db92d9..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AuthGroupsAndProjectsDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,29 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AuthGroupsAndProjectsDTO;
-import com.labsynch.labseer.dto.AuthGroupsDTO;
-import com.labsynch.labseer.dto.AuthProjectGroupsDTO;
-import java.util.Collection;
-
-privileged aspect AuthGroupsAndProjectsDTO_Roo_JavaBean {
-    
-    public Collection<AuthGroupsDTO> AuthGroupsAndProjectsDTO.getGroups() {
-        return this.groups;
-    }
-    
-    public void AuthGroupsAndProjectsDTO.setGroups(Collection<AuthGroupsDTO> groups) {
-        this.groups = groups;
-    }
-    
-    public Collection<AuthProjectGroupsDTO> AuthGroupsAndProjectsDTO.getProjects() {
-        return this.projects;
-    }
-    
-    public void AuthGroupsAndProjectsDTO.setProjects(Collection<AuthProjectGroupsDTO> projects) {
-        this.projects = projects;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthGroupsAndProjectsDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/AuthGroupsAndProjectsDTO_Roo_Json.aj
deleted file mode 100644
index 606244849..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AuthGroupsAndProjectsDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AuthGroupsAndProjectsDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect AuthGroupsAndProjectsDTO_Roo_Json {
-    
-    public static AuthGroupsAndProjectsDTO AuthGroupsAndProjectsDTO.fromJsonToAuthGroupsAndProjectsDTO(String json) {
-        return new JSONDeserializer<AuthGroupsAndProjectsDTO>()
-        .use(null, AuthGroupsAndProjectsDTO.class).deserialize(json);
-    }
-    
-    public static Collection<AuthGroupsAndProjectsDTO> AuthGroupsAndProjectsDTO.fromJsonArrayToAuthGroupsAndProes(String json) {
-        return new JSONDeserializer<List<AuthGroupsAndProjectsDTO>>()
-        .use("values", AuthGroupsAndProjectsDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthGroupsAndProjectsDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/AuthGroupsAndProjectsDTO_Roo_ToString.aj
deleted file mode 100644
index 04f809091..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AuthGroupsAndProjectsDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AuthGroupsAndProjectsDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AuthGroupsAndProjectsDTO_Roo_ToString {
-    
-    public String AuthGroupsAndProjectsDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthGroupsDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthGroupsDTO.java
index 233f1fc3c..b99e2d14c 100644
--- a/src/main/java/com/labsynch/labseer/dto/AuthGroupsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthGroupsDTO.java
@@ -5,6 +5,8 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -34,6 +36,26 @@ public static String toJsonArray(Collection<AuthGroupsDTO> collection) {
 	public static Collection<AuthGroupsDTO> fromJsonArrayToAuthGroes(String json) {
         return new JSONDeserializer<List<AuthGroupsDTO>>().use(null, ArrayList.class).use("values", AuthGroupsDTO.class).deserialize(json);
     }
+
+	public String getName() {
+        return this.name;
+    }
+
+	public void setName(String name) {
+        this.name = name;
+    }
+
+	public Collection<String> getMembers() {
+        return this.members;
+    }
+
+	public void setMembers(Collection<String> members) {
+        this.members = members;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthGroupsDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/AuthGroupsDTO_Roo_JavaBean.aj
deleted file mode 100644
index e1afd2d07..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AuthGroupsDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,27 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AuthGroupsDTO;
-import java.util.Collection;
-
-privileged aspect AuthGroupsDTO_Roo_JavaBean {
-    
-    public String AuthGroupsDTO.getName() {
-        return this.name;
-    }
-    
-    public void AuthGroupsDTO.setName(String name) {
-        this.name = name;
-    }
-    
-    public Collection<String> AuthGroupsDTO.getMembers() {
-        return this.members;
-    }
-    
-    public void AuthGroupsDTO.setMembers(Collection<String> members) {
-        this.members = members;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthGroupsDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/AuthGroupsDTO_Roo_ToString.aj
deleted file mode 100644
index ec1b74eb7..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AuthGroupsDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AuthGroupsDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AuthGroupsDTO_Roo_ToString {
-    
-    public String AuthGroupsDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthProjectDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthProjectDTO.java
index fa4bda7e8..c1422b2c5 100755
--- a/src/main/java/com/labsynch/labseer/dto/AuthProjectDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthProjectDTO.java
@@ -3,7 +3,8 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -42,6 +43,26 @@ public static String toJsonArray(Collection<AuthProjectDTO> collection) {
 	public static Collection<AuthProjectDTO> fromJsonArrayToAuthProes(String json) {
         return new JSONDeserializer<List<AuthProjectDTO>>().use(null, ArrayList.class).use("values", AuthProjectDTO.class).deserialize(json);
     }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public Collection<String> getProjects() {
+        return this.projects;
+    }
+
+	public void setProjects(Collection<String> projects) {
+        this.projects = projects;
+    }
+
+	public Collection<String> getProjectAdmins() {
+        return this.projectAdmins;
+    }
+
+	public void setProjectAdmins(Collection<String> projectAdmins) {
+        this.projectAdmins = projectAdmins;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthProjectDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/AuthProjectDTO_Roo_JavaBean.aj
deleted file mode 100644
index 56dec5951..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AuthProjectDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,27 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AuthProjectDTO;
-import java.util.Collection;
-
-privileged aspect AuthProjectDTO_Roo_JavaBean {
-    
-    public Collection<String> AuthProjectDTO.getProjects() {
-        return this.projects;
-    }
-    
-    public void AuthProjectDTO.setProjects(Collection<String> projects) {
-        this.projects = projects;
-    }
-    
-    public Collection<String> AuthProjectDTO.getProjectAdmins() {
-        return this.projectAdmins;
-    }
-    
-    public void AuthProjectDTO.setProjectAdmins(Collection<String> projectAdmins) {
-        this.projectAdmins = projectAdmins;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthProjectDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/AuthProjectDTO_Roo_ToString.aj
deleted file mode 100644
index 0ac7a85d2..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AuthProjectDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AuthProjectDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AuthProjectDTO_Roo_ToString {
-    
-    public String AuthProjectDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthProjectGroupsDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthProjectGroupsDTO.java
index e579adade..11666afbf 100644
--- a/src/main/java/com/labsynch/labseer/dto/AuthProjectGroupsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthProjectGroupsDTO.java
@@ -3,7 +3,8 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -55,6 +56,76 @@ public static String toJsonArray(Collection<AuthProjectGroupsDTO> collection) {
 	public static Collection<AuthProjectGroupsDTO> fromJsonArrayToAuthProes(String json) {
         return new JSONDeserializer<List<AuthProjectGroupsDTO>>().use(null, ArrayList.class).use("values", AuthProjectGroupsDTO.class).deserialize(json);
     }
+
+	public String getName() {
+        return this.name;
+    }
+
+	public void setName(String name) {
+        this.name = name;
+    }
+
+	public String getCode() {
+        return this.code;
+    }
+
+	public void setCode(String code) {
+        this.code = code;
+    }
+
+	public String getAlias() {
+        return this.alias;
+    }
+
+	public void setAlias(String alias) {
+        this.alias = alias;
+    }
+
+	public boolean isActive() {
+        return this.active;
+    }
+
+	public void setActive(boolean active) {
+        this.active = active;
+    }
+
+	public boolean isIsRestricted() {
+        return this.isRestricted;
+    }
+
+	public void setIsRestricted(boolean isRestricted) {
+        this.isRestricted = isRestricted;
+    }
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Collection<String> getGroups() {
+        return this.groups;
+    }
+
+	public void setGroups(Collection<String> groups) {
+        this.groups = groups;
+    }
+
+	public static AuthProjectGroupsDTO fromJsonToAuthProjectGroupsDTO(String json) {
+        return new JSONDeserializer<AuthProjectGroupsDTO>()
+        .use(null, AuthProjectGroupsDTO.class).deserialize(json);
+    }
+
+	public static Collection<AuthProjectGroupsDTO> fromJsonArrayToAuthProjectGroes(String json) {
+        return new JSONDeserializer<List<AuthProjectGroupsDTO>>()
+        .use("values", AuthProjectGroupsDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthProjectGroupsDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/AuthProjectGroupsDTO_Roo_JavaBean.aj
deleted file mode 100644
index ec55ca509..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AuthProjectGroupsDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,67 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AuthProjectGroupsDTO;
-import java.util.Collection;
-
-privileged aspect AuthProjectGroupsDTO_Roo_JavaBean {
-    
-    public String AuthProjectGroupsDTO.getName() {
-        return this.name;
-    }
-    
-    public void AuthProjectGroupsDTO.setName(String name) {
-        this.name = name;
-    }
-    
-    public String AuthProjectGroupsDTO.getCode() {
-        return this.code;
-    }
-    
-    public void AuthProjectGroupsDTO.setCode(String code) {
-        this.code = code;
-    }
-    
-    public String AuthProjectGroupsDTO.getAlias() {
-        return this.alias;
-    }
-    
-    public void AuthProjectGroupsDTO.setAlias(String alias) {
-        this.alias = alias;
-    }
-    
-    public boolean AuthProjectGroupsDTO.isActive() {
-        return this.active;
-    }
-    
-    public void AuthProjectGroupsDTO.setActive(boolean active) {
-        this.active = active;
-    }
-    
-    public boolean AuthProjectGroupsDTO.isIsRestricted() {
-        return this.isRestricted;
-    }
-    
-    public void AuthProjectGroupsDTO.setIsRestricted(boolean isRestricted) {
-        this.isRestricted = isRestricted;
-    }
-    
-    public Long AuthProjectGroupsDTO.getId() {
-        return this.id;
-    }
-    
-    public void AuthProjectGroupsDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Collection<String> AuthProjectGroupsDTO.getGroups() {
-        return this.groups;
-    }
-    
-    public void AuthProjectGroupsDTO.setGroups(Collection<String> groups) {
-        this.groups = groups;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthProjectGroupsDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/AuthProjectGroupsDTO_Roo_Json.aj
deleted file mode 100644
index 85012e676..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AuthProjectGroupsDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AuthProjectGroupsDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect AuthProjectGroupsDTO_Roo_Json {
-    
-    public static AuthProjectGroupsDTO AuthProjectGroupsDTO.fromJsonToAuthProjectGroupsDTO(String json) {
-        return new JSONDeserializer<AuthProjectGroupsDTO>()
-        .use(null, AuthProjectGroupsDTO.class).deserialize(json);
-    }
-    
-    public static Collection<AuthProjectGroupsDTO> AuthProjectGroupsDTO.fromJsonArrayToAuthProjectGroes(String json) {
-        return new JSONDeserializer<List<AuthProjectGroupsDTO>>()
-        .use("values", AuthProjectGroupsDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthProjectGroupsDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/AuthProjectGroupsDTO_Roo_ToString.aj
deleted file mode 100644
index 3947c2c1a..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AuthProjectGroupsDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AuthProjectGroupsDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AuthProjectGroupsDTO_Roo_ToString {
-    
-    public String AuthProjectGroupsDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthUserDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthUserDTO.java
index cbb805838..4ffc257e8 100755
--- a/src/main/java/com/labsynch/labseer/dto/AuthUserDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthUserDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -11,6 +17,48 @@ public class AuthUserDTO {
 	
 	private String name;
 
+
+	public String getName() {
+        return this.name;
+    }
+
+	public void setName(String name) {
+        this.name = name;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static AuthUserDTO fromJsonToAuthUserDTO(String json) {
+        return new JSONDeserializer<AuthUserDTO>()
+        .use(null, AuthUserDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<AuthUserDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<AuthUserDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<AuthUserDTO> fromJsonArrayToAuthUserDTO(String json) {
+        return new JSONDeserializer<List<AuthUserDTO>>()
+        .use("values", AuthUserDTO.class).deserialize(json);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthUserDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/AuthUserDTO_Roo_JavaBean.aj
deleted file mode 100644
index 3e127027c..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AuthUserDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AuthUserDTO;
-
-privileged aspect AuthUserDTO_Roo_JavaBean {
-    
-    public String AuthUserDTO.getName() {
-        return this.name;
-    }
-    
-    public void AuthUserDTO.setName(String name) {
-        this.name = name;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthUserDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/AuthUserDTO_Roo_Json.aj
deleted file mode 100644
index b1da2b4dc..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AuthUserDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AuthUserDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect AuthUserDTO_Roo_Json {
-    
-    public String AuthUserDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String AuthUserDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static AuthUserDTO AuthUserDTO.fromJsonToAuthUserDTO(String json) {
-        return new JSONDeserializer<AuthUserDTO>()
-        .use(null, AuthUserDTO.class).deserialize(json);
-    }
-    
-    public static String AuthUserDTO.toJsonArray(Collection<AuthUserDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String AuthUserDTO.toJsonArray(Collection<AuthUserDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<AuthUserDTO> AuthUserDTO.fromJsonArrayToAuthUserDTO(String json) {
-        return new JSONDeserializer<List<AuthUserDTO>>()
-        .use("values", AuthUserDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthUserDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/AuthUserDTO_Roo_ToString.aj
deleted file mode 100644
index 3e1009fc6..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AuthUserDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AuthUserDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AuthUserDTO_Roo_ToString {
-    
-    public String AuthUserDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorBrowserQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthorBrowserQueryDTO.java
index aa1a1f933..6f7f4fb60 100644
--- a/src/main/java/com/labsynch/labseer/dto/AuthorBrowserQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthorBrowserQueryDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -13,6 +19,56 @@ public class AuthorBrowserQueryDTO {
 	
 	private AuthorQueryDTO queryDTO;
 
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static AuthorBrowserQueryDTO fromJsonToAuthorBrowserQueryDTO(String json) {
+        return new JSONDeserializer<AuthorBrowserQueryDTO>()
+        .use(null, AuthorBrowserQueryDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<AuthorBrowserQueryDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<AuthorBrowserQueryDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<AuthorBrowserQueryDTO> fromJsonArrayToAuthorBroes(String json) {
+        return new JSONDeserializer<List<AuthorBrowserQueryDTO>>()
+        .use("values", AuthorBrowserQueryDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getQueryString() {
+        return this.queryString;
+    }
+
+	public void setQueryString(String queryString) {
+        this.queryString = queryString;
+    }
+
+	public AuthorQueryDTO getQueryDTO() {
+        return this.queryDTO;
+    }
+
+	public void setQueryDTO(AuthorQueryDTO queryDTO) {
+        this.queryDTO = queryDTO;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorBrowserQueryDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/AuthorBrowserQueryDTO_Roo_JavaBean.aj
deleted file mode 100644
index e7c4c1cd8..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AuthorBrowserQueryDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,27 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AuthorBrowserQueryDTO;
-import com.labsynch.labseer.dto.AuthorQueryDTO;
-
-privileged aspect AuthorBrowserQueryDTO_Roo_JavaBean {
-    
-    public String AuthorBrowserQueryDTO.getQueryString() {
-        return this.queryString;
-    }
-    
-    public void AuthorBrowserQueryDTO.setQueryString(String queryString) {
-        this.queryString = queryString;
-    }
-    
-    public AuthorQueryDTO AuthorBrowserQueryDTO.getQueryDTO() {
-        return this.queryDTO;
-    }
-    
-    public void AuthorBrowserQueryDTO.setQueryDTO(AuthorQueryDTO queryDTO) {
-        this.queryDTO = queryDTO;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorBrowserQueryDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/AuthorBrowserQueryDTO_Roo_Json.aj
deleted file mode 100644
index 728fa76e4..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AuthorBrowserQueryDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AuthorBrowserQueryDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect AuthorBrowserQueryDTO_Roo_Json {
-    
-    public String AuthorBrowserQueryDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String AuthorBrowserQueryDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static AuthorBrowserQueryDTO AuthorBrowserQueryDTO.fromJsonToAuthorBrowserQueryDTO(String json) {
-        return new JSONDeserializer<AuthorBrowserQueryDTO>()
-        .use(null, AuthorBrowserQueryDTO.class).deserialize(json);
-    }
-    
-    public static String AuthorBrowserQueryDTO.toJsonArray(Collection<AuthorBrowserQueryDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String AuthorBrowserQueryDTO.toJsonArray(Collection<AuthorBrowserQueryDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<AuthorBrowserQueryDTO> AuthorBrowserQueryDTO.fromJsonArrayToAuthorBroes(String json) {
-        return new JSONDeserializer<List<AuthorBrowserQueryDTO>>()
-        .use("values", AuthorBrowserQueryDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorBrowserQueryDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/AuthorBrowserQueryDTO_Roo_ToString.aj
deleted file mode 100644
index b440ccbed..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AuthorBrowserQueryDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AuthorBrowserQueryDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AuthorBrowserQueryDTO_Roo_ToString {
-    
-    public String AuthorBrowserQueryDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorNameDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthorNameDTO.java
index f08975460..7d82b41dd 100755
--- a/src/main/java/com/labsynch/labseer/dto/AuthorNameDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthorNameDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -11,6 +17,48 @@ public class AuthorNameDTO {
 	
 	private String name;
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static AuthorNameDTO fromJsonToAuthorNameDTO(String json) {
+        return new JSONDeserializer<AuthorNameDTO>()
+        .use(null, AuthorNameDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<AuthorNameDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<AuthorNameDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<AuthorNameDTO> fromJsonArrayToAuthoes(String json) {
+        return new JSONDeserializer<List<AuthorNameDTO>>()
+        .use("values", AuthorNameDTO.class).deserialize(json);
+    }
+
+	public String getName() {
+        return this.name;
+    }
+
+	public void setName(String name) {
+        this.name = name;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorNameDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/AuthorNameDTO_Roo_JavaBean.aj
deleted file mode 100755
index de0d84f9c..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AuthorNameDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AuthorNameDTO;
-
-privileged aspect AuthorNameDTO_Roo_JavaBean {
-    
-    public String AuthorNameDTO.getName() {
-        return this.name;
-    }
-    
-    public void AuthorNameDTO.setName(String name) {
-        this.name = name;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorNameDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/AuthorNameDTO_Roo_Json.aj
deleted file mode 100755
index ecaf36139..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AuthorNameDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AuthorNameDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect AuthorNameDTO_Roo_Json {
-    
-    public String AuthorNameDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String AuthorNameDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static AuthorNameDTO AuthorNameDTO.fromJsonToAuthorNameDTO(String json) {
-        return new JSONDeserializer<AuthorNameDTO>()
-        .use(null, AuthorNameDTO.class).deserialize(json);
-    }
-    
-    public static String AuthorNameDTO.toJsonArray(Collection<AuthorNameDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String AuthorNameDTO.toJsonArray(Collection<AuthorNameDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<AuthorNameDTO> AuthorNameDTO.fromJsonArrayToAuthoes(String json) {
-        return new JSONDeserializer<List<AuthorNameDTO>>()
-        .use("values", AuthorNameDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorNameDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/AuthorNameDTO_Roo_ToString.aj
deleted file mode 100755
index 1059827a0..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AuthorNameDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AuthorNameDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AuthorNameDTO_Roo_ToString {
-    
-    public String AuthorNameDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthorQueryDTO.java
index 71723fbc3..efea06df3 100644
--- a/src/main/java/com/labsynch/labseer/dto/AuthorQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthorQueryDTO.java
@@ -1,8 +1,12 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -51,4 +55,126 @@ public AuthorQueryDTO(AuthorQueryDTO queryDTO){
 		this.values = queryDTO.getValues();
 		this.labels = queryDTO.getLabels();
 	}
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static AuthorQueryDTO fromJsonToAuthorQueryDTO(String json) {
+        return new JSONDeserializer<AuthorQueryDTO>()
+        .use(null, AuthorQueryDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<AuthorQueryDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<AuthorQueryDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<AuthorQueryDTO> fromJsonArrayToAuthoes(String json) {
+        return new JSONDeserializer<List<AuthorQueryDTO>>()
+        .use("values", AuthorQueryDTO.class).deserialize(json);
+    }
+
+	public Date getRecordedDateGreaterThan() {
+        return this.recordedDateGreaterThan;
+    }
+
+	public void setRecordedDateGreaterThan(Date recordedDateGreaterThan) {
+        this.recordedDateGreaterThan = recordedDateGreaterThan;
+    }
+
+	public Date getRecordedDateLessThan() {
+        return this.recordedDateLessThan;
+    }
+
+	public void setRecordedDateLessThan(Date recordedDateLessThan) {
+        this.recordedDateLessThan = recordedDateLessThan;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public Integer getMaxResults() {
+        return this.maxResults;
+    }
+
+	public void setMaxResults(Integer maxResults) {
+        this.maxResults = maxResults;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getFirstName() {
+        return this.firstName;
+    }
+
+	public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+	public String getLastName() {
+        return this.lastName;
+    }
+
+	public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+	public String getUserName() {
+        return this.userName;
+    }
+
+	public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+	public Collection<ValueQueryDTO> getValues() {
+        return this.values;
+    }
+
+	public void setValues(Collection<ValueQueryDTO> values) {
+        this.values = values;
+    }
+
+	public Collection<LabelQueryDTO> getLabels() {
+        return this.labels;
+    }
+
+	public void setLabels(Collection<LabelQueryDTO> labels) {
+        this.labels = labels;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorQueryDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/AuthorQueryDTO_Roo_JavaBean.aj
deleted file mode 100644
index 5177405f2..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AuthorQueryDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,102 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AuthorQueryDTO;
-import com.labsynch.labseer.dto.LabelQueryDTO;
-import com.labsynch.labseer.dto.ValueQueryDTO;
-import java.util.Collection;
-import java.util.Date;
-
-privileged aspect AuthorQueryDTO_Roo_JavaBean {
-    
-    public Date AuthorQueryDTO.getRecordedDateGreaterThan() {
-        return this.recordedDateGreaterThan;
-    }
-    
-    public void AuthorQueryDTO.setRecordedDateGreaterThan(Date recordedDateGreaterThan) {
-        this.recordedDateGreaterThan = recordedDateGreaterThan;
-    }
-    
-    public Date AuthorQueryDTO.getRecordedDateLessThan() {
-        return this.recordedDateLessThan;
-    }
-    
-    public void AuthorQueryDTO.setRecordedDateLessThan(Date recordedDateLessThan) {
-        this.recordedDateLessThan = recordedDateLessThan;
-    }
-    
-    public String AuthorQueryDTO.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void AuthorQueryDTO.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public Integer AuthorQueryDTO.getMaxResults() {
-        return this.maxResults;
-    }
-    
-    public void AuthorQueryDTO.setMaxResults(Integer maxResults) {
-        this.maxResults = maxResults;
-    }
-    
-    public String AuthorQueryDTO.getLsType() {
-        return this.lsType;
-    }
-    
-    public void AuthorQueryDTO.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String AuthorQueryDTO.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void AuthorQueryDTO.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String AuthorQueryDTO.getFirstName() {
-        return this.firstName;
-    }
-    
-    public void AuthorQueryDTO.setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-    
-    public String AuthorQueryDTO.getLastName() {
-        return this.lastName;
-    }
-    
-    public void AuthorQueryDTO.setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-    
-    public String AuthorQueryDTO.getUserName() {
-        return this.userName;
-    }
-    
-    public void AuthorQueryDTO.setUserName(String userName) {
-        this.userName = userName;
-    }
-    
-    public Collection<ValueQueryDTO> AuthorQueryDTO.getValues() {
-        return this.values;
-    }
-    
-    public void AuthorQueryDTO.setValues(Collection<ValueQueryDTO> values) {
-        this.values = values;
-    }
-    
-    public Collection<LabelQueryDTO> AuthorQueryDTO.getLabels() {
-        return this.labels;
-    }
-    
-    public void AuthorQueryDTO.setLabels(Collection<LabelQueryDTO> labels) {
-        this.labels = labels;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorQueryDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/AuthorQueryDTO_Roo_Json.aj
deleted file mode 100644
index b850eb466..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AuthorQueryDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AuthorQueryDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect AuthorQueryDTO_Roo_Json {
-    
-    public String AuthorQueryDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String AuthorQueryDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static AuthorQueryDTO AuthorQueryDTO.fromJsonToAuthorQueryDTO(String json) {
-        return new JSONDeserializer<AuthorQueryDTO>()
-        .use(null, AuthorQueryDTO.class).deserialize(json);
-    }
-    
-    public static String AuthorQueryDTO.toJsonArray(Collection<AuthorQueryDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String AuthorQueryDTO.toJsonArray(Collection<AuthorQueryDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<AuthorQueryDTO> AuthorQueryDTO.fromJsonArrayToAuthoes(String json) {
-        return new JSONDeserializer<List<AuthorQueryDTO>>()
-        .use("values", AuthorQueryDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorQueryDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/AuthorQueryDTO_Roo_ToString.aj
deleted file mode 100644
index 5ee772325..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AuthorQueryDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AuthorQueryDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AuthorQueryDTO_Roo_ToString {
-    
-    public String AuthorQueryDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorQueryResultDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthorQueryResultDTO.java
index 91fefee04..f64a470f8 100644
--- a/src/main/java/com/labsynch/labseer/dto/AuthorQueryResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthorQueryResultDTO.java
@@ -1,7 +1,9 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -9,7 +11,7 @@
 
 import com.labsynch.labseer.domain.Author;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -32,4 +34,52 @@ public String toJson() {
         return new JSONSerializer().exclude("*.class", "results.password").include("results.lsTags", "results.lsLabels", "results.lsStates.lsValues", "results.authorRoles.roleEntry").transform(new ExcludeNulls(), void.class).serialize(this);
     }
 	
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public Integer getMaxResults() {
+        return this.maxResults;
+    }
+
+	public void setMaxResults(Integer maxResults) {
+        this.maxResults = maxResults;
+    }
+
+	public Integer getNumberOfResults() {
+        return this.numberOfResults;
+    }
+
+	public void setNumberOfResults(Integer numberOfResults) {
+        this.numberOfResults = numberOfResults;
+    }
+
+	public Collection<Author> getResults() {
+        return this.results;
+    }
+
+	public void setResults(Collection<Author> results) {
+        this.results = results;
+    }
+
+	public static AuthorQueryResultDTO fromJsonToAuthorQueryResultDTO(String json) {
+        return new JSONDeserializer<AuthorQueryResultDTO>()
+        .use(null, AuthorQueryResultDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<AuthorQueryResultDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<AuthorQueryResultDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<AuthorQueryResultDTO> fromJsonArrayToAuthoes(String json) {
+        return new JSONDeserializer<List<AuthorQueryResultDTO>>()
+        .use("values", AuthorQueryResultDTO.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorQueryResultDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/AuthorQueryResultDTO_Roo_JavaBean.aj
deleted file mode 100644
index 7f004876a..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AuthorQueryResultDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,36 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.dto.AuthorQueryResultDTO;
-import java.util.Collection;
-
-privileged aspect AuthorQueryResultDTO_Roo_JavaBean {
-    
-    public Integer AuthorQueryResultDTO.getMaxResults() {
-        return this.maxResults;
-    }
-    
-    public void AuthorQueryResultDTO.setMaxResults(Integer maxResults) {
-        this.maxResults = maxResults;
-    }
-    
-    public Integer AuthorQueryResultDTO.getNumberOfResults() {
-        return this.numberOfResults;
-    }
-    
-    public void AuthorQueryResultDTO.setNumberOfResults(Integer numberOfResults) {
-        this.numberOfResults = numberOfResults;
-    }
-    
-    public Collection<Author> AuthorQueryResultDTO.getResults() {
-        return this.results;
-    }
-    
-    public void AuthorQueryResultDTO.setResults(Collection<Author> results) {
-        this.results = results;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorQueryResultDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/AuthorQueryResultDTO_Roo_Json.aj
deleted file mode 100644
index 9c7247763..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AuthorQueryResultDTO_Roo_Json.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AuthorQueryResultDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect AuthorQueryResultDTO_Roo_Json {
-    
-    public static AuthorQueryResultDTO AuthorQueryResultDTO.fromJsonToAuthorQueryResultDTO(String json) {
-        return new JSONDeserializer<AuthorQueryResultDTO>()
-        .use(null, AuthorQueryResultDTO.class).deserialize(json);
-    }
-    
-    public static String AuthorQueryResultDTO.toJsonArray(Collection<AuthorQueryResultDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String AuthorQueryResultDTO.toJsonArray(Collection<AuthorQueryResultDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<AuthorQueryResultDTO> AuthorQueryResultDTO.fromJsonArrayToAuthoes(String json) {
-        return new JSONDeserializer<List<AuthorQueryResultDTO>>()
-        .use("values", AuthorQueryResultDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorQueryResultDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/AuthorQueryResultDTO_Roo_ToString.aj
deleted file mode 100644
index 0f6b1d542..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AuthorQueryResultDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AuthorQueryResultDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AuthorQueryResultDTO_Roo_ToString {
-    
-    public String AuthorQueryResultDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorRoleDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthorRoleDTO.java
index 2d9a36173..4a584ce6f 100644
--- a/src/main/java/com/labsynch/labseer/dto/AuthorRoleDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthorRoleDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -17,6 +23,72 @@ public class AuthorRoleDTO {
 	
 	private String userName;
 	
+
+	public String getRoleType() {
+        return this.roleType;
+    }
+
+	public void setRoleType(String roleType) {
+        this.roleType = roleType;
+    }
+
+	public String getRoleKind() {
+        return this.roleKind;
+    }
+
+	public void setRoleKind(String roleKind) {
+        this.roleKind = roleKind;
+    }
+
+	public String getRoleName() {
+        return this.roleName;
+    }
+
+	public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+
+	public String getUserName() {
+        return this.userName;
+    }
+
+	public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static AuthorRoleDTO fromJsonToAuthorRoleDTO(String json) {
+        return new JSONDeserializer<AuthorRoleDTO>()
+        .use(null, AuthorRoleDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<AuthorRoleDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<AuthorRoleDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<AuthorRoleDTO> fromJsonArrayToAuthorRoes(String json) {
+        return new JSONDeserializer<List<AuthorRoleDTO>>()
+        .use("values", AuthorRoleDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorRoleDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/AuthorRoleDTO_Roo_JavaBean.aj
deleted file mode 100644
index 033267112..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AuthorRoleDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,42 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AuthorRoleDTO;
-
-privileged aspect AuthorRoleDTO_Roo_JavaBean {
-    
-    public String AuthorRoleDTO.getRoleType() {
-        return this.roleType;
-    }
-    
-    public void AuthorRoleDTO.setRoleType(String roleType) {
-        this.roleType = roleType;
-    }
-    
-    public String AuthorRoleDTO.getRoleKind() {
-        return this.roleKind;
-    }
-    
-    public void AuthorRoleDTO.setRoleKind(String roleKind) {
-        this.roleKind = roleKind;
-    }
-    
-    public String AuthorRoleDTO.getRoleName() {
-        return this.roleName;
-    }
-    
-    public void AuthorRoleDTO.setRoleName(String roleName) {
-        this.roleName = roleName;
-    }
-    
-    public String AuthorRoleDTO.getUserName() {
-        return this.userName;
-    }
-    
-    public void AuthorRoleDTO.setUserName(String userName) {
-        this.userName = userName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorRoleDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/AuthorRoleDTO_Roo_Json.aj
deleted file mode 100644
index 514c37bf8..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AuthorRoleDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AuthorRoleDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect AuthorRoleDTO_Roo_Json {
-    
-    public String AuthorRoleDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String AuthorRoleDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static AuthorRoleDTO AuthorRoleDTO.fromJsonToAuthorRoleDTO(String json) {
-        return new JSONDeserializer<AuthorRoleDTO>()
-        .use(null, AuthorRoleDTO.class).deserialize(json);
-    }
-    
-    public static String AuthorRoleDTO.toJsonArray(Collection<AuthorRoleDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String AuthorRoleDTO.toJsonArray(Collection<AuthorRoleDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<AuthorRoleDTO> AuthorRoleDTO.fromJsonArrayToAuthorRoes(String json) {
-        return new JSONDeserializer<List<AuthorRoleDTO>>()
-        .use("values", AuthorRoleDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorRoleDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/AuthorRoleDTO_Roo_ToString.aj
deleted file mode 100644
index 625c3e0f4..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AuthorRoleDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AuthorRoleDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AuthorRoleDTO_Roo_ToString {
-    
-    public String AuthorRoleDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AutoLabelDTO.java b/src/main/java/com/labsynch/labseer/dto/AutoLabelDTO.java
index 2e289e07a..121fbb46b 100755
--- a/src/main/java/com/labsynch/labseer/dto/AutoLabelDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AutoLabelDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -22,4 +28,54 @@ public AutoLabelDTO (String autoLabel, Long labelNumber){
     		this.labelNumber = labelNumber;
     }
 
+
+	public String getAutoLabel() {
+        return this.autoLabel;
+    }
+
+	public void setAutoLabel(String autoLabel) {
+        this.autoLabel = autoLabel;
+    }
+
+	public Long getLabelNumber() {
+        return this.labelNumber;
+    }
+
+	public void setLabelNumber(Long labelNumber) {
+        this.labelNumber = labelNumber;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static AutoLabelDTO fromJsonToAutoLabelDTO(String json) {
+        return new JSONDeserializer<AutoLabelDTO>()
+        .use(null, AutoLabelDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<AutoLabelDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<AutoLabelDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<AutoLabelDTO> fromJsonArrayToAutoes(String json) {
+        return new JSONDeserializer<List<AutoLabelDTO>>()
+        .use("values", AutoLabelDTO.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/AutoLabelDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/AutoLabelDTO_Roo_JavaBean.aj
deleted file mode 100755
index 9cf6e84f5..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AutoLabelDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AutoLabelDTO;
-
-privileged aspect AutoLabelDTO_Roo_JavaBean {
-    
-    public String AutoLabelDTO.getAutoLabel() {
-        return this.autoLabel;
-    }
-    
-    public void AutoLabelDTO.setAutoLabel(String autoLabel) {
-        this.autoLabel = autoLabel;
-    }
-    
-    public Long AutoLabelDTO.getLabelNumber() {
-        return this.labelNumber;
-    }
-    
-    public void AutoLabelDTO.setLabelNumber(Long labelNumber) {
-        this.labelNumber = labelNumber;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AutoLabelDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/AutoLabelDTO_Roo_Json.aj
deleted file mode 100755
index 6a8c56adc..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AutoLabelDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AutoLabelDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect AutoLabelDTO_Roo_Json {
-    
-    public String AutoLabelDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String AutoLabelDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static AutoLabelDTO AutoLabelDTO.fromJsonToAutoLabelDTO(String json) {
-        return new JSONDeserializer<AutoLabelDTO>()
-        .use(null, AutoLabelDTO.class).deserialize(json);
-    }
-    
-    public static String AutoLabelDTO.toJsonArray(Collection<AutoLabelDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String AutoLabelDTO.toJsonArray(Collection<AutoLabelDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<AutoLabelDTO> AutoLabelDTO.fromJsonArrayToAutoes(String json) {
-        return new JSONDeserializer<List<AutoLabelDTO>>()
-        .use("values", AutoLabelDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/AutoLabelDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/AutoLabelDTO_Roo_ToString.aj
deleted file mode 100755
index ebc6524c6..000000000
--- a/src/main/java/com/labsynch/labseer/dto/AutoLabelDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AutoLabelDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect AutoLabelDTO_Roo_ToString {
-    
-    public String AutoLabelDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BatchCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/BatchCodeDTO.java
index e8d66b19c..d3c5db8bf 100755
--- a/src/main/java/com/labsynch/labseer/dto/BatchCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BatchCodeDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -29,6 +35,48 @@ public static CellProcessor[] getProcessors() {
 		return processors;
 	}
 
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static BatchCodeDTO fromJsonToBatchCodeDTO(String json) {
+        return new JSONDeserializer<BatchCodeDTO>()
+        .use(null, BatchCodeDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<BatchCodeDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<BatchCodeDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<BatchCodeDTO> fromJsonArrayToBatchCoes(String json) {
+        return new JSONDeserializer<List<BatchCodeDTO>>()
+        .use("values", BatchCodeDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getBatchCode() {
+        return this.batchCode;
+    }
+
+	public void setBatchCode(String batchCode) {
+        this.batchCode = batchCode;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/BatchCodeDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/BatchCodeDTO_Roo_JavaBean.aj
deleted file mode 100755
index 7e1d4658f..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BatchCodeDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BatchCodeDTO;
-
-privileged aspect BatchCodeDTO_Roo_JavaBean {
-    
-    public String BatchCodeDTO.getBatchCode() {
-        return this.batchCode;
-    }
-    
-    public void BatchCodeDTO.setBatchCode(String batchCode) {
-        this.batchCode = batchCode;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BatchCodeDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/BatchCodeDTO_Roo_Json.aj
deleted file mode 100755
index 1fc68a0fe..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BatchCodeDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BatchCodeDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect BatchCodeDTO_Roo_Json {
-    
-    public String BatchCodeDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String BatchCodeDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static BatchCodeDTO BatchCodeDTO.fromJsonToBatchCodeDTO(String json) {
-        return new JSONDeserializer<BatchCodeDTO>()
-        .use(null, BatchCodeDTO.class).deserialize(json);
-    }
-    
-    public static String BatchCodeDTO.toJsonArray(Collection<BatchCodeDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String BatchCodeDTO.toJsonArray(Collection<BatchCodeDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<BatchCodeDTO> BatchCodeDTO.fromJsonArrayToBatchCoes(String json) {
-        return new JSONDeserializer<List<BatchCodeDTO>>()
-        .use("values", BatchCodeDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BatchCodeDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/BatchCodeDTO_Roo_ToString.aj
deleted file mode 100755
index 213067dad..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BatchCodeDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BatchCodeDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect BatchCodeDTO_Roo_ToString {
-    
-    public String BatchCodeDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO.java b/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO.java
index f8bd830d9..81cda3cd0 100644
--- a/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO.java
@@ -10,7 +10,8 @@
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import javax.persistence.NoResultException;
@@ -27,7 +28,7 @@
 
 import com.labsynch.labseer.service.ErrorMessage;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -58,4 +59,60 @@ public String toJson() {
         .exclude("*.class").serialize(this);
     }
     
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static BatchCodeDependencyDTO fromJsonToBatchCodeDependencyDTO(String json) {
+        return new JSONDeserializer<BatchCodeDependencyDTO>()
+        .use(null, BatchCodeDependencyDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<BatchCodeDependencyDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<BatchCodeDependencyDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<BatchCodeDependencyDTO> fromJsonArrayToBatchCoes(String json) {
+        return new JSONDeserializer<List<BatchCodeDependencyDTO>>()
+        .use("values", BatchCodeDependencyDTO.class).deserialize(json);
+    }
+
+	public Collection<String> getBatchCodes() {
+        return this.batchCodes;
+    }
+
+	public void setBatchCodes(Collection<String> batchCodes) {
+        this.batchCodes = batchCodes;
+    }
+
+	public Boolean getLinkedDataExists() {
+        return this.linkedDataExists;
+    }
+
+	public void setLinkedDataExists(Boolean linkedDataExists) {
+        this.linkedDataExists = linkedDataExists;
+    }
+
+	public Collection<CodeTableDTO> getLinkedExperiments() {
+        return this.linkedExperiments;
+    }
+
+	public void setLinkedExperiments(Collection<CodeTableDTO> linkedExperiments) {
+        this.linkedExperiments = linkedExperiments;
+    }
+
+	public Collection<ErrorMessage> getErrors() {
+        return this.errors;
+    }
+
+	public void setErrors(Collection<ErrorMessage> errors) {
+        this.errors = errors;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO_Roo_JavaBean.aj
deleted file mode 100644
index 5b880c49a..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BatchCodeDependencyDTO;
-import com.labsynch.labseer.dto.CodeTableDTO;
-import com.labsynch.labseer.service.ErrorMessage;
-import java.util.Collection;
-
-privileged aspect BatchCodeDependencyDTO_Roo_JavaBean {
-    
-    public Collection<String> BatchCodeDependencyDTO.getBatchCodes() {
-        return this.batchCodes;
-    }
-    
-    public void BatchCodeDependencyDTO.setBatchCodes(Collection<String> batchCodes) {
-        this.batchCodes = batchCodes;
-    }
-    
-    public Boolean BatchCodeDependencyDTO.getLinkedDataExists() {
-        return this.linkedDataExists;
-    }
-    
-    public void BatchCodeDependencyDTO.setLinkedDataExists(Boolean linkedDataExists) {
-        this.linkedDataExists = linkedDataExists;
-    }
-    
-    public Collection<CodeTableDTO> BatchCodeDependencyDTO.getLinkedExperiments() {
-        return this.linkedExperiments;
-    }
-    
-    public void BatchCodeDependencyDTO.setLinkedExperiments(Collection<CodeTableDTO> linkedExperiments) {
-        this.linkedExperiments = linkedExperiments;
-    }
-    
-    public Collection<ErrorMessage> BatchCodeDependencyDTO.getErrors() {
-        return this.errors;
-    }
-    
-    public void BatchCodeDependencyDTO.setErrors(Collection<ErrorMessage> errors) {
-        this.errors = errors;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO_Roo_Json.aj
deleted file mode 100644
index 1bcdfc8a3..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO_Roo_Json.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BatchCodeDependencyDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect BatchCodeDependencyDTO_Roo_Json {
-    
-    public static BatchCodeDependencyDTO BatchCodeDependencyDTO.fromJsonToBatchCodeDependencyDTO(String json) {
-        return new JSONDeserializer<BatchCodeDependencyDTO>()
-        .use(null, BatchCodeDependencyDTO.class).deserialize(json);
-    }
-    
-    public static String BatchCodeDependencyDTO.toJsonArray(Collection<BatchCodeDependencyDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String BatchCodeDependencyDTO.toJsonArray(Collection<BatchCodeDependencyDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<BatchCodeDependencyDTO> BatchCodeDependencyDTO.fromJsonArrayToBatchCoes(String json) {
-        return new JSONDeserializer<List<BatchCodeDependencyDTO>>()
-        .use("values", BatchCodeDependencyDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO_Roo_ToString.aj
deleted file mode 100644
index 7c4a9d4c8..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BatchCodeDependencyDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect BatchCodeDependencyDTO_Roo_ToString {
-    
-    public String BatchCodeDependencyDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BatchProjectDTO.java b/src/main/java/com/labsynch/labseer/dto/BatchProjectDTO.java
index 7a5b19586..80a037acc 100644
--- a/src/main/java/com/labsynch/labseer/dto/BatchProjectDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BatchProjectDTO.java
@@ -6,7 +6,8 @@
 
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.roo.addon.javabean.RooJavaBean;
@@ -15,6 +16,8 @@
 
 import com.labsynch.labseer.domain.Lot;
 import com.labsynch.labseer.utils.SimpleUtil;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
 @RooJavaBean
 @RooToString
@@ -61,4 +64,54 @@ public static Collection<BatchProjectDTO> getBatchProjects(Collection<BatchProje
     }
     
    
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static BatchProjectDTO fromJsonToBatchProjectDTO(String json) {
+        return new JSONDeserializer<BatchProjectDTO>()
+        .use(null, BatchProjectDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<BatchProjectDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<BatchProjectDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<BatchProjectDTO> fromJsonArrayToBatchProes(String json) {
+        return new JSONDeserializer<List<BatchProjectDTO>>()
+        .use("values", BatchProjectDTO.class).deserialize(json);
+    }
+
+	public String getRequestName() {
+        return this.requestName;
+    }
+
+	public void setRequestName(String requestName) {
+        this.requestName = requestName;
+    }
+
+	public String getProjectCode() {
+        return this.projectCode;
+    }
+
+	public void setProjectCode(String projectCode) {
+        this.projectCode = projectCode;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/BatchProjectDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/BatchProjectDTO_Roo_JavaBean.aj
deleted file mode 100644
index 460d4488e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BatchProjectDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BatchProjectDTO;
-
-privileged aspect BatchProjectDTO_Roo_JavaBean {
-    
-    public String BatchProjectDTO.getRequestName() {
-        return this.requestName;
-    }
-    
-    public void BatchProjectDTO.setRequestName(String requestName) {
-        this.requestName = requestName;
-    }
-    
-    public String BatchProjectDTO.getProjectCode() {
-        return this.projectCode;
-    }
-    
-    public void BatchProjectDTO.setProjectCode(String projectCode) {
-        this.projectCode = projectCode;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BatchProjectDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/BatchProjectDTO_Roo_Json.aj
deleted file mode 100644
index 012464e24..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BatchProjectDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BatchProjectDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect BatchProjectDTO_Roo_Json {
-    
-    public String BatchProjectDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String BatchProjectDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static BatchProjectDTO BatchProjectDTO.fromJsonToBatchProjectDTO(String json) {
-        return new JSONDeserializer<BatchProjectDTO>()
-        .use(null, BatchProjectDTO.class).deserialize(json);
-    }
-    
-    public static String BatchProjectDTO.toJsonArray(Collection<BatchProjectDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String BatchProjectDTO.toJsonArray(Collection<BatchProjectDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<BatchProjectDTO> BatchProjectDTO.fromJsonArrayToBatchProes(String json) {
-        return new JSONDeserializer<List<BatchProjectDTO>>()
-        .use("values", BatchProjectDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BatchProjectDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/BatchProjectDTO_Roo_ToString.aj
deleted file mode 100644
index ee1e28136..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BatchProjectDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BatchProjectDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect BatchProjectDTO_Roo_ToString {
-    
-    public String BatchProjectDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO.java
index 99ff97453..9f65c92f0 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO.java
@@ -10,7 +10,8 @@
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import javax.persistence.NoResultException;
@@ -29,7 +30,7 @@
 import com.labsynch.labseer.utils.PropertiesUtilService;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -176,4 +177,76 @@ public void checkAgainstTemplate(String templateName) {
 			logger.error("Caught exception comparing template to mappings.",e);
 		}
 	}
+
+	public Collection<SimpleBulkLoadPropertyDTO> getSdfProperties() {
+        return this.sdfProperties;
+    }
+
+	public void setSdfProperties(Collection<SimpleBulkLoadPropertyDTO> sdfProperties) {
+        this.sdfProperties = sdfProperties;
+    }
+
+	public Collection<SimpleBulkLoadPropertyDTO> getDbProperties() {
+        return this.dbProperties;
+    }
+
+	public void setDbProperties(Collection<SimpleBulkLoadPropertyDTO> dbProperties) {
+        this.dbProperties = dbProperties;
+    }
+
+	public Collection<BulkLoadPropertyMappingDTO> getBulkLoadProperties() {
+        return this.bulkLoadProperties;
+    }
+
+	public void setBulkLoadProperties(Collection<BulkLoadPropertyMappingDTO> bulkLoadProperties) {
+        this.bulkLoadProperties = bulkLoadProperties;
+    }
+
+	public Collection<ErrorMessage> getErrors() {
+        return this.errors;
+    }
+
+	public void setErrors(Collection<ErrorMessage> errors) {
+        this.errors = errors;
+    }
+
+	public int getNumRecordsRead() {
+        return this.numRecordsRead;
+    }
+
+	public void setNumRecordsRead(int numRecordsRead) {
+        this.numRecordsRead = numRecordsRead;
+    }
+
+	public String getTemplateName() {
+        return this.templateName;
+    }
+
+	public void setTemplateName(String templateName) {
+        this.templateName = templateName;
+    }
+
+	public static BulkLoadPropertiesDTO fromJsonToBulkLoadPropertiesDTO(String json) {
+        return new JSONDeserializer<BulkLoadPropertiesDTO>()
+        .use(null, BulkLoadPropertiesDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<BulkLoadPropertiesDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<BulkLoadPropertiesDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<BulkLoadPropertiesDTO> fromJsonArrayToBulkLoadProes(String json) {
+        return new JSONDeserializer<List<BulkLoadPropertiesDTO>>()
+        .use("values", BulkLoadPropertiesDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO_Roo_JavaBean.aj
deleted file mode 100644
index 78dc0958c..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,62 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BulkLoadPropertiesDTO;
-import com.labsynch.labseer.dto.BulkLoadPropertyMappingDTO;
-import com.labsynch.labseer.dto.SimpleBulkLoadPropertyDTO;
-import com.labsynch.labseer.service.ErrorMessage;
-import java.util.Collection;
-
-privileged aspect BulkLoadPropertiesDTO_Roo_JavaBean {
-    
-    public Collection<SimpleBulkLoadPropertyDTO> BulkLoadPropertiesDTO.getSdfProperties() {
-        return this.sdfProperties;
-    }
-    
-    public void BulkLoadPropertiesDTO.setSdfProperties(Collection<SimpleBulkLoadPropertyDTO> sdfProperties) {
-        this.sdfProperties = sdfProperties;
-    }
-    
-    public Collection<SimpleBulkLoadPropertyDTO> BulkLoadPropertiesDTO.getDbProperties() {
-        return this.dbProperties;
-    }
-    
-    public void BulkLoadPropertiesDTO.setDbProperties(Collection<SimpleBulkLoadPropertyDTO> dbProperties) {
-        this.dbProperties = dbProperties;
-    }
-    
-    public Collection<BulkLoadPropertyMappingDTO> BulkLoadPropertiesDTO.getBulkLoadProperties() {
-        return this.bulkLoadProperties;
-    }
-    
-    public void BulkLoadPropertiesDTO.setBulkLoadProperties(Collection<BulkLoadPropertyMappingDTO> bulkLoadProperties) {
-        this.bulkLoadProperties = bulkLoadProperties;
-    }
-    
-    public Collection<ErrorMessage> BulkLoadPropertiesDTO.getErrors() {
-        return this.errors;
-    }
-    
-    public void BulkLoadPropertiesDTO.setErrors(Collection<ErrorMessage> errors) {
-        this.errors = errors;
-    }
-    
-    public int BulkLoadPropertiesDTO.getNumRecordsRead() {
-        return this.numRecordsRead;
-    }
-    
-    public void BulkLoadPropertiesDTO.setNumRecordsRead(int numRecordsRead) {
-        this.numRecordsRead = numRecordsRead;
-    }
-    
-    public String BulkLoadPropertiesDTO.getTemplateName() {
-        return this.templateName;
-    }
-    
-    public void BulkLoadPropertiesDTO.setTemplateName(String templateName) {
-        this.templateName = templateName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO_Roo_Json.aj
deleted file mode 100644
index e541dc3cf..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO_Roo_Json.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BulkLoadPropertiesDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect BulkLoadPropertiesDTO_Roo_Json {
-    
-    public static BulkLoadPropertiesDTO BulkLoadPropertiesDTO.fromJsonToBulkLoadPropertiesDTO(String json) {
-        return new JSONDeserializer<BulkLoadPropertiesDTO>()
-        .use(null, BulkLoadPropertiesDTO.class).deserialize(json);
-    }
-    
-    public static String BulkLoadPropertiesDTO.toJsonArray(Collection<BulkLoadPropertiesDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String BulkLoadPropertiesDTO.toJsonArray(Collection<BulkLoadPropertiesDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<BulkLoadPropertiesDTO> BulkLoadPropertiesDTO.fromJsonArrayToBulkLoadProes(String json) {
-        return new JSONDeserializer<List<BulkLoadPropertiesDTO>>()
-        .use("values", BulkLoadPropertiesDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO_Roo_ToString.aj
deleted file mode 100644
index 0ce870dd6..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BulkLoadPropertiesDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect BulkLoadPropertiesDTO_Roo_ToString {
-    
-    public String BulkLoadPropertiesDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertyMappingDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertyMappingDTO.java
index 4b55c7fa3..fe3512a5b 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertyMappingDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertyMappingDTO.java
@@ -3,7 +3,8 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.roo.addon.javabean.RooJavaBean;
@@ -11,7 +12,7 @@
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -74,4 +75,76 @@ public static BulkLoadPropertyMappingDTO findMappingBySdfPropertyEquals(Collecti
     	return null;
     }
     
+
+	public static BulkLoadPropertyMappingDTO fromJsonToBulkLoadPropertyMappingDTO(String json) {
+        return new JSONDeserializer<BulkLoadPropertyMappingDTO>()
+        .use(null, BulkLoadPropertyMappingDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<BulkLoadPropertyMappingDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<BulkLoadPropertyMappingDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<BulkLoadPropertyMappingDTO> fromJsonArrayToBulkLoadProes(String json) {
+        return new JSONDeserializer<List<BulkLoadPropertyMappingDTO>>()
+        .use("values", BulkLoadPropertyMappingDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getDbProperty() {
+        return this.dbProperty;
+    }
+
+	public void setDbProperty(String dbProperty) {
+        this.dbProperty = dbProperty;
+    }
+
+	public String getSdfProperty() {
+        return this.sdfProperty;
+    }
+
+	public void setSdfProperty(String sdfProperty) {
+        this.sdfProperty = sdfProperty;
+    }
+
+	public boolean isRequired() {
+        return this.required;
+    }
+
+	public void setRequired(boolean required) {
+        this.required = required;
+    }
+
+	public Collection<String> getInvalidValues() {
+        return this.invalidValues;
+    }
+
+	public void setInvalidValues(Collection<String> invalidValues) {
+        this.invalidValues = invalidValues;
+    }
+
+	public String getDefaultVal() {
+        return this.defaultVal;
+    }
+
+	public void setDefaultVal(String defaultVal) {
+        this.defaultVal = defaultVal;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertyMappingDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertyMappingDTO_Roo_JavaBean.aj
deleted file mode 100644
index 4710ba119..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertyMappingDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,59 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BulkLoadPropertyMappingDTO;
-import java.util.Collection;
-
-privileged aspect BulkLoadPropertyMappingDTO_Roo_JavaBean {
-    
-    public String BulkLoadPropertyMappingDTO.getDbProperty() {
-        return this.dbProperty;
-    }
-    
-    public void BulkLoadPropertyMappingDTO.setDbProperty(String dbProperty) {
-        this.dbProperty = dbProperty;
-    }
-    
-    public String BulkLoadPropertyMappingDTO.getSdfProperty() {
-        return this.sdfProperty;
-    }
-    
-    public void BulkLoadPropertyMappingDTO.setSdfProperty(String sdfProperty) {
-        this.sdfProperty = sdfProperty;
-    }
-    
-    public boolean BulkLoadPropertyMappingDTO.isRequired() {
-        return this.required;
-    }
-    
-    public void BulkLoadPropertyMappingDTO.setRequired(boolean required) {
-        this.required = required;
-    }
-    
-    public Collection<String> BulkLoadPropertyMappingDTO.getInvalidValues() {
-        return this.invalidValues;
-    }
-    
-    public void BulkLoadPropertyMappingDTO.setInvalidValues(Collection<String> invalidValues) {
-        this.invalidValues = invalidValues;
-    }
-    
-    public String BulkLoadPropertyMappingDTO.getDefaultVal() {
-        return this.defaultVal;
-    }
-    
-    public void BulkLoadPropertyMappingDTO.setDefaultVal(String defaultVal) {
-        this.defaultVal = defaultVal;
-    }
-    
-    public boolean BulkLoadPropertyMappingDTO.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void BulkLoadPropertyMappingDTO.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertyMappingDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertyMappingDTO_Roo_Json.aj
deleted file mode 100644
index ca6db68db..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertyMappingDTO_Roo_Json.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BulkLoadPropertyMappingDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect BulkLoadPropertyMappingDTO_Roo_Json {
-    
-    public static BulkLoadPropertyMappingDTO BulkLoadPropertyMappingDTO.fromJsonToBulkLoadPropertyMappingDTO(String json) {
-        return new JSONDeserializer<BulkLoadPropertyMappingDTO>()
-        .use(null, BulkLoadPropertyMappingDTO.class).deserialize(json);
-    }
-    
-    public static String BulkLoadPropertyMappingDTO.toJsonArray(Collection<BulkLoadPropertyMappingDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String BulkLoadPropertyMappingDTO.toJsonArray(Collection<BulkLoadPropertyMappingDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<BulkLoadPropertyMappingDTO> BulkLoadPropertyMappingDTO.fromJsonArrayToBulkLoadProes(String json) {
-        return new JSONDeserializer<List<BulkLoadPropertyMappingDTO>>()
-        .use("values", BulkLoadPropertyMappingDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertyMappingDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertyMappingDTO_Roo_ToString.aj
deleted file mode 100644
index 63dcd7352..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertyMappingDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BulkLoadPropertyMappingDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect BulkLoadPropertyMappingDTO_Roo_ToString {
-    
-    public String BulkLoadPropertyMappingDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFRequestDTO.java
index 68f0d63ad..9ed027542 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFRequestDTO.java
@@ -2,13 +2,15 @@
 
 import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -45,4 +47,76 @@ public String toJson() {
         .include("filePath", "fileDate", "userName",  "validate", "mappings").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
     }
     
+
+	public String getFilePath() {
+        return this.filePath;
+    }
+
+	public void setFilePath(String filePath) {
+        this.filePath = filePath;
+    }
+
+	public String getUserName() {
+        return this.userName;
+    }
+
+	public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+	public Date getFileDate() {
+        return this.fileDate;
+    }
+
+	public void setFileDate(Date fileDate) {
+        this.fileDate = fileDate;
+    }
+
+	public LabelPrefixDTO getLabelPrefix() {
+        return this.labelPrefix;
+    }
+
+	public void setLabelPrefix(LabelPrefixDTO labelPrefix) {
+        this.labelPrefix = labelPrefix;
+    }
+
+	public Boolean getValidate() {
+        return this.validate;
+    }
+
+	public void setValidate(Boolean validate) {
+        this.validate = validate;
+    }
+
+	public Collection<BulkLoadPropertyMappingDTO> getMappings() {
+        return this.mappings;
+    }
+
+	public void setMappings(Collection<BulkLoadPropertyMappingDTO> mappings) {
+        this.mappings = mappings;
+    }
+
+	public static BulkLoadRegisterSDFRequestDTO fromJsonToBulkLoadRegisterSDFRequestDTO(String json) {
+        return new JSONDeserializer<BulkLoadRegisterSDFRequestDTO>()
+        .use(null, BulkLoadRegisterSDFRequestDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<BulkLoadRegisterSDFRequestDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<BulkLoadRegisterSDFRequestDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<BulkLoadRegisterSDFRequestDTO> fromJsonArrayToBulkLoes(String json) {
+        return new JSONDeserializer<List<BulkLoadRegisterSDFRequestDTO>>()
+        .use("values", BulkLoadRegisterSDFRequestDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFRequestDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFRequestDTO_Roo_JavaBean.aj
deleted file mode 100644
index 1c061872a..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFRequestDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,62 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BulkLoadPropertyMappingDTO;
-import com.labsynch.labseer.dto.BulkLoadRegisterSDFRequestDTO;
-import com.labsynch.labseer.dto.LabelPrefixDTO;
-import java.util.Collection;
-import java.util.Date;
-
-privileged aspect BulkLoadRegisterSDFRequestDTO_Roo_JavaBean {
-    
-    public String BulkLoadRegisterSDFRequestDTO.getFilePath() {
-        return this.filePath;
-    }
-    
-    public void BulkLoadRegisterSDFRequestDTO.setFilePath(String filePath) {
-        this.filePath = filePath;
-    }
-    
-    public String BulkLoadRegisterSDFRequestDTO.getUserName() {
-        return this.userName;
-    }
-    
-    public void BulkLoadRegisterSDFRequestDTO.setUserName(String userName) {
-        this.userName = userName;
-    }
-    
-    public Date BulkLoadRegisterSDFRequestDTO.getFileDate() {
-        return this.fileDate;
-    }
-    
-    public void BulkLoadRegisterSDFRequestDTO.setFileDate(Date fileDate) {
-        this.fileDate = fileDate;
-    }
-    
-    public LabelPrefixDTO BulkLoadRegisterSDFRequestDTO.getLabelPrefix() {
-        return this.labelPrefix;
-    }
-    
-    public void BulkLoadRegisterSDFRequestDTO.setLabelPrefix(LabelPrefixDTO labelPrefix) {
-        this.labelPrefix = labelPrefix;
-    }
-    
-    public Boolean BulkLoadRegisterSDFRequestDTO.getValidate() {
-        return this.validate;
-    }
-    
-    public void BulkLoadRegisterSDFRequestDTO.setValidate(Boolean validate) {
-        this.validate = validate;
-    }
-    
-    public Collection<BulkLoadPropertyMappingDTO> BulkLoadRegisterSDFRequestDTO.getMappings() {
-        return this.mappings;
-    }
-    
-    public void BulkLoadRegisterSDFRequestDTO.setMappings(Collection<BulkLoadPropertyMappingDTO> mappings) {
-        this.mappings = mappings;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFRequestDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFRequestDTO_Roo_Json.aj
deleted file mode 100644
index da4b3b578..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFRequestDTO_Roo_Json.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BulkLoadRegisterSDFRequestDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect BulkLoadRegisterSDFRequestDTO_Roo_Json {
-    
-    public static BulkLoadRegisterSDFRequestDTO BulkLoadRegisterSDFRequestDTO.fromJsonToBulkLoadRegisterSDFRequestDTO(String json) {
-        return new JSONDeserializer<BulkLoadRegisterSDFRequestDTO>()
-        .use(null, BulkLoadRegisterSDFRequestDTO.class).deserialize(json);
-    }
-    
-    public static String BulkLoadRegisterSDFRequestDTO.toJsonArray(Collection<BulkLoadRegisterSDFRequestDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String BulkLoadRegisterSDFRequestDTO.toJsonArray(Collection<BulkLoadRegisterSDFRequestDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<BulkLoadRegisterSDFRequestDTO> BulkLoadRegisterSDFRequestDTO.fromJsonArrayToBulkLoes(String json) {
-        return new JSONDeserializer<List<BulkLoadRegisterSDFRequestDTO>>()
-        .use("values", BulkLoadRegisterSDFRequestDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFRequestDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFRequestDTO_Roo_ToString.aj
deleted file mode 100644
index 3ff0ce86b..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFRequestDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BulkLoadRegisterSDFRequestDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect BulkLoadRegisterSDFRequestDTO_Roo_ToString {
-    
-    public String BulkLoadRegisterSDFRequestDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFResponseDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFResponseDTO.java
index 6e97bd402..b29b87a23 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFResponseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFResponseDTO.java
@@ -2,13 +2,16 @@
 
 import java.util.Collection;
 import java.util.Date;
+import java.util.List;
 import com.labsynch.labseer.dto.ValidationResponseDTO;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -37,4 +40,52 @@ public String toJson() {
         .include("reportFiles", "results").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
     }
     
+
+	public String getSummary() {
+        return this.summary;
+    }
+
+	public void setSummary(String summary) {
+        this.summary = summary;
+    }
+
+	public Collection<ValidationResponseDTO> getResults() {
+        return this.results;
+    }
+
+	public void setResults(Collection<ValidationResponseDTO> results) {
+        this.results = results;
+    }
+
+	public Collection<String> getReportFiles() {
+        return this.reportFiles;
+    }
+
+	public void setReportFiles(Collection<String> reportFiles) {
+        this.reportFiles = reportFiles;
+    }
+
+	public static BulkLoadRegisterSDFResponseDTO fromJsonToBulkLoadRegisterSDFResponseDTO(String json) {
+        return new JSONDeserializer<BulkLoadRegisterSDFResponseDTO>()
+        .use(null, BulkLoadRegisterSDFResponseDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<BulkLoadRegisterSDFResponseDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<BulkLoadRegisterSDFResponseDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<BulkLoadRegisterSDFResponseDTO> fromJsonArrayToBulkLoadRegisterSDFRespoes(String json) {
+        return new JSONDeserializer<List<BulkLoadRegisterSDFResponseDTO>>()
+        .use("values", BulkLoadRegisterSDFResponseDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFResponseDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFResponseDTO_Roo_JavaBean.aj
deleted file mode 100644
index 799b48d92..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFResponseDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,36 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BulkLoadRegisterSDFResponseDTO;
-import com.labsynch.labseer.dto.ValidationResponseDTO;
-import java.util.Collection;
-
-privileged aspect BulkLoadRegisterSDFResponseDTO_Roo_JavaBean {
-    
-    public String BulkLoadRegisterSDFResponseDTO.getSummary() {
-        return this.summary;
-    }
-    
-    public void BulkLoadRegisterSDFResponseDTO.setSummary(String summary) {
-        this.summary = summary;
-    }
-    
-    public Collection<ValidationResponseDTO> BulkLoadRegisterSDFResponseDTO.getResults() {
-        return this.results;
-    }
-    
-    public void BulkLoadRegisterSDFResponseDTO.setResults(Collection<ValidationResponseDTO> results) {
-        this.results = results;
-    }
-    
-    public Collection<String> BulkLoadRegisterSDFResponseDTO.getReportFiles() {
-        return this.reportFiles;
-    }
-    
-    public void BulkLoadRegisterSDFResponseDTO.setReportFiles(Collection<String> reportFiles) {
-        this.reportFiles = reportFiles;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFResponseDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFResponseDTO_Roo_Json.aj
deleted file mode 100644
index 57f3e5c97..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFResponseDTO_Roo_Json.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BulkLoadRegisterSDFResponseDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect BulkLoadRegisterSDFResponseDTO_Roo_Json {
-    
-    public static BulkLoadRegisterSDFResponseDTO BulkLoadRegisterSDFResponseDTO.fromJsonToBulkLoadRegisterSDFResponseDTO(String json) {
-        return new JSONDeserializer<BulkLoadRegisterSDFResponseDTO>()
-        .use(null, BulkLoadRegisterSDFResponseDTO.class).deserialize(json);
-    }
-    
-    public static String BulkLoadRegisterSDFResponseDTO.toJsonArray(Collection<BulkLoadRegisterSDFResponseDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String BulkLoadRegisterSDFResponseDTO.toJsonArray(Collection<BulkLoadRegisterSDFResponseDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<BulkLoadRegisterSDFResponseDTO> BulkLoadRegisterSDFResponseDTO.fromJsonArrayToBulkLoadRegisterSDFRespoes(String json) {
-        return new JSONDeserializer<List<BulkLoadRegisterSDFResponseDTO>>()
-        .use("values", BulkLoadRegisterSDFResponseDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFResponseDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFResponseDTO_Roo_ToString.aj
deleted file mode 100644
index af93f94ea..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFResponseDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BulkLoadRegisterSDFResponseDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect BulkLoadRegisterSDFResponseDTO_Roo_ToString {
-    
-    public String BulkLoadRegisterSDFResponseDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFPropertyRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFPropertyRequestDTO.java
index e2907f953..defcd5033 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFPropertyRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFPropertyRequestDTO.java
@@ -1,7 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -33,4 +37,78 @@ public BulkLoadSDFPropertyRequestDTO(String fileName, int numRecords, String tem
     	this.mappings = mappings;
     }
     
+
+	public String getFileName() {
+        return this.fileName;
+    }
+
+	public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+	public int getNumRecords() {
+        return this.numRecords;
+    }
+
+	public void setNumRecords(int numRecords) {
+        this.numRecords = numRecords;
+    }
+
+	public String getTemplateName() {
+        return this.templateName;
+    }
+
+	public void setTemplateName(String templateName) {
+        this.templateName = templateName;
+    }
+
+	public String getUserName() {
+        return this.userName;
+    }
+
+	public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+	public Collection<BulkLoadPropertyMappingDTO> getMappings() {
+        return this.mappings;
+    }
+
+	public void setMappings(Collection<BulkLoadPropertyMappingDTO> mappings) {
+        this.mappings = mappings;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static BulkLoadSDFPropertyRequestDTO fromJsonToBulkLoadSDFPropertyRequestDTO(String json) {
+        return new JSONDeserializer<BulkLoadSDFPropertyRequestDTO>()
+        .use(null, BulkLoadSDFPropertyRequestDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<BulkLoadSDFPropertyRequestDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<BulkLoadSDFPropertyRequestDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<BulkLoadSDFPropertyRequestDTO> fromJsonArrayToBulkLoadSDFProes(String json) {
+        return new JSONDeserializer<List<BulkLoadSDFPropertyRequestDTO>>()
+        .use("values", BulkLoadSDFPropertyRequestDTO.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFPropertyRequestDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFPropertyRequestDTO_Roo_JavaBean.aj
deleted file mode 100644
index bf99d68ee..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFPropertyRequestDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,52 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BulkLoadPropertyMappingDTO;
-import com.labsynch.labseer.dto.BulkLoadSDFPropertyRequestDTO;
-import java.util.Collection;
-
-privileged aspect BulkLoadSDFPropertyRequestDTO_Roo_JavaBean {
-    
-    public String BulkLoadSDFPropertyRequestDTO.getFileName() {
-        return this.fileName;
-    }
-    
-    public void BulkLoadSDFPropertyRequestDTO.setFileName(String fileName) {
-        this.fileName = fileName;
-    }
-    
-    public int BulkLoadSDFPropertyRequestDTO.getNumRecords() {
-        return this.numRecords;
-    }
-    
-    public void BulkLoadSDFPropertyRequestDTO.setNumRecords(int numRecords) {
-        this.numRecords = numRecords;
-    }
-    
-    public String BulkLoadSDFPropertyRequestDTO.getTemplateName() {
-        return this.templateName;
-    }
-    
-    public void BulkLoadSDFPropertyRequestDTO.setTemplateName(String templateName) {
-        this.templateName = templateName;
-    }
-    
-    public String BulkLoadSDFPropertyRequestDTO.getUserName() {
-        return this.userName;
-    }
-    
-    public void BulkLoadSDFPropertyRequestDTO.setUserName(String userName) {
-        this.userName = userName;
-    }
-    
-    public Collection<BulkLoadPropertyMappingDTO> BulkLoadSDFPropertyRequestDTO.getMappings() {
-        return this.mappings;
-    }
-    
-    public void BulkLoadSDFPropertyRequestDTO.setMappings(Collection<BulkLoadPropertyMappingDTO> mappings) {
-        this.mappings = mappings;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFPropertyRequestDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFPropertyRequestDTO_Roo_Json.aj
deleted file mode 100644
index d6eeffce9..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFPropertyRequestDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BulkLoadSDFPropertyRequestDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect BulkLoadSDFPropertyRequestDTO_Roo_Json {
-    
-    public String BulkLoadSDFPropertyRequestDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String BulkLoadSDFPropertyRequestDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static BulkLoadSDFPropertyRequestDTO BulkLoadSDFPropertyRequestDTO.fromJsonToBulkLoadSDFPropertyRequestDTO(String json) {
-        return new JSONDeserializer<BulkLoadSDFPropertyRequestDTO>()
-        .use(null, BulkLoadSDFPropertyRequestDTO.class).deserialize(json);
-    }
-    
-    public static String BulkLoadSDFPropertyRequestDTO.toJsonArray(Collection<BulkLoadSDFPropertyRequestDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String BulkLoadSDFPropertyRequestDTO.toJsonArray(Collection<BulkLoadSDFPropertyRequestDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<BulkLoadSDFPropertyRequestDTO> BulkLoadSDFPropertyRequestDTO.fromJsonArrayToBulkLoadSDFProes(String json) {
-        return new JSONDeserializer<List<BulkLoadSDFPropertyRequestDTO>>()
-        .use("values", BulkLoadSDFPropertyRequestDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFPropertyRequestDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFPropertyRequestDTO_Roo_ToString.aj
deleted file mode 100644
index 1cf9cc212..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFPropertyRequestDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BulkLoadSDFPropertyRequestDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect BulkLoadSDFPropertyRequestDTO_Roo_ToString {
-    
-    public String BulkLoadSDFPropertyRequestDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO.java
index b33a946ff..fad487191 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO.java
@@ -10,7 +10,8 @@
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import javax.persistence.NoResultException;
@@ -27,7 +28,7 @@
 
 import com.labsynch.labseer.service.ErrorMessage;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -48,4 +49,44 @@ public String toJson() {
         return new JSONSerializer()
         .include("chemists","projects").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
     }
+
+	public Collection<String> getChemists() {
+        return this.chemists;
+    }
+
+	public void setChemists(Collection<String> chemists) {
+        this.chemists = chemists;
+    }
+
+	public Collection<String> getProjects() {
+        return this.projects;
+    }
+
+	public void setProjects(Collection<String> projects) {
+        this.projects = projects;
+    }
+
+	public static BulkLoadSDFValidationPropertiesResponseDTO fromJsonToBulkLoadSDFValidationPropertiesResponseDTO(String json) {
+        return new JSONDeserializer<BulkLoadSDFValidationPropertiesResponseDTO>()
+        .use(null, BulkLoadSDFValidationPropertiesResponseDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<BulkLoadSDFValidationPropertiesResponseDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<BulkLoadSDFValidationPropertiesResponseDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<BulkLoadSDFValidationPropertiesResponseDTO> fromJsonArrayToBulkLoadSDFValidationPropertiesRespoes(String json) {
+        return new JSONDeserializer<List<BulkLoadSDFValidationPropertiesResponseDTO>>()
+        .use("values", BulkLoadSDFValidationPropertiesResponseDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO_Roo_JavaBean.aj
deleted file mode 100644
index 7b99eec7d..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,27 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BulkLoadSDFValidationPropertiesResponseDTO;
-import java.util.Collection;
-
-privileged aspect BulkLoadSDFValidationPropertiesResponseDTO_Roo_JavaBean {
-    
-    public Collection<String> BulkLoadSDFValidationPropertiesResponseDTO.getChemists() {
-        return this.chemists;
-    }
-    
-    public void BulkLoadSDFValidationPropertiesResponseDTO.setChemists(Collection<String> chemists) {
-        this.chemists = chemists;
-    }
-    
-    public Collection<String> BulkLoadSDFValidationPropertiesResponseDTO.getProjects() {
-        return this.projects;
-    }
-    
-    public void BulkLoadSDFValidationPropertiesResponseDTO.setProjects(Collection<String> projects) {
-        this.projects = projects;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO_Roo_Json.aj
deleted file mode 100644
index 1654be691..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO_Roo_Json.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BulkLoadSDFValidationPropertiesResponseDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect BulkLoadSDFValidationPropertiesResponseDTO_Roo_Json {
-    
-    public static BulkLoadSDFValidationPropertiesResponseDTO BulkLoadSDFValidationPropertiesResponseDTO.fromJsonToBulkLoadSDFValidationPropertiesResponseDTO(String json) {
-        return new JSONDeserializer<BulkLoadSDFValidationPropertiesResponseDTO>()
-        .use(null, BulkLoadSDFValidationPropertiesResponseDTO.class).deserialize(json);
-    }
-    
-    public static String BulkLoadSDFValidationPropertiesResponseDTO.toJsonArray(Collection<BulkLoadSDFValidationPropertiesResponseDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String BulkLoadSDFValidationPropertiesResponseDTO.toJsonArray(Collection<BulkLoadSDFValidationPropertiesResponseDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<BulkLoadSDFValidationPropertiesResponseDTO> BulkLoadSDFValidationPropertiesResponseDTO.fromJsonArrayToBulkLoadSDFValidationPropertiesRespoes(String json) {
-        return new JSONDeserializer<List<BulkLoadSDFValidationPropertiesResponseDTO>>()
-        .use("values", BulkLoadSDFValidationPropertiesResponseDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO_Roo_ToString.aj
deleted file mode 100644
index aa73aa481..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BulkLoadSDFValidationPropertiesResponseDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect BulkLoadSDFValidationPropertiesResponseDTO_Roo_ToString {
-    
-    public String BulkLoadSDFValidationPropertiesResponseDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO.java
index ca21c7333..35d00e731 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO.java
@@ -10,7 +10,8 @@
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import javax.persistence.NoResultException;
@@ -27,7 +28,7 @@
 
 import com.labsynch.labseer.service.ErrorMessage;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -46,4 +47,70 @@ public class BulkLoadTemplateDTO {
     public BulkLoadTemplateDTO(){
     }
 
+
+	public String getTemplateName() {
+        return this.templateName;
+    }
+
+	public void setTemplateName(String templateName) {
+        this.templateName = templateName;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public Collection<BulkLoadPropertyMappingDTO> getMappings() {
+        return this.mappings;
+    }
+
+	public void setMappings(Collection<BulkLoadPropertyMappingDTO> mappings) {
+        this.mappings = mappings;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static BulkLoadTemplateDTO fromJsonToBulkLoadTemplateDTO(String json) {
+        return new JSONDeserializer<BulkLoadTemplateDTO>()
+        .use(null, BulkLoadTemplateDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<BulkLoadTemplateDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<BulkLoadTemplateDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<BulkLoadTemplateDTO> fromJsonArrayToBulkLoes(String json) {
+        return new JSONDeserializer<List<BulkLoadTemplateDTO>>()
+        .use("values", BulkLoadTemplateDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO_Roo_JavaBean.aj
deleted file mode 100644
index a19abd035..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,44 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BulkLoadPropertyMappingDTO;
-import com.labsynch.labseer.dto.BulkLoadTemplateDTO;
-import java.util.Collection;
-
-privileged aspect BulkLoadTemplateDTO_Roo_JavaBean {
-    
-    public String BulkLoadTemplateDTO.getTemplateName() {
-        return this.templateName;
-    }
-    
-    public void BulkLoadTemplateDTO.setTemplateName(String templateName) {
-        this.templateName = templateName;
-    }
-    
-    public String BulkLoadTemplateDTO.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void BulkLoadTemplateDTO.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public boolean BulkLoadTemplateDTO.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void BulkLoadTemplateDTO.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public Collection<BulkLoadPropertyMappingDTO> BulkLoadTemplateDTO.getMappings() {
-        return this.mappings;
-    }
-    
-    public void BulkLoadTemplateDTO.setMappings(Collection<BulkLoadPropertyMappingDTO> mappings) {
-        this.mappings = mappings;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO_Roo_Json.aj
deleted file mode 100644
index cb7ae0bef..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BulkLoadTemplateDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect BulkLoadTemplateDTO_Roo_Json {
-    
-    public String BulkLoadTemplateDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String BulkLoadTemplateDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static BulkLoadTemplateDTO BulkLoadTemplateDTO.fromJsonToBulkLoadTemplateDTO(String json) {
-        return new JSONDeserializer<BulkLoadTemplateDTO>()
-        .use(null, BulkLoadTemplateDTO.class).deserialize(json);
-    }
-    
-    public static String BulkLoadTemplateDTO.toJsonArray(Collection<BulkLoadTemplateDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String BulkLoadTemplateDTO.toJsonArray(Collection<BulkLoadTemplateDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<BulkLoadTemplateDTO> BulkLoadTemplateDTO.fromJsonArrayToBulkLoes(String json) {
-        return new JSONDeserializer<List<BulkLoadTemplateDTO>>()
-        .use("values", BulkLoadTemplateDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO_Roo_ToString.aj
deleted file mode 100644
index 73df826e6..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BulkLoadTemplateDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect BulkLoadTemplateDTO_Roo_ToString {
-    
-    public String BulkLoadTemplateDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkTransferPart1DTO.java b/src/main/java/com/labsynch/labseer/dto/BulkTransferPart1DTO.java
index 854142a63..b0b216aa9 100755
--- a/src/main/java/com/labsynch/labseer/dto/BulkTransferPart1DTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkTransferPart1DTO.java
@@ -1,7 +1,12 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -36,4 +41,166 @@ public class BulkTransferPart1DTO {
 //    Protocol,Is New Plate,Possible Transfer Error
 
 
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static BulkTransferPart1DTO fromJsonToBulkTransferPart1DTO(String json) {
+        return new JSONDeserializer<BulkTransferPart1DTO>()
+        .use(null, BulkTransferPart1DTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<BulkTransferPart1DTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<BulkTransferPart1DTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<BulkTransferPart1DTO> fromJsonArrayToBulkTransferPart1DTO(String json) {
+        return new JSONDeserializer<List<BulkTransferPart1DTO>>()
+        .use("values", BulkTransferPart1DTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getSourceBarcode() {
+        return this.sourceBarcode;
+    }
+
+	public void setSourceBarcode(String sourceBarcode) {
+        this.sourceBarcode = sourceBarcode;
+    }
+
+	public String getSourceWell() {
+        return this.sourceWell;
+    }
+
+	public void setSourceWell(String sourceWell) {
+        this.sourceWell = sourceWell;
+    }
+
+	public String getDestinationBarcode() {
+        return this.destinationBarcode;
+    }
+
+	public void setDestinationBarcode(String destinationBarcode) {
+        this.destinationBarcode = destinationBarcode;
+    }
+
+	public String getDestinationWell() {
+        return this.destinationWell;
+    }
+
+	public void setDestinationWell(String destinationWell) {
+        this.destinationWell = destinationWell;
+    }
+
+	public String getDestinationPlateSize() {
+        return this.destinationPlateSize;
+    }
+
+	public void setDestinationPlateSize(String destinationPlateSize) {
+        this.destinationPlateSize = destinationPlateSize;
+    }
+
+	public String getAmountTransferred() {
+        return this.amountTransferred;
+    }
+
+	public void setAmountTransferred(String amountTransferred) {
+        this.amountTransferred = amountTransferred;
+    }
+
+	public String getAmountUnits() {
+        return this.amountUnits;
+    }
+
+	public void setAmountUnits(String amountUnits) {
+        this.amountUnits = amountUnits;
+    }
+
+	public String getFinalConcentration() {
+        return this.finalConcentration;
+    }
+
+	public void setFinalConcentration(String finalConcentration) {
+        this.finalConcentration = finalConcentration;
+    }
+
+	public String getConcUnits() {
+        return this.concUnits;
+    }
+
+	public void setConcUnits(String concUnits) {
+        this.concUnits = concUnits;
+    }
+
+	public String getFinalVolume() {
+        return this.finalVolume;
+    }
+
+	public void setFinalVolume(String finalVolume) {
+        this.finalVolume = finalVolume;
+    }
+
+	public String getVolumeUnits() {
+        return this.volumeUnits;
+    }
+
+	public void setVolumeUnits(String volumeUnits) {
+        this.volumeUnits = volumeUnits;
+    }
+
+	public String getLiquidType() {
+        return this.liquidType;
+    }
+
+	public void setLiquidType(String liquidType) {
+        this.liquidType = liquidType;
+    }
+
+	public Date getDateTime() {
+        return this.dateTime;
+    }
+
+	public void setDateTime(Date dateTime) {
+        this.dateTime = dateTime;
+    }
+
+	public String getTransferProtocol() {
+        return this.transferProtocol;
+    }
+
+	public void setTransferProtocol(String transferProtocol) {
+        this.transferProtocol = transferProtocol;
+    }
+
+	public boolean isIsNewPlate() {
+        return this.isNewPlate;
+    }
+
+	public void setIsNewPlate(boolean isNewPlate) {
+        this.isNewPlate = isNewPlate;
+    }
+
+	public String getPossibleTransferError() {
+        return this.possibleTransferError;
+    }
+
+	public void setPossibleTransferError(String possibleTransferError) {
+        this.possibleTransferError = possibleTransferError;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkTransferPart1DTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/BulkTransferPart1DTO_Roo_JavaBean.aj
deleted file mode 100755
index c52d639db..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BulkTransferPart1DTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,139 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BulkTransferPart1DTO;
-import java.util.Date;
-
-privileged aspect BulkTransferPart1DTO_Roo_JavaBean {
-    
-    public String BulkTransferPart1DTO.getSourceBarcode() {
-        return this.sourceBarcode;
-    }
-    
-    public void BulkTransferPart1DTO.setSourceBarcode(String sourceBarcode) {
-        this.sourceBarcode = sourceBarcode;
-    }
-    
-    public String BulkTransferPart1DTO.getSourceWell() {
-        return this.sourceWell;
-    }
-    
-    public void BulkTransferPart1DTO.setSourceWell(String sourceWell) {
-        this.sourceWell = sourceWell;
-    }
-    
-    public String BulkTransferPart1DTO.getDestinationBarcode() {
-        return this.destinationBarcode;
-    }
-    
-    public void BulkTransferPart1DTO.setDestinationBarcode(String destinationBarcode) {
-        this.destinationBarcode = destinationBarcode;
-    }
-    
-    public String BulkTransferPart1DTO.getDestinationWell() {
-        return this.destinationWell;
-    }
-    
-    public void BulkTransferPart1DTO.setDestinationWell(String destinationWell) {
-        this.destinationWell = destinationWell;
-    }
-    
-    public String BulkTransferPart1DTO.getDestinationPlateSize() {
-        return this.destinationPlateSize;
-    }
-    
-    public void BulkTransferPart1DTO.setDestinationPlateSize(String destinationPlateSize) {
-        this.destinationPlateSize = destinationPlateSize;
-    }
-    
-    public String BulkTransferPart1DTO.getAmountTransferred() {
-        return this.amountTransferred;
-    }
-    
-    public void BulkTransferPart1DTO.setAmountTransferred(String amountTransferred) {
-        this.amountTransferred = amountTransferred;
-    }
-    
-    public String BulkTransferPart1DTO.getAmountUnits() {
-        return this.amountUnits;
-    }
-    
-    public void BulkTransferPart1DTO.setAmountUnits(String amountUnits) {
-        this.amountUnits = amountUnits;
-    }
-    
-    public String BulkTransferPart1DTO.getFinalConcentration() {
-        return this.finalConcentration;
-    }
-    
-    public void BulkTransferPart1DTO.setFinalConcentration(String finalConcentration) {
-        this.finalConcentration = finalConcentration;
-    }
-    
-    public String BulkTransferPart1DTO.getConcUnits() {
-        return this.concUnits;
-    }
-    
-    public void BulkTransferPart1DTO.setConcUnits(String concUnits) {
-        this.concUnits = concUnits;
-    }
-    
-    public String BulkTransferPart1DTO.getFinalVolume() {
-        return this.finalVolume;
-    }
-    
-    public void BulkTransferPart1DTO.setFinalVolume(String finalVolume) {
-        this.finalVolume = finalVolume;
-    }
-    
-    public String BulkTransferPart1DTO.getVolumeUnits() {
-        return this.volumeUnits;
-    }
-    
-    public void BulkTransferPart1DTO.setVolumeUnits(String volumeUnits) {
-        this.volumeUnits = volumeUnits;
-    }
-    
-    public String BulkTransferPart1DTO.getLiquidType() {
-        return this.liquidType;
-    }
-    
-    public void BulkTransferPart1DTO.setLiquidType(String liquidType) {
-        this.liquidType = liquidType;
-    }
-    
-    public Date BulkTransferPart1DTO.getDateTime() {
-        return this.dateTime;
-    }
-    
-    public void BulkTransferPart1DTO.setDateTime(Date dateTime) {
-        this.dateTime = dateTime;
-    }
-    
-    public String BulkTransferPart1DTO.getTransferProtocol() {
-        return this.transferProtocol;
-    }
-    
-    public void BulkTransferPart1DTO.setTransferProtocol(String transferProtocol) {
-        this.transferProtocol = transferProtocol;
-    }
-    
-    public boolean BulkTransferPart1DTO.isIsNewPlate() {
-        return this.isNewPlate;
-    }
-    
-    public void BulkTransferPart1DTO.setIsNewPlate(boolean isNewPlate) {
-        this.isNewPlate = isNewPlate;
-    }
-    
-    public String BulkTransferPart1DTO.getPossibleTransferError() {
-        return this.possibleTransferError;
-    }
-    
-    public void BulkTransferPart1DTO.setPossibleTransferError(String possibleTransferError) {
-        this.possibleTransferError = possibleTransferError;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkTransferPart1DTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/BulkTransferPart1DTO_Roo_Json.aj
deleted file mode 100755
index 0731140aa..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BulkTransferPart1DTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BulkTransferPart1DTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect BulkTransferPart1DTO_Roo_Json {
-    
-    public String BulkTransferPart1DTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String BulkTransferPart1DTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static BulkTransferPart1DTO BulkTransferPart1DTO.fromJsonToBulkTransferPart1DTO(String json) {
-        return new JSONDeserializer<BulkTransferPart1DTO>()
-        .use(null, BulkTransferPart1DTO.class).deserialize(json);
-    }
-    
-    public static String BulkTransferPart1DTO.toJsonArray(Collection<BulkTransferPart1DTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String BulkTransferPart1DTO.toJsonArray(Collection<BulkTransferPart1DTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<BulkTransferPart1DTO> BulkTransferPart1DTO.fromJsonArrayToBulkTransferPart1DTO(String json) {
-        return new JSONDeserializer<List<BulkTransferPart1DTO>>()
-        .use("values", BulkTransferPart1DTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkTransferPart1DTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/BulkTransferPart1DTO_Roo_ToString.aj
deleted file mode 100755
index 23e6faca9..000000000
--- a/src/main/java/com/labsynch/labseer/dto/BulkTransferPart1DTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.BulkTransferPart1DTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect BulkTransferPart1DTO_Roo_ToString {
-    
-    public String BulkTransferPart1DTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ChangePasswordDTO.java b/src/main/java/com/labsynch/labseer/dto/ChangePasswordDTO.java
index f8b923ba2..af258f963 100644
--- a/src/main/java/com/labsynch/labseer/dto/ChangePasswordDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ChangePasswordDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -19,6 +25,72 @@ public class ChangePasswordDTO {
 	
 	public ChangePasswordDTO(){
 	}
+
+	public String getUsername() {
+        return this.username;
+    }
+
+	public void setUsername(String username) {
+        this.username = username;
+    }
+
+	public String getOldPassword() {
+        return this.oldPassword;
+    }
+
+	public void setOldPassword(String oldPassword) {
+        this.oldPassword = oldPassword;
+    }
+
+	public String getNewPassword() {
+        return this.newPassword;
+    }
+
+	public void setNewPassword(String newPassword) {
+        this.newPassword = newPassword;
+    }
+
+	public String getNewPasswordAgain() {
+        return this.newPasswordAgain;
+    }
+
+	public void setNewPasswordAgain(String newPasswordAgain) {
+        this.newPasswordAgain = newPasswordAgain;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ChangePasswordDTO fromJsonToChangePasswordDTO(String json) {
+        return new JSONDeserializer<ChangePasswordDTO>()
+        .use(null, ChangePasswordDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ChangePasswordDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ChangePasswordDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ChangePasswordDTO> fromJsonArrayToChangePasswoes(String json) {
+        return new JSONDeserializer<List<ChangePasswordDTO>>()
+        .use("values", ChangePasswordDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ChangePasswordDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ChangePasswordDTO_Roo_JavaBean.aj
deleted file mode 100644
index a085ddd14..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ChangePasswordDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,42 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ChangePasswordDTO;
-
-privileged aspect ChangePasswordDTO_Roo_JavaBean {
-    
-    public String ChangePasswordDTO.getUsername() {
-        return this.username;
-    }
-    
-    public void ChangePasswordDTO.setUsername(String username) {
-        this.username = username;
-    }
-    
-    public String ChangePasswordDTO.getOldPassword() {
-        return this.oldPassword;
-    }
-    
-    public void ChangePasswordDTO.setOldPassword(String oldPassword) {
-        this.oldPassword = oldPassword;
-    }
-    
-    public String ChangePasswordDTO.getNewPassword() {
-        return this.newPassword;
-    }
-    
-    public void ChangePasswordDTO.setNewPassword(String newPassword) {
-        this.newPassword = newPassword;
-    }
-    
-    public String ChangePasswordDTO.getNewPasswordAgain() {
-        return this.newPasswordAgain;
-    }
-    
-    public void ChangePasswordDTO.setNewPasswordAgain(String newPasswordAgain) {
-        this.newPasswordAgain = newPasswordAgain;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ChangePasswordDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ChangePasswordDTO_Roo_Json.aj
deleted file mode 100644
index 6749171ed..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ChangePasswordDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ChangePasswordDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ChangePasswordDTO_Roo_Json {
-    
-    public String ChangePasswordDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ChangePasswordDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ChangePasswordDTO ChangePasswordDTO.fromJsonToChangePasswordDTO(String json) {
-        return new JSONDeserializer<ChangePasswordDTO>()
-        .use(null, ChangePasswordDTO.class).deserialize(json);
-    }
-    
-    public static String ChangePasswordDTO.toJsonArray(Collection<ChangePasswordDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ChangePasswordDTO.toJsonArray(Collection<ChangePasswordDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ChangePasswordDTO> ChangePasswordDTO.fromJsonArrayToChangePasswoes(String json) {
-        return new JSONDeserializer<List<ChangePasswordDTO>>()
-        .use("values", ChangePasswordDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ChangePasswordDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ChangePasswordDTO_Roo_ToString.aj
deleted file mode 100644
index 380e1a544..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ChangePasswordDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ChangePasswordDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ChangePasswordDTO_Roo_ToString {
-    
-    public String ChangePasswordDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CleanMolOptionsDTO.java b/src/main/java/com/labsynch/labseer/dto/CleanMolOptionsDTO.java
index 365404140..2a654a825 100644
--- a/src/main/java/com/labsynch/labseer/dto/CleanMolOptionsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CleanMolOptionsDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -14,4 +20,54 @@ public class CleanMolOptionsDTO {
 	private String opts;
 	
 	
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static CleanMolOptionsDTO fromJsonToCleanMolOptionsDTO(String json) {
+        return new JSONDeserializer<CleanMolOptionsDTO>()
+        .use(null, CleanMolOptionsDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<CleanMolOptionsDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<CleanMolOptionsDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<CleanMolOptionsDTO> fromJsonArrayToCleanMolOptioes(String json) {
+        return new JSONDeserializer<List<CleanMolOptionsDTO>>()
+        .use("values", CleanMolOptionsDTO.class).deserialize(json);
+    }
+
+	public int getDim() {
+        return this.dim;
+    }
+
+	public void setDim(int dim) {
+        this.dim = dim;
+    }
+
+	public String getOpts() {
+        return this.opts;
+    }
+
+	public void setOpts(String opts) {
+        this.opts = opts;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/CleanMolOptionsDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/CleanMolOptionsDTO_Roo_JavaBean.aj
deleted file mode 100644
index 4fa631138..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CleanMolOptionsDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CleanMolOptionsDTO;
-
-privileged aspect CleanMolOptionsDTO_Roo_JavaBean {
-    
-    public int CleanMolOptionsDTO.getDim() {
-        return this.dim;
-    }
-    
-    public void CleanMolOptionsDTO.setDim(int dim) {
-        this.dim = dim;
-    }
-    
-    public String CleanMolOptionsDTO.getOpts() {
-        return this.opts;
-    }
-    
-    public void CleanMolOptionsDTO.setOpts(String opts) {
-        this.opts = opts;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CleanMolOptionsDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/CleanMolOptionsDTO_Roo_Json.aj
deleted file mode 100644
index 27d0f3c75..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CleanMolOptionsDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CleanMolOptionsDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect CleanMolOptionsDTO_Roo_Json {
-    
-    public String CleanMolOptionsDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String CleanMolOptionsDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static CleanMolOptionsDTO CleanMolOptionsDTO.fromJsonToCleanMolOptionsDTO(String json) {
-        return new JSONDeserializer<CleanMolOptionsDTO>()
-        .use(null, CleanMolOptionsDTO.class).deserialize(json);
-    }
-    
-    public static String CleanMolOptionsDTO.toJsonArray(Collection<CleanMolOptionsDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String CleanMolOptionsDTO.toJsonArray(Collection<CleanMolOptionsDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<CleanMolOptionsDTO> CleanMolOptionsDTO.fromJsonArrayToCleanMolOptioes(String json) {
-        return new JSONDeserializer<List<CleanMolOptionsDTO>>()
-        .use("values", CleanMolOptionsDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CleanMolOptionsDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/CleanMolOptionsDTO_Roo_ToString.aj
deleted file mode 100644
index a8b9d76ec..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CleanMolOptionsDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CleanMolOptionsDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect CleanMolOptionsDTO_Roo_ToString {
-    
-    public String CleanMolOptionsDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTO.java
index 8a09e885a..51ec84d9c 100644
--- a/src/main/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTO.java
@@ -3,11 +3,13 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 
 import javax.persistence.EntityManager;
 import javax.persistence.TypedQuery;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.roo.addon.javabean.RooJavaBean;
@@ -19,7 +21,7 @@
 import com.labsynch.labseer.domain.SubjectValue;
 import com.labsynch.labseer.domain.TreatmentGroupValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -377,6 +379,62 @@ private void dedupeLinkedExperiments() {
 		logger.debug("Deduped size: "+linkedExperiments.size());
 	}
 
+
+	public Collection<String> getBatchCodes() {
+        return this.batchCodes;
+    }
+
+	public void setBatchCodes(Collection<String> batchCodes) {
+        this.batchCodes = batchCodes;
+    }
+
+	public Boolean getLinkedDataExists() {
+        return this.linkedDataExists;
+    }
+
+	public void setLinkedDataExists(Boolean linkedDataExists) {
+        this.linkedDataExists = linkedDataExists;
+    }
+
+	public Collection<CodeTableDTO> getLinkedExperiments() {
+        return this.linkedExperiments;
+    }
+
+	public void setLinkedExperiments(Collection<CodeTableDTO> linkedExperiments) {
+        this.linkedExperiments = linkedExperiments;
+    }
+
+	public Collection<ErrorMessageDTO> getErrors() {
+        return this.errors;
+    }
+
+	public void setErrors(Collection<ErrorMessageDTO> errors) {
+        this.errors = errors;
+    }
+
+	public static CmpdRegBatchCodeDTO fromJsonToCmpdRegBatchCodeDTO(String json) {
+        return new JSONDeserializer<CmpdRegBatchCodeDTO>()
+        .use(null, CmpdRegBatchCodeDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<CmpdRegBatchCodeDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<CmpdRegBatchCodeDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<CmpdRegBatchCodeDTO> fromJsonArrayToCmpdRegBatchCoes(String json) {
+        return new JSONDeserializer<List<CmpdRegBatchCodeDTO>>()
+        .use("values", CmpdRegBatchCodeDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTO_Roo_JavaBean.aj
deleted file mode 100644
index 2c6a5330b..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CmpdRegBatchCodeDTO;
-import com.labsynch.labseer.dto.CodeTableDTO;
-import com.labsynch.labseer.dto.ErrorMessageDTO;
-import java.util.Collection;
-
-privileged aspect CmpdRegBatchCodeDTO_Roo_JavaBean {
-    
-    public Collection<String> CmpdRegBatchCodeDTO.getBatchCodes() {
-        return this.batchCodes;
-    }
-    
-    public void CmpdRegBatchCodeDTO.setBatchCodes(Collection<String> batchCodes) {
-        this.batchCodes = batchCodes;
-    }
-    
-    public Boolean CmpdRegBatchCodeDTO.getLinkedDataExists() {
-        return this.linkedDataExists;
-    }
-    
-    public void CmpdRegBatchCodeDTO.setLinkedDataExists(Boolean linkedDataExists) {
-        this.linkedDataExists = linkedDataExists;
-    }
-    
-    public Collection<CodeTableDTO> CmpdRegBatchCodeDTO.getLinkedExperiments() {
-        return this.linkedExperiments;
-    }
-    
-    public void CmpdRegBatchCodeDTO.setLinkedExperiments(Collection<CodeTableDTO> linkedExperiments) {
-        this.linkedExperiments = linkedExperiments;
-    }
-    
-    public Collection<ErrorMessageDTO> CmpdRegBatchCodeDTO.getErrors() {
-        return this.errors;
-    }
-    
-    public void CmpdRegBatchCodeDTO.setErrors(Collection<ErrorMessageDTO> errors) {
-        this.errors = errors;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTO_Roo_Json.aj
deleted file mode 100644
index 29825f55e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTO_Roo_Json.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CmpdRegBatchCodeDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect CmpdRegBatchCodeDTO_Roo_Json {
-    
-    public static CmpdRegBatchCodeDTO CmpdRegBatchCodeDTO.fromJsonToCmpdRegBatchCodeDTO(String json) {
-        return new JSONDeserializer<CmpdRegBatchCodeDTO>()
-        .use(null, CmpdRegBatchCodeDTO.class).deserialize(json);
-    }
-    
-    public static String CmpdRegBatchCodeDTO.toJsonArray(Collection<CmpdRegBatchCodeDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String CmpdRegBatchCodeDTO.toJsonArray(Collection<CmpdRegBatchCodeDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<CmpdRegBatchCodeDTO> CmpdRegBatchCodeDTO.fromJsonArrayToCmpdRegBatchCoes(String json) {
-        return new JSONDeserializer<List<CmpdRegBatchCodeDTO>>()
-        .use("values", CmpdRegBatchCodeDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTO_Roo_ToString.aj
deleted file mode 100644
index 33a29237e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CmpdRegBatchCodeDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect CmpdRegBatchCodeDTO_Roo_ToString {
-    
-    public String CmpdRegBatchCodeDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CmpdRegStructureSearchDTO.java b/src/main/java/com/labsynch/labseer/dto/CmpdRegStructureSearchDTO.java
index 4c0eda906..71a592dbf 100755
--- a/src/main/java/com/labsynch/labseer/dto/CmpdRegStructureSearchDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CmpdRegStructureSearchDTO.java
@@ -1,7 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.List;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -22,4 +26,78 @@ public class CmpdRegStructureSearchDTO{
   
 	private Integer maxResults;
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static CmpdRegStructureSearchDTO fromJsonToCmpdRegStructureSearchDTO(String json) {
+        return new JSONDeserializer<CmpdRegStructureSearchDTO>()
+        .use(null, CmpdRegStructureSearchDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<CmpdRegStructureSearchDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<CmpdRegStructureSearchDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<CmpdRegStructureSearchDTO> fromJsonArrayToCmpdRegStructureSearchDTO(String json) {
+        return new JSONDeserializer<List<CmpdRegStructureSearchDTO>>()
+        .use("values", CmpdRegStructureSearchDTO.class).deserialize(json);
+    }
+
+	public List<String> getProjects() {
+        return this.projects;
+    }
+
+	public void setProjects(List<String> projects) {
+        this.projects = projects;
+    }
+
+	public String getSearchType() {
+        return this.searchType;
+    }
+
+	public void setSearchType(String searchType) {
+        this.searchType = searchType;
+    }
+
+	public Float getPercentSimilarity() {
+        return this.percentSimilarity;
+    }
+
+	public void setPercentSimilarity(Float percentSimilarity) {
+        this.percentSimilarity = percentSimilarity;
+    }
+
+	public String getMolStructure() {
+        return this.molStructure;
+    }
+
+	public void setMolStructure(String molStructure) {
+        this.molStructure = molStructure;
+    }
+
+	public Integer getMaxResults() {
+        return this.maxResults;
+    }
+
+	public void setMaxResults(Integer maxResults) {
+        this.maxResults = maxResults;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/CmpdRegStructureSearchDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/CmpdRegStructureSearchDTO_Roo_JavaBean.aj
deleted file mode 100644
index a681c4a3e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CmpdRegStructureSearchDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,51 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CmpdRegStructureSearchDTO;
-import java.util.List;
-
-privileged aspect CmpdRegStructureSearchDTO_Roo_JavaBean {
-    
-    public List<String> CmpdRegStructureSearchDTO.getProjects() {
-        return this.projects;
-    }
-    
-    public void CmpdRegStructureSearchDTO.setProjects(List<String> projects) {
-        this.projects = projects;
-    }
-    
-    public String CmpdRegStructureSearchDTO.getSearchType() {
-        return this.searchType;
-    }
-    
-    public void CmpdRegStructureSearchDTO.setSearchType(String searchType) {
-        this.searchType = searchType;
-    }
-    
-    public Float CmpdRegStructureSearchDTO.getPercentSimilarity() {
-        return this.percentSimilarity;
-    }
-    
-    public void CmpdRegStructureSearchDTO.setPercentSimilarity(Float percentSimilarity) {
-        this.percentSimilarity = percentSimilarity;
-    }
-    
-    public String CmpdRegStructureSearchDTO.getMolStructure() {
-        return this.molStructure;
-    }
-    
-    public void CmpdRegStructureSearchDTO.setMolStructure(String molStructure) {
-        this.molStructure = molStructure;
-    }
-    
-    public Integer CmpdRegStructureSearchDTO.getMaxResults() {
-        return this.maxResults;
-    }
-    
-    public void CmpdRegStructureSearchDTO.setMaxResults(Integer maxResults) {
-        this.maxResults = maxResults;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CmpdRegStructureSearchDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/CmpdRegStructureSearchDTO_Roo_Json.aj
deleted file mode 100644
index 10974caea..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CmpdRegStructureSearchDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CmpdRegStructureSearchDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect CmpdRegStructureSearchDTO_Roo_Json {
-    
-    public String CmpdRegStructureSearchDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String CmpdRegStructureSearchDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static CmpdRegStructureSearchDTO CmpdRegStructureSearchDTO.fromJsonToCmpdRegStructureSearchDTO(String json) {
-        return new JSONDeserializer<CmpdRegStructureSearchDTO>()
-        .use(null, CmpdRegStructureSearchDTO.class).deserialize(json);
-    }
-    
-    public static String CmpdRegStructureSearchDTO.toJsonArray(Collection<CmpdRegStructureSearchDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String CmpdRegStructureSearchDTO.toJsonArray(Collection<CmpdRegStructureSearchDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<CmpdRegStructureSearchDTO> CmpdRegStructureSearchDTO.fromJsonArrayToCmpdRegStructureSearchDTO(String json) {
-        return new JSONDeserializer<List<CmpdRegStructureSearchDTO>>()
-        .use("values", CmpdRegStructureSearchDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CmpdRegStructureSearchDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/CmpdRegStructureSearchDTO_Roo_ToString.aj
deleted file mode 100644
index d1a48c745..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CmpdRegStructureSearchDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CmpdRegStructureSearchDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect CmpdRegStructureSearchDTO_Roo_ToString {
-    
-    public String CmpdRegStructureSearchDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeLabelDTO.java b/src/main/java/com/labsynch/labseer/dto/CodeLabelDTO.java
index 3017a07e9..464f53b29 100644
--- a/src/main/java/com/labsynch/labseer/dto/CodeLabelDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CodeLabelDTO.java
@@ -2,13 +2,14 @@
 
 import java.util.Collection;
 import java.util.List;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -47,6 +48,52 @@ public static String toJsonArray(Collection<CodeLabelDTO> collection) {
     }
 	
 
+
+	public List<String> getFoundCodeNames() {
+        return this.foundCodeNames;
+    }
+
+	public void setFoundCodeNames(List<String> foundCodeNames) {
+        this.foundCodeNames = foundCodeNames;
+    }
+
+	public String getLevel() {
+        return this.level;
+    }
+
+	public void setLevel(String level) {
+        this.level = level;
+    }
+
+	public String getMessage() {
+        return this.message;
+    }
+
+	public void setMessage(String message) {
+        this.message = message;
+    }
+
+	public String getRequestLabel() {
+        return this.requestLabel;
+    }
+
+	public void setRequestLabel(String requestLabel) {
+        this.requestLabel = requestLabel;
+    }
+
+	public static CodeLabelDTO fromJsonToCodeLabelDTO(String json) {
+        return new JSONDeserializer<CodeLabelDTO>()
+        .use(null, CodeLabelDTO.class).deserialize(json);
+    }
+
+	public static Collection<CodeLabelDTO> fromJsonArrayToCoes(String json) {
+        return new JSONDeserializer<List<CodeLabelDTO>>()
+        .use("values", CodeLabelDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeLabelDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/CodeLabelDTO_Roo_JavaBean.aj
deleted file mode 100644
index 8ad89bf83..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CodeLabelDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CodeLabelDTO;
-import java.util.List;
-
-privileged aspect CodeLabelDTO_Roo_JavaBean {
-    
-    public List<String> CodeLabelDTO.getFoundCodeNames() {
-        return this.foundCodeNames;
-    }
-    
-    public void CodeLabelDTO.setFoundCodeNames(List<String> foundCodeNames) {
-        this.foundCodeNames = foundCodeNames;
-    }
-    
-    public String CodeLabelDTO.getLevel() {
-        return this.level;
-    }
-    
-    public void CodeLabelDTO.setLevel(String level) {
-        this.level = level;
-    }
-    
-    public String CodeLabelDTO.getMessage() {
-        return this.message;
-    }
-    
-    public void CodeLabelDTO.setMessage(String message) {
-        this.message = message;
-    }
-    
-    public String CodeLabelDTO.getRequestLabel() {
-        return this.requestLabel;
-    }
-    
-    public void CodeLabelDTO.setRequestLabel(String requestLabel) {
-        this.requestLabel = requestLabel;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeLabelDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/CodeLabelDTO_Roo_Json.aj
deleted file mode 100644
index 79c0cc6d9..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CodeLabelDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CodeLabelDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect CodeLabelDTO_Roo_Json {
-    
-    public static CodeLabelDTO CodeLabelDTO.fromJsonToCodeLabelDTO(String json) {
-        return new JSONDeserializer<CodeLabelDTO>()
-        .use(null, CodeLabelDTO.class).deserialize(json);
-    }
-    
-    public static Collection<CodeLabelDTO> CodeLabelDTO.fromJsonArrayToCoes(String json) {
-        return new JSONDeserializer<List<CodeLabelDTO>>()
-        .use("values", CodeLabelDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeLabelDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/CodeLabelDTO_Roo_ToString.aj
deleted file mode 100644
index cda1abf41..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CodeLabelDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CodeLabelDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect CodeLabelDTO_Roo_ToString {
-    
-    public String CodeLabelDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeNameQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/CodeNameQueryDTO.java
index f2d3047cd..87c2d471d 100644
--- a/src/main/java/com/labsynch/labseer/dto/CodeNameQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CodeNameQueryDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -15,4 +21,54 @@ public class CodeNameQueryDTO {
 	public CodeNameQueryDTO(){
 		
 	}
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getCodeName() {
+        return this.codeName;
+    }
+
+	public void setCodeName(String codeName) {
+        this.codeName = codeName;
+    }
+
+	public String getOperator() {
+        return this.operator;
+    }
+
+	public void setOperator(String operator) {
+        this.operator = operator;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static CodeNameQueryDTO fromJsonToCodeNameQueryDTO(String json) {
+        return new JSONDeserializer<CodeNameQueryDTO>()
+        .use(null, CodeNameQueryDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<CodeNameQueryDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<CodeNameQueryDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<CodeNameQueryDTO> fromJsonArrayToCoes(String json) {
+        return new JSONDeserializer<List<CodeNameQueryDTO>>()
+        .use("values", CodeNameQueryDTO.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeNameQueryDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/CodeNameQueryDTO_Roo_JavaBean.aj
deleted file mode 100644
index 5a0f3dc54..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CodeNameQueryDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CodeNameQueryDTO;
-
-privileged aspect CodeNameQueryDTO_Roo_JavaBean {
-    
-    public String CodeNameQueryDTO.getCodeName() {
-        return this.codeName;
-    }
-    
-    public void CodeNameQueryDTO.setCodeName(String codeName) {
-        this.codeName = codeName;
-    }
-    
-    public String CodeNameQueryDTO.getOperator() {
-        return this.operator;
-    }
-    
-    public void CodeNameQueryDTO.setOperator(String operator) {
-        this.operator = operator;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeNameQueryDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/CodeNameQueryDTO_Roo_Json.aj
deleted file mode 100644
index d7fa36128..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CodeNameQueryDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CodeNameQueryDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect CodeNameQueryDTO_Roo_Json {
-    
-    public String CodeNameQueryDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String CodeNameQueryDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static CodeNameQueryDTO CodeNameQueryDTO.fromJsonToCodeNameQueryDTO(String json) {
-        return new JSONDeserializer<CodeNameQueryDTO>()
-        .use(null, CodeNameQueryDTO.class).deserialize(json);
-    }
-    
-    public static String CodeNameQueryDTO.toJsonArray(Collection<CodeNameQueryDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String CodeNameQueryDTO.toJsonArray(Collection<CodeNameQueryDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<CodeNameQueryDTO> CodeNameQueryDTO.fromJsonArrayToCoes(String json) {
-        return new JSONDeserializer<List<CodeNameQueryDTO>>()
-        .use("values", CodeNameQueryDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeNameQueryDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/CodeNameQueryDTO_Roo_ToString.aj
deleted file mode 100644
index 08e4d89d4..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CodeNameQueryDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CodeNameQueryDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect CodeNameQueryDTO_Roo_ToString {
-    
-    public String CodeNameQueryDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeNameValueDTO.java b/src/main/java/com/labsynch/labseer/dto/CodeNameValueDTO.java
index c2bc2c3a3..ae40ed2bb 100644
--- a/src/main/java/com/labsynch/labseer/dto/CodeNameValueDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CodeNameValueDTO.java
@@ -1,14 +1,16 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.AbstractValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -37,6 +39,36 @@ public static String toJsonArray(Collection<CodeNameValueDTO> collection) {
     }
 	
 
+
+	public static CodeNameValueDTO fromJsonToCodeNameValueDTO(String json) {
+        return new JSONDeserializer<CodeNameValueDTO>()
+        .use(null, CodeNameValueDTO.class).deserialize(json);
+    }
+
+	public static Collection<CodeNameValueDTO> fromJsonArrayToCoes(String json) {
+        return new JSONDeserializer<List<CodeNameValueDTO>>()
+        .use("values", CodeNameValueDTO.class).deserialize(json);
+    }
+
+	public String getCodeName() {
+        return this.codeName;
+    }
+
+	public void setCodeName(String codeName) {
+        this.codeName = codeName;
+    }
+
+	public AbstractValue getValue() {
+        return this.value;
+    }
+
+	public void setValue(AbstractValue value) {
+        this.value = value;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeNameValueDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/CodeNameValueDTO_Roo_JavaBean.aj
deleted file mode 100644
index 70fc32e3a..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CodeNameValueDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,27 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.AbstractValue;
-import com.labsynch.labseer.dto.CodeNameValueDTO;
-
-privileged aspect CodeNameValueDTO_Roo_JavaBean {
-    
-    public String CodeNameValueDTO.getCodeName() {
-        return this.codeName;
-    }
-    
-    public void CodeNameValueDTO.setCodeName(String codeName) {
-        this.codeName = codeName;
-    }
-    
-    public AbstractValue CodeNameValueDTO.getValue() {
-        return this.value;
-    }
-    
-    public void CodeNameValueDTO.setValue(AbstractValue value) {
-        this.value = value;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeNameValueDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/CodeNameValueDTO_Roo_Json.aj
deleted file mode 100644
index 9b74bf9df..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CodeNameValueDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CodeNameValueDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect CodeNameValueDTO_Roo_Json {
-    
-    public static CodeNameValueDTO CodeNameValueDTO.fromJsonToCodeNameValueDTO(String json) {
-        return new JSONDeserializer<CodeNameValueDTO>()
-        .use(null, CodeNameValueDTO.class).deserialize(json);
-    }
-    
-    public static Collection<CodeNameValueDTO> CodeNameValueDTO.fromJsonArrayToCoes(String json) {
-        return new JSONDeserializer<List<CodeNameValueDTO>>()
-        .use("values", CodeNameValueDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeNameValueDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/CodeNameValueDTO_Roo_ToString.aj
deleted file mode 100644
index 9e58358ce..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CodeNameValueDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CodeNameValueDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect CodeNameValueDTO_Roo_ToString {
-    
-    public String CodeNameValueDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeTableDTO.java b/src/main/java/com/labsynch/labseer/dto/CodeTableDTO.java
index 4a35abc48..eaffb55ad 100755
--- a/src/main/java/com/labsynch/labseer/dto/CodeTableDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CodeTableDTO.java
@@ -3,7 +3,8 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
@@ -13,7 +14,7 @@
 import com.labsynch.labseer.domain.Experiment;
 import com.labsynch.labseer.domain.ExperimentLabel;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -144,6 +145,100 @@ public String toJson() {
 	public static String toJsonArray(Collection<CodeTableDTO> collection) {
         return new JSONSerializer().exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
     }
+
+	public static CodeTableDTO fromJsonToCodeTableDTO(String json) {
+        return new JSONDeserializer<CodeTableDTO>()
+        .use(null, CodeTableDTO.class).deserialize(json);
+    }
+
+	public static Collection<CodeTableDTO> fromJsonArrayToCoes(String json) {
+        return new JSONDeserializer<List<CodeTableDTO>>()
+        .use("values", CodeTableDTO.class).deserialize(json);
+    }
+
+	public String getCode() {
+        return this.code;
+    }
+
+	public void setCode(String code) {
+        this.code = code;
+    }
+
+	public String getName() {
+        return this.name;
+    }
+
+	public void setName(String name) {
+        this.name = name;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public Integer getDisplayOrder() {
+        return this.displayOrder;
+    }
+
+	public void setDisplayOrder(Integer displayOrder) {
+        this.displayOrder = displayOrder;
+    }
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public String getDescription() {
+        return this.description;
+    }
+
+	public void setDescription(String description) {
+        this.description = description;
+    }
+
+	public String getComments() {
+        return this.comments;
+    }
+
+	public void setComments(String comments) {
+        this.comments = comments;
+    }
+
+	public String getCodeType() {
+        return this.codeType;
+    }
+
+	public void setCodeType(String codeType) {
+        this.codeType = codeType;
+    }
+
+	public String getCodeKind() {
+        return this.codeKind;
+    }
+
+	public void setCodeKind(String codeKind) {
+        this.codeKind = codeKind;
+    }
+
+	public String getCodeOrigin() {
+        return this.codeOrigin;
+    }
+
+	public void setCodeOrigin(String codeOrigin) {
+        this.codeOrigin = codeOrigin;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeTableDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/CodeTableDTO_Roo_JavaBean.aj
deleted file mode 100755
index da3d619df..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CodeTableDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,90 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CodeTableDTO;
-
-privileged aspect CodeTableDTO_Roo_JavaBean {
-    
-    public String CodeTableDTO.getCode() {
-        return this.code;
-    }
-    
-    public void CodeTableDTO.setCode(String code) {
-        this.code = code;
-    }
-    
-    public String CodeTableDTO.getName() {
-        return this.name;
-    }
-    
-    public void CodeTableDTO.setName(String name) {
-        this.name = name;
-    }
-    
-    public boolean CodeTableDTO.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void CodeTableDTO.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public Integer CodeTableDTO.getDisplayOrder() {
-        return this.displayOrder;
-    }
-    
-    public void CodeTableDTO.setDisplayOrder(Integer displayOrder) {
-        this.displayOrder = displayOrder;
-    }
-    
-    public Long CodeTableDTO.getId() {
-        return this.id;
-    }
-    
-    public void CodeTableDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-    public String CodeTableDTO.getDescription() {
-        return this.description;
-    }
-    
-    public void CodeTableDTO.setDescription(String description) {
-        this.description = description;
-    }
-    
-    public String CodeTableDTO.getComments() {
-        return this.comments;
-    }
-    
-    public void CodeTableDTO.setComments(String comments) {
-        this.comments = comments;
-    }
-    
-    public String CodeTableDTO.getCodeType() {
-        return this.codeType;
-    }
-    
-    public void CodeTableDTO.setCodeType(String codeType) {
-        this.codeType = codeType;
-    }
-    
-    public String CodeTableDTO.getCodeKind() {
-        return this.codeKind;
-    }
-    
-    public void CodeTableDTO.setCodeKind(String codeKind) {
-        this.codeKind = codeKind;
-    }
-    
-    public String CodeTableDTO.getCodeOrigin() {
-        return this.codeOrigin;
-    }
-    
-    public void CodeTableDTO.setCodeOrigin(String codeOrigin) {
-        this.codeOrigin = codeOrigin;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeTableDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/CodeTableDTO_Roo_Json.aj
deleted file mode 100755
index 8fb913278..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CodeTableDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CodeTableDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect CodeTableDTO_Roo_Json {
-    
-    public static CodeTableDTO CodeTableDTO.fromJsonToCodeTableDTO(String json) {
-        return new JSONDeserializer<CodeTableDTO>()
-        .use(null, CodeTableDTO.class).deserialize(json);
-    }
-    
-    public static Collection<CodeTableDTO> CodeTableDTO.fromJsonArrayToCoes(String json) {
-        return new JSONDeserializer<List<CodeTableDTO>>()
-        .use("values", CodeTableDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeTableDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/CodeTableDTO_Roo_ToString.aj
deleted file mode 100755
index 867e04388..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CodeTableDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CodeTableDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect CodeTableDTO_Roo_ToString {
-    
-    public String CodeTableDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeTypeKindDTO.java b/src/main/java/com/labsynch/labseer/dto/CodeTypeKindDTO.java
index 2dc5caf90..2b7dd2a4b 100644
--- a/src/main/java/com/labsynch/labseer/dto/CodeTypeKindDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CodeTypeKindDTO.java
@@ -1,13 +1,15 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -39,6 +41,44 @@ public static String toJsonArray(Collection<CodeTypeKindDTO> collection) {
     }
 	
 
+
+	public static CodeTypeKindDTO fromJsonToCodeTypeKindDTO(String json) {
+        return new JSONDeserializer<CodeTypeKindDTO>()
+        .use(null, CodeTypeKindDTO.class).deserialize(json);
+    }
+
+	public static Collection<CodeTypeKindDTO> fromJsonArrayToCoes(String json) {
+        return new JSONDeserializer<List<CodeTypeKindDTO>>()
+        .use("values", CodeTypeKindDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getCodeName() {
+        return this.codeName;
+    }
+
+	public void setCodeName(String codeName) {
+        this.codeName = codeName;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeTypeKindDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/CodeTypeKindDTO_Roo_JavaBean.aj
deleted file mode 100644
index 24c69ecd4..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CodeTypeKindDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CodeTypeKindDTO;
-
-privileged aspect CodeTypeKindDTO_Roo_JavaBean {
-    
-    public String CodeTypeKindDTO.getCodeName() {
-        return this.codeName;
-    }
-    
-    public void CodeTypeKindDTO.setCodeName(String codeName) {
-        this.codeName = codeName;
-    }
-    
-    public String CodeTypeKindDTO.getLsType() {
-        return this.lsType;
-    }
-    
-    public void CodeTypeKindDTO.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String CodeTypeKindDTO.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void CodeTypeKindDTO.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeTypeKindDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/CodeTypeKindDTO_Roo_Json.aj
deleted file mode 100644
index 62b6c54d0..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CodeTypeKindDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CodeTypeKindDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect CodeTypeKindDTO_Roo_Json {
-    
-    public static CodeTypeKindDTO CodeTypeKindDTO.fromJsonToCodeTypeKindDTO(String json) {
-        return new JSONDeserializer<CodeTypeKindDTO>()
-        .use(null, CodeTypeKindDTO.class).deserialize(json);
-    }
-    
-    public static Collection<CodeTypeKindDTO> CodeTypeKindDTO.fromJsonArrayToCoes(String json) {
-        return new JSONDeserializer<List<CodeTypeKindDTO>>()
-        .use("values", CodeTypeKindDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeTypeKindDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/CodeTypeKindDTO_Roo_ToString.aj
deleted file mode 100644
index 0e7aa1128..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CodeTypeKindDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CodeTypeKindDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect CodeTypeKindDTO_Roo_ToString {
-    
-    public String CodeTypeKindDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerBatchCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerBatchCodeDTO.java
index 0e63a1dc7..2fd2507f0 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerBatchCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerBatchCodeDTO.java
@@ -2,13 +2,15 @@
 
 import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -46,6 +48,60 @@ public static String toJsonArray(Collection<ContainerBatchCodeDTO> collection) {
     }
 	
 
+
+	public String getBatchCode() {
+        return this.batchCode;
+    }
+
+	public void setBatchCode(String batchCode) {
+        this.batchCode = batchCode;
+    }
+
+	public String getContainerCodeName() {
+        return this.containerCodeName;
+    }
+
+	public void setContainerCodeName(String containerCodeName) {
+        this.containerCodeName = containerCodeName;
+    }
+
+	public String getContainerBarcode() {
+        return this.containerBarcode;
+    }
+
+	public void setContainerBarcode(String containerBarcode) {
+        this.containerBarcode = containerBarcode;
+    }
+
+	public String getWellCodeName() {
+        return this.wellCodeName;
+    }
+
+	public void setWellCodeName(String wellCodeName) {
+        this.wellCodeName = wellCodeName;
+    }
+
+	public String getWellName() {
+        return this.wellName;
+    }
+
+	public void setWellName(String wellName) {
+        this.wellName = wellName;
+    }
+
+	public static ContainerBatchCodeDTO fromJsonToContainerBatchCodeDTO(String json) {
+        return new JSONDeserializer<ContainerBatchCodeDTO>()
+        .use(null, ContainerBatchCodeDTO.class).deserialize(json);
+    }
+
+	public static Collection<ContainerBatchCodeDTO> fromJsonArrayToContainerBatchCoes(String json) {
+        return new JSONDeserializer<List<ContainerBatchCodeDTO>>()
+        .use("values", ContainerBatchCodeDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerBatchCodeDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ContainerBatchCodeDTO_Roo_JavaBean.aj
deleted file mode 100644
index 46ba14f0f..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerBatchCodeDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,50 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerBatchCodeDTO;
-
-privileged aspect ContainerBatchCodeDTO_Roo_JavaBean {
-    
-    public String ContainerBatchCodeDTO.getBatchCode() {
-        return this.batchCode;
-    }
-    
-    public void ContainerBatchCodeDTO.setBatchCode(String batchCode) {
-        this.batchCode = batchCode;
-    }
-    
-    public String ContainerBatchCodeDTO.getContainerCodeName() {
-        return this.containerCodeName;
-    }
-    
-    public void ContainerBatchCodeDTO.setContainerCodeName(String containerCodeName) {
-        this.containerCodeName = containerCodeName;
-    }
-    
-    public String ContainerBatchCodeDTO.getContainerBarcode() {
-        return this.containerBarcode;
-    }
-    
-    public void ContainerBatchCodeDTO.setContainerBarcode(String containerBarcode) {
-        this.containerBarcode = containerBarcode;
-    }
-    
-    public String ContainerBatchCodeDTO.getWellCodeName() {
-        return this.wellCodeName;
-    }
-    
-    public void ContainerBatchCodeDTO.setWellCodeName(String wellCodeName) {
-        this.wellCodeName = wellCodeName;
-    }
-    
-    public String ContainerBatchCodeDTO.getWellName() {
-        return this.wellName;
-    }
-    
-    public void ContainerBatchCodeDTO.setWellName(String wellName) {
-        this.wellName = wellName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerBatchCodeDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ContainerBatchCodeDTO_Roo_Json.aj
deleted file mode 100644
index d58e6fd7f..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerBatchCodeDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerBatchCodeDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ContainerBatchCodeDTO_Roo_Json {
-    
-    public static ContainerBatchCodeDTO ContainerBatchCodeDTO.fromJsonToContainerBatchCodeDTO(String json) {
-        return new JSONDeserializer<ContainerBatchCodeDTO>()
-        .use(null, ContainerBatchCodeDTO.class).deserialize(json);
-    }
-    
-    public static Collection<ContainerBatchCodeDTO> ContainerBatchCodeDTO.fromJsonArrayToContainerBatchCoes(String json) {
-        return new JSONDeserializer<List<ContainerBatchCodeDTO>>()
-        .use("values", ContainerBatchCodeDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerBatchCodeDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ContainerBatchCodeDTO_Roo_ToString.aj
deleted file mode 100644
index 2ad0fb6bf..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerBatchCodeDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerBatchCodeDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ContainerBatchCodeDTO_Roo_ToString {
-    
-    public String ContainerBatchCodeDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerBrowserQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerBrowserQueryDTO.java
index 35b5838c1..6a0793034 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerBrowserQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerBrowserQueryDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -13,6 +19,56 @@ public class ContainerBrowserQueryDTO {
 	
 	private ContainerQueryDTO queryDTO;
 
+
+	public String getQueryString() {
+        return this.queryString;
+    }
+
+	public void setQueryString(String queryString) {
+        this.queryString = queryString;
+    }
+
+	public ContainerQueryDTO getQueryDTO() {
+        return this.queryDTO;
+    }
+
+	public void setQueryDTO(ContainerQueryDTO queryDTO) {
+        this.queryDTO = queryDTO;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ContainerBrowserQueryDTO fromJsonToContainerBrowserQueryDTO(String json) {
+        return new JSONDeserializer<ContainerBrowserQueryDTO>()
+        .use(null, ContainerBrowserQueryDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ContainerBrowserQueryDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ContainerBrowserQueryDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ContainerBrowserQueryDTO> fromJsonArrayToContainerBroes(String json) {
+        return new JSONDeserializer<List<ContainerBrowserQueryDTO>>()
+        .use("values", ContainerBrowserQueryDTO.class).deserialize(json);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerBrowserQueryDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ContainerBrowserQueryDTO_Roo_JavaBean.aj
deleted file mode 100644
index 0fcf6813c..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerBrowserQueryDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,27 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerBrowserQueryDTO;
-import com.labsynch.labseer.dto.ContainerQueryDTO;
-
-privileged aspect ContainerBrowserQueryDTO_Roo_JavaBean {
-    
-    public String ContainerBrowserQueryDTO.getQueryString() {
-        return this.queryString;
-    }
-    
-    public void ContainerBrowserQueryDTO.setQueryString(String queryString) {
-        this.queryString = queryString;
-    }
-    
-    public ContainerQueryDTO ContainerBrowserQueryDTO.getQueryDTO() {
-        return this.queryDTO;
-    }
-    
-    public void ContainerBrowserQueryDTO.setQueryDTO(ContainerQueryDTO queryDTO) {
-        this.queryDTO = queryDTO;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerBrowserQueryDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ContainerBrowserQueryDTO_Roo_Json.aj
deleted file mode 100644
index 8ca6c3055..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerBrowserQueryDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerBrowserQueryDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ContainerBrowserQueryDTO_Roo_Json {
-    
-    public String ContainerBrowserQueryDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ContainerBrowserQueryDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ContainerBrowserQueryDTO ContainerBrowserQueryDTO.fromJsonToContainerBrowserQueryDTO(String json) {
-        return new JSONDeserializer<ContainerBrowserQueryDTO>()
-        .use(null, ContainerBrowserQueryDTO.class).deserialize(json);
-    }
-    
-    public static String ContainerBrowserQueryDTO.toJsonArray(Collection<ContainerBrowserQueryDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ContainerBrowserQueryDTO.toJsonArray(Collection<ContainerBrowserQueryDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ContainerBrowserQueryDTO> ContainerBrowserQueryDTO.fromJsonArrayToContainerBroes(String json) {
-        return new JSONDeserializer<List<ContainerBrowserQueryDTO>>()
-        .use("values", ContainerBrowserQueryDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerBrowserQueryDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ContainerBrowserQueryDTO_Roo_ToString.aj
deleted file mode 100644
index 9de05098d..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerBrowserQueryDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerBrowserQueryDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ContainerBrowserQueryDTO_Roo_ToString {
-    
-    public String ContainerBrowserQueryDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerCodeNameStateDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerCodeNameStateDTO.java
index 6d841862d..05d2bb4f7 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerCodeNameStateDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerCodeNameStateDTO.java
@@ -1,14 +1,16 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.ContainerState;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -36,4 +38,34 @@ public static String toJsonArray(Collection<ContainerCodeNameStateDTO> collectio
         return new JSONSerializer().include("lsState.lsValues").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getContainerCodeName() {
+        return this.containerCodeName;
+    }
+
+	public void setContainerCodeName(String containerCodeName) {
+        this.containerCodeName = containerCodeName;
+    }
+
+	public ContainerState getLsState() {
+        return this.lsState;
+    }
+
+	public void setLsState(ContainerState lsState) {
+        this.lsState = lsState;
+    }
+
+	public static ContainerCodeNameStateDTO fromJsonToContainerCodeNameStateDTO(String json) {
+        return new JSONDeserializer<ContainerCodeNameStateDTO>()
+        .use(null, ContainerCodeNameStateDTO.class).deserialize(json);
+    }
+
+	public static Collection<ContainerCodeNameStateDTO> fromJsonArrayToContainerCoes(String json) {
+        return new JSONDeserializer<List<ContainerCodeNameStateDTO>>()
+        .use("values", ContainerCodeNameStateDTO.class).deserialize(json);
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerCodeNameStateDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ContainerCodeNameStateDTO_Roo_JavaBean.aj
deleted file mode 100644
index 83b5b226a..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerCodeNameStateDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,27 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.ContainerState;
-import com.labsynch.labseer.dto.ContainerCodeNameStateDTO;
-
-privileged aspect ContainerCodeNameStateDTO_Roo_JavaBean {
-    
-    public String ContainerCodeNameStateDTO.getContainerCodeName() {
-        return this.containerCodeName;
-    }
-    
-    public void ContainerCodeNameStateDTO.setContainerCodeName(String containerCodeName) {
-        this.containerCodeName = containerCodeName;
-    }
-    
-    public ContainerState ContainerCodeNameStateDTO.getLsState() {
-        return this.lsState;
-    }
-    
-    public void ContainerCodeNameStateDTO.setLsState(ContainerState lsState) {
-        this.lsState = lsState;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerCodeNameStateDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ContainerCodeNameStateDTO_Roo_Json.aj
deleted file mode 100644
index 4f5a21b7b..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerCodeNameStateDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerCodeNameStateDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ContainerCodeNameStateDTO_Roo_Json {
-    
-    public static ContainerCodeNameStateDTO ContainerCodeNameStateDTO.fromJsonToContainerCodeNameStateDTO(String json) {
-        return new JSONDeserializer<ContainerCodeNameStateDTO>()
-        .use(null, ContainerCodeNameStateDTO.class).deserialize(json);
-    }
-    
-    public static Collection<ContainerCodeNameStateDTO> ContainerCodeNameStateDTO.fromJsonArrayToContainerCoes(String json) {
-        return new JSONDeserializer<List<ContainerCodeNameStateDTO>>()
-        .use("values", ContainerCodeNameStateDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerCodeNameStateDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ContainerCodeNameStateDTO_Roo_ToString.aj
deleted file mode 100644
index 379eb2232..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerCodeNameStateDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerCodeNameStateDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ContainerCodeNameStateDTO_Roo_ToString {
-    
-    public String ContainerCodeNameStateDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerDependencyCheckDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerDependencyCheckDTO.java
index d46ca8c8d..e0a4b7a2b 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerDependencyCheckDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerDependencyCheckDTO.java
@@ -3,12 +3,14 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.roo.addon.javabean.RooJavaBean;
@@ -24,7 +26,7 @@
 import com.labsynch.labseer.domain.SubjectValue;
 import com.labsynch.labseer.domain.TreatmentGroupValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -129,6 +131,70 @@ private Collection<Experiment> getReferencedExperiments(Collection<Subject> subj
 		return results;
 	}
 	
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public Container getQueryContainer() {
+        return this.queryContainer;
+    }
+
+	public void setQueryContainer(Container queryContainer) {
+        this.queryContainer = queryContainer;
+    }
+
+	public Collection<String> getDependentCorpNames() {
+        return this.dependentCorpNames;
+    }
+
+	public void setDependentCorpNames(Collection<String> dependentCorpNames) {
+        this.dependentCorpNames = dependentCorpNames;
+    }
+
+	public boolean isLinkedDataExists() {
+        return this.linkedDataExists;
+    }
+
+	public void setLinkedDataExists(boolean linkedDataExists) {
+        this.linkedDataExists = linkedDataExists;
+    }
+
+	public Collection<CodeTableDTO> getLinkedExperiments() {
+        return this.linkedExperiments;
+    }
+
+	public void setLinkedExperiments(Collection<CodeTableDTO> linkedExperiments) {
+        this.linkedExperiments = linkedExperiments;
+    }
+
+	public Collection<ErrorMessageDTO> getErrors() {
+        return this.errors;
+    }
+
+	public void setErrors(Collection<ErrorMessageDTO> errors) {
+        this.errors = errors;
+    }
+
+	public static ContainerDependencyCheckDTO fromJsonToContainerDependencyCheckDTO(String json) {
+        return new JSONDeserializer<ContainerDependencyCheckDTO>()
+        .use(null, ContainerDependencyCheckDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ContainerDependencyCheckDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ContainerDependencyCheckDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ContainerDependencyCheckDTO> fromJsonArrayToCoes(String json) {
+        return new JSONDeserializer<List<ContainerDependencyCheckDTO>>()
+        .use("values", ContainerDependencyCheckDTO.class).deserialize(json);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerDependencyCheckDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ContainerDependencyCheckDTO_Roo_JavaBean.aj
deleted file mode 100644
index 087bfc1d1..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerDependencyCheckDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,54 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.dto.CodeTableDTO;
-import com.labsynch.labseer.dto.ContainerDependencyCheckDTO;
-import com.labsynch.labseer.dto.ErrorMessageDTO;
-import java.util.Collection;
-
-privileged aspect ContainerDependencyCheckDTO_Roo_JavaBean {
-    
-    public Container ContainerDependencyCheckDTO.getQueryContainer() {
-        return this.queryContainer;
-    }
-    
-    public void ContainerDependencyCheckDTO.setQueryContainer(Container queryContainer) {
-        this.queryContainer = queryContainer;
-    }
-    
-    public Collection<String> ContainerDependencyCheckDTO.getDependentCorpNames() {
-        return this.dependentCorpNames;
-    }
-    
-    public void ContainerDependencyCheckDTO.setDependentCorpNames(Collection<String> dependentCorpNames) {
-        this.dependentCorpNames = dependentCorpNames;
-    }
-    
-    public boolean ContainerDependencyCheckDTO.isLinkedDataExists() {
-        return this.linkedDataExists;
-    }
-    
-    public void ContainerDependencyCheckDTO.setLinkedDataExists(boolean linkedDataExists) {
-        this.linkedDataExists = linkedDataExists;
-    }
-    
-    public Collection<CodeTableDTO> ContainerDependencyCheckDTO.getLinkedExperiments() {
-        return this.linkedExperiments;
-    }
-    
-    public void ContainerDependencyCheckDTO.setLinkedExperiments(Collection<CodeTableDTO> linkedExperiments) {
-        this.linkedExperiments = linkedExperiments;
-    }
-    
-    public Collection<ErrorMessageDTO> ContainerDependencyCheckDTO.getErrors() {
-        return this.errors;
-    }
-    
-    public void ContainerDependencyCheckDTO.setErrors(Collection<ErrorMessageDTO> errors) {
-        this.errors = errors;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerDependencyCheckDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ContainerDependencyCheckDTO_Roo_Json.aj
deleted file mode 100644
index 941f09391..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerDependencyCheckDTO_Roo_Json.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerDependencyCheckDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ContainerDependencyCheckDTO_Roo_Json {
-    
-    public static ContainerDependencyCheckDTO ContainerDependencyCheckDTO.fromJsonToContainerDependencyCheckDTO(String json) {
-        return new JSONDeserializer<ContainerDependencyCheckDTO>()
-        .use(null, ContainerDependencyCheckDTO.class).deserialize(json);
-    }
-    
-    public static String ContainerDependencyCheckDTO.toJsonArray(Collection<ContainerDependencyCheckDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ContainerDependencyCheckDTO.toJsonArray(Collection<ContainerDependencyCheckDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ContainerDependencyCheckDTO> ContainerDependencyCheckDTO.fromJsonArrayToCoes(String json) {
-        return new JSONDeserializer<List<ContainerDependencyCheckDTO>>()
-        .use("values", ContainerDependencyCheckDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerDependencyCheckDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ContainerDependencyCheckDTO_Roo_ToString.aj
deleted file mode 100644
index 1126b9ffe..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerDependencyCheckDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerDependencyCheckDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ContainerDependencyCheckDTO_Roo_ToString {
-    
-    public String ContainerDependencyCheckDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerErrorMessageDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerErrorMessageDTO.java
index af85a72d0..a08b4530c 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerErrorMessageDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerErrorMessageDTO.java
@@ -1,14 +1,16 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.Container;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -42,4 +44,58 @@ public ContainerErrorMessageDTO(String containerCodeName, Container container){
 		this.container = container;
 	}
 	
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static ContainerErrorMessageDTO fromJsonToContainerErrorMessageDTO(String json) {
+        return new JSONDeserializer<ContainerErrorMessageDTO>()
+        .use(null, ContainerErrorMessageDTO.class).deserialize(json);
+    }
+
+	public static Collection<ContainerErrorMessageDTO> fromJsonArrayToContainerErroes(String json) {
+        return new JSONDeserializer<List<ContainerErrorMessageDTO>>()
+        .use("values", ContainerErrorMessageDTO.class).deserialize(json);
+    }
+
+	public String getContainerCodeName() {
+        return this.containerCodeName;
+    }
+
+	public void setContainerCodeName(String containerCodeName) {
+        this.containerCodeName = containerCodeName;
+    }
+
+	public String getLevel() {
+        return this.level;
+    }
+
+	public void setLevel(String level) {
+        this.level = level;
+    }
+
+	public String getMessage() {
+        return this.message;
+    }
+
+	public void setMessage(String message) {
+        this.message = message;
+    }
+
+	public Container getContainer() {
+        return this.container;
+    }
+
+	public void setContainer(Container container) {
+        this.container = container;
+    }
+
+	public Container getDefinition() {
+        return this.definition;
+    }
+
+	public void setDefinition(Container definition) {
+        this.definition = definition;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerErrorMessageDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ContainerErrorMessageDTO_Roo_JavaBean.aj
deleted file mode 100644
index f7a96ffed..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerErrorMessageDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,51 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.dto.ContainerErrorMessageDTO;
-
-privileged aspect ContainerErrorMessageDTO_Roo_JavaBean {
-    
-    public String ContainerErrorMessageDTO.getContainerCodeName() {
-        return this.containerCodeName;
-    }
-    
-    public void ContainerErrorMessageDTO.setContainerCodeName(String containerCodeName) {
-        this.containerCodeName = containerCodeName;
-    }
-    
-    public String ContainerErrorMessageDTO.getLevel() {
-        return this.level;
-    }
-    
-    public void ContainerErrorMessageDTO.setLevel(String level) {
-        this.level = level;
-    }
-    
-    public String ContainerErrorMessageDTO.getMessage() {
-        return this.message;
-    }
-    
-    public void ContainerErrorMessageDTO.setMessage(String message) {
-        this.message = message;
-    }
-    
-    public Container ContainerErrorMessageDTO.getContainer() {
-        return this.container;
-    }
-    
-    public void ContainerErrorMessageDTO.setContainer(Container container) {
-        this.container = container;
-    }
-    
-    public Container ContainerErrorMessageDTO.getDefinition() {
-        return this.definition;
-    }
-    
-    public void ContainerErrorMessageDTO.setDefinition(Container definition) {
-        this.definition = definition;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerErrorMessageDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ContainerErrorMessageDTO_Roo_Json.aj
deleted file mode 100644
index fdf510a28..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerErrorMessageDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerErrorMessageDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ContainerErrorMessageDTO_Roo_Json {
-    
-    public static ContainerErrorMessageDTO ContainerErrorMessageDTO.fromJsonToContainerErrorMessageDTO(String json) {
-        return new JSONDeserializer<ContainerErrorMessageDTO>()
-        .use(null, ContainerErrorMessageDTO.class).deserialize(json);
-    }
-    
-    public static Collection<ContainerErrorMessageDTO> ContainerErrorMessageDTO.fromJsonArrayToContainerErroes(String json) {
-        return new JSONDeserializer<List<ContainerErrorMessageDTO>>()
-        .use("values", ContainerErrorMessageDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerErrorMessageDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ContainerErrorMessageDTO_Roo_ToString.aj
deleted file mode 100644
index 8cd54a8b1..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerErrorMessageDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerErrorMessageDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ContainerErrorMessageDTO_Roo_ToString {
-    
-    public String ContainerErrorMessageDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerLocationDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerLocationDTO.java
index 430b19ba0..b66d1e280 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerLocationDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerLocationDTO.java
@@ -2,13 +2,15 @@
 
 import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -48,6 +50,76 @@ public static String toJsonArray(Collection<ContainerLocationDTO> collection) {
     }
 	
 
+
+	public static ContainerLocationDTO fromJsonToContainerLocationDTO(String json) {
+        return new JSONDeserializer<ContainerLocationDTO>()
+        .use(null, ContainerLocationDTO.class).deserialize(json);
+    }
+
+	public static Collection<ContainerLocationDTO> fromJsonArrayToContainerLocatioes(String json) {
+        return new JSONDeserializer<List<ContainerLocationDTO>>()
+        .use("values", ContainerLocationDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getLocationCodeName() {
+        return this.locationCodeName;
+    }
+
+	public void setLocationCodeName(String locationCodeName) {
+        this.locationCodeName = locationCodeName;
+    }
+
+	public String getContainerCodeName() {
+        return this.containerCodeName;
+    }
+
+	public void setContainerCodeName(String containerCodeName) {
+        this.containerCodeName = containerCodeName;
+    }
+
+	public String getContainerBarcode() {
+        return this.containerBarcode;
+    }
+
+	public void setContainerBarcode(String containerBarcode) {
+        this.containerBarcode = containerBarcode;
+    }
+
+	public String getLevel() {
+        return this.level;
+    }
+
+	public void setLevel(String level) {
+        this.level = level;
+    }
+
+	public String getMessage() {
+        return this.message;
+    }
+
+	public void setMessage(String message) {
+        this.message = message;
+    }
+
+	public String getModifiedBy() {
+        return this.modifiedBy;
+    }
+
+	public void setModifiedBy(String modifiedBy) {
+        this.modifiedBy = modifiedBy;
+    }
+
+	public Date getModifiedDate() {
+        return this.modifiedDate;
+    }
+
+	public void setModifiedDate(Date modifiedDate) {
+        this.modifiedDate = modifiedDate;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerLocationDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ContainerLocationDTO_Roo_JavaBean.aj
deleted file mode 100644
index 220999598..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerLocationDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,67 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerLocationDTO;
-import java.util.Date;
-
-privileged aspect ContainerLocationDTO_Roo_JavaBean {
-    
-    public String ContainerLocationDTO.getLocationCodeName() {
-        return this.locationCodeName;
-    }
-    
-    public void ContainerLocationDTO.setLocationCodeName(String locationCodeName) {
-        this.locationCodeName = locationCodeName;
-    }
-    
-    public String ContainerLocationDTO.getContainerCodeName() {
-        return this.containerCodeName;
-    }
-    
-    public void ContainerLocationDTO.setContainerCodeName(String containerCodeName) {
-        this.containerCodeName = containerCodeName;
-    }
-    
-    public String ContainerLocationDTO.getContainerBarcode() {
-        return this.containerBarcode;
-    }
-    
-    public void ContainerLocationDTO.setContainerBarcode(String containerBarcode) {
-        this.containerBarcode = containerBarcode;
-    }
-    
-    public String ContainerLocationDTO.getLevel() {
-        return this.level;
-    }
-    
-    public void ContainerLocationDTO.setLevel(String level) {
-        this.level = level;
-    }
-    
-    public String ContainerLocationDTO.getMessage() {
-        return this.message;
-    }
-    
-    public void ContainerLocationDTO.setMessage(String message) {
-        this.message = message;
-    }
-    
-    public String ContainerLocationDTO.getModifiedBy() {
-        return this.modifiedBy;
-    }
-    
-    public void ContainerLocationDTO.setModifiedBy(String modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
-    
-    public Date ContainerLocationDTO.getModifiedDate() {
-        return this.modifiedDate;
-    }
-    
-    public void ContainerLocationDTO.setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerLocationDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ContainerLocationDTO_Roo_Json.aj
deleted file mode 100644
index c4677ff6b..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerLocationDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerLocationDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ContainerLocationDTO_Roo_Json {
-    
-    public static ContainerLocationDTO ContainerLocationDTO.fromJsonToContainerLocationDTO(String json) {
-        return new JSONDeserializer<ContainerLocationDTO>()
-        .use(null, ContainerLocationDTO.class).deserialize(json);
-    }
-    
-    public static Collection<ContainerLocationDTO> ContainerLocationDTO.fromJsonArrayToContainerLocatioes(String json) {
-        return new JSONDeserializer<List<ContainerLocationDTO>>()
-        .use("values", ContainerLocationDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerLocationDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ContainerLocationDTO_Roo_ToString.aj
deleted file mode 100644
index 9b1a9f568..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerLocationDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerLocationDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ContainerLocationDTO_Roo_ToString {
-    
-    public String ContainerLocationDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerLocationTreeDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerLocationTreeDTO.java
index 052e6247c..a29d4bb42 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerLocationTreeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerLocationTreeDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -36,4 +42,126 @@ public ContainerLocationTreeDTO (String codeName, String parentCodeName, String
 		this.lsKind = lsKind;
 	}
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ContainerLocationTreeDTO fromJsonToContainerLocationTreeDTO(String json) {
+        return new JSONDeserializer<ContainerLocationTreeDTO>()
+        .use(null, ContainerLocationTreeDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ContainerLocationTreeDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ContainerLocationTreeDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ContainerLocationTreeDTO> fromJsonArrayToContainerLocatioes(String json) {
+        return new JSONDeserializer<List<ContainerLocationTreeDTO>>()
+        .use("values", ContainerLocationTreeDTO.class).deserialize(json);
+    }
+
+	public String getCodeName() {
+        return this.codeName;
+    }
+
+	public void setCodeName(String codeName) {
+        this.codeName = codeName;
+    }
+
+	public String getParentCodeName() {
+        return this.parentCodeName;
+    }
+
+	public void setParentCodeName(String parentCodeName) {
+        this.parentCodeName = parentCodeName;
+    }
+
+	public String getLabelText() {
+        return this.labelText;
+    }
+
+	public void setLabelText(String labelText) {
+        this.labelText = labelText;
+    }
+
+	public String getCodeTree() {
+        return this.codeTree;
+    }
+
+	public void setCodeTree(String codeTree) {
+        this.codeTree = codeTree;
+    }
+
+	public String getLabelTree() {
+        return this.labelTree;
+    }
+
+	public void setLabelTree(String labelTree) {
+        this.labelTree = labelTree;
+    }
+
+	public Integer getLevel() {
+        return this.level;
+    }
+
+	public void setLevel(Integer level) {
+        this.level = level;
+    }
+
+	public String getRootCodeName() {
+        return this.rootCodeName;
+    }
+
+	public void setRootCodeName(String rootCodeName) {
+        this.rootCodeName = rootCodeName;
+    }
+
+	public String getCodeNameBreadcrumb() {
+        return this.codeNameBreadcrumb;
+    }
+
+	public void setCodeNameBreadcrumb(String codeNameBreadcrumb) {
+        this.codeNameBreadcrumb = codeNameBreadcrumb;
+    }
+
+	public String getLabelTextBreadcrumb() {
+        return this.labelTextBreadcrumb;
+    }
+
+	public void setLabelTextBreadcrumb(String labelTextBreadcrumb) {
+        this.labelTextBreadcrumb = labelTextBreadcrumb;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerLocationTreeDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ContainerLocationTreeDTO_Roo_JavaBean.aj
deleted file mode 100644
index 4fe8f0af1..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerLocationTreeDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,98 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerLocationTreeDTO;
-
-privileged aspect ContainerLocationTreeDTO_Roo_JavaBean {
-    
-    public String ContainerLocationTreeDTO.getCodeName() {
-        return this.codeName;
-    }
-    
-    public void ContainerLocationTreeDTO.setCodeName(String codeName) {
-        this.codeName = codeName;
-    }
-    
-    public String ContainerLocationTreeDTO.getParentCodeName() {
-        return this.parentCodeName;
-    }
-    
-    public void ContainerLocationTreeDTO.setParentCodeName(String parentCodeName) {
-        this.parentCodeName = parentCodeName;
-    }
-    
-    public String ContainerLocationTreeDTO.getLabelText() {
-        return this.labelText;
-    }
-    
-    public void ContainerLocationTreeDTO.setLabelText(String labelText) {
-        this.labelText = labelText;
-    }
-    
-    public String ContainerLocationTreeDTO.getCodeTree() {
-        return this.codeTree;
-    }
-    
-    public void ContainerLocationTreeDTO.setCodeTree(String codeTree) {
-        this.codeTree = codeTree;
-    }
-    
-    public String ContainerLocationTreeDTO.getLabelTree() {
-        return this.labelTree;
-    }
-    
-    public void ContainerLocationTreeDTO.setLabelTree(String labelTree) {
-        this.labelTree = labelTree;
-    }
-    
-    public Integer ContainerLocationTreeDTO.getLevel() {
-        return this.level;
-    }
-    
-    public void ContainerLocationTreeDTO.setLevel(Integer level) {
-        this.level = level;
-    }
-    
-    public String ContainerLocationTreeDTO.getRootCodeName() {
-        return this.rootCodeName;
-    }
-    
-    public void ContainerLocationTreeDTO.setRootCodeName(String rootCodeName) {
-        this.rootCodeName = rootCodeName;
-    }
-    
-    public String ContainerLocationTreeDTO.getCodeNameBreadcrumb() {
-        return this.codeNameBreadcrumb;
-    }
-    
-    public void ContainerLocationTreeDTO.setCodeNameBreadcrumb(String codeNameBreadcrumb) {
-        this.codeNameBreadcrumb = codeNameBreadcrumb;
-    }
-    
-    public String ContainerLocationTreeDTO.getLabelTextBreadcrumb() {
-        return this.labelTextBreadcrumb;
-    }
-    
-    public void ContainerLocationTreeDTO.setLabelTextBreadcrumb(String labelTextBreadcrumb) {
-        this.labelTextBreadcrumb = labelTextBreadcrumb;
-    }
-    
-    public String ContainerLocationTreeDTO.getLsType() {
-        return this.lsType;
-    }
-    
-    public void ContainerLocationTreeDTO.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String ContainerLocationTreeDTO.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void ContainerLocationTreeDTO.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerLocationTreeDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ContainerLocationTreeDTO_Roo_Json.aj
deleted file mode 100644
index 6b947a886..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerLocationTreeDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerLocationTreeDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ContainerLocationTreeDTO_Roo_Json {
-    
-    public String ContainerLocationTreeDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ContainerLocationTreeDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ContainerLocationTreeDTO ContainerLocationTreeDTO.fromJsonToContainerLocationTreeDTO(String json) {
-        return new JSONDeserializer<ContainerLocationTreeDTO>()
-        .use(null, ContainerLocationTreeDTO.class).deserialize(json);
-    }
-    
-    public static String ContainerLocationTreeDTO.toJsonArray(Collection<ContainerLocationTreeDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ContainerLocationTreeDTO.toJsonArray(Collection<ContainerLocationTreeDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ContainerLocationTreeDTO> ContainerLocationTreeDTO.fromJsonArrayToContainerLocatioes(String json) {
-        return new JSONDeserializer<List<ContainerLocationTreeDTO>>()
-        .use("values", ContainerLocationTreeDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerLocationTreeDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ContainerLocationTreeDTO_Roo_ToString.aj
deleted file mode 100644
index 3a786e496..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerLocationTreeDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerLocationTreeDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ContainerLocationTreeDTO_Roo_ToString {
-    
-    public String ContainerLocationTreeDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerMiniDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerMiniDTO.java
index 4b6afba79..0307c7a34 100755
--- a/src/main/java/com/labsynch/labseer/dto/ContainerMiniDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerMiniDTO.java
@@ -1,10 +1,16 @@
 package com.labsynch.labseer.dto;
 
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.Container;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 
 @RooJavaBean
 @RooToString
@@ -21,6 +27,56 @@ public ContainerMiniDTO(Container container) {
 	private Integer version;
 	
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ContainerMiniDTO fromJsonToContainerMiniDTO(String json) {
+        return new JSONDeserializer<ContainerMiniDTO>()
+        .use(null, ContainerMiniDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ContainerMiniDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ContainerMiniDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ContainerMiniDTO> fromJsonArrayToCoes(String json) {
+        return new JSONDeserializer<List<ContainerMiniDTO>>()
+        .use("values", ContainerMiniDTO.class).deserialize(json);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerMiniDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ContainerMiniDTO_Roo_JavaBean.aj
deleted file mode 100755
index fcd0b2a96..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerMiniDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerMiniDTO;
-
-privileged aspect ContainerMiniDTO_Roo_JavaBean {
-    
-    public Long ContainerMiniDTO.getId() {
-        return this.id;
-    }
-    
-    public void ContainerMiniDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer ContainerMiniDTO.getVersion() {
-        return this.version;
-    }
-    
-    public void ContainerMiniDTO.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerMiniDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ContainerMiniDTO_Roo_Json.aj
deleted file mode 100755
index 8de2a7bce..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerMiniDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerMiniDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ContainerMiniDTO_Roo_Json {
-    
-    public String ContainerMiniDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ContainerMiniDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ContainerMiniDTO ContainerMiniDTO.fromJsonToContainerMiniDTO(String json) {
-        return new JSONDeserializer<ContainerMiniDTO>()
-        .use(null, ContainerMiniDTO.class).deserialize(json);
-    }
-    
-    public static String ContainerMiniDTO.toJsonArray(Collection<ContainerMiniDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ContainerMiniDTO.toJsonArray(Collection<ContainerMiniDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ContainerMiniDTO> ContainerMiniDTO.fromJsonArrayToCoes(String json) {
-        return new JSONDeserializer<List<ContainerMiniDTO>>()
-        .use("values", ContainerMiniDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerMiniDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ContainerMiniDTO_Roo_ToString.aj
deleted file mode 100755
index e83a8ebd2..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerMiniDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerMiniDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ContainerMiniDTO_Roo_ToString {
-    
-    public String ContainerMiniDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerQueryDTO.java
index d1311c1d0..9c984a47c 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerQueryDTO.java
@@ -1,8 +1,12 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -50,4 +54,126 @@ public ContainerQueryDTO(ContainerQueryDTO queryDTO){
 		this.values = queryDTO.getValues();
 		this.labels = queryDTO.getLabels();
 	}
+
+	public Date getRecordedDateGreaterThan() {
+        return this.recordedDateGreaterThan;
+    }
+
+	public void setRecordedDateGreaterThan(Date recordedDateGreaterThan) {
+        this.recordedDateGreaterThan = recordedDateGreaterThan;
+    }
+
+	public Date getRecordedDateLessThan() {
+        return this.recordedDateLessThan;
+    }
+
+	public void setRecordedDateLessThan(Date recordedDateLessThan) {
+        this.recordedDateLessThan = recordedDateLessThan;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public Integer getMaxResults() {
+        return this.maxResults;
+    }
+
+	public void setMaxResults(Integer maxResults) {
+        this.maxResults = maxResults;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public Collection<ItxQueryDTO> getFirstInteractions() {
+        return this.firstInteractions;
+    }
+
+	public void setFirstInteractions(Collection<ItxQueryDTO> firstInteractions) {
+        this.firstInteractions = firstInteractions;
+    }
+
+	public Collection<ItxQueryDTO> getSecondInteractions() {
+        return this.secondInteractions;
+    }
+
+	public void setSecondInteractions(Collection<ItxQueryDTO> secondInteractions) {
+        this.secondInteractions = secondInteractions;
+    }
+
+	public Collection<ItxQueryDTO> getSubjects() {
+        return this.subjects;
+    }
+
+	public void setSubjects(Collection<ItxQueryDTO> subjects) {
+        this.subjects = subjects;
+    }
+
+	public Collection<ValueQueryDTO> getValues() {
+        return this.values;
+    }
+
+	public void setValues(Collection<ValueQueryDTO> values) {
+        this.values = values;
+    }
+
+	public Collection<LabelQueryDTO> getLabels() {
+        return this.labels;
+    }
+
+	public void setLabels(Collection<LabelQueryDTO> labels) {
+        this.labels = labels;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ContainerQueryDTO fromJsonToContainerQueryDTO(String json) {
+        return new JSONDeserializer<ContainerQueryDTO>()
+        .use(null, ContainerQueryDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ContainerQueryDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ContainerQueryDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ContainerQueryDTO> fromJsonArrayToCoes(String json) {
+        return new JSONDeserializer<List<ContainerQueryDTO>>()
+        .use("values", ContainerQueryDTO.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerQueryDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ContainerQueryDTO_Roo_JavaBean.aj
deleted file mode 100644
index b90183284..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerQueryDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,103 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerQueryDTO;
-import com.labsynch.labseer.dto.ItxQueryDTO;
-import com.labsynch.labseer.dto.LabelQueryDTO;
-import com.labsynch.labseer.dto.ValueQueryDTO;
-import java.util.Collection;
-import java.util.Date;
-
-privileged aspect ContainerQueryDTO_Roo_JavaBean {
-    
-    public Date ContainerQueryDTO.getRecordedDateGreaterThan() {
-        return this.recordedDateGreaterThan;
-    }
-    
-    public void ContainerQueryDTO.setRecordedDateGreaterThan(Date recordedDateGreaterThan) {
-        this.recordedDateGreaterThan = recordedDateGreaterThan;
-    }
-    
-    public Date ContainerQueryDTO.getRecordedDateLessThan() {
-        return this.recordedDateLessThan;
-    }
-    
-    public void ContainerQueryDTO.setRecordedDateLessThan(Date recordedDateLessThan) {
-        this.recordedDateLessThan = recordedDateLessThan;
-    }
-    
-    public String ContainerQueryDTO.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void ContainerQueryDTO.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public Integer ContainerQueryDTO.getMaxResults() {
-        return this.maxResults;
-    }
-    
-    public void ContainerQueryDTO.setMaxResults(Integer maxResults) {
-        this.maxResults = maxResults;
-    }
-    
-    public String ContainerQueryDTO.getLsType() {
-        return this.lsType;
-    }
-    
-    public void ContainerQueryDTO.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String ContainerQueryDTO.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void ContainerQueryDTO.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public Collection<ItxQueryDTO> ContainerQueryDTO.getFirstInteractions() {
-        return this.firstInteractions;
-    }
-    
-    public void ContainerQueryDTO.setFirstInteractions(Collection<ItxQueryDTO> firstInteractions) {
-        this.firstInteractions = firstInteractions;
-    }
-    
-    public Collection<ItxQueryDTO> ContainerQueryDTO.getSecondInteractions() {
-        return this.secondInteractions;
-    }
-    
-    public void ContainerQueryDTO.setSecondInteractions(Collection<ItxQueryDTO> secondInteractions) {
-        this.secondInteractions = secondInteractions;
-    }
-    
-    public Collection<ItxQueryDTO> ContainerQueryDTO.getSubjects() {
-        return this.subjects;
-    }
-    
-    public void ContainerQueryDTO.setSubjects(Collection<ItxQueryDTO> subjects) {
-        this.subjects = subjects;
-    }
-    
-    public Collection<ValueQueryDTO> ContainerQueryDTO.getValues() {
-        return this.values;
-    }
-    
-    public void ContainerQueryDTO.setValues(Collection<ValueQueryDTO> values) {
-        this.values = values;
-    }
-    
-    public Collection<LabelQueryDTO> ContainerQueryDTO.getLabels() {
-        return this.labels;
-    }
-    
-    public void ContainerQueryDTO.setLabels(Collection<LabelQueryDTO> labels) {
-        this.labels = labels;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerQueryDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ContainerQueryDTO_Roo_Json.aj
deleted file mode 100644
index 343c8e9a9..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerQueryDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerQueryDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ContainerQueryDTO_Roo_Json {
-    
-    public String ContainerQueryDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ContainerQueryDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ContainerQueryDTO ContainerQueryDTO.fromJsonToContainerQueryDTO(String json) {
-        return new JSONDeserializer<ContainerQueryDTO>()
-        .use(null, ContainerQueryDTO.class).deserialize(json);
-    }
-    
-    public static String ContainerQueryDTO.toJsonArray(Collection<ContainerQueryDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ContainerQueryDTO.toJsonArray(Collection<ContainerQueryDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ContainerQueryDTO> ContainerQueryDTO.fromJsonArrayToCoes(String json) {
-        return new JSONDeserializer<List<ContainerQueryDTO>>()
-        .use("values", ContainerQueryDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerQueryDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ContainerQueryDTO_Roo_ToString.aj
deleted file mode 100644
index f05809e9a..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerQueryDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerQueryDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ContainerQueryDTO_Roo_ToString {
-    
-    public String ContainerQueryDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerQueryResultDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerQueryResultDTO.java
index 12b279e65..f410eee53 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerQueryResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerQueryResultDTO.java
@@ -1,7 +1,9 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -9,7 +11,7 @@
 
 import com.labsynch.labseer.domain.Container;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -52,4 +54,52 @@ public String toJsonStub() {
         return new JSONSerializer().exclude("*.class", "results.lsStates.lsThing").include("results.lsTags", "results.lsLabels").prettyPrint(false).transform(new ExcludeNulls(), void.class).serialize(this);
     }
 	
+
+	public Integer getMaxResults() {
+        return this.maxResults;
+    }
+
+	public void setMaxResults(Integer maxResults) {
+        this.maxResults = maxResults;
+    }
+
+	public Integer getNumberOfResults() {
+        return this.numberOfResults;
+    }
+
+	public void setNumberOfResults(Integer numberOfResults) {
+        this.numberOfResults = numberOfResults;
+    }
+
+	public Collection<Container> getResults() {
+        return this.results;
+    }
+
+	public void setResults(Collection<Container> results) {
+        this.results = results;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static ContainerQueryResultDTO fromJsonToContainerQueryResultDTO(String json) {
+        return new JSONDeserializer<ContainerQueryResultDTO>()
+        .use(null, ContainerQueryResultDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ContainerQueryResultDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ContainerQueryResultDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ContainerQueryResultDTO> fromJsonArrayToCoes(String json) {
+        return new JSONDeserializer<List<ContainerQueryResultDTO>>()
+        .use("values", ContainerQueryResultDTO.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerQueryResultDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ContainerQueryResultDTO_Roo_JavaBean.aj
deleted file mode 100644
index 8c8b9eb29..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerQueryResultDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,36 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.dto.ContainerQueryResultDTO;
-import java.util.Collection;
-
-privileged aspect ContainerQueryResultDTO_Roo_JavaBean {
-    
-    public Integer ContainerQueryResultDTO.getMaxResults() {
-        return this.maxResults;
-    }
-    
-    public void ContainerQueryResultDTO.setMaxResults(Integer maxResults) {
-        this.maxResults = maxResults;
-    }
-    
-    public Integer ContainerQueryResultDTO.getNumberOfResults() {
-        return this.numberOfResults;
-    }
-    
-    public void ContainerQueryResultDTO.setNumberOfResults(Integer numberOfResults) {
-        this.numberOfResults = numberOfResults;
-    }
-    
-    public Collection<Container> ContainerQueryResultDTO.getResults() {
-        return this.results;
-    }
-    
-    public void ContainerQueryResultDTO.setResults(Collection<Container> results) {
-        this.results = results;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerQueryResultDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ContainerQueryResultDTO_Roo_Json.aj
deleted file mode 100644
index aa752e3fa..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerQueryResultDTO_Roo_Json.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerQueryResultDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ContainerQueryResultDTO_Roo_Json {
-    
-    public static ContainerQueryResultDTO ContainerQueryResultDTO.fromJsonToContainerQueryResultDTO(String json) {
-        return new JSONDeserializer<ContainerQueryResultDTO>()
-        .use(null, ContainerQueryResultDTO.class).deserialize(json);
-    }
-    
-    public static String ContainerQueryResultDTO.toJsonArray(Collection<ContainerQueryResultDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ContainerQueryResultDTO.toJsonArray(Collection<ContainerQueryResultDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ContainerQueryResultDTO> ContainerQueryResultDTO.fromJsonArrayToCoes(String json) {
-        return new JSONDeserializer<List<ContainerQueryResultDTO>>()
-        .use("values", ContainerQueryResultDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerQueryResultDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ContainerQueryResultDTO_Roo_ToString.aj
deleted file mode 100644
index e7454c726..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerQueryResultDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerQueryResultDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ContainerQueryResultDTO_Roo_ToString {
-    
-    public String ContainerQueryResultDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerRequestDTO.java
index 5d1daf9b1..3ef721a09 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerRequestDTO.java
@@ -1,8 +1,13 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 import java.math.BigDecimal;
+import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -28,6 +33,80 @@ public ContainerRequestDTO(String containerCodeName, String modifiedBy, Date mod
 	}
 	
 
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ContainerRequestDTO fromJsonToContainerRequestDTO(String json) {
+        return new JSONDeserializer<ContainerRequestDTO>()
+        .use(null, ContainerRequestDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ContainerRequestDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ContainerRequestDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ContainerRequestDTO> fromJsonArrayToCoes(String json) {
+        return new JSONDeserializer<List<ContainerRequestDTO>>()
+        .use("values", ContainerRequestDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getContainerCodeName() {
+        return this.containerCodeName;
+    }
+
+	public void setContainerCodeName(String containerCodeName) {
+        this.containerCodeName = containerCodeName;
+    }
+
+	public BigDecimal getAmount() {
+        return this.amount;
+    }
+
+	public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+	public String getAmountUnits() {
+        return this.amountUnits;
+    }
+
+	public void setAmountUnits(String amountUnits) {
+        this.amountUnits = amountUnits;
+    }
+
+	public String getModifiedBy() {
+        return this.modifiedBy;
+    }
+
+	public void setModifiedBy(String modifiedBy) {
+        this.modifiedBy = modifiedBy;
+    }
+
+	public Date getModifiedDate() {
+        return this.modifiedDate;
+    }
+
+	public void setModifiedDate(Date modifiedDate) {
+        this.modifiedDate = modifiedDate;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerRequestDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ContainerRequestDTO_Roo_JavaBean.aj
deleted file mode 100644
index a2be79671..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerRequestDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,52 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerRequestDTO;
-import java.math.BigDecimal;
-import java.util.Date;
-
-privileged aspect ContainerRequestDTO_Roo_JavaBean {
-    
-    public String ContainerRequestDTO.getContainerCodeName() {
-        return this.containerCodeName;
-    }
-    
-    public void ContainerRequestDTO.setContainerCodeName(String containerCodeName) {
-        this.containerCodeName = containerCodeName;
-    }
-    
-    public BigDecimal ContainerRequestDTO.getAmount() {
-        return this.amount;
-    }
-    
-    public void ContainerRequestDTO.setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
-    
-    public String ContainerRequestDTO.getAmountUnits() {
-        return this.amountUnits;
-    }
-    
-    public void ContainerRequestDTO.setAmountUnits(String amountUnits) {
-        this.amountUnits = amountUnits;
-    }
-    
-    public String ContainerRequestDTO.getModifiedBy() {
-        return this.modifiedBy;
-    }
-    
-    public void ContainerRequestDTO.setModifiedBy(String modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
-    
-    public Date ContainerRequestDTO.getModifiedDate() {
-        return this.modifiedDate;
-    }
-    
-    public void ContainerRequestDTO.setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerRequestDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ContainerRequestDTO_Roo_Json.aj
deleted file mode 100644
index f6b3c8aab..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerRequestDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerRequestDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ContainerRequestDTO_Roo_Json {
-    
-    public String ContainerRequestDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ContainerRequestDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ContainerRequestDTO ContainerRequestDTO.fromJsonToContainerRequestDTO(String json) {
-        return new JSONDeserializer<ContainerRequestDTO>()
-        .use(null, ContainerRequestDTO.class).deserialize(json);
-    }
-    
-    public static String ContainerRequestDTO.toJsonArray(Collection<ContainerRequestDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ContainerRequestDTO.toJsonArray(Collection<ContainerRequestDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ContainerRequestDTO> ContainerRequestDTO.fromJsonArrayToCoes(String json) {
-        return new JSONDeserializer<List<ContainerRequestDTO>>()
-        .use("values", ContainerRequestDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerRequestDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ContainerRequestDTO_Roo_ToString.aj
deleted file mode 100644
index fb089f89a..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerRequestDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerRequestDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ContainerRequestDTO_Roo_ToString {
-    
-    public String ContainerRequestDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerSearchRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerSearchRequestDTO.java
index dba45b126..1137cb953 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerSearchRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerSearchRequestDTO.java
@@ -1,10 +1,14 @@
 package com.labsynch.labseer.dto;
 
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 
 @RooJavaBean
 @RooToString
@@ -34,4 +38,92 @@ public String toJson() {
         return new JSONSerializer().exclude("*.class").serialize(this);
     }
 	
+
+	public static ContainerSearchRequestDTO fromJsonToContainerSearchRequestDTO(String json) {
+        return new JSONDeserializer<ContainerSearchRequestDTO>()
+        .use(null, ContainerSearchRequestDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ContainerSearchRequestDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ContainerSearchRequestDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ContainerSearchRequestDTO> fromJsonArrayToCoes(String json) {
+        return new JSONDeserializer<List<ContainerSearchRequestDTO>>()
+        .use("values", ContainerSearchRequestDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getBarcode() {
+        return this.barcode;
+    }
+
+	public void setBarcode(String barcode) {
+        this.barcode = barcode;
+    }
+
+	public String getDefinition() {
+        return this.definition;
+    }
+
+	public void setDefinition(String definition) {
+        this.definition = definition;
+    }
+
+	public String getStatus() {
+        return this.status;
+    }
+
+	public void setStatus(String status) {
+        this.status = status;
+    }
+
+	public String getDescription() {
+        return this.description;
+    }
+
+	public void setDescription(String description) {
+        this.description = description;
+    }
+
+	public String getCreatedUser() {
+        return this.createdUser;
+    }
+
+	public void setCreatedUser(String createdUser) {
+        this.createdUser = createdUser;
+    }
+
+	public String getType() {
+        return this.type;
+    }
+
+	public void setType(String type) {
+        this.type = type;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerSearchRequestDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ContainerSearchRequestDTO_Roo_JavaBean.aj
deleted file mode 100644
index d55626e6b..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerSearchRequestDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,74 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerSearchRequestDTO;
-
-privileged aspect ContainerSearchRequestDTO_Roo_JavaBean {
-    
-    public String ContainerSearchRequestDTO.getBarcode() {
-        return this.barcode;
-    }
-    
-    public void ContainerSearchRequestDTO.setBarcode(String barcode) {
-        this.barcode = barcode;
-    }
-    
-    public String ContainerSearchRequestDTO.getDefinition() {
-        return this.definition;
-    }
-    
-    public void ContainerSearchRequestDTO.setDefinition(String definition) {
-        this.definition = definition;
-    }
-    
-    public String ContainerSearchRequestDTO.getStatus() {
-        return this.status;
-    }
-    
-    public void ContainerSearchRequestDTO.setStatus(String status) {
-        this.status = status;
-    }
-    
-    public String ContainerSearchRequestDTO.getDescription() {
-        return this.description;
-    }
-    
-    public void ContainerSearchRequestDTO.setDescription(String description) {
-        this.description = description;
-    }
-    
-    public String ContainerSearchRequestDTO.getCreatedUser() {
-        return this.createdUser;
-    }
-    
-    public void ContainerSearchRequestDTO.setCreatedUser(String createdUser) {
-        this.createdUser = createdUser;
-    }
-    
-    public String ContainerSearchRequestDTO.getType() {
-        return this.type;
-    }
-    
-    public void ContainerSearchRequestDTO.setType(String type) {
-        this.type = type;
-    }
-    
-    public String ContainerSearchRequestDTO.getLsType() {
-        return this.lsType;
-    }
-    
-    public void ContainerSearchRequestDTO.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String ContainerSearchRequestDTO.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void ContainerSearchRequestDTO.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerSearchRequestDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ContainerSearchRequestDTO_Roo_Json.aj
deleted file mode 100644
index 112db026c..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerSearchRequestDTO_Roo_Json.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerSearchRequestDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ContainerSearchRequestDTO_Roo_Json {
-    
-    public static ContainerSearchRequestDTO ContainerSearchRequestDTO.fromJsonToContainerSearchRequestDTO(String json) {
-        return new JSONDeserializer<ContainerSearchRequestDTO>()
-        .use(null, ContainerSearchRequestDTO.class).deserialize(json);
-    }
-    
-    public static String ContainerSearchRequestDTO.toJsonArray(Collection<ContainerSearchRequestDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ContainerSearchRequestDTO.toJsonArray(Collection<ContainerSearchRequestDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ContainerSearchRequestDTO> ContainerSearchRequestDTO.fromJsonArrayToCoes(String json) {
-        return new JSONDeserializer<List<ContainerSearchRequestDTO>>()
-        .use("values", ContainerSearchRequestDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerSearchRequestDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ContainerSearchRequestDTO_Roo_ToString.aj
deleted file mode 100644
index 577640d13..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerSearchRequestDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerSearchRequestDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ContainerSearchRequestDTO_Roo_ToString {
-    
-    public String ContainerSearchRequestDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerStateMiniDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerStateMiniDTO.java
index 35602d634..2c67381a2 100755
--- a/src/main/java/com/labsynch/labseer/dto/ContainerStateMiniDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerStateMiniDTO.java
@@ -1,10 +1,16 @@
 package com.labsynch.labseer.dto;
 
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.ContainerState;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 
 @RooJavaBean
 @RooToString
@@ -21,5 +27,63 @@ public ContainerStateMiniDTO(ContainerState state) {
 
 	private ContainerMiniDTO container;
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ContainerStateMiniDTO fromJsonToContainerStateMiniDTO(String json) {
+        return new JSONDeserializer<ContainerStateMiniDTO>()
+        .use(null, ContainerStateMiniDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ContainerStateMiniDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ContainerStateMiniDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ContainerStateMiniDTO> fromJsonArrayToCoes(String json) {
+        return new JSONDeserializer<List<ContainerStateMiniDTO>>()
+        .use("values", ContainerStateMiniDTO.class).deserialize(json);
+    }
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public ContainerMiniDTO getContainer() {
+        return this.container;
+    }
+
+	public void setContainer(ContainerMiniDTO container) {
+        this.container = container;
+    }
 }
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerStateMiniDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ContainerStateMiniDTO_Roo_JavaBean.aj
deleted file mode 100755
index de12d57ef..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerStateMiniDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerMiniDTO;
-import com.labsynch.labseer.dto.ContainerStateMiniDTO;
-
-privileged aspect ContainerStateMiniDTO_Roo_JavaBean {
-    
-    public Long ContainerStateMiniDTO.getId() {
-        return this.id;
-    }
-    
-    public void ContainerStateMiniDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer ContainerStateMiniDTO.getVersion() {
-        return this.version;
-    }
-    
-    public void ContainerStateMiniDTO.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-    public ContainerMiniDTO ContainerStateMiniDTO.getContainer() {
-        return this.container;
-    }
-    
-    public void ContainerStateMiniDTO.setContainer(ContainerMiniDTO container) {
-        this.container = container;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerStateMiniDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ContainerStateMiniDTO_Roo_Json.aj
deleted file mode 100755
index 8edd9fd21..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerStateMiniDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerStateMiniDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ContainerStateMiniDTO_Roo_Json {
-    
-    public String ContainerStateMiniDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ContainerStateMiniDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ContainerStateMiniDTO ContainerStateMiniDTO.fromJsonToContainerStateMiniDTO(String json) {
-        return new JSONDeserializer<ContainerStateMiniDTO>()
-        .use(null, ContainerStateMiniDTO.class).deserialize(json);
-    }
-    
-    public static String ContainerStateMiniDTO.toJsonArray(Collection<ContainerStateMiniDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ContainerStateMiniDTO.toJsonArray(Collection<ContainerStateMiniDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ContainerStateMiniDTO> ContainerStateMiniDTO.fromJsonArrayToCoes(String json) {
-        return new JSONDeserializer<List<ContainerStateMiniDTO>>()
-        .use("values", ContainerStateMiniDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerStateMiniDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ContainerStateMiniDTO_Roo_ToString.aj
deleted file mode 100755
index 507637733..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerStateMiniDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerStateMiniDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ContainerStateMiniDTO_Roo_ToString {
-    
-    public String ContainerStateMiniDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerStatePathDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerStatePathDTO.java
index ce3a0f035..b5bd9a45a 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerStatePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerStatePathDTO.java
@@ -1,14 +1,16 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.ContainerState;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -34,6 +36,52 @@ public String toJson() {
 	public static String toJsonArray(Collection<ContainerStatePathDTO> collection) {
         return new JSONSerializer().include("states.lsValues").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
     }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static ContainerStatePathDTO fromJsonToContainerStatePathDTO(String json) {
+        return new JSONDeserializer<ContainerStatePathDTO>()
+        .use(null, ContainerStatePathDTO.class).deserialize(json);
+    }
+
+	public static Collection<ContainerStatePathDTO> fromJsonArrayToCoes(String json) {
+        return new JSONDeserializer<List<ContainerStatePathDTO>>()
+        .use("values", ContainerStatePathDTO.class).deserialize(json);
+    }
+
+	public String getIdOrCodeName() {
+        return this.idOrCodeName;
+    }
+
+	public void setIdOrCodeName(String idOrCodeName) {
+        this.idOrCodeName = idOrCodeName;
+    }
+
+	public String getStateType() {
+        return this.stateType;
+    }
+
+	public void setStateType(String stateType) {
+        this.stateType = stateType;
+    }
+
+	public String getStateKind() {
+        return this.stateKind;
+    }
+
+	public void setStateKind(String stateKind) {
+        this.stateKind = stateKind;
+    }
+
+	public Collection<ContainerState> getStates() {
+        return this.states;
+    }
+
+	public void setStates(Collection<ContainerState> states) {
+        this.states = states;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerStatePathDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ContainerStatePathDTO_Roo_JavaBean.aj
deleted file mode 100644
index 3649ad835..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerStatePathDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,44 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.ContainerState;
-import com.labsynch.labseer.dto.ContainerStatePathDTO;
-import java.util.Collection;
-
-privileged aspect ContainerStatePathDTO_Roo_JavaBean {
-    
-    public String ContainerStatePathDTO.getIdOrCodeName() {
-        return this.idOrCodeName;
-    }
-    
-    public void ContainerStatePathDTO.setIdOrCodeName(String idOrCodeName) {
-        this.idOrCodeName = idOrCodeName;
-    }
-    
-    public String ContainerStatePathDTO.getStateType() {
-        return this.stateType;
-    }
-    
-    public void ContainerStatePathDTO.setStateType(String stateType) {
-        this.stateType = stateType;
-    }
-    
-    public String ContainerStatePathDTO.getStateKind() {
-        return this.stateKind;
-    }
-    
-    public void ContainerStatePathDTO.setStateKind(String stateKind) {
-        this.stateKind = stateKind;
-    }
-    
-    public Collection<ContainerState> ContainerStatePathDTO.getStates() {
-        return this.states;
-    }
-    
-    public void ContainerStatePathDTO.setStates(Collection<ContainerState> states) {
-        this.states = states;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerStatePathDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ContainerStatePathDTO_Roo_Json.aj
deleted file mode 100644
index 02c4cfe27..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerStatePathDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerStatePathDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ContainerStatePathDTO_Roo_Json {
-    
-    public static ContainerStatePathDTO ContainerStatePathDTO.fromJsonToContainerStatePathDTO(String json) {
-        return new JSONDeserializer<ContainerStatePathDTO>()
-        .use(null, ContainerStatePathDTO.class).deserialize(json);
-    }
-    
-    public static Collection<ContainerStatePathDTO> ContainerStatePathDTO.fromJsonArrayToCoes(String json) {
-        return new JSONDeserializer<List<ContainerStatePathDTO>>()
-        .use("values", ContainerStatePathDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerStatePathDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ContainerStatePathDTO_Roo_ToString.aj
deleted file mode 100644
index f4e966c3b..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerStatePathDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerStatePathDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ContainerStatePathDTO_Roo_ToString {
-    
-    public String ContainerStatePathDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerSubjectsDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerSubjectsDTO.java
index 5bf55fc64..5fce9a3ca 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerSubjectsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerSubjectsDTO.java
@@ -2,14 +2,16 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.Subject;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -41,6 +43,52 @@ public static String toJsonArrayStub(Collection<ContainerSubjectsDTO> collection
         return new JSONSerializer().include("subjects").exclude("*.class","subjects.lsStates","subjects.lsLabels").transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
+
+	public String getContainerIdOrCodeName() {
+        return this.containerIdOrCodeName;
+    }
+
+	public void setContainerIdOrCodeName(String containerIdOrCodeName) {
+        this.containerIdOrCodeName = containerIdOrCodeName;
+    }
+
+	public String getInteractionType() {
+        return this.interactionType;
+    }
+
+	public void setInteractionType(String interactionType) {
+        this.interactionType = interactionType;
+    }
+
+	public String getInteractionKind() {
+        return this.interactionKind;
+    }
+
+	public void setInteractionKind(String interactionKind) {
+        this.interactionKind = interactionKind;
+    }
+
+	public Collection<Subject> getSubjects() {
+        return this.subjects;
+    }
+
+	public void setSubjects(Collection<Subject> subjects) {
+        this.subjects = subjects;
+    }
+
+	public static ContainerSubjectsDTO fromJsonToContainerSubjectsDTO(String json) {
+        return new JSONDeserializer<ContainerSubjectsDTO>()
+        .use(null, ContainerSubjectsDTO.class).deserialize(json);
+    }
+
+	public static Collection<ContainerSubjectsDTO> fromJsonArrayToCoes(String json) {
+        return new JSONDeserializer<List<ContainerSubjectsDTO>>()
+        .use("values", ContainerSubjectsDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerSubjectsDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ContainerSubjectsDTO_Roo_JavaBean.aj
deleted file mode 100644
index 289afa5d8..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerSubjectsDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,44 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.dto.ContainerSubjectsDTO;
-import java.util.Collection;
-
-privileged aspect ContainerSubjectsDTO_Roo_JavaBean {
-    
-    public String ContainerSubjectsDTO.getContainerIdOrCodeName() {
-        return this.containerIdOrCodeName;
-    }
-    
-    public void ContainerSubjectsDTO.setContainerIdOrCodeName(String containerIdOrCodeName) {
-        this.containerIdOrCodeName = containerIdOrCodeName;
-    }
-    
-    public String ContainerSubjectsDTO.getInteractionType() {
-        return this.interactionType;
-    }
-    
-    public void ContainerSubjectsDTO.setInteractionType(String interactionType) {
-        this.interactionType = interactionType;
-    }
-    
-    public String ContainerSubjectsDTO.getInteractionKind() {
-        return this.interactionKind;
-    }
-    
-    public void ContainerSubjectsDTO.setInteractionKind(String interactionKind) {
-        this.interactionKind = interactionKind;
-    }
-    
-    public Collection<Subject> ContainerSubjectsDTO.getSubjects() {
-        return this.subjects;
-    }
-    
-    public void ContainerSubjectsDTO.setSubjects(Collection<Subject> subjects) {
-        this.subjects = subjects;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerSubjectsDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ContainerSubjectsDTO_Roo_Json.aj
deleted file mode 100644
index eb20662cb..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerSubjectsDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerSubjectsDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ContainerSubjectsDTO_Roo_Json {
-    
-    public static ContainerSubjectsDTO ContainerSubjectsDTO.fromJsonToContainerSubjectsDTO(String json) {
-        return new JSONDeserializer<ContainerSubjectsDTO>()
-        .use(null, ContainerSubjectsDTO.class).deserialize(json);
-    }
-    
-    public static Collection<ContainerSubjectsDTO> ContainerSubjectsDTO.fromJsonArrayToCoes(String json) {
-        return new JSONDeserializer<List<ContainerSubjectsDTO>>()
-        .use("values", ContainerSubjectsDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerSubjectsDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ContainerSubjectsDTO_Roo_ToString.aj
deleted file mode 100644
index 7351ed2ae..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerSubjectsDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerSubjectsDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ContainerSubjectsDTO_Roo_ToString {
-    
-    public String ContainerSubjectsDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerValuePathDTO.java
index 630273c95..9910c76c3 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerValuePathDTO.java
@@ -1,14 +1,16 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.ContainerValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -38,6 +40,68 @@ public String toJson() {
 	public static String toJsonArray(Collection<ContainerValuePathDTO> collection) {
         return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
     }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getIdOrCodeName() {
+        return this.idOrCodeName;
+    }
+
+	public void setIdOrCodeName(String idOrCodeName) {
+        this.idOrCodeName = idOrCodeName;
+    }
+
+	public String getStateType() {
+        return this.stateType;
+    }
+
+	public void setStateType(String stateType) {
+        this.stateType = stateType;
+    }
+
+	public String getStateKind() {
+        return this.stateKind;
+    }
+
+	public void setStateKind(String stateKind) {
+        this.stateKind = stateKind;
+    }
+
+	public String getValueType() {
+        return this.valueType;
+    }
+
+	public void setValueType(String valueType) {
+        this.valueType = valueType;
+    }
+
+	public String getValueKind() {
+        return this.valueKind;
+    }
+
+	public void setValueKind(String valueKind) {
+        this.valueKind = valueKind;
+    }
+
+	public Collection<ContainerValue> getValues() {
+        return this.values;
+    }
+
+	public void setValues(Collection<ContainerValue> values) {
+        this.values = values;
+    }
+
+	public static ContainerValuePathDTO fromJsonToContainerValuePathDTO(String json) {
+        return new JSONDeserializer<ContainerValuePathDTO>()
+        .use(null, ContainerValuePathDTO.class).deserialize(json);
+    }
+
+	public static Collection<ContainerValuePathDTO> fromJsonArrayToCoes(String json) {
+        return new JSONDeserializer<List<ContainerValuePathDTO>>()
+        .use("values", ContainerValuePathDTO.class).deserialize(json);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerValuePathDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ContainerValuePathDTO_Roo_JavaBean.aj
deleted file mode 100644
index 169d47f9a..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerValuePathDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,60 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.ContainerValue;
-import com.labsynch.labseer.dto.ContainerValuePathDTO;
-import java.util.Collection;
-
-privileged aspect ContainerValuePathDTO_Roo_JavaBean {
-    
-    public String ContainerValuePathDTO.getIdOrCodeName() {
-        return this.idOrCodeName;
-    }
-    
-    public void ContainerValuePathDTO.setIdOrCodeName(String idOrCodeName) {
-        this.idOrCodeName = idOrCodeName;
-    }
-    
-    public String ContainerValuePathDTO.getStateType() {
-        return this.stateType;
-    }
-    
-    public void ContainerValuePathDTO.setStateType(String stateType) {
-        this.stateType = stateType;
-    }
-    
-    public String ContainerValuePathDTO.getStateKind() {
-        return this.stateKind;
-    }
-    
-    public void ContainerValuePathDTO.setStateKind(String stateKind) {
-        this.stateKind = stateKind;
-    }
-    
-    public String ContainerValuePathDTO.getValueType() {
-        return this.valueType;
-    }
-    
-    public void ContainerValuePathDTO.setValueType(String valueType) {
-        this.valueType = valueType;
-    }
-    
-    public String ContainerValuePathDTO.getValueKind() {
-        return this.valueKind;
-    }
-    
-    public void ContainerValuePathDTO.setValueKind(String valueKind) {
-        this.valueKind = valueKind;
-    }
-    
-    public Collection<ContainerValue> ContainerValuePathDTO.getValues() {
-        return this.values;
-    }
-    
-    public void ContainerValuePathDTO.setValues(Collection<ContainerValue> values) {
-        this.values = values;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerValuePathDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ContainerValuePathDTO_Roo_Json.aj
deleted file mode 100644
index 588868f08..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerValuePathDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerValuePathDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ContainerValuePathDTO_Roo_Json {
-    
-    public static ContainerValuePathDTO ContainerValuePathDTO.fromJsonToContainerValuePathDTO(String json) {
-        return new JSONDeserializer<ContainerValuePathDTO>()
-        .use(null, ContainerValuePathDTO.class).deserialize(json);
-    }
-    
-    public static Collection<ContainerValuePathDTO> ContainerValuePathDTO.fromJsonArrayToCoes(String json) {
-        return new JSONDeserializer<List<ContainerValuePathDTO>>()
-        .use("values", ContainerValuePathDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerValuePathDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ContainerValuePathDTO_Roo_ToString.aj
deleted file mode 100644
index b2b9fb166..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerValuePathDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerValuePathDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ContainerValuePathDTO_Roo_ToString {
-    
-    public String ContainerValuePathDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerValueRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerValueRequestDTO.java
index 0109794f4..818962e59 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerValueRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerValueRequestDTO.java
@@ -1,10 +1,16 @@
 package com.labsynch.labseer.dto;
 
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.Container;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 
 @RooJavaBean
 @RooToString
@@ -20,6 +26,96 @@ public class ContainerValueRequestDTO {
 	private String value;
 	
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ContainerValueRequestDTO fromJsonToContainerValueRequestDTO(String json) {
+        return new JSONDeserializer<ContainerValueRequestDTO>()
+        .use(null, ContainerValueRequestDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ContainerValueRequestDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ContainerValueRequestDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ContainerValueRequestDTO> fromJsonArrayToCoes(String json) {
+        return new JSONDeserializer<List<ContainerValueRequestDTO>>()
+        .use("values", ContainerValueRequestDTO.class).deserialize(json);
+    }
+
+	public String getContainerType() {
+        return this.containerType;
+    }
+
+	public void setContainerType(String containerType) {
+        this.containerType = containerType;
+    }
+
+	public String getContainerKind() {
+        return this.containerKind;
+    }
+
+	public void setContainerKind(String containerKind) {
+        this.containerKind = containerKind;
+    }
+
+	public String getStateType() {
+        return this.stateType;
+    }
+
+	public void setStateType(String stateType) {
+        this.stateType = stateType;
+    }
+
+	public String getStateKind() {
+        return this.stateKind;
+    }
+
+	public void setStateKind(String stateKind) {
+        this.stateKind = stateKind;
+    }
+
+	public String getValueType() {
+        return this.valueType;
+    }
+
+	public void setValueType(String valueType) {
+        this.valueType = valueType;
+    }
+
+	public String getValueKind() {
+        return this.valueKind;
+    }
+
+	public void setValueKind(String valueKind) {
+        this.valueKind = valueKind;
+    }
+
+	public String getValue() {
+        return this.value;
+    }
+
+	public void setValue(String value) {
+        this.value = value;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerValueRequestDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ContainerValueRequestDTO_Roo_JavaBean.aj
deleted file mode 100644
index ec8e8bded..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerValueRequestDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,66 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerValueRequestDTO;
-
-privileged aspect ContainerValueRequestDTO_Roo_JavaBean {
-    
-    public String ContainerValueRequestDTO.getContainerType() {
-        return this.containerType;
-    }
-    
-    public void ContainerValueRequestDTO.setContainerType(String containerType) {
-        this.containerType = containerType;
-    }
-    
-    public String ContainerValueRequestDTO.getContainerKind() {
-        return this.containerKind;
-    }
-    
-    public void ContainerValueRequestDTO.setContainerKind(String containerKind) {
-        this.containerKind = containerKind;
-    }
-    
-    public String ContainerValueRequestDTO.getStateType() {
-        return this.stateType;
-    }
-    
-    public void ContainerValueRequestDTO.setStateType(String stateType) {
-        this.stateType = stateType;
-    }
-    
-    public String ContainerValueRequestDTO.getStateKind() {
-        return this.stateKind;
-    }
-    
-    public void ContainerValueRequestDTO.setStateKind(String stateKind) {
-        this.stateKind = stateKind;
-    }
-    
-    public String ContainerValueRequestDTO.getValueType() {
-        return this.valueType;
-    }
-    
-    public void ContainerValueRequestDTO.setValueType(String valueType) {
-        this.valueType = valueType;
-    }
-    
-    public String ContainerValueRequestDTO.getValueKind() {
-        return this.valueKind;
-    }
-    
-    public void ContainerValueRequestDTO.setValueKind(String valueKind) {
-        this.valueKind = valueKind;
-    }
-    
-    public String ContainerValueRequestDTO.getValue() {
-        return this.value;
-    }
-    
-    public void ContainerValueRequestDTO.setValue(String value) {
-        this.value = value;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerValueRequestDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ContainerValueRequestDTO_Roo_Json.aj
deleted file mode 100644
index 29adf737c..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerValueRequestDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerValueRequestDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ContainerValueRequestDTO_Roo_Json {
-    
-    public String ContainerValueRequestDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ContainerValueRequestDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ContainerValueRequestDTO ContainerValueRequestDTO.fromJsonToContainerValueRequestDTO(String json) {
-        return new JSONDeserializer<ContainerValueRequestDTO>()
-        .use(null, ContainerValueRequestDTO.class).deserialize(json);
-    }
-    
-    public static String ContainerValueRequestDTO.toJsonArray(Collection<ContainerValueRequestDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ContainerValueRequestDTO.toJsonArray(Collection<ContainerValueRequestDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ContainerValueRequestDTO> ContainerValueRequestDTO.fromJsonArrayToCoes(String json) {
-        return new JSONDeserializer<List<ContainerValueRequestDTO>>()
-        .use("values", ContainerValueRequestDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerValueRequestDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ContainerValueRequestDTO_Roo_ToString.aj
deleted file mode 100644
index 4f1554b27..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerValueRequestDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerValueRequestDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ContainerValueRequestDTO_Roo_ToString {
-    
-    public String ContainerValueRequestDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerWellCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerWellCodeDTO.java
index 5881c310f..72a59702e 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerWellCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerWellCodeDTO.java
@@ -2,13 +2,14 @@
 
 import java.util.Collection;
 import java.util.List;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -35,6 +36,36 @@ public static String toJsonArray(Collection<ContainerWellCodeDTO> collection) {
         return new JSONSerializer().include("wellCodeNames").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static ContainerWellCodeDTO fromJsonToContainerWellCodeDTO(String json) {
+        return new JSONDeserializer<ContainerWellCodeDTO>()
+        .use(null, ContainerWellCodeDTO.class).deserialize(json);
+    }
+
+	public static Collection<ContainerWellCodeDTO> fromJsonArrayToContainerWellCoes(String json) {
+        return new JSONDeserializer<List<ContainerWellCodeDTO>>()
+        .use("values", ContainerWellCodeDTO.class).deserialize(json);
+    }
+
+	public String getRequestCodeName() {
+        return this.requestCodeName;
+    }
+
+	public void setRequestCodeName(String requestCodeName) {
+        this.requestCodeName = requestCodeName;
+    }
+
+	public List<String> getWellCodeNames() {
+        return this.wellCodeNames;
+    }
+
+	public void setWellCodeNames(List<String> wellCodeNames) {
+        this.wellCodeNames = wellCodeNames;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerWellCodeDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ContainerWellCodeDTO_Roo_JavaBean.aj
deleted file mode 100644
index eed02d33e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerWellCodeDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,27 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerWellCodeDTO;
-import java.util.List;
-
-privileged aspect ContainerWellCodeDTO_Roo_JavaBean {
-    
-    public String ContainerWellCodeDTO.getRequestCodeName() {
-        return this.requestCodeName;
-    }
-    
-    public void ContainerWellCodeDTO.setRequestCodeName(String requestCodeName) {
-        this.requestCodeName = requestCodeName;
-    }
-    
-    public List<String> ContainerWellCodeDTO.getWellCodeNames() {
-        return this.wellCodeNames;
-    }
-    
-    public void ContainerWellCodeDTO.setWellCodeNames(List<String> wellCodeNames) {
-        this.wellCodeNames = wellCodeNames;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerWellCodeDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ContainerWellCodeDTO_Roo_Json.aj
deleted file mode 100644
index 17c6bb91b..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerWellCodeDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerWellCodeDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ContainerWellCodeDTO_Roo_Json {
-    
-    public static ContainerWellCodeDTO ContainerWellCodeDTO.fromJsonToContainerWellCodeDTO(String json) {
-        return new JSONDeserializer<ContainerWellCodeDTO>()
-        .use(null, ContainerWellCodeDTO.class).deserialize(json);
-    }
-    
-    public static Collection<ContainerWellCodeDTO> ContainerWellCodeDTO.fromJsonArrayToContainerWellCoes(String json) {
-        return new JSONDeserializer<List<ContainerWellCodeDTO>>()
-        .use("values", ContainerWellCodeDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerWellCodeDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ContainerWellCodeDTO_Roo_ToString.aj
deleted file mode 100644
index 5b3de6ad6..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ContainerWellCodeDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerWellCodeDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ContainerWellCodeDTO_Roo_ToString {
-    
-    public String ContainerWellCodeDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CorpNameDTO.java b/src/main/java/com/labsynch/labseer/dto/CorpNameDTO.java
index 5f608314e..7cad6b917 100644
--- a/src/main/java/com/labsynch/labseer/dto/CorpNameDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CorpNameDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -13,4 +19,54 @@ public class CorpNameDTO{
 	
 	private String corpName;
 
+
+	public int getCorpNumber() {
+        return this.corpNumber;
+    }
+
+	public void setCorpNumber(int corpNumber) {
+        this.corpNumber = corpNumber;
+    }
+
+	public String getCorpName() {
+        return this.corpName;
+    }
+
+	public void setCorpName(String corpName) {
+        this.corpName = corpName;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static CorpNameDTO fromJsonToCorpNameDTO(String json) {
+        return new JSONDeserializer<CorpNameDTO>()
+        .use(null, CorpNameDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<CorpNameDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<CorpNameDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<CorpNameDTO> fromJsonArrayToCoes(String json) {
+        return new JSONDeserializer<List<CorpNameDTO>>()
+        .use("values", CorpNameDTO.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/CorpNameDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/CorpNameDTO_Roo_JavaBean.aj
deleted file mode 100644
index e4dc49645..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CorpNameDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CorpNameDTO;
-
-privileged aspect CorpNameDTO_Roo_JavaBean {
-    
-    public int CorpNameDTO.getCorpNumber() {
-        return this.corpNumber;
-    }
-    
-    public void CorpNameDTO.setCorpNumber(int corpNumber) {
-        this.corpNumber = corpNumber;
-    }
-    
-    public String CorpNameDTO.getCorpName() {
-        return this.corpName;
-    }
-    
-    public void CorpNameDTO.setCorpName(String corpName) {
-        this.corpName = corpName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CorpNameDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/CorpNameDTO_Roo_Json.aj
deleted file mode 100644
index d2b9f877e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CorpNameDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CorpNameDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect CorpNameDTO_Roo_Json {
-    
-    public String CorpNameDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String CorpNameDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static CorpNameDTO CorpNameDTO.fromJsonToCorpNameDTO(String json) {
-        return new JSONDeserializer<CorpNameDTO>()
-        .use(null, CorpNameDTO.class).deserialize(json);
-    }
-    
-    public static String CorpNameDTO.toJsonArray(Collection<CorpNameDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String CorpNameDTO.toJsonArray(Collection<CorpNameDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<CorpNameDTO> CorpNameDTO.fromJsonArrayToCoes(String json) {
-        return new JSONDeserializer<List<CorpNameDTO>>()
-        .use("values", CorpNameDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CorpNameDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/CorpNameDTO_Roo_ToString.aj
deleted file mode 100644
index 0fca32561..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CorpNameDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CorpNameDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect CorpNameDTO_Roo_ToString {
-    
-    public String CorpNameDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CreatePlateRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/CreatePlateRequestDTO.java
index 7a1b33795..92d9c763e 100644
--- a/src/main/java/com/labsynch/labseer/dto/CreatePlateRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CreatePlateRequestDTO.java
@@ -3,11 +3,13 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -39,4 +41,108 @@ public String toJson() {
         return new JSONSerializer().include("wells").exclude("*.class").serialize(this);
     }
 	
+
+	public String getBarcode() {
+        return this.barcode;
+    }
+
+	public void setBarcode(String barcode) {
+        this.barcode = barcode;
+    }
+
+	public String getDefinition() {
+        return this.definition;
+    }
+
+	public void setDefinition(String definition) {
+        this.definition = definition;
+    }
+
+	public String getTemplate() {
+        return this.template;
+    }
+
+	public void setTemplate(String template) {
+        this.template = template;
+    }
+
+	public String getDescription() {
+        return this.description;
+    }
+
+	public void setDescription(String description) {
+        this.description = description;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public String getCreatedUser() {
+        return this.createdUser;
+    }
+
+	public void setCreatedUser(String createdUser) {
+        this.createdUser = createdUser;
+    }
+
+	public Date getCreatedDate() {
+        return this.createdDate;
+    }
+
+	public void setCreatedDate(Date createdDate) {
+        this.createdDate = createdDate;
+    }
+
+	public String getPhysicalState() {
+        return this.physicalState;
+    }
+
+	public void setPhysicalState(String physicalState) {
+        this.physicalState = physicalState;
+    }
+
+	public String getBatchConcentrationUnits() {
+        return this.batchConcentrationUnits;
+    }
+
+	public void setBatchConcentrationUnits(String batchConcentrationUnits) {
+        this.batchConcentrationUnits = batchConcentrationUnits;
+    }
+
+	public Collection<WellContentDTO> getWells() {
+        return this.wells;
+    }
+
+	public void setWells(Collection<WellContentDTO> wells) {
+        this.wells = wells;
+    }
+
+	public static CreatePlateRequestDTO fromJsonToCreatePlateRequestDTO(String json) {
+        return new JSONDeserializer<CreatePlateRequestDTO>()
+        .use(null, CreatePlateRequestDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<CreatePlateRequestDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<CreatePlateRequestDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<CreatePlateRequestDTO> fromJsonArrayToCreatePlateRequestDTO(String json) {
+        return new JSONDeserializer<List<CreatePlateRequestDTO>>()
+        .use("values", CreatePlateRequestDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/CreatePlateRequestDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/CreatePlateRequestDTO_Roo_JavaBean.aj
deleted file mode 100644
index ea8c6f6f6..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CreatePlateRequestDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,93 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CreatePlateRequestDTO;
-import com.labsynch.labseer.dto.WellContentDTO;
-import java.util.Collection;
-import java.util.Date;
-
-privileged aspect CreatePlateRequestDTO_Roo_JavaBean {
-    
-    public String CreatePlateRequestDTO.getBarcode() {
-        return this.barcode;
-    }
-    
-    public void CreatePlateRequestDTO.setBarcode(String barcode) {
-        this.barcode = barcode;
-    }
-    
-    public String CreatePlateRequestDTO.getDefinition() {
-        return this.definition;
-    }
-    
-    public void CreatePlateRequestDTO.setDefinition(String definition) {
-        this.definition = definition;
-    }
-    
-    public String CreatePlateRequestDTO.getTemplate() {
-        return this.template;
-    }
-    
-    public void CreatePlateRequestDTO.setTemplate(String template) {
-        this.template = template;
-    }
-    
-    public String CreatePlateRequestDTO.getDescription() {
-        return this.description;
-    }
-    
-    public void CreatePlateRequestDTO.setDescription(String description) {
-        this.description = description;
-    }
-    
-    public String CreatePlateRequestDTO.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void CreatePlateRequestDTO.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public String CreatePlateRequestDTO.getCreatedUser() {
-        return this.createdUser;
-    }
-    
-    public void CreatePlateRequestDTO.setCreatedUser(String createdUser) {
-        this.createdUser = createdUser;
-    }
-    
-    public Date CreatePlateRequestDTO.getCreatedDate() {
-        return this.createdDate;
-    }
-    
-    public void CreatePlateRequestDTO.setCreatedDate(Date createdDate) {
-        this.createdDate = createdDate;
-    }
-    
-    public String CreatePlateRequestDTO.getPhysicalState() {
-        return this.physicalState;
-    }
-    
-    public void CreatePlateRequestDTO.setPhysicalState(String physicalState) {
-        this.physicalState = physicalState;
-    }
-    
-    public String CreatePlateRequestDTO.getBatchConcentrationUnits() {
-        return this.batchConcentrationUnits;
-    }
-    
-    public void CreatePlateRequestDTO.setBatchConcentrationUnits(String batchConcentrationUnits) {
-        this.batchConcentrationUnits = batchConcentrationUnits;
-    }
-    
-    public Collection<WellContentDTO> CreatePlateRequestDTO.getWells() {
-        return this.wells;
-    }
-    
-    public void CreatePlateRequestDTO.setWells(Collection<WellContentDTO> wells) {
-        this.wells = wells;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CreatePlateRequestDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/CreatePlateRequestDTO_Roo_Json.aj
deleted file mode 100644
index f20e38676..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CreatePlateRequestDTO_Roo_Json.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CreatePlateRequestDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect CreatePlateRequestDTO_Roo_Json {
-    
-    public static CreatePlateRequestDTO CreatePlateRequestDTO.fromJsonToCreatePlateRequestDTO(String json) {
-        return new JSONDeserializer<CreatePlateRequestDTO>()
-        .use(null, CreatePlateRequestDTO.class).deserialize(json);
-    }
-    
-    public static String CreatePlateRequestDTO.toJsonArray(Collection<CreatePlateRequestDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String CreatePlateRequestDTO.toJsonArray(Collection<CreatePlateRequestDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<CreatePlateRequestDTO> CreatePlateRequestDTO.fromJsonArrayToCreatePlateRequestDTO(String json) {
-        return new JSONDeserializer<List<CreatePlateRequestDTO>>()
-        .use("values", CreatePlateRequestDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CreatePlateRequestDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/CreatePlateRequestDTO_Roo_ToString.aj
deleted file mode 100644
index 9d041010a..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CreatePlateRequestDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CreatePlateRequestDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect CreatePlateRequestDTO_Roo_ToString {
-    
-    public String CreatePlateRequestDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CurveFitDTO.java b/src/main/java/com/labsynch/labseer/dto/CurveFitDTO.java
index 1ba1ae7fb..ff76f8231 100644
--- a/src/main/java/com/labsynch/labseer/dto/CurveFitDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CurveFitDTO.java
@@ -14,7 +14,8 @@
 import javax.persistence.EntityManager;
 import javax.persistence.NoResultException;
 import javax.persistence.TypedQuery;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import javax.persistence.NoResultException;
@@ -37,6 +38,8 @@
 import com.labsynch.labseer.domain.SubjectValue;
 import com.labsynch.labseer.domain.TreatmentGroup;
 import com.labsynch.labseer.utils.SimpleUtil;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
 @RooJavaBean
 @RooToString
@@ -977,4 +980,430 @@ public static Collection<ProtocolValue> findDisplayMinMaxByCurveId(String curveI
 		return getDisplayMinMaxByProtocolIds(findProtocolIdsByCurveId(curveId));
 	}
 	
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static CurveFitDTO fromJsonToCurveFitDTO(String json) {
+        return new JSONDeserializer<CurveFitDTO>()
+        .use(null, CurveFitDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<CurveFitDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<CurveFitDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<CurveFitDTO> fromJsonArrayToCurveFitDTO(String json) {
+        return new JSONDeserializer<List<CurveFitDTO>>()
+        .use("values", CurveFitDTO.class).deserialize(json);
+    }
+
+	public String getCurveId() {
+        return this.curveId;
+    }
+
+	public void setCurveId(String curveId) {
+        this.curveId = curveId;
+    }
+
+	public String getAnalysisGroupCode() {
+        return this.analysisGroupCode;
+    }
+
+	public void setAnalysisGroupCode(String analysisGroupCode) {
+        this.analysisGroupCode = analysisGroupCode;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public Date getRecordedDate() {
+        return this.recordedDate;
+    }
+
+	public void setRecordedDate(Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+	public Long getLsTransaction() {
+        return this.lsTransaction;
+    }
+
+	public void setLsTransaction(Long lsTransaction) {
+        this.lsTransaction = lsTransaction;
+    }
+
+	public String getBatchCode() {
+        return this.batchCode;
+    }
+
+	public void setBatchCode(String batchCode) {
+        this.batchCode = batchCode;
+    }
+
+	public String getCategory() {
+        return this.category;
+    }
+
+	public void setCategory(String category) {
+        this.category = category;
+    }
+
+	public String getRenderingHint() {
+        return this.renderingHint;
+    }
+
+	public void setRenderingHint(String renderingHint) {
+        this.renderingHint = renderingHint;
+    }
+
+	public String getMin() {
+        return this.min;
+    }
+
+	public void setMin(String min) {
+        this.min = min;
+    }
+
+	public String getMax() {
+        return this.max;
+    }
+
+	public void setMax(String max) {
+        this.max = max;
+    }
+
+	public String getEc50() {
+        return this.ec50;
+    }
+
+	public void setEc50(String ec50) {
+        this.ec50 = ec50;
+    }
+
+	public String getMinUnits() {
+        return this.minUnits;
+    }
+
+	public void setMinUnits(String minUnits) {
+        this.minUnits = minUnits;
+    }
+
+	public String getMaxUnits() {
+        return this.maxUnits;
+    }
+
+	public void setMaxUnits(String maxUnits) {
+        this.maxUnits = maxUnits;
+    }
+
+	public String getEc50Units() {
+        return this.ec50Units;
+    }
+
+	public void setEc50Units(String ec50Units) {
+        this.ec50Units = ec50Units;
+    }
+
+	public String getSlope() {
+        return this.slope;
+    }
+
+	public void setSlope(String slope) {
+        this.slope = slope;
+    }
+
+	public BigDecimal getMinUncertainty() {
+        return this.minUncertainty;
+    }
+
+	public void setMinUncertainty(BigDecimal minUncertainty) {
+        this.minUncertainty = minUncertainty;
+    }
+
+	public BigDecimal getMaxUncertainty() {
+        return this.maxUncertainty;
+    }
+
+	public void setMaxUncertainty(BigDecimal maxUncertainty) {
+        this.maxUncertainty = maxUncertainty;
+    }
+
+	public BigDecimal getEc50Uncertainty() {
+        return this.ec50Uncertainty;
+    }
+
+	public void setEc50Uncertainty(BigDecimal ec50Uncertainty) {
+        this.ec50Uncertainty = ec50Uncertainty;
+    }
+
+	public BigDecimal getSlopeUncertainty() {
+        return this.slopeUncertainty;
+    }
+
+	public void setSlopeUncertainty(BigDecimal slopeUncertainty) {
+        this.slopeUncertainty = slopeUncertainty;
+    }
+
+	public String getMinUncertaintyType() {
+        return this.minUncertaintyType;
+    }
+
+	public void setMinUncertaintyType(String minUncertaintyType) {
+        this.minUncertaintyType = minUncertaintyType;
+    }
+
+	public String getMaxUncertaintyType() {
+        return this.maxUncertaintyType;
+    }
+
+	public void setMaxUncertaintyType(String maxUncertaintyType) {
+        this.maxUncertaintyType = maxUncertaintyType;
+    }
+
+	public String getEc50UncertaintyType() {
+        return this.ec50UncertaintyType;
+    }
+
+	public void setEc50UncertaintyType(String ec50UncertaintyType) {
+        this.ec50UncertaintyType = ec50UncertaintyType;
+    }
+
+	public String getSlopeUncertaintyType() {
+        return this.slopeUncertaintyType;
+    }
+
+	public void setSlopeUncertaintyType(String slopeUncertaintyType) {
+        this.slopeUncertaintyType = slopeUncertaintyType;
+    }
+
+	public String getMinOperatorKind() {
+        return this.minOperatorKind;
+    }
+
+	public void setMinOperatorKind(String minOperatorKind) {
+        this.minOperatorKind = minOperatorKind;
+    }
+
+	public String getMaxOperatorKind() {
+        return this.maxOperatorKind;
+    }
+
+	public void setMaxOperatorKind(String maxOperatorKind) {
+        this.maxOperatorKind = maxOperatorKind;
+    }
+
+	public String getEc50OperatorKind() {
+        return this.ec50OperatorKind;
+    }
+
+	public void setEc50OperatorKind(String ec50OperatorKind) {
+        this.ec50OperatorKind = ec50OperatorKind;
+    }
+
+	public String getSlopeOperatorKind() {
+        return this.slopeOperatorKind;
+    }
+
+	public void setSlopeOperatorKind(String slopeOperatorKind) {
+        this.slopeOperatorKind = slopeOperatorKind;
+    }
+
+	public BigDecimal getFittedMin() {
+        return this.fittedMin;
+    }
+
+	public void setFittedMin(BigDecimal fittedMin) {
+        this.fittedMin = fittedMin;
+    }
+
+	public BigDecimal getFittedMax() {
+        return this.fittedMax;
+    }
+
+	public void setFittedMax(BigDecimal fittedMax) {
+        this.fittedMax = fittedMax;
+    }
+
+	public BigDecimal getFittedEC50() {
+        return this.fittedEC50;
+    }
+
+	public void setFittedEC50(BigDecimal fittedEC50) {
+        this.fittedEC50 = fittedEC50;
+    }
+
+	public BigDecimal getFittedSlope() {
+        return this.fittedSlope;
+    }
+
+	public void setFittedSlope(BigDecimal fittedSlope) {
+        this.fittedSlope = fittedSlope;
+    }
+
+	public BigDecimal getFittedMinUncertainty() {
+        return this.fittedMinUncertainty;
+    }
+
+	public void setFittedMinUncertainty(BigDecimal fittedMinUncertainty) {
+        this.fittedMinUncertainty = fittedMinUncertainty;
+    }
+
+	public BigDecimal getFittedMaxUncertainty() {
+        return this.fittedMaxUncertainty;
+    }
+
+	public void setFittedMaxUncertainty(BigDecimal fittedMaxUncertainty) {
+        this.fittedMaxUncertainty = fittedMaxUncertainty;
+    }
+
+	public BigDecimal getFittedEc50Uncertainty() {
+        return this.fittedEc50Uncertainty;
+    }
+
+	public void setFittedEc50Uncertainty(BigDecimal fittedEc50Uncertainty) {
+        this.fittedEc50Uncertainty = fittedEc50Uncertainty;
+    }
+
+	public BigDecimal getFittedSlopeUncertainty() {
+        return this.fittedSlopeUncertainty;
+    }
+
+	public void setFittedSlopeUncertainty(BigDecimal fittedSlopeUncertainty) {
+        this.fittedSlopeUncertainty = fittedSlopeUncertainty;
+    }
+
+	public String getFittedMinUncertaintyType() {
+        return this.fittedMinUncertaintyType;
+    }
+
+	public void setFittedMinUncertaintyType(String fittedMinUncertaintyType) {
+        this.fittedMinUncertaintyType = fittedMinUncertaintyType;
+    }
+
+	public String getFittedMaxUncertaintyType() {
+        return this.fittedMaxUncertaintyType;
+    }
+
+	public void setFittedMaxUncertaintyType(String fittedMaxUncertaintyType) {
+        this.fittedMaxUncertaintyType = fittedMaxUncertaintyType;
+    }
+
+	public String getFittedEc50UncertaintyType() {
+        return this.fittedEc50UncertaintyType;
+    }
+
+	public void setFittedEc50UncertaintyType(String fittedEc50UncertaintyType) {
+        this.fittedEc50UncertaintyType = fittedEc50UncertaintyType;
+    }
+
+	public String getFittedSlopeUncertaintyType() {
+        return this.fittedSlopeUncertaintyType;
+    }
+
+	public void setFittedSlopeUncertaintyType(String fittedSlopeUncertaintyType) {
+        this.fittedSlopeUncertaintyType = fittedSlopeUncertaintyType;
+    }
+
+	public BigDecimal getSse() {
+        return this.sse;
+    }
+
+	public void setSse(BigDecimal sse) {
+        this.sse = sse;
+    }
+
+	public BigDecimal getSst() {
+        return this.sst;
+    }
+
+	public void setSst(BigDecimal sst) {
+        this.sst = sst;
+    }
+
+	public BigDecimal getRsquared() {
+        return this.rsquared;
+    }
+
+	public void setRsquared(BigDecimal rsquared) {
+        this.rsquared = rsquared;
+    }
+
+	public String getCurveErrorsClob() {
+        return this.curveErrorsClob;
+    }
+
+	public void setCurveErrorsClob(String curveErrorsClob) {
+        this.curveErrorsClob = curveErrorsClob;
+    }
+
+	public String getReportedValuesClob() {
+        return this.reportedValuesClob;
+    }
+
+	public void setReportedValuesClob(String reportedValuesClob) {
+        this.reportedValuesClob = reportedValuesClob;
+    }
+
+	public String getParameterStdErrorsClob() {
+        return this.parameterStdErrorsClob;
+    }
+
+	public void setParameterStdErrorsClob(String parameterStdErrorsClob) {
+        this.parameterStdErrorsClob = parameterStdErrorsClob;
+    }
+
+	public String getFitSettings() {
+        return this.fitSettings;
+    }
+
+	public void setFitSettings(String fitSettings) {
+        this.fitSettings = fitSettings;
+    }
+
+	public String getFitSummaryClob() {
+        return this.fitSummaryClob;
+    }
+
+	public void setFitSummaryClob(String fitSummaryClob) {
+        this.fitSummaryClob = fitSummaryClob;
+    }
+
+	public String getUserFlagStatus() {
+        return this.userFlagStatus;
+    }
+
+	public void setUserFlagStatus(String userFlagStatus) {
+        this.userFlagStatus = userFlagStatus;
+    }
+
+	public String getAlgorithmFlagStatus() {
+        return this.algorithmFlagStatus;
+    }
+
+	public void setAlgorithmFlagStatus(String algorithmFlagStatus) {
+        this.algorithmFlagStatus = algorithmFlagStatus;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/CurveFitDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/CurveFitDTO_Roo_JavaBean.aj
deleted file mode 100644
index 1b1e7d5a4..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CurveFitDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,404 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CurveFitDTO;
-import java.math.BigDecimal;
-import java.util.Date;
-
-privileged aspect CurveFitDTO_Roo_JavaBean {
-    
-    public String CurveFitDTO.getCurveId() {
-        return this.curveId;
-    }
-    
-    public void CurveFitDTO.setCurveId(String curveId) {
-        this.curveId = curveId;
-    }
-    
-    public String CurveFitDTO.getAnalysisGroupCode() {
-        return this.analysisGroupCode;
-    }
-    
-    public void CurveFitDTO.setAnalysisGroupCode(String analysisGroupCode) {
-        this.analysisGroupCode = analysisGroupCode;
-    }
-    
-    public String CurveFitDTO.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void CurveFitDTO.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public Date CurveFitDTO.getRecordedDate() {
-        return this.recordedDate;
-    }
-    
-    public void CurveFitDTO.setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
-    
-    public Long CurveFitDTO.getLsTransaction() {
-        return this.lsTransaction;
-    }
-    
-    public void CurveFitDTO.setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
-    
-    public String CurveFitDTO.getBatchCode() {
-        return this.batchCode;
-    }
-    
-    public void CurveFitDTO.setBatchCode(String batchCode) {
-        this.batchCode = batchCode;
-    }
-    
-    public String CurveFitDTO.getCategory() {
-        return this.category;
-    }
-    
-    public void CurveFitDTO.setCategory(String category) {
-        this.category = category;
-    }
-    
-    public String CurveFitDTO.getRenderingHint() {
-        return this.renderingHint;
-    }
-    
-    public void CurveFitDTO.setRenderingHint(String renderingHint) {
-        this.renderingHint = renderingHint;
-    }
-    
-    public String CurveFitDTO.getMin() {
-        return this.min;
-    }
-    
-    public void CurveFitDTO.setMin(String min) {
-        this.min = min;
-    }
-    
-    public String CurveFitDTO.getMax() {
-        return this.max;
-    }
-    
-    public void CurveFitDTO.setMax(String max) {
-        this.max = max;
-    }
-    
-    public String CurveFitDTO.getEc50() {
-        return this.ec50;
-    }
-    
-    public void CurveFitDTO.setEc50(String ec50) {
-        this.ec50 = ec50;
-    }
-    
-    public String CurveFitDTO.getMinUnits() {
-        return this.minUnits;
-    }
-    
-    public void CurveFitDTO.setMinUnits(String minUnits) {
-        this.minUnits = minUnits;
-    }
-    
-    public String CurveFitDTO.getMaxUnits() {
-        return this.maxUnits;
-    }
-    
-    public void CurveFitDTO.setMaxUnits(String maxUnits) {
-        this.maxUnits = maxUnits;
-    }
-    
-    public String CurveFitDTO.getEc50Units() {
-        return this.ec50Units;
-    }
-    
-    public void CurveFitDTO.setEc50Units(String ec50Units) {
-        this.ec50Units = ec50Units;
-    }
-    
-    public String CurveFitDTO.getSlope() {
-        return this.slope;
-    }
-    
-    public void CurveFitDTO.setSlope(String slope) {
-        this.slope = slope;
-    }
-    
-    public BigDecimal CurveFitDTO.getMinUncertainty() {
-        return this.minUncertainty;
-    }
-    
-    public void CurveFitDTO.setMinUncertainty(BigDecimal minUncertainty) {
-        this.minUncertainty = minUncertainty;
-    }
-    
-    public BigDecimal CurveFitDTO.getMaxUncertainty() {
-        return this.maxUncertainty;
-    }
-    
-    public void CurveFitDTO.setMaxUncertainty(BigDecimal maxUncertainty) {
-        this.maxUncertainty = maxUncertainty;
-    }
-    
-    public BigDecimal CurveFitDTO.getEc50Uncertainty() {
-        return this.ec50Uncertainty;
-    }
-    
-    public void CurveFitDTO.setEc50Uncertainty(BigDecimal ec50Uncertainty) {
-        this.ec50Uncertainty = ec50Uncertainty;
-    }
-    
-    public BigDecimal CurveFitDTO.getSlopeUncertainty() {
-        return this.slopeUncertainty;
-    }
-    
-    public void CurveFitDTO.setSlopeUncertainty(BigDecimal slopeUncertainty) {
-        this.slopeUncertainty = slopeUncertainty;
-    }
-    
-    public String CurveFitDTO.getMinUncertaintyType() {
-        return this.minUncertaintyType;
-    }
-    
-    public void CurveFitDTO.setMinUncertaintyType(String minUncertaintyType) {
-        this.minUncertaintyType = minUncertaintyType;
-    }
-    
-    public String CurveFitDTO.getMaxUncertaintyType() {
-        return this.maxUncertaintyType;
-    }
-    
-    public void CurveFitDTO.setMaxUncertaintyType(String maxUncertaintyType) {
-        this.maxUncertaintyType = maxUncertaintyType;
-    }
-    
-    public String CurveFitDTO.getEc50UncertaintyType() {
-        return this.ec50UncertaintyType;
-    }
-    
-    public void CurveFitDTO.setEc50UncertaintyType(String ec50UncertaintyType) {
-        this.ec50UncertaintyType = ec50UncertaintyType;
-    }
-    
-    public String CurveFitDTO.getSlopeUncertaintyType() {
-        return this.slopeUncertaintyType;
-    }
-    
-    public void CurveFitDTO.setSlopeUncertaintyType(String slopeUncertaintyType) {
-        this.slopeUncertaintyType = slopeUncertaintyType;
-    }
-    
-    public String CurveFitDTO.getMinOperatorKind() {
-        return this.minOperatorKind;
-    }
-    
-    public void CurveFitDTO.setMinOperatorKind(String minOperatorKind) {
-        this.minOperatorKind = minOperatorKind;
-    }
-    
-    public String CurveFitDTO.getMaxOperatorKind() {
-        return this.maxOperatorKind;
-    }
-    
-    public void CurveFitDTO.setMaxOperatorKind(String maxOperatorKind) {
-        this.maxOperatorKind = maxOperatorKind;
-    }
-    
-    public String CurveFitDTO.getEc50OperatorKind() {
-        return this.ec50OperatorKind;
-    }
-    
-    public void CurveFitDTO.setEc50OperatorKind(String ec50OperatorKind) {
-        this.ec50OperatorKind = ec50OperatorKind;
-    }
-    
-    public String CurveFitDTO.getSlopeOperatorKind() {
-        return this.slopeOperatorKind;
-    }
-    
-    public void CurveFitDTO.setSlopeOperatorKind(String slopeOperatorKind) {
-        this.slopeOperatorKind = slopeOperatorKind;
-    }
-    
-    public BigDecimal CurveFitDTO.getFittedMin() {
-        return this.fittedMin;
-    }
-    
-    public void CurveFitDTO.setFittedMin(BigDecimal fittedMin) {
-        this.fittedMin = fittedMin;
-    }
-    
-    public BigDecimal CurveFitDTO.getFittedMax() {
-        return this.fittedMax;
-    }
-    
-    public void CurveFitDTO.setFittedMax(BigDecimal fittedMax) {
-        this.fittedMax = fittedMax;
-    }
-    
-    public BigDecimal CurveFitDTO.getFittedEC50() {
-        return this.fittedEC50;
-    }
-    
-    public void CurveFitDTO.setFittedEC50(BigDecimal fittedEC50) {
-        this.fittedEC50 = fittedEC50;
-    }
-    
-    public BigDecimal CurveFitDTO.getFittedSlope() {
-        return this.fittedSlope;
-    }
-    
-    public void CurveFitDTO.setFittedSlope(BigDecimal fittedSlope) {
-        this.fittedSlope = fittedSlope;
-    }
-    
-    public BigDecimal CurveFitDTO.getFittedMinUncertainty() {
-        return this.fittedMinUncertainty;
-    }
-    
-    public void CurveFitDTO.setFittedMinUncertainty(BigDecimal fittedMinUncertainty) {
-        this.fittedMinUncertainty = fittedMinUncertainty;
-    }
-    
-    public BigDecimal CurveFitDTO.getFittedMaxUncertainty() {
-        return this.fittedMaxUncertainty;
-    }
-    
-    public void CurveFitDTO.setFittedMaxUncertainty(BigDecimal fittedMaxUncertainty) {
-        this.fittedMaxUncertainty = fittedMaxUncertainty;
-    }
-    
-    public BigDecimal CurveFitDTO.getFittedEc50Uncertainty() {
-        return this.fittedEc50Uncertainty;
-    }
-    
-    public void CurveFitDTO.setFittedEc50Uncertainty(BigDecimal fittedEc50Uncertainty) {
-        this.fittedEc50Uncertainty = fittedEc50Uncertainty;
-    }
-    
-    public BigDecimal CurveFitDTO.getFittedSlopeUncertainty() {
-        return this.fittedSlopeUncertainty;
-    }
-    
-    public void CurveFitDTO.setFittedSlopeUncertainty(BigDecimal fittedSlopeUncertainty) {
-        this.fittedSlopeUncertainty = fittedSlopeUncertainty;
-    }
-    
-    public String CurveFitDTO.getFittedMinUncertaintyType() {
-        return this.fittedMinUncertaintyType;
-    }
-    
-    public void CurveFitDTO.setFittedMinUncertaintyType(String fittedMinUncertaintyType) {
-        this.fittedMinUncertaintyType = fittedMinUncertaintyType;
-    }
-    
-    public String CurveFitDTO.getFittedMaxUncertaintyType() {
-        return this.fittedMaxUncertaintyType;
-    }
-    
-    public void CurveFitDTO.setFittedMaxUncertaintyType(String fittedMaxUncertaintyType) {
-        this.fittedMaxUncertaintyType = fittedMaxUncertaintyType;
-    }
-    
-    public String CurveFitDTO.getFittedEc50UncertaintyType() {
-        return this.fittedEc50UncertaintyType;
-    }
-    
-    public void CurveFitDTO.setFittedEc50UncertaintyType(String fittedEc50UncertaintyType) {
-        this.fittedEc50UncertaintyType = fittedEc50UncertaintyType;
-    }
-    
-    public String CurveFitDTO.getFittedSlopeUncertaintyType() {
-        return this.fittedSlopeUncertaintyType;
-    }
-    
-    public void CurveFitDTO.setFittedSlopeUncertaintyType(String fittedSlopeUncertaintyType) {
-        this.fittedSlopeUncertaintyType = fittedSlopeUncertaintyType;
-    }
-    
-    public BigDecimal CurveFitDTO.getSse() {
-        return this.sse;
-    }
-    
-    public void CurveFitDTO.setSse(BigDecimal sse) {
-        this.sse = sse;
-    }
-    
-    public BigDecimal CurveFitDTO.getSst() {
-        return this.sst;
-    }
-    
-    public void CurveFitDTO.setSst(BigDecimal sst) {
-        this.sst = sst;
-    }
-    
-    public BigDecimal CurveFitDTO.getRsquared() {
-        return this.rsquared;
-    }
-    
-    public void CurveFitDTO.setRsquared(BigDecimal rsquared) {
-        this.rsquared = rsquared;
-    }
-    
-    public String CurveFitDTO.getCurveErrorsClob() {
-        return this.curveErrorsClob;
-    }
-    
-    public void CurveFitDTO.setCurveErrorsClob(String curveErrorsClob) {
-        this.curveErrorsClob = curveErrorsClob;
-    }
-    
-    public String CurveFitDTO.getReportedValuesClob() {
-        return this.reportedValuesClob;
-    }
-    
-    public void CurveFitDTO.setReportedValuesClob(String reportedValuesClob) {
-        this.reportedValuesClob = reportedValuesClob;
-    }
-    
-    public String CurveFitDTO.getParameterStdErrorsClob() {
-        return this.parameterStdErrorsClob;
-    }
-    
-    public void CurveFitDTO.setParameterStdErrorsClob(String parameterStdErrorsClob) {
-        this.parameterStdErrorsClob = parameterStdErrorsClob;
-    }
-    
-    public String CurveFitDTO.getFitSettings() {
-        return this.fitSettings;
-    }
-    
-    public void CurveFitDTO.setFitSettings(String fitSettings) {
-        this.fitSettings = fitSettings;
-    }
-    
-    public String CurveFitDTO.getFitSummaryClob() {
-        return this.fitSummaryClob;
-    }
-    
-    public void CurveFitDTO.setFitSummaryClob(String fitSummaryClob) {
-        this.fitSummaryClob = fitSummaryClob;
-    }
-    
-    public String CurveFitDTO.getUserFlagStatus() {
-        return this.userFlagStatus;
-    }
-    
-    public void CurveFitDTO.setUserFlagStatus(String userFlagStatus) {
-        this.userFlagStatus = userFlagStatus;
-    }
-    
-    public String CurveFitDTO.getAlgorithmFlagStatus() {
-        return this.algorithmFlagStatus;
-    }
-    
-    public void CurveFitDTO.setAlgorithmFlagStatus(String algorithmFlagStatus) {
-        this.algorithmFlagStatus = algorithmFlagStatus;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CurveFitDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/CurveFitDTO_Roo_Json.aj
deleted file mode 100644
index 7adc6c2b0..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CurveFitDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CurveFitDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect CurveFitDTO_Roo_Json {
-    
-    public String CurveFitDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String CurveFitDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static CurveFitDTO CurveFitDTO.fromJsonToCurveFitDTO(String json) {
-        return new JSONDeserializer<CurveFitDTO>()
-        .use(null, CurveFitDTO.class).deserialize(json);
-    }
-    
-    public static String CurveFitDTO.toJsonArray(Collection<CurveFitDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String CurveFitDTO.toJsonArray(Collection<CurveFitDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<CurveFitDTO> CurveFitDTO.fromJsonArrayToCurveFitDTO(String json) {
-        return new JSONDeserializer<List<CurveFitDTO>>()
-        .use("values", CurveFitDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/CurveFitDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/CurveFitDTO_Roo_ToString.aj
deleted file mode 100644
index 583d980d3..000000000
--- a/src/main/java/com/labsynch/labseer/dto/CurveFitDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CurveFitDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect CurveFitDTO_Roo_ToString {
-    
-    public String CurveFitDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/DateValueComparisonRequest.java b/src/main/java/com/labsynch/labseer/dto/DateValueComparisonRequest.java
index f9e77d06c..702be500b 100644
--- a/src/main/java/com/labsynch/labseer/dto/DateValueComparisonRequest.java
+++ b/src/main/java/com/labsynch/labseer/dto/DateValueComparisonRequest.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -23,6 +29,96 @@ public class DateValueComparisonRequest {
 	
 	private Boolean newerThanModified; 
 	
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getStateType() {
+        return this.stateType;
+    }
+
+	public void setStateType(String stateType) {
+        this.stateType = stateType;
+    }
+
+	public String getStateKind() {
+        return this.stateKind;
+    }
+
+	public void setStateKind(String stateKind) {
+        this.stateKind = stateKind;
+    }
+
+	public String getValueKind() {
+        return this.valueKind;
+    }
+
+	public void setValueKind(String valueKind) {
+        this.valueKind = valueKind;
+    }
+
+	public Integer getSecondsDelta() {
+        return this.secondsDelta;
+    }
+
+	public void setSecondsDelta(Integer secondsDelta) {
+        this.secondsDelta = secondsDelta;
+    }
+
+	public Boolean getNewerThanModified() {
+        return this.newerThanModified;
+    }
+
+	public void setNewerThanModified(Boolean newerThanModified) {
+        this.newerThanModified = newerThanModified;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static DateValueComparisonRequest fromJsonToDateValueComparisonRequest(String json) {
+        return new JSONDeserializer<DateValueComparisonRequest>()
+        .use(null, DateValueComparisonRequest.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<DateValueComparisonRequest> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<DateValueComparisonRequest> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<DateValueComparisonRequest> fromJsonArrayToDateValueComparisonRequests(String json) {
+        return new JSONDeserializer<List<DateValueComparisonRequest>>()
+        .use("values", DateValueComparisonRequest.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/DateValueComparisonRequest_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/DateValueComparisonRequest_Roo_JavaBean.aj
deleted file mode 100644
index 3e1e08fd2..000000000
--- a/src/main/java/com/labsynch/labseer/dto/DateValueComparisonRequest_Roo_JavaBean.aj
+++ /dev/null
@@ -1,66 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.DateValueComparisonRequest;
-
-privileged aspect DateValueComparisonRequest_Roo_JavaBean {
-    
-    public String DateValueComparisonRequest.getLsType() {
-        return this.lsType;
-    }
-    
-    public void DateValueComparisonRequest.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String DateValueComparisonRequest.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void DateValueComparisonRequest.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String DateValueComparisonRequest.getStateType() {
-        return this.stateType;
-    }
-    
-    public void DateValueComparisonRequest.setStateType(String stateType) {
-        this.stateType = stateType;
-    }
-    
-    public String DateValueComparisonRequest.getStateKind() {
-        return this.stateKind;
-    }
-    
-    public void DateValueComparisonRequest.setStateKind(String stateKind) {
-        this.stateKind = stateKind;
-    }
-    
-    public String DateValueComparisonRequest.getValueKind() {
-        return this.valueKind;
-    }
-    
-    public void DateValueComparisonRequest.setValueKind(String valueKind) {
-        this.valueKind = valueKind;
-    }
-    
-    public Integer DateValueComparisonRequest.getSecondsDelta() {
-        return this.secondsDelta;
-    }
-    
-    public void DateValueComparisonRequest.setSecondsDelta(Integer secondsDelta) {
-        this.secondsDelta = secondsDelta;
-    }
-    
-    public Boolean DateValueComparisonRequest.getNewerThanModified() {
-        return this.newerThanModified;
-    }
-    
-    public void DateValueComparisonRequest.setNewerThanModified(Boolean newerThanModified) {
-        this.newerThanModified = newerThanModified;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/DateValueComparisonRequest_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/DateValueComparisonRequest_Roo_Json.aj
deleted file mode 100644
index 80007e3e6..000000000
--- a/src/main/java/com/labsynch/labseer/dto/DateValueComparisonRequest_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.DateValueComparisonRequest;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect DateValueComparisonRequest_Roo_Json {
-    
-    public String DateValueComparisonRequest.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String DateValueComparisonRequest.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static DateValueComparisonRequest DateValueComparisonRequest.fromJsonToDateValueComparisonRequest(String json) {
-        return new JSONDeserializer<DateValueComparisonRequest>()
-        .use(null, DateValueComparisonRequest.class).deserialize(json);
-    }
-    
-    public static String DateValueComparisonRequest.toJsonArray(Collection<DateValueComparisonRequest> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String DateValueComparisonRequest.toJsonArray(Collection<DateValueComparisonRequest> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<DateValueComparisonRequest> DateValueComparisonRequest.fromJsonArrayToDateValueComparisonRequests(String json) {
-        return new JSONDeserializer<List<DateValueComparisonRequest>>()
-        .use("values", DateValueComparisonRequest.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/DateValueComparisonRequest_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/DateValueComparisonRequest_Roo_ToString.aj
deleted file mode 100644
index 45dc3903c..000000000
--- a/src/main/java/com/labsynch/labseer/dto/DateValueComparisonRequest_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.DateValueComparisonRequest;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect DateValueComparisonRequest_Roo_ToString {
-    
-    public String DateValueComparisonRequest.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/DependencyCheckDTO.java b/src/main/java/com/labsynch/labseer/dto/DependencyCheckDTO.java
index 9642cc2f9..bdcac60fe 100644
--- a/src/main/java/com/labsynch/labseer/dto/DependencyCheckDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/DependencyCheckDTO.java
@@ -3,11 +3,13 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 
 import javax.persistence.EntityManager;
 import javax.persistence.TypedQuery;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.roo.addon.javabean.RooJavaBean;
@@ -20,7 +22,7 @@
 import com.labsynch.labseer.domain.ContainerValue;
 import com.labsynch.labseer.domain.TreatmentGroupValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -416,6 +418,78 @@ private void dedupeLinkedExperiments() {
 		logger.debug("Deduped size: "+linkedExperiments.size());
 	}
 
+
+	public Collection<String> getQueryCodeNames() {
+        return this.queryCodeNames;
+    }
+
+	public void setQueryCodeNames(Collection<String> queryCodeNames) {
+        this.queryCodeNames = queryCodeNames;
+    }
+
+	public Collection<String> getDependentCorpNames() {
+        return this.dependentCorpNames;
+    }
+
+	public void setDependentCorpNames(Collection<String> dependentCorpNames) {
+        this.dependentCorpNames = dependentCorpNames;
+    }
+
+	public Boolean getLinkedDataExists() {
+        return this.linkedDataExists;
+    }
+
+	public void setLinkedDataExists(Boolean linkedDataExists) {
+        this.linkedDataExists = linkedDataExists;
+    }
+
+	public Collection<CodeTableDTO> getLinkedExperiments() {
+        return this.linkedExperiments;
+    }
+
+	public void setLinkedExperiments(Collection<CodeTableDTO> linkedExperiments) {
+        this.linkedExperiments = linkedExperiments;
+    }
+
+	public Collection<CodeTableDTO> getLinkedContainers() {
+        return this.linkedContainers;
+    }
+
+	public void setLinkedContainers(Collection<CodeTableDTO> linkedContainers) {
+        this.linkedContainers = linkedContainers;
+    }
+
+	public Collection<ErrorMessageDTO> getErrors() {
+        return this.errors;
+    }
+
+	public void setErrors(Collection<ErrorMessageDTO> errors) {
+        this.errors = errors;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static DependencyCheckDTO fromJsonToDependencyCheckDTO(String json) {
+        return new JSONDeserializer<DependencyCheckDTO>()
+        .use(null, DependencyCheckDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<DependencyCheckDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<DependencyCheckDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<DependencyCheckDTO> fromJsonArrayToDependencyCheckDTO(String json) {
+        return new JSONDeserializer<List<DependencyCheckDTO>>()
+        .use("values", DependencyCheckDTO.class).deserialize(json);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/DependencyCheckDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/DependencyCheckDTO_Roo_JavaBean.aj
deleted file mode 100644
index a86b36f08..000000000
--- a/src/main/java/com/labsynch/labseer/dto/DependencyCheckDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CodeTableDTO;
-import com.labsynch.labseer.dto.DependencyCheckDTO;
-import com.labsynch.labseer.dto.ErrorMessageDTO;
-import java.util.Collection;
-
-privileged aspect DependencyCheckDTO_Roo_JavaBean {
-    
-    public Collection<String> DependencyCheckDTO.getQueryCodeNames() {
-        return this.queryCodeNames;
-    }
-    
-    public void DependencyCheckDTO.setQueryCodeNames(Collection<String> queryCodeNames) {
-        this.queryCodeNames = queryCodeNames;
-    }
-    
-    public Collection<String> DependencyCheckDTO.getDependentCorpNames() {
-        return this.dependentCorpNames;
-    }
-    
-    public void DependencyCheckDTO.setDependentCorpNames(Collection<String> dependentCorpNames) {
-        this.dependentCorpNames = dependentCorpNames;
-    }
-    
-    public Boolean DependencyCheckDTO.getLinkedDataExists() {
-        return this.linkedDataExists;
-    }
-    
-    public void DependencyCheckDTO.setLinkedDataExists(Boolean linkedDataExists) {
-        this.linkedDataExists = linkedDataExists;
-    }
-    
-    public Collection<CodeTableDTO> DependencyCheckDTO.getLinkedExperiments() {
-        return this.linkedExperiments;
-    }
-    
-    public void DependencyCheckDTO.setLinkedExperiments(Collection<CodeTableDTO> linkedExperiments) {
-        this.linkedExperiments = linkedExperiments;
-    }
-    
-    public Collection<CodeTableDTO> DependencyCheckDTO.getLinkedContainers() {
-        return this.linkedContainers;
-    }
-    
-    public void DependencyCheckDTO.setLinkedContainers(Collection<CodeTableDTO> linkedContainers) {
-        this.linkedContainers = linkedContainers;
-    }
-    
-    public Collection<ErrorMessageDTO> DependencyCheckDTO.getErrors() {
-        return this.errors;
-    }
-    
-    public void DependencyCheckDTO.setErrors(Collection<ErrorMessageDTO> errors) {
-        this.errors = errors;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/DependencyCheckDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/DependencyCheckDTO_Roo_Json.aj
deleted file mode 100644
index bf05b8f03..000000000
--- a/src/main/java/com/labsynch/labseer/dto/DependencyCheckDTO_Roo_Json.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.DependencyCheckDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect DependencyCheckDTO_Roo_Json {
-    
-    public static DependencyCheckDTO DependencyCheckDTO.fromJsonToDependencyCheckDTO(String json) {
-        return new JSONDeserializer<DependencyCheckDTO>()
-        .use(null, DependencyCheckDTO.class).deserialize(json);
-    }
-    
-    public static String DependencyCheckDTO.toJsonArray(Collection<DependencyCheckDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String DependencyCheckDTO.toJsonArray(Collection<DependencyCheckDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<DependencyCheckDTO> DependencyCheckDTO.fromJsonArrayToDependencyCheckDTO(String json) {
-        return new JSONDeserializer<List<DependencyCheckDTO>>()
-        .use("values", DependencyCheckDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/DependencyCheckDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/DependencyCheckDTO_Roo_ToString.aj
deleted file mode 100644
index 5a304efc0..000000000
--- a/src/main/java/com/labsynch/labseer/dto/DependencyCheckDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.DependencyCheckDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect DependencyCheckDTO_Roo_ToString {
-    
-    public String DependencyCheckDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/DoseReponseParamsDTO.java b/src/main/java/com/labsynch/labseer/dto/DoseReponseParamsDTO.java
index 0335e4959..badd96e66 100755
--- a/src/main/java/com/labsynch/labseer/dto/DoseReponseParamsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/DoseReponseParamsDTO.java
@@ -1,7 +1,12 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 import java.math.BigDecimal;
-
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.roo.addon.javabean.RooJavaBean;
@@ -90,6 +95,224 @@ public DoseReponseParamsDTO(
 	private Long lsTransaction;
 	private boolean publicData;
 
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static DoseReponseParamsDTO fromJsonToDoseReponseParamsDTO(String json) {
+        return new JSONDeserializer<DoseReponseParamsDTO>()
+        .use(null, DoseReponseParamsDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<DoseReponseParamsDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<DoseReponseParamsDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<DoseReponseParamsDTO> fromJsonArrayToDoseRepoes(String json) {
+        return new JSONDeserializer<List<DoseReponseParamsDTO>>()
+        .use("values", DoseReponseParamsDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public Long getStateid() {
+        return this.Stateid;
+    }
+
+	public void setStateid(Long Stateid) {
+        this.Stateid = Stateid;
+    }
+
+	public String getAgCodeName() {
+        return this.agCodeName;
+    }
+
+	public void setAgCodeName(String agCodeName) {
+        this.agCodeName = agCodeName;
+    }
+
+	public String getCurveId() {
+        return this.curveId;
+    }
+
+	public void setCurveId(String curveId) {
+        this.curveId = curveId;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getStringValue() {
+        return this.stringValue;
+    }
+
+	public void setStringValue(String stringValue) {
+        this.stringValue = stringValue;
+    }
+
+	public String getCodeValue() {
+        return this.codeValue;
+    }
+
+	public void setCodeValue(String codeValue) {
+        this.codeValue = codeValue;
+    }
+
+	public String getClobValue() {
+        return this.clobValue;
+    }
+
+	public void setClobValue(String clobValue) {
+        this.clobValue = clobValue;
+    }
+
+	public String getOperatorType() {
+        return this.operatorType;
+    }
+
+	public void setOperatorType(String operatorType) {
+        this.operatorType = operatorType;
+    }
+
+	public String getOperatorKind() {
+        return this.operatorKind;
+    }
+
+	public void setOperatorKind(String operatorKind) {
+        this.operatorKind = operatorKind;
+    }
+
+	public BigDecimal getNumericValue() {
+        return this.numericValue;
+    }
+
+	public void setNumericValue(BigDecimal numericValue) {
+        this.numericValue = numericValue;
+    }
+
+	public Integer getSigFigs() {
+        return this.sigFigs;
+    }
+
+	public void setSigFigs(Integer sigFigs) {
+        this.sigFigs = sigFigs;
+    }
+
+	public BigDecimal getUncertainty() {
+        return this.uncertainty;
+    }
+
+	public void setUncertainty(BigDecimal uncertainty) {
+        this.uncertainty = uncertainty;
+    }
+
+	public Integer getNumberOfReplicates() {
+        return this.numberOfReplicates;
+    }
+
+	public void setNumberOfReplicates(Integer numberOfReplicates) {
+        this.numberOfReplicates = numberOfReplicates;
+    }
+
+	public String getUncertaintyType() {
+        return this.uncertaintyType;
+    }
+
+	public void setUncertaintyType(String uncertaintyType) {
+        this.uncertaintyType = uncertaintyType;
+    }
+
+	public String getUnitType() {
+        return this.unitType;
+    }
+
+	public void setUnitType(String unitType) {
+        this.unitType = unitType;
+    }
+
+	public String getUnitKind() {
+        return this.unitKind;
+    }
+
+	public void setUnitKind(String unitKind) {
+        this.unitKind = unitKind;
+    }
+
+	public String getComments() {
+        return this.comments;
+    }
+
+	public void setComments(String comments) {
+        this.comments = comments;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public Long getLsTransaction() {
+        return this.lsTransaction;
+    }
+
+	public void setLsTransaction(Long lsTransaction) {
+        this.lsTransaction = lsTransaction;
+    }
+
+	public boolean isPublicData() {
+        return this.publicData;
+    }
+
+	public void setPublicData(boolean publicData) {
+        this.publicData = publicData;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/DoseReponseParamsDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/DoseReponseParamsDTO_Roo_JavaBean.aj
deleted file mode 100755
index 498d7e17e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/DoseReponseParamsDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,195 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.DoseReponseParamsDTO;
-import java.math.BigDecimal;
-
-privileged aspect DoseReponseParamsDTO_Roo_JavaBean {
-    
-    public Long DoseReponseParamsDTO.getId() {
-        return this.id;
-    }
-    
-    public void DoseReponseParamsDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer DoseReponseParamsDTO.getVersion() {
-        return this.version;
-    }
-    
-    public void DoseReponseParamsDTO.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-    public Long DoseReponseParamsDTO.getStateid() {
-        return this.Stateid;
-    }
-    
-    public void DoseReponseParamsDTO.setStateid(Long Stateid) {
-        this.Stateid = Stateid;
-    }
-    
-    public String DoseReponseParamsDTO.getAgCodeName() {
-        return this.agCodeName;
-    }
-    
-    public void DoseReponseParamsDTO.setAgCodeName(String agCodeName) {
-        this.agCodeName = agCodeName;
-    }
-    
-    public String DoseReponseParamsDTO.getCurveId() {
-        return this.curveId;
-    }
-    
-    public void DoseReponseParamsDTO.setCurveId(String curveId) {
-        this.curveId = curveId;
-    }
-    
-    public String DoseReponseParamsDTO.getLsType() {
-        return this.lsType;
-    }
-    
-    public void DoseReponseParamsDTO.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String DoseReponseParamsDTO.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void DoseReponseParamsDTO.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String DoseReponseParamsDTO.getStringValue() {
-        return this.stringValue;
-    }
-    
-    public void DoseReponseParamsDTO.setStringValue(String stringValue) {
-        this.stringValue = stringValue;
-    }
-    
-    public String DoseReponseParamsDTO.getCodeValue() {
-        return this.codeValue;
-    }
-    
-    public void DoseReponseParamsDTO.setCodeValue(String codeValue) {
-        this.codeValue = codeValue;
-    }
-    
-    public String DoseReponseParamsDTO.getClobValue() {
-        return this.clobValue;
-    }
-    
-    public void DoseReponseParamsDTO.setClobValue(String clobValue) {
-        this.clobValue = clobValue;
-    }
-    
-    public String DoseReponseParamsDTO.getOperatorType() {
-        return this.operatorType;
-    }
-    
-    public void DoseReponseParamsDTO.setOperatorType(String operatorType) {
-        this.operatorType = operatorType;
-    }
-    
-    public String DoseReponseParamsDTO.getOperatorKind() {
-        return this.operatorKind;
-    }
-    
-    public void DoseReponseParamsDTO.setOperatorKind(String operatorKind) {
-        this.operatorKind = operatorKind;
-    }
-    
-    public BigDecimal DoseReponseParamsDTO.getNumericValue() {
-        return this.numericValue;
-    }
-    
-    public void DoseReponseParamsDTO.setNumericValue(BigDecimal numericValue) {
-        this.numericValue = numericValue;
-    }
-    
-    public Integer DoseReponseParamsDTO.getSigFigs() {
-        return this.sigFigs;
-    }
-    
-    public void DoseReponseParamsDTO.setSigFigs(Integer sigFigs) {
-        this.sigFigs = sigFigs;
-    }
-    
-    public BigDecimal DoseReponseParamsDTO.getUncertainty() {
-        return this.uncertainty;
-    }
-    
-    public void DoseReponseParamsDTO.setUncertainty(BigDecimal uncertainty) {
-        this.uncertainty = uncertainty;
-    }
-    
-    public Integer DoseReponseParamsDTO.getNumberOfReplicates() {
-        return this.numberOfReplicates;
-    }
-    
-    public void DoseReponseParamsDTO.setNumberOfReplicates(Integer numberOfReplicates) {
-        this.numberOfReplicates = numberOfReplicates;
-    }
-    
-    public String DoseReponseParamsDTO.getUncertaintyType() {
-        return this.uncertaintyType;
-    }
-    
-    public void DoseReponseParamsDTO.setUncertaintyType(String uncertaintyType) {
-        this.uncertaintyType = uncertaintyType;
-    }
-    
-    public String DoseReponseParamsDTO.getUnitType() {
-        return this.unitType;
-    }
-    
-    public void DoseReponseParamsDTO.setUnitType(String unitType) {
-        this.unitType = unitType;
-    }
-    
-    public String DoseReponseParamsDTO.getUnitKind() {
-        return this.unitKind;
-    }
-    
-    public void DoseReponseParamsDTO.setUnitKind(String unitKind) {
-        this.unitKind = unitKind;
-    }
-    
-    public String DoseReponseParamsDTO.getComments() {
-        return this.comments;
-    }
-    
-    public void DoseReponseParamsDTO.setComments(String comments) {
-        this.comments = comments;
-    }
-    
-    public boolean DoseReponseParamsDTO.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void DoseReponseParamsDTO.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public Long DoseReponseParamsDTO.getLsTransaction() {
-        return this.lsTransaction;
-    }
-    
-    public void DoseReponseParamsDTO.setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
-    
-    public boolean DoseReponseParamsDTO.isPublicData() {
-        return this.publicData;
-    }
-    
-    public void DoseReponseParamsDTO.setPublicData(boolean publicData) {
-        this.publicData = publicData;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/DoseReponseParamsDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/DoseReponseParamsDTO_Roo_Json.aj
deleted file mode 100755
index e260bd887..000000000
--- a/src/main/java/com/labsynch/labseer/dto/DoseReponseParamsDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.DoseReponseParamsDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect DoseReponseParamsDTO_Roo_Json {
-    
-    public String DoseReponseParamsDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String DoseReponseParamsDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static DoseReponseParamsDTO DoseReponseParamsDTO.fromJsonToDoseReponseParamsDTO(String json) {
-        return new JSONDeserializer<DoseReponseParamsDTO>()
-        .use(null, DoseReponseParamsDTO.class).deserialize(json);
-    }
-    
-    public static String DoseReponseParamsDTO.toJsonArray(Collection<DoseReponseParamsDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String DoseReponseParamsDTO.toJsonArray(Collection<DoseReponseParamsDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<DoseReponseParamsDTO> DoseReponseParamsDTO.fromJsonArrayToDoseRepoes(String json) {
-        return new JSONDeserializer<List<DoseReponseParamsDTO>>()
-        .use("values", DoseReponseParamsDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/DoseReponseParamsDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/DoseReponseParamsDTO_Roo_ToString.aj
deleted file mode 100755
index 1aa3778a3..000000000
--- a/src/main/java/com/labsynch/labseer/dto/DoseReponseParamsDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.DoseReponseParamsDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect DoseReponseParamsDTO_Roo_ToString {
-    
-    public String DoseReponseParamsDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/EntrezDbDTO.java b/src/main/java/com/labsynch/labseer/dto/EntrezDbDTO.java
index 0ae5010d4..5755b7efb 100644
--- a/src/main/java/com/labsynch/labseer/dto/EntrezDbDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/EntrezDbDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -13,4 +19,62 @@ public class EntrezDbDTO {
     private String entrezGenesFile;
     private String geneHistoryFile;
 
+
+	public String getTaxonomyId() {
+        return this.taxonomyId;
+    }
+
+	public void setTaxonomyId(String taxonomyId) {
+        this.taxonomyId = taxonomyId;
+    }
+
+	public String getEntrezGenesFile() {
+        return this.entrezGenesFile;
+    }
+
+	public void setEntrezGenesFile(String entrezGenesFile) {
+        this.entrezGenesFile = entrezGenesFile;
+    }
+
+	public String getGeneHistoryFile() {
+        return this.geneHistoryFile;
+    }
+
+	public void setGeneHistoryFile(String geneHistoryFile) {
+        this.geneHistoryFile = geneHistoryFile;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static EntrezDbDTO fromJsonToEntrezDbDTO(String json) {
+        return new JSONDeserializer<EntrezDbDTO>()
+        .use(null, EntrezDbDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<EntrezDbDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<EntrezDbDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<EntrezDbDTO> fromJsonArrayToEntrezDbDTO(String json) {
+        return new JSONDeserializer<List<EntrezDbDTO>>()
+        .use("values", EntrezDbDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/EntrezDbDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/EntrezDbDTO_Roo_JavaBean.aj
deleted file mode 100644
index 48c4580a3..000000000
--- a/src/main/java/com/labsynch/labseer/dto/EntrezDbDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.EntrezDbDTO;
-
-privileged aspect EntrezDbDTO_Roo_JavaBean {
-    
-    public String EntrezDbDTO.getTaxonomyId() {
-        return this.taxonomyId;
-    }
-    
-    public void EntrezDbDTO.setTaxonomyId(String taxonomyId) {
-        this.taxonomyId = taxonomyId;
-    }
-    
-    public String EntrezDbDTO.getEntrezGenesFile() {
-        return this.entrezGenesFile;
-    }
-    
-    public void EntrezDbDTO.setEntrezGenesFile(String entrezGenesFile) {
-        this.entrezGenesFile = entrezGenesFile;
-    }
-    
-    public String EntrezDbDTO.getGeneHistoryFile() {
-        return this.geneHistoryFile;
-    }
-    
-    public void EntrezDbDTO.setGeneHistoryFile(String geneHistoryFile) {
-        this.geneHistoryFile = geneHistoryFile;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/EntrezDbDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/EntrezDbDTO_Roo_Json.aj
deleted file mode 100644
index e36596844..000000000
--- a/src/main/java/com/labsynch/labseer/dto/EntrezDbDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.EntrezDbDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect EntrezDbDTO_Roo_Json {
-    
-    public String EntrezDbDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String EntrezDbDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static EntrezDbDTO EntrezDbDTO.fromJsonToEntrezDbDTO(String json) {
-        return new JSONDeserializer<EntrezDbDTO>()
-        .use(null, EntrezDbDTO.class).deserialize(json);
-    }
-    
-    public static String EntrezDbDTO.toJsonArray(Collection<EntrezDbDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String EntrezDbDTO.toJsonArray(Collection<EntrezDbDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<EntrezDbDTO> EntrezDbDTO.fromJsonArrayToEntrezDbDTO(String json) {
-        return new JSONDeserializer<List<EntrezDbDTO>>()
-        .use("values", EntrezDbDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/EntrezDbDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/EntrezDbDTO_Roo_ToString.aj
deleted file mode 100644
index 1ae2d8e14..000000000
--- a/src/main/java/com/labsynch/labseer/dto/EntrezDbDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.EntrezDbDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect EntrezDbDTO_Roo_ToString {
-    
-    public String EntrezDbDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/EntrezDbGeneDTO.java b/src/main/java/com/labsynch/labseer/dto/EntrezDbGeneDTO.java
index 4af4408b0..125b59e3a 100755
--- a/src/main/java/com/labsynch/labseer/dto/EntrezDbGeneDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/EntrezDbGeneDTO.java
@@ -1,7 +1,12 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -27,4 +32,158 @@ public class EntrezDbGeneDTO {
     private String otherDesignations;
     private Date modificationDate;
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static EntrezDbGeneDTO fromJsonToEntrezDbGeneDTO(String json) {
+        return new JSONDeserializer<EntrezDbGeneDTO>()
+        .use(null, EntrezDbGeneDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<EntrezDbGeneDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<EntrezDbGeneDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<EntrezDbGeneDTO> fromJsonArrayToEntrezDbGeneDTO(String json) {
+        return new JSONDeserializer<List<EntrezDbGeneDTO>>()
+        .use("values", EntrezDbGeneDTO.class).deserialize(json);
+    }
+
+	public String getTaxId() {
+        return this.taxId;
+    }
+
+	public void setTaxId(String taxId) {
+        this.taxId = taxId;
+    }
+
+	public String getGeneId() {
+        return this.geneId;
+    }
+
+	public void setGeneId(String geneId) {
+        this.geneId = geneId;
+    }
+
+	public String getSymbol() {
+        return this.symbol;
+    }
+
+	public void setSymbol(String symbol) {
+        this.symbol = symbol;
+    }
+
+	public String getLocusTag() {
+        return this.locusTag;
+    }
+
+	public void setLocusTag(String locusTag) {
+        this.locusTag = locusTag;
+    }
+
+	public String getSynonyms() {
+        return this.synonyms;
+    }
+
+	public void setSynonyms(String synonyms) {
+        this.synonyms = synonyms;
+    }
+
+	public String getDbXrefs() {
+        return this.dbXrefs;
+    }
+
+	public void setDbXrefs(String dbXrefs) {
+        this.dbXrefs = dbXrefs;
+    }
+
+	public String getChromosome() {
+        return this.chromosome;
+    }
+
+	public void setChromosome(String chromosome) {
+        this.chromosome = chromosome;
+    }
+
+	public String getMapLocation() {
+        return this.mapLocation;
+    }
+
+	public void setMapLocation(String mapLocation) {
+        this.mapLocation = mapLocation;
+    }
+
+	public String getDescription() {
+        return this.description;
+    }
+
+	public void setDescription(String description) {
+        this.description = description;
+    }
+
+	public String getTypeOfGene() {
+        return this.typeOfGene;
+    }
+
+	public void setTypeOfGene(String typeOfGene) {
+        this.typeOfGene = typeOfGene;
+    }
+
+	public String getSymbolFromAuthority() {
+        return this.symbolFromAuthority;
+    }
+
+	public void setSymbolFromAuthority(String symbolFromAuthority) {
+        this.symbolFromAuthority = symbolFromAuthority;
+    }
+
+	public String getFullNameFromAuthority() {
+        return this.fullNameFromAuthority;
+    }
+
+	public void setFullNameFromAuthority(String fullNameFromAuthority) {
+        this.fullNameFromAuthority = fullNameFromAuthority;
+    }
+
+	public String getNomenclatureStatus() {
+        return this.nomenclatureStatus;
+    }
+
+	public void setNomenclatureStatus(String nomenclatureStatus) {
+        this.nomenclatureStatus = nomenclatureStatus;
+    }
+
+	public String getOtherDesignations() {
+        return this.otherDesignations;
+    }
+
+	public void setOtherDesignations(String otherDesignations) {
+        this.otherDesignations = otherDesignations;
+    }
+
+	public Date getModificationDate() {
+        return this.modificationDate;
+    }
+
+	public void setModificationDate(Date modificationDate) {
+        this.modificationDate = modificationDate;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/EntrezDbGeneDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/EntrezDbGeneDTO_Roo_JavaBean.aj
deleted file mode 100755
index 9338580ab..000000000
--- a/src/main/java/com/labsynch/labseer/dto/EntrezDbGeneDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,131 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.EntrezDbGeneDTO;
-import java.util.Date;
-
-privileged aspect EntrezDbGeneDTO_Roo_JavaBean {
-    
-    public String EntrezDbGeneDTO.getTaxId() {
-        return this.taxId;
-    }
-    
-    public void EntrezDbGeneDTO.setTaxId(String taxId) {
-        this.taxId = taxId;
-    }
-    
-    public String EntrezDbGeneDTO.getGeneId() {
-        return this.geneId;
-    }
-    
-    public void EntrezDbGeneDTO.setGeneId(String geneId) {
-        this.geneId = geneId;
-    }
-    
-    public String EntrezDbGeneDTO.getSymbol() {
-        return this.symbol;
-    }
-    
-    public void EntrezDbGeneDTO.setSymbol(String symbol) {
-        this.symbol = symbol;
-    }
-    
-    public String EntrezDbGeneDTO.getLocusTag() {
-        return this.locusTag;
-    }
-    
-    public void EntrezDbGeneDTO.setLocusTag(String locusTag) {
-        this.locusTag = locusTag;
-    }
-    
-    public String EntrezDbGeneDTO.getSynonyms() {
-        return this.synonyms;
-    }
-    
-    public void EntrezDbGeneDTO.setSynonyms(String synonyms) {
-        this.synonyms = synonyms;
-    }
-    
-    public String EntrezDbGeneDTO.getDbXrefs() {
-        return this.dbXrefs;
-    }
-    
-    public void EntrezDbGeneDTO.setDbXrefs(String dbXrefs) {
-        this.dbXrefs = dbXrefs;
-    }
-    
-    public String EntrezDbGeneDTO.getChromosome() {
-        return this.chromosome;
-    }
-    
-    public void EntrezDbGeneDTO.setChromosome(String chromosome) {
-        this.chromosome = chromosome;
-    }
-    
-    public String EntrezDbGeneDTO.getMapLocation() {
-        return this.mapLocation;
-    }
-    
-    public void EntrezDbGeneDTO.setMapLocation(String mapLocation) {
-        this.mapLocation = mapLocation;
-    }
-    
-    public String EntrezDbGeneDTO.getDescription() {
-        return this.description;
-    }
-    
-    public void EntrezDbGeneDTO.setDescription(String description) {
-        this.description = description;
-    }
-    
-    public String EntrezDbGeneDTO.getTypeOfGene() {
-        return this.typeOfGene;
-    }
-    
-    public void EntrezDbGeneDTO.setTypeOfGene(String typeOfGene) {
-        this.typeOfGene = typeOfGene;
-    }
-    
-    public String EntrezDbGeneDTO.getSymbolFromAuthority() {
-        return this.symbolFromAuthority;
-    }
-    
-    public void EntrezDbGeneDTO.setSymbolFromAuthority(String symbolFromAuthority) {
-        this.symbolFromAuthority = symbolFromAuthority;
-    }
-    
-    public String EntrezDbGeneDTO.getFullNameFromAuthority() {
-        return this.fullNameFromAuthority;
-    }
-    
-    public void EntrezDbGeneDTO.setFullNameFromAuthority(String fullNameFromAuthority) {
-        this.fullNameFromAuthority = fullNameFromAuthority;
-    }
-    
-    public String EntrezDbGeneDTO.getNomenclatureStatus() {
-        return this.nomenclatureStatus;
-    }
-    
-    public void EntrezDbGeneDTO.setNomenclatureStatus(String nomenclatureStatus) {
-        this.nomenclatureStatus = nomenclatureStatus;
-    }
-    
-    public String EntrezDbGeneDTO.getOtherDesignations() {
-        return this.otherDesignations;
-    }
-    
-    public void EntrezDbGeneDTO.setOtherDesignations(String otherDesignations) {
-        this.otherDesignations = otherDesignations;
-    }
-    
-    public Date EntrezDbGeneDTO.getModificationDate() {
-        return this.modificationDate;
-    }
-    
-    public void EntrezDbGeneDTO.setModificationDate(Date modificationDate) {
-        this.modificationDate = modificationDate;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/EntrezDbGeneDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/EntrezDbGeneDTO_Roo_Json.aj
deleted file mode 100755
index 1b46b589b..000000000
--- a/src/main/java/com/labsynch/labseer/dto/EntrezDbGeneDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.EntrezDbGeneDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect EntrezDbGeneDTO_Roo_Json {
-    
-    public String EntrezDbGeneDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String EntrezDbGeneDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static EntrezDbGeneDTO EntrezDbGeneDTO.fromJsonToEntrezDbGeneDTO(String json) {
-        return new JSONDeserializer<EntrezDbGeneDTO>()
-        .use(null, EntrezDbGeneDTO.class).deserialize(json);
-    }
-    
-    public static String EntrezDbGeneDTO.toJsonArray(Collection<EntrezDbGeneDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String EntrezDbGeneDTO.toJsonArray(Collection<EntrezDbGeneDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<EntrezDbGeneDTO> EntrezDbGeneDTO.fromJsonArrayToEntrezDbGeneDTO(String json) {
-        return new JSONDeserializer<List<EntrezDbGeneDTO>>()
-        .use("values", EntrezDbGeneDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/EntrezDbGeneDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/EntrezDbGeneDTO_Roo_ToString.aj
deleted file mode 100755
index 8a8ff60df..000000000
--- a/src/main/java/com/labsynch/labseer/dto/EntrezDbGeneDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.EntrezDbGeneDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect EntrezDbGeneDTO_Roo_ToString {
-    
-    public String EntrezDbGeneDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/EntrezDiscontinuedGeneDTO.java b/src/main/java/com/labsynch/labseer/dto/EntrezDiscontinuedGeneDTO.java
index 59468d18b..4a203e062 100644
--- a/src/main/java/com/labsynch/labseer/dto/EntrezDiscontinuedGeneDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/EntrezDiscontinuedGeneDTO.java
@@ -1,7 +1,12 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -19,4 +24,78 @@ public class EntrezDiscontinuedGeneDTO {
     private String discontinuedSymbol;    
     private Date discontinuedDate;
 
+
+	public String getTaxId() {
+        return this.taxId;
+    }
+
+	public void setTaxId(String taxId) {
+        this.taxId = taxId;
+    }
+
+	public String getGeneId() {
+        return this.geneId;
+    }
+
+	public void setGeneId(String geneId) {
+        this.geneId = geneId;
+    }
+
+	public String getDiscontinuedGeneId() {
+        return this.discontinuedGeneId;
+    }
+
+	public void setDiscontinuedGeneId(String discontinuedGeneId) {
+        this.discontinuedGeneId = discontinuedGeneId;
+    }
+
+	public String getDiscontinuedSymbol() {
+        return this.discontinuedSymbol;
+    }
+
+	public void setDiscontinuedSymbol(String discontinuedSymbol) {
+        this.discontinuedSymbol = discontinuedSymbol;
+    }
+
+	public Date getDiscontinuedDate() {
+        return this.discontinuedDate;
+    }
+
+	public void setDiscontinuedDate(Date discontinuedDate) {
+        this.discontinuedDate = discontinuedDate;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static EntrezDiscontinuedGeneDTO fromJsonToEntrezDiscontinuedGeneDTO(String json) {
+        return new JSONDeserializer<EntrezDiscontinuedGeneDTO>()
+        .use(null, EntrezDiscontinuedGeneDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<EntrezDiscontinuedGeneDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<EntrezDiscontinuedGeneDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<EntrezDiscontinuedGeneDTO> fromJsonArrayToEntrezDiscoes(String json) {
+        return new JSONDeserializer<List<EntrezDiscontinuedGeneDTO>>()
+        .use("values", EntrezDiscontinuedGeneDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/EntrezDiscontinuedGeneDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/EntrezDiscontinuedGeneDTO_Roo_JavaBean.aj
deleted file mode 100644
index 0c0742c9d..000000000
--- a/src/main/java/com/labsynch/labseer/dto/EntrezDiscontinuedGeneDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,51 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.EntrezDiscontinuedGeneDTO;
-import java.util.Date;
-
-privileged aspect EntrezDiscontinuedGeneDTO_Roo_JavaBean {
-    
-    public String EntrezDiscontinuedGeneDTO.getTaxId() {
-        return this.taxId;
-    }
-    
-    public void EntrezDiscontinuedGeneDTO.setTaxId(String taxId) {
-        this.taxId = taxId;
-    }
-    
-    public String EntrezDiscontinuedGeneDTO.getGeneId() {
-        return this.geneId;
-    }
-    
-    public void EntrezDiscontinuedGeneDTO.setGeneId(String geneId) {
-        this.geneId = geneId;
-    }
-    
-    public String EntrezDiscontinuedGeneDTO.getDiscontinuedGeneId() {
-        return this.discontinuedGeneId;
-    }
-    
-    public void EntrezDiscontinuedGeneDTO.setDiscontinuedGeneId(String discontinuedGeneId) {
-        this.discontinuedGeneId = discontinuedGeneId;
-    }
-    
-    public String EntrezDiscontinuedGeneDTO.getDiscontinuedSymbol() {
-        return this.discontinuedSymbol;
-    }
-    
-    public void EntrezDiscontinuedGeneDTO.setDiscontinuedSymbol(String discontinuedSymbol) {
-        this.discontinuedSymbol = discontinuedSymbol;
-    }
-    
-    public Date EntrezDiscontinuedGeneDTO.getDiscontinuedDate() {
-        return this.discontinuedDate;
-    }
-    
-    public void EntrezDiscontinuedGeneDTO.setDiscontinuedDate(Date discontinuedDate) {
-        this.discontinuedDate = discontinuedDate;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/EntrezDiscontinuedGeneDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/EntrezDiscontinuedGeneDTO_Roo_Json.aj
deleted file mode 100644
index d943228e3..000000000
--- a/src/main/java/com/labsynch/labseer/dto/EntrezDiscontinuedGeneDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.EntrezDiscontinuedGeneDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect EntrezDiscontinuedGeneDTO_Roo_Json {
-    
-    public String EntrezDiscontinuedGeneDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String EntrezDiscontinuedGeneDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static EntrezDiscontinuedGeneDTO EntrezDiscontinuedGeneDTO.fromJsonToEntrezDiscontinuedGeneDTO(String json) {
-        return new JSONDeserializer<EntrezDiscontinuedGeneDTO>()
-        .use(null, EntrezDiscontinuedGeneDTO.class).deserialize(json);
-    }
-    
-    public static String EntrezDiscontinuedGeneDTO.toJsonArray(Collection<EntrezDiscontinuedGeneDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String EntrezDiscontinuedGeneDTO.toJsonArray(Collection<EntrezDiscontinuedGeneDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<EntrezDiscontinuedGeneDTO> EntrezDiscontinuedGeneDTO.fromJsonArrayToEntrezDiscoes(String json) {
-        return new JSONDeserializer<List<EntrezDiscontinuedGeneDTO>>()
-        .use("values", EntrezDiscontinuedGeneDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/EntrezDiscontinuedGeneDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/EntrezDiscontinuedGeneDTO_Roo_ToString.aj
deleted file mode 100644
index fcf49276a..000000000
--- a/src/main/java/com/labsynch/labseer/dto/EntrezDiscontinuedGeneDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.EntrezDiscontinuedGeneDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect EntrezDiscontinuedGeneDTO_Roo_ToString {
-    
-    public String EntrezDiscontinuedGeneDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ErrorMessageDTO.java b/src/main/java/com/labsynch/labseer/dto/ErrorMessageDTO.java
index 9ae53f623..f5347b409 100755
--- a/src/main/java/com/labsynch/labseer/dto/ErrorMessageDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ErrorMessageDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -22,4 +28,54 @@ public ErrorMessageDTO(String level, String message){
 		this.message = message;
 	}
 	
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ErrorMessageDTO fromJsonToErrorMessageDTO(String json) {
+        return new JSONDeserializer<ErrorMessageDTO>()
+        .use(null, ErrorMessageDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ErrorMessageDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ErrorMessageDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ErrorMessageDTO> fromJsonArrayToErroes(String json) {
+        return new JSONDeserializer<List<ErrorMessageDTO>>()
+        .use("values", ErrorMessageDTO.class).deserialize(json);
+    }
+
+	public String getLevel() {
+        return this.level;
+    }
+
+	public void setLevel(String level) {
+        this.level = level;
+    }
+
+	public String getMessage() {
+        return this.message;
+    }
+
+	public void setMessage(String message) {
+        this.message = message;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ErrorMessageDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ErrorMessageDTO_Roo_JavaBean.aj
deleted file mode 100755
index fa108a384..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ErrorMessageDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ErrorMessageDTO;
-
-privileged aspect ErrorMessageDTO_Roo_JavaBean {
-    
-    public String ErrorMessageDTO.getLevel() {
-        return this.level;
-    }
-    
-    public void ErrorMessageDTO.setLevel(String level) {
-        this.level = level;
-    }
-    
-    public String ErrorMessageDTO.getMessage() {
-        return this.message;
-    }
-    
-    public void ErrorMessageDTO.setMessage(String message) {
-        this.message = message;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ErrorMessageDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ErrorMessageDTO_Roo_Json.aj
deleted file mode 100755
index fc69c83ab..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ErrorMessageDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ErrorMessageDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ErrorMessageDTO_Roo_Json {
-    
-    public String ErrorMessageDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ErrorMessageDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ErrorMessageDTO ErrorMessageDTO.fromJsonToErrorMessageDTO(String json) {
-        return new JSONDeserializer<ErrorMessageDTO>()
-        .use(null, ErrorMessageDTO.class).deserialize(json);
-    }
-    
-    public static String ErrorMessageDTO.toJsonArray(Collection<ErrorMessageDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ErrorMessageDTO.toJsonArray(Collection<ErrorMessageDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ErrorMessageDTO> ErrorMessageDTO.fromJsonArrayToErroes(String json) {
-        return new JSONDeserializer<List<ErrorMessageDTO>>()
-        .use("values", ErrorMessageDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ErrorMessageDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ErrorMessageDTO_Roo_ToString.aj
deleted file mode 100755
index 166930cb2..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ErrorMessageDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ErrorMessageDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ErrorMessageDTO_Roo_ToString {
-    
-    public String ErrorMessageDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentCodeDTO.java
index 96ade4088..1e40d564c 100644
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentCodeDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -15,6 +21,56 @@ public class ExperimentCodeDTO {
 	public ExperimentCodeDTO(){
 	}
 
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ExperimentCodeDTO fromJsonToExperimentCodeDTO(String json) {
+        return new JSONDeserializer<ExperimentCodeDTO>()
+        .use(null, ExperimentCodeDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ExperimentCodeDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ExperimentCodeDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ExperimentCodeDTO> fromJsonArrayToExperimentCoes(String json) {
+        return new JSONDeserializer<List<ExperimentCodeDTO>>()
+        .use("values", ExperimentCodeDTO.class).deserialize(json);
+    }
+
+	public String getExperimentCode() {
+        return this.experimentCode;
+    }
+
+	public void setExperimentCode(String experimentCode) {
+        this.experimentCode = experimentCode;
+    }
+
+	public String getProtocolCode() {
+        return this.protocolCode;
+    }
+
+	public void setProtocolCode(String protocolCode) {
+        this.protocolCode = protocolCode;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentCodeDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ExperimentCodeDTO_Roo_JavaBean.aj
deleted file mode 100644
index bd8810c68..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentCodeDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ExperimentCodeDTO;
-
-privileged aspect ExperimentCodeDTO_Roo_JavaBean {
-    
-    public String ExperimentCodeDTO.getExperimentCode() {
-        return this.experimentCode;
-    }
-    
-    public void ExperimentCodeDTO.setExperimentCode(String experimentCode) {
-        this.experimentCode = experimentCode;
-    }
-    
-    public String ExperimentCodeDTO.getProtocolCode() {
-        return this.protocolCode;
-    }
-    
-    public void ExperimentCodeDTO.setProtocolCode(String protocolCode) {
-        this.protocolCode = protocolCode;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentCodeDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ExperimentCodeDTO_Roo_Json.aj
deleted file mode 100644
index 04da1fa51..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentCodeDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ExperimentCodeDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ExperimentCodeDTO_Roo_Json {
-    
-    public String ExperimentCodeDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ExperimentCodeDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ExperimentCodeDTO ExperimentCodeDTO.fromJsonToExperimentCodeDTO(String json) {
-        return new JSONDeserializer<ExperimentCodeDTO>()
-        .use(null, ExperimentCodeDTO.class).deserialize(json);
-    }
-    
-    public static String ExperimentCodeDTO.toJsonArray(Collection<ExperimentCodeDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ExperimentCodeDTO.toJsonArray(Collection<ExperimentCodeDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ExperimentCodeDTO> ExperimentCodeDTO.fromJsonArrayToExperimentCoes(String json) {
-        return new JSONDeserializer<List<ExperimentCodeDTO>>()
-        .use("values", ExperimentCodeDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentCodeDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ExperimentCodeDTO_Roo_ToString.aj
deleted file mode 100644
index fe17a836e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentCodeDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ExperimentCodeDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ExperimentCodeDTO_Roo_ToString {
-    
-    public String ExperimentCodeDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentCsvDataDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentCsvDataDTO.java
index d94f4e299..7b7ab58cd 100644
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentCsvDataDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentCsvDataDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -17,6 +23,72 @@ public class ExperimentCsvDataDTO {
 
 	private String subjectCsvFilePath;
 	
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ExperimentCsvDataDTO fromJsonToExperimentCsvDataDTO(String json) {
+        return new JSONDeserializer<ExperimentCsvDataDTO>()
+        .use(null, ExperimentCsvDataDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ExperimentCsvDataDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ExperimentCsvDataDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ExperimentCsvDataDTO> fromJsonArrayToExperimentCsvDataDTO(String json) {
+        return new JSONDeserializer<List<ExperimentCsvDataDTO>>()
+        .use("values", ExperimentCsvDataDTO.class).deserialize(json);
+    }
+
+	public String getExperimentCsvFilePath() {
+        return this.experimentCsvFilePath;
+    }
+
+	public void setExperimentCsvFilePath(String experimentCsvFilePath) {
+        this.experimentCsvFilePath = experimentCsvFilePath;
+    }
+
+	public String getAnalysisGroupCsvFilePath() {
+        return this.analysisGroupCsvFilePath;
+    }
+
+	public void setAnalysisGroupCsvFilePath(String analysisGroupCsvFilePath) {
+        this.analysisGroupCsvFilePath = analysisGroupCsvFilePath;
+    }
+
+	public String getTreatmentGroupCsvFilePath() {
+        return this.treatmentGroupCsvFilePath;
+    }
+
+	public void setTreatmentGroupCsvFilePath(String treatmentGroupCsvFilePath) {
+        this.treatmentGroupCsvFilePath = treatmentGroupCsvFilePath;
+    }
+
+	public String getSubjectCsvFilePath() {
+        return this.subjectCsvFilePath;
+    }
+
+	public void setSubjectCsvFilePath(String subjectCsvFilePath) {
+        this.subjectCsvFilePath = subjectCsvFilePath;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentCsvDataDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ExperimentCsvDataDTO_Roo_JavaBean.aj
deleted file mode 100644
index 3b4a9e588..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentCsvDataDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,42 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ExperimentCsvDataDTO;
-
-privileged aspect ExperimentCsvDataDTO_Roo_JavaBean {
-    
-    public String ExperimentCsvDataDTO.getExperimentCsvFilePath() {
-        return this.experimentCsvFilePath;
-    }
-    
-    public void ExperimentCsvDataDTO.setExperimentCsvFilePath(String experimentCsvFilePath) {
-        this.experimentCsvFilePath = experimentCsvFilePath;
-    }
-    
-    public String ExperimentCsvDataDTO.getAnalysisGroupCsvFilePath() {
-        return this.analysisGroupCsvFilePath;
-    }
-    
-    public void ExperimentCsvDataDTO.setAnalysisGroupCsvFilePath(String analysisGroupCsvFilePath) {
-        this.analysisGroupCsvFilePath = analysisGroupCsvFilePath;
-    }
-    
-    public String ExperimentCsvDataDTO.getTreatmentGroupCsvFilePath() {
-        return this.treatmentGroupCsvFilePath;
-    }
-    
-    public void ExperimentCsvDataDTO.setTreatmentGroupCsvFilePath(String treatmentGroupCsvFilePath) {
-        this.treatmentGroupCsvFilePath = treatmentGroupCsvFilePath;
-    }
-    
-    public String ExperimentCsvDataDTO.getSubjectCsvFilePath() {
-        return this.subjectCsvFilePath;
-    }
-    
-    public void ExperimentCsvDataDTO.setSubjectCsvFilePath(String subjectCsvFilePath) {
-        this.subjectCsvFilePath = subjectCsvFilePath;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentCsvDataDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ExperimentCsvDataDTO_Roo_Json.aj
deleted file mode 100644
index a7ea2d2e9..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentCsvDataDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ExperimentCsvDataDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ExperimentCsvDataDTO_Roo_Json {
-    
-    public String ExperimentCsvDataDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ExperimentCsvDataDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ExperimentCsvDataDTO ExperimentCsvDataDTO.fromJsonToExperimentCsvDataDTO(String json) {
-        return new JSONDeserializer<ExperimentCsvDataDTO>()
-        .use(null, ExperimentCsvDataDTO.class).deserialize(json);
-    }
-    
-    public static String ExperimentCsvDataDTO.toJsonArray(Collection<ExperimentCsvDataDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ExperimentCsvDataDTO.toJsonArray(Collection<ExperimentCsvDataDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ExperimentCsvDataDTO> ExperimentCsvDataDTO.fromJsonArrayToExperimentCsvDataDTO(String json) {
-        return new JSONDeserializer<List<ExperimentCsvDataDTO>>()
-        .use("values", ExperimentCsvDataDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentCsvDataDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ExperimentCsvDataDTO_Roo_ToString.aj
deleted file mode 100644
index e4d8ccd43..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentCsvDataDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ExperimentCsvDataDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ExperimentCsvDataDTO_Roo_ToString {
-    
-    public String ExperimentCsvDataDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentDataDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentDataDTO.java
index 13ebd3862..f8336ef72 100644
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentDataDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentDataDTO.java
@@ -6,7 +6,8 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -87,6 +88,114 @@ public static String toJsonArray(Collection<ExperimentDataDTO> collection) {
 	public static Collection<ExperimentDataDTO> fromJsonArrayToExperimentDataDTO(String json) {
         return new JSONDeserializer<List<ExperimentDataDTO>>().use(null, ArrayList.class).use("values", ExperimentDataDTO.class).deserialize(json);
     }
+
+	public String getProtocolName() {
+        return this.protocolName;
+    }
+
+	public void setProtocolName(String protocolName) {
+        this.protocolName = protocolName;
+    }
+
+	public String getProtocolCodeName() {
+        return this.protocolCodeName;
+    }
+
+	public void setProtocolCodeName(String protocolCodeName) {
+        this.protocolCodeName = protocolCodeName;
+    }
+
+	public Long getProtocolId() {
+        return this.protocolId;
+    }
+
+	public void setProtocolId(Long protocolId) {
+        this.protocolId = protocolId;
+    }
+
+	public String getAssayFolderRule() {
+        return this.assayFolderRule;
+    }
+
+	public void setAssayFolderRule(String assayFolderRule) {
+        this.assayFolderRule = assayFolderRule;
+    }
+
+	public String getProtocolShortDescription() {
+        return this.protocolShortDescription;
+    }
+
+	public void setProtocolShortDescription(String protocolShortDescription) {
+        this.protocolShortDescription = protocolShortDescription;
+    }
+
+	public String getExperimentName() {
+        return this.experimentName;
+    }
+
+	public void setExperimentName(String experimentName) {
+        this.experimentName = experimentName;
+    }
+
+	public String getExperimentCodeName() {
+        return this.experimentCodeName;
+    }
+
+	public void setExperimentCodeName(String experimentCodeName) {
+        this.experimentCodeName = experimentCodeName;
+    }
+
+	public Long getExperimentId() {
+        return this.experimentId;
+    }
+
+	public void setExperimentId(Long experimentId) {
+        this.experimentId = experimentId;
+    }
+
+	public String getExperimentShortDescription() {
+        return this.experimentShortDescription;
+    }
+
+	public void setExperimentShortDescription(String experimentShortDescription) {
+        this.experimentShortDescription = experimentShortDescription;
+    }
+
+	public String getDisplayResults() {
+        return this.displayResults;
+    }
+
+	public void setDisplayResults(String displayResults) {
+        this.displayResults = displayResults;
+    }
+
+	public String getRenderData() {
+        return this.renderData;
+    }
+
+	public void setRenderData(String renderData) {
+        this.renderData = renderData;
+    }
+
+	public Set<LsTag> getLsTags() {
+        return this.lsTags;
+    }
+
+	public void setLsTags(Set<LsTag> lsTags) {
+        this.lsTags = lsTags;
+    }
+
+	public Set<AnalysisGroupValueDTO> getAnalysisGroupValues() {
+        return this.analysisGroupValues;
+    }
+
+	public void setAnalysisGroupValues(Set<AnalysisGroupValueDTO> analysisGroupValues) {
+        this.analysisGroupValues = analysisGroupValues;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 	
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentDataDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ExperimentDataDTO_Roo_JavaBean.aj
deleted file mode 100644
index 04f29e109..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentDataDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,117 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.LsTag;
-import com.labsynch.labseer.dto.AnalysisGroupValueDTO;
-import com.labsynch.labseer.dto.ExperimentDataDTO;
-import java.util.Set;
-
-privileged aspect ExperimentDataDTO_Roo_JavaBean {
-    
-    public String ExperimentDataDTO.getProtocolName() {
-        return this.protocolName;
-    }
-    
-    public void ExperimentDataDTO.setProtocolName(String protocolName) {
-        this.protocolName = protocolName;
-    }
-    
-    public String ExperimentDataDTO.getProtocolCodeName() {
-        return this.protocolCodeName;
-    }
-    
-    public void ExperimentDataDTO.setProtocolCodeName(String protocolCodeName) {
-        this.protocolCodeName = protocolCodeName;
-    }
-    
-    public Long ExperimentDataDTO.getProtocolId() {
-        return this.protocolId;
-    }
-    
-    public void ExperimentDataDTO.setProtocolId(Long protocolId) {
-        this.protocolId = protocolId;
-    }
-    
-    public String ExperimentDataDTO.getAssayFolderRule() {
-        return this.assayFolderRule;
-    }
-    
-    public void ExperimentDataDTO.setAssayFolderRule(String assayFolderRule) {
-        this.assayFolderRule = assayFolderRule;
-    }
-    
-    public String ExperimentDataDTO.getProtocolShortDescription() {
-        return this.protocolShortDescription;
-    }
-    
-    public void ExperimentDataDTO.setProtocolShortDescription(String protocolShortDescription) {
-        this.protocolShortDescription = protocolShortDescription;
-    }
-    
-    public String ExperimentDataDTO.getExperimentName() {
-        return this.experimentName;
-    }
-    
-    public void ExperimentDataDTO.setExperimentName(String experimentName) {
-        this.experimentName = experimentName;
-    }
-    
-    public String ExperimentDataDTO.getExperimentCodeName() {
-        return this.experimentCodeName;
-    }
-    
-    public void ExperimentDataDTO.setExperimentCodeName(String experimentCodeName) {
-        this.experimentCodeName = experimentCodeName;
-    }
-    
-    public Long ExperimentDataDTO.getExperimentId() {
-        return this.experimentId;
-    }
-    
-    public void ExperimentDataDTO.setExperimentId(Long experimentId) {
-        this.experimentId = experimentId;
-    }
-    
-    public String ExperimentDataDTO.getExperimentShortDescription() {
-        return this.experimentShortDescription;
-    }
-    
-    public void ExperimentDataDTO.setExperimentShortDescription(String experimentShortDescription) {
-        this.experimentShortDescription = experimentShortDescription;
-    }
-    
-    public String ExperimentDataDTO.getDisplayResults() {
-        return this.displayResults;
-    }
-    
-    public void ExperimentDataDTO.setDisplayResults(String displayResults) {
-        this.displayResults = displayResults;
-    }
-    
-    public String ExperimentDataDTO.getRenderData() {
-        return this.renderData;
-    }
-    
-    public void ExperimentDataDTO.setRenderData(String renderData) {
-        this.renderData = renderData;
-    }
-    
-    public Set<LsTag> ExperimentDataDTO.getLsTags() {
-        return this.lsTags;
-    }
-    
-    public void ExperimentDataDTO.setLsTags(Set<LsTag> lsTags) {
-        this.lsTags = lsTags;
-    }
-    
-    public Set<AnalysisGroupValueDTO> ExperimentDataDTO.getAnalysisGroupValues() {
-        return this.analysisGroupValues;
-    }
-    
-    public void ExperimentDataDTO.setAnalysisGroupValues(Set<AnalysisGroupValueDTO> analysisGroupValues) {
-        this.analysisGroupValues = analysisGroupValues;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentDataDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ExperimentDataDTO_Roo_ToString.aj
deleted file mode 100644
index 05d71d953..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentDataDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ExperimentDataDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ExperimentDataDTO_Roo_ToString {
-    
-    public String ExperimentDataDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentErrorMessageDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentErrorMessageDTO.java
index 25784f4b0..5cf3d9480 100644
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentErrorMessageDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentErrorMessageDTO.java
@@ -1,7 +1,9 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -9,7 +11,7 @@
 
 import com.labsynch.labseer.domain.Experiment;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -108,4 +110,50 @@ public ExperimentErrorMessageDTO(String experimentCodeName, Experiment experimen
 		this.experiment = experiment;
 	}
 	
+
+	public static ExperimentErrorMessageDTO fromJsonToExperimentErrorMessageDTO(String json) {
+        return new JSONDeserializer<ExperimentErrorMessageDTO>()
+        .use(null, ExperimentErrorMessageDTO.class).deserialize(json);
+    }
+
+	public static Collection<ExperimentErrorMessageDTO> fromJsonArrayToExperimentErroes(String json) {
+        return new JSONDeserializer<List<ExperimentErrorMessageDTO>>()
+        .use("values", ExperimentErrorMessageDTO.class).deserialize(json);
+    }
+
+	public String getExperimentCodeName() {
+        return this.experimentCodeName;
+    }
+
+	public void setExperimentCodeName(String experimentCodeName) {
+        this.experimentCodeName = experimentCodeName;
+    }
+
+	public String getLevel() {
+        return this.level;
+    }
+
+	public void setLevel(String level) {
+        this.level = level;
+    }
+
+	public String getMessage() {
+        return this.message;
+    }
+
+	public void setMessage(String message) {
+        this.message = message;
+    }
+
+	public Experiment getExperiment() {
+        return this.experiment;
+    }
+
+	public void setExperiment(Experiment experiment) {
+        this.experiment = experiment;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentErrorMessageDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ExperimentErrorMessageDTO_Roo_JavaBean.aj
deleted file mode 100644
index 6956f4a7c..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentErrorMessageDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.dto.ExperimentErrorMessageDTO;
-
-privileged aspect ExperimentErrorMessageDTO_Roo_JavaBean {
-    
-    public String ExperimentErrorMessageDTO.getExperimentCodeName() {
-        return this.experimentCodeName;
-    }
-    
-    public void ExperimentErrorMessageDTO.setExperimentCodeName(String experimentCodeName) {
-        this.experimentCodeName = experimentCodeName;
-    }
-    
-    public String ExperimentErrorMessageDTO.getLevel() {
-        return this.level;
-    }
-    
-    public void ExperimentErrorMessageDTO.setLevel(String level) {
-        this.level = level;
-    }
-    
-    public String ExperimentErrorMessageDTO.getMessage() {
-        return this.message;
-    }
-    
-    public void ExperimentErrorMessageDTO.setMessage(String message) {
-        this.message = message;
-    }
-    
-    public Experiment ExperimentErrorMessageDTO.getExperiment() {
-        return this.experiment;
-    }
-    
-    public void ExperimentErrorMessageDTO.setExperiment(Experiment experiment) {
-        this.experiment = experiment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentErrorMessageDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ExperimentErrorMessageDTO_Roo_Json.aj
deleted file mode 100644
index 8618b254f..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentErrorMessageDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ExperimentErrorMessageDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ExperimentErrorMessageDTO_Roo_Json {
-    
-    public static ExperimentErrorMessageDTO ExperimentErrorMessageDTO.fromJsonToExperimentErrorMessageDTO(String json) {
-        return new JSONDeserializer<ExperimentErrorMessageDTO>()
-        .use(null, ExperimentErrorMessageDTO.class).deserialize(json);
-    }
-    
-    public static Collection<ExperimentErrorMessageDTO> ExperimentErrorMessageDTO.fromJsonArrayToExperimentErroes(String json) {
-        return new JSONDeserializer<List<ExperimentErrorMessageDTO>>()
-        .use("values", ExperimentErrorMessageDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentErrorMessageDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ExperimentErrorMessageDTO_Roo_ToString.aj
deleted file mode 100644
index 7e98ff848..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentErrorMessageDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ExperimentErrorMessageDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ExperimentErrorMessageDTO_Roo_ToString {
-    
-    public String ExperimentErrorMessageDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentFilterDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentFilterDTO.java
index 3a2b2e9fe..827566a12 100755
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentFilterDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentFilterDTO.java
@@ -4,7 +4,8 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -49,6 +50,42 @@ public static String toPrettyJsonArray(Collection<ExperimentFilterDTO> collectio
 	public static Collection<ExperimentFilterDTO> fromJsonArrayToExperimentFilterDTO(String json) {
         return new JSONDeserializer<List<ExperimentFilterDTO>>().use(null, ArrayList.class).use("values", ExperimentFilterDTO.class).deserialize(json);
     }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public Long getExperimentId() {
+        return this.experimentId;
+    }
+
+	public void setExperimentId(Long experimentId) {
+        this.experimentId = experimentId;
+    }
+
+	public String getExperimentCode() {
+        return this.experimentCode;
+    }
+
+	public void setExperimentCode(String experimentCode) {
+        this.experimentCode = experimentCode;
+    }
+
+	public String getExperimentName() {
+        return this.experimentName;
+    }
+
+	public void setExperimentName(String experimentName) {
+        this.experimentName = experimentName;
+    }
+
+	public Collection<ValueTypeKindDTO> getValueKinds() {
+        return this.valueKinds;
+    }
+
+	public void setValueKinds(Collection<ValueTypeKindDTO> valueKinds) {
+        this.valueKinds = valueKinds;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentFilterDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ExperimentFilterDTO_Roo_JavaBean.aj
deleted file mode 100755
index 17edfddf5..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentFilterDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,44 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ExperimentFilterDTO;
-import com.labsynch.labseer.dto.ValueTypeKindDTO;
-import java.util.Collection;
-
-privileged aspect ExperimentFilterDTO_Roo_JavaBean {
-    
-    public Long ExperimentFilterDTO.getExperimentId() {
-        return this.experimentId;
-    }
-    
-    public void ExperimentFilterDTO.setExperimentId(Long experimentId) {
-        this.experimentId = experimentId;
-    }
-    
-    public String ExperimentFilterDTO.getExperimentCode() {
-        return this.experimentCode;
-    }
-    
-    public void ExperimentFilterDTO.setExperimentCode(String experimentCode) {
-        this.experimentCode = experimentCode;
-    }
-    
-    public String ExperimentFilterDTO.getExperimentName() {
-        return this.experimentName;
-    }
-    
-    public void ExperimentFilterDTO.setExperimentName(String experimentName) {
-        this.experimentName = experimentName;
-    }
-    
-    public Collection<ValueTypeKindDTO> ExperimentFilterDTO.getValueKinds() {
-        return this.valueKinds;
-    }
-    
-    public void ExperimentFilterDTO.setValueKinds(Collection<ValueTypeKindDTO> valueKinds) {
-        this.valueKinds = valueKinds;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentFilterDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ExperimentFilterDTO_Roo_ToString.aj
deleted file mode 100755
index 57ca6b384..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentFilterDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ExperimentFilterDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ExperimentFilterDTO_Roo_ToString {
-    
-    public String ExperimentFilterDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentFilterSearchDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentFilterSearchDTO.java
index 908492471..f9d6ee0f8 100755
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentFilterSearchDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentFilterSearchDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -27,6 +33,112 @@ public class ExperimentFilterSearchDTO {
 
 	private String filterValue;
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ExperimentFilterSearchDTO fromJsonToExperimentFilterSearchDTO(String json) {
+        return new JSONDeserializer<ExperimentFilterSearchDTO>()
+        .use(null, ExperimentFilterSearchDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ExperimentFilterSearchDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ExperimentFilterSearchDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ExperimentFilterSearchDTO> fromJsonArrayToExperimentFilterSearchDTO(String json) {
+        return new JSONDeserializer<List<ExperimentFilterSearchDTO>>()
+        .use("values", ExperimentFilterSearchDTO.class).deserialize(json);
+    }
+
+	public String getQueryId() {
+        return this.queryId;
+    }
+
+	public void setQueryId(String queryId) {
+        this.queryId = queryId;
+    }
+
+	public String getTermName() {
+        return this.termName;
+    }
+
+	public void setTermName(String termName) {
+        this.termName = termName;
+    }
+
+	public Long getExperimentId() {
+        return this.experimentId;
+    }
+
+	public void setExperimentId(Long experimentId) {
+        this.experimentId = experimentId;
+    }
+
+	public String getCodeName() {
+        return this.codeName;
+    }
+
+	public void setCodeName(String codeName) {
+        this.codeName = codeName;
+    }
+
+	public String getExperimentCode() {
+        return this.experimentCode;
+    }
+
+	public void setExperimentCode(String experimentCode) {
+        this.experimentCode = experimentCode;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getOperator() {
+        return this.operator;
+    }
+
+	public void setOperator(String operator) {
+        this.operator = operator;
+    }
+
+	public String getFilterValue() {
+        return this.filterValue;
+    }
+
+	public void setFilterValue(String filterValue) {
+        this.filterValue = filterValue;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentFilterSearchDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ExperimentFilterSearchDTO_Roo_JavaBean.aj
deleted file mode 100755
index fd9f5c105..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentFilterSearchDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,82 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ExperimentFilterSearchDTO;
-
-privileged aspect ExperimentFilterSearchDTO_Roo_JavaBean {
-    
-    public String ExperimentFilterSearchDTO.getQueryId() {
-        return this.queryId;
-    }
-    
-    public void ExperimentFilterSearchDTO.setQueryId(String queryId) {
-        this.queryId = queryId;
-    }
-    
-    public String ExperimentFilterSearchDTO.getTermName() {
-        return this.termName;
-    }
-    
-    public void ExperimentFilterSearchDTO.setTermName(String termName) {
-        this.termName = termName;
-    }
-    
-    public Long ExperimentFilterSearchDTO.getExperimentId() {
-        return this.experimentId;
-    }
-    
-    public void ExperimentFilterSearchDTO.setExperimentId(Long experimentId) {
-        this.experimentId = experimentId;
-    }
-    
-    public String ExperimentFilterSearchDTO.getCodeName() {
-        return this.codeName;
-    }
-    
-    public void ExperimentFilterSearchDTO.setCodeName(String codeName) {
-        this.codeName = codeName;
-    }
-    
-    public String ExperimentFilterSearchDTO.getExperimentCode() {
-        return this.experimentCode;
-    }
-    
-    public void ExperimentFilterSearchDTO.setExperimentCode(String experimentCode) {
-        this.experimentCode = experimentCode;
-    }
-    
-    public String ExperimentFilterSearchDTO.getLsType() {
-        return this.lsType;
-    }
-    
-    public void ExperimentFilterSearchDTO.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String ExperimentFilterSearchDTO.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void ExperimentFilterSearchDTO.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String ExperimentFilterSearchDTO.getOperator() {
-        return this.operator;
-    }
-    
-    public void ExperimentFilterSearchDTO.setOperator(String operator) {
-        this.operator = operator;
-    }
-    
-    public String ExperimentFilterSearchDTO.getFilterValue() {
-        return this.filterValue;
-    }
-    
-    public void ExperimentFilterSearchDTO.setFilterValue(String filterValue) {
-        this.filterValue = filterValue;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentFilterSearchDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ExperimentFilterSearchDTO_Roo_Json.aj
deleted file mode 100755
index 5a6e8cf11..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentFilterSearchDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ExperimentFilterSearchDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ExperimentFilterSearchDTO_Roo_Json {
-    
-    public String ExperimentFilterSearchDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ExperimentFilterSearchDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ExperimentFilterSearchDTO ExperimentFilterSearchDTO.fromJsonToExperimentFilterSearchDTO(String json) {
-        return new JSONDeserializer<ExperimentFilterSearchDTO>()
-        .use(null, ExperimentFilterSearchDTO.class).deserialize(json);
-    }
-    
-    public static String ExperimentFilterSearchDTO.toJsonArray(Collection<ExperimentFilterSearchDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ExperimentFilterSearchDTO.toJsonArray(Collection<ExperimentFilterSearchDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ExperimentFilterSearchDTO> ExperimentFilterSearchDTO.fromJsonArrayToExperimentFilterSearchDTO(String json) {
-        return new JSONDeserializer<List<ExperimentFilterSearchDTO>>()
-        .use("values", ExperimentFilterSearchDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentFilterSearchDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ExperimentFilterSearchDTO_Roo_ToString.aj
deleted file mode 100755
index 131d2fcf0..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentFilterSearchDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ExperimentFilterSearchDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ExperimentFilterSearchDTO_Roo_ToString {
-    
-    public String ExperimentFilterSearchDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentGuiStubDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentGuiStubDTO.java
index 7ad99f835..2818206c4 100755
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentGuiStubDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentGuiStubDTO.java
@@ -1,8 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import java.util.Collection;
 import java.util.Date;
+import java.util.List;
 import java.util.Set;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.roo.addon.javabean.RooJavaBean;
@@ -13,6 +16,8 @@
 import com.labsynch.labseer.domain.ExperimentState;
 import com.labsynch.labseer.domain.ExperimentValue;
 import com.labsynch.labseer.domain.Protocol;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
 @RooJavaBean
 @RooToString
@@ -95,6 +100,160 @@ public ExperimentGuiStubDTO(Experiment experiment) {
 
 
 
+
+	public Long getExperimentId() {
+        return this.experimentId;
+    }
+
+	public void setExperimentId(Long experimentId) {
+        this.experimentId = experimentId;
+    }
+
+	public Long getProtocolId() {
+        return this.protocolId;
+    }
+
+	public void setProtocolId(Long protocolId) {
+        this.protocolId = protocolId;
+    }
+
+	public String getProtocolName() {
+        return this.protocolName;
+    }
+
+	public void setProtocolName(String protocolName) {
+        this.protocolName = protocolName;
+    }
+
+	public String getCode() {
+        return this.code;
+    }
+
+	public void setCode(String code) {
+        this.code = code;
+    }
+
+	public String getName() {
+        return this.name;
+    }
+
+	public void setName(String name) {
+        this.name = name;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getScientist() {
+        return this.scientist;
+    }
+
+	public void setScientist(String scientist) {
+        this.scientist = scientist;
+    }
+
+	public Date getCompletionDate() {
+        return this.completionDate;
+    }
+
+	public void setCompletionDate(Date completionDate) {
+        this.completionDate = completionDate;
+    }
+
+	public String getNotebook() {
+        return this.notebook;
+    }
+
+	public void setNotebook(String notebook) {
+        this.notebook = notebook;
+    }
+
+	public String getNotebookPage() {
+        return this.notebookPage;
+    }
+
+	public void setNotebookPage(String notebookPage) {
+        this.notebookPage = notebookPage;
+    }
+
+	public String getStatus() {
+        return this.status;
+    }
+
+	public void setStatus(String status) {
+        this.status = status;
+    }
+
+	public String getAnalysisStatus() {
+        return this.analysisStatus;
+    }
+
+	public void setAnalysisStatus(String analysisStatus) {
+        this.analysisStatus = analysisStatus;
+    }
+
+	public String getShortDescription() {
+        return this.shortDescription;
+    }
+
+	public void setShortDescription(String shortDescription) {
+        this.shortDescription = shortDescription;
+    }
+
+	public String getLongDescription() {
+        return this.longDescription;
+    }
+
+	public void setLongDescription(String longDescription) {
+        this.longDescription = longDescription;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ExperimentGuiStubDTO fromJsonToExperimentGuiStubDTO(String json) {
+        return new JSONDeserializer<ExperimentGuiStubDTO>()
+        .use(null, ExperimentGuiStubDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ExperimentGuiStubDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ExperimentGuiStubDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ExperimentGuiStubDTO> fromJsonArrayToExperimentGuiStubDTO(String json) {
+        return new JSONDeserializer<List<ExperimentGuiStubDTO>>()
+        .use("values", ExperimentGuiStubDTO.class).deserialize(json);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentGuiStubDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ExperimentGuiStubDTO_Roo_JavaBean.aj
deleted file mode 100755
index 75513e5c2..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentGuiStubDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,131 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ExperimentGuiStubDTO;
-import java.util.Date;
-
-privileged aspect ExperimentGuiStubDTO_Roo_JavaBean {
-    
-    public Long ExperimentGuiStubDTO.getExperimentId() {
-        return this.experimentId;
-    }
-    
-    public void ExperimentGuiStubDTO.setExperimentId(Long experimentId) {
-        this.experimentId = experimentId;
-    }
-    
-    public Long ExperimentGuiStubDTO.getProtocolId() {
-        return this.protocolId;
-    }
-    
-    public void ExperimentGuiStubDTO.setProtocolId(Long protocolId) {
-        this.protocolId = protocolId;
-    }
-    
-    public String ExperimentGuiStubDTO.getProtocolName() {
-        return this.protocolName;
-    }
-    
-    public void ExperimentGuiStubDTO.setProtocolName(String protocolName) {
-        this.protocolName = protocolName;
-    }
-    
-    public String ExperimentGuiStubDTO.getCode() {
-        return this.code;
-    }
-    
-    public void ExperimentGuiStubDTO.setCode(String code) {
-        this.code = code;
-    }
-    
-    public String ExperimentGuiStubDTO.getName() {
-        return this.name;
-    }
-    
-    public void ExperimentGuiStubDTO.setName(String name) {
-        this.name = name;
-    }
-    
-    public String ExperimentGuiStubDTO.getLsType() {
-        return this.lsType;
-    }
-    
-    public void ExperimentGuiStubDTO.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String ExperimentGuiStubDTO.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void ExperimentGuiStubDTO.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String ExperimentGuiStubDTO.getScientist() {
-        return this.scientist;
-    }
-    
-    public void ExperimentGuiStubDTO.setScientist(String scientist) {
-        this.scientist = scientist;
-    }
-    
-    public Date ExperimentGuiStubDTO.getCompletionDate() {
-        return this.completionDate;
-    }
-    
-    public void ExperimentGuiStubDTO.setCompletionDate(Date completionDate) {
-        this.completionDate = completionDate;
-    }
-    
-    public String ExperimentGuiStubDTO.getNotebook() {
-        return this.notebook;
-    }
-    
-    public void ExperimentGuiStubDTO.setNotebook(String notebook) {
-        this.notebook = notebook;
-    }
-    
-    public String ExperimentGuiStubDTO.getNotebookPage() {
-        return this.notebookPage;
-    }
-    
-    public void ExperimentGuiStubDTO.setNotebookPage(String notebookPage) {
-        this.notebookPage = notebookPage;
-    }
-    
-    public String ExperimentGuiStubDTO.getStatus() {
-        return this.status;
-    }
-    
-    public void ExperimentGuiStubDTO.setStatus(String status) {
-        this.status = status;
-    }
-    
-    public String ExperimentGuiStubDTO.getAnalysisStatus() {
-        return this.analysisStatus;
-    }
-    
-    public void ExperimentGuiStubDTO.setAnalysisStatus(String analysisStatus) {
-        this.analysisStatus = analysisStatus;
-    }
-    
-    public String ExperimentGuiStubDTO.getShortDescription() {
-        return this.shortDescription;
-    }
-    
-    public void ExperimentGuiStubDTO.setShortDescription(String shortDescription) {
-        this.shortDescription = shortDescription;
-    }
-    
-    public String ExperimentGuiStubDTO.getLongDescription() {
-        return this.longDescription;
-    }
-    
-    public void ExperimentGuiStubDTO.setLongDescription(String longDescription) {
-        this.longDescription = longDescription;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentGuiStubDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ExperimentGuiStubDTO_Roo_Json.aj
deleted file mode 100755
index 40cfffde3..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentGuiStubDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ExperimentGuiStubDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ExperimentGuiStubDTO_Roo_Json {
-    
-    public String ExperimentGuiStubDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ExperimentGuiStubDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ExperimentGuiStubDTO ExperimentGuiStubDTO.fromJsonToExperimentGuiStubDTO(String json) {
-        return new JSONDeserializer<ExperimentGuiStubDTO>()
-        .use(null, ExperimentGuiStubDTO.class).deserialize(json);
-    }
-    
-    public static String ExperimentGuiStubDTO.toJsonArray(Collection<ExperimentGuiStubDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ExperimentGuiStubDTO.toJsonArray(Collection<ExperimentGuiStubDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ExperimentGuiStubDTO> ExperimentGuiStubDTO.fromJsonArrayToExperimentGuiStubDTO(String json) {
-        return new JSONDeserializer<List<ExperimentGuiStubDTO>>()
-        .use("values", ExperimentGuiStubDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentGuiStubDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ExperimentGuiStubDTO_Roo_ToString.aj
deleted file mode 100755
index e74b1f572..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentGuiStubDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ExperimentGuiStubDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ExperimentGuiStubDTO_Roo_ToString {
-    
-    public String ExperimentGuiStubDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentSearchRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentSearchRequestDTO.java
index 83d642650..6f7b1fd7c 100755
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentSearchRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentSearchRequestDTO.java
@@ -5,7 +5,8 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -56,6 +57,58 @@ public static String toJsonArray(Collection<ExperimentSearchRequestDTO> collecti
 	public static Collection<ExperimentSearchRequestDTO> fromJsonArrayToExperimentSearchRequestDTO(String json) {
         return new JSONDeserializer<List<ExperimentSearchRequestDTO>>().use(null, ArrayList.class).use("values", ExperimentSearchRequestDTO.class).deserialize(json);
     }
+
+	public String getAdvancedFilter() {
+        return this.advancedFilter;
+    }
+
+	public void setAdvancedFilter(String advancedFilter) {
+        this.advancedFilter = advancedFilter;
+    }
+
+	public String getAdvancedFilterSQL() {
+        return this.advancedFilterSQL;
+    }
+
+	public void setAdvancedFilterSQL(String advancedFilterSQL) {
+        this.advancedFilterSQL = advancedFilterSQL;
+    }
+
+	public String getBooleanFilter() {
+        return this.booleanFilter;
+    }
+
+	public void setBooleanFilter(String booleanFilter) {
+        this.booleanFilter = booleanFilter;
+    }
+
+	public Set<ExperimentFilterSearchDTO> getSearchFilters() {
+        return this.searchFilters;
+    }
+
+	public void setSearchFilters(Set<ExperimentFilterSearchDTO> searchFilters) {
+        this.searchFilters = searchFilters;
+    }
+
+	public Set<String> getBatchCodeList() {
+        return this.batchCodeList;
+    }
+
+	public void setBatchCodeList(Set<String> batchCodeList) {
+        this.batchCodeList = batchCodeList;
+    }
+
+	public Set<String> getExperimentCodeList() {
+        return this.experimentCodeList;
+    }
+
+	public void setExperimentCodeList(Set<String> experimentCodeList) {
+        this.experimentCodeList = experimentCodeList;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 	
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentSearchRequestDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ExperimentSearchRequestDTO_Roo_JavaBean.aj
deleted file mode 100755
index 0716541e3..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentSearchRequestDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,60 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ExperimentFilterSearchDTO;
-import com.labsynch.labseer.dto.ExperimentSearchRequestDTO;
-import java.util.Set;
-
-privileged aspect ExperimentSearchRequestDTO_Roo_JavaBean {
-    
-    public String ExperimentSearchRequestDTO.getAdvancedFilter() {
-        return this.advancedFilter;
-    }
-    
-    public void ExperimentSearchRequestDTO.setAdvancedFilter(String advancedFilter) {
-        this.advancedFilter = advancedFilter;
-    }
-    
-    public String ExperimentSearchRequestDTO.getAdvancedFilterSQL() {
-        return this.advancedFilterSQL;
-    }
-    
-    public void ExperimentSearchRequestDTO.setAdvancedFilterSQL(String advancedFilterSQL) {
-        this.advancedFilterSQL = advancedFilterSQL;
-    }
-    
-    public String ExperimentSearchRequestDTO.getBooleanFilter() {
-        return this.booleanFilter;
-    }
-    
-    public void ExperimentSearchRequestDTO.setBooleanFilter(String booleanFilter) {
-        this.booleanFilter = booleanFilter;
-    }
-    
-    public Set<ExperimentFilterSearchDTO> ExperimentSearchRequestDTO.getSearchFilters() {
-        return this.searchFilters;
-    }
-    
-    public void ExperimentSearchRequestDTO.setSearchFilters(Set<ExperimentFilterSearchDTO> searchFilters) {
-        this.searchFilters = searchFilters;
-    }
-    
-    public Set<String> ExperimentSearchRequestDTO.getBatchCodeList() {
-        return this.batchCodeList;
-    }
-    
-    public void ExperimentSearchRequestDTO.setBatchCodeList(Set<String> batchCodeList) {
-        this.batchCodeList = batchCodeList;
-    }
-    
-    public Set<String> ExperimentSearchRequestDTO.getExperimentCodeList() {
-        return this.experimentCodeList;
-    }
-    
-    public void ExperimentSearchRequestDTO.setExperimentCodeList(Set<String> experimentCodeList) {
-        this.experimentCodeList = experimentCodeList;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentSearchRequestDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ExperimentSearchRequestDTO_Roo_ToString.aj
deleted file mode 100755
index 5ea1fc293..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentSearchRequestDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ExperimentSearchRequestDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ExperimentSearchRequestDTO_Roo_ToString {
-    
-    public String ExperimentSearchRequestDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentStatePathDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentStatePathDTO.java
index 3cdcd888f..a67e6d4e4 100644
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentStatePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentStatePathDTO.java
@@ -1,14 +1,16 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.ExperimentState;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -34,6 +36,52 @@ public String toJson() {
 	public static String toJsonArray(Collection<ExperimentStatePathDTO> collection) {
         return new JSONSerializer().include("states.lsValues").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
     }
+
+	public String getIdOrCodeName() {
+        return this.idOrCodeName;
+    }
+
+	public void setIdOrCodeName(String idOrCodeName) {
+        this.idOrCodeName = idOrCodeName;
+    }
+
+	public String getStateType() {
+        return this.stateType;
+    }
+
+	public void setStateType(String stateType) {
+        this.stateType = stateType;
+    }
+
+	public String getStateKind() {
+        return this.stateKind;
+    }
+
+	public void setStateKind(String stateKind) {
+        this.stateKind = stateKind;
+    }
+
+	public Collection<ExperimentState> getStates() {
+        return this.states;
+    }
+
+	public void setStates(Collection<ExperimentState> states) {
+        this.states = states;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static ExperimentStatePathDTO fromJsonToExperimentStatePathDTO(String json) {
+        return new JSONDeserializer<ExperimentStatePathDTO>()
+        .use(null, ExperimentStatePathDTO.class).deserialize(json);
+    }
+
+	public static Collection<ExperimentStatePathDTO> fromJsonArrayToExperimentStatePathDTO(String json) {
+        return new JSONDeserializer<List<ExperimentStatePathDTO>>()
+        .use("values", ExperimentStatePathDTO.class).deserialize(json);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentStatePathDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ExperimentStatePathDTO_Roo_JavaBean.aj
deleted file mode 100644
index 34c81dd30..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentStatePathDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,44 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.ExperimentState;
-import com.labsynch.labseer.dto.ExperimentStatePathDTO;
-import java.util.Collection;
-
-privileged aspect ExperimentStatePathDTO_Roo_JavaBean {
-    
-    public String ExperimentStatePathDTO.getIdOrCodeName() {
-        return this.idOrCodeName;
-    }
-    
-    public void ExperimentStatePathDTO.setIdOrCodeName(String idOrCodeName) {
-        this.idOrCodeName = idOrCodeName;
-    }
-    
-    public String ExperimentStatePathDTO.getStateType() {
-        return this.stateType;
-    }
-    
-    public void ExperimentStatePathDTO.setStateType(String stateType) {
-        this.stateType = stateType;
-    }
-    
-    public String ExperimentStatePathDTO.getStateKind() {
-        return this.stateKind;
-    }
-    
-    public void ExperimentStatePathDTO.setStateKind(String stateKind) {
-        this.stateKind = stateKind;
-    }
-    
-    public Collection<ExperimentState> ExperimentStatePathDTO.getStates() {
-        return this.states;
-    }
-    
-    public void ExperimentStatePathDTO.setStates(Collection<ExperimentState> states) {
-        this.states = states;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentStatePathDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ExperimentStatePathDTO_Roo_Json.aj
deleted file mode 100644
index 53a0d861b..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentStatePathDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ExperimentStatePathDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ExperimentStatePathDTO_Roo_Json {
-    
-    public static ExperimentStatePathDTO ExperimentStatePathDTO.fromJsonToExperimentStatePathDTO(String json) {
-        return new JSONDeserializer<ExperimentStatePathDTO>()
-        .use(null, ExperimentStatePathDTO.class).deserialize(json);
-    }
-    
-    public static Collection<ExperimentStatePathDTO> ExperimentStatePathDTO.fromJsonArrayToExperimentStatePathDTO(String json) {
-        return new JSONDeserializer<List<ExperimentStatePathDTO>>()
-        .use("values", ExperimentStatePathDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentStatePathDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ExperimentStatePathDTO_Roo_ToString.aj
deleted file mode 100644
index 7d3178606..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentStatePathDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ExperimentStatePathDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ExperimentStatePathDTO_Roo_ToString {
-    
-    public String ExperimentStatePathDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentValuePathDTO.java
index 05ceb87ba..de6917285 100644
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentValuePathDTO.java
@@ -1,14 +1,16 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.ExperimentValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -38,6 +40,68 @@ public String toJson() {
 	public static String toJsonArray(Collection<ExperimentValuePathDTO> collection) {
         return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
     }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static ExperimentValuePathDTO fromJsonToExperimentValuePathDTO(String json) {
+        return new JSONDeserializer<ExperimentValuePathDTO>()
+        .use(null, ExperimentValuePathDTO.class).deserialize(json);
+    }
+
+	public static Collection<ExperimentValuePathDTO> fromJsonArrayToExperimentValuePathDTO(String json) {
+        return new JSONDeserializer<List<ExperimentValuePathDTO>>()
+        .use("values", ExperimentValuePathDTO.class).deserialize(json);
+    }
+
+	public String getIdOrCodeName() {
+        return this.idOrCodeName;
+    }
+
+	public void setIdOrCodeName(String idOrCodeName) {
+        this.idOrCodeName = idOrCodeName;
+    }
+
+	public String getStateType() {
+        return this.stateType;
+    }
+
+	public void setStateType(String stateType) {
+        this.stateType = stateType;
+    }
+
+	public String getStateKind() {
+        return this.stateKind;
+    }
+
+	public void setStateKind(String stateKind) {
+        this.stateKind = stateKind;
+    }
+
+	public String getValueType() {
+        return this.valueType;
+    }
+
+	public void setValueType(String valueType) {
+        this.valueType = valueType;
+    }
+
+	public String getValueKind() {
+        return this.valueKind;
+    }
+
+	public void setValueKind(String valueKind) {
+        this.valueKind = valueKind;
+    }
+
+	public Collection<ExperimentValue> getValues() {
+        return this.values;
+    }
+
+	public void setValues(Collection<ExperimentValue> values) {
+        this.values = values;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentValuePathDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ExperimentValuePathDTO_Roo_JavaBean.aj
deleted file mode 100644
index da955c9b6..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentValuePathDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,60 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.ExperimentValue;
-import com.labsynch.labseer.dto.ExperimentValuePathDTO;
-import java.util.Collection;
-
-privileged aspect ExperimentValuePathDTO_Roo_JavaBean {
-    
-    public String ExperimentValuePathDTO.getIdOrCodeName() {
-        return this.idOrCodeName;
-    }
-    
-    public void ExperimentValuePathDTO.setIdOrCodeName(String idOrCodeName) {
-        this.idOrCodeName = idOrCodeName;
-    }
-    
-    public String ExperimentValuePathDTO.getStateType() {
-        return this.stateType;
-    }
-    
-    public void ExperimentValuePathDTO.setStateType(String stateType) {
-        this.stateType = stateType;
-    }
-    
-    public String ExperimentValuePathDTO.getStateKind() {
-        return this.stateKind;
-    }
-    
-    public void ExperimentValuePathDTO.setStateKind(String stateKind) {
-        this.stateKind = stateKind;
-    }
-    
-    public String ExperimentValuePathDTO.getValueType() {
-        return this.valueType;
-    }
-    
-    public void ExperimentValuePathDTO.setValueType(String valueType) {
-        this.valueType = valueType;
-    }
-    
-    public String ExperimentValuePathDTO.getValueKind() {
-        return this.valueKind;
-    }
-    
-    public void ExperimentValuePathDTO.setValueKind(String valueKind) {
-        this.valueKind = valueKind;
-    }
-    
-    public Collection<ExperimentValue> ExperimentValuePathDTO.getValues() {
-        return this.values;
-    }
-    
-    public void ExperimentValuePathDTO.setValues(Collection<ExperimentValue> values) {
-        this.values = values;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentValuePathDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ExperimentValuePathDTO_Roo_Json.aj
deleted file mode 100644
index ac152f5da..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentValuePathDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ExperimentValuePathDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ExperimentValuePathDTO_Roo_Json {
-    
-    public static ExperimentValuePathDTO ExperimentValuePathDTO.fromJsonToExperimentValuePathDTO(String json) {
-        return new JSONDeserializer<ExperimentValuePathDTO>()
-        .use(null, ExperimentValuePathDTO.class).deserialize(json);
-    }
-    
-    public static Collection<ExperimentValuePathDTO> ExperimentValuePathDTO.fromJsonArrayToExperimentValuePathDTO(String json) {
-        return new JSONDeserializer<List<ExperimentValuePathDTO>>()
-        .use("values", ExperimentValuePathDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentValuePathDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ExperimentValuePathDTO_Roo_ToString.aj
deleted file mode 100644
index ae2f278f5..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentValuePathDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ExperimentValuePathDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ExperimentValuePathDTO_Roo_ToString {
-    
-    public String ExperimentValuePathDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExportResultDTO.java b/src/main/java/com/labsynch/labseer/dto/ExportResultDTO.java
index 29133ab5d..c7c576bb2 100644
--- a/src/main/java/com/labsynch/labseer/dto/ExportResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExportResultDTO.java
@@ -1,12 +1,16 @@
 package com.labsynch.labseer.dto;
 
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 
 @RooJavaBean
 @RooToString
@@ -34,4 +38,60 @@ public String toJson() {
         return new JSONSerializer().exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
     }
     
+
+	public static ExportResultDTO fromJsonToExportResultDTO(String json) {
+        return new JSONDeserializer<ExportResultDTO>()
+        .use(null, ExportResultDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ExportResultDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ExportResultDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ExportResultDTO> fromJsonArrayToExpoes(String json) {
+        return new JSONDeserializer<List<ExportResultDTO>>()
+        .use("values", ExportResultDTO.class).deserialize(json);
+    }
+
+	public String getSummary() {
+        return this.summary;
+    }
+
+	public void setSummary(String summary) {
+        this.summary = summary;
+    }
+
+	public String getLevel() {
+        return this.level;
+    }
+
+	public void setLevel(String level) {
+        this.level = level;
+    }
+
+	public String getMessage() {
+        return this.message;
+    }
+
+	public void setMessage(String message) {
+        this.message = message;
+    }
+
+	public String getReportFilePath() {
+        return this.reportFilePath;
+    }
+
+	public void setReportFilePath(String reportFilePath) {
+        this.reportFilePath = reportFilePath;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ExportResultDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ExportResultDTO_Roo_JavaBean.aj
deleted file mode 100644
index b16b3796c..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExportResultDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,42 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ExportResultDTO;
-
-privileged aspect ExportResultDTO_Roo_JavaBean {
-    
-    public String ExportResultDTO.getSummary() {
-        return this.summary;
-    }
-    
-    public void ExportResultDTO.setSummary(String summary) {
-        this.summary = summary;
-    }
-    
-    public String ExportResultDTO.getLevel() {
-        return this.level;
-    }
-    
-    public void ExportResultDTO.setLevel(String level) {
-        this.level = level;
-    }
-    
-    public String ExportResultDTO.getMessage() {
-        return this.message;
-    }
-    
-    public void ExportResultDTO.setMessage(String message) {
-        this.message = message;
-    }
-    
-    public String ExportResultDTO.getReportFilePath() {
-        return this.reportFilePath;
-    }
-    
-    public void ExportResultDTO.setReportFilePath(String reportFilePath) {
-        this.reportFilePath = reportFilePath;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExportResultDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ExportResultDTO_Roo_Json.aj
deleted file mode 100644
index 89d762cae..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExportResultDTO_Roo_Json.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ExportResultDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ExportResultDTO_Roo_Json {
-    
-    public static ExportResultDTO ExportResultDTO.fromJsonToExportResultDTO(String json) {
-        return new JSONDeserializer<ExportResultDTO>()
-        .use(null, ExportResultDTO.class).deserialize(json);
-    }
-    
-    public static String ExportResultDTO.toJsonArray(Collection<ExportResultDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ExportResultDTO.toJsonArray(Collection<ExportResultDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ExportResultDTO> ExportResultDTO.fromJsonArrayToExpoes(String json) {
-        return new JSONDeserializer<List<ExportResultDTO>>()
-        .use("values", ExportResultDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ExportResultDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ExportResultDTO_Roo_ToString.aj
deleted file mode 100644
index 13ceebe23..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ExportResultDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ExportResultDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ExportResultDTO_Roo_ToString {
-    
-    public String ExportResultDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/FileSaveReturnArrayDTO.java b/src/main/java/com/labsynch/labseer/dto/FileSaveReturnArrayDTO.java
index a524ccab9..7ec62ea6e 100755
--- a/src/main/java/com/labsynch/labseer/dto/FileSaveReturnArrayDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/FileSaveReturnArrayDTO.java
@@ -3,7 +3,8 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -39,4 +40,16 @@ public static String toJsonArray(Collection<FileSaveReturnArrayDTO> collection)
 	public static Collection<FileSaveReturnArrayDTO> fromJsonArrayToFileSaveReturnArrayDTO(String json) {
         return new JSONDeserializer<List<FileSaveReturnArrayDTO>>().use(null, ArrayList.class).use("values", FileSaveReturnArrayDTO.class).deserialize(json);
     }
+
+	public List<FileSaveReturnDTO> getReturnFileList() {
+        return this.returnFileList;
+    }
+
+	public void setReturnFileList(List<FileSaveReturnDTO> returnFileList) {
+        this.returnFileList = returnFileList;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/FileSaveReturnArrayDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/FileSaveReturnArrayDTO_Roo_JavaBean.aj
deleted file mode 100644
index 088dc1d33..000000000
--- a/src/main/java/com/labsynch/labseer/dto/FileSaveReturnArrayDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,20 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.FileSaveReturnArrayDTO;
-import com.labsynch.labseer.dto.FileSaveReturnDTO;
-import java.util.List;
-
-privileged aspect FileSaveReturnArrayDTO_Roo_JavaBean {
-    
-    public List<FileSaveReturnDTO> FileSaveReturnArrayDTO.getReturnFileList() {
-        return this.returnFileList;
-    }
-    
-    public void FileSaveReturnArrayDTO.setReturnFileList(List<FileSaveReturnDTO> returnFileList) {
-        this.returnFileList = returnFileList;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/FileSaveReturnArrayDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/FileSaveReturnArrayDTO_Roo_ToString.aj
deleted file mode 100644
index 0af3fa5ad..000000000
--- a/src/main/java/com/labsynch/labseer/dto/FileSaveReturnArrayDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.FileSaveReturnArrayDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect FileSaveReturnArrayDTO_Roo_ToString {
-    
-    public String FileSaveReturnArrayDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/FileSaveReturnDTO.java b/src/main/java/com/labsynch/labseer/dto/FileSaveReturnDTO.java
index 1d209a131..32a05d95f 100755
--- a/src/main/java/com/labsynch/labseer/dto/FileSaveReturnDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/FileSaveReturnDTO.java
@@ -10,7 +10,8 @@
 import java.util.List;
 
 import javax.persistence.Transient;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.roo.addon.javabean.RooJavaBean;
@@ -116,4 +117,76 @@ public static String toJsonArray(Collection<FileSaveReturnDTO> collection) {
 	public static Collection<FileSaveReturnDTO> fromJsonArrayToFileSaveReturnDTO(String json) {
         return new JSONDeserializer<List<FileSaveReturnDTO>>().use(null, ArrayList.class).use("values", FileSaveReturnDTO.class).deserialize(json);
     }
+
+	public String getName() {
+        return this.name;
+    }
+
+	public void setName(String name) {
+        this.name = name;
+    }
+
+	public long getSize() {
+        return this.size;
+    }
+
+	public void setSize(long size) {
+        this.size = size;
+    }
+
+	public String getType() {
+        return this.type;
+    }
+
+	public void setType(String type) {
+        this.type = type;
+    }
+
+	public String getUrl() {
+        return this.url;
+    }
+
+	public void setUrl(String url) {
+        this.url = url;
+    }
+
+	public String getDescription() {
+        return this.description;
+    }
+
+	public void setDescription(String description) {
+        this.description = description;
+    }
+
+	public Boolean getUploaded() {
+        return this.uploaded;
+    }
+
+	public void setUploaded(Boolean uploaded) {
+        this.uploaded = uploaded;
+    }
+
+	public Boolean getIe() {
+        return this.ie;
+    }
+
+	public void setIe(Boolean ie) {
+        this.ie = ie;
+    }
+
+	public String getSubdir() {
+        return this.subdir;
+    }
+
+	public void setSubdir(String subdir) {
+        this.subdir = subdir;
+    }
+
+	public void setFile(MultipartFile file) {
+        this.file = file;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/FileSaveReturnDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/FileSaveReturnDTO_Roo_JavaBean.aj
deleted file mode 100644
index 72f6478f4..000000000
--- a/src/main/java/com/labsynch/labseer/dto/FileSaveReturnDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,79 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.FileSaveReturnDTO;
-import org.springframework.web.multipart.MultipartFile;
-
-privileged aspect FileSaveReturnDTO_Roo_JavaBean {
-    
-    public String FileSaveReturnDTO.getName() {
-        return this.name;
-    }
-    
-    public void FileSaveReturnDTO.setName(String name) {
-        this.name = name;
-    }
-    
-    public long FileSaveReturnDTO.getSize() {
-        return this.size;
-    }
-    
-    public void FileSaveReturnDTO.setSize(long size) {
-        this.size = size;
-    }
-    
-    public String FileSaveReturnDTO.getType() {
-        return this.type;
-    }
-    
-    public void FileSaveReturnDTO.setType(String type) {
-        this.type = type;
-    }
-    
-    public String FileSaveReturnDTO.getUrl() {
-        return this.url;
-    }
-    
-    public void FileSaveReturnDTO.setUrl(String url) {
-        this.url = url;
-    }
-    
-    public String FileSaveReturnDTO.getDescription() {
-        return this.description;
-    }
-    
-    public void FileSaveReturnDTO.setDescription(String description) {
-        this.description = description;
-    }
-    
-    public Boolean FileSaveReturnDTO.getUploaded() {
-        return this.uploaded;
-    }
-    
-    public void FileSaveReturnDTO.setUploaded(Boolean uploaded) {
-        this.uploaded = uploaded;
-    }
-    
-    public Boolean FileSaveReturnDTO.getIe() {
-        return this.ie;
-    }
-    
-    public void FileSaveReturnDTO.setIe(Boolean ie) {
-        this.ie = ie;
-    }
-    
-    public String FileSaveReturnDTO.getSubdir() {
-        return this.subdir;
-    }
-    
-    public void FileSaveReturnDTO.setSubdir(String subdir) {
-        this.subdir = subdir;
-    }
-    
-    public void FileSaveReturnDTO.setFile(MultipartFile file) {
-        this.file = file;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/FileSaveReturnDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/FileSaveReturnDTO_Roo_ToString.aj
deleted file mode 100644
index e9bfa3c0c..000000000
--- a/src/main/java/com/labsynch/labseer/dto/FileSaveReturnDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.FileSaveReturnDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect FileSaveReturnDTO_Roo_ToString {
-    
-    public String FileSaveReturnDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/FileSaveSendDTO.java b/src/main/java/com/labsynch/labseer/dto/FileSaveSendDTO.java
index fbacb8f57..ca5b0ca97 100755
--- a/src/main/java/com/labsynch/labseer/dto/FileSaveSendDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/FileSaveSendDTO.java
@@ -7,10 +7,12 @@
 import java.io.InputStream;
 import java.net.URLEncoder;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import javax.persistence.Transient;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.roo.addon.javabean.RooJavaBean;
@@ -19,6 +21,8 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import com.labsynch.labseer.utils.PropertiesUtilService;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 
@@ -139,4 +143,74 @@ public List<FileSaveReturnDTO> saveFile() {
 	}
 	
 
-	}
+	
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static FileSaveSendDTO fromJsonToFileSaveSendDTO(String json) {
+        return new JSONDeserializer<FileSaveSendDTO>()
+        .use(null, FileSaveSendDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<FileSaveSendDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<FileSaveSendDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<FileSaveSendDTO> fromJsonArrayToFileSaveSendDTO(String json) {
+        return new JSONDeserializer<List<FileSaveSendDTO>>()
+        .use("values", FileSaveSendDTO.class).deserialize(json);
+    }
+
+	public Boolean getIe() {
+        return this.ie;
+    }
+
+	public void setIe(Boolean ie) {
+        this.ie = ie;
+    }
+
+	public String getSubdir() {
+        return this.subdir;
+    }
+
+	public void setSubdir(String subdir) {
+        this.subdir = subdir;
+    }
+
+	public List<String> getDescription() {
+        return this.description;
+    }
+
+	public void setDescription(List<String> description) {
+        this.description = description;
+    }
+
+	public void setFile(List<MultipartFile> file) {
+        this.file = file;
+    }
+
+	public PropertiesUtilService getPropertiesUtilService() {
+        return this.propertiesUtilService;
+    }
+
+	public void setPropertiesUtilService(PropertiesUtilService propertiesUtilService) {
+        this.propertiesUtilService = propertiesUtilService;
+    }
+}
diff --git a/src/main/java/com/labsynch/labseer/dto/FileSaveSendDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/FileSaveSendDTO_Roo_JavaBean.aj
deleted file mode 100644
index d71ee5075..000000000
--- a/src/main/java/com/labsynch/labseer/dto/FileSaveSendDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,49 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.FileSaveSendDTO;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import java.util.List;
-import org.springframework.web.multipart.MultipartFile;
-
-privileged aspect FileSaveSendDTO_Roo_JavaBean {
-    
-    public Boolean FileSaveSendDTO.getIe() {
-        return this.ie;
-    }
-    
-    public void FileSaveSendDTO.setIe(Boolean ie) {
-        this.ie = ie;
-    }
-    
-    public String FileSaveSendDTO.getSubdir() {
-        return this.subdir;
-    }
-    
-    public void FileSaveSendDTO.setSubdir(String subdir) {
-        this.subdir = subdir;
-    }
-    
-    public List<String> FileSaveSendDTO.getDescription() {
-        return this.description;
-    }
-    
-    public void FileSaveSendDTO.setDescription(List<String> description) {
-        this.description = description;
-    }
-    
-    public void FileSaveSendDTO.setFile(List<MultipartFile> file) {
-        this.file = file;
-    }
-    
-    public PropertiesUtilService FileSaveSendDTO.getPropertiesUtilService() {
-        return this.propertiesUtilService;
-    }
-    
-    public void FileSaveSendDTO.setPropertiesUtilService(PropertiesUtilService propertiesUtilService) {
-        this.propertiesUtilService = propertiesUtilService;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/FileSaveSendDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/FileSaveSendDTO_Roo_Json.aj
deleted file mode 100644
index 12f7081f4..000000000
--- a/src/main/java/com/labsynch/labseer/dto/FileSaveSendDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.FileSaveSendDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect FileSaveSendDTO_Roo_Json {
-    
-    public String FileSaveSendDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String FileSaveSendDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static FileSaveSendDTO FileSaveSendDTO.fromJsonToFileSaveSendDTO(String json) {
-        return new JSONDeserializer<FileSaveSendDTO>()
-        .use(null, FileSaveSendDTO.class).deserialize(json);
-    }
-    
-    public static String FileSaveSendDTO.toJsonArray(Collection<FileSaveSendDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String FileSaveSendDTO.toJsonArray(Collection<FileSaveSendDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<FileSaveSendDTO> FileSaveSendDTO.fromJsonArrayToFileSaveSendDTO(String json) {
-        return new JSONDeserializer<List<FileSaveSendDTO>>()
-        .use("values", FileSaveSendDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/FileSaveSendDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/FileSaveSendDTO_Roo_ToString.aj
deleted file mode 100644
index 3d98fd0c3..000000000
--- a/src/main/java/com/labsynch/labseer/dto/FileSaveSendDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.FileSaveSendDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect FileSaveSendDTO_Roo_ToString {
-    
-    public String FileSaveSendDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/FlagWellDTO.java b/src/main/java/com/labsynch/labseer/dto/FlagWellDTO.java
index 2cf197d90..53cb7766a 100644
--- a/src/main/java/com/labsynch/labseer/dto/FlagWellDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/FlagWellDTO.java
@@ -11,7 +11,8 @@
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import javax.persistence.NoResultException;
@@ -29,6 +30,8 @@
 import com.labsynch.labseer.domain.TreatmentGroupState;
 import com.labsynch.labseer.domain.TreatmentGroupValue;
 import com.labsynch.labseer.utils.StatCalc;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
 @RooJavaBean
 @RooToString
@@ -506,4 +509,158 @@ private static SubjectState createWellFlagState(Long subjectId, String stateType
 	}
 
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public Long getResponseSubjectValueId() {
+        return this.responseSubjectValueId;
+    }
+
+	public void setResponseSubjectValueId(Long responseSubjectValueId) {
+        this.responseSubjectValueId = responseSubjectValueId;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public Long getLsTransaction() {
+        return this.lsTransaction;
+    }
+
+	public void setLsTransaction(Long lsTransaction) {
+        this.lsTransaction = lsTransaction;
+    }
+
+	public String getAlgorithmFlagStatus() {
+        return this.algorithmFlagStatus;
+    }
+
+	public void setAlgorithmFlagStatus(String algorithmFlagStatus) {
+        this.algorithmFlagStatus = algorithmFlagStatus;
+    }
+
+	public String getAlgorithmFlagObservation() {
+        return this.algorithmFlagObservation;
+    }
+
+	public void setAlgorithmFlagObservation(String algorithmFlagObservation) {
+        this.algorithmFlagObservation = algorithmFlagObservation;
+    }
+
+	public String getAlgorithmFlagCause() {
+        return this.algorithmFlagCause;
+    }
+
+	public void setAlgorithmFlagCause(String algorithmFlagCause) {
+        this.algorithmFlagCause = algorithmFlagCause;
+    }
+
+	public String getAlgorithmFlagComment() {
+        return this.algorithmFlagComment;
+    }
+
+	public void setAlgorithmFlagComment(String algorithmFlagComment) {
+        this.algorithmFlagComment = algorithmFlagComment;
+    }
+
+	public String getPreprocessFlagStatus() {
+        return this.preprocessFlagStatus;
+    }
+
+	public void setPreprocessFlagStatus(String preprocessFlagStatus) {
+        this.preprocessFlagStatus = preprocessFlagStatus;
+    }
+
+	public String getPreprocessFlagObservation() {
+        return this.preprocessFlagObservation;
+    }
+
+	public void setPreprocessFlagObservation(String preprocessFlagObservation) {
+        this.preprocessFlagObservation = preprocessFlagObservation;
+    }
+
+	public String getPreprocessFlagCause() {
+        return this.preprocessFlagCause;
+    }
+
+	public void setPreprocessFlagCause(String preprocessFlagCause) {
+        this.preprocessFlagCause = preprocessFlagCause;
+    }
+
+	public String getPreprocessFlagComment() {
+        return this.preprocessFlagComment;
+    }
+
+	public void setPreprocessFlagComment(String preprocessFlagComment) {
+        this.preprocessFlagComment = preprocessFlagComment;
+    }
+
+	public String getUserFlagStatus() {
+        return this.userFlagStatus;
+    }
+
+	public void setUserFlagStatus(String userFlagStatus) {
+        this.userFlagStatus = userFlagStatus;
+    }
+
+	public String getUserFlagObservation() {
+        return this.userFlagObservation;
+    }
+
+	public void setUserFlagObservation(String userFlagObservation) {
+        this.userFlagObservation = userFlagObservation;
+    }
+
+	public String getUserFlagCause() {
+        return this.userFlagCause;
+    }
+
+	public void setUserFlagCause(String userFlagCause) {
+        this.userFlagCause = userFlagCause;
+    }
+
+	public String getUserFlagComment() {
+        return this.userFlagComment;
+    }
+
+	public void setUserFlagComment(String userFlagComment) {
+        this.userFlagComment = userFlagComment;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static FlagWellDTO fromJsonToFlagWellDTO(String json) {
+        return new JSONDeserializer<FlagWellDTO>()
+        .use(null, FlagWellDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<FlagWellDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<FlagWellDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<FlagWellDTO> fromJsonArrayToFlagWellDTO(String json) {
+        return new JSONDeserializer<List<FlagWellDTO>>()
+        .use("values", FlagWellDTO.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/FlagWellDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/FlagWellDTO_Roo_JavaBean.aj
deleted file mode 100644
index 1be7f4177..000000000
--- a/src/main/java/com/labsynch/labseer/dto/FlagWellDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,130 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.FlagWellDTO;
-
-privileged aspect FlagWellDTO_Roo_JavaBean {
-    
-    public Long FlagWellDTO.getResponseSubjectValueId() {
-        return this.responseSubjectValueId;
-    }
-    
-    public void FlagWellDTO.setResponseSubjectValueId(Long responseSubjectValueId) {
-        this.responseSubjectValueId = responseSubjectValueId;
-    }
-    
-    public String FlagWellDTO.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void FlagWellDTO.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public Long FlagWellDTO.getLsTransaction() {
-        return this.lsTransaction;
-    }
-    
-    public void FlagWellDTO.setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
-    
-    public String FlagWellDTO.getAlgorithmFlagStatus() {
-        return this.algorithmFlagStatus;
-    }
-    
-    public void FlagWellDTO.setAlgorithmFlagStatus(String algorithmFlagStatus) {
-        this.algorithmFlagStatus = algorithmFlagStatus;
-    }
-    
-    public String FlagWellDTO.getAlgorithmFlagObservation() {
-        return this.algorithmFlagObservation;
-    }
-    
-    public void FlagWellDTO.setAlgorithmFlagObservation(String algorithmFlagObservation) {
-        this.algorithmFlagObservation = algorithmFlagObservation;
-    }
-    
-    public String FlagWellDTO.getAlgorithmFlagCause() {
-        return this.algorithmFlagCause;
-    }
-    
-    public void FlagWellDTO.setAlgorithmFlagCause(String algorithmFlagCause) {
-        this.algorithmFlagCause = algorithmFlagCause;
-    }
-    
-    public String FlagWellDTO.getAlgorithmFlagComment() {
-        return this.algorithmFlagComment;
-    }
-    
-    public void FlagWellDTO.setAlgorithmFlagComment(String algorithmFlagComment) {
-        this.algorithmFlagComment = algorithmFlagComment;
-    }
-    
-    public String FlagWellDTO.getPreprocessFlagStatus() {
-        return this.preprocessFlagStatus;
-    }
-    
-    public void FlagWellDTO.setPreprocessFlagStatus(String preprocessFlagStatus) {
-        this.preprocessFlagStatus = preprocessFlagStatus;
-    }
-    
-    public String FlagWellDTO.getPreprocessFlagObservation() {
-        return this.preprocessFlagObservation;
-    }
-    
-    public void FlagWellDTO.setPreprocessFlagObservation(String preprocessFlagObservation) {
-        this.preprocessFlagObservation = preprocessFlagObservation;
-    }
-    
-    public String FlagWellDTO.getPreprocessFlagCause() {
-        return this.preprocessFlagCause;
-    }
-    
-    public void FlagWellDTO.setPreprocessFlagCause(String preprocessFlagCause) {
-        this.preprocessFlagCause = preprocessFlagCause;
-    }
-    
-    public String FlagWellDTO.getPreprocessFlagComment() {
-        return this.preprocessFlagComment;
-    }
-    
-    public void FlagWellDTO.setPreprocessFlagComment(String preprocessFlagComment) {
-        this.preprocessFlagComment = preprocessFlagComment;
-    }
-    
-    public String FlagWellDTO.getUserFlagStatus() {
-        return this.userFlagStatus;
-    }
-    
-    public void FlagWellDTO.setUserFlagStatus(String userFlagStatus) {
-        this.userFlagStatus = userFlagStatus;
-    }
-    
-    public String FlagWellDTO.getUserFlagObservation() {
-        return this.userFlagObservation;
-    }
-    
-    public void FlagWellDTO.setUserFlagObservation(String userFlagObservation) {
-        this.userFlagObservation = userFlagObservation;
-    }
-    
-    public String FlagWellDTO.getUserFlagCause() {
-        return this.userFlagCause;
-    }
-    
-    public void FlagWellDTO.setUserFlagCause(String userFlagCause) {
-        this.userFlagCause = userFlagCause;
-    }
-    
-    public String FlagWellDTO.getUserFlagComment() {
-        return this.userFlagComment;
-    }
-    
-    public void FlagWellDTO.setUserFlagComment(String userFlagComment) {
-        this.userFlagComment = userFlagComment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/FlagWellDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/FlagWellDTO_Roo_Json.aj
deleted file mode 100644
index 6268fd96f..000000000
--- a/src/main/java/com/labsynch/labseer/dto/FlagWellDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.FlagWellDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect FlagWellDTO_Roo_Json {
-    
-    public String FlagWellDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String FlagWellDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static FlagWellDTO FlagWellDTO.fromJsonToFlagWellDTO(String json) {
-        return new JSONDeserializer<FlagWellDTO>()
-        .use(null, FlagWellDTO.class).deserialize(json);
-    }
-    
-    public static String FlagWellDTO.toJsonArray(Collection<FlagWellDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String FlagWellDTO.toJsonArray(Collection<FlagWellDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<FlagWellDTO> FlagWellDTO.fromJsonArrayToFlagWellDTO(String json) {
-        return new JSONDeserializer<List<FlagWellDTO>>()
-        .use("values", FlagWellDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/FlagWellDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/FlagWellDTO_Roo_ToString.aj
deleted file mode 100644
index 1b9879d4b..000000000
--- a/src/main/java/com/labsynch/labseer/dto/FlagWellDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.FlagWellDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect FlagWellDTO_Roo_ToString {
-    
-    public String FlagWellDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/FlatThingCsvDTO.java b/src/main/java/com/labsynch/labseer/dto/FlatThingCsvDTO.java
index 90b5f9b53..2f4f9c1ef 100644
--- a/src/main/java/com/labsynch/labseer/dto/FlatThingCsvDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/FlatThingCsvDTO.java
@@ -1,11 +1,16 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.roo.addon.javabean.RooJavaBean;
@@ -314,6 +319,380 @@ public static CellProcessor[] getProcessors() {
 	}
 
 
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static FlatThingCsvDTO fromJsonToFlatThingCsvDTO(String json) {
+        return new JSONDeserializer<FlatThingCsvDTO>()
+        .use(null, FlatThingCsvDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<FlatThingCsvDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<FlatThingCsvDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<FlatThingCsvDTO> fromJsonArrayToFlatThingCsvDTO(String json) {
+        return new JSONDeserializer<List<FlatThingCsvDTO>>()
+        .use("values", FlatThingCsvDTO.class).deserialize(json);
+    }
+
+	public Long getParentId() {
+        return this.parentId;
+    }
+
+	public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+	public String getTempParentId() {
+        return this.tempParentId;
+    }
+
+	public void setTempParentId(String tempParentId) {
+        this.tempParentId = tempParentId;
+    }
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public String getTempId() {
+        return this.tempId;
+    }
+
+	public void setTempId(String tempId) {
+        this.tempId = tempId;
+    }
+
+	public String getCodeName() {
+        return this.codeName;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public Long getStateId() {
+        return this.stateId;
+    }
+
+	public void setStateId(Long stateId) {
+        this.stateId = stateId;
+    }
+
+	public String getTempStateId() {
+        return this.tempStateId;
+    }
+
+	public void setTempStateId(String tempStateId) {
+        this.tempStateId = tempStateId;
+    }
+
+	public String getStateType() {
+        return this.stateType;
+    }
+
+	public void setStateType(String stateType) {
+        this.stateType = stateType;
+    }
+
+	public String getStateKind() {
+        return this.stateKind;
+    }
+
+	public void setStateKind(String stateKind) {
+        this.stateKind = stateKind;
+    }
+
+	public Long getValueId() {
+        return this.valueId;
+    }
+
+	public void setValueId(Long valueId) {
+        this.valueId = valueId;
+    }
+
+	public String getTempValueId() {
+        return this.tempValueId;
+    }
+
+	public void setTempValueId(String tempValueId) {
+        this.tempValueId = tempValueId;
+    }
+
+	public String getValueType() {
+        return this.valueType;
+    }
+
+	public void setValueType(String valueType) {
+        this.valueType = valueType;
+    }
+
+	public String getValueKind() {
+        return this.valueKind;
+    }
+
+	public void setValueKind(String valueKind) {
+        this.valueKind = valueKind;
+    }
+
+	public String getCodeOrigin() {
+        return this.codeOrigin;
+    }
+
+	public void setCodeOrigin(String codeOrigin) {
+        this.codeOrigin = codeOrigin;
+    }
+
+	public String getCodeType() {
+        return this.codeType;
+    }
+
+	public void setCodeType(String codeType) {
+        this.codeType = codeType;
+    }
+
+	public String getCodeKind() {
+        return this.codeKind;
+    }
+
+	public void setCodeKind(String codeKind) {
+        this.codeKind = codeKind;
+    }
+
+	public String getCodeValue() {
+        return this.codeValue;
+    }
+
+	public void setCodeValue(String codeValue) {
+        this.codeValue = codeValue;
+    }
+
+	public String getStringValue() {
+        return this.stringValue;
+    }
+
+	public void setStringValue(String stringValue) {
+        this.stringValue = stringValue;
+    }
+
+	public String getFileValue() {
+        return this.fileValue;
+    }
+
+	public void setFileValue(String fileValue) {
+        this.fileValue = fileValue;
+    }
+
+	public String getUrlValue() {
+        return this.urlValue;
+    }
+
+	public void setUrlValue(String urlValue) {
+        this.urlValue = urlValue;
+    }
+
+	public Date getDateValue() {
+        return this.dateValue;
+    }
+
+	public void setDateValue(Date dateValue) {
+        this.dateValue = dateValue;
+    }
+
+	public String getClobValue() {
+        return this.clobValue;
+    }
+
+	public void setClobValue(String clobValue) {
+        this.clobValue = clobValue;
+    }
+
+	public String getOperatorType() {
+        return this.operatorType;
+    }
+
+	public void setOperatorType(String operatorType) {
+        this.operatorType = operatorType;
+    }
+
+	public String getOperatorKind() {
+        return this.operatorKind;
+    }
+
+	public void setOperatorKind(String operatorKind) {
+        this.operatorKind = operatorKind;
+    }
+
+	public BigDecimal getNumericValue() {
+        return this.numericValue;
+    }
+
+	public void setNumericValue(BigDecimal numericValue) {
+        this.numericValue = numericValue;
+    }
+
+	public Integer getSigFigs() {
+        return this.sigFigs;
+    }
+
+	public void setSigFigs(Integer sigFigs) {
+        this.sigFigs = sigFigs;
+    }
+
+	public BigDecimal getUncertainty() {
+        return this.uncertainty;
+    }
+
+	public void setUncertainty(BigDecimal uncertainty) {
+        this.uncertainty = uncertainty;
+    }
+
+	public Integer getNumberOfReplicates() {
+        return this.numberOfReplicates;
+    }
+
+	public void setNumberOfReplicates(Integer numberOfReplicates) {
+        this.numberOfReplicates = numberOfReplicates;
+    }
+
+	public String getUncertaintyType() {
+        return this.uncertaintyType;
+    }
+
+	public void setUncertaintyType(String uncertaintyType) {
+        this.uncertaintyType = uncertaintyType;
+    }
+
+	public String getUnitType() {
+        return this.unitType;
+    }
+
+	public void setUnitType(String unitType) {
+        this.unitType = unitType;
+    }
+
+	public String getUnitKind() {
+        return this.unitKind;
+    }
+
+	public void setUnitKind(String unitKind) {
+        this.unitKind = unitKind;
+    }
+
+	public Double getConcentration() {
+        return this.concentration;
+    }
+
+	public void setConcentration(Double concentration) {
+        this.concentration = concentration;
+    }
+
+	public String getConcUnit() {
+        return this.concUnit;
+    }
+
+	public void setConcUnit(String concUnit) {
+        this.concUnit = concUnit;
+    }
+
+	public String getComments() {
+        return this.comments;
+    }
+
+	public void setComments(String comments) {
+        this.comments = comments;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public Long getLsTransaction() {
+        return this.lsTransaction;
+    }
+
+	public void setLsTransaction(Long lsTransaction) {
+        this.lsTransaction = lsTransaction;
+    }
+
+	public Date getRecordedDate() {
+        return this.recordedDate;
+    }
+
+	public void setRecordedDate(Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public Date getModifiedDate() {
+        return this.modifiedDate;
+    }
+
+	public void setModifiedDate(Date modifiedDate) {
+        this.modifiedDate = modifiedDate;
+    }
+
+	public String getModifiedBy() {
+        return this.modifiedBy;
+    }
+
+	public void setModifiedBy(String modifiedBy) {
+        this.modifiedBy = modifiedBy;
+    }
+
+	public boolean isPublicData() {
+        return this.publicData;
+    }
+
+	public void setPublicData(boolean publicData) {
+        this.publicData = publicData;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/FlatThingCsvDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/FlatThingCsvDTO_Roo_JavaBean.aj
deleted file mode 100644
index 3c34e170e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/FlatThingCsvDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,352 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.FlatThingCsvDTO;
-import java.math.BigDecimal;
-import java.util.Date;
-
-privileged aspect FlatThingCsvDTO_Roo_JavaBean {
-    
-    public Long FlatThingCsvDTO.getParentId() {
-        return this.parentId;
-    }
-    
-    public void FlatThingCsvDTO.setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-    
-    public String FlatThingCsvDTO.getTempParentId() {
-        return this.tempParentId;
-    }
-    
-    public void FlatThingCsvDTO.setTempParentId(String tempParentId) {
-        this.tempParentId = tempParentId;
-    }
-    
-    public Long FlatThingCsvDTO.getId() {
-        return this.id;
-    }
-    
-    public void FlatThingCsvDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-    public String FlatThingCsvDTO.getTempId() {
-        return this.tempId;
-    }
-    
-    public void FlatThingCsvDTO.setTempId(String tempId) {
-        this.tempId = tempId;
-    }
-    
-    public String FlatThingCsvDTO.getCodeName() {
-        return this.codeName;
-    }
-    
-    public String FlatThingCsvDTO.getLsType() {
-        return this.lsType;
-    }
-    
-    public void FlatThingCsvDTO.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String FlatThingCsvDTO.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void FlatThingCsvDTO.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public Long FlatThingCsvDTO.getStateId() {
-        return this.stateId;
-    }
-    
-    public void FlatThingCsvDTO.setStateId(Long stateId) {
-        this.stateId = stateId;
-    }
-    
-    public String FlatThingCsvDTO.getTempStateId() {
-        return this.tempStateId;
-    }
-    
-    public void FlatThingCsvDTO.setTempStateId(String tempStateId) {
-        this.tempStateId = tempStateId;
-    }
-    
-    public String FlatThingCsvDTO.getStateType() {
-        return this.stateType;
-    }
-    
-    public void FlatThingCsvDTO.setStateType(String stateType) {
-        this.stateType = stateType;
-    }
-    
-    public String FlatThingCsvDTO.getStateKind() {
-        return this.stateKind;
-    }
-    
-    public void FlatThingCsvDTO.setStateKind(String stateKind) {
-        this.stateKind = stateKind;
-    }
-    
-    public Long FlatThingCsvDTO.getValueId() {
-        return this.valueId;
-    }
-    
-    public void FlatThingCsvDTO.setValueId(Long valueId) {
-        this.valueId = valueId;
-    }
-    
-    public String FlatThingCsvDTO.getTempValueId() {
-        return this.tempValueId;
-    }
-    
-    public void FlatThingCsvDTO.setTempValueId(String tempValueId) {
-        this.tempValueId = tempValueId;
-    }
-    
-    public String FlatThingCsvDTO.getValueType() {
-        return this.valueType;
-    }
-    
-    public void FlatThingCsvDTO.setValueType(String valueType) {
-        this.valueType = valueType;
-    }
-    
-    public String FlatThingCsvDTO.getValueKind() {
-        return this.valueKind;
-    }
-    
-    public void FlatThingCsvDTO.setValueKind(String valueKind) {
-        this.valueKind = valueKind;
-    }
-    
-    public String FlatThingCsvDTO.getCodeOrigin() {
-        return this.codeOrigin;
-    }
-    
-    public void FlatThingCsvDTO.setCodeOrigin(String codeOrigin) {
-        this.codeOrigin = codeOrigin;
-    }
-    
-    public String FlatThingCsvDTO.getCodeType() {
-        return this.codeType;
-    }
-    
-    public void FlatThingCsvDTO.setCodeType(String codeType) {
-        this.codeType = codeType;
-    }
-    
-    public String FlatThingCsvDTO.getCodeKind() {
-        return this.codeKind;
-    }
-    
-    public void FlatThingCsvDTO.setCodeKind(String codeKind) {
-        this.codeKind = codeKind;
-    }
-    
-    public String FlatThingCsvDTO.getCodeValue() {
-        return this.codeValue;
-    }
-    
-    public void FlatThingCsvDTO.setCodeValue(String codeValue) {
-        this.codeValue = codeValue;
-    }
-    
-    public String FlatThingCsvDTO.getStringValue() {
-        return this.stringValue;
-    }
-    
-    public void FlatThingCsvDTO.setStringValue(String stringValue) {
-        this.stringValue = stringValue;
-    }
-    
-    public String FlatThingCsvDTO.getFileValue() {
-        return this.fileValue;
-    }
-    
-    public void FlatThingCsvDTO.setFileValue(String fileValue) {
-        this.fileValue = fileValue;
-    }
-    
-    public String FlatThingCsvDTO.getUrlValue() {
-        return this.urlValue;
-    }
-    
-    public void FlatThingCsvDTO.setUrlValue(String urlValue) {
-        this.urlValue = urlValue;
-    }
-    
-    public Date FlatThingCsvDTO.getDateValue() {
-        return this.dateValue;
-    }
-    
-    public void FlatThingCsvDTO.setDateValue(Date dateValue) {
-        this.dateValue = dateValue;
-    }
-    
-    public String FlatThingCsvDTO.getClobValue() {
-        return this.clobValue;
-    }
-    
-    public void FlatThingCsvDTO.setClobValue(String clobValue) {
-        this.clobValue = clobValue;
-    }
-    
-    public String FlatThingCsvDTO.getOperatorType() {
-        return this.operatorType;
-    }
-    
-    public void FlatThingCsvDTO.setOperatorType(String operatorType) {
-        this.operatorType = operatorType;
-    }
-    
-    public String FlatThingCsvDTO.getOperatorKind() {
-        return this.operatorKind;
-    }
-    
-    public void FlatThingCsvDTO.setOperatorKind(String operatorKind) {
-        this.operatorKind = operatorKind;
-    }
-    
-    public BigDecimal FlatThingCsvDTO.getNumericValue() {
-        return this.numericValue;
-    }
-    
-    public void FlatThingCsvDTO.setNumericValue(BigDecimal numericValue) {
-        this.numericValue = numericValue;
-    }
-    
-    public Integer FlatThingCsvDTO.getSigFigs() {
-        return this.sigFigs;
-    }
-    
-    public void FlatThingCsvDTO.setSigFigs(Integer sigFigs) {
-        this.sigFigs = sigFigs;
-    }
-    
-    public BigDecimal FlatThingCsvDTO.getUncertainty() {
-        return this.uncertainty;
-    }
-    
-    public void FlatThingCsvDTO.setUncertainty(BigDecimal uncertainty) {
-        this.uncertainty = uncertainty;
-    }
-    
-    public Integer FlatThingCsvDTO.getNumberOfReplicates() {
-        return this.numberOfReplicates;
-    }
-    
-    public void FlatThingCsvDTO.setNumberOfReplicates(Integer numberOfReplicates) {
-        this.numberOfReplicates = numberOfReplicates;
-    }
-    
-    public String FlatThingCsvDTO.getUncertaintyType() {
-        return this.uncertaintyType;
-    }
-    
-    public void FlatThingCsvDTO.setUncertaintyType(String uncertaintyType) {
-        this.uncertaintyType = uncertaintyType;
-    }
-    
-    public String FlatThingCsvDTO.getUnitType() {
-        return this.unitType;
-    }
-    
-    public void FlatThingCsvDTO.setUnitType(String unitType) {
-        this.unitType = unitType;
-    }
-    
-    public String FlatThingCsvDTO.getUnitKind() {
-        return this.unitKind;
-    }
-    
-    public void FlatThingCsvDTO.setUnitKind(String unitKind) {
-        this.unitKind = unitKind;
-    }
-    
-    public Double FlatThingCsvDTO.getConcentration() {
-        return this.concentration;
-    }
-    
-    public void FlatThingCsvDTO.setConcentration(Double concentration) {
-        this.concentration = concentration;
-    }
-    
-    public String FlatThingCsvDTO.getConcUnit() {
-        return this.concUnit;
-    }
-    
-    public void FlatThingCsvDTO.setConcUnit(String concUnit) {
-        this.concUnit = concUnit;
-    }
-    
-    public String FlatThingCsvDTO.getComments() {
-        return this.comments;
-    }
-    
-    public void FlatThingCsvDTO.setComments(String comments) {
-        this.comments = comments;
-    }
-    
-    public boolean FlatThingCsvDTO.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void FlatThingCsvDTO.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public Long FlatThingCsvDTO.getLsTransaction() {
-        return this.lsTransaction;
-    }
-    
-    public void FlatThingCsvDTO.setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
-    
-    public Date FlatThingCsvDTO.getRecordedDate() {
-        return this.recordedDate;
-    }
-    
-    public void FlatThingCsvDTO.setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
-    
-    public String FlatThingCsvDTO.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void FlatThingCsvDTO.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public Date FlatThingCsvDTO.getModifiedDate() {
-        return this.modifiedDate;
-    }
-    
-    public void FlatThingCsvDTO.setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
-    
-    public String FlatThingCsvDTO.getModifiedBy() {
-        return this.modifiedBy;
-    }
-    
-    public void FlatThingCsvDTO.setModifiedBy(String modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
-    
-    public boolean FlatThingCsvDTO.isPublicData() {
-        return this.publicData;
-    }
-    
-    public void FlatThingCsvDTO.setPublicData(boolean publicData) {
-        this.publicData = publicData;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/FlatThingCsvDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/FlatThingCsvDTO_Roo_Json.aj
deleted file mode 100644
index 277580b18..000000000
--- a/src/main/java/com/labsynch/labseer/dto/FlatThingCsvDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.FlatThingCsvDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect FlatThingCsvDTO_Roo_Json {
-    
-    public String FlatThingCsvDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String FlatThingCsvDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static FlatThingCsvDTO FlatThingCsvDTO.fromJsonToFlatThingCsvDTO(String json) {
-        return new JSONDeserializer<FlatThingCsvDTO>()
-        .use(null, FlatThingCsvDTO.class).deserialize(json);
-    }
-    
-    public static String FlatThingCsvDTO.toJsonArray(Collection<FlatThingCsvDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String FlatThingCsvDTO.toJsonArray(Collection<FlatThingCsvDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<FlatThingCsvDTO> FlatThingCsvDTO.fromJsonArrayToFlatThingCsvDTO(String json) {
-        return new JSONDeserializer<List<FlatThingCsvDTO>>()
-        .use("values", FlatThingCsvDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/FlatThingCsvDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/FlatThingCsvDTO_Roo_ToString.aj
deleted file mode 100644
index 30c2980a9..000000000
--- a/src/main/java/com/labsynch/labseer/dto/FlatThingCsvDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.FlatThingCsvDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect FlatThingCsvDTO_Roo_ToString {
-    
-    public String FlatThingCsvDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/GeneIdDTO.java b/src/main/java/com/labsynch/labseer/dto/GeneIdDTO.java
index 4aaa7f5ea..cce7f49e5 100755
--- a/src/main/java/com/labsynch/labseer/dto/GeneIdDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/GeneIdDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -11,6 +17,48 @@ public class GeneIdDTO {
 	
 	private String gid;
 
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static GeneIdDTO fromJsonToGeneIdDTO(String json) {
+        return new JSONDeserializer<GeneIdDTO>()
+        .use(null, GeneIdDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<GeneIdDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<GeneIdDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<GeneIdDTO> fromJsonArrayToGeneIdDTO(String json) {
+        return new JSONDeserializer<List<GeneIdDTO>>()
+        .use("values", GeneIdDTO.class).deserialize(json);
+    }
+
+	public String getGid() {
+        return this.gid;
+    }
+
+	public void setGid(String gid) {
+        this.gid = gid;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/GeneIdDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/GeneIdDTO_Roo_JavaBean.aj
deleted file mode 100755
index d99a359ac..000000000
--- a/src/main/java/com/labsynch/labseer/dto/GeneIdDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.GeneIdDTO;
-
-privileged aspect GeneIdDTO_Roo_JavaBean {
-    
-    public String GeneIdDTO.getGid() {
-        return this.gid;
-    }
-    
-    public void GeneIdDTO.setGid(String gid) {
-        this.gid = gid;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/GeneIdDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/GeneIdDTO_Roo_Json.aj
deleted file mode 100755
index 373a94b08..000000000
--- a/src/main/java/com/labsynch/labseer/dto/GeneIdDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.GeneIdDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect GeneIdDTO_Roo_Json {
-    
-    public String GeneIdDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String GeneIdDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static GeneIdDTO GeneIdDTO.fromJsonToGeneIdDTO(String json) {
-        return new JSONDeserializer<GeneIdDTO>()
-        .use(null, GeneIdDTO.class).deserialize(json);
-    }
-    
-    public static String GeneIdDTO.toJsonArray(Collection<GeneIdDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String GeneIdDTO.toJsonArray(Collection<GeneIdDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<GeneIdDTO> GeneIdDTO.fromJsonArrayToGeneIdDTO(String json) {
-        return new JSONDeserializer<List<GeneIdDTO>>()
-        .use("values", GeneIdDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/GeneIdDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/GeneIdDTO_Roo_ToString.aj
deleted file mode 100755
index f32dfa5a9..000000000
--- a/src/main/java/com/labsynch/labseer/dto/GeneIdDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.GeneIdDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect GeneIdDTO_Roo_ToString {
-    
-    public String GeneIdDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/GeneOrthologDTO.java b/src/main/java/com/labsynch/labseer/dto/GeneOrthologDTO.java
index ccd57076e..abc16f511 100644
--- a/src/main/java/com/labsynch/labseer/dto/GeneOrthologDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/GeneOrthologDTO.java
@@ -5,6 +5,8 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -63,4 +65,200 @@ public static String toJsonArray(Collection<GeneOrthologDTO> collection) {
 	public static Collection<GeneOrthologDTO> fromJsonArrayToGeneOrtholoes(String json) {
         return new JSONDeserializer<List<GeneOrthologDTO>>().use(null, ArrayList.class).use("values", GeneOrthologDTO.class).deserialize(json);
     }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public Integer getRowIndex() {
+        return this.rowIndex;
+    }
+
+	public void setRowIndex(Integer rowIndex) {
+        this.rowIndex = rowIndex;
+    }
+
+	public String getGeneId() {
+        return this.geneId;
+    }
+
+	public void setGeneId(String geneId) {
+        this.geneId = geneId;
+    }
+
+	public String getSymbol() {
+        return this.symbol;
+    }
+
+	public void setSymbol(String symbol) {
+        this.symbol = symbol;
+    }
+
+	public String getTaxId() {
+        return this.taxId;
+    }
+
+	public void setTaxId(String taxId) {
+        this.taxId = taxId;
+    }
+
+	public String getSpecies() {
+        return this.species;
+    }
+
+	public void setSpecies(String species) {
+        this.species = species;
+    }
+
+	public String getTypeOfGene() {
+        return this.typeOfGene;
+    }
+
+	public void setTypeOfGene(String typeOfGene) {
+        this.typeOfGene = typeOfGene;
+    }
+
+	public String getMappedGeneId() {
+        return this.mappedGeneId;
+    }
+
+	public void setMappedGeneId(String mappedGeneId) {
+        this.mappedGeneId = mappedGeneId;
+    }
+
+	public String getMappedSymbol() {
+        return this.mappedSymbol;
+    }
+
+	public void setMappedSymbol(String mappedSymbol) {
+        this.mappedSymbol = mappedSymbol;
+    }
+
+	public String getMappedTaxId() {
+        return this.mappedTaxId;
+    }
+
+	public void setMappedTaxId(String mappedTaxId) {
+        this.mappedTaxId = mappedTaxId;
+    }
+
+	public String getMappedSpecies() {
+        return this.mappedSpecies;
+    }
+
+	public void setMappedSpecies(String mappedSpecies) {
+        this.mappedSpecies = mappedSpecies;
+    }
+
+	public String getMappedTypeOfGene() {
+        return this.mappedTypeOfGene;
+    }
+
+	public void setMappedTypeOfGene(String mappedTypeOfGene) {
+        this.mappedTypeOfGene = mappedTypeOfGene;
+    }
+
+	public Integer getMappedScore() {
+        return this.mappedScore;
+    }
+
+	public void setMappedScore(Integer mappedScore) {
+        this.mappedScore = mappedScore;
+    }
+
+	public Integer getMappedPerc() {
+        return this.mappedPerc;
+    }
+
+	public void setMappedPerc(Integer mappedPerc) {
+        this.mappedPerc = mappedPerc;
+    }
+
+	public Integer getMappedHitLen() {
+        return this.mappedHitLen;
+    }
+
+	public void setMappedHitLen(Integer mappedHitLen) {
+        this.mappedHitLen = mappedHitLen;
+    }
+
+	public Double getMappedPercRatio() {
+        return this.mappedPercRatio;
+    }
+
+	public void setMappedPercRatio(Double mappedPercRatio) {
+        this.mappedPercRatio = mappedPercRatio;
+    }
+
+	public Integer getMappedLocalIndex() {
+        return this.mappedLocalIndex;
+    }
+
+	public void setMappedLocalIndex(Integer mappedLocalIndex) {
+        this.mappedLocalIndex = mappedLocalIndex;
+    }
+
+	public Integer getMappedGeneIndex() {
+        return this.mappedGeneIndex;
+    }
+
+	public void setMappedGeneIndex(Integer mappedGeneIndex) {
+        this.mappedGeneIndex = mappedGeneIndex;
+    }
+
+	public Integer getMappedIsoformIndex() {
+        return this.mappedIsoformIndex;
+    }
+
+	public void setMappedIsoformIndex(Integer mappedIsoformIndex) {
+        this.mappedIsoformIndex = mappedIsoformIndex;
+    }
+
+	public String getOrthCode() {
+        return this.orthCode;
+    }
+
+	public void setOrthCode(String orthCode) {
+        this.orthCode = orthCode;
+    }
+
+	public String getVersionName() {
+        return this.versionName;
+    }
+
+	public void setVersionName(String versionName) {
+        this.versionName = versionName;
+    }
+
+	public Integer getCurationLevel() {
+        return this.curationLevel;
+    }
+
+	public void setCurationLevel(Integer curationLevel) {
+        this.curationLevel = curationLevel;
+    }
+
+	public String getCurator() {
+        return this.curator;
+    }
+
+	public void setCurator(String curator) {
+        this.curator = curator;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/GeneOrthologDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/GeneOrthologDTO_Roo_JavaBean.aj
deleted file mode 100644
index 9fc7cd947..000000000
--- a/src/main/java/com/labsynch/labseer/dto/GeneOrthologDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,202 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.GeneOrthologDTO;
-
-privileged aspect GeneOrthologDTO_Roo_JavaBean {
-    
-    public Long GeneOrthologDTO.getId() {
-        return this.id;
-    }
-    
-    public void GeneOrthologDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-    public String GeneOrthologDTO.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void GeneOrthologDTO.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public Integer GeneOrthologDTO.getRowIndex() {
-        return this.rowIndex;
-    }
-    
-    public void GeneOrthologDTO.setRowIndex(Integer rowIndex) {
-        this.rowIndex = rowIndex;
-    }
-    
-    public String GeneOrthologDTO.getGeneId() {
-        return this.geneId;
-    }
-    
-    public void GeneOrthologDTO.setGeneId(String geneId) {
-        this.geneId = geneId;
-    }
-    
-    public String GeneOrthologDTO.getSymbol() {
-        return this.symbol;
-    }
-    
-    public void GeneOrthologDTO.setSymbol(String symbol) {
-        this.symbol = symbol;
-    }
-    
-    public String GeneOrthologDTO.getTaxId() {
-        return this.taxId;
-    }
-    
-    public void GeneOrthologDTO.setTaxId(String taxId) {
-        this.taxId = taxId;
-    }
-    
-    public String GeneOrthologDTO.getSpecies() {
-        return this.species;
-    }
-    
-    public void GeneOrthologDTO.setSpecies(String species) {
-        this.species = species;
-    }
-    
-    public String GeneOrthologDTO.getTypeOfGene() {
-        return this.typeOfGene;
-    }
-    
-    public void GeneOrthologDTO.setTypeOfGene(String typeOfGene) {
-        this.typeOfGene = typeOfGene;
-    }
-    
-    public String GeneOrthologDTO.getMappedGeneId() {
-        return this.mappedGeneId;
-    }
-    
-    public void GeneOrthologDTO.setMappedGeneId(String mappedGeneId) {
-        this.mappedGeneId = mappedGeneId;
-    }
-    
-    public String GeneOrthologDTO.getMappedSymbol() {
-        return this.mappedSymbol;
-    }
-    
-    public void GeneOrthologDTO.setMappedSymbol(String mappedSymbol) {
-        this.mappedSymbol = mappedSymbol;
-    }
-    
-    public String GeneOrthologDTO.getMappedTaxId() {
-        return this.mappedTaxId;
-    }
-    
-    public void GeneOrthologDTO.setMappedTaxId(String mappedTaxId) {
-        this.mappedTaxId = mappedTaxId;
-    }
-    
-    public String GeneOrthologDTO.getMappedSpecies() {
-        return this.mappedSpecies;
-    }
-    
-    public void GeneOrthologDTO.setMappedSpecies(String mappedSpecies) {
-        this.mappedSpecies = mappedSpecies;
-    }
-    
-    public String GeneOrthologDTO.getMappedTypeOfGene() {
-        return this.mappedTypeOfGene;
-    }
-    
-    public void GeneOrthologDTO.setMappedTypeOfGene(String mappedTypeOfGene) {
-        this.mappedTypeOfGene = mappedTypeOfGene;
-    }
-    
-    public Integer GeneOrthologDTO.getMappedScore() {
-        return this.mappedScore;
-    }
-    
-    public void GeneOrthologDTO.setMappedScore(Integer mappedScore) {
-        this.mappedScore = mappedScore;
-    }
-    
-    public Integer GeneOrthologDTO.getMappedPerc() {
-        return this.mappedPerc;
-    }
-    
-    public void GeneOrthologDTO.setMappedPerc(Integer mappedPerc) {
-        this.mappedPerc = mappedPerc;
-    }
-    
-    public Integer GeneOrthologDTO.getMappedHitLen() {
-        return this.mappedHitLen;
-    }
-    
-    public void GeneOrthologDTO.setMappedHitLen(Integer mappedHitLen) {
-        this.mappedHitLen = mappedHitLen;
-    }
-    
-    public Double GeneOrthologDTO.getMappedPercRatio() {
-        return this.mappedPercRatio;
-    }
-    
-    public void GeneOrthologDTO.setMappedPercRatio(Double mappedPercRatio) {
-        this.mappedPercRatio = mappedPercRatio;
-    }
-    
-    public Integer GeneOrthologDTO.getMappedLocalIndex() {
-        return this.mappedLocalIndex;
-    }
-    
-    public void GeneOrthologDTO.setMappedLocalIndex(Integer mappedLocalIndex) {
-        this.mappedLocalIndex = mappedLocalIndex;
-    }
-    
-    public Integer GeneOrthologDTO.getMappedGeneIndex() {
-        return this.mappedGeneIndex;
-    }
-    
-    public void GeneOrthologDTO.setMappedGeneIndex(Integer mappedGeneIndex) {
-        this.mappedGeneIndex = mappedGeneIndex;
-    }
-    
-    public Integer GeneOrthologDTO.getMappedIsoformIndex() {
-        return this.mappedIsoformIndex;
-    }
-    
-    public void GeneOrthologDTO.setMappedIsoformIndex(Integer mappedIsoformIndex) {
-        this.mappedIsoformIndex = mappedIsoformIndex;
-    }
-    
-    public String GeneOrthologDTO.getOrthCode() {
-        return this.orthCode;
-    }
-    
-    public void GeneOrthologDTO.setOrthCode(String orthCode) {
-        this.orthCode = orthCode;
-    }
-    
-    public String GeneOrthologDTO.getVersionName() {
-        return this.versionName;
-    }
-    
-    public void GeneOrthologDTO.setVersionName(String versionName) {
-        this.versionName = versionName;
-    }
-    
-    public Integer GeneOrthologDTO.getCurationLevel() {
-        return this.curationLevel;
-    }
-    
-    public void GeneOrthologDTO.setCurationLevel(Integer curationLevel) {
-        this.curationLevel = curationLevel;
-    }
-    
-    public String GeneOrthologDTO.getCurator() {
-        return this.curator;
-    }
-    
-    public void GeneOrthologDTO.setCurator(String curator) {
-        this.curator = curator;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/GeneOrthologDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/GeneOrthologDTO_Roo_ToString.aj
deleted file mode 100644
index 9ef0913ba..000000000
--- a/src/main/java/com/labsynch/labseer/dto/GeneOrthologDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.GeneOrthologDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect GeneOrthologDTO_Roo_ToString {
-    
-    public String GeneOrthologDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/GeneOrthologFileDTO.java b/src/main/java/com/labsynch/labseer/dto/GeneOrthologFileDTO.java
index 41f909e41..ccb88c9d0 100644
--- a/src/main/java/com/labsynch/labseer/dto/GeneOrthologFileDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/GeneOrthologFileDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -17,4 +23,94 @@ public class GeneOrthologFileDTO {
     private String curator;
     private String recordedBy;
     
+
+	public String getVersionName() {
+        return this.versionName;
+    }
+
+	public void setVersionName(String versionName) {
+        this.versionName = versionName;
+    }
+
+	public String getTestFileName() {
+        return this.testFileName;
+    }
+
+	public void setTestFileName(String testFileName) {
+        this.testFileName = testFileName;
+    }
+
+	public String getOrthologType() {
+        return this.orthologType;
+    }
+
+	public void setOrthologType(String orthologType) {
+        this.orthologType = orthologType;
+    }
+
+	public Long getCurationLevel() {
+        return this.curationLevel;
+    }
+
+	public void setCurationLevel(Long curationLevel) {
+        this.curationLevel = curationLevel;
+    }
+
+	public String getDescription() {
+        return this.description;
+    }
+
+	public void setDescription(String description) {
+        this.description = description;
+    }
+
+	public String getCurator() {
+        return this.curator;
+    }
+
+	public void setCurator(String curator) {
+        this.curator = curator;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static GeneOrthologFileDTO fromJsonToGeneOrthologFileDTO(String json) {
+        return new JSONDeserializer<GeneOrthologFileDTO>()
+        .use(null, GeneOrthologFileDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<GeneOrthologFileDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<GeneOrthologFileDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<GeneOrthologFileDTO> fromJsonArrayToGeneOrtholoes(String json) {
+        return new JSONDeserializer<List<GeneOrthologFileDTO>>()
+        .use("values", GeneOrthologFileDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/GeneOrthologFileDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/GeneOrthologFileDTO_Roo_JavaBean.aj
deleted file mode 100644
index 51283ef87..000000000
--- a/src/main/java/com/labsynch/labseer/dto/GeneOrthologFileDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,66 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.GeneOrthologFileDTO;
-
-privileged aspect GeneOrthologFileDTO_Roo_JavaBean {
-    
-    public String GeneOrthologFileDTO.getVersionName() {
-        return this.versionName;
-    }
-    
-    public void GeneOrthologFileDTO.setVersionName(String versionName) {
-        this.versionName = versionName;
-    }
-    
-    public String GeneOrthologFileDTO.getTestFileName() {
-        return this.testFileName;
-    }
-    
-    public void GeneOrthologFileDTO.setTestFileName(String testFileName) {
-        this.testFileName = testFileName;
-    }
-    
-    public String GeneOrthologFileDTO.getOrthologType() {
-        return this.orthologType;
-    }
-    
-    public void GeneOrthologFileDTO.setOrthologType(String orthologType) {
-        this.orthologType = orthologType;
-    }
-    
-    public Long GeneOrthologFileDTO.getCurationLevel() {
-        return this.curationLevel;
-    }
-    
-    public void GeneOrthologFileDTO.setCurationLevel(Long curationLevel) {
-        this.curationLevel = curationLevel;
-    }
-    
-    public String GeneOrthologFileDTO.getDescription() {
-        return this.description;
-    }
-    
-    public void GeneOrthologFileDTO.setDescription(String description) {
-        this.description = description;
-    }
-    
-    public String GeneOrthologFileDTO.getCurator() {
-        return this.curator;
-    }
-    
-    public void GeneOrthologFileDTO.setCurator(String curator) {
-        this.curator = curator;
-    }
-    
-    public String GeneOrthologFileDTO.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void GeneOrthologFileDTO.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/GeneOrthologFileDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/GeneOrthologFileDTO_Roo_Json.aj
deleted file mode 100644
index f9cac85b0..000000000
--- a/src/main/java/com/labsynch/labseer/dto/GeneOrthologFileDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.GeneOrthologFileDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect GeneOrthologFileDTO_Roo_Json {
-    
-    public String GeneOrthologFileDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String GeneOrthologFileDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static GeneOrthologFileDTO GeneOrthologFileDTO.fromJsonToGeneOrthologFileDTO(String json) {
-        return new JSONDeserializer<GeneOrthologFileDTO>()
-        .use(null, GeneOrthologFileDTO.class).deserialize(json);
-    }
-    
-    public static String GeneOrthologFileDTO.toJsonArray(Collection<GeneOrthologFileDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String GeneOrthologFileDTO.toJsonArray(Collection<GeneOrthologFileDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<GeneOrthologFileDTO> GeneOrthologFileDTO.fromJsonArrayToGeneOrtholoes(String json) {
-        return new JSONDeserializer<List<GeneOrthologFileDTO>>()
-        .use("values", GeneOrthologFileDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/GeneOrthologFileDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/GeneOrthologFileDTO_Roo_ToString.aj
deleted file mode 100644
index be56ee899..000000000
--- a/src/main/java/com/labsynch/labseer/dto/GeneOrthologFileDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.GeneOrthologFileDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect GeneOrthologFileDTO_Roo_ToString {
-    
-    public String GeneOrthologFileDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/GenericQueryCodeTableResultDTO.java b/src/main/java/com/labsynch/labseer/dto/GenericQueryCodeTableResultDTO.java
index 0f1b0efd3..f1c8a5551 100644
--- a/src/main/java/com/labsynch/labseer/dto/GenericQueryCodeTableResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/GenericQueryCodeTableResultDTO.java
@@ -1,7 +1,9 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -9,7 +11,7 @@
 
 import com.labsynch.labseer.domain.LsThing;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -32,4 +34,52 @@ public String toJson() {
         return new JSONSerializer().exclude("*.class").include("results").transform(new ExcludeNulls(), void.class).serialize(this);
     }
 	
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static GenericQueryCodeTableResultDTO fromJsonToGenericQueryCodeTableResultDTO(String json) {
+        return new JSONDeserializer<GenericQueryCodeTableResultDTO>()
+        .use(null, GenericQueryCodeTableResultDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<GenericQueryCodeTableResultDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<GenericQueryCodeTableResultDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<GenericQueryCodeTableResultDTO> fromJsonArrayToGenericQueryCoes(String json) {
+        return new JSONDeserializer<List<GenericQueryCodeTableResultDTO>>()
+        .use("values", GenericQueryCodeTableResultDTO.class).deserialize(json);
+    }
+
+	public Integer getMaxResults() {
+        return this.maxResults;
+    }
+
+	public void setMaxResults(Integer maxResults) {
+        this.maxResults = maxResults;
+    }
+
+	public Integer getNumberOfResults() {
+        return this.numberOfResults;
+    }
+
+	public void setNumberOfResults(Integer numberOfResults) {
+        this.numberOfResults = numberOfResults;
+    }
+
+	public Collection<CodeTableDTO> getResults() {
+        return this.results;
+    }
+
+	public void setResults(Collection<CodeTableDTO> results) {
+        this.results = results;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/GenericQueryCodeTableResultDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/GenericQueryCodeTableResultDTO_Roo_JavaBean.aj
deleted file mode 100644
index b108af9bd..000000000
--- a/src/main/java/com/labsynch/labseer/dto/GenericQueryCodeTableResultDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,36 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CodeTableDTO;
-import com.labsynch.labseer.dto.GenericQueryCodeTableResultDTO;
-import java.util.Collection;
-
-privileged aspect GenericQueryCodeTableResultDTO_Roo_JavaBean {
-    
-    public Integer GenericQueryCodeTableResultDTO.getMaxResults() {
-        return this.maxResults;
-    }
-    
-    public void GenericQueryCodeTableResultDTO.setMaxResults(Integer maxResults) {
-        this.maxResults = maxResults;
-    }
-    
-    public Integer GenericQueryCodeTableResultDTO.getNumberOfResults() {
-        return this.numberOfResults;
-    }
-    
-    public void GenericQueryCodeTableResultDTO.setNumberOfResults(Integer numberOfResults) {
-        this.numberOfResults = numberOfResults;
-    }
-    
-    public Collection<CodeTableDTO> GenericQueryCodeTableResultDTO.getResults() {
-        return this.results;
-    }
-    
-    public void GenericQueryCodeTableResultDTO.setResults(Collection<CodeTableDTO> results) {
-        this.results = results;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/GenericQueryCodeTableResultDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/GenericQueryCodeTableResultDTO_Roo_Json.aj
deleted file mode 100644
index c2eb2c6e3..000000000
--- a/src/main/java/com/labsynch/labseer/dto/GenericQueryCodeTableResultDTO_Roo_Json.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.GenericQueryCodeTableResultDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect GenericQueryCodeTableResultDTO_Roo_Json {
-    
-    public static GenericQueryCodeTableResultDTO GenericQueryCodeTableResultDTO.fromJsonToGenericQueryCodeTableResultDTO(String json) {
-        return new JSONDeserializer<GenericQueryCodeTableResultDTO>()
-        .use(null, GenericQueryCodeTableResultDTO.class).deserialize(json);
-    }
-    
-    public static String GenericQueryCodeTableResultDTO.toJsonArray(Collection<GenericQueryCodeTableResultDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String GenericQueryCodeTableResultDTO.toJsonArray(Collection<GenericQueryCodeTableResultDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<GenericQueryCodeTableResultDTO> GenericQueryCodeTableResultDTO.fromJsonArrayToGenericQueryCoes(String json) {
-        return new JSONDeserializer<List<GenericQueryCodeTableResultDTO>>()
-        .use("values", GenericQueryCodeTableResultDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/GenericQueryCodeTableResultDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/GenericQueryCodeTableResultDTO_Roo_ToString.aj
deleted file mode 100644
index 468215edf..000000000
--- a/src/main/java/com/labsynch/labseer/dto/GenericQueryCodeTableResultDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.GenericQueryCodeTableResultDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect GenericQueryCodeTableResultDTO_Roo_ToString {
-    
-    public String GenericQueryCodeTableResultDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/GenericStatePathRequest.java b/src/main/java/com/labsynch/labseer/dto/GenericStatePathRequest.java
index 57f54889e..4ae491bda 100644
--- a/src/main/java/com/labsynch/labseer/dto/GenericStatePathRequest.java
+++ b/src/main/java/com/labsynch/labseer/dto/GenericStatePathRequest.java
@@ -1,13 +1,15 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -31,6 +33,44 @@ public String toJson() {
 	public static String toJsonArray(Collection<GenericStatePathRequest> collection) {
         return new JSONSerializer().exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
     }
+
+	public String getIdOrCodeName() {
+        return this.idOrCodeName;
+    }
+
+	public void setIdOrCodeName(String idOrCodeName) {
+        this.idOrCodeName = idOrCodeName;
+    }
+
+	public String getStateType() {
+        return this.stateType;
+    }
+
+	public void setStateType(String stateType) {
+        this.stateType = stateType;
+    }
+
+	public String getStateKind() {
+        return this.stateKind;
+    }
+
+	public void setStateKind(String stateKind) {
+        this.stateKind = stateKind;
+    }
+
+	public static GenericStatePathRequest fromJsonToGenericStatePathRequest(String json) {
+        return new JSONDeserializer<GenericStatePathRequest>()
+        .use(null, GenericStatePathRequest.class).deserialize(json);
+    }
+
+	public static Collection<GenericStatePathRequest> fromJsonArrayToGenericStatePathRequests(String json) {
+        return new JSONDeserializer<List<GenericStatePathRequest>>()
+        .use("values", GenericStatePathRequest.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/GenericStatePathRequest_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/GenericStatePathRequest_Roo_JavaBean.aj
deleted file mode 100644
index 50fb755d4..000000000
--- a/src/main/java/com/labsynch/labseer/dto/GenericStatePathRequest_Roo_JavaBean.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.GenericStatePathRequest;
-
-privileged aspect GenericStatePathRequest_Roo_JavaBean {
-    
-    public String GenericStatePathRequest.getIdOrCodeName() {
-        return this.idOrCodeName;
-    }
-    
-    public void GenericStatePathRequest.setIdOrCodeName(String idOrCodeName) {
-        this.idOrCodeName = idOrCodeName;
-    }
-    
-    public String GenericStatePathRequest.getStateType() {
-        return this.stateType;
-    }
-    
-    public void GenericStatePathRequest.setStateType(String stateType) {
-        this.stateType = stateType;
-    }
-    
-    public String GenericStatePathRequest.getStateKind() {
-        return this.stateKind;
-    }
-    
-    public void GenericStatePathRequest.setStateKind(String stateKind) {
-        this.stateKind = stateKind;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/GenericStatePathRequest_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/GenericStatePathRequest_Roo_Json.aj
deleted file mode 100644
index 72f7cdefa..000000000
--- a/src/main/java/com/labsynch/labseer/dto/GenericStatePathRequest_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.GenericStatePathRequest;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect GenericStatePathRequest_Roo_Json {
-    
-    public static GenericStatePathRequest GenericStatePathRequest.fromJsonToGenericStatePathRequest(String json) {
-        return new JSONDeserializer<GenericStatePathRequest>()
-        .use(null, GenericStatePathRequest.class).deserialize(json);
-    }
-    
-    public static Collection<GenericStatePathRequest> GenericStatePathRequest.fromJsonArrayToGenericStatePathRequests(String json) {
-        return new JSONDeserializer<List<GenericStatePathRequest>>()
-        .use("values", GenericStatePathRequest.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/GenericStatePathRequest_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/GenericStatePathRequest_Roo_ToString.aj
deleted file mode 100644
index 6966b5691..000000000
--- a/src/main/java/com/labsynch/labseer/dto/GenericStatePathRequest_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.GenericStatePathRequest;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect GenericStatePathRequest_Roo_ToString {
-    
-    public String GenericStatePathRequest.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/GenericValuePathRequest.java b/src/main/java/com/labsynch/labseer/dto/GenericValuePathRequest.java
index abb8437d2..445527914 100644
--- a/src/main/java/com/labsynch/labseer/dto/GenericValuePathRequest.java
+++ b/src/main/java/com/labsynch/labseer/dto/GenericValuePathRequest.java
@@ -1,13 +1,15 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -35,6 +37,60 @@ public String toJson() {
 	public static String toJsonArray(Collection<GenericValuePathRequest> collection) {
         return new JSONSerializer().exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
     }
+
+	public static GenericValuePathRequest fromJsonToGenericValuePathRequest(String json) {
+        return new JSONDeserializer<GenericValuePathRequest>()
+        .use(null, GenericValuePathRequest.class).deserialize(json);
+    }
+
+	public static Collection<GenericValuePathRequest> fromJsonArrayToGenericValuePathRequests(String json) {
+        return new JSONDeserializer<List<GenericValuePathRequest>>()
+        .use("values", GenericValuePathRequest.class).deserialize(json);
+    }
+
+	public String getIdOrCodeName() {
+        return this.idOrCodeName;
+    }
+
+	public void setIdOrCodeName(String idOrCodeName) {
+        this.idOrCodeName = idOrCodeName;
+    }
+
+	public String getStateType() {
+        return this.stateType;
+    }
+
+	public void setStateType(String stateType) {
+        this.stateType = stateType;
+    }
+
+	public String getStateKind() {
+        return this.stateKind;
+    }
+
+	public void setStateKind(String stateKind) {
+        this.stateKind = stateKind;
+    }
+
+	public String getValueType() {
+        return this.valueType;
+    }
+
+	public void setValueType(String valueType) {
+        this.valueType = valueType;
+    }
+
+	public String getValueKind() {
+        return this.valueKind;
+    }
+
+	public void setValueKind(String valueKind) {
+        this.valueKind = valueKind;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/GenericValuePathRequest_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/GenericValuePathRequest_Roo_JavaBean.aj
deleted file mode 100644
index b08c9b2ab..000000000
--- a/src/main/java/com/labsynch/labseer/dto/GenericValuePathRequest_Roo_JavaBean.aj
+++ /dev/null
@@ -1,50 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.GenericValuePathRequest;
-
-privileged aspect GenericValuePathRequest_Roo_JavaBean {
-    
-    public String GenericValuePathRequest.getIdOrCodeName() {
-        return this.idOrCodeName;
-    }
-    
-    public void GenericValuePathRequest.setIdOrCodeName(String idOrCodeName) {
-        this.idOrCodeName = idOrCodeName;
-    }
-    
-    public String GenericValuePathRequest.getStateType() {
-        return this.stateType;
-    }
-    
-    public void GenericValuePathRequest.setStateType(String stateType) {
-        this.stateType = stateType;
-    }
-    
-    public String GenericValuePathRequest.getStateKind() {
-        return this.stateKind;
-    }
-    
-    public void GenericValuePathRequest.setStateKind(String stateKind) {
-        this.stateKind = stateKind;
-    }
-    
-    public String GenericValuePathRequest.getValueType() {
-        return this.valueType;
-    }
-    
-    public void GenericValuePathRequest.setValueType(String valueType) {
-        this.valueType = valueType;
-    }
-    
-    public String GenericValuePathRequest.getValueKind() {
-        return this.valueKind;
-    }
-    
-    public void GenericValuePathRequest.setValueKind(String valueKind) {
-        this.valueKind = valueKind;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/GenericValuePathRequest_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/GenericValuePathRequest_Roo_Json.aj
deleted file mode 100644
index 2b1838067..000000000
--- a/src/main/java/com/labsynch/labseer/dto/GenericValuePathRequest_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.GenericValuePathRequest;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect GenericValuePathRequest_Roo_Json {
-    
-    public static GenericValuePathRequest GenericValuePathRequest.fromJsonToGenericValuePathRequest(String json) {
-        return new JSONDeserializer<GenericValuePathRequest>()
-        .use(null, GenericValuePathRequest.class).deserialize(json);
-    }
-    
-    public static Collection<GenericValuePathRequest> GenericValuePathRequest.fromJsonArrayToGenericValuePathRequests(String json) {
-        return new JSONDeserializer<List<GenericValuePathRequest>>()
-        .use("values", GenericValuePathRequest.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/GenericValuePathRequest_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/GenericValuePathRequest_Roo_ToString.aj
deleted file mode 100644
index ed80f2e5c..000000000
--- a/src/main/java/com/labsynch/labseer/dto/GenericValuePathRequest_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.GenericValuePathRequest;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect GenericValuePathRequest_Roo_ToString {
-    
-    public String GenericValuePathRequest.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/HydrogenizeMolInputDTO.java b/src/main/java/com/labsynch/labseer/dto/HydrogenizeMolInputDTO.java
index c25f9492e..1cbb358ef 100644
--- a/src/main/java/com/labsynch/labseer/dto/HydrogenizeMolInputDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/HydrogenizeMolInputDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -15,4 +21,62 @@ public class HydrogenizeMolInputDTO {
 	
 	private MethodOptionDTO parameters;
 
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static HydrogenizeMolInputDTO fromJsonToHydrogenizeMolInputDTO(String json) {
+        return new JSONDeserializer<HydrogenizeMolInputDTO>()
+        .use(null, HydrogenizeMolInputDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<HydrogenizeMolInputDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<HydrogenizeMolInputDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<HydrogenizeMolInputDTO> fromJsonArrayToHydrogenizeMoes(String json) {
+        return new JSONDeserializer<List<HydrogenizeMolInputDTO>>()
+        .use("values", HydrogenizeMolInputDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getStructure() {
+        return this.structure;
+    }
+
+	public void setStructure(String structure) {
+        this.structure = structure;
+    }
+
+	public String getInputFormat() {
+        return this.inputFormat;
+    }
+
+	public void setInputFormat(String inputFormat) {
+        this.inputFormat = inputFormat;
+    }
+
+	public MethodOptionDTO getParameters() {
+        return this.parameters;
+    }
+
+	public void setParameters(MethodOptionDTO parameters) {
+        this.parameters = parameters;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/HydrogenizeMolInputDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/HydrogenizeMolInputDTO_Roo_JavaBean.aj
deleted file mode 100644
index 5483a5302..000000000
--- a/src/main/java/com/labsynch/labseer/dto/HydrogenizeMolInputDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.HydrogenizeMolInputDTO;
-import com.labsynch.labseer.dto.MethodOptionDTO;
-
-privileged aspect HydrogenizeMolInputDTO_Roo_JavaBean {
-    
-    public String HydrogenizeMolInputDTO.getStructure() {
-        return this.structure;
-    }
-    
-    public void HydrogenizeMolInputDTO.setStructure(String structure) {
-        this.structure = structure;
-    }
-    
-    public String HydrogenizeMolInputDTO.getInputFormat() {
-        return this.inputFormat;
-    }
-    
-    public void HydrogenizeMolInputDTO.setInputFormat(String inputFormat) {
-        this.inputFormat = inputFormat;
-    }
-    
-    public MethodOptionDTO HydrogenizeMolInputDTO.getParameters() {
-        return this.parameters;
-    }
-    
-    public void HydrogenizeMolInputDTO.setParameters(MethodOptionDTO parameters) {
-        this.parameters = parameters;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/HydrogenizeMolInputDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/HydrogenizeMolInputDTO_Roo_Json.aj
deleted file mode 100644
index 1e19ef794..000000000
--- a/src/main/java/com/labsynch/labseer/dto/HydrogenizeMolInputDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.HydrogenizeMolInputDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect HydrogenizeMolInputDTO_Roo_Json {
-    
-    public String HydrogenizeMolInputDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String HydrogenizeMolInputDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static HydrogenizeMolInputDTO HydrogenizeMolInputDTO.fromJsonToHydrogenizeMolInputDTO(String json) {
-        return new JSONDeserializer<HydrogenizeMolInputDTO>()
-        .use(null, HydrogenizeMolInputDTO.class).deserialize(json);
-    }
-    
-    public static String HydrogenizeMolInputDTO.toJsonArray(Collection<HydrogenizeMolInputDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String HydrogenizeMolInputDTO.toJsonArray(Collection<HydrogenizeMolInputDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<HydrogenizeMolInputDTO> HydrogenizeMolInputDTO.fromJsonArrayToHydrogenizeMoes(String json) {
-        return new JSONDeserializer<List<HydrogenizeMolInputDTO>>()
-        .use("values", HydrogenizeMolInputDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/HydrogenizeMolInputDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/HydrogenizeMolInputDTO_Roo_ToString.aj
deleted file mode 100644
index 9ffc46cbe..000000000
--- a/src/main/java/com/labsynch/labseer/dto/HydrogenizeMolInputDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.HydrogenizeMolInputDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect HydrogenizeMolInputDTO_Roo_ToString {
-    
-    public String HydrogenizeMolInputDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/IdCollectionDTO.java b/src/main/java/com/labsynch/labseer/dto/IdCollectionDTO.java
index 49fa18cf2..e096ff56a 100755
--- a/src/main/java/com/labsynch/labseer/dto/IdCollectionDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/IdCollectionDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -13,6 +19,56 @@ public class IdCollectionDTO {
 
 	private Integer version;
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static IdCollectionDTO fromJsonToIdCollectionDTO(String json) {
+        return new JSONDeserializer<IdCollectionDTO>()
+        .use(null, IdCollectionDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<IdCollectionDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<IdCollectionDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<IdCollectionDTO> fromJsonArrayToIdCollectioes(String json) {
+        return new JSONDeserializer<List<IdCollectionDTO>>()
+        .use("values", IdCollectionDTO.class).deserialize(json);
+    }
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/IdCollectionDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/IdCollectionDTO_Roo_JavaBean.aj
deleted file mode 100755
index d5d06cf46..000000000
--- a/src/main/java/com/labsynch/labseer/dto/IdCollectionDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.IdCollectionDTO;
-
-privileged aspect IdCollectionDTO_Roo_JavaBean {
-    
-    public Long IdCollectionDTO.getId() {
-        return this.id;
-    }
-    
-    public void IdCollectionDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer IdCollectionDTO.getVersion() {
-        return this.version;
-    }
-    
-    public void IdCollectionDTO.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/IdCollectionDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/IdCollectionDTO_Roo_Json.aj
deleted file mode 100755
index 15a3d3cc4..000000000
--- a/src/main/java/com/labsynch/labseer/dto/IdCollectionDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.IdCollectionDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect IdCollectionDTO_Roo_Json {
-    
-    public String IdCollectionDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String IdCollectionDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static IdCollectionDTO IdCollectionDTO.fromJsonToIdCollectionDTO(String json) {
-        return new JSONDeserializer<IdCollectionDTO>()
-        .use(null, IdCollectionDTO.class).deserialize(json);
-    }
-    
-    public static String IdCollectionDTO.toJsonArray(Collection<IdCollectionDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String IdCollectionDTO.toJsonArray(Collection<IdCollectionDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<IdCollectionDTO> IdCollectionDTO.fromJsonArrayToIdCollectioes(String json) {
-        return new JSONDeserializer<List<IdCollectionDTO>>()
-        .use("values", IdCollectionDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/IdCollectionDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/IdCollectionDTO_Roo_ToString.aj
deleted file mode 100755
index 6fa0ba985..000000000
--- a/src/main/java/com/labsynch/labseer/dto/IdCollectionDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.IdCollectionDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect IdCollectionDTO_Roo_ToString {
-    
-    public String IdCollectionDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/IdSetDTO.java b/src/main/java/com/labsynch/labseer/dto/IdSetDTO.java
index 92f56f120..34fb9432b 100644
--- a/src/main/java/com/labsynch/labseer/dto/IdSetDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/IdSetDTO.java
@@ -7,7 +7,8 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -36,6 +37,18 @@ public static String toJsonArray(Collection<IdSetDTO> collection) {
 	public static Collection<IdSetDTO> fromJsonArrayToIdSetDTO(String json) {
         return new JSONDeserializer<List<IdSetDTO>>().use(null, ArrayList.class).use("values", IdSetDTO.class).deserialize(json);
     }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public Set<Long> getIdSet() {
+        return this.idSet;
+    }
+
+	public void setIdSet(Set<Long> idSet) {
+        this.idSet = idSet;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/IdSetDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/IdSetDTO_Roo_JavaBean.aj
deleted file mode 100644
index 3604a45e7..000000000
--- a/src/main/java/com/labsynch/labseer/dto/IdSetDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,19 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.IdSetDTO;
-import java.util.Set;
-
-privileged aspect IdSetDTO_Roo_JavaBean {
-    
-    public Set<Long> IdSetDTO.getIdSet() {
-        return this.idSet;
-    }
-    
-    public void IdSetDTO.setIdSet(Set<Long> idSet) {
-        this.idSet = idSet;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/IdSetDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/IdSetDTO_Roo_ToString.aj
deleted file mode 100644
index c8d085a6a..000000000
--- a/src/main/java/com/labsynch/labseer/dto/IdSetDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.IdSetDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect IdSetDTO_Roo_ToString {
-    
-    public String IdSetDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ItxQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/ItxQueryDTO.java
index dc76354ab..debb03fe3 100644
--- a/src/main/java/com/labsynch/labseer/dto/ItxQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ItxQueryDTO.java
@@ -1,7 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -27,4 +31,118 @@ public class ItxQueryDTO {
 	public ItxQueryDTO(){
 		
 	}
+
+	public String getInteractionType() {
+        return this.interactionType;
+    }
+
+	public void setInteractionType(String interactionType) {
+        this.interactionType = interactionType;
+    }
+
+	public String getInteractionKind() {
+        return this.interactionKind;
+    }
+
+	public void setInteractionKind(String interactionKind) {
+        this.interactionKind = interactionKind;
+    }
+
+	public String getThingType() {
+        return this.thingType;
+    }
+
+	public void setThingType(String thingType) {
+        this.thingType = thingType;
+    }
+
+	public String getThingKind() {
+        return this.thingKind;
+    }
+
+	public void setThingKind(String thingKind) {
+        this.thingKind = thingKind;
+    }
+
+	public String getThingLabelText() {
+        return this.thingLabelText;
+    }
+
+	public void setThingLabelText(String thingLabelText) {
+        this.thingLabelText = thingLabelText;
+    }
+
+	public String getThingLabelType() {
+        return this.thingLabelType;
+    }
+
+	public void setThingLabelType(String thingLabelType) {
+        this.thingLabelType = thingLabelType;
+    }
+
+	public String getThingLabelKind() {
+        return this.thingLabelKind;
+    }
+
+	public void setThingLabelKind(String thingLabelKind) {
+        this.thingLabelKind = thingLabelKind;
+    }
+
+	public String getThingCodeName() {
+        return this.thingCodeName;
+    }
+
+	public void setThingCodeName(String thingCodeName) {
+        this.thingCodeName = thingCodeName;
+    }
+
+	public String getOperator() {
+        return this.operator;
+    }
+
+	public void setOperator(String operator) {
+        this.operator = operator;
+    }
+
+	public Collection<ValueQueryDTO> getThingValues() {
+        return this.thingValues;
+    }
+
+	public void setThingValues(Collection<ValueQueryDTO> thingValues) {
+        this.thingValues = thingValues;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ItxQueryDTO fromJsonToItxQueryDTO(String json) {
+        return new JSONDeserializer<ItxQueryDTO>()
+        .use(null, ItxQueryDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ItxQueryDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ItxQueryDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ItxQueryDTO> fromJsonArrayToItxQueryDTO(String json) {
+        return new JSONDeserializer<List<ItxQueryDTO>>()
+        .use("values", ItxQueryDTO.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ItxQueryDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ItxQueryDTO_Roo_JavaBean.aj
deleted file mode 100644
index 93d82ac70..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ItxQueryDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,92 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ItxQueryDTO;
-import com.labsynch.labseer.dto.ValueQueryDTO;
-import java.util.Collection;
-
-privileged aspect ItxQueryDTO_Roo_JavaBean {
-    
-    public String ItxQueryDTO.getInteractionType() {
-        return this.interactionType;
-    }
-    
-    public void ItxQueryDTO.setInteractionType(String interactionType) {
-        this.interactionType = interactionType;
-    }
-    
-    public String ItxQueryDTO.getInteractionKind() {
-        return this.interactionKind;
-    }
-    
-    public void ItxQueryDTO.setInteractionKind(String interactionKind) {
-        this.interactionKind = interactionKind;
-    }
-    
-    public String ItxQueryDTO.getThingType() {
-        return this.thingType;
-    }
-    
-    public void ItxQueryDTO.setThingType(String thingType) {
-        this.thingType = thingType;
-    }
-    
-    public String ItxQueryDTO.getThingKind() {
-        return this.thingKind;
-    }
-    
-    public void ItxQueryDTO.setThingKind(String thingKind) {
-        this.thingKind = thingKind;
-    }
-    
-    public String ItxQueryDTO.getThingLabelText() {
-        return this.thingLabelText;
-    }
-    
-    public void ItxQueryDTO.setThingLabelText(String thingLabelText) {
-        this.thingLabelText = thingLabelText;
-    }
-    
-    public String ItxQueryDTO.getThingLabelType() {
-        return this.thingLabelType;
-    }
-    
-    public void ItxQueryDTO.setThingLabelType(String thingLabelType) {
-        this.thingLabelType = thingLabelType;
-    }
-    
-    public String ItxQueryDTO.getThingLabelKind() {
-        return this.thingLabelKind;
-    }
-    
-    public void ItxQueryDTO.setThingLabelKind(String thingLabelKind) {
-        this.thingLabelKind = thingLabelKind;
-    }
-    
-    public String ItxQueryDTO.getThingCodeName() {
-        return this.thingCodeName;
-    }
-    
-    public void ItxQueryDTO.setThingCodeName(String thingCodeName) {
-        this.thingCodeName = thingCodeName;
-    }
-    
-    public String ItxQueryDTO.getOperator() {
-        return this.operator;
-    }
-    
-    public void ItxQueryDTO.setOperator(String operator) {
-        this.operator = operator;
-    }
-    
-    public Collection<ValueQueryDTO> ItxQueryDTO.getThingValues() {
-        return this.thingValues;
-    }
-    
-    public void ItxQueryDTO.setThingValues(Collection<ValueQueryDTO> thingValues) {
-        this.thingValues = thingValues;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ItxQueryDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ItxQueryDTO_Roo_Json.aj
deleted file mode 100644
index c2c75b54e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ItxQueryDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ItxQueryDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ItxQueryDTO_Roo_Json {
-    
-    public String ItxQueryDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ItxQueryDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ItxQueryDTO ItxQueryDTO.fromJsonToItxQueryDTO(String json) {
-        return new JSONDeserializer<ItxQueryDTO>()
-        .use(null, ItxQueryDTO.class).deserialize(json);
-    }
-    
-    public static String ItxQueryDTO.toJsonArray(Collection<ItxQueryDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ItxQueryDTO.toJsonArray(Collection<ItxQueryDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ItxQueryDTO> ItxQueryDTO.fromJsonArrayToItxQueryDTO(String json) {
-        return new JSONDeserializer<List<ItxQueryDTO>>()
-        .use("values", ItxQueryDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ItxQueryDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ItxQueryDTO_Roo_ToString.aj
deleted file mode 100644
index 07b713b35..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ItxQueryDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ItxQueryDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ItxQueryDTO_Roo_ToString {
-    
-    public String ItxQueryDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/JSTreeNodeDTO.java b/src/main/java/com/labsynch/labseer/dto/JSTreeNodeDTO.java
index a2ab708a0..b08295bcb 100755
--- a/src/main/java/com/labsynch/labseer/dto/JSTreeNodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/JSTreeNodeDTO.java
@@ -8,6 +8,8 @@
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -79,6 +81,50 @@ public boolean equals(Object obj) {
             append(parent, rhs.parent).
             isEquals();
     }
+
+	public String getId() {
+        return this.id;
+    }
+
+	public void setId(String id) {
+        this.id = id;
+    }
+
+	public String getParent() {
+        return this.parent;
+    }
+
+	public void setParent(String parent) {
+        this.parent = parent;
+    }
+
+	public String getText() {
+        return this.text;
+    }
+
+	public void setText(String text) {
+        this.text = text;
+    }
+
+	public String getDescription() {
+        return this.description;
+    }
+
+	public void setDescription(String description) {
+        this.description = description;
+    }
+
+	public Set<LsTag> getLsTags() {
+        return this.lsTags;
+    }
+
+	public void setLsTags(Set<LsTag> lsTags) {
+        this.lsTags = lsTags;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/JSTreeNodeDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/JSTreeNodeDTO_Roo_JavaBean.aj
deleted file mode 100755
index 04d58cf09..000000000
--- a/src/main/java/com/labsynch/labseer/dto/JSTreeNodeDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,52 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.LsTag;
-import com.labsynch.labseer.dto.JSTreeNodeDTO;
-import java.util.Set;
-
-privileged aspect JSTreeNodeDTO_Roo_JavaBean {
-    
-    public String JSTreeNodeDTO.getId() {
-        return this.id;
-    }
-    
-    public void JSTreeNodeDTO.setId(String id) {
-        this.id = id;
-    }
-    
-    public String JSTreeNodeDTO.getParent() {
-        return this.parent;
-    }
-    
-    public void JSTreeNodeDTO.setParent(String parent) {
-        this.parent = parent;
-    }
-    
-    public String JSTreeNodeDTO.getText() {
-        return this.text;
-    }
-    
-    public void JSTreeNodeDTO.setText(String text) {
-        this.text = text;
-    }
-    
-    public String JSTreeNodeDTO.getDescription() {
-        return this.description;
-    }
-    
-    public void JSTreeNodeDTO.setDescription(String description) {
-        this.description = description;
-    }
-    
-    public Set<LsTag> JSTreeNodeDTO.getLsTags() {
-        return this.lsTags;
-    }
-    
-    public void JSTreeNodeDTO.setLsTags(Set<LsTag> lsTags) {
-        this.lsTags = lsTags;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/JSTreeNodeDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/JSTreeNodeDTO_Roo_ToString.aj
deleted file mode 100755
index 5e3091a7f..000000000
--- a/src/main/java/com/labsynch/labseer/dto/JSTreeNodeDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.JSTreeNodeDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect JSTreeNodeDTO_Roo_ToString {
-    
-    public String JSTreeNodeDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/KeyValueDTO.java b/src/main/java/com/labsynch/labseer/dto/KeyValueDTO.java
index 9db791d47..9251257e7 100644
--- a/src/main/java/com/labsynch/labseer/dto/KeyValueDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/KeyValueDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -13,6 +19,56 @@ public class KeyValueDTO {
 
 	private String value;
 	
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static KeyValueDTO fromJsonToKeyValueDTO(String json) {
+        return new JSONDeserializer<KeyValueDTO>()
+        .use(null, KeyValueDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<KeyValueDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<KeyValueDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<KeyValueDTO> fromJsonArrayToKeyValueDTO(String json) {
+        return new JSONDeserializer<List<KeyValueDTO>>()
+        .use("values", KeyValueDTO.class).deserialize(json);
+    }
+
+	public String getKey() {
+        return this.key;
+    }
+
+	public void setKey(String key) {
+        this.key = key;
+    }
+
+	public String getValue() {
+        return this.value;
+    }
+
+	public void setValue(String value) {
+        this.value = value;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/KeyValueDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/KeyValueDTO_Roo_JavaBean.aj
deleted file mode 100644
index 0db24a9ac..000000000
--- a/src/main/java/com/labsynch/labseer/dto/KeyValueDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.KeyValueDTO;
-
-privileged aspect KeyValueDTO_Roo_JavaBean {
-    
-    public String KeyValueDTO.getKey() {
-        return this.key;
-    }
-    
-    public void KeyValueDTO.setKey(String key) {
-        this.key = key;
-    }
-    
-    public String KeyValueDTO.getValue() {
-        return this.value;
-    }
-    
-    public void KeyValueDTO.setValue(String value) {
-        this.value = value;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/KeyValueDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/KeyValueDTO_Roo_Json.aj
deleted file mode 100644
index e206847a2..000000000
--- a/src/main/java/com/labsynch/labseer/dto/KeyValueDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.KeyValueDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect KeyValueDTO_Roo_Json {
-    
-    public String KeyValueDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String KeyValueDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static KeyValueDTO KeyValueDTO.fromJsonToKeyValueDTO(String json) {
-        return new JSONDeserializer<KeyValueDTO>()
-        .use(null, KeyValueDTO.class).deserialize(json);
-    }
-    
-    public static String KeyValueDTO.toJsonArray(Collection<KeyValueDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String KeyValueDTO.toJsonArray(Collection<KeyValueDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<KeyValueDTO> KeyValueDTO.fromJsonArrayToKeyValueDTO(String json) {
-        return new JSONDeserializer<List<KeyValueDTO>>()
-        .use("values", KeyValueDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/KeyValueDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/KeyValueDTO_Roo_ToString.aj
deleted file mode 100644
index cf97e787c..000000000
--- a/src/main/java/com/labsynch/labseer/dto/KeyValueDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.KeyValueDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect KeyValueDTO_Roo_ToString {
-    
-    public String KeyValueDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/KiCurveFitDTO.java b/src/main/java/com/labsynch/labseer/dto/KiCurveFitDTO.java
index f94543333..920c4dd5a 100644
--- a/src/main/java/com/labsynch/labseer/dto/KiCurveFitDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/KiCurveFitDTO.java
@@ -13,7 +13,8 @@
 
 import javax.persistence.EntityManager;
 import javax.persistence.TypedQuery;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import javax.persistence.NoResultException;
@@ -33,6 +34,8 @@
 import com.labsynch.labseer.domain.Experiment;
 import com.labsynch.labseer.domain.SubjectValue;
 import com.labsynch.labseer.utils.SimpleUtil;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
 @RooJavaBean
 @RooToString
@@ -764,4 +767,454 @@ private static Collection<KiCurveFitDTO> makeCurveFitDTOsFromCurveIdList(Collect
 		return curveFitDTOs;
 	}
 	
+
+	public String getCurveId() {
+        return this.curveId;
+    }
+
+	public void setCurveId(String curveId) {
+        this.curveId = curveId;
+    }
+
+	public String getAnalysisGroupCode() {
+        return this.analysisGroupCode;
+    }
+
+	public void setAnalysisGroupCode(String analysisGroupCode) {
+        this.analysisGroupCode = analysisGroupCode;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public Date getRecordedDate() {
+        return this.recordedDate;
+    }
+
+	public void setRecordedDate(Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+	public Long getLsTransaction() {
+        return this.lsTransaction;
+    }
+
+	public void setLsTransaction(Long lsTransaction) {
+        this.lsTransaction = lsTransaction;
+    }
+
+	public String getBatchCode() {
+        return this.batchCode;
+    }
+
+	public void setBatchCode(String batchCode) {
+        this.batchCode = batchCode;
+    }
+
+	public String getCategory() {
+        return this.category;
+    }
+
+	public void setCategory(String category) {
+        this.category = category;
+    }
+
+	public String getRenderingHint() {
+        return this.renderingHint;
+    }
+
+	public void setRenderingHint(String renderingHint) {
+        this.renderingHint = renderingHint;
+    }
+
+	public String getMin() {
+        return this.min;
+    }
+
+	public void setMin(String min) {
+        this.min = min;
+    }
+
+	public String getMax() {
+        return this.max;
+    }
+
+	public void setMax(String max) {
+        this.max = max;
+    }
+
+	public String getMinUnits() {
+        return this.minUnits;
+    }
+
+	public void setMinUnits(String minUnits) {
+        this.minUnits = minUnits;
+    }
+
+	public String getMaxUnits() {
+        return this.maxUnits;
+    }
+
+	public void setMaxUnits(String maxUnits) {
+        this.maxUnits = maxUnits;
+    }
+
+	public String getKi() {
+        return this.ki;
+    }
+
+	public void setKi(String ki) {
+        this.ki = ki;
+    }
+
+	public String getKiUnits() {
+        return this.kiUnits;
+    }
+
+	public void setKiUnits(String kiUnits) {
+        this.kiUnits = kiUnits;
+    }
+
+	public BigDecimal getLigandConc() {
+        return this.ligandConc;
+    }
+
+	public void setLigandConc(BigDecimal ligandConc) {
+        this.ligandConc = ligandConc;
+    }
+
+	public String getLigandConcUnits() {
+        return this.ligandConcUnits;
+    }
+
+	public void setLigandConcUnits(String ligandConcUnits) {
+        this.ligandConcUnits = ligandConcUnits;
+    }
+
+	public BigDecimal getKd() {
+        return this.kd;
+    }
+
+	public void setKd(BigDecimal kd) {
+        this.kd = kd;
+    }
+
+	public String getKdUnits() {
+        return this.kdUnits;
+    }
+
+	public void setKdUnits(String kdUnits) {
+        this.kdUnits = kdUnits;
+    }
+
+	public BigDecimal getMinUncertainty() {
+        return this.minUncertainty;
+    }
+
+	public void setMinUncertainty(BigDecimal minUncertainty) {
+        this.minUncertainty = minUncertainty;
+    }
+
+	public BigDecimal getMaxUncertainty() {
+        return this.maxUncertainty;
+    }
+
+	public void setMaxUncertainty(BigDecimal maxUncertainty) {
+        this.maxUncertainty = maxUncertainty;
+    }
+
+	public BigDecimal getKiUncertainty() {
+        return this.kiUncertainty;
+    }
+
+	public void setKiUncertainty(BigDecimal kiUncertainty) {
+        this.kiUncertainty = kiUncertainty;
+    }
+
+	public BigDecimal getLigandConcUncertainty() {
+        return this.ligandConcUncertainty;
+    }
+
+	public void setLigandConcUncertainty(BigDecimal ligandConcUncertainty) {
+        this.ligandConcUncertainty = ligandConcUncertainty;
+    }
+
+	public BigDecimal getKdUncertainty() {
+        return this.kdUncertainty;
+    }
+
+	public void setKdUncertainty(BigDecimal kdUncertainty) {
+        this.kdUncertainty = kdUncertainty;
+    }
+
+	public String getMinUncertaintyType() {
+        return this.minUncertaintyType;
+    }
+
+	public void setMinUncertaintyType(String minUncertaintyType) {
+        this.minUncertaintyType = minUncertaintyType;
+    }
+
+	public String getMaxUncertaintyType() {
+        return this.maxUncertaintyType;
+    }
+
+	public void setMaxUncertaintyType(String maxUncertaintyType) {
+        this.maxUncertaintyType = maxUncertaintyType;
+    }
+
+	public String getKiUncertaintyType() {
+        return this.kiUncertaintyType;
+    }
+
+	public void setKiUncertaintyType(String kiUncertaintyType) {
+        this.kiUncertaintyType = kiUncertaintyType;
+    }
+
+	public String getLigandConcUncertaintyType() {
+        return this.ligandConcUncertaintyType;
+    }
+
+	public void setLigandConcUncertaintyType(String ligandConcUncertaintyType) {
+        this.ligandConcUncertaintyType = ligandConcUncertaintyType;
+    }
+
+	public String getKdUncertaintyType() {
+        return this.kdUncertaintyType;
+    }
+
+	public void setKdUncertaintyType(String kdUncertaintyType) {
+        this.kdUncertaintyType = kdUncertaintyType;
+    }
+
+	public String getMinOperatorKind() {
+        return this.minOperatorKind;
+    }
+
+	public void setMinOperatorKind(String minOperatorKind) {
+        this.minOperatorKind = minOperatorKind;
+    }
+
+	public String getMaxOperatorKind() {
+        return this.maxOperatorKind;
+    }
+
+	public void setMaxOperatorKind(String maxOperatorKind) {
+        this.maxOperatorKind = maxOperatorKind;
+    }
+
+	public String getKiOperatorKind() {
+        return this.kiOperatorKind;
+    }
+
+	public void setKiOperatorKind(String kiOperatorKind) {
+        this.kiOperatorKind = kiOperatorKind;
+    }
+
+	public String getLigandConcOperatorKind() {
+        return this.ligandConcOperatorKind;
+    }
+
+	public void setLigandConcOperatorKind(String ligandConcOperatorKind) {
+        this.ligandConcOperatorKind = ligandConcOperatorKind;
+    }
+
+	public String getKdOperatorKind() {
+        return this.kdOperatorKind;
+    }
+
+	public void setKdOperatorKind(String kdOperatorKind) {
+        this.kdOperatorKind = kdOperatorKind;
+    }
+
+	public BigDecimal getFittedMin() {
+        return this.fittedMin;
+    }
+
+	public void setFittedMin(BigDecimal fittedMin) {
+        this.fittedMin = fittedMin;
+    }
+
+	public BigDecimal getFittedMax() {
+        return this.fittedMax;
+    }
+
+	public void setFittedMax(BigDecimal fittedMax) {
+        this.fittedMax = fittedMax;
+    }
+
+	public BigDecimal getFittedKi() {
+        return this.fittedKi;
+    }
+
+	public void setFittedKi(BigDecimal fittedKi) {
+        this.fittedKi = fittedKi;
+    }
+
+	public BigDecimal getFittedMinUncertainty() {
+        return this.fittedMinUncertainty;
+    }
+
+	public void setFittedMinUncertainty(BigDecimal fittedMinUncertainty) {
+        this.fittedMinUncertainty = fittedMinUncertainty;
+    }
+
+	public BigDecimal getFittedMaxUncertainty() {
+        return this.fittedMaxUncertainty;
+    }
+
+	public void setFittedMaxUncertainty(BigDecimal fittedMaxUncertainty) {
+        this.fittedMaxUncertainty = fittedMaxUncertainty;
+    }
+
+	public BigDecimal getFittedKiUncertainty() {
+        return this.fittedKiUncertainty;
+    }
+
+	public void setFittedKiUncertainty(BigDecimal fittedKiUncertainty) {
+        this.fittedKiUncertainty = fittedKiUncertainty;
+    }
+
+	public String getFittedMinUncertaintyType() {
+        return this.fittedMinUncertaintyType;
+    }
+
+	public void setFittedMinUncertaintyType(String fittedMinUncertaintyType) {
+        this.fittedMinUncertaintyType = fittedMinUncertaintyType;
+    }
+
+	public String getFittedMaxUncertaintyType() {
+        return this.fittedMaxUncertaintyType;
+    }
+
+	public void setFittedMaxUncertaintyType(String fittedMaxUncertaintyType) {
+        this.fittedMaxUncertaintyType = fittedMaxUncertaintyType;
+    }
+
+	public String getFittedKiUncertaintyType() {
+        return this.fittedKiUncertaintyType;
+    }
+
+	public void setFittedKiUncertaintyType(String fittedKiUncertaintyType) {
+        this.fittedKiUncertaintyType = fittedKiUncertaintyType;
+    }
+
+	public BigDecimal getSse() {
+        return this.sse;
+    }
+
+	public void setSse(BigDecimal sse) {
+        this.sse = sse;
+    }
+
+	public BigDecimal getSst() {
+        return this.sst;
+    }
+
+	public void setSst(BigDecimal sst) {
+        this.sst = sst;
+    }
+
+	public BigDecimal getRsquared() {
+        return this.rsquared;
+    }
+
+	public void setRsquared(BigDecimal rsquared) {
+        this.rsquared = rsquared;
+    }
+
+	public String getCurveErrorsClob() {
+        return this.curveErrorsClob;
+    }
+
+	public void setCurveErrorsClob(String curveErrorsClob) {
+        this.curveErrorsClob = curveErrorsClob;
+    }
+
+	public String getReportedValuesClob() {
+        return this.reportedValuesClob;
+    }
+
+	public void setReportedValuesClob(String reportedValuesClob) {
+        this.reportedValuesClob = reportedValuesClob;
+    }
+
+	public String getParameterStdErrorsClob() {
+        return this.parameterStdErrorsClob;
+    }
+
+	public void setParameterStdErrorsClob(String parameterStdErrorsClob) {
+        this.parameterStdErrorsClob = parameterStdErrorsClob;
+    }
+
+	public String getFitSettings() {
+        return this.fitSettings;
+    }
+
+	public void setFitSettings(String fitSettings) {
+        this.fitSettings = fitSettings;
+    }
+
+	public String getFitSummaryClob() {
+        return this.fitSummaryClob;
+    }
+
+	public void setFitSummaryClob(String fitSummaryClob) {
+        this.fitSummaryClob = fitSummaryClob;
+    }
+
+	public String getUserFlagStatus() {
+        return this.userFlagStatus;
+    }
+
+	public void setUserFlagStatus(String userFlagStatus) {
+        this.userFlagStatus = userFlagStatus;
+    }
+
+	public String getAlgorithmFlagStatus() {
+        return this.algorithmFlagStatus;
+    }
+
+	public void setAlgorithmFlagStatus(String algorithmFlagStatus) {
+        this.algorithmFlagStatus = algorithmFlagStatus;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static KiCurveFitDTO fromJsonToKiCurveFitDTO(String json) {
+        return new JSONDeserializer<KiCurveFitDTO>()
+        .use(null, KiCurveFitDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<KiCurveFitDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<KiCurveFitDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<KiCurveFitDTO> fromJsonArrayToKiCurveFitDTO(String json) {
+        return new JSONDeserializer<List<KiCurveFitDTO>>()
+        .use("values", KiCurveFitDTO.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/KiCurveFitDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/KiCurveFitDTO_Roo_JavaBean.aj
deleted file mode 100644
index ba1d771be..000000000
--- a/src/main/java/com/labsynch/labseer/dto/KiCurveFitDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,428 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.KiCurveFitDTO;
-import java.math.BigDecimal;
-import java.util.Date;
-
-privileged aspect KiCurveFitDTO_Roo_JavaBean {
-    
-    public String KiCurveFitDTO.getCurveId() {
-        return this.curveId;
-    }
-    
-    public void KiCurveFitDTO.setCurveId(String curveId) {
-        this.curveId = curveId;
-    }
-    
-    public String KiCurveFitDTO.getAnalysisGroupCode() {
-        return this.analysisGroupCode;
-    }
-    
-    public void KiCurveFitDTO.setAnalysisGroupCode(String analysisGroupCode) {
-        this.analysisGroupCode = analysisGroupCode;
-    }
-    
-    public String KiCurveFitDTO.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void KiCurveFitDTO.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public Date KiCurveFitDTO.getRecordedDate() {
-        return this.recordedDate;
-    }
-    
-    public void KiCurveFitDTO.setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
-    
-    public Long KiCurveFitDTO.getLsTransaction() {
-        return this.lsTransaction;
-    }
-    
-    public void KiCurveFitDTO.setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
-    
-    public String KiCurveFitDTO.getBatchCode() {
-        return this.batchCode;
-    }
-    
-    public void KiCurveFitDTO.setBatchCode(String batchCode) {
-        this.batchCode = batchCode;
-    }
-    
-    public String KiCurveFitDTO.getCategory() {
-        return this.category;
-    }
-    
-    public void KiCurveFitDTO.setCategory(String category) {
-        this.category = category;
-    }
-    
-    public String KiCurveFitDTO.getRenderingHint() {
-        return this.renderingHint;
-    }
-    
-    public void KiCurveFitDTO.setRenderingHint(String renderingHint) {
-        this.renderingHint = renderingHint;
-    }
-    
-    public String KiCurveFitDTO.getMin() {
-        return this.min;
-    }
-    
-    public void KiCurveFitDTO.setMin(String min) {
-        this.min = min;
-    }
-    
-    public String KiCurveFitDTO.getMax() {
-        return this.max;
-    }
-    
-    public void KiCurveFitDTO.setMax(String max) {
-        this.max = max;
-    }
-    
-    public String KiCurveFitDTO.getMinUnits() {
-        return this.minUnits;
-    }
-    
-    public void KiCurveFitDTO.setMinUnits(String minUnits) {
-        this.minUnits = minUnits;
-    }
-    
-    public String KiCurveFitDTO.getMaxUnits() {
-        return this.maxUnits;
-    }
-    
-    public void KiCurveFitDTO.setMaxUnits(String maxUnits) {
-        this.maxUnits = maxUnits;
-    }
-    
-    public String KiCurveFitDTO.getKi() {
-        return this.ki;
-    }
-    
-    public void KiCurveFitDTO.setKi(String ki) {
-        this.ki = ki;
-    }
-    
-    public String KiCurveFitDTO.getKiUnits() {
-        return this.kiUnits;
-    }
-    
-    public void KiCurveFitDTO.setKiUnits(String kiUnits) {
-        this.kiUnits = kiUnits;
-    }
-    
-    public BigDecimal KiCurveFitDTO.getLigandConc() {
-        return this.ligandConc;
-    }
-    
-    public void KiCurveFitDTO.setLigandConc(BigDecimal ligandConc) {
-        this.ligandConc = ligandConc;
-    }
-    
-    public String KiCurveFitDTO.getLigandConcUnits() {
-        return this.ligandConcUnits;
-    }
-    
-    public void KiCurveFitDTO.setLigandConcUnits(String ligandConcUnits) {
-        this.ligandConcUnits = ligandConcUnits;
-    }
-    
-    public BigDecimal KiCurveFitDTO.getKd() {
-        return this.kd;
-    }
-    
-    public void KiCurveFitDTO.setKd(BigDecimal kd) {
-        this.kd = kd;
-    }
-    
-    public String KiCurveFitDTO.getKdUnits() {
-        return this.kdUnits;
-    }
-    
-    public void KiCurveFitDTO.setKdUnits(String kdUnits) {
-        this.kdUnits = kdUnits;
-    }
-    
-    public BigDecimal KiCurveFitDTO.getMinUncertainty() {
-        return this.minUncertainty;
-    }
-    
-    public void KiCurveFitDTO.setMinUncertainty(BigDecimal minUncertainty) {
-        this.minUncertainty = minUncertainty;
-    }
-    
-    public BigDecimal KiCurveFitDTO.getMaxUncertainty() {
-        return this.maxUncertainty;
-    }
-    
-    public void KiCurveFitDTO.setMaxUncertainty(BigDecimal maxUncertainty) {
-        this.maxUncertainty = maxUncertainty;
-    }
-    
-    public BigDecimal KiCurveFitDTO.getKiUncertainty() {
-        return this.kiUncertainty;
-    }
-    
-    public void KiCurveFitDTO.setKiUncertainty(BigDecimal kiUncertainty) {
-        this.kiUncertainty = kiUncertainty;
-    }
-    
-    public BigDecimal KiCurveFitDTO.getLigandConcUncertainty() {
-        return this.ligandConcUncertainty;
-    }
-    
-    public void KiCurveFitDTO.setLigandConcUncertainty(BigDecimal ligandConcUncertainty) {
-        this.ligandConcUncertainty = ligandConcUncertainty;
-    }
-    
-    public BigDecimal KiCurveFitDTO.getKdUncertainty() {
-        return this.kdUncertainty;
-    }
-    
-    public void KiCurveFitDTO.setKdUncertainty(BigDecimal kdUncertainty) {
-        this.kdUncertainty = kdUncertainty;
-    }
-    
-    public String KiCurveFitDTO.getMinUncertaintyType() {
-        return this.minUncertaintyType;
-    }
-    
-    public void KiCurveFitDTO.setMinUncertaintyType(String minUncertaintyType) {
-        this.minUncertaintyType = minUncertaintyType;
-    }
-    
-    public String KiCurveFitDTO.getMaxUncertaintyType() {
-        return this.maxUncertaintyType;
-    }
-    
-    public void KiCurveFitDTO.setMaxUncertaintyType(String maxUncertaintyType) {
-        this.maxUncertaintyType = maxUncertaintyType;
-    }
-    
-    public String KiCurveFitDTO.getKiUncertaintyType() {
-        return this.kiUncertaintyType;
-    }
-    
-    public void KiCurveFitDTO.setKiUncertaintyType(String kiUncertaintyType) {
-        this.kiUncertaintyType = kiUncertaintyType;
-    }
-    
-    public String KiCurveFitDTO.getLigandConcUncertaintyType() {
-        return this.ligandConcUncertaintyType;
-    }
-    
-    public void KiCurveFitDTO.setLigandConcUncertaintyType(String ligandConcUncertaintyType) {
-        this.ligandConcUncertaintyType = ligandConcUncertaintyType;
-    }
-    
-    public String KiCurveFitDTO.getKdUncertaintyType() {
-        return this.kdUncertaintyType;
-    }
-    
-    public void KiCurveFitDTO.setKdUncertaintyType(String kdUncertaintyType) {
-        this.kdUncertaintyType = kdUncertaintyType;
-    }
-    
-    public String KiCurveFitDTO.getMinOperatorKind() {
-        return this.minOperatorKind;
-    }
-    
-    public void KiCurveFitDTO.setMinOperatorKind(String minOperatorKind) {
-        this.minOperatorKind = minOperatorKind;
-    }
-    
-    public String KiCurveFitDTO.getMaxOperatorKind() {
-        return this.maxOperatorKind;
-    }
-    
-    public void KiCurveFitDTO.setMaxOperatorKind(String maxOperatorKind) {
-        this.maxOperatorKind = maxOperatorKind;
-    }
-    
-    public String KiCurveFitDTO.getKiOperatorKind() {
-        return this.kiOperatorKind;
-    }
-    
-    public void KiCurveFitDTO.setKiOperatorKind(String kiOperatorKind) {
-        this.kiOperatorKind = kiOperatorKind;
-    }
-    
-    public String KiCurveFitDTO.getLigandConcOperatorKind() {
-        return this.ligandConcOperatorKind;
-    }
-    
-    public void KiCurveFitDTO.setLigandConcOperatorKind(String ligandConcOperatorKind) {
-        this.ligandConcOperatorKind = ligandConcOperatorKind;
-    }
-    
-    public String KiCurveFitDTO.getKdOperatorKind() {
-        return this.kdOperatorKind;
-    }
-    
-    public void KiCurveFitDTO.setKdOperatorKind(String kdOperatorKind) {
-        this.kdOperatorKind = kdOperatorKind;
-    }
-    
-    public BigDecimal KiCurveFitDTO.getFittedMin() {
-        return this.fittedMin;
-    }
-    
-    public void KiCurveFitDTO.setFittedMin(BigDecimal fittedMin) {
-        this.fittedMin = fittedMin;
-    }
-    
-    public BigDecimal KiCurveFitDTO.getFittedMax() {
-        return this.fittedMax;
-    }
-    
-    public void KiCurveFitDTO.setFittedMax(BigDecimal fittedMax) {
-        this.fittedMax = fittedMax;
-    }
-    
-    public BigDecimal KiCurveFitDTO.getFittedKi() {
-        return this.fittedKi;
-    }
-    
-    public void KiCurveFitDTO.setFittedKi(BigDecimal fittedKi) {
-        this.fittedKi = fittedKi;
-    }
-    
-    public BigDecimal KiCurveFitDTO.getFittedMinUncertainty() {
-        return this.fittedMinUncertainty;
-    }
-    
-    public void KiCurveFitDTO.setFittedMinUncertainty(BigDecimal fittedMinUncertainty) {
-        this.fittedMinUncertainty = fittedMinUncertainty;
-    }
-    
-    public BigDecimal KiCurveFitDTO.getFittedMaxUncertainty() {
-        return this.fittedMaxUncertainty;
-    }
-    
-    public void KiCurveFitDTO.setFittedMaxUncertainty(BigDecimal fittedMaxUncertainty) {
-        this.fittedMaxUncertainty = fittedMaxUncertainty;
-    }
-    
-    public BigDecimal KiCurveFitDTO.getFittedKiUncertainty() {
-        return this.fittedKiUncertainty;
-    }
-    
-    public void KiCurveFitDTO.setFittedKiUncertainty(BigDecimal fittedKiUncertainty) {
-        this.fittedKiUncertainty = fittedKiUncertainty;
-    }
-    
-    public String KiCurveFitDTO.getFittedMinUncertaintyType() {
-        return this.fittedMinUncertaintyType;
-    }
-    
-    public void KiCurveFitDTO.setFittedMinUncertaintyType(String fittedMinUncertaintyType) {
-        this.fittedMinUncertaintyType = fittedMinUncertaintyType;
-    }
-    
-    public String KiCurveFitDTO.getFittedMaxUncertaintyType() {
-        return this.fittedMaxUncertaintyType;
-    }
-    
-    public void KiCurveFitDTO.setFittedMaxUncertaintyType(String fittedMaxUncertaintyType) {
-        this.fittedMaxUncertaintyType = fittedMaxUncertaintyType;
-    }
-    
-    public String KiCurveFitDTO.getFittedKiUncertaintyType() {
-        return this.fittedKiUncertaintyType;
-    }
-    
-    public void KiCurveFitDTO.setFittedKiUncertaintyType(String fittedKiUncertaintyType) {
-        this.fittedKiUncertaintyType = fittedKiUncertaintyType;
-    }
-    
-    public BigDecimal KiCurveFitDTO.getSse() {
-        return this.sse;
-    }
-    
-    public void KiCurveFitDTO.setSse(BigDecimal sse) {
-        this.sse = sse;
-    }
-    
-    public BigDecimal KiCurveFitDTO.getSst() {
-        return this.sst;
-    }
-    
-    public void KiCurveFitDTO.setSst(BigDecimal sst) {
-        this.sst = sst;
-    }
-    
-    public BigDecimal KiCurveFitDTO.getRsquared() {
-        return this.rsquared;
-    }
-    
-    public void KiCurveFitDTO.setRsquared(BigDecimal rsquared) {
-        this.rsquared = rsquared;
-    }
-    
-    public String KiCurveFitDTO.getCurveErrorsClob() {
-        return this.curveErrorsClob;
-    }
-    
-    public void KiCurveFitDTO.setCurveErrorsClob(String curveErrorsClob) {
-        this.curveErrorsClob = curveErrorsClob;
-    }
-    
-    public String KiCurveFitDTO.getReportedValuesClob() {
-        return this.reportedValuesClob;
-    }
-    
-    public void KiCurveFitDTO.setReportedValuesClob(String reportedValuesClob) {
-        this.reportedValuesClob = reportedValuesClob;
-    }
-    
-    public String KiCurveFitDTO.getParameterStdErrorsClob() {
-        return this.parameterStdErrorsClob;
-    }
-    
-    public void KiCurveFitDTO.setParameterStdErrorsClob(String parameterStdErrorsClob) {
-        this.parameterStdErrorsClob = parameterStdErrorsClob;
-    }
-    
-    public String KiCurveFitDTO.getFitSettings() {
-        return this.fitSettings;
-    }
-    
-    public void KiCurveFitDTO.setFitSettings(String fitSettings) {
-        this.fitSettings = fitSettings;
-    }
-    
-    public String KiCurveFitDTO.getFitSummaryClob() {
-        return this.fitSummaryClob;
-    }
-    
-    public void KiCurveFitDTO.setFitSummaryClob(String fitSummaryClob) {
-        this.fitSummaryClob = fitSummaryClob;
-    }
-    
-    public String KiCurveFitDTO.getUserFlagStatus() {
-        return this.userFlagStatus;
-    }
-    
-    public void KiCurveFitDTO.setUserFlagStatus(String userFlagStatus) {
-        this.userFlagStatus = userFlagStatus;
-    }
-    
-    public String KiCurveFitDTO.getAlgorithmFlagStatus() {
-        return this.algorithmFlagStatus;
-    }
-    
-    public void KiCurveFitDTO.setAlgorithmFlagStatus(String algorithmFlagStatus) {
-        this.algorithmFlagStatus = algorithmFlagStatus;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/KiCurveFitDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/KiCurveFitDTO_Roo_Json.aj
deleted file mode 100644
index a4824b1f3..000000000
--- a/src/main/java/com/labsynch/labseer/dto/KiCurveFitDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.KiCurveFitDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect KiCurveFitDTO_Roo_Json {
-    
-    public String KiCurveFitDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String KiCurveFitDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static KiCurveFitDTO KiCurveFitDTO.fromJsonToKiCurveFitDTO(String json) {
-        return new JSONDeserializer<KiCurveFitDTO>()
-        .use(null, KiCurveFitDTO.class).deserialize(json);
-    }
-    
-    public static String KiCurveFitDTO.toJsonArray(Collection<KiCurveFitDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String KiCurveFitDTO.toJsonArray(Collection<KiCurveFitDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<KiCurveFitDTO> KiCurveFitDTO.fromJsonArrayToKiCurveFitDTO(String json) {
-        return new JSONDeserializer<List<KiCurveFitDTO>>()
-        .use("values", KiCurveFitDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/KiCurveFitDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/KiCurveFitDTO_Roo_ToString.aj
deleted file mode 100644
index 8ff5c8810..000000000
--- a/src/main/java/com/labsynch/labseer/dto/KiCurveFitDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.KiCurveFitDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect KiCurveFitDTO_Roo_ToString {
-    
-    public String KiCurveFitDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LabelPrefixDTO.java b/src/main/java/com/labsynch/labseer/dto/LabelPrefixDTO.java
index 06e06a9f5..817dc64fb 100644
--- a/src/main/java/com/labsynch/labseer/dto/LabelPrefixDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LabelPrefixDTO.java
@@ -1,10 +1,14 @@
 package com.labsynch.labseer.dto;
 
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 
 @RooJavaBean
 @RooToString
@@ -31,4 +35,102 @@ public class LabelPrefixDTO {
 	public String toSafeJson() {
 		return new JSONSerializer().exclude("*.class", "id", "code", "name", "ignore").serialize(this);
 	}
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static LabelPrefixDTO fromJsonToLabelPrefixDTO(String json) {
+        return new JSONDeserializer<LabelPrefixDTO>()
+        .use(null, LabelPrefixDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<LabelPrefixDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<LabelPrefixDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<LabelPrefixDTO> fromJsonArrayToLabelPrefixDTO(String json) {
+        return new JSONDeserializer<List<LabelPrefixDTO>>()
+        .use("values", LabelPrefixDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public String getCode() {
+        return this.code;
+    }
+
+	public void setCode(String code) {
+        this.code = code;
+    }
+
+	public String getName() {
+        return this.name;
+    }
+
+	public void setName(String name) {
+        this.name = name;
+    }
+
+	public Boolean getIgnore() {
+        return this.ignore;
+    }
+
+	public void setIgnore(Boolean ignore) {
+        this.ignore = ignore;
+    }
+
+	public String getLabelTypeAndKind() {
+        return this.labelTypeAndKind;
+    }
+
+	public void setLabelTypeAndKind(String labelTypeAndKind) {
+        this.labelTypeAndKind = labelTypeAndKind;
+    }
+
+	public String getThingTypeAndKind() {
+        return this.thingTypeAndKind;
+    }
+
+	public void setThingTypeAndKind(String thingTypeAndKind) {
+        this.thingTypeAndKind = thingTypeAndKind;
+    }
+
+	public String getLabelPrefix() {
+        return this.labelPrefix;
+    }
+
+	public void setLabelPrefix(String labelPrefix) {
+        this.labelPrefix = labelPrefix;
+    }
+
+	public Long getNumberOfLabels() {
+        return this.numberOfLabels;
+    }
+
+	public void setNumberOfLabels(Long numberOfLabels) {
+        this.numberOfLabels = numberOfLabels;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/LabelPrefixDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/LabelPrefixDTO_Roo_JavaBean.aj
deleted file mode 100644
index efa427aa5..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LabelPrefixDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,74 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LabelPrefixDTO;
-
-privileged aspect LabelPrefixDTO_Roo_JavaBean {
-    
-    public Long LabelPrefixDTO.getId() {
-        return this.id;
-    }
-    
-    public void LabelPrefixDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-    public String LabelPrefixDTO.getCode() {
-        return this.code;
-    }
-    
-    public void LabelPrefixDTO.setCode(String code) {
-        this.code = code;
-    }
-    
-    public String LabelPrefixDTO.getName() {
-        return this.name;
-    }
-    
-    public void LabelPrefixDTO.setName(String name) {
-        this.name = name;
-    }
-    
-    public Boolean LabelPrefixDTO.getIgnore() {
-        return this.ignore;
-    }
-    
-    public void LabelPrefixDTO.setIgnore(Boolean ignore) {
-        this.ignore = ignore;
-    }
-    
-    public String LabelPrefixDTO.getLabelTypeAndKind() {
-        return this.labelTypeAndKind;
-    }
-    
-    public void LabelPrefixDTO.setLabelTypeAndKind(String labelTypeAndKind) {
-        this.labelTypeAndKind = labelTypeAndKind;
-    }
-    
-    public String LabelPrefixDTO.getThingTypeAndKind() {
-        return this.thingTypeAndKind;
-    }
-    
-    public void LabelPrefixDTO.setThingTypeAndKind(String thingTypeAndKind) {
-        this.thingTypeAndKind = thingTypeAndKind;
-    }
-    
-    public String LabelPrefixDTO.getLabelPrefix() {
-        return this.labelPrefix;
-    }
-    
-    public void LabelPrefixDTO.setLabelPrefix(String labelPrefix) {
-        this.labelPrefix = labelPrefix;
-    }
-    
-    public Long LabelPrefixDTO.getNumberOfLabels() {
-        return this.numberOfLabels;
-    }
-    
-    public void LabelPrefixDTO.setNumberOfLabels(Long numberOfLabels) {
-        this.numberOfLabels = numberOfLabels;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LabelPrefixDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/LabelPrefixDTO_Roo_Json.aj
deleted file mode 100644
index bb86837d1..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LabelPrefixDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LabelPrefixDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect LabelPrefixDTO_Roo_Json {
-    
-    public String LabelPrefixDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String LabelPrefixDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static LabelPrefixDTO LabelPrefixDTO.fromJsonToLabelPrefixDTO(String json) {
-        return new JSONDeserializer<LabelPrefixDTO>()
-        .use(null, LabelPrefixDTO.class).deserialize(json);
-    }
-    
-    public static String LabelPrefixDTO.toJsonArray(Collection<LabelPrefixDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String LabelPrefixDTO.toJsonArray(Collection<LabelPrefixDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<LabelPrefixDTO> LabelPrefixDTO.fromJsonArrayToLabelPrefixDTO(String json) {
-        return new JSONDeserializer<List<LabelPrefixDTO>>()
-        .use("values", LabelPrefixDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LabelPrefixDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/LabelPrefixDTO_Roo_ToString.aj
deleted file mode 100644
index 586284c91..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LabelPrefixDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LabelPrefixDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect LabelPrefixDTO_Roo_ToString {
-    
-    public String LabelPrefixDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LabelQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/LabelQueryDTO.java
index fcec692e8..cbe07c821 100644
--- a/src/main/java/com/labsynch/labseer/dto/LabelQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LabelQueryDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -17,4 +23,70 @@ public class LabelQueryDTO {
 	public LabelQueryDTO(){
 		
 	}
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static LabelQueryDTO fromJsonToLabelQueryDTO(String json) {
+        return new JSONDeserializer<LabelQueryDTO>()
+        .use(null, LabelQueryDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<LabelQueryDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<LabelQueryDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<LabelQueryDTO> fromJsonArrayToLabelQueryDTO(String json) {
+        return new JSONDeserializer<List<LabelQueryDTO>>()
+        .use("values", LabelQueryDTO.class).deserialize(json);
+    }
+
+	public String getLabelText() {
+        return this.labelText;
+    }
+
+	public void setLabelText(String labelText) {
+        this.labelText = labelText;
+    }
+
+	public String getLabelType() {
+        return this.labelType;
+    }
+
+	public void setLabelType(String labelType) {
+        this.labelType = labelType;
+    }
+
+	public String getLabelKind() {
+        return this.labelKind;
+    }
+
+	public void setLabelKind(String labelKind) {
+        this.labelKind = labelKind;
+    }
+
+	public String getOperator() {
+        return this.operator;
+    }
+
+	public void setOperator(String operator) {
+        this.operator = operator;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/LabelQueryDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/LabelQueryDTO_Roo_JavaBean.aj
deleted file mode 100644
index 86d514e25..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LabelQueryDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,42 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LabelQueryDTO;
-
-privileged aspect LabelQueryDTO_Roo_JavaBean {
-    
-    public String LabelQueryDTO.getLabelText() {
-        return this.labelText;
-    }
-    
-    public void LabelQueryDTO.setLabelText(String labelText) {
-        this.labelText = labelText;
-    }
-    
-    public String LabelQueryDTO.getLabelType() {
-        return this.labelType;
-    }
-    
-    public void LabelQueryDTO.setLabelType(String labelType) {
-        this.labelType = labelType;
-    }
-    
-    public String LabelQueryDTO.getLabelKind() {
-        return this.labelKind;
-    }
-    
-    public void LabelQueryDTO.setLabelKind(String labelKind) {
-        this.labelKind = labelKind;
-    }
-    
-    public String LabelQueryDTO.getOperator() {
-        return this.operator;
-    }
-    
-    public void LabelQueryDTO.setOperator(String operator) {
-        this.operator = operator;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LabelQueryDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/LabelQueryDTO_Roo_Json.aj
deleted file mode 100644
index 2568c8aa5..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LabelQueryDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LabelQueryDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect LabelQueryDTO_Roo_Json {
-    
-    public String LabelQueryDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String LabelQueryDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static LabelQueryDTO LabelQueryDTO.fromJsonToLabelQueryDTO(String json) {
-        return new JSONDeserializer<LabelQueryDTO>()
-        .use(null, LabelQueryDTO.class).deserialize(json);
-    }
-    
-    public static String LabelQueryDTO.toJsonArray(Collection<LabelQueryDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String LabelQueryDTO.toJsonArray(Collection<LabelQueryDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<LabelQueryDTO> LabelQueryDTO.fromJsonArrayToLabelQueryDTO(String json) {
-        return new JSONDeserializer<List<LabelQueryDTO>>()
-        .use("values", LabelQueryDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LabelQueryDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/LabelQueryDTO_Roo_ToString.aj
deleted file mode 100644
index 1fd1c4956..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LabelQueryDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LabelQueryDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect LabelQueryDTO_Roo_ToString {
-    
-    public String LabelQueryDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LabelSequenceDTO.java b/src/main/java/com/labsynch/labseer/dto/LabelSequenceDTO.java
index 27e083570..a3f2e02dd 100755
--- a/src/main/java/com/labsynch/labseer/dto/LabelSequenceDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LabelSequenceDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -25,4 +31,102 @@ public class LabelSequenceDTO {
 
     private Long startingNumber;
 
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static LabelSequenceDTO fromJsonToLabelSequenceDTO(String json) {
+        return new JSONDeserializer<LabelSequenceDTO>()
+        .use(null, LabelSequenceDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<LabelSequenceDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<LabelSequenceDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<LabelSequenceDTO> fromJsonArrayToLabelSequenceDTO(String json) {
+        return new JSONDeserializer<List<LabelSequenceDTO>>()
+        .use("values", LabelSequenceDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public Long getNumberOfLabels() {
+        return this.numberOfLabels;
+    }
+
+	public void setNumberOfLabels(Long numberOfLabels) {
+        this.numberOfLabels = numberOfLabels;
+    }
+
+	public String getThingTypeAndKind() {
+        return this.thingTypeAndKind;
+    }
+
+	public void setThingTypeAndKind(String thingTypeAndKind) {
+        this.thingTypeAndKind = thingTypeAndKind;
+    }
+
+	public String getLabelTypeAndKind() {
+        return this.labelTypeAndKind;
+    }
+
+	public void setLabelTypeAndKind(String labelTypeAndKind) {
+        this.labelTypeAndKind = labelTypeAndKind;
+    }
+
+	public String getLabelPrefix() {
+        return this.labelPrefix;
+    }
+
+	public void setLabelPrefix(String labelPrefix) {
+        this.labelPrefix = labelPrefix;
+    }
+
+	public String getLabelSeparator() {
+        return this.labelSeparator;
+    }
+
+	public void setLabelSeparator(String labelSeparator) {
+        this.labelSeparator = labelSeparator;
+    }
+
+	public boolean isGroupDigits() {
+        return this.groupDigits;
+    }
+
+	public void setGroupDigits(boolean groupDigits) {
+        this.groupDigits = groupDigits;
+    }
+
+	public Integer getDigits() {
+        return this.digits;
+    }
+
+	public void setDigits(Integer digits) {
+        this.digits = digits;
+    }
+
+	public Long getStartingNumber() {
+        return this.startingNumber;
+    }
+
+	public void setStartingNumber(Long startingNumber) {
+        this.startingNumber = startingNumber;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/LabelSequenceDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/LabelSequenceDTO_Roo_JavaBean.aj
deleted file mode 100755
index 12400b58f..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LabelSequenceDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,74 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LabelSequenceDTO;
-
-privileged aspect LabelSequenceDTO_Roo_JavaBean {
-    
-    public Long LabelSequenceDTO.getNumberOfLabels() {
-        return this.numberOfLabels;
-    }
-    
-    public void LabelSequenceDTO.setNumberOfLabels(Long numberOfLabels) {
-        this.numberOfLabels = numberOfLabels;
-    }
-    
-    public String LabelSequenceDTO.getThingTypeAndKind() {
-        return this.thingTypeAndKind;
-    }
-    
-    public void LabelSequenceDTO.setThingTypeAndKind(String thingTypeAndKind) {
-        this.thingTypeAndKind = thingTypeAndKind;
-    }
-    
-    public String LabelSequenceDTO.getLabelTypeAndKind() {
-        return this.labelTypeAndKind;
-    }
-    
-    public void LabelSequenceDTO.setLabelTypeAndKind(String labelTypeAndKind) {
-        this.labelTypeAndKind = labelTypeAndKind;
-    }
-    
-    public String LabelSequenceDTO.getLabelPrefix() {
-        return this.labelPrefix;
-    }
-    
-    public void LabelSequenceDTO.setLabelPrefix(String labelPrefix) {
-        this.labelPrefix = labelPrefix;
-    }
-    
-    public String LabelSequenceDTO.getLabelSeparator() {
-        return this.labelSeparator;
-    }
-    
-    public void LabelSequenceDTO.setLabelSeparator(String labelSeparator) {
-        this.labelSeparator = labelSeparator;
-    }
-    
-    public boolean LabelSequenceDTO.isGroupDigits() {
-        return this.groupDigits;
-    }
-    
-    public void LabelSequenceDTO.setGroupDigits(boolean groupDigits) {
-        this.groupDigits = groupDigits;
-    }
-    
-    public Integer LabelSequenceDTO.getDigits() {
-        return this.digits;
-    }
-    
-    public void LabelSequenceDTO.setDigits(Integer digits) {
-        this.digits = digits;
-    }
-    
-    public Long LabelSequenceDTO.getStartingNumber() {
-        return this.startingNumber;
-    }
-    
-    public void LabelSequenceDTO.setStartingNumber(Long startingNumber) {
-        this.startingNumber = startingNumber;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LabelSequenceDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/LabelSequenceDTO_Roo_Json.aj
deleted file mode 100755
index bdc8e966e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LabelSequenceDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LabelSequenceDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect LabelSequenceDTO_Roo_Json {
-    
-    public String LabelSequenceDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String LabelSequenceDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static LabelSequenceDTO LabelSequenceDTO.fromJsonToLabelSequenceDTO(String json) {
-        return new JSONDeserializer<LabelSequenceDTO>()
-        .use(null, LabelSequenceDTO.class).deserialize(json);
-    }
-    
-    public static String LabelSequenceDTO.toJsonArray(Collection<LabelSequenceDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String LabelSequenceDTO.toJsonArray(Collection<LabelSequenceDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<LabelSequenceDTO> LabelSequenceDTO.fromJsonArrayToLabelSequenceDTO(String json) {
-        return new JSONDeserializer<List<LabelSequenceDTO>>()
-        .use("values", LabelSequenceDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LabelSequenceDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/LabelSequenceDTO_Roo_ToString.aj
deleted file mode 100755
index 043f638a6..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LabelSequenceDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LabelSequenceDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect LabelSequenceDTO_Roo_ToString {
-    
-    public String LabelSequenceDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LicenseDTO.java b/src/main/java/com/labsynch/labseer/dto/LicenseDTO.java
index 05284e15b..f134c5afe 100644
--- a/src/main/java/com/labsynch/labseer/dto/LicenseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LicenseDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -29,6 +35,96 @@ public LicenseDTO() {
 
 	
 
+
+	public String getLicensee() {
+        return this.licensee;
+    }
+
+	public void setLicensee(String licensee) {
+        this.licensee = licensee;
+    }
+
+	public String getValidDateString() {
+        return this.validDateString;
+    }
+
+	public void setValidDateString(String validDateString) {
+        this.validDateString = validDateString;
+    }
+
+	public boolean isValid() {
+        return this.valid;
+    }
+
+	public void setValid(boolean valid) {
+        this.valid = valid;
+    }
+
+	public String getEdition() {
+        return this.edition;
+    }
+
+	public void setEdition(String edition) {
+        this.edition = edition;
+    }
+
+	public String getFeatures() {
+        return this.features;
+    }
+
+	public void setFeatures(String features) {
+        this.features = features;
+    }
+
+	public Integer getNumberOfUsers() {
+        return this.numberOfUsers;
+    }
+
+	public void setNumberOfUsers(Integer numberOfUsers) {
+        this.numberOfUsers = numberOfUsers;
+    }
+
+	public Integer getNumberOfDaysLeft() {
+        return this.numberOfDaysLeft;
+    }
+
+	public void setNumberOfDaysLeft(Integer numberOfDaysLeft) {
+        this.numberOfDaysLeft = numberOfDaysLeft;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static LicenseDTO fromJsonToLicenseDTO(String json) {
+        return new JSONDeserializer<LicenseDTO>()
+        .use(null, LicenseDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<LicenseDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<LicenseDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<LicenseDTO> fromJsonArrayToLicenseDTO(String json) {
+        return new JSONDeserializer<List<LicenseDTO>>()
+        .use("values", LicenseDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/LicenseDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/LicenseDTO_Roo_JavaBean.aj
deleted file mode 100644
index ce5be1aac..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LicenseDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,66 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LicenseDTO;
-
-privileged aspect LicenseDTO_Roo_JavaBean {
-    
-    public String LicenseDTO.getLicensee() {
-        return this.licensee;
-    }
-    
-    public void LicenseDTO.setLicensee(String licensee) {
-        this.licensee = licensee;
-    }
-    
-    public String LicenseDTO.getValidDateString() {
-        return this.validDateString;
-    }
-    
-    public void LicenseDTO.setValidDateString(String validDateString) {
-        this.validDateString = validDateString;
-    }
-    
-    public boolean LicenseDTO.isValid() {
-        return this.valid;
-    }
-    
-    public void LicenseDTO.setValid(boolean valid) {
-        this.valid = valid;
-    }
-    
-    public String LicenseDTO.getEdition() {
-        return this.edition;
-    }
-    
-    public void LicenseDTO.setEdition(String edition) {
-        this.edition = edition;
-    }
-    
-    public String LicenseDTO.getFeatures() {
-        return this.features;
-    }
-    
-    public void LicenseDTO.setFeatures(String features) {
-        this.features = features;
-    }
-    
-    public Integer LicenseDTO.getNumberOfUsers() {
-        return this.numberOfUsers;
-    }
-    
-    public void LicenseDTO.setNumberOfUsers(Integer numberOfUsers) {
-        this.numberOfUsers = numberOfUsers;
-    }
-    
-    public Integer LicenseDTO.getNumberOfDaysLeft() {
-        return this.numberOfDaysLeft;
-    }
-    
-    public void LicenseDTO.setNumberOfDaysLeft(Integer numberOfDaysLeft) {
-        this.numberOfDaysLeft = numberOfDaysLeft;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LicenseDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/LicenseDTO_Roo_Json.aj
deleted file mode 100644
index 80f6d6eef..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LicenseDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LicenseDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect LicenseDTO_Roo_Json {
-    
-    public String LicenseDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String LicenseDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static LicenseDTO LicenseDTO.fromJsonToLicenseDTO(String json) {
-        return new JSONDeserializer<LicenseDTO>()
-        .use(null, LicenseDTO.class).deserialize(json);
-    }
-    
-    public static String LicenseDTO.toJsonArray(Collection<LicenseDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String LicenseDTO.toJsonArray(Collection<LicenseDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<LicenseDTO> LicenseDTO.fromJsonArrayToLicenseDTO(String json) {
-        return new JSONDeserializer<List<LicenseDTO>>()
-        .use("values", LicenseDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LicenseDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/LicenseDTO_Roo_ToString.aj
deleted file mode 100644
index fc7c58bee..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LicenseDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LicenseDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect LicenseDTO_Roo_ToString {
-    
-    public String LicenseDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LotAliasDTO.java b/src/main/java/com/labsynch/labseer/dto/LotAliasDTO.java
index ef7224374..3a8bc55e7 100644
--- a/src/main/java/com/labsynch/labseer/dto/LotAliasDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LotAliasDTO.java
@@ -2,14 +2,18 @@
 
 import java.util.Collection;
 import java.util.HashSet;
-
+import java.util.List;
 import javax.persistence.NoResultException;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.LotAlias;
 import com.labsynch.labseer.domain.ParentAlias;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
 @RooJavaBean
 @RooToString
@@ -65,4 +69,78 @@ public static Collection<LotAliasDTO> getLotsByAlias(Collection<LotAliasDTO> lot
 	}
     
    
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static LotAliasDTO fromJsonToLotAliasDTO(String json) {
+        return new JSONDeserializer<LotAliasDTO>()
+        .use(null, LotAliasDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<LotAliasDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<LotAliasDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<LotAliasDTO> fromJsonArrayToLoes(String json) {
+        return new JSONDeserializer<List<LotAliasDTO>>()
+        .use("values", LotAliasDTO.class).deserialize(json);
+    }
+
+	public String getLotCorpName() {
+        return this.lotCorpName;
+    }
+
+	public void setLotCorpName(String lotCorpName) {
+        this.lotCorpName = lotCorpName;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getAliasName() {
+        return this.aliasName;
+    }
+
+	public void setAliasName(String aliasName) {
+        this.aliasName = aliasName;
+    }
+
+	public boolean isPreferred() {
+        return this.preferred;
+    }
+
+	public void setPreferred(boolean preferred) {
+        this.preferred = preferred;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/LotAliasDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/LotAliasDTO_Roo_JavaBean.aj
deleted file mode 100644
index b7d4c3f8c..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LotAliasDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,50 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LotAliasDTO;
-
-privileged aspect LotAliasDTO_Roo_JavaBean {
-    
-    public String LotAliasDTO.getLotCorpName() {
-        return this.lotCorpName;
-    }
-    
-    public void LotAliasDTO.setLotCorpName(String lotCorpName) {
-        this.lotCorpName = lotCorpName;
-    }
-    
-    public String LotAliasDTO.getLsType() {
-        return this.lsType;
-    }
-    
-    public void LotAliasDTO.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String LotAliasDTO.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void LotAliasDTO.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String LotAliasDTO.getAliasName() {
-        return this.aliasName;
-    }
-    
-    public void LotAliasDTO.setAliasName(String aliasName) {
-        this.aliasName = aliasName;
-    }
-    
-    public boolean LotAliasDTO.isPreferred() {
-        return this.preferred;
-    }
-    
-    public void LotAliasDTO.setPreferred(boolean preferred) {
-        this.preferred = preferred;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LotAliasDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/LotAliasDTO_Roo_Json.aj
deleted file mode 100644
index aa87d4c2f..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LotAliasDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LotAliasDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect LotAliasDTO_Roo_Json {
-    
-    public String LotAliasDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String LotAliasDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static LotAliasDTO LotAliasDTO.fromJsonToLotAliasDTO(String json) {
-        return new JSONDeserializer<LotAliasDTO>()
-        .use(null, LotAliasDTO.class).deserialize(json);
-    }
-    
-    public static String LotAliasDTO.toJsonArray(Collection<LotAliasDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String LotAliasDTO.toJsonArray(Collection<LotAliasDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<LotAliasDTO> LotAliasDTO.fromJsonArrayToLoes(String json) {
-        return new JSONDeserializer<List<LotAliasDTO>>()
-        .use("values", LotAliasDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LotAliasDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/LotAliasDTO_Roo_ToString.aj
deleted file mode 100644
index 29ee0beb7..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LotAliasDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LotAliasDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect LotAliasDTO_Roo_ToString {
-    
-    public String LotAliasDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LotDTO.java b/src/main/java/com/labsynch/labseer/dto/LotDTO.java
index f810d1c03..1149d6c8b 100755
--- a/src/main/java/com/labsynch/labseer/dto/LotDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LotDTO.java
@@ -1,14 +1,17 @@
 package com.labsynch.labseer.dto;
 
+import java.util.Collection;
 import java.util.Date;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import javax.persistence.Lob;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.roo.addon.javabean.RooJavaBean;
@@ -25,6 +28,8 @@
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
 import com.labsynch.labseer.service.ChemStructureService;
 import com.labsynch.labseer.utils.MoleculeUtil;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
 @RooJavaBean
 @RooToString
@@ -209,4 +214,598 @@ public LotDTO(Lot lot){
 	public LotDTO() {
 		// Empty constructor
 	}
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Double getAbsorbance() {
+        return this.absorbance;
+    }
+
+	public void setAbsorbance(Double absorbance) {
+        this.absorbance = absorbance;
+    }
+
+	public Double getAmount() {
+        return this.amount;
+    }
+
+	public void setAmount(Double amount) {
+        this.amount = amount;
+    }
+
+	public String getAmountUnitsCode() {
+        return this.amountUnitsCode;
+    }
+
+	public void setAmountUnitsCode(String amountUnitsCode) {
+        this.amountUnitsCode = amountUnitsCode;
+    }
+
+	public String getBarcode() {
+        return this.barcode;
+    }
+
+	public void setBarcode(String barcode) {
+        this.barcode = barcode;
+    }
+
+	public Double getBoilingPoint() {
+        return this.boilingPoint;
+    }
+
+	public void setBoilingPoint(Double boilingPoint) {
+        this.boilingPoint = boilingPoint;
+    }
+
+	public Long getBuid() {
+        return this.buid;
+    }
+
+	public void setBuid(Long buid) {
+        this.buid = buid;
+    }
+
+	public String getBulkLoadFile() {
+        return this.bulkLoadFile;
+    }
+
+	public void setBulkLoadFile(String bulkLoadFile) {
+        this.bulkLoadFile = bulkLoadFile;
+    }
+
+	public String getChemist() {
+        return this.chemist;
+    }
+
+	public void setChemist(String chemist) {
+        this.chemist = chemist;
+    }
+
+	public String getColor() {
+        return this.color;
+    }
+
+	public void setColor(String color) {
+        this.color = color;
+    }
+
+	public String getComments() {
+        return this.comments;
+    }
+
+	public void setComments(String comments) {
+        this.comments = comments;
+    }
+
+	public String getLotCorpName() {
+        return this.lotCorpName;
+    }
+
+	public void setLotCorpName(String lotCorpName) {
+        this.lotCorpName = lotCorpName;
+    }
+
+	public Boolean getIsVirtual() {
+        return this.isVirtual;
+    }
+
+	public void setIsVirtual(Boolean isVirtual) {
+        this.isVirtual = isVirtual;
+    }
+
+	public Double getLambda() {
+        return this.lambda;
+    }
+
+	public void setLambda(Double lambda) {
+        this.lambda = lambda;
+    }
+
+	public String getLotAliases() {
+        return this.lotAliases;
+    }
+
+	public void setLotAliases(String lotAliases) {
+        this.lotAliases = lotAliases;
+    }
+
+	public Double getLotMolWeight() {
+        return this.lotMolWeight;
+    }
+
+	public void setLotMolWeight(Double lotMolWeight) {
+        this.lotMolWeight = lotMolWeight;
+    }
+
+	public Integer getLotNumber() {
+        return this.lotNumber;
+    }
+
+	public void setLotNumber(Integer lotNumber) {
+        this.lotNumber = lotNumber;
+    }
+
+	public Double getMeltingPoint() {
+        return this.meltingPoint;
+    }
+
+	public void setMeltingPoint(Double meltingPoint) {
+        this.meltingPoint = meltingPoint;
+    }
+
+	public String getModifiedBy() {
+        return this.modifiedBy;
+    }
+
+	public void setModifiedBy(String modifiedBy) {
+        this.modifiedBy = modifiedBy;
+    }
+
+	public Date getModifiedDate() {
+        return this.modifiedDate;
+    }
+
+	public void setModifiedDate(Date modifiedDate) {
+        this.modifiedDate = modifiedDate;
+    }
+
+	public String getNotebookPage() {
+        return this.notebookPage;
+    }
+
+	public void setNotebookPage(String notebookPage) {
+        this.notebookPage = notebookPage;
+    }
+
+	public Double getObservedMassOne() {
+        return this.observedMassOne;
+    }
+
+	public void setObservedMassOne(Double observedMassOne) {
+        this.observedMassOne = observedMassOne;
+    }
+
+	public Double getObservedMassTwo() {
+        return this.observedMassTwo;
+    }
+
+	public void setObservedMassTwo(Double observedMassTwo) {
+        this.observedMassTwo = observedMassTwo;
+    }
+
+	public Double getPercentEE() {
+        return this.percentEE;
+    }
+
+	public void setPercentEE(Double percentEE) {
+        this.percentEE = percentEE;
+    }
+
+	public String getPhysicalStateCode() {
+        return this.physicalStateCode;
+    }
+
+	public void setPhysicalStateCode(String physicalStateCode) {
+        this.physicalStateCode = physicalStateCode;
+    }
+
+	public String getProject() {
+        return this.project;
+    }
+
+	public void setProject(String project) {
+        this.project = project;
+    }
+
+	public Double getPurity() {
+        return this.purity;
+    }
+
+	public void setPurity(Double purity) {
+        this.purity = purity;
+    }
+
+	public String getPurityMeasuredByCode() {
+        return this.purityMeasuredByCode;
+    }
+
+	public void setPurityMeasuredByCode(String purityMeasuredByCode) {
+        this.purityMeasuredByCode = purityMeasuredByCode;
+    }
+
+	public String getPurityOperatorCode() {
+        return this.purityOperatorCode;
+    }
+
+	public void setPurityOperatorCode(String purityOperatorCode) {
+        this.purityOperatorCode = purityOperatorCode;
+    }
+
+	public Date getRegistrationDate() {
+        return this.registrationDate;
+    }
+
+	public void setRegistrationDate(Date registrationDate) {
+        this.registrationDate = registrationDate;
+    }
+
+	public Double getRetain() {
+        return this.retain;
+    }
+
+	public void setRetain(Double retain) {
+        this.retain = retain;
+    }
+
+	public String getRetainLocation() {
+        return this.retainLocation;
+    }
+
+	public void setRetainLocation(String retainLocation) {
+        this.retainLocation = retainLocation;
+    }
+
+	public String getRetainUnitsCode() {
+        return this.retainUnitsCode;
+    }
+
+	public void setRetainUnitsCode(String retainUnitsCode) {
+        this.retainUnitsCode = retainUnitsCode;
+    }
+
+	public String getLotRegisteredBy() {
+        return this.lotRegisteredBy;
+    }
+
+	public void setLotRegisteredBy(String lotRegisteredBy) {
+        this.lotRegisteredBy = lotRegisteredBy;
+    }
+
+	public Double getSolutionAmount() {
+        return this.solutionAmount;
+    }
+
+	public void setSolutionAmount(Double solutionAmount) {
+        this.solutionAmount = solutionAmount;
+    }
+
+	public String getSolutionAmountUnitsCode() {
+        return this.solutionAmountUnitsCode;
+    }
+
+	public void setSolutionAmountUnitsCode(String solutionAmountUnitsCode) {
+        this.solutionAmountUnitsCode = solutionAmountUnitsCode;
+    }
+
+	public String getStockLocation() {
+        return this.stockLocation;
+    }
+
+	public void setStockLocation(String stockLocation) {
+        this.stockLocation = stockLocation;
+    }
+
+	public String getStockSolvent() {
+        return this.stockSolvent;
+    }
+
+	public void setStockSolvent(String stockSolvent) {
+        this.stockSolvent = stockSolvent;
+    }
+
+	public String getSupplier() {
+        return this.supplier;
+    }
+
+	public void setSupplier(String supplier) {
+        this.supplier = supplier;
+    }
+
+	public String getSupplierID() {
+        return this.supplierID;
+    }
+
+	public void setSupplierID(String supplierID) {
+        this.supplierID = supplierID;
+    }
+
+	public String getSupplierLot() {
+        return this.supplierLot;
+    }
+
+	public void setSupplierLot(String supplierLot) {
+        this.supplierLot = supplierLot;
+    }
+
+	public Date getSynthesisDate() {
+        return this.synthesisDate;
+    }
+
+	public void setSynthesisDate(Date synthesisDate) {
+        this.synthesisDate = synthesisDate;
+    }
+
+	public Double getTareWeight() {
+        return this.tareWeight;
+    }
+
+	public void setTareWeight(Double tareWeight) {
+        this.tareWeight = tareWeight;
+    }
+
+	public String getTareWeightUnitsCode() {
+        return this.tareWeightUnitsCode;
+    }
+
+	public void setTareWeightUnitsCode(String tareWeightUnitsCode) {
+        this.tareWeightUnitsCode = tareWeightUnitsCode;
+    }
+
+	public Double getTotalAmountStored() {
+        return this.totalAmountStored;
+    }
+
+	public void setTotalAmountStored(Double totalAmountStored) {
+        this.totalAmountStored = totalAmountStored;
+    }
+
+	public String getTotalAmountStoredUnitsCode() {
+        return this.totalAmountStoredUnitsCode;
+    }
+
+	public void setTotalAmountStoredUnitsCode(String totalAmountStoredUnitsCode) {
+        this.totalAmountStoredUnitsCode = totalAmountStoredUnitsCode;
+    }
+
+	public String getVendorCode() {
+        return this.vendorCode;
+    }
+
+	public void setVendorCode(String vendorCode) {
+        this.vendorCode = vendorCode;
+    }
+
+	public String getVendorId() {
+        return this.vendorId;
+    }
+
+	public void setVendorId(String vendorId) {
+        this.vendorId = vendorId;
+    }
+
+	public String getSaltFormCorpName() {
+        return this.saltFormCorpName;
+    }
+
+	public void setSaltFormCorpName(String saltFormCorpName) {
+        this.saltFormCorpName = saltFormCorpName;
+    }
+
+	public String getCasNumber() {
+        return this.casNumber;
+    }
+
+	public void setCasNumber(String casNumber) {
+        this.casNumber = casNumber;
+    }
+
+	public String getSaltAbbrevs() {
+        return this.saltAbbrevs;
+    }
+
+	public void setSaltAbbrevs(String saltAbbrevs) {
+        this.saltAbbrevs = saltAbbrevs;
+    }
+
+	public String getSaltEquivalents() {
+        return this.saltEquivalents;
+    }
+
+	public void setSaltEquivalents(String saltEquivalents) {
+        this.saltEquivalents = saltEquivalents;
+    }
+
+	public String getParentCorpName() {
+        return this.parentCorpName;
+    }
+
+	public void setParentCorpName(String parentCorpName) {
+        this.parentCorpName = parentCorpName;
+    }
+
+	public long getParentNumber() {
+        return this.parentNumber;
+    }
+
+	public void setParentNumber(long parentNumber) {
+        this.parentNumber = parentNumber;
+    }
+
+	public String getParentCommonName() {
+        return this.parentCommonName;
+    }
+
+	public void setParentCommonName(String parentCommonName) {
+        this.parentCommonName = parentCommonName;
+    }
+
+	public String getParentStereoCategory() {
+        return this.parentStereoCategory;
+    }
+
+	public void setParentStereoCategory(String parentStereoCategory) {
+        this.parentStereoCategory = parentStereoCategory;
+    }
+
+	public String getParentStereoComment() {
+        return this.parentStereoComment;
+    }
+
+	public void setParentStereoComment(String parentStereoComment) {
+        this.parentStereoComment = parentStereoComment;
+    }
+
+	public String getParentStructure() {
+        return this.parentStructure;
+    }
+
+	public void setParentStructure(String parentStructure) {
+        this.parentStructure = parentStructure;
+    }
+
+	public Double getParentMolWeight() {
+        return this.parentMolWeight;
+    }
+
+	public void setParentMolWeight(Double parentMolWeight) {
+        this.parentMolWeight = parentMolWeight;
+    }
+
+	public Double getParentExactMass() {
+        return this.parentExactMass;
+    }
+
+	public void setParentExactMass(Double parentExactMass) {
+        this.parentExactMass = parentExactMass;
+    }
+
+	public String getParentMolFormula() {
+        return this.parentMolFormula;
+    }
+
+	public void setParentMolFormula(String parentMolFormula) {
+        this.parentMolFormula = parentMolFormula;
+    }
+
+	public Date getParentRegistrationDate() {
+        return this.parentRegistrationDate;
+    }
+
+	public void setParentRegistrationDate(Date parentRegistrationDate) {
+        this.parentRegistrationDate = parentRegistrationDate;
+    }
+
+	public String getParentRegisteredBy() {
+        return this.parentRegisteredBy;
+    }
+
+	public void setParentRegisteredBy(String parentRegisteredBy) {
+        this.parentRegisteredBy = parentRegisteredBy;
+    }
+
+	public Date getParentModifiedDate() {
+        return this.parentModifiedDate;
+    }
+
+	public void setParentModifiedDate(Date parentModifiedDate) {
+        this.parentModifiedDate = parentModifiedDate;
+    }
+
+	public String getParentModifiedBy() {
+        return this.parentModifiedBy;
+    }
+
+	public void setParentModifiedBy(String parentModifiedBy) {
+        this.parentModifiedBy = parentModifiedBy;
+    }
+
+	public String getParentAliases() {
+        return this.parentAliases;
+    }
+
+	public void setParentAliases(String parentAliases) {
+        this.parentAliases = parentAliases;
+    }
+
+	public String getParentAnnotationCode() {
+        return this.parentAnnotationCode;
+    }
+
+	public void setParentAnnotationCode(String parentAnnotationCode) {
+        this.parentAnnotationCode = parentAnnotationCode;
+    }
+
+	public String getParentCompoundTypeCode() {
+        return this.parentCompoundTypeCode;
+    }
+
+	public void setParentCompoundTypeCode(String parentCompoundTypeCode) {
+        this.parentCompoundTypeCode = parentCompoundTypeCode;
+    }
+
+	public String getParentComment() {
+        return this.parentComment;
+    }
+
+	public void setParentComment(String parentComment) {
+        this.parentComment = parentComment;
+    }
+
+	public Boolean getParentIsMixture() {
+        return this.parentIsMixture;
+    }
+
+	public void setParentIsMixture(Boolean parentIsMixture) {
+        this.parentIsMixture = parentIsMixture;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static LotDTO fromJsonToLotDTO(String json) {
+        return new JSONDeserializer<LotDTO>()
+        .use(null, LotDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<LotDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<LotDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<LotDTO> fromJsonArrayToLoes(String json) {
+        return new JSONDeserializer<List<LotDTO>>()
+        .use("values", LotDTO.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/LotDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/LotDTO_Roo_JavaBean.aj
deleted file mode 100644
index 1934f9006..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LotDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,571 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LotDTO;
-import java.util.Date;
-
-privileged aspect LotDTO_Roo_JavaBean {
-    
-    public Long LotDTO.getId() {
-        return this.id;
-    }
-    
-    public void LotDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Double LotDTO.getAbsorbance() {
-        return this.absorbance;
-    }
-    
-    public void LotDTO.setAbsorbance(Double absorbance) {
-        this.absorbance = absorbance;
-    }
-    
-    public Double LotDTO.getAmount() {
-        return this.amount;
-    }
-    
-    public void LotDTO.setAmount(Double amount) {
-        this.amount = amount;
-    }
-    
-    public String LotDTO.getAmountUnitsCode() {
-        return this.amountUnitsCode;
-    }
-    
-    public void LotDTO.setAmountUnitsCode(String amountUnitsCode) {
-        this.amountUnitsCode = amountUnitsCode;
-    }
-    
-    public String LotDTO.getBarcode() {
-        return this.barcode;
-    }
-    
-    public void LotDTO.setBarcode(String barcode) {
-        this.barcode = barcode;
-    }
-    
-    public Double LotDTO.getBoilingPoint() {
-        return this.boilingPoint;
-    }
-    
-    public void LotDTO.setBoilingPoint(Double boilingPoint) {
-        this.boilingPoint = boilingPoint;
-    }
-    
-    public Long LotDTO.getBuid() {
-        return this.buid;
-    }
-    
-    public void LotDTO.setBuid(Long buid) {
-        this.buid = buid;
-    }
-    
-    public String LotDTO.getBulkLoadFile() {
-        return this.bulkLoadFile;
-    }
-    
-    public void LotDTO.setBulkLoadFile(String bulkLoadFile) {
-        this.bulkLoadFile = bulkLoadFile;
-    }
-    
-    public String LotDTO.getChemist() {
-        return this.chemist;
-    }
-    
-    public void LotDTO.setChemist(String chemist) {
-        this.chemist = chemist;
-    }
-    
-    public String LotDTO.getColor() {
-        return this.color;
-    }
-    
-    public void LotDTO.setColor(String color) {
-        this.color = color;
-    }
-    
-    public String LotDTO.getComments() {
-        return this.comments;
-    }
-    
-    public void LotDTO.setComments(String comments) {
-        this.comments = comments;
-    }
-    
-    public String LotDTO.getLotCorpName() {
-        return this.lotCorpName;
-    }
-    
-    public void LotDTO.setLotCorpName(String lotCorpName) {
-        this.lotCorpName = lotCorpName;
-    }
-    
-    public Boolean LotDTO.getIsVirtual() {
-        return this.isVirtual;
-    }
-    
-    public void LotDTO.setIsVirtual(Boolean isVirtual) {
-        this.isVirtual = isVirtual;
-    }
-    
-    public Double LotDTO.getLambda() {
-        return this.lambda;
-    }
-    
-    public void LotDTO.setLambda(Double lambda) {
-        this.lambda = lambda;
-    }
-    
-    public String LotDTO.getLotAliases() {
-        return this.lotAliases;
-    }
-    
-    public void LotDTO.setLotAliases(String lotAliases) {
-        this.lotAliases = lotAliases;
-    }
-    
-    public Double LotDTO.getLotMolWeight() {
-        return this.lotMolWeight;
-    }
-    
-    public void LotDTO.setLotMolWeight(Double lotMolWeight) {
-        this.lotMolWeight = lotMolWeight;
-    }
-    
-    public Integer LotDTO.getLotNumber() {
-        return this.lotNumber;
-    }
-    
-    public void LotDTO.setLotNumber(Integer lotNumber) {
-        this.lotNumber = lotNumber;
-    }
-    
-    public Double LotDTO.getMeltingPoint() {
-        return this.meltingPoint;
-    }
-    
-    public void LotDTO.setMeltingPoint(Double meltingPoint) {
-        this.meltingPoint = meltingPoint;
-    }
-    
-    public String LotDTO.getModifiedBy() {
-        return this.modifiedBy;
-    }
-    
-    public void LotDTO.setModifiedBy(String modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
-    
-    public Date LotDTO.getModifiedDate() {
-        return this.modifiedDate;
-    }
-    
-    public void LotDTO.setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
-    
-    public String LotDTO.getNotebookPage() {
-        return this.notebookPage;
-    }
-    
-    public void LotDTO.setNotebookPage(String notebookPage) {
-        this.notebookPage = notebookPage;
-    }
-    
-    public Double LotDTO.getObservedMassOne() {
-        return this.observedMassOne;
-    }
-    
-    public void LotDTO.setObservedMassOne(Double observedMassOne) {
-        this.observedMassOne = observedMassOne;
-    }
-    
-    public Double LotDTO.getObservedMassTwo() {
-        return this.observedMassTwo;
-    }
-    
-    public void LotDTO.setObservedMassTwo(Double observedMassTwo) {
-        this.observedMassTwo = observedMassTwo;
-    }
-    
-    public Double LotDTO.getPercentEE() {
-        return this.percentEE;
-    }
-    
-    public void LotDTO.setPercentEE(Double percentEE) {
-        this.percentEE = percentEE;
-    }
-    
-    public String LotDTO.getPhysicalStateCode() {
-        return this.physicalStateCode;
-    }
-    
-    public void LotDTO.setPhysicalStateCode(String physicalStateCode) {
-        this.physicalStateCode = physicalStateCode;
-    }
-    
-    public String LotDTO.getProject() {
-        return this.project;
-    }
-    
-    public void LotDTO.setProject(String project) {
-        this.project = project;
-    }
-    
-    public Double LotDTO.getPurity() {
-        return this.purity;
-    }
-    
-    public void LotDTO.setPurity(Double purity) {
-        this.purity = purity;
-    }
-    
-    public String LotDTO.getPurityMeasuredByCode() {
-        return this.purityMeasuredByCode;
-    }
-    
-    public void LotDTO.setPurityMeasuredByCode(String purityMeasuredByCode) {
-        this.purityMeasuredByCode = purityMeasuredByCode;
-    }
-    
-    public String LotDTO.getPurityOperatorCode() {
-        return this.purityOperatorCode;
-    }
-    
-    public void LotDTO.setPurityOperatorCode(String purityOperatorCode) {
-        this.purityOperatorCode = purityOperatorCode;
-    }
-    
-    public Date LotDTO.getRegistrationDate() {
-        return this.registrationDate;
-    }
-    
-    public void LotDTO.setRegistrationDate(Date registrationDate) {
-        this.registrationDate = registrationDate;
-    }
-    
-    public Double LotDTO.getRetain() {
-        return this.retain;
-    }
-    
-    public void LotDTO.setRetain(Double retain) {
-        this.retain = retain;
-    }
-    
-    public String LotDTO.getRetainLocation() {
-        return this.retainLocation;
-    }
-    
-    public void LotDTO.setRetainLocation(String retainLocation) {
-        this.retainLocation = retainLocation;
-    }
-    
-    public String LotDTO.getRetainUnitsCode() {
-        return this.retainUnitsCode;
-    }
-    
-    public void LotDTO.setRetainUnitsCode(String retainUnitsCode) {
-        this.retainUnitsCode = retainUnitsCode;
-    }
-    
-    public String LotDTO.getLotRegisteredBy() {
-        return this.lotRegisteredBy;
-    }
-    
-    public void LotDTO.setLotRegisteredBy(String lotRegisteredBy) {
-        this.lotRegisteredBy = lotRegisteredBy;
-    }
-    
-    public Double LotDTO.getSolutionAmount() {
-        return this.solutionAmount;
-    }
-    
-    public void LotDTO.setSolutionAmount(Double solutionAmount) {
-        this.solutionAmount = solutionAmount;
-    }
-    
-    public String LotDTO.getSolutionAmountUnitsCode() {
-        return this.solutionAmountUnitsCode;
-    }
-    
-    public void LotDTO.setSolutionAmountUnitsCode(String solutionAmountUnitsCode) {
-        this.solutionAmountUnitsCode = solutionAmountUnitsCode;
-    }
-    
-    public String LotDTO.getStockLocation() {
-        return this.stockLocation;
-    }
-    
-    public void LotDTO.setStockLocation(String stockLocation) {
-        this.stockLocation = stockLocation;
-    }
-    
-    public String LotDTO.getStockSolvent() {
-        return this.stockSolvent;
-    }
-    
-    public void LotDTO.setStockSolvent(String stockSolvent) {
-        this.stockSolvent = stockSolvent;
-    }
-    
-    public String LotDTO.getSupplier() {
-        return this.supplier;
-    }
-    
-    public void LotDTO.setSupplier(String supplier) {
-        this.supplier = supplier;
-    }
-    
-    public String LotDTO.getSupplierID() {
-        return this.supplierID;
-    }
-    
-    public void LotDTO.setSupplierID(String supplierID) {
-        this.supplierID = supplierID;
-    }
-    
-    public String LotDTO.getSupplierLot() {
-        return this.supplierLot;
-    }
-    
-    public void LotDTO.setSupplierLot(String supplierLot) {
-        this.supplierLot = supplierLot;
-    }
-    
-    public Date LotDTO.getSynthesisDate() {
-        return this.synthesisDate;
-    }
-    
-    public void LotDTO.setSynthesisDate(Date synthesisDate) {
-        this.synthesisDate = synthesisDate;
-    }
-    
-    public Double LotDTO.getTareWeight() {
-        return this.tareWeight;
-    }
-    
-    public void LotDTO.setTareWeight(Double tareWeight) {
-        this.tareWeight = tareWeight;
-    }
-    
-    public String LotDTO.getTareWeightUnitsCode() {
-        return this.tareWeightUnitsCode;
-    }
-    
-    public void LotDTO.setTareWeightUnitsCode(String tareWeightUnitsCode) {
-        this.tareWeightUnitsCode = tareWeightUnitsCode;
-    }
-    
-    public Double LotDTO.getTotalAmountStored() {
-        return this.totalAmountStored;
-    }
-    
-    public void LotDTO.setTotalAmountStored(Double totalAmountStored) {
-        this.totalAmountStored = totalAmountStored;
-    }
-    
-    public String LotDTO.getTotalAmountStoredUnitsCode() {
-        return this.totalAmountStoredUnitsCode;
-    }
-    
-    public void LotDTO.setTotalAmountStoredUnitsCode(String totalAmountStoredUnitsCode) {
-        this.totalAmountStoredUnitsCode = totalAmountStoredUnitsCode;
-    }
-    
-    public String LotDTO.getVendorCode() {
-        return this.vendorCode;
-    }
-    
-    public void LotDTO.setVendorCode(String vendorCode) {
-        this.vendorCode = vendorCode;
-    }
-    
-    public String LotDTO.getVendorId() {
-        return this.vendorId;
-    }
-    
-    public void LotDTO.setVendorId(String vendorId) {
-        this.vendorId = vendorId;
-    }
-    
-    public String LotDTO.getSaltFormCorpName() {
-        return this.saltFormCorpName;
-    }
-    
-    public void LotDTO.setSaltFormCorpName(String saltFormCorpName) {
-        this.saltFormCorpName = saltFormCorpName;
-    }
-    
-    public String LotDTO.getCasNumber() {
-        return this.casNumber;
-    }
-    
-    public void LotDTO.setCasNumber(String casNumber) {
-        this.casNumber = casNumber;
-    }
-    
-    public String LotDTO.getSaltAbbrevs() {
-        return this.saltAbbrevs;
-    }
-    
-    public void LotDTO.setSaltAbbrevs(String saltAbbrevs) {
-        this.saltAbbrevs = saltAbbrevs;
-    }
-    
-    public String LotDTO.getSaltEquivalents() {
-        return this.saltEquivalents;
-    }
-    
-    public void LotDTO.setSaltEquivalents(String saltEquivalents) {
-        this.saltEquivalents = saltEquivalents;
-    }
-    
-    public String LotDTO.getParentCorpName() {
-        return this.parentCorpName;
-    }
-    
-    public void LotDTO.setParentCorpName(String parentCorpName) {
-        this.parentCorpName = parentCorpName;
-    }
-    
-    public long LotDTO.getParentNumber() {
-        return this.parentNumber;
-    }
-    
-    public void LotDTO.setParentNumber(long parentNumber) {
-        this.parentNumber = parentNumber;
-    }
-    
-    public String LotDTO.getParentCommonName() {
-        return this.parentCommonName;
-    }
-    
-    public void LotDTO.setParentCommonName(String parentCommonName) {
-        this.parentCommonName = parentCommonName;
-    }
-    
-    public String LotDTO.getParentStereoCategory() {
-        return this.parentStereoCategory;
-    }
-    
-    public void LotDTO.setParentStereoCategory(String parentStereoCategory) {
-        this.parentStereoCategory = parentStereoCategory;
-    }
-    
-    public String LotDTO.getParentStereoComment() {
-        return this.parentStereoComment;
-    }
-    
-    public void LotDTO.setParentStereoComment(String parentStereoComment) {
-        this.parentStereoComment = parentStereoComment;
-    }
-    
-    public String LotDTO.getParentStructure() {
-        return this.parentStructure;
-    }
-    
-    public void LotDTO.setParentStructure(String parentStructure) {
-        this.parentStructure = parentStructure;
-    }
-    
-    public Double LotDTO.getParentMolWeight() {
-        return this.parentMolWeight;
-    }
-    
-    public void LotDTO.setParentMolWeight(Double parentMolWeight) {
-        this.parentMolWeight = parentMolWeight;
-    }
-    
-    public Double LotDTO.getParentExactMass() {
-        return this.parentExactMass;
-    }
-    
-    public void LotDTO.setParentExactMass(Double parentExactMass) {
-        this.parentExactMass = parentExactMass;
-    }
-    
-    public String LotDTO.getParentMolFormula() {
-        return this.parentMolFormula;
-    }
-    
-    public void LotDTO.setParentMolFormula(String parentMolFormula) {
-        this.parentMolFormula = parentMolFormula;
-    }
-    
-    public Date LotDTO.getParentRegistrationDate() {
-        return this.parentRegistrationDate;
-    }
-    
-    public void LotDTO.setParentRegistrationDate(Date parentRegistrationDate) {
-        this.parentRegistrationDate = parentRegistrationDate;
-    }
-    
-    public String LotDTO.getParentRegisteredBy() {
-        return this.parentRegisteredBy;
-    }
-    
-    public void LotDTO.setParentRegisteredBy(String parentRegisteredBy) {
-        this.parentRegisteredBy = parentRegisteredBy;
-    }
-    
-    public Date LotDTO.getParentModifiedDate() {
-        return this.parentModifiedDate;
-    }
-    
-    public void LotDTO.setParentModifiedDate(Date parentModifiedDate) {
-        this.parentModifiedDate = parentModifiedDate;
-    }
-    
-    public String LotDTO.getParentModifiedBy() {
-        return this.parentModifiedBy;
-    }
-    
-    public void LotDTO.setParentModifiedBy(String parentModifiedBy) {
-        this.parentModifiedBy = parentModifiedBy;
-    }
-    
-    public String LotDTO.getParentAliases() {
-        return this.parentAliases;
-    }
-    
-    public void LotDTO.setParentAliases(String parentAliases) {
-        this.parentAliases = parentAliases;
-    }
-    
-    public String LotDTO.getParentAnnotationCode() {
-        return this.parentAnnotationCode;
-    }
-    
-    public void LotDTO.setParentAnnotationCode(String parentAnnotationCode) {
-        this.parentAnnotationCode = parentAnnotationCode;
-    }
-    
-    public String LotDTO.getParentCompoundTypeCode() {
-        return this.parentCompoundTypeCode;
-    }
-    
-    public void LotDTO.setParentCompoundTypeCode(String parentCompoundTypeCode) {
-        this.parentCompoundTypeCode = parentCompoundTypeCode;
-    }
-    
-    public String LotDTO.getParentComment() {
-        return this.parentComment;
-    }
-    
-    public void LotDTO.setParentComment(String parentComment) {
-        this.parentComment = parentComment;
-    }
-    
-    public Boolean LotDTO.getParentIsMixture() {
-        return this.parentIsMixture;
-    }
-    
-    public void LotDTO.setParentIsMixture(Boolean parentIsMixture) {
-        this.parentIsMixture = parentIsMixture;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LotDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/LotDTO_Roo_Json.aj
deleted file mode 100644
index 9f1311b54..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LotDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LotDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect LotDTO_Roo_Json {
-    
-    public String LotDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String LotDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static LotDTO LotDTO.fromJsonToLotDTO(String json) {
-        return new JSONDeserializer<LotDTO>()
-        .use(null, LotDTO.class).deserialize(json);
-    }
-    
-    public static String LotDTO.toJsonArray(Collection<LotDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String LotDTO.toJsonArray(Collection<LotDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<LotDTO> LotDTO.fromJsonArrayToLoes(String json) {
-        return new JSONDeserializer<List<LotDTO>>()
-        .use("values", LotDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LotDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/LotDTO_Roo_ToString.aj
deleted file mode 100644
index 859c36f31..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LotDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LotDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect LotDTO_Roo_ToString {
-    
-    public String LotDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LotsByProjectDTO.java b/src/main/java/com/labsynch/labseer/dto/LotsByProjectDTO.java
index f1e3607ec..2fce8f7bd 100755
--- a/src/main/java/com/labsynch/labseer/dto/LotsByProjectDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LotsByProjectDTO.java
@@ -1,7 +1,10 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -37,4 +40,82 @@ public LotsByProjectDTO(
 	public LotsByProjectDTO() {
 		// Empty constructor
 	}
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public String getLotCorpName() {
+        return this.lotCorpName;
+    }
+
+	public void setLotCorpName(String lotCorpName) {
+        this.lotCorpName = lotCorpName;
+    }
+
+	public Integer getLotNumber() {
+        return this.lotNumber;
+    }
+
+	public void setLotNumber(Integer lotNumber) {
+        this.lotNumber = lotNumber;
+    }
+
+	public Date getRegistrationDate() {
+        return this.registrationDate;
+    }
+
+	public void setRegistrationDate(Date registrationDate) {
+        this.registrationDate = registrationDate;
+    }
+
+	public String getParentCorpName() {
+        return this.parentCorpName;
+    }
+
+	public void setParentCorpName(String parentCorpName) {
+        this.parentCorpName = parentCorpName;
+    }
+
+	public String getProject() {
+        return this.project;
+    }
+
+	public void setProject(String project) {
+        this.project = project;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static LotsByProjectDTO fromJsonToLotsByProjectDTO(String json) {
+        return new JSONDeserializer<LotsByProjectDTO>()
+        .use(null, LotsByProjectDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<LotsByProjectDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<LotsByProjectDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<LotsByProjectDTO> fromJsonArrayToLotsByProes(String json) {
+        return new JSONDeserializer<List<LotsByProjectDTO>>()
+        .use("values", LotsByProjectDTO.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/LotsByProjectDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/LotsByProjectDTO_Roo_JavaBean.aj
deleted file mode 100644
index ff4b72c38..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LotsByProjectDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,59 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LotsByProjectDTO;
-import java.util.Date;
-
-privileged aspect LotsByProjectDTO_Roo_JavaBean {
-    
-    public Long LotsByProjectDTO.getId() {
-        return this.id;
-    }
-    
-    public void LotsByProjectDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-    public String LotsByProjectDTO.getLotCorpName() {
-        return this.lotCorpName;
-    }
-    
-    public void LotsByProjectDTO.setLotCorpName(String lotCorpName) {
-        this.lotCorpName = lotCorpName;
-    }
-    
-    public Integer LotsByProjectDTO.getLotNumber() {
-        return this.lotNumber;
-    }
-    
-    public void LotsByProjectDTO.setLotNumber(Integer lotNumber) {
-        this.lotNumber = lotNumber;
-    }
-    
-    public Date LotsByProjectDTO.getRegistrationDate() {
-        return this.registrationDate;
-    }
-    
-    public void LotsByProjectDTO.setRegistrationDate(Date registrationDate) {
-        this.registrationDate = registrationDate;
-    }
-    
-    public String LotsByProjectDTO.getParentCorpName() {
-        return this.parentCorpName;
-    }
-    
-    public void LotsByProjectDTO.setParentCorpName(String parentCorpName) {
-        this.parentCorpName = parentCorpName;
-    }
-    
-    public String LotsByProjectDTO.getProject() {
-        return this.project;
-    }
-    
-    public void LotsByProjectDTO.setProject(String project) {
-        this.project = project;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LotsByProjectDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/LotsByProjectDTO_Roo_Json.aj
deleted file mode 100644
index 37763efd4..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LotsByProjectDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LotsByProjectDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect LotsByProjectDTO_Roo_Json {
-    
-    public String LotsByProjectDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String LotsByProjectDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static LotsByProjectDTO LotsByProjectDTO.fromJsonToLotsByProjectDTO(String json) {
-        return new JSONDeserializer<LotsByProjectDTO>()
-        .use(null, LotsByProjectDTO.class).deserialize(json);
-    }
-    
-    public static String LotsByProjectDTO.toJsonArray(Collection<LotsByProjectDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String LotsByProjectDTO.toJsonArray(Collection<LotsByProjectDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<LotsByProjectDTO> LotsByProjectDTO.fromJsonArrayToLotsByProes(String json) {
-        return new JSONDeserializer<List<LotsByProjectDTO>>()
-        .use("values", LotsByProjectDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingBrowserQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/LsThingBrowserQueryDTO.java
index 2b97fb423..7289b572e 100644
--- a/src/main/java/com/labsynch/labseer/dto/LsThingBrowserQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LsThingBrowserQueryDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -13,6 +19,56 @@ public class LsThingBrowserQueryDTO {
 	
 	private LsThingQueryDTO queryDTO;
 
+
+	public String getQueryString() {
+        return this.queryString;
+    }
+
+	public void setQueryString(String queryString) {
+        this.queryString = queryString;
+    }
+
+	public LsThingQueryDTO getQueryDTO() {
+        return this.queryDTO;
+    }
+
+	public void setQueryDTO(LsThingQueryDTO queryDTO) {
+        this.queryDTO = queryDTO;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static LsThingBrowserQueryDTO fromJsonToLsThingBrowserQueryDTO(String json) {
+        return new JSONDeserializer<LsThingBrowserQueryDTO>()
+        .use(null, LsThingBrowserQueryDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<LsThingBrowserQueryDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<LsThingBrowserQueryDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<LsThingBrowserQueryDTO> fromJsonArrayToLsThingBroes(String json) {
+        return new JSONDeserializer<List<LsThingBrowserQueryDTO>>()
+        .use("values", LsThingBrowserQueryDTO.class).deserialize(json);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingBrowserQueryDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/LsThingBrowserQueryDTO_Roo_JavaBean.aj
deleted file mode 100644
index cd5757fdc..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LsThingBrowserQueryDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,27 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LsThingBrowserQueryDTO;
-import com.labsynch.labseer.dto.LsThingQueryDTO;
-
-privileged aspect LsThingBrowserQueryDTO_Roo_JavaBean {
-    
-    public String LsThingBrowserQueryDTO.getQueryString() {
-        return this.queryString;
-    }
-    
-    public void LsThingBrowserQueryDTO.setQueryString(String queryString) {
-        this.queryString = queryString;
-    }
-    
-    public LsThingQueryDTO LsThingBrowserQueryDTO.getQueryDTO() {
-        return this.queryDTO;
-    }
-    
-    public void LsThingBrowserQueryDTO.setQueryDTO(LsThingQueryDTO queryDTO) {
-        this.queryDTO = queryDTO;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingBrowserQueryDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/LsThingBrowserQueryDTO_Roo_Json.aj
deleted file mode 100644
index 1a616ff9d..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LsThingBrowserQueryDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LsThingBrowserQueryDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect LsThingBrowserQueryDTO_Roo_Json {
-    
-    public String LsThingBrowserQueryDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String LsThingBrowserQueryDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static LsThingBrowserQueryDTO LsThingBrowserQueryDTO.fromJsonToLsThingBrowserQueryDTO(String json) {
-        return new JSONDeserializer<LsThingBrowserQueryDTO>()
-        .use(null, LsThingBrowserQueryDTO.class).deserialize(json);
-    }
-    
-    public static String LsThingBrowserQueryDTO.toJsonArray(Collection<LsThingBrowserQueryDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String LsThingBrowserQueryDTO.toJsonArray(Collection<LsThingBrowserQueryDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<LsThingBrowserQueryDTO> LsThingBrowserQueryDTO.fromJsonArrayToLsThingBroes(String json) {
-        return new JSONDeserializer<List<LsThingBrowserQueryDTO>>()
-        .use("values", LsThingBrowserQueryDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingBrowserQueryDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/LsThingBrowserQueryDTO_Roo_ToString.aj
deleted file mode 100644
index 444bcb646..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LsThingBrowserQueryDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LsThingBrowserQueryDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect LsThingBrowserQueryDTO_Roo_ToString {
-    
-    public String LsThingBrowserQueryDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/LsThingQueryDTO.java
index 5605057b1..03859c63c 100644
--- a/src/main/java/com/labsynch/labseer/dto/LsThingQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LsThingQueryDTO.java
@@ -1,8 +1,12 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -54,4 +58,134 @@ public LsThingQueryDTO(LsThingQueryDTO queryDTO){
 		this.labels = queryDTO.getLabels();
 		this.codeName = queryDTO.getCodeName();
 	}
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static LsThingQueryDTO fromJsonToLsThingQueryDTO(String json) {
+        return new JSONDeserializer<LsThingQueryDTO>()
+        .use(null, LsThingQueryDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<LsThingQueryDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<LsThingQueryDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<LsThingQueryDTO> fromJsonArrayToLsThingQueryDTO(String json) {
+        return new JSONDeserializer<List<LsThingQueryDTO>>()
+        .use("values", LsThingQueryDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public Boolean getCombineTermsWithAnd() {
+        return this.combineTermsWithAnd;
+    }
+
+	public void setCombineTermsWithAnd(Boolean combineTermsWithAnd) {
+        this.combineTermsWithAnd = combineTermsWithAnd;
+    }
+
+	public Date getRecordedDateGreaterThan() {
+        return this.recordedDateGreaterThan;
+    }
+
+	public void setRecordedDateGreaterThan(Date recordedDateGreaterThan) {
+        this.recordedDateGreaterThan = recordedDateGreaterThan;
+    }
+
+	public Date getRecordedDateLessThan() {
+        return this.recordedDateLessThan;
+    }
+
+	public void setRecordedDateLessThan(Date recordedDateLessThan) {
+        this.recordedDateLessThan = recordedDateLessThan;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public Integer getMaxResults() {
+        return this.maxResults;
+    }
+
+	public void setMaxResults(Integer maxResults) {
+        this.maxResults = maxResults;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public Collection<ItxQueryDTO> getFirstInteractions() {
+        return this.firstInteractions;
+    }
+
+	public void setFirstInteractions(Collection<ItxQueryDTO> firstInteractions) {
+        this.firstInteractions = firstInteractions;
+    }
+
+	public Collection<ItxQueryDTO> getSecondInteractions() {
+        return this.secondInteractions;
+    }
+
+	public void setSecondInteractions(Collection<ItxQueryDTO> secondInteractions) {
+        this.secondInteractions = secondInteractions;
+    }
+
+	public Collection<ValueQueryDTO> getValues() {
+        return this.values;
+    }
+
+	public void setValues(Collection<ValueQueryDTO> values) {
+        this.values = values;
+    }
+
+	public Collection<LabelQueryDTO> getLabels() {
+        return this.labels;
+    }
+
+	public void setLabels(Collection<LabelQueryDTO> labels) {
+        this.labels = labels;
+    }
+
+	public CodeNameQueryDTO getCodeName() {
+        return this.codeName;
+    }
+
+	public void setCodeName(CodeNameQueryDTO codeName) {
+        this.codeName = codeName;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingQueryDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/LsThingQueryDTO_Roo_JavaBean.aj
deleted file mode 100644
index 6275c24f8..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LsThingQueryDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,112 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CodeNameQueryDTO;
-import com.labsynch.labseer.dto.ItxQueryDTO;
-import com.labsynch.labseer.dto.LabelQueryDTO;
-import com.labsynch.labseer.dto.LsThingQueryDTO;
-import com.labsynch.labseer.dto.ValueQueryDTO;
-import java.util.Collection;
-import java.util.Date;
-
-privileged aspect LsThingQueryDTO_Roo_JavaBean {
-    
-    public Boolean LsThingQueryDTO.getCombineTermsWithAnd() {
-        return this.combineTermsWithAnd;
-    }
-    
-    public void LsThingQueryDTO.setCombineTermsWithAnd(Boolean combineTermsWithAnd) {
-        this.combineTermsWithAnd = combineTermsWithAnd;
-    }
-    
-    public Date LsThingQueryDTO.getRecordedDateGreaterThan() {
-        return this.recordedDateGreaterThan;
-    }
-    
-    public void LsThingQueryDTO.setRecordedDateGreaterThan(Date recordedDateGreaterThan) {
-        this.recordedDateGreaterThan = recordedDateGreaterThan;
-    }
-    
-    public Date LsThingQueryDTO.getRecordedDateLessThan() {
-        return this.recordedDateLessThan;
-    }
-    
-    public void LsThingQueryDTO.setRecordedDateLessThan(Date recordedDateLessThan) {
-        this.recordedDateLessThan = recordedDateLessThan;
-    }
-    
-    public String LsThingQueryDTO.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void LsThingQueryDTO.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public Integer LsThingQueryDTO.getMaxResults() {
-        return this.maxResults;
-    }
-    
-    public void LsThingQueryDTO.setMaxResults(Integer maxResults) {
-        this.maxResults = maxResults;
-    }
-    
-    public String LsThingQueryDTO.getLsType() {
-        return this.lsType;
-    }
-    
-    public void LsThingQueryDTO.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String LsThingQueryDTO.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void LsThingQueryDTO.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public Collection<ItxQueryDTO> LsThingQueryDTO.getFirstInteractions() {
-        return this.firstInteractions;
-    }
-    
-    public void LsThingQueryDTO.setFirstInteractions(Collection<ItxQueryDTO> firstInteractions) {
-        this.firstInteractions = firstInteractions;
-    }
-    
-    public Collection<ItxQueryDTO> LsThingQueryDTO.getSecondInteractions() {
-        return this.secondInteractions;
-    }
-    
-    public void LsThingQueryDTO.setSecondInteractions(Collection<ItxQueryDTO> secondInteractions) {
-        this.secondInteractions = secondInteractions;
-    }
-    
-    public Collection<ValueQueryDTO> LsThingQueryDTO.getValues() {
-        return this.values;
-    }
-    
-    public void LsThingQueryDTO.setValues(Collection<ValueQueryDTO> values) {
-        this.values = values;
-    }
-    
-    public Collection<LabelQueryDTO> LsThingQueryDTO.getLabels() {
-        return this.labels;
-    }
-    
-    public void LsThingQueryDTO.setLabels(Collection<LabelQueryDTO> labels) {
-        this.labels = labels;
-    }
-    
-    public CodeNameQueryDTO LsThingQueryDTO.getCodeName() {
-        return this.codeName;
-    }
-    
-    public void LsThingQueryDTO.setCodeName(CodeNameQueryDTO codeName) {
-        this.codeName = codeName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingQueryDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/LsThingQueryDTO_Roo_Json.aj
deleted file mode 100644
index fcad5b2df..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LsThingQueryDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LsThingQueryDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect LsThingQueryDTO_Roo_Json {
-    
-    public String LsThingQueryDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String LsThingQueryDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static LsThingQueryDTO LsThingQueryDTO.fromJsonToLsThingQueryDTO(String json) {
-        return new JSONDeserializer<LsThingQueryDTO>()
-        .use(null, LsThingQueryDTO.class).deserialize(json);
-    }
-    
-    public static String LsThingQueryDTO.toJsonArray(Collection<LsThingQueryDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String LsThingQueryDTO.toJsonArray(Collection<LsThingQueryDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<LsThingQueryDTO> LsThingQueryDTO.fromJsonArrayToLsThingQueryDTO(String json) {
-        return new JSONDeserializer<List<LsThingQueryDTO>>()
-        .use("values", LsThingQueryDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingQueryDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/LsThingQueryDTO_Roo_ToString.aj
deleted file mode 100644
index f2dff5edc..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LsThingQueryDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LsThingQueryDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect LsThingQueryDTO_Roo_ToString {
-    
-    public String LsThingQueryDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingQueryResultDTO.java b/src/main/java/com/labsynch/labseer/dto/LsThingQueryResultDTO.java
index 31a3b0286..503d6ec71 100644
--- a/src/main/java/com/labsynch/labseer/dto/LsThingQueryResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LsThingQueryResultDTO.java
@@ -1,7 +1,9 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -9,7 +11,7 @@
 
 import com.labsynch.labseer.domain.LsThing;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -52,4 +54,52 @@ public String toJsonStub() {
         return new JSONSerializer().exclude("*.class", "results.lsStates").include("results.lsTags", "results.lsLabels").prettyPrint(false).transform(new ExcludeNulls(), void.class).serialize(this);
     }
 	
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static LsThingQueryResultDTO fromJsonToLsThingQueryResultDTO(String json) {
+        return new JSONDeserializer<LsThingQueryResultDTO>()
+        .use(null, LsThingQueryResultDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<LsThingQueryResultDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<LsThingQueryResultDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<LsThingQueryResultDTO> fromJsonArrayToLsThingQueryResultDTO(String json) {
+        return new JSONDeserializer<List<LsThingQueryResultDTO>>()
+        .use("values", LsThingQueryResultDTO.class).deserialize(json);
+    }
+
+	public Integer getMaxResults() {
+        return this.maxResults;
+    }
+
+	public void setMaxResults(Integer maxResults) {
+        this.maxResults = maxResults;
+    }
+
+	public Integer getNumberOfResults() {
+        return this.numberOfResults;
+    }
+
+	public void setNumberOfResults(Integer numberOfResults) {
+        this.numberOfResults = numberOfResults;
+    }
+
+	public Collection<LsThing> getResults() {
+        return this.results;
+    }
+
+	public void setResults(Collection<LsThing> results) {
+        this.results = results;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingQueryResultDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/LsThingQueryResultDTO_Roo_JavaBean.aj
deleted file mode 100644
index de1200b6e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LsThingQueryResultDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,36 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.dto.LsThingQueryResultDTO;
-import java.util.Collection;
-
-privileged aspect LsThingQueryResultDTO_Roo_JavaBean {
-    
-    public Integer LsThingQueryResultDTO.getMaxResults() {
-        return this.maxResults;
-    }
-    
-    public void LsThingQueryResultDTO.setMaxResults(Integer maxResults) {
-        this.maxResults = maxResults;
-    }
-    
-    public Integer LsThingQueryResultDTO.getNumberOfResults() {
-        return this.numberOfResults;
-    }
-    
-    public void LsThingQueryResultDTO.setNumberOfResults(Integer numberOfResults) {
-        this.numberOfResults = numberOfResults;
-    }
-    
-    public Collection<LsThing> LsThingQueryResultDTO.getResults() {
-        return this.results;
-    }
-    
-    public void LsThingQueryResultDTO.setResults(Collection<LsThing> results) {
-        this.results = results;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingQueryResultDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/LsThingQueryResultDTO_Roo_Json.aj
deleted file mode 100644
index 441333aa0..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LsThingQueryResultDTO_Roo_Json.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LsThingQueryResultDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect LsThingQueryResultDTO_Roo_Json {
-    
-    public static LsThingQueryResultDTO LsThingQueryResultDTO.fromJsonToLsThingQueryResultDTO(String json) {
-        return new JSONDeserializer<LsThingQueryResultDTO>()
-        .use(null, LsThingQueryResultDTO.class).deserialize(json);
-    }
-    
-    public static String LsThingQueryResultDTO.toJsonArray(Collection<LsThingQueryResultDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String LsThingQueryResultDTO.toJsonArray(Collection<LsThingQueryResultDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<LsThingQueryResultDTO> LsThingQueryResultDTO.fromJsonArrayToLsThingQueryResultDTO(String json) {
-        return new JSONDeserializer<List<LsThingQueryResultDTO>>()
-        .use("values", LsThingQueryResultDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingQueryResultDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/LsThingQueryResultDTO_Roo_ToString.aj
deleted file mode 100644
index 30176701f..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LsThingQueryResultDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LsThingQueryResultDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect LsThingQueryResultDTO_Roo_ToString {
-    
-    public String LsThingQueryResultDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingStatePathDTO.java b/src/main/java/com/labsynch/labseer/dto/LsThingStatePathDTO.java
index 66c5d0ac0..add294f39 100644
--- a/src/main/java/com/labsynch/labseer/dto/LsThingStatePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LsThingStatePathDTO.java
@@ -1,14 +1,16 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.LsThingState;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -34,6 +36,52 @@ public String toJson() {
 	public static String toJsonArray(Collection<LsThingStatePathDTO> collection) {
         return new JSONSerializer().include("states.lsValues").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
     }
+
+	public String getIdOrCodeName() {
+        return this.idOrCodeName;
+    }
+
+	public void setIdOrCodeName(String idOrCodeName) {
+        this.idOrCodeName = idOrCodeName;
+    }
+
+	public String getStateType() {
+        return this.stateType;
+    }
+
+	public void setStateType(String stateType) {
+        this.stateType = stateType;
+    }
+
+	public String getStateKind() {
+        return this.stateKind;
+    }
+
+	public void setStateKind(String stateKind) {
+        this.stateKind = stateKind;
+    }
+
+	public Collection<LsThingState> getStates() {
+        return this.states;
+    }
+
+	public void setStates(Collection<LsThingState> states) {
+        this.states = states;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static LsThingStatePathDTO fromJsonToLsThingStatePathDTO(String json) {
+        return new JSONDeserializer<LsThingStatePathDTO>()
+        .use(null, LsThingStatePathDTO.class).deserialize(json);
+    }
+
+	public static Collection<LsThingStatePathDTO> fromJsonArrayToLsThingStatePathDTO(String json) {
+        return new JSONDeserializer<List<LsThingStatePathDTO>>()
+        .use("values", LsThingStatePathDTO.class).deserialize(json);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingStatePathDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/LsThingStatePathDTO_Roo_JavaBean.aj
deleted file mode 100644
index aa75672bc..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LsThingStatePathDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,44 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.LsThingState;
-import com.labsynch.labseer.dto.LsThingStatePathDTO;
-import java.util.Collection;
-
-privileged aspect LsThingStatePathDTO_Roo_JavaBean {
-    
-    public String LsThingStatePathDTO.getIdOrCodeName() {
-        return this.idOrCodeName;
-    }
-    
-    public void LsThingStatePathDTO.setIdOrCodeName(String idOrCodeName) {
-        this.idOrCodeName = idOrCodeName;
-    }
-    
-    public String LsThingStatePathDTO.getStateType() {
-        return this.stateType;
-    }
-    
-    public void LsThingStatePathDTO.setStateType(String stateType) {
-        this.stateType = stateType;
-    }
-    
-    public String LsThingStatePathDTO.getStateKind() {
-        return this.stateKind;
-    }
-    
-    public void LsThingStatePathDTO.setStateKind(String stateKind) {
-        this.stateKind = stateKind;
-    }
-    
-    public Collection<LsThingState> LsThingStatePathDTO.getStates() {
-        return this.states;
-    }
-    
-    public void LsThingStatePathDTO.setStates(Collection<LsThingState> states) {
-        this.states = states;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingStatePathDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/LsThingStatePathDTO_Roo_Json.aj
deleted file mode 100644
index b14f9317e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LsThingStatePathDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LsThingStatePathDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect LsThingStatePathDTO_Roo_Json {
-    
-    public static LsThingStatePathDTO LsThingStatePathDTO.fromJsonToLsThingStatePathDTO(String json) {
-        return new JSONDeserializer<LsThingStatePathDTO>()
-        .use(null, LsThingStatePathDTO.class).deserialize(json);
-    }
-    
-    public static Collection<LsThingStatePathDTO> LsThingStatePathDTO.fromJsonArrayToLsThingStatePathDTO(String json) {
-        return new JSONDeserializer<List<LsThingStatePathDTO>>()
-        .use("values", LsThingStatePathDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingStatePathDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/LsThingStatePathDTO_Roo_ToString.aj
deleted file mode 100644
index b9c41da91..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LsThingStatePathDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LsThingStatePathDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect LsThingStatePathDTO_Roo_ToString {
-    
-    public String LsThingStatePathDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingValidationDTO.java b/src/main/java/com/labsynch/labseer/dto/LsThingValidationDTO.java
index 38cb5d6a0..7d06becc6 100644
--- a/src/main/java/com/labsynch/labseer/dto/LsThingValidationDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LsThingValidationDTO.java
@@ -1,12 +1,17 @@
 package com.labsynch.labseer.dto;
 
+import java.util.Collection;
+import java.util.List;
 import java.util.Set;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.LsThing;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
 
 @RooJavaBean
@@ -30,6 +35,88 @@ public LsThingValidationDTO() {
 	private boolean forwardAndReverseAreSame;
 	
 	private Set<ValueRuleDTO> valueRules;
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static LsThingValidationDTO fromJsonToLsThingValidationDTO(String json) {
+        return new JSONDeserializer<LsThingValidationDTO>()
+        .use(null, LsThingValidationDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<LsThingValidationDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<LsThingValidationDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<LsThingValidationDTO> fromJsonArrayToLsThingValidatioes(String json) {
+        return new JSONDeserializer<List<LsThingValidationDTO>>()
+        .use("values", LsThingValidationDTO.class).deserialize(json);
+    }
+
+	public LsThing getLsThing() {
+        return this.lsThing;
+    }
+
+	public void setLsThing(LsThing lsThing) {
+        this.lsThing = lsThing;
+    }
+
+	public boolean isUniqueName() {
+        return this.uniqueName;
+    }
+
+	public void setUniqueName(boolean uniqueName) {
+        this.uniqueName = uniqueName;
+    }
+
+	public boolean isUniqueInteractions() {
+        return this.uniqueInteractions;
+    }
+
+	public void setUniqueInteractions(boolean uniqueInteractions) {
+        this.uniqueInteractions = uniqueInteractions;
+    }
+
+	public boolean isOrderMatters() {
+        return this.orderMatters;
+    }
+
+	public void setOrderMatters(boolean orderMatters) {
+        this.orderMatters = orderMatters;
+    }
+
+	public boolean isForwardAndReverseAreSame() {
+        return this.forwardAndReverseAreSame;
+    }
+
+	public void setForwardAndReverseAreSame(boolean forwardAndReverseAreSame) {
+        this.forwardAndReverseAreSame = forwardAndReverseAreSame;
+    }
+
+	public Set<ValueRuleDTO> getValueRules() {
+        return this.valueRules;
+    }
+
+	public void setValueRules(Set<ValueRuleDTO> valueRules) {
+        this.valueRules = valueRules;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingValidationDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/LsThingValidationDTO_Roo_JavaBean.aj
deleted file mode 100644
index 336de1deb..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LsThingValidationDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.dto.LsThingValidationDTO;
-import com.labsynch.labseer.dto.ValueRuleDTO;
-import java.util.Set;
-
-privileged aspect LsThingValidationDTO_Roo_JavaBean {
-    
-    public LsThing LsThingValidationDTO.getLsThing() {
-        return this.lsThing;
-    }
-    
-    public void LsThingValidationDTO.setLsThing(LsThing lsThing) {
-        this.lsThing = lsThing;
-    }
-    
-    public boolean LsThingValidationDTO.isUniqueName() {
-        return this.uniqueName;
-    }
-    
-    public void LsThingValidationDTO.setUniqueName(boolean uniqueName) {
-        this.uniqueName = uniqueName;
-    }
-    
-    public boolean LsThingValidationDTO.isUniqueInteractions() {
-        return this.uniqueInteractions;
-    }
-    
-    public void LsThingValidationDTO.setUniqueInteractions(boolean uniqueInteractions) {
-        this.uniqueInteractions = uniqueInteractions;
-    }
-    
-    public boolean LsThingValidationDTO.isOrderMatters() {
-        return this.orderMatters;
-    }
-    
-    public void LsThingValidationDTO.setOrderMatters(boolean orderMatters) {
-        this.orderMatters = orderMatters;
-    }
-    
-    public boolean LsThingValidationDTO.isForwardAndReverseAreSame() {
-        return this.forwardAndReverseAreSame;
-    }
-    
-    public void LsThingValidationDTO.setForwardAndReverseAreSame(boolean forwardAndReverseAreSame) {
-        this.forwardAndReverseAreSame = forwardAndReverseAreSame;
-    }
-    
-    public Set<ValueRuleDTO> LsThingValidationDTO.getValueRules() {
-        return this.valueRules;
-    }
-    
-    public void LsThingValidationDTO.setValueRules(Set<ValueRuleDTO> valueRules) {
-        this.valueRules = valueRules;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingValidationDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/LsThingValidationDTO_Roo_Json.aj
deleted file mode 100644
index afe56fb09..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LsThingValidationDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LsThingValidationDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect LsThingValidationDTO_Roo_Json {
-    
-    public String LsThingValidationDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String LsThingValidationDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static LsThingValidationDTO LsThingValidationDTO.fromJsonToLsThingValidationDTO(String json) {
-        return new JSONDeserializer<LsThingValidationDTO>()
-        .use(null, LsThingValidationDTO.class).deserialize(json);
-    }
-    
-    public static String LsThingValidationDTO.toJsonArray(Collection<LsThingValidationDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String LsThingValidationDTO.toJsonArray(Collection<LsThingValidationDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<LsThingValidationDTO> LsThingValidationDTO.fromJsonArrayToLsThingValidatioes(String json) {
-        return new JSONDeserializer<List<LsThingValidationDTO>>()
-        .use("values", LsThingValidationDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingValidationDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/LsThingValidationDTO_Roo_ToString.aj
deleted file mode 100644
index 3ebd9366d..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LsThingValidationDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LsThingValidationDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect LsThingValidationDTO_Roo_ToString {
-    
-    public String LsThingValidationDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/LsThingValuePathDTO.java
index 1bf522c6b..ccc80dd68 100644
--- a/src/main/java/com/labsynch/labseer/dto/LsThingValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LsThingValuePathDTO.java
@@ -1,14 +1,16 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.LsThingValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -38,6 +40,68 @@ public String toJson() {
 	public static String toJsonArray(Collection<LsThingValuePathDTO> collection) {
         return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
     }
+
+	public String getIdOrCodeName() {
+        return this.idOrCodeName;
+    }
+
+	public void setIdOrCodeName(String idOrCodeName) {
+        this.idOrCodeName = idOrCodeName;
+    }
+
+	public String getStateType() {
+        return this.stateType;
+    }
+
+	public void setStateType(String stateType) {
+        this.stateType = stateType;
+    }
+
+	public String getStateKind() {
+        return this.stateKind;
+    }
+
+	public void setStateKind(String stateKind) {
+        this.stateKind = stateKind;
+    }
+
+	public String getValueType() {
+        return this.valueType;
+    }
+
+	public void setValueType(String valueType) {
+        this.valueType = valueType;
+    }
+
+	public String getValueKind() {
+        return this.valueKind;
+    }
+
+	public void setValueKind(String valueKind) {
+        this.valueKind = valueKind;
+    }
+
+	public Collection<LsThingValue> getValues() {
+        return this.values;
+    }
+
+	public void setValues(Collection<LsThingValue> values) {
+        this.values = values;
+    }
+
+	public static LsThingValuePathDTO fromJsonToLsThingValuePathDTO(String json) {
+        return new JSONDeserializer<LsThingValuePathDTO>()
+        .use(null, LsThingValuePathDTO.class).deserialize(json);
+    }
+
+	public static Collection<LsThingValuePathDTO> fromJsonArrayToLsThingValuePathDTO(String json) {
+        return new JSONDeserializer<List<LsThingValuePathDTO>>()
+        .use("values", LsThingValuePathDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingValuePathDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/LsThingValuePathDTO_Roo_JavaBean.aj
deleted file mode 100644
index 1d1064ed8..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LsThingValuePathDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,60 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.LsThingValue;
-import com.labsynch.labseer.dto.LsThingValuePathDTO;
-import java.util.Collection;
-
-privileged aspect LsThingValuePathDTO_Roo_JavaBean {
-    
-    public String LsThingValuePathDTO.getIdOrCodeName() {
-        return this.idOrCodeName;
-    }
-    
-    public void LsThingValuePathDTO.setIdOrCodeName(String idOrCodeName) {
-        this.idOrCodeName = idOrCodeName;
-    }
-    
-    public String LsThingValuePathDTO.getStateType() {
-        return this.stateType;
-    }
-    
-    public void LsThingValuePathDTO.setStateType(String stateType) {
-        this.stateType = stateType;
-    }
-    
-    public String LsThingValuePathDTO.getStateKind() {
-        return this.stateKind;
-    }
-    
-    public void LsThingValuePathDTO.setStateKind(String stateKind) {
-        this.stateKind = stateKind;
-    }
-    
-    public String LsThingValuePathDTO.getValueType() {
-        return this.valueType;
-    }
-    
-    public void LsThingValuePathDTO.setValueType(String valueType) {
-        this.valueType = valueType;
-    }
-    
-    public String LsThingValuePathDTO.getValueKind() {
-        return this.valueKind;
-    }
-    
-    public void LsThingValuePathDTO.setValueKind(String valueKind) {
-        this.valueKind = valueKind;
-    }
-    
-    public Collection<LsThingValue> LsThingValuePathDTO.getValues() {
-        return this.values;
-    }
-    
-    public void LsThingValuePathDTO.setValues(Collection<LsThingValue> values) {
-        this.values = values;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingValuePathDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/LsThingValuePathDTO_Roo_Json.aj
deleted file mode 100644
index 2890040d7..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LsThingValuePathDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LsThingValuePathDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect LsThingValuePathDTO_Roo_Json {
-    
-    public static LsThingValuePathDTO LsThingValuePathDTO.fromJsonToLsThingValuePathDTO(String json) {
-        return new JSONDeserializer<LsThingValuePathDTO>()
-        .use(null, LsThingValuePathDTO.class).deserialize(json);
-    }
-    
-    public static Collection<LsThingValuePathDTO> LsThingValuePathDTO.fromJsonArrayToLsThingValuePathDTO(String json) {
-        return new JSONDeserializer<List<LsThingValuePathDTO>>()
-        .use("values", LsThingValuePathDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingValuePathDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/LsThingValuePathDTO_Roo_ToString.aj
deleted file mode 100644
index 30035968b..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LsThingValuePathDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LsThingValuePathDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect LsThingValuePathDTO_Roo_ToString {
-    
-    public String LsThingValuePathDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LsTransactionQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/LsTransactionQueryDTO.java
index 99879ac82..91a30f717 100644
--- a/src/main/java/com/labsynch/labseer/dto/LsTransactionQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LsTransactionQueryDTO.java
@@ -2,14 +2,16 @@
 
 import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.LsTransaction;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -41,6 +43,84 @@ public static String toJsonArray(Collection<LsTransactionQueryDTO> collection) {
         return new JSONSerializer().exclude("*.class").include("results").transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
+
+	public static LsTransactionQueryDTO fromJsonToLsTransactionQueryDTO(String json) {
+        return new JSONDeserializer<LsTransactionQueryDTO>()
+        .use(null, LsTransactionQueryDTO.class).deserialize(json);
+    }
+
+	public static Collection<LsTransactionQueryDTO> fromJsonArrayToLsTransactioes(String json) {
+        return new JSONDeserializer<List<LsTransactionQueryDTO>>()
+        .use("values", LsTransactionQueryDTO.class).deserialize(json);
+    }
+
+	public Date getRecordedDateGreaterThan() {
+        return this.recordedDateGreaterThan;
+    }
+
+	public void setRecordedDateGreaterThan(Date recordedDateGreaterThan) {
+        this.recordedDateGreaterThan = recordedDateGreaterThan;
+    }
+
+	public Date getRecordedDateLessThan() {
+        return this.recordedDateLessThan;
+    }
+
+	public void setRecordedDateLessThan(Date recordedDateLessThan) {
+        this.recordedDateLessThan = recordedDateLessThan;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public String getStatus() {
+        return this.status;
+    }
+
+	public void setStatus(String status) {
+        this.status = status;
+    }
+
+	public String getType() {
+        return this.type;
+    }
+
+	public void setType(String type) {
+        this.type = type;
+    }
+
+	public Integer getMaxResults() {
+        return this.maxResults;
+    }
+
+	public void setMaxResults(Integer maxResults) {
+        this.maxResults = maxResults;
+    }
+
+	public Integer getNumberOfResults() {
+        return this.numberOfResults;
+    }
+
+	public void setNumberOfResults(Integer numberOfResults) {
+        this.numberOfResults = numberOfResults;
+    }
+
+	public Collection<LsTransaction> getResults() {
+        return this.results;
+    }
+
+	public void setResults(Collection<LsTransaction> results) {
+        this.results = results;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/LsTransactionQueryDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/LsTransactionQueryDTO_Roo_JavaBean.aj
deleted file mode 100644
index dfd60d32e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LsTransactionQueryDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,77 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.LsTransaction;
-import com.labsynch.labseer.dto.LsTransactionQueryDTO;
-import java.util.Collection;
-import java.util.Date;
-
-privileged aspect LsTransactionQueryDTO_Roo_JavaBean {
-    
-    public Date LsTransactionQueryDTO.getRecordedDateGreaterThan() {
-        return this.recordedDateGreaterThan;
-    }
-    
-    public void LsTransactionQueryDTO.setRecordedDateGreaterThan(Date recordedDateGreaterThan) {
-        this.recordedDateGreaterThan = recordedDateGreaterThan;
-    }
-    
-    public Date LsTransactionQueryDTO.getRecordedDateLessThan() {
-        return this.recordedDateLessThan;
-    }
-    
-    public void LsTransactionQueryDTO.setRecordedDateLessThan(Date recordedDateLessThan) {
-        this.recordedDateLessThan = recordedDateLessThan;
-    }
-    
-    public String LsTransactionQueryDTO.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void LsTransactionQueryDTO.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public String LsTransactionQueryDTO.getStatus() {
-        return this.status;
-    }
-    
-    public void LsTransactionQueryDTO.setStatus(String status) {
-        this.status = status;
-    }
-    
-    public String LsTransactionQueryDTO.getType() {
-        return this.type;
-    }
-    
-    public void LsTransactionQueryDTO.setType(String type) {
-        this.type = type;
-    }
-    
-    public Integer LsTransactionQueryDTO.getMaxResults() {
-        return this.maxResults;
-    }
-    
-    public void LsTransactionQueryDTO.setMaxResults(Integer maxResults) {
-        this.maxResults = maxResults;
-    }
-    
-    public Integer LsTransactionQueryDTO.getNumberOfResults() {
-        return this.numberOfResults;
-    }
-    
-    public void LsTransactionQueryDTO.setNumberOfResults(Integer numberOfResults) {
-        this.numberOfResults = numberOfResults;
-    }
-    
-    public Collection<LsTransaction> LsTransactionQueryDTO.getResults() {
-        return this.results;
-    }
-    
-    public void LsTransactionQueryDTO.setResults(Collection<LsTransaction> results) {
-        this.results = results;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LsTransactionQueryDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/LsTransactionQueryDTO_Roo_Json.aj
deleted file mode 100644
index c71274840..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LsTransactionQueryDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LsTransactionQueryDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect LsTransactionQueryDTO_Roo_Json {
-    
-    public static LsTransactionQueryDTO LsTransactionQueryDTO.fromJsonToLsTransactionQueryDTO(String json) {
-        return new JSONDeserializer<LsTransactionQueryDTO>()
-        .use(null, LsTransactionQueryDTO.class).deserialize(json);
-    }
-    
-    public static Collection<LsTransactionQueryDTO> LsTransactionQueryDTO.fromJsonArrayToLsTransactioes(String json) {
-        return new JSONDeserializer<List<LsTransactionQueryDTO>>()
-        .use("values", LsTransactionQueryDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/LsTransactionQueryDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/LsTransactionQueryDTO_Roo_ToString.aj
deleted file mode 100644
index 75e252f92..000000000
--- a/src/main/java/com/labsynch/labseer/dto/LsTransactionQueryDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LsTransactionQueryDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect LsTransactionQueryDTO_Roo_ToString {
-    
-    public String LsTransactionQueryDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/Metalot.java b/src/main/java/com/labsynch/labseer/dto/Metalot.java
index ccd940c34..93fe65324 100755
--- a/src/main/java/com/labsynch/labseer/dto/Metalot.java
+++ b/src/main/java/com/labsynch/labseer/dto/Metalot.java
@@ -6,7 +6,8 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -60,4 +61,40 @@ public static String toJsonArray(Collection<Metalot> collection) {
 	public static Collection<Metalot> fromJsonArrayToMetalots(String json) {
         return new JSONDeserializer<List<Metalot>>().use(null, ArrayList.class).use("values", Metalot.class).deserialize(json);
     }
+
+	public boolean isSkipParentDupeCheck() {
+        return this.skipParentDupeCheck;
+    }
+
+	public void setSkipParentDupeCheck(boolean skipParentDupeCheck) {
+        this.skipParentDupeCheck = skipParentDupeCheck;
+    }
+
+	public Lot getLot() {
+        return this.lot;
+    }
+
+	public void setLot(Lot lot) {
+        this.lot = lot;
+    }
+
+	public Set<IsoSalt> getIsosalts() {
+        return this.isosalts;
+    }
+
+	public void setIsosalts(Set<IsoSalt> isosalts) {
+        this.isosalts = isosalts;
+    }
+
+	public Set<FileList> getFileList() {
+        return this.fileList;
+    }
+
+	public void setFileList(Set<FileList> fileList) {
+        this.fileList = fileList;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/MetalotReturn.java b/src/main/java/com/labsynch/labseer/dto/MetalotReturn.java
index fd7926ec1..7c3f3aafb 100755
--- a/src/main/java/com/labsynch/labseer/dto/MetalotReturn.java
+++ b/src/main/java/com/labsynch/labseer/dto/MetalotReturn.java
@@ -1,16 +1,18 @@
 package com.labsynch.labseer.dto;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
 import javax.transaction.Transactional;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.service.ErrorMessage;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 import flexjson.transformer.DateTransformer;
 
@@ -32,4 +34,44 @@ public String toJson() {
         return json;
 	}
 
+
+	public Metalot getMetalot() {
+        return this.metalot;
+    }
+
+	public void setMetalot(Metalot metalot) {
+        this.metalot = metalot;
+    }
+
+	public ArrayList<ErrorMessage> getErrors() {
+        return this.errors;
+    }
+
+	public void setErrors(ArrayList<ErrorMessage> errors) {
+        this.errors = errors;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static MetalotReturn fromJsonToMetalotReturn(String json) {
+        return new JSONDeserializer<MetalotReturn>()
+        .use(null, MetalotReturn.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<MetalotReturn> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<MetalotReturn> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<MetalotReturn> fromJsonArrayToMetalotReturns(String json) {
+        return new JSONDeserializer<List<MetalotReturn>>()
+        .use("values", MetalotReturn.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/MetalotReturnDTO.java b/src/main/java/com/labsynch/labseer/dto/MetalotReturnDTO.java
index 98a308857..56985e65a 100755
--- a/src/main/java/com/labsynch/labseer/dto/MetalotReturnDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MetalotReturnDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -15,4 +21,62 @@ public class MetalotReturnDTO{
 	
 	private long buid;
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public long getId() {
+        return this.id;
+    }
+
+	public void setId(long id) {
+        this.id = id;
+    }
+
+	public String getCorpName() {
+        return this.corpName;
+    }
+
+	public void setCorpName(String corpName) {
+        this.corpName = corpName;
+    }
+
+	public long getBuid() {
+        return this.buid;
+    }
+
+	public void setBuid(long buid) {
+        this.buid = buid;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static MetalotReturnDTO fromJsonToMetalotReturnDTO(String json) {
+        return new JSONDeserializer<MetalotReturnDTO>()
+        .use(null, MetalotReturnDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<MetalotReturnDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<MetalotReturnDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<MetalotReturnDTO> fromJsonArrayToMetaloes(String json) {
+        return new JSONDeserializer<List<MetalotReturnDTO>>()
+        .use("values", MetalotReturnDTO.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/MetalotReturnDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/MetalotReturnDTO_Roo_JavaBean.aj
deleted file mode 100644
index d6c153e4b..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MetalotReturnDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.MetalotReturnDTO;
-
-privileged aspect MetalotReturnDTO_Roo_JavaBean {
-    
-    public long MetalotReturnDTO.getId() {
-        return this.id;
-    }
-    
-    public void MetalotReturnDTO.setId(long id) {
-        this.id = id;
-    }
-    
-    public String MetalotReturnDTO.getCorpName() {
-        return this.corpName;
-    }
-    
-    public void MetalotReturnDTO.setCorpName(String corpName) {
-        this.corpName = corpName;
-    }
-    
-    public long MetalotReturnDTO.getBuid() {
-        return this.buid;
-    }
-    
-    public void MetalotReturnDTO.setBuid(long buid) {
-        this.buid = buid;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MetalotReturnDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/MetalotReturnDTO_Roo_Json.aj
deleted file mode 100644
index 2919a9d37..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MetalotReturnDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.MetalotReturnDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect MetalotReturnDTO_Roo_Json {
-    
-    public String MetalotReturnDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String MetalotReturnDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static MetalotReturnDTO MetalotReturnDTO.fromJsonToMetalotReturnDTO(String json) {
-        return new JSONDeserializer<MetalotReturnDTO>()
-        .use(null, MetalotReturnDTO.class).deserialize(json);
-    }
-    
-    public static String MetalotReturnDTO.toJsonArray(Collection<MetalotReturnDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String MetalotReturnDTO.toJsonArray(Collection<MetalotReturnDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<MetalotReturnDTO> MetalotReturnDTO.fromJsonArrayToMetaloes(String json) {
-        return new JSONDeserializer<List<MetalotReturnDTO>>()
-        .use("values", MetalotReturnDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MetalotReturnDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/MetalotReturnDTO_Roo_ToString.aj
deleted file mode 100644
index 46c44f938..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MetalotReturnDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.MetalotReturnDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect MetalotReturnDTO_Roo_ToString {
-    
-    public String MetalotReturnDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MetalotReturn_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/MetalotReturn_Roo_JavaBean.aj
deleted file mode 100644
index a752f5989..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MetalotReturn_Roo_JavaBean.aj
+++ /dev/null
@@ -1,29 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.Metalot;
-import com.labsynch.labseer.dto.MetalotReturn;
-import com.labsynch.labseer.service.ErrorMessage;
-import java.util.ArrayList;
-
-privileged aspect MetalotReturn_Roo_JavaBean {
-    
-    public Metalot MetalotReturn.getMetalot() {
-        return this.metalot;
-    }
-    
-    public void MetalotReturn.setMetalot(Metalot metalot) {
-        this.metalot = metalot;
-    }
-    
-    public ArrayList<ErrorMessage> MetalotReturn.getErrors() {
-        return this.errors;
-    }
-    
-    public void MetalotReturn.setErrors(ArrayList<ErrorMessage> errors) {
-        this.errors = errors;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MetalotReturn_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/MetalotReturn_Roo_Json.aj
deleted file mode 100644
index 3570f385c..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MetalotReturn_Roo_Json.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.MetalotReturn;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect MetalotReturn_Roo_Json {
-    
-    public static MetalotReturn MetalotReturn.fromJsonToMetalotReturn(String json) {
-        return new JSONDeserializer<MetalotReturn>()
-        .use(null, MetalotReturn.class).deserialize(json);
-    }
-    
-    public static String MetalotReturn.toJsonArray(Collection<MetalotReturn> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String MetalotReturn.toJsonArray(Collection<MetalotReturn> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<MetalotReturn> MetalotReturn.fromJsonArrayToMetalotReturns(String json) {
-        return new JSONDeserializer<List<MetalotReturn>>()
-        .use("values", MetalotReturn.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MetalotReturn_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/MetalotReturn_Roo_ToString.aj
deleted file mode 100644
index b23b3128a..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MetalotReturn_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.MetalotReturn;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect MetalotReturn_Roo_ToString {
-    
-    public String MetalotReturn.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/Metalot_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/Metalot_Roo_JavaBean.aj
deleted file mode 100644
index fb9e25997..000000000
--- a/src/main/java/com/labsynch/labseer/dto/Metalot_Roo_JavaBean.aj
+++ /dev/null
@@ -1,46 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.FileList;
-import com.labsynch.labseer.domain.IsoSalt;
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.dto.Metalot;
-import java.util.Set;
-
-privileged aspect Metalot_Roo_JavaBean {
-    
-    public boolean Metalot.isSkipParentDupeCheck() {
-        return this.skipParentDupeCheck;
-    }
-    
-    public void Metalot.setSkipParentDupeCheck(boolean skipParentDupeCheck) {
-        this.skipParentDupeCheck = skipParentDupeCheck;
-    }
-    
-    public Lot Metalot.getLot() {
-        return this.lot;
-    }
-    
-    public void Metalot.setLot(Lot lot) {
-        this.lot = lot;
-    }
-    
-    public Set<IsoSalt> Metalot.getIsosalts() {
-        return this.isosalts;
-    }
-    
-    public void Metalot.setIsosalts(Set<IsoSalt> isosalts) {
-        this.isosalts = isosalts;
-    }
-    
-    public Set<FileList> Metalot.getFileList() {
-        return this.fileList;
-    }
-    
-    public void Metalot.setFileList(Set<FileList> fileList) {
-        this.fileList = fileList;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/Metalot_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/Metalot_Roo_ToString.aj
deleted file mode 100644
index 0e41dad55..000000000
--- a/src/main/java/com/labsynch/labseer/dto/Metalot_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.Metalot;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect Metalot_Roo_ToString {
-    
-    public String Metalot.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MethodOptionDTO.java b/src/main/java/com/labsynch/labseer/dto/MethodOptionDTO.java
index c1d116a40..01c65cec1 100644
--- a/src/main/java/com/labsynch/labseer/dto/MethodOptionDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MethodOptionDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -11,4 +17,46 @@ public class MethodOptionDTO {
 		
 	private String method;
 	
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static MethodOptionDTO fromJsonToMethodOptionDTO(String json) {
+        return new JSONDeserializer<MethodOptionDTO>()
+        .use(null, MethodOptionDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<MethodOptionDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<MethodOptionDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<MethodOptionDTO> fromJsonArrayToMethodOptioes(String json) {
+        return new JSONDeserializer<List<MethodOptionDTO>>()
+        .use("values", MethodOptionDTO.class).deserialize(json);
+    }
+
+	public String getMethod() {
+        return this.method;
+    }
+
+	public void setMethod(String method) {
+        this.method = method;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/MethodOptionDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/MethodOptionDTO_Roo_JavaBean.aj
deleted file mode 100644
index 136b71cac..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MethodOptionDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.MethodOptionDTO;
-
-privileged aspect MethodOptionDTO_Roo_JavaBean {
-    
-    public String MethodOptionDTO.getMethod() {
-        return this.method;
-    }
-    
-    public void MethodOptionDTO.setMethod(String method) {
-        this.method = method;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MethodOptionDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/MethodOptionDTO_Roo_Json.aj
deleted file mode 100644
index 4cae4e721..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MethodOptionDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.MethodOptionDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect MethodOptionDTO_Roo_Json {
-    
-    public String MethodOptionDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String MethodOptionDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static MethodOptionDTO MethodOptionDTO.fromJsonToMethodOptionDTO(String json) {
-        return new JSONDeserializer<MethodOptionDTO>()
-        .use(null, MethodOptionDTO.class).deserialize(json);
-    }
-    
-    public static String MethodOptionDTO.toJsonArray(Collection<MethodOptionDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String MethodOptionDTO.toJsonArray(Collection<MethodOptionDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<MethodOptionDTO> MethodOptionDTO.fromJsonArrayToMethodOptioes(String json) {
-        return new JSONDeserializer<List<MethodOptionDTO>>()
-        .use("values", MethodOptionDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MethodOptionDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/MethodOptionDTO_Roo_ToString.aj
deleted file mode 100644
index 0223400a5..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MethodOptionDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.MethodOptionDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect MethodOptionDTO_Roo_ToString {
-    
-    public String MethodOptionDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MolCleanInputDTO.java b/src/main/java/com/labsynch/labseer/dto/MolCleanInputDTO.java
index 5c8f90723..ae48f82ef 100644
--- a/src/main/java/com/labsynch/labseer/dto/MolCleanInputDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MolCleanInputDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -13,4 +19,54 @@ public class MolCleanInputDTO {
 		
 	private CleanMolOptionsDTO parameters;
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static MolCleanInputDTO fromJsonToMolCleanInputDTO(String json) {
+        return new JSONDeserializer<MolCleanInputDTO>()
+        .use(null, MolCleanInputDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<MolCleanInputDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<MolCleanInputDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<MolCleanInputDTO> fromJsonArrayToMoes(String json) {
+        return new JSONDeserializer<List<MolCleanInputDTO>>()
+        .use("values", MolCleanInputDTO.class).deserialize(json);
+    }
+
+	public String getStructure() {
+        return this.structure;
+    }
+
+	public void setStructure(String structure) {
+        this.structure = structure;
+    }
+
+	public CleanMolOptionsDTO getParameters() {
+        return this.parameters;
+    }
+
+	public void setParameters(CleanMolOptionsDTO parameters) {
+        this.parameters = parameters;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/MolCleanInputDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/MolCleanInputDTO_Roo_JavaBean.aj
deleted file mode 100644
index dd986e03d..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MolCleanInputDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,27 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CleanMolOptionsDTO;
-import com.labsynch.labseer.dto.MolCleanInputDTO;
-
-privileged aspect MolCleanInputDTO_Roo_JavaBean {
-    
-    public String MolCleanInputDTO.getStructure() {
-        return this.structure;
-    }
-    
-    public void MolCleanInputDTO.setStructure(String structure) {
-        this.structure = structure;
-    }
-    
-    public CleanMolOptionsDTO MolCleanInputDTO.getParameters() {
-        return this.parameters;
-    }
-    
-    public void MolCleanInputDTO.setParameters(CleanMolOptionsDTO parameters) {
-        this.parameters = parameters;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MolCleanInputDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/MolCleanInputDTO_Roo_Json.aj
deleted file mode 100644
index bd33487d2..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MolCleanInputDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.MolCleanInputDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect MolCleanInputDTO_Roo_Json {
-    
-    public String MolCleanInputDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String MolCleanInputDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static MolCleanInputDTO MolCleanInputDTO.fromJsonToMolCleanInputDTO(String json) {
-        return new JSONDeserializer<MolCleanInputDTO>()
-        .use(null, MolCleanInputDTO.class).deserialize(json);
-    }
-    
-    public static String MolCleanInputDTO.toJsonArray(Collection<MolCleanInputDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String MolCleanInputDTO.toJsonArray(Collection<MolCleanInputDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<MolCleanInputDTO> MolCleanInputDTO.fromJsonArrayToMoes(String json) {
-        return new JSONDeserializer<List<MolCleanInputDTO>>()
-        .use("values", MolCleanInputDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MolCleanInputDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/MolCleanInputDTO_Roo_ToString.aj
deleted file mode 100644
index c5784ab92..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MolCleanInputDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.MolCleanInputDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect MolCleanInputDTO_Roo_ToString {
-    
-    public String MolCleanInputDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MolConvertInputDTO.java b/src/main/java/com/labsynch/labseer/dto/MolConvertInputDTO.java
index 9f9e37c42..a77848b35 100644
--- a/src/main/java/com/labsynch/labseer/dto/MolConvertInputDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MolConvertInputDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -15,4 +21,62 @@ public class MolConvertInputDTO {
 	
 	private String parameters;
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getStructure() {
+        return this.structure;
+    }
+
+	public void setStructure(String structure) {
+        this.structure = structure;
+    }
+
+	public String getInputFormat() {
+        return this.inputFormat;
+    }
+
+	public void setInputFormat(String inputFormat) {
+        this.inputFormat = inputFormat;
+    }
+
+	public String getParameters() {
+        return this.parameters;
+    }
+
+	public void setParameters(String parameters) {
+        this.parameters = parameters;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static MolConvertInputDTO fromJsonToMolConvertInputDTO(String json) {
+        return new JSONDeserializer<MolConvertInputDTO>()
+        .use(null, MolConvertInputDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<MolConvertInputDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<MolConvertInputDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<MolConvertInputDTO> fromJsonArrayToMolCoes(String json) {
+        return new JSONDeserializer<List<MolConvertInputDTO>>()
+        .use("values", MolConvertInputDTO.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/MolConvertInputDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/MolConvertInputDTO_Roo_JavaBean.aj
deleted file mode 100644
index 8f0b54f4e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MolConvertInputDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.MolConvertInputDTO;
-
-privileged aspect MolConvertInputDTO_Roo_JavaBean {
-    
-    public String MolConvertInputDTO.getStructure() {
-        return this.structure;
-    }
-    
-    public void MolConvertInputDTO.setStructure(String structure) {
-        this.structure = structure;
-    }
-    
-    public String MolConvertInputDTO.getInputFormat() {
-        return this.inputFormat;
-    }
-    
-    public void MolConvertInputDTO.setInputFormat(String inputFormat) {
-        this.inputFormat = inputFormat;
-    }
-    
-    public String MolConvertInputDTO.getParameters() {
-        return this.parameters;
-    }
-    
-    public void MolConvertInputDTO.setParameters(String parameters) {
-        this.parameters = parameters;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MolConvertInputDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/MolConvertInputDTO_Roo_Json.aj
deleted file mode 100644
index 7e5b25ecc..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MolConvertInputDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.MolConvertInputDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect MolConvertInputDTO_Roo_Json {
-    
-    public String MolConvertInputDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String MolConvertInputDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static MolConvertInputDTO MolConvertInputDTO.fromJsonToMolConvertInputDTO(String json) {
-        return new JSONDeserializer<MolConvertInputDTO>()
-        .use(null, MolConvertInputDTO.class).deserialize(json);
-    }
-    
-    public static String MolConvertInputDTO.toJsonArray(Collection<MolConvertInputDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String MolConvertInputDTO.toJsonArray(Collection<MolConvertInputDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<MolConvertInputDTO> MolConvertInputDTO.fromJsonArrayToMolCoes(String json) {
-        return new JSONDeserializer<List<MolConvertInputDTO>>()
-        .use("values", MolConvertInputDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MolConvertInputDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/MolConvertInputDTO_Roo_ToString.aj
deleted file mode 100644
index d01f437c4..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MolConvertInputDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.MolConvertInputDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect MolConvertInputDTO_Roo_ToString {
-    
-    public String MolConvertInputDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MolConvertOutputDTO.java b/src/main/java/com/labsynch/labseer/dto/MolConvertOutputDTO.java
index 47de9b0e1..fe6c6ec4b 100644
--- a/src/main/java/com/labsynch/labseer/dto/MolConvertOutputDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MolConvertOutputDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -15,4 +21,62 @@ public class MolConvertOutputDTO {
 	
 	private String contentUrl;
 
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static MolConvertOutputDTO fromJsonToMolConvertOutputDTO(String json) {
+        return new JSONDeserializer<MolConvertOutputDTO>()
+        .use(null, MolConvertOutputDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<MolConvertOutputDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<MolConvertOutputDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<MolConvertOutputDTO> fromJsonArrayToMolCoes(String json) {
+        return new JSONDeserializer<List<MolConvertOutputDTO>>()
+        .use("values", MolConvertOutputDTO.class).deserialize(json);
+    }
+
+	public String getStructure() {
+        return this.structure;
+    }
+
+	public void setStructure(String structure) {
+        this.structure = structure;
+    }
+
+	public String getFormat() {
+        return this.format;
+    }
+
+	public void setFormat(String format) {
+        this.format = format;
+    }
+
+	public String getContentUrl() {
+        return this.contentUrl;
+    }
+
+	public void setContentUrl(String contentUrl) {
+        this.contentUrl = contentUrl;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/MolConvertOutputDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/MolConvertOutputDTO_Roo_JavaBean.aj
deleted file mode 100644
index 313be0857..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MolConvertOutputDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.MolConvertOutputDTO;
-
-privileged aspect MolConvertOutputDTO_Roo_JavaBean {
-    
-    public String MolConvertOutputDTO.getStructure() {
-        return this.structure;
-    }
-    
-    public void MolConvertOutputDTO.setStructure(String structure) {
-        this.structure = structure;
-    }
-    
-    public String MolConvertOutputDTO.getFormat() {
-        return this.format;
-    }
-    
-    public void MolConvertOutputDTO.setFormat(String format) {
-        this.format = format;
-    }
-    
-    public String MolConvertOutputDTO.getContentUrl() {
-        return this.contentUrl;
-    }
-    
-    public void MolConvertOutputDTO.setContentUrl(String contentUrl) {
-        this.contentUrl = contentUrl;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MolConvertOutputDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/MolConvertOutputDTO_Roo_Json.aj
deleted file mode 100644
index e3086179a..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MolConvertOutputDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.MolConvertOutputDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect MolConvertOutputDTO_Roo_Json {
-    
-    public String MolConvertOutputDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String MolConvertOutputDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static MolConvertOutputDTO MolConvertOutputDTO.fromJsonToMolConvertOutputDTO(String json) {
-        return new JSONDeserializer<MolConvertOutputDTO>()
-        .use(null, MolConvertOutputDTO.class).deserialize(json);
-    }
-    
-    public static String MolConvertOutputDTO.toJsonArray(Collection<MolConvertOutputDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String MolConvertOutputDTO.toJsonArray(Collection<MolConvertOutputDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<MolConvertOutputDTO> MolConvertOutputDTO.fromJsonArrayToMolCoes(String json) {
-        return new JSONDeserializer<List<MolConvertOutputDTO>>()
-        .use("values", MolConvertOutputDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MolConvertOutputDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/MolConvertOutputDTO_Roo_ToString.aj
deleted file mode 100644
index 39eba6734..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MolConvertOutputDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.MolConvertOutputDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect MolConvertOutputDTO_Roo_ToString {
-    
-    public String MolConvertOutputDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MolInputDTO.java b/src/main/java/com/labsynch/labseer/dto/MolInputDTO.java
index c402cf4e7..78d6172eb 100644
--- a/src/main/java/com/labsynch/labseer/dto/MolInputDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MolInputDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -11,4 +17,46 @@ public class MolInputDTO {
 	
 	private String structure;
 	
+
+	public String getStructure() {
+        return this.structure;
+    }
+
+	public void setStructure(String structure) {
+        this.structure = structure;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static MolInputDTO fromJsonToMolInputDTO(String json) {
+        return new JSONDeserializer<MolInputDTO>()
+        .use(null, MolInputDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<MolInputDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<MolInputDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<MolInputDTO> fromJsonArrayToMoes(String json) {
+        return new JSONDeserializer<List<MolInputDTO>>()
+        .use("values", MolInputDTO.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/MolInputDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/MolInputDTO_Roo_JavaBean.aj
deleted file mode 100644
index 0f20f21d0..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MolInputDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.MolInputDTO;
-
-privileged aspect MolInputDTO_Roo_JavaBean {
-    
-    public String MolInputDTO.getStructure() {
-        return this.structure;
-    }
-    
-    public void MolInputDTO.setStructure(String structure) {
-        this.structure = structure;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MolInputDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/MolInputDTO_Roo_Json.aj
deleted file mode 100644
index 213ef89ac..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MolInputDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.MolInputDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect MolInputDTO_Roo_Json {
-    
-    public String MolInputDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String MolInputDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static MolInputDTO MolInputDTO.fromJsonToMolInputDTO(String json) {
-        return new JSONDeserializer<MolInputDTO>()
-        .use(null, MolInputDTO.class).deserialize(json);
-    }
-    
-    public static String MolInputDTO.toJsonArray(Collection<MolInputDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String MolInputDTO.toJsonArray(Collection<MolInputDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<MolInputDTO> MolInputDTO.fromJsonArrayToMoes(String json) {
-        return new JSONDeserializer<List<MolInputDTO>>()
-        .use("values", MolInputDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MolInputDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/MolInputDTO_Roo_ToString.aj
deleted file mode 100644
index 77329d75f..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MolInputDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.MolInputDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect MolInputDTO_Roo_ToString {
-    
-    public String MolInputDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MolPropertiesDTO.java b/src/main/java/com/labsynch/labseer/dto/MolPropertiesDTO.java
index efc71ccf3..fd3a910c5 100644
--- a/src/main/java/com/labsynch/labseer/dto/MolPropertiesDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MolPropertiesDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -17,6 +23,72 @@ public class MolPropertiesDTO {
 
 	private String smiles;
 
+
+	public String getMolStructure() {
+        return this.molStructure;
+    }
+
+	public void setMolStructure(String molStructure) {
+        this.molStructure = molStructure;
+    }
+
+	public Double getMolWeight() {
+        return this.molWeight;
+    }
+
+	public void setMolWeight(Double molWeight) {
+        this.molWeight = molWeight;
+    }
+
+	public String getMolFormula() {
+        return this.molFormula;
+    }
+
+	public void setMolFormula(String molFormula) {
+        this.molFormula = molFormula;
+    }
+
+	public String getSmiles() {
+        return this.smiles;
+    }
+
+	public void setSmiles(String smiles) {
+        this.smiles = smiles;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static MolPropertiesDTO fromJsonToMolPropertiesDTO(String json) {
+        return new JSONDeserializer<MolPropertiesDTO>()
+        .use(null, MolPropertiesDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<MolPropertiesDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<MolPropertiesDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<MolPropertiesDTO> fromJsonArrayToMolProes(String json) {
+        return new JSONDeserializer<List<MolPropertiesDTO>>()
+        .use("values", MolPropertiesDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/MolPropertiesDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/MolPropertiesDTO_Roo_JavaBean.aj
deleted file mode 100644
index 5528dfc72..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MolPropertiesDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,42 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.MolPropertiesDTO;
-
-privileged aspect MolPropertiesDTO_Roo_JavaBean {
-    
-    public String MolPropertiesDTO.getMolStructure() {
-        return this.molStructure;
-    }
-    
-    public void MolPropertiesDTO.setMolStructure(String molStructure) {
-        this.molStructure = molStructure;
-    }
-    
-    public Double MolPropertiesDTO.getMolWeight() {
-        return this.molWeight;
-    }
-    
-    public void MolPropertiesDTO.setMolWeight(Double molWeight) {
-        this.molWeight = molWeight;
-    }
-    
-    public String MolPropertiesDTO.getMolFormula() {
-        return this.molFormula;
-    }
-    
-    public void MolPropertiesDTO.setMolFormula(String molFormula) {
-        this.molFormula = molFormula;
-    }
-    
-    public String MolPropertiesDTO.getSmiles() {
-        return this.smiles;
-    }
-    
-    public void MolPropertiesDTO.setSmiles(String smiles) {
-        this.smiles = smiles;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MolPropertiesDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/MolPropertiesDTO_Roo_Json.aj
deleted file mode 100644
index f6b210095..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MolPropertiesDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.MolPropertiesDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect MolPropertiesDTO_Roo_Json {
-    
-    public String MolPropertiesDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String MolPropertiesDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static MolPropertiesDTO MolPropertiesDTO.fromJsonToMolPropertiesDTO(String json) {
-        return new JSONDeserializer<MolPropertiesDTO>()
-        .use(null, MolPropertiesDTO.class).deserialize(json);
-    }
-    
-    public static String MolPropertiesDTO.toJsonArray(Collection<MolPropertiesDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String MolPropertiesDTO.toJsonArray(Collection<MolPropertiesDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<MolPropertiesDTO> MolPropertiesDTO.fromJsonArrayToMolProes(String json) {
-        return new JSONDeserializer<List<MolPropertiesDTO>>()
-        .use("values", MolPropertiesDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MolPropertiesDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/MolPropertiesDTO_Roo_ToString.aj
deleted file mode 100644
index add959282..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MolPropertiesDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.MolPropertiesDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect MolPropertiesDTO_Roo_ToString {
-    
-    public String MolPropertiesDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchRequest.java b/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchRequest.java
index 1a9f4abae..9bd220f9f 100644
--- a/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchRequest.java
+++ b/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchRequest.java
@@ -1,7 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -28,4 +32,94 @@ public class MultiContainerSubjectSearchRequest {
 	public MultiContainerSubjectSearchRequest(){
 		
 	}
+
+	public Integer getMaxResults() {
+        return this.maxResults;
+    }
+
+	public void setMaxResults(Integer maxResults) {
+        this.maxResults = maxResults;
+    }
+
+	public String getProtocolLabelLike() {
+        return this.protocolLabelLike;
+    }
+
+	public void setProtocolLabelLike(String protocolLabelLike) {
+        this.protocolLabelLike = protocolLabelLike;
+    }
+
+	public String getExperimentLabelLike() {
+        return this.experimentLabelLike;
+    }
+
+	public void setExperimentLabelLike(String experimentLabelLike) {
+        this.experimentLabelLike = experimentLabelLike;
+    }
+
+	public Collection<String> getContainerCodes() {
+        return this.containerCodes;
+    }
+
+	public void setContainerCodes(Collection<String> containerCodes) {
+        this.containerCodes = containerCodes;
+    }
+
+	public String getSubjectType() {
+        return this.subjectType;
+    }
+
+	public void setSubjectType(String subjectType) {
+        this.subjectType = subjectType;
+    }
+
+	public String getSubjectKind() {
+        return this.subjectKind;
+    }
+
+	public void setSubjectKind(String subjectKind) {
+        this.subjectKind = subjectKind;
+    }
+
+	public Collection<ValueQueryDTO> getValues() {
+        return this.values;
+    }
+
+	public void setValues(Collection<ValueQueryDTO> values) {
+        this.values = values;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static MultiContainerSubjectSearchRequest fromJsonToMultiContainerSubjectSearchRequest(String json) {
+        return new JSONDeserializer<MultiContainerSubjectSearchRequest>()
+        .use(null, MultiContainerSubjectSearchRequest.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<MultiContainerSubjectSearchRequest> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<MultiContainerSubjectSearchRequest> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<MultiContainerSubjectSearchRequest> fromJsonArrayToMultiContainerSubjectSearchRequests(String json) {
+        return new JSONDeserializer<List<MultiContainerSubjectSearchRequest>>()
+        .use("values", MultiContainerSubjectSearchRequest.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchRequest_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchRequest_Roo_JavaBean.aj
deleted file mode 100644
index b3df6b2d5..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchRequest_Roo_JavaBean.aj
+++ /dev/null
@@ -1,68 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.MultiContainerSubjectSearchRequest;
-import com.labsynch.labseer.dto.ValueQueryDTO;
-import java.util.Collection;
-
-privileged aspect MultiContainerSubjectSearchRequest_Roo_JavaBean {
-    
-    public Integer MultiContainerSubjectSearchRequest.getMaxResults() {
-        return this.maxResults;
-    }
-    
-    public void MultiContainerSubjectSearchRequest.setMaxResults(Integer maxResults) {
-        this.maxResults = maxResults;
-    }
-    
-    public String MultiContainerSubjectSearchRequest.getProtocolLabelLike() {
-        return this.protocolLabelLike;
-    }
-    
-    public void MultiContainerSubjectSearchRequest.setProtocolLabelLike(String protocolLabelLike) {
-        this.protocolLabelLike = protocolLabelLike;
-    }
-    
-    public String MultiContainerSubjectSearchRequest.getExperimentLabelLike() {
-        return this.experimentLabelLike;
-    }
-    
-    public void MultiContainerSubjectSearchRequest.setExperimentLabelLike(String experimentLabelLike) {
-        this.experimentLabelLike = experimentLabelLike;
-    }
-    
-    public Collection<String> MultiContainerSubjectSearchRequest.getContainerCodes() {
-        return this.containerCodes;
-    }
-    
-    public void MultiContainerSubjectSearchRequest.setContainerCodes(Collection<String> containerCodes) {
-        this.containerCodes = containerCodes;
-    }
-    
-    public String MultiContainerSubjectSearchRequest.getSubjectType() {
-        return this.subjectType;
-    }
-    
-    public void MultiContainerSubjectSearchRequest.setSubjectType(String subjectType) {
-        this.subjectType = subjectType;
-    }
-    
-    public String MultiContainerSubjectSearchRequest.getSubjectKind() {
-        return this.subjectKind;
-    }
-    
-    public void MultiContainerSubjectSearchRequest.setSubjectKind(String subjectKind) {
-        this.subjectKind = subjectKind;
-    }
-    
-    public Collection<ValueQueryDTO> MultiContainerSubjectSearchRequest.getValues() {
-        return this.values;
-    }
-    
-    public void MultiContainerSubjectSearchRequest.setValues(Collection<ValueQueryDTO> values) {
-        this.values = values;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchRequest_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchRequest_Roo_Json.aj
deleted file mode 100644
index 1d18385b6..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchRequest_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.MultiContainerSubjectSearchRequest;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect MultiContainerSubjectSearchRequest_Roo_Json {
-    
-    public String MultiContainerSubjectSearchRequest.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String MultiContainerSubjectSearchRequest.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static MultiContainerSubjectSearchRequest MultiContainerSubjectSearchRequest.fromJsonToMultiContainerSubjectSearchRequest(String json) {
-        return new JSONDeserializer<MultiContainerSubjectSearchRequest>()
-        .use(null, MultiContainerSubjectSearchRequest.class).deserialize(json);
-    }
-    
-    public static String MultiContainerSubjectSearchRequest.toJsonArray(Collection<MultiContainerSubjectSearchRequest> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String MultiContainerSubjectSearchRequest.toJsonArray(Collection<MultiContainerSubjectSearchRequest> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<MultiContainerSubjectSearchRequest> MultiContainerSubjectSearchRequest.fromJsonArrayToMultiContainerSubjectSearchRequests(String json) {
-        return new JSONDeserializer<List<MultiContainerSubjectSearchRequest>>()
-        .use("values", MultiContainerSubjectSearchRequest.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchRequest_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchRequest_Roo_ToString.aj
deleted file mode 100644
index 012a008a0..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchRequest_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.MultiContainerSubjectSearchRequest;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect MultiContainerSubjectSearchRequest_Roo_ToString {
-    
-    public String MultiContainerSubjectSearchRequest.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchResultDTO.java b/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchResultDTO.java
index f9842602d..379c0e640 100644
--- a/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchResultDTO.java
@@ -1,14 +1,16 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -51,4 +53,52 @@ public String toJsonStub() {
         return new JSONSerializer().exclude("*.class", "results.subjects.lsStates").include("results", "results.subjects.lsTags", "results.subjects.lsLabels").prettyPrint(false).transform(new ExcludeNulls(), void.class).serialize(this);
     }
 	
+
+	public static MultiContainerSubjectSearchResultDTO fromJsonToMultiContainerSubjectSearchResultDTO(String json) {
+        return new JSONDeserializer<MultiContainerSubjectSearchResultDTO>()
+        .use(null, MultiContainerSubjectSearchResultDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<MultiContainerSubjectSearchResultDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<MultiContainerSubjectSearchResultDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<MultiContainerSubjectSearchResultDTO> fromJsonArrayToMultiCoes(String json) {
+        return new JSONDeserializer<List<MultiContainerSubjectSearchResultDTO>>()
+        .use("values", MultiContainerSubjectSearchResultDTO.class).deserialize(json);
+    }
+
+	public Integer getMaxResults() {
+        return this.maxResults;
+    }
+
+	public void setMaxResults(Integer maxResults) {
+        this.maxResults = maxResults;
+    }
+
+	public Integer getNumberOfResults() {
+        return this.numberOfResults;
+    }
+
+	public void setNumberOfResults(Integer numberOfResults) {
+        this.numberOfResults = numberOfResults;
+    }
+
+	public Collection<ContainerSubjectsDTO> getResults() {
+        return this.results;
+    }
+
+	public void setResults(Collection<ContainerSubjectsDTO> results) {
+        this.results = results;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchResultDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchResultDTO_Roo_JavaBean.aj
deleted file mode 100644
index adc37793b..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchResultDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,36 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ContainerSubjectsDTO;
-import com.labsynch.labseer.dto.MultiContainerSubjectSearchResultDTO;
-import java.util.Collection;
-
-privileged aspect MultiContainerSubjectSearchResultDTO_Roo_JavaBean {
-    
-    public Integer MultiContainerSubjectSearchResultDTO.getMaxResults() {
-        return this.maxResults;
-    }
-    
-    public void MultiContainerSubjectSearchResultDTO.setMaxResults(Integer maxResults) {
-        this.maxResults = maxResults;
-    }
-    
-    public Integer MultiContainerSubjectSearchResultDTO.getNumberOfResults() {
-        return this.numberOfResults;
-    }
-    
-    public void MultiContainerSubjectSearchResultDTO.setNumberOfResults(Integer numberOfResults) {
-        this.numberOfResults = numberOfResults;
-    }
-    
-    public Collection<ContainerSubjectsDTO> MultiContainerSubjectSearchResultDTO.getResults() {
-        return this.results;
-    }
-    
-    public void MultiContainerSubjectSearchResultDTO.setResults(Collection<ContainerSubjectsDTO> results) {
-        this.results = results;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchResultDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchResultDTO_Roo_Json.aj
deleted file mode 100644
index 6160e5503..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchResultDTO_Roo_Json.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.MultiContainerSubjectSearchResultDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect MultiContainerSubjectSearchResultDTO_Roo_Json {
-    
-    public static MultiContainerSubjectSearchResultDTO MultiContainerSubjectSearchResultDTO.fromJsonToMultiContainerSubjectSearchResultDTO(String json) {
-        return new JSONDeserializer<MultiContainerSubjectSearchResultDTO>()
-        .use(null, MultiContainerSubjectSearchResultDTO.class).deserialize(json);
-    }
-    
-    public static String MultiContainerSubjectSearchResultDTO.toJsonArray(Collection<MultiContainerSubjectSearchResultDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String MultiContainerSubjectSearchResultDTO.toJsonArray(Collection<MultiContainerSubjectSearchResultDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<MultiContainerSubjectSearchResultDTO> MultiContainerSubjectSearchResultDTO.fromJsonArrayToMultiCoes(String json) {
-        return new JSONDeserializer<List<MultiContainerSubjectSearchResultDTO>>()
-        .use("values", MultiContainerSubjectSearchResultDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchResultDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchResultDTO_Roo_ToString.aj
deleted file mode 100644
index ae10bb6ed..000000000
--- a/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchResultDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.MultiContainerSubjectSearchResultDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect MultiContainerSubjectSearchResultDTO_Roo_ToString {
-    
-    public String MultiContainerSubjectSearchResultDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO.java b/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO.java
index 34892e83a..9f415b52a 100644
--- a/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO.java
@@ -5,12 +5,16 @@
 import java.util.List;
 
 import javax.persistence.NoResultException;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.Parent;
 import com.labsynch.labseer.domain.ParentAlias;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
 @RooJavaBean
 @RooToString
@@ -77,4 +81,110 @@ public static Collection<ParentAliasDTO> getParentsByAlias(Collection<ParentAlia
 		return results;
 	}
 
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ParentAliasDTO fromJsonToParentAliasDTO(String json) {
+        return new JSONDeserializer<ParentAliasDTO>()
+        .use(null, ParentAliasDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ParentAliasDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ParentAliasDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ParentAliasDTO> fromJsonArrayToParentAliasDTO(String json) {
+        return new JSONDeserializer<List<ParentAliasDTO>>()
+        .use("values", ParentAliasDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getParentCorpName() {
+        return this.parentCorpName;
+    }
+
+	public void setParentCorpName(String parentCorpName) {
+        this.parentCorpName = parentCorpName;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getAliasName() {
+        return this.aliasName;
+    }
+
+	public void setAliasName(String aliasName) {
+        this.aliasName = aliasName;
+    }
+
+	public boolean isPreferred() {
+        return this.preferred;
+    }
+
+	public void setPreferred(boolean preferred) {
+        this.preferred = preferred;
+    }
+
+	public Integer getSortId() {
+        return this.sortId;
+    }
+
+	public void setSortId(Integer sortId) {
+        this.sortId = sortId;
+    }
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Boolean getIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(Boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO_Roo_JavaBean.aj
deleted file mode 100644
index 5cfbd3b2e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,82 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ParentAliasDTO;
-
-privileged aspect ParentAliasDTO_Roo_JavaBean {
-    
-    public String ParentAliasDTO.getParentCorpName() {
-        return this.parentCorpName;
-    }
-    
-    public void ParentAliasDTO.setParentCorpName(String parentCorpName) {
-        this.parentCorpName = parentCorpName;
-    }
-    
-    public String ParentAliasDTO.getLsType() {
-        return this.lsType;
-    }
-    
-    public void ParentAliasDTO.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String ParentAliasDTO.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void ParentAliasDTO.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String ParentAliasDTO.getAliasName() {
-        return this.aliasName;
-    }
-    
-    public void ParentAliasDTO.setAliasName(String aliasName) {
-        this.aliasName = aliasName;
-    }
-    
-    public boolean ParentAliasDTO.isPreferred() {
-        return this.preferred;
-    }
-    
-    public void ParentAliasDTO.setPreferred(boolean preferred) {
-        this.preferred = preferred;
-    }
-    
-    public Integer ParentAliasDTO.getSortId() {
-        return this.sortId;
-    }
-    
-    public void ParentAliasDTO.setSortId(Integer sortId) {
-        this.sortId = sortId;
-    }
-    
-    public Long ParentAliasDTO.getId() {
-        return this.id;
-    }
-    
-    public void ParentAliasDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Boolean ParentAliasDTO.getIgnored() {
-        return this.ignored;
-    }
-    
-    public void ParentAliasDTO.setIgnored(Boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public Integer ParentAliasDTO.getVersion() {
-        return this.version;
-    }
-    
-    public void ParentAliasDTO.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO_Roo_Json.aj
deleted file mode 100644
index 0169099b4..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ParentAliasDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ParentAliasDTO_Roo_Json {
-    
-    public String ParentAliasDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ParentAliasDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ParentAliasDTO ParentAliasDTO.fromJsonToParentAliasDTO(String json) {
-        return new JSONDeserializer<ParentAliasDTO>()
-        .use(null, ParentAliasDTO.class).deserialize(json);
-    }
-    
-    public static String ParentAliasDTO.toJsonArray(Collection<ParentAliasDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ParentAliasDTO.toJsonArray(Collection<ParentAliasDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ParentAliasDTO> ParentAliasDTO.fromJsonArrayToParentAliasDTO(String json) {
-        return new JSONDeserializer<List<ParentAliasDTO>>()
-        .use("values", ParentAliasDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO_Roo_ToString.aj
deleted file mode 100644
index fbd778bb9..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ParentAliasDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ParentAliasDTO_Roo_ToString {
-    
-    public String ParentAliasDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentDTO.java b/src/main/java/com/labsynch/labseer/dto/ParentDTO.java
index bbd6fcb03..0169502b2 100755
--- a/src/main/java/com/labsynch/labseer/dto/ParentDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ParentDTO.java
@@ -1,12 +1,15 @@
 package com.labsynch.labseer.dto;
 
+import java.util.Collection;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import javax.persistence.Column;
 import javax.persistence.ManyToOne;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
@@ -19,6 +22,8 @@
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
 import com.labsynch.labseer.service.ChemStructureService;
 import com.labsynch.labseer.utils.MoleculeUtil;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
 @RooJavaBean
 @RooToString
@@ -86,4 +91,182 @@ public void setParent(Parent parent) {
 		this.setId(parent.getId());
 	}
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ParentDTO fromJsonToParentDTO(String json) {
+        return new JSONDeserializer<ParentDTO>()
+        .use(null, ParentDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ParentDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ParentDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ParentDTO> fromJsonArrayToParentDTO(String json) {
+        return new JSONDeserializer<List<ParentDTO>>()
+        .use("values", ParentDTO.class).deserialize(json);
+    }
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public String getCorpName() {
+        return this.corpName;
+    }
+
+	public void setCorpName(String corpName) {
+        this.corpName = corpName;
+    }
+
+	public String getChemist() {
+        return this.chemist;
+    }
+
+	public void setChemist(String chemist) {
+        this.chemist = chemist;
+    }
+
+	public String getCommonName() {
+        return this.commonName;
+    }
+
+	public void setCommonName(String commonName) {
+        this.commonName = commonName;
+    }
+
+	public StereoCategory getStereoCategory() {
+        return this.stereoCategory;
+    }
+
+	public void setStereoCategory(StereoCategory stereoCategory) {
+        this.stereoCategory = stereoCategory;
+    }
+
+	public String getStereoComment() {
+        return this.stereoComment;
+    }
+
+	public void setStereoComment(String stereoComment) {
+        this.stereoComment = stereoComment;
+    }
+
+	public String getMolStructure() {
+        return this.molStructure;
+    }
+
+	public void setMolStructure(String molStructure) {
+        this.molStructure = molStructure;
+    }
+
+	public Double getExactMass() {
+        return this.exactMass;
+    }
+
+	public void setExactMass(Double exactMass) {
+        this.exactMass = exactMass;
+    }
+
+	public String getMolFormula() {
+        return this.molFormula;
+    }
+
+	public void setMolFormula(String molFormula) {
+        this.molFormula = molFormula;
+    }
+
+	public int getCdId() {
+        return this.CdId;
+    }
+
+	public void setCdId(int CdId) {
+        this.CdId = CdId;
+    }
+
+	public Double getMolWeight() {
+        return this.molWeight;
+    }
+
+	public void setMolWeight(Double molWeight) {
+        this.molWeight = molWeight;
+    }
+
+	public Boolean getIgnore() {
+        return this.ignore;
+    }
+
+	public void setIgnore(Boolean ignore) {
+        this.ignore = ignore;
+    }
+
+	public ParentAnnotation getParentAnnotation() {
+        return this.parentAnnotation;
+    }
+
+	public void setParentAnnotation(ParentAnnotation parentAnnotation) {
+        this.parentAnnotation = parentAnnotation;
+    }
+
+	public CompoundType getCompoundType() {
+        return this.compoundType;
+    }
+
+	public void setCompoundType(CompoundType compoundType) {
+        this.compoundType = compoundType;
+    }
+
+	public String getComment() {
+        return this.comment;
+    }
+
+	public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+	public Boolean getIsMixture() {
+        return this.isMixture;
+    }
+
+	public void setIsMixture(Boolean isMixture) {
+        this.isMixture = isMixture;
+    }
+
+	public Set<SaltFormDTO> getSaltForms() {
+        return this.saltForms;
+    }
+
+	public void setSaltForms(Set<SaltFormDTO> saltForms) {
+        this.saltForms = saltForms;
+    }
+
+	public Set<ParentAliasDTO> getParentAliases() {
+        return this.parentAliases;
+    }
+
+	public void setParentAliases(Set<ParentAliasDTO> parentAliases) {
+        this.parentAliases = parentAliases;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ParentDTO_Roo_JavaBean.aj
deleted file mode 100644
index 8432c0103..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ParentDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,160 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.CompoundType;
-import com.labsynch.labseer.domain.ParentAnnotation;
-import com.labsynch.labseer.domain.StereoCategory;
-import com.labsynch.labseer.dto.ParentAliasDTO;
-import com.labsynch.labseer.dto.ParentDTO;
-import com.labsynch.labseer.dto.SaltFormDTO;
-import java.util.Set;
-
-privileged aspect ParentDTO_Roo_JavaBean {
-    
-    public Long ParentDTO.getId() {
-        return this.id;
-    }
-    
-    public void ParentDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-    public String ParentDTO.getCorpName() {
-        return this.corpName;
-    }
-    
-    public void ParentDTO.setCorpName(String corpName) {
-        this.corpName = corpName;
-    }
-    
-    public String ParentDTO.getChemist() {
-        return this.chemist;
-    }
-    
-    public void ParentDTO.setChemist(String chemist) {
-        this.chemist = chemist;
-    }
-    
-    public String ParentDTO.getCommonName() {
-        return this.commonName;
-    }
-    
-    public void ParentDTO.setCommonName(String commonName) {
-        this.commonName = commonName;
-    }
-    
-    public StereoCategory ParentDTO.getStereoCategory() {
-        return this.stereoCategory;
-    }
-    
-    public void ParentDTO.setStereoCategory(StereoCategory stereoCategory) {
-        this.stereoCategory = stereoCategory;
-    }
-    
-    public String ParentDTO.getStereoComment() {
-        return this.stereoComment;
-    }
-    
-    public void ParentDTO.setStereoComment(String stereoComment) {
-        this.stereoComment = stereoComment;
-    }
-    
-    public String ParentDTO.getMolStructure() {
-        return this.molStructure;
-    }
-    
-    public void ParentDTO.setMolStructure(String molStructure) {
-        this.molStructure = molStructure;
-    }
-    
-    public Double ParentDTO.getExactMass() {
-        return this.exactMass;
-    }
-    
-    public void ParentDTO.setExactMass(Double exactMass) {
-        this.exactMass = exactMass;
-    }
-    
-    public String ParentDTO.getMolFormula() {
-        return this.molFormula;
-    }
-    
-    public void ParentDTO.setMolFormula(String molFormula) {
-        this.molFormula = molFormula;
-    }
-    
-    public int ParentDTO.getCdId() {
-        return this.CdId;
-    }
-    
-    public void ParentDTO.setCdId(int CdId) {
-        this.CdId = CdId;
-    }
-    
-    public Double ParentDTO.getMolWeight() {
-        return this.molWeight;
-    }
-    
-    public void ParentDTO.setMolWeight(Double molWeight) {
-        this.molWeight = molWeight;
-    }
-    
-    public Boolean ParentDTO.getIgnore() {
-        return this.ignore;
-    }
-    
-    public void ParentDTO.setIgnore(Boolean ignore) {
-        this.ignore = ignore;
-    }
-    
-    public ParentAnnotation ParentDTO.getParentAnnotation() {
-        return this.parentAnnotation;
-    }
-    
-    public void ParentDTO.setParentAnnotation(ParentAnnotation parentAnnotation) {
-        this.parentAnnotation = parentAnnotation;
-    }
-    
-    public CompoundType ParentDTO.getCompoundType() {
-        return this.compoundType;
-    }
-    
-    public void ParentDTO.setCompoundType(CompoundType compoundType) {
-        this.compoundType = compoundType;
-    }
-    
-    public String ParentDTO.getComment() {
-        return this.comment;
-    }
-    
-    public void ParentDTO.setComment(String comment) {
-        this.comment = comment;
-    }
-    
-    public Boolean ParentDTO.getIsMixture() {
-        return this.isMixture;
-    }
-    
-    public void ParentDTO.setIsMixture(Boolean isMixture) {
-        this.isMixture = isMixture;
-    }
-    
-    public Set<SaltFormDTO> ParentDTO.getSaltForms() {
-        return this.saltForms;
-    }
-    
-    public void ParentDTO.setSaltForms(Set<SaltFormDTO> saltForms) {
-        this.saltForms = saltForms;
-    }
-    
-    public Set<ParentAliasDTO> ParentDTO.getParentAliases() {
-        return this.parentAliases;
-    }
-    
-    public void ParentDTO.setParentAliases(Set<ParentAliasDTO> parentAliases) {
-        this.parentAliases = parentAliases;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ParentDTO_Roo_Json.aj
deleted file mode 100644
index b0e629721..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ParentDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ParentDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ParentDTO_Roo_Json {
-    
-    public String ParentDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ParentDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ParentDTO ParentDTO.fromJsonToParentDTO(String json) {
-        return new JSONDeserializer<ParentDTO>()
-        .use(null, ParentDTO.class).deserialize(json);
-    }
-    
-    public static String ParentDTO.toJsonArray(Collection<ParentDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ParentDTO.toJsonArray(Collection<ParentDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ParentDTO> ParentDTO.fromJsonArrayToParentDTO(String json) {
-        return new JSONDeserializer<List<ParentDTO>>()
-        .use("values", ParentDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ParentDTO_Roo_ToString.aj
deleted file mode 100644
index d58eaa620..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ParentDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ParentDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ParentDTO_Roo_ToString {
-    
-    public String ParentDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentEditDTO.java b/src/main/java/com/labsynch/labseer/dto/ParentEditDTO.java
index 2120769ef..bd6905e64 100644
--- a/src/main/java/com/labsynch/labseer/dto/ParentEditDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ParentEditDTO.java
@@ -1,12 +1,15 @@
 package com.labsynch.labseer.dto;
 
+import java.util.Collection;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import javax.persistence.Column;
 import javax.persistence.ManyToOne;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -15,6 +18,8 @@
 import com.labsynch.labseer.domain.Parent;
 import com.labsynch.labseer.domain.ParentAnnotation;
 import com.labsynch.labseer.domain.StereoCategory;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
 @RooJavaBean
 @RooToString
@@ -90,4 +95,206 @@ public void setParent(Parent parent) {
 //		this.setId(parent.getId());
 	}
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public String getCorpName() {
+        return this.corpName;
+    }
+
+	public void setCorpName(String corpName) {
+        this.corpName = corpName;
+    }
+
+	public String getChemistCode() {
+        return this.chemistCode;
+    }
+
+	public void setChemistCode(String chemistCode) {
+        this.chemistCode = chemistCode;
+    }
+
+	public String getModifiedBy() {
+        return this.modifiedBy;
+    }
+
+	public void setModifiedBy(String modifiedBy) {
+        this.modifiedBy = modifiedBy;
+    }
+
+	public String getCommonName() {
+        return this.commonName;
+    }
+
+	public void setCommonName(String commonName) {
+        this.commonName = commonName;
+    }
+
+	public String getStereoCategoryCode() {
+        return this.stereoCategoryCode;
+    }
+
+	public void setStereoCategoryCode(String stereoCategoryCode) {
+        this.stereoCategoryCode = stereoCategoryCode;
+    }
+
+	public String getStereoComment() {
+        return this.stereoComment;
+    }
+
+	public void setStereoComment(String stereoComment) {
+        this.stereoComment = stereoComment;
+    }
+
+	public String getMolStructure() {
+        return this.molStructure;
+    }
+
+	public void setMolStructure(String molStructure) {
+        this.molStructure = molStructure;
+    }
+
+	public Double getExactMass() {
+        return this.exactMass;
+    }
+
+	public void setExactMass(Double exactMass) {
+        this.exactMass = exactMass;
+    }
+
+	public String getMolFormula() {
+        return this.molFormula;
+    }
+
+	public void setMolFormula(String molFormula) {
+        this.molFormula = molFormula;
+    }
+
+	public int getCdId() {
+        return this.CdId;
+    }
+
+	public void setCdId(int CdId) {
+        this.CdId = CdId;
+    }
+
+	public Double getMolWeight() {
+        return this.molWeight;
+    }
+
+	public void setMolWeight(Double molWeight) {
+        this.molWeight = molWeight;
+    }
+
+	public Boolean getIgnore() {
+        return this.ignore;
+    }
+
+	public void setIgnore(Boolean ignore) {
+        this.ignore = ignore;
+    }
+
+	public String getParentAnnotationCode() {
+        return this.parentAnnotationCode;
+    }
+
+	public void setParentAnnotationCode(String parentAnnotationCode) {
+        this.parentAnnotationCode = parentAnnotationCode;
+    }
+
+	public String getCompoundTypeCode() {
+        return this.compoundTypeCode;
+    }
+
+	public void setCompoundTypeCode(String compoundTypeCode) {
+        this.compoundTypeCode = compoundTypeCode;
+    }
+
+	public String getComment() {
+        return this.comment;
+    }
+
+	public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+	public Boolean getIsMixture() {
+        return this.isMixture;
+    }
+
+	public void setIsMixture(Boolean isMixture) {
+        this.isMixture = isMixture;
+    }
+
+	public String getCommonNameAliases() {
+        return this.commonNameAliases;
+    }
+
+	public void setCommonNameAliases(String commonNameAliases) {
+        this.commonNameAliases = commonNameAliases;
+    }
+
+	public String getLiveDesignAliases() {
+        return this.liveDesignAliases;
+    }
+
+	public void setLiveDesignAliases(String liveDesignAliases) {
+        this.liveDesignAliases = liveDesignAliases;
+    }
+
+	public String getDefaultAliases() {
+        return this.defaultAliases;
+    }
+
+	public void setDefaultAliases(String defaultAliases) {
+        this.defaultAliases = defaultAliases;
+    }
+
+	public Set<ParentAliasDTO> getParentAliases() {
+        return this.parentAliases;
+    }
+
+	public void setParentAliases(Set<ParentAliasDTO> parentAliases) {
+        this.parentAliases = parentAliases;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ParentEditDTO fromJsonToParentEditDTO(String json) {
+        return new JSONDeserializer<ParentEditDTO>()
+        .use(null, ParentEditDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ParentEditDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ParentEditDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ParentEditDTO> fromJsonArrayToParentEditDTO(String json) {
+        return new JSONDeserializer<List<ParentEditDTO>>()
+        .use("values", ParentEditDTO.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentEditDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ParentEditDTO_Roo_JavaBean.aj
deleted file mode 100644
index 0e63aff4e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ParentEditDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,180 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ParentAliasDTO;
-import com.labsynch.labseer.dto.ParentEditDTO;
-import java.util.Set;
-
-privileged aspect ParentEditDTO_Roo_JavaBean {
-    
-    public Long ParentEditDTO.getId() {
-        return this.id;
-    }
-    
-    public void ParentEditDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-    public String ParentEditDTO.getCorpName() {
-        return this.corpName;
-    }
-    
-    public void ParentEditDTO.setCorpName(String corpName) {
-        this.corpName = corpName;
-    }
-    
-    public String ParentEditDTO.getChemistCode() {
-        return this.chemistCode;
-    }
-    
-    public void ParentEditDTO.setChemistCode(String chemistCode) {
-        this.chemistCode = chemistCode;
-    }
-    
-    public String ParentEditDTO.getModifiedBy() {
-        return this.modifiedBy;
-    }
-    
-    public void ParentEditDTO.setModifiedBy(String modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
-    
-    public String ParentEditDTO.getCommonName() {
-        return this.commonName;
-    }
-    
-    public void ParentEditDTO.setCommonName(String commonName) {
-        this.commonName = commonName;
-    }
-    
-    public String ParentEditDTO.getStereoCategoryCode() {
-        return this.stereoCategoryCode;
-    }
-    
-    public void ParentEditDTO.setStereoCategoryCode(String stereoCategoryCode) {
-        this.stereoCategoryCode = stereoCategoryCode;
-    }
-    
-    public String ParentEditDTO.getStereoComment() {
-        return this.stereoComment;
-    }
-    
-    public void ParentEditDTO.setStereoComment(String stereoComment) {
-        this.stereoComment = stereoComment;
-    }
-    
-    public String ParentEditDTO.getMolStructure() {
-        return this.molStructure;
-    }
-    
-    public void ParentEditDTO.setMolStructure(String molStructure) {
-        this.molStructure = molStructure;
-    }
-    
-    public Double ParentEditDTO.getExactMass() {
-        return this.exactMass;
-    }
-    
-    public void ParentEditDTO.setExactMass(Double exactMass) {
-        this.exactMass = exactMass;
-    }
-    
-    public String ParentEditDTO.getMolFormula() {
-        return this.molFormula;
-    }
-    
-    public void ParentEditDTO.setMolFormula(String molFormula) {
-        this.molFormula = molFormula;
-    }
-    
-    public int ParentEditDTO.getCdId() {
-        return this.CdId;
-    }
-    
-    public void ParentEditDTO.setCdId(int CdId) {
-        this.CdId = CdId;
-    }
-    
-    public Double ParentEditDTO.getMolWeight() {
-        return this.molWeight;
-    }
-    
-    public void ParentEditDTO.setMolWeight(Double molWeight) {
-        this.molWeight = molWeight;
-    }
-    
-    public Boolean ParentEditDTO.getIgnore() {
-        return this.ignore;
-    }
-    
-    public void ParentEditDTO.setIgnore(Boolean ignore) {
-        this.ignore = ignore;
-    }
-    
-    public String ParentEditDTO.getParentAnnotationCode() {
-        return this.parentAnnotationCode;
-    }
-    
-    public void ParentEditDTO.setParentAnnotationCode(String parentAnnotationCode) {
-        this.parentAnnotationCode = parentAnnotationCode;
-    }
-    
-    public String ParentEditDTO.getCompoundTypeCode() {
-        return this.compoundTypeCode;
-    }
-    
-    public void ParentEditDTO.setCompoundTypeCode(String compoundTypeCode) {
-        this.compoundTypeCode = compoundTypeCode;
-    }
-    
-    public String ParentEditDTO.getComment() {
-        return this.comment;
-    }
-    
-    public void ParentEditDTO.setComment(String comment) {
-        this.comment = comment;
-    }
-    
-    public Boolean ParentEditDTO.getIsMixture() {
-        return this.isMixture;
-    }
-    
-    public void ParentEditDTO.setIsMixture(Boolean isMixture) {
-        this.isMixture = isMixture;
-    }
-    
-    public String ParentEditDTO.getCommonNameAliases() {
-        return this.commonNameAliases;
-    }
-    
-    public void ParentEditDTO.setCommonNameAliases(String commonNameAliases) {
-        this.commonNameAliases = commonNameAliases;
-    }
-    
-    public String ParentEditDTO.getLiveDesignAliases() {
-        return this.liveDesignAliases;
-    }
-    
-    public void ParentEditDTO.setLiveDesignAliases(String liveDesignAliases) {
-        this.liveDesignAliases = liveDesignAliases;
-    }
-    
-    public String ParentEditDTO.getDefaultAliases() {
-        return this.defaultAliases;
-    }
-    
-    public void ParentEditDTO.setDefaultAliases(String defaultAliases) {
-        this.defaultAliases = defaultAliases;
-    }
-    
-    public Set<ParentAliasDTO> ParentEditDTO.getParentAliases() {
-        return this.parentAliases;
-    }
-    
-    public void ParentEditDTO.setParentAliases(Set<ParentAliasDTO> parentAliases) {
-        this.parentAliases = parentAliases;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentEditDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ParentEditDTO_Roo_Json.aj
deleted file mode 100644
index 7303d8820..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ParentEditDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ParentEditDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ParentEditDTO_Roo_Json {
-    
-    public String ParentEditDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ParentEditDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ParentEditDTO ParentEditDTO.fromJsonToParentEditDTO(String json) {
-        return new JSONDeserializer<ParentEditDTO>()
-        .use(null, ParentEditDTO.class).deserialize(json);
-    }
-    
-    public static String ParentEditDTO.toJsonArray(Collection<ParentEditDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ParentEditDTO.toJsonArray(Collection<ParentEditDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ParentEditDTO> ParentEditDTO.fromJsonArrayToParentEditDTO(String json) {
-        return new JSONDeserializer<List<ParentEditDTO>>()
-        .use("values", ParentEditDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentEditDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ParentEditDTO_Roo_ToString.aj
deleted file mode 100644
index 457d1c474..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ParentEditDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ParentEditDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ParentEditDTO_Roo_ToString {
-    
-    public String ParentEditDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentLotCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/ParentLotCodeDTO.java
index f564215d9..d359aca84 100644
--- a/src/main/java/com/labsynch/labseer/dto/ParentLotCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ParentLotCodeDTO.java
@@ -1,11 +1,13 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -35,4 +37,42 @@ public static String toJsonArray(Collection<ParentLotCodeDTO> collection) {
         .exclude("*.class").serialize(collection);
     }
 
+
+	public static ParentLotCodeDTO fromJsonToParentLotCodeDTO(String json) {
+        return new JSONDeserializer<ParentLotCodeDTO>()
+        .use(null, ParentLotCodeDTO.class).deserialize(json);
+    }
+
+	public static Collection<ParentLotCodeDTO> fromJsonArrayToParentLotCoes(String json) {
+        return new JSONDeserializer<List<ParentLotCodeDTO>>()
+        .use("values", ParentLotCodeDTO.class).deserialize(json);
+    }
+
+	public String getRequestName() {
+        return this.requestName;
+    }
+
+	public void setRequestName(String requestName) {
+        this.requestName = requestName;
+    }
+
+	public String getReferenceCode() {
+        return this.referenceCode;
+    }
+
+	public void setReferenceCode(String referenceCode) {
+        this.referenceCode = referenceCode;
+    }
+
+	public Collection<String> getLotCodes() {
+        return this.lotCodes;
+    }
+
+	public void setLotCodes(Collection<String> lotCodes) {
+        this.lotCodes = lotCodes;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentLotCodeDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ParentLotCodeDTO_Roo_JavaBean.aj
deleted file mode 100644
index 69da68888..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ParentLotCodeDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ParentLotCodeDTO;
-import java.util.Collection;
-
-privileged aspect ParentLotCodeDTO_Roo_JavaBean {
-    
-    public String ParentLotCodeDTO.getRequestName() {
-        return this.requestName;
-    }
-    
-    public void ParentLotCodeDTO.setRequestName(String requestName) {
-        this.requestName = requestName;
-    }
-    
-    public String ParentLotCodeDTO.getReferenceCode() {
-        return this.referenceCode;
-    }
-    
-    public void ParentLotCodeDTO.setReferenceCode(String referenceCode) {
-        this.referenceCode = referenceCode;
-    }
-    
-    public Collection<String> ParentLotCodeDTO.getLotCodes() {
-        return this.lotCodes;
-    }
-    
-    public void ParentLotCodeDTO.setLotCodes(Collection<String> lotCodes) {
-        this.lotCodes = lotCodes;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentLotCodeDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ParentLotCodeDTO_Roo_Json.aj
deleted file mode 100644
index 960156f6e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ParentLotCodeDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ParentLotCodeDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ParentLotCodeDTO_Roo_Json {
-    
-    public static ParentLotCodeDTO ParentLotCodeDTO.fromJsonToParentLotCodeDTO(String json) {
-        return new JSONDeserializer<ParentLotCodeDTO>()
-        .use(null, ParentLotCodeDTO.class).deserialize(json);
-    }
-    
-    public static Collection<ParentLotCodeDTO> ParentLotCodeDTO.fromJsonArrayToParentLotCoes(String json) {
-        return new JSONDeserializer<List<ParentLotCodeDTO>>()
-        .use("values", ParentLotCodeDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentLotCodeDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ParentLotCodeDTO_Roo_ToString.aj
deleted file mode 100644
index 1c0f54d0a..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ParentLotCodeDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ParentLotCodeDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ParentLotCodeDTO_Roo_ToString {
-    
-    public String ParentLotCodeDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentValidationDTO.java b/src/main/java/com/labsynch/labseer/dto/ParentValidationDTO.java
index 1d2b5b8ff..ebd5b6cde 100644
--- a/src/main/java/com/labsynch/labseer/dto/ParentValidationDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ParentValidationDTO.java
@@ -2,7 +2,9 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.roo.addon.javabean.RooJavaBean;
@@ -10,7 +12,7 @@
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.service.ErrorMessage;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -38,4 +40,60 @@ public String toJson() {
         .exclude("*.class").serialize(this);
     }
     
+
+	public Collection<CodeTableDTO> getAffectedLots() {
+        return this.affectedLots;
+    }
+
+	public void setAffectedLots(Collection<CodeTableDTO> affectedLots) {
+        this.affectedLots = affectedLots;
+    }
+
+	public boolean isParentUnique() {
+        return this.parentUnique;
+    }
+
+	public void setParentUnique(boolean parentUnique) {
+        this.parentUnique = parentUnique;
+    }
+
+	public Collection<ParentDTO> getDupeParents() {
+        return this.dupeParents;
+    }
+
+	public void setDupeParents(Collection<ParentDTO> dupeParents) {
+        this.dupeParents = dupeParents;
+    }
+
+	public Collection<ErrorMessage> getErrors() {
+        return this.errors;
+    }
+
+	public void setErrors(Collection<ErrorMessage> errors) {
+        this.errors = errors;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static ParentValidationDTO fromJsonToParentValidationDTO(String json) {
+        return new JSONDeserializer<ParentValidationDTO>()
+        .use(null, ParentValidationDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ParentValidationDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ParentValidationDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ParentValidationDTO> fromJsonArrayToParentValidatioes(String json) {
+        return new JSONDeserializer<List<ParentValidationDTO>>()
+        .use("values", ParentValidationDTO.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentValidationDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ParentValidationDTO_Roo_JavaBean.aj
deleted file mode 100644
index f5d5c5131..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ParentValidationDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,46 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.CodeTableDTO;
-import com.labsynch.labseer.dto.ParentDTO;
-import com.labsynch.labseer.dto.ParentValidationDTO;
-import com.labsynch.labseer.service.ErrorMessage;
-import java.util.Collection;
-
-privileged aspect ParentValidationDTO_Roo_JavaBean {
-    
-    public Collection<CodeTableDTO> ParentValidationDTO.getAffectedLots() {
-        return this.affectedLots;
-    }
-    
-    public void ParentValidationDTO.setAffectedLots(Collection<CodeTableDTO> affectedLots) {
-        this.affectedLots = affectedLots;
-    }
-    
-    public boolean ParentValidationDTO.isParentUnique() {
-        return this.parentUnique;
-    }
-    
-    public void ParentValidationDTO.setParentUnique(boolean parentUnique) {
-        this.parentUnique = parentUnique;
-    }
-    
-    public Collection<ParentDTO> ParentValidationDTO.getDupeParents() {
-        return this.dupeParents;
-    }
-    
-    public void ParentValidationDTO.setDupeParents(Collection<ParentDTO> dupeParents) {
-        this.dupeParents = dupeParents;
-    }
-    
-    public Collection<ErrorMessage> ParentValidationDTO.getErrors() {
-        return this.errors;
-    }
-    
-    public void ParentValidationDTO.setErrors(Collection<ErrorMessage> errors) {
-        this.errors = errors;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentValidationDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ParentValidationDTO_Roo_Json.aj
deleted file mode 100644
index ee8e093f8..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ParentValidationDTO_Roo_Json.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ParentValidationDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ParentValidationDTO_Roo_Json {
-    
-    public static ParentValidationDTO ParentValidationDTO.fromJsonToParentValidationDTO(String json) {
-        return new JSONDeserializer<ParentValidationDTO>()
-        .use(null, ParentValidationDTO.class).deserialize(json);
-    }
-    
-    public static String ParentValidationDTO.toJsonArray(Collection<ParentValidationDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ParentValidationDTO.toJsonArray(Collection<ParentValidationDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ParentValidationDTO> ParentValidationDTO.fromJsonArrayToParentValidatioes(String json) {
-        return new JSONDeserializer<List<ParentValidationDTO>>()
-        .use("values", ParentValidationDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentValidationDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ParentValidationDTO_Roo_ToString.aj
deleted file mode 100644
index 43330f684..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ParentValidationDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ParentValidationDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ParentValidationDTO_Roo_ToString {
-    
-    public String ParentValidationDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/PlateStubDTO.java b/src/main/java/com/labsynch/labseer/dto/PlateStubDTO.java
index 87f994b74..b801ed662 100644
--- a/src/main/java/com/labsynch/labseer/dto/PlateStubDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PlateStubDTO.java
@@ -1,11 +1,13 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -33,6 +35,62 @@ public String toJson() {
     }
 	
 
+
+	public static PlateStubDTO fromJsonToPlateStubDTO(String json) {
+        return new JSONDeserializer<PlateStubDTO>()
+        .use(null, PlateStubDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<PlateStubDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<PlateStubDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<PlateStubDTO> fromJsonArrayToPlateStubDTO(String json) {
+        return new JSONDeserializer<List<PlateStubDTO>>()
+        .use("values", PlateStubDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getBarcode() {
+        return this.barcode;
+    }
+
+	public void setBarcode(String barcode) {
+        this.barcode = barcode;
+    }
+
+	public String getCodeName() {
+        return this.codeName;
+    }
+
+	public void setCodeName(String codeName) {
+        this.codeName = codeName;
+    }
+
+	public String getPlateType() {
+        return this.plateType;
+    }
+
+	public void setPlateType(String plateType) {
+        this.plateType = plateType;
+    }
+
+	public Collection<WellStubDTO> getWells() {
+        return this.wells;
+    }
+
+	public void setWells(Collection<WellStubDTO> wells) {
+        this.wells = wells;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/PlateStubDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/PlateStubDTO_Roo_JavaBean.aj
deleted file mode 100644
index 7143e420e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/PlateStubDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,44 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.PlateStubDTO;
-import com.labsynch.labseer.dto.WellStubDTO;
-import java.util.Collection;
-
-privileged aspect PlateStubDTO_Roo_JavaBean {
-    
-    public String PlateStubDTO.getBarcode() {
-        return this.barcode;
-    }
-    
-    public void PlateStubDTO.setBarcode(String barcode) {
-        this.barcode = barcode;
-    }
-    
-    public String PlateStubDTO.getCodeName() {
-        return this.codeName;
-    }
-    
-    public void PlateStubDTO.setCodeName(String codeName) {
-        this.codeName = codeName;
-    }
-    
-    public String PlateStubDTO.getPlateType() {
-        return this.plateType;
-    }
-    
-    public void PlateStubDTO.setPlateType(String plateType) {
-        this.plateType = plateType;
-    }
-    
-    public Collection<WellStubDTO> PlateStubDTO.getWells() {
-        return this.wells;
-    }
-    
-    public void PlateStubDTO.setWells(Collection<WellStubDTO> wells) {
-        this.wells = wells;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/PlateStubDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/PlateStubDTO_Roo_Json.aj
deleted file mode 100644
index 1df513c1e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/PlateStubDTO_Roo_Json.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.PlateStubDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect PlateStubDTO_Roo_Json {
-    
-    public static PlateStubDTO PlateStubDTO.fromJsonToPlateStubDTO(String json) {
-        return new JSONDeserializer<PlateStubDTO>()
-        .use(null, PlateStubDTO.class).deserialize(json);
-    }
-    
-    public static String PlateStubDTO.toJsonArray(Collection<PlateStubDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String PlateStubDTO.toJsonArray(Collection<PlateStubDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<PlateStubDTO> PlateStubDTO.fromJsonArrayToPlateStubDTO(String json) {
-        return new JSONDeserializer<List<PlateStubDTO>>()
-        .use("values", PlateStubDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/PlateStubDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/PlateStubDTO_Roo_ToString.aj
deleted file mode 100644
index 615fc8885..000000000
--- a/src/main/java/com/labsynch/labseer/dto/PlateStubDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.PlateStubDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect PlateStubDTO_Roo_ToString {
-    
-    public String PlateStubDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/PlateWellDTO.java b/src/main/java/com/labsynch/labseer/dto/PlateWellDTO.java
index 43559b403..787611fa8 100644
--- a/src/main/java/com/labsynch/labseer/dto/PlateWellDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PlateWellDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -27,6 +33,72 @@ public PlateWellDTO(String plateBarcode, String plateCodeName, String wellCodeNa
 	}
 	
 
+
+	public String getPlateBarcode() {
+        return this.plateBarcode;
+    }
+
+	public void setPlateBarcode(String plateBarcode) {
+        this.plateBarcode = plateBarcode;
+    }
+
+	public String getPlateCodeName() {
+        return this.plateCodeName;
+    }
+
+	public void setPlateCodeName(String plateCodeName) {
+        this.plateCodeName = plateCodeName;
+    }
+
+	public String getWellCodeName() {
+        return this.wellCodeName;
+    }
+
+	public void setWellCodeName(String wellCodeName) {
+        this.wellCodeName = wellCodeName;
+    }
+
+	public String getWellLabel() {
+        return this.wellLabel;
+    }
+
+	public void setWellLabel(String wellLabel) {
+        this.wellLabel = wellLabel;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static PlateWellDTO fromJsonToPlateWellDTO(String json) {
+        return new JSONDeserializer<PlateWellDTO>()
+        .use(null, PlateWellDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<PlateWellDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<PlateWellDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<PlateWellDTO> fromJsonArrayToPlateWellDTO(String json) {
+        return new JSONDeserializer<List<PlateWellDTO>>()
+        .use("values", PlateWellDTO.class).deserialize(json);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/PlateWellDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/PlateWellDTO_Roo_JavaBean.aj
deleted file mode 100644
index 720d29c9a..000000000
--- a/src/main/java/com/labsynch/labseer/dto/PlateWellDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,42 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.PlateWellDTO;
-
-privileged aspect PlateWellDTO_Roo_JavaBean {
-    
-    public String PlateWellDTO.getPlateBarcode() {
-        return this.plateBarcode;
-    }
-    
-    public void PlateWellDTO.setPlateBarcode(String plateBarcode) {
-        this.plateBarcode = plateBarcode;
-    }
-    
-    public String PlateWellDTO.getPlateCodeName() {
-        return this.plateCodeName;
-    }
-    
-    public void PlateWellDTO.setPlateCodeName(String plateCodeName) {
-        this.plateCodeName = plateCodeName;
-    }
-    
-    public String PlateWellDTO.getWellCodeName() {
-        return this.wellCodeName;
-    }
-    
-    public void PlateWellDTO.setWellCodeName(String wellCodeName) {
-        this.wellCodeName = wellCodeName;
-    }
-    
-    public String PlateWellDTO.getWellLabel() {
-        return this.wellLabel;
-    }
-    
-    public void PlateWellDTO.setWellLabel(String wellLabel) {
-        this.wellLabel = wellLabel;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/PlateWellDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/PlateWellDTO_Roo_Json.aj
deleted file mode 100644
index e450bd043..000000000
--- a/src/main/java/com/labsynch/labseer/dto/PlateWellDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.PlateWellDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect PlateWellDTO_Roo_Json {
-    
-    public String PlateWellDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String PlateWellDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static PlateWellDTO PlateWellDTO.fromJsonToPlateWellDTO(String json) {
-        return new JSONDeserializer<PlateWellDTO>()
-        .use(null, PlateWellDTO.class).deserialize(json);
-    }
-    
-    public static String PlateWellDTO.toJsonArray(Collection<PlateWellDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String PlateWellDTO.toJsonArray(Collection<PlateWellDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<PlateWellDTO> PlateWellDTO.fromJsonArrayToPlateWellDTO(String json) {
-        return new JSONDeserializer<List<PlateWellDTO>>()
-        .use("values", PlateWellDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/PlateWellDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/PlateWellDTO_Roo_ToString.aj
deleted file mode 100644
index c28a6a040..000000000
--- a/src/main/java/com/labsynch/labseer/dto/PlateWellDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.PlateWellDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect PlateWellDTO_Roo_ToString {
-    
-    public String PlateWellDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO.java b/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO.java
index 7c50f855e..fc9bc0c42 100755
--- a/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO.java
@@ -6,19 +6,23 @@
 
 import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
 import javax.persistence.Lob;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.validation.constraints.Size;
 
 import javax.persistence.NoResultException;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.domain.Lot;
 import com.labsynch.labseer.domain.Parent;
 import com.labsynch.labseer.domain.PhysicalState;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
 @RooJavaBean
 @RooToString
@@ -72,6 +76,64 @@ public static Collection<PreferredNameDTO> getParentPreferredNames(Collection<Pr
     	return preferredNameDTOs;
 	}
   
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static PreferredNameDTO fromJsonToPreferredNameDTO(String json) {
+        return new JSONDeserializer<PreferredNameDTO>()
+        .use(null, PreferredNameDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<PreferredNameDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<PreferredNameDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<PreferredNameDTO> fromJsonArrayToPreferredNameDTO(String json) {
+        return new JSONDeserializer<List<PreferredNameDTO>>()
+        .use("values", PreferredNameDTO.class).deserialize(json);
+    }
+
+	public String getRequestName() {
+        return this.requestName;
+    }
+
+	public void setRequestName(String requestName) {
+        this.requestName = requestName;
+    }
+
+	public String getPreferredName() {
+        return this.preferredName;
+    }
+
+	public void setPreferredName(String preferredName) {
+        this.preferredName = preferredName;
+    }
+
+	public String getReferenceName() {
+        return this.referenceName;
+    }
+
+	public void setReferenceName(String referenceName) {
+        this.referenceName = referenceName;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO_Roo_JavaBean.aj
deleted file mode 100755
index 0df10d3b4..000000000
--- a/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.PreferredNameDTO;
-
-privileged aspect PreferredNameDTO_Roo_JavaBean {
-    
-    public String PreferredNameDTO.getRequestName() {
-        return this.requestName;
-    }
-    
-    public void PreferredNameDTO.setRequestName(String requestName) {
-        this.requestName = requestName;
-    }
-    
-    public String PreferredNameDTO.getPreferredName() {
-        return this.preferredName;
-    }
-    
-    public void PreferredNameDTO.setPreferredName(String preferredName) {
-        this.preferredName = preferredName;
-    }
-    
-    public String PreferredNameDTO.getReferenceName() {
-        return this.referenceName;
-    }
-    
-    public void PreferredNameDTO.setReferenceName(String referenceName) {
-        this.referenceName = referenceName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO_Roo_Json.aj
deleted file mode 100755
index 24a496234..000000000
--- a/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.PreferredNameDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect PreferredNameDTO_Roo_Json {
-    
-    public String PreferredNameDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String PreferredNameDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static PreferredNameDTO PreferredNameDTO.fromJsonToPreferredNameDTO(String json) {
-        return new JSONDeserializer<PreferredNameDTO>()
-        .use(null, PreferredNameDTO.class).deserialize(json);
-    }
-    
-    public static String PreferredNameDTO.toJsonArray(Collection<PreferredNameDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String PreferredNameDTO.toJsonArray(Collection<PreferredNameDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<PreferredNameDTO> PreferredNameDTO.fromJsonArrayToPreferredNameDTO(String json) {
-        return new JSONDeserializer<List<PreferredNameDTO>>()
-        .use("values", PreferredNameDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO_Roo_ToString.aj
deleted file mode 100755
index d9fb69550..000000000
--- a/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.PreferredNameDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect PreferredNameDTO_Roo_ToString {
-    
-    public String PreferredNameDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/PreferredNameRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/PreferredNameRequestDTO.java
index af2637b7f..5bd945afb 100755
--- a/src/main/java/com/labsynch/labseer/dto/PreferredNameRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PreferredNameRequestDTO.java
@@ -3,7 +3,8 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -38,6 +39,44 @@ public static String toJsonArray(Collection<PreferredNameRequestDTO> collection)
 	public static Collection<PreferredNameRequestDTO> fromJsonArrayToPreferredNameResultsDTO(String json) {
         return new JSONDeserializer<List<PreferredNameRequestDTO>>().use(null, ArrayList.class).use("values", PreferredNameRequestDTO.class).deserialize(json);
     }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static PreferredNameRequestDTO fromJsonToPreferredNameRequestDTO(String json) {
+        return new JSONDeserializer<PreferredNameRequestDTO>()
+        .use(null, PreferredNameRequestDTO.class).deserialize(json);
+    }
+
+	public static Collection<PreferredNameRequestDTO> fromJsonArrayToPreferredNameRequestDTO(String json) {
+        return new JSONDeserializer<List<PreferredNameRequestDTO>>()
+        .use("values", PreferredNameRequestDTO.class).deserialize(json);
+    }
+
+	public boolean isError() {
+        return this.error;
+    }
+
+	public void setError(boolean error) {
+        this.error = error;
+    }
+
+	public Collection<ErrorMessageDTO> getErrorMessages() {
+        return this.errorMessages;
+    }
+
+	public void setErrorMessages(Collection<ErrorMessageDTO> errorMessages) {
+        this.errorMessages = errorMessages;
+    }
+
+	public Collection<PreferredNameDTO> getRequests() {
+        return this.requests;
+    }
+
+	public void setRequests(Collection<PreferredNameDTO> requests) {
+        this.requests = requests;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/PreferredNameRequestDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/PreferredNameRequestDTO_Roo_JavaBean.aj
deleted file mode 100755
index 642cf1a68..000000000
--- a/src/main/java/com/labsynch/labseer/dto/PreferredNameRequestDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,37 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ErrorMessageDTO;
-import com.labsynch.labseer.dto.PreferredNameDTO;
-import com.labsynch.labseer.dto.PreferredNameRequestDTO;
-import java.util.Collection;
-
-privileged aspect PreferredNameRequestDTO_Roo_JavaBean {
-    
-    public boolean PreferredNameRequestDTO.isError() {
-        return this.error;
-    }
-    
-    public void PreferredNameRequestDTO.setError(boolean error) {
-        this.error = error;
-    }
-    
-    public Collection<ErrorMessageDTO> PreferredNameRequestDTO.getErrorMessages() {
-        return this.errorMessages;
-    }
-    
-    public void PreferredNameRequestDTO.setErrorMessages(Collection<ErrorMessageDTO> errorMessages) {
-        this.errorMessages = errorMessages;
-    }
-    
-    public Collection<PreferredNameDTO> PreferredNameRequestDTO.getRequests() {
-        return this.requests;
-    }
-    
-    public void PreferredNameRequestDTO.setRequests(Collection<PreferredNameDTO> requests) {
-        this.requests = requests;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/PreferredNameRequestDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/PreferredNameRequestDTO_Roo_Json.aj
deleted file mode 100755
index 232763a43..000000000
--- a/src/main/java/com/labsynch/labseer/dto/PreferredNameRequestDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.PreferredNameRequestDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect PreferredNameRequestDTO_Roo_Json {
-    
-    public static PreferredNameRequestDTO PreferredNameRequestDTO.fromJsonToPreferredNameRequestDTO(String json) {
-        return new JSONDeserializer<PreferredNameRequestDTO>()
-        .use(null, PreferredNameRequestDTO.class).deserialize(json);
-    }
-    
-    public static Collection<PreferredNameRequestDTO> PreferredNameRequestDTO.fromJsonArrayToPreferredNameRequestDTO(String json) {
-        return new JSONDeserializer<List<PreferredNameRequestDTO>>()
-        .use("values", PreferredNameRequestDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/PreferredNameRequestDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/PreferredNameRequestDTO_Roo_ToString.aj
deleted file mode 100755
index 5b8c4a33a..000000000
--- a/src/main/java/com/labsynch/labseer/dto/PreferredNameRequestDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.PreferredNameRequestDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect PreferredNameRequestDTO_Roo_ToString {
-    
-    public String PreferredNameRequestDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/PreferredNameResultsDTO.java b/src/main/java/com/labsynch/labseer/dto/PreferredNameResultsDTO.java
index 6ab137768..ebe0cb3e6 100755
--- a/src/main/java/com/labsynch/labseer/dto/PreferredNameResultsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PreferredNameResultsDTO.java
@@ -3,7 +3,8 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -38,6 +39,34 @@ public static String toJsonArray(Collection<PreferredNameResultsDTO> collection)
 	public static Collection<PreferredNameResultsDTO> fromJsonArrayToPreferredNameResultsDTO(String json) {
         return new JSONDeserializer<List<PreferredNameResultsDTO>>().use(null, ArrayList.class).use("values", PreferredNameResultsDTO.class).deserialize(json);
     }
+
+	public boolean isError() {
+        return this.error;
+    }
+
+	public void setError(boolean error) {
+        this.error = error;
+    }
+
+	public Collection<ErrorMessageDTO> getErrorMessages() {
+        return this.errorMessages;
+    }
+
+	public void setErrorMessages(Collection<ErrorMessageDTO> errorMessages) {
+        this.errorMessages = errorMessages;
+    }
+
+	public Collection<PreferredNameDTO> getResults() {
+        return this.results;
+    }
+
+	public void setResults(Collection<PreferredNameDTO> results) {
+        this.results = results;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/PreferredNameResultsDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/PreferredNameResultsDTO_Roo_JavaBean.aj
deleted file mode 100755
index 47b25c42c..000000000
--- a/src/main/java/com/labsynch/labseer/dto/PreferredNameResultsDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,37 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ErrorMessageDTO;
-import com.labsynch.labseer.dto.PreferredNameDTO;
-import com.labsynch.labseer.dto.PreferredNameResultsDTO;
-import java.util.Collection;
-
-privileged aspect PreferredNameResultsDTO_Roo_JavaBean {
-    
-    public boolean PreferredNameResultsDTO.isError() {
-        return this.error;
-    }
-    
-    public void PreferredNameResultsDTO.setError(boolean error) {
-        this.error = error;
-    }
-    
-    public Collection<ErrorMessageDTO> PreferredNameResultsDTO.getErrorMessages() {
-        return this.errorMessages;
-    }
-    
-    public void PreferredNameResultsDTO.setErrorMessages(Collection<ErrorMessageDTO> errorMessages) {
-        this.errorMessages = errorMessages;
-    }
-    
-    public Collection<PreferredNameDTO> PreferredNameResultsDTO.getResults() {
-        return this.results;
-    }
-    
-    public void PreferredNameResultsDTO.setResults(Collection<PreferredNameDTO> results) {
-        this.results = results;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/PreferredNameResultsDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/PreferredNameResultsDTO_Roo_ToString.aj
deleted file mode 100755
index e6a3304f4..000000000
--- a/src/main/java/com/labsynch/labseer/dto/PreferredNameResultsDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.PreferredNameResultsDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect PreferredNameResultsDTO_Roo_ToString {
-    
-    public String PreferredNameResultsDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/PreferredNameWithErrorDTO.java b/src/main/java/com/labsynch/labseer/dto/PreferredNameWithErrorDTO.java
index b01cabf34..209768c09 100755
--- a/src/main/java/com/labsynch/labseer/dto/PreferredNameWithErrorDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PreferredNameWithErrorDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -18,6 +24,72 @@ public class PreferredNameWithErrorDTO {
 	private ErrorMessageDTO errorMesageDTO;
 	
 	
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static PreferredNameWithErrorDTO fromJsonToPreferredNameWithErrorDTO(String json) {
+        return new JSONDeserializer<PreferredNameWithErrorDTO>()
+        .use(null, PreferredNameWithErrorDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<PreferredNameWithErrorDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<PreferredNameWithErrorDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<PreferredNameWithErrorDTO> fromJsonArrayToPreferredNameWithErroes(String json) {
+        return new JSONDeserializer<List<PreferredNameWithErrorDTO>>()
+        .use("values", PreferredNameWithErrorDTO.class).deserialize(json);
+    }
+
+	public String getRequestName() {
+        return this.requestName;
+    }
+
+	public void setRequestName(String requestName) {
+        this.requestName = requestName;
+    }
+
+	public String getPreferredName() {
+        return this.preferredName;
+    }
+
+	public void setPreferredName(String preferredName) {
+        this.preferredName = preferredName;
+    }
+
+	public String getReferenceName() {
+        return this.referenceName;
+    }
+
+	public void setReferenceName(String referenceName) {
+        this.referenceName = referenceName;
+    }
+
+	public ErrorMessageDTO getErrorMesageDTO() {
+        return this.errorMesageDTO;
+    }
+
+	public void setErrorMesageDTO(ErrorMessageDTO errorMesageDTO) {
+        this.errorMesageDTO = errorMesageDTO;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/PreferredNameWithErrorDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/PreferredNameWithErrorDTO_Roo_JavaBean.aj
deleted file mode 100755
index 90f432753..000000000
--- a/src/main/java/com/labsynch/labseer/dto/PreferredNameWithErrorDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ErrorMessageDTO;
-import com.labsynch.labseer.dto.PreferredNameWithErrorDTO;
-
-privileged aspect PreferredNameWithErrorDTO_Roo_JavaBean {
-    
-    public String PreferredNameWithErrorDTO.getRequestName() {
-        return this.requestName;
-    }
-    
-    public void PreferredNameWithErrorDTO.setRequestName(String requestName) {
-        this.requestName = requestName;
-    }
-    
-    public String PreferredNameWithErrorDTO.getPreferredName() {
-        return this.preferredName;
-    }
-    
-    public void PreferredNameWithErrorDTO.setPreferredName(String preferredName) {
-        this.preferredName = preferredName;
-    }
-    
-    public String PreferredNameWithErrorDTO.getReferenceName() {
-        return this.referenceName;
-    }
-    
-    public void PreferredNameWithErrorDTO.setReferenceName(String referenceName) {
-        this.referenceName = referenceName;
-    }
-    
-    public ErrorMessageDTO PreferredNameWithErrorDTO.getErrorMesageDTO() {
-        return this.errorMesageDTO;
-    }
-    
-    public void PreferredNameWithErrorDTO.setErrorMesageDTO(ErrorMessageDTO errorMesageDTO) {
-        this.errorMesageDTO = errorMesageDTO;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/PreferredNameWithErrorDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/PreferredNameWithErrorDTO_Roo_Json.aj
deleted file mode 100755
index b53cdd1d1..000000000
--- a/src/main/java/com/labsynch/labseer/dto/PreferredNameWithErrorDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.PreferredNameWithErrorDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect PreferredNameWithErrorDTO_Roo_Json {
-    
-    public String PreferredNameWithErrorDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String PreferredNameWithErrorDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static PreferredNameWithErrorDTO PreferredNameWithErrorDTO.fromJsonToPreferredNameWithErrorDTO(String json) {
-        return new JSONDeserializer<PreferredNameWithErrorDTO>()
-        .use(null, PreferredNameWithErrorDTO.class).deserialize(json);
-    }
-    
-    public static String PreferredNameWithErrorDTO.toJsonArray(Collection<PreferredNameWithErrorDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String PreferredNameWithErrorDTO.toJsonArray(Collection<PreferredNameWithErrorDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<PreferredNameWithErrorDTO> PreferredNameWithErrorDTO.fromJsonArrayToPreferredNameWithErroes(String json) {
-        return new JSONDeserializer<List<PreferredNameWithErrorDTO>>()
-        .use("values", PreferredNameWithErrorDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/PreferredNameWithErrorDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/PreferredNameWithErrorDTO_Roo_ToString.aj
deleted file mode 100755
index 3cd1b5ab6..000000000
--- a/src/main/java/com/labsynch/labseer/dto/PreferredNameWithErrorDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.PreferredNameWithErrorDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect PreferredNameWithErrorDTO_Roo_ToString {
-    
-    public String PreferredNameWithErrorDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ProtocolDTO.java b/src/main/java/com/labsynch/labseer/dto/ProtocolDTO.java
index 1a3355189..3ae92c665 100755
--- a/src/main/java/com/labsynch/labseer/dto/ProtocolDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ProtocolDTO.java
@@ -33,7 +33,8 @@
 import javax.persistence.OneToMany;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.roo.addon.javabean.RooJavaBean;
@@ -170,4 +171,186 @@ private int countExperiments(Protocol protocol) {
     	}
     	return count;
     }
+
+	public String getShortDescription() {
+        return this.shortDescription;
+    }
+
+	public void setShortDescription(String shortDescription) {
+        this.shortDescription = shortDescription;
+    }
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getCodeName() {
+        return this.codeName;
+    }
+
+	public void setCodeName(String codeName) {
+        this.codeName = codeName;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public Date getRecordedDate() {
+        return this.recordedDate;
+    }
+
+	public void setRecordedDate(Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+	public String getModifiedBy() {
+        return this.modifiedBy;
+    }
+
+	public void setModifiedBy(String modifiedBy) {
+        this.modifiedBy = modifiedBy;
+    }
+
+	public Date getModifiedDate() {
+        return this.modifiedDate;
+    }
+
+	public void setModifiedDate(Date modifiedDate) {
+        this.modifiedDate = modifiedDate;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public boolean isDeleted() {
+        return this.deleted;
+    }
+
+	public void setDeleted(boolean deleted) {
+        this.deleted = deleted;
+    }
+
+	public Long getLsTransaction() {
+        return this.lsTransaction;
+    }
+
+	public void setLsTransaction(Long lsTransaction) {
+        this.lsTransaction = lsTransaction;
+    }
+
+	public Integer getExperimentCount() {
+        return this.experimentCount;
+    }
+
+	public void setExperimentCount(Integer experimentCount) {
+        this.experimentCount = experimentCount;
+    }
+
+	public Set<ThingPage> getThingPage() {
+        return this.thingPage;
+    }
+
+	public void setThingPage(Set<ThingPage> thingPage) {
+        this.thingPage = thingPage;
+    }
+
+	public Set<ProtocolState> getLsStates() {
+        return this.lsStates;
+    }
+
+	public void setLsStates(Set<ProtocolState> lsStates) {
+        this.lsStates = lsStates;
+    }
+
+	public Set<Experiment> getExperiments() {
+        return this.experiments;
+    }
+
+	public void setExperiments(Set<Experiment> experiments) {
+        this.experiments = experiments;
+    }
+
+	public Set<ProtocolLabel> getLsLabels() {
+        return this.lsLabels;
+    }
+
+	public void setLsLabels(Set<ProtocolLabel> lsLabels) {
+        this.lsLabels = lsLabels;
+    }
+
+	public Set<LsTag> getLsTags() {
+        return this.lsTags;
+    }
+
+	public void setLsTags(Set<LsTag> lsTags) {
+        this.lsTags = lsTags;
+    }
+
+	public Set<ItxProtocolProtocol> getFirstProtocols() {
+        return this.firstProtocols;
+    }
+
+	public void setFirstProtocols(Set<ItxProtocolProtocol> firstProtocols) {
+        this.firstProtocols = firstProtocols;
+    }
+
+	public Set<ItxProtocolProtocol> getSecondProtocols() {
+        return this.secondProtocols;
+    }
+
+	public void setSecondProtocols(Set<ItxProtocolProtocol> secondProtocols) {
+        this.secondProtocols = secondProtocols;
+    }
+
+	public String toString() {
+        return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).setExcludeFieldNames("lsTags", "lsStates", "experiments", "lsLabels").toString();
+    }
+
+	public static ProtocolDTO fromJsonToProtocolDTO(String json) {
+        return new JSONDeserializer<ProtocolDTO>()
+        .use(null, ProtocolDTO.class).deserialize(json);
+    }
+
+	public static Collection<ProtocolDTO> fromJsonArrayToProtocoes(String json) {
+        return new JSONDeserializer<List<ProtocolDTO>>()
+        .use("values", ProtocolDTO.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ProtocolDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ProtocolDTO_Roo_JavaBean.aj
deleted file mode 100644
index 3dee45391..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ProtocolDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,186 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ItxProtocolProtocol;
-import com.labsynch.labseer.domain.LsTag;
-import com.labsynch.labseer.domain.ProtocolLabel;
-import com.labsynch.labseer.domain.ProtocolState;
-import com.labsynch.labseer.domain.ThingPage;
-import com.labsynch.labseer.dto.ProtocolDTO;
-import java.util.Date;
-import java.util.Set;
-
-privileged aspect ProtocolDTO_Roo_JavaBean {
-    
-    public String ProtocolDTO.getShortDescription() {
-        return this.shortDescription;
-    }
-    
-    public void ProtocolDTO.setShortDescription(String shortDescription) {
-        this.shortDescription = shortDescription;
-    }
-    
-    public Long ProtocolDTO.getId() {
-        return this.id;
-    }
-    
-    public void ProtocolDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer ProtocolDTO.getVersion() {
-        return this.version;
-    }
-    
-    public void ProtocolDTO.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-    public String ProtocolDTO.getLsType() {
-        return this.lsType;
-    }
-    
-    public void ProtocolDTO.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String ProtocolDTO.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void ProtocolDTO.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String ProtocolDTO.getCodeName() {
-        return this.codeName;
-    }
-    
-    public void ProtocolDTO.setCodeName(String codeName) {
-        this.codeName = codeName;
-    }
-    
-    public String ProtocolDTO.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void ProtocolDTO.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public Date ProtocolDTO.getRecordedDate() {
-        return this.recordedDate;
-    }
-    
-    public void ProtocolDTO.setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
-    
-    public String ProtocolDTO.getModifiedBy() {
-        return this.modifiedBy;
-    }
-    
-    public void ProtocolDTO.setModifiedBy(String modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
-    
-    public Date ProtocolDTO.getModifiedDate() {
-        return this.modifiedDate;
-    }
-    
-    public void ProtocolDTO.setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
-    
-    public boolean ProtocolDTO.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void ProtocolDTO.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public boolean ProtocolDTO.isDeleted() {
-        return this.deleted;
-    }
-    
-    public void ProtocolDTO.setDeleted(boolean deleted) {
-        this.deleted = deleted;
-    }
-    
-    public Long ProtocolDTO.getLsTransaction() {
-        return this.lsTransaction;
-    }
-    
-    public void ProtocolDTO.setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
-    
-    public Integer ProtocolDTO.getExperimentCount() {
-        return this.experimentCount;
-    }
-    
-    public void ProtocolDTO.setExperimentCount(Integer experimentCount) {
-        this.experimentCount = experimentCount;
-    }
-    
-    public Set<ThingPage> ProtocolDTO.getThingPage() {
-        return this.thingPage;
-    }
-    
-    public void ProtocolDTO.setThingPage(Set<ThingPage> thingPage) {
-        this.thingPage = thingPage;
-    }
-    
-    public Set<ProtocolState> ProtocolDTO.getLsStates() {
-        return this.lsStates;
-    }
-    
-    public void ProtocolDTO.setLsStates(Set<ProtocolState> lsStates) {
-        this.lsStates = lsStates;
-    }
-    
-    public Set<Experiment> ProtocolDTO.getExperiments() {
-        return this.experiments;
-    }
-    
-    public void ProtocolDTO.setExperiments(Set<Experiment> experiments) {
-        this.experiments = experiments;
-    }
-    
-    public Set<ProtocolLabel> ProtocolDTO.getLsLabels() {
-        return this.lsLabels;
-    }
-    
-    public void ProtocolDTO.setLsLabels(Set<ProtocolLabel> lsLabels) {
-        this.lsLabels = lsLabels;
-    }
-    
-    public Set<LsTag> ProtocolDTO.getLsTags() {
-        return this.lsTags;
-    }
-    
-    public void ProtocolDTO.setLsTags(Set<LsTag> lsTags) {
-        this.lsTags = lsTags;
-    }
-    
-    public Set<ItxProtocolProtocol> ProtocolDTO.getFirstProtocols() {
-        return this.firstProtocols;
-    }
-    
-    public void ProtocolDTO.setFirstProtocols(Set<ItxProtocolProtocol> firstProtocols) {
-        this.firstProtocols = firstProtocols;
-    }
-    
-    public Set<ItxProtocolProtocol> ProtocolDTO.getSecondProtocols() {
-        return this.secondProtocols;
-    }
-    
-    public void ProtocolDTO.setSecondProtocols(Set<ItxProtocolProtocol> secondProtocols) {
-        this.secondProtocols = secondProtocols;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ProtocolDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ProtocolDTO_Roo_Json.aj
deleted file mode 100644
index 3bd58ee74..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ProtocolDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ProtocolDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ProtocolDTO_Roo_Json {
-    
-    public static ProtocolDTO ProtocolDTO.fromJsonToProtocolDTO(String json) {
-        return new JSONDeserializer<ProtocolDTO>()
-        .use(null, ProtocolDTO.class).deserialize(json);
-    }
-    
-    public static Collection<ProtocolDTO> ProtocolDTO.fromJsonArrayToProtocoes(String json) {
-        return new JSONDeserializer<List<ProtocolDTO>>()
-        .use("values", ProtocolDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ProtocolDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ProtocolDTO_Roo_ToString.aj
deleted file mode 100644
index b92c34230..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ProtocolDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ProtocolDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ProtocolDTO_Roo_ToString {
-    
-    public String ProtocolDTO.toString() {
-        return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).setExcludeFieldNames("lsTags", "lsStates", "experiments", "lsLabels").toString();
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ProtocolErrorMessageDTO.java b/src/main/java/com/labsynch/labseer/dto/ProtocolErrorMessageDTO.java
index 5e98eb8ef..60b8412ea 100644
--- a/src/main/java/com/labsynch/labseer/dto/ProtocolErrorMessageDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ProtocolErrorMessageDTO.java
@@ -1,7 +1,9 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -9,7 +11,7 @@
 
 import com.labsynch.labseer.domain.Protocol;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -53,4 +55,50 @@ public ProtocolErrorMessageDTO(String protocolCodeName, Protocol protocol){
 		this.protocol = protocol;
 	}
 	
+
+	public String getProtocolCodeName() {
+        return this.protocolCodeName;
+    }
+
+	public void setProtocolCodeName(String protocolCodeName) {
+        this.protocolCodeName = protocolCodeName;
+    }
+
+	public String getLevel() {
+        return this.level;
+    }
+
+	public void setLevel(String level) {
+        this.level = level;
+    }
+
+	public String getMessage() {
+        return this.message;
+    }
+
+	public void setMessage(String message) {
+        this.message = message;
+    }
+
+	public Protocol getProtocol() {
+        return this.protocol;
+    }
+
+	public void setProtocol(Protocol protocol) {
+        this.protocol = protocol;
+    }
+
+	public static ProtocolErrorMessageDTO fromJsonToProtocolErrorMessageDTO(String json) {
+        return new JSONDeserializer<ProtocolErrorMessageDTO>()
+        .use(null, ProtocolErrorMessageDTO.class).deserialize(json);
+    }
+
+	public static Collection<ProtocolErrorMessageDTO> fromJsonArrayToProtocolErroes(String json) {
+        return new JSONDeserializer<List<ProtocolErrorMessageDTO>>()
+        .use("values", ProtocolErrorMessageDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/dto/ProtocolErrorMessageDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ProtocolErrorMessageDTO_Roo_JavaBean.aj
deleted file mode 100644
index 5d08cfa26..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ProtocolErrorMessageDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.dto.ProtocolErrorMessageDTO;
-
-privileged aspect ProtocolErrorMessageDTO_Roo_JavaBean {
-    
-    public String ProtocolErrorMessageDTO.getProtocolCodeName() {
-        return this.protocolCodeName;
-    }
-    
-    public void ProtocolErrorMessageDTO.setProtocolCodeName(String protocolCodeName) {
-        this.protocolCodeName = protocolCodeName;
-    }
-    
-    public String ProtocolErrorMessageDTO.getLevel() {
-        return this.level;
-    }
-    
-    public void ProtocolErrorMessageDTO.setLevel(String level) {
-        this.level = level;
-    }
-    
-    public String ProtocolErrorMessageDTO.getMessage() {
-        return this.message;
-    }
-    
-    public void ProtocolErrorMessageDTO.setMessage(String message) {
-        this.message = message;
-    }
-    
-    public Protocol ProtocolErrorMessageDTO.getProtocol() {
-        return this.protocol;
-    }
-    
-    public void ProtocolErrorMessageDTO.setProtocol(Protocol protocol) {
-        this.protocol = protocol;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ProtocolErrorMessageDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ProtocolErrorMessageDTO_Roo_Json.aj
deleted file mode 100644
index ba5c50d3f..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ProtocolErrorMessageDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ProtocolErrorMessageDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ProtocolErrorMessageDTO_Roo_Json {
-    
-    public static ProtocolErrorMessageDTO ProtocolErrorMessageDTO.fromJsonToProtocolErrorMessageDTO(String json) {
-        return new JSONDeserializer<ProtocolErrorMessageDTO>()
-        .use(null, ProtocolErrorMessageDTO.class).deserialize(json);
-    }
-    
-    public static Collection<ProtocolErrorMessageDTO> ProtocolErrorMessageDTO.fromJsonArrayToProtocolErroes(String json) {
-        return new JSONDeserializer<List<ProtocolErrorMessageDTO>>()
-        .use("values", ProtocolErrorMessageDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ProtocolErrorMessageDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ProtocolErrorMessageDTO_Roo_ToString.aj
deleted file mode 100644
index cff6b698c..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ProtocolErrorMessageDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ProtocolErrorMessageDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ProtocolErrorMessageDTO_Roo_ToString {
-    
-    public String ProtocolErrorMessageDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ProtocolStatePathDTO.java b/src/main/java/com/labsynch/labseer/dto/ProtocolStatePathDTO.java
index 104b3fb1f..096436f1b 100644
--- a/src/main/java/com/labsynch/labseer/dto/ProtocolStatePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ProtocolStatePathDTO.java
@@ -1,14 +1,16 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.ProtocolState;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -34,6 +36,52 @@ public String toJson() {
 	public static String toJsonArray(Collection<ProtocolStatePathDTO> collection) {
         return new JSONSerializer().include("states.lsValues").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
     }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static ProtocolStatePathDTO fromJsonToProtocolStatePathDTO(String json) {
+        return new JSONDeserializer<ProtocolStatePathDTO>()
+        .use(null, ProtocolStatePathDTO.class).deserialize(json);
+    }
+
+	public static Collection<ProtocolStatePathDTO> fromJsonArrayToProtocoes(String json) {
+        return new JSONDeserializer<List<ProtocolStatePathDTO>>()
+        .use("values", ProtocolStatePathDTO.class).deserialize(json);
+    }
+
+	public String getIdOrCodeName() {
+        return this.idOrCodeName;
+    }
+
+	public void setIdOrCodeName(String idOrCodeName) {
+        this.idOrCodeName = idOrCodeName;
+    }
+
+	public String getStateType() {
+        return this.stateType;
+    }
+
+	public void setStateType(String stateType) {
+        this.stateType = stateType;
+    }
+
+	public String getStateKind() {
+        return this.stateKind;
+    }
+
+	public void setStateKind(String stateKind) {
+        this.stateKind = stateKind;
+    }
+
+	public Collection<ProtocolState> getStates() {
+        return this.states;
+    }
+
+	public void setStates(Collection<ProtocolState> states) {
+        this.states = states;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ProtocolStatePathDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ProtocolStatePathDTO_Roo_JavaBean.aj
deleted file mode 100644
index 910f11f6f..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ProtocolStatePathDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,44 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.ProtocolState;
-import com.labsynch.labseer.dto.ProtocolStatePathDTO;
-import java.util.Collection;
-
-privileged aspect ProtocolStatePathDTO_Roo_JavaBean {
-    
-    public String ProtocolStatePathDTO.getIdOrCodeName() {
-        return this.idOrCodeName;
-    }
-    
-    public void ProtocolStatePathDTO.setIdOrCodeName(String idOrCodeName) {
-        this.idOrCodeName = idOrCodeName;
-    }
-    
-    public String ProtocolStatePathDTO.getStateType() {
-        return this.stateType;
-    }
-    
-    public void ProtocolStatePathDTO.setStateType(String stateType) {
-        this.stateType = stateType;
-    }
-    
-    public String ProtocolStatePathDTO.getStateKind() {
-        return this.stateKind;
-    }
-    
-    public void ProtocolStatePathDTO.setStateKind(String stateKind) {
-        this.stateKind = stateKind;
-    }
-    
-    public Collection<ProtocolState> ProtocolStatePathDTO.getStates() {
-        return this.states;
-    }
-    
-    public void ProtocolStatePathDTO.setStates(Collection<ProtocolState> states) {
-        this.states = states;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ProtocolStatePathDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ProtocolStatePathDTO_Roo_Json.aj
deleted file mode 100644
index be9302058..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ProtocolStatePathDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ProtocolStatePathDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ProtocolStatePathDTO_Roo_Json {
-    
-    public static ProtocolStatePathDTO ProtocolStatePathDTO.fromJsonToProtocolStatePathDTO(String json) {
-        return new JSONDeserializer<ProtocolStatePathDTO>()
-        .use(null, ProtocolStatePathDTO.class).deserialize(json);
-    }
-    
-    public static Collection<ProtocolStatePathDTO> ProtocolStatePathDTO.fromJsonArrayToProtocoes(String json) {
-        return new JSONDeserializer<List<ProtocolStatePathDTO>>()
-        .use("values", ProtocolStatePathDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ProtocolStatePathDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ProtocolStatePathDTO_Roo_ToString.aj
deleted file mode 100644
index 1e43be112..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ProtocolStatePathDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ProtocolStatePathDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ProtocolStatePathDTO_Roo_ToString {
-    
-    public String ProtocolStatePathDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ProtocolValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/ProtocolValuePathDTO.java
index 0be0df5e6..651af338c 100644
--- a/src/main/java/com/labsynch/labseer/dto/ProtocolValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ProtocolValuePathDTO.java
@@ -1,14 +1,16 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.ProtocolValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -38,6 +40,68 @@ public String toJson() {
 	public static String toJsonArray(Collection<ProtocolValuePathDTO> collection) {
         return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
     }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static ProtocolValuePathDTO fromJsonToProtocolValuePathDTO(String json) {
+        return new JSONDeserializer<ProtocolValuePathDTO>()
+        .use(null, ProtocolValuePathDTO.class).deserialize(json);
+    }
+
+	public static Collection<ProtocolValuePathDTO> fromJsonArrayToProtocoes(String json) {
+        return new JSONDeserializer<List<ProtocolValuePathDTO>>()
+        .use("values", ProtocolValuePathDTO.class).deserialize(json);
+    }
+
+	public String getIdOrCodeName() {
+        return this.idOrCodeName;
+    }
+
+	public void setIdOrCodeName(String idOrCodeName) {
+        this.idOrCodeName = idOrCodeName;
+    }
+
+	public String getStateType() {
+        return this.stateType;
+    }
+
+	public void setStateType(String stateType) {
+        this.stateType = stateType;
+    }
+
+	public String getStateKind() {
+        return this.stateKind;
+    }
+
+	public void setStateKind(String stateKind) {
+        this.stateKind = stateKind;
+    }
+
+	public String getValueType() {
+        return this.valueType;
+    }
+
+	public void setValueType(String valueType) {
+        this.valueType = valueType;
+    }
+
+	public String getValueKind() {
+        return this.valueKind;
+    }
+
+	public void setValueKind(String valueKind) {
+        this.valueKind = valueKind;
+    }
+
+	public Collection<ProtocolValue> getValues() {
+        return this.values;
+    }
+
+	public void setValues(Collection<ProtocolValue> values) {
+        this.values = values;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ProtocolValuePathDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ProtocolValuePathDTO_Roo_JavaBean.aj
deleted file mode 100644
index f0c606a45..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ProtocolValuePathDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,60 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.ProtocolValue;
-import com.labsynch.labseer.dto.ProtocolValuePathDTO;
-import java.util.Collection;
-
-privileged aspect ProtocolValuePathDTO_Roo_JavaBean {
-    
-    public String ProtocolValuePathDTO.getIdOrCodeName() {
-        return this.idOrCodeName;
-    }
-    
-    public void ProtocolValuePathDTO.setIdOrCodeName(String idOrCodeName) {
-        this.idOrCodeName = idOrCodeName;
-    }
-    
-    public String ProtocolValuePathDTO.getStateType() {
-        return this.stateType;
-    }
-    
-    public void ProtocolValuePathDTO.setStateType(String stateType) {
-        this.stateType = stateType;
-    }
-    
-    public String ProtocolValuePathDTO.getStateKind() {
-        return this.stateKind;
-    }
-    
-    public void ProtocolValuePathDTO.setStateKind(String stateKind) {
-        this.stateKind = stateKind;
-    }
-    
-    public String ProtocolValuePathDTO.getValueType() {
-        return this.valueType;
-    }
-    
-    public void ProtocolValuePathDTO.setValueType(String valueType) {
-        this.valueType = valueType;
-    }
-    
-    public String ProtocolValuePathDTO.getValueKind() {
-        return this.valueKind;
-    }
-    
-    public void ProtocolValuePathDTO.setValueKind(String valueKind) {
-        this.valueKind = valueKind;
-    }
-    
-    public Collection<ProtocolValue> ProtocolValuePathDTO.getValues() {
-        return this.values;
-    }
-    
-    public void ProtocolValuePathDTO.setValues(Collection<ProtocolValue> values) {
-        this.values = values;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ProtocolValuePathDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ProtocolValuePathDTO_Roo_Json.aj
deleted file mode 100644
index 8bde64378..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ProtocolValuePathDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ProtocolValuePathDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ProtocolValuePathDTO_Roo_Json {
-    
-    public static ProtocolValuePathDTO ProtocolValuePathDTO.fromJsonToProtocolValuePathDTO(String json) {
-        return new JSONDeserializer<ProtocolValuePathDTO>()
-        .use(null, ProtocolValuePathDTO.class).deserialize(json);
-    }
-    
-    public static Collection<ProtocolValuePathDTO> ProtocolValuePathDTO.fromJsonArrayToProtocoes(String json) {
-        return new JSONDeserializer<List<ProtocolValuePathDTO>>()
-        .use("values", ProtocolValuePathDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ProtocolValuePathDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ProtocolValuePathDTO_Roo_ToString.aj
deleted file mode 100644
index 589c431b2..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ProtocolValuePathDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ProtocolValuePathDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ProtocolValuePathDTO_Roo_ToString {
-    
-    public String ProtocolValuePathDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/PurgeFileDependencyCheckResponseDTO.java b/src/main/java/com/labsynch/labseer/dto/PurgeFileDependencyCheckResponseDTO.java
index 180fc200a..e4b88df28 100644
--- a/src/main/java/com/labsynch/labseer/dto/PurgeFileDependencyCheckResponseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PurgeFileDependencyCheckResponseDTO.java
@@ -1,12 +1,16 @@
 package com.labsynch.labseer.dto;
 
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 
 @RooJavaBean
 @RooToString
@@ -31,4 +35,44 @@ public String toJson() {
         .exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
     }
     
+
+	public static PurgeFileDependencyCheckResponseDTO fromJsonToPurgeFileDependencyCheckResponseDTO(String json) {
+        return new JSONDeserializer<PurgeFileDependencyCheckResponseDTO>()
+        .use(null, PurgeFileDependencyCheckResponseDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<PurgeFileDependencyCheckResponseDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<PurgeFileDependencyCheckResponseDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<PurgeFileDependencyCheckResponseDTO> fromJsonArrayToPurgeFileDependencyCheckRespoes(String json) {
+        return new JSONDeserializer<List<PurgeFileDependencyCheckResponseDTO>>()
+        .use("values", PurgeFileDependencyCheckResponseDTO.class).deserialize(json);
+    }
+
+	public String getSummary() {
+        return this.summary;
+    }
+
+	public void setSummary(String summary) {
+        this.summary = summary;
+    }
+
+	public boolean isCanPurge() {
+        return this.canPurge;
+    }
+
+	public void setCanPurge(boolean canPurge) {
+        this.canPurge = canPurge;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/PurgeFileDependencyCheckResponseDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/PurgeFileDependencyCheckResponseDTO_Roo_JavaBean.aj
deleted file mode 100644
index 508327789..000000000
--- a/src/main/java/com/labsynch/labseer/dto/PurgeFileDependencyCheckResponseDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.PurgeFileDependencyCheckResponseDTO;
-
-privileged aspect PurgeFileDependencyCheckResponseDTO_Roo_JavaBean {
-    
-    public String PurgeFileDependencyCheckResponseDTO.getSummary() {
-        return this.summary;
-    }
-    
-    public void PurgeFileDependencyCheckResponseDTO.setSummary(String summary) {
-        this.summary = summary;
-    }
-    
-    public boolean PurgeFileDependencyCheckResponseDTO.isCanPurge() {
-        return this.canPurge;
-    }
-    
-    public void PurgeFileDependencyCheckResponseDTO.setCanPurge(boolean canPurge) {
-        this.canPurge = canPurge;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/PurgeFileDependencyCheckResponseDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/PurgeFileDependencyCheckResponseDTO_Roo_Json.aj
deleted file mode 100644
index 0a1427101..000000000
--- a/src/main/java/com/labsynch/labseer/dto/PurgeFileDependencyCheckResponseDTO_Roo_Json.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.PurgeFileDependencyCheckResponseDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect PurgeFileDependencyCheckResponseDTO_Roo_Json {
-    
-    public static PurgeFileDependencyCheckResponseDTO PurgeFileDependencyCheckResponseDTO.fromJsonToPurgeFileDependencyCheckResponseDTO(String json) {
-        return new JSONDeserializer<PurgeFileDependencyCheckResponseDTO>()
-        .use(null, PurgeFileDependencyCheckResponseDTO.class).deserialize(json);
-    }
-    
-    public static String PurgeFileDependencyCheckResponseDTO.toJsonArray(Collection<PurgeFileDependencyCheckResponseDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String PurgeFileDependencyCheckResponseDTO.toJsonArray(Collection<PurgeFileDependencyCheckResponseDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<PurgeFileDependencyCheckResponseDTO> PurgeFileDependencyCheckResponseDTO.fromJsonArrayToPurgeFileDependencyCheckRespoes(String json) {
-        return new JSONDeserializer<List<PurgeFileDependencyCheckResponseDTO>>()
-        .use("values", PurgeFileDependencyCheckResponseDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/PurgeFileDependencyCheckResponseDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/PurgeFileDependencyCheckResponseDTO_Roo_ToString.aj
deleted file mode 100644
index cbb09e209..000000000
--- a/src/main/java/com/labsynch/labseer/dto/PurgeFileDependencyCheckResponseDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.PurgeFileDependencyCheckResponseDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect PurgeFileDependencyCheckResponseDTO_Roo_ToString {
-    
-    public String PurgeFileDependencyCheckResponseDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/PurgeFileResponseDTO.java b/src/main/java/com/labsynch/labseer/dto/PurgeFileResponseDTO.java
index f346f7f57..b7c657df4 100644
--- a/src/main/java/com/labsynch/labseer/dto/PurgeFileResponseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PurgeFileResponseDTO.java
@@ -1,12 +1,16 @@
 package com.labsynch.labseer.dto;
 
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 
 @RooJavaBean
 @RooToString
@@ -34,4 +38,52 @@ public String toJson() {
         .exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
     }
     
+
+	public String getSummary() {
+        return this.summary;
+    }
+
+	public void setSummary(String summary) {
+        this.summary = summary;
+    }
+
+	public boolean isSuccess() {
+        return this.success;
+    }
+
+	public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+	public String getFileName() {
+        return this.fileName;
+    }
+
+	public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+	public static PurgeFileResponseDTO fromJsonToPurgeFileResponseDTO(String json) {
+        return new JSONDeserializer<PurgeFileResponseDTO>()
+        .use(null, PurgeFileResponseDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<PurgeFileResponseDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<PurgeFileResponseDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<PurgeFileResponseDTO> fromJsonArrayToPurgeFileRespoes(String json) {
+        return new JSONDeserializer<List<PurgeFileResponseDTO>>()
+        .use("values", PurgeFileResponseDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/PurgeFileResponseDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/PurgeFileResponseDTO_Roo_JavaBean.aj
deleted file mode 100644
index 6a326aded..000000000
--- a/src/main/java/com/labsynch/labseer/dto/PurgeFileResponseDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.PurgeFileResponseDTO;
-
-privileged aspect PurgeFileResponseDTO_Roo_JavaBean {
-    
-    public String PurgeFileResponseDTO.getSummary() {
-        return this.summary;
-    }
-    
-    public void PurgeFileResponseDTO.setSummary(String summary) {
-        this.summary = summary;
-    }
-    
-    public boolean PurgeFileResponseDTO.isSuccess() {
-        return this.success;
-    }
-    
-    public void PurgeFileResponseDTO.setSuccess(boolean success) {
-        this.success = success;
-    }
-    
-    public String PurgeFileResponseDTO.getFileName() {
-        return this.fileName;
-    }
-    
-    public void PurgeFileResponseDTO.setFileName(String fileName) {
-        this.fileName = fileName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/PurgeFileResponseDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/PurgeFileResponseDTO_Roo_Json.aj
deleted file mode 100644
index 908ba6467..000000000
--- a/src/main/java/com/labsynch/labseer/dto/PurgeFileResponseDTO_Roo_Json.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.PurgeFileResponseDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect PurgeFileResponseDTO_Roo_Json {
-    
-    public static PurgeFileResponseDTO PurgeFileResponseDTO.fromJsonToPurgeFileResponseDTO(String json) {
-        return new JSONDeserializer<PurgeFileResponseDTO>()
-        .use(null, PurgeFileResponseDTO.class).deserialize(json);
-    }
-    
-    public static String PurgeFileResponseDTO.toJsonArray(Collection<PurgeFileResponseDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String PurgeFileResponseDTO.toJsonArray(Collection<PurgeFileResponseDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<PurgeFileResponseDTO> PurgeFileResponseDTO.fromJsonArrayToPurgeFileRespoes(String json) {
-        return new JSONDeserializer<List<PurgeFileResponseDTO>>()
-        .use("values", PurgeFileResponseDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/PurgeFileResponseDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/PurgeFileResponseDTO_Roo_ToString.aj
deleted file mode 100644
index 57f209149..000000000
--- a/src/main/java/com/labsynch/labseer/dto/PurgeFileResponseDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.PurgeFileResponseDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect PurgeFileResponseDTO_Roo_ToString {
-    
-    public String PurgeFileResponseDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/RawCurveDataDTO.java b/src/main/java/com/labsynch/labseer/dto/RawCurveDataDTO.java
index 01cfaeb25..18ca2afff 100644
--- a/src/main/java/com/labsynch/labseer/dto/RawCurveDataDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/RawCurveDataDTO.java
@@ -11,7 +11,8 @@
 
 import javax.persistence.EntityManager;
 import javax.persistence.TypedQuery;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.roo.addon.javabean.RooJavaBean;
@@ -24,6 +25,8 @@
 import org.supercsv.prefs.CsvPreference;
 
 import com.labsynch.labseer.domain.SubjectValue;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
 @RooJavaBean
 @RooToString
@@ -456,4 +459,206 @@ public static Collection<RawCurveDataDTO> getRawAgonistCurveDataByExperiment(Str
 		return rawCurveDataDTOs;
 	}
 
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static RawCurveDataDTO fromJsonToRawCurveDataDTO(String json) {
+        return new JSONDeserializer<RawCurveDataDTO>()
+        .use(null, RawCurveDataDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<RawCurveDataDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<RawCurveDataDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<RawCurveDataDTO> fromJsonArrayToRawCurveDataDTO(String json) {
+        return new JSONDeserializer<List<RawCurveDataDTO>>()
+        .use("values", RawCurveDataDTO.class).deserialize(json);
+    }
+
+	public String getCurveId() {
+        return this.curveId;
+    }
+
+	public void setCurveId(String curveId) {
+        this.curveId = curveId;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public Long getLsTransaction() {
+        return this.lsTransaction;
+    }
+
+	public void setLsTransaction(Long lsTransaction) {
+        this.lsTransaction = lsTransaction;
+    }
+
+	public Long getResponseSubjectValueId() {
+        return this.responseSubjectValueId;
+    }
+
+	public void setResponseSubjectValueId(Long responseSubjectValueId) {
+        this.responseSubjectValueId = responseSubjectValueId;
+    }
+
+	public BigDecimal getResponse() {
+        return this.response;
+    }
+
+	public void setResponse(BigDecimal response) {
+        this.response = response;
+    }
+
+	public String getResponseKind() {
+        return this.responseKind;
+    }
+
+	public void setResponseKind(String responseKind) {
+        this.responseKind = responseKind;
+    }
+
+	public String getResponseUnits() {
+        return this.responseUnits;
+    }
+
+	public void setResponseUnits(String responseUnits) {
+        this.responseUnits = responseUnits;
+    }
+
+	public BigDecimal getDose() {
+        return this.dose;
+    }
+
+	public void setDose(BigDecimal dose) {
+        this.dose = dose;
+    }
+
+	public String getDoseUnits() {
+        return this.doseUnits;
+    }
+
+	public void setDoseUnits(String doseUnits) {
+        this.doseUnits = doseUnits;
+    }
+
+	public String getAlgorithmFlagStatus() {
+        return this.algorithmFlagStatus;
+    }
+
+	public void setAlgorithmFlagStatus(String algorithmFlagStatus) {
+        this.algorithmFlagStatus = algorithmFlagStatus;
+    }
+
+	public String getAlgorithmFlagObservation() {
+        return this.algorithmFlagObservation;
+    }
+
+	public void setAlgorithmFlagObservation(String algorithmFlagObservation) {
+        this.algorithmFlagObservation = algorithmFlagObservation;
+    }
+
+	public String getAlgorithmFlagCause() {
+        return this.algorithmFlagCause;
+    }
+
+	public void setAlgorithmFlagCause(String algorithmFlagCause) {
+        this.algorithmFlagCause = algorithmFlagCause;
+    }
+
+	public String getAlgorithmFlagComment() {
+        return this.algorithmFlagComment;
+    }
+
+	public void setAlgorithmFlagComment(String algorithmFlagComment) {
+        this.algorithmFlagComment = algorithmFlagComment;
+    }
+
+	public String getPreprocessFlagStatus() {
+        return this.preprocessFlagStatus;
+    }
+
+	public void setPreprocessFlagStatus(String preprocessFlagStatus) {
+        this.preprocessFlagStatus = preprocessFlagStatus;
+    }
+
+	public String getPreprocessFlagObservation() {
+        return this.preprocessFlagObservation;
+    }
+
+	public void setPreprocessFlagObservation(String preprocessFlagObservation) {
+        this.preprocessFlagObservation = preprocessFlagObservation;
+    }
+
+	public String getPreprocessFlagCause() {
+        return this.preprocessFlagCause;
+    }
+
+	public void setPreprocessFlagCause(String preprocessFlagCause) {
+        this.preprocessFlagCause = preprocessFlagCause;
+    }
+
+	public String getPreprocessFlagComment() {
+        return this.preprocessFlagComment;
+    }
+
+	public void setPreprocessFlagComment(String preprocessFlagComment) {
+        this.preprocessFlagComment = preprocessFlagComment;
+    }
+
+	public String getUserFlagStatus() {
+        return this.userFlagStatus;
+    }
+
+	public void setUserFlagStatus(String userFlagStatus) {
+        this.userFlagStatus = userFlagStatus;
+    }
+
+	public String getUserFlagObservation() {
+        return this.userFlagObservation;
+    }
+
+	public void setUserFlagObservation(String userFlagObservation) {
+        this.userFlagObservation = userFlagObservation;
+    }
+
+	public String getUserFlagCause() {
+        return this.userFlagCause;
+    }
+
+	public void setUserFlagCause(String userFlagCause) {
+        this.userFlagCause = userFlagCause;
+    }
+
+	public String getUserFlagComment() {
+        return this.userFlagComment;
+    }
+
+	public void setUserFlagComment(String userFlagComment) {
+        this.userFlagComment = userFlagComment;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/dto/RawCurveDataDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/RawCurveDataDTO_Roo_JavaBean.aj
deleted file mode 100644
index 99a55b537..000000000
--- a/src/main/java/com/labsynch/labseer/dto/RawCurveDataDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,179 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.RawCurveDataDTO;
-import java.math.BigDecimal;
-
-privileged aspect RawCurveDataDTO_Roo_JavaBean {
-    
-    public String RawCurveDataDTO.getCurveId() {
-        return this.curveId;
-    }
-    
-    public void RawCurveDataDTO.setCurveId(String curveId) {
-        this.curveId = curveId;
-    }
-    
-    public String RawCurveDataDTO.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void RawCurveDataDTO.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public Long RawCurveDataDTO.getLsTransaction() {
-        return this.lsTransaction;
-    }
-    
-    public void RawCurveDataDTO.setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
-    
-    public Long RawCurveDataDTO.getResponseSubjectValueId() {
-        return this.responseSubjectValueId;
-    }
-    
-    public void RawCurveDataDTO.setResponseSubjectValueId(Long responseSubjectValueId) {
-        this.responseSubjectValueId = responseSubjectValueId;
-    }
-    
-    public BigDecimal RawCurveDataDTO.getResponse() {
-        return this.response;
-    }
-    
-    public void RawCurveDataDTO.setResponse(BigDecimal response) {
-        this.response = response;
-    }
-    
-    public String RawCurveDataDTO.getResponseKind() {
-        return this.responseKind;
-    }
-    
-    public void RawCurveDataDTO.setResponseKind(String responseKind) {
-        this.responseKind = responseKind;
-    }
-    
-    public String RawCurveDataDTO.getResponseUnits() {
-        return this.responseUnits;
-    }
-    
-    public void RawCurveDataDTO.setResponseUnits(String responseUnits) {
-        this.responseUnits = responseUnits;
-    }
-    
-    public BigDecimal RawCurveDataDTO.getDose() {
-        return this.dose;
-    }
-    
-    public void RawCurveDataDTO.setDose(BigDecimal dose) {
-        this.dose = dose;
-    }
-    
-    public String RawCurveDataDTO.getDoseUnits() {
-        return this.doseUnits;
-    }
-    
-    public void RawCurveDataDTO.setDoseUnits(String doseUnits) {
-        this.doseUnits = doseUnits;
-    }
-    
-    public String RawCurveDataDTO.getAlgorithmFlagStatus() {
-        return this.algorithmFlagStatus;
-    }
-    
-    public void RawCurveDataDTO.setAlgorithmFlagStatus(String algorithmFlagStatus) {
-        this.algorithmFlagStatus = algorithmFlagStatus;
-    }
-    
-    public String RawCurveDataDTO.getAlgorithmFlagObservation() {
-        return this.algorithmFlagObservation;
-    }
-    
-    public void RawCurveDataDTO.setAlgorithmFlagObservation(String algorithmFlagObservation) {
-        this.algorithmFlagObservation = algorithmFlagObservation;
-    }
-    
-    public String RawCurveDataDTO.getAlgorithmFlagCause() {
-        return this.algorithmFlagCause;
-    }
-    
-    public void RawCurveDataDTO.setAlgorithmFlagCause(String algorithmFlagCause) {
-        this.algorithmFlagCause = algorithmFlagCause;
-    }
-    
-    public String RawCurveDataDTO.getAlgorithmFlagComment() {
-        return this.algorithmFlagComment;
-    }
-    
-    public void RawCurveDataDTO.setAlgorithmFlagComment(String algorithmFlagComment) {
-        this.algorithmFlagComment = algorithmFlagComment;
-    }
-    
-    public String RawCurveDataDTO.getPreprocessFlagStatus() {
-        return this.preprocessFlagStatus;
-    }
-    
-    public void RawCurveDataDTO.setPreprocessFlagStatus(String preprocessFlagStatus) {
-        this.preprocessFlagStatus = preprocessFlagStatus;
-    }
-    
-    public String RawCurveDataDTO.getPreprocessFlagObservation() {
-        return this.preprocessFlagObservation;
-    }
-    
-    public void RawCurveDataDTO.setPreprocessFlagObservation(String preprocessFlagObservation) {
-        this.preprocessFlagObservation = preprocessFlagObservation;
-    }
-    
-    public String RawCurveDataDTO.getPreprocessFlagCause() {
-        return this.preprocessFlagCause;
-    }
-    
-    public void RawCurveDataDTO.setPreprocessFlagCause(String preprocessFlagCause) {
-        this.preprocessFlagCause = preprocessFlagCause;
-    }
-    
-    public String RawCurveDataDTO.getPreprocessFlagComment() {
-        return this.preprocessFlagComment;
-    }
-    
-    public void RawCurveDataDTO.setPreprocessFlagComment(String preprocessFlagComment) {
-        this.preprocessFlagComment = preprocessFlagComment;
-    }
-    
-    public String RawCurveDataDTO.getUserFlagStatus() {
-        return this.userFlagStatus;
-    }
-    
-    public void RawCurveDataDTO.setUserFlagStatus(String userFlagStatus) {
-        this.userFlagStatus = userFlagStatus;
-    }
-    
-    public String RawCurveDataDTO.getUserFlagObservation() {
-        return this.userFlagObservation;
-    }
-    
-    public void RawCurveDataDTO.setUserFlagObservation(String userFlagObservation) {
-        this.userFlagObservation = userFlagObservation;
-    }
-    
-    public String RawCurveDataDTO.getUserFlagCause() {
-        return this.userFlagCause;
-    }
-    
-    public void RawCurveDataDTO.setUserFlagCause(String userFlagCause) {
-        this.userFlagCause = userFlagCause;
-    }
-    
-    public String RawCurveDataDTO.getUserFlagComment() {
-        return this.userFlagComment;
-    }
-    
-    public void RawCurveDataDTO.setUserFlagComment(String userFlagComment) {
-        this.userFlagComment = userFlagComment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/RawCurveDataDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/RawCurveDataDTO_Roo_Json.aj
deleted file mode 100644
index a3bd7cae4..000000000
--- a/src/main/java/com/labsynch/labseer/dto/RawCurveDataDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.RawCurveDataDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect RawCurveDataDTO_Roo_Json {
-    
-    public String RawCurveDataDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String RawCurveDataDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static RawCurveDataDTO RawCurveDataDTO.fromJsonToRawCurveDataDTO(String json) {
-        return new JSONDeserializer<RawCurveDataDTO>()
-        .use(null, RawCurveDataDTO.class).deserialize(json);
-    }
-    
-    public static String RawCurveDataDTO.toJsonArray(Collection<RawCurveDataDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String RawCurveDataDTO.toJsonArray(Collection<RawCurveDataDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<RawCurveDataDTO> RawCurveDataDTO.fromJsonArrayToRawCurveDataDTO(String json) {
-        return new JSONDeserializer<List<RawCurveDataDTO>>()
-        .use("values", RawCurveDataDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/RawCurveDataDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/RawCurveDataDTO_Roo_ToString.aj
deleted file mode 100644
index e26793fd2..000000000
--- a/src/main/java/com/labsynch/labseer/dto/RawCurveDataDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.RawCurveDataDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect RawCurveDataDTO_Roo_ToString {
-    
-    public String RawCurveDataDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/RegSearchDTO.java b/src/main/java/com/labsynch/labseer/dto/RegSearchDTO.java
index 659438cdf..eb21b1ed0 100755
--- a/src/main/java/com/labsynch/labseer/dto/RegSearchDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/RegSearchDTO.java
@@ -5,7 +5,8 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -46,4 +47,56 @@ public static String toJsonArray(Collection<RegSearchDTO> collection) {
 	public static Collection<RegSearchDTO> fromJsonArrayToRegSearchDTO(String json) {
         return new JSONDeserializer<List<RegSearchDTO>>().use(null, ArrayList.class).use("values", RegSearchDTO.class).deserialize(json);
     }
+
+	public String getAsDrawnStructure() {
+        return this.asDrawnStructure;
+    }
+
+	public void setAsDrawnStructure(String asDrawnStructure) {
+        this.asDrawnStructure = asDrawnStructure;
+    }
+
+	public String getAsDrawnImage() {
+        return this.asDrawnImage;
+    }
+
+	public void setAsDrawnImage(String asDrawnImage) {
+        this.asDrawnImage = asDrawnImage;
+    }
+
+	public double getAsDrawnMolWeight() {
+        return this.asDrawnMolWeight;
+    }
+
+	public void setAsDrawnMolWeight(double asDrawnMolWeight) {
+        this.asDrawnMolWeight = asDrawnMolWeight;
+    }
+
+	public double getAsDrawnExactMass() {
+        return this.asDrawnExactMass;
+    }
+
+	public void setAsDrawnExactMass(double asDrawnExactMass) {
+        this.asDrawnExactMass = asDrawnExactMass;
+    }
+
+	public String getAsDrawnMolFormula() {
+        return this.asDrawnMolFormula;
+    }
+
+	public void setAsDrawnMolFormula(String asDrawnMolFormula) {
+        this.asDrawnMolFormula = asDrawnMolFormula;
+    }
+
+	public Set<ParentDTO> getParents() {
+        return this.parents;
+    }
+
+	public void setParents(Set<ParentDTO> parents) {
+        this.parents = parents;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/RegSearchDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/RegSearchDTO_Roo_JavaBean.aj
deleted file mode 100644
index 9dd1f03d7..000000000
--- a/src/main/java/com/labsynch/labseer/dto/RegSearchDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,60 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ParentDTO;
-import com.labsynch.labseer.dto.RegSearchDTO;
-import java.util.Set;
-
-privileged aspect RegSearchDTO_Roo_JavaBean {
-    
-    public String RegSearchDTO.getAsDrawnStructure() {
-        return this.asDrawnStructure;
-    }
-    
-    public void RegSearchDTO.setAsDrawnStructure(String asDrawnStructure) {
-        this.asDrawnStructure = asDrawnStructure;
-    }
-    
-    public String RegSearchDTO.getAsDrawnImage() {
-        return this.asDrawnImage;
-    }
-    
-    public void RegSearchDTO.setAsDrawnImage(String asDrawnImage) {
-        this.asDrawnImage = asDrawnImage;
-    }
-    
-    public double RegSearchDTO.getAsDrawnMolWeight() {
-        return this.asDrawnMolWeight;
-    }
-    
-    public void RegSearchDTO.setAsDrawnMolWeight(double asDrawnMolWeight) {
-        this.asDrawnMolWeight = asDrawnMolWeight;
-    }
-    
-    public double RegSearchDTO.getAsDrawnExactMass() {
-        return this.asDrawnExactMass;
-    }
-    
-    public void RegSearchDTO.setAsDrawnExactMass(double asDrawnExactMass) {
-        this.asDrawnExactMass = asDrawnExactMass;
-    }
-    
-    public String RegSearchDTO.getAsDrawnMolFormula() {
-        return this.asDrawnMolFormula;
-    }
-    
-    public void RegSearchDTO.setAsDrawnMolFormula(String asDrawnMolFormula) {
-        this.asDrawnMolFormula = asDrawnMolFormula;
-    }
-    
-    public Set<ParentDTO> RegSearchDTO.getParents() {
-        return this.parents;
-    }
-    
-    public void RegSearchDTO.setParents(Set<ParentDTO> parents) {
-        this.parents = parents;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/RegSearchDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/RegSearchDTO_Roo_ToString.aj
deleted file mode 100644
index 1d2c40aa0..000000000
--- a/src/main/java/com/labsynch/labseer/dto/RegSearchDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.RegSearchDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect RegSearchDTO_Roo_ToString {
-    
-    public String RegSearchDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/RegSearchParamsDTO.java b/src/main/java/com/labsynch/labseer/dto/RegSearchParamsDTO.java
index 37071aa9f..52dd7dc85 100755
--- a/src/main/java/com/labsynch/labseer/dto/RegSearchParamsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/RegSearchParamsDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -20,4 +26,78 @@ public class RegSearchParamsDTO {
 	private String lotCorpName;
     
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getCorpName() {
+        return this.corpName;
+    }
+
+	public void setCorpName(String corpName) {
+        this.corpName = corpName;
+    }
+
+	public String getMolStructure() {
+        return this.molStructure;
+    }
+
+	public void setMolStructure(String molStructure) {
+        this.molStructure = molStructure;
+    }
+
+	public String getParentCorpName() {
+        return this.parentCorpName;
+    }
+
+	public void setParentCorpName(String parentCorpName) {
+        this.parentCorpName = parentCorpName;
+    }
+
+	public String getSaltFormCorpName() {
+        return this.saltFormCorpName;
+    }
+
+	public void setSaltFormCorpName(String saltFormCorpName) {
+        this.saltFormCorpName = saltFormCorpName;
+    }
+
+	public String getLotCorpName() {
+        return this.lotCorpName;
+    }
+
+	public void setLotCorpName(String lotCorpName) {
+        this.lotCorpName = lotCorpName;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static RegSearchParamsDTO fromJsonToRegSearchParamsDTO(String json) {
+        return new JSONDeserializer<RegSearchParamsDTO>()
+        .use(null, RegSearchParamsDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<RegSearchParamsDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<RegSearchParamsDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<RegSearchParamsDTO> fromJsonArrayToRegSearchParamsDTO(String json) {
+        return new JSONDeserializer<List<RegSearchParamsDTO>>()
+        .use("values", RegSearchParamsDTO.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/RegSearchParamsDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/RegSearchParamsDTO_Roo_JavaBean.aj
deleted file mode 100644
index 249c7aa02..000000000
--- a/src/main/java/com/labsynch/labseer/dto/RegSearchParamsDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,50 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.RegSearchParamsDTO;
-
-privileged aspect RegSearchParamsDTO_Roo_JavaBean {
-    
-    public String RegSearchParamsDTO.getCorpName() {
-        return this.corpName;
-    }
-    
-    public void RegSearchParamsDTO.setCorpName(String corpName) {
-        this.corpName = corpName;
-    }
-    
-    public String RegSearchParamsDTO.getMolStructure() {
-        return this.molStructure;
-    }
-    
-    public void RegSearchParamsDTO.setMolStructure(String molStructure) {
-        this.molStructure = molStructure;
-    }
-    
-    public String RegSearchParamsDTO.getParentCorpName() {
-        return this.parentCorpName;
-    }
-    
-    public void RegSearchParamsDTO.setParentCorpName(String parentCorpName) {
-        this.parentCorpName = parentCorpName;
-    }
-    
-    public String RegSearchParamsDTO.getSaltFormCorpName() {
-        return this.saltFormCorpName;
-    }
-    
-    public void RegSearchParamsDTO.setSaltFormCorpName(String saltFormCorpName) {
-        this.saltFormCorpName = saltFormCorpName;
-    }
-    
-    public String RegSearchParamsDTO.getLotCorpName() {
-        return this.lotCorpName;
-    }
-    
-    public void RegSearchParamsDTO.setLotCorpName(String lotCorpName) {
-        this.lotCorpName = lotCorpName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/RegSearchParamsDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/RegSearchParamsDTO_Roo_Json.aj
deleted file mode 100644
index 84408bbe5..000000000
--- a/src/main/java/com/labsynch/labseer/dto/RegSearchParamsDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.RegSearchParamsDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect RegSearchParamsDTO_Roo_Json {
-    
-    public String RegSearchParamsDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String RegSearchParamsDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static RegSearchParamsDTO RegSearchParamsDTO.fromJsonToRegSearchParamsDTO(String json) {
-        return new JSONDeserializer<RegSearchParamsDTO>()
-        .use(null, RegSearchParamsDTO.class).deserialize(json);
-    }
-    
-    public static String RegSearchParamsDTO.toJsonArray(Collection<RegSearchParamsDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String RegSearchParamsDTO.toJsonArray(Collection<RegSearchParamsDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<RegSearchParamsDTO> RegSearchParamsDTO.fromJsonArrayToRegSearchParamsDTO(String json) {
-        return new JSONDeserializer<List<RegSearchParamsDTO>>()
-        .use("values", RegSearchParamsDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/RegSearchParamsDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/RegSearchParamsDTO_Roo_ToString.aj
deleted file mode 100644
index cae74f114..000000000
--- a/src/main/java/com/labsynch/labseer/dto/RegSearchParamsDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.RegSearchParamsDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect RegSearchParamsDTO_Roo_ToString {
-    
-    public String RegSearchParamsDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/RenderMolRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/RenderMolRequestDTO.java
index 6d3208572..6a240586d 100644
--- a/src/main/java/com/labsynch/labseer/dto/RenderMolRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/RenderMolRequestDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -19,6 +25,80 @@ public class RenderMolRequestDTO {
 	
 	private String format;
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static RenderMolRequestDTO fromJsonToRenderMolRequestDTO(String json) {
+        return new JSONDeserializer<RenderMolRequestDTO>()
+        .use(null, RenderMolRequestDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<RenderMolRequestDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<RenderMolRequestDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<RenderMolRequestDTO> fromJsonArrayToRenderMoes(String json) {
+        return new JSONDeserializer<List<RenderMolRequestDTO>>()
+        .use("values", RenderMolRequestDTO.class).deserialize(json);
+    }
+
+	public String getCodeName() {
+        return this.codeName;
+    }
+
+	public void setCodeName(String codeName) {
+        this.codeName = codeName;
+    }
+
+	public String getMolStructure() {
+        return this.molStructure;
+    }
+
+	public void setMolStructure(String molStructure) {
+        this.molStructure = molStructure;
+    }
+
+	public Integer getHeight() {
+        return this.height;
+    }
+
+	public void setHeight(Integer height) {
+        this.height = height;
+    }
+
+	public Integer getWidth() {
+        return this.width;
+    }
+
+	public void setWidth(Integer width) {
+        this.width = width;
+    }
+
+	public String getFormat() {
+        return this.format;
+    }
+
+	public void setFormat(String format) {
+        this.format = format;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/RenderMolRequestDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/RenderMolRequestDTO_Roo_JavaBean.aj
deleted file mode 100644
index 008527f51..000000000
--- a/src/main/java/com/labsynch/labseer/dto/RenderMolRequestDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,50 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.RenderMolRequestDTO;
-
-privileged aspect RenderMolRequestDTO_Roo_JavaBean {
-    
-    public String RenderMolRequestDTO.getCodeName() {
-        return this.codeName;
-    }
-    
-    public void RenderMolRequestDTO.setCodeName(String codeName) {
-        this.codeName = codeName;
-    }
-    
-    public String RenderMolRequestDTO.getMolStructure() {
-        return this.molStructure;
-    }
-    
-    public void RenderMolRequestDTO.setMolStructure(String molStructure) {
-        this.molStructure = molStructure;
-    }
-    
-    public Integer RenderMolRequestDTO.getHeight() {
-        return this.height;
-    }
-    
-    public void RenderMolRequestDTO.setHeight(Integer height) {
-        this.height = height;
-    }
-    
-    public Integer RenderMolRequestDTO.getWidth() {
-        return this.width;
-    }
-    
-    public void RenderMolRequestDTO.setWidth(Integer width) {
-        this.width = width;
-    }
-    
-    public String RenderMolRequestDTO.getFormat() {
-        return this.format;
-    }
-    
-    public void RenderMolRequestDTO.setFormat(String format) {
-        this.format = format;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/RenderMolRequestDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/RenderMolRequestDTO_Roo_Json.aj
deleted file mode 100644
index 586abe8fe..000000000
--- a/src/main/java/com/labsynch/labseer/dto/RenderMolRequestDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.RenderMolRequestDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect RenderMolRequestDTO_Roo_Json {
-    
-    public String RenderMolRequestDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String RenderMolRequestDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static RenderMolRequestDTO RenderMolRequestDTO.fromJsonToRenderMolRequestDTO(String json) {
-        return new JSONDeserializer<RenderMolRequestDTO>()
-        .use(null, RenderMolRequestDTO.class).deserialize(json);
-    }
-    
-    public static String RenderMolRequestDTO.toJsonArray(Collection<RenderMolRequestDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String RenderMolRequestDTO.toJsonArray(Collection<RenderMolRequestDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<RenderMolRequestDTO> RenderMolRequestDTO.fromJsonArrayToRenderMoes(String json) {
-        return new JSONDeserializer<List<RenderMolRequestDTO>>()
-        .use("values", RenderMolRequestDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/RenderMolRequestDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/RenderMolRequestDTO_Roo_ToString.aj
deleted file mode 100644
index 116f7595a..000000000
--- a/src/main/java/com/labsynch/labseer/dto/RenderMolRequestDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.RenderMolRequestDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect RenderMolRequestDTO_Roo_ToString {
-    
-    public String RenderMolRequestDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ReparentLotDTO.java b/src/main/java/com/labsynch/labseer/dto/ReparentLotDTO.java
index 2e3cc6f9d..1c914c7b2 100644
--- a/src/main/java/com/labsynch/labseer/dto/ReparentLotDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ReparentLotDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -15,4 +21,62 @@ public class ReparentLotDTO {
 
 	private String modifiedBy;
 	
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getParentCorpName() {
+        return this.parentCorpName;
+    }
+
+	public void setParentCorpName(String parentCorpName) {
+        this.parentCorpName = parentCorpName;
+    }
+
+	public String getLotCorpName() {
+        return this.lotCorpName;
+    }
+
+	public void setLotCorpName(String lotCorpName) {
+        this.lotCorpName = lotCorpName;
+    }
+
+	public String getModifiedBy() {
+        return this.modifiedBy;
+    }
+
+	public void setModifiedBy(String modifiedBy) {
+        this.modifiedBy = modifiedBy;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ReparentLotDTO fromJsonToReparentLotDTO(String json) {
+        return new JSONDeserializer<ReparentLotDTO>()
+        .use(null, ReparentLotDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ReparentLotDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ReparentLotDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ReparentLotDTO> fromJsonArrayToReparentLoes(String json) {
+        return new JSONDeserializer<List<ReparentLotDTO>>()
+        .use("values", ReparentLotDTO.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ReparentLotDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ReparentLotDTO_Roo_JavaBean.aj
deleted file mode 100644
index 765659c7f..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ReparentLotDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ReparentLotDTO;
-
-privileged aspect ReparentLotDTO_Roo_JavaBean {
-    
-    public String ReparentLotDTO.getParentCorpName() {
-        return this.parentCorpName;
-    }
-    
-    public void ReparentLotDTO.setParentCorpName(String parentCorpName) {
-        this.parentCorpName = parentCorpName;
-    }
-    
-    public String ReparentLotDTO.getLotCorpName() {
-        return this.lotCorpName;
-    }
-    
-    public void ReparentLotDTO.setLotCorpName(String lotCorpName) {
-        this.lotCorpName = lotCorpName;
-    }
-    
-    public String ReparentLotDTO.getModifiedBy() {
-        return this.modifiedBy;
-    }
-    
-    public void ReparentLotDTO.setModifiedBy(String modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ReparentLotDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ReparentLotDTO_Roo_Json.aj
deleted file mode 100644
index e7e02f59e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ReparentLotDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ReparentLotDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ReparentLotDTO_Roo_Json {
-    
-    public String ReparentLotDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ReparentLotDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ReparentLotDTO ReparentLotDTO.fromJsonToReparentLotDTO(String json) {
-        return new JSONDeserializer<ReparentLotDTO>()
-        .use(null, ReparentLotDTO.class).deserialize(json);
-    }
-    
-    public static String ReparentLotDTO.toJsonArray(Collection<ReparentLotDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ReparentLotDTO.toJsonArray(Collection<ReparentLotDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ReparentLotDTO> ReparentLotDTO.fromJsonArrayToReparentLoes(String json) {
-        return new JSONDeserializer<List<ReparentLotDTO>>()
-        .use("values", ReparentLotDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ReparentLotDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ReparentLotDTO_Roo_ToString.aj
deleted file mode 100644
index c05b9eb12..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ReparentLotDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ReparentLotDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ReparentLotDTO_Roo_ToString {
-    
-    public String ReparentLotDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/RequestNameDTO.java b/src/main/java/com/labsynch/labseer/dto/RequestNameDTO.java
index 907abe696..296370349 100755
--- a/src/main/java/com/labsynch/labseer/dto/RequestNameDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/RequestNameDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -11,6 +17,48 @@ public class RequestNameDTO {
 
 	private String requestName;
 	
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getRequestName() {
+        return this.requestName;
+    }
+
+	public void setRequestName(String requestName) {
+        this.requestName = requestName;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static RequestNameDTO fromJsonToRequestNameDTO(String json) {
+        return new JSONDeserializer<RequestNameDTO>()
+        .use(null, RequestNameDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<RequestNameDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<RequestNameDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<RequestNameDTO> fromJsonArrayToRequestNameDTO(String json) {
+        return new JSONDeserializer<List<RequestNameDTO>>()
+        .use("values", RequestNameDTO.class).deserialize(json);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/RequestNameDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/RequestNameDTO_Roo_JavaBean.aj
deleted file mode 100755
index 578d6499c..000000000
--- a/src/main/java/com/labsynch/labseer/dto/RequestNameDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.RequestNameDTO;
-
-privileged aspect RequestNameDTO_Roo_JavaBean {
-    
-    public String RequestNameDTO.getRequestName() {
-        return this.requestName;
-    }
-    
-    public void RequestNameDTO.setRequestName(String requestName) {
-        this.requestName = requestName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/RequestNameDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/RequestNameDTO_Roo_Json.aj
deleted file mode 100755
index d20928d95..000000000
--- a/src/main/java/com/labsynch/labseer/dto/RequestNameDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.RequestNameDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect RequestNameDTO_Roo_Json {
-    
-    public String RequestNameDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String RequestNameDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static RequestNameDTO RequestNameDTO.fromJsonToRequestNameDTO(String json) {
-        return new JSONDeserializer<RequestNameDTO>()
-        .use(null, RequestNameDTO.class).deserialize(json);
-    }
-    
-    public static String RequestNameDTO.toJsonArray(Collection<RequestNameDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String RequestNameDTO.toJsonArray(Collection<RequestNameDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<RequestNameDTO> RequestNameDTO.fromJsonArrayToRequestNameDTO(String json) {
-        return new JSONDeserializer<List<RequestNameDTO>>()
-        .use("values", RequestNameDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/RequestNameDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/RequestNameDTO_Roo_ToString.aj
deleted file mode 100755
index 0e8e66c40..000000000
--- a/src/main/java/com/labsynch/labseer/dto/RequestNameDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.RequestNameDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect RequestNameDTO_Roo_ToString {
-    
-    public String RequestNameDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SELColOrderDTO.java b/src/main/java/com/labsynch/labseer/dto/SELColOrderDTO.java
index 389b706b5..7122dc4c0 100644
--- a/src/main/java/com/labsynch/labseer/dto/SELColOrderDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SELColOrderDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -34,6 +40,96 @@ public int compareTo(Object compareObject) {
 		return this.columnOrder - compareColOrder;
 	}
 	
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static SELColOrderDTO fromJsonToSELColOrderDTO(String json) {
+        return new JSONDeserializer<SELColOrderDTO>()
+        .use(null, SELColOrderDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<SELColOrderDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<SELColOrderDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<SELColOrderDTO> fromJsonArrayToSELCoes(String json) {
+        return new JSONDeserializer<List<SELColOrderDTO>>()
+        .use("values", SELColOrderDTO.class).deserialize(json);
+    }
+
+	public Long getStateId() {
+        return this.stateId;
+    }
+
+	public void setStateId(Long stateId) {
+        this.stateId = stateId;
+    }
+
+	public String getColumnName() {
+        return this.columnName;
+    }
+
+	public void setColumnName(String columnName) {
+        this.columnName = columnName;
+    }
+
+	public Integer getColumnOrder() {
+        return this.columnOrder;
+    }
+
+	public void setColumnOrder(Integer columnOrder) {
+        this.columnOrder = columnOrder;
+    }
+
+	public boolean isColumnDisplay() {
+        return this.columnDisplay;
+    }
+
+	public void setColumnDisplay(boolean columnDisplay) {
+        this.columnDisplay = columnDisplay;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public boolean isPublicData() {
+        return this.publicData;
+    }
+
+	public void setPublicData(boolean publicData) {
+        this.publicData = publicData;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/SELColOrderDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/SELColOrderDTO_Roo_JavaBean.aj
deleted file mode 100644
index 2f93ad115..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SELColOrderDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,66 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SELColOrderDTO;
-
-privileged aspect SELColOrderDTO_Roo_JavaBean {
-    
-    public Long SELColOrderDTO.getStateId() {
-        return this.stateId;
-    }
-    
-    public void SELColOrderDTO.setStateId(Long stateId) {
-        this.stateId = stateId;
-    }
-    
-    public String SELColOrderDTO.getColumnName() {
-        return this.columnName;
-    }
-    
-    public void SELColOrderDTO.setColumnName(String columnName) {
-        this.columnName = columnName;
-    }
-    
-    public Integer SELColOrderDTO.getColumnOrder() {
-        return this.columnOrder;
-    }
-    
-    public void SELColOrderDTO.setColumnOrder(Integer columnOrder) {
-        this.columnOrder = columnOrder;
-    }
-    
-    public boolean SELColOrderDTO.isColumnDisplay() {
-        return this.columnDisplay;
-    }
-    
-    public void SELColOrderDTO.setColumnDisplay(boolean columnDisplay) {
-        this.columnDisplay = columnDisplay;
-    }
-    
-    public String SELColOrderDTO.getLsType() {
-        return this.lsType;
-    }
-    
-    public void SELColOrderDTO.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String SELColOrderDTO.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void SELColOrderDTO.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public boolean SELColOrderDTO.isPublicData() {
-        return this.publicData;
-    }
-    
-    public void SELColOrderDTO.setPublicData(boolean publicData) {
-        this.publicData = publicData;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SELColOrderDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/SELColOrderDTO_Roo_Json.aj
deleted file mode 100644
index cb937f700..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SELColOrderDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SELColOrderDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect SELColOrderDTO_Roo_Json {
-    
-    public String SELColOrderDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String SELColOrderDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static SELColOrderDTO SELColOrderDTO.fromJsonToSELColOrderDTO(String json) {
-        return new JSONDeserializer<SELColOrderDTO>()
-        .use(null, SELColOrderDTO.class).deserialize(json);
-    }
-    
-    public static String SELColOrderDTO.toJsonArray(Collection<SELColOrderDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String SELColOrderDTO.toJsonArray(Collection<SELColOrderDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<SELColOrderDTO> SELColOrderDTO.fromJsonArrayToSELCoes(String json) {
-        return new JSONDeserializer<List<SELColOrderDTO>>()
-        .use("values", SELColOrderDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SELColOrderDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/SELColOrderDTO_Roo_ToString.aj
deleted file mode 100644
index a619a33f5..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SELColOrderDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SELColOrderDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SELColOrderDTO_Roo_ToString {
-    
-    public String SELColOrderDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SaltFormAliasDTO.java b/src/main/java/com/labsynch/labseer/dto/SaltFormAliasDTO.java
index 65bc106a2..f3b57f3af 100644
--- a/src/main/java/com/labsynch/labseer/dto/SaltFormAliasDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SaltFormAliasDTO.java
@@ -1,11 +1,17 @@
 package com.labsynch.labseer.dto;
 
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.ParentAlias;
 import com.labsynch.labseer.domain.SaltFormAlias;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 
 @RooJavaBean
 @RooToString
@@ -39,4 +45,78 @@ public boolean getPreferred(){
     }
     
    
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getSaltFormCorpName() {
+        return this.saltFormCorpName;
+    }
+
+	public void setSaltFormCorpName(String saltFormCorpName) {
+        this.saltFormCorpName = saltFormCorpName;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getAliasName() {
+        return this.aliasName;
+    }
+
+	public void setAliasName(String aliasName) {
+        this.aliasName = aliasName;
+    }
+
+	public boolean isPreferred() {
+        return this.preferred;
+    }
+
+	public void setPreferred(boolean preferred) {
+        this.preferred = preferred;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static SaltFormAliasDTO fromJsonToSaltFormAliasDTO(String json) {
+        return new JSONDeserializer<SaltFormAliasDTO>()
+        .use(null, SaltFormAliasDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<SaltFormAliasDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<SaltFormAliasDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<SaltFormAliasDTO> fromJsonArrayToSaltFoes(String json) {
+        return new JSONDeserializer<List<SaltFormAliasDTO>>()
+        .use("values", SaltFormAliasDTO.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/SaltFormAliasDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/SaltFormAliasDTO_Roo_JavaBean.aj
deleted file mode 100644
index f2b38e8ea..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SaltFormAliasDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,50 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SaltFormAliasDTO;
-
-privileged aspect SaltFormAliasDTO_Roo_JavaBean {
-    
-    public String SaltFormAliasDTO.getSaltFormCorpName() {
-        return this.saltFormCorpName;
-    }
-    
-    public void SaltFormAliasDTO.setSaltFormCorpName(String saltFormCorpName) {
-        this.saltFormCorpName = saltFormCorpName;
-    }
-    
-    public String SaltFormAliasDTO.getLsType() {
-        return this.lsType;
-    }
-    
-    public void SaltFormAliasDTO.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String SaltFormAliasDTO.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void SaltFormAliasDTO.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String SaltFormAliasDTO.getAliasName() {
-        return this.aliasName;
-    }
-    
-    public void SaltFormAliasDTO.setAliasName(String aliasName) {
-        this.aliasName = aliasName;
-    }
-    
-    public boolean SaltFormAliasDTO.isPreferred() {
-        return this.preferred;
-    }
-    
-    public void SaltFormAliasDTO.setPreferred(boolean preferred) {
-        this.preferred = preferred;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SaltFormAliasDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/SaltFormAliasDTO_Roo_Json.aj
deleted file mode 100644
index 27027883e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SaltFormAliasDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SaltFormAliasDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect SaltFormAliasDTO_Roo_Json {
-    
-    public String SaltFormAliasDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String SaltFormAliasDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static SaltFormAliasDTO SaltFormAliasDTO.fromJsonToSaltFormAliasDTO(String json) {
-        return new JSONDeserializer<SaltFormAliasDTO>()
-        .use(null, SaltFormAliasDTO.class).deserialize(json);
-    }
-    
-    public static String SaltFormAliasDTO.toJsonArray(Collection<SaltFormAliasDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String SaltFormAliasDTO.toJsonArray(Collection<SaltFormAliasDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<SaltFormAliasDTO> SaltFormAliasDTO.fromJsonArrayToSaltFoes(String json) {
-        return new JSONDeserializer<List<SaltFormAliasDTO>>()
-        .use("values", SaltFormAliasDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SaltFormAliasDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/SaltFormAliasDTO_Roo_ToString.aj
deleted file mode 100644
index d51cb7898..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SaltFormAliasDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SaltFormAliasDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SaltFormAliasDTO_Roo_ToString {
-    
-    public String SaltFormAliasDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SaltFormDTO.java b/src/main/java/com/labsynch/labseer/dto/SaltFormDTO.java
index 1f5135ac8..f31cb5ca0 100755
--- a/src/main/java/com/labsynch/labseer/dto/SaltFormDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SaltFormDTO.java
@@ -1,11 +1,14 @@
 package com.labsynch.labseer.dto;
 
+import java.util.Collection;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import javax.persistence.Lob;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -13,6 +16,8 @@
 import com.labsynch.labseer.domain.IsoSalt;
 import com.labsynch.labseer.domain.Lot;
 import com.labsynch.labseer.domain.SaltForm;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
 @RooJavaBean
 @RooToString
@@ -119,4 +124,42 @@ public Set<Lot> getLots() {
     public void setLots(Set<Lot> lots) {
         this.lots = lots;
     }
+
+	public void setChemist(String chemist) {
+        this.chemist = chemist;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static SaltFormDTO fromJsonToSaltFormDTO(String json) {
+        return new JSONDeserializer<SaltFormDTO>()
+        .use(null, SaltFormDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<SaltFormDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<SaltFormDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<SaltFormDTO> fromJsonArrayToSaltFoes(String json) {
+        return new JSONDeserializer<List<SaltFormDTO>>()
+        .use("values", SaltFormDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/SaltFormDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/SaltFormDTO_Roo_JavaBean.aj
deleted file mode 100644
index 91d402e9d..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SaltFormDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,14 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SaltFormDTO;
-
-privileged aspect SaltFormDTO_Roo_JavaBean {
-    
-    public void SaltFormDTO.setChemist(String chemist) {
-        this.chemist = chemist;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SaltFormDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/SaltFormDTO_Roo_Json.aj
deleted file mode 100644
index b583fe5be..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SaltFormDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SaltFormDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect SaltFormDTO_Roo_Json {
-    
-    public String SaltFormDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String SaltFormDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static SaltFormDTO SaltFormDTO.fromJsonToSaltFormDTO(String json) {
-        return new JSONDeserializer<SaltFormDTO>()
-        .use(null, SaltFormDTO.class).deserialize(json);
-    }
-    
-    public static String SaltFormDTO.toJsonArray(Collection<SaltFormDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String SaltFormDTO.toJsonArray(Collection<SaltFormDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<SaltFormDTO> SaltFormDTO.fromJsonArrayToSaltFoes(String json) {
-        return new JSONDeserializer<List<SaltFormDTO>>()
-        .use("values", SaltFormDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SaltFormDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/SaltFormDTO_Roo_ToString.aj
deleted file mode 100644
index 82250ce3b..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SaltFormDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SaltFormDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SaltFormDTO_Roo_ToString {
-    
-    public String SaltFormDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchCdIdReturnDTO.java b/src/main/java/com/labsynch/labseer/dto/SearchCdIdReturnDTO.java
index e942cb9b3..030a634e2 100644
--- a/src/main/java/com/labsynch/labseer/dto/SearchCdIdReturnDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SearchCdIdReturnDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -17,4 +23,70 @@ public class SearchCdIdReturnDTO{
 
 	private String stereoComment;
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getCorpName() {
+        return this.corpName;
+    }
+
+	public void setCorpName(String corpName) {
+        this.corpName = corpName;
+    }
+
+	public int getCdId() {
+        return this.CdId;
+    }
+
+	public void setCdId(int CdId) {
+        this.CdId = CdId;
+    }
+
+	public String getStereoCategoryName() {
+        return this.stereoCategoryName;
+    }
+
+	public void setStereoCategoryName(String stereoCategoryName) {
+        this.stereoCategoryName = stereoCategoryName;
+    }
+
+	public String getStereoComment() {
+        return this.stereoComment;
+    }
+
+	public void setStereoComment(String stereoComment) {
+        this.stereoComment = stereoComment;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static SearchCdIdReturnDTO fromJsonToSearchCdIdReturnDTO(String json) {
+        return new JSONDeserializer<SearchCdIdReturnDTO>()
+        .use(null, SearchCdIdReturnDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<SearchCdIdReturnDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<SearchCdIdReturnDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<SearchCdIdReturnDTO> fromJsonArrayToSearchCdIdReturnDTO(String json) {
+        return new JSONDeserializer<List<SearchCdIdReturnDTO>>()
+        .use("values", SearchCdIdReturnDTO.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchCdIdReturnDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/SearchCdIdReturnDTO_Roo_JavaBean.aj
deleted file mode 100644
index d7759ea9b..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SearchCdIdReturnDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,42 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SearchCdIdReturnDTO;
-
-privileged aspect SearchCdIdReturnDTO_Roo_JavaBean {
-    
-    public String SearchCdIdReturnDTO.getCorpName() {
-        return this.corpName;
-    }
-    
-    public void SearchCdIdReturnDTO.setCorpName(String corpName) {
-        this.corpName = corpName;
-    }
-    
-    public int SearchCdIdReturnDTO.getCdId() {
-        return this.CdId;
-    }
-    
-    public void SearchCdIdReturnDTO.setCdId(int CdId) {
-        this.CdId = CdId;
-    }
-    
-    public String SearchCdIdReturnDTO.getStereoCategoryName() {
-        return this.stereoCategoryName;
-    }
-    
-    public void SearchCdIdReturnDTO.setStereoCategoryName(String stereoCategoryName) {
-        this.stereoCategoryName = stereoCategoryName;
-    }
-    
-    public String SearchCdIdReturnDTO.getStereoComment() {
-        return this.stereoComment;
-    }
-    
-    public void SearchCdIdReturnDTO.setStereoComment(String stereoComment) {
-        this.stereoComment = stereoComment;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchCdIdReturnDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/SearchCdIdReturnDTO_Roo_Json.aj
deleted file mode 100644
index 06b23a528..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SearchCdIdReturnDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SearchCdIdReturnDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect SearchCdIdReturnDTO_Roo_Json {
-    
-    public String SearchCdIdReturnDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String SearchCdIdReturnDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static SearchCdIdReturnDTO SearchCdIdReturnDTO.fromJsonToSearchCdIdReturnDTO(String json) {
-        return new JSONDeserializer<SearchCdIdReturnDTO>()
-        .use(null, SearchCdIdReturnDTO.class).deserialize(json);
-    }
-    
-    public static String SearchCdIdReturnDTO.toJsonArray(Collection<SearchCdIdReturnDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String SearchCdIdReturnDTO.toJsonArray(Collection<SearchCdIdReturnDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<SearchCdIdReturnDTO> SearchCdIdReturnDTO.fromJsonArrayToSearchCdIdReturnDTO(String json) {
-        return new JSONDeserializer<List<SearchCdIdReturnDTO>>()
-        .use("values", SearchCdIdReturnDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchCdIdReturnDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/SearchCdIdReturnDTO_Roo_ToString.aj
deleted file mode 100644
index 9eb83228f..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SearchCdIdReturnDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SearchCdIdReturnDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SearchCdIdReturnDTO_Roo_ToString {
-    
-    public String SearchCdIdReturnDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchCompoundReturnDTO.java b/src/main/java/com/labsynch/labseer/dto/SearchCompoundReturnDTO.java
index 337192447..6453426ce 100755
--- a/src/main/java/com/labsynch/labseer/dto/SearchCompoundReturnDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SearchCompoundReturnDTO.java
@@ -4,7 +4,8 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -56,4 +57,64 @@ public static Collection<SearchCompoundReturnDTO> fromJsonArrayToSearchCompoes(S
         		.use( Date.class, new DateTransformer( "MM/dd/yyyy"))
         		.deserialize(json);
     }
+
+	public String getCorpName() {
+        return this.corpName;
+    }
+
+	public void setCorpName(String corpName) {
+        this.corpName = corpName;
+    }
+
+	public String getCorpNameType() {
+        return this.corpNameType;
+    }
+
+	public void setCorpNameType(String corpNameType) {
+        this.corpNameType = corpNameType;
+    }
+
+	public List<ParentAliasDTO> getParentAliases() {
+        return this.parentAliases;
+    }
+
+	public void setParentAliases(List<ParentAliasDTO> parentAliases) {
+        this.parentAliases = parentAliases;
+    }
+
+	public String getStereoCategoryName() {
+        return this.stereoCategoryName;
+    }
+
+	public void setStereoCategoryName(String stereoCategoryName) {
+        this.stereoCategoryName = stereoCategoryName;
+    }
+
+	public String getStereoComment() {
+        return this.stereoComment;
+    }
+
+	public void setStereoComment(String stereoComment) {
+        this.stereoComment = stereoComment;
+    }
+
+	public List<SearchLotDTO> getLotIDs() {
+        return this.lotIDs;
+    }
+
+	public void setLotIDs(List<SearchLotDTO> lotIDs) {
+        this.lotIDs = lotIDs;
+    }
+
+	public String getMolStructure() {
+        return this.molStructure;
+    }
+
+	public void setMolStructure(String molStructure) {
+        this.molStructure = molStructure;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchCompoundReturnDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/SearchCompoundReturnDTO_Roo_JavaBean.aj
deleted file mode 100644
index 24fc4fbac..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SearchCompoundReturnDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,69 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ParentAliasDTO;
-import com.labsynch.labseer.dto.SearchCompoundReturnDTO;
-import com.labsynch.labseer.dto.SearchLotDTO;
-import java.util.List;
-
-privileged aspect SearchCompoundReturnDTO_Roo_JavaBean {
-    
-    public String SearchCompoundReturnDTO.getCorpName() {
-        return this.corpName;
-    }
-    
-    public void SearchCompoundReturnDTO.setCorpName(String corpName) {
-        this.corpName = corpName;
-    }
-    
-    public String SearchCompoundReturnDTO.getCorpNameType() {
-        return this.corpNameType;
-    }
-    
-    public void SearchCompoundReturnDTO.setCorpNameType(String corpNameType) {
-        this.corpNameType = corpNameType;
-    }
-    
-    public List<ParentAliasDTO> SearchCompoundReturnDTO.getParentAliases() {
-        return this.parentAliases;
-    }
-    
-    public void SearchCompoundReturnDTO.setParentAliases(List<ParentAliasDTO> parentAliases) {
-        this.parentAliases = parentAliases;
-    }
-    
-    public String SearchCompoundReturnDTO.getStereoCategoryName() {
-        return this.stereoCategoryName;
-    }
-    
-    public void SearchCompoundReturnDTO.setStereoCategoryName(String stereoCategoryName) {
-        this.stereoCategoryName = stereoCategoryName;
-    }
-    
-    public String SearchCompoundReturnDTO.getStereoComment() {
-        return this.stereoComment;
-    }
-    
-    public void SearchCompoundReturnDTO.setStereoComment(String stereoComment) {
-        this.stereoComment = stereoComment;
-    }
-    
-    public List<SearchLotDTO> SearchCompoundReturnDTO.getLotIDs() {
-        return this.lotIDs;
-    }
-    
-    public void SearchCompoundReturnDTO.setLotIDs(List<SearchLotDTO> lotIDs) {
-        this.lotIDs = lotIDs;
-    }
-    
-    public String SearchCompoundReturnDTO.getMolStructure() {
-        return this.molStructure;
-    }
-    
-    public void SearchCompoundReturnDTO.setMolStructure(String molStructure) {
-        this.molStructure = molStructure;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchCompoundReturnDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/SearchCompoundReturnDTO_Roo_ToString.aj
deleted file mode 100644
index ec7b8bedb..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SearchCompoundReturnDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SearchCompoundReturnDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SearchCompoundReturnDTO_Roo_ToString {
-    
-    public String SearchCompoundReturnDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchFormDTO.java b/src/main/java/com/labsynch/labseer/dto/SearchFormDTO.java
index 668f1238a..75b1880b7 100755
--- a/src/main/java/com/labsynch/labseer/dto/SearchFormDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SearchFormDTO.java
@@ -4,7 +4,8 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -91,4 +92,200 @@ public static Collection<SearchFormDTO> fromJsonArrayToSearchFoes(String json) {
         		.use( Date.class, new DateTransformer( "MM/dd/yyyy"))
         		.deserialize(json);
     }
+
+	public String getCorpNameList() {
+        return this.corpNameList;
+    }
+
+	public void setCorpNameList(String corpNameList) {
+        this.corpNameList = corpNameList;
+    }
+
+	public List<String> getProjects() {
+        return this.projects;
+    }
+
+	public void setProjects(List<String> projects) {
+        this.projects = projects;
+    }
+
+	public List<String> getFormattedCorpNameList() {
+        return this.formattedCorpNameList;
+    }
+
+	public void setFormattedCorpNameList(List<String> formattedCorpNameList) {
+        this.formattedCorpNameList = formattedCorpNameList;
+    }
+
+	public String getCorpNameFrom() {
+        return this.corpNameFrom;
+    }
+
+	public void setCorpNameFrom(String corpNameFrom) {
+        this.corpNameFrom = corpNameFrom;
+    }
+
+	public String getCorpNameTo() {
+        return this.corpNameTo;
+    }
+
+	public void setCorpNameTo(String corpNameTo) {
+        this.corpNameTo = corpNameTo;
+    }
+
+	public String getAliasContSelect() {
+        return this.aliasContSelect;
+    }
+
+	public void setAliasContSelect(String aliasContSelect) {
+        this.aliasContSelect = aliasContSelect;
+    }
+
+	public String getAlias() {
+        return this.alias;
+    }
+
+	public void setAlias(String alias) {
+        this.alias = alias;
+    }
+
+	public String getDateFrom() {
+        return this.dateFrom;
+    }
+
+	public void setDateFrom(String dateFrom) {
+        this.dateFrom = dateFrom;
+    }
+
+	public String getDateTo() {
+        return this.dateTo;
+    }
+
+	public void setDateTo(String dateTo) {
+        this.dateTo = dateTo;
+    }
+
+	public Date getMinSynthDate() {
+        return this.minSynthDate;
+    }
+
+	public void setMinSynthDate(Date minSynthDate) {
+        this.minSynthDate = minSynthDate;
+    }
+
+	public Date getMaxSynthDate() {
+        return this.maxSynthDate;
+    }
+
+	public void setMaxSynthDate(Date maxSynthDate) {
+        this.maxSynthDate = maxSynthDate;
+    }
+
+	public String getSearchType() {
+        return this.searchType;
+    }
+
+	public void setSearchType(String searchType) {
+        this.searchType = searchType;
+    }
+
+	public Float getPercentSimilarity() {
+        return this.percentSimilarity;
+    }
+
+	public void setPercentSimilarity(Float percentSimilarity) {
+        this.percentSimilarity = percentSimilarity;
+    }
+
+	public String getChemist() {
+        return this.chemist;
+    }
+
+	public void setChemist(String chemist) {
+        this.chemist = chemist;
+    }
+
+	public String getMolStructure() {
+        return this.molStructure;
+    }
+
+	public void setMolStructure(String molStructure) {
+        this.molStructure = molStructure;
+    }
+
+	public Long getBuidNumber() {
+        return this.buidNumber;
+    }
+
+	public void setBuidNumber(Long buidNumber) {
+        this.buidNumber = buidNumber;
+    }
+
+	public Long getMinParentNumber() {
+        return this.minParentNumber;
+    }
+
+	public void setMinParentNumber(Long minParentNumber) {
+        this.minParentNumber = minParentNumber;
+    }
+
+	public Long getMaxParentNumber() {
+        return this.maxParentNumber;
+    }
+
+	public void setMaxParentNumber(Long maxParentNumber) {
+        this.maxParentNumber = maxParentNumber;
+    }
+
+	public String getParentCorpName() {
+        return this.parentCorpName;
+    }
+
+	public void setParentCorpName(String parentCorpName) {
+        this.parentCorpName = parentCorpName;
+    }
+
+	public String getSaltFormCorpName() {
+        return this.saltFormCorpName;
+    }
+
+	public void setSaltFormCorpName(String saltFormCorpName) {
+        this.saltFormCorpName = saltFormCorpName;
+    }
+
+	public String getLotCorpName() {
+        return this.lotCorpName;
+    }
+
+	public void setLotCorpName(String lotCorpName) {
+        this.lotCorpName = lotCorpName;
+    }
+
+	public boolean isValuesSet() {
+        return this.valuesSet;
+    }
+
+	public void setValuesSet(boolean valuesSet) {
+        this.valuesSet = valuesSet;
+    }
+
+	public String getLoggedInUser() {
+        return this.loggedInUser;
+    }
+
+	public void setLoggedInUser(String loggedInUser) {
+        this.loggedInUser = loggedInUser;
+    }
+
+	public Integer getMaxResults() {
+        return this.maxResults;
+    }
+
+	public void setMaxResults(Integer maxResults) {
+        this.maxResults = maxResults;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchFormDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/SearchFormDTO_Roo_JavaBean.aj
deleted file mode 100644
index 892f8e381..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SearchFormDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,204 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SearchFormDTO;
-import java.util.Date;
-import java.util.List;
-
-privileged aspect SearchFormDTO_Roo_JavaBean {
-    
-    public String SearchFormDTO.getCorpNameList() {
-        return this.corpNameList;
-    }
-    
-    public void SearchFormDTO.setCorpNameList(String corpNameList) {
-        this.corpNameList = corpNameList;
-    }
-    
-    public List<String> SearchFormDTO.getProjects() {
-        return this.projects;
-    }
-    
-    public void SearchFormDTO.setProjects(List<String> projects) {
-        this.projects = projects;
-    }
-    
-    public List<String> SearchFormDTO.getFormattedCorpNameList() {
-        return this.formattedCorpNameList;
-    }
-    
-    public void SearchFormDTO.setFormattedCorpNameList(List<String> formattedCorpNameList) {
-        this.formattedCorpNameList = formattedCorpNameList;
-    }
-    
-    public String SearchFormDTO.getCorpNameFrom() {
-        return this.corpNameFrom;
-    }
-    
-    public void SearchFormDTO.setCorpNameFrom(String corpNameFrom) {
-        this.corpNameFrom = corpNameFrom;
-    }
-    
-    public String SearchFormDTO.getCorpNameTo() {
-        return this.corpNameTo;
-    }
-    
-    public void SearchFormDTO.setCorpNameTo(String corpNameTo) {
-        this.corpNameTo = corpNameTo;
-    }
-    
-    public String SearchFormDTO.getAliasContSelect() {
-        return this.aliasContSelect;
-    }
-    
-    public void SearchFormDTO.setAliasContSelect(String aliasContSelect) {
-        this.aliasContSelect = aliasContSelect;
-    }
-    
-    public String SearchFormDTO.getAlias() {
-        return this.alias;
-    }
-    
-    public void SearchFormDTO.setAlias(String alias) {
-        this.alias = alias;
-    }
-    
-    public String SearchFormDTO.getDateFrom() {
-        return this.dateFrom;
-    }
-    
-    public void SearchFormDTO.setDateFrom(String dateFrom) {
-        this.dateFrom = dateFrom;
-    }
-    
-    public String SearchFormDTO.getDateTo() {
-        return this.dateTo;
-    }
-    
-    public void SearchFormDTO.setDateTo(String dateTo) {
-        this.dateTo = dateTo;
-    }
-    
-    public Date SearchFormDTO.getMinSynthDate() {
-        return this.minSynthDate;
-    }
-    
-    public void SearchFormDTO.setMinSynthDate(Date minSynthDate) {
-        this.minSynthDate = minSynthDate;
-    }
-    
-    public Date SearchFormDTO.getMaxSynthDate() {
-        return this.maxSynthDate;
-    }
-    
-    public void SearchFormDTO.setMaxSynthDate(Date maxSynthDate) {
-        this.maxSynthDate = maxSynthDate;
-    }
-    
-    public String SearchFormDTO.getSearchType() {
-        return this.searchType;
-    }
-    
-    public void SearchFormDTO.setSearchType(String searchType) {
-        this.searchType = searchType;
-    }
-    
-    public Float SearchFormDTO.getPercentSimilarity() {
-        return this.percentSimilarity;
-    }
-    
-    public void SearchFormDTO.setPercentSimilarity(Float percentSimilarity) {
-        this.percentSimilarity = percentSimilarity;
-    }
-    
-    public String SearchFormDTO.getChemist() {
-        return this.chemist;
-    }
-    
-    public void SearchFormDTO.setChemist(String chemist) {
-        this.chemist = chemist;
-    }
-    
-    public String SearchFormDTO.getMolStructure() {
-        return this.molStructure;
-    }
-    
-    public void SearchFormDTO.setMolStructure(String molStructure) {
-        this.molStructure = molStructure;
-    }
-    
-    public Long SearchFormDTO.getBuidNumber() {
-        return this.buidNumber;
-    }
-    
-    public void SearchFormDTO.setBuidNumber(Long buidNumber) {
-        this.buidNumber = buidNumber;
-    }
-    
-    public Long SearchFormDTO.getMinParentNumber() {
-        return this.minParentNumber;
-    }
-    
-    public void SearchFormDTO.setMinParentNumber(Long minParentNumber) {
-        this.minParentNumber = minParentNumber;
-    }
-    
-    public Long SearchFormDTO.getMaxParentNumber() {
-        return this.maxParentNumber;
-    }
-    
-    public void SearchFormDTO.setMaxParentNumber(Long maxParentNumber) {
-        this.maxParentNumber = maxParentNumber;
-    }
-    
-    public String SearchFormDTO.getParentCorpName() {
-        return this.parentCorpName;
-    }
-    
-    public void SearchFormDTO.setParentCorpName(String parentCorpName) {
-        this.parentCorpName = parentCorpName;
-    }
-    
-    public String SearchFormDTO.getSaltFormCorpName() {
-        return this.saltFormCorpName;
-    }
-    
-    public void SearchFormDTO.setSaltFormCorpName(String saltFormCorpName) {
-        this.saltFormCorpName = saltFormCorpName;
-    }
-    
-    public String SearchFormDTO.getLotCorpName() {
-        return this.lotCorpName;
-    }
-    
-    public void SearchFormDTO.setLotCorpName(String lotCorpName) {
-        this.lotCorpName = lotCorpName;
-    }
-    
-    public boolean SearchFormDTO.isValuesSet() {
-        return this.valuesSet;
-    }
-    
-    public void SearchFormDTO.setValuesSet(boolean valuesSet) {
-        this.valuesSet = valuesSet;
-    }
-    
-    public String SearchFormDTO.getLoggedInUser() {
-        return this.loggedInUser;
-    }
-    
-    public void SearchFormDTO.setLoggedInUser(String loggedInUser) {
-        this.loggedInUser = loggedInUser;
-    }
-    
-    public Integer SearchFormDTO.getMaxResults() {
-        return this.maxResults;
-    }
-    
-    public void SearchFormDTO.setMaxResults(Integer maxResults) {
-        this.maxResults = maxResults;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchFormDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/SearchFormDTO_Roo_ToString.aj
deleted file mode 100644
index 4bae84d6c..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SearchFormDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SearchFormDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SearchFormDTO_Roo_ToString {
-    
-    public String SearchFormDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchFormReturnDTO.java b/src/main/java/com/labsynch/labseer/dto/SearchFormReturnDTO.java
index 36a9dc612..8d91c78a9 100755
--- a/src/main/java/com/labsynch/labseer/dto/SearchFormReturnDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SearchFormReturnDTO.java
@@ -5,7 +5,8 @@
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -48,4 +49,24 @@ public static Collection<SearchFormReturnDTO> fromJsonArrayToSearchFoes(String j
         		.deserialize(json);
     }
 
+
+	public Collection<SearchCompoundReturnDTO> getFoundCompounds() {
+        return this.foundCompounds;
+    }
+
+	public void setFoundCompounds(Collection<SearchCompoundReturnDTO> foundCompounds) {
+        this.foundCompounds = foundCompounds;
+    }
+
+	public boolean isLotsWithheld() {
+        return this.lotsWithheld;
+    }
+
+	public void setLotsWithheld(boolean lotsWithheld) {
+        this.lotsWithheld = lotsWithheld;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchFormReturnDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/SearchFormReturnDTO_Roo_JavaBean.aj
deleted file mode 100644
index 01ff10723..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SearchFormReturnDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,28 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SearchCompoundReturnDTO;
-import com.labsynch.labseer.dto.SearchFormReturnDTO;
-import java.util.Collection;
-
-privileged aspect SearchFormReturnDTO_Roo_JavaBean {
-    
-    public Collection<SearchCompoundReturnDTO> SearchFormReturnDTO.getFoundCompounds() {
-        return this.foundCompounds;
-    }
-    
-    public void SearchFormReturnDTO.setFoundCompounds(Collection<SearchCompoundReturnDTO> foundCompounds) {
-        this.foundCompounds = foundCompounds;
-    }
-    
-    public boolean SearchFormReturnDTO.isLotsWithheld() {
-        return this.lotsWithheld;
-    }
-    
-    public void SearchFormReturnDTO.setLotsWithheld(boolean lotsWithheld) {
-        this.lotsWithheld = lotsWithheld;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchFormReturnDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/SearchFormReturnDTO_Roo_ToString.aj
deleted file mode 100644
index 18db1c81f..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SearchFormReturnDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SearchFormReturnDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SearchFormReturnDTO_Roo_ToString {
-    
-    public String SearchFormReturnDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchLotDTO.java b/src/main/java/com/labsynch/labseer/dto/SearchLotDTO.java
index 0a80765e2..419ef1c18 100755
--- a/src/main/java/com/labsynch/labseer/dto/SearchLotDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SearchLotDTO.java
@@ -4,7 +4,8 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -54,4 +55,56 @@ public static Collection<SearchLotDTO> fromJsonArrayToSearchLoes(String json) {
         		.use( Date.class, new DateTransformer( "MM/dd/yyyy"))
         		.deserialize(json);
     }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getCorpName() {
+        return this.corpName;
+    }
+
+	public void setCorpName(String corpName) {
+        this.corpName = corpName;
+    }
+
+	public int getLotNumber() {
+        return this.lotNumber;
+    }
+
+	public void setLotNumber(int lotNumber) {
+        this.lotNumber = lotNumber;
+    }
+
+	public long getBuid() {
+        return this.buid;
+    }
+
+	public void setBuid(long buid) {
+        this.buid = buid;
+    }
+
+	public List<LotAliasDTO> getLotAliases() {
+        return this.lotAliases;
+    }
+
+	public void setLotAliases(List<LotAliasDTO> lotAliases) {
+        this.lotAliases = lotAliases;
+    }
+
+	public Date getRegistrationDate() {
+        return this.registrationDate;
+    }
+
+	public void setRegistrationDate(Date registrationDate) {
+        this.registrationDate = registrationDate;
+    }
+
+	public Date getSynthesisDate() {
+        return this.synthesisDate;
+    }
+
+	public void setSynthesisDate(Date synthesisDate) {
+        this.synthesisDate = synthesisDate;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchLotDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/SearchLotDTO_Roo_JavaBean.aj
deleted file mode 100644
index 56b2969ea..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SearchLotDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,61 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LotAliasDTO;
-import com.labsynch.labseer.dto.SearchLotDTO;
-import java.util.Date;
-import java.util.List;
-
-privileged aspect SearchLotDTO_Roo_JavaBean {
-    
-    public String SearchLotDTO.getCorpName() {
-        return this.corpName;
-    }
-    
-    public void SearchLotDTO.setCorpName(String corpName) {
-        this.corpName = corpName;
-    }
-    
-    public int SearchLotDTO.getLotNumber() {
-        return this.lotNumber;
-    }
-    
-    public void SearchLotDTO.setLotNumber(int lotNumber) {
-        this.lotNumber = lotNumber;
-    }
-    
-    public long SearchLotDTO.getBuid() {
-        return this.buid;
-    }
-    
-    public void SearchLotDTO.setBuid(long buid) {
-        this.buid = buid;
-    }
-    
-    public List<LotAliasDTO> SearchLotDTO.getLotAliases() {
-        return this.lotAliases;
-    }
-    
-    public void SearchLotDTO.setLotAliases(List<LotAliasDTO> lotAliases) {
-        this.lotAliases = lotAliases;
-    }
-    
-    public Date SearchLotDTO.getRegistrationDate() {
-        return this.registrationDate;
-    }
-    
-    public void SearchLotDTO.setRegistrationDate(Date registrationDate) {
-        this.registrationDate = registrationDate;
-    }
-    
-    public Date SearchLotDTO.getSynthesisDate() {
-        return this.synthesisDate;
-    }
-    
-    public void SearchLotDTO.setSynthesisDate(Date synthesisDate) {
-        this.synthesisDate = synthesisDate;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchLotDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/SearchLotDTO_Roo_ToString.aj
deleted file mode 100644
index 8e1579a53..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SearchLotDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SearchLotDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SearchLotDTO_Roo_ToString {
-    
-    public String SearchLotDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchResultExportRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/SearchResultExportRequestDTO.java
index 56213478e..32a07c469 100644
--- a/src/main/java/com/labsynch/labseer/dto/SearchResultExportRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SearchResultExportRequestDTO.java
@@ -1,12 +1,16 @@
 package com.labsynch.labseer.dto;
 
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 
 @RooJavaBean
 @RooToString
@@ -30,4 +34,44 @@ public String toJson() {
         return new JSONSerializer().include("searchFormResultsDTO.foundCompounds.lotIDs").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
     }
     
+
+	public String getFilePath() {
+        return this.filePath;
+    }
+
+	public void setFilePath(String filePath) {
+        this.filePath = filePath;
+    }
+
+	public SearchFormReturnDTO getSearchFormResultsDTO() {
+        return this.searchFormResultsDTO;
+    }
+
+	public void setSearchFormResultsDTO(SearchFormReturnDTO searchFormResultsDTO) {
+        this.searchFormResultsDTO = searchFormResultsDTO;
+    }
+
+	public static SearchResultExportRequestDTO fromJsonToSearchResultExportRequestDTO(String json) {
+        return new JSONDeserializer<SearchResultExportRequestDTO>()
+        .use(null, SearchResultExportRequestDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<SearchResultExportRequestDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<SearchResultExportRequestDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<SearchResultExportRequestDTO> fromJsonArrayToSearchResultExpoes(String json) {
+        return new JSONDeserializer<List<SearchResultExportRequestDTO>>()
+        .use("values", SearchResultExportRequestDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchResultExportRequestDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/SearchResultExportRequestDTO_Roo_JavaBean.aj
deleted file mode 100644
index f349c7339..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SearchResultExportRequestDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,27 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SearchFormReturnDTO;
-import com.labsynch.labseer.dto.SearchResultExportRequestDTO;
-
-privileged aspect SearchResultExportRequestDTO_Roo_JavaBean {
-    
-    public String SearchResultExportRequestDTO.getFilePath() {
-        return this.filePath;
-    }
-    
-    public void SearchResultExportRequestDTO.setFilePath(String filePath) {
-        this.filePath = filePath;
-    }
-    
-    public SearchFormReturnDTO SearchResultExportRequestDTO.getSearchFormResultsDTO() {
-        return this.searchFormResultsDTO;
-    }
-    
-    public void SearchResultExportRequestDTO.setSearchFormResultsDTO(SearchFormReturnDTO searchFormResultsDTO) {
-        this.searchFormResultsDTO = searchFormResultsDTO;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchResultExportRequestDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/SearchResultExportRequestDTO_Roo_Json.aj
deleted file mode 100644
index d911b0e1d..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SearchResultExportRequestDTO_Roo_Json.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SearchResultExportRequestDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect SearchResultExportRequestDTO_Roo_Json {
-    
-    public static SearchResultExportRequestDTO SearchResultExportRequestDTO.fromJsonToSearchResultExportRequestDTO(String json) {
-        return new JSONDeserializer<SearchResultExportRequestDTO>()
-        .use(null, SearchResultExportRequestDTO.class).deserialize(json);
-    }
-    
-    public static String SearchResultExportRequestDTO.toJsonArray(Collection<SearchResultExportRequestDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String SearchResultExportRequestDTO.toJsonArray(Collection<SearchResultExportRequestDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<SearchResultExportRequestDTO> SearchResultExportRequestDTO.fromJsonArrayToSearchResultExpoes(String json) {
-        return new JSONDeserializer<List<SearchResultExportRequestDTO>>()
-        .use("values", SearchResultExportRequestDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchResultExportRequestDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/SearchResultExportRequestDTO_Roo_ToString.aj
deleted file mode 100644
index ee263ce56..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SearchResultExportRequestDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SearchResultExportRequestDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SearchResultExportRequestDTO_Roo_ToString {
-    
-    public String SearchResultExportRequestDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SetTubeLocationDTO.java b/src/main/java/com/labsynch/labseer/dto/SetTubeLocationDTO.java
index f268d0a90..653d05759 100644
--- a/src/main/java/com/labsynch/labseer/dto/SetTubeLocationDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SetTubeLocationDTO.java
@@ -1,8 +1,13 @@
 package com.labsynch.labseer.dto;
 
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -22,4 +27,78 @@ public class SetTubeLocationDTO {
 	
 	private String rootLabel;
 	
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getBarcode() {
+        return this.barcode;
+    }
+
+	public void setBarcode(String barcode) {
+        this.barcode = barcode;
+    }
+
+	public String getLocationBreadCrumb() {
+        return this.locationBreadCrumb;
+    }
+
+	public void setLocationBreadCrumb(String locationBreadCrumb) {
+        this.locationBreadCrumb = locationBreadCrumb;
+    }
+
+	public String getUser() {
+        return this.user;
+    }
+
+	public void setUser(String user) {
+        this.user = user;
+    }
+
+	public Date getDate() {
+        return this.date;
+    }
+
+	public void setDate(Date date) {
+        this.date = date;
+    }
+
+	public String getRootLabel() {
+        return this.rootLabel;
+    }
+
+	public void setRootLabel(String rootLabel) {
+        this.rootLabel = rootLabel;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static SetTubeLocationDTO fromJsonToSetTubeLocationDTO(String json) {
+        return new JSONDeserializer<SetTubeLocationDTO>()
+        .use(null, SetTubeLocationDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<SetTubeLocationDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<SetTubeLocationDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<SetTubeLocationDTO> fromJsonArrayToSetTubeLocatioes(String json) {
+        return new JSONDeserializer<List<SetTubeLocationDTO>>()
+        .use("values", SetTubeLocationDTO.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/SetTubeLocationDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/SetTubeLocationDTO_Roo_JavaBean.aj
deleted file mode 100644
index b41c5d969..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SetTubeLocationDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,51 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SetTubeLocationDTO;
-import java.util.Date;
-
-privileged aspect SetTubeLocationDTO_Roo_JavaBean {
-    
-    public String SetTubeLocationDTO.getBarcode() {
-        return this.barcode;
-    }
-    
-    public void SetTubeLocationDTO.setBarcode(String barcode) {
-        this.barcode = barcode;
-    }
-    
-    public String SetTubeLocationDTO.getLocationBreadCrumb() {
-        return this.locationBreadCrumb;
-    }
-    
-    public void SetTubeLocationDTO.setLocationBreadCrumb(String locationBreadCrumb) {
-        this.locationBreadCrumb = locationBreadCrumb;
-    }
-    
-    public String SetTubeLocationDTO.getUser() {
-        return this.user;
-    }
-    
-    public void SetTubeLocationDTO.setUser(String user) {
-        this.user = user;
-    }
-    
-    public Date SetTubeLocationDTO.getDate() {
-        return this.date;
-    }
-    
-    public void SetTubeLocationDTO.setDate(Date date) {
-        this.date = date;
-    }
-    
-    public String SetTubeLocationDTO.getRootLabel() {
-        return this.rootLabel;
-    }
-    
-    public void SetTubeLocationDTO.setRootLabel(String rootLabel) {
-        this.rootLabel = rootLabel;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SetTubeLocationDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/SetTubeLocationDTO_Roo_Json.aj
deleted file mode 100644
index 15c73f4ff..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SetTubeLocationDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SetTubeLocationDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect SetTubeLocationDTO_Roo_Json {
-    
-    public String SetTubeLocationDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String SetTubeLocationDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static SetTubeLocationDTO SetTubeLocationDTO.fromJsonToSetTubeLocationDTO(String json) {
-        return new JSONDeserializer<SetTubeLocationDTO>()
-        .use(null, SetTubeLocationDTO.class).deserialize(json);
-    }
-    
-    public static String SetTubeLocationDTO.toJsonArray(Collection<SetTubeLocationDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String SetTubeLocationDTO.toJsonArray(Collection<SetTubeLocationDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<SetTubeLocationDTO> SetTubeLocationDTO.fromJsonArrayToSetTubeLocatioes(String json) {
-        return new JSONDeserializer<List<SetTubeLocationDTO>>()
-        .use("values", SetTubeLocationDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SetTubeLocationDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/SetTubeLocationDTO_Roo_ToString.aj
deleted file mode 100644
index e2f775e59..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SetTubeLocationDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SetTubeLocationDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SetTubeLocationDTO_Roo_ToString {
-    
-    public String SetTubeLocationDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SimpleBulkLoadPropertyDTO.java b/src/main/java/com/labsynch/labseer/dto/SimpleBulkLoadPropertyDTO.java
index beaf1d483..935866844 100644
--- a/src/main/java/com/labsynch/labseer/dto/SimpleBulkLoadPropertyDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SimpleBulkLoadPropertyDTO.java
@@ -1,12 +1,16 @@
 package com.labsynch.labseer.dto;
 
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 
 @RooJavaBean
 @RooToString
@@ -83,4 +87,68 @@ public boolean equals(Object that){
     		return (nameEqual & dataTypeEqual & requiredEqual & displayOrderEqual & ignoredEqual);
     	}
     }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getName() {
+        return this.name;
+    }
+
+	public void setName(String name) {
+        this.name = name;
+    }
+
+	public String getDataType() {
+        return this.dataType;
+    }
+
+	public void setDataType(String dataType) {
+        this.dataType = dataType;
+    }
+
+	public Boolean getRequired() {
+        return this.required;
+    }
+
+	public void setRequired(Boolean required) {
+        this.required = required;
+    }
+
+	public Integer getDisplayOrder() {
+        return this.displayOrder;
+    }
+
+	public void setDisplayOrder(Integer displayOrder) {
+        this.displayOrder = displayOrder;
+    }
+
+	public Boolean getIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(Boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public static SimpleBulkLoadPropertyDTO fromJsonToSimpleBulkLoadPropertyDTO(String json) {
+        return new JSONDeserializer<SimpleBulkLoadPropertyDTO>()
+        .use(null, SimpleBulkLoadPropertyDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<SimpleBulkLoadPropertyDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<SimpleBulkLoadPropertyDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<SimpleBulkLoadPropertyDTO> fromJsonArrayToSimpleBulkLoadProes(String json) {
+        return new JSONDeserializer<List<SimpleBulkLoadPropertyDTO>>()
+        .use("values", SimpleBulkLoadPropertyDTO.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/SimpleBulkLoadPropertyDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/SimpleBulkLoadPropertyDTO_Roo_JavaBean.aj
deleted file mode 100644
index c75beabfb..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SimpleBulkLoadPropertyDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,50 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SimpleBulkLoadPropertyDTO;
-
-privileged aspect SimpleBulkLoadPropertyDTO_Roo_JavaBean {
-    
-    public String SimpleBulkLoadPropertyDTO.getName() {
-        return this.name;
-    }
-    
-    public void SimpleBulkLoadPropertyDTO.setName(String name) {
-        this.name = name;
-    }
-    
-    public String SimpleBulkLoadPropertyDTO.getDataType() {
-        return this.dataType;
-    }
-    
-    public void SimpleBulkLoadPropertyDTO.setDataType(String dataType) {
-        this.dataType = dataType;
-    }
-    
-    public Boolean SimpleBulkLoadPropertyDTO.getRequired() {
-        return this.required;
-    }
-    
-    public void SimpleBulkLoadPropertyDTO.setRequired(Boolean required) {
-        this.required = required;
-    }
-    
-    public Integer SimpleBulkLoadPropertyDTO.getDisplayOrder() {
-        return this.displayOrder;
-    }
-    
-    public void SimpleBulkLoadPropertyDTO.setDisplayOrder(Integer displayOrder) {
-        this.displayOrder = displayOrder;
-    }
-    
-    public Boolean SimpleBulkLoadPropertyDTO.getIgnored() {
-        return this.ignored;
-    }
-    
-    public void SimpleBulkLoadPropertyDTO.setIgnored(Boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SimpleBulkLoadPropertyDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/SimpleBulkLoadPropertyDTO_Roo_Json.aj
deleted file mode 100644
index 8b0c9c713..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SimpleBulkLoadPropertyDTO_Roo_Json.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SimpleBulkLoadPropertyDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect SimpleBulkLoadPropertyDTO_Roo_Json {
-    
-    public static SimpleBulkLoadPropertyDTO SimpleBulkLoadPropertyDTO.fromJsonToSimpleBulkLoadPropertyDTO(String json) {
-        return new JSONDeserializer<SimpleBulkLoadPropertyDTO>()
-        .use(null, SimpleBulkLoadPropertyDTO.class).deserialize(json);
-    }
-    
-    public static String SimpleBulkLoadPropertyDTO.toJsonArray(Collection<SimpleBulkLoadPropertyDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String SimpleBulkLoadPropertyDTO.toJsonArray(Collection<SimpleBulkLoadPropertyDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<SimpleBulkLoadPropertyDTO> SimpleBulkLoadPropertyDTO.fromJsonArrayToSimpleBulkLoadProes(String json) {
-        return new JSONDeserializer<List<SimpleBulkLoadPropertyDTO>>()
-        .use("values", SimpleBulkLoadPropertyDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SimpleBulkLoadPropertyDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/SimpleBulkLoadPropertyDTO_Roo_ToString.aj
deleted file mode 100644
index 9a8e107bd..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SimpleBulkLoadPropertyDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SimpleBulkLoadPropertyDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SimpleBulkLoadPropertyDTO_Roo_ToString {
-    
-    public String SimpleBulkLoadPropertyDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/StandardizationDryRunSearchDTO.java b/src/main/java/com/labsynch/labseer/dto/StandardizationDryRunSearchDTO.java
index 4e0c9c3c7..2a8b3f998 100755
--- a/src/main/java/com/labsynch/labseer/dto/StandardizationDryRunSearchDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StandardizationDryRunSearchDTO.java
@@ -2,7 +2,12 @@
 
 import com.labsynch.labseer.chemclasses.CmpdRegMolecule.RegistrationStatus;
 import com.labsynch.labseer.chemclasses.CmpdRegMolecule.StandardizationStatus;
-
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -72,4 +77,150 @@ public void setOperator(String operator) {
 
     private RegistrationStatus[] registrationStatuses;
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static StandardizationDryRunSearchDTO fromJsonToStandardizationDryRunSearchDTO(String json) {
+        return new JSONDeserializer<StandardizationDryRunSearchDTO>()
+        .use(null, StandardizationDryRunSearchDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<StandardizationDryRunSearchDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<StandardizationDryRunSearchDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<StandardizationDryRunSearchDTO> fromJsonArrayToStandardizatioes(String json) {
+        return new JSONDeserializer<List<StandardizationDryRunSearchDTO>>()
+        .use("values", StandardizationDryRunSearchDTO.class).deserialize(json);
+    }
+
+	public NumericWithOperator getOldMolWeight() {
+        return this.oldMolWeight;
+    }
+
+	public void setOldMolWeight(NumericWithOperator oldMolWeight) {
+        this.oldMolWeight = oldMolWeight;
+    }
+
+	public NumericWithOperator getNewMolWeight() {
+        return this.newMolWeight;
+    }
+
+	public void setNewMolWeight(NumericWithOperator newMolWeight) {
+        this.newMolWeight = newMolWeight;
+    }
+
+	public NumericWithOperator getDeltaMolWeight() {
+        return this.deltaMolWeight;
+    }
+
+	public void setDeltaMolWeight(NumericWithOperator deltaMolWeight) {
+        this.deltaMolWeight = deltaMolWeight;
+    }
+
+	public String[] getCorpNames() {
+        return this.corpNames;
+    }
+
+	public void setCorpNames(String[] corpNames) {
+        this.corpNames = corpNames;
+    }
+
+	public Boolean getIncludeCorpNames() {
+        return this.includeCorpNames;
+    }
+
+	public void setIncludeCorpNames(Boolean includeCorpNames) {
+        this.includeCorpNames = includeCorpNames;
+    }
+
+	public Boolean getHasNewDuplicates() {
+        return this.hasNewDuplicates;
+    }
+
+	public void setHasNewDuplicates(Boolean hasNewDuplicates) {
+        this.hasNewDuplicates = hasNewDuplicates;
+    }
+
+	public Boolean getHasExistingDuplicates() {
+        return this.hasExistingDuplicates;
+    }
+
+	public void setHasExistingDuplicates(Boolean hasExistingDuplicates) {
+        this.hasExistingDuplicates = hasExistingDuplicates;
+    }
+
+	public Boolean getAsDrawnDisplayChange() {
+        return this.asDrawnDisplayChange;
+    }
+
+	public void setAsDrawnDisplayChange(Boolean asDrawnDisplayChange) {
+        this.asDrawnDisplayChange = asDrawnDisplayChange;
+    }
+
+	public Boolean getChangedStructure() {
+        return this.changedStructure;
+    }
+
+	public void setChangedStructure(Boolean changedStructure) {
+        this.changedStructure = changedStructure;
+    }
+
+	public Boolean getDisplayChange() {
+        return this.displayChange;
+    }
+
+	public void setDisplayChange(Boolean displayChange) {
+        this.displayChange = displayChange;
+    }
+
+	public String getFilePath() {
+        return this.filePath;
+    }
+
+	public void setFilePath(String filePath) {
+        this.filePath = filePath;
+    }
+
+	public Integer getMaxResults() {
+        return this.maxResults;
+    }
+
+	public void setMaxResults(Integer maxResults) {
+        this.maxResults = maxResults;
+    }
+
+	public StandardizationStatus[] getStandardizationStatuses() {
+        return this.standardizationStatuses;
+    }
+
+	public void setStandardizationStatuses(StandardizationStatus[] standardizationStatuses) {
+        this.standardizationStatuses = standardizationStatuses;
+    }
+
+	public RegistrationStatus[] getRegistrationStatuses() {
+        return this.registrationStatuses;
+    }
+
+	public void setRegistrationStatuses(RegistrationStatus[] registrationStatuses) {
+        this.registrationStatuses = registrationStatuses;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/StandardizationDryRunSearchDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/StandardizationDryRunSearchDTO_Roo_JavaBean.aj
deleted file mode 100644
index 9ad0733c1..000000000
--- a/src/main/java/com/labsynch/labseer/dto/StandardizationDryRunSearchDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,124 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.chemclasses.CmpdRegMolecule.RegistrationStatus;
-import com.labsynch.labseer.chemclasses.CmpdRegMolecule.StandardizationStatus;
-import com.labsynch.labseer.dto.StandardizationDryRunSearchDTO;
-
-privileged aspect StandardizationDryRunSearchDTO_Roo_JavaBean {
-    
-    public NumericWithOperator StandardizationDryRunSearchDTO.getOldMolWeight() {
-        return this.oldMolWeight;
-    }
-    
-    public void StandardizationDryRunSearchDTO.setOldMolWeight(NumericWithOperator oldMolWeight) {
-        this.oldMolWeight = oldMolWeight;
-    }
-    
-    public NumericWithOperator StandardizationDryRunSearchDTO.getNewMolWeight() {
-        return this.newMolWeight;
-    }
-    
-    public void StandardizationDryRunSearchDTO.setNewMolWeight(NumericWithOperator newMolWeight) {
-        this.newMolWeight = newMolWeight;
-    }
-    
-    public NumericWithOperator StandardizationDryRunSearchDTO.getDeltaMolWeight() {
-        return this.deltaMolWeight;
-    }
-    
-    public void StandardizationDryRunSearchDTO.setDeltaMolWeight(NumericWithOperator deltaMolWeight) {
-        this.deltaMolWeight = deltaMolWeight;
-    }
-    
-    public String[] StandardizationDryRunSearchDTO.getCorpNames() {
-        return this.corpNames;
-    }
-    
-    public void StandardizationDryRunSearchDTO.setCorpNames(String[] corpNames) {
-        this.corpNames = corpNames;
-    }
-    
-    public Boolean StandardizationDryRunSearchDTO.getIncludeCorpNames() {
-        return this.includeCorpNames;
-    }
-    
-    public void StandardizationDryRunSearchDTO.setIncludeCorpNames(Boolean includeCorpNames) {
-        this.includeCorpNames = includeCorpNames;
-    }
-    
-    public Boolean StandardizationDryRunSearchDTO.getHasNewDuplicates() {
-        return this.hasNewDuplicates;
-    }
-    
-    public void StandardizationDryRunSearchDTO.setHasNewDuplicates(Boolean hasNewDuplicates) {
-        this.hasNewDuplicates = hasNewDuplicates;
-    }
-    
-    public Boolean StandardizationDryRunSearchDTO.getHasExistingDuplicates() {
-        return this.hasExistingDuplicates;
-    }
-    
-    public void StandardizationDryRunSearchDTO.setHasExistingDuplicates(Boolean hasExistingDuplicates) {
-        this.hasExistingDuplicates = hasExistingDuplicates;
-    }
-    
-    public Boolean StandardizationDryRunSearchDTO.getAsDrawnDisplayChange() {
-        return this.asDrawnDisplayChange;
-    }
-    
-    public void StandardizationDryRunSearchDTO.setAsDrawnDisplayChange(Boolean asDrawnDisplayChange) {
-        this.asDrawnDisplayChange = asDrawnDisplayChange;
-    }
-    
-    public Boolean StandardizationDryRunSearchDTO.getChangedStructure() {
-        return this.changedStructure;
-    }
-    
-    public void StandardizationDryRunSearchDTO.setChangedStructure(Boolean changedStructure) {
-        this.changedStructure = changedStructure;
-    }
-    
-    public Boolean StandardizationDryRunSearchDTO.getDisplayChange() {
-        return this.displayChange;
-    }
-    
-    public void StandardizationDryRunSearchDTO.setDisplayChange(Boolean displayChange) {
-        this.displayChange = displayChange;
-    }
-    
-    public String StandardizationDryRunSearchDTO.getFilePath() {
-        return this.filePath;
-    }
-    
-    public void StandardizationDryRunSearchDTO.setFilePath(String filePath) {
-        this.filePath = filePath;
-    }
-    
-    public Integer StandardizationDryRunSearchDTO.getMaxResults() {
-        return this.maxResults;
-    }
-    
-    public void StandardizationDryRunSearchDTO.setMaxResults(Integer maxResults) {
-        this.maxResults = maxResults;
-    }
-    
-    public StandardizationStatus[] StandardizationDryRunSearchDTO.getStandardizationStatuses() {
-        return this.standardizationStatuses;
-    }
-    
-    public void StandardizationDryRunSearchDTO.setStandardizationStatuses(StandardizationStatus[] standardizationStatuses) {
-        this.standardizationStatuses = standardizationStatuses;
-    }
-    
-    public RegistrationStatus[] StandardizationDryRunSearchDTO.getRegistrationStatuses() {
-        return this.registrationStatuses;
-    }
-    
-    public void StandardizationDryRunSearchDTO.setRegistrationStatuses(RegistrationStatus[] registrationStatuses) {
-        this.registrationStatuses = registrationStatuses;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/StandardizationDryRunSearchDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/StandardizationDryRunSearchDTO_Roo_Json.aj
deleted file mode 100644
index 9e6c94a3f..000000000
--- a/src/main/java/com/labsynch/labseer/dto/StandardizationDryRunSearchDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.StandardizationDryRunSearchDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect StandardizationDryRunSearchDTO_Roo_Json {
-    
-    public String StandardizationDryRunSearchDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String StandardizationDryRunSearchDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static StandardizationDryRunSearchDTO StandardizationDryRunSearchDTO.fromJsonToStandardizationDryRunSearchDTO(String json) {
-        return new JSONDeserializer<StandardizationDryRunSearchDTO>()
-        .use(null, StandardizationDryRunSearchDTO.class).deserialize(json);
-    }
-    
-    public static String StandardizationDryRunSearchDTO.toJsonArray(Collection<StandardizationDryRunSearchDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String StandardizationDryRunSearchDTO.toJsonArray(Collection<StandardizationDryRunSearchDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<StandardizationDryRunSearchDTO> StandardizationDryRunSearchDTO.fromJsonArrayToStandardizatioes(String json) {
-        return new JSONDeserializer<List<StandardizationDryRunSearchDTO>>()
-        .use("values", StandardizationDryRunSearchDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/StandardizationDryRunSearchDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/StandardizationDryRunSearchDTO_Roo_ToString.aj
deleted file mode 100644
index 4681ef6cf..000000000
--- a/src/main/java/com/labsynch/labseer/dto/StandardizationDryRunSearchDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.StandardizationDryRunSearchDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect StandardizationDryRunSearchDTO_Roo_ToString {
-    
-    public String StandardizationDryRunSearchDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/StateValueCsvDTO.java b/src/main/java/com/labsynch/labseer/dto/StateValueCsvDTO.java
index 4011e3424..52fceaa71 100644
--- a/src/main/java/com/labsynch/labseer/dto/StateValueCsvDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StateValueCsvDTO.java
@@ -4,8 +4,11 @@
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.roo.addon.javabean.RooJavaBean;
@@ -15,6 +18,8 @@
 import org.supercsv.cellprocessor.ift.CellProcessor;
 
 import com.labsynch.labseer.domain.ExperimentValue;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
 @RooJavaBean
 @RooToString
@@ -278,6 +283,280 @@ public static CellProcessor[] getProcessors() {
 	}
 
 
+
+	public Long getStateId() {
+        return this.stateId;
+    }
+
+	public void setStateId(Long stateId) {
+        this.stateId = stateId;
+    }
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getCodeOrigin() {
+        return this.codeOrigin;
+    }
+
+	public void setCodeOrigin(String codeOrigin) {
+        this.codeOrigin = codeOrigin;
+    }
+
+	public String getCodeType() {
+        return this.codeType;
+    }
+
+	public void setCodeType(String codeType) {
+        this.codeType = codeType;
+    }
+
+	public String getCodeKind() {
+        return this.codeKind;
+    }
+
+	public void setCodeKind(String codeKind) {
+        this.codeKind = codeKind;
+    }
+
+	public String getCodeValue() {
+        return this.codeValue;
+    }
+
+	public void setCodeValue(String codeValue) {
+        this.codeValue = codeValue;
+    }
+
+	public String getStringValue() {
+        return this.stringValue;
+    }
+
+	public void setStringValue(String stringValue) {
+        this.stringValue = stringValue;
+    }
+
+	public String getFileValue() {
+        return this.fileValue;
+    }
+
+	public void setFileValue(String fileValue) {
+        this.fileValue = fileValue;
+    }
+
+	public String getUrlValue() {
+        return this.urlValue;
+    }
+
+	public void setUrlValue(String urlValue) {
+        this.urlValue = urlValue;
+    }
+
+	public Date getDateValue() {
+        return this.dateValue;
+    }
+
+	public void setDateValue(Date dateValue) {
+        this.dateValue = dateValue;
+    }
+
+	public String getClobValue() {
+        return this.clobValue;
+    }
+
+	public void setClobValue(String clobValue) {
+        this.clobValue = clobValue;
+    }
+
+	public String getOperatorType() {
+        return this.operatorType;
+    }
+
+	public void setOperatorType(String operatorType) {
+        this.operatorType = operatorType;
+    }
+
+	public String getOperatorKind() {
+        return this.operatorKind;
+    }
+
+	public void setOperatorKind(String operatorKind) {
+        this.operatorKind = operatorKind;
+    }
+
+	public BigDecimal getNumericValue() {
+        return this.numericValue;
+    }
+
+	public void setNumericValue(BigDecimal numericValue) {
+        this.numericValue = numericValue;
+    }
+
+	public Integer getSigFigs() {
+        return this.sigFigs;
+    }
+
+	public void setSigFigs(Integer sigFigs) {
+        this.sigFigs = sigFigs;
+    }
+
+	public BigDecimal getUncertainty() {
+        return this.uncertainty;
+    }
+
+	public void setUncertainty(BigDecimal uncertainty) {
+        this.uncertainty = uncertainty;
+    }
+
+	public Integer getNumberOfReplicates() {
+        return this.numberOfReplicates;
+    }
+
+	public void setNumberOfReplicates(Integer numberOfReplicates) {
+        this.numberOfReplicates = numberOfReplicates;
+    }
+
+	public String getUncertaintyType() {
+        return this.uncertaintyType;
+    }
+
+	public void setUncertaintyType(String uncertaintyType) {
+        this.uncertaintyType = uncertaintyType;
+    }
+
+	public String getUnitType() {
+        return this.unitType;
+    }
+
+	public void setUnitType(String unitType) {
+        this.unitType = unitType;
+    }
+
+	public String getUnitKind() {
+        return this.unitKind;
+    }
+
+	public void setUnitKind(String unitKind) {
+        this.unitKind = unitKind;
+    }
+
+	public String getComments() {
+        return this.comments;
+    }
+
+	public void setComments(String comments) {
+        this.comments = comments;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public Long getLsTransaction() {
+        return this.lsTransaction;
+    }
+
+	public void setLsTransaction(Long lsTransaction) {
+        this.lsTransaction = lsTransaction;
+    }
+
+	public Date getRecordedDate() {
+        return this.recordedDate;
+    }
+
+	public void setRecordedDate(Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public Date getModifiedDate() {
+        return this.modifiedDate;
+    }
+
+	public void setModifiedDate(Date modifiedDate) {
+        this.modifiedDate = modifiedDate;
+    }
+
+	public String getModifiedBy() {
+        return this.modifiedBy;
+    }
+
+	public void setModifiedBy(String modifiedBy) {
+        this.modifiedBy = modifiedBy;
+    }
+
+	public boolean isPublicData() {
+        return this.publicData;
+    }
+
+	public void setPublicData(boolean publicData) {
+        this.publicData = publicData;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static StateValueCsvDTO fromJsonToStateValueCsvDTO(String json) {
+        return new JSONDeserializer<StateValueCsvDTO>()
+        .use(null, StateValueCsvDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<StateValueCsvDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<StateValueCsvDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<StateValueCsvDTO> fromJsonArrayToStateValueCsvDTO(String json) {
+        return new JSONDeserializer<List<StateValueCsvDTO>>()
+        .use("values", StateValueCsvDTO.class).deserialize(json);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/StateValueCsvDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/StateValueCsvDTO_Roo_JavaBean.aj
deleted file mode 100644
index 69e54c302..000000000
--- a/src/main/java/com/labsynch/labseer/dto/StateValueCsvDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,252 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.StateValueCsvDTO;
-import java.math.BigDecimal;
-import java.util.Date;
-
-privileged aspect StateValueCsvDTO_Roo_JavaBean {
-    
-    public Long StateValueCsvDTO.getStateId() {
-        return this.stateId;
-    }
-    
-    public void StateValueCsvDTO.setStateId(Long stateId) {
-        this.stateId = stateId;
-    }
-    
-    public Long StateValueCsvDTO.getId() {
-        return this.id;
-    }
-    
-    public void StateValueCsvDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-    public String StateValueCsvDTO.getLsType() {
-        return this.lsType;
-    }
-    
-    public void StateValueCsvDTO.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String StateValueCsvDTO.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void StateValueCsvDTO.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String StateValueCsvDTO.getCodeOrigin() {
-        return this.codeOrigin;
-    }
-    
-    public void StateValueCsvDTO.setCodeOrigin(String codeOrigin) {
-        this.codeOrigin = codeOrigin;
-    }
-    
-    public String StateValueCsvDTO.getCodeType() {
-        return this.codeType;
-    }
-    
-    public void StateValueCsvDTO.setCodeType(String codeType) {
-        this.codeType = codeType;
-    }
-    
-    public String StateValueCsvDTO.getCodeKind() {
-        return this.codeKind;
-    }
-    
-    public void StateValueCsvDTO.setCodeKind(String codeKind) {
-        this.codeKind = codeKind;
-    }
-    
-    public String StateValueCsvDTO.getCodeValue() {
-        return this.codeValue;
-    }
-    
-    public void StateValueCsvDTO.setCodeValue(String codeValue) {
-        this.codeValue = codeValue;
-    }
-    
-    public String StateValueCsvDTO.getStringValue() {
-        return this.stringValue;
-    }
-    
-    public void StateValueCsvDTO.setStringValue(String stringValue) {
-        this.stringValue = stringValue;
-    }
-    
-    public String StateValueCsvDTO.getFileValue() {
-        return this.fileValue;
-    }
-    
-    public void StateValueCsvDTO.setFileValue(String fileValue) {
-        this.fileValue = fileValue;
-    }
-    
-    public String StateValueCsvDTO.getUrlValue() {
-        return this.urlValue;
-    }
-    
-    public void StateValueCsvDTO.setUrlValue(String urlValue) {
-        this.urlValue = urlValue;
-    }
-    
-    public Date StateValueCsvDTO.getDateValue() {
-        return this.dateValue;
-    }
-    
-    public void StateValueCsvDTO.setDateValue(Date dateValue) {
-        this.dateValue = dateValue;
-    }
-    
-    public String StateValueCsvDTO.getClobValue() {
-        return this.clobValue;
-    }
-    
-    public void StateValueCsvDTO.setClobValue(String clobValue) {
-        this.clobValue = clobValue;
-    }
-    
-    public String StateValueCsvDTO.getOperatorType() {
-        return this.operatorType;
-    }
-    
-    public void StateValueCsvDTO.setOperatorType(String operatorType) {
-        this.operatorType = operatorType;
-    }
-    
-    public String StateValueCsvDTO.getOperatorKind() {
-        return this.operatorKind;
-    }
-    
-    public void StateValueCsvDTO.setOperatorKind(String operatorKind) {
-        this.operatorKind = operatorKind;
-    }
-    
-    public BigDecimal StateValueCsvDTO.getNumericValue() {
-        return this.numericValue;
-    }
-    
-    public void StateValueCsvDTO.setNumericValue(BigDecimal numericValue) {
-        this.numericValue = numericValue;
-    }
-    
-    public Integer StateValueCsvDTO.getSigFigs() {
-        return this.sigFigs;
-    }
-    
-    public void StateValueCsvDTO.setSigFigs(Integer sigFigs) {
-        this.sigFigs = sigFigs;
-    }
-    
-    public BigDecimal StateValueCsvDTO.getUncertainty() {
-        return this.uncertainty;
-    }
-    
-    public void StateValueCsvDTO.setUncertainty(BigDecimal uncertainty) {
-        this.uncertainty = uncertainty;
-    }
-    
-    public Integer StateValueCsvDTO.getNumberOfReplicates() {
-        return this.numberOfReplicates;
-    }
-    
-    public void StateValueCsvDTO.setNumberOfReplicates(Integer numberOfReplicates) {
-        this.numberOfReplicates = numberOfReplicates;
-    }
-    
-    public String StateValueCsvDTO.getUncertaintyType() {
-        return this.uncertaintyType;
-    }
-    
-    public void StateValueCsvDTO.setUncertaintyType(String uncertaintyType) {
-        this.uncertaintyType = uncertaintyType;
-    }
-    
-    public String StateValueCsvDTO.getUnitType() {
-        return this.unitType;
-    }
-    
-    public void StateValueCsvDTO.setUnitType(String unitType) {
-        this.unitType = unitType;
-    }
-    
-    public String StateValueCsvDTO.getUnitKind() {
-        return this.unitKind;
-    }
-    
-    public void StateValueCsvDTO.setUnitKind(String unitKind) {
-        this.unitKind = unitKind;
-    }
-    
-    public String StateValueCsvDTO.getComments() {
-        return this.comments;
-    }
-    
-    public void StateValueCsvDTO.setComments(String comments) {
-        this.comments = comments;
-    }
-    
-    public boolean StateValueCsvDTO.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void StateValueCsvDTO.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public Long StateValueCsvDTO.getLsTransaction() {
-        return this.lsTransaction;
-    }
-    
-    public void StateValueCsvDTO.setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
-    
-    public Date StateValueCsvDTO.getRecordedDate() {
-        return this.recordedDate;
-    }
-    
-    public void StateValueCsvDTO.setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
-    
-    public String StateValueCsvDTO.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void StateValueCsvDTO.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public Date StateValueCsvDTO.getModifiedDate() {
-        return this.modifiedDate;
-    }
-    
-    public void StateValueCsvDTO.setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
-    
-    public String StateValueCsvDTO.getModifiedBy() {
-        return this.modifiedBy;
-    }
-    
-    public void StateValueCsvDTO.setModifiedBy(String modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
-    
-    public boolean StateValueCsvDTO.isPublicData() {
-        return this.publicData;
-    }
-    
-    public void StateValueCsvDTO.setPublicData(boolean publicData) {
-        this.publicData = publicData;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/StateValueCsvDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/StateValueCsvDTO_Roo_Json.aj
deleted file mode 100644
index 659b8ea8a..000000000
--- a/src/main/java/com/labsynch/labseer/dto/StateValueCsvDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.StateValueCsvDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect StateValueCsvDTO_Roo_Json {
-    
-    public String StateValueCsvDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String StateValueCsvDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static StateValueCsvDTO StateValueCsvDTO.fromJsonToStateValueCsvDTO(String json) {
-        return new JSONDeserializer<StateValueCsvDTO>()
-        .use(null, StateValueCsvDTO.class).deserialize(json);
-    }
-    
-    public static String StateValueCsvDTO.toJsonArray(Collection<StateValueCsvDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String StateValueCsvDTO.toJsonArray(Collection<StateValueCsvDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<StateValueCsvDTO> StateValueCsvDTO.fromJsonArrayToStateValueCsvDTO(String json) {
-        return new JSONDeserializer<List<StateValueCsvDTO>>()
-        .use("values", StateValueCsvDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/StateValueCsvDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/StateValueCsvDTO_Roo_ToString.aj
deleted file mode 100644
index 681f6603b..000000000
--- a/src/main/java/com/labsynch/labseer/dto/StateValueCsvDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.StateValueCsvDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect StateValueCsvDTO_Roo_ToString {
-    
-    public String StateValueCsvDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/StateValueDTO.java b/src/main/java/com/labsynch/labseer/dto/StateValueDTO.java
index b5d237218..bb2f2c425 100644
--- a/src/main/java/com/labsynch/labseer/dto/StateValueDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StateValueDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -13,4 +19,54 @@ public class StateValueDTO {
 	
 	String lsValue;
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static StateValueDTO fromJsonToStateValueDTO(String json) {
+        return new JSONDeserializer<StateValueDTO>()
+        .use(null, StateValueDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<StateValueDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<StateValueDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<StateValueDTO> fromJsonArrayToStateValueDTO(String json) {
+        return new JSONDeserializer<List<StateValueDTO>>()
+        .use("values", StateValueDTO.class).deserialize(json);
+    }
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public String getLsValue() {
+        return this.lsValue;
+    }
+
+	public void setLsValue(String lsValue) {
+        this.lsValue = lsValue;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/StateValueDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/StateValueDTO_Roo_JavaBean.aj
deleted file mode 100644
index 020c11049..000000000
--- a/src/main/java/com/labsynch/labseer/dto/StateValueDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.StateValueDTO;
-
-privileged aspect StateValueDTO_Roo_JavaBean {
-    
-    public Long StateValueDTO.getId() {
-        return this.id;
-    }
-    
-    public void StateValueDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-    public String StateValueDTO.getLsValue() {
-        return this.lsValue;
-    }
-    
-    public void StateValueDTO.setLsValue(String lsValue) {
-        this.lsValue = lsValue;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/StateValueDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/StateValueDTO_Roo_Json.aj
deleted file mode 100644
index 71c5fc896..000000000
--- a/src/main/java/com/labsynch/labseer/dto/StateValueDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.StateValueDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect StateValueDTO_Roo_Json {
-    
-    public String StateValueDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String StateValueDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static StateValueDTO StateValueDTO.fromJsonToStateValueDTO(String json) {
-        return new JSONDeserializer<StateValueDTO>()
-        .use(null, StateValueDTO.class).deserialize(json);
-    }
-    
-    public static String StateValueDTO.toJsonArray(Collection<StateValueDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String StateValueDTO.toJsonArray(Collection<StateValueDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<StateValueDTO> StateValueDTO.fromJsonArrayToStateValueDTO(String json) {
-        return new JSONDeserializer<List<StateValueDTO>>()
-        .use("values", StateValueDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/StateValueDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/StateValueDTO_Roo_ToString.aj
deleted file mode 100644
index 1c572f518..000000000
--- a/src/main/java/com/labsynch/labseer/dto/StateValueDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.StateValueDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect StateValueDTO_Roo_ToString {
-    
-    public String StateValueDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesDTO.java b/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesDTO.java
index d65b84f4f..a7649db98 100644
--- a/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesDTO.java
@@ -3,7 +3,8 @@
 import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.List;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.roo.addon.javabean.RooJavaBean;
@@ -15,7 +16,7 @@
 import com.labsynch.labseer.domain.LsThingValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
 import com.labsynch.labseer.utils.SimpleUtil;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -143,4 +144,114 @@ public StoichiometryPropertiesDTO(LsThing thing){
 		}
 	}
 	
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static StoichiometryPropertiesDTO fromJsonToStoichiometryPropertiesDTO(String json) {
+        return new JSONDeserializer<StoichiometryPropertiesDTO>()
+        .use(null, StoichiometryPropertiesDTO.class).deserialize(json);
+    }
+
+	public static Collection<StoichiometryPropertiesDTO> fromJsonArrayToStoichiometryProes(String json) {
+        return new JSONDeserializer<List<StoichiometryPropertiesDTO>>()
+        .use("values", StoichiometryPropertiesDTO.class).deserialize(json);
+    }
+
+	public String getCodeName() {
+        return this.codeName;
+    }
+
+	public void setCodeName(String codeName) {
+        this.codeName = codeName;
+    }
+
+	public String getCorpName() {
+        return this.corpName;
+    }
+
+	public void setCorpName(String corpName) {
+        this.corpName = corpName;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getPreferredName() {
+        return this.preferredName;
+    }
+
+	public void setPreferredName(String preferredName) {
+        this.preferredName = preferredName;
+    }
+
+	public BigDecimal getMolWeight() {
+        return this.molWeight;
+    }
+
+	public void setMolWeight(BigDecimal molWeight) {
+        this.molWeight = molWeight;
+    }
+
+	public BigDecimal getDensity() {
+        return this.density;
+    }
+
+	public void setDensity(BigDecimal density) {
+        this.density = density;
+    }
+
+	public BigDecimal getConcentration() {
+        return this.concentration;
+    }
+
+	public void setConcentration(BigDecimal concentration) {
+        this.concentration = concentration;
+    }
+
+	public String getConcUnit() {
+        return this.concUnit;
+    }
+
+	public void setConcUnit(String concUnit) {
+        this.concUnit = concUnit;
+    }
+
+	public String getPhase() {
+        return this.phase;
+    }
+
+	public void setPhase(String phase) {
+        this.phase = phase;
+    }
+
+	public BigDecimal getAmountMade() {
+        return this.amountMade;
+    }
+
+	public void setAmountMade(BigDecimal amountMade) {
+        this.amountMade = amountMade;
+    }
+
+	public String getAmountMadeUnits() {
+        return this.amountMadeUnits;
+    }
+
+	public void setAmountMadeUnits(String amountMadeUnits) {
+        this.amountMadeUnits = amountMadeUnits;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesDTO_Roo_JavaBean.aj
deleted file mode 100644
index 99ac3b7c9..000000000
--- a/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,107 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.StoichiometryPropertiesDTO;
-import java.math.BigDecimal;
-
-privileged aspect StoichiometryPropertiesDTO_Roo_JavaBean {
-    
-    public String StoichiometryPropertiesDTO.getCodeName() {
-        return this.codeName;
-    }
-    
-    public void StoichiometryPropertiesDTO.setCodeName(String codeName) {
-        this.codeName = codeName;
-    }
-    
-    public String StoichiometryPropertiesDTO.getCorpName() {
-        return this.corpName;
-    }
-    
-    public void StoichiometryPropertiesDTO.setCorpName(String corpName) {
-        this.corpName = corpName;
-    }
-    
-    public String StoichiometryPropertiesDTO.getLsType() {
-        return this.lsType;
-    }
-    
-    public void StoichiometryPropertiesDTO.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String StoichiometryPropertiesDTO.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void StoichiometryPropertiesDTO.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String StoichiometryPropertiesDTO.getPreferredName() {
-        return this.preferredName;
-    }
-    
-    public void StoichiometryPropertiesDTO.setPreferredName(String preferredName) {
-        this.preferredName = preferredName;
-    }
-    
-    public BigDecimal StoichiometryPropertiesDTO.getMolWeight() {
-        return this.molWeight;
-    }
-    
-    public void StoichiometryPropertiesDTO.setMolWeight(BigDecimal molWeight) {
-        this.molWeight = molWeight;
-    }
-    
-    public BigDecimal StoichiometryPropertiesDTO.getDensity() {
-        return this.density;
-    }
-    
-    public void StoichiometryPropertiesDTO.setDensity(BigDecimal density) {
-        this.density = density;
-    }
-    
-    public BigDecimal StoichiometryPropertiesDTO.getConcentration() {
-        return this.concentration;
-    }
-    
-    public void StoichiometryPropertiesDTO.setConcentration(BigDecimal concentration) {
-        this.concentration = concentration;
-    }
-    
-    public String StoichiometryPropertiesDTO.getConcUnit() {
-        return this.concUnit;
-    }
-    
-    public void StoichiometryPropertiesDTO.setConcUnit(String concUnit) {
-        this.concUnit = concUnit;
-    }
-    
-    public String StoichiometryPropertiesDTO.getPhase() {
-        return this.phase;
-    }
-    
-    public void StoichiometryPropertiesDTO.setPhase(String phase) {
-        this.phase = phase;
-    }
-    
-    public BigDecimal StoichiometryPropertiesDTO.getAmountMade() {
-        return this.amountMade;
-    }
-    
-    public void StoichiometryPropertiesDTO.setAmountMade(BigDecimal amountMade) {
-        this.amountMade = amountMade;
-    }
-    
-    public String StoichiometryPropertiesDTO.getAmountMadeUnits() {
-        return this.amountMadeUnits;
-    }
-    
-    public void StoichiometryPropertiesDTO.setAmountMadeUnits(String amountMadeUnits) {
-        this.amountMadeUnits = amountMadeUnits;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesDTO_Roo_Json.aj
deleted file mode 100644
index af0d09d9c..000000000
--- a/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.StoichiometryPropertiesDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect StoichiometryPropertiesDTO_Roo_Json {
-    
-    public static StoichiometryPropertiesDTO StoichiometryPropertiesDTO.fromJsonToStoichiometryPropertiesDTO(String json) {
-        return new JSONDeserializer<StoichiometryPropertiesDTO>()
-        .use(null, StoichiometryPropertiesDTO.class).deserialize(json);
-    }
-    
-    public static Collection<StoichiometryPropertiesDTO> StoichiometryPropertiesDTO.fromJsonArrayToStoichiometryProes(String json) {
-        return new JSONDeserializer<List<StoichiometryPropertiesDTO>>()
-        .use("values", StoichiometryPropertiesDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesDTO_Roo_ToString.aj
deleted file mode 100644
index 09f033c82..000000000
--- a/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.StoichiometryPropertiesDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect StoichiometryPropertiesDTO_Roo_ToString {
-    
-    public String StoichiometryPropertiesDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesResultsDTO.java b/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesResultsDTO.java
index 887aaaa21..a3d7cb80a 100644
--- a/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesResultsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesResultsDTO.java
@@ -2,13 +2,15 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -35,4 +37,50 @@ public static String toJsonArray(Collection<StoichiometryPropertiesResultsDTO> c
 	public StoichiometryPropertiesResultsDTO(){
 	}
 	
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public boolean isHasError() {
+        return this.hasError;
+    }
+
+	public void setHasError(boolean hasError) {
+        this.hasError = hasError;
+    }
+
+	public boolean isHasWarning() {
+        return this.hasWarning;
+    }
+
+	public void setHasWarning(boolean hasWarning) {
+        this.hasWarning = hasWarning;
+    }
+
+	public Collection<ErrorMessageDTO> getErrorMessages() {
+        return this.errorMessages;
+    }
+
+	public void setErrorMessages(Collection<ErrorMessageDTO> errorMessages) {
+        this.errorMessages = errorMessages;
+    }
+
+	public Collection<StoichiometryPropertiesDTO> getResults() {
+        return this.results;
+    }
+
+	public void setResults(Collection<StoichiometryPropertiesDTO> results) {
+        this.results = results;
+    }
+
+	public static StoichiometryPropertiesResultsDTO fromJsonToStoichiometryPropertiesResultsDTO(String json) {
+        return new JSONDeserializer<StoichiometryPropertiesResultsDTO>()
+        .use(null, StoichiometryPropertiesResultsDTO.class).deserialize(json);
+    }
+
+	public static Collection<StoichiometryPropertiesResultsDTO> fromJsonArrayToStoichiometryProes(String json) {
+        return new JSONDeserializer<List<StoichiometryPropertiesResultsDTO>>()
+        .use("values", StoichiometryPropertiesResultsDTO.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesResultsDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesResultsDTO_Roo_JavaBean.aj
deleted file mode 100644
index 57855be27..000000000
--- a/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesResultsDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ErrorMessageDTO;
-import com.labsynch.labseer.dto.StoichiometryPropertiesDTO;
-import com.labsynch.labseer.dto.StoichiometryPropertiesResultsDTO;
-import java.util.Collection;
-
-privileged aspect StoichiometryPropertiesResultsDTO_Roo_JavaBean {
-    
-    public boolean StoichiometryPropertiesResultsDTO.isHasError() {
-        return this.hasError;
-    }
-    
-    public void StoichiometryPropertiesResultsDTO.setHasError(boolean hasError) {
-        this.hasError = hasError;
-    }
-    
-    public boolean StoichiometryPropertiesResultsDTO.isHasWarning() {
-        return this.hasWarning;
-    }
-    
-    public void StoichiometryPropertiesResultsDTO.setHasWarning(boolean hasWarning) {
-        this.hasWarning = hasWarning;
-    }
-    
-    public Collection<ErrorMessageDTO> StoichiometryPropertiesResultsDTO.getErrorMessages() {
-        return this.errorMessages;
-    }
-    
-    public void StoichiometryPropertiesResultsDTO.setErrorMessages(Collection<ErrorMessageDTO> errorMessages) {
-        this.errorMessages = errorMessages;
-    }
-    
-    public Collection<StoichiometryPropertiesDTO> StoichiometryPropertiesResultsDTO.getResults() {
-        return this.results;
-    }
-    
-    public void StoichiometryPropertiesResultsDTO.setResults(Collection<StoichiometryPropertiesDTO> results) {
-        this.results = results;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesResultsDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesResultsDTO_Roo_Json.aj
deleted file mode 100644
index 37127da46..000000000
--- a/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesResultsDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.StoichiometryPropertiesResultsDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect StoichiometryPropertiesResultsDTO_Roo_Json {
-    
-    public static StoichiometryPropertiesResultsDTO StoichiometryPropertiesResultsDTO.fromJsonToStoichiometryPropertiesResultsDTO(String json) {
-        return new JSONDeserializer<StoichiometryPropertiesResultsDTO>()
-        .use(null, StoichiometryPropertiesResultsDTO.class).deserialize(json);
-    }
-    
-    public static Collection<StoichiometryPropertiesResultsDTO> StoichiometryPropertiesResultsDTO.fromJsonArrayToStoichiometryProes(String json) {
-        return new JSONDeserializer<List<StoichiometryPropertiesResultsDTO>>()
-        .use("values", StoichiometryPropertiesResultsDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesResultsDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesResultsDTO_Roo_ToString.aj
deleted file mode 100644
index 81db87679..000000000
--- a/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesResultsDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.StoichiometryPropertiesResultsDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect StoichiometryPropertiesResultsDTO_Roo_ToString {
-    
-    public String StoichiometryPropertiesResultsDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/StringCollectionDTO.java b/src/main/java/com/labsynch/labseer/dto/StringCollectionDTO.java
index 600c3b777..9331c2a79 100755
--- a/src/main/java/com/labsynch/labseer/dto/StringCollectionDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StringCollectionDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -13,6 +19,56 @@ public class StringCollectionDTO {
 	
 	private String code;
 
+
+	public String getName() {
+        return this.name;
+    }
+
+	public void setName(String name) {
+        this.name = name;
+    }
+
+	public String getCode() {
+        return this.code;
+    }
+
+	public void setCode(String code) {
+        this.code = code;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static StringCollectionDTO fromJsonToStringCollectionDTO(String json) {
+        return new JSONDeserializer<StringCollectionDTO>()
+        .use(null, StringCollectionDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<StringCollectionDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<StringCollectionDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<StringCollectionDTO> fromJsonArrayToStringCollectioes(String json) {
+        return new JSONDeserializer<List<StringCollectionDTO>>()
+        .use("values", StringCollectionDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/StringCollectionDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/StringCollectionDTO_Roo_JavaBean.aj
deleted file mode 100755
index 6e21012a4..000000000
--- a/src/main/java/com/labsynch/labseer/dto/StringCollectionDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.StringCollectionDTO;
-
-privileged aspect StringCollectionDTO_Roo_JavaBean {
-    
-    public String StringCollectionDTO.getName() {
-        return this.name;
-    }
-    
-    public void StringCollectionDTO.setName(String name) {
-        this.name = name;
-    }
-    
-    public String StringCollectionDTO.getCode() {
-        return this.code;
-    }
-    
-    public void StringCollectionDTO.setCode(String code) {
-        this.code = code;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/StringCollectionDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/StringCollectionDTO_Roo_Json.aj
deleted file mode 100755
index 53ce1176d..000000000
--- a/src/main/java/com/labsynch/labseer/dto/StringCollectionDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.StringCollectionDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect StringCollectionDTO_Roo_Json {
-    
-    public String StringCollectionDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String StringCollectionDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static StringCollectionDTO StringCollectionDTO.fromJsonToStringCollectionDTO(String json) {
-        return new JSONDeserializer<StringCollectionDTO>()
-        .use(null, StringCollectionDTO.class).deserialize(json);
-    }
-    
-    public static String StringCollectionDTO.toJsonArray(Collection<StringCollectionDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String StringCollectionDTO.toJsonArray(Collection<StringCollectionDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<StringCollectionDTO> StringCollectionDTO.fromJsonArrayToStringCollectioes(String json) {
-        return new JSONDeserializer<List<StringCollectionDTO>>()
-        .use("values", StringCollectionDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/StringCollectionDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/StringCollectionDTO_Roo_ToString.aj
deleted file mode 100755
index 5cc90888e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/StringCollectionDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.StringCollectionDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect StringCollectionDTO_Roo_ToString {
-    
-    public String StringCollectionDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/StrippedSaltDTO.java b/src/main/java/com/labsynch/labseer/dto/StrippedSaltDTO.java
index 674ed2ff0..384658724 100644
--- a/src/main/java/com/labsynch/labseer/dto/StrippedSaltDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StrippedSaltDTO.java
@@ -1,16 +1,18 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
 import com.labsynch.labseer.domain.Salt;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -38,4 +40,34 @@ public static String toJsonArray(Collection<StrippedSaltDTO> collection) {
         .exclude("*.class").serialize(collection);
     }
 
+
+	public Map<Salt, Integer> getSaltCounts() {
+        return this.saltCounts;
+    }
+
+	public void setSaltCounts(Map<Salt, Integer> saltCounts) {
+        this.saltCounts = saltCounts;
+    }
+
+	public Set<? extends CmpdRegMolecule> getUnidentifiedFragments() {
+        return this.unidentifiedFragments;
+    }
+
+	public void setUnidentifiedFragments(Set<? extends CmpdRegMolecule> unidentifiedFragments) {
+        this.unidentifiedFragments = unidentifiedFragments;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static StrippedSaltDTO fromJsonToStrippedSaltDTO(String json) {
+        return new JSONDeserializer<StrippedSaltDTO>()
+        .use(null, StrippedSaltDTO.class).deserialize(json);
+    }
+
+	public static Collection<StrippedSaltDTO> fromJsonArrayToStrippedSaltDTO(String json) {
+        return new JSONDeserializer<List<StrippedSaltDTO>>()
+        .use("values", StrippedSaltDTO.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/StrippedSaltDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/StrippedSaltDTO_Roo_JavaBean.aj
deleted file mode 100644
index c96c6ca48..000000000
--- a/src/main/java/com/labsynch/labseer/dto/StrippedSaltDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,30 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
-import com.labsynch.labseer.domain.Salt;
-import com.labsynch.labseer.dto.StrippedSaltDTO;
-import java.util.Map;
-import java.util.Set;
-
-privileged aspect StrippedSaltDTO_Roo_JavaBean {
-    
-    public Map<Salt, Integer> StrippedSaltDTO.getSaltCounts() {
-        return this.saltCounts;
-    }
-    
-    public void StrippedSaltDTO.setSaltCounts(Map<Salt, Integer> saltCounts) {
-        this.saltCounts = saltCounts;
-    }
-    
-    public Set<? extends CmpdRegMolecule> StrippedSaltDTO.getUnidentifiedFragments() {
-        return this.unidentifiedFragments;
-    }
-    
-    public void StrippedSaltDTO.setUnidentifiedFragments(Set<? extends CmpdRegMolecule> unidentifiedFragments) {
-        this.unidentifiedFragments = unidentifiedFragments;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/StrippedSaltDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/StrippedSaltDTO_Roo_Json.aj
deleted file mode 100644
index 56d71acfb..000000000
--- a/src/main/java/com/labsynch/labseer/dto/StrippedSaltDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.StrippedSaltDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect StrippedSaltDTO_Roo_Json {
-    
-    public static StrippedSaltDTO StrippedSaltDTO.fromJsonToStrippedSaltDTO(String json) {
-        return new JSONDeserializer<StrippedSaltDTO>()
-        .use(null, StrippedSaltDTO.class).deserialize(json);
-    }
-    
-    public static Collection<StrippedSaltDTO> StrippedSaltDTO.fromJsonArrayToStrippedSaltDTO(String json) {
-        return new JSONDeserializer<List<StrippedSaltDTO>>()
-        .use("values", StrippedSaltDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/StrippedSaltDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/StrippedSaltDTO_Roo_ToString.aj
deleted file mode 100644
index 5e4e2d0a7..000000000
--- a/src/main/java/com/labsynch/labseer/dto/StrippedSaltDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.StrippedSaltDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect StrippedSaltDTO_Roo_ToString {
-    
-    public String StrippedSaltDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/StructureAndThingSearchDTO.java b/src/main/java/com/labsynch/labseer/dto/StructureAndThingSearchDTO.java
index b3a5fd583..2f6e5c864 100644
--- a/src/main/java/com/labsynch/labseer/dto/StructureAndThingSearchDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StructureAndThingSearchDTO.java
@@ -5,6 +5,8 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -47,6 +49,50 @@ public static String toJsonArray(Collection<StructureAndThingSearchDTO> collecti
 	public static Collection<StructureAndThingSearchDTO> fromJsonArrayToStructureAndThingSearchDTO(String json) {
         return new JSONDeserializer<List<StructureAndThingSearchDTO>>().use(null, ArrayList.class).use("values", StructureAndThingSearchDTO.class).deserialize(json);
     }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getQueryMol() {
+        return this.queryMol;
+    }
+
+	public void setQueryMol(String queryMol) {
+        this.queryMol = queryMol;
+    }
+
+	public String getSearchType() {
+        return this.searchType;
+    }
+
+	public void setSearchType(String searchType) {
+        this.searchType = searchType;
+    }
+
+	public Integer getMaxResults() {
+        return this.maxResults;
+    }
+
+	public void setMaxResults(Integer maxResults) {
+        this.maxResults = maxResults;
+    }
+
+	public Float getSimilarity() {
+        return this.similarity;
+    }
+
+	public void setSimilarity(Float similarity) {
+        this.similarity = similarity;
+    }
+
+	public LsThingQueryDTO getLsThingQueryDTO() {
+        return this.lsThingQueryDTO;
+    }
+
+	public void setLsThingQueryDTO(LsThingQueryDTO lsThingQueryDTO) {
+        this.lsThingQueryDTO = lsThingQueryDTO;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/StructureAndThingSearchDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/StructureAndThingSearchDTO_Roo_JavaBean.aj
deleted file mode 100644
index b401f90e0..000000000
--- a/src/main/java/com/labsynch/labseer/dto/StructureAndThingSearchDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,51 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.LsThingQueryDTO;
-import com.labsynch.labseer.dto.StructureAndThingSearchDTO;
-
-privileged aspect StructureAndThingSearchDTO_Roo_JavaBean {
-    
-    public String StructureAndThingSearchDTO.getQueryMol() {
-        return this.queryMol;
-    }
-    
-    public void StructureAndThingSearchDTO.setQueryMol(String queryMol) {
-        this.queryMol = queryMol;
-    }
-    
-    public String StructureAndThingSearchDTO.getSearchType() {
-        return this.searchType;
-    }
-    
-    public void StructureAndThingSearchDTO.setSearchType(String searchType) {
-        this.searchType = searchType;
-    }
-    
-    public Integer StructureAndThingSearchDTO.getMaxResults() {
-        return this.maxResults;
-    }
-    
-    public void StructureAndThingSearchDTO.setMaxResults(Integer maxResults) {
-        this.maxResults = maxResults;
-    }
-    
-    public Float StructureAndThingSearchDTO.getSimilarity() {
-        return this.similarity;
-    }
-    
-    public void StructureAndThingSearchDTO.setSimilarity(Float similarity) {
-        this.similarity = similarity;
-    }
-    
-    public LsThingQueryDTO StructureAndThingSearchDTO.getLsThingQueryDTO() {
-        return this.lsThingQueryDTO;
-    }
-    
-    public void StructureAndThingSearchDTO.setLsThingQueryDTO(LsThingQueryDTO lsThingQueryDTO) {
-        this.lsThingQueryDTO = lsThingQueryDTO;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/StructureAndThingSearchDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/StructureAndThingSearchDTO_Roo_ToString.aj
deleted file mode 100644
index a40ea2ec0..000000000
--- a/src/main/java/com/labsynch/labseer/dto/StructureAndThingSearchDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.StructureAndThingSearchDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect StructureAndThingSearchDTO_Roo_ToString {
-    
-    public String StructureAndThingSearchDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/StructureSearchDTO.java b/src/main/java/com/labsynch/labseer/dto/StructureSearchDTO.java
index d65b5a578..a1d97b9a1 100644
--- a/src/main/java/com/labsynch/labseer/dto/StructureSearchDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StructureSearchDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -28,6 +34,88 @@ public StructureSearchDTO(String queryMol, String lsType, String lsKind, String
 		this.similarity = similarity;
 	}
 
+
+	public String getQueryMol() {
+        return this.queryMol;
+    }
+
+	public void setQueryMol(String queryMol) {
+        this.queryMol = queryMol;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getSearchType() {
+        return this.searchType;
+    }
+
+	public void setSearchType(String searchType) {
+        this.searchType = searchType;
+    }
+
+	public Integer getMaxResults() {
+        return this.maxResults;
+    }
+
+	public void setMaxResults(Integer maxResults) {
+        this.maxResults = maxResults;
+    }
+
+	public Float getSimilarity() {
+        return this.similarity;
+    }
+
+	public void setSimilarity(Float similarity) {
+        this.similarity = similarity;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static StructureSearchDTO fromJsonToStructureSearchDTO(String json) {
+        return new JSONDeserializer<StructureSearchDTO>()
+        .use(null, StructureSearchDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<StructureSearchDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<StructureSearchDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<StructureSearchDTO> fromJsonArrayToStructureSearchDTO(String json) {
+        return new JSONDeserializer<List<StructureSearchDTO>>()
+        .use("values", StructureSearchDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/StructureSearchDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/StructureSearchDTO_Roo_JavaBean.aj
deleted file mode 100644
index f24e1875d..000000000
--- a/src/main/java/com/labsynch/labseer/dto/StructureSearchDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,58 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.StructureSearchDTO;
-
-privileged aspect StructureSearchDTO_Roo_JavaBean {
-    
-    public String StructureSearchDTO.getQueryMol() {
-        return this.queryMol;
-    }
-    
-    public void StructureSearchDTO.setQueryMol(String queryMol) {
-        this.queryMol = queryMol;
-    }
-    
-    public String StructureSearchDTO.getLsType() {
-        return this.lsType;
-    }
-    
-    public void StructureSearchDTO.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String StructureSearchDTO.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void StructureSearchDTO.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String StructureSearchDTO.getSearchType() {
-        return this.searchType;
-    }
-    
-    public void StructureSearchDTO.setSearchType(String searchType) {
-        this.searchType = searchType;
-    }
-    
-    public Integer StructureSearchDTO.getMaxResults() {
-        return this.maxResults;
-    }
-    
-    public void StructureSearchDTO.setMaxResults(Integer maxResults) {
-        this.maxResults = maxResults;
-    }
-    
-    public Float StructureSearchDTO.getSimilarity() {
-        return this.similarity;
-    }
-    
-    public void StructureSearchDTO.setSimilarity(Float similarity) {
-        this.similarity = similarity;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/StructureSearchDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/StructureSearchDTO_Roo_Json.aj
deleted file mode 100644
index 28545466d..000000000
--- a/src/main/java/com/labsynch/labseer/dto/StructureSearchDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.StructureSearchDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect StructureSearchDTO_Roo_Json {
-    
-    public String StructureSearchDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String StructureSearchDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static StructureSearchDTO StructureSearchDTO.fromJsonToStructureSearchDTO(String json) {
-        return new JSONDeserializer<StructureSearchDTO>()
-        .use(null, StructureSearchDTO.class).deserialize(json);
-    }
-    
-    public static String StructureSearchDTO.toJsonArray(Collection<StructureSearchDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String StructureSearchDTO.toJsonArray(Collection<StructureSearchDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<StructureSearchDTO> StructureSearchDTO.fromJsonArrayToStructureSearchDTO(String json) {
-        return new JSONDeserializer<List<StructureSearchDTO>>()
-        .use("values", StructureSearchDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/StructureSearchDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/StructureSearchDTO_Roo_ToString.aj
deleted file mode 100644
index 2abb67e3f..000000000
--- a/src/main/java/com/labsynch/labseer/dto/StructureSearchDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.StructureSearchDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect StructureSearchDTO_Roo_ToString {
-    
-    public String StructureSearchDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectCodeDTO.java
index 598501b1e..c353ffe63 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectCodeDTO.java
@@ -1,13 +1,15 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -30,6 +32,36 @@ public static String toJsonArray(Collection<SubjectCodeDTO> collection) {
 	}
 	
 
+
+	public static SubjectCodeDTO fromJsonToSubjectCodeDTO(String json) {
+        return new JSONDeserializer<SubjectCodeDTO>()
+        .use(null, SubjectCodeDTO.class).deserialize(json);
+    }
+
+	public static Collection<SubjectCodeDTO> fromJsonArrayToSubjectCoes(String json) {
+        return new JSONDeserializer<List<SubjectCodeDTO>>()
+        .use("values", SubjectCodeDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getSubjectCode() {
+        return this.subjectCode;
+    }
+
+	public void setSubjectCode(String subjectCode) {
+        this.subjectCode = subjectCode;
+    }
+
+	public Collection<TreatmentGroupCodeDTO> getTreatmentGroupCodes() {
+        return this.treatmentGroupCodes;
+    }
+
+	public void setTreatmentGroupCodes(Collection<TreatmentGroupCodeDTO> treatmentGroupCodes) {
+        this.treatmentGroupCodes = treatmentGroupCodes;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectCodeDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/SubjectCodeDTO_Roo_JavaBean.aj
deleted file mode 100644
index 08f3c8a53..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectCodeDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,28 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectCodeDTO;
-import com.labsynch.labseer.dto.TreatmentGroupCodeDTO;
-import java.util.Collection;
-
-privileged aspect SubjectCodeDTO_Roo_JavaBean {
-    
-    public String SubjectCodeDTO.getSubjectCode() {
-        return this.subjectCode;
-    }
-    
-    public void SubjectCodeDTO.setSubjectCode(String subjectCode) {
-        this.subjectCode = subjectCode;
-    }
-    
-    public Collection<TreatmentGroupCodeDTO> SubjectCodeDTO.getTreatmentGroupCodes() {
-        return this.treatmentGroupCodes;
-    }
-    
-    public void SubjectCodeDTO.setTreatmentGroupCodes(Collection<TreatmentGroupCodeDTO> treatmentGroupCodes) {
-        this.treatmentGroupCodes = treatmentGroupCodes;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectCodeDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/SubjectCodeDTO_Roo_Json.aj
deleted file mode 100644
index 02a2aa5f8..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectCodeDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectCodeDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect SubjectCodeDTO_Roo_Json {
-    
-    public static SubjectCodeDTO SubjectCodeDTO.fromJsonToSubjectCodeDTO(String json) {
-        return new JSONDeserializer<SubjectCodeDTO>()
-        .use(null, SubjectCodeDTO.class).deserialize(json);
-    }
-    
-    public static Collection<SubjectCodeDTO> SubjectCodeDTO.fromJsonArrayToSubjectCoes(String json) {
-        return new JSONDeserializer<List<SubjectCodeDTO>>()
-        .use("values", SubjectCodeDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectCodeDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/SubjectCodeDTO_Roo_ToString.aj
deleted file mode 100644
index f16a38a40..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectCodeDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectCodeDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SubjectCodeDTO_Roo_ToString {
-    
-    public String SubjectCodeDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectCodeNameDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectCodeNameDTO.java
index 4d63b9872..cde15e731 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectCodeNameDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectCodeNameDTO.java
@@ -1,14 +1,16 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.Subject;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -36,6 +38,36 @@ public static String toJsonArray(Collection<SubjectCodeNameDTO> collection) {
     }
 	
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static SubjectCodeNameDTO fromJsonToSubjectCodeNameDTO(String json) {
+        return new JSONDeserializer<SubjectCodeNameDTO>()
+        .use(null, SubjectCodeNameDTO.class).deserialize(json);
+    }
+
+	public static Collection<SubjectCodeNameDTO> fromJsonArrayToSubjectCoes(String json) {
+        return new JSONDeserializer<List<SubjectCodeNameDTO>>()
+        .use("values", SubjectCodeNameDTO.class).deserialize(json);
+    }
+
+	public String getRequestCodeName() {
+        return this.requestCodeName;
+    }
+
+	public void setRequestCodeName(String requestCodeName) {
+        this.requestCodeName = requestCodeName;
+    }
+
+	public Subject getSubject() {
+        return this.subject;
+    }
+
+	public void setSubject(Subject subject) {
+        this.subject = subject;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectCodeNameDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/SubjectCodeNameDTO_Roo_JavaBean.aj
deleted file mode 100644
index 8700dce81..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectCodeNameDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,27 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.dto.SubjectCodeNameDTO;
-
-privileged aspect SubjectCodeNameDTO_Roo_JavaBean {
-    
-    public String SubjectCodeNameDTO.getRequestCodeName() {
-        return this.requestCodeName;
-    }
-    
-    public void SubjectCodeNameDTO.setRequestCodeName(String requestCodeName) {
-        this.requestCodeName = requestCodeName;
-    }
-    
-    public Subject SubjectCodeNameDTO.getSubject() {
-        return this.subject;
-    }
-    
-    public void SubjectCodeNameDTO.setSubject(Subject subject) {
-        this.subject = subject;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectCodeNameDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/SubjectCodeNameDTO_Roo_Json.aj
deleted file mode 100644
index e043003c5..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectCodeNameDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectCodeNameDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect SubjectCodeNameDTO_Roo_Json {
-    
-    public static SubjectCodeNameDTO SubjectCodeNameDTO.fromJsonToSubjectCodeNameDTO(String json) {
-        return new JSONDeserializer<SubjectCodeNameDTO>()
-        .use(null, SubjectCodeNameDTO.class).deserialize(json);
-    }
-    
-    public static Collection<SubjectCodeNameDTO> SubjectCodeNameDTO.fromJsonArrayToSubjectCoes(String json) {
-        return new JSONDeserializer<List<SubjectCodeNameDTO>>()
-        .use("values", SubjectCodeNameDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectCodeNameDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/SubjectCodeNameDTO_Roo_ToString.aj
deleted file mode 100644
index 0125aabb1..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectCodeNameDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectCodeNameDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SubjectCodeNameDTO_Roo_ToString {
-    
-    public String SubjectCodeNameDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectCodeStateDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectCodeStateDTO.java
index 0812f5640..0e37e5d85 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectCodeStateDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectCodeStateDTO.java
@@ -1,10 +1,16 @@
 package com.labsynch.labseer.dto;
 
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.SubjectState;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 
 @RooJavaBean
 @RooToString
@@ -22,6 +28,56 @@ public SubjectCodeStateDTO(String subjectCode, SubjectState subjectState){
 		this.subjectState = subjectState;
 	}
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getSubjectCode() {
+        return this.subjectCode;
+    }
+
+	public void setSubjectCode(String subjectCode) {
+        this.subjectCode = subjectCode;
+    }
+
+	public SubjectState getSubjectState() {
+        return this.subjectState;
+    }
+
+	public void setSubjectState(SubjectState subjectState) {
+        this.subjectState = subjectState;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static SubjectCodeStateDTO fromJsonToSubjectCodeStateDTO(String json) {
+        return new JSONDeserializer<SubjectCodeStateDTO>()
+        .use(null, SubjectCodeStateDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<SubjectCodeStateDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<SubjectCodeStateDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<SubjectCodeStateDTO> fromJsonArrayToSubjectCoes(String json) {
+        return new JSONDeserializer<List<SubjectCodeStateDTO>>()
+        .use("values", SubjectCodeStateDTO.class).deserialize(json);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectCodeStateDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/SubjectCodeStateDTO_Roo_JavaBean.aj
deleted file mode 100644
index cbd0f3682..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectCodeStateDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,27 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.SubjectState;
-import com.labsynch.labseer.dto.SubjectCodeStateDTO;
-
-privileged aspect SubjectCodeStateDTO_Roo_JavaBean {
-    
-    public String SubjectCodeStateDTO.getSubjectCode() {
-        return this.subjectCode;
-    }
-    
-    public void SubjectCodeStateDTO.setSubjectCode(String subjectCode) {
-        this.subjectCode = subjectCode;
-    }
-    
-    public SubjectState SubjectCodeStateDTO.getSubjectState() {
-        return this.subjectState;
-    }
-    
-    public void SubjectCodeStateDTO.setSubjectState(SubjectState subjectState) {
-        this.subjectState = subjectState;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectCodeStateDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/SubjectCodeStateDTO_Roo_Json.aj
deleted file mode 100644
index 2a204be49..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectCodeStateDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectCodeStateDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect SubjectCodeStateDTO_Roo_Json {
-    
-    public String SubjectCodeStateDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String SubjectCodeStateDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static SubjectCodeStateDTO SubjectCodeStateDTO.fromJsonToSubjectCodeStateDTO(String json) {
-        return new JSONDeserializer<SubjectCodeStateDTO>()
-        .use(null, SubjectCodeStateDTO.class).deserialize(json);
-    }
-    
-    public static String SubjectCodeStateDTO.toJsonArray(Collection<SubjectCodeStateDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String SubjectCodeStateDTO.toJsonArray(Collection<SubjectCodeStateDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<SubjectCodeStateDTO> SubjectCodeStateDTO.fromJsonArrayToSubjectCoes(String json) {
-        return new JSONDeserializer<List<SubjectCodeStateDTO>>()
-        .use("values", SubjectCodeStateDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectCodeStateDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/SubjectCodeStateDTO_Roo_ToString.aj
deleted file mode 100644
index 32c7b7675..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectCodeStateDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectCodeStateDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SubjectCodeStateDTO_Roo_ToString {
-    
-    public String SubjectCodeStateDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectCsvDataDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectCsvDataDTO.java
index 07d79da45..eb0d1205d 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectCsvDataDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectCsvDataDTO.java
@@ -1,7 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
 import java.util.List;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -15,6 +19,56 @@ public class SubjectCsvDataDTO {
 
 	private String subjectCsvFilePath;
 	
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static SubjectCsvDataDTO fromJsonToSubjectCsvDataDTO(String json) {
+        return new JSONDeserializer<SubjectCsvDataDTO>()
+        .use(null, SubjectCsvDataDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<SubjectCsvDataDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<SubjectCsvDataDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<SubjectCsvDataDTO> fromJsonArrayToSubjectCsvDataDTO(String json) {
+        return new JSONDeserializer<List<SubjectCsvDataDTO>>()
+        .use("values", SubjectCsvDataDTO.class).deserialize(json);
+    }
+
+	public List<Long> getTreatmentGroupIds() {
+        return this.treatmentGroupIds;
+    }
+
+	public void setTreatmentGroupIds(List<Long> treatmentGroupIds) {
+        this.treatmentGroupIds = treatmentGroupIds;
+    }
+
+	public String getSubjectCsvFilePath() {
+        return this.subjectCsvFilePath;
+    }
+
+	public void setSubjectCsvFilePath(String subjectCsvFilePath) {
+        this.subjectCsvFilePath = subjectCsvFilePath;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectCsvDataDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/SubjectCsvDataDTO_Roo_JavaBean.aj
deleted file mode 100644
index bacf3c7c0..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectCsvDataDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,27 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectCsvDataDTO;
-import java.util.List;
-
-privileged aspect SubjectCsvDataDTO_Roo_JavaBean {
-    
-    public List<Long> SubjectCsvDataDTO.getTreatmentGroupIds() {
-        return this.treatmentGroupIds;
-    }
-    
-    public void SubjectCsvDataDTO.setTreatmentGroupIds(List<Long> treatmentGroupIds) {
-        this.treatmentGroupIds = treatmentGroupIds;
-    }
-    
-    public String SubjectCsvDataDTO.getSubjectCsvFilePath() {
-        return this.subjectCsvFilePath;
-    }
-    
-    public void SubjectCsvDataDTO.setSubjectCsvFilePath(String subjectCsvFilePath) {
-        this.subjectCsvFilePath = subjectCsvFilePath;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectCsvDataDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/SubjectCsvDataDTO_Roo_Json.aj
deleted file mode 100644
index 38c16d47e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectCsvDataDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectCsvDataDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect SubjectCsvDataDTO_Roo_Json {
-    
-    public String SubjectCsvDataDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String SubjectCsvDataDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static SubjectCsvDataDTO SubjectCsvDataDTO.fromJsonToSubjectCsvDataDTO(String json) {
-        return new JSONDeserializer<SubjectCsvDataDTO>()
-        .use(null, SubjectCsvDataDTO.class).deserialize(json);
-    }
-    
-    public static String SubjectCsvDataDTO.toJsonArray(Collection<SubjectCsvDataDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String SubjectCsvDataDTO.toJsonArray(Collection<SubjectCsvDataDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<SubjectCsvDataDTO> SubjectCsvDataDTO.fromJsonArrayToSubjectCsvDataDTO(String json) {
-        return new JSONDeserializer<List<SubjectCsvDataDTO>>()
-        .use("values", SubjectCsvDataDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectCsvDataDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/SubjectCsvDataDTO_Roo_ToString.aj
deleted file mode 100644
index 7bf882270..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectCsvDataDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectCsvDataDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SubjectCsvDataDTO_Roo_ToString {
-    
-    public String SubjectCsvDataDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectDTO.java
index 49e75aab1..6bf51dd55 100755
--- a/src/main/java/com/labsynch/labseer/dto/SubjectDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectDTO.java
@@ -7,7 +7,8 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -99,6 +100,130 @@ public static String toJsonArray(Collection<SubjectDTO> collection) {
 	public static Collection<SubjectDTO> fromJsonArrayToSubjectDTO(String json) {
         return new JSONDeserializer<List<SubjectDTO>>().use(null, ArrayList.class).use("values", SubjectDTO.class).deserialize(json);
     }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getCodeName() {
+        return this.codeName;
+    }
+
+	public void setCodeName(String codeName) {
+        this.codeName = codeName;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public Date getRecordedDate() {
+        return this.recordedDate;
+    }
+
+	public void setRecordedDate(Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+	public String getModifiedBy() {
+        return this.modifiedBy;
+    }
+
+	public void setModifiedBy(String modifiedBy) {
+        this.modifiedBy = modifiedBy;
+    }
+
+	public Date getModifiedDate() {
+        return this.modifiedDate;
+    }
+
+	public void setModifiedDate(Date modifiedDate) {
+        this.modifiedDate = modifiedDate;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public Long getLsTransaction() {
+        return this.lsTransaction;
+    }
+
+	public void setLsTransaction(Long lsTransaction) {
+        this.lsTransaction = lsTransaction;
+    }
+
+	public Set<TreatmentGroupMiniDTO> getTreatmentGroups() {
+        return this.treatmentGroups;
+    }
+
+	public void setTreatmentGroups(Set<TreatmentGroupMiniDTO> treatmentGroups) {
+        this.treatmentGroups = treatmentGroups;
+    }
+
+	public Set<SubjectLabelDTO> getLsLabels() {
+        return this.lsLabels;
+    }
+
+	public void setLsLabels(Set<SubjectLabelDTO> lsLabels) {
+        this.lsLabels = lsLabels;
+    }
+
+	public Set<SubjectStateDTO> getLsStates() {
+        return this.lsStates;
+    }
+
+	public void setLsStates(Set<SubjectStateDTO> lsStates) {
+        this.lsStates = lsStates;
+    }
+
+	public Set<ThingPage> getThingPage() {
+        return this.thingPage;
+    }
+
+	public void setThingPage(Set<ThingPage> thingPage) {
+        this.thingPage = thingPage;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/SubjectDTO_Roo_JavaBean.aj
deleted file mode 100755
index dde1a191a..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,136 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.ThingPage;
-import com.labsynch.labseer.dto.SubjectDTO;
-import com.labsynch.labseer.dto.SubjectLabelDTO;
-import com.labsynch.labseer.dto.SubjectStateDTO;
-import com.labsynch.labseer.dto.TreatmentGroupMiniDTO;
-import java.util.Date;
-import java.util.Set;
-
-privileged aspect SubjectDTO_Roo_JavaBean {
-    
-    public Long SubjectDTO.getId() {
-        return this.id;
-    }
-    
-    public void SubjectDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer SubjectDTO.getVersion() {
-        return this.version;
-    }
-    
-    public void SubjectDTO.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-    public String SubjectDTO.getLsType() {
-        return this.lsType;
-    }
-    
-    public void SubjectDTO.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String SubjectDTO.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void SubjectDTO.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String SubjectDTO.getCodeName() {
-        return this.codeName;
-    }
-    
-    public void SubjectDTO.setCodeName(String codeName) {
-        this.codeName = codeName;
-    }
-    
-    public String SubjectDTO.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void SubjectDTO.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public Date SubjectDTO.getRecordedDate() {
-        return this.recordedDate;
-    }
-    
-    public void SubjectDTO.setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
-    
-    public String SubjectDTO.getModifiedBy() {
-        return this.modifiedBy;
-    }
-    
-    public void SubjectDTO.setModifiedBy(String modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
-    
-    public Date SubjectDTO.getModifiedDate() {
-        return this.modifiedDate;
-    }
-    
-    public void SubjectDTO.setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
-    
-    public boolean SubjectDTO.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void SubjectDTO.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public Long SubjectDTO.getLsTransaction() {
-        return this.lsTransaction;
-    }
-    
-    public void SubjectDTO.setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
-    
-    public Set<TreatmentGroupMiniDTO> SubjectDTO.getTreatmentGroups() {
-        return this.treatmentGroups;
-    }
-    
-    public void SubjectDTO.setTreatmentGroups(Set<TreatmentGroupMiniDTO> treatmentGroups) {
-        this.treatmentGroups = treatmentGroups;
-    }
-    
-    public Set<SubjectLabelDTO> SubjectDTO.getLsLabels() {
-        return this.lsLabels;
-    }
-    
-    public void SubjectDTO.setLsLabels(Set<SubjectLabelDTO> lsLabels) {
-        this.lsLabels = lsLabels;
-    }
-    
-    public Set<SubjectStateDTO> SubjectDTO.getLsStates() {
-        return this.lsStates;
-    }
-    
-    public void SubjectDTO.setLsStates(Set<SubjectStateDTO> lsStates) {
-        this.lsStates = lsStates;
-    }
-    
-    public Set<ThingPage> SubjectDTO.getThingPage() {
-        return this.thingPage;
-    }
-    
-    public void SubjectDTO.setThingPage(Set<ThingPage> thingPage) {
-        this.thingPage = thingPage;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/SubjectDTO_Roo_ToString.aj
deleted file mode 100755
index d08790373..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SubjectDTO_Roo_ToString {
-    
-    public String SubjectDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectLabelDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectLabelDTO.java
index d44c7a3e5..8847fab8e 100755
--- a/src/main/java/com/labsynch/labseer/dto/SubjectLabelDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectLabelDTO.java
@@ -1,12 +1,17 @@
 package com.labsynch.labseer.dto;
 
+import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.SubjectLabel;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
 @RooJavaBean
 @RooToString
@@ -57,6 +62,152 @@ public SubjectLabelDTO(SubjectLabel subjectLabel) {
 
 
 
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static SubjectLabelDTO fromJsonToSubjectLabelDTO(String json) {
+        return new JSONDeserializer<SubjectLabelDTO>()
+        .use(null, SubjectLabelDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<SubjectLabelDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<SubjectLabelDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<SubjectLabelDTO> fromJsonArrayToSubjectLabelDTO(String json) {
+        return new JSONDeserializer<List<SubjectLabelDTO>>()
+        .use("values", SubjectLabelDTO.class).deserialize(json);
+    }
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public SubjectMiniDTO getSubject() {
+        return this.subject;
+    }
+
+	public void setSubject(SubjectMiniDTO subject) {
+        this.subject = subject;
+    }
+
+	public String getLabelText() {
+        return this.labelText;
+    }
+
+	public void setLabelText(String labelText) {
+        this.labelText = labelText;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public Date getRecordedDate() {
+        return this.recordedDate;
+    }
+
+	public void setRecordedDate(Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+	public Date getModifiedDate() {
+        return this.modifiedDate;
+    }
+
+	public void setModifiedDate(Date modifiedDate) {
+        this.modifiedDate = modifiedDate;
+    }
+
+	public boolean isPhysicallyLabled() {
+        return this.physicallyLabled;
+    }
+
+	public void setPhysicallyLabled(boolean physicallyLabled) {
+        this.physicallyLabled = physicallyLabled;
+    }
+
+	public String getImageFile() {
+        return this.imageFile;
+    }
+
+	public void setImageFile(String imageFile) {
+        this.imageFile = imageFile;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getLsTypeAndKind() {
+        return this.lsTypeAndKind;
+    }
+
+	public void setLsTypeAndKind(String lsTypeAndKind) {
+        this.lsTypeAndKind = lsTypeAndKind;
+    }
+
+	public boolean isPreferred() {
+        return this.preferred;
+    }
+
+	public void setPreferred(boolean preferred) {
+        this.preferred = preferred;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public Long getLsTransaction_Id() {
+        return this.lsTransaction_Id;
+    }
+
+	public void setLsTransaction_Id(Long lsTransaction_Id) {
+        this.lsTransaction_Id = lsTransaction_Id;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectLabelDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/SubjectLabelDTO_Roo_JavaBean.aj
deleted file mode 100755
index b92525908..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectLabelDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,124 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectLabelDTO;
-import com.labsynch.labseer.dto.SubjectMiniDTO;
-import java.util.Date;
-
-privileged aspect SubjectLabelDTO_Roo_JavaBean {
-    
-    public Long SubjectLabelDTO.getId() {
-        return this.id;
-    }
-    
-    public void SubjectLabelDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-    public SubjectMiniDTO SubjectLabelDTO.getSubject() {
-        return this.subject;
-    }
-    
-    public void SubjectLabelDTO.setSubject(SubjectMiniDTO subject) {
-        this.subject = subject;
-    }
-    
-    public String SubjectLabelDTO.getLabelText() {
-        return this.labelText;
-    }
-    
-    public void SubjectLabelDTO.setLabelText(String labelText) {
-        this.labelText = labelText;
-    }
-    
-    public String SubjectLabelDTO.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void SubjectLabelDTO.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public Date SubjectLabelDTO.getRecordedDate() {
-        return this.recordedDate;
-    }
-    
-    public void SubjectLabelDTO.setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
-    
-    public Date SubjectLabelDTO.getModifiedDate() {
-        return this.modifiedDate;
-    }
-    
-    public void SubjectLabelDTO.setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
-    
-    public boolean SubjectLabelDTO.isPhysicallyLabled() {
-        return this.physicallyLabled;
-    }
-    
-    public void SubjectLabelDTO.setPhysicallyLabled(boolean physicallyLabled) {
-        this.physicallyLabled = physicallyLabled;
-    }
-    
-    public String SubjectLabelDTO.getImageFile() {
-        return this.imageFile;
-    }
-    
-    public void SubjectLabelDTO.setImageFile(String imageFile) {
-        this.imageFile = imageFile;
-    }
-    
-    public String SubjectLabelDTO.getLsType() {
-        return this.lsType;
-    }
-    
-    public void SubjectLabelDTO.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String SubjectLabelDTO.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void SubjectLabelDTO.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String SubjectLabelDTO.getLsTypeAndKind() {
-        return this.lsTypeAndKind;
-    }
-    
-    public void SubjectLabelDTO.setLsTypeAndKind(String lsTypeAndKind) {
-        this.lsTypeAndKind = lsTypeAndKind;
-    }
-    
-    public boolean SubjectLabelDTO.isPreferred() {
-        return this.preferred;
-    }
-    
-    public void SubjectLabelDTO.setPreferred(boolean preferred) {
-        this.preferred = preferred;
-    }
-    
-    public boolean SubjectLabelDTO.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void SubjectLabelDTO.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public Long SubjectLabelDTO.getLsTransaction_Id() {
-        return this.lsTransaction_Id;
-    }
-    
-    public void SubjectLabelDTO.setLsTransaction_Id(Long lsTransaction_Id) {
-        this.lsTransaction_Id = lsTransaction_Id;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectLabelDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/SubjectLabelDTO_Roo_Json.aj
deleted file mode 100755
index f5588b79b..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectLabelDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectLabelDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect SubjectLabelDTO_Roo_Json {
-    
-    public String SubjectLabelDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String SubjectLabelDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static SubjectLabelDTO SubjectLabelDTO.fromJsonToSubjectLabelDTO(String json) {
-        return new JSONDeserializer<SubjectLabelDTO>()
-        .use(null, SubjectLabelDTO.class).deserialize(json);
-    }
-    
-    public static String SubjectLabelDTO.toJsonArray(Collection<SubjectLabelDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String SubjectLabelDTO.toJsonArray(Collection<SubjectLabelDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<SubjectLabelDTO> SubjectLabelDTO.fromJsonArrayToSubjectLabelDTO(String json) {
-        return new JSONDeserializer<List<SubjectLabelDTO>>()
-        .use("values", SubjectLabelDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectLabelDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/SubjectLabelDTO_Roo_ToString.aj
deleted file mode 100755
index 1c96dd3f3..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectLabelDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectLabelDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SubjectLabelDTO_Roo_ToString {
-    
-    public String SubjectLabelDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectMiniDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectMiniDTO.java
index c0e478e90..72e433f36 100755
--- a/src/main/java/com/labsynch/labseer/dto/SubjectMiniDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectMiniDTO.java
@@ -1,10 +1,16 @@
 package com.labsynch.labseer.dto;
 
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.Subject;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 
 @RooJavaBean
 @RooToString
@@ -25,6 +31,64 @@ public SubjectMiniDTO(Subject subject) {
 
 
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String getCodeName() {
+        return this.codeName;
+    }
+
+	public void setCodeName(String codeName) {
+        this.codeName = codeName;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static SubjectMiniDTO fromJsonToSubjectMiniDTO(String json) {
+        return new JSONDeserializer<SubjectMiniDTO>()
+        .use(null, SubjectMiniDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<SubjectMiniDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<SubjectMiniDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<SubjectMiniDTO> fromJsonArrayToSubjectMiniDTO(String json) {
+        return new JSONDeserializer<List<SubjectMiniDTO>>()
+        .use("values", SubjectMiniDTO.class).deserialize(json);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectMiniDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/SubjectMiniDTO_Roo_JavaBean.aj
deleted file mode 100755
index 93fbbdf79..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectMiniDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectMiniDTO;
-
-privileged aspect SubjectMiniDTO_Roo_JavaBean {
-    
-    public Long SubjectMiniDTO.getId() {
-        return this.id;
-    }
-    
-    public void SubjectMiniDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer SubjectMiniDTO.getVersion() {
-        return this.version;
-    }
-    
-    public void SubjectMiniDTO.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-    public String SubjectMiniDTO.getCodeName() {
-        return this.codeName;
-    }
-    
-    public void SubjectMiniDTO.setCodeName(String codeName) {
-        this.codeName = codeName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectMiniDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/SubjectMiniDTO_Roo_Json.aj
deleted file mode 100755
index 7e483e0a4..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectMiniDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectMiniDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect SubjectMiniDTO_Roo_Json {
-    
-    public String SubjectMiniDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String SubjectMiniDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static SubjectMiniDTO SubjectMiniDTO.fromJsonToSubjectMiniDTO(String json) {
-        return new JSONDeserializer<SubjectMiniDTO>()
-        .use(null, SubjectMiniDTO.class).deserialize(json);
-    }
-    
-    public static String SubjectMiniDTO.toJsonArray(Collection<SubjectMiniDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String SubjectMiniDTO.toJsonArray(Collection<SubjectMiniDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<SubjectMiniDTO> SubjectMiniDTO.fromJsonArrayToSubjectMiniDTO(String json) {
-        return new JSONDeserializer<List<SubjectMiniDTO>>()
-        .use("values", SubjectMiniDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectMiniDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/SubjectMiniDTO_Roo_ToString.aj
deleted file mode 100755
index 8f4e11002..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectMiniDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectMiniDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SubjectMiniDTO_Roo_ToString {
-    
-    public String SubjectMiniDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectSearchRequest.java b/src/main/java/com/labsynch/labseer/dto/SubjectSearchRequest.java
index 7a9722b8c..1b76ee7df 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectSearchRequest.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectSearchRequest.java
@@ -1,7 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -28,4 +32,94 @@ public class SubjectSearchRequest {
 	public SubjectSearchRequest(){
 		
 	}
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static SubjectSearchRequest fromJsonToSubjectSearchRequest(String json) {
+        return new JSONDeserializer<SubjectSearchRequest>()
+        .use(null, SubjectSearchRequest.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<SubjectSearchRequest> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<SubjectSearchRequest> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<SubjectSearchRequest> fromJsonArrayToSubjectSearchRequests(String json) {
+        return new JSONDeserializer<List<SubjectSearchRequest>>()
+        .use("values", SubjectSearchRequest.class).deserialize(json);
+    }
+
+	public Integer getMaxResults() {
+        return this.maxResults;
+    }
+
+	public void setMaxResults(Integer maxResults) {
+        this.maxResults = maxResults;
+    }
+
+	public String getProtocolLabelLike() {
+        return this.protocolLabelLike;
+    }
+
+	public void setProtocolLabelLike(String protocolLabelLike) {
+        this.protocolLabelLike = protocolLabelLike;
+    }
+
+	public String getExperimentLabelLike() {
+        return this.experimentLabelLike;
+    }
+
+	public void setExperimentLabelLike(String experimentLabelLike) {
+        this.experimentLabelLike = experimentLabelLike;
+    }
+
+	public String getContainerCode() {
+        return this.containerCode;
+    }
+
+	public void setContainerCode(String containerCode) {
+        this.containerCode = containerCode;
+    }
+
+	public String getSubjectType() {
+        return this.subjectType;
+    }
+
+	public void setSubjectType(String subjectType) {
+        this.subjectType = subjectType;
+    }
+
+	public String getSubjectKind() {
+        return this.subjectKind;
+    }
+
+	public void setSubjectKind(String subjectKind) {
+        this.subjectKind = subjectKind;
+    }
+
+	public Collection<ValueQueryDTO> getValues() {
+        return this.values;
+    }
+
+	public void setValues(Collection<ValueQueryDTO> values) {
+        this.values = values;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectSearchRequest_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/SubjectSearchRequest_Roo_JavaBean.aj
deleted file mode 100644
index 17c2fc277..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectSearchRequest_Roo_JavaBean.aj
+++ /dev/null
@@ -1,68 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectSearchRequest;
-import com.labsynch.labseer.dto.ValueQueryDTO;
-import java.util.Collection;
-
-privileged aspect SubjectSearchRequest_Roo_JavaBean {
-    
-    public Integer SubjectSearchRequest.getMaxResults() {
-        return this.maxResults;
-    }
-    
-    public void SubjectSearchRequest.setMaxResults(Integer maxResults) {
-        this.maxResults = maxResults;
-    }
-    
-    public String SubjectSearchRequest.getProtocolLabelLike() {
-        return this.protocolLabelLike;
-    }
-    
-    public void SubjectSearchRequest.setProtocolLabelLike(String protocolLabelLike) {
-        this.protocolLabelLike = protocolLabelLike;
-    }
-    
-    public String SubjectSearchRequest.getExperimentLabelLike() {
-        return this.experimentLabelLike;
-    }
-    
-    public void SubjectSearchRequest.setExperimentLabelLike(String experimentLabelLike) {
-        this.experimentLabelLike = experimentLabelLike;
-    }
-    
-    public String SubjectSearchRequest.getContainerCode() {
-        return this.containerCode;
-    }
-    
-    public void SubjectSearchRequest.setContainerCode(String containerCode) {
-        this.containerCode = containerCode;
-    }
-    
-    public String SubjectSearchRequest.getSubjectType() {
-        return this.subjectType;
-    }
-    
-    public void SubjectSearchRequest.setSubjectType(String subjectType) {
-        this.subjectType = subjectType;
-    }
-    
-    public String SubjectSearchRequest.getSubjectKind() {
-        return this.subjectKind;
-    }
-    
-    public void SubjectSearchRequest.setSubjectKind(String subjectKind) {
-        this.subjectKind = subjectKind;
-    }
-    
-    public Collection<ValueQueryDTO> SubjectSearchRequest.getValues() {
-        return this.values;
-    }
-    
-    public void SubjectSearchRequest.setValues(Collection<ValueQueryDTO> values) {
-        this.values = values;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectSearchRequest_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/SubjectSearchRequest_Roo_Json.aj
deleted file mode 100644
index 6e9b034e5..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectSearchRequest_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectSearchRequest;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect SubjectSearchRequest_Roo_Json {
-    
-    public String SubjectSearchRequest.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String SubjectSearchRequest.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static SubjectSearchRequest SubjectSearchRequest.fromJsonToSubjectSearchRequest(String json) {
-        return new JSONDeserializer<SubjectSearchRequest>()
-        .use(null, SubjectSearchRequest.class).deserialize(json);
-    }
-    
-    public static String SubjectSearchRequest.toJsonArray(Collection<SubjectSearchRequest> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String SubjectSearchRequest.toJsonArray(Collection<SubjectSearchRequest> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<SubjectSearchRequest> SubjectSearchRequest.fromJsonArrayToSubjectSearchRequests(String json) {
-        return new JSONDeserializer<List<SubjectSearchRequest>>()
-        .use("values", SubjectSearchRequest.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectSearchRequest_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/SubjectSearchRequest_Roo_ToString.aj
deleted file mode 100644
index 96e0bfbd5..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectSearchRequest_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectSearchRequest;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SubjectSearchRequest_Roo_ToString {
-    
-    public String SubjectSearchRequest.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectSearchResultDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectSearchResultDTO.java
index 9785e22bc..ef1429629 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectSearchResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectSearchResultDTO.java
@@ -1,7 +1,9 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -9,7 +11,7 @@
 
 import com.labsynch.labseer.domain.Subject;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -52,4 +54,52 @@ public String toJsonStub() {
         return new JSONSerializer().exclude("*.class", "results.lsStates").include("results.lsTags", "results.lsLabels").prettyPrint(false).transform(new ExcludeNulls(), void.class).serialize(this);
     }
 	
+
+	public Integer getMaxResults() {
+        return this.maxResults;
+    }
+
+	public void setMaxResults(Integer maxResults) {
+        this.maxResults = maxResults;
+    }
+
+	public Integer getNumberOfResults() {
+        return this.numberOfResults;
+    }
+
+	public void setNumberOfResults(Integer numberOfResults) {
+        this.numberOfResults = numberOfResults;
+    }
+
+	public Collection<Subject> getResults() {
+        return this.results;
+    }
+
+	public void setResults(Collection<Subject> results) {
+        this.results = results;
+    }
+
+	public static SubjectSearchResultDTO fromJsonToSubjectSearchResultDTO(String json) {
+        return new JSONDeserializer<SubjectSearchResultDTO>()
+        .use(null, SubjectSearchResultDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<SubjectSearchResultDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<SubjectSearchResultDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<SubjectSearchResultDTO> fromJsonArrayToSubjectSearchResultDTO(String json) {
+        return new JSONDeserializer<List<SubjectSearchResultDTO>>()
+        .use("values", SubjectSearchResultDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectSearchResultDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/SubjectSearchResultDTO_Roo_JavaBean.aj
deleted file mode 100644
index a2cfaca20..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectSearchResultDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,36 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.dto.SubjectSearchResultDTO;
-import java.util.Collection;
-
-privileged aspect SubjectSearchResultDTO_Roo_JavaBean {
-    
-    public Integer SubjectSearchResultDTO.getMaxResults() {
-        return this.maxResults;
-    }
-    
-    public void SubjectSearchResultDTO.setMaxResults(Integer maxResults) {
-        this.maxResults = maxResults;
-    }
-    
-    public Integer SubjectSearchResultDTO.getNumberOfResults() {
-        return this.numberOfResults;
-    }
-    
-    public void SubjectSearchResultDTO.setNumberOfResults(Integer numberOfResults) {
-        this.numberOfResults = numberOfResults;
-    }
-    
-    public Collection<Subject> SubjectSearchResultDTO.getResults() {
-        return this.results;
-    }
-    
-    public void SubjectSearchResultDTO.setResults(Collection<Subject> results) {
-        this.results = results;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectSearchResultDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/SubjectSearchResultDTO_Roo_Json.aj
deleted file mode 100644
index c1bb676c3..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectSearchResultDTO_Roo_Json.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectSearchResultDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect SubjectSearchResultDTO_Roo_Json {
-    
-    public static SubjectSearchResultDTO SubjectSearchResultDTO.fromJsonToSubjectSearchResultDTO(String json) {
-        return new JSONDeserializer<SubjectSearchResultDTO>()
-        .use(null, SubjectSearchResultDTO.class).deserialize(json);
-    }
-    
-    public static String SubjectSearchResultDTO.toJsonArray(Collection<SubjectSearchResultDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String SubjectSearchResultDTO.toJsonArray(Collection<SubjectSearchResultDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<SubjectSearchResultDTO> SubjectSearchResultDTO.fromJsonArrayToSubjectSearchResultDTO(String json) {
-        return new JSONDeserializer<List<SubjectSearchResultDTO>>()
-        .use("values", SubjectSearchResultDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectSearchResultDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/SubjectSearchResultDTO_Roo_ToString.aj
deleted file mode 100644
index d76e74e5e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectSearchResultDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectSearchResultDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SubjectSearchResultDTO_Roo_ToString {
-    
-    public String SubjectSearchResultDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectStateDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectStateDTO.java
index e2f225547..7c764789a 100755
--- a/src/main/java/com/labsynch/labseer/dto/SubjectStateDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectStateDTO.java
@@ -1,15 +1,20 @@
 package com.labsynch.labseer.dto;
 
+import java.util.Collection;
 import java.util.Date;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.SubjectState;
 import com.labsynch.labseer.domain.SubjectValue;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
 @RooJavaBean
 @RooToString
@@ -58,5 +63,143 @@ public SubjectStateDTO(SubjectState subjectState) {
     private Set<SubjectValue> subjectValues = new HashSet<SubjectValue>();
 
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static SubjectStateDTO fromJsonToSubjectStateDTO(String json) {
+        return new JSONDeserializer<SubjectStateDTO>()
+        .use(null, SubjectStateDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<SubjectStateDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<SubjectStateDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<SubjectStateDTO> fromJsonArrayToSubjectStateDTO(String json) {
+        return new JSONDeserializer<List<SubjectStateDTO>>()
+        .use("values", SubjectStateDTO.class).deserialize(json);
+    }
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public SubjectMiniDTO getSubject() {
+        return this.subject;
+    }
+
+	public void setSubject(SubjectMiniDTO subject) {
+        this.subject = subject;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public Date getRecordedDate() {
+        return this.recordedDate;
+    }
+
+	public void setRecordedDate(Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+	public String getModifiedBy() {
+        return this.modifiedBy;
+    }
+
+	public void setModifiedBy(String modifiedBy) {
+        this.modifiedBy = modifiedBy;
+    }
+
+	public Date getModifiedDate() {
+        return this.modifiedDate;
+    }
+
+	public void setModifiedDate(Date modifiedDate) {
+        this.modifiedDate = modifiedDate;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getLsTypeAndKind() {
+        return this.lsTypeAndKind;
+    }
+
+	public void setLsTypeAndKind(String lsTypeAndKind) {
+        this.lsTypeAndKind = lsTypeAndKind;
+    }
+
+	public String getComments() {
+        return this.comments;
+    }
+
+	public void setComments(String comments) {
+        this.comments = comments;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public Long getLsTransaction_Id() {
+        return this.lsTransaction_Id;
+    }
+
+	public void setLsTransaction_Id(Long lsTransaction_Id) {
+        this.lsTransaction_Id = lsTransaction_Id;
+    }
+
+	public Set<SubjectValue> getSubjectValues() {
+        return this.subjectValues;
+    }
+
+	public void setSubjectValues(Set<SubjectValue> subjectValues) {
+        this.subjectValues = subjectValues;
+    }
 }
 
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectStateDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/SubjectStateDTO_Roo_JavaBean.aj
deleted file mode 100755
index c1a149112..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectStateDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,118 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.dto.SubjectMiniDTO;
-import com.labsynch.labseer.dto.SubjectStateDTO;
-import java.util.Date;
-import java.util.Set;
-
-privileged aspect SubjectStateDTO_Roo_JavaBean {
-    
-    public Long SubjectStateDTO.getId() {
-        return this.id;
-    }
-    
-    public void SubjectStateDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-    public SubjectMiniDTO SubjectStateDTO.getSubject() {
-        return this.subject;
-    }
-    
-    public void SubjectStateDTO.setSubject(SubjectMiniDTO subject) {
-        this.subject = subject;
-    }
-    
-    public String SubjectStateDTO.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void SubjectStateDTO.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public Date SubjectStateDTO.getRecordedDate() {
-        return this.recordedDate;
-    }
-    
-    public void SubjectStateDTO.setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
-    
-    public String SubjectStateDTO.getModifiedBy() {
-        return this.modifiedBy;
-    }
-    
-    public void SubjectStateDTO.setModifiedBy(String modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
-    
-    public Date SubjectStateDTO.getModifiedDate() {
-        return this.modifiedDate;
-    }
-    
-    public void SubjectStateDTO.setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
-    
-    public String SubjectStateDTO.getLsType() {
-        return this.lsType;
-    }
-    
-    public void SubjectStateDTO.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String SubjectStateDTO.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void SubjectStateDTO.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String SubjectStateDTO.getLsTypeAndKind() {
-        return this.lsTypeAndKind;
-    }
-    
-    public void SubjectStateDTO.setLsTypeAndKind(String lsTypeAndKind) {
-        this.lsTypeAndKind = lsTypeAndKind;
-    }
-    
-    public String SubjectStateDTO.getComments() {
-        return this.comments;
-    }
-    
-    public void SubjectStateDTO.setComments(String comments) {
-        this.comments = comments;
-    }
-    
-    public boolean SubjectStateDTO.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void SubjectStateDTO.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public Long SubjectStateDTO.getLsTransaction_Id() {
-        return this.lsTransaction_Id;
-    }
-    
-    public void SubjectStateDTO.setLsTransaction_Id(Long lsTransaction_Id) {
-        this.lsTransaction_Id = lsTransaction_Id;
-    }
-    
-    public Set<SubjectValue> SubjectStateDTO.getSubjectValues() {
-        return this.subjectValues;
-    }
-    
-    public void SubjectStateDTO.setSubjectValues(Set<SubjectValue> subjectValues) {
-        this.subjectValues = subjectValues;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectStateDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/SubjectStateDTO_Roo_Json.aj
deleted file mode 100755
index 62d03abe6..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectStateDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectStateDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect SubjectStateDTO_Roo_Json {
-    
-    public String SubjectStateDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String SubjectStateDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static SubjectStateDTO SubjectStateDTO.fromJsonToSubjectStateDTO(String json) {
-        return new JSONDeserializer<SubjectStateDTO>()
-        .use(null, SubjectStateDTO.class).deserialize(json);
-    }
-    
-    public static String SubjectStateDTO.toJsonArray(Collection<SubjectStateDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String SubjectStateDTO.toJsonArray(Collection<SubjectStateDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<SubjectStateDTO> SubjectStateDTO.fromJsonArrayToSubjectStateDTO(String json) {
-        return new JSONDeserializer<List<SubjectStateDTO>>()
-        .use("values", SubjectStateDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectStateDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/SubjectStateDTO_Roo_ToString.aj
deleted file mode 100755
index 1a57b3a89..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectStateDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectStateDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SubjectStateDTO_Roo_ToString {
-    
-    public String SubjectStateDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectStateMiniDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectStateMiniDTO.java
index 50b3926ca..09b5be2f8 100755
--- a/src/main/java/com/labsynch/labseer/dto/SubjectStateMiniDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectStateMiniDTO.java
@@ -1,10 +1,16 @@
 package com.labsynch.labseer.dto;
 
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.SubjectState;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 
 @RooJavaBean
 @RooToString
@@ -17,5 +23,47 @@ public SubjectStateMiniDTO(SubjectState subjectState) {
 
 	private Long id;
 
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static SubjectStateMiniDTO fromJsonToSubjectStateMiniDTO(String json) {
+        return new JSONDeserializer<SubjectStateMiniDTO>()
+        .use(null, SubjectStateMiniDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<SubjectStateMiniDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<SubjectStateMiniDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<SubjectStateMiniDTO> fromJsonArrayToSubjectStateMiniDTO(String json) {
+        return new JSONDeserializer<List<SubjectStateMiniDTO>>()
+        .use("values", SubjectStateMiniDTO.class).deserialize(json);
+    }
 }
 
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectStateMiniDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/SubjectStateMiniDTO_Roo_JavaBean.aj
deleted file mode 100755
index cc445f3e7..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectStateMiniDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectStateMiniDTO;
-
-privileged aspect SubjectStateMiniDTO_Roo_JavaBean {
-    
-    public Long SubjectStateMiniDTO.getId() {
-        return this.id;
-    }
-    
-    public void SubjectStateMiniDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectStateMiniDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/SubjectStateMiniDTO_Roo_Json.aj
deleted file mode 100755
index d3b944ec8..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectStateMiniDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectStateMiniDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect SubjectStateMiniDTO_Roo_Json {
-    
-    public String SubjectStateMiniDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String SubjectStateMiniDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static SubjectStateMiniDTO SubjectStateMiniDTO.fromJsonToSubjectStateMiniDTO(String json) {
-        return new JSONDeserializer<SubjectStateMiniDTO>()
-        .use(null, SubjectStateMiniDTO.class).deserialize(json);
-    }
-    
-    public static String SubjectStateMiniDTO.toJsonArray(Collection<SubjectStateMiniDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String SubjectStateMiniDTO.toJsonArray(Collection<SubjectStateMiniDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<SubjectStateMiniDTO> SubjectStateMiniDTO.fromJsonArrayToSubjectStateMiniDTO(String json) {
-        return new JSONDeserializer<List<SubjectStateMiniDTO>>()
-        .use("values", SubjectStateMiniDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectStateMiniDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/SubjectStateMiniDTO_Roo_ToString.aj
deleted file mode 100755
index e61cbd199..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectStateMiniDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectStateMiniDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SubjectStateMiniDTO_Roo_ToString {
-    
-    public String SubjectStateMiniDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectStatePathDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectStatePathDTO.java
index 908b22e0f..ccc5e18af 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectStatePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectStatePathDTO.java
@@ -1,14 +1,16 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.SubjectState;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -34,6 +36,52 @@ public String toJson() {
 	public static String toJsonArray(Collection<SubjectStatePathDTO> collection) {
         return new JSONSerializer().include("states.lsValues").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
     }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public static SubjectStatePathDTO fromJsonToSubjectStatePathDTO(String json) {
+        return new JSONDeserializer<SubjectStatePathDTO>()
+        .use(null, SubjectStatePathDTO.class).deserialize(json);
+    }
+
+	public static Collection<SubjectStatePathDTO> fromJsonArrayToSubjectStatePathDTO(String json) {
+        return new JSONDeserializer<List<SubjectStatePathDTO>>()
+        .use("values", SubjectStatePathDTO.class).deserialize(json);
+    }
+
+	public String getIdOrCodeName() {
+        return this.idOrCodeName;
+    }
+
+	public void setIdOrCodeName(String idOrCodeName) {
+        this.idOrCodeName = idOrCodeName;
+    }
+
+	public String getStateType() {
+        return this.stateType;
+    }
+
+	public void setStateType(String stateType) {
+        this.stateType = stateType;
+    }
+
+	public String getStateKind() {
+        return this.stateKind;
+    }
+
+	public void setStateKind(String stateKind) {
+        this.stateKind = stateKind;
+    }
+
+	public Collection<SubjectState> getStates() {
+        return this.states;
+    }
+
+	public void setStates(Collection<SubjectState> states) {
+        this.states = states;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectStatePathDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/SubjectStatePathDTO_Roo_JavaBean.aj
deleted file mode 100644
index a51b46af7..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectStatePathDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,44 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.SubjectState;
-import com.labsynch.labseer.dto.SubjectStatePathDTO;
-import java.util.Collection;
-
-privileged aspect SubjectStatePathDTO_Roo_JavaBean {
-    
-    public String SubjectStatePathDTO.getIdOrCodeName() {
-        return this.idOrCodeName;
-    }
-    
-    public void SubjectStatePathDTO.setIdOrCodeName(String idOrCodeName) {
-        this.idOrCodeName = idOrCodeName;
-    }
-    
-    public String SubjectStatePathDTO.getStateType() {
-        return this.stateType;
-    }
-    
-    public void SubjectStatePathDTO.setStateType(String stateType) {
-        this.stateType = stateType;
-    }
-    
-    public String SubjectStatePathDTO.getStateKind() {
-        return this.stateKind;
-    }
-    
-    public void SubjectStatePathDTO.setStateKind(String stateKind) {
-        this.stateKind = stateKind;
-    }
-    
-    public Collection<SubjectState> SubjectStatePathDTO.getStates() {
-        return this.states;
-    }
-    
-    public void SubjectStatePathDTO.setStates(Collection<SubjectState> states) {
-        this.states = states;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectStatePathDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/SubjectStatePathDTO_Roo_Json.aj
deleted file mode 100644
index 13fdef6f2..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectStatePathDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectStatePathDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect SubjectStatePathDTO_Roo_Json {
-    
-    public static SubjectStatePathDTO SubjectStatePathDTO.fromJsonToSubjectStatePathDTO(String json) {
-        return new JSONDeserializer<SubjectStatePathDTO>()
-        .use(null, SubjectStatePathDTO.class).deserialize(json);
-    }
-    
-    public static Collection<SubjectStatePathDTO> SubjectStatePathDTO.fromJsonArrayToSubjectStatePathDTO(String json) {
-        return new JSONDeserializer<List<SubjectStatePathDTO>>()
-        .use("values", SubjectStatePathDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectStatePathDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/SubjectStatePathDTO_Roo_ToString.aj
deleted file mode 100644
index 32999d8d7..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectStatePathDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectStatePathDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SubjectStatePathDTO_Roo_ToString {
-    
-    public String SubjectStatePathDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectStateValueDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectStateValueDTO.java
index 462ecc9e7..935f427e4 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectStateValueDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectStateValueDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -10,4 +16,54 @@
 public class SubjectStateValueDTO {
 	long subjectId;
 	String subjectValue;
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static SubjectStateValueDTO fromJsonToSubjectStateValueDTO(String json) {
+        return new JSONDeserializer<SubjectStateValueDTO>()
+        .use(null, SubjectStateValueDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<SubjectStateValueDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<SubjectStateValueDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<SubjectStateValueDTO> fromJsonArrayToSubjectStateValueDTO(String json) {
+        return new JSONDeserializer<List<SubjectStateValueDTO>>()
+        .use("values", SubjectStateValueDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public long getSubjectId() {
+        return this.subjectId;
+    }
+
+	public void setSubjectId(long subjectId) {
+        this.subjectId = subjectId;
+    }
+
+	public String getSubjectValue() {
+        return this.subjectValue;
+    }
+
+	public void setSubjectValue(String subjectValue) {
+        this.subjectValue = subjectValue;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectStateValueDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/SubjectStateValueDTO_Roo_JavaBean.aj
deleted file mode 100644
index 225064c0b..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectStateValueDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectStateValueDTO;
-
-privileged aspect SubjectStateValueDTO_Roo_JavaBean {
-    
-    public long SubjectStateValueDTO.getSubjectId() {
-        return this.subjectId;
-    }
-    
-    public void SubjectStateValueDTO.setSubjectId(long subjectId) {
-        this.subjectId = subjectId;
-    }
-    
-    public String SubjectStateValueDTO.getSubjectValue() {
-        return this.subjectValue;
-    }
-    
-    public void SubjectStateValueDTO.setSubjectValue(String subjectValue) {
-        this.subjectValue = subjectValue;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectStateValueDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/SubjectStateValueDTO_Roo_Json.aj
deleted file mode 100644
index b450a76c8..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectStateValueDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectStateValueDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect SubjectStateValueDTO_Roo_Json {
-    
-    public String SubjectStateValueDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String SubjectStateValueDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static SubjectStateValueDTO SubjectStateValueDTO.fromJsonToSubjectStateValueDTO(String json) {
-        return new JSONDeserializer<SubjectStateValueDTO>()
-        .use(null, SubjectStateValueDTO.class).deserialize(json);
-    }
-    
-    public static String SubjectStateValueDTO.toJsonArray(Collection<SubjectStateValueDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String SubjectStateValueDTO.toJsonArray(Collection<SubjectStateValueDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<SubjectStateValueDTO> SubjectStateValueDTO.fromJsonArrayToSubjectStateValueDTO(String json) {
-        return new JSONDeserializer<List<SubjectStateValueDTO>>()
-        .use("values", SubjectStateValueDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectStateValueDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/SubjectStateValueDTO_Roo_ToString.aj
deleted file mode 100644
index 787e57779..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectStateValueDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectStateValueDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SubjectStateValueDTO_Roo_ToString {
-    
-    public String SubjectStateValueDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectValueDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectValueDTO.java
index 3faa80194..b10dfae14 100755
--- a/src/main/java/com/labsynch/labseer/dto/SubjectValueDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectValueDTO.java
@@ -1,8 +1,11 @@
 package com.labsynch.labseer.dto;
 
 import java.math.BigDecimal;
+import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -10,6 +13,8 @@
 import com.labsynch.labseer.domain.SubjectState;
 import com.labsynch.labseer.domain.SubjectValue;
 import com.labsynch.labseer.domain.TreatmentGroupState;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
 @RooJavaBean
 @RooToString
@@ -119,5 +124,351 @@ public boolean getPublicData() {
 	}
 
 
+
+	public Long getTreatmentGroupId() {
+        return this.treatmentGroupId;
+    }
+
+	public void setTreatmentGroupId(Long treatmentGroupId) {
+        this.treatmentGroupId = treatmentGroupId;
+    }
+
+	public Long getSubjectId() {
+        return this.subjectId;
+    }
+
+	public void setSubjectId(Long subjectId) {
+        this.subjectId = subjectId;
+    }
+
+	public SubjectState getLsState() {
+        return this.lsState;
+    }
+
+	public void setLsState(SubjectState lsState) {
+        this.lsState = lsState;
+    }
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getLsTypeAndKind() {
+        return this.lsTypeAndKind;
+    }
+
+	public void setLsTypeAndKind(String lsTypeAndKind) {
+        this.lsTypeAndKind = lsTypeAndKind;
+    }
+
+	public String getStringValue() {
+        return this.stringValue;
+    }
+
+	public void setStringValue(String stringValue) {
+        this.stringValue = stringValue;
+    }
+
+	public String getCodeValue() {
+        return this.codeValue;
+    }
+
+	public void setCodeValue(String codeValue) {
+        this.codeValue = codeValue;
+    }
+
+	public String getFileValue() {
+        return this.fileValue;
+    }
+
+	public void setFileValue(String fileValue) {
+        this.fileValue = fileValue;
+    }
+
+	public String getUrlValue() {
+        return this.urlValue;
+    }
+
+	public void setUrlValue(String urlValue) {
+        this.urlValue = urlValue;
+    }
+
+	public Date getDateValue() {
+        return this.dateValue;
+    }
+
+	public void setDateValue(Date dateValue) {
+        this.dateValue = dateValue;
+    }
+
+	public String getClobValue() {
+        return this.clobValue;
+    }
+
+	public void setClobValue(String clobValue) {
+        this.clobValue = clobValue;
+    }
+
+	public byte[] getBlobValue() {
+        return this.blobValue;
+    }
+
+	public void setBlobValue(byte[] blobValue) {
+        this.blobValue = blobValue;
+    }
+
+	public BigDecimal getNumericValue() {
+        return this.numericValue;
+    }
+
+	public void setNumericValue(BigDecimal numericValue) {
+        this.numericValue = numericValue;
+    }
+
+	public Integer getSigFigs() {
+        return this.sigFigs;
+    }
+
+	public void setSigFigs(Integer sigFigs) {
+        this.sigFigs = sigFigs;
+    }
+
+	public BigDecimal getUncertainty() {
+        return this.uncertainty;
+    }
+
+	public void setUncertainty(BigDecimal uncertainty) {
+        this.uncertainty = uncertainty;
+    }
+
+	public Integer getNumberOfReplicates() {
+        return this.numberOfReplicates;
+    }
+
+	public void setNumberOfReplicates(Integer numberOfReplicates) {
+        this.numberOfReplicates = numberOfReplicates;
+    }
+
+	public String getUncertaintyType() {
+        return this.uncertaintyType;
+    }
+
+	public void setUncertaintyType(String uncertaintyType) {
+        this.uncertaintyType = uncertaintyType;
+    }
+
+	public String getComments() {
+        return this.comments;
+    }
+
+	public void setComments(String comments) {
+        this.comments = comments;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public Date getRecordedDate() {
+        return this.recordedDate;
+    }
+
+	public void setRecordedDate(Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+	public Date getModifiedDate() {
+        return this.modifiedDate;
+    }
+
+	public void setModifiedDate(Date modifiedDate) {
+        this.modifiedDate = modifiedDate;
+    }
+
+	public boolean isPublicData() {
+        return this.publicData;
+    }
+
+	public void setPublicData(boolean publicData) {
+        this.publicData = publicData;
+    }
+
+	public String getCodeOrigin() {
+        return this.codeOrigin;
+    }
+
+	public void setCodeOrigin(String codeOrigin) {
+        this.codeOrigin = codeOrigin;
+    }
+
+	public String getCodeType() {
+        return this.codeType;
+    }
+
+	public void setCodeType(String codeType) {
+        this.codeType = codeType;
+    }
+
+	public String getCodeKind() {
+        return this.codeKind;
+    }
+
+	public void setCodeKind(String codeKind) {
+        this.codeKind = codeKind;
+    }
+
+	public String getOperatorType() {
+        return this.operatorType;
+    }
+
+	public void setOperatorType(String operatorType) {
+        this.operatorType = operatorType;
+    }
+
+	public String getOperatorKind() {
+        return this.operatorKind;
+    }
+
+	public void setOperatorKind(String operatorKind) {
+        this.operatorKind = operatorKind;
+    }
+
+	public String getUnitType() {
+        return this.unitType;
+    }
+
+	public void setUnitType(String unitType) {
+        this.unitType = unitType;
+    }
+
+	public String getUnitKind() {
+        return this.unitKind;
+    }
+
+	public void setUnitKind(String unitKind) {
+        this.unitKind = unitKind;
+    }
+
+	public Long getLsTransaction() {
+        return this.lsTransaction;
+    }
+
+	public void setLsTransaction(Long lsTransaction) {
+        this.lsTransaction = lsTransaction;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public String getModifiedBy() {
+        return this.modifiedBy;
+    }
+
+	public void setModifiedBy(String modifiedBy) {
+        this.modifiedBy = modifiedBy;
+    }
+
+	public Long getStateId() {
+        return this.stateId;
+    }
+
+	public void setStateId(Long stateId) {
+        this.stateId = stateId;
+    }
+
+	public String getStateType() {
+        return this.stateType;
+    }
+
+	public void setStateType(String stateType) {
+        this.stateType = stateType;
+    }
+
+	public String getStateKind() {
+        return this.stateKind;
+    }
+
+	public void setStateKind(String stateKind) {
+        this.stateKind = stateKind;
+    }
+
+	public BigDecimal getConcentration() {
+        return this.concentration;
+    }
+
+	public void setConcentration(BigDecimal concentration) {
+        this.concentration = concentration;
+    }
+
+	public String getConcUnit() {
+        return this.concUnit;
+    }
+
+	public void setConcUnit(String concUnit) {
+        this.concUnit = concUnit;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static SubjectValueDTO fromJsonToSubjectValueDTO(String json) {
+        return new JSONDeserializer<SubjectValueDTO>()
+        .use(null, SubjectValueDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<SubjectValueDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<SubjectValueDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<SubjectValueDTO> fromJsonArrayToSubjectValueDTO(String json) {
+        return new JSONDeserializer<List<SubjectValueDTO>>()
+        .use("values", SubjectValueDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectValueDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/SubjectValueDTO_Roo_JavaBean.aj
deleted file mode 100755
index f07079d8a..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectValueDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,325 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.SubjectState;
-import com.labsynch.labseer.dto.SubjectValueDTO;
-import java.math.BigDecimal;
-import java.util.Date;
-
-privileged aspect SubjectValueDTO_Roo_JavaBean {
-    
-    public Long SubjectValueDTO.getTreatmentGroupId() {
-        return this.treatmentGroupId;
-    }
-    
-    public void SubjectValueDTO.setTreatmentGroupId(Long treatmentGroupId) {
-        this.treatmentGroupId = treatmentGroupId;
-    }
-    
-    public Long SubjectValueDTO.getSubjectId() {
-        return this.subjectId;
-    }
-    
-    public void SubjectValueDTO.setSubjectId(Long subjectId) {
-        this.subjectId = subjectId;
-    }
-    
-    public SubjectState SubjectValueDTO.getLsState() {
-        return this.lsState;
-    }
-    
-    public void SubjectValueDTO.setLsState(SubjectState lsState) {
-        this.lsState = lsState;
-    }
-    
-    public Long SubjectValueDTO.getId() {
-        return this.id;
-    }
-    
-    public void SubjectValueDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-    public String SubjectValueDTO.getLsType() {
-        return this.lsType;
-    }
-    
-    public void SubjectValueDTO.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String SubjectValueDTO.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void SubjectValueDTO.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String SubjectValueDTO.getLsTypeAndKind() {
-        return this.lsTypeAndKind;
-    }
-    
-    public void SubjectValueDTO.setLsTypeAndKind(String lsTypeAndKind) {
-        this.lsTypeAndKind = lsTypeAndKind;
-    }
-    
-    public String SubjectValueDTO.getStringValue() {
-        return this.stringValue;
-    }
-    
-    public void SubjectValueDTO.setStringValue(String stringValue) {
-        this.stringValue = stringValue;
-    }
-    
-    public String SubjectValueDTO.getCodeValue() {
-        return this.codeValue;
-    }
-    
-    public void SubjectValueDTO.setCodeValue(String codeValue) {
-        this.codeValue = codeValue;
-    }
-    
-    public String SubjectValueDTO.getFileValue() {
-        return this.fileValue;
-    }
-    
-    public void SubjectValueDTO.setFileValue(String fileValue) {
-        this.fileValue = fileValue;
-    }
-    
-    public String SubjectValueDTO.getUrlValue() {
-        return this.urlValue;
-    }
-    
-    public void SubjectValueDTO.setUrlValue(String urlValue) {
-        this.urlValue = urlValue;
-    }
-    
-    public Date SubjectValueDTO.getDateValue() {
-        return this.dateValue;
-    }
-    
-    public void SubjectValueDTO.setDateValue(Date dateValue) {
-        this.dateValue = dateValue;
-    }
-    
-    public String SubjectValueDTO.getClobValue() {
-        return this.clobValue;
-    }
-    
-    public void SubjectValueDTO.setClobValue(String clobValue) {
-        this.clobValue = clobValue;
-    }
-    
-    public byte[] SubjectValueDTO.getBlobValue() {
-        return this.blobValue;
-    }
-    
-    public void SubjectValueDTO.setBlobValue(byte[] blobValue) {
-        this.blobValue = blobValue;
-    }
-    
-    public BigDecimal SubjectValueDTO.getNumericValue() {
-        return this.numericValue;
-    }
-    
-    public void SubjectValueDTO.setNumericValue(BigDecimal numericValue) {
-        this.numericValue = numericValue;
-    }
-    
-    public Integer SubjectValueDTO.getSigFigs() {
-        return this.sigFigs;
-    }
-    
-    public void SubjectValueDTO.setSigFigs(Integer sigFigs) {
-        this.sigFigs = sigFigs;
-    }
-    
-    public BigDecimal SubjectValueDTO.getUncertainty() {
-        return this.uncertainty;
-    }
-    
-    public void SubjectValueDTO.setUncertainty(BigDecimal uncertainty) {
-        this.uncertainty = uncertainty;
-    }
-    
-    public Integer SubjectValueDTO.getNumberOfReplicates() {
-        return this.numberOfReplicates;
-    }
-    
-    public void SubjectValueDTO.setNumberOfReplicates(Integer numberOfReplicates) {
-        this.numberOfReplicates = numberOfReplicates;
-    }
-    
-    public String SubjectValueDTO.getUncertaintyType() {
-        return this.uncertaintyType;
-    }
-    
-    public void SubjectValueDTO.setUncertaintyType(String uncertaintyType) {
-        this.uncertaintyType = uncertaintyType;
-    }
-    
-    public String SubjectValueDTO.getComments() {
-        return this.comments;
-    }
-    
-    public void SubjectValueDTO.setComments(String comments) {
-        this.comments = comments;
-    }
-    
-    public boolean SubjectValueDTO.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void SubjectValueDTO.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public Date SubjectValueDTO.getRecordedDate() {
-        return this.recordedDate;
-    }
-    
-    public void SubjectValueDTO.setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
-    
-    public Date SubjectValueDTO.getModifiedDate() {
-        return this.modifiedDate;
-    }
-    
-    public void SubjectValueDTO.setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
-    
-    public boolean SubjectValueDTO.isPublicData() {
-        return this.publicData;
-    }
-    
-    public void SubjectValueDTO.setPublicData(boolean publicData) {
-        this.publicData = publicData;
-    }
-    
-    public String SubjectValueDTO.getCodeOrigin() {
-        return this.codeOrigin;
-    }
-    
-    public void SubjectValueDTO.setCodeOrigin(String codeOrigin) {
-        this.codeOrigin = codeOrigin;
-    }
-    
-    public String SubjectValueDTO.getCodeType() {
-        return this.codeType;
-    }
-    
-    public void SubjectValueDTO.setCodeType(String codeType) {
-        this.codeType = codeType;
-    }
-    
-    public String SubjectValueDTO.getCodeKind() {
-        return this.codeKind;
-    }
-    
-    public void SubjectValueDTO.setCodeKind(String codeKind) {
-        this.codeKind = codeKind;
-    }
-    
-    public String SubjectValueDTO.getOperatorType() {
-        return this.operatorType;
-    }
-    
-    public void SubjectValueDTO.setOperatorType(String operatorType) {
-        this.operatorType = operatorType;
-    }
-    
-    public String SubjectValueDTO.getOperatorKind() {
-        return this.operatorKind;
-    }
-    
-    public void SubjectValueDTO.setOperatorKind(String operatorKind) {
-        this.operatorKind = operatorKind;
-    }
-    
-    public String SubjectValueDTO.getUnitType() {
-        return this.unitType;
-    }
-    
-    public void SubjectValueDTO.setUnitType(String unitType) {
-        this.unitType = unitType;
-    }
-    
-    public String SubjectValueDTO.getUnitKind() {
-        return this.unitKind;
-    }
-    
-    public void SubjectValueDTO.setUnitKind(String unitKind) {
-        this.unitKind = unitKind;
-    }
-    
-    public Long SubjectValueDTO.getLsTransaction() {
-        return this.lsTransaction;
-    }
-    
-    public void SubjectValueDTO.setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
-    
-    public String SubjectValueDTO.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void SubjectValueDTO.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public String SubjectValueDTO.getModifiedBy() {
-        return this.modifiedBy;
-    }
-    
-    public void SubjectValueDTO.setModifiedBy(String modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
-    
-    public Long SubjectValueDTO.getStateId() {
-        return this.stateId;
-    }
-    
-    public void SubjectValueDTO.setStateId(Long stateId) {
-        this.stateId = stateId;
-    }
-    
-    public String SubjectValueDTO.getStateType() {
-        return this.stateType;
-    }
-    
-    public void SubjectValueDTO.setStateType(String stateType) {
-        this.stateType = stateType;
-    }
-    
-    public String SubjectValueDTO.getStateKind() {
-        return this.stateKind;
-    }
-    
-    public void SubjectValueDTO.setStateKind(String stateKind) {
-        this.stateKind = stateKind;
-    }
-    
-    public BigDecimal SubjectValueDTO.getConcentration() {
-        return this.concentration;
-    }
-    
-    public void SubjectValueDTO.setConcentration(BigDecimal concentration) {
-        this.concentration = concentration;
-    }
-    
-    public String SubjectValueDTO.getConcUnit() {
-        return this.concUnit;
-    }
-    
-    public void SubjectValueDTO.setConcUnit(String concUnit) {
-        this.concUnit = concUnit;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectValueDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/SubjectValueDTO_Roo_Json.aj
deleted file mode 100755
index 65a69a47f..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectValueDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectValueDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect SubjectValueDTO_Roo_Json {
-    
-    public String SubjectValueDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String SubjectValueDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static SubjectValueDTO SubjectValueDTO.fromJsonToSubjectValueDTO(String json) {
-        return new JSONDeserializer<SubjectValueDTO>()
-        .use(null, SubjectValueDTO.class).deserialize(json);
-    }
-    
-    public static String SubjectValueDTO.toJsonArray(Collection<SubjectValueDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String SubjectValueDTO.toJsonArray(Collection<SubjectValueDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<SubjectValueDTO> SubjectValueDTO.fromJsonArrayToSubjectValueDTO(String json) {
-        return new JSONDeserializer<List<SubjectValueDTO>>()
-        .use("values", SubjectValueDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectValueDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/SubjectValueDTO_Roo_ToString.aj
deleted file mode 100755
index 2fc446cef..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectValueDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectValueDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SubjectValueDTO_Roo_ToString {
-    
-    public String SubjectValueDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectValuePathDTO.java
index 5e5306a6f..35ac7bcbd 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectValuePathDTO.java
@@ -1,14 +1,16 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.SubjectValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -38,6 +40,68 @@ public String toJson() {
 	public static String toJsonArray(Collection<SubjectValuePathDTO> collection) {
         return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
     }
+
+	public static SubjectValuePathDTO fromJsonToSubjectValuePathDTO(String json) {
+        return new JSONDeserializer<SubjectValuePathDTO>()
+        .use(null, SubjectValuePathDTO.class).deserialize(json);
+    }
+
+	public static Collection<SubjectValuePathDTO> fromJsonArrayToSubjectValuePathDTO(String json) {
+        return new JSONDeserializer<List<SubjectValuePathDTO>>()
+        .use("values", SubjectValuePathDTO.class).deserialize(json);
+    }
+
+	public String getIdOrCodeName() {
+        return this.idOrCodeName;
+    }
+
+	public void setIdOrCodeName(String idOrCodeName) {
+        this.idOrCodeName = idOrCodeName;
+    }
+
+	public String getStateType() {
+        return this.stateType;
+    }
+
+	public void setStateType(String stateType) {
+        this.stateType = stateType;
+    }
+
+	public String getStateKind() {
+        return this.stateKind;
+    }
+
+	public void setStateKind(String stateKind) {
+        this.stateKind = stateKind;
+    }
+
+	public String getValueType() {
+        return this.valueType;
+    }
+
+	public void setValueType(String valueType) {
+        this.valueType = valueType;
+    }
+
+	public String getValueKind() {
+        return this.valueKind;
+    }
+
+	public void setValueKind(String valueKind) {
+        this.valueKind = valueKind;
+    }
+
+	public Collection<SubjectValue> getValues() {
+        return this.values;
+    }
+
+	public void setValues(Collection<SubjectValue> values) {
+        this.values = values;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectValuePathDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/SubjectValuePathDTO_Roo_JavaBean.aj
deleted file mode 100644
index 21df1dea6..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectValuePathDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,60 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.dto.SubjectValuePathDTO;
-import java.util.Collection;
-
-privileged aspect SubjectValuePathDTO_Roo_JavaBean {
-    
-    public String SubjectValuePathDTO.getIdOrCodeName() {
-        return this.idOrCodeName;
-    }
-    
-    public void SubjectValuePathDTO.setIdOrCodeName(String idOrCodeName) {
-        this.idOrCodeName = idOrCodeName;
-    }
-    
-    public String SubjectValuePathDTO.getStateType() {
-        return this.stateType;
-    }
-    
-    public void SubjectValuePathDTO.setStateType(String stateType) {
-        this.stateType = stateType;
-    }
-    
-    public String SubjectValuePathDTO.getStateKind() {
-        return this.stateKind;
-    }
-    
-    public void SubjectValuePathDTO.setStateKind(String stateKind) {
-        this.stateKind = stateKind;
-    }
-    
-    public String SubjectValuePathDTO.getValueType() {
-        return this.valueType;
-    }
-    
-    public void SubjectValuePathDTO.setValueType(String valueType) {
-        this.valueType = valueType;
-    }
-    
-    public String SubjectValuePathDTO.getValueKind() {
-        return this.valueKind;
-    }
-    
-    public void SubjectValuePathDTO.setValueKind(String valueKind) {
-        this.valueKind = valueKind;
-    }
-    
-    public Collection<SubjectValue> SubjectValuePathDTO.getValues() {
-        return this.values;
-    }
-    
-    public void SubjectValuePathDTO.setValues(Collection<SubjectValue> values) {
-        this.values = values;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectValuePathDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/SubjectValuePathDTO_Roo_Json.aj
deleted file mode 100644
index f223a2d93..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectValuePathDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectValuePathDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect SubjectValuePathDTO_Roo_Json {
-    
-    public static SubjectValuePathDTO SubjectValuePathDTO.fromJsonToSubjectValuePathDTO(String json) {
-        return new JSONDeserializer<SubjectValuePathDTO>()
-        .use(null, SubjectValuePathDTO.class).deserialize(json);
-    }
-    
-    public static Collection<SubjectValuePathDTO> SubjectValuePathDTO.fromJsonArrayToSubjectValuePathDTO(String json) {
-        return new JSONDeserializer<List<SubjectValuePathDTO>>()
-        .use("values", SubjectValuePathDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectValuePathDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/SubjectValuePathDTO_Roo_ToString.aj
deleted file mode 100644
index beefc9889..000000000
--- a/src/main/java/com/labsynch/labseer/dto/SubjectValuePathDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.SubjectValuePathDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SubjectValuePathDTO_Roo_ToString {
-    
-    public String SubjectValuePathDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TempThingDTO.java b/src/main/java/com/labsynch/labseer/dto/TempThingDTO.java
index c15ae6de6..4f6463b97 100644
--- a/src/main/java/com/labsynch/labseer/dto/TempThingDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TempThingDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.roo.addon.javabean.RooJavaBean;
@@ -24,6 +30,80 @@ public TempThingDTO(){
 	private String codeName;
 	private String tempId;
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static TempThingDTO fromJsonToTempThingDTO(String json) {
+        return new JSONDeserializer<TempThingDTO>()
+        .use(null, TempThingDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<TempThingDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<TempThingDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<TempThingDTO> fromJsonArrayToTempThingDTO(String json) {
+        return new JSONDeserializer<List<TempThingDTO>>()
+        .use("values", TempThingDTO.class).deserialize(json);
+    }
+
+	public Long getParentId() {
+        return this.parentId;
+    }
+
+	public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+	public String getParentCodeName() {
+        return this.parentCodeName;
+    }
+
+	public void setParentCodeName(String parentCodeName) {
+        this.parentCodeName = parentCodeName;
+    }
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public String getCodeName() {
+        return this.codeName;
+    }
+
+	public void setCodeName(String codeName) {
+        this.codeName = codeName;
+    }
+
+	public String getTempId() {
+        return this.tempId;
+    }
+
+	public void setTempId(String tempId) {
+        this.tempId = tempId;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/TempThingDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/TempThingDTO_Roo_JavaBean.aj
deleted file mode 100644
index 695e95296..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TempThingDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,50 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.TempThingDTO;
-
-privileged aspect TempThingDTO_Roo_JavaBean {
-    
-    public Long TempThingDTO.getParentId() {
-        return this.parentId;
-    }
-    
-    public void TempThingDTO.setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-    
-    public String TempThingDTO.getParentCodeName() {
-        return this.parentCodeName;
-    }
-    
-    public void TempThingDTO.setParentCodeName(String parentCodeName) {
-        this.parentCodeName = parentCodeName;
-    }
-    
-    public Long TempThingDTO.getId() {
-        return this.id;
-    }
-    
-    public void TempThingDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-    public String TempThingDTO.getCodeName() {
-        return this.codeName;
-    }
-    
-    public void TempThingDTO.setCodeName(String codeName) {
-        this.codeName = codeName;
-    }
-    
-    public String TempThingDTO.getTempId() {
-        return this.tempId;
-    }
-    
-    public void TempThingDTO.setTempId(String tempId) {
-        this.tempId = tempId;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TempThingDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/TempThingDTO_Roo_Json.aj
deleted file mode 100644
index 6e3108ba3..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TempThingDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.TempThingDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect TempThingDTO_Roo_Json {
-    
-    public String TempThingDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String TempThingDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static TempThingDTO TempThingDTO.fromJsonToTempThingDTO(String json) {
-        return new JSONDeserializer<TempThingDTO>()
-        .use(null, TempThingDTO.class).deserialize(json);
-    }
-    
-    public static String TempThingDTO.toJsonArray(Collection<TempThingDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String TempThingDTO.toJsonArray(Collection<TempThingDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<TempThingDTO> TempThingDTO.fromJsonArrayToTempThingDTO(String json) {
-        return new JSONDeserializer<List<TempThingDTO>>()
-        .use("values", TempThingDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TempThingDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/TempThingDTO_Roo_ToString.aj
deleted file mode 100644
index f41760648..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TempThingDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.TempThingDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect TempThingDTO_Roo_ToString {
-    
-    public String TempThingDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TgDataDTO.java b/src/main/java/com/labsynch/labseer/dto/TgDataDTO.java
index bd439e700..999380eb8 100644
--- a/src/main/java/com/labsynch/labseer/dto/TgDataDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TgDataDTO.java
@@ -11,7 +11,8 @@
 
 import javax.persistence.EntityManager;
 import javax.persistence.TypedQuery;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -23,6 +24,8 @@
 
 import com.labsynch.labseer.domain.SubjectValue;
 import com.labsynch.labseer.domain.TreatmentGroupValue;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
 @RooJavaBean
 @RooToString
@@ -195,4 +198,142 @@ public static Collection<TgDataDTO> getTgData(List<String> curveIds) {
 		return getTgData(makeTgDataDTOsFromCurveIdList(curveIds));
 	}
 	
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static TgDataDTO fromJsonToTgDataDTO(String json) {
+        return new JSONDeserializer<TgDataDTO>()
+        .use(null, TgDataDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<TgDataDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<TgDataDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<TgDataDTO> fromJsonArrayToTgDataDTO(String json) {
+        return new JSONDeserializer<List<TgDataDTO>>()
+        .use("values", TgDataDTO.class).deserialize(json);
+    }
+
+	public String getCurveId() {
+        return this.curveId;
+    }
+
+	public void setCurveId(String curveId) {
+        this.curveId = curveId;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public Long getLsTransaction() {
+        return this.lsTransaction;
+    }
+
+	public void setLsTransaction(Long lsTransaction) {
+        this.lsTransaction = lsTransaction;
+    }
+
+	public Long getTgvId() {
+        return this.tgvId;
+    }
+
+	public void setTgvId(Long tgvId) {
+        this.tgvId = tgvId;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public Integer getNumberOfReplicates() {
+        return this.numberOfReplicates;
+    }
+
+	public void setNumberOfReplicates(Integer numberOfReplicates) {
+        this.numberOfReplicates = numberOfReplicates;
+    }
+
+	public BigDecimal getNumericValue() {
+        return this.numericValue;
+    }
+
+	public void setNumericValue(BigDecimal numericValue) {
+        this.numericValue = numericValue;
+    }
+
+	public String getUnitType() {
+        return this.unitType;
+    }
+
+	public void setUnitType(String unitType) {
+        this.unitType = unitType;
+    }
+
+	public String getUnitKind() {
+        return this.unitKind;
+    }
+
+	public void setUnitKind(String unitKind) {
+        this.unitKind = unitKind;
+    }
+
+	public String getUncertaintyType() {
+        return this.uncertaintyType;
+    }
+
+	public void setUncertaintyType(String uncertaintyType) {
+        this.uncertaintyType = uncertaintyType;
+    }
+
+	public BigDecimal getUncertainty() {
+        return this.uncertainty;
+    }
+
+	public void setUncertainty(BigDecimal uncertainty) {
+        this.uncertainty = uncertainty;
+    }
+
+	public Boolean getPublicData() {
+        return this.publicData;
+    }
+
+	public void setPublicData(Boolean publicData) {
+        this.publicData = publicData;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/TgDataDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/TgDataDTO_Roo_JavaBean.aj
deleted file mode 100644
index f97168b21..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TgDataDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,115 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.TgDataDTO;
-import java.math.BigDecimal;
-
-privileged aspect TgDataDTO_Roo_JavaBean {
-    
-    public String TgDataDTO.getCurveId() {
-        return this.curveId;
-    }
-    
-    public void TgDataDTO.setCurveId(String curveId) {
-        this.curveId = curveId;
-    }
-    
-    public String TgDataDTO.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void TgDataDTO.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public Long TgDataDTO.getLsTransaction() {
-        return this.lsTransaction;
-    }
-    
-    public void TgDataDTO.setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
-    
-    public Long TgDataDTO.getTgvId() {
-        return this.tgvId;
-    }
-    
-    public void TgDataDTO.setTgvId(Long tgvId) {
-        this.tgvId = tgvId;
-    }
-    
-    public String TgDataDTO.getLsType() {
-        return this.lsType;
-    }
-    
-    public void TgDataDTO.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String TgDataDTO.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void TgDataDTO.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public Integer TgDataDTO.getNumberOfReplicates() {
-        return this.numberOfReplicates;
-    }
-    
-    public void TgDataDTO.setNumberOfReplicates(Integer numberOfReplicates) {
-        this.numberOfReplicates = numberOfReplicates;
-    }
-    
-    public BigDecimal TgDataDTO.getNumericValue() {
-        return this.numericValue;
-    }
-    
-    public void TgDataDTO.setNumericValue(BigDecimal numericValue) {
-        this.numericValue = numericValue;
-    }
-    
-    public String TgDataDTO.getUnitType() {
-        return this.unitType;
-    }
-    
-    public void TgDataDTO.setUnitType(String unitType) {
-        this.unitType = unitType;
-    }
-    
-    public String TgDataDTO.getUnitKind() {
-        return this.unitKind;
-    }
-    
-    public void TgDataDTO.setUnitKind(String unitKind) {
-        this.unitKind = unitKind;
-    }
-    
-    public String TgDataDTO.getUncertaintyType() {
-        return this.uncertaintyType;
-    }
-    
-    public void TgDataDTO.setUncertaintyType(String uncertaintyType) {
-        this.uncertaintyType = uncertaintyType;
-    }
-    
-    public BigDecimal TgDataDTO.getUncertainty() {
-        return this.uncertainty;
-    }
-    
-    public void TgDataDTO.setUncertainty(BigDecimal uncertainty) {
-        this.uncertainty = uncertainty;
-    }
-    
-    public Boolean TgDataDTO.getPublicData() {
-        return this.publicData;
-    }
-    
-    public void TgDataDTO.setPublicData(Boolean publicData) {
-        this.publicData = publicData;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TgDataDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/TgDataDTO_Roo_Json.aj
deleted file mode 100644
index b1b4ba0b2..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TgDataDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.TgDataDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect TgDataDTO_Roo_Json {
-    
-    public String TgDataDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String TgDataDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static TgDataDTO TgDataDTO.fromJsonToTgDataDTO(String json) {
-        return new JSONDeserializer<TgDataDTO>()
-        .use(null, TgDataDTO.class).deserialize(json);
-    }
-    
-    public static String TgDataDTO.toJsonArray(Collection<TgDataDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String TgDataDTO.toJsonArray(Collection<TgDataDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<TgDataDTO> TgDataDTO.fromJsonArrayToTgDataDTO(String json) {
-        return new JSONDeserializer<List<TgDataDTO>>()
-        .use("values", TgDataDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TgDataDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/TgDataDTO_Roo_ToString.aj
deleted file mode 100644
index da5c3137f..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TgDataDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.TgDataDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect TgDataDTO_Roo_ToString {
-    
-    public String TgDataDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupCodeDTO.java
index 9166cb4ab..85715b2d0 100644
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupCodeDTO.java
@@ -1,7 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -17,6 +21,56 @@ public class TreatmentGroupCodeDTO {
 	public TreatmentGroupCodeDTO(){
 	}
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static TreatmentGroupCodeDTO fromJsonToTreatmentGroupCodeDTO(String json) {
+        return new JSONDeserializer<TreatmentGroupCodeDTO>()
+        .use(null, TreatmentGroupCodeDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<TreatmentGroupCodeDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<TreatmentGroupCodeDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<TreatmentGroupCodeDTO> fromJsonArrayToTreatmentGroupCoes(String json) {
+        return new JSONDeserializer<List<TreatmentGroupCodeDTO>>()
+        .use("values", TreatmentGroupCodeDTO.class).deserialize(json);
+    }
+
+	public String getTreatmentGroupCode() {
+        return this.treatmentGroupCode;
+    }
+
+	public void setTreatmentGroupCode(String treatmentGroupCode) {
+        this.treatmentGroupCode = treatmentGroupCode;
+    }
+
+	public Collection<AnalysisGroupCodeDTO> getAnalysisGroupCodes() {
+        return this.analysisGroupCodes;
+    }
+
+	public void setAnalysisGroupCodes(Collection<AnalysisGroupCodeDTO> analysisGroupCodes) {
+        this.analysisGroupCodes = analysisGroupCodes;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupCodeDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupCodeDTO_Roo_JavaBean.aj
deleted file mode 100644
index d22da96ad..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupCodeDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,28 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.AnalysisGroupCodeDTO;
-import com.labsynch.labseer.dto.TreatmentGroupCodeDTO;
-import java.util.Collection;
-
-privileged aspect TreatmentGroupCodeDTO_Roo_JavaBean {
-    
-    public String TreatmentGroupCodeDTO.getTreatmentGroupCode() {
-        return this.treatmentGroupCode;
-    }
-    
-    public void TreatmentGroupCodeDTO.setTreatmentGroupCode(String treatmentGroupCode) {
-        this.treatmentGroupCode = treatmentGroupCode;
-    }
-    
-    public Collection<AnalysisGroupCodeDTO> TreatmentGroupCodeDTO.getAnalysisGroupCodes() {
-        return this.analysisGroupCodes;
-    }
-    
-    public void TreatmentGroupCodeDTO.setAnalysisGroupCodes(Collection<AnalysisGroupCodeDTO> analysisGroupCodes) {
-        this.analysisGroupCodes = analysisGroupCodes;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupCodeDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupCodeDTO_Roo_Json.aj
deleted file mode 100644
index 4df938a18..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupCodeDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.TreatmentGroupCodeDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect TreatmentGroupCodeDTO_Roo_Json {
-    
-    public String TreatmentGroupCodeDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String TreatmentGroupCodeDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static TreatmentGroupCodeDTO TreatmentGroupCodeDTO.fromJsonToTreatmentGroupCodeDTO(String json) {
-        return new JSONDeserializer<TreatmentGroupCodeDTO>()
-        .use(null, TreatmentGroupCodeDTO.class).deserialize(json);
-    }
-    
-    public static String TreatmentGroupCodeDTO.toJsonArray(Collection<TreatmentGroupCodeDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String TreatmentGroupCodeDTO.toJsonArray(Collection<TreatmentGroupCodeDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<TreatmentGroupCodeDTO> TreatmentGroupCodeDTO.fromJsonArrayToTreatmentGroupCoes(String json) {
-        return new JSONDeserializer<List<TreatmentGroupCodeDTO>>()
-        .use("values", TreatmentGroupCodeDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupCodeDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupCodeDTO_Roo_ToString.aj
deleted file mode 100644
index 7e34920d2..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupCodeDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.TreatmentGroupCodeDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect TreatmentGroupCodeDTO_Roo_ToString {
-    
-    public String TreatmentGroupCodeDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupMiniDTO.java b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupMiniDTO.java
index 5b3d0f04d..d1aa8a855 100755
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupMiniDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupMiniDTO.java
@@ -1,10 +1,16 @@
 package com.labsynch.labseer.dto;
 
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.TreatmentGroup;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 
 @RooJavaBean
 @RooToString
@@ -24,6 +30,64 @@ public TreatmentGroupMiniDTO(TreatmentGroup treatmentGroup) {
 	private String codeName;
 
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+	public String getCodeName() {
+        return this.codeName;
+    }
+
+	public void setCodeName(String codeName) {
+        this.codeName = codeName;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static TreatmentGroupMiniDTO fromJsonToTreatmentGroupMiniDTO(String json) {
+        return new JSONDeserializer<TreatmentGroupMiniDTO>()
+        .use(null, TreatmentGroupMiniDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<TreatmentGroupMiniDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<TreatmentGroupMiniDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<TreatmentGroupMiniDTO> fromJsonArrayToTreatmentGroes(String json) {
+        return new JSONDeserializer<List<TreatmentGroupMiniDTO>>()
+        .use("values", TreatmentGroupMiniDTO.class).deserialize(json);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupMiniDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupMiniDTO_Roo_JavaBean.aj
deleted file mode 100755
index ebbc689d5..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupMiniDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.TreatmentGroupMiniDTO;
-
-privileged aspect TreatmentGroupMiniDTO_Roo_JavaBean {
-    
-    public Long TreatmentGroupMiniDTO.getId() {
-        return this.id;
-    }
-    
-    public void TreatmentGroupMiniDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer TreatmentGroupMiniDTO.getVersion() {
-        return this.version;
-    }
-    
-    public void TreatmentGroupMiniDTO.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-    public String TreatmentGroupMiniDTO.getCodeName() {
-        return this.codeName;
-    }
-    
-    public void TreatmentGroupMiniDTO.setCodeName(String codeName) {
-        this.codeName = codeName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupMiniDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupMiniDTO_Roo_Json.aj
deleted file mode 100755
index aa87dd1e0..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupMiniDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.TreatmentGroupMiniDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect TreatmentGroupMiniDTO_Roo_Json {
-    
-    public String TreatmentGroupMiniDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String TreatmentGroupMiniDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static TreatmentGroupMiniDTO TreatmentGroupMiniDTO.fromJsonToTreatmentGroupMiniDTO(String json) {
-        return new JSONDeserializer<TreatmentGroupMiniDTO>()
-        .use(null, TreatmentGroupMiniDTO.class).deserialize(json);
-    }
-    
-    public static String TreatmentGroupMiniDTO.toJsonArray(Collection<TreatmentGroupMiniDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String TreatmentGroupMiniDTO.toJsonArray(Collection<TreatmentGroupMiniDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<TreatmentGroupMiniDTO> TreatmentGroupMiniDTO.fromJsonArrayToTreatmentGroes(String json) {
-        return new JSONDeserializer<List<TreatmentGroupMiniDTO>>()
-        .use("values", TreatmentGroupMiniDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupMiniDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupMiniDTO_Roo_ToString.aj
deleted file mode 100755
index 19463b5c9..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupMiniDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.TreatmentGroupMiniDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect TreatmentGroupMiniDTO_Roo_ToString {
-    
-    public String TreatmentGroupMiniDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupStatePathDTO.java b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupStatePathDTO.java
index c5a43c960..c98b8d719 100644
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupStatePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupStatePathDTO.java
@@ -1,14 +1,16 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.TreatmentGroupState;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -34,6 +36,52 @@ public String toJson() {
 	public static String toJsonArray(Collection<TreatmentGroupStatePathDTO> collection) {
         return new JSONSerializer().include("states.lsValues").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
     }
+
+	public String getIdOrCodeName() {
+        return this.idOrCodeName;
+    }
+
+	public void setIdOrCodeName(String idOrCodeName) {
+        this.idOrCodeName = idOrCodeName;
+    }
+
+	public String getStateType() {
+        return this.stateType;
+    }
+
+	public void setStateType(String stateType) {
+        this.stateType = stateType;
+    }
+
+	public String getStateKind() {
+        return this.stateKind;
+    }
+
+	public void setStateKind(String stateKind) {
+        this.stateKind = stateKind;
+    }
+
+	public Collection<TreatmentGroupState> getStates() {
+        return this.states;
+    }
+
+	public void setStates(Collection<TreatmentGroupState> states) {
+        this.states = states;
+    }
+
+	public static TreatmentGroupStatePathDTO fromJsonToTreatmentGroupStatePathDTO(String json) {
+        return new JSONDeserializer<TreatmentGroupStatePathDTO>()
+        .use(null, TreatmentGroupStatePathDTO.class).deserialize(json);
+    }
+
+	public static Collection<TreatmentGroupStatePathDTO> fromJsonArrayToTreatmentGroes(String json) {
+        return new JSONDeserializer<List<TreatmentGroupStatePathDTO>>()
+        .use("values", TreatmentGroupStatePathDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupStatePathDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupStatePathDTO_Roo_JavaBean.aj
deleted file mode 100644
index 47f9ae7ad..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupStatePathDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,44 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.TreatmentGroupState;
-import com.labsynch.labseer.dto.TreatmentGroupStatePathDTO;
-import java.util.Collection;
-
-privileged aspect TreatmentGroupStatePathDTO_Roo_JavaBean {
-    
-    public String TreatmentGroupStatePathDTO.getIdOrCodeName() {
-        return this.idOrCodeName;
-    }
-    
-    public void TreatmentGroupStatePathDTO.setIdOrCodeName(String idOrCodeName) {
-        this.idOrCodeName = idOrCodeName;
-    }
-    
-    public String TreatmentGroupStatePathDTO.getStateType() {
-        return this.stateType;
-    }
-    
-    public void TreatmentGroupStatePathDTO.setStateType(String stateType) {
-        this.stateType = stateType;
-    }
-    
-    public String TreatmentGroupStatePathDTO.getStateKind() {
-        return this.stateKind;
-    }
-    
-    public void TreatmentGroupStatePathDTO.setStateKind(String stateKind) {
-        this.stateKind = stateKind;
-    }
-    
-    public Collection<TreatmentGroupState> TreatmentGroupStatePathDTO.getStates() {
-        return this.states;
-    }
-    
-    public void TreatmentGroupStatePathDTO.setStates(Collection<TreatmentGroupState> states) {
-        this.states = states;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupStatePathDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupStatePathDTO_Roo_Json.aj
deleted file mode 100644
index 37611ebc3..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupStatePathDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.TreatmentGroupStatePathDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect TreatmentGroupStatePathDTO_Roo_Json {
-    
-    public static TreatmentGroupStatePathDTO TreatmentGroupStatePathDTO.fromJsonToTreatmentGroupStatePathDTO(String json) {
-        return new JSONDeserializer<TreatmentGroupStatePathDTO>()
-        .use(null, TreatmentGroupStatePathDTO.class).deserialize(json);
-    }
-    
-    public static Collection<TreatmentGroupStatePathDTO> TreatmentGroupStatePathDTO.fromJsonArrayToTreatmentGroes(String json) {
-        return new JSONDeserializer<List<TreatmentGroupStatePathDTO>>()
-        .use("values", TreatmentGroupStatePathDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupStatePathDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupStatePathDTO_Roo_ToString.aj
deleted file mode 100644
index 53aed1e6e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupStatePathDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.TreatmentGroupStatePathDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect TreatmentGroupStatePathDTO_Roo_ToString {
-    
-    public String TreatmentGroupStatePathDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValueDTO.java b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValueDTO.java
index 13680470c..102b2f00c 100644
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValueDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValueDTO.java
@@ -1,14 +1,19 @@
 package com.labsynch.labseer.dto;
 
 import java.math.BigDecimal;
+import java.util.Collection;
 import java.util.Date;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.TreatmentGroupState;
 import com.labsynch.labseer.domain.TreatmentGroupValue;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
 @RooJavaBean
 @RooToString
@@ -117,5 +122,351 @@ public boolean getPublicData() {
 		return this.isPublicData();
 	}
 
+
+	public Long getAnalysisGroupId() {
+        return this.analysisGroupId;
+    }
+
+	public void setAnalysisGroupId(Long analysisGroupId) {
+        this.analysisGroupId = analysisGroupId;
+    }
+
+	public Long getTreatmentGroupId() {
+        return this.treatmentGroupId;
+    }
+
+	public void setTreatmentGroupId(Long treatmentGroupId) {
+        this.treatmentGroupId = treatmentGroupId;
+    }
+
+	public TreatmentGroupState getLsState() {
+        return this.lsState;
+    }
+
+	public void setLsState(TreatmentGroupState lsState) {
+        this.lsState = lsState;
+    }
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public String getLsTypeAndKind() {
+        return this.lsTypeAndKind;
+    }
+
+	public void setLsTypeAndKind(String lsTypeAndKind) {
+        this.lsTypeAndKind = lsTypeAndKind;
+    }
+
+	public String getStringValue() {
+        return this.stringValue;
+    }
+
+	public void setStringValue(String stringValue) {
+        this.stringValue = stringValue;
+    }
+
+	public String getCodeValue() {
+        return this.codeValue;
+    }
+
+	public void setCodeValue(String codeValue) {
+        this.codeValue = codeValue;
+    }
+
+	public String getFileValue() {
+        return this.fileValue;
+    }
+
+	public void setFileValue(String fileValue) {
+        this.fileValue = fileValue;
+    }
+
+	public String getUrlValue() {
+        return this.urlValue;
+    }
+
+	public void setUrlValue(String urlValue) {
+        this.urlValue = urlValue;
+    }
+
+	public Date getDateValue() {
+        return this.dateValue;
+    }
+
+	public void setDateValue(Date dateValue) {
+        this.dateValue = dateValue;
+    }
+
+	public String getClobValue() {
+        return this.clobValue;
+    }
+
+	public void setClobValue(String clobValue) {
+        this.clobValue = clobValue;
+    }
+
+	public byte[] getBlobValue() {
+        return this.blobValue;
+    }
+
+	public void setBlobValue(byte[] blobValue) {
+        this.blobValue = blobValue;
+    }
+
+	public BigDecimal getNumericValue() {
+        return this.numericValue;
+    }
+
+	public void setNumericValue(BigDecimal numericValue) {
+        this.numericValue = numericValue;
+    }
+
+	public Integer getSigFigs() {
+        return this.sigFigs;
+    }
+
+	public void setSigFigs(Integer sigFigs) {
+        this.sigFigs = sigFigs;
+    }
+
+	public BigDecimal getUncertainty() {
+        return this.uncertainty;
+    }
+
+	public void setUncertainty(BigDecimal uncertainty) {
+        this.uncertainty = uncertainty;
+    }
+
+	public Integer getNumberOfReplicates() {
+        return this.numberOfReplicates;
+    }
+
+	public void setNumberOfReplicates(Integer numberOfReplicates) {
+        this.numberOfReplicates = numberOfReplicates;
+    }
+
+	public String getUncertaintyType() {
+        return this.uncertaintyType;
+    }
+
+	public void setUncertaintyType(String uncertaintyType) {
+        this.uncertaintyType = uncertaintyType;
+    }
+
+	public String getComments() {
+        return this.comments;
+    }
+
+	public void setComments(String comments) {
+        this.comments = comments;
+    }
+
+	public boolean isIgnored() {
+        return this.ignored;
+    }
+
+	public void setIgnored(boolean ignored) {
+        this.ignored = ignored;
+    }
+
+	public Date getRecordedDate() {
+        return this.recordedDate;
+    }
+
+	public void setRecordedDate(Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+	public Date getModifiedDate() {
+        return this.modifiedDate;
+    }
+
+	public void setModifiedDate(Date modifiedDate) {
+        this.modifiedDate = modifiedDate;
+    }
+
+	public boolean isPublicData() {
+        return this.publicData;
+    }
+
+	public void setPublicData(boolean publicData) {
+        this.publicData = publicData;
+    }
+
+	public String getCodeOrigin() {
+        return this.codeOrigin;
+    }
+
+	public void setCodeOrigin(String codeOrigin) {
+        this.codeOrigin = codeOrigin;
+    }
+
+	public String getCodeType() {
+        return this.codeType;
+    }
+
+	public void setCodeType(String codeType) {
+        this.codeType = codeType;
+    }
+
+	public String getCodeKind() {
+        return this.codeKind;
+    }
+
+	public void setCodeKind(String codeKind) {
+        this.codeKind = codeKind;
+    }
+
+	public String getOperatorType() {
+        return this.operatorType;
+    }
+
+	public void setOperatorType(String operatorType) {
+        this.operatorType = operatorType;
+    }
+
+	public String getOperatorKind() {
+        return this.operatorKind;
+    }
+
+	public void setOperatorKind(String operatorKind) {
+        this.operatorKind = operatorKind;
+    }
+
+	public String getUnitType() {
+        return this.unitType;
+    }
+
+	public void setUnitType(String unitType) {
+        this.unitType = unitType;
+    }
+
+	public String getUnitKind() {
+        return this.unitKind;
+    }
+
+	public void setUnitKind(String unitKind) {
+        this.unitKind = unitKind;
+    }
+
+	public Long getLsTransaction() {
+        return this.lsTransaction;
+    }
+
+	public void setLsTransaction(Long lsTransaction) {
+        this.lsTransaction = lsTransaction;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public String getModifiedBy() {
+        return this.modifiedBy;
+    }
+
+	public void setModifiedBy(String modifiedBy) {
+        this.modifiedBy = modifiedBy;
+    }
+
+	public Long getStateId() {
+        return this.stateId;
+    }
+
+	public void setStateId(Long stateId) {
+        this.stateId = stateId;
+    }
+
+	public String getStateType() {
+        return this.stateType;
+    }
+
+	public void setStateType(String stateType) {
+        this.stateType = stateType;
+    }
+
+	public String getStateKind() {
+        return this.stateKind;
+    }
+
+	public void setStateKind(String stateKind) {
+        this.stateKind = stateKind;
+    }
+
+	public BigDecimal getConcentration() {
+        return this.concentration;
+    }
+
+	public void setConcentration(BigDecimal concentration) {
+        this.concentration = concentration;
+    }
+
+	public String getConcUnit() {
+        return this.concUnit;
+    }
+
+	public void setConcUnit(String concUnit) {
+        this.concUnit = concUnit;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static TreatmentGroupValueDTO fromJsonToTreatmentGroupValueDTO(String json) {
+        return new JSONDeserializer<TreatmentGroupValueDTO>()
+        .use(null, TreatmentGroupValueDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<TreatmentGroupValueDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<TreatmentGroupValueDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<TreatmentGroupValueDTO> fromJsonArrayToTreatmentGroes(String json) {
+        return new JSONDeserializer<List<TreatmentGroupValueDTO>>()
+        .use("values", TreatmentGroupValueDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValueDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValueDTO_Roo_JavaBean.aj
deleted file mode 100644
index 6833e6ab9..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValueDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,325 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.TreatmentGroupState;
-import com.labsynch.labseer.dto.TreatmentGroupValueDTO;
-import java.math.BigDecimal;
-import java.util.Date;
-
-privileged aspect TreatmentGroupValueDTO_Roo_JavaBean {
-    
-    public Long TreatmentGroupValueDTO.getAnalysisGroupId() {
-        return this.analysisGroupId;
-    }
-    
-    public void TreatmentGroupValueDTO.setAnalysisGroupId(Long analysisGroupId) {
-        this.analysisGroupId = analysisGroupId;
-    }
-    
-    public Long TreatmentGroupValueDTO.getTreatmentGroupId() {
-        return this.treatmentGroupId;
-    }
-    
-    public void TreatmentGroupValueDTO.setTreatmentGroupId(Long treatmentGroupId) {
-        this.treatmentGroupId = treatmentGroupId;
-    }
-    
-    public TreatmentGroupState TreatmentGroupValueDTO.getLsState() {
-        return this.lsState;
-    }
-    
-    public void TreatmentGroupValueDTO.setLsState(TreatmentGroupState lsState) {
-        this.lsState = lsState;
-    }
-    
-    public Long TreatmentGroupValueDTO.getId() {
-        return this.id;
-    }
-    
-    public void TreatmentGroupValueDTO.setId(Long id) {
-        this.id = id;
-    }
-    
-    public String TreatmentGroupValueDTO.getLsType() {
-        return this.lsType;
-    }
-    
-    public void TreatmentGroupValueDTO.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String TreatmentGroupValueDTO.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void TreatmentGroupValueDTO.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public String TreatmentGroupValueDTO.getLsTypeAndKind() {
-        return this.lsTypeAndKind;
-    }
-    
-    public void TreatmentGroupValueDTO.setLsTypeAndKind(String lsTypeAndKind) {
-        this.lsTypeAndKind = lsTypeAndKind;
-    }
-    
-    public String TreatmentGroupValueDTO.getStringValue() {
-        return this.stringValue;
-    }
-    
-    public void TreatmentGroupValueDTO.setStringValue(String stringValue) {
-        this.stringValue = stringValue;
-    }
-    
-    public String TreatmentGroupValueDTO.getCodeValue() {
-        return this.codeValue;
-    }
-    
-    public void TreatmentGroupValueDTO.setCodeValue(String codeValue) {
-        this.codeValue = codeValue;
-    }
-    
-    public String TreatmentGroupValueDTO.getFileValue() {
-        return this.fileValue;
-    }
-    
-    public void TreatmentGroupValueDTO.setFileValue(String fileValue) {
-        this.fileValue = fileValue;
-    }
-    
-    public String TreatmentGroupValueDTO.getUrlValue() {
-        return this.urlValue;
-    }
-    
-    public void TreatmentGroupValueDTO.setUrlValue(String urlValue) {
-        this.urlValue = urlValue;
-    }
-    
-    public Date TreatmentGroupValueDTO.getDateValue() {
-        return this.dateValue;
-    }
-    
-    public void TreatmentGroupValueDTO.setDateValue(Date dateValue) {
-        this.dateValue = dateValue;
-    }
-    
-    public String TreatmentGroupValueDTO.getClobValue() {
-        return this.clobValue;
-    }
-    
-    public void TreatmentGroupValueDTO.setClobValue(String clobValue) {
-        this.clobValue = clobValue;
-    }
-    
-    public byte[] TreatmentGroupValueDTO.getBlobValue() {
-        return this.blobValue;
-    }
-    
-    public void TreatmentGroupValueDTO.setBlobValue(byte[] blobValue) {
-        this.blobValue = blobValue;
-    }
-    
-    public BigDecimal TreatmentGroupValueDTO.getNumericValue() {
-        return this.numericValue;
-    }
-    
-    public void TreatmentGroupValueDTO.setNumericValue(BigDecimal numericValue) {
-        this.numericValue = numericValue;
-    }
-    
-    public Integer TreatmentGroupValueDTO.getSigFigs() {
-        return this.sigFigs;
-    }
-    
-    public void TreatmentGroupValueDTO.setSigFigs(Integer sigFigs) {
-        this.sigFigs = sigFigs;
-    }
-    
-    public BigDecimal TreatmentGroupValueDTO.getUncertainty() {
-        return this.uncertainty;
-    }
-    
-    public void TreatmentGroupValueDTO.setUncertainty(BigDecimal uncertainty) {
-        this.uncertainty = uncertainty;
-    }
-    
-    public Integer TreatmentGroupValueDTO.getNumberOfReplicates() {
-        return this.numberOfReplicates;
-    }
-    
-    public void TreatmentGroupValueDTO.setNumberOfReplicates(Integer numberOfReplicates) {
-        this.numberOfReplicates = numberOfReplicates;
-    }
-    
-    public String TreatmentGroupValueDTO.getUncertaintyType() {
-        return this.uncertaintyType;
-    }
-    
-    public void TreatmentGroupValueDTO.setUncertaintyType(String uncertaintyType) {
-        this.uncertaintyType = uncertaintyType;
-    }
-    
-    public String TreatmentGroupValueDTO.getComments() {
-        return this.comments;
-    }
-    
-    public void TreatmentGroupValueDTO.setComments(String comments) {
-        this.comments = comments;
-    }
-    
-    public boolean TreatmentGroupValueDTO.isIgnored() {
-        return this.ignored;
-    }
-    
-    public void TreatmentGroupValueDTO.setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
-    
-    public Date TreatmentGroupValueDTO.getRecordedDate() {
-        return this.recordedDate;
-    }
-    
-    public void TreatmentGroupValueDTO.setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
-    
-    public Date TreatmentGroupValueDTO.getModifiedDate() {
-        return this.modifiedDate;
-    }
-    
-    public void TreatmentGroupValueDTO.setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
-    
-    public boolean TreatmentGroupValueDTO.isPublicData() {
-        return this.publicData;
-    }
-    
-    public void TreatmentGroupValueDTO.setPublicData(boolean publicData) {
-        this.publicData = publicData;
-    }
-    
-    public String TreatmentGroupValueDTO.getCodeOrigin() {
-        return this.codeOrigin;
-    }
-    
-    public void TreatmentGroupValueDTO.setCodeOrigin(String codeOrigin) {
-        this.codeOrigin = codeOrigin;
-    }
-    
-    public String TreatmentGroupValueDTO.getCodeType() {
-        return this.codeType;
-    }
-    
-    public void TreatmentGroupValueDTO.setCodeType(String codeType) {
-        this.codeType = codeType;
-    }
-    
-    public String TreatmentGroupValueDTO.getCodeKind() {
-        return this.codeKind;
-    }
-    
-    public void TreatmentGroupValueDTO.setCodeKind(String codeKind) {
-        this.codeKind = codeKind;
-    }
-    
-    public String TreatmentGroupValueDTO.getOperatorType() {
-        return this.operatorType;
-    }
-    
-    public void TreatmentGroupValueDTO.setOperatorType(String operatorType) {
-        this.operatorType = operatorType;
-    }
-    
-    public String TreatmentGroupValueDTO.getOperatorKind() {
-        return this.operatorKind;
-    }
-    
-    public void TreatmentGroupValueDTO.setOperatorKind(String operatorKind) {
-        this.operatorKind = operatorKind;
-    }
-    
-    public String TreatmentGroupValueDTO.getUnitType() {
-        return this.unitType;
-    }
-    
-    public void TreatmentGroupValueDTO.setUnitType(String unitType) {
-        this.unitType = unitType;
-    }
-    
-    public String TreatmentGroupValueDTO.getUnitKind() {
-        return this.unitKind;
-    }
-    
-    public void TreatmentGroupValueDTO.setUnitKind(String unitKind) {
-        this.unitKind = unitKind;
-    }
-    
-    public Long TreatmentGroupValueDTO.getLsTransaction() {
-        return this.lsTransaction;
-    }
-    
-    public void TreatmentGroupValueDTO.setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
-    
-    public String TreatmentGroupValueDTO.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void TreatmentGroupValueDTO.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public String TreatmentGroupValueDTO.getModifiedBy() {
-        return this.modifiedBy;
-    }
-    
-    public void TreatmentGroupValueDTO.setModifiedBy(String modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
-    
-    public Long TreatmentGroupValueDTO.getStateId() {
-        return this.stateId;
-    }
-    
-    public void TreatmentGroupValueDTO.setStateId(Long stateId) {
-        this.stateId = stateId;
-    }
-    
-    public String TreatmentGroupValueDTO.getStateType() {
-        return this.stateType;
-    }
-    
-    public void TreatmentGroupValueDTO.setStateType(String stateType) {
-        this.stateType = stateType;
-    }
-    
-    public String TreatmentGroupValueDTO.getStateKind() {
-        return this.stateKind;
-    }
-    
-    public void TreatmentGroupValueDTO.setStateKind(String stateKind) {
-        this.stateKind = stateKind;
-    }
-    
-    public BigDecimal TreatmentGroupValueDTO.getConcentration() {
-        return this.concentration;
-    }
-    
-    public void TreatmentGroupValueDTO.setConcentration(BigDecimal concentration) {
-        this.concentration = concentration;
-    }
-    
-    public String TreatmentGroupValueDTO.getConcUnit() {
-        return this.concUnit;
-    }
-    
-    public void TreatmentGroupValueDTO.setConcUnit(String concUnit) {
-        this.concUnit = concUnit;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValueDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValueDTO_Roo_Json.aj
deleted file mode 100644
index 0ba97f857..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValueDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.TreatmentGroupValueDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect TreatmentGroupValueDTO_Roo_Json {
-    
-    public String TreatmentGroupValueDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String TreatmentGroupValueDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static TreatmentGroupValueDTO TreatmentGroupValueDTO.fromJsonToTreatmentGroupValueDTO(String json) {
-        return new JSONDeserializer<TreatmentGroupValueDTO>()
-        .use(null, TreatmentGroupValueDTO.class).deserialize(json);
-    }
-    
-    public static String TreatmentGroupValueDTO.toJsonArray(Collection<TreatmentGroupValueDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String TreatmentGroupValueDTO.toJsonArray(Collection<TreatmentGroupValueDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<TreatmentGroupValueDTO> TreatmentGroupValueDTO.fromJsonArrayToTreatmentGroes(String json) {
-        return new JSONDeserializer<List<TreatmentGroupValueDTO>>()
-        .use("values", TreatmentGroupValueDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValueDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValueDTO_Roo_ToString.aj
deleted file mode 100644
index e7a78be1e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValueDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.TreatmentGroupValueDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect TreatmentGroupValueDTO_Roo_ToString {
-    
-    public String TreatmentGroupValueDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValuePathDTO.java
index 4a728800e..5487205c7 100644
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValuePathDTO.java
@@ -1,14 +1,16 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.TreatmentGroupValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -38,6 +40,68 @@ public String toJson() {
 	public static String toJsonArray(Collection<TreatmentGroupValuePathDTO> collection) {
         return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
     }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getIdOrCodeName() {
+        return this.idOrCodeName;
+    }
+
+	public void setIdOrCodeName(String idOrCodeName) {
+        this.idOrCodeName = idOrCodeName;
+    }
+
+	public String getStateType() {
+        return this.stateType;
+    }
+
+	public void setStateType(String stateType) {
+        this.stateType = stateType;
+    }
+
+	public String getStateKind() {
+        return this.stateKind;
+    }
+
+	public void setStateKind(String stateKind) {
+        this.stateKind = stateKind;
+    }
+
+	public String getValueType() {
+        return this.valueType;
+    }
+
+	public void setValueType(String valueType) {
+        this.valueType = valueType;
+    }
+
+	public String getValueKind() {
+        return this.valueKind;
+    }
+
+	public void setValueKind(String valueKind) {
+        this.valueKind = valueKind;
+    }
+
+	public Collection<TreatmentGroupValue> getValues() {
+        return this.values;
+    }
+
+	public void setValues(Collection<TreatmentGroupValue> values) {
+        this.values = values;
+    }
+
+	public static TreatmentGroupValuePathDTO fromJsonToTreatmentGroupValuePathDTO(String json) {
+        return new JSONDeserializer<TreatmentGroupValuePathDTO>()
+        .use(null, TreatmentGroupValuePathDTO.class).deserialize(json);
+    }
+
+	public static Collection<TreatmentGroupValuePathDTO> fromJsonArrayToTreatmentGroes(String json) {
+        return new JSONDeserializer<List<TreatmentGroupValuePathDTO>>()
+        .use("values", TreatmentGroupValuePathDTO.class).deserialize(json);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValuePathDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValuePathDTO_Roo_JavaBean.aj
deleted file mode 100644
index c5bfde440..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValuePathDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,60 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.TreatmentGroupValue;
-import com.labsynch.labseer.dto.TreatmentGroupValuePathDTO;
-import java.util.Collection;
-
-privileged aspect TreatmentGroupValuePathDTO_Roo_JavaBean {
-    
-    public String TreatmentGroupValuePathDTO.getIdOrCodeName() {
-        return this.idOrCodeName;
-    }
-    
-    public void TreatmentGroupValuePathDTO.setIdOrCodeName(String idOrCodeName) {
-        this.idOrCodeName = idOrCodeName;
-    }
-    
-    public String TreatmentGroupValuePathDTO.getStateType() {
-        return this.stateType;
-    }
-    
-    public void TreatmentGroupValuePathDTO.setStateType(String stateType) {
-        this.stateType = stateType;
-    }
-    
-    public String TreatmentGroupValuePathDTO.getStateKind() {
-        return this.stateKind;
-    }
-    
-    public void TreatmentGroupValuePathDTO.setStateKind(String stateKind) {
-        this.stateKind = stateKind;
-    }
-    
-    public String TreatmentGroupValuePathDTO.getValueType() {
-        return this.valueType;
-    }
-    
-    public void TreatmentGroupValuePathDTO.setValueType(String valueType) {
-        this.valueType = valueType;
-    }
-    
-    public String TreatmentGroupValuePathDTO.getValueKind() {
-        return this.valueKind;
-    }
-    
-    public void TreatmentGroupValuePathDTO.setValueKind(String valueKind) {
-        this.valueKind = valueKind;
-    }
-    
-    public Collection<TreatmentGroupValue> TreatmentGroupValuePathDTO.getValues() {
-        return this.values;
-    }
-    
-    public void TreatmentGroupValuePathDTO.setValues(Collection<TreatmentGroupValue> values) {
-        this.values = values;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValuePathDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValuePathDTO_Roo_Json.aj
deleted file mode 100644
index 4bed0ac2d..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValuePathDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.TreatmentGroupValuePathDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect TreatmentGroupValuePathDTO_Roo_Json {
-    
-    public static TreatmentGroupValuePathDTO TreatmentGroupValuePathDTO.fromJsonToTreatmentGroupValuePathDTO(String json) {
-        return new JSONDeserializer<TreatmentGroupValuePathDTO>()
-        .use(null, TreatmentGroupValuePathDTO.class).deserialize(json);
-    }
-    
-    public static Collection<TreatmentGroupValuePathDTO> TreatmentGroupValuePathDTO.fromJsonArrayToTreatmentGroes(String json) {
-        return new JSONDeserializer<List<TreatmentGroupValuePathDTO>>()
-        .use("values", TreatmentGroupValuePathDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValuePathDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValuePathDTO_Roo_ToString.aj
deleted file mode 100644
index 9fdb649d1..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValuePathDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.TreatmentGroupValuePathDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect TreatmentGroupValuePathDTO_Roo_ToString {
-    
-    public String TreatmentGroupValuePathDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TsvLoaderResponseDTO.java b/src/main/java/com/labsynch/labseer/dto/TsvLoaderResponseDTO.java
index af6b1f40c..ced726cea 100644
--- a/src/main/java/com/labsynch/labseer/dto/TsvLoaderResponseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TsvLoaderResponseDTO.java
@@ -1,13 +1,15 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -35,6 +37,44 @@ public static String toJsonArray(Collection<TsvLoaderResponseDTO> collection) {
         return new JSONSerializer().include("analysisGroups","treatmentGroups","subjects").exclude("*.class").serialize(collection);
     }
 
+
+	public static TsvLoaderResponseDTO fromJsonToTsvLoaderResponseDTO(String json) {
+        return new JSONDeserializer<TsvLoaderResponseDTO>()
+        .use(null, TsvLoaderResponseDTO.class).deserialize(json);
+    }
+
+	public static Collection<TsvLoaderResponseDTO> fromJsonArrayToTsvLoaderRespoes(String json) {
+        return new JSONDeserializer<List<TsvLoaderResponseDTO>>()
+        .use("values", TsvLoaderResponseDTO.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public Collection<TempThingDTO> getAnalysisGroups() {
+        return this.analysisGroups;
+    }
+
+	public void setAnalysisGroups(Collection<TempThingDTO> analysisGroups) {
+        this.analysisGroups = analysisGroups;
+    }
+
+	public Collection<TempThingDTO> getTreatmentGroups() {
+        return this.treatmentGroups;
+    }
+
+	public void setTreatmentGroups(Collection<TempThingDTO> treatmentGroups) {
+        this.treatmentGroups = treatmentGroups;
+    }
+
+	public Collection<TempThingDTO> getSubjects() {
+        return this.subjects;
+    }
+
+	public void setSubjects(Collection<TempThingDTO> subjects) {
+        this.subjects = subjects;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/TsvLoaderResponseDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/TsvLoaderResponseDTO_Roo_JavaBean.aj
deleted file mode 100644
index 8543f43ba..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TsvLoaderResponseDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,36 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.TempThingDTO;
-import com.labsynch.labseer.dto.TsvLoaderResponseDTO;
-import java.util.Collection;
-
-privileged aspect TsvLoaderResponseDTO_Roo_JavaBean {
-    
-    public Collection<TempThingDTO> TsvLoaderResponseDTO.getAnalysisGroups() {
-        return this.analysisGroups;
-    }
-    
-    public void TsvLoaderResponseDTO.setAnalysisGroups(Collection<TempThingDTO> analysisGroups) {
-        this.analysisGroups = analysisGroups;
-    }
-    
-    public Collection<TempThingDTO> TsvLoaderResponseDTO.getTreatmentGroups() {
-        return this.treatmentGroups;
-    }
-    
-    public void TsvLoaderResponseDTO.setTreatmentGroups(Collection<TempThingDTO> treatmentGroups) {
-        this.treatmentGroups = treatmentGroups;
-    }
-    
-    public Collection<TempThingDTO> TsvLoaderResponseDTO.getSubjects() {
-        return this.subjects;
-    }
-    
-    public void TsvLoaderResponseDTO.setSubjects(Collection<TempThingDTO> subjects) {
-        this.subjects = subjects;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TsvLoaderResponseDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/TsvLoaderResponseDTO_Roo_Json.aj
deleted file mode 100644
index bb87fea95..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TsvLoaderResponseDTO_Roo_Json.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.TsvLoaderResponseDTO;
-import flexjson.JSONDeserializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect TsvLoaderResponseDTO_Roo_Json {
-    
-    public static TsvLoaderResponseDTO TsvLoaderResponseDTO.fromJsonToTsvLoaderResponseDTO(String json) {
-        return new JSONDeserializer<TsvLoaderResponseDTO>()
-        .use(null, TsvLoaderResponseDTO.class).deserialize(json);
-    }
-    
-    public static Collection<TsvLoaderResponseDTO> TsvLoaderResponseDTO.fromJsonArrayToTsvLoaderRespoes(String json) {
-        return new JSONDeserializer<List<TsvLoaderResponseDTO>>()
-        .use("values", TsvLoaderResponseDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TsvLoaderResponseDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/TsvLoaderResponseDTO_Roo_ToString.aj
deleted file mode 100644
index 44c32ac20..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TsvLoaderResponseDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.TsvLoaderResponseDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect TsvLoaderResponseDTO_Roo_ToString {
-    
-    public String TsvLoaderResponseDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TypeDTO.java b/src/main/java/com/labsynch/labseer/dto/TypeDTO.java
index bbd1ad886..2bc6b24b8 100644
--- a/src/main/java/com/labsynch/labseer/dto/TypeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TypeDTO.java
@@ -3,7 +3,8 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import javax.persistence.NoResultException;
@@ -23,6 +24,8 @@
 import com.labsynch.labseer.domain.ThingType;
 import com.labsynch.labseer.domain.UnitType;
 import com.labsynch.labseer.domain.ValueType;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
 @RooJavaBean
 @RooToString
@@ -249,6 +252,48 @@ public static Collection<RoleType> getOrCreateRoleTypes(
 		}
 		return roleTypes;
 	}
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getTypeName() {
+        return this.typeName;
+    }
+
+	public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static TypeDTO fromJsonToTypeDTO(String json) {
+        return new JSONDeserializer<TypeDTO>()
+        .use(null, TypeDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<TypeDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<TypeDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<TypeDTO> fromJsonArrayToTypeDTO(String json) {
+        return new JSONDeserializer<List<TypeDTO>>()
+        .use("values", TypeDTO.class).deserialize(json);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/TypeDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/TypeDTO_Roo_JavaBean.aj
deleted file mode 100644
index 26017e114..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TypeDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,18 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.TypeDTO;
-
-privileged aspect TypeDTO_Roo_JavaBean {
-    
-    public String TypeDTO.getTypeName() {
-        return this.typeName;
-    }
-    
-    public void TypeDTO.setTypeName(String typeName) {
-        this.typeName = typeName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TypeDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/TypeDTO_Roo_Json.aj
deleted file mode 100644
index 05d739c91..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TypeDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.TypeDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect TypeDTO_Roo_Json {
-    
-    public String TypeDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String TypeDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static TypeDTO TypeDTO.fromJsonToTypeDTO(String json) {
-        return new JSONDeserializer<TypeDTO>()
-        .use(null, TypeDTO.class).deserialize(json);
-    }
-    
-    public static String TypeDTO.toJsonArray(Collection<TypeDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String TypeDTO.toJsonArray(Collection<TypeDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<TypeDTO> TypeDTO.fromJsonArrayToTypeDTO(String json) {
-        return new JSONDeserializer<List<TypeDTO>>()
-        .use("values", TypeDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TypeDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/TypeDTO_Roo_ToString.aj
deleted file mode 100644
index 70b74d595..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TypeDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.TypeDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect TypeDTO_Roo_ToString {
-    
-    public String TypeDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TypeKindDTO.java b/src/main/java/com/labsynch/labseer/dto/TypeKindDTO.java
index 5a21fd85a..ab66dddf9 100644
--- a/src/main/java/com/labsynch/labseer/dto/TypeKindDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TypeKindDTO.java
@@ -3,7 +3,8 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import javax.persistence.NoResultException;
@@ -35,6 +36,8 @@
 import com.labsynch.labseer.domain.UnitType;
 import com.labsynch.labseer.domain.ValueKind;
 import com.labsynch.labseer.domain.ValueType;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
 @RooJavaBean
 @RooToString
@@ -363,6 +366,56 @@ public static Collection<RoleKind> getOrCreateRoleKinds(
 	
 	
 	
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static TypeKindDTO fromJsonToTypeKindDTO(String json) {
+        return new JSONDeserializer<TypeKindDTO>()
+        .use(null, TypeKindDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<TypeKindDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<TypeKindDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<TypeKindDTO> fromJsonArrayToTypeKindDTO(String json) {
+        return new JSONDeserializer<List<TypeKindDTO>>()
+        .use("values", TypeKindDTO.class).deserialize(json);
+    }
+
+	public String getTypeName() {
+        return this.typeName;
+    }
+
+	public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+	public String getKindName() {
+        return this.kindName;
+    }
+
+	public void setKindName(String kindName) {
+        this.kindName = kindName;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/TypeKindDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/TypeKindDTO_Roo_JavaBean.aj
deleted file mode 100644
index 7d62f2162..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TypeKindDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.TypeKindDTO;
-
-privileged aspect TypeKindDTO_Roo_JavaBean {
-    
-    public String TypeKindDTO.getTypeName() {
-        return this.typeName;
-    }
-    
-    public void TypeKindDTO.setTypeName(String typeName) {
-        this.typeName = typeName;
-    }
-    
-    public String TypeKindDTO.getKindName() {
-        return this.kindName;
-    }
-    
-    public void TypeKindDTO.setKindName(String kindName) {
-        this.kindName = kindName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TypeKindDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/TypeKindDTO_Roo_Json.aj
deleted file mode 100644
index db4632826..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TypeKindDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.TypeKindDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect TypeKindDTO_Roo_Json {
-    
-    public String TypeKindDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String TypeKindDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static TypeKindDTO TypeKindDTO.fromJsonToTypeKindDTO(String json) {
-        return new JSONDeserializer<TypeKindDTO>()
-        .use(null, TypeKindDTO.class).deserialize(json);
-    }
-    
-    public static String TypeKindDTO.toJsonArray(Collection<TypeKindDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String TypeKindDTO.toJsonArray(Collection<TypeKindDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<TypeKindDTO> TypeKindDTO.fromJsonArrayToTypeKindDTO(String json) {
-        return new JSONDeserializer<List<TypeKindDTO>>()
-        .use("values", TypeKindDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/TypeKindDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/TypeKindDTO_Roo_ToString.aj
deleted file mode 100644
index 04299ab1e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/TypeKindDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.TypeKindDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect TypeKindDTO_Roo_ToString {
-    
-    public String TypeKindDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ValidationResponseDTO.java b/src/main/java/com/labsynch/labseer/dto/ValidationResponseDTO.java
index 07337f91f..dabe73861 100644
--- a/src/main/java/com/labsynch/labseer/dto/ValidationResponseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ValidationResponseDTO.java
@@ -1,13 +1,14 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-
+import java.util.List;
 import com.labsynch.labseer.utils.ExcludeNulls;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
-
+import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @RooJavaBean
@@ -34,4 +35,68 @@ public String toJson() {
         .include("level", "record", "categoryCode", "categoryDescription", "message").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getLevel() {
+        return this.level;
+    }
+
+	public void setLevel(String level) {
+        this.level = level;
+    }
+
+	public int getRecord() {
+        return this.record;
+    }
+
+	public void setRecord(int record) {
+        this.record = record;
+    }
+
+	public String getCategoryCode() {
+        return this.categoryCode;
+    }
+
+	public void setCategoryCode(String categoryCode) {
+        this.categoryCode = categoryCode;
+    }
+
+	public String getCategoryDescription() {
+        return this.categoryDescription;
+    }
+
+	public void setCategoryDescription(String categoryDescription) {
+        this.categoryDescription = categoryDescription;
+    }
+
+	public String getMessage() {
+        return this.message;
+    }
+
+	public void setMessage(String message) {
+        this.message = message;
+    }
+
+	public static ValidationResponseDTO fromJsonToValidationResponseDTO(String json) {
+        return new JSONDeserializer<ValidationResponseDTO>()
+        .use(null, ValidationResponseDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ValidationResponseDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ValidationResponseDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ValidationResponseDTO> fromJsonArrayToValidationRespoes(String json) {
+        return new JSONDeserializer<List<ValidationResponseDTO>>()
+        .use("values", ValidationResponseDTO.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ValidationResponseDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ValidationResponseDTO_Roo_JavaBean.aj
deleted file mode 100644
index 55a2c71e9..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ValidationResponseDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,50 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ValidationResponseDTO;
-
-privileged aspect ValidationResponseDTO_Roo_JavaBean {
-    
-    public String ValidationResponseDTO.getLevel() {
-        return this.level;
-    }
-    
-    public void ValidationResponseDTO.setLevel(String level) {
-        this.level = level;
-    }
-    
-    public int ValidationResponseDTO.getRecord() {
-        return this.record;
-    }
-    
-    public void ValidationResponseDTO.setRecord(int record) {
-        this.record = record;
-    }
-    
-    public String ValidationResponseDTO.getCategoryCode() {
-        return this.categoryCode;
-    }
-    
-    public void ValidationResponseDTO.setCategoryCode(String categoryCode) {
-        this.categoryCode = categoryCode;
-    }
-    
-    public String ValidationResponseDTO.getCategoryDescription() {
-        return this.categoryDescription;
-    }
-    
-    public void ValidationResponseDTO.setCategoryDescription(String categoryDescription) {
-        this.categoryDescription = categoryDescription;
-    }
-    
-    public String ValidationResponseDTO.getMessage() {
-        return this.message;
-    }
-    
-    public void ValidationResponseDTO.setMessage(String message) {
-        this.message = message;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ValidationResponseDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ValidationResponseDTO_Roo_Json.aj
deleted file mode 100644
index bbaa7cd97..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ValidationResponseDTO_Roo_Json.aj
+++ /dev/null
@@ -1,35 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ValidationResponseDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ValidationResponseDTO_Roo_Json {
-    
-    public static ValidationResponseDTO ValidationResponseDTO.fromJsonToValidationResponseDTO(String json) {
-        return new JSONDeserializer<ValidationResponseDTO>()
-        .use(null, ValidationResponseDTO.class).deserialize(json);
-    }
-    
-    public static String ValidationResponseDTO.toJsonArray(Collection<ValidationResponseDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ValidationResponseDTO.toJsonArray(Collection<ValidationResponseDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ValidationResponseDTO> ValidationResponseDTO.fromJsonArrayToValidationRespoes(String json) {
-        return new JSONDeserializer<List<ValidationResponseDTO>>()
-        .use("values", ValidationResponseDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ValidationResponseDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ValidationResponseDTO_Roo_ToString.aj
deleted file mode 100644
index 2a1bbbbc1..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ValidationResponseDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ValidationResponseDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ValidationResponseDTO_Roo_ToString {
-    
-    public String ValidationResponseDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/ValuePathDTO.java
index 3c041cce0..8d3032bbd 100644
--- a/src/main/java/com/labsynch/labseer/dto/ValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ValuePathDTO.java
@@ -1,8 +1,11 @@
 package com.labsynch.labseer.dto;
 
 import java.math.BigDecimal;
+import java.util.Collection;
+import java.util.List;
 import java.util.Set;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -13,6 +16,8 @@
 import com.labsynch.labseer.domain.LsThing;
 import com.labsynch.labseer.domain.LsThingState;
 import com.labsynch.labseer.domain.LsThingValue;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
 
 @RooJavaBean
@@ -113,6 +118,96 @@ public BigDecimal extractNumericValue(ItxLsThingLsThing ItxLsThingLsThing){
     
     
 	
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ValuePathDTO fromJsonToValuePathDTO(String json) {
+        return new JSONDeserializer<ValuePathDTO>()
+        .use(null, ValuePathDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ValuePathDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ValuePathDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ValuePathDTO> fromJsonArrayToValuePathDTO(String json) {
+        return new JSONDeserializer<List<ValuePathDTO>>()
+        .use("values", ValuePathDTO.class).deserialize(json);
+    }
+
+	public String getEntity() {
+        return this.entity;
+    }
+
+	public void setEntity(String entity) {
+        this.entity = entity;
+    }
+
+	public String getEntityType() {
+        return this.entityType;
+    }
+
+	public void setEntityType(String entityType) {
+        this.entityType = entityType;
+    }
+
+	public String getEntityKind() {
+        return this.entityKind;
+    }
+
+	public void setEntityKind(String entityKind) {
+        this.entityKind = entityKind;
+    }
+
+	public String getStateType() {
+        return this.stateType;
+    }
+
+	public void setStateType(String stateType) {
+        this.stateType = stateType;
+    }
+
+	public String getStateKind() {
+        return this.stateKind;
+    }
+
+	public void setStateKind(String stateKind) {
+        this.stateKind = stateKind;
+    }
+
+	public String getValueType() {
+        return this.valueType;
+    }
+
+	public void setValueType(String valueType) {
+        this.valueType = valueType;
+    }
+
+	public String getValueKind() {
+        return this.valueKind;
+    }
+
+	public void setValueKind(String valueKind) {
+        this.valueKind = valueKind;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ValuePathDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ValuePathDTO_Roo_JavaBean.aj
deleted file mode 100644
index dffda9f01..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ValuePathDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,66 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ValuePathDTO;
-
-privileged aspect ValuePathDTO_Roo_JavaBean {
-    
-    public String ValuePathDTO.getEntity() {
-        return this.entity;
-    }
-    
-    public void ValuePathDTO.setEntity(String entity) {
-        this.entity = entity;
-    }
-    
-    public String ValuePathDTO.getEntityType() {
-        return this.entityType;
-    }
-    
-    public void ValuePathDTO.setEntityType(String entityType) {
-        this.entityType = entityType;
-    }
-    
-    public String ValuePathDTO.getEntityKind() {
-        return this.entityKind;
-    }
-    
-    public void ValuePathDTO.setEntityKind(String entityKind) {
-        this.entityKind = entityKind;
-    }
-    
-    public String ValuePathDTO.getStateType() {
-        return this.stateType;
-    }
-    
-    public void ValuePathDTO.setStateType(String stateType) {
-        this.stateType = stateType;
-    }
-    
-    public String ValuePathDTO.getStateKind() {
-        return this.stateKind;
-    }
-    
-    public void ValuePathDTO.setStateKind(String stateKind) {
-        this.stateKind = stateKind;
-    }
-    
-    public String ValuePathDTO.getValueType() {
-        return this.valueType;
-    }
-    
-    public void ValuePathDTO.setValueType(String valueType) {
-        this.valueType = valueType;
-    }
-    
-    public String ValuePathDTO.getValueKind() {
-        return this.valueKind;
-    }
-    
-    public void ValuePathDTO.setValueKind(String valueKind) {
-        this.valueKind = valueKind;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ValuePathDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ValuePathDTO_Roo_Json.aj
deleted file mode 100644
index 7bb32341b..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ValuePathDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ValuePathDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ValuePathDTO_Roo_Json {
-    
-    public String ValuePathDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ValuePathDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ValuePathDTO ValuePathDTO.fromJsonToValuePathDTO(String json) {
-        return new JSONDeserializer<ValuePathDTO>()
-        .use(null, ValuePathDTO.class).deserialize(json);
-    }
-    
-    public static String ValuePathDTO.toJsonArray(Collection<ValuePathDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ValuePathDTO.toJsonArray(Collection<ValuePathDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ValuePathDTO> ValuePathDTO.fromJsonArrayToValuePathDTO(String json) {
-        return new JSONDeserializer<List<ValuePathDTO>>()
-        .use("values", ValuePathDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ValuePathDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ValuePathDTO_Roo_ToString.aj
deleted file mode 100644
index 29abbcd09..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ValuePathDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ValuePathDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ValuePathDTO_Roo_ToString {
-    
-    public String ValuePathDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ValueQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/ValueQueryDTO.java
index 7dd35eba6..c78c992b4 100644
--- a/src/main/java/com/labsynch/labseer/dto/ValueQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ValueQueryDTO.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -19,4 +25,86 @@ public class ValueQueryDTO {
 	public ValueQueryDTO(){
 		
 	}
+
+	public String getStateType() {
+        return this.stateType;
+    }
+
+	public void setStateType(String stateType) {
+        this.stateType = stateType;
+    }
+
+	public String getStateKind() {
+        return this.stateKind;
+    }
+
+	public void setStateKind(String stateKind) {
+        this.stateKind = stateKind;
+    }
+
+	public String getValueType() {
+        return this.valueType;
+    }
+
+	public void setValueType(String valueType) {
+        this.valueType = valueType;
+    }
+
+	public String getValueKind() {
+        return this.valueKind;
+    }
+
+	public void setValueKind(String valueKind) {
+        this.valueKind = valueKind;
+    }
+
+	public String getValue() {
+        return this.value;
+    }
+
+	public void setValue(String value) {
+        this.value = value;
+    }
+
+	public String getOperator() {
+        return this.operator;
+    }
+
+	public void setOperator(String operator) {
+        this.operator = operator;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ValueQueryDTO fromJsonToValueQueryDTO(String json) {
+        return new JSONDeserializer<ValueQueryDTO>()
+        .use(null, ValueQueryDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ValueQueryDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ValueQueryDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ValueQueryDTO> fromJsonArrayToValueQueryDTO(String json) {
+        return new JSONDeserializer<List<ValueQueryDTO>>()
+        .use("values", ValueQueryDTO.class).deserialize(json);
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ValueQueryDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ValueQueryDTO_Roo_JavaBean.aj
deleted file mode 100644
index e579e8397..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ValueQueryDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,58 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ValueQueryDTO;
-
-privileged aspect ValueQueryDTO_Roo_JavaBean {
-    
-    public String ValueQueryDTO.getStateType() {
-        return this.stateType;
-    }
-    
-    public void ValueQueryDTO.setStateType(String stateType) {
-        this.stateType = stateType;
-    }
-    
-    public String ValueQueryDTO.getStateKind() {
-        return this.stateKind;
-    }
-    
-    public void ValueQueryDTO.setStateKind(String stateKind) {
-        this.stateKind = stateKind;
-    }
-    
-    public String ValueQueryDTO.getValueType() {
-        return this.valueType;
-    }
-    
-    public void ValueQueryDTO.setValueType(String valueType) {
-        this.valueType = valueType;
-    }
-    
-    public String ValueQueryDTO.getValueKind() {
-        return this.valueKind;
-    }
-    
-    public void ValueQueryDTO.setValueKind(String valueKind) {
-        this.valueKind = valueKind;
-    }
-    
-    public String ValueQueryDTO.getValue() {
-        return this.value;
-    }
-    
-    public void ValueQueryDTO.setValue(String value) {
-        this.value = value;
-    }
-    
-    public String ValueQueryDTO.getOperator() {
-        return this.operator;
-    }
-    
-    public void ValueQueryDTO.setOperator(String operator) {
-        this.operator = operator;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ValueQueryDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ValueQueryDTO_Roo_Json.aj
deleted file mode 100644
index 29cc849ed..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ValueQueryDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ValueQueryDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ValueQueryDTO_Roo_Json {
-    
-    public String ValueQueryDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ValueQueryDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ValueQueryDTO ValueQueryDTO.fromJsonToValueQueryDTO(String json) {
-        return new JSONDeserializer<ValueQueryDTO>()
-        .use(null, ValueQueryDTO.class).deserialize(json);
-    }
-    
-    public static String ValueQueryDTO.toJsonArray(Collection<ValueQueryDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ValueQueryDTO.toJsonArray(Collection<ValueQueryDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ValueQueryDTO> ValueQueryDTO.fromJsonArrayToValueQueryDTO(String json) {
-        return new JSONDeserializer<List<ValueQueryDTO>>()
-        .use("values", ValueQueryDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ValueQueryDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ValueQueryDTO_Roo_ToString.aj
deleted file mode 100644
index b6911b156..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ValueQueryDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ValueQueryDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ValueQueryDTO_Roo_ToString {
-    
-    public String ValueQueryDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ValueRuleDTO.java b/src/main/java/com/labsynch/labseer/dto/ValueRuleDTO.java
index b49693098..9753891c2 100644
--- a/src/main/java/com/labsynch/labseer/dto/ValueRuleDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ValueRuleDTO.java
@@ -1,7 +1,10 @@
 package com.labsynch.labseer.dto;
 
 import java.math.BigDecimal;
-
+import java.util.Collection;
+import java.util.List;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.roo.addon.javabean.RooJavaBean;
@@ -11,6 +14,8 @@
 import com.labsynch.labseer.domain.ItxLsThingLsThing;
 import com.labsynch.labseer.domain.LsThing;
 import com.labsynch.labseer.service.LsThingServiceImpl;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
 
 @RooJavaBean
@@ -72,6 +77,64 @@ public boolean checkRuleApplies(ItxLsThingLsThing itx){
 		return false;
 	}
 	
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ValueRuleDTO fromJsonToValueRuleDTO(String json) {
+        return new JSONDeserializer<ValueRuleDTO>()
+        .use(null, ValueRuleDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ValueRuleDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ValueRuleDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ValueRuleDTO> fromJsonArrayToValueRuleDTO(String json) {
+        return new JSONDeserializer<List<ValueRuleDTO>>()
+        .use("values", ValueRuleDTO.class).deserialize(json);
+    }
+
+	public String getComparisonMethod() {
+        return this.comparisonMethod;
+    }
+
+	public void setComparisonMethod(String comparisonMethod) {
+        this.comparisonMethod = comparisonMethod;
+    }
+
+	public BigDecimal getComparisonRange() {
+        return this.comparisonRange;
+    }
+
+	public void setComparisonRange(BigDecimal comparisonRange) {
+        this.comparisonRange = comparisonRange;
+    }
+
+	public ValuePathDTO getValue() {
+        return this.value;
+    }
+
+	public void setValue(ValuePathDTO value) {
+        this.value = value;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ValueRuleDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ValueRuleDTO_Roo_JavaBean.aj
deleted file mode 100644
index 2f335e12f..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ValueRuleDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,36 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ValuePathDTO;
-import com.labsynch.labseer.dto.ValueRuleDTO;
-import java.math.BigDecimal;
-
-privileged aspect ValueRuleDTO_Roo_JavaBean {
-    
-    public String ValueRuleDTO.getComparisonMethod() {
-        return this.comparisonMethod;
-    }
-    
-    public void ValueRuleDTO.setComparisonMethod(String comparisonMethod) {
-        this.comparisonMethod = comparisonMethod;
-    }
-    
-    public BigDecimal ValueRuleDTO.getComparisonRange() {
-        return this.comparisonRange;
-    }
-    
-    public void ValueRuleDTO.setComparisonRange(BigDecimal comparisonRange) {
-        this.comparisonRange = comparisonRange;
-    }
-    
-    public ValuePathDTO ValueRuleDTO.getValue() {
-        return this.value;
-    }
-    
-    public void ValueRuleDTO.setValue(ValuePathDTO value) {
-        this.value = value;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ValueRuleDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ValueRuleDTO_Roo_Json.aj
deleted file mode 100644
index e251cf6dc..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ValueRuleDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ValueRuleDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ValueRuleDTO_Roo_Json {
-    
-    public String ValueRuleDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ValueRuleDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ValueRuleDTO ValueRuleDTO.fromJsonToValueRuleDTO(String json) {
-        return new JSONDeserializer<ValueRuleDTO>()
-        .use(null, ValueRuleDTO.class).deserialize(json);
-    }
-    
-    public static String ValueRuleDTO.toJsonArray(Collection<ValueRuleDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ValueRuleDTO.toJsonArray(Collection<ValueRuleDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ValueRuleDTO> ValueRuleDTO.fromJsonArrayToValueRuleDTO(String json) {
-        return new JSONDeserializer<List<ValueRuleDTO>>()
-        .use("values", ValueRuleDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ValueRuleDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ValueRuleDTO_Roo_ToString.aj
deleted file mode 100644
index deb677613..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ValueRuleDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ValueRuleDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ValueRuleDTO_Roo_ToString {
-    
-    public String ValueRuleDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ValueTypeKindDTO.java b/src/main/java/com/labsynch/labseer/dto/ValueTypeKindDTO.java
index b08411885..4461eb85a 100755
--- a/src/main/java/com/labsynch/labseer/dto/ValueTypeKindDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ValueTypeKindDTO.java
@@ -1,6 +1,8 @@
 package com.labsynch.labseer.dto;
 
 import javax.persistence.NoResultException;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -8,6 +10,10 @@
 
 import com.labsynch.labseer.domain.ValueKind;
 import com.labsynch.labseer.domain.ValueType;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 
 @RooJavaBean
 @RooToString
@@ -51,6 +57,72 @@ public void findValueKind(){
     		this.valueKind = null;
     	}
 	}
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ValueTypeKindDTO fromJsonToValueTypeKindDTO(String json) {
+        return new JSONDeserializer<ValueTypeKindDTO>()
+        .use(null, ValueTypeKindDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ValueTypeKindDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ValueTypeKindDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ValueTypeKindDTO> fromJsonArrayToValueTypeKindDTO(String json) {
+        return new JSONDeserializer<List<ValueTypeKindDTO>>()
+        .use("values", ValueTypeKindDTO.class).deserialize(json);
+    }
+
+	public String getLsType() {
+        return this.lsType;
+    }
+
+	public void setLsType(String lsType) {
+        this.lsType = lsType;
+    }
+
+	public String getLsKind() {
+        return this.lsKind;
+    }
+
+	public void setLsKind(String lsKind) {
+        this.lsKind = lsKind;
+    }
+
+	public int getDisplayOrder() {
+        return this.displayOrder;
+    }
+
+	public void setDisplayOrder(int displayOrder) {
+        this.displayOrder = displayOrder;
+    }
+
+	public ValueKind getValueKind() {
+        return this.valueKind;
+    }
+
+	public void setValueKind(ValueKind valueKind) {
+        this.valueKind = valueKind;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ValueTypeKindDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/ValueTypeKindDTO_Roo_JavaBean.aj
deleted file mode 100755
index a6880d56d..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ValueTypeKindDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.domain.ValueKind;
-import com.labsynch.labseer.dto.ValueTypeKindDTO;
-
-privileged aspect ValueTypeKindDTO_Roo_JavaBean {
-    
-    public String ValueTypeKindDTO.getLsType() {
-        return this.lsType;
-    }
-    
-    public void ValueTypeKindDTO.setLsType(String lsType) {
-        this.lsType = lsType;
-    }
-    
-    public String ValueTypeKindDTO.getLsKind() {
-        return this.lsKind;
-    }
-    
-    public void ValueTypeKindDTO.setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
-    
-    public int ValueTypeKindDTO.getDisplayOrder() {
-        return this.displayOrder;
-    }
-    
-    public void ValueTypeKindDTO.setDisplayOrder(int displayOrder) {
-        this.displayOrder = displayOrder;
-    }
-    
-    public ValueKind ValueTypeKindDTO.getValueKind() {
-        return this.valueKind;
-    }
-    
-    public void ValueTypeKindDTO.setValueKind(ValueKind valueKind) {
-        this.valueKind = valueKind;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ValueTypeKindDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/ValueTypeKindDTO_Roo_Json.aj
deleted file mode 100755
index c5f7acd43..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ValueTypeKindDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ValueTypeKindDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ValueTypeKindDTO_Roo_Json {
-    
-    public String ValueTypeKindDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ValueTypeKindDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ValueTypeKindDTO ValueTypeKindDTO.fromJsonToValueTypeKindDTO(String json) {
-        return new JSONDeserializer<ValueTypeKindDTO>()
-        .use(null, ValueTypeKindDTO.class).deserialize(json);
-    }
-    
-    public static String ValueTypeKindDTO.toJsonArray(Collection<ValueTypeKindDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ValueTypeKindDTO.toJsonArray(Collection<ValueTypeKindDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ValueTypeKindDTO> ValueTypeKindDTO.fromJsonArrayToValueTypeKindDTO(String json) {
-        return new JSONDeserializer<List<ValueTypeKindDTO>>()
-        .use("values", ValueTypeKindDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/ValueTypeKindDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/ValueTypeKindDTO_Roo_ToString.aj
deleted file mode 100755
index 4cb45f376..000000000
--- a/src/main/java/com/labsynch/labseer/dto/ValueTypeKindDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.ValueTypeKindDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ValueTypeKindDTO_Roo_ToString {
-    
-    public String ValueTypeKindDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/WellContentDTO.java b/src/main/java/com/labsynch/labseer/dto/WellContentDTO.java
index d35dfebd5..355276cdd 100644
--- a/src/main/java/com/labsynch/labseer/dto/WellContentDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/WellContentDTO.java
@@ -1,12 +1,16 @@
 package com.labsynch.labseer.dto;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -85,6 +89,168 @@ public WellContentDTO(String containerCodeName,
 	
 	
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static WellContentDTO fromJsonToWellContentDTO(String json) {
+        return new JSONDeserializer<WellContentDTO>()
+        .use(null, WellContentDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<WellContentDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<WellContentDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<WellContentDTO> fromJsonArrayToWellCoes(String json) {
+        return new JSONDeserializer<List<WellContentDTO>>()
+        .use("values", WellContentDTO.class).deserialize(json);
+    }
+
+	public String getContainerCodeName() {
+        return this.containerCodeName;
+    }
+
+	public void setContainerCodeName(String containerCodeName) {
+        this.containerCodeName = containerCodeName;
+    }
+
+	public BigDecimal getAmount() {
+        return this.amount;
+    }
+
+	public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+	public String getAmountUnits() {
+        return this.amountUnits;
+    }
+
+	public void setAmountUnits(String amountUnits) {
+        this.amountUnits = amountUnits;
+    }
+
+	public String getBatchCode() {
+        return this.batchCode;
+    }
+
+	public void setBatchCode(String batchCode) {
+        this.batchCode = batchCode;
+    }
+
+	public Double getBatchConcentration() {
+        return this.batchConcentration;
+    }
+
+	public void setBatchConcentration(Double batchConcentration) {
+        this.batchConcentration = batchConcentration;
+    }
+
+	public String getBatchConcUnits() {
+        return this.batchConcUnits;
+    }
+
+	public void setBatchConcUnits(String batchConcUnits) {
+        this.batchConcUnits = batchConcUnits;
+    }
+
+	public String getSolventCode() {
+        return this.solventCode;
+    }
+
+	public void setSolventCode(String solventCode) {
+        this.solventCode = solventCode;
+    }
+
+	public String getPhysicalState() {
+        return this.physicalState;
+    }
+
+	public void setPhysicalState(String physicalState) {
+        this.physicalState = physicalState;
+    }
+
+	public String getLevel() {
+        return this.level;
+    }
+
+	public void setLevel(String level) {
+        this.level = level;
+    }
+
+	public String getMessage() {
+        return this.message;
+    }
+
+	public void setMessage(String message) {
+        this.message = message;
+    }
+
+	public String getWellName() {
+        return this.wellName;
+    }
+
+	public void setWellName(String wellName) {
+        this.wellName = wellName;
+    }
+
+	public Integer getRowIndex() {
+        return this.rowIndex;
+    }
+
+	public void setRowIndex(Integer rowIndex) {
+        this.rowIndex = rowIndex;
+    }
+
+	public Integer getColumnIndex() {
+        return this.columnIndex;
+    }
+
+	public void setColumnIndex(Integer columnIndex) {
+        this.columnIndex = columnIndex;
+    }
+
+	public String getRecordedBy() {
+        return this.recordedBy;
+    }
+
+	public void setRecordedBy(String recordedBy) {
+        this.recordedBy = recordedBy;
+    }
+
+	public Date getRecordedDate() {
+        return this.recordedDate;
+    }
+
+	public void setRecordedDate(Date recordedDate) {
+        this.recordedDate = recordedDate;
+    }
+
+	public Date getLastModifiedDate() {
+        return this.lastModifiedDate;
+    }
+
+	public void setLastModifiedDate(Date lastModifiedDate) {
+        this.lastModifiedDate = lastModifiedDate;
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/WellContentDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/WellContentDTO_Roo_JavaBean.aj
deleted file mode 100644
index f6d2ef22e..000000000
--- a/src/main/java/com/labsynch/labseer/dto/WellContentDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,140 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.WellContentDTO;
-import java.math.BigDecimal;
-import java.util.Date;
-
-privileged aspect WellContentDTO_Roo_JavaBean {
-    
-    public String WellContentDTO.getContainerCodeName() {
-        return this.containerCodeName;
-    }
-    
-    public void WellContentDTO.setContainerCodeName(String containerCodeName) {
-        this.containerCodeName = containerCodeName;
-    }
-    
-    public BigDecimal WellContentDTO.getAmount() {
-        return this.amount;
-    }
-    
-    public void WellContentDTO.setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
-    
-    public String WellContentDTO.getAmountUnits() {
-        return this.amountUnits;
-    }
-    
-    public void WellContentDTO.setAmountUnits(String amountUnits) {
-        this.amountUnits = amountUnits;
-    }
-    
-    public String WellContentDTO.getBatchCode() {
-        return this.batchCode;
-    }
-    
-    public void WellContentDTO.setBatchCode(String batchCode) {
-        this.batchCode = batchCode;
-    }
-    
-    public Double WellContentDTO.getBatchConcentration() {
-        return this.batchConcentration;
-    }
-    
-    public void WellContentDTO.setBatchConcentration(Double batchConcentration) {
-        this.batchConcentration = batchConcentration;
-    }
-    
-    public String WellContentDTO.getBatchConcUnits() {
-        return this.batchConcUnits;
-    }
-    
-    public void WellContentDTO.setBatchConcUnits(String batchConcUnits) {
-        this.batchConcUnits = batchConcUnits;
-    }
-    
-    public String WellContentDTO.getSolventCode() {
-        return this.solventCode;
-    }
-    
-    public void WellContentDTO.setSolventCode(String solventCode) {
-        this.solventCode = solventCode;
-    }
-    
-    public String WellContentDTO.getPhysicalState() {
-        return this.physicalState;
-    }
-    
-    public void WellContentDTO.setPhysicalState(String physicalState) {
-        this.physicalState = physicalState;
-    }
-    
-    public String WellContentDTO.getLevel() {
-        return this.level;
-    }
-    
-    public void WellContentDTO.setLevel(String level) {
-        this.level = level;
-    }
-    
-    public String WellContentDTO.getMessage() {
-        return this.message;
-    }
-    
-    public void WellContentDTO.setMessage(String message) {
-        this.message = message;
-    }
-    
-    public String WellContentDTO.getWellName() {
-        return this.wellName;
-    }
-    
-    public void WellContentDTO.setWellName(String wellName) {
-        this.wellName = wellName;
-    }
-    
-    public Integer WellContentDTO.getRowIndex() {
-        return this.rowIndex;
-    }
-    
-    public void WellContentDTO.setRowIndex(Integer rowIndex) {
-        this.rowIndex = rowIndex;
-    }
-    
-    public Integer WellContentDTO.getColumnIndex() {
-        return this.columnIndex;
-    }
-    
-    public void WellContentDTO.setColumnIndex(Integer columnIndex) {
-        this.columnIndex = columnIndex;
-    }
-    
-    public String WellContentDTO.getRecordedBy() {
-        return this.recordedBy;
-    }
-    
-    public void WellContentDTO.setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
-    
-    public Date WellContentDTO.getRecordedDate() {
-        return this.recordedDate;
-    }
-    
-    public void WellContentDTO.setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
-    
-    public Date WellContentDTO.getLastModifiedDate() {
-        return this.lastModifiedDate;
-    }
-    
-    public void WellContentDTO.setLastModifiedDate(Date lastModifiedDate) {
-        this.lastModifiedDate = lastModifiedDate;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/WellContentDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/WellContentDTO_Roo_Json.aj
deleted file mode 100644
index 9dbd98784..000000000
--- a/src/main/java/com/labsynch/labseer/dto/WellContentDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.WellContentDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect WellContentDTO_Roo_Json {
-    
-    public String WellContentDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String WellContentDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static WellContentDTO WellContentDTO.fromJsonToWellContentDTO(String json) {
-        return new JSONDeserializer<WellContentDTO>()
-        .use(null, WellContentDTO.class).deserialize(json);
-    }
-    
-    public static String WellContentDTO.toJsonArray(Collection<WellContentDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String WellContentDTO.toJsonArray(Collection<WellContentDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<WellContentDTO> WellContentDTO.fromJsonArrayToWellCoes(String json) {
-        return new JSONDeserializer<List<WellContentDTO>>()
-        .use("values", WellContentDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/WellContentDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/WellContentDTO_Roo_ToString.aj
deleted file mode 100644
index 704ddb0e7..000000000
--- a/src/main/java/com/labsynch/labseer/dto/WellContentDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.WellContentDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect WellContentDTO_Roo_ToString {
-    
-    public String WellContentDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/WellStubDTO.java b/src/main/java/com/labsynch/labseer/dto/WellStubDTO.java
index 860638e03..53985fe35 100644
--- a/src/main/java/com/labsynch/labseer/dto/WellStubDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/WellStubDTO.java
@@ -4,7 +4,8 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
@@ -13,6 +14,8 @@
 import com.labsynch.labseer.domain.Container;
 import com.labsynch.labseer.domain.ContainerLabel;
 import com.labsynch.labseer.service.ContainerService;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
 @RooJavaBean
 @RooToString
@@ -61,6 +64,72 @@ public static Collection<WellStubDTO> convertToWellStubDTOs(
 	}
 	
 
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getWellName() {
+        return this.wellName;
+    }
+
+	public void setWellName(String wellName) {
+        this.wellName = wellName;
+    }
+
+	public String getCodeName() {
+        return this.codeName;
+    }
+
+	public void setCodeName(String codeName) {
+        this.codeName = codeName;
+    }
+
+	public Integer getRowIndex() {
+        return this.rowIndex;
+    }
+
+	public void setRowIndex(Integer rowIndex) {
+        this.rowIndex = rowIndex;
+    }
+
+	public Integer getColumnIndex() {
+        return this.columnIndex;
+    }
+
+	public void setColumnIndex(Integer columnIndex) {
+        this.columnIndex = columnIndex;
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static WellStubDTO fromJsonToWellStubDTO(String json) {
+        return new JSONDeserializer<WellStubDTO>()
+        .use(null, WellStubDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<WellStubDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<WellStubDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<WellStubDTO> fromJsonArrayToWellStubDTO(String json) {
+        return new JSONDeserializer<List<WellStubDTO>>()
+        .use("values", WellStubDTO.class).deserialize(json);
+    }
 }
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/WellStubDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/WellStubDTO_Roo_JavaBean.aj
deleted file mode 100644
index 5de54f4b1..000000000
--- a/src/main/java/com/labsynch/labseer/dto/WellStubDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,42 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.WellStubDTO;
-
-privileged aspect WellStubDTO_Roo_JavaBean {
-    
-    public String WellStubDTO.getWellName() {
-        return this.wellName;
-    }
-    
-    public void WellStubDTO.setWellName(String wellName) {
-        this.wellName = wellName;
-    }
-    
-    public String WellStubDTO.getCodeName() {
-        return this.codeName;
-    }
-    
-    public void WellStubDTO.setCodeName(String codeName) {
-        this.codeName = codeName;
-    }
-    
-    public Integer WellStubDTO.getRowIndex() {
-        return this.rowIndex;
-    }
-    
-    public void WellStubDTO.setRowIndex(Integer rowIndex) {
-        this.rowIndex = rowIndex;
-    }
-    
-    public Integer WellStubDTO.getColumnIndex() {
-        return this.columnIndex;
-    }
-    
-    public void WellStubDTO.setColumnIndex(Integer columnIndex) {
-        this.columnIndex = columnIndex;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/WellStubDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/WellStubDTO_Roo_Json.aj
deleted file mode 100644
index 84f28d0f1..000000000
--- a/src/main/java/com/labsynch/labseer/dto/WellStubDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.WellStubDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect WellStubDTO_Roo_Json {
-    
-    public String WellStubDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String WellStubDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static WellStubDTO WellStubDTO.fromJsonToWellStubDTO(String json) {
-        return new JSONDeserializer<WellStubDTO>()
-        .use(null, WellStubDTO.class).deserialize(json);
-    }
-    
-    public static String WellStubDTO.toJsonArray(Collection<WellStubDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String WellStubDTO.toJsonArray(Collection<WellStubDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<WellStubDTO> WellStubDTO.fromJsonArrayToWellStubDTO(String json) {
-        return new JSONDeserializer<List<WellStubDTO>>()
-        .use("values", WellStubDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/WellStubDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/WellStubDTO_Roo_ToString.aj
deleted file mode 100644
index e9d9af78f..000000000
--- a/src/main/java/com/labsynch/labseer/dto/WellStubDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto;
-
-import com.labsynch.labseer.dto.WellStubDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect WellStubDTO_Roo_ToString {
-    
-    public String WellStubDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/configuration/StandardizerSettingsConfigDTO.java b/src/main/java/com/labsynch/labseer/dto/configuration/StandardizerSettingsConfigDTO.java
index 3673cbb2f..9100f1829 100644
--- a/src/main/java/com/labsynch/labseer/dto/configuration/StandardizerSettingsConfigDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/configuration/StandardizerSettingsConfigDTO.java
@@ -1,7 +1,13 @@
 package com.labsynch.labseer.dto.configuration;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.roo.addon.javabean.RooJavaBean;
@@ -46,4 +52,62 @@ public boolean equals(Object obj) {
 		return equalsBuilder.isEquals();
 	}
 
+
+	public Boolean getShouldStandardize() {
+        return this.shouldStandardize;
+    }
+
+	public void setShouldStandardize(Boolean shouldStandardize) {
+        this.shouldStandardize = shouldStandardize;
+    }
+
+	public String getType() {
+        return this.type;
+    }
+
+	public void setType(String type) {
+        this.type = type;
+    }
+
+	public String getSettings() {
+        return this.settings;
+    }
+
+	public void setSettings(String settings) {
+        this.settings = settings;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static StandardizerSettingsConfigDTO fromJsonToStandardizerSettingsConfigDTO(String json) {
+        return new JSONDeserializer<StandardizerSettingsConfigDTO>()
+        .use(null, StandardizerSettingsConfigDTO.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<StandardizerSettingsConfigDTO> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<StandardizerSettingsConfigDTO> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<StandardizerSettingsConfigDTO> fromJsonArrayToStandardizerSettingsCoes(String json) {
+        return new JSONDeserializer<List<StandardizerSettingsConfigDTO>>()
+        .use("values", StandardizerSettingsConfigDTO.class).deserialize(json);
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/dto/configuration/StandardizerSettingsConfigDTO_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/dto/configuration/StandardizerSettingsConfigDTO_Roo_JavaBean.aj
deleted file mode 100644
index 87ed94b25..000000000
--- a/src/main/java/com/labsynch/labseer/dto/configuration/StandardizerSettingsConfigDTO_Roo_JavaBean.aj
+++ /dev/null
@@ -1,34 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto.configuration;
-
-import com.labsynch.labseer.dto.configuration.StandardizerSettingsConfigDTO;
-
-privileged aspect StandardizerSettingsConfigDTO_Roo_JavaBean {
-    
-    public Boolean StandardizerSettingsConfigDTO.getShouldStandardize() {
-        return this.shouldStandardize;
-    }
-    
-    public void StandardizerSettingsConfigDTO.setShouldStandardize(Boolean shouldStandardize) {
-        this.shouldStandardize = shouldStandardize;
-    }
-    
-    public String StandardizerSettingsConfigDTO.getType() {
-        return this.type;
-    }
-    
-    public void StandardizerSettingsConfigDTO.setType(String type) {
-        this.type = type;
-    }
-    
-    public String StandardizerSettingsConfigDTO.getSettings() {
-        return this.settings;
-    }
-    
-    public void StandardizerSettingsConfigDTO.setSettings(String settings) {
-        this.settings = settings;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/configuration/StandardizerSettingsConfigDTO_Roo_Json.aj b/src/main/java/com/labsynch/labseer/dto/configuration/StandardizerSettingsConfigDTO_Roo_Json.aj
deleted file mode 100644
index 91c37fa44..000000000
--- a/src/main/java/com/labsynch/labseer/dto/configuration/StandardizerSettingsConfigDTO_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto.configuration;
-
-import com.labsynch.labseer.dto.configuration.StandardizerSettingsConfigDTO;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect StandardizerSettingsConfigDTO_Roo_Json {
-    
-    public String StandardizerSettingsConfigDTO.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String StandardizerSettingsConfigDTO.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static StandardizerSettingsConfigDTO StandardizerSettingsConfigDTO.fromJsonToStandardizerSettingsConfigDTO(String json) {
-        return new JSONDeserializer<StandardizerSettingsConfigDTO>()
-        .use(null, StandardizerSettingsConfigDTO.class).deserialize(json);
-    }
-    
-    public static String StandardizerSettingsConfigDTO.toJsonArray(Collection<StandardizerSettingsConfigDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String StandardizerSettingsConfigDTO.toJsonArray(Collection<StandardizerSettingsConfigDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<StandardizerSettingsConfigDTO> StandardizerSettingsConfigDTO.fromJsonArrayToStandardizerSettingsCoes(String json) {
-        return new JSONDeserializer<List<StandardizerSettingsConfigDTO>>()
-        .use("values", StandardizerSettingsConfigDTO.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/dto/configuration/StandardizerSettingsConfigDTO_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/dto/configuration/StandardizerSettingsConfigDTO_Roo_ToString.aj
deleted file mode 100644
index 6263aeebc..000000000
--- a/src/main/java/com/labsynch/labseer/dto/configuration/StandardizerSettingsConfigDTO_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.dto.configuration;
-
-import com.labsynch.labseer.dto.configuration.StandardizerSettingsConfigDTO;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect StandardizerSettingsConfigDTO_Roo_ToString {
-    
-    public String StandardizerSettingsConfigDTO.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/exceptions/ErrorMessage.java b/src/main/java/com/labsynch/labseer/exceptions/ErrorMessage.java
index 560055802..2838f3d89 100755
--- a/src/main/java/com/labsynch/labseer/exceptions/ErrorMessage.java
+++ b/src/main/java/com/labsynch/labseer/exceptions/ErrorMessage.java
@@ -1,7 +1,12 @@
 package com.labsynch.labseer.exceptions;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -17,4 +22,54 @@ public class ErrorMessage {
     @Size(max = 255)
     private String message;
     
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ErrorMessage fromJsonToErrorMessage(String json) {
+        return new JSONDeserializer<ErrorMessage>()
+        .use(null, ErrorMessage.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ErrorMessage> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ErrorMessage> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ErrorMessage> fromJsonArrayToErrorMessages(String json) {
+        return new JSONDeserializer<List<ErrorMessage>>()
+        .use("values", ErrorMessage.class).deserialize(json);
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String getErrorLevel() {
+        return this.errorLevel;
+    }
+
+	public void setErrorLevel(String errorLevel) {
+        this.errorLevel = errorLevel;
+    }
+
+	public String getMessage() {
+        return this.message;
+    }
+
+	public void setMessage(String message) {
+        this.message = message;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/exceptions/ErrorMessage_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/exceptions/ErrorMessage_Roo_JavaBean.aj
deleted file mode 100755
index 271c2617d..000000000
--- a/src/main/java/com/labsynch/labseer/exceptions/ErrorMessage_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.exceptions;
-
-import com.labsynch.labseer.exceptions.ErrorMessage;
-
-privileged aspect ErrorMessage_Roo_JavaBean {
-    
-    public String ErrorMessage.getErrorLevel() {
-        return this.errorLevel;
-    }
-    
-    public void ErrorMessage.setErrorLevel(String errorLevel) {
-        this.errorLevel = errorLevel;
-    }
-    
-    public String ErrorMessage.getMessage() {
-        return this.message;
-    }
-    
-    public void ErrorMessage.setMessage(String message) {
-        this.message = message;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/exceptions/ErrorMessage_Roo_Json.aj b/src/main/java/com/labsynch/labseer/exceptions/ErrorMessage_Roo_Json.aj
deleted file mode 100755
index d473e57af..000000000
--- a/src/main/java/com/labsynch/labseer/exceptions/ErrorMessage_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.exceptions;
-
-import com.labsynch.labseer.exceptions.ErrorMessage;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ErrorMessage_Roo_Json {
-    
-    public String ErrorMessage.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ErrorMessage.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ErrorMessage ErrorMessage.fromJsonToErrorMessage(String json) {
-        return new JSONDeserializer<ErrorMessage>()
-        .use(null, ErrorMessage.class).deserialize(json);
-    }
-    
-    public static String ErrorMessage.toJsonArray(Collection<ErrorMessage> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ErrorMessage.toJsonArray(Collection<ErrorMessage> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ErrorMessage> ErrorMessage.fromJsonArrayToErrorMessages(String json) {
-        return new JSONDeserializer<List<ErrorMessage>>()
-        .use("values", ErrorMessage.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/exceptions/ErrorMessage_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/exceptions/ErrorMessage_Roo_ToString.aj
deleted file mode 100755
index dc456e7be..000000000
--- a/src/main/java/com/labsynch/labseer/exceptions/ErrorMessage_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.exceptions;
-
-import com.labsynch.labseer.exceptions.ErrorMessage;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ErrorMessage_Roo_ToString {
-    
-    public String ErrorMessage.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/exceptions/LsThingValidationErrorMessage.java b/src/main/java/com/labsynch/labseer/exceptions/LsThingValidationErrorMessage.java
index bb42ab296..3298433f7 100644
--- a/src/main/java/com/labsynch/labseer/exceptions/LsThingValidationErrorMessage.java
+++ b/src/main/java/com/labsynch/labseer/exceptions/LsThingValidationErrorMessage.java
@@ -1,7 +1,12 @@
 package com.labsynch.labseer.exceptions;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -37,4 +42,70 @@ public LsThingValidationErrorMessage(UniqueNameException e){
         this.setMatchingThingCorpName(e.getMatchingThingCorpName());
     }
     
+
+	public String getErrorLevel() {
+        return this.errorLevel;
+    }
+
+	public void setErrorLevel(String errorLevel) {
+        this.errorLevel = errorLevel;
+    }
+
+	public String getMessage() {
+        return this.message;
+    }
+
+	public void setMessage(String message) {
+        this.message = message;
+    }
+
+	public String getMatchingThingCodeName() {
+        return this.matchingThingCodeName;
+    }
+
+	public void setMatchingThingCodeName(String matchingThingCodeName) {
+        this.matchingThingCodeName = matchingThingCodeName;
+    }
+
+	public String getMatchingThingCorpName() {
+        return this.matchingThingCorpName;
+    }
+
+	public void setMatchingThingCorpName(String matchingThingCorpName) {
+        this.matchingThingCorpName = matchingThingCorpName;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static LsThingValidationErrorMessage fromJsonToLsThingValidationErrorMessage(String json) {
+        return new JSONDeserializer<LsThingValidationErrorMessage>()
+        .use(null, LsThingValidationErrorMessage.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<LsThingValidationErrorMessage> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<LsThingValidationErrorMessage> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<LsThingValidationErrorMessage> fromJsonArrayToLsThingValidationErrorMessages(String json) {
+        return new JSONDeserializer<List<LsThingValidationErrorMessage>>()
+        .use("values", LsThingValidationErrorMessage.class).deserialize(json);
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/exceptions/LsThingValidationErrorMessage_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/exceptions/LsThingValidationErrorMessage_Roo_JavaBean.aj
deleted file mode 100644
index 788a447ad..000000000
--- a/src/main/java/com/labsynch/labseer/exceptions/LsThingValidationErrorMessage_Roo_JavaBean.aj
+++ /dev/null
@@ -1,42 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.exceptions;
-
-import com.labsynch.labseer.exceptions.LsThingValidationErrorMessage;
-
-privileged aspect LsThingValidationErrorMessage_Roo_JavaBean {
-    
-    public String LsThingValidationErrorMessage.getErrorLevel() {
-        return this.errorLevel;
-    }
-    
-    public void LsThingValidationErrorMessage.setErrorLevel(String errorLevel) {
-        this.errorLevel = errorLevel;
-    }
-    
-    public String LsThingValidationErrorMessage.getMessage() {
-        return this.message;
-    }
-    
-    public void LsThingValidationErrorMessage.setMessage(String message) {
-        this.message = message;
-    }
-    
-    public String LsThingValidationErrorMessage.getMatchingThingCodeName() {
-        return this.matchingThingCodeName;
-    }
-    
-    public void LsThingValidationErrorMessage.setMatchingThingCodeName(String matchingThingCodeName) {
-        this.matchingThingCodeName = matchingThingCodeName;
-    }
-    
-    public String LsThingValidationErrorMessage.getMatchingThingCorpName() {
-        return this.matchingThingCorpName;
-    }
-    
-    public void LsThingValidationErrorMessage.setMatchingThingCorpName(String matchingThingCorpName) {
-        this.matchingThingCorpName = matchingThingCorpName;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/exceptions/LsThingValidationErrorMessage_Roo_Json.aj b/src/main/java/com/labsynch/labseer/exceptions/LsThingValidationErrorMessage_Roo_Json.aj
deleted file mode 100644
index d01fa88e5..000000000
--- a/src/main/java/com/labsynch/labseer/exceptions/LsThingValidationErrorMessage_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.exceptions;
-
-import com.labsynch.labseer.exceptions.LsThingValidationErrorMessage;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect LsThingValidationErrorMessage_Roo_Json {
-    
-    public String LsThingValidationErrorMessage.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String LsThingValidationErrorMessage.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static LsThingValidationErrorMessage LsThingValidationErrorMessage.fromJsonToLsThingValidationErrorMessage(String json) {
-        return new JSONDeserializer<LsThingValidationErrorMessage>()
-        .use(null, LsThingValidationErrorMessage.class).deserialize(json);
-    }
-    
-    public static String LsThingValidationErrorMessage.toJsonArray(Collection<LsThingValidationErrorMessage> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String LsThingValidationErrorMessage.toJsonArray(Collection<LsThingValidationErrorMessage> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<LsThingValidationErrorMessage> LsThingValidationErrorMessage.fromJsonArrayToLsThingValidationErrorMessages(String json) {
-        return new JSONDeserializer<List<LsThingValidationErrorMessage>>()
-        .use("values", LsThingValidationErrorMessage.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/exceptions/LsThingValidationErrorMessage_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/exceptions/LsThingValidationErrorMessage_Roo_ToString.aj
deleted file mode 100644
index 6dabf6ada..000000000
--- a/src/main/java/com/labsynch/labseer/exceptions/LsThingValidationErrorMessage_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.exceptions;
-
-import com.labsynch.labseer.exceptions.LsThingValidationErrorMessage;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect LsThingValidationErrorMessage_Roo_ToString {
-    
-    public String LsThingValidationErrorMessage.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/service/ErrorList.java b/src/main/java/com/labsynch/labseer/service/ErrorList.java
index acde76a08..099698b0a 100755
--- a/src/main/java/com/labsynch/labseer/service/ErrorList.java
+++ b/src/main/java/com/labsynch/labseer/service/ErrorList.java
@@ -3,7 +3,8 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -35,4 +36,16 @@ public static String toJsonArray(Collection<ErrorList> collection) {
 	public static Collection<ErrorList> fromJsonArrayToErrorLists(String json) {
         return new JSONDeserializer<List<ErrorList>>().use(null, ArrayList.class).use("values", ErrorList.class).deserialize(json);
     }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public ArrayList<ErrorMessage> getErrors() {
+        return this.errors;
+    }
+
+	public void setErrors(ArrayList<ErrorMessage> errors) {
+        this.errors = errors;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ErrorList_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/service/ErrorList_Roo_JavaBean.aj
deleted file mode 100644
index a7615fb39..000000000
--- a/src/main/java/com/labsynch/labseer/service/ErrorList_Roo_JavaBean.aj
+++ /dev/null
@@ -1,20 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.service;
-
-import com.labsynch.labseer.service.ErrorList;
-import com.labsynch.labseer.service.ErrorMessage;
-import java.util.ArrayList;
-
-privileged aspect ErrorList_Roo_JavaBean {
-    
-    public ArrayList<ErrorMessage> ErrorList.getErrors() {
-        return this.errors;
-    }
-    
-    public void ErrorList.setErrors(ArrayList<ErrorMessage> errors) {
-        this.errors = errors;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/service/ErrorList_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/service/ErrorList_Roo_ToString.aj
deleted file mode 100644
index 5f8e92a3b..000000000
--- a/src/main/java/com/labsynch/labseer/service/ErrorList_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.service;
-
-import com.labsynch.labseer.service.ErrorList;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ErrorList_Roo_ToString {
-    
-    public String ErrorList.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/service/ErrorMessage.java b/src/main/java/com/labsynch/labseer/service/ErrorMessage.java
index 7f42d8582..d6dbccbf3 100755
--- a/src/main/java/com/labsynch/labseer/service/ErrorMessage.java
+++ b/src/main/java/com/labsynch/labseer/service/ErrorMessage.java
@@ -1,7 +1,12 @@
 package com.labsynch.labseer.service;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+import java.util.Collection;
+import java.util.List;
 import javax.validation.constraints.Size;
-
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.json.RooJson;
 import org.springframework.roo.addon.tostring.RooToString;
@@ -25,4 +30,54 @@ public ErrorMessage(String level, String message){
 	public ErrorMessage() {
 	}
     
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	public String toJson() {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(this);
+    }
+
+	public String toJson(String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(this);
+    }
+
+	public static ErrorMessage fromJsonToErrorMessage(String json) {
+        return new JSONDeserializer<ErrorMessage>()
+        .use(null, ErrorMessage.class).deserialize(json);
+    }
+
+	public static String toJsonArray(Collection<ErrorMessage> collection) {
+        return new JSONSerializer()
+        .exclude("*.class").serialize(collection);
+    }
+
+	public static String toJsonArray(Collection<ErrorMessage> collection, String[] fields) {
+        return new JSONSerializer()
+        .include(fields).exclude("*.class").serialize(collection);
+    }
+
+	public static Collection<ErrorMessage> fromJsonArrayToErrorMessages(String json) {
+        return new JSONDeserializer<List<ErrorMessage>>()
+        .use("values", ErrorMessage.class).deserialize(json);
+    }
+
+	public String getLevel() {
+        return this.level;
+    }
+
+	public void setLevel(String level) {
+        this.level = level;
+    }
+
+	public String getMessage() {
+        return this.message;
+    }
+
+	public void setMessage(String message) {
+        this.message = message;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ErrorMessage_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/service/ErrorMessage_Roo_JavaBean.aj
deleted file mode 100644
index 46a5ef10d..000000000
--- a/src/main/java/com/labsynch/labseer/service/ErrorMessage_Roo_JavaBean.aj
+++ /dev/null
@@ -1,26 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.service;
-
-import com.labsynch.labseer.service.ErrorMessage;
-
-privileged aspect ErrorMessage_Roo_JavaBean {
-    
-    public String ErrorMessage.getLevel() {
-        return this.level;
-    }
-    
-    public void ErrorMessage.setLevel(String level) {
-        this.level = level;
-    }
-    
-    public String ErrorMessage.getMessage() {
-        return this.message;
-    }
-    
-    public void ErrorMessage.setMessage(String message) {
-        this.message = message;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/service/ErrorMessage_Roo_Json.aj b/src/main/java/com/labsynch/labseer/service/ErrorMessage_Roo_Json.aj
deleted file mode 100644
index 9f157991d..000000000
--- a/src/main/java/com/labsynch/labseer/service/ErrorMessage_Roo_Json.aj
+++ /dev/null
@@ -1,45 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.service;
-
-import com.labsynch.labseer.service.ErrorMessage;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-privileged aspect ErrorMessage_Roo_Json {
-    
-    public String ErrorMessage.toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
-    
-    public String ErrorMessage.toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
-    
-    public static ErrorMessage ErrorMessage.fromJsonToErrorMessage(String json) {
-        return new JSONDeserializer<ErrorMessage>()
-        .use(null, ErrorMessage.class).deserialize(json);
-    }
-    
-    public static String ErrorMessage.toJsonArray(Collection<ErrorMessage> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-    
-    public static String ErrorMessage.toJsonArray(Collection<ErrorMessage> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-    
-    public static Collection<ErrorMessage> ErrorMessage.fromJsonArrayToErrorMessages(String json) {
-        return new JSONDeserializer<List<ErrorMessage>>()
-        .use("values", ErrorMessage.class).deserialize(json);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/service/ErrorMessage_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/service/ErrorMessage_Roo_ToString.aj
deleted file mode 100644
index bc12df3e1..000000000
--- a/src/main/java/com/labsynch/labseer/service/ErrorMessage_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.service;
-
-import com.labsynch.labseer.service.ErrorMessage;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect ErrorMessage_Roo_ToString {
-    
-    public String ErrorMessage.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/service/SaltLoader.java b/src/main/java/com/labsynch/labseer/service/SaltLoader.java
index fb03e3f00..acd23a0dc 100755
--- a/src/main/java/com/labsynch/labseer/service/SaltLoader.java
+++ b/src/main/java/com/labsynch/labseer/service/SaltLoader.java
@@ -1,17 +1,30 @@
 package com.labsynch.labseer.service;
 
 import java.util.Date;
-
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
-
+import javax.persistence.Version;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.roo.addon.javabean.RooJavaBean;
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
+@Entity
+@Configurable
 @RooJavaBean
 @RooToString
 @RooJpaActiveRecord
@@ -35,4 +48,184 @@ public class SaltLoader {
     @Temporal(TemporalType.TIMESTAMP)
     @DateTimeFormat(style = "S-")
     private Date loadedDate;
+
+	@PersistenceContext
+    transient EntityManager entityManager;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "description", "numberOfSalts", "size", "uploaded", "file", "fileName", "loadedDate");
+
+	public static final EntityManager entityManager() {
+        EntityManager em = new SaltLoader().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+	public static long countSaltLoaders() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM SaltLoader o", Long.class).getSingleResult();
+    }
+
+	public static List<SaltLoader> findAllSaltLoaders() {
+        return entityManager().createQuery("SELECT o FROM SaltLoader o", SaltLoader.class).getResultList();
+    }
+
+	public static List<SaltLoader> findAllSaltLoaders(String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM SaltLoader o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, SaltLoader.class).getResultList();
+    }
+
+	public static SaltLoader findSaltLoader(Long id) {
+        if (id == null) return null;
+        return entityManager().find(SaltLoader.class, id);
+    }
+
+	public static List<SaltLoader> findSaltLoaderEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM SaltLoader o", SaltLoader.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	public static List<SaltLoader> findSaltLoaderEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+        String jpaQuery = "SELECT o FROM SaltLoader o";
+        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+                jpaQuery = jpaQuery + " " + sortOrder;
+            }
+        }
+        return entityManager().createQuery(jpaQuery, SaltLoader.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
+	@Transactional
+    public void persist() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.persist(this);
+    }
+
+	@Transactional
+    public void remove() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager.contains(this)) {
+            this.entityManager.remove(this);
+        } else {
+            SaltLoader attached = SaltLoader.findSaltLoader(this.id);
+            this.entityManager.remove(attached);
+        }
+    }
+
+	@Transactional
+    public void flush() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.flush();
+    }
+
+	@Transactional
+    public void clear() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        this.entityManager.clear();
+    }
+
+	@Transactional
+    public SaltLoader merge() {
+        if (this.entityManager == null) this.entityManager = entityManager();
+        SaltLoader merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+	public String getName() {
+        return this.name;
+    }
+
+	public void setName(String name) {
+        this.name = name;
+    }
+
+	public String getDescription() {
+        return this.description;
+    }
+
+	public void setDescription(String description) {
+        this.description = description;
+    }
+
+	public long getNumberOfSalts() {
+        return this.numberOfSalts;
+    }
+
+	public void setNumberOfSalts(long numberOfSalts) {
+        this.numberOfSalts = numberOfSalts;
+    }
+
+	public long getSize() {
+        return this.size;
+    }
+
+	public void setSize(long size) {
+        this.size = size;
+    }
+
+	public Boolean getUploaded() {
+        return this.uploaded;
+    }
+
+	public void setUploaded(Boolean uploaded) {
+        this.uploaded = uploaded;
+    }
+
+	public MultipartFile getFile() {
+        return this.file;
+    }
+
+	public void setFile(MultipartFile file) {
+        this.file = file;
+    }
+
+	public String getFileName() {
+        return this.fileName;
+    }
+
+	public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+	public Date getLoadedDate() {
+        return this.loadedDate;
+    }
+
+	public void setLoadedDate(Date loadedDate) {
+        this.loadedDate = loadedDate;
+    }
+
+	public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private Long id;
+
+	@Version
+    @Column(name = "version")
+    private Integer version;
+
+	public Long getId() {
+        return this.id;
+    }
+
+	public void setId(Long id) {
+        this.id = id;
+    }
+
+	public Integer getVersion() {
+        return this.version;
+    }
+
+	public void setVersion(Integer version) {
+        this.version = version;
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/service/SaltLoader_Roo_Configurable.aj b/src/main/java/com/labsynch/labseer/service/SaltLoader_Roo_Configurable.aj
deleted file mode 100644
index 597500534..000000000
--- a/src/main/java/com/labsynch/labseer/service/SaltLoader_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.service;
-
-import com.labsynch.labseer.service.SaltLoader;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect SaltLoader_Roo_Configurable {
-    
-    declare @type: SaltLoader: @Configurable;
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/service/SaltLoader_Roo_JavaBean.aj b/src/main/java/com/labsynch/labseer/service/SaltLoader_Roo_JavaBean.aj
deleted file mode 100644
index 4273bfadc..000000000
--- a/src/main/java/com/labsynch/labseer/service/SaltLoader_Roo_JavaBean.aj
+++ /dev/null
@@ -1,76 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.service;
-
-import com.labsynch.labseer.service.SaltLoader;
-import java.util.Date;
-import org.springframework.web.multipart.MultipartFile;
-
-privileged aspect SaltLoader_Roo_JavaBean {
-    
-    public String SaltLoader.getName() {
-        return this.name;
-    }
-    
-    public void SaltLoader.setName(String name) {
-        this.name = name;
-    }
-    
-    public String SaltLoader.getDescription() {
-        return this.description;
-    }
-    
-    public void SaltLoader.setDescription(String description) {
-        this.description = description;
-    }
-    
-    public long SaltLoader.getNumberOfSalts() {
-        return this.numberOfSalts;
-    }
-    
-    public void SaltLoader.setNumberOfSalts(long numberOfSalts) {
-        this.numberOfSalts = numberOfSalts;
-    }
-    
-    public long SaltLoader.getSize() {
-        return this.size;
-    }
-    
-    public void SaltLoader.setSize(long size) {
-        this.size = size;
-    }
-    
-    public Boolean SaltLoader.getUploaded() {
-        return this.uploaded;
-    }
-    
-    public void SaltLoader.setUploaded(Boolean uploaded) {
-        this.uploaded = uploaded;
-    }
-    
-    public MultipartFile SaltLoader.getFile() {
-        return this.file;
-    }
-    
-    public void SaltLoader.setFile(MultipartFile file) {
-        this.file = file;
-    }
-    
-    public String SaltLoader.getFileName() {
-        return this.fileName;
-    }
-    
-    public void SaltLoader.setFileName(String fileName) {
-        this.fileName = fileName;
-    }
-    
-    public Date SaltLoader.getLoadedDate() {
-        return this.loadedDate;
-    }
-    
-    public void SaltLoader.setLoadedDate(Date loadedDate) {
-        this.loadedDate = loadedDate;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/service/SaltLoader_Roo_Jpa_ActiveRecord.aj b/src/main/java/com/labsynch/labseer/service/SaltLoader_Roo_Jpa_ActiveRecord.aj
deleted file mode 100644
index d67beb6e3..000000000
--- a/src/main/java/com/labsynch/labseer/service/SaltLoader_Roo_Jpa_ActiveRecord.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.service;
-
-import com.labsynch.labseer.service.SaltLoader;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect SaltLoader_Roo_Jpa_ActiveRecord {
-    
-    @PersistenceContext
-    transient EntityManager SaltLoader.entityManager;
-    
-    public static final List<String> SaltLoader.fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "description", "numberOfSalts", "size", "uploaded", "file", "fileName", "loadedDate");
-    
-    public static final EntityManager SaltLoader.entityManager() {
-        EntityManager em = new SaltLoader().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
-    
-    public static long SaltLoader.countSaltLoaders() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM SaltLoader o", Long.class).getSingleResult();
-    }
-    
-    public static List<SaltLoader> SaltLoader.findAllSaltLoaders() {
-        return entityManager().createQuery("SELECT o FROM SaltLoader o", SaltLoader.class).getResultList();
-    }
-    
-    public static List<SaltLoader> SaltLoader.findAllSaltLoaders(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM SaltLoader o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, SaltLoader.class).getResultList();
-    }
-    
-    public static SaltLoader SaltLoader.findSaltLoader(Long id) {
-        if (id == null) return null;
-        return entityManager().find(SaltLoader.class, id);
-    }
-    
-    public static List<SaltLoader> SaltLoader.findSaltLoaderEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM SaltLoader o", SaltLoader.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    public static List<SaltLoader> SaltLoader.findSaltLoaderEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM SaltLoader o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, SaltLoader.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
-    @Transactional
-    public void SaltLoader.persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
-    
-    @Transactional
-    public void SaltLoader.remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            SaltLoader attached = SaltLoader.findSaltLoader(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
-    
-    @Transactional
-    public void SaltLoader.flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
-    
-    @Transactional
-    public void SaltLoader.clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
-    
-    @Transactional
-    public SaltLoader SaltLoader.merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        SaltLoader merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/service/SaltLoader_Roo_Jpa_Entity.aj b/src/main/java/com/labsynch/labseer/service/SaltLoader_Roo_Jpa_Entity.aj
deleted file mode 100644
index 433f07b6d..000000000
--- a/src/main/java/com/labsynch/labseer/service/SaltLoader_Roo_Jpa_Entity.aj
+++ /dev/null
@@ -1,43 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.service;
-
-import com.labsynch.labseer.service.SaltLoader;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
-privileged aspect SaltLoader_Roo_Jpa_Entity {
-    
-    declare @type: SaltLoader: @Entity;
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long SaltLoader.id;
-    
-    @Version
-    @Column(name = "version")
-    private Integer SaltLoader.version;
-    
-    public Long SaltLoader.getId() {
-        return this.id;
-    }
-    
-    public void SaltLoader.setId(Long id) {
-        this.id = id;
-    }
-    
-    public Integer SaltLoader.getVersion() {
-        return this.version;
-    }
-    
-    public void SaltLoader.setVersion(Integer version) {
-        this.version = version;
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/service/SaltLoader_Roo_ToString.aj b/src/main/java/com/labsynch/labseer/service/SaltLoader_Roo_ToString.aj
deleted file mode 100644
index 0957f8648..000000000
--- a/src/main/java/com/labsynch/labseer/service/SaltLoader_Roo_ToString.aj
+++ /dev/null
@@ -1,16 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.service;
-
-import com.labsynch.labseer.service.SaltLoader;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-privileged aspect SaltLoader_Roo_ToString {
-    
-    public String SaltLoader.toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-    
-}
diff --git a/src/main/java/com/labsynch/labseer/web/ApplicationConversionServiceFactoryBean.java b/src/main/java/com/labsynch/labseer/web/ApplicationConversionServiceFactoryBean.java
index 439baf185..daca42fd4 100755
--- a/src/main/java/com/labsynch/labseer/web/ApplicationConversionServiceFactoryBean.java
+++ b/src/main/java/com/labsynch/labseer/web/ApplicationConversionServiceFactoryBean.java
@@ -1,5 +1,7 @@
 package com.labsynch.labseer.web;
 
+import com.labsynch.labseer.domain.*;
+import com.labsynch.labseer.service.SaltLoader;
 import java.util.Set;
 
 import org.springframework.beans.factory.annotation.Configurable;
@@ -7,110 +9,7 @@
 import org.springframework.format.FormatterRegistry;
 import org.springframework.format.support.FormattingConversionServiceFactoryBean;
 import org.springframework.roo.addon.web.mvc.controller.converter.RooConversionService;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.AnalysisGroupLabel;
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.domain.ApplicationSetting;
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.AuthorRole;
-import com.labsynch.labseer.domain.CodeKind;
-import com.labsynch.labseer.domain.CodeType;
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ContainerKind;
-import com.labsynch.labseer.domain.ContainerLabel;
-import com.labsynch.labseer.domain.ContainerState;
-import com.labsynch.labseer.domain.ContainerType;
-import com.labsynch.labseer.domain.ContainerValue;
-import com.labsynch.labseer.domain.DDictKind;
-import com.labsynch.labseer.domain.DDictType;
-import com.labsynch.labseer.domain.DDictValue;
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentKind;
-import com.labsynch.labseer.domain.ExperimentLabel;
-import com.labsynch.labseer.domain.ExperimentState;
-import com.labsynch.labseer.domain.ExperimentType;
-import com.labsynch.labseer.domain.ExperimentValue;
-import com.labsynch.labseer.domain.FileThing;
-import com.labsynch.labseer.domain.InteractionKind;
-import com.labsynch.labseer.domain.InteractionType;
-import com.labsynch.labseer.domain.ItxContainerContainer;
-import com.labsynch.labseer.domain.ItxContainerContainerState;
-import com.labsynch.labseer.domain.ItxContainerContainerValue;
-import com.labsynch.labseer.domain.ItxProtocolProtocol;
-import com.labsynch.labseer.domain.ItxProtocolProtocolState;
-import com.labsynch.labseer.domain.ItxProtocolProtocolValue;
-import com.labsynch.labseer.domain.ItxSubjectContainer;
-import com.labsynch.labseer.domain.ItxSubjectContainerState;
-import com.labsynch.labseer.domain.ItxSubjectContainerValue;
-import com.labsynch.labseer.domain.LabelKind;
-import com.labsynch.labseer.domain.LabelSequence;
-import com.labsynch.labseer.domain.LabelType;
-import com.labsynch.labseer.domain.LsInteraction;
-import com.labsynch.labseer.domain.LsRole;
-import com.labsynch.labseer.domain.LsTag;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.LsThingLabel;
-import com.labsynch.labseer.domain.LsThingState;
-import com.labsynch.labseer.domain.LsThingValue;
-import com.labsynch.labseer.domain.LsTransaction;
-import com.labsynch.labseer.domain.OperatorKind;
-import com.labsynch.labseer.domain.OperatorType;
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ProtocolKind;
-import com.labsynch.labseer.domain.ProtocolLabel;
-import com.labsynch.labseer.domain.ProtocolState;
-import com.labsynch.labseer.domain.ProtocolType;
-import com.labsynch.labseer.domain.ProtocolValue;
-import com.labsynch.labseer.domain.RoleKind;
-import com.labsynch.labseer.domain.RoleType;
-import com.labsynch.labseer.domain.StateKind;
-import com.labsynch.labseer.domain.StateType;
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.SubjectLabel;
-import com.labsynch.labseer.domain.SubjectState;
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.domain.ThingKind;
-import com.labsynch.labseer.domain.ThingPage;
-import com.labsynch.labseer.domain.ThingPageArchive;
-import com.labsynch.labseer.domain.ThingType;
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.domain.TreatmentGroupLabel;
-import com.labsynch.labseer.domain.TreatmentGroupState;
-import com.labsynch.labseer.domain.TreatmentGroupValue;
-import com.labsynch.labseer.domain.UncertaintyKind;
-import com.labsynch.labseer.domain.UnitKind;
-import com.labsynch.labseer.domain.UnitType;
-import com.labsynch.labseer.domain.UpdateLog;
-import com.labsynch.labseer.domain.ValueKind;
-import com.labsynch.labseer.domain.ValueType;
-import com.labsynch.labseer.domain.CmpdRegAppSetting;
-import com.labsynch.labseer.domain.CompoundType;
-import com.labsynch.labseer.domain.CorpName;
-import com.labsynch.labseer.domain.FileList;
-import com.labsynch.labseer.domain.FileType;
-import com.labsynch.labseer.domain.Isotope;
-import com.labsynch.labseer.domain.LotAlias;
-import com.labsynch.labseer.domain.LotAliasKind;
-import com.labsynch.labseer.domain.LotAliasType;
-import com.labsynch.labseer.domain.Operator;
-import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.domain.ParentAlias;
-import com.labsynch.labseer.domain.ParentAliasKind;
-import com.labsynch.labseer.domain.ParentAliasType;
-import com.labsynch.labseer.domain.ParentAnnotation;
-import com.labsynch.labseer.domain.PhysicalState;
-import com.labsynch.labseer.domain.PreDef_CorpName;
-import com.labsynch.labseer.domain.PurityMeasuredBy;
-import com.labsynch.labseer.domain.Salt;
-import com.labsynch.labseer.domain.SaltForm;
-import com.labsynch.labseer.domain.SolutionUnit;
-import com.labsynch.labseer.domain.StereoCategory;
-import com.labsynch.labseer.domain.Unit;
-import com.labsynch.labseer.domain.Vendor;
-import com.labsynch.labseer.domain.BulkLoadFile;;
+import org.springframework.transaction.annotation.Transactional;;
 
 
 @Configurable
@@ -2909,4 +2808,812 @@ public com.labsynch.labseer.domain.ParentAnnotation convert(String id) {
             }
         };
     }
+
+	public Converter<AuthorLabel, String> getAuthorLabelToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.AuthorLabel, java.lang.String>() {
+            public String convert(AuthorLabel authorLabel) {
+                return new StringBuilder().append(authorLabel.getLabelText()).append(' ').append(authorLabel.getRecordedBy()).append(' ').append(authorLabel.getRecordedDate()).append(' ').append(authorLabel.getModifiedDate()).toString();
+            }
+        };
+    }
+
+	public Converter<Long, AuthorLabel> getIdToAuthorLabelConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.AuthorLabel>() {
+            public com.labsynch.labseer.domain.AuthorLabel convert(java.lang.Long id) {
+                return AuthorLabel.findAuthorLabel(id);
+            }
+        };
+    }
+
+	public Converter<String, AuthorLabel> getStringToAuthorLabelConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.AuthorLabel>() {
+            public com.labsynch.labseer.domain.AuthorLabel convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), AuthorLabel.class);
+            }
+        };
+    }
+
+	public Converter<AuthorState, String> getAuthorStateToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.AuthorState, java.lang.String>() {
+            public String convert(AuthorState authorState) {
+                return new StringBuilder().append(authorState.getRecordedBy()).append(' ').append(authorState.getRecordedDate()).append(' ').append(authorState.getModifiedBy()).append(' ').append(authorState.getModifiedDate()).toString();
+            }
+        };
+    }
+
+	public Converter<Long, AuthorState> getIdToAuthorStateConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.AuthorState>() {
+            public com.labsynch.labseer.domain.AuthorState convert(java.lang.Long id) {
+                return AuthorState.findAuthorState(id);
+            }
+        };
+    }
+
+	public Converter<String, AuthorState> getStringToAuthorStateConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.AuthorState>() {
+            public com.labsynch.labseer.domain.AuthorState convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), AuthorState.class);
+            }
+        };
+    }
+
+	public Converter<AuthorValue, String> getAuthorValueToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.AuthorValue, java.lang.String>() {
+            public String convert(AuthorValue authorValue) {
+                return new StringBuilder().append(authorValue.getLsType()).append(' ').append(authorValue.getLsKind()).append(' ').append(authorValue.getLsTypeAndKind()).append(' ').append(authorValue.getCodeOrigin()).toString();
+            }
+        };
+    }
+
+	public Converter<Long, AuthorValue> getIdToAuthorValueConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.AuthorValue>() {
+            public com.labsynch.labseer.domain.AuthorValue convert(java.lang.Long id) {
+                return AuthorValue.findAuthorValue(id);
+            }
+        };
+    }
+
+	public Converter<String, AuthorValue> getStringToAuthorValueConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.AuthorValue>() {
+            public com.labsynch.labseer.domain.AuthorValue convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), AuthorValue.class);
+            }
+        };
+    }
+
+	public Converter<BulkLoadTemplate, String> getBulkLoadTemplateToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.BulkLoadTemplate, java.lang.String>() {
+            public String convert(BulkLoadTemplate bulkLoadTemplate) {
+                return new StringBuilder().append(bulkLoadTemplate.getTemplateName()).append(' ').append(bulkLoadTemplate.getJsonTemplate()).append(' ').append(bulkLoadTemplate.getRecordedBy()).toString();
+            }
+        };
+    }
+
+	public Converter<Long, BulkLoadTemplate> getIdToBulkLoadTemplateConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.BulkLoadTemplate>() {
+            public com.labsynch.labseer.domain.BulkLoadTemplate convert(java.lang.Long id) {
+                return BulkLoadTemplate.findBulkLoadTemplate(id);
+            }
+        };
+    }
+
+	public Converter<String, BulkLoadTemplate> getStringToBulkLoadTemplateConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.BulkLoadTemplate>() {
+            public com.labsynch.labseer.domain.BulkLoadTemplate convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), BulkLoadTemplate.class);
+            }
+        };
+    }
+
+	public Converter<CodeOrigin, String> getCodeOriginToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.CodeOrigin, java.lang.String>() {
+            public String convert(CodeOrigin codeOrigin) {
+                return new StringBuilder().append(codeOrigin.getName()).toString();
+            }
+        };
+    }
+
+	public Converter<Long, CodeOrigin> getIdToCodeOriginConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.CodeOrigin>() {
+            public com.labsynch.labseer.domain.CodeOrigin convert(java.lang.Long id) {
+                return CodeOrigin.findCodeOrigin(id);
+            }
+        };
+    }
+
+	public Converter<String, CodeOrigin> getStringToCodeOriginConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.CodeOrigin>() {
+            public com.labsynch.labseer.domain.CodeOrigin convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), CodeOrigin.class);
+            }
+        };
+    }
+
+	public Converter<Compound, String> getCompoundToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.Compound, java.lang.String>() {
+            public String convert(Compound compound) {
+                return new StringBuilder().append(compound.getCorpName()).append(' ').append(compound.getExternal_id()).append(' ').append(compound.getCdId()).append(' ').append(compound.getCreatedDate()).toString();
+            }
+        };
+    }
+
+	public Converter<Long, Compound> getIdToCompoundConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.Compound>() {
+            public com.labsynch.labseer.domain.Compound convert(java.lang.Long id) {
+                return Compound.findCompound(id);
+            }
+        };
+    }
+
+	public Converter<String, Compound> getStringToCompoundConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.Compound>() {
+            public com.labsynch.labseer.domain.Compound convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), Compound.class);
+            }
+        };
+    }
+
+	public Converter<CronJob, String> getCronJobToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.CronJob, java.lang.String>() {
+            public String convert(CronJob cronJob) {
+                return new StringBuilder().append(cronJob.getSchedule()).append(' ').append(cronJob.getScriptType()).append(' ').append(cronJob.getScriptFile()).append(' ').append(cronJob.getFunctionName()).toString();
+            }
+        };
+    }
+
+	public Converter<Long, CronJob> getIdToCronJobConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.CronJob>() {
+            public com.labsynch.labseer.domain.CronJob convert(java.lang.Long id) {
+                return CronJob.findCronJob(id);
+            }
+        };
+    }
+
+	public Converter<String, CronJob> getStringToCronJobConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.CronJob>() {
+            public com.labsynch.labseer.domain.CronJob convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), CronJob.class);
+            }
+        };
+    }
+
+	public Converter<IsoSalt, String> getIsoSaltToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.IsoSalt, java.lang.String>() {
+            public String convert(IsoSalt isoSalt) {
+                return new StringBuilder().append(isoSalt.getType()).append(' ').append(isoSalt.getEquivalents()).toString();
+            }
+        };
+    }
+
+	public Converter<Long, IsoSalt> getIdToIsoSaltConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.IsoSalt>() {
+            public com.labsynch.labseer.domain.IsoSalt convert(java.lang.Long id) {
+                return IsoSalt.findIsoSalt(id);
+            }
+        };
+    }
+
+	public Converter<String, IsoSalt> getStringToIsoSaltConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.IsoSalt>() {
+            public com.labsynch.labseer.domain.IsoSalt convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), IsoSalt.class);
+            }
+        };
+    }
+
+	public Converter<ItxExperimentExperiment, String> getItxExperimentExperimentToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxExperimentExperiment, java.lang.String>() {
+            public String convert(ItxExperimentExperiment itxExperimentExperiment) {
+                return new StringBuilder().append(itxExperimentExperiment.getLsType()).append(' ').append(itxExperimentExperiment.getLsKind()).append(' ').append(itxExperimentExperiment.getLsTypeAndKind()).append(' ').append(itxExperimentExperiment.getCodeName()).toString();
+            }
+        };
+    }
+
+	public Converter<Long, ItxExperimentExperiment> getIdToItxExperimentExperimentConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxExperimentExperiment>() {
+            public com.labsynch.labseer.domain.ItxExperimentExperiment convert(java.lang.Long id) {
+                return ItxExperimentExperiment.findItxExperimentExperiment(id);
+            }
+        };
+    }
+
+	public Converter<String, ItxExperimentExperiment> getStringToItxExperimentExperimentConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxExperimentExperiment>() {
+            public com.labsynch.labseer.domain.ItxExperimentExperiment convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), ItxExperimentExperiment.class);
+            }
+        };
+    }
+
+	public Converter<ItxExperimentExperimentState, String> getItxExperimentExperimentStateToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxExperimentExperimentState, java.lang.String>() {
+            public String convert(ItxExperimentExperimentState itxExperimentExperimentState) {
+                return new StringBuilder().append(itxExperimentExperimentState.getRecordedBy()).append(' ').append(itxExperimentExperimentState.getRecordedDate()).append(' ').append(itxExperimentExperimentState.getModifiedBy()).append(' ').append(itxExperimentExperimentState.getModifiedDate()).toString();
+            }
+        };
+    }
+
+	public Converter<Long, ItxExperimentExperimentState> getIdToItxExperimentExperimentStateConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxExperimentExperimentState>() {
+            public com.labsynch.labseer.domain.ItxExperimentExperimentState convert(java.lang.Long id) {
+                return ItxExperimentExperimentState.findItxExperimentExperimentState(id);
+            }
+        };
+    }
+
+	public Converter<String, ItxExperimentExperimentState> getStringToItxExperimentExperimentStateConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxExperimentExperimentState>() {
+            public com.labsynch.labseer.domain.ItxExperimentExperimentState convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), ItxExperimentExperimentState.class);
+            }
+        };
+    }
+
+	public Converter<ItxExperimentExperimentValue, String> getItxExperimentExperimentValueToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxExperimentExperimentValue, java.lang.String>() {
+            public String convert(ItxExperimentExperimentValue itxExperimentExperimentValue) {
+                return new StringBuilder().append(itxExperimentExperimentValue.getLsType()).append(' ').append(itxExperimentExperimentValue.getLsKind()).append(' ').append(itxExperimentExperimentValue.getLsTypeAndKind()).append(' ').append(itxExperimentExperimentValue.getCodeOrigin()).toString();
+            }
+        };
+    }
+
+	public Converter<Long, ItxExperimentExperimentValue> getIdToItxExperimentExperimentValueConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxExperimentExperimentValue>() {
+            public com.labsynch.labseer.domain.ItxExperimentExperimentValue convert(java.lang.Long id) {
+                return ItxExperimentExperimentValue.findItxExperimentExperimentValue(id);
+            }
+        };
+    }
+
+	public Converter<String, ItxExperimentExperimentValue> getStringToItxExperimentExperimentValueConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxExperimentExperimentValue>() {
+            public com.labsynch.labseer.domain.ItxExperimentExperimentValue convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), ItxExperimentExperimentValue.class);
+            }
+        };
+    }
+
+	public Converter<ItxLsThingLsThing, String> getItxLsThingLsThingToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxLsThingLsThing, java.lang.String>() {
+            public String convert(ItxLsThingLsThing itxLsThingLsThing) {
+                return new StringBuilder().append(itxLsThingLsThing.getLsType()).append(' ').append(itxLsThingLsThing.getLsKind()).append(' ').append(itxLsThingLsThing.getLsTypeAndKind()).append(' ').append(itxLsThingLsThing.getCodeName()).toString();
+            }
+        };
+    }
+
+	public Converter<Long, ItxLsThingLsThing> getIdToItxLsThingLsThingConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxLsThingLsThing>() {
+            public com.labsynch.labseer.domain.ItxLsThingLsThing convert(java.lang.Long id) {
+                return ItxLsThingLsThing.findItxLsThingLsThing(id);
+            }
+        };
+    }
+
+	public Converter<String, ItxLsThingLsThing> getStringToItxLsThingLsThingConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxLsThingLsThing>() {
+            public com.labsynch.labseer.domain.ItxLsThingLsThing convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), ItxLsThingLsThing.class);
+            }
+        };
+    }
+
+	public Converter<ItxLsThingLsThingState, String> getItxLsThingLsThingStateToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxLsThingLsThingState, java.lang.String>() {
+            public String convert(ItxLsThingLsThingState itxLsThingLsThingState) {
+                return new StringBuilder().append(itxLsThingLsThingState.getRecordedBy()).append(' ').append(itxLsThingLsThingState.getRecordedDate()).append(' ').append(itxLsThingLsThingState.getModifiedBy()).append(' ').append(itxLsThingLsThingState.getModifiedDate()).toString();
+            }
+        };
+    }
+
+	public Converter<Long, ItxLsThingLsThingState> getIdToItxLsThingLsThingStateConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxLsThingLsThingState>() {
+            public com.labsynch.labseer.domain.ItxLsThingLsThingState convert(java.lang.Long id) {
+                return ItxLsThingLsThingState.findItxLsThingLsThingState(id);
+            }
+        };
+    }
+
+	public Converter<String, ItxLsThingLsThingState> getStringToItxLsThingLsThingStateConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxLsThingLsThingState>() {
+            public com.labsynch.labseer.domain.ItxLsThingLsThingState convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), ItxLsThingLsThingState.class);
+            }
+        };
+    }
+
+	public Converter<ItxLsThingLsThingValue, String> getItxLsThingLsThingValueToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxLsThingLsThingValue, java.lang.String>() {
+            public String convert(ItxLsThingLsThingValue itxLsThingLsThingValue) {
+                return new StringBuilder().append(itxLsThingLsThingValue.getLsType()).append(' ').append(itxLsThingLsThingValue.getLsKind()).append(' ').append(itxLsThingLsThingValue.getLsTypeAndKind()).append(' ').append(itxLsThingLsThingValue.getCodeOrigin()).toString();
+            }
+        };
+    }
+
+	public Converter<Long, ItxLsThingLsThingValue> getIdToItxLsThingLsThingValueConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxLsThingLsThingValue>() {
+            public com.labsynch.labseer.domain.ItxLsThingLsThingValue convert(java.lang.Long id) {
+                return ItxLsThingLsThingValue.findItxLsThingLsThingValue(id);
+            }
+        };
+    }
+
+	public Converter<String, ItxLsThingLsThingValue> getStringToItxLsThingLsThingValueConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxLsThingLsThingValue>() {
+            public com.labsynch.labseer.domain.ItxLsThingLsThingValue convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), ItxLsThingLsThingValue.class);
+            }
+        };
+    }
+
+	public Converter<LabelSequenceRole, String> getLabelSequenceRoleToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LabelSequenceRole, java.lang.String>() {
+            public String convert(LabelSequenceRole labelSequenceRole) {
+                return "(no displayable fields)";
+            }
+        };
+    }
+
+	public Converter<Long, LabelSequenceRole> getIdToLabelSequenceRoleConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LabelSequenceRole>() {
+            public com.labsynch.labseer.domain.LabelSequenceRole convert(java.lang.Long id) {
+                return LabelSequenceRole.findLabelSequenceRole(id);
+            }
+        };
+    }
+
+	public Converter<String, LabelSequenceRole> getStringToLabelSequenceRoleConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LabelSequenceRole>() {
+            public com.labsynch.labseer.domain.LabelSequenceRole convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), LabelSequenceRole.class);
+            }
+        };
+    }
+
+	public Converter<Lot, String> getLotToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.Lot, java.lang.String>() {
+            public String convert(Lot lot) {
+                return new StringBuilder().append(lot.getStorageLocation()).append(' ').append(lot.getBuid()).append(' ').append(lot.getAsDrawnStruct()).append(' ').append(lot.getLotAsDrawnCdId()).toString();
+            }
+        };
+    }
+
+	public Converter<Long, Lot> getIdToLotConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.Lot>() {
+            public com.labsynch.labseer.domain.Lot convert(java.lang.Long id) {
+                return Lot.findLot(id);
+            }
+        };
+    }
+
+	public Converter<String, Lot> getStringToLotConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.Lot>() {
+            public com.labsynch.labseer.domain.Lot convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), Lot.class);
+            }
+        };
+    }
+
+	public Converter<LsSeqAnlGrp, String> getLsSeqAnlGrpToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqAnlGrp, java.lang.String>() {
+            public String convert(LsSeqAnlGrp lsSeqAnlGrp) {
+                return "(no displayable fields)";
+            }
+        };
+    }
+
+	public Converter<Long, LsSeqAnlGrp> getIdToLsSeqAnlGrpConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqAnlGrp>() {
+            public com.labsynch.labseer.domain.LsSeqAnlGrp convert(java.lang.Long id) {
+                return LsSeqAnlGrp.findLsSeqAnlGrp(id);
+            }
+        };
+    }
+
+	public Converter<String, LsSeqAnlGrp> getStringToLsSeqAnlGrpConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqAnlGrp>() {
+            public com.labsynch.labseer.domain.LsSeqAnlGrp convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), LsSeqAnlGrp.class);
+            }
+        };
+    }
+
+	public Converter<LsSeqContainer, String> getLsSeqContainerToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqContainer, java.lang.String>() {
+            public String convert(LsSeqContainer lsSeqContainer) {
+                return "(no displayable fields)";
+            }
+        };
+    }
+
+	public Converter<Long, LsSeqContainer> getIdToLsSeqContainerConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqContainer>() {
+            public com.labsynch.labseer.domain.LsSeqContainer convert(java.lang.Long id) {
+                return LsSeqContainer.findLsSeqContainer(id);
+            }
+        };
+    }
+
+	public Converter<String, LsSeqContainer> getStringToLsSeqContainerConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqContainer>() {
+            public com.labsynch.labseer.domain.LsSeqContainer convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), LsSeqContainer.class);
+            }
+        };
+    }
+
+	public Converter<LsSeqExpt, String> getLsSeqExptToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqExpt, java.lang.String>() {
+            public String convert(LsSeqExpt lsSeqExpt) {
+                return "(no displayable fields)";
+            }
+        };
+    }
+
+	public Converter<Long, LsSeqExpt> getIdToLsSeqExptConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqExpt>() {
+            public com.labsynch.labseer.domain.LsSeqExpt convert(java.lang.Long id) {
+                return LsSeqExpt.findLsSeqExpt(id);
+            }
+        };
+    }
+
+	public Converter<String, LsSeqExpt> getStringToLsSeqExptConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqExpt>() {
+            public com.labsynch.labseer.domain.LsSeqExpt convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), LsSeqExpt.class);
+            }
+        };
+    }
+
+	public Converter<LsSeqItxCntrCntr, String> getLsSeqItxCntrCntrToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqItxCntrCntr, java.lang.String>() {
+            public String convert(LsSeqItxCntrCntr lsSeqItxCntrCntr) {
+                return "(no displayable fields)";
+            }
+        };
+    }
+
+	public Converter<Long, LsSeqItxCntrCntr> getIdToLsSeqItxCntrCntrConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqItxCntrCntr>() {
+            public com.labsynch.labseer.domain.LsSeqItxCntrCntr convert(java.lang.Long id) {
+                return LsSeqItxCntrCntr.findLsSeqItxCntrCntr(id);
+            }
+        };
+    }
+
+	public Converter<String, LsSeqItxCntrCntr> getStringToLsSeqItxCntrCntrConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqItxCntrCntr>() {
+            public com.labsynch.labseer.domain.LsSeqItxCntrCntr convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), LsSeqItxCntrCntr.class);
+            }
+        };
+    }
+
+	public Converter<LsSeqItxExperimentExperiment, String> getLsSeqItxExperimentExperimentToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqItxExperimentExperiment, java.lang.String>() {
+            public String convert(LsSeqItxExperimentExperiment lsSeqItxExperimentExperiment) {
+                return "(no displayable fields)";
+            }
+        };
+    }
+
+	public Converter<Long, LsSeqItxExperimentExperiment> getIdToLsSeqItxExperimentExperimentConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqItxExperimentExperiment>() {
+            public com.labsynch.labseer.domain.LsSeqItxExperimentExperiment convert(java.lang.Long id) {
+                return LsSeqItxExperimentExperiment.findLsSeqItxExperimentExperiment(id);
+            }
+        };
+    }
+
+	public Converter<String, LsSeqItxExperimentExperiment> getStringToLsSeqItxExperimentExperimentConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqItxExperimentExperiment>() {
+            public com.labsynch.labseer.domain.LsSeqItxExperimentExperiment convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), LsSeqItxExperimentExperiment.class);
+            }
+        };
+    }
+
+	public Converter<LsSeqItxLsThingLsThing, String> getLsSeqItxLsThingLsThingToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqItxLsThingLsThing, java.lang.String>() {
+            public String convert(LsSeqItxLsThingLsThing lsSeqItxLsThingLsThing) {
+                return "(no displayable fields)";
+            }
+        };
+    }
+
+	public Converter<Long, LsSeqItxLsThingLsThing> getIdToLsSeqItxLsThingLsThingConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqItxLsThingLsThing>() {
+            public com.labsynch.labseer.domain.LsSeqItxLsThingLsThing convert(java.lang.Long id) {
+                return LsSeqItxLsThingLsThing.findLsSeqItxLsThingLsThing(id);
+            }
+        };
+    }
+
+	public Converter<String, LsSeqItxLsThingLsThing> getStringToLsSeqItxLsThingLsThingConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqItxLsThingLsThing>() {
+            public com.labsynch.labseer.domain.LsSeqItxLsThingLsThing convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), LsSeqItxLsThingLsThing.class);
+            }
+        };
+    }
+
+	public Converter<LsSeqItxProtocolProtocol, String> getLsSeqItxProtocolProtocolToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqItxProtocolProtocol, java.lang.String>() {
+            public String convert(LsSeqItxProtocolProtocol lsSeqItxProtocolProtocol) {
+                return "(no displayable fields)";
+            }
+        };
+    }
+
+	public Converter<Long, LsSeqItxProtocolProtocol> getIdToLsSeqItxProtocolProtocolConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqItxProtocolProtocol>() {
+            public com.labsynch.labseer.domain.LsSeqItxProtocolProtocol convert(java.lang.Long id) {
+                return LsSeqItxProtocolProtocol.findLsSeqItxProtocolProtocol(id);
+            }
+        };
+    }
+
+	public Converter<String, LsSeqItxProtocolProtocol> getStringToLsSeqItxProtocolProtocolConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqItxProtocolProtocol>() {
+            public com.labsynch.labseer.domain.LsSeqItxProtocolProtocol convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), LsSeqItxProtocolProtocol.class);
+            }
+        };
+    }
+
+	public Converter<LsSeqItxSubjCntr, String> getLsSeqItxSubjCntrToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqItxSubjCntr, java.lang.String>() {
+            public String convert(LsSeqItxSubjCntr lsSeqItxSubjCntr) {
+                return "(no displayable fields)";
+            }
+        };
+    }
+
+	public Converter<Long, LsSeqItxSubjCntr> getIdToLsSeqItxSubjCntrConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqItxSubjCntr>() {
+            public com.labsynch.labseer.domain.LsSeqItxSubjCntr convert(java.lang.Long id) {
+                return LsSeqItxSubjCntr.findLsSeqItxSubjCntr(id);
+            }
+        };
+    }
+
+	public Converter<String, LsSeqItxSubjCntr> getStringToLsSeqItxSubjCntrConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqItxSubjCntr>() {
+            public com.labsynch.labseer.domain.LsSeqItxSubjCntr convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), LsSeqItxSubjCntr.class);
+            }
+        };
+    }
+
+	public Converter<LsSeqProtocol, String> getLsSeqProtocolToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqProtocol, java.lang.String>() {
+            public String convert(LsSeqProtocol lsSeqProtocol) {
+                return "(no displayable fields)";
+            }
+        };
+    }
+
+	public Converter<Long, LsSeqProtocol> getIdToLsSeqProtocolConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqProtocol>() {
+            public com.labsynch.labseer.domain.LsSeqProtocol convert(java.lang.Long id) {
+                return LsSeqProtocol.findLsSeqProtocol(id);
+            }
+        };
+    }
+
+	public Converter<String, LsSeqProtocol> getStringToLsSeqProtocolConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqProtocol>() {
+            public com.labsynch.labseer.domain.LsSeqProtocol convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), LsSeqProtocol.class);
+            }
+        };
+    }
+
+	public Converter<LsSeqSubject, String> getLsSeqSubjectToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqSubject, java.lang.String>() {
+            public String convert(LsSeqSubject lsSeqSubject) {
+                return "(no displayable fields)";
+            }
+        };
+    }
+
+	public Converter<Long, LsSeqSubject> getIdToLsSeqSubjectConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqSubject>() {
+            public com.labsynch.labseer.domain.LsSeqSubject convert(java.lang.Long id) {
+                return LsSeqSubject.findLsSeqSubject(id);
+            }
+        };
+    }
+
+	public Converter<String, LsSeqSubject> getStringToLsSeqSubjectConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqSubject>() {
+            public com.labsynch.labseer.domain.LsSeqSubject convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), LsSeqSubject.class);
+            }
+        };
+    }
+
+	public Converter<LsSeqTrtGrp, String> getLsSeqTrtGrpToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqTrtGrp, java.lang.String>() {
+            public String convert(LsSeqTrtGrp lsSeqTrtGrp) {
+                return "(no displayable fields)";
+            }
+        };
+    }
+
+	public Converter<Long, LsSeqTrtGrp> getIdToLsSeqTrtGrpConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqTrtGrp>() {
+            public com.labsynch.labseer.domain.LsSeqTrtGrp convert(java.lang.Long id) {
+                return LsSeqTrtGrp.findLsSeqTrtGrp(id);
+            }
+        };
+    }
+
+	public Converter<String, LsSeqTrtGrp> getStringToLsSeqTrtGrpConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqTrtGrp>() {
+            public com.labsynch.labseer.domain.LsSeqTrtGrp convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), LsSeqTrtGrp.class);
+            }
+        };
+    }
+
+	public Converter<Long, RoleKind> getIdToRoleKindConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.RoleKind>() {
+            public com.labsynch.labseer.domain.RoleKind convert(java.lang.Long id) {
+                return RoleKind.findRoleKind(id);
+            }
+        };
+    }
+
+	public Converter<String, RoleKind> getStringToRoleKindConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.RoleKind>() {
+            public com.labsynch.labseer.domain.RoleKind convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), RoleKind.class);
+            }
+        };
+    }
+
+	public Converter<RoleType, String> getRoleTypeToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.RoleType, java.lang.String>() {
+            public String convert(RoleType roleType) {
+                return new StringBuilder().append(roleType.getTypeName()).toString();
+            }
+        };
+    }
+
+	public Converter<Long, RoleType> getIdToRoleTypeConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.RoleType>() {
+            public com.labsynch.labseer.domain.RoleType convert(java.lang.Long id) {
+                return RoleType.findRoleType(id);
+            }
+        };
+    }
+
+	public Converter<String, RoleType> getStringToRoleTypeConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.RoleType>() {
+            public com.labsynch.labseer.domain.RoleType convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), RoleType.class);
+            }
+        };
+    }
+
+	public Converter<SaltFormAlias, String> getSaltFormAliasToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.SaltFormAlias, java.lang.String>() {
+            public String convert(SaltFormAlias saltFormAlias) {
+                return new StringBuilder().append(saltFormAlias.getLsType()).append(' ').append(saltFormAlias.getLsKind()).append(' ').append(saltFormAlias.getAliasName()).toString();
+            }
+        };
+    }
+
+	public Converter<Long, SaltFormAlias> getIdToSaltFormAliasConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.SaltFormAlias>() {
+            public com.labsynch.labseer.domain.SaltFormAlias convert(java.lang.Long id) {
+                return SaltFormAlias.findSaltFormAlias(id);
+            }
+        };
+    }
+
+	public Converter<String, SaltFormAlias> getStringToSaltFormAliasConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.SaltFormAlias>() {
+            public com.labsynch.labseer.domain.SaltFormAlias convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), SaltFormAlias.class);
+            }
+        };
+    }
+
+	public Converter<SaltFormAliasKind, String> getSaltFormAliasKindToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.SaltFormAliasKind, java.lang.String>() {
+            public String convert(SaltFormAliasKind saltFormAliasKind) {
+                return new StringBuilder().append(saltFormAliasKind.getKindName()).toString();
+            }
+        };
+    }
+
+	public Converter<Long, SaltFormAliasKind> getIdToSaltFormAliasKindConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.SaltFormAliasKind>() {
+            public com.labsynch.labseer.domain.SaltFormAliasKind convert(java.lang.Long id) {
+                return SaltFormAliasKind.findSaltFormAliasKind(id);
+            }
+        };
+    }
+
+	public Converter<String, SaltFormAliasKind> getStringToSaltFormAliasKindConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.SaltFormAliasKind>() {
+            public com.labsynch.labseer.domain.SaltFormAliasKind convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), SaltFormAliasKind.class);
+            }
+        };
+    }
+
+	public Converter<SaltFormAliasType, String> getSaltFormAliasTypeToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.SaltFormAliasType, java.lang.String>() {
+            public String convert(SaltFormAliasType saltFormAliasType) {
+                return new StringBuilder().append(saltFormAliasType.getTypeName()).toString();
+            }
+        };
+    }
+
+	public Converter<Long, SaltFormAliasType> getIdToSaltFormAliasTypeConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.SaltFormAliasType>() {
+            public com.labsynch.labseer.domain.SaltFormAliasType convert(java.lang.Long id) {
+                return SaltFormAliasType.findSaltFormAliasType(id);
+            }
+        };
+    }
+
+	public Converter<String, SaltFormAliasType> getStringToSaltFormAliasTypeConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.SaltFormAliasType>() {
+            public com.labsynch.labseer.domain.SaltFormAliasType convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), SaltFormAliasType.class);
+            }
+        };
+    }
+
+	public Converter<TempSelectTable, String> getTempSelectTableToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.TempSelectTable, java.lang.String>() {
+            public String convert(TempSelectTable tempSelectTable) {
+                return new StringBuilder().append(tempSelectTable.getNumberVar()).append(' ').append(tempSelectTable.getStringVar()).append(' ').append(tempSelectTable.getLsTransaction()).append(' ').append(tempSelectTable.getRecordedDate()).toString();
+            }
+        };
+    }
+
+	public Converter<Long, TempSelectTable> getIdToTempSelectTableConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.TempSelectTable>() {
+            public com.labsynch.labseer.domain.TempSelectTable convert(java.lang.Long id) {
+                return TempSelectTable.findTempSelectTable(id);
+            }
+        };
+    }
+
+	public Converter<String, TempSelectTable> getStringToTempSelectTableConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.TempSelectTable>() {
+            public com.labsynch.labseer.domain.TempSelectTable convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), TempSelectTable.class);
+            }
+        };
+    }
+
+	public Converter<SaltLoader, String> getSaltLoaderToStringConverter() {
+        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.service.SaltLoader, java.lang.String>() {
+            public String convert(SaltLoader saltLoader) {
+                return new StringBuilder().append(saltLoader.getName()).append(' ').append(saltLoader.getDescription()).append(' ').append(saltLoader.getNumberOfSalts()).append(' ').append(saltLoader.getSize()).toString();
+            }
+        };
+    }
+
+	public Converter<Long, SaltLoader> getIdToSaltLoaderConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.service.SaltLoader>() {
+            public com.labsynch.labseer.service.SaltLoader convert(java.lang.Long id) {
+                return SaltLoader.findSaltLoader(id);
+            }
+        };
+    }
+
+	public Converter<String, SaltLoader> getStringToSaltLoaderConverter() {
+        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.service.SaltLoader>() {
+            public com.labsynch.labseer.service.SaltLoader convert(String id) {
+                return getObject().convert(getObject().convert(id, Long.class), SaltLoader.class);
+            }
+        };
+    }
 }
diff --git a/src/main/java/com/labsynch/labseer/web/ApplicationConversionServiceFactoryBean_Roo_ConversionService.aj b/src/main/java/com/labsynch/labseer/web/ApplicationConversionServiceFactoryBean_Roo_ConversionService.aj
deleted file mode 100644
index 16009b253..000000000
--- a/src/main/java/com/labsynch/labseer/web/ApplicationConversionServiceFactoryBean_Roo_ConversionService.aj
+++ /dev/null
@@ -1,853 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.web;
-
-import com.labsynch.labseer.domain.AuthorLabel;
-import com.labsynch.labseer.domain.AuthorState;
-import com.labsynch.labseer.domain.AuthorValue;
-import com.labsynch.labseer.domain.BulkLoadTemplate;
-import com.labsynch.labseer.domain.CodeOrigin;
-import com.labsynch.labseer.domain.Compound;
-import com.labsynch.labseer.domain.CronJob;
-import com.labsynch.labseer.domain.IsoSalt;
-import com.labsynch.labseer.domain.ItxExperimentExperiment;
-import com.labsynch.labseer.domain.ItxExperimentExperimentState;
-import com.labsynch.labseer.domain.ItxExperimentExperimentValue;
-import com.labsynch.labseer.domain.ItxLsThingLsThing;
-import com.labsynch.labseer.domain.ItxLsThingLsThingState;
-import com.labsynch.labseer.domain.ItxLsThingLsThingValue;
-import com.labsynch.labseer.domain.LabelSequenceRole;
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.domain.LsSeqAnlGrp;
-import com.labsynch.labseer.domain.LsSeqContainer;
-import com.labsynch.labseer.domain.LsSeqExpt;
-import com.labsynch.labseer.domain.LsSeqItxCntrCntr;
-import com.labsynch.labseer.domain.LsSeqItxExperimentExperiment;
-import com.labsynch.labseer.domain.LsSeqItxLsThingLsThing;
-import com.labsynch.labseer.domain.LsSeqItxProtocolProtocol;
-import com.labsynch.labseer.domain.LsSeqItxSubjCntr;
-import com.labsynch.labseer.domain.LsSeqProtocol;
-import com.labsynch.labseer.domain.LsSeqSubject;
-import com.labsynch.labseer.domain.LsSeqTrtGrp;
-import com.labsynch.labseer.domain.RoleKind;
-import com.labsynch.labseer.domain.RoleType;
-import com.labsynch.labseer.domain.SaltFormAlias;
-import com.labsynch.labseer.domain.SaltFormAliasKind;
-import com.labsynch.labseer.domain.SaltFormAliasType;
-import com.labsynch.labseer.domain.TempSelectTable;
-import com.labsynch.labseer.service.SaltLoader;
-import com.labsynch.labseer.web.ApplicationConversionServiceFactoryBean;
-import org.springframework.core.convert.converter.Converter;
-
-privileged aspect ApplicationConversionServiceFactoryBean_Roo_ConversionService {
-    
-    public Converter<AuthorLabel, String> ApplicationConversionServiceFactoryBean.getAuthorLabelToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.AuthorLabel, java.lang.String>() {
-            public String convert(AuthorLabel authorLabel) {
-                return new StringBuilder().append(authorLabel.getLabelText()).append(' ').append(authorLabel.getRecordedBy()).append(' ').append(authorLabel.getRecordedDate()).append(' ').append(authorLabel.getModifiedDate()).toString();
-            }
-        };
-    }
-    
-    public Converter<Long, AuthorLabel> ApplicationConversionServiceFactoryBean.getIdToAuthorLabelConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.AuthorLabel>() {
-            public com.labsynch.labseer.domain.AuthorLabel convert(java.lang.Long id) {
-                return AuthorLabel.findAuthorLabel(id);
-            }
-        };
-    }
-    
-    public Converter<String, AuthorLabel> ApplicationConversionServiceFactoryBean.getStringToAuthorLabelConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.AuthorLabel>() {
-            public com.labsynch.labseer.domain.AuthorLabel convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), AuthorLabel.class);
-            }
-        };
-    }
-    
-    public Converter<AuthorState, String> ApplicationConversionServiceFactoryBean.getAuthorStateToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.AuthorState, java.lang.String>() {
-            public String convert(AuthorState authorState) {
-                return new StringBuilder().append(authorState.getRecordedBy()).append(' ').append(authorState.getRecordedDate()).append(' ').append(authorState.getModifiedBy()).append(' ').append(authorState.getModifiedDate()).toString();
-            }
-        };
-    }
-    
-    public Converter<Long, AuthorState> ApplicationConversionServiceFactoryBean.getIdToAuthorStateConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.AuthorState>() {
-            public com.labsynch.labseer.domain.AuthorState convert(java.lang.Long id) {
-                return AuthorState.findAuthorState(id);
-            }
-        };
-    }
-    
-    public Converter<String, AuthorState> ApplicationConversionServiceFactoryBean.getStringToAuthorStateConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.AuthorState>() {
-            public com.labsynch.labseer.domain.AuthorState convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), AuthorState.class);
-            }
-        };
-    }
-    
-    public Converter<AuthorValue, String> ApplicationConversionServiceFactoryBean.getAuthorValueToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.AuthorValue, java.lang.String>() {
-            public String convert(AuthorValue authorValue) {
-                return new StringBuilder().append(authorValue.getLsType()).append(' ').append(authorValue.getLsKind()).append(' ').append(authorValue.getLsTypeAndKind()).append(' ').append(authorValue.getCodeOrigin()).toString();
-            }
-        };
-    }
-    
-    public Converter<Long, AuthorValue> ApplicationConversionServiceFactoryBean.getIdToAuthorValueConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.AuthorValue>() {
-            public com.labsynch.labseer.domain.AuthorValue convert(java.lang.Long id) {
-                return AuthorValue.findAuthorValue(id);
-            }
-        };
-    }
-    
-    public Converter<String, AuthorValue> ApplicationConversionServiceFactoryBean.getStringToAuthorValueConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.AuthorValue>() {
-            public com.labsynch.labseer.domain.AuthorValue convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), AuthorValue.class);
-            }
-        };
-    }
-    
-    public Converter<BulkLoadTemplate, String> ApplicationConversionServiceFactoryBean.getBulkLoadTemplateToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.BulkLoadTemplate, java.lang.String>() {
-            public String convert(BulkLoadTemplate bulkLoadTemplate) {
-                return new StringBuilder().append(bulkLoadTemplate.getTemplateName()).append(' ').append(bulkLoadTemplate.getJsonTemplate()).append(' ').append(bulkLoadTemplate.getRecordedBy()).toString();
-            }
-        };
-    }
-    
-    public Converter<Long, BulkLoadTemplate> ApplicationConversionServiceFactoryBean.getIdToBulkLoadTemplateConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.BulkLoadTemplate>() {
-            public com.labsynch.labseer.domain.BulkLoadTemplate convert(java.lang.Long id) {
-                return BulkLoadTemplate.findBulkLoadTemplate(id);
-            }
-        };
-    }
-    
-    public Converter<String, BulkLoadTemplate> ApplicationConversionServiceFactoryBean.getStringToBulkLoadTemplateConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.BulkLoadTemplate>() {
-            public com.labsynch.labseer.domain.BulkLoadTemplate convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), BulkLoadTemplate.class);
-            }
-        };
-    }
-    
-    public Converter<CodeOrigin, String> ApplicationConversionServiceFactoryBean.getCodeOriginToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.CodeOrigin, java.lang.String>() {
-            public String convert(CodeOrigin codeOrigin) {
-                return new StringBuilder().append(codeOrigin.getName()).toString();
-            }
-        };
-    }
-    
-    public Converter<Long, CodeOrigin> ApplicationConversionServiceFactoryBean.getIdToCodeOriginConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.CodeOrigin>() {
-            public com.labsynch.labseer.domain.CodeOrigin convert(java.lang.Long id) {
-                return CodeOrigin.findCodeOrigin(id);
-            }
-        };
-    }
-    
-    public Converter<String, CodeOrigin> ApplicationConversionServiceFactoryBean.getStringToCodeOriginConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.CodeOrigin>() {
-            public com.labsynch.labseer.domain.CodeOrigin convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), CodeOrigin.class);
-            }
-        };
-    }
-    
-    public Converter<Compound, String> ApplicationConversionServiceFactoryBean.getCompoundToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.Compound, java.lang.String>() {
-            public String convert(Compound compound) {
-                return new StringBuilder().append(compound.getCorpName()).append(' ').append(compound.getExternal_id()).append(' ').append(compound.getCdId()).append(' ').append(compound.getCreatedDate()).toString();
-            }
-        };
-    }
-    
-    public Converter<Long, Compound> ApplicationConversionServiceFactoryBean.getIdToCompoundConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.Compound>() {
-            public com.labsynch.labseer.domain.Compound convert(java.lang.Long id) {
-                return Compound.findCompound(id);
-            }
-        };
-    }
-    
-    public Converter<String, Compound> ApplicationConversionServiceFactoryBean.getStringToCompoundConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.Compound>() {
-            public com.labsynch.labseer.domain.Compound convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), Compound.class);
-            }
-        };
-    }
-    
-    public Converter<CronJob, String> ApplicationConversionServiceFactoryBean.getCronJobToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.CronJob, java.lang.String>() {
-            public String convert(CronJob cronJob) {
-                return new StringBuilder().append(cronJob.getSchedule()).append(' ').append(cronJob.getScriptType()).append(' ').append(cronJob.getScriptFile()).append(' ').append(cronJob.getFunctionName()).toString();
-            }
-        };
-    }
-    
-    public Converter<Long, CronJob> ApplicationConversionServiceFactoryBean.getIdToCronJobConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.CronJob>() {
-            public com.labsynch.labseer.domain.CronJob convert(java.lang.Long id) {
-                return CronJob.findCronJob(id);
-            }
-        };
-    }
-    
-    public Converter<String, CronJob> ApplicationConversionServiceFactoryBean.getStringToCronJobConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.CronJob>() {
-            public com.labsynch.labseer.domain.CronJob convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), CronJob.class);
-            }
-        };
-    }
-    
-    public Converter<IsoSalt, String> ApplicationConversionServiceFactoryBean.getIsoSaltToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.IsoSalt, java.lang.String>() {
-            public String convert(IsoSalt isoSalt) {
-                return new StringBuilder().append(isoSalt.getType()).append(' ').append(isoSalt.getEquivalents()).toString();
-            }
-        };
-    }
-    
-    public Converter<Long, IsoSalt> ApplicationConversionServiceFactoryBean.getIdToIsoSaltConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.IsoSalt>() {
-            public com.labsynch.labseer.domain.IsoSalt convert(java.lang.Long id) {
-                return IsoSalt.findIsoSalt(id);
-            }
-        };
-    }
-    
-    public Converter<String, IsoSalt> ApplicationConversionServiceFactoryBean.getStringToIsoSaltConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.IsoSalt>() {
-            public com.labsynch.labseer.domain.IsoSalt convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), IsoSalt.class);
-            }
-        };
-    }
-    
-    public Converter<ItxExperimentExperiment, String> ApplicationConversionServiceFactoryBean.getItxExperimentExperimentToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxExperimentExperiment, java.lang.String>() {
-            public String convert(ItxExperimentExperiment itxExperimentExperiment) {
-                return new StringBuilder().append(itxExperimentExperiment.getLsType()).append(' ').append(itxExperimentExperiment.getLsKind()).append(' ').append(itxExperimentExperiment.getLsTypeAndKind()).append(' ').append(itxExperimentExperiment.getCodeName()).toString();
-            }
-        };
-    }
-    
-    public Converter<Long, ItxExperimentExperiment> ApplicationConversionServiceFactoryBean.getIdToItxExperimentExperimentConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxExperimentExperiment>() {
-            public com.labsynch.labseer.domain.ItxExperimentExperiment convert(java.lang.Long id) {
-                return ItxExperimentExperiment.findItxExperimentExperiment(id);
-            }
-        };
-    }
-    
-    public Converter<String, ItxExperimentExperiment> ApplicationConversionServiceFactoryBean.getStringToItxExperimentExperimentConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxExperimentExperiment>() {
-            public com.labsynch.labseer.domain.ItxExperimentExperiment convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), ItxExperimentExperiment.class);
-            }
-        };
-    }
-    
-    public Converter<ItxExperimentExperimentState, String> ApplicationConversionServiceFactoryBean.getItxExperimentExperimentStateToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxExperimentExperimentState, java.lang.String>() {
-            public String convert(ItxExperimentExperimentState itxExperimentExperimentState) {
-                return new StringBuilder().append(itxExperimentExperimentState.getRecordedBy()).append(' ').append(itxExperimentExperimentState.getRecordedDate()).append(' ').append(itxExperimentExperimentState.getModifiedBy()).append(' ').append(itxExperimentExperimentState.getModifiedDate()).toString();
-            }
-        };
-    }
-    
-    public Converter<Long, ItxExperimentExperimentState> ApplicationConversionServiceFactoryBean.getIdToItxExperimentExperimentStateConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxExperimentExperimentState>() {
-            public com.labsynch.labseer.domain.ItxExperimentExperimentState convert(java.lang.Long id) {
-                return ItxExperimentExperimentState.findItxExperimentExperimentState(id);
-            }
-        };
-    }
-    
-    public Converter<String, ItxExperimentExperimentState> ApplicationConversionServiceFactoryBean.getStringToItxExperimentExperimentStateConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxExperimentExperimentState>() {
-            public com.labsynch.labseer.domain.ItxExperimentExperimentState convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), ItxExperimentExperimentState.class);
-            }
-        };
-    }
-    
-    public Converter<ItxExperimentExperimentValue, String> ApplicationConversionServiceFactoryBean.getItxExperimentExperimentValueToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxExperimentExperimentValue, java.lang.String>() {
-            public String convert(ItxExperimentExperimentValue itxExperimentExperimentValue) {
-                return new StringBuilder().append(itxExperimentExperimentValue.getLsType()).append(' ').append(itxExperimentExperimentValue.getLsKind()).append(' ').append(itxExperimentExperimentValue.getLsTypeAndKind()).append(' ').append(itxExperimentExperimentValue.getCodeOrigin()).toString();
-            }
-        };
-    }
-    
-    public Converter<Long, ItxExperimentExperimentValue> ApplicationConversionServiceFactoryBean.getIdToItxExperimentExperimentValueConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxExperimentExperimentValue>() {
-            public com.labsynch.labseer.domain.ItxExperimentExperimentValue convert(java.lang.Long id) {
-                return ItxExperimentExperimentValue.findItxExperimentExperimentValue(id);
-            }
-        };
-    }
-    
-    public Converter<String, ItxExperimentExperimentValue> ApplicationConversionServiceFactoryBean.getStringToItxExperimentExperimentValueConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxExperimentExperimentValue>() {
-            public com.labsynch.labseer.domain.ItxExperimentExperimentValue convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), ItxExperimentExperimentValue.class);
-            }
-        };
-    }
-    
-    public Converter<ItxLsThingLsThing, String> ApplicationConversionServiceFactoryBean.getItxLsThingLsThingToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxLsThingLsThing, java.lang.String>() {
-            public String convert(ItxLsThingLsThing itxLsThingLsThing) {
-                return new StringBuilder().append(itxLsThingLsThing.getLsType()).append(' ').append(itxLsThingLsThing.getLsKind()).append(' ').append(itxLsThingLsThing.getLsTypeAndKind()).append(' ').append(itxLsThingLsThing.getCodeName()).toString();
-            }
-        };
-    }
-    
-    public Converter<Long, ItxLsThingLsThing> ApplicationConversionServiceFactoryBean.getIdToItxLsThingLsThingConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxLsThingLsThing>() {
-            public com.labsynch.labseer.domain.ItxLsThingLsThing convert(java.lang.Long id) {
-                return ItxLsThingLsThing.findItxLsThingLsThing(id);
-            }
-        };
-    }
-    
-    public Converter<String, ItxLsThingLsThing> ApplicationConversionServiceFactoryBean.getStringToItxLsThingLsThingConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxLsThingLsThing>() {
-            public com.labsynch.labseer.domain.ItxLsThingLsThing convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), ItxLsThingLsThing.class);
-            }
-        };
-    }
-    
-    public Converter<ItxLsThingLsThingState, String> ApplicationConversionServiceFactoryBean.getItxLsThingLsThingStateToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxLsThingLsThingState, java.lang.String>() {
-            public String convert(ItxLsThingLsThingState itxLsThingLsThingState) {
-                return new StringBuilder().append(itxLsThingLsThingState.getRecordedBy()).append(' ').append(itxLsThingLsThingState.getRecordedDate()).append(' ').append(itxLsThingLsThingState.getModifiedBy()).append(' ').append(itxLsThingLsThingState.getModifiedDate()).toString();
-            }
-        };
-    }
-    
-    public Converter<Long, ItxLsThingLsThingState> ApplicationConversionServiceFactoryBean.getIdToItxLsThingLsThingStateConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxLsThingLsThingState>() {
-            public com.labsynch.labseer.domain.ItxLsThingLsThingState convert(java.lang.Long id) {
-                return ItxLsThingLsThingState.findItxLsThingLsThingState(id);
-            }
-        };
-    }
-    
-    public Converter<String, ItxLsThingLsThingState> ApplicationConversionServiceFactoryBean.getStringToItxLsThingLsThingStateConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxLsThingLsThingState>() {
-            public com.labsynch.labseer.domain.ItxLsThingLsThingState convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), ItxLsThingLsThingState.class);
-            }
-        };
-    }
-    
-    public Converter<ItxLsThingLsThingValue, String> ApplicationConversionServiceFactoryBean.getItxLsThingLsThingValueToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxLsThingLsThingValue, java.lang.String>() {
-            public String convert(ItxLsThingLsThingValue itxLsThingLsThingValue) {
-                return new StringBuilder().append(itxLsThingLsThingValue.getLsType()).append(' ').append(itxLsThingLsThingValue.getLsKind()).append(' ').append(itxLsThingLsThingValue.getLsTypeAndKind()).append(' ').append(itxLsThingLsThingValue.getCodeOrigin()).toString();
-            }
-        };
-    }
-    
-    public Converter<Long, ItxLsThingLsThingValue> ApplicationConversionServiceFactoryBean.getIdToItxLsThingLsThingValueConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxLsThingLsThingValue>() {
-            public com.labsynch.labseer.domain.ItxLsThingLsThingValue convert(java.lang.Long id) {
-                return ItxLsThingLsThingValue.findItxLsThingLsThingValue(id);
-            }
-        };
-    }
-    
-    public Converter<String, ItxLsThingLsThingValue> ApplicationConversionServiceFactoryBean.getStringToItxLsThingLsThingValueConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxLsThingLsThingValue>() {
-            public com.labsynch.labseer.domain.ItxLsThingLsThingValue convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), ItxLsThingLsThingValue.class);
-            }
-        };
-    }
-    
-    public Converter<LabelSequenceRole, String> ApplicationConversionServiceFactoryBean.getLabelSequenceRoleToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LabelSequenceRole, java.lang.String>() {
-            public String convert(LabelSequenceRole labelSequenceRole) {
-                return "(no displayable fields)";
-            }
-        };
-    }
-    
-    public Converter<Long, LabelSequenceRole> ApplicationConversionServiceFactoryBean.getIdToLabelSequenceRoleConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LabelSequenceRole>() {
-            public com.labsynch.labseer.domain.LabelSequenceRole convert(java.lang.Long id) {
-                return LabelSequenceRole.findLabelSequenceRole(id);
-            }
-        };
-    }
-    
-    public Converter<String, LabelSequenceRole> ApplicationConversionServiceFactoryBean.getStringToLabelSequenceRoleConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LabelSequenceRole>() {
-            public com.labsynch.labseer.domain.LabelSequenceRole convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), LabelSequenceRole.class);
-            }
-        };
-    }
-    
-    public Converter<Lot, String> ApplicationConversionServiceFactoryBean.getLotToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.Lot, java.lang.String>() {
-            public String convert(Lot lot) {
-                return new StringBuilder().append(lot.getStorageLocation()).append(' ').append(lot.getBuid()).append(' ').append(lot.getAsDrawnStruct()).append(' ').append(lot.getLotAsDrawnCdId()).toString();
-            }
-        };
-    }
-    
-    public Converter<Long, Lot> ApplicationConversionServiceFactoryBean.getIdToLotConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.Lot>() {
-            public com.labsynch.labseer.domain.Lot convert(java.lang.Long id) {
-                return Lot.findLot(id);
-            }
-        };
-    }
-    
-    public Converter<String, Lot> ApplicationConversionServiceFactoryBean.getStringToLotConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.Lot>() {
-            public com.labsynch.labseer.domain.Lot convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), Lot.class);
-            }
-        };
-    }
-    
-    public Converter<LsSeqAnlGrp, String> ApplicationConversionServiceFactoryBean.getLsSeqAnlGrpToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqAnlGrp, java.lang.String>() {
-            public String convert(LsSeqAnlGrp lsSeqAnlGrp) {
-                return "(no displayable fields)";
-            }
-        };
-    }
-    
-    public Converter<Long, LsSeqAnlGrp> ApplicationConversionServiceFactoryBean.getIdToLsSeqAnlGrpConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqAnlGrp>() {
-            public com.labsynch.labseer.domain.LsSeqAnlGrp convert(java.lang.Long id) {
-                return LsSeqAnlGrp.findLsSeqAnlGrp(id);
-            }
-        };
-    }
-    
-    public Converter<String, LsSeqAnlGrp> ApplicationConversionServiceFactoryBean.getStringToLsSeqAnlGrpConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqAnlGrp>() {
-            public com.labsynch.labseer.domain.LsSeqAnlGrp convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), LsSeqAnlGrp.class);
-            }
-        };
-    }
-    
-    public Converter<LsSeqContainer, String> ApplicationConversionServiceFactoryBean.getLsSeqContainerToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqContainer, java.lang.String>() {
-            public String convert(LsSeqContainer lsSeqContainer) {
-                return "(no displayable fields)";
-            }
-        };
-    }
-    
-    public Converter<Long, LsSeqContainer> ApplicationConversionServiceFactoryBean.getIdToLsSeqContainerConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqContainer>() {
-            public com.labsynch.labseer.domain.LsSeqContainer convert(java.lang.Long id) {
-                return LsSeqContainer.findLsSeqContainer(id);
-            }
-        };
-    }
-    
-    public Converter<String, LsSeqContainer> ApplicationConversionServiceFactoryBean.getStringToLsSeqContainerConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqContainer>() {
-            public com.labsynch.labseer.domain.LsSeqContainer convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), LsSeqContainer.class);
-            }
-        };
-    }
-    
-    public Converter<LsSeqExpt, String> ApplicationConversionServiceFactoryBean.getLsSeqExptToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqExpt, java.lang.String>() {
-            public String convert(LsSeqExpt lsSeqExpt) {
-                return "(no displayable fields)";
-            }
-        };
-    }
-    
-    public Converter<Long, LsSeqExpt> ApplicationConversionServiceFactoryBean.getIdToLsSeqExptConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqExpt>() {
-            public com.labsynch.labseer.domain.LsSeqExpt convert(java.lang.Long id) {
-                return LsSeqExpt.findLsSeqExpt(id);
-            }
-        };
-    }
-    
-    public Converter<String, LsSeqExpt> ApplicationConversionServiceFactoryBean.getStringToLsSeqExptConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqExpt>() {
-            public com.labsynch.labseer.domain.LsSeqExpt convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), LsSeqExpt.class);
-            }
-        };
-    }
-    
-    public Converter<LsSeqItxCntrCntr, String> ApplicationConversionServiceFactoryBean.getLsSeqItxCntrCntrToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqItxCntrCntr, java.lang.String>() {
-            public String convert(LsSeqItxCntrCntr lsSeqItxCntrCntr) {
-                return "(no displayable fields)";
-            }
-        };
-    }
-    
-    public Converter<Long, LsSeqItxCntrCntr> ApplicationConversionServiceFactoryBean.getIdToLsSeqItxCntrCntrConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqItxCntrCntr>() {
-            public com.labsynch.labseer.domain.LsSeqItxCntrCntr convert(java.lang.Long id) {
-                return LsSeqItxCntrCntr.findLsSeqItxCntrCntr(id);
-            }
-        };
-    }
-    
-    public Converter<String, LsSeqItxCntrCntr> ApplicationConversionServiceFactoryBean.getStringToLsSeqItxCntrCntrConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqItxCntrCntr>() {
-            public com.labsynch.labseer.domain.LsSeqItxCntrCntr convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), LsSeqItxCntrCntr.class);
-            }
-        };
-    }
-    
-    public Converter<LsSeqItxExperimentExperiment, String> ApplicationConversionServiceFactoryBean.getLsSeqItxExperimentExperimentToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqItxExperimentExperiment, java.lang.String>() {
-            public String convert(LsSeqItxExperimentExperiment lsSeqItxExperimentExperiment) {
-                return "(no displayable fields)";
-            }
-        };
-    }
-    
-    public Converter<Long, LsSeqItxExperimentExperiment> ApplicationConversionServiceFactoryBean.getIdToLsSeqItxExperimentExperimentConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqItxExperimentExperiment>() {
-            public com.labsynch.labseer.domain.LsSeqItxExperimentExperiment convert(java.lang.Long id) {
-                return LsSeqItxExperimentExperiment.findLsSeqItxExperimentExperiment(id);
-            }
-        };
-    }
-    
-    public Converter<String, LsSeqItxExperimentExperiment> ApplicationConversionServiceFactoryBean.getStringToLsSeqItxExperimentExperimentConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqItxExperimentExperiment>() {
-            public com.labsynch.labseer.domain.LsSeqItxExperimentExperiment convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), LsSeqItxExperimentExperiment.class);
-            }
-        };
-    }
-    
-    public Converter<LsSeqItxLsThingLsThing, String> ApplicationConversionServiceFactoryBean.getLsSeqItxLsThingLsThingToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqItxLsThingLsThing, java.lang.String>() {
-            public String convert(LsSeqItxLsThingLsThing lsSeqItxLsThingLsThing) {
-                return "(no displayable fields)";
-            }
-        };
-    }
-    
-    public Converter<Long, LsSeqItxLsThingLsThing> ApplicationConversionServiceFactoryBean.getIdToLsSeqItxLsThingLsThingConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqItxLsThingLsThing>() {
-            public com.labsynch.labseer.domain.LsSeqItxLsThingLsThing convert(java.lang.Long id) {
-                return LsSeqItxLsThingLsThing.findLsSeqItxLsThingLsThing(id);
-            }
-        };
-    }
-    
-    public Converter<String, LsSeqItxLsThingLsThing> ApplicationConversionServiceFactoryBean.getStringToLsSeqItxLsThingLsThingConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqItxLsThingLsThing>() {
-            public com.labsynch.labseer.domain.LsSeqItxLsThingLsThing convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), LsSeqItxLsThingLsThing.class);
-            }
-        };
-    }
-    
-    public Converter<LsSeqItxProtocolProtocol, String> ApplicationConversionServiceFactoryBean.getLsSeqItxProtocolProtocolToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqItxProtocolProtocol, java.lang.String>() {
-            public String convert(LsSeqItxProtocolProtocol lsSeqItxProtocolProtocol) {
-                return "(no displayable fields)";
-            }
-        };
-    }
-    
-    public Converter<Long, LsSeqItxProtocolProtocol> ApplicationConversionServiceFactoryBean.getIdToLsSeqItxProtocolProtocolConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqItxProtocolProtocol>() {
-            public com.labsynch.labseer.domain.LsSeqItxProtocolProtocol convert(java.lang.Long id) {
-                return LsSeqItxProtocolProtocol.findLsSeqItxProtocolProtocol(id);
-            }
-        };
-    }
-    
-    public Converter<String, LsSeqItxProtocolProtocol> ApplicationConversionServiceFactoryBean.getStringToLsSeqItxProtocolProtocolConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqItxProtocolProtocol>() {
-            public com.labsynch.labseer.domain.LsSeqItxProtocolProtocol convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), LsSeqItxProtocolProtocol.class);
-            }
-        };
-    }
-    
-    public Converter<LsSeqItxSubjCntr, String> ApplicationConversionServiceFactoryBean.getLsSeqItxSubjCntrToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqItxSubjCntr, java.lang.String>() {
-            public String convert(LsSeqItxSubjCntr lsSeqItxSubjCntr) {
-                return "(no displayable fields)";
-            }
-        };
-    }
-    
-    public Converter<Long, LsSeqItxSubjCntr> ApplicationConversionServiceFactoryBean.getIdToLsSeqItxSubjCntrConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqItxSubjCntr>() {
-            public com.labsynch.labseer.domain.LsSeqItxSubjCntr convert(java.lang.Long id) {
-                return LsSeqItxSubjCntr.findLsSeqItxSubjCntr(id);
-            }
-        };
-    }
-    
-    public Converter<String, LsSeqItxSubjCntr> ApplicationConversionServiceFactoryBean.getStringToLsSeqItxSubjCntrConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqItxSubjCntr>() {
-            public com.labsynch.labseer.domain.LsSeqItxSubjCntr convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), LsSeqItxSubjCntr.class);
-            }
-        };
-    }
-    
-    public Converter<LsSeqProtocol, String> ApplicationConversionServiceFactoryBean.getLsSeqProtocolToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqProtocol, java.lang.String>() {
-            public String convert(LsSeqProtocol lsSeqProtocol) {
-                return "(no displayable fields)";
-            }
-        };
-    }
-    
-    public Converter<Long, LsSeqProtocol> ApplicationConversionServiceFactoryBean.getIdToLsSeqProtocolConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqProtocol>() {
-            public com.labsynch.labseer.domain.LsSeqProtocol convert(java.lang.Long id) {
-                return LsSeqProtocol.findLsSeqProtocol(id);
-            }
-        };
-    }
-    
-    public Converter<String, LsSeqProtocol> ApplicationConversionServiceFactoryBean.getStringToLsSeqProtocolConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqProtocol>() {
-            public com.labsynch.labseer.domain.LsSeqProtocol convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), LsSeqProtocol.class);
-            }
-        };
-    }
-    
-    public Converter<LsSeqSubject, String> ApplicationConversionServiceFactoryBean.getLsSeqSubjectToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqSubject, java.lang.String>() {
-            public String convert(LsSeqSubject lsSeqSubject) {
-                return "(no displayable fields)";
-            }
-        };
-    }
-    
-    public Converter<Long, LsSeqSubject> ApplicationConversionServiceFactoryBean.getIdToLsSeqSubjectConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqSubject>() {
-            public com.labsynch.labseer.domain.LsSeqSubject convert(java.lang.Long id) {
-                return LsSeqSubject.findLsSeqSubject(id);
-            }
-        };
-    }
-    
-    public Converter<String, LsSeqSubject> ApplicationConversionServiceFactoryBean.getStringToLsSeqSubjectConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqSubject>() {
-            public com.labsynch.labseer.domain.LsSeqSubject convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), LsSeqSubject.class);
-            }
-        };
-    }
-    
-    public Converter<LsSeqTrtGrp, String> ApplicationConversionServiceFactoryBean.getLsSeqTrtGrpToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqTrtGrp, java.lang.String>() {
-            public String convert(LsSeqTrtGrp lsSeqTrtGrp) {
-                return "(no displayable fields)";
-            }
-        };
-    }
-    
-    public Converter<Long, LsSeqTrtGrp> ApplicationConversionServiceFactoryBean.getIdToLsSeqTrtGrpConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqTrtGrp>() {
-            public com.labsynch.labseer.domain.LsSeqTrtGrp convert(java.lang.Long id) {
-                return LsSeqTrtGrp.findLsSeqTrtGrp(id);
-            }
-        };
-    }
-    
-    public Converter<String, LsSeqTrtGrp> ApplicationConversionServiceFactoryBean.getStringToLsSeqTrtGrpConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqTrtGrp>() {
-            public com.labsynch.labseer.domain.LsSeqTrtGrp convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), LsSeqTrtGrp.class);
-            }
-        };
-    }
-    
-    public Converter<Long, RoleKind> ApplicationConversionServiceFactoryBean.getIdToRoleKindConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.RoleKind>() {
-            public com.labsynch.labseer.domain.RoleKind convert(java.lang.Long id) {
-                return RoleKind.findRoleKind(id);
-            }
-        };
-    }
-    
-    public Converter<String, RoleKind> ApplicationConversionServiceFactoryBean.getStringToRoleKindConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.RoleKind>() {
-            public com.labsynch.labseer.domain.RoleKind convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), RoleKind.class);
-            }
-        };
-    }
-    
-    public Converter<RoleType, String> ApplicationConversionServiceFactoryBean.getRoleTypeToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.RoleType, java.lang.String>() {
-            public String convert(RoleType roleType) {
-                return new StringBuilder().append(roleType.getTypeName()).toString();
-            }
-        };
-    }
-    
-    public Converter<Long, RoleType> ApplicationConversionServiceFactoryBean.getIdToRoleTypeConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.RoleType>() {
-            public com.labsynch.labseer.domain.RoleType convert(java.lang.Long id) {
-                return RoleType.findRoleType(id);
-            }
-        };
-    }
-    
-    public Converter<String, RoleType> ApplicationConversionServiceFactoryBean.getStringToRoleTypeConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.RoleType>() {
-            public com.labsynch.labseer.domain.RoleType convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), RoleType.class);
-            }
-        };
-    }
-    
-    public Converter<SaltFormAlias, String> ApplicationConversionServiceFactoryBean.getSaltFormAliasToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.SaltFormAlias, java.lang.String>() {
-            public String convert(SaltFormAlias saltFormAlias) {
-                return new StringBuilder().append(saltFormAlias.getLsType()).append(' ').append(saltFormAlias.getLsKind()).append(' ').append(saltFormAlias.getAliasName()).toString();
-            }
-        };
-    }
-    
-    public Converter<Long, SaltFormAlias> ApplicationConversionServiceFactoryBean.getIdToSaltFormAliasConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.SaltFormAlias>() {
-            public com.labsynch.labseer.domain.SaltFormAlias convert(java.lang.Long id) {
-                return SaltFormAlias.findSaltFormAlias(id);
-            }
-        };
-    }
-    
-    public Converter<String, SaltFormAlias> ApplicationConversionServiceFactoryBean.getStringToSaltFormAliasConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.SaltFormAlias>() {
-            public com.labsynch.labseer.domain.SaltFormAlias convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), SaltFormAlias.class);
-            }
-        };
-    }
-    
-    public Converter<SaltFormAliasKind, String> ApplicationConversionServiceFactoryBean.getSaltFormAliasKindToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.SaltFormAliasKind, java.lang.String>() {
-            public String convert(SaltFormAliasKind saltFormAliasKind) {
-                return new StringBuilder().append(saltFormAliasKind.getKindName()).toString();
-            }
-        };
-    }
-    
-    public Converter<Long, SaltFormAliasKind> ApplicationConversionServiceFactoryBean.getIdToSaltFormAliasKindConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.SaltFormAliasKind>() {
-            public com.labsynch.labseer.domain.SaltFormAliasKind convert(java.lang.Long id) {
-                return SaltFormAliasKind.findSaltFormAliasKind(id);
-            }
-        };
-    }
-    
-    public Converter<String, SaltFormAliasKind> ApplicationConversionServiceFactoryBean.getStringToSaltFormAliasKindConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.SaltFormAliasKind>() {
-            public com.labsynch.labseer.domain.SaltFormAliasKind convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), SaltFormAliasKind.class);
-            }
-        };
-    }
-    
-    public Converter<SaltFormAliasType, String> ApplicationConversionServiceFactoryBean.getSaltFormAliasTypeToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.SaltFormAliasType, java.lang.String>() {
-            public String convert(SaltFormAliasType saltFormAliasType) {
-                return new StringBuilder().append(saltFormAliasType.getTypeName()).toString();
-            }
-        };
-    }
-    
-    public Converter<Long, SaltFormAliasType> ApplicationConversionServiceFactoryBean.getIdToSaltFormAliasTypeConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.SaltFormAliasType>() {
-            public com.labsynch.labseer.domain.SaltFormAliasType convert(java.lang.Long id) {
-                return SaltFormAliasType.findSaltFormAliasType(id);
-            }
-        };
-    }
-    
-    public Converter<String, SaltFormAliasType> ApplicationConversionServiceFactoryBean.getStringToSaltFormAliasTypeConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.SaltFormAliasType>() {
-            public com.labsynch.labseer.domain.SaltFormAliasType convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), SaltFormAliasType.class);
-            }
-        };
-    }
-    
-    public Converter<TempSelectTable, String> ApplicationConversionServiceFactoryBean.getTempSelectTableToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.TempSelectTable, java.lang.String>() {
-            public String convert(TempSelectTable tempSelectTable) {
-                return new StringBuilder().append(tempSelectTable.getNumberVar()).append(' ').append(tempSelectTable.getStringVar()).append(' ').append(tempSelectTable.getLsTransaction()).append(' ').append(tempSelectTable.getRecordedDate()).toString();
-            }
-        };
-    }
-    
-    public Converter<Long, TempSelectTable> ApplicationConversionServiceFactoryBean.getIdToTempSelectTableConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.TempSelectTable>() {
-            public com.labsynch.labseer.domain.TempSelectTable convert(java.lang.Long id) {
-                return TempSelectTable.findTempSelectTable(id);
-            }
-        };
-    }
-    
-    public Converter<String, TempSelectTable> ApplicationConversionServiceFactoryBean.getStringToTempSelectTableConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.TempSelectTable>() {
-            public com.labsynch.labseer.domain.TempSelectTable convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), TempSelectTable.class);
-            }
-        };
-    }
-    
-    public Converter<SaltLoader, String> ApplicationConversionServiceFactoryBean.getSaltLoaderToStringConverter() {
-        return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.service.SaltLoader, java.lang.String>() {
-            public String convert(SaltLoader saltLoader) {
-                return new StringBuilder().append(saltLoader.getName()).append(' ').append(saltLoader.getDescription()).append(' ').append(saltLoader.getNumberOfSalts()).append(' ').append(saltLoader.getSize()).toString();
-            }
-        };
-    }
-    
-    public Converter<Long, SaltLoader> ApplicationConversionServiceFactoryBean.getIdToSaltLoaderConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.service.SaltLoader>() {
-            public com.labsynch.labseer.service.SaltLoader convert(java.lang.Long id) {
-                return SaltLoader.findSaltLoader(id);
-            }
-        };
-    }
-    
-    public Converter<String, SaltLoader> ApplicationConversionServiceFactoryBean.getStringToSaltLoaderConverter() {
-        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.service.SaltLoader>() {
-            public com.labsynch.labseer.service.SaltLoader convert(String id) {
-                return getObject().convert(getObject().convert(id, Long.class), SaltLoader.class);
-            }
-        };
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupDataOnDemand.java
index b38d8cf9d..2646f4b25 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupDataOnDemand.java
@@ -1,7 +1,167 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Configurable
+@Component
 @RooDataOnDemand(entity = AnalysisGroup.class)
 public class AnalysisGroupDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<AnalysisGroup> data;
+
+	public AnalysisGroup getNewTransientAnalysisGroup(int index) {
+        AnalysisGroup obj = new AnalysisGroup();
+        setCodeName(obj, index);
+        setDeleted(obj, index);
+        setIgnored(obj, index);
+        setLsKind(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedBy(obj, index);
+        setModifiedDate(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        return obj;
+    }
+
+	public void setCodeName(AnalysisGroup obj, int index) {
+        String codeName = "codeName_" + index;
+        if (codeName.length() > 255) {
+            codeName = new Random().nextInt(10) + codeName.substring(1, 255);
+        }
+        obj.setCodeName(codeName);
+    }
+
+	public void setDeleted(AnalysisGroup obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setIgnored(AnalysisGroup obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setLsKind(AnalysisGroup obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsTransaction(AnalysisGroup obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(AnalysisGroup obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 255) {
+            lsType = lsType.substring(0, 255);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(AnalysisGroup obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedBy(AnalysisGroup obj, int index) {
+        String modifiedBy = "modifiedBy_" + index;
+        if (modifiedBy.length() > 255) {
+            modifiedBy = modifiedBy.substring(0, 255);
+        }
+        obj.setModifiedBy(modifiedBy);
+    }
+
+	public void setModifiedDate(AnalysisGroup obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setRecordedBy(AnalysisGroup obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(AnalysisGroup obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public AnalysisGroup getSpecificAnalysisGroup(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        AnalysisGroup obj = data.get(index);
+        Long id = obj.getId();
+        return AnalysisGroup.findAnalysisGroup(id);
+    }
+
+	public AnalysisGroup getRandomAnalysisGroup() {
+        init();
+        AnalysisGroup obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return AnalysisGroup.findAnalysisGroup(id);
+    }
+
+	public boolean modifyAnalysisGroup(AnalysisGroup obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = AnalysisGroup.findAnalysisGroupEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'AnalysisGroup' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<AnalysisGroup>();
+        for (int i = 0; i < 10; i++) {
+            AnalysisGroup obj = getNewTransientAnalysisGroup(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 7bc7afca0..000000000
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroupDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect AnalysisGroupDataOnDemand_Roo_Configurable {
-    
-    declare @type: AnalysisGroupDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 5770a5c01..000000000
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,170 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.AnalysisGroupDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.stereotype.Component;
-
-privileged aspect AnalysisGroupDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: AnalysisGroupDataOnDemand: @Component;
-    
-    private Random AnalysisGroupDataOnDemand.rnd = new SecureRandom();
-    
-    private List<AnalysisGroup> AnalysisGroupDataOnDemand.data;
-    
-    public AnalysisGroup AnalysisGroupDataOnDemand.getNewTransientAnalysisGroup(int index) {
-        AnalysisGroup obj = new AnalysisGroup();
-        setCodeName(obj, index);
-        setDeleted(obj, index);
-        setIgnored(obj, index);
-        setLsKind(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedBy(obj, index);
-        setModifiedDate(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        return obj;
-    }
-    
-    public void AnalysisGroupDataOnDemand.setCodeName(AnalysisGroup obj, int index) {
-        String codeName = "codeName_" + index;
-        if (codeName.length() > 255) {
-            codeName = new Random().nextInt(10) + codeName.substring(1, 255);
-        }
-        obj.setCodeName(codeName);
-    }
-    
-    public void AnalysisGroupDataOnDemand.setDeleted(AnalysisGroup obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void AnalysisGroupDataOnDemand.setIgnored(AnalysisGroup obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void AnalysisGroupDataOnDemand.setLsKind(AnalysisGroup obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void AnalysisGroupDataOnDemand.setLsTransaction(AnalysisGroup obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void AnalysisGroupDataOnDemand.setLsType(AnalysisGroup obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 255) {
-            lsType = lsType.substring(0, 255);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void AnalysisGroupDataOnDemand.setLsTypeAndKind(AnalysisGroup obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void AnalysisGroupDataOnDemand.setModifiedBy(AnalysisGroup obj, int index) {
-        String modifiedBy = "modifiedBy_" + index;
-        if (modifiedBy.length() > 255) {
-            modifiedBy = modifiedBy.substring(0, 255);
-        }
-        obj.setModifiedBy(modifiedBy);
-    }
-    
-    public void AnalysisGroupDataOnDemand.setModifiedDate(AnalysisGroup obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void AnalysisGroupDataOnDemand.setRecordedBy(AnalysisGroup obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void AnalysisGroupDataOnDemand.setRecordedDate(AnalysisGroup obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public AnalysisGroup AnalysisGroupDataOnDemand.getSpecificAnalysisGroup(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        AnalysisGroup obj = data.get(index);
-        Long id = obj.getId();
-        return AnalysisGroup.findAnalysisGroup(id);
-    }
-    
-    public AnalysisGroup AnalysisGroupDataOnDemand.getRandomAnalysisGroup() {
-        init();
-        AnalysisGroup obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return AnalysisGroup.findAnalysisGroup(id);
-    }
-    
-    public boolean AnalysisGroupDataOnDemand.modifyAnalysisGroup(AnalysisGroup obj) {
-        return false;
-    }
-    
-    public void AnalysisGroupDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = AnalysisGroup.findAnalysisGroupEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'AnalysisGroup' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<AnalysisGroup>();
-        for (int i = 0; i < 10; i++) {
-            AnalysisGroup obj = getNewTransientAnalysisGroup(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupIntegrationTest.java
index 3f1f799cc..cebbe548d 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
+@Configurable
 @RooIntegrationTest(entity = AnalysisGroup.class)
 public class AnalysisGroupIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    AnalysisGroupDataOnDemand dod;
+
+	@Test
+    public void testCountAnalysisGroups() {
+        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to initialize correctly", dod.getRandomAnalysisGroup());
+        long count = AnalysisGroup.countAnalysisGroups();
+        Assert.assertTrue("Counter for 'AnalysisGroup' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindAnalysisGroup() {
+        AnalysisGroup obj = dod.getRandomAnalysisGroup();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to provide an identifier", id);
+        obj = AnalysisGroup.findAnalysisGroup(id);
+        Assert.assertNotNull("Find method for 'AnalysisGroup' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'AnalysisGroup' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllAnalysisGroups() {
+        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to initialize correctly", dod.getRandomAnalysisGroup());
+        long count = AnalysisGroup.countAnalysisGroups();
+        Assert.assertTrue("Too expensive to perform a find all test for 'AnalysisGroup', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<AnalysisGroup> result = AnalysisGroup.findAllAnalysisGroups();
+        Assert.assertNotNull("Find all method for 'AnalysisGroup' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'AnalysisGroup' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindAnalysisGroupEntries() {
+        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to initialize correctly", dod.getRandomAnalysisGroup());
+        long count = AnalysisGroup.countAnalysisGroups();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<AnalysisGroup> result = AnalysisGroup.findAnalysisGroupEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'AnalysisGroup' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'AnalysisGroup' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        AnalysisGroup obj = dod.getRandomAnalysisGroup();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to provide an identifier", id);
+        obj = AnalysisGroup.findAnalysisGroup(id);
+        Assert.assertNotNull("Find method for 'AnalysisGroup' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyAnalysisGroup(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'AnalysisGroup' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        AnalysisGroup obj = dod.getRandomAnalysisGroup();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to provide an identifier", id);
+        obj = AnalysisGroup.findAnalysisGroup(id);
+        boolean modified =  dod.modifyAnalysisGroup(obj);
+        Integer currentVersion = obj.getVersion();
+        AnalysisGroup merged = (AnalysisGroup)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'AnalysisGroup' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to initialize correctly", dod.getRandomAnalysisGroup());
+        AnalysisGroup obj = dod.getNewTransientAnalysisGroup(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'AnalysisGroup' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'AnalysisGroup' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        AnalysisGroup obj = dod.getRandomAnalysisGroup();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to provide an identifier", id);
+        obj = AnalysisGroup.findAnalysisGroup(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'AnalysisGroup' with identifier '" + id + "'", AnalysisGroup.findAnalysisGroup(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 3552ad30e..000000000
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroupIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect AnalysisGroupIntegrationTest_Roo_Configurable {
-    
-    declare @type: AnalysisGroupIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 5c63a66d8..000000000
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.AnalysisGroupDataOnDemand;
-import com.labsynch.labseer.domain.AnalysisGroupIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect AnalysisGroupIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: AnalysisGroupIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: AnalysisGroupIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: AnalysisGroupIntegrationTest: @Transactional;
-    
-    @Autowired
-    AnalysisGroupDataOnDemand AnalysisGroupIntegrationTest.dod;
-    
-    @Test
-    public void AnalysisGroupIntegrationTest.testCountAnalysisGroups() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to initialize correctly", dod.getRandomAnalysisGroup());
-        long count = AnalysisGroup.countAnalysisGroups();
-        Assert.assertTrue("Counter for 'AnalysisGroup' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void AnalysisGroupIntegrationTest.testFindAnalysisGroup() {
-        AnalysisGroup obj = dod.getRandomAnalysisGroup();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to provide an identifier", id);
-        obj = AnalysisGroup.findAnalysisGroup(id);
-        Assert.assertNotNull("Find method for 'AnalysisGroup' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'AnalysisGroup' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void AnalysisGroupIntegrationTest.testFindAllAnalysisGroups() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to initialize correctly", dod.getRandomAnalysisGroup());
-        long count = AnalysisGroup.countAnalysisGroups();
-        Assert.assertTrue("Too expensive to perform a find all test for 'AnalysisGroup', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<AnalysisGroup> result = AnalysisGroup.findAllAnalysisGroups();
-        Assert.assertNotNull("Find all method for 'AnalysisGroup' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'AnalysisGroup' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void AnalysisGroupIntegrationTest.testFindAnalysisGroupEntries() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to initialize correctly", dod.getRandomAnalysisGroup());
-        long count = AnalysisGroup.countAnalysisGroups();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<AnalysisGroup> result = AnalysisGroup.findAnalysisGroupEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'AnalysisGroup' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'AnalysisGroup' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void AnalysisGroupIntegrationTest.testFlush() {
-        AnalysisGroup obj = dod.getRandomAnalysisGroup();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to provide an identifier", id);
-        obj = AnalysisGroup.findAnalysisGroup(id);
-        Assert.assertNotNull("Find method for 'AnalysisGroup' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyAnalysisGroup(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'AnalysisGroup' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void AnalysisGroupIntegrationTest.testMergeUpdate() {
-        AnalysisGroup obj = dod.getRandomAnalysisGroup();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to provide an identifier", id);
-        obj = AnalysisGroup.findAnalysisGroup(id);
-        boolean modified =  dod.modifyAnalysisGroup(obj);
-        Integer currentVersion = obj.getVersion();
-        AnalysisGroup merged = (AnalysisGroup)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'AnalysisGroup' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void AnalysisGroupIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to initialize correctly", dod.getRandomAnalysisGroup());
-        AnalysisGroup obj = dod.getNewTransientAnalysisGroup(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'AnalysisGroup' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'AnalysisGroup' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void AnalysisGroupIntegrationTest.testRemove() {
-        AnalysisGroup obj = dod.getRandomAnalysisGroup();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to provide an identifier", id);
-        obj = AnalysisGroup.findAnalysisGroup(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'AnalysisGroup' with identifier '" + id + "'", AnalysisGroup.findAnalysisGroup(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelDataOnDemand.java
index e208850a8..4afe44c46 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelDataOnDemand.java
@@ -1,7 +1,189 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Configurable
+@Component
 @RooDataOnDemand(entity = AnalysisGroupLabel.class)
 public class AnalysisGroupLabelDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<AnalysisGroupLabel> data;
+
+	@Autowired
+    AnalysisGroupDataOnDemand analysisGroupDataOnDemand;
+
+	public AnalysisGroupLabel getNewTransientAnalysisGroupLabel(int index) {
+        AnalysisGroupLabel obj = new AnalysisGroupLabel();
+        setAnalysisGroup(obj, index);
+        setDeleted(obj, index);
+        setIgnored(obj, index);
+        setImageFile(obj, index);
+        setLabelText(obj, index);
+        setLsKind(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedDate(obj, index);
+        setPhysicallyLabled(obj, index);
+        setPreferred(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        return obj;
+    }
+
+	public void setAnalysisGroup(AnalysisGroupLabel obj, int index) {
+        AnalysisGroup analysisGroup = analysisGroupDataOnDemand.getRandomAnalysisGroup();
+        obj.setAnalysisGroup(analysisGroup);
+    }
+
+	public void setDeleted(AnalysisGroupLabel obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setIgnored(AnalysisGroupLabel obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setImageFile(AnalysisGroupLabel obj, int index) {
+        String imageFile = "imageFile_" + index;
+        if (imageFile.length() > 255) {
+            imageFile = imageFile.substring(0, 255);
+        }
+        obj.setImageFile(imageFile);
+    }
+
+	public void setLabelText(AnalysisGroupLabel obj, int index) {
+        String labelText = "labelText_" + index;
+        if (labelText.length() > 255) {
+            labelText = labelText.substring(0, 255);
+        }
+        obj.setLabelText(labelText);
+    }
+
+	public void setLsKind(AnalysisGroupLabel obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsTransaction(AnalysisGroupLabel obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(AnalysisGroupLabel obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 64) {
+            lsType = lsType.substring(0, 64);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(AnalysisGroupLabel obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedDate(AnalysisGroupLabel obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setPhysicallyLabled(AnalysisGroupLabel obj, int index) {
+        Boolean physicallyLabled = true;
+        obj.setPhysicallyLabled(physicallyLabled);
+    }
+
+	public void setPreferred(AnalysisGroupLabel obj, int index) {
+        Boolean preferred = true;
+        obj.setPreferred(preferred);
+    }
+
+	public void setRecordedBy(AnalysisGroupLabel obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(AnalysisGroupLabel obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public AnalysisGroupLabel getSpecificAnalysisGroupLabel(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        AnalysisGroupLabel obj = data.get(index);
+        Long id = obj.getId();
+        return AnalysisGroupLabel.findAnalysisGroupLabel(id);
+    }
+
+	public AnalysisGroupLabel getRandomAnalysisGroupLabel() {
+        init();
+        AnalysisGroupLabel obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return AnalysisGroupLabel.findAnalysisGroupLabel(id);
+    }
+
+	public boolean modifyAnalysisGroupLabel(AnalysisGroupLabel obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = AnalysisGroupLabel.findAnalysisGroupLabelEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'AnalysisGroupLabel' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<AnalysisGroupLabel>();
+        for (int i = 0; i < 10; i++) {
+            AnalysisGroupLabel obj = getNewTransientAnalysisGroupLabel(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index dc9493736..000000000
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroupLabelDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect AnalysisGroupLabelDataOnDemand_Roo_Configurable {
-    
-    declare @type: AnalysisGroupLabelDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 02c9e503e..000000000
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,194 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.AnalysisGroupDataOnDemand;
-import com.labsynch.labseer.domain.AnalysisGroupLabel;
-import com.labsynch.labseer.domain.AnalysisGroupLabelDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect AnalysisGroupLabelDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: AnalysisGroupLabelDataOnDemand: @Component;
-    
-    private Random AnalysisGroupLabelDataOnDemand.rnd = new SecureRandom();
-    
-    private List<AnalysisGroupLabel> AnalysisGroupLabelDataOnDemand.data;
-    
-    @Autowired
-    AnalysisGroupDataOnDemand AnalysisGroupLabelDataOnDemand.analysisGroupDataOnDemand;
-    
-    public AnalysisGroupLabel AnalysisGroupLabelDataOnDemand.getNewTransientAnalysisGroupLabel(int index) {
-        AnalysisGroupLabel obj = new AnalysisGroupLabel();
-        setAnalysisGroup(obj, index);
-        setDeleted(obj, index);
-        setIgnored(obj, index);
-        setImageFile(obj, index);
-        setLabelText(obj, index);
-        setLsKind(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedDate(obj, index);
-        setPhysicallyLabled(obj, index);
-        setPreferred(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        return obj;
-    }
-    
-    public void AnalysisGroupLabelDataOnDemand.setAnalysisGroup(AnalysisGroupLabel obj, int index) {
-        AnalysisGroup analysisGroup = analysisGroupDataOnDemand.getRandomAnalysisGroup();
-        obj.setAnalysisGroup(analysisGroup);
-    }
-    
-    public void AnalysisGroupLabelDataOnDemand.setDeleted(AnalysisGroupLabel obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void AnalysisGroupLabelDataOnDemand.setIgnored(AnalysisGroupLabel obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void AnalysisGroupLabelDataOnDemand.setImageFile(AnalysisGroupLabel obj, int index) {
-        String imageFile = "imageFile_" + index;
-        if (imageFile.length() > 255) {
-            imageFile = imageFile.substring(0, 255);
-        }
-        obj.setImageFile(imageFile);
-    }
-    
-    public void AnalysisGroupLabelDataOnDemand.setLabelText(AnalysisGroupLabel obj, int index) {
-        String labelText = "labelText_" + index;
-        if (labelText.length() > 255) {
-            labelText = labelText.substring(0, 255);
-        }
-        obj.setLabelText(labelText);
-    }
-    
-    public void AnalysisGroupLabelDataOnDemand.setLsKind(AnalysisGroupLabel obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void AnalysisGroupLabelDataOnDemand.setLsTransaction(AnalysisGroupLabel obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void AnalysisGroupLabelDataOnDemand.setLsType(AnalysisGroupLabel obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 64) {
-            lsType = lsType.substring(0, 64);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void AnalysisGroupLabelDataOnDemand.setLsTypeAndKind(AnalysisGroupLabel obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void AnalysisGroupLabelDataOnDemand.setModifiedDate(AnalysisGroupLabel obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void AnalysisGroupLabelDataOnDemand.setPhysicallyLabled(AnalysisGroupLabel obj, int index) {
-        Boolean physicallyLabled = true;
-        obj.setPhysicallyLabled(physicallyLabled);
-    }
-    
-    public void AnalysisGroupLabelDataOnDemand.setPreferred(AnalysisGroupLabel obj, int index) {
-        Boolean preferred = true;
-        obj.setPreferred(preferred);
-    }
-    
-    public void AnalysisGroupLabelDataOnDemand.setRecordedBy(AnalysisGroupLabel obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void AnalysisGroupLabelDataOnDemand.setRecordedDate(AnalysisGroupLabel obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public AnalysisGroupLabel AnalysisGroupLabelDataOnDemand.getSpecificAnalysisGroupLabel(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        AnalysisGroupLabel obj = data.get(index);
-        Long id = obj.getId();
-        return AnalysisGroupLabel.findAnalysisGroupLabel(id);
-    }
-    
-    public AnalysisGroupLabel AnalysisGroupLabelDataOnDemand.getRandomAnalysisGroupLabel() {
-        init();
-        AnalysisGroupLabel obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return AnalysisGroupLabel.findAnalysisGroupLabel(id);
-    }
-    
-    public boolean AnalysisGroupLabelDataOnDemand.modifyAnalysisGroupLabel(AnalysisGroupLabel obj) {
-        return false;
-    }
-    
-    public void AnalysisGroupLabelDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = AnalysisGroupLabel.findAnalysisGroupLabelEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'AnalysisGroupLabel' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<AnalysisGroupLabel>();
-        for (int i = 0; i < 10; i++) {
-            AnalysisGroupLabel obj = getNewTransientAnalysisGroupLabel(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelIntegrationTest.java
index eb280227f..c647f72b4 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
+@Configurable
 @RooIntegrationTest(entity = AnalysisGroupLabel.class)
 public class AnalysisGroupLabelIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    AnalysisGroupLabelDataOnDemand dod;
+
+	@Test
+    public void testCountAnalysisGroupLabels() {
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to initialize correctly", dod.getRandomAnalysisGroupLabel());
+        long count = AnalysisGroupLabel.countAnalysisGroupLabels();
+        Assert.assertTrue("Counter for 'AnalysisGroupLabel' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindAnalysisGroupLabel() {
+        AnalysisGroupLabel obj = dod.getRandomAnalysisGroupLabel();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to provide an identifier", id);
+        obj = AnalysisGroupLabel.findAnalysisGroupLabel(id);
+        Assert.assertNotNull("Find method for 'AnalysisGroupLabel' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'AnalysisGroupLabel' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllAnalysisGroupLabels() {
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to initialize correctly", dod.getRandomAnalysisGroupLabel());
+        long count = AnalysisGroupLabel.countAnalysisGroupLabels();
+        Assert.assertTrue("Too expensive to perform a find all test for 'AnalysisGroupLabel', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<AnalysisGroupLabel> result = AnalysisGroupLabel.findAllAnalysisGroupLabels();
+        Assert.assertNotNull("Find all method for 'AnalysisGroupLabel' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'AnalysisGroupLabel' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindAnalysisGroupLabelEntries() {
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to initialize correctly", dod.getRandomAnalysisGroupLabel());
+        long count = AnalysisGroupLabel.countAnalysisGroupLabels();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<AnalysisGroupLabel> result = AnalysisGroupLabel.findAnalysisGroupLabelEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'AnalysisGroupLabel' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'AnalysisGroupLabel' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        AnalysisGroupLabel obj = dod.getRandomAnalysisGroupLabel();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to provide an identifier", id);
+        obj = AnalysisGroupLabel.findAnalysisGroupLabel(id);
+        Assert.assertNotNull("Find method for 'AnalysisGroupLabel' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyAnalysisGroupLabel(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'AnalysisGroupLabel' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        AnalysisGroupLabel obj = dod.getRandomAnalysisGroupLabel();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to provide an identifier", id);
+        obj = AnalysisGroupLabel.findAnalysisGroupLabel(id);
+        boolean modified =  dod.modifyAnalysisGroupLabel(obj);
+        Integer currentVersion = obj.getVersion();
+        AnalysisGroupLabel merged = (AnalysisGroupLabel)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'AnalysisGroupLabel' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to initialize correctly", dod.getRandomAnalysisGroupLabel());
+        AnalysisGroupLabel obj = dod.getNewTransientAnalysisGroupLabel(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'AnalysisGroupLabel' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'AnalysisGroupLabel' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        AnalysisGroupLabel obj = dod.getRandomAnalysisGroupLabel();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to provide an identifier", id);
+        obj = AnalysisGroupLabel.findAnalysisGroupLabel(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'AnalysisGroupLabel' with identifier '" + id + "'", AnalysisGroupLabel.findAnalysisGroupLabel(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index a05ceec76..000000000
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroupLabelIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect AnalysisGroupLabelIntegrationTest_Roo_Configurable {
-    
-    declare @type: AnalysisGroupLabelIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 588f4d7bc..000000000
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroupLabel;
-import com.labsynch.labseer.domain.AnalysisGroupLabelDataOnDemand;
-import com.labsynch.labseer.domain.AnalysisGroupLabelIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect AnalysisGroupLabelIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: AnalysisGroupLabelIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: AnalysisGroupLabelIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: AnalysisGroupLabelIntegrationTest: @Transactional;
-    
-    @Autowired
-    AnalysisGroupLabelDataOnDemand AnalysisGroupLabelIntegrationTest.dod;
-    
-    @Test
-    public void AnalysisGroupLabelIntegrationTest.testCountAnalysisGroupLabels() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to initialize correctly", dod.getRandomAnalysisGroupLabel());
-        long count = AnalysisGroupLabel.countAnalysisGroupLabels();
-        Assert.assertTrue("Counter for 'AnalysisGroupLabel' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void AnalysisGroupLabelIntegrationTest.testFindAnalysisGroupLabel() {
-        AnalysisGroupLabel obj = dod.getRandomAnalysisGroupLabel();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to provide an identifier", id);
-        obj = AnalysisGroupLabel.findAnalysisGroupLabel(id);
-        Assert.assertNotNull("Find method for 'AnalysisGroupLabel' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'AnalysisGroupLabel' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void AnalysisGroupLabelIntegrationTest.testFindAllAnalysisGroupLabels() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to initialize correctly", dod.getRandomAnalysisGroupLabel());
-        long count = AnalysisGroupLabel.countAnalysisGroupLabels();
-        Assert.assertTrue("Too expensive to perform a find all test for 'AnalysisGroupLabel', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<AnalysisGroupLabel> result = AnalysisGroupLabel.findAllAnalysisGroupLabels();
-        Assert.assertNotNull("Find all method for 'AnalysisGroupLabel' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'AnalysisGroupLabel' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void AnalysisGroupLabelIntegrationTest.testFindAnalysisGroupLabelEntries() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to initialize correctly", dod.getRandomAnalysisGroupLabel());
-        long count = AnalysisGroupLabel.countAnalysisGroupLabels();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<AnalysisGroupLabel> result = AnalysisGroupLabel.findAnalysisGroupLabelEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'AnalysisGroupLabel' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'AnalysisGroupLabel' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void AnalysisGroupLabelIntegrationTest.testFlush() {
-        AnalysisGroupLabel obj = dod.getRandomAnalysisGroupLabel();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to provide an identifier", id);
-        obj = AnalysisGroupLabel.findAnalysisGroupLabel(id);
-        Assert.assertNotNull("Find method for 'AnalysisGroupLabel' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyAnalysisGroupLabel(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'AnalysisGroupLabel' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void AnalysisGroupLabelIntegrationTest.testMergeUpdate() {
-        AnalysisGroupLabel obj = dod.getRandomAnalysisGroupLabel();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to provide an identifier", id);
-        obj = AnalysisGroupLabel.findAnalysisGroupLabel(id);
-        boolean modified =  dod.modifyAnalysisGroupLabel(obj);
-        Integer currentVersion = obj.getVersion();
-        AnalysisGroupLabel merged = (AnalysisGroupLabel)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'AnalysisGroupLabel' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void AnalysisGroupLabelIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to initialize correctly", dod.getRandomAnalysisGroupLabel());
-        AnalysisGroupLabel obj = dod.getNewTransientAnalysisGroupLabel(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'AnalysisGroupLabel' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'AnalysisGroupLabel' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void AnalysisGroupLabelIntegrationTest.testRemove() {
-        AnalysisGroupLabel obj = dod.getRandomAnalysisGroupLabel();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to provide an identifier", id);
-        obj = AnalysisGroupLabel.findAnalysisGroupLabel(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'AnalysisGroupLabel' with identifier '" + id + "'", AnalysisGroupLabel.findAnalysisGroupLabel(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateDataOnDemand.java
index 0c2e25dc8..d610133c3 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateDataOnDemand.java
@@ -1,7 +1,177 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Component
+@Configurable
 @RooDataOnDemand(entity = AnalysisGroupState.class)
 public class AnalysisGroupStateDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<AnalysisGroupState> data;
+
+	@Autowired
+    AnalysisGroupDataOnDemand analysisGroupDataOnDemand;
+
+	public AnalysisGroupState getNewTransientAnalysisGroupState(int index) {
+        AnalysisGroupState obj = new AnalysisGroupState();
+        setAnalysisGroup(obj, index);
+        setComments(obj, index);
+        setDeleted(obj, index);
+        setIgnored(obj, index);
+        setLsKind(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedBy(obj, index);
+        setModifiedDate(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        return obj;
+    }
+
+	public void setAnalysisGroup(AnalysisGroupState obj, int index) {
+        AnalysisGroup analysisGroup = analysisGroupDataOnDemand.getRandomAnalysisGroup();
+        obj.setAnalysisGroup(analysisGroup);
+    }
+
+	public void setComments(AnalysisGroupState obj, int index) {
+        String comments = "comments_" + index;
+        if (comments.length() > 512) {
+            comments = comments.substring(0, 512);
+        }
+        obj.setComments(comments);
+    }
+
+	public void setDeleted(AnalysisGroupState obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setIgnored(AnalysisGroupState obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setLsKind(AnalysisGroupState obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsTransaction(AnalysisGroupState obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(AnalysisGroupState obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 64) {
+            lsType = lsType.substring(0, 64);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(AnalysisGroupState obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedBy(AnalysisGroupState obj, int index) {
+        String modifiedBy = "modifiedBy_" + index;
+        if (modifiedBy.length() > 255) {
+            modifiedBy = modifiedBy.substring(0, 255);
+        }
+        obj.setModifiedBy(modifiedBy);
+    }
+
+	public void setModifiedDate(AnalysisGroupState obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setRecordedBy(AnalysisGroupState obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(AnalysisGroupState obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public AnalysisGroupState getSpecificAnalysisGroupState(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        AnalysisGroupState obj = data.get(index);
+        Long id = obj.getId();
+        return AnalysisGroupState.findAnalysisGroupState(id);
+    }
+
+	public AnalysisGroupState getRandomAnalysisGroupState() {
+        init();
+        AnalysisGroupState obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return AnalysisGroupState.findAnalysisGroupState(id);
+    }
+
+	public boolean modifyAnalysisGroupState(AnalysisGroupState obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = AnalysisGroupState.findAnalysisGroupStateEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'AnalysisGroupState' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<AnalysisGroupState>();
+        for (int i = 0; i < 10; i++) {
+            AnalysisGroupState obj = getNewTransientAnalysisGroupState(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index f14aa71b0..000000000
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroupStateDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect AnalysisGroupStateDataOnDemand_Roo_Configurable {
-    
-    declare @type: AnalysisGroupStateDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 3299447a1..000000000
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,182 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.AnalysisGroupDataOnDemand;
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import com.labsynch.labseer.domain.AnalysisGroupStateDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect AnalysisGroupStateDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: AnalysisGroupStateDataOnDemand: @Component;
-    
-    private Random AnalysisGroupStateDataOnDemand.rnd = new SecureRandom();
-    
-    private List<AnalysisGroupState> AnalysisGroupStateDataOnDemand.data;
-    
-    @Autowired
-    AnalysisGroupDataOnDemand AnalysisGroupStateDataOnDemand.analysisGroupDataOnDemand;
-    
-    public AnalysisGroupState AnalysisGroupStateDataOnDemand.getNewTransientAnalysisGroupState(int index) {
-        AnalysisGroupState obj = new AnalysisGroupState();
-        setAnalysisGroup(obj, index);
-        setComments(obj, index);
-        setDeleted(obj, index);
-        setIgnored(obj, index);
-        setLsKind(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedBy(obj, index);
-        setModifiedDate(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        return obj;
-    }
-    
-    public void AnalysisGroupStateDataOnDemand.setAnalysisGroup(AnalysisGroupState obj, int index) {
-        AnalysisGroup analysisGroup = analysisGroupDataOnDemand.getRandomAnalysisGroup();
-        obj.setAnalysisGroup(analysisGroup);
-    }
-    
-    public void AnalysisGroupStateDataOnDemand.setComments(AnalysisGroupState obj, int index) {
-        String comments = "comments_" + index;
-        if (comments.length() > 512) {
-            comments = comments.substring(0, 512);
-        }
-        obj.setComments(comments);
-    }
-    
-    public void AnalysisGroupStateDataOnDemand.setDeleted(AnalysisGroupState obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void AnalysisGroupStateDataOnDemand.setIgnored(AnalysisGroupState obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void AnalysisGroupStateDataOnDemand.setLsKind(AnalysisGroupState obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void AnalysisGroupStateDataOnDemand.setLsTransaction(AnalysisGroupState obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void AnalysisGroupStateDataOnDemand.setLsType(AnalysisGroupState obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 64) {
-            lsType = lsType.substring(0, 64);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void AnalysisGroupStateDataOnDemand.setLsTypeAndKind(AnalysisGroupState obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void AnalysisGroupStateDataOnDemand.setModifiedBy(AnalysisGroupState obj, int index) {
-        String modifiedBy = "modifiedBy_" + index;
-        if (modifiedBy.length() > 255) {
-            modifiedBy = modifiedBy.substring(0, 255);
-        }
-        obj.setModifiedBy(modifiedBy);
-    }
-    
-    public void AnalysisGroupStateDataOnDemand.setModifiedDate(AnalysisGroupState obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void AnalysisGroupStateDataOnDemand.setRecordedBy(AnalysisGroupState obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void AnalysisGroupStateDataOnDemand.setRecordedDate(AnalysisGroupState obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public AnalysisGroupState AnalysisGroupStateDataOnDemand.getSpecificAnalysisGroupState(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        AnalysisGroupState obj = data.get(index);
-        Long id = obj.getId();
-        return AnalysisGroupState.findAnalysisGroupState(id);
-    }
-    
-    public AnalysisGroupState AnalysisGroupStateDataOnDemand.getRandomAnalysisGroupState() {
-        init();
-        AnalysisGroupState obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return AnalysisGroupState.findAnalysisGroupState(id);
-    }
-    
-    public boolean AnalysisGroupStateDataOnDemand.modifyAnalysisGroupState(AnalysisGroupState obj) {
-        return false;
-    }
-    
-    public void AnalysisGroupStateDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = AnalysisGroupState.findAnalysisGroupStateEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'AnalysisGroupState' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<AnalysisGroupState>();
-        for (int i = 0; i < 10; i++) {
-            AnalysisGroupState obj = getNewTransientAnalysisGroupState(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateIntegrationTest.java
index 3faa70ba0..832c3271b 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = AnalysisGroupState.class)
 public class AnalysisGroupStateIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    AnalysisGroupStateDataOnDemand dod;
+
+	@Test
+    public void testCountAnalysisGroupStates() {
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to initialize correctly", dod.getRandomAnalysisGroupState());
+        long count = AnalysisGroupState.countAnalysisGroupStates();
+        Assert.assertTrue("Counter for 'AnalysisGroupState' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindAnalysisGroupState() {
+        AnalysisGroupState obj = dod.getRandomAnalysisGroupState();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to provide an identifier", id);
+        obj = AnalysisGroupState.findAnalysisGroupState(id);
+        Assert.assertNotNull("Find method for 'AnalysisGroupState' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'AnalysisGroupState' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllAnalysisGroupStates() {
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to initialize correctly", dod.getRandomAnalysisGroupState());
+        long count = AnalysisGroupState.countAnalysisGroupStates();
+        Assert.assertTrue("Too expensive to perform a find all test for 'AnalysisGroupState', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<AnalysisGroupState> result = AnalysisGroupState.findAllAnalysisGroupStates();
+        Assert.assertNotNull("Find all method for 'AnalysisGroupState' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'AnalysisGroupState' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindAnalysisGroupStateEntries() {
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to initialize correctly", dod.getRandomAnalysisGroupState());
+        long count = AnalysisGroupState.countAnalysisGroupStates();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<AnalysisGroupState> result = AnalysisGroupState.findAnalysisGroupStateEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'AnalysisGroupState' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'AnalysisGroupState' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        AnalysisGroupState obj = dod.getRandomAnalysisGroupState();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to provide an identifier", id);
+        obj = AnalysisGroupState.findAnalysisGroupState(id);
+        Assert.assertNotNull("Find method for 'AnalysisGroupState' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyAnalysisGroupState(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'AnalysisGroupState' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        AnalysisGroupState obj = dod.getRandomAnalysisGroupState();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to provide an identifier", id);
+        obj = AnalysisGroupState.findAnalysisGroupState(id);
+        boolean modified =  dod.modifyAnalysisGroupState(obj);
+        Integer currentVersion = obj.getVersion();
+        AnalysisGroupState merged = (AnalysisGroupState)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'AnalysisGroupState' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to initialize correctly", dod.getRandomAnalysisGroupState());
+        AnalysisGroupState obj = dod.getNewTransientAnalysisGroupState(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'AnalysisGroupState' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'AnalysisGroupState' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        AnalysisGroupState obj = dod.getRandomAnalysisGroupState();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to provide an identifier", id);
+        obj = AnalysisGroupState.findAnalysisGroupState(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'AnalysisGroupState' with identifier '" + id + "'", AnalysisGroupState.findAnalysisGroupState(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index b385ef75e..000000000
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroupStateIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect AnalysisGroupStateIntegrationTest_Roo_Configurable {
-    
-    declare @type: AnalysisGroupStateIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index b90fcebd0..000000000
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import com.labsynch.labseer.domain.AnalysisGroupStateDataOnDemand;
-import com.labsynch.labseer.domain.AnalysisGroupStateIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect AnalysisGroupStateIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: AnalysisGroupStateIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: AnalysisGroupStateIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: AnalysisGroupStateIntegrationTest: @Transactional;
-    
-    @Autowired
-    AnalysisGroupStateDataOnDemand AnalysisGroupStateIntegrationTest.dod;
-    
-    @Test
-    public void AnalysisGroupStateIntegrationTest.testCountAnalysisGroupStates() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to initialize correctly", dod.getRandomAnalysisGroupState());
-        long count = AnalysisGroupState.countAnalysisGroupStates();
-        Assert.assertTrue("Counter for 'AnalysisGroupState' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void AnalysisGroupStateIntegrationTest.testFindAnalysisGroupState() {
-        AnalysisGroupState obj = dod.getRandomAnalysisGroupState();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to provide an identifier", id);
-        obj = AnalysisGroupState.findAnalysisGroupState(id);
-        Assert.assertNotNull("Find method for 'AnalysisGroupState' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'AnalysisGroupState' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void AnalysisGroupStateIntegrationTest.testFindAllAnalysisGroupStates() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to initialize correctly", dod.getRandomAnalysisGroupState());
-        long count = AnalysisGroupState.countAnalysisGroupStates();
-        Assert.assertTrue("Too expensive to perform a find all test for 'AnalysisGroupState', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<AnalysisGroupState> result = AnalysisGroupState.findAllAnalysisGroupStates();
-        Assert.assertNotNull("Find all method for 'AnalysisGroupState' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'AnalysisGroupState' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void AnalysisGroupStateIntegrationTest.testFindAnalysisGroupStateEntries() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to initialize correctly", dod.getRandomAnalysisGroupState());
-        long count = AnalysisGroupState.countAnalysisGroupStates();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<AnalysisGroupState> result = AnalysisGroupState.findAnalysisGroupStateEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'AnalysisGroupState' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'AnalysisGroupState' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void AnalysisGroupStateIntegrationTest.testFlush() {
-        AnalysisGroupState obj = dod.getRandomAnalysisGroupState();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to provide an identifier", id);
-        obj = AnalysisGroupState.findAnalysisGroupState(id);
-        Assert.assertNotNull("Find method for 'AnalysisGroupState' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyAnalysisGroupState(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'AnalysisGroupState' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void AnalysisGroupStateIntegrationTest.testMergeUpdate() {
-        AnalysisGroupState obj = dod.getRandomAnalysisGroupState();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to provide an identifier", id);
-        obj = AnalysisGroupState.findAnalysisGroupState(id);
-        boolean modified =  dod.modifyAnalysisGroupState(obj);
-        Integer currentVersion = obj.getVersion();
-        AnalysisGroupState merged = (AnalysisGroupState)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'AnalysisGroupState' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void AnalysisGroupStateIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to initialize correctly", dod.getRandomAnalysisGroupState());
-        AnalysisGroupState obj = dod.getNewTransientAnalysisGroupState(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'AnalysisGroupState' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'AnalysisGroupState' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void AnalysisGroupStateIntegrationTest.testRemove() {
-        AnalysisGroupState obj = dod.getRandomAnalysisGroupState();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to provide an identifier", id);
-        obj = AnalysisGroupState.findAnalysisGroupState(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'AnalysisGroupState' with identifier '" + id + "'", AnalysisGroupState.findAnalysisGroupState(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueDataOnDemand.java
index ea5a40620..d66bd0645 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueDataOnDemand.java
@@ -1,7 +1,382 @@
 package com.labsynch.labseer.domain;
 
+import java.math.BigDecimal;
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Configurable
+@Component
 @RooDataOnDemand(entity = AnalysisGroupValue.class)
 public class AnalysisGroupValueDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<AnalysisGroupValue> data;
+
+	@Autowired
+    AnalysisGroupStateDataOnDemand analysisGroupStateDataOnDemand;
+
+	public AnalysisGroupValue getNewTransientAnalysisGroupValue(int index) {
+        AnalysisGroupValue obj = new AnalysisGroupValue();
+        setBlobValue(obj, index);
+        setClobValue(obj, index);
+        setCodeKind(obj, index);
+        setCodeOrigin(obj, index);
+        setCodeType(obj, index);
+        setCodeTypeAndKind(obj, index);
+        setCodeValue(obj, index);
+        setComments(obj, index);
+        setConcUnit(obj, index);
+        setConcentration(obj, index);
+        setDateValue(obj, index);
+        setDeleted(obj, index);
+        setFileValue(obj, index);
+        setIgnored(obj, index);
+        setLsKind(obj, index);
+        setLsState(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedBy(obj, index);
+        setModifiedDate(obj, index);
+        setNumberOfReplicates(obj, index);
+        setNumericValue(obj, index);
+        setOperatorKind(obj, index);
+        setOperatorType(obj, index);
+        setOperatorTypeAndKind(obj, index);
+        setPublicData(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        setSigFigs(obj, index);
+        setStringValue(obj, index);
+        setUncertainty(obj, index);
+        setUncertaintyType(obj, index);
+        setUnitKind(obj, index);
+        setUnitType(obj, index);
+        setUnitTypeAndKind(obj, index);
+        setUrlValue(obj, index);
+        return obj;
+    }
+
+	public void setBlobValue(AnalysisGroupValue obj, int index) {
+        byte[] blobValue = String.valueOf(index).getBytes();
+        obj.setBlobValue(blobValue);
+    }
+
+	public void setClobValue(AnalysisGroupValue obj, int index) {
+        String clobValue = "clobValue_" + index;
+        obj.setClobValue(clobValue);
+    }
+
+	public void setCodeKind(AnalysisGroupValue obj, int index) {
+        String codeKind = "codeKind_" + index;
+        if (codeKind.length() > 255) {
+            codeKind = codeKind.substring(0, 255);
+        }
+        obj.setCodeKind(codeKind);
+    }
+
+	public void setCodeOrigin(AnalysisGroupValue obj, int index) {
+        String codeOrigin = "codeOrigin_" + index;
+        if (codeOrigin.length() > 255) {
+            codeOrigin = codeOrigin.substring(0, 255);
+        }
+        obj.setCodeOrigin(codeOrigin);
+    }
+
+	public void setCodeType(AnalysisGroupValue obj, int index) {
+        String codeType = "codeType_" + index;
+        if (codeType.length() > 255) {
+            codeType = codeType.substring(0, 255);
+        }
+        obj.setCodeType(codeType);
+    }
+
+	public void setCodeTypeAndKind(AnalysisGroupValue obj, int index) {
+        String codeTypeAndKind = "codeTypeAndKind_" + index;
+        if (codeTypeAndKind.length() > 350) {
+            codeTypeAndKind = codeTypeAndKind.substring(0, 350);
+        }
+        obj.setCodeTypeAndKind(codeTypeAndKind);
+    }
+
+	public void setCodeValue(AnalysisGroupValue obj, int index) {
+        String codeValue = "codeValue_" + index;
+        if (codeValue.length() > 255) {
+            codeValue = codeValue.substring(0, 255);
+        }
+        obj.setCodeValue(codeValue);
+    }
+
+	public void setComments(AnalysisGroupValue obj, int index) {
+        String comments = "comments_" + index;
+        if (comments.length() > 512) {
+            comments = comments.substring(0, 512);
+        }
+        obj.setComments(comments);
+    }
+
+	public void setConcUnit(AnalysisGroupValue obj, int index) {
+        String concUnit = "concUnit_" + index;
+        if (concUnit.length() > 25) {
+            concUnit = concUnit.substring(0, 25);
+        }
+        obj.setConcUnit(concUnit);
+    }
+
+	public void setConcentration(AnalysisGroupValue obj, int index) {
+        Double concentration = new Integer(index).doubleValue();
+        obj.setConcentration(concentration);
+    }
+
+	public void setDateValue(AnalysisGroupValue obj, int index) {
+        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setDateValue(dateValue);
+    }
+
+	public void setDeleted(AnalysisGroupValue obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setFileValue(AnalysisGroupValue obj, int index) {
+        String fileValue = "fileValue_" + index;
+        if (fileValue.length() > 512) {
+            fileValue = fileValue.substring(0, 512);
+        }
+        obj.setFileValue(fileValue);
+    }
+
+	public void setIgnored(AnalysisGroupValue obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setLsKind(AnalysisGroupValue obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsState(AnalysisGroupValue obj, int index) {
+        AnalysisGroupState lsState = analysisGroupStateDataOnDemand.getRandomAnalysisGroupState();
+        obj.setLsState(lsState);
+    }
+
+	public void setLsTransaction(AnalysisGroupValue obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(AnalysisGroupValue obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 64) {
+            lsType = lsType.substring(0, 64);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(AnalysisGroupValue obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 350) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 350);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedBy(AnalysisGroupValue obj, int index) {
+        String modifiedBy = "modifiedBy_" + index;
+        if (modifiedBy.length() > 255) {
+            modifiedBy = modifiedBy.substring(0, 255);
+        }
+        obj.setModifiedBy(modifiedBy);
+    }
+
+	public void setModifiedDate(AnalysisGroupValue obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setNumberOfReplicates(AnalysisGroupValue obj, int index) {
+        Integer numberOfReplicates = new Integer(index);
+        obj.setNumberOfReplicates(numberOfReplicates);
+    }
+
+	public void setNumericValue(AnalysisGroupValue obj, int index) {
+        BigDecimal numericValue = BigDecimal.valueOf(index);
+        if (numericValue.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
+            numericValue = new BigDecimal("99999999999999999999.999999999999999999");
+        }
+        obj.setNumericValue(numericValue);
+    }
+
+	public void setOperatorKind(AnalysisGroupValue obj, int index) {
+        String operatorKind = "operator_" + index;
+        if (operatorKind.length() > 10) {
+            operatorKind = operatorKind.substring(0, 10);
+        }
+        obj.setOperatorKind(operatorKind);
+    }
+
+	public void setOperatorType(AnalysisGroupValue obj, int index) {
+        String operatorType = "operatorType_" + index;
+        if (operatorType.length() > 25) {
+            operatorType = operatorType.substring(0, 25);
+        }
+        obj.setOperatorType(operatorType);
+    }
+
+	public void setOperatorTypeAndKind(AnalysisGroupValue obj, int index) {
+        String operatorTypeAndKind = "operatorTypeAndKind_" + index;
+        if (operatorTypeAndKind.length() > 50) {
+            operatorTypeAndKind = operatorTypeAndKind.substring(0, 50);
+        }
+        obj.setOperatorTypeAndKind(operatorTypeAndKind);
+    }
+
+	public void setPublicData(AnalysisGroupValue obj, int index) {
+        Boolean publicData = true;
+        obj.setPublicData(publicData);
+    }
+
+	public void setRecordedBy(AnalysisGroupValue obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(AnalysisGroupValue obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public void setSigFigs(AnalysisGroupValue obj, int index) {
+        Integer sigFigs = new Integer(index);
+        obj.setSigFigs(sigFigs);
+    }
+
+	public void setStringValue(AnalysisGroupValue obj, int index) {
+        String stringValue = "stringValue_" + index;
+        if (stringValue.length() > 255) {
+            stringValue = stringValue.substring(0, 255);
+        }
+        obj.setStringValue(stringValue);
+    }
+
+	public void setUncertainty(AnalysisGroupValue obj, int index) {
+        BigDecimal uncertainty = BigDecimal.valueOf(index);
+        if (uncertainty.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
+            uncertainty = new BigDecimal("99999999999999999999.999999999999999999");
+        }
+        obj.setUncertainty(uncertainty);
+    }
+
+	public void setUncertaintyType(AnalysisGroupValue obj, int index) {
+        String uncertaintyType = "uncertaintyType_" + index;
+        if (uncertaintyType.length() > 255) {
+            uncertaintyType = uncertaintyType.substring(0, 255);
+        }
+        obj.setUncertaintyType(uncertaintyType);
+    }
+
+	public void setUnitKind(AnalysisGroupValue obj, int index) {
+        String unitKind = "unitKind_" + index;
+        if (unitKind.length() > 25) {
+            unitKind = unitKind.substring(0, 25);
+        }
+        obj.setUnitKind(unitKind);
+    }
+
+	public void setUnitType(AnalysisGroupValue obj, int index) {
+        String unitType = "unitType_" + index;
+        if (unitType.length() > 25) {
+            unitType = unitType.substring(0, 25);
+        }
+        obj.setUnitType(unitType);
+    }
+
+	public void setUnitTypeAndKind(AnalysisGroupValue obj, int index) {
+        String unitTypeAndKind = "unitTypeAndKind_" + index;
+        if (unitTypeAndKind.length() > 55) {
+            unitTypeAndKind = unitTypeAndKind.substring(0, 55);
+        }
+        obj.setUnitTypeAndKind(unitTypeAndKind);
+    }
+
+	public void setUrlValue(AnalysisGroupValue obj, int index) {
+        String urlValue = "urlValue_" + index;
+        if (urlValue.length() > 2000) {
+            urlValue = urlValue.substring(0, 2000);
+        }
+        obj.setUrlValue(urlValue);
+    }
+
+	public AnalysisGroupValue getSpecificAnalysisGroupValue(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        AnalysisGroupValue obj = data.get(index);
+        Long id = obj.getId();
+        return AnalysisGroupValue.findAnalysisGroupValue(id);
+    }
+
+	public AnalysisGroupValue getRandomAnalysisGroupValue() {
+        init();
+        AnalysisGroupValue obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return AnalysisGroupValue.findAnalysisGroupValue(id);
+    }
+
+	public boolean modifyAnalysisGroupValue(AnalysisGroupValue obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = AnalysisGroupValue.findAnalysisGroupValueEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'AnalysisGroupValue' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<AnalysisGroupValue>();
+        for (int i = 0; i < 10; i++) {
+            AnalysisGroupValue obj = getNewTransientAnalysisGroupValue(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 7dc8d4fb3..000000000
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroupValueDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect AnalysisGroupValueDataOnDemand_Roo_Configurable {
-    
-    declare @type: AnalysisGroupValueDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index f7b2d5788..000000000
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,387 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import com.labsynch.labseer.domain.AnalysisGroupStateDataOnDemand;
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.domain.AnalysisGroupValueDataOnDemand;
-import java.math.BigDecimal;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect AnalysisGroupValueDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: AnalysisGroupValueDataOnDemand: @Component;
-    
-    private Random AnalysisGroupValueDataOnDemand.rnd = new SecureRandom();
-    
-    private List<AnalysisGroupValue> AnalysisGroupValueDataOnDemand.data;
-    
-    @Autowired
-    AnalysisGroupStateDataOnDemand AnalysisGroupValueDataOnDemand.analysisGroupStateDataOnDemand;
-    
-    public AnalysisGroupValue AnalysisGroupValueDataOnDemand.getNewTransientAnalysisGroupValue(int index) {
-        AnalysisGroupValue obj = new AnalysisGroupValue();
-        setBlobValue(obj, index);
-        setClobValue(obj, index);
-        setCodeKind(obj, index);
-        setCodeOrigin(obj, index);
-        setCodeType(obj, index);
-        setCodeTypeAndKind(obj, index);
-        setCodeValue(obj, index);
-        setComments(obj, index);
-        setConcUnit(obj, index);
-        setConcentration(obj, index);
-        setDateValue(obj, index);
-        setDeleted(obj, index);
-        setFileValue(obj, index);
-        setIgnored(obj, index);
-        setLsKind(obj, index);
-        setLsState(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedBy(obj, index);
-        setModifiedDate(obj, index);
-        setNumberOfReplicates(obj, index);
-        setNumericValue(obj, index);
-        setOperatorKind(obj, index);
-        setOperatorType(obj, index);
-        setOperatorTypeAndKind(obj, index);
-        setPublicData(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        setSigFigs(obj, index);
-        setStringValue(obj, index);
-        setUncertainty(obj, index);
-        setUncertaintyType(obj, index);
-        setUnitKind(obj, index);
-        setUnitType(obj, index);
-        setUnitTypeAndKind(obj, index);
-        setUrlValue(obj, index);
-        return obj;
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setBlobValue(AnalysisGroupValue obj, int index) {
-        byte[] blobValue = String.valueOf(index).getBytes();
-        obj.setBlobValue(blobValue);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setClobValue(AnalysisGroupValue obj, int index) {
-        String clobValue = "clobValue_" + index;
-        obj.setClobValue(clobValue);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setCodeKind(AnalysisGroupValue obj, int index) {
-        String codeKind = "codeKind_" + index;
-        if (codeKind.length() > 255) {
-            codeKind = codeKind.substring(0, 255);
-        }
-        obj.setCodeKind(codeKind);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setCodeOrigin(AnalysisGroupValue obj, int index) {
-        String codeOrigin = "codeOrigin_" + index;
-        if (codeOrigin.length() > 255) {
-            codeOrigin = codeOrigin.substring(0, 255);
-        }
-        obj.setCodeOrigin(codeOrigin);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setCodeType(AnalysisGroupValue obj, int index) {
-        String codeType = "codeType_" + index;
-        if (codeType.length() > 255) {
-            codeType = codeType.substring(0, 255);
-        }
-        obj.setCodeType(codeType);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setCodeTypeAndKind(AnalysisGroupValue obj, int index) {
-        String codeTypeAndKind = "codeTypeAndKind_" + index;
-        if (codeTypeAndKind.length() > 350) {
-            codeTypeAndKind = codeTypeAndKind.substring(0, 350);
-        }
-        obj.setCodeTypeAndKind(codeTypeAndKind);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setCodeValue(AnalysisGroupValue obj, int index) {
-        String codeValue = "codeValue_" + index;
-        if (codeValue.length() > 255) {
-            codeValue = codeValue.substring(0, 255);
-        }
-        obj.setCodeValue(codeValue);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setComments(AnalysisGroupValue obj, int index) {
-        String comments = "comments_" + index;
-        if (comments.length() > 512) {
-            comments = comments.substring(0, 512);
-        }
-        obj.setComments(comments);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setConcUnit(AnalysisGroupValue obj, int index) {
-        String concUnit = "concUnit_" + index;
-        if (concUnit.length() > 25) {
-            concUnit = concUnit.substring(0, 25);
-        }
-        obj.setConcUnit(concUnit);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setConcentration(AnalysisGroupValue obj, int index) {
-        Double concentration = new Integer(index).doubleValue();
-        obj.setConcentration(concentration);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setDateValue(AnalysisGroupValue obj, int index) {
-        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setDateValue(dateValue);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setDeleted(AnalysisGroupValue obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setFileValue(AnalysisGroupValue obj, int index) {
-        String fileValue = "fileValue_" + index;
-        if (fileValue.length() > 512) {
-            fileValue = fileValue.substring(0, 512);
-        }
-        obj.setFileValue(fileValue);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setIgnored(AnalysisGroupValue obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setLsKind(AnalysisGroupValue obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setLsState(AnalysisGroupValue obj, int index) {
-        AnalysisGroupState lsState = analysisGroupStateDataOnDemand.getRandomAnalysisGroupState();
-        obj.setLsState(lsState);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setLsTransaction(AnalysisGroupValue obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setLsType(AnalysisGroupValue obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 64) {
-            lsType = lsType.substring(0, 64);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setLsTypeAndKind(AnalysisGroupValue obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 350) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 350);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setModifiedBy(AnalysisGroupValue obj, int index) {
-        String modifiedBy = "modifiedBy_" + index;
-        if (modifiedBy.length() > 255) {
-            modifiedBy = modifiedBy.substring(0, 255);
-        }
-        obj.setModifiedBy(modifiedBy);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setModifiedDate(AnalysisGroupValue obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setNumberOfReplicates(AnalysisGroupValue obj, int index) {
-        Integer numberOfReplicates = new Integer(index);
-        obj.setNumberOfReplicates(numberOfReplicates);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setNumericValue(AnalysisGroupValue obj, int index) {
-        BigDecimal numericValue = BigDecimal.valueOf(index);
-        if (numericValue.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
-            numericValue = new BigDecimal("99999999999999999999.999999999999999999");
-        }
-        obj.setNumericValue(numericValue);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setOperatorKind(AnalysisGroupValue obj, int index) {
-        String operatorKind = "operator_" + index;
-        if (operatorKind.length() > 10) {
-            operatorKind = operatorKind.substring(0, 10);
-        }
-        obj.setOperatorKind(operatorKind);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setOperatorType(AnalysisGroupValue obj, int index) {
-        String operatorType = "operatorType_" + index;
-        if (operatorType.length() > 25) {
-            operatorType = operatorType.substring(0, 25);
-        }
-        obj.setOperatorType(operatorType);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setOperatorTypeAndKind(AnalysisGroupValue obj, int index) {
-        String operatorTypeAndKind = "operatorTypeAndKind_" + index;
-        if (operatorTypeAndKind.length() > 50) {
-            operatorTypeAndKind = operatorTypeAndKind.substring(0, 50);
-        }
-        obj.setOperatorTypeAndKind(operatorTypeAndKind);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setPublicData(AnalysisGroupValue obj, int index) {
-        Boolean publicData = true;
-        obj.setPublicData(publicData);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setRecordedBy(AnalysisGroupValue obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setRecordedDate(AnalysisGroupValue obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setSigFigs(AnalysisGroupValue obj, int index) {
-        Integer sigFigs = new Integer(index);
-        obj.setSigFigs(sigFigs);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setStringValue(AnalysisGroupValue obj, int index) {
-        String stringValue = "stringValue_" + index;
-        if (stringValue.length() > 255) {
-            stringValue = stringValue.substring(0, 255);
-        }
-        obj.setStringValue(stringValue);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setUncertainty(AnalysisGroupValue obj, int index) {
-        BigDecimal uncertainty = BigDecimal.valueOf(index);
-        if (uncertainty.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
-            uncertainty = new BigDecimal("99999999999999999999.999999999999999999");
-        }
-        obj.setUncertainty(uncertainty);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setUncertaintyType(AnalysisGroupValue obj, int index) {
-        String uncertaintyType = "uncertaintyType_" + index;
-        if (uncertaintyType.length() > 255) {
-            uncertaintyType = uncertaintyType.substring(0, 255);
-        }
-        obj.setUncertaintyType(uncertaintyType);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setUnitKind(AnalysisGroupValue obj, int index) {
-        String unitKind = "unitKind_" + index;
-        if (unitKind.length() > 25) {
-            unitKind = unitKind.substring(0, 25);
-        }
-        obj.setUnitKind(unitKind);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setUnitType(AnalysisGroupValue obj, int index) {
-        String unitType = "unitType_" + index;
-        if (unitType.length() > 25) {
-            unitType = unitType.substring(0, 25);
-        }
-        obj.setUnitType(unitType);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setUnitTypeAndKind(AnalysisGroupValue obj, int index) {
-        String unitTypeAndKind = "unitTypeAndKind_" + index;
-        if (unitTypeAndKind.length() > 55) {
-            unitTypeAndKind = unitTypeAndKind.substring(0, 55);
-        }
-        obj.setUnitTypeAndKind(unitTypeAndKind);
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.setUrlValue(AnalysisGroupValue obj, int index) {
-        String urlValue = "urlValue_" + index;
-        if (urlValue.length() > 2000) {
-            urlValue = urlValue.substring(0, 2000);
-        }
-        obj.setUrlValue(urlValue);
-    }
-    
-    public AnalysisGroupValue AnalysisGroupValueDataOnDemand.getSpecificAnalysisGroupValue(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        AnalysisGroupValue obj = data.get(index);
-        Long id = obj.getId();
-        return AnalysisGroupValue.findAnalysisGroupValue(id);
-    }
-    
-    public AnalysisGroupValue AnalysisGroupValueDataOnDemand.getRandomAnalysisGroupValue() {
-        init();
-        AnalysisGroupValue obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return AnalysisGroupValue.findAnalysisGroupValue(id);
-    }
-    
-    public boolean AnalysisGroupValueDataOnDemand.modifyAnalysisGroupValue(AnalysisGroupValue obj) {
-        return false;
-    }
-    
-    public void AnalysisGroupValueDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = AnalysisGroupValue.findAnalysisGroupValueEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'AnalysisGroupValue' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<AnalysisGroupValue>();
-        for (int i = 0; i < 10; i++) {
-            AnalysisGroupValue obj = getNewTransientAnalysisGroupValue(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueIntegrationTest.java
index 6b9137255..ee2242548 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = AnalysisGroupValue.class)
 public class AnalysisGroupValueIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    AnalysisGroupValueDataOnDemand dod;
+
+	@Test
+    public void testCountAnalysisGroupValues() {
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to initialize correctly", dod.getRandomAnalysisGroupValue());
+        long count = AnalysisGroupValue.countAnalysisGroupValues();
+        Assert.assertTrue("Counter for 'AnalysisGroupValue' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindAnalysisGroupValue() {
+        AnalysisGroupValue obj = dod.getRandomAnalysisGroupValue();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to provide an identifier", id);
+        obj = AnalysisGroupValue.findAnalysisGroupValue(id);
+        Assert.assertNotNull("Find method for 'AnalysisGroupValue' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'AnalysisGroupValue' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllAnalysisGroupValues() {
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to initialize correctly", dod.getRandomAnalysisGroupValue());
+        long count = AnalysisGroupValue.countAnalysisGroupValues();
+        Assert.assertTrue("Too expensive to perform a find all test for 'AnalysisGroupValue', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<AnalysisGroupValue> result = AnalysisGroupValue.findAllAnalysisGroupValues();
+        Assert.assertNotNull("Find all method for 'AnalysisGroupValue' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'AnalysisGroupValue' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindAnalysisGroupValueEntries() {
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to initialize correctly", dod.getRandomAnalysisGroupValue());
+        long count = AnalysisGroupValue.countAnalysisGroupValues();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<AnalysisGroupValue> result = AnalysisGroupValue.findAnalysisGroupValueEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'AnalysisGroupValue' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'AnalysisGroupValue' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        AnalysisGroupValue obj = dod.getRandomAnalysisGroupValue();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to provide an identifier", id);
+        obj = AnalysisGroupValue.findAnalysisGroupValue(id);
+        Assert.assertNotNull("Find method for 'AnalysisGroupValue' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyAnalysisGroupValue(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'AnalysisGroupValue' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        AnalysisGroupValue obj = dod.getRandomAnalysisGroupValue();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to provide an identifier", id);
+        obj = AnalysisGroupValue.findAnalysisGroupValue(id);
+        boolean modified =  dod.modifyAnalysisGroupValue(obj);
+        Integer currentVersion = obj.getVersion();
+        AnalysisGroupValue merged = (AnalysisGroupValue)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'AnalysisGroupValue' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to initialize correctly", dod.getRandomAnalysisGroupValue());
+        AnalysisGroupValue obj = dod.getNewTransientAnalysisGroupValue(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'AnalysisGroupValue' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'AnalysisGroupValue' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        AnalysisGroupValue obj = dod.getRandomAnalysisGroupValue();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to provide an identifier", id);
+        obj = AnalysisGroupValue.findAnalysisGroupValue(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'AnalysisGroupValue' with identifier '" + id + "'", AnalysisGroupValue.findAnalysisGroupValue(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 0885840e1..000000000
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroupValueIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect AnalysisGroupValueIntegrationTest_Roo_Configurable {
-    
-    declare @type: AnalysisGroupValueIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 65acee205..000000000
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.domain.AnalysisGroupValueDataOnDemand;
-import com.labsynch.labseer.domain.AnalysisGroupValueIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect AnalysisGroupValueIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: AnalysisGroupValueIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: AnalysisGroupValueIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: AnalysisGroupValueIntegrationTest: @Transactional;
-    
-    @Autowired
-    AnalysisGroupValueDataOnDemand AnalysisGroupValueIntegrationTest.dod;
-    
-    @Test
-    public void AnalysisGroupValueIntegrationTest.testCountAnalysisGroupValues() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to initialize correctly", dod.getRandomAnalysisGroupValue());
-        long count = AnalysisGroupValue.countAnalysisGroupValues();
-        Assert.assertTrue("Counter for 'AnalysisGroupValue' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void AnalysisGroupValueIntegrationTest.testFindAnalysisGroupValue() {
-        AnalysisGroupValue obj = dod.getRandomAnalysisGroupValue();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to provide an identifier", id);
-        obj = AnalysisGroupValue.findAnalysisGroupValue(id);
-        Assert.assertNotNull("Find method for 'AnalysisGroupValue' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'AnalysisGroupValue' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void AnalysisGroupValueIntegrationTest.testFindAllAnalysisGroupValues() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to initialize correctly", dod.getRandomAnalysisGroupValue());
-        long count = AnalysisGroupValue.countAnalysisGroupValues();
-        Assert.assertTrue("Too expensive to perform a find all test for 'AnalysisGroupValue', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<AnalysisGroupValue> result = AnalysisGroupValue.findAllAnalysisGroupValues();
-        Assert.assertNotNull("Find all method for 'AnalysisGroupValue' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'AnalysisGroupValue' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void AnalysisGroupValueIntegrationTest.testFindAnalysisGroupValueEntries() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to initialize correctly", dod.getRandomAnalysisGroupValue());
-        long count = AnalysisGroupValue.countAnalysisGroupValues();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<AnalysisGroupValue> result = AnalysisGroupValue.findAnalysisGroupValueEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'AnalysisGroupValue' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'AnalysisGroupValue' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void AnalysisGroupValueIntegrationTest.testFlush() {
-        AnalysisGroupValue obj = dod.getRandomAnalysisGroupValue();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to provide an identifier", id);
-        obj = AnalysisGroupValue.findAnalysisGroupValue(id);
-        Assert.assertNotNull("Find method for 'AnalysisGroupValue' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyAnalysisGroupValue(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'AnalysisGroupValue' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void AnalysisGroupValueIntegrationTest.testMergeUpdate() {
-        AnalysisGroupValue obj = dod.getRandomAnalysisGroupValue();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to provide an identifier", id);
-        obj = AnalysisGroupValue.findAnalysisGroupValue(id);
-        boolean modified =  dod.modifyAnalysisGroupValue(obj);
-        Integer currentVersion = obj.getVersion();
-        AnalysisGroupValue merged = (AnalysisGroupValue)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'AnalysisGroupValue' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void AnalysisGroupValueIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to initialize correctly", dod.getRandomAnalysisGroupValue());
-        AnalysisGroupValue obj = dod.getNewTransientAnalysisGroupValue(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'AnalysisGroupValue' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'AnalysisGroupValue' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void AnalysisGroupValueIntegrationTest.testRemove() {
-        AnalysisGroupValue obj = dod.getRandomAnalysisGroupValue();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to provide an identifier", id);
-        obj = AnalysisGroupValue.findAnalysisGroupValue(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'AnalysisGroupValue' with identifier '" + id + "'", AnalysisGroupValue.findAnalysisGroupValue(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/AuthorDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/AuthorDataOnDemand.java
index 671f58f3a..2ba802c80 100755
--- a/src/test/java/com/labsynch/labseer/domain/AuthorDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/AuthorDataOnDemand.java
@@ -1,7 +1,236 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Component
+@Configurable
 @RooDataOnDemand(entity = Author.class)
 public class AuthorDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<Author> data;
+
+	public Author getNewTransientAuthor(int index) {
+        Author obj = new Author();
+        setActivationDate(obj, index);
+        setActivationKey(obj, index);
+        setCodeName(obj, index);
+        setDeleted(obj, index);
+        setEmailAddress(obj, index);
+        setEnabled(obj, index);
+        setFirstName(obj, index);
+        setIgnored(obj, index);
+        setLastName(obj, index);
+        setLocked(obj, index);
+        setLsKind(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedBy(obj, index);
+        setModifiedDate(obj, index);
+        setPassword(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        setUserName(obj, index);
+        return obj;
+    }
+
+	public void setActivationDate(Author obj, int index) {
+        Date activationDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setActivationDate(activationDate);
+    }
+
+	public void setActivationKey(Author obj, int index) {
+        String activationKey = "activationKey_" + index;
+        obj.setActivationKey(activationKey);
+    }
+
+	public void setCodeName(Author obj, int index) {
+        String codeName = "codeName_" + index;
+        if (codeName.length() > 255) {
+            codeName = new Random().nextInt(10) + codeName.substring(1, 255);
+        }
+        obj.setCodeName(codeName);
+    }
+
+	public void setDeleted(Author obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setEmailAddress(Author obj, int index) {
+        String emailAddress = "foo" + index + "@bar.com";
+        if (emailAddress.length() > 255) {
+            emailAddress = emailAddress.substring(0, 255);
+        }
+        obj.setEmailAddress(emailAddress);
+    }
+
+	public void setEnabled(Author obj, int index) {
+        Boolean enabled = Boolean.TRUE;
+        obj.setEnabled(enabled);
+    }
+
+	public void setFirstName(Author obj, int index) {
+        String firstName = "firstName_" + index;
+        if (firstName.length() > 255) {
+            firstName = firstName.substring(0, 255);
+        }
+        obj.setFirstName(firstName);
+    }
+
+	public void setIgnored(Author obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setLastName(Author obj, int index) {
+        String lastName = "lastName_" + index;
+        if (lastName.length() > 255) {
+            lastName = lastName.substring(0, 255);
+        }
+        obj.setLastName(lastName);
+    }
+
+	public void setLocked(Author obj, int index) {
+        Boolean locked = Boolean.TRUE;
+        obj.setLocked(locked);
+    }
+
+	public void setLsKind(Author obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsTransaction(Author obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(Author obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 255) {
+            lsType = lsType.substring(0, 255);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(Author obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedBy(Author obj, int index) {
+        String modifiedBy = "modifiedBy_" + index;
+        if (modifiedBy.length() > 255) {
+            modifiedBy = modifiedBy.substring(0, 255);
+        }
+        obj.setModifiedBy(modifiedBy);
+    }
+
+	public void setModifiedDate(Author obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setPassword(Author obj, int index) {
+        String password = "password_" + index;
+        if (password.length() > 255) {
+            password = password.substring(0, 255);
+        }
+        obj.setPassword(password);
+    }
+
+	public void setRecordedBy(Author obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(Author obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public void setUserName(Author obj, int index) {
+        String userName = "userName_" + index;
+        if (userName.length() > 255) {
+            userName = userName.substring(0, 255);
+        }
+        obj.setUserName(userName);
+    }
+
+	public Author getSpecificAuthor(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        Author obj = data.get(index);
+        Long id = obj.getId();
+        return Author.findAuthor(id);
+    }
+
+	public Author getRandomAuthor() {
+        init();
+        Author obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return Author.findAuthor(id);
+    }
+
+	public boolean modifyAuthor(Author obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = Author.findAuthorEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'Author' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<Author>();
+        for (int i = 0; i < 10; i++) {
+            Author obj = getNewTransientAuthor(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/AuthorDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/AuthorDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 5de9a671c..000000000
--- a/src/test/java/com/labsynch/labseer/domain/AuthorDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AuthorDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect AuthorDataOnDemand_Roo_Configurable {
-    
-    declare @type: AuthorDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/AuthorDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/AuthorDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 2679485b9..000000000
--- a/src/test/java/com/labsynch/labseer/domain/AuthorDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,239 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.AuthorDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.stereotype.Component;
-
-privileged aspect AuthorDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: AuthorDataOnDemand: @Component;
-    
-    private Random AuthorDataOnDemand.rnd = new SecureRandom();
-    
-    private List<Author> AuthorDataOnDemand.data;
-    
-    public Author AuthorDataOnDemand.getNewTransientAuthor(int index) {
-        Author obj = new Author();
-        setActivationDate(obj, index);
-        setActivationKey(obj, index);
-        setCodeName(obj, index);
-        setDeleted(obj, index);
-        setEmailAddress(obj, index);
-        setEnabled(obj, index);
-        setFirstName(obj, index);
-        setIgnored(obj, index);
-        setLastName(obj, index);
-        setLocked(obj, index);
-        setLsKind(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedBy(obj, index);
-        setModifiedDate(obj, index);
-        setPassword(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        setUserName(obj, index);
-        return obj;
-    }
-    
-    public void AuthorDataOnDemand.setActivationDate(Author obj, int index) {
-        Date activationDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setActivationDate(activationDate);
-    }
-    
-    public void AuthorDataOnDemand.setActivationKey(Author obj, int index) {
-        String activationKey = "activationKey_" + index;
-        obj.setActivationKey(activationKey);
-    }
-    
-    public void AuthorDataOnDemand.setCodeName(Author obj, int index) {
-        String codeName = "codeName_" + index;
-        if (codeName.length() > 255) {
-            codeName = new Random().nextInt(10) + codeName.substring(1, 255);
-        }
-        obj.setCodeName(codeName);
-    }
-    
-    public void AuthorDataOnDemand.setDeleted(Author obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void AuthorDataOnDemand.setEmailAddress(Author obj, int index) {
-        String emailAddress = "foo" + index + "@bar.com";
-        if (emailAddress.length() > 255) {
-            emailAddress = emailAddress.substring(0, 255);
-        }
-        obj.setEmailAddress(emailAddress);
-    }
-    
-    public void AuthorDataOnDemand.setEnabled(Author obj, int index) {
-        Boolean enabled = Boolean.TRUE;
-        obj.setEnabled(enabled);
-    }
-    
-    public void AuthorDataOnDemand.setFirstName(Author obj, int index) {
-        String firstName = "firstName_" + index;
-        if (firstName.length() > 255) {
-            firstName = firstName.substring(0, 255);
-        }
-        obj.setFirstName(firstName);
-    }
-    
-    public void AuthorDataOnDemand.setIgnored(Author obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void AuthorDataOnDemand.setLastName(Author obj, int index) {
-        String lastName = "lastName_" + index;
-        if (lastName.length() > 255) {
-            lastName = lastName.substring(0, 255);
-        }
-        obj.setLastName(lastName);
-    }
-    
-    public void AuthorDataOnDemand.setLocked(Author obj, int index) {
-        Boolean locked = Boolean.TRUE;
-        obj.setLocked(locked);
-    }
-    
-    public void AuthorDataOnDemand.setLsKind(Author obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void AuthorDataOnDemand.setLsTransaction(Author obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void AuthorDataOnDemand.setLsType(Author obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 255) {
-            lsType = lsType.substring(0, 255);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void AuthorDataOnDemand.setLsTypeAndKind(Author obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void AuthorDataOnDemand.setModifiedBy(Author obj, int index) {
-        String modifiedBy = "modifiedBy_" + index;
-        if (modifiedBy.length() > 255) {
-            modifiedBy = modifiedBy.substring(0, 255);
-        }
-        obj.setModifiedBy(modifiedBy);
-    }
-    
-    public void AuthorDataOnDemand.setModifiedDate(Author obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void AuthorDataOnDemand.setPassword(Author obj, int index) {
-        String password = "password_" + index;
-        if (password.length() > 255) {
-            password = password.substring(0, 255);
-        }
-        obj.setPassword(password);
-    }
-    
-    public void AuthorDataOnDemand.setRecordedBy(Author obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void AuthorDataOnDemand.setRecordedDate(Author obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public void AuthorDataOnDemand.setUserName(Author obj, int index) {
-        String userName = "userName_" + index;
-        if (userName.length() > 255) {
-            userName = userName.substring(0, 255);
-        }
-        obj.setUserName(userName);
-    }
-    
-    public Author AuthorDataOnDemand.getSpecificAuthor(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        Author obj = data.get(index);
-        Long id = obj.getId();
-        return Author.findAuthor(id);
-    }
-    
-    public Author AuthorDataOnDemand.getRandomAuthor() {
-        init();
-        Author obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return Author.findAuthor(id);
-    }
-    
-    public boolean AuthorDataOnDemand.modifyAuthor(Author obj) {
-        return false;
-    }
-    
-    public void AuthorDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = Author.findAuthorEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'Author' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<Author>();
-        for (int i = 0; i < 10; i++) {
-            Author obj = getNewTransientAuthor(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/AuthorIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/AuthorIntegrationTest.java
index 899471b15..5666b3eee 100755
--- a/src/test/java/com/labsynch/labseer/domain/AuthorIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/AuthorIntegrationTest.java
@@ -1,8 +1,23 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = Author.class)
 public class AuthorIntegrationTest {
 
@@ -10,4 +25,108 @@ public class AuthorIntegrationTest {
     public void testMarkerMethod() {
     }
     
+
+	@Autowired
+    AuthorDataOnDemand dod;
+
+	@Test
+    public void testCountAuthors() {
+        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", dod.getRandomAuthor());
+        long count = Author.countAuthors();
+        Assert.assertTrue("Counter for 'Author' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindAuthor() {
+        Author obj = dod.getRandomAuthor();
+        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'Author' failed to provide an identifier", id);
+        obj = Author.findAuthor(id);
+        Assert.assertNotNull("Find method for 'Author' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'Author' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllAuthors() {
+        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", dod.getRandomAuthor());
+        long count = Author.countAuthors();
+        Assert.assertTrue("Too expensive to perform a find all test for 'Author', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<Author> result = Author.findAllAuthors();
+        Assert.assertNotNull("Find all method for 'Author' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'Author' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindAuthorEntries() {
+        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", dod.getRandomAuthor());
+        long count = Author.countAuthors();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<Author> result = Author.findAuthorEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'Author' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'Author' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        Author obj = dod.getRandomAuthor();
+        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'Author' failed to provide an identifier", id);
+        obj = Author.findAuthor(id);
+        Assert.assertNotNull("Find method for 'Author' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyAuthor(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'Author' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        Author obj = dod.getRandomAuthor();
+        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'Author' failed to provide an identifier", id);
+        obj = Author.findAuthor(id);
+        boolean modified =  dod.modifyAuthor(obj);
+        Integer currentVersion = obj.getVersion();
+        Author merged = (Author)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'Author' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", dod.getRandomAuthor());
+        Author obj = dod.getNewTransientAuthor(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'Author' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'Author' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'Author' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        Author obj = dod.getRandomAuthor();
+        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'Author' failed to provide an identifier", id);
+        obj = Author.findAuthor(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'Author' with identifier '" + id + "'", Author.findAuthor(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/AuthorIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/AuthorIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 6788f56f6..000000000
--- a/src/test/java/com/labsynch/labseer/domain/AuthorIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AuthorIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect AuthorIntegrationTest_Roo_Configurable {
-    
-    declare @type: AuthorIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/AuthorIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/AuthorIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 5ad6f793e..000000000
--- a/src/test/java/com/labsynch/labseer/domain/AuthorIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.AuthorDataOnDemand;
-import com.labsynch.labseer.domain.AuthorIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect AuthorIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: AuthorIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: AuthorIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: AuthorIntegrationTest: @Transactional;
-    
-    @Autowired
-    AuthorDataOnDemand AuthorIntegrationTest.dod;
-    
-    @Test
-    public void AuthorIntegrationTest.testCountAuthors() {
-        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", dod.getRandomAuthor());
-        long count = Author.countAuthors();
-        Assert.assertTrue("Counter for 'Author' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void AuthorIntegrationTest.testFindAuthor() {
-        Author obj = dod.getRandomAuthor();
-        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'Author' failed to provide an identifier", id);
-        obj = Author.findAuthor(id);
-        Assert.assertNotNull("Find method for 'Author' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'Author' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void AuthorIntegrationTest.testFindAllAuthors() {
-        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", dod.getRandomAuthor());
-        long count = Author.countAuthors();
-        Assert.assertTrue("Too expensive to perform a find all test for 'Author', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<Author> result = Author.findAllAuthors();
-        Assert.assertNotNull("Find all method for 'Author' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'Author' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void AuthorIntegrationTest.testFindAuthorEntries() {
-        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", dod.getRandomAuthor());
-        long count = Author.countAuthors();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<Author> result = Author.findAuthorEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'Author' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'Author' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void AuthorIntegrationTest.testFlush() {
-        Author obj = dod.getRandomAuthor();
-        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'Author' failed to provide an identifier", id);
-        obj = Author.findAuthor(id);
-        Assert.assertNotNull("Find method for 'Author' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyAuthor(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'Author' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void AuthorIntegrationTest.testMergeUpdate() {
-        Author obj = dod.getRandomAuthor();
-        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'Author' failed to provide an identifier", id);
-        obj = Author.findAuthor(id);
-        boolean modified =  dod.modifyAuthor(obj);
-        Integer currentVersion = obj.getVersion();
-        Author merged = (Author)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'Author' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void AuthorIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", dod.getRandomAuthor());
-        Author obj = dod.getNewTransientAuthor(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'Author' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'Author' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'Author' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void AuthorIntegrationTest.testRemove() {
-        Author obj = dod.getRandomAuthor();
-        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'Author' failed to provide an identifier", id);
-        obj = Author.findAuthor(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'Author' with identifier '" + id + "'", Author.findAuthor(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/AuthorTest.java b/src/test/java/com/labsynch/labseer/domain/AuthorTest.java
index a86c29e1c..7de32dd8b 100755
--- a/src/test/java/com/labsynch/labseer/domain/AuthorTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/AuthorTest.java
@@ -1,10 +1,25 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
+@Configurable
 @RooIntegrationTest(entity = Author.class)
 public class AuthorTest {
 	
@@ -21,4 +36,108 @@ public void CreateAuthor_Test001(){
 		auth.persist();
 		logger.info(auth.toJson());
 	}
+
+	@Autowired
+    AuthorDataOnDemand dod;
+
+	@Test
+    public void testCountAuthors() {
+        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", dod.getRandomAuthor());
+        long count = Author.countAuthors();
+        Assert.assertTrue("Counter for 'Author' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindAuthor() {
+        Author obj = dod.getRandomAuthor();
+        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'Author' failed to provide an identifier", id);
+        obj = Author.findAuthor(id);
+        Assert.assertNotNull("Find method for 'Author' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'Author' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllAuthors() {
+        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", dod.getRandomAuthor());
+        long count = Author.countAuthors();
+        Assert.assertTrue("Too expensive to perform a find all test for 'Author', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<Author> result = Author.findAllAuthors();
+        Assert.assertNotNull("Find all method for 'Author' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'Author' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindAuthorEntries() {
+        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", dod.getRandomAuthor());
+        long count = Author.countAuthors();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<Author> result = Author.findAuthorEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'Author' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'Author' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        Author obj = dod.getRandomAuthor();
+        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'Author' failed to provide an identifier", id);
+        obj = Author.findAuthor(id);
+        Assert.assertNotNull("Find method for 'Author' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyAuthor(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'Author' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        Author obj = dod.getRandomAuthor();
+        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'Author' failed to provide an identifier", id);
+        obj = Author.findAuthor(id);
+        boolean modified =  dod.modifyAuthor(obj);
+        Integer currentVersion = obj.getVersion();
+        Author merged = (Author)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'Author' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", dod.getRandomAuthor());
+        Author obj = dod.getNewTransientAuthor(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'Author' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'Author' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'Author' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        Author obj = dod.getRandomAuthor();
+        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'Author' failed to provide an identifier", id);
+        obj = Author.findAuthor(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'Author' with identifier '" + id + "'", Author.findAuthor(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/AuthorTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/AuthorTest_Roo_Configurable.aj
deleted file mode 100755
index cc7174aa4..000000000
--- a/src/test/java/com/labsynch/labseer/domain/AuthorTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AuthorTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect AuthorTest_Roo_Configurable {
-    
-    declare @type: AuthorTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/AuthorTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/AuthorTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 6b3c5bf9c..000000000
--- a/src/test/java/com/labsynch/labseer/domain/AuthorTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.AuthorDataOnDemand;
-import com.labsynch.labseer.domain.AuthorTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect AuthorTest_Roo_IntegrationTest {
-    
-    declare @type: AuthorTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: AuthorTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: AuthorTest: @Transactional;
-    
-    @Autowired
-    AuthorDataOnDemand AuthorTest.dod;
-    
-    @Test
-    public void AuthorTest.testCountAuthors() {
-        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", dod.getRandomAuthor());
-        long count = Author.countAuthors();
-        Assert.assertTrue("Counter for 'Author' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void AuthorTest.testFindAuthor() {
-        Author obj = dod.getRandomAuthor();
-        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'Author' failed to provide an identifier", id);
-        obj = Author.findAuthor(id);
-        Assert.assertNotNull("Find method for 'Author' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'Author' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void AuthorTest.testFindAllAuthors() {
-        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", dod.getRandomAuthor());
-        long count = Author.countAuthors();
-        Assert.assertTrue("Too expensive to perform a find all test for 'Author', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<Author> result = Author.findAllAuthors();
-        Assert.assertNotNull("Find all method for 'Author' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'Author' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void AuthorTest.testFindAuthorEntries() {
-        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", dod.getRandomAuthor());
-        long count = Author.countAuthors();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<Author> result = Author.findAuthorEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'Author' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'Author' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void AuthorTest.testFlush() {
-        Author obj = dod.getRandomAuthor();
-        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'Author' failed to provide an identifier", id);
-        obj = Author.findAuthor(id);
-        Assert.assertNotNull("Find method for 'Author' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyAuthor(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'Author' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void AuthorTest.testMergeUpdate() {
-        Author obj = dod.getRandomAuthor();
-        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'Author' failed to provide an identifier", id);
-        obj = Author.findAuthor(id);
-        boolean modified =  dod.modifyAuthor(obj);
-        Integer currentVersion = obj.getVersion();
-        Author merged = (Author)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'Author' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void AuthorTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", dod.getRandomAuthor());
-        Author obj = dod.getNewTransientAuthor(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'Author' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'Author' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'Author' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void AuthorTest.testRemove() {
-        Author obj = dod.getRandomAuthor();
-        Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'Author' failed to provide an identifier", id);
-        obj = Author.findAuthor(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'Author' with identifier '" + id + "'", Author.findAuthor(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ContainerDataOnDemand.java
index 1c8c21d57..e5565a4a1 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerDataOnDemand.java
@@ -1,7 +1,185 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Configurable
+@Component
 @RooDataOnDemand(entity = Container.class)
 public class ContainerDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<Container> data;
+
+	public Container getNewTransientContainer(int index) {
+        Container obj = new Container();
+        setCodeName(obj, index);
+        setColumnIndex(obj, index);
+        setDeleted(obj, index);
+        setIgnored(obj, index);
+        setLocationId(obj, index);
+        setLsKind(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedBy(obj, index);
+        setModifiedDate(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        setRowIndex(obj, index);
+        return obj;
+    }
+
+	public void setCodeName(Container obj, int index) {
+        String codeName = "codeName_" + index;
+        if (codeName.length() > 255) {
+            codeName = new Random().nextInt(10) + codeName.substring(1, 255);
+        }
+        obj.setCodeName(codeName);
+    }
+
+	public void setColumnIndex(Container obj, int index) {
+        Integer columnIndex = new Integer(index);
+        obj.setColumnIndex(columnIndex);
+    }
+
+	public void setDeleted(Container obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setIgnored(Container obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setLocationId(Container obj, int index) {
+        Long locationId = new Integer(index).longValue();
+        obj.setLocationId(locationId);
+    }
+
+	public void setLsKind(Container obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsTransaction(Container obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(Container obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 255) {
+            lsType = lsType.substring(0, 255);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(Container obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedBy(Container obj, int index) {
+        String modifiedBy = "modifiedBy_" + index;
+        if (modifiedBy.length() > 255) {
+            modifiedBy = modifiedBy.substring(0, 255);
+        }
+        obj.setModifiedBy(modifiedBy);
+    }
+
+	public void setModifiedDate(Container obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setRecordedBy(Container obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(Container obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public void setRowIndex(Container obj, int index) {
+        Integer rowIndex = new Integer(index);
+        obj.setRowIndex(rowIndex);
+    }
+
+	public Container getSpecificContainer(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        Container obj = data.get(index);
+        Long id = obj.getId();
+        return Container.findContainer(id);
+    }
+
+	public Container getRandomContainer() {
+        init();
+        Container obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return Container.findContainer(id);
+    }
+
+	public boolean modifyContainer(Container obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = Container.findContainerEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'Container' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<Container>();
+        for (int i = 0; i < 10; i++) {
+            Container obj = getNewTransientContainer(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ContainerDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 649e56ef4..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ContainerDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ContainerDataOnDemand_Roo_Configurable {
-    
-    declare @type: ContainerDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ContainerDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 1ddf043f4..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ContainerDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,188 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ContainerDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.stereotype.Component;
-
-privileged aspect ContainerDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ContainerDataOnDemand: @Component;
-    
-    private Random ContainerDataOnDemand.rnd = new SecureRandom();
-    
-    private List<Container> ContainerDataOnDemand.data;
-    
-    public Container ContainerDataOnDemand.getNewTransientContainer(int index) {
-        Container obj = new Container();
-        setCodeName(obj, index);
-        setColumnIndex(obj, index);
-        setDeleted(obj, index);
-        setIgnored(obj, index);
-        setLocationId(obj, index);
-        setLsKind(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedBy(obj, index);
-        setModifiedDate(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        setRowIndex(obj, index);
-        return obj;
-    }
-    
-    public void ContainerDataOnDemand.setCodeName(Container obj, int index) {
-        String codeName = "codeName_" + index;
-        if (codeName.length() > 255) {
-            codeName = new Random().nextInt(10) + codeName.substring(1, 255);
-        }
-        obj.setCodeName(codeName);
-    }
-    
-    public void ContainerDataOnDemand.setColumnIndex(Container obj, int index) {
-        Integer columnIndex = new Integer(index);
-        obj.setColumnIndex(columnIndex);
-    }
-    
-    public void ContainerDataOnDemand.setDeleted(Container obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void ContainerDataOnDemand.setIgnored(Container obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void ContainerDataOnDemand.setLocationId(Container obj, int index) {
-        Long locationId = new Integer(index).longValue();
-        obj.setLocationId(locationId);
-    }
-    
-    public void ContainerDataOnDemand.setLsKind(Container obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void ContainerDataOnDemand.setLsTransaction(Container obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void ContainerDataOnDemand.setLsType(Container obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 255) {
-            lsType = lsType.substring(0, 255);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void ContainerDataOnDemand.setLsTypeAndKind(Container obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void ContainerDataOnDemand.setModifiedBy(Container obj, int index) {
-        String modifiedBy = "modifiedBy_" + index;
-        if (modifiedBy.length() > 255) {
-            modifiedBy = modifiedBy.substring(0, 255);
-        }
-        obj.setModifiedBy(modifiedBy);
-    }
-    
-    public void ContainerDataOnDemand.setModifiedDate(Container obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void ContainerDataOnDemand.setRecordedBy(Container obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void ContainerDataOnDemand.setRecordedDate(Container obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public void ContainerDataOnDemand.setRowIndex(Container obj, int index) {
-        Integer rowIndex = new Integer(index);
-        obj.setRowIndex(rowIndex);
-    }
-    
-    public Container ContainerDataOnDemand.getSpecificContainer(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        Container obj = data.get(index);
-        Long id = obj.getId();
-        return Container.findContainer(id);
-    }
-    
-    public Container ContainerDataOnDemand.getRandomContainer() {
-        init();
-        Container obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return Container.findContainer(id);
-    }
-    
-    public boolean ContainerDataOnDemand.modifyContainer(Container obj) {
-        return false;
-    }
-    
-    public void ContainerDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = Container.findContainerEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'Container' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<Container>();
-        for (int i = 0; i < 10; i++) {
-            Container obj = getNewTransientContainer(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ContainerIntegrationTest.java
index c04dd8689..0128e1386 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
+@Configurable
 @RooIntegrationTest(entity = Container.class)
 public class ContainerIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ContainerDataOnDemand dod;
+
+	@Test
+    public void testCountContainers() {
+        Assert.assertNotNull("Data on demand for 'Container' failed to initialize correctly", dod.getRandomContainer());
+        long count = Container.countContainers();
+        Assert.assertTrue("Counter for 'Container' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindContainer() {
+        Container obj = dod.getRandomContainer();
+        Assert.assertNotNull("Data on demand for 'Container' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'Container' failed to provide an identifier", id);
+        obj = Container.findContainer(id);
+        Assert.assertNotNull("Find method for 'Container' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'Container' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllContainers() {
+        Assert.assertNotNull("Data on demand for 'Container' failed to initialize correctly", dod.getRandomContainer());
+        long count = Container.countContainers();
+        Assert.assertTrue("Too expensive to perform a find all test for 'Container', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<Container> result = Container.findAllContainers();
+        Assert.assertNotNull("Find all method for 'Container' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'Container' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindContainerEntries() {
+        Assert.assertNotNull("Data on demand for 'Container' failed to initialize correctly", dod.getRandomContainer());
+        long count = Container.countContainers();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<Container> result = Container.findContainerEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'Container' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'Container' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        Container obj = dod.getRandomContainer();
+        Assert.assertNotNull("Data on demand for 'Container' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'Container' failed to provide an identifier", id);
+        obj = Container.findContainer(id);
+        Assert.assertNotNull("Find method for 'Container' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyContainer(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'Container' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        Container obj = dod.getRandomContainer();
+        Assert.assertNotNull("Data on demand for 'Container' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'Container' failed to provide an identifier", id);
+        obj = Container.findContainer(id);
+        boolean modified =  dod.modifyContainer(obj);
+        Integer currentVersion = obj.getVersion();
+        Container merged = (Container)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'Container' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'Container' failed to initialize correctly", dod.getRandomContainer());
+        Container obj = dod.getNewTransientContainer(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'Container' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'Container' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'Container' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        Container obj = dod.getRandomContainer();
+        Assert.assertNotNull("Data on demand for 'Container' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'Container' failed to provide an identifier", id);
+        obj = Container.findContainer(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'Container' with identifier '" + id + "'", Container.findContainer(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ContainerIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 8bb82cd9b..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ContainerIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ContainerIntegrationTest_Roo_Configurable {
-    
-    declare @type: ContainerIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ContainerIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index c7a52526f..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ContainerIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ContainerDataOnDemand;
-import com.labsynch.labseer.domain.ContainerIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ContainerIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ContainerIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ContainerIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ContainerIntegrationTest: @Transactional;
-    
-    @Autowired
-    ContainerDataOnDemand ContainerIntegrationTest.dod;
-    
-    @Test
-    public void ContainerIntegrationTest.testCountContainers() {
-        Assert.assertNotNull("Data on demand for 'Container' failed to initialize correctly", dod.getRandomContainer());
-        long count = Container.countContainers();
-        Assert.assertTrue("Counter for 'Container' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ContainerIntegrationTest.testFindContainer() {
-        Container obj = dod.getRandomContainer();
-        Assert.assertNotNull("Data on demand for 'Container' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'Container' failed to provide an identifier", id);
-        obj = Container.findContainer(id);
-        Assert.assertNotNull("Find method for 'Container' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'Container' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ContainerIntegrationTest.testFindAllContainers() {
-        Assert.assertNotNull("Data on demand for 'Container' failed to initialize correctly", dod.getRandomContainer());
-        long count = Container.countContainers();
-        Assert.assertTrue("Too expensive to perform a find all test for 'Container', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<Container> result = Container.findAllContainers();
-        Assert.assertNotNull("Find all method for 'Container' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'Container' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ContainerIntegrationTest.testFindContainerEntries() {
-        Assert.assertNotNull("Data on demand for 'Container' failed to initialize correctly", dod.getRandomContainer());
-        long count = Container.countContainers();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<Container> result = Container.findContainerEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'Container' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'Container' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ContainerIntegrationTest.testFlush() {
-        Container obj = dod.getRandomContainer();
-        Assert.assertNotNull("Data on demand for 'Container' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'Container' failed to provide an identifier", id);
-        obj = Container.findContainer(id);
-        Assert.assertNotNull("Find method for 'Container' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyContainer(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'Container' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ContainerIntegrationTest.testMergeUpdate() {
-        Container obj = dod.getRandomContainer();
-        Assert.assertNotNull("Data on demand for 'Container' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'Container' failed to provide an identifier", id);
-        obj = Container.findContainer(id);
-        boolean modified =  dod.modifyContainer(obj);
-        Integer currentVersion = obj.getVersion();
-        Container merged = (Container)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'Container' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ContainerIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'Container' failed to initialize correctly", dod.getRandomContainer());
-        Container obj = dod.getNewTransientContainer(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'Container' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'Container' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'Container' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ContainerIntegrationTest.testRemove() {
-        Container obj = dod.getRandomContainer();
-        Assert.assertNotNull("Data on demand for 'Container' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'Container' failed to provide an identifier", id);
-        obj = Container.findContainer(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'Container' with identifier '" + id + "'", Container.findContainer(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ContainerKindDataOnDemand.java
index 9b235fb8b..0b9e53642 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerKindDataOnDemand.java
@@ -1,7 +1,108 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Component
+@Configurable
 @RooDataOnDemand(entity = ContainerKind.class)
 public class ContainerKindDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<ContainerKind> data;
+
+	@Autowired
+    ContainerTypeDataOnDemand containerTypeDataOnDemand;
+
+	public ContainerKind getNewTransientContainerKind(int index) {
+        ContainerKind obj = new ContainerKind();
+        setKindName(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        return obj;
+    }
+
+	public void setKindName(ContainerKind obj, int index) {
+        String kindName = "kindName_" + index;
+        if (kindName.length() > 255) {
+            kindName = kindName.substring(0, 255);
+        }
+        obj.setKindName(kindName);
+    }
+
+	public void setLsType(ContainerKind obj, int index) {
+        ContainerType lsType = containerTypeDataOnDemand.getRandomContainerType();
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(ContainerKind obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = new Random().nextInt(10) + lsTypeAndKind.substring(1, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public ContainerKind getSpecificContainerKind(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        ContainerKind obj = data.get(index);
+        Long id = obj.getId();
+        return ContainerKind.findContainerKind(id);
+    }
+
+	public ContainerKind getRandomContainerKind() {
+        init();
+        ContainerKind obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return ContainerKind.findContainerKind(id);
+    }
+
+	public boolean modifyContainerKind(ContainerKind obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = ContainerKind.findContainerKindEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'ContainerKind' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<ContainerKind>();
+        for (int i = 0; i < 10; i++) {
+            ContainerKind obj = getNewTransientContainerKind(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerKindDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ContainerKindDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index d6a2a0f77..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ContainerKindDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerKindDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ContainerKindDataOnDemand_Roo_Configurable {
-    
-    declare @type: ContainerKindDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerKindDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ContainerKindDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 62d60c5c4..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ContainerKindDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,113 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerKind;
-import com.labsynch.labseer.domain.ContainerKindDataOnDemand;
-import com.labsynch.labseer.domain.ContainerType;
-import com.labsynch.labseer.domain.ContainerTypeDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect ContainerKindDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ContainerKindDataOnDemand: @Component;
-    
-    private Random ContainerKindDataOnDemand.rnd = new SecureRandom();
-    
-    private List<ContainerKind> ContainerKindDataOnDemand.data;
-    
-    @Autowired
-    ContainerTypeDataOnDemand ContainerKindDataOnDemand.containerTypeDataOnDemand;
-    
-    public ContainerKind ContainerKindDataOnDemand.getNewTransientContainerKind(int index) {
-        ContainerKind obj = new ContainerKind();
-        setKindName(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        return obj;
-    }
-    
-    public void ContainerKindDataOnDemand.setKindName(ContainerKind obj, int index) {
-        String kindName = "kindName_" + index;
-        if (kindName.length() > 255) {
-            kindName = kindName.substring(0, 255);
-        }
-        obj.setKindName(kindName);
-    }
-    
-    public void ContainerKindDataOnDemand.setLsType(ContainerKind obj, int index) {
-        ContainerType lsType = containerTypeDataOnDemand.getRandomContainerType();
-        obj.setLsType(lsType);
-    }
-    
-    public void ContainerKindDataOnDemand.setLsTypeAndKind(ContainerKind obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = new Random().nextInt(10) + lsTypeAndKind.substring(1, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public ContainerKind ContainerKindDataOnDemand.getSpecificContainerKind(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        ContainerKind obj = data.get(index);
-        Long id = obj.getId();
-        return ContainerKind.findContainerKind(id);
-    }
-    
-    public ContainerKind ContainerKindDataOnDemand.getRandomContainerKind() {
-        init();
-        ContainerKind obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return ContainerKind.findContainerKind(id);
-    }
-    
-    public boolean ContainerKindDataOnDemand.modifyContainerKind(ContainerKind obj) {
-        return false;
-    }
-    
-    public void ContainerKindDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = ContainerKind.findContainerKindEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ContainerKind' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<ContainerKind>();
-        for (int i = 0; i < 10; i++) {
-            ContainerKind obj = getNewTransientContainerKind(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ContainerKindIntegrationTest.java
index 326ca10f4..5d267a6b2 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerKindIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
+@Configurable
 @RooIntegrationTest(entity = ContainerKind.class)
 public class ContainerKindIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ContainerKindDataOnDemand dod;
+
+	@Test
+    public void testCountContainerKinds() {
+        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to initialize correctly", dod.getRandomContainerKind());
+        long count = ContainerKind.countContainerKinds();
+        Assert.assertTrue("Counter for 'ContainerKind' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindContainerKind() {
+        ContainerKind obj = dod.getRandomContainerKind();
+        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to provide an identifier", id);
+        obj = ContainerKind.findContainerKind(id);
+        Assert.assertNotNull("Find method for 'ContainerKind' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'ContainerKind' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllContainerKinds() {
+        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to initialize correctly", dod.getRandomContainerKind());
+        long count = ContainerKind.countContainerKinds();
+        Assert.assertTrue("Too expensive to perform a find all test for 'ContainerKind', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<ContainerKind> result = ContainerKind.findAllContainerKinds();
+        Assert.assertNotNull("Find all method for 'ContainerKind' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'ContainerKind' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindContainerKindEntries() {
+        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to initialize correctly", dod.getRandomContainerKind());
+        long count = ContainerKind.countContainerKinds();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<ContainerKind> result = ContainerKind.findContainerKindEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'ContainerKind' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'ContainerKind' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        ContainerKind obj = dod.getRandomContainerKind();
+        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to provide an identifier", id);
+        obj = ContainerKind.findContainerKind(id);
+        Assert.assertNotNull("Find method for 'ContainerKind' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyContainerKind(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'ContainerKind' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        ContainerKind obj = dod.getRandomContainerKind();
+        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to provide an identifier", id);
+        obj = ContainerKind.findContainerKind(id);
+        boolean modified =  dod.modifyContainerKind(obj);
+        Integer currentVersion = obj.getVersion();
+        ContainerKind merged = obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'ContainerKind' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to initialize correctly", dod.getRandomContainerKind());
+        ContainerKind obj = dod.getNewTransientContainerKind(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'ContainerKind' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'ContainerKind' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        ContainerKind obj = dod.getRandomContainerKind();
+        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to provide an identifier", id);
+        obj = ContainerKind.findContainerKind(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'ContainerKind' with identifier '" + id + "'", ContainerKind.findContainerKind(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerKindIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ContainerKindIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 8d7d5a291..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ContainerKindIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerKindIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ContainerKindIntegrationTest_Roo_Configurable {
-    
-    declare @type: ContainerKindIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerKindIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ContainerKindIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 9905bb8e0..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ContainerKindIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerKind;
-import com.labsynch.labseer.domain.ContainerKindDataOnDemand;
-import com.labsynch.labseer.domain.ContainerKindIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ContainerKindIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ContainerKindIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ContainerKindIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ContainerKindIntegrationTest: @Transactional;
-    
-    @Autowired
-    ContainerKindDataOnDemand ContainerKindIntegrationTest.dod;
-    
-    @Test
-    public void ContainerKindIntegrationTest.testCountContainerKinds() {
-        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to initialize correctly", dod.getRandomContainerKind());
-        long count = ContainerKind.countContainerKinds();
-        Assert.assertTrue("Counter for 'ContainerKind' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ContainerKindIntegrationTest.testFindContainerKind() {
-        ContainerKind obj = dod.getRandomContainerKind();
-        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to provide an identifier", id);
-        obj = ContainerKind.findContainerKind(id);
-        Assert.assertNotNull("Find method for 'ContainerKind' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ContainerKind' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ContainerKindIntegrationTest.testFindAllContainerKinds() {
-        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to initialize correctly", dod.getRandomContainerKind());
-        long count = ContainerKind.countContainerKinds();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ContainerKind', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<ContainerKind> result = ContainerKind.findAllContainerKinds();
-        Assert.assertNotNull("Find all method for 'ContainerKind' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ContainerKind' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ContainerKindIntegrationTest.testFindContainerKindEntries() {
-        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to initialize correctly", dod.getRandomContainerKind());
-        long count = ContainerKind.countContainerKinds();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<ContainerKind> result = ContainerKind.findContainerKindEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'ContainerKind' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ContainerKind' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ContainerKindIntegrationTest.testFlush() {
-        ContainerKind obj = dod.getRandomContainerKind();
-        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to provide an identifier", id);
-        obj = ContainerKind.findContainerKind(id);
-        Assert.assertNotNull("Find method for 'ContainerKind' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyContainerKind(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'ContainerKind' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ContainerKindIntegrationTest.testMergeUpdate() {
-        ContainerKind obj = dod.getRandomContainerKind();
-        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to provide an identifier", id);
-        obj = ContainerKind.findContainerKind(id);
-        boolean modified =  dod.modifyContainerKind(obj);
-        Integer currentVersion = obj.getVersion();
-        ContainerKind merged = obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ContainerKind' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ContainerKindIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to initialize correctly", dod.getRandomContainerKind());
-        ContainerKind obj = dod.getNewTransientContainerKind(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'ContainerKind' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'ContainerKind' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ContainerKindIntegrationTest.testRemove() {
-        ContainerKind obj = dod.getRandomContainerKind();
-        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to provide an identifier", id);
-        obj = ContainerKind.findContainerKind(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'ContainerKind' with identifier '" + id + "'", ContainerKind.findContainerKind(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerLabelDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ContainerLabelDataOnDemand.java
index 5a079d913..34c8f2add 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerLabelDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerLabelDataOnDemand.java
@@ -1,7 +1,189 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Configurable
+@Component
 @RooDataOnDemand(entity = ContainerLabel.class)
 public class ContainerLabelDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<ContainerLabel> data;
+
+	@Autowired
+    ContainerDataOnDemand containerDataOnDemand;
+
+	public ContainerLabel getNewTransientContainerLabel(int index) {
+        ContainerLabel obj = new ContainerLabel();
+        setContainer(obj, index);
+        setDeleted(obj, index);
+        setIgnored(obj, index);
+        setImageFile(obj, index);
+        setLabelText(obj, index);
+        setLsKind(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedDate(obj, index);
+        setPhysicallyLabled(obj, index);
+        setPreferred(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        return obj;
+    }
+
+	public void setContainer(ContainerLabel obj, int index) {
+        Container container = containerDataOnDemand.getRandomContainer();
+        obj.setContainer(container);
+    }
+
+	public void setDeleted(ContainerLabel obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setIgnored(ContainerLabel obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setImageFile(ContainerLabel obj, int index) {
+        String imageFile = "imageFile_" + index;
+        if (imageFile.length() > 255) {
+            imageFile = imageFile.substring(0, 255);
+        }
+        obj.setImageFile(imageFile);
+    }
+
+	public void setLabelText(ContainerLabel obj, int index) {
+        String labelText = "labelText_" + index;
+        if (labelText.length() > 255) {
+            labelText = labelText.substring(0, 255);
+        }
+        obj.setLabelText(labelText);
+    }
+
+	public void setLsKind(ContainerLabel obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsTransaction(ContainerLabel obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(ContainerLabel obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 64) {
+            lsType = lsType.substring(0, 64);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(ContainerLabel obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedDate(ContainerLabel obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setPhysicallyLabled(ContainerLabel obj, int index) {
+        Boolean physicallyLabled = true;
+        obj.setPhysicallyLabled(physicallyLabled);
+    }
+
+	public void setPreferred(ContainerLabel obj, int index) {
+        Boolean preferred = true;
+        obj.setPreferred(preferred);
+    }
+
+	public void setRecordedBy(ContainerLabel obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(ContainerLabel obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public ContainerLabel getSpecificContainerLabel(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        ContainerLabel obj = data.get(index);
+        Long id = obj.getId();
+        return ContainerLabel.findContainerLabel(id);
+    }
+
+	public ContainerLabel getRandomContainerLabel() {
+        init();
+        ContainerLabel obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return ContainerLabel.findContainerLabel(id);
+    }
+
+	public boolean modifyContainerLabel(ContainerLabel obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = ContainerLabel.findContainerLabelEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'ContainerLabel' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<ContainerLabel>();
+        for (int i = 0; i < 10; i++) {
+            ContainerLabel obj = getNewTransientContainerLabel(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerLabelDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ContainerLabelDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index ce1696aff..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ContainerLabelDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerLabelDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ContainerLabelDataOnDemand_Roo_Configurable {
-    
-    declare @type: ContainerLabelDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerLabelDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ContainerLabelDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 93058de23..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ContainerLabelDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,194 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ContainerDataOnDemand;
-import com.labsynch.labseer.domain.ContainerLabel;
-import com.labsynch.labseer.domain.ContainerLabelDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect ContainerLabelDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ContainerLabelDataOnDemand: @Component;
-    
-    private Random ContainerLabelDataOnDemand.rnd = new SecureRandom();
-    
-    private List<ContainerLabel> ContainerLabelDataOnDemand.data;
-    
-    @Autowired
-    ContainerDataOnDemand ContainerLabelDataOnDemand.containerDataOnDemand;
-    
-    public ContainerLabel ContainerLabelDataOnDemand.getNewTransientContainerLabel(int index) {
-        ContainerLabel obj = new ContainerLabel();
-        setContainer(obj, index);
-        setDeleted(obj, index);
-        setIgnored(obj, index);
-        setImageFile(obj, index);
-        setLabelText(obj, index);
-        setLsKind(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedDate(obj, index);
-        setPhysicallyLabled(obj, index);
-        setPreferred(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        return obj;
-    }
-    
-    public void ContainerLabelDataOnDemand.setContainer(ContainerLabel obj, int index) {
-        Container container = containerDataOnDemand.getRandomContainer();
-        obj.setContainer(container);
-    }
-    
-    public void ContainerLabelDataOnDemand.setDeleted(ContainerLabel obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void ContainerLabelDataOnDemand.setIgnored(ContainerLabel obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void ContainerLabelDataOnDemand.setImageFile(ContainerLabel obj, int index) {
-        String imageFile = "imageFile_" + index;
-        if (imageFile.length() > 255) {
-            imageFile = imageFile.substring(0, 255);
-        }
-        obj.setImageFile(imageFile);
-    }
-    
-    public void ContainerLabelDataOnDemand.setLabelText(ContainerLabel obj, int index) {
-        String labelText = "labelText_" + index;
-        if (labelText.length() > 255) {
-            labelText = labelText.substring(0, 255);
-        }
-        obj.setLabelText(labelText);
-    }
-    
-    public void ContainerLabelDataOnDemand.setLsKind(ContainerLabel obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void ContainerLabelDataOnDemand.setLsTransaction(ContainerLabel obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void ContainerLabelDataOnDemand.setLsType(ContainerLabel obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 64) {
-            lsType = lsType.substring(0, 64);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void ContainerLabelDataOnDemand.setLsTypeAndKind(ContainerLabel obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void ContainerLabelDataOnDemand.setModifiedDate(ContainerLabel obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void ContainerLabelDataOnDemand.setPhysicallyLabled(ContainerLabel obj, int index) {
-        Boolean physicallyLabled = true;
-        obj.setPhysicallyLabled(physicallyLabled);
-    }
-    
-    public void ContainerLabelDataOnDemand.setPreferred(ContainerLabel obj, int index) {
-        Boolean preferred = true;
-        obj.setPreferred(preferred);
-    }
-    
-    public void ContainerLabelDataOnDemand.setRecordedBy(ContainerLabel obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void ContainerLabelDataOnDemand.setRecordedDate(ContainerLabel obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public ContainerLabel ContainerLabelDataOnDemand.getSpecificContainerLabel(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        ContainerLabel obj = data.get(index);
-        Long id = obj.getId();
-        return ContainerLabel.findContainerLabel(id);
-    }
-    
-    public ContainerLabel ContainerLabelDataOnDemand.getRandomContainerLabel() {
-        init();
-        ContainerLabel obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return ContainerLabel.findContainerLabel(id);
-    }
-    
-    public boolean ContainerLabelDataOnDemand.modifyContainerLabel(ContainerLabel obj) {
-        return false;
-    }
-    
-    public void ContainerLabelDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = ContainerLabel.findContainerLabelEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ContainerLabel' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<ContainerLabel>();
-        for (int i = 0; i < 10; i++) {
-            ContainerLabel obj = getNewTransientContainerLabel(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerLabelIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ContainerLabelIntegrationTest.java
index 4c59f4076..fb46dd751 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerLabelIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerLabelIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
+@Configurable
 @RooIntegrationTest(entity = ContainerLabel.class)
 public class ContainerLabelIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ContainerLabelDataOnDemand dod;
+
+	@Test
+    public void testCountContainerLabels() {
+        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to initialize correctly", dod.getRandomContainerLabel());
+        long count = ContainerLabel.countContainerLabels();
+        Assert.assertTrue("Counter for 'ContainerLabel' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindContainerLabel() {
+        ContainerLabel obj = dod.getRandomContainerLabel();
+        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to provide an identifier", id);
+        obj = ContainerLabel.findContainerLabel(id);
+        Assert.assertNotNull("Find method for 'ContainerLabel' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'ContainerLabel' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllContainerLabels() {
+        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to initialize correctly", dod.getRandomContainerLabel());
+        long count = ContainerLabel.countContainerLabels();
+        Assert.assertTrue("Too expensive to perform a find all test for 'ContainerLabel', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<ContainerLabel> result = ContainerLabel.findAllContainerLabels();
+        Assert.assertNotNull("Find all method for 'ContainerLabel' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'ContainerLabel' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindContainerLabelEntries() {
+        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to initialize correctly", dod.getRandomContainerLabel());
+        long count = ContainerLabel.countContainerLabels();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<ContainerLabel> result = ContainerLabel.findContainerLabelEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'ContainerLabel' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'ContainerLabel' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        ContainerLabel obj = dod.getRandomContainerLabel();
+        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to provide an identifier", id);
+        obj = ContainerLabel.findContainerLabel(id);
+        Assert.assertNotNull("Find method for 'ContainerLabel' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyContainerLabel(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'ContainerLabel' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        ContainerLabel obj = dod.getRandomContainerLabel();
+        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to provide an identifier", id);
+        obj = ContainerLabel.findContainerLabel(id);
+        boolean modified =  dod.modifyContainerLabel(obj);
+        Integer currentVersion = obj.getVersion();
+        ContainerLabel merged = (ContainerLabel)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'ContainerLabel' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to initialize correctly", dod.getRandomContainerLabel());
+        ContainerLabel obj = dod.getNewTransientContainerLabel(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'ContainerLabel' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'ContainerLabel' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        ContainerLabel obj = dod.getRandomContainerLabel();
+        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to provide an identifier", id);
+        obj = ContainerLabel.findContainerLabel(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'ContainerLabel' with identifier '" + id + "'", ContainerLabel.findContainerLabel(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerLabelIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ContainerLabelIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index efe6f4c65..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ContainerLabelIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerLabelIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ContainerLabelIntegrationTest_Roo_Configurable {
-    
-    declare @type: ContainerLabelIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerLabelIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ContainerLabelIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index fcddae29f..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ContainerLabelIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerLabel;
-import com.labsynch.labseer.domain.ContainerLabelDataOnDemand;
-import com.labsynch.labseer.domain.ContainerLabelIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ContainerLabelIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ContainerLabelIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ContainerLabelIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ContainerLabelIntegrationTest: @Transactional;
-    
-    @Autowired
-    ContainerLabelDataOnDemand ContainerLabelIntegrationTest.dod;
-    
-    @Test
-    public void ContainerLabelIntegrationTest.testCountContainerLabels() {
-        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to initialize correctly", dod.getRandomContainerLabel());
-        long count = ContainerLabel.countContainerLabels();
-        Assert.assertTrue("Counter for 'ContainerLabel' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ContainerLabelIntegrationTest.testFindContainerLabel() {
-        ContainerLabel obj = dod.getRandomContainerLabel();
-        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to provide an identifier", id);
-        obj = ContainerLabel.findContainerLabel(id);
-        Assert.assertNotNull("Find method for 'ContainerLabel' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ContainerLabel' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ContainerLabelIntegrationTest.testFindAllContainerLabels() {
-        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to initialize correctly", dod.getRandomContainerLabel());
-        long count = ContainerLabel.countContainerLabels();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ContainerLabel', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<ContainerLabel> result = ContainerLabel.findAllContainerLabels();
-        Assert.assertNotNull("Find all method for 'ContainerLabel' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ContainerLabel' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ContainerLabelIntegrationTest.testFindContainerLabelEntries() {
-        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to initialize correctly", dod.getRandomContainerLabel());
-        long count = ContainerLabel.countContainerLabels();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<ContainerLabel> result = ContainerLabel.findContainerLabelEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'ContainerLabel' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ContainerLabel' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ContainerLabelIntegrationTest.testFlush() {
-        ContainerLabel obj = dod.getRandomContainerLabel();
-        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to provide an identifier", id);
-        obj = ContainerLabel.findContainerLabel(id);
-        Assert.assertNotNull("Find method for 'ContainerLabel' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyContainerLabel(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'ContainerLabel' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ContainerLabelIntegrationTest.testMergeUpdate() {
-        ContainerLabel obj = dod.getRandomContainerLabel();
-        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to provide an identifier", id);
-        obj = ContainerLabel.findContainerLabel(id);
-        boolean modified =  dod.modifyContainerLabel(obj);
-        Integer currentVersion = obj.getVersion();
-        ContainerLabel merged = (ContainerLabel)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ContainerLabel' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ContainerLabelIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to initialize correctly", dod.getRandomContainerLabel());
-        ContainerLabel obj = dod.getNewTransientContainerLabel(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'ContainerLabel' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'ContainerLabel' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ContainerLabelIntegrationTest.testRemove() {
-        ContainerLabel obj = dod.getRandomContainerLabel();
-        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to provide an identifier", id);
-        obj = ContainerLabel.findContainerLabel(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'ContainerLabel' with identifier '" + id + "'", ContainerLabel.findContainerLabel(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ContainerStateDataOnDemand.java
index afd7380f8..730f06d87 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerStateDataOnDemand.java
@@ -1,7 +1,177 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Component
+@Configurable
 @RooDataOnDemand(entity = ContainerState.class)
 public class ContainerStateDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<ContainerState> data;
+
+	@Autowired
+    ContainerDataOnDemand containerDataOnDemand;
+
+	public ContainerState getNewTransientContainerState(int index) {
+        ContainerState obj = new ContainerState();
+        setComments(obj, index);
+        setContainer(obj, index);
+        setDeleted(obj, index);
+        setIgnored(obj, index);
+        setLsKind(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedBy(obj, index);
+        setModifiedDate(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        return obj;
+    }
+
+	public void setComments(ContainerState obj, int index) {
+        String comments = "comments_" + index;
+        if (comments.length() > 512) {
+            comments = comments.substring(0, 512);
+        }
+        obj.setComments(comments);
+    }
+
+	public void setContainer(ContainerState obj, int index) {
+        Container container = containerDataOnDemand.getRandomContainer();
+        obj.setContainer(container);
+    }
+
+	public void setDeleted(ContainerState obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setIgnored(ContainerState obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setLsKind(ContainerState obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsTransaction(ContainerState obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(ContainerState obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 64) {
+            lsType = lsType.substring(0, 64);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(ContainerState obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedBy(ContainerState obj, int index) {
+        String modifiedBy = "modifiedBy_" + index;
+        if (modifiedBy.length() > 255) {
+            modifiedBy = modifiedBy.substring(0, 255);
+        }
+        obj.setModifiedBy(modifiedBy);
+    }
+
+	public void setModifiedDate(ContainerState obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setRecordedBy(ContainerState obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(ContainerState obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public ContainerState getSpecificContainerState(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        ContainerState obj = data.get(index);
+        Long id = obj.getId();
+        return ContainerState.findContainerState(id);
+    }
+
+	public ContainerState getRandomContainerState() {
+        init();
+        ContainerState obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return ContainerState.findContainerState(id);
+    }
+
+	public boolean modifyContainerState(ContainerState obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = ContainerState.findContainerStateEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'ContainerState' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<ContainerState>();
+        for (int i = 0; i < 10; i++) {
+            ContainerState obj = getNewTransientContainerState(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerStateDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ContainerStateDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 384d6431f..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ContainerStateDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerStateDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ContainerStateDataOnDemand_Roo_Configurable {
-    
-    declare @type: ContainerStateDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerStateDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ContainerStateDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index e55c551d3..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ContainerStateDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,182 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ContainerDataOnDemand;
-import com.labsynch.labseer.domain.ContainerState;
-import com.labsynch.labseer.domain.ContainerStateDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect ContainerStateDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ContainerStateDataOnDemand: @Component;
-    
-    private Random ContainerStateDataOnDemand.rnd = new SecureRandom();
-    
-    private List<ContainerState> ContainerStateDataOnDemand.data;
-    
-    @Autowired
-    ContainerDataOnDemand ContainerStateDataOnDemand.containerDataOnDemand;
-    
-    public ContainerState ContainerStateDataOnDemand.getNewTransientContainerState(int index) {
-        ContainerState obj = new ContainerState();
-        setComments(obj, index);
-        setContainer(obj, index);
-        setDeleted(obj, index);
-        setIgnored(obj, index);
-        setLsKind(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedBy(obj, index);
-        setModifiedDate(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        return obj;
-    }
-    
-    public void ContainerStateDataOnDemand.setComments(ContainerState obj, int index) {
-        String comments = "comments_" + index;
-        if (comments.length() > 512) {
-            comments = comments.substring(0, 512);
-        }
-        obj.setComments(comments);
-    }
-    
-    public void ContainerStateDataOnDemand.setContainer(ContainerState obj, int index) {
-        Container container = containerDataOnDemand.getRandomContainer();
-        obj.setContainer(container);
-    }
-    
-    public void ContainerStateDataOnDemand.setDeleted(ContainerState obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void ContainerStateDataOnDemand.setIgnored(ContainerState obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void ContainerStateDataOnDemand.setLsKind(ContainerState obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void ContainerStateDataOnDemand.setLsTransaction(ContainerState obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void ContainerStateDataOnDemand.setLsType(ContainerState obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 64) {
-            lsType = lsType.substring(0, 64);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void ContainerStateDataOnDemand.setLsTypeAndKind(ContainerState obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void ContainerStateDataOnDemand.setModifiedBy(ContainerState obj, int index) {
-        String modifiedBy = "modifiedBy_" + index;
-        if (modifiedBy.length() > 255) {
-            modifiedBy = modifiedBy.substring(0, 255);
-        }
-        obj.setModifiedBy(modifiedBy);
-    }
-    
-    public void ContainerStateDataOnDemand.setModifiedDate(ContainerState obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void ContainerStateDataOnDemand.setRecordedBy(ContainerState obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void ContainerStateDataOnDemand.setRecordedDate(ContainerState obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public ContainerState ContainerStateDataOnDemand.getSpecificContainerState(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        ContainerState obj = data.get(index);
-        Long id = obj.getId();
-        return ContainerState.findContainerState(id);
-    }
-    
-    public ContainerState ContainerStateDataOnDemand.getRandomContainerState() {
-        init();
-        ContainerState obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return ContainerState.findContainerState(id);
-    }
-    
-    public boolean ContainerStateDataOnDemand.modifyContainerState(ContainerState obj) {
-        return false;
-    }
-    
-    public void ContainerStateDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = ContainerState.findContainerStateEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ContainerState' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<ContainerState>();
-        for (int i = 0; i < 10; i++) {
-            ContainerState obj = getNewTransientContainerState(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ContainerStateIntegrationTest.java
index c73801631..43678e26d 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerStateIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
+@Configurable
 @RooIntegrationTest(entity = ContainerState.class)
 public class ContainerStateIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ContainerStateDataOnDemand dod;
+
+	@Test
+    public void testCountContainerStates() {
+        Assert.assertNotNull("Data on demand for 'ContainerState' failed to initialize correctly", dod.getRandomContainerState());
+        long count = ContainerState.countContainerStates();
+        Assert.assertTrue("Counter for 'ContainerState' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindContainerState() {
+        ContainerState obj = dod.getRandomContainerState();
+        Assert.assertNotNull("Data on demand for 'ContainerState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ContainerState' failed to provide an identifier", id);
+        obj = ContainerState.findContainerState(id);
+        Assert.assertNotNull("Find method for 'ContainerState' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'ContainerState' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllContainerStates() {
+        Assert.assertNotNull("Data on demand for 'ContainerState' failed to initialize correctly", dod.getRandomContainerState());
+        long count = ContainerState.countContainerStates();
+        Assert.assertTrue("Too expensive to perform a find all test for 'ContainerState', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<ContainerState> result = ContainerState.findAllContainerStates();
+        Assert.assertNotNull("Find all method for 'ContainerState' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'ContainerState' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindContainerStateEntries() {
+        Assert.assertNotNull("Data on demand for 'ContainerState' failed to initialize correctly", dod.getRandomContainerState());
+        long count = ContainerState.countContainerStates();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<ContainerState> result = ContainerState.findContainerStateEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'ContainerState' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'ContainerState' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        ContainerState obj = dod.getRandomContainerState();
+        Assert.assertNotNull("Data on demand for 'ContainerState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ContainerState' failed to provide an identifier", id);
+        obj = ContainerState.findContainerState(id);
+        Assert.assertNotNull("Find method for 'ContainerState' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyContainerState(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'ContainerState' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        ContainerState obj = dod.getRandomContainerState();
+        Assert.assertNotNull("Data on demand for 'ContainerState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ContainerState' failed to provide an identifier", id);
+        obj = ContainerState.findContainerState(id);
+        boolean modified =  dod.modifyContainerState(obj);
+        Integer currentVersion = obj.getVersion();
+        ContainerState merged = (ContainerState)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'ContainerState' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'ContainerState' failed to initialize correctly", dod.getRandomContainerState());
+        ContainerState obj = dod.getNewTransientContainerState(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'ContainerState' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'ContainerState' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'ContainerState' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        ContainerState obj = dod.getRandomContainerState();
+        Assert.assertNotNull("Data on demand for 'ContainerState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ContainerState' failed to provide an identifier", id);
+        obj = ContainerState.findContainerState(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'ContainerState' with identifier '" + id + "'", ContainerState.findContainerState(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerStateIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ContainerStateIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index b3fefbf87..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ContainerStateIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerStateIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ContainerStateIntegrationTest_Roo_Configurable {
-    
-    declare @type: ContainerStateIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerStateIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ContainerStateIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index fe8906dc7..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ContainerStateIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerState;
-import com.labsynch.labseer.domain.ContainerStateDataOnDemand;
-import com.labsynch.labseer.domain.ContainerStateIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ContainerStateIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ContainerStateIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ContainerStateIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ContainerStateIntegrationTest: @Transactional;
-    
-    @Autowired
-    ContainerStateDataOnDemand ContainerStateIntegrationTest.dod;
-    
-    @Test
-    public void ContainerStateIntegrationTest.testCountContainerStates() {
-        Assert.assertNotNull("Data on demand for 'ContainerState' failed to initialize correctly", dod.getRandomContainerState());
-        long count = ContainerState.countContainerStates();
-        Assert.assertTrue("Counter for 'ContainerState' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ContainerStateIntegrationTest.testFindContainerState() {
-        ContainerState obj = dod.getRandomContainerState();
-        Assert.assertNotNull("Data on demand for 'ContainerState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ContainerState' failed to provide an identifier", id);
-        obj = ContainerState.findContainerState(id);
-        Assert.assertNotNull("Find method for 'ContainerState' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ContainerState' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ContainerStateIntegrationTest.testFindAllContainerStates() {
-        Assert.assertNotNull("Data on demand for 'ContainerState' failed to initialize correctly", dod.getRandomContainerState());
-        long count = ContainerState.countContainerStates();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ContainerState', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<ContainerState> result = ContainerState.findAllContainerStates();
-        Assert.assertNotNull("Find all method for 'ContainerState' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ContainerState' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ContainerStateIntegrationTest.testFindContainerStateEntries() {
-        Assert.assertNotNull("Data on demand for 'ContainerState' failed to initialize correctly", dod.getRandomContainerState());
-        long count = ContainerState.countContainerStates();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<ContainerState> result = ContainerState.findContainerStateEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'ContainerState' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ContainerState' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ContainerStateIntegrationTest.testFlush() {
-        ContainerState obj = dod.getRandomContainerState();
-        Assert.assertNotNull("Data on demand for 'ContainerState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ContainerState' failed to provide an identifier", id);
-        obj = ContainerState.findContainerState(id);
-        Assert.assertNotNull("Find method for 'ContainerState' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyContainerState(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'ContainerState' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ContainerStateIntegrationTest.testMergeUpdate() {
-        ContainerState obj = dod.getRandomContainerState();
-        Assert.assertNotNull("Data on demand for 'ContainerState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ContainerState' failed to provide an identifier", id);
-        obj = ContainerState.findContainerState(id);
-        boolean modified =  dod.modifyContainerState(obj);
-        Integer currentVersion = obj.getVersion();
-        ContainerState merged = (ContainerState)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ContainerState' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ContainerStateIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'ContainerState' failed to initialize correctly", dod.getRandomContainerState());
-        ContainerState obj = dod.getNewTransientContainerState(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ContainerState' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'ContainerState' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'ContainerState' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ContainerStateIntegrationTest.testRemove() {
-        ContainerState obj = dod.getRandomContainerState();
-        Assert.assertNotNull("Data on demand for 'ContainerState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ContainerState' failed to provide an identifier", id);
-        obj = ContainerState.findContainerState(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'ContainerState' with identifier '" + id + "'", ContainerState.findContainerState(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ContainerTypeDataOnDemand.java
index a078c057b..f8a6250b3 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerTypeDataOnDemand.java
@@ -1,7 +1,89 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Component
+@Configurable
 @RooDataOnDemand(entity = ContainerType.class)
 public class ContainerTypeDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<ContainerType> data;
+
+	public ContainerType getNewTransientContainerType(int index) {
+        ContainerType obj = new ContainerType();
+        setTypeName(obj, index);
+        return obj;
+    }
+
+	public void setTypeName(ContainerType obj, int index) {
+        String typeName = "typeName_" + index;
+        if (typeName.length() > 128) {
+            typeName = new Random().nextInt(10) + typeName.substring(1, 128);
+        }
+        obj.setTypeName(typeName);
+    }
+
+	public ContainerType getSpecificContainerType(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        ContainerType obj = data.get(index);
+        Long id = obj.getId();
+        return ContainerType.findContainerType(id);
+    }
+
+	public ContainerType getRandomContainerType() {
+        init();
+        ContainerType obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return ContainerType.findContainerType(id);
+    }
+
+	public boolean modifyContainerType(ContainerType obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = ContainerType.findContainerTypeEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'ContainerType' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<ContainerType>();
+        for (int i = 0; i < 10; i++) {
+            ContainerType obj = getNewTransientContainerType(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerTypeDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ContainerTypeDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 0bde35a94..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ContainerTypeDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerTypeDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ContainerTypeDataOnDemand_Roo_Configurable {
-    
-    declare @type: ContainerTypeDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerTypeDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ContainerTypeDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index cc42c6163..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ContainerTypeDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,92 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerType;
-import com.labsynch.labseer.domain.ContainerTypeDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.stereotype.Component;
-
-privileged aspect ContainerTypeDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ContainerTypeDataOnDemand: @Component;
-    
-    private Random ContainerTypeDataOnDemand.rnd = new SecureRandom();
-    
-    private List<ContainerType> ContainerTypeDataOnDemand.data;
-    
-    public ContainerType ContainerTypeDataOnDemand.getNewTransientContainerType(int index) {
-        ContainerType obj = new ContainerType();
-        setTypeName(obj, index);
-        return obj;
-    }
-    
-    public void ContainerTypeDataOnDemand.setTypeName(ContainerType obj, int index) {
-        String typeName = "typeName_" + index;
-        if (typeName.length() > 128) {
-            typeName = new Random().nextInt(10) + typeName.substring(1, 128);
-        }
-        obj.setTypeName(typeName);
-    }
-    
-    public ContainerType ContainerTypeDataOnDemand.getSpecificContainerType(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        ContainerType obj = data.get(index);
-        Long id = obj.getId();
-        return ContainerType.findContainerType(id);
-    }
-    
-    public ContainerType ContainerTypeDataOnDemand.getRandomContainerType() {
-        init();
-        ContainerType obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return ContainerType.findContainerType(id);
-    }
-    
-    public boolean ContainerTypeDataOnDemand.modifyContainerType(ContainerType obj) {
-        return false;
-    }
-    
-    public void ContainerTypeDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = ContainerType.findContainerTypeEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ContainerType' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<ContainerType>();
-        for (int i = 0; i < 10; i++) {
-            ContainerType obj = getNewTransientContainerType(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ContainerTypeIntegrationTest.java
index aefa09915..f60b05136 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerTypeIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = ContainerType.class)
 public class ContainerTypeIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ContainerTypeDataOnDemand dod;
+
+	@Test
+    public void testCountContainerTypes() {
+        Assert.assertNotNull("Data on demand for 'ContainerType' failed to initialize correctly", dod.getRandomContainerType());
+        long count = ContainerType.countContainerTypes();
+        Assert.assertTrue("Counter for 'ContainerType' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindContainerType() {
+        ContainerType obj = dod.getRandomContainerType();
+        Assert.assertNotNull("Data on demand for 'ContainerType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ContainerType' failed to provide an identifier", id);
+        obj = ContainerType.findContainerType(id);
+        Assert.assertNotNull("Find method for 'ContainerType' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'ContainerType' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllContainerTypes() {
+        Assert.assertNotNull("Data on demand for 'ContainerType' failed to initialize correctly", dod.getRandomContainerType());
+        long count = ContainerType.countContainerTypes();
+        Assert.assertTrue("Too expensive to perform a find all test for 'ContainerType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<ContainerType> result = ContainerType.findAllContainerTypes();
+        Assert.assertNotNull("Find all method for 'ContainerType' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'ContainerType' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindContainerTypeEntries() {
+        Assert.assertNotNull("Data on demand for 'ContainerType' failed to initialize correctly", dod.getRandomContainerType());
+        long count = ContainerType.countContainerTypes();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<ContainerType> result = ContainerType.findContainerTypeEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'ContainerType' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'ContainerType' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        ContainerType obj = dod.getRandomContainerType();
+        Assert.assertNotNull("Data on demand for 'ContainerType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ContainerType' failed to provide an identifier", id);
+        obj = ContainerType.findContainerType(id);
+        Assert.assertNotNull("Find method for 'ContainerType' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyContainerType(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'ContainerType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        ContainerType obj = dod.getRandomContainerType();
+        Assert.assertNotNull("Data on demand for 'ContainerType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ContainerType' failed to provide an identifier", id);
+        obj = ContainerType.findContainerType(id);
+        boolean modified =  dod.modifyContainerType(obj);
+        Integer currentVersion = obj.getVersion();
+        ContainerType merged = obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'ContainerType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'ContainerType' failed to initialize correctly", dod.getRandomContainerType());
+        ContainerType obj = dod.getNewTransientContainerType(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'ContainerType' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'ContainerType' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'ContainerType' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        ContainerType obj = dod.getRandomContainerType();
+        Assert.assertNotNull("Data on demand for 'ContainerType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ContainerType' failed to provide an identifier", id);
+        obj = ContainerType.findContainerType(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'ContainerType' with identifier '" + id + "'", ContainerType.findContainerType(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerTypeIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ContainerTypeIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index d136ef542..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ContainerTypeIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerTypeIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ContainerTypeIntegrationTest_Roo_Configurable {
-    
-    declare @type: ContainerTypeIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerTypeIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ContainerTypeIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index d50275f86..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ContainerTypeIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerType;
-import com.labsynch.labseer.domain.ContainerTypeDataOnDemand;
-import com.labsynch.labseer.domain.ContainerTypeIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ContainerTypeIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ContainerTypeIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ContainerTypeIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ContainerTypeIntegrationTest: @Transactional;
-    
-    @Autowired
-    ContainerTypeDataOnDemand ContainerTypeIntegrationTest.dod;
-    
-    @Test
-    public void ContainerTypeIntegrationTest.testCountContainerTypes() {
-        Assert.assertNotNull("Data on demand for 'ContainerType' failed to initialize correctly", dod.getRandomContainerType());
-        long count = ContainerType.countContainerTypes();
-        Assert.assertTrue("Counter for 'ContainerType' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ContainerTypeIntegrationTest.testFindContainerType() {
-        ContainerType obj = dod.getRandomContainerType();
-        Assert.assertNotNull("Data on demand for 'ContainerType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ContainerType' failed to provide an identifier", id);
-        obj = ContainerType.findContainerType(id);
-        Assert.assertNotNull("Find method for 'ContainerType' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ContainerType' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ContainerTypeIntegrationTest.testFindAllContainerTypes() {
-        Assert.assertNotNull("Data on demand for 'ContainerType' failed to initialize correctly", dod.getRandomContainerType());
-        long count = ContainerType.countContainerTypes();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ContainerType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<ContainerType> result = ContainerType.findAllContainerTypes();
-        Assert.assertNotNull("Find all method for 'ContainerType' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ContainerType' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ContainerTypeIntegrationTest.testFindContainerTypeEntries() {
-        Assert.assertNotNull("Data on demand for 'ContainerType' failed to initialize correctly", dod.getRandomContainerType());
-        long count = ContainerType.countContainerTypes();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<ContainerType> result = ContainerType.findContainerTypeEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'ContainerType' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ContainerType' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ContainerTypeIntegrationTest.testFlush() {
-        ContainerType obj = dod.getRandomContainerType();
-        Assert.assertNotNull("Data on demand for 'ContainerType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ContainerType' failed to provide an identifier", id);
-        obj = ContainerType.findContainerType(id);
-        Assert.assertNotNull("Find method for 'ContainerType' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyContainerType(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'ContainerType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ContainerTypeIntegrationTest.testMergeUpdate() {
-        ContainerType obj = dod.getRandomContainerType();
-        Assert.assertNotNull("Data on demand for 'ContainerType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ContainerType' failed to provide an identifier", id);
-        obj = ContainerType.findContainerType(id);
-        boolean modified =  dod.modifyContainerType(obj);
-        Integer currentVersion = obj.getVersion();
-        ContainerType merged = obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ContainerType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ContainerTypeIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'ContainerType' failed to initialize correctly", dod.getRandomContainerType());
-        ContainerType obj = dod.getNewTransientContainerType(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ContainerType' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'ContainerType' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'ContainerType' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ContainerTypeIntegrationTest.testRemove() {
-        ContainerType obj = dod.getRandomContainerType();
-        Assert.assertNotNull("Data on demand for 'ContainerType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ContainerType' failed to provide an identifier", id);
-        obj = ContainerType.findContainerType(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'ContainerType' with identifier '" + id + "'", ContainerType.findContainerType(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ContainerValueDataOnDemand.java
index a773ecda1..d1ebfa581 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerValueDataOnDemand.java
@@ -1,7 +1,382 @@
 package com.labsynch.labseer.domain;
 
+import java.math.BigDecimal;
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Component
+@Configurable
 @RooDataOnDemand(entity = ContainerValue.class)
 public class ContainerValueDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<ContainerValue> data;
+
+	@Autowired
+    ContainerStateDataOnDemand containerStateDataOnDemand;
+
+	public ContainerValue getNewTransientContainerValue(int index) {
+        ContainerValue obj = new ContainerValue();
+        setBlobValue(obj, index);
+        setClobValue(obj, index);
+        setCodeKind(obj, index);
+        setCodeOrigin(obj, index);
+        setCodeType(obj, index);
+        setCodeTypeAndKind(obj, index);
+        setCodeValue(obj, index);
+        setComments(obj, index);
+        setConcUnit(obj, index);
+        setConcentration(obj, index);
+        setDateValue(obj, index);
+        setDeleted(obj, index);
+        setFileValue(obj, index);
+        setIgnored(obj, index);
+        setLsKind(obj, index);
+        setLsState(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedBy(obj, index);
+        setModifiedDate(obj, index);
+        setNumberOfReplicates(obj, index);
+        setNumericValue(obj, index);
+        setOperatorKind(obj, index);
+        setOperatorType(obj, index);
+        setOperatorTypeAndKind(obj, index);
+        setPublicData(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        setSigFigs(obj, index);
+        setStringValue(obj, index);
+        setUncertainty(obj, index);
+        setUncertaintyType(obj, index);
+        setUnitKind(obj, index);
+        setUnitType(obj, index);
+        setUnitTypeAndKind(obj, index);
+        setUrlValue(obj, index);
+        return obj;
+    }
+
+	public void setBlobValue(ContainerValue obj, int index) {
+        byte[] blobValue = String.valueOf(index).getBytes();
+        obj.setBlobValue(blobValue);
+    }
+
+	public void setClobValue(ContainerValue obj, int index) {
+        String clobValue = "clobValue_" + index;
+        obj.setClobValue(clobValue);
+    }
+
+	public void setCodeKind(ContainerValue obj, int index) {
+        String codeKind = "codeKind_" + index;
+        if (codeKind.length() > 255) {
+            codeKind = codeKind.substring(0, 255);
+        }
+        obj.setCodeKind(codeKind);
+    }
+
+	public void setCodeOrigin(ContainerValue obj, int index) {
+        String codeOrigin = "codeOrigin_" + index;
+        if (codeOrigin.length() > 255) {
+            codeOrigin = codeOrigin.substring(0, 255);
+        }
+        obj.setCodeOrigin(codeOrigin);
+    }
+
+	public void setCodeType(ContainerValue obj, int index) {
+        String codeType = "codeType_" + index;
+        if (codeType.length() > 255) {
+            codeType = codeType.substring(0, 255);
+        }
+        obj.setCodeType(codeType);
+    }
+
+	public void setCodeTypeAndKind(ContainerValue obj, int index) {
+        String codeTypeAndKind = "codeTypeAndKind_" + index;
+        if (codeTypeAndKind.length() > 350) {
+            codeTypeAndKind = codeTypeAndKind.substring(0, 350);
+        }
+        obj.setCodeTypeAndKind(codeTypeAndKind);
+    }
+
+	public void setCodeValue(ContainerValue obj, int index) {
+        String codeValue = "codeValue_" + index;
+        if (codeValue.length() > 255) {
+            codeValue = codeValue.substring(0, 255);
+        }
+        obj.setCodeValue(codeValue);
+    }
+
+	public void setComments(ContainerValue obj, int index) {
+        String comments = "comments_" + index;
+        if (comments.length() > 512) {
+            comments = comments.substring(0, 512);
+        }
+        obj.setComments(comments);
+    }
+
+	public void setConcUnit(ContainerValue obj, int index) {
+        String concUnit = "concUnit_" + index;
+        if (concUnit.length() > 25) {
+            concUnit = concUnit.substring(0, 25);
+        }
+        obj.setConcUnit(concUnit);
+    }
+
+	public void setConcentration(ContainerValue obj, int index) {
+        Double concentration = new Integer(index).doubleValue();
+        obj.setConcentration(concentration);
+    }
+
+	public void setDateValue(ContainerValue obj, int index) {
+        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setDateValue(dateValue);
+    }
+
+	public void setDeleted(ContainerValue obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setFileValue(ContainerValue obj, int index) {
+        String fileValue = "fileValue_" + index;
+        if (fileValue.length() > 512) {
+            fileValue = fileValue.substring(0, 512);
+        }
+        obj.setFileValue(fileValue);
+    }
+
+	public void setIgnored(ContainerValue obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setLsKind(ContainerValue obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsState(ContainerValue obj, int index) {
+        ContainerState lsState = containerStateDataOnDemand.getRandomContainerState();
+        obj.setLsState(lsState);
+    }
+
+	public void setLsTransaction(ContainerValue obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(ContainerValue obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 64) {
+            lsType = lsType.substring(0, 64);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(ContainerValue obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 350) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 350);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedBy(ContainerValue obj, int index) {
+        String modifiedBy = "modifiedBy_" + index;
+        if (modifiedBy.length() > 255) {
+            modifiedBy = modifiedBy.substring(0, 255);
+        }
+        obj.setModifiedBy(modifiedBy);
+    }
+
+	public void setModifiedDate(ContainerValue obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setNumberOfReplicates(ContainerValue obj, int index) {
+        Integer numberOfReplicates = new Integer(index);
+        obj.setNumberOfReplicates(numberOfReplicates);
+    }
+
+	public void setNumericValue(ContainerValue obj, int index) {
+        BigDecimal numericValue = BigDecimal.valueOf(index);
+        if (numericValue.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
+            numericValue = new BigDecimal("99999999999999999999.999999999999999999");
+        }
+        obj.setNumericValue(numericValue);
+    }
+
+	public void setOperatorKind(ContainerValue obj, int index) {
+        String operatorKind = "operator_" + index;
+        if (operatorKind.length() > 10) {
+            operatorKind = operatorKind.substring(0, 10);
+        }
+        obj.setOperatorKind(operatorKind);
+    }
+
+	public void setOperatorType(ContainerValue obj, int index) {
+        String operatorType = "operatorType_" + index;
+        if (operatorType.length() > 25) {
+            operatorType = operatorType.substring(0, 25);
+        }
+        obj.setOperatorType(operatorType);
+    }
+
+	public void setOperatorTypeAndKind(ContainerValue obj, int index) {
+        String operatorTypeAndKind = "operatorTypeAndKind_" + index;
+        if (operatorTypeAndKind.length() > 50) {
+            operatorTypeAndKind = operatorTypeAndKind.substring(0, 50);
+        }
+        obj.setOperatorTypeAndKind(operatorTypeAndKind);
+    }
+
+	public void setPublicData(ContainerValue obj, int index) {
+        Boolean publicData = true;
+        obj.setPublicData(publicData);
+    }
+
+	public void setRecordedBy(ContainerValue obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(ContainerValue obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public void setSigFigs(ContainerValue obj, int index) {
+        Integer sigFigs = new Integer(index);
+        obj.setSigFigs(sigFigs);
+    }
+
+	public void setStringValue(ContainerValue obj, int index) {
+        String stringValue = "stringValue_" + index;
+        if (stringValue.length() > 255) {
+            stringValue = stringValue.substring(0, 255);
+        }
+        obj.setStringValue(stringValue);
+    }
+
+	public void setUncertainty(ContainerValue obj, int index) {
+        BigDecimal uncertainty = BigDecimal.valueOf(index);
+        if (uncertainty.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
+            uncertainty = new BigDecimal("99999999999999999999.999999999999999999");
+        }
+        obj.setUncertainty(uncertainty);
+    }
+
+	public void setUncertaintyType(ContainerValue obj, int index) {
+        String uncertaintyType = "uncertaintyType_" + index;
+        if (uncertaintyType.length() > 255) {
+            uncertaintyType = uncertaintyType.substring(0, 255);
+        }
+        obj.setUncertaintyType(uncertaintyType);
+    }
+
+	public void setUnitKind(ContainerValue obj, int index) {
+        String unitKind = "unitKind_" + index;
+        if (unitKind.length() > 25) {
+            unitKind = unitKind.substring(0, 25);
+        }
+        obj.setUnitKind(unitKind);
+    }
+
+	public void setUnitType(ContainerValue obj, int index) {
+        String unitType = "unitType_" + index;
+        if (unitType.length() > 25) {
+            unitType = unitType.substring(0, 25);
+        }
+        obj.setUnitType(unitType);
+    }
+
+	public void setUnitTypeAndKind(ContainerValue obj, int index) {
+        String unitTypeAndKind = "unitTypeAndKind_" + index;
+        if (unitTypeAndKind.length() > 55) {
+            unitTypeAndKind = unitTypeAndKind.substring(0, 55);
+        }
+        obj.setUnitTypeAndKind(unitTypeAndKind);
+    }
+
+	public void setUrlValue(ContainerValue obj, int index) {
+        String urlValue = "urlValue_" + index;
+        if (urlValue.length() > 2000) {
+            urlValue = urlValue.substring(0, 2000);
+        }
+        obj.setUrlValue(urlValue);
+    }
+
+	public ContainerValue getSpecificContainerValue(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        ContainerValue obj = data.get(index);
+        Long id = obj.getId();
+        return ContainerValue.findContainerValue(id);
+    }
+
+	public ContainerValue getRandomContainerValue() {
+        init();
+        ContainerValue obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return ContainerValue.findContainerValue(id);
+    }
+
+	public boolean modifyContainerValue(ContainerValue obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = ContainerValue.findContainerValueEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'ContainerValue' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<ContainerValue>();
+        for (int i = 0; i < 10; i++) {
+            ContainerValue obj = getNewTransientContainerValue(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerValueDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ContainerValueDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 63c155fae..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ContainerValueDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerValueDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ContainerValueDataOnDemand_Roo_Configurable {
-    
-    declare @type: ContainerValueDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerValueDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ContainerValueDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 2dae20548..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ContainerValueDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,387 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerState;
-import com.labsynch.labseer.domain.ContainerStateDataOnDemand;
-import com.labsynch.labseer.domain.ContainerValue;
-import com.labsynch.labseer.domain.ContainerValueDataOnDemand;
-import java.math.BigDecimal;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect ContainerValueDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ContainerValueDataOnDemand: @Component;
-    
-    private Random ContainerValueDataOnDemand.rnd = new SecureRandom();
-    
-    private List<ContainerValue> ContainerValueDataOnDemand.data;
-    
-    @Autowired
-    ContainerStateDataOnDemand ContainerValueDataOnDemand.containerStateDataOnDemand;
-    
-    public ContainerValue ContainerValueDataOnDemand.getNewTransientContainerValue(int index) {
-        ContainerValue obj = new ContainerValue();
-        setBlobValue(obj, index);
-        setClobValue(obj, index);
-        setCodeKind(obj, index);
-        setCodeOrigin(obj, index);
-        setCodeType(obj, index);
-        setCodeTypeAndKind(obj, index);
-        setCodeValue(obj, index);
-        setComments(obj, index);
-        setConcUnit(obj, index);
-        setConcentration(obj, index);
-        setDateValue(obj, index);
-        setDeleted(obj, index);
-        setFileValue(obj, index);
-        setIgnored(obj, index);
-        setLsKind(obj, index);
-        setLsState(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedBy(obj, index);
-        setModifiedDate(obj, index);
-        setNumberOfReplicates(obj, index);
-        setNumericValue(obj, index);
-        setOperatorKind(obj, index);
-        setOperatorType(obj, index);
-        setOperatorTypeAndKind(obj, index);
-        setPublicData(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        setSigFigs(obj, index);
-        setStringValue(obj, index);
-        setUncertainty(obj, index);
-        setUncertaintyType(obj, index);
-        setUnitKind(obj, index);
-        setUnitType(obj, index);
-        setUnitTypeAndKind(obj, index);
-        setUrlValue(obj, index);
-        return obj;
-    }
-    
-    public void ContainerValueDataOnDemand.setBlobValue(ContainerValue obj, int index) {
-        byte[] blobValue = String.valueOf(index).getBytes();
-        obj.setBlobValue(blobValue);
-    }
-    
-    public void ContainerValueDataOnDemand.setClobValue(ContainerValue obj, int index) {
-        String clobValue = "clobValue_" + index;
-        obj.setClobValue(clobValue);
-    }
-    
-    public void ContainerValueDataOnDemand.setCodeKind(ContainerValue obj, int index) {
-        String codeKind = "codeKind_" + index;
-        if (codeKind.length() > 255) {
-            codeKind = codeKind.substring(0, 255);
-        }
-        obj.setCodeKind(codeKind);
-    }
-    
-    public void ContainerValueDataOnDemand.setCodeOrigin(ContainerValue obj, int index) {
-        String codeOrigin = "codeOrigin_" + index;
-        if (codeOrigin.length() > 255) {
-            codeOrigin = codeOrigin.substring(0, 255);
-        }
-        obj.setCodeOrigin(codeOrigin);
-    }
-    
-    public void ContainerValueDataOnDemand.setCodeType(ContainerValue obj, int index) {
-        String codeType = "codeType_" + index;
-        if (codeType.length() > 255) {
-            codeType = codeType.substring(0, 255);
-        }
-        obj.setCodeType(codeType);
-    }
-    
-    public void ContainerValueDataOnDemand.setCodeTypeAndKind(ContainerValue obj, int index) {
-        String codeTypeAndKind = "codeTypeAndKind_" + index;
-        if (codeTypeAndKind.length() > 350) {
-            codeTypeAndKind = codeTypeAndKind.substring(0, 350);
-        }
-        obj.setCodeTypeAndKind(codeTypeAndKind);
-    }
-    
-    public void ContainerValueDataOnDemand.setCodeValue(ContainerValue obj, int index) {
-        String codeValue = "codeValue_" + index;
-        if (codeValue.length() > 255) {
-            codeValue = codeValue.substring(0, 255);
-        }
-        obj.setCodeValue(codeValue);
-    }
-    
-    public void ContainerValueDataOnDemand.setComments(ContainerValue obj, int index) {
-        String comments = "comments_" + index;
-        if (comments.length() > 512) {
-            comments = comments.substring(0, 512);
-        }
-        obj.setComments(comments);
-    }
-    
-    public void ContainerValueDataOnDemand.setConcUnit(ContainerValue obj, int index) {
-        String concUnit = "concUnit_" + index;
-        if (concUnit.length() > 25) {
-            concUnit = concUnit.substring(0, 25);
-        }
-        obj.setConcUnit(concUnit);
-    }
-    
-    public void ContainerValueDataOnDemand.setConcentration(ContainerValue obj, int index) {
-        Double concentration = new Integer(index).doubleValue();
-        obj.setConcentration(concentration);
-    }
-    
-    public void ContainerValueDataOnDemand.setDateValue(ContainerValue obj, int index) {
-        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setDateValue(dateValue);
-    }
-    
-    public void ContainerValueDataOnDemand.setDeleted(ContainerValue obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void ContainerValueDataOnDemand.setFileValue(ContainerValue obj, int index) {
-        String fileValue = "fileValue_" + index;
-        if (fileValue.length() > 512) {
-            fileValue = fileValue.substring(0, 512);
-        }
-        obj.setFileValue(fileValue);
-    }
-    
-    public void ContainerValueDataOnDemand.setIgnored(ContainerValue obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void ContainerValueDataOnDemand.setLsKind(ContainerValue obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void ContainerValueDataOnDemand.setLsState(ContainerValue obj, int index) {
-        ContainerState lsState = containerStateDataOnDemand.getRandomContainerState();
-        obj.setLsState(lsState);
-    }
-    
-    public void ContainerValueDataOnDemand.setLsTransaction(ContainerValue obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void ContainerValueDataOnDemand.setLsType(ContainerValue obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 64) {
-            lsType = lsType.substring(0, 64);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void ContainerValueDataOnDemand.setLsTypeAndKind(ContainerValue obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 350) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 350);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void ContainerValueDataOnDemand.setModifiedBy(ContainerValue obj, int index) {
-        String modifiedBy = "modifiedBy_" + index;
-        if (modifiedBy.length() > 255) {
-            modifiedBy = modifiedBy.substring(0, 255);
-        }
-        obj.setModifiedBy(modifiedBy);
-    }
-    
-    public void ContainerValueDataOnDemand.setModifiedDate(ContainerValue obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void ContainerValueDataOnDemand.setNumberOfReplicates(ContainerValue obj, int index) {
-        Integer numberOfReplicates = new Integer(index);
-        obj.setNumberOfReplicates(numberOfReplicates);
-    }
-    
-    public void ContainerValueDataOnDemand.setNumericValue(ContainerValue obj, int index) {
-        BigDecimal numericValue = BigDecimal.valueOf(index);
-        if (numericValue.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
-            numericValue = new BigDecimal("99999999999999999999.999999999999999999");
-        }
-        obj.setNumericValue(numericValue);
-    }
-    
-    public void ContainerValueDataOnDemand.setOperatorKind(ContainerValue obj, int index) {
-        String operatorKind = "operator_" + index;
-        if (operatorKind.length() > 10) {
-            operatorKind = operatorKind.substring(0, 10);
-        }
-        obj.setOperatorKind(operatorKind);
-    }
-    
-    public void ContainerValueDataOnDemand.setOperatorType(ContainerValue obj, int index) {
-        String operatorType = "operatorType_" + index;
-        if (operatorType.length() > 25) {
-            operatorType = operatorType.substring(0, 25);
-        }
-        obj.setOperatorType(operatorType);
-    }
-    
-    public void ContainerValueDataOnDemand.setOperatorTypeAndKind(ContainerValue obj, int index) {
-        String operatorTypeAndKind = "operatorTypeAndKind_" + index;
-        if (operatorTypeAndKind.length() > 50) {
-            operatorTypeAndKind = operatorTypeAndKind.substring(0, 50);
-        }
-        obj.setOperatorTypeAndKind(operatorTypeAndKind);
-    }
-    
-    public void ContainerValueDataOnDemand.setPublicData(ContainerValue obj, int index) {
-        Boolean publicData = true;
-        obj.setPublicData(publicData);
-    }
-    
-    public void ContainerValueDataOnDemand.setRecordedBy(ContainerValue obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void ContainerValueDataOnDemand.setRecordedDate(ContainerValue obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public void ContainerValueDataOnDemand.setSigFigs(ContainerValue obj, int index) {
-        Integer sigFigs = new Integer(index);
-        obj.setSigFigs(sigFigs);
-    }
-    
-    public void ContainerValueDataOnDemand.setStringValue(ContainerValue obj, int index) {
-        String stringValue = "stringValue_" + index;
-        if (stringValue.length() > 255) {
-            stringValue = stringValue.substring(0, 255);
-        }
-        obj.setStringValue(stringValue);
-    }
-    
-    public void ContainerValueDataOnDemand.setUncertainty(ContainerValue obj, int index) {
-        BigDecimal uncertainty = BigDecimal.valueOf(index);
-        if (uncertainty.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
-            uncertainty = new BigDecimal("99999999999999999999.999999999999999999");
-        }
-        obj.setUncertainty(uncertainty);
-    }
-    
-    public void ContainerValueDataOnDemand.setUncertaintyType(ContainerValue obj, int index) {
-        String uncertaintyType = "uncertaintyType_" + index;
-        if (uncertaintyType.length() > 255) {
-            uncertaintyType = uncertaintyType.substring(0, 255);
-        }
-        obj.setUncertaintyType(uncertaintyType);
-    }
-    
-    public void ContainerValueDataOnDemand.setUnitKind(ContainerValue obj, int index) {
-        String unitKind = "unitKind_" + index;
-        if (unitKind.length() > 25) {
-            unitKind = unitKind.substring(0, 25);
-        }
-        obj.setUnitKind(unitKind);
-    }
-    
-    public void ContainerValueDataOnDemand.setUnitType(ContainerValue obj, int index) {
-        String unitType = "unitType_" + index;
-        if (unitType.length() > 25) {
-            unitType = unitType.substring(0, 25);
-        }
-        obj.setUnitType(unitType);
-    }
-    
-    public void ContainerValueDataOnDemand.setUnitTypeAndKind(ContainerValue obj, int index) {
-        String unitTypeAndKind = "unitTypeAndKind_" + index;
-        if (unitTypeAndKind.length() > 55) {
-            unitTypeAndKind = unitTypeAndKind.substring(0, 55);
-        }
-        obj.setUnitTypeAndKind(unitTypeAndKind);
-    }
-    
-    public void ContainerValueDataOnDemand.setUrlValue(ContainerValue obj, int index) {
-        String urlValue = "urlValue_" + index;
-        if (urlValue.length() > 2000) {
-            urlValue = urlValue.substring(0, 2000);
-        }
-        obj.setUrlValue(urlValue);
-    }
-    
-    public ContainerValue ContainerValueDataOnDemand.getSpecificContainerValue(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        ContainerValue obj = data.get(index);
-        Long id = obj.getId();
-        return ContainerValue.findContainerValue(id);
-    }
-    
-    public ContainerValue ContainerValueDataOnDemand.getRandomContainerValue() {
-        init();
-        ContainerValue obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return ContainerValue.findContainerValue(id);
-    }
-    
-    public boolean ContainerValueDataOnDemand.modifyContainerValue(ContainerValue obj) {
-        return false;
-    }
-    
-    public void ContainerValueDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = ContainerValue.findContainerValueEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ContainerValue' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<ContainerValue>();
-        for (int i = 0; i < 10; i++) {
-            ContainerValue obj = getNewTransientContainerValue(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ContainerValueIntegrationTest.java
index 60a15804f..b9312be4d 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerValueIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
+@Configurable
 @RooIntegrationTest(entity = ContainerValue.class)
 public class ContainerValueIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ContainerValueDataOnDemand dod;
+
+	@Test
+    public void testCountContainerValues() {
+        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to initialize correctly", dod.getRandomContainerValue());
+        long count = ContainerValue.countContainerValues();
+        Assert.assertTrue("Counter for 'ContainerValue' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindContainerValue() {
+        ContainerValue obj = dod.getRandomContainerValue();
+        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to provide an identifier", id);
+        obj = ContainerValue.findContainerValue(id);
+        Assert.assertNotNull("Find method for 'ContainerValue' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'ContainerValue' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllContainerValues() {
+        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to initialize correctly", dod.getRandomContainerValue());
+        long count = ContainerValue.countContainerValues();
+        Assert.assertTrue("Too expensive to perform a find all test for 'ContainerValue', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<ContainerValue> result = ContainerValue.findAllContainerValues();
+        Assert.assertNotNull("Find all method for 'ContainerValue' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'ContainerValue' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindContainerValueEntries() {
+        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to initialize correctly", dod.getRandomContainerValue());
+        long count = ContainerValue.countContainerValues();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<ContainerValue> result = ContainerValue.findContainerValueEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'ContainerValue' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'ContainerValue' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        ContainerValue obj = dod.getRandomContainerValue();
+        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to provide an identifier", id);
+        obj = ContainerValue.findContainerValue(id);
+        Assert.assertNotNull("Find method for 'ContainerValue' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyContainerValue(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'ContainerValue' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        ContainerValue obj = dod.getRandomContainerValue();
+        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to provide an identifier", id);
+        obj = ContainerValue.findContainerValue(id);
+        boolean modified =  dod.modifyContainerValue(obj);
+        Integer currentVersion = obj.getVersion();
+        ContainerValue merged = (ContainerValue)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'ContainerValue' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to initialize correctly", dod.getRandomContainerValue());
+        ContainerValue obj = dod.getNewTransientContainerValue(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'ContainerValue' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'ContainerValue' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        ContainerValue obj = dod.getRandomContainerValue();
+        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to provide an identifier", id);
+        obj = ContainerValue.findContainerValue(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'ContainerValue' with identifier '" + id + "'", ContainerValue.findContainerValue(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerValueIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ContainerValueIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index fecf568f6..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ContainerValueIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerValueIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ContainerValueIntegrationTest_Roo_Configurable {
-    
-    declare @type: ContainerValueIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerValueIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ContainerValueIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 742c8215e..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ContainerValueIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ContainerValue;
-import com.labsynch.labseer.domain.ContainerValueDataOnDemand;
-import com.labsynch.labseer.domain.ContainerValueIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ContainerValueIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ContainerValueIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ContainerValueIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ContainerValueIntegrationTest: @Transactional;
-    
-    @Autowired
-    ContainerValueDataOnDemand ContainerValueIntegrationTest.dod;
-    
-    @Test
-    public void ContainerValueIntegrationTest.testCountContainerValues() {
-        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to initialize correctly", dod.getRandomContainerValue());
-        long count = ContainerValue.countContainerValues();
-        Assert.assertTrue("Counter for 'ContainerValue' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ContainerValueIntegrationTest.testFindContainerValue() {
-        ContainerValue obj = dod.getRandomContainerValue();
-        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to provide an identifier", id);
-        obj = ContainerValue.findContainerValue(id);
-        Assert.assertNotNull("Find method for 'ContainerValue' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ContainerValue' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ContainerValueIntegrationTest.testFindAllContainerValues() {
-        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to initialize correctly", dod.getRandomContainerValue());
-        long count = ContainerValue.countContainerValues();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ContainerValue', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<ContainerValue> result = ContainerValue.findAllContainerValues();
-        Assert.assertNotNull("Find all method for 'ContainerValue' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ContainerValue' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ContainerValueIntegrationTest.testFindContainerValueEntries() {
-        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to initialize correctly", dod.getRandomContainerValue());
-        long count = ContainerValue.countContainerValues();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<ContainerValue> result = ContainerValue.findContainerValueEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'ContainerValue' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ContainerValue' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ContainerValueIntegrationTest.testFlush() {
-        ContainerValue obj = dod.getRandomContainerValue();
-        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to provide an identifier", id);
-        obj = ContainerValue.findContainerValue(id);
-        Assert.assertNotNull("Find method for 'ContainerValue' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyContainerValue(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'ContainerValue' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ContainerValueIntegrationTest.testMergeUpdate() {
-        ContainerValue obj = dod.getRandomContainerValue();
-        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to provide an identifier", id);
-        obj = ContainerValue.findContainerValue(id);
-        boolean modified =  dod.modifyContainerValue(obj);
-        Integer currentVersion = obj.getVersion();
-        ContainerValue merged = (ContainerValue)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ContainerValue' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ContainerValueIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to initialize correctly", dod.getRandomContainerValue());
-        ContainerValue obj = dod.getNewTransientContainerValue(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'ContainerValue' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'ContainerValue' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ContainerValueIntegrationTest.testRemove() {
-        ContainerValue obj = dod.getRandomContainerValue();
-        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to provide an identifier", id);
-        obj = ContainerValue.findContainerValue(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'ContainerValue' with identifier '" + id + "'", ContainerValue.findContainerValue(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ExperimentDataOnDemand.java
index 0114b0108..770187822 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentDataOnDemand.java
@@ -1,7 +1,186 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Component
+@Configurable
 @RooDataOnDemand(entity = Experiment.class)
 public class ExperimentDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<Experiment> data;
+
+	@Autowired
+    ProtocolDataOnDemand protocolDataOnDemand;
+
+	public Experiment getNewTransientExperiment(int index) {
+        Experiment obj = new Experiment();
+        setCodeName(obj, index);
+        setDeleted(obj, index);
+        setIgnored(obj, index);
+        setLsKind(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedBy(obj, index);
+        setModifiedDate(obj, index);
+        setProtocol(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        setShortDescription(obj, index);
+        return obj;
+    }
+
+	public void setCodeName(Experiment obj, int index) {
+        String codeName = "codeName_" + index;
+        if (codeName.length() > 255) {
+            codeName = new Random().nextInt(10) + codeName.substring(1, 255);
+        }
+        obj.setCodeName(codeName);
+    }
+
+	public void setDeleted(Experiment obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setIgnored(Experiment obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setLsKind(Experiment obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsTransaction(Experiment obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(Experiment obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 255) {
+            lsType = lsType.substring(0, 255);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(Experiment obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedBy(Experiment obj, int index) {
+        String modifiedBy = "modifiedBy_" + index;
+        if (modifiedBy.length() > 255) {
+            modifiedBy = modifiedBy.substring(0, 255);
+        }
+        obj.setModifiedBy(modifiedBy);
+    }
+
+	public void setModifiedDate(Experiment obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setProtocol(Experiment obj, int index) {
+        Protocol protocol = protocolDataOnDemand.getRandomProtocol();
+        obj.setProtocol(protocol);
+    }
+
+	public void setRecordedBy(Experiment obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(Experiment obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public void setShortDescription(Experiment obj, int index) {
+        String shortDescription = "shortDescription_" + index;
+        if (shortDescription.length() > 1024) {
+            shortDescription = shortDescription.substring(0, 1024);
+        }
+        obj.setShortDescription(shortDescription);
+    }
+
+	public Experiment getSpecificExperiment(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        Experiment obj = data.get(index);
+        Long id = obj.getId();
+        return Experiment.findExperiment(id);
+    }
+
+	public Experiment getRandomExperiment() {
+        init();
+        Experiment obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return Experiment.findExperiment(id);
+    }
+
+	public boolean modifyExperiment(Experiment obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = Experiment.findExperimentEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'Experiment' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<Experiment>();
+        for (int i = 0; i < 10; i++) {
+            Experiment obj = getNewTransientExperiment(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ExperimentDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 15692f5dc..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ExperimentDataOnDemand_Roo_Configurable {
-    
-    declare @type: ExperimentDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ExperimentDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 40348542f..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,191 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentDataOnDemand;
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ProtocolDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect ExperimentDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ExperimentDataOnDemand: @Component;
-    
-    private Random ExperimentDataOnDemand.rnd = new SecureRandom();
-    
-    private List<Experiment> ExperimentDataOnDemand.data;
-    
-    @Autowired
-    ProtocolDataOnDemand ExperimentDataOnDemand.protocolDataOnDemand;
-    
-    public Experiment ExperimentDataOnDemand.getNewTransientExperiment(int index) {
-        Experiment obj = new Experiment();
-        setCodeName(obj, index);
-        setDeleted(obj, index);
-        setIgnored(obj, index);
-        setLsKind(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedBy(obj, index);
-        setModifiedDate(obj, index);
-        setProtocol(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        setShortDescription(obj, index);
-        return obj;
-    }
-    
-    public void ExperimentDataOnDemand.setCodeName(Experiment obj, int index) {
-        String codeName = "codeName_" + index;
-        if (codeName.length() > 255) {
-            codeName = new Random().nextInt(10) + codeName.substring(1, 255);
-        }
-        obj.setCodeName(codeName);
-    }
-    
-    public void ExperimentDataOnDemand.setDeleted(Experiment obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void ExperimentDataOnDemand.setIgnored(Experiment obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void ExperimentDataOnDemand.setLsKind(Experiment obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void ExperimentDataOnDemand.setLsTransaction(Experiment obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void ExperimentDataOnDemand.setLsType(Experiment obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 255) {
-            lsType = lsType.substring(0, 255);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void ExperimentDataOnDemand.setLsTypeAndKind(Experiment obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void ExperimentDataOnDemand.setModifiedBy(Experiment obj, int index) {
-        String modifiedBy = "modifiedBy_" + index;
-        if (modifiedBy.length() > 255) {
-            modifiedBy = modifiedBy.substring(0, 255);
-        }
-        obj.setModifiedBy(modifiedBy);
-    }
-    
-    public void ExperimentDataOnDemand.setModifiedDate(Experiment obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void ExperimentDataOnDemand.setProtocol(Experiment obj, int index) {
-        Protocol protocol = protocolDataOnDemand.getRandomProtocol();
-        obj.setProtocol(protocol);
-    }
-    
-    public void ExperimentDataOnDemand.setRecordedBy(Experiment obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void ExperimentDataOnDemand.setRecordedDate(Experiment obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public void ExperimentDataOnDemand.setShortDescription(Experiment obj, int index) {
-        String shortDescription = "shortDescription_" + index;
-        if (shortDescription.length() > 1024) {
-            shortDescription = shortDescription.substring(0, 1024);
-        }
-        obj.setShortDescription(shortDescription);
-    }
-    
-    public Experiment ExperimentDataOnDemand.getSpecificExperiment(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        Experiment obj = data.get(index);
-        Long id = obj.getId();
-        return Experiment.findExperiment(id);
-    }
-    
-    public Experiment ExperimentDataOnDemand.getRandomExperiment() {
-        init();
-        Experiment obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return Experiment.findExperiment(id);
-    }
-    
-    public boolean ExperimentDataOnDemand.modifyExperiment(Experiment obj) {
-        return false;
-    }
-    
-    public void ExperimentDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = Experiment.findExperimentEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'Experiment' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<Experiment>();
-        for (int i = 0; i < 10; i++) {
-            Experiment obj = getNewTransientExperiment(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ExperimentIntegrationTest.java
index 6c18a3bd5..970a5f54b 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = Experiment.class)
 public class ExperimentIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ExperimentDataOnDemand dod;
+
+	@Test
+    public void testCountExperiments() {
+        Assert.assertNotNull("Data on demand for 'Experiment' failed to initialize correctly", dod.getRandomExperiment());
+        long count = Experiment.countExperiments();
+        Assert.assertTrue("Counter for 'Experiment' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindExperiment() {
+        Experiment obj = dod.getRandomExperiment();
+        Assert.assertNotNull("Data on demand for 'Experiment' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'Experiment' failed to provide an identifier", id);
+        obj = Experiment.findExperiment(id);
+        Assert.assertNotNull("Find method for 'Experiment' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'Experiment' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllExperiments() {
+        Assert.assertNotNull("Data on demand for 'Experiment' failed to initialize correctly", dod.getRandomExperiment());
+        long count = Experiment.countExperiments();
+        Assert.assertTrue("Too expensive to perform a find all test for 'Experiment', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<Experiment> result = Experiment.findAllExperiments();
+        Assert.assertNotNull("Find all method for 'Experiment' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'Experiment' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindExperimentEntries() {
+        Assert.assertNotNull("Data on demand for 'Experiment' failed to initialize correctly", dod.getRandomExperiment());
+        long count = Experiment.countExperiments();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<Experiment> result = Experiment.findExperimentEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'Experiment' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'Experiment' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        Experiment obj = dod.getRandomExperiment();
+        Assert.assertNotNull("Data on demand for 'Experiment' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'Experiment' failed to provide an identifier", id);
+        obj = Experiment.findExperiment(id);
+        Assert.assertNotNull("Find method for 'Experiment' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyExperiment(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'Experiment' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        Experiment obj = dod.getRandomExperiment();
+        Assert.assertNotNull("Data on demand for 'Experiment' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'Experiment' failed to provide an identifier", id);
+        obj = Experiment.findExperiment(id);
+        boolean modified =  dod.modifyExperiment(obj);
+        Integer currentVersion = obj.getVersion();
+        Experiment merged = (Experiment)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'Experiment' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'Experiment' failed to initialize correctly", dod.getRandomExperiment());
+        Experiment obj = dod.getNewTransientExperiment(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'Experiment' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'Experiment' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'Experiment' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        Experiment obj = dod.getRandomExperiment();
+        Assert.assertNotNull("Data on demand for 'Experiment' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'Experiment' failed to provide an identifier", id);
+        obj = Experiment.findExperiment(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'Experiment' with identifier '" + id + "'", Experiment.findExperiment(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ExperimentIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index e0d6d88ca..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ExperimentIntegrationTest_Roo_Configurable {
-    
-    declare @type: ExperimentIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ExperimentIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 8ce4c7a02..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentDataOnDemand;
-import com.labsynch.labseer.domain.ExperimentIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ExperimentIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ExperimentIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ExperimentIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ExperimentIntegrationTest: @Transactional;
-    
-    @Autowired
-    ExperimentDataOnDemand ExperimentIntegrationTest.dod;
-    
-    @Test
-    public void ExperimentIntegrationTest.testCountExperiments() {
-        Assert.assertNotNull("Data on demand for 'Experiment' failed to initialize correctly", dod.getRandomExperiment());
-        long count = Experiment.countExperiments();
-        Assert.assertTrue("Counter for 'Experiment' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ExperimentIntegrationTest.testFindExperiment() {
-        Experiment obj = dod.getRandomExperiment();
-        Assert.assertNotNull("Data on demand for 'Experiment' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'Experiment' failed to provide an identifier", id);
-        obj = Experiment.findExperiment(id);
-        Assert.assertNotNull("Find method for 'Experiment' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'Experiment' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ExperimentIntegrationTest.testFindAllExperiments() {
-        Assert.assertNotNull("Data on demand for 'Experiment' failed to initialize correctly", dod.getRandomExperiment());
-        long count = Experiment.countExperiments();
-        Assert.assertTrue("Too expensive to perform a find all test for 'Experiment', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<Experiment> result = Experiment.findAllExperiments();
-        Assert.assertNotNull("Find all method for 'Experiment' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'Experiment' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ExperimentIntegrationTest.testFindExperimentEntries() {
-        Assert.assertNotNull("Data on demand for 'Experiment' failed to initialize correctly", dod.getRandomExperiment());
-        long count = Experiment.countExperiments();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<Experiment> result = Experiment.findExperimentEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'Experiment' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'Experiment' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ExperimentIntegrationTest.testFlush() {
-        Experiment obj = dod.getRandomExperiment();
-        Assert.assertNotNull("Data on demand for 'Experiment' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'Experiment' failed to provide an identifier", id);
-        obj = Experiment.findExperiment(id);
-        Assert.assertNotNull("Find method for 'Experiment' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyExperiment(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'Experiment' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ExperimentIntegrationTest.testMergeUpdate() {
-        Experiment obj = dod.getRandomExperiment();
-        Assert.assertNotNull("Data on demand for 'Experiment' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'Experiment' failed to provide an identifier", id);
-        obj = Experiment.findExperiment(id);
-        boolean modified =  dod.modifyExperiment(obj);
-        Integer currentVersion = obj.getVersion();
-        Experiment merged = (Experiment)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'Experiment' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ExperimentIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'Experiment' failed to initialize correctly", dod.getRandomExperiment());
-        Experiment obj = dod.getNewTransientExperiment(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'Experiment' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'Experiment' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'Experiment' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ExperimentIntegrationTest.testRemove() {
-        Experiment obj = dod.getRandomExperiment();
-        Assert.assertNotNull("Data on demand for 'Experiment' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'Experiment' failed to provide an identifier", id);
-        obj = Experiment.findExperiment(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'Experiment' with identifier '" + id + "'", Experiment.findExperiment(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ExperimentKindDataOnDemand.java
index 21b551ae8..73848f733 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentKindDataOnDemand.java
@@ -1,7 +1,108 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Component
+@Configurable
 @RooDataOnDemand(entity = ExperimentKind.class)
 public class ExperimentKindDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<ExperimentKind> data;
+
+	@Autowired
+    ExperimentTypeDataOnDemand experimentTypeDataOnDemand;
+
+	public ExperimentKind getNewTransientExperimentKind(int index) {
+        ExperimentKind obj = new ExperimentKind();
+        setKindName(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        return obj;
+    }
+
+	public void setKindName(ExperimentKind obj, int index) {
+        String kindName = "kindName_" + index;
+        if (kindName.length() > 255) {
+            kindName = kindName.substring(0, 255);
+        }
+        obj.setKindName(kindName);
+    }
+
+	public void setLsType(ExperimentKind obj, int index) {
+        ExperimentType lsType = experimentTypeDataOnDemand.getRandomExperimentType();
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(ExperimentKind obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = new Random().nextInt(10) + lsTypeAndKind.substring(1, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public ExperimentKind getSpecificExperimentKind(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        ExperimentKind obj = data.get(index);
+        Long id = obj.getId();
+        return ExperimentKind.findExperimentKind(id);
+    }
+
+	public ExperimentKind getRandomExperimentKind() {
+        init();
+        ExperimentKind obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return ExperimentKind.findExperimentKind(id);
+    }
+
+	public boolean modifyExperimentKind(ExperimentKind obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = ExperimentKind.findExperimentKindEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'ExperimentKind' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<ExperimentKind>();
+        for (int i = 0; i < 10; i++) {
+            ExperimentKind obj = getNewTransientExperimentKind(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentKindDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ExperimentKindDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 134ab73c4..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentKindDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentKindDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ExperimentKindDataOnDemand_Roo_Configurable {
-    
-    declare @type: ExperimentKindDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentKindDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ExperimentKindDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index a5a3a7815..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentKindDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,113 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentKind;
-import com.labsynch.labseer.domain.ExperimentKindDataOnDemand;
-import com.labsynch.labseer.domain.ExperimentType;
-import com.labsynch.labseer.domain.ExperimentTypeDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect ExperimentKindDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ExperimentKindDataOnDemand: @Component;
-    
-    private Random ExperimentKindDataOnDemand.rnd = new SecureRandom();
-    
-    private List<ExperimentKind> ExperimentKindDataOnDemand.data;
-    
-    @Autowired
-    ExperimentTypeDataOnDemand ExperimentKindDataOnDemand.experimentTypeDataOnDemand;
-    
-    public ExperimentKind ExperimentKindDataOnDemand.getNewTransientExperimentKind(int index) {
-        ExperimentKind obj = new ExperimentKind();
-        setKindName(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        return obj;
-    }
-    
-    public void ExperimentKindDataOnDemand.setKindName(ExperimentKind obj, int index) {
-        String kindName = "kindName_" + index;
-        if (kindName.length() > 255) {
-            kindName = kindName.substring(0, 255);
-        }
-        obj.setKindName(kindName);
-    }
-    
-    public void ExperimentKindDataOnDemand.setLsType(ExperimentKind obj, int index) {
-        ExperimentType lsType = experimentTypeDataOnDemand.getRandomExperimentType();
-        obj.setLsType(lsType);
-    }
-    
-    public void ExperimentKindDataOnDemand.setLsTypeAndKind(ExperimentKind obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = new Random().nextInt(10) + lsTypeAndKind.substring(1, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public ExperimentKind ExperimentKindDataOnDemand.getSpecificExperimentKind(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        ExperimentKind obj = data.get(index);
-        Long id = obj.getId();
-        return ExperimentKind.findExperimentKind(id);
-    }
-    
-    public ExperimentKind ExperimentKindDataOnDemand.getRandomExperimentKind() {
-        init();
-        ExperimentKind obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return ExperimentKind.findExperimentKind(id);
-    }
-    
-    public boolean ExperimentKindDataOnDemand.modifyExperimentKind(ExperimentKind obj) {
-        return false;
-    }
-    
-    public void ExperimentKindDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = ExperimentKind.findExperimentKindEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ExperimentKind' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<ExperimentKind>();
-        for (int i = 0; i < 10; i++) {
-            ExperimentKind obj = getNewTransientExperimentKind(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ExperimentKindIntegrationTest.java
index 6b5350750..3fe16db32 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentKindIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = ExperimentKind.class)
 public class ExperimentKindIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ExperimentKindDataOnDemand dod;
+
+	@Test
+    public void testCountExperimentKinds() {
+        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to initialize correctly", dod.getRandomExperimentKind());
+        long count = ExperimentKind.countExperimentKinds();
+        Assert.assertTrue("Counter for 'ExperimentKind' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindExperimentKind() {
+        ExperimentKind obj = dod.getRandomExperimentKind();
+        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to provide an identifier", id);
+        obj = ExperimentKind.findExperimentKind(id);
+        Assert.assertNotNull("Find method for 'ExperimentKind' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'ExperimentKind' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllExperimentKinds() {
+        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to initialize correctly", dod.getRandomExperimentKind());
+        long count = ExperimentKind.countExperimentKinds();
+        Assert.assertTrue("Too expensive to perform a find all test for 'ExperimentKind', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<ExperimentKind> result = ExperimentKind.findAllExperimentKinds();
+        Assert.assertNotNull("Find all method for 'ExperimentKind' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'ExperimentKind' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindExperimentKindEntries() {
+        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to initialize correctly", dod.getRandomExperimentKind());
+        long count = ExperimentKind.countExperimentKinds();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<ExperimentKind> result = ExperimentKind.findExperimentKindEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'ExperimentKind' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'ExperimentKind' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        ExperimentKind obj = dod.getRandomExperimentKind();
+        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to provide an identifier", id);
+        obj = ExperimentKind.findExperimentKind(id);
+        Assert.assertNotNull("Find method for 'ExperimentKind' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyExperimentKind(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'ExperimentKind' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        ExperimentKind obj = dod.getRandomExperimentKind();
+        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to provide an identifier", id);
+        obj = ExperimentKind.findExperimentKind(id);
+        boolean modified =  dod.modifyExperimentKind(obj);
+        Integer currentVersion = obj.getVersion();
+        ExperimentKind merged = obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'ExperimentKind' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to initialize correctly", dod.getRandomExperimentKind());
+        ExperimentKind obj = dod.getNewTransientExperimentKind(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'ExperimentKind' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'ExperimentKind' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        ExperimentKind obj = dod.getRandomExperimentKind();
+        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to provide an identifier", id);
+        obj = ExperimentKind.findExperimentKind(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'ExperimentKind' with identifier '" + id + "'", ExperimentKind.findExperimentKind(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentKindIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ExperimentKindIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index ec97f339d..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentKindIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentKindIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ExperimentKindIntegrationTest_Roo_Configurable {
-    
-    declare @type: ExperimentKindIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentKindIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ExperimentKindIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 1ca5d49f6..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentKindIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentKind;
-import com.labsynch.labseer.domain.ExperimentKindDataOnDemand;
-import com.labsynch.labseer.domain.ExperimentKindIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ExperimentKindIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ExperimentKindIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ExperimentKindIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ExperimentKindIntegrationTest: @Transactional;
-    
-    @Autowired
-    ExperimentKindDataOnDemand ExperimentKindIntegrationTest.dod;
-    
-    @Test
-    public void ExperimentKindIntegrationTest.testCountExperimentKinds() {
-        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to initialize correctly", dod.getRandomExperimentKind());
-        long count = ExperimentKind.countExperimentKinds();
-        Assert.assertTrue("Counter for 'ExperimentKind' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ExperimentKindIntegrationTest.testFindExperimentKind() {
-        ExperimentKind obj = dod.getRandomExperimentKind();
-        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to provide an identifier", id);
-        obj = ExperimentKind.findExperimentKind(id);
-        Assert.assertNotNull("Find method for 'ExperimentKind' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ExperimentKind' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ExperimentKindIntegrationTest.testFindAllExperimentKinds() {
-        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to initialize correctly", dod.getRandomExperimentKind());
-        long count = ExperimentKind.countExperimentKinds();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ExperimentKind', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<ExperimentKind> result = ExperimentKind.findAllExperimentKinds();
-        Assert.assertNotNull("Find all method for 'ExperimentKind' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ExperimentKind' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ExperimentKindIntegrationTest.testFindExperimentKindEntries() {
-        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to initialize correctly", dod.getRandomExperimentKind());
-        long count = ExperimentKind.countExperimentKinds();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<ExperimentKind> result = ExperimentKind.findExperimentKindEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'ExperimentKind' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ExperimentKind' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ExperimentKindIntegrationTest.testFlush() {
-        ExperimentKind obj = dod.getRandomExperimentKind();
-        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to provide an identifier", id);
-        obj = ExperimentKind.findExperimentKind(id);
-        Assert.assertNotNull("Find method for 'ExperimentKind' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyExperimentKind(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'ExperimentKind' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ExperimentKindIntegrationTest.testMergeUpdate() {
-        ExperimentKind obj = dod.getRandomExperimentKind();
-        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to provide an identifier", id);
-        obj = ExperimentKind.findExperimentKind(id);
-        boolean modified =  dod.modifyExperimentKind(obj);
-        Integer currentVersion = obj.getVersion();
-        ExperimentKind merged = obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ExperimentKind' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ExperimentKindIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to initialize correctly", dod.getRandomExperimentKind());
-        ExperimentKind obj = dod.getNewTransientExperimentKind(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'ExperimentKind' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'ExperimentKind' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ExperimentKindIntegrationTest.testRemove() {
-        ExperimentKind obj = dod.getRandomExperimentKind();
-        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to provide an identifier", id);
-        obj = ExperimentKind.findExperimentKind(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'ExperimentKind' with identifier '" + id + "'", ExperimentKind.findExperimentKind(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentLabelDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ExperimentLabelDataOnDemand.java
index e9af7c7bb..6f56cf6a1 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentLabelDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentLabelDataOnDemand.java
@@ -1,7 +1,189 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Component
+@Configurable
 @RooDataOnDemand(entity = ExperimentLabel.class)
 public class ExperimentLabelDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<ExperimentLabel> data;
+
+	@Autowired
+    ExperimentDataOnDemand experimentDataOnDemand;
+
+	public ExperimentLabel getNewTransientExperimentLabel(int index) {
+        ExperimentLabel obj = new ExperimentLabel();
+        setDeleted(obj, index);
+        setExperiment(obj, index);
+        setIgnored(obj, index);
+        setImageFile(obj, index);
+        setLabelText(obj, index);
+        setLsKind(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedDate(obj, index);
+        setPhysicallyLabled(obj, index);
+        setPreferred(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        return obj;
+    }
+
+	public void setDeleted(ExperimentLabel obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setExperiment(ExperimentLabel obj, int index) {
+        Experiment experiment = experimentDataOnDemand.getRandomExperiment();
+        obj.setExperiment(experiment);
+    }
+
+	public void setIgnored(ExperimentLabel obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setImageFile(ExperimentLabel obj, int index) {
+        String imageFile = "imageFile_" + index;
+        if (imageFile.length() > 255) {
+            imageFile = imageFile.substring(0, 255);
+        }
+        obj.setImageFile(imageFile);
+    }
+
+	public void setLabelText(ExperimentLabel obj, int index) {
+        String labelText = "labelText_" + index;
+        if (labelText.length() > 255) {
+            labelText = labelText.substring(0, 255);
+        }
+        obj.setLabelText(labelText);
+    }
+
+	public void setLsKind(ExperimentLabel obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsTransaction(ExperimentLabel obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(ExperimentLabel obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 64) {
+            lsType = lsType.substring(0, 64);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(ExperimentLabel obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedDate(ExperimentLabel obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setPhysicallyLabled(ExperimentLabel obj, int index) {
+        Boolean physicallyLabled = true;
+        obj.setPhysicallyLabled(physicallyLabled);
+    }
+
+	public void setPreferred(ExperimentLabel obj, int index) {
+        Boolean preferred = true;
+        obj.setPreferred(preferred);
+    }
+
+	public void setRecordedBy(ExperimentLabel obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(ExperimentLabel obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public ExperimentLabel getSpecificExperimentLabel(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        ExperimentLabel obj = data.get(index);
+        Long id = obj.getId();
+        return ExperimentLabel.findExperimentLabel(id);
+    }
+
+	public ExperimentLabel getRandomExperimentLabel() {
+        init();
+        ExperimentLabel obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return ExperimentLabel.findExperimentLabel(id);
+    }
+
+	public boolean modifyExperimentLabel(ExperimentLabel obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = ExperimentLabel.findExperimentLabelEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'ExperimentLabel' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<ExperimentLabel>();
+        for (int i = 0; i < 10; i++) {
+            ExperimentLabel obj = getNewTransientExperimentLabel(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentLabelDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ExperimentLabelDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index d330de53a..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentLabelDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentLabelDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ExperimentLabelDataOnDemand_Roo_Configurable {
-    
-    declare @type: ExperimentLabelDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentLabelDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ExperimentLabelDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 214f96eab..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentLabelDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,194 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentDataOnDemand;
-import com.labsynch.labseer.domain.ExperimentLabel;
-import com.labsynch.labseer.domain.ExperimentLabelDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect ExperimentLabelDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ExperimentLabelDataOnDemand: @Component;
-    
-    private Random ExperimentLabelDataOnDemand.rnd = new SecureRandom();
-    
-    private List<ExperimentLabel> ExperimentLabelDataOnDemand.data;
-    
-    @Autowired
-    ExperimentDataOnDemand ExperimentLabelDataOnDemand.experimentDataOnDemand;
-    
-    public ExperimentLabel ExperimentLabelDataOnDemand.getNewTransientExperimentLabel(int index) {
-        ExperimentLabel obj = new ExperimentLabel();
-        setDeleted(obj, index);
-        setExperiment(obj, index);
-        setIgnored(obj, index);
-        setImageFile(obj, index);
-        setLabelText(obj, index);
-        setLsKind(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedDate(obj, index);
-        setPhysicallyLabled(obj, index);
-        setPreferred(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        return obj;
-    }
-    
-    public void ExperimentLabelDataOnDemand.setDeleted(ExperimentLabel obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void ExperimentLabelDataOnDemand.setExperiment(ExperimentLabel obj, int index) {
-        Experiment experiment = experimentDataOnDemand.getRandomExperiment();
-        obj.setExperiment(experiment);
-    }
-    
-    public void ExperimentLabelDataOnDemand.setIgnored(ExperimentLabel obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void ExperimentLabelDataOnDemand.setImageFile(ExperimentLabel obj, int index) {
-        String imageFile = "imageFile_" + index;
-        if (imageFile.length() > 255) {
-            imageFile = imageFile.substring(0, 255);
-        }
-        obj.setImageFile(imageFile);
-    }
-    
-    public void ExperimentLabelDataOnDemand.setLabelText(ExperimentLabel obj, int index) {
-        String labelText = "labelText_" + index;
-        if (labelText.length() > 255) {
-            labelText = labelText.substring(0, 255);
-        }
-        obj.setLabelText(labelText);
-    }
-    
-    public void ExperimentLabelDataOnDemand.setLsKind(ExperimentLabel obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void ExperimentLabelDataOnDemand.setLsTransaction(ExperimentLabel obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void ExperimentLabelDataOnDemand.setLsType(ExperimentLabel obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 64) {
-            lsType = lsType.substring(0, 64);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void ExperimentLabelDataOnDemand.setLsTypeAndKind(ExperimentLabel obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void ExperimentLabelDataOnDemand.setModifiedDate(ExperimentLabel obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void ExperimentLabelDataOnDemand.setPhysicallyLabled(ExperimentLabel obj, int index) {
-        Boolean physicallyLabled = true;
-        obj.setPhysicallyLabled(physicallyLabled);
-    }
-    
-    public void ExperimentLabelDataOnDemand.setPreferred(ExperimentLabel obj, int index) {
-        Boolean preferred = true;
-        obj.setPreferred(preferred);
-    }
-    
-    public void ExperimentLabelDataOnDemand.setRecordedBy(ExperimentLabel obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void ExperimentLabelDataOnDemand.setRecordedDate(ExperimentLabel obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public ExperimentLabel ExperimentLabelDataOnDemand.getSpecificExperimentLabel(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        ExperimentLabel obj = data.get(index);
-        Long id = obj.getId();
-        return ExperimentLabel.findExperimentLabel(id);
-    }
-    
-    public ExperimentLabel ExperimentLabelDataOnDemand.getRandomExperimentLabel() {
-        init();
-        ExperimentLabel obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return ExperimentLabel.findExperimentLabel(id);
-    }
-    
-    public boolean ExperimentLabelDataOnDemand.modifyExperimentLabel(ExperimentLabel obj) {
-        return false;
-    }
-    
-    public void ExperimentLabelDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = ExperimentLabel.findExperimentLabelEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ExperimentLabel' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<ExperimentLabel>();
-        for (int i = 0; i < 10; i++) {
-            ExperimentLabel obj = getNewTransientExperimentLabel(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentLabelIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ExperimentLabelIntegrationTest.java
index 61d74617c..a2cbc2657 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentLabelIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentLabelIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = ExperimentLabel.class)
 public class ExperimentLabelIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ExperimentLabelDataOnDemand dod;
+
+	@Test
+    public void testCountExperimentLabels() {
+        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to initialize correctly", dod.getRandomExperimentLabel());
+        long count = ExperimentLabel.countExperimentLabels();
+        Assert.assertTrue("Counter for 'ExperimentLabel' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindExperimentLabel() {
+        ExperimentLabel obj = dod.getRandomExperimentLabel();
+        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to provide an identifier", id);
+        obj = ExperimentLabel.findExperimentLabel(id);
+        Assert.assertNotNull("Find method for 'ExperimentLabel' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'ExperimentLabel' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllExperimentLabels() {
+        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to initialize correctly", dod.getRandomExperimentLabel());
+        long count = ExperimentLabel.countExperimentLabels();
+        Assert.assertTrue("Too expensive to perform a find all test for 'ExperimentLabel', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<ExperimentLabel> result = ExperimentLabel.findAllExperimentLabels();
+        Assert.assertNotNull("Find all method for 'ExperimentLabel' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'ExperimentLabel' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindExperimentLabelEntries() {
+        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to initialize correctly", dod.getRandomExperimentLabel());
+        long count = ExperimentLabel.countExperimentLabels();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<ExperimentLabel> result = ExperimentLabel.findExperimentLabelEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'ExperimentLabel' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'ExperimentLabel' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        ExperimentLabel obj = dod.getRandomExperimentLabel();
+        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to provide an identifier", id);
+        obj = ExperimentLabel.findExperimentLabel(id);
+        Assert.assertNotNull("Find method for 'ExperimentLabel' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyExperimentLabel(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'ExperimentLabel' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        ExperimentLabel obj = dod.getRandomExperimentLabel();
+        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to provide an identifier", id);
+        obj = ExperimentLabel.findExperimentLabel(id);
+        boolean modified =  dod.modifyExperimentLabel(obj);
+        Integer currentVersion = obj.getVersion();
+        ExperimentLabel merged = (ExperimentLabel)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'ExperimentLabel' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to initialize correctly", dod.getRandomExperimentLabel());
+        ExperimentLabel obj = dod.getNewTransientExperimentLabel(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'ExperimentLabel' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'ExperimentLabel' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        ExperimentLabel obj = dod.getRandomExperimentLabel();
+        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to provide an identifier", id);
+        obj = ExperimentLabel.findExperimentLabel(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'ExperimentLabel' with identifier '" + id + "'", ExperimentLabel.findExperimentLabel(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentLabelIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ExperimentLabelIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 6b18ad2ed..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentLabelIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentLabelIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ExperimentLabelIntegrationTest_Roo_Configurable {
-    
-    declare @type: ExperimentLabelIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentLabelIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ExperimentLabelIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 47c7e4483..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentLabelIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentLabel;
-import com.labsynch.labseer.domain.ExperimentLabelDataOnDemand;
-import com.labsynch.labseer.domain.ExperimentLabelIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ExperimentLabelIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ExperimentLabelIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ExperimentLabelIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ExperimentLabelIntegrationTest: @Transactional;
-    
-    @Autowired
-    ExperimentLabelDataOnDemand ExperimentLabelIntegrationTest.dod;
-    
-    @Test
-    public void ExperimentLabelIntegrationTest.testCountExperimentLabels() {
-        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to initialize correctly", dod.getRandomExperimentLabel());
-        long count = ExperimentLabel.countExperimentLabels();
-        Assert.assertTrue("Counter for 'ExperimentLabel' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ExperimentLabelIntegrationTest.testFindExperimentLabel() {
-        ExperimentLabel obj = dod.getRandomExperimentLabel();
-        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to provide an identifier", id);
-        obj = ExperimentLabel.findExperimentLabel(id);
-        Assert.assertNotNull("Find method for 'ExperimentLabel' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ExperimentLabel' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ExperimentLabelIntegrationTest.testFindAllExperimentLabels() {
-        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to initialize correctly", dod.getRandomExperimentLabel());
-        long count = ExperimentLabel.countExperimentLabels();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ExperimentLabel', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<ExperimentLabel> result = ExperimentLabel.findAllExperimentLabels();
-        Assert.assertNotNull("Find all method for 'ExperimentLabel' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ExperimentLabel' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ExperimentLabelIntegrationTest.testFindExperimentLabelEntries() {
-        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to initialize correctly", dod.getRandomExperimentLabel());
-        long count = ExperimentLabel.countExperimentLabels();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<ExperimentLabel> result = ExperimentLabel.findExperimentLabelEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'ExperimentLabel' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ExperimentLabel' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ExperimentLabelIntegrationTest.testFlush() {
-        ExperimentLabel obj = dod.getRandomExperimentLabel();
-        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to provide an identifier", id);
-        obj = ExperimentLabel.findExperimentLabel(id);
-        Assert.assertNotNull("Find method for 'ExperimentLabel' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyExperimentLabel(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'ExperimentLabel' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ExperimentLabelIntegrationTest.testMergeUpdate() {
-        ExperimentLabel obj = dod.getRandomExperimentLabel();
-        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to provide an identifier", id);
-        obj = ExperimentLabel.findExperimentLabel(id);
-        boolean modified =  dod.modifyExperimentLabel(obj);
-        Integer currentVersion = obj.getVersion();
-        ExperimentLabel merged = (ExperimentLabel)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ExperimentLabel' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ExperimentLabelIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to initialize correctly", dod.getRandomExperimentLabel());
-        ExperimentLabel obj = dod.getNewTransientExperimentLabel(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'ExperimentLabel' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'ExperimentLabel' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ExperimentLabelIntegrationTest.testRemove() {
-        ExperimentLabel obj = dod.getRandomExperimentLabel();
-        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to provide an identifier", id);
-        obj = ExperimentLabel.findExperimentLabel(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'ExperimentLabel' with identifier '" + id + "'", ExperimentLabel.findExperimentLabel(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ExperimentStateDataOnDemand.java
index 792752055..c743ce27e 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentStateDataOnDemand.java
@@ -1,7 +1,177 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Configurable
+@Component
 @RooDataOnDemand(entity = ExperimentState.class)
 public class ExperimentStateDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<ExperimentState> data;
+
+	@Autowired
+    ExperimentDataOnDemand experimentDataOnDemand;
+
+	public ExperimentState getNewTransientExperimentState(int index) {
+        ExperimentState obj = new ExperimentState();
+        setComments(obj, index);
+        setDeleted(obj, index);
+        setExperiment(obj, index);
+        setIgnored(obj, index);
+        setLsKind(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedBy(obj, index);
+        setModifiedDate(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        return obj;
+    }
+
+	public void setComments(ExperimentState obj, int index) {
+        String comments = "comments_" + index;
+        if (comments.length() > 512) {
+            comments = comments.substring(0, 512);
+        }
+        obj.setComments(comments);
+    }
+
+	public void setDeleted(ExperimentState obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setExperiment(ExperimentState obj, int index) {
+        Experiment experiment = experimentDataOnDemand.getRandomExperiment();
+        obj.setExperiment(experiment);
+    }
+
+	public void setIgnored(ExperimentState obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setLsKind(ExperimentState obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsTransaction(ExperimentState obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(ExperimentState obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 64) {
+            lsType = lsType.substring(0, 64);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(ExperimentState obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedBy(ExperimentState obj, int index) {
+        String modifiedBy = "modifiedBy_" + index;
+        if (modifiedBy.length() > 255) {
+            modifiedBy = modifiedBy.substring(0, 255);
+        }
+        obj.setModifiedBy(modifiedBy);
+    }
+
+	public void setModifiedDate(ExperimentState obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setRecordedBy(ExperimentState obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(ExperimentState obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public ExperimentState getSpecificExperimentState(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        ExperimentState obj = data.get(index);
+        Long id = obj.getId();
+        return ExperimentState.findExperimentState(id);
+    }
+
+	public ExperimentState getRandomExperimentState() {
+        init();
+        ExperimentState obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return ExperimentState.findExperimentState(id);
+    }
+
+	public boolean modifyExperimentState(ExperimentState obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = ExperimentState.findExperimentStateEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'ExperimentState' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<ExperimentState>();
+        for (int i = 0; i < 10; i++) {
+            ExperimentState obj = getNewTransientExperimentState(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentStateDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ExperimentStateDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index bfd94e60f..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentStateDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentStateDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ExperimentStateDataOnDemand_Roo_Configurable {
-    
-    declare @type: ExperimentStateDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentStateDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ExperimentStateDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index ce9454bb9..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentStateDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,182 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentDataOnDemand;
-import com.labsynch.labseer.domain.ExperimentState;
-import com.labsynch.labseer.domain.ExperimentStateDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect ExperimentStateDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ExperimentStateDataOnDemand: @Component;
-    
-    private Random ExperimentStateDataOnDemand.rnd = new SecureRandom();
-    
-    private List<ExperimentState> ExperimentStateDataOnDemand.data;
-    
-    @Autowired
-    ExperimentDataOnDemand ExperimentStateDataOnDemand.experimentDataOnDemand;
-    
-    public ExperimentState ExperimentStateDataOnDemand.getNewTransientExperimentState(int index) {
-        ExperimentState obj = new ExperimentState();
-        setComments(obj, index);
-        setDeleted(obj, index);
-        setExperiment(obj, index);
-        setIgnored(obj, index);
-        setLsKind(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedBy(obj, index);
-        setModifiedDate(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        return obj;
-    }
-    
-    public void ExperimentStateDataOnDemand.setComments(ExperimentState obj, int index) {
-        String comments = "comments_" + index;
-        if (comments.length() > 512) {
-            comments = comments.substring(0, 512);
-        }
-        obj.setComments(comments);
-    }
-    
-    public void ExperimentStateDataOnDemand.setDeleted(ExperimentState obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void ExperimentStateDataOnDemand.setExperiment(ExperimentState obj, int index) {
-        Experiment experiment = experimentDataOnDemand.getRandomExperiment();
-        obj.setExperiment(experiment);
-    }
-    
-    public void ExperimentStateDataOnDemand.setIgnored(ExperimentState obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void ExperimentStateDataOnDemand.setLsKind(ExperimentState obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void ExperimentStateDataOnDemand.setLsTransaction(ExperimentState obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void ExperimentStateDataOnDemand.setLsType(ExperimentState obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 64) {
-            lsType = lsType.substring(0, 64);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void ExperimentStateDataOnDemand.setLsTypeAndKind(ExperimentState obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void ExperimentStateDataOnDemand.setModifiedBy(ExperimentState obj, int index) {
-        String modifiedBy = "modifiedBy_" + index;
-        if (modifiedBy.length() > 255) {
-            modifiedBy = modifiedBy.substring(0, 255);
-        }
-        obj.setModifiedBy(modifiedBy);
-    }
-    
-    public void ExperimentStateDataOnDemand.setModifiedDate(ExperimentState obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void ExperimentStateDataOnDemand.setRecordedBy(ExperimentState obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void ExperimentStateDataOnDemand.setRecordedDate(ExperimentState obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public ExperimentState ExperimentStateDataOnDemand.getSpecificExperimentState(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        ExperimentState obj = data.get(index);
-        Long id = obj.getId();
-        return ExperimentState.findExperimentState(id);
-    }
-    
-    public ExperimentState ExperimentStateDataOnDemand.getRandomExperimentState() {
-        init();
-        ExperimentState obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return ExperimentState.findExperimentState(id);
-    }
-    
-    public boolean ExperimentStateDataOnDemand.modifyExperimentState(ExperimentState obj) {
-        return false;
-    }
-    
-    public void ExperimentStateDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = ExperimentState.findExperimentStateEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ExperimentState' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<ExperimentState>();
-        for (int i = 0; i < 10; i++) {
-            ExperimentState obj = getNewTransientExperimentState(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ExperimentStateIntegrationTest.java
index eef41b2e2..033a496ef 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentStateIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = ExperimentState.class)
 public class ExperimentStateIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ExperimentStateDataOnDemand dod;
+
+	@Test
+    public void testCountExperimentStates() {
+        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to initialize correctly", dod.getRandomExperimentState());
+        long count = ExperimentState.countExperimentStates();
+        Assert.assertTrue("Counter for 'ExperimentState' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindExperimentState() {
+        ExperimentState obj = dod.getRandomExperimentState();
+        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to provide an identifier", id);
+        obj = ExperimentState.findExperimentState(id);
+        Assert.assertNotNull("Find method for 'ExperimentState' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'ExperimentState' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllExperimentStates() {
+        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to initialize correctly", dod.getRandomExperimentState());
+        long count = ExperimentState.countExperimentStates();
+        Assert.assertTrue("Too expensive to perform a find all test for 'ExperimentState', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<ExperimentState> result = ExperimentState.findAllExperimentStates();
+        Assert.assertNotNull("Find all method for 'ExperimentState' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'ExperimentState' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindExperimentStateEntries() {
+        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to initialize correctly", dod.getRandomExperimentState());
+        long count = ExperimentState.countExperimentStates();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<ExperimentState> result = ExperimentState.findExperimentStateEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'ExperimentState' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'ExperimentState' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        ExperimentState obj = dod.getRandomExperimentState();
+        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to provide an identifier", id);
+        obj = ExperimentState.findExperimentState(id);
+        Assert.assertNotNull("Find method for 'ExperimentState' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyExperimentState(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'ExperimentState' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        ExperimentState obj = dod.getRandomExperimentState();
+        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to provide an identifier", id);
+        obj = ExperimentState.findExperimentState(id);
+        boolean modified =  dod.modifyExperimentState(obj);
+        Integer currentVersion = obj.getVersion();
+        ExperimentState merged = (ExperimentState)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'ExperimentState' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to initialize correctly", dod.getRandomExperimentState());
+        ExperimentState obj = dod.getNewTransientExperimentState(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'ExperimentState' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'ExperimentState' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        ExperimentState obj = dod.getRandomExperimentState();
+        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to provide an identifier", id);
+        obj = ExperimentState.findExperimentState(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'ExperimentState' with identifier '" + id + "'", ExperimentState.findExperimentState(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentStateIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ExperimentStateIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 3e76dfa22..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentStateIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentStateIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ExperimentStateIntegrationTest_Roo_Configurable {
-    
-    declare @type: ExperimentStateIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentStateIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ExperimentStateIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index afe06c5fb..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentStateIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentState;
-import com.labsynch.labseer.domain.ExperimentStateDataOnDemand;
-import com.labsynch.labseer.domain.ExperimentStateIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ExperimentStateIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ExperimentStateIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ExperimentStateIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ExperimentStateIntegrationTest: @Transactional;
-    
-    @Autowired
-    ExperimentStateDataOnDemand ExperimentStateIntegrationTest.dod;
-    
-    @Test
-    public void ExperimentStateIntegrationTest.testCountExperimentStates() {
-        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to initialize correctly", dod.getRandomExperimentState());
-        long count = ExperimentState.countExperimentStates();
-        Assert.assertTrue("Counter for 'ExperimentState' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ExperimentStateIntegrationTest.testFindExperimentState() {
-        ExperimentState obj = dod.getRandomExperimentState();
-        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to provide an identifier", id);
-        obj = ExperimentState.findExperimentState(id);
-        Assert.assertNotNull("Find method for 'ExperimentState' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ExperimentState' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ExperimentStateIntegrationTest.testFindAllExperimentStates() {
-        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to initialize correctly", dod.getRandomExperimentState());
-        long count = ExperimentState.countExperimentStates();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ExperimentState', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<ExperimentState> result = ExperimentState.findAllExperimentStates();
-        Assert.assertNotNull("Find all method for 'ExperimentState' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ExperimentState' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ExperimentStateIntegrationTest.testFindExperimentStateEntries() {
-        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to initialize correctly", dod.getRandomExperimentState());
-        long count = ExperimentState.countExperimentStates();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<ExperimentState> result = ExperimentState.findExperimentStateEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'ExperimentState' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ExperimentState' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ExperimentStateIntegrationTest.testFlush() {
-        ExperimentState obj = dod.getRandomExperimentState();
-        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to provide an identifier", id);
-        obj = ExperimentState.findExperimentState(id);
-        Assert.assertNotNull("Find method for 'ExperimentState' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyExperimentState(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'ExperimentState' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ExperimentStateIntegrationTest.testMergeUpdate() {
-        ExperimentState obj = dod.getRandomExperimentState();
-        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to provide an identifier", id);
-        obj = ExperimentState.findExperimentState(id);
-        boolean modified =  dod.modifyExperimentState(obj);
-        Integer currentVersion = obj.getVersion();
-        ExperimentState merged = (ExperimentState)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ExperimentState' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ExperimentStateIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to initialize correctly", dod.getRandomExperimentState());
-        ExperimentState obj = dod.getNewTransientExperimentState(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'ExperimentState' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'ExperimentState' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ExperimentStateIntegrationTest.testRemove() {
-        ExperimentState obj = dod.getRandomExperimentState();
-        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to provide an identifier", id);
-        obj = ExperimentState.findExperimentState(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'ExperimentState' with identifier '" + id + "'", ExperimentState.findExperimentState(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ExperimentTypeDataOnDemand.java
index 0b9a8a5b3..de73729a3 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentTypeDataOnDemand.java
@@ -1,7 +1,89 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Component
+@Configurable
 @RooDataOnDemand(entity = ExperimentType.class)
 public class ExperimentTypeDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<ExperimentType> data;
+
+	public ExperimentType getNewTransientExperimentType(int index) {
+        ExperimentType obj = new ExperimentType();
+        setTypeName(obj, index);
+        return obj;
+    }
+
+	public void setTypeName(ExperimentType obj, int index) {
+        String typeName = "typeName_" + index;
+        if (typeName.length() > 128) {
+            typeName = new Random().nextInt(10) + typeName.substring(1, 128);
+        }
+        obj.setTypeName(typeName);
+    }
+
+	public ExperimentType getSpecificExperimentType(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        ExperimentType obj = data.get(index);
+        Long id = obj.getId();
+        return ExperimentType.findExperimentType(id);
+    }
+
+	public ExperimentType getRandomExperimentType() {
+        init();
+        ExperimentType obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return ExperimentType.findExperimentType(id);
+    }
+
+	public boolean modifyExperimentType(ExperimentType obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = ExperimentType.findExperimentTypeEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'ExperimentType' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<ExperimentType>();
+        for (int i = 0; i < 10; i++) {
+            ExperimentType obj = getNewTransientExperimentType(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentTypeDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ExperimentTypeDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 8a7dcb500..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentTypeDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentTypeDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ExperimentTypeDataOnDemand_Roo_Configurable {
-    
-    declare @type: ExperimentTypeDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentTypeDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ExperimentTypeDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index c4b721700..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentTypeDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,92 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentType;
-import com.labsynch.labseer.domain.ExperimentTypeDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.stereotype.Component;
-
-privileged aspect ExperimentTypeDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ExperimentTypeDataOnDemand: @Component;
-    
-    private Random ExperimentTypeDataOnDemand.rnd = new SecureRandom();
-    
-    private List<ExperimentType> ExperimentTypeDataOnDemand.data;
-    
-    public ExperimentType ExperimentTypeDataOnDemand.getNewTransientExperimentType(int index) {
-        ExperimentType obj = new ExperimentType();
-        setTypeName(obj, index);
-        return obj;
-    }
-    
-    public void ExperimentTypeDataOnDemand.setTypeName(ExperimentType obj, int index) {
-        String typeName = "typeName_" + index;
-        if (typeName.length() > 128) {
-            typeName = new Random().nextInt(10) + typeName.substring(1, 128);
-        }
-        obj.setTypeName(typeName);
-    }
-    
-    public ExperimentType ExperimentTypeDataOnDemand.getSpecificExperimentType(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        ExperimentType obj = data.get(index);
-        Long id = obj.getId();
-        return ExperimentType.findExperimentType(id);
-    }
-    
-    public ExperimentType ExperimentTypeDataOnDemand.getRandomExperimentType() {
-        init();
-        ExperimentType obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return ExperimentType.findExperimentType(id);
-    }
-    
-    public boolean ExperimentTypeDataOnDemand.modifyExperimentType(ExperimentType obj) {
-        return false;
-    }
-    
-    public void ExperimentTypeDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = ExperimentType.findExperimentTypeEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ExperimentType' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<ExperimentType>();
-        for (int i = 0; i < 10; i++) {
-            ExperimentType obj = getNewTransientExperimentType(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ExperimentTypeIntegrationTest.java
index 7ce529c53..b0e5f6826 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentTypeIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = ExperimentType.class)
 public class ExperimentTypeIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ExperimentTypeDataOnDemand dod;
+
+	@Test
+    public void testCountExperimentTypes() {
+        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to initialize correctly", dod.getRandomExperimentType());
+        long count = ExperimentType.countExperimentTypes();
+        Assert.assertTrue("Counter for 'ExperimentType' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindExperimentType() {
+        ExperimentType obj = dod.getRandomExperimentType();
+        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to provide an identifier", id);
+        obj = ExperimentType.findExperimentType(id);
+        Assert.assertNotNull("Find method for 'ExperimentType' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'ExperimentType' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllExperimentTypes() {
+        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to initialize correctly", dod.getRandomExperimentType());
+        long count = ExperimentType.countExperimentTypes();
+        Assert.assertTrue("Too expensive to perform a find all test for 'ExperimentType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<ExperimentType> result = ExperimentType.findAllExperimentTypes();
+        Assert.assertNotNull("Find all method for 'ExperimentType' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'ExperimentType' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindExperimentTypeEntries() {
+        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to initialize correctly", dod.getRandomExperimentType());
+        long count = ExperimentType.countExperimentTypes();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<ExperimentType> result = ExperimentType.findExperimentTypeEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'ExperimentType' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'ExperimentType' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        ExperimentType obj = dod.getRandomExperimentType();
+        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to provide an identifier", id);
+        obj = ExperimentType.findExperimentType(id);
+        Assert.assertNotNull("Find method for 'ExperimentType' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyExperimentType(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'ExperimentType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        ExperimentType obj = dod.getRandomExperimentType();
+        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to provide an identifier", id);
+        obj = ExperimentType.findExperimentType(id);
+        boolean modified =  dod.modifyExperimentType(obj);
+        Integer currentVersion = obj.getVersion();
+        ExperimentType merged = obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'ExperimentType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to initialize correctly", dod.getRandomExperimentType());
+        ExperimentType obj = dod.getNewTransientExperimentType(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'ExperimentType' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'ExperimentType' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        ExperimentType obj = dod.getRandomExperimentType();
+        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to provide an identifier", id);
+        obj = ExperimentType.findExperimentType(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'ExperimentType' with identifier '" + id + "'", ExperimentType.findExperimentType(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentTypeIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ExperimentTypeIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 873310564..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentTypeIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentTypeIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ExperimentTypeIntegrationTest_Roo_Configurable {
-    
-    declare @type: ExperimentTypeIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentTypeIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ExperimentTypeIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 25118931b..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentTypeIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentType;
-import com.labsynch.labseer.domain.ExperimentTypeDataOnDemand;
-import com.labsynch.labseer.domain.ExperimentTypeIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ExperimentTypeIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ExperimentTypeIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ExperimentTypeIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ExperimentTypeIntegrationTest: @Transactional;
-    
-    @Autowired
-    ExperimentTypeDataOnDemand ExperimentTypeIntegrationTest.dod;
-    
-    @Test
-    public void ExperimentTypeIntegrationTest.testCountExperimentTypes() {
-        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to initialize correctly", dod.getRandomExperimentType());
-        long count = ExperimentType.countExperimentTypes();
-        Assert.assertTrue("Counter for 'ExperimentType' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ExperimentTypeIntegrationTest.testFindExperimentType() {
-        ExperimentType obj = dod.getRandomExperimentType();
-        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to provide an identifier", id);
-        obj = ExperimentType.findExperimentType(id);
-        Assert.assertNotNull("Find method for 'ExperimentType' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ExperimentType' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ExperimentTypeIntegrationTest.testFindAllExperimentTypes() {
-        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to initialize correctly", dod.getRandomExperimentType());
-        long count = ExperimentType.countExperimentTypes();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ExperimentType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<ExperimentType> result = ExperimentType.findAllExperimentTypes();
-        Assert.assertNotNull("Find all method for 'ExperimentType' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ExperimentType' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ExperimentTypeIntegrationTest.testFindExperimentTypeEntries() {
-        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to initialize correctly", dod.getRandomExperimentType());
-        long count = ExperimentType.countExperimentTypes();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<ExperimentType> result = ExperimentType.findExperimentTypeEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'ExperimentType' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ExperimentType' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ExperimentTypeIntegrationTest.testFlush() {
-        ExperimentType obj = dod.getRandomExperimentType();
-        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to provide an identifier", id);
-        obj = ExperimentType.findExperimentType(id);
-        Assert.assertNotNull("Find method for 'ExperimentType' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyExperimentType(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'ExperimentType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ExperimentTypeIntegrationTest.testMergeUpdate() {
-        ExperimentType obj = dod.getRandomExperimentType();
-        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to provide an identifier", id);
-        obj = ExperimentType.findExperimentType(id);
-        boolean modified =  dod.modifyExperimentType(obj);
-        Integer currentVersion = obj.getVersion();
-        ExperimentType merged = obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ExperimentType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ExperimentTypeIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to initialize correctly", dod.getRandomExperimentType());
-        ExperimentType obj = dod.getNewTransientExperimentType(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'ExperimentType' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'ExperimentType' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ExperimentTypeIntegrationTest.testRemove() {
-        ExperimentType obj = dod.getRandomExperimentType();
-        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to provide an identifier", id);
-        obj = ExperimentType.findExperimentType(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'ExperimentType' with identifier '" + id + "'", ExperimentType.findExperimentType(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ExperimentValueDataOnDemand.java
index c4ecc9be2..ae1612ac7 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentValueDataOnDemand.java
@@ -1,7 +1,382 @@
 package com.labsynch.labseer.domain;
 
+import java.math.BigDecimal;
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Component
+@Configurable
 @RooDataOnDemand(entity = ExperimentValue.class)
 public class ExperimentValueDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<ExperimentValue> data;
+
+	@Autowired
+    ExperimentStateDataOnDemand experimentStateDataOnDemand;
+
+	public ExperimentValue getNewTransientExperimentValue(int index) {
+        ExperimentValue obj = new ExperimentValue();
+        setBlobValue(obj, index);
+        setClobValue(obj, index);
+        setCodeKind(obj, index);
+        setCodeOrigin(obj, index);
+        setCodeType(obj, index);
+        setCodeTypeAndKind(obj, index);
+        setCodeValue(obj, index);
+        setComments(obj, index);
+        setConcUnit(obj, index);
+        setConcentration(obj, index);
+        setDateValue(obj, index);
+        setDeleted(obj, index);
+        setFileValue(obj, index);
+        setIgnored(obj, index);
+        setLsKind(obj, index);
+        setLsState(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedBy(obj, index);
+        setModifiedDate(obj, index);
+        setNumberOfReplicates(obj, index);
+        setNumericValue(obj, index);
+        setOperatorKind(obj, index);
+        setOperatorType(obj, index);
+        setOperatorTypeAndKind(obj, index);
+        setPublicData(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        setSigFigs(obj, index);
+        setStringValue(obj, index);
+        setUncertainty(obj, index);
+        setUncertaintyType(obj, index);
+        setUnitKind(obj, index);
+        setUnitType(obj, index);
+        setUnitTypeAndKind(obj, index);
+        setUrlValue(obj, index);
+        return obj;
+    }
+
+	public void setBlobValue(ExperimentValue obj, int index) {
+        byte[] blobValue = String.valueOf(index).getBytes();
+        obj.setBlobValue(blobValue);
+    }
+
+	public void setClobValue(ExperimentValue obj, int index) {
+        String clobValue = "clobValue_" + index;
+        obj.setClobValue(clobValue);
+    }
+
+	public void setCodeKind(ExperimentValue obj, int index) {
+        String codeKind = "codeKind_" + index;
+        if (codeKind.length() > 255) {
+            codeKind = codeKind.substring(0, 255);
+        }
+        obj.setCodeKind(codeKind);
+    }
+
+	public void setCodeOrigin(ExperimentValue obj, int index) {
+        String codeOrigin = "codeOrigin_" + index;
+        if (codeOrigin.length() > 255) {
+            codeOrigin = codeOrigin.substring(0, 255);
+        }
+        obj.setCodeOrigin(codeOrigin);
+    }
+
+	public void setCodeType(ExperimentValue obj, int index) {
+        String codeType = "codeType_" + index;
+        if (codeType.length() > 255) {
+            codeType = codeType.substring(0, 255);
+        }
+        obj.setCodeType(codeType);
+    }
+
+	public void setCodeTypeAndKind(ExperimentValue obj, int index) {
+        String codeTypeAndKind = "codeTypeAndKind_" + index;
+        if (codeTypeAndKind.length() > 350) {
+            codeTypeAndKind = codeTypeAndKind.substring(0, 350);
+        }
+        obj.setCodeTypeAndKind(codeTypeAndKind);
+    }
+
+	public void setCodeValue(ExperimentValue obj, int index) {
+        String codeValue = "codeValue_" + index;
+        if (codeValue.length() > 255) {
+            codeValue = codeValue.substring(0, 255);
+        }
+        obj.setCodeValue(codeValue);
+    }
+
+	public void setComments(ExperimentValue obj, int index) {
+        String comments = "comments_" + index;
+        if (comments.length() > 512) {
+            comments = comments.substring(0, 512);
+        }
+        obj.setComments(comments);
+    }
+
+	public void setConcUnit(ExperimentValue obj, int index) {
+        String concUnit = "concUnit_" + index;
+        if (concUnit.length() > 25) {
+            concUnit = concUnit.substring(0, 25);
+        }
+        obj.setConcUnit(concUnit);
+    }
+
+	public void setConcentration(ExperimentValue obj, int index) {
+        Double concentration = new Integer(index).doubleValue();
+        obj.setConcentration(concentration);
+    }
+
+	public void setDateValue(ExperimentValue obj, int index) {
+        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setDateValue(dateValue);
+    }
+
+	public void setDeleted(ExperimentValue obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setFileValue(ExperimentValue obj, int index) {
+        String fileValue = "fileValue_" + index;
+        if (fileValue.length() > 512) {
+            fileValue = fileValue.substring(0, 512);
+        }
+        obj.setFileValue(fileValue);
+    }
+
+	public void setIgnored(ExperimentValue obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setLsKind(ExperimentValue obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsState(ExperimentValue obj, int index) {
+        ExperimentState lsState = experimentStateDataOnDemand.getRandomExperimentState();
+        obj.setLsState(lsState);
+    }
+
+	public void setLsTransaction(ExperimentValue obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(ExperimentValue obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 64) {
+            lsType = lsType.substring(0, 64);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(ExperimentValue obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 350) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 350);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedBy(ExperimentValue obj, int index) {
+        String modifiedBy = "modifiedBy_" + index;
+        if (modifiedBy.length() > 255) {
+            modifiedBy = modifiedBy.substring(0, 255);
+        }
+        obj.setModifiedBy(modifiedBy);
+    }
+
+	public void setModifiedDate(ExperimentValue obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setNumberOfReplicates(ExperimentValue obj, int index) {
+        Integer numberOfReplicates = new Integer(index);
+        obj.setNumberOfReplicates(numberOfReplicates);
+    }
+
+	public void setNumericValue(ExperimentValue obj, int index) {
+        BigDecimal numericValue = BigDecimal.valueOf(index);
+        if (numericValue.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
+            numericValue = new BigDecimal("99999999999999999999.999999999999999999");
+        }
+        obj.setNumericValue(numericValue);
+    }
+
+	public void setOperatorKind(ExperimentValue obj, int index) {
+        String operatorKind = "operator_" + index;
+        if (operatorKind.length() > 10) {
+            operatorKind = operatorKind.substring(0, 10);
+        }
+        obj.setOperatorKind(operatorKind);
+    }
+
+	public void setOperatorType(ExperimentValue obj, int index) {
+        String operatorType = "operatorType_" + index;
+        if (operatorType.length() > 25) {
+            operatorType = operatorType.substring(0, 25);
+        }
+        obj.setOperatorType(operatorType);
+    }
+
+	public void setOperatorTypeAndKind(ExperimentValue obj, int index) {
+        String operatorTypeAndKind = "operatorTypeAndKind_" + index;
+        if (operatorTypeAndKind.length() > 50) {
+            operatorTypeAndKind = operatorTypeAndKind.substring(0, 50);
+        }
+        obj.setOperatorTypeAndKind(operatorTypeAndKind);
+    }
+
+	public void setPublicData(ExperimentValue obj, int index) {
+        Boolean publicData = true;
+        obj.setPublicData(publicData);
+    }
+
+	public void setRecordedBy(ExperimentValue obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(ExperimentValue obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public void setSigFigs(ExperimentValue obj, int index) {
+        Integer sigFigs = new Integer(index);
+        obj.setSigFigs(sigFigs);
+    }
+
+	public void setStringValue(ExperimentValue obj, int index) {
+        String stringValue = "stringValue_" + index;
+        if (stringValue.length() > 255) {
+            stringValue = stringValue.substring(0, 255);
+        }
+        obj.setStringValue(stringValue);
+    }
+
+	public void setUncertainty(ExperimentValue obj, int index) {
+        BigDecimal uncertainty = BigDecimal.valueOf(index);
+        if (uncertainty.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
+            uncertainty = new BigDecimal("99999999999999999999.999999999999999999");
+        }
+        obj.setUncertainty(uncertainty);
+    }
+
+	public void setUncertaintyType(ExperimentValue obj, int index) {
+        String uncertaintyType = "uncertaintyType_" + index;
+        if (uncertaintyType.length() > 255) {
+            uncertaintyType = uncertaintyType.substring(0, 255);
+        }
+        obj.setUncertaintyType(uncertaintyType);
+    }
+
+	public void setUnitKind(ExperimentValue obj, int index) {
+        String unitKind = "unitKind_" + index;
+        if (unitKind.length() > 25) {
+            unitKind = unitKind.substring(0, 25);
+        }
+        obj.setUnitKind(unitKind);
+    }
+
+	public void setUnitType(ExperimentValue obj, int index) {
+        String unitType = "unitType_" + index;
+        if (unitType.length() > 25) {
+            unitType = unitType.substring(0, 25);
+        }
+        obj.setUnitType(unitType);
+    }
+
+	public void setUnitTypeAndKind(ExperimentValue obj, int index) {
+        String unitTypeAndKind = "unitTypeAndKind_" + index;
+        if (unitTypeAndKind.length() > 55) {
+            unitTypeAndKind = unitTypeAndKind.substring(0, 55);
+        }
+        obj.setUnitTypeAndKind(unitTypeAndKind);
+    }
+
+	public void setUrlValue(ExperimentValue obj, int index) {
+        String urlValue = "urlValue_" + index;
+        if (urlValue.length() > 2000) {
+            urlValue = urlValue.substring(0, 2000);
+        }
+        obj.setUrlValue(urlValue);
+    }
+
+	public ExperimentValue getSpecificExperimentValue(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        ExperimentValue obj = data.get(index);
+        Long id = obj.getId();
+        return ExperimentValue.findExperimentValue(id);
+    }
+
+	public ExperimentValue getRandomExperimentValue() {
+        init();
+        ExperimentValue obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return ExperimentValue.findExperimentValue(id);
+    }
+
+	public boolean modifyExperimentValue(ExperimentValue obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = ExperimentValue.findExperimentValueEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'ExperimentValue' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<ExperimentValue>();
+        for (int i = 0; i < 10; i++) {
+            ExperimentValue obj = getNewTransientExperimentValue(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentValueDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ExperimentValueDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 757019065..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentValueDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentValueDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ExperimentValueDataOnDemand_Roo_Configurable {
-    
-    declare @type: ExperimentValueDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentValueDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ExperimentValueDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 1b2343d13..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentValueDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,387 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentState;
-import com.labsynch.labseer.domain.ExperimentStateDataOnDemand;
-import com.labsynch.labseer.domain.ExperimentValue;
-import com.labsynch.labseer.domain.ExperimentValueDataOnDemand;
-import java.math.BigDecimal;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect ExperimentValueDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ExperimentValueDataOnDemand: @Component;
-    
-    private Random ExperimentValueDataOnDemand.rnd = new SecureRandom();
-    
-    private List<ExperimentValue> ExperimentValueDataOnDemand.data;
-    
-    @Autowired
-    ExperimentStateDataOnDemand ExperimentValueDataOnDemand.experimentStateDataOnDemand;
-    
-    public ExperimentValue ExperimentValueDataOnDemand.getNewTransientExperimentValue(int index) {
-        ExperimentValue obj = new ExperimentValue();
-        setBlobValue(obj, index);
-        setClobValue(obj, index);
-        setCodeKind(obj, index);
-        setCodeOrigin(obj, index);
-        setCodeType(obj, index);
-        setCodeTypeAndKind(obj, index);
-        setCodeValue(obj, index);
-        setComments(obj, index);
-        setConcUnit(obj, index);
-        setConcentration(obj, index);
-        setDateValue(obj, index);
-        setDeleted(obj, index);
-        setFileValue(obj, index);
-        setIgnored(obj, index);
-        setLsKind(obj, index);
-        setLsState(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedBy(obj, index);
-        setModifiedDate(obj, index);
-        setNumberOfReplicates(obj, index);
-        setNumericValue(obj, index);
-        setOperatorKind(obj, index);
-        setOperatorType(obj, index);
-        setOperatorTypeAndKind(obj, index);
-        setPublicData(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        setSigFigs(obj, index);
-        setStringValue(obj, index);
-        setUncertainty(obj, index);
-        setUncertaintyType(obj, index);
-        setUnitKind(obj, index);
-        setUnitType(obj, index);
-        setUnitTypeAndKind(obj, index);
-        setUrlValue(obj, index);
-        return obj;
-    }
-    
-    public void ExperimentValueDataOnDemand.setBlobValue(ExperimentValue obj, int index) {
-        byte[] blobValue = String.valueOf(index).getBytes();
-        obj.setBlobValue(blobValue);
-    }
-    
-    public void ExperimentValueDataOnDemand.setClobValue(ExperimentValue obj, int index) {
-        String clobValue = "clobValue_" + index;
-        obj.setClobValue(clobValue);
-    }
-    
-    public void ExperimentValueDataOnDemand.setCodeKind(ExperimentValue obj, int index) {
-        String codeKind = "codeKind_" + index;
-        if (codeKind.length() > 255) {
-            codeKind = codeKind.substring(0, 255);
-        }
-        obj.setCodeKind(codeKind);
-    }
-    
-    public void ExperimentValueDataOnDemand.setCodeOrigin(ExperimentValue obj, int index) {
-        String codeOrigin = "codeOrigin_" + index;
-        if (codeOrigin.length() > 255) {
-            codeOrigin = codeOrigin.substring(0, 255);
-        }
-        obj.setCodeOrigin(codeOrigin);
-    }
-    
-    public void ExperimentValueDataOnDemand.setCodeType(ExperimentValue obj, int index) {
-        String codeType = "codeType_" + index;
-        if (codeType.length() > 255) {
-            codeType = codeType.substring(0, 255);
-        }
-        obj.setCodeType(codeType);
-    }
-    
-    public void ExperimentValueDataOnDemand.setCodeTypeAndKind(ExperimentValue obj, int index) {
-        String codeTypeAndKind = "codeTypeAndKind_" + index;
-        if (codeTypeAndKind.length() > 350) {
-            codeTypeAndKind = codeTypeAndKind.substring(0, 350);
-        }
-        obj.setCodeTypeAndKind(codeTypeAndKind);
-    }
-    
-    public void ExperimentValueDataOnDemand.setCodeValue(ExperimentValue obj, int index) {
-        String codeValue = "codeValue_" + index;
-        if (codeValue.length() > 255) {
-            codeValue = codeValue.substring(0, 255);
-        }
-        obj.setCodeValue(codeValue);
-    }
-    
-    public void ExperimentValueDataOnDemand.setComments(ExperimentValue obj, int index) {
-        String comments = "comments_" + index;
-        if (comments.length() > 512) {
-            comments = comments.substring(0, 512);
-        }
-        obj.setComments(comments);
-    }
-    
-    public void ExperimentValueDataOnDemand.setConcUnit(ExperimentValue obj, int index) {
-        String concUnit = "concUnit_" + index;
-        if (concUnit.length() > 25) {
-            concUnit = concUnit.substring(0, 25);
-        }
-        obj.setConcUnit(concUnit);
-    }
-    
-    public void ExperimentValueDataOnDemand.setConcentration(ExperimentValue obj, int index) {
-        Double concentration = new Integer(index).doubleValue();
-        obj.setConcentration(concentration);
-    }
-    
-    public void ExperimentValueDataOnDemand.setDateValue(ExperimentValue obj, int index) {
-        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setDateValue(dateValue);
-    }
-    
-    public void ExperimentValueDataOnDemand.setDeleted(ExperimentValue obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void ExperimentValueDataOnDemand.setFileValue(ExperimentValue obj, int index) {
-        String fileValue = "fileValue_" + index;
-        if (fileValue.length() > 512) {
-            fileValue = fileValue.substring(0, 512);
-        }
-        obj.setFileValue(fileValue);
-    }
-    
-    public void ExperimentValueDataOnDemand.setIgnored(ExperimentValue obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void ExperimentValueDataOnDemand.setLsKind(ExperimentValue obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void ExperimentValueDataOnDemand.setLsState(ExperimentValue obj, int index) {
-        ExperimentState lsState = experimentStateDataOnDemand.getRandomExperimentState();
-        obj.setLsState(lsState);
-    }
-    
-    public void ExperimentValueDataOnDemand.setLsTransaction(ExperimentValue obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void ExperimentValueDataOnDemand.setLsType(ExperimentValue obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 64) {
-            lsType = lsType.substring(0, 64);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void ExperimentValueDataOnDemand.setLsTypeAndKind(ExperimentValue obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 350) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 350);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void ExperimentValueDataOnDemand.setModifiedBy(ExperimentValue obj, int index) {
-        String modifiedBy = "modifiedBy_" + index;
-        if (modifiedBy.length() > 255) {
-            modifiedBy = modifiedBy.substring(0, 255);
-        }
-        obj.setModifiedBy(modifiedBy);
-    }
-    
-    public void ExperimentValueDataOnDemand.setModifiedDate(ExperimentValue obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void ExperimentValueDataOnDemand.setNumberOfReplicates(ExperimentValue obj, int index) {
-        Integer numberOfReplicates = new Integer(index);
-        obj.setNumberOfReplicates(numberOfReplicates);
-    }
-    
-    public void ExperimentValueDataOnDemand.setNumericValue(ExperimentValue obj, int index) {
-        BigDecimal numericValue = BigDecimal.valueOf(index);
-        if (numericValue.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
-            numericValue = new BigDecimal("99999999999999999999.999999999999999999");
-        }
-        obj.setNumericValue(numericValue);
-    }
-    
-    public void ExperimentValueDataOnDemand.setOperatorKind(ExperimentValue obj, int index) {
-        String operatorKind = "operator_" + index;
-        if (operatorKind.length() > 10) {
-            operatorKind = operatorKind.substring(0, 10);
-        }
-        obj.setOperatorKind(operatorKind);
-    }
-    
-    public void ExperimentValueDataOnDemand.setOperatorType(ExperimentValue obj, int index) {
-        String operatorType = "operatorType_" + index;
-        if (operatorType.length() > 25) {
-            operatorType = operatorType.substring(0, 25);
-        }
-        obj.setOperatorType(operatorType);
-    }
-    
-    public void ExperimentValueDataOnDemand.setOperatorTypeAndKind(ExperimentValue obj, int index) {
-        String operatorTypeAndKind = "operatorTypeAndKind_" + index;
-        if (operatorTypeAndKind.length() > 50) {
-            operatorTypeAndKind = operatorTypeAndKind.substring(0, 50);
-        }
-        obj.setOperatorTypeAndKind(operatorTypeAndKind);
-    }
-    
-    public void ExperimentValueDataOnDemand.setPublicData(ExperimentValue obj, int index) {
-        Boolean publicData = true;
-        obj.setPublicData(publicData);
-    }
-    
-    public void ExperimentValueDataOnDemand.setRecordedBy(ExperimentValue obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void ExperimentValueDataOnDemand.setRecordedDate(ExperimentValue obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public void ExperimentValueDataOnDemand.setSigFigs(ExperimentValue obj, int index) {
-        Integer sigFigs = new Integer(index);
-        obj.setSigFigs(sigFigs);
-    }
-    
-    public void ExperimentValueDataOnDemand.setStringValue(ExperimentValue obj, int index) {
-        String stringValue = "stringValue_" + index;
-        if (stringValue.length() > 255) {
-            stringValue = stringValue.substring(0, 255);
-        }
-        obj.setStringValue(stringValue);
-    }
-    
-    public void ExperimentValueDataOnDemand.setUncertainty(ExperimentValue obj, int index) {
-        BigDecimal uncertainty = BigDecimal.valueOf(index);
-        if (uncertainty.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
-            uncertainty = new BigDecimal("99999999999999999999.999999999999999999");
-        }
-        obj.setUncertainty(uncertainty);
-    }
-    
-    public void ExperimentValueDataOnDemand.setUncertaintyType(ExperimentValue obj, int index) {
-        String uncertaintyType = "uncertaintyType_" + index;
-        if (uncertaintyType.length() > 255) {
-            uncertaintyType = uncertaintyType.substring(0, 255);
-        }
-        obj.setUncertaintyType(uncertaintyType);
-    }
-    
-    public void ExperimentValueDataOnDemand.setUnitKind(ExperimentValue obj, int index) {
-        String unitKind = "unitKind_" + index;
-        if (unitKind.length() > 25) {
-            unitKind = unitKind.substring(0, 25);
-        }
-        obj.setUnitKind(unitKind);
-    }
-    
-    public void ExperimentValueDataOnDemand.setUnitType(ExperimentValue obj, int index) {
-        String unitType = "unitType_" + index;
-        if (unitType.length() > 25) {
-            unitType = unitType.substring(0, 25);
-        }
-        obj.setUnitType(unitType);
-    }
-    
-    public void ExperimentValueDataOnDemand.setUnitTypeAndKind(ExperimentValue obj, int index) {
-        String unitTypeAndKind = "unitTypeAndKind_" + index;
-        if (unitTypeAndKind.length() > 55) {
-            unitTypeAndKind = unitTypeAndKind.substring(0, 55);
-        }
-        obj.setUnitTypeAndKind(unitTypeAndKind);
-    }
-    
-    public void ExperimentValueDataOnDemand.setUrlValue(ExperimentValue obj, int index) {
-        String urlValue = "urlValue_" + index;
-        if (urlValue.length() > 2000) {
-            urlValue = urlValue.substring(0, 2000);
-        }
-        obj.setUrlValue(urlValue);
-    }
-    
-    public ExperimentValue ExperimentValueDataOnDemand.getSpecificExperimentValue(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        ExperimentValue obj = data.get(index);
-        Long id = obj.getId();
-        return ExperimentValue.findExperimentValue(id);
-    }
-    
-    public ExperimentValue ExperimentValueDataOnDemand.getRandomExperimentValue() {
-        init();
-        ExperimentValue obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return ExperimentValue.findExperimentValue(id);
-    }
-    
-    public boolean ExperimentValueDataOnDemand.modifyExperimentValue(ExperimentValue obj) {
-        return false;
-    }
-    
-    public void ExperimentValueDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = ExperimentValue.findExperimentValueEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ExperimentValue' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<ExperimentValue>();
-        for (int i = 0; i < 10; i++) {
-            ExperimentValue obj = getNewTransientExperimentValue(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ExperimentValueIntegrationTest.java
index 5de1d751e..200d86bb5 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentValueIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = ExperimentValue.class)
 public class ExperimentValueIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ExperimentValueDataOnDemand dod;
+
+	@Test
+    public void testCountExperimentValues() {
+        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to initialize correctly", dod.getRandomExperimentValue());
+        long count = ExperimentValue.countExperimentValues();
+        Assert.assertTrue("Counter for 'ExperimentValue' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindExperimentValue() {
+        ExperimentValue obj = dod.getRandomExperimentValue();
+        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to provide an identifier", id);
+        obj = ExperimentValue.findExperimentValue(id);
+        Assert.assertNotNull("Find method for 'ExperimentValue' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'ExperimentValue' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllExperimentValues() {
+        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to initialize correctly", dod.getRandomExperimentValue());
+        long count = ExperimentValue.countExperimentValues();
+        Assert.assertTrue("Too expensive to perform a find all test for 'ExperimentValue', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<ExperimentValue> result = ExperimentValue.findAllExperimentValues();
+        Assert.assertNotNull("Find all method for 'ExperimentValue' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'ExperimentValue' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindExperimentValueEntries() {
+        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to initialize correctly", dod.getRandomExperimentValue());
+        long count = ExperimentValue.countExperimentValues();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<ExperimentValue> result = ExperimentValue.findExperimentValueEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'ExperimentValue' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'ExperimentValue' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        ExperimentValue obj = dod.getRandomExperimentValue();
+        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to provide an identifier", id);
+        obj = ExperimentValue.findExperimentValue(id);
+        Assert.assertNotNull("Find method for 'ExperimentValue' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyExperimentValue(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'ExperimentValue' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        ExperimentValue obj = dod.getRandomExperimentValue();
+        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to provide an identifier", id);
+        obj = ExperimentValue.findExperimentValue(id);
+        boolean modified =  dod.modifyExperimentValue(obj);
+        Integer currentVersion = obj.getVersion();
+        ExperimentValue merged = (ExperimentValue)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'ExperimentValue' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to initialize correctly", dod.getRandomExperimentValue());
+        ExperimentValue obj = dod.getNewTransientExperimentValue(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'ExperimentValue' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'ExperimentValue' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        ExperimentValue obj = dod.getRandomExperimentValue();
+        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to provide an identifier", id);
+        obj = ExperimentValue.findExperimentValue(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'ExperimentValue' with identifier '" + id + "'", ExperimentValue.findExperimentValue(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentValueIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ExperimentValueIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index a95b76c79..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentValueIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentValueIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ExperimentValueIntegrationTest_Roo_Configurable {
-    
-    declare @type: ExperimentValueIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentValueIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ExperimentValueIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 654dd135e..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentValueIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ExperimentValue;
-import com.labsynch.labseer.domain.ExperimentValueDataOnDemand;
-import com.labsynch.labseer.domain.ExperimentValueIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ExperimentValueIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ExperimentValueIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ExperimentValueIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ExperimentValueIntegrationTest: @Transactional;
-    
-    @Autowired
-    ExperimentValueDataOnDemand ExperimentValueIntegrationTest.dod;
-    
-    @Test
-    public void ExperimentValueIntegrationTest.testCountExperimentValues() {
-        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to initialize correctly", dod.getRandomExperimentValue());
-        long count = ExperimentValue.countExperimentValues();
-        Assert.assertTrue("Counter for 'ExperimentValue' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ExperimentValueIntegrationTest.testFindExperimentValue() {
-        ExperimentValue obj = dod.getRandomExperimentValue();
-        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to provide an identifier", id);
-        obj = ExperimentValue.findExperimentValue(id);
-        Assert.assertNotNull("Find method for 'ExperimentValue' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ExperimentValue' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ExperimentValueIntegrationTest.testFindAllExperimentValues() {
-        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to initialize correctly", dod.getRandomExperimentValue());
-        long count = ExperimentValue.countExperimentValues();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ExperimentValue', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<ExperimentValue> result = ExperimentValue.findAllExperimentValues();
-        Assert.assertNotNull("Find all method for 'ExperimentValue' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ExperimentValue' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ExperimentValueIntegrationTest.testFindExperimentValueEntries() {
-        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to initialize correctly", dod.getRandomExperimentValue());
-        long count = ExperimentValue.countExperimentValues();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<ExperimentValue> result = ExperimentValue.findExperimentValueEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'ExperimentValue' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ExperimentValue' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ExperimentValueIntegrationTest.testFlush() {
-        ExperimentValue obj = dod.getRandomExperimentValue();
-        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to provide an identifier", id);
-        obj = ExperimentValue.findExperimentValue(id);
-        Assert.assertNotNull("Find method for 'ExperimentValue' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyExperimentValue(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'ExperimentValue' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ExperimentValueIntegrationTest.testMergeUpdate() {
-        ExperimentValue obj = dod.getRandomExperimentValue();
-        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to provide an identifier", id);
-        obj = ExperimentValue.findExperimentValue(id);
-        boolean modified =  dod.modifyExperimentValue(obj);
-        Integer currentVersion = obj.getVersion();
-        ExperimentValue merged = (ExperimentValue)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ExperimentValue' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ExperimentValueIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to initialize correctly", dod.getRandomExperimentValue());
-        ExperimentValue obj = dod.getNewTransientExperimentValue(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'ExperimentValue' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'ExperimentValue' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ExperimentValueIntegrationTest.testRemove() {
-        ExperimentValue obj = dod.getRandomExperimentValue();
-        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to provide an identifier", id);
-        obj = ExperimentValue.findExperimentValue(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'ExperimentValue' with identifier '" + id + "'", ExperimentValue.findExperimentValue(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/InteractionKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/InteractionKindDataOnDemand.java
index 91a2c6bf3..892d60834 100755
--- a/src/test/java/com/labsynch/labseer/domain/InteractionKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/InteractionKindDataOnDemand.java
@@ -1,7 +1,108 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Configurable
+@Component
 @RooDataOnDemand(entity = InteractionKind.class)
 public class InteractionKindDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<InteractionKind> data;
+
+	@Autowired
+    InteractionTypeDataOnDemand interactionTypeDataOnDemand;
+
+	public InteractionKind getNewTransientInteractionKind(int index) {
+        InteractionKind obj = new InteractionKind();
+        setKindName(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        return obj;
+    }
+
+	public void setKindName(InteractionKind obj, int index) {
+        String kindName = "kindName_" + index;
+        if (kindName.length() > 255) {
+            kindName = kindName.substring(0, 255);
+        }
+        obj.setKindName(kindName);
+    }
+
+	public void setLsType(InteractionKind obj, int index) {
+        InteractionType lsType = interactionTypeDataOnDemand.getRandomInteractionType();
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(InteractionKind obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = new Random().nextInt(10) + lsTypeAndKind.substring(1, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public InteractionKind getSpecificInteractionKind(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        InteractionKind obj = data.get(index);
+        Long id = obj.getId();
+        return InteractionKind.findInteractionKind(id);
+    }
+
+	public InteractionKind getRandomInteractionKind() {
+        init();
+        InteractionKind obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return InteractionKind.findInteractionKind(id);
+    }
+
+	public boolean modifyInteractionKind(InteractionKind obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = InteractionKind.findInteractionKindEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'InteractionKind' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<InteractionKind>();
+        for (int i = 0; i < 10; i++) {
+            InteractionKind obj = getNewTransientInteractionKind(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/InteractionKindDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/InteractionKindDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index b5132d0bc..000000000
--- a/src/test/java/com/labsynch/labseer/domain/InteractionKindDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.InteractionKindDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect InteractionKindDataOnDemand_Roo_Configurable {
-    
-    declare @type: InteractionKindDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/InteractionKindDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/InteractionKindDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 348f32b3c..000000000
--- a/src/test/java/com/labsynch/labseer/domain/InteractionKindDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,113 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.InteractionKind;
-import com.labsynch.labseer.domain.InteractionKindDataOnDemand;
-import com.labsynch.labseer.domain.InteractionType;
-import com.labsynch.labseer.domain.InteractionTypeDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect InteractionKindDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: InteractionKindDataOnDemand: @Component;
-    
-    private Random InteractionKindDataOnDemand.rnd = new SecureRandom();
-    
-    private List<InteractionKind> InteractionKindDataOnDemand.data;
-    
-    @Autowired
-    InteractionTypeDataOnDemand InteractionKindDataOnDemand.interactionTypeDataOnDemand;
-    
-    public InteractionKind InteractionKindDataOnDemand.getNewTransientInteractionKind(int index) {
-        InteractionKind obj = new InteractionKind();
-        setKindName(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        return obj;
-    }
-    
-    public void InteractionKindDataOnDemand.setKindName(InteractionKind obj, int index) {
-        String kindName = "kindName_" + index;
-        if (kindName.length() > 255) {
-            kindName = kindName.substring(0, 255);
-        }
-        obj.setKindName(kindName);
-    }
-    
-    public void InteractionKindDataOnDemand.setLsType(InteractionKind obj, int index) {
-        InteractionType lsType = interactionTypeDataOnDemand.getRandomInteractionType();
-        obj.setLsType(lsType);
-    }
-    
-    public void InteractionKindDataOnDemand.setLsTypeAndKind(InteractionKind obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = new Random().nextInt(10) + lsTypeAndKind.substring(1, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public InteractionKind InteractionKindDataOnDemand.getSpecificInteractionKind(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        InteractionKind obj = data.get(index);
-        Long id = obj.getId();
-        return InteractionKind.findInteractionKind(id);
-    }
-    
-    public InteractionKind InteractionKindDataOnDemand.getRandomInteractionKind() {
-        init();
-        InteractionKind obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return InteractionKind.findInteractionKind(id);
-    }
-    
-    public boolean InteractionKindDataOnDemand.modifyInteractionKind(InteractionKind obj) {
-        return false;
-    }
-    
-    public void InteractionKindDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = InteractionKind.findInteractionKindEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'InteractionKind' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<InteractionKind>();
-        for (int i = 0; i < 10; i++) {
-            InteractionKind obj = getNewTransientInteractionKind(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/InteractionKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/InteractionKindIntegrationTest.java
index a9c48b050..5241e7ca6 100755
--- a/src/test/java/com/labsynch/labseer/domain/InteractionKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/InteractionKindIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = InteractionKind.class)
 public class InteractionKindIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    InteractionKindDataOnDemand dod;
+
+	@Test
+    public void testCountInteractionKinds() {
+        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to initialize correctly", dod.getRandomInteractionKind());
+        long count = InteractionKind.countInteractionKinds();
+        Assert.assertTrue("Counter for 'InteractionKind' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindInteractionKind() {
+        InteractionKind obj = dod.getRandomInteractionKind();
+        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to provide an identifier", id);
+        obj = InteractionKind.findInteractionKind(id);
+        Assert.assertNotNull("Find method for 'InteractionKind' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'InteractionKind' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllInteractionKinds() {
+        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to initialize correctly", dod.getRandomInteractionKind());
+        long count = InteractionKind.countInteractionKinds();
+        Assert.assertTrue("Too expensive to perform a find all test for 'InteractionKind', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<InteractionKind> result = InteractionKind.findAllInteractionKinds();
+        Assert.assertNotNull("Find all method for 'InteractionKind' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'InteractionKind' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindInteractionKindEntries() {
+        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to initialize correctly", dod.getRandomInteractionKind());
+        long count = InteractionKind.countInteractionKinds();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<InteractionKind> result = InteractionKind.findInteractionKindEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'InteractionKind' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'InteractionKind' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        InteractionKind obj = dod.getRandomInteractionKind();
+        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to provide an identifier", id);
+        obj = InteractionKind.findInteractionKind(id);
+        Assert.assertNotNull("Find method for 'InteractionKind' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyInteractionKind(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'InteractionKind' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        InteractionKind obj = dod.getRandomInteractionKind();
+        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to provide an identifier", id);
+        obj = InteractionKind.findInteractionKind(id);
+        boolean modified =  dod.modifyInteractionKind(obj);
+        Integer currentVersion = obj.getVersion();
+        InteractionKind merged = obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'InteractionKind' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to initialize correctly", dod.getRandomInteractionKind());
+        InteractionKind obj = dod.getNewTransientInteractionKind(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'InteractionKind' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'InteractionKind' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        InteractionKind obj = dod.getRandomInteractionKind();
+        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to provide an identifier", id);
+        obj = InteractionKind.findInteractionKind(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'InteractionKind' with identifier '" + id + "'", InteractionKind.findInteractionKind(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/InteractionKindIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/InteractionKindIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 285344bf4..000000000
--- a/src/test/java/com/labsynch/labseer/domain/InteractionKindIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.InteractionKindIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect InteractionKindIntegrationTest_Roo_Configurable {
-    
-    declare @type: InteractionKindIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/InteractionKindIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/InteractionKindIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 7397bd7b2..000000000
--- a/src/test/java/com/labsynch/labseer/domain/InteractionKindIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.InteractionKind;
-import com.labsynch.labseer.domain.InteractionKindDataOnDemand;
-import com.labsynch.labseer.domain.InteractionKindIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect InteractionKindIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: InteractionKindIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: InteractionKindIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: InteractionKindIntegrationTest: @Transactional;
-    
-    @Autowired
-    InteractionKindDataOnDemand InteractionKindIntegrationTest.dod;
-    
-    @Test
-    public void InteractionKindIntegrationTest.testCountInteractionKinds() {
-        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to initialize correctly", dod.getRandomInteractionKind());
-        long count = InteractionKind.countInteractionKinds();
-        Assert.assertTrue("Counter for 'InteractionKind' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void InteractionKindIntegrationTest.testFindInteractionKind() {
-        InteractionKind obj = dod.getRandomInteractionKind();
-        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to provide an identifier", id);
-        obj = InteractionKind.findInteractionKind(id);
-        Assert.assertNotNull("Find method for 'InteractionKind' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'InteractionKind' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void InteractionKindIntegrationTest.testFindAllInteractionKinds() {
-        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to initialize correctly", dod.getRandomInteractionKind());
-        long count = InteractionKind.countInteractionKinds();
-        Assert.assertTrue("Too expensive to perform a find all test for 'InteractionKind', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<InteractionKind> result = InteractionKind.findAllInteractionKinds();
-        Assert.assertNotNull("Find all method for 'InteractionKind' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'InteractionKind' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void InteractionKindIntegrationTest.testFindInteractionKindEntries() {
-        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to initialize correctly", dod.getRandomInteractionKind());
-        long count = InteractionKind.countInteractionKinds();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<InteractionKind> result = InteractionKind.findInteractionKindEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'InteractionKind' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'InteractionKind' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void InteractionKindIntegrationTest.testFlush() {
-        InteractionKind obj = dod.getRandomInteractionKind();
-        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to provide an identifier", id);
-        obj = InteractionKind.findInteractionKind(id);
-        Assert.assertNotNull("Find method for 'InteractionKind' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyInteractionKind(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'InteractionKind' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void InteractionKindIntegrationTest.testMergeUpdate() {
-        InteractionKind obj = dod.getRandomInteractionKind();
-        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to provide an identifier", id);
-        obj = InteractionKind.findInteractionKind(id);
-        boolean modified =  dod.modifyInteractionKind(obj);
-        Integer currentVersion = obj.getVersion();
-        InteractionKind merged = obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'InteractionKind' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void InteractionKindIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to initialize correctly", dod.getRandomInteractionKind());
-        InteractionKind obj = dod.getNewTransientInteractionKind(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'InteractionKind' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'InteractionKind' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void InteractionKindIntegrationTest.testRemove() {
-        InteractionKind obj = dod.getRandomInteractionKind();
-        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to provide an identifier", id);
-        obj = InteractionKind.findInteractionKind(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'InteractionKind' with identifier '" + id + "'", InteractionKind.findInteractionKind(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/InteractionTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/InteractionTypeDataOnDemand.java
index 37ab65897..aeb8d8938 100755
--- a/src/test/java/com/labsynch/labseer/domain/InteractionTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/InteractionTypeDataOnDemand.java
@@ -1,7 +1,98 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Configurable
+@Component
 @RooDataOnDemand(entity = InteractionType.class)
 public class InteractionTypeDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<InteractionType> data;
+
+	public InteractionType getNewTransientInteractionType(int index) {
+        InteractionType obj = new InteractionType();
+        setTypeName(obj, index);
+        setTypeVerb(obj, index);
+        return obj;
+    }
+
+	public void setTypeName(InteractionType obj, int index) {
+        String typeName = "typeName_" + index;
+        if (typeName.length() > 128) {
+            typeName = new Random().nextInt(10) + typeName.substring(1, 128);
+        }
+        obj.setTypeName(typeName);
+    }
+
+	public void setTypeVerb(InteractionType obj, int index) {
+        String typeVerb = "typeVerb_" + index;
+        if (typeVerb.length() > 128) {
+            typeVerb = typeVerb.substring(0, 128);
+        }
+        obj.setTypeVerb(typeVerb);
+    }
+
+	public InteractionType getSpecificInteractionType(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        InteractionType obj = data.get(index);
+        Long id = obj.getId();
+        return InteractionType.findInteractionType(id);
+    }
+
+	public InteractionType getRandomInteractionType() {
+        init();
+        InteractionType obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return InteractionType.findInteractionType(id);
+    }
+
+	public boolean modifyInteractionType(InteractionType obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = InteractionType.findInteractionTypeEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'InteractionType' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<InteractionType>();
+        for (int i = 0; i < 10; i++) {
+            InteractionType obj = getNewTransientInteractionType(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/InteractionTypeDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/InteractionTypeDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index c0f6fdc0f..000000000
--- a/src/test/java/com/labsynch/labseer/domain/InteractionTypeDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.InteractionTypeDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect InteractionTypeDataOnDemand_Roo_Configurable {
-    
-    declare @type: InteractionTypeDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/InteractionTypeDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/InteractionTypeDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index ea5648b2b..000000000
--- a/src/test/java/com/labsynch/labseer/domain/InteractionTypeDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,101 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.InteractionType;
-import com.labsynch.labseer.domain.InteractionTypeDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.stereotype.Component;
-
-privileged aspect InteractionTypeDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: InteractionTypeDataOnDemand: @Component;
-    
-    private Random InteractionTypeDataOnDemand.rnd = new SecureRandom();
-    
-    private List<InteractionType> InteractionTypeDataOnDemand.data;
-    
-    public InteractionType InteractionTypeDataOnDemand.getNewTransientInteractionType(int index) {
-        InteractionType obj = new InteractionType();
-        setTypeName(obj, index);
-        setTypeVerb(obj, index);
-        return obj;
-    }
-    
-    public void InteractionTypeDataOnDemand.setTypeName(InteractionType obj, int index) {
-        String typeName = "typeName_" + index;
-        if (typeName.length() > 128) {
-            typeName = new Random().nextInt(10) + typeName.substring(1, 128);
-        }
-        obj.setTypeName(typeName);
-    }
-    
-    public void InteractionTypeDataOnDemand.setTypeVerb(InteractionType obj, int index) {
-        String typeVerb = "typeVerb_" + index;
-        if (typeVerb.length() > 128) {
-            typeVerb = typeVerb.substring(0, 128);
-        }
-        obj.setTypeVerb(typeVerb);
-    }
-    
-    public InteractionType InteractionTypeDataOnDemand.getSpecificInteractionType(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        InteractionType obj = data.get(index);
-        Long id = obj.getId();
-        return InteractionType.findInteractionType(id);
-    }
-    
-    public InteractionType InteractionTypeDataOnDemand.getRandomInteractionType() {
-        init();
-        InteractionType obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return InteractionType.findInteractionType(id);
-    }
-    
-    public boolean InteractionTypeDataOnDemand.modifyInteractionType(InteractionType obj) {
-        return false;
-    }
-    
-    public void InteractionTypeDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = InteractionType.findInteractionTypeEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'InteractionType' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<InteractionType>();
-        for (int i = 0; i < 10; i++) {
-            InteractionType obj = getNewTransientInteractionType(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/InteractionTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/InteractionTypeIntegrationTest.java
index 4897bf02e..4b4679822 100755
--- a/src/test/java/com/labsynch/labseer/domain/InteractionTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/InteractionTypeIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
+@Configurable
 @RooIntegrationTest(entity = InteractionType.class)
 public class InteractionTypeIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    InteractionTypeDataOnDemand dod;
+
+	@Test
+    public void testCountInteractionTypes() {
+        Assert.assertNotNull("Data on demand for 'InteractionType' failed to initialize correctly", dod.getRandomInteractionType());
+        long count = InteractionType.countInteractionTypes();
+        Assert.assertTrue("Counter for 'InteractionType' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindInteractionType() {
+        InteractionType obj = dod.getRandomInteractionType();
+        Assert.assertNotNull("Data on demand for 'InteractionType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'InteractionType' failed to provide an identifier", id);
+        obj = InteractionType.findInteractionType(id);
+        Assert.assertNotNull("Find method for 'InteractionType' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'InteractionType' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllInteractionTypes() {
+        Assert.assertNotNull("Data on demand for 'InteractionType' failed to initialize correctly", dod.getRandomInteractionType());
+        long count = InteractionType.countInteractionTypes();
+        Assert.assertTrue("Too expensive to perform a find all test for 'InteractionType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<InteractionType> result = InteractionType.findAllInteractionTypes();
+        Assert.assertNotNull("Find all method for 'InteractionType' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'InteractionType' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindInteractionTypeEntries() {
+        Assert.assertNotNull("Data on demand for 'InteractionType' failed to initialize correctly", dod.getRandomInteractionType());
+        long count = InteractionType.countInteractionTypes();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<InteractionType> result = InteractionType.findInteractionTypeEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'InteractionType' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'InteractionType' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        InteractionType obj = dod.getRandomInteractionType();
+        Assert.assertNotNull("Data on demand for 'InteractionType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'InteractionType' failed to provide an identifier", id);
+        obj = InteractionType.findInteractionType(id);
+        Assert.assertNotNull("Find method for 'InteractionType' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyInteractionType(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'InteractionType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        InteractionType obj = dod.getRandomInteractionType();
+        Assert.assertNotNull("Data on demand for 'InteractionType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'InteractionType' failed to provide an identifier", id);
+        obj = InteractionType.findInteractionType(id);
+        boolean modified =  dod.modifyInteractionType(obj);
+        Integer currentVersion = obj.getVersion();
+        InteractionType merged = obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'InteractionType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'InteractionType' failed to initialize correctly", dod.getRandomInteractionType());
+        InteractionType obj = dod.getNewTransientInteractionType(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'InteractionType' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'InteractionType' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'InteractionType' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        InteractionType obj = dod.getRandomInteractionType();
+        Assert.assertNotNull("Data on demand for 'InteractionType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'InteractionType' failed to provide an identifier", id);
+        obj = InteractionType.findInteractionType(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'InteractionType' with identifier '" + id + "'", InteractionType.findInteractionType(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/InteractionTypeIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/InteractionTypeIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 28a4aa3e7..000000000
--- a/src/test/java/com/labsynch/labseer/domain/InteractionTypeIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.InteractionTypeIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect InteractionTypeIntegrationTest_Roo_Configurable {
-    
-    declare @type: InteractionTypeIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/InteractionTypeIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/InteractionTypeIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index e1529e472..000000000
--- a/src/test/java/com/labsynch/labseer/domain/InteractionTypeIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.InteractionType;
-import com.labsynch.labseer.domain.InteractionTypeDataOnDemand;
-import com.labsynch.labseer.domain.InteractionTypeIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect InteractionTypeIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: InteractionTypeIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: InteractionTypeIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: InteractionTypeIntegrationTest: @Transactional;
-    
-    @Autowired
-    InteractionTypeDataOnDemand InteractionTypeIntegrationTest.dod;
-    
-    @Test
-    public void InteractionTypeIntegrationTest.testCountInteractionTypes() {
-        Assert.assertNotNull("Data on demand for 'InteractionType' failed to initialize correctly", dod.getRandomInteractionType());
-        long count = InteractionType.countInteractionTypes();
-        Assert.assertTrue("Counter for 'InteractionType' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void InteractionTypeIntegrationTest.testFindInteractionType() {
-        InteractionType obj = dod.getRandomInteractionType();
-        Assert.assertNotNull("Data on demand for 'InteractionType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'InteractionType' failed to provide an identifier", id);
-        obj = InteractionType.findInteractionType(id);
-        Assert.assertNotNull("Find method for 'InteractionType' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'InteractionType' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void InteractionTypeIntegrationTest.testFindAllInteractionTypes() {
-        Assert.assertNotNull("Data on demand for 'InteractionType' failed to initialize correctly", dod.getRandomInteractionType());
-        long count = InteractionType.countInteractionTypes();
-        Assert.assertTrue("Too expensive to perform a find all test for 'InteractionType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<InteractionType> result = InteractionType.findAllInteractionTypes();
-        Assert.assertNotNull("Find all method for 'InteractionType' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'InteractionType' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void InteractionTypeIntegrationTest.testFindInteractionTypeEntries() {
-        Assert.assertNotNull("Data on demand for 'InteractionType' failed to initialize correctly", dod.getRandomInteractionType());
-        long count = InteractionType.countInteractionTypes();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<InteractionType> result = InteractionType.findInteractionTypeEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'InteractionType' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'InteractionType' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void InteractionTypeIntegrationTest.testFlush() {
-        InteractionType obj = dod.getRandomInteractionType();
-        Assert.assertNotNull("Data on demand for 'InteractionType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'InteractionType' failed to provide an identifier", id);
-        obj = InteractionType.findInteractionType(id);
-        Assert.assertNotNull("Find method for 'InteractionType' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyInteractionType(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'InteractionType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void InteractionTypeIntegrationTest.testMergeUpdate() {
-        InteractionType obj = dod.getRandomInteractionType();
-        Assert.assertNotNull("Data on demand for 'InteractionType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'InteractionType' failed to provide an identifier", id);
-        obj = InteractionType.findInteractionType(id);
-        boolean modified =  dod.modifyInteractionType(obj);
-        Integer currentVersion = obj.getVersion();
-        InteractionType merged = obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'InteractionType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void InteractionTypeIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'InteractionType' failed to initialize correctly", dod.getRandomInteractionType());
-        InteractionType obj = dod.getNewTransientInteractionType(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'InteractionType' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'InteractionType' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'InteractionType' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void InteractionTypeIntegrationTest.testRemove() {
-        InteractionType obj = dod.getRandomInteractionType();
-        Assert.assertNotNull("Data on demand for 'InteractionType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'InteractionType' failed to provide an identifier", id);
-        obj = InteractionType.findInteractionType(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'InteractionType' with identifier '" + id + "'", InteractionType.findInteractionType(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerDataOnDemand.java
index bed02be96..fa290f10f 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerDataOnDemand.java
@@ -1,7 +1,183 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Configurable
+@Component
 @RooDataOnDemand(entity = ItxContainerContainer.class)
 public class ItxContainerContainerDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<ItxContainerContainer> data;
+
+	@Autowired
+    ContainerDataOnDemand containerDataOnDemand;
+
+	public ItxContainerContainer getNewTransientItxContainerContainer(int index) {
+        ItxContainerContainer obj = new ItxContainerContainer();
+        setCodeName(obj, index);
+        setDeleted(obj, index);
+        setFirstContainer(obj, index);
+        setIgnored(obj, index);
+        setLsKind(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedBy(obj, index);
+        setModifiedDate(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        setSecondContainer(obj, index);
+        return obj;
+    }
+
+	public void setCodeName(ItxContainerContainer obj, int index) {
+        String codeName = "codeName_" + index;
+        if (codeName.length() > 255) {
+            codeName = new Random().nextInt(10) + codeName.substring(1, 255);
+        }
+        obj.setCodeName(codeName);
+    }
+
+	public void setDeleted(ItxContainerContainer obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setFirstContainer(ItxContainerContainer obj, int index) {
+        Container firstContainer = containerDataOnDemand.getRandomContainer();
+        obj.setFirstContainer(firstContainer);
+    }
+
+	public void setIgnored(ItxContainerContainer obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setLsKind(ItxContainerContainer obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsTransaction(ItxContainerContainer obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(ItxContainerContainer obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 255) {
+            lsType = lsType.substring(0, 255);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(ItxContainerContainer obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedBy(ItxContainerContainer obj, int index) {
+        String modifiedBy = "modifiedBy_" + index;
+        if (modifiedBy.length() > 255) {
+            modifiedBy = modifiedBy.substring(0, 255);
+        }
+        obj.setModifiedBy(modifiedBy);
+    }
+
+	public void setModifiedDate(ItxContainerContainer obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setRecordedBy(ItxContainerContainer obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(ItxContainerContainer obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public void setSecondContainer(ItxContainerContainer obj, int index) {
+        Container secondContainer = containerDataOnDemand.getRandomContainer();
+        obj.setSecondContainer(secondContainer);
+    }
+
+	public ItxContainerContainer getSpecificItxContainerContainer(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        ItxContainerContainer obj = data.get(index);
+        Long id = obj.getId();
+        return ItxContainerContainer.findItxContainerContainer(id);
+    }
+
+	public ItxContainerContainer getRandomItxContainerContainer() {
+        init();
+        ItxContainerContainer obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return ItxContainerContainer.findItxContainerContainer(id);
+    }
+
+	public boolean modifyItxContainerContainer(ItxContainerContainer obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = ItxContainerContainer.findItxContainerContainerEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'ItxContainerContainer' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<ItxContainerContainer>();
+        for (int i = 0; i < 10; i++) {
+            ItxContainerContainer obj = getNewTransientItxContainerContainer(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index dde789b5a..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxContainerContainerDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ItxContainerContainerDataOnDemand_Roo_Configurable {
-    
-    declare @type: ItxContainerContainerDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index d03935bdd..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,188 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ContainerDataOnDemand;
-import com.labsynch.labseer.domain.ItxContainerContainer;
-import com.labsynch.labseer.domain.ItxContainerContainerDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect ItxContainerContainerDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ItxContainerContainerDataOnDemand: @Component;
-    
-    private Random ItxContainerContainerDataOnDemand.rnd = new SecureRandom();
-    
-    private List<ItxContainerContainer> ItxContainerContainerDataOnDemand.data;
-    
-    @Autowired
-    ContainerDataOnDemand ItxContainerContainerDataOnDemand.containerDataOnDemand;
-    
-    public ItxContainerContainer ItxContainerContainerDataOnDemand.getNewTransientItxContainerContainer(int index) {
-        ItxContainerContainer obj = new ItxContainerContainer();
-        setCodeName(obj, index);
-        setDeleted(obj, index);
-        setFirstContainer(obj, index);
-        setIgnored(obj, index);
-        setLsKind(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedBy(obj, index);
-        setModifiedDate(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        setSecondContainer(obj, index);
-        return obj;
-    }
-    
-    public void ItxContainerContainerDataOnDemand.setCodeName(ItxContainerContainer obj, int index) {
-        String codeName = "codeName_" + index;
-        if (codeName.length() > 255) {
-            codeName = new Random().nextInt(10) + codeName.substring(1, 255);
-        }
-        obj.setCodeName(codeName);
-    }
-    
-    public void ItxContainerContainerDataOnDemand.setDeleted(ItxContainerContainer obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void ItxContainerContainerDataOnDemand.setFirstContainer(ItxContainerContainer obj, int index) {
-        Container firstContainer = containerDataOnDemand.getRandomContainer();
-        obj.setFirstContainer(firstContainer);
-    }
-    
-    public void ItxContainerContainerDataOnDemand.setIgnored(ItxContainerContainer obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void ItxContainerContainerDataOnDemand.setLsKind(ItxContainerContainer obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void ItxContainerContainerDataOnDemand.setLsTransaction(ItxContainerContainer obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void ItxContainerContainerDataOnDemand.setLsType(ItxContainerContainer obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 255) {
-            lsType = lsType.substring(0, 255);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void ItxContainerContainerDataOnDemand.setLsTypeAndKind(ItxContainerContainer obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void ItxContainerContainerDataOnDemand.setModifiedBy(ItxContainerContainer obj, int index) {
-        String modifiedBy = "modifiedBy_" + index;
-        if (modifiedBy.length() > 255) {
-            modifiedBy = modifiedBy.substring(0, 255);
-        }
-        obj.setModifiedBy(modifiedBy);
-    }
-    
-    public void ItxContainerContainerDataOnDemand.setModifiedDate(ItxContainerContainer obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void ItxContainerContainerDataOnDemand.setRecordedBy(ItxContainerContainer obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void ItxContainerContainerDataOnDemand.setRecordedDate(ItxContainerContainer obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public void ItxContainerContainerDataOnDemand.setSecondContainer(ItxContainerContainer obj, int index) {
-        Container secondContainer = containerDataOnDemand.getRandomContainer();
-        obj.setSecondContainer(secondContainer);
-    }
-    
-    public ItxContainerContainer ItxContainerContainerDataOnDemand.getSpecificItxContainerContainer(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        ItxContainerContainer obj = data.get(index);
-        Long id = obj.getId();
-        return ItxContainerContainer.findItxContainerContainer(id);
-    }
-    
-    public ItxContainerContainer ItxContainerContainerDataOnDemand.getRandomItxContainerContainer() {
-        init();
-        ItxContainerContainer obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return ItxContainerContainer.findItxContainerContainer(id);
-    }
-    
-    public boolean ItxContainerContainerDataOnDemand.modifyItxContainerContainer(ItxContainerContainer obj) {
-        return false;
-    }
-    
-    public void ItxContainerContainerDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = ItxContainerContainer.findItxContainerContainerEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ItxContainerContainer' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<ItxContainerContainer>();
-        for (int i = 0; i < 10; i++) {
-            ItxContainerContainer obj = getNewTransientItxContainerContainer(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerIntegrationTest.java
index 6dcafb68e..849f05f1e 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
+@Configurable
 @RooIntegrationTest(entity = ItxContainerContainer.class)
 public class ItxContainerContainerIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ItxContainerContainerDataOnDemand dod;
+
+	@Test
+    public void testCountItxContainerContainers() {
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to initialize correctly", dod.getRandomItxContainerContainer());
+        long count = ItxContainerContainer.countItxContainerContainers();
+        Assert.assertTrue("Counter for 'ItxContainerContainer' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindItxContainerContainer() {
+        ItxContainerContainer obj = dod.getRandomItxContainerContainer();
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to provide an identifier", id);
+        obj = ItxContainerContainer.findItxContainerContainer(id);
+        Assert.assertNotNull("Find method for 'ItxContainerContainer' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'ItxContainerContainer' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllItxContainerContainers() {
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to initialize correctly", dod.getRandomItxContainerContainer());
+        long count = ItxContainerContainer.countItxContainerContainers();
+        Assert.assertTrue("Too expensive to perform a find all test for 'ItxContainerContainer', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<ItxContainerContainer> result = ItxContainerContainer.findAllItxContainerContainers();
+        Assert.assertNotNull("Find all method for 'ItxContainerContainer' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'ItxContainerContainer' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindItxContainerContainerEntries() {
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to initialize correctly", dod.getRandomItxContainerContainer());
+        long count = ItxContainerContainer.countItxContainerContainers();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<ItxContainerContainer> result = ItxContainerContainer.findItxContainerContainerEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'ItxContainerContainer' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'ItxContainerContainer' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        ItxContainerContainer obj = dod.getRandomItxContainerContainer();
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to provide an identifier", id);
+        obj = ItxContainerContainer.findItxContainerContainer(id);
+        Assert.assertNotNull("Find method for 'ItxContainerContainer' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyItxContainerContainer(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'ItxContainerContainer' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        ItxContainerContainer obj = dod.getRandomItxContainerContainer();
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to provide an identifier", id);
+        obj = ItxContainerContainer.findItxContainerContainer(id);
+        boolean modified =  dod.modifyItxContainerContainer(obj);
+        Integer currentVersion = obj.getVersion();
+        ItxContainerContainer merged = (ItxContainerContainer)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'ItxContainerContainer' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to initialize correctly", dod.getRandomItxContainerContainer());
+        ItxContainerContainer obj = dod.getNewTransientItxContainerContainer(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'ItxContainerContainer' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'ItxContainerContainer' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        ItxContainerContainer obj = dod.getRandomItxContainerContainer();
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to provide an identifier", id);
+        obj = ItxContainerContainer.findItxContainerContainer(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'ItxContainerContainer' with identifier '" + id + "'", ItxContainerContainer.findItxContainerContainer(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 8223d4ae5..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxContainerContainerIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ItxContainerContainerIntegrationTest_Roo_Configurable {
-    
-    declare @type: ItxContainerContainerIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 697c5a35d..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxContainerContainer;
-import com.labsynch.labseer.domain.ItxContainerContainerDataOnDemand;
-import com.labsynch.labseer.domain.ItxContainerContainerIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ItxContainerContainerIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ItxContainerContainerIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ItxContainerContainerIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ItxContainerContainerIntegrationTest: @Transactional;
-    
-    @Autowired
-    ItxContainerContainerDataOnDemand ItxContainerContainerIntegrationTest.dod;
-    
-    @Test
-    public void ItxContainerContainerIntegrationTest.testCountItxContainerContainers() {
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to initialize correctly", dod.getRandomItxContainerContainer());
-        long count = ItxContainerContainer.countItxContainerContainers();
-        Assert.assertTrue("Counter for 'ItxContainerContainer' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ItxContainerContainerIntegrationTest.testFindItxContainerContainer() {
-        ItxContainerContainer obj = dod.getRandomItxContainerContainer();
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to provide an identifier", id);
-        obj = ItxContainerContainer.findItxContainerContainer(id);
-        Assert.assertNotNull("Find method for 'ItxContainerContainer' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ItxContainerContainer' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ItxContainerContainerIntegrationTest.testFindAllItxContainerContainers() {
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to initialize correctly", dod.getRandomItxContainerContainer());
-        long count = ItxContainerContainer.countItxContainerContainers();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ItxContainerContainer', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<ItxContainerContainer> result = ItxContainerContainer.findAllItxContainerContainers();
-        Assert.assertNotNull("Find all method for 'ItxContainerContainer' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ItxContainerContainer' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ItxContainerContainerIntegrationTest.testFindItxContainerContainerEntries() {
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to initialize correctly", dod.getRandomItxContainerContainer());
-        long count = ItxContainerContainer.countItxContainerContainers();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<ItxContainerContainer> result = ItxContainerContainer.findItxContainerContainerEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'ItxContainerContainer' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ItxContainerContainer' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ItxContainerContainerIntegrationTest.testFlush() {
-        ItxContainerContainer obj = dod.getRandomItxContainerContainer();
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to provide an identifier", id);
-        obj = ItxContainerContainer.findItxContainerContainer(id);
-        Assert.assertNotNull("Find method for 'ItxContainerContainer' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyItxContainerContainer(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'ItxContainerContainer' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ItxContainerContainerIntegrationTest.testMergeUpdate() {
-        ItxContainerContainer obj = dod.getRandomItxContainerContainer();
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to provide an identifier", id);
-        obj = ItxContainerContainer.findItxContainerContainer(id);
-        boolean modified =  dod.modifyItxContainerContainer(obj);
-        Integer currentVersion = obj.getVersion();
-        ItxContainerContainer merged = (ItxContainerContainer)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ItxContainerContainer' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ItxContainerContainerIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to initialize correctly", dod.getRandomItxContainerContainer());
-        ItxContainerContainer obj = dod.getNewTransientItxContainerContainer(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'ItxContainerContainer' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'ItxContainerContainer' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ItxContainerContainerIntegrationTest.testRemove() {
-        ItxContainerContainer obj = dod.getRandomItxContainerContainer();
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to provide an identifier", id);
-        obj = ItxContainerContainer.findItxContainerContainer(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'ItxContainerContainer' with identifier '" + id + "'", ItxContainerContainer.findItxContainerContainer(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateDataOnDemand.java
index 3460ea758..444b65e4b 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateDataOnDemand.java
@@ -1,7 +1,171 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Configurable
+@Component
 @RooDataOnDemand(entity = ItxContainerContainerState.class)
 public class ItxContainerContainerStateDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<ItxContainerContainerState> data;
+
+	@Autowired
+    ItxContainerContainerDataOnDemand itxContainerContainerDataOnDemand;
+
+	public ItxContainerContainerState getNewTransientItxContainerContainerState(int index) {
+        ItxContainerContainerState obj = new ItxContainerContainerState();
+        setComments(obj, index);
+        setDeleted(obj, index);
+        setIgnored(obj, index);
+        setLsKind(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedBy(obj, index);
+        setModifiedDate(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        return obj;
+    }
+
+	public void setComments(ItxContainerContainerState obj, int index) {
+        String comments = "comments_" + index;
+        if (comments.length() > 512) {
+            comments = comments.substring(0, 512);
+        }
+        obj.setComments(comments);
+    }
+
+	public void setDeleted(ItxContainerContainerState obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setIgnored(ItxContainerContainerState obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setLsKind(ItxContainerContainerState obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsTransaction(ItxContainerContainerState obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(ItxContainerContainerState obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 64) {
+            lsType = lsType.substring(0, 64);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(ItxContainerContainerState obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedBy(ItxContainerContainerState obj, int index) {
+        String modifiedBy = "modifiedBy_" + index;
+        if (modifiedBy.length() > 255) {
+            modifiedBy = modifiedBy.substring(0, 255);
+        }
+        obj.setModifiedBy(modifiedBy);
+    }
+
+	public void setModifiedDate(ItxContainerContainerState obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setRecordedBy(ItxContainerContainerState obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(ItxContainerContainerState obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public ItxContainerContainerState getSpecificItxContainerContainerState(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        ItxContainerContainerState obj = data.get(index);
+        Long id = obj.getId();
+        return ItxContainerContainerState.findItxContainerContainerState(id);
+    }
+
+	public ItxContainerContainerState getRandomItxContainerContainerState() {
+        init();
+        ItxContainerContainerState obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return ItxContainerContainerState.findItxContainerContainerState(id);
+    }
+
+	public boolean modifyItxContainerContainerState(ItxContainerContainerState obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = ItxContainerContainerState.findItxContainerContainerStateEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'ItxContainerContainerState' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<ItxContainerContainerState>();
+        for (int i = 0; i < 10; i++) {
+            ItxContainerContainerState obj = getNewTransientItxContainerContainerState(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index be6b33371..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxContainerContainerStateDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ItxContainerContainerStateDataOnDemand_Roo_Configurable {
-    
-    declare @type: ItxContainerContainerStateDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 89e96302c..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,175 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxContainerContainerDataOnDemand;
-import com.labsynch.labseer.domain.ItxContainerContainerState;
-import com.labsynch.labseer.domain.ItxContainerContainerStateDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect ItxContainerContainerStateDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ItxContainerContainerStateDataOnDemand: @Component;
-    
-    private Random ItxContainerContainerStateDataOnDemand.rnd = new SecureRandom();
-    
-    private List<ItxContainerContainerState> ItxContainerContainerStateDataOnDemand.data;
-    
-    @Autowired
-    ItxContainerContainerDataOnDemand ItxContainerContainerStateDataOnDemand.itxContainerContainerDataOnDemand;
-    
-    public ItxContainerContainerState ItxContainerContainerStateDataOnDemand.getNewTransientItxContainerContainerState(int index) {
-        ItxContainerContainerState obj = new ItxContainerContainerState();
-        setComments(obj, index);
-        setDeleted(obj, index);
-        setIgnored(obj, index);
-        setLsKind(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedBy(obj, index);
-        setModifiedDate(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        return obj;
-    }
-    
-    public void ItxContainerContainerStateDataOnDemand.setComments(ItxContainerContainerState obj, int index) {
-        String comments = "comments_" + index;
-        if (comments.length() > 512) {
-            comments = comments.substring(0, 512);
-        }
-        obj.setComments(comments);
-    }
-    
-    public void ItxContainerContainerStateDataOnDemand.setDeleted(ItxContainerContainerState obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void ItxContainerContainerStateDataOnDemand.setIgnored(ItxContainerContainerState obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void ItxContainerContainerStateDataOnDemand.setLsKind(ItxContainerContainerState obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void ItxContainerContainerStateDataOnDemand.setLsTransaction(ItxContainerContainerState obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void ItxContainerContainerStateDataOnDemand.setLsType(ItxContainerContainerState obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 64) {
-            lsType = lsType.substring(0, 64);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void ItxContainerContainerStateDataOnDemand.setLsTypeAndKind(ItxContainerContainerState obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void ItxContainerContainerStateDataOnDemand.setModifiedBy(ItxContainerContainerState obj, int index) {
-        String modifiedBy = "modifiedBy_" + index;
-        if (modifiedBy.length() > 255) {
-            modifiedBy = modifiedBy.substring(0, 255);
-        }
-        obj.setModifiedBy(modifiedBy);
-    }
-    
-    public void ItxContainerContainerStateDataOnDemand.setModifiedDate(ItxContainerContainerState obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void ItxContainerContainerStateDataOnDemand.setRecordedBy(ItxContainerContainerState obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void ItxContainerContainerStateDataOnDemand.setRecordedDate(ItxContainerContainerState obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public ItxContainerContainerState ItxContainerContainerStateDataOnDemand.getSpecificItxContainerContainerState(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        ItxContainerContainerState obj = data.get(index);
-        Long id = obj.getId();
-        return ItxContainerContainerState.findItxContainerContainerState(id);
-    }
-    
-    public ItxContainerContainerState ItxContainerContainerStateDataOnDemand.getRandomItxContainerContainerState() {
-        init();
-        ItxContainerContainerState obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return ItxContainerContainerState.findItxContainerContainerState(id);
-    }
-    
-    public boolean ItxContainerContainerStateDataOnDemand.modifyItxContainerContainerState(ItxContainerContainerState obj) {
-        return false;
-    }
-    
-    public void ItxContainerContainerStateDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = ItxContainerContainerState.findItxContainerContainerStateEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ItxContainerContainerState' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<ItxContainerContainerState>();
-        for (int i = 0; i < 10; i++) {
-            ItxContainerContainerState obj = getNewTransientItxContainerContainerState(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateIntegrationTest.java
index bc9a15c90..18944f56b 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
+@Configurable
 @RooIntegrationTest(entity = ItxContainerContainerState.class)
 public class ItxContainerContainerStateIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ItxContainerContainerStateDataOnDemand dod;
+
+	@Test
+    public void testCountItxContainerContainerStates() {
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to initialize correctly", dod.getRandomItxContainerContainerState());
+        long count = ItxContainerContainerState.countItxContainerContainerStates();
+        Assert.assertTrue("Counter for 'ItxContainerContainerState' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindItxContainerContainerState() {
+        ItxContainerContainerState obj = dod.getRandomItxContainerContainerState();
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to provide an identifier", id);
+        obj = ItxContainerContainerState.findItxContainerContainerState(id);
+        Assert.assertNotNull("Find method for 'ItxContainerContainerState' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'ItxContainerContainerState' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllItxContainerContainerStates() {
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to initialize correctly", dod.getRandomItxContainerContainerState());
+        long count = ItxContainerContainerState.countItxContainerContainerStates();
+        Assert.assertTrue("Too expensive to perform a find all test for 'ItxContainerContainerState', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<ItxContainerContainerState> result = ItxContainerContainerState.findAllItxContainerContainerStates();
+        Assert.assertNotNull("Find all method for 'ItxContainerContainerState' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'ItxContainerContainerState' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindItxContainerContainerStateEntries() {
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to initialize correctly", dod.getRandomItxContainerContainerState());
+        long count = ItxContainerContainerState.countItxContainerContainerStates();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<ItxContainerContainerState> result = ItxContainerContainerState.findItxContainerContainerStateEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'ItxContainerContainerState' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'ItxContainerContainerState' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        ItxContainerContainerState obj = dod.getRandomItxContainerContainerState();
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to provide an identifier", id);
+        obj = ItxContainerContainerState.findItxContainerContainerState(id);
+        Assert.assertNotNull("Find method for 'ItxContainerContainerState' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyItxContainerContainerState(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'ItxContainerContainerState' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        ItxContainerContainerState obj = dod.getRandomItxContainerContainerState();
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to provide an identifier", id);
+        obj = ItxContainerContainerState.findItxContainerContainerState(id);
+        boolean modified =  dod.modifyItxContainerContainerState(obj);
+        Integer currentVersion = obj.getVersion();
+        ItxContainerContainerState merged = (ItxContainerContainerState)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'ItxContainerContainerState' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to initialize correctly", dod.getRandomItxContainerContainerState());
+        ItxContainerContainerState obj = dod.getNewTransientItxContainerContainerState(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'ItxContainerContainerState' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'ItxContainerContainerState' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        ItxContainerContainerState obj = dod.getRandomItxContainerContainerState();
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to provide an identifier", id);
+        obj = ItxContainerContainerState.findItxContainerContainerState(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'ItxContainerContainerState' with identifier '" + id + "'", ItxContainerContainerState.findItxContainerContainerState(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 463502304..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxContainerContainerStateIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ItxContainerContainerStateIntegrationTest_Roo_Configurable {
-    
-    declare @type: ItxContainerContainerStateIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 5e7728861..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxContainerContainerState;
-import com.labsynch.labseer.domain.ItxContainerContainerStateDataOnDemand;
-import com.labsynch.labseer.domain.ItxContainerContainerStateIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ItxContainerContainerStateIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ItxContainerContainerStateIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ItxContainerContainerStateIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ItxContainerContainerStateIntegrationTest: @Transactional;
-    
-    @Autowired
-    ItxContainerContainerStateDataOnDemand ItxContainerContainerStateIntegrationTest.dod;
-    
-    @Test
-    public void ItxContainerContainerStateIntegrationTest.testCountItxContainerContainerStates() {
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to initialize correctly", dod.getRandomItxContainerContainerState());
-        long count = ItxContainerContainerState.countItxContainerContainerStates();
-        Assert.assertTrue("Counter for 'ItxContainerContainerState' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ItxContainerContainerStateIntegrationTest.testFindItxContainerContainerState() {
-        ItxContainerContainerState obj = dod.getRandomItxContainerContainerState();
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to provide an identifier", id);
-        obj = ItxContainerContainerState.findItxContainerContainerState(id);
-        Assert.assertNotNull("Find method for 'ItxContainerContainerState' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ItxContainerContainerState' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ItxContainerContainerStateIntegrationTest.testFindAllItxContainerContainerStates() {
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to initialize correctly", dod.getRandomItxContainerContainerState());
-        long count = ItxContainerContainerState.countItxContainerContainerStates();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ItxContainerContainerState', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<ItxContainerContainerState> result = ItxContainerContainerState.findAllItxContainerContainerStates();
-        Assert.assertNotNull("Find all method for 'ItxContainerContainerState' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ItxContainerContainerState' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ItxContainerContainerStateIntegrationTest.testFindItxContainerContainerStateEntries() {
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to initialize correctly", dod.getRandomItxContainerContainerState());
-        long count = ItxContainerContainerState.countItxContainerContainerStates();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<ItxContainerContainerState> result = ItxContainerContainerState.findItxContainerContainerStateEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'ItxContainerContainerState' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ItxContainerContainerState' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ItxContainerContainerStateIntegrationTest.testFlush() {
-        ItxContainerContainerState obj = dod.getRandomItxContainerContainerState();
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to provide an identifier", id);
-        obj = ItxContainerContainerState.findItxContainerContainerState(id);
-        Assert.assertNotNull("Find method for 'ItxContainerContainerState' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyItxContainerContainerState(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'ItxContainerContainerState' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ItxContainerContainerStateIntegrationTest.testMergeUpdate() {
-        ItxContainerContainerState obj = dod.getRandomItxContainerContainerState();
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to provide an identifier", id);
-        obj = ItxContainerContainerState.findItxContainerContainerState(id);
-        boolean modified =  dod.modifyItxContainerContainerState(obj);
-        Integer currentVersion = obj.getVersion();
-        ItxContainerContainerState merged = (ItxContainerContainerState)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ItxContainerContainerState' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ItxContainerContainerStateIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to initialize correctly", dod.getRandomItxContainerContainerState());
-        ItxContainerContainerState obj = dod.getNewTransientItxContainerContainerState(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'ItxContainerContainerState' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'ItxContainerContainerState' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ItxContainerContainerStateIntegrationTest.testRemove() {
-        ItxContainerContainerState obj = dod.getRandomItxContainerContainerState();
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to provide an identifier", id);
-        obj = ItxContainerContainerState.findItxContainerContainerState(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'ItxContainerContainerState' with identifier '" + id + "'", ItxContainerContainerState.findItxContainerContainerState(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueDataOnDemand.java
index 61b16c9f2..fc9a35e20 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueDataOnDemand.java
@@ -1,7 +1,376 @@
 package com.labsynch.labseer.domain;
 
+import java.math.BigDecimal;
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Component
+@Configurable
 @RooDataOnDemand(entity = ItxContainerContainerValue.class)
 public class ItxContainerContainerValueDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<ItxContainerContainerValue> data;
+
+	@Autowired
+    ItxContainerContainerStateDataOnDemand itxContainerContainerStateDataOnDemand;
+
+	public ItxContainerContainerValue getNewTransientItxContainerContainerValue(int index) {
+        ItxContainerContainerValue obj = new ItxContainerContainerValue();
+        setBlobValue(obj, index);
+        setClobValue(obj, index);
+        setCodeKind(obj, index);
+        setCodeOrigin(obj, index);
+        setCodeType(obj, index);
+        setCodeTypeAndKind(obj, index);
+        setCodeValue(obj, index);
+        setComments(obj, index);
+        setConcUnit(obj, index);
+        setConcentration(obj, index);
+        setDateValue(obj, index);
+        setDeleted(obj, index);
+        setFileValue(obj, index);
+        setIgnored(obj, index);
+        setLsKind(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedBy(obj, index);
+        setModifiedDate(obj, index);
+        setNumberOfReplicates(obj, index);
+        setNumericValue(obj, index);
+        setOperatorKind(obj, index);
+        setOperatorType(obj, index);
+        setOperatorTypeAndKind(obj, index);
+        setPublicData(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        setSigFigs(obj, index);
+        setStringValue(obj, index);
+        setUncertainty(obj, index);
+        setUncertaintyType(obj, index);
+        setUnitKind(obj, index);
+        setUnitType(obj, index);
+        setUnitTypeAndKind(obj, index);
+        setUrlValue(obj, index);
+        return obj;
+    }
+
+	public void setBlobValue(ItxContainerContainerValue obj, int index) {
+        byte[] blobValue = String.valueOf(index).getBytes();
+        obj.setBlobValue(blobValue);
+    }
+
+	public void setClobValue(ItxContainerContainerValue obj, int index) {
+        String clobValue = "clobValue_" + index;
+        obj.setClobValue(clobValue);
+    }
+
+	public void setCodeKind(ItxContainerContainerValue obj, int index) {
+        String codeKind = "codeKind_" + index;
+        if (codeKind.length() > 255) {
+            codeKind = codeKind.substring(0, 255);
+        }
+        obj.setCodeKind(codeKind);
+    }
+
+	public void setCodeOrigin(ItxContainerContainerValue obj, int index) {
+        String codeOrigin = "codeOrigin_" + index;
+        if (codeOrigin.length() > 255) {
+            codeOrigin = codeOrigin.substring(0, 255);
+        }
+        obj.setCodeOrigin(codeOrigin);
+    }
+
+	public void setCodeType(ItxContainerContainerValue obj, int index) {
+        String codeType = "codeType_" + index;
+        if (codeType.length() > 255) {
+            codeType = codeType.substring(0, 255);
+        }
+        obj.setCodeType(codeType);
+    }
+
+	public void setCodeTypeAndKind(ItxContainerContainerValue obj, int index) {
+        String codeTypeAndKind = "codeTypeAndKind_" + index;
+        if (codeTypeAndKind.length() > 350) {
+            codeTypeAndKind = codeTypeAndKind.substring(0, 350);
+        }
+        obj.setCodeTypeAndKind(codeTypeAndKind);
+    }
+
+	public void setCodeValue(ItxContainerContainerValue obj, int index) {
+        String codeValue = "codeValue_" + index;
+        if (codeValue.length() > 255) {
+            codeValue = codeValue.substring(0, 255);
+        }
+        obj.setCodeValue(codeValue);
+    }
+
+	public void setComments(ItxContainerContainerValue obj, int index) {
+        String comments = "comments_" + index;
+        if (comments.length() > 512) {
+            comments = comments.substring(0, 512);
+        }
+        obj.setComments(comments);
+    }
+
+	public void setConcUnit(ItxContainerContainerValue obj, int index) {
+        String concUnit = "concUnit_" + index;
+        if (concUnit.length() > 25) {
+            concUnit = concUnit.substring(0, 25);
+        }
+        obj.setConcUnit(concUnit);
+    }
+
+	public void setConcentration(ItxContainerContainerValue obj, int index) {
+        Double concentration = new Integer(index).doubleValue();
+        obj.setConcentration(concentration);
+    }
+
+	public void setDateValue(ItxContainerContainerValue obj, int index) {
+        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setDateValue(dateValue);
+    }
+
+	public void setDeleted(ItxContainerContainerValue obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setFileValue(ItxContainerContainerValue obj, int index) {
+        String fileValue = "fileValue_" + index;
+        if (fileValue.length() > 512) {
+            fileValue = fileValue.substring(0, 512);
+        }
+        obj.setFileValue(fileValue);
+    }
+
+	public void setIgnored(ItxContainerContainerValue obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setLsKind(ItxContainerContainerValue obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsTransaction(ItxContainerContainerValue obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(ItxContainerContainerValue obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 64) {
+            lsType = lsType.substring(0, 64);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(ItxContainerContainerValue obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 350) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 350);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedBy(ItxContainerContainerValue obj, int index) {
+        String modifiedBy = "modifiedBy_" + index;
+        if (modifiedBy.length() > 255) {
+            modifiedBy = modifiedBy.substring(0, 255);
+        }
+        obj.setModifiedBy(modifiedBy);
+    }
+
+	public void setModifiedDate(ItxContainerContainerValue obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setNumberOfReplicates(ItxContainerContainerValue obj, int index) {
+        Integer numberOfReplicates = new Integer(index);
+        obj.setNumberOfReplicates(numberOfReplicates);
+    }
+
+	public void setNumericValue(ItxContainerContainerValue obj, int index) {
+        BigDecimal numericValue = BigDecimal.valueOf(index);
+        if (numericValue.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
+            numericValue = new BigDecimal("99999999999999999999.999999999999999999");
+        }
+        obj.setNumericValue(numericValue);
+    }
+
+	public void setOperatorKind(ItxContainerContainerValue obj, int index) {
+        String operatorKind = "operator_" + index;
+        if (operatorKind.length() > 10) {
+            operatorKind = operatorKind.substring(0, 10);
+        }
+        obj.setOperatorKind(operatorKind);
+    }
+
+	public void setOperatorType(ItxContainerContainerValue obj, int index) {
+        String operatorType = "operatorType_" + index;
+        if (operatorType.length() > 25) {
+            operatorType = operatorType.substring(0, 25);
+        }
+        obj.setOperatorType(operatorType);
+    }
+
+	public void setOperatorTypeAndKind(ItxContainerContainerValue obj, int index) {
+        String operatorTypeAndKind = "operatorTypeAndKind_" + index;
+        if (operatorTypeAndKind.length() > 50) {
+            operatorTypeAndKind = operatorTypeAndKind.substring(0, 50);
+        }
+        obj.setOperatorTypeAndKind(operatorTypeAndKind);
+    }
+
+	public void setPublicData(ItxContainerContainerValue obj, int index) {
+        Boolean publicData = true;
+        obj.setPublicData(publicData);
+    }
+
+	public void setRecordedBy(ItxContainerContainerValue obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(ItxContainerContainerValue obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public void setSigFigs(ItxContainerContainerValue obj, int index) {
+        Integer sigFigs = new Integer(index);
+        obj.setSigFigs(sigFigs);
+    }
+
+	public void setStringValue(ItxContainerContainerValue obj, int index) {
+        String stringValue = "stringValue_" + index;
+        if (stringValue.length() > 255) {
+            stringValue = stringValue.substring(0, 255);
+        }
+        obj.setStringValue(stringValue);
+    }
+
+	public void setUncertainty(ItxContainerContainerValue obj, int index) {
+        BigDecimal uncertainty = BigDecimal.valueOf(index);
+        if (uncertainty.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
+            uncertainty = new BigDecimal("99999999999999999999.999999999999999999");
+        }
+        obj.setUncertainty(uncertainty);
+    }
+
+	public void setUncertaintyType(ItxContainerContainerValue obj, int index) {
+        String uncertaintyType = "uncertaintyType_" + index;
+        if (uncertaintyType.length() > 255) {
+            uncertaintyType = uncertaintyType.substring(0, 255);
+        }
+        obj.setUncertaintyType(uncertaintyType);
+    }
+
+	public void setUnitKind(ItxContainerContainerValue obj, int index) {
+        String unitKind = "unitKind_" + index;
+        if (unitKind.length() > 25) {
+            unitKind = unitKind.substring(0, 25);
+        }
+        obj.setUnitKind(unitKind);
+    }
+
+	public void setUnitType(ItxContainerContainerValue obj, int index) {
+        String unitType = "unitType_" + index;
+        if (unitType.length() > 25) {
+            unitType = unitType.substring(0, 25);
+        }
+        obj.setUnitType(unitType);
+    }
+
+	public void setUnitTypeAndKind(ItxContainerContainerValue obj, int index) {
+        String unitTypeAndKind = "unitTypeAndKind_" + index;
+        if (unitTypeAndKind.length() > 55) {
+            unitTypeAndKind = unitTypeAndKind.substring(0, 55);
+        }
+        obj.setUnitTypeAndKind(unitTypeAndKind);
+    }
+
+	public void setUrlValue(ItxContainerContainerValue obj, int index) {
+        String urlValue = "urlValue_" + index;
+        if (urlValue.length() > 2000) {
+            urlValue = urlValue.substring(0, 2000);
+        }
+        obj.setUrlValue(urlValue);
+    }
+
+	public ItxContainerContainerValue getSpecificItxContainerContainerValue(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        ItxContainerContainerValue obj = data.get(index);
+        Long id = obj.getId();
+        return ItxContainerContainerValue.findItxContainerContainerValue(id);
+    }
+
+	public ItxContainerContainerValue getRandomItxContainerContainerValue() {
+        init();
+        ItxContainerContainerValue obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return ItxContainerContainerValue.findItxContainerContainerValue(id);
+    }
+
+	public boolean modifyItxContainerContainerValue(ItxContainerContainerValue obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = ItxContainerContainerValue.findItxContainerContainerValueEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'ItxContainerContainerValue' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<ItxContainerContainerValue>();
+        for (int i = 0; i < 10; i++) {
+            ItxContainerContainerValue obj = getNewTransientItxContainerContainerValue(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index a1d634154..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxContainerContainerValueDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ItxContainerContainerValueDataOnDemand_Roo_Configurable {
-    
-    declare @type: ItxContainerContainerValueDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index b7a37336e..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,380 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxContainerContainerStateDataOnDemand;
-import com.labsynch.labseer.domain.ItxContainerContainerValue;
-import com.labsynch.labseer.domain.ItxContainerContainerValueDataOnDemand;
-import java.math.BigDecimal;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect ItxContainerContainerValueDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ItxContainerContainerValueDataOnDemand: @Component;
-    
-    private Random ItxContainerContainerValueDataOnDemand.rnd = new SecureRandom();
-    
-    private List<ItxContainerContainerValue> ItxContainerContainerValueDataOnDemand.data;
-    
-    @Autowired
-    ItxContainerContainerStateDataOnDemand ItxContainerContainerValueDataOnDemand.itxContainerContainerStateDataOnDemand;
-    
-    public ItxContainerContainerValue ItxContainerContainerValueDataOnDemand.getNewTransientItxContainerContainerValue(int index) {
-        ItxContainerContainerValue obj = new ItxContainerContainerValue();
-        setBlobValue(obj, index);
-        setClobValue(obj, index);
-        setCodeKind(obj, index);
-        setCodeOrigin(obj, index);
-        setCodeType(obj, index);
-        setCodeTypeAndKind(obj, index);
-        setCodeValue(obj, index);
-        setComments(obj, index);
-        setConcUnit(obj, index);
-        setConcentration(obj, index);
-        setDateValue(obj, index);
-        setDeleted(obj, index);
-        setFileValue(obj, index);
-        setIgnored(obj, index);
-        setLsKind(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedBy(obj, index);
-        setModifiedDate(obj, index);
-        setNumberOfReplicates(obj, index);
-        setNumericValue(obj, index);
-        setOperatorKind(obj, index);
-        setOperatorType(obj, index);
-        setOperatorTypeAndKind(obj, index);
-        setPublicData(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        setSigFigs(obj, index);
-        setStringValue(obj, index);
-        setUncertainty(obj, index);
-        setUncertaintyType(obj, index);
-        setUnitKind(obj, index);
-        setUnitType(obj, index);
-        setUnitTypeAndKind(obj, index);
-        setUrlValue(obj, index);
-        return obj;
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setBlobValue(ItxContainerContainerValue obj, int index) {
-        byte[] blobValue = String.valueOf(index).getBytes();
-        obj.setBlobValue(blobValue);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setClobValue(ItxContainerContainerValue obj, int index) {
-        String clobValue = "clobValue_" + index;
-        obj.setClobValue(clobValue);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setCodeKind(ItxContainerContainerValue obj, int index) {
-        String codeKind = "codeKind_" + index;
-        if (codeKind.length() > 255) {
-            codeKind = codeKind.substring(0, 255);
-        }
-        obj.setCodeKind(codeKind);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setCodeOrigin(ItxContainerContainerValue obj, int index) {
-        String codeOrigin = "codeOrigin_" + index;
-        if (codeOrigin.length() > 255) {
-            codeOrigin = codeOrigin.substring(0, 255);
-        }
-        obj.setCodeOrigin(codeOrigin);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setCodeType(ItxContainerContainerValue obj, int index) {
-        String codeType = "codeType_" + index;
-        if (codeType.length() > 255) {
-            codeType = codeType.substring(0, 255);
-        }
-        obj.setCodeType(codeType);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setCodeTypeAndKind(ItxContainerContainerValue obj, int index) {
-        String codeTypeAndKind = "codeTypeAndKind_" + index;
-        if (codeTypeAndKind.length() > 350) {
-            codeTypeAndKind = codeTypeAndKind.substring(0, 350);
-        }
-        obj.setCodeTypeAndKind(codeTypeAndKind);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setCodeValue(ItxContainerContainerValue obj, int index) {
-        String codeValue = "codeValue_" + index;
-        if (codeValue.length() > 255) {
-            codeValue = codeValue.substring(0, 255);
-        }
-        obj.setCodeValue(codeValue);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setComments(ItxContainerContainerValue obj, int index) {
-        String comments = "comments_" + index;
-        if (comments.length() > 512) {
-            comments = comments.substring(0, 512);
-        }
-        obj.setComments(comments);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setConcUnit(ItxContainerContainerValue obj, int index) {
-        String concUnit = "concUnit_" + index;
-        if (concUnit.length() > 25) {
-            concUnit = concUnit.substring(0, 25);
-        }
-        obj.setConcUnit(concUnit);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setConcentration(ItxContainerContainerValue obj, int index) {
-        Double concentration = new Integer(index).doubleValue();
-        obj.setConcentration(concentration);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setDateValue(ItxContainerContainerValue obj, int index) {
-        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setDateValue(dateValue);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setDeleted(ItxContainerContainerValue obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setFileValue(ItxContainerContainerValue obj, int index) {
-        String fileValue = "fileValue_" + index;
-        if (fileValue.length() > 512) {
-            fileValue = fileValue.substring(0, 512);
-        }
-        obj.setFileValue(fileValue);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setIgnored(ItxContainerContainerValue obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setLsKind(ItxContainerContainerValue obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setLsTransaction(ItxContainerContainerValue obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setLsType(ItxContainerContainerValue obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 64) {
-            lsType = lsType.substring(0, 64);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setLsTypeAndKind(ItxContainerContainerValue obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 350) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 350);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setModifiedBy(ItxContainerContainerValue obj, int index) {
-        String modifiedBy = "modifiedBy_" + index;
-        if (modifiedBy.length() > 255) {
-            modifiedBy = modifiedBy.substring(0, 255);
-        }
-        obj.setModifiedBy(modifiedBy);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setModifiedDate(ItxContainerContainerValue obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setNumberOfReplicates(ItxContainerContainerValue obj, int index) {
-        Integer numberOfReplicates = new Integer(index);
-        obj.setNumberOfReplicates(numberOfReplicates);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setNumericValue(ItxContainerContainerValue obj, int index) {
-        BigDecimal numericValue = BigDecimal.valueOf(index);
-        if (numericValue.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
-            numericValue = new BigDecimal("99999999999999999999.999999999999999999");
-        }
-        obj.setNumericValue(numericValue);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setOperatorKind(ItxContainerContainerValue obj, int index) {
-        String operatorKind = "operator_" + index;
-        if (operatorKind.length() > 10) {
-            operatorKind = operatorKind.substring(0, 10);
-        }
-        obj.setOperatorKind(operatorKind);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setOperatorType(ItxContainerContainerValue obj, int index) {
-        String operatorType = "operatorType_" + index;
-        if (operatorType.length() > 25) {
-            operatorType = operatorType.substring(0, 25);
-        }
-        obj.setOperatorType(operatorType);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setOperatorTypeAndKind(ItxContainerContainerValue obj, int index) {
-        String operatorTypeAndKind = "operatorTypeAndKind_" + index;
-        if (operatorTypeAndKind.length() > 50) {
-            operatorTypeAndKind = operatorTypeAndKind.substring(0, 50);
-        }
-        obj.setOperatorTypeAndKind(operatorTypeAndKind);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setPublicData(ItxContainerContainerValue obj, int index) {
-        Boolean publicData = true;
-        obj.setPublicData(publicData);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setRecordedBy(ItxContainerContainerValue obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setRecordedDate(ItxContainerContainerValue obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setSigFigs(ItxContainerContainerValue obj, int index) {
-        Integer sigFigs = new Integer(index);
-        obj.setSigFigs(sigFigs);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setStringValue(ItxContainerContainerValue obj, int index) {
-        String stringValue = "stringValue_" + index;
-        if (stringValue.length() > 255) {
-            stringValue = stringValue.substring(0, 255);
-        }
-        obj.setStringValue(stringValue);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setUncertainty(ItxContainerContainerValue obj, int index) {
-        BigDecimal uncertainty = BigDecimal.valueOf(index);
-        if (uncertainty.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
-            uncertainty = new BigDecimal("99999999999999999999.999999999999999999");
-        }
-        obj.setUncertainty(uncertainty);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setUncertaintyType(ItxContainerContainerValue obj, int index) {
-        String uncertaintyType = "uncertaintyType_" + index;
-        if (uncertaintyType.length() > 255) {
-            uncertaintyType = uncertaintyType.substring(0, 255);
-        }
-        obj.setUncertaintyType(uncertaintyType);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setUnitKind(ItxContainerContainerValue obj, int index) {
-        String unitKind = "unitKind_" + index;
-        if (unitKind.length() > 25) {
-            unitKind = unitKind.substring(0, 25);
-        }
-        obj.setUnitKind(unitKind);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setUnitType(ItxContainerContainerValue obj, int index) {
-        String unitType = "unitType_" + index;
-        if (unitType.length() > 25) {
-            unitType = unitType.substring(0, 25);
-        }
-        obj.setUnitType(unitType);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setUnitTypeAndKind(ItxContainerContainerValue obj, int index) {
-        String unitTypeAndKind = "unitTypeAndKind_" + index;
-        if (unitTypeAndKind.length() > 55) {
-            unitTypeAndKind = unitTypeAndKind.substring(0, 55);
-        }
-        obj.setUnitTypeAndKind(unitTypeAndKind);
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.setUrlValue(ItxContainerContainerValue obj, int index) {
-        String urlValue = "urlValue_" + index;
-        if (urlValue.length() > 2000) {
-            urlValue = urlValue.substring(0, 2000);
-        }
-        obj.setUrlValue(urlValue);
-    }
-    
-    public ItxContainerContainerValue ItxContainerContainerValueDataOnDemand.getSpecificItxContainerContainerValue(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        ItxContainerContainerValue obj = data.get(index);
-        Long id = obj.getId();
-        return ItxContainerContainerValue.findItxContainerContainerValue(id);
-    }
-    
-    public ItxContainerContainerValue ItxContainerContainerValueDataOnDemand.getRandomItxContainerContainerValue() {
-        init();
-        ItxContainerContainerValue obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return ItxContainerContainerValue.findItxContainerContainerValue(id);
-    }
-    
-    public boolean ItxContainerContainerValueDataOnDemand.modifyItxContainerContainerValue(ItxContainerContainerValue obj) {
-        return false;
-    }
-    
-    public void ItxContainerContainerValueDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = ItxContainerContainerValue.findItxContainerContainerValueEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ItxContainerContainerValue' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<ItxContainerContainerValue>();
-        for (int i = 0; i < 10; i++) {
-            ItxContainerContainerValue obj = getNewTransientItxContainerContainerValue(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueIntegrationTest.java
index 204677863..cf423ce9e 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = ItxContainerContainerValue.class)
 public class ItxContainerContainerValueIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ItxContainerContainerValueDataOnDemand dod;
+
+	@Test
+    public void testCountItxContainerContainerValues() {
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to initialize correctly", dod.getRandomItxContainerContainerValue());
+        long count = ItxContainerContainerValue.countItxContainerContainerValues();
+        Assert.assertTrue("Counter for 'ItxContainerContainerValue' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindItxContainerContainerValue() {
+        ItxContainerContainerValue obj = dod.getRandomItxContainerContainerValue();
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to provide an identifier", id);
+        obj = ItxContainerContainerValue.findItxContainerContainerValue(id);
+        Assert.assertNotNull("Find method for 'ItxContainerContainerValue' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'ItxContainerContainerValue' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllItxContainerContainerValues() {
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to initialize correctly", dod.getRandomItxContainerContainerValue());
+        long count = ItxContainerContainerValue.countItxContainerContainerValues();
+        Assert.assertTrue("Too expensive to perform a find all test for 'ItxContainerContainerValue', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<ItxContainerContainerValue> result = ItxContainerContainerValue.findAllItxContainerContainerValues();
+        Assert.assertNotNull("Find all method for 'ItxContainerContainerValue' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'ItxContainerContainerValue' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindItxContainerContainerValueEntries() {
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to initialize correctly", dod.getRandomItxContainerContainerValue());
+        long count = ItxContainerContainerValue.countItxContainerContainerValues();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<ItxContainerContainerValue> result = ItxContainerContainerValue.findItxContainerContainerValueEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'ItxContainerContainerValue' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'ItxContainerContainerValue' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        ItxContainerContainerValue obj = dod.getRandomItxContainerContainerValue();
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to provide an identifier", id);
+        obj = ItxContainerContainerValue.findItxContainerContainerValue(id);
+        Assert.assertNotNull("Find method for 'ItxContainerContainerValue' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyItxContainerContainerValue(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'ItxContainerContainerValue' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        ItxContainerContainerValue obj = dod.getRandomItxContainerContainerValue();
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to provide an identifier", id);
+        obj = ItxContainerContainerValue.findItxContainerContainerValue(id);
+        boolean modified =  dod.modifyItxContainerContainerValue(obj);
+        Integer currentVersion = obj.getVersion();
+        ItxContainerContainerValue merged = (ItxContainerContainerValue)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'ItxContainerContainerValue' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to initialize correctly", dod.getRandomItxContainerContainerValue());
+        ItxContainerContainerValue obj = dod.getNewTransientItxContainerContainerValue(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'ItxContainerContainerValue' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'ItxContainerContainerValue' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        ItxContainerContainerValue obj = dod.getRandomItxContainerContainerValue();
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to provide an identifier", id);
+        obj = ItxContainerContainerValue.findItxContainerContainerValue(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'ItxContainerContainerValue' with identifier '" + id + "'", ItxContainerContainerValue.findItxContainerContainerValue(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index c59d837c7..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxContainerContainerValueIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ItxContainerContainerValueIntegrationTest_Roo_Configurable {
-    
-    declare @type: ItxContainerContainerValueIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index cc0449716..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxContainerContainerValue;
-import com.labsynch.labseer.domain.ItxContainerContainerValueDataOnDemand;
-import com.labsynch.labseer.domain.ItxContainerContainerValueIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ItxContainerContainerValueIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ItxContainerContainerValueIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ItxContainerContainerValueIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ItxContainerContainerValueIntegrationTest: @Transactional;
-    
-    @Autowired
-    ItxContainerContainerValueDataOnDemand ItxContainerContainerValueIntegrationTest.dod;
-    
-    @Test
-    public void ItxContainerContainerValueIntegrationTest.testCountItxContainerContainerValues() {
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to initialize correctly", dod.getRandomItxContainerContainerValue());
-        long count = ItxContainerContainerValue.countItxContainerContainerValues();
-        Assert.assertTrue("Counter for 'ItxContainerContainerValue' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ItxContainerContainerValueIntegrationTest.testFindItxContainerContainerValue() {
-        ItxContainerContainerValue obj = dod.getRandomItxContainerContainerValue();
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to provide an identifier", id);
-        obj = ItxContainerContainerValue.findItxContainerContainerValue(id);
-        Assert.assertNotNull("Find method for 'ItxContainerContainerValue' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ItxContainerContainerValue' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ItxContainerContainerValueIntegrationTest.testFindAllItxContainerContainerValues() {
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to initialize correctly", dod.getRandomItxContainerContainerValue());
-        long count = ItxContainerContainerValue.countItxContainerContainerValues();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ItxContainerContainerValue', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<ItxContainerContainerValue> result = ItxContainerContainerValue.findAllItxContainerContainerValues();
-        Assert.assertNotNull("Find all method for 'ItxContainerContainerValue' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ItxContainerContainerValue' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ItxContainerContainerValueIntegrationTest.testFindItxContainerContainerValueEntries() {
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to initialize correctly", dod.getRandomItxContainerContainerValue());
-        long count = ItxContainerContainerValue.countItxContainerContainerValues();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<ItxContainerContainerValue> result = ItxContainerContainerValue.findItxContainerContainerValueEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'ItxContainerContainerValue' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ItxContainerContainerValue' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ItxContainerContainerValueIntegrationTest.testFlush() {
-        ItxContainerContainerValue obj = dod.getRandomItxContainerContainerValue();
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to provide an identifier", id);
-        obj = ItxContainerContainerValue.findItxContainerContainerValue(id);
-        Assert.assertNotNull("Find method for 'ItxContainerContainerValue' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyItxContainerContainerValue(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'ItxContainerContainerValue' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ItxContainerContainerValueIntegrationTest.testMergeUpdate() {
-        ItxContainerContainerValue obj = dod.getRandomItxContainerContainerValue();
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to provide an identifier", id);
-        obj = ItxContainerContainerValue.findItxContainerContainerValue(id);
-        boolean modified =  dod.modifyItxContainerContainerValue(obj);
-        Integer currentVersion = obj.getVersion();
-        ItxContainerContainerValue merged = (ItxContainerContainerValue)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ItxContainerContainerValue' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ItxContainerContainerValueIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to initialize correctly", dod.getRandomItxContainerContainerValue());
-        ItxContainerContainerValue obj = dod.getNewTransientItxContainerContainerValue(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'ItxContainerContainerValue' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'ItxContainerContainerValue' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ItxContainerContainerValueIntegrationTest.testRemove() {
-        ItxContainerContainerValue obj = dod.getRandomItxContainerContainerValue();
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to provide an identifier", id);
-        obj = ItxContainerContainerValue.findItxContainerContainerValue(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'ItxContainerContainerValue' with identifier '" + id + "'", ItxContainerContainerValue.findItxContainerContainerValue(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerDataOnDemand.java
index 5c4593f4e..4b0757cbd 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerDataOnDemand.java
@@ -1,7 +1,186 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Configurable
+@Component
 @RooDataOnDemand(entity = ItxSubjectContainer.class)
 public class ItxSubjectContainerDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<ItxSubjectContainer> data;
+
+	@Autowired
+    ContainerDataOnDemand containerDataOnDemand;
+
+	@Autowired
+    SubjectDataOnDemand subjectDataOnDemand;
+
+	public ItxSubjectContainer getNewTransientItxSubjectContainer(int index) {
+        ItxSubjectContainer obj = new ItxSubjectContainer();
+        setCodeName(obj, index);
+        setContainer(obj, index);
+        setDeleted(obj, index);
+        setIgnored(obj, index);
+        setLsKind(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedBy(obj, index);
+        setModifiedDate(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        setSubject(obj, index);
+        return obj;
+    }
+
+	public void setCodeName(ItxSubjectContainer obj, int index) {
+        String codeName = "codeName_" + index;
+        if (codeName.length() > 255) {
+            codeName = new Random().nextInt(10) + codeName.substring(1, 255);
+        }
+        obj.setCodeName(codeName);
+    }
+
+	public void setContainer(ItxSubjectContainer obj, int index) {
+        Container container = containerDataOnDemand.getRandomContainer();
+        obj.setContainer(container);
+    }
+
+	public void setDeleted(ItxSubjectContainer obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setIgnored(ItxSubjectContainer obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setLsKind(ItxSubjectContainer obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsTransaction(ItxSubjectContainer obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(ItxSubjectContainer obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 255) {
+            lsType = lsType.substring(0, 255);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(ItxSubjectContainer obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedBy(ItxSubjectContainer obj, int index) {
+        String modifiedBy = "modifiedBy_" + index;
+        if (modifiedBy.length() > 255) {
+            modifiedBy = modifiedBy.substring(0, 255);
+        }
+        obj.setModifiedBy(modifiedBy);
+    }
+
+	public void setModifiedDate(ItxSubjectContainer obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setRecordedBy(ItxSubjectContainer obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(ItxSubjectContainer obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public void setSubject(ItxSubjectContainer obj, int index) {
+        Subject subject = subjectDataOnDemand.getRandomSubject();
+        obj.setSubject(subject);
+    }
+
+	public ItxSubjectContainer getSpecificItxSubjectContainer(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        ItxSubjectContainer obj = data.get(index);
+        Long id = obj.getId();
+        return ItxSubjectContainer.findItxSubjectContainer(id);
+    }
+
+	public ItxSubjectContainer getRandomItxSubjectContainer() {
+        init();
+        ItxSubjectContainer obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return ItxSubjectContainer.findItxSubjectContainer(id);
+    }
+
+	public boolean modifyItxSubjectContainer(ItxSubjectContainer obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = ItxSubjectContainer.findItxSubjectContainerEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'ItxSubjectContainer' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<ItxSubjectContainer>();
+        for (int i = 0; i < 10; i++) {
+            ItxSubjectContainer obj = getNewTransientItxSubjectContainer(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index adfbdc367..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxSubjectContainerDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ItxSubjectContainerDataOnDemand_Roo_Configurable {
-    
-    declare @type: ItxSubjectContainerDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 700b7779c..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,193 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ContainerDataOnDemand;
-import com.labsynch.labseer.domain.ItxSubjectContainer;
-import com.labsynch.labseer.domain.ItxSubjectContainerDataOnDemand;
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.SubjectDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect ItxSubjectContainerDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ItxSubjectContainerDataOnDemand: @Component;
-    
-    private Random ItxSubjectContainerDataOnDemand.rnd = new SecureRandom();
-    
-    private List<ItxSubjectContainer> ItxSubjectContainerDataOnDemand.data;
-    
-    @Autowired
-    ContainerDataOnDemand ItxSubjectContainerDataOnDemand.containerDataOnDemand;
-    
-    @Autowired
-    SubjectDataOnDemand ItxSubjectContainerDataOnDemand.subjectDataOnDemand;
-    
-    public ItxSubjectContainer ItxSubjectContainerDataOnDemand.getNewTransientItxSubjectContainer(int index) {
-        ItxSubjectContainer obj = new ItxSubjectContainer();
-        setCodeName(obj, index);
-        setContainer(obj, index);
-        setDeleted(obj, index);
-        setIgnored(obj, index);
-        setLsKind(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedBy(obj, index);
-        setModifiedDate(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        setSubject(obj, index);
-        return obj;
-    }
-    
-    public void ItxSubjectContainerDataOnDemand.setCodeName(ItxSubjectContainer obj, int index) {
-        String codeName = "codeName_" + index;
-        if (codeName.length() > 255) {
-            codeName = new Random().nextInt(10) + codeName.substring(1, 255);
-        }
-        obj.setCodeName(codeName);
-    }
-    
-    public void ItxSubjectContainerDataOnDemand.setContainer(ItxSubjectContainer obj, int index) {
-        Container container = containerDataOnDemand.getRandomContainer();
-        obj.setContainer(container);
-    }
-    
-    public void ItxSubjectContainerDataOnDemand.setDeleted(ItxSubjectContainer obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void ItxSubjectContainerDataOnDemand.setIgnored(ItxSubjectContainer obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void ItxSubjectContainerDataOnDemand.setLsKind(ItxSubjectContainer obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void ItxSubjectContainerDataOnDemand.setLsTransaction(ItxSubjectContainer obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void ItxSubjectContainerDataOnDemand.setLsType(ItxSubjectContainer obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 255) {
-            lsType = lsType.substring(0, 255);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void ItxSubjectContainerDataOnDemand.setLsTypeAndKind(ItxSubjectContainer obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void ItxSubjectContainerDataOnDemand.setModifiedBy(ItxSubjectContainer obj, int index) {
-        String modifiedBy = "modifiedBy_" + index;
-        if (modifiedBy.length() > 255) {
-            modifiedBy = modifiedBy.substring(0, 255);
-        }
-        obj.setModifiedBy(modifiedBy);
-    }
-    
-    public void ItxSubjectContainerDataOnDemand.setModifiedDate(ItxSubjectContainer obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void ItxSubjectContainerDataOnDemand.setRecordedBy(ItxSubjectContainer obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void ItxSubjectContainerDataOnDemand.setRecordedDate(ItxSubjectContainer obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public void ItxSubjectContainerDataOnDemand.setSubject(ItxSubjectContainer obj, int index) {
-        Subject subject = subjectDataOnDemand.getRandomSubject();
-        obj.setSubject(subject);
-    }
-    
-    public ItxSubjectContainer ItxSubjectContainerDataOnDemand.getSpecificItxSubjectContainer(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        ItxSubjectContainer obj = data.get(index);
-        Long id = obj.getId();
-        return ItxSubjectContainer.findItxSubjectContainer(id);
-    }
-    
-    public ItxSubjectContainer ItxSubjectContainerDataOnDemand.getRandomItxSubjectContainer() {
-        init();
-        ItxSubjectContainer obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return ItxSubjectContainer.findItxSubjectContainer(id);
-    }
-    
-    public boolean ItxSubjectContainerDataOnDemand.modifyItxSubjectContainer(ItxSubjectContainer obj) {
-        return false;
-    }
-    
-    public void ItxSubjectContainerDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = ItxSubjectContainer.findItxSubjectContainerEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ItxSubjectContainer' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<ItxSubjectContainer>();
-        for (int i = 0; i < 10; i++) {
-            ItxSubjectContainer obj = getNewTransientItxSubjectContainer(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerIntegrationTest.java
index 5720601a5..cbf7e95ea 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = ItxSubjectContainer.class)
 public class ItxSubjectContainerIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ItxSubjectContainerDataOnDemand dod;
+
+	@Test
+    public void testCountItxSubjectContainers() {
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to initialize correctly", dod.getRandomItxSubjectContainer());
+        long count = ItxSubjectContainer.countItxSubjectContainers();
+        Assert.assertTrue("Counter for 'ItxSubjectContainer' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindItxSubjectContainer() {
+        ItxSubjectContainer obj = dod.getRandomItxSubjectContainer();
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to provide an identifier", id);
+        obj = ItxSubjectContainer.findItxSubjectContainer(id);
+        Assert.assertNotNull("Find method for 'ItxSubjectContainer' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'ItxSubjectContainer' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllItxSubjectContainers() {
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to initialize correctly", dod.getRandomItxSubjectContainer());
+        long count = ItxSubjectContainer.countItxSubjectContainers();
+        Assert.assertTrue("Too expensive to perform a find all test for 'ItxSubjectContainer', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<ItxSubjectContainer> result = ItxSubjectContainer.findAllItxSubjectContainers();
+        Assert.assertNotNull("Find all method for 'ItxSubjectContainer' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'ItxSubjectContainer' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindItxSubjectContainerEntries() {
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to initialize correctly", dod.getRandomItxSubjectContainer());
+        long count = ItxSubjectContainer.countItxSubjectContainers();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<ItxSubjectContainer> result = ItxSubjectContainer.findItxSubjectContainerEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'ItxSubjectContainer' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'ItxSubjectContainer' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        ItxSubjectContainer obj = dod.getRandomItxSubjectContainer();
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to provide an identifier", id);
+        obj = ItxSubjectContainer.findItxSubjectContainer(id);
+        Assert.assertNotNull("Find method for 'ItxSubjectContainer' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyItxSubjectContainer(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'ItxSubjectContainer' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        ItxSubjectContainer obj = dod.getRandomItxSubjectContainer();
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to provide an identifier", id);
+        obj = ItxSubjectContainer.findItxSubjectContainer(id);
+        boolean modified =  dod.modifyItxSubjectContainer(obj);
+        Integer currentVersion = obj.getVersion();
+        ItxSubjectContainer merged = (ItxSubjectContainer)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'ItxSubjectContainer' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to initialize correctly", dod.getRandomItxSubjectContainer());
+        ItxSubjectContainer obj = dod.getNewTransientItxSubjectContainer(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'ItxSubjectContainer' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'ItxSubjectContainer' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        ItxSubjectContainer obj = dod.getRandomItxSubjectContainer();
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to provide an identifier", id);
+        obj = ItxSubjectContainer.findItxSubjectContainer(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'ItxSubjectContainer' with identifier '" + id + "'", ItxSubjectContainer.findItxSubjectContainer(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 915b2c20f..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxSubjectContainerIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ItxSubjectContainerIntegrationTest_Roo_Configurable {
-    
-    declare @type: ItxSubjectContainerIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 73bb84704..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxSubjectContainer;
-import com.labsynch.labseer.domain.ItxSubjectContainerDataOnDemand;
-import com.labsynch.labseer.domain.ItxSubjectContainerIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ItxSubjectContainerIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ItxSubjectContainerIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ItxSubjectContainerIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ItxSubjectContainerIntegrationTest: @Transactional;
-    
-    @Autowired
-    ItxSubjectContainerDataOnDemand ItxSubjectContainerIntegrationTest.dod;
-    
-    @Test
-    public void ItxSubjectContainerIntegrationTest.testCountItxSubjectContainers() {
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to initialize correctly", dod.getRandomItxSubjectContainer());
-        long count = ItxSubjectContainer.countItxSubjectContainers();
-        Assert.assertTrue("Counter for 'ItxSubjectContainer' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ItxSubjectContainerIntegrationTest.testFindItxSubjectContainer() {
-        ItxSubjectContainer obj = dod.getRandomItxSubjectContainer();
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to provide an identifier", id);
-        obj = ItxSubjectContainer.findItxSubjectContainer(id);
-        Assert.assertNotNull("Find method for 'ItxSubjectContainer' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ItxSubjectContainer' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ItxSubjectContainerIntegrationTest.testFindAllItxSubjectContainers() {
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to initialize correctly", dod.getRandomItxSubjectContainer());
-        long count = ItxSubjectContainer.countItxSubjectContainers();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ItxSubjectContainer', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<ItxSubjectContainer> result = ItxSubjectContainer.findAllItxSubjectContainers();
-        Assert.assertNotNull("Find all method for 'ItxSubjectContainer' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ItxSubjectContainer' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ItxSubjectContainerIntegrationTest.testFindItxSubjectContainerEntries() {
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to initialize correctly", dod.getRandomItxSubjectContainer());
-        long count = ItxSubjectContainer.countItxSubjectContainers();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<ItxSubjectContainer> result = ItxSubjectContainer.findItxSubjectContainerEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'ItxSubjectContainer' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ItxSubjectContainer' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ItxSubjectContainerIntegrationTest.testFlush() {
-        ItxSubjectContainer obj = dod.getRandomItxSubjectContainer();
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to provide an identifier", id);
-        obj = ItxSubjectContainer.findItxSubjectContainer(id);
-        Assert.assertNotNull("Find method for 'ItxSubjectContainer' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyItxSubjectContainer(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'ItxSubjectContainer' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ItxSubjectContainerIntegrationTest.testMergeUpdate() {
-        ItxSubjectContainer obj = dod.getRandomItxSubjectContainer();
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to provide an identifier", id);
-        obj = ItxSubjectContainer.findItxSubjectContainer(id);
-        boolean modified =  dod.modifyItxSubjectContainer(obj);
-        Integer currentVersion = obj.getVersion();
-        ItxSubjectContainer merged = (ItxSubjectContainer)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ItxSubjectContainer' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ItxSubjectContainerIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to initialize correctly", dod.getRandomItxSubjectContainer());
-        ItxSubjectContainer obj = dod.getNewTransientItxSubjectContainer(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'ItxSubjectContainer' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'ItxSubjectContainer' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ItxSubjectContainerIntegrationTest.testRemove() {
-        ItxSubjectContainer obj = dod.getRandomItxSubjectContainer();
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to provide an identifier", id);
-        obj = ItxSubjectContainer.findItxSubjectContainer(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'ItxSubjectContainer' with identifier '" + id + "'", ItxSubjectContainer.findItxSubjectContainer(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateDataOnDemand.java
index d3c6648f8..e8d2041a0 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateDataOnDemand.java
@@ -1,7 +1,171 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Component
+@Configurable
 @RooDataOnDemand(entity = ItxSubjectContainerState.class)
 public class ItxSubjectContainerStateDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<ItxSubjectContainerState> data;
+
+	@Autowired
+    ItxSubjectContainerDataOnDemand itxSubjectContainerDataOnDemand;
+
+	public ItxSubjectContainerState getNewTransientItxSubjectContainerState(int index) {
+        ItxSubjectContainerState obj = new ItxSubjectContainerState();
+        setComments(obj, index);
+        setDeleted(obj, index);
+        setIgnored(obj, index);
+        setLsKind(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedBy(obj, index);
+        setModifiedDate(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        return obj;
+    }
+
+	public void setComments(ItxSubjectContainerState obj, int index) {
+        String comments = "comments_" + index;
+        if (comments.length() > 512) {
+            comments = comments.substring(0, 512);
+        }
+        obj.setComments(comments);
+    }
+
+	public void setDeleted(ItxSubjectContainerState obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setIgnored(ItxSubjectContainerState obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setLsKind(ItxSubjectContainerState obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsTransaction(ItxSubjectContainerState obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(ItxSubjectContainerState obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 64) {
+            lsType = lsType.substring(0, 64);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(ItxSubjectContainerState obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedBy(ItxSubjectContainerState obj, int index) {
+        String modifiedBy = "modifiedBy_" + index;
+        if (modifiedBy.length() > 255) {
+            modifiedBy = modifiedBy.substring(0, 255);
+        }
+        obj.setModifiedBy(modifiedBy);
+    }
+
+	public void setModifiedDate(ItxSubjectContainerState obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setRecordedBy(ItxSubjectContainerState obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(ItxSubjectContainerState obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public ItxSubjectContainerState getSpecificItxSubjectContainerState(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        ItxSubjectContainerState obj = data.get(index);
+        Long id = obj.getId();
+        return ItxSubjectContainerState.findItxSubjectContainerState(id);
+    }
+
+	public ItxSubjectContainerState getRandomItxSubjectContainerState() {
+        init();
+        ItxSubjectContainerState obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return ItxSubjectContainerState.findItxSubjectContainerState(id);
+    }
+
+	public boolean modifyItxSubjectContainerState(ItxSubjectContainerState obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = ItxSubjectContainerState.findItxSubjectContainerStateEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'ItxSubjectContainerState' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<ItxSubjectContainerState>();
+        for (int i = 0; i < 10; i++) {
+            ItxSubjectContainerState obj = getNewTransientItxSubjectContainerState(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 3d4444cc2..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxSubjectContainerStateDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ItxSubjectContainerStateDataOnDemand_Roo_Configurable {
-    
-    declare @type: ItxSubjectContainerStateDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 36f35a186..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,175 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxSubjectContainerDataOnDemand;
-import com.labsynch.labseer.domain.ItxSubjectContainerState;
-import com.labsynch.labseer.domain.ItxSubjectContainerStateDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect ItxSubjectContainerStateDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ItxSubjectContainerStateDataOnDemand: @Component;
-    
-    private Random ItxSubjectContainerStateDataOnDemand.rnd = new SecureRandom();
-    
-    private List<ItxSubjectContainerState> ItxSubjectContainerStateDataOnDemand.data;
-    
-    @Autowired
-    ItxSubjectContainerDataOnDemand ItxSubjectContainerStateDataOnDemand.itxSubjectContainerDataOnDemand;
-    
-    public ItxSubjectContainerState ItxSubjectContainerStateDataOnDemand.getNewTransientItxSubjectContainerState(int index) {
-        ItxSubjectContainerState obj = new ItxSubjectContainerState();
-        setComments(obj, index);
-        setDeleted(obj, index);
-        setIgnored(obj, index);
-        setLsKind(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedBy(obj, index);
-        setModifiedDate(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        return obj;
-    }
-    
-    public void ItxSubjectContainerStateDataOnDemand.setComments(ItxSubjectContainerState obj, int index) {
-        String comments = "comments_" + index;
-        if (comments.length() > 512) {
-            comments = comments.substring(0, 512);
-        }
-        obj.setComments(comments);
-    }
-    
-    public void ItxSubjectContainerStateDataOnDemand.setDeleted(ItxSubjectContainerState obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void ItxSubjectContainerStateDataOnDemand.setIgnored(ItxSubjectContainerState obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void ItxSubjectContainerStateDataOnDemand.setLsKind(ItxSubjectContainerState obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void ItxSubjectContainerStateDataOnDemand.setLsTransaction(ItxSubjectContainerState obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void ItxSubjectContainerStateDataOnDemand.setLsType(ItxSubjectContainerState obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 64) {
-            lsType = lsType.substring(0, 64);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void ItxSubjectContainerStateDataOnDemand.setLsTypeAndKind(ItxSubjectContainerState obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void ItxSubjectContainerStateDataOnDemand.setModifiedBy(ItxSubjectContainerState obj, int index) {
-        String modifiedBy = "modifiedBy_" + index;
-        if (modifiedBy.length() > 255) {
-            modifiedBy = modifiedBy.substring(0, 255);
-        }
-        obj.setModifiedBy(modifiedBy);
-    }
-    
-    public void ItxSubjectContainerStateDataOnDemand.setModifiedDate(ItxSubjectContainerState obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void ItxSubjectContainerStateDataOnDemand.setRecordedBy(ItxSubjectContainerState obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void ItxSubjectContainerStateDataOnDemand.setRecordedDate(ItxSubjectContainerState obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public ItxSubjectContainerState ItxSubjectContainerStateDataOnDemand.getSpecificItxSubjectContainerState(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        ItxSubjectContainerState obj = data.get(index);
-        Long id = obj.getId();
-        return ItxSubjectContainerState.findItxSubjectContainerState(id);
-    }
-    
-    public ItxSubjectContainerState ItxSubjectContainerStateDataOnDemand.getRandomItxSubjectContainerState() {
-        init();
-        ItxSubjectContainerState obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return ItxSubjectContainerState.findItxSubjectContainerState(id);
-    }
-    
-    public boolean ItxSubjectContainerStateDataOnDemand.modifyItxSubjectContainerState(ItxSubjectContainerState obj) {
-        return false;
-    }
-    
-    public void ItxSubjectContainerStateDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = ItxSubjectContainerState.findItxSubjectContainerStateEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ItxSubjectContainerState' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<ItxSubjectContainerState>();
-        for (int i = 0; i < 10; i++) {
-            ItxSubjectContainerState obj = getNewTransientItxSubjectContainerState(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateIntegrationTest.java
index c1295e7d5..79391c12b 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = ItxSubjectContainerState.class)
 public class ItxSubjectContainerStateIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ItxSubjectContainerStateDataOnDemand dod;
+
+	@Test
+    public void testCountItxSubjectContainerStates() {
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to initialize correctly", dod.getRandomItxSubjectContainerState());
+        long count = ItxSubjectContainerState.countItxSubjectContainerStates();
+        Assert.assertTrue("Counter for 'ItxSubjectContainerState' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindItxSubjectContainerState() {
+        ItxSubjectContainerState obj = dod.getRandomItxSubjectContainerState();
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to provide an identifier", id);
+        obj = ItxSubjectContainerState.findItxSubjectContainerState(id);
+        Assert.assertNotNull("Find method for 'ItxSubjectContainerState' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'ItxSubjectContainerState' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllItxSubjectContainerStates() {
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to initialize correctly", dod.getRandomItxSubjectContainerState());
+        long count = ItxSubjectContainerState.countItxSubjectContainerStates();
+        Assert.assertTrue("Too expensive to perform a find all test for 'ItxSubjectContainerState', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<ItxSubjectContainerState> result = ItxSubjectContainerState.findAllItxSubjectContainerStates();
+        Assert.assertNotNull("Find all method for 'ItxSubjectContainerState' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'ItxSubjectContainerState' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindItxSubjectContainerStateEntries() {
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to initialize correctly", dod.getRandomItxSubjectContainerState());
+        long count = ItxSubjectContainerState.countItxSubjectContainerStates();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<ItxSubjectContainerState> result = ItxSubjectContainerState.findItxSubjectContainerStateEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'ItxSubjectContainerState' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'ItxSubjectContainerState' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        ItxSubjectContainerState obj = dod.getRandomItxSubjectContainerState();
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to provide an identifier", id);
+        obj = ItxSubjectContainerState.findItxSubjectContainerState(id);
+        Assert.assertNotNull("Find method for 'ItxSubjectContainerState' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyItxSubjectContainerState(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'ItxSubjectContainerState' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        ItxSubjectContainerState obj = dod.getRandomItxSubjectContainerState();
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to provide an identifier", id);
+        obj = ItxSubjectContainerState.findItxSubjectContainerState(id);
+        boolean modified =  dod.modifyItxSubjectContainerState(obj);
+        Integer currentVersion = obj.getVersion();
+        ItxSubjectContainerState merged = (ItxSubjectContainerState)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'ItxSubjectContainerState' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to initialize correctly", dod.getRandomItxSubjectContainerState());
+        ItxSubjectContainerState obj = dod.getNewTransientItxSubjectContainerState(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'ItxSubjectContainerState' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'ItxSubjectContainerState' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        ItxSubjectContainerState obj = dod.getRandomItxSubjectContainerState();
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to provide an identifier", id);
+        obj = ItxSubjectContainerState.findItxSubjectContainerState(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'ItxSubjectContainerState' with identifier '" + id + "'", ItxSubjectContainerState.findItxSubjectContainerState(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 3a04674be..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxSubjectContainerStateIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ItxSubjectContainerStateIntegrationTest_Roo_Configurable {
-    
-    declare @type: ItxSubjectContainerStateIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 7c2d9d9fb..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxSubjectContainerState;
-import com.labsynch.labseer.domain.ItxSubjectContainerStateDataOnDemand;
-import com.labsynch.labseer.domain.ItxSubjectContainerStateIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ItxSubjectContainerStateIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ItxSubjectContainerStateIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ItxSubjectContainerStateIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ItxSubjectContainerStateIntegrationTest: @Transactional;
-    
-    @Autowired
-    ItxSubjectContainerStateDataOnDemand ItxSubjectContainerStateIntegrationTest.dod;
-    
-    @Test
-    public void ItxSubjectContainerStateIntegrationTest.testCountItxSubjectContainerStates() {
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to initialize correctly", dod.getRandomItxSubjectContainerState());
-        long count = ItxSubjectContainerState.countItxSubjectContainerStates();
-        Assert.assertTrue("Counter for 'ItxSubjectContainerState' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ItxSubjectContainerStateIntegrationTest.testFindItxSubjectContainerState() {
-        ItxSubjectContainerState obj = dod.getRandomItxSubjectContainerState();
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to provide an identifier", id);
-        obj = ItxSubjectContainerState.findItxSubjectContainerState(id);
-        Assert.assertNotNull("Find method for 'ItxSubjectContainerState' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ItxSubjectContainerState' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ItxSubjectContainerStateIntegrationTest.testFindAllItxSubjectContainerStates() {
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to initialize correctly", dod.getRandomItxSubjectContainerState());
-        long count = ItxSubjectContainerState.countItxSubjectContainerStates();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ItxSubjectContainerState', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<ItxSubjectContainerState> result = ItxSubjectContainerState.findAllItxSubjectContainerStates();
-        Assert.assertNotNull("Find all method for 'ItxSubjectContainerState' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ItxSubjectContainerState' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ItxSubjectContainerStateIntegrationTest.testFindItxSubjectContainerStateEntries() {
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to initialize correctly", dod.getRandomItxSubjectContainerState());
-        long count = ItxSubjectContainerState.countItxSubjectContainerStates();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<ItxSubjectContainerState> result = ItxSubjectContainerState.findItxSubjectContainerStateEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'ItxSubjectContainerState' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ItxSubjectContainerState' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ItxSubjectContainerStateIntegrationTest.testFlush() {
-        ItxSubjectContainerState obj = dod.getRandomItxSubjectContainerState();
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to provide an identifier", id);
-        obj = ItxSubjectContainerState.findItxSubjectContainerState(id);
-        Assert.assertNotNull("Find method for 'ItxSubjectContainerState' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyItxSubjectContainerState(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'ItxSubjectContainerState' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ItxSubjectContainerStateIntegrationTest.testMergeUpdate() {
-        ItxSubjectContainerState obj = dod.getRandomItxSubjectContainerState();
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to provide an identifier", id);
-        obj = ItxSubjectContainerState.findItxSubjectContainerState(id);
-        boolean modified =  dod.modifyItxSubjectContainerState(obj);
-        Integer currentVersion = obj.getVersion();
-        ItxSubjectContainerState merged = (ItxSubjectContainerState)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ItxSubjectContainerState' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ItxSubjectContainerStateIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to initialize correctly", dod.getRandomItxSubjectContainerState());
-        ItxSubjectContainerState obj = dod.getNewTransientItxSubjectContainerState(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'ItxSubjectContainerState' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'ItxSubjectContainerState' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ItxSubjectContainerStateIntegrationTest.testRemove() {
-        ItxSubjectContainerState obj = dod.getRandomItxSubjectContainerState();
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to provide an identifier", id);
-        obj = ItxSubjectContainerState.findItxSubjectContainerState(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'ItxSubjectContainerState' with identifier '" + id + "'", ItxSubjectContainerState.findItxSubjectContainerState(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueDataOnDemand.java
index 6bfbc0f72..3d7c965f5 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueDataOnDemand.java
@@ -1,7 +1,376 @@
 package com.labsynch.labseer.domain;
 
+import java.math.BigDecimal;
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Component
+@Configurable
 @RooDataOnDemand(entity = ItxSubjectContainerValue.class)
 public class ItxSubjectContainerValueDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<ItxSubjectContainerValue> data;
+
+	@Autowired
+    ItxSubjectContainerStateDataOnDemand itxSubjectContainerStateDataOnDemand;
+
+	public ItxSubjectContainerValue getNewTransientItxSubjectContainerValue(int index) {
+        ItxSubjectContainerValue obj = new ItxSubjectContainerValue();
+        setBlobValue(obj, index);
+        setClobValue(obj, index);
+        setCodeKind(obj, index);
+        setCodeOrigin(obj, index);
+        setCodeType(obj, index);
+        setCodeTypeAndKind(obj, index);
+        setCodeValue(obj, index);
+        setComments(obj, index);
+        setConcUnit(obj, index);
+        setConcentration(obj, index);
+        setDateValue(obj, index);
+        setDeleted(obj, index);
+        setFileValue(obj, index);
+        setIgnored(obj, index);
+        setLsKind(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedBy(obj, index);
+        setModifiedDate(obj, index);
+        setNumberOfReplicates(obj, index);
+        setNumericValue(obj, index);
+        setOperatorKind(obj, index);
+        setOperatorType(obj, index);
+        setOperatorTypeAndKind(obj, index);
+        setPublicData(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        setSigFigs(obj, index);
+        setStringValue(obj, index);
+        setUncertainty(obj, index);
+        setUncertaintyType(obj, index);
+        setUnitKind(obj, index);
+        setUnitType(obj, index);
+        setUnitTypeAndKind(obj, index);
+        setUrlValue(obj, index);
+        return obj;
+    }
+
+	public void setBlobValue(ItxSubjectContainerValue obj, int index) {
+        byte[] blobValue = String.valueOf(index).getBytes();
+        obj.setBlobValue(blobValue);
+    }
+
+	public void setClobValue(ItxSubjectContainerValue obj, int index) {
+        String clobValue = "clobValue_" + index;
+        obj.setClobValue(clobValue);
+    }
+
+	public void setCodeKind(ItxSubjectContainerValue obj, int index) {
+        String codeKind = "codeKind_" + index;
+        if (codeKind.length() > 255) {
+            codeKind = codeKind.substring(0, 255);
+        }
+        obj.setCodeKind(codeKind);
+    }
+
+	public void setCodeOrigin(ItxSubjectContainerValue obj, int index) {
+        String codeOrigin = "codeOrigin_" + index;
+        if (codeOrigin.length() > 255) {
+            codeOrigin = codeOrigin.substring(0, 255);
+        }
+        obj.setCodeOrigin(codeOrigin);
+    }
+
+	public void setCodeType(ItxSubjectContainerValue obj, int index) {
+        String codeType = "codeType_" + index;
+        if (codeType.length() > 255) {
+            codeType = codeType.substring(0, 255);
+        }
+        obj.setCodeType(codeType);
+    }
+
+	public void setCodeTypeAndKind(ItxSubjectContainerValue obj, int index) {
+        String codeTypeAndKind = "codeTypeAndKind_" + index;
+        if (codeTypeAndKind.length() > 350) {
+            codeTypeAndKind = codeTypeAndKind.substring(0, 350);
+        }
+        obj.setCodeTypeAndKind(codeTypeAndKind);
+    }
+
+	public void setCodeValue(ItxSubjectContainerValue obj, int index) {
+        String codeValue = "codeValue_" + index;
+        if (codeValue.length() > 255) {
+            codeValue = codeValue.substring(0, 255);
+        }
+        obj.setCodeValue(codeValue);
+    }
+
+	public void setComments(ItxSubjectContainerValue obj, int index) {
+        String comments = "comments_" + index;
+        if (comments.length() > 512) {
+            comments = comments.substring(0, 512);
+        }
+        obj.setComments(comments);
+    }
+
+	public void setConcUnit(ItxSubjectContainerValue obj, int index) {
+        String concUnit = "concUnit_" + index;
+        if (concUnit.length() > 25) {
+            concUnit = concUnit.substring(0, 25);
+        }
+        obj.setConcUnit(concUnit);
+    }
+
+	public void setConcentration(ItxSubjectContainerValue obj, int index) {
+        Double concentration = new Integer(index).doubleValue();
+        obj.setConcentration(concentration);
+    }
+
+	public void setDateValue(ItxSubjectContainerValue obj, int index) {
+        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setDateValue(dateValue);
+    }
+
+	public void setDeleted(ItxSubjectContainerValue obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setFileValue(ItxSubjectContainerValue obj, int index) {
+        String fileValue = "fileValue_" + index;
+        if (fileValue.length() > 512) {
+            fileValue = fileValue.substring(0, 512);
+        }
+        obj.setFileValue(fileValue);
+    }
+
+	public void setIgnored(ItxSubjectContainerValue obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setLsKind(ItxSubjectContainerValue obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsTransaction(ItxSubjectContainerValue obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(ItxSubjectContainerValue obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 64) {
+            lsType = lsType.substring(0, 64);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(ItxSubjectContainerValue obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 350) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 350);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedBy(ItxSubjectContainerValue obj, int index) {
+        String modifiedBy = "modifiedBy_" + index;
+        if (modifiedBy.length() > 255) {
+            modifiedBy = modifiedBy.substring(0, 255);
+        }
+        obj.setModifiedBy(modifiedBy);
+    }
+
+	public void setModifiedDate(ItxSubjectContainerValue obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setNumberOfReplicates(ItxSubjectContainerValue obj, int index) {
+        Integer numberOfReplicates = new Integer(index);
+        obj.setNumberOfReplicates(numberOfReplicates);
+    }
+
+	public void setNumericValue(ItxSubjectContainerValue obj, int index) {
+        BigDecimal numericValue = BigDecimal.valueOf(index);
+        if (numericValue.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
+            numericValue = new BigDecimal("99999999999999999999.999999999999999999");
+        }
+        obj.setNumericValue(numericValue);
+    }
+
+	public void setOperatorKind(ItxSubjectContainerValue obj, int index) {
+        String operatorKind = "operator_" + index;
+        if (operatorKind.length() > 10) {
+            operatorKind = operatorKind.substring(0, 10);
+        }
+        obj.setOperatorKind(operatorKind);
+    }
+
+	public void setOperatorType(ItxSubjectContainerValue obj, int index) {
+        String operatorType = "operatorType_" + index;
+        if (operatorType.length() > 25) {
+            operatorType = operatorType.substring(0, 25);
+        }
+        obj.setOperatorType(operatorType);
+    }
+
+	public void setOperatorTypeAndKind(ItxSubjectContainerValue obj, int index) {
+        String operatorTypeAndKind = "operatorTypeAndKind_" + index;
+        if (operatorTypeAndKind.length() > 50) {
+            operatorTypeAndKind = operatorTypeAndKind.substring(0, 50);
+        }
+        obj.setOperatorTypeAndKind(operatorTypeAndKind);
+    }
+
+	public void setPublicData(ItxSubjectContainerValue obj, int index) {
+        Boolean publicData = true;
+        obj.setPublicData(publicData);
+    }
+
+	public void setRecordedBy(ItxSubjectContainerValue obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(ItxSubjectContainerValue obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public void setSigFigs(ItxSubjectContainerValue obj, int index) {
+        Integer sigFigs = new Integer(index);
+        obj.setSigFigs(sigFigs);
+    }
+
+	public void setStringValue(ItxSubjectContainerValue obj, int index) {
+        String stringValue = "stringValue_" + index;
+        if (stringValue.length() > 255) {
+            stringValue = stringValue.substring(0, 255);
+        }
+        obj.setStringValue(stringValue);
+    }
+
+	public void setUncertainty(ItxSubjectContainerValue obj, int index) {
+        BigDecimal uncertainty = BigDecimal.valueOf(index);
+        if (uncertainty.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
+            uncertainty = new BigDecimal("99999999999999999999.999999999999999999");
+        }
+        obj.setUncertainty(uncertainty);
+    }
+
+	public void setUncertaintyType(ItxSubjectContainerValue obj, int index) {
+        String uncertaintyType = "uncertaintyType_" + index;
+        if (uncertaintyType.length() > 255) {
+            uncertaintyType = uncertaintyType.substring(0, 255);
+        }
+        obj.setUncertaintyType(uncertaintyType);
+    }
+
+	public void setUnitKind(ItxSubjectContainerValue obj, int index) {
+        String unitKind = "unitKind_" + index;
+        if (unitKind.length() > 25) {
+            unitKind = unitKind.substring(0, 25);
+        }
+        obj.setUnitKind(unitKind);
+    }
+
+	public void setUnitType(ItxSubjectContainerValue obj, int index) {
+        String unitType = "unitType_" + index;
+        if (unitType.length() > 25) {
+            unitType = unitType.substring(0, 25);
+        }
+        obj.setUnitType(unitType);
+    }
+
+	public void setUnitTypeAndKind(ItxSubjectContainerValue obj, int index) {
+        String unitTypeAndKind = "unitTypeAndKind_" + index;
+        if (unitTypeAndKind.length() > 55) {
+            unitTypeAndKind = unitTypeAndKind.substring(0, 55);
+        }
+        obj.setUnitTypeAndKind(unitTypeAndKind);
+    }
+
+	public void setUrlValue(ItxSubjectContainerValue obj, int index) {
+        String urlValue = "urlValue_" + index;
+        if (urlValue.length() > 2000) {
+            urlValue = urlValue.substring(0, 2000);
+        }
+        obj.setUrlValue(urlValue);
+    }
+
+	public ItxSubjectContainerValue getSpecificItxSubjectContainerValue(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        ItxSubjectContainerValue obj = data.get(index);
+        Long id = obj.getId();
+        return ItxSubjectContainerValue.findItxSubjectContainerValue(id);
+    }
+
+	public ItxSubjectContainerValue getRandomItxSubjectContainerValue() {
+        init();
+        ItxSubjectContainerValue obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return ItxSubjectContainerValue.findItxSubjectContainerValue(id);
+    }
+
+	public boolean modifyItxSubjectContainerValue(ItxSubjectContainerValue obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = ItxSubjectContainerValue.findItxSubjectContainerValueEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'ItxSubjectContainerValue' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<ItxSubjectContainerValue>();
+        for (int i = 0; i < 10; i++) {
+            ItxSubjectContainerValue obj = getNewTransientItxSubjectContainerValue(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 831b63f75..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxSubjectContainerValueDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ItxSubjectContainerValueDataOnDemand_Roo_Configurable {
-    
-    declare @type: ItxSubjectContainerValueDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 879b29c87..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,380 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxSubjectContainerStateDataOnDemand;
-import com.labsynch.labseer.domain.ItxSubjectContainerValue;
-import com.labsynch.labseer.domain.ItxSubjectContainerValueDataOnDemand;
-import java.math.BigDecimal;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect ItxSubjectContainerValueDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ItxSubjectContainerValueDataOnDemand: @Component;
-    
-    private Random ItxSubjectContainerValueDataOnDemand.rnd = new SecureRandom();
-    
-    private List<ItxSubjectContainerValue> ItxSubjectContainerValueDataOnDemand.data;
-    
-    @Autowired
-    ItxSubjectContainerStateDataOnDemand ItxSubjectContainerValueDataOnDemand.itxSubjectContainerStateDataOnDemand;
-    
-    public ItxSubjectContainerValue ItxSubjectContainerValueDataOnDemand.getNewTransientItxSubjectContainerValue(int index) {
-        ItxSubjectContainerValue obj = new ItxSubjectContainerValue();
-        setBlobValue(obj, index);
-        setClobValue(obj, index);
-        setCodeKind(obj, index);
-        setCodeOrigin(obj, index);
-        setCodeType(obj, index);
-        setCodeTypeAndKind(obj, index);
-        setCodeValue(obj, index);
-        setComments(obj, index);
-        setConcUnit(obj, index);
-        setConcentration(obj, index);
-        setDateValue(obj, index);
-        setDeleted(obj, index);
-        setFileValue(obj, index);
-        setIgnored(obj, index);
-        setLsKind(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedBy(obj, index);
-        setModifiedDate(obj, index);
-        setNumberOfReplicates(obj, index);
-        setNumericValue(obj, index);
-        setOperatorKind(obj, index);
-        setOperatorType(obj, index);
-        setOperatorTypeAndKind(obj, index);
-        setPublicData(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        setSigFigs(obj, index);
-        setStringValue(obj, index);
-        setUncertainty(obj, index);
-        setUncertaintyType(obj, index);
-        setUnitKind(obj, index);
-        setUnitType(obj, index);
-        setUnitTypeAndKind(obj, index);
-        setUrlValue(obj, index);
-        return obj;
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setBlobValue(ItxSubjectContainerValue obj, int index) {
-        byte[] blobValue = String.valueOf(index).getBytes();
-        obj.setBlobValue(blobValue);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setClobValue(ItxSubjectContainerValue obj, int index) {
-        String clobValue = "clobValue_" + index;
-        obj.setClobValue(clobValue);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setCodeKind(ItxSubjectContainerValue obj, int index) {
-        String codeKind = "codeKind_" + index;
-        if (codeKind.length() > 255) {
-            codeKind = codeKind.substring(0, 255);
-        }
-        obj.setCodeKind(codeKind);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setCodeOrigin(ItxSubjectContainerValue obj, int index) {
-        String codeOrigin = "codeOrigin_" + index;
-        if (codeOrigin.length() > 255) {
-            codeOrigin = codeOrigin.substring(0, 255);
-        }
-        obj.setCodeOrigin(codeOrigin);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setCodeType(ItxSubjectContainerValue obj, int index) {
-        String codeType = "codeType_" + index;
-        if (codeType.length() > 255) {
-            codeType = codeType.substring(0, 255);
-        }
-        obj.setCodeType(codeType);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setCodeTypeAndKind(ItxSubjectContainerValue obj, int index) {
-        String codeTypeAndKind = "codeTypeAndKind_" + index;
-        if (codeTypeAndKind.length() > 350) {
-            codeTypeAndKind = codeTypeAndKind.substring(0, 350);
-        }
-        obj.setCodeTypeAndKind(codeTypeAndKind);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setCodeValue(ItxSubjectContainerValue obj, int index) {
-        String codeValue = "codeValue_" + index;
-        if (codeValue.length() > 255) {
-            codeValue = codeValue.substring(0, 255);
-        }
-        obj.setCodeValue(codeValue);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setComments(ItxSubjectContainerValue obj, int index) {
-        String comments = "comments_" + index;
-        if (comments.length() > 512) {
-            comments = comments.substring(0, 512);
-        }
-        obj.setComments(comments);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setConcUnit(ItxSubjectContainerValue obj, int index) {
-        String concUnit = "concUnit_" + index;
-        if (concUnit.length() > 25) {
-            concUnit = concUnit.substring(0, 25);
-        }
-        obj.setConcUnit(concUnit);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setConcentration(ItxSubjectContainerValue obj, int index) {
-        Double concentration = new Integer(index).doubleValue();
-        obj.setConcentration(concentration);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setDateValue(ItxSubjectContainerValue obj, int index) {
-        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setDateValue(dateValue);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setDeleted(ItxSubjectContainerValue obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setFileValue(ItxSubjectContainerValue obj, int index) {
-        String fileValue = "fileValue_" + index;
-        if (fileValue.length() > 512) {
-            fileValue = fileValue.substring(0, 512);
-        }
-        obj.setFileValue(fileValue);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setIgnored(ItxSubjectContainerValue obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setLsKind(ItxSubjectContainerValue obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setLsTransaction(ItxSubjectContainerValue obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setLsType(ItxSubjectContainerValue obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 64) {
-            lsType = lsType.substring(0, 64);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setLsTypeAndKind(ItxSubjectContainerValue obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 350) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 350);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setModifiedBy(ItxSubjectContainerValue obj, int index) {
-        String modifiedBy = "modifiedBy_" + index;
-        if (modifiedBy.length() > 255) {
-            modifiedBy = modifiedBy.substring(0, 255);
-        }
-        obj.setModifiedBy(modifiedBy);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setModifiedDate(ItxSubjectContainerValue obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setNumberOfReplicates(ItxSubjectContainerValue obj, int index) {
-        Integer numberOfReplicates = new Integer(index);
-        obj.setNumberOfReplicates(numberOfReplicates);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setNumericValue(ItxSubjectContainerValue obj, int index) {
-        BigDecimal numericValue = BigDecimal.valueOf(index);
-        if (numericValue.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
-            numericValue = new BigDecimal("99999999999999999999.999999999999999999");
-        }
-        obj.setNumericValue(numericValue);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setOperatorKind(ItxSubjectContainerValue obj, int index) {
-        String operatorKind = "operator_" + index;
-        if (operatorKind.length() > 10) {
-            operatorKind = operatorKind.substring(0, 10);
-        }
-        obj.setOperatorKind(operatorKind);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setOperatorType(ItxSubjectContainerValue obj, int index) {
-        String operatorType = "operatorType_" + index;
-        if (operatorType.length() > 25) {
-            operatorType = operatorType.substring(0, 25);
-        }
-        obj.setOperatorType(operatorType);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setOperatorTypeAndKind(ItxSubjectContainerValue obj, int index) {
-        String operatorTypeAndKind = "operatorTypeAndKind_" + index;
-        if (operatorTypeAndKind.length() > 50) {
-            operatorTypeAndKind = operatorTypeAndKind.substring(0, 50);
-        }
-        obj.setOperatorTypeAndKind(operatorTypeAndKind);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setPublicData(ItxSubjectContainerValue obj, int index) {
-        Boolean publicData = true;
-        obj.setPublicData(publicData);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setRecordedBy(ItxSubjectContainerValue obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setRecordedDate(ItxSubjectContainerValue obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setSigFigs(ItxSubjectContainerValue obj, int index) {
-        Integer sigFigs = new Integer(index);
-        obj.setSigFigs(sigFigs);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setStringValue(ItxSubjectContainerValue obj, int index) {
-        String stringValue = "stringValue_" + index;
-        if (stringValue.length() > 255) {
-            stringValue = stringValue.substring(0, 255);
-        }
-        obj.setStringValue(stringValue);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setUncertainty(ItxSubjectContainerValue obj, int index) {
-        BigDecimal uncertainty = BigDecimal.valueOf(index);
-        if (uncertainty.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
-            uncertainty = new BigDecimal("99999999999999999999.999999999999999999");
-        }
-        obj.setUncertainty(uncertainty);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setUncertaintyType(ItxSubjectContainerValue obj, int index) {
-        String uncertaintyType = "uncertaintyType_" + index;
-        if (uncertaintyType.length() > 255) {
-            uncertaintyType = uncertaintyType.substring(0, 255);
-        }
-        obj.setUncertaintyType(uncertaintyType);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setUnitKind(ItxSubjectContainerValue obj, int index) {
-        String unitKind = "unitKind_" + index;
-        if (unitKind.length() > 25) {
-            unitKind = unitKind.substring(0, 25);
-        }
-        obj.setUnitKind(unitKind);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setUnitType(ItxSubjectContainerValue obj, int index) {
-        String unitType = "unitType_" + index;
-        if (unitType.length() > 25) {
-            unitType = unitType.substring(0, 25);
-        }
-        obj.setUnitType(unitType);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setUnitTypeAndKind(ItxSubjectContainerValue obj, int index) {
-        String unitTypeAndKind = "unitTypeAndKind_" + index;
-        if (unitTypeAndKind.length() > 55) {
-            unitTypeAndKind = unitTypeAndKind.substring(0, 55);
-        }
-        obj.setUnitTypeAndKind(unitTypeAndKind);
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.setUrlValue(ItxSubjectContainerValue obj, int index) {
-        String urlValue = "urlValue_" + index;
-        if (urlValue.length() > 2000) {
-            urlValue = urlValue.substring(0, 2000);
-        }
-        obj.setUrlValue(urlValue);
-    }
-    
-    public ItxSubjectContainerValue ItxSubjectContainerValueDataOnDemand.getSpecificItxSubjectContainerValue(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        ItxSubjectContainerValue obj = data.get(index);
-        Long id = obj.getId();
-        return ItxSubjectContainerValue.findItxSubjectContainerValue(id);
-    }
-    
-    public ItxSubjectContainerValue ItxSubjectContainerValueDataOnDemand.getRandomItxSubjectContainerValue() {
-        init();
-        ItxSubjectContainerValue obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return ItxSubjectContainerValue.findItxSubjectContainerValue(id);
-    }
-    
-    public boolean ItxSubjectContainerValueDataOnDemand.modifyItxSubjectContainerValue(ItxSubjectContainerValue obj) {
-        return false;
-    }
-    
-    public void ItxSubjectContainerValueDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = ItxSubjectContainerValue.findItxSubjectContainerValueEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ItxSubjectContainerValue' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<ItxSubjectContainerValue>();
-        for (int i = 0; i < 10; i++) {
-            ItxSubjectContainerValue obj = getNewTransientItxSubjectContainerValue(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueIntegrationTest.java
index acb8ff798..2ff844a29 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
+@Configurable
 @RooIntegrationTest(entity = ItxSubjectContainerValue.class)
 public class ItxSubjectContainerValueIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ItxSubjectContainerValueDataOnDemand dod;
+
+	@Test
+    public void testCountItxSubjectContainerValues() {
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to initialize correctly", dod.getRandomItxSubjectContainerValue());
+        long count = ItxSubjectContainerValue.countItxSubjectContainerValues();
+        Assert.assertTrue("Counter for 'ItxSubjectContainerValue' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindItxSubjectContainerValue() {
+        ItxSubjectContainerValue obj = dod.getRandomItxSubjectContainerValue();
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to provide an identifier", id);
+        obj = ItxSubjectContainerValue.findItxSubjectContainerValue(id);
+        Assert.assertNotNull("Find method for 'ItxSubjectContainerValue' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'ItxSubjectContainerValue' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllItxSubjectContainerValues() {
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to initialize correctly", dod.getRandomItxSubjectContainerValue());
+        long count = ItxSubjectContainerValue.countItxSubjectContainerValues();
+        Assert.assertTrue("Too expensive to perform a find all test for 'ItxSubjectContainerValue', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<ItxSubjectContainerValue> result = ItxSubjectContainerValue.findAllItxSubjectContainerValues();
+        Assert.assertNotNull("Find all method for 'ItxSubjectContainerValue' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'ItxSubjectContainerValue' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindItxSubjectContainerValueEntries() {
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to initialize correctly", dod.getRandomItxSubjectContainerValue());
+        long count = ItxSubjectContainerValue.countItxSubjectContainerValues();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<ItxSubjectContainerValue> result = ItxSubjectContainerValue.findItxSubjectContainerValueEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'ItxSubjectContainerValue' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'ItxSubjectContainerValue' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        ItxSubjectContainerValue obj = dod.getRandomItxSubjectContainerValue();
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to provide an identifier", id);
+        obj = ItxSubjectContainerValue.findItxSubjectContainerValue(id);
+        Assert.assertNotNull("Find method for 'ItxSubjectContainerValue' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyItxSubjectContainerValue(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'ItxSubjectContainerValue' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        ItxSubjectContainerValue obj = dod.getRandomItxSubjectContainerValue();
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to provide an identifier", id);
+        obj = ItxSubjectContainerValue.findItxSubjectContainerValue(id);
+        boolean modified =  dod.modifyItxSubjectContainerValue(obj);
+        Integer currentVersion = obj.getVersion();
+        ItxSubjectContainerValue merged = (ItxSubjectContainerValue)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'ItxSubjectContainerValue' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to initialize correctly", dod.getRandomItxSubjectContainerValue());
+        ItxSubjectContainerValue obj = dod.getNewTransientItxSubjectContainerValue(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'ItxSubjectContainerValue' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'ItxSubjectContainerValue' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        ItxSubjectContainerValue obj = dod.getRandomItxSubjectContainerValue();
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to provide an identifier", id);
+        obj = ItxSubjectContainerValue.findItxSubjectContainerValue(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'ItxSubjectContainerValue' with identifier '" + id + "'", ItxSubjectContainerValue.findItxSubjectContainerValue(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 1a9e53109..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxSubjectContainerValueIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ItxSubjectContainerValueIntegrationTest_Roo_Configurable {
-    
-    declare @type: ItxSubjectContainerValueIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 15929e7a6..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ItxSubjectContainerValue;
-import com.labsynch.labseer.domain.ItxSubjectContainerValueDataOnDemand;
-import com.labsynch.labseer.domain.ItxSubjectContainerValueIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ItxSubjectContainerValueIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ItxSubjectContainerValueIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ItxSubjectContainerValueIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ItxSubjectContainerValueIntegrationTest: @Transactional;
-    
-    @Autowired
-    ItxSubjectContainerValueDataOnDemand ItxSubjectContainerValueIntegrationTest.dod;
-    
-    @Test
-    public void ItxSubjectContainerValueIntegrationTest.testCountItxSubjectContainerValues() {
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to initialize correctly", dod.getRandomItxSubjectContainerValue());
-        long count = ItxSubjectContainerValue.countItxSubjectContainerValues();
-        Assert.assertTrue("Counter for 'ItxSubjectContainerValue' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ItxSubjectContainerValueIntegrationTest.testFindItxSubjectContainerValue() {
-        ItxSubjectContainerValue obj = dod.getRandomItxSubjectContainerValue();
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to provide an identifier", id);
-        obj = ItxSubjectContainerValue.findItxSubjectContainerValue(id);
-        Assert.assertNotNull("Find method for 'ItxSubjectContainerValue' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ItxSubjectContainerValue' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ItxSubjectContainerValueIntegrationTest.testFindAllItxSubjectContainerValues() {
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to initialize correctly", dod.getRandomItxSubjectContainerValue());
-        long count = ItxSubjectContainerValue.countItxSubjectContainerValues();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ItxSubjectContainerValue', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<ItxSubjectContainerValue> result = ItxSubjectContainerValue.findAllItxSubjectContainerValues();
-        Assert.assertNotNull("Find all method for 'ItxSubjectContainerValue' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ItxSubjectContainerValue' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ItxSubjectContainerValueIntegrationTest.testFindItxSubjectContainerValueEntries() {
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to initialize correctly", dod.getRandomItxSubjectContainerValue());
-        long count = ItxSubjectContainerValue.countItxSubjectContainerValues();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<ItxSubjectContainerValue> result = ItxSubjectContainerValue.findItxSubjectContainerValueEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'ItxSubjectContainerValue' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ItxSubjectContainerValue' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ItxSubjectContainerValueIntegrationTest.testFlush() {
-        ItxSubjectContainerValue obj = dod.getRandomItxSubjectContainerValue();
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to provide an identifier", id);
-        obj = ItxSubjectContainerValue.findItxSubjectContainerValue(id);
-        Assert.assertNotNull("Find method for 'ItxSubjectContainerValue' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyItxSubjectContainerValue(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'ItxSubjectContainerValue' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ItxSubjectContainerValueIntegrationTest.testMergeUpdate() {
-        ItxSubjectContainerValue obj = dod.getRandomItxSubjectContainerValue();
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to provide an identifier", id);
-        obj = ItxSubjectContainerValue.findItxSubjectContainerValue(id);
-        boolean modified =  dod.modifyItxSubjectContainerValue(obj);
-        Integer currentVersion = obj.getVersion();
-        ItxSubjectContainerValue merged = (ItxSubjectContainerValue)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ItxSubjectContainerValue' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ItxSubjectContainerValueIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to initialize correctly", dod.getRandomItxSubjectContainerValue());
-        ItxSubjectContainerValue obj = dod.getNewTransientItxSubjectContainerValue(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'ItxSubjectContainerValue' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'ItxSubjectContainerValue' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ItxSubjectContainerValueIntegrationTest.testRemove() {
-        ItxSubjectContainerValue obj = dod.getRandomItxSubjectContainerValue();
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to provide an identifier", id);
-        obj = ItxSubjectContainerValue.findItxSubjectContainerValue(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'ItxSubjectContainerValue' with identifier '" + id + "'", ItxSubjectContainerValue.findItxSubjectContainerValue(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/LabelKindDataOnDemand.java
index 043ab586f..32f703351 100755
--- a/src/test/java/com/labsynch/labseer/domain/LabelKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/LabelKindDataOnDemand.java
@@ -1,7 +1,102 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Configurable
+@Component
 @RooDataOnDemand(entity = LabelKind.class)
 public class LabelKindDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<LabelKind> data;
+
+	@Autowired
+    LabelTypeDataOnDemand labelTypeDataOnDemand;
+
+	public LabelKind getNewTransientLabelKind(int index) {
+        LabelKind obj = new LabelKind();
+        setKindName(obj, index);
+        setLsTypeAndKind(obj, index);
+        return obj;
+    }
+
+	public void setKindName(LabelKind obj, int index) {
+        String kindName = "kindName_" + index;
+        if (kindName.length() > 255) {
+            kindName = kindName.substring(0, 255);
+        }
+        obj.setKindName(kindName);
+    }
+
+	public void setLsTypeAndKind(LabelKind obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = new Random().nextInt(10) + lsTypeAndKind.substring(1, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public LabelKind getSpecificLabelKind(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        LabelKind obj = data.get(index);
+        Long id = obj.getId();
+        return LabelKind.findLabelKind(id);
+    }
+
+	public LabelKind getRandomLabelKind() {
+        init();
+        LabelKind obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return LabelKind.findLabelKind(id);
+    }
+
+	public boolean modifyLabelKind(LabelKind obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = LabelKind.findLabelKindEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'LabelKind' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<LabelKind>();
+        for (int i = 0; i < 10; i++) {
+            LabelKind obj = getNewTransientLabelKind(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelKindDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/LabelKindDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index a93185ccc..000000000
--- a/src/test/java/com/labsynch/labseer/domain/LabelKindDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelKindDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LabelKindDataOnDemand_Roo_Configurable {
-    
-    declare @type: LabelKindDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelKindDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/LabelKindDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index e11dd7776..000000000
--- a/src/test/java/com/labsynch/labseer/domain/LabelKindDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,106 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelKind;
-import com.labsynch.labseer.domain.LabelKindDataOnDemand;
-import com.labsynch.labseer.domain.LabelTypeDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect LabelKindDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: LabelKindDataOnDemand: @Component;
-    
-    private Random LabelKindDataOnDemand.rnd = new SecureRandom();
-    
-    private List<LabelKind> LabelKindDataOnDemand.data;
-    
-    @Autowired
-    LabelTypeDataOnDemand LabelKindDataOnDemand.labelTypeDataOnDemand;
-    
-    public LabelKind LabelKindDataOnDemand.getNewTransientLabelKind(int index) {
-        LabelKind obj = new LabelKind();
-        setKindName(obj, index);
-        setLsTypeAndKind(obj, index);
-        return obj;
-    }
-    
-    public void LabelKindDataOnDemand.setKindName(LabelKind obj, int index) {
-        String kindName = "kindName_" + index;
-        if (kindName.length() > 255) {
-            kindName = kindName.substring(0, 255);
-        }
-        obj.setKindName(kindName);
-    }
-    
-    public void LabelKindDataOnDemand.setLsTypeAndKind(LabelKind obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = new Random().nextInt(10) + lsTypeAndKind.substring(1, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public LabelKind LabelKindDataOnDemand.getSpecificLabelKind(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        LabelKind obj = data.get(index);
-        Long id = obj.getId();
-        return LabelKind.findLabelKind(id);
-    }
-    
-    public LabelKind LabelKindDataOnDemand.getRandomLabelKind() {
-        init();
-        LabelKind obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return LabelKind.findLabelKind(id);
-    }
-    
-    public boolean LabelKindDataOnDemand.modifyLabelKind(LabelKind obj) {
-        return false;
-    }
-    
-    public void LabelKindDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = LabelKind.findLabelKindEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'LabelKind' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<LabelKind>();
-        for (int i = 0; i < 10; i++) {
-            LabelKind obj = getNewTransientLabelKind(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/LabelKindIntegrationTest.java
index b85448da1..490a5d1a4 100755
--- a/src/test/java/com/labsynch/labseer/domain/LabelKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/LabelKindIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
+@Configurable
 @RooIntegrationTest(entity = LabelKind.class)
 public class LabelKindIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    LabelKindDataOnDemand dod;
+
+	@Test
+    public void testCountLabelKinds() {
+        Assert.assertNotNull("Data on demand for 'LabelKind' failed to initialize correctly", dod.getRandomLabelKind());
+        long count = LabelKind.countLabelKinds();
+        Assert.assertTrue("Counter for 'LabelKind' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindLabelKind() {
+        LabelKind obj = dod.getRandomLabelKind();
+        Assert.assertNotNull("Data on demand for 'LabelKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'LabelKind' failed to provide an identifier", id);
+        obj = LabelKind.findLabelKind(id);
+        Assert.assertNotNull("Find method for 'LabelKind' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'LabelKind' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllLabelKinds() {
+        Assert.assertNotNull("Data on demand for 'LabelKind' failed to initialize correctly", dod.getRandomLabelKind());
+        long count = LabelKind.countLabelKinds();
+        Assert.assertTrue("Too expensive to perform a find all test for 'LabelKind', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<LabelKind> result = LabelKind.findAllLabelKinds();
+        Assert.assertNotNull("Find all method for 'LabelKind' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'LabelKind' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindLabelKindEntries() {
+        Assert.assertNotNull("Data on demand for 'LabelKind' failed to initialize correctly", dod.getRandomLabelKind());
+        long count = LabelKind.countLabelKinds();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<LabelKind> result = LabelKind.findLabelKindEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'LabelKind' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'LabelKind' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        LabelKind obj = dod.getRandomLabelKind();
+        Assert.assertNotNull("Data on demand for 'LabelKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'LabelKind' failed to provide an identifier", id);
+        obj = LabelKind.findLabelKind(id);
+        Assert.assertNotNull("Find method for 'LabelKind' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyLabelKind(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'LabelKind' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        LabelKind obj = dod.getRandomLabelKind();
+        Assert.assertNotNull("Data on demand for 'LabelKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'LabelKind' failed to provide an identifier", id);
+        obj = LabelKind.findLabelKind(id);
+        boolean modified =  dod.modifyLabelKind(obj);
+        Integer currentVersion = obj.getVersion();
+        LabelKind merged = obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'LabelKind' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'LabelKind' failed to initialize correctly", dod.getRandomLabelKind());
+        LabelKind obj = dod.getNewTransientLabelKind(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'LabelKind' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'LabelKind' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'LabelKind' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        LabelKind obj = dod.getRandomLabelKind();
+        Assert.assertNotNull("Data on demand for 'LabelKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'LabelKind' failed to provide an identifier", id);
+        obj = LabelKind.findLabelKind(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'LabelKind' with identifier '" + id + "'", LabelKind.findLabelKind(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelKindIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/LabelKindIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index db8cf8932..000000000
--- a/src/test/java/com/labsynch/labseer/domain/LabelKindIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelKindIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LabelKindIntegrationTest_Roo_Configurable {
-    
-    declare @type: LabelKindIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelKindIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/LabelKindIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index b1e336413..000000000
--- a/src/test/java/com/labsynch/labseer/domain/LabelKindIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelKind;
-import com.labsynch.labseer.domain.LabelKindDataOnDemand;
-import com.labsynch.labseer.domain.LabelKindIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LabelKindIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: LabelKindIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: LabelKindIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: LabelKindIntegrationTest: @Transactional;
-    
-    @Autowired
-    LabelKindDataOnDemand LabelKindIntegrationTest.dod;
-    
-    @Test
-    public void LabelKindIntegrationTest.testCountLabelKinds() {
-        Assert.assertNotNull("Data on demand for 'LabelKind' failed to initialize correctly", dod.getRandomLabelKind());
-        long count = LabelKind.countLabelKinds();
-        Assert.assertTrue("Counter for 'LabelKind' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void LabelKindIntegrationTest.testFindLabelKind() {
-        LabelKind obj = dod.getRandomLabelKind();
-        Assert.assertNotNull("Data on demand for 'LabelKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'LabelKind' failed to provide an identifier", id);
-        obj = LabelKind.findLabelKind(id);
-        Assert.assertNotNull("Find method for 'LabelKind' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'LabelKind' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void LabelKindIntegrationTest.testFindAllLabelKinds() {
-        Assert.assertNotNull("Data on demand for 'LabelKind' failed to initialize correctly", dod.getRandomLabelKind());
-        long count = LabelKind.countLabelKinds();
-        Assert.assertTrue("Too expensive to perform a find all test for 'LabelKind', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<LabelKind> result = LabelKind.findAllLabelKinds();
-        Assert.assertNotNull("Find all method for 'LabelKind' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'LabelKind' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void LabelKindIntegrationTest.testFindLabelKindEntries() {
-        Assert.assertNotNull("Data on demand for 'LabelKind' failed to initialize correctly", dod.getRandomLabelKind());
-        long count = LabelKind.countLabelKinds();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<LabelKind> result = LabelKind.findLabelKindEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'LabelKind' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'LabelKind' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void LabelKindIntegrationTest.testFlush() {
-        LabelKind obj = dod.getRandomLabelKind();
-        Assert.assertNotNull("Data on demand for 'LabelKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'LabelKind' failed to provide an identifier", id);
-        obj = LabelKind.findLabelKind(id);
-        Assert.assertNotNull("Find method for 'LabelKind' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyLabelKind(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'LabelKind' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void LabelKindIntegrationTest.testMergeUpdate() {
-        LabelKind obj = dod.getRandomLabelKind();
-        Assert.assertNotNull("Data on demand for 'LabelKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'LabelKind' failed to provide an identifier", id);
-        obj = LabelKind.findLabelKind(id);
-        boolean modified =  dod.modifyLabelKind(obj);
-        Integer currentVersion = obj.getVersion();
-        LabelKind merged = obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'LabelKind' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void LabelKindIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'LabelKind' failed to initialize correctly", dod.getRandomLabelKind());
-        LabelKind obj = dod.getNewTransientLabelKind(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'LabelKind' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'LabelKind' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'LabelKind' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void LabelKindIntegrationTest.testRemove() {
-        LabelKind obj = dod.getRandomLabelKind();
-        Assert.assertNotNull("Data on demand for 'LabelKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'LabelKind' failed to provide an identifier", id);
-        obj = LabelKind.findLabelKind(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'LabelKind' with identifier '" + id + "'", LabelKind.findLabelKind(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelSequenceDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/LabelSequenceDataOnDemand.java
index 5df618426..75a5d3c51 100755
--- a/src/test/java/com/labsynch/labseer/domain/LabelSequenceDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/LabelSequenceDataOnDemand.java
@@ -1,7 +1,155 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Component
+@Configurable
 @RooDataOnDemand(entity = LabelSequence.class)
 public class LabelSequenceDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<LabelSequence> data;
+
+	public LabelSequence getNewTransientLabelSequence(int index) {
+        LabelSequence obj = new LabelSequence();
+        setDbSequence(obj, index);
+        setDigits(obj, index);
+        setGroupDigits(obj, index);
+        setIgnored(obj, index);
+        setLabelPrefix(obj, index);
+        setLabelSeparator(obj, index);
+        setLabelTypeAndKind(obj, index);
+        setModifiedDate(obj, index);
+        setStartingNumber(obj, index);
+        setThingTypeAndKind(obj, index);
+        return obj;
+    }
+
+	public void setDbSequence(LabelSequence obj, int index) {
+        String dbSequence = "dbSequence_" + index;
+        obj.setDbSequence(dbSequence);
+    }
+
+	public void setDigits(LabelSequence obj, int index) {
+        Integer digits = new Integer(index);
+        obj.setDigits(digits);
+    }
+
+	public void setGroupDigits(LabelSequence obj, int index) {
+        Boolean groupDigits = true;
+        obj.setGroupDigits(groupDigits);
+    }
+
+	public void setIgnored(LabelSequence obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setLabelPrefix(LabelSequence obj, int index) {
+        String labelPrefix = "labelPrefix_" + index;
+        if (labelPrefix.length() > 50) {
+            labelPrefix = labelPrefix.substring(0, 50);
+        }
+        obj.setLabelPrefix(labelPrefix);
+    }
+
+	public void setLabelSeparator(LabelSequence obj, int index) {
+        String labelSeparator = "labelSep_" + index;
+        if (labelSeparator.length() > 10) {
+            labelSeparator = labelSeparator.substring(0, 10);
+        }
+        obj.setLabelSeparator(labelSeparator);
+    }
+
+	public void setLabelTypeAndKind(LabelSequence obj, int index) {
+        String labelTypeAndKind = "labelTypeAndKind_" + index;
+        if (labelTypeAndKind.length() > 255) {
+            labelTypeAndKind = labelTypeAndKind.substring(0, 255);
+        }
+        obj.setLabelTypeAndKind(labelTypeAndKind);
+    }
+
+	public void setModifiedDate(LabelSequence obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setStartingNumber(LabelSequence obj, int index) {
+        Long startingNumber = new Integer(index).longValue();
+        obj.setStartingNumber(startingNumber);
+    }
+
+	public void setThingTypeAndKind(LabelSequence obj, int index) {
+        String thingTypeAndKind = "thingTypeAndKind_" + index;
+        if (thingTypeAndKind.length() > 255) {
+            thingTypeAndKind = thingTypeAndKind.substring(0, 255);
+        }
+        obj.setThingTypeAndKind(thingTypeAndKind);
+    }
+
+	public LabelSequence getSpecificLabelSequence(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        LabelSequence obj = data.get(index);
+        Long id = obj.getId();
+        return LabelSequence.findLabelSequence(id);
+    }
+
+	public LabelSequence getRandomLabelSequence() {
+        init();
+        LabelSequence obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return LabelSequence.findLabelSequence(id);
+    }
+
+	public boolean modifyLabelSequence(LabelSequence obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = LabelSequence.findLabelSequenceEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'LabelSequence' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<LabelSequence>();
+        for (int i = 0; i < 10; i++) {
+            LabelSequence obj = getNewTransientLabelSequence(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelSequenceDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/LabelSequenceDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 622f1fac1..000000000
--- a/src/test/java/com/labsynch/labseer/domain/LabelSequenceDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelSequenceDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LabelSequenceDataOnDemand_Roo_Configurable {
-    
-    declare @type: LabelSequenceDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelSequenceDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/LabelSequenceDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 8cc4842b7..000000000
--- a/src/test/java/com/labsynch/labseer/domain/LabelSequenceDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,158 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelSequence;
-import com.labsynch.labseer.domain.LabelSequenceDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.stereotype.Component;
-
-privileged aspect LabelSequenceDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: LabelSequenceDataOnDemand: @Component;
-    
-    private Random LabelSequenceDataOnDemand.rnd = new SecureRandom();
-    
-    private List<LabelSequence> LabelSequenceDataOnDemand.data;
-    
-    public LabelSequence LabelSequenceDataOnDemand.getNewTransientLabelSequence(int index) {
-        LabelSequence obj = new LabelSequence();
-        setDbSequence(obj, index);
-        setDigits(obj, index);
-        setGroupDigits(obj, index);
-        setIgnored(obj, index);
-        setLabelPrefix(obj, index);
-        setLabelSeparator(obj, index);
-        setLabelTypeAndKind(obj, index);
-        setModifiedDate(obj, index);
-        setStartingNumber(obj, index);
-        setThingTypeAndKind(obj, index);
-        return obj;
-    }
-    
-    public void LabelSequenceDataOnDemand.setDbSequence(LabelSequence obj, int index) {
-        String dbSequence = "dbSequence_" + index;
-        obj.setDbSequence(dbSequence);
-    }
-    
-    public void LabelSequenceDataOnDemand.setDigits(LabelSequence obj, int index) {
-        Integer digits = new Integer(index);
-        obj.setDigits(digits);
-    }
-    
-    public void LabelSequenceDataOnDemand.setGroupDigits(LabelSequence obj, int index) {
-        Boolean groupDigits = true;
-        obj.setGroupDigits(groupDigits);
-    }
-    
-    public void LabelSequenceDataOnDemand.setIgnored(LabelSequence obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void LabelSequenceDataOnDemand.setLabelPrefix(LabelSequence obj, int index) {
-        String labelPrefix = "labelPrefix_" + index;
-        if (labelPrefix.length() > 50) {
-            labelPrefix = labelPrefix.substring(0, 50);
-        }
-        obj.setLabelPrefix(labelPrefix);
-    }
-    
-    public void LabelSequenceDataOnDemand.setLabelSeparator(LabelSequence obj, int index) {
-        String labelSeparator = "labelSep_" + index;
-        if (labelSeparator.length() > 10) {
-            labelSeparator = labelSeparator.substring(0, 10);
-        }
-        obj.setLabelSeparator(labelSeparator);
-    }
-    
-    public void LabelSequenceDataOnDemand.setLabelTypeAndKind(LabelSequence obj, int index) {
-        String labelTypeAndKind = "labelTypeAndKind_" + index;
-        if (labelTypeAndKind.length() > 255) {
-            labelTypeAndKind = labelTypeAndKind.substring(0, 255);
-        }
-        obj.setLabelTypeAndKind(labelTypeAndKind);
-    }
-    
-    public void LabelSequenceDataOnDemand.setModifiedDate(LabelSequence obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void LabelSequenceDataOnDemand.setStartingNumber(LabelSequence obj, int index) {
-        Long startingNumber = new Integer(index).longValue();
-        obj.setStartingNumber(startingNumber);
-    }
-    
-    public void LabelSequenceDataOnDemand.setThingTypeAndKind(LabelSequence obj, int index) {
-        String thingTypeAndKind = "thingTypeAndKind_" + index;
-        if (thingTypeAndKind.length() > 255) {
-            thingTypeAndKind = thingTypeAndKind.substring(0, 255);
-        }
-        obj.setThingTypeAndKind(thingTypeAndKind);
-    }
-    
-    public LabelSequence LabelSequenceDataOnDemand.getSpecificLabelSequence(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        LabelSequence obj = data.get(index);
-        Long id = obj.getId();
-        return LabelSequence.findLabelSequence(id);
-    }
-    
-    public LabelSequence LabelSequenceDataOnDemand.getRandomLabelSequence() {
-        init();
-        LabelSequence obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return LabelSequence.findLabelSequence(id);
-    }
-    
-    public boolean LabelSequenceDataOnDemand.modifyLabelSequence(LabelSequence obj) {
-        return false;
-    }
-    
-    public void LabelSequenceDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = LabelSequence.findLabelSequenceEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'LabelSequence' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<LabelSequence>();
-        for (int i = 0; i < 10; i++) {
-            LabelSequence obj = getNewTransientLabelSequence(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelSequenceIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/LabelSequenceIntegrationTest.java
index 5f231acdf..6fbdad506 100755
--- a/src/test/java/com/labsynch/labseer/domain/LabelSequenceIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/LabelSequenceIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
+@Configurable
 @RooIntegrationTest(entity = LabelSequence.class)
 public class LabelSequenceIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    LabelSequenceDataOnDemand dod;
+
+	@Test
+    public void testCountLabelSequences() {
+        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to initialize correctly", dod.getRandomLabelSequence());
+        long count = LabelSequence.countLabelSequences();
+        Assert.assertTrue("Counter for 'LabelSequence' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindLabelSequence() {
+        LabelSequence obj = dod.getRandomLabelSequence();
+        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to provide an identifier", id);
+        obj = LabelSequence.findLabelSequence(id);
+        Assert.assertNotNull("Find method for 'LabelSequence' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'LabelSequence' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllLabelSequences() {
+        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to initialize correctly", dod.getRandomLabelSequence());
+        long count = LabelSequence.countLabelSequences();
+        Assert.assertTrue("Too expensive to perform a find all test for 'LabelSequence', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<LabelSequence> result = LabelSequence.findAllLabelSequences();
+        Assert.assertNotNull("Find all method for 'LabelSequence' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'LabelSequence' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindLabelSequenceEntries() {
+        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to initialize correctly", dod.getRandomLabelSequence());
+        long count = LabelSequence.countLabelSequences();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<LabelSequence> result = LabelSequence.findLabelSequenceEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'LabelSequence' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'LabelSequence' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        LabelSequence obj = dod.getRandomLabelSequence();
+        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to provide an identifier", id);
+        obj = LabelSequence.findLabelSequence(id);
+        Assert.assertNotNull("Find method for 'LabelSequence' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyLabelSequence(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'LabelSequence' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        LabelSequence obj = dod.getRandomLabelSequence();
+        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to provide an identifier", id);
+        obj = LabelSequence.findLabelSequence(id);
+        boolean modified =  dod.modifyLabelSequence(obj);
+        Integer currentVersion = obj.getVersion();
+        LabelSequence merged = obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'LabelSequence' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to initialize correctly", dod.getRandomLabelSequence());
+        LabelSequence obj = dod.getNewTransientLabelSequence(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'LabelSequence' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'LabelSequence' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        LabelSequence obj = dod.getRandomLabelSequence();
+        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to provide an identifier", id);
+        obj = LabelSequence.findLabelSequence(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'LabelSequence' with identifier '" + id + "'", LabelSequence.findLabelSequence(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelSequenceIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/LabelSequenceIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 5049dd501..000000000
--- a/src/test/java/com/labsynch/labseer/domain/LabelSequenceIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelSequenceIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LabelSequenceIntegrationTest_Roo_Configurable {
-    
-    declare @type: LabelSequenceIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelSequenceIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/LabelSequenceIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index a01cc4206..000000000
--- a/src/test/java/com/labsynch/labseer/domain/LabelSequenceIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelSequence;
-import com.labsynch.labseer.domain.LabelSequenceDataOnDemand;
-import com.labsynch.labseer.domain.LabelSequenceIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LabelSequenceIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: LabelSequenceIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: LabelSequenceIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: LabelSequenceIntegrationTest: @Transactional;
-    
-    @Autowired
-    LabelSequenceDataOnDemand LabelSequenceIntegrationTest.dod;
-    
-    @Test
-    public void LabelSequenceIntegrationTest.testCountLabelSequences() {
-        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to initialize correctly", dod.getRandomLabelSequence());
-        long count = LabelSequence.countLabelSequences();
-        Assert.assertTrue("Counter for 'LabelSequence' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void LabelSequenceIntegrationTest.testFindLabelSequence() {
-        LabelSequence obj = dod.getRandomLabelSequence();
-        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to provide an identifier", id);
-        obj = LabelSequence.findLabelSequence(id);
-        Assert.assertNotNull("Find method for 'LabelSequence' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'LabelSequence' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void LabelSequenceIntegrationTest.testFindAllLabelSequences() {
-        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to initialize correctly", dod.getRandomLabelSequence());
-        long count = LabelSequence.countLabelSequences();
-        Assert.assertTrue("Too expensive to perform a find all test for 'LabelSequence', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<LabelSequence> result = LabelSequence.findAllLabelSequences();
-        Assert.assertNotNull("Find all method for 'LabelSequence' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'LabelSequence' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void LabelSequenceIntegrationTest.testFindLabelSequenceEntries() {
-        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to initialize correctly", dod.getRandomLabelSequence());
-        long count = LabelSequence.countLabelSequences();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<LabelSequence> result = LabelSequence.findLabelSequenceEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'LabelSequence' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'LabelSequence' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void LabelSequenceIntegrationTest.testFlush() {
-        LabelSequence obj = dod.getRandomLabelSequence();
-        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to provide an identifier", id);
-        obj = LabelSequence.findLabelSequence(id);
-        Assert.assertNotNull("Find method for 'LabelSequence' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyLabelSequence(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'LabelSequence' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void LabelSequenceIntegrationTest.testMergeUpdate() {
-        LabelSequence obj = dod.getRandomLabelSequence();
-        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to provide an identifier", id);
-        obj = LabelSequence.findLabelSequence(id);
-        boolean modified =  dod.modifyLabelSequence(obj);
-        Integer currentVersion = obj.getVersion();
-        LabelSequence merged = obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'LabelSequence' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void LabelSequenceIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to initialize correctly", dod.getRandomLabelSequence());
-        LabelSequence obj = dod.getNewTransientLabelSequence(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'LabelSequence' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'LabelSequence' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void LabelSequenceIntegrationTest.testRemove() {
-        LabelSequence obj = dod.getRandomLabelSequence();
-        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to provide an identifier", id);
-        obj = LabelSequence.findLabelSequence(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'LabelSequence' with identifier '" + id + "'", LabelSequence.findLabelSequence(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/LabelTypeDataOnDemand.java
index 2d13acb2c..ac4f4c4f7 100755
--- a/src/test/java/com/labsynch/labseer/domain/LabelTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/LabelTypeDataOnDemand.java
@@ -1,7 +1,89 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Configurable
+@Component
 @RooDataOnDemand(entity = LabelType.class)
 public class LabelTypeDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<LabelType> data;
+
+	public LabelType getNewTransientLabelType(int index) {
+        LabelType obj = new LabelType();
+        setTypeName(obj, index);
+        return obj;
+    }
+
+	public void setTypeName(LabelType obj, int index) {
+        String typeName = "typeName_" + index;
+        if (typeName.length() > 255) {
+            typeName = new Random().nextInt(10) + typeName.substring(1, 255);
+        }
+        obj.setTypeName(typeName);
+    }
+
+	public LabelType getSpecificLabelType(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        LabelType obj = data.get(index);
+        Long id = obj.getId();
+        return LabelType.findLabelType(id);
+    }
+
+	public LabelType getRandomLabelType() {
+        init();
+        LabelType obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return LabelType.findLabelType(id);
+    }
+
+	public boolean modifyLabelType(LabelType obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = LabelType.findLabelTypeEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'LabelType' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<LabelType>();
+        for (int i = 0; i < 10; i++) {
+            LabelType obj = getNewTransientLabelType(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelTypeDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/LabelTypeDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 8ddd8973b..000000000
--- a/src/test/java/com/labsynch/labseer/domain/LabelTypeDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelTypeDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LabelTypeDataOnDemand_Roo_Configurable {
-    
-    declare @type: LabelTypeDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelTypeDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/LabelTypeDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index cbdbc4f5d..000000000
--- a/src/test/java/com/labsynch/labseer/domain/LabelTypeDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,92 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelType;
-import com.labsynch.labseer.domain.LabelTypeDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.stereotype.Component;
-
-privileged aspect LabelTypeDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: LabelTypeDataOnDemand: @Component;
-    
-    private Random LabelTypeDataOnDemand.rnd = new SecureRandom();
-    
-    private List<LabelType> LabelTypeDataOnDemand.data;
-    
-    public LabelType LabelTypeDataOnDemand.getNewTransientLabelType(int index) {
-        LabelType obj = new LabelType();
-        setTypeName(obj, index);
-        return obj;
-    }
-    
-    public void LabelTypeDataOnDemand.setTypeName(LabelType obj, int index) {
-        String typeName = "typeName_" + index;
-        if (typeName.length() > 255) {
-            typeName = new Random().nextInt(10) + typeName.substring(1, 255);
-        }
-        obj.setTypeName(typeName);
-    }
-    
-    public LabelType LabelTypeDataOnDemand.getSpecificLabelType(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        LabelType obj = data.get(index);
-        Long id = obj.getId();
-        return LabelType.findLabelType(id);
-    }
-    
-    public LabelType LabelTypeDataOnDemand.getRandomLabelType() {
-        init();
-        LabelType obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return LabelType.findLabelType(id);
-    }
-    
-    public boolean LabelTypeDataOnDemand.modifyLabelType(LabelType obj) {
-        return false;
-    }
-    
-    public void LabelTypeDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = LabelType.findLabelTypeEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'LabelType' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<LabelType>();
-        for (int i = 0; i < 10; i++) {
-            LabelType obj = getNewTransientLabelType(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/LabelTypeIntegrationTest.java
index 88acb0a76..052117b22 100755
--- a/src/test/java/com/labsynch/labseer/domain/LabelTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/LabelTypeIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = LabelType.class)
 public class LabelTypeIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    LabelTypeDataOnDemand dod;
+
+	@Test
+    public void testCountLabelTypes() {
+        Assert.assertNotNull("Data on demand for 'LabelType' failed to initialize correctly", dod.getRandomLabelType());
+        long count = LabelType.countLabelTypes();
+        Assert.assertTrue("Counter for 'LabelType' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindLabelType() {
+        LabelType obj = dod.getRandomLabelType();
+        Assert.assertNotNull("Data on demand for 'LabelType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'LabelType' failed to provide an identifier", id);
+        obj = LabelType.findLabelType(id);
+        Assert.assertNotNull("Find method for 'LabelType' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'LabelType' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllLabelTypes() {
+        Assert.assertNotNull("Data on demand for 'LabelType' failed to initialize correctly", dod.getRandomLabelType());
+        long count = LabelType.countLabelTypes();
+        Assert.assertTrue("Too expensive to perform a find all test for 'LabelType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<LabelType> result = LabelType.findAllLabelTypes();
+        Assert.assertNotNull("Find all method for 'LabelType' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'LabelType' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindLabelTypeEntries() {
+        Assert.assertNotNull("Data on demand for 'LabelType' failed to initialize correctly", dod.getRandomLabelType());
+        long count = LabelType.countLabelTypes();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<LabelType> result = LabelType.findLabelTypeEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'LabelType' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'LabelType' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        LabelType obj = dod.getRandomLabelType();
+        Assert.assertNotNull("Data on demand for 'LabelType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'LabelType' failed to provide an identifier", id);
+        obj = LabelType.findLabelType(id);
+        Assert.assertNotNull("Find method for 'LabelType' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyLabelType(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'LabelType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        LabelType obj = dod.getRandomLabelType();
+        Assert.assertNotNull("Data on demand for 'LabelType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'LabelType' failed to provide an identifier", id);
+        obj = LabelType.findLabelType(id);
+        boolean modified =  dod.modifyLabelType(obj);
+        Integer currentVersion = obj.getVersion();
+        LabelType merged = obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'LabelType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'LabelType' failed to initialize correctly", dod.getRandomLabelType());
+        LabelType obj = dod.getNewTransientLabelType(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'LabelType' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'LabelType' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'LabelType' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        LabelType obj = dod.getRandomLabelType();
+        Assert.assertNotNull("Data on demand for 'LabelType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'LabelType' failed to provide an identifier", id);
+        obj = LabelType.findLabelType(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'LabelType' with identifier '" + id + "'", LabelType.findLabelType(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelTypeIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/LabelTypeIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 0375d01e5..000000000
--- a/src/test/java/com/labsynch/labseer/domain/LabelTypeIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelTypeIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LabelTypeIntegrationTest_Roo_Configurable {
-    
-    declare @type: LabelTypeIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelTypeIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/LabelTypeIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index ad767a2ab..000000000
--- a/src/test/java/com/labsynch/labseer/domain/LabelTypeIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LabelType;
-import com.labsynch.labseer.domain.LabelTypeDataOnDemand;
-import com.labsynch.labseer.domain.LabelTypeIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LabelTypeIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: LabelTypeIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: LabelTypeIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: LabelTypeIntegrationTest: @Transactional;
-    
-    @Autowired
-    LabelTypeDataOnDemand LabelTypeIntegrationTest.dod;
-    
-    @Test
-    public void LabelTypeIntegrationTest.testCountLabelTypes() {
-        Assert.assertNotNull("Data on demand for 'LabelType' failed to initialize correctly", dod.getRandomLabelType());
-        long count = LabelType.countLabelTypes();
-        Assert.assertTrue("Counter for 'LabelType' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void LabelTypeIntegrationTest.testFindLabelType() {
-        LabelType obj = dod.getRandomLabelType();
-        Assert.assertNotNull("Data on demand for 'LabelType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'LabelType' failed to provide an identifier", id);
-        obj = LabelType.findLabelType(id);
-        Assert.assertNotNull("Find method for 'LabelType' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'LabelType' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void LabelTypeIntegrationTest.testFindAllLabelTypes() {
-        Assert.assertNotNull("Data on demand for 'LabelType' failed to initialize correctly", dod.getRandomLabelType());
-        long count = LabelType.countLabelTypes();
-        Assert.assertTrue("Too expensive to perform a find all test for 'LabelType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<LabelType> result = LabelType.findAllLabelTypes();
-        Assert.assertNotNull("Find all method for 'LabelType' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'LabelType' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void LabelTypeIntegrationTest.testFindLabelTypeEntries() {
-        Assert.assertNotNull("Data on demand for 'LabelType' failed to initialize correctly", dod.getRandomLabelType());
-        long count = LabelType.countLabelTypes();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<LabelType> result = LabelType.findLabelTypeEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'LabelType' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'LabelType' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void LabelTypeIntegrationTest.testFlush() {
-        LabelType obj = dod.getRandomLabelType();
-        Assert.assertNotNull("Data on demand for 'LabelType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'LabelType' failed to provide an identifier", id);
-        obj = LabelType.findLabelType(id);
-        Assert.assertNotNull("Find method for 'LabelType' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyLabelType(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'LabelType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void LabelTypeIntegrationTest.testMergeUpdate() {
-        LabelType obj = dod.getRandomLabelType();
-        Assert.assertNotNull("Data on demand for 'LabelType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'LabelType' failed to provide an identifier", id);
-        obj = LabelType.findLabelType(id);
-        boolean modified =  dod.modifyLabelType(obj);
-        Integer currentVersion = obj.getVersion();
-        LabelType merged = obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'LabelType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void LabelTypeIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'LabelType' failed to initialize correctly", dod.getRandomLabelType());
-        LabelType obj = dod.getNewTransientLabelType(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'LabelType' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'LabelType' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'LabelType' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void LabelTypeIntegrationTest.testRemove() {
-        LabelType obj = dod.getRandomLabelType();
-        Assert.assertNotNull("Data on demand for 'LabelType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'LabelType' failed to provide an identifier", id);
-        obj = LabelType.findLabelType(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'LabelType' with identifier '" + id + "'", LabelType.findLabelType(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/LsInteractionDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/LsInteractionDataOnDemand.java
index ca6492e17..a633d2aff 100755
--- a/src/test/java/com/labsynch/labseer/domain/LsInteractionDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/LsInteractionDataOnDemand.java
@@ -1,7 +1,179 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Component
+@Configurable
 @RooDataOnDemand(entity = LsInteraction.class)
 public class LsInteractionDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<LsInteraction> data;
+
+	public LsInteraction getNewTransientLsInteraction(int index) {
+        LsInteraction obj = new LsInteraction();
+        setCodeName(obj, index);
+        setDeleted(obj, index);
+        setFirstThing(obj, index);
+        setIgnored(obj, index);
+        setLsKind(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedBy(obj, index);
+        setModifiedDate(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        setSecondThing(obj, index);
+        return obj;
+    }
+
+	public void setCodeName(LsInteraction obj, int index) {
+        String codeName = "codeName_" + index;
+        if (codeName.length() > 255) {
+            codeName = new Random().nextInt(10) + codeName.substring(1, 255);
+        }
+        obj.setCodeName(codeName);
+    }
+
+	public void setDeleted(LsInteraction obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setFirstThing(LsInteraction obj, int index) {
+        Long firstThing = new Integer(index).longValue();
+        obj.setFirstThing(firstThing);
+    }
+
+	public void setIgnored(LsInteraction obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setLsKind(LsInteraction obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsTransaction(LsInteraction obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(LsInteraction obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 255) {
+            lsType = lsType.substring(0, 255);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(LsInteraction obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedBy(LsInteraction obj, int index) {
+        String modifiedBy = "modifiedBy_" + index;
+        if (modifiedBy.length() > 255) {
+            modifiedBy = modifiedBy.substring(0, 255);
+        }
+        obj.setModifiedBy(modifiedBy);
+    }
+
+	public void setModifiedDate(LsInteraction obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setRecordedBy(LsInteraction obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(LsInteraction obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public void setSecondThing(LsInteraction obj, int index) {
+        Long secondThing = new Integer(index).longValue();
+        obj.setSecondThing(secondThing);
+    }
+
+	public LsInteraction getSpecificLsInteraction(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        LsInteraction obj = data.get(index);
+        Long id = obj.getId();
+        return LsInteraction.findLsInteraction(id);
+    }
+
+	public LsInteraction getRandomLsInteraction() {
+        init();
+        LsInteraction obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return LsInteraction.findLsInteraction(id);
+    }
+
+	public boolean modifyLsInteraction(LsInteraction obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = LsInteraction.findLsInteractionEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'LsInteraction' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<LsInteraction>();
+        for (int i = 0; i < 10; i++) {
+            LsInteraction obj = getNewTransientLsInteraction(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/LsInteractionDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/LsInteractionDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 3eca2a9a1..000000000
--- a/src/test/java/com/labsynch/labseer/domain/LsInteractionDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsInteractionDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LsInteractionDataOnDemand_Roo_Configurable {
-    
-    declare @type: LsInteractionDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/LsInteractionDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/LsInteractionDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 172ec0cd7..000000000
--- a/src/test/java/com/labsynch/labseer/domain/LsInteractionDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,182 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsInteraction;
-import com.labsynch.labseer.domain.LsInteractionDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.stereotype.Component;
-
-privileged aspect LsInteractionDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: LsInteractionDataOnDemand: @Component;
-    
-    private Random LsInteractionDataOnDemand.rnd = new SecureRandom();
-    
-    private List<LsInteraction> LsInteractionDataOnDemand.data;
-    
-    public LsInteraction LsInteractionDataOnDemand.getNewTransientLsInteraction(int index) {
-        LsInteraction obj = new LsInteraction();
-        setCodeName(obj, index);
-        setDeleted(obj, index);
-        setFirstThing(obj, index);
-        setIgnored(obj, index);
-        setLsKind(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedBy(obj, index);
-        setModifiedDate(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        setSecondThing(obj, index);
-        return obj;
-    }
-    
-    public void LsInteractionDataOnDemand.setCodeName(LsInteraction obj, int index) {
-        String codeName = "codeName_" + index;
-        if (codeName.length() > 255) {
-            codeName = new Random().nextInt(10) + codeName.substring(1, 255);
-        }
-        obj.setCodeName(codeName);
-    }
-    
-    public void LsInteractionDataOnDemand.setDeleted(LsInteraction obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void LsInteractionDataOnDemand.setFirstThing(LsInteraction obj, int index) {
-        Long firstThing = new Integer(index).longValue();
-        obj.setFirstThing(firstThing);
-    }
-    
-    public void LsInteractionDataOnDemand.setIgnored(LsInteraction obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void LsInteractionDataOnDemand.setLsKind(LsInteraction obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void LsInteractionDataOnDemand.setLsTransaction(LsInteraction obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void LsInteractionDataOnDemand.setLsType(LsInteraction obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 255) {
-            lsType = lsType.substring(0, 255);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void LsInteractionDataOnDemand.setLsTypeAndKind(LsInteraction obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void LsInteractionDataOnDemand.setModifiedBy(LsInteraction obj, int index) {
-        String modifiedBy = "modifiedBy_" + index;
-        if (modifiedBy.length() > 255) {
-            modifiedBy = modifiedBy.substring(0, 255);
-        }
-        obj.setModifiedBy(modifiedBy);
-    }
-    
-    public void LsInteractionDataOnDemand.setModifiedDate(LsInteraction obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void LsInteractionDataOnDemand.setRecordedBy(LsInteraction obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void LsInteractionDataOnDemand.setRecordedDate(LsInteraction obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public void LsInteractionDataOnDemand.setSecondThing(LsInteraction obj, int index) {
-        Long secondThing = new Integer(index).longValue();
-        obj.setSecondThing(secondThing);
-    }
-    
-    public LsInteraction LsInteractionDataOnDemand.getSpecificLsInteraction(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        LsInteraction obj = data.get(index);
-        Long id = obj.getId();
-        return LsInteraction.findLsInteraction(id);
-    }
-    
-    public LsInteraction LsInteractionDataOnDemand.getRandomLsInteraction() {
-        init();
-        LsInteraction obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return LsInteraction.findLsInteraction(id);
-    }
-    
-    public boolean LsInteractionDataOnDemand.modifyLsInteraction(LsInteraction obj) {
-        return false;
-    }
-    
-    public void LsInteractionDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = LsInteraction.findLsInteractionEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'LsInteraction' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<LsInteraction>();
-        for (int i = 0; i < 10; i++) {
-            LsInteraction obj = getNewTransientLsInteraction(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/LsInteractionIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/LsInteractionIntegrationTest.java
index 4ac696502..a400c50c5 100755
--- a/src/test/java/com/labsynch/labseer/domain/LsInteractionIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/LsInteractionIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
+@Configurable
 @RooIntegrationTest(entity = LsInteraction.class)
 public class LsInteractionIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    LsInteractionDataOnDemand dod;
+
+	@Test
+    public void testCountLsInteractions() {
+        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to initialize correctly", dod.getRandomLsInteraction());
+        long count = LsInteraction.countLsInteractions();
+        Assert.assertTrue("Counter for 'LsInteraction' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindLsInteraction() {
+        LsInteraction obj = dod.getRandomLsInteraction();
+        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to provide an identifier", id);
+        obj = LsInteraction.findLsInteraction(id);
+        Assert.assertNotNull("Find method for 'LsInteraction' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'LsInteraction' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllLsInteractions() {
+        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to initialize correctly", dod.getRandomLsInteraction());
+        long count = LsInteraction.countLsInteractions();
+        Assert.assertTrue("Too expensive to perform a find all test for 'LsInteraction', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<LsInteraction> result = LsInteraction.findAllLsInteractions();
+        Assert.assertNotNull("Find all method for 'LsInteraction' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'LsInteraction' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindLsInteractionEntries() {
+        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to initialize correctly", dod.getRandomLsInteraction());
+        long count = LsInteraction.countLsInteractions();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<LsInteraction> result = LsInteraction.findLsInteractionEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'LsInteraction' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'LsInteraction' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        LsInteraction obj = dod.getRandomLsInteraction();
+        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to provide an identifier", id);
+        obj = LsInteraction.findLsInteraction(id);
+        Assert.assertNotNull("Find method for 'LsInteraction' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyLsInteraction(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'LsInteraction' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        LsInteraction obj = dod.getRandomLsInteraction();
+        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to provide an identifier", id);
+        obj = LsInteraction.findLsInteraction(id);
+        boolean modified =  dod.modifyLsInteraction(obj);
+        Integer currentVersion = obj.getVersion();
+        LsInteraction merged = (LsInteraction)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'LsInteraction' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to initialize correctly", dod.getRandomLsInteraction());
+        LsInteraction obj = dod.getNewTransientLsInteraction(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'LsInteraction' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'LsInteraction' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        LsInteraction obj = dod.getRandomLsInteraction();
+        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to provide an identifier", id);
+        obj = LsInteraction.findLsInteraction(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'LsInteraction' with identifier '" + id + "'", LsInteraction.findLsInteraction(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/LsInteractionIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/LsInteractionIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index fef752cb7..000000000
--- a/src/test/java/com/labsynch/labseer/domain/LsInteractionIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsInteractionIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LsInteractionIntegrationTest_Roo_Configurable {
-    
-    declare @type: LsInteractionIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/LsInteractionIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/LsInteractionIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 77cd27200..000000000
--- a/src/test/java/com/labsynch/labseer/domain/LsInteractionIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsInteraction;
-import com.labsynch.labseer.domain.LsInteractionDataOnDemand;
-import com.labsynch.labseer.domain.LsInteractionIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LsInteractionIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: LsInteractionIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: LsInteractionIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: LsInteractionIntegrationTest: @Transactional;
-    
-    @Autowired
-    LsInteractionDataOnDemand LsInteractionIntegrationTest.dod;
-    
-    @Test
-    public void LsInteractionIntegrationTest.testCountLsInteractions() {
-        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to initialize correctly", dod.getRandomLsInteraction());
-        long count = LsInteraction.countLsInteractions();
-        Assert.assertTrue("Counter for 'LsInteraction' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void LsInteractionIntegrationTest.testFindLsInteraction() {
-        LsInteraction obj = dod.getRandomLsInteraction();
-        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to provide an identifier", id);
-        obj = LsInteraction.findLsInteraction(id);
-        Assert.assertNotNull("Find method for 'LsInteraction' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'LsInteraction' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void LsInteractionIntegrationTest.testFindAllLsInteractions() {
-        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to initialize correctly", dod.getRandomLsInteraction());
-        long count = LsInteraction.countLsInteractions();
-        Assert.assertTrue("Too expensive to perform a find all test for 'LsInteraction', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<LsInteraction> result = LsInteraction.findAllLsInteractions();
-        Assert.assertNotNull("Find all method for 'LsInteraction' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'LsInteraction' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void LsInteractionIntegrationTest.testFindLsInteractionEntries() {
-        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to initialize correctly", dod.getRandomLsInteraction());
-        long count = LsInteraction.countLsInteractions();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<LsInteraction> result = LsInteraction.findLsInteractionEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'LsInteraction' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'LsInteraction' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void LsInteractionIntegrationTest.testFlush() {
-        LsInteraction obj = dod.getRandomLsInteraction();
-        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to provide an identifier", id);
-        obj = LsInteraction.findLsInteraction(id);
-        Assert.assertNotNull("Find method for 'LsInteraction' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyLsInteraction(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'LsInteraction' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void LsInteractionIntegrationTest.testMergeUpdate() {
-        LsInteraction obj = dod.getRandomLsInteraction();
-        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to provide an identifier", id);
-        obj = LsInteraction.findLsInteraction(id);
-        boolean modified =  dod.modifyLsInteraction(obj);
-        Integer currentVersion = obj.getVersion();
-        LsInteraction merged = (LsInteraction)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'LsInteraction' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void LsInteractionIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to initialize correctly", dod.getRandomLsInteraction());
-        LsInteraction obj = dod.getNewTransientLsInteraction(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'LsInteraction' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'LsInteraction' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void LsInteractionIntegrationTest.testRemove() {
-        LsInteraction obj = dod.getRandomLsInteraction();
-        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to provide an identifier", id);
-        obj = LsInteraction.findLsInteraction(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'LsInteraction' with identifier '" + id + "'", LsInteraction.findLsInteraction(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/LsTransactionDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/LsTransactionDataOnDemand.java
index c74f69aee..533495c79 100755
--- a/src/test/java/com/labsynch/labseer/domain/LsTransactionDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/LsTransactionDataOnDemand.java
@@ -1,7 +1,119 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Configurable
+@Component
 @RooDataOnDemand(entity = LsTransaction.class)
 public class LsTransactionDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<LsTransaction> data;
+
+	public LsTransaction getNewTransientLsTransaction(int index) {
+        LsTransaction obj = new LsTransaction();
+        setComments(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        setStatus(obj, index);
+        setType(obj, index);
+        return obj;
+    }
+
+	public void setComments(LsTransaction obj, int index) {
+        String comments = "comments_" + index;
+        if (comments.length() > 255) {
+            comments = comments.substring(0, 255);
+        }
+        obj.setComments(comments);
+    }
+
+	public void setRecordedBy(LsTransaction obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(LsTransaction obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public void setStatus(LsTransaction obj, int index) {
+        LsTransactionStatus status = LsTransactionStatus.class.getEnumConstants()[0];
+        obj.setStatus(status);
+    }
+
+	public void setType(LsTransaction obj, int index) {
+        LsTransactionType type = LsTransactionType.class.getEnumConstants()[0];
+        obj.setType(type);
+    }
+
+	public LsTransaction getSpecificLsTransaction(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        LsTransaction obj = data.get(index);
+        Long id = obj.getId();
+        return LsTransaction.findLsTransaction(id);
+    }
+
+	public LsTransaction getRandomLsTransaction() {
+        init();
+        LsTransaction obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return LsTransaction.findLsTransaction(id);
+    }
+
+	public boolean modifyLsTransaction(LsTransaction obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = LsTransaction.findLsTransactionEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'LsTransaction' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<LsTransaction>();
+        for (int i = 0; i < 10; i++) {
+            LsTransaction obj = getNewTransientLsTransaction(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/LsTransactionDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/LsTransactionDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index dab2e7698..000000000
--- a/src/test/java/com/labsynch/labseer/domain/LsTransactionDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsTransactionDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LsTransactionDataOnDemand_Roo_Configurable {
-    
-    declare @type: LsTransactionDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/LsTransactionDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/LsTransactionDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 4ee1a3cab..000000000
--- a/src/test/java/com/labsynch/labseer/domain/LsTransactionDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,124 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsTransaction;
-import com.labsynch.labseer.domain.LsTransactionDataOnDemand;
-import com.labsynch.labseer.domain.LsTransactionStatus;
-import com.labsynch.labseer.domain.LsTransactionType;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.stereotype.Component;
-
-privileged aspect LsTransactionDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: LsTransactionDataOnDemand: @Component;
-    
-    private Random LsTransactionDataOnDemand.rnd = new SecureRandom();
-    
-    private List<LsTransaction> LsTransactionDataOnDemand.data;
-    
-    public LsTransaction LsTransactionDataOnDemand.getNewTransientLsTransaction(int index) {
-        LsTransaction obj = new LsTransaction();
-        setComments(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        setStatus(obj, index);
-        setType(obj, index);
-        return obj;
-    }
-    
-    public void LsTransactionDataOnDemand.setComments(LsTransaction obj, int index) {
-        String comments = "comments_" + index;
-        if (comments.length() > 255) {
-            comments = comments.substring(0, 255);
-        }
-        obj.setComments(comments);
-    }
-    
-    public void LsTransactionDataOnDemand.setRecordedBy(LsTransaction obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void LsTransactionDataOnDemand.setRecordedDate(LsTransaction obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public void LsTransactionDataOnDemand.setStatus(LsTransaction obj, int index) {
-        LsTransactionStatus status = LsTransactionStatus.class.getEnumConstants()[0];
-        obj.setStatus(status);
-    }
-    
-    public void LsTransactionDataOnDemand.setType(LsTransaction obj, int index) {
-        LsTransactionType type = LsTransactionType.class.getEnumConstants()[0];
-        obj.setType(type);
-    }
-    
-    public LsTransaction LsTransactionDataOnDemand.getSpecificLsTransaction(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        LsTransaction obj = data.get(index);
-        Long id = obj.getId();
-        return LsTransaction.findLsTransaction(id);
-    }
-    
-    public LsTransaction LsTransactionDataOnDemand.getRandomLsTransaction() {
-        init();
-        LsTransaction obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return LsTransaction.findLsTransaction(id);
-    }
-    
-    public boolean LsTransactionDataOnDemand.modifyLsTransaction(LsTransaction obj) {
-        return false;
-    }
-    
-    public void LsTransactionDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = LsTransaction.findLsTransactionEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'LsTransaction' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<LsTransaction>();
-        for (int i = 0; i < 10; i++) {
-            LsTransaction obj = getNewTransientLsTransaction(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/LsTransactionIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/LsTransactionIntegrationTest.java
index 695409726..795540db5 100755
--- a/src/test/java/com/labsynch/labseer/domain/LsTransactionIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/LsTransactionIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = LsTransaction.class)
 public class LsTransactionIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    LsTransactionDataOnDemand dod;
+
+	@Test
+    public void testCountLsTransactions() {
+        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to initialize correctly", dod.getRandomLsTransaction());
+        long count = LsTransaction.countLsTransactions();
+        Assert.assertTrue("Counter for 'LsTransaction' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindLsTransaction() {
+        LsTransaction obj = dod.getRandomLsTransaction();
+        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to provide an identifier", id);
+        obj = LsTransaction.findLsTransaction(id);
+        Assert.assertNotNull("Find method for 'LsTransaction' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'LsTransaction' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllLsTransactions() {
+        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to initialize correctly", dod.getRandomLsTransaction());
+        long count = LsTransaction.countLsTransactions();
+        Assert.assertTrue("Too expensive to perform a find all test for 'LsTransaction', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<LsTransaction> result = LsTransaction.findAllLsTransactions();
+        Assert.assertNotNull("Find all method for 'LsTransaction' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'LsTransaction' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindLsTransactionEntries() {
+        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to initialize correctly", dod.getRandomLsTransaction());
+        long count = LsTransaction.countLsTransactions();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<LsTransaction> result = LsTransaction.findLsTransactionEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'LsTransaction' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'LsTransaction' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        LsTransaction obj = dod.getRandomLsTransaction();
+        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to provide an identifier", id);
+        obj = LsTransaction.findLsTransaction(id);
+        Assert.assertNotNull("Find method for 'LsTransaction' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyLsTransaction(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'LsTransaction' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        LsTransaction obj = dod.getRandomLsTransaction();
+        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to provide an identifier", id);
+        obj = LsTransaction.findLsTransaction(id);
+        boolean modified =  dod.modifyLsTransaction(obj);
+        Integer currentVersion = obj.getVersion();
+        LsTransaction merged = obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'LsTransaction' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to initialize correctly", dod.getRandomLsTransaction());
+        LsTransaction obj = dod.getNewTransientLsTransaction(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'LsTransaction' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'LsTransaction' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        LsTransaction obj = dod.getRandomLsTransaction();
+        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to provide an identifier", id);
+        obj = LsTransaction.findLsTransaction(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'LsTransaction' with identifier '" + id + "'", LsTransaction.findLsTransaction(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/LsTransactionIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/LsTransactionIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 257ddb22b..000000000
--- a/src/test/java/com/labsynch/labseer/domain/LsTransactionIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsTransactionIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect LsTransactionIntegrationTest_Roo_Configurable {
-    
-    declare @type: LsTransactionIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/LsTransactionIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/LsTransactionIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index e9025e79c..000000000
--- a/src/test/java/com/labsynch/labseer/domain/LsTransactionIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.LsTransaction;
-import com.labsynch.labseer.domain.LsTransactionDataOnDemand;
-import com.labsynch.labseer.domain.LsTransactionIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect LsTransactionIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: LsTransactionIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: LsTransactionIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: LsTransactionIntegrationTest: @Transactional;
-    
-    @Autowired
-    LsTransactionDataOnDemand LsTransactionIntegrationTest.dod;
-    
-    @Test
-    public void LsTransactionIntegrationTest.testCountLsTransactions() {
-        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to initialize correctly", dod.getRandomLsTransaction());
-        long count = LsTransaction.countLsTransactions();
-        Assert.assertTrue("Counter for 'LsTransaction' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void LsTransactionIntegrationTest.testFindLsTransaction() {
-        LsTransaction obj = dod.getRandomLsTransaction();
-        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to provide an identifier", id);
-        obj = LsTransaction.findLsTransaction(id);
-        Assert.assertNotNull("Find method for 'LsTransaction' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'LsTransaction' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void LsTransactionIntegrationTest.testFindAllLsTransactions() {
-        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to initialize correctly", dod.getRandomLsTransaction());
-        long count = LsTransaction.countLsTransactions();
-        Assert.assertTrue("Too expensive to perform a find all test for 'LsTransaction', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<LsTransaction> result = LsTransaction.findAllLsTransactions();
-        Assert.assertNotNull("Find all method for 'LsTransaction' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'LsTransaction' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void LsTransactionIntegrationTest.testFindLsTransactionEntries() {
-        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to initialize correctly", dod.getRandomLsTransaction());
-        long count = LsTransaction.countLsTransactions();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<LsTransaction> result = LsTransaction.findLsTransactionEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'LsTransaction' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'LsTransaction' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void LsTransactionIntegrationTest.testFlush() {
-        LsTransaction obj = dod.getRandomLsTransaction();
-        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to provide an identifier", id);
-        obj = LsTransaction.findLsTransaction(id);
-        Assert.assertNotNull("Find method for 'LsTransaction' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyLsTransaction(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'LsTransaction' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void LsTransactionIntegrationTest.testMergeUpdate() {
-        LsTransaction obj = dod.getRandomLsTransaction();
-        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to provide an identifier", id);
-        obj = LsTransaction.findLsTransaction(id);
-        boolean modified =  dod.modifyLsTransaction(obj);
-        Integer currentVersion = obj.getVersion();
-        LsTransaction merged = obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'LsTransaction' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void LsTransactionIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to initialize correctly", dod.getRandomLsTransaction());
-        LsTransaction obj = dod.getNewTransientLsTransaction(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'LsTransaction' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'LsTransaction' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void LsTransactionIntegrationTest.testRemove() {
-        LsTransaction obj = dod.getRandomLsTransaction();
-        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to provide an identifier", id);
-        obj = LsTransaction.findLsTransaction(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'LsTransaction' with identifier '" + id + "'", LsTransaction.findLsTransaction(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/OperatorTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/OperatorTypeDataOnDemand.java
index c5517c536..ffa56e68e 100755
--- a/src/test/java/com/labsynch/labseer/domain/OperatorTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/OperatorTypeDataOnDemand.java
@@ -1,7 +1,89 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Component
+@Configurable
 @RooDataOnDemand(entity = OperatorType.class)
 public class OperatorTypeDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<OperatorType> data;
+
+	public OperatorType getNewTransientOperatorType(int index) {
+        OperatorType obj = new OperatorType();
+        setTypeName(obj, index);
+        return obj;
+    }
+
+	public void setTypeName(OperatorType obj, int index) {
+        String typeName = "typeName_" + index;
+        if (typeName.length() > 25) {
+            typeName = new Random().nextInt(10) + typeName.substring(1, 25);
+        }
+        obj.setTypeName(typeName);
+    }
+
+	public OperatorType getSpecificOperatorType(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        OperatorType obj = data.get(index);
+        Long id = obj.getId();
+        return OperatorType.findOperatorType(id);
+    }
+
+	public OperatorType getRandomOperatorType() {
+        init();
+        OperatorType obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return OperatorType.findOperatorType(id);
+    }
+
+	public boolean modifyOperatorType(OperatorType obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = OperatorType.findOperatorTypeEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'OperatorType' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<OperatorType>();
+        for (int i = 0; i < 10; i++) {
+            OperatorType obj = getNewTransientOperatorType(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/OperatorTypeDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/OperatorTypeDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index df024d12c..000000000
--- a/src/test/java/com/labsynch/labseer/domain/OperatorTypeDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.OperatorTypeDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect OperatorTypeDataOnDemand_Roo_Configurable {
-    
-    declare @type: OperatorTypeDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/OperatorTypeDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/OperatorTypeDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index b1482e101..000000000
--- a/src/test/java/com/labsynch/labseer/domain/OperatorTypeDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,92 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.OperatorType;
-import com.labsynch.labseer.domain.OperatorTypeDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.stereotype.Component;
-
-privileged aspect OperatorTypeDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: OperatorTypeDataOnDemand: @Component;
-    
-    private Random OperatorTypeDataOnDemand.rnd = new SecureRandom();
-    
-    private List<OperatorType> OperatorTypeDataOnDemand.data;
-    
-    public OperatorType OperatorTypeDataOnDemand.getNewTransientOperatorType(int index) {
-        OperatorType obj = new OperatorType();
-        setTypeName(obj, index);
-        return obj;
-    }
-    
-    public void OperatorTypeDataOnDemand.setTypeName(OperatorType obj, int index) {
-        String typeName = "typeName_" + index;
-        if (typeName.length() > 25) {
-            typeName = new Random().nextInt(10) + typeName.substring(1, 25);
-        }
-        obj.setTypeName(typeName);
-    }
-    
-    public OperatorType OperatorTypeDataOnDemand.getSpecificOperatorType(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        OperatorType obj = data.get(index);
-        Long id = obj.getId();
-        return OperatorType.findOperatorType(id);
-    }
-    
-    public OperatorType OperatorTypeDataOnDemand.getRandomOperatorType() {
-        init();
-        OperatorType obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return OperatorType.findOperatorType(id);
-    }
-    
-    public boolean OperatorTypeDataOnDemand.modifyOperatorType(OperatorType obj) {
-        return false;
-    }
-    
-    public void OperatorTypeDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = OperatorType.findOperatorTypeEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'OperatorType' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<OperatorType>();
-        for (int i = 0; i < 10; i++) {
-            OperatorType obj = getNewTransientOperatorType(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/OperatorTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/OperatorTypeIntegrationTest.java
index ccd5ae13d..329ced7a6 100755
--- a/src/test/java/com/labsynch/labseer/domain/OperatorTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/OperatorTypeIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
+@Configurable
 @RooIntegrationTest(entity = OperatorType.class)
 public class OperatorTypeIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    OperatorTypeDataOnDemand dod;
+
+	@Test
+    public void testCountOperatorTypes() {
+        Assert.assertNotNull("Data on demand for 'OperatorType' failed to initialize correctly", dod.getRandomOperatorType());
+        long count = OperatorType.countOperatorTypes();
+        Assert.assertTrue("Counter for 'OperatorType' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindOperatorType() {
+        OperatorType obj = dod.getRandomOperatorType();
+        Assert.assertNotNull("Data on demand for 'OperatorType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'OperatorType' failed to provide an identifier", id);
+        obj = OperatorType.findOperatorType(id);
+        Assert.assertNotNull("Find method for 'OperatorType' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'OperatorType' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllOperatorTypes() {
+        Assert.assertNotNull("Data on demand for 'OperatorType' failed to initialize correctly", dod.getRandomOperatorType());
+        long count = OperatorType.countOperatorTypes();
+        Assert.assertTrue("Too expensive to perform a find all test for 'OperatorType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<OperatorType> result = OperatorType.findAllOperatorTypes();
+        Assert.assertNotNull("Find all method for 'OperatorType' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'OperatorType' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindOperatorTypeEntries() {
+        Assert.assertNotNull("Data on demand for 'OperatorType' failed to initialize correctly", dod.getRandomOperatorType());
+        long count = OperatorType.countOperatorTypes();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<OperatorType> result = OperatorType.findOperatorTypeEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'OperatorType' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'OperatorType' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        OperatorType obj = dod.getRandomOperatorType();
+        Assert.assertNotNull("Data on demand for 'OperatorType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'OperatorType' failed to provide an identifier", id);
+        obj = OperatorType.findOperatorType(id);
+        Assert.assertNotNull("Find method for 'OperatorType' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyOperatorType(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'OperatorType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        OperatorType obj = dod.getRandomOperatorType();
+        Assert.assertNotNull("Data on demand for 'OperatorType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'OperatorType' failed to provide an identifier", id);
+        obj = OperatorType.findOperatorType(id);
+        boolean modified =  dod.modifyOperatorType(obj);
+        Integer currentVersion = obj.getVersion();
+        OperatorType merged = obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'OperatorType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'OperatorType' failed to initialize correctly", dod.getRandomOperatorType());
+        OperatorType obj = dod.getNewTransientOperatorType(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'OperatorType' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'OperatorType' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'OperatorType' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        OperatorType obj = dod.getRandomOperatorType();
+        Assert.assertNotNull("Data on demand for 'OperatorType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'OperatorType' failed to provide an identifier", id);
+        obj = OperatorType.findOperatorType(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'OperatorType' with identifier '" + id + "'", OperatorType.findOperatorType(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/OperatorTypeIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/OperatorTypeIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 32c84c42f..000000000
--- a/src/test/java/com/labsynch/labseer/domain/OperatorTypeIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.OperatorTypeIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect OperatorTypeIntegrationTest_Roo_Configurable {
-    
-    declare @type: OperatorTypeIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/OperatorTypeIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/OperatorTypeIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 5fada4c5f..000000000
--- a/src/test/java/com/labsynch/labseer/domain/OperatorTypeIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.OperatorType;
-import com.labsynch.labseer.domain.OperatorTypeDataOnDemand;
-import com.labsynch.labseer.domain.OperatorTypeIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect OperatorTypeIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: OperatorTypeIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: OperatorTypeIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: OperatorTypeIntegrationTest: @Transactional;
-    
-    @Autowired
-    OperatorTypeDataOnDemand OperatorTypeIntegrationTest.dod;
-    
-    @Test
-    public void OperatorTypeIntegrationTest.testCountOperatorTypes() {
-        Assert.assertNotNull("Data on demand for 'OperatorType' failed to initialize correctly", dod.getRandomOperatorType());
-        long count = OperatorType.countOperatorTypes();
-        Assert.assertTrue("Counter for 'OperatorType' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void OperatorTypeIntegrationTest.testFindOperatorType() {
-        OperatorType obj = dod.getRandomOperatorType();
-        Assert.assertNotNull("Data on demand for 'OperatorType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'OperatorType' failed to provide an identifier", id);
-        obj = OperatorType.findOperatorType(id);
-        Assert.assertNotNull("Find method for 'OperatorType' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'OperatorType' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void OperatorTypeIntegrationTest.testFindAllOperatorTypes() {
-        Assert.assertNotNull("Data on demand for 'OperatorType' failed to initialize correctly", dod.getRandomOperatorType());
-        long count = OperatorType.countOperatorTypes();
-        Assert.assertTrue("Too expensive to perform a find all test for 'OperatorType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<OperatorType> result = OperatorType.findAllOperatorTypes();
-        Assert.assertNotNull("Find all method for 'OperatorType' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'OperatorType' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void OperatorTypeIntegrationTest.testFindOperatorTypeEntries() {
-        Assert.assertNotNull("Data on demand for 'OperatorType' failed to initialize correctly", dod.getRandomOperatorType());
-        long count = OperatorType.countOperatorTypes();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<OperatorType> result = OperatorType.findOperatorTypeEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'OperatorType' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'OperatorType' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void OperatorTypeIntegrationTest.testFlush() {
-        OperatorType obj = dod.getRandomOperatorType();
-        Assert.assertNotNull("Data on demand for 'OperatorType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'OperatorType' failed to provide an identifier", id);
-        obj = OperatorType.findOperatorType(id);
-        Assert.assertNotNull("Find method for 'OperatorType' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyOperatorType(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'OperatorType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void OperatorTypeIntegrationTest.testMergeUpdate() {
-        OperatorType obj = dod.getRandomOperatorType();
-        Assert.assertNotNull("Data on demand for 'OperatorType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'OperatorType' failed to provide an identifier", id);
-        obj = OperatorType.findOperatorType(id);
-        boolean modified =  dod.modifyOperatorType(obj);
-        Integer currentVersion = obj.getVersion();
-        OperatorType merged = obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'OperatorType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void OperatorTypeIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'OperatorType' failed to initialize correctly", dod.getRandomOperatorType());
-        OperatorType obj = dod.getNewTransientOperatorType(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'OperatorType' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'OperatorType' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'OperatorType' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void OperatorTypeIntegrationTest.testRemove() {
-        OperatorType obj = dod.getRandomOperatorType();
-        Assert.assertNotNull("Data on demand for 'OperatorType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'OperatorType' failed to provide an identifier", id);
-        obj = OperatorType.findOperatorType(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'OperatorType' with identifier '" + id + "'", OperatorType.findOperatorType(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ProtocolDataOnDemand.java
index e8614d1b8..7583fb816 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolDataOnDemand.java
@@ -1,7 +1,176 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Configurable
+@Component
 @RooDataOnDemand(entity = Protocol.class)
 public class ProtocolDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<Protocol> data;
+
+	public Protocol getNewTransientProtocol(int index) {
+        Protocol obj = new Protocol();
+        setCodeName(obj, index);
+        setDeleted(obj, index);
+        setIgnored(obj, index);
+        setLsKind(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedBy(obj, index);
+        setModifiedDate(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        setShortDescription(obj, index);
+        return obj;
+    }
+
+	public void setCodeName(Protocol obj, int index) {
+        String codeName = "codeName_" + index;
+        if (codeName.length() > 255) {
+            codeName = new Random().nextInt(10) + codeName.substring(1, 255);
+        }
+        obj.setCodeName(codeName);
+    }
+
+	public void setDeleted(Protocol obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setIgnored(Protocol obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setLsKind(Protocol obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsTransaction(Protocol obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(Protocol obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 255) {
+            lsType = lsType.substring(0, 255);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(Protocol obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedBy(Protocol obj, int index) {
+        String modifiedBy = "modifiedBy_" + index;
+        if (modifiedBy.length() > 255) {
+            modifiedBy = modifiedBy.substring(0, 255);
+        }
+        obj.setModifiedBy(modifiedBy);
+    }
+
+	public void setModifiedDate(Protocol obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setRecordedBy(Protocol obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(Protocol obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public void setShortDescription(Protocol obj, int index) {
+        String shortDescription = "shortDescription_" + index;
+        if (shortDescription.length() > 1000) {
+            shortDescription = shortDescription.substring(0, 1000);
+        }
+        obj.setShortDescription(shortDescription);
+    }
+
+	public Protocol getSpecificProtocol(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        Protocol obj = data.get(index);
+        Long id = obj.getId();
+        return Protocol.findProtocol(id);
+    }
+
+	public Protocol getRandomProtocol() {
+        init();
+        Protocol obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return Protocol.findProtocol(id);
+    }
+
+	public boolean modifyProtocol(Protocol obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = Protocol.findProtocolEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'Protocol' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<Protocol>();
+        for (int i = 0; i < 10; i++) {
+            Protocol obj = getNewTransientProtocol(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ProtocolDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 5934de721..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ProtocolDataOnDemand_Roo_Configurable {
-    
-    declare @type: ProtocolDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ProtocolDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 01d6c8c48..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,179 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ProtocolDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.stereotype.Component;
-
-privileged aspect ProtocolDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ProtocolDataOnDemand: @Component;
-    
-    private Random ProtocolDataOnDemand.rnd = new SecureRandom();
-    
-    private List<Protocol> ProtocolDataOnDemand.data;
-    
-    public Protocol ProtocolDataOnDemand.getNewTransientProtocol(int index) {
-        Protocol obj = new Protocol();
-        setCodeName(obj, index);
-        setDeleted(obj, index);
-        setIgnored(obj, index);
-        setLsKind(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedBy(obj, index);
-        setModifiedDate(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        setShortDescription(obj, index);
-        return obj;
-    }
-    
-    public void ProtocolDataOnDemand.setCodeName(Protocol obj, int index) {
-        String codeName = "codeName_" + index;
-        if (codeName.length() > 255) {
-            codeName = new Random().nextInt(10) + codeName.substring(1, 255);
-        }
-        obj.setCodeName(codeName);
-    }
-    
-    public void ProtocolDataOnDemand.setDeleted(Protocol obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void ProtocolDataOnDemand.setIgnored(Protocol obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void ProtocolDataOnDemand.setLsKind(Protocol obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void ProtocolDataOnDemand.setLsTransaction(Protocol obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void ProtocolDataOnDemand.setLsType(Protocol obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 255) {
-            lsType = lsType.substring(0, 255);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void ProtocolDataOnDemand.setLsTypeAndKind(Protocol obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void ProtocolDataOnDemand.setModifiedBy(Protocol obj, int index) {
-        String modifiedBy = "modifiedBy_" + index;
-        if (modifiedBy.length() > 255) {
-            modifiedBy = modifiedBy.substring(0, 255);
-        }
-        obj.setModifiedBy(modifiedBy);
-    }
-    
-    public void ProtocolDataOnDemand.setModifiedDate(Protocol obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void ProtocolDataOnDemand.setRecordedBy(Protocol obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void ProtocolDataOnDemand.setRecordedDate(Protocol obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public void ProtocolDataOnDemand.setShortDescription(Protocol obj, int index) {
-        String shortDescription = "shortDescription_" + index;
-        if (shortDescription.length() > 1000) {
-            shortDescription = shortDescription.substring(0, 1000);
-        }
-        obj.setShortDescription(shortDescription);
-    }
-    
-    public Protocol ProtocolDataOnDemand.getSpecificProtocol(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        Protocol obj = data.get(index);
-        Long id = obj.getId();
-        return Protocol.findProtocol(id);
-    }
-    
-    public Protocol ProtocolDataOnDemand.getRandomProtocol() {
-        init();
-        Protocol obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return Protocol.findProtocol(id);
-    }
-    
-    public boolean ProtocolDataOnDemand.modifyProtocol(Protocol obj) {
-        return false;
-    }
-    
-    public void ProtocolDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = Protocol.findProtocolEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'Protocol' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<Protocol>();
-        for (int i = 0; i < 10; i++) {
-            Protocol obj = getNewTransientProtocol(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ProtocolIntegrationTest.java
index 97434e713..eee2e3b6f 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = Protocol.class)
 public class ProtocolIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ProtocolDataOnDemand dod;
+
+	@Test
+    public void testCountProtocols() {
+        Assert.assertNotNull("Data on demand for 'Protocol' failed to initialize correctly", dod.getRandomProtocol());
+        long count = Protocol.countProtocols();
+        Assert.assertTrue("Counter for 'Protocol' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindProtocol() {
+        Protocol obj = dod.getRandomProtocol();
+        Assert.assertNotNull("Data on demand for 'Protocol' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'Protocol' failed to provide an identifier", id);
+        obj = Protocol.findProtocol(id);
+        Assert.assertNotNull("Find method for 'Protocol' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'Protocol' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllProtocols() {
+        Assert.assertNotNull("Data on demand for 'Protocol' failed to initialize correctly", dod.getRandomProtocol());
+        long count = Protocol.countProtocols();
+        Assert.assertTrue("Too expensive to perform a find all test for 'Protocol', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<Protocol> result = Protocol.findAllProtocols();
+        Assert.assertNotNull("Find all method for 'Protocol' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'Protocol' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindProtocolEntries() {
+        Assert.assertNotNull("Data on demand for 'Protocol' failed to initialize correctly", dod.getRandomProtocol());
+        long count = Protocol.countProtocols();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<Protocol> result = Protocol.findProtocolEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'Protocol' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'Protocol' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        Protocol obj = dod.getRandomProtocol();
+        Assert.assertNotNull("Data on demand for 'Protocol' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'Protocol' failed to provide an identifier", id);
+        obj = Protocol.findProtocol(id);
+        Assert.assertNotNull("Find method for 'Protocol' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyProtocol(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'Protocol' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        Protocol obj = dod.getRandomProtocol();
+        Assert.assertNotNull("Data on demand for 'Protocol' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'Protocol' failed to provide an identifier", id);
+        obj = Protocol.findProtocol(id);
+        boolean modified =  dod.modifyProtocol(obj);
+        Integer currentVersion = obj.getVersion();
+        Protocol merged = (Protocol)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'Protocol' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'Protocol' failed to initialize correctly", dod.getRandomProtocol());
+        Protocol obj = dod.getNewTransientProtocol(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'Protocol' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'Protocol' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'Protocol' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        Protocol obj = dod.getRandomProtocol();
+        Assert.assertNotNull("Data on demand for 'Protocol' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'Protocol' failed to provide an identifier", id);
+        obj = Protocol.findProtocol(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'Protocol' with identifier '" + id + "'", Protocol.findProtocol(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ProtocolIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 0a16506b1..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ProtocolIntegrationTest_Roo_Configurable {
-    
-    declare @type: ProtocolIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ProtocolIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 29a7badfa..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ProtocolDataOnDemand;
-import com.labsynch.labseer.domain.ProtocolIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ProtocolIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ProtocolIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ProtocolIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ProtocolIntegrationTest: @Transactional;
-    
-    @Autowired
-    ProtocolDataOnDemand ProtocolIntegrationTest.dod;
-    
-    @Test
-    public void ProtocolIntegrationTest.testCountProtocols() {
-        Assert.assertNotNull("Data on demand for 'Protocol' failed to initialize correctly", dod.getRandomProtocol());
-        long count = Protocol.countProtocols();
-        Assert.assertTrue("Counter for 'Protocol' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ProtocolIntegrationTest.testFindProtocol() {
-        Protocol obj = dod.getRandomProtocol();
-        Assert.assertNotNull("Data on demand for 'Protocol' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'Protocol' failed to provide an identifier", id);
-        obj = Protocol.findProtocol(id);
-        Assert.assertNotNull("Find method for 'Protocol' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'Protocol' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ProtocolIntegrationTest.testFindAllProtocols() {
-        Assert.assertNotNull("Data on demand for 'Protocol' failed to initialize correctly", dod.getRandomProtocol());
-        long count = Protocol.countProtocols();
-        Assert.assertTrue("Too expensive to perform a find all test for 'Protocol', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<Protocol> result = Protocol.findAllProtocols();
-        Assert.assertNotNull("Find all method for 'Protocol' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'Protocol' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ProtocolIntegrationTest.testFindProtocolEntries() {
-        Assert.assertNotNull("Data on demand for 'Protocol' failed to initialize correctly", dod.getRandomProtocol());
-        long count = Protocol.countProtocols();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<Protocol> result = Protocol.findProtocolEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'Protocol' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'Protocol' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ProtocolIntegrationTest.testFlush() {
-        Protocol obj = dod.getRandomProtocol();
-        Assert.assertNotNull("Data on demand for 'Protocol' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'Protocol' failed to provide an identifier", id);
-        obj = Protocol.findProtocol(id);
-        Assert.assertNotNull("Find method for 'Protocol' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyProtocol(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'Protocol' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ProtocolIntegrationTest.testMergeUpdate() {
-        Protocol obj = dod.getRandomProtocol();
-        Assert.assertNotNull("Data on demand for 'Protocol' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'Protocol' failed to provide an identifier", id);
-        obj = Protocol.findProtocol(id);
-        boolean modified =  dod.modifyProtocol(obj);
-        Integer currentVersion = obj.getVersion();
-        Protocol merged = (Protocol)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'Protocol' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ProtocolIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'Protocol' failed to initialize correctly", dod.getRandomProtocol());
-        Protocol obj = dod.getNewTransientProtocol(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'Protocol' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'Protocol' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'Protocol' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ProtocolIntegrationTest.testRemove() {
-        Protocol obj = dod.getRandomProtocol();
-        Assert.assertNotNull("Data on demand for 'Protocol' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'Protocol' failed to provide an identifier", id);
-        obj = Protocol.findProtocol(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'Protocol' with identifier '" + id + "'", Protocol.findProtocol(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ProtocolKindDataOnDemand.java
index 87a04cebd..b03bd93c6 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolKindDataOnDemand.java
@@ -1,7 +1,108 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Component
+@Configurable
 @RooDataOnDemand(entity = ProtocolKind.class)
 public class ProtocolKindDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<ProtocolKind> data;
+
+	@Autowired
+    ProtocolTypeDataOnDemand protocolTypeDataOnDemand;
+
+	public ProtocolKind getNewTransientProtocolKind(int index) {
+        ProtocolKind obj = new ProtocolKind();
+        setKindName(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        return obj;
+    }
+
+	public void setKindName(ProtocolKind obj, int index) {
+        String kindName = "kindName_" + index;
+        if (kindName.length() > 255) {
+            kindName = kindName.substring(0, 255);
+        }
+        obj.setKindName(kindName);
+    }
+
+	public void setLsType(ProtocolKind obj, int index) {
+        ProtocolType lsType = protocolTypeDataOnDemand.getRandomProtocolType();
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(ProtocolKind obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = new Random().nextInt(10) + lsTypeAndKind.substring(1, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public ProtocolKind getSpecificProtocolKind(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        ProtocolKind obj = data.get(index);
+        Long id = obj.getId();
+        return ProtocolKind.findProtocolKind(id);
+    }
+
+	public ProtocolKind getRandomProtocolKind() {
+        init();
+        ProtocolKind obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return ProtocolKind.findProtocolKind(id);
+    }
+
+	public boolean modifyProtocolKind(ProtocolKind obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = ProtocolKind.findProtocolKindEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'ProtocolKind' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<ProtocolKind>();
+        for (int i = 0; i < 10; i++) {
+            ProtocolKind obj = getNewTransientProtocolKind(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolKindDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ProtocolKindDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index ce82842b1..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolKindDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolKindDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ProtocolKindDataOnDemand_Roo_Configurable {
-    
-    declare @type: ProtocolKindDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolKindDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ProtocolKindDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 8c7545751..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolKindDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,113 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolKind;
-import com.labsynch.labseer.domain.ProtocolKindDataOnDemand;
-import com.labsynch.labseer.domain.ProtocolType;
-import com.labsynch.labseer.domain.ProtocolTypeDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect ProtocolKindDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ProtocolKindDataOnDemand: @Component;
-    
-    private Random ProtocolKindDataOnDemand.rnd = new SecureRandom();
-    
-    private List<ProtocolKind> ProtocolKindDataOnDemand.data;
-    
-    @Autowired
-    ProtocolTypeDataOnDemand ProtocolKindDataOnDemand.protocolTypeDataOnDemand;
-    
-    public ProtocolKind ProtocolKindDataOnDemand.getNewTransientProtocolKind(int index) {
-        ProtocolKind obj = new ProtocolKind();
-        setKindName(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        return obj;
-    }
-    
-    public void ProtocolKindDataOnDemand.setKindName(ProtocolKind obj, int index) {
-        String kindName = "kindName_" + index;
-        if (kindName.length() > 255) {
-            kindName = kindName.substring(0, 255);
-        }
-        obj.setKindName(kindName);
-    }
-    
-    public void ProtocolKindDataOnDemand.setLsType(ProtocolKind obj, int index) {
-        ProtocolType lsType = protocolTypeDataOnDemand.getRandomProtocolType();
-        obj.setLsType(lsType);
-    }
-    
-    public void ProtocolKindDataOnDemand.setLsTypeAndKind(ProtocolKind obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = new Random().nextInt(10) + lsTypeAndKind.substring(1, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public ProtocolKind ProtocolKindDataOnDemand.getSpecificProtocolKind(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        ProtocolKind obj = data.get(index);
-        Long id = obj.getId();
-        return ProtocolKind.findProtocolKind(id);
-    }
-    
-    public ProtocolKind ProtocolKindDataOnDemand.getRandomProtocolKind() {
-        init();
-        ProtocolKind obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return ProtocolKind.findProtocolKind(id);
-    }
-    
-    public boolean ProtocolKindDataOnDemand.modifyProtocolKind(ProtocolKind obj) {
-        return false;
-    }
-    
-    public void ProtocolKindDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = ProtocolKind.findProtocolKindEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ProtocolKind' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<ProtocolKind>();
-        for (int i = 0; i < 10; i++) {
-            ProtocolKind obj = getNewTransientProtocolKind(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ProtocolKindIntegrationTest.java
index e1073d3b4..2f6930f77 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolKindIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = ProtocolKind.class)
 public class ProtocolKindIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ProtocolKindDataOnDemand dod;
+
+	@Test
+    public void testCountProtocolKinds() {
+        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to initialize correctly", dod.getRandomProtocolKind());
+        long count = ProtocolKind.countProtocolKinds();
+        Assert.assertTrue("Counter for 'ProtocolKind' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindProtocolKind() {
+        ProtocolKind obj = dod.getRandomProtocolKind();
+        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to provide an identifier", id);
+        obj = ProtocolKind.findProtocolKind(id);
+        Assert.assertNotNull("Find method for 'ProtocolKind' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'ProtocolKind' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllProtocolKinds() {
+        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to initialize correctly", dod.getRandomProtocolKind());
+        long count = ProtocolKind.countProtocolKinds();
+        Assert.assertTrue("Too expensive to perform a find all test for 'ProtocolKind', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<ProtocolKind> result = ProtocolKind.findAllProtocolKinds();
+        Assert.assertNotNull("Find all method for 'ProtocolKind' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'ProtocolKind' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindProtocolKindEntries() {
+        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to initialize correctly", dod.getRandomProtocolKind());
+        long count = ProtocolKind.countProtocolKinds();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<ProtocolKind> result = ProtocolKind.findProtocolKindEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'ProtocolKind' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'ProtocolKind' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        ProtocolKind obj = dod.getRandomProtocolKind();
+        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to provide an identifier", id);
+        obj = ProtocolKind.findProtocolKind(id);
+        Assert.assertNotNull("Find method for 'ProtocolKind' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyProtocolKind(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'ProtocolKind' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        ProtocolKind obj = dod.getRandomProtocolKind();
+        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to provide an identifier", id);
+        obj = ProtocolKind.findProtocolKind(id);
+        boolean modified =  dod.modifyProtocolKind(obj);
+        Integer currentVersion = obj.getVersion();
+        ProtocolKind merged = obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'ProtocolKind' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to initialize correctly", dod.getRandomProtocolKind());
+        ProtocolKind obj = dod.getNewTransientProtocolKind(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'ProtocolKind' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'ProtocolKind' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        ProtocolKind obj = dod.getRandomProtocolKind();
+        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to provide an identifier", id);
+        obj = ProtocolKind.findProtocolKind(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'ProtocolKind' with identifier '" + id + "'", ProtocolKind.findProtocolKind(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolKindIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ProtocolKindIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index f14de0149..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolKindIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolKindIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ProtocolKindIntegrationTest_Roo_Configurable {
-    
-    declare @type: ProtocolKindIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolKindIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ProtocolKindIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 227f61c9d..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolKindIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolKind;
-import com.labsynch.labseer.domain.ProtocolKindDataOnDemand;
-import com.labsynch.labseer.domain.ProtocolKindIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ProtocolKindIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ProtocolKindIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ProtocolKindIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ProtocolKindIntegrationTest: @Transactional;
-    
-    @Autowired
-    ProtocolKindDataOnDemand ProtocolKindIntegrationTest.dod;
-    
-    @Test
-    public void ProtocolKindIntegrationTest.testCountProtocolKinds() {
-        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to initialize correctly", dod.getRandomProtocolKind());
-        long count = ProtocolKind.countProtocolKinds();
-        Assert.assertTrue("Counter for 'ProtocolKind' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ProtocolKindIntegrationTest.testFindProtocolKind() {
-        ProtocolKind obj = dod.getRandomProtocolKind();
-        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to provide an identifier", id);
-        obj = ProtocolKind.findProtocolKind(id);
-        Assert.assertNotNull("Find method for 'ProtocolKind' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ProtocolKind' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ProtocolKindIntegrationTest.testFindAllProtocolKinds() {
-        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to initialize correctly", dod.getRandomProtocolKind());
-        long count = ProtocolKind.countProtocolKinds();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ProtocolKind', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<ProtocolKind> result = ProtocolKind.findAllProtocolKinds();
-        Assert.assertNotNull("Find all method for 'ProtocolKind' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ProtocolKind' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ProtocolKindIntegrationTest.testFindProtocolKindEntries() {
-        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to initialize correctly", dod.getRandomProtocolKind());
-        long count = ProtocolKind.countProtocolKinds();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<ProtocolKind> result = ProtocolKind.findProtocolKindEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'ProtocolKind' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ProtocolKind' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ProtocolKindIntegrationTest.testFlush() {
-        ProtocolKind obj = dod.getRandomProtocolKind();
-        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to provide an identifier", id);
-        obj = ProtocolKind.findProtocolKind(id);
-        Assert.assertNotNull("Find method for 'ProtocolKind' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyProtocolKind(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'ProtocolKind' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ProtocolKindIntegrationTest.testMergeUpdate() {
-        ProtocolKind obj = dod.getRandomProtocolKind();
-        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to provide an identifier", id);
-        obj = ProtocolKind.findProtocolKind(id);
-        boolean modified =  dod.modifyProtocolKind(obj);
-        Integer currentVersion = obj.getVersion();
-        ProtocolKind merged = obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ProtocolKind' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ProtocolKindIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to initialize correctly", dod.getRandomProtocolKind());
-        ProtocolKind obj = dod.getNewTransientProtocolKind(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'ProtocolKind' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'ProtocolKind' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ProtocolKindIntegrationTest.testRemove() {
-        ProtocolKind obj = dod.getRandomProtocolKind();
-        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to provide an identifier", id);
-        obj = ProtocolKind.findProtocolKind(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'ProtocolKind' with identifier '" + id + "'", ProtocolKind.findProtocolKind(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolLabelDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ProtocolLabelDataOnDemand.java
index 0e7ea119e..58af75c68 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolLabelDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolLabelDataOnDemand.java
@@ -1,7 +1,189 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Component
+@Configurable
 @RooDataOnDemand(entity = ProtocolLabel.class)
 public class ProtocolLabelDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<ProtocolLabel> data;
+
+	@Autowired
+    ProtocolDataOnDemand protocolDataOnDemand;
+
+	public ProtocolLabel getNewTransientProtocolLabel(int index) {
+        ProtocolLabel obj = new ProtocolLabel();
+        setDeleted(obj, index);
+        setIgnored(obj, index);
+        setImageFile(obj, index);
+        setLabelText(obj, index);
+        setLsKind(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedDate(obj, index);
+        setPhysicallyLabled(obj, index);
+        setPreferred(obj, index);
+        setProtocol(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        return obj;
+    }
+
+	public void setDeleted(ProtocolLabel obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setIgnored(ProtocolLabel obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setImageFile(ProtocolLabel obj, int index) {
+        String imageFile = "imageFile_" + index;
+        if (imageFile.length() > 255) {
+            imageFile = imageFile.substring(0, 255);
+        }
+        obj.setImageFile(imageFile);
+    }
+
+	public void setLabelText(ProtocolLabel obj, int index) {
+        String labelText = "labelText_" + index;
+        if (labelText.length() > 255) {
+            labelText = labelText.substring(0, 255);
+        }
+        obj.setLabelText(labelText);
+    }
+
+	public void setLsKind(ProtocolLabel obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsTransaction(ProtocolLabel obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(ProtocolLabel obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 64) {
+            lsType = lsType.substring(0, 64);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(ProtocolLabel obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedDate(ProtocolLabel obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setPhysicallyLabled(ProtocolLabel obj, int index) {
+        Boolean physicallyLabled = true;
+        obj.setPhysicallyLabled(physicallyLabled);
+    }
+
+	public void setPreferred(ProtocolLabel obj, int index) {
+        Boolean preferred = true;
+        obj.setPreferred(preferred);
+    }
+
+	public void setProtocol(ProtocolLabel obj, int index) {
+        Protocol protocol = protocolDataOnDemand.getRandomProtocol();
+        obj.setProtocol(protocol);
+    }
+
+	public void setRecordedBy(ProtocolLabel obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(ProtocolLabel obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public ProtocolLabel getSpecificProtocolLabel(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        ProtocolLabel obj = data.get(index);
+        Long id = obj.getId();
+        return ProtocolLabel.findProtocolLabel(id);
+    }
+
+	public ProtocolLabel getRandomProtocolLabel() {
+        init();
+        ProtocolLabel obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return ProtocolLabel.findProtocolLabel(id);
+    }
+
+	public boolean modifyProtocolLabel(ProtocolLabel obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = ProtocolLabel.findProtocolLabelEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'ProtocolLabel' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<ProtocolLabel>();
+        for (int i = 0; i < 10; i++) {
+            ProtocolLabel obj = getNewTransientProtocolLabel(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolLabelDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ProtocolLabelDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 5bff1fe64..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolLabelDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolLabelDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ProtocolLabelDataOnDemand_Roo_Configurable {
-    
-    declare @type: ProtocolLabelDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolLabelDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ProtocolLabelDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 0eb794f77..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolLabelDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,194 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ProtocolDataOnDemand;
-import com.labsynch.labseer.domain.ProtocolLabel;
-import com.labsynch.labseer.domain.ProtocolLabelDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect ProtocolLabelDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ProtocolLabelDataOnDemand: @Component;
-    
-    private Random ProtocolLabelDataOnDemand.rnd = new SecureRandom();
-    
-    private List<ProtocolLabel> ProtocolLabelDataOnDemand.data;
-    
-    @Autowired
-    ProtocolDataOnDemand ProtocolLabelDataOnDemand.protocolDataOnDemand;
-    
-    public ProtocolLabel ProtocolLabelDataOnDemand.getNewTransientProtocolLabel(int index) {
-        ProtocolLabel obj = new ProtocolLabel();
-        setDeleted(obj, index);
-        setIgnored(obj, index);
-        setImageFile(obj, index);
-        setLabelText(obj, index);
-        setLsKind(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedDate(obj, index);
-        setPhysicallyLabled(obj, index);
-        setPreferred(obj, index);
-        setProtocol(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        return obj;
-    }
-    
-    public void ProtocolLabelDataOnDemand.setDeleted(ProtocolLabel obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void ProtocolLabelDataOnDemand.setIgnored(ProtocolLabel obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void ProtocolLabelDataOnDemand.setImageFile(ProtocolLabel obj, int index) {
-        String imageFile = "imageFile_" + index;
-        if (imageFile.length() > 255) {
-            imageFile = imageFile.substring(0, 255);
-        }
-        obj.setImageFile(imageFile);
-    }
-    
-    public void ProtocolLabelDataOnDemand.setLabelText(ProtocolLabel obj, int index) {
-        String labelText = "labelText_" + index;
-        if (labelText.length() > 255) {
-            labelText = labelText.substring(0, 255);
-        }
-        obj.setLabelText(labelText);
-    }
-    
-    public void ProtocolLabelDataOnDemand.setLsKind(ProtocolLabel obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void ProtocolLabelDataOnDemand.setLsTransaction(ProtocolLabel obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void ProtocolLabelDataOnDemand.setLsType(ProtocolLabel obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 64) {
-            lsType = lsType.substring(0, 64);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void ProtocolLabelDataOnDemand.setLsTypeAndKind(ProtocolLabel obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void ProtocolLabelDataOnDemand.setModifiedDate(ProtocolLabel obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void ProtocolLabelDataOnDemand.setPhysicallyLabled(ProtocolLabel obj, int index) {
-        Boolean physicallyLabled = true;
-        obj.setPhysicallyLabled(physicallyLabled);
-    }
-    
-    public void ProtocolLabelDataOnDemand.setPreferred(ProtocolLabel obj, int index) {
-        Boolean preferred = true;
-        obj.setPreferred(preferred);
-    }
-    
-    public void ProtocolLabelDataOnDemand.setProtocol(ProtocolLabel obj, int index) {
-        Protocol protocol = protocolDataOnDemand.getRandomProtocol();
-        obj.setProtocol(protocol);
-    }
-    
-    public void ProtocolLabelDataOnDemand.setRecordedBy(ProtocolLabel obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void ProtocolLabelDataOnDemand.setRecordedDate(ProtocolLabel obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public ProtocolLabel ProtocolLabelDataOnDemand.getSpecificProtocolLabel(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        ProtocolLabel obj = data.get(index);
-        Long id = obj.getId();
-        return ProtocolLabel.findProtocolLabel(id);
-    }
-    
-    public ProtocolLabel ProtocolLabelDataOnDemand.getRandomProtocolLabel() {
-        init();
-        ProtocolLabel obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return ProtocolLabel.findProtocolLabel(id);
-    }
-    
-    public boolean ProtocolLabelDataOnDemand.modifyProtocolLabel(ProtocolLabel obj) {
-        return false;
-    }
-    
-    public void ProtocolLabelDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = ProtocolLabel.findProtocolLabelEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ProtocolLabel' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<ProtocolLabel>();
-        for (int i = 0; i < 10; i++) {
-            ProtocolLabel obj = getNewTransientProtocolLabel(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolLabelIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ProtocolLabelIntegrationTest.java
index 07f99260b..f564aa384 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolLabelIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolLabelIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = ProtocolLabel.class)
 public class ProtocolLabelIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ProtocolLabelDataOnDemand dod;
+
+	@Test
+    public void testCountProtocolLabels() {
+        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to initialize correctly", dod.getRandomProtocolLabel());
+        long count = ProtocolLabel.countProtocolLabels();
+        Assert.assertTrue("Counter for 'ProtocolLabel' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindProtocolLabel() {
+        ProtocolLabel obj = dod.getRandomProtocolLabel();
+        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to provide an identifier", id);
+        obj = ProtocolLabel.findProtocolLabel(id);
+        Assert.assertNotNull("Find method for 'ProtocolLabel' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'ProtocolLabel' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllProtocolLabels() {
+        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to initialize correctly", dod.getRandomProtocolLabel());
+        long count = ProtocolLabel.countProtocolLabels();
+        Assert.assertTrue("Too expensive to perform a find all test for 'ProtocolLabel', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<ProtocolLabel> result = ProtocolLabel.findAllProtocolLabels();
+        Assert.assertNotNull("Find all method for 'ProtocolLabel' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'ProtocolLabel' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindProtocolLabelEntries() {
+        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to initialize correctly", dod.getRandomProtocolLabel());
+        long count = ProtocolLabel.countProtocolLabels();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<ProtocolLabel> result = ProtocolLabel.findProtocolLabelEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'ProtocolLabel' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'ProtocolLabel' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        ProtocolLabel obj = dod.getRandomProtocolLabel();
+        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to provide an identifier", id);
+        obj = ProtocolLabel.findProtocolLabel(id);
+        Assert.assertNotNull("Find method for 'ProtocolLabel' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyProtocolLabel(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'ProtocolLabel' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        ProtocolLabel obj = dod.getRandomProtocolLabel();
+        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to provide an identifier", id);
+        obj = ProtocolLabel.findProtocolLabel(id);
+        boolean modified =  dod.modifyProtocolLabel(obj);
+        Integer currentVersion = obj.getVersion();
+        ProtocolLabel merged = (ProtocolLabel)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'ProtocolLabel' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to initialize correctly", dod.getRandomProtocolLabel());
+        ProtocolLabel obj = dod.getNewTransientProtocolLabel(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'ProtocolLabel' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'ProtocolLabel' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        ProtocolLabel obj = dod.getRandomProtocolLabel();
+        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to provide an identifier", id);
+        obj = ProtocolLabel.findProtocolLabel(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'ProtocolLabel' with identifier '" + id + "'", ProtocolLabel.findProtocolLabel(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolLabelIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ProtocolLabelIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index baf53f8a5..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolLabelIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolLabelIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ProtocolLabelIntegrationTest_Roo_Configurable {
-    
-    declare @type: ProtocolLabelIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolLabelIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ProtocolLabelIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 78939f864..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolLabelIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolLabel;
-import com.labsynch.labseer.domain.ProtocolLabelDataOnDemand;
-import com.labsynch.labseer.domain.ProtocolLabelIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ProtocolLabelIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ProtocolLabelIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ProtocolLabelIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ProtocolLabelIntegrationTest: @Transactional;
-    
-    @Autowired
-    ProtocolLabelDataOnDemand ProtocolLabelIntegrationTest.dod;
-    
-    @Test
-    public void ProtocolLabelIntegrationTest.testCountProtocolLabels() {
-        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to initialize correctly", dod.getRandomProtocolLabel());
-        long count = ProtocolLabel.countProtocolLabels();
-        Assert.assertTrue("Counter for 'ProtocolLabel' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ProtocolLabelIntegrationTest.testFindProtocolLabel() {
-        ProtocolLabel obj = dod.getRandomProtocolLabel();
-        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to provide an identifier", id);
-        obj = ProtocolLabel.findProtocolLabel(id);
-        Assert.assertNotNull("Find method for 'ProtocolLabel' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ProtocolLabel' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ProtocolLabelIntegrationTest.testFindAllProtocolLabels() {
-        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to initialize correctly", dod.getRandomProtocolLabel());
-        long count = ProtocolLabel.countProtocolLabels();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ProtocolLabel', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<ProtocolLabel> result = ProtocolLabel.findAllProtocolLabels();
-        Assert.assertNotNull("Find all method for 'ProtocolLabel' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ProtocolLabel' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ProtocolLabelIntegrationTest.testFindProtocolLabelEntries() {
-        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to initialize correctly", dod.getRandomProtocolLabel());
-        long count = ProtocolLabel.countProtocolLabels();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<ProtocolLabel> result = ProtocolLabel.findProtocolLabelEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'ProtocolLabel' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ProtocolLabel' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ProtocolLabelIntegrationTest.testFlush() {
-        ProtocolLabel obj = dod.getRandomProtocolLabel();
-        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to provide an identifier", id);
-        obj = ProtocolLabel.findProtocolLabel(id);
-        Assert.assertNotNull("Find method for 'ProtocolLabel' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyProtocolLabel(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'ProtocolLabel' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ProtocolLabelIntegrationTest.testMergeUpdate() {
-        ProtocolLabel obj = dod.getRandomProtocolLabel();
-        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to provide an identifier", id);
-        obj = ProtocolLabel.findProtocolLabel(id);
-        boolean modified =  dod.modifyProtocolLabel(obj);
-        Integer currentVersion = obj.getVersion();
-        ProtocolLabel merged = (ProtocolLabel)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ProtocolLabel' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ProtocolLabelIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to initialize correctly", dod.getRandomProtocolLabel());
-        ProtocolLabel obj = dod.getNewTransientProtocolLabel(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'ProtocolLabel' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'ProtocolLabel' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ProtocolLabelIntegrationTest.testRemove() {
-        ProtocolLabel obj = dod.getRandomProtocolLabel();
-        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to provide an identifier", id);
-        obj = ProtocolLabel.findProtocolLabel(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'ProtocolLabel' with identifier '" + id + "'", ProtocolLabel.findProtocolLabel(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ProtocolStateDataOnDemand.java
index 326850115..49a4c6414 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolStateDataOnDemand.java
@@ -1,7 +1,177 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Configurable
+@Component
 @RooDataOnDemand(entity = ProtocolState.class)
 public class ProtocolStateDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<ProtocolState> data;
+
+	@Autowired
+    ProtocolDataOnDemand protocolDataOnDemand;
+
+	public ProtocolState getNewTransientProtocolState(int index) {
+        ProtocolState obj = new ProtocolState();
+        setComments(obj, index);
+        setDeleted(obj, index);
+        setIgnored(obj, index);
+        setLsKind(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedBy(obj, index);
+        setModifiedDate(obj, index);
+        setProtocol(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        return obj;
+    }
+
+	public void setComments(ProtocolState obj, int index) {
+        String comments = "comments_" + index;
+        if (comments.length() > 512) {
+            comments = comments.substring(0, 512);
+        }
+        obj.setComments(comments);
+    }
+
+	public void setDeleted(ProtocolState obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setIgnored(ProtocolState obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setLsKind(ProtocolState obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsTransaction(ProtocolState obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(ProtocolState obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 64) {
+            lsType = lsType.substring(0, 64);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(ProtocolState obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedBy(ProtocolState obj, int index) {
+        String modifiedBy = "modifiedBy_" + index;
+        if (modifiedBy.length() > 255) {
+            modifiedBy = modifiedBy.substring(0, 255);
+        }
+        obj.setModifiedBy(modifiedBy);
+    }
+
+	public void setModifiedDate(ProtocolState obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setProtocol(ProtocolState obj, int index) {
+        Protocol protocol = protocolDataOnDemand.getRandomProtocol();
+        obj.setProtocol(protocol);
+    }
+
+	public void setRecordedBy(ProtocolState obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(ProtocolState obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public ProtocolState getSpecificProtocolState(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        ProtocolState obj = data.get(index);
+        Long id = obj.getId();
+        return ProtocolState.findProtocolState(id);
+    }
+
+	public ProtocolState getRandomProtocolState() {
+        init();
+        ProtocolState obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return ProtocolState.findProtocolState(id);
+    }
+
+	public boolean modifyProtocolState(ProtocolState obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = ProtocolState.findProtocolStateEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'ProtocolState' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<ProtocolState>();
+        for (int i = 0; i < 10; i++) {
+            ProtocolState obj = getNewTransientProtocolState(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolStateDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ProtocolStateDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 0f55bd307..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolStateDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolStateDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ProtocolStateDataOnDemand_Roo_Configurable {
-    
-    declare @type: ProtocolStateDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolStateDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ProtocolStateDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index b96b3c1d2..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolStateDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,182 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ProtocolDataOnDemand;
-import com.labsynch.labseer.domain.ProtocolState;
-import com.labsynch.labseer.domain.ProtocolStateDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect ProtocolStateDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ProtocolStateDataOnDemand: @Component;
-    
-    private Random ProtocolStateDataOnDemand.rnd = new SecureRandom();
-    
-    private List<ProtocolState> ProtocolStateDataOnDemand.data;
-    
-    @Autowired
-    ProtocolDataOnDemand ProtocolStateDataOnDemand.protocolDataOnDemand;
-    
-    public ProtocolState ProtocolStateDataOnDemand.getNewTransientProtocolState(int index) {
-        ProtocolState obj = new ProtocolState();
-        setComments(obj, index);
-        setDeleted(obj, index);
-        setIgnored(obj, index);
-        setLsKind(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedBy(obj, index);
-        setModifiedDate(obj, index);
-        setProtocol(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        return obj;
-    }
-    
-    public void ProtocolStateDataOnDemand.setComments(ProtocolState obj, int index) {
-        String comments = "comments_" + index;
-        if (comments.length() > 512) {
-            comments = comments.substring(0, 512);
-        }
-        obj.setComments(comments);
-    }
-    
-    public void ProtocolStateDataOnDemand.setDeleted(ProtocolState obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void ProtocolStateDataOnDemand.setIgnored(ProtocolState obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void ProtocolStateDataOnDemand.setLsKind(ProtocolState obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void ProtocolStateDataOnDemand.setLsTransaction(ProtocolState obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void ProtocolStateDataOnDemand.setLsType(ProtocolState obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 64) {
-            lsType = lsType.substring(0, 64);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void ProtocolStateDataOnDemand.setLsTypeAndKind(ProtocolState obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void ProtocolStateDataOnDemand.setModifiedBy(ProtocolState obj, int index) {
-        String modifiedBy = "modifiedBy_" + index;
-        if (modifiedBy.length() > 255) {
-            modifiedBy = modifiedBy.substring(0, 255);
-        }
-        obj.setModifiedBy(modifiedBy);
-    }
-    
-    public void ProtocolStateDataOnDemand.setModifiedDate(ProtocolState obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void ProtocolStateDataOnDemand.setProtocol(ProtocolState obj, int index) {
-        Protocol protocol = protocolDataOnDemand.getRandomProtocol();
-        obj.setProtocol(protocol);
-    }
-    
-    public void ProtocolStateDataOnDemand.setRecordedBy(ProtocolState obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void ProtocolStateDataOnDemand.setRecordedDate(ProtocolState obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public ProtocolState ProtocolStateDataOnDemand.getSpecificProtocolState(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        ProtocolState obj = data.get(index);
-        Long id = obj.getId();
-        return ProtocolState.findProtocolState(id);
-    }
-    
-    public ProtocolState ProtocolStateDataOnDemand.getRandomProtocolState() {
-        init();
-        ProtocolState obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return ProtocolState.findProtocolState(id);
-    }
-    
-    public boolean ProtocolStateDataOnDemand.modifyProtocolState(ProtocolState obj) {
-        return false;
-    }
-    
-    public void ProtocolStateDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = ProtocolState.findProtocolStateEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ProtocolState' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<ProtocolState>();
-        for (int i = 0; i < 10; i++) {
-            ProtocolState obj = getNewTransientProtocolState(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ProtocolStateIntegrationTest.java
index d1961ab3a..fc72e79f8 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolStateIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
+@Configurable
 @RooIntegrationTest(entity = ProtocolState.class)
 public class ProtocolStateIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ProtocolStateDataOnDemand dod;
+
+	@Test
+    public void testCountProtocolStates() {
+        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to initialize correctly", dod.getRandomProtocolState());
+        long count = ProtocolState.countProtocolStates();
+        Assert.assertTrue("Counter for 'ProtocolState' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindProtocolState() {
+        ProtocolState obj = dod.getRandomProtocolState();
+        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to provide an identifier", id);
+        obj = ProtocolState.findProtocolState(id);
+        Assert.assertNotNull("Find method for 'ProtocolState' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'ProtocolState' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllProtocolStates() {
+        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to initialize correctly", dod.getRandomProtocolState());
+        long count = ProtocolState.countProtocolStates();
+        Assert.assertTrue("Too expensive to perform a find all test for 'ProtocolState', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<ProtocolState> result = ProtocolState.findAllProtocolStates();
+        Assert.assertNotNull("Find all method for 'ProtocolState' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'ProtocolState' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindProtocolStateEntries() {
+        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to initialize correctly", dod.getRandomProtocolState());
+        long count = ProtocolState.countProtocolStates();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<ProtocolState> result = ProtocolState.findProtocolStateEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'ProtocolState' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'ProtocolState' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        ProtocolState obj = dod.getRandomProtocolState();
+        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to provide an identifier", id);
+        obj = ProtocolState.findProtocolState(id);
+        Assert.assertNotNull("Find method for 'ProtocolState' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyProtocolState(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'ProtocolState' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        ProtocolState obj = dod.getRandomProtocolState();
+        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to provide an identifier", id);
+        obj = ProtocolState.findProtocolState(id);
+        boolean modified =  dod.modifyProtocolState(obj);
+        Integer currentVersion = obj.getVersion();
+        ProtocolState merged = (ProtocolState)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'ProtocolState' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to initialize correctly", dod.getRandomProtocolState());
+        ProtocolState obj = dod.getNewTransientProtocolState(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'ProtocolState' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'ProtocolState' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        ProtocolState obj = dod.getRandomProtocolState();
+        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to provide an identifier", id);
+        obj = ProtocolState.findProtocolState(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'ProtocolState' with identifier '" + id + "'", ProtocolState.findProtocolState(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolStateIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ProtocolStateIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 6c89cd4b2..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolStateIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolStateIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ProtocolStateIntegrationTest_Roo_Configurable {
-    
-    declare @type: ProtocolStateIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolStateIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ProtocolStateIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 24be0fa96..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolStateIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolState;
-import com.labsynch.labseer.domain.ProtocolStateDataOnDemand;
-import com.labsynch.labseer.domain.ProtocolStateIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ProtocolStateIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ProtocolStateIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ProtocolStateIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ProtocolStateIntegrationTest: @Transactional;
-    
-    @Autowired
-    ProtocolStateDataOnDemand ProtocolStateIntegrationTest.dod;
-    
-    @Test
-    public void ProtocolStateIntegrationTest.testCountProtocolStates() {
-        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to initialize correctly", dod.getRandomProtocolState());
-        long count = ProtocolState.countProtocolStates();
-        Assert.assertTrue("Counter for 'ProtocolState' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ProtocolStateIntegrationTest.testFindProtocolState() {
-        ProtocolState obj = dod.getRandomProtocolState();
-        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to provide an identifier", id);
-        obj = ProtocolState.findProtocolState(id);
-        Assert.assertNotNull("Find method for 'ProtocolState' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ProtocolState' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ProtocolStateIntegrationTest.testFindAllProtocolStates() {
-        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to initialize correctly", dod.getRandomProtocolState());
-        long count = ProtocolState.countProtocolStates();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ProtocolState', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<ProtocolState> result = ProtocolState.findAllProtocolStates();
-        Assert.assertNotNull("Find all method for 'ProtocolState' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ProtocolState' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ProtocolStateIntegrationTest.testFindProtocolStateEntries() {
-        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to initialize correctly", dod.getRandomProtocolState());
-        long count = ProtocolState.countProtocolStates();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<ProtocolState> result = ProtocolState.findProtocolStateEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'ProtocolState' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ProtocolState' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ProtocolStateIntegrationTest.testFlush() {
-        ProtocolState obj = dod.getRandomProtocolState();
-        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to provide an identifier", id);
-        obj = ProtocolState.findProtocolState(id);
-        Assert.assertNotNull("Find method for 'ProtocolState' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyProtocolState(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'ProtocolState' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ProtocolStateIntegrationTest.testMergeUpdate() {
-        ProtocolState obj = dod.getRandomProtocolState();
-        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to provide an identifier", id);
-        obj = ProtocolState.findProtocolState(id);
-        boolean modified =  dod.modifyProtocolState(obj);
-        Integer currentVersion = obj.getVersion();
-        ProtocolState merged = (ProtocolState)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ProtocolState' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ProtocolStateIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to initialize correctly", dod.getRandomProtocolState());
-        ProtocolState obj = dod.getNewTransientProtocolState(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'ProtocolState' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'ProtocolState' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ProtocolStateIntegrationTest.testRemove() {
-        ProtocolState obj = dod.getRandomProtocolState();
-        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to provide an identifier", id);
-        obj = ProtocolState.findProtocolState(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'ProtocolState' with identifier '" + id + "'", ProtocolState.findProtocolState(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ProtocolTypeDataOnDemand.java
index dcb61d2de..cd1810a9b 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolTypeDataOnDemand.java
@@ -1,7 +1,89 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Component
+@Configurable
 @RooDataOnDemand(entity = ProtocolType.class)
 public class ProtocolTypeDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<ProtocolType> data;
+
+	public ProtocolType getNewTransientProtocolType(int index) {
+        ProtocolType obj = new ProtocolType();
+        setTypeName(obj, index);
+        return obj;
+    }
+
+	public void setTypeName(ProtocolType obj, int index) {
+        String typeName = "typeName_" + index;
+        if (typeName.length() > 128) {
+            typeName = new Random().nextInt(10) + typeName.substring(1, 128);
+        }
+        obj.setTypeName(typeName);
+    }
+
+	public ProtocolType getSpecificProtocolType(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        ProtocolType obj = data.get(index);
+        Long id = obj.getId();
+        return ProtocolType.findProtocolType(id);
+    }
+
+	public ProtocolType getRandomProtocolType() {
+        init();
+        ProtocolType obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return ProtocolType.findProtocolType(id);
+    }
+
+	public boolean modifyProtocolType(ProtocolType obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = ProtocolType.findProtocolTypeEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'ProtocolType' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<ProtocolType>();
+        for (int i = 0; i < 10; i++) {
+            ProtocolType obj = getNewTransientProtocolType(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolTypeDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ProtocolTypeDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 7affe91db..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolTypeDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolTypeDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ProtocolTypeDataOnDemand_Roo_Configurable {
-    
-    declare @type: ProtocolTypeDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolTypeDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ProtocolTypeDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index ed77e0be1..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolTypeDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,92 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolType;
-import com.labsynch.labseer.domain.ProtocolTypeDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.stereotype.Component;
-
-privileged aspect ProtocolTypeDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ProtocolTypeDataOnDemand: @Component;
-    
-    private Random ProtocolTypeDataOnDemand.rnd = new SecureRandom();
-    
-    private List<ProtocolType> ProtocolTypeDataOnDemand.data;
-    
-    public ProtocolType ProtocolTypeDataOnDemand.getNewTransientProtocolType(int index) {
-        ProtocolType obj = new ProtocolType();
-        setTypeName(obj, index);
-        return obj;
-    }
-    
-    public void ProtocolTypeDataOnDemand.setTypeName(ProtocolType obj, int index) {
-        String typeName = "typeName_" + index;
-        if (typeName.length() > 128) {
-            typeName = new Random().nextInt(10) + typeName.substring(1, 128);
-        }
-        obj.setTypeName(typeName);
-    }
-    
-    public ProtocolType ProtocolTypeDataOnDemand.getSpecificProtocolType(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        ProtocolType obj = data.get(index);
-        Long id = obj.getId();
-        return ProtocolType.findProtocolType(id);
-    }
-    
-    public ProtocolType ProtocolTypeDataOnDemand.getRandomProtocolType() {
-        init();
-        ProtocolType obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return ProtocolType.findProtocolType(id);
-    }
-    
-    public boolean ProtocolTypeDataOnDemand.modifyProtocolType(ProtocolType obj) {
-        return false;
-    }
-    
-    public void ProtocolTypeDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = ProtocolType.findProtocolTypeEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ProtocolType' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<ProtocolType>();
-        for (int i = 0; i < 10; i++) {
-            ProtocolType obj = getNewTransientProtocolType(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ProtocolTypeIntegrationTest.java
index 45e03a64d..2e7f5adf6 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolTypeIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = ProtocolType.class)
 public class ProtocolTypeIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ProtocolTypeDataOnDemand dod;
+
+	@Test
+    public void testCountProtocolTypes() {
+        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to initialize correctly", dod.getRandomProtocolType());
+        long count = ProtocolType.countProtocolTypes();
+        Assert.assertTrue("Counter for 'ProtocolType' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindProtocolType() {
+        ProtocolType obj = dod.getRandomProtocolType();
+        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to provide an identifier", id);
+        obj = ProtocolType.findProtocolType(id);
+        Assert.assertNotNull("Find method for 'ProtocolType' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'ProtocolType' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllProtocolTypes() {
+        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to initialize correctly", dod.getRandomProtocolType());
+        long count = ProtocolType.countProtocolTypes();
+        Assert.assertTrue("Too expensive to perform a find all test for 'ProtocolType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<ProtocolType> result = ProtocolType.findAllProtocolTypes();
+        Assert.assertNotNull("Find all method for 'ProtocolType' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'ProtocolType' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindProtocolTypeEntries() {
+        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to initialize correctly", dod.getRandomProtocolType());
+        long count = ProtocolType.countProtocolTypes();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<ProtocolType> result = ProtocolType.findProtocolTypeEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'ProtocolType' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'ProtocolType' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        ProtocolType obj = dod.getRandomProtocolType();
+        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to provide an identifier", id);
+        obj = ProtocolType.findProtocolType(id);
+        Assert.assertNotNull("Find method for 'ProtocolType' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyProtocolType(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'ProtocolType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        ProtocolType obj = dod.getRandomProtocolType();
+        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to provide an identifier", id);
+        obj = ProtocolType.findProtocolType(id);
+        boolean modified =  dod.modifyProtocolType(obj);
+        Integer currentVersion = obj.getVersion();
+        ProtocolType merged = obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'ProtocolType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to initialize correctly", dod.getRandomProtocolType());
+        ProtocolType obj = dod.getNewTransientProtocolType(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'ProtocolType' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'ProtocolType' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        ProtocolType obj = dod.getRandomProtocolType();
+        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to provide an identifier", id);
+        obj = ProtocolType.findProtocolType(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'ProtocolType' with identifier '" + id + "'", ProtocolType.findProtocolType(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolTypeIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ProtocolTypeIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 01083a01a..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolTypeIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolTypeIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ProtocolTypeIntegrationTest_Roo_Configurable {
-    
-    declare @type: ProtocolTypeIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolTypeIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ProtocolTypeIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 0dc035a75..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolTypeIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolType;
-import com.labsynch.labseer.domain.ProtocolTypeDataOnDemand;
-import com.labsynch.labseer.domain.ProtocolTypeIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ProtocolTypeIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ProtocolTypeIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ProtocolTypeIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ProtocolTypeIntegrationTest: @Transactional;
-    
-    @Autowired
-    ProtocolTypeDataOnDemand ProtocolTypeIntegrationTest.dod;
-    
-    @Test
-    public void ProtocolTypeIntegrationTest.testCountProtocolTypes() {
-        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to initialize correctly", dod.getRandomProtocolType());
-        long count = ProtocolType.countProtocolTypes();
-        Assert.assertTrue("Counter for 'ProtocolType' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ProtocolTypeIntegrationTest.testFindProtocolType() {
-        ProtocolType obj = dod.getRandomProtocolType();
-        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to provide an identifier", id);
-        obj = ProtocolType.findProtocolType(id);
-        Assert.assertNotNull("Find method for 'ProtocolType' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ProtocolType' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ProtocolTypeIntegrationTest.testFindAllProtocolTypes() {
-        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to initialize correctly", dod.getRandomProtocolType());
-        long count = ProtocolType.countProtocolTypes();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ProtocolType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<ProtocolType> result = ProtocolType.findAllProtocolTypes();
-        Assert.assertNotNull("Find all method for 'ProtocolType' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ProtocolType' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ProtocolTypeIntegrationTest.testFindProtocolTypeEntries() {
-        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to initialize correctly", dod.getRandomProtocolType());
-        long count = ProtocolType.countProtocolTypes();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<ProtocolType> result = ProtocolType.findProtocolTypeEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'ProtocolType' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ProtocolType' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ProtocolTypeIntegrationTest.testFlush() {
-        ProtocolType obj = dod.getRandomProtocolType();
-        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to provide an identifier", id);
-        obj = ProtocolType.findProtocolType(id);
-        Assert.assertNotNull("Find method for 'ProtocolType' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyProtocolType(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'ProtocolType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ProtocolTypeIntegrationTest.testMergeUpdate() {
-        ProtocolType obj = dod.getRandomProtocolType();
-        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to provide an identifier", id);
-        obj = ProtocolType.findProtocolType(id);
-        boolean modified =  dod.modifyProtocolType(obj);
-        Integer currentVersion = obj.getVersion();
-        ProtocolType merged = obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ProtocolType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ProtocolTypeIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to initialize correctly", dod.getRandomProtocolType());
-        ProtocolType obj = dod.getNewTransientProtocolType(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'ProtocolType' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'ProtocolType' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ProtocolTypeIntegrationTest.testRemove() {
-        ProtocolType obj = dod.getRandomProtocolType();
-        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to provide an identifier", id);
-        obj = ProtocolType.findProtocolType(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'ProtocolType' with identifier '" + id + "'", ProtocolType.findProtocolType(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ProtocolValueDataOnDemand.java
index bff1db177..84496a688 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolValueDataOnDemand.java
@@ -1,7 +1,382 @@
 package com.labsynch.labseer.domain;
 
+import java.math.BigDecimal;
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Component
+@Configurable
 @RooDataOnDemand(entity = ProtocolValue.class)
 public class ProtocolValueDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<ProtocolValue> data;
+
+	@Autowired
+    ProtocolStateDataOnDemand protocolStateDataOnDemand;
+
+	public ProtocolValue getNewTransientProtocolValue(int index) {
+        ProtocolValue obj = new ProtocolValue();
+        setBlobValue(obj, index);
+        setClobValue(obj, index);
+        setCodeKind(obj, index);
+        setCodeOrigin(obj, index);
+        setCodeType(obj, index);
+        setCodeTypeAndKind(obj, index);
+        setCodeValue(obj, index);
+        setComments(obj, index);
+        setConcUnit(obj, index);
+        setConcentration(obj, index);
+        setDateValue(obj, index);
+        setDeleted(obj, index);
+        setFileValue(obj, index);
+        setIgnored(obj, index);
+        setLsKind(obj, index);
+        setLsState(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedBy(obj, index);
+        setModifiedDate(obj, index);
+        setNumberOfReplicates(obj, index);
+        setNumericValue(obj, index);
+        setOperatorKind(obj, index);
+        setOperatorType(obj, index);
+        setOperatorTypeAndKind(obj, index);
+        setPublicData(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        setSigFigs(obj, index);
+        setStringValue(obj, index);
+        setUncertainty(obj, index);
+        setUncertaintyType(obj, index);
+        setUnitKind(obj, index);
+        setUnitType(obj, index);
+        setUnitTypeAndKind(obj, index);
+        setUrlValue(obj, index);
+        return obj;
+    }
+
+	public void setBlobValue(ProtocolValue obj, int index) {
+        byte[] blobValue = String.valueOf(index).getBytes();
+        obj.setBlobValue(blobValue);
+    }
+
+	public void setClobValue(ProtocolValue obj, int index) {
+        String clobValue = "clobValue_" + index;
+        obj.setClobValue(clobValue);
+    }
+
+	public void setCodeKind(ProtocolValue obj, int index) {
+        String codeKind = "codeKind_" + index;
+        if (codeKind.length() > 255) {
+            codeKind = codeKind.substring(0, 255);
+        }
+        obj.setCodeKind(codeKind);
+    }
+
+	public void setCodeOrigin(ProtocolValue obj, int index) {
+        String codeOrigin = "codeOrigin_" + index;
+        if (codeOrigin.length() > 255) {
+            codeOrigin = codeOrigin.substring(0, 255);
+        }
+        obj.setCodeOrigin(codeOrigin);
+    }
+
+	public void setCodeType(ProtocolValue obj, int index) {
+        String codeType = "codeType_" + index;
+        if (codeType.length() > 255) {
+            codeType = codeType.substring(0, 255);
+        }
+        obj.setCodeType(codeType);
+    }
+
+	public void setCodeTypeAndKind(ProtocolValue obj, int index) {
+        String codeTypeAndKind = "codeTypeAndKind_" + index;
+        if (codeTypeAndKind.length() > 350) {
+            codeTypeAndKind = codeTypeAndKind.substring(0, 350);
+        }
+        obj.setCodeTypeAndKind(codeTypeAndKind);
+    }
+
+	public void setCodeValue(ProtocolValue obj, int index) {
+        String codeValue = "codeValue_" + index;
+        if (codeValue.length() > 255) {
+            codeValue = codeValue.substring(0, 255);
+        }
+        obj.setCodeValue(codeValue);
+    }
+
+	public void setComments(ProtocolValue obj, int index) {
+        String comments = "comments_" + index;
+        if (comments.length() > 512) {
+            comments = comments.substring(0, 512);
+        }
+        obj.setComments(comments);
+    }
+
+	public void setConcUnit(ProtocolValue obj, int index) {
+        String concUnit = "concUnit_" + index;
+        if (concUnit.length() > 25) {
+            concUnit = concUnit.substring(0, 25);
+        }
+        obj.setConcUnit(concUnit);
+    }
+
+	public void setConcentration(ProtocolValue obj, int index) {
+        Double concentration = new Integer(index).doubleValue();
+        obj.setConcentration(concentration);
+    }
+
+	public void setDateValue(ProtocolValue obj, int index) {
+        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setDateValue(dateValue);
+    }
+
+	public void setDeleted(ProtocolValue obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setFileValue(ProtocolValue obj, int index) {
+        String fileValue = "fileValue_" + index;
+        if (fileValue.length() > 512) {
+            fileValue = fileValue.substring(0, 512);
+        }
+        obj.setFileValue(fileValue);
+    }
+
+	public void setIgnored(ProtocolValue obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setLsKind(ProtocolValue obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsState(ProtocolValue obj, int index) {
+        ProtocolState lsState = protocolStateDataOnDemand.getRandomProtocolState();
+        obj.setLsState(lsState);
+    }
+
+	public void setLsTransaction(ProtocolValue obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(ProtocolValue obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 64) {
+            lsType = lsType.substring(0, 64);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(ProtocolValue obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 350) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 350);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedBy(ProtocolValue obj, int index) {
+        String modifiedBy = "modifiedBy_" + index;
+        if (modifiedBy.length() > 255) {
+            modifiedBy = modifiedBy.substring(0, 255);
+        }
+        obj.setModifiedBy(modifiedBy);
+    }
+
+	public void setModifiedDate(ProtocolValue obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setNumberOfReplicates(ProtocolValue obj, int index) {
+        Integer numberOfReplicates = new Integer(index);
+        obj.setNumberOfReplicates(numberOfReplicates);
+    }
+
+	public void setNumericValue(ProtocolValue obj, int index) {
+        BigDecimal numericValue = BigDecimal.valueOf(index);
+        if (numericValue.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
+            numericValue = new BigDecimal("99999999999999999999.999999999999999999");
+        }
+        obj.setNumericValue(numericValue);
+    }
+
+	public void setOperatorKind(ProtocolValue obj, int index) {
+        String operatorKind = "operator_" + index;
+        if (operatorKind.length() > 10) {
+            operatorKind = operatorKind.substring(0, 10);
+        }
+        obj.setOperatorKind(operatorKind);
+    }
+
+	public void setOperatorType(ProtocolValue obj, int index) {
+        String operatorType = "operatorType_" + index;
+        if (operatorType.length() > 25) {
+            operatorType = operatorType.substring(0, 25);
+        }
+        obj.setOperatorType(operatorType);
+    }
+
+	public void setOperatorTypeAndKind(ProtocolValue obj, int index) {
+        String operatorTypeAndKind = "operatorTypeAndKind_" + index;
+        if (operatorTypeAndKind.length() > 50) {
+            operatorTypeAndKind = operatorTypeAndKind.substring(0, 50);
+        }
+        obj.setOperatorTypeAndKind(operatorTypeAndKind);
+    }
+
+	public void setPublicData(ProtocolValue obj, int index) {
+        Boolean publicData = true;
+        obj.setPublicData(publicData);
+    }
+
+	public void setRecordedBy(ProtocolValue obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(ProtocolValue obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public void setSigFigs(ProtocolValue obj, int index) {
+        Integer sigFigs = new Integer(index);
+        obj.setSigFigs(sigFigs);
+    }
+
+	public void setStringValue(ProtocolValue obj, int index) {
+        String stringValue = "stringValue_" + index;
+        if (stringValue.length() > 255) {
+            stringValue = stringValue.substring(0, 255);
+        }
+        obj.setStringValue(stringValue);
+    }
+
+	public void setUncertainty(ProtocolValue obj, int index) {
+        BigDecimal uncertainty = BigDecimal.valueOf(index);
+        if (uncertainty.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
+            uncertainty = new BigDecimal("99999999999999999999.999999999999999999");
+        }
+        obj.setUncertainty(uncertainty);
+    }
+
+	public void setUncertaintyType(ProtocolValue obj, int index) {
+        String uncertaintyType = "uncertaintyType_" + index;
+        if (uncertaintyType.length() > 255) {
+            uncertaintyType = uncertaintyType.substring(0, 255);
+        }
+        obj.setUncertaintyType(uncertaintyType);
+    }
+
+	public void setUnitKind(ProtocolValue obj, int index) {
+        String unitKind = "unitKind_" + index;
+        if (unitKind.length() > 25) {
+            unitKind = unitKind.substring(0, 25);
+        }
+        obj.setUnitKind(unitKind);
+    }
+
+	public void setUnitType(ProtocolValue obj, int index) {
+        String unitType = "unitType_" + index;
+        if (unitType.length() > 25) {
+            unitType = unitType.substring(0, 25);
+        }
+        obj.setUnitType(unitType);
+    }
+
+	public void setUnitTypeAndKind(ProtocolValue obj, int index) {
+        String unitTypeAndKind = "unitTypeAndKind_" + index;
+        if (unitTypeAndKind.length() > 55) {
+            unitTypeAndKind = unitTypeAndKind.substring(0, 55);
+        }
+        obj.setUnitTypeAndKind(unitTypeAndKind);
+    }
+
+	public void setUrlValue(ProtocolValue obj, int index) {
+        String urlValue = "urlValue_" + index;
+        if (urlValue.length() > 2000) {
+            urlValue = urlValue.substring(0, 2000);
+        }
+        obj.setUrlValue(urlValue);
+    }
+
+	public ProtocolValue getSpecificProtocolValue(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        ProtocolValue obj = data.get(index);
+        Long id = obj.getId();
+        return ProtocolValue.findProtocolValue(id);
+    }
+
+	public ProtocolValue getRandomProtocolValue() {
+        init();
+        ProtocolValue obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return ProtocolValue.findProtocolValue(id);
+    }
+
+	public boolean modifyProtocolValue(ProtocolValue obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = ProtocolValue.findProtocolValueEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'ProtocolValue' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<ProtocolValue>();
+        for (int i = 0; i < 10; i++) {
+            ProtocolValue obj = getNewTransientProtocolValue(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolValueDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ProtocolValueDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 3dfbcf0d0..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolValueDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolValueDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ProtocolValueDataOnDemand_Roo_Configurable {
-    
-    declare @type: ProtocolValueDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolValueDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ProtocolValueDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index bab371053..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolValueDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,387 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolState;
-import com.labsynch.labseer.domain.ProtocolStateDataOnDemand;
-import com.labsynch.labseer.domain.ProtocolValue;
-import com.labsynch.labseer.domain.ProtocolValueDataOnDemand;
-import java.math.BigDecimal;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect ProtocolValueDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ProtocolValueDataOnDemand: @Component;
-    
-    private Random ProtocolValueDataOnDemand.rnd = new SecureRandom();
-    
-    private List<ProtocolValue> ProtocolValueDataOnDemand.data;
-    
-    @Autowired
-    ProtocolStateDataOnDemand ProtocolValueDataOnDemand.protocolStateDataOnDemand;
-    
-    public ProtocolValue ProtocolValueDataOnDemand.getNewTransientProtocolValue(int index) {
-        ProtocolValue obj = new ProtocolValue();
-        setBlobValue(obj, index);
-        setClobValue(obj, index);
-        setCodeKind(obj, index);
-        setCodeOrigin(obj, index);
-        setCodeType(obj, index);
-        setCodeTypeAndKind(obj, index);
-        setCodeValue(obj, index);
-        setComments(obj, index);
-        setConcUnit(obj, index);
-        setConcentration(obj, index);
-        setDateValue(obj, index);
-        setDeleted(obj, index);
-        setFileValue(obj, index);
-        setIgnored(obj, index);
-        setLsKind(obj, index);
-        setLsState(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedBy(obj, index);
-        setModifiedDate(obj, index);
-        setNumberOfReplicates(obj, index);
-        setNumericValue(obj, index);
-        setOperatorKind(obj, index);
-        setOperatorType(obj, index);
-        setOperatorTypeAndKind(obj, index);
-        setPublicData(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        setSigFigs(obj, index);
-        setStringValue(obj, index);
-        setUncertainty(obj, index);
-        setUncertaintyType(obj, index);
-        setUnitKind(obj, index);
-        setUnitType(obj, index);
-        setUnitTypeAndKind(obj, index);
-        setUrlValue(obj, index);
-        return obj;
-    }
-    
-    public void ProtocolValueDataOnDemand.setBlobValue(ProtocolValue obj, int index) {
-        byte[] blobValue = String.valueOf(index).getBytes();
-        obj.setBlobValue(blobValue);
-    }
-    
-    public void ProtocolValueDataOnDemand.setClobValue(ProtocolValue obj, int index) {
-        String clobValue = "clobValue_" + index;
-        obj.setClobValue(clobValue);
-    }
-    
-    public void ProtocolValueDataOnDemand.setCodeKind(ProtocolValue obj, int index) {
-        String codeKind = "codeKind_" + index;
-        if (codeKind.length() > 255) {
-            codeKind = codeKind.substring(0, 255);
-        }
-        obj.setCodeKind(codeKind);
-    }
-    
-    public void ProtocolValueDataOnDemand.setCodeOrigin(ProtocolValue obj, int index) {
-        String codeOrigin = "codeOrigin_" + index;
-        if (codeOrigin.length() > 255) {
-            codeOrigin = codeOrigin.substring(0, 255);
-        }
-        obj.setCodeOrigin(codeOrigin);
-    }
-    
-    public void ProtocolValueDataOnDemand.setCodeType(ProtocolValue obj, int index) {
-        String codeType = "codeType_" + index;
-        if (codeType.length() > 255) {
-            codeType = codeType.substring(0, 255);
-        }
-        obj.setCodeType(codeType);
-    }
-    
-    public void ProtocolValueDataOnDemand.setCodeTypeAndKind(ProtocolValue obj, int index) {
-        String codeTypeAndKind = "codeTypeAndKind_" + index;
-        if (codeTypeAndKind.length() > 350) {
-            codeTypeAndKind = codeTypeAndKind.substring(0, 350);
-        }
-        obj.setCodeTypeAndKind(codeTypeAndKind);
-    }
-    
-    public void ProtocolValueDataOnDemand.setCodeValue(ProtocolValue obj, int index) {
-        String codeValue = "codeValue_" + index;
-        if (codeValue.length() > 255) {
-            codeValue = codeValue.substring(0, 255);
-        }
-        obj.setCodeValue(codeValue);
-    }
-    
-    public void ProtocolValueDataOnDemand.setComments(ProtocolValue obj, int index) {
-        String comments = "comments_" + index;
-        if (comments.length() > 512) {
-            comments = comments.substring(0, 512);
-        }
-        obj.setComments(comments);
-    }
-    
-    public void ProtocolValueDataOnDemand.setConcUnit(ProtocolValue obj, int index) {
-        String concUnit = "concUnit_" + index;
-        if (concUnit.length() > 25) {
-            concUnit = concUnit.substring(0, 25);
-        }
-        obj.setConcUnit(concUnit);
-    }
-    
-    public void ProtocolValueDataOnDemand.setConcentration(ProtocolValue obj, int index) {
-        Double concentration = new Integer(index).doubleValue();
-        obj.setConcentration(concentration);
-    }
-    
-    public void ProtocolValueDataOnDemand.setDateValue(ProtocolValue obj, int index) {
-        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setDateValue(dateValue);
-    }
-    
-    public void ProtocolValueDataOnDemand.setDeleted(ProtocolValue obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void ProtocolValueDataOnDemand.setFileValue(ProtocolValue obj, int index) {
-        String fileValue = "fileValue_" + index;
-        if (fileValue.length() > 512) {
-            fileValue = fileValue.substring(0, 512);
-        }
-        obj.setFileValue(fileValue);
-    }
-    
-    public void ProtocolValueDataOnDemand.setIgnored(ProtocolValue obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void ProtocolValueDataOnDemand.setLsKind(ProtocolValue obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void ProtocolValueDataOnDemand.setLsState(ProtocolValue obj, int index) {
-        ProtocolState lsState = protocolStateDataOnDemand.getRandomProtocolState();
-        obj.setLsState(lsState);
-    }
-    
-    public void ProtocolValueDataOnDemand.setLsTransaction(ProtocolValue obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void ProtocolValueDataOnDemand.setLsType(ProtocolValue obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 64) {
-            lsType = lsType.substring(0, 64);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void ProtocolValueDataOnDemand.setLsTypeAndKind(ProtocolValue obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 350) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 350);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void ProtocolValueDataOnDemand.setModifiedBy(ProtocolValue obj, int index) {
-        String modifiedBy = "modifiedBy_" + index;
-        if (modifiedBy.length() > 255) {
-            modifiedBy = modifiedBy.substring(0, 255);
-        }
-        obj.setModifiedBy(modifiedBy);
-    }
-    
-    public void ProtocolValueDataOnDemand.setModifiedDate(ProtocolValue obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void ProtocolValueDataOnDemand.setNumberOfReplicates(ProtocolValue obj, int index) {
-        Integer numberOfReplicates = new Integer(index);
-        obj.setNumberOfReplicates(numberOfReplicates);
-    }
-    
-    public void ProtocolValueDataOnDemand.setNumericValue(ProtocolValue obj, int index) {
-        BigDecimal numericValue = BigDecimal.valueOf(index);
-        if (numericValue.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
-            numericValue = new BigDecimal("99999999999999999999.999999999999999999");
-        }
-        obj.setNumericValue(numericValue);
-    }
-    
-    public void ProtocolValueDataOnDemand.setOperatorKind(ProtocolValue obj, int index) {
-        String operatorKind = "operator_" + index;
-        if (operatorKind.length() > 10) {
-            operatorKind = operatorKind.substring(0, 10);
-        }
-        obj.setOperatorKind(operatorKind);
-    }
-    
-    public void ProtocolValueDataOnDemand.setOperatorType(ProtocolValue obj, int index) {
-        String operatorType = "operatorType_" + index;
-        if (operatorType.length() > 25) {
-            operatorType = operatorType.substring(0, 25);
-        }
-        obj.setOperatorType(operatorType);
-    }
-    
-    public void ProtocolValueDataOnDemand.setOperatorTypeAndKind(ProtocolValue obj, int index) {
-        String operatorTypeAndKind = "operatorTypeAndKind_" + index;
-        if (operatorTypeAndKind.length() > 50) {
-            operatorTypeAndKind = operatorTypeAndKind.substring(0, 50);
-        }
-        obj.setOperatorTypeAndKind(operatorTypeAndKind);
-    }
-    
-    public void ProtocolValueDataOnDemand.setPublicData(ProtocolValue obj, int index) {
-        Boolean publicData = true;
-        obj.setPublicData(publicData);
-    }
-    
-    public void ProtocolValueDataOnDemand.setRecordedBy(ProtocolValue obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void ProtocolValueDataOnDemand.setRecordedDate(ProtocolValue obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public void ProtocolValueDataOnDemand.setSigFigs(ProtocolValue obj, int index) {
-        Integer sigFigs = new Integer(index);
-        obj.setSigFigs(sigFigs);
-    }
-    
-    public void ProtocolValueDataOnDemand.setStringValue(ProtocolValue obj, int index) {
-        String stringValue = "stringValue_" + index;
-        if (stringValue.length() > 255) {
-            stringValue = stringValue.substring(0, 255);
-        }
-        obj.setStringValue(stringValue);
-    }
-    
-    public void ProtocolValueDataOnDemand.setUncertainty(ProtocolValue obj, int index) {
-        BigDecimal uncertainty = BigDecimal.valueOf(index);
-        if (uncertainty.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
-            uncertainty = new BigDecimal("99999999999999999999.999999999999999999");
-        }
-        obj.setUncertainty(uncertainty);
-    }
-    
-    public void ProtocolValueDataOnDemand.setUncertaintyType(ProtocolValue obj, int index) {
-        String uncertaintyType = "uncertaintyType_" + index;
-        if (uncertaintyType.length() > 255) {
-            uncertaintyType = uncertaintyType.substring(0, 255);
-        }
-        obj.setUncertaintyType(uncertaintyType);
-    }
-    
-    public void ProtocolValueDataOnDemand.setUnitKind(ProtocolValue obj, int index) {
-        String unitKind = "unitKind_" + index;
-        if (unitKind.length() > 25) {
-            unitKind = unitKind.substring(0, 25);
-        }
-        obj.setUnitKind(unitKind);
-    }
-    
-    public void ProtocolValueDataOnDemand.setUnitType(ProtocolValue obj, int index) {
-        String unitType = "unitType_" + index;
-        if (unitType.length() > 25) {
-            unitType = unitType.substring(0, 25);
-        }
-        obj.setUnitType(unitType);
-    }
-    
-    public void ProtocolValueDataOnDemand.setUnitTypeAndKind(ProtocolValue obj, int index) {
-        String unitTypeAndKind = "unitTypeAndKind_" + index;
-        if (unitTypeAndKind.length() > 55) {
-            unitTypeAndKind = unitTypeAndKind.substring(0, 55);
-        }
-        obj.setUnitTypeAndKind(unitTypeAndKind);
-    }
-    
-    public void ProtocolValueDataOnDemand.setUrlValue(ProtocolValue obj, int index) {
-        String urlValue = "urlValue_" + index;
-        if (urlValue.length() > 2000) {
-            urlValue = urlValue.substring(0, 2000);
-        }
-        obj.setUrlValue(urlValue);
-    }
-    
-    public ProtocolValue ProtocolValueDataOnDemand.getSpecificProtocolValue(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        ProtocolValue obj = data.get(index);
-        Long id = obj.getId();
-        return ProtocolValue.findProtocolValue(id);
-    }
-    
-    public ProtocolValue ProtocolValueDataOnDemand.getRandomProtocolValue() {
-        init();
-        ProtocolValue obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return ProtocolValue.findProtocolValue(id);
-    }
-    
-    public boolean ProtocolValueDataOnDemand.modifyProtocolValue(ProtocolValue obj) {
-        return false;
-    }
-    
-    public void ProtocolValueDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = ProtocolValue.findProtocolValueEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ProtocolValue' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<ProtocolValue>();
-        for (int i = 0; i < 10; i++) {
-            ProtocolValue obj = getNewTransientProtocolValue(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ProtocolValueIntegrationTest.java
index bab6d64cf..05d6d38c5 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolValueIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = ProtocolValue.class)
 public class ProtocolValueIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ProtocolValueDataOnDemand dod;
+
+	@Test
+    public void testCountProtocolValues() {
+        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to initialize correctly", dod.getRandomProtocolValue());
+        long count = ProtocolValue.countProtocolValues();
+        Assert.assertTrue("Counter for 'ProtocolValue' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindProtocolValue() {
+        ProtocolValue obj = dod.getRandomProtocolValue();
+        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to provide an identifier", id);
+        obj = ProtocolValue.findProtocolValue(id);
+        Assert.assertNotNull("Find method for 'ProtocolValue' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'ProtocolValue' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllProtocolValues() {
+        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to initialize correctly", dod.getRandomProtocolValue());
+        long count = ProtocolValue.countProtocolValues();
+        Assert.assertTrue("Too expensive to perform a find all test for 'ProtocolValue', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<ProtocolValue> result = ProtocolValue.findAllProtocolValues();
+        Assert.assertNotNull("Find all method for 'ProtocolValue' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'ProtocolValue' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindProtocolValueEntries() {
+        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to initialize correctly", dod.getRandomProtocolValue());
+        long count = ProtocolValue.countProtocolValues();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<ProtocolValue> result = ProtocolValue.findProtocolValueEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'ProtocolValue' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'ProtocolValue' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        ProtocolValue obj = dod.getRandomProtocolValue();
+        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to provide an identifier", id);
+        obj = ProtocolValue.findProtocolValue(id);
+        Assert.assertNotNull("Find method for 'ProtocolValue' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyProtocolValue(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'ProtocolValue' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        ProtocolValue obj = dod.getRandomProtocolValue();
+        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to provide an identifier", id);
+        obj = ProtocolValue.findProtocolValue(id);
+        boolean modified =  dod.modifyProtocolValue(obj);
+        Integer currentVersion = obj.getVersion();
+        ProtocolValue merged = (ProtocolValue)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'ProtocolValue' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to initialize correctly", dod.getRandomProtocolValue());
+        ProtocolValue obj = dod.getNewTransientProtocolValue(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'ProtocolValue' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'ProtocolValue' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        ProtocolValue obj = dod.getRandomProtocolValue();
+        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to provide an identifier", id);
+        obj = ProtocolValue.findProtocolValue(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'ProtocolValue' with identifier '" + id + "'", ProtocolValue.findProtocolValue(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolValueIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ProtocolValueIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index de9bcfae5..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolValueIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolValueIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ProtocolValueIntegrationTest_Roo_Configurable {
-    
-    declare @type: ProtocolValueIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolValueIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ProtocolValueIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index d75ca1cf0..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolValueIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ProtocolValue;
-import com.labsynch.labseer.domain.ProtocolValueDataOnDemand;
-import com.labsynch.labseer.domain.ProtocolValueIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ProtocolValueIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ProtocolValueIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ProtocolValueIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ProtocolValueIntegrationTest: @Transactional;
-    
-    @Autowired
-    ProtocolValueDataOnDemand ProtocolValueIntegrationTest.dod;
-    
-    @Test
-    public void ProtocolValueIntegrationTest.testCountProtocolValues() {
-        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to initialize correctly", dod.getRandomProtocolValue());
-        long count = ProtocolValue.countProtocolValues();
-        Assert.assertTrue("Counter for 'ProtocolValue' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ProtocolValueIntegrationTest.testFindProtocolValue() {
-        ProtocolValue obj = dod.getRandomProtocolValue();
-        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to provide an identifier", id);
-        obj = ProtocolValue.findProtocolValue(id);
-        Assert.assertNotNull("Find method for 'ProtocolValue' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ProtocolValue' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ProtocolValueIntegrationTest.testFindAllProtocolValues() {
-        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to initialize correctly", dod.getRandomProtocolValue());
-        long count = ProtocolValue.countProtocolValues();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ProtocolValue', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<ProtocolValue> result = ProtocolValue.findAllProtocolValues();
-        Assert.assertNotNull("Find all method for 'ProtocolValue' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ProtocolValue' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ProtocolValueIntegrationTest.testFindProtocolValueEntries() {
-        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to initialize correctly", dod.getRandomProtocolValue());
-        long count = ProtocolValue.countProtocolValues();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<ProtocolValue> result = ProtocolValue.findProtocolValueEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'ProtocolValue' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ProtocolValue' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ProtocolValueIntegrationTest.testFlush() {
-        ProtocolValue obj = dod.getRandomProtocolValue();
-        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to provide an identifier", id);
-        obj = ProtocolValue.findProtocolValue(id);
-        Assert.assertNotNull("Find method for 'ProtocolValue' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyProtocolValue(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'ProtocolValue' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ProtocolValueIntegrationTest.testMergeUpdate() {
-        ProtocolValue obj = dod.getRandomProtocolValue();
-        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to provide an identifier", id);
-        obj = ProtocolValue.findProtocolValue(id);
-        boolean modified =  dod.modifyProtocolValue(obj);
-        Integer currentVersion = obj.getVersion();
-        ProtocolValue merged = (ProtocolValue)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ProtocolValue' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ProtocolValueIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to initialize correctly", dod.getRandomProtocolValue());
-        ProtocolValue obj = dod.getNewTransientProtocolValue(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'ProtocolValue' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'ProtocolValue' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ProtocolValueIntegrationTest.testRemove() {
-        ProtocolValue obj = dod.getRandomProtocolValue();
-        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to provide an identifier", id);
-        obj = ProtocolValue.findProtocolValue(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'ProtocolValue' with identifier '" + id + "'", ProtocolValue.findProtocolValue(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/StateKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/StateKindDataOnDemand.java
index 84536c758..e6a559ce0 100755
--- a/src/test/java/com/labsynch/labseer/domain/StateKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/StateKindDataOnDemand.java
@@ -1,7 +1,108 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Configurable
+@Component
 @RooDataOnDemand(entity = StateKind.class)
 public class StateKindDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<StateKind> data;
+
+	@Autowired
+    StateTypeDataOnDemand stateTypeDataOnDemand;
+
+	public StateKind getNewTransientStateKind(int index) {
+        StateKind obj = new StateKind();
+        setKindName(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        return obj;
+    }
+
+	public void setKindName(StateKind obj, int index) {
+        String kindName = "kindName_" + index;
+        if (kindName.length() > 64) {
+            kindName = kindName.substring(0, 64);
+        }
+        obj.setKindName(kindName);
+    }
+
+	public void setLsType(StateKind obj, int index) {
+        StateType lsType = stateTypeDataOnDemand.getRandomStateType();
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(StateKind obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = new Random().nextInt(10) + lsTypeAndKind.substring(1, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public StateKind getSpecificStateKind(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        StateKind obj = data.get(index);
+        Long id = obj.getId();
+        return StateKind.findStateKind(id);
+    }
+
+	public StateKind getRandomStateKind() {
+        init();
+        StateKind obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return StateKind.findStateKind(id);
+    }
+
+	public boolean modifyStateKind(StateKind obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = StateKind.findStateKindEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'StateKind' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<StateKind>();
+        for (int i = 0; i < 10; i++) {
+            StateKind obj = getNewTransientStateKind(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/StateKindDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/StateKindDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index ce8cb3461..000000000
--- a/src/test/java/com/labsynch/labseer/domain/StateKindDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StateKindDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect StateKindDataOnDemand_Roo_Configurable {
-    
-    declare @type: StateKindDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/StateKindDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/StateKindDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index b833c6306..000000000
--- a/src/test/java/com/labsynch/labseer/domain/StateKindDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,113 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StateKind;
-import com.labsynch.labseer.domain.StateKindDataOnDemand;
-import com.labsynch.labseer.domain.StateType;
-import com.labsynch.labseer.domain.StateTypeDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect StateKindDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: StateKindDataOnDemand: @Component;
-    
-    private Random StateKindDataOnDemand.rnd = new SecureRandom();
-    
-    private List<StateKind> StateKindDataOnDemand.data;
-    
-    @Autowired
-    StateTypeDataOnDemand StateKindDataOnDemand.stateTypeDataOnDemand;
-    
-    public StateKind StateKindDataOnDemand.getNewTransientStateKind(int index) {
-        StateKind obj = new StateKind();
-        setKindName(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        return obj;
-    }
-    
-    public void StateKindDataOnDemand.setKindName(StateKind obj, int index) {
-        String kindName = "kindName_" + index;
-        if (kindName.length() > 64) {
-            kindName = kindName.substring(0, 64);
-        }
-        obj.setKindName(kindName);
-    }
-    
-    public void StateKindDataOnDemand.setLsType(StateKind obj, int index) {
-        StateType lsType = stateTypeDataOnDemand.getRandomStateType();
-        obj.setLsType(lsType);
-    }
-    
-    public void StateKindDataOnDemand.setLsTypeAndKind(StateKind obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = new Random().nextInt(10) + lsTypeAndKind.substring(1, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public StateKind StateKindDataOnDemand.getSpecificStateKind(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        StateKind obj = data.get(index);
-        Long id = obj.getId();
-        return StateKind.findStateKind(id);
-    }
-    
-    public StateKind StateKindDataOnDemand.getRandomStateKind() {
-        init();
-        StateKind obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return StateKind.findStateKind(id);
-    }
-    
-    public boolean StateKindDataOnDemand.modifyStateKind(StateKind obj) {
-        return false;
-    }
-    
-    public void StateKindDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = StateKind.findStateKindEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'StateKind' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<StateKind>();
-        for (int i = 0; i < 10; i++) {
-            StateKind obj = getNewTransientStateKind(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/StateKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/StateKindIntegrationTest.java
index 4bff77f89..5c47777a2 100755
--- a/src/test/java/com/labsynch/labseer/domain/StateKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/StateKindIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = StateKind.class)
 public class StateKindIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    StateKindDataOnDemand dod;
+
+	@Test
+    public void testCountStateKinds() {
+        Assert.assertNotNull("Data on demand for 'StateKind' failed to initialize correctly", dod.getRandomStateKind());
+        long count = StateKind.countStateKinds();
+        Assert.assertTrue("Counter for 'StateKind' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindStateKind() {
+        StateKind obj = dod.getRandomStateKind();
+        Assert.assertNotNull("Data on demand for 'StateKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'StateKind' failed to provide an identifier", id);
+        obj = StateKind.findStateKind(id);
+        Assert.assertNotNull("Find method for 'StateKind' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'StateKind' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllStateKinds() {
+        Assert.assertNotNull("Data on demand for 'StateKind' failed to initialize correctly", dod.getRandomStateKind());
+        long count = StateKind.countStateKinds();
+        Assert.assertTrue("Too expensive to perform a find all test for 'StateKind', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<StateKind> result = StateKind.findAllStateKinds();
+        Assert.assertNotNull("Find all method for 'StateKind' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'StateKind' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindStateKindEntries() {
+        Assert.assertNotNull("Data on demand for 'StateKind' failed to initialize correctly", dod.getRandomStateKind());
+        long count = StateKind.countStateKinds();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<StateKind> result = StateKind.findStateKindEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'StateKind' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'StateKind' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        StateKind obj = dod.getRandomStateKind();
+        Assert.assertNotNull("Data on demand for 'StateKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'StateKind' failed to provide an identifier", id);
+        obj = StateKind.findStateKind(id);
+        Assert.assertNotNull("Find method for 'StateKind' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyStateKind(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'StateKind' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        StateKind obj = dod.getRandomStateKind();
+        Assert.assertNotNull("Data on demand for 'StateKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'StateKind' failed to provide an identifier", id);
+        obj = StateKind.findStateKind(id);
+        boolean modified =  dod.modifyStateKind(obj);
+        Integer currentVersion = obj.getVersion();
+        StateKind merged = obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'StateKind' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'StateKind' failed to initialize correctly", dod.getRandomStateKind());
+        StateKind obj = dod.getNewTransientStateKind(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'StateKind' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'StateKind' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'StateKind' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        StateKind obj = dod.getRandomStateKind();
+        Assert.assertNotNull("Data on demand for 'StateKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'StateKind' failed to provide an identifier", id);
+        obj = StateKind.findStateKind(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'StateKind' with identifier '" + id + "'", StateKind.findStateKind(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/StateKindIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/StateKindIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 45fa893bd..000000000
--- a/src/test/java/com/labsynch/labseer/domain/StateKindIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StateKindIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect StateKindIntegrationTest_Roo_Configurable {
-    
-    declare @type: StateKindIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/StateKindIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/StateKindIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index d1bb05064..000000000
--- a/src/test/java/com/labsynch/labseer/domain/StateKindIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StateKind;
-import com.labsynch.labseer.domain.StateKindDataOnDemand;
-import com.labsynch.labseer.domain.StateKindIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect StateKindIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: StateKindIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: StateKindIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: StateKindIntegrationTest: @Transactional;
-    
-    @Autowired
-    StateKindDataOnDemand StateKindIntegrationTest.dod;
-    
-    @Test
-    public void StateKindIntegrationTest.testCountStateKinds() {
-        Assert.assertNotNull("Data on demand for 'StateKind' failed to initialize correctly", dod.getRandomStateKind());
-        long count = StateKind.countStateKinds();
-        Assert.assertTrue("Counter for 'StateKind' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void StateKindIntegrationTest.testFindStateKind() {
-        StateKind obj = dod.getRandomStateKind();
-        Assert.assertNotNull("Data on demand for 'StateKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'StateKind' failed to provide an identifier", id);
-        obj = StateKind.findStateKind(id);
-        Assert.assertNotNull("Find method for 'StateKind' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'StateKind' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void StateKindIntegrationTest.testFindAllStateKinds() {
-        Assert.assertNotNull("Data on demand for 'StateKind' failed to initialize correctly", dod.getRandomStateKind());
-        long count = StateKind.countStateKinds();
-        Assert.assertTrue("Too expensive to perform a find all test for 'StateKind', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<StateKind> result = StateKind.findAllStateKinds();
-        Assert.assertNotNull("Find all method for 'StateKind' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'StateKind' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void StateKindIntegrationTest.testFindStateKindEntries() {
-        Assert.assertNotNull("Data on demand for 'StateKind' failed to initialize correctly", dod.getRandomStateKind());
-        long count = StateKind.countStateKinds();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<StateKind> result = StateKind.findStateKindEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'StateKind' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'StateKind' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void StateKindIntegrationTest.testFlush() {
-        StateKind obj = dod.getRandomStateKind();
-        Assert.assertNotNull("Data on demand for 'StateKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'StateKind' failed to provide an identifier", id);
-        obj = StateKind.findStateKind(id);
-        Assert.assertNotNull("Find method for 'StateKind' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyStateKind(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'StateKind' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void StateKindIntegrationTest.testMergeUpdate() {
-        StateKind obj = dod.getRandomStateKind();
-        Assert.assertNotNull("Data on demand for 'StateKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'StateKind' failed to provide an identifier", id);
-        obj = StateKind.findStateKind(id);
-        boolean modified =  dod.modifyStateKind(obj);
-        Integer currentVersion = obj.getVersion();
-        StateKind merged = obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'StateKind' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void StateKindIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'StateKind' failed to initialize correctly", dod.getRandomStateKind());
-        StateKind obj = dod.getNewTransientStateKind(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'StateKind' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'StateKind' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'StateKind' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void StateKindIntegrationTest.testRemove() {
-        StateKind obj = dod.getRandomStateKind();
-        Assert.assertNotNull("Data on demand for 'StateKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'StateKind' failed to provide an identifier", id);
-        obj = StateKind.findStateKind(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'StateKind' with identifier '" + id + "'", StateKind.findStateKind(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/StateTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/StateTypeDataOnDemand.java
index 1023337ed..b74bbcb1c 100755
--- a/src/test/java/com/labsynch/labseer/domain/StateTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/StateTypeDataOnDemand.java
@@ -1,7 +1,89 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Configurable
+@Component
 @RooDataOnDemand(entity = StateType.class)
 public class StateTypeDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<StateType> data;
+
+	public StateType getNewTransientStateType(int index) {
+        StateType obj = new StateType();
+        setTypeName(obj, index);
+        return obj;
+    }
+
+	public void setTypeName(StateType obj, int index) {
+        String typeName = "typeName_" + index;
+        if (typeName.length() > 64) {
+            typeName = new Random().nextInt(10) + typeName.substring(1, 64);
+        }
+        obj.setTypeName(typeName);
+    }
+
+	public StateType getSpecificStateType(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        StateType obj = data.get(index);
+        Long id = obj.getId();
+        return StateType.findStateType(id);
+    }
+
+	public StateType getRandomStateType() {
+        init();
+        StateType obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return StateType.findStateType(id);
+    }
+
+	public boolean modifyStateType(StateType obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = StateType.findStateTypeEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'StateType' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<StateType>();
+        for (int i = 0; i < 10; i++) {
+            StateType obj = getNewTransientStateType(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/StateTypeDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/StateTypeDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index bbc6917e5..000000000
--- a/src/test/java/com/labsynch/labseer/domain/StateTypeDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StateTypeDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect StateTypeDataOnDemand_Roo_Configurable {
-    
-    declare @type: StateTypeDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/StateTypeDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/StateTypeDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 60618f3de..000000000
--- a/src/test/java/com/labsynch/labseer/domain/StateTypeDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,92 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StateType;
-import com.labsynch.labseer.domain.StateTypeDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.stereotype.Component;
-
-privileged aspect StateTypeDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: StateTypeDataOnDemand: @Component;
-    
-    private Random StateTypeDataOnDemand.rnd = new SecureRandom();
-    
-    private List<StateType> StateTypeDataOnDemand.data;
-    
-    public StateType StateTypeDataOnDemand.getNewTransientStateType(int index) {
-        StateType obj = new StateType();
-        setTypeName(obj, index);
-        return obj;
-    }
-    
-    public void StateTypeDataOnDemand.setTypeName(StateType obj, int index) {
-        String typeName = "typeName_" + index;
-        if (typeName.length() > 64) {
-            typeName = new Random().nextInt(10) + typeName.substring(1, 64);
-        }
-        obj.setTypeName(typeName);
-    }
-    
-    public StateType StateTypeDataOnDemand.getSpecificStateType(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        StateType obj = data.get(index);
-        Long id = obj.getId();
-        return StateType.findStateType(id);
-    }
-    
-    public StateType StateTypeDataOnDemand.getRandomStateType() {
-        init();
-        StateType obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return StateType.findStateType(id);
-    }
-    
-    public boolean StateTypeDataOnDemand.modifyStateType(StateType obj) {
-        return false;
-    }
-    
-    public void StateTypeDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = StateType.findStateTypeEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'StateType' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<StateType>();
-        for (int i = 0; i < 10; i++) {
-            StateType obj = getNewTransientStateType(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/StateTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/StateTypeIntegrationTest.java
index 298c666ad..11013a1f4 100755
--- a/src/test/java/com/labsynch/labseer/domain/StateTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/StateTypeIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
+@Configurable
 @RooIntegrationTest(entity = StateType.class)
 public class StateTypeIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    StateTypeDataOnDemand dod;
+
+	@Test
+    public void testCountStateTypes() {
+        Assert.assertNotNull("Data on demand for 'StateType' failed to initialize correctly", dod.getRandomStateType());
+        long count = StateType.countStateTypes();
+        Assert.assertTrue("Counter for 'StateType' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindStateType() {
+        StateType obj = dod.getRandomStateType();
+        Assert.assertNotNull("Data on demand for 'StateType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'StateType' failed to provide an identifier", id);
+        obj = StateType.findStateType(id);
+        Assert.assertNotNull("Find method for 'StateType' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'StateType' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllStateTypes() {
+        Assert.assertNotNull("Data on demand for 'StateType' failed to initialize correctly", dod.getRandomStateType());
+        long count = StateType.countStateTypes();
+        Assert.assertTrue("Too expensive to perform a find all test for 'StateType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<StateType> result = StateType.findAllStateTypes();
+        Assert.assertNotNull("Find all method for 'StateType' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'StateType' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindStateTypeEntries() {
+        Assert.assertNotNull("Data on demand for 'StateType' failed to initialize correctly", dod.getRandomStateType());
+        long count = StateType.countStateTypes();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<StateType> result = StateType.findStateTypeEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'StateType' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'StateType' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        StateType obj = dod.getRandomStateType();
+        Assert.assertNotNull("Data on demand for 'StateType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'StateType' failed to provide an identifier", id);
+        obj = StateType.findStateType(id);
+        Assert.assertNotNull("Find method for 'StateType' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyStateType(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'StateType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        StateType obj = dod.getRandomStateType();
+        Assert.assertNotNull("Data on demand for 'StateType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'StateType' failed to provide an identifier", id);
+        obj = StateType.findStateType(id);
+        boolean modified =  dod.modifyStateType(obj);
+        Integer currentVersion = obj.getVersion();
+        StateType merged = obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'StateType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'StateType' failed to initialize correctly", dod.getRandomStateType());
+        StateType obj = dod.getNewTransientStateType(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'StateType' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'StateType' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'StateType' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        StateType obj = dod.getRandomStateType();
+        Assert.assertNotNull("Data on demand for 'StateType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'StateType' failed to provide an identifier", id);
+        obj = StateType.findStateType(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'StateType' with identifier '" + id + "'", StateType.findStateType(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/StateTypeIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/StateTypeIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index a4e044a88..000000000
--- a/src/test/java/com/labsynch/labseer/domain/StateTypeIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StateTypeIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect StateTypeIntegrationTest_Roo_Configurable {
-    
-    declare @type: StateTypeIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/StateTypeIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/StateTypeIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 3e2547f81..000000000
--- a/src/test/java/com/labsynch/labseer/domain/StateTypeIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.StateType;
-import com.labsynch.labseer.domain.StateTypeDataOnDemand;
-import com.labsynch.labseer.domain.StateTypeIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect StateTypeIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: StateTypeIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: StateTypeIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: StateTypeIntegrationTest: @Transactional;
-    
-    @Autowired
-    StateTypeDataOnDemand StateTypeIntegrationTest.dod;
-    
-    @Test
-    public void StateTypeIntegrationTest.testCountStateTypes() {
-        Assert.assertNotNull("Data on demand for 'StateType' failed to initialize correctly", dod.getRandomStateType());
-        long count = StateType.countStateTypes();
-        Assert.assertTrue("Counter for 'StateType' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void StateTypeIntegrationTest.testFindStateType() {
-        StateType obj = dod.getRandomStateType();
-        Assert.assertNotNull("Data on demand for 'StateType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'StateType' failed to provide an identifier", id);
-        obj = StateType.findStateType(id);
-        Assert.assertNotNull("Find method for 'StateType' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'StateType' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void StateTypeIntegrationTest.testFindAllStateTypes() {
-        Assert.assertNotNull("Data on demand for 'StateType' failed to initialize correctly", dod.getRandomStateType());
-        long count = StateType.countStateTypes();
-        Assert.assertTrue("Too expensive to perform a find all test for 'StateType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<StateType> result = StateType.findAllStateTypes();
-        Assert.assertNotNull("Find all method for 'StateType' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'StateType' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void StateTypeIntegrationTest.testFindStateTypeEntries() {
-        Assert.assertNotNull("Data on demand for 'StateType' failed to initialize correctly", dod.getRandomStateType());
-        long count = StateType.countStateTypes();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<StateType> result = StateType.findStateTypeEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'StateType' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'StateType' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void StateTypeIntegrationTest.testFlush() {
-        StateType obj = dod.getRandomStateType();
-        Assert.assertNotNull("Data on demand for 'StateType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'StateType' failed to provide an identifier", id);
-        obj = StateType.findStateType(id);
-        Assert.assertNotNull("Find method for 'StateType' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyStateType(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'StateType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void StateTypeIntegrationTest.testMergeUpdate() {
-        StateType obj = dod.getRandomStateType();
-        Assert.assertNotNull("Data on demand for 'StateType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'StateType' failed to provide an identifier", id);
-        obj = StateType.findStateType(id);
-        boolean modified =  dod.modifyStateType(obj);
-        Integer currentVersion = obj.getVersion();
-        StateType merged = obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'StateType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void StateTypeIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'StateType' failed to initialize correctly", dod.getRandomStateType());
-        StateType obj = dod.getNewTransientStateType(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'StateType' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'StateType' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'StateType' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void StateTypeIntegrationTest.testRemove() {
-        StateType obj = dod.getRandomStateType();
-        Assert.assertNotNull("Data on demand for 'StateType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'StateType' failed to provide an identifier", id);
-        obj = StateType.findStateType(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'StateType' with identifier '" + id + "'", StateType.findStateType(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/SubjectDataOnDemand.java
index 18bfbaa71..c1d576aa2 100755
--- a/src/test/java/com/labsynch/labseer/domain/SubjectDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/SubjectDataOnDemand.java
@@ -1,7 +1,167 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Component
+@Configurable
 @RooDataOnDemand(entity = Subject.class)
 public class SubjectDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<Subject> data;
+
+	public Subject getNewTransientSubject(int index) {
+        Subject obj = new Subject();
+        setCodeName(obj, index);
+        setDeleted(obj, index);
+        setIgnored(obj, index);
+        setLsKind(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedBy(obj, index);
+        setModifiedDate(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        return obj;
+    }
+
+	public void setCodeName(Subject obj, int index) {
+        String codeName = "codeName_" + index;
+        if (codeName.length() > 255) {
+            codeName = new Random().nextInt(10) + codeName.substring(1, 255);
+        }
+        obj.setCodeName(codeName);
+    }
+
+	public void setDeleted(Subject obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setIgnored(Subject obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setLsKind(Subject obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsTransaction(Subject obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(Subject obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 255) {
+            lsType = lsType.substring(0, 255);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(Subject obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedBy(Subject obj, int index) {
+        String modifiedBy = "modifiedBy_" + index;
+        if (modifiedBy.length() > 255) {
+            modifiedBy = modifiedBy.substring(0, 255);
+        }
+        obj.setModifiedBy(modifiedBy);
+    }
+
+	public void setModifiedDate(Subject obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setRecordedBy(Subject obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(Subject obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public Subject getSpecificSubject(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        Subject obj = data.get(index);
+        Long id = obj.getId();
+        return Subject.findSubject(id);
+    }
+
+	public Subject getRandomSubject() {
+        init();
+        Subject obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return Subject.findSubject(id);
+    }
+
+	public boolean modifySubject(Subject obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = Subject.findSubjectEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'Subject' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<Subject>();
+        for (int i = 0; i < 10; i++) {
+            Subject obj = getNewTransientSubject(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/SubjectDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 7a9c42056..000000000
--- a/src/test/java/com/labsynch/labseer/domain/SubjectDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SubjectDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect SubjectDataOnDemand_Roo_Configurable {
-    
-    declare @type: SubjectDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/SubjectDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 458c6b458..000000000
--- a/src/test/java/com/labsynch/labseer/domain/SubjectDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,170 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.SubjectDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.stereotype.Component;
-
-privileged aspect SubjectDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: SubjectDataOnDemand: @Component;
-    
-    private Random SubjectDataOnDemand.rnd = new SecureRandom();
-    
-    private List<Subject> SubjectDataOnDemand.data;
-    
-    public Subject SubjectDataOnDemand.getNewTransientSubject(int index) {
-        Subject obj = new Subject();
-        setCodeName(obj, index);
-        setDeleted(obj, index);
-        setIgnored(obj, index);
-        setLsKind(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedBy(obj, index);
-        setModifiedDate(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        return obj;
-    }
-    
-    public void SubjectDataOnDemand.setCodeName(Subject obj, int index) {
-        String codeName = "codeName_" + index;
-        if (codeName.length() > 255) {
-            codeName = new Random().nextInt(10) + codeName.substring(1, 255);
-        }
-        obj.setCodeName(codeName);
-    }
-    
-    public void SubjectDataOnDemand.setDeleted(Subject obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void SubjectDataOnDemand.setIgnored(Subject obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void SubjectDataOnDemand.setLsKind(Subject obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void SubjectDataOnDemand.setLsTransaction(Subject obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void SubjectDataOnDemand.setLsType(Subject obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 255) {
-            lsType = lsType.substring(0, 255);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void SubjectDataOnDemand.setLsTypeAndKind(Subject obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void SubjectDataOnDemand.setModifiedBy(Subject obj, int index) {
-        String modifiedBy = "modifiedBy_" + index;
-        if (modifiedBy.length() > 255) {
-            modifiedBy = modifiedBy.substring(0, 255);
-        }
-        obj.setModifiedBy(modifiedBy);
-    }
-    
-    public void SubjectDataOnDemand.setModifiedDate(Subject obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void SubjectDataOnDemand.setRecordedBy(Subject obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void SubjectDataOnDemand.setRecordedDate(Subject obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public Subject SubjectDataOnDemand.getSpecificSubject(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        Subject obj = data.get(index);
-        Long id = obj.getId();
-        return Subject.findSubject(id);
-    }
-    
-    public Subject SubjectDataOnDemand.getRandomSubject() {
-        init();
-        Subject obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return Subject.findSubject(id);
-    }
-    
-    public boolean SubjectDataOnDemand.modifySubject(Subject obj) {
-        return false;
-    }
-    
-    public void SubjectDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = Subject.findSubjectEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'Subject' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<Subject>();
-        for (int i = 0; i < 10; i++) {
-            Subject obj = getNewTransientSubject(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/SubjectIntegrationTest.java
index 3cf62285d..6962cfbb3 100755
--- a/src/test/java/com/labsynch/labseer/domain/SubjectIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/SubjectIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = Subject.class)
 public class SubjectIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    SubjectDataOnDemand dod;
+
+	@Test
+    public void testCountSubjects() {
+        Assert.assertNotNull("Data on demand for 'Subject' failed to initialize correctly", dod.getRandomSubject());
+        long count = Subject.countSubjects();
+        Assert.assertTrue("Counter for 'Subject' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindSubject() {
+        Subject obj = dod.getRandomSubject();
+        Assert.assertNotNull("Data on demand for 'Subject' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'Subject' failed to provide an identifier", id);
+        obj = Subject.findSubject(id);
+        Assert.assertNotNull("Find method for 'Subject' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'Subject' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllSubjects() {
+        Assert.assertNotNull("Data on demand for 'Subject' failed to initialize correctly", dod.getRandomSubject());
+        long count = Subject.countSubjects();
+        Assert.assertTrue("Too expensive to perform a find all test for 'Subject', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<Subject> result = Subject.findAllSubjects();
+        Assert.assertNotNull("Find all method for 'Subject' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'Subject' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindSubjectEntries() {
+        Assert.assertNotNull("Data on demand for 'Subject' failed to initialize correctly", dod.getRandomSubject());
+        long count = Subject.countSubjects();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<Subject> result = Subject.findSubjectEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'Subject' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'Subject' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        Subject obj = dod.getRandomSubject();
+        Assert.assertNotNull("Data on demand for 'Subject' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'Subject' failed to provide an identifier", id);
+        obj = Subject.findSubject(id);
+        Assert.assertNotNull("Find method for 'Subject' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifySubject(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'Subject' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        Subject obj = dod.getRandomSubject();
+        Assert.assertNotNull("Data on demand for 'Subject' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'Subject' failed to provide an identifier", id);
+        obj = Subject.findSubject(id);
+        boolean modified =  dod.modifySubject(obj);
+        Integer currentVersion = obj.getVersion();
+        Subject merged = (Subject)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'Subject' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'Subject' failed to initialize correctly", dod.getRandomSubject());
+        Subject obj = dod.getNewTransientSubject(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'Subject' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'Subject' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'Subject' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        Subject obj = dod.getRandomSubject();
+        Assert.assertNotNull("Data on demand for 'Subject' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'Subject' failed to provide an identifier", id);
+        obj = Subject.findSubject(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'Subject' with identifier '" + id + "'", Subject.findSubject(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/SubjectIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 468282465..000000000
--- a/src/test/java/com/labsynch/labseer/domain/SubjectIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SubjectIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect SubjectIntegrationTest_Roo_Configurable {
-    
-    declare @type: SubjectIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/SubjectIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 23263334c..000000000
--- a/src/test/java/com/labsynch/labseer/domain/SubjectIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.SubjectDataOnDemand;
-import com.labsynch.labseer.domain.SubjectIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect SubjectIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: SubjectIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: SubjectIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: SubjectIntegrationTest: @Transactional;
-    
-    @Autowired
-    SubjectDataOnDemand SubjectIntegrationTest.dod;
-    
-    @Test
-    public void SubjectIntegrationTest.testCountSubjects() {
-        Assert.assertNotNull("Data on demand for 'Subject' failed to initialize correctly", dod.getRandomSubject());
-        long count = Subject.countSubjects();
-        Assert.assertTrue("Counter for 'Subject' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void SubjectIntegrationTest.testFindSubject() {
-        Subject obj = dod.getRandomSubject();
-        Assert.assertNotNull("Data on demand for 'Subject' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'Subject' failed to provide an identifier", id);
-        obj = Subject.findSubject(id);
-        Assert.assertNotNull("Find method for 'Subject' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'Subject' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void SubjectIntegrationTest.testFindAllSubjects() {
-        Assert.assertNotNull("Data on demand for 'Subject' failed to initialize correctly", dod.getRandomSubject());
-        long count = Subject.countSubjects();
-        Assert.assertTrue("Too expensive to perform a find all test for 'Subject', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<Subject> result = Subject.findAllSubjects();
-        Assert.assertNotNull("Find all method for 'Subject' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'Subject' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void SubjectIntegrationTest.testFindSubjectEntries() {
-        Assert.assertNotNull("Data on demand for 'Subject' failed to initialize correctly", dod.getRandomSubject());
-        long count = Subject.countSubjects();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<Subject> result = Subject.findSubjectEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'Subject' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'Subject' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void SubjectIntegrationTest.testFlush() {
-        Subject obj = dod.getRandomSubject();
-        Assert.assertNotNull("Data on demand for 'Subject' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'Subject' failed to provide an identifier", id);
-        obj = Subject.findSubject(id);
-        Assert.assertNotNull("Find method for 'Subject' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifySubject(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'Subject' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void SubjectIntegrationTest.testMergeUpdate() {
-        Subject obj = dod.getRandomSubject();
-        Assert.assertNotNull("Data on demand for 'Subject' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'Subject' failed to provide an identifier", id);
-        obj = Subject.findSubject(id);
-        boolean modified =  dod.modifySubject(obj);
-        Integer currentVersion = obj.getVersion();
-        Subject merged = (Subject)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'Subject' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void SubjectIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'Subject' failed to initialize correctly", dod.getRandomSubject());
-        Subject obj = dod.getNewTransientSubject(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'Subject' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'Subject' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'Subject' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void SubjectIntegrationTest.testRemove() {
-        Subject obj = dod.getRandomSubject();
-        Assert.assertNotNull("Data on demand for 'Subject' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'Subject' failed to provide an identifier", id);
-        obj = Subject.findSubject(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'Subject' with identifier '" + id + "'", Subject.findSubject(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/SubjectStateDataOnDemand.java
index 76adad08f..df8c2009a 100755
--- a/src/test/java/com/labsynch/labseer/domain/SubjectStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/SubjectStateDataOnDemand.java
@@ -1,7 +1,177 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Component
+@Configurable
 @RooDataOnDemand(entity = SubjectState.class)
 public class SubjectStateDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<SubjectState> data;
+
+	@Autowired
+    SubjectDataOnDemand subjectDataOnDemand;
+
+	public SubjectState getNewTransientSubjectState(int index) {
+        SubjectState obj = new SubjectState();
+        setComments(obj, index);
+        setDeleted(obj, index);
+        setIgnored(obj, index);
+        setLsKind(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedBy(obj, index);
+        setModifiedDate(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        setSubject(obj, index);
+        return obj;
+    }
+
+	public void setComments(SubjectState obj, int index) {
+        String comments = "comments_" + index;
+        if (comments.length() > 512) {
+            comments = comments.substring(0, 512);
+        }
+        obj.setComments(comments);
+    }
+
+	public void setDeleted(SubjectState obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setIgnored(SubjectState obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setLsKind(SubjectState obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsTransaction(SubjectState obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(SubjectState obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 64) {
+            lsType = lsType.substring(0, 64);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(SubjectState obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedBy(SubjectState obj, int index) {
+        String modifiedBy = "modifiedBy_" + index;
+        if (modifiedBy.length() > 255) {
+            modifiedBy = modifiedBy.substring(0, 255);
+        }
+        obj.setModifiedBy(modifiedBy);
+    }
+
+	public void setModifiedDate(SubjectState obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setRecordedBy(SubjectState obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(SubjectState obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public void setSubject(SubjectState obj, int index) {
+        Subject subject = subjectDataOnDemand.getRandomSubject();
+        obj.setSubject(subject);
+    }
+
+	public SubjectState getSpecificSubjectState(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        SubjectState obj = data.get(index);
+        Long id = obj.getId();
+        return SubjectState.findSubjectState(id);
+    }
+
+	public SubjectState getRandomSubjectState() {
+        init();
+        SubjectState obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return SubjectState.findSubjectState(id);
+    }
+
+	public boolean modifySubjectState(SubjectState obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = SubjectState.findSubjectStateEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'SubjectState' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<SubjectState>();
+        for (int i = 0; i < 10; i++) {
+            SubjectState obj = getNewTransientSubjectState(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectStateDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/SubjectStateDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 132540646..000000000
--- a/src/test/java/com/labsynch/labseer/domain/SubjectStateDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SubjectStateDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect SubjectStateDataOnDemand_Roo_Configurable {
-    
-    declare @type: SubjectStateDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectStateDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/SubjectStateDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index a20259306..000000000
--- a/src/test/java/com/labsynch/labseer/domain/SubjectStateDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,182 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.SubjectDataOnDemand;
-import com.labsynch.labseer.domain.SubjectState;
-import com.labsynch.labseer.domain.SubjectStateDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect SubjectStateDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: SubjectStateDataOnDemand: @Component;
-    
-    private Random SubjectStateDataOnDemand.rnd = new SecureRandom();
-    
-    private List<SubjectState> SubjectStateDataOnDemand.data;
-    
-    @Autowired
-    SubjectDataOnDemand SubjectStateDataOnDemand.subjectDataOnDemand;
-    
-    public SubjectState SubjectStateDataOnDemand.getNewTransientSubjectState(int index) {
-        SubjectState obj = new SubjectState();
-        setComments(obj, index);
-        setDeleted(obj, index);
-        setIgnored(obj, index);
-        setLsKind(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedBy(obj, index);
-        setModifiedDate(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        setSubject(obj, index);
-        return obj;
-    }
-    
-    public void SubjectStateDataOnDemand.setComments(SubjectState obj, int index) {
-        String comments = "comments_" + index;
-        if (comments.length() > 512) {
-            comments = comments.substring(0, 512);
-        }
-        obj.setComments(comments);
-    }
-    
-    public void SubjectStateDataOnDemand.setDeleted(SubjectState obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void SubjectStateDataOnDemand.setIgnored(SubjectState obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void SubjectStateDataOnDemand.setLsKind(SubjectState obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void SubjectStateDataOnDemand.setLsTransaction(SubjectState obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void SubjectStateDataOnDemand.setLsType(SubjectState obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 64) {
-            lsType = lsType.substring(0, 64);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void SubjectStateDataOnDemand.setLsTypeAndKind(SubjectState obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void SubjectStateDataOnDemand.setModifiedBy(SubjectState obj, int index) {
-        String modifiedBy = "modifiedBy_" + index;
-        if (modifiedBy.length() > 255) {
-            modifiedBy = modifiedBy.substring(0, 255);
-        }
-        obj.setModifiedBy(modifiedBy);
-    }
-    
-    public void SubjectStateDataOnDemand.setModifiedDate(SubjectState obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void SubjectStateDataOnDemand.setRecordedBy(SubjectState obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void SubjectStateDataOnDemand.setRecordedDate(SubjectState obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public void SubjectStateDataOnDemand.setSubject(SubjectState obj, int index) {
-        Subject subject = subjectDataOnDemand.getRandomSubject();
-        obj.setSubject(subject);
-    }
-    
-    public SubjectState SubjectStateDataOnDemand.getSpecificSubjectState(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        SubjectState obj = data.get(index);
-        Long id = obj.getId();
-        return SubjectState.findSubjectState(id);
-    }
-    
-    public SubjectState SubjectStateDataOnDemand.getRandomSubjectState() {
-        init();
-        SubjectState obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return SubjectState.findSubjectState(id);
-    }
-    
-    public boolean SubjectStateDataOnDemand.modifySubjectState(SubjectState obj) {
-        return false;
-    }
-    
-    public void SubjectStateDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = SubjectState.findSubjectStateEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'SubjectState' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<SubjectState>();
-        for (int i = 0; i < 10; i++) {
-            SubjectState obj = getNewTransientSubjectState(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/SubjectStateIntegrationTest.java
index b9dba36a8..b18005802 100755
--- a/src/test/java/com/labsynch/labseer/domain/SubjectStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/SubjectStateIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
+@Configurable
 @RooIntegrationTest(entity = SubjectState.class)
 public class SubjectStateIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    SubjectStateDataOnDemand dod;
+
+	@Test
+    public void testCountSubjectStates() {
+        Assert.assertNotNull("Data on demand for 'SubjectState' failed to initialize correctly", dod.getRandomSubjectState());
+        long count = SubjectState.countSubjectStates();
+        Assert.assertTrue("Counter for 'SubjectState' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindSubjectState() {
+        SubjectState obj = dod.getRandomSubjectState();
+        Assert.assertNotNull("Data on demand for 'SubjectState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'SubjectState' failed to provide an identifier", id);
+        obj = SubjectState.findSubjectState(id);
+        Assert.assertNotNull("Find method for 'SubjectState' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'SubjectState' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllSubjectStates() {
+        Assert.assertNotNull("Data on demand for 'SubjectState' failed to initialize correctly", dod.getRandomSubjectState());
+        long count = SubjectState.countSubjectStates();
+        Assert.assertTrue("Too expensive to perform a find all test for 'SubjectState', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<SubjectState> result = SubjectState.findAllSubjectStates();
+        Assert.assertNotNull("Find all method for 'SubjectState' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'SubjectState' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindSubjectStateEntries() {
+        Assert.assertNotNull("Data on demand for 'SubjectState' failed to initialize correctly", dod.getRandomSubjectState());
+        long count = SubjectState.countSubjectStates();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<SubjectState> result = SubjectState.findSubjectStateEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'SubjectState' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'SubjectState' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        SubjectState obj = dod.getRandomSubjectState();
+        Assert.assertNotNull("Data on demand for 'SubjectState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'SubjectState' failed to provide an identifier", id);
+        obj = SubjectState.findSubjectState(id);
+        Assert.assertNotNull("Find method for 'SubjectState' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifySubjectState(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'SubjectState' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        SubjectState obj = dod.getRandomSubjectState();
+        Assert.assertNotNull("Data on demand for 'SubjectState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'SubjectState' failed to provide an identifier", id);
+        obj = SubjectState.findSubjectState(id);
+        boolean modified =  dod.modifySubjectState(obj);
+        Integer currentVersion = obj.getVersion();
+        SubjectState merged = (SubjectState)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'SubjectState' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'SubjectState' failed to initialize correctly", dod.getRandomSubjectState());
+        SubjectState obj = dod.getNewTransientSubjectState(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'SubjectState' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'SubjectState' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'SubjectState' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        SubjectState obj = dod.getRandomSubjectState();
+        Assert.assertNotNull("Data on demand for 'SubjectState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'SubjectState' failed to provide an identifier", id);
+        obj = SubjectState.findSubjectState(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'SubjectState' with identifier '" + id + "'", SubjectState.findSubjectState(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectStateIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/SubjectStateIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index f170b6d3a..000000000
--- a/src/test/java/com/labsynch/labseer/domain/SubjectStateIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SubjectStateIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect SubjectStateIntegrationTest_Roo_Configurable {
-    
-    declare @type: SubjectStateIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectStateIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/SubjectStateIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index c823bea19..000000000
--- a/src/test/java/com/labsynch/labseer/domain/SubjectStateIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SubjectState;
-import com.labsynch.labseer.domain.SubjectStateDataOnDemand;
-import com.labsynch.labseer.domain.SubjectStateIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect SubjectStateIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: SubjectStateIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: SubjectStateIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: SubjectStateIntegrationTest: @Transactional;
-    
-    @Autowired
-    SubjectStateDataOnDemand SubjectStateIntegrationTest.dod;
-    
-    @Test
-    public void SubjectStateIntegrationTest.testCountSubjectStates() {
-        Assert.assertNotNull("Data on demand for 'SubjectState' failed to initialize correctly", dod.getRandomSubjectState());
-        long count = SubjectState.countSubjectStates();
-        Assert.assertTrue("Counter for 'SubjectState' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void SubjectStateIntegrationTest.testFindSubjectState() {
-        SubjectState obj = dod.getRandomSubjectState();
-        Assert.assertNotNull("Data on demand for 'SubjectState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'SubjectState' failed to provide an identifier", id);
-        obj = SubjectState.findSubjectState(id);
-        Assert.assertNotNull("Find method for 'SubjectState' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'SubjectState' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void SubjectStateIntegrationTest.testFindAllSubjectStates() {
-        Assert.assertNotNull("Data on demand for 'SubjectState' failed to initialize correctly", dod.getRandomSubjectState());
-        long count = SubjectState.countSubjectStates();
-        Assert.assertTrue("Too expensive to perform a find all test for 'SubjectState', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<SubjectState> result = SubjectState.findAllSubjectStates();
-        Assert.assertNotNull("Find all method for 'SubjectState' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'SubjectState' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void SubjectStateIntegrationTest.testFindSubjectStateEntries() {
-        Assert.assertNotNull("Data on demand for 'SubjectState' failed to initialize correctly", dod.getRandomSubjectState());
-        long count = SubjectState.countSubjectStates();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<SubjectState> result = SubjectState.findSubjectStateEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'SubjectState' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'SubjectState' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void SubjectStateIntegrationTest.testFlush() {
-        SubjectState obj = dod.getRandomSubjectState();
-        Assert.assertNotNull("Data on demand for 'SubjectState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'SubjectState' failed to provide an identifier", id);
-        obj = SubjectState.findSubjectState(id);
-        Assert.assertNotNull("Find method for 'SubjectState' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifySubjectState(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'SubjectState' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void SubjectStateIntegrationTest.testMergeUpdate() {
-        SubjectState obj = dod.getRandomSubjectState();
-        Assert.assertNotNull("Data on demand for 'SubjectState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'SubjectState' failed to provide an identifier", id);
-        obj = SubjectState.findSubjectState(id);
-        boolean modified =  dod.modifySubjectState(obj);
-        Integer currentVersion = obj.getVersion();
-        SubjectState merged = (SubjectState)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'SubjectState' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void SubjectStateIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'SubjectState' failed to initialize correctly", dod.getRandomSubjectState());
-        SubjectState obj = dod.getNewTransientSubjectState(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'SubjectState' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'SubjectState' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'SubjectState' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void SubjectStateIntegrationTest.testRemove() {
-        SubjectState obj = dod.getRandomSubjectState();
-        Assert.assertNotNull("Data on demand for 'SubjectState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'SubjectState' failed to provide an identifier", id);
-        obj = SubjectState.findSubjectState(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'SubjectState' with identifier '" + id + "'", SubjectState.findSubjectState(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/SubjectValueDataOnDemand.java
index ee7937b18..01c45ef39 100755
--- a/src/test/java/com/labsynch/labseer/domain/SubjectValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/SubjectValueDataOnDemand.java
@@ -1,7 +1,382 @@
 package com.labsynch.labseer.domain;
 
+import java.math.BigDecimal;
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Configurable
+@Component
 @RooDataOnDemand(entity = SubjectValue.class)
 public class SubjectValueDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<SubjectValue> data;
+
+	@Autowired
+    SubjectStateDataOnDemand subjectStateDataOnDemand;
+
+	public SubjectValue getNewTransientSubjectValue(int index) {
+        SubjectValue obj = new SubjectValue();
+        setBlobValue(obj, index);
+        setClobValue(obj, index);
+        setCodeKind(obj, index);
+        setCodeOrigin(obj, index);
+        setCodeType(obj, index);
+        setCodeTypeAndKind(obj, index);
+        setCodeValue(obj, index);
+        setComments(obj, index);
+        setConcUnit(obj, index);
+        setConcentration(obj, index);
+        setDateValue(obj, index);
+        setDeleted(obj, index);
+        setFileValue(obj, index);
+        setIgnored(obj, index);
+        setLsKind(obj, index);
+        setLsState(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedBy(obj, index);
+        setModifiedDate(obj, index);
+        setNumberOfReplicates(obj, index);
+        setNumericValue(obj, index);
+        setOperatorKind(obj, index);
+        setOperatorType(obj, index);
+        setOperatorTypeAndKind(obj, index);
+        setPublicData(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        setSigFigs(obj, index);
+        setStringValue(obj, index);
+        setUncertainty(obj, index);
+        setUncertaintyType(obj, index);
+        setUnitKind(obj, index);
+        setUnitType(obj, index);
+        setUnitTypeAndKind(obj, index);
+        setUrlValue(obj, index);
+        return obj;
+    }
+
+	public void setBlobValue(SubjectValue obj, int index) {
+        byte[] blobValue = String.valueOf(index).getBytes();
+        obj.setBlobValue(blobValue);
+    }
+
+	public void setClobValue(SubjectValue obj, int index) {
+        String clobValue = "clobValue_" + index;
+        obj.setClobValue(clobValue);
+    }
+
+	public void setCodeKind(SubjectValue obj, int index) {
+        String codeKind = "codeKind_" + index;
+        if (codeKind.length() > 255) {
+            codeKind = codeKind.substring(0, 255);
+        }
+        obj.setCodeKind(codeKind);
+    }
+
+	public void setCodeOrigin(SubjectValue obj, int index) {
+        String codeOrigin = "codeOrigin_" + index;
+        if (codeOrigin.length() > 255) {
+            codeOrigin = codeOrigin.substring(0, 255);
+        }
+        obj.setCodeOrigin(codeOrigin);
+    }
+
+	public void setCodeType(SubjectValue obj, int index) {
+        String codeType = "codeType_" + index;
+        if (codeType.length() > 255) {
+            codeType = codeType.substring(0, 255);
+        }
+        obj.setCodeType(codeType);
+    }
+
+	public void setCodeTypeAndKind(SubjectValue obj, int index) {
+        String codeTypeAndKind = "codeTypeAndKind_" + index;
+        if (codeTypeAndKind.length() > 350) {
+            codeTypeAndKind = codeTypeAndKind.substring(0, 350);
+        }
+        obj.setCodeTypeAndKind(codeTypeAndKind);
+    }
+
+	public void setCodeValue(SubjectValue obj, int index) {
+        String codeValue = "codeValue_" + index;
+        if (codeValue.length() > 255) {
+            codeValue = codeValue.substring(0, 255);
+        }
+        obj.setCodeValue(codeValue);
+    }
+
+	public void setComments(SubjectValue obj, int index) {
+        String comments = "comments_" + index;
+        if (comments.length() > 512) {
+            comments = comments.substring(0, 512);
+        }
+        obj.setComments(comments);
+    }
+
+	public void setConcUnit(SubjectValue obj, int index) {
+        String concUnit = "concUnit_" + index;
+        if (concUnit.length() > 25) {
+            concUnit = concUnit.substring(0, 25);
+        }
+        obj.setConcUnit(concUnit);
+    }
+
+	public void setConcentration(SubjectValue obj, int index) {
+        Double concentration = new Integer(index).doubleValue();
+        obj.setConcentration(concentration);
+    }
+
+	public void setDateValue(SubjectValue obj, int index) {
+        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setDateValue(dateValue);
+    }
+
+	public void setDeleted(SubjectValue obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setFileValue(SubjectValue obj, int index) {
+        String fileValue = "fileValue_" + index;
+        if (fileValue.length() > 512) {
+            fileValue = fileValue.substring(0, 512);
+        }
+        obj.setFileValue(fileValue);
+    }
+
+	public void setIgnored(SubjectValue obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setLsKind(SubjectValue obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsState(SubjectValue obj, int index) {
+        SubjectState lsState = subjectStateDataOnDemand.getRandomSubjectState();
+        obj.setLsState(lsState);
+    }
+
+	public void setLsTransaction(SubjectValue obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(SubjectValue obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 64) {
+            lsType = lsType.substring(0, 64);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(SubjectValue obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 350) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 350);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedBy(SubjectValue obj, int index) {
+        String modifiedBy = "modifiedBy_" + index;
+        if (modifiedBy.length() > 255) {
+            modifiedBy = modifiedBy.substring(0, 255);
+        }
+        obj.setModifiedBy(modifiedBy);
+    }
+
+	public void setModifiedDate(SubjectValue obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setNumberOfReplicates(SubjectValue obj, int index) {
+        Integer numberOfReplicates = new Integer(index);
+        obj.setNumberOfReplicates(numberOfReplicates);
+    }
+
+	public void setNumericValue(SubjectValue obj, int index) {
+        BigDecimal numericValue = BigDecimal.valueOf(index);
+        if (numericValue.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
+            numericValue = new BigDecimal("99999999999999999999.999999999999999999");
+        }
+        obj.setNumericValue(numericValue);
+    }
+
+	public void setOperatorKind(SubjectValue obj, int index) {
+        String operatorKind = "operator_" + index;
+        if (operatorKind.length() > 10) {
+            operatorKind = operatorKind.substring(0, 10);
+        }
+        obj.setOperatorKind(operatorKind);
+    }
+
+	public void setOperatorType(SubjectValue obj, int index) {
+        String operatorType = "operatorType_" + index;
+        if (operatorType.length() > 25) {
+            operatorType = operatorType.substring(0, 25);
+        }
+        obj.setOperatorType(operatorType);
+    }
+
+	public void setOperatorTypeAndKind(SubjectValue obj, int index) {
+        String operatorTypeAndKind = "operatorTypeAndKind_" + index;
+        if (operatorTypeAndKind.length() > 50) {
+            operatorTypeAndKind = operatorTypeAndKind.substring(0, 50);
+        }
+        obj.setOperatorTypeAndKind(operatorTypeAndKind);
+    }
+
+	public void setPublicData(SubjectValue obj, int index) {
+        Boolean publicData = true;
+        obj.setPublicData(publicData);
+    }
+
+	public void setRecordedBy(SubjectValue obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(SubjectValue obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public void setSigFigs(SubjectValue obj, int index) {
+        Integer sigFigs = new Integer(index);
+        obj.setSigFigs(sigFigs);
+    }
+
+	public void setStringValue(SubjectValue obj, int index) {
+        String stringValue = "stringValue_" + index;
+        if (stringValue.length() > 255) {
+            stringValue = stringValue.substring(0, 255);
+        }
+        obj.setStringValue(stringValue);
+    }
+
+	public void setUncertainty(SubjectValue obj, int index) {
+        BigDecimal uncertainty = BigDecimal.valueOf(index);
+        if (uncertainty.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
+            uncertainty = new BigDecimal("99999999999999999999.999999999999999999");
+        }
+        obj.setUncertainty(uncertainty);
+    }
+
+	public void setUncertaintyType(SubjectValue obj, int index) {
+        String uncertaintyType = "uncertaintyType_" + index;
+        if (uncertaintyType.length() > 255) {
+            uncertaintyType = uncertaintyType.substring(0, 255);
+        }
+        obj.setUncertaintyType(uncertaintyType);
+    }
+
+	public void setUnitKind(SubjectValue obj, int index) {
+        String unitKind = "unitKind_" + index;
+        if (unitKind.length() > 25) {
+            unitKind = unitKind.substring(0, 25);
+        }
+        obj.setUnitKind(unitKind);
+    }
+
+	public void setUnitType(SubjectValue obj, int index) {
+        String unitType = "unitType_" + index;
+        if (unitType.length() > 25) {
+            unitType = unitType.substring(0, 25);
+        }
+        obj.setUnitType(unitType);
+    }
+
+	public void setUnitTypeAndKind(SubjectValue obj, int index) {
+        String unitTypeAndKind = "unitTypeAndKind_" + index;
+        if (unitTypeAndKind.length() > 55) {
+            unitTypeAndKind = unitTypeAndKind.substring(0, 55);
+        }
+        obj.setUnitTypeAndKind(unitTypeAndKind);
+    }
+
+	public void setUrlValue(SubjectValue obj, int index) {
+        String urlValue = "urlValue_" + index;
+        if (urlValue.length() > 2000) {
+            urlValue = urlValue.substring(0, 2000);
+        }
+        obj.setUrlValue(urlValue);
+    }
+
+	public SubjectValue getSpecificSubjectValue(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        SubjectValue obj = data.get(index);
+        Long id = obj.getId();
+        return SubjectValue.findSubjectValue(id);
+    }
+
+	public SubjectValue getRandomSubjectValue() {
+        init();
+        SubjectValue obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return SubjectValue.findSubjectValue(id);
+    }
+
+	public boolean modifySubjectValue(SubjectValue obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = SubjectValue.findSubjectValueEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'SubjectValue' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<SubjectValue>();
+        for (int i = 0; i < 10; i++) {
+            SubjectValue obj = getNewTransientSubjectValue(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectValueDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/SubjectValueDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index c8034187c..000000000
--- a/src/test/java/com/labsynch/labseer/domain/SubjectValueDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SubjectValueDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect SubjectValueDataOnDemand_Roo_Configurable {
-    
-    declare @type: SubjectValueDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectValueDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/SubjectValueDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 6f60740f9..000000000
--- a/src/test/java/com/labsynch/labseer/domain/SubjectValueDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,387 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SubjectState;
-import com.labsynch.labseer.domain.SubjectStateDataOnDemand;
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.domain.SubjectValueDataOnDemand;
-import java.math.BigDecimal;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect SubjectValueDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: SubjectValueDataOnDemand: @Component;
-    
-    private Random SubjectValueDataOnDemand.rnd = new SecureRandom();
-    
-    private List<SubjectValue> SubjectValueDataOnDemand.data;
-    
-    @Autowired
-    SubjectStateDataOnDemand SubjectValueDataOnDemand.subjectStateDataOnDemand;
-    
-    public SubjectValue SubjectValueDataOnDemand.getNewTransientSubjectValue(int index) {
-        SubjectValue obj = new SubjectValue();
-        setBlobValue(obj, index);
-        setClobValue(obj, index);
-        setCodeKind(obj, index);
-        setCodeOrigin(obj, index);
-        setCodeType(obj, index);
-        setCodeTypeAndKind(obj, index);
-        setCodeValue(obj, index);
-        setComments(obj, index);
-        setConcUnit(obj, index);
-        setConcentration(obj, index);
-        setDateValue(obj, index);
-        setDeleted(obj, index);
-        setFileValue(obj, index);
-        setIgnored(obj, index);
-        setLsKind(obj, index);
-        setLsState(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedBy(obj, index);
-        setModifiedDate(obj, index);
-        setNumberOfReplicates(obj, index);
-        setNumericValue(obj, index);
-        setOperatorKind(obj, index);
-        setOperatorType(obj, index);
-        setOperatorTypeAndKind(obj, index);
-        setPublicData(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        setSigFigs(obj, index);
-        setStringValue(obj, index);
-        setUncertainty(obj, index);
-        setUncertaintyType(obj, index);
-        setUnitKind(obj, index);
-        setUnitType(obj, index);
-        setUnitTypeAndKind(obj, index);
-        setUrlValue(obj, index);
-        return obj;
-    }
-    
-    public void SubjectValueDataOnDemand.setBlobValue(SubjectValue obj, int index) {
-        byte[] blobValue = String.valueOf(index).getBytes();
-        obj.setBlobValue(blobValue);
-    }
-    
-    public void SubjectValueDataOnDemand.setClobValue(SubjectValue obj, int index) {
-        String clobValue = "clobValue_" + index;
-        obj.setClobValue(clobValue);
-    }
-    
-    public void SubjectValueDataOnDemand.setCodeKind(SubjectValue obj, int index) {
-        String codeKind = "codeKind_" + index;
-        if (codeKind.length() > 255) {
-            codeKind = codeKind.substring(0, 255);
-        }
-        obj.setCodeKind(codeKind);
-    }
-    
-    public void SubjectValueDataOnDemand.setCodeOrigin(SubjectValue obj, int index) {
-        String codeOrigin = "codeOrigin_" + index;
-        if (codeOrigin.length() > 255) {
-            codeOrigin = codeOrigin.substring(0, 255);
-        }
-        obj.setCodeOrigin(codeOrigin);
-    }
-    
-    public void SubjectValueDataOnDemand.setCodeType(SubjectValue obj, int index) {
-        String codeType = "codeType_" + index;
-        if (codeType.length() > 255) {
-            codeType = codeType.substring(0, 255);
-        }
-        obj.setCodeType(codeType);
-    }
-    
-    public void SubjectValueDataOnDemand.setCodeTypeAndKind(SubjectValue obj, int index) {
-        String codeTypeAndKind = "codeTypeAndKind_" + index;
-        if (codeTypeAndKind.length() > 350) {
-            codeTypeAndKind = codeTypeAndKind.substring(0, 350);
-        }
-        obj.setCodeTypeAndKind(codeTypeAndKind);
-    }
-    
-    public void SubjectValueDataOnDemand.setCodeValue(SubjectValue obj, int index) {
-        String codeValue = "codeValue_" + index;
-        if (codeValue.length() > 255) {
-            codeValue = codeValue.substring(0, 255);
-        }
-        obj.setCodeValue(codeValue);
-    }
-    
-    public void SubjectValueDataOnDemand.setComments(SubjectValue obj, int index) {
-        String comments = "comments_" + index;
-        if (comments.length() > 512) {
-            comments = comments.substring(0, 512);
-        }
-        obj.setComments(comments);
-    }
-    
-    public void SubjectValueDataOnDemand.setConcUnit(SubjectValue obj, int index) {
-        String concUnit = "concUnit_" + index;
-        if (concUnit.length() > 25) {
-            concUnit = concUnit.substring(0, 25);
-        }
-        obj.setConcUnit(concUnit);
-    }
-    
-    public void SubjectValueDataOnDemand.setConcentration(SubjectValue obj, int index) {
-        Double concentration = new Integer(index).doubleValue();
-        obj.setConcentration(concentration);
-    }
-    
-    public void SubjectValueDataOnDemand.setDateValue(SubjectValue obj, int index) {
-        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setDateValue(dateValue);
-    }
-    
-    public void SubjectValueDataOnDemand.setDeleted(SubjectValue obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void SubjectValueDataOnDemand.setFileValue(SubjectValue obj, int index) {
-        String fileValue = "fileValue_" + index;
-        if (fileValue.length() > 512) {
-            fileValue = fileValue.substring(0, 512);
-        }
-        obj.setFileValue(fileValue);
-    }
-    
-    public void SubjectValueDataOnDemand.setIgnored(SubjectValue obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void SubjectValueDataOnDemand.setLsKind(SubjectValue obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void SubjectValueDataOnDemand.setLsState(SubjectValue obj, int index) {
-        SubjectState lsState = subjectStateDataOnDemand.getRandomSubjectState();
-        obj.setLsState(lsState);
-    }
-    
-    public void SubjectValueDataOnDemand.setLsTransaction(SubjectValue obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void SubjectValueDataOnDemand.setLsType(SubjectValue obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 64) {
-            lsType = lsType.substring(0, 64);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void SubjectValueDataOnDemand.setLsTypeAndKind(SubjectValue obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 350) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 350);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void SubjectValueDataOnDemand.setModifiedBy(SubjectValue obj, int index) {
-        String modifiedBy = "modifiedBy_" + index;
-        if (modifiedBy.length() > 255) {
-            modifiedBy = modifiedBy.substring(0, 255);
-        }
-        obj.setModifiedBy(modifiedBy);
-    }
-    
-    public void SubjectValueDataOnDemand.setModifiedDate(SubjectValue obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void SubjectValueDataOnDemand.setNumberOfReplicates(SubjectValue obj, int index) {
-        Integer numberOfReplicates = new Integer(index);
-        obj.setNumberOfReplicates(numberOfReplicates);
-    }
-    
-    public void SubjectValueDataOnDemand.setNumericValue(SubjectValue obj, int index) {
-        BigDecimal numericValue = BigDecimal.valueOf(index);
-        if (numericValue.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
-            numericValue = new BigDecimal("99999999999999999999.999999999999999999");
-        }
-        obj.setNumericValue(numericValue);
-    }
-    
-    public void SubjectValueDataOnDemand.setOperatorKind(SubjectValue obj, int index) {
-        String operatorKind = "operator_" + index;
-        if (operatorKind.length() > 10) {
-            operatorKind = operatorKind.substring(0, 10);
-        }
-        obj.setOperatorKind(operatorKind);
-    }
-    
-    public void SubjectValueDataOnDemand.setOperatorType(SubjectValue obj, int index) {
-        String operatorType = "operatorType_" + index;
-        if (operatorType.length() > 25) {
-            operatorType = operatorType.substring(0, 25);
-        }
-        obj.setOperatorType(operatorType);
-    }
-    
-    public void SubjectValueDataOnDemand.setOperatorTypeAndKind(SubjectValue obj, int index) {
-        String operatorTypeAndKind = "operatorTypeAndKind_" + index;
-        if (operatorTypeAndKind.length() > 50) {
-            operatorTypeAndKind = operatorTypeAndKind.substring(0, 50);
-        }
-        obj.setOperatorTypeAndKind(operatorTypeAndKind);
-    }
-    
-    public void SubjectValueDataOnDemand.setPublicData(SubjectValue obj, int index) {
-        Boolean publicData = true;
-        obj.setPublicData(publicData);
-    }
-    
-    public void SubjectValueDataOnDemand.setRecordedBy(SubjectValue obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void SubjectValueDataOnDemand.setRecordedDate(SubjectValue obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public void SubjectValueDataOnDemand.setSigFigs(SubjectValue obj, int index) {
-        Integer sigFigs = new Integer(index);
-        obj.setSigFigs(sigFigs);
-    }
-    
-    public void SubjectValueDataOnDemand.setStringValue(SubjectValue obj, int index) {
-        String stringValue = "stringValue_" + index;
-        if (stringValue.length() > 255) {
-            stringValue = stringValue.substring(0, 255);
-        }
-        obj.setStringValue(stringValue);
-    }
-    
-    public void SubjectValueDataOnDemand.setUncertainty(SubjectValue obj, int index) {
-        BigDecimal uncertainty = BigDecimal.valueOf(index);
-        if (uncertainty.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
-            uncertainty = new BigDecimal("99999999999999999999.999999999999999999");
-        }
-        obj.setUncertainty(uncertainty);
-    }
-    
-    public void SubjectValueDataOnDemand.setUncertaintyType(SubjectValue obj, int index) {
-        String uncertaintyType = "uncertaintyType_" + index;
-        if (uncertaintyType.length() > 255) {
-            uncertaintyType = uncertaintyType.substring(0, 255);
-        }
-        obj.setUncertaintyType(uncertaintyType);
-    }
-    
-    public void SubjectValueDataOnDemand.setUnitKind(SubjectValue obj, int index) {
-        String unitKind = "unitKind_" + index;
-        if (unitKind.length() > 25) {
-            unitKind = unitKind.substring(0, 25);
-        }
-        obj.setUnitKind(unitKind);
-    }
-    
-    public void SubjectValueDataOnDemand.setUnitType(SubjectValue obj, int index) {
-        String unitType = "unitType_" + index;
-        if (unitType.length() > 25) {
-            unitType = unitType.substring(0, 25);
-        }
-        obj.setUnitType(unitType);
-    }
-    
-    public void SubjectValueDataOnDemand.setUnitTypeAndKind(SubjectValue obj, int index) {
-        String unitTypeAndKind = "unitTypeAndKind_" + index;
-        if (unitTypeAndKind.length() > 55) {
-            unitTypeAndKind = unitTypeAndKind.substring(0, 55);
-        }
-        obj.setUnitTypeAndKind(unitTypeAndKind);
-    }
-    
-    public void SubjectValueDataOnDemand.setUrlValue(SubjectValue obj, int index) {
-        String urlValue = "urlValue_" + index;
-        if (urlValue.length() > 2000) {
-            urlValue = urlValue.substring(0, 2000);
-        }
-        obj.setUrlValue(urlValue);
-    }
-    
-    public SubjectValue SubjectValueDataOnDemand.getSpecificSubjectValue(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        SubjectValue obj = data.get(index);
-        Long id = obj.getId();
-        return SubjectValue.findSubjectValue(id);
-    }
-    
-    public SubjectValue SubjectValueDataOnDemand.getRandomSubjectValue() {
-        init();
-        SubjectValue obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return SubjectValue.findSubjectValue(id);
-    }
-    
-    public boolean SubjectValueDataOnDemand.modifySubjectValue(SubjectValue obj) {
-        return false;
-    }
-    
-    public void SubjectValueDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = SubjectValue.findSubjectValueEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'SubjectValue' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<SubjectValue>();
-        for (int i = 0; i < 10; i++) {
-            SubjectValue obj = getNewTransientSubjectValue(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/SubjectValueIntegrationTest.java
index 5e8bdca9e..68a780992 100755
--- a/src/test/java/com/labsynch/labseer/domain/SubjectValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/SubjectValueIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = SubjectValue.class)
 public class SubjectValueIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    SubjectValueDataOnDemand dod;
+
+	@Test
+    public void testCountSubjectValues() {
+        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to initialize correctly", dod.getRandomSubjectValue());
+        long count = SubjectValue.countSubjectValues();
+        Assert.assertTrue("Counter for 'SubjectValue' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindSubjectValue() {
+        SubjectValue obj = dod.getRandomSubjectValue();
+        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to provide an identifier", id);
+        obj = SubjectValue.findSubjectValue(id);
+        Assert.assertNotNull("Find method for 'SubjectValue' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'SubjectValue' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllSubjectValues() {
+        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to initialize correctly", dod.getRandomSubjectValue());
+        long count = SubjectValue.countSubjectValues();
+        Assert.assertTrue("Too expensive to perform a find all test for 'SubjectValue', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<SubjectValue> result = SubjectValue.findAllSubjectValues();
+        Assert.assertNotNull("Find all method for 'SubjectValue' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'SubjectValue' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindSubjectValueEntries() {
+        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to initialize correctly", dod.getRandomSubjectValue());
+        long count = SubjectValue.countSubjectValues();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<SubjectValue> result = SubjectValue.findSubjectValueEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'SubjectValue' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'SubjectValue' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        SubjectValue obj = dod.getRandomSubjectValue();
+        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to provide an identifier", id);
+        obj = SubjectValue.findSubjectValue(id);
+        Assert.assertNotNull("Find method for 'SubjectValue' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifySubjectValue(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'SubjectValue' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        SubjectValue obj = dod.getRandomSubjectValue();
+        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to provide an identifier", id);
+        obj = SubjectValue.findSubjectValue(id);
+        boolean modified =  dod.modifySubjectValue(obj);
+        Integer currentVersion = obj.getVersion();
+        SubjectValue merged = (SubjectValue)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'SubjectValue' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to initialize correctly", dod.getRandomSubjectValue());
+        SubjectValue obj = dod.getNewTransientSubjectValue(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'SubjectValue' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'SubjectValue' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        SubjectValue obj = dod.getRandomSubjectValue();
+        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to provide an identifier", id);
+        obj = SubjectValue.findSubjectValue(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'SubjectValue' with identifier '" + id + "'", SubjectValue.findSubjectValue(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectValueIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/SubjectValueIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 292b17a2a..000000000
--- a/src/test/java/com/labsynch/labseer/domain/SubjectValueIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SubjectValueIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect SubjectValueIntegrationTest_Roo_Configurable {
-    
-    declare @type: SubjectValueIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectValueIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/SubjectValueIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 068f10e18..000000000
--- a/src/test/java/com/labsynch/labseer/domain/SubjectValueIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.domain.SubjectValueDataOnDemand;
-import com.labsynch.labseer.domain.SubjectValueIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect SubjectValueIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: SubjectValueIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: SubjectValueIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: SubjectValueIntegrationTest: @Transactional;
-    
-    @Autowired
-    SubjectValueDataOnDemand SubjectValueIntegrationTest.dod;
-    
-    @Test
-    public void SubjectValueIntegrationTest.testCountSubjectValues() {
-        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to initialize correctly", dod.getRandomSubjectValue());
-        long count = SubjectValue.countSubjectValues();
-        Assert.assertTrue("Counter for 'SubjectValue' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void SubjectValueIntegrationTest.testFindSubjectValue() {
-        SubjectValue obj = dod.getRandomSubjectValue();
-        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to provide an identifier", id);
-        obj = SubjectValue.findSubjectValue(id);
-        Assert.assertNotNull("Find method for 'SubjectValue' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'SubjectValue' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void SubjectValueIntegrationTest.testFindAllSubjectValues() {
-        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to initialize correctly", dod.getRandomSubjectValue());
-        long count = SubjectValue.countSubjectValues();
-        Assert.assertTrue("Too expensive to perform a find all test for 'SubjectValue', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<SubjectValue> result = SubjectValue.findAllSubjectValues();
-        Assert.assertNotNull("Find all method for 'SubjectValue' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'SubjectValue' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void SubjectValueIntegrationTest.testFindSubjectValueEntries() {
-        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to initialize correctly", dod.getRandomSubjectValue());
-        long count = SubjectValue.countSubjectValues();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<SubjectValue> result = SubjectValue.findSubjectValueEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'SubjectValue' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'SubjectValue' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void SubjectValueIntegrationTest.testFlush() {
-        SubjectValue obj = dod.getRandomSubjectValue();
-        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to provide an identifier", id);
-        obj = SubjectValue.findSubjectValue(id);
-        Assert.assertNotNull("Find method for 'SubjectValue' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifySubjectValue(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'SubjectValue' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void SubjectValueIntegrationTest.testMergeUpdate() {
-        SubjectValue obj = dod.getRandomSubjectValue();
-        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to provide an identifier", id);
-        obj = SubjectValue.findSubjectValue(id);
-        boolean modified =  dod.modifySubjectValue(obj);
-        Integer currentVersion = obj.getVersion();
-        SubjectValue merged = (SubjectValue)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'SubjectValue' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void SubjectValueIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to initialize correctly", dod.getRandomSubjectValue());
-        SubjectValue obj = dod.getNewTransientSubjectValue(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'SubjectValue' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'SubjectValue' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void SubjectValueIntegrationTest.testRemove() {
-        SubjectValue obj = dod.getRandomSubjectValue();
-        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to provide an identifier", id);
-        obj = SubjectValue.findSubjectValue(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'SubjectValue' with identifier '" + id + "'", SubjectValue.findSubjectValue(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ThingKindDataOnDemand.java
index d663be532..23563bcdc 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingKindDataOnDemand.java
@@ -1,7 +1,108 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Configurable
+@Component
 @RooDataOnDemand(entity = ThingKind.class)
 public class ThingKindDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<ThingKind> data;
+
+	@Autowired
+    ThingTypeDataOnDemand thingTypeDataOnDemand;
+
+	public ThingKind getNewTransientThingKind(int index) {
+        ThingKind obj = new ThingKind();
+        setKindName(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        return obj;
+    }
+
+	public void setKindName(ThingKind obj, int index) {
+        String kindName = "kindName_" + index;
+        if (kindName.length() > 255) {
+            kindName = kindName.substring(0, 255);
+        }
+        obj.setKindName(kindName);
+    }
+
+	public void setLsType(ThingKind obj, int index) {
+        ThingType lsType = thingTypeDataOnDemand.getRandomThingType();
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(ThingKind obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = new Random().nextInt(10) + lsTypeAndKind.substring(1, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public ThingKind getSpecificThingKind(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        ThingKind obj = data.get(index);
+        Long id = obj.getId();
+        return ThingKind.findThingKind(id);
+    }
+
+	public ThingKind getRandomThingKind() {
+        init();
+        ThingKind obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return ThingKind.findThingKind(id);
+    }
+
+	public boolean modifyThingKind(ThingKind obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = ThingKind.findThingKindEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'ThingKind' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<ThingKind>();
+        for (int i = 0; i < 10; i++) {
+            ThingKind obj = getNewTransientThingKind(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingKindDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ThingKindDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index fc67d94e6..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ThingKindDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingKindDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ThingKindDataOnDemand_Roo_Configurable {
-    
-    declare @type: ThingKindDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingKindDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ThingKindDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 9bfc8c297..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ThingKindDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,113 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingKind;
-import com.labsynch.labseer.domain.ThingKindDataOnDemand;
-import com.labsynch.labseer.domain.ThingType;
-import com.labsynch.labseer.domain.ThingTypeDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect ThingKindDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ThingKindDataOnDemand: @Component;
-    
-    private Random ThingKindDataOnDemand.rnd = new SecureRandom();
-    
-    private List<ThingKind> ThingKindDataOnDemand.data;
-    
-    @Autowired
-    ThingTypeDataOnDemand ThingKindDataOnDemand.thingTypeDataOnDemand;
-    
-    public ThingKind ThingKindDataOnDemand.getNewTransientThingKind(int index) {
-        ThingKind obj = new ThingKind();
-        setKindName(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        return obj;
-    }
-    
-    public void ThingKindDataOnDemand.setKindName(ThingKind obj, int index) {
-        String kindName = "kindName_" + index;
-        if (kindName.length() > 255) {
-            kindName = kindName.substring(0, 255);
-        }
-        obj.setKindName(kindName);
-    }
-    
-    public void ThingKindDataOnDemand.setLsType(ThingKind obj, int index) {
-        ThingType lsType = thingTypeDataOnDemand.getRandomThingType();
-        obj.setLsType(lsType);
-    }
-    
-    public void ThingKindDataOnDemand.setLsTypeAndKind(ThingKind obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = new Random().nextInt(10) + lsTypeAndKind.substring(1, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public ThingKind ThingKindDataOnDemand.getSpecificThingKind(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        ThingKind obj = data.get(index);
-        Long id = obj.getId();
-        return ThingKind.findThingKind(id);
-    }
-    
-    public ThingKind ThingKindDataOnDemand.getRandomThingKind() {
-        init();
-        ThingKind obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return ThingKind.findThingKind(id);
-    }
-    
-    public boolean ThingKindDataOnDemand.modifyThingKind(ThingKind obj) {
-        return false;
-    }
-    
-    public void ThingKindDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = ThingKind.findThingKindEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ThingKind' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<ThingKind>();
-        for (int i = 0; i < 10; i++) {
-            ThingKind obj = getNewTransientThingKind(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ThingKindIntegrationTest.java
index 1ff45d29f..a1a6f82c8 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingKindIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = ThingKind.class)
 public class ThingKindIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ThingKindDataOnDemand dod;
+
+	@Test
+    public void testCountThingKinds() {
+        Assert.assertNotNull("Data on demand for 'ThingKind' failed to initialize correctly", dod.getRandomThingKind());
+        long count = ThingKind.countThingKinds();
+        Assert.assertTrue("Counter for 'ThingKind' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindThingKind() {
+        ThingKind obj = dod.getRandomThingKind();
+        Assert.assertNotNull("Data on demand for 'ThingKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ThingKind' failed to provide an identifier", id);
+        obj = ThingKind.findThingKind(id);
+        Assert.assertNotNull("Find method for 'ThingKind' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'ThingKind' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllThingKinds() {
+        Assert.assertNotNull("Data on demand for 'ThingKind' failed to initialize correctly", dod.getRandomThingKind());
+        long count = ThingKind.countThingKinds();
+        Assert.assertTrue("Too expensive to perform a find all test for 'ThingKind', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<ThingKind> result = ThingKind.findAllThingKinds();
+        Assert.assertNotNull("Find all method for 'ThingKind' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'ThingKind' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindThingKindEntries() {
+        Assert.assertNotNull("Data on demand for 'ThingKind' failed to initialize correctly", dod.getRandomThingKind());
+        long count = ThingKind.countThingKinds();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<ThingKind> result = ThingKind.findThingKindEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'ThingKind' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'ThingKind' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        ThingKind obj = dod.getRandomThingKind();
+        Assert.assertNotNull("Data on demand for 'ThingKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ThingKind' failed to provide an identifier", id);
+        obj = ThingKind.findThingKind(id);
+        Assert.assertNotNull("Find method for 'ThingKind' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyThingKind(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'ThingKind' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        ThingKind obj = dod.getRandomThingKind();
+        Assert.assertNotNull("Data on demand for 'ThingKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ThingKind' failed to provide an identifier", id);
+        obj = ThingKind.findThingKind(id);
+        boolean modified =  dod.modifyThingKind(obj);
+        Integer currentVersion = obj.getVersion();
+        ThingKind merged = obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'ThingKind' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'ThingKind' failed to initialize correctly", dod.getRandomThingKind());
+        ThingKind obj = dod.getNewTransientThingKind(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'ThingKind' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'ThingKind' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'ThingKind' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        ThingKind obj = dod.getRandomThingKind();
+        Assert.assertNotNull("Data on demand for 'ThingKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ThingKind' failed to provide an identifier", id);
+        obj = ThingKind.findThingKind(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'ThingKind' with identifier '" + id + "'", ThingKind.findThingKind(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingKindIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ThingKindIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index d5a633b60..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ThingKindIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingKindIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ThingKindIntegrationTest_Roo_Configurable {
-    
-    declare @type: ThingKindIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingKindIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ThingKindIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 965f7114c..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ThingKindIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingKind;
-import com.labsynch.labseer.domain.ThingKindDataOnDemand;
-import com.labsynch.labseer.domain.ThingKindIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ThingKindIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ThingKindIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ThingKindIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ThingKindIntegrationTest: @Transactional;
-    
-    @Autowired
-    ThingKindDataOnDemand ThingKindIntegrationTest.dod;
-    
-    @Test
-    public void ThingKindIntegrationTest.testCountThingKinds() {
-        Assert.assertNotNull("Data on demand for 'ThingKind' failed to initialize correctly", dod.getRandomThingKind());
-        long count = ThingKind.countThingKinds();
-        Assert.assertTrue("Counter for 'ThingKind' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ThingKindIntegrationTest.testFindThingKind() {
-        ThingKind obj = dod.getRandomThingKind();
-        Assert.assertNotNull("Data on demand for 'ThingKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ThingKind' failed to provide an identifier", id);
-        obj = ThingKind.findThingKind(id);
-        Assert.assertNotNull("Find method for 'ThingKind' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ThingKind' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ThingKindIntegrationTest.testFindAllThingKinds() {
-        Assert.assertNotNull("Data on demand for 'ThingKind' failed to initialize correctly", dod.getRandomThingKind());
-        long count = ThingKind.countThingKinds();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ThingKind', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<ThingKind> result = ThingKind.findAllThingKinds();
-        Assert.assertNotNull("Find all method for 'ThingKind' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ThingKind' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ThingKindIntegrationTest.testFindThingKindEntries() {
-        Assert.assertNotNull("Data on demand for 'ThingKind' failed to initialize correctly", dod.getRandomThingKind());
-        long count = ThingKind.countThingKinds();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<ThingKind> result = ThingKind.findThingKindEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'ThingKind' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ThingKind' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ThingKindIntegrationTest.testFlush() {
-        ThingKind obj = dod.getRandomThingKind();
-        Assert.assertNotNull("Data on demand for 'ThingKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ThingKind' failed to provide an identifier", id);
-        obj = ThingKind.findThingKind(id);
-        Assert.assertNotNull("Find method for 'ThingKind' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyThingKind(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'ThingKind' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ThingKindIntegrationTest.testMergeUpdate() {
-        ThingKind obj = dod.getRandomThingKind();
-        Assert.assertNotNull("Data on demand for 'ThingKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ThingKind' failed to provide an identifier", id);
-        obj = ThingKind.findThingKind(id);
-        boolean modified =  dod.modifyThingKind(obj);
-        Integer currentVersion = obj.getVersion();
-        ThingKind merged = obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ThingKind' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ThingKindIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'ThingKind' failed to initialize correctly", dod.getRandomThingKind());
-        ThingKind obj = dod.getNewTransientThingKind(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ThingKind' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'ThingKind' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'ThingKind' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ThingKindIntegrationTest.testRemove() {
-        ThingKind obj = dod.getRandomThingKind();
-        Assert.assertNotNull("Data on demand for 'ThingKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ThingKind' failed to provide an identifier", id);
-        obj = ThingKind.findThingKind(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'ThingKind' with identifier '" + id + "'", ThingKind.findThingKind(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveDataOnDemand.java
index 332ac6f46..67c1f6232 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveDataOnDemand.java
@@ -1,7 +1,167 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Configurable
+@Component
 @RooDataOnDemand(entity = ThingPageArchive.class)
 public class ThingPageArchiveDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<ThingPageArchive> data;
+
+	public ThingPageArchive getNewTransientThingPageArchive(int index) {
+        ThingPageArchive obj = new ThingPageArchive();
+        setArchived(obj, index);
+        setCurrentEditor(obj, index);
+        setIgnored(obj, index);
+        setLsTransaction(obj, index);
+        setModifiedBy(obj, index);
+        setModifiedDate(obj, index);
+        setPageContent(obj, index);
+        setPageName(obj, index);
+        setPageVersion(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        setThing(obj, index);
+        return obj;
+    }
+
+	public void setArchived(ThingPageArchive obj, int index) {
+        Boolean archived = true;
+        obj.setArchived(archived);
+    }
+
+	public void setCurrentEditor(ThingPageArchive obj, int index) {
+        String currentEditor = "currentEditor_" + index;
+        if (currentEditor.length() > 255) {
+            currentEditor = currentEditor.substring(0, 255);
+        }
+        obj.setCurrentEditor(currentEditor);
+    }
+
+	public void setIgnored(ThingPageArchive obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setLsTransaction(ThingPageArchive obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setModifiedBy(ThingPageArchive obj, int index) {
+        String modifiedBy = "modifiedBy_" + index;
+        if (modifiedBy.length() > 255) {
+            modifiedBy = modifiedBy.substring(0, 255);
+        }
+        obj.setModifiedBy(modifiedBy);
+    }
+
+	public void setModifiedDate(ThingPageArchive obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setPageContent(ThingPageArchive obj, int index) {
+        String pageContent = "pageContent_" + index;
+        obj.setPageContent(pageContent);
+    }
+
+	public void setPageName(ThingPageArchive obj, int index) {
+        String pageName = "pageName_" + index;
+        if (pageName.length() > 255) {
+            pageName = pageName.substring(0, 255);
+        }
+        obj.setPageName(pageName);
+    }
+
+	public void setPageVersion(ThingPageArchive obj, int index) {
+        Integer pageVersion = new Integer(index);
+        obj.setPageVersion(pageVersion);
+    }
+
+	public void setRecordedBy(ThingPageArchive obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(ThingPageArchive obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public void setThing(ThingPageArchive obj, int index) {
+        Long thing = new Integer(index).longValue();
+        obj.setThing(thing);
+    }
+
+	public ThingPageArchive getSpecificThingPageArchive(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        ThingPageArchive obj = data.get(index);
+        Long id = obj.getId();
+        return ThingPageArchive.findThingPageArchive(id);
+    }
+
+	public ThingPageArchive getRandomThingPageArchive() {
+        init();
+        ThingPageArchive obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return ThingPageArchive.findThingPageArchive(id);
+    }
+
+	public boolean modifyThingPageArchive(ThingPageArchive obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = ThingPageArchive.findThingPageArchiveEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'ThingPageArchive' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<ThingPageArchive>();
+        for (int i = 0; i < 10; i++) {
+            ThingPageArchive obj = getNewTransientThingPageArchive(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 267e75183..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingPageArchiveDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ThingPageArchiveDataOnDemand_Roo_Configurable {
-    
-    declare @type: ThingPageArchiveDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 8cafcec90..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,170 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingPageArchive;
-import com.labsynch.labseer.domain.ThingPageArchiveDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.stereotype.Component;
-
-privileged aspect ThingPageArchiveDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ThingPageArchiveDataOnDemand: @Component;
-    
-    private Random ThingPageArchiveDataOnDemand.rnd = new SecureRandom();
-    
-    private List<ThingPageArchive> ThingPageArchiveDataOnDemand.data;
-    
-    public ThingPageArchive ThingPageArchiveDataOnDemand.getNewTransientThingPageArchive(int index) {
-        ThingPageArchive obj = new ThingPageArchive();
-        setArchived(obj, index);
-        setCurrentEditor(obj, index);
-        setIgnored(obj, index);
-        setLsTransaction(obj, index);
-        setModifiedBy(obj, index);
-        setModifiedDate(obj, index);
-        setPageContent(obj, index);
-        setPageName(obj, index);
-        setPageVersion(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        setThing(obj, index);
-        return obj;
-    }
-    
-    public void ThingPageArchiveDataOnDemand.setArchived(ThingPageArchive obj, int index) {
-        Boolean archived = true;
-        obj.setArchived(archived);
-    }
-    
-    public void ThingPageArchiveDataOnDemand.setCurrentEditor(ThingPageArchive obj, int index) {
-        String currentEditor = "currentEditor_" + index;
-        if (currentEditor.length() > 255) {
-            currentEditor = currentEditor.substring(0, 255);
-        }
-        obj.setCurrentEditor(currentEditor);
-    }
-    
-    public void ThingPageArchiveDataOnDemand.setIgnored(ThingPageArchive obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void ThingPageArchiveDataOnDemand.setLsTransaction(ThingPageArchive obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void ThingPageArchiveDataOnDemand.setModifiedBy(ThingPageArchive obj, int index) {
-        String modifiedBy = "modifiedBy_" + index;
-        if (modifiedBy.length() > 255) {
-            modifiedBy = modifiedBy.substring(0, 255);
-        }
-        obj.setModifiedBy(modifiedBy);
-    }
-    
-    public void ThingPageArchiveDataOnDemand.setModifiedDate(ThingPageArchive obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void ThingPageArchiveDataOnDemand.setPageContent(ThingPageArchive obj, int index) {
-        String pageContent = "pageContent_" + index;
-        obj.setPageContent(pageContent);
-    }
-    
-    public void ThingPageArchiveDataOnDemand.setPageName(ThingPageArchive obj, int index) {
-        String pageName = "pageName_" + index;
-        if (pageName.length() > 255) {
-            pageName = pageName.substring(0, 255);
-        }
-        obj.setPageName(pageName);
-    }
-    
-    public void ThingPageArchiveDataOnDemand.setPageVersion(ThingPageArchive obj, int index) {
-        Integer pageVersion = new Integer(index);
-        obj.setPageVersion(pageVersion);
-    }
-    
-    public void ThingPageArchiveDataOnDemand.setRecordedBy(ThingPageArchive obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void ThingPageArchiveDataOnDemand.setRecordedDate(ThingPageArchive obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public void ThingPageArchiveDataOnDemand.setThing(ThingPageArchive obj, int index) {
-        Long thing = new Integer(index).longValue();
-        obj.setThing(thing);
-    }
-    
-    public ThingPageArchive ThingPageArchiveDataOnDemand.getSpecificThingPageArchive(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        ThingPageArchive obj = data.get(index);
-        Long id = obj.getId();
-        return ThingPageArchive.findThingPageArchive(id);
-    }
-    
-    public ThingPageArchive ThingPageArchiveDataOnDemand.getRandomThingPageArchive() {
-        init();
-        ThingPageArchive obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return ThingPageArchive.findThingPageArchive(id);
-    }
-    
-    public boolean ThingPageArchiveDataOnDemand.modifyThingPageArchive(ThingPageArchive obj) {
-        return false;
-    }
-    
-    public void ThingPageArchiveDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = ThingPageArchive.findThingPageArchiveEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ThingPageArchive' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<ThingPageArchive>();
-        for (int i = 0; i < 10; i++) {
-            ThingPageArchive obj = getNewTransientThingPageArchive(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveIntegrationTest.java
index dfeeabcbf..499db5036 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = ThingPageArchive.class)
 public class ThingPageArchiveIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ThingPageArchiveDataOnDemand dod;
+
+	@Test
+    public void testCountThingPageArchives() {
+        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to initialize correctly", dod.getRandomThingPageArchive());
+        long count = ThingPageArchive.countThingPageArchives();
+        Assert.assertTrue("Counter for 'ThingPageArchive' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindThingPageArchive() {
+        ThingPageArchive obj = dod.getRandomThingPageArchive();
+        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to provide an identifier", id);
+        obj = ThingPageArchive.findThingPageArchive(id);
+        Assert.assertNotNull("Find method for 'ThingPageArchive' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'ThingPageArchive' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllThingPageArchives() {
+        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to initialize correctly", dod.getRandomThingPageArchive());
+        long count = ThingPageArchive.countThingPageArchives();
+        Assert.assertTrue("Too expensive to perform a find all test for 'ThingPageArchive', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<ThingPageArchive> result = ThingPageArchive.findAllThingPageArchives();
+        Assert.assertNotNull("Find all method for 'ThingPageArchive' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'ThingPageArchive' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindThingPageArchiveEntries() {
+        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to initialize correctly", dod.getRandomThingPageArchive());
+        long count = ThingPageArchive.countThingPageArchives();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<ThingPageArchive> result = ThingPageArchive.findThingPageArchiveEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'ThingPageArchive' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'ThingPageArchive' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        ThingPageArchive obj = dod.getRandomThingPageArchive();
+        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to provide an identifier", id);
+        obj = ThingPageArchive.findThingPageArchive(id);
+        Assert.assertNotNull("Find method for 'ThingPageArchive' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyThingPageArchive(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'ThingPageArchive' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        ThingPageArchive obj = dod.getRandomThingPageArchive();
+        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to provide an identifier", id);
+        obj = ThingPageArchive.findThingPageArchive(id);
+        boolean modified =  dod.modifyThingPageArchive(obj);
+        Integer currentVersion = obj.getVersion();
+        ThingPageArchive merged = obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'ThingPageArchive' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to initialize correctly", dod.getRandomThingPageArchive());
+        ThingPageArchive obj = dod.getNewTransientThingPageArchive(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'ThingPageArchive' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'ThingPageArchive' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        ThingPageArchive obj = dod.getRandomThingPageArchive();
+        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to provide an identifier", id);
+        obj = ThingPageArchive.findThingPageArchive(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'ThingPageArchive' with identifier '" + id + "'", ThingPageArchive.findThingPageArchive(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 60a435701..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingPageArchiveIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ThingPageArchiveIntegrationTest_Roo_Configurable {
-    
-    declare @type: ThingPageArchiveIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index bc718bbb0..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingPageArchive;
-import com.labsynch.labseer.domain.ThingPageArchiveDataOnDemand;
-import com.labsynch.labseer.domain.ThingPageArchiveIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ThingPageArchiveIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ThingPageArchiveIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ThingPageArchiveIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ThingPageArchiveIntegrationTest: @Transactional;
-    
-    @Autowired
-    ThingPageArchiveDataOnDemand ThingPageArchiveIntegrationTest.dod;
-    
-    @Test
-    public void ThingPageArchiveIntegrationTest.testCountThingPageArchives() {
-        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to initialize correctly", dod.getRandomThingPageArchive());
-        long count = ThingPageArchive.countThingPageArchives();
-        Assert.assertTrue("Counter for 'ThingPageArchive' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ThingPageArchiveIntegrationTest.testFindThingPageArchive() {
-        ThingPageArchive obj = dod.getRandomThingPageArchive();
-        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to provide an identifier", id);
-        obj = ThingPageArchive.findThingPageArchive(id);
-        Assert.assertNotNull("Find method for 'ThingPageArchive' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ThingPageArchive' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ThingPageArchiveIntegrationTest.testFindAllThingPageArchives() {
-        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to initialize correctly", dod.getRandomThingPageArchive());
-        long count = ThingPageArchive.countThingPageArchives();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ThingPageArchive', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<ThingPageArchive> result = ThingPageArchive.findAllThingPageArchives();
-        Assert.assertNotNull("Find all method for 'ThingPageArchive' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ThingPageArchive' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ThingPageArchiveIntegrationTest.testFindThingPageArchiveEntries() {
-        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to initialize correctly", dod.getRandomThingPageArchive());
-        long count = ThingPageArchive.countThingPageArchives();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<ThingPageArchive> result = ThingPageArchive.findThingPageArchiveEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'ThingPageArchive' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ThingPageArchive' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ThingPageArchiveIntegrationTest.testFlush() {
-        ThingPageArchive obj = dod.getRandomThingPageArchive();
-        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to provide an identifier", id);
-        obj = ThingPageArchive.findThingPageArchive(id);
-        Assert.assertNotNull("Find method for 'ThingPageArchive' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyThingPageArchive(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'ThingPageArchive' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ThingPageArchiveIntegrationTest.testMergeUpdate() {
-        ThingPageArchive obj = dod.getRandomThingPageArchive();
-        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to provide an identifier", id);
-        obj = ThingPageArchive.findThingPageArchive(id);
-        boolean modified =  dod.modifyThingPageArchive(obj);
-        Integer currentVersion = obj.getVersion();
-        ThingPageArchive merged = obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ThingPageArchive' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ThingPageArchiveIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to initialize correctly", dod.getRandomThingPageArchive());
-        ThingPageArchive obj = dod.getNewTransientThingPageArchive(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'ThingPageArchive' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'ThingPageArchive' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ThingPageArchiveIntegrationTest.testRemove() {
-        ThingPageArchive obj = dod.getRandomThingPageArchive();
-        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to provide an identifier", id);
-        obj = ThingPageArchive.findThingPageArchive(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'ThingPageArchive' with identifier '" + id + "'", ThingPageArchive.findThingPageArchive(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingPageDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ThingPageDataOnDemand.java
index 822b14b60..ed8dfb014 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingPageDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingPageDataOnDemand.java
@@ -1,7 +1,159 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Configurable
+@Component
 @RooDataOnDemand(entity = ThingPage.class)
 public class ThingPageDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<ThingPage> data;
+
+	@Autowired
+    LsTransactionDataOnDemand lsTransactionDataOnDemand;
+
+	public ThingPage getNewTransientThingPage(int index) {
+        ThingPage obj = new ThingPage();
+        setArchived(obj, index);
+        setCurrentEditor(obj, index);
+        setIgnored(obj, index);
+        setModifiedBy(obj, index);
+        setModifiedDate(obj, index);
+        setPageContent(obj, index);
+        setPageName(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        setThing(obj, index);
+        return obj;
+    }
+
+	public void setArchived(ThingPage obj, int index) {
+        Boolean archived = true;
+        obj.setArchived(archived);
+    }
+
+	public void setCurrentEditor(ThingPage obj, int index) {
+        String currentEditor = "currentEditor_" + index;
+        if (currentEditor.length() > 255) {
+            currentEditor = currentEditor.substring(0, 255);
+        }
+        obj.setCurrentEditor(currentEditor);
+    }
+
+	public void setIgnored(ThingPage obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setModifiedBy(ThingPage obj, int index) {
+        String modifiedBy = "modifiedBy_" + index;
+        if (modifiedBy.length() > 255) {
+            modifiedBy = modifiedBy.substring(0, 255);
+        }
+        obj.setModifiedBy(modifiedBy);
+    }
+
+	public void setModifiedDate(ThingPage obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setPageContent(ThingPage obj, int index) {
+        String pageContent = "pageContent_" + index;
+        obj.setPageContent(pageContent);
+    }
+
+	public void setPageName(ThingPage obj, int index) {
+        String pageName = "pageName_" + index;
+        if (pageName.length() > 255) {
+            pageName = pageName.substring(0, 255);
+        }
+        obj.setPageName(pageName);
+    }
+
+	public void setRecordedBy(ThingPage obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(ThingPage obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public void setThing(ThingPage obj, int index) {
+        AbstractThing thing = null;
+        obj.setThing(thing);
+    }
+
+	public ThingPage getSpecificThingPage(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        ThingPage obj = data.get(index);
+        Long id = obj.getId();
+        return ThingPage.findThingPage(id);
+    }
+
+	public ThingPage getRandomThingPage() {
+        init();
+        ThingPage obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return ThingPage.findThingPage(id);
+    }
+
+	public boolean modifyThingPage(ThingPage obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = ThingPage.findThingPageEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'ThingPage' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<ThingPage>();
+        for (int i = 0; i < 10; i++) {
+            ThingPage obj = getNewTransientThingPage(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingPageDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ThingPageDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 36965fddd..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ThingPageDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingPageDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ThingPageDataOnDemand_Roo_Configurable {
-    
-    declare @type: ThingPageDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingPageDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ThingPageDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index b1fd8b38c..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ThingPageDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,164 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.AbstractThing;
-import com.labsynch.labseer.domain.LsTransactionDataOnDemand;
-import com.labsynch.labseer.domain.ThingPage;
-import com.labsynch.labseer.domain.ThingPageDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect ThingPageDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ThingPageDataOnDemand: @Component;
-    
-    private Random ThingPageDataOnDemand.rnd = new SecureRandom();
-    
-    private List<ThingPage> ThingPageDataOnDemand.data;
-    
-    @Autowired
-    LsTransactionDataOnDemand ThingPageDataOnDemand.lsTransactionDataOnDemand;
-    
-    public ThingPage ThingPageDataOnDemand.getNewTransientThingPage(int index) {
-        ThingPage obj = new ThingPage();
-        setArchived(obj, index);
-        setCurrentEditor(obj, index);
-        setIgnored(obj, index);
-        setModifiedBy(obj, index);
-        setModifiedDate(obj, index);
-        setPageContent(obj, index);
-        setPageName(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        setThing(obj, index);
-        return obj;
-    }
-    
-    public void ThingPageDataOnDemand.setArchived(ThingPage obj, int index) {
-        Boolean archived = true;
-        obj.setArchived(archived);
-    }
-    
-    public void ThingPageDataOnDemand.setCurrentEditor(ThingPage obj, int index) {
-        String currentEditor = "currentEditor_" + index;
-        if (currentEditor.length() > 255) {
-            currentEditor = currentEditor.substring(0, 255);
-        }
-        obj.setCurrentEditor(currentEditor);
-    }
-    
-    public void ThingPageDataOnDemand.setIgnored(ThingPage obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void ThingPageDataOnDemand.setModifiedBy(ThingPage obj, int index) {
-        String modifiedBy = "modifiedBy_" + index;
-        if (modifiedBy.length() > 255) {
-            modifiedBy = modifiedBy.substring(0, 255);
-        }
-        obj.setModifiedBy(modifiedBy);
-    }
-    
-    public void ThingPageDataOnDemand.setModifiedDate(ThingPage obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void ThingPageDataOnDemand.setPageContent(ThingPage obj, int index) {
-        String pageContent = "pageContent_" + index;
-        obj.setPageContent(pageContent);
-    }
-    
-    public void ThingPageDataOnDemand.setPageName(ThingPage obj, int index) {
-        String pageName = "pageName_" + index;
-        if (pageName.length() > 255) {
-            pageName = pageName.substring(0, 255);
-        }
-        obj.setPageName(pageName);
-    }
-    
-    public void ThingPageDataOnDemand.setRecordedBy(ThingPage obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void ThingPageDataOnDemand.setRecordedDate(ThingPage obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public void ThingPageDataOnDemand.setThing(ThingPage obj, int index) {
-        AbstractThing thing = null;
-        obj.setThing(thing);
-    }
-    
-    public ThingPage ThingPageDataOnDemand.getSpecificThingPage(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        ThingPage obj = data.get(index);
-        Long id = obj.getId();
-        return ThingPage.findThingPage(id);
-    }
-    
-    public ThingPage ThingPageDataOnDemand.getRandomThingPage() {
-        init();
-        ThingPage obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return ThingPage.findThingPage(id);
-    }
-    
-    public boolean ThingPageDataOnDemand.modifyThingPage(ThingPage obj) {
-        return false;
-    }
-    
-    public void ThingPageDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = ThingPage.findThingPageEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ThingPage' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<ThingPage>();
-        for (int i = 0; i < 10; i++) {
-            ThingPage obj = getNewTransientThingPage(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingPageIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ThingPageIntegrationTest.java
index 9db45f9a9..7ddbe340b 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingPageIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingPageIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
+@Configurable
 @RooIntegrationTest(entity = ThingPage.class)
 public class ThingPageIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ThingPageDataOnDemand dod;
+
+	@Test
+    public void testCountThingPages() {
+        Assert.assertNotNull("Data on demand for 'ThingPage' failed to initialize correctly", dod.getRandomThingPage());
+        long count = ThingPage.countThingPages();
+        Assert.assertTrue("Counter for 'ThingPage' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindThingPage() {
+        ThingPage obj = dod.getRandomThingPage();
+        Assert.assertNotNull("Data on demand for 'ThingPage' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ThingPage' failed to provide an identifier", id);
+        obj = ThingPage.findThingPage(id);
+        Assert.assertNotNull("Find method for 'ThingPage' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'ThingPage' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllThingPages() {
+        Assert.assertNotNull("Data on demand for 'ThingPage' failed to initialize correctly", dod.getRandomThingPage());
+        long count = ThingPage.countThingPages();
+        Assert.assertTrue("Too expensive to perform a find all test for 'ThingPage', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<ThingPage> result = ThingPage.findAllThingPages();
+        Assert.assertNotNull("Find all method for 'ThingPage' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'ThingPage' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindThingPageEntries() {
+        Assert.assertNotNull("Data on demand for 'ThingPage' failed to initialize correctly", dod.getRandomThingPage());
+        long count = ThingPage.countThingPages();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<ThingPage> result = ThingPage.findThingPageEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'ThingPage' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'ThingPage' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        ThingPage obj = dod.getRandomThingPage();
+        Assert.assertNotNull("Data on demand for 'ThingPage' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ThingPage' failed to provide an identifier", id);
+        obj = ThingPage.findThingPage(id);
+        Assert.assertNotNull("Find method for 'ThingPage' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyThingPage(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'ThingPage' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        ThingPage obj = dod.getRandomThingPage();
+        Assert.assertNotNull("Data on demand for 'ThingPage' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ThingPage' failed to provide an identifier", id);
+        obj = ThingPage.findThingPage(id);
+        boolean modified =  dod.modifyThingPage(obj);
+        Integer currentVersion = obj.getVersion();
+        ThingPage merged = obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'ThingPage' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'ThingPage' failed to initialize correctly", dod.getRandomThingPage());
+        ThingPage obj = dod.getNewTransientThingPage(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'ThingPage' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'ThingPage' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'ThingPage' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        ThingPage obj = dod.getRandomThingPage();
+        Assert.assertNotNull("Data on demand for 'ThingPage' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ThingPage' failed to provide an identifier", id);
+        obj = ThingPage.findThingPage(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'ThingPage' with identifier '" + id + "'", ThingPage.findThingPage(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingPageIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ThingPageIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 23b98e34e..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ThingPageIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingPageIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ThingPageIntegrationTest_Roo_Configurable {
-    
-    declare @type: ThingPageIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingPageIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ThingPageIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 304eb7204..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ThingPageIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingPage;
-import com.labsynch.labseer.domain.ThingPageDataOnDemand;
-import com.labsynch.labseer.domain.ThingPageIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ThingPageIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ThingPageIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ThingPageIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ThingPageIntegrationTest: @Transactional;
-    
-    @Autowired
-    ThingPageDataOnDemand ThingPageIntegrationTest.dod;
-    
-    @Test
-    public void ThingPageIntegrationTest.testCountThingPages() {
-        Assert.assertNotNull("Data on demand for 'ThingPage' failed to initialize correctly", dod.getRandomThingPage());
-        long count = ThingPage.countThingPages();
-        Assert.assertTrue("Counter for 'ThingPage' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ThingPageIntegrationTest.testFindThingPage() {
-        ThingPage obj = dod.getRandomThingPage();
-        Assert.assertNotNull("Data on demand for 'ThingPage' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ThingPage' failed to provide an identifier", id);
-        obj = ThingPage.findThingPage(id);
-        Assert.assertNotNull("Find method for 'ThingPage' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ThingPage' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ThingPageIntegrationTest.testFindAllThingPages() {
-        Assert.assertNotNull("Data on demand for 'ThingPage' failed to initialize correctly", dod.getRandomThingPage());
-        long count = ThingPage.countThingPages();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ThingPage', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<ThingPage> result = ThingPage.findAllThingPages();
-        Assert.assertNotNull("Find all method for 'ThingPage' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ThingPage' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ThingPageIntegrationTest.testFindThingPageEntries() {
-        Assert.assertNotNull("Data on demand for 'ThingPage' failed to initialize correctly", dod.getRandomThingPage());
-        long count = ThingPage.countThingPages();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<ThingPage> result = ThingPage.findThingPageEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'ThingPage' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ThingPage' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ThingPageIntegrationTest.testFlush() {
-        ThingPage obj = dod.getRandomThingPage();
-        Assert.assertNotNull("Data on demand for 'ThingPage' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ThingPage' failed to provide an identifier", id);
-        obj = ThingPage.findThingPage(id);
-        Assert.assertNotNull("Find method for 'ThingPage' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyThingPage(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'ThingPage' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ThingPageIntegrationTest.testMergeUpdate() {
-        ThingPage obj = dod.getRandomThingPage();
-        Assert.assertNotNull("Data on demand for 'ThingPage' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ThingPage' failed to provide an identifier", id);
-        obj = ThingPage.findThingPage(id);
-        boolean modified =  dod.modifyThingPage(obj);
-        Integer currentVersion = obj.getVersion();
-        ThingPage merged = obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ThingPage' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ThingPageIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'ThingPage' failed to initialize correctly", dod.getRandomThingPage());
-        ThingPage obj = dod.getNewTransientThingPage(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ThingPage' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'ThingPage' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'ThingPage' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ThingPageIntegrationTest.testRemove() {
-        ThingPage obj = dod.getRandomThingPage();
-        Assert.assertNotNull("Data on demand for 'ThingPage' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ThingPage' failed to provide an identifier", id);
-        obj = ThingPage.findThingPage(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'ThingPage' with identifier '" + id + "'", ThingPage.findThingPage(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ThingTypeDataOnDemand.java
index 84c90f640..920111c15 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingTypeDataOnDemand.java
@@ -1,7 +1,89 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Component
+@Configurable
 @RooDataOnDemand(entity = ThingType.class)
 public class ThingTypeDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<ThingType> data;
+
+	public ThingType getNewTransientThingType(int index) {
+        ThingType obj = new ThingType();
+        setTypeName(obj, index);
+        return obj;
+    }
+
+	public void setTypeName(ThingType obj, int index) {
+        String typeName = "typeName_" + index;
+        if (typeName.length() > 128) {
+            typeName = new Random().nextInt(10) + typeName.substring(1, 128);
+        }
+        obj.setTypeName(typeName);
+    }
+
+	public ThingType getSpecificThingType(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        ThingType obj = data.get(index);
+        Long id = obj.getId();
+        return ThingType.findThingType(id);
+    }
+
+	public ThingType getRandomThingType() {
+        init();
+        ThingType obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return ThingType.findThingType(id);
+    }
+
+	public boolean modifyThingType(ThingType obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = ThingType.findThingTypeEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'ThingType' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<ThingType>();
+        for (int i = 0; i < 10; i++) {
+            ThingType obj = getNewTransientThingType(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingTypeDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ThingTypeDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index e7d94437a..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ThingTypeDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingTypeDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ThingTypeDataOnDemand_Roo_Configurable {
-    
-    declare @type: ThingTypeDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingTypeDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ThingTypeDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index e1c15debd..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ThingTypeDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,92 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingType;
-import com.labsynch.labseer.domain.ThingTypeDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.stereotype.Component;
-
-privileged aspect ThingTypeDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ThingTypeDataOnDemand: @Component;
-    
-    private Random ThingTypeDataOnDemand.rnd = new SecureRandom();
-    
-    private List<ThingType> ThingTypeDataOnDemand.data;
-    
-    public ThingType ThingTypeDataOnDemand.getNewTransientThingType(int index) {
-        ThingType obj = new ThingType();
-        setTypeName(obj, index);
-        return obj;
-    }
-    
-    public void ThingTypeDataOnDemand.setTypeName(ThingType obj, int index) {
-        String typeName = "typeName_" + index;
-        if (typeName.length() > 128) {
-            typeName = new Random().nextInt(10) + typeName.substring(1, 128);
-        }
-        obj.setTypeName(typeName);
-    }
-    
-    public ThingType ThingTypeDataOnDemand.getSpecificThingType(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        ThingType obj = data.get(index);
-        Long id = obj.getId();
-        return ThingType.findThingType(id);
-    }
-    
-    public ThingType ThingTypeDataOnDemand.getRandomThingType() {
-        init();
-        ThingType obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return ThingType.findThingType(id);
-    }
-    
-    public boolean ThingTypeDataOnDemand.modifyThingType(ThingType obj) {
-        return false;
-    }
-    
-    public void ThingTypeDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = ThingType.findThingTypeEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ThingType' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<ThingType>();
-        for (int i = 0; i < 10; i++) {
-            ThingType obj = getNewTransientThingType(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ThingTypeIntegrationTest.java
index 9ba08f361..0a3f224f3 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingTypeIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
+@Configurable
 @RooIntegrationTest(entity = ThingType.class)
 public class ThingTypeIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ThingTypeDataOnDemand dod;
+
+	@Test
+    public void testCountThingTypes() {
+        Assert.assertNotNull("Data on demand for 'ThingType' failed to initialize correctly", dod.getRandomThingType());
+        long count = ThingType.countThingTypes();
+        Assert.assertTrue("Counter for 'ThingType' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindThingType() {
+        ThingType obj = dod.getRandomThingType();
+        Assert.assertNotNull("Data on demand for 'ThingType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ThingType' failed to provide an identifier", id);
+        obj = ThingType.findThingType(id);
+        Assert.assertNotNull("Find method for 'ThingType' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'ThingType' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllThingTypes() {
+        Assert.assertNotNull("Data on demand for 'ThingType' failed to initialize correctly", dod.getRandomThingType());
+        long count = ThingType.countThingTypes();
+        Assert.assertTrue("Too expensive to perform a find all test for 'ThingType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<ThingType> result = ThingType.findAllThingTypes();
+        Assert.assertNotNull("Find all method for 'ThingType' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'ThingType' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindThingTypeEntries() {
+        Assert.assertNotNull("Data on demand for 'ThingType' failed to initialize correctly", dod.getRandomThingType());
+        long count = ThingType.countThingTypes();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<ThingType> result = ThingType.findThingTypeEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'ThingType' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'ThingType' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        ThingType obj = dod.getRandomThingType();
+        Assert.assertNotNull("Data on demand for 'ThingType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ThingType' failed to provide an identifier", id);
+        obj = ThingType.findThingType(id);
+        Assert.assertNotNull("Find method for 'ThingType' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyThingType(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'ThingType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        ThingType obj = dod.getRandomThingType();
+        Assert.assertNotNull("Data on demand for 'ThingType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ThingType' failed to provide an identifier", id);
+        obj = ThingType.findThingType(id);
+        boolean modified =  dod.modifyThingType(obj);
+        Integer currentVersion = obj.getVersion();
+        ThingType merged = obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'ThingType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'ThingType' failed to initialize correctly", dod.getRandomThingType());
+        ThingType obj = dod.getNewTransientThingType(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'ThingType' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'ThingType' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'ThingType' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        ThingType obj = dod.getRandomThingType();
+        Assert.assertNotNull("Data on demand for 'ThingType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ThingType' failed to provide an identifier", id);
+        obj = ThingType.findThingType(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'ThingType' with identifier '" + id + "'", ThingType.findThingType(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingTypeIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ThingTypeIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 9d026c685..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ThingTypeIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingTypeIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ThingTypeIntegrationTest_Roo_Configurable {
-    
-    declare @type: ThingTypeIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingTypeIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ThingTypeIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 17392355b..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ThingTypeIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ThingType;
-import com.labsynch.labseer.domain.ThingTypeDataOnDemand;
-import com.labsynch.labseer.domain.ThingTypeIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ThingTypeIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ThingTypeIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ThingTypeIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ThingTypeIntegrationTest: @Transactional;
-    
-    @Autowired
-    ThingTypeDataOnDemand ThingTypeIntegrationTest.dod;
-    
-    @Test
-    public void ThingTypeIntegrationTest.testCountThingTypes() {
-        Assert.assertNotNull("Data on demand for 'ThingType' failed to initialize correctly", dod.getRandomThingType());
-        long count = ThingType.countThingTypes();
-        Assert.assertTrue("Counter for 'ThingType' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ThingTypeIntegrationTest.testFindThingType() {
-        ThingType obj = dod.getRandomThingType();
-        Assert.assertNotNull("Data on demand for 'ThingType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ThingType' failed to provide an identifier", id);
-        obj = ThingType.findThingType(id);
-        Assert.assertNotNull("Find method for 'ThingType' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ThingType' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ThingTypeIntegrationTest.testFindAllThingTypes() {
-        Assert.assertNotNull("Data on demand for 'ThingType' failed to initialize correctly", dod.getRandomThingType());
-        long count = ThingType.countThingTypes();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ThingType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<ThingType> result = ThingType.findAllThingTypes();
-        Assert.assertNotNull("Find all method for 'ThingType' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ThingType' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ThingTypeIntegrationTest.testFindThingTypeEntries() {
-        Assert.assertNotNull("Data on demand for 'ThingType' failed to initialize correctly", dod.getRandomThingType());
-        long count = ThingType.countThingTypes();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<ThingType> result = ThingType.findThingTypeEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'ThingType' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ThingType' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ThingTypeIntegrationTest.testFlush() {
-        ThingType obj = dod.getRandomThingType();
-        Assert.assertNotNull("Data on demand for 'ThingType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ThingType' failed to provide an identifier", id);
-        obj = ThingType.findThingType(id);
-        Assert.assertNotNull("Find method for 'ThingType' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyThingType(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'ThingType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ThingTypeIntegrationTest.testMergeUpdate() {
-        ThingType obj = dod.getRandomThingType();
-        Assert.assertNotNull("Data on demand for 'ThingType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ThingType' failed to provide an identifier", id);
-        obj = ThingType.findThingType(id);
-        boolean modified =  dod.modifyThingType(obj);
-        Integer currentVersion = obj.getVersion();
-        ThingType merged = obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ThingType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ThingTypeIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'ThingType' failed to initialize correctly", dod.getRandomThingType());
-        ThingType obj = dod.getNewTransientThingType(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ThingType' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'ThingType' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'ThingType' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ThingTypeIntegrationTest.testRemove() {
-        ThingType obj = dod.getRandomThingType();
-        Assert.assertNotNull("Data on demand for 'ThingType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ThingType' failed to provide an identifier", id);
-        obj = ThingType.findThingType(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'ThingType' with identifier '" + id + "'", ThingType.findThingType(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupDataOnDemand.java
index 37ca3e096..23abcdb36 100755
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupDataOnDemand.java
@@ -1,7 +1,167 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Configurable
+@Component
 @RooDataOnDemand(entity = TreatmentGroup.class)
 public class TreatmentGroupDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<TreatmentGroup> data;
+
+	public TreatmentGroup getNewTransientTreatmentGroup(int index) {
+        TreatmentGroup obj = new TreatmentGroup();
+        setCodeName(obj, index);
+        setDeleted(obj, index);
+        setIgnored(obj, index);
+        setLsKind(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedBy(obj, index);
+        setModifiedDate(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        return obj;
+    }
+
+	public void setCodeName(TreatmentGroup obj, int index) {
+        String codeName = "codeName_" + index;
+        if (codeName.length() > 255) {
+            codeName = new Random().nextInt(10) + codeName.substring(1, 255);
+        }
+        obj.setCodeName(codeName);
+    }
+
+	public void setDeleted(TreatmentGroup obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setIgnored(TreatmentGroup obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setLsKind(TreatmentGroup obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsTransaction(TreatmentGroup obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(TreatmentGroup obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 255) {
+            lsType = lsType.substring(0, 255);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(TreatmentGroup obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedBy(TreatmentGroup obj, int index) {
+        String modifiedBy = "modifiedBy_" + index;
+        if (modifiedBy.length() > 255) {
+            modifiedBy = modifiedBy.substring(0, 255);
+        }
+        obj.setModifiedBy(modifiedBy);
+    }
+
+	public void setModifiedDate(TreatmentGroup obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setRecordedBy(TreatmentGroup obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(TreatmentGroup obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public TreatmentGroup getSpecificTreatmentGroup(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        TreatmentGroup obj = data.get(index);
+        Long id = obj.getId();
+        return TreatmentGroup.findTreatmentGroup(id);
+    }
+
+	public TreatmentGroup getRandomTreatmentGroup() {
+        init();
+        TreatmentGroup obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return TreatmentGroup.findTreatmentGroup(id);
+    }
+
+	public boolean modifyTreatmentGroup(TreatmentGroup obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = TreatmentGroup.findTreatmentGroupEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'TreatmentGroup' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<TreatmentGroup>();
+        for (int i = 0; i < 10; i++) {
+            TreatmentGroup obj = getNewTransientTreatmentGroup(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 64fc7b415..000000000
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroupDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect TreatmentGroupDataOnDemand_Roo_Configurable {
-    
-    declare @type: TreatmentGroupDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 87def73af..000000000
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,170 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.domain.TreatmentGroupDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.stereotype.Component;
-
-privileged aspect TreatmentGroupDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: TreatmentGroupDataOnDemand: @Component;
-    
-    private Random TreatmentGroupDataOnDemand.rnd = new SecureRandom();
-    
-    private List<TreatmentGroup> TreatmentGroupDataOnDemand.data;
-    
-    public TreatmentGroup TreatmentGroupDataOnDemand.getNewTransientTreatmentGroup(int index) {
-        TreatmentGroup obj = new TreatmentGroup();
-        setCodeName(obj, index);
-        setDeleted(obj, index);
-        setIgnored(obj, index);
-        setLsKind(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedBy(obj, index);
-        setModifiedDate(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        return obj;
-    }
-    
-    public void TreatmentGroupDataOnDemand.setCodeName(TreatmentGroup obj, int index) {
-        String codeName = "codeName_" + index;
-        if (codeName.length() > 255) {
-            codeName = new Random().nextInt(10) + codeName.substring(1, 255);
-        }
-        obj.setCodeName(codeName);
-    }
-    
-    public void TreatmentGroupDataOnDemand.setDeleted(TreatmentGroup obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void TreatmentGroupDataOnDemand.setIgnored(TreatmentGroup obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void TreatmentGroupDataOnDemand.setLsKind(TreatmentGroup obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void TreatmentGroupDataOnDemand.setLsTransaction(TreatmentGroup obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void TreatmentGroupDataOnDemand.setLsType(TreatmentGroup obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 255) {
-            lsType = lsType.substring(0, 255);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void TreatmentGroupDataOnDemand.setLsTypeAndKind(TreatmentGroup obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void TreatmentGroupDataOnDemand.setModifiedBy(TreatmentGroup obj, int index) {
-        String modifiedBy = "modifiedBy_" + index;
-        if (modifiedBy.length() > 255) {
-            modifiedBy = modifiedBy.substring(0, 255);
-        }
-        obj.setModifiedBy(modifiedBy);
-    }
-    
-    public void TreatmentGroupDataOnDemand.setModifiedDate(TreatmentGroup obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void TreatmentGroupDataOnDemand.setRecordedBy(TreatmentGroup obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void TreatmentGroupDataOnDemand.setRecordedDate(TreatmentGroup obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public TreatmentGroup TreatmentGroupDataOnDemand.getSpecificTreatmentGroup(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        TreatmentGroup obj = data.get(index);
-        Long id = obj.getId();
-        return TreatmentGroup.findTreatmentGroup(id);
-    }
-    
-    public TreatmentGroup TreatmentGroupDataOnDemand.getRandomTreatmentGroup() {
-        init();
-        TreatmentGroup obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return TreatmentGroup.findTreatmentGroup(id);
-    }
-    
-    public boolean TreatmentGroupDataOnDemand.modifyTreatmentGroup(TreatmentGroup obj) {
-        return false;
-    }
-    
-    public void TreatmentGroupDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = TreatmentGroup.findTreatmentGroupEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'TreatmentGroup' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<TreatmentGroup>();
-        for (int i = 0; i < 10; i++) {
-            TreatmentGroup obj = getNewTransientTreatmentGroup(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupIntegrationTest.java
index 270b6b1b4..e77d03d26 100755
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = TreatmentGroup.class)
 public class TreatmentGroupIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    TreatmentGroupDataOnDemand dod;
+
+	@Test
+    public void testCountTreatmentGroups() {
+        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to initialize correctly", dod.getRandomTreatmentGroup());
+        long count = TreatmentGroup.countTreatmentGroups();
+        Assert.assertTrue("Counter for 'TreatmentGroup' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindTreatmentGroup() {
+        TreatmentGroup obj = dod.getRandomTreatmentGroup();
+        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to provide an identifier", id);
+        obj = TreatmentGroup.findTreatmentGroup(id);
+        Assert.assertNotNull("Find method for 'TreatmentGroup' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'TreatmentGroup' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllTreatmentGroups() {
+        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to initialize correctly", dod.getRandomTreatmentGroup());
+        long count = TreatmentGroup.countTreatmentGroups();
+        Assert.assertTrue("Too expensive to perform a find all test for 'TreatmentGroup', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<TreatmentGroup> result = TreatmentGroup.findAllTreatmentGroups();
+        Assert.assertNotNull("Find all method for 'TreatmentGroup' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'TreatmentGroup' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindTreatmentGroupEntries() {
+        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to initialize correctly", dod.getRandomTreatmentGroup());
+        long count = TreatmentGroup.countTreatmentGroups();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<TreatmentGroup> result = TreatmentGroup.findTreatmentGroupEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'TreatmentGroup' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'TreatmentGroup' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        TreatmentGroup obj = dod.getRandomTreatmentGroup();
+        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to provide an identifier", id);
+        obj = TreatmentGroup.findTreatmentGroup(id);
+        Assert.assertNotNull("Find method for 'TreatmentGroup' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyTreatmentGroup(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'TreatmentGroup' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        TreatmentGroup obj = dod.getRandomTreatmentGroup();
+        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to provide an identifier", id);
+        obj = TreatmentGroup.findTreatmentGroup(id);
+        boolean modified =  dod.modifyTreatmentGroup(obj);
+        Integer currentVersion = obj.getVersion();
+        TreatmentGroup merged = (TreatmentGroup)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'TreatmentGroup' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to initialize correctly", dod.getRandomTreatmentGroup());
+        TreatmentGroup obj = dod.getNewTransientTreatmentGroup(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'TreatmentGroup' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'TreatmentGroup' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        TreatmentGroup obj = dod.getRandomTreatmentGroup();
+        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to provide an identifier", id);
+        obj = TreatmentGroup.findTreatmentGroup(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'TreatmentGroup' with identifier '" + id + "'", TreatmentGroup.findTreatmentGroup(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 231f39a1f..000000000
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroupIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect TreatmentGroupIntegrationTest_Roo_Configurable {
-    
-    declare @type: TreatmentGroupIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 3ba2107b2..000000000
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.domain.TreatmentGroupDataOnDemand;
-import com.labsynch.labseer.domain.TreatmentGroupIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect TreatmentGroupIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: TreatmentGroupIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: TreatmentGroupIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: TreatmentGroupIntegrationTest: @Transactional;
-    
-    @Autowired
-    TreatmentGroupDataOnDemand TreatmentGroupIntegrationTest.dod;
-    
-    @Test
-    public void TreatmentGroupIntegrationTest.testCountTreatmentGroups() {
-        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to initialize correctly", dod.getRandomTreatmentGroup());
-        long count = TreatmentGroup.countTreatmentGroups();
-        Assert.assertTrue("Counter for 'TreatmentGroup' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void TreatmentGroupIntegrationTest.testFindTreatmentGroup() {
-        TreatmentGroup obj = dod.getRandomTreatmentGroup();
-        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to provide an identifier", id);
-        obj = TreatmentGroup.findTreatmentGroup(id);
-        Assert.assertNotNull("Find method for 'TreatmentGroup' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'TreatmentGroup' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void TreatmentGroupIntegrationTest.testFindAllTreatmentGroups() {
-        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to initialize correctly", dod.getRandomTreatmentGroup());
-        long count = TreatmentGroup.countTreatmentGroups();
-        Assert.assertTrue("Too expensive to perform a find all test for 'TreatmentGroup', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<TreatmentGroup> result = TreatmentGroup.findAllTreatmentGroups();
-        Assert.assertNotNull("Find all method for 'TreatmentGroup' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'TreatmentGroup' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void TreatmentGroupIntegrationTest.testFindTreatmentGroupEntries() {
-        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to initialize correctly", dod.getRandomTreatmentGroup());
-        long count = TreatmentGroup.countTreatmentGroups();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<TreatmentGroup> result = TreatmentGroup.findTreatmentGroupEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'TreatmentGroup' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'TreatmentGroup' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void TreatmentGroupIntegrationTest.testFlush() {
-        TreatmentGroup obj = dod.getRandomTreatmentGroup();
-        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to provide an identifier", id);
-        obj = TreatmentGroup.findTreatmentGroup(id);
-        Assert.assertNotNull("Find method for 'TreatmentGroup' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyTreatmentGroup(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'TreatmentGroup' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void TreatmentGroupIntegrationTest.testMergeUpdate() {
-        TreatmentGroup obj = dod.getRandomTreatmentGroup();
-        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to provide an identifier", id);
-        obj = TreatmentGroup.findTreatmentGroup(id);
-        boolean modified =  dod.modifyTreatmentGroup(obj);
-        Integer currentVersion = obj.getVersion();
-        TreatmentGroup merged = (TreatmentGroup)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'TreatmentGroup' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void TreatmentGroupIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to initialize correctly", dod.getRandomTreatmentGroup());
-        TreatmentGroup obj = dod.getNewTransientTreatmentGroup(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'TreatmentGroup' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'TreatmentGroup' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void TreatmentGroupIntegrationTest.testRemove() {
-        TreatmentGroup obj = dod.getRandomTreatmentGroup();
-        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to provide an identifier", id);
-        obj = TreatmentGroup.findTreatmentGroup(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'TreatmentGroup' with identifier '" + id + "'", TreatmentGroup.findTreatmentGroup(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateDataOnDemand.java
index c66e7f02b..01d34f6de 100755
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateDataOnDemand.java
@@ -1,7 +1,177 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Configurable
+@Component
 @RooDataOnDemand(entity = TreatmentGroupState.class)
 public class TreatmentGroupStateDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<TreatmentGroupState> data;
+
+	@Autowired
+    TreatmentGroupDataOnDemand treatmentGroupDataOnDemand;
+
+	public TreatmentGroupState getNewTransientTreatmentGroupState(int index) {
+        TreatmentGroupState obj = new TreatmentGroupState();
+        setComments(obj, index);
+        setDeleted(obj, index);
+        setIgnored(obj, index);
+        setLsKind(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedBy(obj, index);
+        setModifiedDate(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        setTreatmentGroup(obj, index);
+        return obj;
+    }
+
+	public void setComments(TreatmentGroupState obj, int index) {
+        String comments = "comments_" + index;
+        if (comments.length() > 512) {
+            comments = comments.substring(0, 512);
+        }
+        obj.setComments(comments);
+    }
+
+	public void setDeleted(TreatmentGroupState obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setIgnored(TreatmentGroupState obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setLsKind(TreatmentGroupState obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsTransaction(TreatmentGroupState obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(TreatmentGroupState obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 64) {
+            lsType = lsType.substring(0, 64);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(TreatmentGroupState obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedBy(TreatmentGroupState obj, int index) {
+        String modifiedBy = "modifiedBy_" + index;
+        if (modifiedBy.length() > 255) {
+            modifiedBy = modifiedBy.substring(0, 255);
+        }
+        obj.setModifiedBy(modifiedBy);
+    }
+
+	public void setModifiedDate(TreatmentGroupState obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setRecordedBy(TreatmentGroupState obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(TreatmentGroupState obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public void setTreatmentGroup(TreatmentGroupState obj, int index) {
+        TreatmentGroup treatmentGroup = treatmentGroupDataOnDemand.getRandomTreatmentGroup();
+        obj.setTreatmentGroup(treatmentGroup);
+    }
+
+	public TreatmentGroupState getSpecificTreatmentGroupState(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        TreatmentGroupState obj = data.get(index);
+        Long id = obj.getId();
+        return TreatmentGroupState.findTreatmentGroupState(id);
+    }
+
+	public TreatmentGroupState getRandomTreatmentGroupState() {
+        init();
+        TreatmentGroupState obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return TreatmentGroupState.findTreatmentGroupState(id);
+    }
+
+	public boolean modifyTreatmentGroupState(TreatmentGroupState obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = TreatmentGroupState.findTreatmentGroupStateEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'TreatmentGroupState' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<TreatmentGroupState>();
+        for (int i = 0; i < 10; i++) {
+            TreatmentGroupState obj = getNewTransientTreatmentGroupState(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 87b0520a4..000000000
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroupStateDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect TreatmentGroupStateDataOnDemand_Roo_Configurable {
-    
-    declare @type: TreatmentGroupStateDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index c3a14a3fa..000000000
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,182 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.domain.TreatmentGroupDataOnDemand;
-import com.labsynch.labseer.domain.TreatmentGroupState;
-import com.labsynch.labseer.domain.TreatmentGroupStateDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect TreatmentGroupStateDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: TreatmentGroupStateDataOnDemand: @Component;
-    
-    private Random TreatmentGroupStateDataOnDemand.rnd = new SecureRandom();
-    
-    private List<TreatmentGroupState> TreatmentGroupStateDataOnDemand.data;
-    
-    @Autowired
-    TreatmentGroupDataOnDemand TreatmentGroupStateDataOnDemand.treatmentGroupDataOnDemand;
-    
-    public TreatmentGroupState TreatmentGroupStateDataOnDemand.getNewTransientTreatmentGroupState(int index) {
-        TreatmentGroupState obj = new TreatmentGroupState();
-        setComments(obj, index);
-        setDeleted(obj, index);
-        setIgnored(obj, index);
-        setLsKind(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedBy(obj, index);
-        setModifiedDate(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        setTreatmentGroup(obj, index);
-        return obj;
-    }
-    
-    public void TreatmentGroupStateDataOnDemand.setComments(TreatmentGroupState obj, int index) {
-        String comments = "comments_" + index;
-        if (comments.length() > 512) {
-            comments = comments.substring(0, 512);
-        }
-        obj.setComments(comments);
-    }
-    
-    public void TreatmentGroupStateDataOnDemand.setDeleted(TreatmentGroupState obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void TreatmentGroupStateDataOnDemand.setIgnored(TreatmentGroupState obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void TreatmentGroupStateDataOnDemand.setLsKind(TreatmentGroupState obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void TreatmentGroupStateDataOnDemand.setLsTransaction(TreatmentGroupState obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void TreatmentGroupStateDataOnDemand.setLsType(TreatmentGroupState obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 64) {
-            lsType = lsType.substring(0, 64);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void TreatmentGroupStateDataOnDemand.setLsTypeAndKind(TreatmentGroupState obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void TreatmentGroupStateDataOnDemand.setModifiedBy(TreatmentGroupState obj, int index) {
-        String modifiedBy = "modifiedBy_" + index;
-        if (modifiedBy.length() > 255) {
-            modifiedBy = modifiedBy.substring(0, 255);
-        }
-        obj.setModifiedBy(modifiedBy);
-    }
-    
-    public void TreatmentGroupStateDataOnDemand.setModifiedDate(TreatmentGroupState obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void TreatmentGroupStateDataOnDemand.setRecordedBy(TreatmentGroupState obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void TreatmentGroupStateDataOnDemand.setRecordedDate(TreatmentGroupState obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public void TreatmentGroupStateDataOnDemand.setTreatmentGroup(TreatmentGroupState obj, int index) {
-        TreatmentGroup treatmentGroup = treatmentGroupDataOnDemand.getRandomTreatmentGroup();
-        obj.setTreatmentGroup(treatmentGroup);
-    }
-    
-    public TreatmentGroupState TreatmentGroupStateDataOnDemand.getSpecificTreatmentGroupState(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        TreatmentGroupState obj = data.get(index);
-        Long id = obj.getId();
-        return TreatmentGroupState.findTreatmentGroupState(id);
-    }
-    
-    public TreatmentGroupState TreatmentGroupStateDataOnDemand.getRandomTreatmentGroupState() {
-        init();
-        TreatmentGroupState obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return TreatmentGroupState.findTreatmentGroupState(id);
-    }
-    
-    public boolean TreatmentGroupStateDataOnDemand.modifyTreatmentGroupState(TreatmentGroupState obj) {
-        return false;
-    }
-    
-    public void TreatmentGroupStateDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = TreatmentGroupState.findTreatmentGroupStateEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'TreatmentGroupState' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<TreatmentGroupState>();
-        for (int i = 0; i < 10; i++) {
-            TreatmentGroupState obj = getNewTransientTreatmentGroupState(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateIntegrationTest.java
index 422956f22..55d5888cc 100755
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
+@Configurable
 @RooIntegrationTest(entity = TreatmentGroupState.class)
 public class TreatmentGroupStateIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    TreatmentGroupStateDataOnDemand dod;
+
+	@Test
+    public void testCountTreatmentGroupStates() {
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to initialize correctly", dod.getRandomTreatmentGroupState());
+        long count = TreatmentGroupState.countTreatmentGroupStates();
+        Assert.assertTrue("Counter for 'TreatmentGroupState' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindTreatmentGroupState() {
+        TreatmentGroupState obj = dod.getRandomTreatmentGroupState();
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to provide an identifier", id);
+        obj = TreatmentGroupState.findTreatmentGroupState(id);
+        Assert.assertNotNull("Find method for 'TreatmentGroupState' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'TreatmentGroupState' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllTreatmentGroupStates() {
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to initialize correctly", dod.getRandomTreatmentGroupState());
+        long count = TreatmentGroupState.countTreatmentGroupStates();
+        Assert.assertTrue("Too expensive to perform a find all test for 'TreatmentGroupState', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<TreatmentGroupState> result = TreatmentGroupState.findAllTreatmentGroupStates();
+        Assert.assertNotNull("Find all method for 'TreatmentGroupState' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'TreatmentGroupState' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindTreatmentGroupStateEntries() {
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to initialize correctly", dod.getRandomTreatmentGroupState());
+        long count = TreatmentGroupState.countTreatmentGroupStates();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<TreatmentGroupState> result = TreatmentGroupState.findTreatmentGroupStateEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'TreatmentGroupState' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'TreatmentGroupState' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        TreatmentGroupState obj = dod.getRandomTreatmentGroupState();
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to provide an identifier", id);
+        obj = TreatmentGroupState.findTreatmentGroupState(id);
+        Assert.assertNotNull("Find method for 'TreatmentGroupState' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyTreatmentGroupState(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'TreatmentGroupState' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        TreatmentGroupState obj = dod.getRandomTreatmentGroupState();
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to provide an identifier", id);
+        obj = TreatmentGroupState.findTreatmentGroupState(id);
+        boolean modified =  dod.modifyTreatmentGroupState(obj);
+        Integer currentVersion = obj.getVersion();
+        TreatmentGroupState merged = (TreatmentGroupState)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'TreatmentGroupState' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to initialize correctly", dod.getRandomTreatmentGroupState());
+        TreatmentGroupState obj = dod.getNewTransientTreatmentGroupState(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'TreatmentGroupState' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'TreatmentGroupState' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        TreatmentGroupState obj = dod.getRandomTreatmentGroupState();
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to provide an identifier", id);
+        obj = TreatmentGroupState.findTreatmentGroupState(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'TreatmentGroupState' with identifier '" + id + "'", TreatmentGroupState.findTreatmentGroupState(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 13d7daf0d..000000000
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroupStateIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect TreatmentGroupStateIntegrationTest_Roo_Configurable {
-    
-    declare @type: TreatmentGroupStateIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 7f64c4b8d..000000000
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroupState;
-import com.labsynch.labseer.domain.TreatmentGroupStateDataOnDemand;
-import com.labsynch.labseer.domain.TreatmentGroupStateIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect TreatmentGroupStateIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: TreatmentGroupStateIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: TreatmentGroupStateIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: TreatmentGroupStateIntegrationTest: @Transactional;
-    
-    @Autowired
-    TreatmentGroupStateDataOnDemand TreatmentGroupStateIntegrationTest.dod;
-    
-    @Test
-    public void TreatmentGroupStateIntegrationTest.testCountTreatmentGroupStates() {
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to initialize correctly", dod.getRandomTreatmentGroupState());
-        long count = TreatmentGroupState.countTreatmentGroupStates();
-        Assert.assertTrue("Counter for 'TreatmentGroupState' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void TreatmentGroupStateIntegrationTest.testFindTreatmentGroupState() {
-        TreatmentGroupState obj = dod.getRandomTreatmentGroupState();
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to provide an identifier", id);
-        obj = TreatmentGroupState.findTreatmentGroupState(id);
-        Assert.assertNotNull("Find method for 'TreatmentGroupState' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'TreatmentGroupState' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void TreatmentGroupStateIntegrationTest.testFindAllTreatmentGroupStates() {
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to initialize correctly", dod.getRandomTreatmentGroupState());
-        long count = TreatmentGroupState.countTreatmentGroupStates();
-        Assert.assertTrue("Too expensive to perform a find all test for 'TreatmentGroupState', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<TreatmentGroupState> result = TreatmentGroupState.findAllTreatmentGroupStates();
-        Assert.assertNotNull("Find all method for 'TreatmentGroupState' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'TreatmentGroupState' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void TreatmentGroupStateIntegrationTest.testFindTreatmentGroupStateEntries() {
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to initialize correctly", dod.getRandomTreatmentGroupState());
-        long count = TreatmentGroupState.countTreatmentGroupStates();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<TreatmentGroupState> result = TreatmentGroupState.findTreatmentGroupStateEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'TreatmentGroupState' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'TreatmentGroupState' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void TreatmentGroupStateIntegrationTest.testFlush() {
-        TreatmentGroupState obj = dod.getRandomTreatmentGroupState();
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to provide an identifier", id);
-        obj = TreatmentGroupState.findTreatmentGroupState(id);
-        Assert.assertNotNull("Find method for 'TreatmentGroupState' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyTreatmentGroupState(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'TreatmentGroupState' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void TreatmentGroupStateIntegrationTest.testMergeUpdate() {
-        TreatmentGroupState obj = dod.getRandomTreatmentGroupState();
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to provide an identifier", id);
-        obj = TreatmentGroupState.findTreatmentGroupState(id);
-        boolean modified =  dod.modifyTreatmentGroupState(obj);
-        Integer currentVersion = obj.getVersion();
-        TreatmentGroupState merged = (TreatmentGroupState)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'TreatmentGroupState' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void TreatmentGroupStateIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to initialize correctly", dod.getRandomTreatmentGroupState());
-        TreatmentGroupState obj = dod.getNewTransientTreatmentGroupState(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'TreatmentGroupState' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'TreatmentGroupState' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void TreatmentGroupStateIntegrationTest.testRemove() {
-        TreatmentGroupState obj = dod.getRandomTreatmentGroupState();
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to provide an identifier", id);
-        obj = TreatmentGroupState.findTreatmentGroupState(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'TreatmentGroupState' with identifier '" + id + "'", TreatmentGroupState.findTreatmentGroupState(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueDataOnDemand.java
index c995507ec..cc71e1ad3 100755
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueDataOnDemand.java
@@ -1,7 +1,382 @@
 package com.labsynch.labseer.domain;
 
+import java.math.BigDecimal;
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Component
+@Configurable
 @RooDataOnDemand(entity = TreatmentGroupValue.class)
 public class TreatmentGroupValueDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<TreatmentGroupValue> data;
+
+	@Autowired
+    TreatmentGroupStateDataOnDemand treatmentGroupStateDataOnDemand;
+
+	public TreatmentGroupValue getNewTransientTreatmentGroupValue(int index) {
+        TreatmentGroupValue obj = new TreatmentGroupValue();
+        setBlobValue(obj, index);
+        setClobValue(obj, index);
+        setCodeKind(obj, index);
+        setCodeOrigin(obj, index);
+        setCodeType(obj, index);
+        setCodeTypeAndKind(obj, index);
+        setCodeValue(obj, index);
+        setComments(obj, index);
+        setConcUnit(obj, index);
+        setConcentration(obj, index);
+        setDateValue(obj, index);
+        setDeleted(obj, index);
+        setFileValue(obj, index);
+        setIgnored(obj, index);
+        setLsKind(obj, index);
+        setLsState(obj, index);
+        setLsTransaction(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        setModifiedBy(obj, index);
+        setModifiedDate(obj, index);
+        setNumberOfReplicates(obj, index);
+        setNumericValue(obj, index);
+        setOperatorKind(obj, index);
+        setOperatorType(obj, index);
+        setOperatorTypeAndKind(obj, index);
+        setPublicData(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        setSigFigs(obj, index);
+        setStringValue(obj, index);
+        setUncertainty(obj, index);
+        setUncertaintyType(obj, index);
+        setUnitKind(obj, index);
+        setUnitType(obj, index);
+        setUnitTypeAndKind(obj, index);
+        setUrlValue(obj, index);
+        return obj;
+    }
+
+	public void setBlobValue(TreatmentGroupValue obj, int index) {
+        byte[] blobValue = String.valueOf(index).getBytes();
+        obj.setBlobValue(blobValue);
+    }
+
+	public void setClobValue(TreatmentGroupValue obj, int index) {
+        String clobValue = "clobValue_" + index;
+        obj.setClobValue(clobValue);
+    }
+
+	public void setCodeKind(TreatmentGroupValue obj, int index) {
+        String codeKind = "codeKind_" + index;
+        if (codeKind.length() > 255) {
+            codeKind = codeKind.substring(0, 255);
+        }
+        obj.setCodeKind(codeKind);
+    }
+
+	public void setCodeOrigin(TreatmentGroupValue obj, int index) {
+        String codeOrigin = "codeOrigin_" + index;
+        if (codeOrigin.length() > 255) {
+            codeOrigin = codeOrigin.substring(0, 255);
+        }
+        obj.setCodeOrigin(codeOrigin);
+    }
+
+	public void setCodeType(TreatmentGroupValue obj, int index) {
+        String codeType = "codeType_" + index;
+        if (codeType.length() > 255) {
+            codeType = codeType.substring(0, 255);
+        }
+        obj.setCodeType(codeType);
+    }
+
+	public void setCodeTypeAndKind(TreatmentGroupValue obj, int index) {
+        String codeTypeAndKind = "codeTypeAndKind_" + index;
+        if (codeTypeAndKind.length() > 350) {
+            codeTypeAndKind = codeTypeAndKind.substring(0, 350);
+        }
+        obj.setCodeTypeAndKind(codeTypeAndKind);
+    }
+
+	public void setCodeValue(TreatmentGroupValue obj, int index) {
+        String codeValue = "codeValue_" + index;
+        if (codeValue.length() > 255) {
+            codeValue = codeValue.substring(0, 255);
+        }
+        obj.setCodeValue(codeValue);
+    }
+
+	public void setComments(TreatmentGroupValue obj, int index) {
+        String comments = "comments_" + index;
+        if (comments.length() > 512) {
+            comments = comments.substring(0, 512);
+        }
+        obj.setComments(comments);
+    }
+
+	public void setConcUnit(TreatmentGroupValue obj, int index) {
+        String concUnit = "concUnit_" + index;
+        if (concUnit.length() > 25) {
+            concUnit = concUnit.substring(0, 25);
+        }
+        obj.setConcUnit(concUnit);
+    }
+
+	public void setConcentration(TreatmentGroupValue obj, int index) {
+        Double concentration = new Integer(index).doubleValue();
+        obj.setConcentration(concentration);
+    }
+
+	public void setDateValue(TreatmentGroupValue obj, int index) {
+        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setDateValue(dateValue);
+    }
+
+	public void setDeleted(TreatmentGroupValue obj, int index) {
+        Boolean deleted = true;
+        obj.setDeleted(deleted);
+    }
+
+	public void setFileValue(TreatmentGroupValue obj, int index) {
+        String fileValue = "fileValue_" + index;
+        if (fileValue.length() > 512) {
+            fileValue = fileValue.substring(0, 512);
+        }
+        obj.setFileValue(fileValue);
+    }
+
+	public void setIgnored(TreatmentGroupValue obj, int index) {
+        Boolean ignored = true;
+        obj.setIgnored(ignored);
+    }
+
+	public void setLsKind(TreatmentGroupValue obj, int index) {
+        String lsKind = "lsKind_" + index;
+        if (lsKind.length() > 255) {
+            lsKind = lsKind.substring(0, 255);
+        }
+        obj.setLsKind(lsKind);
+    }
+
+	public void setLsState(TreatmentGroupValue obj, int index) {
+        TreatmentGroupState lsState = treatmentGroupStateDataOnDemand.getRandomTreatmentGroupState();
+        obj.setLsState(lsState);
+    }
+
+	public void setLsTransaction(TreatmentGroupValue obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setLsType(TreatmentGroupValue obj, int index) {
+        String lsType = "lsType_" + index;
+        if (lsType.length() > 64) {
+            lsType = lsType.substring(0, 64);
+        }
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(TreatmentGroupValue obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 350) {
+            lsTypeAndKind = lsTypeAndKind.substring(0, 350);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public void setModifiedBy(TreatmentGroupValue obj, int index) {
+        String modifiedBy = "modifiedBy_" + index;
+        if (modifiedBy.length() > 255) {
+            modifiedBy = modifiedBy.substring(0, 255);
+        }
+        obj.setModifiedBy(modifiedBy);
+    }
+
+	public void setModifiedDate(TreatmentGroupValue obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setModifiedDate(modifiedDate);
+    }
+
+	public void setNumberOfReplicates(TreatmentGroupValue obj, int index) {
+        Integer numberOfReplicates = new Integer(index);
+        obj.setNumberOfReplicates(numberOfReplicates);
+    }
+
+	public void setNumericValue(TreatmentGroupValue obj, int index) {
+        BigDecimal numericValue = BigDecimal.valueOf(index);
+        if (numericValue.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
+            numericValue = new BigDecimal("99999999999999999999.999999999999999999");
+        }
+        obj.setNumericValue(numericValue);
+    }
+
+	public void setOperatorKind(TreatmentGroupValue obj, int index) {
+        String operatorKind = "operator_" + index;
+        if (operatorKind.length() > 10) {
+            operatorKind = operatorKind.substring(0, 10);
+        }
+        obj.setOperatorKind(operatorKind);
+    }
+
+	public void setOperatorType(TreatmentGroupValue obj, int index) {
+        String operatorType = "operatorType_" + index;
+        if (operatorType.length() > 25) {
+            operatorType = operatorType.substring(0, 25);
+        }
+        obj.setOperatorType(operatorType);
+    }
+
+	public void setOperatorTypeAndKind(TreatmentGroupValue obj, int index) {
+        String operatorTypeAndKind = "operatorTypeAndKind_" + index;
+        if (operatorTypeAndKind.length() > 50) {
+            operatorTypeAndKind = operatorTypeAndKind.substring(0, 50);
+        }
+        obj.setOperatorTypeAndKind(operatorTypeAndKind);
+    }
+
+	public void setPublicData(TreatmentGroupValue obj, int index) {
+        Boolean publicData = true;
+        obj.setPublicData(publicData);
+    }
+
+	public void setRecordedBy(TreatmentGroupValue obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(TreatmentGroupValue obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public void setSigFigs(TreatmentGroupValue obj, int index) {
+        Integer sigFigs = new Integer(index);
+        obj.setSigFigs(sigFigs);
+    }
+
+	public void setStringValue(TreatmentGroupValue obj, int index) {
+        String stringValue = "stringValue_" + index;
+        if (stringValue.length() > 255) {
+            stringValue = stringValue.substring(0, 255);
+        }
+        obj.setStringValue(stringValue);
+    }
+
+	public void setUncertainty(TreatmentGroupValue obj, int index) {
+        BigDecimal uncertainty = BigDecimal.valueOf(index);
+        if (uncertainty.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
+            uncertainty = new BigDecimal("99999999999999999999.999999999999999999");
+        }
+        obj.setUncertainty(uncertainty);
+    }
+
+	public void setUncertaintyType(TreatmentGroupValue obj, int index) {
+        String uncertaintyType = "uncertaintyType_" + index;
+        if (uncertaintyType.length() > 255) {
+            uncertaintyType = uncertaintyType.substring(0, 255);
+        }
+        obj.setUncertaintyType(uncertaintyType);
+    }
+
+	public void setUnitKind(TreatmentGroupValue obj, int index) {
+        String unitKind = "unitKind_" + index;
+        if (unitKind.length() > 25) {
+            unitKind = unitKind.substring(0, 25);
+        }
+        obj.setUnitKind(unitKind);
+    }
+
+	public void setUnitType(TreatmentGroupValue obj, int index) {
+        String unitType = "unitType_" + index;
+        if (unitType.length() > 25) {
+            unitType = unitType.substring(0, 25);
+        }
+        obj.setUnitType(unitType);
+    }
+
+	public void setUnitTypeAndKind(TreatmentGroupValue obj, int index) {
+        String unitTypeAndKind = "unitTypeAndKind_" + index;
+        if (unitTypeAndKind.length() > 55) {
+            unitTypeAndKind = unitTypeAndKind.substring(0, 55);
+        }
+        obj.setUnitTypeAndKind(unitTypeAndKind);
+    }
+
+	public void setUrlValue(TreatmentGroupValue obj, int index) {
+        String urlValue = "urlValue_" + index;
+        if (urlValue.length() > 2000) {
+            urlValue = urlValue.substring(0, 2000);
+        }
+        obj.setUrlValue(urlValue);
+    }
+
+	public TreatmentGroupValue getSpecificTreatmentGroupValue(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        TreatmentGroupValue obj = data.get(index);
+        Long id = obj.getId();
+        return TreatmentGroupValue.findTreatmentGroupValue(id);
+    }
+
+	public TreatmentGroupValue getRandomTreatmentGroupValue() {
+        init();
+        TreatmentGroupValue obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return TreatmentGroupValue.findTreatmentGroupValue(id);
+    }
+
+	public boolean modifyTreatmentGroupValue(TreatmentGroupValue obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = TreatmentGroupValue.findTreatmentGroupValueEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'TreatmentGroupValue' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<TreatmentGroupValue>();
+        for (int i = 0; i < 10; i++) {
+            TreatmentGroupValue obj = getNewTransientTreatmentGroupValue(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 2dd22034b..000000000
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroupValueDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect TreatmentGroupValueDataOnDemand_Roo_Configurable {
-    
-    declare @type: TreatmentGroupValueDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 29964efb8..000000000
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,387 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroupState;
-import com.labsynch.labseer.domain.TreatmentGroupStateDataOnDemand;
-import com.labsynch.labseer.domain.TreatmentGroupValue;
-import com.labsynch.labseer.domain.TreatmentGroupValueDataOnDemand;
-import java.math.BigDecimal;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect TreatmentGroupValueDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: TreatmentGroupValueDataOnDemand: @Component;
-    
-    private Random TreatmentGroupValueDataOnDemand.rnd = new SecureRandom();
-    
-    private List<TreatmentGroupValue> TreatmentGroupValueDataOnDemand.data;
-    
-    @Autowired
-    TreatmentGroupStateDataOnDemand TreatmentGroupValueDataOnDemand.treatmentGroupStateDataOnDemand;
-    
-    public TreatmentGroupValue TreatmentGroupValueDataOnDemand.getNewTransientTreatmentGroupValue(int index) {
-        TreatmentGroupValue obj = new TreatmentGroupValue();
-        setBlobValue(obj, index);
-        setClobValue(obj, index);
-        setCodeKind(obj, index);
-        setCodeOrigin(obj, index);
-        setCodeType(obj, index);
-        setCodeTypeAndKind(obj, index);
-        setCodeValue(obj, index);
-        setComments(obj, index);
-        setConcUnit(obj, index);
-        setConcentration(obj, index);
-        setDateValue(obj, index);
-        setDeleted(obj, index);
-        setFileValue(obj, index);
-        setIgnored(obj, index);
-        setLsKind(obj, index);
-        setLsState(obj, index);
-        setLsTransaction(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        setModifiedBy(obj, index);
-        setModifiedDate(obj, index);
-        setNumberOfReplicates(obj, index);
-        setNumericValue(obj, index);
-        setOperatorKind(obj, index);
-        setOperatorType(obj, index);
-        setOperatorTypeAndKind(obj, index);
-        setPublicData(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        setSigFigs(obj, index);
-        setStringValue(obj, index);
-        setUncertainty(obj, index);
-        setUncertaintyType(obj, index);
-        setUnitKind(obj, index);
-        setUnitType(obj, index);
-        setUnitTypeAndKind(obj, index);
-        setUrlValue(obj, index);
-        return obj;
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setBlobValue(TreatmentGroupValue obj, int index) {
-        byte[] blobValue = String.valueOf(index).getBytes();
-        obj.setBlobValue(blobValue);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setClobValue(TreatmentGroupValue obj, int index) {
-        String clobValue = "clobValue_" + index;
-        obj.setClobValue(clobValue);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setCodeKind(TreatmentGroupValue obj, int index) {
-        String codeKind = "codeKind_" + index;
-        if (codeKind.length() > 255) {
-            codeKind = codeKind.substring(0, 255);
-        }
-        obj.setCodeKind(codeKind);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setCodeOrigin(TreatmentGroupValue obj, int index) {
-        String codeOrigin = "codeOrigin_" + index;
-        if (codeOrigin.length() > 255) {
-            codeOrigin = codeOrigin.substring(0, 255);
-        }
-        obj.setCodeOrigin(codeOrigin);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setCodeType(TreatmentGroupValue obj, int index) {
-        String codeType = "codeType_" + index;
-        if (codeType.length() > 255) {
-            codeType = codeType.substring(0, 255);
-        }
-        obj.setCodeType(codeType);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setCodeTypeAndKind(TreatmentGroupValue obj, int index) {
-        String codeTypeAndKind = "codeTypeAndKind_" + index;
-        if (codeTypeAndKind.length() > 350) {
-            codeTypeAndKind = codeTypeAndKind.substring(0, 350);
-        }
-        obj.setCodeTypeAndKind(codeTypeAndKind);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setCodeValue(TreatmentGroupValue obj, int index) {
-        String codeValue = "codeValue_" + index;
-        if (codeValue.length() > 255) {
-            codeValue = codeValue.substring(0, 255);
-        }
-        obj.setCodeValue(codeValue);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setComments(TreatmentGroupValue obj, int index) {
-        String comments = "comments_" + index;
-        if (comments.length() > 512) {
-            comments = comments.substring(0, 512);
-        }
-        obj.setComments(comments);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setConcUnit(TreatmentGroupValue obj, int index) {
-        String concUnit = "concUnit_" + index;
-        if (concUnit.length() > 25) {
-            concUnit = concUnit.substring(0, 25);
-        }
-        obj.setConcUnit(concUnit);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setConcentration(TreatmentGroupValue obj, int index) {
-        Double concentration = new Integer(index).doubleValue();
-        obj.setConcentration(concentration);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setDateValue(TreatmentGroupValue obj, int index) {
-        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setDateValue(dateValue);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setDeleted(TreatmentGroupValue obj, int index) {
-        Boolean deleted = true;
-        obj.setDeleted(deleted);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setFileValue(TreatmentGroupValue obj, int index) {
-        String fileValue = "fileValue_" + index;
-        if (fileValue.length() > 512) {
-            fileValue = fileValue.substring(0, 512);
-        }
-        obj.setFileValue(fileValue);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setIgnored(TreatmentGroupValue obj, int index) {
-        Boolean ignored = true;
-        obj.setIgnored(ignored);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setLsKind(TreatmentGroupValue obj, int index) {
-        String lsKind = "lsKind_" + index;
-        if (lsKind.length() > 255) {
-            lsKind = lsKind.substring(0, 255);
-        }
-        obj.setLsKind(lsKind);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setLsState(TreatmentGroupValue obj, int index) {
-        TreatmentGroupState lsState = treatmentGroupStateDataOnDemand.getRandomTreatmentGroupState();
-        obj.setLsState(lsState);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setLsTransaction(TreatmentGroupValue obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setLsType(TreatmentGroupValue obj, int index) {
-        String lsType = "lsType_" + index;
-        if (lsType.length() > 64) {
-            lsType = lsType.substring(0, 64);
-        }
-        obj.setLsType(lsType);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setLsTypeAndKind(TreatmentGroupValue obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 350) {
-            lsTypeAndKind = lsTypeAndKind.substring(0, 350);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setModifiedBy(TreatmentGroupValue obj, int index) {
-        String modifiedBy = "modifiedBy_" + index;
-        if (modifiedBy.length() > 255) {
-            modifiedBy = modifiedBy.substring(0, 255);
-        }
-        obj.setModifiedBy(modifiedBy);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setModifiedDate(TreatmentGroupValue obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setModifiedDate(modifiedDate);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setNumberOfReplicates(TreatmentGroupValue obj, int index) {
-        Integer numberOfReplicates = new Integer(index);
-        obj.setNumberOfReplicates(numberOfReplicates);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setNumericValue(TreatmentGroupValue obj, int index) {
-        BigDecimal numericValue = BigDecimal.valueOf(index);
-        if (numericValue.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
-            numericValue = new BigDecimal("99999999999999999999.999999999999999999");
-        }
-        obj.setNumericValue(numericValue);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setOperatorKind(TreatmentGroupValue obj, int index) {
-        String operatorKind = "operator_" + index;
-        if (operatorKind.length() > 10) {
-            operatorKind = operatorKind.substring(0, 10);
-        }
-        obj.setOperatorKind(operatorKind);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setOperatorType(TreatmentGroupValue obj, int index) {
-        String operatorType = "operatorType_" + index;
-        if (operatorType.length() > 25) {
-            operatorType = operatorType.substring(0, 25);
-        }
-        obj.setOperatorType(operatorType);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setOperatorTypeAndKind(TreatmentGroupValue obj, int index) {
-        String operatorTypeAndKind = "operatorTypeAndKind_" + index;
-        if (operatorTypeAndKind.length() > 50) {
-            operatorTypeAndKind = operatorTypeAndKind.substring(0, 50);
-        }
-        obj.setOperatorTypeAndKind(operatorTypeAndKind);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setPublicData(TreatmentGroupValue obj, int index) {
-        Boolean publicData = true;
-        obj.setPublicData(publicData);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setRecordedBy(TreatmentGroupValue obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setRecordedDate(TreatmentGroupValue obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setSigFigs(TreatmentGroupValue obj, int index) {
-        Integer sigFigs = new Integer(index);
-        obj.setSigFigs(sigFigs);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setStringValue(TreatmentGroupValue obj, int index) {
-        String stringValue = "stringValue_" + index;
-        if (stringValue.length() > 255) {
-            stringValue = stringValue.substring(0, 255);
-        }
-        obj.setStringValue(stringValue);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setUncertainty(TreatmentGroupValue obj, int index) {
-        BigDecimal uncertainty = BigDecimal.valueOf(index);
-        if (uncertainty.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
-            uncertainty = new BigDecimal("99999999999999999999.999999999999999999");
-        }
-        obj.setUncertainty(uncertainty);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setUncertaintyType(TreatmentGroupValue obj, int index) {
-        String uncertaintyType = "uncertaintyType_" + index;
-        if (uncertaintyType.length() > 255) {
-            uncertaintyType = uncertaintyType.substring(0, 255);
-        }
-        obj.setUncertaintyType(uncertaintyType);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setUnitKind(TreatmentGroupValue obj, int index) {
-        String unitKind = "unitKind_" + index;
-        if (unitKind.length() > 25) {
-            unitKind = unitKind.substring(0, 25);
-        }
-        obj.setUnitKind(unitKind);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setUnitType(TreatmentGroupValue obj, int index) {
-        String unitType = "unitType_" + index;
-        if (unitType.length() > 25) {
-            unitType = unitType.substring(0, 25);
-        }
-        obj.setUnitType(unitType);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setUnitTypeAndKind(TreatmentGroupValue obj, int index) {
-        String unitTypeAndKind = "unitTypeAndKind_" + index;
-        if (unitTypeAndKind.length() > 55) {
-            unitTypeAndKind = unitTypeAndKind.substring(0, 55);
-        }
-        obj.setUnitTypeAndKind(unitTypeAndKind);
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.setUrlValue(TreatmentGroupValue obj, int index) {
-        String urlValue = "urlValue_" + index;
-        if (urlValue.length() > 2000) {
-            urlValue = urlValue.substring(0, 2000);
-        }
-        obj.setUrlValue(urlValue);
-    }
-    
-    public TreatmentGroupValue TreatmentGroupValueDataOnDemand.getSpecificTreatmentGroupValue(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        TreatmentGroupValue obj = data.get(index);
-        Long id = obj.getId();
-        return TreatmentGroupValue.findTreatmentGroupValue(id);
-    }
-    
-    public TreatmentGroupValue TreatmentGroupValueDataOnDemand.getRandomTreatmentGroupValue() {
-        init();
-        TreatmentGroupValue obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return TreatmentGroupValue.findTreatmentGroupValue(id);
-    }
-    
-    public boolean TreatmentGroupValueDataOnDemand.modifyTreatmentGroupValue(TreatmentGroupValue obj) {
-        return false;
-    }
-    
-    public void TreatmentGroupValueDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = TreatmentGroupValue.findTreatmentGroupValueEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'TreatmentGroupValue' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<TreatmentGroupValue>();
-        for (int i = 0; i < 10; i++) {
-            TreatmentGroupValue obj = getNewTransientTreatmentGroupValue(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueIntegrationTest.java
index 717570f4e..95e06ee8a 100755
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
+@Configurable
 @RooIntegrationTest(entity = TreatmentGroupValue.class)
 public class TreatmentGroupValueIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    TreatmentGroupValueDataOnDemand dod;
+
+	@Test
+    public void testCountTreatmentGroupValues() {
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to initialize correctly", dod.getRandomTreatmentGroupValue());
+        long count = TreatmentGroupValue.countTreatmentGroupValues();
+        Assert.assertTrue("Counter for 'TreatmentGroupValue' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindTreatmentGroupValue() {
+        TreatmentGroupValue obj = dod.getRandomTreatmentGroupValue();
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to provide an identifier", id);
+        obj = TreatmentGroupValue.findTreatmentGroupValue(id);
+        Assert.assertNotNull("Find method for 'TreatmentGroupValue' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'TreatmentGroupValue' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllTreatmentGroupValues() {
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to initialize correctly", dod.getRandomTreatmentGroupValue());
+        long count = TreatmentGroupValue.countTreatmentGroupValues();
+        Assert.assertTrue("Too expensive to perform a find all test for 'TreatmentGroupValue', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<TreatmentGroupValue> result = TreatmentGroupValue.findAllTreatmentGroupValues();
+        Assert.assertNotNull("Find all method for 'TreatmentGroupValue' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'TreatmentGroupValue' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindTreatmentGroupValueEntries() {
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to initialize correctly", dod.getRandomTreatmentGroupValue());
+        long count = TreatmentGroupValue.countTreatmentGroupValues();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<TreatmentGroupValue> result = TreatmentGroupValue.findTreatmentGroupValueEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'TreatmentGroupValue' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'TreatmentGroupValue' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        TreatmentGroupValue obj = dod.getRandomTreatmentGroupValue();
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to provide an identifier", id);
+        obj = TreatmentGroupValue.findTreatmentGroupValue(id);
+        Assert.assertNotNull("Find method for 'TreatmentGroupValue' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyTreatmentGroupValue(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'TreatmentGroupValue' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        TreatmentGroupValue obj = dod.getRandomTreatmentGroupValue();
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to provide an identifier", id);
+        obj = TreatmentGroupValue.findTreatmentGroupValue(id);
+        boolean modified =  dod.modifyTreatmentGroupValue(obj);
+        Integer currentVersion = obj.getVersion();
+        TreatmentGroupValue merged = (TreatmentGroupValue)obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'TreatmentGroupValue' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to initialize correctly", dod.getRandomTreatmentGroupValue());
+        TreatmentGroupValue obj = dod.getNewTransientTreatmentGroupValue(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'TreatmentGroupValue' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'TreatmentGroupValue' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        TreatmentGroupValue obj = dod.getRandomTreatmentGroupValue();
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to provide an identifier", id);
+        obj = TreatmentGroupValue.findTreatmentGroupValue(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'TreatmentGroupValue' with identifier '" + id + "'", TreatmentGroupValue.findTreatmentGroupValue(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 6be321799..000000000
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroupValueIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect TreatmentGroupValueIntegrationTest_Roo_Configurable {
-    
-    declare @type: TreatmentGroupValueIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 4082aec09..000000000
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.TreatmentGroupValue;
-import com.labsynch.labseer.domain.TreatmentGroupValueDataOnDemand;
-import com.labsynch.labseer.domain.TreatmentGroupValueIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect TreatmentGroupValueIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: TreatmentGroupValueIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: TreatmentGroupValueIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: TreatmentGroupValueIntegrationTest: @Transactional;
-    
-    @Autowired
-    TreatmentGroupValueDataOnDemand TreatmentGroupValueIntegrationTest.dod;
-    
-    @Test
-    public void TreatmentGroupValueIntegrationTest.testCountTreatmentGroupValues() {
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to initialize correctly", dod.getRandomTreatmentGroupValue());
-        long count = TreatmentGroupValue.countTreatmentGroupValues();
-        Assert.assertTrue("Counter for 'TreatmentGroupValue' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void TreatmentGroupValueIntegrationTest.testFindTreatmentGroupValue() {
-        TreatmentGroupValue obj = dod.getRandomTreatmentGroupValue();
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to provide an identifier", id);
-        obj = TreatmentGroupValue.findTreatmentGroupValue(id);
-        Assert.assertNotNull("Find method for 'TreatmentGroupValue' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'TreatmentGroupValue' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void TreatmentGroupValueIntegrationTest.testFindAllTreatmentGroupValues() {
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to initialize correctly", dod.getRandomTreatmentGroupValue());
-        long count = TreatmentGroupValue.countTreatmentGroupValues();
-        Assert.assertTrue("Too expensive to perform a find all test for 'TreatmentGroupValue', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<TreatmentGroupValue> result = TreatmentGroupValue.findAllTreatmentGroupValues();
-        Assert.assertNotNull("Find all method for 'TreatmentGroupValue' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'TreatmentGroupValue' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void TreatmentGroupValueIntegrationTest.testFindTreatmentGroupValueEntries() {
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to initialize correctly", dod.getRandomTreatmentGroupValue());
-        long count = TreatmentGroupValue.countTreatmentGroupValues();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<TreatmentGroupValue> result = TreatmentGroupValue.findTreatmentGroupValueEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'TreatmentGroupValue' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'TreatmentGroupValue' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void TreatmentGroupValueIntegrationTest.testFlush() {
-        TreatmentGroupValue obj = dod.getRandomTreatmentGroupValue();
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to provide an identifier", id);
-        obj = TreatmentGroupValue.findTreatmentGroupValue(id);
-        Assert.assertNotNull("Find method for 'TreatmentGroupValue' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyTreatmentGroupValue(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'TreatmentGroupValue' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void TreatmentGroupValueIntegrationTest.testMergeUpdate() {
-        TreatmentGroupValue obj = dod.getRandomTreatmentGroupValue();
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to provide an identifier", id);
-        obj = TreatmentGroupValue.findTreatmentGroupValue(id);
-        boolean modified =  dod.modifyTreatmentGroupValue(obj);
-        Integer currentVersion = obj.getVersion();
-        TreatmentGroupValue merged = (TreatmentGroupValue)obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'TreatmentGroupValue' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void TreatmentGroupValueIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to initialize correctly", dod.getRandomTreatmentGroupValue());
-        TreatmentGroupValue obj = dod.getNewTransientTreatmentGroupValue(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'TreatmentGroupValue' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'TreatmentGroupValue' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void TreatmentGroupValueIntegrationTest.testRemove() {
-        TreatmentGroupValue obj = dod.getRandomTreatmentGroupValue();
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to provide an identifier", id);
-        obj = TreatmentGroupValue.findTreatmentGroupValue(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'TreatmentGroupValue' with identifier '" + id + "'", TreatmentGroupValue.findTreatmentGroupValue(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/UnitKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/UnitKindDataOnDemand.java
index 3c75ba8d5..44c607e05 100755
--- a/src/test/java/com/labsynch/labseer/domain/UnitKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/UnitKindDataOnDemand.java
@@ -1,7 +1,108 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Component
+@Configurable
 @RooDataOnDemand(entity = UnitKind.class)
 public class UnitKindDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<UnitKind> data;
+
+	@Autowired
+    UnitTypeDataOnDemand unitTypeDataOnDemand;
+
+	public UnitKind getNewTransientUnitKind(int index) {
+        UnitKind obj = new UnitKind();
+        setKindName(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        return obj;
+    }
+
+	public void setKindName(UnitKind obj, int index) {
+        String kindName = "kindName_" + index;
+        if (kindName.length() > 64) {
+            kindName = kindName.substring(0, 64);
+        }
+        obj.setKindName(kindName);
+    }
+
+	public void setLsType(UnitKind obj, int index) {
+        UnitType lsType = unitTypeDataOnDemand.getRandomUnitType();
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(UnitKind obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = new Random().nextInt(10) + lsTypeAndKind.substring(1, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public UnitKind getSpecificUnitKind(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        UnitKind obj = data.get(index);
+        Long id = obj.getId();
+        return UnitKind.findUnitKind(id);
+    }
+
+	public UnitKind getRandomUnitKind() {
+        init();
+        UnitKind obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return UnitKind.findUnitKind(id);
+    }
+
+	public boolean modifyUnitKind(UnitKind obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = UnitKind.findUnitKindEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'UnitKind' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<UnitKind>();
+        for (int i = 0; i < 10; i++) {
+            UnitKind obj = getNewTransientUnitKind(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/UnitKindDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/UnitKindDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 9dd550202..000000000
--- a/src/test/java/com/labsynch/labseer/domain/UnitKindDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UnitKindDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect UnitKindDataOnDemand_Roo_Configurable {
-    
-    declare @type: UnitKindDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/UnitKindDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/UnitKindDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index d3b0bae84..000000000
--- a/src/test/java/com/labsynch/labseer/domain/UnitKindDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,113 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UnitKind;
-import com.labsynch.labseer.domain.UnitKindDataOnDemand;
-import com.labsynch.labseer.domain.UnitType;
-import com.labsynch.labseer.domain.UnitTypeDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect UnitKindDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: UnitKindDataOnDemand: @Component;
-    
-    private Random UnitKindDataOnDemand.rnd = new SecureRandom();
-    
-    private List<UnitKind> UnitKindDataOnDemand.data;
-    
-    @Autowired
-    UnitTypeDataOnDemand UnitKindDataOnDemand.unitTypeDataOnDemand;
-    
-    public UnitKind UnitKindDataOnDemand.getNewTransientUnitKind(int index) {
-        UnitKind obj = new UnitKind();
-        setKindName(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        return obj;
-    }
-    
-    public void UnitKindDataOnDemand.setKindName(UnitKind obj, int index) {
-        String kindName = "kindName_" + index;
-        if (kindName.length() > 64) {
-            kindName = kindName.substring(0, 64);
-        }
-        obj.setKindName(kindName);
-    }
-    
-    public void UnitKindDataOnDemand.setLsType(UnitKind obj, int index) {
-        UnitType lsType = unitTypeDataOnDemand.getRandomUnitType();
-        obj.setLsType(lsType);
-    }
-    
-    public void UnitKindDataOnDemand.setLsTypeAndKind(UnitKind obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = new Random().nextInt(10) + lsTypeAndKind.substring(1, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public UnitKind UnitKindDataOnDemand.getSpecificUnitKind(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        UnitKind obj = data.get(index);
-        Long id = obj.getId();
-        return UnitKind.findUnitKind(id);
-    }
-    
-    public UnitKind UnitKindDataOnDemand.getRandomUnitKind() {
-        init();
-        UnitKind obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return UnitKind.findUnitKind(id);
-    }
-    
-    public boolean UnitKindDataOnDemand.modifyUnitKind(UnitKind obj) {
-        return false;
-    }
-    
-    public void UnitKindDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = UnitKind.findUnitKindEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'UnitKind' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<UnitKind>();
-        for (int i = 0; i < 10; i++) {
-            UnitKind obj = getNewTransientUnitKind(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/UnitKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/UnitKindIntegrationTest.java
index 6a399706c..325331257 100755
--- a/src/test/java/com/labsynch/labseer/domain/UnitKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/UnitKindIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = UnitKind.class)
 public class UnitKindIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    UnitKindDataOnDemand dod;
+
+	@Test
+    public void testCountUnitKinds() {
+        Assert.assertNotNull("Data on demand for 'UnitKind' failed to initialize correctly", dod.getRandomUnitKind());
+        long count = UnitKind.countUnitKinds();
+        Assert.assertTrue("Counter for 'UnitKind' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindUnitKind() {
+        UnitKind obj = dod.getRandomUnitKind();
+        Assert.assertNotNull("Data on demand for 'UnitKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'UnitKind' failed to provide an identifier", id);
+        obj = UnitKind.findUnitKind(id);
+        Assert.assertNotNull("Find method for 'UnitKind' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'UnitKind' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllUnitKinds() {
+        Assert.assertNotNull("Data on demand for 'UnitKind' failed to initialize correctly", dod.getRandomUnitKind());
+        long count = UnitKind.countUnitKinds();
+        Assert.assertTrue("Too expensive to perform a find all test for 'UnitKind', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<UnitKind> result = UnitKind.findAllUnitKinds();
+        Assert.assertNotNull("Find all method for 'UnitKind' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'UnitKind' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindUnitKindEntries() {
+        Assert.assertNotNull("Data on demand for 'UnitKind' failed to initialize correctly", dod.getRandomUnitKind());
+        long count = UnitKind.countUnitKinds();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<UnitKind> result = UnitKind.findUnitKindEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'UnitKind' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'UnitKind' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        UnitKind obj = dod.getRandomUnitKind();
+        Assert.assertNotNull("Data on demand for 'UnitKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'UnitKind' failed to provide an identifier", id);
+        obj = UnitKind.findUnitKind(id);
+        Assert.assertNotNull("Find method for 'UnitKind' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyUnitKind(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'UnitKind' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        UnitKind obj = dod.getRandomUnitKind();
+        Assert.assertNotNull("Data on demand for 'UnitKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'UnitKind' failed to provide an identifier", id);
+        obj = UnitKind.findUnitKind(id);
+        boolean modified =  dod.modifyUnitKind(obj);
+        Integer currentVersion = obj.getVersion();
+        UnitKind merged = obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'UnitKind' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'UnitKind' failed to initialize correctly", dod.getRandomUnitKind());
+        UnitKind obj = dod.getNewTransientUnitKind(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'UnitKind' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'UnitKind' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'UnitKind' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        UnitKind obj = dod.getRandomUnitKind();
+        Assert.assertNotNull("Data on demand for 'UnitKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'UnitKind' failed to provide an identifier", id);
+        obj = UnitKind.findUnitKind(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'UnitKind' with identifier '" + id + "'", UnitKind.findUnitKind(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/UnitKindIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/UnitKindIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 7191de2ec..000000000
--- a/src/test/java/com/labsynch/labseer/domain/UnitKindIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UnitKindIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect UnitKindIntegrationTest_Roo_Configurable {
-    
-    declare @type: UnitKindIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/UnitKindIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/UnitKindIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 9ac41e376..000000000
--- a/src/test/java/com/labsynch/labseer/domain/UnitKindIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UnitKind;
-import com.labsynch.labseer.domain.UnitKindDataOnDemand;
-import com.labsynch.labseer.domain.UnitKindIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect UnitKindIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: UnitKindIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: UnitKindIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: UnitKindIntegrationTest: @Transactional;
-    
-    @Autowired
-    UnitKindDataOnDemand UnitKindIntegrationTest.dod;
-    
-    @Test
-    public void UnitKindIntegrationTest.testCountUnitKinds() {
-        Assert.assertNotNull("Data on demand for 'UnitKind' failed to initialize correctly", dod.getRandomUnitKind());
-        long count = UnitKind.countUnitKinds();
-        Assert.assertTrue("Counter for 'UnitKind' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void UnitKindIntegrationTest.testFindUnitKind() {
-        UnitKind obj = dod.getRandomUnitKind();
-        Assert.assertNotNull("Data on demand for 'UnitKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'UnitKind' failed to provide an identifier", id);
-        obj = UnitKind.findUnitKind(id);
-        Assert.assertNotNull("Find method for 'UnitKind' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'UnitKind' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void UnitKindIntegrationTest.testFindAllUnitKinds() {
-        Assert.assertNotNull("Data on demand for 'UnitKind' failed to initialize correctly", dod.getRandomUnitKind());
-        long count = UnitKind.countUnitKinds();
-        Assert.assertTrue("Too expensive to perform a find all test for 'UnitKind', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<UnitKind> result = UnitKind.findAllUnitKinds();
-        Assert.assertNotNull("Find all method for 'UnitKind' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'UnitKind' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void UnitKindIntegrationTest.testFindUnitKindEntries() {
-        Assert.assertNotNull("Data on demand for 'UnitKind' failed to initialize correctly", dod.getRandomUnitKind());
-        long count = UnitKind.countUnitKinds();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<UnitKind> result = UnitKind.findUnitKindEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'UnitKind' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'UnitKind' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void UnitKindIntegrationTest.testFlush() {
-        UnitKind obj = dod.getRandomUnitKind();
-        Assert.assertNotNull("Data on demand for 'UnitKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'UnitKind' failed to provide an identifier", id);
-        obj = UnitKind.findUnitKind(id);
-        Assert.assertNotNull("Find method for 'UnitKind' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyUnitKind(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'UnitKind' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void UnitKindIntegrationTest.testMergeUpdate() {
-        UnitKind obj = dod.getRandomUnitKind();
-        Assert.assertNotNull("Data on demand for 'UnitKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'UnitKind' failed to provide an identifier", id);
-        obj = UnitKind.findUnitKind(id);
-        boolean modified =  dod.modifyUnitKind(obj);
-        Integer currentVersion = obj.getVersion();
-        UnitKind merged = obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'UnitKind' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void UnitKindIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'UnitKind' failed to initialize correctly", dod.getRandomUnitKind());
-        UnitKind obj = dod.getNewTransientUnitKind(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'UnitKind' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'UnitKind' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'UnitKind' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void UnitKindIntegrationTest.testRemove() {
-        UnitKind obj = dod.getRandomUnitKind();
-        Assert.assertNotNull("Data on demand for 'UnitKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'UnitKind' failed to provide an identifier", id);
-        obj = UnitKind.findUnitKind(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'UnitKind' with identifier '" + id + "'", UnitKind.findUnitKind(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/UnitTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/UnitTypeDataOnDemand.java
index e53eb293b..5a6c0c8ab 100755
--- a/src/test/java/com/labsynch/labseer/domain/UnitTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/UnitTypeDataOnDemand.java
@@ -1,7 +1,89 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Configurable
+@Component
 @RooDataOnDemand(entity = UnitType.class)
 public class UnitTypeDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<UnitType> data;
+
+	public UnitType getNewTransientUnitType(int index) {
+        UnitType obj = new UnitType();
+        setTypeName(obj, index);
+        return obj;
+    }
+
+	public void setTypeName(UnitType obj, int index) {
+        String typeName = "typeName_" + index;
+        if (typeName.length() > 64) {
+            typeName = new Random().nextInt(10) + typeName.substring(1, 64);
+        }
+        obj.setTypeName(typeName);
+    }
+
+	public UnitType getSpecificUnitType(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        UnitType obj = data.get(index);
+        Long id = obj.getId();
+        return UnitType.findUnitType(id);
+    }
+
+	public UnitType getRandomUnitType() {
+        init();
+        UnitType obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return UnitType.findUnitType(id);
+    }
+
+	public boolean modifyUnitType(UnitType obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = UnitType.findUnitTypeEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'UnitType' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<UnitType>();
+        for (int i = 0; i < 10; i++) {
+            UnitType obj = getNewTransientUnitType(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/UnitTypeDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/UnitTypeDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 72f77c418..000000000
--- a/src/test/java/com/labsynch/labseer/domain/UnitTypeDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UnitTypeDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect UnitTypeDataOnDemand_Roo_Configurable {
-    
-    declare @type: UnitTypeDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/UnitTypeDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/UnitTypeDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 34db563de..000000000
--- a/src/test/java/com/labsynch/labseer/domain/UnitTypeDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,92 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UnitType;
-import com.labsynch.labseer.domain.UnitTypeDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.stereotype.Component;
-
-privileged aspect UnitTypeDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: UnitTypeDataOnDemand: @Component;
-    
-    private Random UnitTypeDataOnDemand.rnd = new SecureRandom();
-    
-    private List<UnitType> UnitTypeDataOnDemand.data;
-    
-    public UnitType UnitTypeDataOnDemand.getNewTransientUnitType(int index) {
-        UnitType obj = new UnitType();
-        setTypeName(obj, index);
-        return obj;
-    }
-    
-    public void UnitTypeDataOnDemand.setTypeName(UnitType obj, int index) {
-        String typeName = "typeName_" + index;
-        if (typeName.length() > 64) {
-            typeName = new Random().nextInt(10) + typeName.substring(1, 64);
-        }
-        obj.setTypeName(typeName);
-    }
-    
-    public UnitType UnitTypeDataOnDemand.getSpecificUnitType(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        UnitType obj = data.get(index);
-        Long id = obj.getId();
-        return UnitType.findUnitType(id);
-    }
-    
-    public UnitType UnitTypeDataOnDemand.getRandomUnitType() {
-        init();
-        UnitType obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return UnitType.findUnitType(id);
-    }
-    
-    public boolean UnitTypeDataOnDemand.modifyUnitType(UnitType obj) {
-        return false;
-    }
-    
-    public void UnitTypeDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = UnitType.findUnitTypeEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'UnitType' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<UnitType>();
-        for (int i = 0; i < 10; i++) {
-            UnitType obj = getNewTransientUnitType(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/UnitTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/UnitTypeIntegrationTest.java
index 59570c161..ffa486cff 100755
--- a/src/test/java/com/labsynch/labseer/domain/UnitTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/UnitTypeIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
+@Configurable
 @RooIntegrationTest(entity = UnitType.class)
 public class UnitTypeIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    UnitTypeDataOnDemand dod;
+
+	@Test
+    public void testCountUnitTypes() {
+        Assert.assertNotNull("Data on demand for 'UnitType' failed to initialize correctly", dod.getRandomUnitType());
+        long count = UnitType.countUnitTypes();
+        Assert.assertTrue("Counter for 'UnitType' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindUnitType() {
+        UnitType obj = dod.getRandomUnitType();
+        Assert.assertNotNull("Data on demand for 'UnitType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'UnitType' failed to provide an identifier", id);
+        obj = UnitType.findUnitType(id);
+        Assert.assertNotNull("Find method for 'UnitType' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'UnitType' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllUnitTypes() {
+        Assert.assertNotNull("Data on demand for 'UnitType' failed to initialize correctly", dod.getRandomUnitType());
+        long count = UnitType.countUnitTypes();
+        Assert.assertTrue("Too expensive to perform a find all test for 'UnitType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<UnitType> result = UnitType.findAllUnitTypes();
+        Assert.assertNotNull("Find all method for 'UnitType' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'UnitType' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindUnitTypeEntries() {
+        Assert.assertNotNull("Data on demand for 'UnitType' failed to initialize correctly", dod.getRandomUnitType());
+        long count = UnitType.countUnitTypes();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<UnitType> result = UnitType.findUnitTypeEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'UnitType' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'UnitType' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        UnitType obj = dod.getRandomUnitType();
+        Assert.assertNotNull("Data on demand for 'UnitType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'UnitType' failed to provide an identifier", id);
+        obj = UnitType.findUnitType(id);
+        Assert.assertNotNull("Find method for 'UnitType' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyUnitType(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'UnitType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        UnitType obj = dod.getRandomUnitType();
+        Assert.assertNotNull("Data on demand for 'UnitType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'UnitType' failed to provide an identifier", id);
+        obj = UnitType.findUnitType(id);
+        boolean modified =  dod.modifyUnitType(obj);
+        Integer currentVersion = obj.getVersion();
+        UnitType merged = obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'UnitType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'UnitType' failed to initialize correctly", dod.getRandomUnitType());
+        UnitType obj = dod.getNewTransientUnitType(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'UnitType' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'UnitType' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'UnitType' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        UnitType obj = dod.getRandomUnitType();
+        Assert.assertNotNull("Data on demand for 'UnitType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'UnitType' failed to provide an identifier", id);
+        obj = UnitType.findUnitType(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'UnitType' with identifier '" + id + "'", UnitType.findUnitType(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/UnitTypeIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/UnitTypeIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 343d736ee..000000000
--- a/src/test/java/com/labsynch/labseer/domain/UnitTypeIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UnitTypeIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect UnitTypeIntegrationTest_Roo_Configurable {
-    
-    declare @type: UnitTypeIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/UnitTypeIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/UnitTypeIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 1a7827e6e..000000000
--- a/src/test/java/com/labsynch/labseer/domain/UnitTypeIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UnitType;
-import com.labsynch.labseer.domain.UnitTypeDataOnDemand;
-import com.labsynch.labseer.domain.UnitTypeIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect UnitTypeIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: UnitTypeIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: UnitTypeIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: UnitTypeIntegrationTest: @Transactional;
-    
-    @Autowired
-    UnitTypeDataOnDemand UnitTypeIntegrationTest.dod;
-    
-    @Test
-    public void UnitTypeIntegrationTest.testCountUnitTypes() {
-        Assert.assertNotNull("Data on demand for 'UnitType' failed to initialize correctly", dod.getRandomUnitType());
-        long count = UnitType.countUnitTypes();
-        Assert.assertTrue("Counter for 'UnitType' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void UnitTypeIntegrationTest.testFindUnitType() {
-        UnitType obj = dod.getRandomUnitType();
-        Assert.assertNotNull("Data on demand for 'UnitType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'UnitType' failed to provide an identifier", id);
-        obj = UnitType.findUnitType(id);
-        Assert.assertNotNull("Find method for 'UnitType' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'UnitType' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void UnitTypeIntegrationTest.testFindAllUnitTypes() {
-        Assert.assertNotNull("Data on demand for 'UnitType' failed to initialize correctly", dod.getRandomUnitType());
-        long count = UnitType.countUnitTypes();
-        Assert.assertTrue("Too expensive to perform a find all test for 'UnitType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<UnitType> result = UnitType.findAllUnitTypes();
-        Assert.assertNotNull("Find all method for 'UnitType' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'UnitType' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void UnitTypeIntegrationTest.testFindUnitTypeEntries() {
-        Assert.assertNotNull("Data on demand for 'UnitType' failed to initialize correctly", dod.getRandomUnitType());
-        long count = UnitType.countUnitTypes();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<UnitType> result = UnitType.findUnitTypeEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'UnitType' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'UnitType' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void UnitTypeIntegrationTest.testFlush() {
-        UnitType obj = dod.getRandomUnitType();
-        Assert.assertNotNull("Data on demand for 'UnitType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'UnitType' failed to provide an identifier", id);
-        obj = UnitType.findUnitType(id);
-        Assert.assertNotNull("Find method for 'UnitType' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyUnitType(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'UnitType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void UnitTypeIntegrationTest.testMergeUpdate() {
-        UnitType obj = dod.getRandomUnitType();
-        Assert.assertNotNull("Data on demand for 'UnitType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'UnitType' failed to provide an identifier", id);
-        obj = UnitType.findUnitType(id);
-        boolean modified =  dod.modifyUnitType(obj);
-        Integer currentVersion = obj.getVersion();
-        UnitType merged = obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'UnitType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void UnitTypeIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'UnitType' failed to initialize correctly", dod.getRandomUnitType());
-        UnitType obj = dod.getNewTransientUnitType(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'UnitType' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'UnitType' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'UnitType' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void UnitTypeIntegrationTest.testRemove() {
-        UnitType obj = dod.getRandomUnitType();
-        Assert.assertNotNull("Data on demand for 'UnitType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'UnitType' failed to provide an identifier", id);
-        obj = UnitType.findUnitType(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'UnitType' with identifier '" + id + "'", UnitType.findUnitType(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/UpdateLogDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/UpdateLogDataOnDemand.java
index 9545bb44f..299e0b831 100755
--- a/src/test/java/com/labsynch/labseer/domain/UpdateLogDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/UpdateLogDataOnDemand.java
@@ -1,7 +1,128 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Configurable
+@Component
 @RooDataOnDemand(entity = UpdateLog.class)
 public class UpdateLogDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<UpdateLog> data;
+
+	public UpdateLog getNewTransientUpdateLog(int index) {
+        UpdateLog obj = new UpdateLog();
+        setComments(obj, index);
+        setLsTransaction(obj, index);
+        setRecordedBy(obj, index);
+        setRecordedDate(obj, index);
+        setThing(obj, index);
+        setUpdateAction(obj, index);
+        return obj;
+    }
+
+	public void setComments(UpdateLog obj, int index) {
+        String comments = "comments_" + index;
+        if (comments.length() > 512) {
+            comments = comments.substring(0, 512);
+        }
+        obj.setComments(comments);
+    }
+
+	public void setLsTransaction(UpdateLog obj, int index) {
+        Long lsTransaction = new Integer(index).longValue();
+        obj.setLsTransaction(lsTransaction);
+    }
+
+	public void setRecordedBy(UpdateLog obj, int index) {
+        String recordedBy = "recordedBy_" + index;
+        if (recordedBy.length() > 255) {
+            recordedBy = recordedBy.substring(0, 255);
+        }
+        obj.setRecordedBy(recordedBy);
+    }
+
+	public void setRecordedDate(UpdateLog obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+        obj.setRecordedDate(recordedDate);
+    }
+
+	public void setThing(UpdateLog obj, int index) {
+        Long thing = new Integer(index).longValue();
+        obj.setThing(thing);
+    }
+
+	public void setUpdateAction(UpdateLog obj, int index) {
+        String updateAction = "updateAction_" + index;
+        if (updateAction.length() > 255) {
+            updateAction = updateAction.substring(0, 255);
+        }
+        obj.setUpdateAction(updateAction);
+    }
+
+	public UpdateLog getSpecificUpdateLog(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        UpdateLog obj = data.get(index);
+        Long id = obj.getId();
+        return UpdateLog.findUpdateLog(id);
+    }
+
+	public UpdateLog getRandomUpdateLog() {
+        init();
+        UpdateLog obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return UpdateLog.findUpdateLog(id);
+    }
+
+	public boolean modifyUpdateLog(UpdateLog obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = UpdateLog.findUpdateLogEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'UpdateLog' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<UpdateLog>();
+        for (int i = 0; i < 10; i++) {
+            UpdateLog obj = getNewTransientUpdateLog(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/UpdateLogDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/UpdateLogDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 0639d4d4a..000000000
--- a/src/test/java/com/labsynch/labseer/domain/UpdateLogDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UpdateLogDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect UpdateLogDataOnDemand_Roo_Configurable {
-    
-    declare @type: UpdateLogDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/UpdateLogDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/UpdateLogDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 0af410a88..000000000
--- a/src/test/java/com/labsynch/labseer/domain/UpdateLogDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,131 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UpdateLog;
-import com.labsynch.labseer.domain.UpdateLogDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.stereotype.Component;
-
-privileged aspect UpdateLogDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: UpdateLogDataOnDemand: @Component;
-    
-    private Random UpdateLogDataOnDemand.rnd = new SecureRandom();
-    
-    private List<UpdateLog> UpdateLogDataOnDemand.data;
-    
-    public UpdateLog UpdateLogDataOnDemand.getNewTransientUpdateLog(int index) {
-        UpdateLog obj = new UpdateLog();
-        setComments(obj, index);
-        setLsTransaction(obj, index);
-        setRecordedBy(obj, index);
-        setRecordedDate(obj, index);
-        setThing(obj, index);
-        setUpdateAction(obj, index);
-        return obj;
-    }
-    
-    public void UpdateLogDataOnDemand.setComments(UpdateLog obj, int index) {
-        String comments = "comments_" + index;
-        if (comments.length() > 512) {
-            comments = comments.substring(0, 512);
-        }
-        obj.setComments(comments);
-    }
-    
-    public void UpdateLogDataOnDemand.setLsTransaction(UpdateLog obj, int index) {
-        Long lsTransaction = new Integer(index).longValue();
-        obj.setLsTransaction(lsTransaction);
-    }
-    
-    public void UpdateLogDataOnDemand.setRecordedBy(UpdateLog obj, int index) {
-        String recordedBy = "recordedBy_" + index;
-        if (recordedBy.length() > 255) {
-            recordedBy = recordedBy.substring(0, 255);
-        }
-        obj.setRecordedBy(recordedBy);
-    }
-    
-    public void UpdateLogDataOnDemand.setRecordedDate(UpdateLog obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
-        obj.setRecordedDate(recordedDate);
-    }
-    
-    public void UpdateLogDataOnDemand.setThing(UpdateLog obj, int index) {
-        Long thing = new Integer(index).longValue();
-        obj.setThing(thing);
-    }
-    
-    public void UpdateLogDataOnDemand.setUpdateAction(UpdateLog obj, int index) {
-        String updateAction = "updateAction_" + index;
-        if (updateAction.length() > 255) {
-            updateAction = updateAction.substring(0, 255);
-        }
-        obj.setUpdateAction(updateAction);
-    }
-    
-    public UpdateLog UpdateLogDataOnDemand.getSpecificUpdateLog(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        UpdateLog obj = data.get(index);
-        Long id = obj.getId();
-        return UpdateLog.findUpdateLog(id);
-    }
-    
-    public UpdateLog UpdateLogDataOnDemand.getRandomUpdateLog() {
-        init();
-        UpdateLog obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return UpdateLog.findUpdateLog(id);
-    }
-    
-    public boolean UpdateLogDataOnDemand.modifyUpdateLog(UpdateLog obj) {
-        return false;
-    }
-    
-    public void UpdateLogDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = UpdateLog.findUpdateLogEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'UpdateLog' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<UpdateLog>();
-        for (int i = 0; i < 10; i++) {
-            UpdateLog obj = getNewTransientUpdateLog(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/UpdateLogIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/UpdateLogIntegrationTest.java
index 765801d40..10d7885c1 100755
--- a/src/test/java/com/labsynch/labseer/domain/UpdateLogIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/UpdateLogIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
+@Configurable
 @RooIntegrationTest(entity = UpdateLog.class)
 public class UpdateLogIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    UpdateLogDataOnDemand dod;
+
+	@Test
+    public void testCountUpdateLogs() {
+        Assert.assertNotNull("Data on demand for 'UpdateLog' failed to initialize correctly", dod.getRandomUpdateLog());
+        long count = UpdateLog.countUpdateLogs();
+        Assert.assertTrue("Counter for 'UpdateLog' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindUpdateLog() {
+        UpdateLog obj = dod.getRandomUpdateLog();
+        Assert.assertNotNull("Data on demand for 'UpdateLog' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'UpdateLog' failed to provide an identifier", id);
+        obj = UpdateLog.findUpdateLog(id);
+        Assert.assertNotNull("Find method for 'UpdateLog' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'UpdateLog' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllUpdateLogs() {
+        Assert.assertNotNull("Data on demand for 'UpdateLog' failed to initialize correctly", dod.getRandomUpdateLog());
+        long count = UpdateLog.countUpdateLogs();
+        Assert.assertTrue("Too expensive to perform a find all test for 'UpdateLog', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<UpdateLog> result = UpdateLog.findAllUpdateLogs();
+        Assert.assertNotNull("Find all method for 'UpdateLog' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'UpdateLog' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindUpdateLogEntries() {
+        Assert.assertNotNull("Data on demand for 'UpdateLog' failed to initialize correctly", dod.getRandomUpdateLog());
+        long count = UpdateLog.countUpdateLogs();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<UpdateLog> result = UpdateLog.findUpdateLogEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'UpdateLog' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'UpdateLog' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        UpdateLog obj = dod.getRandomUpdateLog();
+        Assert.assertNotNull("Data on demand for 'UpdateLog' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'UpdateLog' failed to provide an identifier", id);
+        obj = UpdateLog.findUpdateLog(id);
+        Assert.assertNotNull("Find method for 'UpdateLog' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyUpdateLog(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'UpdateLog' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        UpdateLog obj = dod.getRandomUpdateLog();
+        Assert.assertNotNull("Data on demand for 'UpdateLog' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'UpdateLog' failed to provide an identifier", id);
+        obj = UpdateLog.findUpdateLog(id);
+        boolean modified =  dod.modifyUpdateLog(obj);
+        Integer currentVersion = obj.getVersion();
+        UpdateLog merged = obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'UpdateLog' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'UpdateLog' failed to initialize correctly", dod.getRandomUpdateLog());
+        UpdateLog obj = dod.getNewTransientUpdateLog(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'UpdateLog' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'UpdateLog' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'UpdateLog' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        UpdateLog obj = dod.getRandomUpdateLog();
+        Assert.assertNotNull("Data on demand for 'UpdateLog' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'UpdateLog' failed to provide an identifier", id);
+        obj = UpdateLog.findUpdateLog(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'UpdateLog' with identifier '" + id + "'", UpdateLog.findUpdateLog(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/UpdateLogIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/UpdateLogIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 93f3da5e6..000000000
--- a/src/test/java/com/labsynch/labseer/domain/UpdateLogIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UpdateLogIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect UpdateLogIntegrationTest_Roo_Configurable {
-    
-    declare @type: UpdateLogIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/UpdateLogIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/UpdateLogIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 3c425fa0a..000000000
--- a/src/test/java/com/labsynch/labseer/domain/UpdateLogIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.UpdateLog;
-import com.labsynch.labseer.domain.UpdateLogDataOnDemand;
-import com.labsynch.labseer.domain.UpdateLogIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect UpdateLogIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: UpdateLogIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: UpdateLogIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: UpdateLogIntegrationTest: @Transactional;
-    
-    @Autowired
-    UpdateLogDataOnDemand UpdateLogIntegrationTest.dod;
-    
-    @Test
-    public void UpdateLogIntegrationTest.testCountUpdateLogs() {
-        Assert.assertNotNull("Data on demand for 'UpdateLog' failed to initialize correctly", dod.getRandomUpdateLog());
-        long count = UpdateLog.countUpdateLogs();
-        Assert.assertTrue("Counter for 'UpdateLog' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void UpdateLogIntegrationTest.testFindUpdateLog() {
-        UpdateLog obj = dod.getRandomUpdateLog();
-        Assert.assertNotNull("Data on demand for 'UpdateLog' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'UpdateLog' failed to provide an identifier", id);
-        obj = UpdateLog.findUpdateLog(id);
-        Assert.assertNotNull("Find method for 'UpdateLog' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'UpdateLog' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void UpdateLogIntegrationTest.testFindAllUpdateLogs() {
-        Assert.assertNotNull("Data on demand for 'UpdateLog' failed to initialize correctly", dod.getRandomUpdateLog());
-        long count = UpdateLog.countUpdateLogs();
-        Assert.assertTrue("Too expensive to perform a find all test for 'UpdateLog', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<UpdateLog> result = UpdateLog.findAllUpdateLogs();
-        Assert.assertNotNull("Find all method for 'UpdateLog' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'UpdateLog' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void UpdateLogIntegrationTest.testFindUpdateLogEntries() {
-        Assert.assertNotNull("Data on demand for 'UpdateLog' failed to initialize correctly", dod.getRandomUpdateLog());
-        long count = UpdateLog.countUpdateLogs();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<UpdateLog> result = UpdateLog.findUpdateLogEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'UpdateLog' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'UpdateLog' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void UpdateLogIntegrationTest.testFlush() {
-        UpdateLog obj = dod.getRandomUpdateLog();
-        Assert.assertNotNull("Data on demand for 'UpdateLog' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'UpdateLog' failed to provide an identifier", id);
-        obj = UpdateLog.findUpdateLog(id);
-        Assert.assertNotNull("Find method for 'UpdateLog' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyUpdateLog(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'UpdateLog' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void UpdateLogIntegrationTest.testMergeUpdate() {
-        UpdateLog obj = dod.getRandomUpdateLog();
-        Assert.assertNotNull("Data on demand for 'UpdateLog' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'UpdateLog' failed to provide an identifier", id);
-        obj = UpdateLog.findUpdateLog(id);
-        boolean modified =  dod.modifyUpdateLog(obj);
-        Integer currentVersion = obj.getVersion();
-        UpdateLog merged = obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'UpdateLog' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void UpdateLogIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'UpdateLog' failed to initialize correctly", dod.getRandomUpdateLog());
-        UpdateLog obj = dod.getNewTransientUpdateLog(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'UpdateLog' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'UpdateLog' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'UpdateLog' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void UpdateLogIntegrationTest.testRemove() {
-        UpdateLog obj = dod.getRandomUpdateLog();
-        Assert.assertNotNull("Data on demand for 'UpdateLog' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'UpdateLog' failed to provide an identifier", id);
-        obj = UpdateLog.findUpdateLog(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'UpdateLog' with identifier '" + id + "'", UpdateLog.findUpdateLog(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ValueKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ValueKindDataOnDemand.java
index 4643c0170..454cca103 100755
--- a/src/test/java/com/labsynch/labseer/domain/ValueKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ValueKindDataOnDemand.java
@@ -1,7 +1,108 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Configurable
+@Component
 @RooDataOnDemand(entity = ValueKind.class)
 public class ValueKindDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<ValueKind> data;
+
+	@Autowired
+    ValueTypeDataOnDemand valueTypeDataOnDemand;
+
+	public ValueKind getNewTransientValueKind(int index) {
+        ValueKind obj = new ValueKind();
+        setKindName(obj, index);
+        setLsType(obj, index);
+        setLsTypeAndKind(obj, index);
+        return obj;
+    }
+
+	public void setKindName(ValueKind obj, int index) {
+        String kindName = "kindName_" + index;
+        if (kindName.length() > 64) {
+            kindName = kindName.substring(0, 64);
+        }
+        obj.setKindName(kindName);
+    }
+
+	public void setLsType(ValueKind obj, int index) {
+        ValueType lsType = valueTypeDataOnDemand.getRandomValueType();
+        obj.setLsType(lsType);
+    }
+
+	public void setLsTypeAndKind(ValueKind obj, int index) {
+        String lsTypeAndKind = "lsTypeAndKind_" + index;
+        if (lsTypeAndKind.length() > 255) {
+            lsTypeAndKind = new Random().nextInt(10) + lsTypeAndKind.substring(1, 255);
+        }
+        obj.setLsTypeAndKind(lsTypeAndKind);
+    }
+
+	public ValueKind getSpecificValueKind(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        ValueKind obj = data.get(index);
+        Long id = obj.getId();
+        return ValueKind.findValueKind(id);
+    }
+
+	public ValueKind getRandomValueKind() {
+        init();
+        ValueKind obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return ValueKind.findValueKind(id);
+    }
+
+	public boolean modifyValueKind(ValueKind obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = ValueKind.findValueKindEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'ValueKind' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<ValueKind>();
+        for (int i = 0; i < 10; i++) {
+            ValueKind obj = getNewTransientValueKind(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ValueKindDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ValueKindDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index ec0874d4e..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ValueKindDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ValueKindDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ValueKindDataOnDemand_Roo_Configurable {
-    
-    declare @type: ValueKindDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ValueKindDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ValueKindDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index e93134901..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ValueKindDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,113 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ValueKind;
-import com.labsynch.labseer.domain.ValueKindDataOnDemand;
-import com.labsynch.labseer.domain.ValueType;
-import com.labsynch.labseer.domain.ValueTypeDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-privileged aspect ValueKindDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ValueKindDataOnDemand: @Component;
-    
-    private Random ValueKindDataOnDemand.rnd = new SecureRandom();
-    
-    private List<ValueKind> ValueKindDataOnDemand.data;
-    
-    @Autowired
-    ValueTypeDataOnDemand ValueKindDataOnDemand.valueTypeDataOnDemand;
-    
-    public ValueKind ValueKindDataOnDemand.getNewTransientValueKind(int index) {
-        ValueKind obj = new ValueKind();
-        setKindName(obj, index);
-        setLsType(obj, index);
-        setLsTypeAndKind(obj, index);
-        return obj;
-    }
-    
-    public void ValueKindDataOnDemand.setKindName(ValueKind obj, int index) {
-        String kindName = "kindName_" + index;
-        if (kindName.length() > 64) {
-            kindName = kindName.substring(0, 64);
-        }
-        obj.setKindName(kindName);
-    }
-    
-    public void ValueKindDataOnDemand.setLsType(ValueKind obj, int index) {
-        ValueType lsType = valueTypeDataOnDemand.getRandomValueType();
-        obj.setLsType(lsType);
-    }
-    
-    public void ValueKindDataOnDemand.setLsTypeAndKind(ValueKind obj, int index) {
-        String lsTypeAndKind = "lsTypeAndKind_" + index;
-        if (lsTypeAndKind.length() > 255) {
-            lsTypeAndKind = new Random().nextInt(10) + lsTypeAndKind.substring(1, 255);
-        }
-        obj.setLsTypeAndKind(lsTypeAndKind);
-    }
-    
-    public ValueKind ValueKindDataOnDemand.getSpecificValueKind(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        ValueKind obj = data.get(index);
-        Long id = obj.getId();
-        return ValueKind.findValueKind(id);
-    }
-    
-    public ValueKind ValueKindDataOnDemand.getRandomValueKind() {
-        init();
-        ValueKind obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return ValueKind.findValueKind(id);
-    }
-    
-    public boolean ValueKindDataOnDemand.modifyValueKind(ValueKind obj) {
-        return false;
-    }
-    
-    public void ValueKindDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = ValueKind.findValueKindEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ValueKind' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<ValueKind>();
-        for (int i = 0; i < 10; i++) {
-            ValueKind obj = getNewTransientValueKind(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ValueKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ValueKindIntegrationTest.java
index ea0b26fe2..d65b05571 100755
--- a/src/test/java/com/labsynch/labseer/domain/ValueKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ValueKindIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@Configurable
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
 @RooIntegrationTest(entity = ValueKind.class)
 public class ValueKindIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ValueKindDataOnDemand dod;
+
+	@Test
+    public void testCountValueKinds() {
+        Assert.assertNotNull("Data on demand for 'ValueKind' failed to initialize correctly", dod.getRandomValueKind());
+        long count = ValueKind.countValueKinds();
+        Assert.assertTrue("Counter for 'ValueKind' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindValueKind() {
+        ValueKind obj = dod.getRandomValueKind();
+        Assert.assertNotNull("Data on demand for 'ValueKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ValueKind' failed to provide an identifier", id);
+        obj = ValueKind.findValueKind(id);
+        Assert.assertNotNull("Find method for 'ValueKind' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'ValueKind' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllValueKinds() {
+        Assert.assertNotNull("Data on demand for 'ValueKind' failed to initialize correctly", dod.getRandomValueKind());
+        long count = ValueKind.countValueKinds();
+        Assert.assertTrue("Too expensive to perform a find all test for 'ValueKind', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<ValueKind> result = ValueKind.findAllValueKinds();
+        Assert.assertNotNull("Find all method for 'ValueKind' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'ValueKind' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindValueKindEntries() {
+        Assert.assertNotNull("Data on demand for 'ValueKind' failed to initialize correctly", dod.getRandomValueKind());
+        long count = ValueKind.countValueKinds();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<ValueKind> result = ValueKind.findValueKindEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'ValueKind' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'ValueKind' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        ValueKind obj = dod.getRandomValueKind();
+        Assert.assertNotNull("Data on demand for 'ValueKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ValueKind' failed to provide an identifier", id);
+        obj = ValueKind.findValueKind(id);
+        Assert.assertNotNull("Find method for 'ValueKind' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyValueKind(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'ValueKind' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        ValueKind obj = dod.getRandomValueKind();
+        Assert.assertNotNull("Data on demand for 'ValueKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ValueKind' failed to provide an identifier", id);
+        obj = ValueKind.findValueKind(id);
+        boolean modified =  dod.modifyValueKind(obj);
+        Integer currentVersion = obj.getVersion();
+        ValueKind merged = obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'ValueKind' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'ValueKind' failed to initialize correctly", dod.getRandomValueKind());
+        ValueKind obj = dod.getNewTransientValueKind(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'ValueKind' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'ValueKind' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'ValueKind' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        ValueKind obj = dod.getRandomValueKind();
+        Assert.assertNotNull("Data on demand for 'ValueKind' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ValueKind' failed to provide an identifier", id);
+        obj = ValueKind.findValueKind(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'ValueKind' with identifier '" + id + "'", ValueKind.findValueKind(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ValueKindIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ValueKindIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 0688bb808..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ValueKindIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ValueKindIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ValueKindIntegrationTest_Roo_Configurable {
-    
-    declare @type: ValueKindIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ValueKindIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ValueKindIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index a5c2248f0..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ValueKindIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ValueKind;
-import com.labsynch.labseer.domain.ValueKindDataOnDemand;
-import com.labsynch.labseer.domain.ValueKindIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ValueKindIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ValueKindIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ValueKindIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ValueKindIntegrationTest: @Transactional;
-    
-    @Autowired
-    ValueKindDataOnDemand ValueKindIntegrationTest.dod;
-    
-    @Test
-    public void ValueKindIntegrationTest.testCountValueKinds() {
-        Assert.assertNotNull("Data on demand for 'ValueKind' failed to initialize correctly", dod.getRandomValueKind());
-        long count = ValueKind.countValueKinds();
-        Assert.assertTrue("Counter for 'ValueKind' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ValueKindIntegrationTest.testFindValueKind() {
-        ValueKind obj = dod.getRandomValueKind();
-        Assert.assertNotNull("Data on demand for 'ValueKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ValueKind' failed to provide an identifier", id);
-        obj = ValueKind.findValueKind(id);
-        Assert.assertNotNull("Find method for 'ValueKind' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ValueKind' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ValueKindIntegrationTest.testFindAllValueKinds() {
-        Assert.assertNotNull("Data on demand for 'ValueKind' failed to initialize correctly", dod.getRandomValueKind());
-        long count = ValueKind.countValueKinds();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ValueKind', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<ValueKind> result = ValueKind.findAllValueKinds();
-        Assert.assertNotNull("Find all method for 'ValueKind' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ValueKind' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ValueKindIntegrationTest.testFindValueKindEntries() {
-        Assert.assertNotNull("Data on demand for 'ValueKind' failed to initialize correctly", dod.getRandomValueKind());
-        long count = ValueKind.countValueKinds();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<ValueKind> result = ValueKind.findValueKindEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'ValueKind' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ValueKind' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ValueKindIntegrationTest.testFlush() {
-        ValueKind obj = dod.getRandomValueKind();
-        Assert.assertNotNull("Data on demand for 'ValueKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ValueKind' failed to provide an identifier", id);
-        obj = ValueKind.findValueKind(id);
-        Assert.assertNotNull("Find method for 'ValueKind' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyValueKind(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'ValueKind' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ValueKindIntegrationTest.testMergeUpdate() {
-        ValueKind obj = dod.getRandomValueKind();
-        Assert.assertNotNull("Data on demand for 'ValueKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ValueKind' failed to provide an identifier", id);
-        obj = ValueKind.findValueKind(id);
-        boolean modified =  dod.modifyValueKind(obj);
-        Integer currentVersion = obj.getVersion();
-        ValueKind merged = obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ValueKind' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ValueKindIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'ValueKind' failed to initialize correctly", dod.getRandomValueKind());
-        ValueKind obj = dod.getNewTransientValueKind(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ValueKind' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'ValueKind' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'ValueKind' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ValueKindIntegrationTest.testRemove() {
-        ValueKind obj = dod.getRandomValueKind();
-        Assert.assertNotNull("Data on demand for 'ValueKind' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ValueKind' failed to provide an identifier", id);
-        obj = ValueKind.findValueKind(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'ValueKind' with identifier '" + id + "'", ValueKind.findValueKind(id));
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ValueTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ValueTypeDataOnDemand.java
index 05e743f9e..255a42726 100755
--- a/src/test/java/com/labsynch/labseer/domain/ValueTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ValueTypeDataOnDemand.java
@@ -1,7 +1,89 @@
 package com.labsynch.labseer.domain;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.dod.RooDataOnDemand;
+import org.springframework.stereotype.Component;
 
+@Component
+@Configurable
 @RooDataOnDemand(entity = ValueType.class)
 public class ValueTypeDataOnDemand {
+
+	private Random rnd = new SecureRandom();
+
+	private List<ValueType> data;
+
+	public ValueType getNewTransientValueType(int index) {
+        ValueType obj = new ValueType();
+        setTypeName(obj, index);
+        return obj;
+    }
+
+	public void setTypeName(ValueType obj, int index) {
+        String typeName = "typeName_" + index;
+        if (typeName.length() > 64) {
+            typeName = new Random().nextInt(10) + typeName.substring(1, 64);
+        }
+        obj.setTypeName(typeName);
+    }
+
+	public ValueType getSpecificValueType(int index) {
+        init();
+        if (index < 0) {
+            index = 0;
+        }
+        if (index > (data.size() - 1)) {
+            index = data.size() - 1;
+        }
+        ValueType obj = data.get(index);
+        Long id = obj.getId();
+        return ValueType.findValueType(id);
+    }
+
+	public ValueType getRandomValueType() {
+        init();
+        ValueType obj = data.get(rnd.nextInt(data.size()));
+        Long id = obj.getId();
+        return ValueType.findValueType(id);
+    }
+
+	public boolean modifyValueType(ValueType obj) {
+        return false;
+    }
+
+	public void init() {
+        int from = 0;
+        int to = 10;
+        data = ValueType.findValueTypeEntries(from, to);
+        if (data == null) {
+            throw new IllegalStateException("Find entries implementation for 'ValueType' illegally returned null");
+        }
+        if (!data.isEmpty()) {
+            return;
+        }
+        
+        data = new ArrayList<ValueType>();
+        for (int i = 0; i < 10; i++) {
+            ValueType obj = getNewTransientValueType(i);
+            try {
+                obj.persist();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
+                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                }
+                throw new IllegalStateException(msg.toString(), e);
+            }
+            obj.flush();
+            data.add(obj);
+        }
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ValueTypeDataOnDemand_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ValueTypeDataOnDemand_Roo_Configurable.aj
deleted file mode 100755
index 5c2436914..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ValueTypeDataOnDemand_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ValueTypeDataOnDemand;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ValueTypeDataOnDemand_Roo_Configurable {
-    
-    declare @type: ValueTypeDataOnDemand: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ValueTypeDataOnDemand_Roo_DataOnDemand.aj b/src/test/java/com/labsynch/labseer/domain/ValueTypeDataOnDemand_Roo_DataOnDemand.aj
deleted file mode 100755
index 10420425f..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ValueTypeDataOnDemand_Roo_DataOnDemand.aj
+++ /dev/null
@@ -1,92 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ValueType;
-import com.labsynch.labseer.domain.ValueTypeDataOnDemand;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.springframework.stereotype.Component;
-
-privileged aspect ValueTypeDataOnDemand_Roo_DataOnDemand {
-    
-    declare @type: ValueTypeDataOnDemand: @Component;
-    
-    private Random ValueTypeDataOnDemand.rnd = new SecureRandom();
-    
-    private List<ValueType> ValueTypeDataOnDemand.data;
-    
-    public ValueType ValueTypeDataOnDemand.getNewTransientValueType(int index) {
-        ValueType obj = new ValueType();
-        setTypeName(obj, index);
-        return obj;
-    }
-    
-    public void ValueTypeDataOnDemand.setTypeName(ValueType obj, int index) {
-        String typeName = "typeName_" + index;
-        if (typeName.length() > 64) {
-            typeName = new Random().nextInt(10) + typeName.substring(1, 64);
-        }
-        obj.setTypeName(typeName);
-    }
-    
-    public ValueType ValueTypeDataOnDemand.getSpecificValueType(int index) {
-        init();
-        if (index < 0) {
-            index = 0;
-        }
-        if (index > (data.size() - 1)) {
-            index = data.size() - 1;
-        }
-        ValueType obj = data.get(index);
-        Long id = obj.getId();
-        return ValueType.findValueType(id);
-    }
-    
-    public ValueType ValueTypeDataOnDemand.getRandomValueType() {
-        init();
-        ValueType obj = data.get(rnd.nextInt(data.size()));
-        Long id = obj.getId();
-        return ValueType.findValueType(id);
-    }
-    
-    public boolean ValueTypeDataOnDemand.modifyValueType(ValueType obj) {
-        return false;
-    }
-    
-    public void ValueTypeDataOnDemand.init() {
-        int from = 0;
-        int to = 10;
-        data = ValueType.findValueTypeEntries(from, to);
-        if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ValueType' illegally returned null");
-        }
-        if (!data.isEmpty()) {
-            return;
-        }
-        
-        data = new ArrayList<ValueType>();
-        for (int i = 0; i < 10; i++) {
-            ValueType obj = getNewTransientValueType(i);
-            try {
-                obj.persist();
-            } catch (final ConstraintViolationException e) {
-                final StringBuilder msg = new StringBuilder();
-                for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-                }
-                throw new IllegalStateException(msg.toString(), e);
-            }
-            obj.flush();
-            data.add(obj);
-        }
-    }
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ValueTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ValueTypeIntegrationTest.java
index 8cc5b3b54..b101d82d8 100755
--- a/src/test/java/com/labsynch/labseer/domain/ValueTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ValueTypeIntegrationTest.java
@@ -1,12 +1,131 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Iterator;
+import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.roo.addon.test.RooIntegrationTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
 
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
+@Transactional
+@Configurable
 @RooIntegrationTest(entity = ValueType.class)
 public class ValueTypeIntegrationTest {
 
     @Test
     public void testMarkerMethod() {
     }
+
+	@Autowired
+    ValueTypeDataOnDemand dod;
+
+	@Test
+    public void testCountValueTypes() {
+        Assert.assertNotNull("Data on demand for 'ValueType' failed to initialize correctly", dod.getRandomValueType());
+        long count = ValueType.countValueTypes();
+        Assert.assertTrue("Counter for 'ValueType' incorrectly reported there were no entries", count > 0);
+    }
+
+	@Test
+    public void testFindValueType() {
+        ValueType obj = dod.getRandomValueType();
+        Assert.assertNotNull("Data on demand for 'ValueType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ValueType' failed to provide an identifier", id);
+        obj = ValueType.findValueType(id);
+        Assert.assertNotNull("Find method for 'ValueType' illegally returned null for id '" + id + "'", obj);
+        Assert.assertEquals("Find method for 'ValueType' returned the incorrect identifier", id, obj.getId());
+    }
+
+	@Test
+    public void testFindAllValueTypes() {
+        Assert.assertNotNull("Data on demand for 'ValueType' failed to initialize correctly", dod.getRandomValueType());
+        long count = ValueType.countValueTypes();
+        Assert.assertTrue("Too expensive to perform a find all test for 'ValueType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        List<ValueType> result = ValueType.findAllValueTypes();
+        Assert.assertNotNull("Find all method for 'ValueType' illegally returned null", result);
+        Assert.assertTrue("Find all method for 'ValueType' failed to return any data", result.size() > 0);
+    }
+
+	@Test
+    public void testFindValueTypeEntries() {
+        Assert.assertNotNull("Data on demand for 'ValueType' failed to initialize correctly", dod.getRandomValueType());
+        long count = ValueType.countValueTypes();
+        if (count > 20) count = 20;
+        int firstResult = 0;
+        int maxResults = (int) count;
+        List<ValueType> result = ValueType.findValueTypeEntries(firstResult, maxResults);
+        Assert.assertNotNull("Find entries method for 'ValueType' illegally returned null", result);
+        Assert.assertEquals("Find entries method for 'ValueType' returned an incorrect number of entries", count, result.size());
+    }
+
+	@Test
+    public void testFlush() {
+        ValueType obj = dod.getRandomValueType();
+        Assert.assertNotNull("Data on demand for 'ValueType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ValueType' failed to provide an identifier", id);
+        obj = ValueType.findValueType(id);
+        Assert.assertNotNull("Find method for 'ValueType' illegally returned null for id '" + id + "'", obj);
+        boolean modified =  dod.modifyValueType(obj);
+        Integer currentVersion = obj.getVersion();
+        obj.flush();
+        Assert.assertTrue("Version for 'ValueType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testMergeUpdate() {
+        ValueType obj = dod.getRandomValueType();
+        Assert.assertNotNull("Data on demand for 'ValueType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ValueType' failed to provide an identifier", id);
+        obj = ValueType.findValueType(id);
+        boolean modified =  dod.modifyValueType(obj);
+        Integer currentVersion = obj.getVersion();
+        ValueType merged = obj.merge();
+        obj.flush();
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
+        Assert.assertTrue("Version for 'ValueType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+    }
+
+	@Test
+    public void testPersist() {
+        Assert.assertNotNull("Data on demand for 'ValueType' failed to initialize correctly", dod.getRandomValueType());
+        ValueType obj = dod.getNewTransientValueType(Integer.MAX_VALUE);
+        Assert.assertNotNull("Data on demand for 'ValueType' failed to provide a new transient entity", obj);
+        Assert.assertNull("Expected 'ValueType' identifier to be null", obj.getId());
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
+        obj.flush();
+        Assert.assertNotNull("Expected 'ValueType' identifier to no longer be null", obj.getId());
+    }
+
+	@Test
+    public void testRemove() {
+        ValueType obj = dod.getRandomValueType();
+        Assert.assertNotNull("Data on demand for 'ValueType' failed to initialize correctly", obj);
+        Long id = obj.getId();
+        Assert.assertNotNull("Data on demand for 'ValueType' failed to provide an identifier", id);
+        obj = ValueType.findValueType(id);
+        obj.remove();
+        obj.flush();
+        Assert.assertNull("Failed to remove 'ValueType' with identifier '" + id + "'", ValueType.findValueType(id));
+    }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ValueTypeIntegrationTest_Roo_Configurable.aj b/src/test/java/com/labsynch/labseer/domain/ValueTypeIntegrationTest_Roo_Configurable.aj
deleted file mode 100755
index 194cd3309..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ValueTypeIntegrationTest_Roo_Configurable.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ValueTypeIntegrationTest;
-import org.springframework.beans.factory.annotation.Configurable;
-
-privileged aspect ValueTypeIntegrationTest_Roo_Configurable {
-    
-    declare @type: ValueTypeIntegrationTest: @Configurable;
-    
-}
diff --git a/src/test/java/com/labsynch/labseer/domain/ValueTypeIntegrationTest_Roo_IntegrationTest.aj b/src/test/java/com/labsynch/labseer/domain/ValueTypeIntegrationTest_Roo_IntegrationTest.aj
deleted file mode 100755
index 6682dcc35..000000000
--- a/src/test/java/com/labsynch/labseer/domain/ValueTypeIntegrationTest_Roo_IntegrationTest.aj
+++ /dev/null
@@ -1,133 +0,0 @@
-// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.
-// You may push code into the target .java compilation unit if you wish to edit any member(s).
-
-package com.labsynch.labseer.domain;
-
-import com.labsynch.labseer.domain.ValueType;
-import com.labsynch.labseer.domain.ValueTypeDataOnDemand;
-import com.labsynch.labseer.domain.ValueTypeIntegrationTest;
-import java.util.Iterator;
-import java.util.List;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-privileged aspect ValueTypeIntegrationTest_Roo_IntegrationTest {
-    
-    declare @type: ValueTypeIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
-    
-    declare @type: ValueTypeIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
-    
-    declare @type: ValueTypeIntegrationTest: @Transactional;
-    
-    @Autowired
-    ValueTypeDataOnDemand ValueTypeIntegrationTest.dod;
-    
-    @Test
-    public void ValueTypeIntegrationTest.testCountValueTypes() {
-        Assert.assertNotNull("Data on demand for 'ValueType' failed to initialize correctly", dod.getRandomValueType());
-        long count = ValueType.countValueTypes();
-        Assert.assertTrue("Counter for 'ValueType' incorrectly reported there were no entries", count > 0);
-    }
-    
-    @Test
-    public void ValueTypeIntegrationTest.testFindValueType() {
-        ValueType obj = dod.getRandomValueType();
-        Assert.assertNotNull("Data on demand for 'ValueType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ValueType' failed to provide an identifier", id);
-        obj = ValueType.findValueType(id);
-        Assert.assertNotNull("Find method for 'ValueType' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ValueType' returned the incorrect identifier", id, obj.getId());
-    }
-    
-    @Test
-    public void ValueTypeIntegrationTest.testFindAllValueTypes() {
-        Assert.assertNotNull("Data on demand for 'ValueType' failed to initialize correctly", dod.getRandomValueType());
-        long count = ValueType.countValueTypes();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ValueType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
-        List<ValueType> result = ValueType.findAllValueTypes();
-        Assert.assertNotNull("Find all method for 'ValueType' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ValueType' failed to return any data", result.size() > 0);
-    }
-    
-    @Test
-    public void ValueTypeIntegrationTest.testFindValueTypeEntries() {
-        Assert.assertNotNull("Data on demand for 'ValueType' failed to initialize correctly", dod.getRandomValueType());
-        long count = ValueType.countValueTypes();
-        if (count > 20) count = 20;
-        int firstResult = 0;
-        int maxResults = (int) count;
-        List<ValueType> result = ValueType.findValueTypeEntries(firstResult, maxResults);
-        Assert.assertNotNull("Find entries method for 'ValueType' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ValueType' returned an incorrect number of entries", count, result.size());
-    }
-    
-    @Test
-    public void ValueTypeIntegrationTest.testFlush() {
-        ValueType obj = dod.getRandomValueType();
-        Assert.assertNotNull("Data on demand for 'ValueType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ValueType' failed to provide an identifier", id);
-        obj = ValueType.findValueType(id);
-        Assert.assertNotNull("Find method for 'ValueType' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyValueType(obj);
-        Integer currentVersion = obj.getVersion();
-        obj.flush();
-        Assert.assertTrue("Version for 'ValueType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ValueTypeIntegrationTest.testMergeUpdate() {
-        ValueType obj = dod.getRandomValueType();
-        Assert.assertNotNull("Data on demand for 'ValueType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ValueType' failed to provide an identifier", id);
-        obj = ValueType.findValueType(id);
-        boolean modified =  dod.modifyValueType(obj);
-        Integer currentVersion = obj.getVersion();
-        ValueType merged = obj.merge();
-        obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ValueType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
-    }
-    
-    @Test
-    public void ValueTypeIntegrationTest.testPersist() {
-        Assert.assertNotNull("Data on demand for 'ValueType' failed to initialize correctly", dod.getRandomValueType());
-        ValueType obj = dod.getNewTransientValueType(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ValueType' failed to provide a new transient entity", obj);
-        Assert.assertNull("Expected 'ValueType' identifier to be null", obj.getId());
-        try {
-            obj.persist();
-        } catch (final ConstraintViolationException e) {
-            final StringBuilder msg = new StringBuilder();
-            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
-            }
-            throw new IllegalStateException(msg.toString(), e);
-        }
-        obj.flush();
-        Assert.assertNotNull("Expected 'ValueType' identifier to no longer be null", obj.getId());
-    }
-    
-    @Test
-    public void ValueTypeIntegrationTest.testRemove() {
-        ValueType obj = dod.getRandomValueType();
-        Assert.assertNotNull("Data on demand for 'ValueType' failed to initialize correctly", obj);
-        Long id = obj.getId();
-        Assert.assertNotNull("Data on demand for 'ValueType' failed to provide an identifier", id);
-        obj = ValueType.findValueType(id);
-        obj.remove();
-        obj.flush();
-        Assert.assertNull("Failed to remove 'ValueType' with identifier '" + id + "'", ValueType.findValueType(id));
-    }
-    
-}

From a196a31c5bedab83772f60cd842c1d99a23328f8 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Thu, 28 Apr 2022 18:12:54 -0700
Subject: [PATCH 54/73] Fix bbchem compilation

---
 .../chemclasses/bbchem/BBChemDryRunStructure.java      | 10 ----------
 .../chemclasses/bbchem/BBChemParentStructure.java      | 10 ----------
 .../chemclasses/bbchem/BBChemSaltFormStructure.java    | 10 ----------
 .../chemclasses/bbchem/BBChemSaltStructure.java        | 10 ----------
 .../bbchem/BBChemStandardizationDryRunStructure.java   | 10 ----------
 .../labseer/domain/AbstractBBChemStructure.java        |  1 +
 6 files changed, 1 insertion(+), 50 deletions(-)

diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure.java
index 224d1bb11..b31af2368 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure.java
@@ -45,16 +45,6 @@ public static BBChemDryRunStructure fromJsonToBBChemDryRunStructure(String json)
         .use(null, BBChemDryRunStructure.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<BBChemDryRunStructure> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-
-	public static String toJsonArray(Collection<BBChemDryRunStructure> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-
 	public static Collection<BBChemDryRunStructure> fromJsonArrayToBBChemDryRunStructures(String json) {
         return new JSONDeserializer<List<BBChemDryRunStructure>>()
         .use("values", BBChemDryRunStructure.class).deserialize(json);
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure.java
index fd759cf8a..09bcb575b 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure.java
@@ -56,16 +56,6 @@ public static BBChemParentStructure fromJsonToBBChemParentStructure(String json)
         .use(null, BBChemParentStructure.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<BBChemParentStructure> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-
-	public static String toJsonArray(Collection<BBChemParentStructure> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-
 	public static Collection<BBChemParentStructure> fromJsonArrayToBBChemParentStructures(String json) {
         return new JSONDeserializer<List<BBChemParentStructure>>()
         .use("values", BBChemParentStructure.class).deserialize(json);
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure.java
index efd8fc726..5a705c85a 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure.java
@@ -172,16 +172,6 @@ public static BBChemSaltFormStructure fromJsonToBBChemSaltFormStructure(String j
         .use(null, BBChemSaltFormStructure.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<BBChemSaltFormStructure> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-
-	public static String toJsonArray(Collection<BBChemSaltFormStructure> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-
 	public static Collection<BBChemSaltFormStructure> fromJsonArrayToBBChemSaltFormStructures(String json) {
         return new JSONDeserializer<List<BBChemSaltFormStructure>>()
         .use("values", BBChemSaltFormStructure.class).deserialize(json);
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure.java
index d022fc02c..1d02df72f 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure.java
@@ -156,16 +156,6 @@ public static BBChemSaltStructure fromJsonToBBChemSaltStructure(String json) {
         .use(null, BBChemSaltStructure.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<BBChemSaltStructure> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-
-	public static String toJsonArray(Collection<BBChemSaltStructure> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-
 	public static Collection<BBChemSaltStructure> fromJsonArrayToBBChemSaltStructures(String json) {
         return new JSONDeserializer<List<BBChemSaltStructure>>()
         .use("values", BBChemSaltStructure.class).deserialize(json);
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure.java
index 24a5587a2..1503a4763 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure.java
@@ -156,16 +156,6 @@ public static BBChemStandardizationDryRunStructure fromJsonToBBChemStandardizati
         .use(null, BBChemStandardizationDryRunStructure.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<BBChemStandardizationDryRunStructure> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
-
-	public static String toJsonArray(Collection<BBChemStandardizationDryRunStructure> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
-
 	public static Collection<BBChemStandardizationDryRunStructure> fromJsonArrayToBBChemStandardizationDryRunStructures(String json) {
         return new JSONDeserializer<List<BBChemStandardizationDryRunStructure>>()
         .use("values", BBChemStandardizationDryRunStructure.class).deserialize(json);
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure.java b/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure.java
index 135bc6ee8..80e10010e 100644
--- a/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure.java
+++ b/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure.java
@@ -132,6 +132,7 @@ public void updateStructureInfo(AbstractBBChemStructure updatedBbChemStructure)
 
 
 	@PersistenceContext
+    protected
     transient EntityManager entityManager;
 
 	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("id", "preReg", "reg", "mol", "substructure", "similarity", "recordedDate", "standardizationStatus", "standardizationComment", "registrationStatus", "registrationComment", "exactMolWeight", "averageMolWeight", "totalCharge", "smiles", "inchi", "molecularFormula", "properties");

From 12c720b995936baa578728dfc8b3acd1ab5735b7 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Thu, 28 Apr 2022 18:28:20 -0700
Subject: [PATCH 55/73] Remove roo dependencies and annotations

---
 .gitignore                                    |   1 -
 labsynch_v2.13.roo                            | 331 ------------------
 pom.xml                                       |  12 -
 .../api/ApiAnalysisGroupController.java       |   4 -
 .../api/ApiAnalysisGroupValueController.java  |   1 -
 .../labseer/api/ApiExperimentController.java  |   1 -
 .../labseer/api/ApiFileSaveController.java    |   1 -
 .../labseer/api/ApiFileTypeController.java    |   3 -
 .../api/ApiItxSubjectContainerController.java |   3 -
 .../labseer/api/ApiKindController.java        |   2 -
 .../api/ApiLabelSequenceController.java       |   2 -
 .../api/ApiLsTransactionController.java       |   1 -
 .../labseer/api/ApiMetalotController.java     |   1 -
 .../labseer/api/ApiOperatorController.java    |   2 -
 .../api/ApiParentAnnotationController.java    |   2 -
 .../api/ApiPhysicalStateController.java       |   2 -
 .../labseer/api/ApiProtocolController.java    |   2 -
 .../api/ApiPurityMeasuredByController.java    |   3 -
 .../labseer/api/ApiRegSearchController.java   |   1 -
 .../labseer/api/ApiSearchFormController.java  |   1 -
 .../api/ApiSolutionUnitController.java        |   2 -
 .../labseer/api/ApiStateController.java       |   2 -
 .../labseer/api/ApiSubjectController.java     |   1 -
 .../api/ApiSubjectValueController.java        |   2 -
 .../api/ApiTreatmentGroupController.java      |   1 -
 .../labseer/api/ApiTypeController.java        |   2 -
 .../bbchem/BBChemDryRunStructure.java         |   8 -
 .../bbchem/BBChemParentStructure.java         |   9 +-
 .../bbchem/BBChemSaltFormStructure.java       |   9 +-
 .../bbchem/BBChemSaltStructure.java           |   9 +-
 .../BBChemStandardizationDryRunStructure.java |   9 +-
 .../domain/AbstractBBChemStructure.java       |   9 +-
 .../labseer/domain/AbstractLabel.java         |   7 +-
 .../labseer/domain/AbstractState.java         |   7 +-
 .../labseer/domain/AbstractThing.java         |   7 +-
 .../labseer/domain/AbstractValue.java         |   7 +-
 .../labseer/domain/AnalysisGroup.java         |   9 +-
 .../labseer/domain/AnalysisGroupLabel.java    |   9 +-
 .../labseer/domain/AnalysisGroupState.java    |   9 +-
 .../labseer/domain/AnalysisGroupValue.java    |   9 +-
 .../labseer/domain/ApplicationSetting.java    |   9 +-
 .../com/labsynch/labseer/domain/Author.java   |  10 +-
 .../labsynch/labseer/domain/AuthorLabel.java  |   9 +-
 .../labsynch/labseer/domain/AuthorRole.java   |   8 -
 .../labsynch/labseer/domain/AuthorState.java  |   9 +-
 .../labsynch/labseer/domain/AuthorValue.java  |   9 +-
 .../labsynch/labseer/domain/BulkLoadFile.java |   9 +-
 .../labseer/domain/BulkLoadTemplate.java      |   9 +-
 .../labseer/domain/ChemStructure.java         |   9 +-
 .../labseer/domain/CmpdRegAppSetting.java     |   9 +-
 .../com/labsynch/labseer/domain/CodeKind.java |   9 +-
 .../labsynch/labseer/domain/CodeOrigin.java   |   9 +-
 .../com/labsynch/labseer/domain/CodeType.java |   9 +-
 .../com/labsynch/labseer/domain/Compound.java |   9 +-
 .../labsynch/labseer/domain/CompoundType.java |   9 +-
 .../labsynch/labseer/domain/Container.java    |   9 +-
 .../labseer/domain/ContainerKind.java         |   9 +-
 .../labseer/domain/ContainerLabel.java        |   9 +-
 .../labseer/domain/ContainerState.java        |   9 +-
 .../labseer/domain/ContainerType.java         |   9 +-
 .../labseer/domain/ContainerValue.java        |   9 +-
 .../com/labsynch/labseer/domain/CorpName.java |   9 +-
 .../com/labsynch/labseer/domain/CronJob.java  |   9 +-
 .../labsynch/labseer/domain/DDictKind.java    |   9 +-
 .../labsynch/labseer/domain/DDictType.java    |   9 +-
 .../labsynch/labseer/domain/DDictValue.java   |  11 -
 .../labseer/domain/DryRunCompound.java        |   9 +-
 .../labsynch/labseer/domain/Experiment.java   |   8 -
 .../labseer/domain/ExperimentKind.java        |   9 +-
 .../labseer/domain/ExperimentLabel.java       |   9 +-
 .../labseer/domain/ExperimentState.java       |   9 +-
 .../labseer/domain/ExperimentType.java        |   9 +-
 .../labseer/domain/ExperimentValue.java       |   9 +-
 .../com/labsynch/labseer/domain/FileList.java |   9 +-
 .../labsynch/labseer/domain/FileThing.java    |   9 +-
 .../com/labsynch/labseer/domain/FileType.java |   9 +-
 .../labseer/domain/InteractionKind.java       |   9 +-
 .../labseer/domain/InteractionType.java       |   9 +-
 .../com/labsynch/labseer/domain/IsoSalt.java  |   9 +-
 .../com/labsynch/labseer/domain/Isotope.java  |   9 +-
 .../labseer/domain/ItxContainerContainer.java |   9 +-
 .../domain/ItxContainerContainerState.java    |   9 +-
 .../domain/ItxContainerContainerValue.java    |   9 +-
 .../domain/ItxExperimentExperiment.java       |   9 +-
 .../domain/ItxExperimentExperimentState.java  |   9 +-
 .../domain/ItxExperimentExperimentValue.java  |   9 +-
 .../labseer/domain/ItxLsThingLsThing.java     |   9 +-
 .../domain/ItxLsThingLsThingState.java        |   9 +-
 .../domain/ItxLsThingLsThingValue.java        |   9 +-
 .../labseer/domain/ItxProtocolProtocol.java   |   9 +-
 .../domain/ItxProtocolProtocolState.java      |   9 +-
 .../domain/ItxProtocolProtocolValue.java      |   9 +-
 .../labseer/domain/ItxSubjectContainer.java   |   9 +-
 .../domain/ItxSubjectContainerState.java      |   9 +-
 .../domain/ItxSubjectContainerValue.java      |   9 +-
 .../labsynch/labseer/domain/LabelKind.java    |   9 +-
 .../labseer/domain/LabelSequence.java         |  10 -
 .../labseer/domain/LabelSequenceRole.java     |   8 -
 .../labsynch/labseer/domain/LabelType.java    |   9 +-
 .../java/com/labsynch/labseer/domain/Lot.java |  12 -
 .../com/labsynch/labseer/domain/LotAlias.java |  10 -
 .../labsynch/labseer/domain/LotAliasKind.java |   9 +-
 .../labsynch/labseer/domain/LotAliasType.java |   9 +-
 .../labseer/domain/LsInteraction.java         |   9 +-
 .../com/labsynch/labseer/domain/LsRole.java   |  13 -
 .../labsynch/labseer/domain/LsSeqAnlGrp.java  |   4 -
 .../labseer/domain/LsSeqContainer.java        |   4 -
 .../labsynch/labseer/domain/LsSeqExpt.java    |   4 -
 .../labseer/domain/LsSeqItxCntrCntr.java      |   4 -
 .../domain/LsSeqItxExperimentExperiment.java  |   4 -
 .../domain/LsSeqItxLsThingLsThing.java        |   4 -
 .../domain/LsSeqItxProtocolProtocol.java      |   4 -
 .../labseer/domain/LsSeqItxSubjCntr.java      |   4 -
 .../labseer/domain/LsSeqProtocol.java         |   4 -
 .../labsynch/labseer/domain/LsSeqSubject.java |   4 -
 .../labsynch/labseer/domain/LsSeqTrtGrp.java  |   4 -
 .../com/labsynch/labseer/domain/LsTag.java    |   8 -
 .../com/labsynch/labseer/domain/LsThing.java  |  14 -
 .../labsynch/labseer/domain/LsThingLabel.java |  11 -
 .../labsynch/labseer/domain/LsThingState.java |   9 +-
 .../labsynch/labseer/domain/LsThingValue.java |  17 -
 .../labseer/domain/LsTransaction.java         |   9 +-
 .../com/labsynch/labseer/domain/Operator.java |   9 +-
 .../labsynch/labseer/domain/OperatorKind.java |   9 +-
 .../labsynch/labseer/domain/OperatorType.java |   9 +-
 .../com/labsynch/labseer/domain/Parent.java   |   9 +-
 .../labsynch/labseer/domain/ParentAlias.java  |  11 -
 .../labseer/domain/ParentAliasKind.java       |   9 +-
 .../labseer/domain/ParentAliasType.java       |   9 +-
 .../labseer/domain/ParentAnnotation.java      |   9 +-
 .../labseer/domain/PhysicalState.java         |   9 +-
 .../labseer/domain/PreDef_CorpName.java       |   9 +-
 .../com/labsynch/labseer/domain/Protocol.java |   8 -
 .../labsynch/labseer/domain/ProtocolKind.java |   9 +-
 .../labseer/domain/ProtocolLabel.java         |   9 +-
 .../labseer/domain/ProtocolState.java         |   9 +-
 .../labsynch/labseer/domain/ProtocolType.java |   9 +-
 .../labseer/domain/ProtocolValue.java         |   9 +-
 .../labseer/domain/PurityMeasuredBy.java      |   9 +-
 .../labsynch/labseer/domain/RegSearch.java    |   7 +-
 .../com/labsynch/labseer/domain/RoleKind.java |   9 -
 .../com/labsynch/labseer/domain/RoleType.java |   9 +-
 .../com/labsynch/labseer/domain/Salt.java     |   9 +-
 .../com/labsynch/labseer/domain/SaltForm.java |   9 +-
 .../labseer/domain/SaltFormAlias.java         |   9 +-
 .../labseer/domain/SaltFormAliasKind.java     |   9 +-
 .../labseer/domain/SaltFormAliasType.java     |   9 +-
 .../labsynch/labseer/domain/SolutionUnit.java |   9 +-
 .../domain/StandardizationDryRunCompound.java |   9 +-
 .../domain/StandardizationHistory.java        |   9 +-
 .../domain/StandardizationSettings.java       |   9 +-
 .../labsynch/labseer/domain/StateKind.java    |   9 +-
 .../labsynch/labseer/domain/StateType.java    |   9 +-
 .../labseer/domain/StereoCategory.java        |   9 +-
 .../labseer/domain/StructureKind.java         |   9 -
 .../labseer/domain/StructureType.java         |   9 +-
 .../com/labsynch/labseer/domain/Subject.java  |   9 +-
 .../labsynch/labseer/domain/SubjectLabel.java |   9 +-
 .../labsynch/labseer/domain/SubjectState.java |   8 -
 .../labsynch/labseer/domain/SubjectValue.java |   8 -
 .../labseer/domain/TempSelectTable.java       |   7 +-
 .../labsynch/labseer/domain/ThingKind.java    |   9 +-
 .../labsynch/labseer/domain/ThingPage.java    |   9 +-
 .../labseer/domain/ThingPageArchive.java      |   9 +-
 .../labsynch/labseer/domain/ThingType.java    |   9 +-
 .../labseer/domain/TreatmentGroup.java        |   9 +-
 .../labseer/domain/TreatmentGroupLabel.java   |   9 +-
 .../labseer/domain/TreatmentGroupState.java   |   9 +-
 .../labseer/domain/TreatmentGroupValue.java   |   9 -
 .../labseer/domain/UncertaintyKind.java       |   9 +-
 .../com/labsynch/labseer/domain/Unit.java     |   9 +-
 .../com/labsynch/labseer/domain/UnitKind.java |   9 +-
 .../com/labsynch/labseer/domain/UnitType.java |   9 +-
 .../labsynch/labseer/domain/UpdateLog.java    |   7 +-
 .../labsynch/labseer/domain/ValueKind.java    |   9 +-
 .../labsynch/labseer/domain/ValueType.java    |   9 +-
 .../com/labsynch/labseer/domain/Vendor.java   |   9 +-
 .../labseer/dto/AnalysisGroupCodeDTO.java     |   7 +-
 .../labseer/dto/AnalysisGroupCsvDTO.java      |   7 +-
 .../dto/AnalysisGroupStatePathDTO.java        |   7 +-
 .../dto/AnalysisGroupValueBaseDTO.java        |   7 +-
 .../labseer/dto/AnalysisGroupValueDTO.java    |   7 +-
 .../dto/AnalysisGroupValuePathDTO.java        |   7 +-
 .../labseer/dto/AuthGroupsAndProjectsDTO.java |   7 +-
 .../labsynch/labseer/dto/AuthGroupsDTO.java   |   7 +-
 .../labsynch/labseer/dto/AuthProjectDTO.java  |   7 +-
 .../labseer/dto/AuthProjectGroupsDTO.java     |   7 +-
 .../com/labsynch/labseer/dto/AuthUserDTO.java |   7 +-
 .../labseer/dto/AuthorBrowserQueryDTO.java    |   7 +-
 .../labsynch/labseer/dto/AuthorNameDTO.java   |   7 +-
 .../labsynch/labseer/dto/AuthorQueryDTO.java  |   7 +-
 .../labseer/dto/AuthorQueryResultDTO.java     |   7 +-
 .../labsynch/labseer/dto/AuthorRoleDTO.java   |   7 +-
 .../labsynch/labseer/dto/AutoLabelDTO.java    |   7 +-
 .../labsynch/labseer/dto/BatchCodeDTO.java    |   7 +-
 .../labseer/dto/BatchCodeDependencyDTO.java   |   7 +-
 .../labsynch/labseer/dto/BatchProjectDTO.java |   7 +-
 .../labseer/dto/BulkLoadPropertiesDTO.java    |   7 +-
 .../dto/BulkLoadPropertyMappingDTO.java       |   7 +-
 .../dto/BulkLoadRegisterSDFRequestDTO.java    |   7 +-
 .../dto/BulkLoadRegisterSDFResponseDTO.java   |   7 +-
 .../dto/BulkLoadSDFPropertyRequestDTO.java    |   7 +-
 ...oadSDFValidationPropertiesResponseDTO.java |   7 +-
 .../labseer/dto/BulkLoadTemplateDTO.java      |   7 +-
 .../labseer/dto/BulkTransferPart1DTO.java     |   7 +-
 .../labseer/dto/ChangePasswordDTO.java        |   7 +-
 .../labseer/dto/CleanMolOptionsDTO.java       |   7 +-
 .../labseer/dto/CmpdRegBatchCodeDTO.java      |   7 +-
 .../dto/CmpdRegStructureSearchDTO.java        |   7 +-
 .../labsynch/labseer/dto/CodeLabelDTO.java    |   7 +-
 .../labseer/dto/CodeNameQueryDTO.java         |   7 +-
 .../labseer/dto/CodeNameValueDTO.java         |   7 +-
 .../labsynch/labseer/dto/CodeTableDTO.java    |   7 +-
 .../labsynch/labseer/dto/CodeTypeKindDTO.java |   7 +-
 .../labseer/dto/ContainerBatchCodeDTO.java    |   7 +-
 .../labseer/dto/ContainerBrowserQueryDTO.java |   7 +-
 .../dto/ContainerCodeNameStateDTO.java        |   7 +-
 .../dto/ContainerDependencyCheckDTO.java      |   7 +-
 .../labseer/dto/ContainerErrorMessageDTO.java |   7 +-
 .../labseer/dto/ContainerLocationDTO.java     |   7 +-
 .../labseer/dto/ContainerLocationTreeDTO.java |   7 +-
 .../labseer/dto/ContainerMiniDTO.java         |   7 +-
 .../labseer/dto/ContainerQueryDTO.java        |   7 +-
 .../labseer/dto/ContainerQueryResultDTO.java  |   7 +-
 .../labseer/dto/ContainerRequestDTO.java      |   7 +-
 .../dto/ContainerSearchRequestDTO.java        |   7 +-
 .../labseer/dto/ContainerStateMiniDTO.java    |   7 +-
 .../labseer/dto/ContainerStatePathDTO.java    |   7 +-
 .../labseer/dto/ContainerSubjectsDTO.java     |   7 +-
 .../labseer/dto/ContainerValuePathDTO.java    |   7 +-
 .../labseer/dto/ContainerValueRequestDTO.java |   7 +-
 .../labseer/dto/ContainerWellCodeDTO.java     |   7 +-
 .../com/labsynch/labseer/dto/CorpNameDTO.java |   7 +-
 .../labseer/dto/CreatePlateRequestDTO.java    |   7 +-
 .../com/labsynch/labseer/dto/CurveFitDTO.java |   7 +-
 .../dto/DateValueComparisonRequest.java       |   7 +-
 .../labseer/dto/DependencyCheckDTO.java       |   7 +-
 .../labseer/dto/DoseReponseParamsDTO.java     |   7 +-
 .../com/labsynch/labseer/dto/EntrezDbDTO.java |   7 +-
 .../labsynch/labseer/dto/EntrezDbGeneDTO.java |   7 +-
 .../dto/EntrezDiscontinuedGeneDTO.java        |   7 +-
 .../labsynch/labseer/dto/ErrorMessageDTO.java |   7 +-
 .../labseer/dto/ExperimentCodeDTO.java        |   7 +-
 .../labseer/dto/ExperimentCsvDataDTO.java     |   7 +-
 .../labseer/dto/ExperimentDataDTO.java        |   7 +-
 .../dto/ExperimentErrorMessageDTO.java        |   7 +-
 .../labseer/dto/ExperimentFilterDTO.java      |   7 +-
 .../dto/ExperimentFilterSearchDTO.java        |   7 +-
 .../labseer/dto/ExperimentGuiStubDTO.java     |   7 +-
 .../dto/ExperimentSearchRequestDTO.java       |   7 +-
 .../labseer/dto/ExperimentStatePathDTO.java   |   7 +-
 .../labseer/dto/ExperimentValuePathDTO.java   |   7 +-
 .../labsynch/labseer/dto/ExportResultDTO.java |   7 +-
 .../labseer/dto/FileSaveReturnArrayDTO.java   |   7 +-
 .../labseer/dto/FileSaveReturnDTO.java        |   7 +-
 .../labsynch/labseer/dto/FileSaveSendDTO.java |   7 +-
 .../com/labsynch/labseer/dto/FlagWellDTO.java |   7 +-
 .../labsynch/labseer/dto/FlatThingCsvDTO.java |   7 +-
 .../com/labsynch/labseer/dto/GeneIdDTO.java   |   7 +-
 .../labsynch/labseer/dto/GeneOrthologDTO.java |   7 +-
 .../labseer/dto/GeneOrthologFileDTO.java      |   7 +-
 .../dto/GenericQueryCodeTableResultDTO.java   |   7 +-
 .../labseer/dto/GenericStatePathRequest.java  |   7 +-
 .../labseer/dto/GenericValuePathRequest.java  |   7 +-
 .../labseer/dto/HydrogenizeMolInputDTO.java   |   7 +-
 .../labsynch/labseer/dto/IdCollectionDTO.java |   7 +-
 .../com/labsynch/labseer/dto/IdSetDTO.java    |   7 +-
 .../com/labsynch/labseer/dto/ItxQueryDTO.java |   7 +-
 .../labsynch/labseer/dto/JSTreeNodeDTO.java   |   7 +-
 .../com/labsynch/labseer/dto/KeyValueDTO.java |   7 +-
 .../labsynch/labseer/dto/KiCurveFitDTO.java   |   7 +-
 .../labsynch/labseer/dto/LabelPrefixDTO.java  |   7 +-
 .../labsynch/labseer/dto/LabelQueryDTO.java   |   7 +-
 .../labseer/dto/LabelSequenceDTO.java         |   7 +-
 .../com/labsynch/labseer/dto/LicenseDTO.java  |   7 +-
 .../com/labsynch/labseer/dto/LotAliasDTO.java |   7 +-
 .../java/com/labsynch/labseer/dto/LotDTO.java |   8 +-
 .../labseer/dto/LotsByProjectDTO.java         |   5 -
 .../labseer/dto/LsThingBrowserQueryDTO.java   |   7 +-
 .../labsynch/labseer/dto/LsThingQueryDTO.java |   7 +-
 .../labseer/dto/LsThingQueryResultDTO.java    |   7 +-
 .../labseer/dto/LsThingStatePathDTO.java      |   7 +-
 .../labseer/dto/LsThingValidationDTO.java     |   7 +-
 .../labseer/dto/LsThingValuePathDTO.java      |   7 +-
 .../labseer/dto/LsTransactionQueryDTO.java    |   7 +-
 .../com/labsynch/labseer/dto/Metalot.java     |   7 +-
 .../labsynch/labseer/dto/MetalotReturn.java   |   7 +-
 .../labseer/dto/MetalotReturnDTO.java         |   7 +-
 .../labsynch/labseer/dto/MethodOptionDTO.java |   7 +-
 .../labseer/dto/MolCleanInputDTO.java         |   7 +-
 .../labseer/dto/MolConvertInputDTO.java       |   7 +-
 .../labseer/dto/MolConvertOutputDTO.java      |   7 +-
 .../com/labsynch/labseer/dto/MolInputDTO.java |   7 +-
 .../labseer/dto/MolPropertiesDTO.java         |   7 +-
 .../MultiContainerSubjectSearchRequest.java   |   7 +-
 .../MultiContainerSubjectSearchResultDTO.java |   7 +-
 .../labsynch/labseer/dto/ParentAliasDTO.java  |   7 +-
 .../com/labsynch/labseer/dto/ParentDTO.java   |   7 +-
 .../labsynch/labseer/dto/ParentEditDTO.java   |   7 +-
 .../labseer/dto/ParentLotCodeDTO.java         |   7 +-
 .../labseer/dto/ParentValidationDTO.java      |   7 +-
 .../labsynch/labseer/dto/PlateStubDTO.java    |   7 +-
 .../labsynch/labseer/dto/PlateWellDTO.java    |   7 +-
 .../labseer/dto/PreferredNameDTO.java         |   7 +-
 .../labseer/dto/PreferredNameRequestDTO.java  |   7 +-
 .../labseer/dto/PreferredNameResultsDTO.java  |   7 +-
 .../dto/PreferredNameWithErrorDTO.java        |   7 +-
 .../com/labsynch/labseer/dto/ProtocolDTO.java |   8 -
 .../labseer/dto/ProtocolErrorMessageDTO.java  |   7 +-
 .../labseer/dto/ProtocolStatePathDTO.java     |   7 +-
 .../labseer/dto/ProtocolValuePathDTO.java     |   7 +-
 .../PurgeFileDependencyCheckResponseDTO.java  |   7 +-
 .../labseer/dto/PurgeFileResponseDTO.java     |   7 +-
 .../labsynch/labseer/dto/RawCurveDataDTO.java |   7 +-
 .../labsynch/labseer/dto/RegSearchDTO.java    |   7 +-
 .../labseer/dto/RegSearchParamsDTO.java       |   7 +-
 .../labseer/dto/RenderMolRequestDTO.java      |   7 +-
 .../labsynch/labseer/dto/ReparentLotDTO.java  |   7 +-
 .../labsynch/labseer/dto/RequestNameDTO.java  |   7 +-
 .../labsynch/labseer/dto/SELColOrderDTO.java  |   7 +-
 .../labseer/dto/SaltFormAliasDTO.java         |   7 +-
 .../com/labsynch/labseer/dto/SaltFormDTO.java |   7 +-
 .../labseer/dto/SearchCdIdReturnDTO.java      |   7 +-
 .../labseer/dto/SearchCompoundReturnDTO.java  |   7 +-
 .../labsynch/labseer/dto/SearchFormDTO.java   |   7 +-
 .../labseer/dto/SearchFormReturnDTO.java      |   7 +-
 .../labsynch/labseer/dto/SearchLotDTO.java    |   7 +-
 .../dto/SearchResultExportRequestDTO.java     |   7 +-
 .../labseer/dto/SetTubeLocationDTO.java       |   7 +-
 .../dto/SimpleBulkLoadPropertyDTO.java        |   7 +-
 .../dto/StandardizationDryRunSearchDTO.java   |   7 +-
 .../labseer/dto/StateValueCsvDTO.java         |   7 +-
 .../labsynch/labseer/dto/StateValueDTO.java   |   7 +-
 .../dto/StoichiometryPropertiesDTO.java       |   7 +-
 .../StoichiometryPropertiesResultsDTO.java    |   7 +-
 .../labseer/dto/StringCollectionDTO.java      |   7 +-
 .../labsynch/labseer/dto/StrippedSaltDTO.java |   7 +-
 .../dto/StructureAndThingSearchDTO.java       |   7 +-
 .../labseer/dto/StructureSearchDTO.java       |   7 +-
 .../labsynch/labseer/dto/SubjectCodeDTO.java  |   7 +-
 .../labseer/dto/SubjectCodeNameDTO.java       |   7 +-
 .../labseer/dto/SubjectCodeStateDTO.java      |   7 +-
 .../labseer/dto/SubjectCsvDataDTO.java        |   7 +-
 .../com/labsynch/labseer/dto/SubjectDTO.java  |   7 +-
 .../labsynch/labseer/dto/SubjectLabelDTO.java |   7 +-
 .../labsynch/labseer/dto/SubjectMiniDTO.java  |   7 +-
 .../labseer/dto/SubjectSearchRequest.java     |   7 +-
 .../labseer/dto/SubjectSearchResultDTO.java   |   7 +-
 .../labsynch/labseer/dto/SubjectStateDTO.java |   7 +-
 .../labseer/dto/SubjectStateMiniDTO.java      |   7 +-
 .../labseer/dto/SubjectStatePathDTO.java      |   7 +-
 .../labseer/dto/SubjectStateValueDTO.java     |   7 +-
 .../labsynch/labseer/dto/SubjectValueDTO.java |   7 +-
 .../labseer/dto/SubjectValuePathDTO.java      |   7 +-
 .../labsynch/labseer/dto/TempThingDTO.java    |   7 +-
 .../com/labsynch/labseer/dto/TgDataDTO.java   |   7 +-
 .../labseer/dto/TreatmentGroupCodeDTO.java    |   7 +-
 .../labseer/dto/TreatmentGroupMiniDTO.java    |   7 +-
 .../dto/TreatmentGroupStatePathDTO.java       |   7 +-
 .../labseer/dto/TreatmentGroupValueDTO.java   |   7 +-
 .../dto/TreatmentGroupValuePathDTO.java       |   7 +-
 .../labseer/dto/TsvLoaderResponseDTO.java     |   7 +-
 .../com/labsynch/labseer/dto/TypeDTO.java     |   7 +-
 .../com/labsynch/labseer/dto/TypeKindDTO.java |   7 +-
 .../labseer/dto/ValidationResponseDTO.java    |   7 +-
 .../labsynch/labseer/dto/ValuePathDTO.java    |   7 +-
 .../labsynch/labseer/dto/ValueQueryDTO.java   |   7 +-
 .../labsynch/labseer/dto/ValueRuleDTO.java    |   7 +-
 .../labseer/dto/ValueTypeKindDTO.java         |   7 +-
 .../labsynch/labseer/dto/WellContentDTO.java  |   7 +-
 .../com/labsynch/labseer/dto/WellStubDTO.java |   7 +-
 .../StandardizerSettingsConfigDTO.java        |   7 +-
 .../labseer/exceptions/ErrorMessage.java      |   7 +-
 .../LsThingValidationErrorMessage.java        |   7 +-
 .../labsynch/labseer/service/ErrorList.java   |   7 +-
 .../labseer/service/ErrorMessage.java         |   7 +-
 .../labsynch/labseer/service/SaltLoader.java  |   7 +-
 ...plicationConversionServiceFactoryBean.java |   2 -
 .../domain/AnalysisGroupDataOnDemand.java     |   2 -
 .../domain/AnalysisGroupIntegrationTest.java  |   2 -
 .../AnalysisGroupLabelDataOnDemand.java       |   2 -
 .../AnalysisGroupLabelIntegrationTest.java    |   2 -
 .../AnalysisGroupStateDataOnDemand.java       |   2 -
 .../AnalysisGroupStateIntegrationTest.java    |   2 -
 .../AnalysisGroupValueDataOnDemand.java       |   2 -
 .../AnalysisGroupValueIntegrationTest.java    |   2 -
 .../labseer/domain/AuthorDataOnDemand.java    |   2 -
 .../labseer/domain/AuthorIntegrationTest.java |   2 -
 .../labsynch/labseer/domain/AuthorTest.java   |   2 -
 .../labseer/domain/ContainerDataOnDemand.java |   2 -
 .../domain/ContainerIntegrationTest.java      |   2 -
 .../domain/ContainerKindDataOnDemand.java     |   2 -
 .../domain/ContainerKindIntegrationTest.java  |   2 -
 .../domain/ContainerLabelDataOnDemand.java    |   2 -
 .../domain/ContainerLabelIntegrationTest.java |   2 -
 .../domain/ContainerStateDataOnDemand.java    |   2 -
 .../domain/ContainerStateIntegrationTest.java |   2 -
 .../domain/ContainerTypeDataOnDemand.java     |   2 -
 .../domain/ContainerTypeIntegrationTest.java  |   2 -
 .../domain/ContainerValueDataOnDemand.java    |   2 -
 .../domain/ContainerValueIntegrationTest.java |   2 -
 .../domain/ExperimentDataOnDemand.java        |   2 -
 .../domain/ExperimentIntegrationTest.java     |   2 -
 .../domain/ExperimentKindDataOnDemand.java    |   2 -
 .../domain/ExperimentKindIntegrationTest.java |   2 -
 .../domain/ExperimentLabelDataOnDemand.java   |   2 -
 .../ExperimentLabelIntegrationTest.java       |   2 -
 .../domain/ExperimentStateDataOnDemand.java   |   2 -
 .../ExperimentStateIntegrationTest.java       |   2 -
 .../domain/ExperimentTypeDataOnDemand.java    |   2 -
 .../domain/ExperimentTypeIntegrationTest.java |   2 -
 .../domain/ExperimentValueDataOnDemand.java   |   2 -
 .../ExperimentValueIntegrationTest.java       |   2 -
 .../domain/InteractionKindDataOnDemand.java   |   2 -
 .../InteractionKindIntegrationTest.java       |   2 -
 .../domain/InteractionTypeDataOnDemand.java   |   2 -
 .../InteractionTypeIntegrationTest.java       |   2 -
 .../ItxContainerContainerDataOnDemand.java    |   2 -
 .../ItxContainerContainerIntegrationTest.java |   2 -
 ...txContainerContainerStateDataOnDemand.java |   2 -
 ...ontainerContainerStateIntegrationTest.java |   2 -
 ...txContainerContainerValueDataOnDemand.java |   2 -
 ...ontainerContainerValueIntegrationTest.java |   2 -
 .../ItxSubjectContainerDataOnDemand.java      |   2 -
 .../ItxSubjectContainerIntegrationTest.java   |   2 -
 .../ItxSubjectContainerStateDataOnDemand.java |   2 -
 ...xSubjectContainerStateIntegrationTest.java |   2 -
 .../ItxSubjectContainerValueDataOnDemand.java |   2 -
 ...xSubjectContainerValueIntegrationTest.java |   2 -
 .../labseer/domain/LabelKindDataOnDemand.java |   2 -
 .../domain/LabelKindIntegrationTest.java      |   2 -
 .../domain/LabelSequenceDataOnDemand.java     |   2 -
 .../domain/LabelSequenceIntegrationTest.java  |   2 -
 .../labseer/domain/LabelTypeDataOnDemand.java |   2 -
 .../domain/LabelTypeIntegrationTest.java      |   2 -
 .../domain/LsInteractionDataOnDemand.java     |   2 -
 .../domain/LsInteractionIntegrationTest.java  |   2 -
 .../domain/LsTransactionDataOnDemand.java     |   2 -
 .../domain/LsTransactionIntegrationTest.java  |   2 -
 .../domain/OperatorTypeDataOnDemand.java      |   2 -
 .../domain/OperatorTypeIntegrationTest.java   |   2 -
 .../labseer/domain/ProtocolDataOnDemand.java  |   2 -
 .../domain/ProtocolIntegrationTest.java       |   2 -
 .../domain/ProtocolKindDataOnDemand.java      |   2 -
 .../domain/ProtocolKindIntegrationTest.java   |   2 -
 .../domain/ProtocolLabelDataOnDemand.java     |   2 -
 .../domain/ProtocolLabelIntegrationTest.java  |   2 -
 .../domain/ProtocolStateDataOnDemand.java     |   2 -
 .../domain/ProtocolStateIntegrationTest.java  |   2 -
 .../domain/ProtocolTypeDataOnDemand.java      |   2 -
 .../domain/ProtocolTypeIntegrationTest.java   |   2 -
 .../domain/ProtocolValueDataOnDemand.java     |   2 -
 .../domain/ProtocolValueIntegrationTest.java  |   2 -
 .../labseer/domain/StateKindDataOnDemand.java |   2 -
 .../domain/StateKindIntegrationTest.java      |   2 -
 .../labseer/domain/StateTypeDataOnDemand.java |   2 -
 .../domain/StateTypeIntegrationTest.java      |   2 -
 .../labseer/domain/SubjectDataOnDemand.java   |   2 -
 .../domain/SubjectIntegrationTest.java        |   2 -
 .../domain/SubjectStateDataOnDemand.java      |   2 -
 .../domain/SubjectStateIntegrationTest.java   |   2 -
 .../domain/SubjectValueDataOnDemand.java      |   2 -
 .../domain/SubjectValueIntegrationTest.java   |   2 -
 .../labseer/domain/ThingKindDataOnDemand.java |   2 -
 .../domain/ThingKindIntegrationTest.java      |   2 -
 .../domain/ThingPageArchiveDataOnDemand.java  |   2 -
 .../ThingPageArchiveIntegrationTest.java      |   2 -
 .../labseer/domain/ThingPageDataOnDemand.java |   2 -
 .../domain/ThingPageIntegrationTest.java      |   2 -
 .../labseer/domain/ThingTypeDataOnDemand.java |   2 -
 .../domain/ThingTypeIntegrationTest.java      |   2 -
 .../domain/TreatmentGroupDataOnDemand.java    |   2 -
 .../domain/TreatmentGroupIntegrationTest.java |   2 -
 .../TreatmentGroupStateDataOnDemand.java      |   2 -
 .../TreatmentGroupStateIntegrationTest.java   |   2 -
 .../TreatmentGroupValueDataOnDemand.java      |   2 -
 .../TreatmentGroupValueIntegrationTest.java   |   2 -
 .../labseer/domain/UnitKindDataOnDemand.java  |   2 -
 .../domain/UnitKindIntegrationTest.java       |   2 -
 .../labseer/domain/UnitTypeDataOnDemand.java  |   2 -
 .../domain/UnitTypeIntegrationTest.java       |   2 -
 .../labseer/domain/UpdateLogDataOnDemand.java |   2 -
 .../domain/UpdateLogIntegrationTest.java      |   2 -
 .../labseer/domain/ValueKindDataOnDemand.java |   2 -
 .../domain/ValueKindIntegrationTest.java      |   2 -
 .../labseer/domain/ValueTypeDataOnDemand.java |   2 -
 .../domain/ValueTypeIntegrationTest.java      |   2 -
 487 files changed, 319 insertions(+), 2998 deletions(-)
 delete mode 100755 labsynch_v2.13.roo

diff --git a/.gitignore b/.gitignore
index d4e3082de..9eab4a3f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 .project
 .classpath
 .settings
-log.roo
 .vscode
 .m2
 lib
\ No newline at end of file
diff --git a/labsynch_v2.13.roo b/labsynch_v2.13.roo
deleted file mode 100755
index 9061c32cc..000000000
--- a/labsynch_v2.13.roo
+++ /dev/null
@@ -1,331 +0,0 @@
-// new flattened models - 2012-11-11
-
-project --topLevelPackage com.labsynch.labseer --projectName labseer
-
-//jpa setup --database MYSQL --provider HIBERNATE --password root --userName root --hostName 127.0.0.1:8889 --databaseName labsynch4
-//jpa setup --provider ECLIPSELINK --database HYPERSONIC_IN_MEMORY
-//jpa setup --provider HIBERNATE --database HYPERSONIC_IN_MEMORY
-jpa setup --provider HIBERNATE --database ORACLE --hostName ora.labsynch.com --databaseName osl --userName labseer2 --password labseer2_password
-
-
-// Create domain entities
-
-entity jpa --class ~.domain.lsTransaction --activeRecord true --testAutomatically --sequenceName LS_TRANSACTION_PKSEQ
-field string --fieldName comments --sizeMax 255
-field date --fieldName recordedDate --type java.util.Date --notNull --timeFormat MEDIUM
-
-
-entity jpa --class ~.domain.Author --activeRecord true --testAutomatically --sequenceName AUTHOR_PKSEQ
-field string --fieldName firstName --sizeMax 255
-field string --fieldName middleName --sizeMax 255
-field string --fieldName lastName --sizeMax 255
-field string --fieldName userName --sizeMax 255 --notNull --unique
-field string --fieldName email --sizeMax 255
-field string --fieldName password --sizeMax 255
-field date --fieldName recordedDate --type java.util.Date --notNull --timeFormat MEDIUM
-
-entity jpa --class ~.domain.ThingType --activeRecord true --testAutomatically --sequenceName THING_TYPE_PKSEQ
-field string --fieldName typeName --sizeMax 128 --notNull --unique
-
-entity jpa --class ~.domain.ThingKind --activeRecord true --testAutomatically --sequenceName THING_KIND_PKSEQ
-field reference --fieldName thingType --type ~.domain.ThingType --notNull
-field string --fieldName kindName --sizeMax 255 --notNull
-field string --fieldName typeAndKind --sizeMax 255
-
-//this is the abstract Thing and Interaction class that will be subclassed --additional fields added later
-// not sure if this should be abstract or concrete -- either way meant to be abstract in nature
-entity jpa --class ~.domain.AbstractThing --activeRecord true --abstract --sequenceName THING_PKSEQ --inheritanceType TABLE_PER_CLASS
-field string --fieldName kind --sizeMax 255 
-field string --fieldName codeName --sizeMax 255 
-field string --fieldName recordedBy --sizeMax 255 --notNull
-field date --fieldName recordedDate --type java.util.Date --timeFormat MEDIUM
-field string --fieldName modifiedBy --sizeMax 255 
-field date --fieldName modifiedDate --type java.util.Date --timeFormat MEDIUM
-field boolean --fieldName ignored --primitive --notNull
-field reference --fieldName lsTransaction --type ~.domain.lsTransaction
-
-entity jpa --class ~.domain.InteractionType --activeRecord true --testAutomatically --sequenceName INTERACTION_TYPE_PKSEQ
-field string --fieldName typeName --sizeMax 128 --notNull --unique
-field string --fieldName typeVerb --sizeMax 128 --notNull
-
-entity jpa --class ~.domain.InteractionKind --activeRecord true --testAutomatically --sequenceName INTERACTION_KIND_PKSEQ
-field reference --fieldName interactionType --type ~.domain.InteractionType --notNull
-field string --fieldName kindName --sizeMax 255 --notNull
-field string --fieldName typeAndKind --sizeMax 255
-
-
-// interaction is a subclass of thing
-entity jpa --class ~.domain.LsInteraction --extends ~.domain.AbstractThing --testAutomatically 
-field string --fieldName interactionType --sizeMax 64 --notNull
-field string --fieldName interactionKind --sizeMax 255 --notNull
-field string --fieldName interactionTypeAndKind --sizeMax 255
-field number --fieldName firstThing --type java.lang.Long --column first_thing_id --notNull
-field number --fieldName secondThing --type java.lang.Long --column second_thing_id --notNull
-
-entity jpa --class ~.domain.StateType --activeRecord true --testAutomatically --sequenceName STATE_TYPE_PKSEQ
-field string --fieldName typeName --sizeMax 64 --notNull --unique
-
-entity jpa --class ~.domain.StateKind --activeRecord true --testAutomatically --sequenceName STATE_KIND_PKSEQ
-field reference --fieldName stateType --type ~.domain.StateType --notNull
-field string --fieldName kindName --sizeMax 64 --notNull
-field string --fieldName typeAndKind --sizeMax 255
-
-entity jpa --class ~.domain.AbstractState --activeRecord true --abstract --sequenceName STATE_PKSEQ --inheritanceType TABLE_PER_CLASS
-field string --fieldName recordedBy --sizeMax 255 --notNull
-field date --fieldName recordedDate --type java.util.Date --notNull --timeFormat MEDIUM
-field string --fieldName modifiedBy --sizeMax 255 
-field date --fieldName modifiedDate --type java.util.Date --timeFormat MEDIUM
-field string --fieldName stateType --sizeMax 64 --notNull
-field string --fieldName stateKind --sizeMax 255 --notNull
-field string --fieldName stateTypeAndKind --sizeMax 255
-field string --fieldName comments --sizeMax 512
-field boolean --fieldName ignored --primitive --notNull
-field reference --fieldName lsTransaction --type ~.domain.lsTransaction
-
-entity jpa --class ~.domain.ValueType --activeRecord true --testAutomatically --sequenceName VALUE_TYPE_PKSEQ
-field string --fieldName typeName --sizeMax 64 --notNull --unique
-
-entity jpa --class ~.domain.ValueKind --activeRecord true --testAutomatically --sequenceName VALUE_KIND_PKSEQ
-field reference --fieldName valueType --type ~.domain.ValueType --notNull
-field string --fieldName kindName --sizeMax 64 --notNull
-field string --fieldName typeAndKind --sizeMax 255
-
-//add annotated units 
-
-entity jpa --class ~.domain.UnitType --activeRecord true --testAutomatically --sequenceName UNITS_TYPE_PKSEQ
-field string --fieldName typeName --sizeMax 64 --notNull --unique
-
-entity jpa --class ~.domain.UnitKind --activeRecord true --testAutomatically --sequenceName UNITS_KIND_PKSEQ
-field reference --fieldName unitType --type ~.domain.UnitType --notNull
-field string --fieldName kindName --sizeMax 64 --notNull
-field string --fieldName typeAndKind --sizeMax 255 
-
-entity jpa --class ~.domain.OperatorType --activeRecord true --testAutomatically --sequenceName OPERATOR_TYPE_PKSEQ
-field string --fieldName typeName --sizeMax 5 --notNull --unique
-
-entity jpa --class ~.domain.AbstractValue --activeRecord true --abstract --sequenceName VALUE_PKSEQ --inheritanceType TABLE_PER_CLASS
-field string --fieldName valueType --sizeMax 64 --notNull
-field string --fieldName valueKind --sizeMax 255 --notNull
-field string --fieldName valueTypeAndKind --sizeMax 255 
-field string --fieldName batchCode --sizeMax 255 
-field string --fieldName stringValue --sizeMax 255
-field string --fieldName fileValue --sizeMax 512
-field string --fieldName urlValue --sizeMax 2000
-field date --fieldName dateValue --type java.util.Date --timeFormat MEDIUM
-field string --fieldName clobValue
-field string --fieldName blobValue
-field string --fieldName valueOperator --sizeMax 5
-field number --fieldName numericValue --type java.lang.Float
-field number --fieldName sigFigs --type java.lang.Integer
-field number --fieldName uncertainty --type java.lang.Float
-field string --fieldName valueUnit --sizeMax 25
-field string --fieldName comments --sizeMax 512
-field boolean --fieldName ignored --primitive --notNull
-field reference --fieldName lsTransaction --type ~.domain.lsTransaction
-field date --fieldName recordedDate --type java.util.Date --notNull --timeFormat MEDIUM
-field date --fieldName modifiedDate --type java.util.Date --timeFormat MEDIUM
-field boolean --fieldName publicData --primitive --notNull
-
-entity jpa --class ~.domain.LabelType --activeRecord true --testAutomatically --sequenceName LABEL_TYPE_PKSEQ
-field string --fieldName typeName --sizeMax 255 --notNull --unique
-
-entity jpa --class ~.domain.LabelKind --activeRecord true --testAutomatically --sequenceName LABEL_KIND_PKSEQ
-field reference --fieldName labelType --type ~.domain.LabelType
-field string --fieldName kindName --sizeMax 255 --notNull
-field string --fieldName typeAndKind --sizeMax 255 
-
-entity jpa --class ~.domain.AbstractLabel --activeRecord true --abstract --sequenceName LABEL_PKSEQ --inheritanceType TABLE_PER_CLASS
-field string --fieldName labelValue --sizeMax 255 --notNull
-field string --fieldName recordedBy --sizeMax 255 --notNull
-field date --fieldName recordedDate --type java.util.Date --notNull --timeFormat MEDIUM
-field date --fieldName modifiedDate --type java.util.Date --timeFormat MEDIUM
-field boolean --fieldName physicallyLabled --primitive
-field string --fieldName imgageFile --sizeMax 255
-field string --fieldName labelType --sizeMax 64 --notNull
-field string --fieldName labelKind --sizeMax 255 --notNull
-field string --fieldName labelTypeAndKind --sizeMax 255 
-field boolean --fieldName preferred --primitive --notNull
-field boolean --fieldName ignored --primitive --notNull
-field reference --fieldName lsTransaction --type ~.domain.lsTransaction
-
-entity jpa --class ~.domain.ThingPage --activeRecord true --testAutomatically --sequenceName THING_PAGE_PKSEQ
-field string --fieldName pageName --sizeMax 255
-field string --fieldName recordedBy --sizeMax 255 --notNull
-field date --fieldName recordedDate --type java.util.Date --notNull --timeFormat MEDIUM
-field string --fieldName pageContent
-field string --fieldName modifiedBy --sizeMax 255 --notNull
-field date --fieldName modifiedDate --type java.util.Date --notNull --timeFormat MEDIUM
-field string --fieldName currentEditor --sizeMax 255 --notNull
-field boolean --fieldName ignored --primitive --notNull
-field boolean --fieldName archived --primitive --notNull
-field reference --fieldName lsTransaction --type ~.domain.lsTransaction
-field reference --fieldName thing --type ~.domain.AbstractThing --cardinality MANY_TO_ONE --joinColumnName thing_id --notNull
-field set --class ~.domain.AbstractThing --fieldName thingPage --type ~.domain.ThingPage --mappedBy thing --notNull false --cardinality ONE_TO_MANY
-
-
-entity jpa --class ~.domain.LabelSequence --activeRecord true --testAutomatically --sequenceName LABEL_SEQUENCE_PKSEQ
-field string --fieldName thingTypeAndKind --sizeMax 255 --notNull
-field string --fieldName labelTypeAndKind --sizeMax 255 --notNull
-field string --fieldName labelPrefix --sizeMax 50 --notNull
-field string --fieldName labelSeparator --sizeMax 10
-field boolean --fieldName groupDigits --primitive
-field number --fieldName digits --type java.lang.Integer
-field number --fieldName latestNumber --type java.lang.Long
-field boolean --fieldName ignored --primitive --notNull
-field date --fieldName modifiedDate --type java.util.Date --timeFormat MEDIUM
-
-
-entity jpa --class ~.domain.ThingPageArchive --activeRecord true --testAutomatically --sequenceName THING_PAGE_ARCHIVE_PKSEQ
-field string --fieldName pageName --sizeMax 255
-field string --fieldName recordedBy --sizeMax 255 --notNull
-field date --fieldName recordedDate --type java.util.Date --notNull --timeFormat MEDIUM
-field string --fieldName pageContent
-field string --fieldName modifiedBy --sizeMax 255 --notNull
-field date --fieldName modifiedDate --type java.util.Date --notNull --timeFormat MEDIUM
-field string --fieldName currentEditor --sizeMax 255
-field boolean --fieldName ignored --primitive --notNull
-field boolean --fieldName archived --primitive
-field number --fieldName lsTransaction --type java.lang.Long
-field number --fieldName thing --type java.lang.Long --column thing_id
-field number --fieldName pageVersion --type java.lang.Integer
-
-// create the State subclasses
-entity jpa --class ~.domain.ProtocolState --extends ~.domain.AbstractState --testAutomatically 
-entity jpa --class ~.domain.ExperimentState --extends ~.domain.AbstractState --testAutomatically 
-entity jpa --class ~.domain.AnalysisGroupState --extends ~.domain.AbstractState --testAutomatically 
-entity jpa --class ~.domain.TreatmentGroupState --extends ~.domain.AbstractState --testAutomatically 
-entity jpa --class ~.domain.SubjectState --extends ~.domain.AbstractState --testAutomatically 
-
-// create the other state values subclasses
-entity jpa --class ~.domain.ProtocolValue --extends ~.domain.AbstractValue --testAutomatically 
-entity jpa --class ~.domain.ExperimentValue --extends ~.domain.AbstractValue --testAutomatically 
-entity jpa --class ~.domain.AnalysisGroupValue --extends ~.domain.AbstractValue --testAutomatically 
-entity jpa --class ~.domain.TreatmentGroupValue --extends ~.domain.AbstractValue --testAutomatically 
-entity jpa --class ~.domain.SubjectValue --extends ~.domain.AbstractValue --testAutomatically 
-entity jpa --class ~.domain.ContainerValue --extends ~.domain.AbstractValue --testAutomatically 
-
-
-// create the thing subclasses
-entity jpa --class ~.domain.Protocol --extends ~.domain.AbstractThing --testAutomatically 
-field string --fieldName shortDescription --sizeMax 255 --notNull
-entity jpa --class ~.domain.ProtocolLabel --extends ~.domain.AbstractLabel --testAutomatically 
-field reference --class ~.domain.ProtocolLabel --fieldName protocol --type ~.domain.Protocol --cardinality MANY_TO_ONE
-
-field reference --class ~.domain.ProtocolState --fieldName protocol --type ~.domain.Protocol --cardinality MANY_TO_ONE --joinColumnName protocol_id --notNull
-field set --class ~.domain.Protocol --fieldName protocolStates --type ~.domain.ProtocolState --mappedBy protocol --notNull false --cardinality ONE_TO_MANY
-field reference --class ~.domain.ProtocolValue --fieldName protocolState --type ~.domain.ProtocolState --cardinality MANY_TO_ONE --joinColumnName protocol_state_id --notNull
-field set --class ~.domain.ProtocolState --fieldName protocolValues --type ~.domain.ProtocolValue --mappedBy protocolState --notNull false --cardinality ONE_TO_MANY
-
-
-entity jpa --class ~.domain.Experiment --extends ~.domain.AbstractThing --testAutomatically 
-field string --fieldName shortDescription --sizeMax 255 --notNull
-entity jpa --class ~.domain.ExperimentLabel --extends ~.domain.AbstractLabel --testAutomatically 
-field reference --class ~.domain.ExperimentLabel --fieldName experiment --type ~.domain.Experiment --cardinality MANY_TO_ONE
-field reference --fieldName protocol --type ~.domain.Protocol --cardinality MANY_TO_ONE --joinColumnName protocol_id --notNull
-field set --class ~.domain.Protocol --fieldName experiments --type ~.domain.Experiment --mappedBy protocol --notNull false --cardinality ONE_TO_MANY
-field reference --class ~.domain.ExperimentState --fieldName experiment --type ~.domain.Experiment --cardinality MANY_TO_ONE --joinColumnName experiment_id --notNull
-field set --class ~.domain.Experiment --fieldName experimentStates --type ~.domain.ExperimentState --mappedBy experiment --notNull false --cardinality ONE_TO_MANY
-field reference --class ~.domain.ExperimentValue --fieldName experimentState --type ~.domain.ExperimentState --cardinality MANY_TO_ONE --joinColumnName experiment_state_id --notNull
-field set --class ~.domain.ExperimentState --fieldName experimentValues --type ~.domain.ExperimentValue --mappedBy experimentState --notNull false --cardinality ONE_TO_MANY
-
-
-entity jpa --class ~.domain.AnalysisGroup --extends ~.domain.AbstractThing --testAutomatically 
-entity jpa --class ~.domain.AnalysisGroupLabel --extends ~.domain.AbstractLabel --testAutomatically 
-field reference --class ~.domain.AnalysisGroupLabel --fieldName analysisGroup --type ~.domain.AnalysisGroup --cardinality MANY_TO_ONE
-field reference --fieldName experiment --type ~.domain.Experiment --cardinality MANY_TO_ONE --joinColumnName experiment_id --notNull
-field set --class ~.domain.Experiment --fieldName analysisGroups --type ~.domain.AnalysisGroup --mappedBy experiment --notNull false --cardinality ONE_TO_MANY
-field reference --class ~.domain.AnalysisGroupState --fieldName analysisGroup --type ~.domain.AnalysisGroup --cardinality MANY_TO_ONE --joinColumnName experiment_group_id --notNull
-field set --class ~.domain.AnalysisGroup --fieldName analysisGroupStates --type ~.domain.AnalysisGroupState --mappedBy analysisGroup --notNull false --cardinality ONE_TO_MANY
-field reference --class ~.domain.AnalysisGroupValue --fieldName analysisGroupState --type ~.domain.AnalysisGroupState --cardinality MANY_TO_ONE --joinColumnName experiment_state_id --notNull
-field set --class ~.domain.AnalysisGroupState --fieldName analysisGroupValues --type ~.domain.AnalysisGroupValue --mappedBy analysisGroupState --notNull false --cardinality ONE_TO_MANY
-
-
-
-entity jpa --class ~.domain.TreatmentGroup --extends ~.domain.AbstractThing --testAutomatically 
-field reference --fieldName analysisGroup --type ~.domain.AnalysisGroup --cardinality MANY_TO_ONE --joinColumnName experiment_group_id --notNull
-field set --class ~.domain.AnalysisGroup --fieldName treatmentGroups --type ~.domain.TreatmentGroup --mappedBy analysisGroup --notNull false --cardinality ONE_TO_MANY
-field reference --class ~.domain.TreatmentGroupState --fieldName treatmentGroup --type ~.domain.TreatmentGroup --cardinality MANY_TO_ONE --joinColumnName treatment_group_id --notNull
-field set --class ~.domain.TreatmentGroup --fieldName treatmentGroupStates --type ~.domain.TreatmentGroupState --mappedBy treatmentGroup --notNull false --cardinality ONE_TO_MANY
-field reference --class ~.domain.TreatmentGroupValue --fieldName treatmentGroupState --type ~.domain.TreatmentGroupState --cardinality MANY_TO_ONE --joinColumnName treatment_state_id --notNull
-field set --class ~.domain.TreatmentGroupState --fieldName treatmentGroupValues --type ~.domain.TreatmentGroupValue --mappedBy treatmentGroupState --notNull false --cardinality ONE_TO_MANY
-
-
-entity jpa --class ~.domain.Subject --extends ~.domain.AbstractThing --testAutomatically 
-field reference --fieldName treatmentGroup --type ~.domain.TreatmentGroup --cardinality MANY_TO_ONE --joinColumnName treatment_group_id --notNull
-field set --class ~.domain.TreatmentGroup --fieldName subjects --type ~.domain.Subject --mappedBy treatmentGroup --notNull false --cardinality ONE_TO_MANY
-field reference --class ~.domain.SubjectState --fieldName subject --type ~.domain.Subject --cardinality MANY_TO_ONE --joinColumnName subject_id --notNull
-field set --class ~.domain.Subject --fieldName subjectStates --type ~.domain.SubjectState --mappedBy subject --notNull false --cardinality ONE_TO_MANY
-field reference --class ~.domain.SubjectValue --fieldName subjectState --type ~.domain.SubjectState --cardinality MANY_TO_ONE --joinColumnName subject_state_id --notNull
-field set --class ~.domain.SubjectState --fieldName subjectValues --type ~.domain.SubjectValue --mappedBy subjectState --notNull false --cardinality ONE_TO_MANY
-
-
-entity jpa --class ~.domain.ContainerType --activeRecord true --testAutomatically --sequenceName CONTAINER_TYPE_PKSEQ
-field string --fieldName typeName --sizeMax 128 --notNull --unique
-
-entity jpa --class ~.domain.ContainerKind --activeRecord true --testAutomatically --sequenceName CONTAINER_KIND_PKSEQ
-field reference --fieldName containerType --type ~.domain.ContainerType --notNull
-field string --fieldName kindName --sizeMax 255 --notNull
-field string --fieldName typeAndKind --sizeMax 255
-
-/////////
-
-entity jpa --class ~.domain.Container --extends ~.domain.AbstractThing --testAutomatically 
-field string --fieldName containterType --sizeMax 255 --notNull
-field string --fieldName containerKind --sizeMax 255 --notNull
-field string --fieldName containerTypeAndKind --sizeMax 255 
-field string --fieldName name --sizeMax 255 --notNull
-field string --fieldName description --sizeMax 255 --notNull
-entity jpa --class ~.domain.ContainerLabel --extends ~.domain.AbstractLabel --testAutomatically 
-field reference --class ~.domain.ContainerLabel --fieldName container --type ~.domain.Container --cardinality MANY_TO_ONE --joinColumnName container_id --notNull
-field set --class ~.domain.Container --fieldName containerLabels --type ~.domain.ContainerLabel --mappedBy container --notNull false --cardinality ONE_TO_MANY
-entity jpa --class ~.domain.ContainerState --extends ~.domain.AbstractState --testAutomatically 
-field reference --class ~.domain.ContainerState --fieldName container --type ~.domain.Container --cardinality MANY_TO_ONE --joinColumnName container_id --notNull
-field set --class ~.domain.Container --fieldName containerStates --type ~.domain.ContainerState --mappedBy container --notNull false --cardinality ONE_TO_MANY
-entity jpa --class ~.domain.ContainerValue --extends ~.domain.AbstractValue --testAutomatically 
-field reference --class ~.domain.ContainerValue --fieldName containerState --type ~.domain.ContainerState --cardinality MANY_TO_ONE --joinColumnName container_state_id --notNull
-field set --class ~.domain.ContainerState --fieldName containerValues --type ~.domain.ContainerValue --mappedBy containerState --notNull false --cardinality ONE_TO_MANY
-
-
-entity jpa --class ~.domain.ItxContainerContainer --extends ~.domain.AbstractThing --testAutomatically 
-field string --fieldName interactionType --sizeMax 64 --notNull
-field string --fieldName interactionKind --sizeMax 255 --notNull
-field string --fieldName interactionTypeAndKind --sizeMax 255 
-field reference --fieldName firstContainer --type ~.domain.Container --cardinality MANY_TO_ONE --joinColumnName first_container_id --notNull
-field reference --fieldName secondContainer --type ~.domain.Container --cardinality MANY_TO_ONE --joinColumnName second_container_id --notNull
-field set --class ~.domain.Container --fieldName firstContainers --type ~.domain.ItxContainerContainer --mappedBy secondContainer --notNull false --cardinality ONE_TO_MANY
-field set --class ~.domain.Container --fieldName secondContainers --type ~.domain.ItxContainerContainer --mappedBy firstContainer --notNull false --cardinality ONE_TO_MANY
-entity jpa --class ~.domain.ItxContainerContainerState --extends ~.domain.AbstractState --testAutomatically 
-field reference --class ~.domain.ItxContainerContainerState --fieldName itxContainerContainer --type ~.domain.ItxContainerContainer --cardinality MANY_TO_ONE 
-field set --class ~.domain.ItxContainerContainer --fieldName itxContainerContainerStates --type ~.domain.ItxContainerContainerState --mappedBy itxContainerContainer --notNull false --cardinality ONE_TO_MANY
-entity jpa --class ~.domain.ItxContainerContainerValue --extends ~.domain.AbstractValue --testAutomatically 
-field reference --class ~.domain.ItxContainerContainerValue --fieldName itxContainerContainerState --type ~.domain.ItxContainerContainerState --cardinality MANY_TO_ONE
-field set --class ~.domain.ItxContainerContainerState --fieldName itxContainerContainerValues --type ~.domain.ItxContainerContainerValue --mappedBy itxContainerContainerState --notNull false --cardinality ONE_TO_MANY
-
-
-entity jpa --class ~.domain.ItxSubjectContainer --extends ~.domain.AbstractThing --testAutomatically 
-field string --fieldName interactionType --sizeMax 64 --notNull
-field string --fieldName interactionKind --sizeMax 255 --notNull
-field string --fieldName interactionTypeAndKind --sizeMax 255
-field reference --fieldName subject --type ~.domain.Subject --cardinality MANY_TO_ONE --joinColumnName subject_id --notNull
-field reference --fieldName container --type ~.domain.Container --cardinality MANY_TO_ONE --joinColumnName container_id --notNull
-field set --class ~.domain.Subject --fieldName containers --type ~.domain.ItxSubjectContainer --mappedBy subject --notNull false --cardinality ONE_TO_MANY
-field set --class ~.domain.Container --fieldName subjects --type ~.domain.ItxSubjectContainer --mappedBy container --notNull false --cardinality ONE_TO_MANY
-entity jpa --class ~.domain.ItxSubjectContainerState --extends ~.domain.AbstractState --testAutomatically 
-field reference --class ~.domain.ItxSubjectContainerState --fieldName itxSubjectContainer --type ~.domain.ItxSubjectContainer --cardinality MANY_TO_ONE 
-field set --class ~.domain.ItxSubjectContainer --fieldName itxSubjectContainerStates --type ~.domain.ItxSubjectContainerState --mappedBy itxSubjectContainer --notNull false --cardinality ONE_TO_MANY
-entity jpa --class ~.domain.ItxSubjectContainerValue --extends ~.domain.AbstractValue --testAutomatically 
-field reference --class ~.domain.ItxSubjectContainerValue --fieldName itxSubjectContainerState --type ~.domain.ItxSubjectContainerState --cardinality MANY_TO_ONE
-field set --class ~.domain.ItxSubjectContainerState --fieldName itxSubjectContainerValues --type ~.domain.ItxSubjectContainerValue --mappedBy itxSubjectContainerState --notNull false --cardinality ONE_TO_MANY
-
-finder -add findBy
-
-// Offer JSON remoting for all domain types through Spring MVC
-//json all --deepSerialize
-json all
-web mvc json setup
-web mvc json all --package ~.web
-web mvc setup
-web mvc all --package ~.web
-web mvc finder all
-logging setup --level DEBUG
-
diff --git a/pom.xml b/pom.xml
index 11550c316..127f66b88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.build.timestamp.format>yyyyMMdd_HHmm</maven.build.timestamp.format>
 		<date>${maven.build.timestamp}</date>
-		<roo.version>1.3.2.RELEASE</roo.version>
 		<slf4j.version>1.7.5</slf4j.version>
 		<log4j.version>2.17.2</log4j.version>
 		<spring.version>5.3.18</spring.version>
@@ -235,13 +234,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 			<artifactId>flyway-core</artifactId>
 			<version>4.2.0</version>
 		</dependency>
-		<!-- ROO dependencies -->
-		<dependency>
-			<groupId>org.springframework.roo</groupId>
-			<artifactId>org.springframework.roo.annotations</artifactId>
-			<version>${roo.version}</version>
-			<scope>provided</scope>
-		</dependency>
 		<!-- Spring dependencies -->
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -717,9 +709,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 				<configuration>
 					<printSummary>false</printSummary>
 					<redirectTestOutputToFile>true</redirectTestOutputToFile>
-					<excludes>
-						<exclude>**/*_Roo_*</exclude>
-					</excludes>
 					<skipTests>true</skipTests>
 				</configuration>
 			</plugin>
@@ -761,7 +750,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 					</additionalBuildcommands>
 					<additionalProjectnatures>
 						<projectnature>org.eclipse.ajdt.ui.ajnature</projectnature>
-						<projectnature>com.springsource.sts.roo.core.nature</projectnature>
 						<projectnature>org.springframework.ide.eclipse.core.springnature</projectnature>
 					</additionalProjectnatures>
 				</configuration>
diff --git a/src/main/java/com/labsynch/labseer/api/ApiAnalysisGroupController.java b/src/main/java/com/labsynch/labseer/api/ApiAnalysisGroupController.java
index 02957527d..c1f0b8420 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiAnalysisGroupController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiAnalysisGroupController.java
@@ -15,8 +15,6 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -47,9 +45,7 @@
 
 @Controller
 @RequestMapping("api/v1/analysisgroups")
-//@RooWebFinder
 @Transactional
-//@RooWebJson(jsonObject = AnalysisGroup.class)
 public class ApiAnalysisGroupController {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiAnalysisGroupController.class);
diff --git a/src/main/java/com/labsynch/labseer/api/ApiAnalysisGroupValueController.java b/src/main/java/com/labsynch/labseer/api/ApiAnalysisGroupValueController.java
index 94795e883..1e6df24bd 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiAnalysisGroupValueController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiAnalysisGroupValueController.java
@@ -41,7 +41,6 @@
 @Controller
 @RequestMapping("api/v1/analysisgroupvalues")
 @Transactional
-//@RooWebJson(jsonObject = AnalysisGroupValue.class)
 public class ApiAnalysisGroupValueController {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiAnalysisGroupValueController.class);
diff --git a/src/main/java/com/labsynch/labseer/api/ApiExperimentController.java b/src/main/java/com/labsynch/labseer/api/ApiExperimentController.java
index 172a3162d..f8a8b7eaa 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiExperimentController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiExperimentController.java
@@ -83,7 +83,6 @@
 @Controller
 @RequestMapping("api/v1/experiments")
 //@Transactional
-//@RooWebJson(jsonObject = Experiment.class)
 public class ApiExperimentController {
 	private static final Logger logger = LoggerFactory.getLogger(ApiExperimentController.class);
 	
diff --git a/src/main/java/com/labsynch/labseer/api/ApiFileSaveController.java b/src/main/java/com/labsynch/labseer/api/ApiFileSaveController.java
index 593fded22..aa98d29a4 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiFileSaveController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiFileSaveController.java
@@ -19,7 +19,6 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/src/main/java/com/labsynch/labseer/api/ApiFileTypeController.java b/src/main/java/com/labsynch/labseer/api/ApiFileTypeController.java
index afe2ea868..b575a5618 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiFileTypeController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiFileTypeController.java
@@ -4,9 +4,6 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
diff --git a/src/main/java/com/labsynch/labseer/api/ApiItxSubjectContainerController.java b/src/main/java/com/labsynch/labseer/api/ApiItxSubjectContainerController.java
index 7fe6d4390..2906ac3a0 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiItxSubjectContainerController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiItxSubjectContainerController.java
@@ -23,9 +23,6 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/src/main/java/com/labsynch/labseer/api/ApiKindController.java b/src/main/java/com/labsynch/labseer/api/ApiKindController.java
index e1b6b5c53..863a680a7 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiKindController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiKindController.java
@@ -9,8 +9,6 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/src/main/java/com/labsynch/labseer/api/ApiLabelSequenceController.java b/src/main/java/com/labsynch/labseer/api/ApiLabelSequenceController.java
index ecf375dcf..8a87411cf 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiLabelSequenceController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiLabelSequenceController.java
@@ -29,10 +29,8 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-//@RooWebJson(jsonObject = LabelSequence.class)
 @Controller
 @RequestMapping("/api/v1/labelsequences")
-//@RooWebFinder
 public class ApiLabelSequenceController {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiLabelSequenceController.class);
diff --git a/src/main/java/com/labsynch/labseer/api/ApiLsTransactionController.java b/src/main/java/com/labsynch/labseer/api/ApiLsTransactionController.java
index b43d035a1..2d963a272 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiLsTransactionController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiLsTransactionController.java
@@ -21,7 +21,6 @@
 import com.labsynch.labseer.dto.LsTransactionQueryDTO;
 import com.labsynch.labseer.service.LsTransactionService;
 
-//@RooWebJson(jsonObject = LsTransaction.class)
 @Controller
 @RequestMapping("/api/v1/lstransactions")
 @Transactional
diff --git a/src/main/java/com/labsynch/labseer/api/ApiMetalotController.java b/src/main/java/com/labsynch/labseer/api/ApiMetalotController.java
index 396806213..b552a1f70 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiMetalotController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiMetalotController.java
@@ -12,7 +12,6 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
diff --git a/src/main/java/com/labsynch/labseer/api/ApiOperatorController.java b/src/main/java/com/labsynch/labseer/api/ApiOperatorController.java
index 64a4dc22a..0bf3e741b 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiOperatorController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiOperatorController.java
@@ -3,8 +3,6 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/src/main/java/com/labsynch/labseer/api/ApiParentAnnotationController.java b/src/main/java/com/labsynch/labseer/api/ApiParentAnnotationController.java
index 4d2d16327..af3702e52 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiParentAnnotationController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiParentAnnotationController.java
@@ -4,8 +4,6 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
diff --git a/src/main/java/com/labsynch/labseer/api/ApiPhysicalStateController.java b/src/main/java/com/labsynch/labseer/api/ApiPhysicalStateController.java
index d9a50b706..773d16755 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiPhysicalStateController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiPhysicalStateController.java
@@ -8,8 +8,6 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
diff --git a/src/main/java/com/labsynch/labseer/api/ApiProtocolController.java b/src/main/java/com/labsynch/labseer/api/ApiProtocolController.java
index ad6daf69e..25e11598f 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiProtocolController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiProtocolController.java
@@ -46,10 +46,8 @@
 
 import flexjson.JSONSerializer;
 
-//@RooWebJson(jsonObject = Protocol.class)
 @Controller
 @RequestMapping("api/v1/protocols")
-//@RooWebFinder
 @Transactional
 public class ApiProtocolController {
 
diff --git a/src/main/java/com/labsynch/labseer/api/ApiPurityMeasuredByController.java b/src/main/java/com/labsynch/labseer/api/ApiPurityMeasuredByController.java
index 70ebb58b6..14b7a275b 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiPurityMeasuredByController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiPurityMeasuredByController.java
@@ -4,9 +4,6 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
diff --git a/src/main/java/com/labsynch/labseer/api/ApiRegSearchController.java b/src/main/java/com/labsynch/labseer/api/ApiRegSearchController.java
index a7efc0692..493cfac44 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiRegSearchController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiRegSearchController.java
@@ -24,7 +24,6 @@
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
 import com.labsynch.labseer.service.RegSearchService;
 
-//@RooWebScaffold(path = "regsearches", formBackingObject = RegSearch.class)
 @RequestMapping(value ={"/api/v1/regsearches", "/api/v1/regSearches"})
 @Controller
 public class ApiRegSearchController {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiSearchFormController.java b/src/main/java/com/labsynch/labseer/api/ApiSearchFormController.java
index 67101ade8..12da98b0e 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiSearchFormController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSearchFormController.java
@@ -22,7 +22,6 @@
 import com.labsynch.labseer.service.ErrorMessage;
 import com.labsynch.labseer.service.SearchFormService;
 
-//@RooWebScaffold(path = "searchforms", formBackingObject = SearchForm.class)
 @RequestMapping(value = {"/api/v1/searchforms", "/api/v1/search"})
 @Controller
 public class ApiSearchFormController {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java b/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java
index 77e49bfe2..f68835be1 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java
@@ -24,8 +24,6 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
diff --git a/src/main/java/com/labsynch/labseer/api/ApiStateController.java b/src/main/java/com/labsynch/labseer/api/ApiStateController.java
index feddaf04a..d0d464093 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiStateController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiStateController.java
@@ -51,9 +51,7 @@
 
 @Controller
 @RequestMapping("api/v1")
-//@RooWebFinder
 @Transactional
-//@RooWebJson(jsonObject = AbstractState.class)
 public class ApiStateController {
 private static final Logger logger = LoggerFactory.getLogger(ApiStateController.class);
 
diff --git a/src/main/java/com/labsynch/labseer/api/ApiSubjectController.java b/src/main/java/com/labsynch/labseer/api/ApiSubjectController.java
index 00b3cd546..cc843958f 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiSubjectController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSubjectController.java
@@ -45,7 +45,6 @@
 @Controller
 @RequestMapping("api/v1/subjects")
 @Transactional
-//@RooWebJson(jsonObject = Subject.class)
 public class ApiSubjectController {
 	
 	private static final Logger logger = LoggerFactory.getLogger(ApiSubjectController.class);
diff --git a/src/main/java/com/labsynch/labseer/api/ApiSubjectValueController.java b/src/main/java/com/labsynch/labseer/api/ApiSubjectValueController.java
index 1cae79063..868f559de 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiSubjectValueController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSubjectValueController.java
@@ -7,7 +7,6 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -23,7 +22,6 @@
 @Transactional
 @RequestMapping("api/v1/subjectvalues")
 @Controller
-//@RooWebJson(jsonObject = SubjectValue.class)
 
 public class ApiSubjectValueController {
 
diff --git a/src/main/java/com/labsynch/labseer/api/ApiTreatmentGroupController.java b/src/main/java/com/labsynch/labseer/api/ApiTreatmentGroupController.java
index b0473bf09..802696955 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiTreatmentGroupController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiTreatmentGroupController.java
@@ -13,7 +13,6 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/src/main/java/com/labsynch/labseer/api/ApiTypeController.java b/src/main/java/com/labsynch/labseer/api/ApiTypeController.java
index ac912e558..85d97853a 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiTypeController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiTypeController.java
@@ -9,8 +9,6 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.roo.addon.web.mvc.controller.finder.RooWebFinder;
-import org.springframework.roo.addon.web.mvc.controller.json.RooWebJson;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure.java
index b31af2368..4af177170 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure.java
@@ -11,18 +11,10 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(sequenceName = "BBCHEM_STRUCTURE_PKSEQ", finders = { "findBBChemDryRunStructuresByRegEquals", "findBBChemDryRunStructuresByPreRegEquals"})
 public class BBChemDryRunStructure extends AbstractBBChemStructure {
 
 
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure.java
index 09bcb575b..41e456fa6 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure.java
@@ -15,18 +15,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(sequenceName = "BBCHEM_STRUCTURE_PKSEQ", finders = { "findBBChemParentStructuresByRegEquals", "findBBChemParentStructuresByPreRegEquals"})
+
 public class BBChemParentStructure extends AbstractBBChemStructure {
 
     public static List<BBChemParentStructure> findBBChemParentStructuresBySubstructure(BitSet substructure, int maxResults) {
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure.java
index 5a705c85a..63b0f6e12 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure.java
@@ -15,18 +15,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(sequenceName = "BBCHEM_STRUCTURE_PKSEQ", finders = { "findBBChemSaltFormStructuresByRegEquals", "findBBChemSaltFormStructuresByPreRegEquals"})
+
 public class BBChemSaltFormStructure  extends AbstractBBChemStructure {
 
     public static List<BBChemSaltFormStructure> findBBChemSaltFormStructuresBySubstructure(BitSet substructure, int maxResults) {
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure.java
index 1d02df72f..0d059fc28 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure.java
@@ -11,18 +11,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(sequenceName = "BBCHEM_STRUCTURE_PKSEQ", finders = { "findBBChemSaltStructuresByRegEquals", "findBBChemSaltStructuresByPreRegEquals"})
+
 public class BBChemSaltStructure extends AbstractBBChemStructure {
 
 
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure.java
index 1503a4763..0b148a7f3 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure.java
@@ -11,18 +11,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(sequenceName = "BBCHEM_STRUCTURE_PKSEQ", finders = { "findBBChemStandardizationDryRunStructuresByRegEquals", "findBBChemStandardizationDryRunStructuresByPreRegEquals"})
+
 public class BBChemStandardizationDryRunStructure extends AbstractBBChemStructure {
 
 
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure.java b/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure.java
index 80e10010e..1439892ff 100644
--- a/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure.java
+++ b/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure.java
@@ -31,19 +31,12 @@
 import org.hibernate.annotations.Type;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
 @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(sequenceName = "BBCHEM_STRUCTURE_PKSEQ", inheritanceType = "TABLE_PER_CLASS")
+
 public abstract class AbstractBBChemStructure {
 
     @Id
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractLabel.java b/src/main/java/com/labsynch/labseer/domain/AbstractLabel.java
index 4d71d5b13..7a919d4ac 100755
--- a/src/main/java/com/labsynch/labseer/domain/AbstractLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/AbstractLabel.java
@@ -21,17 +21,12 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(sequenceName = "LABEL_PKSEQ", inheritanceType = "TABLE_PER_CLASS")
+
 @Transactional
 public abstract class AbstractLabel {
 
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractState.java b/src/main/java/com/labsynch/labseer/domain/AbstractState.java
index 561bc7040..45e2d0b86 100755
--- a/src/main/java/com/labsynch/labseer/domain/AbstractState.java
+++ b/src/main/java/com/labsynch/labseer/domain/AbstractState.java
@@ -21,17 +21,12 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
 @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(sequenceName = "STATE_PKSEQ", inheritanceType = "TABLE_PER_CLASS")
+
 @Transactional
 public abstract class AbstractState {
 
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractThing.java b/src/main/java/com/labsynch/labseer/domain/AbstractThing.java
index b24ba2aba..1a5633c73 100755
--- a/src/main/java/com/labsynch/labseer/domain/AbstractThing.java
+++ b/src/main/java/com/labsynch/labseer/domain/AbstractThing.java
@@ -26,17 +26,12 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
 @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(sequenceName = "THING_PKSEQ", inheritanceType = "TABLE_PER_CLASS")
+
 @Transactional
 public abstract class AbstractThing {
 
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractValue.java b/src/main/java/com/labsynch/labseer/domain/AbstractValue.java
index e55c2a415..4c3bcd834 100755
--- a/src/main/java/com/labsynch/labseer/domain/AbstractValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/AbstractValue.java
@@ -24,9 +24,6 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 import org.supercsv.cellprocessor.Optional;
 import org.supercsv.cellprocessor.ift.CellProcessor;
@@ -34,9 +31,7 @@
 @Configurable
 @Entity
 @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(sequenceName = "VALUE_PKSEQ", inheritanceType = "TABLE_PER_CLASS")
+
 @Transactional
 public abstract class AbstractValue {
 
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroup.java b/src/main/java/com/labsynch/labseer/domain/AnalysisGroup.java
index 26cfd1dcd..bec86a8e3 100755
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroup.java
+++ b/src/main/java/com/labsynch/labseer/domain/AnalysisGroup.java
@@ -23,10 +23,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.dto.AnalysisGroupCsvDTO;
@@ -39,10 +35,7 @@
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findAnalysisGroupsByLsTransactionEquals", "findAnalysisGroupsByExperiments", "findAnalysisGroupsByExperimentsAndIgnoredNot" })
+
 public class AnalysisGroup extends AbstractThing {
 
     private static final Logger logger = LoggerFactory.getLogger(AnalysisGroup.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel.java b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel.java
index c63863b36..a880fdab8 100755
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel.java
@@ -15,10 +15,6 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import flexjson.JSONDeserializer;
@@ -26,11 +22,8 @@
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
+
 @Transactional
-@RooJpaActiveRecord(finders = { "findAnalysisGroupLabelsByAnalysisGroup", "findAnalysisGroupLabelsByLsTransactionEquals" })
 public class AnalysisGroupLabel extends AbstractLabel {
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState.java b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState.java
index ff25719e3..0cab7179a 100755
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState.java
+++ b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState.java
@@ -22,10 +22,6 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.dto.AnalysisGroupCsvDTO;
@@ -38,11 +34,8 @@
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
+
 @Transactional
-@RooJpaActiveRecord(finders = { "findAnalysisGroupStatesByLsTypeAndKindEquals", "findAnalysisGroupStatesByAnalysisGroup", "findAnalysisGroupStatesByLsTransactionEquals", "findAnalysisGroupStatesByLsTypeEqualsAndLsKindEquals", "findAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot" })
 public class AnalysisGroupState extends AbstractState {
 
 	
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue.java b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue.java
index 5cfab7a24..0b0ffe3e5 100755
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue.java
@@ -26,10 +26,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 import org.supercsv.cellprocessor.Optional;
 import org.supercsv.cellprocessor.ift.CellProcessor;
@@ -48,10 +44,7 @@
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findAnalysisGroupValuesByLsState", "findAnalysisGroupValuesByLsTransactionEquals", "findAnalysisGroupValuesByCodeValueEquals", "findAnalysisGroupValuesByIgnoredNotAndCodeValueEquals", "findAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals", "findAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot" })
+
 public class AnalysisGroupValue extends AbstractValue {
 
 	private static final Logger logger = LoggerFactory.getLogger(AnalysisGroupValue.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/ApplicationSetting.java b/src/main/java/com/labsynch/labseer/domain/ApplicationSetting.java
index 11512b945..144367330 100755
--- a/src/main/java/com/labsynch/labseer/domain/ApplicationSetting.java
+++ b/src/main/java/com/labsynch/labseer/domain/ApplicationSetting.java
@@ -22,18 +22,11 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(sequenceName = "APPSETTING_PKSEQ", finders = { "findApplicationSettingsByPropNameEquals", "findApplicationSettingsByPropNameEqualsAndIgnoredNot" })
+
 public class ApplicationSetting {
 
 	//private static final Logger logger = LoggerFactory.getLogger(ApplicationSetting.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/Author.java b/src/main/java/com/labsynch/labseer/domain/Author.java
index 127495d90..5bbda244b 100755
--- a/src/main/java/com/labsynch/labseer/domain/Author.java
+++ b/src/main/java/com/labsynch/labseer/domain/Author.java
@@ -20,9 +20,6 @@
 import javax.validation.constraints.Size;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
@@ -32,12 +29,9 @@
 
 @Configurable
 @Entity
-@RooJson
-@RooJavaBean
-//@RooToString(excludeFields = { "password", "modifiedDate", "activationKey", "activationDate", "emailAddress", "recordedDate", "modifiedDate", "enabled", "locked" })
-//@RooToString(excludeFields = { "password", "authorRoles"})
+//(excludeFields = { "password", "modifiedDate", "activationKey", "activationDate", "emailAddress", "recordedDate", "modifiedDate", "enabled", "locked" })
+//(excludeFields = { "password", "authorRoles"})
 
-@RooJpaActiveRecord(sequenceName = "AUTHOR_PKSEQ", finders = { "findAllAuthors", "findAuthorsByUserName", "findAuthorsByEmailAddress", "findAuthorsByActivationKeyAndEmailAddress" })
 public class Author extends AbstractThing {
 
 	
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorLabel.java b/src/main/java/com/labsynch/labseer/domain/AuthorLabel.java
index 6369431bd..cca72cee7 100644
--- a/src/main/java/com/labsynch/labseer/domain/AuthorLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/AuthorLabel.java
@@ -14,10 +14,6 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import flexjson.JSONDeserializer;
@@ -25,11 +21,8 @@
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
+
 @Transactional
-@RooJpaActiveRecord(finders = { "findAuthorLabelsByAuthor", "findAuthorLabelsByLsTransactionEquals" })
 public class AuthorLabel extends AbstractLabel {
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorRole.java b/src/main/java/com/labsynch/labseer/domain/AuthorRole.java
index d371cb2a0..4bd420803 100755
--- a/src/main/java/com/labsynch/labseer/domain/AuthorRole.java
+++ b/src/main/java/com/labsynch/labseer/domain/AuthorRole.java
@@ -19,21 +19,13 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @Entity
 @Configurable
-@RooJson
-@RooJavaBean
-@RooToString(excludeFields = { "userEntry", "roleEntry", "version" })
 @Table(name = "author_role", uniqueConstraints = { @javax.persistence.UniqueConstraint(columnNames = { "author_id", "lsrole_id" }) })
-@RooJpaActiveRecord(sequenceName = "AUTH_ROLE_PKSEQ", finders = { "findAuthorRolesByUserEntry", "findAuthorRolesByRoleEntry", "findAuthorRolesByRoleEntryAndUserEntry" })
 public class AuthorRole {
 	
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorState.java b/src/main/java/com/labsynch/labseer/domain/AuthorState.java
index 3dbc2205e..159f4c6cf 100644
--- a/src/main/java/com/labsynch/labseer/domain/AuthorState.java
+++ b/src/main/java/com/labsynch/labseer/domain/AuthorState.java
@@ -20,10 +20,6 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.dto.FlatThingCsvDTO;
@@ -35,11 +31,8 @@
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
+
 @Transactional
-@RooJpaActiveRecord(finders = { "findAuthorStatesByLsTypeAndKindEquals", "findAuthorStatesByAuthor", "findAuthorStatesByLsTransactionEquals", "findAuthorStatesByLsTypeEqualsAndLsKindEquals", "findAuthorStatesByAuthorAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot" })
 public class AuthorState extends AbstractState {
 
 	@NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorValue.java b/src/main/java/com/labsynch/labseer/domain/AuthorValue.java
index 9e4081426..d910a0d82 100644
--- a/src/main/java/com/labsynch/labseer/domain/AuthorValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/AuthorValue.java
@@ -16,10 +16,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 import com.labsynch.labseer.utils.CustomBigDecimalFactory;
 
@@ -28,10 +24,7 @@
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findAuthorValuesByLsState", "findAuthorValuesByLsTransactionEquals", "findAuthorValuesByCodeValueEquals", "findAuthorValuesByIgnoredNotAndCodeValueEquals", "findAuthorValuesByLsTypeEqualsAndLsKindEquals", "findAuthorValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot" })
+
 public class AuthorValue extends AbstractValue {
 
     private static final Logger logger = LoggerFactory.getLogger(AuthorValue.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/BulkLoadFile.java b/src/main/java/com/labsynch/labseer/domain/BulkLoadFile.java
index 9ce3245b5..786e81954 100644
--- a/src/main/java/com/labsynch/labseer/domain/BulkLoadFile.java
+++ b/src/main/java/com/labsynch/labseer/domain/BulkLoadFile.java
@@ -19,18 +19,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders={"findBulkLoadFilesByRecordedByEquals","findBulkLoadFilesByFileNameEquals"})
+
 public class BulkLoadFile {
 
     @Size(max = 1000)
diff --git a/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate.java b/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate.java
index 14ca3593e..00e3085aa 100644
--- a/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate.java
+++ b/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate.java
@@ -14,10 +14,6 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 import com.labsynch.labseer.dto.BulkLoadPropertyMappingDTO;
 import com.labsynch.labseer.dto.BulkLoadTemplateDTO;
@@ -28,10 +24,7 @@
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders={"findBulkLoadTemplatesByRecordedByEquals", "findBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals", "findBulkLoadTemplatesByTemplateNameEquals"})
+
 public class BulkLoadTemplate {
 
     @Size(max = 255)
diff --git a/src/main/java/com/labsynch/labseer/domain/ChemStructure.java b/src/main/java/com/labsynch/labseer/domain/ChemStructure.java
index ad54c9121..470b6d94e 100644
--- a/src/main/java/com/labsynch/labseer/domain/ChemStructure.java
+++ b/src/main/java/com/labsynch/labseer/domain/ChemStructure.java
@@ -22,18 +22,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(sequenceName = "CHEM_STRUCTURE_PKSEQ", finders = { "findChemStructureByCodeNameEquals", "findChemStructuresByCodeNameEquals" })
+
 public class ChemStructure {
 
     private static final Logger logger = LoggerFactory.getLogger(ChemStructure.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting.java b/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting.java
index 80325b330..ce83271b2 100755
--- a/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting.java
+++ b/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting.java
@@ -20,18 +20,11 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findApplicationSettingByPropNameEquals", "findApplicationSettingByPropNameEqualsAndIgnoredNot" })
+
 
 public class CmpdRegAppSetting {
 		
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeKind.java b/src/main/java/com/labsynch/labseer/domain/CodeKind.java
index 2c4dc022f..0c683ea98 100755
--- a/src/main/java/com/labsynch/labseer/domain/CodeKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/CodeKind.java
@@ -24,18 +24,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findCodeKindsByLsTypeAndKindEquals", "findCodeKindsByLsType", "findCodeKindsByKindNameEqualsAndLsType" })
+
 public class CodeKind {
 
 	private static final Logger logger = LoggerFactory.getLogger(CodeKind.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeOrigin.java b/src/main/java/com/labsynch/labseer/domain/CodeOrigin.java
index 93615f497..914ce2c3a 100644
--- a/src/main/java/com/labsynch/labseer/domain/CodeOrigin.java
+++ b/src/main/java/com/labsynch/labseer/domain/CodeOrigin.java
@@ -22,18 +22,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(sequenceName = "CODE_ORIGIN_PKSEQ", finders = { "findCodeOriginsByNameEquals" })
+
 public class CodeOrigin {
 
 	private static final Logger logger = LoggerFactory.getLogger(CodeOrigin.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeType.java b/src/main/java/com/labsynch/labseer/domain/CodeType.java
index 2f5980765..0c93a0241 100755
--- a/src/main/java/com/labsynch/labseer/domain/CodeType.java
+++ b/src/main/java/com/labsynch/labseer/domain/CodeType.java
@@ -22,18 +22,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(sequenceName = "CODE_TYPE_PKSEQ", finders = { "findCodeTypesByTypeNameEquals" })
+
 public class CodeType {
 
 	private static final Logger logger = LoggerFactory.getLogger(CodeType.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/Compound.java b/src/main/java/com/labsynch/labseer/domain/Compound.java
index 62a568450..d1086fadb 100644
--- a/src/main/java/com/labsynch/labseer/domain/Compound.java
+++ b/src/main/java/com/labsynch/labseer/domain/Compound.java
@@ -22,19 +22,12 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
 @Transactional
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findCompoundsByCdId", "findCompoundsByExternal_idEquals" })
+
 public class Compound {
 
     private static final Logger logger = LoggerFactory.getLogger(Compound.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/CompoundType.java b/src/main/java/com/labsynch/labseer/domain/CompoundType.java
index 167e9d688..001da78f0 100644
--- a/src/main/java/com/labsynch/labseer/domain/CompoundType.java
+++ b/src/main/java/com/labsynch/labseer/domain/CompoundType.java
@@ -17,18 +17,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders={"findCompoundTypesByCodeEquals"})
+
 public class CompoundType {
 
 	@NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/Container.java b/src/main/java/com/labsynch/labseer/domain/Container.java
index 0515085ec..0602c9bca 100755
--- a/src/main/java/com/labsynch/labseer/domain/Container.java
+++ b/src/main/java/com/labsynch/labseer/domain/Container.java
@@ -21,10 +21,6 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.dto.ContainerLocationTreeDTO;
@@ -36,10 +32,7 @@
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(finders = { "findContainersByLsTypeEqualsAndLsKindEquals", "findContainersByLsTypeEquals", "findContainersByLsKindEquals" })
-@RooJson
+
 @SqlResultSetMapping(name="ContainerLocationTreeDTOResult", classes = {
 		@ConstructorResult(targetClass = ContainerLocationTreeDTO.class,
 		columns = {@ColumnResult(name="code_name"), 
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerKind.java b/src/main/java/com/labsynch/labseer/domain/ContainerKind.java
index 083a8f8a9..f51f68c24 100755
--- a/src/main/java/com/labsynch/labseer/domain/ContainerKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ContainerKind.java
@@ -21,18 +21,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(sequenceName = "CONTAINER_KIND_PKSEQ", finders={"findContainerKindsByKindNameEqualsAndLsType"})
-@RooJson
+
 public class ContainerKind {
 
 	
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerLabel.java b/src/main/java/com/labsynch/labseer/domain/ContainerLabel.java
index ec0ded8b5..449c22ce0 100755
--- a/src/main/java/com/labsynch/labseer/domain/ContainerLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/ContainerLabel.java
@@ -15,20 +15,13 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findContainerLabelsByLsTransactionEquals","findContainerLabelsByLabelTextEqualsAndIgnoredNot","findContainerLabelsByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot", "findContainerLabelsByContainerAndIgnoredNot" })
+
 public class ContainerLabel extends AbstractLabel {
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerState.java b/src/main/java/com/labsynch/labseer/domain/ContainerState.java
index 5e5b8cfb4..6842a88c6 100755
--- a/src/main/java/com/labsynch/labseer/domain/ContainerState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ContainerState.java
@@ -22,10 +22,6 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.utils.CustomBigDecimalFactory;
@@ -36,10 +32,7 @@
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findContainerStatesByContainer", "findContainerStatesByIgnoredNot", "findContainerStatesByContainerAndLsKindEqualsAndIgnoredNot" })
+
 public class ContainerState extends AbstractState {
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerType.java b/src/main/java/com/labsynch/labseer/domain/ContainerType.java
index cbbbcabfb..a9e6a886f 100755
--- a/src/main/java/com/labsynch/labseer/domain/ContainerType.java
+++ b/src/main/java/com/labsynch/labseer/domain/ContainerType.java
@@ -19,18 +19,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(sequenceName = "CONTAINER_TYPE_PKSEQ" , finders = { "findContainerTypesByTypeNameEquals" })
-@RooJson
+
 public class ContainerType {
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerValue.java b/src/main/java/com/labsynch/labseer/domain/ContainerValue.java
index eff7fd68f..75ca40af5 100755
--- a/src/main/java/com/labsynch/labseer/domain/ContainerValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ContainerValue.java
@@ -18,10 +18,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
@@ -31,10 +27,7 @@
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findContainerValuesByLsState", "findContainerValuesByIgnoredNot" })
+
 public class ContainerValue extends AbstractValue {
 
     private static final Logger logger = LoggerFactory.getLogger(ContainerValue.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/CorpName.java b/src/main/java/com/labsynch/labseer/domain/CorpName.java
index 9e9c8a6d4..91d29e6d1 100755
--- a/src/main/java/com/labsynch/labseer/domain/CorpName.java
+++ b/src/main/java/com/labsynch/labseer/domain/CorpName.java
@@ -16,19 +16,12 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord
-@RooJson
+
 public class CorpName {
 
 	@Size(max = 50)
diff --git a/src/main/java/com/labsynch/labseer/domain/CronJob.java b/src/main/java/com/labsynch/labseer/domain/CronJob.java
index 4ced4d85d..b104d0fbd 100644
--- a/src/main/java/com/labsynch/labseer/domain/CronJob.java
+++ b/src/main/java/com/labsynch/labseer/domain/CronJob.java
@@ -21,18 +21,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(sequenceName = "CRON_JOB_PKSEQ", finders={"findCronJobsByCodeNameEquals"})
+
 public class CronJob {
 
 	private static final Logger logger = LoggerFactory.getLogger(CronJob.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictKind.java b/src/main/java/com/labsynch/labseer/domain/DDictKind.java
index 81436e776..e96fcb128 100644
--- a/src/main/java/com/labsynch/labseer/domain/DDictKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/DDictKind.java
@@ -23,18 +23,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(sequenceName = "DDICT_KIND_PKSEQ", finders = { "findDDictKindsByLsTypeEqualsAndNameEquals"})
+
 public class DDictKind {
 	
     private static final Logger logger = LoggerFactory.getLogger(DDictKind.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictType.java b/src/main/java/com/labsynch/labseer/domain/DDictType.java
index e661308ef..0105c74be 100644
--- a/src/main/java/com/labsynch/labseer/domain/DDictType.java
+++ b/src/main/java/com/labsynch/labseer/domain/DDictType.java
@@ -21,18 +21,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(sequenceName = "DDICT_TYPE_PKSEQ", finders = { "findDDictTypesByNameEquals"})
+
 public class DDictType {
 
     private static final Logger logger = LoggerFactory.getLogger(DDictType.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictValue.java b/src/main/java/com/labsynch/labseer/domain/DDictValue.java
index bbaef5c37..161f8653e 100644
--- a/src/main/java/com/labsynch/labseer/domain/DDictValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/DDictValue.java
@@ -21,10 +21,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 import org.supercsv.cellprocessor.Optional;
 import org.supercsv.cellprocessor.ift.CellProcessor;
@@ -36,13 +32,6 @@
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(sequenceName = "DDICT_VALUE_PKSEQ", finders = { "findDDictValuesByCodeNameEquals", 
-		"findDDictValuesByLsTypeEqualsAndLsKindEquals", "findDDictValuesByLsTypeEquals", 
-		"findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals",
-		"findDDictValuesByLsKindEquals", "findDDictValuesByIgnoredNot", "findDDictValuesByLabelTextLike" })
 public class DDictValue {
 
     private static final Logger logger = LoggerFactory.getLogger(DDictValue.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/DryRunCompound.java b/src/main/java/com/labsynch/labseer/domain/DryRunCompound.java
index 98530dec3..78389446c 100644
--- a/src/main/java/com/labsynch/labseer/domain/DryRunCompound.java
+++ b/src/main/java/com/labsynch/labseer/domain/DryRunCompound.java
@@ -16,18 +16,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = {"findDryRunCompoundsByCorpNameEquals", "findDryRunCompoundsByCdId" })
+
 public class DryRunCompound {
 
 	private String corpName;
diff --git a/src/main/java/com/labsynch/labseer/domain/Experiment.java b/src/main/java/com/labsynch/labseer/domain/Experiment.java
index e6b3e72bf..37601fcfd 100755
--- a/src/main/java/com/labsynch/labseer/domain/Experiment.java
+++ b/src/main/java/com/labsynch/labseer/domain/Experiment.java
@@ -27,10 +27,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.utils.CustomBigDecimalFactory;
@@ -41,10 +37,6 @@
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString(excludeFields = { "lsTags", "lsStates", "analysisGroups", "lsLabels" })
-@RooJson
-@RooJpaActiveRecord(finders = { "findExperimentsByCodeNameEquals", "findExperimentsByLsTransaction", "findExperimentsByProtocol", "findExperimentsByLsTypeEqualsAndLsKindEquals", "findExperimentsByLsTypeEquals", "findExperimentsByLsKindEquals", "findExperimentsByLsKindLike", "findExperimentsByLsTypeLike", "findExperimentsByCodeNameLike", "findExperimentsByRecordedByLike" })
 public class Experiment extends AbstractThing {
 
     private static final Logger logger = LoggerFactory.getLogger(Experiment.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentKind.java b/src/main/java/com/labsynch/labseer/domain/ExperimentKind.java
index 617b40b42..da1d0b829 100755
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ExperimentKind.java
@@ -22,18 +22,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(sequenceName = "EXPERIMENT_KIND_PKSEQ", finders={"findExperimentKindsByLsTypeEqualsAndKindNameEquals"})
-@RooJson
+
 public class ExperimentKind {
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentLabel.java b/src/main/java/com/labsynch/labseer/domain/ExperimentLabel.java
index f0ae7e068..232fe93c1 100755
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/ExperimentLabel.java
@@ -18,10 +18,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.utils.CustomBigDecimalFactory;
@@ -32,10 +28,7 @@
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findExperimentLabelsByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot", "findExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot", "findExperimentLabelsByExperiment", "findExperimentLabelsByLabelTextLike", "findExperimentLabelsByExperimentAndIgnoredNot" })
+
 public class ExperimentLabel extends AbstractLabel {
 
     private static final Logger logger = LoggerFactory.getLogger(ExperimentLabel.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentState.java b/src/main/java/com/labsynch/labseer/domain/ExperimentState.java
index e66befc57..c84126eb3 100755
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ExperimentState.java
@@ -22,10 +22,6 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.utils.CustomBigDecimalFactory;
@@ -36,10 +32,7 @@
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(finders = { "findExperimentStatesByExperiment" })
-@RooJson
+
 public class ExperimentState extends AbstractState {
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentType.java b/src/main/java/com/labsynch/labseer/domain/ExperimentType.java
index eea4b8634..5e53e3c79 100755
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentType.java
+++ b/src/main/java/com/labsynch/labseer/domain/ExperimentType.java
@@ -19,18 +19,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(sequenceName = "EXPERIMENT_TYPE_PKSEQ", finders = { "findExperimentTypesByTypeNameEquals" })
-@RooJson
+
 public class ExperimentType {
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentValue.java b/src/main/java/com/labsynch/labseer/domain/ExperimentValue.java
index ccac8d23a..57270c79e 100755
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ExperimentValue.java
@@ -19,10 +19,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 import org.supercsv.cellprocessor.Optional;
 import org.supercsv.cellprocessor.ift.CellProcessor;
@@ -32,10 +28,7 @@
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findExperimentValuesByLsState", "findExperimentValuesByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals", "findExperimentValuesByLsKindEqualsAndCodeValueLike", "findExperimentValuesByLsKindEqualsAndStringValueLike" })
+
 public class ExperimentValue extends AbstractValue {
 
     private static final Logger logger = LoggerFactory.getLogger(ExperimentValue.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/FileList.java b/src/main/java/com/labsynch/labseer/domain/FileList.java
index fa79c449b..d8cb38195 100755
--- a/src/main/java/com/labsynch/labseer/domain/FileList.java
+++ b/src/main/java/com/labsynch/labseer/domain/FileList.java
@@ -28,19 +28,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findFileListsByLot", "findFileListsByUrlEquals" })
+
 public class FileList {
 
 	
diff --git a/src/main/java/com/labsynch/labseer/domain/FileThing.java b/src/main/java/com/labsynch/labseer/domain/FileThing.java
index a3a709309..0bbe05046 100755
--- a/src/main/java/com/labsynch/labseer/domain/FileThing.java
+++ b/src/main/java/com/labsynch/labseer/domain/FileThing.java
@@ -9,18 +9,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(sequenceName = "FILE_PKSEQ")
-@RooJson
+
 public class FileThing extends AbstractThing {
 
     @Size(max = 512)
diff --git a/src/main/java/com/labsynch/labseer/domain/FileType.java b/src/main/java/com/labsynch/labseer/domain/FileType.java
index dfe3a5906..e12a5232d 100755
--- a/src/main/java/com/labsynch/labseer/domain/FileType.java
+++ b/src/main/java/com/labsynch/labseer/domain/FileType.java
@@ -17,18 +17,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(finders = { "findFileTypesByCodeEquals" })
-@RooJson
+
 public class FileType {
 
 	
diff --git a/src/main/java/com/labsynch/labseer/domain/InteractionKind.java b/src/main/java/com/labsynch/labseer/domain/InteractionKind.java
index d09a1d06f..ca4f46db9 100755
--- a/src/main/java/com/labsynch/labseer/domain/InteractionKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/InteractionKind.java
@@ -24,18 +24,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(sequenceName = "INTERACTION_KIND_PKSEQ", finders = { "findInteractionKindsByKindNameEqualsAndLsType", "findInteractionKindsByKindNameEquals" })
+
 public class InteractionKind {
 	
 	private static final Logger logger = LoggerFactory.getLogger(InteractionKind.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/InteractionType.java b/src/main/java/com/labsynch/labseer/domain/InteractionType.java
index 6c36a12e2..60cbb6d58 100755
--- a/src/main/java/com/labsynch/labseer/domain/InteractionType.java
+++ b/src/main/java/com/labsynch/labseer/domain/InteractionType.java
@@ -21,18 +21,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(sequenceName = "INTERACTION_TYPE_PKSEQ", finders = { "findInteractionTypesByTypeNameEquals", "findInteractionTypesByTypeNameEqualsAndTypeVerbEquals" })
-@RooJson
+
 public class InteractionType {
 
     private static final Logger logger = LoggerFactory.getLogger(InteractionType.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/IsoSalt.java b/src/main/java/com/labsynch/labseer/domain/IsoSalt.java
index 286fbb804..b33cb64c0 100755
--- a/src/main/java/com/labsynch/labseer/domain/IsoSalt.java
+++ b/src/main/java/com/labsynch/labseer/domain/IsoSalt.java
@@ -20,10 +20,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import flexjson.JSONDeserializer;
@@ -32,10 +28,7 @@
 @Configurable
 @Entity
 @Transactional
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findIsoSaltsBySaltForm", "findIsoSaltsBySaltFormAndType" })
+
 public class IsoSalt {
 
 	private static final Logger logger = LoggerFactory.getLogger(IsoSalt.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/Isotope.java b/src/main/java/com/labsynch/labseer/domain/Isotope.java
index c5d0f5612..aba1922a7 100755
--- a/src/main/java/com/labsynch/labseer/domain/Isotope.java
+++ b/src/main/java/com/labsynch/labseer/domain/Isotope.java
@@ -22,18 +22,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findIsotopesByAbbrevEquals", "findIsotopesByAbbrevEqualsAndNameEquals", "findIsotopesByNameEquals" })
+
 public class Isotope {
 
 	
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer.java b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer.java
index 60fa5f705..d500520e2 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer.java
@@ -23,10 +23,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 import com.labsynch.labseer.utils.CustomBigDecimalFactory;
 import com.labsynch.labseer.utils.ExcludeNulls;
@@ -36,10 +32,7 @@
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findItxContainerContainersByLsTransactionEquals", "findItxContainerContainersByLsTypeEqualsAndFirstContainerEquals", "findItxContainerContainersByLsTypeEqualsAndSecondContainerEquals" })
+
 public class ItxContainerContainer extends AbstractThing {
 
 	private static final Logger logger = LoggerFactory.getLogger(ItxContainerContainer.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState.java b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState.java
index 0a654b9dc..522d05e2f 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState.java
@@ -18,10 +18,6 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.utils.CustomBigDecimalFactory;
@@ -32,10 +28,7 @@
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord
-@RooJson
+
 public class ItxContainerContainerState extends AbstractState {
 
     public ItxContainerContainerState(ItxContainerContainerState itxState) {
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue.java b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue.java
index d6354675e..454fee62a 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue.java
@@ -12,10 +12,6 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.utils.CustomBigDecimalFactory;
@@ -26,10 +22,7 @@
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord
-@RooJson
+
 public class ItxContainerContainerValue extends AbstractValue {
 		
     @ManyToOne
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment.java b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment.java
index f9ef186c0..361960c89 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment.java
@@ -24,10 +24,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 import com.labsynch.labseer.utils.CustomBigDecimalFactory;
 import com.labsynch.labseer.utils.ExcludeNulls;
@@ -37,10 +33,7 @@
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findItxExperimentExperimentsByLsTransactionEquals", "findItxExperimentExperimentsByFirstExperiment" , "findItxExperimentExperimentsBySecondExperiment"})
+
 @Table(name="ITX_EXPT_EXPT")
 public class ItxExperimentExperiment extends AbstractThing {
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState.java b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState.java
index 9c09e677d..59e0d9420 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState.java
@@ -19,10 +19,6 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.utils.CustomBigDecimalFactory;
@@ -33,10 +29,7 @@
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord
-@RooJson
+
 @Table(name="ITX_EXPT_EXPT_STATE")
 public class ItxExperimentExperimentState extends AbstractState {
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue.java b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue.java
index 689d031d6..74ddf23e3 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue.java
@@ -13,10 +13,6 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.utils.CustomBigDecimalFactory;
@@ -27,10 +23,7 @@
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord
-@RooJson
+
 @Table(name="ITX_EXPT_EXPT_VALUE")
 public class ItxExperimentExperimentValue extends AbstractValue {
 		
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing.java b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing.java
index 2ac76a31d..23b0f33cd 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing.java
@@ -24,10 +24,6 @@
 import org.slf4j.LoggerFactory;
 import javax.persistence.NoResultException;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 import com.labsynch.labseer.utils.CustomBigDecimalFactory;
 import com.labsynch.labseer.utils.ExcludeNulls;
@@ -37,10 +33,7 @@
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findItxLsThingLsThingsByCodeNameEquals", "findItxLsThingLsThingsByFirstLsThing", "findItxLsThingLsThingsBySecondLsThing" })
+
 public class ItxLsThingLsThing extends AbstractThing {
 
 	private static final Logger logger = LoggerFactory.getLogger(ItxLsThingLsThing.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState.java b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState.java
index f7d41e138..cddb0bd16 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState.java
@@ -20,10 +20,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.utils.CustomBigDecimalFactory;
@@ -34,10 +30,7 @@
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord
-@RooJson
+
 public class ItxLsThingLsThingState extends AbstractState {
 	
 	private static final Logger logger = LoggerFactory.getLogger(ItxLsThingLsThingState.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue.java b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue.java
index 8a96a95a4..037b94680 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue.java
@@ -18,18 +18,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findItxLsThingLsThingValuesByLsTransactionEquals", "findItxLsThingLsThingValuesByLsKindEquals" })
+
 public class ItxLsThingLsThingValue extends AbstractValue {
 
     @ManyToOne
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol.java b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol.java
index f440c1e5f..9ea765de5 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol.java
@@ -23,10 +23,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.utils.CustomBigDecimalFactory;
@@ -37,10 +33,7 @@
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findItxProtocolProtocolsByLsTransactionEquals", "findItxProtocolProtocolsByFirstProtocol" , "findItxProtocolProtocolsBySecondProtocol"})
+
 public class ItxProtocolProtocol extends AbstractThing {
 	
 	private static final Logger logger = LoggerFactory.getLogger(ItxProtocolProtocol.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState.java b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState.java
index 8c6c2d021..32c6e843d 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState.java
@@ -18,10 +18,6 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.utils.CustomBigDecimalFactory;
@@ -32,10 +28,7 @@
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord
-@RooJson
+
 public class ItxProtocolProtocolState extends AbstractState {
 
     public ItxProtocolProtocolState(ItxProtocolProtocolState itxState) {
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue.java b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue.java
index 7aaed18f6..7c8a3bed3 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue.java
@@ -12,10 +12,6 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.utils.CustomBigDecimalFactory;
@@ -26,10 +22,7 @@
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord
-@RooJson
+
 public class ItxProtocolProtocolValue extends AbstractValue {
 		
     @ManyToOne
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer.java b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer.java
index 8526fe7e0..5e4e013ed 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer.java
@@ -24,10 +24,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.utils.CustomBigDecimalFactory;
@@ -38,10 +34,7 @@
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findItxSubjectContainersBySubject", "findItxSubjectContainersByCodeNameEquals", "findItxSubjectContainersByContainer", "findItxSubjectContainersByLsTransactionEquals" })
+
 public class ItxSubjectContainer extends AbstractThing {
 	
 	private static final Logger logger = LoggerFactory.getLogger(ItxSubjectContainer.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState.java b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState.java
index 3ecf5f45b..14ed5f085 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState.java
@@ -19,10 +19,6 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.utils.CustomBigDecimalFactory;
@@ -33,10 +29,7 @@
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord
-@RooJson
+
 public class ItxSubjectContainerState extends AbstractState {
 
     public ItxSubjectContainerState() {
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue.java b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue.java
index 1a1223a69..08d377640 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue.java
@@ -14,10 +14,6 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.utils.CustomBigDecimalFactory;
@@ -28,10 +24,7 @@
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord
-@RooJson
+
 public class ItxSubjectContainerValue extends AbstractValue {
 
     @ManyToOne
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelKind.java b/src/main/java/com/labsynch/labseer/domain/LabelKind.java
index 790549282..1bd3c178a 100755
--- a/src/main/java/com/labsynch/labseer/domain/LabelKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/LabelKind.java
@@ -24,18 +24,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(sequenceName = "LABEL_KIND_PKSEQ", finders = { "findLabelKindsByLsType", "findLabelKindsByKindNameEquals", "findLabelKindsByKindNameEqualsAndLsType" })
+
 public class LabelKind {
 	
 	private static final Logger logger = LoggerFactory.getLogger(LabelKind.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelSequence.java b/src/main/java/com/labsynch/labseer/domain/LabelSequence.java
index 21b8f98a6..295e4c39a 100755
--- a/src/main/java/com/labsynch/labseer/domain/LabelSequence.java
+++ b/src/main/java/com/labsynch/labseer/domain/LabelSequence.java
@@ -39,10 +39,6 @@
 import org.hibernate.jdbc.ReturningWork;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.dto.AutoLabelDTO;
@@ -54,12 +50,6 @@
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(sequenceName = "LABEL_SEQUENCE_PKSEQ", finders = { "findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals", 
-		"findLabelSequencesByThingTypeAndKindEquals", "findLabelSequencesByLabelTypeAndKindEquals",
-"findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals"})
 public class LabelSequence {
 
 	@NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole.java b/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole.java
index 9a2c84638..a5aca1fe4 100644
--- a/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole.java
+++ b/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole.java
@@ -22,20 +22,12 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 
 @Configurable
 @Entity
-@RooJson
-@RooJavaBean
-@RooToString(excludeFields = { "labelSequenceEntry", "roleEntry", "version" })
 @Table(name = "label_sequence_ls_role", uniqueConstraints = { @javax.persistence.UniqueConstraint(columnNames = { "label_sequence_id", "ls_role_id" }) })
-@RooJpaActiveRecord(sequenceName = "LABELSEQ_ROLE_PKSEQ", finders = { "findLabelSequenceRolesByRoleEntryAndLabelSequenceEntry" })
 public class LabelSequenceRole {
 	
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelType.java b/src/main/java/com/labsynch/labseer/domain/LabelType.java
index 27ac76a2e..89caf1755 100755
--- a/src/main/java/com/labsynch/labseer/domain/LabelType.java
+++ b/src/main/java/com/labsynch/labseer/domain/LabelType.java
@@ -22,18 +22,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(sequenceName = "LABEL_TYPE_PKSEQ", finders = { "findLabelTypesByTypeNameEquals" })
-@RooJson
+
 public class LabelType {
 
 	private static final Logger logger = LoggerFactory.getLogger(LabelType.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/Lot.java b/src/main/java/com/labsynch/labseer/domain/Lot.java
index 6d7e7066a..e89a7a09c 100755
--- a/src/main/java/com/labsynch/labseer/domain/Lot.java
+++ b/src/main/java/com/labsynch/labseer/domain/Lot.java
@@ -43,10 +43,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -58,14 +54,6 @@
 @Entity
 @Configurable
 @Transactional
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findLotsByCorpNameEquals", "findLotsByCorpNameLike", "findLotsBySynthesisDateBetween", 
-		                         "findLotsBySaltForm", "findLotsBySynthesisDateGreaterThan", "findLotsBySynthesisDateLessThan", 
-		                         "findLotsByChemistAndSynthesisDateBetween", "findLotsByIsVirtualNot", "findLotsByBuid", 
-		                         "findLotsByNotebookPageEquals", "findLotsByNotebookPageEqualsAndIgnoreNot", 
-		                         "findLotsByBulkLoadFileEquals" })
 public class Lot {
 	
     private static final Logger logger = LoggerFactory.getLogger(Lot.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAlias.java b/src/main/java/com/labsynch/labseer/domain/LotAlias.java
index 34068fd72..d4d084841 100644
--- a/src/main/java/com/labsynch/labseer/domain/LotAlias.java
+++ b/src/main/java/com/labsynch/labseer/domain/LotAlias.java
@@ -16,10 +16,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 import com.labsynch.labseer.dto.LotAliasDTO;
 import com.labsynch.labseer.exceptions.LotNotFoundException;
@@ -30,12 +26,6 @@
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders={"findLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals", 
-						     "findLotAliasesByLotAndLsTypeEqualsAndLsKindEquals",
-							"findLotAliasesByLot"})
 public class LotAlias {
 
 	private static final Logger logger = LoggerFactory.getLogger(LotAlias.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAliasKind.java b/src/main/java/com/labsynch/labseer/domain/LotAliasKind.java
index dc4d0949b..a75086103 100644
--- a/src/main/java/com/labsynch/labseer/domain/LotAliasKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/LotAliasKind.java
@@ -19,18 +19,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord()
+
 public class LotAliasKind {
 	
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAliasType.java b/src/main/java/com/labsynch/labseer/domain/LotAliasType.java
index 486561fcc..0c963e082 100644
--- a/src/main/java/com/labsynch/labseer/domain/LotAliasType.java
+++ b/src/main/java/com/labsynch/labseer/domain/LotAliasType.java
@@ -16,18 +16,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord()
+
 public class LotAliasType {
 
     @Size(max = 255)
diff --git a/src/main/java/com/labsynch/labseer/domain/LsInteraction.java b/src/main/java/com/labsynch/labseer/domain/LsInteraction.java
index 0c15832e8..3eea764a9 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsInteraction.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsInteraction.java
@@ -10,18 +10,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord
-@RooJson
+
 public class LsInteraction extends AbstractThing {
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/LsRole.java b/src/main/java/com/labsynch/labseer/domain/LsRole.java
index 710428d31..616b445e4 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsRole.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsRole.java
@@ -22,9 +22,6 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.dto.CodeTableDTO;
@@ -33,16 +30,6 @@
 
 @Configurable
 @Entity
-@RooJson
-@RooJavaBean
-@RooJpaActiveRecord(sequenceName = "LSROLE_PKSEQ", finders = { 
-		"findLsRolesByRoleNameEquals", 
-		"findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals", 
-		"findLsRolesByLsTypeEqualsAndRoleNameEquals", 
-		"findLsRolesByLsTypeEqualsAndLsKindEquals",
-		"findLsRolesByLsTypeEquals",
-		"findLsRolesByLsKindEquals"})
-
 public class LsRole {
 
     @Size(max = 255)
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqAnlGrp.java b/src/main/java/com/labsynch/labseer/domain/LsSeqAnlGrp.java
index 79524d49b..d49083427 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqAnlGrp.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqAnlGrp.java
@@ -11,14 +11,10 @@
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Version;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooJpaActiveRecord(sequenceName = "LSSEQ_ANLGRP_PKSEQ" )
 public class LsSeqAnlGrp {
 	
 	
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqContainer.java b/src/main/java/com/labsynch/labseer/domain/LsSeqContainer.java
index 8ea0b9998..7caa2ff09 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqContainer.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqContainer.java
@@ -11,15 +11,11 @@
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Version;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
 
-@RooJpaActiveRecord(sequenceName = "LSSEQ_CONTAINER_PKSEQ" )
 public class LsSeqContainer {
 	
 	
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqExpt.java b/src/main/java/com/labsynch/labseer/domain/LsSeqExpt.java
index 407f0b7d8..9cec7f1f9 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqExpt.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqExpt.java
@@ -11,15 +11,11 @@
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Version;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
 
-@RooJpaActiveRecord(sequenceName = "LSSEQ_EXPT_PKSEQ" )
 public class LsSeqExpt {
 	
 	
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxCntrCntr.java b/src/main/java/com/labsynch/labseer/domain/LsSeqItxCntrCntr.java
index 44c6cca66..29a1cde6c 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxCntrCntr.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqItxCntrCntr.java
@@ -11,16 +11,12 @@
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Version;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.transaction.annotation.Transactional;
 
 
 @Entity
 @Configurable
-@RooJavaBean
 
-@RooJpaActiveRecord(sequenceName = "LSSEQ_ITXCNTRCNTR_PKSEQ" )
 public class LsSeqItxCntrCntr {
 	
 	
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxExperimentExperiment.java b/src/main/java/com/labsynch/labseer/domain/LsSeqItxExperimentExperiment.java
index 903e0a582..0ab5b4126 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxExperimentExperiment.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqItxExperimentExperiment.java
@@ -12,14 +12,10 @@
 import javax.persistence.Table;
 import javax.persistence.Version;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooJpaActiveRecord(sequenceName = "LSSEQ_ITXEXPTEXPT_PKSEQ" )
 @Table(name="LS_SEQ_ITX_EXPT_EXPT")
 public class LsSeqItxExperimentExperiment {
 	
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxLsThingLsThing.java b/src/main/java/com/labsynch/labseer/domain/LsSeqItxLsThingLsThing.java
index 469c2d987..f4ae89f11 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxLsThingLsThing.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqItxLsThingLsThing.java
@@ -11,14 +11,10 @@
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Version;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooJpaActiveRecord(sequenceName = "LSSEQ_ITXTHGTHG_PKSEQ" )
 public class LsSeqItxLsThingLsThing {
 	
 
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxProtocolProtocol.java b/src/main/java/com/labsynch/labseer/domain/LsSeqItxProtocolProtocol.java
index 016407a68..80739a259 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxProtocolProtocol.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqItxProtocolProtocol.java
@@ -11,16 +11,12 @@
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Version;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.transaction.annotation.Transactional;
 
 
 @Entity
 @Configurable
-@RooJavaBean
 
-@RooJpaActiveRecord(sequenceName = "LSSEQ_ITXPROTPROT_PKSEQ" )
 public class LsSeqItxProtocolProtocol {
 	
 	
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxSubjCntr.java b/src/main/java/com/labsynch/labseer/domain/LsSeqItxSubjCntr.java
index 8f4e5832e..61dda47a1 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxSubjCntr.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqItxSubjCntr.java
@@ -11,15 +11,11 @@
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Version;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
 
-@RooJpaActiveRecord(sequenceName = "LSSEQ_ITXSUBJCNTR_PKSEQ" )
 public class LsSeqItxSubjCntr {
 	
 	
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqProtocol.java b/src/main/java/com/labsynch/labseer/domain/LsSeqProtocol.java
index 12893f59e..f2b19721c 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqProtocol.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqProtocol.java
@@ -11,14 +11,10 @@
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Version;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooJpaActiveRecord(sequenceName = "LSSEQ_PROT_PKSEQ" )
 public class LsSeqProtocol {
 	
 	
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqSubject.java b/src/main/java/com/labsynch/labseer/domain/LsSeqSubject.java
index dfe9e42ac..7729364ac 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqSubject.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqSubject.java
@@ -11,14 +11,10 @@
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Version;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooJpaActiveRecord(sequenceName = "LSSEQ_SUBJ_PKSEQ" )
 public class LsSeqSubject {
 	
 	
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqTrtGrp.java b/src/main/java/com/labsynch/labseer/domain/LsSeqTrtGrp.java
index 947569aba..2407d4b4f 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqTrtGrp.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqTrtGrp.java
@@ -11,14 +11,10 @@
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Version;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooJpaActiveRecord(sequenceName = "LSSEQ_TRTGRP_PKSEQ" )
 public class LsSeqTrtGrp {
 	
 	
diff --git a/src/main/java/com/labsynch/labseer/domain/LsTag.java b/src/main/java/com/labsynch/labseer/domain/LsTag.java
index 58f04df4b..af4a75dd7 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsTag.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsTag.java
@@ -26,20 +26,12 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString(excludeFields = { "experiments", "protocols", "recordedDate", "version" })
-@RooJson
-@RooJpaActiveRecord(sequenceName = "LS_TAG_PKSEQ", finders = { "findLsTagsByTagTextEquals", "findLsTagsByTagTextLike" })
 public class LsTag {
 
 	
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThing.java b/src/main/java/com/labsynch/labseer/domain/LsThing.java
index fcdcb0050..0298da972 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsThing.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsThing.java
@@ -25,10 +25,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.api.ApiExperimentController;
@@ -42,16 +38,6 @@
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString(excludeFields = { "lsTags", "lsStates", "lsLabels" })
-@RooJson
-@RooJpaActiveRecord(finders = { "findLsThingsByCodeNameEquals", "findLsThingsByCodeNameLike", 
-		"findLsThingsByLsKindLike", "findLsThingsByLsTransactionEquals", 
-		"findLsThingsByLsTypeAndKindEquals", "findLsThingsByRecordedByLike", 
-		"findLsThingsByLsTypeEquals", "findLsThingsByLsKindEquals", 
-		"findLsThingsByLsTypeEqualsAndLsKindEquals",
-		"findLsThingsByRecordedDateGreaterThan", "findLsThingsByRecordedDateLessThan" })
-
 public class LsThing extends AbstractThing {
 
 	private static final Logger logger = LoggerFactory.getLogger(LsThing.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingLabel.java b/src/main/java/com/labsynch/labseer/domain/LsThingLabel.java
index d7368f0d4..2ce37cea3 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsThingLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsThingLabel.java
@@ -19,10 +19,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.dto.PreferredNameDTO;
@@ -32,13 +28,6 @@
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findLsThingLabelsByLsThing", "findLsThingLabelsByLsTransactionEquals", 
-		"findLsThingLabelsByLabelTextEquals",
-		"findLsThingLabelsByLabelTextEqualsAndIgnoredNot",
-	     "findLsThingLabelsByLabelTextLike" })
 public class LsThingLabel extends AbstractLabel {
 
 	private static final Logger logger = LoggerFactory.getLogger(LsThingLabel.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingState.java b/src/main/java/com/labsynch/labseer/domain/LsThingState.java
index 687559e2a..07c71d66c 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsThingState.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsThingState.java
@@ -21,10 +21,6 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.utils.CustomBigDecimalFactory;
@@ -35,10 +31,7 @@
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findLsThingStatesByLsTransactionEquals", "findLsThingStatesByLsThing"})
+
 public class LsThingState extends AbstractState {
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingValue.java b/src/main/java/com/labsynch/labseer/domain/LsThingValue.java
index 3e6e2ef5c..7684503d0 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsThingValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsThingValue.java
@@ -17,10 +17,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.utils.ByteArrayTransformer;
@@ -32,19 +28,6 @@
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findLsThingValuesByLsState", "findLsThingValuesByLsTransactionEquals",
-		 "findLsThingValuesByCodeValueEquals", "findLsThingValuesByIgnoredNotAndCodeValueEquals",
-		 "findLsThingValuesByLsKindEqualsAndStringValueLike", "findLsThingValuesByLsKindEqualsAndDateValueLike",
-		 "findLsThingValuesByLsKindEqualsAndCodeValueLike",
-		 "findLsThingValuesByLsKindEqualsAndStringValueEquals",
-		 "findLsThingValuesByLsKindEqualsAndNumericValueEquals",
-		 "findLsThingValuesByLsKindEqualsAndNumericValueGreaterThanEquals",
-		 "findLsThingValuesByLsKindEqualsAndNumericValueLessThanEquals",
-		 "findLsThingValuesByLsKindEqualsAndDateValueGreaterThanEquals",
-		 "findLsThingValuesByLsKindEqualsAndDateValueLessThanEquals"})
 public class LsThingValue extends AbstractValue {
 
 	private static final Logger logger = LoggerFactory.getLogger(LsThingValue.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/LsTransaction.java b/src/main/java/com/labsynch/labseer/domain/LsTransaction.java
index c43203a14..cd4ac2891 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsTransaction.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsTransaction.java
@@ -24,18 +24,11 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(sequenceName = "LS_TRANSACTION_PKSEQ")
-@RooJson
+
 public class LsTransaction {
 
     @Size(max = 255)
diff --git a/src/main/java/com/labsynch/labseer/domain/Operator.java b/src/main/java/com/labsynch/labseer/domain/Operator.java
index f97a25b68..650ed5f6a 100755
--- a/src/main/java/com/labsynch/labseer/domain/Operator.java
+++ b/src/main/java/com/labsynch/labseer/domain/Operator.java
@@ -17,18 +17,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findOperatorsByCodeEquals", "findOperatorsByNameEquals" })
+
 public class Operator {
 
     @Size(max = 255)
diff --git a/src/main/java/com/labsynch/labseer/domain/OperatorKind.java b/src/main/java/com/labsynch/labseer/domain/OperatorKind.java
index 12dc957f4..57902451d 100755
--- a/src/main/java/com/labsynch/labseer/domain/OperatorKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/OperatorKind.java
@@ -22,18 +22,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(sequenceName = "OPERATOR_KIND_PKSEQ", finders={"findOperatorKindsByKindNameEqualsAndLsType"})
-@RooJson
+
 public class OperatorKind {
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/OperatorType.java b/src/main/java/com/labsynch/labseer/domain/OperatorType.java
index 81748765b..949204f91 100755
--- a/src/main/java/com/labsynch/labseer/domain/OperatorType.java
+++ b/src/main/java/com/labsynch/labseer/domain/OperatorType.java
@@ -19,18 +19,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(sequenceName = "OPERATOR_TYPE_PKSEQ", finders = { "findOperatorTypesByTypeNameEquals" })
-@RooJson
+
 public class OperatorType {
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/Parent.java b/src/main/java/com/labsynch/labseer/domain/Parent.java
index ad940f336..15d3a7a0b 100755
--- a/src/main/java/com/labsynch/labseer/domain/Parent.java
+++ b/src/main/java/com/labsynch/labseer/domain/Parent.java
@@ -40,10 +40,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.dto.LabelPrefixDTO;
@@ -56,10 +52,7 @@
 @Entity
 @Configurable
 @Transactional
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findParentsByCorpNameEquals", "findParentsByCorpNameLike", "findParentsByCdId", "findParentsBySaltForms", "findParentsByCommonNameLike", "findParentsByBulkLoadFileEquals" })
+
 public class Parent {
 
 	private static final Logger logger = LoggerFactory.getLogger(Parent.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAlias.java b/src/main/java/com/labsynch/labseer/domain/ParentAlias.java
index 5bec1c47d..ae0b12a4b 100644
--- a/src/main/java/com/labsynch/labseer/domain/ParentAlias.java
+++ b/src/main/java/com/labsynch/labseer/domain/ParentAlias.java
@@ -16,10 +16,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 import com.labsynch.labseer.dto.ParentAliasDTO;
 import com.labsynch.labseer.exceptions.ParentNotFoundException;
@@ -30,13 +26,6 @@
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders={"findParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals", 
-		"findParentAliasesByParent", "findParentAliasesByAliasNameEquals", 
-		"findParentAliasesByParentAndLsTypeEqualsAndLsKindEquals",
-		"findParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals"})
 public class ParentAlias {
 
 	private static final Logger logger = LoggerFactory.getLogger(ParentAlias.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAliasKind.java b/src/main/java/com/labsynch/labseer/domain/ParentAliasKind.java
index 5fe455bb3..ef52c7c79 100644
--- a/src/main/java/com/labsynch/labseer/domain/ParentAliasKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ParentAliasKind.java
@@ -19,18 +19,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord()
+
 public class ParentAliasKind {
 	
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAliasType.java b/src/main/java/com/labsynch/labseer/domain/ParentAliasType.java
index 8a37f47ca..3462d1f9e 100644
--- a/src/main/java/com/labsynch/labseer/domain/ParentAliasType.java
+++ b/src/main/java/com/labsynch/labseer/domain/ParentAliasType.java
@@ -16,18 +16,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord()
+
 public class ParentAliasType {
 
     @Size(max = 255)
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAnnotation.java b/src/main/java/com/labsynch/labseer/domain/ParentAnnotation.java
index b85ff85b2..c252ba66f 100644
--- a/src/main/java/com/labsynch/labseer/domain/ParentAnnotation.java
+++ b/src/main/java/com/labsynch/labseer/domain/ParentAnnotation.java
@@ -17,18 +17,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders={"findParentAnnotationsByCodeEquals"})
+
 public class ParentAnnotation {
 
 	@NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/PhysicalState.java b/src/main/java/com/labsynch/labseer/domain/PhysicalState.java
index 909cd7222..a00a8d66a 100755
--- a/src/main/java/com/labsynch/labseer/domain/PhysicalState.java
+++ b/src/main/java/com/labsynch/labseer/domain/PhysicalState.java
@@ -17,18 +17,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findPhysicalStatesByCodeEquals", "findPhysicalStatesByNameLike", "findPhysicalStatesByNameEquals" })
+
 public class PhysicalState {
 
 	
diff --git a/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName.java b/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName.java
index 9a3cda71c..15594045c 100755
--- a/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName.java
+++ b/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName.java
@@ -19,18 +19,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord
-@RooJson
+
 public class PreDef_CorpName {
 
 	
diff --git a/src/main/java/com/labsynch/labseer/domain/Protocol.java b/src/main/java/com/labsynch/labseer/domain/Protocol.java
index 22adc1ed2..64313e391 100755
--- a/src/main/java/com/labsynch/labseer/domain/Protocol.java
+++ b/src/main/java/com/labsynch/labseer/domain/Protocol.java
@@ -23,10 +23,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.dto.CodeTableDTO;
@@ -38,10 +34,6 @@
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString(excludeFields = { "lsTags", "lsStates", "experiments", "lsLabels" })
-@RooJson
-@RooJpaActiveRecord(finders = { "findProtocolsByCodeNameEquals", "findProtocolsByCodeNameLike", "findProtocolsByIgnoredNot", "findProtocolsByLsKindEquals", "findProtocolsByLsTypeEquals", "findProtocolsByLsTypeEqualsAndLsKindEquals", "findProtocolsByLsTypeAndKindEquals", "findProtocolsByLsTransactionEquals", "findProtocolsByRecordedByLike", "findProtocolsByLsKindLike", "findProtocolsByLsTypeLike", "findProtocolsByCodeNameEqualsAndIgnoredNot" })
 public class Protocol extends AbstractThing {
 
     private static final Logger logger = LoggerFactory.getLogger(Protocol.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolKind.java b/src/main/java/com/labsynch/labseer/domain/ProtocolKind.java
index c617e8c3a..8725281f5 100755
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ProtocolKind.java
@@ -22,18 +22,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(sequenceName = "PROTOCOL_KIND_PKSEQ", finders={"findProtocolKindsByLsTypeEqualsAndKindNameEquals"})
-@RooJson
+
 public class ProtocolKind {
 
     @Id
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolLabel.java b/src/main/java/com/labsynch/labseer/domain/ProtocolLabel.java
index ce734a9ca..6947c9352 100755
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/ProtocolLabel.java
@@ -16,20 +16,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findProtocolLabelsByProtocol", "findProtocolLabelsByLsTransactionEquals", "findProtocolLabelsByLabelTextEqualsAndIgnoredNot", "findProtocolLabelsByLabelTextLike" })
+
 public class ProtocolLabel extends AbstractLabel {
 	
 	private static final Logger logger = LoggerFactory.getLogger(ProtocolLabel.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolState.java b/src/main/java/com/labsynch/labseer/domain/ProtocolState.java
index 5dbe07c92..a5380dd48 100755
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ProtocolState.java
@@ -22,10 +22,6 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.utils.CustomBigDecimalFactory;
@@ -36,11 +32,8 @@
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
+
 @Transactional
-@RooJpaActiveRecord(finders = { "findProtocolStatesByProtocol", "findProtocolStatesByLsTransactionEquals" })
 public class ProtocolState extends AbstractState {
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolType.java b/src/main/java/com/labsynch/labseer/domain/ProtocolType.java
index 8e7f07722..11eb5d816 100755
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolType.java
+++ b/src/main/java/com/labsynch/labseer/domain/ProtocolType.java
@@ -19,18 +19,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(sequenceName = "PROTOCOL_TYPE_PKSEQ", finders = { "findProtocolTypesByTypeNameEquals" })
-@RooJson
+
 public class ProtocolType {
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolValue.java b/src/main/java/com/labsynch/labseer/domain/ProtocolValue.java
index 204e7cdae..dfa7c1597 100755
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ProtocolValue.java
@@ -16,10 +16,6 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 import com.labsynch.labseer.utils.CustomBigDecimalFactory;
 
@@ -28,10 +24,7 @@
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findProtocolValuesByLsState", "findProtocolValuesByLsTransactionEquals", "findProtocolValuesByLsKindEqualsAndStringValueLike", "findProtocolValuesByLsKindEqualsAndCodeValueLike" })
+
 public class ProtocolValue extends AbstractValue {
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy.java b/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy.java
index 0d076e3b1..16605a14c 100755
--- a/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy.java
+++ b/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy.java
@@ -17,18 +17,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(finders = { "findPurityMeasuredBysByCodeEquals", "findPurityMeasuredBysByNameEquals", "findPurityMeasuredBysByNameLike" })
-@RooJson
+
 public class PurityMeasuredBy {
 
 	
diff --git a/src/main/java/com/labsynch/labseer/domain/RegSearch.java b/src/main/java/com/labsynch/labseer/domain/RegSearch.java
index d840dad89..da6afdd02 100755
--- a/src/main/java/com/labsynch/labseer/domain/RegSearch.java
+++ b/src/main/java/com/labsynch/labseer/domain/RegSearch.java
@@ -7,13 +7,8 @@
 import javax.persistence.Lob;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class RegSearch {
 
 	
diff --git a/src/main/java/com/labsynch/labseer/domain/RoleKind.java b/src/main/java/com/labsynch/labseer/domain/RoleKind.java
index 197569bd6..055651b4a 100644
--- a/src/main/java/com/labsynch/labseer/domain/RoleKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/RoleKind.java
@@ -21,20 +21,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(sequenceName = "ROLE_KIND_PKSEQ", finders={"findRoleKindsByLsType", 
-		"findRoldKindsByKindNameEquals", "findRoleKindsByKindNameEqualsAndLsType"})
-@RooJson
 public class RoleKind {
 	
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/RoleType.java b/src/main/java/com/labsynch/labseer/domain/RoleType.java
index 41d0be087..474c45cd5 100644
--- a/src/main/java/com/labsynch/labseer/domain/RoleType.java
+++ b/src/main/java/com/labsynch/labseer/domain/RoleType.java
@@ -19,18 +19,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(sequenceName = "ROLE_TYPE_PKSEQ", finders = { "findRoleTypesByTypeNameEquals" })
-@RooJson
+
 public class RoleType {
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/Salt.java b/src/main/java/com/labsynch/labseer/domain/Salt.java
index b4da84879..986b235b6 100755
--- a/src/main/java/com/labsynch/labseer/domain/Salt.java
+++ b/src/main/java/com/labsynch/labseer/domain/Salt.java
@@ -24,19 +24,12 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
 @Transactional
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findSaltsByCdId", "findSaltsByAbbrevEquals", "findSaltsByAbbrevLike", "findSaltsByAbbrevEqualsAndNameEquals", "findSaltsByNameEquals" })
+
 public class Salt {
 
 	@Column(columnDefinition="text")
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltForm.java b/src/main/java/com/labsynch/labseer/domain/SaltForm.java
index 688f43add..afb5a58cf 100755
--- a/src/main/java/com/labsynch/labseer/domain/SaltForm.java
+++ b/src/main/java/com/labsynch/labseer/domain/SaltForm.java
@@ -39,10 +39,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.dto.SearchFormDTO;
@@ -52,10 +48,7 @@
 @Entity
 @Configurable
 @Transactional
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findSaltFormsByCorpNameEquals", "findSaltFormsByCorpNameLike", "findSaltFormsByParent", "findSaltFormsByCdId", "findSaltFormsByBulkLoadFileEquals" })
+
 public class SaltForm implements Comparable {
 
 	private static final Logger logger = LoggerFactory.getLogger(SaltForm.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAlias.java b/src/main/java/com/labsynch/labseer/domain/SaltFormAlias.java
index 1e3b152a9..b16d5fd8d 100644
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAlias.java
+++ b/src/main/java/com/labsynch/labseer/domain/SaltFormAlias.java
@@ -16,10 +16,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 import com.labsynch.labseer.dto.SaltFormAliasDTO;
 import com.labsynch.labseer.exceptions.ParentNotFoundException;
@@ -31,10 +27,7 @@
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders={"findSaltFormAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals", "findSaltFormAliasesBySaltForm"})
+
 public class SaltFormAlias {
 
 	private static final Logger logger = LoggerFactory.getLogger(SaltFormAlias.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind.java b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind.java
index 57e48a474..88f441c81 100644
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind.java
@@ -19,18 +19,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord()
+
 public class SaltFormAliasKind {
 	
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType.java b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType.java
index 006a7c725..71e201f7f 100644
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType.java
+++ b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType.java
@@ -16,18 +16,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord()
+
 public class SaltFormAliasType {
 	
     @Size(max = 255)
diff --git a/src/main/java/com/labsynch/labseer/domain/SolutionUnit.java b/src/main/java/com/labsynch/labseer/domain/SolutionUnit.java
index ad78879f8..c5232148f 100755
--- a/src/main/java/com/labsynch/labseer/domain/SolutionUnit.java
+++ b/src/main/java/com/labsynch/labseer/domain/SolutionUnit.java
@@ -17,18 +17,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findSolutionUnitsByCodeLike", "findSolutionUnitsByCodeEquals", "findSolutionUnitsByNameEquals" })
+
 public class SolutionUnit {
 
     @Size(max = 255)
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound.java b/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound.java
index 09a526d96..09ed0ad1d 100644
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound.java
+++ b/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound.java
@@ -26,10 +26,6 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
@@ -41,10 +37,7 @@
 import flexjson.JSONSerializer;
 
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = {"findStandardizationDryRunCompoundsByCorpNameEquals","findStandardizationDryRunCompoundsByCdId" })
+
 @Configurable
 public class StandardizationDryRunCompound {
 	
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationHistory.java b/src/main/java/com/labsynch/labseer/domain/StandardizationHistory.java
index bf02e56d7..3b92552e8 100644
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationHistory.java
+++ b/src/main/java/com/labsynch/labseer/domain/StandardizationHistory.java
@@ -17,18 +17,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord
+
 public class StandardizationHistory {
 
 	@Id
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationSettings.java b/src/main/java/com/labsynch/labseer/domain/StandardizationSettings.java
index c6eb74b0e..55615eb69 100644
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationSettings.java
+++ b/src/main/java/com/labsynch/labseer/domain/StandardizationSettings.java
@@ -1,8 +1,4 @@
 package com.labsynch.labseer.domain;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
@@ -27,10 +23,7 @@
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findStandardizationSettingsesByNeedsStandardization" })
+
 public class StandardizationSettings {
 
     /**
diff --git a/src/main/java/com/labsynch/labseer/domain/StateKind.java b/src/main/java/com/labsynch/labseer/domain/StateKind.java
index 59782fdc0..3345daa43 100755
--- a/src/main/java/com/labsynch/labseer/domain/StateKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/StateKind.java
@@ -24,18 +24,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(sequenceName = "STATE_KIND_PKSEQ", finders = { "findStateKindsByLsType", "findStateKindsByKindNameEquals", "findStateKindsByKindNameEqualsAndLsType" })
+
 public class StateKind {
 
     private static final Logger logger = LoggerFactory.getLogger(StateKind.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/StateType.java b/src/main/java/com/labsynch/labseer/domain/StateType.java
index 40511ac9c..5ae920149 100755
--- a/src/main/java/com/labsynch/labseer/domain/StateType.java
+++ b/src/main/java/com/labsynch/labseer/domain/StateType.java
@@ -22,18 +22,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(sequenceName = "STATE_TYPE_PKSEQ", finders = { "findStateTypesByTypeNameEquals" })
-@RooJson
+
 public class StateType {
 
     private static final Logger logger = LoggerFactory.getLogger(StateType.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/StereoCategory.java b/src/main/java/com/labsynch/labseer/domain/StereoCategory.java
index 824cb607c..7d6556ecf 100755
--- a/src/main/java/com/labsynch/labseer/domain/StereoCategory.java
+++ b/src/main/java/com/labsynch/labseer/domain/StereoCategory.java
@@ -17,18 +17,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findStereoCategorysByCodeEquals", "findStereoCategorysByCodeLike" })
+
 public class StereoCategory {
 
     @Size(max = 255)
diff --git a/src/main/java/com/labsynch/labseer/domain/StructureKind.java b/src/main/java/com/labsynch/labseer/domain/StructureKind.java
index 038c320b7..28740a27c 100644
--- a/src/main/java/com/labsynch/labseer/domain/StructureKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/StructureKind.java
@@ -24,19 +24,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(sequenceName = "Structure_KIND_PKSEQ", finders = { "findStructureKindsByLsType", 
-		"findStructureKindsByKindNameEquals", "findStructureKindsByKindNameEqualsAndLsType" })
 public class StructureKind {
 
     private static final Logger logger = LoggerFactory.getLogger(StructureKind.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/StructureType.java b/src/main/java/com/labsynch/labseer/domain/StructureType.java
index 962c84882..2b1df0452 100644
--- a/src/main/java/com/labsynch/labseer/domain/StructureType.java
+++ b/src/main/java/com/labsynch/labseer/domain/StructureType.java
@@ -22,18 +22,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(sequenceName = "STATE_TYPE_PKSEQ", finders = { "findStructureTypesByTypeNameEquals" })
-@RooJson
+
 public class StructureType {
 
     private static final Logger logger = LoggerFactory.getLogger(StructureType.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/Subject.java b/src/main/java/com/labsynch/labseer/domain/Subject.java
index d1361028f..304f5693f 100755
--- a/src/main/java/com/labsynch/labseer/domain/Subject.java
+++ b/src/main/java/com/labsynch/labseer/domain/Subject.java
@@ -24,10 +24,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.dto.FlatThingCsvDTO;
@@ -39,10 +35,7 @@
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(finders = { "findSubjectsByTreatmentGroups", "findSubjectsByLsTransactionEquals", "findSubjectsByCodeNameEquals" })
-@RooJson
+
 public class Subject extends AbstractThing {
 	
 	private static final Logger logger = LoggerFactory.getLogger(Subject.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectLabel.java b/src/main/java/com/labsynch/labseer/domain/SubjectLabel.java
index 4ea3adeff..216ea474f 100755
--- a/src/main/java/com/labsynch/labseer/domain/SubjectLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/SubjectLabel.java
@@ -15,10 +15,6 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import flexjson.JSONDeserializer;
@@ -26,10 +22,7 @@
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findExperimentLabelsByLabelTextLikeAndLabelTypeAndKindEqualsAndPreferredNotAndIgnoredNot", "findSubjectLabelsBySubject" })
+
 public class SubjectLabel extends AbstractLabel {
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectState.java b/src/main/java/com/labsynch/labseer/domain/SubjectState.java
index 0b09b0f8b..a656fd1f1 100755
--- a/src/main/java/com/labsynch/labseer/domain/SubjectState.java
+++ b/src/main/java/com/labsynch/labseer/domain/SubjectState.java
@@ -24,10 +24,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.dto.FlatThingCsvDTO;
@@ -39,10 +35,6 @@
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString(excludeFields = { "subject", "lsValues" })
-@RooJson
-@RooJpaActiveRecord(finders = { "findSubjectStatesBySubject", "findSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject" })
 public class SubjectState extends AbstractState {
 
     private static final Logger logger = LoggerFactory.getLogger(SubjectState.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectValue.java b/src/main/java/com/labsynch/labseer/domain/SubjectValue.java
index c548c6eae..28c96ed3e 100755
--- a/src/main/java/com/labsynch/labseer/domain/SubjectValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/SubjectValue.java
@@ -18,10 +18,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 import org.supercsv.cellprocessor.Optional;
 import org.supercsv.cellprocessor.ift.CellProcessor;
@@ -36,10 +32,6 @@
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString(excludeFields = { "lsState" })
-@RooJson
-@RooJpaActiveRecord(finders = { "findSubjectValuesByLsState", "findSubjectValuesByCodeValueEquals", "findSubjectValuesByIgnoredNotAndCodeValueEquals", "findSubjectValuesByLsTypeEqualsAndLsKindEquals", "findSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals" })
 public class SubjectValue extends AbstractValue {
 
 	private static final Logger logger = LoggerFactory.getLogger(SubjectValue.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/TempSelectTable.java b/src/main/java/com/labsynch/labseer/domain/TempSelectTable.java
index d7496b99b..0e1feec88 100644
--- a/src/main/java/com/labsynch/labseer/domain/TempSelectTable.java
+++ b/src/main/java/com/labsynch/labseer/domain/TempSelectTable.java
@@ -23,16 +23,11 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(sequenceName = "TEMP_SELECT_PKSEQ")
+
 public class TempSelectTable {
 
 	private static final Logger logger = LoggerFactory.getLogger(TempSelectTable.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingKind.java b/src/main/java/com/labsynch/labseer/domain/ThingKind.java
index 6527a5f12..786c69ee5 100755
--- a/src/main/java/com/labsynch/labseer/domain/ThingKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ThingKind.java
@@ -24,18 +24,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findThingKindsByLsTypeAndKindEquals", "findThingKindsByLsType", "findThingKindsByKindNameEqualsAndLsType" })
+
 public class ThingKind {
 
 	private static final Logger logger = LoggerFactory.getLogger(ThingKind.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingPage.java b/src/main/java/com/labsynch/labseer/domain/ThingPage.java
index 946e3e975..c1766f37a 100755
--- a/src/main/java/com/labsynch/labseer/domain/ThingPage.java
+++ b/src/main/java/com/labsynch/labseer/domain/ThingPage.java
@@ -26,18 +26,11 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(sequenceName = "THING_PAGE_PKSEQ")
-@RooJson
+
 public class ThingPage {
 
     @Size(max = 255)
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingPageArchive.java b/src/main/java/com/labsynch/labseer/domain/ThingPageArchive.java
index c06f9216f..3358677b9 100755
--- a/src/main/java/com/labsynch/labseer/domain/ThingPageArchive.java
+++ b/src/main/java/com/labsynch/labseer/domain/ThingPageArchive.java
@@ -24,18 +24,11 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(sequenceName = "THING_PAGE_ARCHIVE_PKSEQ")
-@RooJson
+
 public class ThingPageArchive {
 
     @Size(max = 255)
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingType.java b/src/main/java/com/labsynch/labseer/domain/ThingType.java
index 0e7a407b4..1c0f77884 100755
--- a/src/main/java/com/labsynch/labseer/domain/ThingType.java
+++ b/src/main/java/com/labsynch/labseer/domain/ThingType.java
@@ -22,18 +22,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(sequenceName = "THING_TYPE_PKSEQ", finders = { "findThingTypesByTypeNameEquals" })
+
 public class ThingType {
 
 	private static final Logger logger = LoggerFactory.getLogger(ThingType.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroup.java b/src/main/java/com/labsynch/labseer/domain/TreatmentGroup.java
index 907121d14..8e231a9d1 100755
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroup.java
+++ b/src/main/java/com/labsynch/labseer/domain/TreatmentGroup.java
@@ -21,10 +21,6 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.dto.FlatThingCsvDTO;
@@ -35,10 +31,7 @@
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findTreatmentGroupsByAnalysisGroups", "findTreatmentGroupsByLsTransactionEquals", "findTreatmentGroupsByCodeNameEquals" })
+
 public class TreatmentGroup extends AbstractThing {
 
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "treatmentGroup", fetch = FetchType.LAZY)
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel.java b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel.java
index 392fe97ec..d48801b90 100755
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel.java
@@ -15,10 +15,6 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import flexjson.JSONDeserializer;
@@ -26,11 +22,8 @@
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
+
 @Transactional
-@RooJpaActiveRecord(finders = { "findTreatmentGroupLabelsByTreatmentGroup", "findTreatmentGroupLabelsByLsTransactionEquals" })
 public class TreatmentGroupLabel extends AbstractLabel {
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState.java b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState.java
index f8c1db036..0ae9c5adc 100755
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState.java
+++ b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState.java
@@ -22,10 +22,6 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.dto.FlatThingCsvDTO;
@@ -37,10 +33,7 @@
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findTreatmentGroupStatesByLsTypeAndKindEquals", "findTreatmentGroupStatesByTreatmentGroup", "findTreatmentGroupStatesByLsTransactionEquals" })
+
 public class TreatmentGroupState extends AbstractState {
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue.java b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue.java
index 3235b62fc..8c1c6b665 100755
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue.java
@@ -19,10 +19,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 import org.supercsv.cellprocessor.Optional;
 import org.supercsv.cellprocessor.ift.CellProcessor;
@@ -37,11 +33,6 @@
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findTreatmentGroupValuesByLsState", "findTreatmentGroupValuesByLsTransactionEquals",
-		"findTreatmentGroupValuesByCodeValueEquals", "findTreatmentGroupValuesByIgnoredNotAndCodeValueEquals"})
 public class TreatmentGroupValue extends AbstractValue {
 
 	private static final Logger logger = LoggerFactory.getLogger(TreatmentGroupValue.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/UncertaintyKind.java b/src/main/java/com/labsynch/labseer/domain/UncertaintyKind.java
index 2daa60183..e204a84f6 100755
--- a/src/main/java/com/labsynch/labseer/domain/UncertaintyKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/UncertaintyKind.java
@@ -19,18 +19,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(sequenceName = "UNCERTAINTY_KIND_PKSEQ")
-@RooJson
+
 public class UncertaintyKind {
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/Unit.java b/src/main/java/com/labsynch/labseer/domain/Unit.java
index 1750ca019..da279e754 100755
--- a/src/main/java/com/labsynch/labseer/domain/Unit.java
+++ b/src/main/java/com/labsynch/labseer/domain/Unit.java
@@ -17,18 +17,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findUnitsByCodeLike", "findUnitsByCodeEquals", "findUnitsByNameEquals" })
+
 public class Unit {
 
     @Size(max = 255)
diff --git a/src/main/java/com/labsynch/labseer/domain/UnitKind.java b/src/main/java/com/labsynch/labseer/domain/UnitKind.java
index adc3b5e2c..c7f6baef8 100755
--- a/src/main/java/com/labsynch/labseer/domain/UnitKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/UnitKind.java
@@ -22,18 +22,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(sequenceName = "UNITS_KIND_PKSEQ", finders={"findUnitKindsByKindNameEqualsAndLsType"})
-@RooJson
+
 public class UnitKind {
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/UnitType.java b/src/main/java/com/labsynch/labseer/domain/UnitType.java
index de569540e..0680bdf61 100755
--- a/src/main/java/com/labsynch/labseer/domain/UnitType.java
+++ b/src/main/java/com/labsynch/labseer/domain/UnitType.java
@@ -19,18 +19,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(sequenceName = "UNITS_TYPE_PKSEQ", finders = { "findUnitTypesByTypeNameEquals" })
-@RooJson
+
 public class UnitType {
 
     @NotNull
diff --git a/src/main/java/com/labsynch/labseer/domain/UpdateLog.java b/src/main/java/com/labsynch/labseer/domain/UpdateLog.java
index 98102be78..df9e75490 100755
--- a/src/main/java/com/labsynch/labseer/domain/UpdateLog.java
+++ b/src/main/java/com/labsynch/labseer/domain/UpdateLog.java
@@ -19,16 +19,11 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(sequenceName = "UPDATE_LOG_PKSEQ")
+
 public class UpdateLog {
 
     private Long thing;
diff --git a/src/main/java/com/labsynch/labseer/domain/ValueKind.java b/src/main/java/com/labsynch/labseer/domain/ValueKind.java
index ef2d74c32..5d3bd38dd 100755
--- a/src/main/java/com/labsynch/labseer/domain/ValueKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ValueKind.java
@@ -24,18 +24,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(sequenceName = "VALUE_KIND_PKSEQ", finders = { "findValueKindsByLsType", "findValueKindsByKindNameEqualsAndLsType" })
+
 public class ValueKind {
 
     private static final Logger logger = LoggerFactory.getLogger(ValueKind.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/ValueType.java b/src/main/java/com/labsynch/labseer/domain/ValueType.java
index 15b7be965..9fb8133b9 100755
--- a/src/main/java/com/labsynch/labseer/domain/ValueType.java
+++ b/src/main/java/com/labsynch/labseer/domain/ValueType.java
@@ -22,18 +22,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Configurable
 @Entity
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord(sequenceName = "VALUE_TYPE_PKSEQ", finders = { "findValueTypesByTypeNameEquals" })
-@RooJson
+
 public class ValueType {
 
     private static final Logger logger = LoggerFactory.getLogger(ValueType.class);
diff --git a/src/main/java/com/labsynch/labseer/domain/Vendor.java b/src/main/java/com/labsynch/labseer/domain/Vendor.java
index 71920e95e..16fbc02dc 100755
--- a/src/main/java/com/labsynch/labseer/domain/Vendor.java
+++ b/src/main/java/com/labsynch/labseer/domain/Vendor.java
@@ -17,18 +17,11 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
-@RooJpaActiveRecord(finders = { "findVendorsByCodeLike", "findVendorsByCodeEquals", "findVendorsByNameEquals", "findVendorsByNameLike" })
+
 public class Vendor {
 
     @Size(max = 255)
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCodeDTO.java
index 7c3e2c254..dafa6e56c 100644
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCodeDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class AnalysisGroupCodeDTO {
 	
 	private String analysisGroupCode;
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCsvDTO.java b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCsvDTO.java
index 81e0f5212..73d5336de 100644
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCsvDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCsvDTO.java
@@ -13,15 +13,10 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.supercsv.cellprocessor.Optional;
 import org.supercsv.cellprocessor.ift.CellProcessor;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class AnalysisGroupCsvDTO {
 
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupStatePathDTO.java b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupStatePathDTO.java
index 19ee88290..ad2f1f2e6 100644
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupStatePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupStatePathDTO.java
@@ -4,18 +4,13 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.AnalysisGroupState;
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class AnalysisGroupStatePathDTO {
 
 	public AnalysisGroupStatePathDTO() {
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueBaseDTO.java b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueBaseDTO.java
index 0155653a8..e5ace62f0 100755
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueBaseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueBaseDTO.java
@@ -10,13 +10,8 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class AnalysisGroupValueBaseDTO {
 
 	private static final Logger logger = LoggerFactory.getLogger(AnalysisGroupValueBaseDTO.class);
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueDTO.java b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueDTO.java
index 6745b2522..ff90d7c6e 100755
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueDTO.java
@@ -10,9 +10,6 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.supercsv.cellprocessor.Optional;
 import org.supercsv.cellprocessor.ift.CellProcessor;
 
@@ -21,9 +18,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class AnalysisGroupValueDTO {
 
 	private static final Logger logger = LoggerFactory.getLogger(AnalysisGroupValueDTO.class);
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValuePathDTO.java
index 2cde5a211..9acae4874 100644
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValuePathDTO.java
@@ -4,18 +4,13 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.AnalysisGroupValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class AnalysisGroupValuePathDTO {
 
 	public AnalysisGroupValuePathDTO() {
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthGroupsAndProjectsDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthGroupsAndProjectsDTO.java
index 4a4a6968a..c4be85b28 100644
--- a/src/main/java/com/labsynch/labseer/dto/AuthGroupsAndProjectsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthGroupsAndProjectsDTO.java
@@ -5,18 +5,13 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
 
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class AuthGroupsAndProjectsDTO {
 	
 
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthGroupsDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthGroupsDTO.java
index b99e2d14c..21c20e15e 100644
--- a/src/main/java/com/labsynch/labseer/dto/AuthGroupsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthGroupsDTO.java
@@ -7,13 +7,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class AuthGroupsDTO {
 	
 	private String name;
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthProjectDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthProjectDTO.java
index c1422b2c5..7bb0bad94 100755
--- a/src/main/java/com/labsynch/labseer/dto/AuthProjectDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthProjectDTO.java
@@ -5,16 +5,11 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class AuthProjectDTO {
 	
 	private Collection<String> projects;
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthProjectGroupsDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthProjectGroupsDTO.java
index 11666afbf..0aff5f202 100644
--- a/src/main/java/com/labsynch/labseer/dto/AuthProjectGroupsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthProjectGroupsDTO.java
@@ -5,16 +5,11 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class AuthProjectGroupsDTO {
 	
 
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthUserDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthUserDTO.java
index 4ffc257e8..9781e72f6 100755
--- a/src/main/java/com/labsynch/labseer/dto/AuthUserDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthUserDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class AuthUserDTO {
 	
 	private String name;
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorBrowserQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthorBrowserQueryDTO.java
index 6f7f4fb60..a941913e5 100644
--- a/src/main/java/com/labsynch/labseer/dto/AuthorBrowserQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthorBrowserQueryDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class AuthorBrowserQueryDTO {
 	
 	private String queryString;
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorNameDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthorNameDTO.java
index 7d82b41dd..c32d20a71 100755
--- a/src/main/java/com/labsynch/labseer/dto/AuthorNameDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthorNameDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class AuthorNameDTO {
 	
 	private String name;
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthorQueryDTO.java
index efea06df3..1bbdff53b 100644
--- a/src/main/java/com/labsynch/labseer/dto/AuthorQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthorQueryDTO.java
@@ -7,13 +7,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class AuthorQueryDTO {
 
 	Date recordedDateGreaterThan;
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorQueryResultDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthorQueryResultDTO.java
index f64a470f8..25031479b 100644
--- a/src/main/java/com/labsynch/labseer/dto/AuthorQueryResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthorQueryResultDTO.java
@@ -4,9 +4,6 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.domain.Author;
@@ -14,9 +11,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class AuthorQueryResultDTO {
 
 	Integer maxResults;
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorRoleDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthorRoleDTO.java
index 4a584ce6f..4c9935f84 100644
--- a/src/main/java/com/labsynch/labseer/dto/AuthorRoleDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthorRoleDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class AuthorRoleDTO {
 	
 	private String roleType;
diff --git a/src/main/java/com/labsynch/labseer/dto/AutoLabelDTO.java b/src/main/java/com/labsynch/labseer/dto/AutoLabelDTO.java
index 121fbb46b..a78f24596 100755
--- a/src/main/java/com/labsynch/labseer/dto/AutoLabelDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AutoLabelDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class AutoLabelDTO {
 	
     private String autoLabel;
diff --git a/src/main/java/com/labsynch/labseer/dto/BatchCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/BatchCodeDTO.java
index d3c5db8bf..6951a572c 100755
--- a/src/main/java/com/labsynch/labseer/dto/BatchCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BatchCodeDTO.java
@@ -6,15 +6,10 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.supercsv.cellprocessor.Optional;
 import org.supercsv.cellprocessor.ift.CellProcessor;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class BatchCodeDTO {
 	
 	private String batchCode;
diff --git a/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO.java b/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO.java
index 81cda3cd0..591a04707 100644
--- a/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO.java
@@ -16,9 +16,6 @@
 import org.slf4j.LoggerFactory;
 import javax.persistence.NoResultException;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.domain.BulkLoadTemplate;
@@ -31,9 +28,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class BatchCodeDependencyDTO {
 	
 	private static final Logger logger = LoggerFactory.getLogger(BatchCodeDependencyDTO.class);
diff --git a/src/main/java/com/labsynch/labseer/dto/BatchProjectDTO.java b/src/main/java/com/labsynch/labseer/dto/BatchProjectDTO.java
index 80a037acc..f6cd276fc 100644
--- a/src/main/java/com/labsynch/labseer/dto/BatchProjectDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BatchProjectDTO.java
@@ -10,18 +10,13 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.Lot;
 import com.labsynch.labseer.utils.SimpleUtil;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class BatchProjectDTO {
 	
 	private static final Logger logger = LoggerFactory.getLogger(BatchProjectDTO.class);
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO.java
index 9f65c92f0..43a087a1d 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO.java
@@ -16,9 +16,6 @@
 import org.slf4j.LoggerFactory;
 import javax.persistence.NoResultException;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.domain.BulkLoadTemplate;
@@ -33,9 +30,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class BulkLoadPropertiesDTO {
 	
 	private static final Logger logger = LoggerFactory.getLogger(BulkLoadPropertiesDTO.class);
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertyMappingDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertyMappingDTO.java
index fe3512a5b..442826998 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertyMappingDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertyMappingDTO.java
@@ -7,17 +7,12 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class BulkLoadPropertyMappingDTO {
 	
     private static final Logger logger = LoggerFactory.getLogger(BulkLoadPropertyMappingDTO.class);
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFRequestDTO.java
index 9ed027542..c7976e98c 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFRequestDTO.java
@@ -5,17 +5,12 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class BulkLoadRegisterSDFRequestDTO {
 
     private String filePath;
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFResponseDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFResponseDTO.java
index b29b87a23..2e122de1c 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFResponseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFResponseDTO.java
@@ -6,17 +6,12 @@
 import com.labsynch.labseer.dto.ValidationResponseDTO;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class BulkLoadRegisterSDFResponseDTO {
 
     private String summary;
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFPropertyRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFPropertyRequestDTO.java
index defcd5033..45d71bc4a 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFPropertyRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFPropertyRequestDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class BulkLoadSDFPropertyRequestDTO {
 
     private String fileName;
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO.java
index fad487191..28dadf081 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO.java
@@ -16,9 +16,6 @@
 import org.slf4j.LoggerFactory;
 import javax.persistence.NoResultException;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.domain.BulkLoadTemplate;
@@ -31,9 +28,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class BulkLoadSDFValidationPropertiesResponseDTO {
 		
     private Collection<String> chemists;
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO.java
index 35d00e731..b302adc08 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO.java
@@ -16,9 +16,6 @@
 import org.slf4j.LoggerFactory;
 import javax.persistence.NoResultException;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.domain.BulkLoadTemplate;
@@ -31,9 +28,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class BulkLoadTemplateDTO {
     
     private String templateName;
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkTransferPart1DTO.java b/src/main/java/com/labsynch/labseer/dto/BulkTransferPart1DTO.java
index b0b216aa9..6b1a55d48 100755
--- a/src/main/java/com/labsynch/labseer/dto/BulkTransferPart1DTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkTransferPart1DTO.java
@@ -7,13 +7,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class BulkTransferPart1DTO {
 	
     private String sourceBarcode;
diff --git a/src/main/java/com/labsynch/labseer/dto/ChangePasswordDTO.java b/src/main/java/com/labsynch/labseer/dto/ChangePasswordDTO.java
index af258f963..6439ad188 100644
--- a/src/main/java/com/labsynch/labseer/dto/ChangePasswordDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ChangePasswordDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ChangePasswordDTO {
 	
 	private String username;
diff --git a/src/main/java/com/labsynch/labseer/dto/CleanMolOptionsDTO.java b/src/main/java/com/labsynch/labseer/dto/CleanMolOptionsDTO.java
index 2a654a825..a3449bb28 100644
--- a/src/main/java/com/labsynch/labseer/dto/CleanMolOptionsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CleanMolOptionsDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class CleanMolOptionsDTO {
 	
 	private int dim;
diff --git a/src/main/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTO.java
index 51ec84d9c..fcf7941e0 100644
--- a/src/main/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTO.java
@@ -12,9 +12,6 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.domain.AnalysisGroupValue;
@@ -24,9 +21,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class CmpdRegBatchCodeDTO {
 	
 	public CmpdRegBatchCodeDTO() {
diff --git a/src/main/java/com/labsynch/labseer/dto/CmpdRegStructureSearchDTO.java b/src/main/java/com/labsynch/labseer/dto/CmpdRegStructureSearchDTO.java
index 71a592dbf..e5c031018 100755
--- a/src/main/java/com/labsynch/labseer/dto/CmpdRegStructureSearchDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CmpdRegStructureSearchDTO.java
@@ -6,14 +6,9 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class CmpdRegStructureSearchDTO{
 	
 	private List<String> projects;
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeLabelDTO.java b/src/main/java/com/labsynch/labseer/dto/CodeLabelDTO.java
index 464f53b29..1804fee57 100644
--- a/src/main/java/com/labsynch/labseer/dto/CodeLabelDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CodeLabelDTO.java
@@ -4,17 +4,12 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class CodeLabelDTO {
 	
 	private List<String> foundCodeNames;
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeNameQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/CodeNameQueryDTO.java
index 87c2d471d..b9aa379bf 100644
--- a/src/main/java/com/labsynch/labseer/dto/CodeNameQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CodeNameQueryDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class CodeNameQueryDTO {
 
 	String codeName;
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeNameValueDTO.java b/src/main/java/com/labsynch/labseer/dto/CodeNameValueDTO.java
index ae40ed2bb..1f12dbdc1 100644
--- a/src/main/java/com/labsynch/labseer/dto/CodeNameValueDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CodeNameValueDTO.java
@@ -4,18 +4,13 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.AbstractValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class CodeNameValueDTO {
 		
 	private String codeName;
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeTableDTO.java b/src/main/java/com/labsynch/labseer/dto/CodeTableDTO.java
index eaffb55ad..b84c16c63 100755
--- a/src/main/java/com/labsynch/labseer/dto/CodeTableDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CodeTableDTO.java
@@ -6,9 +6,6 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.DDictValue;
 import com.labsynch.labseer.domain.Experiment;
@@ -17,9 +14,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class CodeTableDTO {
 
 	public CodeTableDTO() {
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeTypeKindDTO.java b/src/main/java/com/labsynch/labseer/dto/CodeTypeKindDTO.java
index 2b7dd2a4b..052db5359 100644
--- a/src/main/java/com/labsynch/labseer/dto/CodeTypeKindDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CodeTypeKindDTO.java
@@ -4,17 +4,12 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class CodeTypeKindDTO {
 		
 	private String codeName;
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerBatchCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerBatchCodeDTO.java
index 2fd2507f0..eb7c57683 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerBatchCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerBatchCodeDTO.java
@@ -5,17 +5,12 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ContainerBatchCodeDTO {
 	
 	private String batchCode;
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerBrowserQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerBrowserQueryDTO.java
index 6a0793034..a67fd6c0c 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerBrowserQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerBrowserQueryDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ContainerBrowserQueryDTO {
 	
 	private String queryString;
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerCodeNameStateDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerCodeNameStateDTO.java
index 05d2bb4f7..92c49a9cc 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerCodeNameStateDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerCodeNameStateDTO.java
@@ -4,18 +4,13 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.ContainerState;
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ContainerCodeNameStateDTO {
 	
 	 public ContainerCodeNameStateDTO() {
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerDependencyCheckDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerDependencyCheckDTO.java
index e0a4b7a2b..23764ef5a 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerDependencyCheckDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerDependencyCheckDTO.java
@@ -13,9 +13,6 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.domain.AnalysisGroupValue;
@@ -29,9 +26,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ContainerDependencyCheckDTO {
 	
 	public ContainerDependencyCheckDTO() {
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerErrorMessageDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerErrorMessageDTO.java
index a08b4530c..1888fa158 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerErrorMessageDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerErrorMessageDTO.java
@@ -4,18 +4,13 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.Container;
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ContainerErrorMessageDTO {
 
 	String containerCodeName;
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerLocationDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerLocationDTO.java
index b66d1e280..e0e8d764a 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerLocationDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerLocationDTO.java
@@ -5,17 +5,12 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ContainerLocationDTO {
 	
 	private String locationCodeName;
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerLocationTreeDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerLocationTreeDTO.java
index a29d4bb42..1d13bdf12 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerLocationTreeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerLocationTreeDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ContainerLocationTreeDTO {
 	
 	private String codeName;
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerMiniDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerMiniDTO.java
index 0307c7a34..10c776bee 100755
--- a/src/main/java/com/labsynch/labseer/dto/ContainerMiniDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerMiniDTO.java
@@ -2,9 +2,6 @@
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.Container;
 import flexjson.JSONDeserializer;
@@ -12,9 +9,7 @@
 import java.util.Collection;
 import java.util.List;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ContainerMiniDTO {
 	
     public ContainerMiniDTO(Container container) {
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerQueryDTO.java
index 9c984a47c..c4809a35a 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerQueryDTO.java
@@ -7,13 +7,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ContainerQueryDTO {
 
 	Date recordedDateGreaterThan;
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerQueryResultDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerQueryResultDTO.java
index f410eee53..52f399586 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerQueryResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerQueryResultDTO.java
@@ -4,9 +4,6 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.domain.Container;
@@ -14,9 +11,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ContainerQueryResultDTO {
 
 	Integer maxResults;
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerRequestDTO.java
index 3ef721a09..7797b79f4 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerRequestDTO.java
@@ -8,13 +8,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ContainerRequestDTO {
 	
 	private String containerCodeName;
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerSearchRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerSearchRequestDTO.java
index 1137cb953..f8c43d9aa 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerSearchRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerSearchRequestDTO.java
@@ -2,17 +2,12 @@
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ContainerSearchRequestDTO {
 
 	private String barcode;
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerStateMiniDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerStateMiniDTO.java
index 2c67381a2..94ecb038f 100755
--- a/src/main/java/com/labsynch/labseer/dto/ContainerStateMiniDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerStateMiniDTO.java
@@ -2,9 +2,6 @@
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.ContainerState;
 import flexjson.JSONDeserializer;
@@ -12,9 +9,7 @@
 import java.util.Collection;
 import java.util.List;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ContainerStateMiniDTO {
 	
     public ContainerStateMiniDTO(ContainerState state) {
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerStatePathDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerStatePathDTO.java
index b5bd9a45a..207f50d2a 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerStatePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerStatePathDTO.java
@@ -4,18 +4,13 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.ContainerState;
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ContainerStatePathDTO {
 
 	public ContainerStatePathDTO() {
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerSubjectsDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerSubjectsDTO.java
index 5fce9a3ca..941ad56e0 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerSubjectsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerSubjectsDTO.java
@@ -5,18 +5,13 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.Subject;
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ContainerSubjectsDTO {
 	
 	private String containerIdOrCodeName;
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerValuePathDTO.java
index 9910c76c3..1161a10f9 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerValuePathDTO.java
@@ -4,18 +4,13 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.ContainerValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ContainerValuePathDTO {
 
 	public ContainerValuePathDTO() {
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerValueRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerValueRequestDTO.java
index 818962e59..7b73404c4 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerValueRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerValueRequestDTO.java
@@ -2,9 +2,6 @@
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.Container;
 import flexjson.JSONDeserializer;
@@ -12,9 +9,7 @@
 import java.util.Collection;
 import java.util.List;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ContainerValueRequestDTO {
 
 	private String containerType;
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerWellCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerWellCodeDTO.java
index 72a59702e..7e0f070cc 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerWellCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerWellCodeDTO.java
@@ -4,17 +4,12 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ContainerWellCodeDTO {
 	
 	private String requestCodeName;
diff --git a/src/main/java/com/labsynch/labseer/dto/CorpNameDTO.java b/src/main/java/com/labsynch/labseer/dto/CorpNameDTO.java
index 7cad6b917..d7c803128 100644
--- a/src/main/java/com/labsynch/labseer/dto/CorpNameDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CorpNameDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class CorpNameDTO{
 
 	private int corpNumber;
diff --git a/src/main/java/com/labsynch/labseer/dto/CreatePlateRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/CreatePlateRequestDTO.java
index 92d9c763e..76ccf8438 100644
--- a/src/main/java/com/labsynch/labseer/dto/CreatePlateRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CreatePlateRequestDTO.java
@@ -6,15 +6,10 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class CreatePlateRequestDTO {
 
 	private String barcode;
diff --git a/src/main/java/com/labsynch/labseer/dto/CurveFitDTO.java b/src/main/java/com/labsynch/labseer/dto/CurveFitDTO.java
index ff76f8231..a320975c4 100644
--- a/src/main/java/com/labsynch/labseer/dto/CurveFitDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CurveFitDTO.java
@@ -19,9 +19,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import javax.persistence.NoResultException;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 import org.supercsv.cellprocessor.Optional;
 import org.supercsv.cellprocessor.ift.CellProcessor;
@@ -41,9 +38,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class CurveFitDTO {
 	
 	private static final Logger logger = LoggerFactory.getLogger(CurveFitDTO.class);
diff --git a/src/main/java/com/labsynch/labseer/dto/DateValueComparisonRequest.java b/src/main/java/com/labsynch/labseer/dto/DateValueComparisonRequest.java
index 702be500b..63e2749cd 100644
--- a/src/main/java/com/labsynch/labseer/dto/DateValueComparisonRequest.java
+++ b/src/main/java/com/labsynch/labseer/dto/DateValueComparisonRequest.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class DateValueComparisonRequest {
 	
 	private String lsType;
diff --git a/src/main/java/com/labsynch/labseer/dto/DependencyCheckDTO.java b/src/main/java/com/labsynch/labseer/dto/DependencyCheckDTO.java
index bdcac60fe..0f0b0f4f1 100644
--- a/src/main/java/com/labsynch/labseer/dto/DependencyCheckDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/DependencyCheckDTO.java
@@ -12,9 +12,6 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.domain.AnalysisGroupValue;
@@ -25,9 +22,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class DependencyCheckDTO {
 	
 	public DependencyCheckDTO() {
diff --git a/src/main/java/com/labsynch/labseer/dto/DoseReponseParamsDTO.java b/src/main/java/com/labsynch/labseer/dto/DoseReponseParamsDTO.java
index badd96e66..a08d51d63 100755
--- a/src/main/java/com/labsynch/labseer/dto/DoseReponseParamsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/DoseReponseParamsDTO.java
@@ -9,13 +9,8 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class DoseReponseParamsDTO {
 
 	private static final Logger logger = LoggerFactory.getLogger(DoseReponseParamsDTO.class);
diff --git a/src/main/java/com/labsynch/labseer/dto/EntrezDbDTO.java b/src/main/java/com/labsynch/labseer/dto/EntrezDbDTO.java
index 5755b7efb..02693fd04 100644
--- a/src/main/java/com/labsynch/labseer/dto/EntrezDbDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/EntrezDbDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class EntrezDbDTO {
 	
     private String taxonomyId;
diff --git a/src/main/java/com/labsynch/labseer/dto/EntrezDbGeneDTO.java b/src/main/java/com/labsynch/labseer/dto/EntrezDbGeneDTO.java
index 125b59e3a..6fd522947 100755
--- a/src/main/java/com/labsynch/labseer/dto/EntrezDbGeneDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/EntrezDbGeneDTO.java
@@ -7,13 +7,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class EntrezDbGeneDTO {
 	
     private String taxId;
diff --git a/src/main/java/com/labsynch/labseer/dto/EntrezDiscontinuedGeneDTO.java b/src/main/java/com/labsynch/labseer/dto/EntrezDiscontinuedGeneDTO.java
index 4a203e062..80ab9645a 100644
--- a/src/main/java/com/labsynch/labseer/dto/EntrezDiscontinuedGeneDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/EntrezDiscontinuedGeneDTO.java
@@ -7,13 +7,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class EntrezDiscontinuedGeneDTO {
 	
 	//tax_id  GeneID  Discontinued_GeneID     Discontinued_Symbol     Discontinue_Date
diff --git a/src/main/java/com/labsynch/labseer/dto/ErrorMessageDTO.java b/src/main/java/com/labsynch/labseer/dto/ErrorMessageDTO.java
index f5347b409..35cc2733f 100755
--- a/src/main/java/com/labsynch/labseer/dto/ErrorMessageDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ErrorMessageDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ErrorMessageDTO {
 
 	String level;
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentCodeDTO.java
index 1e40d564c..7059e12fb 100644
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentCodeDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ExperimentCodeDTO {
 	
 	private String experimentCode;
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentCsvDataDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentCsvDataDTO.java
index 7b7ab58cd..3add61cb1 100644
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentCsvDataDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentCsvDataDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ExperimentCsvDataDTO {
 	
 	private String experimentCsvFilePath;
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentDataDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentDataDTO.java
index f8336ef72..36cd4692c 100644
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentDataDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentDataDTO.java
@@ -8,9 +8,6 @@
 import java.util.Set;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.LsTag;
 import com.labsynch.labseer.utils.CustomBigDecimalFactory;
@@ -20,9 +17,7 @@
 import flexjson.JSONSerializer;
 
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ExperimentDataDTO {
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentErrorMessageDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentErrorMessageDTO.java
index 5cf3d9480..86ded2184 100644
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentErrorMessageDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentErrorMessageDTO.java
@@ -4,9 +4,6 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.domain.Experiment;
@@ -14,9 +11,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ExperimentErrorMessageDTO {
 
 	String experimentCodeName;
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentFilterDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentFilterDTO.java
index 827566a12..8b68f2ba8 100755
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentFilterDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentFilterDTO.java
@@ -6,16 +6,11 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ExperimentFilterDTO {
 	
 	private Long experimentId;
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentFilterSearchDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentFilterSearchDTO.java
index f9d6ee0f8..38aaa0880 100755
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentFilterSearchDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentFilterSearchDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ExperimentFilterSearchDTO {
 	
 	private String queryId;
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentGuiStubDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentGuiStubDTO.java
index 2818206c4..9b195e794 100755
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentGuiStubDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentGuiStubDTO.java
@@ -8,9 +8,6 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.Experiment;
 import com.labsynch.labseer.domain.ExperimentState;
@@ -19,9 +16,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ExperimentGuiStubDTO {
 	
 	private static final Logger logger = LoggerFactory.getLogger(ExperimentGuiStubDTO.class);
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentSearchRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentSearchRequestDTO.java
index 6f7b1fd7c..5bad89b81 100755
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentSearchRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentSearchRequestDTO.java
@@ -7,9 +7,6 @@
 import java.util.Set;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
@@ -21,9 +18,7 @@
 *
 */
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ExperimentSearchRequestDTO {
 
 	/**
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentStatePathDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentStatePathDTO.java
index a67e6d4e4..152638a55 100644
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentStatePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentStatePathDTO.java
@@ -4,18 +4,13 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.ExperimentState;
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ExperimentStatePathDTO {
 
 	public ExperimentStatePathDTO() {
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentValuePathDTO.java
index de6917285..1d18c35f3 100644
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentValuePathDTO.java
@@ -4,18 +4,13 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.ExperimentValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ExperimentValuePathDTO {
 
 	public ExperimentValuePathDTO() {
diff --git a/src/main/java/com/labsynch/labseer/dto/ExportResultDTO.java b/src/main/java/com/labsynch/labseer/dto/ExportResultDTO.java
index c7c576bb2..0c2ed5e71 100644
--- a/src/main/java/com/labsynch/labseer/dto/ExportResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExportResultDTO.java
@@ -2,9 +2,6 @@
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
@@ -12,9 +9,7 @@
 import java.util.Collection;
 import java.util.List;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ExportResultDTO {
 
     private String summary;
diff --git a/src/main/java/com/labsynch/labseer/dto/FileSaveReturnArrayDTO.java b/src/main/java/com/labsynch/labseer/dto/FileSaveReturnArrayDTO.java
index 7ec62ea6e..c4cdac535 100755
--- a/src/main/java/com/labsynch/labseer/dto/FileSaveReturnArrayDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/FileSaveReturnArrayDTO.java
@@ -5,16 +5,11 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class FileSaveReturnArrayDTO{
 			 
 	private List<FileSaveReturnDTO> returnFileList = new ArrayList<FileSaveReturnDTO>();
diff --git a/src/main/java/com/labsynch/labseer/dto/FileSaveReturnDTO.java b/src/main/java/com/labsynch/labseer/dto/FileSaveReturnDTO.java
index 32a05d95f..51067da6c 100755
--- a/src/main/java/com/labsynch/labseer/dto/FileSaveReturnDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/FileSaveReturnDTO.java
@@ -14,17 +14,12 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.web.multipart.MultipartFile;
 
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class FileSaveReturnDTO{
 			 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/FileSaveSendDTO.java b/src/main/java/com/labsynch/labseer/dto/FileSaveSendDTO.java
index ca5b0ca97..bc51ba6a5 100755
--- a/src/main/java/com/labsynch/labseer/dto/FileSaveSendDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/FileSaveSendDTO.java
@@ -15,9 +15,6 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.labsynch.labseer.utils.PropertiesUtilService;
@@ -29,9 +26,7 @@
 import com.labsynch.labseer.utils.MimeTypeUtil;
 
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class FileSaveSendDTO{
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/FlagWellDTO.java b/src/main/java/com/labsynch/labseer/dto/FlagWellDTO.java
index 53cb7766a..0e346dafc 100644
--- a/src/main/java/com/labsynch/labseer/dto/FlagWellDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/FlagWellDTO.java
@@ -16,9 +16,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import javax.persistence.NoResultException;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 import org.supercsv.cellprocessor.Optional;
 import org.supercsv.cellprocessor.ift.CellProcessor;
@@ -33,9 +30,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class FlagWellDTO {
 	
 	private static final Logger logger = LoggerFactory.getLogger(FlagWellDTO.class);
diff --git a/src/main/java/com/labsynch/labseer/dto/FlatThingCsvDTO.java b/src/main/java/com/labsynch/labseer/dto/FlatThingCsvDTO.java
index 2f4f9c1ef..4b4e614a3 100644
--- a/src/main/java/com/labsynch/labseer/dto/FlatThingCsvDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/FlatThingCsvDTO.java
@@ -13,15 +13,10 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.supercsv.cellprocessor.Optional;
 import org.supercsv.cellprocessor.ift.CellProcessor;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class FlatThingCsvDTO {
 
 	private static final Logger logger = LoggerFactory.getLogger(FlatThingCsvDTO.class);
diff --git a/src/main/java/com/labsynch/labseer/dto/GeneIdDTO.java b/src/main/java/com/labsynch/labseer/dto/GeneIdDTO.java
index cce7f49e5..727ff9cc6 100755
--- a/src/main/java/com/labsynch/labseer/dto/GeneIdDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/GeneIdDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class GeneIdDTO {
 	
 	private String gid;
diff --git a/src/main/java/com/labsynch/labseer/dto/GeneOrthologDTO.java b/src/main/java/com/labsynch/labseer/dto/GeneOrthologDTO.java
index abc16f511..7624554a5 100644
--- a/src/main/java/com/labsynch/labseer/dto/GeneOrthologDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/GeneOrthologDTO.java
@@ -7,15 +7,10 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class GeneOrthologDTO {
 	
 	private Long id;
diff --git a/src/main/java/com/labsynch/labseer/dto/GeneOrthologFileDTO.java b/src/main/java/com/labsynch/labseer/dto/GeneOrthologFileDTO.java
index ccb88c9d0..0fdb52999 100644
--- a/src/main/java/com/labsynch/labseer/dto/GeneOrthologFileDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/GeneOrthologFileDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class GeneOrthologFileDTO {
 	
 	private String versionName;
diff --git a/src/main/java/com/labsynch/labseer/dto/GenericQueryCodeTableResultDTO.java b/src/main/java/com/labsynch/labseer/dto/GenericQueryCodeTableResultDTO.java
index f1c8a5551..9ab427df2 100644
--- a/src/main/java/com/labsynch/labseer/dto/GenericQueryCodeTableResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/GenericQueryCodeTableResultDTO.java
@@ -4,9 +4,6 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.domain.LsThing;
@@ -14,9 +11,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class GenericQueryCodeTableResultDTO {
 
 	Integer maxResults;
diff --git a/src/main/java/com/labsynch/labseer/dto/GenericStatePathRequest.java b/src/main/java/com/labsynch/labseer/dto/GenericStatePathRequest.java
index 4ae491bda..d7056191c 100644
--- a/src/main/java/com/labsynch/labseer/dto/GenericStatePathRequest.java
+++ b/src/main/java/com/labsynch/labseer/dto/GenericStatePathRequest.java
@@ -4,17 +4,12 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class GenericStatePathRequest {
 
 	public GenericStatePathRequest() {
diff --git a/src/main/java/com/labsynch/labseer/dto/GenericValuePathRequest.java b/src/main/java/com/labsynch/labseer/dto/GenericValuePathRequest.java
index 445527914..fb8e264f1 100644
--- a/src/main/java/com/labsynch/labseer/dto/GenericValuePathRequest.java
+++ b/src/main/java/com/labsynch/labseer/dto/GenericValuePathRequest.java
@@ -4,17 +4,12 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class GenericValuePathRequest {
 
 	public GenericValuePathRequest() {
diff --git a/src/main/java/com/labsynch/labseer/dto/HydrogenizeMolInputDTO.java b/src/main/java/com/labsynch/labseer/dto/HydrogenizeMolInputDTO.java
index 1cbb358ef..fc1c2fd39 100644
--- a/src/main/java/com/labsynch/labseer/dto/HydrogenizeMolInputDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/HydrogenizeMolInputDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class HydrogenizeMolInputDTO {
 	
 	private String structure;
diff --git a/src/main/java/com/labsynch/labseer/dto/IdCollectionDTO.java b/src/main/java/com/labsynch/labseer/dto/IdCollectionDTO.java
index e096ff56a..6cd176918 100755
--- a/src/main/java/com/labsynch/labseer/dto/IdCollectionDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/IdCollectionDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class IdCollectionDTO {
 	
 	private Long id;
diff --git a/src/main/java/com/labsynch/labseer/dto/IdSetDTO.java b/src/main/java/com/labsynch/labseer/dto/IdSetDTO.java
index 34fb9432b..8f57564e7 100644
--- a/src/main/java/com/labsynch/labseer/dto/IdSetDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/IdSetDTO.java
@@ -9,13 +9,8 @@
 import java.util.Set;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class IdSetDTO {
 	
 	private Set<Long> idSet = new HashSet<Long>();
diff --git a/src/main/java/com/labsynch/labseer/dto/ItxQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/ItxQueryDTO.java
index debb03fe3..7c8bceb55 100644
--- a/src/main/java/com/labsynch/labseer/dto/ItxQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ItxQueryDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ItxQueryDTO {
 
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/JSTreeNodeDTO.java b/src/main/java/com/labsynch/labseer/dto/JSTreeNodeDTO.java
index b08295bcb..39afed746 100755
--- a/src/main/java/com/labsynch/labseer/dto/JSTreeNodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/JSTreeNodeDTO.java
@@ -10,18 +10,13 @@
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.LsTag;
 
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class JSTreeNodeDTO {
 	
 	private String id; // use codeName
diff --git a/src/main/java/com/labsynch/labseer/dto/KeyValueDTO.java b/src/main/java/com/labsynch/labseer/dto/KeyValueDTO.java
index 9251257e7..83a19ae10 100644
--- a/src/main/java/com/labsynch/labseer/dto/KeyValueDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/KeyValueDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class KeyValueDTO {
 
 	private String key;
diff --git a/src/main/java/com/labsynch/labseer/dto/KiCurveFitDTO.java b/src/main/java/com/labsynch/labseer/dto/KiCurveFitDTO.java
index 920c4dd5a..c61257cb4 100644
--- a/src/main/java/com/labsynch/labseer/dto/KiCurveFitDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/KiCurveFitDTO.java
@@ -18,9 +18,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import javax.persistence.NoResultException;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 import org.supercsv.cellprocessor.Optional;
 import org.supercsv.cellprocessor.ift.CellProcessor;
@@ -37,9 +34,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class KiCurveFitDTO {
 	
 	private static final Logger logger = LoggerFactory.getLogger(KiCurveFitDTO.class);
diff --git a/src/main/java/com/labsynch/labseer/dto/LabelPrefixDTO.java b/src/main/java/com/labsynch/labseer/dto/LabelPrefixDTO.java
index 817dc64fb..8b161144e 100644
--- a/src/main/java/com/labsynch/labseer/dto/LabelPrefixDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LabelPrefixDTO.java
@@ -2,17 +2,12 @@
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class LabelPrefixDTO {
 
 	private Long id;
diff --git a/src/main/java/com/labsynch/labseer/dto/LabelQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/LabelQueryDTO.java
index cbe07c821..518bc3f2a 100644
--- a/src/main/java/com/labsynch/labseer/dto/LabelQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LabelQueryDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class LabelQueryDTO {
 
 	String labelText;
diff --git a/src/main/java/com/labsynch/labseer/dto/LabelSequenceDTO.java b/src/main/java/com/labsynch/labseer/dto/LabelSequenceDTO.java
index a3f2e02dd..f8f877218 100755
--- a/src/main/java/com/labsynch/labseer/dto/LabelSequenceDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LabelSequenceDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class LabelSequenceDTO {
 	
     private Long numberOfLabels;
diff --git a/src/main/java/com/labsynch/labseer/dto/LicenseDTO.java b/src/main/java/com/labsynch/labseer/dto/LicenseDTO.java
index f134c5afe..401a83a1b 100644
--- a/src/main/java/com/labsynch/labseer/dto/LicenseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LicenseDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class LicenseDTO {
 
 	public LicenseDTO() {
diff --git a/src/main/java/com/labsynch/labseer/dto/LotAliasDTO.java b/src/main/java/com/labsynch/labseer/dto/LotAliasDTO.java
index 3a8bc55e7..3a863f944 100644
--- a/src/main/java/com/labsynch/labseer/dto/LotAliasDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LotAliasDTO.java
@@ -6,18 +6,13 @@
 import javax.persistence.NoResultException;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.LotAlias;
 import com.labsynch.labseer.domain.ParentAlias;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class LotAliasDTO {
 
     private String lotCorpName;
diff --git a/src/main/java/com/labsynch/labseer/dto/LotDTO.java b/src/main/java/com/labsynch/labseer/dto/LotDTO.java
index 1149d6c8b..d3637d54a 100755
--- a/src/main/java/com/labsynch/labseer/dto/LotDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LotDTO.java
@@ -14,9 +14,6 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.IsoSalt;
 import com.labsynch.labseer.domain.Lot;
@@ -31,10 +28,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-//@RooEntity
-@RooJson
+
 public class LotDTO {
 	private Long id;
 	private Double absorbance;
diff --git a/src/main/java/com/labsynch/labseer/dto/LotsByProjectDTO.java b/src/main/java/com/labsynch/labseer/dto/LotsByProjectDTO.java
index 2fce8f7bd..0ad12fc96 100755
--- a/src/main/java/com/labsynch/labseer/dto/LotsByProjectDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LotsByProjectDTO.java
@@ -5,13 +5,8 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 
-@RooJavaBean
-@RooJson
 public class LotsByProjectDTO {
 	private Long id;
 	private String lotCorpName;
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingBrowserQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/LsThingBrowserQueryDTO.java
index 7289b572e..9819f6fb4 100644
--- a/src/main/java/com/labsynch/labseer/dto/LsThingBrowserQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LsThingBrowserQueryDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class LsThingBrowserQueryDTO {
 	
 	private String queryString;
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/LsThingQueryDTO.java
index 03859c63c..a8a5ea257 100644
--- a/src/main/java/com/labsynch/labseer/dto/LsThingQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LsThingQueryDTO.java
@@ -7,13 +7,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class LsThingQueryDTO {
 
 	Boolean combineTermsWithAnd = false;
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingQueryResultDTO.java b/src/main/java/com/labsynch/labseer/dto/LsThingQueryResultDTO.java
index 503d6ec71..5aa1131de 100644
--- a/src/main/java/com/labsynch/labseer/dto/LsThingQueryResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LsThingQueryResultDTO.java
@@ -4,9 +4,6 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.domain.LsThing;
@@ -14,9 +11,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class LsThingQueryResultDTO {
 
 	Integer maxResults;
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingStatePathDTO.java b/src/main/java/com/labsynch/labseer/dto/LsThingStatePathDTO.java
index add294f39..64e0b8408 100644
--- a/src/main/java/com/labsynch/labseer/dto/LsThingStatePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LsThingStatePathDTO.java
@@ -4,18 +4,13 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.LsThingState;
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class LsThingStatePathDTO {
 
 	public LsThingStatePathDTO() {
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingValidationDTO.java b/src/main/java/com/labsynch/labseer/dto/LsThingValidationDTO.java
index 7d06becc6..3071cdc25 100644
--- a/src/main/java/com/labsynch/labseer/dto/LsThingValidationDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LsThingValidationDTO.java
@@ -5,18 +5,13 @@
 import java.util.Set;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.LsThing;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class LsThingValidationDTO {
 	
     public LsThingValidationDTO() {
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/LsThingValuePathDTO.java
index ccc80dd68..566950df0 100644
--- a/src/main/java/com/labsynch/labseer/dto/LsThingValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LsThingValuePathDTO.java
@@ -4,18 +4,13 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.LsThingValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class LsThingValuePathDTO {
 
 	public LsThingValuePathDTO() {
diff --git a/src/main/java/com/labsynch/labseer/dto/LsTransactionQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/LsTransactionQueryDTO.java
index 91a30f717..1ed489190 100644
--- a/src/main/java/com/labsynch/labseer/dto/LsTransactionQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LsTransactionQueryDTO.java
@@ -5,18 +5,13 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.LsTransaction;
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class LsTransactionQueryDTO {
 	
 	Date recordedDateGreaterThan;
diff --git a/src/main/java/com/labsynch/labseer/dto/Metalot.java b/src/main/java/com/labsynch/labseer/dto/Metalot.java
index 93fe65324..c60c23fbd 100755
--- a/src/main/java/com/labsynch/labseer/dto/Metalot.java
+++ b/src/main/java/com/labsynch/labseer/dto/Metalot.java
@@ -8,9 +8,6 @@
 import java.util.Set;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.FileList;
 import com.labsynch.labseer.domain.IsoSalt;
@@ -20,9 +17,7 @@
 import flexjson.JSONSerializer;
 import flexjson.transformer.DateTransformer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 
 public class Metalot {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/MetalotReturn.java b/src/main/java/com/labsynch/labseer/dto/MetalotReturn.java
index 7c3f3aafb..8c92ecce3 100755
--- a/src/main/java/com/labsynch/labseer/dto/MetalotReturn.java
+++ b/src/main/java/com/labsynch/labseer/dto/MetalotReturn.java
@@ -7,18 +7,13 @@
 import javax.transaction.Transactional;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.service.ErrorMessage;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 import flexjson.transformer.DateTransformer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class MetalotReturn {
 	
 	Metalot metalot;
diff --git a/src/main/java/com/labsynch/labseer/dto/MetalotReturnDTO.java b/src/main/java/com/labsynch/labseer/dto/MetalotReturnDTO.java
index 56985e65a..c6be67fa2 100755
--- a/src/main/java/com/labsynch/labseer/dto/MetalotReturnDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MetalotReturnDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class MetalotReturnDTO{
 
 	private long id;
diff --git a/src/main/java/com/labsynch/labseer/dto/MethodOptionDTO.java b/src/main/java/com/labsynch/labseer/dto/MethodOptionDTO.java
index 01c65cec1..6b61edc54 100644
--- a/src/main/java/com/labsynch/labseer/dto/MethodOptionDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MethodOptionDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class MethodOptionDTO {
 		
 	private String method;
diff --git a/src/main/java/com/labsynch/labseer/dto/MolCleanInputDTO.java b/src/main/java/com/labsynch/labseer/dto/MolCleanInputDTO.java
index ae48f82ef..647c42cdf 100644
--- a/src/main/java/com/labsynch/labseer/dto/MolCleanInputDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MolCleanInputDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class MolCleanInputDTO {
 	
 	private String structure;
diff --git a/src/main/java/com/labsynch/labseer/dto/MolConvertInputDTO.java b/src/main/java/com/labsynch/labseer/dto/MolConvertInputDTO.java
index a77848b35..4e47db566 100644
--- a/src/main/java/com/labsynch/labseer/dto/MolConvertInputDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MolConvertInputDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class MolConvertInputDTO {
 	
 	private String structure;
diff --git a/src/main/java/com/labsynch/labseer/dto/MolConvertOutputDTO.java b/src/main/java/com/labsynch/labseer/dto/MolConvertOutputDTO.java
index fe6c6ec4b..1b4209af3 100644
--- a/src/main/java/com/labsynch/labseer/dto/MolConvertOutputDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MolConvertOutputDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class MolConvertOutputDTO {
 	
 	private String structure;
diff --git a/src/main/java/com/labsynch/labseer/dto/MolInputDTO.java b/src/main/java/com/labsynch/labseer/dto/MolInputDTO.java
index 78d6172eb..fa8a09967 100644
--- a/src/main/java/com/labsynch/labseer/dto/MolInputDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MolInputDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class MolInputDTO {
 	
 	private String structure;
diff --git a/src/main/java/com/labsynch/labseer/dto/MolPropertiesDTO.java b/src/main/java/com/labsynch/labseer/dto/MolPropertiesDTO.java
index fd3a910c5..c03b03fe4 100644
--- a/src/main/java/com/labsynch/labseer/dto/MolPropertiesDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MolPropertiesDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class MolPropertiesDTO {
 	
 	private String molStructure;
diff --git a/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchRequest.java b/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchRequest.java
index 9bd220f9f..eba5983e1 100644
--- a/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchRequest.java
+++ b/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchRequest.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class MultiContainerSubjectSearchRequest {
 	
 	Integer maxResults;
diff --git a/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchResultDTO.java b/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchResultDTO.java
index 379c0e640..f513a028b 100644
--- a/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchResultDTO.java
@@ -4,18 +4,13 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class MultiContainerSubjectSearchResultDTO {
 
 	Integer maxResults;
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO.java b/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO.java
index 9f415b52a..13e946705 100644
--- a/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO.java
@@ -7,18 +7,13 @@
 import javax.persistence.NoResultException;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.Parent;
 import com.labsynch.labseer.domain.ParentAlias;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ParentAliasDTO {
 
 	private String parentCorpName;
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentDTO.java b/src/main/java/com/labsynch/labseer/dto/ParentDTO.java
index 0169502b2..6e0f925d9 100755
--- a/src/main/java/com/labsynch/labseer/dto/ParentDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ParentDTO.java
@@ -11,9 +11,6 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.CompoundType;
 import com.labsynch.labseer.domain.Parent;
@@ -25,9 +22,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ParentDTO{
 
 	private Long id;
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentEditDTO.java b/src/main/java/com/labsynch/labseer/dto/ParentEditDTO.java
index bd6905e64..0f90118b7 100644
--- a/src/main/java/com/labsynch/labseer/dto/ParentEditDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ParentEditDTO.java
@@ -10,9 +10,6 @@
 import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.CompoundType;
 import com.labsynch.labseer.domain.Parent;
@@ -21,9 +18,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ParentEditDTO{
 
 	private Long id;
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentLotCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/ParentLotCodeDTO.java
index d359aca84..a04d13295 100644
--- a/src/main/java/com/labsynch/labseer/dto/ParentLotCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ParentLotCodeDTO.java
@@ -4,15 +4,10 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ParentLotCodeDTO {
 	
 	private String requestName;
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentValidationDTO.java b/src/main/java/com/labsynch/labseer/dto/ParentValidationDTO.java
index ebd5b6cde..af8edd8da 100644
--- a/src/main/java/com/labsynch/labseer/dto/ParentValidationDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ParentValidationDTO.java
@@ -7,17 +7,12 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.service.ErrorMessage;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ParentValidationDTO {
 	
 	private static final Logger logger = LoggerFactory.getLogger(ParentValidationDTO.class);
diff --git a/src/main/java/com/labsynch/labseer/dto/PlateStubDTO.java b/src/main/java/com/labsynch/labseer/dto/PlateStubDTO.java
index b801ed662..7894ed307 100644
--- a/src/main/java/com/labsynch/labseer/dto/PlateStubDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PlateStubDTO.java
@@ -4,15 +4,10 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class PlateStubDTO {
 	
 	private String barcode;
diff --git a/src/main/java/com/labsynch/labseer/dto/PlateWellDTO.java b/src/main/java/com/labsynch/labseer/dto/PlateWellDTO.java
index 787611fa8..33e714bcd 100644
--- a/src/main/java/com/labsynch/labseer/dto/PlateWellDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PlateWellDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class PlateWellDTO {
 	
 	private String plateBarcode;
diff --git a/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO.java b/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO.java
index fc9bc0c42..25ccce785 100755
--- a/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO.java
@@ -1,8 +1,5 @@
 package com.labsynch.labseer.dto;
 
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import java.util.Collection;
 import java.util.Date;
@@ -24,9 +21,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class PreferredNameDTO {
 	
 	public PreferredNameDTO() {		
diff --git a/src/main/java/com/labsynch/labseer/dto/PreferredNameRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/PreferredNameRequestDTO.java
index 5bd945afb..6a870ee50 100755
--- a/src/main/java/com/labsynch/labseer/dto/PreferredNameRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PreferredNameRequestDTO.java
@@ -5,16 +5,11 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class PreferredNameRequestDTO {
 
 	private boolean error;
diff --git a/src/main/java/com/labsynch/labseer/dto/PreferredNameResultsDTO.java b/src/main/java/com/labsynch/labseer/dto/PreferredNameResultsDTO.java
index ebe0cb3e6..68ef3114e 100755
--- a/src/main/java/com/labsynch/labseer/dto/PreferredNameResultsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PreferredNameResultsDTO.java
@@ -5,16 +5,11 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class PreferredNameResultsDTO {
 
 	private boolean error;
diff --git a/src/main/java/com/labsynch/labseer/dto/PreferredNameWithErrorDTO.java b/src/main/java/com/labsynch/labseer/dto/PreferredNameWithErrorDTO.java
index 209768c09..2198b74ff 100755
--- a/src/main/java/com/labsynch/labseer/dto/PreferredNameWithErrorDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PreferredNameWithErrorDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class PreferredNameWithErrorDTO {
 
 	private String requestName;
diff --git a/src/main/java/com/labsynch/labseer/dto/ProtocolDTO.java b/src/main/java/com/labsynch/labseer/dto/ProtocolDTO.java
index 3ae92c665..0222055e6 100755
--- a/src/main/java/com/labsynch/labseer/dto/ProtocolDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ProtocolDTO.java
@@ -37,15 +37,7 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
-
-@RooJavaBean
-@RooToString(excludeFields = { "lsTags", "lsStates", "experiments", "lsLabels" })
-@RooJson
 public class ProtocolDTO{
 
     private static final Logger logger = LoggerFactory.getLogger(ProtocolDTO.class);
diff --git a/src/main/java/com/labsynch/labseer/dto/ProtocolErrorMessageDTO.java b/src/main/java/com/labsynch/labseer/dto/ProtocolErrorMessageDTO.java
index 60b8412ea..54bae5fd6 100644
--- a/src/main/java/com/labsynch/labseer/dto/ProtocolErrorMessageDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ProtocolErrorMessageDTO.java
@@ -4,9 +4,6 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.domain.Protocol;
@@ -14,9 +11,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ProtocolErrorMessageDTO {
 
 	String protocolCodeName;
diff --git a/src/main/java/com/labsynch/labseer/dto/ProtocolStatePathDTO.java b/src/main/java/com/labsynch/labseer/dto/ProtocolStatePathDTO.java
index 096436f1b..850aec313 100644
--- a/src/main/java/com/labsynch/labseer/dto/ProtocolStatePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ProtocolStatePathDTO.java
@@ -4,18 +4,13 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.ProtocolState;
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ProtocolStatePathDTO {
 
 	public ProtocolStatePathDTO() {
diff --git a/src/main/java/com/labsynch/labseer/dto/ProtocolValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/ProtocolValuePathDTO.java
index 651af338c..fd22f4055 100644
--- a/src/main/java/com/labsynch/labseer/dto/ProtocolValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ProtocolValuePathDTO.java
@@ -4,18 +4,13 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.ProtocolValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ProtocolValuePathDTO {
 
 	public ProtocolValuePathDTO() {
diff --git a/src/main/java/com/labsynch/labseer/dto/PurgeFileDependencyCheckResponseDTO.java b/src/main/java/com/labsynch/labseer/dto/PurgeFileDependencyCheckResponseDTO.java
index e4b88df28..91bb62ca3 100644
--- a/src/main/java/com/labsynch/labseer/dto/PurgeFileDependencyCheckResponseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PurgeFileDependencyCheckResponseDTO.java
@@ -2,9 +2,6 @@
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
@@ -12,9 +9,7 @@
 import java.util.Collection;
 import java.util.List;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class PurgeFileDependencyCheckResponseDTO {
 
     private String summary;
diff --git a/src/main/java/com/labsynch/labseer/dto/PurgeFileResponseDTO.java b/src/main/java/com/labsynch/labseer/dto/PurgeFileResponseDTO.java
index b7c657df4..94d9c5b9b 100644
--- a/src/main/java/com/labsynch/labseer/dto/PurgeFileResponseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PurgeFileResponseDTO.java
@@ -2,9 +2,6 @@
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
@@ -12,9 +9,7 @@
 import java.util.Collection;
 import java.util.List;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class PurgeFileResponseDTO {
 
     private String summary;
diff --git a/src/main/java/com/labsynch/labseer/dto/RawCurveDataDTO.java b/src/main/java/com/labsynch/labseer/dto/RawCurveDataDTO.java
index 18ca2afff..1f3447cb2 100644
--- a/src/main/java/com/labsynch/labseer/dto/RawCurveDataDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/RawCurveDataDTO.java
@@ -15,9 +15,6 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.supercsv.cellprocessor.Optional;
 import org.supercsv.cellprocessor.ift.CellProcessor;
 import org.supercsv.io.CsvBeanWriter;
@@ -28,9 +25,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class RawCurveDataDTO {
 	
 	private static final Logger logger = LoggerFactory.getLogger(RawCurveDataDTO.class);
diff --git a/src/main/java/com/labsynch/labseer/dto/RegSearchDTO.java b/src/main/java/com/labsynch/labseer/dto/RegSearchDTO.java
index eb21b1ed0..cb8497ccb 100755
--- a/src/main/java/com/labsynch/labseer/dto/RegSearchDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/RegSearchDTO.java
@@ -7,16 +7,11 @@
 import java.util.Set;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class RegSearchDTO {
 
     private String asDrawnStructure;
diff --git a/src/main/java/com/labsynch/labseer/dto/RegSearchParamsDTO.java b/src/main/java/com/labsynch/labseer/dto/RegSearchParamsDTO.java
index 52dd7dc85..4b3126d3e 100755
--- a/src/main/java/com/labsynch/labseer/dto/RegSearchParamsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/RegSearchParamsDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class RegSearchParamsDTO {
 
     private String corpName;
diff --git a/src/main/java/com/labsynch/labseer/dto/RenderMolRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/RenderMolRequestDTO.java
index 6a240586d..aca53777d 100644
--- a/src/main/java/com/labsynch/labseer/dto/RenderMolRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/RenderMolRequestDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class RenderMolRequestDTO {
 	
 	private String codeName;
diff --git a/src/main/java/com/labsynch/labseer/dto/ReparentLotDTO.java b/src/main/java/com/labsynch/labseer/dto/ReparentLotDTO.java
index 1c914c7b2..adf483432 100644
--- a/src/main/java/com/labsynch/labseer/dto/ReparentLotDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ReparentLotDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ReparentLotDTO {
 	
 	private String parentCorpName;
diff --git a/src/main/java/com/labsynch/labseer/dto/RequestNameDTO.java b/src/main/java/com/labsynch/labseer/dto/RequestNameDTO.java
index 296370349..af2491bf2 100755
--- a/src/main/java/com/labsynch/labseer/dto/RequestNameDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/RequestNameDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class RequestNameDTO {
 
 	private String requestName;
diff --git a/src/main/java/com/labsynch/labseer/dto/SELColOrderDTO.java b/src/main/java/com/labsynch/labseer/dto/SELColOrderDTO.java
index 7122dc4c0..60b6e333d 100644
--- a/src/main/java/com/labsynch/labseer/dto/SELColOrderDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SELColOrderDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class SELColOrderDTO implements Comparable {
 	
 	private Long stateId;
diff --git a/src/main/java/com/labsynch/labseer/dto/SaltFormAliasDTO.java b/src/main/java/com/labsynch/labseer/dto/SaltFormAliasDTO.java
index f3b57f3af..7b26e3b7f 100644
--- a/src/main/java/com/labsynch/labseer/dto/SaltFormAliasDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SaltFormAliasDTO.java
@@ -2,9 +2,6 @@
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.ParentAlias;
 import com.labsynch.labseer.domain.SaltFormAlias;
@@ -13,9 +10,7 @@
 import java.util.Collection;
 import java.util.List;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class SaltFormAliasDTO {
 
     private String saltFormCorpName;
diff --git a/src/main/java/com/labsynch/labseer/dto/SaltFormDTO.java b/src/main/java/com/labsynch/labseer/dto/SaltFormDTO.java
index f31cb5ca0..aed36d2e5 100755
--- a/src/main/java/com/labsynch/labseer/dto/SaltFormDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SaltFormDTO.java
@@ -9,9 +9,6 @@
 import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.IsoSalt;
 import com.labsynch.labseer.domain.Lot;
@@ -19,9 +16,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class SaltFormDTO{
 
 
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchCdIdReturnDTO.java b/src/main/java/com/labsynch/labseer/dto/SearchCdIdReturnDTO.java
index 030a634e2..9db684c74 100644
--- a/src/main/java/com/labsynch/labseer/dto/SearchCdIdReturnDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SearchCdIdReturnDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class SearchCdIdReturnDTO{
 
     private String corpName;
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchCompoundReturnDTO.java b/src/main/java/com/labsynch/labseer/dto/SearchCompoundReturnDTO.java
index 6453426ce..76d808947 100755
--- a/src/main/java/com/labsynch/labseer/dto/SearchCompoundReturnDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SearchCompoundReturnDTO.java
@@ -6,17 +6,12 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 import flexjson.transformer.DateTransformer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class SearchCompoundReturnDTO{
 
     private String corpName;
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchFormDTO.java b/src/main/java/com/labsynch/labseer/dto/SearchFormDTO.java
index 75b1880b7..8f07e55c7 100755
--- a/src/main/java/com/labsynch/labseer/dto/SearchFormDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SearchFormDTO.java
@@ -6,18 +6,13 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 import flexjson.transformer.DateTransformer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class SearchFormDTO{
 
 	private String corpNameList;
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchFormReturnDTO.java b/src/main/java/com/labsynch/labseer/dto/SearchFormReturnDTO.java
index 8d91c78a9..9746ae01d 100755
--- a/src/main/java/com/labsynch/labseer/dto/SearchFormReturnDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SearchFormReturnDTO.java
@@ -7,17 +7,12 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 import flexjson.transformer.DateTransformer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class SearchFormReturnDTO{
 			 
 	private Collection<SearchCompoundReturnDTO> foundCompounds = new HashSet<SearchCompoundReturnDTO>();
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchLotDTO.java b/src/main/java/com/labsynch/labseer/dto/SearchLotDTO.java
index 419ef1c18..9d9987ecf 100755
--- a/src/main/java/com/labsynch/labseer/dto/SearchLotDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SearchLotDTO.java
@@ -6,17 +6,12 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 import flexjson.transformer.DateTransformer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class SearchLotDTO {
 
     private String corpName;
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchResultExportRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/SearchResultExportRequestDTO.java
index 32a07c469..a796ad249 100644
--- a/src/main/java/com/labsynch/labseer/dto/SearchResultExportRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SearchResultExportRequestDTO.java
@@ -2,9 +2,6 @@
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
@@ -12,9 +9,7 @@
 import java.util.Collection;
 import java.util.List;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class SearchResultExportRequestDTO {
 
     private String filePath;
diff --git a/src/main/java/com/labsynch/labseer/dto/SetTubeLocationDTO.java b/src/main/java/com/labsynch/labseer/dto/SetTubeLocationDTO.java
index 653d05759..933b023e3 100644
--- a/src/main/java/com/labsynch/labseer/dto/SetTubeLocationDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SetTubeLocationDTO.java
@@ -8,13 +8,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class SetTubeLocationDTO {
 
 	private String barcode;
diff --git a/src/main/java/com/labsynch/labseer/dto/SimpleBulkLoadPropertyDTO.java b/src/main/java/com/labsynch/labseer/dto/SimpleBulkLoadPropertyDTO.java
index 935866844..28fc99eaa 100644
--- a/src/main/java/com/labsynch/labseer/dto/SimpleBulkLoadPropertyDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SimpleBulkLoadPropertyDTO.java
@@ -2,9 +2,6 @@
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
@@ -12,9 +9,7 @@
 import java.util.Collection;
 import java.util.List;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class SimpleBulkLoadPropertyDTO {
 
     private String name;
diff --git a/src/main/java/com/labsynch/labseer/dto/StandardizationDryRunSearchDTO.java b/src/main/java/com/labsynch/labseer/dto/StandardizationDryRunSearchDTO.java
index 2a8b3f998..321a93b55 100755
--- a/src/main/java/com/labsynch/labseer/dto/StandardizationDryRunSearchDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StandardizationDryRunSearchDTO.java
@@ -8,14 +8,9 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 
 public class StandardizationDryRunSearchDTO {
 
diff --git a/src/main/java/com/labsynch/labseer/dto/StateValueCsvDTO.java b/src/main/java/com/labsynch/labseer/dto/StateValueCsvDTO.java
index 52fceaa71..e2908bd4c 100644
--- a/src/main/java/com/labsynch/labseer/dto/StateValueCsvDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StateValueCsvDTO.java
@@ -11,9 +11,6 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.supercsv.cellprocessor.Optional;
 import org.supercsv.cellprocessor.ift.CellProcessor;
 
@@ -21,9 +18,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class StateValueCsvDTO {
 
 	private static final Logger logger = LoggerFactory.getLogger(StateValueCsvDTO.class);
diff --git a/src/main/java/com/labsynch/labseer/dto/StateValueDTO.java b/src/main/java/com/labsynch/labseer/dto/StateValueDTO.java
index bb2f2c425..c4e4038d2 100644
--- a/src/main/java/com/labsynch/labseer/dto/StateValueDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StateValueDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class StateValueDTO {
 	
 	Long id;
diff --git a/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesDTO.java b/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesDTO.java
index a7649db98..78eeb1be1 100644
--- a/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesDTO.java
@@ -7,9 +7,6 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.ItxLsThingLsThing;
 import com.labsynch.labseer.domain.LsThing;
@@ -19,9 +16,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class StoichiometryPropertiesDTO {
 	
 	private static final Logger logger = LoggerFactory.getLogger(StoichiometryPropertiesDTO.class);
diff --git a/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesResultsDTO.java b/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesResultsDTO.java
index a3d7cb80a..adadd9dd0 100644
--- a/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesResultsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesResultsDTO.java
@@ -5,17 +5,12 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class StoichiometryPropertiesResultsDTO {
 
 	boolean hasError;
diff --git a/src/main/java/com/labsynch/labseer/dto/StringCollectionDTO.java b/src/main/java/com/labsynch/labseer/dto/StringCollectionDTO.java
index 9331c2a79..881f3b806 100755
--- a/src/main/java/com/labsynch/labseer/dto/StringCollectionDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StringCollectionDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class StringCollectionDTO {
 	
 	private String name;
diff --git a/src/main/java/com/labsynch/labseer/dto/StrippedSaltDTO.java b/src/main/java/com/labsynch/labseer/dto/StrippedSaltDTO.java
index 384658724..cdd44a72b 100644
--- a/src/main/java/com/labsynch/labseer/dto/StrippedSaltDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StrippedSaltDTO.java
@@ -6,18 +6,13 @@
 import java.util.Set;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
 import com.labsynch.labseer.domain.Salt;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class StrippedSaltDTO {
 		
 	private Map<Salt, Integer> saltCounts;
diff --git a/src/main/java/com/labsynch/labseer/dto/StructureAndThingSearchDTO.java b/src/main/java/com/labsynch/labseer/dto/StructureAndThingSearchDTO.java
index 2f6e5c864..28ed71f4a 100644
--- a/src/main/java/com/labsynch/labseer/dto/StructureAndThingSearchDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StructureAndThingSearchDTO.java
@@ -7,13 +7,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class StructureAndThingSearchDTO {
 	
 	private String queryMol;
diff --git a/src/main/java/com/labsynch/labseer/dto/StructureSearchDTO.java b/src/main/java/com/labsynch/labseer/dto/StructureSearchDTO.java
index a1d97b9a1..921ea2bfe 100644
--- a/src/main/java/com/labsynch/labseer/dto/StructureSearchDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StructureSearchDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class StructureSearchDTO {
 	
 	private String queryMol;
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectCodeDTO.java
index c353ffe63..00a682e3a 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectCodeDTO.java
@@ -4,17 +4,12 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class SubjectCodeDTO {
 	
 	private String subjectCode;
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectCodeNameDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectCodeNameDTO.java
index cde15e731..96c20b20f 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectCodeNameDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectCodeNameDTO.java
@@ -4,18 +4,13 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.Subject;
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class SubjectCodeNameDTO {
 	
 	private String requestCodeName;
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectCodeStateDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectCodeStateDTO.java
index 0e37e5d85..c0ec9e888 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectCodeStateDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectCodeStateDTO.java
@@ -2,9 +2,6 @@
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.SubjectState;
 import flexjson.JSONDeserializer;
@@ -12,9 +9,7 @@
 import java.util.Collection;
 import java.util.List;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class SubjectCodeStateDTO {
 	
 	private String subjectCode;
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectCsvDataDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectCsvDataDTO.java
index eb0d1205d..0eb107782 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectCsvDataDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectCsvDataDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class SubjectCsvDataDTO {
 	
 	private List<Long> treatmentGroupIds;
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectDTO.java
index 6bf51dd55..e7c2746d0 100755
--- a/src/main/java/com/labsynch/labseer/dto/SubjectDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectDTO.java
@@ -9,9 +9,6 @@
 import java.util.Set;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.Subject;
 import com.labsynch.labseer.domain.ThingPage;
@@ -21,9 +18,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class SubjectDTO {
 	
     public SubjectDTO(Subject subject) {
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectLabelDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectLabelDTO.java
index 8847fab8e..e1f33c59b 100755
--- a/src/main/java/com/labsynch/labseer/dto/SubjectLabelDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectLabelDTO.java
@@ -5,17 +5,12 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.SubjectLabel;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class SubjectLabelDTO {
 	
     public SubjectLabelDTO(SubjectLabel subjectLabel) {
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectMiniDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectMiniDTO.java
index 72e433f36..9e5e8c558 100755
--- a/src/main/java/com/labsynch/labseer/dto/SubjectMiniDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectMiniDTO.java
@@ -2,9 +2,6 @@
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.Subject;
 import flexjson.JSONDeserializer;
@@ -12,9 +9,7 @@
 import java.util.Collection;
 import java.util.List;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class SubjectMiniDTO {
 	
     public SubjectMiniDTO(Subject subject) {
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectSearchRequest.java b/src/main/java/com/labsynch/labseer/dto/SubjectSearchRequest.java
index 1b76ee7df..ae5c11e8f 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectSearchRequest.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectSearchRequest.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class SubjectSearchRequest {
 	
 	Integer maxResults;
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectSearchResultDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectSearchResultDTO.java
index ef1429629..3ea8bf649 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectSearchResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectSearchResultDTO.java
@@ -4,9 +4,6 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.domain.Subject;
@@ -14,9 +11,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class SubjectSearchResultDTO {
 
 	Integer maxResults;
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectStateDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectStateDTO.java
index 7c764789a..fdb0e2056 100755
--- a/src/main/java/com/labsynch/labseer/dto/SubjectStateDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectStateDTO.java
@@ -7,18 +7,13 @@
 import java.util.Set;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.SubjectState;
 import com.labsynch.labseer.domain.SubjectValue;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class SubjectStateDTO {
 	
     public SubjectStateDTO(SubjectState subjectState) {
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectStateMiniDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectStateMiniDTO.java
index 09b5be2f8..f58d75fe2 100755
--- a/src/main/java/com/labsynch/labseer/dto/SubjectStateMiniDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectStateMiniDTO.java
@@ -2,9 +2,6 @@
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.SubjectState;
 import flexjson.JSONDeserializer;
@@ -12,9 +9,7 @@
 import java.util.Collection;
 import java.util.List;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class SubjectStateMiniDTO {
 	
     public SubjectStateMiniDTO(SubjectState subjectState) {
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectStatePathDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectStatePathDTO.java
index ccc5e18af..3f6778e63 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectStatePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectStatePathDTO.java
@@ -4,18 +4,13 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.SubjectState;
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class SubjectStatePathDTO {
 
 	public SubjectStatePathDTO() {
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectStateValueDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectStateValueDTO.java
index 935f427e4..7b15bc72f 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectStateValueDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectStateValueDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class SubjectStateValueDTO {
 	long subjectId;
 	String subjectValue;
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectValueDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectValueDTO.java
index b10dfae14..d85a240a4 100755
--- a/src/main/java/com/labsynch/labseer/dto/SubjectValueDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectValueDTO.java
@@ -6,9 +6,6 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.SubjectState;
 import com.labsynch.labseer.domain.SubjectValue;
@@ -16,9 +13,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class SubjectValueDTO {
 	
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectValuePathDTO.java
index 35ac7bcbd..3cb78a8de 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectValuePathDTO.java
@@ -4,18 +4,13 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.SubjectValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class SubjectValuePathDTO {
 
 	public SubjectValuePathDTO() {
diff --git a/src/main/java/com/labsynch/labseer/dto/TempThingDTO.java b/src/main/java/com/labsynch/labseer/dto/TempThingDTO.java
index 4f6463b97..339e85438 100644
--- a/src/main/java/com/labsynch/labseer/dto/TempThingDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TempThingDTO.java
@@ -8,13 +8,8 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class TempThingDTO {
 
 	private static final Logger logger = LoggerFactory.getLogger(TempThingDTO.class);
diff --git a/src/main/java/com/labsynch/labseer/dto/TgDataDTO.java b/src/main/java/com/labsynch/labseer/dto/TgDataDTO.java
index 999380eb8..400849ab6 100644
--- a/src/main/java/com/labsynch/labseer/dto/TgDataDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TgDataDTO.java
@@ -13,9 +13,6 @@
 import javax.persistence.TypedQuery;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.supercsv.cellprocessor.Optional;
 import org.supercsv.cellprocessor.ift.CellProcessor;
 import org.supercsv.io.CsvBeanWriter;
@@ -27,9 +24,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class TgDataDTO {
 	
 	private String curveId;
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupCodeDTO.java
index 85715b2d0..a64cb9a17 100644
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupCodeDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class TreatmentGroupCodeDTO {
 	
 	private String treatmentGroupCode;
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupMiniDTO.java b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupMiniDTO.java
index d1aa8a855..7a3400e8f 100755
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupMiniDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupMiniDTO.java
@@ -2,9 +2,6 @@
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.TreatmentGroup;
 import flexjson.JSONDeserializer;
@@ -12,9 +9,7 @@
 import java.util.Collection;
 import java.util.List;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class TreatmentGroupMiniDTO {
 	
     public TreatmentGroupMiniDTO(TreatmentGroup treatmentGroup) {
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupStatePathDTO.java b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupStatePathDTO.java
index c98b8d719..6c64c80a9 100644
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupStatePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupStatePathDTO.java
@@ -4,18 +4,13 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.TreatmentGroupState;
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class TreatmentGroupStatePathDTO {
 
 	public TreatmentGroupStatePathDTO() {
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValueDTO.java b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValueDTO.java
index 102b2f00c..d4addf4e1 100644
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValueDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValueDTO.java
@@ -6,18 +6,13 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.TreatmentGroupState;
 import com.labsynch.labseer.domain.TreatmentGroupValue;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class TreatmentGroupValueDTO {
 	
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValuePathDTO.java
index 5487205c7..14e937e77 100644
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValuePathDTO.java
@@ -4,18 +4,13 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.TreatmentGroupValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class TreatmentGroupValuePathDTO {
 
 	public TreatmentGroupValuePathDTO() {
diff --git a/src/main/java/com/labsynch/labseer/dto/TsvLoaderResponseDTO.java b/src/main/java/com/labsynch/labseer/dto/TsvLoaderResponseDTO.java
index ced726cea..175161532 100644
--- a/src/main/java/com/labsynch/labseer/dto/TsvLoaderResponseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TsvLoaderResponseDTO.java
@@ -6,15 +6,10 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class TsvLoaderResponseDTO {
 
 	private static final Logger logger = LoggerFactory.getLogger(TsvLoaderResponseDTO.class);
diff --git a/src/main/java/com/labsynch/labseer/dto/TypeDTO.java b/src/main/java/com/labsynch/labseer/dto/TypeDTO.java
index 2bc6b24b8..f0e4c7f42 100644
--- a/src/main/java/com/labsynch/labseer/dto/TypeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TypeDTO.java
@@ -8,9 +8,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import javax.persistence.NoResultException;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.ContainerType;
 import com.labsynch.labseer.domain.DDictType;
@@ -27,9 +24,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class TypeDTO {
 	
 	private String typeName;
diff --git a/src/main/java/com/labsynch/labseer/dto/TypeKindDTO.java b/src/main/java/com/labsynch/labseer/dto/TypeKindDTO.java
index ab66dddf9..083880ba6 100644
--- a/src/main/java/com/labsynch/labseer/dto/TypeKindDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TypeKindDTO.java
@@ -8,9 +8,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import javax.persistence.NoResultException;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.ContainerKind;
 import com.labsynch.labseer.domain.ContainerType;
@@ -39,9 +36,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class TypeKindDTO {
 	
 	private static final Logger logger = LoggerFactory.getLogger(TypeKindDTO.class);
diff --git a/src/main/java/com/labsynch/labseer/dto/ValidationResponseDTO.java b/src/main/java/com/labsynch/labseer/dto/ValidationResponseDTO.java
index dabe73861..bd37056c1 100644
--- a/src/main/java/com/labsynch/labseer/dto/ValidationResponseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ValidationResponseDTO.java
@@ -5,15 +5,10 @@
 import com.labsynch.labseer.utils.ExcludeNulls;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ValidationResponseDTO {
 		
     private String level;
diff --git a/src/main/java/com/labsynch/labseer/dto/ValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/ValuePathDTO.java
index 8d3032bbd..b135eb6df 100644
--- a/src/main/java/com/labsynch/labseer/dto/ValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ValuePathDTO.java
@@ -6,9 +6,6 @@
 import java.util.Set;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.ItxLsThingLsThing;
 import com.labsynch.labseer.domain.ItxLsThingLsThingState;
@@ -20,9 +17,7 @@
 import flexjson.JSONSerializer;
 
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ValuePathDTO {
 	
     public ValuePathDTO() {
diff --git a/src/main/java/com/labsynch/labseer/dto/ValueQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/ValueQueryDTO.java
index c78c992b4..e53968f38 100644
--- a/src/main/java/com/labsynch/labseer/dto/ValueQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ValueQueryDTO.java
@@ -6,13 +6,8 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ValueQueryDTO {
 
 	String stateType;
diff --git a/src/main/java/com/labsynch/labseer/dto/ValueRuleDTO.java b/src/main/java/com/labsynch/labseer/dto/ValueRuleDTO.java
index 9753891c2..19212c4ac 100644
--- a/src/main/java/com/labsynch/labseer/dto/ValueRuleDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ValueRuleDTO.java
@@ -7,9 +7,6 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.ItxLsThingLsThing;
 import com.labsynch.labseer.domain.LsThing;
@@ -18,9 +15,7 @@
 import flexjson.JSONSerializer;
 
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ValueRuleDTO {
 	
     public ValueRuleDTO() {
diff --git a/src/main/java/com/labsynch/labseer/dto/ValueTypeKindDTO.java b/src/main/java/com/labsynch/labseer/dto/ValueTypeKindDTO.java
index 4461eb85a..740109cb5 100755
--- a/src/main/java/com/labsynch/labseer/dto/ValueTypeKindDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ValueTypeKindDTO.java
@@ -3,9 +3,6 @@
 import javax.persistence.NoResultException;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.domain.ValueKind;
@@ -15,9 +12,7 @@
 import java.util.Collection;
 import java.util.List;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ValueTypeKindDTO {
 	
 	private String lsType;
diff --git a/src/main/java/com/labsynch/labseer/dto/WellContentDTO.java b/src/main/java/com/labsynch/labseer/dto/WellContentDTO.java
index 355276cdd..b2681cfff 100644
--- a/src/main/java/com/labsynch/labseer/dto/WellContentDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/WellContentDTO.java
@@ -11,13 +11,8 @@
 import java.util.Map;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class WellContentDTO {
 	
 	private String containerCodeName;
diff --git a/src/main/java/com/labsynch/labseer/dto/WellStubDTO.java b/src/main/java/com/labsynch/labseer/dto/WellStubDTO.java
index 53985fe35..a93dcad62 100644
--- a/src/main/java/com/labsynch/labseer/dto/WellStubDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/WellStubDTO.java
@@ -7,9 +7,6 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import com.labsynch.labseer.domain.Container;
 import com.labsynch.labseer.domain.ContainerLabel;
@@ -17,9 +14,7 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class WellStubDTO {
 	
 	private String wellName;
diff --git a/src/main/java/com/labsynch/labseer/dto/configuration/StandardizerSettingsConfigDTO.java b/src/main/java/com/labsynch/labseer/dto/configuration/StandardizerSettingsConfigDTO.java
index 9100f1829..fe64b36c6 100644
--- a/src/main/java/com/labsynch/labseer/dto/configuration/StandardizerSettingsConfigDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/configuration/StandardizerSettingsConfigDTO.java
@@ -10,13 +10,8 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class StandardizerSettingsConfigDTO {
 
     private Boolean shouldStandardize;
diff --git a/src/main/java/com/labsynch/labseer/exceptions/ErrorMessage.java b/src/main/java/com/labsynch/labseer/exceptions/ErrorMessage.java
index 2838f3d89..f9425e26e 100755
--- a/src/main/java/com/labsynch/labseer/exceptions/ErrorMessage.java
+++ b/src/main/java/com/labsynch/labseer/exceptions/ErrorMessage.java
@@ -7,13 +7,8 @@
 import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ErrorMessage {
 
     @Size(max = 50)
diff --git a/src/main/java/com/labsynch/labseer/exceptions/LsThingValidationErrorMessage.java b/src/main/java/com/labsynch/labseer/exceptions/LsThingValidationErrorMessage.java
index 3298433f7..8e9626253 100644
--- a/src/main/java/com/labsynch/labseer/exceptions/LsThingValidationErrorMessage.java
+++ b/src/main/java/com/labsynch/labseer/exceptions/LsThingValidationErrorMessage.java
@@ -7,13 +7,8 @@
 import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class LsThingValidationErrorMessage {
 
     @Size(max = 50)
diff --git a/src/main/java/com/labsynch/labseer/service/ErrorList.java b/src/main/java/com/labsynch/labseer/service/ErrorList.java
index 099698b0a..99d62d608 100755
--- a/src/main/java/com/labsynch/labseer/service/ErrorList.java
+++ b/src/main/java/com/labsynch/labseer/service/ErrorList.java
@@ -5,16 +5,11 @@
 import java.util.List;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ErrorList {
 
     private ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
diff --git a/src/main/java/com/labsynch/labseer/service/ErrorMessage.java b/src/main/java/com/labsynch/labseer/service/ErrorMessage.java
index d6dbccbf3..54882bca3 100755
--- a/src/main/java/com/labsynch/labseer/service/ErrorMessage.java
+++ b/src/main/java/com/labsynch/labseer/service/ErrorMessage.java
@@ -7,13 +7,8 @@
 import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.json.RooJson;
-import org.springframework.roo.addon.tostring.RooToString;
 
-@RooJavaBean
-@RooToString
-@RooJson
+
 public class ErrorMessage {
 
     @Size(max = 50)
diff --git a/src/main/java/com/labsynch/labseer/service/SaltLoader.java b/src/main/java/com/labsynch/labseer/service/SaltLoader.java
index acd23a0dc..f4a897fb3 100755
--- a/src/main/java/com/labsynch/labseer/service/SaltLoader.java
+++ b/src/main/java/com/labsynch/labseer/service/SaltLoader.java
@@ -17,17 +17,12 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.roo.addon.javabean.RooJavaBean;
-import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
-import org.springframework.roo.addon.tostring.RooToString;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 @Entity
 @Configurable
-@RooJavaBean
-@RooToString
-@RooJpaActiveRecord
+
 public class SaltLoader {
 	
     private String name;
diff --git a/src/main/java/com/labsynch/labseer/web/ApplicationConversionServiceFactoryBean.java b/src/main/java/com/labsynch/labseer/web/ApplicationConversionServiceFactoryBean.java
index daca42fd4..8e660bd72 100755
--- a/src/main/java/com/labsynch/labseer/web/ApplicationConversionServiceFactoryBean.java
+++ b/src/main/java/com/labsynch/labseer/web/ApplicationConversionServiceFactoryBean.java
@@ -8,7 +8,6 @@
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.format.FormatterRegistry;
 import org.springframework.format.support.FormattingConversionServiceFactoryBean;
-import org.springframework.roo.addon.web.mvc.controller.converter.RooConversionService;
 import org.springframework.transaction.annotation.Transactional;;
 
 
@@ -16,7 +15,6 @@
 /**
  * A central place to register application converters and formatters. 
  */
-@RooConversionService
 @Transactional
 public class ApplicationConversionServiceFactoryBean extends FormattingConversionServiceFactoryBean {
 
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupDataOnDemand.java
index 2646f4b25..48d0938f1 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupDataOnDemand.java
@@ -11,12 +11,10 @@
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Configurable
 @Component
-@RooDataOnDemand(entity = AnalysisGroup.class)
 public class AnalysisGroupDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupIntegrationTest.java
index cebbe548d..3ff7d63bf 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
 @Configurable
-@RooIntegrationTest(entity = AnalysisGroup.class)
 public class AnalysisGroupIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelDataOnDemand.java
index 4afe44c46..1d0cf93c2 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelDataOnDemand.java
@@ -12,12 +12,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Configurable
 @Component
-@RooDataOnDemand(entity = AnalysisGroupLabel.class)
 public class AnalysisGroupLabelDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelIntegrationTest.java
index c647f72b4..5606e3ced 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
 @Configurable
-@RooIntegrationTest(entity = AnalysisGroupLabel.class)
 public class AnalysisGroupLabelIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateDataOnDemand.java
index d610133c3..b921f52fc 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateDataOnDemand.java
@@ -12,12 +12,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Component
 @Configurable
-@RooDataOnDemand(entity = AnalysisGroupState.class)
 public class AnalysisGroupStateDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateIntegrationTest.java
index 832c3271b..b53236a9c 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = AnalysisGroupState.class)
 public class AnalysisGroupStateIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueDataOnDemand.java
index d66bd0645..a2762fe3d 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueDataOnDemand.java
@@ -13,12 +13,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Configurable
 @Component
-@RooDataOnDemand(entity = AnalysisGroupValue.class)
 public class AnalysisGroupValueDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueIntegrationTest.java
index ee2242548..4a9d8a7a8 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = AnalysisGroupValue.class)
 public class AnalysisGroupValueIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/AuthorDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/AuthorDataOnDemand.java
index 2ba802c80..48792e4a1 100755
--- a/src/test/java/com/labsynch/labseer/domain/AuthorDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/AuthorDataOnDemand.java
@@ -11,12 +11,10 @@
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Component
 @Configurable
-@RooDataOnDemand(entity = Author.class)
 public class AuthorDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/AuthorIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/AuthorIntegrationTest.java
index 5666b3eee..4896e4dae 100755
--- a/src/test/java/com/labsynch/labseer/domain/AuthorIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/AuthorIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = Author.class)
 public class AuthorIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/AuthorTest.java b/src/test/java/com/labsynch/labseer/domain/AuthorTest.java
index 7de32dd8b..3853a99be 100755
--- a/src/test/java/com/labsynch/labseer/domain/AuthorTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/AuthorTest.java
@@ -11,7 +11,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,7 +19,6 @@
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
 @Configurable
-@RooIntegrationTest(entity = Author.class)
 public class AuthorTest {
 	
 	private static final Logger logger = LoggerFactory.getLogger(AuthorTest.class);
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ContainerDataOnDemand.java
index e5565a4a1..5a5e45a23 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerDataOnDemand.java
@@ -11,12 +11,10 @@
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Configurable
 @Component
-@RooDataOnDemand(entity = Container.class)
 public class ContainerDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ContainerIntegrationTest.java
index 0128e1386..3bc979fd3 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
 @Configurable
-@RooIntegrationTest(entity = Container.class)
 public class ContainerIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ContainerKindDataOnDemand.java
index 0b9e53642..fff90356d 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerKindDataOnDemand.java
@@ -9,12 +9,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Component
 @Configurable
-@RooDataOnDemand(entity = ContainerKind.class)
 public class ContainerKindDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ContainerKindIntegrationTest.java
index 5d267a6b2..9c019997a 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerKindIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
 @Configurable
-@RooIntegrationTest(entity = ContainerKind.class)
 public class ContainerKindIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerLabelDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ContainerLabelDataOnDemand.java
index 34c8f2add..d46bf1ed8 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerLabelDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerLabelDataOnDemand.java
@@ -12,12 +12,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Configurable
 @Component
-@RooDataOnDemand(entity = ContainerLabel.class)
 public class ContainerLabelDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerLabelIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ContainerLabelIntegrationTest.java
index fb46dd751..4a54b71ca 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerLabelIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerLabelIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
 @Configurable
-@RooIntegrationTest(entity = ContainerLabel.class)
 public class ContainerLabelIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ContainerStateDataOnDemand.java
index 730f06d87..13c44f4dc 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerStateDataOnDemand.java
@@ -12,12 +12,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Component
 @Configurable
-@RooDataOnDemand(entity = ContainerState.class)
 public class ContainerStateDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ContainerStateIntegrationTest.java
index 43678e26d..f12d38e50 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerStateIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
 @Configurable
-@RooIntegrationTest(entity = ContainerState.class)
 public class ContainerStateIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ContainerTypeDataOnDemand.java
index f8a6250b3..24d83692a 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerTypeDataOnDemand.java
@@ -8,12 +8,10 @@
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Component
 @Configurable
-@RooDataOnDemand(entity = ContainerType.class)
 public class ContainerTypeDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ContainerTypeIntegrationTest.java
index f60b05136..dca1eb07c 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerTypeIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = ContainerType.class)
 public class ContainerTypeIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ContainerValueDataOnDemand.java
index d1ebfa581..c34d4033a 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerValueDataOnDemand.java
@@ -13,12 +13,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Component
 @Configurable
-@RooDataOnDemand(entity = ContainerValue.class)
 public class ContainerValueDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ContainerValueIntegrationTest.java
index b9312be4d..c8e0f5c57 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerValueIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
 @Configurable
-@RooIntegrationTest(entity = ContainerValue.class)
 public class ContainerValueIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ExperimentDataOnDemand.java
index 770187822..ec4ba0bfc 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentDataOnDemand.java
@@ -12,12 +12,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Component
 @Configurable
-@RooDataOnDemand(entity = Experiment.class)
 public class ExperimentDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ExperimentIntegrationTest.java
index 970a5f54b..8af8fe477 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = Experiment.class)
 public class ExperimentIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ExperimentKindDataOnDemand.java
index 73848f733..b25b5a340 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentKindDataOnDemand.java
@@ -9,12 +9,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Component
 @Configurable
-@RooDataOnDemand(entity = ExperimentKind.class)
 public class ExperimentKindDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ExperimentKindIntegrationTest.java
index 3fe16db32..0d93839d4 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentKindIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = ExperimentKind.class)
 public class ExperimentKindIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentLabelDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ExperimentLabelDataOnDemand.java
index 6f56cf6a1..9f4c60ac0 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentLabelDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentLabelDataOnDemand.java
@@ -12,12 +12,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Component
 @Configurable
-@RooDataOnDemand(entity = ExperimentLabel.class)
 public class ExperimentLabelDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentLabelIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ExperimentLabelIntegrationTest.java
index a2cbc2657..46ab0d9cd 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentLabelIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentLabelIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = ExperimentLabel.class)
 public class ExperimentLabelIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ExperimentStateDataOnDemand.java
index c743ce27e..0c834bb82 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentStateDataOnDemand.java
@@ -12,12 +12,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Configurable
 @Component
-@RooDataOnDemand(entity = ExperimentState.class)
 public class ExperimentStateDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ExperimentStateIntegrationTest.java
index 033a496ef..ce85f27b8 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentStateIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = ExperimentState.class)
 public class ExperimentStateIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ExperimentTypeDataOnDemand.java
index de73729a3..34157ecd5 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentTypeDataOnDemand.java
@@ -8,12 +8,10 @@
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Component
 @Configurable
-@RooDataOnDemand(entity = ExperimentType.class)
 public class ExperimentTypeDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ExperimentTypeIntegrationTest.java
index b0e5f6826..38797fb4e 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentTypeIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = ExperimentType.class)
 public class ExperimentTypeIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ExperimentValueDataOnDemand.java
index ae1612ac7..7a1f5c100 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentValueDataOnDemand.java
@@ -13,12 +13,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Component
 @Configurable
-@RooDataOnDemand(entity = ExperimentValue.class)
 public class ExperimentValueDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ExperimentValueIntegrationTest.java
index 200d86bb5..d28f94983 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentValueIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = ExperimentValue.class)
 public class ExperimentValueIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/InteractionKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/InteractionKindDataOnDemand.java
index 892d60834..6b4040beb 100755
--- a/src/test/java/com/labsynch/labseer/domain/InteractionKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/InteractionKindDataOnDemand.java
@@ -9,12 +9,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Configurable
 @Component
-@RooDataOnDemand(entity = InteractionKind.class)
 public class InteractionKindDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/InteractionKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/InteractionKindIntegrationTest.java
index 5241e7ca6..b564f765f 100755
--- a/src/test/java/com/labsynch/labseer/domain/InteractionKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/InteractionKindIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = InteractionKind.class)
 public class InteractionKindIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/InteractionTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/InteractionTypeDataOnDemand.java
index aeb8d8938..717704c55 100755
--- a/src/test/java/com/labsynch/labseer/domain/InteractionTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/InteractionTypeDataOnDemand.java
@@ -8,12 +8,10 @@
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Configurable
 @Component
-@RooDataOnDemand(entity = InteractionType.class)
 public class InteractionTypeDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/InteractionTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/InteractionTypeIntegrationTest.java
index 4b4679822..0420c8ab4 100755
--- a/src/test/java/com/labsynch/labseer/domain/InteractionTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/InteractionTypeIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
 @Configurable
-@RooIntegrationTest(entity = InteractionType.class)
 public class InteractionTypeIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerDataOnDemand.java
index fa290f10f..e580fc450 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerDataOnDemand.java
@@ -12,12 +12,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Configurable
 @Component
-@RooDataOnDemand(entity = ItxContainerContainer.class)
 public class ItxContainerContainerDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerIntegrationTest.java
index 849f05f1e..524562c29 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
 @Configurable
-@RooIntegrationTest(entity = ItxContainerContainer.class)
 public class ItxContainerContainerIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateDataOnDemand.java
index 444b65e4b..c630a4990 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateDataOnDemand.java
@@ -12,12 +12,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Configurable
 @Component
-@RooDataOnDemand(entity = ItxContainerContainerState.class)
 public class ItxContainerContainerStateDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateIntegrationTest.java
index 18944f56b..2c45ae5c3 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
 @Configurable
-@RooIntegrationTest(entity = ItxContainerContainerState.class)
 public class ItxContainerContainerStateIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueDataOnDemand.java
index fc9a35e20..6eeff81e6 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueDataOnDemand.java
@@ -13,12 +13,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Component
 @Configurable
-@RooDataOnDemand(entity = ItxContainerContainerValue.class)
 public class ItxContainerContainerValueDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueIntegrationTest.java
index cf423ce9e..a6af32144 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = ItxContainerContainerValue.class)
 public class ItxContainerContainerValueIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerDataOnDemand.java
index 4b0757cbd..b83378f7f 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerDataOnDemand.java
@@ -12,12 +12,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Configurable
 @Component
-@RooDataOnDemand(entity = ItxSubjectContainer.class)
 public class ItxSubjectContainerDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerIntegrationTest.java
index cbf7e95ea..1b5c06c1d 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = ItxSubjectContainer.class)
 public class ItxSubjectContainerIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateDataOnDemand.java
index e8d2041a0..ea54b37af 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateDataOnDemand.java
@@ -12,12 +12,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Component
 @Configurable
-@RooDataOnDemand(entity = ItxSubjectContainerState.class)
 public class ItxSubjectContainerStateDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateIntegrationTest.java
index 79391c12b..3c7e74b5c 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = ItxSubjectContainerState.class)
 public class ItxSubjectContainerStateIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueDataOnDemand.java
index 3d7c965f5..e3dba7a01 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueDataOnDemand.java
@@ -13,12 +13,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Component
 @Configurable
-@RooDataOnDemand(entity = ItxSubjectContainerValue.class)
 public class ItxSubjectContainerValueDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueIntegrationTest.java
index 2ff844a29..7f4c15f3c 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
 @Configurable
-@RooIntegrationTest(entity = ItxSubjectContainerValue.class)
 public class ItxSubjectContainerValueIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/LabelKindDataOnDemand.java
index 32f703351..367ede51c 100755
--- a/src/test/java/com/labsynch/labseer/domain/LabelKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/LabelKindDataOnDemand.java
@@ -9,12 +9,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Configurable
 @Component
-@RooDataOnDemand(entity = LabelKind.class)
 public class LabelKindDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/LabelKindIntegrationTest.java
index 490a5d1a4..4b45e8ef4 100755
--- a/src/test/java/com/labsynch/labseer/domain/LabelKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/LabelKindIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
 @Configurable
-@RooIntegrationTest(entity = LabelKind.class)
 public class LabelKindIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelSequenceDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/LabelSequenceDataOnDemand.java
index 75a5d3c51..efa971baf 100755
--- a/src/test/java/com/labsynch/labseer/domain/LabelSequenceDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/LabelSequenceDataOnDemand.java
@@ -11,12 +11,10 @@
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Component
 @Configurable
-@RooDataOnDemand(entity = LabelSequence.class)
 public class LabelSequenceDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelSequenceIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/LabelSequenceIntegrationTest.java
index 6fbdad506..303a39f29 100755
--- a/src/test/java/com/labsynch/labseer/domain/LabelSequenceIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/LabelSequenceIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
 @Configurable
-@RooIntegrationTest(entity = LabelSequence.class)
 public class LabelSequenceIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/LabelTypeDataOnDemand.java
index ac4f4c4f7..1c4a197ba 100755
--- a/src/test/java/com/labsynch/labseer/domain/LabelTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/LabelTypeDataOnDemand.java
@@ -8,12 +8,10 @@
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Configurable
 @Component
-@RooDataOnDemand(entity = LabelType.class)
 public class LabelTypeDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/LabelTypeIntegrationTest.java
index 052117b22..462007fad 100755
--- a/src/test/java/com/labsynch/labseer/domain/LabelTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/LabelTypeIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = LabelType.class)
 public class LabelTypeIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/LsInteractionDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/LsInteractionDataOnDemand.java
index a633d2aff..08a0a2360 100755
--- a/src/test/java/com/labsynch/labseer/domain/LsInteractionDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/LsInteractionDataOnDemand.java
@@ -11,12 +11,10 @@
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Component
 @Configurable
-@RooDataOnDemand(entity = LsInteraction.class)
 public class LsInteractionDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/LsInteractionIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/LsInteractionIntegrationTest.java
index a400c50c5..35c91551a 100755
--- a/src/test/java/com/labsynch/labseer/domain/LsInteractionIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/LsInteractionIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
 @Configurable
-@RooIntegrationTest(entity = LsInteraction.class)
 public class LsInteractionIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/LsTransactionDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/LsTransactionDataOnDemand.java
index 533495c79..5fac5938b 100755
--- a/src/test/java/com/labsynch/labseer/domain/LsTransactionDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/LsTransactionDataOnDemand.java
@@ -11,12 +11,10 @@
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Configurable
 @Component
-@RooDataOnDemand(entity = LsTransaction.class)
 public class LsTransactionDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/LsTransactionIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/LsTransactionIntegrationTest.java
index 795540db5..aa1f87969 100755
--- a/src/test/java/com/labsynch/labseer/domain/LsTransactionIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/LsTransactionIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = LsTransaction.class)
 public class LsTransactionIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/OperatorTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/OperatorTypeDataOnDemand.java
index ffa56e68e..e5e31891b 100755
--- a/src/test/java/com/labsynch/labseer/domain/OperatorTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/OperatorTypeDataOnDemand.java
@@ -8,12 +8,10 @@
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Component
 @Configurable
-@RooDataOnDemand(entity = OperatorType.class)
 public class OperatorTypeDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/OperatorTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/OperatorTypeIntegrationTest.java
index 329ced7a6..2909e8ef7 100755
--- a/src/test/java/com/labsynch/labseer/domain/OperatorTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/OperatorTypeIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
 @Configurable
-@RooIntegrationTest(entity = OperatorType.class)
 public class OperatorTypeIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ProtocolDataOnDemand.java
index 7583fb816..fc1075821 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolDataOnDemand.java
@@ -11,12 +11,10 @@
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Configurable
 @Component
-@RooDataOnDemand(entity = Protocol.class)
 public class ProtocolDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ProtocolIntegrationTest.java
index eee2e3b6f..249ad0b32 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = Protocol.class)
 public class ProtocolIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ProtocolKindDataOnDemand.java
index b03bd93c6..e715c0038 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolKindDataOnDemand.java
@@ -9,12 +9,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Component
 @Configurable
-@RooDataOnDemand(entity = ProtocolKind.class)
 public class ProtocolKindDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ProtocolKindIntegrationTest.java
index 2f6930f77..e4230d1d5 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolKindIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = ProtocolKind.class)
 public class ProtocolKindIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolLabelDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ProtocolLabelDataOnDemand.java
index 58af75c68..f111b5f56 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolLabelDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolLabelDataOnDemand.java
@@ -12,12 +12,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Component
 @Configurable
-@RooDataOnDemand(entity = ProtocolLabel.class)
 public class ProtocolLabelDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolLabelIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ProtocolLabelIntegrationTest.java
index f564aa384..6f83565ca 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolLabelIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolLabelIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = ProtocolLabel.class)
 public class ProtocolLabelIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ProtocolStateDataOnDemand.java
index 49a4c6414..d4c01a2f1 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolStateDataOnDemand.java
@@ -12,12 +12,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Configurable
 @Component
-@RooDataOnDemand(entity = ProtocolState.class)
 public class ProtocolStateDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ProtocolStateIntegrationTest.java
index fc72e79f8..135f87657 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolStateIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
 @Configurable
-@RooIntegrationTest(entity = ProtocolState.class)
 public class ProtocolStateIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ProtocolTypeDataOnDemand.java
index cd1810a9b..f884f29db 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolTypeDataOnDemand.java
@@ -8,12 +8,10 @@
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Component
 @Configurable
-@RooDataOnDemand(entity = ProtocolType.class)
 public class ProtocolTypeDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ProtocolTypeIntegrationTest.java
index 2e7f5adf6..5fd0d4155 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolTypeIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = ProtocolType.class)
 public class ProtocolTypeIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ProtocolValueDataOnDemand.java
index 84496a688..e98d2bda9 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolValueDataOnDemand.java
@@ -13,12 +13,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Component
 @Configurable
-@RooDataOnDemand(entity = ProtocolValue.class)
 public class ProtocolValueDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ProtocolValueIntegrationTest.java
index 05d6d38c5..763038c7e 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolValueIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = ProtocolValue.class)
 public class ProtocolValueIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/StateKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/StateKindDataOnDemand.java
index e6a559ce0..e520e8fd0 100755
--- a/src/test/java/com/labsynch/labseer/domain/StateKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/StateKindDataOnDemand.java
@@ -9,12 +9,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Configurable
 @Component
-@RooDataOnDemand(entity = StateKind.class)
 public class StateKindDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/StateKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/StateKindIntegrationTest.java
index 5c47777a2..35b2222e7 100755
--- a/src/test/java/com/labsynch/labseer/domain/StateKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/StateKindIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = StateKind.class)
 public class StateKindIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/StateTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/StateTypeDataOnDemand.java
index b74bbcb1c..2cb9a780c 100755
--- a/src/test/java/com/labsynch/labseer/domain/StateTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/StateTypeDataOnDemand.java
@@ -8,12 +8,10 @@
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Configurable
 @Component
-@RooDataOnDemand(entity = StateType.class)
 public class StateTypeDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/StateTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/StateTypeIntegrationTest.java
index 11013a1f4..929a6f19f 100755
--- a/src/test/java/com/labsynch/labseer/domain/StateTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/StateTypeIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
 @Configurable
-@RooIntegrationTest(entity = StateType.class)
 public class StateTypeIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/SubjectDataOnDemand.java
index c1d576aa2..721b9b4fc 100755
--- a/src/test/java/com/labsynch/labseer/domain/SubjectDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/SubjectDataOnDemand.java
@@ -11,12 +11,10 @@
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Component
 @Configurable
-@RooDataOnDemand(entity = Subject.class)
 public class SubjectDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/SubjectIntegrationTest.java
index 6962cfbb3..6e2da7ace 100755
--- a/src/test/java/com/labsynch/labseer/domain/SubjectIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/SubjectIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = Subject.class)
 public class SubjectIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/SubjectStateDataOnDemand.java
index df8c2009a..e14bfe699 100755
--- a/src/test/java/com/labsynch/labseer/domain/SubjectStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/SubjectStateDataOnDemand.java
@@ -12,12 +12,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Component
 @Configurable
-@RooDataOnDemand(entity = SubjectState.class)
 public class SubjectStateDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/SubjectStateIntegrationTest.java
index b18005802..b50834110 100755
--- a/src/test/java/com/labsynch/labseer/domain/SubjectStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/SubjectStateIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
 @Configurable
-@RooIntegrationTest(entity = SubjectState.class)
 public class SubjectStateIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/SubjectValueDataOnDemand.java
index 01c45ef39..e70faa228 100755
--- a/src/test/java/com/labsynch/labseer/domain/SubjectValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/SubjectValueDataOnDemand.java
@@ -13,12 +13,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Configurable
 @Component
-@RooDataOnDemand(entity = SubjectValue.class)
 public class SubjectValueDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/SubjectValueIntegrationTest.java
index 68a780992..01c0e839a 100755
--- a/src/test/java/com/labsynch/labseer/domain/SubjectValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/SubjectValueIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = SubjectValue.class)
 public class SubjectValueIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ThingKindDataOnDemand.java
index 23563bcdc..e303ec5e2 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingKindDataOnDemand.java
@@ -9,12 +9,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Configurable
 @Component
-@RooDataOnDemand(entity = ThingKind.class)
 public class ThingKindDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ThingKindIntegrationTest.java
index a1a6f82c8..05be64fd6 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingKindIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = ThingKind.class)
 public class ThingKindIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveDataOnDemand.java
index 67c1f6232..f27aef11f 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveDataOnDemand.java
@@ -11,12 +11,10 @@
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Configurable
 @Component
-@RooDataOnDemand(entity = ThingPageArchive.class)
 public class ThingPageArchiveDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveIntegrationTest.java
index 499db5036..439cd5490 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = ThingPageArchive.class)
 public class ThingPageArchiveIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingPageDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ThingPageDataOnDemand.java
index ed8dfb014..26a5c9885 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingPageDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingPageDataOnDemand.java
@@ -12,12 +12,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Configurable
 @Component
-@RooDataOnDemand(entity = ThingPage.class)
 public class ThingPageDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingPageIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ThingPageIntegrationTest.java
index 7ddbe340b..f86430532 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingPageIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingPageIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
 @Configurable
-@RooIntegrationTest(entity = ThingPage.class)
 public class ThingPageIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ThingTypeDataOnDemand.java
index 920111c15..267622775 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingTypeDataOnDemand.java
@@ -8,12 +8,10 @@
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Component
 @Configurable
-@RooDataOnDemand(entity = ThingType.class)
 public class ThingTypeDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ThingTypeIntegrationTest.java
index 0a3f224f3..8780fb715 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingTypeIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
 @Configurable
-@RooIntegrationTest(entity = ThingType.class)
 public class ThingTypeIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupDataOnDemand.java
index 23abcdb36..8d46f10a8 100755
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupDataOnDemand.java
@@ -11,12 +11,10 @@
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Configurable
 @Component
-@RooDataOnDemand(entity = TreatmentGroup.class)
 public class TreatmentGroupDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupIntegrationTest.java
index e77d03d26..864d88a4d 100755
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = TreatmentGroup.class)
 public class TreatmentGroupIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateDataOnDemand.java
index 01d34f6de..b878fe53a 100755
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateDataOnDemand.java
@@ -12,12 +12,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Configurable
 @Component
-@RooDataOnDemand(entity = TreatmentGroupState.class)
 public class TreatmentGroupStateDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateIntegrationTest.java
index 55d5888cc..643010029 100755
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
 @Configurable
-@RooIntegrationTest(entity = TreatmentGroupState.class)
 public class TreatmentGroupStateIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueDataOnDemand.java
index cc71e1ad3..a6fc38b1b 100755
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueDataOnDemand.java
@@ -13,12 +13,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Component
 @Configurable
-@RooDataOnDemand(entity = TreatmentGroupValue.class)
 public class TreatmentGroupValueDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueIntegrationTest.java
index 95e06ee8a..fb762a196 100755
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
 @Configurable
-@RooIntegrationTest(entity = TreatmentGroupValue.class)
 public class TreatmentGroupValueIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/UnitKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/UnitKindDataOnDemand.java
index 44c607e05..28ae0a70f 100755
--- a/src/test/java/com/labsynch/labseer/domain/UnitKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/UnitKindDataOnDemand.java
@@ -9,12 +9,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Component
 @Configurable
-@RooDataOnDemand(entity = UnitKind.class)
 public class UnitKindDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/UnitKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/UnitKindIntegrationTest.java
index 325331257..267d45dce 100755
--- a/src/test/java/com/labsynch/labseer/domain/UnitKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/UnitKindIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = UnitKind.class)
 public class UnitKindIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/UnitTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/UnitTypeDataOnDemand.java
index 5a6c0c8ab..e7e9559ec 100755
--- a/src/test/java/com/labsynch/labseer/domain/UnitTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/UnitTypeDataOnDemand.java
@@ -8,12 +8,10 @@
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Configurable
 @Component
-@RooDataOnDemand(entity = UnitType.class)
 public class UnitTypeDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/UnitTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/UnitTypeIntegrationTest.java
index ffa486cff..9a2865408 100755
--- a/src/test/java/com/labsynch/labseer/domain/UnitTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/UnitTypeIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
 @Configurable
-@RooIntegrationTest(entity = UnitType.class)
 public class UnitTypeIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/UpdateLogDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/UpdateLogDataOnDemand.java
index 299e0b831..1777fdc3a 100755
--- a/src/test/java/com/labsynch/labseer/domain/UpdateLogDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/UpdateLogDataOnDemand.java
@@ -11,12 +11,10 @@
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Configurable
 @Component
-@RooDataOnDemand(entity = UpdateLog.class)
 public class UpdateLogDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/UpdateLogIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/UpdateLogIntegrationTest.java
index 10d7885c1..2b30bf3c4 100755
--- a/src/test/java/com/labsynch/labseer/domain/UpdateLogIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/UpdateLogIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
 @Configurable
-@RooIntegrationTest(entity = UpdateLog.class)
 public class UpdateLogIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ValueKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ValueKindDataOnDemand.java
index 454cca103..f3ab78a0e 100755
--- a/src/test/java/com/labsynch/labseer/domain/ValueKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ValueKindDataOnDemand.java
@@ -9,12 +9,10 @@
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Configurable
 @Component
-@RooDataOnDemand(entity = ValueKind.class)
 public class ValueKindDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ValueKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ValueKindIntegrationTest.java
index d65b05571..8c1dfdd2a 100755
--- a/src/test/java/com/labsynch/labseer/domain/ValueKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ValueKindIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
-@RooIntegrationTest(entity = ValueKind.class)
 public class ValueKindIntegrationTest {
 
     @Test
diff --git a/src/test/java/com/labsynch/labseer/domain/ValueTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ValueTypeDataOnDemand.java
index 255a42726..c62c6dd72 100755
--- a/src/test/java/com/labsynch/labseer/domain/ValueTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ValueTypeDataOnDemand.java
@@ -8,12 +8,10 @@
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.dod.RooDataOnDemand;
 import org.springframework.stereotype.Component;
 
 @Component
 @Configurable
-@RooDataOnDemand(entity = ValueType.class)
 public class ValueTypeDataOnDemand {
 
 	private Random rnd = new SecureRandom();
diff --git a/src/test/java/com/labsynch/labseer/domain/ValueTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ValueTypeIntegrationTest.java
index b101d82d8..3113a0768 100755
--- a/src/test/java/com/labsynch/labseer/domain/ValueTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ValueTypeIntegrationTest.java
@@ -9,7 +9,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.roo.addon.test.RooIntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +17,6 @@
 @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml")
 @Transactional
 @Configurable
-@RooIntegrationTest(entity = ValueType.class)
 public class ValueTypeIntegrationTest {
 
     @Test

From 7ae53d47d16b07de88a7e325ca3c194e24c27a9c Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Fri, 29 Apr 2022 09:02:50 -0700
Subject: [PATCH 56/73] Remove uiModel methods

---
 .../labseer/api/ApiIsotopeController.java     |  63 --------
 .../labseer/api/ApiMetalotController.java     |  16 --
 .../api/ApiPhysicalStateController.java       |  63 --------
 .../labseer/api/ApiSaltController.java        |  49 ------
 .../api/ApiSolutionUnitController.java        | 143 ------------------
 5 files changed, 334 deletions(-)

diff --git a/src/main/java/com/labsynch/labseer/api/ApiIsotopeController.java b/src/main/java/com/labsynch/labseer/api/ApiIsotopeController.java
index da6f86221..f80d742c8 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiIsotopeController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiIsotopeController.java
@@ -35,69 +35,6 @@ public class ApiIsotopeController {
 	
     private static final Logger logger = LoggerFactory.getLogger(ApiIsotopeController.class);
 
-    @RequestMapping(method = RequestMethod.POST)
-    public String create(@Valid Isotope isotope, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            uiModel.addAttribute("isotope", isotope);
-            return "isotopes/create";
-        }
-        uiModel.asMap().clear();
-        isotope.persist();
-        return "redirect:/isotopes/" + encodeUrlPathSegment(isotope.getId().toString(), httpServletRequest);
-    }
-
-    @RequestMapping(params = "form", method = RequestMethod.GET)
-    public String createForm(Model uiModel) {
-        uiModel.addAttribute("isotope", new Isotope());
-        return "isotopes/create";
-    }
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
-    public String show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("isotope", Isotope.findIsotope(id));
-        uiModel.addAttribute("itemId", id);
-        return "isotopes/show";
-    }
-
-    @RequestMapping(method = RequestMethod.GET)
-    public String list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            uiModel.addAttribute("isotopes", Isotope.findIsotopeEntries(page == null ? 0 : (page.intValue() - 1) * sizeNo, sizeNo));
-            float nrOfPages = (float) Isotope.countIsotopes() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("isotopes", Isotope.findAllIsotopes());
-        }
-        return "isotopes/list";
-    }
-
-    @RequestMapping(method = RequestMethod.PUT)
-    public String update(@Valid Isotope isotope, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            uiModel.addAttribute("isotope", isotope);
-            return "isotopes/update";
-        }
-        uiModel.asMap().clear();
-        isotope.merge();
-        return "redirect:/isotopes/" + encodeUrlPathSegment(isotope.getId().toString(), httpServletRequest);
-    }
-
-    @RequestMapping(value = "/{id}", params = "form", method = RequestMethod.GET)
-    public String updateForm(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("isotope", Isotope.findIsotope(id));
-        return "isotopes/update";
-    }
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-    public String delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        Isotope.findIsotope(id).remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/isotopes";
-    }
-
     @ModelAttribute("isotopes")
     public Collection<Isotope> populateIsotopes() {
         return Isotope.findAllIsotopes();
diff --git a/src/main/java/com/labsynch/labseer/api/ApiMetalotController.java b/src/main/java/com/labsynch/labseer/api/ApiMetalotController.java
index b552a1f70..cb932a557 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiMetalotController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiMetalotController.java
@@ -212,22 +212,6 @@ public ResponseEntity<String> jsonFindMetalotsByCorpNameParam(@RequestParam("cor
 		return new ResponseEntity<String>(metaLot.toJson(), headers, HttpStatus.OK);
 	}
 
-
-	@Transactional
-	@RequestMapping(params = "find=ByCorpNameEquals", method = RequestMethod.GET)
-	public String findMetalotsByCorpNameEqualsForm(@RequestParam("corpName") String corpName, Model uiModel) {
-		uiModel.addAttribute("metalots", Parent.findParentsByCorpNameEquals(corpName).getResultList());
-		return "metalots/list";
-	}
-
-	@Transactional
-	@RequestMapping(params = "find=ByCorpNameLike", method = RequestMethod.GET)
-	public String findParentsByCorpNameLike(@RequestParam("corpName") String corpName, Model uiModel) {
-		uiModel.addAttribute("parents", Parent.findParentsByCorpNameLike(corpName).getResultList());
-		return "metalots/list";
-	}
-
-
 	String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
 		String enc = httpServletRequest.getCharacterEncoding();
 		if (enc == null) {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiPhysicalStateController.java b/src/main/java/com/labsynch/labseer/api/ApiPhysicalStateController.java
index 773d16755..1cf3174c2 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiPhysicalStateController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiPhysicalStateController.java
@@ -35,69 +35,6 @@ public class ApiPhysicalStateController {
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
 
-    @RequestMapping(method = RequestMethod.POST)
-    public String create(@Valid PhysicalState physicalState, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            uiModel.addAttribute("physicalState", physicalState);
-            return "physicalstates/create";
-        }
-        uiModel.asMap().clear();
-        physicalState.persist();
-        return "redirect:/physicalstates/" + encodeUrlPathSegment(physicalState.getId().toString(), httpServletRequest);
-    }
-
-    @RequestMapping(params = "form", method = RequestMethod.GET)
-    public String createForm(Model uiModel) {
-        uiModel.addAttribute("physicalState", new PhysicalState());
-        return "physicalstates/create";
-    }
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
-    public String show(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("physicalstate", PhysicalState.findPhysicalState(id));
-        uiModel.addAttribute("itemId", id);
-        return "physicalstates/show";
-    }
-
-    @RequestMapping(method = RequestMethod.GET)
-    public String list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            uiModel.addAttribute("physicalstates", PhysicalState.findPhysicalStateEntries(page == null ? 0 : (page.intValue() - 1) * sizeNo, sizeNo));
-            float nrOfPages = (float) PhysicalState.countPhysicalStates() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("physicalstates", PhysicalState.findAllPhysicalStates());
-        }
-        return "physicalstates/list";
-    }
-
-    @RequestMapping(method = RequestMethod.PUT)
-    public String update(@Valid PhysicalState physicalState, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            uiModel.addAttribute("physicalState", physicalState);
-            return "physicalstates/update";
-        }
-        uiModel.asMap().clear();
-        physicalState.merge();
-        return "redirect:/physicalstates/" + encodeUrlPathSegment(physicalState.getId().toString(), httpServletRequest);
-    }
-
-    @RequestMapping(value = "/{id}", params = "form", method = RequestMethod.GET)
-    public String updateForm(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("physicalState", PhysicalState.findPhysicalState(id));
-        return "physicalstates/update";
-    }
-
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-    public String delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        PhysicalState.findPhysicalState(id).remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/physicalstates";
-    }
-
     @ModelAttribute("physicalstates")
     public Collection<PhysicalState> populatePhysicalStates() {
         return PhysicalState.findAllPhysicalStates();
diff --git a/src/main/java/com/labsynch/labseer/api/ApiSaltController.java b/src/main/java/com/labsynch/labseer/api/ApiSaltController.java
index 16c583d75..a8815b6e8 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiSaltController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSaltController.java
@@ -73,24 +73,6 @@ public ResponseEntity<String> loadSalts(
 
 	}
 
-	@RequestMapping(method = RequestMethod.POST)
-	public String create(@Valid Salt salt, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) throws CmpdRegMolFormatException {
-		if (bindingResult.hasErrors()) {
-			uiModel.addAttribute("salt", salt);
-			return "salts/create";
-		}
-		uiModel.asMap().clear();
-		salt = saltStructureService.saveStructure(salt);
-		if (salt.getCdId() > 0 && salt.getCdId() != -1) {
-			salt.persist();
-			return "redirect:/salts/" + encodeUrlPathSegment(salt.getId().toString(), httpServletRequest);
-		} else {
-			//remove the salt from the Salt_Structure table??
-			uiModel.addAttribute("salt", salt);
-			return "salts/create";
-		}
-	}
-
 	@ModelAttribute("salts")
 	public Collection<Salt> populateSalts() {
 		return Salt.findAllSalts();
@@ -205,37 +187,6 @@ public ResponseEntity<String> createFromJson(@RequestBody String json) throws Cm
 	// 	return new ResponseEntity<String>(headers, HttpStatus.OK);
 	// }
 
-	@RequestMapping(method = RequestMethod.PUT)
-	public String update(@Valid Salt salt, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-		if (bindingResult.hasErrors()) {
-			uiModel.addAttribute("salt", salt);
-			return "salts/update";
-		}
-		uiModel.asMap().clear();
-		try {
-			logger.debug("Salt weight: " + chemStructureService.getMolWeight(salt.getMolStructure()));
-		} catch (CmpdRegMolFormatException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
-		Salt updatedSalt = null;
-		try{
-			updatedSalt = saltStructureService.update(salt);
-		}catch (CmpdRegMolFormatException e) {
-			logger.error("Bad mol format",e);
-			updatedSalt = null;
-		}
-		ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
-		if (updatedSalt == null) {
-			ErrorMessage error = new ErrorMessage();
-			error.setLevel("error");
-			error.setMessage("Bad molformat. Please fix the molfile: " + salt.getMolStructure());
-			errors.add(error);
-			return "redirect:/salts/";
-		}
-		return "redirect:/salts/" + encodeUrlPathSegment(salt.getId().toString(), httpServletRequest);
-	}
-
 	@RequestMapping(method = RequestMethod.PUT, headers = "Accept=application/json")
 	public ResponseEntity<String> updateFromJson(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
diff --git a/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java b/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java
index f68835be1..73b2c82b4 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java
@@ -224,149 +224,6 @@ public Map<String, Object> getPropertyMap(SolutionUnit SolutionUnit, Enumeration
         return propertyValuesMap;
     }
 
-	@ResponseBody
-    @RequestMapping(headers = "Accept=application/json", params = "getColumnType")
-    public String getColumnType(Model uiModel, HttpServletRequest request, @RequestParam(value = "_columnName_", required = false) String columnName) {
-        // Getting all declared fields
-        boolean fieldExists = false;
-        Field attr = null;
-        for(Field field : SolutionUnit.class.getDeclaredFields()){
-            if(field.getName().equals(columnName)){
-                attr = field;
-                fieldExists = true;
-                break;
-            }
-        }
-        // If current field not exists on entity, find on superclass
-        if(!fieldExists){
-            if(SolutionUnit.class.getSuperclass() != null){
-                for(Field field : SolutionUnit.class.getSuperclass().getDeclaredFields()){
-                    if(field.getName().equals(columnName)){
-                        attr = field;
-                        fieldExists = true;
-                        break;
-                    }
-                }
-            }
-        }
-        if(fieldExists){
-            // Getting field type
-            Object fieldType = null;
-            if (attr != null) {
-                fieldType = attr.getType();
-                String type = fieldType.toString();
-                // Returning value based on type
-                if ("String".equals(type)){
-                    return "{\"columnType\": \"string\"}";
-                } else if ("float".equals(type) || type.contains("Float")){
-                    return "{\"columnType\": \"number\"}";
-                } else if ("short".equals(type) || type.contains("Short")){
-                    return "{\"columnType\": \"number\"}";
-                } else if ("long".equals(type) || type.contains("Long")){
-                    return "{\"columnType\": \"number\"}";
-                } else if ("double".equals(type) || type.contains("Double")){
-                    return "{\"columnType\": \"number\"}";
-                } else if ("int".equals(type) || type.contains("Integer")){
-                    return "{\"columnType\": \"number\"}";
-                } else if ("Date".equals(type)){
-                    return "{\"columnType\": \"date\"}";
-                } else if ("boolean".equals(type) || type.contains("Boolean")){
-                    return "{\"columnType\": \"boolean\"}";
-                } else {
-                    // Returning by default
-                    return "{\"columnType\": \"undefined\"}";
-                }
-            }
-        }
-        // Returning by default
-        return "{\"columnType\": \"undefined\"}";
-    }
-
-	@ResponseBody
-    @RequestMapping(headers = "Accept=application/json", params = "geti18nText")
-    public String geti18nText(Model uiModel, HttpServletRequest request, @RequestParam(value = "_locale_", required = false) String locale) {
-        // Getting current locale
-        Locale defaultLocale = new Locale(locale);
-        // Building JSON response
-        StringBuilder json = new StringBuilder();
-        json.append("\"all_isnull\": \"" + messageSource_dtt.getMessage("global.filters.operations.all.isnull", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"all_notnull\": \"" + messageSource_dtt.getMessage("global.filters.operations.all.notnull", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"boolean_false\": \"" + messageSource_dtt.getMessage("global.filters.operations.boolean.false", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"boolean_true\": \"" + messageSource_dtt.getMessage("global.filters.operations.boolean.true", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"date_between\": \"" + messageSource_dtt.getMessage("global.filters.operations.date.between", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"date_date\": \"" + messageSource_dtt.getMessage("global.filters.operations.date.date", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"date_day\": \"" + messageSource_dtt.getMessage("global.filters.operations.date.day", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"date_month\": \"" + messageSource_dtt.getMessage("global.filters.operations.date.month", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"date_year\": \"" + messageSource_dtt.getMessage("global.filters.operations.date.year", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"number_between\": \"" + messageSource_dtt.getMessage("global.filters.operations.number.between", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"string_contains\": \"" + messageSource_dtt.getMessage("global.filters.operations.string.contains", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"string_ends\": \"" + messageSource_dtt.getMessage("global.filters.operations.string.ends", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"string_isempty\": \"" + messageSource_dtt.getMessage("global.filters.operations.string.isempty", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"string_isnotempty\": \"" + messageSource_dtt.getMessage("global.filters.operations.string.isnotempty", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"string_starts\": \"" + messageSource_dtt.getMessage("global.filters.operations.string.starts", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"button_find\": \"" + messageSource_dtt.getMessage("button_find", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"help_all_isnull\": \"" + messageSource_dtt.getMessage("help.all.isnull", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"help_all_notnull\": \"" + messageSource_dtt.getMessage("help.all.notnull", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"help_boolean_false\": \"" + messageSource_dtt.getMessage("help.boolean.false", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"help_boolean_true\": \"" + messageSource_dtt.getMessage("help.boolean.true", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"help_date_between\": \"" + messageSource_dtt.getMessage("help.date.between", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"help_date_date\": \"" + messageSource_dtt.getMessage("help.date.date", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"help_date_day\": \"" + messageSource_dtt.getMessage("help.date.day", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"help_date_month\": \"" + messageSource_dtt.getMessage("help.date.month", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"help_date_year\": \"" + messageSource_dtt.getMessage("help.date.year", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"help_number_between\": \"" + messageSource_dtt.getMessage("help.number.between", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"help_number_eq\": \"" + messageSource_dtt.getMessage("help.number.eq", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"help_number_neq\": \"" + messageSource_dtt.getMessage("help.number.neq", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"help_number_gt\": \"" + messageSource_dtt.getMessage("help.number.gt", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"help_number_lt\": \"" + messageSource_dtt.getMessage("help.number.lt", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"help_number_goe\": \"" + messageSource_dtt.getMessage("help.number.goe", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"help_number_loe\": \"" + messageSource_dtt.getMessage("help.number.loe", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"help_string_contains\": \"" + messageSource_dtt.getMessage("help.string.contains", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"help_string_ends\": \"" + messageSource_dtt.getMessage("help.string.ends", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"help_string_isempty\": \"" + messageSource_dtt.getMessage("help.string.isempty", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"help_string_isnotempty\": \"" + messageSource_dtt.getMessage("help.string.isnotempty", null, defaultLocale) + "\"");
-        json.append(",");
-        json.append("\"help_string_starts\": \"" + messageSource_dtt.getMessage("help.string.starts", null, defaultLocale) + "\"");
-        json.append("}");
-        // return JSON with locale strings
-        return json.toString();
-    }
-
 	public List<SolutionUnit> findSolutionUnitsByParameters(SolutionUnit SolutionUnit, Enumeration<Map<String, String>> propertyNames) {
         // Gets propertyMap
         Map<String, Object> propertyMap = getPropertyMap(SolutionUnit, propertyNames);

From efb6a1b305f25eb75f05de8a75f2423f0a2aec9f Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Fri, 29 Apr 2022 09:04:24 -0700
Subject: [PATCH 57/73] Remove encodeUrlPathSegment methods

---
 .../labsynch/labseer/api/ApiFileSaveController.java   | 11 -----------
 .../labsynch/labseer/api/ApiIsotopeController.java    |  9 ---------
 .../labsynch/labseer/api/ApiMetalotController.java    |  9 ---------
 .../labseer/api/ApiPhysicalStateController.java       |  9 ---------
 .../labsynch/labseer/api/ApiRegSearchController.java  | 11 -----------
 .../com/labsynch/labseer/api/ApiSaltController.java   |  9 ---------
 6 files changed, 58 deletions(-)

diff --git a/src/main/java/com/labsynch/labseer/api/ApiFileSaveController.java b/src/main/java/com/labsynch/labseer/api/ApiFileSaveController.java
index aa98d29a4..4a4135ddb 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiFileSaveController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiFileSaveController.java
@@ -179,17 +179,6 @@ public String showdoc(	@PathVariable("id") Long id,
 		return null;
 	}
 
-
-
-	String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-		String enc = httpServletRequest.getCharacterEncoding();
-		if (enc == null) {
-			enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-		}
-		pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-		return pathSegment;
-	}
-
 	@RequestMapping(method = RequestMethod.OPTIONS)
 	public ResponseEntity<String> getOptions() {
 		HttpHeaders headers= new HttpHeaders();
diff --git a/src/main/java/com/labsynch/labseer/api/ApiIsotopeController.java b/src/main/java/com/labsynch/labseer/api/ApiIsotopeController.java
index f80d742c8..aebee6dc9 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiIsotopeController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiIsotopeController.java
@@ -40,15 +40,6 @@ public Collection<Isotope> populateIsotopes() {
         return Isotope.findAllIsotopes();
     }
 
-    String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-
     @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiMetalotController.java b/src/main/java/com/labsynch/labseer/api/ApiMetalotController.java
index cb932a557..ae55a1cd4 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiMetalotController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiMetalotController.java
@@ -212,15 +212,6 @@ public ResponseEntity<String> jsonFindMetalotsByCorpNameParam(@RequestParam("cor
 		return new ResponseEntity<String>(metaLot.toJson(), headers, HttpStatus.OK);
 	}
 
-	String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-		String enc = httpServletRequest.getCharacterEncoding();
-		if (enc == null) {
-			enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-		}
-		pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-		return pathSegment;
-	}
-
 	@RequestMapping(method = RequestMethod.OPTIONS)
 	public ResponseEntity<String> getOptions() {
 		HttpHeaders headers= new HttpHeaders();
diff --git a/src/main/java/com/labsynch/labseer/api/ApiPhysicalStateController.java b/src/main/java/com/labsynch/labseer/api/ApiPhysicalStateController.java
index 1cf3174c2..fd9712249 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiPhysicalStateController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiPhysicalStateController.java
@@ -40,15 +40,6 @@ public Collection<PhysicalState> populatePhysicalStates() {
         return PhysicalState.findAllPhysicalStates();
     }
 
-    String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-        String enc = httpServletRequest.getCharacterEncoding();
-        if (enc == null) {
-            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-        }
-        pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-        return pathSegment;
-    }
-
     @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiRegSearchController.java b/src/main/java/com/labsynch/labseer/api/ApiRegSearchController.java
index 493cfac44..542fd5bc2 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiRegSearchController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiRegSearchController.java
@@ -33,17 +33,6 @@ public class ApiRegSearchController {
 	
 	Logger logger = LoggerFactory.getLogger(ApiRegSearchController.class);
 
-
-	String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-		String enc = httpServletRequest.getCharacterEncoding();
-		if (enc == null) {
-			enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-		}
-		pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-		return pathSegment;
-	}
-
-
 	@RequestMapping(value = "/parent", method = RequestMethod.POST, headers = "Accept=application/json")
 	public ResponseEntity<String> getParentsbyParamsPost(@RequestBody String searchParams) {
 		logger.debug("using the /regsearches/parent controller" );
diff --git a/src/main/java/com/labsynch/labseer/api/ApiSaltController.java b/src/main/java/com/labsynch/labseer/api/ApiSaltController.java
index a8815b6e8..d191a52a9 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiSaltController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSaltController.java
@@ -78,15 +78,6 @@ public Collection<Salt> populateSalts() {
 		return Salt.findAllSalts();
 	}
 
-	String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
-		String enc = httpServletRequest.getCharacterEncoding();
-		if (enc == null) {
-			enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
-		}
-		pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
-		return pathSegment;
-	}
-
 	@RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	public ResponseEntity<String> showJson(@PathVariable("id") Long id) {

From 6fcfba2e586c18448f7a85f13e7f06f99b20e184 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Fri, 29 Apr 2022 09:06:10 -0700
Subject: [PATCH 58/73] Remove get options methods

---
 .../labseer/api/ApiAliasNameController.java   | 13 ----------
 .../labseer/api/ApiCmpdSearchController.java  | 12 ---------
 .../labseer/api/ApiFileSaveController.java    | 26 -------------------
 .../labseer/api/ApiMetalotController.java     | 12 ---------
 .../labseer/api/ApiPreferredIdController.java | 12 ---------
 .../api/ApiPurityMeasuredByController.java    | 12 ---------
 .../labseer/api/ApiRegSearchController.java   | 12 ---------
 .../labseer/api/ApiSearchFormController.java  | 15 -----------
 .../api/ApiSolutionUnitController.java        | 12 ---------
 .../ApiStandardizationServicesController.java | 13 ----------
 .../api/ApiStereoCategoryController.java      | 12 ---------
 .../api/ApiStructureServicesController.java   | 13 ----------
 .../labseer/api/ApiVendorController.java      | 12 ---------
 .../api/RegisterCompoundsController.java      | 14 ----------
 14 files changed, 190 deletions(-)

diff --git a/src/main/java/com/labsynch/labseer/api/ApiAliasNameController.java b/src/main/java/com/labsynch/labseer/api/ApiAliasNameController.java
index 62c79f876..f2e826bd4 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiAliasNameController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiAliasNameController.java
@@ -63,19 +63,6 @@ public ResponseEntity<String> getParentsByAliasName(@RequestBody String json){
 		return new ResponseEntity<String>(ParentAliasDTO.toJsonArray(aliasNameDTOs), headers, HttpStatus.OK);
 	}
 	
-
-	@RequestMapping(method = RequestMethod.OPTIONS)
-	public ResponseEntity<String> getOptions() {
-		HttpHeaders headers= new HttpHeaders();
-		headers.add("Content-Type", "application/text");
-		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
-		headers.setExpires(0); // Expire the cache
-		return new ResponseEntity<String>(headers, HttpStatus.OK);
-	}
-	
 	@Transactional
 	@RequestMapping(value = "/parentAliasTypes", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
diff --git a/src/main/java/com/labsynch/labseer/api/ApiCmpdSearchController.java b/src/main/java/com/labsynch/labseer/api/ApiCmpdSearchController.java
index febbdcc39..8b63389d9 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiCmpdSearchController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiCmpdSearchController.java
@@ -145,16 +145,4 @@ public ResponseEntity<String> searchStructuresForm (
 		}
 	}
 
-	@RequestMapping(method = RequestMethod.OPTIONS)
-	public ResponseEntity<String> getOptions() {
-		HttpHeaders headers= new HttpHeaders();
-		headers.add("Content-Type", "application/text");
-		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
-		headers.setExpires(0); // Expire the cache
-		return new ResponseEntity<String>(headers, HttpStatus.OK);
-	}
-
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiFileSaveController.java b/src/main/java/com/labsynch/labseer/api/ApiFileSaveController.java
index 4a4135ddb..745e62ad9 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiFileSaveController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiFileSaveController.java
@@ -179,30 +179,4 @@ public String showdoc(	@PathVariable("id") Long id,
 		return null;
 	}
 
-	@RequestMapping(method = RequestMethod.OPTIONS)
-	public ResponseEntity<String> getOptions() {
-		HttpHeaders headers= new HttpHeaders();
-		headers.add("Content-Type", "application/text, text/html");
-		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
-		headers.setExpires(0); // Expire the cache
-
-		return new ResponseEntity<String>(headers, HttpStatus.OK);
-	}
-
-
-//	public static String getFileName(String fullUrl) {
-//		fullUrl = fullUrl.trim();
-//		String pattern = "(/.*$)";
-//		String fileName = fullUrl.replace(pattern, "$0");
-//
-//		return fileName;
-//	}
-
-
-
-
-	
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiMetalotController.java b/src/main/java/com/labsynch/labseer/api/ApiMetalotController.java
index ae55a1cd4..782733258 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiMetalotController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiMetalotController.java
@@ -212,16 +212,4 @@ public ResponseEntity<String> jsonFindMetalotsByCorpNameParam(@RequestParam("cor
 		return new ResponseEntity<String>(metaLot.toJson(), headers, HttpStatus.OK);
 	}
 
-	@RequestMapping(method = RequestMethod.OPTIONS)
-	public ResponseEntity<String> getOptions() {
-		HttpHeaders headers= new HttpHeaders();
-		headers.add("Content-Type", "application/text");
-		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
-		headers.setExpires(0); // Expire the cache
-
-		return new ResponseEntity<String>(headers, HttpStatus.OK);
-	}
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiPreferredIdController.java b/src/main/java/com/labsynch/labseer/api/ApiPreferredIdController.java
index 7ef44035b..65f8d9d81 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiPreferredIdController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiPreferredIdController.java
@@ -67,16 +67,4 @@ public ResponseEntity<String> checkCorpNameExists(@RequestParam String requestNa
 		return new ResponseEntity<String>(PreferredNameDTO.toJsonArray(preferredNameDTOs), headers, HttpStatus.OK);
 	}
 
-	@RequestMapping(method = RequestMethod.OPTIONS)
-	public ResponseEntity<String> getOptions() {
-		HttpHeaders headers= new HttpHeaders();
-		headers.add("Content-Type", "application/text");
-		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
-		headers.setExpires(0); // Expire the cache
-		return new ResponseEntity<String>(headers, HttpStatus.OK);
-	}
-
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiPurityMeasuredByController.java b/src/main/java/com/labsynch/labseer/api/ApiPurityMeasuredByController.java
index 14b7a275b..9b3bc1582 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiPurityMeasuredByController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiPurityMeasuredByController.java
@@ -128,16 +128,4 @@ public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
 	
-	
-	@RequestMapping(method = RequestMethod.OPTIONS)
-    public ResponseEntity<String> getOptions() {
-        HttpHeaders headers= new HttpHeaders();
-        headers.add("Content-Type", "application/text, text/html");
-        headers.add("Access-Control-Allow-Headers", "Content-Type");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Access-Control-Max-Age", "86400");
-        
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-    
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiRegSearchController.java b/src/main/java/com/labsynch/labseer/api/ApiRegSearchController.java
index 542fd5bc2..2b4db2c67 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiRegSearchController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiRegSearchController.java
@@ -78,16 +78,4 @@ public ResponseEntity<String> getParentsbyParams(@RequestParam String searchPara
 
 		return new ResponseEntity<String>(regSearchDTO.toJson(), headers, HttpStatus.OK);
 	}
-
-
-	@RequestMapping(method = RequestMethod.OPTIONS)
-	public ResponseEntity<String> getOptions() {
-		HttpHeaders headers= new HttpHeaders();
-		headers.add("Content-Type", "application/text, text/html");
-		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Access-Control-Max-Age", "86400");
-
-		return new ResponseEntity<String>(headers, HttpStatus.OK);
-	}
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiSearchFormController.java b/src/main/java/com/labsynch/labseer/api/ApiSearchFormController.java
index 12da98b0e..fcaa3f47f 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiSearchFormController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSearchFormController.java
@@ -114,19 +114,4 @@ public ResponseEntity<String> searchCmpdsByParamsPost(@RequestBody String search
 			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.INTERNAL_SERVER_ERROR); 
 		}	
 	}
-
-
-	@RequestMapping(method = RequestMethod.OPTIONS)
-	public ResponseEntity<String> getOptions() {
-		HttpHeaders headers= new HttpHeaders();
-		headers.add("Content-Type", "application/text");
-		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
-		headers.setExpires(0); // Expire the cache
-		return new ResponseEntity<String>(headers, HttpStatus.OK);
-	}
-
-
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java b/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java
index 73b2c82b4..3cc062061 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java
@@ -146,18 +146,6 @@ public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
 
-    @RequestMapping(method = RequestMethod.OPTIONS)
-    public ResponseEntity<String> getOptions() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text");
-        headers.add("Access-Control-Allow-Headers", "Content-Type");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
-        headers.setExpires(0); // Expire the cache
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-
 	@Autowired
     public ConversionService conversionService_dtt;
 
diff --git a/src/main/java/com/labsynch/labseer/api/ApiStandardizationServicesController.java b/src/main/java/com/labsynch/labseer/api/ApiStandardizationServicesController.java
index bd06368bb..6dfeb71fa 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiStandardizationServicesController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiStandardizationServicesController.java
@@ -195,17 +195,4 @@ public ResponseEntity<String> getDryRunStats() throws StandardizerException{
 		return new ResponseEntity<String>(dryRunStats, headers, HttpStatus.OK);
 	}
 
-	@RequestMapping(method = RequestMethod.OPTIONS)
-	public ResponseEntity<String> getOptions() {
-		HttpHeaders headers= new HttpHeaders();
-		headers.add("Content-Type", "application/text");
-		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
-		headers.setExpires(0); // Expire the cache
-		return new ResponseEntity<String>(headers, HttpStatus.OK);
-	}
-
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/api/ApiStereoCategoryController.java b/src/main/java/com/labsynch/labseer/api/ApiStereoCategoryController.java
index 6b16f41c7..dd7153698 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiStereoCategoryController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiStereoCategoryController.java
@@ -276,16 +276,4 @@ public ResponseEntity<String> searchBySearchTerms(@RequestParam(value="searchTer
 		return new ResponseEntity<String>(StereoCategory.toJsonArray(StereoCategory.findStereoCategoriesBySearchTerm(searchTerm).getResultList()), headers, HttpStatus.OK);
 	}	
 
-	@RequestMapping(method = RequestMethod.OPTIONS)
-	public ResponseEntity<String> getOptions() {
-		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/text");
-		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
-		headers.setExpires(0); // Expire the cache
-		return new ResponseEntity<String>(headers, HttpStatus.OK);
-	}	 
-
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiStructureServicesController.java b/src/main/java/com/labsynch/labseer/api/ApiStructureServicesController.java
index d033e7dce..c4072963c 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiStructureServicesController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiStructureServicesController.java
@@ -148,17 +148,4 @@ public ResponseEntity<String> cipStereoInfo(@RequestBody String json){
 		return new ResponseEntity<String>(output, headers, HttpStatus.OK);
 	}
 	
-	@RequestMapping(method = RequestMethod.OPTIONS)
-	public ResponseEntity<String> getOptions() {
-		HttpHeaders headers= new HttpHeaders();
-		headers.add("Content-Type", "application/text");
-		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
-		headers.setExpires(0); // Expire the cache
-		return new ResponseEntity<String>(headers, HttpStatus.OK);
-	}
-	
-
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiVendorController.java b/src/main/java/com/labsynch/labseer/api/ApiVendorController.java
index de6906838..a6c14c560 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiVendorController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiVendorController.java
@@ -281,16 +281,4 @@ public ResponseEntity<String> searchBySearchTerms(@RequestParam(value="searchTer
 		return new ResponseEntity<String>(Vendor.toJsonArray(Vendor.findVendorsBySearchTerm(searchTerm).getResultList()), headers, HttpStatus.OK);
 	}	
 
-	@RequestMapping(method = RequestMethod.OPTIONS)
-	public ResponseEntity<String> getOptions() {
-		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/text");
-		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
-		headers.setExpires(0); // Expire the cache
-		return new ResponseEntity<String>(headers, HttpStatus.OK);
-	}	 
-
 }
diff --git a/src/main/java/com/labsynch/labseer/api/RegisterCompoundsController.java b/src/main/java/com/labsynch/labseer/api/RegisterCompoundsController.java
index 007d3bc3c..84243e3d1 100755
--- a/src/main/java/com/labsynch/labseer/api/RegisterCompoundsController.java
+++ b/src/main/java/com/labsynch/labseer/api/RegisterCompoundsController.java
@@ -64,18 +64,4 @@ public ResponseEntity<String> searchCmpdsByParamsPost(
 //        curl -i -X POST -H "Accept: application/json" 'http://localhost:8080/cmpdreg/api/v1/registration/cmpds?inputFileName=/tmp/spark1.sdf&errorFileName=/tmp/spark1_errorMols.sdf&compoundAlias=ALIAS&supplierId=VENDORCATNO&project=PROJECT&supplier=IGNYTA&notebook=NOTEBOOK&stereoCategory=unknown&compoundChemist=CHEMIST&compoundChemistCode=chemadmin'        
 	}
 
-
-	@RequestMapping(method = RequestMethod.OPTIONS)
-	public ResponseEntity<String> getOptions() {
-		HttpHeaders headers= new HttpHeaders();
-		headers.add("Content-Type", "application/text");
-		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
-		headers.setExpires(0); // Expire the cache
-		return new ResponseEntity<String>(headers, HttpStatus.OK);
-	}
-
-
 }

From 34fd002da1bc520469f712a01da2ba31aa191e70 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Fri, 29 Apr 2022 09:09:00 -0700
Subject: [PATCH 59/73] Remove populateX methods

---
 .../java/com/labsynch/labseer/api/ApiIsotopeController.java  | 5 -----
 .../com/labsynch/labseer/api/ApiPhysicalStateController.java | 4 ----
 .../java/com/labsynch/labseer/api/ApiSaltController.java     | 5 -----
 3 files changed, 14 deletions(-)

diff --git a/src/main/java/com/labsynch/labseer/api/ApiIsotopeController.java b/src/main/java/com/labsynch/labseer/api/ApiIsotopeController.java
index aebee6dc9..bc4d0f025 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiIsotopeController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiIsotopeController.java
@@ -35,11 +35,6 @@ public class ApiIsotopeController {
 	
     private static final Logger logger = LoggerFactory.getLogger(ApiIsotopeController.class);
 
-    @ModelAttribute("isotopes")
-    public Collection<Isotope> populateIsotopes() {
-        return Isotope.findAllIsotopes();
-    }
-
     @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiPhysicalStateController.java b/src/main/java/com/labsynch/labseer/api/ApiPhysicalStateController.java
index fd9712249..403977dc3 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiPhysicalStateController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiPhysicalStateController.java
@@ -35,10 +35,6 @@ public class ApiPhysicalStateController {
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
 
-    @ModelAttribute("physicalstates")
-    public Collection<PhysicalState> populatePhysicalStates() {
-        return PhysicalState.findAllPhysicalStates();
-    }
 
     @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
diff --git a/src/main/java/com/labsynch/labseer/api/ApiSaltController.java b/src/main/java/com/labsynch/labseer/api/ApiSaltController.java
index d191a52a9..b188c04cb 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiSaltController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSaltController.java
@@ -73,11 +73,6 @@ public ResponseEntity<String> loadSalts(
 
 	}
 
-	@ModelAttribute("salts")
-	public Collection<Salt> populateSalts() {
-		return Salt.findAllSalts();
-	}
-
 	@RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	public ResponseEntity<String> showJson(@PathVariable("id") Long id) {

From 6aea356e6fe2f710509b2b50549f6c72ecc4558b Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Fri, 29 Apr 2022 09:10:23 -0700
Subject: [PATCH 60/73] Remove unused autowired services conversionService_dtt,
 messageSource_dtt

---
 .../com/labsynch/labseer/api/ApiSolutionUnitController.java | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java b/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java
index 3cc062061..14946f506 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java
@@ -146,12 +146,6 @@ public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
 
-	@Autowired
-    public ConversionService conversionService_dtt;
-
-	@Autowired
-    public MessageSource messageSource_dtt;
-
 	public BeanWrapper beanWrapper;
 
 

From 8ebea25fdba41bd0c7112bf1297d542a0ead4470 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Fri, 29 Apr 2022 11:38:51 -0700
Subject: [PATCH 61/73] Organize imports on all java files

---
 .../labseer/api/ApiAliasNameController.java   | 14 +++---
 .../api/ApiAnalysisGroupController.java       | 35 +++++++--------
 .../api/ApiAnalysisGroupValueController.java  | 15 +++----
 .../labseer/api/ApiAuthorController.java      | 24 +++++-----
 .../labseer/api/ApiAuthorRoleController.java  | 10 ++---
 .../api/ApiAuthorizationController.java       | 16 +++----
 .../labseer/api/ApiBulkLoadController.java    | 24 +++++-----
 .../labseer/api/ApiCmpdSearchController.java  | 19 +++-----
 .../labseer/api/ApiCompoundsController.java   |  4 +-
 .../labseer/api/ApiContainerController.java   | 32 ++++++-------
 .../api/ApiContainerStateController.java      | 26 +++++------
 .../labseer/api/ApiCronJobController.java     | 10 ++---
 .../labseer/api/ApiCurveFitController.java    | 14 +++---
 .../labseer/api/ApiDDictValueController.java  | 12 ++---
 .../labseer/api/ApiExperimentController.java  | 42 ++++++++---------
 .../api/ApiExperimentLabelController.java     |  6 +--
 .../labseer/api/ApiExportController.java      |  8 ++--
 .../labseer/api/ApiFileSaveController.java    | 14 +++---
 .../labseer/api/ApiFileTypeController.java    | 11 ++---
 .../labseer/api/ApiIsotopeController.java     | 10 -----
 .../ApiItxContainerContainerController.java   |  8 ++--
 ...iItxContainerContainerValueController.java |  6 +--
 .../ApiItxExperimentExperimentController.java | 10 ++---
 .../api/ApiItxLsThingLsThingController.java   | 16 +++----
 .../api/ApiItxProtocolProtocolController.java |  8 ++--
 .../api/ApiItxSubjectContainerController.java | 16 +++----
 .../labseer/api/ApiKindController.java        | 24 +++++-----
 .../labseer/api/ApiLabelController.java       | 16 +++----
 .../api/ApiLabelSequenceController.java       | 13 +++---
 .../labseer/api/ApiLicenseController.java     |  6 +--
 .../labseer/api/ApiLsRoleController.java      |  5 +--
 .../labseer/api/ApiLsThingController.java     | 34 +++++++-------
 .../api/ApiLsTransactionController.java       |  8 ++--
 .../labseer/api/ApiMetalotController.java     | 26 +++++------
 .../labseer/api/ApiOperatorController.java    |  3 +-
 .../api/ApiParentAnnotationController.java    |  6 +--
 .../labseer/api/ApiParentController.java      | 15 +++----
 .../labseer/api/ApiParentLotController.java   | 21 ++++-----
 .../api/ApiPhysicalStateController.java       | 19 ++------
 .../labseer/api/ApiPreferredIdController.java |  4 +-
 .../labseer/api/ApiProjectController.java     |  9 +---
 .../labseer/api/ApiProtocolController.java    | 32 ++++++-------
 .../api/ApiPurityMeasuredByController.java    | 11 ++---
 .../labseer/api/ApiRegSearchController.java   | 11 ++---
 .../labseer/api/ApiSaltController.java        |  8 ----
 .../labseer/api/ApiSearchFormController.java  | 12 ++---
 .../labseer/api/ApiSetupController.java       | 24 +++++-----
 .../api/ApiSolutionUnitController.java        |  7 ---
 .../ApiStandardizationServicesController.java | 19 ++++----
 .../labseer/api/ApiStateController.java       | 28 ++++++------
 .../api/ApiStereoCategoryController.java      | 13 +++---
 .../labseer/api/ApiStructureController.java   | 21 ++++-----
 .../api/ApiStructureImageController.java      | 12 ++---
 .../api/ApiStructureServicesController.java   | 26 ++++-------
 .../labseer/api/ApiSubjectController.java     | 30 ++++++-------
 .../api/ApiSubjectValueController.java        |  7 +--
 .../api/ApiTreatmentGroupController.java      | 17 ++-----
 .../labseer/api/ApiTypeController.java        | 24 +++++-----
 .../labseer/api/ApiValueController.java       | 30 ++++++-------
 .../labseer/api/ApiValueKindController.java   | 11 ++---
 .../labseer/api/ApiVendorController.java      | 13 +++---
 .../api/RegisterCompoundsController.java      |  4 +-
 .../bbchem/BBChemDryRunStructure.java         | 10 +++--
 .../bbchem/BBChemParentStructure.java         |  7 ++-
 .../bbchem/BBChemSaltFormStructure.java       |  7 ++-
 .../bbchem/BBChemSaltStructure.java           | 10 +++--
 .../BBChemStandardizationDryRunStructure.java | 10 +++--
 .../bbchem/BBChemStructureService.java        |  2 +-
 .../bbchem/BBChemStructureServiceImpl.java    | 19 ++++----
 .../ChemStructureServiceBBChemImpl.java       | 33 +++++---------
 .../bbchem/CmpdRegMoleculeBBChemImpl.java     |  9 ++--
 .../bbchem/CmpdRegSDFWriterBBChemImpl.java    | 10 ++---
 .../domain/AbstractBBChemStructure.java       |  7 ++-
 .../labseer/domain/AbstractLabel.java         |  2 +
 .../labseer/domain/AbstractState.java         |  2 +
 .../labseer/domain/AbstractThing.java         |  1 +
 .../labseer/domain/AbstractValue.java         |  2 +
 .../labseer/domain/AnalysisGroup.java         | 11 +++--
 .../labseer/domain/AnalysisGroupLabel.java    |  2 +
 .../labseer/domain/AnalysisGroupState.java    | 11 +++--
 .../labseer/domain/AnalysisGroupValue.java    | 19 ++++----
 .../labseer/domain/ApplicationSetting.java    |  7 ++-
 .../com/labsynch/labseer/domain/Author.java   |  6 +--
 .../labsynch/labseer/domain/AuthorLabel.java  |  2 +
 .../labsynch/labseer/domain/AuthorRole.java   |  2 +
 .../labsynch/labseer/domain/AuthorState.java  |  9 ++--
 .../labsynch/labseer/domain/AuthorValue.java  |  4 +-
 .../labsynch/labseer/domain/BulkLoadFile.java |  7 ++-
 .../labseer/domain/BulkLoadTemplate.java      | 12 +++--
 .../labseer/domain/ChemStructure.java         |  7 ++-
 .../labseer/domain/CmpdRegAppSetting.java     |  7 ++-
 .../com/labsynch/labseer/domain/CodeKind.java |  6 ++-
 .../labsynch/labseer/domain/CodeOrigin.java   |  6 ++-
 .../com/labsynch/labseer/domain/CodeType.java |  6 ++-
 .../com/labsynch/labseer/domain/Compound.java |  7 ++-
 .../labsynch/labseer/domain/CompoundType.java |  7 ++-
 .../labsynch/labseer/domain/Container.java    |  9 ++--
 .../labseer/domain/ContainerKind.java         |  7 ++-
 .../labseer/domain/ContainerLabel.java        |  3 ++
 .../labseer/domain/ContainerState.java        |  7 ++-
 .../labseer/domain/ContainerType.java         |  7 ++-
 .../labseer/domain/ContainerValue.java        |  6 ++-
 .../com/labsynch/labseer/domain/CorpName.java |  7 ++-
 .../com/labsynch/labseer/domain/CronJob.java  |  7 ++-
 .../labsynch/labseer/domain/DDictKind.java    |  6 ++-
 .../labsynch/labseer/domain/DDictType.java    |  7 ++-
 .../labsynch/labseer/domain/DDictValue.java   |  5 ++-
 .../labseer/domain/DryRunCompound.java        |  8 ++--
 .../labsynch/labseer/domain/Experiment.java   |  7 ++-
 .../labseer/domain/ExperimentKind.java        |  6 ++-
 .../labseer/domain/ExperimentLabel.java       |  8 ++--
 .../labseer/domain/ExperimentState.java       |  6 +--
 .../labseer/domain/ExperimentValue.java       |  2 +
 .../com/labsynch/labseer/domain/FileList.java |  7 ++-
 .../labsynch/labseer/domain/FileThing.java    |  7 ++-
 .../com/labsynch/labseer/domain/FileType.java |  7 ++-
 .../labseer/domain/InteractionKind.java       |  6 ++-
 .../labseer/domain/InteractionType.java       |  7 ++-
 .../com/labsynch/labseer/domain/IsoSalt.java  |  2 +
 .../com/labsynch/labseer/domain/Isotope.java  |  7 ++-
 .../labseer/domain/ItxContainerContainer.java |  6 ++-
 .../domain/ItxContainerContainerState.java    |  7 +--
 .../domain/ItxContainerContainerValue.java    |  8 ++--
 .../domain/ItxExperimentExperiment.java       |  6 ++-
 .../domain/ItxExperimentExperimentState.java  |  7 +--
 .../domain/ItxExperimentExperimentValue.java  |  8 ++--
 .../labseer/domain/ItxLsThingLsThing.java     |  8 ++--
 .../domain/ItxLsThingLsThingState.java        |  7 +--
 .../domain/ItxLsThingLsThingValue.java        | 12 ++---
 .../labseer/domain/ItxProtocolProtocol.java   |  7 +--
 .../domain/ItxProtocolProtocolState.java      |  7 +--
 .../domain/ItxProtocolProtocolValue.java      |  8 ++--
 .../labseer/domain/ItxSubjectContainer.java   |  7 +--
 .../domain/ItxSubjectContainerState.java      |  7 +--
 .../domain/ItxSubjectContainerValue.java      |  8 ++--
 .../labsynch/labseer/domain/LabelKind.java    |  6 ++-
 .../labseer/domain/LabelSequence.java         | 10 +++--
 .../labseer/domain/LabelSequenceRole.java     |  6 ++-
 .../labsynch/labseer/domain/LabelType.java    |  6 ++-
 .../java/com/labsynch/labseer/domain/Lot.java | 10 ++---
 .../com/labsynch/labseer/domain/LotAlias.java | 12 +++--
 .../labsynch/labseer/domain/LotAliasKind.java |  7 ++-
 .../labsynch/labseer/domain/LotAliasType.java |  7 ++-
 .../labseer/domain/LsInteraction.java         |  7 ++-
 .../com/labsynch/labseer/domain/LsRole.java   |  4 +-
 .../labsynch/labseer/domain/LsSeqAnlGrp.java  |  2 +
 .../labseer/domain/LsSeqContainer.java        |  2 +
 .../labsynch/labseer/domain/LsSeqExpt.java    |  2 +
 .../labseer/domain/LsSeqItxCntrCntr.java      |  2 +
 .../domain/LsSeqItxExperimentExperiment.java  |  2 +
 .../domain/LsSeqItxLsThingLsThing.java        |  2 +
 .../domain/LsSeqItxProtocolProtocol.java      |  2 +
 .../labseer/domain/LsSeqItxSubjCntr.java      |  2 +
 .../labseer/domain/LsSeqProtocol.java         |  2 +
 .../labsynch/labseer/domain/LsSeqSubject.java |  2 +
 .../labsynch/labseer/domain/LsSeqTrtGrp.java  |  2 +
 .../com/labsynch/labseer/domain/LsTag.java    |  2 +
 .../com/labsynch/labseer/domain/LsThing.java  | 13 +++---
 .../labsynch/labseer/domain/LsThingLabel.java |  7 +--
 .../labsynch/labseer/domain/LsThingState.java |  7 ++-
 .../labsynch/labseer/domain/LsThingValue.java |  8 ++--
 .../labseer/domain/LsTransaction.java         |  7 ++-
 .../com/labsynch/labseer/domain/Operator.java |  7 ++-
 .../labsynch/labseer/domain/OperatorKind.java |  6 ++-
 .../labsynch/labseer/domain/OperatorType.java |  7 ++-
 .../com/labsynch/labseer/domain/Parent.java   |  9 ++--
 .../labsynch/labseer/domain/ParentAlias.java  | 12 +++--
 .../labseer/domain/ParentAliasKind.java       |  7 ++-
 .../labseer/domain/ParentAliasType.java       |  7 ++-
 .../labseer/domain/ParentAnnotation.java      |  7 ++-
 .../labseer/domain/PhysicalState.java         |  7 ++-
 .../labseer/domain/PreDef_CorpName.java       |  7 ++-
 .../com/labsynch/labseer/domain/Protocol.java |  9 ++--
 .../labsynch/labseer/domain/ProtocolKind.java |  6 ++-
 .../labseer/domain/ProtocolLabel.java         |  3 ++
 .../labseer/domain/ProtocolState.java         |  6 +--
 .../labsynch/labseer/domain/ProtocolType.java |  7 ++-
 .../labseer/domain/ProtocolValue.java         |  4 +-
 .../labseer/domain/PurityMeasuredBy.java      |  7 ++-
 .../labsynch/labseer/domain/RegSearch.java    |  7 ++-
 .../com/labsynch/labseer/domain/RoleKind.java |  7 ++-
 .../com/labsynch/labseer/domain/RoleType.java |  7 ++-
 .../com/labsynch/labseer/domain/Salt.java     |  7 +--
 .../com/labsynch/labseer/domain/SaltForm.java |  6 +--
 .../labseer/domain/SaltFormAlias.java         | 13 +++---
 .../labseer/domain/SaltFormAliasKind.java     |  7 ++-
 .../labseer/domain/SaltFormAliasType.java     |  7 ++-
 .../labsynch/labseer/domain/SolutionUnit.java |  7 ++-
 .../domain/StandardizationDryRunCompound.java | 15 +++----
 .../domain/StandardizationHistory.java        |  7 ++-
 .../domain/StandardizationSettings.java       |  9 ++--
 .../labsynch/labseer/domain/StateKind.java    |  6 ++-
 .../labsynch/labseer/domain/StateType.java    |  6 ++-
 .../labseer/domain/StereoCategory.java        |  7 ++-
 .../labseer/domain/StructureKind.java         |  6 ++-
 .../labseer/domain/StructureType.java         |  6 ++-
 .../com/labsynch/labseer/domain/Subject.java  |  9 ++--
 .../labsynch/labseer/domain/SubjectLabel.java |  2 +
 .../labsynch/labseer/domain/SubjectState.java |  9 ++--
 .../labsynch/labseer/domain/SubjectValue.java | 10 +++--
 .../labseer/domain/TempSelectTable.java       |  2 +
 .../labsynch/labseer/domain/ThingKind.java    |  6 ++-
 .../labsynch/labseer/domain/ThingPage.java    |  7 ++-
 .../labseer/domain/ThingPageArchive.java      |  7 ++-
 .../labsynch/labseer/domain/ThingType.java    |  6 ++-
 .../labseer/domain/TreatmentGroup.java        |  7 ++-
 .../labseer/domain/TreatmentGroupLabel.java   |  2 +
 .../labseer/domain/TreatmentGroupValue.java   | 12 ++---
 .../labseer/domain/UncertaintyKind.java       |  7 ++-
 .../com/labsynch/labseer/domain/Unit.java     |  7 ++-
 .../com/labsynch/labseer/domain/UnitKind.java |  6 ++-
 .../com/labsynch/labseer/domain/UnitType.java |  7 ++-
 .../labsynch/labseer/domain/UpdateLog.java    |  2 +
 .../labsynch/labseer/domain/ValueKind.java    |  6 ++-
 .../labsynch/labseer/domain/ValueType.java    |  6 ++-
 .../com/labsynch/labseer/domain/Vendor.java   |  7 ++-
 .../labseer/dto/AnalysisGroupCodeDTO.java     |  6 ++-
 .../labseer/dto/AnalysisGroupCsvDTO.java      |  6 ++-
 .../dto/AnalysisGroupStatePathDTO.java        |  6 ++-
 .../dto/AnalysisGroupValueBaseDTO.java        |  6 ++-
 .../labseer/dto/AnalysisGroupValueDTO.java    |  6 +--
 .../dto/AnalysisGroupValuePathDTO.java        |  6 ++-
 .../labseer/dto/AuthGroupsAndProjectsDTO.java |  5 ++-
 .../labsynch/labseer/dto/AuthGroupsDTO.java   |  6 ++-
 .../labsynch/labseer/dto/AuthProjectDTO.java  |  1 +
 .../labseer/dto/AuthProjectGroupsDTO.java     |  1 +
 .../com/labsynch/labseer/dto/AuthUserDTO.java |  6 ++-
 .../labseer/dto/AuthorBrowserQueryDTO.java    |  6 ++-
 .../labsynch/labseer/dto/AuthorNameDTO.java   |  6 ++-
 .../labsynch/labseer/dto/AuthorQueryDTO.java  |  6 ++-
 .../labseer/dto/AuthorQueryResultDTO.java     |  6 ++-
 .../labsynch/labseer/dto/AuthorRoleDTO.java   |  6 ++-
 .../labsynch/labseer/dto/AutoLabelDTO.java    |  6 ++-
 .../labsynch/labseer/dto/BatchCodeDTO.java    |  6 ++-
 .../labseer/dto/BatchCodeDependencyDTO.java   | 19 +-------
 .../labsynch/labseer/dto/BatchProjectDTO.java |  6 ++-
 .../labseer/dto/BulkLoadPropertiesDTO.java    | 23 +++-------
 .../dto/BulkLoadPropertyMappingDTO.java       |  4 +-
 .../dto/BulkLoadRegisterSDFRequestDTO.java    |  4 +-
 .../dto/BulkLoadRegisterSDFResponseDTO.java   |  6 +--
 .../dto/BulkLoadSDFPropertyRequestDTO.java    |  6 ++-
 ...oadSDFValidationPropertiesResponseDTO.java | 23 ++--------
 .../labseer/dto/BulkLoadTemplateDTO.java      | 21 +--------
 .../labseer/dto/BulkTransferPart1DTO.java     |  6 ++-
 .../labseer/dto/ChangePasswordDTO.java        |  6 ++-
 .../labseer/dto/CleanMolOptionsDTO.java       |  6 ++-
 .../labseer/dto/CmpdRegBatchCodeDTO.java      | 10 +++--
 .../dto/CmpdRegStructureSearchDTO.java        |  6 ++-
 .../labsynch/labseer/dto/CodeLabelDTO.java    |  4 +-
 .../labseer/dto/CodeNameQueryDTO.java         |  6 ++-
 .../labseer/dto/CodeNameValueDTO.java         |  6 ++-
 .../labsynch/labseer/dto/CodeTableDTO.java    |  8 ++--
 .../labsynch/labseer/dto/CodeTypeKindDTO.java |  4 +-
 .../labseer/dto/ContainerBatchCodeDTO.java    |  5 ++-
 .../labseer/dto/ContainerBrowserQueryDTO.java |  6 ++-
 .../dto/ContainerCodeNameStateDTO.java        |  6 ++-
 .../dto/ContainerDependencyCheckDTO.java      | 17 +++----
 .../labseer/dto/ContainerErrorMessageDTO.java |  6 ++-
 .../labseer/dto/ContainerLocationDTO.java     |  4 +-
 .../labseer/dto/ContainerLocationTreeDTO.java |  6 ++-
 .../labseer/dto/ContainerMiniDTO.java         |  8 ++--
 .../labseer/dto/ContainerQueryDTO.java        |  6 ++-
 .../labseer/dto/ContainerQueryResultDTO.java  |  6 ++-
 .../labseer/dto/ContainerRequestDTO.java      |  6 ++-
 .../dto/ContainerSearchRequestDTO.java        |  6 ++-
 .../labseer/dto/ContainerStateMiniDTO.java    |  8 ++--
 .../labseer/dto/ContainerStatePathDTO.java    |  6 ++-
 .../labseer/dto/ContainerSubjectsDTO.java     |  6 ++-
 .../labseer/dto/ContainerValuePathDTO.java    |  6 ++-
 .../labseer/dto/ContainerValueRequestDTO.java |  6 +--
 .../labseer/dto/ContainerWellCodeDTO.java     |  4 +-
 .../com/labsynch/labseer/dto/CorpNameDTO.java |  6 ++-
 .../labseer/dto/CreatePlateRequestDTO.java    |  2 +
 .../com/labsynch/labseer/dto/CurveFitDTO.java | 21 ++++-----
 .../dto/DateValueComparisonRequest.java       |  6 ++-
 .../labseer/dto/DependencyCheckDTO.java       | 12 ++---
 .../labseer/dto/DoseReponseParamsDTO.java     |  6 ++-
 .../com/labsynch/labseer/dto/EntrezDbDTO.java |  6 ++-
 .../labsynch/labseer/dto/EntrezDbGeneDTO.java |  6 ++-
 .../dto/EntrezDiscontinuedGeneDTO.java        |  6 ++-
 .../labsynch/labseer/dto/ErrorMessageDTO.java |  6 ++-
 .../labseer/dto/ExperimentCodeDTO.java        |  6 ++-
 .../labseer/dto/ExperimentCsvDataDTO.java     |  6 ++-
 .../labseer/dto/ExperimentDataDTO.java        |  8 ++--
 .../dto/ExperimentErrorMessageDTO.java        |  6 ++-
 .../labseer/dto/ExperimentFilterDTO.java      |  1 +
 .../dto/ExperimentFilterSearchDTO.java        |  6 ++-
 .../labseer/dto/ExperimentGuiStubDTO.java     | 10 +++--
 .../dto/ExperimentSearchRequestDTO.java       |  1 +
 .../labseer/dto/ExperimentStatePathDTO.java   |  6 ++-
 .../labseer/dto/ExperimentValuePathDTO.java   |  6 ++-
 .../labsynch/labseer/dto/ExportResultDTO.java |  8 ++--
 .../labseer/dto/FileSaveReturnArrayDTO.java   |  1 +
 .../labseer/dto/FileSaveReturnDTO.java        |  1 +
 .../labsynch/labseer/dto/FileSaveSendDTO.java | 11 ++---
 .../com/labsynch/labseer/dto/FlagWellDTO.java | 19 ++++----
 .../labsynch/labseer/dto/FlatThingCsvDTO.java |  6 ++-
 .../com/labsynch/labseer/dto/GeneIdDTO.java   |  6 ++-
 .../labsynch/labseer/dto/GeneOrthologDTO.java |  6 +--
 .../labseer/dto/GeneOrthologFileDTO.java      |  6 ++-
 .../dto/GenericQueryCodeTableResultDTO.java   |  5 ++-
 .../labseer/dto/GenericStatePathRequest.java  |  4 +-
 .../labseer/dto/GenericValuePathRequest.java  |  4 +-
 .../com/labsynch/labseer/dto/ItxQueryDTO.java |  6 ++-
 .../labsynch/labseer/dto/JSTreeNodeDTO.java   |  4 +-
 .../com/labsynch/labseer/dto/KeyValueDTO.java |  6 ++-
 .../labsynch/labseer/dto/LabelPrefixDTO.java  |  6 ++-
 .../labsynch/labseer/dto/LabelQueryDTO.java   |  6 ++-
 .../com/labsynch/labseer/dto/LotAliasDTO.java |  6 ++-
 .../java/com/labsynch/labseer/dto/LotDTO.java | 17 ++-----
 .../labseer/dto/LsThingBrowserQueryDTO.java   |  6 ++-
 .../labsynch/labseer/dto/LsThingQueryDTO.java |  6 ++-
 .../labseer/dto/LsThingQueryResultDTO.java    |  6 ++-
 .../labseer/dto/LsThingStatePathDTO.java      |  6 ++-
 .../labseer/dto/LsThingValidationDTO.java     |  4 +-
 .../labseer/dto/LsThingValuePathDTO.java      |  6 ++-
 .../com/labsynch/labseer/dto/Metalot.java     |  5 ++-
 .../labsynch/labseer/dto/MetalotReturn.java   |  5 ++-
 .../labsynch/labseer/dto/MethodOptionDTO.java |  6 ++-
 .../labseer/dto/MolConvertInputDTO.java       |  6 ++-
 .../labseer/dto/MolConvertOutputDTO.java      |  6 ++-
 .../com/labsynch/labseer/dto/MolInputDTO.java |  6 ++-
 .../MultiContainerSubjectSearchRequest.java   |  6 ++-
 .../MultiContainerSubjectSearchResultDTO.java |  4 +-
 .../labsynch/labseer/dto/ParentAliasDTO.java  |  5 ++-
 .../labsynch/labseer/dto/ParentEditDTO.java   |  9 +---
 .../labseer/dto/ParentValidationDTO.java      |  4 +-
 .../labsynch/labseer/dto/PlateWellDTO.java    |  6 ++-
 .../labseer/dto/PreferredNameDTO.java         | 13 ++----
 .../labseer/dto/PreferredNameResultsDTO.java  |  1 +
 .../labseer/dto/ProtocolValuePathDTO.java     |  6 ++-
 .../PurgeFileDependencyCheckResponseDTO.java  |  8 ++--
 .../labseer/dto/PurgeFileResponseDTO.java     |  8 ++--
 .../labseer/dto/RegSearchParamsDTO.java       |  6 ++-
 .../labseer/dto/RenderMolRequestDTO.java      |  6 ++-
 .../labsynch/labseer/dto/ReparentLotDTO.java  |  6 ++-
 .../labsynch/labseer/dto/RequestNameDTO.java  |  6 ++-
 .../labsynch/labseer/dto/SELColOrderDTO.java  |  6 ++-
 .../labseer/dto/SearchCdIdReturnDTO.java      |  6 ++-
 .../labseer/dto/SearchCompoundReturnDTO.java  |  1 +
 .../labseer/dto/SearchFormReturnDTO.java      |  1 +
 .../labseer/dto/SetTubeLocationDTO.java       |  6 ++-
 .../labsynch/labseer/dto/StateValueDTO.java   |  6 ++-
 .../dto/StoichiometryPropertiesDTO.java       | 10 +++--
 .../StoichiometryPropertiesResultsDTO.java    |  4 +-
 .../labseer/dto/StructureSearchDTO.java       |  6 ++-
 .../labsynch/labseer/dto/SubjectCodeDTO.java  |  4 +-
 .../labsynch/labseer/dto/SubjectLabelDTO.java |  4 +-
 .../labsynch/labseer/dto/SubjectMiniDTO.java  |  8 ++--
 .../labseer/dto/SubjectSearchRequest.java     |  6 ++-
 .../labseer/dto/SubjectSearchResultDTO.java   |  6 ++-
 .../labseer/dto/SubjectStateMiniDTO.java      |  8 ++--
 .../labsynch/labseer/dto/SubjectValueDTO.java |  7 +--
 .../labsynch/labseer/dto/TempThingDTO.java    |  6 ++-
 .../com/labsynch/labseer/dto/TgDataDTO.java   |  7 +--
 .../labseer/dto/TreatmentGroupCodeDTO.java    |  6 ++-
 .../labseer/dto/TreatmentGroupMiniDTO.java    |  8 ++--
 .../dto/TreatmentGroupStatePathDTO.java       |  6 ++-
 .../labseer/dto/TreatmentGroupValueDTO.java   |  6 ++-
 .../dto/TreatmentGroupValuePathDTO.java       |  6 ++-
 .../labseer/dto/TsvLoaderResponseDTO.java     |  2 +
 .../com/labsynch/labseer/dto/TypeDTO.java     | 11 +++--
 .../com/labsynch/labseer/dto/TypeKindDTO.java | 11 +++--
 .../labseer/dto/ValidationResponseDTO.java    |  3 ++
 .../labsynch/labseer/dto/ValuePathDTO.java    |  6 ++-
 .../labsynch/labseer/dto/ValueQueryDTO.java   |  6 ++-
 .../StandardizerSettingsConfigDTO.java        |  8 ++--
 .../labseer/exceptions/ErrorMessage.java      |  7 ++-
 .../LsThingValidationErrorMessage.java        |  7 ++-
 .../service/ACASAuthenticationProvider.java   | 12 ++---
 .../labseer/service/AnalysisGroupService.java |  4 +-
 .../service/AnalysisGroupServiceImpl.java     | 26 +++++------
 .../service/AnalysisGroupStateService.java    |  4 +-
 .../service/AnalysisGroupValueService.java    |  4 +-
 .../AnalysisGroupValueServiceImpl.java        | 14 +++---
 .../labseer/service/AuthorRoleService.java    |  4 +-
 .../labseer/service/AuthorService.java        |  4 +-
 .../labseer/service/AuthorServiceImpl.java    | 24 +++++-----
 .../labseer/service/AutoLabelService.java     |  4 +-
 .../labseer/service/AutoLabelServiceImpl.java | 12 ++---
 .../labseer/service/BulkLoadServiceImpl.java  | 29 +++++-------
 .../labseer/service/ChemStructureService.java |  6 +--
 .../labseer/service/ContainerService.java     |  5 +--
 .../labseer/service/ContainerServiceImpl.java | 19 ++++----
 .../service/ContainerStateService.java        |  4 +-
 .../service/ContainerStateServiceImpl.java    | 14 +++---
 .../service/ContainerValueService.java        |  4 +-
 .../service/ContainerValueServiceImpl.java    | 12 ++---
 .../labseer/service/CorpNameServiceImpl.java  | 12 ++---
 .../labseer/service/CronJobService.java       |  4 +-
 .../labseer/service/CronJobServiceImpl.java   |  6 +--
 .../service/DataDictionaryService.java        |  4 +-
 .../service/DataDictionaryServiceImpl.java    | 13 +++---
 .../DatabaseAuthenticationProvider.java       | 10 ++---
 .../labsynch/labseer/service/ErrorList.java   |  1 +
 .../labseer/service/ErrorMessage.java         |  7 ++-
 .../labseer/service/ExperimentService.java    |  4 +-
 .../service/ExperimentServiceImpl.java        | 16 +++----
 .../service/ExperimentStateService.java       |  4 +-
 .../service/ExperimentStateServiceImpl.java   | 10 ++---
 .../service/ExperimentValueService.java       |  4 +-
 .../service/ExperimentValueServiceImpl.java   | 20 ++++-----
 .../labseer/service/ExportServiceImpl.java    | 11 +++--
 .../labseer/service/GeneThingService.java     | 10 ++---
 .../labseer/service/GeneThingServiceImpl.java | 28 ++++++------
 .../labseer/service/IsoSaltServiceImpl.java   |  6 +--
 .../service/ItxContainerContainerService.java |  4 +-
 .../ItxContainerContainerServiceImpl.java     | 10 ++---
 .../ItxContainerContainerStateService.java    |  4 +-
 ...ItxContainerContainerStateServiceImpl.java |  8 ++--
 .../ItxContainerContainerValueService.java    |  4 +-
 ...ItxContainerContainerValueServiceImpl.java | 10 ++---
 .../ItxExperimentExperimentService.java       |  4 +-
 .../ItxExperimentExperimentStateService.java  |  4 +-
 ...xExperimentExperimentStateServiceImpl.java |  9 ++--
 .../ItxExperimentExperimentValueService.java  |  4 +-
 ...xExperimentExperimentValueServiceImpl.java | 10 ++---
 .../service/ItxLsThingLsThingService.java     |  4 +-
 .../service/ItxLsThingLsThingServiceImpl.java | 41 +++--------------
 .../service/ItxProtocolProtocolService.java   |  4 +-
 .../ItxProtocolProtocolServiceImpl.java       | 14 +++---
 .../ItxProtocolProtocolStateService.java      |  5 +--
 .../ItxProtocolProtocolStateServiceImpl.java  | 10 ++---
 .../ItxProtocolProtocolValueService.java      |  4 +-
 .../service/ItxSubjectContainerService.java   |  4 +-
 .../ItxSubjectContainerServiceImpl.java       | 12 ++---
 .../ItxSubjectContainerStateService.java      |  4 +-
 .../ItxSubjectContainerStateServiceImpl.java  | 10 ++---
 .../ItxSubjectContainerValueService.java      |  4 +-
 .../ItxSubjectContainerValueServiceImpl.java  | 10 ++---
 .../labseer/service/LabelSequenceService.java |  6 +--
 .../service/LabelSequenceServiceImpl.java     | 12 +++--
 .../labseer/service/LicenseService.java       |  8 +---
 .../labseer/service/LicenseServiceImpl.java   | 27 ++---------
 .../LoadPreDefCorpNameServiceImpl.java        | 10 ++---
 .../labseer/service/LotAliasServiceImpl.java  |  8 ++--
 .../labseer/service/LotServiceImpl.java       | 16 +++----
 .../labseer/service/LsThingService.java       |  9 ++--
 .../labseer/service/LsThingServiceImpl.java   | 34 ++++++--------
 .../service/LsThingStateServiceImpl.java      | 12 ++---
 .../service/LsThingValueServiceImpl.java      | 12 ++---
 .../labseer/service/LsTransactionService.java |  4 +-
 .../service/LsTransactionServiceImpl.java     |  8 ++--
 .../service/ParentAliasServiceImpl.java       |  6 +--
 .../labseer/service/ParentLotService.java     |  2 -
 .../labseer/service/ParentLotServiceImpl.java | 10 ++---
 .../labseer/service/ParentService.java        |  3 --
 .../labseer/service/ParentServiceImpl.java    | 21 +++------
 .../service/ParentStructureService.java       |  1 -
 .../service/ParentStructureServiceImpl.java   | 14 +++---
 .../PostSuccessfulAuthenticationHandler.java  |  4 +-
 .../labseer/service/ProtocolService.java      |  4 +-
 .../service/ProtocolStateServiceImpl.java     | 12 ++---
 .../service/ProtocolValueServiceImpl.java     | 12 ++---
 .../labseer/service/RegSearchServiceImpl.java | 17 ++++---
 .../labseer/service/SaltFormServiceImpl.java  | 14 +++---
 .../labsynch/labseer/service/SaltLoader.java  |  2 +
 .../labseer/service/SaltServiceImpl.java      | 13 +++---
 .../service/SaltStructureServiceImpl.java     | 15 +++----
 .../service/SearchFormServiceImpl.java        | 15 +++----
 .../labseer/service/SetupServiceImpl.java     | 10 ++---
 .../service/StandardizationService.java       |  4 +-
 .../service/StructureImageServiceImpl.java    | 11 +++--
 .../labseer/service/StructureServiceImpl.java | 12 ++---
 .../labseer/service/SubjectService.java       |  4 +-
 .../labseer/service/SubjectServiceImpl.java   | 22 +++++----
 .../labseer/service/SubjectStateService.java  |  4 +-
 .../labseer/service/SubjectValueService.java  |  4 +-
 .../service/SubjectValueServiceImpl.java      | 16 +++----
 .../service/TreatmentGroupService.java        |  9 ++--
 .../service/TreatmentGroupServiceImpl.java    | 21 +++++----
 .../service/TreatmentGroupStateService.java   |  4 +-
 .../service/TreatmentGroupValueService.java   |  4 +-
 .../TreatmentGroupValueServiceImpl.java       | 16 +++----
 .../labseer/utils/BitSetUserType.java         | 10 ++---
 .../labseer/utils/ByteArrayTransformer.java   |  1 +
 .../labseer/utils/DeleteAllParents.java       |  4 +-
 .../labsynch/labseer/utils/InitialSetup.java  |  6 +--
 .../labseer/utils/LoadCompoundsUtil.java      | 16 +++----
 .../labseer/utils/LoadFullCompoundsUtil.java  | 13 +++---
 .../labsynch/labseer/utils/MimeTypeUtil.java  |  4 +-
 .../labsynch/labseer/utils/MoleculeUtil.java  |  8 ++--
 .../utils/PhysicalNamingStrategyImpl.java     |  3 +-
 .../utils/PropertiesUtilServiceImpl.java      | 10 ++---
 .../com/labsynch/labseer/utils/Request.java   |  6 +--
 .../labsynch/labseer/utils/SecurityUtil.java  |  7 +--
 .../labsynch/labseer/utils/SecurityUtils.java | 10 ++---
 .../labsynch/labseer/utils/SimpleUtil.java    | 34 ++++++--------
 .../labseer/api/ApiAuthorControllerTest.java  | 12 ++---
 .../api/ApiAuthorRoleControllerTest.java      |  4 +-
 .../api/ApiCompoundsControllerTest.java       | 13 +++---
 .../api/ApiContainerControllerTest.java       | 42 ++++++++---------
 .../api/ApiContainerStateControllerTest.java  | 17 +++----
 .../api/ApiCurveFitControllerTest.java        | 12 +++--
 .../ApiExperimentControllerGetDataTest.java   | 14 +-----
 .../api/ApiExperimentControllerSaveTest.java  | 12 -----
 .../api/ApiExperimentControllerTest.java      | 10 ++---
 .../api/ApiGeneThingsControllerTest.java      | 11 -----
 ...ItxExperimentExperimentControllerTest.java | 11 +----
 .../ApiItxProtocolProtocolControllerTest.java |  6 +--
 .../ApiItxSubjectContainerControllerTest.java | 13 +-----
 .../api/ApiLabelSequenceControllerTest.java   | 12 +++--
 .../api/ApiLsThingControllerPostTest.java     | 11 ++---
 .../api/ApiLsThingControllerSearchTest.java   | 27 +++--------
 .../labseer/api/ApiLsThingControllerTest.java | 12 ++---
 .../api/ApiProtocolControllerTest.java        | 18 ++++----
 .../labseer/api/ApiSetupControllerTest.java   | 45 +++++++++----------
 .../api/ApiStructureControllerTest.java       |  7 +--
 .../labseer/api/ApiSubjectControllerTest.java | 17 ++++---
 .../labseer/api/ApiValueControllerTest.java   | 16 +++----
 .../api/ApiValueKindControllerTest.java       | 15 +++----
 .../domain/AnalysisGroupDataOnDemand.java     |  2 +
 .../domain/AnalysisGroupIntegrationTest.java  |  2 +
 .../AnalysisGroupLabelDataOnDemand.java       |  2 +
 .../AnalysisGroupLabelIntegrationTest.java    |  2 +
 .../AnalysisGroupStateDataOnDemand.java       |  2 +
 .../AnalysisGroupStateIntegrationTest.java    |  2 +
 .../AnalysisGroupValueDataOnDemand.java       |  2 +
 .../AnalysisGroupValueIntegrationTest.java    |  2 +
 .../labseer/domain/AuthorDataOnDemand.java    |  2 +
 .../labseer/domain/AuthorIntegrationTest.java |  2 +
 .../labsynch/labseer/domain/AuthorTest.java   |  2 +
 .../labseer/domain/ContainerDataOnDemand.java |  2 +
 .../domain/ContainerIntegrationTest.java      |  2 +
 .../domain/ContainerKindDataOnDemand.java     |  2 +
 .../domain/ContainerKindIntegrationTest.java  |  2 +
 .../domain/ContainerLabelDataOnDemand.java    |  2 +
 .../domain/ContainerLabelIntegrationTest.java |  2 +
 .../domain/ContainerStateDataOnDemand.java    |  2 +
 .../domain/ContainerStateIntegrationTest.java |  2 +
 .../domain/ContainerTypeDataOnDemand.java     |  2 +
 .../domain/ContainerTypeIntegrationTest.java  |  2 +
 .../domain/ContainerValueDataOnDemand.java    |  2 +
 .../domain/ContainerValueIntegrationTest.java |  2 +
 .../domain/ExperimentDataOnDemand.java        |  2 +
 .../domain/ExperimentIntegrationTest.java     |  2 +
 .../domain/ExperimentKindDataOnDemand.java    |  2 +
 .../domain/ExperimentKindIntegrationTest.java |  2 +
 .../domain/ExperimentLabelDataOnDemand.java   |  2 +
 .../ExperimentLabelIntegrationTest.java       |  2 +
 .../domain/ExperimentStateDataOnDemand.java   |  2 +
 .../ExperimentStateIntegrationTest.java       |  2 +
 .../domain/ExperimentTypeDataOnDemand.java    |  2 +
 .../domain/ExperimentTypeIntegrationTest.java |  2 +
 .../domain/ExperimentValueDataOnDemand.java   |  2 +
 .../ExperimentValueIntegrationTest.java       |  2 +
 .../domain/InteractionKindDataOnDemand.java   |  2 +
 .../InteractionKindIntegrationTest.java       |  2 +
 .../domain/InteractionTypeDataOnDemand.java   |  2 +
 .../InteractionTypeIntegrationTest.java       |  2 +
 .../ItxContainerContainerDataOnDemand.java    |  2 +
 .../ItxContainerContainerIntegrationTest.java |  2 +
 ...txContainerContainerStateDataOnDemand.java |  2 +
 ...ontainerContainerStateIntegrationTest.java |  2 +
 ...txContainerContainerValueDataOnDemand.java |  2 +
 ...ontainerContainerValueIntegrationTest.java |  2 +
 .../ItxSubjectContainerDataOnDemand.java      |  2 +
 .../ItxSubjectContainerIntegrationTest.java   |  2 +
 .../ItxSubjectContainerStateDataOnDemand.java |  2 +
 ...xSubjectContainerStateIntegrationTest.java |  2 +
 .../ItxSubjectContainerValueDataOnDemand.java |  2 +
 ...xSubjectContainerValueIntegrationTest.java |  2 +
 .../labseer/domain/LabelKindDataOnDemand.java |  2 +
 .../domain/LabelKindIntegrationTest.java      |  2 +
 .../domain/LabelSequenceDataOnDemand.java     |  2 +
 .../domain/LabelSequenceIntegrationTest.java  |  2 +
 .../labseer/domain/LabelTypeDataOnDemand.java |  2 +
 .../domain/LabelTypeIntegrationTest.java      |  2 +
 .../domain/LsInteractionDataOnDemand.java     |  2 +
 .../domain/LsInteractionIntegrationTest.java  |  2 +
 .../domain/LsTransactionDataOnDemand.java     |  2 +
 .../domain/LsTransactionIntegrationTest.java  |  2 +
 .../domain/OperatorTypeDataOnDemand.java      |  2 +
 .../domain/OperatorTypeIntegrationTest.java   |  2 +
 .../labseer/domain/ProtocolDataOnDemand.java  |  2 +
 .../domain/ProtocolIntegrationTest.java       |  2 +
 .../domain/ProtocolKindDataOnDemand.java      |  2 +
 .../domain/ProtocolKindIntegrationTest.java   |  2 +
 .../domain/ProtocolLabelDataOnDemand.java     |  2 +
 .../domain/ProtocolLabelIntegrationTest.java  |  2 +
 .../domain/ProtocolStateDataOnDemand.java     |  2 +
 .../domain/ProtocolStateIntegrationTest.java  |  2 +
 .../domain/ProtocolTypeDataOnDemand.java      |  2 +
 .../domain/ProtocolTypeIntegrationTest.java   |  2 +
 .../domain/ProtocolValueDataOnDemand.java     |  2 +
 .../domain/ProtocolValueIntegrationTest.java  |  2 +
 .../labseer/domain/StateKindDataOnDemand.java |  2 +
 .../domain/StateKindIntegrationTest.java      |  2 +
 .../labseer/domain/StateTypeDataOnDemand.java |  2 +
 .../domain/StateTypeIntegrationTest.java      |  2 +
 .../labseer/domain/SubjectDataOnDemand.java   |  2 +
 .../domain/SubjectIntegrationTest.java        |  2 +
 .../domain/SubjectStateDataOnDemand.java      |  2 +
 .../domain/SubjectStateIntegrationTest.java   |  2 +
 .../domain/SubjectValueDataOnDemand.java      |  2 +
 .../domain/SubjectValueIntegrationTest.java   |  2 +
 .../labseer/domain/ThingKindDataOnDemand.java |  2 +
 .../domain/ThingKindIntegrationTest.java      |  2 +
 .../domain/ThingPageArchiveDataOnDemand.java  |  2 +
 .../ThingPageArchiveIntegrationTest.java      |  2 +
 .../labseer/domain/ThingPageDataOnDemand.java |  2 +
 .../domain/ThingPageIntegrationTest.java      |  2 +
 .../labseer/domain/ThingTypeDataOnDemand.java |  2 +
 .../domain/ThingTypeIntegrationTest.java      |  2 +
 .../domain/TreatmentGroupDataOnDemand.java    |  2 +
 .../domain/TreatmentGroupIntegrationTest.java |  2 +
 .../TreatmentGroupStateDataOnDemand.java      |  2 +
 .../TreatmentGroupStateIntegrationTest.java   |  2 +
 .../TreatmentGroupValueDataOnDemand.java      |  2 +
 .../TreatmentGroupValueIntegrationTest.java   |  2 +
 .../labseer/domain/UnitKindDataOnDemand.java  |  2 +
 .../domain/UnitKindIntegrationTest.java       |  2 +
 .../labseer/domain/UnitTypeDataOnDemand.java  |  2 +
 .../domain/UnitTypeIntegrationTest.java       |  2 +
 .../labseer/domain/UpdateLogDataOnDemand.java |  2 +
 .../domain/UpdateLogIntegrationTest.java      |  2 +
 .../labseer/domain/ValueKindDataOnDemand.java |  2 +
 .../domain/ValueKindIntegrationTest.java      |  2 +
 .../labseer/domain/ValueTypeDataOnDemand.java |  2 +
 .../domain/ValueTypeIntegrationTest.java      |  2 +
 .../domainImpl/AnalysisGroupValueTest.java    | 12 ++---
 .../domainImpl/ExperimentStateTest.java       |  6 +--
 .../labseer/domainImpl/ExperimentTest.java    |  6 +--
 .../domainImpl/ExperimentValueTest.java       |  6 +--
 .../labseer/domainImpl/ItxLsThingsTest.java   |  6 +--
 .../labseer/domainImpl/LsThingTest.java       | 10 ++---
 .../labseer/domainImpl/SubjectValueTest.java  |  8 ++--
 .../domainImpl/TreatmentGroupValueTest.java   |  7 ++-
 .../labseer/dto/CmpdRegBatchCodeDTOTest.java  |  4 +-
 .../labseer/dto/CodeTableDTOTest.java         |  4 +-
 .../labsynch/labseer/dto/CurveFitDTOTest.java |  5 +--
 .../labsynch/labseer/dto/FlagWellDTOTest.java |  8 +---
 .../labseer/dto/RawCurveDataDTOTest.java      |  8 +---
 .../labsynch/labseer/dto/TgDataDTOTest.java   |  8 +---
 .../labseer/dto/ValueTypeKindDTOTest.java     |  9 +---
 .../labseer/manytomany/AnalysisGroupTest.java | 26 +++++------
 .../manytomany/ExperimentStatusTests.java     | 20 ++++-----
 .../labseer/manytomany/ExperimentTest.java    | 18 ++++----
 .../labsynch/labseer/manytomany/ItxTest.java  | 23 +++++-----
 .../labseer/manytomany/SubjectTest.java       | 15 +++----
 .../manytomany/TreatmentGroupTest.java        | 14 +++---
 .../service/AnalysisGroupServiceTests.java    | 16 +++----
 .../AnalysisGroupStateServiceTest.java        |  9 ++--
 .../AnalysisGroupValueServiceTest.java        | 23 +++++-----
 .../AnalysisGroupValueServiceTest2.java       | 33 +-------------
 .../labseer/service/AuthorServiceTests.java   | 10 ++---
 .../labseer/service/AutoLabelServiceTest.java |  9 ++--
 .../service/ContainerLSServiceTests.java      | 43 +++++++-----------
 .../ContainerLabelJsonServiceTests.java       |  6 +--
 .../CreateAnalysisGroupsFromCSVFileTests.java |  6 +--
 .../CreateGeneIDsFromCSVFileTests.java        | 32 +++++++------
 .../labseer/service/CreateProjectsTests.java  | 22 +++++----
 .../labseer/service/CronJobServiceTests.java  |  4 +-
 .../service/DataDictionaryCodeNameTest.java   |  4 +-
 .../service/ExperimentServiceTests.java       | 28 ++++++------
 .../service/ExperimentServiceTests2.java      | 22 ++++-----
 .../ExperimentServiceTests3_Nodes.java        | 15 ++-----
 .../service/ExperimentServiceTests4_Save.java | 13 +++---
 .../service/ExperimentStateServiceTests.java  |  8 ++--
 .../service/ExperimentValueServiceTests.java  |  8 ++--
 .../labseer/service/GeneDataServiceTests.java | 19 +++-----
 .../service/GeneThingServiceTests.java        | 13 +++---
 .../ItxLsThingLsThingServiceTests.java        | 10 ++---
 .../ItxSubjectContainerServiceTest.java       | 14 +-----
 .../service/LsThingGeneServiceTests.java      | 14 +++---
 .../LsThingPreferredIdServiceTests.java       | 35 +++------------
 .../service/LsThingServicePutTests.java       |  8 ++--
 .../labseer/service/LsThingServiceTests.java  | 29 +++++-------
 .../service/LsThingStateServiceTest.java      |  4 +-
 .../service/LsThingValueServiceTest.java      | 35 +--------------
 .../labseer/service/PreferredNameTest.java    |  4 +-
 .../labseer/service/ProtocolServiceTest.java  | 21 ++++-----
 .../ReadBulkTrasnferPart1CSVServiceTests.java | 10 ++---
 .../service/StructureServiceTests.java        |  6 +--
 .../labseer/service/SubjectServiceTest.java   | 16 +++----
 .../service/SubjectStateServiceTest.java      |  7 ++-
 .../service/SubjectValueServiceTest.java      | 14 +++---
 .../TreatmentGroupStateServiceTest.java       |  4 +-
 .../TreatmentGroupValueServiceTest.java       | 31 ++-----------
 .../labseer/service/UpdateLogServiceTest.java |  8 ++--
 .../labseer/utils/InitialSetupTest.java       |  6 +--
 .../labseer/utils/LicenseCheckTest.java       |  6 +--
 .../labsynch/labseer/utils/ReadPropsTest.java | 20 ++++-----
 .../labseer/utils/ReadResourceFileTest.java   |  5 +--
 .../utils/ReadSeuratUsersFileTest.java        |  1 -
 .../labseer/utils/SimpleJsonDateTest.java     |  6 +--
 .../labseer/utils/SimpleUtilTest.java         |  4 +-
 687 files changed, 2874 insertions(+), 2796 deletions(-)

diff --git a/src/main/java/com/labsynch/labseer/api/ApiAliasNameController.java b/src/main/java/com/labsynch/labseer/api/ApiAliasNameController.java
index f2e826bd4..9fc0ba822 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiAliasNameController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiAliasNameController.java
@@ -3,6 +3,13 @@
 import java.util.Collection;
 import java.util.List;
 
+import com.labsynch.labseer.domain.LotAliasKind;
+import com.labsynch.labseer.domain.LotAliasType;
+import com.labsynch.labseer.domain.ParentAliasKind;
+import com.labsynch.labseer.domain.ParentAliasType;
+import com.labsynch.labseer.dto.LotAliasDTO;
+import com.labsynch.labseer.dto.ParentAliasDTO;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
@@ -16,13 +23,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.LotAliasKind;
-import com.labsynch.labseer.domain.LotAliasType;
-import com.labsynch.labseer.domain.ParentAliasKind;
-import com.labsynch.labseer.domain.ParentAliasType;
-import com.labsynch.labseer.dto.LotAliasDTO;
-import com.labsynch.labseer.dto.ParentAliasDTO;
-
 @RequestMapping(value = {"/api/v1/aliases"})
 @Controller
 public class ApiAliasNameController {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiAnalysisGroupController.java b/src/main/java/com/labsynch/labseer/api/ApiAnalysisGroupController.java
index c1f0b8420..b3446837f 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiAnalysisGroupController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiAnalysisGroupController.java
@@ -1,38 +1,18 @@
 package com.labsynch.labseer.api;
 
-import java.io.BufferedReader;
-import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
 import com.labsynch.labseer.domain.AnalysisGroup;
 import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.domain.Experiment;
 import com.labsynch.labseer.domain.Subject;
 import com.labsynch.labseer.domain.SubjectState;
 import com.labsynch.labseer.domain.SubjectValue;
 import com.labsynch.labseer.domain.TreatmentGroup;
 import com.labsynch.labseer.domain.TreatmentGroupValue;
-import com.labsynch.labseer.dto.IdCollectionDTO;
 import com.labsynch.labseer.dto.KeyValueDTO;
 import com.labsynch.labseer.exceptions.NotFoundException;
 import com.labsynch.labseer.service.AnalysisGroupService;
@@ -43,6 +23,21 @@
 import com.labsynch.labseer.service.TreatmentGroupValueService;
 import com.labsynch.labseer.utils.SimpleUtil;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
 @Controller
 @RequestMapping("api/v1/analysisgroups")
 @Transactional
diff --git a/src/main/java/com/labsynch/labseer/api/ApiAnalysisGroupValueController.java b/src/main/java/com/labsynch/labseer/api/ApiAnalysisGroupValueController.java
index 1e6df24bd..1c8b16962 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiAnalysisGroupValueController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiAnalysisGroupValueController.java
@@ -1,8 +1,6 @@
 package com.labsynch.labseer.api;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -10,7 +8,12 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.io.IOUtils;
+import com.labsynch.labseer.domain.AnalysisGroupState;
+import com.labsynch.labseer.domain.AnalysisGroupValue;
+import com.labsynch.labseer.dto.AnalysisGroupValueDTO;
+import com.labsynch.labseer.dto.IdSetDTO;
+import com.labsynch.labseer.service.AnalysisGroupValueService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,12 +33,6 @@
 import org.supercsv.io.ICsvBeanWriter;
 import org.supercsv.prefs.CsvPreference;
 
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.dto.AnalysisGroupValueDTO;
-import com.labsynch.labseer.dto.IdSetDTO;
-import com.labsynch.labseer.service.AnalysisGroupValueService;
-
 import flexjson.JSONDeserializer;
 
 @Controller
diff --git a/src/main/java/com/labsynch/labseer/api/ApiAuthorController.java b/src/main/java/com/labsynch/labseer/api/ApiAuthorController.java
index 15f4db7c9..916fda501 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiAuthorController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiAuthorController.java
@@ -5,6 +5,18 @@
 import java.util.Date;
 import java.util.List;
 
+import com.labsynch.labseer.domain.Author;
+import com.labsynch.labseer.domain.LsThing;
+import com.labsynch.labseer.dto.AuthorBrowserQueryDTO;
+import com.labsynch.labseer.dto.AuthorNameDTO;
+import com.labsynch.labseer.dto.AuthorQueryResultDTO;
+import com.labsynch.labseer.dto.CodeTableDTO;
+import com.labsynch.labseer.dto.GenericQueryCodeTableResultDTO;
+import com.labsynch.labseer.exceptions.ErrorMessage;
+import com.labsynch.labseer.service.AuthorService;
+import com.labsynch.labseer.utils.PropertiesFileService;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,18 +32,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.dto.AuthorBrowserQueryDTO;
-import com.labsynch.labseer.dto.AuthorNameDTO;
-import com.labsynch.labseer.dto.AuthorQueryResultDTO;
-import com.labsynch.labseer.dto.CodeTableDTO;
-import com.labsynch.labseer.dto.GenericQueryCodeTableResultDTO;
-import com.labsynch.labseer.exceptions.ErrorMessage;
-import com.labsynch.labseer.service.AuthorService;
-import com.labsynch.labseer.utils.PropertiesFileService;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-
 @Controller
 @RequestMapping("api/v1/authors")
 public class ApiAuthorController {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiAuthorRoleController.java b/src/main/java/com/labsynch/labseer/api/ApiAuthorRoleController.java
index baabc1319..a42147278 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiAuthorRoleController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiAuthorRoleController.java
@@ -3,6 +3,11 @@
 import java.util.Collection;
 import java.util.List;
 
+import com.labsynch.labseer.domain.Author;
+import com.labsynch.labseer.domain.AuthorRole;
+import com.labsynch.labseer.dto.AuthorRoleDTO;
+import com.labsynch.labseer.service.AuthorRoleService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,11 +22,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.AuthorRole;
-import com.labsynch.labseer.dto.AuthorRoleDTO;
-import com.labsynch.labseer.service.AuthorRoleService;
-
 @Controller
 @RequestMapping("api/v1/authorroles")
 public class ApiAuthorRoleController {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiAuthorizationController.java b/src/main/java/com/labsynch/labseer/api/ApiAuthorizationController.java
index 3a7297823..e2375aea4 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiAuthorizationController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiAuthorizationController.java
@@ -6,6 +6,14 @@
 import javax.persistence.NoResultException;
 import javax.persistence.TypedQuery;
 
+import com.labsynch.labseer.domain.Author;
+import com.labsynch.labseer.domain.LsThing;
+import com.labsynch.labseer.dto.AuthGroupsAndProjectsDTO;
+import com.labsynch.labseer.dto.ChangePasswordDTO;
+import com.labsynch.labseer.dto.CodeTableDTO;
+import com.labsynch.labseer.service.AuthorService;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,14 +28,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.dto.AuthGroupsAndProjectsDTO;
-import com.labsynch.labseer.dto.ChangePasswordDTO;
-import com.labsynch.labseer.dto.CodeTableDTO;
-import com.labsynch.labseer.service.AuthorService;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-
 @Controller
 @RequestMapping("api/v1/authorization")
 public class ApiAuthorizationController {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiBulkLoadController.java b/src/main/java/com/labsynch/labseer/api/ApiBulkLoadController.java
index 16d268b70..1505df5eb 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiBulkLoadController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiBulkLoadController.java
@@ -2,6 +2,17 @@
 
 import java.util.Collection;
 
+import com.labsynch.labseer.domain.BulkLoadFile;
+import com.labsynch.labseer.domain.BulkLoadTemplate;
+import com.labsynch.labseer.dto.BulkLoadPropertiesDTO;
+import com.labsynch.labseer.dto.BulkLoadRegisterSDFRequestDTO;
+import com.labsynch.labseer.dto.BulkLoadRegisterSDFResponseDTO;
+import com.labsynch.labseer.dto.BulkLoadSDFPropertyRequestDTO;
+import com.labsynch.labseer.dto.BulkLoadSDFValidationPropertiesResponseDTO;
+import com.labsynch.labseer.dto.PurgeFileDependencyCheckResponseDTO;
+import com.labsynch.labseer.dto.PurgeFileResponseDTO;
+import com.labsynch.labseer.service.BulkLoadService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,22 +20,9 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import com.labsynch.labseer.domain.BulkLoadFile;
-import com.labsynch.labseer.domain.BulkLoadTemplate;
-import com.labsynch.labseer.dto.BulkLoadPropertiesDTO;
-import com.labsynch.labseer.dto.BulkLoadRegisterSDFResponseDTO;
-import com.labsynch.labseer.dto.BulkLoadSDFPropertyRequestDTO;
-import com.labsynch.labseer.dto.BulkLoadRegisterSDFRequestDTO;
-import com.labsynch.labseer.dto.BulkLoadSDFValidationPropertiesResponseDTO;
-import com.labsynch.labseer.dto.PurgeFileDependencyCheckResponseDTO;
-import com.labsynch.labseer.dto.PurgeFileResponseDTO;
-import com.labsynch.labseer.service.BulkLoadService;
 
 @RequestMapping(value = {"/api/v1/bulkload"})
 @Controller
diff --git a/src/main/java/com/labsynch/labseer/api/ApiCmpdSearchController.java b/src/main/java/com/labsynch/labseer/api/ApiCmpdSearchController.java
index 8b63389d9..7752f88f6 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiCmpdSearchController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiCmpdSearchController.java
@@ -1,11 +1,15 @@
 package com.labsynch.labseer.api;
 
 import java.io.IOException;
-import java.io.StringWriter;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Optional;
+
+import com.labsynch.labseer.dto.CmpdRegStructureSearchDTO;
+import com.labsynch.labseer.dto.PreferredNameDTO;
+import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
+import com.labsynch.labseer.service.ChemStructureService.SearchType;
+import com.labsynch.labseer.service.RegSearchService;
+import com.labsynch.labseer.service.SearchFormService;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,15 +26,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.dto.CmpdRegStructureSearchDTO;
-import com.labsynch.labseer.dto.PreferredNameDTO;
-import com.labsynch.labseer.dto.SearchCdIdReturnDTO;
-import com.labsynch.labseer.dto.SearchFormDTO;
-import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
-import com.labsynch.labseer.service.RegSearchService;
-import com.labsynch.labseer.service.SearchFormService;
-import com.labsynch.labseer.service.ChemStructureService.SearchType;
-
 @RequestMapping(value = {"/api/v1/structuresearch"})
 @Controller
 public class ApiCmpdSearchController {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiCompoundsController.java b/src/main/java/com/labsynch/labseer/api/ApiCompoundsController.java
index a9d013e93..add44d01f 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiCompoundsController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiCompoundsController.java
@@ -1,6 +1,8 @@
 package com.labsynch.labseer.api;
 
 
+import com.labsynch.labseer.dto.CmpdRegBatchCodeDTO;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
@@ -12,8 +14,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import com.labsynch.labseer.dto.CmpdRegBatchCodeDTO;
-
 @Controller
 @RequestMapping("api/v1/compounds")
 @Transactional
diff --git a/src/main/java/com/labsynch/labseer/api/ApiContainerController.java b/src/main/java/com/labsynch/labseer/api/ApiContainerController.java
index c7b4b1122..8f891b312 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiContainerController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiContainerController.java
@@ -6,24 +6,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import javax.persistence.NoResultException;
-import org.springframework.dao.IncorrectResultSizeDataAccessException;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.Author;
 import com.labsynch.labseer.domain.Container;
 import com.labsynch.labseer.domain.ContainerLabel;
 import com.labsynch.labseer.domain.ContainerState;
@@ -55,6 +39,22 @@
 import com.labsynch.labseer.utils.PropertiesUtilService;
 import com.labsynch.labseer.utils.SimpleUtil;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.IncorrectResultSizeDataAccessException;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
 import flexjson.JSONSerializer;
 
 @Controller
diff --git a/src/main/java/com/labsynch/labseer/api/ApiContainerStateController.java b/src/main/java/com/labsynch/labseer/api/ApiContainerStateController.java
index 687005f50..6c48b446b 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiContainerStateController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiContainerStateController.java
@@ -8,6 +8,18 @@
 import java.util.Date;
 import java.util.List;
 
+import com.labsynch.labseer.domain.Container;
+import com.labsynch.labseer.domain.ContainerState;
+import com.labsynch.labseer.domain.LsTransaction;
+import com.labsynch.labseer.domain.UpdateLog;
+import com.labsynch.labseer.dto.ContainerMiniDTO;
+import com.labsynch.labseer.dto.ContainerQueryResultDTO;
+import com.labsynch.labseer.dto.ContainerStateMiniDTO;
+import com.labsynch.labseer.dto.ContainerValueRequestDTO;
+import com.labsynch.labseer.service.ContainerService;
+import com.labsynch.labseer.service.ContainerStateService;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,26 +29,12 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ContainerState;
-import com.labsynch.labseer.domain.LsTransaction;
-import com.labsynch.labseer.domain.UpdateLog;
-import com.labsynch.labseer.dto.ContainerMiniDTO;
-import com.labsynch.labseer.dto.ContainerQueryResultDTO;
-import com.labsynch.labseer.dto.ContainerStateMiniDTO;
-import com.labsynch.labseer.dto.ContainerValueRequestDTO;
-import com.labsynch.labseer.service.ContainerService;
-import com.labsynch.labseer.service.ContainerStateService;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-
-import flexjson.JSONSerializer;
 import flexjson.JSONTokener;
 
 @Controller
diff --git a/src/main/java/com/labsynch/labseer/api/ApiCronJobController.java b/src/main/java/com/labsynch/labseer/api/ApiCronJobController.java
index ada67d371..8c9909196 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiCronJobController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiCronJobController.java
@@ -4,6 +4,10 @@
 import java.util.Collection;
 import java.util.List;
 
+import com.labsynch.labseer.domain.CronJob;
+import com.labsynch.labseer.service.CronJobService;
+import com.labsynch.labseer.utils.SimpleUtil;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,14 +20,8 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.CronJob;
-import com.labsynch.labseer.dto.CodeTableDTO;
-import com.labsynch.labseer.service.CronJobService;
-import com.labsynch.labseer.utils.SimpleUtil;
-
 @Transactional
 @RequestMapping("api/v1/cronjobs")
 @Controller
diff --git a/src/main/java/com/labsynch/labseer/api/ApiCurveFitController.java b/src/main/java/com/labsynch/labseer/api/ApiCurveFitController.java
index 9fcd7601a..cc45e39df 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiCurveFitController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiCurveFitController.java
@@ -3,6 +3,13 @@
 import java.util.Collection;
 import java.util.List;
 
+import com.labsynch.labseer.domain.ProtocolValue;
+import com.labsynch.labseer.dto.CurveFitDTO;
+import com.labsynch.labseer.dto.FlagWellDTO;
+import com.labsynch.labseer.dto.KiCurveFitDTO;
+import com.labsynch.labseer.dto.RawCurveDataDTO;
+import com.labsynch.labseer.dto.TgDataDTO;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
@@ -15,13 +22,6 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import com.labsynch.labseer.domain.ProtocolValue;
-import com.labsynch.labseer.dto.CurveFitDTO;
-import com.labsynch.labseer.dto.FlagWellDTO;
-import com.labsynch.labseer.dto.KiCurveFitDTO;
-import com.labsynch.labseer.dto.RawCurveDataDTO;
-import com.labsynch.labseer.dto.TgDataDTO;
-
 @Controller
 @RequestMapping("api/v1/curvefit")
 @Transactional
diff --git a/src/main/java/com/labsynch/labseer/api/ApiDDictValueController.java b/src/main/java/com/labsynch/labseer/api/ApiDDictValueController.java
index d4566dc00..396c05ea8 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiDDictValueController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiDDictValueController.java
@@ -4,6 +4,12 @@
 import java.util.Collection;
 import java.util.List;
 
+import com.labsynch.labseer.domain.DDictValue;
+import com.labsynch.labseer.dto.CodeTableDTO;
+import com.labsynch.labseer.exceptions.ErrorMessage;
+import com.labsynch.labseer.service.DataDictionaryService;
+import com.labsynch.labseer.utils.SimpleUtil;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,12 +25,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.DDictValue;
-import com.labsynch.labseer.dto.CodeTableDTO;
-import com.labsynch.labseer.exceptions.ErrorMessage;
-import com.labsynch.labseer.service.DataDictionaryService;
-import com.labsynch.labseer.utils.SimpleUtil;
-
 @Transactional
 @RequestMapping("api/v1/ddictvalues")
 @Controller
diff --git a/src/main/java/com/labsynch/labseer/api/ApiExperimentController.java b/src/main/java/com/labsynch/labseer/api/ApiExperimentController.java
index f8a8b7eaa..fb2bd23ab 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiExperimentController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiExperimentController.java
@@ -10,28 +10,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import javax.persistence.NoResultException;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.HandlerMapping;
-import org.supercsv.cellprocessor.ift.CellProcessor;
-import org.supercsv.io.CsvBeanWriter;
-import org.supercsv.io.ICsvBeanWriter;
-import org.supercsv.prefs.CsvPreference;
+import javax.servlet.http.HttpServletRequest;
 
 import com.labsynch.labseer.domain.AnalysisGroup;
 import com.labsynch.labseer.domain.AnalysisGroupValue;
@@ -77,6 +57,26 @@
 import com.labsynch.labseer.utils.PropertiesUtilService;
 import com.labsynch.labseer.utils.SimpleUtil;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.HandlerMapping;
+import org.supercsv.cellprocessor.ift.CellProcessor;
+import org.supercsv.io.CsvBeanWriter;
+import org.supercsv.io.ICsvBeanWriter;
+import org.supercsv.prefs.CsvPreference;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/api/ApiExperimentLabelController.java b/src/main/java/com/labsynch/labseer/api/ApiExperimentLabelController.java
index 248bf151d..11b0bfd4a 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiExperimentLabelController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiExperimentLabelController.java
@@ -2,6 +2,9 @@
 
 import java.util.List;
 
+import com.labsynch.labseer.domain.ExperimentLabel;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,9 +18,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.ExperimentLabel;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-
 
 @Transactional
 @RequestMapping("api/v1/experimentlabels")
diff --git a/src/main/java/com/labsynch/labseer/api/ApiExportController.java b/src/main/java/com/labsynch/labseer/api/ApiExportController.java
index 01c38ac77..508aaf830 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiExportController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiExportController.java
@@ -1,5 +1,9 @@
 package com.labsynch.labseer.api;
 
+import com.labsynch.labseer.dto.ExportResultDTO;
+import com.labsynch.labseer.dto.SearchResultExportRequestDTO;
+import com.labsynch.labseer.service.ExportService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,10 +16,6 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.dto.ExportResultDTO;
-import com.labsynch.labseer.dto.SearchResultExportRequestDTO;
-import com.labsynch.labseer.service.ExportService;
-
 @RequestMapping(value = {"/api/v1/export"})
 @Controller
 public class ApiExportController {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiFileSaveController.java b/src/main/java/com/labsynch/labseer/api/ApiFileSaveController.java
index 745e62ad9..bf8efae23 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiFileSaveController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiFileSaveController.java
@@ -5,12 +5,15 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.labsynch.labseer.domain.FileList;
+import com.labsynch.labseer.dto.FileSaveReturnDTO;
+import com.labsynch.labseer.dto.FileSaveSendDTO;
+import com.labsynch.labseer.utils.MimeTypeUtil;
+
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,13 +29,6 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-import com.labsynch.labseer.domain.FileList;
-import com.labsynch.labseer.dto.FileSaveReturnDTO;
-import com.labsynch.labseer.dto.FileSaveSendDTO;
-import com.labsynch.labseer.utils.MimeTypeUtil;
 
 @RequestMapping({"/api/v1/filesave", "/api/v1/MultipleFilePicker"})
 @Controller
diff --git a/src/main/java/com/labsynch/labseer/api/ApiFileTypeController.java b/src/main/java/com/labsynch/labseer/api/ApiFileTypeController.java
index b575a5618..177f0861b 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiFileTypeController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiFileTypeController.java
@@ -1,21 +1,16 @@
 package com.labsynch.labseer.api;
-import javax.servlet.http.HttpServletRequest;
+import com.labsynch.labseer.domain.FileType;
+import com.labsynch.labseer.utils.PropertiesUtilService;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.FileType;
-
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import org.springframework.beans.factory.annotation.Autowired;
-
 @RequestMapping(value = {"/api/v1/fileTypes"})
 @Controller
 public class ApiFileTypeController {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiIsotopeController.java b/src/main/java/com/labsynch/labseer/api/ApiIsotopeController.java
index bc4d0f025..a99e3e8b0 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiIsotopeController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiIsotopeController.java
@@ -1,12 +1,8 @@
 package com.labsynch.labseer.api;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-
 import com.labsynch.labseer.domain.Isotope;
 import com.labsynch.labseer.service.ErrorList;
 import com.labsynch.labseer.service.ErrorMessage;
@@ -17,17 +13,11 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
 
 @RequestMapping(value = {"/api/v1/isotopes"})
 @Controller
diff --git a/src/main/java/com/labsynch/labseer/api/ApiItxContainerContainerController.java b/src/main/java/com/labsynch/labseer/api/ApiItxContainerContainerController.java
index 4073c3f4d..e76981ace 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiItxContainerContainerController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiItxContainerContainerController.java
@@ -4,6 +4,10 @@
 import java.util.HashSet;
 import java.util.List;
 
+import com.labsynch.labseer.domain.ItxContainerContainer;
+import com.labsynch.labseer.service.ItxContainerContainerService;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,10 +22,6 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.ItxContainerContainer;
-import com.labsynch.labseer.service.ItxContainerContainerService;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-
 @Controller
 @RequestMapping("/api/v1/itxcontainercontainers")
 public class ApiItxContainerContainerController {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiItxContainerContainerValueController.java b/src/main/java/com/labsynch/labseer/api/ApiItxContainerContainerValueController.java
index 33e8b71eb..a77195db2 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiItxContainerContainerValueController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiItxContainerContainerValueController.java
@@ -5,6 +5,9 @@
 import java.io.StringReader;
 import java.util.List;
 
+import com.labsynch.labseer.domain.ItxContainerContainerValue;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -20,9 +23,6 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.ItxContainerContainerValue;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-
 import flexjson.JSONTokener;
 
 @Controller
diff --git a/src/main/java/com/labsynch/labseer/api/ApiItxExperimentExperimentController.java b/src/main/java/com/labsynch/labseer/api/ApiItxExperimentExperimentController.java
index 662bb0e00..df6a2e391 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiItxExperimentExperimentController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiItxExperimentExperimentController.java
@@ -4,6 +4,11 @@
 import java.util.HashSet;
 import java.util.List;
 
+import com.labsynch.labseer.domain.Experiment;
+import com.labsynch.labseer.domain.ItxExperimentExperiment;
+import com.labsynch.labseer.service.ItxExperimentExperimentService;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,11 +23,6 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ItxExperimentExperiment;
-import com.labsynch.labseer.service.ItxExperimentExperimentService;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-
 @Controller
 @RequestMapping("/api/v1/itxexperimentexperiments")
 public class ApiItxExperimentExperimentController {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiItxLsThingLsThingController.java b/src/main/java/com/labsynch/labseer/api/ApiItxLsThingLsThingController.java
index a53a77163..8f19d0920 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiItxLsThingLsThingController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiItxLsThingLsThingController.java
@@ -5,6 +5,14 @@
 import java.util.HashSet;
 import java.util.List;
 
+import com.labsynch.labseer.domain.ItxLsThingLsThing;
+import com.labsynch.labseer.domain.LsThing;
+import com.labsynch.labseer.dto.CodeTableDTO;
+import com.labsynch.labseer.exceptions.ErrorMessage;
+import com.labsynch.labseer.service.ItxLsThingLsThingService;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+import com.labsynch.labseer.utils.SimpleUtil;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,14 +28,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.ItxLsThingLsThing;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.dto.CodeTableDTO;
-import com.labsynch.labseer.exceptions.ErrorMessage;
-import com.labsynch.labseer.service.ItxLsThingLsThingService;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import com.labsynch.labseer.utils.SimpleUtil;
-
 @Controller
 @RequestMapping("/api/v1/itxLsThingLsThings")
 public class ApiItxLsThingLsThingController {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiItxProtocolProtocolController.java b/src/main/java/com/labsynch/labseer/api/ApiItxProtocolProtocolController.java
index 908bcf6b6..e9488498b 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiItxProtocolProtocolController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiItxProtocolProtocolController.java
@@ -4,6 +4,10 @@
 import java.util.HashSet;
 import java.util.List;
 
+import com.labsynch.labseer.domain.ItxProtocolProtocol;
+import com.labsynch.labseer.domain.Protocol;
+import com.labsynch.labseer.service.ItxProtocolProtocolService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,10 +23,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.ItxProtocolProtocol;
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.service.ItxProtocolProtocolService;
-
 @RequestMapping("/api/v1/itxprotocolprotocols")
 @Controller
 public class ApiItxProtocolProtocolController {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiItxSubjectContainerController.java b/src/main/java/com/labsynch/labseer/api/ApiItxSubjectContainerController.java
index 2906ac3a0..3d280e0af 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiItxSubjectContainerController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiItxSubjectContainerController.java
@@ -1,22 +1,16 @@
 package com.labsynch.labseer.api;
 
-import com.labsynch.labseer.domain.ItxContainerContainer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+
 import com.labsynch.labseer.domain.ItxSubjectContainer;
 import com.labsynch.labseer.domain.Subject;
 import com.labsynch.labseer.service.ItxSubjectContainerService;
 import com.labsynch.labseer.utils.PropertiesUtilService;
 import com.labsynch.labseer.utils.SimpleUtil;
 
-import flexjson.JSONTokener;
-
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-
-import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/labsynch/labseer/api/ApiKindController.java b/src/main/java/com/labsynch/labseer/api/ApiKindController.java
index 863a680a7..d789979b1 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiKindController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiKindController.java
@@ -4,6 +4,18 @@
 import java.util.Collection;
 import java.util.List;
 
+import com.labsynch.labseer.domain.ContainerKind;
+import com.labsynch.labseer.domain.DDictKind;
+import com.labsynch.labseer.domain.ExperimentKind;
+import com.labsynch.labseer.domain.InteractionKind;
+import com.labsynch.labseer.domain.LabelKind;
+import com.labsynch.labseer.domain.OperatorKind;
+import com.labsynch.labseer.domain.ProtocolKind;
+import com.labsynch.labseer.domain.StateKind;
+import com.labsynch.labseer.domain.ThingKind;
+import com.labsynch.labseer.domain.UnitKind;
+import com.labsynch.labseer.domain.ValueKind;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
@@ -17,18 +29,6 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.ContainerKind;
-import com.labsynch.labseer.domain.DDictKind;
-import com.labsynch.labseer.domain.ExperimentKind;
-import com.labsynch.labseer.domain.InteractionKind;
-import com.labsynch.labseer.domain.LabelKind;
-import com.labsynch.labseer.domain.OperatorKind;
-import com.labsynch.labseer.domain.ProtocolKind;
-import com.labsynch.labseer.domain.StateKind;
-import com.labsynch.labseer.domain.ThingKind;
-import com.labsynch.labseer.domain.UnitKind;
-import com.labsynch.labseer.domain.ValueKind;
-
 @Transactional
 @RequestMapping("api/v1")
 @Controller
diff --git a/src/main/java/com/labsynch/labseer/api/ApiLabelController.java b/src/main/java/com/labsynch/labseer/api/ApiLabelController.java
index ff175ac38..de939bf04 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiLabelController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiLabelController.java
@@ -4,6 +4,14 @@
 import java.util.Collection;
 import java.util.List;
 
+import com.labsynch.labseer.domain.AnalysisGroupLabel;
+import com.labsynch.labseer.domain.ContainerLabel;
+import com.labsynch.labseer.domain.ExperimentLabel;
+import com.labsynch.labseer.domain.LsThingLabel;
+import com.labsynch.labseer.domain.ProtocolLabel;
+import com.labsynch.labseer.domain.SubjectLabel;
+import com.labsynch.labseer.domain.TreatmentGroupLabel;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
@@ -17,14 +25,6 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.AnalysisGroupLabel;
-import com.labsynch.labseer.domain.ContainerLabel;
-import com.labsynch.labseer.domain.ExperimentLabel;
-import com.labsynch.labseer.domain.LsThingLabel;
-import com.labsynch.labseer.domain.ProtocolLabel;
-import com.labsynch.labseer.domain.SubjectLabel;
-import com.labsynch.labseer.domain.TreatmentGroupLabel;
-
 
 @Transactional
 @RequestMapping("api/v1")
diff --git a/src/main/java/com/labsynch/labseer/api/ApiLabelSequenceController.java b/src/main/java/com/labsynch/labseer/api/ApiLabelSequenceController.java
index 8a87411cf..2fbab8189 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiLabelSequenceController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiLabelSequenceController.java
@@ -1,5 +1,11 @@
 package com.labsynch.labseer.api;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.persistence.NonUniqueResultException;
+
 import com.labsynch.labseer.domain.AuthorRole;
 import com.labsynch.labseer.domain.LabelSequence;
 import com.labsynch.labseer.dto.AutoLabelDTO;
@@ -7,13 +13,6 @@
 import com.labsynch.labseer.service.AutoLabelService;
 import com.labsynch.labseer.service.LabelSequenceService;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.NonUniqueResultException;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/labsynch/labseer/api/ApiLicenseController.java b/src/main/java/com/labsynch/labseer/api/ApiLicenseController.java
index cbfced79d..1d10b0a28 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiLicenseController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiLicenseController.java
@@ -3,6 +3,9 @@
 import java.io.IOException;
 import java.net.URISyntaxException;
 
+import com.labsynch.labseer.dto.LicenseDTO;
+import com.labsynch.labseer.service.LicenseService;
+
 import org.bouncycastle.openpgp.PGPException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -16,9 +19,6 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.dto.LicenseDTO;
-import com.labsynch.labseer.service.LicenseService;
-
 @Controller
 @RequestMapping("/api/v1/license")
 @Transactional
diff --git a/src/main/java/com/labsynch/labseer/api/ApiLsRoleController.java b/src/main/java/com/labsynch/labseer/api/ApiLsRoleController.java
index 00f191734..000f9c0fb 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiLsRoleController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiLsRoleController.java
@@ -1,12 +1,11 @@
 package com.labsynch.labseer.api;
 
-import com.labsynch.labseer.domain.LsRole;
-import com.labsynch.labseer.dto.CodeTableDTO;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
+import com.labsynch.labseer.domain.LsRole;
+import com.labsynch.labseer.dto.CodeTableDTO;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/com/labsynch/labseer/api/ApiLsThingController.java b/src/main/java/com/labsynch/labseer/api/ApiLsThingController.java
index d2225c9ad..0b1dad928 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiLsThingController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiLsThingController.java
@@ -7,21 +7,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
 import com.labsynch.labseer.domain.LsThing;
 import com.labsynch.labseer.dto.CodeTableDTO;
 import com.labsynch.labseer.dto.CodeTypeKindDTO;
@@ -29,8 +14,8 @@
 import com.labsynch.labseer.dto.DependencyCheckDTO;
 import com.labsynch.labseer.dto.GeneOrthologDTO;
 import com.labsynch.labseer.dto.GeneOrthologFileDTO;
-import com.labsynch.labseer.dto.LsThingBrowserQueryDTO;
 import com.labsynch.labseer.dto.GenericQueryCodeTableResultDTO;
+import com.labsynch.labseer.dto.LsThingBrowserQueryDTO;
 import com.labsynch.labseer.dto.LsThingQueryCodeTableResultDTO;
 import com.labsynch.labseer.dto.LsThingQueryDTO;
 import com.labsynch.labseer.dto.LsThingQueryResultDTO;
@@ -42,12 +27,27 @@
 import com.labsynch.labseer.dto.StructureSearchDTO;
 import com.labsynch.labseer.exceptions.ErrorMessage;
 import com.labsynch.labseer.exceptions.LsThingValidationErrorMessage;
+import com.labsynch.labseer.service.ChemStructureService.SearchType;
 import com.labsynch.labseer.service.GeneThingService;
 import com.labsynch.labseer.service.LsThingService;
-import com.labsynch.labseer.service.ChemStructureService.SearchType;
 import com.labsynch.labseer.utils.PropertiesUtilService;
 import com.labsynch.labseer.utils.SimpleUtil;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
 import flexjson.JSONSerializer;
 
 @Controller
diff --git a/src/main/java/com/labsynch/labseer/api/ApiLsTransactionController.java b/src/main/java/com/labsynch/labseer/api/ApiLsTransactionController.java
index 2d963a272..1290571dc 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiLsTransactionController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiLsTransactionController.java
@@ -3,6 +3,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.labsynch.labseer.domain.LsTransaction;
+import com.labsynch.labseer.dto.LsTransactionQueryDTO;
+import com.labsynch.labseer.service.LsTransactionService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,10 +21,6 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.LsTransaction;
-import com.labsynch.labseer.dto.LsTransactionQueryDTO;
-import com.labsynch.labseer.service.LsTransactionService;
-
 @Controller
 @RequestMapping("/api/v1/lstransactions")
 @Transactional
diff --git a/src/main/java/com/labsynch/labseer/api/ApiMetalotController.java b/src/main/java/com/labsynch/labseer/api/ApiMetalotController.java
index 782733258..c17dd3db8 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiMetalotController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiMetalotController.java
@@ -1,9 +1,17 @@
 package com.labsynch.labseer.api;
 
-import java.io.UnsupportedEncodingException;
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
+import com.labsynch.labseer.domain.FileList;
+import com.labsynch.labseer.domain.IsoSalt;
+import com.labsynch.labseer.domain.Lot;
+import com.labsynch.labseer.domain.Parent;
+import com.labsynch.labseer.domain.SaltForm;
+import com.labsynch.labseer.dto.Metalot;
+import com.labsynch.labseer.dto.MetalotReturn;
+import com.labsynch.labseer.service.ChemStructureService;
+import com.labsynch.labseer.service.ErrorMessage;
+import com.labsynch.labseer.service.MetalotService;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,26 +22,12 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-import com.labsynch.labseer.domain.FileList;
-import com.labsynch.labseer.domain.IsoSalt;
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.domain.SaltForm;
-import com.labsynch.labseer.dto.Metalot;
-import com.labsynch.labseer.dto.MetalotReturn;
-import com.labsynch.labseer.service.ChemStructureService;
-import com.labsynch.labseer.service.ErrorMessage;
-import com.labsynch.labseer.service.MetalotService;
 
 @RequestMapping(value="/api/v1/metalots")
 @Controller
diff --git a/src/main/java/com/labsynch/labseer/api/ApiOperatorController.java b/src/main/java/com/labsynch/labseer/api/ApiOperatorController.java
index 0bf3e741b..a1dfe3c92 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiOperatorController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiOperatorController.java
@@ -1,5 +1,7 @@
 package com.labsynch.labseer.api;
 
+import com.labsynch.labseer.domain.Operator;
+
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -10,7 +12,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
-import com.labsynch.labseer.domain.Operator;
 
 @RequestMapping(value = {"/api/v1/operators"})
 @Transactional
diff --git a/src/main/java/com/labsynch/labseer/api/ApiParentAnnotationController.java b/src/main/java/com/labsynch/labseer/api/ApiParentAnnotationController.java
index af3702e52..c4c062a0d 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiParentAnnotationController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiParentAnnotationController.java
@@ -1,21 +1,17 @@
 package com.labsynch.labseer.api;
-import javax.servlet.http.HttpServletRequest;
+import com.labsynch.labseer.domain.ParentAnnotation;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.ParentAnnotation;
-
 @RequestMapping(value = {"/api/v1/parentAnnotations"})
 @Transactional
 @Controller
diff --git a/src/main/java/com/labsynch/labseer/api/ApiParentController.java b/src/main/java/com/labsynch/labseer/api/ApiParentController.java
index 85ba1e3bf..34069191e 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiParentController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiParentController.java
@@ -1,8 +1,13 @@
 package com.labsynch.labseer.api;
 
-import java.net.URLDecoder;
 import java.util.Collection;
 
+import com.labsynch.labseer.domain.Parent;
+import com.labsynch.labseer.dto.CodeTableDTO;
+import com.labsynch.labseer.dto.ParentEditDTO;
+import com.labsynch.labseer.dto.ParentValidationDTO;
+import com.labsynch.labseer.service.ParentService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,16 +19,8 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.dto.CodeTableDTO;
-import com.labsynch.labseer.dto.ParentEditDTO;
-import com.labsynch.labseer.dto.ParentValidationDTO;
-import com.labsynch.labseer.service.ParentService;
-import com.labsynch.labseer.utils.SecurityUtil;
-
 @RequestMapping(value = {"/api/v1/parents"})
 @Controller
 public class ApiParentController {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiParentLotController.java b/src/main/java/com/labsynch/labseer/api/ApiParentLotController.java
index 815e7c4a0..713e9cb3e 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiParentLotController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiParentLotController.java
@@ -3,6 +3,15 @@
 import java.util.Collection;
 import java.util.List;
 
+import com.labsynch.labseer.domain.Lot;
+import com.labsynch.labseer.dto.CodeTableDTO;
+import com.labsynch.labseer.dto.LotDTO;
+import com.labsynch.labseer.dto.LotsByProjectDTO;
+import com.labsynch.labseer.dto.ParentLotCodeDTO;
+import com.labsynch.labseer.dto.ReparentLotDTO;
+import com.labsynch.labseer.service.LotService;
+import com.labsynch.labseer.service.ParentLotService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,18 +26,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.dto.CodeTableDTO;
-import com.labsynch.labseer.dto.LotDTO;
-import com.labsynch.labseer.dto.LotsByProjectDTO;
-import com.labsynch.labseer.dto.ParentEditDTO;
-import com.labsynch.labseer.dto.ParentLotCodeDTO;
-import com.labsynch.labseer.dto.ReparentLotDTO;
-import com.labsynch.labseer.service.LotService;
-import com.labsynch.labseer.service.ParentLotService;
-import com.labsynch.labseer.utils.SecurityUtil;
-
 @RequestMapping(value = {"/api/v1/parentLot"})
 @Controller
 public class ApiParentLotController {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiPhysicalStateController.java b/src/main/java/com/labsynch/labseer/api/ApiPhysicalStateController.java
index 403977dc3..95e73f696 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiPhysicalStateController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiPhysicalStateController.java
@@ -1,31 +1,18 @@
 package com.labsynch.labseer.api;
-import java.io.UnsupportedEncodingException;
-import java.util.Collection;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
+import com.labsynch.labseer.domain.PhysicalState;
+import com.labsynch.labseer.utils.PropertiesUtilService;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-import com.labsynch.labseer.domain.PhysicalState;
-
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import org.springframework.beans.factory.annotation.Autowired;
 
 @RequestMapping(value = {"/api/v1/physicalStates"})
 @Transactional
diff --git a/src/main/java/com/labsynch/labseer/api/ApiPreferredIdController.java b/src/main/java/com/labsynch/labseer/api/ApiPreferredIdController.java
index 65f8d9d81..14699e9b3 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiPreferredIdController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiPreferredIdController.java
@@ -3,6 +3,8 @@
 import java.util.Collection;
 import java.util.HashSet;
 
+import com.labsynch.labseer.dto.PreferredNameDTO;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
@@ -16,8 +18,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.dto.PreferredNameDTO;
-
 @RequestMapping(value = {"/api/v1"})
 @Controller
 public class ApiPreferredIdController {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiProjectController.java b/src/main/java/com/labsynch/labseer/api/ApiProjectController.java
index b2c0a310f..997a7510a 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiProjectController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiProjectController.java
@@ -1,13 +1,11 @@
 package com.labsynch.labseer.api;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.List;
+
+import com.labsynch.labseer.dto.BatchProjectDTO;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -15,11 +13,8 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.dto.BatchProjectDTO;
-
 @RequestMapping(value = {"/api/v1/projects"})
 @Controller
 public class ApiProjectController {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiProtocolController.java b/src/main/java/com/labsynch/labseer/api/ApiProtocolController.java
index 25e11598f..b5c08395d 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiProtocolController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiProtocolController.java
@@ -9,13 +9,28 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.persistence.NoResultException;
 import javax.servlet.http.HttpServletRequest;
 
+import com.labsynch.labseer.domain.Experiment;
+import com.labsynch.labseer.domain.ExperimentValue;
+import com.labsynch.labseer.domain.Protocol;
+import com.labsynch.labseer.domain.ProtocolValue;
+import com.labsynch.labseer.dto.CodeTableDTO;
+import com.labsynch.labseer.dto.DateValueComparisonRequest;
+import com.labsynch.labseer.dto.ProtocolDTO;
+import com.labsynch.labseer.dto.ProtocolErrorMessageDTO;
+import com.labsynch.labseer.exceptions.ErrorMessage;
+import com.labsynch.labseer.exceptions.UniqueNameException;
+import com.labsynch.labseer.service.ExperimentValueService;
+import com.labsynch.labseer.service.ProtocolService;
+import com.labsynch.labseer.service.ProtocolValueService;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import javax.persistence.NoResultException;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -29,21 +44,6 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.HandlerMapping;
 
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentValue;
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ProtocolValue;
-import com.labsynch.labseer.dto.CodeTableDTO;
-import com.labsynch.labseer.dto.DateValueComparisonRequest;
-import com.labsynch.labseer.dto.ProtocolDTO;
-import com.labsynch.labseer.dto.ProtocolErrorMessageDTO;
-import com.labsynch.labseer.exceptions.ErrorMessage;
-import com.labsynch.labseer.exceptions.UniqueNameException;
-import com.labsynch.labseer.service.ExperimentValueService;
-import com.labsynch.labseer.service.ProtocolService;
-import com.labsynch.labseer.service.ProtocolValueService;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-
 import flexjson.JSONSerializer;
 
 @Controller
diff --git a/src/main/java/com/labsynch/labseer/api/ApiPurityMeasuredByController.java b/src/main/java/com/labsynch/labseer/api/ApiPurityMeasuredByController.java
index 9b3bc1582..63bc4699d 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiPurityMeasuredByController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiPurityMeasuredByController.java
@@ -1,23 +1,18 @@
 package com.labsynch.labseer.api;
-import javax.servlet.http.HttpServletRequest;
+import com.labsynch.labseer.domain.PurityMeasuredBy;
+import com.labsynch.labseer.utils.PropertiesUtilService;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.PurityMeasuredBy;
-
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import org.springframework.beans.factory.annotation.Autowired;
-
 
 @RequestMapping(value = {"/api/v1/purityMeasuredBys"})
 @Controller
diff --git a/src/main/java/com/labsynch/labseer/api/ApiRegSearchController.java b/src/main/java/com/labsynch/labseer/api/ApiRegSearchController.java
index 2b4db2c67..5a99015c3 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiRegSearchController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiRegSearchController.java
@@ -1,9 +1,10 @@
 package com.labsynch.labseer.api;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 
-import javax.servlet.http.HttpServletRequest;
+import com.labsynch.labseer.dto.RegSearchDTO;
+import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
+import com.labsynch.labseer.service.RegSearchService;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,12 +18,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
-
-import com.labsynch.labseer.dto.RegSearchDTO;
-import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
-import com.labsynch.labseer.service.RegSearchService;
 
 @RequestMapping(value ={"/api/v1/regsearches", "/api/v1/regSearches"})
 @Controller
diff --git a/src/main/java/com/labsynch/labseer/api/ApiSaltController.java b/src/main/java/com/labsynch/labseer/api/ApiSaltController.java
index b188c04cb..15ebd0a03 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiSaltController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSaltController.java
@@ -4,9 +4,6 @@
 import java.util.Collection;
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-
 import com.labsynch.labseer.domain.Salt;
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
 import com.labsynch.labseer.exceptions.StructureSaveException;
@@ -23,17 +20,12 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.util.UriUtils;
-import org.springframework.web.util.WebUtils;
 
 @RequestMapping(value = {"/api/v1/salts"})
 @Transactional
diff --git a/src/main/java/com/labsynch/labseer/api/ApiSearchFormController.java b/src/main/java/com/labsynch/labseer/api/ApiSearchFormController.java
index fcaa3f47f..17a0175be 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiSearchFormController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSearchFormController.java
@@ -3,6 +3,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.labsynch.labseer.dto.SearchFormDTO;
+import com.labsynch.labseer.dto.SearchFormReturnDTO;
+import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
+import com.labsynch.labseer.service.ErrorMessage;
+import com.labsynch.labseer.service.SearchFormService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,12 +22,6 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import com.labsynch.labseer.dto.SearchFormDTO;
-import com.labsynch.labseer.dto.SearchFormReturnDTO;
-import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
-import com.labsynch.labseer.service.ErrorMessage;
-import com.labsynch.labseer.service.SearchFormService;
-
 @RequestMapping(value = {"/api/v1/searchforms", "/api/v1/search"})
 @Controller
 public class ApiSearchFormController {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiSetupController.java b/src/main/java/com/labsynch/labseer/api/ApiSetupController.java
index 373177db8..49fb41e2b 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiSetupController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSetupController.java
@@ -4,18 +4,6 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
 import com.labsynch.labseer.domain.ContainerKind;
 import com.labsynch.labseer.domain.ContainerType;
 import com.labsynch.labseer.domain.DDictKind;
@@ -48,6 +36,18 @@
 import com.labsynch.labseer.service.DataDictionaryService;
 import com.labsynch.labseer.service.LabelSequenceService;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
 @Controller
 @RequestMapping("api/v1/setup")
 @Transactional
diff --git a/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java b/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java
index 14946f506..7e6f316f7 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java
@@ -1,11 +1,9 @@
 package com.labsynch.labseer.api;
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -18,20 +16,15 @@
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.BeanWrapperImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.MessageSource;
-import org.springframework.core.convert.ConversionService;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 @RequestMapping(value = {"/api/v1/solutionUnits"})
diff --git a/src/main/java/com/labsynch/labseer/api/ApiStandardizationServicesController.java b/src/main/java/com/labsynch/labseer/api/ApiStandardizationServicesController.java
index 6dfeb71fa..57693a624 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiStandardizationServicesController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiStandardizationServicesController.java
@@ -5,6 +5,14 @@
 
 import javax.persistence.TypedQuery;
 
+import com.labsynch.labseer.domain.StandardizationDryRunCompound;
+import com.labsynch.labseer.domain.StandardizationHistory;
+import com.labsynch.labseer.domain.StandardizationSettings;
+import com.labsynch.labseer.dto.StandardizationDryRunSearchDTO;
+import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
+import com.labsynch.labseer.exceptions.StandardizerException;
+import com.labsynch.labseer.service.StandardizationService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,17 +27,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import flexjson.JSONDeserializer;
-
-import com.labsynch.labseer.domain.StandardizationDryRunCompound;
-import com.labsynch.labseer.domain.StandardizationHistory;
-import com.labsynch.labseer.domain.StandardizationSettings;
-import com.labsynch.labseer.dto.StandardizationDryRunSearchDTO;
-import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
-import com.labsynch.labseer.exceptions.StandardizerException;
-import com.labsynch.labseer.service.ChemStructureService;
-import com.labsynch.labseer.service.StandardizationService;
-
 @RequestMapping(value = {"/api/v1/standardization"})
 @Controller
 public class ApiStandardizationServicesController {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiStateController.java b/src/main/java/com/labsynch/labseer/api/ApiStateController.java
index d0d464093..47f9a264f 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiStateController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiStateController.java
@@ -4,20 +4,6 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
 import com.labsynch.labseer.domain.AnalysisGroupState;
 import com.labsynch.labseer.domain.ContainerState;
 import com.labsynch.labseer.domain.ExperimentState;
@@ -49,6 +35,20 @@
 import com.labsynch.labseer.service.SubjectStateService;
 import com.labsynch.labseer.service.TreatmentGroupStateService;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
 @Controller
 @RequestMapping("api/v1")
 @Transactional
diff --git a/src/main/java/com/labsynch/labseer/api/ApiStereoCategoryController.java b/src/main/java/com/labsynch/labseer/api/ApiStereoCategoryController.java
index dd7153698..0ca9a8198 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiStereoCategoryController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiStereoCategoryController.java
@@ -3,8 +3,14 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.labsynch.labseer.domain.Parent;
+import com.labsynch.labseer.domain.StereoCategory;
+import com.labsynch.labseer.service.ErrorMessage;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -16,13 +22,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.domain.StereoCategory;
-
-import com.labsynch.labseer.service.ErrorMessage;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import org.springframework.beans.factory.annotation.Autowired;
-
 @RequestMapping(value = {"/api/v1/stereoCategories"})
 @Controller
 public class ApiStereoCategoryController {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiStructureController.java b/src/main/java/com/labsynch/labseer/api/ApiStructureController.java
index 90ec17317..cbadf5574 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiStructureController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiStructureController.java
@@ -3,10 +3,20 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
+import javax.persistence.NoResultException;
+
+import com.labsynch.labseer.domain.ChemStructure;
+import com.labsynch.labseer.dto.MolPropertiesDTO;
+import com.labsynch.labseer.dto.RenderMolRequestDTO;
+import com.labsynch.labseer.dto.StructureSearchDTO;
+import com.labsynch.labseer.exceptions.NotFoundException;
+import com.labsynch.labseer.service.ChemStructureService.SearchType;
+import com.labsynch.labseer.service.LsThingService;
+import com.labsynch.labseer.service.StructureService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import javax.persistence.NoResultException;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -20,15 +30,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.ChemStructure;
-import com.labsynch.labseer.dto.MolPropertiesDTO;
-import com.labsynch.labseer.dto.RenderMolRequestDTO;
-import com.labsynch.labseer.dto.StructureSearchDTO;
-import com.labsynch.labseer.exceptions.NotFoundException;
-import com.labsynch.labseer.service.LsThingService;
-import com.labsynch.labseer.service.StructureService;
-import com.labsynch.labseer.service.ChemStructureService.SearchType;
-
 @Controller
 @RequestMapping("api/v1/structure")
 @Transactional
diff --git a/src/main/java/com/labsynch/labseer/api/ApiStructureImageController.java b/src/main/java/com/labsynch/labseer/api/ApiStructureImageController.java
index 7ed9fab0f..d15dfae42 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiStructureImageController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiStructureImageController.java
@@ -2,6 +2,12 @@
 
 import java.util.List;
 
+import com.labsynch.labseer.domain.Lot;
+import com.labsynch.labseer.domain.Parent;
+import com.labsynch.labseer.domain.SaltForm;
+import com.labsynch.labseer.domain.StandardizationDryRunCompound;
+import com.labsynch.labseer.service.StructureImageService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,12 +24,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.domain.SaltForm;
-import com.labsynch.labseer.domain.StandardizationDryRunCompound;
-import com.labsynch.labseer.service.StructureImageService;
-
 @RequestMapping("/api/v1/structureimage")
 @Controller
 @Transactional
diff --git a/src/main/java/com/labsynch/labseer/api/ApiStructureServicesController.java b/src/main/java/com/labsynch/labseer/api/ApiStructureServicesController.java
index c4072963c..20dc9eaec 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiStructureServicesController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiStructureServicesController.java
@@ -1,8 +1,15 @@
 package com.labsynch.labseer.api;
 
 import java.io.IOException;
-import java.util.Collection;
-import java.util.List;
+
+import com.labsynch.labseer.dto.HydrogenizeMolInputDTO;
+import com.labsynch.labseer.dto.MolCleanInputDTO;
+import com.labsynch.labseer.dto.MolConvertInputDTO;
+import com.labsynch.labseer.dto.MolConvertOutputDTO;
+import com.labsynch.labseer.dto.MolInputDTO;
+import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
+import com.labsynch.labseer.exceptions.StandardizerException;
+import com.labsynch.labseer.service.ChemStructureService;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -11,26 +18,11 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.ParentAliasKind;
-import com.labsynch.labseer.domain.ParentAliasType;
-import com.labsynch.labseer.dto.HydrogenizeMolInputDTO;
-import com.labsynch.labseer.dto.MolCleanInputDTO;
-import com.labsynch.labseer.dto.MolConvertInputDTO;
-import com.labsynch.labseer.dto.MolConvertOutputDTO;
-import com.labsynch.labseer.dto.MolInputDTO;
-import com.labsynch.labseer.dto.ParentAliasDTO;
-import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
-import com.labsynch.labseer.exceptions.StandardizerException;
-import com.labsynch.labseer.service.ChemStructureService;
-import com.labsynch.labseer.service.SearchFormService;
-
 @RequestMapping(value = {"/api/v1/structureServices"})
 @Controller
 public class ApiStructureServicesController {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiSubjectController.java b/src/main/java/com/labsynch/labseer/api/ApiSubjectController.java
index cc843958f..3eb4a4227 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiSubjectController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSubjectController.java
@@ -8,23 +8,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import javax.persistence.NoResultException;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.Container;
 import com.labsynch.labseer.domain.Subject;
 import com.labsynch.labseer.domain.SubjectValue;
 import com.labsynch.labseer.dto.ContainerSubjectsDTO;
@@ -42,6 +27,21 @@
 import com.labsynch.labseer.service.SubjectValueService;
 import com.labsynch.labseer.utils.SimpleUtil;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
 @Controller
 @RequestMapping("api/v1/subjects")
 @Transactional
diff --git a/src/main/java/com/labsynch/labseer/api/ApiSubjectValueController.java b/src/main/java/com/labsynch/labseer/api/ApiSubjectValueController.java
index 868f559de..b2d70ec5a 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiSubjectValueController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSubjectValueController.java
@@ -1,6 +1,7 @@
 package com.labsynch.labseer.api;
 
-import java.util.List;
+import com.labsynch.labseer.domain.SubjectState;
+import com.labsynch.labseer.domain.SubjectValue;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -10,15 +11,11 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.SubjectState;
-import com.labsynch.labseer.domain.SubjectValue;
-
 @Transactional
 @RequestMapping("api/v1/subjectvalues")
 @Controller
diff --git a/src/main/java/com/labsynch/labseer/api/ApiTreatmentGroupController.java b/src/main/java/com/labsynch/labseer/api/ApiTreatmentGroupController.java
index 802696955..3ea5fa169 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiTreatmentGroupController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiTreatmentGroupController.java
@@ -1,12 +1,13 @@
 package com.labsynch.labseer.api;
 
-import java.io.BufferedReader;
-import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.commons.io.IOUtils;
+import com.labsynch.labseer.domain.TreatmentGroup;
+import com.labsynch.labseer.service.TreatmentGroupService;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,18 +20,8 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.service.SubjectValueService;
-import com.labsynch.labseer.service.TreatmentGroupService;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-
-import flexjson.JSONTokener;
-
 @Controller
 @RequestMapping("api/v1/treatmentgroups")
 @Transactional
diff --git a/src/main/java/com/labsynch/labseer/api/ApiTypeController.java b/src/main/java/com/labsynch/labseer/api/ApiTypeController.java
index 85d97853a..9951cd3c3 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiTypeController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiTypeController.java
@@ -4,6 +4,18 @@
 import java.util.Collection;
 import java.util.List;
 
+import com.labsynch.labseer.domain.ContainerType;
+import com.labsynch.labseer.domain.DDictType;
+import com.labsynch.labseer.domain.ExperimentType;
+import com.labsynch.labseer.domain.InteractionType;
+import com.labsynch.labseer.domain.LabelType;
+import com.labsynch.labseer.domain.OperatorType;
+import com.labsynch.labseer.domain.ProtocolType;
+import com.labsynch.labseer.domain.StateType;
+import com.labsynch.labseer.domain.ThingType;
+import com.labsynch.labseer.domain.UnitType;
+import com.labsynch.labseer.domain.ValueType;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
@@ -17,18 +29,6 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.ContainerType;
-import com.labsynch.labseer.domain.DDictType;
-import com.labsynch.labseer.domain.ExperimentType;
-import com.labsynch.labseer.domain.InteractionType;
-import com.labsynch.labseer.domain.LabelType;
-import com.labsynch.labseer.domain.OperatorType;
-import com.labsynch.labseer.domain.ProtocolType;
-import com.labsynch.labseer.domain.StateType;
-import com.labsynch.labseer.domain.ThingType;
-import com.labsynch.labseer.domain.UnitType;
-import com.labsynch.labseer.domain.ValueType;
-
 @Transactional
 @RequestMapping("api/v1")
 @Controller
diff --git a/src/main/java/com/labsynch/labseer/api/ApiValueController.java b/src/main/java/com/labsynch/labseer/api/ApiValueController.java
index 687274934..e2fdd8e1d 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiValueController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiValueController.java
@@ -4,21 +4,6 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
 import com.labsynch.labseer.domain.AnalysisGroupValue;
 import com.labsynch.labseer.domain.ContainerValue;
 import com.labsynch.labseer.domain.ExperimentValue;
@@ -46,6 +31,21 @@
 import com.labsynch.labseer.service.SubjectValueService;
 import com.labsynch.labseer.service.TreatmentGroupValueService;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
 @Controller
 @RequestMapping("api/v1")
 @Transactional
diff --git a/src/main/java/com/labsynch/labseer/api/ApiValueKindController.java b/src/main/java/com/labsynch/labseer/api/ApiValueKindController.java
index 443970edb..5a77efe95 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiValueKindController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiValueKindController.java
@@ -4,9 +4,14 @@
 import java.util.HashSet;
 import java.util.List;
 
+import javax.persistence.NoResultException;
+
+import com.labsynch.labseer.domain.ValueKind;
+import com.labsynch.labseer.domain.ValueType;
+import com.labsynch.labseer.dto.ValueTypeKindDTO;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import javax.persistence.NoResultException;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -16,10 +21,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import com.labsynch.labseer.domain.ValueKind;
-import com.labsynch.labseer.domain.ValueType;
-import com.labsynch.labseer.dto.ValueTypeKindDTO;
-
 @Transactional
 @RequestMapping("api/v1/valuekinds")
 @Controller
diff --git a/src/main/java/com/labsynch/labseer/api/ApiVendorController.java b/src/main/java/com/labsynch/labseer/api/ApiVendorController.java
index a6c14c560..d03e05dce 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiVendorController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiVendorController.java
@@ -3,8 +3,14 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.labsynch.labseer.domain.Lot;
+import com.labsynch.labseer.domain.Vendor;
+import com.labsynch.labseer.service.ErrorMessage;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -16,13 +22,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.domain.Vendor;
-
-import com.labsynch.labseer.service.ErrorMessage;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import org.springframework.beans.factory.annotation.Autowired;
-
 @RequestMapping(value = {"/api/v1/vendors"})
 @Controller
 public class ApiVendorController {
diff --git a/src/main/java/com/labsynch/labseer/api/RegisterCompoundsController.java b/src/main/java/com/labsynch/labseer/api/RegisterCompoundsController.java
index 84243e3d1..b091758be 100755
--- a/src/main/java/com/labsynch/labseer/api/RegisterCompoundsController.java
+++ b/src/main/java/com/labsynch/labseer/api/RegisterCompoundsController.java
@@ -2,6 +2,8 @@
 
 import java.util.HashMap;
 
+import com.labsynch.labseer.utils.LoadFullCompoundsUtil;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,8 +15,6 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import com.labsynch.labseer.utils.LoadFullCompoundsUtil;
-
 @RequestMapping(value = {"/api/v1/registration"})
 @Controller
 public class RegisterCompoundsController {
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure.java
index 4af177170..3570c9759 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure.java
@@ -1,18 +1,22 @@
 package com.labsynch.labseer.chemclasses.bbchem;
 
-import com.labsynch.labseer.domain.AbstractBBChemStructure;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.TypedQuery;
+
+import com.labsynch.labseer.domain.AbstractBBChemStructure;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 public class BBChemDryRunStructure extends AbstractBBChemStructure {
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure.java
index 41e456fa6..a1431fde9 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure.java
@@ -3,6 +3,7 @@
 import java.util.BitSet;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
@@ -10,13 +11,15 @@
 
 import com.labsynch.labseer.domain.AbstractBBChemStructure;
 import com.labsynch.labseer.utils.SimpleUtil;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure.java
index 63b0f6e12..19e32127c 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure.java
@@ -3,6 +3,7 @@
 import java.util.BitSet;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
@@ -10,13 +11,15 @@
 
 import com.labsynch.labseer.domain.AbstractBBChemStructure;
 import com.labsynch.labseer.utils.SimpleUtil;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure.java
index 0d059fc28..8d6b6796b 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure.java
@@ -1,18 +1,22 @@
 package com.labsynch.labseer.chemclasses.bbchem;
 
-import com.labsynch.labseer.domain.AbstractBBChemStructure;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.TypedQuery;
+
+import com.labsynch.labseer.domain.AbstractBBChemStructure;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure.java
index 0b148a7f3..5c3b68579 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure.java
@@ -1,18 +1,22 @@
 package com.labsynch.labseer.chemclasses.bbchem;
 
-import com.labsynch.labseer.domain.AbstractBBChemStructure;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.TypedQuery;
+
+import com.labsynch.labseer.domain.AbstractBBChemStructure;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStructureService.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStructureService.java
index 405946d85..8361f5de8 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStructureService.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStructureService.java
@@ -4,10 +4,10 @@
 import java.util.List;
 import java.util.Map.Entry;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.labsynch.labseer.domain.AbstractBBChemStructure;
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStructureServiceImpl.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStructureServiceImpl.java
index ce962e64e..8df07ca83 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStructureServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStructureServiceImpl.java
@@ -7,37 +7,34 @@
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.BitSet;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Collection;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.Future;
-import java.util.Collections;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
 import com.labsynch.labseer.domain.AbstractBBChemStructure;
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
 import com.labsynch.labseer.utils.PropertiesUtilService;
-import com.labsynch.labseer.utils.SimpleUtil;
-import com.labsynch.labseer.utils.SimpleUtil.PostResponse;
-import com.labsynch.labseer.utils.Response;
 import com.labsynch.labseer.utils.Request;
+import com.labsynch.labseer.utils.Response;
+import com.labsynch.labseer.utils.SimpleUtil;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
 
 @Component
 public class BBChemStructureServiceImpl  implements BBChemStructureService {
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/ChemStructureServiceBBChemImpl.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/ChemStructureServiceBBChemImpl.java
index fb0a8b005..1dc104c8f 100755
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/ChemStructureServiceBBChemImpl.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/ChemStructureServiceBBChemImpl.java
@@ -1,18 +1,26 @@
 package com.labsynch.labseer.chemclasses.bbchem;
 
+import static java.lang.Math.toIntExact;
+
 import java.io.IOException;
 import java.math.BigInteger;
-import java.net.HttpURLConnection;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Base64;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import javax.persistence.TypedQuery;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
 import com.labsynch.labseer.chemclasses.CmpdRegMolecule.RegistrationStatus;
 import com.labsynch.labseer.chemclasses.CmpdRegMolecule.StandardizationStatus;
@@ -29,29 +37,12 @@
 import com.labsynch.labseer.utils.PropertiesUtilService;
 import com.labsynch.labseer.utils.SimpleUtil;
 
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
-import java.util.UUID;
-import java.util.Map.Entry;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
-
-import static java.lang.Math.toIntExact;
 @Component
 public class ChemStructureServiceBBChemImpl implements ChemStructureService {
 
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/CmpdRegMoleculeBBChemImpl.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/CmpdRegMoleculeBBChemImpl.java
index c1760075d..bca52352a 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/CmpdRegMoleculeBBChemImpl.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/CmpdRegMoleculeBBChemImpl.java
@@ -2,18 +2,15 @@
 
 import java.io.IOException;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
 import com.labsynch.labseer.utils.SimpleUtil;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.stereotype.Component;
 
 public class CmpdRegMoleculeBBChemImpl implements CmpdRegMolecule {
 
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/CmpdRegSDFWriterBBChemImpl.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/CmpdRegSDFWriterBBChemImpl.java
index f950f67f4..c178411ca 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/CmpdRegSDFWriterBBChemImpl.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/CmpdRegSDFWriterBBChemImpl.java
@@ -4,15 +4,15 @@
 import java.io.FileWriter;
 import java.io.IOException;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.beans.factory.annotation.Autowired;
-
 import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
 import com.labsynch.labseer.chemclasses.CmpdRegSDFWriter;
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
+
 
 @Configurable
 public class CmpdRegSDFWriterBBChemImpl implements CmpdRegSDFWriter {
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure.java b/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure.java
index 1439892ff..9432dbcf5 100644
--- a/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure.java
+++ b/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure.java
@@ -5,6 +5,7 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -24,8 +25,7 @@
 import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
 import com.labsynch.labseer.chemclasses.CmpdRegMolecule.RegistrationStatus;
 import com.labsynch.labseer.chemclasses.CmpdRegMolecule.StandardizationStatus;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.hibernate.annotations.Type;
@@ -33,6 +33,9 @@
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractLabel.java b/src/main/java/com/labsynch/labseer/domain/AbstractLabel.java
index 7a919d4ac..56ef85911 100755
--- a/src/main/java/com/labsynch/labseer/domain/AbstractLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/AbstractLabel.java
@@ -2,6 +2,7 @@
 
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -17,6 +18,7 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractState.java b/src/main/java/com/labsynch/labseer/domain/AbstractState.java
index 45e2d0b86..b4a03b21a 100755
--- a/src/main/java/com/labsynch/labseer/domain/AbstractState.java
+++ b/src/main/java/com/labsynch/labseer/domain/AbstractState.java
@@ -2,6 +2,7 @@
 
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -17,6 +18,7 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractThing.java b/src/main/java/com/labsynch/labseer/domain/AbstractThing.java
index 1a5633c73..8f09c076c 100755
--- a/src/main/java/com/labsynch/labseer/domain/AbstractThing.java
+++ b/src/main/java/com/labsynch/labseer/domain/AbstractThing.java
@@ -22,6 +22,7 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractValue.java b/src/main/java/com/labsynch/labseer/domain/AbstractValue.java
index 4c3bcd834..cfbf6c597 100755
--- a/src/main/java/com/labsynch/labseer/domain/AbstractValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/AbstractValue.java
@@ -3,6 +3,7 @@
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -20,6 +21,7 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroup.java b/src/main/java/com/labsynch/labseer/domain/AnalysisGroup.java
index bec86a8e3..4f1c718f0 100755
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroup.java
+++ b/src/main/java/com/labsynch/labseer/domain/AnalysisGroup.java
@@ -1,7 +1,6 @@
 package com.labsynch.labseer.domain;
 
 import java.io.Reader;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -18,6 +17,11 @@
 import javax.persistence.OneToMany;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
+
+import com.labsynch.labseer.dto.AnalysisGroupCsvDTO;
+import com.labsynch.labseer.dto.FlatThingCsvDTO;
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -25,11 +29,6 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.dto.AnalysisGroupCsvDTO;
-import com.labsynch.labseer.dto.FlatThingCsvDTO;
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel.java b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel.java
index a880fdab8..21a4a07a3 100755
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel.java
@@ -5,6 +5,7 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
@@ -12,6 +13,7 @@
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState.java b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState.java
index 0cab7179a..bba9d3316 100755
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState.java
+++ b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState.java
@@ -1,7 +1,6 @@
 package com.labsynch.labseer.domain;
 
 import java.io.Reader;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -19,16 +18,16 @@
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.dto.AnalysisGroupCsvDTO;
 import com.labsynch.labseer.dto.FlatThingCsvDTO;
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
 import com.labsynch.labseer.utils.ExcludeNulls;
 
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.beans.factory.annotation.Configurable;
+import org.springframework.transaction.annotation.Transactional;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue.java b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue.java
index 0b0ffe3e5..5adc85746 100755
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue.java
@@ -8,6 +8,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
@@ -21,14 +22,6 @@
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import javax.validation.constraints.NotNull;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.transaction.annotation.Transactional;
-import org.supercsv.cellprocessor.Optional;
-import org.supercsv.cellprocessor.ift.CellProcessor;
 
 import com.labsynch.labseer.dto.AnalysisGroupCsvDTO;
 import com.labsynch.labseer.dto.AnalysisGroupValueBaseDTO;
@@ -36,9 +29,17 @@
 import com.labsynch.labseer.dto.ExperimentFilterSearchDTO;
 import com.labsynch.labseer.dto.FlatThingCsvDTO;
 import com.labsynch.labseer.dto.ValueTypeKindDTO;
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
 import com.labsynch.labseer.utils.ExcludeNulls;
 
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
+import org.springframework.transaction.annotation.Transactional;
+import org.supercsv.cellprocessor.Optional;
+import org.supercsv.cellprocessor.ift.CellProcessor;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ApplicationSetting.java b/src/main/java/com/labsynch/labseer/domain/ApplicationSetting.java
index 144367330..5120cf3d1 100755
--- a/src/main/java/com/labsynch/labseer/domain/ApplicationSetting.java
+++ b/src/main/java/com/labsynch/labseer/domain/ApplicationSetting.java
@@ -1,10 +1,9 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -18,12 +17,16 @@
 import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 
diff --git a/src/main/java/com/labsynch/labseer/domain/Author.java b/src/main/java/com/labsynch/labseer/domain/Author.java
index 5bbda244b..25efa25b2 100755
--- a/src/main/java/com/labsynch/labseer/domain/Author.java
+++ b/src/main/java/com/labsynch/labseer/domain/Author.java
@@ -8,7 +8,6 @@
 import java.util.Set;
 
 import javax.persistence.CascadeType;
-import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.FetchType;
@@ -18,12 +17,13 @@
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.utils.ExcludeNulls;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorLabel.java b/src/main/java/com/labsynch/labseer/domain/AuthorLabel.java
index cca72cee7..2755e0de0 100644
--- a/src/main/java/com/labsynch/labseer/domain/AuthorLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/AuthorLabel.java
@@ -5,12 +5,14 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorRole.java b/src/main/java/com/labsynch/labseer/domain/AuthorRole.java
index 4bd420803..29192ccb8 100755
--- a/src/main/java/com/labsynch/labseer/domain/AuthorRole.java
+++ b/src/main/java/com/labsynch/labseer/domain/AuthorRole.java
@@ -18,8 +18,10 @@
 import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorState.java b/src/main/java/com/labsynch/labseer/domain/AuthorState.java
index 159f4c6cf..6adb2b4f3 100644
--- a/src/main/java/com/labsynch/labseer/domain/AuthorState.java
+++ b/src/main/java/com/labsynch/labseer/domain/AuthorState.java
@@ -1,6 +1,5 @@
 package com.labsynch.labseer.domain;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -17,15 +16,15 @@
 import javax.persistence.OneToMany;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
+
+import com.labsynch.labseer.dto.FlatThingCsvDTO;
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.dto.FlatThingCsvDTO;
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorValue.java b/src/main/java/com/labsynch/labseer/domain/AuthorValue.java
index d910a0d82..3846eab4a 100644
--- a/src/main/java/com/labsynch/labseer/domain/AuthorValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/AuthorValue.java
@@ -1,23 +1,23 @@
 package com.labsynch.labseer.domain;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
 
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
diff --git a/src/main/java/com/labsynch/labseer/domain/BulkLoadFile.java b/src/main/java/com/labsynch/labseer/domain/BulkLoadFile.java
index 786e81954..ce9be2fab 100644
--- a/src/main/java/com/labsynch/labseer/domain/BulkLoadFile.java
+++ b/src/main/java/com/labsynch/labseer/domain/BulkLoadFile.java
@@ -1,10 +1,9 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -16,11 +15,15 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 
diff --git a/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate.java b/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate.java
index 00e3085aa..bb897e434 100644
--- a/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate.java
+++ b/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate.java
@@ -1,5 +1,8 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Collection;
+import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -11,16 +14,17 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
+import com.labsynch.labseer.dto.BulkLoadPropertyMappingDTO;
+import com.labsynch.labseer.dto.BulkLoadTemplateDTO;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
-import com.labsynch.labseer.dto.BulkLoadPropertyMappingDTO;
-import com.labsynch.labseer.dto.BulkLoadTemplateDTO;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
-import java.util.Collection;
-import java.util.List;
 
 @Configurable
 @Entity
diff --git a/src/main/java/com/labsynch/labseer/domain/ChemStructure.java b/src/main/java/com/labsynch/labseer/domain/ChemStructure.java
index 470b6d94e..1716915cf 100644
--- a/src/main/java/com/labsynch/labseer/domain/ChemStructure.java
+++ b/src/main/java/com/labsynch/labseer/domain/ChemStructure.java
@@ -1,10 +1,9 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -17,6 +16,7 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -24,6 +24,9 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 
diff --git a/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting.java b/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting.java
index ce83271b2..c2f8716c3 100755
--- a/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting.java
+++ b/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting.java
@@ -1,10 +1,9 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -16,12 +15,16 @@
 import javax.persistence.TemporalType;
 import javax.persistence.Version;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeKind.java b/src/main/java/com/labsynch/labseer/domain/CodeKind.java
index 0c683ea98..bc62b1f41 100755
--- a/src/main/java/com/labsynch/labseer/domain/CodeKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/CodeKind.java
@@ -1,7 +1,5 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
 
@@ -19,6 +17,7 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -26,6 +25,9 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeOrigin.java b/src/main/java/com/labsynch/labseer/domain/CodeOrigin.java
index 914ce2c3a..8851d54ca 100644
--- a/src/main/java/com/labsynch/labseer/domain/CodeOrigin.java
+++ b/src/main/java/com/labsynch/labseer/domain/CodeOrigin.java
@@ -1,7 +1,5 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
 
@@ -17,6 +15,7 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -24,6 +23,9 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeType.java b/src/main/java/com/labsynch/labseer/domain/CodeType.java
index 0c93a0241..45c70d90a 100755
--- a/src/main/java/com/labsynch/labseer/domain/CodeType.java
+++ b/src/main/java/com/labsynch/labseer/domain/CodeType.java
@@ -1,7 +1,5 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
 
@@ -17,6 +15,7 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -24,6 +23,9 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/Compound.java b/src/main/java/com/labsynch/labseer/domain/Compound.java
index d1086fadb..fa9e7df03 100644
--- a/src/main/java/com/labsynch/labseer/domain/Compound.java
+++ b/src/main/java/com/labsynch/labseer/domain/Compound.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -16,6 +15,7 @@
 import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -24,6 +24,9 @@
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 @Transactional
diff --git a/src/main/java/com/labsynch/labseer/domain/CompoundType.java b/src/main/java/com/labsynch/labseer/domain/CompoundType.java
index 001da78f0..467d0a7d4 100644
--- a/src/main/java/com/labsynch/labseer/domain/CompoundType.java
+++ b/src/main/java/com/labsynch/labseer/domain/CompoundType.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -14,11 +13,15 @@
 import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/Container.java b/src/main/java/com/labsynch/labseer/domain/Container.java
index 0602c9bca..e72da74be 100755
--- a/src/main/java/com/labsynch/labseer/domain/Container.java
+++ b/src/main/java/com/labsynch/labseer/domain/Container.java
@@ -1,7 +1,6 @@
 package com.labsynch.labseer.domain;
 
 import java.io.Reader;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -18,15 +17,15 @@
 import javax.persistence.OneToMany;
 import javax.persistence.SqlResultSetMapping;
 import javax.persistence.TypedQuery;
+
+import com.labsynch.labseer.dto.ContainerLocationTreeDTO;
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.dto.ContainerLocationTreeDTO;
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerKind.java b/src/main/java/com/labsynch/labseer/domain/ContainerKind.java
index f51f68c24..f08d95efc 100755
--- a/src/main/java/com/labsynch/labseer/domain/ContainerKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ContainerKind.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -18,11 +17,15 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerLabel.java b/src/main/java/com/labsynch/labseer/domain/ContainerLabel.java
index 449c22ce0..d09175cfc 100755
--- a/src/main/java/com/labsynch/labseer/domain/ContainerLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/ContainerLabel.java
@@ -6,16 +6,19 @@
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerState.java b/src/main/java/com/labsynch/labseer/domain/ContainerState.java
index 6842a88c6..e126652bf 100755
--- a/src/main/java/com/labsynch/labseer/domain/ContainerState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ContainerState.java
@@ -1,7 +1,6 @@
 package com.labsynch.labseer.domain;
 
 import java.io.Reader;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -19,14 +18,14 @@
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
+
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerType.java b/src/main/java/com/labsynch/labseer/domain/ContainerType.java
index a9e6a886f..74d31c72c 100755
--- a/src/main/java/com/labsynch/labseer/domain/ContainerType.java
+++ b/src/main/java/com/labsynch/labseer/domain/ContainerType.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -16,11 +15,15 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerValue.java b/src/main/java/com/labsynch/labseer/domain/ContainerValue.java
index 75ca40af5..289beb462 100755
--- a/src/main/java/com/labsynch/labseer/domain/ContainerValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ContainerValue.java
@@ -7,12 +7,16 @@
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
+
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -20,8 +24,6 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.utils.ExcludeNulls;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/CorpName.java b/src/main/java/com/labsynch/labseer/domain/CorpName.java
index 91d29e6d1..1b8832bcb 100755
--- a/src/main/java/com/labsynch/labseer/domain/CorpName.java
+++ b/src/main/java/com/labsynch/labseer/domain/CorpName.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -13,11 +12,15 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.Version;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 @Entity
 @Configurable
diff --git a/src/main/java/com/labsynch/labseer/domain/CronJob.java b/src/main/java/com/labsynch/labseer/domain/CronJob.java
index b104d0fbd..96bdb9269 100644
--- a/src/main/java/com/labsynch/labseer/domain/CronJob.java
+++ b/src/main/java/com/labsynch/labseer/domain/CronJob.java
@@ -1,10 +1,9 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -16,6 +15,7 @@
 import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -23,6 +23,9 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictKind.java b/src/main/java/com/labsynch/labseer/domain/DDictKind.java
index e96fcb128..e7a4bd76d 100644
--- a/src/main/java/com/labsynch/labseer/domain/DDictKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/DDictKind.java
@@ -1,7 +1,5 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
 
@@ -18,6 +16,7 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -25,6 +24,9 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictType.java b/src/main/java/com/labsynch/labseer/domain/DDictType.java
index 0105c74be..dfd2ee644 100644
--- a/src/main/java/com/labsynch/labseer/domain/DDictType.java
+++ b/src/main/java/com/labsynch/labseer/domain/DDictType.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -16,6 +15,7 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -23,6 +23,9 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictValue.java b/src/main/java/com/labsynch/labseer/domain/DDictValue.java
index 161f8653e..bbf32c5c1 100644
--- a/src/main/java/com/labsynch/labseer/domain/DDictValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/DDictValue.java
@@ -16,6 +16,9 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
+import com.labsynch.labseer.dto.CodeTableDTO;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -25,8 +28,6 @@
 import org.supercsv.cellprocessor.Optional;
 import org.supercsv.cellprocessor.ift.CellProcessor;
 
-import com.labsynch.labseer.dto.CodeTableDTO;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/DryRunCompound.java b/src/main/java/com/labsynch/labseer/domain/DryRunCompound.java
index 78389446c..de9df3132 100644
--- a/src/main/java/com/labsynch/labseer/domain/DryRunCompound.java
+++ b/src/main/java/com/labsynch/labseer/domain/DryRunCompound.java
@@ -1,9 +1,7 @@
 package com.labsynch.labseer.domain;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -13,11 +11,15 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 import javax.persistence.Version;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 
diff --git a/src/main/java/com/labsynch/labseer/domain/Experiment.java b/src/main/java/com/labsynch/labseer/domain/Experiment.java
index 37601fcfd..80b3168c3 100755
--- a/src/main/java/com/labsynch/labseer/domain/Experiment.java
+++ b/src/main/java/com/labsynch/labseer/domain/Experiment.java
@@ -1,7 +1,6 @@
 package com.labsynch.labseer.domain;
 
 import java.io.Reader;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -22,6 +21,9 @@
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -29,9 +31,6 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentKind.java b/src/main/java/com/labsynch/labseer/domain/ExperimentKind.java
index da1d0b829..cd46d0349 100755
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ExperimentKind.java
@@ -1,7 +1,5 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
 
@@ -19,11 +17,15 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentLabel.java b/src/main/java/com/labsynch/labseer/domain/ExperimentLabel.java
index 232fe93c1..b815d169d 100755
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/ExperimentLabel.java
@@ -1,18 +1,21 @@
 package com.labsynch.labseer.domain;
 
 import java.io.Reader;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
+
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -20,9 +23,6 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentState.java b/src/main/java/com/labsynch/labseer/domain/ExperimentState.java
index c84126eb3..8d1743952 100755
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ExperimentState.java
@@ -1,7 +1,6 @@
 package com.labsynch.labseer.domain;
 
 import java.io.Reader;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -19,14 +18,13 @@
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
 
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentValue.java b/src/main/java/com/labsynch/labseer/domain/ExperimentValue.java
index 57270c79e..a909690db 100755
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ExperimentValue.java
@@ -7,6 +7,7 @@
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
@@ -14,6 +15,7 @@
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
diff --git a/src/main/java/com/labsynch/labseer/domain/FileList.java b/src/main/java/com/labsynch/labseer/domain/FileList.java
index d8cb38195..ed1f6522f 100755
--- a/src/main/java/com/labsynch/labseer/domain/FileList.java
+++ b/src/main/java/com/labsynch/labseer/domain/FileList.java
@@ -1,7 +1,5 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -9,6 +7,7 @@
 import java.io.InputStream;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -23,6 +22,7 @@
 import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -31,6 +31,9 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 
diff --git a/src/main/java/com/labsynch/labseer/domain/FileThing.java b/src/main/java/com/labsynch/labseer/domain/FileThing.java
index 0bbe05046..9dd3546a8 100755
--- a/src/main/java/com/labsynch/labseer/domain/FileThing.java
+++ b/src/main/java/com/labsynch/labseer/domain/FileThing.java
@@ -1,16 +1,19 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Entity;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/FileType.java b/src/main/java/com/labsynch/labseer/domain/FileType.java
index e12a5232d..1abdb8e47 100755
--- a/src/main/java/com/labsynch/labseer/domain/FileType.java
+++ b/src/main/java/com/labsynch/labseer/domain/FileType.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -14,11 +13,15 @@
 import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 
diff --git a/src/main/java/com/labsynch/labseer/domain/InteractionKind.java b/src/main/java/com/labsynch/labseer/domain/InteractionKind.java
index ca4f46db9..d7db803d9 100755
--- a/src/main/java/com/labsynch/labseer/domain/InteractionKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/InteractionKind.java
@@ -1,7 +1,5 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
 
@@ -19,6 +17,7 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -26,6 +25,9 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 
diff --git a/src/main/java/com/labsynch/labseer/domain/InteractionType.java b/src/main/java/com/labsynch/labseer/domain/InteractionType.java
index 60cbb6d58..cd0c6a659 100755
--- a/src/main/java/com/labsynch/labseer/domain/InteractionType.java
+++ b/src/main/java/com/labsynch/labseer/domain/InteractionType.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -16,6 +15,7 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -23,6 +23,9 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 
diff --git a/src/main/java/com/labsynch/labseer/domain/IsoSalt.java b/src/main/java/com/labsynch/labseer/domain/IsoSalt.java
index b33cb64c0..81dedb4e4 100755
--- a/src/main/java/com/labsynch/labseer/domain/IsoSalt.java
+++ b/src/main/java/com/labsynch/labseer/domain/IsoSalt.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -15,6 +16,7 @@
 import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
diff --git a/src/main/java/com/labsynch/labseer/domain/Isotope.java b/src/main/java/com/labsynch/labseer/domain/Isotope.java
index aba1922a7..05f364973 100755
--- a/src/main/java/com/labsynch/labseer/domain/Isotope.java
+++ b/src/main/java/com/labsynch/labseer/domain/Isotope.java
@@ -1,10 +1,9 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -19,11 +18,15 @@
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer.java b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer.java
index d500520e2..74d32a115 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer.java
@@ -18,14 +18,16 @@
 import javax.persistence.OneToMany;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
+
+import com.labsynch.labseer.utils.CustomBigDecimalFactory;
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
 
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState.java b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState.java
index 522d05e2f..7da7d1824 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState.java
@@ -15,14 +15,15 @@
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
+
+import com.labsynch.labseer.utils.CustomBigDecimalFactory;
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue.java b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue.java
index 454fee62a..bad269722 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue.java
@@ -1,22 +1,22 @@
 package com.labsynch.labseer.domain;
 
 import java.io.Reader;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment.java b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment.java
index 361960c89..0d8c87cf6 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment.java
@@ -19,14 +19,16 @@
 import javax.persistence.Table;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
+
+import com.labsynch.labseer.utils.CustomBigDecimalFactory;
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
 
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState.java b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState.java
index 59e0d9420..6041f5d92 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState.java
@@ -16,14 +16,15 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
+
+import com.labsynch.labseer.utils.CustomBigDecimalFactory;
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue.java b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue.java
index 74ddf23e3..6ee9f3f62 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue.java
@@ -1,23 +1,23 @@
 package com.labsynch.labseer.domain;
 
 import java.io.Reader;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
+
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing.java b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing.java
index 23b0f33cd..95b366555 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing.java
@@ -15,18 +15,20 @@
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.NoResultException;
 import javax.persistence.OneToMany;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
+
+import com.labsynch.labseer.utils.CustomBigDecimalFactory;
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import javax.persistence.NoResultException;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
 
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState.java b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState.java
index cddb0bd16..e4345e60a 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState.java
@@ -15,6 +15,10 @@
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
+
+import com.labsynch.labseer.utils.CustomBigDecimalFactory;
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -22,9 +26,6 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue.java b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue.java
index 037b94680..f2a0da63e 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue.java
@@ -1,25 +1,27 @@
 package com.labsynch.labseer.domain;
 
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.io.Reader;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.TypedQuery;
+
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol.java b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol.java
index 9ea765de5..c5e38e1f9 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol.java
@@ -18,6 +18,10 @@
 import javax.persistence.OneToMany;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
+
+import com.labsynch.labseer.utils.CustomBigDecimalFactory;
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -25,9 +29,6 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState.java b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState.java
index 32c6e843d..1ce66c533 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState.java
@@ -15,14 +15,15 @@
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
+
+import com.labsynch.labseer.utils.CustomBigDecimalFactory;
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue.java b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue.java
index 7c8a3bed3..7914fc207 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue.java
@@ -1,22 +1,22 @@
 package com.labsynch.labseer.domain;
 
 import java.io.Reader;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer.java b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer.java
index 5e4e013ed..af685d341 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer.java
@@ -19,6 +19,10 @@
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
+
+import com.labsynch.labseer.utils.CustomBigDecimalFactory;
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -26,9 +30,6 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState.java b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState.java
index 14ed5f085..2dc77ae54 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState.java
@@ -16,14 +16,15 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Query;
+
+import com.labsynch.labseer.utils.CustomBigDecimalFactory;
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue.java b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue.java
index 08d377640..1a7199ef6 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue.java
@@ -1,24 +1,24 @@
 package com.labsynch.labseer.domain;
 
 import java.io.Reader;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Query;
+
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelKind.java b/src/main/java/com/labsynch/labseer/domain/LabelKind.java
index 1bd3c178a..7bd8eea65 100755
--- a/src/main/java/com/labsynch/labseer/domain/LabelKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/LabelKind.java
@@ -1,7 +1,5 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
 
@@ -19,6 +17,7 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -26,6 +25,9 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelSequence.java b/src/main/java/com/labsynch/labseer/domain/LabelSequence.java
index 295e4c39a..0472edb4e 100755
--- a/src/main/java/com/labsynch/labseer/domain/LabelSequence.java
+++ b/src/main/java/com/labsynch/labseer/domain/LabelSequence.java
@@ -29,6 +29,12 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
+import com.labsynch.labseer.dto.AutoLabelDTO;
+import com.labsynch.labseer.utils.ExcludeNulls;
+import com.labsynch.labseer.utils.SimpleUtil;
+import com.labsynch.labseer.utils.SimpleUtil.DbType;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.hibernate.Session;
@@ -41,10 +47,6 @@
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.dto.AutoLabelDTO;
-import com.labsynch.labseer.utils.ExcludeNulls;
-import com.labsynch.labseer.utils.SimpleUtil;
-import com.labsynch.labseer.utils.SimpleUtil.DbType;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole.java b/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole.java
index a5aca1fe4..9ad4f8ba7 100644
--- a/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole.java
+++ b/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole.java
@@ -1,7 +1,5 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
 
@@ -21,9 +19,13 @@
 import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 @Configurable
 @Entity
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelType.java b/src/main/java/com/labsynch/labseer/domain/LabelType.java
index 89caf1755..9fac8ffc4 100755
--- a/src/main/java/com/labsynch/labseer/domain/LabelType.java
+++ b/src/main/java/com/labsynch/labseer/domain/LabelType.java
@@ -1,7 +1,5 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
 
@@ -17,6 +15,7 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -24,6 +23,9 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/Lot.java b/src/main/java/com/labsynch/labseer/domain/Lot.java
index e89a7a09c..5e70b93f0 100755
--- a/src/main/java/com/labsynch/labseer/domain/Lot.java
+++ b/src/main/java/com/labsynch/labseer/domain/Lot.java
@@ -6,10 +6,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
-import javax.annotation.PostConstruct;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -37,17 +34,18 @@
 import javax.persistence.criteria.Root;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
+import com.labsynch.labseer.dto.LotsByProjectDTO;
+import com.labsynch.labseer.dto.SearchFormDTO;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.dto.LotsByProjectDTO;
-import com.labsynch.labseer.dto.SearchFormDTO;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAlias.java b/src/main/java/com/labsynch/labseer/domain/LotAlias.java
index d4d084841..3d63a933d 100644
--- a/src/main/java/com/labsynch/labseer/domain/LotAlias.java
+++ b/src/main/java/com/labsynch/labseer/domain/LotAlias.java
@@ -1,5 +1,8 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Collection;
+import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -11,18 +14,19 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 import javax.persistence.Version;
+
+import com.labsynch.labseer.dto.LotAliasDTO;
+import com.labsynch.labseer.exceptions.LotNotFoundException;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
-import com.labsynch.labseer.dto.LotAliasDTO;
-import com.labsynch.labseer.exceptions.LotNotFoundException;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
-import java.util.Collection;
-import java.util.List;
 
 @Entity
 @Configurable
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAliasKind.java b/src/main/java/com/labsynch/labseer/domain/LotAliasKind.java
index a75086103..d1a537e2c 100644
--- a/src/main/java/com/labsynch/labseer/domain/LotAliasKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/LotAliasKind.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -16,11 +15,15 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAliasType.java b/src/main/java/com/labsynch/labseer/domain/LotAliasType.java
index 0c963e082..b7c5f398e 100644
--- a/src/main/java/com/labsynch/labseer/domain/LotAliasType.java
+++ b/src/main/java/com/labsynch/labseer/domain/LotAliasType.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -13,11 +12,15 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.Version;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 
diff --git a/src/main/java/com/labsynch/labseer/domain/LsInteraction.java b/src/main/java/com/labsynch/labseer/domain/LsInteraction.java
index 3eea764a9..5f7ac7857 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsInteraction.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsInteraction.java
@@ -1,17 +1,20 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.validation.constraints.NotNull;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/LsRole.java b/src/main/java/com/labsynch/labseer/domain/LsRole.java
index 616b445e4..cf183e7ed 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsRole.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsRole.java
@@ -21,10 +21,12 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
+import com.labsynch.labseer.dto.CodeTableDTO;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.dto.CodeTableDTO;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqAnlGrp.java b/src/main/java/com/labsynch/labseer/domain/LsSeqAnlGrp.java
index d49083427..a106cb820 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqAnlGrp.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqAnlGrp.java
@@ -1,6 +1,7 @@
 package com.labsynch.labseer.domain;
 
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -10,6 +11,7 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Version;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqContainer.java b/src/main/java/com/labsynch/labseer/domain/LsSeqContainer.java
index 7caa2ff09..decf26a36 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqContainer.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqContainer.java
@@ -1,6 +1,7 @@
 package com.labsynch.labseer.domain;
 
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -10,6 +11,7 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Version;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqExpt.java b/src/main/java/com/labsynch/labseer/domain/LsSeqExpt.java
index 9cec7f1f9..2a93cace3 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqExpt.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqExpt.java
@@ -1,6 +1,7 @@
 package com.labsynch.labseer.domain;
 
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -10,6 +11,7 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Version;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxCntrCntr.java b/src/main/java/com/labsynch/labseer/domain/LsSeqItxCntrCntr.java
index 29a1cde6c..349a8746c 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxCntrCntr.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqItxCntrCntr.java
@@ -1,6 +1,7 @@
 package com.labsynch.labseer.domain;
 
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -10,6 +11,7 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Version;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxExperimentExperiment.java b/src/main/java/com/labsynch/labseer/domain/LsSeqItxExperimentExperiment.java
index 0ab5b4126..df44f4a1f 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxExperimentExperiment.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqItxExperimentExperiment.java
@@ -1,6 +1,7 @@
 package com.labsynch.labseer.domain;
 
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -11,6 +12,7 @@
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Version;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxLsThingLsThing.java b/src/main/java/com/labsynch/labseer/domain/LsSeqItxLsThingLsThing.java
index f4ae89f11..d02cd9c06 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxLsThingLsThing.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqItxLsThingLsThing.java
@@ -1,6 +1,7 @@
 package com.labsynch.labseer.domain;
 
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -10,6 +11,7 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Version;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxProtocolProtocol.java b/src/main/java/com/labsynch/labseer/domain/LsSeqItxProtocolProtocol.java
index 80739a259..df200e4b1 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxProtocolProtocol.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqItxProtocolProtocol.java
@@ -1,6 +1,7 @@
 package com.labsynch.labseer.domain;
 
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -10,6 +11,7 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Version;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxSubjCntr.java b/src/main/java/com/labsynch/labseer/domain/LsSeqItxSubjCntr.java
index 61dda47a1..14f9f458f 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxSubjCntr.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqItxSubjCntr.java
@@ -1,6 +1,7 @@
 package com.labsynch.labseer.domain;
 
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -10,6 +11,7 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Version;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqProtocol.java b/src/main/java/com/labsynch/labseer/domain/LsSeqProtocol.java
index f2b19721c..9670c1e3f 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqProtocol.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqProtocol.java
@@ -1,6 +1,7 @@
 package com.labsynch.labseer.domain;
 
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -10,6 +11,7 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Version;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqSubject.java b/src/main/java/com/labsynch/labseer/domain/LsSeqSubject.java
index 7729364ac..483171167 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqSubject.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqSubject.java
@@ -1,6 +1,7 @@
 package com.labsynch.labseer.domain;
 
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -10,6 +11,7 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Version;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqTrtGrp.java b/src/main/java/com/labsynch/labseer/domain/LsSeqTrtGrp.java
index 2407d4b4f..913015b43 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqTrtGrp.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqTrtGrp.java
@@ -1,6 +1,7 @@
 package com.labsynch.labseer.domain;
 
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -10,6 +11,7 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Version;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/LsTag.java b/src/main/java/com/labsynch/labseer/domain/LsTag.java
index af4a75dd7..966b673f2 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsTag.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsTag.java
@@ -22,11 +22,13 @@
 import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.transaction.annotation.Transactional;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThing.java b/src/main/java/com/labsynch/labseer/domain/LsThing.java
index 0298da972..bfe05c792 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsThing.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsThing.java
@@ -1,7 +1,6 @@
 package com.labsynch.labseer.domain;
 
 import java.io.Reader;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -17,8 +16,12 @@
 import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
 import javax.persistence.OneToMany;
-import javax.persistence.Query;
 import javax.persistence.TypedQuery;
+
+import com.labsynch.labseer.utils.ByteArrayTransformer;
+import com.labsynch.labseer.utils.ExcludeNulls;
+import com.labsynch.labseer.utils.SimpleUtil;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.hibernate.StaleObjectStateException;
@@ -27,12 +30,6 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.api.ApiExperimentController;
-import com.labsynch.labseer.utils.ByteArrayTransformer;
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
-import com.labsynch.labseer.utils.SimpleUtil;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingLabel.java b/src/main/java/com/labsynch/labseer/domain/LsThingLabel.java
index 2ce37cea3..4e4831678 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsThingLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsThingLabel.java
@@ -7,13 +7,16 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
+
+import com.labsynch.labseer.dto.PreferredNameDTO;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -21,8 +24,6 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.dto.PreferredNameDTO;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingState.java b/src/main/java/com/labsynch/labseer/domain/LsThingState.java
index 07c71d66c..ba58e2f1b 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsThingState.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsThingState.java
@@ -1,7 +1,6 @@
 package com.labsynch.labseer.domain;
 
 import java.io.Reader;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -18,14 +17,14 @@
 import javax.persistence.OneToMany;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
+
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingValue.java b/src/main/java/com/labsynch/labseer/domain/LsThingValue.java
index 7684503d0..85816ec67 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsThingValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsThingValue.java
@@ -6,12 +6,16 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
+
+import com.labsynch.labseer.utils.ByteArrayTransformer;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -19,10 +23,6 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.utils.ByteArrayTransformer;
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/LsTransaction.java b/src/main/java/com/labsynch/labseer/domain/LsTransaction.java
index cd4ac2891..60d422889 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsTransaction.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsTransaction.java
@@ -1,10 +1,9 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -20,12 +19,16 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/Operator.java b/src/main/java/com/labsynch/labseer/domain/Operator.java
index 650ed5f6a..e6e0c8cf6 100755
--- a/src/main/java/com/labsynch/labseer/domain/Operator.java
+++ b/src/main/java/com/labsynch/labseer/domain/Operator.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -14,11 +13,15 @@
 import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 
diff --git a/src/main/java/com/labsynch/labseer/domain/OperatorKind.java b/src/main/java/com/labsynch/labseer/domain/OperatorKind.java
index 57902451d..5e0e8d833 100755
--- a/src/main/java/com/labsynch/labseer/domain/OperatorKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/OperatorKind.java
@@ -1,7 +1,5 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
 
@@ -19,11 +17,15 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/OperatorType.java b/src/main/java/com/labsynch/labseer/domain/OperatorType.java
index 949204f91..9e9fc653f 100755
--- a/src/main/java/com/labsynch/labseer/domain/OperatorType.java
+++ b/src/main/java/com/labsynch/labseer/domain/OperatorType.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -16,11 +15,15 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/Parent.java b/src/main/java/com/labsynch/labseer/domain/Parent.java
index 15d3a7a0b..c67912d3b 100755
--- a/src/main/java/com/labsynch/labseer/domain/Parent.java
+++ b/src/main/java/com/labsynch/labseer/domain/Parent.java
@@ -33,19 +33,18 @@
 import javax.persistence.criteria.Root;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
+import com.labsynch.labseer.dto.LabelPrefixDTO;
+import com.labsynch.labseer.dto.SearchFormDTO;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.dto.LabelPrefixDTO;
-import com.labsynch.labseer.dto.SearchFormDTO;
-import com.labsynch.labseer.service.ChemStructureService;
-import com.labsynch.labseer.service.ParentService;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAlias.java b/src/main/java/com/labsynch/labseer/domain/ParentAlias.java
index ae0b12a4b..ca0294983 100644
--- a/src/main/java/com/labsynch/labseer/domain/ParentAlias.java
+++ b/src/main/java/com/labsynch/labseer/domain/ParentAlias.java
@@ -1,5 +1,8 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Collection;
+import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -11,18 +14,19 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 import javax.persistence.Version;
+
+import com.labsynch.labseer.dto.ParentAliasDTO;
+import com.labsynch.labseer.exceptions.ParentNotFoundException;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
-import com.labsynch.labseer.dto.ParentAliasDTO;
-import com.labsynch.labseer.exceptions.ParentNotFoundException;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
-import java.util.Collection;
-import java.util.List;
 
 @Configurable
 @Entity
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAliasKind.java b/src/main/java/com/labsynch/labseer/domain/ParentAliasKind.java
index ef52c7c79..acef5ecdd 100644
--- a/src/main/java/com/labsynch/labseer/domain/ParentAliasKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ParentAliasKind.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -16,11 +15,15 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAliasType.java b/src/main/java/com/labsynch/labseer/domain/ParentAliasType.java
index 3462d1f9e..9c6c28481 100644
--- a/src/main/java/com/labsynch/labseer/domain/ParentAliasType.java
+++ b/src/main/java/com/labsynch/labseer/domain/ParentAliasType.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -13,11 +12,15 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.Version;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAnnotation.java b/src/main/java/com/labsynch/labseer/domain/ParentAnnotation.java
index c252ba66f..77316a339 100644
--- a/src/main/java/com/labsynch/labseer/domain/ParentAnnotation.java
+++ b/src/main/java/com/labsynch/labseer/domain/ParentAnnotation.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -14,11 +13,15 @@
 import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 
diff --git a/src/main/java/com/labsynch/labseer/domain/PhysicalState.java b/src/main/java/com/labsynch/labseer/domain/PhysicalState.java
index a00a8d66a..5ae94bb7c 100755
--- a/src/main/java/com/labsynch/labseer/domain/PhysicalState.java
+++ b/src/main/java/com/labsynch/labseer/domain/PhysicalState.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -14,11 +13,15 @@
 import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 
diff --git a/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName.java b/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName.java
index 15594045c..0ee2c9884 100755
--- a/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName.java
+++ b/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -14,6 +13,7 @@
 import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -21,6 +21,9 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/Protocol.java b/src/main/java/com/labsynch/labseer/domain/Protocol.java
index 64313e391..c04b31855 100755
--- a/src/main/java/com/labsynch/labseer/domain/Protocol.java
+++ b/src/main/java/com/labsynch/labseer/domain/Protocol.java
@@ -1,7 +1,6 @@
 package com.labsynch.labseer.domain;
 
 import java.io.Reader;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -18,6 +17,10 @@
 import javax.persistence.OneToMany;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.Size;
+
+import com.labsynch.labseer.dto.CodeTableDTO;
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -25,10 +28,6 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.dto.CodeTableDTO;
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolKind.java b/src/main/java/com/labsynch/labseer/domain/ProtocolKind.java
index 8725281f5..4ec8613ac 100755
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ProtocolKind.java
@@ -1,7 +1,5 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
 
@@ -19,11 +17,15 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolLabel.java b/src/main/java/com/labsynch/labseer/domain/ProtocolLabel.java
index 6947c9352..7eed59b13 100755
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/ProtocolLabel.java
@@ -5,18 +5,21 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolState.java b/src/main/java/com/labsynch/labseer/domain/ProtocolState.java
index a5380dd48..0c7cd6945 100755
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ProtocolState.java
@@ -1,7 +1,6 @@
 package com.labsynch.labseer.domain;
 
 import java.io.Reader;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -19,14 +18,13 @@
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
 
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolType.java b/src/main/java/com/labsynch/labseer/domain/ProtocolType.java
index 11eb5d816..46da48f99 100755
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolType.java
+++ b/src/main/java/com/labsynch/labseer/domain/ProtocolType.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -16,11 +15,15 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolValue.java b/src/main/java/com/labsynch/labseer/domain/ProtocolValue.java
index dfa7c1597..5f2c6aa91 100755
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ProtocolValue.java
@@ -1,23 +1,23 @@
 package com.labsynch.labseer.domain;
 
 import java.io.Reader;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
 
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
diff --git a/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy.java b/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy.java
index 16605a14c..c5f87eeb0 100755
--- a/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy.java
+++ b/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -14,11 +13,15 @@
 import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/RegSearch.java b/src/main/java/com/labsynch/labseer/domain/RegSearch.java
index da6afdd02..e8d799dc7 100755
--- a/src/main/java/com/labsynch/labseer/domain/RegSearch.java
+++ b/src/main/java/com/labsynch/labseer/domain/RegSearch.java
@@ -1,13 +1,16 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Lob;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class RegSearch {
 
diff --git a/src/main/java/com/labsynch/labseer/domain/RoleKind.java b/src/main/java/com/labsynch/labseer/domain/RoleKind.java
index 055651b4a..3a70bd4f2 100644
--- a/src/main/java/com/labsynch/labseer/domain/RoleKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/RoleKind.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -18,11 +17,15 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 @Configurable
 @Entity
diff --git a/src/main/java/com/labsynch/labseer/domain/RoleType.java b/src/main/java/com/labsynch/labseer/domain/RoleType.java
index 474c45cd5..68ae485f6 100644
--- a/src/main/java/com/labsynch/labseer/domain/RoleType.java
+++ b/src/main/java/com/labsynch/labseer/domain/RoleType.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -16,11 +15,15 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/Salt.java b/src/main/java/com/labsynch/labseer/domain/Salt.java
index 986b235b6..dc86af8d8 100755
--- a/src/main/java/com/labsynch/labseer/domain/Salt.java
+++ b/src/main/java/com/labsynch/labseer/domain/Salt.java
@@ -1,7 +1,5 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -12,7 +10,6 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.Lob;
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 import javax.persistence.Version;
@@ -21,11 +18,15 @@
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 @Transactional
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltForm.java b/src/main/java/com/labsynch/labseer/domain/SaltForm.java
index afb5a58cf..ccbf93446 100755
--- a/src/main/java/com/labsynch/labseer/domain/SaltForm.java
+++ b/src/main/java/com/labsynch/labseer/domain/SaltForm.java
@@ -1,7 +1,6 @@
 package com.labsynch.labseer.domain;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashSet;
@@ -17,7 +16,6 @@
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
-import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.PersistenceContext;
@@ -33,6 +31,9 @@
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import javax.validation.constraints.Size;
+
+import com.labsynch.labseer.dto.SearchFormDTO;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -41,7 +42,6 @@
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.dto.SearchFormDTO;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAlias.java b/src/main/java/com/labsynch/labseer/domain/SaltFormAlias.java
index b16d5fd8d..739b54b79 100644
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAlias.java
+++ b/src/main/java/com/labsynch/labseer/domain/SaltFormAlias.java
@@ -1,5 +1,8 @@
 package com.labsynch.labseer.domain;
 
+import java.util.Collection;
+import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -11,19 +14,19 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 import javax.persistence.Version;
+
+import com.labsynch.labseer.dto.SaltFormAliasDTO;
+import com.labsynch.labseer.exceptions.SaltFormNotFoundException;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
-import com.labsynch.labseer.dto.SaltFormAliasDTO;
-import com.labsynch.labseer.exceptions.ParentNotFoundException;
-import com.labsynch.labseer.exceptions.SaltFormNotFoundException;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
-import java.util.Collection;
-import java.util.List;
 
 @Entity
 @Configurable
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind.java b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind.java
index 88f441c81..6f287560e 100644
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -16,11 +15,15 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType.java b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType.java
index 71e201f7f..5140d2c36 100644
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType.java
+++ b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -13,11 +12,15 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.Version;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/SolutionUnit.java b/src/main/java/com/labsynch/labseer/domain/SolutionUnit.java
index c5232148f..3ebb4cc89 100755
--- a/src/main/java/com/labsynch/labseer/domain/SolutionUnit.java
+++ b/src/main/java/com/labsynch/labseer/domain/SolutionUnit.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -14,11 +13,15 @@
 import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound.java b/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound.java
index 09ed0ad1d..12a8ec075 100644
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound.java
+++ b/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound.java
@@ -1,8 +1,11 @@
 package com.labsynch.labseer.domain;
+import static java.lang.Math.toIntExact;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -12,7 +15,6 @@
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.PersistenceContext;
-import javax.persistence.Transient;
 import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.persistence.criteria.CriteriaBuilder;
@@ -20,19 +22,16 @@
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import static java.lang.Math.toIntExact;
+import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
+import com.labsynch.labseer.chemclasses.CmpdRegMolecule.RegistrationStatus;
+import com.labsynch.labseer.chemclasses.CmpdRegMolecule.StandardizationStatus;
+import com.labsynch.labseer.dto.StandardizationDryRunSearchDTO;
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
-import com.labsynch.labseer.chemclasses.CmpdRegMolecule.RegistrationStatus;
-import com.labsynch.labseer.chemclasses.CmpdRegMolecule.StandardizationStatus;
-import com.labsynch.labseer.dto.StandardizationDryRunSearchDTO;
-import com.labsynch.labseer.dto.configuration.StandardizerSettingsConfigDTO;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationHistory.java b/src/main/java/com/labsynch/labseer/domain/StandardizationHistory.java
index 3b92552e8..9e84ed49d 100644
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationHistory.java
+++ b/src/main/java/com/labsynch/labseer/domain/StandardizationHistory.java
@@ -1,10 +1,9 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -14,11 +13,15 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Version;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationSettings.java b/src/main/java/com/labsynch/labseer/domain/StandardizationSettings.java
index 55615eb69..f26254191 100644
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationSettings.java
+++ b/src/main/java/com/labsynch/labseer/domain/StandardizationSettings.java
@@ -1,10 +1,8 @@
 package com.labsynch.labseer.domain;
-import org.springframework.transaction.annotation.Transactional;
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -16,10 +14,15 @@
 import javax.persistence.TemporalType;
 import javax.persistence.TypedQuery;
 import javax.persistence.Version;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.transaction.annotation.Transactional;
+
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
 @Configurable
 @Entity
diff --git a/src/main/java/com/labsynch/labseer/domain/StateKind.java b/src/main/java/com/labsynch/labseer/domain/StateKind.java
index 3345daa43..3a0c08ffa 100755
--- a/src/main/java/com/labsynch/labseer/domain/StateKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/StateKind.java
@@ -1,7 +1,5 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
 
@@ -19,6 +17,7 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -26,6 +25,9 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/StateType.java b/src/main/java/com/labsynch/labseer/domain/StateType.java
index 5ae920149..319c6deb7 100755
--- a/src/main/java/com/labsynch/labseer/domain/StateType.java
+++ b/src/main/java/com/labsynch/labseer/domain/StateType.java
@@ -1,7 +1,5 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
 
@@ -17,6 +15,7 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -24,6 +23,9 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/StereoCategory.java b/src/main/java/com/labsynch/labseer/domain/StereoCategory.java
index 7d6556ecf..b5b38c342 100755
--- a/src/main/java/com/labsynch/labseer/domain/StereoCategory.java
+++ b/src/main/java/com/labsynch/labseer/domain/StereoCategory.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -14,11 +13,15 @@
 import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/StructureKind.java b/src/main/java/com/labsynch/labseer/domain/StructureKind.java
index 28740a27c..a3cb4397a 100644
--- a/src/main/java/com/labsynch/labseer/domain/StructureKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/StructureKind.java
@@ -1,7 +1,5 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
 
@@ -19,6 +17,7 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -26,6 +25,9 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 public class StructureKind {
diff --git a/src/main/java/com/labsynch/labseer/domain/StructureType.java b/src/main/java/com/labsynch/labseer/domain/StructureType.java
index 2b1df0452..0d6bce5b4 100644
--- a/src/main/java/com/labsynch/labseer/domain/StructureType.java
+++ b/src/main/java/com/labsynch/labseer/domain/StructureType.java
@@ -1,7 +1,5 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
 
@@ -17,6 +15,7 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -24,6 +23,9 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/Subject.java b/src/main/java/com/labsynch/labseer/domain/Subject.java
index 304f5693f..f61c5a107 100755
--- a/src/main/java/com/labsynch/labseer/domain/Subject.java
+++ b/src/main/java/com/labsynch/labseer/domain/Subject.java
@@ -1,7 +1,6 @@
 package com.labsynch.labseer.domain;
 
 import java.io.Reader;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -19,6 +18,10 @@
 import javax.persistence.OneToMany;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
+
+import com.labsynch.labseer.dto.FlatThingCsvDTO;
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -26,10 +29,6 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.dto.FlatThingCsvDTO;
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectLabel.java b/src/main/java/com/labsynch/labseer/domain/SubjectLabel.java
index 216ea474f..2e27991c0 100755
--- a/src/main/java/com/labsynch/labseer/domain/SubjectLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/SubjectLabel.java
@@ -5,6 +5,7 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
@@ -12,6 +13,7 @@
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectState.java b/src/main/java/com/labsynch/labseer/domain/SubjectState.java
index a656fd1f1..9840a5a9d 100755
--- a/src/main/java/com/labsynch/labseer/domain/SubjectState.java
+++ b/src/main/java/com/labsynch/labseer/domain/SubjectState.java
@@ -1,7 +1,6 @@
 package com.labsynch.labseer.domain;
 
 import java.io.Reader;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -19,6 +18,10 @@
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
+
+import com.labsynch.labseer.dto.FlatThingCsvDTO;
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -26,10 +29,6 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.dto.FlatThingCsvDTO;
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectValue.java b/src/main/java/com/labsynch/labseer/domain/SubjectValue.java
index 28c96ed3e..97f67e81b 100755
--- a/src/main/java/com/labsynch/labseer/domain/SubjectValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/SubjectValue.java
@@ -6,6 +6,7 @@
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
@@ -13,6 +14,11 @@
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
+
+import com.labsynch.labseer.dto.FlatThingCsvDTO;
+import com.labsynch.labseer.dto.SubjectValueDTO;
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -22,10 +28,6 @@
 import org.supercsv.cellprocessor.Optional;
 import org.supercsv.cellprocessor.ift.CellProcessor;
 
-import com.labsynch.labseer.dto.FlatThingCsvDTO;
-import com.labsynch.labseer.dto.SubjectValueDTO;
-import com.labsynch.labseer.utils.ExcludeNulls;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/TempSelectTable.java b/src/main/java/com/labsynch/labseer/domain/TempSelectTable.java
index 0e1feec88..790c0f845 100644
--- a/src/main/java/com/labsynch/labseer/domain/TempSelectTable.java
+++ b/src/main/java/com/labsynch/labseer/domain/TempSelectTable.java
@@ -3,6 +3,7 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -17,6 +18,7 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingKind.java b/src/main/java/com/labsynch/labseer/domain/ThingKind.java
index 786c69ee5..3a04b2866 100755
--- a/src/main/java/com/labsynch/labseer/domain/ThingKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ThingKind.java
@@ -1,7 +1,5 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
 
@@ -19,6 +17,7 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -26,6 +25,9 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingPage.java b/src/main/java/com/labsynch/labseer/domain/ThingPage.java
index c1766f37a..6ef8ff1b6 100755
--- a/src/main/java/com/labsynch/labseer/domain/ThingPage.java
+++ b/src/main/java/com/labsynch/labseer/domain/ThingPage.java
@@ -1,10 +1,9 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -22,12 +21,16 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingPageArchive.java b/src/main/java/com/labsynch/labseer/domain/ThingPageArchive.java
index 3358677b9..ac3485133 100755
--- a/src/main/java/com/labsynch/labseer/domain/ThingPageArchive.java
+++ b/src/main/java/com/labsynch/labseer/domain/ThingPageArchive.java
@@ -1,10 +1,9 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -20,12 +19,16 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingType.java b/src/main/java/com/labsynch/labseer/domain/ThingType.java
index 1c0f77884..47f97a532 100755
--- a/src/main/java/com/labsynch/labseer/domain/ThingType.java
+++ b/src/main/java/com/labsynch/labseer/domain/ThingType.java
@@ -1,7 +1,5 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
 
@@ -17,6 +15,7 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -24,6 +23,9 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroup.java b/src/main/java/com/labsynch/labseer/domain/TreatmentGroup.java
index 8e231a9d1..ba8c56ecd 100755
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroup.java
+++ b/src/main/java/com/labsynch/labseer/domain/TreatmentGroup.java
@@ -1,7 +1,6 @@
 package com.labsynch.labseer.domain;
 
 import java.io.Reader;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -18,14 +17,14 @@
 import javax.persistence.OneToMany;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
+
+import com.labsynch.labseer.dto.FlatThingCsvDTO;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.dto.FlatThingCsvDTO;
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel.java b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel.java
index d48801b90..82b8b56c7 100755
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel.java
@@ -5,6 +5,7 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
@@ -12,6 +13,7 @@
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue.java b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue.java
index 8c1c6b665..09b94965a 100755
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue.java
@@ -1,12 +1,12 @@
 package com.labsynch.labseer.domain;
 
 import java.io.Reader;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.JoinColumn;
@@ -14,6 +14,11 @@
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 import javax.validation.constraints.NotNull;
+
+import com.labsynch.labseer.dto.FlatThingCsvDTO;
+import com.labsynch.labseer.dto.TreatmentGroupValueDTO;
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -23,11 +28,6 @@
 import org.supercsv.cellprocessor.Optional;
 import org.supercsv.cellprocessor.ift.CellProcessor;
 
-import com.labsynch.labseer.dto.FlatThingCsvDTO;
-import com.labsynch.labseer.dto.TreatmentGroupValueDTO;
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/domain/UncertaintyKind.java b/src/main/java/com/labsynch/labseer/domain/UncertaintyKind.java
index e204a84f6..8faad8075 100755
--- a/src/main/java/com/labsynch/labseer/domain/UncertaintyKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/UncertaintyKind.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -16,11 +15,15 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 
diff --git a/src/main/java/com/labsynch/labseer/domain/Unit.java b/src/main/java/com/labsynch/labseer/domain/Unit.java
index da279e754..07e8e6a4d 100755
--- a/src/main/java/com/labsynch/labseer/domain/Unit.java
+++ b/src/main/java/com/labsynch/labseer/domain/Unit.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -14,11 +13,15 @@
 import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 
diff --git a/src/main/java/com/labsynch/labseer/domain/UnitKind.java b/src/main/java/com/labsynch/labseer/domain/UnitKind.java
index c7f6baef8..6c4c3b8ba 100755
--- a/src/main/java/com/labsynch/labseer/domain/UnitKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/UnitKind.java
@@ -1,7 +1,5 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
 
@@ -19,11 +17,15 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/UnitType.java b/src/main/java/com/labsynch/labseer/domain/UnitType.java
index 0680bdf61..19da7d0cd 100755
--- a/src/main/java/com/labsynch/labseer/domain/UnitType.java
+++ b/src/main/java/com/labsynch/labseer/domain/UnitType.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -16,11 +15,15 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/UpdateLog.java b/src/main/java/com/labsynch/labseer/domain/UpdateLog.java
index df9e75490..1681eea35 100755
--- a/src/main/java/com/labsynch/labseer/domain/UpdateLog.java
+++ b/src/main/java/com/labsynch/labseer/domain/UpdateLog.java
@@ -2,6 +2,7 @@
 
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -15,6 +16,7 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
diff --git a/src/main/java/com/labsynch/labseer/domain/ValueKind.java b/src/main/java/com/labsynch/labseer/domain/ValueKind.java
index 5d3bd38dd..976ac7770 100755
--- a/src/main/java/com/labsynch/labseer/domain/ValueKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ValueKind.java
@@ -1,7 +1,5 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
 
@@ -19,6 +17,7 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -26,6 +25,9 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/ValueType.java b/src/main/java/com/labsynch/labseer/domain/ValueType.java
index 9fb8133b9..41d1cabdb 100755
--- a/src/main/java/com/labsynch/labseer/domain/ValueType.java
+++ b/src/main/java/com/labsynch/labseer/domain/ValueType.java
@@ -1,7 +1,5 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
 
@@ -17,6 +15,7 @@
 import javax.persistence.Version;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -24,6 +23,9 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Configurable
 @Entity
 
diff --git a/src/main/java/com/labsynch/labseer/domain/Vendor.java b/src/main/java/com/labsynch/labseer/domain/Vendor.java
index 16fbc02dc..7cdc0552e 100755
--- a/src/main/java/com/labsynch/labseer/domain/Vendor.java
+++ b/src/main/java/com/labsynch/labseer/domain/Vendor.java
@@ -1,9 +1,8 @@
 package com.labsynch.labseer.domain;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -14,11 +13,15 @@
 import javax.persistence.TypedQuery;
 import javax.persistence.Version;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 @Entity
 @Configurable
 
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCodeDTO.java
index dafa6e56c..45896b4fd 100644
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCodeDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class AnalysisGroupCodeDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCsvDTO.java b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCsvDTO.java
index 73d5336de..a841d2be6 100644
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCsvDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCsvDTO.java
@@ -1,7 +1,5 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -9,6 +7,7 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -16,6 +15,9 @@
 import org.supercsv.cellprocessor.Optional;
 import org.supercsv.cellprocessor.ift.CellProcessor;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class AnalysisGroupCsvDTO {
 
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupStatePathDTO.java b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupStatePathDTO.java
index ad2f1f2e6..12451d046 100644
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupStatePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupStatePathDTO.java
@@ -2,11 +2,13 @@
 
 import java.util.Collection;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.labsynch.labseer.domain.AnalysisGroupState;
 import com.labsynch.labseer.utils.ExcludeNulls;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueBaseDTO.java b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueBaseDTO.java
index e5ace62f0..301c4779b 100755
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueBaseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueBaseDTO.java
@@ -1,16 +1,18 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class AnalysisGroupValueBaseDTO {
 
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueDTO.java b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueDTO.java
index ff90d7c6e..a2ad5e6dd 100755
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueDTO.java
@@ -1,11 +1,13 @@
 package com.labsynch.labseer.dto;
 
+import java.math.BigDecimal;
 import java.text.Format;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 import java.util.Date;
+import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -13,8 +15,6 @@
 import org.supercsv.cellprocessor.Optional;
 import org.supercsv.cellprocessor.ift.CellProcessor;
 
-import java.math.BigDecimal;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValuePathDTO.java
index 9acae4874..e066f979f 100644
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValuePathDTO.java
@@ -2,11 +2,13 @@
 
 import java.util.Collection;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.labsynch.labseer.domain.AnalysisGroupValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthGroupsAndProjectsDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthGroupsAndProjectsDTO.java
index c4be85b28..0fec2273e 100644
--- a/src/main/java/com/labsynch/labseer/dto/AuthGroupsAndProjectsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthGroupsAndProjectsDTO.java
@@ -3,11 +3,12 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.labsynch.labseer.utils.ExcludeNulls;
 
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthGroupsDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthGroupsDTO.java
index 21c20e15e..762d09dc8 100644
--- a/src/main/java/com/labsynch/labseer/dto/AuthGroupsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthGroupsDTO.java
@@ -1,13 +1,15 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class AuthGroupsDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthProjectDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthProjectDTO.java
index 7bb0bad94..7cb5a37ac 100755
--- a/src/main/java/com/labsynch/labseer/dto/AuthProjectDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthProjectDTO.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthProjectGroupsDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthProjectGroupsDTO.java
index 0aff5f202..4853ee94d 100644
--- a/src/main/java/com/labsynch/labseer/dto/AuthProjectGroupsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthProjectGroupsDTO.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthUserDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthUserDTO.java
index 9781e72f6..44c435d72 100755
--- a/src/main/java/com/labsynch/labseer/dto/AuthUserDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthUserDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class AuthUserDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorBrowserQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthorBrowserQueryDTO.java
index a941913e5..0f67ee5ed 100644
--- a/src/main/java/com/labsynch/labseer/dto/AuthorBrowserQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthorBrowserQueryDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class AuthorBrowserQueryDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorNameDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthorNameDTO.java
index c32d20a71..70a06bf2c 100755
--- a/src/main/java/com/labsynch/labseer/dto/AuthorNameDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthorNameDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class AuthorNameDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthorQueryDTO.java
index 1bbdff53b..a26523b6f 100644
--- a/src/main/java/com/labsynch/labseer/dto/AuthorQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthorQueryDTO.java
@@ -1,13 +1,15 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class AuthorQueryDTO {
 
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorQueryResultDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthorQueryResultDTO.java
index 25031479b..c8e9a1076 100644
--- a/src/main/java/com/labsynch/labseer/dto/AuthorQueryResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthorQueryResultDTO.java
@@ -2,12 +2,14 @@
 
 import java.util.Collection;
 import java.util.List;
+
+import com.labsynch.labseer.domain.Author;
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorRoleDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthorRoleDTO.java
index 4c9935f84..612c30148 100644
--- a/src/main/java/com/labsynch/labseer/dto/AuthorRoleDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthorRoleDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class AuthorRoleDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/AutoLabelDTO.java b/src/main/java/com/labsynch/labseer/dto/AutoLabelDTO.java
index a78f24596..a34e09b0a 100755
--- a/src/main/java/com/labsynch/labseer/dto/AutoLabelDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AutoLabelDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class AutoLabelDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/BatchCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/BatchCodeDTO.java
index 6951a572c..790d54f5a 100755
--- a/src/main/java/com/labsynch/labseer/dto/BatchCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BatchCodeDTO.java
@@ -1,14 +1,16 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.supercsv.cellprocessor.Optional;
 import org.supercsv.cellprocessor.ift.CellProcessor;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class BatchCodeDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO.java b/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO.java
index 591a04707..43b087507 100644
--- a/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO.java
@@ -1,30 +1,15 @@
 package com.labsynch.labseer.dto;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Date;
-import java.util.HashSet;
 import java.util.List;
 
-import javax.persistence.Lob;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.validation.constraints.Size;
+import com.labsynch.labseer.service.ErrorMessage;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import javax.persistence.NoResultException;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.BulkLoadTemplate;
-import com.labsynch.labseer.domain.CorpName;
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.domain.PhysicalState;
-
-import com.labsynch.labseer.service.ErrorMessage;
-import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/BatchProjectDTO.java b/src/main/java/com/labsynch/labseer/dto/BatchProjectDTO.java
index f6cd276fc..532efb599 100644
--- a/src/main/java/com/labsynch/labseer/dto/BatchProjectDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BatchProjectDTO.java
@@ -6,13 +6,15 @@
 
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
+
+import com.labsynch.labseer.domain.Lot;
+import com.labsynch.labseer.utils.SimpleUtil;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.utils.SimpleUtil;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO.java
index 43a087a1d..e39162b46 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO.java
@@ -2,31 +2,20 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 
-import javax.persistence.Lob;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import javax.persistence.NoResultException;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.domain.BulkLoadTemplate;
-import com.labsynch.labseer.domain.CorpName;
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.domain.PhysicalState;
-
 import com.labsynch.labseer.service.ErrorMessage;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import org.springframework.beans.factory.annotation.Autowired;
 import com.labsynch.labseer.utils.ExcludeNulls;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertyMappingDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertyMappingDTO.java
index 442826998..a0a1fe493 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertyMappingDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertyMappingDTO.java
@@ -3,12 +3,14 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
+
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFRequestDTO.java
index c7976e98c..9c1e667c0 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFRequestDTO.java
@@ -3,10 +3,12 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFResponseDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFResponseDTO.java
index 2e122de1c..ce8224e82 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFResponseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFResponseDTO.java
@@ -1,13 +1,13 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
-import com.labsynch.labseer.dto.ValidationResponseDTO;
+
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFPropertyRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFPropertyRequestDTO.java
index 45d71bc4a..615484acc 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFPropertyRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFPropertyRequestDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class BulkLoadSDFPropertyRequestDTO {
 
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO.java
index 28dadf081..bc042c406 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO.java
@@ -1,30 +1,13 @@
 package com.labsynch.labseer.dto;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Date;
-import java.util.HashSet;
 import java.util.List;
 
-import javax.persistence.Lob;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.validation.constraints.Size;
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.persistence.NoResultException;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.labsynch.labseer.domain.BulkLoadTemplate;
-import com.labsynch.labseer.domain.CorpName;
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.domain.PhysicalState;
-
-import com.labsynch.labseer.service.ErrorMessage;
-import com.labsynch.labseer.utils.ExcludeNulls;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO.java
index b302adc08..b4fdb3762 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO.java
@@ -1,30 +1,11 @@
 package com.labsynch.labseer.dto;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Date;
-import java.util.HashSet;
 import java.util.List;
 
-import javax.persistence.Lob;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.persistence.NoResultException;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.labsynch.labseer.domain.BulkLoadTemplate;
-import com.labsynch.labseer.domain.CorpName;
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.domain.PhysicalState;
-
-import com.labsynch.labseer.service.ErrorMessage;
-import com.labsynch.labseer.utils.ExcludeNulls;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkTransferPart1DTO.java b/src/main/java/com/labsynch/labseer/dto/BulkTransferPart1DTO.java
index 6b1a55d48..03cd3cd18 100755
--- a/src/main/java/com/labsynch/labseer/dto/BulkTransferPart1DTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkTransferPart1DTO.java
@@ -1,13 +1,15 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class BulkTransferPart1DTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/ChangePasswordDTO.java b/src/main/java/com/labsynch/labseer/dto/ChangePasswordDTO.java
index 6439ad188..fe23f49c2 100644
--- a/src/main/java/com/labsynch/labseer/dto/ChangePasswordDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ChangePasswordDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class ChangePasswordDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/CleanMolOptionsDTO.java b/src/main/java/com/labsynch/labseer/dto/CleanMolOptionsDTO.java
index a3449bb28..0d6679628 100644
--- a/src/main/java/com/labsynch/labseer/dto/CleanMolOptionsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CleanMolOptionsDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class CleanMolOptionsDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTO.java
index fcf7941e0..80e9cf899 100644
--- a/src/main/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTO.java
@@ -8,16 +8,18 @@
 
 import javax.persistence.EntityManager;
 import javax.persistence.TypedQuery;
+
+import com.labsynch.labseer.domain.AnalysisGroupValue;
+import com.labsynch.labseer.domain.SubjectValue;
+import com.labsynch.labseer.domain.TreatmentGroupValue;
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.domain.TreatmentGroupValue;
-import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/CmpdRegStructureSearchDTO.java b/src/main/java/com/labsynch/labseer/dto/CmpdRegStructureSearchDTO.java
index e5c031018..0000eb1ee 100755
--- a/src/main/java/com/labsynch/labseer/dto/CmpdRegStructureSearchDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CmpdRegStructureSearchDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 
 public class CmpdRegStructureSearchDTO{
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeLabelDTO.java b/src/main/java/com/labsynch/labseer/dto/CodeLabelDTO.java
index 1804fee57..07e1f29f4 100644
--- a/src/main/java/com/labsynch/labseer/dto/CodeLabelDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CodeLabelDTO.java
@@ -2,10 +2,12 @@
 
 import java.util.Collection;
 import java.util.List;
+
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeNameQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/CodeNameQueryDTO.java
index b9aa379bf..b1a20d936 100644
--- a/src/main/java/com/labsynch/labseer/dto/CodeNameQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CodeNameQueryDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class CodeNameQueryDTO {
 
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeNameValueDTO.java b/src/main/java/com/labsynch/labseer/dto/CodeNameValueDTO.java
index 1f12dbdc1..011fb1395 100644
--- a/src/main/java/com/labsynch/labseer/dto/CodeNameValueDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CodeNameValueDTO.java
@@ -2,11 +2,13 @@
 
 import java.util.Collection;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.labsynch.labseer.domain.AbstractValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeTableDTO.java b/src/main/java/com/labsynch/labseer/dto/CodeTableDTO.java
index b84c16c63..4c373a871 100755
--- a/src/main/java/com/labsynch/labseer/dto/CodeTableDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CodeTableDTO.java
@@ -3,14 +3,16 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.dao.IncorrectResultSizeDataAccessException;
 
 import com.labsynch.labseer.domain.DDictValue;
 import com.labsynch.labseer.domain.Experiment;
 import com.labsynch.labseer.domain.ExperimentLabel;
 import com.labsynch.labseer.utils.ExcludeNulls;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.dao.IncorrectResultSizeDataAccessException;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeTypeKindDTO.java b/src/main/java/com/labsynch/labseer/dto/CodeTypeKindDTO.java
index 052db5359..2ddb86145 100644
--- a/src/main/java/com/labsynch/labseer/dto/CodeTypeKindDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CodeTypeKindDTO.java
@@ -2,10 +2,12 @@
 
 import java.util.Collection;
 import java.util.List;
+
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerBatchCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerBatchCodeDTO.java
index eb7c57683..e70e9de6c 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerBatchCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerBatchCodeDTO.java
@@ -1,12 +1,13 @@
 package com.labsynch.labseer.dto;
 
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
+
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerBrowserQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerBrowserQueryDTO.java
index a67fd6c0c..4421d6e85 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerBrowserQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerBrowserQueryDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class ContainerBrowserQueryDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerCodeNameStateDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerCodeNameStateDTO.java
index 92c49a9cc..b7d32ffe9 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerCodeNameStateDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerCodeNameStateDTO.java
@@ -2,11 +2,13 @@
 
 import java.util.Collection;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.labsynch.labseer.domain.ContainerState;
 import com.labsynch.labseer.utils.ExcludeNulls;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerDependencyCheckDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerDependencyCheckDTO.java
index 23764ef5a..769012b8b 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerDependencyCheckDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerDependencyCheckDTO.java
@@ -4,25 +4,22 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 
 import javax.persistence.EntityManager;
-import javax.persistence.Query;
 import javax.persistence.TypedQuery;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.AnalysisGroupValue;
 import com.labsynch.labseer.domain.Container;
 import com.labsynch.labseer.domain.Experiment;
 import com.labsynch.labseer.domain.ItxSubjectContainer;
 import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.domain.TreatmentGroupValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.transaction.annotation.Transactional;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerErrorMessageDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerErrorMessageDTO.java
index 1888fa158..ce03163f1 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerErrorMessageDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerErrorMessageDTO.java
@@ -2,11 +2,13 @@
 
 import java.util.Collection;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.labsynch.labseer.domain.Container;
 import com.labsynch.labseer.utils.ExcludeNulls;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerLocationDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerLocationDTO.java
index e0e8d764a..66e64c5a8 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerLocationDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerLocationDTO.java
@@ -3,10 +3,12 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerLocationTreeDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerLocationTreeDTO.java
index 1d13bdf12..4435a970a 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerLocationTreeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerLocationTreeDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class ContainerLocationTreeDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerMiniDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerMiniDTO.java
index 10c776bee..1db8ce5ae 100755
--- a/src/main/java/com/labsynch/labseer/dto/ContainerMiniDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerMiniDTO.java
@@ -1,13 +1,15 @@
 package com.labsynch.labseer.dto;
 
+import java.util.Collection;
+import java.util.List;
+
+import com.labsynch.labseer.domain.Container;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.labsynch.labseer.domain.Container;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
-import java.util.Collection;
-import java.util.List;
 
 
 public class ContainerMiniDTO {
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerQueryDTO.java
index c4809a35a..50dc31640 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerQueryDTO.java
@@ -1,13 +1,15 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class ContainerQueryDTO {
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerQueryResultDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerQueryResultDTO.java
index 52f399586..179f3d177 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerQueryResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerQueryResultDTO.java
@@ -2,12 +2,14 @@
 
 import java.util.Collection;
 import java.util.List;
+
+import com.labsynch.labseer.domain.Container;
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerRequestDTO.java
index 7797b79f4..6a0032440 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerRequestDTO.java
@@ -1,14 +1,16 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class ContainerRequestDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerSearchRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerSearchRequestDTO.java
index f8c43d9aa..3db448b2e 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerSearchRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerSearchRequestDTO.java
@@ -1,11 +1,13 @@
 package com.labsynch.labseer.dto;
 
+import java.util.Collection;
+import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
-import java.util.Collection;
-import java.util.List;
 
 
 public class ContainerSearchRequestDTO {
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerStateMiniDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerStateMiniDTO.java
index 94ecb038f..af7180c6b 100755
--- a/src/main/java/com/labsynch/labseer/dto/ContainerStateMiniDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerStateMiniDTO.java
@@ -1,13 +1,15 @@
 package com.labsynch.labseer.dto;
 
+import java.util.Collection;
+import java.util.List;
+
+import com.labsynch.labseer.domain.ContainerState;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.labsynch.labseer.domain.ContainerState;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
-import java.util.Collection;
-import java.util.List;
 
 
 public class ContainerStateMiniDTO {
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerStatePathDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerStatePathDTO.java
index 207f50d2a..61df6a080 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerStatePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerStatePathDTO.java
@@ -2,11 +2,13 @@
 
 import java.util.Collection;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.labsynch.labseer.domain.ContainerState;
 import com.labsynch.labseer.utils.ExcludeNulls;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerSubjectsDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerSubjectsDTO.java
index 941ad56e0..ab9f24d52 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerSubjectsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerSubjectsDTO.java
@@ -3,11 +3,13 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.labsynch.labseer.domain.Subject;
 import com.labsynch.labseer.utils.ExcludeNulls;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerValuePathDTO.java
index 1161a10f9..e5bc9a26d 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerValuePathDTO.java
@@ -2,11 +2,13 @@
 
 import java.util.Collection;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.labsynch.labseer.domain.ContainerValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerValueRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerValueRequestDTO.java
index 7b73404c4..f9a60378d 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerValueRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerValueRequestDTO.java
@@ -1,13 +1,13 @@
 package com.labsynch.labseer.dto;
 
+import java.util.Collection;
+import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.labsynch.labseer.domain.Container;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
-import java.util.Collection;
-import java.util.List;
 
 
 public class ContainerValueRequestDTO {
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerWellCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerWellCodeDTO.java
index 7e0f070cc..2f1b23fd6 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerWellCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerWellCodeDTO.java
@@ -2,10 +2,12 @@
 
 import java.util.Collection;
 import java.util.List;
+
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/CorpNameDTO.java b/src/main/java/com/labsynch/labseer/dto/CorpNameDTO.java
index d7c803128..d778d0780 100644
--- a/src/main/java/com/labsynch/labseer/dto/CorpNameDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CorpNameDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class CorpNameDTO{
 
diff --git a/src/main/java/com/labsynch/labseer/dto/CreatePlateRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/CreatePlateRequestDTO.java
index 76ccf8438..df58ca47c 100644
--- a/src/main/java/com/labsynch/labseer/dto/CreatePlateRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CreatePlateRequestDTO.java
@@ -4,8 +4,10 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/CurveFitDTO.java b/src/main/java/com/labsynch/labseer/dto/CurveFitDTO.java
index a320975c4..b6ccb5c0f 100644
--- a/src/main/java/com/labsynch/labseer/dto/CurveFitDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CurveFitDTO.java
@@ -14,11 +14,21 @@
 import javax.persistence.EntityManager;
 import javax.persistence.NoResultException;
 import javax.persistence.TypedQuery;
+
+import com.labsynch.labseer.domain.AnalysisGroup;
+import com.labsynch.labseer.domain.AnalysisGroupState;
+import com.labsynch.labseer.domain.AnalysisGroupValue;
+import com.labsynch.labseer.domain.Experiment;
+import com.labsynch.labseer.domain.ProtocolValue;
+import com.labsynch.labseer.domain.Subject;
+import com.labsynch.labseer.domain.SubjectValue;
+import com.labsynch.labseer.domain.TreatmentGroup;
+import com.labsynch.labseer.utils.SimpleUtil;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import javax.persistence.NoResultException;
 import org.springframework.transaction.annotation.Transactional;
 import org.supercsv.cellprocessor.Optional;
 import org.supercsv.cellprocessor.ift.CellProcessor;
@@ -26,15 +36,6 @@
 import org.supercsv.io.ICsvBeanWriter;
 import org.supercsv.prefs.CsvPreference;
 
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ProtocolValue;
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.utils.SimpleUtil;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/DateValueComparisonRequest.java b/src/main/java/com/labsynch/labseer/dto/DateValueComparisonRequest.java
index 63e2749cd..1b40bb314 100644
--- a/src/main/java/com/labsynch/labseer/dto/DateValueComparisonRequest.java
+++ b/src/main/java/com/labsynch/labseer/dto/DateValueComparisonRequest.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class DateValueComparisonRequest {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/DependencyCheckDTO.java b/src/main/java/com/labsynch/labseer/dto/DependencyCheckDTO.java
index 0f0b0f4f1..b3ee82144 100644
--- a/src/main/java/com/labsynch/labseer/dto/DependencyCheckDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/DependencyCheckDTO.java
@@ -8,17 +8,19 @@
 
 import javax.persistence.EntityManager;
 import javax.persistence.TypedQuery;
+
+import com.labsynch.labseer.domain.AnalysisGroupValue;
+import com.labsynch.labseer.domain.ContainerValue;
+import com.labsynch.labseer.domain.SubjectValue;
+import com.labsynch.labseer.domain.TreatmentGroupValue;
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.domain.ContainerValue;
-import com.labsynch.labseer.domain.TreatmentGroupValue;
-import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/DoseReponseParamsDTO.java b/src/main/java/com/labsynch/labseer/dto/DoseReponseParamsDTO.java
index a08d51d63..786ac8a2a 100755
--- a/src/main/java/com/labsynch/labseer/dto/DoseReponseParamsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/DoseReponseParamsDTO.java
@@ -1,15 +1,17 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class DoseReponseParamsDTO {
 
diff --git a/src/main/java/com/labsynch/labseer/dto/EntrezDbDTO.java b/src/main/java/com/labsynch/labseer/dto/EntrezDbDTO.java
index 02693fd04..404a1b1fe 100644
--- a/src/main/java/com/labsynch/labseer/dto/EntrezDbDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/EntrezDbDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class EntrezDbDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/EntrezDbGeneDTO.java b/src/main/java/com/labsynch/labseer/dto/EntrezDbGeneDTO.java
index 6fd522947..72bd02a25 100755
--- a/src/main/java/com/labsynch/labseer/dto/EntrezDbGeneDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/EntrezDbGeneDTO.java
@@ -1,13 +1,15 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class EntrezDbGeneDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/EntrezDiscontinuedGeneDTO.java b/src/main/java/com/labsynch/labseer/dto/EntrezDiscontinuedGeneDTO.java
index 80ab9645a..7e4b43e34 100644
--- a/src/main/java/com/labsynch/labseer/dto/EntrezDiscontinuedGeneDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/EntrezDiscontinuedGeneDTO.java
@@ -1,13 +1,15 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class EntrezDiscontinuedGeneDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/ErrorMessageDTO.java b/src/main/java/com/labsynch/labseer/dto/ErrorMessageDTO.java
index 35cc2733f..4c2f7fec4 100755
--- a/src/main/java/com/labsynch/labseer/dto/ErrorMessageDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ErrorMessageDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class ErrorMessageDTO {
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentCodeDTO.java
index 7059e12fb..f20920987 100644
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentCodeDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class ExperimentCodeDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentCsvDataDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentCsvDataDTO.java
index 3add61cb1..4eab6db47 100644
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentCsvDataDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentCsvDataDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class ExperimentCsvDataDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentDataDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentDataDTO.java
index 36cd4692c..50bd942a3 100644
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentDataDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentDataDTO.java
@@ -1,17 +1,15 @@
 package com.labsynch.labseer.dto;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.labsynch.labseer.domain.LsTag;
-import com.labsynch.labseer.utils.CustomBigDecimalFactory;
-import com.labsynch.labseer.utils.ExcludeNulls;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentErrorMessageDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentErrorMessageDTO.java
index 86ded2184..b73e3bcd7 100644
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentErrorMessageDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentErrorMessageDTO.java
@@ -2,12 +2,14 @@
 
 import java.util.Collection;
 import java.util.List;
+
+import com.labsynch.labseer.domain.Experiment;
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentFilterDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentFilterDTO.java
index 8b68f2ba8..94ace067d 100755
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentFilterDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentFilterDTO.java
@@ -4,6 +4,7 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentFilterSearchDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentFilterSearchDTO.java
index 38aaa0880..e503d5af9 100755
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentFilterSearchDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentFilterSearchDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class ExperimentFilterSearchDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentGuiStubDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentGuiStubDTO.java
index 9b195e794..1713b6de3 100755
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentGuiStubDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentGuiStubDTO.java
@@ -4,15 +4,17 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.labsynch.labseer.domain.Experiment;
 import com.labsynch.labseer.domain.ExperimentState;
 import com.labsynch.labseer.domain.ExperimentValue;
 import com.labsynch.labseer.domain.Protocol;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentSearchRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentSearchRequestDTO.java
index 5bad89b81..05ca13ce1 100755
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentSearchRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentSearchRequestDTO.java
@@ -5,6 +5,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentStatePathDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentStatePathDTO.java
index 152638a55..ec0a9c10c 100644
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentStatePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentStatePathDTO.java
@@ -2,11 +2,13 @@
 
 import java.util.Collection;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.labsynch.labseer.domain.ExperimentState;
 import com.labsynch.labseer.utils.ExcludeNulls;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentValuePathDTO.java
index 1d18c35f3..4b0916348 100644
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentValuePathDTO.java
@@ -2,11 +2,13 @@
 
 import java.util.Collection;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.labsynch.labseer.domain.ExperimentValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ExportResultDTO.java b/src/main/java/com/labsynch/labseer/dto/ExportResultDTO.java
index 0c2ed5e71..a1ae3fced 100644
--- a/src/main/java/com/labsynch/labseer/dto/ExportResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExportResultDTO.java
@@ -1,13 +1,15 @@
 package com.labsynch.labseer.dto;
 
+import java.util.Collection;
+import java.util.List;
+
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
-import java.util.Collection;
-import java.util.List;
 
 
 public class ExportResultDTO {
diff --git a/src/main/java/com/labsynch/labseer/dto/FileSaveReturnArrayDTO.java b/src/main/java/com/labsynch/labseer/dto/FileSaveReturnArrayDTO.java
index c4cdac535..4c7246cbc 100755
--- a/src/main/java/com/labsynch/labseer/dto/FileSaveReturnArrayDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/FileSaveReturnArrayDTO.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/FileSaveReturnDTO.java b/src/main/java/com/labsynch/labseer/dto/FileSaveReturnDTO.java
index 51067da6c..c9ca47390 100755
--- a/src/main/java/com/labsynch/labseer/dto/FileSaveReturnDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/FileSaveReturnDTO.java
@@ -10,6 +10,7 @@
 import java.util.List;
 
 import javax.persistence.Transient;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
diff --git a/src/main/java/com/labsynch/labseer/dto/FileSaveSendDTO.java b/src/main/java/com/labsynch/labseer/dto/FileSaveSendDTO.java
index bc51ba6a5..be5823dd7 100755
--- a/src/main/java/com/labsynch/labseer/dto/FileSaveSendDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/FileSaveSendDTO.java
@@ -11,19 +11,20 @@
 import java.util.List;
 
 import javax.persistence.Transient;
+
+import com.labsynch.labseer.utils.MimeTypeUtil;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.labsynch.labseer.utils.PropertiesUtilService;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Configurable;
-
-import com.labsynch.labseer.utils.MimeTypeUtil;
 
 @Configurable
 
diff --git a/src/main/java/com/labsynch/labseer/dto/FlagWellDTO.java b/src/main/java/com/labsynch/labseer/dto/FlagWellDTO.java
index 0e346dafc..750d99089 100644
--- a/src/main/java/com/labsynch/labseer/dto/FlagWellDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/FlagWellDTO.java
@@ -1,7 +1,6 @@
 package com.labsynch.labseer.dto;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -9,16 +8,9 @@
 import java.util.Map;
 
 import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.persistence.NoResultException;
-import org.springframework.transaction.annotation.Transactional;
-import org.supercsv.cellprocessor.Optional;
-import org.supercsv.cellprocessor.ift.CellProcessor;
 
 import com.labsynch.labseer.domain.Subject;
 import com.labsynch.labseer.domain.SubjectState;
@@ -27,6 +19,15 @@
 import com.labsynch.labseer.domain.TreatmentGroupState;
 import com.labsynch.labseer.domain.TreatmentGroupValue;
 import com.labsynch.labseer.utils.StatCalc;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.transaction.annotation.Transactional;
+import org.supercsv.cellprocessor.Optional;
+import org.supercsv.cellprocessor.ift.CellProcessor;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/FlatThingCsvDTO.java b/src/main/java/com/labsynch/labseer/dto/FlatThingCsvDTO.java
index 4b4e614a3..1ca4c04bb 100644
--- a/src/main/java/com/labsynch/labseer/dto/FlatThingCsvDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/FlatThingCsvDTO.java
@@ -1,7 +1,5 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -9,6 +7,7 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -16,6 +15,9 @@
 import org.supercsv.cellprocessor.Optional;
 import org.supercsv.cellprocessor.ift.CellProcessor;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class FlatThingCsvDTO {
 
diff --git a/src/main/java/com/labsynch/labseer/dto/GeneIdDTO.java b/src/main/java/com/labsynch/labseer/dto/GeneIdDTO.java
index 727ff9cc6..6ae5bddb9 100755
--- a/src/main/java/com/labsynch/labseer/dto/GeneIdDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/GeneIdDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class GeneIdDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/GeneOrthologDTO.java b/src/main/java/com/labsynch/labseer/dto/GeneOrthologDTO.java
index 7624554a5..bbd33745e 100644
--- a/src/main/java/com/labsynch/labseer/dto/GeneOrthologDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/GeneOrthologDTO.java
@@ -1,14 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.labsynch.labseer.utils.ExcludeNulls;
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
 
 public class GeneOrthologDTO {
diff --git a/src/main/java/com/labsynch/labseer/dto/GeneOrthologFileDTO.java b/src/main/java/com/labsynch/labseer/dto/GeneOrthologFileDTO.java
index 0fdb52999..7e5b818f0 100644
--- a/src/main/java/com/labsynch/labseer/dto/GeneOrthologFileDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/GeneOrthologFileDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class GeneOrthologFileDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/GenericQueryCodeTableResultDTO.java b/src/main/java/com/labsynch/labseer/dto/GenericQueryCodeTableResultDTO.java
index 9ab427df2..ce1daf8ab 100644
--- a/src/main/java/com/labsynch/labseer/dto/GenericQueryCodeTableResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/GenericQueryCodeTableResultDTO.java
@@ -2,12 +2,13 @@
 
 import java.util.Collection;
 import java.util.List;
+
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/GenericStatePathRequest.java b/src/main/java/com/labsynch/labseer/dto/GenericStatePathRequest.java
index d7056191c..8310e246b 100644
--- a/src/main/java/com/labsynch/labseer/dto/GenericStatePathRequest.java
+++ b/src/main/java/com/labsynch/labseer/dto/GenericStatePathRequest.java
@@ -2,10 +2,12 @@
 
 import java.util.Collection;
 import java.util.List;
+
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/GenericValuePathRequest.java b/src/main/java/com/labsynch/labseer/dto/GenericValuePathRequest.java
index fb8e264f1..a39674cf2 100644
--- a/src/main/java/com/labsynch/labseer/dto/GenericValuePathRequest.java
+++ b/src/main/java/com/labsynch/labseer/dto/GenericValuePathRequest.java
@@ -2,10 +2,12 @@
 
 import java.util.Collection;
 import java.util.List;
+
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ItxQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/ItxQueryDTO.java
index 7c8bceb55..934b4508f 100644
--- a/src/main/java/com/labsynch/labseer/dto/ItxQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ItxQueryDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class ItxQueryDTO {
 
diff --git a/src/main/java/com/labsynch/labseer/dto/JSTreeNodeDTO.java b/src/main/java/com/labsynch/labseer/dto/JSTreeNodeDTO.java
index 39afed746..ab289fd34 100755
--- a/src/main/java/com/labsynch/labseer/dto/JSTreeNodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/JSTreeNodeDTO.java
@@ -6,13 +6,13 @@
 import java.util.List;
 import java.util.Set;
 
+import com.labsynch.labseer.domain.LsTag;
+
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.labsynch.labseer.domain.LsTag;
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/KeyValueDTO.java b/src/main/java/com/labsynch/labseer/dto/KeyValueDTO.java
index 83a19ae10..7806dd051 100644
--- a/src/main/java/com/labsynch/labseer/dto/KeyValueDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/KeyValueDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class KeyValueDTO {
 
diff --git a/src/main/java/com/labsynch/labseer/dto/LabelPrefixDTO.java b/src/main/java/com/labsynch/labseer/dto/LabelPrefixDTO.java
index 8b161144e..9ad565d86 100644
--- a/src/main/java/com/labsynch/labseer/dto/LabelPrefixDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LabelPrefixDTO.java
@@ -1,11 +1,13 @@
 package com.labsynch.labseer.dto;
 
+import java.util.Collection;
+import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
-import java.util.Collection;
-import java.util.List;
 
 
 public class LabelPrefixDTO {
diff --git a/src/main/java/com/labsynch/labseer/dto/LabelQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/LabelQueryDTO.java
index 518bc3f2a..35385dcb1 100644
--- a/src/main/java/com/labsynch/labseer/dto/LabelQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LabelQueryDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class LabelQueryDTO {
 
diff --git a/src/main/java/com/labsynch/labseer/dto/LotAliasDTO.java b/src/main/java/com/labsynch/labseer/dto/LotAliasDTO.java
index 3a863f944..69a6e9cc1 100644
--- a/src/main/java/com/labsynch/labseer/dto/LotAliasDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LotAliasDTO.java
@@ -3,12 +3,14 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
+
 import javax.persistence.NoResultException;
+
+import com.labsynch.labseer.domain.LotAlias;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.labsynch.labseer.domain.LotAlias;
-import com.labsynch.labseer.domain.ParentAlias;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/LotDTO.java b/src/main/java/com/labsynch/labseer/dto/LotDTO.java
index d3637d54a..db6f0c59f 100755
--- a/src/main/java/com/labsynch/labseer/dto/LotDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LotDTO.java
@@ -2,29 +2,20 @@
 
 import java.util.Collection;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Lob;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import com.labsynch.labseer.domain.IsoSalt;
 import com.labsynch.labseer.domain.Lot;
 import com.labsynch.labseer.domain.LotAlias;
 import com.labsynch.labseer.domain.Parent;
 import com.labsynch.labseer.domain.ParentAlias;
-import com.labsynch.labseer.domain.PhysicalState;
 import com.labsynch.labseer.domain.SaltForm;
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
-import com.labsynch.labseer.service.ChemStructureService;
 import com.labsynch.labseer.utils.MoleculeUtil;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingBrowserQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/LsThingBrowserQueryDTO.java
index 9819f6fb4..73070a970 100644
--- a/src/main/java/com/labsynch/labseer/dto/LsThingBrowserQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LsThingBrowserQueryDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class LsThingBrowserQueryDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/LsThingQueryDTO.java
index a8a5ea257..cb22f40d8 100644
--- a/src/main/java/com/labsynch/labseer/dto/LsThingQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LsThingQueryDTO.java
@@ -1,13 +1,15 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class LsThingQueryDTO {
 
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingQueryResultDTO.java b/src/main/java/com/labsynch/labseer/dto/LsThingQueryResultDTO.java
index 5aa1131de..122545fc5 100644
--- a/src/main/java/com/labsynch/labseer/dto/LsThingQueryResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LsThingQueryResultDTO.java
@@ -2,12 +2,14 @@
 
 import java.util.Collection;
 import java.util.List;
+
+import com.labsynch.labseer.domain.LsThing;
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingStatePathDTO.java b/src/main/java/com/labsynch/labseer/dto/LsThingStatePathDTO.java
index 64e0b8408..2de59c9c3 100644
--- a/src/main/java/com/labsynch/labseer/dto/LsThingStatePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LsThingStatePathDTO.java
@@ -2,11 +2,13 @@
 
 import java.util.Collection;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.labsynch.labseer.domain.LsThingState;
 import com.labsynch.labseer.utils.ExcludeNulls;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingValidationDTO.java b/src/main/java/com/labsynch/labseer/dto/LsThingValidationDTO.java
index 3071cdc25..761754bcc 100644
--- a/src/main/java/com/labsynch/labseer/dto/LsThingValidationDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LsThingValidationDTO.java
@@ -3,10 +3,12 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
+
+import com.labsynch.labseer.domain.LsThing;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.labsynch.labseer.domain.LsThing;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/LsThingValuePathDTO.java
index 566950df0..93a4c4f68 100644
--- a/src/main/java/com/labsynch/labseer/dto/LsThingValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LsThingValuePathDTO.java
@@ -2,11 +2,13 @@
 
 import java.util.Collection;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.labsynch.labseer.domain.LsThingValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/Metalot.java b/src/main/java/com/labsynch/labseer/dto/Metalot.java
index c60c23fbd..349f6e992 100755
--- a/src/main/java/com/labsynch/labseer/dto/Metalot.java
+++ b/src/main/java/com/labsynch/labseer/dto/Metalot.java
@@ -6,13 +6,14 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.labsynch.labseer.domain.FileList;
 import com.labsynch.labseer.domain.IsoSalt;
 import com.labsynch.labseer.domain.Lot;
 
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 import flexjson.transformer.DateTransformer;
diff --git a/src/main/java/com/labsynch/labseer/dto/MetalotReturn.java b/src/main/java/com/labsynch/labseer/dto/MetalotReturn.java
index 8c92ecce3..a204f89ea 100755
--- a/src/main/java/com/labsynch/labseer/dto/MetalotReturn.java
+++ b/src/main/java/com/labsynch/labseer/dto/MetalotReturn.java
@@ -4,11 +4,14 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import javax.transaction.Transactional;
+
+import com.labsynch.labseer.service.ErrorMessage;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.labsynch.labseer.service.ErrorMessage;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 import flexjson.transformer.DateTransformer;
diff --git a/src/main/java/com/labsynch/labseer/dto/MethodOptionDTO.java b/src/main/java/com/labsynch/labseer/dto/MethodOptionDTO.java
index 6b61edc54..3db01496c 100644
--- a/src/main/java/com/labsynch/labseer/dto/MethodOptionDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MethodOptionDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class MethodOptionDTO {
 		
diff --git a/src/main/java/com/labsynch/labseer/dto/MolConvertInputDTO.java b/src/main/java/com/labsynch/labseer/dto/MolConvertInputDTO.java
index 4e47db566..a10be798b 100644
--- a/src/main/java/com/labsynch/labseer/dto/MolConvertInputDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MolConvertInputDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class MolConvertInputDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/MolConvertOutputDTO.java b/src/main/java/com/labsynch/labseer/dto/MolConvertOutputDTO.java
index 1b4209af3..286b5d1e7 100644
--- a/src/main/java/com/labsynch/labseer/dto/MolConvertOutputDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MolConvertOutputDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class MolConvertOutputDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/MolInputDTO.java b/src/main/java/com/labsynch/labseer/dto/MolInputDTO.java
index fa8a09967..fe23a3cce 100644
--- a/src/main/java/com/labsynch/labseer/dto/MolInputDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MolInputDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class MolInputDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchRequest.java b/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchRequest.java
index eba5983e1..3ee51b236 100644
--- a/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchRequest.java
+++ b/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchRequest.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class MultiContainerSubjectSearchRequest {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchResultDTO.java b/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchResultDTO.java
index f513a028b..e73d3901e 100644
--- a/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchResultDTO.java
@@ -2,11 +2,13 @@
 
 import java.util.Collection;
 import java.util.List;
+
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO.java b/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO.java
index 13e946705..dd0825eeb 100644
--- a/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO.java
@@ -5,11 +5,12 @@
 import java.util.List;
 
 import javax.persistence.NoResultException;
+
+import com.labsynch.labseer.domain.ParentAlias;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.domain.ParentAlias;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentEditDTO.java b/src/main/java/com/labsynch/labseer/dto/ParentEditDTO.java
index 0f90118b7..f756afe27 100644
--- a/src/main/java/com/labsynch/labseer/dto/ParentEditDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ParentEditDTO.java
@@ -5,16 +5,11 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.persistence.Column;
-import javax.persistence.ManyToOne;
-import javax.validation.constraints.Size;
+import com.labsynch.labseer.domain.Parent;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.labsynch.labseer.domain.CompoundType;
-import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.domain.ParentAnnotation;
-import com.labsynch.labseer.domain.StereoCategory;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentValidationDTO.java b/src/main/java/com/labsynch/labseer/dto/ParentValidationDTO.java
index af8edd8da..2f631ba81 100644
--- a/src/main/java/com/labsynch/labseer/dto/ParentValidationDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ParentValidationDTO.java
@@ -3,12 +3,14 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+
+import com.labsynch.labseer.service.ErrorMessage;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.labsynch.labseer.service.ErrorMessage;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/PlateWellDTO.java b/src/main/java/com/labsynch/labseer/dto/PlateWellDTO.java
index 33e714bcd..4f5d8b726 100644
--- a/src/main/java/com/labsynch/labseer/dto/PlateWellDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PlateWellDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class PlateWellDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO.java b/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO.java
index 25ccce785..6bb184e0e 100755
--- a/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO.java
@@ -2,22 +2,17 @@
 
 
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
-import javax.persistence.Lob;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.validation.constraints.Size;
 
 import javax.persistence.NoResultException;
+
+import com.labsynch.labseer.domain.Lot;
+import com.labsynch.labseer.domain.Parent;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.domain.PhysicalState;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/PreferredNameResultsDTO.java b/src/main/java/com/labsynch/labseer/dto/PreferredNameResultsDTO.java
index 68ef3114e..2ddb021c2 100755
--- a/src/main/java/com/labsynch/labseer/dto/PreferredNameResultsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PreferredNameResultsDTO.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ProtocolValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/ProtocolValuePathDTO.java
index fd22f4055..ca5a59d28 100644
--- a/src/main/java/com/labsynch/labseer/dto/ProtocolValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ProtocolValuePathDTO.java
@@ -2,11 +2,13 @@
 
 import java.util.Collection;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.labsynch.labseer.domain.ProtocolValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/PurgeFileDependencyCheckResponseDTO.java b/src/main/java/com/labsynch/labseer/dto/PurgeFileDependencyCheckResponseDTO.java
index 91bb62ca3..0a8ca11df 100644
--- a/src/main/java/com/labsynch/labseer/dto/PurgeFileDependencyCheckResponseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PurgeFileDependencyCheckResponseDTO.java
@@ -1,13 +1,15 @@
 package com.labsynch.labseer.dto;
 
+import java.util.Collection;
+import java.util.List;
+
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
-import java.util.Collection;
-import java.util.List;
 
 
 public class PurgeFileDependencyCheckResponseDTO {
diff --git a/src/main/java/com/labsynch/labseer/dto/PurgeFileResponseDTO.java b/src/main/java/com/labsynch/labseer/dto/PurgeFileResponseDTO.java
index 94d9c5b9b..94ca9be1b 100644
--- a/src/main/java/com/labsynch/labseer/dto/PurgeFileResponseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PurgeFileResponseDTO.java
@@ -1,13 +1,15 @@
 package com.labsynch.labseer.dto;
 
+import java.util.Collection;
+import java.util.List;
+
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
-import java.util.Collection;
-import java.util.List;
 
 
 public class PurgeFileResponseDTO {
diff --git a/src/main/java/com/labsynch/labseer/dto/RegSearchParamsDTO.java b/src/main/java/com/labsynch/labseer/dto/RegSearchParamsDTO.java
index 4b3126d3e..3b6527a41 100755
--- a/src/main/java/com/labsynch/labseer/dto/RegSearchParamsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/RegSearchParamsDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class RegSearchParamsDTO {
 
diff --git a/src/main/java/com/labsynch/labseer/dto/RenderMolRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/RenderMolRequestDTO.java
index aca53777d..0d8458936 100644
--- a/src/main/java/com/labsynch/labseer/dto/RenderMolRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/RenderMolRequestDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class RenderMolRequestDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/ReparentLotDTO.java b/src/main/java/com/labsynch/labseer/dto/ReparentLotDTO.java
index adf483432..8948c3773 100644
--- a/src/main/java/com/labsynch/labseer/dto/ReparentLotDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ReparentLotDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class ReparentLotDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/RequestNameDTO.java b/src/main/java/com/labsynch/labseer/dto/RequestNameDTO.java
index af2491bf2..85be89689 100755
--- a/src/main/java/com/labsynch/labseer/dto/RequestNameDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/RequestNameDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class RequestNameDTO {
 
diff --git a/src/main/java/com/labsynch/labseer/dto/SELColOrderDTO.java b/src/main/java/com/labsynch/labseer/dto/SELColOrderDTO.java
index 60b6e333d..c1662e938 100644
--- a/src/main/java/com/labsynch/labseer/dto/SELColOrderDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SELColOrderDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class SELColOrderDTO implements Comparable {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchCdIdReturnDTO.java b/src/main/java/com/labsynch/labseer/dto/SearchCdIdReturnDTO.java
index 9db684c74..2a18a31ec 100644
--- a/src/main/java/com/labsynch/labseer/dto/SearchCdIdReturnDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SearchCdIdReturnDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class SearchCdIdReturnDTO{
 
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchCompoundReturnDTO.java b/src/main/java/com/labsynch/labseer/dto/SearchCompoundReturnDTO.java
index 76d808947..8649782c4 100755
--- a/src/main/java/com/labsynch/labseer/dto/SearchCompoundReturnDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SearchCompoundReturnDTO.java
@@ -4,6 +4,7 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchFormReturnDTO.java b/src/main/java/com/labsynch/labseer/dto/SearchFormReturnDTO.java
index 9746ae01d..52ab33201 100755
--- a/src/main/java/com/labsynch/labseer/dto/SearchFormReturnDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SearchFormReturnDTO.java
@@ -5,6 +5,7 @@
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/SetTubeLocationDTO.java b/src/main/java/com/labsynch/labseer/dto/SetTubeLocationDTO.java
index 933b023e3..4769ee86b 100644
--- a/src/main/java/com/labsynch/labseer/dto/SetTubeLocationDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SetTubeLocationDTO.java
@@ -1,14 +1,16 @@
 package com.labsynch.labseer.dto;
 
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class SetTubeLocationDTO {
 
diff --git a/src/main/java/com/labsynch/labseer/dto/StateValueDTO.java b/src/main/java/com/labsynch/labseer/dto/StateValueDTO.java
index c4e4038d2..9a3365f22 100644
--- a/src/main/java/com/labsynch/labseer/dto/StateValueDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StateValueDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class StateValueDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesDTO.java b/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesDTO.java
index 78eeb1be1..0b5e47de9 100644
--- a/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesDTO.java
@@ -3,16 +3,18 @@
 import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.labsynch.labseer.domain.ItxLsThingLsThing;
 import com.labsynch.labseer.domain.LsThing;
 import com.labsynch.labseer.domain.LsThingValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
 import com.labsynch.labseer.utils.SimpleUtil;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesResultsDTO.java b/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesResultsDTO.java
index adadd9dd0..1b8236b47 100644
--- a/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesResultsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesResultsDTO.java
@@ -3,10 +3,12 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/StructureSearchDTO.java b/src/main/java/com/labsynch/labseer/dto/StructureSearchDTO.java
index 921ea2bfe..a2f27b217 100644
--- a/src/main/java/com/labsynch/labseer/dto/StructureSearchDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StructureSearchDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class StructureSearchDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectCodeDTO.java
index 00a682e3a..0a603e885 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectCodeDTO.java
@@ -2,10 +2,12 @@
 
 import java.util.Collection;
 import java.util.List;
+
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectLabelDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectLabelDTO.java
index e1f33c59b..04ca971ab 100755
--- a/src/main/java/com/labsynch/labseer/dto/SubjectLabelDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectLabelDTO.java
@@ -3,10 +3,12 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+
+import com.labsynch.labseer.domain.SubjectLabel;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.labsynch.labseer.domain.SubjectLabel;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectMiniDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectMiniDTO.java
index 9e5e8c558..ceb7ecc2f 100755
--- a/src/main/java/com/labsynch/labseer/dto/SubjectMiniDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectMiniDTO.java
@@ -1,13 +1,15 @@
 package com.labsynch.labseer.dto;
 
+import java.util.Collection;
+import java.util.List;
+
+import com.labsynch.labseer.domain.Subject;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.labsynch.labseer.domain.Subject;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
-import java.util.Collection;
-import java.util.List;
 
 
 public class SubjectMiniDTO {
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectSearchRequest.java b/src/main/java/com/labsynch/labseer/dto/SubjectSearchRequest.java
index ae5c11e8f..2713d55af 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectSearchRequest.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectSearchRequest.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class SubjectSearchRequest {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectSearchResultDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectSearchResultDTO.java
index 3ea8bf649..81cc15bdb 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectSearchResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectSearchResultDTO.java
@@ -2,12 +2,14 @@
 
 import java.util.Collection;
 import java.util.List;
+
+import com.labsynch.labseer.domain.Subject;
+import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.utils.ExcludeNulls;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectStateMiniDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectStateMiniDTO.java
index f58d75fe2..3103db460 100755
--- a/src/main/java/com/labsynch/labseer/dto/SubjectStateMiniDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectStateMiniDTO.java
@@ -1,13 +1,15 @@
 package com.labsynch.labseer.dto;
 
+import java.util.Collection;
+import java.util.List;
+
+import com.labsynch.labseer.domain.SubjectState;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.labsynch.labseer.domain.SubjectState;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
-import java.util.Collection;
-import java.util.List;
 
 
 public class SubjectStateMiniDTO {
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectValueDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectValueDTO.java
index d85a240a4..0fd2e901e 100755
--- a/src/main/java/com/labsynch/labseer/dto/SubjectValueDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectValueDTO.java
@@ -4,12 +4,13 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.labsynch.labseer.domain.SubjectState;
 import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.domain.TreatmentGroupState;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/TempThingDTO.java b/src/main/java/com/labsynch/labseer/dto/TempThingDTO.java
index 339e85438..fb5c90ea7 100644
--- a/src/main/java/com/labsynch/labseer/dto/TempThingDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TempThingDTO.java
@@ -1,14 +1,16 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class TempThingDTO {
 
diff --git a/src/main/java/com/labsynch/labseer/dto/TgDataDTO.java b/src/main/java/com/labsynch/labseer/dto/TgDataDTO.java
index 400849ab6..370a3f3e9 100644
--- a/src/main/java/com/labsynch/labseer/dto/TgDataDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TgDataDTO.java
@@ -7,10 +7,13 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 
 import javax.persistence.EntityManager;
 import javax.persistence.TypedQuery;
+
+import com.labsynch.labseer.domain.SubjectValue;
+import com.labsynch.labseer.domain.TreatmentGroupValue;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.supercsv.cellprocessor.Optional;
@@ -19,8 +22,6 @@
 import org.supercsv.io.ICsvBeanWriter;
 import org.supercsv.prefs.CsvPreference;
 
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.domain.TreatmentGroupValue;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupCodeDTO.java
index a64cb9a17..603f87a24 100644
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupCodeDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class TreatmentGroupCodeDTO {
 	
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupMiniDTO.java b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupMiniDTO.java
index 7a3400e8f..b80a19861 100755
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupMiniDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupMiniDTO.java
@@ -1,13 +1,15 @@
 package com.labsynch.labseer.dto;
 
+import java.util.Collection;
+import java.util.List;
+
+import com.labsynch.labseer.domain.TreatmentGroup;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.labsynch.labseer.domain.TreatmentGroup;
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
-import java.util.Collection;
-import java.util.List;
 
 
 public class TreatmentGroupMiniDTO {
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupStatePathDTO.java b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupStatePathDTO.java
index 6c64c80a9..04656f4e4 100644
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupStatePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupStatePathDTO.java
@@ -2,11 +2,13 @@
 
 import java.util.Collection;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.labsynch.labseer.domain.TreatmentGroupState;
 import com.labsynch.labseer.utils.ExcludeNulls;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValueDTO.java b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValueDTO.java
index d4addf4e1..f37306686 100644
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValueDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValueDTO.java
@@ -4,11 +4,13 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.labsynch.labseer.domain.TreatmentGroupState;
 import com.labsynch.labseer.domain.TreatmentGroupValue;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValuePathDTO.java
index 14e937e77..3fe0dccf0 100644
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValuePathDTO.java
@@ -2,11 +2,13 @@
 
 import java.util.Collection;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.labsynch.labseer.domain.TreatmentGroupValue;
 import com.labsynch.labseer.utils.ExcludeNulls;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/TsvLoaderResponseDTO.java b/src/main/java/com/labsynch/labseer/dto/TsvLoaderResponseDTO.java
index 175161532..aa4d67838 100644
--- a/src/main/java/com/labsynch/labseer/dto/TsvLoaderResponseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TsvLoaderResponseDTO.java
@@ -2,10 +2,12 @@
 
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/TypeDTO.java b/src/main/java/com/labsynch/labseer/dto/TypeDTO.java
index f0e4c7f42..abded1338 100644
--- a/src/main/java/com/labsynch/labseer/dto/TypeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TypeDTO.java
@@ -3,10 +3,7 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
 import javax.persistence.NoResultException;
 
 import com.labsynch.labseer.domain.ContainerType;
@@ -21,6 +18,12 @@
 import com.labsynch.labseer.domain.ThingType;
 import com.labsynch.labseer.domain.UnitType;
 import com.labsynch.labseer.domain.ValueType;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/TypeKindDTO.java b/src/main/java/com/labsynch/labseer/dto/TypeKindDTO.java
index 083880ba6..a4b06063c 100644
--- a/src/main/java/com/labsynch/labseer/dto/TypeKindDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TypeKindDTO.java
@@ -3,10 +3,7 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
 import javax.persistence.NoResultException;
 
 import com.labsynch.labseer.domain.ContainerKind;
@@ -33,6 +30,12 @@
 import com.labsynch.labseer.domain.UnitType;
 import com.labsynch.labseer.domain.ValueKind;
 import com.labsynch.labseer.domain.ValueType;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ValidationResponseDTO.java b/src/main/java/com/labsynch/labseer/dto/ValidationResponseDTO.java
index bd37056c1..53747bd3a 100644
--- a/src/main/java/com/labsynch/labseer/dto/ValidationResponseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ValidationResponseDTO.java
@@ -2,9 +2,12 @@
 
 import java.util.Collection;
 import java.util.List;
+
 import com.labsynch.labseer.utils.ExcludeNulls;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/ValuePathDTO.java
index b135eb6df..c1c60739e 100644
--- a/src/main/java/com/labsynch/labseer/dto/ValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ValuePathDTO.java
@@ -4,8 +4,6 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.labsynch.labseer.domain.ItxLsThingLsThing;
 import com.labsynch.labseer.domain.ItxLsThingLsThingState;
@@ -13,6 +11,10 @@
 import com.labsynch.labseer.domain.LsThing;
 import com.labsynch.labseer.domain.LsThingState;
 import com.labsynch.labseer.domain.LsThingValue;
+
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
diff --git a/src/main/java/com/labsynch/labseer/dto/ValueQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/ValueQueryDTO.java
index e53968f38..b1e818f43 100644
--- a/src/main/java/com/labsynch/labseer/dto/ValueQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ValueQueryDTO.java
@@ -1,12 +1,14 @@
 package com.labsynch.labseer.dto;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class ValueQueryDTO {
 
diff --git a/src/main/java/com/labsynch/labseer/dto/configuration/StandardizerSettingsConfigDTO.java b/src/main/java/com/labsynch/labseer/dto/configuration/StandardizerSettingsConfigDTO.java
index fe64b36c6..be792c843 100644
--- a/src/main/java/com/labsynch/labseer/dto/configuration/StandardizerSettingsConfigDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/configuration/StandardizerSettingsConfigDTO.java
@@ -1,15 +1,15 @@
 package com.labsynch.labseer.dto.configuration;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
 
 
 public class StandardizerSettingsConfigDTO {
diff --git a/src/main/java/com/labsynch/labseer/exceptions/ErrorMessage.java b/src/main/java/com/labsynch/labseer/exceptions/ErrorMessage.java
index f9425e26e..866926950 100755
--- a/src/main/java/com/labsynch/labseer/exceptions/ErrorMessage.java
+++ b/src/main/java/com/labsynch/labseer/exceptions/ErrorMessage.java
@@ -1,13 +1,16 @@
 package com.labsynch.labseer.exceptions;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class ErrorMessage {
 
diff --git a/src/main/java/com/labsynch/labseer/exceptions/LsThingValidationErrorMessage.java b/src/main/java/com/labsynch/labseer/exceptions/LsThingValidationErrorMessage.java
index 8e9626253..407a49fae 100644
--- a/src/main/java/com/labsynch/labseer/exceptions/LsThingValidationErrorMessage.java
+++ b/src/main/java/com/labsynch/labseer/exceptions/LsThingValidationErrorMessage.java
@@ -1,13 +1,16 @@
 package com.labsynch.labseer.exceptions;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class LsThingValidationErrorMessage {
 
diff --git a/src/main/java/com/labsynch/labseer/service/ACASAuthenticationProvider.java b/src/main/java/com/labsynch/labseer/service/ACASAuthenticationProvider.java
index 1bfe0fe75..641d6b170 100755
--- a/src/main/java/com/labsynch/labseer/service/ACASAuthenticationProvider.java
+++ b/src/main/java/com/labsynch/labseer/service/ACASAuthenticationProvider.java
@@ -14,31 +14,31 @@
 import java.util.Properties;
 
 import javax.persistence.EntityNotFoundException;
+import javax.persistence.NoResultException;
 import javax.persistence.NonUniqueResultException;
 import javax.persistence.TypedQuery;
 
+import com.labsynch.labseer.domain.Author;
+import com.labsynch.labseer.domain.AuthorRole;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+
 import org.apache.commons.codec.binary.Base64;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import javax.persistence.NoResultException;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.DisabledException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.authentication.dao.AbstractUserDetailsAuthenticationProvider;
-import org.springframework.security.crypto.password.MessageDigestPasswordEncoder;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.crypto.password.MessageDigestPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.AuthorRole;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-
 
 
 /**
diff --git a/src/main/java/com/labsynch/labseer/service/AnalysisGroupService.java b/src/main/java/com/labsynch/labseer/service/AnalysisGroupService.java
index 06d91615b..60a8b0cfd 100755
--- a/src/main/java/com/labsynch/labseer/service/AnalysisGroupService.java
+++ b/src/main/java/com/labsynch/labseer/service/AnalysisGroupService.java
@@ -3,13 +3,13 @@
 import java.io.IOException;
 import java.util.HashMap;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.AnalysisGroup;
 import com.labsynch.labseer.dto.TempThingDTO;
 import com.labsynch.labseer.dto.TsvLoaderResponseDTO;
 import com.labsynch.labseer.exceptions.NotFoundException;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface AnalysisGroupService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/AnalysisGroupServiceImpl.java b/src/main/java/com/labsynch/labseer/service/AnalysisGroupServiceImpl.java
index 4b592f0f0..4e399d9d7 100755
--- a/src/main/java/com/labsynch/labseer/service/AnalysisGroupServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/AnalysisGroupServiceImpl.java
@@ -14,34 +14,28 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import javax.persistence.OptimisticLockException;
-
-import org.hibernate.exception.LockAcquisitionException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.supercsv.cellprocessor.ift.CellProcessor;
-import org.supercsv.io.CsvBeanReader;
-import org.supercsv.io.ICsvBeanReader;
-import org.supercsv.prefs.CsvPreference;
-
 import com.labsynch.labseer.domain.AnalysisGroup;
 import com.labsynch.labseer.domain.AnalysisGroupLabel;
 import com.labsynch.labseer.domain.AnalysisGroupState;
 import com.labsynch.labseer.domain.AnalysisGroupValue;
 import com.labsynch.labseer.domain.Experiment;
 import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.domain.TreatmentGroupLabel;
-import com.labsynch.labseer.domain.TreatmentGroupState;
-import com.labsynch.labseer.domain.TreatmentGroupValue;
 import com.labsynch.labseer.dto.FlatThingCsvDTO;
 import com.labsynch.labseer.dto.TempThingDTO;
 import com.labsynch.labseer.dto.TsvLoaderResponseDTO;
 import com.labsynch.labseer.exceptions.NotFoundException;
 import com.labsynch.labseer.utils.PropertiesUtilService;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.supercsv.cellprocessor.ift.CellProcessor;
+import org.supercsv.io.CsvBeanReader;
+import org.supercsv.io.ICsvBeanReader;
+import org.supercsv.prefs.CsvPreference;
+
 @Service
 @Transactional
 public class AnalysisGroupServiceImpl implements AnalysisGroupService {
diff --git a/src/main/java/com/labsynch/labseer/service/AnalysisGroupStateService.java b/src/main/java/com/labsynch/labseer/service/AnalysisGroupStateService.java
index 77e167211..f0250aef3 100755
--- a/src/main/java/com/labsynch/labseer/service/AnalysisGroupStateService.java
+++ b/src/main/java/com/labsynch/labseer/service/AnalysisGroupStateService.java
@@ -3,12 +3,12 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.AnalysisGroupState;
 import com.labsynch.labseer.dto.AnalysisGroupStatePathDTO;
 import com.labsynch.labseer.dto.GenericStatePathRequest;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface AnalysisGroupStateService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/AnalysisGroupValueService.java b/src/main/java/com/labsynch/labseer/service/AnalysisGroupValueService.java
index 2d905777c..cf54b27a3 100644
--- a/src/main/java/com/labsynch/labseer/service/AnalysisGroupValueService.java
+++ b/src/main/java/com/labsynch/labseer/service/AnalysisGroupValueService.java
@@ -3,13 +3,13 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.AnalysisGroupState;
 import com.labsynch.labseer.domain.AnalysisGroupValue;
 import com.labsynch.labseer.dto.AnalysisGroupValuePathDTO;
 import com.labsynch.labseer.dto.GenericValuePathRequest;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface AnalysisGroupValueService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/AnalysisGroupValueServiceImpl.java b/src/main/java/com/labsynch/labseer/service/AnalysisGroupValueServiceImpl.java
index d285d8a03..74c6ac710 100644
--- a/src/main/java/com/labsynch/labseer/service/AnalysisGroupValueServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/AnalysisGroupValueServiceImpl.java
@@ -9,6 +9,13 @@
 import java.util.Date;
 import java.util.List;
 
+import com.labsynch.labseer.domain.AnalysisGroup;
+import com.labsynch.labseer.domain.AnalysisGroupState;
+import com.labsynch.labseer.domain.AnalysisGroupValue;
+import com.labsynch.labseer.dto.AnalysisGroupValuePathDTO;
+import com.labsynch.labseer.dto.GenericValuePathRequest;
+import com.labsynch.labseer.utils.SimpleUtil;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,13 +26,6 @@
 import org.supercsv.io.ICsvBeanWriter;
 import org.supercsv.prefs.CsvPreference;
 
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.dto.AnalysisGroupValuePathDTO;
-import com.labsynch.labseer.dto.GenericValuePathRequest;
-import com.labsynch.labseer.utils.SimpleUtil;
-
 
 @Service
 @Transactional
diff --git a/src/main/java/com/labsynch/labseer/service/AuthorRoleService.java b/src/main/java/com/labsynch/labseer/service/AuthorRoleService.java
index 2f2f3b3ef..cd77dd5fb 100644
--- a/src/main/java/com/labsynch/labseer/service/AuthorRoleService.java
+++ b/src/main/java/com/labsynch/labseer/service/AuthorRoleService.java
@@ -2,11 +2,11 @@
 
 import java.util.Collection;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.Author;
 import com.labsynch.labseer.dto.AuthorRoleDTO;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface AuthorRoleService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/AuthorService.java b/src/main/java/com/labsynch/labseer/service/AuthorService.java
index eb8b23a04..3ad960162 100644
--- a/src/main/java/com/labsynch/labseer/service/AuthorService.java
+++ b/src/main/java/com/labsynch/labseer/service/AuthorService.java
@@ -3,8 +3,6 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.Author;
 import com.labsynch.labseer.domain.LsThing;
 import com.labsynch.labseer.dto.AuthGroupsAndProjectsDTO;
@@ -12,6 +10,8 @@
 import com.labsynch.labseer.dto.AuthorQueryDTO;
 import com.labsynch.labseer.dto.CodeTableDTO;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface AuthorService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/AuthorServiceImpl.java b/src/main/java/com/labsynch/labseer/service/AuthorServiceImpl.java
index bd64ba0de..e6dbb3e24 100644
--- a/src/main/java/com/labsynch/labseer/service/AuthorServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/AuthorServiceImpl.java
@@ -14,27 +14,15 @@
 import java.util.Set;
 
 import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import javax.persistence.NoResultException;
 import javax.persistence.TypedQuery;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Expression;
 import javax.persistence.criteria.Join;
-import javax.persistence.criteria.JoinType;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import org.apache.commons.lang3.RandomStringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.persistence.NoResultException;
-import org.springframework.mail.MailSender;
-import org.springframework.mail.SimpleMailMessage;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.labsynch.labseer.domain.Author;
 import com.labsynch.labseer.domain.AuthorLabel;
 import com.labsynch.labseer.domain.AuthorRole;
@@ -51,12 +39,20 @@
 import com.labsynch.labseer.dto.AuthorBrowserQueryDTO;
 import com.labsynch.labseer.dto.AuthorQueryDTO;
 import com.labsynch.labseer.dto.CodeTableDTO;
-import com.labsynch.labseer.dto.ItxQueryDTO;
 import com.labsynch.labseer.dto.LabelQueryDTO;
 import com.labsynch.labseer.dto.ValueQueryDTO;
 import com.labsynch.labseer.utils.PropertiesUtilService;
 import com.labsynch.labseer.utils.SimpleUtil;
 
+import org.apache.commons.lang3.RandomStringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.mail.MailSender;
+import org.springframework.mail.SimpleMailMessage;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 @Service
 @Transactional
 public class AuthorServiceImpl implements AuthorService {
diff --git a/src/main/java/com/labsynch/labseer/service/AutoLabelService.java b/src/main/java/com/labsynch/labseer/service/AutoLabelService.java
index 7780a7907..cbffe0fdc 100755
--- a/src/main/java/com/labsynch/labseer/service/AutoLabelService.java
+++ b/src/main/java/com/labsynch/labseer/service/AutoLabelService.java
@@ -4,11 +4,11 @@
 
 import javax.persistence.NonUniqueResultException;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.dto.AutoLabelDTO;
 import com.labsynch.labseer.dto.LabelSequenceDTO;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface AutoLabelService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/AutoLabelServiceImpl.java b/src/main/java/com/labsynch/labseer/service/AutoLabelServiceImpl.java
index 0a883f746..0d333a312 100755
--- a/src/main/java/com/labsynch/labseer/service/AutoLabelServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/AutoLabelServiceImpl.java
@@ -8,12 +8,8 @@
 import javax.persistence.NoResultException;
 import javax.persistence.NonUniqueResultException;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.labsynch.labseer.domain.LabelSequence;
+import com.labsynch.labseer.domain.LsSeqAnlGrp;
 import com.labsynch.labseer.domain.LsSeqContainer;
 import com.labsynch.labseer.domain.LsSeqExpt;
 import com.labsynch.labseer.domain.LsSeqItxCntrCntr;
@@ -23,10 +19,14 @@
 import com.labsynch.labseer.domain.LsSeqProtocol;
 import com.labsynch.labseer.domain.LsSeqSubject;
 import com.labsynch.labseer.domain.LsSeqTrtGrp;
-import com.labsynch.labseer.domain.LsSeqAnlGrp;
 import com.labsynch.labseer.dto.AutoLabelDTO;
 import com.labsynch.labseer.dto.LabelSequenceDTO;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 @Service
 @Transactional
 public class AutoLabelServiceImpl implements AutoLabelService {
diff --git a/src/main/java/com/labsynch/labseer/service/BulkLoadServiceImpl.java b/src/main/java/com/labsynch/labseer/service/BulkLoadServiceImpl.java
index 1e6ae223a..765841573 100644
--- a/src/main/java/com/labsynch/labseer/service/BulkLoadServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/BulkLoadServiceImpl.java
@@ -1,14 +1,9 @@
 package com.labsynch.labseer.service;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
-import java.net.URL;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -21,18 +16,10 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.regex.Pattern;
 import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
-import org.apache.commons.io.IOUtils;
-import org.hibernate.Session;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import javax.persistence.NoResultException;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.TransactionSystemException;
-import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
 import com.labsynch.labseer.chemclasses.CmpdRegMoleculeFactory;
@@ -43,6 +30,7 @@
 import com.labsynch.labseer.domain.BulkLoadFile;
 import com.labsynch.labseer.domain.BulkLoadTemplate;
 import com.labsynch.labseer.domain.CompoundType;
+import com.labsynch.labseer.domain.DryRunCompound;
 import com.labsynch.labseer.domain.FileList;
 import com.labsynch.labseer.domain.IsoSalt;
 import com.labsynch.labseer.domain.Lot;
@@ -59,14 +47,13 @@
 import com.labsynch.labseer.domain.StereoCategory;
 import com.labsynch.labseer.domain.Unit;
 import com.labsynch.labseer.domain.Vendor;
-import com.labsynch.labseer.domain.DryRunCompound;
 import com.labsynch.labseer.dto.BatchCodeDependencyDTO;
 import com.labsynch.labseer.dto.BulkLoadPropertiesDTO;
 import com.labsynch.labseer.dto.BulkLoadPropertyMappingDTO;
 import com.labsynch.labseer.dto.BulkLoadRegisterSDFRequestDTO;
 import com.labsynch.labseer.dto.BulkLoadRegisterSDFResponseDTO;
-import com.labsynch.labseer.dto.BulkLoadSDFValidationPropertiesResponseDTO;
 import com.labsynch.labseer.dto.BulkLoadSDFPropertyRequestDTO;
+import com.labsynch.labseer.dto.BulkLoadSDFValidationPropertiesResponseDTO;
 import com.labsynch.labseer.dto.CodeTableDTO;
 import com.labsynch.labseer.dto.ContainerBatchCodeDTO;
 import com.labsynch.labseer.dto.LabelPrefixDTO;
@@ -77,7 +64,6 @@
 import com.labsynch.labseer.dto.SimpleBulkLoadPropertyDTO;
 import com.labsynch.labseer.dto.StrippedSaltDTO;
 import com.labsynch.labseer.dto.ValidationResponseDTO;
-
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
 import com.labsynch.labseer.exceptions.DupeLotException;
 import com.labsynch.labseer.exceptions.DupeParentException;
@@ -86,6 +72,15 @@
 import com.labsynch.labseer.service.ChemStructureService.StructureType;
 import com.labsynch.labseer.utils.PropertiesUtilService;
 import com.labsynch.labseer.utils.SimpleUtil;
+
+import org.hibernate.Session;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.TransactionSystemException;
+import org.springframework.transaction.annotation.Transactional;
+
 import flexjson.JSONSerializer;
 
 @Service
diff --git a/src/main/java/com/labsynch/labseer/service/ChemStructureService.java b/src/main/java/com/labsynch/labseer/service/ChemStructureService.java
index cb7bb779e..267f37c55 100755
--- a/src/main/java/com/labsynch/labseer/service/ChemStructureService.java
+++ b/src/main/java/com/labsynch/labseer/service/ChemStructureService.java
@@ -5,9 +5,6 @@
 import java.util.HashMap;
 import java.util.Optional;
 
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
 import com.labsynch.labseer.dto.MolConvertOutputDTO;
 import com.labsynch.labseer.dto.StrippedSaltDTO;
@@ -15,6 +12,9 @@
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
 import com.labsynch.labseer.exceptions.StandardizerException;
 
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
 @Service
 public interface ChemStructureService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/ContainerService.java b/src/main/java/com/labsynch/labseer/service/ContainerService.java
index 65a9369c5..7ff7643b4 100755
--- a/src/main/java/com/labsynch/labseer/service/ContainerService.java
+++ b/src/main/java/com/labsynch/labseer/service/ContainerService.java
@@ -5,8 +5,6 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.Container;
 import com.labsynch.labseer.domain.ContainerLabel;
 import com.labsynch.labseer.domain.ContainerState;
@@ -28,7 +26,6 @@
 import com.labsynch.labseer.dto.ContainerValueRequestDTO;
 import com.labsynch.labseer.dto.ContainerWellCodeDTO;
 import com.labsynch.labseer.dto.CreatePlateRequestDTO;
-import com.labsynch.labseer.dto.LsThingBrowserQueryDTO;
 import com.labsynch.labseer.dto.PlateStubDTO;
 import com.labsynch.labseer.dto.PlateWellDTO;
 import com.labsynch.labseer.dto.PreferredNameRequestDTO;
@@ -36,6 +33,8 @@
 import com.labsynch.labseer.dto.WellContentDTO;
 import com.labsynch.labseer.exceptions.ErrorMessage;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface ContainerService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/ContainerServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ContainerServiceImpl.java
index f06ef8ca2..eee7d4302 100755
--- a/src/main/java/com/labsynch/labseer/service/ContainerServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ContainerServiceImpl.java
@@ -4,7 +4,6 @@
 import java.io.FileReader;
 import java.io.StringReader;
 import java.math.BigDecimal;
-import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
@@ -20,6 +19,7 @@
 import java.util.Set;
 
 import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
 import javax.persistence.Query;
 import javax.persistence.Tuple;
 import javax.persistence.TypedQuery;
@@ -33,15 +33,6 @@
 import javax.persistence.criteria.Root;
 import javax.sql.DataSource;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.persistence.NoResultException;
-import org.springframework.jdbc.core.BatchPreparedStatementSetter;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.labsynch.labseer.domain.Container;
 import com.labsynch.labseer.domain.ContainerLabel;
 import com.labsynch.labseer.domain.ContainerState;
@@ -86,6 +77,14 @@
 import com.labsynch.labseer.utils.SimpleUtil;
 import com.labsynch.labseer.utils.SimpleUtil.DbType;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import flexjson.JSONTokener;
 
 @Service
diff --git a/src/main/java/com/labsynch/labseer/service/ContainerStateService.java b/src/main/java/com/labsynch/labseer/service/ContainerStateService.java
index 2fc1113ec..5f1fcaa9e 100755
--- a/src/main/java/com/labsynch/labseer/service/ContainerStateService.java
+++ b/src/main/java/com/labsynch/labseer/service/ContainerStateService.java
@@ -3,14 +3,14 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.ContainerState;
 import com.labsynch.labseer.domain.LsTransaction;
 import com.labsynch.labseer.dto.ContainerStatePathDTO;
 import com.labsynch.labseer.dto.ContainerValueRequestDTO;
 import com.labsynch.labseer.dto.GenericStatePathRequest;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface ContainerStateService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/ContainerStateServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ContainerStateServiceImpl.java
index ce2fd9c0f..02b7b6d51 100755
--- a/src/main/java/com/labsynch/labseer/service/ContainerStateServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ContainerStateServiceImpl.java
@@ -21,17 +21,9 @@
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ContainerLabel;
 import com.labsynch.labseer.domain.ContainerState;
 import com.labsynch.labseer.domain.ContainerValue;
-import com.labsynch.labseer.domain.ItxContainerContainer;
 import com.labsynch.labseer.domain.LsTransaction;
 import com.labsynch.labseer.domain.UpdateLog;
 import com.labsynch.labseer.dto.ContainerStatePathDTO;
@@ -40,6 +32,12 @@
 import com.labsynch.labseer.utils.PropertiesUtilService;
 import com.labsynch.labseer.utils.SimpleUtil;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 @Service
 @Transactional
 public class ContainerStateServiceImpl implements ContainerStateService {
diff --git a/src/main/java/com/labsynch/labseer/service/ContainerValueService.java b/src/main/java/com/labsynch/labseer/service/ContainerValueService.java
index 502e8cf1d..f351a39ef 100644
--- a/src/main/java/com/labsynch/labseer/service/ContainerValueService.java
+++ b/src/main/java/com/labsynch/labseer/service/ContainerValueService.java
@@ -3,13 +3,13 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.ContainerState;
 import com.labsynch.labseer.domain.ContainerValue;
 import com.labsynch.labseer.dto.ContainerValuePathDTO;
 import com.labsynch.labseer.dto.GenericValuePathRequest;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface ContainerValueService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/ContainerValueServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ContainerValueServiceImpl.java
index 18b11fbdb..df4589123 100644
--- a/src/main/java/com/labsynch/labseer/service/ContainerValueServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ContainerValueServiceImpl.java
@@ -7,12 +7,6 @@
 import java.util.Date;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.labsynch.labseer.domain.Container;
 import com.labsynch.labseer.domain.ContainerState;
 import com.labsynch.labseer.domain.ContainerValue;
@@ -21,6 +15,12 @@
 import com.labsynch.labseer.utils.PropertiesUtilService;
 import com.labsynch.labseer.utils.SimpleUtil;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 @Service
 @Transactional
 public class ContainerValueServiceImpl implements ContainerValueService {
diff --git a/src/main/java/com/labsynch/labseer/service/CorpNameServiceImpl.java b/src/main/java/com/labsynch/labseer/service/CorpNameServiceImpl.java
index 51e1870bf..abc8df600 100755
--- a/src/main/java/com/labsynch/labseer/service/CorpNameServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/CorpNameServiceImpl.java
@@ -12,12 +12,6 @@
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.labsynch.labseer.domain.CorpName;
 import com.labsynch.labseer.domain.IsoSalt;
 import com.labsynch.labseer.domain.Isotope;
@@ -26,6 +20,12 @@
 import com.labsynch.labseer.dto.CorpNameDTO;
 import com.labsynch.labseer.utils.PropertiesUtilService;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 @Service
 public class CorpNameServiceImpl implements CorpNameService {
 	static Logger logger = LoggerFactory.getLogger(CorpNameServiceImpl.class);
diff --git a/src/main/java/com/labsynch/labseer/service/CronJobService.java b/src/main/java/com/labsynch/labseer/service/CronJobService.java
index 6f53793b0..7470625bb 100644
--- a/src/main/java/com/labsynch/labseer/service/CronJobService.java
+++ b/src/main/java/com/labsynch/labseer/service/CronJobService.java
@@ -1,9 +1,9 @@
 package com.labsynch.labseer.service;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.CronJob;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface CronJobService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/CronJobServiceImpl.java b/src/main/java/com/labsynch/labseer/service/CronJobServiceImpl.java
index c358a7d56..c45e82e06 100644
--- a/src/main/java/com/labsynch/labseer/service/CronJobServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/CronJobServiceImpl.java
@@ -2,15 +2,15 @@
 
 import java.util.List;
 
+import com.labsynch.labseer.domain.CronJob;
+import com.labsynch.labseer.dto.AutoLabelDTO;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.CronJob;
-import com.labsynch.labseer.dto.AutoLabelDTO;
-
 @Service
 @Transactional
 public class CronJobServiceImpl implements CronJobService {
diff --git a/src/main/java/com/labsynch/labseer/service/DataDictionaryService.java b/src/main/java/com/labsynch/labseer/service/DataDictionaryService.java
index b360b2d58..d14bb99c3 100644
--- a/src/main/java/com/labsynch/labseer/service/DataDictionaryService.java
+++ b/src/main/java/com/labsynch/labseer/service/DataDictionaryService.java
@@ -3,11 +3,11 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.DDictValue;
 import com.labsynch.labseer.dto.CodeTableDTO;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface DataDictionaryService {
 	
diff --git a/src/main/java/com/labsynch/labseer/service/DataDictionaryServiceImpl.java b/src/main/java/com/labsynch/labseer/service/DataDictionaryServiceImpl.java
index f2c38ee3a..f3e4c3098 100644
--- a/src/main/java/com/labsynch/labseer/service/DataDictionaryServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/DataDictionaryServiceImpl.java
@@ -6,10 +6,16 @@
 import java.util.Collection;
 import java.util.List;
 
+import javax.persistence.NoResultException;
+
+import com.labsynch.labseer.domain.DDictKind;
+import com.labsynch.labseer.domain.DDictType;
+import com.labsynch.labseer.domain.DDictValue;
+import com.labsynch.labseer.dto.CodeTableDTO;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import javax.persistence.NoResultException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.supercsv.cellprocessor.ift.CellProcessor;
@@ -17,11 +23,6 @@
 import org.supercsv.io.ICsvBeanWriter;
 import org.supercsv.prefs.CsvPreference;
 
-import com.labsynch.labseer.domain.DDictKind;
-import com.labsynch.labseer.domain.DDictType;
-import com.labsynch.labseer.domain.DDictValue;
-import com.labsynch.labseer.dto.CodeTableDTO;
-
 @Service
 @Transactional
 public class DataDictionaryServiceImpl implements DataDictionaryService {
diff --git a/src/main/java/com/labsynch/labseer/service/DatabaseAuthenticationProvider.java b/src/main/java/com/labsynch/labseer/service/DatabaseAuthenticationProvider.java
index 7ad1583cc..b5a0672f1 100755
--- a/src/main/java/com/labsynch/labseer/service/DatabaseAuthenticationProvider.java
+++ b/src/main/java/com/labsynch/labseer/service/DatabaseAuthenticationProvider.java
@@ -12,29 +12,29 @@
 import java.util.List;
 
 import javax.persistence.EntityNotFoundException;
+import javax.persistence.NoResultException;
 import javax.persistence.NonUniqueResultException;
 import javax.persistence.TypedQuery;
 
+import com.labsynch.labseer.domain.Author;
+import com.labsynch.labseer.domain.AuthorRole;
+
 import org.apache.commons.codec.binary.Base64;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import javax.persistence.NoResultException;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.authentication.dao.AbstractUserDetailsAuthenticationProvider;
-import org.springframework.security.crypto.password.MessageDigestPasswordEncoder;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.crypto.password.MessageDigestPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.AuthorRole;
-
 
 
 /**
diff --git a/src/main/java/com/labsynch/labseer/service/ErrorList.java b/src/main/java/com/labsynch/labseer/service/ErrorList.java
index 99d62d608..1ea2baf21 100755
--- a/src/main/java/com/labsynch/labseer/service/ErrorList.java
+++ b/src/main/java/com/labsynch/labseer/service/ErrorList.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
diff --git a/src/main/java/com/labsynch/labseer/service/ErrorMessage.java b/src/main/java/com/labsynch/labseer/service/ErrorMessage.java
index 54882bca3..897c6bdda 100755
--- a/src/main/java/com/labsynch/labseer/service/ErrorMessage.java
+++ b/src/main/java/com/labsynch/labseer/service/ErrorMessage.java
@@ -1,13 +1,16 @@
 package com.labsynch.labseer.service;
 
-import flexjson.JSONDeserializer;
-import flexjson.JSONSerializer;
 import java.util.Collection;
 import java.util.List;
+
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import flexjson.JSONDeserializer;
+import flexjson.JSONSerializer;
+
 
 public class ErrorMessage {
 
diff --git a/src/main/java/com/labsynch/labseer/service/ExperimentService.java b/src/main/java/com/labsynch/labseer/service/ExperimentService.java
index 72124043a..7b7e9ea87 100755
--- a/src/main/java/com/labsynch/labseer/service/ExperimentService.java
+++ b/src/main/java/com/labsynch/labseer/service/ExperimentService.java
@@ -5,8 +5,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.Experiment;
 import com.labsynch.labseer.dto.AnalysisGroupValueDTO;
 import com.labsynch.labseer.dto.CodeTableDTO;
@@ -23,6 +21,8 @@
 import com.labsynch.labseer.exceptions.TooManyResultsException;
 import com.labsynch.labseer.exceptions.UniqueNameException;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface ExperimentService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/ExperimentServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ExperimentServiceImpl.java
index 6d7b2e48a..dd764433a 100755
--- a/src/main/java/com/labsynch/labseer/service/ExperimentServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ExperimentServiceImpl.java
@@ -15,17 +15,10 @@
 import java.util.Set;
 
 import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 
-import org.apache.commons.collections.CollectionUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.persistence.NoResultException;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.labsynch.labseer.domain.AnalysisGroup;
 import com.labsynch.labseer.domain.AnalysisGroupValue;
 import com.labsynch.labseer.domain.DDictValue;
@@ -61,6 +54,13 @@
 import com.labsynch.labseer.utils.PropertiesUtilService;
 import com.labsynch.labseer.utils.SimpleUtil;
 
+import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 
 @Service
 @Transactional
diff --git a/src/main/java/com/labsynch/labseer/service/ExperimentStateService.java b/src/main/java/com/labsynch/labseer/service/ExperimentStateService.java
index 3a92ed6ba..0a59f42b4 100644
--- a/src/main/java/com/labsynch/labseer/service/ExperimentStateService.java
+++ b/src/main/java/com/labsynch/labseer/service/ExperimentStateService.java
@@ -3,12 +3,12 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.ExperimentState;
 import com.labsynch.labseer.dto.ExperimentStatePathDTO;
 import com.labsynch.labseer.dto.GenericStatePathRequest;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface ExperimentStateService {
 	
diff --git a/src/main/java/com/labsynch/labseer/service/ExperimentStateServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ExperimentStateServiceImpl.java
index 3d095ee77..a362111fa 100644
--- a/src/main/java/com/labsynch/labseer/service/ExperimentStateServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ExperimentStateServiceImpl.java
@@ -6,11 +6,6 @@
 import java.util.List;
 import java.util.Set;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.labsynch.labseer.domain.Experiment;
 import com.labsynch.labseer.domain.ExperimentState;
 import com.labsynch.labseer.domain.ExperimentValue;
@@ -18,6 +13,11 @@
 import com.labsynch.labseer.dto.GenericStatePathRequest;
 import com.labsynch.labseer.utils.SimpleUtil;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 
 @Service
 @Transactional
diff --git a/src/main/java/com/labsynch/labseer/service/ExperimentValueService.java b/src/main/java/com/labsynch/labseer/service/ExperimentValueService.java
index 57cf96849..7f689b177 100644
--- a/src/main/java/com/labsynch/labseer/service/ExperimentValueService.java
+++ b/src/main/java/com/labsynch/labseer/service/ExperimentValueService.java
@@ -3,14 +3,14 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.ExperimentValue;
 import com.labsynch.labseer.dto.CodeTableDTO;
 import com.labsynch.labseer.dto.ExperimentValuePathDTO;
 import com.labsynch.labseer.dto.GenericValuePathRequest;
 import com.labsynch.labseer.dto.StateValueDTO;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface ExperimentValueService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/ExperimentValueServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ExperimentValueServiceImpl.java
index d6dee8b30..0ace308e1 100644
--- a/src/main/java/com/labsynch/labseer/service/ExperimentValueServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ExperimentValueServiceImpl.java
@@ -9,16 +9,6 @@
 import java.util.Date;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.supercsv.cellprocessor.ift.CellProcessor;
-import org.supercsv.io.CsvBeanWriter;
-import org.supercsv.io.ICsvBeanWriter;
-import org.supercsv.prefs.CsvPreference;
-
 import com.labsynch.labseer.domain.Experiment;
 import com.labsynch.labseer.domain.ExperimentState;
 import com.labsynch.labseer.domain.ExperimentValue;
@@ -34,6 +24,16 @@
 import com.labsynch.labseer.utils.PropertiesUtilService;
 import com.labsynch.labseer.utils.SimpleUtil;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.supercsv.cellprocessor.ift.CellProcessor;
+import org.supercsv.io.CsvBeanWriter;
+import org.supercsv.io.ICsvBeanWriter;
+import org.supercsv.prefs.CsvPreference;
+
 
 @Service
 @Transactional
diff --git a/src/main/java/com/labsynch/labseer/service/ExportServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ExportServiceImpl.java
index 40c9e8e9b..655a781b9 100644
--- a/src/main/java/com/labsynch/labseer/service/ExportServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ExportServiceImpl.java
@@ -1,7 +1,6 @@
 package com.labsynch.labseer.service;
 
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -12,11 +11,6 @@
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
 import com.labsynch.labseer.chemclasses.CmpdRegMoleculeFactory;
 import com.labsynch.labseer.chemclasses.CmpdRegSDFWriter;
@@ -30,6 +24,11 @@
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
 import com.labsynch.labseer.utils.SimpleUtil;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 @Service
 public class ExportServiceImpl implements ExportService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/GeneThingService.java b/src/main/java/com/labsynch/labseer/service/GeneThingService.java
index ac535b4e6..81e1b866b 100755
--- a/src/main/java/com/labsynch/labseer/service/GeneThingService.java
+++ b/src/main/java/com/labsynch/labseer/service/GeneThingService.java
@@ -4,16 +4,12 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.commons.collections.map.MultiValueMap;
-import org.springframework.stereotype.Service;
-import org.supercsv.cellprocessor.ift.CellProcessor;
-
 import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.LsTransaction;
-import com.labsynch.labseer.dto.EntrezDbGeneDTO;
-import com.labsynch.labseer.dto.EntrezDiscontinuedGeneDTO;
 import com.labsynch.labseer.dto.GeneOrthologDTO;
 
+import org.springframework.stereotype.Service;
+import org.supercsv.cellprocessor.ift.CellProcessor;
+
 @Service
 public interface GeneThingService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/GeneThingServiceImpl.java b/src/main/java/com/labsynch/labseer/service/GeneThingServiceImpl.java
index 4b3f4154e..f3a9b9b02 100755
--- a/src/main/java/com/labsynch/labseer/service/GeneThingServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/GeneThingServiceImpl.java
@@ -15,21 +15,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.collections.map.MultiValueMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import javax.persistence.NoResultException;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.supercsv.cellprocessor.Optional;
-import org.supercsv.cellprocessor.ParseDate;
-import org.supercsv.cellprocessor.ParseDouble;
-import org.supercsv.cellprocessor.ParseInt;
-import org.supercsv.cellprocessor.ift.CellProcessor;
-import org.supercsv.io.CsvBeanReader;
-import org.supercsv.io.ICsvBeanReader;
-import org.supercsv.prefs.CsvPreference;
 
 import com.labsynch.labseer.domain.InteractionKind;
 import com.labsynch.labseer.domain.InteractionType;
@@ -56,6 +42,20 @@
 import com.labsynch.labseer.dto.GeneOrthologDTO;
 import com.labsynch.labseer.utils.SimpleUtil;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.supercsv.cellprocessor.Optional;
+import org.supercsv.cellprocessor.ParseDate;
+import org.supercsv.cellprocessor.ParseDouble;
+import org.supercsv.cellprocessor.ParseInt;
+import org.supercsv.cellprocessor.ift.CellProcessor;
+import org.supercsv.io.CsvBeanReader;
+import org.supercsv.io.ICsvBeanReader;
+import org.supercsv.prefs.CsvPreference;
+
 @Service
 public class GeneThingServiceImpl implements GeneThingService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/IsoSaltServiceImpl.java b/src/main/java/com/labsynch/labseer/service/IsoSaltServiceImpl.java
index 073aa2a15..71e952e90 100644
--- a/src/main/java/com/labsynch/labseer/service/IsoSaltServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/IsoSaltServiceImpl.java
@@ -1,13 +1,13 @@
 package com.labsynch.labseer.service;
 
+import com.labsynch.labseer.domain.IsoSalt;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.labsynch.labseer.domain.IsoSalt;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-
 
 @Service
 public class IsoSaltServiceImpl implements IsoSaltService {
diff --git a/src/main/java/com/labsynch/labseer/service/ItxContainerContainerService.java b/src/main/java/com/labsynch/labseer/service/ItxContainerContainerService.java
index 2d79c5012..0d0d04656 100755
--- a/src/main/java/com/labsynch/labseer/service/ItxContainerContainerService.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxContainerContainerService.java
@@ -2,10 +2,10 @@
 
 import java.util.Collection;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.ItxContainerContainer;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface ItxContainerContainerService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/ItxContainerContainerServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ItxContainerContainerServiceImpl.java
index 15a2b08b0..7b7a87130 100755
--- a/src/main/java/com/labsynch/labseer/service/ItxContainerContainerServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxContainerContainerServiceImpl.java
@@ -5,17 +5,17 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
+import com.labsynch.labseer.domain.ItxContainerContainer;
+import com.labsynch.labseer.domain.ItxContainerContainerState;
+import com.labsynch.labseer.domain.ItxContainerContainerValue;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.ItxContainerContainer;
-import com.labsynch.labseer.domain.ItxContainerContainerState;
-import com.labsynch.labseer.domain.ItxContainerContainerValue;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-
 @Service
 @Transactional
 public class ItxContainerContainerServiceImpl implements ItxContainerContainerService {
diff --git a/src/main/java/com/labsynch/labseer/service/ItxContainerContainerStateService.java b/src/main/java/com/labsynch/labseer/service/ItxContainerContainerStateService.java
index 98a56464e..af2445adf 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxContainerContainerStateService.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxContainerContainerStateService.java
@@ -2,10 +2,10 @@
 
 import java.util.Collection;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.ItxContainerContainerState;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface ItxContainerContainerStateService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/ItxContainerContainerStateServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ItxContainerContainerStateServiceImpl.java
index 0f2dcd4f7..eb8629dfb 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxContainerContainerStateServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxContainerContainerStateServiceImpl.java
@@ -2,16 +2,16 @@
 
 import java.util.Collection;
 
+import com.labsynch.labseer.domain.ItxContainerContainer;
+import com.labsynch.labseer.domain.ItxContainerContainerState;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.ItxContainerContainer;
-import com.labsynch.labseer.domain.ItxContainerContainerState;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-
 @Service
 @Transactional
 public class ItxContainerContainerStateServiceImpl implements ItxContainerContainerStateService {
diff --git a/src/main/java/com/labsynch/labseer/service/ItxContainerContainerValueService.java b/src/main/java/com/labsynch/labseer/service/ItxContainerContainerValueService.java
index 2a628df18..c2e52e08f 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxContainerContainerValueService.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxContainerContainerValueService.java
@@ -2,10 +2,10 @@
 
 import java.util.Collection;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.ItxContainerContainerValue;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface ItxContainerContainerValueService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/ItxContainerContainerValueServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ItxContainerContainerValueServiceImpl.java
index 53aa2ae12..ed55f8f16 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxContainerContainerValueServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxContainerContainerValueServiceImpl.java
@@ -2,18 +2,16 @@
 
 import java.util.Collection;
 
+import com.labsynch.labseer.domain.ItxContainerContainerState;
+import com.labsynch.labseer.domain.ItxContainerContainerValue;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.ContainerState;
-import com.labsynch.labseer.domain.ContainerValue;
-import com.labsynch.labseer.domain.ItxContainerContainerState;
-import com.labsynch.labseer.domain.ItxContainerContainerValue;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-
 @Service
 @Transactional
 public class ItxContainerContainerValueServiceImpl implements ItxContainerContainerValueService {
diff --git a/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentService.java b/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentService.java
index 90604856f..777ea1303 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentService.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentService.java
@@ -2,10 +2,10 @@
 
 import java.util.Collection;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.ItxExperimentExperiment;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface ItxExperimentExperimentService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentStateService.java b/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentStateService.java
index 46c1910a9..aed62ab02 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentStateService.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentStateService.java
@@ -2,10 +2,10 @@
 
 import java.util.Collection;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.ItxExperimentExperimentState;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface ItxExperimentExperimentStateService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentStateServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentStateServiceImpl.java
index 83641403b..226132229 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentStateServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentStateServiceImpl.java
@@ -2,17 +2,16 @@
 
 import java.util.Collection;
 
+import com.labsynch.labseer.domain.ItxExperimentExperiment;
+import com.labsynch.labseer.domain.ItxExperimentExperimentState;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.ItxExperimentExperiment;
-import com.labsynch.labseer.domain.ItxExperimentExperimentState;
-import com.labsynch.labseer.domain.ItxExperimentExperimentValue;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-
 @Service
 @Transactional
 public class ItxExperimentExperimentStateServiceImpl implements ItxExperimentExperimentStateService {
diff --git a/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentValueService.java b/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentValueService.java
index 464c49455..bffc3381d 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentValueService.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentValueService.java
@@ -2,10 +2,10 @@
 
 import java.util.Collection;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.ItxExperimentExperimentValue;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface ItxExperimentExperimentValueService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentValueServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentValueServiceImpl.java
index a32f99879..3ed1b9486 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentValueServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentValueServiceImpl.java
@@ -2,18 +2,16 @@
 
 import java.util.Collection;
 
+import com.labsynch.labseer.domain.ItxExperimentExperimentState;
+import com.labsynch.labseer.domain.ItxExperimentExperimentValue;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.ContainerState;
-import com.labsynch.labseer.domain.ContainerValue;
-import com.labsynch.labseer.domain.ItxExperimentExperimentState;
-import com.labsynch.labseer.domain.ItxExperimentExperimentValue;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-
 @Service
 @Transactional
 public class ItxExperimentExperimentValueServiceImpl implements ItxExperimentExperimentValueService {
diff --git a/src/main/java/com/labsynch/labseer/service/ItxLsThingLsThingService.java b/src/main/java/com/labsynch/labseer/service/ItxLsThingLsThingService.java
index d5d00aeaf..99d4ce7b6 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxLsThingLsThingService.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxLsThingLsThingService.java
@@ -2,11 +2,11 @@
 
 import java.util.Collection;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.ItxLsThingLsThing;
 import com.labsynch.labseer.dto.CodeTableDTO;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface ItxLsThingLsThingService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/ItxLsThingLsThingServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ItxLsThingLsThingServiceImpl.java
index 30a35e331..709ad6486 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxLsThingLsThingServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxLsThingLsThingServiceImpl.java
@@ -1,50 +1,21 @@
 package com.labsynch.labseer.service;
 
-import java.math.BigDecimal;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.collections.map.MultiValueMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.persistence.NoResultException;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.labsynch.labseer.domain.ItxLsThingLsThing;
 import com.labsynch.labseer.domain.ItxLsThingLsThingState;
 import com.labsynch.labseer.domain.ItxLsThingLsThingValue;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.LsThingLabel;
-import com.labsynch.labseer.domain.LsThingState;
-import com.labsynch.labseer.domain.LsThingValue;
 import com.labsynch.labseer.dto.CodeTableDTO;
-import com.labsynch.labseer.dto.ErrorMessageDTO;
-import com.labsynch.labseer.dto.LsThingValidationDTO;
-import com.labsynch.labseer.dto.PreferredNameDTO;
-import com.labsynch.labseer.dto.PreferredNameRequestDTO;
-import com.labsynch.labseer.dto.PreferredNameResultsDTO;
-import com.labsynch.labseer.dto.ValuePathDTO;
-import com.labsynch.labseer.dto.ValueRuleDTO;
-import com.labsynch.labseer.exceptions.ErrorMessage;
-import com.labsynch.labseer.exceptions.UniqueInteractionsException;
-import com.labsynch.labseer.exceptions.UniqueNameException;
-import com.labsynch.labseer.utils.ItxLsThingLsThingComparator;
-import com.labsynch.labseer.utils.LsThingComparatorByBatchNumber;
-import com.labsynch.labseer.utils.LsThingComparatorByCodeName;
 import com.labsynch.labseer.utils.PropertiesUtilService;
-import com.labsynch.labseer.utils.SimpleUtil;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class ItxLsThingLsThingServiceImpl implements ItxLsThingLsThingService {
diff --git a/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolService.java b/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolService.java
index 730218a4a..eb125fe7a 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolService.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolService.java
@@ -2,10 +2,10 @@
 
 import java.util.Collection;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.ItxProtocolProtocol;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface ItxProtocolProtocolService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolServiceImpl.java
index 41055155c..f5a8ed47b 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolServiceImpl.java
@@ -5,20 +5,18 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.labsynch.labseer.domain.ItxProtocolProtocol;
 import com.labsynch.labseer.domain.ItxProtocolProtocolState;
 import com.labsynch.labseer.domain.ItxProtocolProtocolValue;
 import com.labsynch.labseer.domain.Protocol;
 import com.labsynch.labseer.utils.PropertiesUtilService;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 @Service
 @Transactional
 public class ItxProtocolProtocolServiceImpl implements ItxProtocolProtocolService {
diff --git a/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolStateService.java b/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolStateService.java
index 849b639f2..1285761a9 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolStateService.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolStateService.java
@@ -2,11 +2,10 @@
 
 import java.util.Collection;
 
-import org.springframework.stereotype.Service;
-
-import com.labsynch.labseer.domain.ContainerValue;
 import com.labsynch.labseer.domain.ItxProtocolProtocolState;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface ItxProtocolProtocolStateService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolStateServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolStateServiceImpl.java
index 5e3997e41..592c88481 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolStateServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolStateServiceImpl.java
@@ -2,18 +2,16 @@
 
 import java.util.Collection;
 
+import com.labsynch.labseer.domain.ItxProtocolProtocol;
+import com.labsynch.labseer.domain.ItxProtocolProtocolState;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.ContainerState;
-import com.labsynch.labseer.domain.ContainerValue;
-import com.labsynch.labseer.domain.ItxProtocolProtocol;
-import com.labsynch.labseer.domain.ItxProtocolProtocolState;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-
 @Service
 @Transactional
 public class ItxProtocolProtocolStateServiceImpl implements ItxProtocolProtocolStateService {
diff --git a/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolValueService.java b/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolValueService.java
index 2a1054862..3133cb55a 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolValueService.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolValueService.java
@@ -2,10 +2,10 @@
 
 import java.util.Collection;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.ItxProtocolProtocolValue;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface ItxProtocolProtocolValueService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerService.java b/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerService.java
index a595375f2..9b4036feb 100755
--- a/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerService.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerService.java
@@ -1,10 +1,10 @@
 package com.labsynch.labseer.service;
 
+import com.labsynch.labseer.domain.ItxSubjectContainer;
+
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.ItxSubjectContainer;
-
 @Service
 public interface ItxSubjectContainerService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerServiceImpl.java
index c482b0849..f83c488bd 100755
--- a/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerServiceImpl.java
@@ -1,11 +1,5 @@
 package com.labsynch.labseer.service;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.labsynch.labseer.domain.Container;
 import com.labsynch.labseer.domain.ItxSubjectContainer;
 import com.labsynch.labseer.domain.ItxSubjectContainerState;
@@ -13,6 +7,12 @@
 import com.labsynch.labseer.domain.Subject;
 import com.labsynch.labseer.utils.PropertiesUtilService;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 @Service
 @Transactional
 public class ItxSubjectContainerServiceImpl implements ItxSubjectContainerService {
diff --git a/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerStateService.java b/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerStateService.java
index 5ddfa02a5..595f92a88 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerStateService.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerStateService.java
@@ -2,10 +2,10 @@
 
 import java.util.Collection;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.ItxSubjectContainerState;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface ItxSubjectContainerStateService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerStateServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerStateServiceImpl.java
index ee267eb8f..a62e806ec 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerStateServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerStateServiceImpl.java
@@ -2,18 +2,16 @@
 
 import java.util.Collection;
 
+import com.labsynch.labseer.domain.ItxSubjectContainer;
+import com.labsynch.labseer.domain.ItxSubjectContainerState;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.ContainerState;
-import com.labsynch.labseer.domain.ContainerValue;
-import com.labsynch.labseer.domain.ItxSubjectContainer;
-import com.labsynch.labseer.domain.ItxSubjectContainerState;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-
 @Service
 @Transactional
 public class ItxSubjectContainerStateServiceImpl implements ItxSubjectContainerStateService {
diff --git a/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerValueService.java b/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerValueService.java
index dc6227a6b..95fbea517 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerValueService.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerValueService.java
@@ -2,10 +2,10 @@
 
 import java.util.Collection;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.ItxSubjectContainerValue;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface ItxSubjectContainerValueService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerValueServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerValueServiceImpl.java
index 6df02de95..269ae8ff5 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerValueServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerValueServiceImpl.java
@@ -2,18 +2,16 @@
 
 import java.util.Collection;
 
+import com.labsynch.labseer.domain.ItxSubjectContainerState;
+import com.labsynch.labseer.domain.ItxSubjectContainerValue;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.ContainerState;
-import com.labsynch.labseer.domain.ContainerValue;
-import com.labsynch.labseer.domain.ItxSubjectContainerState;
-import com.labsynch.labseer.domain.ItxSubjectContainerValue;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-
 @Service
 @Transactional
 public class ItxSubjectContainerValueServiceImpl implements ItxSubjectContainerValueService {
diff --git a/src/main/java/com/labsynch/labseer/service/LabelSequenceService.java b/src/main/java/com/labsynch/labseer/service/LabelSequenceService.java
index caa64f2ad..057df5f76 100644
--- a/src/main/java/com/labsynch/labseer/service/LabelSequenceService.java
+++ b/src/main/java/com/labsynch/labseer/service/LabelSequenceService.java
@@ -3,13 +3,11 @@
 import java.util.Collection;
 import java.util.List;
 
-import javax.persistence.TypedQuery;
+import com.labsynch.labseer.domain.AuthorRole;
+import com.labsynch.labseer.domain.LabelSequence;
 
 import org.springframework.stereotype.Service;
 
-import com.labsynch.labseer.domain.LabelSequence;
-import com.labsynch.labseer.domain.AuthorRole;
-
 @Service
 public interface LabelSequenceService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/LabelSequenceServiceImpl.java b/src/main/java/com/labsynch/labseer/service/LabelSequenceServiceImpl.java
index 56f13721f..2a010aba5 100644
--- a/src/main/java/com/labsynch/labseer/service/LabelSequenceServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/LabelSequenceServiceImpl.java
@@ -6,20 +6,18 @@
 import java.util.HashSet;
 import java.util.List;
 
-import javax.persistence.TypedQuery;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import javax.persistence.NoResultException;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.Author;
 import com.labsynch.labseer.domain.AuthorRole;
 import com.labsynch.labseer.domain.LabelSequence;
 import com.labsynch.labseer.domain.LabelSequenceRole;
 import com.labsynch.labseer.domain.LsRole;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 
 @Service
 @Transactional
diff --git a/src/main/java/com/labsynch/labseer/service/LicenseService.java b/src/main/java/com/labsynch/labseer/service/LicenseService.java
index 803718528..d2e864f7b 100644
--- a/src/main/java/com/labsynch/labseer/service/LicenseService.java
+++ b/src/main/java/com/labsynch/labseer/service/LicenseService.java
@@ -2,16 +2,12 @@
 
 import java.io.IOException;
 import java.net.URISyntaxException;
-import java.util.Collection;
-import java.util.List;
+
+import com.labsynch.labseer.dto.LicenseDTO;
 
 import org.bouncycastle.openpgp.PGPException;
 import org.springframework.stereotype.Service;
 
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.dto.CodeTableDTO;
-import com.labsynch.labseer.dto.LicenseDTO;
-
 @Service
 public interface LicenseService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/LicenseServiceImpl.java b/src/main/java/com/labsynch/labseer/service/LicenseServiceImpl.java
index d684a2563..3dc279a33 100644
--- a/src/main/java/com/labsynch/labseer/service/LicenseServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/LicenseServiceImpl.java
@@ -1,23 +1,18 @@
 package com.labsynch.labseer.service;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringWriter;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
 
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
+import com.labsynch.labseer.dto.LicenseDTO;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+import com.verhas.licensor.License;
+
 import org.bouncycastle.openpgp.PGPException;
 import org.joda.time.Days;
 import org.joda.time.LocalDate;
@@ -26,20 +21,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.supercsv.cellprocessor.ift.CellProcessor;
-import org.supercsv.io.CsvBeanWriter;
-import org.supercsv.io.ICsvBeanWriter;
-import org.supercsv.prefs.CsvPreference;
-
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.AuthorRole;
-import com.labsynch.labseer.domain.DDictValue;
-import com.labsynch.labseer.domain.LsRole;
-import com.labsynch.labseer.dto.AutoLabelDTO;
-import com.labsynch.labseer.dto.CodeTableDTO;
-import com.labsynch.labseer.dto.LicenseDTO;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-import com.verhas.licensor.License;
 
 @Service
 @Transactional
diff --git a/src/main/java/com/labsynch/labseer/service/LoadPreDefCorpNameServiceImpl.java b/src/main/java/com/labsynch/labseer/service/LoadPreDefCorpNameServiceImpl.java
index 421c3b77a..0e2b9c279 100644
--- a/src/main/java/com/labsynch/labseer/service/LoadPreDefCorpNameServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/LoadPreDefCorpNameServiceImpl.java
@@ -1,14 +1,12 @@
 package com.labsynch.labseer.service;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-import com.labsynch.labseer.domain.CorpName;
 import com.labsynch.labseer.domain.PreDef_CorpName;
-
 import com.labsynch.labseer.utils.PropertiesUtilService;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 @Service
 public class LoadPreDefCorpNameServiceImpl implements LoadPreDefCorpNameService {
diff --git a/src/main/java/com/labsynch/labseer/service/LotAliasServiceImpl.java b/src/main/java/com/labsynch/labseer/service/LotAliasServiceImpl.java
index 6ef1dabd6..02112cdca 100644
--- a/src/main/java/com/labsynch/labseer/service/LotAliasServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/LotAliasServiceImpl.java
@@ -6,16 +6,14 @@
 import java.util.Map;
 import java.util.Set;
 
+import com.labsynch.labseer.domain.Lot;
+import com.labsynch.labseer.domain.LotAlias;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.domain.LotAlias;
-import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.domain.ParentAlias;
-
 @Service
 public class LotAliasServiceImpl implements LotAliasService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/LotServiceImpl.java b/src/main/java/com/labsynch/labseer/service/LotServiceImpl.java
index 21a22cec0..b069d400a 100644
--- a/src/main/java/com/labsynch/labseer/service/LotServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/LotServiceImpl.java
@@ -1,20 +1,12 @@
 package com.labsynch.labseer.service;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.CorpName;
 import com.labsynch.labseer.domain.IsoSalt;
 import com.labsynch.labseer.domain.Lot;
 import com.labsynch.labseer.domain.Operator;
@@ -27,9 +19,13 @@
 import com.labsynch.labseer.domain.Vendor;
 import com.labsynch.labseer.dto.LotDTO;
 import com.labsynch.labseer.dto.LotsByProjectDTO;
-
 import com.labsynch.labseer.utils.PropertiesUtilService;
-import com.labsynch.labseer.utils.SecurityUtil;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 
 @Service
diff --git a/src/main/java/com/labsynch/labseer/service/LsThingService.java b/src/main/java/com/labsynch/labseer/service/LsThingService.java
index 40679ef7a..17ff78286 100755
--- a/src/main/java/com/labsynch/labseer/service/LsThingService.java
+++ b/src/main/java/com/labsynch/labseer/service/LsThingService.java
@@ -5,10 +5,6 @@
 import java.util.Collection;
 import java.util.Map;
 
-import org.hibernate.StaleObjectStateException;
-import org.openscience.cdk.exception.CDKException;
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.LsThing;
 import com.labsynch.labseer.dto.CodeTableDTO;
 import com.labsynch.labseer.dto.CodeTypeKindDTO;
@@ -20,12 +16,15 @@
 import com.labsynch.labseer.dto.PreferredNameRequestDTO;
 import com.labsynch.labseer.dto.PreferredNameResultsDTO;
 import com.labsynch.labseer.dto.StoichiometryPropertiesResultsDTO;
-import com.labsynch.labseer.exceptions.ErrorMessage;
 import com.labsynch.labseer.exceptions.LsThingValidationErrorMessage;
 import com.labsynch.labseer.exceptions.NotFoundException;
 import com.labsynch.labseer.exceptions.UniqueNameException;
 import com.labsynch.labseer.service.ChemStructureService.SearchType;
 
+import org.hibernate.StaleObjectStateException;
+import org.openscience.cdk.exception.CDKException;
+import org.springframework.stereotype.Service;
+
 @Service
 public interface LsThingService {
 	
diff --git a/src/main/java/com/labsynch/labseer/service/LsThingServiceImpl.java b/src/main/java/com/labsynch/labseer/service/LsThingServiceImpl.java
index 97a6dedb1..fe794e0dd 100755
--- a/src/main/java/com/labsynch/labseer/service/LsThingServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/LsThingServiceImpl.java
@@ -5,7 +5,6 @@
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.Collections;
@@ -18,6 +17,7 @@
 import java.util.Set;
 
 import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 import javax.persistence.criteria.CriteriaBuilder;
@@ -28,36 +28,21 @@
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import org.apache.commons.collections.map.MultiValueMap;
-import org.hibernate.StaleObjectStateException;
-import org.openscience.cdk.exception.CDKException;
-
-import com.github.underscore.Function1;
-import com.github.underscore.Tuple;
-import com.github.underscore.$;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.persistence.NoResultException;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
+import com.labsynch.labseer.domain.ChemStructure;
 import com.labsynch.labseer.domain.ItxLsThingLsThing;
 import com.labsynch.labseer.domain.ItxLsThingLsThingState;
 import com.labsynch.labseer.domain.ItxLsThingLsThingValue;
+import com.labsynch.labseer.domain.LabelSequence;
 import com.labsynch.labseer.domain.LsThing;
 import com.labsynch.labseer.domain.LsThingLabel;
 import com.labsynch.labseer.domain.LsThingState;
 import com.labsynch.labseer.domain.LsThingValue;
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ChemStructure;
+import com.labsynch.labseer.dto.AutoLabelDTO;
 import com.labsynch.labseer.dto.CodeTableDTO;
 import com.labsynch.labseer.dto.CodeTypeKindDTO;
 import com.labsynch.labseer.dto.DateValueComparisonRequest;
 import com.labsynch.labseer.dto.DependencyCheckDTO;
 import com.labsynch.labseer.dto.ErrorMessageDTO;
-import com.labsynch.labseer.dto.LsThingBrowserQueryDTO;
 import com.labsynch.labseer.dto.ItxQueryDTO;
 import com.labsynch.labseer.dto.LabelQueryDTO;
 import com.labsynch.labseer.dto.LsThingBrowserQueryDTO;
@@ -81,8 +66,15 @@
 import com.labsynch.labseer.utils.LsThingComparatorByCodeName;
 import com.labsynch.labseer.utils.PropertiesUtilService;
 import com.labsynch.labseer.utils.SimpleUtil;
-import com.labsynch.labseer.domain.LabelSequence;
-import com.labsynch.labseer.dto.AutoLabelDTO;
+
+import org.apache.commons.collections.map.MultiValueMap;
+import org.hibernate.StaleObjectStateException;
+import org.openscience.cdk.exception.CDKException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class LsThingServiceImpl implements LsThingService {
diff --git a/src/main/java/com/labsynch/labseer/service/LsThingStateServiceImpl.java b/src/main/java/com/labsynch/labseer/service/LsThingStateServiceImpl.java
index 7986b023b..a77f3693e 100644
--- a/src/main/java/com/labsynch/labseer/service/LsThingStateServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/LsThingStateServiceImpl.java
@@ -6,12 +6,6 @@
 import java.util.List;
 import java.util.Set;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.labsynch.labseer.domain.LsThing;
 import com.labsynch.labseer.domain.LsThingState;
 import com.labsynch.labseer.domain.LsThingValue;
@@ -20,6 +14,12 @@
 import com.labsynch.labseer.utils.PropertiesUtilService;
 import com.labsynch.labseer.utils.SimpleUtil;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 @Service
 @Transactional
 public class LsThingStateServiceImpl implements LsThingStateService {
diff --git a/src/main/java/com/labsynch/labseer/service/LsThingValueServiceImpl.java b/src/main/java/com/labsynch/labseer/service/LsThingValueServiceImpl.java
index 899ecc77f..af7ad601d 100644
--- a/src/main/java/com/labsynch/labseer/service/LsThingValueServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/LsThingValueServiceImpl.java
@@ -7,12 +7,6 @@
 import java.util.Date;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.labsynch.labseer.domain.LsThing;
 import com.labsynch.labseer.domain.LsThingState;
 import com.labsynch.labseer.domain.LsThingValue;
@@ -20,6 +14,12 @@
 import com.labsynch.labseer.dto.LsThingValuePathDTO;
 import com.labsynch.labseer.utils.SimpleUtil;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 
 @Service
 @Transactional
diff --git a/src/main/java/com/labsynch/labseer/service/LsTransactionService.java b/src/main/java/com/labsynch/labseer/service/LsTransactionService.java
index 39880b71d..a639d0f1a 100644
--- a/src/main/java/com/labsynch/labseer/service/LsTransactionService.java
+++ b/src/main/java/com/labsynch/labseer/service/LsTransactionService.java
@@ -1,9 +1,9 @@
 package com.labsynch.labseer.service;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.dto.LsTransactionQueryDTO;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface LsTransactionService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/LsTransactionServiceImpl.java b/src/main/java/com/labsynch/labseer/service/LsTransactionServiceImpl.java
index 9a5ebef80..c351d5262 100644
--- a/src/main/java/com/labsynch/labseer/service/LsTransactionServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/LsTransactionServiceImpl.java
@@ -12,15 +12,15 @@
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.LsTransaction;
 import com.labsynch.labseer.domain.LsTransactionStatus;
 import com.labsynch.labseer.domain.LsTransactionType;
 import com.labsynch.labseer.dto.LsTransactionQueryDTO;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
 @Service
 public class LsTransactionServiceImpl implements LsTransactionService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/ParentAliasServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ParentAliasServiceImpl.java
index e3ae332ee..38e683e1b 100644
--- a/src/main/java/com/labsynch/labseer/service/ParentAliasServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ParentAliasServiceImpl.java
@@ -6,14 +6,14 @@
 import java.util.Map;
 import java.util.Set;
 
+import com.labsynch.labseer.domain.Parent;
+import com.labsynch.labseer.domain.ParentAlias;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.domain.ParentAlias;
-
 @Service
 public class ParentAliasServiceImpl implements ParentAliasService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/ParentLotService.java b/src/main/java/com/labsynch/labseer/service/ParentLotService.java
index 3ca0ec54b..1fb4d31d2 100644
--- a/src/main/java/com/labsynch/labseer/service/ParentLotService.java
+++ b/src/main/java/com/labsynch/labseer/service/ParentLotService.java
@@ -2,8 +2,6 @@
 
 import java.util.Collection;
 
-import javax.persistence.NoResultException;
-
 import com.labsynch.labseer.domain.Lot;
 import com.labsynch.labseer.dto.CodeTableDTO;
 import com.labsynch.labseer.dto.ParentLotCodeDTO;
diff --git a/src/main/java/com/labsynch/labseer/service/ParentLotServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ParentLotServiceImpl.java
index 617020941..fa1e112d4 100644
--- a/src/main/java/com/labsynch/labseer/service/ParentLotServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ParentLotServiceImpl.java
@@ -5,11 +5,6 @@
 
 import javax.persistence.NoResultException;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.labsynch.labseer.domain.Lot;
 import com.labsynch.labseer.domain.Parent;
 import com.labsynch.labseer.domain.ParentAlias;
@@ -17,6 +12,11 @@
 import com.labsynch.labseer.dto.CodeTableDTO;
 import com.labsynch.labseer.dto.ParentLotCodeDTO;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 @Service
 public class ParentLotServiceImpl implements ParentLotService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/ParentService.java b/src/main/java/com/labsynch/labseer/service/ParentService.java
index 0b11bd323..8f7ab9ff1 100644
--- a/src/main/java/com/labsynch/labseer/service/ParentService.java
+++ b/src/main/java/com/labsynch/labseer/service/ParentService.java
@@ -1,9 +1,6 @@
 package com.labsynch.labseer.service;
 
-import java.io.IOException;
 import java.util.Collection;
-import java.util.List;
-
 
 import com.labsynch.labseer.domain.Parent;
 import com.labsynch.labseer.dto.CodeTableDTO;
diff --git a/src/main/java/com/labsynch/labseer/service/ParentServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ParentServiceImpl.java
index 54ad0f120..bbcde231e 100644
--- a/src/main/java/com/labsynch/labseer/service/ParentServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ParentServiceImpl.java
@@ -1,9 +1,5 @@
 package com.labsynch.labseer.service;
 
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
@@ -12,14 +8,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.labsynch.labseer.domain.Lot;
-import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
 import com.labsynch.labseer.chemclasses.CmpdRegMoleculeFactory;
 import com.labsynch.labseer.chemclasses.CmpdRegSDFWriterFactory;
 import com.labsynch.labseer.domain.Author;
@@ -33,12 +21,15 @@
 import com.labsynch.labseer.dto.ParentDTO;
 import com.labsynch.labseer.dto.ParentEditDTO;
 import com.labsynch.labseer.dto.ParentValidationDTO;
-
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
-import com.labsynch.labseer.service.ChemStructureService.SearchType;
 import com.labsynch.labseer.service.ChemStructureService.StructureType;
 import com.labsynch.labseer.utils.PropertiesUtilService;
-import com.labsynch.labseer.utils.MoleculeUtil;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 
 
diff --git a/src/main/java/com/labsynch/labseer/service/ParentStructureService.java b/src/main/java/com/labsynch/labseer/service/ParentStructureService.java
index a70a90d8b..053f336ff 100755
--- a/src/main/java/com/labsynch/labseer/service/ParentStructureService.java
+++ b/src/main/java/com/labsynch/labseer/service/ParentStructureService.java
@@ -1,7 +1,6 @@
 package com.labsynch.labseer.service;
 
 import com.labsynch.labseer.domain.Parent;
-import com.labsynch.labseer.dto.Metalot;
 
 
 public interface ParentStructureService {
diff --git a/src/main/java/com/labsynch/labseer/service/ParentStructureServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ParentStructureServiceImpl.java
index 89483c2b5..1b986457f 100755
--- a/src/main/java/com/labsynch/labseer/service/ParentStructureServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ParentStructureServiceImpl.java
@@ -3,19 +3,17 @@
 import java.util.Date;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
 import com.labsynch.labseer.domain.Lot;
 import com.labsynch.labseer.domain.Parent;
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
 import com.labsynch.labseer.service.ChemStructureService.StructureType;
-import com.labsynch.labseer.utils.MoleculeUtil;
-import com.labsynch.labseer.utils.SecurityUtil;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 
 @Service
diff --git a/src/main/java/com/labsynch/labseer/service/PostSuccessfulAuthenticationHandler.java b/src/main/java/com/labsynch/labseer/service/PostSuccessfulAuthenticationHandler.java
index 8c8d12d35..e81508605 100755
--- a/src/main/java/com/labsynch/labseer/service/PostSuccessfulAuthenticationHandler.java
+++ b/src/main/java/com/labsynch/labseer/service/PostSuccessfulAuthenticationHandler.java
@@ -7,6 +7,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.labsynch.labseer.utils.SecurityUtils;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,8 +22,6 @@
 import org.springframework.security.web.savedrequest.SavedRequest;
 import org.springframework.util.StringUtils;
 
-import com.labsynch.labseer.utils.SecurityUtils;
-
 public class PostSuccessfulAuthenticationHandler extends  SimpleUrlAuthenticationSuccessHandler {
 
 	static Logger logger = LoggerFactory.getLogger(PostSuccessfulAuthenticationHandler.class);
diff --git a/src/main/java/com/labsynch/labseer/service/ProtocolService.java b/src/main/java/com/labsynch/labseer/service/ProtocolService.java
index cf55dcff3..80509b8ae 100755
--- a/src/main/java/com/labsynch/labseer/service/ProtocolService.java
+++ b/src/main/java/com/labsynch/labseer/service/ProtocolService.java
@@ -5,13 +5,13 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.Protocol;
 import com.labsynch.labseer.dto.DateValueComparisonRequest;
 import com.labsynch.labseer.dto.ProtocolErrorMessageDTO;
 import com.labsynch.labseer.exceptions.UniqueNameException;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface ProtocolService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/ProtocolStateServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ProtocolStateServiceImpl.java
index d793b2a2f..f48af22a2 100644
--- a/src/main/java/com/labsynch/labseer/service/ProtocolStateServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ProtocolStateServiceImpl.java
@@ -6,12 +6,6 @@
 import java.util.List;
 import java.util.Set;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.labsynch.labseer.domain.Protocol;
 import com.labsynch.labseer.domain.ProtocolState;
 import com.labsynch.labseer.domain.ProtocolValue;
@@ -20,6 +14,12 @@
 import com.labsynch.labseer.utils.PropertiesUtilService;
 import com.labsynch.labseer.utils.SimpleUtil;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 @Service
 @Transactional
 public class ProtocolStateServiceImpl implements ProtocolStateService {
diff --git a/src/main/java/com/labsynch/labseer/service/ProtocolValueServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ProtocolValueServiceImpl.java
index 8b790e52e..decb085e9 100644
--- a/src/main/java/com/labsynch/labseer/service/ProtocolValueServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ProtocolValueServiceImpl.java
@@ -7,12 +7,6 @@
 import java.util.Date;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.labsynch.labseer.domain.Protocol;
 import com.labsynch.labseer.domain.ProtocolState;
 import com.labsynch.labseer.domain.ProtocolValue;
@@ -20,6 +14,12 @@
 import com.labsynch.labseer.dto.ProtocolValuePathDTO;
 import com.labsynch.labseer.utils.SimpleUtil;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 
 @Service
 @Transactional
diff --git a/src/main/java/com/labsynch/labseer/service/RegSearchServiceImpl.java b/src/main/java/com/labsynch/labseer/service/RegSearchServiceImpl.java
index 23360e1cb..ac6d65a54 100755
--- a/src/main/java/com/labsynch/labseer/service/RegSearchServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/RegSearchServiceImpl.java
@@ -5,16 +5,8 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.codec.binary.Base64;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
 import com.labsynch.labseer.chemclasses.CmpdRegMoleculeFactory;
-import com.labsynch.labseer.domain.CorpName;
 import com.labsynch.labseer.domain.IsoSalt;
 import com.labsynch.labseer.domain.Lot;
 import com.labsynch.labseer.domain.Parent;
@@ -28,8 +20,15 @@
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
 import com.labsynch.labseer.service.ChemStructureService.SearchType;
 import com.labsynch.labseer.service.ChemStructureService.StructureType;
-import com.labsynch.labseer.utils.PropertiesUtilService;
 import com.labsynch.labseer.utils.MoleculeUtil;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+
+import org.apache.commons.codec.binary.Base64;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class RegSearchServiceImpl implements RegSearchService {
diff --git a/src/main/java/com/labsynch/labseer/service/SaltFormServiceImpl.java b/src/main/java/com/labsynch/labseer/service/SaltFormServiceImpl.java
index 6e158b1c5..f3e6d1e59 100644
--- a/src/main/java/com/labsynch/labseer/service/SaltFormServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/SaltFormServiceImpl.java
@@ -2,28 +2,24 @@
 
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.labsynch.labseer.domain.CorpName;
 import com.labsynch.labseer.domain.IsoSalt;
 import com.labsynch.labseer.domain.Lot;
 import com.labsynch.labseer.domain.Parent;
 import com.labsynch.labseer.domain.SaltForm;
-
 import com.labsynch.labseer.exceptions.DupeSaltFormStructureException;
 import com.labsynch.labseer.exceptions.SaltFormMolFormatException;
 import com.labsynch.labseer.service.ChemStructureService.StructureType;
 import com.labsynch.labseer.utils.PropertiesUtilService;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 
 @Service
 public class SaltFormServiceImpl implements SaltFormService {
diff --git a/src/main/java/com/labsynch/labseer/service/SaltLoader.java b/src/main/java/com/labsynch/labseer/service/SaltLoader.java
index f4a897fb3..ab10601ca 100755
--- a/src/main/java/com/labsynch/labseer/service/SaltLoader.java
+++ b/src/main/java/com/labsynch/labseer/service/SaltLoader.java
@@ -2,6 +2,7 @@
 
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -13,6 +14,7 @@
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
 import javax.persistence.Version;
+
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.beans.factory.annotation.Configurable;
diff --git a/src/main/java/com/labsynch/labseer/service/SaltServiceImpl.java b/src/main/java/com/labsynch/labseer/service/SaltServiceImpl.java
index 72289805b..3fbe9a81d 100644
--- a/src/main/java/com/labsynch/labseer/service/SaltServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/SaltServiceImpl.java
@@ -3,23 +3,22 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
 import com.labsynch.labseer.chemclasses.CmpdRegMoleculeFactory;
 import com.labsynch.labseer.chemclasses.CmpdRegSDFReader;
 import com.labsynch.labseer.chemclasses.CmpdRegSDFReaderFactory;
 import com.labsynch.labseer.domain.Salt;
-
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
 import com.labsynch.labseer.service.ChemStructureService.SearchType;
 import com.labsynch.labseer.service.ChemStructureService.StructureType;
 import com.labsynch.labseer.utils.MoleculeUtil;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 @Service
 public class SaltServiceImpl implements SaltService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/SaltStructureServiceImpl.java b/src/main/java/com/labsynch/labseer/service/SaltStructureServiceImpl.java
index f93523f69..56aa19f24 100755
--- a/src/main/java/com/labsynch/labseer/service/SaltStructureServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/SaltStructureServiceImpl.java
@@ -3,20 +3,19 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
 import com.labsynch.labseer.domain.Salt;
-import com.labsynch.labseer.exceptions.StructureSaveException;
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
-import com.labsynch.labseer.service.ChemStructureService.SearchType;
+import com.labsynch.labseer.exceptions.StructureSaveException;
 import com.labsynch.labseer.service.ChemStructureService.StructureType;
 import com.labsynch.labseer.utils.PropertiesUtilService;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 @Service
 public class SaltStructureServiceImpl implements SaltStructureService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/SearchFormServiceImpl.java b/src/main/java/com/labsynch/labseer/service/SearchFormServiceImpl.java
index 9ca7e87f8..596ad3f67 100755
--- a/src/main/java/com/labsynch/labseer/service/SearchFormServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/SearchFormServiceImpl.java
@@ -15,15 +15,7 @@
 
 import javax.persistence.TypedQuery;
 
-import org.apache.commons.lang3.ArrayUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
-import com.labsynch.labseer.domain.CorpName;
 import com.labsynch.labseer.domain.Lot;
 import com.labsynch.labseer.domain.LotAlias;
 import com.labsynch.labseer.domain.Parent;
@@ -41,6 +33,13 @@
 import com.labsynch.labseer.service.ChemStructureService.StructureType;
 import com.labsynch.labseer.utils.PropertiesUtilService;
 
+import org.apache.commons.lang3.ArrayUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 @Service
 public class SearchFormServiceImpl implements SearchFormService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/SetupServiceImpl.java b/src/main/java/com/labsynch/labseer/service/SetupServiceImpl.java
index 40db26582..85e1f242a 100755
--- a/src/main/java/com/labsynch/labseer/service/SetupServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/SetupServiceImpl.java
@@ -5,15 +5,13 @@
 import java.io.FileReader;
 import java.util.Scanner;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-import com.labsynch.labseer.domain.CorpName;
 import com.labsynch.labseer.domain.PreDef_CorpName;
-
 import com.labsynch.labseer.utils.PropertiesUtilService;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 
 @Service
diff --git a/src/main/java/com/labsynch/labseer/service/StandardizationService.java b/src/main/java/com/labsynch/labseer/service/StandardizationService.java
index 50d344ad8..601b5f26e 100644
--- a/src/main/java/com/labsynch/labseer/service/StandardizationService.java
+++ b/src/main/java/com/labsynch/labseer/service/StandardizationService.java
@@ -3,11 +3,11 @@
 import java.io.IOException;
 import java.util.List;
 
-import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
-import com.labsynch.labseer.exceptions.StandardizerException;
 import com.labsynch.labseer.domain.StandardizationHistory;
 import com.labsynch.labseer.domain.StandardizationSettings;
 import com.labsynch.labseer.dto.StandardizationDryRunSearchDTO;
+import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
+import com.labsynch.labseer.exceptions.StandardizerException;
 
 public interface StandardizationService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/StructureImageServiceImpl.java b/src/main/java/com/labsynch/labseer/service/StructureImageServiceImpl.java
index 6a33daa88..57b48b4a1 100755
--- a/src/main/java/com/labsynch/labseer/service/StructureImageServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/StructureImageServiceImpl.java
@@ -3,12 +3,6 @@
 import java.io.IOException;
 import java.util.Collection;
 
-import org.apache.commons.io.output.ByteArrayOutputStream;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
 import com.labsynch.labseer.chemclasses.CmpdRegMoleculeFactory;
 import com.labsynch.labseer.chemclasses.CmpdRegSDFWriter;
@@ -17,6 +11,11 @@
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
 import com.labsynch.labseer.utils.MoleculeUtil;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 
 @Service
 public class StructureImageServiceImpl implements StructureImageService {
diff --git a/src/main/java/com/labsynch/labseer/service/StructureServiceImpl.java b/src/main/java/com/labsynch/labseer/service/StructureServiceImpl.java
index a36eebf07..39f02f396 100644
--- a/src/main/java/com/labsynch/labseer/service/StructureServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/StructureServiceImpl.java
@@ -16,6 +16,12 @@
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
+import com.labsynch.labseer.domain.ChemStructure;
+import com.labsynch.labseer.dto.AutoLabelDTO;
+import com.labsynch.labseer.dto.MolPropertiesDTO;
+import com.labsynch.labseer.service.ChemStructureService.SearchType;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+
 import org.apache.commons.codec.binary.Base64OutputStream;
 import org.openscience.cdk.depict.Depiction;
 import org.openscience.cdk.depict.DepictionGenerator;
@@ -35,12 +41,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.ChemStructure;
-import com.labsynch.labseer.dto.AutoLabelDTO;
-import com.labsynch.labseer.dto.MolPropertiesDTO;
-import com.labsynch.labseer.service.ChemStructureService.SearchType;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-
 @Service
 @Transactional
 public class StructureServiceImpl implements StructureService {
diff --git a/src/main/java/com/labsynch/labseer/service/SubjectService.java b/src/main/java/com/labsynch/labseer/service/SubjectService.java
index a6b390aab..c7ef13619 100755
--- a/src/main/java/com/labsynch/labseer/service/SubjectService.java
+++ b/src/main/java/com/labsynch/labseer/service/SubjectService.java
@@ -8,8 +8,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.Subject;
 import com.labsynch.labseer.domain.TreatmentGroup;
 import com.labsynch.labseer.dto.ContainerSubjectsDTO;
@@ -21,6 +19,8 @@
 import com.labsynch.labseer.dto.TempThingDTO;
 import com.labsynch.labseer.dto.ValueQueryDTO;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface SubjectService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/SubjectServiceImpl.java b/src/main/java/com/labsynch/labseer/service/SubjectServiceImpl.java
index d40351e37..013dae498 100755
--- a/src/main/java/com/labsynch/labseer/service/SubjectServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/SubjectServiceImpl.java
@@ -22,22 +22,11 @@
 import javax.persistence.TypedQuery;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.CriteriaUpdate;
 import javax.persistence.criteria.Expression;
 import javax.persistence.criteria.Join;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.supercsv.cellprocessor.ift.CellProcessor;
-import org.supercsv.io.CsvBeanReader;
-import org.supercsv.io.ICsvBeanReader;
-import org.supercsv.prefs.CsvPreference;
-
 import com.labsynch.labseer.domain.AnalysisGroup;
 import com.labsynch.labseer.domain.Container;
 import com.labsynch.labseer.domain.Experiment;
@@ -55,7 +44,6 @@
 import com.labsynch.labseer.dto.ExperimentCodeDTO;
 import com.labsynch.labseer.dto.FlatThingCsvDTO;
 import com.labsynch.labseer.dto.MultiContainerSubjectSearchRequest;
-import com.labsynch.labseer.dto.MultiContainerSubjectSearchResultDTO;
 import com.labsynch.labseer.dto.SubjectCodeDTO;
 import com.labsynch.labseer.dto.SubjectCodeNameDTO;
 import com.labsynch.labseer.dto.SubjectDTO;
@@ -68,6 +56,16 @@
 import com.labsynch.labseer.utils.PropertiesUtilService;
 import com.labsynch.labseer.utils.SimpleUtil;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.supercsv.cellprocessor.ift.CellProcessor;
+import org.supercsv.io.CsvBeanReader;
+import org.supercsv.io.ICsvBeanReader;
+import org.supercsv.prefs.CsvPreference;
+
 @Service
 @Transactional
 public class SubjectServiceImpl implements SubjectService {
diff --git a/src/main/java/com/labsynch/labseer/service/SubjectStateService.java b/src/main/java/com/labsynch/labseer/service/SubjectStateService.java
index 0a9f737c4..d642d040a 100755
--- a/src/main/java/com/labsynch/labseer/service/SubjectStateService.java
+++ b/src/main/java/com/labsynch/labseer/service/SubjectStateService.java
@@ -3,12 +3,12 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.SubjectState;
 import com.labsynch.labseer.dto.GenericStatePathRequest;
 import com.labsynch.labseer.dto.SubjectStatePathDTO;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface SubjectStateService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/SubjectValueService.java b/src/main/java/com/labsynch/labseer/service/SubjectValueService.java
index 573918d69..c734bf9b0 100644
--- a/src/main/java/com/labsynch/labseer/service/SubjectValueService.java
+++ b/src/main/java/com/labsynch/labseer/service/SubjectValueService.java
@@ -3,12 +3,12 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.SubjectValue;
 import com.labsynch.labseer.dto.GenericValuePathRequest;
 import com.labsynch.labseer.dto.SubjectValuePathDTO;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface SubjectValueService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/SubjectValueServiceImpl.java b/src/main/java/com/labsynch/labseer/service/SubjectValueServiceImpl.java
index aea139cde..b42b6131b 100644
--- a/src/main/java/com/labsynch/labseer/service/SubjectValueServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/SubjectValueServiceImpl.java
@@ -9,6 +9,14 @@
 import java.util.Date;
 import java.util.List;
 
+import com.labsynch.labseer.domain.Subject;
+import com.labsynch.labseer.domain.SubjectState;
+import com.labsynch.labseer.domain.SubjectValue;
+import com.labsynch.labseer.dto.GenericValuePathRequest;
+import com.labsynch.labseer.dto.SubjectValueDTO;
+import com.labsynch.labseer.dto.SubjectValuePathDTO;
+import com.labsynch.labseer.utils.SimpleUtil;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,14 +27,6 @@
 import org.supercsv.io.ICsvBeanWriter;
 import org.supercsv.prefs.CsvPreference;
 
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.SubjectState;
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.dto.GenericValuePathRequest;
-import com.labsynch.labseer.dto.SubjectValueDTO;
-import com.labsynch.labseer.dto.SubjectValuePathDTO;
-import com.labsynch.labseer.utils.SimpleUtil;
-
 
 @Service
 @Transactional
diff --git a/src/main/java/com/labsynch/labseer/service/TreatmentGroupService.java b/src/main/java/com/labsynch/labseer/service/TreatmentGroupService.java
index 7af58e8e7..ca15b2146 100755
--- a/src/main/java/com/labsynch/labseer/service/TreatmentGroupService.java
+++ b/src/main/java/com/labsynch/labseer/service/TreatmentGroupService.java
@@ -1,17 +1,16 @@
 package com.labsynch.labseer.service;
 
-import java.util.Date;
-import java.util.Set;
-
 import java.io.IOException;
+import java.util.Date;
 import java.util.HashMap;
-
-import org.springframework.stereotype.Service;
+import java.util.Set;
 
 import com.labsynch.labseer.domain.AnalysisGroup;
 import com.labsynch.labseer.domain.TreatmentGroup;
 import com.labsynch.labseer.dto.TempThingDTO;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface TreatmentGroupService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/TreatmentGroupServiceImpl.java b/src/main/java/com/labsynch/labseer/service/TreatmentGroupServiceImpl.java
index 9a23a93a3..6012ae248 100755
--- a/src/main/java/com/labsynch/labseer/service/TreatmentGroupServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/TreatmentGroupServiceImpl.java
@@ -13,18 +13,7 @@
 import java.util.List;
 import java.util.Set;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.supercsv.cellprocessor.ift.CellProcessor;
-import org.supercsv.io.CsvBeanReader;
-import org.supercsv.io.ICsvBeanReader;
-import org.supercsv.prefs.CsvPreference;
-
 import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.Experiment;
 import com.labsynch.labseer.domain.Subject;
 import com.labsynch.labseer.domain.TreatmentGroup;
 import com.labsynch.labseer.domain.TreatmentGroupLabel;
@@ -34,6 +23,16 @@
 import com.labsynch.labseer.dto.TempThingDTO;
 import com.labsynch.labseer.utils.PropertiesUtilService;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.supercsv.cellprocessor.ift.CellProcessor;
+import org.supercsv.io.CsvBeanReader;
+import org.supercsv.io.ICsvBeanReader;
+import org.supercsv.prefs.CsvPreference;
+
 @Service
 @Transactional
 public class TreatmentGroupServiceImpl implements TreatmentGroupService {
diff --git a/src/main/java/com/labsynch/labseer/service/TreatmentGroupStateService.java b/src/main/java/com/labsynch/labseer/service/TreatmentGroupStateService.java
index ea48b2131..0c064dab0 100644
--- a/src/main/java/com/labsynch/labseer/service/TreatmentGroupStateService.java
+++ b/src/main/java/com/labsynch/labseer/service/TreatmentGroupStateService.java
@@ -3,12 +3,12 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.TreatmentGroupState;
 import com.labsynch.labseer.dto.GenericStatePathRequest;
 import com.labsynch.labseer.dto.TreatmentGroupStatePathDTO;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface TreatmentGroupStateService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/TreatmentGroupValueService.java b/src/main/java/com/labsynch/labseer/service/TreatmentGroupValueService.java
index 85a1ac326..a5cb85d97 100644
--- a/src/main/java/com/labsynch/labseer/service/TreatmentGroupValueService.java
+++ b/src/main/java/com/labsynch/labseer/service/TreatmentGroupValueService.java
@@ -3,12 +3,12 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.springframework.stereotype.Service;
-
 import com.labsynch.labseer.domain.TreatmentGroupValue;
 import com.labsynch.labseer.dto.GenericValuePathRequest;
 import com.labsynch.labseer.dto.TreatmentGroupValuePathDTO;
 
+import org.springframework.stereotype.Service;
+
 @Service
 public interface TreatmentGroupValueService {
 
diff --git a/src/main/java/com/labsynch/labseer/service/TreatmentGroupValueServiceImpl.java b/src/main/java/com/labsynch/labseer/service/TreatmentGroupValueServiceImpl.java
index ea296581c..47336d65b 100644
--- a/src/main/java/com/labsynch/labseer/service/TreatmentGroupValueServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/TreatmentGroupValueServiceImpl.java
@@ -9,6 +9,14 @@
 import java.util.Date;
 import java.util.List;
 
+import com.labsynch.labseer.domain.TreatmentGroup;
+import com.labsynch.labseer.domain.TreatmentGroupState;
+import com.labsynch.labseer.domain.TreatmentGroupValue;
+import com.labsynch.labseer.dto.GenericValuePathRequest;
+import com.labsynch.labseer.dto.TreatmentGroupValueDTO;
+import com.labsynch.labseer.dto.TreatmentGroupValuePathDTO;
+import com.labsynch.labseer.utils.SimpleUtil;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,14 +27,6 @@
 import org.supercsv.io.ICsvBeanWriter;
 import org.supercsv.prefs.CsvPreference;
 
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.domain.TreatmentGroupState;
-import com.labsynch.labseer.domain.TreatmentGroupValue;
-import com.labsynch.labseer.dto.GenericValuePathRequest;
-import com.labsynch.labseer.dto.TreatmentGroupValueDTO;
-import com.labsynch.labseer.dto.TreatmentGroupValuePathDTO;
-import com.labsynch.labseer.utils.SimpleUtil;
-
 
 @Service
 @Transactional
diff --git a/src/main/java/com/labsynch/labseer/utils/BitSetUserType.java b/src/main/java/com/labsynch/labseer/utils/BitSetUserType.java
index 8a0ef335d..c6e6f1c9a 100644
--- a/src/main/java/com/labsynch/labseer/utils/BitSetUserType.java
+++ b/src/main/java/com/labsynch/labseer/utils/BitSetUserType.java
@@ -1,16 +1,16 @@
 package com.labsynch.labseer.utils;
 
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
 import java.util.BitSet;
 
 import com.vladmihalcea.hibernate.type.ImmutableType;
+
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.postgresql.util.PGobject;
 
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-
 public class BitSetUserType extends ImmutableType<BitSet> {
 
     public static final BitSetUserType INSTANCE = new BitSetUserType();
diff --git a/src/main/java/com/labsynch/labseer/utils/ByteArrayTransformer.java b/src/main/java/com/labsynch/labseer/utils/ByteArrayTransformer.java
index e2631c3eb..22a1d395e 100755
--- a/src/main/java/com/labsynch/labseer/utils/ByteArrayTransformer.java
+++ b/src/main/java/com/labsynch/labseer/utils/ByteArrayTransformer.java
@@ -1,6 +1,7 @@
 package com.labsynch.labseer.utils;
 
 import java.lang.reflect.Array;
+
 import flexjson.transformer.AbstractTransformer;
 
 public class ByteArrayTransformer extends AbstractTransformer {
diff --git a/src/main/java/com/labsynch/labseer/utils/DeleteAllParents.java b/src/main/java/com/labsynch/labseer/utils/DeleteAllParents.java
index 73d3f26fc..7fa1d38e4 100755
--- a/src/main/java/com/labsynch/labseer/utils/DeleteAllParents.java
+++ b/src/main/java/com/labsynch/labseer/utils/DeleteAllParents.java
@@ -2,12 +2,12 @@
 
 import java.util.List;
 
+import com.labsynch.labseer.domain.Parent;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.Parent;
-
 @Transactional
 public class DeleteAllParents {
 	static Logger logger = LoggerFactory.getLogger(DeleteAllParents.class);
diff --git a/src/main/java/com/labsynch/labseer/utils/InitialSetup.java b/src/main/java/com/labsynch/labseer/utils/InitialSetup.java
index f09272cce..98f0bbd72 100755
--- a/src/main/java/com/labsynch/labseer/utils/InitialSetup.java
+++ b/src/main/java/com/labsynch/labseer/utils/InitialSetup.java
@@ -4,9 +4,6 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.labsynch.labseer.domain.ExperimentKind;
 import com.labsynch.labseer.domain.ExperimentType;
 import com.labsynch.labseer.domain.InteractionType;
@@ -20,6 +17,9 @@
 import com.labsynch.labseer.domain.ThingType;
 import com.labsynch.labseer.domain.ValueType;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class InitialSetup {
 		
 	private static final Logger logger = LoggerFactory.getLogger(InitialSetup.class);
diff --git a/src/main/java/com/labsynch/labseer/utils/LoadCompoundsUtil.java b/src/main/java/com/labsynch/labseer/utils/LoadCompoundsUtil.java
index f104a1ac7..116f50262 100755
--- a/src/main/java/com/labsynch/labseer/utils/LoadCompoundsUtil.java
+++ b/src/main/java/com/labsynch/labseer/utils/LoadCompoundsUtil.java
@@ -11,27 +11,20 @@
 import java.util.List;
 import java.util.Set;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import javax.persistence.NoResultException;
-import org.springframework.dao.IncorrectResultSizeDataAccessException;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
 import com.labsynch.labseer.chemclasses.CmpdRegSDFReader;
 import com.labsynch.labseer.chemclasses.CmpdRegSDFReaderFactory;
 import com.labsynch.labseer.chemclasses.CmpdRegSDFWriter;
 import com.labsynch.labseer.chemclasses.CmpdRegSDFWriterFactory;
-import com.labsynch.labseer.domain.CorpName;
+import com.labsynch.labseer.domain.Author;
 import com.labsynch.labseer.domain.IsoSalt;
 import com.labsynch.labseer.domain.Isotope;
 import com.labsynch.labseer.domain.Lot;
 import com.labsynch.labseer.domain.Parent;
 import com.labsynch.labseer.domain.Salt;
 import com.labsynch.labseer.domain.SaltForm;
-import com.labsynch.labseer.domain.Author;
 import com.labsynch.labseer.domain.StereoCategory;
 import com.labsynch.labseer.dto.Metalot;
 import com.labsynch.labseer.dto.MetalotReturn;
@@ -40,6 +33,13 @@
 import com.labsynch.labseer.service.ErrorMessage;
 import com.labsynch.labseer.service.MetalotService;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.IncorrectResultSizeDataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 @Service
 @Transactional
 public class LoadCompoundsUtil {
diff --git a/src/main/java/com/labsynch/labseer/utils/LoadFullCompoundsUtil.java b/src/main/java/com/labsynch/labseer/utils/LoadFullCompoundsUtil.java
index 5455e4e09..ba4975da6 100644
--- a/src/main/java/com/labsynch/labseer/utils/LoadFullCompoundsUtil.java
+++ b/src/main/java/com/labsynch/labseer/utils/LoadFullCompoundsUtil.java
@@ -6,22 +6,17 @@
 import java.util.Date;
 import java.util.HashMap;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import javax.persistence.NoResultException;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
 import com.labsynch.labseer.chemclasses.CmpdRegSDFReader;
 import com.labsynch.labseer.chemclasses.CmpdRegSDFReaderFactory;
 import com.labsynch.labseer.chemclasses.CmpdRegSDFWriter;
 import com.labsynch.labseer.chemclasses.CmpdRegSDFWriterFactory;
+import com.labsynch.labseer.domain.Author;
 import com.labsynch.labseer.domain.Lot;
 import com.labsynch.labseer.domain.Parent;
 import com.labsynch.labseer.domain.SaltForm;
-import com.labsynch.labseer.domain.Author;
 import com.labsynch.labseer.domain.StereoCategory;
 import com.labsynch.labseer.domain.Vendor;
 import com.labsynch.labseer.dto.Metalot;
@@ -31,6 +26,12 @@
 import com.labsynch.labseer.service.ErrorMessage;
 import com.labsynch.labseer.service.MetalotService;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 @Service
 public class LoadFullCompoundsUtil {
 
diff --git a/src/main/java/com/labsynch/labseer/utils/MimeTypeUtil.java b/src/main/java/com/labsynch/labseer/utils/MimeTypeUtil.java
index 912bf6e81..4212a5a83 100755
--- a/src/main/java/com/labsynch/labseer/utils/MimeTypeUtil.java
+++ b/src/main/java/com/labsynch/labseer/utils/MimeTypeUtil.java
@@ -4,11 +4,11 @@
 import java.io.InputStream;
 import java.util.Properties;
 
+import com.labsynch.labseer.api.ApiFileSaveController;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.labsynch.labseer.api.ApiFileSaveController;
-
 public class MimeTypeUtil {
 
 	static Logger logger = LoggerFactory.getLogger(MimeTypeUtil.class);
diff --git a/src/main/java/com/labsynch/labseer/utils/MoleculeUtil.java b/src/main/java/com/labsynch/labseer/utils/MoleculeUtil.java
index 131ccedfd..d87bb12e0 100755
--- a/src/main/java/com/labsynch/labseer/utils/MoleculeUtil.java
+++ b/src/main/java/com/labsynch/labseer/utils/MoleculeUtil.java
@@ -2,15 +2,15 @@
 
 import java.io.IOException;
 
+import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
+import com.labsynch.labseer.chemclasses.CmpdRegMoleculeFactory;
+import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
-import com.labsynch.labseer.chemclasses.CmpdRegMoleculeFactory;
-import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
-
 @Component
 public class MoleculeUtil {
 
diff --git a/src/main/java/com/labsynch/labseer/utils/PhysicalNamingStrategyImpl.java b/src/main/java/com/labsynch/labseer/utils/PhysicalNamingStrategyImpl.java
index c50aacd20..d2fafdb79 100644
--- a/src/main/java/com/labsynch/labseer/utils/PhysicalNamingStrategyImpl.java
+++ b/src/main/java/com/labsynch/labseer/utils/PhysicalNamingStrategyImpl.java
@@ -1,9 +1,10 @@
 package com.labsynch.labseer.utils;
 
+import java.util.Locale;
+
 import org.hibernate.boot.model.naming.Identifier;
 import org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl;
 import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
-import java.util.Locale;
 public class PhysicalNamingStrategyImpl extends PhysicalNamingStrategyStandardImpl {
     @Override
     public Identifier toPhysicalTableName(Identifier name, JdbcEnvironment context) {
diff --git a/src/main/java/com/labsynch/labseer/utils/PropertiesUtilServiceImpl.java b/src/main/java/com/labsynch/labseer/utils/PropertiesUtilServiceImpl.java
index 53fc7a590..ef4a6b7ad 100755
--- a/src/main/java/com/labsynch/labseer/utils/PropertiesUtilServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/utils/PropertiesUtilServiceImpl.java
@@ -1,14 +1,12 @@
 package com.labsynch.labseer.utils;
 
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import javax.sql.DataSource;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.support.JdbcUtils;
-import org.springframework.jdbc.support.MetaDataAccessException;
 import java.util.Collection;
+
 import com.labsynch.labseer.dto.SimpleBulkLoadPropertyDTO;
 import com.labsynch.labseer.service.ChemStructureService.SearchType;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
 @Service
 public class PropertiesUtilServiceImpl implements PropertiesUtilService{
 	
diff --git a/src/main/java/com/labsynch/labseer/utils/Request.java b/src/main/java/com/labsynch/labseer/utils/Request.java
index 00b5b83a2..dfb4365a6 100644
--- a/src/main/java/com/labsynch/labseer/utils/Request.java
+++ b/src/main/java/com/labsynch/labseer/utils/Request.java
@@ -1,13 +1,13 @@
 package com.labsynch.labseer.utils;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.concurrent.Callable;
 
 import org.apache.commons.io.IOUtils;
-import java.io.OutputStream;
-import java.io.IOException;
-import java.io.InputStream;
 
 public class Request implements Callable<Response> {
 
diff --git a/src/main/java/com/labsynch/labseer/utils/SecurityUtil.java b/src/main/java/com/labsynch/labseer/utils/SecurityUtil.java
index 9ab09870d..eb88ca151 100755
--- a/src/main/java/com/labsynch/labseer/utils/SecurityUtil.java
+++ b/src/main/java/com/labsynch/labseer/utils/SecurityUtil.java
@@ -2,16 +2,17 @@
 
 import java.util.Collection;
 
+import javax.persistence.NoResultException;
+
+import com.labsynch.labseer.domain.Author;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import javax.persistence.NoResultException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.ldap.userdetails.LdapUserDetails;
 
-import com.labsynch.labseer.domain.Author;
-
 public class SecurityUtil {
 
 	static Logger logger = LoggerFactory.getLogger(SecurityUtil.class);
diff --git a/src/main/java/com/labsynch/labseer/utils/SecurityUtils.java b/src/main/java/com/labsynch/labseer/utils/SecurityUtils.java
index a76ed2cf9..bc9b84c97 100644
--- a/src/main/java/com/labsynch/labseer/utils/SecurityUtils.java
+++ b/src/main/java/com/labsynch/labseer/utils/SecurityUtils.java
@@ -5,21 +5,21 @@
 import java.util.HashSet;
 import java.util.List;
 
+import com.labsynch.labseer.domain.Author;
+import com.labsynch.labseer.service.AuthorRoleService;
+import com.labsynch.labseer.service.AuthorService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.User;
-import org.springframework.security.ldap.userdetails.LdapUserDetails;
 import org.springframework.security.ldap.userdetails.InetOrgPerson;
+import org.springframework.security.ldap.userdetails.LdapUserDetails;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.service.AuthorRoleService;
-import com.labsynch.labseer.service.AuthorService;
-
 @Service
 public class SecurityUtils {
 
diff --git a/src/main/java/com/labsynch/labseer/utils/SimpleUtil.java b/src/main/java/com/labsynch/labseer/utils/SimpleUtil.java
index 0d94f43a9..208af5574 100644
--- a/src/main/java/com/labsynch/labseer/utils/SimpleUtil.java
+++ b/src/main/java/com/labsynch/labseer/utils/SimpleUtil.java
@@ -1,12 +1,18 @@
 package com.labsynch.labseer.utils;
 
 import java.io.BufferedInputStream;
+import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.sql.Connection;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.math.BigInteger;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLEncoder;
 import java.sql.DatabaseMetaData;
-import java.sql.DriverManager;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -19,38 +25,26 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import javax.sql.DataSource;
-
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.Expression;
 import javax.persistence.criteria.Predicate;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.jdbc.support.JdbcUtils;
-import org.springframework.jdbc.support.MetaDataAccessException;
-
 import com.github.underscore.$;
 import com.github.underscore.Function1;
 import com.labsynch.labseer.domain.LsThing;
 import com.labsynch.labseer.domain.LsThingState;
 import com.labsynch.labseer.domain.LsThingValue;
 
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.math.BigInteger;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLEncoder;
 import org.apache.commons.io.IOUtils;
-import org.springframework.web.util.UriComponentsBuilder;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.jdbc.support.JdbcUtils;
+import org.springframework.jdbc.support.MetaDataAccessException;
+import org.springframework.web.util.UriComponentsBuilder;
 
 public class SimpleUtil {
 	
diff --git a/src/test/java/com/labsynch/labseer/api/ApiAuthorControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiAuthorControllerTest.java
index da08a93e1..1d630d490 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiAuthorControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiAuthorControllerTest.java
@@ -10,7 +10,11 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.Author;
+import com.labsynch.labseer.domain.AuthorLabel;
+import com.labsynch.labseer.domain.AuthorState;
+import com.labsynch.labseer.domain.AuthorValue;
+import com.labsynch.labseer.dto.CodeTableDTO;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -29,11 +33,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.AuthorLabel;
-import com.labsynch.labseer.domain.AuthorState;
-import com.labsynch.labseer.domain.AuthorValue;
-import com.labsynch.labseer.dto.CodeTableDTO;
+import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
diff --git a/src/test/java/com/labsynch/labseer/api/ApiAuthorRoleControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiAuthorRoleControllerTest.java
index 57cf31e34..250123e0e 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiAuthorRoleControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiAuthorRoleControllerTest.java
@@ -6,6 +6,8 @@
 import java.util.Collection;
 import java.util.HashSet;
 
+import com.labsynch.labseer.dto.AuthorRoleDTO;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -23,8 +25,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.labsynch.labseer.dto.AuthorRoleDTO;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
 @ContextConfiguration(locations = {
diff --git a/src/test/java/com/labsynch/labseer/api/ApiCompoundsControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiCompoundsControllerTest.java
index 382f698d1..0e8655f0e 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiCompoundsControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiCompoundsControllerTest.java
@@ -1,12 +1,13 @@
 package com.labsynch.labseer.api;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import java.util.Collection;
 import java.util.HashSet;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.dto.CmpdRegBatchCodeDTO;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -24,11 +25,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.labsynch.labseer.domain.LabelSequence;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.ProtocolValue;
-import com.labsynch.labseer.dto.CmpdRegBatchCodeDTO;
-import com.labsynch.labseer.dto.CodeTableDTO;
+import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
diff --git a/src/test/java/com/labsynch/labseer/api/ApiContainerControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiContainerControllerTest.java
index 3b55c7b0a..f54e9f5bf 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiContainerControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiContainerControllerTest.java
@@ -14,28 +14,8 @@
 import java.util.HashSet;
 import java.util.List;
 
-import javax.persistence.TypedQuery;
-
-import junit.framework.Assert;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import javax.persistence.NoResultException;
-import org.springframework.http.MediaType;
-import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.test.annotation.Rollback;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.ResultActions;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.context.WebApplicationContext;
+import javax.persistence.TypedQuery;
 
 import com.labsynch.labseer.domain.AnalysisGroup;
 import com.labsynch.labseer.domain.Container;
@@ -70,6 +50,26 @@
 import com.labsynch.labseer.exceptions.ErrorMessage;
 import com.labsynch.labseer.service.ContainerService;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.test.annotation.Rollback;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.ResultActions;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.context.WebApplicationContext;
+
+import junit.framework.Assert;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
 @ContextConfiguration(locations = {
diff --git a/src/test/java/com/labsynch/labseer/api/ApiContainerStateControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiContainerStateControllerTest.java
index 5a5f0f01d..8ccb4e68a 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiContainerStateControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiContainerStateControllerTest.java
@@ -1,12 +1,15 @@
 package com.labsynch.labseer.api;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import java.util.Collection;
 import java.util.HashSet;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.Container;
+import com.labsynch.labseer.domain.ContainerState;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -24,13 +27,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ContainerState;
-import com.labsynch.labseer.domain.LabelSequence;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.ProtocolValue;
-import com.labsynch.labseer.dto.CmpdRegBatchCodeDTO;
-import com.labsynch.labseer.dto.CodeTableDTO;
+import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
diff --git a/src/test/java/com/labsynch/labseer/api/ApiCurveFitControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiCurveFitControllerTest.java
index 0612a7b31..1d60bc4c8 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiCurveFitControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiCurveFitControllerTest.java
@@ -1,11 +1,12 @@
 package com.labsynch.labseer.api;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import java.util.Collection;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.ProtocolValue;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -23,10 +24,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.labsynch.labseer.domain.LabelSequence;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.ProtocolValue;
-import com.labsynch.labseer.dto.CodeTableDTO;
+import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
diff --git a/src/test/java/com/labsynch/labseer/api/ApiExperimentControllerGetDataTest.java b/src/test/java/com/labsynch/labseer/api/ApiExperimentControllerGetDataTest.java
index 5f1fd1367..eae67cd01 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiExperimentControllerGetDataTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiExperimentControllerGetDataTest.java
@@ -1,17 +1,10 @@
 package com.labsynch.labseer.api;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import junit.framework.Assert;
+import com.labsynch.labseer.dto.ExperimentSearchRequestDTO;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -29,11 +22,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentLabel;
-import com.labsynch.labseer.dto.ExperimentErrorMessageDTO;
-import com.labsynch.labseer.dto.ExperimentSearchRequestDTO;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
 @ContextConfiguration(locations = {
diff --git a/src/test/java/com/labsynch/labseer/api/ApiExperimentControllerSaveTest.java b/src/test/java/com/labsynch/labseer/api/ApiExperimentControllerSaveTest.java
index 029f7126c..be1a49ebb 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiExperimentControllerSaveTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiExperimentControllerSaveTest.java
@@ -1,16 +1,9 @@
 package com.labsynch.labseer.api;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import junit.framework.Assert;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -27,11 +20,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentLabel;
-import com.labsynch.labseer.dto.ExperimentErrorMessageDTO;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
 @ContextConfiguration(locations = {
diff --git a/src/test/java/com/labsynch/labseer/api/ApiExperimentControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiExperimentControllerTest.java
index 03116f8ef..7c3fd6ff6 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiExperimentControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiExperimentControllerTest.java
@@ -9,7 +9,10 @@
 import java.util.Collection;
 import java.util.List;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.Experiment;
+import com.labsynch.labseer.dto.CodeTableDTO;
+import com.labsynch.labseer.dto.DateValueComparisonRequest;
+import com.labsynch.labseer.dto.ExperimentErrorMessageDTO;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -27,10 +30,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.dto.CodeTableDTO;
-import com.labsynch.labseer.dto.DateValueComparisonRequest;
-import com.labsynch.labseer.dto.ExperimentErrorMessageDTO;
+import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
diff --git a/src/test/java/com/labsynch/labseer/api/ApiGeneThingsControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiGeneThingsControllerTest.java
index b92303747..8d9d2e575 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiGeneThingsControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiGeneThingsControllerTest.java
@@ -1,15 +1,9 @@
 package com.labsynch.labseer.api;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import java.util.Collection;
-
-import junit.framework.Assert;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -18,19 +12,14 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.exceptions.ErrorMessage;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
 @ContextConfiguration(locations = {
diff --git a/src/test/java/com/labsynch/labseer/api/ApiItxExperimentExperimentControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiItxExperimentExperimentControllerTest.java
index 49d516284..00002cfa4 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiItxExperimentExperimentControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiItxExperimentExperimentControllerTest.java
@@ -10,7 +10,8 @@
 import java.util.Date;
 import java.util.List;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.Experiment;
+import com.labsynch.labseer.domain.ItxExperimentExperiment;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -18,9 +19,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.ContextConfiguration;
@@ -31,12 +30,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ItxExperimentExperiment;
-import com.labsynch.labseer.domain.ItxProtocolProtocol;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.Protocol;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
 @ContextConfiguration(locations = {
diff --git a/src/test/java/com/labsynch/labseer/api/ApiItxProtocolProtocolControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiItxProtocolProtocolControllerTest.java
index fc0442b16..6310a645c 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiItxProtocolProtocolControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiItxProtocolProtocolControllerTest.java
@@ -10,6 +10,9 @@
 import java.util.Date;
 import java.util.List;
 
+import com.labsynch.labseer.domain.ItxProtocolProtocol;
+import com.labsynch.labseer.domain.Protocol;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -27,9 +30,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.labsynch.labseer.domain.ItxProtocolProtocol;
-import com.labsynch.labseer.domain.Protocol;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
 @ContextConfiguration(locations = {
diff --git a/src/test/java/com/labsynch/labseer/api/ApiItxSubjectContainerControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiItxSubjectContainerControllerTest.java
index 63babbcc9..0d5228257 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiItxSubjectContainerControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiItxSubjectContainerControllerTest.java
@@ -1,14 +1,10 @@
 package com.labsynch.labseer.api;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import java.util.Collection;
-import java.util.Date;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.ItxSubjectContainer;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -16,9 +12,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -28,11 +22,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ItxExperimentExperiment;
-import com.labsynch.labseer.domain.ItxSubjectContainer;
-import com.labsynch.labseer.domain.LsThing;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
 @ContextConfiguration(locations = {
diff --git a/src/test/java/com/labsynch/labseer/api/ApiLabelSequenceControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiLabelSequenceControllerTest.java
index c8e1e17ea..56da3f1d9 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiLabelSequenceControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiLabelSequenceControllerTest.java
@@ -1,11 +1,12 @@
 package com.labsynch.labseer.api;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import java.util.Collection;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.LabelSequence;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -20,12 +21,9 @@
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.labsynch.labseer.domain.LabelSequence;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.dto.CodeTableDTO;
+import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
diff --git a/src/test/java/com/labsynch/labseer/api/ApiLsThingControllerPostTest.java b/src/test/java/com/labsynch/labseer/api/ApiLsThingControllerPostTest.java
index 206321217..d74d57ef6 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiLsThingControllerPostTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiLsThingControllerPostTest.java
@@ -1,14 +1,13 @@
 package com.labsynch.labseer.api;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import java.util.Collection;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.LsThing;
+import com.labsynch.labseer.dto.StructureSearchDTO;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -18,19 +17,15 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.dto.StructureSearchDTO;
-import com.labsynch.labseer.exceptions.ErrorMessage;
+import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
diff --git a/src/test/java/com/labsynch/labseer/api/ApiLsThingControllerSearchTest.java b/src/test/java/com/labsynch/labseer/api/ApiLsThingControllerSearchTest.java
index f7ea46025..5c10559ec 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiLsThingControllerSearchTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiLsThingControllerSearchTest.java
@@ -1,16 +1,17 @@
 package com.labsynch.labseer.api;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.LsThing;
+import com.labsynch.labseer.dto.LabelQueryDTO;
+import com.labsynch.labseer.dto.LsThingQueryDTO;
+import com.labsynch.labseer.dto.StructureAndThingSearchDTO;
+import com.labsynch.labseer.dto.StructureSearchDTO;
+import com.labsynch.labseer.dto.ValueQueryDTO;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -18,32 +19,16 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.dto.LabelQueryDTO;
-import com.labsynch.labseer.dto.LsThingQueryDTO;
-import com.labsynch.labseer.dto.StructureAndThingSearchDTO;
-import com.labsynch.labseer.dto.StructureSearchDTO;
-import com.labsynch.labseer.dto.ValueQueryDTO;
-import com.labsynch.labseer.exceptions.ErrorMessage;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
 @ContextConfiguration(locations = {
diff --git a/src/test/java/com/labsynch/labseer/api/ApiLsThingControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiLsThingControllerTest.java
index ddbe1c7c2..f2a1a87bf 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiLsThingControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiLsThingControllerTest.java
@@ -8,7 +8,11 @@
 
 import java.util.Collection;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.ItxLsThingLsThing;
+import com.labsynch.labseer.domain.LsThing;
+import com.labsynch.labseer.dto.DependencyCheckDTO;
+import com.labsynch.labseer.dto.StructureSearchDTO;
+import com.labsynch.labseer.exceptions.ErrorMessage;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -28,11 +32,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.labsynch.labseer.domain.ItxLsThingLsThing;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.dto.DependencyCheckDTO;
-import com.labsynch.labseer.dto.StructureSearchDTO;
-import com.labsynch.labseer.exceptions.ErrorMessage;
+import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
diff --git a/src/test/java/com/labsynch/labseer/api/ApiProtocolControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiProtocolControllerTest.java
index 61ba1888f..43463e182 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiProtocolControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiProtocolControllerTest.java
@@ -9,7 +9,14 @@
 import java.util.Collection;
 import java.util.List;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.AuthorRole;
+import com.labsynch.labseer.domain.LsRole;
+import com.labsynch.labseer.domain.Protocol;
+import com.labsynch.labseer.domain.ProtocolLabel;
+import com.labsynch.labseer.domain.ProtocolValue;
+import com.labsynch.labseer.dto.CodeTableDTO;
+import com.labsynch.labseer.dto.DateValueComparisonRequest;
+import com.labsynch.labseer.dto.ProtocolErrorMessageDTO;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -25,14 +32,7 @@
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.labsynch.labseer.domain.AuthorRole;
-import com.labsynch.labseer.domain.LsRole;
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ProtocolLabel;
-import com.labsynch.labseer.domain.ProtocolValue;
-import com.labsynch.labseer.dto.CodeTableDTO;
-import com.labsynch.labseer.dto.DateValueComparisonRequest;
-import com.labsynch.labseer.dto.ProtocolErrorMessageDTO;
+import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
diff --git a/src/test/java/com/labsynch/labseer/api/ApiSetupControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiSetupControllerTest.java
index 3c5e678de..13571d6e1 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiSetupControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiSetupControllerTest.java
@@ -1,29 +1,11 @@
 package com.labsynch.labseer.api;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import java.util.Collection;
 
-import junit.framework.Assert;
-
-import org.hibernate.SessionFactory;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.context.WebApplicationContext;
-
 import com.labsynch.labseer.domain.ContainerKind;
 import com.labsynch.labseer.domain.ContainerType;
 import com.labsynch.labseer.domain.DDictKind;
@@ -36,12 +18,10 @@
 import com.labsynch.labseer.domain.LabelKind;
 import com.labsynch.labseer.domain.LabelSequence;
 import com.labsynch.labseer.domain.LabelType;
-import com.labsynch.labseer.domain.LsThing;
 import com.labsynch.labseer.domain.OperatorKind;
 import com.labsynch.labseer.domain.OperatorType;
 import com.labsynch.labseer.domain.ProtocolKind;
 import com.labsynch.labseer.domain.ProtocolType;
-import com.labsynch.labseer.domain.ProtocolValue;
 import com.labsynch.labseer.domain.StateKind;
 import com.labsynch.labseer.domain.StateType;
 import com.labsynch.labseer.domain.ThingKind;
@@ -50,7 +30,24 @@
 import com.labsynch.labseer.domain.UnitType;
 import com.labsynch.labseer.domain.ValueKind;
 import com.labsynch.labseer.domain.ValueType;
-import com.labsynch.labseer.dto.CodeTableDTO;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.context.WebApplicationContext;
+
+import junit.framework.Assert;
 
 @Transactional
 @RunWith(SpringJUnit4ClassRunner.class)
diff --git a/src/test/java/com/labsynch/labseer/api/ApiStructureControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiStructureControllerTest.java
index 8a85db0ff..08b710434 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiStructureControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiStructureControllerTest.java
@@ -3,7 +3,9 @@
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-import junit.framework.Assert;
+
+import com.labsynch.labseer.dto.MolPropertiesDTO;
+import com.labsynch.labseer.dto.StructureSearchDTO;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -21,8 +23,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.labsynch.labseer.dto.MolPropertiesDTO;
-import com.labsynch.labseer.dto.StructureSearchDTO;
+import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
diff --git a/src/test/java/com/labsynch/labseer/api/ApiSubjectControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiSubjectControllerTest.java
index dfc69281f..2751755d3 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiSubjectControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiSubjectControllerTest.java
@@ -1,15 +1,17 @@
 package com.labsynch.labseer.api;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import javax.persistence.TypedQuery;
-
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.LsThing;
+import com.labsynch.labseer.domain.Subject;
+import com.labsynch.labseer.dto.SubjectCodeNameDTO;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -27,10 +29,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.dto.CodeTableDTO;
-import com.labsynch.labseer.dto.SubjectCodeNameDTO;
+import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
diff --git a/src/test/java/com/labsynch/labseer/api/ApiValueControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiValueControllerTest.java
index 831ab8a72..3eddd2c49 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiValueControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiValueControllerTest.java
@@ -9,6 +9,14 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import com.labsynch.labseer.domain.AnalysisGroupValue;
+import com.labsynch.labseer.domain.ExperimentValue;
+import com.labsynch.labseer.domain.LsThingValue;
+import com.labsynch.labseer.domain.ProtocolValue;
+import com.labsynch.labseer.domain.SubjectValue;
+import com.labsynch.labseer.domain.TreatmentGroupValue;
+import com.labsynch.labseer.dto.IdSetDTO;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -25,14 +33,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.domain.ExperimentValue;
-import com.labsynch.labseer.domain.LsThingValue;
-import com.labsynch.labseer.domain.ProtocolValue;
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.domain.TreatmentGroupValue;
-import com.labsynch.labseer.dto.IdSetDTO;
-
 import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
diff --git a/src/test/java/com/labsynch/labseer/api/ApiValueKindControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiValueKindControllerTest.java
index 47c01be3c..ea8fdaae4 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiValueKindControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiValueKindControllerTest.java
@@ -1,12 +1,13 @@
 package com.labsynch.labseer.api;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import java.util.Collection;
 import java.util.List;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.ValueKind;
+import com.labsynch.labseer.dto.ValueTypeKindDTO;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -24,11 +25,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.labsynch.labseer.domain.LabelSequence;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.ValueKind;
-import com.labsynch.labseer.dto.CodeTableDTO;
-import com.labsynch.labseer.dto.ValueTypeKindDTO;
+import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupDataOnDemand.java
index 48d0938f1..4fbc43de7 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupDataOnDemand.java
@@ -8,8 +8,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
 
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupIntegrationTest.java
index 3ff7d63bf..6427d762a 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelDataOnDemand.java
index 1d0cf93c2..16be89155 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelDataOnDemand.java
@@ -8,8 +8,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelIntegrationTest.java
index 5606e3ced..5808f4f53 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateDataOnDemand.java
index b921f52fc..c360ec19b 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateDataOnDemand.java
@@ -8,8 +8,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateIntegrationTest.java
index b53236a9c..16f39cbcb 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueDataOnDemand.java
index a2762fe3d..efa036550 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueDataOnDemand.java
@@ -9,8 +9,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueIntegrationTest.java
index 4a9d8a7a8..6522b9e3c 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/AuthorDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/AuthorDataOnDemand.java
index 48792e4a1..f510a6e52 100755
--- a/src/test/java/com/labsynch/labseer/domain/AuthorDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/AuthorDataOnDemand.java
@@ -8,8 +8,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
 
diff --git a/src/test/java/com/labsynch/labseer/domain/AuthorIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/AuthorIntegrationTest.java
index 4896e4dae..ef16c1538 100755
--- a/src/test/java/com/labsynch/labseer/domain/AuthorIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/AuthorIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/AuthorTest.java b/src/test/java/com/labsynch/labseer/domain/AuthorTest.java
index 3853a99be..bf637bfc8 100755
--- a/src/test/java/com/labsynch/labseer/domain/AuthorTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/AuthorTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ContainerDataOnDemand.java
index 5a5e45a23..c5c1c4f84 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerDataOnDemand.java
@@ -8,8 +8,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
 
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ContainerIntegrationTest.java
index 3bc979fd3..5b4033aa7 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ContainerKindDataOnDemand.java
index fff90356d..5d5c8807c 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerKindDataOnDemand.java
@@ -5,8 +5,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ContainerKindIntegrationTest.java
index 9c019997a..21e700577 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerKindIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerLabelDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ContainerLabelDataOnDemand.java
index d46bf1ed8..2dcf971a3 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerLabelDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerLabelDataOnDemand.java
@@ -8,8 +8,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerLabelIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ContainerLabelIntegrationTest.java
index 4a54b71ca..51a8d35a5 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerLabelIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerLabelIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ContainerStateDataOnDemand.java
index 13c44f4dc..4e5c0dbcf 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerStateDataOnDemand.java
@@ -8,8 +8,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ContainerStateIntegrationTest.java
index f12d38e50..bafb2b1e1 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerStateIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ContainerTypeDataOnDemand.java
index 24d83692a..ef7d56cdd 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerTypeDataOnDemand.java
@@ -5,8 +5,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
 
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ContainerTypeIntegrationTest.java
index dca1eb07c..bc2fbdc14 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerTypeIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ContainerValueDataOnDemand.java
index c34d4033a..ac9e3010e 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerValueDataOnDemand.java
@@ -9,8 +9,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ContainerValueIntegrationTest.java
index c8e0f5c57..4228f785f 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerValueIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ExperimentDataOnDemand.java
index ec4ba0bfc..6130eaf5e 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentDataOnDemand.java
@@ -8,8 +8,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ExperimentIntegrationTest.java
index 8af8fe477..793f9fbcc 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ExperimentKindDataOnDemand.java
index b25b5a340..2c8794b6f 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentKindDataOnDemand.java
@@ -5,8 +5,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ExperimentKindIntegrationTest.java
index 0d93839d4..8c1a96e51 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentKindIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentLabelDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ExperimentLabelDataOnDemand.java
index 9f4c60ac0..897665196 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentLabelDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentLabelDataOnDemand.java
@@ -8,8 +8,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentLabelIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ExperimentLabelIntegrationTest.java
index 46ab0d9cd..05062f61b 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentLabelIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentLabelIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ExperimentStateDataOnDemand.java
index 0c834bb82..8a4825016 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentStateDataOnDemand.java
@@ -8,8 +8,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ExperimentStateIntegrationTest.java
index ce85f27b8..512a4fdcd 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentStateIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ExperimentTypeDataOnDemand.java
index 34157ecd5..66b026a92 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentTypeDataOnDemand.java
@@ -5,8 +5,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
 
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ExperimentTypeIntegrationTest.java
index 38797fb4e..492625c35 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentTypeIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ExperimentValueDataOnDemand.java
index 7a1f5c100..23a934a6a 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentValueDataOnDemand.java
@@ -9,8 +9,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ExperimentValueIntegrationTest.java
index d28f94983..8b3e5c58d 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentValueIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/InteractionKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/InteractionKindDataOnDemand.java
index 6b4040beb..23285d140 100755
--- a/src/test/java/com/labsynch/labseer/domain/InteractionKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/InteractionKindDataOnDemand.java
@@ -5,8 +5,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/InteractionKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/InteractionKindIntegrationTest.java
index b564f765f..a487d033e 100755
--- a/src/test/java/com/labsynch/labseer/domain/InteractionKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/InteractionKindIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/InteractionTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/InteractionTypeDataOnDemand.java
index 717704c55..d760cef0d 100755
--- a/src/test/java/com/labsynch/labseer/domain/InteractionTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/InteractionTypeDataOnDemand.java
@@ -5,8 +5,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
 
diff --git a/src/test/java/com/labsynch/labseer/domain/InteractionTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/InteractionTypeIntegrationTest.java
index 0420c8ab4..822fef6df 100755
--- a/src/test/java/com/labsynch/labseer/domain/InteractionTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/InteractionTypeIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerDataOnDemand.java
index e580fc450..103f2a710 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerDataOnDemand.java
@@ -8,8 +8,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerIntegrationTest.java
index 524562c29..8fea5d0c2 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateDataOnDemand.java
index c630a4990..82bb81c74 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateDataOnDemand.java
@@ -8,8 +8,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateIntegrationTest.java
index 2c45ae5c3..cc6e184e9 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueDataOnDemand.java
index 6eeff81e6..d25e92935 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueDataOnDemand.java
@@ -9,8 +9,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueIntegrationTest.java
index a6af32144..0fd65d429 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerDataOnDemand.java
index b83378f7f..a0b09da81 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerDataOnDemand.java
@@ -8,8 +8,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerIntegrationTest.java
index 1b5c06c1d..c7f527804 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateDataOnDemand.java
index ea54b37af..59fdd7692 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateDataOnDemand.java
@@ -8,8 +8,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateIntegrationTest.java
index 3c7e74b5c..8bf932e4c 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueDataOnDemand.java
index e3dba7a01..8988fde19 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueDataOnDemand.java
@@ -9,8 +9,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueIntegrationTest.java
index 7f4c15f3c..252cb938f 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/LabelKindDataOnDemand.java
index 367ede51c..a088d5e69 100755
--- a/src/test/java/com/labsynch/labseer/domain/LabelKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/LabelKindDataOnDemand.java
@@ -5,8 +5,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/LabelKindIntegrationTest.java
index 4b45e8ef4..b3aa428ae 100755
--- a/src/test/java/com/labsynch/labseer/domain/LabelKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/LabelKindIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelSequenceDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/LabelSequenceDataOnDemand.java
index efa971baf..e492275ad 100755
--- a/src/test/java/com/labsynch/labseer/domain/LabelSequenceDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/LabelSequenceDataOnDemand.java
@@ -8,8 +8,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
 
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelSequenceIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/LabelSequenceIntegrationTest.java
index 303a39f29..563e54697 100755
--- a/src/test/java/com/labsynch/labseer/domain/LabelSequenceIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/LabelSequenceIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/LabelTypeDataOnDemand.java
index 1c4a197ba..fa200bf70 100755
--- a/src/test/java/com/labsynch/labseer/domain/LabelTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/LabelTypeDataOnDemand.java
@@ -5,8 +5,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
 
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/LabelTypeIntegrationTest.java
index 462007fad..e3fea7897 100755
--- a/src/test/java/com/labsynch/labseer/domain/LabelTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/LabelTypeIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/LsInteractionDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/LsInteractionDataOnDemand.java
index 08a0a2360..ca8a2da41 100755
--- a/src/test/java/com/labsynch/labseer/domain/LsInteractionDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/LsInteractionDataOnDemand.java
@@ -8,8 +8,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
 
diff --git a/src/test/java/com/labsynch/labseer/domain/LsInteractionIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/LsInteractionIntegrationTest.java
index 35c91551a..d850a6905 100755
--- a/src/test/java/com/labsynch/labseer/domain/LsInteractionIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/LsInteractionIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/LsTransactionDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/LsTransactionDataOnDemand.java
index 5fac5938b..d9db92728 100755
--- a/src/test/java/com/labsynch/labseer/domain/LsTransactionDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/LsTransactionDataOnDemand.java
@@ -8,8 +8,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
 
diff --git a/src/test/java/com/labsynch/labseer/domain/LsTransactionIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/LsTransactionIntegrationTest.java
index aa1f87969..fc97dd075 100755
--- a/src/test/java/com/labsynch/labseer/domain/LsTransactionIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/LsTransactionIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/OperatorTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/OperatorTypeDataOnDemand.java
index e5e31891b..a8bdfe3bb 100755
--- a/src/test/java/com/labsynch/labseer/domain/OperatorTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/OperatorTypeDataOnDemand.java
@@ -5,8 +5,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
 
diff --git a/src/test/java/com/labsynch/labseer/domain/OperatorTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/OperatorTypeIntegrationTest.java
index 2909e8ef7..ed841577e 100755
--- a/src/test/java/com/labsynch/labseer/domain/OperatorTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/OperatorTypeIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ProtocolDataOnDemand.java
index fc1075821..35cb00cc9 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolDataOnDemand.java
@@ -8,8 +8,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
 
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ProtocolIntegrationTest.java
index 249ad0b32..9ba1e6c17 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ProtocolKindDataOnDemand.java
index e715c0038..c654b78d9 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolKindDataOnDemand.java
@@ -5,8 +5,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ProtocolKindIntegrationTest.java
index e4230d1d5..985efc806 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolKindIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolLabelDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ProtocolLabelDataOnDemand.java
index f111b5f56..ade292bc5 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolLabelDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolLabelDataOnDemand.java
@@ -8,8 +8,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolLabelIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ProtocolLabelIntegrationTest.java
index 6f83565ca..540b414c7 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolLabelIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolLabelIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ProtocolStateDataOnDemand.java
index d4c01a2f1..c157f11b6 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolStateDataOnDemand.java
@@ -8,8 +8,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ProtocolStateIntegrationTest.java
index 135f87657..21912c292 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolStateIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ProtocolTypeDataOnDemand.java
index f884f29db..2826818b5 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolTypeDataOnDemand.java
@@ -5,8 +5,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
 
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ProtocolTypeIntegrationTest.java
index 5fd0d4155..cb3215609 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolTypeIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ProtocolValueDataOnDemand.java
index e98d2bda9..22a5a7346 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolValueDataOnDemand.java
@@ -9,8 +9,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ProtocolValueIntegrationTest.java
index 763038c7e..ec13826f5 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolValueIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/StateKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/StateKindDataOnDemand.java
index e520e8fd0..33c9a542b 100755
--- a/src/test/java/com/labsynch/labseer/domain/StateKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/StateKindDataOnDemand.java
@@ -5,8 +5,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/StateKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/StateKindIntegrationTest.java
index 35b2222e7..023cff53e 100755
--- a/src/test/java/com/labsynch/labseer/domain/StateKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/StateKindIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/StateTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/StateTypeDataOnDemand.java
index 2cb9a780c..c06de5624 100755
--- a/src/test/java/com/labsynch/labseer/domain/StateTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/StateTypeDataOnDemand.java
@@ -5,8 +5,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
 
diff --git a/src/test/java/com/labsynch/labseer/domain/StateTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/StateTypeIntegrationTest.java
index 929a6f19f..7765e5744 100755
--- a/src/test/java/com/labsynch/labseer/domain/StateTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/StateTypeIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/SubjectDataOnDemand.java
index 721b9b4fc..b0eff0f8d 100755
--- a/src/test/java/com/labsynch/labseer/domain/SubjectDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/SubjectDataOnDemand.java
@@ -8,8 +8,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
 
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/SubjectIntegrationTest.java
index 6e2da7ace..b22c5476f 100755
--- a/src/test/java/com/labsynch/labseer/domain/SubjectIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/SubjectIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/SubjectStateDataOnDemand.java
index e14bfe699..a6f36c9dd 100755
--- a/src/test/java/com/labsynch/labseer/domain/SubjectStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/SubjectStateDataOnDemand.java
@@ -8,8 +8,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/SubjectStateIntegrationTest.java
index b50834110..52f0da078 100755
--- a/src/test/java/com/labsynch/labseer/domain/SubjectStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/SubjectStateIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/SubjectValueDataOnDemand.java
index e70faa228..058af569f 100755
--- a/src/test/java/com/labsynch/labseer/domain/SubjectValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/SubjectValueDataOnDemand.java
@@ -9,8 +9,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/SubjectValueIntegrationTest.java
index 01c0e839a..08c1bb1da 100755
--- a/src/test/java/com/labsynch/labseer/domain/SubjectValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/SubjectValueIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ThingKindDataOnDemand.java
index e303ec5e2..70761e0ec 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingKindDataOnDemand.java
@@ -5,8 +5,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ThingKindIntegrationTest.java
index 05be64fd6..5b466f3b0 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingKindIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveDataOnDemand.java
index f27aef11f..2eecfc49d 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveDataOnDemand.java
@@ -8,8 +8,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
 
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveIntegrationTest.java
index 439cd5490..d2b5cddb8 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingPageDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ThingPageDataOnDemand.java
index 26a5c9885..cba602af4 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingPageDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingPageDataOnDemand.java
@@ -8,8 +8,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingPageIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ThingPageIntegrationTest.java
index f86430532..fa2ec1299 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingPageIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingPageIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ThingTypeDataOnDemand.java
index 267622775..222ccafe4 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingTypeDataOnDemand.java
@@ -5,8 +5,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
 
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ThingTypeIntegrationTest.java
index 8780fb715..57579ce81 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingTypeIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupDataOnDemand.java
index 8d46f10a8..4705bd212 100755
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupDataOnDemand.java
@@ -8,8 +8,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
 
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupIntegrationTest.java
index 864d88a4d..979203367 100755
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateDataOnDemand.java
index b878fe53a..2f3d11d95 100755
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateDataOnDemand.java
@@ -8,8 +8,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateIntegrationTest.java
index 643010029..ece87353f 100755
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueDataOnDemand.java
index a6fc38b1b..e8bf9d5df 100755
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueDataOnDemand.java
@@ -9,8 +9,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueIntegrationTest.java
index fb762a196..f4a8d058f 100755
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/UnitKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/UnitKindDataOnDemand.java
index 28ae0a70f..f32d0cb94 100755
--- a/src/test/java/com/labsynch/labseer/domain/UnitKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/UnitKindDataOnDemand.java
@@ -5,8 +5,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/UnitKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/UnitKindIntegrationTest.java
index 267d45dce..d6aafaa04 100755
--- a/src/test/java/com/labsynch/labseer/domain/UnitKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/UnitKindIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/UnitTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/UnitTypeDataOnDemand.java
index e7e9559ec..044f773bd 100755
--- a/src/test/java/com/labsynch/labseer/domain/UnitTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/UnitTypeDataOnDemand.java
@@ -5,8 +5,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
 
diff --git a/src/test/java/com/labsynch/labseer/domain/UnitTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/UnitTypeIntegrationTest.java
index 9a2865408..0f9b73ed5 100755
--- a/src/test/java/com/labsynch/labseer/domain/UnitTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/UnitTypeIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/UpdateLogDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/UpdateLogDataOnDemand.java
index 1777fdc3a..e9a88c945 100755
--- a/src/test/java/com/labsynch/labseer/domain/UpdateLogDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/UpdateLogDataOnDemand.java
@@ -8,8 +8,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
 
diff --git a/src/test/java/com/labsynch/labseer/domain/UpdateLogIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/UpdateLogIntegrationTest.java
index 2b30bf3c4..09a6515ba 100755
--- a/src/test/java/com/labsynch/labseer/domain/UpdateLogIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/UpdateLogIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ValueKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ValueKindDataOnDemand.java
index f3ab78a0e..44cd83207 100755
--- a/src/test/java/com/labsynch/labseer/domain/ValueKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ValueKindDataOnDemand.java
@@ -5,8 +5,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
diff --git a/src/test/java/com/labsynch/labseer/domain/ValueKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ValueKindIntegrationTest.java
index 8c1dfdd2a..8c6e63d71 100755
--- a/src/test/java/com/labsynch/labseer/domain/ValueKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ValueKindIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domain/ValueTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ValueTypeDataOnDemand.java
index c62c6dd72..5efc11909 100755
--- a/src/test/java/com/labsynch/labseer/domain/ValueTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ValueTypeDataOnDemand.java
@@ -5,8 +5,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
 
diff --git a/src/test/java/com/labsynch/labseer/domain/ValueTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ValueTypeIntegrationTest.java
index 3113a0768..083525d24 100755
--- a/src/test/java/com/labsynch/labseer/domain/ValueTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ValueTypeIntegrationTest.java
@@ -2,8 +2,10 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/com/labsynch/labseer/domainImpl/AnalysisGroupValueTest.java b/src/test/java/com/labsynch/labseer/domainImpl/AnalysisGroupValueTest.java
index 847f90ba2..4e7a17e98 100644
--- a/src/test/java/com/labsynch/labseer/domainImpl/AnalysisGroupValueTest.java
+++ b/src/test/java/com/labsynch/labseer/domainImpl/AnalysisGroupValueTest.java
@@ -7,6 +7,12 @@
 
 import javax.persistence.NoResultException;
 
+import com.labsynch.labseer.domain.AnalysisGroupValue;
+import com.labsynch.labseer.domain.Experiment;
+import com.labsynch.labseer.domain.LsThing;
+import com.labsynch.labseer.dto.AnalysisGroupValueDTO;
+import com.labsynch.labseer.dto.ExperimentSearchRequestDTO;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -16,12 +22,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.dto.AnalysisGroupValueDTO;
-import com.labsynch.labseer.dto.ExperimentSearchRequestDTO;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
 @Configurable
diff --git a/src/test/java/com/labsynch/labseer/domainImpl/ExperimentStateTest.java b/src/test/java/com/labsynch/labseer/domainImpl/ExperimentStateTest.java
index 4d6550044..5199aba04 100644
--- a/src/test/java/com/labsynch/labseer/domainImpl/ExperimentStateTest.java
+++ b/src/test/java/com/labsynch/labseer/domainImpl/ExperimentStateTest.java
@@ -5,6 +5,9 @@
 
 import javax.persistence.NoResultException;
 
+import com.labsynch.labseer.domain.Experiment;
+import com.labsynch.labseer.domain.ExperimentState;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -14,9 +17,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentState;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
 @Configurable
diff --git a/src/test/java/com/labsynch/labseer/domainImpl/ExperimentTest.java b/src/test/java/com/labsynch/labseer/domainImpl/ExperimentTest.java
index 3d7e15467..09642ae75 100644
--- a/src/test/java/com/labsynch/labseer/domainImpl/ExperimentTest.java
+++ b/src/test/java/com/labsynch/labseer/domainImpl/ExperimentTest.java
@@ -2,6 +2,9 @@
 
 import java.util.List;
 
+import com.labsynch.labseer.domain.Experiment;
+import com.labsynch.labseer.domain.Protocol;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -11,9 +14,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.Protocol;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
 @Configurable
diff --git a/src/test/java/com/labsynch/labseer/domainImpl/ExperimentValueTest.java b/src/test/java/com/labsynch/labseer/domainImpl/ExperimentValueTest.java
index d263cfaf0..98026168a 100644
--- a/src/test/java/com/labsynch/labseer/domainImpl/ExperimentValueTest.java
+++ b/src/test/java/com/labsynch/labseer/domainImpl/ExperimentValueTest.java
@@ -5,6 +5,9 @@
 
 import javax.persistence.NoResultException;
 
+import com.labsynch.labseer.domain.Experiment;
+import com.labsynch.labseer.domain.ExperimentValue;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -14,9 +17,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentValue;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
 @Configurable
diff --git a/src/test/java/com/labsynch/labseer/domainImpl/ItxLsThingsTest.java b/src/test/java/com/labsynch/labseer/domainImpl/ItxLsThingsTest.java
index 82de270c2..4dab91529 100644
--- a/src/test/java/com/labsynch/labseer/domainImpl/ItxLsThingsTest.java
+++ b/src/test/java/com/labsynch/labseer/domainImpl/ItxLsThingsTest.java
@@ -2,6 +2,9 @@
 
 import java.util.List;
 
+import com.labsynch.labseer.domain.ItxLsThingLsThing;
+import com.labsynch.labseer.domain.LsThing;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -11,9 +14,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.ItxLsThingLsThing;
-import com.labsynch.labseer.domain.LsThing;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
 @Configurable
diff --git a/src/test/java/com/labsynch/labseer/domainImpl/LsThingTest.java b/src/test/java/com/labsynch/labseer/domainImpl/LsThingTest.java
index 949873b2b..73e2d8b2c 100644
--- a/src/test/java/com/labsynch/labseer/domainImpl/LsThingTest.java
+++ b/src/test/java/com/labsynch/labseer/domainImpl/LsThingTest.java
@@ -6,6 +6,11 @@
 
 import javax.persistence.NoResultException;
 
+import com.labsynch.labseer.domain.AnalysisGroupValue;
+import com.labsynch.labseer.domain.Experiment;
+import com.labsynch.labseer.domain.LsTag;
+import com.labsynch.labseer.domain.LsThing;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -15,11 +20,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.LsTag;
-import com.labsynch.labseer.domain.LsThing;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
 @Configurable
diff --git a/src/test/java/com/labsynch/labseer/domainImpl/SubjectValueTest.java b/src/test/java/com/labsynch/labseer/domainImpl/SubjectValueTest.java
index c5cb3ac6e..5a03e5e28 100644
--- a/src/test/java/com/labsynch/labseer/domainImpl/SubjectValueTest.java
+++ b/src/test/java/com/labsynch/labseer/domainImpl/SubjectValueTest.java
@@ -5,6 +5,9 @@
 
 import javax.persistence.NoResultException;
 
+import com.labsynch.labseer.domain.Experiment;
+import com.labsynch.labseer.domain.SubjectValue;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -14,11 +17,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.domain.TreatmentGroupValue;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
 @Configurable
diff --git a/src/test/java/com/labsynch/labseer/domainImpl/TreatmentGroupValueTest.java b/src/test/java/com/labsynch/labseer/domainImpl/TreatmentGroupValueTest.java
index 78a65707d..9d88770a9 100644
--- a/src/test/java/com/labsynch/labseer/domainImpl/TreatmentGroupValueTest.java
+++ b/src/test/java/com/labsynch/labseer/domainImpl/TreatmentGroupValueTest.java
@@ -5,6 +5,9 @@
 
 import javax.persistence.NoResultException;
 
+import com.labsynch.labseer.domain.Experiment;
+import com.labsynch.labseer.domain.TreatmentGroupValue;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -14,10 +17,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.domain.TreatmentGroupValue;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
 @Configurable
diff --git a/src/test/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTOTest.java b/src/test/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTOTest.java
index b8df89a07..473e4adae 100644
--- a/src/test/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTOTest.java
+++ b/src/test/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTOTest.java
@@ -4,8 +4,6 @@
 import java.util.Collection;
 import java.util.HashSet;
 
-import junit.framework.Assert;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -15,6 +13,8 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
+import junit.framework.Assert;
+
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
diff --git a/src/test/java/com/labsynch/labseer/dto/CodeTableDTOTest.java b/src/test/java/com/labsynch/labseer/dto/CodeTableDTOTest.java
index 001dca712..7124d9cfd 100644
--- a/src/test/java/com/labsynch/labseer/dto/CodeTableDTOTest.java
+++ b/src/test/java/com/labsynch/labseer/dto/CodeTableDTOTest.java
@@ -3,8 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.Assert;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -13,6 +11,8 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import junit.framework.Assert;
+
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
diff --git a/src/test/java/com/labsynch/labseer/dto/CurveFitDTOTest.java b/src/test/java/com/labsynch/labseer/dto/CurveFitDTOTest.java
index fc70ea19e..8cfcd7404 100644
--- a/src/test/java/com/labsynch/labseer/dto/CurveFitDTOTest.java
+++ b/src/test/java/com/labsynch/labseer/dto/CurveFitDTOTest.java
@@ -2,10 +2,9 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.ProtocolValue;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -16,7 +15,7 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.ProtocolValue;
+import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
diff --git a/src/test/java/com/labsynch/labseer/dto/FlagWellDTOTest.java b/src/test/java/com/labsynch/labseer/dto/FlagWellDTOTest.java
index 21d24107b..1f5a0bdb1 100644
--- a/src/test/java/com/labsynch/labseer/dto/FlagWellDTOTest.java
+++ b/src/test/java/com/labsynch/labseer/dto/FlagWellDTOTest.java
@@ -2,13 +2,12 @@
 
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
 
 import javax.persistence.EntityManager;
 import javax.persistence.TypedQuery;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.SubjectValue;
+import com.labsynch.labseer.domain.TreatmentGroup;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -19,9 +18,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.domain.TreatmentGroup;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
 @Configurable
diff --git a/src/test/java/com/labsynch/labseer/dto/RawCurveDataDTOTest.java b/src/test/java/com/labsynch/labseer/dto/RawCurveDataDTOTest.java
index ef774f256..1571cc655 100644
--- a/src/test/java/com/labsynch/labseer/dto/RawCurveDataDTOTest.java
+++ b/src/test/java/com/labsynch/labseer/dto/RawCurveDataDTOTest.java
@@ -3,12 +3,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
-
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-import junit.framework.Assert;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -19,7 +13,7 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.SubjectValue;
+import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
diff --git a/src/test/java/com/labsynch/labseer/dto/TgDataDTOTest.java b/src/test/java/com/labsynch/labseer/dto/TgDataDTOTest.java
index acea5c27c..228d3b612 100644
--- a/src/test/java/com/labsynch/labseer/dto/TgDataDTOTest.java
+++ b/src/test/java/com/labsynch/labseer/dto/TgDataDTOTest.java
@@ -2,12 +2,6 @@
 
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
-
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-
-import junit.framework.Assert;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -18,7 +12,7 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.SubjectValue;
+import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
diff --git a/src/test/java/com/labsynch/labseer/dto/ValueTypeKindDTOTest.java b/src/test/java/com/labsynch/labseer/dto/ValueTypeKindDTOTest.java
index cb06323c7..e86e4a63d 100644
--- a/src/test/java/com/labsynch/labseer/dto/ValueTypeKindDTOTest.java
+++ b/src/test/java/com/labsynch/labseer/dto/ValueTypeKindDTOTest.java
@@ -1,22 +1,15 @@
 package com.labsynch.labseer.dto;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Assert;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Configurable;
-import javax.persistence.NoResultException;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.ValueKind;
-import com.labsynch.labseer.domain.ValueType;
+import junit.framework.Assert;
 
 
 @RunWith(SpringJUnit4ClassRunner.class)
diff --git a/src/test/java/com/labsynch/labseer/manytomany/AnalysisGroupTest.java b/src/test/java/com/labsynch/labseer/manytomany/AnalysisGroupTest.java
index 8ced72980..e1d79f501 100644
--- a/src/test/java/com/labsynch/labseer/manytomany/AnalysisGroupTest.java
+++ b/src/test/java/com/labsynch/labseer/manytomany/AnalysisGroupTest.java
@@ -6,9 +6,15 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.persistence.TypedQuery;
-
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.AnalysisGroup;
+import com.labsynch.labseer.domain.Experiment;
+import com.labsynch.labseer.domain.Protocol;
+import com.labsynch.labseer.domain.Subject;
+import com.labsynch.labseer.domain.TreatmentGroup;
+import com.labsynch.labseer.exceptions.NotFoundException;
+import com.labsynch.labseer.exceptions.UniqueNameException;
+import com.labsynch.labseer.service.AnalysisGroupService;
+import com.labsynch.labseer.service.ExperimentService;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -16,23 +22,11 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.orm.jpa.JpaObjectRetrievalFailureException;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.AbstractThing;
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentLabel;
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.exceptions.NotFoundException;
-import com.labsynch.labseer.exceptions.UniqueNameException;
-import com.labsynch.labseer.service.AnalysisGroupService;
-import com.labsynch.labseer.service.ExperimentService;
+import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
diff --git a/src/test/java/com/labsynch/labseer/manytomany/ExperimentStatusTests.java b/src/test/java/com/labsynch/labseer/manytomany/ExperimentStatusTests.java
index 21ab46a53..30bc4964d 100644
--- a/src/test/java/com/labsynch/labseer/manytomany/ExperimentStatusTests.java
+++ b/src/test/java/com/labsynch/labseer/manytomany/ExperimentStatusTests.java
@@ -5,7 +5,15 @@
 import java.util.List;
 import java.util.Set;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.AnalysisGroup;
+import com.labsynch.labseer.domain.Experiment;
+import com.labsynch.labseer.domain.Subject;
+import com.labsynch.labseer.domain.SubjectState;
+import com.labsynch.labseer.domain.SubjectValue;
+import com.labsynch.labseer.domain.TreatmentGroup;
+import com.labsynch.labseer.dto.KeyValueDTO;
+import com.labsynch.labseer.service.AutoLabelService;
+import com.labsynch.labseer.service.ExperimentService;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -17,15 +25,7 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.SubjectState;
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.dto.KeyValueDTO;
-import com.labsynch.labseer.service.AutoLabelService;
-import com.labsynch.labseer.service.ExperimentService;
+import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
diff --git a/src/test/java/com/labsynch/labseer/manytomany/ExperimentTest.java b/src/test/java/com/labsynch/labseer/manytomany/ExperimentTest.java
index 9f620d430..62dab7990 100644
--- a/src/test/java/com/labsynch/labseer/manytomany/ExperimentTest.java
+++ b/src/test/java/com/labsynch/labseer/manytomany/ExperimentTest.java
@@ -7,7 +7,14 @@
 import java.util.List;
 import java.util.Set;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.AnalysisGroup;
+import com.labsynch.labseer.domain.Experiment;
+import com.labsynch.labseer.domain.Protocol;
+import com.labsynch.labseer.domain.Subject;
+import com.labsynch.labseer.domain.TreatmentGroup;
+import com.labsynch.labseer.exceptions.NotFoundException;
+import com.labsynch.labseer.exceptions.UniqueNameException;
+import com.labsynch.labseer.service.ExperimentService;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -19,14 +26,7 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.exceptions.NotFoundException;
-import com.labsynch.labseer.exceptions.UniqueNameException;
-import com.labsynch.labseer.service.ExperimentService;
+import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
diff --git a/src/test/java/com/labsynch/labseer/manytomany/ItxTest.java b/src/test/java/com/labsynch/labseer/manytomany/ItxTest.java
index 01696f758..5b89840a5 100644
--- a/src/test/java/com/labsynch/labseer/manytomany/ItxTest.java
+++ b/src/test/java/com/labsynch/labseer/manytomany/ItxTest.java
@@ -1,22 +1,10 @@
 package com.labsynch.labseer.manytomany;
 
-import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
 
-import junit.framework.Assert;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.labsynch.labseer.domain.AnalysisGroup;
 import com.labsynch.labseer.domain.Container;
 import com.labsynch.labseer.domain.Experiment;
@@ -28,6 +16,17 @@
 import com.labsynch.labseer.domain.Subject;
 import com.labsynch.labseer.domain.TreatmentGroup;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Configurable;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
+
+import junit.framework.Assert;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
 @Configurable
diff --git a/src/test/java/com/labsynch/labseer/manytomany/SubjectTest.java b/src/test/java/com/labsynch/labseer/manytomany/SubjectTest.java
index f21bac821..52df56dfa 100644
--- a/src/test/java/com/labsynch/labseer/manytomany/SubjectTest.java
+++ b/src/test/java/com/labsynch/labseer/manytomany/SubjectTest.java
@@ -7,7 +7,12 @@
 import java.util.List;
 import java.util.Set;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.AnalysisGroup;
+import com.labsynch.labseer.domain.Experiment;
+import com.labsynch.labseer.domain.Protocol;
+import com.labsynch.labseer.domain.Subject;
+import com.labsynch.labseer.domain.TreatmentGroup;
+import com.labsynch.labseer.service.SubjectService;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -19,13 +24,7 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.service.SubjectService;
-import com.labsynch.labseer.service.TreatmentGroupService;
+import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
diff --git a/src/test/java/com/labsynch/labseer/manytomany/TreatmentGroupTest.java b/src/test/java/com/labsynch/labseer/manytomany/TreatmentGroupTest.java
index a64860e5b..721a9e50f 100755
--- a/src/test/java/com/labsynch/labseer/manytomany/TreatmentGroupTest.java
+++ b/src/test/java/com/labsynch/labseer/manytomany/TreatmentGroupTest.java
@@ -6,7 +6,12 @@
 import java.util.List;
 import java.util.Set;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.AnalysisGroup;
+import com.labsynch.labseer.domain.Experiment;
+import com.labsynch.labseer.domain.Protocol;
+import com.labsynch.labseer.domain.Subject;
+import com.labsynch.labseer.domain.TreatmentGroup;
+import com.labsynch.labseer.service.TreatmentGroupService;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -18,12 +23,7 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.service.TreatmentGroupService;
+import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
diff --git a/src/test/java/com/labsynch/labseer/service/AnalysisGroupServiceTests.java b/src/test/java/com/labsynch/labseer/service/AnalysisGroupServiceTests.java
index 4a75c7eb6..b8a97acb1 100755
--- a/src/test/java/com/labsynch/labseer/service/AnalysisGroupServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/AnalysisGroupServiceTests.java
@@ -11,7 +11,12 @@
 import java.util.List;
 import java.util.Set;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.AnalysisGroup;
+import com.labsynch.labseer.domain.Experiment;
+import com.labsynch.labseer.dto.IdCollectionDTO;
+import com.labsynch.labseer.dto.TsvLoaderResponseDTO;
+import com.labsynch.labseer.exceptions.NotFoundException;
+import com.labsynch.labseer.utils.PropertiesUtilService;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -23,14 +28,7 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.dto.IdCollectionDTO;
-import com.labsynch.labseer.dto.TsvLoaderResponseDTO;
-import com.labsynch.labseer.exceptions.NotFoundException;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-
-import flexjson.JSONTokener;
+import junit.framework.Assert;
 
 
 @RunWith(SpringJUnit4ClassRunner.class)
diff --git a/src/test/java/com/labsynch/labseer/service/AnalysisGroupStateServiceTest.java b/src/test/java/com/labsynch/labseer/service/AnalysisGroupStateServiceTest.java
index 2a59d8c5e..153541651 100755
--- a/src/test/java/com/labsynch/labseer/service/AnalysisGroupStateServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/AnalysisGroupStateServiceTest.java
@@ -5,7 +5,9 @@
 import java.util.Collection;
 import java.util.HashSet;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.AnalysisGroup;
+import com.labsynch.labseer.domain.AnalysisGroupState;
+import com.labsynch.labseer.domain.AnalysisGroupValue;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -17,10 +19,7 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.domain.ExperimentState;
+import junit.framework.Assert;
 
 
 @RunWith(SpringJUnit4ClassRunner.class)
diff --git a/src/test/java/com/labsynch/labseer/service/AnalysisGroupValueServiceTest.java b/src/test/java/com/labsynch/labseer/service/AnalysisGroupValueServiceTest.java
index f9da979f9..4ce3da303 100755
--- a/src/test/java/com/labsynch/labseer/service/AnalysisGroupValueServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/AnalysisGroupValueServiceTest.java
@@ -15,13 +15,22 @@
 
 import javax.persistence.NoResultException;
 
-
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.labsynch.labseer.domain.AnalysisGroup;
+import com.labsynch.labseer.domain.AnalysisGroupState;
+import com.labsynch.labseer.domain.AnalysisGroupValue;
+import com.labsynch.labseer.domain.Experiment;
+import com.labsynch.labseer.domain.LsThing;
+import com.labsynch.labseer.domain.LsThingLabel;
+import com.labsynch.labseer.dto.AnalysisGroupValueDTO;
+import com.labsynch.labseer.dto.PreferredNameDTO;
+import com.labsynch.labseer.dto.PreferredNameResultsDTO;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -33,18 +42,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentValue;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.LsThingLabel;
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.dto.AnalysisGroupValueDTO;
-import com.labsynch.labseer.dto.PreferredNameDTO;
-import com.labsynch.labseer.dto.PreferredNameResultsDTO;
-
 import flexjson.JSONTokener;
 
 
diff --git a/src/test/java/com/labsynch/labseer/service/AnalysisGroupValueServiceTest2.java b/src/test/java/com/labsynch/labseer/service/AnalysisGroupValueServiceTest2.java
index 770119086..eb35f6602 100644
--- a/src/test/java/com/labsynch/labseer/service/AnalysisGroupValueServiceTest2.java
+++ b/src/test/java/com/labsynch/labseer/service/AnalysisGroupValueServiceTest2.java
@@ -2,26 +2,13 @@
 
 package com.labsynch.labseer.service;
 
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashSet;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
-import javax.persistence.NoResultException;
+import com.labsynch.labseer.dto.AnalysisGroupValueDTO;
+import com.labsynch.labseer.dto.ExperimentSearchRequestDTO;
 
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -30,22 +17,6 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentValue;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.LsThingLabel;
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.dto.AnalysisGroupValueDTO;
-import com.labsynch.labseer.dto.ExperimentSearchRequestDTO;
-import com.labsynch.labseer.dto.PreferredNameDTO;
-import com.labsynch.labseer.dto.PreferredNameResultsDTO;
-
-import flexjson.JSONTokener;
 
 
 @RunWith(SpringJUnit4ClassRunner.class)
diff --git a/src/test/java/com/labsynch/labseer/service/AuthorServiceTests.java b/src/test/java/com/labsynch/labseer/service/AuthorServiceTests.java
index edb40bef5..7f7c50ae9 100644
--- a/src/test/java/com/labsynch/labseer/service/AuthorServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/AuthorServiceTests.java
@@ -2,6 +2,11 @@
 
 import java.util.Collection;
 
+import com.labsynch.labseer.domain.Author;
+import com.labsynch.labseer.domain.LsThing;
+import com.labsynch.labseer.dto.AuthGroupsAndProjectsDTO;
+import com.labsynch.labseer.dto.CodeTableDTO;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -12,11 +17,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.dto.AuthGroupsAndProjectsDTO;
-import com.labsynch.labseer.dto.CodeTableDTO;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {
 		"classpath:/META-INF/spring/applicationContext.xml",
diff --git a/src/test/java/com/labsynch/labseer/service/AutoLabelServiceTest.java b/src/test/java/com/labsynch/labseer/service/AutoLabelServiceTest.java
index 6b184168d..7511c81f4 100644
--- a/src/test/java/com/labsynch/labseer/service/AutoLabelServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/AutoLabelServiceTest.java
@@ -3,13 +3,14 @@
  */
 package com.labsynch.labseer.service;
 
-import java.math.BigInteger;
-import java.sql.Timestamp;
 import java.util.Date;
 import java.util.List;
 
 import javax.persistence.NoResultException;
 
+import com.labsynch.labseer.domain.LabelSequence;
+import com.labsynch.labseer.dto.AutoLabelDTO;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -21,10 +22,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.DDictValue;
-import com.labsynch.labseer.domain.LabelSequence;
-import com.labsynch.labseer.dto.AutoLabelDTO;
-
 /**
  * @author fairway
  *
diff --git a/src/test/java/com/labsynch/labseer/service/ContainerLSServiceTests.java b/src/test/java/com/labsynch/labseer/service/ContainerLSServiceTests.java
index 702e746b2..f45d83082 100755
--- a/src/test/java/com/labsynch/labseer/service/ContainerLSServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/ContainerLSServiceTests.java
@@ -10,10 +10,6 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -28,21 +24,6 @@
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 
-import junit.framework.Assert;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Configurable;
-import javax.persistence.NoResultException;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.test.annotation.Rollback;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.labsynch.labseer.domain.AnalysisGroup;
 import com.labsynch.labseer.domain.Container;
 import com.labsynch.labseer.domain.ContainerLabel;
@@ -52,27 +33,23 @@
 import com.labsynch.labseer.domain.ExperimentLabel;
 import com.labsynch.labseer.domain.InteractionKind;
 import com.labsynch.labseer.domain.InteractionType;
-import com.labsynch.labseer.domain.ItxSubjectContainer;
-import com.labsynch.labseer.domain.LabelKind;
-import com.labsynch.labseer.domain.LabelType;
 import com.labsynch.labseer.domain.ItxContainerContainer;
 import com.labsynch.labseer.domain.ItxContainerContainerState;
 import com.labsynch.labseer.domain.ItxContainerContainerValue;
-import com.labsynch.labseer.domain.ItxLsThingLsThing;
-import com.labsynch.labseer.domain.ItxLsThingLsThingState;
-import com.labsynch.labseer.domain.ItxLsThingLsThingValue;
-import com.labsynch.labseer.domain.LsThing;
+import com.labsynch.labseer.domain.ItxSubjectContainer;
+import com.labsynch.labseer.domain.LabelKind;
+import com.labsynch.labseer.domain.LabelType;
 import com.labsynch.labseer.domain.LsTransaction;
 import com.labsynch.labseer.domain.Protocol;
 import com.labsynch.labseer.domain.Subject;
 import com.labsynch.labseer.domain.TreatmentGroup;
 import com.labsynch.labseer.dto.CodeLabelDTO;
 import com.labsynch.labseer.dto.ContainerDependencyCheckDTO;
-import com.labsynch.labseer.dto.ContainerRequestDTO;
 import com.labsynch.labseer.dto.ContainerErrorMessageDTO;
 import com.labsynch.labseer.dto.ContainerLocationDTO;
 import com.labsynch.labseer.dto.ContainerLocationTreeDTO;
 import com.labsynch.labseer.dto.ContainerMiniDTO;
+import com.labsynch.labseer.dto.ContainerRequestDTO;
 import com.labsynch.labseer.dto.ContainerStateMiniDTO;
 import com.labsynch.labseer.dto.ContainerValueRequestDTO;
 import com.labsynch.labseer.dto.CreatePlateRequestDTO;
@@ -87,7 +64,19 @@
 import com.labsynch.labseer.utils.PropertiesUtilService;
 import com.labsynch.labseer.utils.SimpleUtil;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
+import org.springframework.test.annotation.Rollback;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
+
 import flexjson.JSONTokener;
+import junit.framework.Assert;
 
 
 @RunWith(SpringJUnit4ClassRunner.class)
diff --git a/src/test/java/com/labsynch/labseer/service/ContainerLabelJsonServiceTests.java b/src/test/java/com/labsynch/labseer/service/ContainerLabelJsonServiceTests.java
index bba3fbf0b..359e49c59 100755
--- a/src/test/java/com/labsynch/labseer/service/ContainerLabelJsonServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/ContainerLabelJsonServiceTests.java
@@ -6,6 +6,9 @@
 import java.io.StringReader;
 import java.util.Date;
 
+import com.labsynch.labseer.domain.Container;
+import com.labsynch.labseer.domain.ContainerLabel;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -14,9 +17,6 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ContainerLabel;
-
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext.xml")
diff --git a/src/test/java/com/labsynch/labseer/service/CreateAnalysisGroupsFromCSVFileTests.java b/src/test/java/com/labsynch/labseer/service/CreateAnalysisGroupsFromCSVFileTests.java
index 468d7178a..ce4cb48f4 100644
--- a/src/test/java/com/labsynch/labseer/service/CreateAnalysisGroupsFromCSVFileTests.java
+++ b/src/test/java/com/labsynch/labseer/service/CreateAnalysisGroupsFromCSVFileTests.java
@@ -5,6 +5,9 @@
 import java.io.IOException;
 import java.util.Date;
 
+import com.labsynch.labseer.dto.TsvLoaderResponseDTO;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -15,9 +18,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.dto.TsvLoaderResponseDTO;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext*.xml")
diff --git a/src/test/java/com/labsynch/labseer/service/CreateGeneIDsFromCSVFileTests.java b/src/test/java/com/labsynch/labseer/service/CreateGeneIDsFromCSVFileTests.java
index 5bb16f790..414d89949 100755
--- a/src/test/java/com/labsynch/labseer/service/CreateGeneIDsFromCSVFileTests.java
+++ b/src/test/java/com/labsynch/labseer/service/CreateGeneIDsFromCSVFileTests.java
@@ -13,23 +13,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.supercsv.cellprocessor.Optional;
-import org.supercsv.cellprocessor.ParseDate;
-import org.supercsv.cellprocessor.ift.CellProcessor;
-import org.supercsv.io.CsvBeanReader;
-import org.supercsv.io.ICsvBeanReader;
-import org.supercsv.prefs.CsvPreference;
-
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ContainerState;
 import com.labsynch.labseer.domain.LabelKind;
 import com.labsynch.labseer.domain.LabelSequence;
 import com.labsynch.labseer.domain.LabelType;
@@ -48,6 +31,21 @@
 import com.labsynch.labseer.dto.EntrezDbGeneDTO;
 import com.labsynch.labseer.utils.SimpleUtil;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.supercsv.cellprocessor.Optional;
+import org.supercsv.cellprocessor.ParseDate;
+import org.supercsv.cellprocessor.ift.CellProcessor;
+import org.supercsv.io.CsvBeanReader;
+import org.supercsv.io.ICsvBeanReader;
+import org.supercsv.prefs.CsvPreference;
+
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext.xml")
diff --git a/src/test/java/com/labsynch/labseer/service/CreateProjectsTests.java b/src/test/java/com/labsynch/labseer/service/CreateProjectsTests.java
index 0a23f8d46..fae92cdd9 100755
--- a/src/test/java/com/labsynch/labseer/service/CreateProjectsTests.java
+++ b/src/test/java/com/labsynch/labseer/service/CreateProjectsTests.java
@@ -4,22 +4,10 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Configurable;
 import javax.persistence.NoResultException;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.domain.Author;
 import com.labsynch.labseer.domain.AuthorRole;
@@ -42,6 +30,16 @@
 import com.labsynch.labseer.dto.TypeDTO;
 import com.labsynch.labseer.dto.TypeKindDTO;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
+
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
diff --git a/src/test/java/com/labsynch/labseer/service/CronJobServiceTests.java b/src/test/java/com/labsynch/labseer/service/CronJobServiceTests.java
index d30ec9ec5..05edb0e8e 100644
--- a/src/test/java/com/labsynch/labseer/service/CronJobServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/CronJobServiceTests.java
@@ -2,6 +2,8 @@
 
 package com.labsynch.labseer.service;
 
+import com.labsynch.labseer.domain.CronJob;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -13,8 +15,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.CronJob;
-
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
diff --git a/src/test/java/com/labsynch/labseer/service/DataDictionaryCodeNameTest.java b/src/test/java/com/labsynch/labseer/service/DataDictionaryCodeNameTest.java
index e3d1c53a2..30920f0b9 100644
--- a/src/test/java/com/labsynch/labseer/service/DataDictionaryCodeNameTest.java
+++ b/src/test/java/com/labsynch/labseer/service/DataDictionaryCodeNameTest.java
@@ -6,6 +6,8 @@
 import java.util.Collection;
 import java.util.List;
 
+import com.labsynch.labseer.domain.DDictValue;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -16,8 +18,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.DDictValue;
-
 /**
  * @author fairway
  *
diff --git a/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests.java b/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests.java
index 978629c80..b0d8d3301 100755
--- a/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests.java
@@ -11,20 +11,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import junit.framework.Assert;
-
-import org.apache.commons.io.IOUtils;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.test.annotation.Rollback;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.labsynch.labseer.domain.AnalysisGroup;
 import com.labsynch.labseer.domain.AnalysisGroupLabel;
 import com.labsynch.labseer.domain.AnalysisGroupState;
@@ -52,6 +38,20 @@
 import com.labsynch.labseer.exceptions.TooManyResultsException;
 import com.labsynch.labseer.exceptions.UniqueNameException;
 
+import org.apache.commons.io.IOUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
+import org.springframework.test.annotation.Rollback;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
+
+import junit.framework.Assert;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {
 		"classpath:/META-INF/spring/applicationContext.xml",
diff --git a/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests2.java b/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests2.java
index d2e9bc8ed..f88e12f2e 100755
--- a/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests2.java
+++ b/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests2.java
@@ -8,6 +8,17 @@
 import java.util.List;
 import java.util.Set;
 
+import com.labsynch.labseer.domain.AnalysisGroupValue;
+import com.labsynch.labseer.domain.ItxProtocolProtocol;
+import com.labsynch.labseer.domain.Protocol;
+import com.labsynch.labseer.dto.AnalysisGroupValueDTO;
+import com.labsynch.labseer.dto.BatchCodeDTO;
+import com.labsynch.labseer.dto.CodeTableDTO;
+import com.labsynch.labseer.dto.ExperimentFilterDTO;
+import com.labsynch.labseer.dto.ExperimentFilterSearchDTO;
+import com.labsynch.labseer.dto.ExperimentSearchRequestDTO;
+import com.labsynch.labseer.dto.JSTreeNodeDTO;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.junit.Assert;
 import org.junit.Test;
@@ -20,17 +31,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.domain.ItxProtocolProtocol;
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.dto.AnalysisGroupValueDTO;
-import com.labsynch.labseer.dto.BatchCodeDTO;
-import com.labsynch.labseer.dto.CodeTableDTO;
-import com.labsynch.labseer.dto.ExperimentFilterDTO;
-import com.labsynch.labseer.dto.ExperimentFilterSearchDTO;
-import com.labsynch.labseer.dto.ExperimentSearchRequestDTO;
-import com.labsynch.labseer.dto.JSTreeNodeDTO;
-
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
diff --git a/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests3_Nodes.java b/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests3_Nodes.java
index eff217d85..2f73e6893 100644
--- a/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests3_Nodes.java
+++ b/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests3_Nodes.java
@@ -2,12 +2,13 @@
 
 package com.labsynch.labseer.service;
 
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import com.labsynch.labseer.domain.ProtocolValue;
+import com.labsynch.labseer.dto.ExperimentDataDTO;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -18,16 +19,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ProtocolLabel;
-import com.labsynch.labseer.domain.ProtocolState;
-import com.labsynch.labseer.domain.ProtocolValue;
-import com.labsynch.labseer.dto.AnalysisGroupValueDTO;
-import com.labsynch.labseer.dto.ExperimentDataDTO;
-import com.labsynch.labseer.dto.JSTreeNodeDTO;
-
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
diff --git a/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests4_Save.java b/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests4_Save.java
index 2d2e5010d..72ceafe6e 100644
--- a/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests4_Save.java
+++ b/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests4_Save.java
@@ -2,16 +2,17 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.AnalysisGroup;
+import com.labsynch.labseer.domain.Experiment;
+import com.labsynch.labseer.exceptions.NotFoundException;
+import com.labsynch.labseer.exceptions.UniqueNameException;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -19,15 +20,11 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.exceptions.NotFoundException;
-import com.labsynch.labseer.exceptions.UniqueNameException;
+import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {
diff --git a/src/test/java/com/labsynch/labseer/service/ExperimentStateServiceTests.java b/src/test/java/com/labsynch/labseer/service/ExperimentStateServiceTests.java
index 53f742ecf..8b7fa37e7 100644
--- a/src/test/java/com/labsynch/labseer/service/ExperimentStateServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/ExperimentStateServiceTests.java
@@ -8,7 +8,9 @@
 
 import javax.persistence.NoResultException;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.Experiment;
+import com.labsynch.labseer.domain.ExperimentState;
+import com.labsynch.labseer.domain.ExperimentValue;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -20,9 +22,7 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentState;
-import com.labsynch.labseer.domain.ExperimentValue;
+import junit.framework.Assert;
 
 
 @RunWith(SpringJUnit4ClassRunner.class)
diff --git a/src/test/java/com/labsynch/labseer/service/ExperimentValueServiceTests.java b/src/test/java/com/labsynch/labseer/service/ExperimentValueServiceTests.java
index 7a2869e5d..3db6f29cd 100755
--- a/src/test/java/com/labsynch/labseer/service/ExperimentValueServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/ExperimentValueServiceTests.java
@@ -5,6 +5,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.labsynch.labseer.domain.Experiment;
+import com.labsynch.labseer.domain.ExperimentState;
+import com.labsynch.labseer.domain.ExperimentValue;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -16,10 +20,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentState;
-import com.labsynch.labseer.domain.ExperimentValue;
-
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
diff --git a/src/test/java/com/labsynch/labseer/service/GeneDataServiceTests.java b/src/test/java/com/labsynch/labseer/service/GeneDataServiceTests.java
index 0e3b722fa..6a8b032bb 100644
--- a/src/test/java/com/labsynch/labseer/service/GeneDataServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/GeneDataServiceTests.java
@@ -6,9 +6,14 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
+import com.labsynch.labseer.domain.AnalysisGroupValue;
+import com.labsynch.labseer.dto.AnalysisGroupValueDTO;
+import com.labsynch.labseer.dto.PreferredNameDTO;
+import com.labsynch.labseer.dto.PreferredNameRequestDTO;
+import com.labsynch.labseer.dto.PreferredNameResultsDTO;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -17,18 +22,6 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentState;
-import com.labsynch.labseer.domain.ExperimentValue;
-import com.labsynch.labseer.domain.LsThingLabel;
-import com.labsynch.labseer.dto.AnalysisGroupValueDTO;
-import com.labsynch.labseer.dto.GeneIdDTO;
-import com.labsynch.labseer.dto.PreferredNameDTO;
-import com.labsynch.labseer.dto.PreferredNameRequestDTO;
-import com.labsynch.labseer.dto.PreferredNameResultsDTO;
 
 
 @RunWith(SpringJUnit4ClassRunner.class)
diff --git a/src/test/java/com/labsynch/labseer/service/GeneThingServiceTests.java b/src/test/java/com/labsynch/labseer/service/GeneThingServiceTests.java
index d49dd2cd3..f107a1fb1 100755
--- a/src/test/java/com/labsynch/labseer/service/GeneThingServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/GeneThingServiceTests.java
@@ -5,7 +5,12 @@
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
-import java.util.Set;
+
+import com.labsynch.labseer.domain.Experiment;
+import com.labsynch.labseer.domain.ExperimentState;
+import com.labsynch.labseer.domain.ExperimentValue;
+import com.labsynch.labseer.domain.LsThingLabel;
+import com.labsynch.labseer.dto.GeneIdDTO;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -17,12 +22,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentState;
-import com.labsynch.labseer.domain.ExperimentValue;
-import com.labsynch.labseer.domain.LsThingLabel;
-import com.labsynch.labseer.dto.GeneIdDTO;
-
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext*.xml")
diff --git a/src/test/java/com/labsynch/labseer/service/ItxLsThingLsThingServiceTests.java b/src/test/java/com/labsynch/labseer/service/ItxLsThingLsThingServiceTests.java
index d78ea9205..11147d2f5 100644
--- a/src/test/java/com/labsynch/labseer/service/ItxLsThingLsThingServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/ItxLsThingLsThingServiceTests.java
@@ -4,7 +4,10 @@
 
 import java.util.Set;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.ItxLsThingLsThing;
+import com.labsynch.labseer.domain.ItxLsThingLsThingState;
+import com.labsynch.labseer.domain.ItxLsThingLsThingValue;
+import com.labsynch.labseer.utils.PropertiesUtilService;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -17,10 +20,7 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.ItxLsThingLsThing;
-import com.labsynch.labseer.domain.ItxLsThingLsThingState;
-import com.labsynch.labseer.domain.ItxLsThingLsThingValue;
-import com.labsynch.labseer.utils.PropertiesUtilService;
+import junit.framework.Assert;
 
 
 @RunWith(SpringJUnit4ClassRunner.class)
diff --git a/src/test/java/com/labsynch/labseer/service/ItxSubjectContainerServiceTest.java b/src/test/java/com/labsynch/labseer/service/ItxSubjectContainerServiceTest.java
index 5bbad0ac9..f38a84bff 100644
--- a/src/test/java/com/labsynch/labseer/service/ItxSubjectContainerServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/ItxSubjectContainerServiceTest.java
@@ -2,10 +2,7 @@
 
 package com.labsynch.labseer.service;
 
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import com.labsynch.labseer.domain.ItxSubjectContainer;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -18,15 +15,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.ItxSubjectContainer;
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.SubjectLabel;
-import com.labsynch.labseer.domain.SubjectState;
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.dto.SubjectDTO;
-import com.labsynch.labseer.dto.SubjectLabelDTO;
-import com.labsynch.labseer.dto.SubjectStateDTO;
-
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
diff --git a/src/test/java/com/labsynch/labseer/service/LsThingGeneServiceTests.java b/src/test/java/com/labsynch/labseer/service/LsThingGeneServiceTests.java
index d06dec921..0e82ac2e1 100644
--- a/src/test/java/com/labsynch/labseer/service/LsThingGeneServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/LsThingGeneServiceTests.java
@@ -12,6 +12,13 @@
 import java.util.List;
 import java.util.Set;
 
+import com.labsynch.labseer.domain.AnalysisGroupValue;
+import com.labsynch.labseer.dto.AnalysisGroupValueDTO;
+import com.labsynch.labseer.dto.ExperimentSearchRequestDTO;
+import com.labsynch.labseer.dto.PreferredNameDTO;
+import com.labsynch.labseer.dto.PreferredNameResultsDTO;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -28,13 +35,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.dto.AnalysisGroupValueDTO;
-import com.labsynch.labseer.dto.ExperimentSearchRequestDTO;
-import com.labsynch.labseer.dto.PreferredNameDTO;
-import com.labsynch.labseer.dto.PreferredNameResultsDTO;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-
 import flexjson.JSONDeserializer;
 
 
diff --git a/src/test/java/com/labsynch/labseer/service/LsThingPreferredIdServiceTests.java b/src/test/java/com/labsynch/labseer/service/LsThingPreferredIdServiceTests.java
index 067af79d3..c1ca51e52 100644
--- a/src/test/java/com/labsynch/labseer/service/LsThingPreferredIdServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/LsThingPreferredIdServiceTests.java
@@ -2,13 +2,13 @@
 
 package com.labsynch.labseer.service;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
+
+import com.labsynch.labseer.dto.PreferredNameDTO;
+import com.labsynch.labseer.dto.PreferredNameRequestDTO;
+import com.labsynch.labseer.dto.PreferredNameResultsDTO;
+import com.labsynch.labseer.utils.PropertiesUtilService;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -17,33 +17,8 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
-import javax.persistence.NoResultException;
-import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.labsynch.labseer.domain.InteractionType;
-import com.labsynch.labseer.domain.ItxLsThingLsThing;
-import com.labsynch.labseer.domain.ItxLsThingLsThingState;
-import com.labsynch.labseer.domain.ItxLsThingLsThingValue;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.LsThingLabel;
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ThingKind;
-import com.labsynch.labseer.domain.ThingType;
-import com.labsynch.labseer.dto.LsThingValidationDTO;
-import com.labsynch.labseer.dto.PreferredNameDTO;
-import com.labsynch.labseer.dto.PreferredNameRequestDTO;
-import com.labsynch.labseer.dto.PreferredNameResultsDTO;
-import com.labsynch.labseer.dto.ValuePathDTO;
-import com.labsynch.labseer.dto.ValueRuleDTO;
-import com.labsynch.labseer.exceptions.ErrorMessage;
-import com.labsynch.labseer.exceptions.UniqueNameException;
-import com.labsynch.labseer.utils.ExcludeNulls;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-
-import flexjson.JSONSerializer;
 
 
 @RunWith(SpringJUnit4ClassRunner.class)
diff --git a/src/test/java/com/labsynch/labseer/service/LsThingServicePutTests.java b/src/test/java/com/labsynch/labseer/service/LsThingServicePutTests.java
index 4a1a6419d..b7a08f359 100644
--- a/src/test/java/com/labsynch/labseer/service/LsThingServicePutTests.java
+++ b/src/test/java/com/labsynch/labseer/service/LsThingServicePutTests.java
@@ -5,6 +5,10 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import com.labsynch.labseer.domain.ItxLsThingLsThing;
+import com.labsynch.labseer.domain.LsThing;
+import com.labsynch.labseer.utils.PropertiesUtilService;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -15,10 +19,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.ItxLsThingLsThing;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.utils.PropertiesUtilService;
-
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
diff --git a/src/test/java/com/labsynch/labseer/service/LsThingServiceTests.java b/src/test/java/com/labsynch/labseer/service/LsThingServiceTests.java
index 79614c112..3b9e61579 100755
--- a/src/test/java/com/labsynch/labseer/service/LsThingServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/LsThingServiceTests.java
@@ -10,27 +10,11 @@
 import java.util.List;
 import java.util.Set;
 
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Configurable;
-import javax.persistence.NoResultException;
-import org.springframework.test.annotation.Rollback;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.labsynch.labseer.domain.InteractionType;
 import com.labsynch.labseer.domain.ItxLsThingLsThing;
 import com.labsynch.labseer.domain.ItxLsThingLsThingState;
 import com.labsynch.labseer.domain.ItxLsThingLsThingValue;
 import com.labsynch.labseer.domain.LsThing;
 import com.labsynch.labseer.domain.LsThingLabel;
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ChemStructure;
 import com.labsynch.labseer.domain.ThingKind;
 import com.labsynch.labseer.domain.ThingType;
 import com.labsynch.labseer.dto.CodeTypeKindDTO;
@@ -42,13 +26,24 @@
 import com.labsynch.labseer.dto.StoichiometryPropertiesResultsDTO;
 import com.labsynch.labseer.dto.ValuePathDTO;
 import com.labsynch.labseer.dto.ValueRuleDTO;
-import com.labsynch.labseer.exceptions.ErrorMessage;
 import com.labsynch.labseer.exceptions.LsThingValidationErrorMessage;
 import com.labsynch.labseer.exceptions.UniqueNameException;
 import com.labsynch.labseer.service.ChemStructureService.SearchType;
 import com.labsynch.labseer.utils.ExcludeNulls;
 import com.labsynch.labseer.utils.PropertiesUtilService;
 
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
+import org.springframework.test.annotation.Rollback;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
+
 import flexjson.JSONSerializer;
 
 
diff --git a/src/test/java/com/labsynch/labseer/service/LsThingStateServiceTest.java b/src/test/java/com/labsynch/labseer/service/LsThingStateServiceTest.java
index 706223b14..ee0bd71b6 100644
--- a/src/test/java/com/labsynch/labseer/service/LsThingStateServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/LsThingStateServiceTest.java
@@ -1,6 +1,6 @@
 package com.labsynch.labseer.service;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.LsThingState;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -12,7 +12,7 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.LsThingState;
+import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
diff --git a/src/test/java/com/labsynch/labseer/service/LsThingValueServiceTest.java b/src/test/java/com/labsynch/labseer/service/LsThingValueServiceTest.java
index f73773f6d..02a9410a8 100644
--- a/src/test/java/com/labsynch/labseer/service/LsThingValueServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/LsThingValueServiceTest.java
@@ -2,27 +2,8 @@
 
 package com.labsynch.labseer.service;
 
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.NoResultException;
-
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.LsThingValue;
 
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -33,19 +14,7 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.LsThingLabel;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.LsThingValue;
-import com.labsynch.labseer.dto.AnalysisGroupValueDTO;
-import com.labsynch.labseer.dto.PreferredNameDTO;
-import com.labsynch.labseer.dto.PreferredNameResultsDTO;
-
-import flexjson.JSONTokener;
+import junit.framework.Assert;
 
 
 @RunWith(SpringJUnit4ClassRunner.class)
diff --git a/src/test/java/com/labsynch/labseer/service/PreferredNameTest.java b/src/test/java/com/labsynch/labseer/service/PreferredNameTest.java
index ee3a41fdb..a5b001ce2 100755
--- a/src/test/java/com/labsynch/labseer/service/PreferredNameTest.java
+++ b/src/test/java/com/labsynch/labseer/service/PreferredNameTest.java
@@ -1,5 +1,7 @@
 package com.labsynch.labseer.service;
 
+import com.labsynch.labseer.dto.PreferredNameDTO;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -8,8 +10,6 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.labsynch.labseer.dto.PreferredNameDTO;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext.xml")
 @Configurable
diff --git a/src/test/java/com/labsynch/labseer/service/ProtocolServiceTest.java b/src/test/java/com/labsynch/labseer/service/ProtocolServiceTest.java
index 7de2305a4..f76e37f06 100755
--- a/src/test/java/com/labsynch/labseer/service/ProtocolServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/ProtocolServiceTest.java
@@ -2,7 +2,6 @@
 
 package com.labsynch.labseer.service;
 
-import java.math.BigInteger;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
@@ -11,7 +10,15 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.persistence.EntityManager;
+import com.labsynch.labseer.domain.AuthorRole;
+import com.labsynch.labseer.domain.LsRole;
+import com.labsynch.labseer.domain.LsThing;
+import com.labsynch.labseer.domain.LsTransaction;
+import com.labsynch.labseer.domain.Protocol;
+import com.labsynch.labseer.domain.ProtocolState;
+import com.labsynch.labseer.domain.ProtocolValue;
+import com.labsynch.labseer.dto.CodeTableDTO;
+import com.labsynch.labseer.exceptions.UniqueNameException;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -24,16 +31,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.AuthorRole;
-import com.labsynch.labseer.domain.LsRole;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.LsTransaction;
-import com.labsynch.labseer.domain.Protocol;
-import com.labsynch.labseer.domain.ProtocolState;
-import com.labsynch.labseer.domain.ProtocolValue;
-import com.labsynch.labseer.dto.CodeTableDTO;
-import com.labsynch.labseer.exceptions.UniqueNameException;
-
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
diff --git a/src/test/java/com/labsynch/labseer/service/ReadBulkTrasnferPart1CSVServiceTests.java b/src/test/java/com/labsynch/labseer/service/ReadBulkTrasnferPart1CSVServiceTests.java
index 38e7fa8f8..283bf5134 100755
--- a/src/test/java/com/labsynch/labseer/service/ReadBulkTrasnferPart1CSVServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/ReadBulkTrasnferPart1CSVServiceTests.java
@@ -11,6 +11,11 @@
 import java.util.List;
 import java.util.Map;
 
+import com.labsynch.labseer.domain.Container;
+import com.labsynch.labseer.domain.ContainerState;
+import com.labsynch.labseer.domain.LsTransaction;
+import com.labsynch.labseer.dto.BulkTransferPart1DTO;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -26,11 +31,6 @@
 import org.supercsv.io.ICsvBeanReader;
 import org.supercsv.prefs.CsvPreference;
 
-import com.labsynch.labseer.domain.Container;
-import com.labsynch.labseer.domain.ContainerState;
-import com.labsynch.labseer.domain.LsTransaction;
-import com.labsynch.labseer.dto.BulkTransferPart1DTO;
-
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext.xml")
diff --git a/src/test/java/com/labsynch/labseer/service/StructureServiceTests.java b/src/test/java/com/labsynch/labseer/service/StructureServiceTests.java
index 65f3500fe..e5d2019da 100644
--- a/src/test/java/com/labsynch/labseer/service/StructureServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/StructureServiceTests.java
@@ -6,7 +6,8 @@
 import java.util.Collection;
 import java.util.Date;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.ChemStructure;
+import com.labsynch.labseer.service.ChemStructureService.SearchType;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -19,8 +20,7 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.ChemStructure;
-import com.labsynch.labseer.service.ChemStructureService.SearchType;
+import junit.framework.Assert;
 
 
 @RunWith(SpringJUnit4ClassRunner.class)
diff --git a/src/test/java/com/labsynch/labseer/service/SubjectServiceTest.java b/src/test/java/com/labsynch/labseer/service/SubjectServiceTest.java
index b481e8696..69b296f3a 100755
--- a/src/test/java/com/labsynch/labseer/service/SubjectServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/SubjectServiceTest.java
@@ -7,6 +7,14 @@
 import java.util.List;
 import java.util.Set;
 
+import com.labsynch.labseer.domain.Subject;
+import com.labsynch.labseer.domain.SubjectLabel;
+import com.labsynch.labseer.domain.SubjectState;
+import com.labsynch.labseer.domain.SubjectValue;
+import com.labsynch.labseer.dto.SubjectDTO;
+import com.labsynch.labseer.dto.SubjectLabelDTO;
+import com.labsynch.labseer.dto.SubjectStateDTO;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -18,14 +26,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.SubjectLabel;
-import com.labsynch.labseer.domain.SubjectState;
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.dto.SubjectDTO;
-import com.labsynch.labseer.dto.SubjectLabelDTO;
-import com.labsynch.labseer.dto.SubjectStateDTO;
-
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
diff --git a/src/test/java/com/labsynch/labseer/service/SubjectStateServiceTest.java b/src/test/java/com/labsynch/labseer/service/SubjectStateServiceTest.java
index 170296686..f178acdd7 100755
--- a/src/test/java/com/labsynch/labseer/service/SubjectStateServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/SubjectStateServiceTest.java
@@ -2,7 +2,8 @@
 
 package com.labsynch.labseer.service;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.SubjectState;
+import com.labsynch.labseer.domain.SubjectValue;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -14,9 +15,7 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import com.labsynch.labseer.domain.SubjectState;
-import com.labsynch.labseer.domain.SubjectValue;
+import junit.framework.Assert;
 
 
 @RunWith(SpringJUnit4ClassRunner.class)
diff --git a/src/test/java/com/labsynch/labseer/service/SubjectValueServiceTest.java b/src/test/java/com/labsynch/labseer/service/SubjectValueServiceTest.java
index 93593b492..31a6e59a3 100755
--- a/src/test/java/com/labsynch/labseer/service/SubjectValueServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/SubjectValueServiceTest.java
@@ -11,7 +11,10 @@
 
 import javax.persistence.NoResultException;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.Experiment;
+import com.labsynch.labseer.domain.SubjectState;
+import com.labsynch.labseer.domain.SubjectValue;
+import com.labsynch.labseer.utils.PropertiesUtilService;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -23,14 +26,7 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.ExperimentValue;
-import com.labsynch.labseer.domain.Subject;
-import com.labsynch.labseer.domain.SubjectState;
-import com.labsynch.labseer.domain.SubjectValue;
-import com.labsynch.labseer.domain.TreatmentGroupValue;
-import com.labsynch.labseer.utils.PropertiesUtilService;
+import junit.framework.Assert;
 
 
 @RunWith(SpringJUnit4ClassRunner.class)
diff --git a/src/test/java/com/labsynch/labseer/service/TreatmentGroupStateServiceTest.java b/src/test/java/com/labsynch/labseer/service/TreatmentGroupStateServiceTest.java
index 07cbbec51..b9b6402d6 100644
--- a/src/test/java/com/labsynch/labseer/service/TreatmentGroupStateServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/TreatmentGroupStateServiceTest.java
@@ -2,7 +2,7 @@
 
 import java.util.Collection;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.TreatmentGroupState;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -14,7 +14,7 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.TreatmentGroupState;
+import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
diff --git a/src/test/java/com/labsynch/labseer/service/TreatmentGroupValueServiceTest.java b/src/test/java/com/labsynch/labseer/service/TreatmentGroupValueServiceTest.java
index 71f51af0c..359f7e58d 100644
--- a/src/test/java/com/labsynch/labseer/service/TreatmentGroupValueServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/TreatmentGroupValueServiceTest.java
@@ -2,27 +2,15 @@
 
 package com.labsynch.labseer.service;
 
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Set;
 
 import javax.persistence.NoResultException;
 
-import junit.framework.Assert;
+import com.labsynch.labseer.domain.Experiment;
+import com.labsynch.labseer.domain.TreatmentGroupValue;
 
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -33,20 +21,7 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.AnalysisGroup;
-import com.labsynch.labseer.domain.AnalysisGroupState;
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.domain.Experiment;
-import com.labsynch.labseer.domain.LsThing;
-import com.labsynch.labseer.domain.LsThingLabel;
-import com.labsynch.labseer.domain.TreatmentGroup;
-import com.labsynch.labseer.domain.TreatmentGroupState;
-import com.labsynch.labseer.domain.TreatmentGroupValue;
-import com.labsynch.labseer.dto.AnalysisGroupValueDTO;
-import com.labsynch.labseer.dto.PreferredNameDTO;
-import com.labsynch.labseer.dto.PreferredNameResultsDTO;
-
-import flexjson.JSONTokener;
+import junit.framework.Assert;
 
 
 @RunWith(SpringJUnit4ClassRunner.class)
diff --git a/src/test/java/com/labsynch/labseer/service/UpdateLogServiceTest.java b/src/test/java/com/labsynch/labseer/service/UpdateLogServiceTest.java
index 45291f245..76c807efa 100755
--- a/src/test/java/com/labsynch/labseer/service/UpdateLogServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/UpdateLogServiceTest.java
@@ -5,6 +5,10 @@
 import java.util.Collection;
 import java.util.Date;
 
+import com.labsynch.labseer.domain.ContainerState;
+import com.labsynch.labseer.domain.LsTransaction;
+import com.labsynch.labseer.domain.UpdateLog;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -14,10 +18,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.ContainerState;
-import com.labsynch.labseer.domain.LsTransaction;
-import com.labsynch.labseer.domain.UpdateLog;
-
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext.xml")
diff --git a/src/test/java/com/labsynch/labseer/utils/InitialSetupTest.java b/src/test/java/com/labsynch/labseer/utils/InitialSetupTest.java
index cb93f1d2d..0addf75c4 100755
--- a/src/test/java/com/labsynch/labseer/utils/InitialSetupTest.java
+++ b/src/test/java/com/labsynch/labseer/utils/InitialSetupTest.java
@@ -4,6 +4,9 @@
 import java.util.Collection;
 import java.util.List;
 
+import com.labsynch.labseer.domain.ThingKind;
+import com.labsynch.labseer.domain.ThingType;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -12,9 +15,6 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.labsynch.labseer.domain.ThingKind;
-import com.labsynch.labseer.domain.ThingType;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext*.xml")
 @Configurable
diff --git a/src/test/java/com/labsynch/labseer/utils/LicenseCheckTest.java b/src/test/java/com/labsynch/labseer/utils/LicenseCheckTest.java
index f790abd79..be35e5b9f 100644
--- a/src/test/java/com/labsynch/labseer/utils/LicenseCheckTest.java
+++ b/src/test/java/com/labsynch/labseer/utils/LicenseCheckTest.java
@@ -3,6 +3,9 @@
 import java.io.IOException;
 import java.net.URISyntaxException;
 
+import com.labsynch.labseer.dto.LicenseDTO;
+import com.labsynch.labseer.service.LicenseService;
+
 import org.bouncycastle.openpgp.PGPException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -13,9 +16,6 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.labsynch.labseer.dto.LicenseDTO;
-import com.labsynch.labseer.service.LicenseService;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext*.xml")
 @Configurable
diff --git a/src/test/java/com/labsynch/labseer/utils/ReadPropsTest.java b/src/test/java/com/labsynch/labseer/utils/ReadPropsTest.java
index a057b3170..4f3ef872a 100755
--- a/src/test/java/com/labsynch/labseer/utils/ReadPropsTest.java
+++ b/src/test/java/com/labsynch/labseer/utils/ReadPropsTest.java
@@ -5,6 +5,16 @@
 import java.util.HashSet;
 import java.util.List;
 
+import com.labsynch.labseer.domain.AnalysisGroupValue;
+import com.labsynch.labseer.domain.Author;
+import com.labsynch.labseer.domain.AuthorRole;
+import com.labsynch.labseer.domain.LsRole;
+import com.labsynch.labseer.dto.AnalysisGroupValueBaseDTO;
+import com.labsynch.labseer.dto.BatchCodeDTO;
+import com.labsynch.labseer.dto.ExperimentFilterDTO;
+import com.labsynch.labseer.dto.JSTreeNodeDTO;
+import com.labsynch.labseer.service.ExperimentService;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -17,16 +27,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.AnalysisGroupValue;
-import com.labsynch.labseer.domain.Author;
-import com.labsynch.labseer.domain.AuthorRole;
-import com.labsynch.labseer.domain.LsRole;
-import com.labsynch.labseer.dto.AnalysisGroupValueBaseDTO;
-import com.labsynch.labseer.dto.BatchCodeDTO;
-import com.labsynch.labseer.dto.ExperimentFilterDTO;
-import com.labsynch.labseer.dto.JSTreeNodeDTO;
-import com.labsynch.labseer.service.ExperimentService;
-
 import flexjson.JSONDeserializer;
 
 @RunWith(SpringJUnit4ClassRunner.class)
diff --git a/src/test/java/com/labsynch/labseer/utils/ReadResourceFileTest.java b/src/test/java/com/labsynch/labseer/utils/ReadResourceFileTest.java
index 5f0e2a773..8b911d46c 100755
--- a/src/test/java/com/labsynch/labseer/utils/ReadResourceFileTest.java
+++ b/src/test/java/com/labsynch/labseer/utils/ReadResourceFileTest.java
@@ -4,8 +4,9 @@
 import java.io.InputStream;
 import java.util.Collection;
 
+import com.labsynch.labseer.domain.SubjectState;
+
 import org.apache.commons.io.IOUtils;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,8 +15,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.labsynch.labseer.domain.SubjectState;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext.xml")
 @Configurable
diff --git a/src/test/java/com/labsynch/labseer/utils/ReadSeuratUsersFileTest.java b/src/test/java/com/labsynch/labseer/utils/ReadSeuratUsersFileTest.java
index 756818f4b..a54d5a9c3 100755
--- a/src/test/java/com/labsynch/labseer/utils/ReadSeuratUsersFileTest.java
+++ b/src/test/java/com/labsynch/labseer/utils/ReadSeuratUsersFileTest.java
@@ -2,7 +2,6 @@
 
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
diff --git a/src/test/java/com/labsynch/labseer/utils/SimpleJsonDateTest.java b/src/test/java/com/labsynch/labseer/utils/SimpleJsonDateTest.java
index 88e6e2543..04bcba624 100644
--- a/src/test/java/com/labsynch/labseer/utils/SimpleJsonDateTest.java
+++ b/src/test/java/com/labsynch/labseer/utils/SimpleJsonDateTest.java
@@ -1,5 +1,8 @@
 package com.labsynch.labseer.utils;
 
+import com.labsynch.labseer.domain.ContainerValue;
+import com.labsynch.labseer.domain.ExperimentValue;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -8,9 +11,6 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.labsynch.labseer.domain.ContainerValue;
-import com.labsynch.labseer.domain.ExperimentValue;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext*.xml")
 @Configurable
diff --git a/src/test/java/com/labsynch/labseer/utils/SimpleUtilTest.java b/src/test/java/com/labsynch/labseer/utils/SimpleUtilTest.java
index f25adb39e..aea73137e 100644
--- a/src/test/java/com/labsynch/labseer/utils/SimpleUtilTest.java
+++ b/src/test/java/com/labsynch/labseer/utils/SimpleUtilTest.java
@@ -3,8 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.Assert;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -13,6 +11,8 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import junit.framework.Assert;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext*.xml")
 @Configurable

From 89dba1d1718a966d9563890c6990724f0956a775 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Fri, 29 Apr 2022 11:54:45 -0700
Subject: [PATCH 62/73] Ran vscode format on all .java files

---
 .../labseer/api/ApiAliasNameController.java   |   52 +-
 .../api/ApiAnalysisGroupController.java       |  364 +-
 .../api/ApiAnalysisGroupValueController.java  |  130 +-
 .../labseer/api/ApiAuthorController.java      |  315 +-
 .../labseer/api/ApiAuthorRoleController.java  |   20 +-
 .../api/ApiAuthorizationController.java       |   51 +-
 .../labseer/api/ApiBulkLoadController.java    |  128 +-
 .../labseer/api/ApiCmpdSearchController.java  |   85 +-
 .../api/ApiCompoundTypeController.java        |   18 +-
 .../labseer/api/ApiCompoundsController.java   |   12 +-
 .../labseer/api/ApiContainerController.java   |  650 +--
 .../api/ApiContainerStateController.java      |  498 +--
 .../labseer/api/ApiCronJobController.java     |   36 +-
 .../labseer/api/ApiCurveFitController.java    |  317 +-
 .../labseer/api/ApiDDictValueController.java  |  159 +-
 .../labseer/api/ApiExperimentController.java  | 1993 +++++----
 .../api/ApiExperimentLabelController.java     |   23 +-
 .../labseer/api/ApiExportController.java      |   19 +-
 .../labseer/api/ApiFileSaveController.java    |   59 +-
 .../labseer/api/ApiFileTypeController.java    |   52 +-
 .../labseer/api/ApiIsotopeController.java     |   16 +-
 .../ApiItxContainerContainerController.java   |   43 +-
 ...iItxContainerContainerValueController.java |  365 +-
 .../ApiItxExperimentExperimentController.java |  133 +-
 .../api/ApiItxLsThingLsThingController.java   |  335 +-
 .../api/ApiItxProtocolProtocolController.java |  117 +-
 .../api/ApiItxSubjectContainerController.java |   86 +-
 .../labseer/api/ApiKindController.java        |  275 +-
 .../labseer/api/ApiLabelController.java       |  232 +-
 .../api/ApiLabelSequenceController.java       |   93 +-
 .../labseer/api/ApiLicenseController.java     |    3 +-
 .../labseer/api/ApiLsRoleController.java      |   35 +-
 .../labseer/api/ApiLsThingController.java     |  548 +--
 .../api/ApiLsTransactionController.java       |   47 +-
 .../labseer/api/ApiMetalotController.java     |   93 +-
 .../labseer/api/ApiOperatorController.java    |   14 +-
 .../api/ApiParentAnnotationController.java    |   15 +-
 .../labseer/api/ApiParentController.java      |   42 +-
 .../labseer/api/ApiParentLotController.java   |  111 +-
 .../api/ApiPhysicalStateController.java       |   36 +-
 .../labseer/api/ApiPreferredIdController.java |   18 +-
 .../labseer/api/ApiProjectController.java     |   28 +-
 .../labseer/api/ApiProtocolController.java    |  339 +-
 .../api/ApiPurityMeasuredByController.java    |   72 +-
 .../labseer/api/ApiRegSearchController.java   |   28 +-
 .../labseer/api/ApiSaltController.java        |   70 +-
 .../labseer/api/ApiSearchFormController.java  |   74 +-
 .../labseer/api/ApiSetupController.java       |  173 +-
 .../api/ApiSolutionUnitController.java        |   73 +-
 .../ApiStandardizationServicesController.java |   91 +-
 .../labseer/api/ApiStateController.java       | 1743 ++++----
 .../api/ApiStereoCategoryController.java      |  118 +-
 .../labseer/api/ApiStructureController.java   |  398 +-
 .../api/ApiStructureServicesController.java   |   76 +-
 .../labseer/api/ApiSubjectController.java     |  742 ++--
 .../api/ApiSubjectValueController.java        |   40 +-
 .../api/ApiTreatmentGroupController.java      |   11 +-
 .../labseer/api/ApiTypeController.java        |  277 +-
 .../labseer/api/ApiUnitsController.java       |   20 +-
 .../labseer/api/ApiValueController.java       |  694 +--
 .../labseer/api/ApiValueKindController.java   |   80 +-
 .../labseer/api/ApiVendorController.java      |  113 +-
 .../api/RegisterCompoundsController.java      |   79 +-
 .../labseer/chemclasses/CmpdRegMolecule.java  |   17 +-
 .../chemclasses/CmpdRegMoleculeFactory.java   |    3 +-
 .../labseer/chemclasses/CmpdRegSDFReader.java |    4 +-
 .../chemclasses/CmpdRegSDFReaderFactory.java  |    5 +-
 .../labseer/chemclasses/CmpdRegSDFWriter.java |    6 +-
 .../chemclasses/CmpdRegSDFWriterFactory.java  |    4 +-
 .../bbchem/BBChemDryRunStructure.java         |   98 +-
 .../bbchem/BBChemParentStructure.java         |  113 +-
 .../bbchem/BBChemSaltFormStructure.java       |  120 +-
 .../bbchem/BBChemSaltStructure.java           |   95 +-
 .../BBChemStandardizationDryRunStructure.java |  119 +-
 .../bbchem/BBChemStructureService.java        |   15 +-
 .../bbchem/BBChemStructureServiceImpl.java    |  191 +-
 .../ChemStructureServiceBBChemImpl.java       |  502 ++-
 .../bbchem/CmpdRegMoleculeBBChemImpl.java     |   37 +-
 .../CmpdRegMoleculeFactoryBBChemImpl.java     |   16 +-
 .../bbchem/CmpdRegSDFReaderBBChemImpl.java    |   18 +-
 .../bbchem/CmpdRegSDFWriterBBChemImpl.java    |    1 -
 .../ChemStructureServiceIndigoImpl.java       |  493 ++-
 .../CmpdRegMoleculeFactoryIndigoImpl.java     |    2 +-
 .../indigo/CmpdRegMoleculeIndigoImpl.java     |   52 +-
 .../CmpdRegSDFReaderFactoryIndigoImpl.java    |    7 +-
 .../indigo/CmpdRegSDFReaderIndigoImpl.java    |    8 +-
 .../CmpdRegSDFWriterFactoryIndigoImpl.java    |    4 +-
 .../indigo/CmpdRegSDFWriterIndigoImpl.java    |   18 +-
 .../jchem/ChemStructureServiceJChemImpl.java  |  909 ++--
 .../CmpdRegMoleculeFactoryJChemImpl.java      |    4 +-
 .../jchem/CmpdRegMoleculeJChemImpl.java       |   42 +-
 .../CmpdRegSDFReaderFactoryJChemImpl.java     |    7 +-
 .../jchem/CmpdRegSDFReaderJChemImpl.java      |   20 +-
 .../CmpdRegSDFWriterFactoryJChemImpl.java     |    4 +-
 .../jchem/CmpdRegSDFWriterJChemImpl.java      |   28 +-
 .../postgres/V1_0_4_2__copy_clob_values.java  |  103 +-
 .../postgres/V1_0_4_6__copy_blob_values.java  |   56 +-
 ..._0_6_2__copy_author_value_clob_values.java |   99 +-
 ..._0_6_6__copy_author_value_blob_values.java |   54 +-
 .../V2_0_1_1__copy_mol_structures.java        |  170 +-
 .../postgres/V2_0_1_4__set_defaults.java      |  439 +-
 .../V2_0_7_1__Recalculate_exact_mass.java     |   55 +-
 ...0_6__url_encode_cmpdreg_filelist_urls.java |   48 +-
 .../jchem/V2_0_0_7__Create_Jchem_Tables.java  |   38 +-
 .../jchem/V2_0_2_0__Upgrade_Jchem_Tables.java |   11 +-
 ...V2_0_3_4_1__Add_compound_Jchem_Tables.java |   24 +-
 .../jchem/V2_0_4_3__Upgrade_Jchem_Tables.java |   11 +-
 .../V2_0_8_1_1__Upgrade_Jchem_Tables.java     |   11 +-
 ...2_0_8_1__Add_qc_compound_Jchem_Tables.java |   24 +-
 .../domain/AbstractBBChemStructure.java       |  201 +-
 .../labseer/domain/AbstractLabel.java         |  246 +-
 .../labseer/domain/AbstractState.java         |  225 +-
 .../labseer/domain/AbstractThing.java         |  256 +-
 .../labseer/domain/AbstractValue.java         |  545 +--
 .../labseer/domain/AnalysisGroup.java         |  422 +-
 .../labseer/domain/AnalysisGroupLabel.java    |  175 +-
 .../labseer/domain/AnalysisGroupState.java    |  473 +-
 .../labseer/domain/AnalysisGroupValue.java    | 1693 ++++----
 .../labseer/domain/ApplicationSetting.java    |  193 +-
 .../com/labsynch/labseer/domain/Author.java   |  378 +-
 .../labsynch/labseer/domain/AuthorLabel.java  |  143 +-
 .../labsynch/labseer/domain/AuthorRole.java   |  185 +-
 .../labsynch/labseer/domain/AuthorState.java  |  348 +-
 .../labsynch/labseer/domain/AuthorValue.java  |  312 +-
 .../labsynch/labseer/domain/BulkLoadFile.java |  220 +-
 .../labseer/domain/BulkLoadTemplate.java      |  271 +-
 .../labseer/domain/ChemStructure.java         |  168 +-
 .../labseer/domain/CmpdRegAppSetting.java     |  126 +-
 .../com/labsynch/labseer/domain/CodeKind.java |  194 +-
 .../labsynch/labseer/domain/CodeOrigin.java   |  168 +-
 .../com/labsynch/labseer/domain/CodeType.java |  169 +-
 .../com/labsynch/labseer/domain/Compound.java |  156 +-
 .../labsynch/labseer/domain/CompoundType.java |  140 +-
 .../labsynch/labseer/domain/Container.java    |  623 +--
 .../labseer/domain/ContainerKind.java         |  211 +-
 .../labseer/domain/ContainerLabel.java        |  291 +-
 .../labseer/domain/ContainerState.java        |  290 +-
 .../labseer/domain/ContainerType.java         |  121 +-
 .../labseer/domain/ContainerValue.java        |  392 +-
 .../com/labsynch/labseer/domain/CorpName.java |  120 +-
 .../com/labsynch/labseer/domain/CronJob.java  |  203 +-
 .../labsynch/labseer/domain/DDictKind.java    |  180 +-
 .../labsynch/labseer/domain/DDictType.java    |  141 +-
 .../labsynch/labseer/domain/DDictValue.java   |  376 +-
 .../labseer/domain/DryRunCompound.java        |  184 +-
 .../labsynch/labseer/domain/Experiment.java   |  686 ++-
 .../labseer/domain/ExperimentKind.java        |  120 +-
 .../labseer/domain/ExperimentLabel.java       |  354 +-
 .../labseer/domain/ExperimentState.java       |  271 +-
 .../labseer/domain/ExperimentType.java        |  124 +-
 .../labseer/domain/ExperimentValue.java       |  470 +-
 .../com/labsynch/labseer/domain/FileList.java |  138 +-
 .../labsynch/labseer/domain/FileThing.java    |   97 +-
 .../com/labsynch/labseer/domain/FileType.java |  119 +-
 .../labseer/domain/InteractionKind.java       |  173 +-
 .../labseer/domain/InteractionType.java       |  169 +-
 .../com/labsynch/labseer/domain/IsoSalt.java  |  156 +-
 .../com/labsynch/labseer/domain/Isotope.java  |  183 +-
 .../labseer/domain/ItxContainerContainer.java |  414 +-
 .../domain/ItxContainerContainerState.java    |  137 +-
 .../domain/ItxContainerContainerValue.java    |  140 +-
 .../domain/ItxExperimentExperiment.java       |  256 +-
 .../domain/ItxExperimentExperimentState.java  |  139 +-
 .../domain/ItxExperimentExperimentValue.java  |  125 +-
 .../labseer/domain/ItxLsThingLsThing.java     |  730 ++--
 .../domain/ItxLsThingLsThingState.java        |  188 +-
 .../domain/ItxLsThingLsThingValue.java        |  151 +-
 .../labseer/domain/ItxProtocolProtocol.java   |  246 +-
 .../domain/ItxProtocolProtocolState.java      |  134 +-
 .../domain/ItxProtocolProtocolValue.java      |  120 +-
 .../labseer/domain/ItxSubjectContainer.java   |  285 +-
 .../domain/ItxSubjectContainerState.java      |  149 +-
 .../domain/ItxSubjectContainerValue.java      |  140 +-
 .../labsynch/labseer/domain/LabelKind.java    |  198 +-
 .../labseer/domain/LabelSequence.java         |  684 +--
 .../labseer/domain/LabelSequenceRole.java     |  164 +-
 .../labsynch/labseer/domain/LabelType.java    |  157 +-
 .../java/com/labsynch/labseer/domain/Lot.java |  830 ++--
 .../com/labsynch/labseer/domain/LotAlias.java |  312 +-
 .../labsynch/labseer/domain/LotAliasKind.java |  107 +-
 .../labsynch/labseer/domain/LotAliasType.java |  100 +-
 .../labseer/domain/LsInteraction.java         |   64 +-
 .../com/labsynch/labseer/domain/LsRole.java   |  335 +-
 .../labsynch/labseer/domain/LsSeqAnlGrp.java  |   71 +-
 .../labseer/domain/LsSeqContainer.java        |   71 +-
 .../labsynch/labseer/domain/LsSeqExpt.java    |   71 +-
 .../labseer/domain/LsSeqItxCntrCntr.java      |   72 +-
 .../domain/LsSeqItxExperimentExperiment.java  |   86 +-
 .../domain/LsSeqItxLsThingLsThing.java        |   76 +-
 .../domain/LsSeqItxProtocolProtocol.java      |   79 +-
 .../labseer/domain/LsSeqItxSubjCntr.java      |   71 +-
 .../labseer/domain/LsSeqProtocol.java         |   71 +-
 .../labsynch/labseer/domain/LsSeqSubject.java |   71 +-
 .../labsynch/labseer/domain/LsSeqTrtGrp.java  |   71 +-
 .../com/labsynch/labseer/domain/LsTag.java    |  140 +-
 .../com/labsynch/labseer/domain/LsThing.java  | 1597 ++++---
 .../labsynch/labseer/domain/LsThingLabel.java |  843 ++--
 .../labsynch/labseer/domain/LsThingState.java |  220 +-
 .../labsynch/labseer/domain/LsThingValue.java |  869 ++--
 .../labseer/domain/LsTransaction.java         |  126 +-
 .../labseer/domain/LsTransactionStatus.java   |    4 +-
 .../labseer/domain/LsTransactionType.java     |    4 +-
 .../com/labsynch/labseer/domain/Operator.java |  134 +-
 .../labsynch/labseer/domain/OperatorKind.java |  153 +-
 .../labsynch/labseer/domain/OperatorType.java |  122 +-
 .../com/labsynch/labseer/domain/Parent.java   |  882 ++--
 .../labsynch/labseer/domain/ParentAlias.java  |  410 +-
 .../labseer/domain/ParentAliasKind.java       |  107 +-
 .../labseer/domain/ParentAliasType.java       |  100 +-
 .../labseer/domain/ParentAnnotation.java      |  141 +-
 .../labseer/domain/PhysicalState.java         |  167 +-
 .../labseer/domain/PreDef_CorpName.java       |  162 +-
 .../com/labsynch/labseer/domain/Protocol.java |  399 +-
 .../labsynch/labseer/domain/ProtocolKind.java |  128 +-
 .../labseer/domain/ProtocolLabel.java         |  308 +-
 .../labseer/domain/ProtocolState.java         |  221 +-
 .../labsynch/labseer/domain/ProtocolType.java |  122 +-
 .../labseer/domain/ProtocolValue.java         |  424 +-
 .../labseer/domain/PurityMeasuredBy.java      |  167 +-
 .../labsynch/labseer/domain/RegSearch.java    |   39 +-
 .../com/labsynch/labseer/domain/RoleKind.java |  174 +-
 .../com/labsynch/labseer/domain/RoleType.java |  119 +-
 .../com/labsynch/labseer/domain/Salt.java     |  233 +-
 .../com/labsynch/labseer/domain/SaltForm.java |  885 ++--
 .../labseer/domain/SaltFormAlias.java         |  275 +-
 .../labseer/domain/SaltFormAliasKind.java     |  109 +-
 .../labseer/domain/SaltFormAliasType.java     |  105 +-
 .../labsynch/labseer/domain/SolutionUnit.java |  169 +-
 .../domain/StandardizationDryRunCompound.java |  736 ++--
 .../domain/StandardizationHistory.java        |  245 +-
 .../domain/StandardizationSettings.java       |  141 +-
 .../labsynch/labseer/domain/StateKind.java    |  186 +-
 .../labsynch/labseer/domain/StateType.java    |  119 +-
 .../labseer/domain/StereoCategory.java        |  161 +-
 .../labseer/domain/StructureKind.java         |  196 +-
 .../labseer/domain/StructureType.java         |  122 +-
 .../com/labsynch/labseer/domain/Subject.java  |  472 +-
 .../labsynch/labseer/domain/SubjectLabel.java |  140 +-
 .../labsynch/labseer/domain/SubjectState.java |  252 +-
 .../labsynch/labseer/domain/SubjectValue.java |  733 ++--
 .../labseer/domain/TempSelectTable.java       |  252 +-
 .../labsynch/labseer/domain/ThingKind.java    |  199 +-
 .../labsynch/labseer/domain/ThingPage.java    |  143 +-
 .../labseer/domain/ThingPageArchive.java      |  147 +-
 .../labsynch/labseer/domain/ThingType.java    |  169 +-
 .../labseer/domain/TreatmentGroup.java        |  164 +-
 .../labseer/domain/TreatmentGroupLabel.java   |  158 +-
 .../labseer/domain/TreatmentGroupState.java   |  383 +-
 .../labseer/domain/TreatmentGroupValue.java   |  700 +--
 .../labseer/domain/UncertaintyKind.java       |   99 +-
 .../com/labsynch/labseer/domain/Unit.java     |  154 +-
 .../com/labsynch/labseer/domain/UnitKind.java |  148 +-
 .../com/labsynch/labseer/domain/UnitType.java |  119 +-
 .../labsynch/labseer/domain/UpdateLog.java    |  126 +-
 .../labsynch/labseer/domain/ValueKind.java    |  171 +-
 .../labsynch/labseer/domain/ValueType.java    |  125 +-
 .../com/labsynch/labseer/domain/Vendor.java   |  193 +-
 .../labseer/dto/AnalysisGroupCodeDTO.java     |   52 +-
 .../labseer/dto/AnalysisGroupCsvDTO.java      |  426 +-
 .../dto/AnalysisGroupStatePathDTO.java        |   59 +-
 .../dto/AnalysisGroupValueBaseDTO.java        |  296 +-
 .../labseer/dto/AnalysisGroupValueDTO.java    |  413 +-
 .../dto/AnalysisGroupValuePathDTO.java        |   75 +-
 .../labseer/dto/AuthGroupsAndProjectsDTO.java |   59 +-
 .../labsynch/labseer/dto/AuthGroupsDTO.java   |   33 +-
 .../labsynch/labseer/dto/AuthProjectDTO.java  |   43 +-
 .../labseer/dto/AuthProjectGroupsDTO.java     |   88 +-
 .../com/labsynch/labseer/dto/AuthUserDTO.java |   36 +-
 .../labseer/dto/AuthorBrowserQueryDTO.java    |   44 +-
 .../labsynch/labseer/dto/AuthorNameDTO.java   |   36 +-
 .../labsynch/labseer/dto/AuthorQueryDTO.java  |  151 +-
 .../labseer/dto/AuthorQueryResultDTO.java     |   59 +-
 .../labsynch/labseer/dto/AuthorRoleDTO.java   |   64 +-
 .../labsynch/labseer/dto/AutoLabelDTO.java    |   52 +-
 .../labsynch/labseer/dto/BatchCodeDTO.java    |   60 +-
 .../labseer/dto/BatchCodeDependencyDTO.java   |   74 +-
 .../labsynch/labseer/dto/BatchProjectDTO.java |  104 +-
 .../labseer/dto/BulkLoadPropertiesDTO.java    |  261 +-
 .../dto/BulkLoadPropertyMappingDTO.java       |  143 +-
 .../dto/BulkLoadRegisterSDFRequestDTO.java    |   80 +-
 .../dto/BulkLoadRegisterSDFResponseDTO.java   |   56 +-
 .../dto/BulkLoadSDFPropertyRequestDTO.java    |   77 +-
 ...oadSDFValidationPropertiesResponseDTO.java |   45 +-
 .../labseer/dto/BulkLoadTemplateDTO.java      |   56 +-
 .../labseer/dto/BulkTransferPart1DTO.java     |  106 +-
 .../labseer/dto/ChangePasswordDTO.java        |   69 +-
 .../labseer/dto/CleanMolOptionsDTO.java       |   47 +-
 .../labseer/dto/CmpdRegBatchCodeDTO.java      |  168 +-
 .../dto/CmpdRegStructureSearchDTO.java        |   63 +-
 .../labsynch/labseer/dto/CodeLabelDTO.java    |   95 +-
 .../labseer/dto/CodeNameQueryDTO.java         |   47 +-
 .../labseer/dto/CodeNameValueDTO.java         |   59 +-
 .../labsynch/labseer/dto/CodeTableDTO.java    |  216 +-
 .../labsynch/labseer/dto/CodeTypeKindDTO.java |   65 +-
 .../labseer/dto/ContainerBatchCodeDTO.java    |   86 +-
 .../labseer/dto/ContainerBrowserQueryDTO.java |   44 +-
 .../dto/ContainerCodeNameStateDTO.java        |   52 +-
 .../dto/ContainerDependencyCheckDTO.java      |  146 +-
 .../labseer/dto/ContainerErrorMessageDTO.java |   90 +-
 .../labseer/dto/ContainerLocationDTO.java     |   97 +-
 .../labseer/dto/ContainerLocationTreeDTO.java |  130 +-
 .../labseer/dto/ContainerMiniDTO.java         |   49 +-
 .../labseer/dto/ContainerQueryDTO.java        |  149 +-
 .../labseer/dto/ContainerQueryResultDTO.java  |   90 +-
 .../labseer/dto/ContainerRequestDTO.java      |   83 +-
 .../dto/ContainerSearchRequestDTO.java        |   91 +-
 .../labseer/dto/ContainerStateMiniDTO.java    |   51 +-
 .../labseer/dto/ContainerStatePathDTO.java    |   59 +-
 .../labseer/dto/ContainerSubjectsDTO.java     |   72 +-
 .../labseer/dto/ContainerValuePathDTO.java    |   75 +-
 .../labseer/dto/ContainerValueRequestDTO.java |   73 +-
 .../labseer/dto/ContainerWellCodeDTO.java     |   56 +-
 .../com/labsynch/labseer/dto/CorpNameDTO.java |   42 +-
 .../labseer/dto/CreatePlateRequestDTO.java    |  102 +-
 .../com/labsynch/labseer/dto/CurveFitDTO.java | 1223 +++---
 .../dto/DateValueComparisonRequest.java       |   88 +-
 .../labseer/dto/DependencyCheckDTO.java       |  191 +-
 .../labseer/dto/DoseReponseParamsDTO.java     |  261 +-
 .../com/labsynch/labseer/dto/EntrezDbDTO.java |   42 +-
 .../labsynch/labseer/dto/EntrezDbGeneDTO.java |   90 +-
 .../dto/EntrezDiscontinuedGeneDTO.java        |   56 +-
 .../labsynch/labseer/dto/ErrorMessageDTO.java |   62 +-
 .../labseer/dto/ExperimentCodeDTO.java        |   48 +-
 .../labseer/dto/ExperimentCsvDataDTO.java     |   58 +-
 .../labseer/dto/ExperimentDataDTO.java        |  181 +-
 .../dto/ExperimentErrorMessageDTO.java        |  199 +-
 .../labseer/dto/ExperimentFilterDTO.java      |   49 +-
 .../dto/ExperimentFilterSearchDTO.java        |   86 +-
 .../labseer/dto/ExperimentGuiStubDTO.java     |  217 +-
 .../dto/ExperimentSearchRequestDTO.java       |   85 +-
 .../labseer/dto/ExperimentStatePathDTO.java   |   59 +-
 .../labseer/dto/ExperimentValuePathDTO.java   |   75 +-
 .../labsynch/labseer/dto/ExportResultDTO.java |   58 +-
 .../labseer/dto/FileSaveReturnArrayDTO.java   |   32 +-
 .../labseer/dto/FileSaveReturnDTO.java        |  130 +-
 .../labsynch/labseer/dto/FileSaveSendDTO.java |  155 +-
 .../com/labsynch/labseer/dto/FlagWellDTO.java |  439 +-
 .../labsynch/labseer/dto/FlatThingCsvDTO.java |  499 ++-
 .../com/labsynch/labseer/dto/GeneIdDTO.java   |   36 +-
 .../labsynch/labseer/dto/GeneOrthologDTO.java |  127 +-
 .../labseer/dto/GeneOrthologFileDTO.java      |   62 +-
 .../dto/GenericQueryCodeTableResultDTO.java   |   57 +-
 .../labseer/dto/GenericStatePathRequest.java  |   45 +-
 .../labseer/dto/GenericValuePathRequest.java  |   61 +-
 .../labseer/dto/HydrogenizeMolInputDTO.java   |   50 +-
 .../labsynch/labseer/dto/IdCollectionDTO.java |   42 +-
 .../com/labsynch/labseer/dto/IdSetDTO.java    |   24 +-
 .../com/labsynch/labseer/dto/ItxQueryDTO.java |  100 +-
 .../labsynch/labseer/dto/JSTreeNodeDTO.java   |   71 +-
 .../com/labsynch/labseer/dto/KeyValueDTO.java |   42 +-
 .../labsynch/labseer/dto/KiCurveFitDTO.java   | 1067 ++---
 .../labsynch/labseer/dto/LabelPrefixDTO.java  |  100 +-
 .../labsynch/labseer/dto/LabelQueryDTO.java   |   59 +-
 .../labseer/dto/LabelSequenceDTO.java         |   62 +-
 .../com/labsynch/labseer/dto/LicenseDTO.java  |   81 +-
 .../com/labsynch/labseer/dto/LotAliasDTO.java |  135 +-
 .../java/com/labsynch/labseer/dto/LotDTO.java |  708 +--
 .../labseer/dto/LotsByProjectDTO.java         |  104 +-
 .../labseer/dto/LsThingBrowserQueryDTO.java   |   44 +-
 .../dto/LsThingQueryCodeTableResultDTO.java   |    6 +-
 .../labsynch/labseer/dto/LsThingQueryDTO.java |  162 +-
 .../labseer/dto/LsThingQueryResultDTO.java    |   85 +-
 .../labseer/dto/LsThingStatePathDTO.java      |   59 +-
 .../labseer/dto/LsThingValidationDTO.java     |   79 +-
 .../labseer/dto/LsThingValuePathDTO.java      |   75 +-
 .../labseer/dto/LsTransactionQueryDTO.java    |   98 +-
 .../com/labsynch/labseer/dto/Metalot.java     |   58 +-
 .../labsynch/labseer/dto/MetalotReturn.java   |   55 +-
 .../labseer/dto/MetalotReturnDTO.java         |   48 +-
 .../labsynch/labseer/dto/MethodOptionDTO.java |   36 +-
 .../labseer/dto/MolCleanInputDTO.java         |   42 +-
 .../labseer/dto/MolConvertInputDTO.java       |   50 +-
 .../labseer/dto/MolConvertOutputDTO.java      |   50 +-
 .../com/labsynch/labseer/dto/MolInputDTO.java |   36 +-
 .../labseer/dto/MolPropertiesDTO.java         |   58 +-
 .../MultiContainerSubjectSearchRequest.java   |   94 +-
 .../MultiContainerSubjectSearchResultDTO.java |   92 +-
 .../labsynch/labseer/dto/ParentAliasDTO.java  |  146 +-
 .../com/labsynch/labseer/dto/ParentDTO.java   |  192 +-
 .../labsynch/labseer/dto/ParentEditDTO.java   |  204 +-
 .../labseer/dto/ParentLotCodeDTO.java         |   60 +-
 .../labseer/dto/ParentValidationDTO.java      |   70 +-
 .../labsynch/labseer/dto/PlateStubDTO.java    |   73 +-
 .../labsynch/labseer/dto/PlateWellDTO.java    |   83 +-
 .../labseer/dto/PreferredNameDTO.java         |  132 +-
 .../labseer/dto/PreferredNameRequestDTO.java  |   48 +-
 .../labseer/dto/PreferredNameResultsDTO.java  |   40 +-
 .../dto/PreferredNameWithErrorDTO.java        |   57 +-
 .../com/labsynch/labseer/dto/ProtocolDTO.java |  252 +-
 .../labseer/dto/ProtocolErrorMessageDTO.java  |   82 +-
 .../labseer/dto/ProtocolStatePathDTO.java     |   59 +-
 .../labseer/dto/ProtocolValuePathDTO.java     |   75 +-
 .../PurgeFileDependencyCheckResponseDTO.java  |   49 +-
 .../labseer/dto/PurgeFileResponseDTO.java     |   56 +-
 .../labsynch/labseer/dto/RawCurveDataDTO.java |  708 +--
 .../labsynch/labseer/dto/RegSearchDTO.java    |   59 +-
 .../labseer/dto/RegSearchParamsDTO.java       |   59 +-
 .../labseer/dto/RenderMolRequestDTO.java      |   72 +-
 .../labsynch/labseer/dto/ReparentLotDTO.java  |   50 +-
 .../labsynch/labseer/dto/RequestNameDTO.java  |   36 +-
 .../labsynch/labseer/dto/SELColOrderDTO.java  |  108 +-
 .../labseer/dto/SaltFormAliasDTO.java         |   91 +-
 .../com/labsynch/labseer/dto/SaltFormDTO.java |  144 +-
 .../labseer/dto/SearchCdIdReturnDTO.java      |   54 +-
 .../labseer/dto/SearchCompoundReturnDTO.java  |   73 +-
 .../labsynch/labseer/dto/SearchFormDTO.java   |  223 +-
 .../labseer/dto/SearchFormReturnDTO.java      |   62 +-
 .../labsynch/labseer/dto/SearchLotDTO.java    |   56 +-
 .../dto/SearchResultExportRequestDTO.java     |   49 +-
 .../labseer/dto/SetTubeLocationDTO.java       |   69 +-
 .../dto/SimpleBulkLoadPropertyDTO.java        |  235 +-
 .../dto/StandardizationDryRunSearchDTO.java   |   89 +-
 .../labseer/dto/StateValueCsvDTO.java         |  354 +-
 .../labsynch/labseer/dto/StateValueDTO.java   |   42 +-
 .../dto/StoichiometryPropertiesDTO.java       |  239 +-
 .../StoichiometryPropertiesResultsDTO.java    |   62 +-
 .../labseer/dto/StringCollectionDTO.java      |   44 +-
 .../labsynch/labseer/dto/StrippedSaltDTO.java |   52 +-
 .../dto/StructureAndThingSearchDTO.java       |   79 +-
 .../labseer/dto/StructureSearchDTO.java       |   95 +-
 .../labsynch/labseer/dto/SubjectCodeDTO.java  |   55 +-
 .../labseer/dto/SubjectCodeNameDTO.java       |   59 +-
 .../labseer/dto/SubjectCodeStateDTO.java      |   62 +-
 .../labseer/dto/SubjectCsvDataDTO.java        |   44 +-
 .../com/labsynch/labseer/dto/SubjectDTO.java  |  155 +-
 .../labsynch/labseer/dto/SubjectLabelDTO.java |  163 +-
 .../labsynch/labseer/dto/SubjectMiniDTO.java  |   58 +-
 .../labseer/dto/SubjectSearchRequest.java     |   93 +-
 .../labseer/dto/SubjectSearchResultDTO.java   |   85 +-
 .../labsynch/labseer/dto/SubjectStateDTO.java |  134 +-
 .../labseer/dto/SubjectStateMiniDTO.java      |   39 +-
 .../labseer/dto/SubjectStatePathDTO.java      |   59 +-
 .../labseer/dto/SubjectStateValueDTO.java     |   39 +-
 .../labsynch/labseer/dto/SubjectValueDTO.java |  371 +-
 .../labseer/dto/SubjectValuePathDTO.java      |   75 +-
 .../labsynch/labseer/dto/TempThingDTO.java    |   68 +-
 .../com/labsynch/labseer/dto/TgDataDTO.java   |  279 +-
 .../labseer/dto/TreatmentGroupCodeDTO.java    |   48 +-
 .../labseer/dto/TreatmentGroupMiniDTO.java    |   57 +-
 .../dto/TreatmentGroupStatePathDTO.java       |   59 +-
 .../labseer/dto/TreatmentGroupValueDTO.java   |  370 +-
 .../dto/TreatmentGroupValuePathDTO.java       |   75 +-
 .../labseer/dto/TsvLoaderResponseDTO.java     |   58 +-
 .../com/labsynch/labseer/dto/TypeDTO.java     |  158 +-
 .../com/labsynch/labseer/dto/TypeKindDTO.java |  269 +-
 .../labseer/dto/ValidationResponseDTO.java    |   60 +-
 .../labsynch/labseer/dto/ValuePathDTO.java    |  290 +-
 .../labsynch/labseer/dto/ValueQueryDTO.java   |   73 +-
 .../labsynch/labseer/dto/ValueRuleDTO.java    |  127 +-
 .../labseer/dto/ValueTypeKindDTO.java         |  120 +-
 .../labsynch/labseer/dto/WellContentDTO.java  |  196 +-
 .../com/labsynch/labseer/dto/WellStubDTO.java |  103 +-
 .../StandardizerSettingsConfigDTO.java        |   88 +-
 .../exceptions/CmpdRegMolFormatException.java |    2 +-
 .../labseer/exceptions/DupeLotException.java  |   38 +-
 .../exceptions/DupeParentException.java       |   82 +-
 .../DupeSaltFormCorpNameException.java        |   22 +-
 .../DupeSaltFormStructureException.java       |   22 +-
 .../labseer/exceptions/ErrorMessage.java      |   38 +-
 .../exceptions/JsonParseException.java        |   22 +-
 .../exceptions/LotNotFoundException.java      |   22 +-
 .../LsThingValidationErrorMessage.java        |   64 +-
 .../exceptions/MissingPropertyException.java  |   22 +-
 .../labseer/exceptions/NotFoundException.java |   17 +-
 .../exceptions/ParentNotFoundException.java   |   22 +-
 .../SaltFormMolFormatException.java           |   22 +-
 .../exceptions/SaltFormNotFoundException.java |   22 +-
 .../exceptions/SaltedCompoundException.java   |   22 +-
 .../exceptions/StandardizerException.java     |   15 +-
 .../exceptions/StructureSaveException.java    |    2 +-
 .../exceptions/TooManyResultsException.java   |   17 +-
 .../UniqueInteractionsException.java          |   44 +-
 .../exceptions/UniqueNameException.java       |   47 +-
 .../exceptions/UniqueNotebookException.java   |   21 +-
 .../service/ACASAuthenticationProvider.java   |   77 +-
 .../service/AnalysisGroupServiceImpl.java     |  639 +--
 .../service/AnalysisGroupStateService.java    |    4 +-
 .../AnalysisGroupStateServiceImpl.java        |   94 +-
 .../service/AnalysisGroupValueService.java    |   20 +-
 .../AnalysisGroupValueServiceImpl.java        |  199 +-
 .../labseer/service/AuthorRoleService.java    |    2 -
 .../service/AuthorRoleServiceImpl.java        |   46 +-
 .../labseer/service/AuthorService.java        |    3 +-
 .../labseer/service/AuthorServiceImpl.java    |  545 +--
 .../labseer/service/AutoLabelService.java     |    9 +-
 .../labseer/service/AutoLabelServiceImpl.java |  249 +-
 .../labseer/service/BulkLoadService.java      |    2 -
 .../labseer/service/BulkLoadServiceImpl.java  | 1970 +++++----
 .../labseer/service/ChemStructureService.java |   77 +-
 .../labseer/service/ContainerService.java     |   16 +-
 .../labseer/service/ContainerServiceImpl.java |   84 +-
 .../service/ContainerStateService.java        |    2 -
 .../service/ContainerStateServiceImpl.java    |  305 +-
 .../service/ContainerValueServiceImpl.java    |  174 +-
 .../labseer/service/CorpNameService.java      |    5 +-
 .../labseer/service/CorpNameServiceImpl.java  |  226 +-
 .../labseer/service/CronJobService.java       |    3 -
 .../labseer/service/CronJobServiceImpl.java   |   14 +-
 .../service/DataDictionaryService.java        |    8 +-
 .../service/DataDictionaryServiceImpl.java    |  108 +-
 .../DatabaseAuthenticationProvider.java       |  190 +-
 .../labsynch/labseer/service/ErrorList.java   |   20 +-
 .../labseer/service/ErrorMessage.java         |   50 +-
 .../labseer/service/ExperimentService.java    |   23 +-
 .../service/ExperimentServiceImpl.java        | 1247 +++---
 .../service/ExperimentStateService.java       |    6 +-
 .../service/ExperimentStateServiceImpl.java   |   57 +-
 .../service/ExperimentValueService.java       |    8 +-
 .../service/ExperimentValueServiceImpl.java   |  201 +-
 .../labseer/service/ExportService.java        |    6 +-
 .../labseer/service/ExportServiceImpl.java    |  259 +-
 .../labseer/service/GeneThingService.java     |    4 +-
 .../labseer/service/GeneThingServiceImpl.java | 3836 +++++++++--------
 .../labseer/service/IsoSaltService.java       |    1 -
 .../labseer/service/IsoSaltServiceImpl.java   |   31 +-
 .../service/ItxContainerContainerService.java |    6 +-
 .../ItxContainerContainerServiceImpl.java     |  151 +-
 ...ItxContainerContainerStateServiceImpl.java |   18 +-
 ...ItxContainerContainerValueServiceImpl.java |   18 +-
 .../ItxExperimentExperimentService.java       |    9 +-
 .../ItxExperimentExperimentServiceImpl.java   |  167 +-
 .../ItxExperimentExperimentStateService.java  |    6 +-
 ...xExperimentExperimentStateServiceImpl.java |   18 +-
 .../ItxExperimentExperimentValueService.java  |    6 +-
 ...xExperimentExperimentValueServiceImpl.java |   18 +-
 .../service/ItxLsThingLsThingService.java     |    2 -
 .../service/ItxLsThingLsThingServiceImpl.java |  189 +-
 .../service/ItxProtocolProtocolService.java   |    9 +-
 .../ItxProtocolProtocolServiceImpl.java       |  168 +-
 .../ItxProtocolProtocolStateServiceImpl.java  |   12 +-
 .../ItxProtocolProtocolValueServiceImpl.java  |   12 +-
 .../service/ItxSubjectContainerService.java   |    4 +-
 .../ItxSubjectContainerServiceImpl.java       |   72 +-
 .../ItxSubjectContainerStateServiceImpl.java  |   12 +-
 .../ItxSubjectContainerValueServiceImpl.java  |   12 +-
 .../service/LabelSequenceServiceImpl.java     |   53 +-
 .../labseer/service/LicenseService.java       |    2 -
 .../labseer/service/LicenseServiceImpl.java   |  122 +-
 .../service/LoadPreDefCorpNameService.java    |    3 -
 .../LoadPreDefCorpNameServiceImpl.java        |   14 +-
 .../labseer/service/LotAliasService.java      |    2 -
 .../labseer/service/LotAliasServiceImpl.java  |   44 +-
 .../labsynch/labseer/service/LotService.java  |    1 -
 .../labseer/service/LotServiceImpl.java       |  478 +-
 .../labseer/service/LsThingService.java       |   19 +-
 .../labseer/service/LsThingServiceImpl.java   | 2942 +++++++------
 .../service/LsThingStateServiceImpl.java      |   65 +-
 .../labseer/service/LsThingValueService.java  |    1 -
 .../service/LsThingValueServiceImpl.java      |  139 +-
 .../labseer/service/LsTransactionService.java |    1 -
 .../service/LsTransactionServiceImpl.java     |   75 +-
 .../labseer/service/MetalotService.java       |    2 -
 .../labseer/service/MetalotServiceImpl.java   |  443 +-
 .../labseer/service/ParentAliasService.java   |    2 -
 .../service/ParentAliasServiceImpl.java       |   58 +-
 .../labseer/service/ParentLotService.java     |    2 -
 .../labseer/service/ParentLotServiceImpl.java |   57 +-
 .../labseer/service/ParentService.java        |    7 +-
 .../labseer/service/ParentServiceImpl.java    |  259 +-
 .../service/ParentStructureService.java       |    2 -
 .../service/ParentStructureServiceImpl.java   |   28 +-
 .../PostSuccessfulAuthenticationHandler.java  |  111 +-
 .../labseer/service/ProtocolService.java      |   12 +-
 .../labseer/service/ProtocolServiceImpl.java  |  551 +--
 .../service/ProtocolStateServiceImpl.java     |   70 +-
 .../labseer/service/ProtocolValueService.java |    1 -
 .../service/ProtocolValueServiceImpl.java     |  139 +-
 .../labseer/service/RegSearchServiceImpl.java |   64 +-
 .../labseer/service/SaltFormService.java      |    7 +-
 .../labseer/service/SaltFormServiceImpl.java  |  182 +-
 .../labsynch/labseer/service/SaltLoader.java  |  118 +-
 .../labseer/service/SaltServiceImpl.java      |   34 +-
 .../labseer/service/SaltStructureService.java |    2 -
 .../service/SaltStructureServiceImpl.java     |   33 +-
 .../labseer/service/SearchFormService.java    |    5 +-
 .../service/SearchFormServiceImpl.java        |  386 +-
 .../labseer/service/SetupService.java         |    1 -
 .../labseer/service/SetupServiceImpl.java     |   65 +-
 .../service/StandardizationService.java       |    9 +-
 .../service/StandardizationServiceImpl.java   |  146 +-
 .../service/StructureImageServiceImpl.java    |   26 +-
 .../labseer/service/StructureService.java     |    9 +-
 .../labseer/service/StructureServiceImpl.java |  221 +-
 .../labseer/service/SubjectService.java       |   26 +-
 .../labseer/service/SubjectServiceImpl.java   |  609 +--
 .../labseer/service/SubjectStateService.java  |    2 -
 .../service/SubjectStateServiceImpl.java      |  128 +-
 .../labseer/service/SubjectValueService.java  |   21 +-
 .../service/SubjectValueServiceImpl.java      |  161 +-
 .../service/TreatmentGroupService.java        |    6 +-
 .../service/TreatmentGroupServiceImpl.java    |  308 +-
 .../service/TreatmentGroupStateService.java   |    2 -
 .../TreatmentGroupStateServiceImpl.java       |   87 +-
 .../service/TreatmentGroupValueService.java   |   15 +-
 .../TreatmentGroupValueServiceImpl.java       |  171 +-
 .../labseer/utils/ACASHttpFirewall.java       |    3 +-
 .../labseer/utils/BitSetUserType.java         |    8 +-
 .../labseer/utils/ByteArrayTransformer.java   |   16 +-
 .../utils/CustomBigDecimalFactory.java        |    5 +-
 .../labseer/utils/DeleteAllParents.java       |    6 +-
 .../labsynch/labseer/utils/ExcludeNulls.java  |    7 +-
 .../labsynch/labseer/utils/InitialSetup.java  |  187 +-
 .../utils/ItxLsThingLsThingComparator.java    |    4 +-
 .../labseer/utils/LoadCompoundsUtil.java      |  167 +-
 .../labseer/utils/LoadFullCompoundsUtil.java  |  156 +-
 .../utils/LsThingComparatorByBatchNumber.java |    8 +-
 .../utils/LsThingComparatorByCodeName.java    |    4 +-
 .../com/labsynch/labseer/utils/MigrateDB.java |    6 +-
 .../labsynch/labseer/utils/MimeTypeUtil.java  |   42 +-
 .../labsynch/labseer/utils/MoleculeUtil.java  |   47 +-
 .../utils/PhysicalNamingStrategyImpl.java     |    7 +-
 .../PostSuccessfulAuthenticationHandler.java  |   32 +-
 .../labseer/utils/PropertiesFileService.java  |    3 -
 .../utils/PropertiesFileServiceImpl.java      |   27 +-
 .../labseer/utils/PropertiesUtilService.java  |   66 +-
 .../utils/PropertiesUtilServiceImpl.java      |  512 ++-
 .../com/labsynch/labseer/utils/Request.java   |   10 +-
 .../com/labsynch/labseer/utils/Response.java  |   10 +-
 .../labsynch/labseer/utils/SecurityUtil.java  |   29 +-
 .../labsynch/labseer/utils/SecurityUtils.java |   50 +-
 .../labseer/utils/SetupPropertiesUtils.java   |    5 +-
 .../labsynch/labseer/utils/SimpleUtil.java    |  551 +--
 .../com/labsynch/labseer/utils/StatCalc.java  |   25 +-
 ...plicationConversionServiceFactoryBean.java | 1425 +++---
 ...0_2__Add_standardization_jchem_tables.java |   19 +-
 .../api/ApiAnalysisGroupControllerTest.java   |   90 +-
 .../labseer/api/ApiAuthorControllerTest.java  |  410 +-
 .../api/ApiAuthorRoleControllerTest.java      |  110 +-
 .../api/ApiCompoundsControllerTest.java       |   61 +-
 .../api/ApiContainerControllerTest.java       | 2709 ++++++------
 .../api/ApiContainerStateControllerTest.java  |  189 +-
 .../api/ApiCurveFitControllerTest.java        |  181 +-
 .../api/ApiDDictValueControllerTest.java      |  182 +-
 .../ApiExperimentControllerGetDataTest.java   |   61 +-
 .../api/ApiExperimentControllerSaveTest.java  |   71 +-
 .../api/ApiExperimentControllerTest.java      |  392 +-
 .../api/ApiGeneThingsControllerTest.java      |   64 +-
 ...ItxExperimentExperimentControllerTest.java |  252 +-
 .../ApiItxProtocolProtocolControllerTest.java |  192 +-
 .../ApiItxSubjectContainerControllerTest.java |   58 +-
 .../api/ApiLabelSequenceControllerTest.java   |   56 +-
 .../api/ApiLsThingControllerPostTest.java     |   85 +-
 .../api/ApiLsThingControllerSearchTest.java   |  264 +-
 .../labseer/api/ApiLsThingControllerTest.java | 1154 ++---
 .../api/ApiProtocolControllerTest.java        |  379 +-
 .../labseer/api/ApiSetupControllerTest.java   |  720 ++--
 .../api/ApiStructureControllerTest.java       |  161 +-
 .../labseer/api/ApiSubjectControllerTest.java |  156 +-
 .../labseer/api/ApiValueControllerTest.java   |  380 +-
 .../api/ApiValueKindControllerTest.java       |   83 +-
 .../domain/AnalysisGroupDataOnDemand.java     |   52 +-
 .../domain/AnalysisGroupIntegrationTest.java  |   62 +-
 .../AnalysisGroupLabelDataOnDemand.java       |   63 +-
 .../AnalysisGroupLabelIntegrationTest.java    |   62 +-
 .../AnalysisGroupStateDataOnDemand.java       |   59 +-
 .../AnalysisGroupStateIntegrationTest.java    |   62 +-
 .../AnalysisGroupValueDataOnDemand.java       |  114 +-
 .../AnalysisGroupValueIntegrationTest.java    |   62 +-
 .../labseer/domain/AuthorDataOnDemand.java    |   75 +-
 .../labseer/domain/AuthorIntegrationTest.java |   48 +-
 .../labsynch/labseer/domain/AuthorTest.java   |   73 +-
 .../labseer/domain/ContainerDataOnDemand.java |   58 +-
 .../domain/ContainerIntegrationTest.java      |   47 +-
 .../domain/ContainerKindDataOnDemand.java     |   28 +-
 .../domain/ContainerKindIntegrationTest.java  |   60 +-
 .../domain/ContainerLabelDataOnDemand.java    |   60 +-
 .../domain/ContainerLabelIntegrationTest.java |   62 +-
 .../domain/ContainerStateDataOnDemand.java    |   56 +-
 .../domain/ContainerStateIntegrationTest.java |   62 +-
 .../domain/ContainerTypeDataOnDemand.java     |   22 +-
 .../domain/ContainerTypeIntegrationTest.java  |   60 +-
 .../domain/ContainerValueDataOnDemand.java    |  111 +-
 .../domain/ContainerValueIntegrationTest.java |   62 +-
 .../domain/ExperimentDataOnDemand.java        |   58 +-
 .../domain/ExperimentIntegrationTest.java     |   59 +-
 .../domain/ExperimentKindDataOnDemand.java    |   28 +-
 .../domain/ExperimentKindIntegrationTest.java |   60 +-
 .../domain/ExperimentLabelDataOnDemand.java   |   63 +-
 .../ExperimentLabelIntegrationTest.java       |   62 +-
 .../domain/ExperimentStateDataOnDemand.java   |   59 +-
 .../ExperimentStateIntegrationTest.java       |   62 +-
 .../domain/ExperimentTypeDataOnDemand.java    |   22 +-
 .../domain/ExperimentTypeIntegrationTest.java |   60 +-
 .../domain/ExperimentValueDataOnDemand.java   |  114 +-
 .../ExperimentValueIntegrationTest.java       |   62 +-
 .../domain/InteractionKindDataOnDemand.java   |   31 +-
 .../InteractionKindIntegrationTest.java       |   60 +-
 .../domain/InteractionTypeDataOnDemand.java   |   27 +-
 .../InteractionTypeIntegrationTest.java       |   60 +-
 .../ItxContainerContainerDataOnDemand.java    |   61 +-
 .../ItxContainerContainerIntegrationTest.java |   77 +-
 ...txContainerContainerStateDataOnDemand.java |   57 +-
 ...ontainerContainerStateIntegrationTest.java |   85 +-
 ...txContainerContainerValueDataOnDemand.java |  112 +-
 ...ontainerContainerValueIntegrationTest.java |   85 +-
 .../ItxSubjectContainerDataOnDemand.java      |   63 +-
 .../ItxSubjectContainerIntegrationTest.java   |   62 +-
 .../ItxSubjectContainerStateDataOnDemand.java |   57 +-
 ...xSubjectContainerStateIntegrationTest.java |   85 +-
 .../ItxSubjectContainerValueDataOnDemand.java |  112 +-
 ...xSubjectContainerValueIntegrationTest.java |   85 +-
 .../labseer/domain/LabelKindDataOnDemand.java |   26 +-
 .../domain/LabelKindIntegrationTest.java      |   45 +-
 .../domain/LabelSequenceDataOnDemand.java     |   45 +-
 .../domain/LabelSequenceIntegrationTest.java  |   60 +-
 .../labseer/domain/LabelTypeDataOnDemand.java |   22 +-
 .../domain/LabelTypeIntegrationTest.java      |   45 +-
 .../domain/LsInteractionDataOnDemand.java     |   56 +-
 .../domain/LsInteractionIntegrationTest.java  |   62 +-
 .../domain/LsTransactionDataOnDemand.java     |   35 +-
 .../domain/LsTransactionIntegrationTest.java  |   60 +-
 .../domain/OperatorTypeDataOnDemand.java      |   22 +-
 .../domain/OperatorTypeIntegrationTest.java   |   60 +-
 .../labseer/domain/ProtocolDataOnDemand.java  |   54 +-
 .../domain/ProtocolIntegrationTest.java       |   47 +-
 .../domain/ProtocolKindDataOnDemand.java      |   28 +-
 .../domain/ProtocolKindIntegrationTest.java   |   60 +-
 .../domain/ProtocolLabelDataOnDemand.java     |   60 +-
 .../domain/ProtocolLabelIntegrationTest.java  |   62 +-
 .../domain/ProtocolStateDataOnDemand.java     |   56 +-
 .../domain/ProtocolStateIntegrationTest.java  |   62 +-
 .../domain/ProtocolTypeDataOnDemand.java      |   22 +-
 .../domain/ProtocolTypeIntegrationTest.java   |   60 +-
 .../domain/ProtocolValueDataOnDemand.java     |  111 +-
 .../domain/ProtocolValueIntegrationTest.java  |   62 +-
 .../labseer/domain/StateKindDataOnDemand.java |   28 +-
 .../domain/StateKindIntegrationTest.java      |   45 +-
 .../labseer/domain/StateTypeDataOnDemand.java |   22 +-
 .../domain/StateTypeIntegrationTest.java      |   45 +-
 .../labseer/domain/SubjectDataOnDemand.java   |   52 +-
 .../domain/SubjectIntegrationTest.java        |   47 +-
 .../domain/SubjectStateDataOnDemand.java      |   56 +-
 .../domain/SubjectStateIntegrationTest.java   |   62 +-
 .../domain/SubjectValueDataOnDemand.java      |  111 +-
 .../domain/SubjectValueIntegrationTest.java   |   62 +-
 .../labseer/domain/ThingKindDataOnDemand.java |   28 +-
 .../domain/ThingKindIntegrationTest.java      |   45 +-
 .../domain/ThingPageArchiveDataOnDemand.java  |   57 +-
 .../ThingPageArchiveIntegrationTest.java      |   60 +-
 .../labseer/domain/ThingPageDataOnDemand.java |   52 +-
 .../domain/ThingPageIntegrationTest.java      |   45 +-
 .../labseer/domain/ThingTypeDataOnDemand.java |   22 +-
 .../domain/ThingTypeIntegrationTest.java      |   45 +-
 .../domain/TreatmentGroupDataOnDemand.java    |   52 +-
 .../domain/TreatmentGroupIntegrationTest.java |   62 +-
 .../TreatmentGroupStateDataOnDemand.java      |   59 +-
 .../TreatmentGroupStateIntegrationTest.java   |   62 +-
 .../TreatmentGroupValueDataOnDemand.java      |  114 +-
 .../TreatmentGroupValueIntegrationTest.java   |   62 +-
 .../labseer/domain/UnitKindDataOnDemand.java  |   28 +-
 .../domain/UnitKindIntegrationTest.java       |   45 +-
 .../labseer/domain/UnitTypeDataOnDemand.java  |   22 +-
 .../domain/UnitTypeIntegrationTest.java       |   45 +-
 .../labseer/domain/UpdateLogDataOnDemand.java |   37 +-
 .../domain/UpdateLogIntegrationTest.java      |   45 +-
 .../labseer/domain/ValueKindDataOnDemand.java |   28 +-
 .../domain/ValueKindIntegrationTest.java      |   45 +-
 .../labseer/domain/ValueTypeDataOnDemand.java |   22 +-
 .../domain/ValueTypeIntegrationTest.java      |   45 +-
 .../domainImpl/AnalysisGroupValueTest.java    |  124 +-
 .../domainImpl/ExperimentStateTest.java       |   40 +-
 .../labseer/domainImpl/ExperimentTest.java    |   14 +-
 .../domainImpl/ExperimentValueTest.java       |   53 +-
 .../labseer/domainImpl/ItxLsThingsTest.java   |   24 +-
 .../labseer/domainImpl/LsThingTest.java       |   90 +-
 .../labseer/domainImpl/SubjectValueTest.java  |   64 +-
 .../domainImpl/TreatmentGroupValueTest.java   |   68 +-
 .../labseer/dto/CmpdRegBatchCodeDTOTest.java  |   34 +-
 .../labseer/dto/CodeTableDTOTest.java         |   17 +-
 .../labsynch/labseer/dto/CurveFitDTOTest.java |   37 +-
 .../labsynch/labseer/dto/FlagWellDTOTest.java |   27 +-
 .../labseer/dto/RawCurveDataDTOTest.java      |   15 +-
 .../labsynch/labseer/dto/TgDataDTOTest.java   |   13 +-
 .../labseer/dto/ValueTypeKindDTOTest.java     |   10 +-
 .../labseer/manytomany/AnalysisGroupTest.java |  339 +-
 .../manytomany/ExperimentStatusTests.java     |   16 +-
 .../labseer/manytomany/ExperimentTest.java    |  430 +-
 .../labsynch/labseer/manytomany/ItxTest.java  |  222 +-
 .../labseer/manytomany/SubjectTest.java       |  216 +-
 .../manytomany/TreatmentGroupTest.java        |  257 +-
 .../service/AnalysisGroupServiceTests.java    |  680 ++-
 .../AnalysisGroupStateServiceTest.java        |   78 +-
 .../AnalysisGroupValueServiceTest.java        |  330 +-
 .../AnalysisGroupValueServiceTest2.java       |   55 +-
 .../labseer/service/AuthorServiceTests.java   |   10 +-
 .../labseer/service/AutoLabelServiceTest.java |   35 +-
 .../service/ContainerLSServiceTests.java      |  995 +++--
 .../ContainerLabelJsonServiceTests.java       |   32 +-
 .../CreateAnalysisGroupsFromCSVFileTests.java |   68 +-
 .../CreateGeneIDsFromCSVFileTests.java        |  176 +-
 .../labseer/service/CreateProjectsTests.java  |  140 +-
 .../labseer/service/CronJobServiceTests.java  |   16 +-
 .../service/DataDictionaryCodeNameTest.java   |   17 +-
 .../service/ExperimentServiceTests.java       |  232 +-
 .../service/ExperimentServiceTests2.java      |  344 +-
 .../ExperimentServiceTests3_Nodes.java        |   77 +-
 .../service/ExperimentServiceTests4_Save.java |   96 +-
 .../service/ExperimentStateServiceTests.java  |   74 +-
 .../service/ExperimentValueServiceTests.java  |  225 +-
 .../labseer/service/GeneDataServiceTests.java |   35 +-
 .../service/GeneThingServiceTests.java        |   55 +-
 .../ItxLsThingLsThingServiceTests.java        |  140 +-
 .../ItxSubjectContainerServiceTest.java       |   20 +-
 .../service/LsThingGeneServiceTests.java      |  192 +-
 .../LsThingPreferredIdServiceTests.java       |  110 +-
 .../service/LsThingServicePutTests.java       |   31 +-
 .../labseer/service/LsThingServiceTests.java  |  787 ++--
 .../service/LsThingStateServiceTest.java      |   10 +-
 .../service/LsThingValueServiceTest.java      |   11 +-
 .../labseer/service/PreferredNameTest.java    |   11 +-
 .../labseer/service/ProtocolServiceTest.java  |  463 +-
 .../ReadBulkTrasnferPart1CSVServiceTests.java |  425 +-
 .../service/StructureServiceTests.java        |   83 +-
 .../labseer/service/SubjectServiceTest.java   |   87 +-
 .../service/SubjectStateServiceTest.java      |   22 +-
 .../service/SubjectValueServiceTest.java      |  156 +-
 .../TreatmentGroupStateServiceTest.java       |   19 +-
 .../TreatmentGroupValueServiceTest.java       |   76 +-
 .../labseer/service/UpdateLogServiceTest.java |   57 +-
 .../labseer/utils/InitialSetupTest.java       |   37 +-
 .../labseer/utils/LicenseCheckTest.java       |    5 +-
 .../labsynch/labseer/utils/ReadPropsTest.java |  101 +-
 .../labseer/utils/ReadResourceFileTest.java   |   90 +-
 .../utils/ReadSetupPropertiesTest.java        |   13 +-
 .../utils/ReadSeuratUsersFileTest.java        |   28 +-
 .../labseer/utils/SimpleJsonDateTest.java     |   15 +-
 .../labseer/utils/SimpleUtilTest.java         |    4 +-
 827 files changed, 68274 insertions(+), 57321 deletions(-)

diff --git a/src/main/java/com/labsynch/labseer/api/ApiAliasNameController.java b/src/main/java/com/labsynch/labseer/api/ApiAliasNameController.java
index 9fc0ba822..2af896c48 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiAliasNameController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiAliasNameController.java
@@ -23,10 +23,10 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-@RequestMapping(value = {"/api/v1/aliases"})
+@RequestMapping(value = { "/api/v1/aliases" })
 @Controller
 public class ApiAliasNameController {
-	
+
 	Logger logger = LoggerFactory.getLogger(ApiAliasNameController.class);
 
 	@Transactional
@@ -34,7 +34,7 @@ public class ApiAliasNameController {
 	@ResponseBody
 	public ResponseEntity<String> getParentByAliasName(@RequestParam String aliasName,
 			@RequestParam String lsType,
-			@RequestParam String lsKind){
+			@RequestParam String lsKind) {
 		logger.debug("incoming json from getParentByAliasName: " + aliasName);
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
@@ -43,18 +43,17 @@ public ResponseEntity<String> getParentByAliasName(@RequestParam String aliasNam
 		queryParentAlias.setLsType(lsType);
 		queryParentAlias.setLsKind(lsKind);
 		ParentAliasDTO parentAlias = ParentAliasDTO.getParentByAlias(queryParentAlias);
-		if (parentAlias != null){
+		if (parentAlias != null) {
 			return new ResponseEntity<String>(parentAlias.toJson(), headers, HttpStatus.OK);
 		} else {
 			return new ResponseEntity<String>("", headers, HttpStatus.NOT_FOUND);
 		}
 	}
 
-	
 	@Transactional
 	@RequestMapping(value = "/getParentsByAliasName", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> getParentsByAliasName(@RequestBody String json){
+	public ResponseEntity<String> getParentsByAliasName(@RequestBody String json) {
 		logger.debug("incoming json from getParentAliasName: " + json);
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
@@ -62,45 +61,45 @@ public ResponseEntity<String> getParentsByAliasName(@RequestBody String json){
 		aliasNameDTOs = ParentAliasDTO.getParentsByAlias(aliasNameDTOs);
 		return new ResponseEntity<String>(ParentAliasDTO.toJsonArray(aliasNameDTOs), headers, HttpStatus.OK);
 	}
-	
+
 	@Transactional
 	@RequestMapping(value = "/parentAliasTypes", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> getParentAliasTypes(){
+	public ResponseEntity<String> getParentAliasTypes() {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		
+
 		List<ParentAliasType> aliasTypes = ParentAliasType.findAllParentAliasTypes();
 
-		if (aliasTypes.size() > 0){
+		if (aliasTypes.size() > 0) {
 			return new ResponseEntity<String>(ParentAliasType.toJsonArray(aliasTypes), headers, HttpStatus.OK);
 		} else {
 			return new ResponseEntity<String>("[]", headers, HttpStatus.NOT_FOUND);
 		}
 	}
-	
+
 	@Transactional
 	@RequestMapping(value = "/parentAliasKinds", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> getParentAliasKinds(){
+	public ResponseEntity<String> getParentAliasKinds() {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		
+
 		List<ParentAliasKind> aliasKinds = ParentAliasKind.findAllParentAliasKinds();
 
-		if (aliasKinds.size() > 0){
+		if (aliasKinds.size() > 0) {
 			return new ResponseEntity<String>(ParentAliasKind.toJsonArray(aliasKinds), headers, HttpStatus.OK);
 		} else {
 			return new ResponseEntity<String>("[]", headers, HttpStatus.NOT_FOUND);
 		}
 	}
-	
+
 	@Transactional
 	@RequestMapping(value = "/getLotByAliasName", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	public ResponseEntity<String> getLotByAliasName(@RequestParam String aliasName,
 			@RequestParam String lsType,
-			@RequestParam String lsKind){
+			@RequestParam String lsKind) {
 		logger.debug("incoming json from getLotByAliasName: " + aliasName);
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
@@ -109,18 +108,17 @@ public ResponseEntity<String> getLotByAliasName(@RequestParam String aliasName,
 		queryLotAlias.setLsType(lsType);
 		queryLotAlias.setLsKind(lsKind);
 		LotAliasDTO lotAlias = LotAliasDTO.getLotByAlias(queryLotAlias);
-		if (lotAlias != null){
+		if (lotAlias != null) {
 			return new ResponseEntity<String>(lotAlias.toJson(), headers, HttpStatus.OK);
 		} else {
 			return new ResponseEntity<String>("", headers, HttpStatus.NOT_FOUND);
 		}
 	}
 
-	
 	@Transactional
 	@RequestMapping(value = "/getLotsByAliasName", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> getLotsByAliasName(@RequestBody String json){
+	public ResponseEntity<String> getLotsByAliasName(@RequestBody String json) {
 		logger.debug("incoming json from getLotAliasName: " + json);
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
@@ -128,33 +126,33 @@ public ResponseEntity<String> getLotsByAliasName(@RequestBody String json){
 		aliasNameDTOs = LotAliasDTO.getLotsByAlias(aliasNameDTOs);
 		return new ResponseEntity<String>(LotAliasDTO.toJsonArray(aliasNameDTOs), headers, HttpStatus.OK);
 	}
-	
+
 	@Transactional
 	@RequestMapping(value = "/lotAliasTypes", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> getLotAliasTypes(){
+	public ResponseEntity<String> getLotAliasTypes() {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		
+
 		List<LotAliasType> aliasTypes = LotAliasType.findAllLotAliasTypes();
 
-		if (aliasTypes.size() > 0){
+		if (aliasTypes.size() > 0) {
 			return new ResponseEntity<String>(LotAliasType.toJsonArray(aliasTypes), headers, HttpStatus.OK);
 		} else {
 			return new ResponseEntity<String>("[]", headers, HttpStatus.NOT_FOUND);
 		}
 	}
-	
+
 	@Transactional
 	@RequestMapping(value = "/lotAliasKinds", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> getLotAliasKinds(){
+	public ResponseEntity<String> getLotAliasKinds() {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		
+
 		List<LotAliasKind> aliasKinds = LotAliasKind.findAllLotAliasKinds();
 
-		if (aliasKinds.size() > 0){
+		if (aliasKinds.size() > 0) {
 			return new ResponseEntity<String>(LotAliasKind.toJsonArray(aliasKinds), headers, HttpStatus.OK);
 		} else {
 			return new ResponseEntity<String>("[]", headers, HttpStatus.NOT_FOUND);
diff --git a/src/main/java/com/labsynch/labseer/api/ApiAnalysisGroupController.java b/src/main/java/com/labsynch/labseer/api/ApiAnalysisGroupController.java
index b3446837f..ece94c9e2 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiAnalysisGroupController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiAnalysisGroupController.java
@@ -44,7 +44,7 @@
 public class ApiAnalysisGroupController {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiAnalysisGroupController.class);
-	
+
 	@Autowired
 	private ExperimentValueService experimentValueService;
 
@@ -53,7 +53,7 @@ public class ApiAnalysisGroupController {
 
 	@Autowired
 	private AnalysisGroupService analysisGroupService;
-	
+
 	@Autowired
 	private AnalysisGroupValueService analysisGroupValueService;
 
@@ -70,20 +70,24 @@ public ResponseEntity<String> findSubjectValues(
 			@RequestParam("stateType") String stateType,
 			@RequestParam("stateKind") String stateKind,
 			@RequestParam("stateValueType") String stateValueType,
-			@RequestParam("stateValueKind") String stateValueKind
-			) {
+			@RequestParam("stateValueKind") String stateValueKind) {
 		List<String> values = new ArrayList<String>();
 		AnalysisGroup analysisGroup = AnalysisGroup.findAnalysisGroup(id);
 
-		if (analysisGroup != null){
+		if (analysisGroup != null) {
 			Set<TreatmentGroup> treatmentGroups = analysisGroup.getTreatmentGroups();
-			for (TreatmentGroup treatmentGroup : treatmentGroups){
+			for (TreatmentGroup treatmentGroup : treatmentGroups) {
 				Set<Subject> subjects = treatmentGroup.getSubjects();
-				for (Subject subject : subjects){
-					List<SubjectState> subjectStates = SubjectState.findSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject(stateType, stateKind, subject).getResultList();
-					for (SubjectState subjectState : subjectStates){
-						List<SubjectValue> subjectValues = SubjectValue.findSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals(subjectState, stateValueType, stateValueKind).getResultList();
-						for (SubjectValue subjectValue : subjectValues){
+				for (Subject subject : subjects) {
+					List<SubjectState> subjectStates = SubjectState
+							.findSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject(stateType, stateKind, subject)
+							.getResultList();
+					for (SubjectState subjectState : subjectStates) {
+						List<SubjectValue> subjectValues = SubjectValue
+								.findSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals(subjectState, stateValueType,
+										stateValueKind)
+								.getResultList();
+						for (SubjectValue subjectValue : subjectValues) {
 							if (stateValueType.equalsIgnoreCase("stringValue")) {
 								values.add(subjectValue.getStringValue());
 							} else if (stateValueType.equalsIgnoreCase("numericValue")) {
@@ -92,7 +96,7 @@ public ResponseEntity<String> findSubjectValues(
 						}
 					}
 				}
-			}			
+			}
 		}
 
 		HttpHeaders headers = new HttpHeaders();
@@ -103,158 +107,170 @@ public ResponseEntity<String> findSubjectValues(
 		return new ResponseEntity<String>(transferDTO.toJson(), headers, HttpStatus.OK);
 	}
 
+	// @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers =
+	// "Accept=application/json")
+	// @ResponseBody
+	// public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
+	// AnalysisGroup analysisGroup = AnalysisGroup.findAnalysisGroup(id);
+	// HttpHeaders headers = new HttpHeaders();
+	// headers.add("Content-Type", "application/json; charset=utf-8");
+	// if (analysisGroup == null) {
+	// return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+	// }
+	// return new ResponseEntity<String>(analysisGroup.toJson(), headers,
+	// HttpStatus.OK);
+	// }
 
-
-//	@RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-//    @ResponseBody
-//    public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
-//        AnalysisGroup analysisGroup = AnalysisGroup.findAnalysisGroup(id);
-//        HttpHeaders headers = new HttpHeaders();
-//        headers.add("Content-Type", "application/json; charset=utf-8");
-//        if (analysisGroup == null) {
-//            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-//        }
-//        return new ResponseEntity<String>(analysisGroup.toJson(), headers, HttpStatus.OK);
-//    }
-	
 	@Transactional
-    @RequestMapping(method = RequestMethod.GET, value = "/{id}", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<java.lang.String> showJson(@PathVariable("id") Long id, @RequestParam(value = "with", required = false) String with) {
-        AnalysisGroup analysisGroup = AnalysisGroup.findAnalysisGroup(id);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        if (analysisGroup == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        if (with != null) {
-            if (with.equalsIgnoreCase("fullobject")) {
-                return new ResponseEntity<String>(analysisGroup.toFullJson(), headers, HttpStatus.OK);
-            } else if (with.equalsIgnoreCase("prettyjson")) {
-                return new ResponseEntity<String>(analysisGroup.toPrettyJson(), headers, HttpStatus.OK);
-            } else if (with.equalsIgnoreCase("prettyjsonstub")) {
-                return new ResponseEntity<String>(analysisGroup.toPrettyJsonStub(), headers, HttpStatus.OK);
-            } else {
-                return new ResponseEntity<String>("ERROR: with" + with + " route is not implemented. ", headers, HttpStatus.NOT_IMPLEMENTED);
-            }
-        } else {
-            return new ResponseEntity<String>(analysisGroup.toJson(), headers, HttpStatus.OK);
-        }
-    }
+	@RequestMapping(method = RequestMethod.GET, value = "/{id}", headers = "Accept=application/json")
+	@ResponseBody
+	public ResponseEntity<java.lang.String> showJson(@PathVariable("id") Long id,
+			@RequestParam(value = "with", required = false) String with) {
+		AnalysisGroup analysisGroup = AnalysisGroup.findAnalysisGroup(id);
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		if (analysisGroup == null) {
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		}
+		if (with != null) {
+			if (with.equalsIgnoreCase("fullobject")) {
+				return new ResponseEntity<String>(analysisGroup.toFullJson(), headers, HttpStatus.OK);
+			} else if (with.equalsIgnoreCase("prettyjson")) {
+				return new ResponseEntity<String>(analysisGroup.toPrettyJson(), headers, HttpStatus.OK);
+			} else if (with.equalsIgnoreCase("prettyjsonstub")) {
+				return new ResponseEntity<String>(analysisGroup.toPrettyJsonStub(), headers, HttpStatus.OK);
+			} else {
+				return new ResponseEntity<String>("ERROR: with" + with + " route is not implemented. ", headers,
+						HttpStatus.NOT_IMPLEMENTED);
+			}
+		} else {
+			return new ResponseEntity<String>(analysisGroup.toJson(), headers, HttpStatus.OK);
+		}
+	}
 
 	@RequestMapping(method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        List<AnalysisGroup> result = AnalysisGroup.findAllAnalysisGroups();
-        return new ResponseEntity<String>(AnalysisGroup.toJsonArray(result), headers, HttpStatus.OK);
-    }
-
-//	@RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-//    public ResponseEntity<String> createFromJson(@RequestBody String json) {
-//        AnalysisGroup analysisGroup = AnalysisGroup.fromJsonToAnalysisGroup(json);
-//        analysisGroup.persist();
-//        HttpHeaders headers = new HttpHeaders();
-//        headers.add("Content-Type", "application/json");
-//        return new ResponseEntity<String>(headers, HttpStatus.CREATED);
-//    }
-	
-    @Transactional
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> createFromJson(@RequestBody String json) {
-    	AnalysisGroup analysisGroup = AnalysisGroup.fromJsonToAnalysisGroup(json);
-        AnalysisGroup newAnalysisGroup = null;
+	@ResponseBody
+	public ResponseEntity<String> listJson() {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		List<AnalysisGroup> result = AnalysisGroup.findAllAnalysisGroups();
+		return new ResponseEntity<String>(AnalysisGroup.toJsonArray(result), headers, HttpStatus.OK);
+	}
+
+	// @RequestMapping(method = RequestMethod.POST, headers =
+	// "Accept=application/json")
+	// public ResponseEntity<String> createFromJson(@RequestBody String json) {
+	// AnalysisGroup analysisGroup = AnalysisGroup.fromJsonToAnalysisGroup(json);
+	// analysisGroup.persist();
+	// HttpHeaders headers = new HttpHeaders();
+	// headers.add("Content-Type", "application/json");
+	// return new ResponseEntity<String>(headers, HttpStatus.CREATED);
+	// }
+
+	@Transactional
+	@RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<java.lang.String> createFromJson(@RequestBody String json) {
+		AnalysisGroup analysisGroup = AnalysisGroup.fromJsonToAnalysisGroup(json);
+		AnalysisGroup newAnalysisGroup = null;
 		try {
 			newAnalysisGroup = analysisGroupService.saveLsAnalysisGroup(analysisGroup);
 		} catch (NotFoundException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        return new ResponseEntity<String>(newAnalysisGroup.toJson(), headers, HttpStatus.CREATED);
-    }
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		return new ResponseEntity<String>(newAnalysisGroup.toJson(), headers, HttpStatus.CREATED);
+	}
 
 	@RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> createFromJsonArray(@RequestBody String json) {
+	public ResponseEntity<String> createFromJsonArray(@RequestBody String json) {
 		Collection<AnalysisGroup> analysisGroups = AnalysisGroup.fromJsonArrayToAnalysisGroups(json);
 		Collection<AnalysisGroup> savedAnalysisGroups = new HashSet<AnalysisGroup>();
-        for (AnalysisGroup analysisGroup: analysisGroups) {
-        	try {
+		for (AnalysisGroup analysisGroup : analysisGroups) {
+			try {
 				AnalysisGroup savedAnalysisGroup = analysisGroupService.saveLsAnalysisGroup(analysisGroup);
 				savedAnalysisGroups.add(savedAnalysisGroup);
 			} catch (NotFoundException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
-        }
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        return new ResponseEntity<String>(AnalysisGroup.toJsonArray(savedAnalysisGroups), headers, HttpStatus.CREATED);
-    }
-	
+		}
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		return new ResponseEntity<String>(AnalysisGroup.toJsonArray(savedAnalysisGroups), headers, HttpStatus.CREATED);
+	}
+
 	@Transactional
 	@RequestMapping(method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> updateFromJson(@RequestBody AnalysisGroup analysisGroup) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        AnalysisGroup updatedAnalysisGroup = analysisGroupService.updateLsAnalysisGroup(analysisGroup);
-//        if (analysisGroup.merge() == null) {
-//            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-//        }
-        return new ResponseEntity<String>(updatedAnalysisGroup.toJson(), headers, HttpStatus.OK);
-    }
+	public ResponseEntity<String> updateFromJson(@RequestBody AnalysisGroup analysisGroup) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		AnalysisGroup updatedAnalysisGroup = analysisGroupService.updateLsAnalysisGroup(analysisGroup);
+		// if (analysisGroup.merge() == null) {
+		// return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		// }
+		return new ResponseEntity<String>(updatedAnalysisGroup.toJson(), headers, HttpStatus.OK);
+	}
 
 	@Transactional
 	@RequestMapping(value = "/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> updateFromJsonArray(@RequestBody List<AnalysisGroup> analysisGroups) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
+	public ResponseEntity<String> updateFromJsonArray(@RequestBody List<AnalysisGroup> analysisGroups) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
 		Collection<AnalysisGroup> updatedAnalysisGroups = new HashSet<AnalysisGroup>();
-        for (AnalysisGroup analysisGroup: analysisGroups) {
-        	AnalysisGroup updatedAnalysisGroup = analysisGroupService.updateLsAnalysisGroup(analysisGroup);
-        	updatedAnalysisGroups.add(updatedAnalysisGroup);
-//            if (analysisGroup.merge() == null) {
-//                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-//            }
-        }
-        return new ResponseEntity<String>(AnalysisGroup.toJsonArray(updatedAnalysisGroups), headers, HttpStatus.OK);
-    }
+		for (AnalysisGroup analysisGroup : analysisGroups) {
+			AnalysisGroup updatedAnalysisGroup = analysisGroupService.updateLsAnalysisGroup(analysisGroup);
+			updatedAnalysisGroups.add(updatedAnalysisGroup);
+			// if (analysisGroup.merge() == null) {
+			// return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+			// }
+		}
+		return new ResponseEntity<String>(AnalysisGroup.toJsonArray(updatedAnalysisGroups), headers, HttpStatus.OK);
+	}
 
 	@RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
-        AnalysisGroup analysisGroup = AnalysisGroup.findAnalysisGroup(id);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        if (analysisGroup == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        analysisGroup.remove();
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
-
-//TODO: work out a different strategy with the many to many
-//	@RequestMapping(params = "find=ByExperiment", headers = "Accept=application/json")
-//    @ResponseBody
-//    public ResponseEntity<String> jsonFindAnalysisGroupsByExperiment(@RequestParam("experiment") Experiment experiment) {
-//        HttpHeaders headers = new HttpHeaders();
-//        headers.add("Content-Type", "application/json; charset=utf-8");
-//        return new ResponseEntity<String>(AnalysisGroup.toJsonArray(AnalysisGroup.findAnalysisGroupsByExperiments(experiment).getResultList()), headers, HttpStatus.OK);
-//    }
+	public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
+		AnalysisGroup analysisGroup = AnalysisGroup.findAnalysisGroup(id);
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		if (analysisGroup == null) {
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		}
+		analysisGroup.remove();
+		return new ResponseEntity<String>(headers, HttpStatus.OK);
+	}
+
+	// TODO: work out a different strategy with the many to many
+	// @RequestMapping(params = "find=ByExperiment", headers =
+	// "Accept=application/json")
+	// @ResponseBody
+	// public ResponseEntity<String>
+	// jsonFindAnalysisGroupsByExperiment(@RequestParam("experiment") Experiment
+	// experiment) {
+	// HttpHeaders headers = new HttpHeaders();
+	// headers.add("Content-Type", "application/json; charset=utf-8");
+	// return new
+	// ResponseEntity<String>(AnalysisGroup.toJsonArray(AnalysisGroup.findAnalysisGroupsByExperiments(experiment).getResultList()),
+	// headers, HttpStatus.OK);
+	// }
 
 	@RequestMapping(params = "find=ByLsTransactionEquals", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> jsonFindAnalysisGroupsByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(AnalysisGroup.toJsonArray(AnalysisGroup.findAnalysisGroupsByLsTransactionEquals(lsTransaction).getResultList()), headers, HttpStatus.OK);
-    }
-	
+	@ResponseBody
+	public ResponseEntity<String> jsonFindAnalysisGroupsByLsTransactionEquals(
+			@RequestParam("lsTransaction") Long lsTransaction) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		return new ResponseEntity<String>(
+				AnalysisGroup.toJsonArray(
+						AnalysisGroup.findAnalysisGroupsByLsTransactionEquals(lsTransaction).getResultList()),
+				headers, HttpStatus.OK);
+	}
+
 	@RequestMapping(value = "/{analysisGroupIdOrCodeName}/agvalues/bystate/{stateType}/{stateKind}/{format}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> getAnalysisGroupValuesByIdOrCodeNameFilter31 (
+	public ResponseEntity<String> getAnalysisGroupValuesByIdOrCodeNameFilter31(
 			@PathVariable("analysisGroupIdOrCodeName") String analysisGroupIdOrCodeName,
 			@PathVariable("stateType") String stateType,
 			@PathVariable("stateKind") String stateKind,
@@ -264,20 +280,22 @@ public ResponseEntity<String> getAnalysisGroupValuesByIdOrCodeNameFilter31 (
 		headers.add("Content-Type", "application/json; charset=utf-8");
 
 		AnalysisGroup analysisGroup;
-		if(SimpleUtil.isNumeric(analysisGroupIdOrCodeName)) {
+		if (SimpleUtil.isNumeric(analysisGroupIdOrCodeName)) {
 			analysisGroup = AnalysisGroup.findAnalysisGroup(Long.valueOf(analysisGroupIdOrCodeName));
-		} else {		
+		} else {
 			try {
-				analysisGroup = AnalysisGroup.findAnalysisGroupsByCodeNameEquals(analysisGroupIdOrCodeName).getSingleResult();
-			} catch(Exception ex) {
+				analysisGroup = AnalysisGroup.findAnalysisGroupsByCodeNameEquals(analysisGroupIdOrCodeName)
+						.getSingleResult();
+			} catch (Exception ex) {
 				analysisGroup = null;
 			}
 		}
 
 		List<AnalysisGroupValue> analysisGroupValues;
-		if(analysisGroup != null) {
+		if (analysisGroup != null) {
 			Long analysisGroupId = analysisGroup.getId();
-			analysisGroupValues = analysisGroupValueService.getAnalysisGroupValuesByAnalysisGroupIdAndStateTypeKind(analysisGroupId, stateType, stateKind);
+			analysisGroupValues = analysisGroupValueService
+					.getAnalysisGroupValuesByAnalysisGroupIdAndStateTypeKind(analysisGroupId, stateType, stateKind);
 		} else {
 			analysisGroupValues = new ArrayList<AnalysisGroupValue>();
 		}
@@ -285,15 +303,16 @@ public ResponseEntity<String> getAnalysisGroupValuesByIdOrCodeNameFilter31 (
 			String outputString = analysisGroupValueService.getCsvList(analysisGroupValues);
 			return new ResponseEntity<String>(outputString, headers, HttpStatus.OK);
 		} else {
-			//default format is json
-			return new ResponseEntity<String>(AnalysisGroupValue.toJsonArray(analysisGroupValues), headers, HttpStatus.OK);
+			// default format is json
+			return new ResponseEntity<String>(AnalysisGroupValue.toJsonArray(analysisGroupValues), headers,
+					HttpStatus.OK);
 		}
 	}
-	
+
 	@RequestMapping(value = "/{analysisGroupIdOrCodeName}/subjectvalues/bystate/{stateType}/{stateKind}/{format}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> getSubjectValuesByAnalysisGroupIdOrCodeNameFilter31 (
+	public ResponseEntity<String> getSubjectValuesByAnalysisGroupIdOrCodeNameFilter31(
 			@PathVariable("analysisGroupIdOrCodeName") String analysisGroupIdOrCodeName,
 			@PathVariable("stateType") String stateType,
 			@PathVariable("stateKind") String stateKind,
@@ -303,20 +322,22 @@ public ResponseEntity<String> getSubjectValuesByAnalysisGroupIdOrCodeNameFilter3
 		headers.add("Content-Type", "application/json; charset=utf-8");
 
 		AnalysisGroup analysisGroup;
-		if(SimpleUtil.isNumeric(analysisGroupIdOrCodeName)) {
+		if (SimpleUtil.isNumeric(analysisGroupIdOrCodeName)) {
 			analysisGroup = AnalysisGroup.findAnalysisGroup(Long.valueOf(analysisGroupIdOrCodeName));
-		} else {		
+		} else {
 			try {
-				analysisGroup = AnalysisGroup.findAnalysisGroupsByCodeNameEquals(analysisGroupIdOrCodeName).getSingleResult();
-			} catch(Exception ex) {
+				analysisGroup = AnalysisGroup.findAnalysisGroupsByCodeNameEquals(analysisGroupIdOrCodeName)
+						.getSingleResult();
+			} catch (Exception ex) {
 				analysisGroup = null;
 			}
 		}
 
 		List<SubjectValue> subjectValues;
-		if(analysisGroup != null) {
+		if (analysisGroup != null) {
 			Long analysisGroupId = analysisGroup.getId();
-			subjectValues = subjectValueService.getSubjectValuesByAnalysisGroupIdAndStateTypeKind(analysisGroupId, stateType, stateKind);
+			subjectValues = subjectValueService.getSubjectValuesByAnalysisGroupIdAndStateTypeKind(analysisGroupId,
+					stateType, stateKind);
 		} else {
 			subjectValues = new ArrayList<SubjectValue>();
 		}
@@ -324,7 +345,7 @@ public ResponseEntity<String> getSubjectValuesByAnalysisGroupIdOrCodeNameFilter3
 			String outputString = subjectValueService.getCsvList(subjectValues);
 			return new ResponseEntity<String>(outputString, headers, HttpStatus.OK);
 		} else {
-			//default format is json
+			// default format is json
 			return new ResponseEntity<String>(SubjectValue.toJsonArray(subjectValues), headers, HttpStatus.OK);
 		}
 	}
@@ -332,7 +353,7 @@ public ResponseEntity<String> getSubjectValuesByAnalysisGroupIdOrCodeNameFilter3
 	@RequestMapping(value = "/{analysisGroupIdOrCodeName}/tgvalues/bystate/{stateType}/{stateKind}/{format}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> getTreatmentGroupValuesByAnalysisGroupIdOrCodeNameAndStateTypeKindFilter41 (
+	public ResponseEntity<String> getTreatmentGroupValuesByAnalysisGroupIdOrCodeNameAndStateTypeKindFilter41(
 			@PathVariable("analysisGroupIdOrCodeName") String analysisGroupIdOrCodeName,
 			@PathVariable("stateType") String stateType,
 			@PathVariable("stateKind") String stateKind,
@@ -342,20 +363,22 @@ public ResponseEntity<String> getTreatmentGroupValuesByAnalysisGroupIdOrCodeName
 		headers.add("Content-Type", "application/json; charset=utf-8");
 
 		AnalysisGroup analysisGroup;
-		if(SimpleUtil.isNumeric(analysisGroupIdOrCodeName)) {
+		if (SimpleUtil.isNumeric(analysisGroupIdOrCodeName)) {
 			analysisGroup = AnalysisGroup.findAnalysisGroup(Long.valueOf(analysisGroupIdOrCodeName));
-		} else {		
+		} else {
 			try {
-				analysisGroup = AnalysisGroup.findAnalysisGroupsByCodeNameEquals(analysisGroupIdOrCodeName).getSingleResult();
-			} catch(Exception ex) {
+				analysisGroup = AnalysisGroup.findAnalysisGroupsByCodeNameEquals(analysisGroupIdOrCodeName)
+						.getSingleResult();
+			} catch (Exception ex) {
 				analysisGroup = null;
 			}
 		}
 
 		List<TreatmentGroupValue> treatmentGroupValues;
-		if(analysisGroup != null) {
+		if (analysisGroup != null) {
 			Long analysisGroupId = analysisGroup.getId();
-			treatmentGroupValues = treatmentGroupValueService.getTreatmentGroupValuesByAnalysisGroupIdAndStateTypeKind(analysisGroupId, stateType, stateKind);
+			treatmentGroupValues = treatmentGroupValueService
+					.getTreatmentGroupValuesByAnalysisGroupIdAndStateTypeKind(analysisGroupId, stateType, stateKind);
 		} else {
 			treatmentGroupValues = new ArrayList<TreatmentGroupValue>();
 		}
@@ -363,16 +386,17 @@ public ResponseEntity<String> getTreatmentGroupValuesByAnalysisGroupIdOrCodeName
 			String outputString = treatmentGroupValueService.getCsvList(treatmentGroupValues);
 			return new ResponseEntity<String>(outputString, headers, HttpStatus.OK);
 		} else {
-			//default format is json
-			return new ResponseEntity<String>(TreatmentGroupValue.toJsonArray(treatmentGroupValues), headers, HttpStatus.OK);
+			// default format is json
+			return new ResponseEntity<String>(TreatmentGroupValue.toJsonArray(treatmentGroupValues), headers,
+					HttpStatus.OK);
 		}
 
 	}
-	
+
 	@RequestMapping(value = "/{analysisGroupIdOrCodeName}/agvalues/bystate/{stateType}/{stateKind}/byvalue/{valueType}/{valueKind}/{format}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> getAnalysisGroupValueByIdOrCodeNameAndStateTypeKindAndValueTypeKindFilter3 (
+	public ResponseEntity<String> getAnalysisGroupValueByIdOrCodeNameAndStateTypeKindAndValueTypeKindFilter3(
 			@PathVariable("analysisGroupIdOrCodeName") String analysisGroupIdOrCodeName,
 			@PathVariable("stateType") String stateType,
 			@PathVariable("stateKind") String stateKind,
@@ -384,20 +408,23 @@ public ResponseEntity<String> getAnalysisGroupValueByIdOrCodeNameAndStateTypeKin
 		headers.add("Content-Type", "application/json; charset=utf-8");
 
 		AnalysisGroup analysisGroup;
-		if(SimpleUtil.isNumeric(analysisGroupIdOrCodeName)) {
+		if (SimpleUtil.isNumeric(analysisGroupIdOrCodeName)) {
 			analysisGroup = AnalysisGroup.findAnalysisGroup(Long.valueOf(analysisGroupIdOrCodeName));
-		} else {		
+		} else {
 			try {
-				analysisGroup = AnalysisGroup.findAnalysisGroupsByCodeNameEquals(analysisGroupIdOrCodeName).getSingleResult();
-			} catch(Exception ex) {
+				analysisGroup = AnalysisGroup.findAnalysisGroupsByCodeNameEquals(analysisGroupIdOrCodeName)
+						.getSingleResult();
+			} catch (Exception ex) {
 				analysisGroup = null;
 			}
 		}
 
 		List<AnalysisGroupValue> analysisGroupValues;
-		if(analysisGroup != null) {
+		if (analysisGroup != null) {
 			Long analysisGroupId = analysisGroup.getId();
-			analysisGroupValues = analysisGroupValueService.getAnalysisGroupValuesByAnalysisGroupIdAndStateTypeKindAndValueTypeKind(analysisGroupId, stateType, stateKind, valueType, valueKind);
+			analysisGroupValues = analysisGroupValueService
+					.getAnalysisGroupValuesByAnalysisGroupIdAndStateTypeKindAndValueTypeKind(analysisGroupId, stateType,
+							stateKind, valueType, valueKind);
 		} else {
 			analysisGroupValues = new ArrayList<AnalysisGroupValue>();
 		}
@@ -405,11 +432,10 @@ public ResponseEntity<String> getAnalysisGroupValueByIdOrCodeNameAndStateTypeKin
 			String outputString = analysisGroupValueService.getCsvList(analysisGroupValues);
 			return new ResponseEntity<String>(outputString, headers, HttpStatus.OK);
 		} else {
-			//default format is json
-			return new ResponseEntity<String>(AnalysisGroupValue.toJsonArray(analysisGroupValues), headers, HttpStatus.OK);
+			// default format is json
+			return new ResponseEntity<String>(AnalysisGroupValue.toJsonArray(analysisGroupValues), headers,
+					HttpStatus.OK);
 		}
 	}
 
-
-	
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiAnalysisGroupValueController.java b/src/main/java/com/labsynch/labseer/api/ApiAnalysisGroupValueController.java
index 1c8b16962..068f8fd4d 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiAnalysisGroupValueController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiAnalysisGroupValueController.java
@@ -41,81 +41,103 @@
 public class ApiAnalysisGroupValueController {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiAnalysisGroupValueController.class);
-	
+
 	@Autowired
 	private AnalysisGroupValueService analysisGroupValueService;
 
 	@RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> deleteById(@PathVariable("id") Long id) {
-        AnalysisGroupValue analysisGroupValue = AnalysisGroupValue.findAnalysisGroupValue(id);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        if (analysisGroupValue == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        analysisGroupValue.remove();
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
-    }
+	public ResponseEntity<String> deleteById(@PathVariable("id") Long id) {
+		AnalysisGroupValue analysisGroupValue = AnalysisGroupValue.findAnalysisGroupValue(id);
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		if (analysisGroupValue == null) {
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		}
+		analysisGroupValue.remove();
+		return new ResponseEntity<String>(headers, HttpStatus.OK);
+	}
 
 	@RequestMapping(params = "find=ByCodeValueEquals", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> jsonFindAnalysisGroupValuesByCodeValueEquals(@RequestParam("codeValue") String codeValue) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(AnalysisGroupValue.toJsonArray(AnalysisGroupValue.findAnalysisGroupValuesByCodeValueEquals(codeValue).getResultList()), headers, HttpStatus.OK);
-    }
+	@ResponseBody
+	public ResponseEntity<String> jsonFindAnalysisGroupValuesByCodeValueEquals(
+			@RequestParam("codeValue") String codeValue) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		return new ResponseEntity<String>(
+				AnalysisGroupValue.toJsonArray(
+						AnalysisGroupValue.findAnalysisGroupValuesByCodeValueEquals(codeValue).getResultList()),
+				headers, HttpStatus.OK);
+	}
 
 	@RequestMapping(params = "find=ByIgnoredNotAndCodeValueEquals", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> jsonFindAnalysisGroupValuesByIgnoredNotAndCodeValueEquals(@RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam("codeValue") String codeValue) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(AnalysisGroupValue.toJsonArray(AnalysisGroupValue.findAnalysisGroupValuesByIgnoredNotAndCodeValueEquals(ignored, codeValue).getResultList()), headers, HttpStatus.OK);
-    }
+	@ResponseBody
+	public ResponseEntity<String> jsonFindAnalysisGroupValuesByIgnoredNotAndCodeValueEquals(
+			@RequestParam(value = "ignored", required = false) boolean ignored,
+			@RequestParam("codeValue") String codeValue) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		return new ResponseEntity<String>(
+				AnalysisGroupValue.toJsonArray(AnalysisGroupValue
+						.findAnalysisGroupValuesByIgnoredNotAndCodeValueEquals(ignored, codeValue).getResultList()),
+				headers, HttpStatus.OK);
+	}
 
 	@RequestMapping(params = "find=ByLsState", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> jsonFindAnalysisGroupValuesByLsState(@RequestParam("lsState") AnalysisGroupState lsState) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(AnalysisGroupValue.toJsonArray(AnalysisGroupValue.findAnalysisGroupValuesByLsState(lsState).getResultList()), headers, HttpStatus.OK);
-    }
+	@ResponseBody
+	public ResponseEntity<String> jsonFindAnalysisGroupValuesByLsState(
+			@RequestParam("lsState") AnalysisGroupState lsState) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		return new ResponseEntity<String>(
+				AnalysisGroupValue
+						.toJsonArray(AnalysisGroupValue.findAnalysisGroupValuesByLsState(lsState).getResultList()),
+				headers, HttpStatus.OK);
+	}
 
 	@RequestMapping(params = "find=ByLsTransactionEquals", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> jsonFindAnalysisGroupValuesByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(AnalysisGroupValue.toJsonArray(AnalysisGroupValue.findAnalysisGroupValuesByLsTransactionEquals(lsTransaction).getResultList()), headers, HttpStatus.OK);
-    }
+	@ResponseBody
+	public ResponseEntity<String> jsonFindAnalysisGroupValuesByLsTransactionEquals(
+			@RequestParam("lsTransaction") Long lsTransaction) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		return new ResponseEntity<String>(
+				AnalysisGroupValue.toJsonArray(
+						AnalysisGroupValue.findAnalysisGroupValuesByLsTransactionEquals(lsTransaction).getResultList()),
+				headers, HttpStatus.OK);
+	}
 
 	@RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEquals", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> jsonFindAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(AnalysisGroupValue.toJsonArray(AnalysisGroupValue.findAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals(lsType, lsKind).getResultList()), headers, HttpStatus.OK);
-    }
-	
+	@ResponseBody
+	public ResponseEntity<String> jsonFindAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals(
+			@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		return new ResponseEntity<String>(
+				AnalysisGroupValue.toJsonArray(AnalysisGroupValue
+						.findAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals(lsType, lsKind).getResultList()),
+				headers, HttpStatus.OK);
+	}
+
 	// custom code for gene ID queries
 	@RequestMapping(value = "/geneCodeData", method = RequestMethod.POST, headers = "Accept=application/json")
 	public ResponseEntity<java.lang.String> getGeneCodeData(
-			@RequestBody String json, 
-			@RequestParam(value = "format", required = false) String format, 
+			@RequestBody String json,
+			@RequestParam(value = "format", required = false) String format,
 			@RequestParam(value = "onlyPublicData", required = false) String onlyPublicData) {
 		logger.debug("incoming json: " + json);
-		Collection<String> batchCodes = new JSONDeserializer<List<String>>().use(null, ArrayList.class).use("values", String.class).deserialize(json);
+		Collection<String> batchCodes = new JSONDeserializer<List<String>>().use(null, ArrayList.class)
+				.use("values", String.class).deserialize(json);
 		Set<String> geneCodeList = new HashSet<String>();
 		geneCodeList.addAll(batchCodes);
 
 		Boolean publicData = false;
-		if (onlyPublicData != null && onlyPublicData.equalsIgnoreCase("true")){
+		if (onlyPublicData != null && onlyPublicData.equalsIgnoreCase("true")) {
 			publicData = true;
 		}
 
 		List<AnalysisGroupValueDTO> agValues = null;
 		try {
-			if (publicData){
+			if (publicData) {
 				agValues = AnalysisGroupValue.findAnalysisGroupValueDTO(geneCodeList, publicData).getResultList();
 			} else {
 				agValues = AnalysisGroupValue.findAnalysisGroupValueDTO(geneCodeList).getResultList();
@@ -158,28 +180,28 @@ public ResponseEntity<java.lang.String> getGeneCodeData(
 		}
 	}
 
-	
 	// custom code for agv queries
 	@Transactional
 	@RequestMapping(value = "/getValues/byIdList", method = RequestMethod.POST, headers = "Accept=application/json")
 	public ResponseEntity<java.lang.String> getAgValues(
-			@RequestBody String json, 
-			@RequestParam(value = "format", required = false) String format, 
+			@RequestBody String json,
+			@RequestParam(value = "format", required = false) String format,
 			@RequestParam(value = "onlyPublicData", required = false) String onlyPublicData) {
 		logger.debug("incoming json: " + json);
 		IdSetDTO idSet = IdSetDTO.fromJsonToIdSetDTO(json);
 		boolean onlyPublicDataBoolean = false;
-		if (onlyPublicData.trim().equalsIgnoreCase("true")){
+		if (onlyPublicData.trim().equalsIgnoreCase("true")) {
 			onlyPublicDataBoolean = true;
-		} 
-		List<AnalysisGroupValue> agValues = AnalysisGroupValue.findAnalysisGroupValuesByIdList(idSet.getIdSet(), onlyPublicDataBoolean).getResultList();
+		}
+		List<AnalysisGroupValue> agValues = AnalysisGroupValue
+				.findAnalysisGroupValuesByIdList(idSet.getIdSet(), onlyPublicDataBoolean).getResultList();
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		if (format.equalsIgnoreCase("tsv")) {
 			String outputString = analysisGroupValueService.getCsvList(agValues);
 			return new ResponseEntity<String>(outputString, headers, HttpStatus.OK);
 		} else {
-			//default format is json
+			// default format is json
 			return new ResponseEntity<String>(AnalysisGroupValue.toJsonArray(agValues), headers, HttpStatus.OK);
 		}
 	}
diff --git a/src/main/java/com/labsynch/labseer/api/ApiAuthorController.java b/src/main/java/com/labsynch/labseer/api/ApiAuthorController.java
index 916fda501..cbf814020 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiAuthorController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiAuthorController.java
@@ -40,68 +40,70 @@ public class ApiAuthorController {
 
 	@Autowired
 	private AuthorService authorService;
-	
+
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
 
 	@Autowired
 	private PropertiesFileService propertiesFileService;
 
-	@RequestMapping(value="/{format}", method = RequestMethod.GET, headers = "Accept=application/json")
+	@RequestMapping(value = "/{format}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	public ResponseEntity<java.lang.String> listJsonWithFormat(@PathVariable("format") String format) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		List<Author> result = Author.findAllAuthors();
-		if(format.equalsIgnoreCase("codeTable")) {
-			List<CodeTableDTO> results = authorService.convertToCodeTables(result); 
+		if (format.equalsIgnoreCase("codeTable")) {
+			List<CodeTableDTO> results = authorService.convertToCodeTables(result);
 			results = CodeTableDTO.sortCodeTables(results);
 			return new ResponseEntity<String>(CodeTableDTO.toJsonArray(results), headers, HttpStatus.OK);
-		}
-		else return new ResponseEntity<String>(Author.toJsonArray(result), headers, HttpStatus.OK);
+		} else
+			return new ResponseEntity<String>(Author.toJsonArray(result), headers, HttpStatus.OK);
 	}
 
 	@RequestMapping(value = "/findByRoleName", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	public ResponseEntity<java.lang.String> listAuthorsByRoleName(@RequestParam("authorRoleName") String authorRoleName,
-			@RequestParam(value="format", required = false) String format) {
+			@RequestParam(value = "format", required = false) String format) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		try{
+		try {
 			Collection<Author> authors = authorService.findAuthorsByAuthorRoleName(authorRoleName);
-			if(format != null && format.equalsIgnoreCase("codeTable")) {
+			if (format != null && format.equalsIgnoreCase("codeTable")) {
 				List<Author> authorList = new ArrayList<Author>();
 				authorList.addAll(authors);
-				List<CodeTableDTO> results = authorService.convertToCodeTables(authorList); 
+				List<CodeTableDTO> results = authorService.convertToCodeTables(authorList);
 				results = CodeTableDTO.sortCodeTables(results);
 				return new ResponseEntity<String>(CodeTableDTO.toJsonArray(results), headers, HttpStatus.OK);
-			}
-			else return new ResponseEntity<String>(Author.toJsonArray(authors), headers, HttpStatus.OK);
-		}catch (Exception e){
-			logger.error("Caught exception looking up authors with role: "+authorRoleName, e);
+			} else
+				return new ResponseEntity<String>(Author.toJsonArray(authors), headers, HttpStatus.OK);
+		} catch (Exception e) {
+			logger.error("Caught exception looking up authors with role: " + authorRoleName, e);
 			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
-	
+
 	@RequestMapping(value = "/findByRoleTypeKindAndName", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<java.lang.String> listAuthorsByRoleTypeAndRoleKindAndRoleName(@RequestParam("roleName") String roleName,
+	public ResponseEntity<java.lang.String> listAuthorsByRoleTypeAndRoleKindAndRoleName(
+			@RequestParam("roleName") String roleName,
 			@RequestParam("roleType") String roleType,
 			@RequestParam("roleKind") String roleKind,
-			@RequestParam(value="format", required = false) String format) {
+			@RequestParam(value = "format", required = false) String format) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		try{
-			Collection<Author> authors = authorService.findAuthorsByRoleTypeAndRoleKindAndRoleName(roleType, roleKind, roleName);
-			if(format != null && format.equalsIgnoreCase("codeTable")) {
+		try {
+			Collection<Author> authors = authorService.findAuthorsByRoleTypeAndRoleKindAndRoleName(roleType, roleKind,
+					roleName);
+			if (format != null && format.equalsIgnoreCase("codeTable")) {
 				List<Author> authorList = new ArrayList<Author>();
 				authorList.addAll(authors);
-				List<CodeTableDTO> results = authorService.convertToCodeTables(authorList); 
+				List<CodeTableDTO> results = authorService.convertToCodeTables(authorList);
 				results = CodeTableDTO.sortCodeTables(results);
 				return new ResponseEntity<String>(CodeTableDTO.toJsonArray(results), headers, HttpStatus.OK);
-			}
-			else return new ResponseEntity<String>(Author.toJsonArray(authors), headers, HttpStatus.OK);
-		}catch (Exception e){
+			} else
+				return new ResponseEntity<String>(Author.toJsonArray(authors), headers, HttpStatus.OK);
+		} catch (Exception e) {
 			logger.error("Caught exception looking up authors by role type kind and name", e);
 			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
@@ -114,7 +116,8 @@ public ResponseEntity<java.lang.String> jsonFindAuthorsByName(@RequestBody Autho
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		if (propertiesUtilService.getAuthStrategy().equalsIgnoreCase("properties")) {
 			logger.debug("searching for properites user: " + authorName.getName());
-			String propertiesUserName = propertiesFileService.getUsernameProperty(propertiesUtilService.getSecurityProperties(), authorName.getName());
+			String propertiesUserName = propertiesFileService
+					.getUsernameProperty(propertiesUtilService.getSecurityProperties(), authorName.getName());
 			logger.debug("found properites user: " + propertiesUserName);
 			if (propertiesUserName != null && authorName.getName().equalsIgnoreCase(propertiesUserName)) {
 				Author author = new Author();
@@ -138,7 +141,8 @@ public ResponseEntity<java.lang.String> jsonFindAuthorsByName(@RequestBody Autho
 		return new ResponseEntity<String>("[ ]", headers, HttpStatus.NOT_FOUND);
 	}
 
-	@RequestMapping(value = "/username", params = { "userName" }, method = RequestMethod.GET, headers = "Accept=application/json")
+	@RequestMapping(value = "/username", params = {
+			"userName" }, method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	public ResponseEntity<java.lang.String> jsonFindAuthorsByUserNamePath(@RequestParam("userName") String userName) {
 		HttpHeaders headers = new HttpHeaders();
@@ -152,7 +156,8 @@ public ResponseEntity<java.lang.String> jsonFindAuthorsByUserNamePath(@RequestPa
 		}
 	}
 
-	@RequestMapping(params = { "find=ByUserName", "userName" }, method = RequestMethod.GET, headers = "Accept=application/json")
+	@RequestMapping(params = { "find=ByUserName",
+			"userName" }, method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	public ResponseEntity<java.lang.String> jsonFindAuthorsByUserName(@RequestParam("userName") String userName) {
 		HttpHeaders headers = new HttpHeaders();
@@ -166,17 +171,19 @@ public ResponseEntity<java.lang.String> jsonFindAuthorsByUserName(@RequestParam(
 		}
 	}
 
-	//    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-	//    @ResponseBody
-	//    public ResponseEntity<java.lang.String> showJson(@PathVariable("id") Long id) {
-	//        Author author = Author.findAuthor(id);
-	//        HttpHeaders headers = new HttpHeaders();
-	//        headers.add("Content-Type", "application/json; charset=utf-8");
-	//        if (author == null) {
-	//            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-	//        }
-	//        return new ResponseEntity<String>(author.toJson(), headers, HttpStatus.OK);
-	//    }
+	// @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers =
+	// "Accept=application/json")
+	// @ResponseBody
+	// public ResponseEntity<java.lang.String> showJson(@PathVariable("id") Long id)
+	// {
+	// Author author = Author.findAuthor(id);
+	// HttpHeaders headers = new HttpHeaders();
+	// headers.add("Content-Type", "application/json; charset=utf-8");
+	// if (author == null) {
+	// return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+	// }
+	// return new ResponseEntity<String>(author.toJson(), headers, HttpStatus.OK);
+	// }
 
 	@RequestMapping(method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
@@ -188,69 +195,69 @@ public ResponseEntity<java.lang.String> listJson() {
 	}
 
 	@Transactional
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> createFromJson(@RequestBody String json) {
-    	HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-    	try{
-    		Author author = Author.fromJsonToAuthor(json);
-    		author = authorService.saveAuthor(author);
-            return new ResponseEntity<String>(author.toJson(), headers, HttpStatus.CREATED);
-    	}catch (Exception e){
-    		logger.error("Caught exception saving author",e);
-    		return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
-    	}
-        
-    }
+	@RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<java.lang.String> createFromJson(@RequestBody String json) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		try {
+			Author author = Author.fromJsonToAuthor(json);
+			author = authorService.saveAuthor(author);
+			return new ResponseEntity<String>(author.toJson(), headers, HttpStatus.CREATED);
+		} catch (Exception e) {
+			logger.error("Caught exception saving author", e);
+			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
+		}
+
+	}
 
 	@RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> createFromJsonArray(@RequestBody String json) {
-    	HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try{
-        	Collection<Author> authors = Author.fromJsonArrayToAuthors(json);
-            Collection<Author> savedAuthors = new ArrayList<Author>();
-        	for (Author author : authors) {
-                Author savedAuthor = authorService.saveAuthor(author);
-                savedAuthors.add(savedAuthor);
-            }
-            return new ResponseEntity<String>(Author.toJsonArray(savedAuthors), headers, HttpStatus.CREATED);
-        }catch (Exception e){
-    		logger.error("Caught exception saving author",e);
-    		return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
-    	}
-    	
-    }
+	public ResponseEntity<java.lang.String> createFromJsonArray(@RequestBody String json) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		try {
+			Collection<Author> authors = Author.fromJsonArrayToAuthors(json);
+			Collection<Author> savedAuthors = new ArrayList<Author>();
+			for (Author author : authors) {
+				Author savedAuthor = authorService.saveAuthor(author);
+				savedAuthors.add(savedAuthor);
+			}
+			return new ResponseEntity<String>(Author.toJsonArray(savedAuthors), headers, HttpStatus.CREATED);
+		} catch (Exception e) {
+			logger.error("Caught exception saving author", e);
+			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
+		}
+
+	}
 
 	@Transactional
-    @RequestMapping(value = { "/{id}", "/" }, method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> updateFromJson(@RequestBody String json) {
-        Author author = Author.fromJsonToAuthor(json);
-    	HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        author = authorService.updateAuthor(author);
-        if (author.getId() == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        return new ResponseEntity<String>(author.toJson(), headers, HttpStatus.OK);
-    }
+	@RequestMapping(value = { "/{id}", "/" }, method = RequestMethod.PUT, headers = "Accept=application/json")
+	public ResponseEntity<java.lang.String> updateFromJson(@RequestBody String json) {
+		Author author = Author.fromJsonToAuthor(json);
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		author = authorService.updateAuthor(author);
+		if (author.getId() == null) {
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		}
+		return new ResponseEntity<String>(author.toJson(), headers, HttpStatus.OK);
+	}
 
 	@RequestMapping(value = "/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
 	public ResponseEntity<java.lang.String> updateFromJsonArray(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		try{
+		try {
 			Collection<Author> authors = Author.fromJsonArrayToAuthors(json);
 			Collection<Author> updatedAuthors = new ArrayList<Author>();
 			for (Author author : authors) {
 				Author updatedAuthor = authorService.saveAuthor(author);
 				updatedAuthors.add(updatedAuthor);
 			}
-            return new ResponseEntity<String>(Author.toJsonArray(updatedAuthors), headers, HttpStatus.OK);
-        }catch (Exception e){
-    		logger.error("Caught exception updating authors",e);
-    		return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
-    	}
+			return new ResponseEntity<String>(Author.toJsonArray(updatedAuthors), headers, HttpStatus.OK);
+		} catch (Exception e) {
+			logger.error("Caught exception updating authors", e);
+			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
+		}
 	}
 
 	@RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
@@ -269,10 +276,12 @@ public ResponseEntity<java.lang.String> deleteFromJson(@PathVariable("id") Long
 
 	@RequestMapping(params = "find=ByActivationKeyAndEmailAddress", headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<java.lang.String> jsonFindAuthorsByActivationKeyAndEmailAddress(@RequestParam("activationKey") String activationKey, @RequestParam("emailAddress") String emailAddress) {
+	public ResponseEntity<java.lang.String> jsonFindAuthorsByActivationKeyAndEmailAddress(
+			@RequestParam("activationKey") String activationKey, @RequestParam("emailAddress") String emailAddress) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		List<Author> authors = Author.findAuthorsByActivationKeyAndEmailAddress(activationKey, emailAddress).getResultList();
+		List<Author> authors = Author.findAuthorsByActivationKeyAndEmailAddress(activationKey, emailAddress)
+				.getResultList();
 		if (authors.size() == 1) {
 			return new ResponseEntity<String>(authors.get(0).toJson(), headers, HttpStatus.OK);
 		} else {
@@ -282,7 +291,8 @@ public ResponseEntity<java.lang.String> jsonFindAuthorsByActivationKeyAndEmailAd
 
 	@RequestMapping(params = "find=ByEmailAddress", headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<java.lang.String> jsonFindAuthorsByEmailAddress(@RequestParam("emailAddress") String emailAddress) {
+	public ResponseEntity<java.lang.String> jsonFindAuthorsByEmailAddress(
+			@RequestParam("emailAddress") String emailAddress) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		List<Author> authors = Author.findAuthorsByEmailAddress(emailAddress).getResultList();
@@ -293,9 +303,11 @@ public ResponseEntity<java.lang.String> jsonFindAuthorsByEmailAddress(@RequestPa
 		}
 	}
 
-	@RequestMapping(value = "/projects", params = { "find=ByUserName", "userName" }, method = RequestMethod.GET, headers = "Accept=application/json")
+	@RequestMapping(value = "/projects", params = { "find=ByUserName",
+			"userName" }, method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<java.lang.String> jsonFindAuthorProjectsByUserName(@RequestParam("userName") String userName) {
+	public ResponseEntity<java.lang.String> jsonFindAuthorProjectsByUserName(
+			@RequestParam("userName") String userName) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		Collection<LsThing> projects = authorService.getUserProjects(userName);
@@ -303,76 +315,79 @@ public ResponseEntity<java.lang.String> jsonFindAuthorProjectsByUserName(@Reques
 
 		return new ResponseEntity<String>(LsThing.toJsonArrayStub(projects), headers, HttpStatus.OK);
 	}
-	
+
 	@Transactional
-    @RequestMapping(value = "/getOrCreate", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> getOrCreateFromJson(@RequestBody String json) {
-    	Author author = Author.fromJsonToAuthor(json);
-        author = authorService.getOrCreateAuthor(author);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        return new ResponseEntity<String>(author.toJson(), headers, HttpStatus.CREATED);
-    }
-	
+	@RequestMapping(value = "/getOrCreate", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<java.lang.String> getOrCreateFromJson(@RequestBody String json) {
+		Author author = Author.fromJsonToAuthor(json);
+		author = authorService.getOrCreateAuthor(author);
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		return new ResponseEntity<String>(author.toJson(), headers, HttpStatus.CREATED);
+	}
+
 	@RequestMapping(value = "/genericBrowserSearch", method = RequestMethod.POST, headers = "Accept=application/json")
-	  public ResponseEntity<java.lang.String> genericBrowserSearch(@RequestBody String json, @RequestParam(value = "with", required = false) String with) {
-	  	HttpHeaders headers = new HttpHeaders();
-	    headers.add("Content-Type", "application/json; charset=utf-8");
-	    AuthorBrowserQueryDTO query = AuthorBrowserQueryDTO.fromJsonToAuthorBrowserQueryDTO(json);
-	    ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
-	    boolean errorsFound = false;
-	    Collection<Long> authorIds;
-	    AuthorQueryResultDTO result = new AuthorQueryResultDTO();
-	    try{
-	    	authorIds = authorService.searchAuthorIdsByBrowserQueryDTO(query);
-	    	int maxResults = 1000;
-	    	if (query.getQueryDTO().getMaxResults() != null) maxResults = query.getQueryDTO().getMaxResults();
-	    	result.setMaxResults(maxResults);
-	    	result.setNumberOfResults(authorIds.size());
-	    	if (result.getNumberOfResults() <= result.getMaxResults()){
-	    		result.setResults(authorService.getAuthorsByIds(authorIds));
-	    	}
-	    }catch (Exception e){
-	    	logger.error("Caught searching for authors in generic interaction search",e);
-	    	ErrorMessage error = new ErrorMessage();
-	        error.setErrorLevel("error");
-	        error.setMessage(e.getMessage());
-	        errors.add(error);
-	        errorsFound = true;
-	    }
-	    
-	    if (errorsFound) {
-	        return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.NOT_FOUND);
-	    } else {
-	    	if (with != null) {
-	    		if (with.equalsIgnoreCase("codeTable")) {
-	    			GenericQueryCodeTableResultDTO resultDTO = new GenericQueryCodeTableResultDTO();
-	    			resultDTO.setMaxResults(result.getMaxResults());
-	    			resultDTO.setNumberOfResults(result.getNumberOfResults());
-	    			if (result.getResults() != null){
-	    				resultDTO.setResults((Collection<CodeTableDTO>) authorService.convertToCodeTables(new ArrayList<Author>(result.getResults())));
-	    			}
-	    			return new ResponseEntity<String>(resultDTO.toJson(), headers, HttpStatus.OK);
-	    		}
-	    	}
-	    	return new ResponseEntity<String>(result.toJson(), headers, HttpStatus.OK);
-	    }
-	      
-	  }
-	
+	public ResponseEntity<java.lang.String> genericBrowserSearch(@RequestBody String json,
+			@RequestParam(value = "with", required = false) String with) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		AuthorBrowserQueryDTO query = AuthorBrowserQueryDTO.fromJsonToAuthorBrowserQueryDTO(json);
+		ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
+		boolean errorsFound = false;
+		Collection<Long> authorIds;
+		AuthorQueryResultDTO result = new AuthorQueryResultDTO();
+		try {
+			authorIds = authorService.searchAuthorIdsByBrowserQueryDTO(query);
+			int maxResults = 1000;
+			if (query.getQueryDTO().getMaxResults() != null)
+				maxResults = query.getQueryDTO().getMaxResults();
+			result.setMaxResults(maxResults);
+			result.setNumberOfResults(authorIds.size());
+			if (result.getNumberOfResults() <= result.getMaxResults()) {
+				result.setResults(authorService.getAuthorsByIds(authorIds));
+			}
+		} catch (Exception e) {
+			logger.error("Caught searching for authors in generic interaction search", e);
+			ErrorMessage error = new ErrorMessage();
+			error.setErrorLevel("error");
+			error.setMessage(e.getMessage());
+			errors.add(error);
+			errorsFound = true;
+		}
+
+		if (errorsFound) {
+			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.NOT_FOUND);
+		} else {
+			if (with != null) {
+				if (with.equalsIgnoreCase("codeTable")) {
+					GenericQueryCodeTableResultDTO resultDTO = new GenericQueryCodeTableResultDTO();
+					resultDTO.setMaxResults(result.getMaxResults());
+					resultDTO.setNumberOfResults(result.getNumberOfResults());
+					if (result.getResults() != null) {
+						resultDTO.setResults((Collection<CodeTableDTO>) authorService
+								.convertToCodeTables(new ArrayList<Author>(result.getResults())));
+					}
+					return new ResponseEntity<String>(resultDTO.toJson(), headers, HttpStatus.OK);
+				}
+			}
+			return new ResponseEntity<String>(result.toJson(), headers, HttpStatus.OK);
+		}
+
+	}
+
 	@RequestMapping(value = "/signupAuthor", method = RequestMethod.POST, headers = "Accept=application/json")
 	public ResponseEntity<java.lang.String> signupFromJson(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		try{
+		try {
 			Author author = Author.fromJsonToAuthor(json);
 			author = authorService.signupAuthor(author);
 			return new ResponseEntity<String>(author.toJson(), headers, HttpStatus.CREATED);
-		}catch (Exception e){
-			logger.error("Caught exception signing up author",e);
+		} catch (Exception e) {
+			logger.error("Caught exception signing up author", e);
 			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
-		
+
 	}
 
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiAuthorRoleController.java b/src/main/java/com/labsynch/labseer/api/ApiAuthorRoleController.java
index a42147278..7e23b4bbb 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiAuthorRoleController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiAuthorRoleController.java
@@ -25,13 +25,12 @@
 @Controller
 @RequestMapping("api/v1/authorroles")
 public class ApiAuthorRoleController {
-	
-	@Autowired
+
+    @Autowired
     private AuthorRoleService authorRoleService;
-	
-	private static final Logger logger = LoggerFactory.getLogger(ApiAuthorRoleController.class);
 
-	
+    private static final Logger logger = LoggerFactory.getLogger(ApiAuthorRoleController.class);
+
     @RequestMapping(value = "/{id}", headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<java.lang.String> showJson(@PathVariable("id") Long id) {
@@ -52,7 +51,7 @@ public ResponseEntity<java.lang.String> listJson() {
         List<AuthorRole> result = AuthorRole.findAllAuthorRoles();
         return new ResponseEntity<String>(AuthorRole.toJsonArray(result), headers, HttpStatus.OK);
     }
-    
+
     @RequestMapping(value = "/saveRoles", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<java.lang.String> createFromDTOs(@RequestBody String json) {
         Collection<AuthorRoleDTO> authorRoleDTOs = AuthorRoleDTO.fromJsonArrayToAuthorRoes(json);
@@ -101,7 +100,7 @@ public ResponseEntity<java.lang.String> updateFromJsonArray(@RequestBody List<Au
         }
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-    
+
     @RequestMapping(value = "/deleteRoles", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<java.lang.String> deleteFromDTOs(@RequestBody String json) {
         Collection<AuthorRoleDTO> authorRoleDTOs = AuthorRoleDTO.fromJsonArrayToAuthorRoes(json);
@@ -125,9 +124,12 @@ public ResponseEntity<java.lang.String> deleteFromJson(@PathVariable("id") Long
 
     @RequestMapping(params = "find=ByUserEntry", headers = "Accept=application/json")
     @ResponseBody
-    public ResponseEntity<java.lang.String> jsonFindAuthorRolesByUserEntry(@RequestParam("userEntry") Author userEntry) {
+    public ResponseEntity<java.lang.String> jsonFindAuthorRolesByUserEntry(
+            @RequestParam("userEntry") Author userEntry) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(AuthorRole.toJsonArray(AuthorRole.findAuthorRolesByUserEntry(userEntry).getResultList()), headers, HttpStatus.OK);
+        return new ResponseEntity<String>(
+                AuthorRole.toJsonArray(AuthorRole.findAuthorRolesByUserEntry(userEntry).getResultList()), headers,
+                HttpStatus.OK);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiAuthorizationController.java b/src/main/java/com/labsynch/labseer/api/ApiAuthorizationController.java
index e2375aea4..cb594f420 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiAuthorizationController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiAuthorizationController.java
@@ -36,25 +36,27 @@ public class ApiAuthorizationController {
 
 	@Autowired
 	private AuthorService authorService;
-	
+
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
 
-	@RequestMapping(value = "/projects", params = { "find=ByUserName", "userName" }, method = RequestMethod.GET, headers = "Accept=application/json")
+	@RequestMapping(value = "/projects", params = { "find=ByUserName",
+			"userName" }, method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<java.lang.String> jsonFindAuthorProjectsByUserName(@RequestParam("userName") String userName, @RequestParam(value="format", required=false) String format) {
+	public ResponseEntity<java.lang.String> jsonFindAuthorProjectsByUserName(@RequestParam("userName") String userName,
+			@RequestParam(value = "format", required = false) String format) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		Collection<LsThing> projects = authorService.getUserProjects(userName);
 		logger.debug("searching for user: " + userName);
-		if (format != null && format.equalsIgnoreCase("codeTable")){
+		if (format != null && format.equalsIgnoreCase("codeTable")) {
 			Collection<CodeTableDTO> codeTableProjects = authorService.convertProjectsToCodeTables(projects);
 			return new ResponseEntity<String>(CodeTableDTO.toJsonArray(codeTableProjects), headers, HttpStatus.OK);
 		}
 		return new ResponseEntity<String>(LsThing.toJsonArrayStub(projects), headers, HttpStatus.OK);
 	}
-	
-	@RequestMapping(value = "/groupsAndProjects", params = { }, method = RequestMethod.GET, headers = "Accept=application/json")
+
+	@RequestMapping(value = "/groupsAndProjects", params = {}, method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	public ResponseEntity<java.lang.String> getAuthRolesAndProjects() {
 		HttpHeaders headers = new HttpHeaders();
@@ -62,35 +64,36 @@ public ResponseEntity<java.lang.String> getAuthRolesAndProjects() {
 		AuthGroupsAndProjectsDTO results = authorService.getAuthGroupsAndProjects();
 		return new ResponseEntity<String>(results.toJson(), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/activateUser", params = "activate", method = RequestMethod.GET)
-	public ResponseEntity<java.lang.String> activateUser(@RequestParam(value = "activate", required = true) String activationKey, @RequestParam(value = "emailAddress", required = true) String emailAddress,Model model) {
+	public ResponseEntity<java.lang.String> activateUser(
+			@RequestParam(value = "activate", required = true) String activationKey,
+			@RequestParam(value = "emailAddress", required = true) String emailAddress, Model model) {
 		TypedQuery<Author> query = Author.findAuthorsByActivationKeyAndEmailAddress(activationKey, emailAddress);
-		Author User=query.getSingleResult();
-		if(null!=User){
-				User.setActivationDate(new Date());
-				User.setEnabled(true);
-				User.merge();
-				return new ResponseEntity<String>(HttpStatus.OK);
-		}
-		else{
+		Author User = query.getSingleResult();
+		if (null != User) {
+			User.setActivationDate(new Date());
+			User.setEnabled(true);
+			User.merge();
+			return new ResponseEntity<String>(HttpStatus.OK);
+		} else {
 			return new ResponseEntity<String>(HttpStatus.NOT_FOUND);
 		}
 
 	}
-	
+
 	@RequestMapping(value = "/resetPassword", method = RequestMethod.POST)
 	public ResponseEntity<java.lang.String> resetPassword(@RequestBody String emailAddress) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json;");
 		try {
 			authorService.resetPassword(emailAddress);
-		}catch (Exception e) {
+		} catch (Exception e) {
 			return new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST);
 		}
 		return new ResponseEntity<String>(headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/changePassword", method = RequestMethod.POST)
 	public ResponseEntity<java.lang.String> changePassword(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
@@ -99,16 +102,16 @@ public ResponseEntity<java.lang.String> changePassword(@RequestBody String json)
 		Author author;
 		try {
 			author = Author.findAuthorsByUserName(changePasswordDTO.getUsername()).getSingleResult();
-		}catch (NoResultException e) {
+		} catch (NoResultException e) {
 			return new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST);
 		}
 		try {
-			authorService.changePassword(author, changePasswordDTO.getOldPassword(), changePasswordDTO.getNewPassword(), changePasswordDTO.getNewPasswordAgain());
-		}catch (Exception e) {
+			authorService.changePassword(author, changePasswordDTO.getOldPassword(), changePasswordDTO.getNewPassword(),
+					changePasswordDTO.getNewPasswordAgain());
+		} catch (Exception e) {
 			return new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST);
 		}
 		return new ResponseEntity<String>(headers, HttpStatus.OK);
 	}
-	
-	
+
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiBulkLoadController.java b/src/main/java/com/labsynch/labseer/api/ApiBulkLoadController.java
index 1505df5eb..ec73ff18e 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiBulkLoadController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiBulkLoadController.java
@@ -24,127 +24,127 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-@RequestMapping(value = {"/api/v1/bulkload"})
+@RequestMapping(value = { "/api/v1/bulkload" })
 @Controller
 public class ApiBulkLoadController {
-	
-	Logger logger = LoggerFactory.getLogger(ApiBulkLoadController.class);
-	
-	@Autowired
-	private BulkLoadService bulkLoadService;
-	
-	@RequestMapping(value = "/templates", method = RequestMethod.GET, headers = "Accept=application/json")
+
+    Logger logger = LoggerFactory.getLogger(ApiBulkLoadController.class);
+
+    @Autowired
+    private BulkLoadService bulkLoadService;
+
+    @RequestMapping(value = "/templates", method = RequestMethod.GET, headers = "Accept=application/json")
     public ResponseEntity<String> getAllTemplates() {
-		HttpHeaders headers= new HttpHeaders();
+        HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/text");
         headers.add("Access-Control-Allow-Origin", "*");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
-		try{
-        	Collection<BulkLoadTemplate> templates = BulkLoadTemplate.findAllBulkLoadTemplates();
+        try {
+            Collection<BulkLoadTemplate> templates = BulkLoadTemplate.findAllBulkLoadTemplates();
             return new ResponseEntity<String>(BulkLoadTemplate.toJsonArray(templates), headers, HttpStatus.OK);
-        } catch (Exception e){
+        } catch (Exception e) {
             return new ResponseEntity<String>(e.toString(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
-		
-	@RequestMapping(value = "/templates/saveTemplate", method = RequestMethod.POST, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/templates/saveTemplate", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> saveOrUpdateTemplate(@RequestBody BulkLoadTemplate templateToSave) {
-		HttpHeaders headers= new HttpHeaders();
+        HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/text");
         headers.add("Access-Control-Allow-Origin", "*");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
-		try{
-        	BulkLoadTemplate savedTemplate = bulkLoadService.saveBulkLoadTemplate(templateToSave);
+        try {
+            BulkLoadTemplate savedTemplate = bulkLoadService.saveBulkLoadTemplate(templateToSave);
             return new ResponseEntity<String>(savedTemplate.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e){
+        } catch (Exception e) {
             return new ResponseEntity<String>(e.toString(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
-	
-	@RequestMapping(value = "/getSdfProperties", method = RequestMethod.POST, headers = "Accept=application/json")
-	public ResponseEntity<String> getSdfProperties(@RequestBody BulkLoadSDFPropertyRequestDTO requestDTO){
-		HttpHeaders headers= new HttpHeaders();
+
+    @RequestMapping(value = "/getSdfProperties", method = RequestMethod.POST, headers = "Accept=application/json")
+    public ResponseEntity<String> getSdfProperties(@RequestBody BulkLoadSDFPropertyRequestDTO requestDTO) {
+        HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/text");
         headers.add("Access-Control-Allow-Origin", "*");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
-		try{
-        	BulkLoadPropertiesDTO responseDTO = bulkLoadService.readSDFPropertiesFromFile(requestDTO);
+        try {
+            BulkLoadPropertiesDTO responseDTO = bulkLoadService.readSDFPropertiesFromFile(requestDTO);
             return new ResponseEntity<String>(responseDTO.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e){
+        } catch (Exception e) {
             return new ResponseEntity<String>(e.toString(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
         }
-	}
-	
-//	@Transactional
-	@RequestMapping(value = "/registerSdf", method = RequestMethod.POST, headers = "Accept=application/json")
-	public ResponseEntity<String> registerSdf(@RequestBody BulkLoadRegisterSDFRequestDTO requestDTO){
-		HttpHeaders headers= new HttpHeaders();
+    }
+
+    // @Transactional
+    @RequestMapping(value = "/registerSdf", method = RequestMethod.POST, headers = "Accept=application/json")
+    public ResponseEntity<String> registerSdf(@RequestBody BulkLoadRegisterSDFRequestDTO requestDTO) {
+        HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/text");
         headers.add("Access-Control-Allow-Origin", "*");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
-		try{
-        	BulkLoadRegisterSDFResponseDTO result = bulkLoadService.registerSdf(requestDTO);
+        try {
+            BulkLoadRegisterSDFResponseDTO result = bulkLoadService.registerSdf(requestDTO);
             return new ResponseEntity<String>(result.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e){
+        } catch (Exception e) {
             return new ResponseEntity<String>(e.toString(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
         }
-	}
-	
-	@RequestMapping(value = "/validationProperties", method = RequestMethod.POST, headers = "Accept=application/json")
-	public ResponseEntity<String> validationProperties(@RequestBody BulkLoadRegisterSDFRequestDTO requestDTO){
-		HttpHeaders headers= new HttpHeaders();
+    }
+
+    @RequestMapping(value = "/validationProperties", method = RequestMethod.POST, headers = "Accept=application/json")
+    public ResponseEntity<String> validationProperties(@RequestBody BulkLoadRegisterSDFRequestDTO requestDTO) {
+        HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/text");
         headers.add("Access-Control-Allow-Origin", "*");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
-		try{
-        	BulkLoadSDFValidationPropertiesResponseDTO result = bulkLoadService.validationProperties(requestDTO);
+        try {
+            BulkLoadSDFValidationPropertiesResponseDTO result = bulkLoadService.validationProperties(requestDTO);
             return new ResponseEntity<String>(result.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e){
+        } catch (Exception e) {
             return new ResponseEntity<String>(e.toString(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
         }
-	}
-	
-	@RequestMapping(value = "/files", method = RequestMethod.GET, headers = "Accept=application/json")
+    }
+
+    @RequestMapping(value = "/files", method = RequestMethod.GET, headers = "Accept=application/json")
     public ResponseEntity<String> getAllBulkLoadFiles() {
-		HttpHeaders headers= new HttpHeaders();
+        HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/text");
         headers.add("Access-Control-Allow-Origin", "*");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
-		try{
-        	Collection<BulkLoadFile> files = BulkLoadFile.findAllBulkLoadFiles();
+        try {
+            Collection<BulkLoadFile> files = BulkLoadFile.findAllBulkLoadFiles();
             return new ResponseEntity<String>(BulkLoadFile.toJsonArray(files), headers, HttpStatus.OK);
-        } catch (Exception e){
+        } catch (Exception e) {
             return new ResponseEntity<String>(e.toString(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
-	
-	@RequestMapping(value = "/checkDependencies", method = RequestMethod.POST, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/checkDependencies", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> checkPurgeDependencies(@RequestBody BulkLoadFile bulkLoadFile) {
-		HttpHeaders headers= new HttpHeaders();
+        HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/text");
         headers.add("Access-Control-Allow-Origin", "*");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
-		try{
-        	BulkLoadFile fileToCheck = BulkLoadFile.findBulkLoadFile(bulkLoadFile.getId());
-        	PurgeFileDependencyCheckResponseDTO responseDTO = bulkLoadService.checkPurgeFileDependencies(fileToCheck);
+        try {
+            BulkLoadFile fileToCheck = BulkLoadFile.findBulkLoadFile(bulkLoadFile.getId());
+            PurgeFileDependencyCheckResponseDTO responseDTO = bulkLoadService.checkPurgeFileDependencies(fileToCheck);
             return new ResponseEntity<String>(responseDTO.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e){
-        	logger.error("Caught error in checkDependencies",e);
+        } catch (Exception e) {
+            logger.error("Caught error in checkDependencies", e);
             return new ResponseEntity<String>(e.toString(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
-	
-	@RequestMapping(value = "/purge", method = RequestMethod.POST, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/purge", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> purgeFile(@RequestBody BulkLoadFile bulkLoadFile) {
-		HttpHeaders headers= new HttpHeaders();
+        HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/text");
         headers.add("Access-Control-Allow-Origin", "*");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
-		try{
-        	BulkLoadFile fileToPurge = BulkLoadFile.findBulkLoadFile(bulkLoadFile.getId());
-        	PurgeFileResponseDTO responseDTO = bulkLoadService.purgeFile(fileToPurge);
+        try {
+            BulkLoadFile fileToPurge = BulkLoadFile.findBulkLoadFile(bulkLoadFile.getId());
+            PurgeFileResponseDTO responseDTO = bulkLoadService.purgeFile(fileToPurge);
             return new ResponseEntity<String>(responseDTO.toJson(), headers, HttpStatus.OK);
-        } catch (Exception e){
+        } catch (Exception e) {
             return new ResponseEntity<String>(e.toString(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiCmpdSearchController.java b/src/main/java/com/labsynch/labseer/api/ApiCmpdSearchController.java
index 7752f88f6..482a8ed30 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiCmpdSearchController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiCmpdSearchController.java
@@ -26,7 +26,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-@RequestMapping(value = {"/api/v1/structuresearch"})
+@RequestMapping(value = { "/api/v1/structuresearch" })
 @Controller
 public class ApiCmpdSearchController {
 
@@ -40,32 +40,37 @@ public class ApiCmpdSearchController {
 
 	@RequestMapping(value = "/", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> structureSearch(@RequestBody String json){
+	public ResponseEntity<String> structureSearch(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.setContentType(MediaType.APPLICATION_JSON);
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 
 		List<Integer> searchResults;
 		try {
-			CmpdRegStructureSearchDTO structureSearchDTO = CmpdRegStructureSearchDTO.fromJsonToCmpdRegStructureSearchDTO(json);
-			SearchType matchedSearchType = SearchType.getIfPresent(structureSearchDTO.getSearchType()).orElse(SearchType.SUBSTRUCTURE);
-			searchResults = searchFormService.findParentIds(structureSearchDTO.getMolStructure(), structureSearchDTO.getMaxResults(), structureSearchDTO.getPercentSimilarity(), matchedSearchType, structureSearchDTO.getProjects());
+			CmpdRegStructureSearchDTO structureSearchDTO = CmpdRegStructureSearchDTO
+					.fromJsonToCmpdRegStructureSearchDTO(json);
+			SearchType matchedSearchType = SearchType.getIfPresent(structureSearchDTO.getSearchType())
+					.orElse(SearchType.SUBSTRUCTURE);
+			searchResults = searchFormService.findParentIds(structureSearchDTO.getMolStructure(),
+					structureSearchDTO.getMaxResults(), structureSearchDTO.getPercentSimilarity(), matchedSearchType,
+					structureSearchDTO.getProjects());
 			// Return the integer list of parent ids as a response Entity array
 			return new ResponseEntity<String>(searchResults.toString(), headers, HttpStatus.OK);
 		} catch (CmpdRegMolFormatException | IOException e) {
 			logger.error("Error in structureSearch: " + e.getMessage());
-			return new ResponseEntity<String>("Encountered error with input structure: "+e.toString(), headers, HttpStatus.BAD_REQUEST);
+			return new ResponseEntity<String>("Encountered error with input structure: " + e.toString(), headers,
+					HttpStatus.BAD_REQUEST);
 		}
 	}
 
 	@Transactional
 	@RequestMapping(value = "/getPreferredName/parent", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> jsonArrayCheckParentCorpNameExists(@RequestBody String json){
+	public ResponseEntity<String> jsonArrayCheckParentCorpNameExists(@RequestBody String json) {
 		logger.debug("incoming json from getPreferredName: " + json);
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
@@ -74,69 +79,73 @@ public ResponseEntity<String> jsonArrayCheckParentCorpNameExists(@RequestBody St
 		return new ResponseEntity<String>(PreferredNameDTO.toJsonArray(preferredNameDTOs), headers, HttpStatus.OK);
 	}
 
-
-
 	@RequestMapping(value = "/parents", method = RequestMethod.POST)
 	@ResponseBody
-	public ResponseEntity<String> searchStructures (	
+	public ResponseEntity<String> searchStructures(
 			@RequestBody String molStructure,
 
-			//    		@RequestParam(value = "molStructure", required=true) String molStructure,
-			@RequestParam(value = "maxResults", required=false) Integer maxResults,
-			@RequestParam(value = "similarity", required=false) Float similarity,
-			@RequestParam(value = "searchType", required=false) String searchType,
-			@RequestParam(value = "outputFormat", required=false) String outputFormat) throws IOException {
+			// @RequestParam(value = "molStructure", required=true) String molStructure,
+			@RequestParam(value = "maxResults", required = false) Integer maxResults,
+			@RequestParam(value = "similarity", required = false) Float similarity,
+			@RequestParam(value = "searchType", required = false) String searchType,
+			@RequestParam(value = "outputFormat", required = false) String outputFormat) throws IOException {
 
-		//options for outputFormat -- corpname, cdid, corpname-cdid, sdf ; default is cdid
-		//    ./jcsearch --maxResults:$4 -q $9 -f sdf:Tcd_id DB:compound.parent_structure
+		// options for outputFormat -- corpname, cdid, corpname-cdid, sdf ; default is
+		// cdid
+		// ./jcsearch --maxResults:$4 -q $9 -f sdf:Tcd_id DB:compound.parent_structure
 
 		HttpHeaders headers = new HttpHeaders();
 		headers.setContentType(MediaType.APPLICATION_JSON);
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
-		
+
 		try {
 			SearchType matchedSearchType = SearchType.getIfPresent(searchType).orElse(SearchType.SUBSTRUCTURE);
-			String searchResults = searchFormService.findParentIds(molStructure, maxResults, similarity, matchedSearchType, outputFormat);
+			String searchResults = searchFormService.findParentIds(molStructure, maxResults, similarity,
+					matchedSearchType, outputFormat);
 			return new ResponseEntity<String>(searchResults, headers, HttpStatus.OK);
 		} catch (CmpdRegMolFormatException e) {
-			return new ResponseEntity<String>("Encountered error with input structure: "+e.toString(), headers, HttpStatus.BAD_REQUEST);
+			return new ResponseEntity<String>("Encountered error with input structure: " + e.toString(), headers,
+					HttpStatus.BAD_REQUEST);
 		}
 	}
 
 	@RequestMapping(value = "/parents/form", method = RequestMethod.POST)
 	@ResponseBody
-	public ResponseEntity<String> searchStructuresForm (	
-			@RequestParam(value = "molStructure", required=true) String molStructure,
-			@RequestParam(value = "maxResults", required=false) Integer maxResults,
-			@RequestParam(value = "similarity", required=false) Float similarity,
-			@RequestParam(value = "searchType", required=false) String searchType,
-			@RequestParam(value = "outputFormat", required=false) String outputFormat) throws IOException {
-
-		//options for outputFormat -- corpname, cdid, corpname-cdid, sdf ; default is cdid
-		//    ./jcsearch --maxResults:$4 -q $9 -f sdf:Tcd_id DB:compound.parent_structure
+	public ResponseEntity<String> searchStructuresForm(
+			@RequestParam(value = "molStructure", required = true) String molStructure,
+			@RequestParam(value = "maxResults", required = false) Integer maxResults,
+			@RequestParam(value = "similarity", required = false) Float similarity,
+			@RequestParam(value = "searchType", required = false) String searchType,
+			@RequestParam(value = "outputFormat", required = false) String outputFormat) throws IOException {
 
+		// options for outputFormat -- corpname, cdid, corpname-cdid, sdf ; default is
+		// cdid
+		// ./jcsearch --maxResults:$4 -q $9 -f sdf:Tcd_id DB:compound.parent_structure
 
 		HttpHeaders headers = new HttpHeaders();
 		headers.setContentType(MediaType.APPLICATION_JSON);
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 
-		if (outputFormat == null || outputFormat.equalsIgnoreCase("")) outputFormat = "cdid";
+		if (outputFormat == null || outputFormat.equalsIgnoreCase(""))
+			outputFormat = "cdid";
 
 		String searchResults;
 		try {
 			SearchType matchedSearchType = SearchType.getIfPresent(searchType).orElse(SearchType.DEFAULT);
-			searchResults = searchFormService.findParentIds(molStructure, maxResults, similarity, matchedSearchType, outputFormat);
+			searchResults = searchFormService.findParentIds(molStructure, maxResults, similarity, matchedSearchType,
+					outputFormat);
 			return new ResponseEntity<String>(searchResults, headers, HttpStatus.OK);
 		} catch (CmpdRegMolFormatException e) {
-			return new ResponseEntity<String>("Encountered error with input structure: "+e.toString(), headers, HttpStatus.BAD_REQUEST);
+			return new ResponseEntity<String>("Encountered error with input structure: " + e.toString(), headers,
+					HttpStatus.BAD_REQUEST);
 		}
 	}
 
diff --git a/src/main/java/com/labsynch/labseer/api/ApiCompoundTypeController.java b/src/main/java/com/labsynch/labseer/api/ApiCompoundTypeController.java
index 386e1f88d..9c649d8e8 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiCompoundTypeController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiCompoundTypeController.java
@@ -1,4 +1,5 @@
 package com.labsynch.labseer.api;
+
 import com.labsynch.labseer.domain.CompoundType;
 
 import org.springframework.http.HttpHeaders;
@@ -12,12 +13,11 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-@RequestMapping(value = {"/api/v1/compoundTypes"})
+@RequestMapping(value = { "/api/v1/compoundTypes" })
 @Transactional
 @Controller
 public class ApiCompoundTypeController {
 
-
     @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
@@ -26,8 +26,8 @@ public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
         headers.add("Content-Type", "application/text; charset=utf-8");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
         headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
+        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+        headers.add("Pragma", "no-cache"); // HTTP 1.0
         headers.setExpires(0); // Expire the cache
         if (compoundType == null) {
             return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
@@ -42,10 +42,12 @@ public ResponseEntity<String> listJson() {
         headers.add("Content-Type", "application/text; charset=utf-8");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
         headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
+        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+        headers.add("Pragma", "no-cache"); // HTTP 1.0
         headers.setExpires(0); // Expire the cache
-        return new ResponseEntity<String>(CompoundType.toJsonArray(CompoundType.findAllCompoundTypes("displayOrder", "ASC")), headers, HttpStatus.OK);
+        return new ResponseEntity<String>(
+                CompoundType.toJsonArray(CompoundType.findAllCompoundTypes("displayOrder", "ASC")), headers,
+                HttpStatus.OK);
     }
 
     @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
@@ -109,5 +111,5 @@ public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
         compoundType.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-    
+
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiCompoundsController.java b/src/main/java/com/labsynch/labseer/api/ApiCompoundsController.java
index add44d01f..bebb1004b 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiCompoundsController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiCompoundsController.java
@@ -1,6 +1,5 @@
 package com.labsynch.labseer.api;
 
-
 import com.labsynch.labseer.dto.CmpdRegBatchCodeDTO;
 
 import org.slf4j.Logger;
@@ -18,17 +17,16 @@
 @RequestMapping("api/v1/compounds")
 @Transactional
 public class ApiCompoundsController {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(ApiCompoundsController.class);
-	
+
 	@Transactional
-    @RequestMapping(value = "/checkBatchDependencies", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> checkBatchDependencies(@RequestBody CmpdRegBatchCodeDTO batchDTO) {
+	@RequestMapping(value = "/checkBatchDependencies", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> checkBatchDependencies(@RequestBody CmpdRegBatchCodeDTO batchDTO) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		batchDTO.checkForDependentData();
 		return new ResponseEntity<String>(batchDTO.toJson(), headers, HttpStatus.OK);
 	}
-	
-	
+
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiContainerController.java b/src/main/java/com/labsynch/labseer/api/ApiContainerController.java
index 8f891b312..e6ed9790f 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiContainerController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiContainerController.java
@@ -76,7 +76,7 @@ public class ApiContainerController {
 	@ResponseBody
 	public ResponseEntity<java.lang.String> showJson(@PathVariable("idOrCodeName") String idOrCodeName) {
 		Container container;
-		if(SimpleUtil.isNumeric(idOrCodeName)) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			container = Container.findContainer(Long.valueOf(idOrCodeName));
 		} else {
 			container = Container.findContainerByCodeNameEquals(idOrCodeName);
@@ -111,25 +111,28 @@ public ResponseEntity<java.lang.String> listJson(@RequestParam(value = "lsType",
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		List<Container> containers = new ArrayList<Container>();
-		if (lsType != null && lsType.length() > 0 && lsKind != null && lsKind.length() > 0){
-				containers = Container.findContainersByLsTypeEqualsAndLsKindEquals(lsType, lsKind).getResultList();
-		}else if (lsType != null && lsType.length() > 0 && (lsKind == null || lsKind.length() == 0)){
-				containers = Container.findContainersByLsTypeEquals(lsType).getResultList();
-		}else if((lsType == null || lsType.length()==0) && lsKind != null && lsKind.length() > 0){
-				containers = Container.findContainersByLsKindEquals(lsKind).getResultList();
-		}else{
-				containers = Container.findAllContainers();
+		if (lsType != null && lsType.length() > 0 && lsKind != null && lsKind.length() > 0) {
+			containers = Container.findContainersByLsTypeEqualsAndLsKindEquals(lsType, lsKind).getResultList();
+		} else if (lsType != null && lsType.length() > 0 && (lsKind == null || lsKind.length() == 0)) {
+			containers = Container.findContainersByLsTypeEquals(lsType).getResultList();
+		} else if ((lsType == null || lsType.length() == 0) && lsKind != null && lsKind.length() > 0) {
+			containers = Container.findContainersByLsKindEquals(lsKind).getResultList();
+		} else {
+			containers = Container.findAllContainers();
 		}
 		if (format != null) {
-			if (format.equalsIgnoreCase("codeTable")){
-					List<CodeTableDTO> codeTableContainers = containerService.convertToCodeTables(containers);
-					return new ResponseEntity<String>(CodeTableDTO.toJsonArray(codeTableContainers), headers, HttpStatus.OK);
-			}else if (format != null && format.equalsIgnoreCase("stub")){
+			if (format.equalsIgnoreCase("codeTable")) {
+				List<CodeTableDTO> codeTableContainers = containerService.convertToCodeTables(containers);
+				return new ResponseEntity<String>(CodeTableDTO.toJsonArray(codeTableContainers), headers,
+						HttpStatus.OK);
+			} else if (format != null && format.equalsIgnoreCase("stub")) {
 				return new ResponseEntity<String>(Container.toJsonArrayStub(containers), headers, HttpStatus.OK);
-			}else if (format.equalsIgnoreCase("nestedfull")) {
-				return new ResponseEntity<String>(Container.toJsonArrayWithNestedFull(containers), headers, HttpStatus.OK);
-			}else if (format.equalsIgnoreCase("nestedstub")) {
-				return new ResponseEntity<String>(Container.toJsonArrayWithNestedStubs(containers), headers, HttpStatus.OK);
+			} else if (format.equalsIgnoreCase("nestedfull")) {
+				return new ResponseEntity<String>(Container.toJsonArrayWithNestedFull(containers), headers,
+						HttpStatus.OK);
+			} else if (format.equalsIgnoreCase("nestedstub")) {
+				return new ResponseEntity<String>(Container.toJsonArrayWithNestedStubs(containers), headers,
+						HttpStatus.OK);
 			}
 		}
 		return new ResponseEntity<String>(Container.toJsonArray(containers), headers, HttpStatus.OK);
@@ -263,40 +266,46 @@ public ResponseEntity<java.lang.String> createFromJson(@RequestBody String json)
 	@Transactional
 	@RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
 	public ResponseEntity<java.lang.String> createFromJsonArray(@RequestBody String json) {
-		Collection<Container> containers  = Container.fromJsonArrayToContainers(json);
+		Collection<Container> containers = Container.fromJsonArrayToContainers(json);
 		Collection<Container> savedContainers = containerService.saveLsContainers(containers);
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		return new ResponseEntity<String>(Container.toJsonArray(savedContainers), headers, HttpStatus.CREATED);
 	}
 
-//	  @Transactional
-//	  @RequestMapping(value = "/LsContainer", method = RequestMethod.POST, headers = "Accept=application/json")
-//	  public ResponseEntity<java.lang.String> createLSContainerFromJson(@RequestBody String json) {
-//		  Container container = Container.fromJsonToContainer(json);
-//		  container = containerService.saveLsContainer(container);
-//		  HttpHeaders headers = new HttpHeaders();
-//		  headers.add("Content-Type", "application/json");
-//		  return new ResponseEntity<String>(container.toJson(), headers, HttpStatus.CREATED);
-//	  }
-
-//	  @Transactional
-//	  @RequestMapping(value = "/LsContainer/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-//	  public ResponseEntity<java.lang.String> createLSContainersFromJsonArray(@RequestBody String json) {
-//		  Collection<Container> savedContainers = new ArrayList<Container>();
-//		  BufferedReader br = null;
-//		  StringReader sr = null;
-//		  sr = new StringReader(json);
-//		  br = new BufferedReader(sr);
-//		  for (Container container : Container.fromJsonArrayToContainers(br)) {
-//			  savedContainers.add(containerService.saveLsContainer(container));
-//		  }
-//		  IOUtils.closeQuietly(sr);
-//		  IOUtils.closeQuietly(br);
-//		  HttpHeaders headers = new HttpHeaders();
-//		  headers.add("Content-Type", "application/json");
-//		  return new ResponseEntity<String>(Container.toJsonArray(savedContainers), headers, HttpStatus.CREATED);
-//	  }
+	// @Transactional
+	// @RequestMapping(value = "/LsContainer", method = RequestMethod.POST, headers
+	// = "Accept=application/json")
+	// public ResponseEntity<java.lang.String>
+	// createLSContainerFromJson(@RequestBody String json) {
+	// Container container = Container.fromJsonToContainer(json);
+	// container = containerService.saveLsContainer(container);
+	// HttpHeaders headers = new HttpHeaders();
+	// headers.add("Content-Type", "application/json");
+	// return new ResponseEntity<String>(container.toJson(), headers,
+	// HttpStatus.CREATED);
+	// }
+
+	// @Transactional
+	// @RequestMapping(value = "/LsContainer/jsonArray", method =
+	// RequestMethod.POST, headers = "Accept=application/json")
+	// public ResponseEntity<java.lang.String>
+	// createLSContainersFromJsonArray(@RequestBody String json) {
+	// Collection<Container> savedContainers = new ArrayList<Container>();
+	// BufferedReader br = null;
+	// StringReader sr = null;
+	// sr = new StringReader(json);
+	// br = new BufferedReader(sr);
+	// for (Container container : Container.fromJsonArrayToContainers(br)) {
+	// savedContainers.add(containerService.saveLsContainer(container));
+	// }
+	// IOUtils.closeQuietly(sr);
+	// IOUtils.closeQuietly(br);
+	// HttpHeaders headers = new HttpHeaders();
+	// headers.add("Content-Type", "application/json");
+	// return new ResponseEntity<String>(Container.toJsonArray(savedContainers),
+	// headers, HttpStatus.CREATED);
+	// }
 
 	@Transactional
 	@RequestMapping(value = { "/{id}", "/" }, method = RequestMethod.PUT, headers = "Accept=application/json")
@@ -314,7 +323,7 @@ public ResponseEntity<java.lang.String> updateFromJson(@RequestBody String json)
 	@Transactional
 	@RequestMapping(value = "/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
 	public ResponseEntity<java.lang.String> updateFromJsonArray(@RequestBody String json) {
-		Collection<Container> containers  = Container.fromJsonArrayToContainers(json);
+		Collection<Container> containers = Container.fromJsonArrayToContainers(json);
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<Container> updatedContainers = new ArrayList<Container>();
@@ -328,7 +337,7 @@ public ResponseEntity<java.lang.String> updateFromJsonArray(@RequestBody String
 	@RequestMapping(value = "/{idOrCodeName}", method = RequestMethod.DELETE)
 	public ResponseEntity<java.lang.String> deleteFromJson(@PathVariable("idOrCodeName") String idOrCodeName) {
 		Container container;
-		if(SimpleUtil.isNumeric(idOrCodeName)) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			container = Container.findContainer(Long.valueOf(idOrCodeName));
 		} else {
 			container = Container.findContainerByCodeNameEquals(idOrCodeName);
@@ -341,7 +350,8 @@ public ResponseEntity<java.lang.String> deleteFromJson(@PathVariable("idOrCodeNa
 		} else {
 			logger.info("deleting the container: " + idOrCodeName);
 			container.logicalDelete();
-			if (Container.findContainer(container.getId()) == null || Container.findContainer(container.getId()).isIgnored()) {
+			if (Container.findContainer(container.getId()) == null
+					|| Container.findContainer(container.getId()).isIgnored()) {
 				logger.info("Did not find the container after delete");
 				return new ResponseEntity<String>(headers, HttpStatus.OK);
 			} else {
@@ -350,19 +360,20 @@ public ResponseEntity<java.lang.String> deleteFromJson(@PathVariable("idOrCodeNa
 			}
 		}
 	}
-	
+
 	@RequestMapping(value = "/deleteArrayByCodeNames", method = RequestMethod.POST)
 	public ResponseEntity<java.lang.String> deleteArrayByCodeNames(@RequestBody List<String> codeNames) {
 		HttpHeaders headers = new HttpHeaders();
 		try {
-			Collection<ContainerErrorMessageDTO> foundContainerDTOs = containerService.getContainersByCodeNames(codeNames);
+			Collection<ContainerErrorMessageDTO> foundContainerDTOs = containerService
+					.getContainersByCodeNames(codeNames);
 			Collection<Container> foundContainers = new ArrayList<Container>();
 			for (ContainerErrorMessageDTO foundContainerDTO : foundContainerDTOs) {
-				foundContainers.add(foundContainerDTO.getContainer());				
+				foundContainers.add(foundContainerDTO.getContainer());
 			}
 			containerService.logicalDeleteContainerArray(foundContainers);
 			return new ResponseEntity<String>(headers, HttpStatus.OK);
-		}catch(Exception e){
+		} catch (Exception e) {
 			logger.error("Caught error deleting array of containers", e);
 			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
@@ -375,16 +386,16 @@ public ResponseEntity<String> checkDependencies(@PathVariable("idOrCodeName") St
 		ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
 		boolean errorsFound = false;
 		Container container;
-		if(SimpleUtil.isNumeric(idOrCodeName)) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			container = Container.findContainer(Long.valueOf(idOrCodeName));
-		} else {		
+		} else {
 			try {
 				container = Container.findContainerByCodeNameEquals(idOrCodeName);
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				container = null;
 				ErrorMessage error = new ErrorMessage();
 				error.setErrorLevel("error");
-				error.setMessage("parent:" + idOrCodeName +" not found");
+				error.setMessage("parent:" + idOrCodeName + " not found");
 				errors.add(error);
 				errorsFound = true;
 			}
@@ -400,10 +411,13 @@ public ResponseEntity<String> checkDependencies(@PathVariable("idOrCodeName") St
 	@Transactional
 	@RequestMapping(params = "FindByContainerLabelList", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<java.lang.String> jsonFindContainersByContainerNameEqualsGet(@RequestParam("containerNamesList") String containerNamesList) {
+	public ResponseEntity<java.lang.String> jsonFindContainersByContainerNameEqualsGet(
+			@RequestParam("containerNamesList") String containerNamesList) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		return new ResponseEntity<String>(Container.toJsonArray(Container.findContainersByContainerLabels(containerNamesList)), headers, HttpStatus.OK);
+		return new ResponseEntity<String>(
+				Container.toJsonArray(Container.findContainersByContainerLabels(containerNamesList)), headers,
+				HttpStatus.OK);
 	}
 
 	@Transactional
@@ -412,7 +426,8 @@ public ResponseEntity<java.lang.String> jsonFindContainersByContainerNameEqualsG
 	public ResponseEntity<java.lang.String> jsonFindContainersByNameGet(@RequestParam("labelText") String labelText) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		return new ResponseEntity<String>(Container.toJsonArray(Container.findContainerByContainerLabel(labelText)), headers, HttpStatus.OK);
+		return new ResponseEntity<String>(Container.toJsonArray(Container.findContainerByContainerLabel(labelText)),
+				headers, HttpStatus.OK);
 	}
 
 	@RequestMapping(value = "/validate", method = RequestMethod.POST, headers = "Accept=application/json")
@@ -422,12 +437,11 @@ public ResponseEntity<String> validateContainer(
 		headers.add("Content-Type", "application/json; charset=utf-8");
 
 		Container container = Container.fromJsonToContainer(json);
-		logger.debug("FROM THE Container VALIDATE CONTROLLER: "+container.toJson());
+		logger.debug("FROM THE Container VALIDATE CONTROLLER: " + container.toJson());
 		ArrayList<ErrorMessage> errorMessages = containerService.validateContainer(container);
-		if (!errorMessages.isEmpty()){
+		if (!errorMessages.isEmpty()) {
 			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errorMessages), headers, HttpStatus.CONFLICT);
-		}
-		else{
+		} else {
 			return new ResponseEntity<String>(headers, HttpStatus.ACCEPTED);
 		}
 	}
@@ -436,14 +450,15 @@ public ResponseEntity<String> validateContainer(
 	@RequestMapping(value = "/getContainersInLocation", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
 	public ResponseEntity<java.lang.String> getContainersInLocation(@RequestBody List<String> locationCodeNames,
-			@RequestParam(value="containerType", required=false) String containerType,
-			@RequestParam(value="containerKind", required=false) String containerKind) {
+			@RequestParam(value = "containerType", required = false) String containerType,
+			@RequestParam(value = "containerKind", required = false) String containerKind) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		try{
-			Collection<ContainerLocationDTO> searchResults = containerService.getContainersInLocation(locationCodeNames, containerType, containerKind);
+		try {
+			Collection<ContainerLocationDTO> searchResults = containerService.getContainersInLocation(locationCodeNames,
+					containerType, containerKind);
 			return new ResponseEntity<String>(ContainerLocationDTO.toJsonArray(searchResults), headers, HttpStatus.OK);
-		} catch (Exception e){
+		} catch (Exception e) {
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
@@ -454,10 +469,10 @@ public ResponseEntity<java.lang.String> getContainersInLocation(@RequestBody Lis
 	public ResponseEntity<java.lang.String> getWellCodesByPlateBarcodes(@RequestBody List<String> plateBarcodes) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		try{
+		try {
 			Collection<PlateWellDTO> searchResults = containerService.getWellCodesByPlateBarcodes(plateBarcodes);
 			return new ResponseEntity<String>(PlateWellDTO.toJsonArray(searchResults), headers, HttpStatus.OK);
-		} catch (Exception e){
+		} catch (Exception e) {
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
@@ -466,29 +481,31 @@ public ResponseEntity<java.lang.String> getWellCodesByPlateBarcodes(@RequestBody
 	@RequestMapping(value = "/getContainerCodesByLabels", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
 	public ResponseEntity<java.lang.String> getContainerCodesByLabels(@RequestBody List<String> labelTexts,
-			@RequestParam(value="containerType", required=false) String containerType,
-			@RequestParam(value="containerKind", required=false) String containerKind,
-			@RequestParam(value="labelType", required=false) String labelType,
-			@RequestParam(value="labelKind", required=false) String labelKind,
-			@RequestParam(value="like", required=false) Boolean like,
-			@RequestParam(value="rightLike", required=false) Boolean rightLike,
-			@RequestParam(value="maxResults", required=false) Integer maxResults) {
+			@RequestParam(value = "containerType", required = false) String containerType,
+			@RequestParam(value = "containerKind", required = false) String containerKind,
+			@RequestParam(value = "labelType", required = false) String labelType,
+			@RequestParam(value = "labelKind", required = false) String labelKind,
+			@RequestParam(value = "like", required = false) Boolean like,
+			@RequestParam(value = "rightLike", required = false) Boolean rightLike,
+			@RequestParam(value = "maxResults", required = false) Integer maxResults) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		if (like == null) like = false;
-		if (rightLike == null) rightLike = false;
-		try{
-			Collection<CodeLabelDTO> searchResults = containerService.getContainerCodesByLabels(labelTexts, containerType, containerKind, labelType, labelKind, like, rightLike);
-			if (maxResults != null && maxResults > 0 && searchResults.size() > maxResults){
+		if (like == null)
+			like = false;
+		if (rightLike == null)
+			rightLike = false;
+		try {
+			Collection<CodeLabelDTO> searchResults = containerService.getContainerCodesByLabels(labelTexts,
+					containerType, containerKind, labelType, labelKind, like, rightLike);
+			if (maxResults != null && maxResults > 0 && searchResults.size() > maxResults) {
 				ContainerQueryResultDTO resultDTO = new ContainerQueryResultDTO();
 				resultDTO.setMaxResults(maxResults);
 				resultDTO.setNumberOfResults(searchResults.size());
 				return new ResponseEntity<String>(resultDTO.toJson(), headers, HttpStatus.OK);
-			}
-			else{
+			} else {
 				return new ResponseEntity<String>(CodeLabelDTO.toJsonArray(searchResults), headers, HttpStatus.OK);
 			}
-		} catch (Exception e){
+		} catch (Exception e) {
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
@@ -499,28 +516,32 @@ public ResponseEntity<java.lang.String> getContainerCodesByLabels(@RequestBody L
 	public ResponseEntity<java.lang.String> getWellContent(@RequestBody List<String> wellCodes) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		try{
+		try {
 			Collection<WellContentDTO> results = containerService.getWellContent(wellCodes);
 			boolean success = true;
-			for (WellContentDTO result: results){
-				if (result.getLevel() != null) success = false;
+			for (WellContentDTO result : results) {
+				if (result.getLevel() != null)
+					success = false;
 			}
-			if (success) return new ResponseEntity<String>(WellContentDTO.toJsonArray(results), headers, HttpStatus.OK);
-			else return new ResponseEntity<String>(WellContentDTO.toJsonArray(results), headers, HttpStatus.BAD_REQUEST);
-		} catch (Exception e){
+			if (success)
+				return new ResponseEntity<String>(WellContentDTO.toJsonArray(results), headers, HttpStatus.OK);
+			else
+				return new ResponseEntity<String>(WellContentDTO.toJsonArray(results), headers, HttpStatus.BAD_REQUEST);
+		} catch (Exception e) {
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
 	@RequestMapping(value = "/getCodeNameFromNameRequest", method = RequestMethod.POST, headers = "Accept=application/json")
-	public ResponseEntity<java.lang.String> getCodeNameFromName(@RequestBody String json, 
-			@RequestParam(value = "containerType", required = true) String containerType, 
-			@RequestParam(value = "containerKind", required = true) String containerKind, 
-			@RequestParam(value = "labelType", required = false) String labelType, 
+	public ResponseEntity<java.lang.String> getCodeNameFromName(@RequestBody String json,
+			@RequestParam(value = "containerType", required = true) String containerType,
+			@RequestParam(value = "containerKind", required = true) String containerKind,
+			@RequestParam(value = "labelType", required = false) String labelType,
 			@RequestParam(value = "labelKind", required = false) String labelKind) {
 		PreferredNameRequestDTO requestDTO = PreferredNameRequestDTO.fromJsonToPreferredNameRequestDTO(json);
 		logger.info("getCodeNameFromNameRequest incoming json: " + requestDTO.toJson());
-		PreferredNameResultsDTO results = containerService.getCodeNameFromName(containerType, containerKind, labelType, labelKind, requestDTO);
+		PreferredNameResultsDTO results = containerService.getCodeNameFromName(containerType, containerKind, labelType,
+				labelKind, requestDTO);
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		return new ResponseEntity<String>(results.toJson(), headers, HttpStatus.OK);
@@ -532,16 +553,20 @@ public ResponseEntity<java.lang.String> getCodeNameFromName(@RequestBody String
 	public ResponseEntity<java.lang.String> throwInTrash(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		try{
+		try {
 			Collection<ContainerRequestDTO> containersToTrash = ContainerRequestDTO.fromJsonArrayToCoes(json);
 			Collection<ContainerErrorMessageDTO> results = containerService.throwInTrash(containersToTrash);
 			boolean success = true;
-			for (ContainerErrorMessageDTO result: results){
-				if (result.getLevel() != null) success = false;
+			for (ContainerErrorMessageDTO result : results) {
+				if (result.getLevel() != null)
+					success = false;
 			}
-			if (success) return new ResponseEntity<String>(HttpStatus.NO_CONTENT);
-			else return new ResponseEntity<String>(ContainerErrorMessageDTO.toJsonArray(results), headers, HttpStatus.BAD_REQUEST);
-		} catch (Exception e){
+			if (success)
+				return new ResponseEntity<String>(HttpStatus.NO_CONTENT);
+			else
+				return new ResponseEntity<String>(ContainerErrorMessageDTO.toJsonArray(results), headers,
+						HttpStatus.BAD_REQUEST);
+		} catch (Exception e) {
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
@@ -552,16 +577,20 @@ public ResponseEntity<java.lang.String> throwInTrash(@RequestBody String json) {
 	public ResponseEntity<java.lang.String> updateAmountInWell(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		try{
+		try {
 			Collection<ContainerRequestDTO> wellsToUpdate = ContainerRequestDTO.fromJsonArrayToCoes(json);
 			Collection<ContainerErrorMessageDTO> results = containerService.updateAmountInWell(wellsToUpdate);
 			boolean success = true;
-			for (ContainerErrorMessageDTO result: results){
-				if (result.getLevel() != null) success = false;
+			for (ContainerErrorMessageDTO result : results) {
+				if (result.getLevel() != null)
+					success = false;
 			}
-			if (success) return new ResponseEntity<String>(HttpStatus.NO_CONTENT);
-			else return new ResponseEntity<String>(ContainerErrorMessageDTO.toJsonArray(results), headers, HttpStatus.BAD_REQUEST);
-		} catch (Exception e){
+			if (success)
+				return new ResponseEntity<String>(HttpStatus.NO_CONTENT);
+			else
+				return new ResponseEntity<String>(ContainerErrorMessageDTO.toJsonArray(results), headers,
+						HttpStatus.BAD_REQUEST);
+		} catch (Exception e) {
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
@@ -573,24 +602,26 @@ public ResponseEntity<java.lang.String> createPlate(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		CreatePlateRequestDTO plateRequest = CreatePlateRequestDTO.fromJsonToCreatePlateRequestDTO(json);
-		try{
-			Container dupeContainer = Container.findContainerByLabelTextAndLabelTypeKind("barcode", "barcode", plateRequest.getBarcode()).getSingleResult();
-			if (dupeContainer != null){
+		try {
+			Container dupeContainer = Container
+					.findContainerByLabelTextAndLabelTypeKind("barcode", "barcode", plateRequest.getBarcode())
+					.getSingleResult();
+			if (dupeContainer != null) {
 				return new ResponseEntity<String>("Barcode already exists", headers, HttpStatus.BAD_REQUEST);
 			}
-		}
-		catch (NoResultException e){
-			//barcode is unique, proceed to plate creation
-		}catch (IncorrectResultSizeDataAccessException e){
-			return new ResponseEntity<String>("More than one of this barcode already exists!!", headers, HttpStatus.BAD_REQUEST);
-		}catch (Exception e){
+		} catch (NoResultException e) {
+			// barcode is unique, proceed to plate creation
+		} catch (IncorrectResultSizeDataAccessException e) {
+			return new ResponseEntity<String>("More than one of this barcode already exists!!", headers,
+					HttpStatus.BAD_REQUEST);
+		} catch (Exception e) {
 			logger.error("Uncaught error in createPlate service", e);
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
-		try{
+		try {
 			PlateStubDTO result = containerService.createPlate(plateRequest);
 			return new ResponseEntity<String>(result.toJson(), headers, HttpStatus.OK);
-		} catch (Exception e){
+		} catch (Exception e) {
 			logger.error("Uncaught error in createPlate service", e);
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
@@ -602,26 +633,32 @@ public ResponseEntity<java.lang.String> createPlate(@RequestBody String json) {
 	public ResponseEntity<java.lang.String> createPlates(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		Collection<CreatePlateRequestDTO> plateRequests = CreatePlateRequestDTO.fromJsonArrayToCreatePlateRequestDTO(json);
-		for (CreatePlateRequestDTO plateRequest : plateRequests){
-			try{
-				Container dupeContainer = Container.findContainerByLabelTextAndLabelTypeKind("barcode", "barcode", plateRequest.getBarcode()).getSingleResult();
-				if (dupeContainer != null){
-					return new ResponseEntity<String>("Barcode already exists: "+plateRequest.getBarcode(), headers, HttpStatus.BAD_REQUEST);
+		Collection<CreatePlateRequestDTO> plateRequests = CreatePlateRequestDTO
+				.fromJsonArrayToCreatePlateRequestDTO(json);
+		for (CreatePlateRequestDTO plateRequest : plateRequests) {
+			try {
+				Container dupeContainer = Container
+						.findContainerByLabelTextAndLabelTypeKind("barcode", "barcode", plateRequest.getBarcode())
+						.getSingleResult();
+				if (dupeContainer != null) {
+					return new ResponseEntity<String>("Barcode already exists: " + plateRequest.getBarcode(), headers,
+							HttpStatus.BAD_REQUEST);
 				}
-			}catch (NoResultException e){
-				//barcode is unique, proceed to plate creation
-			}catch (IncorrectResultSizeDataAccessException e){
-				return new ResponseEntity<String>("More than one of this barcode already exists!!: "+plateRequest.getBarcode(), headers, HttpStatus.BAD_REQUEST);
-			}catch (Exception e){
+			} catch (NoResultException e) {
+				// barcode is unique, proceed to plate creation
+			} catch (IncorrectResultSizeDataAccessException e) {
+				return new ResponseEntity<String>(
+						"More than one of this barcode already exists!!: " + plateRequest.getBarcode(), headers,
+						HttpStatus.BAD_REQUEST);
+			} catch (Exception e) {
 				logger.error("Uncaught error in createPlates service", e);
 				return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 			}
 		}
-		try{
+		try {
 			Collection<PlateStubDTO> results = containerService.createPlates(plateRequests);
 			return new ResponseEntity<String>(PlateStubDTO.toJsonArray(results), headers, HttpStatus.OK);
-		} catch (Exception e){
+		} catch (Exception e) {
 			logger.error("Uncaught error in createPlates service", e);
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
@@ -634,24 +671,26 @@ public ResponseEntity<java.lang.String> createTube(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		CreatePlateRequestDTO plateRequest = CreatePlateRequestDTO.fromJsonToCreatePlateRequestDTO(json);
-		try{
-			Container dupeContainer = Container.findContainerByLabelTextAndLabelTypeKind("barcode", "barcode", plateRequest.getBarcode()).getSingleResult();
-			if (dupeContainer != null){
+		try {
+			Container dupeContainer = Container
+					.findContainerByLabelTextAndLabelTypeKind("barcode", "barcode", plateRequest.getBarcode())
+					.getSingleResult();
+			if (dupeContainer != null) {
 				return new ResponseEntity<String>("Barcode already exists", headers, HttpStatus.BAD_REQUEST);
 			}
-		}
-		catch (NoResultException e){
-			//barcode is unique, proceed to plate creation
-		}catch (IncorrectResultSizeDataAccessException e){
-			return new ResponseEntity<String>("More than one of this barcode already exists!!", headers, HttpStatus.BAD_REQUEST);
-		}catch (Exception e){
+		} catch (NoResultException e) {
+			// barcode is unique, proceed to plate creation
+		} catch (IncorrectResultSizeDataAccessException e) {
+			return new ResponseEntity<String>("More than one of this barcode already exists!!", headers,
+					HttpStatus.BAD_REQUEST);
+		} catch (Exception e) {
 			logger.error("Uncaught error in createTube service", e);
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
-		try{
+		try {
 			PlateStubDTO result = containerService.createTube(plateRequest);
 			return new ResponseEntity<String>(result.toJson(), headers, HttpStatus.OK);
-		} catch (Exception e){
+		} catch (Exception e) {
 			logger.error("Uncaught error in createTube service", e);
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
@@ -663,26 +702,32 @@ public ResponseEntity<java.lang.String> createTube(@RequestBody String json) {
 	public ResponseEntity<java.lang.String> createTubes(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		Collection<CreatePlateRequestDTO> plateRequests = CreatePlateRequestDTO.fromJsonArrayToCreatePlateRequestDTO(json);
-		for (CreatePlateRequestDTO plateRequest : plateRequests){
-			try{
-				Container dupeContainer = Container.findContainerByLabelTextAndLabelTypeKind("barcode", "barcode", plateRequest.getBarcode()).getSingleResult();
-				if (dupeContainer != null){
-					return new ResponseEntity<String>("Barcode already exists: "+plateRequest.getBarcode(), headers, HttpStatus.BAD_REQUEST);
+		Collection<CreatePlateRequestDTO> plateRequests = CreatePlateRequestDTO
+				.fromJsonArrayToCreatePlateRequestDTO(json);
+		for (CreatePlateRequestDTO plateRequest : plateRequests) {
+			try {
+				Container dupeContainer = Container
+						.findContainerByLabelTextAndLabelTypeKind("barcode", "barcode", plateRequest.getBarcode())
+						.getSingleResult();
+				if (dupeContainer != null) {
+					return new ResponseEntity<String>("Barcode already exists: " + plateRequest.getBarcode(), headers,
+							HttpStatus.BAD_REQUEST);
 				}
-			}catch (NoResultException e){
-				//barcode is unique, proceed to plate creation
-			}catch (IncorrectResultSizeDataAccessException e){
-				return new ResponseEntity<String>("More than one of this barcode already exists!! "+plateRequest.getBarcode(), headers, HttpStatus.BAD_REQUEST);
-			}catch (Exception e){
+			} catch (NoResultException e) {
+				// barcode is unique, proceed to plate creation
+			} catch (IncorrectResultSizeDataAccessException e) {
+				return new ResponseEntity<String>(
+						"More than one of this barcode already exists!! " + plateRequest.getBarcode(), headers,
+						HttpStatus.BAD_REQUEST);
+			} catch (Exception e) {
 				logger.error("Uncaught error in createTubes service", e);
 				return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 			}
 		}
-		try{
+		try {
 			Collection<PlateStubDTO> results = containerService.createTubes(plateRequests);
 			return new ResponseEntity<String>(PlateStubDTO.toJsonArray(results), headers, HttpStatus.OK);
-		} catch (Exception e){
+		} catch (Exception e) {
 			logger.error("Uncaught error in createTubes service", e);
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
@@ -691,18 +736,22 @@ public ResponseEntity<java.lang.String> createTubes(@RequestBody String json) {
 	@Transactional
 	@RequestMapping(value = "/getWellContentByPlateBarcode/{plateBarcode}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<java.lang.String> getWellContentByPlateBarcode(@PathVariable("plateBarcode") String plateBarcode) {
+	public ResponseEntity<java.lang.String> getWellContentByPlateBarcode(
+			@PathVariable("plateBarcode") String plateBarcode) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		try{
+		try {
 			Collection<WellContentDTO> results = containerService.getWellContentByPlateBarcode(plateBarcode);
 			boolean success = true;
-			for (WellContentDTO result: results){
-				if (result.getLevel() != null) success = false;
+			for (WellContentDTO result : results) {
+				if (result.getLevel() != null)
+					success = false;
 			}
-			if (success) return new ResponseEntity<String>(WellContentDTO.toJsonArray(results), headers, HttpStatus.OK);
-			else return new ResponseEntity<String>(WellContentDTO.toJsonArray(results), headers, HttpStatus.BAD_REQUEST);
-		} catch (Exception e){
+			if (success)
+				return new ResponseEntity<String>(WellContentDTO.toJsonArray(results), headers, HttpStatus.OK);
+			else
+				return new ResponseEntity<String>(WellContentDTO.toJsonArray(results), headers, HttpStatus.BAD_REQUEST);
+		} catch (Exception e) {
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
@@ -710,16 +759,17 @@ public ResponseEntity<java.lang.String> getWellContentByPlateBarcode(@PathVariab
 	@Transactional
 	@RequestMapping(value = "/getPlateTypeByPlateBarcode/{plateBarcode}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<java.lang.String> getPlateTypeByPlateBarcode(@PathVariable("plateBarcode") String plateBarcode) {
+	public ResponseEntity<java.lang.String> getPlateTypeByPlateBarcode(
+			@PathVariable("plateBarcode") String plateBarcode) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		try{
+		try {
 			PlateStubDTO result = containerService.getPlateTypeByPlateBarcode(plateBarcode);
-			if (result != null){
+			if (result != null) {
 				return new ResponseEntity<String>(result.toJson(), headers, HttpStatus.OK);
-			}
-			else return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-		} catch (Exception e){
+			} else
+				return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		} catch (Exception e) {
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
@@ -727,22 +777,29 @@ public ResponseEntity<java.lang.String> getPlateTypeByPlateBarcode(@PathVariable
 	@Transactional
 	@RequestMapping(value = "/updateWellContent", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<java.lang.String> updateWellContent(@RequestParam(value="copyPreviousValues", required=false) Boolean copyPreviousValues,
+	public ResponseEntity<java.lang.String> updateWellContent(
+			@RequestParam(value = "copyPreviousValues", required = false) Boolean copyPreviousValues,
 			@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		try{
+		try {
 			Collection<WellContentDTO> wellsToUpdate = WellContentDTO.fromJsonArrayToWellCoes(json);
-			if (copyPreviousValues==null) copyPreviousValues=true;
-			Collection<ContainerErrorMessageDTO> results = containerService.updateWellContent(wellsToUpdate, copyPreviousValues);
+			if (copyPreviousValues == null)
+				copyPreviousValues = true;
+			Collection<ContainerErrorMessageDTO> results = containerService.updateWellContent(wellsToUpdate,
+					copyPreviousValues);
 			boolean success = true;
-			for (ContainerErrorMessageDTO result: results){
-				if (result.getLevel() != null) success = false;
+			for (ContainerErrorMessageDTO result : results) {
+				if (result.getLevel() != null)
+					success = false;
 			}
-			if (success) return new ResponseEntity<String>(HttpStatus.NO_CONTENT);
-			else return new ResponseEntity<String>(ContainerErrorMessageDTO.toJsonArray(results), headers, HttpStatus.BAD_REQUEST);
-		} catch (Exception e){
-			logger.error("Caught error in updateWellContent",e);
+			if (success)
+				return new ResponseEntity<String>(HttpStatus.NO_CONTENT);
+			else
+				return new ResponseEntity<String>(ContainerErrorMessageDTO.toJsonArray(results), headers,
+						HttpStatus.BAD_REQUEST);
+		} catch (Exception e) {
+			logger.error("Caught error in updateWellContent", e);
 			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
@@ -753,16 +810,21 @@ public ResponseEntity<java.lang.String> updateWellContent(@RequestParam(value="c
 	public ResponseEntity<java.lang.String> getContainersByCodeNames(@RequestBody List<String> codeNames) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		try{
+		try {
 			Collection<ContainerErrorMessageDTO> searchResults = containerService.getContainersByCodeNames(codeNames);
 			boolean success = true;
-			for (ContainerErrorMessageDTO result: searchResults){
-				if (result.getLevel() != null) success = false;
+			for (ContainerErrorMessageDTO result : searchResults) {
+				if (result.getLevel() != null)
+					success = false;
 			}
-			if (success) return new ResponseEntity<String>(ContainerErrorMessageDTO.toJsonArray(searchResults), headers, HttpStatus.OK);
-			else return new ResponseEntity<String>(ContainerErrorMessageDTO.toJsonArray(searchResults), headers, HttpStatus.BAD_REQUEST);
-		} catch (Exception e){
-			logger.error("Uncaught error in getContainersByCodeNames",e);
+			if (success)
+				return new ResponseEntity<String>(ContainerErrorMessageDTO.toJsonArray(searchResults), headers,
+						HttpStatus.OK);
+			else
+				return new ResponseEntity<String>(ContainerErrorMessageDTO.toJsonArray(searchResults), headers,
+						HttpStatus.BAD_REQUEST);
+		} catch (Exception e) {
+			logger.error("Uncaught error in getContainersByCodeNames", e);
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
@@ -770,19 +832,26 @@ public ResponseEntity<java.lang.String> getContainersByCodeNames(@RequestBody Li
 	@Transactional
 	@RequestMapping(value = "/getDefinitionContainersByContainerCodeNames", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<java.lang.String> getDefinitionContainersByContainerCodeNames(@RequestBody List<String> codeNames) {
+	public ResponseEntity<java.lang.String> getDefinitionContainersByContainerCodeNames(
+			@RequestBody List<String> codeNames) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		try{
-			Collection<ContainerErrorMessageDTO> searchResults = containerService.getDefinitionContainersByContainerCodeNames(codeNames);
+		try {
+			Collection<ContainerErrorMessageDTO> searchResults = containerService
+					.getDefinitionContainersByContainerCodeNames(codeNames);
 			boolean success = true;
-			for (ContainerErrorMessageDTO result: searchResults){
-				if (result.getLevel() != null) success = false;
+			for (ContainerErrorMessageDTO result : searchResults) {
+				if (result.getLevel() != null)
+					success = false;
 			}
-			if (success) return new ResponseEntity<String>(ContainerErrorMessageDTO.toJsonArray(searchResults), headers, HttpStatus.OK);
-			else return new ResponseEntity<String>(ContainerErrorMessageDTO.toJsonArray(searchResults), headers, HttpStatus.BAD_REQUEST);
-		} catch (Exception e){
-			logger.error("Uncaught error in getDefinitionContainersByContainerCodeNames",e);
+			if (success)
+				return new ResponseEntity<String>(ContainerErrorMessageDTO.toJsonArray(searchResults), headers,
+						HttpStatus.OK);
+			else
+				return new ResponseEntity<String>(ContainerErrorMessageDTO.toJsonArray(searchResults), headers,
+						HttpStatus.BAD_REQUEST);
+		} catch (Exception e) {
+			logger.error("Uncaught error in getDefinitionContainersByContainerCodeNames", e);
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
@@ -793,32 +862,36 @@ public ResponseEntity<java.lang.String> getDefinitionContainersByContainerCodeNa
 	public ResponseEntity<java.lang.String> getWellCodesByContainerCodes(@RequestBody List<String> codeNames) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		try{
+		try {
 			Collection<ContainerWellCodeDTO> searchResults = containerService.getWellCodesByContainerCodes(codeNames);
 			return new ResponseEntity<String>(ContainerWellCodeDTO.toJsonArray(searchResults), headers, HttpStatus.OK);
-		} catch (Exception e){
-			logger.error("Uncaught error in getWellCodesByContainerCodes",e);
+		} catch (Exception e) {
+			logger.error("Uncaught error in getWellCodesByContainerCodes", e);
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
-	//	  @Transactional
+	// @Transactional
 	@RequestMapping(value = "/moveToLocation", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
 	public ResponseEntity<java.lang.String> moveToLocation(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		try{
+		try {
 			Collection<ContainerLocationDTO> requests = ContainerLocationDTO.fromJsonArrayToContainerLocatioes(json);
 			Collection<ContainerLocationDTO> results = containerService.moveToLocation(requests);
 			boolean success = true;
-			for (ContainerLocationDTO result: results){
-				if (result.getLevel() != null) success = false;
+			for (ContainerLocationDTO result : results) {
+				if (result.getLevel() != null)
+					success = false;
 			}
-			if (success) return new ResponseEntity<String>(HttpStatus.NO_CONTENT);
-			else return new ResponseEntity<String>(ContainerLocationDTO.toJsonArray(results), headers, HttpStatus.BAD_REQUEST);
-		} catch (Exception e){
-			logger.error("Uncaught error in moveToLocation",e);
+			if (success)
+				return new ResponseEntity<String>(HttpStatus.NO_CONTENT);
+			else
+				return new ResponseEntity<String>(ContainerLocationDTO.toJsonArray(results), headers,
+						HttpStatus.BAD_REQUEST);
+		} catch (Exception e) {
+			logger.error("Uncaught error in moveToLocation", e);
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
@@ -830,11 +903,11 @@ public ResponseEntity<java.lang.String> searchContainers(@RequestBody String jso
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		ContainerSearchRequestDTO searchRequest = ContainerSearchRequestDTO.fromJsonToContainerSearchRequestDTO(json);
-		try{
+		try {
 			Collection<Container> results = containerService.searchContainers(searchRequest);
 			logger.debug(Container.toJsonArray(results));
 			return new ResponseEntity<String>(Container.toJsonArray(results), headers, HttpStatus.OK);
-		} catch (Exception e){
+		} catch (Exception e) {
 			logger.error("Uncaught error in searchContainers service", e);
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
@@ -844,33 +917,37 @@ public ResponseEntity<java.lang.String> searchContainers(@RequestBody String jso
 	@RequestMapping(value = "/getContainerCodeNamesByContainerValue", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
 	public ResponseEntity<java.lang.String> getContainersByContainerValue(@RequestBody String json,
-			@RequestParam(value="like", required=false) Boolean like,
-			@RequestParam(value="rightLike", required=false) Boolean rightLike,
-			@RequestParam(value="maxResults", required=false) Integer maxResults) {
+			@RequestParam(value = "like", required = false) Boolean like,
+			@RequestParam(value = "rightLike", required = false) Boolean rightLike,
+			@RequestParam(value = "maxResults", required = false) Integer maxResults) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		if (like == null) like = false;
-		if (rightLike == null) rightLike = false;
-		try{
+		if (like == null)
+			like = false;
+		if (rightLike == null)
+			rightLike = false;
+		try {
 			ContainerValueRequestDTO requestDTO = ContainerValueRequestDTO.fromJsonToContainerValueRequestDTO(json);
-			Collection<String> searchResults = containerService.getContainersByContainerValue(requestDTO, like, rightLike);
-			if (maxResults != null && maxResults > 0 && searchResults.size() > maxResults){
+			Collection<String> searchResults = containerService.getContainersByContainerValue(requestDTO, like,
+					rightLike);
+			if (maxResults != null && maxResults > 0 && searchResults.size() > maxResults) {
 				ContainerQueryResultDTO resultDTO = new ContainerQueryResultDTO();
 				resultDTO.setMaxResults(maxResults);
 				resultDTO.setNumberOfResults(searchResults.size());
 				return new ResponseEntity<String>(resultDTO.toJson(), headers, HttpStatus.OK);
+			} else {
+				return new ResponseEntity<String>(new JSONSerializer().serialize(searchResults), headers,
+						HttpStatus.OK);
 			}
-			else{
-				return new ResponseEntity<String>(new JSONSerializer().serialize(searchResults), headers, HttpStatus.OK);
-			}
-		} catch (Exception e){
-			logger.error("Uncaught error in getContainersByCodeNames",e);
+		} catch (Exception e) {
+			logger.error("Uncaught error in getContainersByCodeNames", e);
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
 	@RequestMapping(value = "/genericBrowserSearch", method = RequestMethod.POST, headers = "Accept=application/json")
-	public ResponseEntity<java.lang.String> genericBrowserSearch(@RequestBody String json, @RequestParam(value = "with", required = false) String with) {
+	public ResponseEntity<java.lang.String> genericBrowserSearch(@RequestBody String json,
+			@RequestParam(value = "with", required = false) String with) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		ContainerBrowserQueryDTO query = ContainerBrowserQueryDTO.fromJsonToContainerBrowserQueryDTO(json);
@@ -878,17 +955,18 @@ public ResponseEntity<java.lang.String> genericBrowserSearch(@RequestBody String
 		boolean errorsFound = false;
 		Collection<Long> containerIds;
 		ContainerQueryResultDTO result = new ContainerQueryResultDTO();
-		try{
+		try {
 			containerIds = containerService.searchContainerIdsByBrowserQueryDTO(query);
 			int maxResults = 1000;
-			if (query.getQueryDTO().getMaxResults() != null) maxResults = query.getQueryDTO().getMaxResults();
+			if (query.getQueryDTO().getMaxResults() != null)
+				maxResults = query.getQueryDTO().getMaxResults();
 			result.setMaxResults(maxResults);
 			result.setNumberOfResults(containerIds.size());
-			if (result.getNumberOfResults() <= result.getMaxResults()){
+			if (result.getNumberOfResults() <= result.getMaxResults()) {
 				result.setResults(containerService.getContainersByIds(containerIds));
 			}
-		}catch (Exception e){
-			logger.error("Caught searching for containers in generic interaction search",e);
+		} catch (Exception e) {
+			logger.error("Caught searching for containers in generic interaction search", e);
 			ErrorMessage error = new ErrorMessage();
 			error.setErrorLevel("error");
 			error.setMessage(e.getMessage());
@@ -912,8 +990,9 @@ public ResponseEntity<java.lang.String> genericBrowserSearch(@RequestBody String
 					GenericQueryCodeTableResultDTO resultDTO = new GenericQueryCodeTableResultDTO();
 					resultDTO.setMaxResults(result.getMaxResults());
 					resultDTO.setNumberOfResults(result.getNumberOfResults());
-					if (result.getResults() != null){
-						resultDTO.setResults((Collection<CodeTableDTO>) containerService.convertToCodeTables(new ArrayList<Container>(result.getResults())));
+					if (result.getResults() != null) {
+						resultDTO.setResults((Collection<CodeTableDTO>) containerService
+								.convertToCodeTables(new ArrayList<Container>(result.getResults())));
 					}
 					return new ResponseEntity<String>(resultDTO.toJson(), headers, HttpStatus.OK);
 				}
@@ -926,7 +1005,8 @@ public ResponseEntity<java.lang.String> genericBrowserSearch(@RequestBody String
 	@Transactional
 	@RequestMapping(value = "/advancedSearchContainers", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<java.lang.String> advancedSearchContainers(@RequestBody String json,@RequestParam(value = "with", required = false) String with,
+	public ResponseEntity<java.lang.String> advancedSearchContainers(@RequestBody String json,
+			@RequestParam(value = "with", required = false) String with,
 			@RequestParam(value = "labelType", required = false) String labelType) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
@@ -935,15 +1015,15 @@ public ResponseEntity<java.lang.String> advancedSearchContainers(@RequestBody St
 		boolean errorsFound = false;
 		Collection<Long> containerIds;
 		ContainerQueryResultDTO result = new ContainerQueryResultDTO();
-		try{
+		try {
 			containerIds = containerService.searchContainerIdsByQueryDTO(query);
 			result.setNumberOfResults(containerIds.size());
 			result.setMaxResults(query.getMaxResults());
-			if (query.getMaxResults() == null || result.getNumberOfResults() <= result.getMaxResults()){
+			if (query.getMaxResults() == null || result.getNumberOfResults() <= result.getMaxResults()) {
 				result.setResults(containerService.getContainersByIds(containerIds));
 			}
-		}catch (Exception e){
-			logger.error("Caught searching for containers in generic interaction search",e);
+		} catch (Exception e) {
+			logger.error("Caught searching for containers in generic interaction search", e);
 			ErrorMessage error = new ErrorMessage();
 			error.setErrorLevel("error");
 			error.setMessage(e.getMessage());
@@ -967,10 +1047,10 @@ public ResponseEntity<java.lang.String> advancedSearchContainers(@RequestBody St
 					GenericQueryCodeTableResultDTO resultDTO = new GenericQueryCodeTableResultDTO();
 					resultDTO.setMaxResults(result.getMaxResults());
 					resultDTO.setNumberOfResults(result.getNumberOfResults());
-					if (result.getResults() != null){
-						if (labelType != null && labelType.length() > 0){
+					if (result.getResults() != null) {
+						if (labelType != null && labelType.length() > 0) {
 							resultDTO.setResults(containerService.convertToCodeTables(result.getResults(), labelType));
-						}else{
+						} else {
 							resultDTO.setResults(containerService.convertToCodeTables(result.getResults()));
 						}
 					}
@@ -980,83 +1060,91 @@ public ResponseEntity<java.lang.String> advancedSearchContainers(@RequestBody St
 			return new ResponseEntity<String>(result.toJson(), headers, HttpStatus.OK);
 		}
 	}
-	
+
 	@Transactional
 	@RequestMapping(value = "/getContainerDTOsByBatchCodes", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
 	public ResponseEntity<java.lang.String> getContainerDTOsByBatchCodes(@RequestBody List<String> batchCodes) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		try{
+		try {
 			Collection<ContainerBatchCodeDTO> searchResults = containerService.getContainerDTOsByBatchCodes(batchCodes);
 			return new ResponseEntity<String>(ContainerBatchCodeDTO.toJsonArray(searchResults), headers, HttpStatus.OK);
-		} catch (Exception e){
-			logger.error("Uncaught error in getContainerDTOsByBatchCodes",e);
+		} catch (Exception e) {
+			logger.error("Uncaught error in getContainerDTOsByBatchCodes", e);
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
-	
+
 	@RequestMapping(value = "/getLocationTreeByRootLabel", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	public ResponseEntity<java.lang.String> getLocationTreeByRootLabel(@RequestParam("rootLabel") String rootLabel,
-			@RequestParam(value="withContainers", required=false) Boolean withContainers) {
+			@RequestParam(value = "withContainers", required = false) Boolean withContainers) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		try{
-			List<ContainerLocationTreeDTO> results = containerService.getLocationTreeByRootLabel(rootLabel, withContainers);
-			if (results != null){
-				return new ResponseEntity<String>(ContainerLocationTreeDTO.toJsonArray(results), headers, HttpStatus.OK);
-			}
-			else return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-		} catch (Exception e){
+		try {
+			List<ContainerLocationTreeDTO> results = containerService.getLocationTreeByRootLabel(rootLabel,
+					withContainers);
+			if (results != null) {
+				return new ResponseEntity<String>(ContainerLocationTreeDTO.toJsonArray(results), headers,
+						HttpStatus.OK);
+			} else
+				return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		} catch (Exception e) {
 			logger.error("Caught exception getting location tree", e);
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
-	
+
 	@RequestMapping(value = "/getLocationTreeByRootCodeName", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<java.lang.String> getLocationTreeByRooCodeName(@RequestParam("rootCodeName") String rootCodeName,
-			@RequestParam(value="withContainers", required=false) Boolean withContainers) {
+	public ResponseEntity<java.lang.String> getLocationTreeByRooCodeName(
+			@RequestParam("rootCodeName") String rootCodeName,
+			@RequestParam(value = "withContainers", required = false) Boolean withContainers) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		try{
-			List<ContainerLocationTreeDTO> results = containerService.getLocationTreeByRootCodeName(rootCodeName, withContainers);
-			if (results != null){
-				return new ResponseEntity<String>(ContainerLocationTreeDTO.toJsonArray(results), headers, HttpStatus.OK);
-			}
-			else return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-		} catch (Exception e){
+		try {
+			List<ContainerLocationTreeDTO> results = containerService.getLocationTreeByRootCodeName(rootCodeName,
+					withContainers);
+			if (results != null) {
+				return new ResponseEntity<String>(ContainerLocationTreeDTO.toJsonArray(results), headers,
+						HttpStatus.OK);
+			} else
+				return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		} catch (Exception e) {
 			logger.error("Caught exception getting location tree", e);
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
-	
+
 	@RequestMapping(value = "/getLocationCodesByBreadcrumbArray", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
 	public ResponseEntity<java.lang.String> getLocationCodeByBreadcrumb(@RequestParam("rootLabel") String rootLabel,
 			@RequestBody List<String> breadcrumbList) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		try{
-			List<ContainerLocationTreeDTO> results = containerService.getLocationCodeByLabelBreadcrumbByRecursiveQuery(rootLabel, breadcrumbList);
-			if (results != null){
-				return new ResponseEntity<String>(ContainerLocationTreeDTO.toJsonArray(results), headers, HttpStatus.OK);
-			}
-			else return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-		} catch (Exception e){
+		try {
+			List<ContainerLocationTreeDTO> results = containerService
+					.getLocationCodeByLabelBreadcrumbByRecursiveQuery(rootLabel, breadcrumbList);
+			if (results != null) {
+				return new ResponseEntity<String>(ContainerLocationTreeDTO.toJsonArray(results), headers,
+						HttpStatus.OK);
+			} else
+				return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		} catch (Exception e) {
 			logger.error("Caught exception getting location tree", e);
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
-	
+
 	@RequestMapping(value = "/saveContainerStatesArray", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
 	public ResponseEntity<java.lang.String> saveContainerStatesArray(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		try{
-			Collection<ContainerCodeNameStateDTO> stateDTOs = ContainerCodeNameStateDTO.fromJsonArrayToContainerCoes(json);
+		try {
+			Collection<ContainerCodeNameStateDTO> stateDTOs = ContainerCodeNameStateDTO
+					.fromJsonArrayToContainerCoes(json);
 			List<String> codeNames = new ArrayList<String>();
 			for (ContainerCodeNameStateDTO dto : stateDTOs) {
 				codeNames.add(dto.getContainerCodeName());
@@ -1064,13 +1152,14 @@ public ResponseEntity<java.lang.String> saveContainerStatesArray(@RequestBody St
 			Collection<ContainerErrorMessageDTO> codeNameLookups = containerService.getContainersByCodeNames(codeNames);
 			Collection<ContainerErrorMessageDTO> errors = new ArrayList<ContainerErrorMessageDTO>();
 			for (ContainerErrorMessageDTO containerDTO : codeNameLookups) {
-				if(containerDTO.getLevel() != null && containerDTO.getLevel().equals("error")) {
+				if (containerDTO.getLevel() != null && containerDTO.getLevel().equals("error")) {
 					errors.add(containerDTO);
 				}
 			}
 			if (!errors.isEmpty()) {
-				return new ResponseEntity<String>(ContainerErrorMessageDTO.toJsonArray(errors), headers, HttpStatus.BAD_REQUEST);
-			}else {
+				return new ResponseEntity<String>(ContainerErrorMessageDTO.toJsonArray(errors), headers,
+						HttpStatus.BAD_REQUEST);
+			} else {
 				Map<String, Container> containerCodeNameMap = new HashMap<String, Container>();
 				for (ContainerErrorMessageDTO dto : codeNameLookups) {
 					containerCodeNameMap.put(dto.getContainerCodeName(), dto.getContainer());
@@ -1079,14 +1168,17 @@ public ResponseEntity<java.lang.String> saveContainerStatesArray(@RequestBody St
 				for (ContainerCodeNameStateDTO stateDTO : stateDTOs) {
 					ContainerState state = stateDTO.getLsState();
 					state.setContainer(containerCodeNameMap.get(stateDTO.getContainerCodeName()));
-					ContainerCodeNameStateDTO newDTO = new ContainerCodeNameStateDTO(stateDTO.getContainerCodeName(), state);
+					ContainerCodeNameStateDTO newDTO = new ContainerCodeNameStateDTO(stateDTO.getContainerCodeName(),
+							state);
 					stateDTOsToSave.add(newDTO);
 				}
-				Collection<ContainerCodeNameStateDTO> savedDTOs = containerService.saveContainerCodeNameStateDTOArray(stateDTOsToSave);
-				return new ResponseEntity<String>(ContainerCodeNameStateDTO.toJsonArray(savedDTOs), headers, HttpStatus.OK);
+				Collection<ContainerCodeNameStateDTO> savedDTOs = containerService
+						.saveContainerCodeNameStateDTOArray(stateDTOsToSave);
+				return new ResponseEntity<String>(ContainerCodeNameStateDTO.toJsonArray(savedDTOs), headers,
+						HttpStatus.OK);
 			}
-		} catch (Exception e){
-			logger.error("Uncaught error in getContainersByCodeNames",e);
+		} catch (Exception e) {
+			logger.error("Uncaught error in getContainersByCodeNames", e);
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
diff --git a/src/main/java/com/labsynch/labseer/api/ApiContainerStateController.java b/src/main/java/com/labsynch/labseer/api/ApiContainerStateController.java
index 6c48b446b..7fad24eb1 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiContainerStateController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiContainerStateController.java
@@ -42,266 +42,270 @@
 @Transactional
 public class ApiContainerStateController {
 
-	private static final Logger logger = LoggerFactory.getLogger(ApiContainerStateController.class);
-	
-  @Autowired
-  private ContainerStateService csService;
-	
-	@Autowired
+    private static final Logger logger = LoggerFactory.getLogger(ApiContainerStateController.class);
+
+    @Autowired
+    private ContainerStateService csService;
+
+    @Autowired
     private ContainerService containerService;
 
     @SuppressWarnings("unused")
     @Autowired
     private PropertiesUtilService propertiesUtilService;
 
-  @Transactional
-  @RequestMapping(value = "/findValidContainerStates/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-  public ResponseEntity<java.lang.String> getValidContainerStatesFromIDs(@RequestBody String json) {
-      Collection<Container> containers = Container.fromJsonArrayToContainers(json);
-      logger.debug("number of containers found: " + containers.size());
-      List<ContainerState> containerStates = new ArrayList<ContainerState>();
-      int counter = 0;
-      List<Long> containerIds = new ArrayList<Long>();
-      for (Container container : containers) {
-          containerIds.add(container.getId());
-          counter++;
-          if (counter == 990) {
-              containerStates.addAll(ContainerState.findValidContainerStates(containerIds));
-              counter = 0;
-              containerIds.clear();
-              logger.debug("number of container States found: " + containerStates.size());
-              logger.debug("number of counter: " + counter);
-          }
-      }
-      if (counter > 0) {
-          containerStates.addAll(ContainerState.findValidContainerStates(containerIds));
-      }
-      logger.debug("number of container States found: " + containerStates.size());
-      HttpHeaders headers = new HttpHeaders();
-      headers.add("Content-Type", "application/json");
-      return new ResponseEntity<String>(ContainerState.toJsonArray(containerStates), headers, HttpStatus.OK);
-  }
+    @Transactional
+    @RequestMapping(value = "/findValidContainerStates/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    public ResponseEntity<java.lang.String> getValidContainerStatesFromIDs(@RequestBody String json) {
+        Collection<Container> containers = Container.fromJsonArrayToContainers(json);
+        logger.debug("number of containers found: " + containers.size());
+        List<ContainerState> containerStates = new ArrayList<ContainerState>();
+        int counter = 0;
+        List<Long> containerIds = new ArrayList<Long>();
+        for (Container container : containers) {
+            containerIds.add(container.getId());
+            counter++;
+            if (counter == 990) {
+                containerStates.addAll(ContainerState.findValidContainerStates(containerIds));
+                counter = 0;
+                containerIds.clear();
+                logger.debug("number of container States found: " + containerStates.size());
+                logger.debug("number of counter: " + counter);
+            }
+        }
+        if (counter > 0) {
+            containerStates.addAll(ContainerState.findValidContainerStates(containerIds));
+        }
+        logger.debug("number of container States found: " + containerStates.size());
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Type", "application/json");
+        return new ResponseEntity<String>(ContainerState.toJsonArray(containerStates), headers, HttpStatus.OK);
+    }
 
-  @Transactional
-  @RequestMapping(value = "/findContainerStates/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-  public ResponseEntity<java.lang.String> getContainerStatesFromIDs(@RequestBody String json) {
-      logger.info("incoming json:" + json);
-      Collection<Container> containers = Container.fromJsonArrayToContainers(json);
-      List<ContainerState> containerStates = new ArrayList<ContainerState>();
-      for (Container container : containers) {
-          logger.info("incoming container: " + container);
-          for (ContainerState cs : ContainerState.findContainerStatesByContainer(Container.findContainer(container.getId())).getResultList()) {
-              containerStates.add(cs);
-          }
-      }
-      HttpHeaders headers = new HttpHeaders();
-      headers.add("Content-Type", "application/json");
-      return new ResponseEntity<String>(ContainerState.toJsonArray(containerStates), headers, HttpStatus.OK);
-  }
+    @Transactional
+    @RequestMapping(value = "/findContainerStates/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    public ResponseEntity<java.lang.String> getContainerStatesFromIDs(@RequestBody String json) {
+        logger.info("incoming json:" + json);
+        Collection<Container> containers = Container.fromJsonArrayToContainers(json);
+        List<ContainerState> containerStates = new ArrayList<ContainerState>();
+        for (Container container : containers) {
+            logger.info("incoming container: " + container);
+            for (ContainerState cs : ContainerState
+                    .findContainerStatesByContainer(Container.findContainer(container.getId())).getResultList()) {
+                containerStates.add(cs);
+            }
+        }
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Type", "application/json");
+        return new ResponseEntity<String>(ContainerState.toJsonArray(containerStates), headers, HttpStatus.OK);
+    }
 
-  @RequestMapping(value = "/jsonFile", method = RequestMethod.POST, headers = "Accept=application/json")
-  public ResponseEntity<java.lang.String> createFromJsonFile(@RequestBody String jsonFile) {
-      HttpHeaders headers = new HttpHeaders();
-      headers.add("Content-Type", "application/json");
-      Collection<ContainerStateMiniDTO> savedContainerStates = new ArrayList<ContainerStateMiniDTO>();
-      int batchSize = propertiesUtilService.getBatchSize();
-      int i = 0;
-      try {
-          BufferedReader br = new BufferedReader(new FileReader(jsonFile));
-          JSONTokener jsonTokens = new JSONTokener(br);
-          Object token;
-          char delimiter;
-          char END_OF_ARRAY = ']';
-          ContainerStateMiniDTO stateDTO;
-          ContainerMiniDTO containerDTO;
-          while (jsonTokens.more()) {
-              delimiter = jsonTokens.nextClean();
-              logger.info("delimiter: " + delimiter);
-              if (delimiter != END_OF_ARRAY) {
-                  token = jsonTokens.nextValue();
-                  logger.info(token.toString());
-                  ContainerState containerState = ContainerState.fromJsonToContainerState(token.toString());
-                  containerState.persist();
-                  stateDTO = new ContainerStateMiniDTO(containerState);
-                  stateDTO.setId(containerState.getId());
-                  stateDTO.setVersion(containerState.getVersion());
-                  containerDTO = new ContainerMiniDTO(containerState.getContainer());
-                  stateDTO.setContainer(containerDTO);
-                  savedContainerStates.add(stateDTO);
-                  if (i % batchSize == 0) {
-                      containerState.flush();
-                      containerState.clear();
-                  }
-                  i++;
-              } else {
-                  break;
-              }
-          }
-      } catch (Exception e) {
-          logger.error("ERROR: " + e);
-          return new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST);
-      }
-      return new ResponseEntity<String>(ContainerStateMiniDTO.toJsonArray(savedContainerStates), headers, HttpStatus.CREATED);
-  }
+    @RequestMapping(value = "/jsonFile", method = RequestMethod.POST, headers = "Accept=application/json")
+    public ResponseEntity<java.lang.String> createFromJsonFile(@RequestBody String jsonFile) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Type", "application/json");
+        Collection<ContainerStateMiniDTO> savedContainerStates = new ArrayList<ContainerStateMiniDTO>();
+        int batchSize = propertiesUtilService.getBatchSize();
+        int i = 0;
+        try {
+            BufferedReader br = new BufferedReader(new FileReader(jsonFile));
+            JSONTokener jsonTokens = new JSONTokener(br);
+            Object token;
+            char delimiter;
+            char END_OF_ARRAY = ']';
+            ContainerStateMiniDTO stateDTO;
+            ContainerMiniDTO containerDTO;
+            while (jsonTokens.more()) {
+                delimiter = jsonTokens.nextClean();
+                logger.info("delimiter: " + delimiter);
+                if (delimiter != END_OF_ARRAY) {
+                    token = jsonTokens.nextValue();
+                    logger.info(token.toString());
+                    ContainerState containerState = ContainerState.fromJsonToContainerState(token.toString());
+                    containerState.persist();
+                    stateDTO = new ContainerStateMiniDTO(containerState);
+                    stateDTO.setId(containerState.getId());
+                    stateDTO.setVersion(containerState.getVersion());
+                    containerDTO = new ContainerMiniDTO(containerState.getContainer());
+                    stateDTO.setContainer(containerDTO);
+                    savedContainerStates.add(stateDTO);
+                    if (i % batchSize == 0) {
+                        containerState.flush();
+                        containerState.clear();
+                    }
+                    i++;
+                } else {
+                    break;
+                }
+            }
+        } catch (Exception e) {
+            logger.error("ERROR: " + e);
+            return new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST);
+        }
+        return new ResponseEntity<String>(ContainerStateMiniDTO.toJsonArray(savedContainerStates), headers,
+                HttpStatus.CREATED);
+    }
 
-  @RequestMapping(value = "/jsonArrayParse", method = RequestMethod.POST, headers = "Accept=application/json")
-  public ResponseEntity<java.lang.String> createFromJsonArray(@RequestBody String json) {
-      HttpHeaders headers = new HttpHeaders();
-      headers.add("Content-Type", "application/json");
-      Collection<ContainerStateMiniDTO> savedContainerStates = new ArrayList<ContainerStateMiniDTO>();
-      int batchSize = propertiesUtilService.getBatchSize();
-      int i = 0;
-      ContainerStateMiniDTO stateDTO;
-      ContainerMiniDTO containerDTO;
-      BufferedReader br = null;
-      StringReader sr = null;
-      try {
-          sr = new StringReader(json);
-          br = new BufferedReader(sr);
-          for (ContainerState containerState : ContainerState.fromJsonArrayToContainerStates(br)) {
-              containerState.persist();
-              stateDTO = new ContainerStateMiniDTO(containerState);
-              stateDTO.setId(containerState.getId());
-              stateDTO.setVersion(containerState.getVersion());
-              containerDTO = new ContainerMiniDTO(containerState.getContainer());
-              stateDTO.setContainer(containerDTO);
-              savedContainerStates.add(stateDTO);
-              if (i % batchSize == 0) {
-                  containerState.flush();
-                  containerState.clear();
-              }
-              i++;
-          }
-      } catch (Exception e) {
-          logger.error("ERROR: " + e);
-          return new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST);
-      } finally {
-          IOUtils.closeQuietly(sr);
-          IOUtils.closeQuietly(br);
-      }
-      return new ResponseEntity<String>(ContainerStateMiniDTO.toJsonArray(savedContainerStates), headers, HttpStatus.CREATED);
-  }
+    @RequestMapping(value = "/jsonArrayParse", method = RequestMethod.POST, headers = "Accept=application/json")
+    public ResponseEntity<java.lang.String> createFromJsonArray(@RequestBody String json) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Type", "application/json");
+        Collection<ContainerStateMiniDTO> savedContainerStates = new ArrayList<ContainerStateMiniDTO>();
+        int batchSize = propertiesUtilService.getBatchSize();
+        int i = 0;
+        ContainerStateMiniDTO stateDTO;
+        ContainerMiniDTO containerDTO;
+        BufferedReader br = null;
+        StringReader sr = null;
+        try {
+            sr = new StringReader(json);
+            br = new BufferedReader(sr);
+            for (ContainerState containerState : ContainerState.fromJsonArrayToContainerStates(br)) {
+                containerState.persist();
+                stateDTO = new ContainerStateMiniDTO(containerState);
+                stateDTO.setId(containerState.getId());
+                stateDTO.setVersion(containerState.getVersion());
+                containerDTO = new ContainerMiniDTO(containerState.getContainer());
+                stateDTO.setContainer(containerDTO);
+                savedContainerStates.add(stateDTO);
+                if (i % batchSize == 0) {
+                    containerState.flush();
+                    containerState.clear();
+                }
+                i++;
+            }
+        } catch (Exception e) {
+            logger.error("ERROR: " + e);
+            return new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST);
+        } finally {
+            IOUtils.closeQuietly(sr);
+            IOUtils.closeQuietly(br);
+        }
+        return new ResponseEntity<String>(ContainerStateMiniDTO.toJsonArray(savedContainerStates), headers,
+                HttpStatus.CREATED);
+    }
 
-  @RequestMapping(value = "/jsonArrayParse", method = RequestMethod.PUT, headers = "Accept=application/json")
-  public ResponseEntity<java.lang.String> updateFromJsonArray(@RequestBody String json) {
-      HttpHeaders headers = new HttpHeaders();
-      headers.add("Content-Type", "application/json");
-      int batchSize = propertiesUtilService.getBatchSize();
-      int i = 0;
-      BufferedReader br = null;
-      StringReader sr = null;
-      try {
-          sr = new StringReader(json);
-          br = new BufferedReader(sr);
-          for (ContainerState containerState : ContainerState.fromJsonArrayToContainerStates(br)) {
-              if (containerState.merge() == null) {
-                  return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-              }
-              if (i % batchSize == 0) {
-                  containerState.flush();
-                  containerState.clear();
-              }
-              i++;
-          }
-      } catch (Exception e) {
-          logger.error("ERROR: " + e);
-          return new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST);
-      } finally {
-          IOUtils.closeQuietly(sr);
-          IOUtils.closeQuietly(br);
-      }
-      return new ResponseEntity<String>("[]", headers, HttpStatus.OK);
-  }
+    @RequestMapping(value = "/jsonArrayParse", method = RequestMethod.PUT, headers = "Accept=application/json")
+    public ResponseEntity<java.lang.String> updateFromJsonArray(@RequestBody String json) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Type", "application/json");
+        int batchSize = propertiesUtilService.getBatchSize();
+        int i = 0;
+        BufferedReader br = null;
+        StringReader sr = null;
+        try {
+            sr = new StringReader(json);
+            br = new BufferedReader(sr);
+            for (ContainerState containerState : ContainerState.fromJsonArrayToContainerStates(br)) {
+                if (containerState.merge() == null) {
+                    return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+                }
+                if (i % batchSize == 0) {
+                    containerState.flush();
+                    containerState.clear();
+                }
+                i++;
+            }
+        } catch (Exception e) {
+            logger.error("ERROR: " + e);
+            return new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST);
+        } finally {
+            IOUtils.closeQuietly(sr);
+            IOUtils.closeQuietly(br);
+        }
+        return new ResponseEntity<String>("[]", headers, HttpStatus.OK);
+    }
 
-  @Transactional
-  @RequestMapping(value = "/ignoreByContainer/jsonArray", params = "lsKind", method = RequestMethod.POST, headers = "Accept=application/json")
-  public ResponseEntity<java.lang.String> updateIgnoreFromJsonArrayAndKind(@RequestParam("lsKind") String lsKind, @RequestBody String json) {
-      HttpHeaders headers = new HttpHeaders();
-      headers.add("Content-Type", "application/json");
-      LsTransaction uplogTransaction;
-      try {
-          uplogTransaction = csService.ignoreByContainer(json, lsKind);
-      } catch (Exception e) {
-          logger.error("ERROR: " + e);
-          return new ResponseEntity<String>(e.toString(), headers, HttpStatus.BAD_REQUEST);
-      }
-      return new ResponseEntity<String>(uplogTransaction.toJson(), headers, HttpStatus.OK);
-  }
+    @Transactional
+    @RequestMapping(value = "/ignoreByContainer/jsonArray", params = "lsKind", method = RequestMethod.POST, headers = "Accept=application/json")
+    public ResponseEntity<java.lang.String> updateIgnoreFromJsonArrayAndKind(@RequestParam("lsKind") String lsKind,
+            @RequestBody String json) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Type", "application/json");
+        LsTransaction uplogTransaction;
+        try {
+            uplogTransaction = csService.ignoreByContainer(json, lsKind);
+        } catch (Exception e) {
+            logger.error("ERROR: " + e);
+            return new ResponseEntity<String>(e.toString(), headers, HttpStatus.BAD_REQUEST);
+        }
+        return new ResponseEntity<String>(uplogTransaction.toJson(), headers, HttpStatus.OK);
+    }
 
-  @Transactional
-  @RequestMapping(value = "/ignore/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-  public ResponseEntity<java.lang.String> updateIgnoreFromJsonArray(@RequestBody String json) {
-      HttpHeaders headers = new HttpHeaders();
-      headers.add("Content-Type", "application/json");
-      LsTransaction lst = new LsTransaction();
-      lst.setComments("mark states to ignore");
-      lst.setRecordedDate(new Date());
-      lst.persist();
-      int batchSize = propertiesUtilService.getBatchSize();
-      int i = 0;
-      BufferedReader br = null;
-      StringReader sr = null;
-      UpdateLog uplog = null;
-      try {
-          sr = new StringReader(json);
-          br = new BufferedReader(sr);
-          for (ContainerState containerState : ContainerState.fromJsonArrayToContainerStates(br)) {
-              uplog = new UpdateLog();
-              uplog.setThing(containerState.getId());
-              uplog.setLsTransaction(lst.getId());
-              uplog.setUpdateAction("ignore");
-              uplog.setComments("mark states to ignore");
-              uplog.setRecordedDate(new Date());
-              uplog.persist();
-              if (i % batchSize == 0) {
-                  uplog.flush();
-                  uplog.clear();
-              }
-              i++;
-          }
-          int results = ContainerState.ignoreStates(lst.getId());
-          logger.debug("number of states marked to ignore: " + results);
-      } catch (Exception e) {
-          logger.error("ERROR: " + e);
-          return new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST);
-      } finally {
-          IOUtils.closeQuietly(sr);
-          IOUtils.closeQuietly(br);
-      }
-      return new ResponseEntity<String>("[]", headers, HttpStatus.OK);
-  }
-  
-  @Transactional
-  @RequestMapping(value = "/getContainerStatesByContainerValue", method = RequestMethod.POST, headers = "Accept=application/json")
-  @ResponseBody
-  public ResponseEntity<java.lang.String> getContainerStatesByContainerValue(@RequestBody String json, 
-		  @RequestParam(value="like", required=false) Boolean like,
-		  @RequestParam(value="rightLike", required=false) Boolean rightLike,
-		  @RequestParam(value="maxResults", required=false) Integer maxResults,
-		  @RequestParam(value = "with", required = false) String with) {
-      HttpHeaders headers = new HttpHeaders();
-      headers.add("Content-Type", "application/json; charset=utf-8");
-      try{
-      	ContainerValueRequestDTO requestDTO = ContainerValueRequestDTO.fromJsonToContainerValueRequestDTO(json);
-      	Collection<ContainerState> searchResults = csService.getContainerStatesByContainerValue(requestDTO, like, rightLike);
-      	if (maxResults != null && maxResults > 0 && searchResults.size() > maxResults){
-        	ContainerQueryResultDTO resultDTO = new ContainerQueryResultDTO();
-        	resultDTO.setMaxResults(maxResults);
-        	resultDTO.setNumberOfResults(searchResults.size());
-        	return new ResponseEntity<String>(resultDTO.toJson(), headers, HttpStatus.OK);
+    @Transactional
+    @RequestMapping(value = "/ignore/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    public ResponseEntity<java.lang.String> updateIgnoreFromJsonArray(@RequestBody String json) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Type", "application/json");
+        LsTransaction lst = new LsTransaction();
+        lst.setComments("mark states to ignore");
+        lst.setRecordedDate(new Date());
+        lst.persist();
+        int batchSize = propertiesUtilService.getBatchSize();
+        int i = 0;
+        BufferedReader br = null;
+        StringReader sr = null;
+        UpdateLog uplog = null;
+        try {
+            sr = new StringReader(json);
+            br = new BufferedReader(sr);
+            for (ContainerState containerState : ContainerState.fromJsonArrayToContainerStates(br)) {
+                uplog = new UpdateLog();
+                uplog.setThing(containerState.getId());
+                uplog.setLsTransaction(lst.getId());
+                uplog.setUpdateAction("ignore");
+                uplog.setComments("mark states to ignore");
+                uplog.setRecordedDate(new Date());
+                uplog.persist();
+                if (i % batchSize == 0) {
+                    uplog.flush();
+                    uplog.clear();
+                }
+                i++;
+            }
+            int results = ContainerState.ignoreStates(lst.getId());
+            logger.debug("number of states marked to ignore: " + results);
+        } catch (Exception e) {
+            logger.error("ERROR: " + e);
+            return new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST);
+        } finally {
+            IOUtils.closeQuietly(sr);
+            IOUtils.closeQuietly(br);
         }
-        else{
-        	if (with != null && with.equalsIgnoreCase("nestedContainer")){
-          		return new ResponseEntity<String>(ContainerState.toJsonArrayWithNestedContainers(searchResults), headers, HttpStatus.OK);
-          	}
-          	return new ResponseEntity<String>(ContainerState.toJsonArray(searchResults), headers, HttpStatus.OK);
+        return new ResponseEntity<String>("[]", headers, HttpStatus.OK);
+    }
+
+    @Transactional
+    @RequestMapping(value = "/getContainerStatesByContainerValue", method = RequestMethod.POST, headers = "Accept=application/json")
+    @ResponseBody
+    public ResponseEntity<java.lang.String> getContainerStatesByContainerValue(@RequestBody String json,
+            @RequestParam(value = "like", required = false) Boolean like,
+            @RequestParam(value = "rightLike", required = false) Boolean rightLike,
+            @RequestParam(value = "maxResults", required = false) Integer maxResults,
+            @RequestParam(value = "with", required = false) String with) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Type", "application/json; charset=utf-8");
+        try {
+            ContainerValueRequestDTO requestDTO = ContainerValueRequestDTO.fromJsonToContainerValueRequestDTO(json);
+            Collection<ContainerState> searchResults = csService.getContainerStatesByContainerValue(requestDTO, like,
+                    rightLike);
+            if (maxResults != null && maxResults > 0 && searchResults.size() > maxResults) {
+                ContainerQueryResultDTO resultDTO = new ContainerQueryResultDTO();
+                resultDTO.setMaxResults(maxResults);
+                resultDTO.setNumberOfResults(searchResults.size());
+                return new ResponseEntity<String>(resultDTO.toJson(), headers, HttpStatus.OK);
+            } else {
+                if (with != null && with.equalsIgnoreCase("nestedContainer")) {
+                    return new ResponseEntity<String>(ContainerState.toJsonArrayWithNestedContainers(searchResults),
+                            headers, HttpStatus.OK);
+                }
+                return new ResponseEntity<String>(ContainerState.toJsonArray(searchResults), headers, HttpStatus.OK);
+            }
+
+        } catch (Exception e) {
+            logger.error("Uncaught error in getContainerStatesByContainerValue", e);
+            return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
         }
-      	
-      } catch (Exception e){
-      	logger.error("Uncaught error in getContainerStatesByContainerValue",e);
-          return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
-      }
-  }
+    }
 
-	
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiCronJobController.java b/src/main/java/com/labsynch/labseer/api/ApiCronJobController.java
index 8c9909196..159773812 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiCronJobController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiCronJobController.java
@@ -26,7 +26,6 @@
 @RequestMapping("api/v1/cronjobs")
 @Controller
 
-
 public class ApiCronJobController {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiCronJobController.class);
@@ -34,7 +33,6 @@ public class ApiCronJobController {
 	@Autowired
 	private CronJobService cronJobService;
 
-
 	@Transactional
 	@RequestMapping(method = RequestMethod.GET, value = "/{idOrCodeName}", headers = "Accept=application/json")
 	@ResponseBody
@@ -42,14 +40,14 @@ public ResponseEntity<String> showJson(@PathVariable("idOrCodeName") String idOr
 
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		
+
 		CronJob cronJob = null;
-		if (SimpleUtil.isNumeric(idOrCodeName)){
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			cronJob = CronJob.findCronJob(Long.valueOf(idOrCodeName));
 		} else {
-			try{
+			try {
 				cronJob = CronJob.findCronJobsByCodeNameEquals(idOrCodeName).getSingleResult();
-			}catch (Exception e){
+			} catch (Exception e) {
 				cronJob = null;
 			}
 		}
@@ -59,7 +57,7 @@ public ResponseEntity<String> showJson(@PathVariable("idOrCodeName") String idOr
 		}
 		return new ResponseEntity<String>(cronJob.toJson(), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	public ResponseEntity<String> listJson() {
@@ -74,10 +72,10 @@ public ResponseEntity<String> listJson() {
 	public ResponseEntity<String> createFromJson(@RequestBody CronJob cronJob) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		try{
+		try {
 			CronJob savedCronJob = cronJobService.saveCronJob(cronJob);
 			return new ResponseEntity<String>(savedCronJob.toJson(), headers, HttpStatus.CREATED);
-		}catch (Exception e){
+		} catch (Exception e) {
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
@@ -88,26 +86,25 @@ public ResponseEntity<String> createFromJsonArray(
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		List<CronJob> savedCronJobs = new ArrayList<CronJob>();
-		try{
-			for (CronJob cronJob : cronJobs){
+		try {
+			for (CronJob cronJob : cronJobs) {
 				CronJob savedCronJob = cronJobService.saveCronJob(cronJob);
 				savedCronJobs.add(savedCronJob);
 			}
 			return new ResponseEntity<String>(CronJob.toJsonArray(savedCronJobs), headers, HttpStatus.CREATED);
-		}catch (Exception e){
+		} catch (Exception e) {
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
-
 	@RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
 	public ResponseEntity<String> updateFromJson(@RequestBody CronJob cronJob) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		try{
+		try {
 			CronJob updatedCronJob = cronJobService.updateCronJob(cronJob);
 			return new ResponseEntity<String>(updatedCronJob.toJson(), headers, HttpStatus.OK);
-		}catch (Exception e){
+		} catch (Exception e) {
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
@@ -117,18 +114,15 @@ public ResponseEntity<String> updateFromJsonArray(@RequestBody List<CronJob> cro
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<CronJob> updatedCronJobs = new ArrayList<CronJob>();
-		try{
-			for (CronJob cronJob : cronJobs){
+		try {
+			for (CronJob cronJob : cronJobs) {
 				CronJob updatedCronJob = cronJobService.updateCronJob(cronJob);
 				updatedCronJobs.add(updatedCronJob);
 			}
 			return new ResponseEntity<String>(CronJob.toJsonArray(updatedCronJobs), headers, HttpStatus.OK);
-		}catch (Exception e){
+		} catch (Exception e) {
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
-
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/api/ApiCurveFitController.java b/src/main/java/com/labsynch/labseer/api/ApiCurveFitController.java
index cc45e39df..f2e3f1ddd 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiCurveFitController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiCurveFitController.java
@@ -26,102 +26,117 @@
 @RequestMapping("api/v1/curvefit")
 @Transactional
 public class ApiCurveFitController {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(ApiCurveFitController.class);
-	
-	//no longer needed - preparing to deprecate
+
+	// no longer needed - preparing to deprecate
 	@Transactional
-    @RequestMapping(value = "/fitdata", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> getFitDataByCurveId(@RequestBody List<String> curveIds, @RequestParam(value = "format", required = false) String format) {
+	@RequestMapping(value = "/fitdata", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> getFitDataByCurveId(@RequestBody List<String> curveIds,
+			@RequestParam(value = "format", required = false) String format) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		try {
-        	//This route will not pull back the correct data if a mix of rendering hints is expected. It will handle mixed existence of rendering hints.
+			// This route will not pull back the correct data if a mix of rendering hints is
+			// expected. It will handle mixed existence of rendering hints.
 			String renderingHint = CurveFitDTO.findFirstRenderingHint(curveIds);
-			if (renderingHint.equalsIgnoreCase("4 parameter D-R")){
+			if (renderingHint.equalsIgnoreCase("4 parameter D-R")) {
 				Collection<CurveFitDTO> filledCurveFitDTOs = CurveFitDTO.getFitData(curveIds);
 				if (format != null && (format.equalsIgnoreCase("csv") || format.equalsIgnoreCase("tsv"))) {
 					String outFileString = CurveFitDTO.getCsvList(filledCurveFitDTOs, format);
 					outFileString = outFileString.replaceAll("\"\"", "\\\"");
-//					this very confusing regex replaces "" with \" to reverse an unintended conversion by supercsv.
-				    return new ResponseEntity<String>(outFileString, headers, HttpStatus.OK);
+					// this very confusing regex replaces "" with \" to reverse an unintended
+					// conversion by supercsv.
+					return new ResponseEntity<String>(outFileString, headers, HttpStatus.OK);
 				} else {
-				    return new ResponseEntity<String>(CurveFitDTO.toJsonArray(filledCurveFitDTOs), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(CurveFitDTO.toJsonArray(filledCurveFitDTOs), headers,
+							HttpStatus.OK);
 				}
-			}
-			else if (renderingHint.equalsIgnoreCase("Ki Fit")){
+			} else if (renderingHint.equalsIgnoreCase("Ki Fit")) {
 				Collection<KiCurveFitDTO> filledKiCurveFitDTOs = KiCurveFitDTO.getFitData(curveIds);
 				if (format != null && (format.equalsIgnoreCase("csv") || format.equalsIgnoreCase("tsv"))) {
 					String outFileString = KiCurveFitDTO.getCsvList(filledKiCurveFitDTOs, format);
 					outFileString = outFileString.replaceAll("\"\"", "\\\"");
-//					this very confusing regex replaces "" with \" to reverse an unintended conversion by supercsv.
-				    return new ResponseEntity<String>(outFileString, headers, HttpStatus.OK);
+					// this very confusing regex replaces "" with \" to reverse an unintended
+					// conversion by supercsv.
+					return new ResponseEntity<String>(outFileString, headers, HttpStatus.OK);
 				} else {
-				    return new ResponseEntity<String>(KiCurveFitDTO.toJsonArray(filledKiCurveFitDTOs), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(KiCurveFitDTO.toJsonArray(filledKiCurveFitDTOs), headers,
+							HttpStatus.OK);
 				}
 			} else {
 				String errorMessage = "ERROR: Rendering hint: " + renderingHint + " not recognized.";
 				logger.error(errorMessage);
 				return new ResponseEntity<String>(errorMessage, headers, HttpStatus.INTERNAL_SERVER_ERROR);
 			}
-			
+
 		} catch (Exception e) {
-//			String error = e.getMessage() + e.getStackTrace();
-	    	logger.error("Caught error: "+e.toString());
-	    	return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
+			// String error = e.getMessage() + e.getStackTrace();
+			logger.error("Caught error: " + e.toString());
+			return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
-    }
-	
+	}
+
 	@Transactional
 	@RequestMapping(value = "/rawdata", method = RequestMethod.POST, headers = "Accept=application/json")
-	public ResponseEntity<String> getRawCurveDataByCurveId(@RequestBody List<String> curveIds, @RequestParam(value = "format", required = false) String format,
+	public ResponseEntity<String> getRawCurveDataByCurveId(@RequestBody List<String> curveIds,
+			@RequestParam(value = "format", required = false) String format,
 			@RequestParam(value = "response", required = false) String responseName) {
 		try {
-			//This route currently assumes that all the curveIds specified have the same rendering hint. It will not pull back the correct data if a mix of rendering hints is expected.
-			Collection<RawCurveDataDTO> filledRawCurveDataDTOs = RawCurveDataDTO.getRawCurveData(curveIds, responseName);
+			// This route currently assumes that all the curveIds specified have the same
+			// rendering hint. It will not pull back the correct data if a mix of rendering
+			// hints is expected.
+			Collection<RawCurveDataDTO> filledRawCurveDataDTOs = RawCurveDataDTO.getRawCurveData(curveIds,
+					responseName);
 			HttpHeaders headers = new HttpHeaders();
 			headers.add("Content-Type", "application/json");
 			if (format != null && (format.equalsIgnoreCase("csv") || format.equalsIgnoreCase("tsv"))) {
 				String outFileString = RawCurveDataDTO.getCsvList(filledRawCurveDataDTOs, format);
 				outFileString = outFileString.replaceAll("\"\"", "\\\"");
-			    return new ResponseEntity<String>(outFileString, headers, HttpStatus.OK);
+				return new ResponseEntity<String>(outFileString, headers, HttpStatus.OK);
 			} else {
-			    return new ResponseEntity<String>(RawCurveDataDTO.toJsonArray(filledRawCurveDataDTOs), headers, HttpStatus.OK);
+				return new ResponseEntity<String>(RawCurveDataDTO.toJsonArray(filledRawCurveDataDTOs), headers,
+						HttpStatus.OK);
 			}
 		} catch (Exception e) {
-//			String error = e.getMessage() + e.getStackTrace();
-	    	logger.error("Caught error: "+e.toString());
-	    	return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
+			// String error = e.getMessage() + e.getStackTrace();
+			logger.error("Caught error: " + e.toString());
+			return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
-	
+
 	@Transactional
 	@RequestMapping(value = "/rawdataagonist", method = RequestMethod.POST, headers = "Accept=application/json")
-	public ResponseEntity<String> getRawCurveDataAgonistByCurveId(@RequestBody List<String> curveIds, @RequestParam(value = "format", required = false) String format,
+	public ResponseEntity<String> getRawCurveDataAgonistByCurveId(@RequestBody List<String> curveIds,
+			@RequestParam(value = "format", required = false) String format,
 			@RequestParam(value = "response", required = false) String responseName) {
 		try {
-			//This route currently assumes that all the curveIds specified have the same rendering hint. It will not pull back the correct data if a mix of rendering hints is expected.
-			Collection<RawCurveDataDTO> filledRawCurveDataDTOs = RawCurveDataDTO.getRawCurveDataAgonist(curveIds, responseName);
+			// This route currently assumes that all the curveIds specified have the same
+			// rendering hint. It will not pull back the correct data if a mix of rendering
+			// hints is expected.
+			Collection<RawCurveDataDTO> filledRawCurveDataDTOs = RawCurveDataDTO.getRawCurveDataAgonist(curveIds,
+					responseName);
 			HttpHeaders headers = new HttpHeaders();
 			headers.add("Content-Type", "application/json");
 			if (format != null && (format.equalsIgnoreCase("csv") || format.equalsIgnoreCase("tsv"))) {
 				String outFileString = RawCurveDataDTO.getCsvList(filledRawCurveDataDTOs, format);
 				outFileString = outFileString.replaceAll("\"\"", "\\\"");
-			    return new ResponseEntity<String>(outFileString, headers, HttpStatus.OK);
+				return new ResponseEntity<String>(outFileString, headers, HttpStatus.OK);
 			} else {
-			    return new ResponseEntity<String>(RawCurveDataDTO.toJsonArray(filledRawCurveDataDTOs), headers, HttpStatus.OK);
+				return new ResponseEntity<String>(RawCurveDataDTO.toJsonArray(filledRawCurveDataDTOs), headers,
+						HttpStatus.OK);
 			}
 		} catch (Exception e) {
-//			String error = e.getMessage() + e.getStackTrace();
-	    	logger.error("Caught error: "+e.toString());
-	    	return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
+			// String error = e.getMessage() + e.getStackTrace();
+			logger.error("Caught error: " + e.toString());
+			return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
-	
 	@Transactional
 	@RequestMapping(value = "/tgdata", method = RequestMethod.POST, headers = "Accept=application/json")
-	public ResponseEntity<String> getTgDataByCurveId(@RequestBody List<String> curveIds, @RequestParam(value = "format", required = false) String format) {
+	public ResponseEntity<String> getTgDataByCurveId(@RequestBody List<String> curveIds,
+			@RequestParam(value = "format", required = false) String format) {
 		try {
 			Collection<TgDataDTO> filledTgDataDTOs = TgDataDTO.getTgData(curveIds);
 			HttpHeaders headers = new HttpHeaders();
@@ -129,197 +144,207 @@ public ResponseEntity<String> getTgDataByCurveId(@RequestBody List<String> curve
 			if (format != null && (format.equalsIgnoreCase("csv") || format.equalsIgnoreCase("tsv"))) {
 				String outFileString = TgDataDTO.getCsvList(filledTgDataDTOs, format);
 				outFileString = outFileString.replaceAll("\"\"", "\\\"");
-			    return new ResponseEntity<String>(outFileString, headers, HttpStatus.OK);
+				return new ResponseEntity<String>(outFileString, headers, HttpStatus.OK);
 			} else {
-			    return new ResponseEntity<String>(TgDataDTO.toJsonArray(filledTgDataDTOs), headers, HttpStatus.OK);
+				return new ResponseEntity<String>(TgDataDTO.toJsonArray(filledTgDataDTOs), headers, HttpStatus.OK);
 			}
 		} catch (Exception e) {
-//			String error = e.getMessage() + e.getStackTrace();
-	    	logger.error("Caught error: "+e.toString());
-	    	return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
+			// String error = e.getMessage() + e.getStackTrace();
+			logger.error("Caught error: " + e.toString());
+			return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
-	
-	//no longer needed - preparing to deprecate
+
+	// no longer needed - preparing to deprecate
 	@Transactional
-    @RequestMapping(value = "/fitdata", method = RequestMethod.GET, headers = "Accept=application/json")
-    public ResponseEntity<String> getFitDataByExperimentIdOrCodeName(@RequestParam(value = "experiment") String experimentIdOrCodeName,
-    		@RequestParam(value = "modelFitType", required=true) String renderingHint,
-    		@RequestParam(value = "format", required = false) String format) {
+	@RequestMapping(value = "/fitdata", method = RequestMethod.GET, headers = "Accept=application/json")
+	public ResponseEntity<String> getFitDataByExperimentIdOrCodeName(
+			@RequestParam(value = "experiment") String experimentIdOrCodeName,
+			@RequestParam(value = "modelFitType", required = true) String renderingHint,
+			@RequestParam(value = "format", required = false) String format) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-        try {
-        	List<String> curveIds = (List<String>) CurveFitDTO.findAllCurveIdsByExperiment(experimentIdOrCodeName);
-			if (renderingHint.equalsIgnoreCase("4 parameter D-R")){
+		try {
+			List<String> curveIds = (List<String>) CurveFitDTO.findAllCurveIdsByExperiment(experimentIdOrCodeName);
+			if (renderingHint.equalsIgnoreCase("4 parameter D-R")) {
 				Collection<CurveFitDTO> filledCurveFitDTOs = CurveFitDTO.getFitData(curveIds);
 				if (format != null && (format.equalsIgnoreCase("csv") || format.equalsIgnoreCase("tsv"))) {
 					String outFileString = CurveFitDTO.getCsvList(filledCurveFitDTOs, format);
 					outFileString = outFileString.replaceAll("\"\"", "\\\"");
-//					this very confusing regex replaces "" with \" to reverse an unintended conversion by supercsv.
-				    return new ResponseEntity<String>(outFileString, headers, HttpStatus.OK);
+					// this very confusing regex replaces "" with \" to reverse an unintended
+					// conversion by supercsv.
+					return new ResponseEntity<String>(outFileString, headers, HttpStatus.OK);
 				} else {
-				    return new ResponseEntity<String>(CurveFitDTO.toJsonArray(filledCurveFitDTOs), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(CurveFitDTO.toJsonArray(filledCurveFitDTOs), headers,
+							HttpStatus.OK);
 				}
-			}
-			else if (renderingHint.equalsIgnoreCase("Ki Fit")){
+			} else if (renderingHint.equalsIgnoreCase("Ki Fit")) {
 				Collection<KiCurveFitDTO> filledKiCurveFitDTOs = KiCurveFitDTO.getFitData(curveIds);
 				if (format != null && (format.equalsIgnoreCase("csv") || format.equalsIgnoreCase("tsv"))) {
 					String outFileString = KiCurveFitDTO.getCsvList(filledKiCurveFitDTOs, format);
 					outFileString = outFileString.replaceAll("\"\"", "\\\"");
-//					this very confusing regex replaces "" with \" to reverse an unintended conversion by supercsv.
-				    return new ResponseEntity<String>(outFileString, headers, HttpStatus.OK);
+					// this very confusing regex replaces "" with \" to reverse an unintended
+					// conversion by supercsv.
+					return new ResponseEntity<String>(outFileString, headers, HttpStatus.OK);
 				} else {
-				    return new ResponseEntity<String>(KiCurveFitDTO.toJsonArray(filledKiCurveFitDTOs), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(KiCurveFitDTO.toJsonArray(filledKiCurveFitDTOs), headers,
+							HttpStatus.OK);
 				}
 			} else {
 				String errorMessage = "ERROR: Rendering hint: " + renderingHint + " not recognized.";
 				logger.error(errorMessage);
 				return new ResponseEntity<String>(errorMessage, headers, HttpStatus.INTERNAL_SERVER_ERROR);
 			}
-			
+
 		} catch (Exception e) {
-//			String error = e.getMessage() + e.getStackTrace();
-	    	logger.error("Caught error: "+e.toString());
-	    	return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
+			// String error = e.getMessage() + e.getStackTrace();
+			logger.error("Caught error: " + e.toString());
+			return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
-    }
-	
+	}
+
 	@Transactional
-    @RequestMapping(value = "/rawdataagonist", method = RequestMethod.GET, headers = "Accept=application/json")
-    public ResponseEntity<String> getRawDataAgonistByExperimentIdOrCodeName(@RequestParam(value = "experiment") String experimentIdOrCodeName, 
-    		@RequestParam(value = "format", required = false) String format,
-    		@RequestParam(value = "response", required = false) String responseName) {
-        try {
-			Collection<RawCurveDataDTO> rawCurveDataDTOs = RawCurveDataDTO.getRawAgonistCurveDataByExperiment(experimentIdOrCodeName, responseName);
+	@RequestMapping(value = "/rawdataagonist", method = RequestMethod.GET, headers = "Accept=application/json")
+	public ResponseEntity<String> getRawDataAgonistByExperimentIdOrCodeName(
+			@RequestParam(value = "experiment") String experimentIdOrCodeName,
+			@RequestParam(value = "format", required = false) String format,
+			@RequestParam(value = "response", required = false) String responseName) {
+		try {
+			Collection<RawCurveDataDTO> rawCurveDataDTOs = RawCurveDataDTO
+					.getRawAgonistCurveDataByExperiment(experimentIdOrCodeName, responseName);
 			HttpHeaders headers = new HttpHeaders();
 			headers.add("Content-Type", "application/json");
 			if (format != null && (format.equalsIgnoreCase("csv") || format.equalsIgnoreCase("tsv"))) {
 				String outFileString = RawCurveDataDTO.getCsvList(rawCurveDataDTOs, format);
 				outFileString = outFileString.replaceAll("\"\"", "\\\"");
-			    return new ResponseEntity<String>(outFileString, headers, HttpStatus.OK);
+				return new ResponseEntity<String>(outFileString, headers, HttpStatus.OK);
 			} else {
-			    return new ResponseEntity<String>(RawCurveDataDTO.toJsonArray(rawCurveDataDTOs), headers, HttpStatus.OK);
+				return new ResponseEntity<String>(RawCurveDataDTO.toJsonArray(rawCurveDataDTOs), headers,
+						HttpStatus.OK);
 			}
 		} catch (Exception e) {
-//			String error = e.getMessage() + e.getStackTrace();
-	    	logger.error("Caught error: "+e.toString());
-	    	return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
+			// String error = e.getMessage() + e.getStackTrace();
+			logger.error("Caught error: " + e.toString());
+			return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
-    }
-	
+	}
+
 	@Transactional
-    @RequestMapping(value = "/rawdata", method = RequestMethod.GET, headers = "Accept=application/json")
-    public ResponseEntity<String> getRawDataByExperimentIdOrCodeName(@RequestParam(value = "experiment") String experimentIdOrCodeName, 
-    		@RequestParam(value = "format", required = false) String format,
-    		@RequestParam(value = "response", required = false) String responseName) {
-        try {
-			Collection<RawCurveDataDTO> rawCurveDataDTOs = RawCurveDataDTO.getRawCurveDataByExperiment(experimentIdOrCodeName, responseName);
+	@RequestMapping(value = "/rawdata", method = RequestMethod.GET, headers = "Accept=application/json")
+	public ResponseEntity<String> getRawDataByExperimentIdOrCodeName(
+			@RequestParam(value = "experiment") String experimentIdOrCodeName,
+			@RequestParam(value = "format", required = false) String format,
+			@RequestParam(value = "response", required = false) String responseName) {
+		try {
+			Collection<RawCurveDataDTO> rawCurveDataDTOs = RawCurveDataDTO
+					.getRawCurveDataByExperiment(experimentIdOrCodeName, responseName);
 			HttpHeaders headers = new HttpHeaders();
 			headers.add("Content-Type", "application/json");
 			if (format != null && (format.equalsIgnoreCase("csv") || format.equalsIgnoreCase("tsv"))) {
 				String outFileString = RawCurveDataDTO.getCsvList(rawCurveDataDTOs, format);
 				outFileString = outFileString.replaceAll("\"\"", "\\\"");
-			    return new ResponseEntity<String>(outFileString, headers, HttpStatus.OK);
+				return new ResponseEntity<String>(outFileString, headers, HttpStatus.OK);
 			} else {
-			    return new ResponseEntity<String>(RawCurveDataDTO.toJsonArray(rawCurveDataDTOs), headers, HttpStatus.OK);
+				return new ResponseEntity<String>(RawCurveDataDTO.toJsonArray(rawCurveDataDTOs), headers,
+						HttpStatus.OK);
 			}
 		} catch (Exception e) {
-//			String error = e.getMessage() + e.getStackTrace();
-	    	logger.error("Caught error: "+e.toString());
-	    	return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
+			// String error = e.getMessage() + e.getStackTrace();
+			logger.error("Caught error: " + e.toString());
+			return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
-    }
+	}
 
-	
 	@Transactional
-    @RequestMapping(value = "/tgdata", method = RequestMethod.GET, headers = "Accept=application/json")
-    public ResponseEntity<String> getTgDataByExperimentIdOrCodeName(@RequestParam(value = "experiment") String experimentIdOrCodeName, 
-    		@RequestParam(value = "format", required = false) String format) {
-        try {
+	@RequestMapping(value = "/tgdata", method = RequestMethod.GET, headers = "Accept=application/json")
+	public ResponseEntity<String> getTgDataByExperimentIdOrCodeName(
+			@RequestParam(value = "experiment") String experimentIdOrCodeName,
+			@RequestParam(value = "format", required = false) String format) {
+		try {
 			Collection<TgDataDTO> tgDataDTOs = TgDataDTO.getTgDataByExperiment(experimentIdOrCodeName);
 			HttpHeaders headers = new HttpHeaders();
 			headers.add("Content-Type", "application/json");
 			if (format != null && (format.equalsIgnoreCase("csv") || format.equalsIgnoreCase("tsv"))) {
 				String outFileString = TgDataDTO.getCsvList(tgDataDTOs, format);
 				outFileString = outFileString.replaceAll("\"\"", "\\\"");
-			    return new ResponseEntity<String>(outFileString, headers, HttpStatus.OK);
+				return new ResponseEntity<String>(outFileString, headers, HttpStatus.OK);
 			} else {
-			    return new ResponseEntity<String>(TgDataDTO.toJsonArray(tgDataDTOs), headers, HttpStatus.OK);
+				return new ResponseEntity<String>(TgDataDTO.toJsonArray(tgDataDTOs), headers, HttpStatus.OK);
 			}
 		} catch (Exception e) {
-//			String error = e.getMessage() + e.getStackTrace();
-	    	logger.error("Caught error: "+e.toString());
-	    	return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
+			// String error = e.getMessage() + e.getStackTrace();
+			logger.error("Caught error: " + e.toString());
+			return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
-    }
-	
-	//no longer needed - preparing to deprecate
+	}
+
+	// no longer needed - preparing to deprecate
 	@Transactional
-    @RequestMapping( method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> updateFitDataFromJson(@RequestBody List<CurveFitDTO> curveFitDTOs) {
-	    try {
+	@RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> updateFitDataFromJson(@RequestBody List<CurveFitDTO> curveFitDTOs) {
+		try {
 			CurveFitDTO.updateFitData(curveFitDTOs);
 			HttpHeaders headers = new HttpHeaders();
 			headers.add("Content-Type", "application/json");
 			return new ResponseEntity<String>(headers, HttpStatus.OK);
 		} catch (Exception e) {
-//	    	String error = e.getMessage() + e.getStackTrace();
-	    	logger.error("Caught error: "+e.toString());
-	    	return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
+			// String error = e.getMessage() + e.getStackTrace();
+			logger.error("Caught error: " + e.toString());
+			return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 
-    }
-	
-	//no longer needed - preparing to deprecate
+	}
+
+	// no longer needed - preparing to deprecate
 	@Transactional
-    @RequestMapping(value = "/ki", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> updateKiFitDataFromJson(@RequestBody List<KiCurveFitDTO> curveFitDTOs) {
-	    try {
+	@RequestMapping(value = "/ki", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> updateKiFitDataFromJson(@RequestBody List<KiCurveFitDTO> curveFitDTOs) {
+		try {
 			KiCurveFitDTO.updateFitData(curveFitDTOs);
 			HttpHeaders headers = new HttpHeaders();
 			headers.add("Content-Type", "application/json");
 			return new ResponseEntity<String>(headers, HttpStatus.OK);
 		} catch (Exception e) {
-//	    	String error = e.getMessage() + e.getStackTrace();
-	    	logger.error("Caught error: "+e.toString());
-	    	return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
+			// String error = e.getMessage() + e.getStackTrace();
+			logger.error("Caught error: " + e.toString());
+			return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 
-    }
-	
+	}
+
 	@Transactional
-    @RequestMapping(value = "/flagWells", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> updateWellFlags(@RequestBody List<FlagWellDTO> flagWellDTOs) {
-	    try {
-	    	FlagWellDTO.updateWellFlags(flagWellDTOs);
-	    	HttpHeaders headers = new HttpHeaders();
-		    headers.add("Content-Type", "application/json");
-		    return new ResponseEntity<String>(headers, HttpStatus.OK);
-	    } catch(Exception e) {
-//	    	String error = e.getMessage() + e.getStackTrace();
-	    	logger.error("Caught error: "+e.toString());
-	    	return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
-	    }
-	    
+	@RequestMapping(value = "/flagWells", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> updateWellFlags(@RequestBody List<FlagWellDTO> flagWellDTOs) {
+		try {
+			FlagWellDTO.updateWellFlags(flagWellDTOs);
+			HttpHeaders headers = new HttpHeaders();
+			headers.add("Content-Type", "application/json");
+			return new ResponseEntity<String>(headers, HttpStatus.OK);
+		} catch (Exception e) {
+			// String error = e.getMessage() + e.getStackTrace();
+			logger.error("Caught error: " + e.toString());
+			return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
+		}
+
+	}
 
-    }
-	
 	@Transactional
 	@RequestMapping(value = "/displayminmax", method = RequestMethod.POST, headers = "Accept=application/json")
-	public ResponseEntity<String> getProtocolCurveDisplayMinAndCurveDisplayMaxByCurveId(@RequestBody String curveId, @RequestParam(value = "format", required = false) String format) {
+	public ResponseEntity<String> getProtocolCurveDisplayMinAndCurveDisplayMaxByCurveId(@RequestBody String curveId,
+			@RequestParam(value = "format", required = false) String format) {
 		try {
-//			logger.debug("From the ApiCurveFitController displayminmax route");
-//			logger.debug("curveId: "+ curveId);
+			// logger.debug("From the ApiCurveFitController displayminmax route");
+			// logger.debug("curveId: "+ curveId);
 			Collection<ProtocolValue> protocolValues = CurveFitDTO.findDisplayMinMaxByCurveId(curveId);
-//			logger.debug("Found: "+ ProtocolValue.toJsonArray(protocolValues));
+			// logger.debug("Found: "+ ProtocolValue.toJsonArray(protocolValues));
 			HttpHeaders headers = new HttpHeaders();
 			headers.add("Content-Type", "application/json");
 			return new ResponseEntity<String>(ProtocolValue.toJsonArray(protocolValues), headers, HttpStatus.OK);
 		} catch (Exception e) {
-//			String error = e.getMessage() + e.getStackTrace();
-	    	logger.error("Caught error: "+e.toString());
-	    	return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
+			// String error = e.getMessage() + e.getStackTrace();
+			logger.error("Caught error: " + e.toString());
+			return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
-	
+
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiDDictValueController.java b/src/main/java/com/labsynch/labseer/api/ApiDDictValueController.java
index 396c05ea8..78ef7e407 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiDDictValueController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiDDictValueController.java
@@ -29,7 +29,6 @@
 @RequestMapping("api/v1/ddictvalues")
 @Controller
 
-
 public class ApiDDictValueController {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiDDictValueController.class);
@@ -39,9 +38,9 @@ public class ApiDDictValueController {
 
 	@RequestMapping(value = "/getvalues/{format}", method = RequestMethod.GET, headers = "Accept=application/json")
 	public ResponseEntity<String> findByTypeAndKind(
-			@PathVariable (value = "format") String format,
-			@RequestParam (value = "lsType", required = false) String lsType,
-			@RequestParam (value = "lsKind", required = false) String lsKind) {
+			@PathVariable(value = "format") String format,
+			@RequestParam(value = "lsType", required = false) String lsType,
+			@RequestParam(value = "lsKind", required = false) String lsKind) {
 
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
@@ -50,47 +49,46 @@ public ResponseEntity<String> findByTypeAndKind(
 
 		List<DDictValue> ddictValues = null;
 
-		if (lsType != null && lsKind == null){
+		if (lsType != null && lsKind == null) {
 			ddictValues = DDictValue.findDDictValuesByLsTypeEquals(lsType).getResultList();
-		} else if (lsType == null && lsKind != null){
+		} else if (lsType == null && lsKind != null) {
 			ddictValues = DDictValue.findDDictValuesByLsKindEquals(lsKind).getResultList();
-		} else if (lsType != null && lsKind != null){
+		} else if (lsType != null && lsKind != null) {
 			ddictValues = DDictValue.findDDictValuesByLsTypeEqualsAndLsKindEquals(lsType, lsKind).getResultList();
 		} else {
 			ddictValues = DDictValue.findAllDDictValues();
 		}
 
-		if(format.equalsIgnoreCase("codeTable")) {
-			List<CodeTableDTO> results = dataDictionaryService.convertToCodeTables(ddictValues); 
+		if (format.equalsIgnoreCase("codeTable")) {
+			List<CodeTableDTO> results = dataDictionaryService.convertToCodeTables(ddictValues);
 			results = CodeTableDTO.sortCodeTables(results);
 			return new ResponseEntity<String>(CodeTableDTO.toJsonArray(results), headers, HttpStatus.OK);
 		} else if (format.equalsIgnoreCase("csv")) {
 			String outputString = dataDictionaryService.getCsvList(ddictValues);
 			return new ResponseEntity<String>(outputString, headers, HttpStatus.OK);
 		} else {
-			//default format is json
+			// default format is json
 			return new ResponseEntity<String>(DDictValue.toJsonArray(ddictValues), headers, HttpStatus.OK);
 		}
 	}
 
-
 	@Transactional
 	@RequestMapping(method = RequestMethod.GET, value = "/{idOrCodeName}", headers = "Accept=application/json")
 	@ResponseBody
 	public ResponseEntity<String> showJson(
 			@PathVariable("idOrCodeName") String idOrCodeName,
-			@RequestParam (value = "format", required = false) String format) {
+			@RequestParam(value = "format", required = false) String format) {
 
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		
+
 		DDictValue dDictValue = null;
 		List<DDictValue> dDictValues = null;
-		if (SimpleUtil.isNumeric(idOrCodeName)){
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			dDictValue = DDictValue.findDDictValue(Long.valueOf(idOrCodeName));
 		} else {
 			dDictValues = DDictValue.findDDictValuesByCodeNameEquals(idOrCodeName).getResultList();
-			if (dDictValues.size() == 1){
+			if (dDictValues.size() == 1) {
 				dDictValue = dDictValues.get(0);
 				logger.info("found a value " + dDictValue.toJson());
 			} else if (dDictValues.size() > 1) {
@@ -102,10 +100,10 @@ public ResponseEntity<String> showJson(
 			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
 		}
 
-		if(format != null &&  format.equalsIgnoreCase("codeTable")) {
-			CodeTableDTO results = dataDictionaryService.getDataDictionaryCodeTable(dDictValue); 
+		if (format != null && format.equalsIgnoreCase("codeTable")) {
+			CodeTableDTO results = dataDictionaryService.getDataDictionaryCodeTable(dDictValue);
 			return new ResponseEntity<String>(results.toJson(), headers, HttpStatus.OK);
-		} else if (format != null &&  format.equalsIgnoreCase("csv")){
+		} else if (format != null && format.equalsIgnoreCase("csv")) {
 			dDictValues.add(dDictValue);
 			String outputString = dataDictionaryService.getCsvList(dDictValues);
 			return new ResponseEntity<String>(outputString, headers, HttpStatus.OK);
@@ -120,18 +118,18 @@ public ResponseEntity<String> showJson(
 	@ResponseBody
 	public ResponseEntity<String> showJsonWithFormat(
 			@PathVariable("idOrCodeName") String idOrCodeName,
-			@PathVariable (value = "format") String format) {
+			@PathVariable(value = "format") String format) {
 
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		
+
 		DDictValue dDictValue = null;
 		List<DDictValue> dDictValues = null;
-		if (SimpleUtil.isNumeric(idOrCodeName)){
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			dDictValue = DDictValue.findDDictValue(Long.valueOf(idOrCodeName));
 		} else {
 			dDictValues = DDictValue.findDDictValuesByCodeNameEquals(idOrCodeName).getResultList();
-			if (dDictValues.size() == 1){
+			if (dDictValues.size() == 1) {
 				dDictValue = dDictValues.get(0);
 				logger.info("found a value " + dDictValue.toJson());
 			} else if (dDictValues.size() > 1) {
@@ -143,10 +141,10 @@ public ResponseEntity<String> showJsonWithFormat(
 			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
 		}
 
-		if(format != null &&  format.equalsIgnoreCase("codeTable")) {
-			CodeTableDTO results = dataDictionaryService.getDataDictionaryCodeTable(dDictValue); 
+		if (format != null && format.equalsIgnoreCase("codeTable")) {
+			CodeTableDTO results = dataDictionaryService.getDataDictionaryCodeTable(dDictValue);
 			return new ResponseEntity<String>(results.toJson(), headers, HttpStatus.OK);
-		} else if (format != null &&  format.equalsIgnoreCase("csv")){
+		} else if (format != null && format.equalsIgnoreCase("csv")) {
 			dDictValues.add(dDictValue);
 			String outputString = dataDictionaryService.getCsvList(dDictValues);
 			return new ResponseEntity<String>(outputString, headers, HttpStatus.OK);
@@ -160,27 +158,29 @@ public ResponseEntity<String> showJsonWithFormat(
 	public ResponseEntity<String> createFromJson(
 			@RequestBody DDictValue dDictValue,
 			@RequestParam(value = "createTypeKind", required = false) String createTypeKindString) {
-		
+
 		Boolean createTypeKind = false;
-		if (createTypeKindString != null && createTypeKindString.equalsIgnoreCase("true")) createTypeKind = true;
+		if (createTypeKindString != null && createTypeKindString.equalsIgnoreCase("true"))
+			createTypeKind = true;
 		dDictValue = dataDictionaryService.saveDataDictionaryValue(dDictValue, createTypeKind);
 		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/json");		
-		if (dDictValue == null){
-			return new ResponseEntity<String>("ERROR: Multiple DDictValue already exists", headers, HttpStatus.CONFLICT);
+		headers.add("Content-Type", "application/json");
+		if (dDictValue == null) {
+			return new ResponseEntity<String>("ERROR: Multiple DDictValue already exists", headers,
+					HttpStatus.CONFLICT);
 		} else {
 			return new ResponseEntity<String>(dDictValue.toJson(), headers, HttpStatus.CREATED);
-		} 
+		}
 	}
 
 	@RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
 	public ResponseEntity<String> createFromJsonArray(
 			@RequestBody List<DDictValue> dDictValues,
 			@RequestParam(value = "createTypeKind", required = false) String createTypeKindString) {
-		
+
 		Boolean createTypeKind = false;
 		logger.info("incoming createTypeKindString " + createTypeKindString);
-		if (createTypeKindString != null && createTypeKindString.equalsIgnoreCase("true")){
+		if (createTypeKindString != null && createTypeKindString.equalsIgnoreCase("true")) {
 			createTypeKind = true;
 		}
 		List<DDictValue> savedDDictValues = dataDictionaryService.saveDataDictionaryValues(dDictValues, createTypeKind);
@@ -188,16 +188,16 @@ public ResponseEntity<String> createFromJsonArray(
 		headers.add("Content-Type", "application/json");
 		return new ResponseEntity<String>(DDictValue.toJsonArray(savedDDictValues), headers, HttpStatus.CREATED);
 	}
-	
-	
+
 	@RequestMapping(value = "/codetable", method = RequestMethod.POST, headers = "Accept=application/json")
 	public ResponseEntity<String> createCodeTableFromJson(
 			@RequestBody CodeTableDTO codeTableDTO,
 			@RequestParam(value = "createTypeKind", required = false) String createTypeKindString) {
-		
+
 		Boolean createTypeKind = false;
-		if (createTypeKindString != null && createTypeKindString.equalsIgnoreCase("true")) createTypeKind = true;
-		
+		if (createTypeKindString != null && createTypeKindString.equalsIgnoreCase("true"))
+			createTypeKind = true;
+
 		logger.info("incoming lsType: " + codeTableDTO.getCodeType());
 		logger.info("incoming lsKind: " + codeTableDTO.getCodeKind());
 		logger.info("incoming codeTableDTO: " + codeTableDTO.toJson());
@@ -205,10 +205,10 @@ public ResponseEntity<String> createCodeTableFromJson(
 		CodeTableDTO codeTableValue = dataDictionaryService.getOrCreateCodeTable(codeTableDTO, createTypeKind);
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		if (codeTableValue == null){
-			return new ResponseEntity<String>("ERROR: unable to create new entry", headers, HttpStatus.BAD_REQUEST);			
-		} 
-		return new ResponseEntity<String>(codeTableValue.toJson(), headers, HttpStatus.CREATED);			
+		if (codeTableValue == null) {
+			return new ResponseEntity<String>("ERROR: unable to create new entry", headers, HttpStatus.BAD_REQUEST);
+		}
+		return new ResponseEntity<String>(codeTableValue.toJson(), headers, HttpStatus.CREATED);
 
 	}
 
@@ -218,48 +218,48 @@ public ResponseEntity<String> createCodeTablesFromJsonArray(@RequestBody List<Co
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Boolean createTypeKind = false;
-		if (createTypeKindString != null && createTypeKindString.equalsIgnoreCase("true")) createTypeKind = true;
-		try{
-			List<CodeTableDTO> savedCodeTableValues = dataDictionaryService.getOrCreateCodeTableArray(codeTableDTOs, createTypeKind);
-			return new ResponseEntity<String>(CodeTableDTO.toJsonArray(savedCodeTableValues), headers, HttpStatus.CREATED);
-		}catch(Exception e){
+		if (createTypeKindString != null && createTypeKindString.equalsIgnoreCase("true"))
+			createTypeKind = true;
+		try {
+			List<CodeTableDTO> savedCodeTableValues = dataDictionaryService.getOrCreateCodeTableArray(codeTableDTOs,
+					createTypeKind);
+			return new ResponseEntity<String>(CodeTableDTO.toJsonArray(savedCodeTableValues), headers,
+					HttpStatus.CREATED);
+		} catch (Exception e) {
 			ErrorMessage error = new ErrorMessage();
 			error.setErrorLevel("error");
 			error.setMessage(e.getMessage());
 			return new ResponseEntity<String>(error.toJson(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
-		
+
 	}
 
 	@RequestMapping(value = "/codetable/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
 	public ResponseEntity<String> updateCodeTableFromJson(@RequestBody CodeTableDTO codeTableDTO) {
-		
+
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		
-		CodeTableDTO codeTableValue = dataDictionaryService.updateCodeTableValue( codeTableDTO);
-		if (codeTableValue == null){
-			return new ResponseEntity<String>("ERROR: unable to update entry", headers, HttpStatus.NOT_FOUND);			
-		} 
+
+		CodeTableDTO codeTableValue = dataDictionaryService.updateCodeTableValue(codeTableDTO);
+		if (codeTableValue == null) {
+			return new ResponseEntity<String>("ERROR: unable to update entry", headers, HttpStatus.NOT_FOUND);
+		}
 		return new ResponseEntity<String>(codeTableValue.toJson(), headers, HttpStatus.OK);
 	}
 
 	@RequestMapping(value = "/codetable/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
 	public ResponseEntity<String> updateCodeTablesFromJsonArray(@RequestBody List<CodeTableDTO> codeTableDTOs) {
-		
+
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		
+
 		List<CodeTableDTO> updatedCodeTableValues = dataDictionaryService.updateCodeTableValueArray(codeTableDTOs);
-		if (updatedCodeTableValues == null){
-			return new ResponseEntity<String>("ERROR: unable to update entry", headers, HttpStatus.NOT_FOUND);			
-		} 
+		if (updatedCodeTableValues == null) {
+			return new ResponseEntity<String>("ERROR: unable to update entry", headers, HttpStatus.NOT_FOUND);
+		}
 		return new ResponseEntity<String>(CodeTableDTO.toJsonArray(updatedCodeTableValues), headers, HttpStatus.OK);
 	}
 
-
-
-
 	@RequestMapping(value = "/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
 	public ResponseEntity<String> updateFromJson(@RequestBody DDictValue dDictValue) {
 		HttpHeaders headers = new HttpHeaders();
@@ -275,7 +275,7 @@ public ResponseEntity<String> updateFromJsonArray(@RequestBody List<DDictValue>
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<DDictValue> savedDDictValues = new ArrayList<DDictValue>();
-		for (DDictValue dDictValue: dDictValues) {
+		for (DDictValue dDictValue : dDictValues) {
 			if (dDictValue.merge() == null) {
 				return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
 			}
@@ -296,17 +296,16 @@ public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
 		return new ResponseEntity<String>(headers, HttpStatus.OK);
 	}
 
-
 	@RequestMapping(value = "", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	public ResponseEntity<String> listJson(
-			@RequestParam (value = "format", required = false) String format) {
+			@RequestParam(value = "format", required = false) String format) {
 
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		List<DDictValue> dDictResults = DDictValue.findAllDDictValues();
 
-		if(format != null && format.equalsIgnoreCase("codeTable")) {
+		if (format != null && format.equalsIgnoreCase("codeTable")) {
 			List<CodeTableDTO> codeTables = dataDictionaryService.convertToCodeTables(dDictResults);
 			codeTables = CodeTableDTO.sortCodeTables(codeTables);
 			return new ResponseEntity<String>(CodeTableDTO.toJsonArray(codeTables), headers, HttpStatus.OK);
@@ -321,8 +320,8 @@ public ResponseEntity<String> listJson(
 	@RequestMapping(value = "/all/{lsType}/{lsKind}/{format}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	public ResponseEntity<java.lang.String> getDDictValuesByTypeKindFormat(
-			@PathVariable("lsType") String lsType, 
-			@PathVariable("lsKind") String lsKind, 
+			@PathVariable("lsType") String lsType,
+			@PathVariable("lsKind") String lsKind,
 			@PathVariable("format") String format) {
 
 		HttpHeaders headers = new HttpHeaders();
@@ -332,9 +331,10 @@ public ResponseEntity<java.lang.String> getDDictValuesByTypeKindFormat(
 			return new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST);
 		}
 
-		List<DDictValue> dDictResults = DDictValue.findDDictValuesByLsTypeEqualsAndLsKindEquals(lsType, lsKind).getResultList();
+		List<DDictValue> dDictResults = DDictValue.findDDictValuesByLsTypeEqualsAndLsKindEquals(lsType, lsKind)
+				.getResultList();
 
-		if(format != null && format.equalsIgnoreCase("codeTable")) {
+		if (format != null && format.equalsIgnoreCase("codeTable")) {
 			List<CodeTableDTO> codeTables = dataDictionaryService.convertToCodeTables(dDictResults);
 			codeTables = CodeTableDTO.sortCodeTables(codeTables);
 			return new ResponseEntity<String>(CodeTableDTO.toJsonArray(codeTables), headers, HttpStatus.OK);
@@ -346,11 +346,10 @@ public ResponseEntity<java.lang.String> getDDictValuesByTypeKindFormat(
 		}
 	}
 
-
 	@RequestMapping(value = "/bytype/{lsType}/{format}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	public ResponseEntity<java.lang.String> getDDictValuesByTypeFormat(
-			@PathVariable("lsType") String lsType, 
+			@PathVariable("lsType") String lsType,
 			@PathVariable("format") String format) {
 
 		HttpHeaders headers = new HttpHeaders();
@@ -362,23 +361,23 @@ public ResponseEntity<java.lang.String> getDDictValuesByTypeFormat(
 
 		List<DDictValue> dDictResults = DDictValue.findDDictValuesByLsTypeEquals(lsType).getResultList();
 
-		if(format != null && format.equalsIgnoreCase("codeTable")) {
-			List<CodeTableDTO> results = dataDictionaryService.getDataDictionaryCodeTableListByType(lsType); 
+		if (format != null && format.equalsIgnoreCase("codeTable")) {
+			List<CodeTableDTO> results = dataDictionaryService.getDataDictionaryCodeTableListByType(lsType);
 			results = CodeTableDTO.sortCodeTables(results);
 			return new ResponseEntity<String>(CodeTableDTO.toJsonArray(results), headers, HttpStatus.OK);
 		} else if (format != null && format.equalsIgnoreCase("csv")) {
 			String outputString = dataDictionaryService.getCsvList(dDictResults);
 			return new ResponseEntity<String>(outputString, headers, HttpStatus.OK);
 		} else {
-			// if user wants to know an error code for empty results; user will normally inspect the size of the result array to on their end
-			//			if(dDictResults.size() == 0) {
-			//				return new ResponseEntity<String>(DDictValue.toJsonArray(dDictResults), headers, HttpStatus.NO_CONTENT);
-			//			}
+			// if user wants to know an error code for empty results; user will normally
+			// inspect the size of the result array to on their end
+			// if(dDictResults.size() == 0) {
+			// return new ResponseEntity<String>(DDictValue.toJsonArray(dDictResults),
+			// headers, HttpStatus.NO_CONTENT);
+			// }
 			return new ResponseEntity<String>(DDictValue.toJsonArray(dDictResults), headers, HttpStatus.OK);
 		}
 
 	}
 
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/api/ApiExperimentController.java b/src/main/java/com/labsynch/labseer/api/ApiExperimentController.java
index fb2bd23ab..de3380405 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiExperimentController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiExperimentController.java
@@ -82,15 +82,15 @@
 
 @Controller
 @RequestMapping("api/v1/experiments")
-//@Transactional
+// @Transactional
 public class ApiExperimentController {
 	private static final Logger logger = LoggerFactory.getLogger(ApiExperimentController.class);
-	
-    @Autowired
-    private LsThingService lsThingService;
 
-    @Autowired
-    private GeneThingService geneThingService;
+	@Autowired
+	private LsThingService lsThingService;
+
+	@Autowired
+	private GeneThingService geneThingService;
 
 	@Autowired
 	private ExperimentService experimentService;
@@ -103,7 +103,7 @@ public class ApiExperimentController {
 
 	@Autowired
 	private AnalysisGroupService analysisGroupService;
-	
+
 	@Autowired
 	private AnalysisGroupValueService analysisGroupValueService;
 
@@ -112,34 +112,36 @@ public class ApiExperimentController {
 
 	@Autowired
 	private SubjectValueService subjectValueService;
-	
+
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
 
-	@Transactional	
+	@Transactional
 	@RequestMapping(value = "/analysisgroup/savefromtsv", method = RequestMethod.POST, headers = "Accept=application/json")
-	public @ResponseBody ResponseEntity<String> saveAnalysisGroupDataFromCsv(@RequestBody ExperimentCsvDataDTO experimentCsvDataDTO) {
+	public @ResponseBody ResponseEntity<String> saveAnalysisGroupDataFromCsv(
+			@RequestBody ExperimentCsvDataDTO experimentCsvDataDTO) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 
 		logger.info("loading data from csv files: " + experimentCsvDataDTO.toJson());
-		
+
 		String analysisGroupFilePath = experimentCsvDataDTO.getAnalysisGroupCsvFilePath();
 		String treatmentGroupFilePath = experimentCsvDataDTO.getTreatmentGroupCsvFilePath();
 		String subjectFilePath = experimentCsvDataDTO.getSubjectCsvFilePath();
 
-		try{
+		try {
 			long startTime = new Date().getTime();
-			TsvLoaderResponseDTO responseDTO = analysisGroupService.saveLsAnalysisGroupFromCsv(analysisGroupFilePath, treatmentGroupFilePath, subjectFilePath);
+			TsvLoaderResponseDTO responseDTO = analysisGroupService.saveLsAnalysisGroupFromCsv(analysisGroupFilePath,
+					treatmentGroupFilePath, subjectFilePath);
 			long endTime = new Date().getTime();
 			long totalTime = endTime - startTime;
 			logger.info("dataLoaded: " + "true" + "   total elapsed time: " + totalTime);
-			return new ResponseEntity<String>(responseDTO.toJson(), headers, HttpStatus.OK) ;
-		}catch (Exception e){
+			return new ResponseEntity<String>(responseDTO.toJson(), headers, HttpStatus.OK);
+		} catch (Exception e) {
 			return new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST);
 		}
 	}
-	
+
 	@RequestMapping(value = "/find=bymetadata", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
@@ -153,13 +155,15 @@ public ResponseEntity<java.lang.String> findExperimentsByMetadata(
 
 		if (with != null) {
 			if (with.equalsIgnoreCase("analysisgroups")) {
-				return new ResponseEntity<String>(Experiment.toJsonArrayStubWithAG(experiments), headers, HttpStatus.OK);
+				return new ResponseEntity<String>(Experiment.toJsonArrayStubWithAG(experiments), headers,
+						HttpStatus.OK);
 			} else if (with.equalsIgnoreCase("fullobject")) {
 				return new ResponseEntity<String>(Experiment.toJsonArray(experiments), headers, HttpStatus.OK);
 			} else if (with.equalsIgnoreCase("prettyjson")) {
 				return new ResponseEntity<String>(Experiment.toJsonArrayPretty(experiments), headers, HttpStatus.OK);
 			} else if (with.equalsIgnoreCase("prettyjsonstub")) {
-				return new ResponseEntity<String>(Experiment.toJsonArrayStubPretty(experiments), headers, HttpStatus.OK);
+				return new ResponseEntity<String>(Experiment.toJsonArrayStubPretty(experiments), headers,
+						HttpStatus.OK);
 			} else {
 				return new ResponseEntity<String>(Experiment.toJsonArrayStub(experiments), headers, HttpStatus.OK);
 			}
@@ -168,7 +172,6 @@ public ResponseEntity<java.lang.String> findExperimentsByMetadata(
 		}
 	}
 
-	
 	@RequestMapping(value = "/bytypekind/{lsType}/{lsKind}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
@@ -182,22 +185,25 @@ public ResponseEntity<java.lang.String> listExperimentsByTypeKindJson(
 		headers.add("Content-Type", "application/json; charset=utf-8");
 
 		List<Experiment> experiments = null;
-		if (protocolType != null && protocolKind != null){		
-			experiments = Experiment.findExperimentsByProtocolTypeAndKindAndExperimentTypeAndKind(protocolType, protocolKind, lsType, lsKind).getResultList();
+		if (protocolType != null && protocolKind != null) {
+			experiments = Experiment.findExperimentsByProtocolTypeAndKindAndExperimentTypeAndKind(protocolType,
+					protocolKind, lsType, lsKind).getResultList();
 		} else {
 			experiments = Experiment.findExperimentsByLsTypeEqualsAndLsKindEquals(lsType, lsKind).getResultList();
-		
+
 		}
 
 		if (with != null) {
 			if (with.equalsIgnoreCase("analysisgroups")) {
-				return new ResponseEntity<String>(Experiment.toJsonArrayStubWithAG(experiments), headers, HttpStatus.OK);
+				return new ResponseEntity<String>(Experiment.toJsonArrayStubWithAG(experiments), headers,
+						HttpStatus.OK);
 			} else if (with.equalsIgnoreCase("fullobject")) {
 				return new ResponseEntity<String>(Experiment.toJsonArray(experiments), headers, HttpStatus.OK);
 			} else if (with.equalsIgnoreCase("prettyjson")) {
 				return new ResponseEntity<String>(Experiment.toJsonArrayPretty(experiments), headers, HttpStatus.OK);
 			} else if (with.equalsIgnoreCase("prettyjsonstub")) {
-				return new ResponseEntity<String>(Experiment.toJsonArrayStubPretty(experiments), headers, HttpStatus.OK);
+				return new ResponseEntity<String>(Experiment.toJsonArrayStubPretty(experiments), headers,
+						HttpStatus.OK);
 			} else {
 				return new ResponseEntity<String>(Experiment.toJsonArrayStub(experiments), headers, HttpStatus.OK);
 			}
@@ -216,40 +222,40 @@ public ResponseEntity<java.lang.String> listJson(
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		List<ExperimentGuiStubDTO> result = new ArrayList<ExperimentGuiStubDTO>();
 
-		if (protocolKind != null && protocolName != null){
+		if (protocolKind != null && protocolName != null) {
 			List<Protocol> protocols = Protocol.findProtocolsByLsKindEquals(protocolKind).getResultList();
-			for (Protocol protocol:protocols){
-				if (protocol.findPreferredName().equals(protocolName)){
+			for (Protocol protocol : protocols) {
+				if (protocol.findPreferredName().equals(protocolName)) {
 					List<Experiment> experiments = Experiment.findExperimentsByProtocol(protocol).getResultList();
-					for (Experiment experiment:experiments){
+					for (Experiment experiment : experiments) {
 						ExperimentGuiStubDTO exptGui = new ExperimentGuiStubDTO(experiment);
 						result.add(exptGui);
 					}
 				}
 			}
-		} else if (protocolKind != null && protocolName == null){
+		} else if (protocolKind != null && protocolName == null) {
 			List<Protocol> protocols = Protocol.findProtocolsByLsKindEquals(protocolKind).getResultList();
-			for (Protocol protocol:protocols){
-				if (protocol.findPreferredName().equals(protocolName)){
+			for (Protocol protocol : protocols) {
+				if (protocol.findPreferredName().equals(protocolName)) {
 					List<Experiment> experiments = Experiment.findExperimentsByProtocol(protocol).getResultList();
-					for (Experiment experiment:experiments){
+					for (Experiment experiment : experiments) {
 						ExperimentGuiStubDTO exptGui = new ExperimentGuiStubDTO(experiment);
 						result.add(exptGui);
 					}
 				}
 			}
-		}  else if (protocolKind == null && protocolName != null){
+		} else if (protocolKind == null && protocolName != null) {
 			List<Protocol> protocols = Protocol.findProtocolByProtocolName(protocolName);
-			for (Protocol protocol:protocols){
+			for (Protocol protocol : protocols) {
 				List<Experiment> experiments = Experiment.findExperimentsByProtocol(protocol).getResultList();
-				for (Experiment experiment:experiments){
+				for (Experiment experiment : experiments) {
 					ExperimentGuiStubDTO exptGui = new ExperimentGuiStubDTO(experiment);
 					result.add(exptGui);
 				}
 			}
 		} else {
 			List<Experiment> experiments = Experiment.findAllExperiments();
-			for (Experiment experiment:experiments){
+			for (Experiment experiment : experiments) {
 				ExperimentGuiStubDTO exptGui = new ExperimentGuiStubDTO(experiment);
 				result.add(exptGui);
 			}
@@ -257,7 +263,7 @@ public ResponseEntity<java.lang.String> listJson(
 
 		return new ResponseEntity<String>(ExperimentGuiStubDTO.toJsonArray(result), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/codetables", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
@@ -266,31 +272,30 @@ public ResponseEntity<java.lang.String> listExperimentCodeTables(
 			@RequestParam(value = "lsKind", required = false) String lsKind) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		try{
+		try {
 			List<CodeTableDTO> result = experimentService.getExperimentsAsCodeTables(lsType, lsKind);
 			return new ResponseEntity<String>(CodeTableDTO.toJsonArray(result), headers, HttpStatus.OK);
-		}catch (Exception e){
-			logger.error("caught exception getting experiments as codetables",e);
+		} catch (Exception e) {
+			logger.error("caught exception getting experiments as codetables", e);
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 
 		}
 	}
 
 	@RequestMapping(value = "/subjectsstatus/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> findSubjectValues(
-    		@PathVariable("id") Long id,
-    		@RequestParam("stateType") String stateType,
-    		@RequestParam("stateKind") String stateKind,
-    		@RequestParam("stateValueType") String stateValueType,
-    		@RequestParam("stateValueKind") String stateValueKind
-    		) {
-		
-    	List<SubjectStateValueDTO > lsValues = new ArrayList<SubjectStateValueDTO>();
-    	
-    	Experiment experiment = Experiment.findExperiment(id);
-    	Set<AnalysisGroup> analysisGroups = experiment.getAnalysisGroups();
-        for (AnalysisGroup analysisGroup: analysisGroups) {
+	@ResponseBody
+	public ResponseEntity<String> findSubjectValues(
+			@PathVariable("id") Long id,
+			@RequestParam("stateType") String stateType,
+			@RequestParam("stateKind") String stateKind,
+			@RequestParam("stateValueType") String stateValueType,
+			@RequestParam("stateValueKind") String stateValueKind) {
+
+		List<SubjectStateValueDTO> lsValues = new ArrayList<SubjectStateValueDTO>();
+
+		Experiment experiment = Experiment.findExperiment(id);
+		Set<AnalysisGroup> analysisGroups = experiment.getAnalysisGroups();
+		for (AnalysisGroup analysisGroup : analysisGroups) {
 			Set<TreatmentGroup> treatmentGroups = analysisGroup.getTreatmentGroups();
 			for (TreatmentGroup treatmentGroup : treatmentGroups) {
 				Set<Subject> subjects = treatmentGroup.getSubjects();
@@ -309,57 +314,58 @@ public ResponseEntity<String> findSubjectValues(
 							svDTO.setSubjectId(subject.getId());
 							if (stateValueType.equalsIgnoreCase("stringValue")) {
 								svDTO.setSubjectValue(subjectValue.getStringValue());
-	    	   				} else if (stateValueType.equalsIgnoreCase("numericValue")) {
-	    	   					svDTO.setSubjectValue(subjectValue.getNumericValue().toString());
-	    	   				}
+							} else if (stateValueType.equalsIgnoreCase("numericValue")) {
+								svDTO.setSubjectValue(subjectValue.getNumericValue().toString());
+							}
 							lsValues.add(svDTO);
 						}
 					}
 				}
 			}
-        }
-        
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");        
-        return new ResponseEntity<String>(SubjectStateValueDTO.toJsonArray(lsValues), headers, HttpStatus.OK);
-    }
+		}
+
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		return new ResponseEntity<String>(SubjectStateValueDTO.toJsonArray(lsValues), headers, HttpStatus.OK);
+	}
 
 	@RequestMapping(value = "/{experimentIdOrCodeName}/exptstates/bytypekind/{stateType}/{stateKind}/{format}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> getExperimentStatesByIdOrCodeNameFilter11 (
+	public ResponseEntity<String> getExperimentStatesByIdOrCodeNameFilter11(
 			@PathVariable("experimentIdOrCodeName") String experimentIdOrCodeName,
 			@PathVariable("stateType") String stateType,
-			@PathVariable("stateKind") String stateKind, 
+			@PathVariable("stateKind") String stateKind,
 			@PathVariable("format") String format) {
 
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 
 		Experiment experiment;
-		if(isNumeric(experimentIdOrCodeName)) {
+		if (isNumeric(experimentIdOrCodeName)) {
 			experiment = Experiment.findExperiment(Long.valueOf(experimentIdOrCodeName));
-		} else {		
+		} else {
 			try {
 				experiment = Experiment.findExperimentsByCodeNameEquals(experimentIdOrCodeName).getSingleResult();
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				experiment = null;
 			}
 		}
 
 		List<ExperimentState> experimentStates;
-		if(experiment != null) {
+		if (experiment != null) {
 			Long experimentId = experiment.getId();
-			experimentStates = experimentStateService.getExperimentStatesByExperimentIdAndStateTypeKind(experimentId, stateType, stateKind);
+			experimentStates = experimentStateService.getExperimentStatesByExperimentIdAndStateTypeKind(experimentId,
+					stateType, stateKind);
 		} else {
 			experimentStates = new ArrayList<ExperimentState>();
 		}
 		if (format.equalsIgnoreCase("tsv")) {
-			//getCSvList is just a stub service for now (skip for now) --> FlatThingCsvDTO
+			// getCSvList is just a stub service for now (skip for now) --> FlatThingCsvDTO
 			String outputString = experimentStateService.getCsvList(experimentStates);
 			return new ResponseEntity<String>(outputString, headers, HttpStatus.OK);
 		} else {
-			//default format is json
+			// default format is json
 			return new ResponseEntity<String>(ExperimentState.toJsonArray(experimentStates), headers, HttpStatus.OK);
 		}
 	}
@@ -369,7 +375,7 @@ public ResponseEntity<String> getExperimentStatesByIdOrCodeNameFilter11 (
 	@RequestMapping(value = "/{experimentIdOrCodeName}/exptvalues/bystate/{stateType}/{stateKind}/{format}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> getExperimentValueByIdOrCodeNameFilter1 (
+	public ResponseEntity<String> getExperimentValueByIdOrCodeNameFilter1(
 			@PathVariable("experimentIdOrCodeName") String experimentIdOrCodeName,
 			@PathVariable("stateType") String stateType,
 			@PathVariable("stateKind") String stateKind,
@@ -379,20 +385,21 @@ public ResponseEntity<String> getExperimentValueByIdOrCodeNameFilter1 (
 		headers.add("Content-Type", "application/json; charset=utf-8");
 
 		Experiment experiment;
-		if(isNumeric(experimentIdOrCodeName)) {
+		if (isNumeric(experimentIdOrCodeName)) {
 			experiment = Experiment.findExperiment(Long.valueOf(experimentIdOrCodeName));
-		} else {		
+		} else {
 			try {
 				experiment = Experiment.findExperimentsByCodeNameEquals(experimentIdOrCodeName).getSingleResult();
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				experiment = null;
 			}
 		}
 
 		List<ExperimentValue> experimentValues;
-		if(experiment != null) {
+		if (experiment != null) {
 			Long experimentId = experiment.getId();
-			experimentValues = experimentValueService.getExperimentValuesByExperimentIdAndStateTypeKind(experimentId, stateType, stateKind);
+			experimentValues = experimentValueService.getExperimentValuesByExperimentIdAndStateTypeKind(experimentId,
+					stateType, stateKind);
 		} else {
 			experimentValues = new ArrayList<ExperimentValue>();
 		}
@@ -400,16 +407,15 @@ public ResponseEntity<String> getExperimentValueByIdOrCodeNameFilter1 (
 			String outputString = experimentValueService.getCsvList(experimentValues);
 			return new ResponseEntity<String>(outputString, headers, HttpStatus.OK);
 		} else {
-			//default format is json
+			// default format is json
 			return new ResponseEntity<String>(ExperimentValue.toJsonArray(experimentValues), headers, HttpStatus.OK);
 		}
 	}
 
-
 	@RequestMapping(value = "/{experimentIdOrCodeName}/exptvalues/bystate/{stateType}/{stateKind}/byvalue/{valueType}/{valueKind}/{format}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> getExperimentValueByIdOrCodeNameFilter2 (
+	public ResponseEntity<String> getExperimentValueByIdOrCodeNameFilter2(
 			@PathVariable("experimentIdOrCodeName") String experimentIdOrCodeName,
 			@PathVariable("stateType") String stateType,
 			@PathVariable("stateKind") String stateKind,
@@ -421,36 +427,37 @@ public ResponseEntity<String> getExperimentValueByIdOrCodeNameFilter2 (
 		headers.add("Content-Type", "application/json; charset=utf-8");
 
 		Experiment experiment;
-		if(isNumeric(experimentIdOrCodeName)) {
+		if (isNumeric(experimentIdOrCodeName)) {
 			experiment = Experiment.findExperiment(Long.valueOf(experimentIdOrCodeName));
-		} else {		
+		} else {
 			try {
 				experiment = Experiment.findExperimentsByCodeNameEquals(experimentIdOrCodeName).getSingleResult();
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				experiment = null;
 			}
 		}
 
 		List<ExperimentValue> experimentValues;
-		if(experiment != null) {
+		if (experiment != null) {
 			Long experimentId = experiment.getId();
-			experimentValues = experimentValueService.getExperimentValuesByExperimentIdAndStateTypeKindAndValueTypeKind(experimentId, stateType, stateKind, valueType, valueKind);
+			experimentValues = experimentValueService.getExperimentValuesByExperimentIdAndStateTypeKindAndValueTypeKind(
+					experimentId, stateType, stateKind, valueType, valueKind);
 		} else {
 			experimentValues = new ArrayList<ExperimentValue>();
 		}
 
-		if (format != null && format.equalsIgnoreCase("tsv")) {		
+		if (format != null && format.equalsIgnoreCase("tsv")) {
 			String outputString = experimentValueService.getCsvList(experimentValues);
 			return new ResponseEntity<String>(outputString, headers, HttpStatus.OK);
 		} else if (format != null && format.equalsIgnoreCase("keyvalue")) {
 			List<StateValueDTO> stateValues = experimentValueService.getKeyValueList(experimentValues);
 			return new ResponseEntity<String>(StateValueDTO.toJsonArray(stateValues), headers, HttpStatus.OK);
-		} else if(format != null && format.equalsIgnoreCase("codeTable")) {				
+		} else if (format != null && format.equalsIgnoreCase("codeTable")) {
 			List<CodeTableDTO> codeTables = experimentValueService.convertToCodeTables(experimentValues);
 			codeTables = CodeTableDTO.sortCodeTables(codeTables);
 			return new ResponseEntity<String>(CodeTableDTO.toJsonArray(codeTables), headers, HttpStatus.OK);
 		} else {
-			//default format is json
+			// default format is json
 			return new ResponseEntity<String>(ExperimentValue.toJsonArray(experimentValues), headers, HttpStatus.OK);
 		}
 
@@ -459,7 +466,7 @@ public ResponseEntity<String> getExperimentValueByIdOrCodeNameFilter2 (
 	@RequestMapping(value = "/{experimentIdOrCodeName}/agvalues/bystate/{stateType}/{stateKind}/{format}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> getAnalysisGroupValuesByIdOrCodeNameFilter31 (
+	public ResponseEntity<String> getAnalysisGroupValuesByIdOrCodeNameFilter31(
 			@PathVariable("experimentIdOrCodeName") String experimentIdOrCodeName,
 			@PathVariable("stateType") String stateType,
 			@PathVariable("stateKind") String stateKind,
@@ -469,20 +476,21 @@ public ResponseEntity<String> getAnalysisGroupValuesByIdOrCodeNameFilter31 (
 		headers.add("Content-Type", "application/json; charset=utf-8");
 
 		Experiment experiment;
-		if(isNumeric(experimentIdOrCodeName)) {
+		if (isNumeric(experimentIdOrCodeName)) {
 			experiment = Experiment.findExperiment(Long.valueOf(experimentIdOrCodeName));
-		} else {		
+		} else {
 			try {
 				experiment = Experiment.findExperimentsByCodeNameEquals(experimentIdOrCodeName).getSingleResult();
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				experiment = null;
 			}
 		}
 
 		List<AnalysisGroupValue> analysisGroupValues;
-		if(experiment != null) {
+		if (experiment != null) {
 			Long experimentId = experiment.getId();
-			analysisGroupValues = analysisGroupValueService.getAnalysisGroupValuesByExperimentIdAndStateTypeKind(experimentId, stateType, stateKind);
+			analysisGroupValues = analysisGroupValueService
+					.getAnalysisGroupValuesByExperimentIdAndStateTypeKind(experimentId, stateType, stateKind);
 		} else {
 			analysisGroupValues = new ArrayList<AnalysisGroupValue>();
 		}
@@ -490,15 +498,16 @@ public ResponseEntity<String> getAnalysisGroupValuesByIdOrCodeNameFilter31 (
 			String outputString = analysisGroupValueService.getCsvList(analysisGroupValues);
 			return new ResponseEntity<String>(outputString, headers, HttpStatus.OK);
 		} else {
-			//default format is json
-			return new ResponseEntity<String>(AnalysisGroupValue.toJsonArray(analysisGroupValues), headers, HttpStatus.OK);
+			// default format is json
+			return new ResponseEntity<String>(AnalysisGroupValue.toJsonArray(analysisGroupValues), headers,
+					HttpStatus.OK);
 		}
 	}
 
 	@RequestMapping(value = "/{experimentIdOrCodeName}/agvalues/bystate/{stateType}/{stateKind}/byvalue/{valueType}/{valueKind}/{format}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> getAnalysisGroupValueByIdOrCodeNameAndStateTypeKindAndValueTypeKindFilter3 (
+	public ResponseEntity<String> getAnalysisGroupValueByIdOrCodeNameAndStateTypeKindAndValueTypeKindFilter3(
 			@PathVariable("experimentIdOrCodeName") String experimentIdOrCodeName,
 			@PathVariable("stateType") String stateType,
 			@PathVariable("stateKind") String stateKind,
@@ -510,20 +519,22 @@ public ResponseEntity<String> getAnalysisGroupValueByIdOrCodeNameAndStateTypeKin
 		headers.add("Content-Type", "application/json; charset=utf-8");
 
 		Experiment experiment;
-		if(isNumeric(experimentIdOrCodeName)) {
+		if (isNumeric(experimentIdOrCodeName)) {
 			experiment = Experiment.findExperiment(Long.valueOf(experimentIdOrCodeName));
-		} else {		
+		} else {
 			try {
 				experiment = Experiment.findExperimentsByCodeNameEquals(experimentIdOrCodeName).getSingleResult();
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				experiment = null;
 			}
 		}
 
 		List<AnalysisGroupValue> analysisGroupValues;
-		if(experiment != null) {
+		if (experiment != null) {
 			Long experimentId = experiment.getId();
-			analysisGroupValues = analysisGroupValueService.getAnalysisGroupValuesByExperimentIdAndStateTypeKindAndValueTypeKind(experimentId, stateType, stateKind, valueType, valueKind);
+			analysisGroupValues = analysisGroupValueService
+					.getAnalysisGroupValuesByExperimentIdAndStateTypeKindAndValueTypeKind(experimentId, stateType,
+							stateKind, valueType, valueKind);
 		} else {
 			analysisGroupValues = new ArrayList<AnalysisGroupValue>();
 		}
@@ -531,14 +542,16 @@ public ResponseEntity<String> getAnalysisGroupValueByIdOrCodeNameAndStateTypeKin
 			String outputString = analysisGroupValueService.getCsvList(analysisGroupValues);
 			return new ResponseEntity<String>(outputString, headers, HttpStatus.OK);
 		} else {
-			//default format is json
-			return new ResponseEntity<String>(AnalysisGroupValue.toJsonArray(analysisGroupValues), headers, HttpStatus.OK);
+			// default format is json
+			return new ResponseEntity<String>(AnalysisGroupValue.toJsonArray(analysisGroupValues), headers,
+					HttpStatus.OK);
 		}
 	}
+
 	@RequestMapping(value = "/{experimentIdOrCodeName}/tgvalues/bystate/{stateType}/{stateKind}/{format}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> getTreatmentGroupValuesByIdOrCodeNameAndStateTypeKindFilter41 (
+	public ResponseEntity<String> getTreatmentGroupValuesByIdOrCodeNameAndStateTypeKindFilter41(
 			@PathVariable("experimentIdOrCodeName") String experimentIdOrCodeName,
 			@PathVariable("stateType") String stateType,
 			@PathVariable("stateKind") String stateKind,
@@ -548,20 +561,21 @@ public ResponseEntity<String> getTreatmentGroupValuesByIdOrCodeNameAndStateTypeK
 		headers.add("Content-Type", "application/json; charset=utf-8");
 
 		Experiment experiment;
-		if(isNumeric(experimentIdOrCodeName)) {
+		if (isNumeric(experimentIdOrCodeName)) {
 			experiment = Experiment.findExperiment(Long.valueOf(experimentIdOrCodeName));
-		} else {		
+		} else {
 			try {
 				experiment = Experiment.findExperimentsByCodeNameEquals(experimentIdOrCodeName).getSingleResult();
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				experiment = null;
 			}
 		}
 
 		List<TreatmentGroupValue> treatmentGroupValues;
-		if(experiment != null) {
+		if (experiment != null) {
 			Long experimentId = experiment.getId();
-			treatmentGroupValues = treatmentGroupValueService.getTreatmentGroupValuesByExperimentIdAndStateTypeKind(experimentId, stateType, stateKind);
+			treatmentGroupValues = treatmentGroupValueService
+					.getTreatmentGroupValuesByExperimentIdAndStateTypeKind(experimentId, stateType, stateKind);
 		} else {
 			treatmentGroupValues = new ArrayList<TreatmentGroupValue>();
 		}
@@ -569,8 +583,9 @@ public ResponseEntity<String> getTreatmentGroupValuesByIdOrCodeNameAndStateTypeK
 			String outputString = treatmentGroupValueService.getCsvList(treatmentGroupValues);
 			return new ResponseEntity<String>(outputString, headers, HttpStatus.OK);
 		} else {
-			//default format is json
-			return new ResponseEntity<String>(TreatmentGroupValue.toJsonArray(treatmentGroupValues), headers, HttpStatus.OK);
+			// default format is json
+			return new ResponseEntity<String>(TreatmentGroupValue.toJsonArray(treatmentGroupValues), headers,
+					HttpStatus.OK);
 		}
 
 	}
@@ -578,7 +593,7 @@ public ResponseEntity<String> getTreatmentGroupValuesByIdOrCodeNameAndStateTypeK
 	@RequestMapping(value = "/{experimentIdOrCodeName}/tgvalues/bystate/{stateType}/{stateKind}/byvalue/{valueType}/{valueKind}/{format}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> getTreatmentGroupValuesByIdOrCodeNameAndStateTypeKindAndValueTypeKindFilter4 (
+	public ResponseEntity<String> getTreatmentGroupValuesByIdOrCodeNameAndStateTypeKindAndValueTypeKindFilter4(
 			@PathVariable("experimentIdOrCodeName") String experimentIdOrCodeName,
 			@PathVariable("stateType") String stateType,
 			@PathVariable("stateKind") String stateKind,
@@ -590,21 +605,22 @@ public ResponseEntity<String> getTreatmentGroupValuesByIdOrCodeNameAndStateTypeK
 		headers.add("Content-Type", "application/json; charset=utf-8");
 
 		Experiment experiment;
-		if(isNumeric(experimentIdOrCodeName)) {
+		if (isNumeric(experimentIdOrCodeName)) {
 			experiment = Experiment.findExperiment(Long.valueOf(experimentIdOrCodeName));
-		} else {		
+		} else {
 			try {
 				experiment = Experiment.findExperimentsByCodeNameEquals(experimentIdOrCodeName).getSingleResult();
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				experiment = null;
 			}
 		}
 
 		List<TreatmentGroupValue> treatmentGroupValues;
-		if(experiment != null) {
+		if (experiment != null) {
 			Long experimentId = experiment.getId();
-			treatmentGroupValues = treatmentGroupValueService.getTreatmentGroupValuesByExperimentIdAndStateTypeKindAndValueTypeKind(experimentId, stateType,
-					stateKind, valueType, valueKind);
+			treatmentGroupValues = treatmentGroupValueService
+					.getTreatmentGroupValuesByExperimentIdAndStateTypeKindAndValueTypeKind(experimentId, stateType,
+							stateKind, valueType, valueKind);
 		} else {
 			treatmentGroupValues = new ArrayList<TreatmentGroupValue>();
 		}
@@ -612,17 +628,20 @@ public ResponseEntity<String> getTreatmentGroupValuesByIdOrCodeNameAndStateTypeK
 			String outputString = treatmentGroupValueService.getCsvList(treatmentGroupValues);
 			return new ResponseEntity<String>(outputString, headers, HttpStatus.OK);
 		} else {
-			//default format is json
-			return new ResponseEntity<String>(TreatmentGroupValue.toJsonArray(treatmentGroupValues), headers, HttpStatus.OK);
+			// default format is json
+			return new ResponseEntity<String>(TreatmentGroupValue.toJsonArray(treatmentGroupValues), headers,
+					HttpStatus.OK);
 		}
 	}
 
-	//	@RequestMapping(value = "/{experimentIdOrCodeName}/subjects/bystate/{stateType}/{stateKind}/byvalue/{valueType}/{valueKind}/{format}", method = RequestMethod.GET, headers = "Accept=application/json")
+	// @RequestMapping(value =
+	// "/{experimentIdOrCodeName}/subjects/bystate/{stateType}/{stateKind}/byvalue/{valueType}/{valueKind}/{format}",
+	// method = RequestMethod.GET, headers = "Accept=application/json")
 
 	@RequestMapping(value = "/{experimentIdOrCodeName}/subjectvalues/bystate/{stateType}/{stateKind}/{format}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> getExperimentValueByIdOrCodeNameAndStateTypeKindFilter51 (
+	public ResponseEntity<String> getExperimentValueByIdOrCodeNameAndStateTypeKindFilter51(
 			@PathVariable("experimentIdOrCodeName") String experimentIdOrCodeName,
 			@PathVariable("stateType") String stateType,
 			@PathVariable("stateKind") String stateKind,
@@ -632,20 +651,21 @@ public ResponseEntity<String> getExperimentValueByIdOrCodeNameAndStateTypeKindFi
 		headers.add("Content-Type", "application/json; charset=utf-8");
 
 		Experiment experiment;
-		if(isNumeric(experimentIdOrCodeName)) {
+		if (isNumeric(experimentIdOrCodeName)) {
 			experiment = Experiment.findExperiment(Long.valueOf(experimentIdOrCodeName));
-		} else {		
+		} else {
 			try {
 				experiment = Experiment.findExperimentsByCodeNameEquals(experimentIdOrCodeName).getSingleResult();
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				experiment = null;
 			}
 		}
 
 		List<SubjectValue> subjectValues;
-		if(experiment != null) {
+		if (experiment != null) {
 			Long experimentId = experiment.getId();
-			subjectValues = subjectValueService.getSubjectValuesByExperimentIdAndStateTypeKind(experimentId, stateType, stateKind);
+			subjectValues = subjectValueService.getSubjectValuesByExperimentIdAndStateTypeKind(experimentId, stateType,
+					stateKind);
 		} else {
 			subjectValues = new ArrayList<SubjectValue>();
 		}
@@ -653,7 +673,7 @@ public ResponseEntity<String> getExperimentValueByIdOrCodeNameAndStateTypeKindFi
 			String outputString = subjectValueService.getCsvList(subjectValues);
 			return new ResponseEntity<String>(outputString, headers, HttpStatus.OK);
 		} else {
-			//default format is json
+			// default format is json
 			return new ResponseEntity<String>(SubjectValue.toJsonArray(subjectValues), headers, HttpStatus.OK);
 		}
 	}
@@ -661,7 +681,7 @@ public ResponseEntity<String> getExperimentValueByIdOrCodeNameAndStateTypeKindFi
 	@RequestMapping(value = "/{experimentIdOrCodeName}/subjectvalues/bystate/{stateType}/{stateKind}/byvalue/{valueType}/{valueKind}/{format}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> getExperimentValueByIdOrCodeNameAndStateTypeKindAndValueTypeKindFilter5 (
+	public ResponseEntity<String> getExperimentValueByIdOrCodeNameAndStateTypeKindAndValueTypeKindFilter5(
 			@PathVariable("experimentIdOrCodeName") String experimentIdOrCodeName,
 			@PathVariable("stateType") String stateType,
 			@PathVariable("stateKind") String stateKind,
@@ -673,20 +693,21 @@ public ResponseEntity<String> getExperimentValueByIdOrCodeNameAndStateTypeKindAn
 		headers.add("Content-Type", "application/json; charset=utf-8");
 
 		Experiment experiment;
-		if(isNumeric(experimentIdOrCodeName)) {
+		if (isNumeric(experimentIdOrCodeName)) {
 			experiment = Experiment.findExperiment(Long.valueOf(experimentIdOrCodeName));
-		} else {		
+		} else {
 			try {
 				experiment = Experiment.findExperimentsByCodeNameEquals(experimentIdOrCodeName).getSingleResult();
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				experiment = null;
 			}
 		}
 
 		List<SubjectValue> subjectValues;
-		if(experiment != null) {
+		if (experiment != null) {
 			Long experimentId = experiment.getId();
-			subjectValues = subjectValueService.getSubjectValuesByExperimentIdAndStateTypeKindAndValueTypeKind(experimentId, stateType,
+			subjectValues = subjectValueService.getSubjectValuesByExperimentIdAndStateTypeKindAndValueTypeKind(
+					experimentId, stateType,
 					stateKind, valueType, valueKind);
 		} else {
 			subjectValues = new ArrayList<SubjectValue>();
@@ -695,7 +716,7 @@ public ResponseEntity<String> getExperimentValueByIdOrCodeNameAndStateTypeKindAn
 			String outputString = subjectValueService.getCsvList(subjectValues);
 			return new ResponseEntity<String>(outputString, headers, HttpStatus.OK);
 		} else {
-			//default format is json
+			// default format is json
 			return new ResponseEntity<String>(SubjectValue.toJsonArray(subjectValues), headers, HttpStatus.OK);
 		}
 
@@ -704,33 +725,31 @@ public ResponseEntity<String> getExperimentValueByIdOrCodeNameAndStateTypeKindAn
 	@RequestMapping(value = "/{idOrCodeName}/values", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> getExperimentValuesForExperimentByIdOrCodeName (
-			@PathVariable("idOrCodeName") String idOrCodeName) {		
+	public ResponseEntity<String> getExperimentValuesForExperimentByIdOrCodeName(
+			@PathVariable("idOrCodeName") String idOrCodeName) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 
 		List<ExperimentValue> experimentValues = null;
 		Long id = null;
-		if(SimpleUtil.isNumeric(idOrCodeName)) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			id = Long.valueOf(idOrCodeName);
 		} else {
 			id = Experiment.findExperimentsByCodeNameEquals(idOrCodeName).getSingleResult().getId();
 		}
 
-		if(id != null) {
+		if (id != null) {
 			experimentValues = experimentValueService.getExperimentValuesByExperimentId(id);
 		}
 
-		return (experimentValues == null) ?
-				new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND) :
-					new ResponseEntity<String>(ExperimentValue.toJsonArray(experimentValues), headers, HttpStatus.OK);
+		return (experimentValues == null) ? new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND)
+				: new ResponseEntity<String>(ExperimentValue.toJsonArray(experimentValues), headers, HttpStatus.OK);
 	}
 
-
 	@RequestMapping(value = "/{experimentIdOrCodeName}/values/{valueId}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> getExperimentValueByIdOrCodeName (
+	public ResponseEntity<String> getExperimentValueByIdOrCodeName(
 			@PathVariable("experimentIdOrCodeName") String experimentIdOrCodeName,
 			@PathVariable("valueId") Long valueId) {
 
@@ -738,7 +757,7 @@ public ResponseEntity<String> getExperimentValueByIdOrCodeName (
 		headers.add("Content-Type", "application/json; charset=utf-8");
 
 		Experiment experiment;
-		if(isNumeric(experimentIdOrCodeName)) {
+		if (isNumeric(experimentIdOrCodeName)) {
 			experiment = Experiment.findExperiment(Long.valueOf(experimentIdOrCodeName));
 		} else {
 			experiment = Experiment.findExperimentsByCodeNameEquals(experimentIdOrCodeName).getSingleResult();
@@ -746,878 +765,961 @@ public ResponseEntity<String> getExperimentValueByIdOrCodeName (
 
 		ExperimentValue experimentValue = ExperimentValue.findExperimentValue(valueId);
 
-		if (experimentValue.getLsState().getExperiment().getId() != experiment.getId()){
+		if (experimentValue.getLsState().getExperiment().getId() != experiment.getId()) {
 			new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
 		}
 
 		return new ResponseEntity<String>(experimentValue.toJson(), headers, HttpStatus.OK);
 	}
 
-//	@Transactional
-//	@RequestMapping(value = "/values", method = RequestMethod.POST, headers = "Accept=application/json")
-//	public @ResponseBody ResponseEntity<String> saveExperimentFromJson(@RequestBody String json) {
-//		HttpHeaders headers = new HttpHeaders();
-//		headers.add("Content-Type", "application/json");
-//
-//		ExperimentValue experimentValue = ExperimentValue.fromJsonToExperimentValue(json);
-//
-//		return (experimentValueService.saveExperimentValue(experimentValue) == null) ?
-//				new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST) :
-//					new ResponseEntity<String>(headers, HttpStatus.OK);
-//	}
-
-//	@Transactional
-//	@RequestMapping(value = "{IdOrCodeName}/values/{Id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-//	public @ResponseBody ResponseEntity<String> updateExperimentFromJsonWithId(
-//			@RequestBody String json,
-//			@PathVariable("Id") String Id,
-//			@PathVariable("IdOrCodeName") String IdOrCodeName) {
-//		HttpHeaders headers = new HttpHeaders();
-//		headers.add("Content-Type", "application/json");
-//
-//		ExperimentValue experimentValue = ExperimentValue.fromJsonToExperimentValue(json);
-//		if(experimentValue.getId() == null) {
-//			return (experimentValueService.saveExperimentValue(experimentValue) != null) ?
-//					new ResponseEntity<String>(headers, HttpStatus.OK) :
-//						new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST);
-//		}      
-//		return ((experimentValueService.updateExperimentValue(experimentValue)) == null) ? 
-//				new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST) : 
-//					new ResponseEntity<String>(headers, HttpStatus.OK);
-//	}
-//
-//	@Transactional
-//	@RequestMapping(value = "{IdOrCodeName}/values", method = RequestMethod.PUT, headers = "Accept=application/json")
-//	public @ResponseBody ResponseEntity<String> updateExperimentFromJsonWithId(
-//			@RequestBody String json,
-//			@PathVariable("IdOrCodeName") String IdOrCodeName) {
-//		HttpHeaders headers = new HttpHeaders();
-//		headers.add("Content-Type", "application/json");
-//
-//		ExperimentValue experimentValue = ExperimentValue.fromJsonToExperimentValue(json);
-//		if(experimentValue.getId() == null) {
-//			return (experimentValueService.saveExperimentValue(experimentValue) != null) ?
-//					new ResponseEntity<String>(headers, HttpStatus.OK) :
-//						new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST);
-//		}      
-//		return ((experimentValueService.updateExperimentValue(experimentValue)) == null) ? 
-//				new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST) : 
-//					new ResponseEntity<String>(headers, HttpStatus.OK);
-//	}
+	// @Transactional
+	// @RequestMapping(value = "/values", method = RequestMethod.POST, headers =
+	// "Accept=application/json")
+	// public @ResponseBody ResponseEntity<String>
+	// saveExperimentFromJson(@RequestBody String json) {
+	// HttpHeaders headers = new HttpHeaders();
+	// headers.add("Content-Type", "application/json");
+	//
+	// ExperimentValue experimentValue =
+	// ExperimentValue.fromJsonToExperimentValue(json);
+	//
+	// return (experimentValueService.saveExperimentValue(experimentValue) == null)
+	// ?
+	// new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST) :
+	// new ResponseEntity<String>(headers, HttpStatus.OK);
+	// }
+
+	// @Transactional
+	// @RequestMapping(value = "{IdOrCodeName}/values/{Id}", method =
+	// RequestMethod.PUT, headers = "Accept=application/json")
+	// public @ResponseBody ResponseEntity<String> updateExperimentFromJsonWithId(
+	// @RequestBody String json,
+	// @PathVariable("Id") String Id,
+	// @PathVariable("IdOrCodeName") String IdOrCodeName) {
+	// HttpHeaders headers = new HttpHeaders();
+	// headers.add("Content-Type", "application/json");
+	//
+	// ExperimentValue experimentValue =
+	// ExperimentValue.fromJsonToExperimentValue(json);
+	// if(experimentValue.getId() == null) {
+	// return (experimentValueService.saveExperimentValue(experimentValue) != null)
+	// ?
+	// new ResponseEntity<String>(headers, HttpStatus.OK) :
+	// new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST);
+	// }
+	// return ((experimentValueService.updateExperimentValue(experimentValue)) ==
+	// null) ?
+	// new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST) :
+	// new ResponseEntity<String>(headers, HttpStatus.OK);
+	// }
+	//
+	// @Transactional
+	// @RequestMapping(value = "{IdOrCodeName}/values", method = RequestMethod.PUT,
+	// headers = "Accept=application/json")
+	// public @ResponseBody ResponseEntity<String> updateExperimentFromJsonWithId(
+	// @RequestBody String json,
+	// @PathVariable("IdOrCodeName") String IdOrCodeName) {
+	// HttpHeaders headers = new HttpHeaders();
+	// headers.add("Content-Type", "application/json");
+	//
+	// ExperimentValue experimentValue =
+	// ExperimentValue.fromJsonToExperimentValue(json);
+	// if(experimentValue.getId() == null) {
+	// return (experimentValueService.saveExperimentValue(experimentValue) != null)
+	// ?
+	// new ResponseEntity<String>(headers, HttpStatus.OK) :
+	// new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST);
+	// }
+	// return ((experimentValueService.updateExperimentValue(experimentValue)) ==
+	// null) ?
+	// new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST) :
+	// new ResponseEntity<String>(headers, HttpStatus.OK);
+	// }
 
 	private static boolean isNumeric(String str) {
 		for (char c : str.toCharArray()) {
-			if (!Character.isDigit(c)) return false;
+			if (!Character.isDigit(c))
+				return false;
 		}
 		return true;
 	}
 
 	@RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
-        Experiment experiment = Experiment.findExperiment(id);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        if (experiment == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        return new ResponseEntity<String>(experiment.toJson(), headers, HttpStatus.OK);
-    }
-
-//	@Transactional
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> createFromJson(@RequestBody String json) {
+	@ResponseBody
+	public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
+		Experiment experiment = Experiment.findExperiment(id);
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		if (experiment == null) {
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		}
+		return new ResponseEntity<String>(experiment.toJson(), headers, HttpStatus.OK);
+	}
+
+	// @Transactional
+	@RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<java.lang.String> createFromJson(@RequestBody String json) {
 		Experiment experiment = Experiment.fromJsonToExperiment(json);
-        logger.debug("----from the Experiment POST controller----");
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
-        boolean errorsFound = false;
-        Experiment savedExperiment = null;
-        try {
+		logger.debug("----from the Experiment POST controller----");
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
+		boolean errorsFound = false;
+		Experiment savedExperiment = null;
+		try {
 			Set<AnalysisGroup> inputAnalysisGroups = new HashSet<AnalysisGroup>();
-			for(AnalysisGroup analysisGroup : experiment.getAnalysisGroups()){
-				inputAnalysisGroups.add(analysisGroup);					
+			for (AnalysisGroup analysisGroup : experiment.getAnalysisGroups()) {
+				inputAnalysisGroups.add(analysisGroup);
 			}
-        	
-//			Set<Long> hashAnalysisGroupIds = new HashSet<Long>();
-//			for(AnalysisGroup analysisGroup : experiment.getAnalysisGroups()){
-//				hashAnalysisGroupIds.add(analysisGroup.getId());
-//			}
-//        	
-//		    List<Long> analysisGroupIds = new ArrayList<Long>(hashAnalysisGroupIds.size());
-//			for(Long analysisGroupId : hashAnalysisGroupIds){
-//				analysisGroupIds.add(analysisGroupId);
-//			}
-//			Collections.sort(analysisGroupIds);
-//        	
-//			List<AnalysisGroup> inputAnalysisGroups = new ArrayList<AnalysisGroup>();
-//			for(Long analysisGroupId : analysisGroupIds){
-//				inputAnalysisGroups.add(AnalysisGroup.findAnalysisGroup(analysisGroupId));
-//			}
-			
+
+			// Set<Long> hashAnalysisGroupIds = new HashSet<Long>();
+			// for(AnalysisGroup analysisGroup : experiment.getAnalysisGroups()){
+			// hashAnalysisGroupIds.add(analysisGroup.getId());
+			// }
+			//
+			// List<Long> analysisGroupIds = new
+			// ArrayList<Long>(hashAnalysisGroupIds.size());
+			// for(Long analysisGroupId : hashAnalysisGroupIds){
+			// analysisGroupIds.add(analysisGroupId);
+			// }
+			// Collections.sort(analysisGroupIds);
+			//
+			// List<AnalysisGroup> inputAnalysisGroups = new ArrayList<AnalysisGroup>();
+			// for(Long analysisGroupId : analysisGroupIds){
+			// inputAnalysisGroups.add(AnalysisGroup.findAnalysisGroup(analysisGroupId));
+			// }
+
 			savedExperiment = experimentService.saveLsExperiment(experiment);
 
 			AnalysisGroup savedAnalysisGroup = null;
 			int i = 0;
-			for(AnalysisGroup analysisGroup : inputAnalysisGroups){
+			for (AnalysisGroup analysisGroup : inputAnalysisGroups) {
 				try {
 					analysisGroup.getExperiments().add(savedExperiment);
 					savedAnalysisGroup = analysisGroupService.saveLsAnalysisGroup(analysisGroup);
-					if ( i % propertiesUtilService.getBatchSize() == 0 ) { 
+					if (i % propertiesUtilService.getBatchSize() == 0) {
 						savedAnalysisGroup.flush();
 						savedAnalysisGroup.clear();
 					}
 					i++;
-				} catch (Exception e){
+				} catch (Exception e) {
 					logger.error("Error saving the analysisGroup -------" + e.toString());
 					throw new RuntimeException("Error saving the analysisGroup" + e);
 				}
 			}
-       				
-//			experiment.setAnalysisGroups(inputAnalysisGroups);
-                
-        } catch (UniqueNameException e) {
-			logger.error("----from the controller UniqueNameException ----" + e.getMessage().toString() + " whole message  " + e.toString());
-            ErrorMessage error = new ErrorMessage();
-            error.setErrorLevel("error");
-            error.setMessage("not unique experiment name");
-            errors.add(error);
-            errorsFound = true;
-        } catch (NotFoundException e) {
-			logger.error("----from the controller NotFoundException ----" + e.getMessage().toString() + " whole message  " + e.toString());
-//TODO: Fix this to do this logic lower in the code if possible. 
-// Assuming that we are unable to find the analysisgroups in the experiment
-//Want to tell the users all of the missing analysisgroups
-            Set<AnalysisGroup> analysisGroups = experiment.getAnalysisGroups();
-            for (AnalysisGroup analysisGroup : analysisGroups){
-            	if (analysisGroup.getId() != null && AnalysisGroup.findAnalysisGroup(analysisGroup.getId()) == null){
-                    ErrorMessage error = new ErrorMessage();
-                    error.setErrorLevel("error");
-                    error.setMessage("analysis group not found: " + analysisGroup.getId());
-                    errors.add(error);
-                    errorsFound = true;            		
-            	}
-            }
-		}
-        if (errorsFound) {
-            return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.CONFLICT);
-        } else {
+
+			// experiment.setAnalysisGroups(inputAnalysisGroups);
+
+		} catch (UniqueNameException e) {
+			logger.error("----from the controller UniqueNameException ----" + e.getMessage().toString()
+					+ " whole message  " + e.toString());
+			ErrorMessage error = new ErrorMessage();
+			error.setErrorLevel("error");
+			error.setMessage("not unique experiment name");
+			errors.add(error);
+			errorsFound = true;
+		} catch (NotFoundException e) {
+			logger.error("----from the controller NotFoundException ----" + e.getMessage().toString()
+					+ " whole message  " + e.toString());
+			// TODO: Fix this to do this logic lower in the code if possible.
+			// Assuming that we are unable to find the analysisgroups in the experiment
+			// Want to tell the users all of the missing analysisgroups
+			Set<AnalysisGroup> analysisGroups = experiment.getAnalysisGroups();
+			for (AnalysisGroup analysisGroup : analysisGroups) {
+				if (analysisGroup.getId() != null && AnalysisGroup.findAnalysisGroup(analysisGroup.getId()) == null) {
+					ErrorMessage error = new ErrorMessage();
+					error.setErrorLevel("error");
+					error.setMessage("analysis group not found: " + analysisGroup.getId());
+					errors.add(error);
+					errorsFound = true;
+				}
+			}
+		}
+		if (errorsFound) {
+			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.CONFLICT);
+		} else {
 			return new ResponseEntity<String>(savedExperiment.toJson(), headers, HttpStatus.CREATED);
-        }
-    }
-	
+		}
+	}
+
 	@Transactional
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> createFromJsonArray(@RequestBody String json) {
+	@RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<java.lang.String> createFromJsonArray(@RequestBody String json) {
 		Collection<Experiment> experiments = Experiment.fromJsonArrayToExperiments(json);
 		HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try{
-        	Collection<Experiment> savedExperiments = experimentService.saveLsExperiments(experiments);
-            return new ResponseEntity<String>(Experiment.toJsonArrayStub(savedExperiments), headers, HttpStatus.CREATED);
-        }catch (UniqueNameException uniqueNameException){
-        	logger.error("Found existing experiment with that name", uniqueNameException);
-        	return new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST);
-        }catch (Exception e){
-        	logger.error("Caught exception in createFromJsonArray",e);
-        	return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-        
-    }
-	
+		headers.add("Content-Type", "application/json");
+		try {
+			Collection<Experiment> savedExperiments = experimentService.saveLsExperiments(experiments);
+			return new ResponseEntity<String>(Experiment.toJsonArrayStub(savedExperiments), headers,
+					HttpStatus.CREATED);
+		} catch (UniqueNameException uniqueNameException) {
+			logger.error("Found existing experiment with that name", uniqueNameException);
+			return new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST);
+		} catch (Exception e) {
+			logger.error("Caught exception in createFromJsonArray", e);
+			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
+		}
+
+	}
+
 	@Transactional
-    @RequestMapping(value = { "/{id}", "/" }, method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> updateFromJson(@RequestBody String json) {
+	@RequestMapping(value = { "/{id}", "/" }, method = RequestMethod.PUT, headers = "Accept=application/json")
+	public ResponseEntity<java.lang.String> updateFromJson(@RequestBody String json) {
 		Experiment experiment = Experiment.fromJsonToExperiment(json);
 		HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
-        boolean errorsFound = false;
-        try {
-        	experiment = experimentService.updateExperiment(experiment);
-        }catch (UniqueNameException e) {
-            logger.error("----from the controller----" + e.getMessage().toString() + " whole message  " + e.toString());
-            ErrorMessage error = new ErrorMessage();
-            error.setErrorLevel("error");
-            error.setMessage("not unique experiment name");
-            errors.add(error);
-            errorsFound = true;
-        }
-        if (errorsFound) {
-            return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.CONFLICT);
-        }
-        if (experiment.getId() == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        return new ResponseEntity<String>(Experiment.findExperiment(experiment.getId()).toJsonStub(), headers, HttpStatus.OK);
-    }
-
-	
+		headers.add("Content-Type", "application/json");
+		ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
+		boolean errorsFound = false;
+		try {
+			experiment = experimentService.updateExperiment(experiment);
+		} catch (UniqueNameException e) {
+			logger.error("----from the controller----" + e.getMessage().toString() + " whole message  " + e.toString());
+			ErrorMessage error = new ErrorMessage();
+			error.setErrorLevel("error");
+			error.setMessage("not unique experiment name");
+			errors.add(error);
+			errorsFound = true;
+		}
+		if (errorsFound) {
+			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.CONFLICT);
+		}
+		if (experiment.getId() == null) {
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		}
+		return new ResponseEntity<String>(Experiment.findExperiment(experiment.getId()).toJsonStub(), headers,
+				HttpStatus.OK);
+	}
+
 	@Transactional
-    @RequestMapping(value = "/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> updateFromJsonArray(@RequestBody String json) {
+	@RequestMapping(value = "/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+	public ResponseEntity<java.lang.String> updateFromJsonArray(@RequestBody String json) {
 		Collection<Experiment> experiments = Experiment.fromJsonArrayToExperiments(json);
 		HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        Collection<Experiment> updatedExperiments = new ArrayList<Experiment>();
-        ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
-        boolean errorsFound = false;
-        for (Experiment experiment : experiments) {
-            try{
-            	updatedExperiments.add(experimentService.updateExperiment(experiment));
-            } catch (UniqueNameException e){
-            	logger.error("----from the controller----" + e.getMessage().toString() + " whole message  " + e.toString());
-                ErrorMessage error = new ErrorMessage();
-                error.setErrorLevel("error");
-                error.setMessage("not unique experiment name");
-                errors.add(error);
-                errorsFound = true;
-            }
-        }
-        if (errorsFound) {
-            return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.CONFLICT);
-        }
-        return new ResponseEntity<String>(Experiment.toJsonArrayStub(updatedExperiments), headers, HttpStatus.OK);
-    }
-
-//	@RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-//    public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
-//        Experiment experiment = Experiment.findExperiment(id);
-//        HttpHeaders headers = new HttpHeaders();
-//        headers.add("Content-Type", "application/json");
-//        if (experiment == null) {
-//            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-//        }
-//        experiment.remove();
-//        return new ResponseEntity<String>(headers, HttpStatus.OK);
-//    }
-	
-//	@RequestMapping(value = "/seldelete/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-//    public ResponseEntity<String> trueDeleteById(@PathVariable("id") Long id) {
-//        Experiment experiment = Experiment.findExperiment(id);
-//        HttpHeaders headers = new HttpHeaders();
-//        headers.add("Content-Type", "application/json");
-//        if (experiment == null) {
-//            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-//        }
-//        long startTime = new Date().getTime();
-//        Experiment.removeExperimentFullCascade(id);
-//		long endTime = new Date().getTime();
-//		long totalTime = endTime - startTime;
-//		logger.info("   total elapsed time: " + totalTime + " ms");
-//        return new ResponseEntity<String>(headers, HttpStatus.OK);
-//    }
-	
+		headers.add("Content-Type", "application/json");
+		Collection<Experiment> updatedExperiments = new ArrayList<Experiment>();
+		ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
+		boolean errorsFound = false;
+		for (Experiment experiment : experiments) {
+			try {
+				updatedExperiments.add(experimentService.updateExperiment(experiment));
+			} catch (UniqueNameException e) {
+				logger.error(
+						"----from the controller----" + e.getMessage().toString() + " whole message  " + e.toString());
+				ErrorMessage error = new ErrorMessage();
+				error.setErrorLevel("error");
+				error.setMessage("not unique experiment name");
+				errors.add(error);
+				errorsFound = true;
+			}
+		}
+		if (errorsFound) {
+			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.CONFLICT);
+		}
+		return new ResponseEntity<String>(Experiment.toJsonArrayStub(updatedExperiments), headers, HttpStatus.OK);
+	}
+
+	// @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers =
+	// "Accept=application/json")
+	// public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
+	// Experiment experiment = Experiment.findExperiment(id);
+	// HttpHeaders headers = new HttpHeaders();
+	// headers.add("Content-Type", "application/json");
+	// if (experiment == null) {
+	// return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+	// }
+	// experiment.remove();
+	// return new ResponseEntity<String>(headers, HttpStatus.OK);
+	// }
+
+	// @RequestMapping(value = "/seldelete/{id}", method = RequestMethod.DELETE,
+	// headers = "Accept=application/json")
+	// public ResponseEntity<String> trueDeleteById(@PathVariable("id") Long id) {
+	// Experiment experiment = Experiment.findExperiment(id);
+	// HttpHeaders headers = new HttpHeaders();
+	// headers.add("Content-Type", "application/json");
+	// if (experiment == null) {
+	// return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+	// }
+	// long startTime = new Date().getTime();
+	// Experiment.removeExperimentFullCascade(id);
+	// long endTime = new Date().getTime();
+	// long totalTime = endTime - startTime;
+	// logger.info(" total elapsed time: " + totalTime + " ms");
+	// return new ResponseEntity<String>(headers, HttpStatus.OK);
+	// }
+
 	@RequestMapping(value = "/browser/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<String> softDeleteById(@PathVariable("id") Long id) {
-        Experiment experiment = Experiment.findExperiment(id);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        if (experiment == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        ExperimentValue experimentValue = experimentValueService.updateExperimentValue(experiment.getCodeName(), "metadata", "experiment metadata", "codeValue", "experiment status", "deleted");
+	public ResponseEntity<String> softDeleteById(@PathVariable("id") Long id) {
+		Experiment experiment = Experiment.findExperiment(id);
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		if (experiment == null) {
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		}
+		ExperimentValue experimentValue = experimentValueService.updateExperimentValue(experiment.getCodeName(),
+				"metadata", "experiment metadata", "codeValue", "experiment status", "deleted");
 		experiment.setIgnored(true);
-        return new ResponseEntity<String>(experimentValue.toJson(), headers, HttpStatus.OK);
-    }
+		return new ResponseEntity<String>(experimentValue.toJson(), headers, HttpStatus.OK);
+	}
 
 	@RequestMapping(params = "find=ByCodeNameEquals", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> jsonFindExperimentsByCodeNameEquals(@RequestParam("codeName") String codeName) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(Experiment.toJsonArray(Experiment.findExperimentsByCodeNameEquals(codeName).getResultList()), headers, HttpStatus.OK);
-    }
+	@ResponseBody
+	public ResponseEntity<String> jsonFindExperimentsByCodeNameEquals(@RequestParam("codeName") String codeName) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		return new ResponseEntity<String>(
+				Experiment.toJsonArray(Experiment.findExperimentsByCodeNameEquals(codeName).getResultList()), headers,
+				HttpStatus.OK);
+	}
 
 	@RequestMapping(params = "find=ByLsTransaction", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> jsonFindExperimentsByLsTransaction(@RequestParam("lsTransaction") Long lsTransaction) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(Experiment.toJsonArray(Experiment.findExperimentsByLsTransaction(lsTransaction).getResultList()), headers, HttpStatus.OK);
-    }
+	@ResponseBody
+	public ResponseEntity<String> jsonFindExperimentsByLsTransaction(
+			@RequestParam("lsTransaction") Long lsTransaction) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		return new ResponseEntity<String>(
+				Experiment.toJsonArray(Experiment.findExperimentsByLsTransaction(lsTransaction).getResultList()),
+				headers, HttpStatus.OK);
+	}
 
 	@RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEquals", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> jsonFindExperimentsByLsTypeEqualsAndLsKindEquals(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(Experiment.toJsonArray(Experiment.findExperimentsByLsTypeEqualsAndLsKindEquals(lsType, lsKind).getResultList()), headers, HttpStatus.OK);
-    }
+	@ResponseBody
+	public ResponseEntity<String> jsonFindExperimentsByLsTypeEqualsAndLsKindEquals(
+			@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		return new ResponseEntity<String>(
+				Experiment.toJsonArray(
+						Experiment.findExperimentsByLsTypeEqualsAndLsKindEquals(lsType, lsKind).getResultList()),
+				headers, HttpStatus.OK);
+	}
 
 	@RequestMapping(params = "find=ByProtocol", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> jsonFindExperimentsByProtocol(@RequestParam("protocol") Protocol protocol) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(Experiment.toJsonArray(Experiment.findExperimentsByProtocol(protocol).getResultList()), headers, HttpStatus.OK);
-    }
-	
-////////////// copied from experiment controller
-	
-    @Transactional
-    @RequestMapping(value = "/agdata/batchcodelist", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> getGeneCodeData(@RequestBody String json, 
-    		@RequestParam(value = "format", required = false) String format, 
-    		@RequestParam(value = "onlyPublicData", required = false) String onlyPublicData) {
-        logger.debug("incoming json: " + json);
-        ExperimentSearchRequestDTO searchRequest = ExperimentSearchRequestDTO.fromJsonToExperimentSearchRequestDTO(json);
-        List<AnalysisGroupValueDTO> agValues = null;
-        
-        Boolean publicData = false;
-		if (onlyPublicData != null && onlyPublicData.equalsIgnoreCase("true")){
+	@ResponseBody
+	public ResponseEntity<String> jsonFindExperimentsByProtocol(@RequestParam("protocol") Protocol protocol) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		return new ResponseEntity<String>(
+				Experiment.toJsonArray(Experiment.findExperimentsByProtocol(protocol).getResultList()), headers,
+				HttpStatus.OK);
+	}
+
+	////////////// copied from experiment controller
+
+	@Transactional
+	@RequestMapping(value = "/agdata/batchcodelist", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<java.lang.String> getGeneCodeData(@RequestBody String json,
+			@RequestParam(value = "format", required = false) String format,
+			@RequestParam(value = "onlyPublicData", required = false) String onlyPublicData) {
+		logger.debug("incoming json: " + json);
+		ExperimentSearchRequestDTO searchRequest = ExperimentSearchRequestDTO
+				.fromJsonToExperimentSearchRequestDTO(json);
+		List<AnalysisGroupValueDTO> agValues = null;
+
+		Boolean publicData = false;
+		if (onlyPublicData != null && onlyPublicData.equalsIgnoreCase("true")) {
 			publicData = true;
 		}
-        
-        try {
-        	if (publicData){
-				agValues = AnalysisGroupValue.findAnalysisGroupValueDTO(searchRequest.getBatchCodeList(), publicData).getResultList();
+
+		try {
+			if (publicData) {
+				agValues = AnalysisGroupValue.findAnalysisGroupValueDTO(searchRequest.getBatchCodeList(), publicData)
+						.getResultList();
 			} else {
-				agValues = AnalysisGroupValue.findAnalysisGroupValueDTO(searchRequest.getBatchCodeList()).getResultList();
+				agValues = AnalysisGroupValue.findAnalysisGroupValueDTO(searchRequest.getBatchCodeList())
+						.getResultList();
+			}
+		} catch (Exception e) {
+			logger.error(e.toString());
+		}
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		if (agValues == null || agValues.size() == 0) {
+			return new ResponseEntity<String>("[]", headers, HttpStatus.EXPECTATION_FAILED);
+		}
+		if (format != null && format.equalsIgnoreCase("csv")) {
+			StringWriter outFile = new StringWriter();
+			ICsvBeanWriter beanWriter = null;
+			try {
+				beanWriter = new CsvBeanWriter(outFile, CsvPreference.STANDARD_PREFERENCE);
+				final String[] header = AnalysisGroupValueDTO.getColumns();
+				final CellProcessor[] processors = AnalysisGroupValueDTO.getProcessors();
+				beanWriter.writeHeader(header);
+				for (final AnalysisGroupValueDTO agValue : agValues) {
+					beanWriter.write(agValue, header, processors);
+				}
+			} catch (IOException e) {
+				e.printStackTrace();
+			} finally {
+				if (beanWriter != null) {
+					try {
+						beanWriter.close();
+						outFile.flush();
+						outFile.close();
+					} catch (IOException e) {
+						e.printStackTrace();
+					}
+				}
 			}
-        } catch (Exception e) {
-            logger.error(e.toString());
-        }
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        if (agValues == null || agValues.size() == 0) {
-            return new ResponseEntity<String>("[]", headers, HttpStatus.EXPECTATION_FAILED);
-        }
-        if (format != null && format.equalsIgnoreCase("csv")) {
-            StringWriter outFile = new StringWriter();
-            ICsvBeanWriter beanWriter = null;
-            try {
-                beanWriter = new CsvBeanWriter(outFile, CsvPreference.STANDARD_PREFERENCE);
-                final String[] header = AnalysisGroupValueDTO.getColumns();
-                final CellProcessor[] processors = AnalysisGroupValueDTO.getProcessors();
-                beanWriter.writeHeader(header);
-                for (final AnalysisGroupValueDTO agValue : agValues) {
-                    beanWriter.write(agValue, header, processors);
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            } finally {
-                if (beanWriter != null) {
-                    try {
-                        beanWriter.close();
-                        outFile.flush();
-                        outFile.close();
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-            return new ResponseEntity<String>(outFile.toString(), headers, HttpStatus.OK);
-        } else {
-            return new ResponseEntity<String>(AnalysisGroupValueDTO.toJsonArray(agValues), headers, HttpStatus.OK);
-        }
-    }
-
-
-    
-    @Transactional
-    @RequestMapping(value = "/filters/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> getExperimentFilters(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        Collection<String> experimentCodes = new JSONDeserializer<List<String>>().use(null, ArrayList.class).use("values", String.class).deserialize(json);
-        Collection<ExperimentFilterDTO> results = experimentService.getExperimentFilters(experimentCodes);
-        return new ResponseEntity<String>(ExperimentFilterDTO.toJsonArray(results), headers, HttpStatus.OK);
-    }
-
-    @Transactional
-    @RequestMapping(value = "/get/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> getExperimentFiltersNew(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        Collection<String> experimentCodes = new JSONDeserializer<List<String>>().use(null, ArrayList.class).use("values", String.class).deserialize(json);
-        Collection<ExperimentFilterDTO> results = experimentService.getExperimentFilters(experimentCodes);
-        return new ResponseEntity<String>(ExperimentFilterDTO.toJsonArray(results), headers, HttpStatus.OK);
-    }
-
-    @Transactional
-    @RequestMapping(value = "/jstreenodes/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> getJsTreeNodes(@RequestBody List<BatchCodeDTO> batchCodes) {
-    	logger.debug("getting tree nodes: " + BatchCodeDTO.toJsonArray(batchCodes));
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        Collection<String> codeValues = new HashSet<String>();
-        for (BatchCodeDTO batchCode : batchCodes) {
-            codeValues.add(batchCode.getBatchCode());
-        }
-        Collection<JSTreeNodeDTO> results = experimentService.getExperimentNodes(codeValues);
-        return new ResponseEntity<String>(JSTreeNodeDTO.toJsonArray(results), headers, HttpStatus.OK);
-    }
-
-    @Transactional
-    @RequestMapping(value = "/exptData/byGeneID", method = RequestMethod.GET, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> getAgDataByGeneId(@RequestParam(value = "geneID", required = true) String geneID, 
-    															@RequestParam(value = "onlyPublicData", required = false) String onlyPublicData) {
-    	boolean showOnlyPublicData = false;
-    	if (onlyPublicData != null && onlyPublicData.trim().equalsIgnoreCase("true")){
-    		showOnlyPublicData = true;
-    	}
-    	
-    	PreferredNameRequestDTO requestDTO = new PreferredNameRequestDTO();
-    	PreferredNameDTO prefDTO = new PreferredNameDTO();
-    	prefDTO.setRequestName(geneID);
-    	Collection<PreferredNameDTO> requests = new HashSet<PreferredNameDTO>();
-    	requests.add(prefDTO);
-		requestDTO.setRequests(requests );
-        String thingType = "gene";
-        String thingKind = "entrez gene";
-        String labelType = "name";
-        String labelKind = "Entrez Gene ID";
-        logger.info("getGeneCodeNameFromNameRequest incoming json: " + requestDTO.toJson());
-        Collection<PreferredNameDTO> batchCodeResults = lsThingService.getPreferredNameFromName(thingType, thingKind, labelType, labelKind, requestDTO).getResults();
-        String batchCode = null;
-        for (PreferredNameDTO batchCodeResult : batchCodeResults){
-        	batchCode = batchCodeResult.getReferenceName();
-        }
-        
-    	List<ExperimentDataDTO> experimentData = experimentService.getExperimentData(batchCode, showOnlyPublicData);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-		headers.add("Cache-Control","no-store, max-age=0, no-cache, must-revalidate"); //HTTP 1.1
-        return new ResponseEntity<String>(ExperimentDataDTO.toJsonArray(experimentData), headers, HttpStatus.OK);
-    }
-    
-    @Transactional
-    @RequestMapping(value = "/exptData/byBatchCode", method = RequestMethod.GET, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> getAgDataByBatchCode(@RequestParam(value = "batchCode", required = true) String batchCode, 
-    															@RequestParam(value = "onlyPublicData", required = false) String onlyPublicData) {
-    	boolean showOnlyPublicData = false;
-    	if (onlyPublicData != null && onlyPublicData.trim().equalsIgnoreCase("true")){
-    		showOnlyPublicData = true;
-    	}
-    	
-    	batchCode = batchCode.trim();
-    	List<ExperimentDataDTO> experimentData = experimentService.getExperimentData(batchCode, showOnlyPublicData);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-		headers.add("Cache-Control","no-store, max-age=0, no-cache, must-revalidate"); //HTTP 1.1
-        return new ResponseEntity<String>(ExperimentDataDTO.toJsonArray(experimentData), headers, HttpStatus.OK);
-    }
-    
-    @Transactional
-    @RequestMapping(value = "/agdata/batchcodelist/experimentcodelist", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> getAGDataByBatchAndExperiment(
-    		@RequestBody String searchRequestJSON, 
-    		@RequestParam(value = "format", required = false) String format,
+			return new ResponseEntity<String>(outFile.toString(), headers, HttpStatus.OK);
+		} else {
+			return new ResponseEntity<String>(AnalysisGroupValueDTO.toJsonArray(agValues), headers, HttpStatus.OK);
+		}
+	}
+
+	@Transactional
+	@RequestMapping(value = "/filters/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<java.lang.String> getExperimentFilters(@RequestBody String json) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		Collection<String> experimentCodes = new JSONDeserializer<List<String>>().use(null, ArrayList.class)
+				.use("values", String.class).deserialize(json);
+		Collection<ExperimentFilterDTO> results = experimentService.getExperimentFilters(experimentCodes);
+		return new ResponseEntity<String>(ExperimentFilterDTO.toJsonArray(results), headers, HttpStatus.OK);
+	}
+
+	@Transactional
+	@RequestMapping(value = "/get/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<java.lang.String> getExperimentFiltersNew(@RequestBody String json) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		Collection<String> experimentCodes = new JSONDeserializer<List<String>>().use(null, ArrayList.class)
+				.use("values", String.class).deserialize(json);
+		Collection<ExperimentFilterDTO> results = experimentService.getExperimentFilters(experimentCodes);
+		return new ResponseEntity<String>(ExperimentFilterDTO.toJsonArray(results), headers, HttpStatus.OK);
+	}
+
+	@Transactional
+	@RequestMapping(value = "/jstreenodes/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<java.lang.String> getJsTreeNodes(@RequestBody List<BatchCodeDTO> batchCodes) {
+		logger.debug("getting tree nodes: " + BatchCodeDTO.toJsonArray(batchCodes));
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		Collection<String> codeValues = new HashSet<String>();
+		for (BatchCodeDTO batchCode : batchCodes) {
+			codeValues.add(batchCode.getBatchCode());
+		}
+		Collection<JSTreeNodeDTO> results = experimentService.getExperimentNodes(codeValues);
+		return new ResponseEntity<String>(JSTreeNodeDTO.toJsonArray(results), headers, HttpStatus.OK);
+	}
+
+	@Transactional
+	@RequestMapping(value = "/exptData/byGeneID", method = RequestMethod.GET, headers = "Accept=application/json")
+	public ResponseEntity<java.lang.String> getAgDataByGeneId(
+			@RequestParam(value = "geneID", required = true) String geneID,
+			@RequestParam(value = "onlyPublicData", required = false) String onlyPublicData) {
+		boolean showOnlyPublicData = false;
+		if (onlyPublicData != null && onlyPublicData.trim().equalsIgnoreCase("true")) {
+			showOnlyPublicData = true;
+		}
+
+		PreferredNameRequestDTO requestDTO = new PreferredNameRequestDTO();
+		PreferredNameDTO prefDTO = new PreferredNameDTO();
+		prefDTO.setRequestName(geneID);
+		Collection<PreferredNameDTO> requests = new HashSet<PreferredNameDTO>();
+		requests.add(prefDTO);
+		requestDTO.setRequests(requests);
+		String thingType = "gene";
+		String thingKind = "entrez gene";
+		String labelType = "name";
+		String labelKind = "Entrez Gene ID";
+		logger.info("getGeneCodeNameFromNameRequest incoming json: " + requestDTO.toJson());
+		Collection<PreferredNameDTO> batchCodeResults = lsThingService
+				.getPreferredNameFromName(thingType, thingKind, labelType, labelKind, requestDTO).getResults();
+		String batchCode = null;
+		for (PreferredNameDTO batchCodeResult : batchCodeResults) {
+			batchCode = batchCodeResult.getReferenceName();
+		}
+
+		List<ExperimentDataDTO> experimentData = experimentService.getExperimentData(batchCode, showOnlyPublicData);
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		headers.add("Cache-Control", "no-store, max-age=0, no-cache, must-revalidate"); // HTTP 1.1
+		return new ResponseEntity<String>(ExperimentDataDTO.toJsonArray(experimentData), headers, HttpStatus.OK);
+	}
+
+	@Transactional
+	@RequestMapping(value = "/exptData/byBatchCode", method = RequestMethod.GET, headers = "Accept=application/json")
+	public ResponseEntity<java.lang.String> getAgDataByBatchCode(
+			@RequestParam(value = "batchCode", required = true) String batchCode,
+			@RequestParam(value = "onlyPublicData", required = false) String onlyPublicData) {
+		boolean showOnlyPublicData = false;
+		if (onlyPublicData != null && onlyPublicData.trim().equalsIgnoreCase("true")) {
+			showOnlyPublicData = true;
+		}
+
+		batchCode = batchCode.trim();
+		List<ExperimentDataDTO> experimentData = experimentService.getExperimentData(batchCode, showOnlyPublicData);
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		headers.add("Cache-Control", "no-store, max-age=0, no-cache, must-revalidate"); // HTTP 1.1
+		return new ResponseEntity<String>(ExperimentDataDTO.toJsonArray(experimentData), headers, HttpStatus.OK);
+	}
+
+	@Transactional
+	@RequestMapping(value = "/agdata/batchcodelist/experimentcodelist", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<java.lang.String> getAGDataByBatchAndExperiment(
+			@RequestBody String searchRequestJSON,
+			@RequestParam(value = "format", required = false) String format,
 			@RequestParam(value = "onlyPublicData", required = false) String onlyPublicData) {
 
 		Boolean publicData = false;
-		if (onlyPublicData != null && onlyPublicData.equalsIgnoreCase("true")){
+		if (onlyPublicData != null && onlyPublicData.equalsIgnoreCase("true")) {
 			publicData = true;
 		}
-		
-		ExperimentSearchRequestDTO searchRequest = ExperimentSearchRequestDTO.fromJsonToExperimentSearchRequestDTO(searchRequestJSON);
-        if (logger.isDebugEnabled()) logger.debug("converted json: " + searchRequest.toJson());
-        List<AnalysisGroupValueDTO> agValues = null;
-        try {
-            agValues = experimentService.getFilteredAGData(searchRequest, publicData);
-            if (logger.isDebugEnabled()) logger.debug("number of agvalues found: " + agValues.size());
-        } catch (Exception e) {
-            logger.error(e.toString());
-        }
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        if (agValues == null || agValues.size() == 0) {
-            return new ResponseEntity<String>("[]", headers, HttpStatus.EXPECTATION_FAILED);
-        }
-        if (format != null && format.equalsIgnoreCase("csv")) {
-            StringWriter outFile = new StringWriter();
-            ICsvBeanWriter beanWriter = null;
-            try {
-                beanWriter = new CsvBeanWriter(outFile, CsvPreference.STANDARD_PREFERENCE);
-                final String[] header = AnalysisGroupValueDTO.getColumns();
-                final CellProcessor[] processors = AnalysisGroupValueDTO.getProcessors();
-                beanWriter.writeHeader(header);
-                for (final AnalysisGroupValueDTO agValue : agValues) {
-                    beanWriter.write(agValue, header, processors);
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            } finally {
-                if (beanWriter != null) {
-                    try {
-                        beanWriter.close();
-                        outFile.flush();
-                        outFile.close();
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-            return new ResponseEntity<String>(outFile.toString(), headers, HttpStatus.OK);
-        } else {
-            return new ResponseEntity<String>(AnalysisGroupValueDTO.toJsonArray(agValues), headers, HttpStatus.OK);
-        }
-    }
-
-    
-    @RequestMapping(method = RequestMethod.GET, value = "/full/{id}", headers = "Accept=application/json")
-    @ResponseBody
-    @Transactional
-    public ResponseEntity<java.lang.String> showFullJson(@PathVariable("id") Long id) {
-        Experiment experiment = Experiment.findExperiment(id);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        if (experiment == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        return new ResponseEntity<String>(experiment.toJson(), headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(method = RequestMethod.GET, value = "/stub/{id}", headers = "Accept=application/json")
-    @ResponseBody
-    @Transactional
-    public ResponseEntity<java.lang.String> showJsonStubWith(@PathVariable("id") Long id, @RequestParam(value = "with", required = false) String with) {
-        Experiment experiment = Experiment.findExperiment(id);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        if (experiment == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        if (with != null) {
-            if (with.equalsIgnoreCase("analysisgroups")) {
-                return new ResponseEntity<String>(experiment.toJsonStubWithAnalysisGroups(), headers, HttpStatus.OK);
-            } else if (with.equalsIgnoreCase("analysisgroupstates")) {
-                return new ResponseEntity<String>(experiment.toJsonStubWithAnalysisGroupStates(), headers, HttpStatus.OK);
-            } else if (with.equalsIgnoreCase("analysisgroupvalues")) {
-                return new ResponseEntity<String>(experiment.toJsonStubWithAnalysisGroups(), headers, HttpStatus.OK);
-            } else if (with.equalsIgnoreCase("fullobject")) {
-                return new ResponseEntity<String>(experiment.toJson(), headers, HttpStatus.OK);
-            } else if (with.equalsIgnoreCase("prettyjson")) {
-                return new ResponseEntity<String>(experiment.toPrettyJson(), headers, HttpStatus.OK);
-            } else if (with.equalsIgnoreCase("prettyjsonstub")) {
-                return new ResponseEntity<String>(experiment.toPrettyJsonStub(), headers, HttpStatus.OK);
-            } else {
-                return new ResponseEntity<String>("ERROR: with" + with + " route is not implemented. ", headers, HttpStatus.NOT_IMPLEMENTED);
-            }
-        } else {
-            return new ResponseEntity<String>(experiment.toJsonStub(), headers, HttpStatus.OK);
-        }
-    }
-
-    @RequestMapping(method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    @Transactional
-    public ResponseEntity<java.lang.String> listJsonByProtocol(@RequestParam Map<String,String> requestParams) {
-    	//Filter parameters supported: type, kind, name, codeName, protocolKind, protocolType, protocolName, protocolCodeName
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        Set<Experiment> result = new HashSet<Experiment>();
-        
-        result = experimentService.findExperimentsByRequestMetadata(requestParams);
-        
-        return new ResponseEntity<String>(Experiment.toJsonArrayStubWithProt(result), headers, HttpStatus.OK);
-    }
-
-    @RequestMapping(value = "/protocolKind/{protocolKind}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    @Transactional
-    public ResponseEntity<java.lang.String> listJsonByProtocolKind(@PathVariable("protocolKind") String protocolKind) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        List<Experiment> result = new ArrayList<Experiment>();
-        if (protocolKind != null) {
-            List<Protocol> protocols = Protocol.findProtocolsByLsKindEquals(protocolKind).getResultList();
-            for (Protocol protocol : protocols) {
-                List<Experiment> experiments = Experiment.findExperimentsByProtocol(protocol).getResultList();
-                result.addAll(experiments);
-            }
-        } else {
-            result.addAll(Experiment.findAllExperiments());
-        }
-        return new ResponseEntity<String>(Experiment.toJsonArrayStub(result), headers, HttpStatus.OK);
-    }
-
-
-    @Transactional
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> deleteFromJson(@PathVariable("id") Long id, @RequestParam(value = "with", required = false) String with) {
-        Experiment experiment = Experiment.findExperiment(id);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        if (experiment == null) {
-            logger.info("Did not find the experiment before delete");
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        } else {
-            logger.info("deleting the experiment: " + id);
-            experiment.logicalDelete();
-            if (Experiment.findExperiment(id) == null || Experiment.findExperiment(id).isIgnored()) {
-                logger.info("Did not find the experiment after delete");
-                return new ResponseEntity<String>(headers, HttpStatus.OK);
-            } else {
-                logger.info("Found the experiment after delete");
-                return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
-            }
-        }
-    }
-    
-    @Transactional
-    @RequestMapping(value = "/{id}/deleteChildren", method = RequestMethod.DELETE, headers  = "Accept=application/json")
-    public ResponseEntity<String> deleteAnalysisGroupsByExperiment(@PathVariable("id") Long id){
-    	Experiment experiment = Experiment.findExperiment(id);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        if (experiment == null) {
-            logger.info("Did not find the experiment before delete");
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        } else if (experimentService.deleteAnalysisGroupsByExperiment(experiment)) {
-        	return new ResponseEntity<String>(headers, HttpStatus.OK);
-        } else {
-        	return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    @Transactional
-    @RequestMapping(value = "/codename/{codeName}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<java.lang.String> jsonFindExperimentsByCodeNameEqualsRoute(@PathVariable("codeName") String codeName, @RequestParam(value = "with", required = false) String with) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        Experiment experiment;
-        try{
-        	experiment = Experiment.findExperimentsByCodeNameEquals(codeName).getSingleResult();
-        } catch (NoResultException e){
-        	return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        if (with != null) {
-            if (with.equalsIgnoreCase("analysisgroups")) {
-                return new ResponseEntity<String>(experiment.toJsonStubWithAnalysisGroups(), headers, HttpStatus.OK);
-            } else if (with.equalsIgnoreCase("analysisgroupstates")) {
-                return new ResponseEntity<String>(experiment.toJsonStubWithAnalysisGroupStates(), headers, HttpStatus.OK);
-            } else if (with.equalsIgnoreCase("analysisgroupvalues")) {
-                return new ResponseEntity<String>(experiment.toJsonStubWithAnalysisGroupValues(), headers, HttpStatus.OK);
-            } else if (with.equalsIgnoreCase("fullobject")) {
-                return new ResponseEntity<String>(experiment.toJson(), headers, HttpStatus.OK);
-            } else if (with.equalsIgnoreCase("prettyjson")) {
-                return new ResponseEntity<String>(experiment.toPrettyJson(), headers, HttpStatus.OK);
-            } else if (with.equalsIgnoreCase("prettyjsonstub")) {
-                return new ResponseEntity<String>(experiment.toPrettyJsonStub(), headers, HttpStatus.OK);
-            } else {
-                return new ResponseEntity<String>("ERROR: with" + with + " route is not implemented. ", headers, HttpStatus.NOT_IMPLEMENTED);
-            }
-        } else {
-            return new ResponseEntity<String>(experiment.toJsonStub(), headers, HttpStatus.OK);
-        }
-    }
-    
-    @Transactional
-    @RequestMapping(value = "/codename/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<java.lang.String> findExperimentsByCodeNames(@RequestBody List<String> codeNames, @RequestParam(value = "with", required = false) String with) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        Collection<ExperimentErrorMessageDTO> foundExperiments;
-        try{
-        	foundExperiments = experimentService.findExperimentsByCodeNames(codeNames);
-        } catch (NoResultException e){
-        	return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        if (with != null) {
-            if (with.equalsIgnoreCase("analysisgroups")) {
-                return new ResponseEntity<String>(ExperimentErrorMessageDTO.toJsonArrayStubWithAG(foundExperiments), headers, HttpStatus.OK);
-            } else if (with.equalsIgnoreCase("analysisgroupstates")) {
-                return new ResponseEntity<String>(ExperimentErrorMessageDTO.toJsonArrayStubWithAGStates(foundExperiments), headers, HttpStatus.OK);
-            } else if (with.equalsIgnoreCase("analysisgroupvalues")) {
-                return new ResponseEntity<String>(ExperimentErrorMessageDTO.toJsonArrayStubWithAGValues(foundExperiments), headers, HttpStatus.OK);
-            } else if (with.equalsIgnoreCase("fullobject")) {
-                return new ResponseEntity<String>(ExperimentErrorMessageDTO.toJsonArray(foundExperiments), headers, HttpStatus.OK);
-            } else if (with.equalsIgnoreCase("prettyjson")) {
-                return new ResponseEntity<String>(ExperimentErrorMessageDTO.toJsonArrayPretty(foundExperiments), headers, HttpStatus.OK);
-            } else if (with.equalsIgnoreCase("prettyjsonstub")) {
-                return new ResponseEntity<String>(ExperimentErrorMessageDTO.toJsonArrayStubPretty(foundExperiments), headers, HttpStatus.OK);
-            } else if (with.equalsIgnoreCase("stubwithprot")) {
-                return new ResponseEntity<String>(ExperimentErrorMessageDTO.toJsonArrayStubWithProt(foundExperiments), headers, HttpStatus.OK);
-            } else {
-                return new ResponseEntity<String>("ERROR: with" + with + " route is not implemented. ", headers, HttpStatus.NOT_IMPLEMENTED);
-            }
-        } else {
-            return new ResponseEntity<String>(ExperimentErrorMessageDTO.toJsonArrayStub(foundExperiments), headers, HttpStatus.OK);
-        }
-    }
-
-    @Transactional
-    @RequestMapping(params = "FindByCodeName", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<java.lang.String> jsonFindExperimentsByCodeNameEquals(
-    		@RequestParam("codeName") String codeName, 
-    		@RequestParam(value = "with", required = false) String with) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        List<Experiment> experiments = Experiment.findExperimentsByCodeNameEquals(codeName).getResultList();
-        if (with != null) {
-            if (with.equalsIgnoreCase("analysisgroups")) {
-                return new ResponseEntity<String>(Experiment.toJsonArrayStubWithAG(experiments), headers, HttpStatus.OK);
-            } else if (with.equalsIgnoreCase("fullobject")) {
-                return new ResponseEntity<String>(Experiment.toJsonArray(experiments), headers, HttpStatus.OK);
-            } else if (with.equalsIgnoreCase("prettyjson")) {
-                return new ResponseEntity<String>(Experiment.toJsonArrayPretty(experiments), headers, HttpStatus.OK);
-            } else if (with.equalsIgnoreCase("prettyjsonstub")) {
-                return new ResponseEntity<String>(Experiment.toJsonArrayStubPretty(experiments), headers, HttpStatus.OK);
-            } else {
-                return new ResponseEntity<String>(Experiment.toJsonArrayStub(experiments), headers, HttpStatus.OK);
-            }
-        } else {
-            return new ResponseEntity<String>(Experiment.toJsonArrayStub(experiments), headers, HttpStatus.OK);
-        }
-    }
-
-    @Transactional
-    @RequestMapping(value = "/experimentname/**", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<java.lang.String> jsonFindProtocolByExperimentNameEqualsRoute(HttpServletRequest request) {
-        String restOfTheUrl = (String) request.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE);
-        String experimentName = restOfTheUrl.split("experimentname\\/")[1].replaceAll("/$", "");
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(Experiment.toJsonArrayStub(Experiment.findExperimentListByExperimentNameAndIgnoredNot(experimentName)), headers, HttpStatus.OK);
-    }
-
-    @Transactional
-    @RequestMapping(params = "FindByExperimentName", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<java.lang.String> jsonFindExperimentByExperimentNameEqualsGet(@RequestParam("experimentName") String experimentName, @RequestParam(value = "with", required = false) String with, @RequestParam(value = "protocolId", required = false) Long protocolId) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        logger.debug("incoming experiment name is " + experimentName);
-        List<Experiment> experiments;
-        if (protocolId != null && protocolId != 0) {
-            experiments = Experiment.findExperimentListByExperimentNameAndProtocolIdAndIgnoredNot(experimentName, protocolId);
-        } else {
-            experiments = Experiment.findExperimentListByExperimentNameAndIgnoredNot(experimentName);
-        }
-        if (with != null) {
-            logger.debug("incoming with param is " + with);
-            if (with.equalsIgnoreCase("analysisgroups")) {
-                return new ResponseEntity<String>(Experiment.toJsonArrayStubWithAG(experiments), headers, HttpStatus.OK);
-            } else if (with.equalsIgnoreCase("fullobject")) {
-                return new ResponseEntity<String>(Experiment.toJsonArray(experiments), headers, HttpStatus.OK);
-            } else if (with.equalsIgnoreCase("prettyjson")) {
-                return new ResponseEntity<String>(Experiment.toJsonArrayPretty(experiments), headers, HttpStatus.OK);
-            } else if (with.equalsIgnoreCase("prettyjsonstub")) {
-                return new ResponseEntity<String>(Experiment.toJsonArrayStubPretty(experiments), headers, HttpStatus.OK);
-            } else {
-                return new ResponseEntity<String>(Experiment.toJsonArrayStub(experiments), headers, HttpStatus.OK);
-            }
-        } else {
-            return new ResponseEntity<String>(Experiment.toJsonArrayStub(experiments), headers, HttpStatus.OK);
-        }
-    }
-
-    @Transactional
-    @RequestMapping(params = "FindByName", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<java.lang.String> jsonFindExperimentByNameGet(@RequestParam("name") String name, @RequestParam(value = "with", required = false) String with, @RequestParam(value = "protocolId", required = false) Long protocolId) {
-    	HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        List<Experiment> experiments;
-        if (protocolId != null && protocolId != 0) {
-            experiments = Experiment.findExperimentListByExperimentNameAndProtocolIdAndIgnoredNot(name, protocolId);
-        } else {
-            experiments = Experiment.findExperimentListByExperimentNameAndIgnoredNot(name);
-        }
-        if (with != null) {
-            if (with.equalsIgnoreCase("analysisgroups")) {
-                return new ResponseEntity<String>(Experiment.toJsonArrayStubWithAG(experiments), headers, HttpStatus.OK);
-            } else if (with.equalsIgnoreCase("fullobject")) {
-                return new ResponseEntity<String>(Experiment.toJsonArray(experiments), headers, HttpStatus.OK);
-            } else if (with.equalsIgnoreCase("prettyjson")) {
-                return new ResponseEntity<String>(Experiment.toJsonArrayPretty(experiments), headers, HttpStatus.OK);
-            } else if (with.equalsIgnoreCase("prettyjsonstub")) {
-                return new ResponseEntity<String>(Experiment.toJsonArrayStubPretty(experiments), headers, HttpStatus.OK);
-            } else {
-                return new ResponseEntity<String>("ERROR: with" + with + " route is not implemented. ", headers, HttpStatus.NOT_IMPLEMENTED);
-            }
-        } else {
-            return new ResponseEntity<String>(Experiment.toJsonArrayStub(experiments), headers, HttpStatus.OK);
-        }
-    }
-
-    
-
-    @Transactional
-    @RequestMapping(value = "/protocol/{codeName}", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<java.lang.String> jsonFindExperimentsByProtocolCodeName(@PathVariable("codeName") String codeName, @RequestParam(value = "with", required = false) String with) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        List<Protocol> protocols = Protocol.findProtocolsByCodeNameEqualsAndIgnoredNot(codeName, true).getResultList();
-        if (protocols.size() == 1) {
-            return new ResponseEntity<String>(Experiment.toJsonArrayStub(Experiment.findExperimentsByProtocol(protocols.get(0)).getResultList()), headers, HttpStatus.OK);
-        } else if (protocols.size() > 1) {
-            logger.error("ERROR: multiple protocols found with the same code name");
-            return new ResponseEntity<String>("[ ]", headers, HttpStatus.CONFLICT);
-        } else {
-            logger.warn("WARN: no protocols found with the query code name");
-            return new ResponseEntity<String>("[ ]", headers, HttpStatus.NOT_FOUND);
-        }
-    }
-
-    @Transactional
-    @RequestMapping(value = "/search", method = RequestMethod.GET)
+
+		ExperimentSearchRequestDTO searchRequest = ExperimentSearchRequestDTO
+				.fromJsonToExperimentSearchRequestDTO(searchRequestJSON);
+		if (logger.isDebugEnabled())
+			logger.debug("converted json: " + searchRequest.toJson());
+		List<AnalysisGroupValueDTO> agValues = null;
+		try {
+			agValues = experimentService.getFilteredAGData(searchRequest, publicData);
+			if (logger.isDebugEnabled())
+				logger.debug("number of agvalues found: " + agValues.size());
+		} catch (Exception e) {
+			logger.error(e.toString());
+		}
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		if (agValues == null || agValues.size() == 0) {
+			return new ResponseEntity<String>("[]", headers, HttpStatus.EXPECTATION_FAILED);
+		}
+		if (format != null && format.equalsIgnoreCase("csv")) {
+			StringWriter outFile = new StringWriter();
+			ICsvBeanWriter beanWriter = null;
+			try {
+				beanWriter = new CsvBeanWriter(outFile, CsvPreference.STANDARD_PREFERENCE);
+				final String[] header = AnalysisGroupValueDTO.getColumns();
+				final CellProcessor[] processors = AnalysisGroupValueDTO.getProcessors();
+				beanWriter.writeHeader(header);
+				for (final AnalysisGroupValueDTO agValue : agValues) {
+					beanWriter.write(agValue, header, processors);
+				}
+			} catch (IOException e) {
+				e.printStackTrace();
+			} finally {
+				if (beanWriter != null) {
+					try {
+						beanWriter.close();
+						outFile.flush();
+						outFile.close();
+					} catch (IOException e) {
+						e.printStackTrace();
+					}
+				}
+			}
+			return new ResponseEntity<String>(outFile.toString(), headers, HttpStatus.OK);
+		} else {
+			return new ResponseEntity<String>(AnalysisGroupValueDTO.toJsonArray(agValues), headers, HttpStatus.OK);
+		}
+	}
+
+	@RequestMapping(method = RequestMethod.GET, value = "/full/{id}", headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<java.lang.String> showFullJson(@PathVariable("id") Long id) {
+		Experiment experiment = Experiment.findExperiment(id);
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		if (experiment == null) {
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		}
+		return new ResponseEntity<String>(experiment.toJson(), headers, HttpStatus.OK);
+	}
+
+	@RequestMapping(method = RequestMethod.GET, value = "/stub/{id}", headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> experimentBrowserSearch(@RequestParam(value="userName", required = false) String userName, @RequestParam(value="projects", required = false) List<String> projects, @RequestParam(value="q", required = true) String searchQuery) {
+	@Transactional
+	public ResponseEntity<java.lang.String> showJsonStubWith(@PathVariable("id") Long id,
+			@RequestParam(value = "with", required = false) String with) {
+		Experiment experiment = Experiment.findExperiment(id);
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		
+		if (experiment == null) {
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		}
+		if (with != null) {
+			if (with.equalsIgnoreCase("analysisgroups")) {
+				return new ResponseEntity<String>(experiment.toJsonStubWithAnalysisGroups(), headers, HttpStatus.OK);
+			} else if (with.equalsIgnoreCase("analysisgroupstates")) {
+				return new ResponseEntity<String>(experiment.toJsonStubWithAnalysisGroupStates(), headers,
+						HttpStatus.OK);
+			} else if (with.equalsIgnoreCase("analysisgroupvalues")) {
+				return new ResponseEntity<String>(experiment.toJsonStubWithAnalysisGroups(), headers, HttpStatus.OK);
+			} else if (with.equalsIgnoreCase("fullobject")) {
+				return new ResponseEntity<String>(experiment.toJson(), headers, HttpStatus.OK);
+			} else if (with.equalsIgnoreCase("prettyjson")) {
+				return new ResponseEntity<String>(experiment.toPrettyJson(), headers, HttpStatus.OK);
+			} else if (with.equalsIgnoreCase("prettyjsonstub")) {
+				return new ResponseEntity<String>(experiment.toPrettyJsonStub(), headers, HttpStatus.OK);
+			} else {
+				return new ResponseEntity<String>("ERROR: with" + with + " route is not implemented. ", headers,
+						HttpStatus.NOT_IMPLEMENTED);
+			}
+		} else {
+			return new ResponseEntity<String>(experiment.toJsonStub(), headers, HttpStatus.OK);
+		}
+	}
+
+	@RequestMapping(method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<java.lang.String> listJsonByProtocol(@RequestParam Map<String, String> requestParams) {
+		// Filter parameters supported: type, kind, name, codeName, protocolKind,
+		// protocolType, protocolName, protocolCodeName
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		Set<Experiment> result = new HashSet<Experiment>();
+
+		result = experimentService.findExperimentsByRequestMetadata(requestParams);
+
+		return new ResponseEntity<String>(Experiment.toJsonArrayStubWithProt(result), headers, HttpStatus.OK);
+	}
+
+	@RequestMapping(value = "/protocolKind/{protocolKind}", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<java.lang.String> listJsonByProtocolKind(@PathVariable("protocolKind") String protocolKind) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		List<Experiment> result = new ArrayList<Experiment>();
+		if (protocolKind != null) {
+			List<Protocol> protocols = Protocol.findProtocolsByLsKindEquals(protocolKind).getResultList();
+			for (Protocol protocol : protocols) {
+				List<Experiment> experiments = Experiment.findExperimentsByProtocol(protocol).getResultList();
+				result.addAll(experiments);
+			}
+		} else {
+			result.addAll(Experiment.findAllExperiments());
+		}
+		return new ResponseEntity<String>(Experiment.toJsonArrayStub(result), headers, HttpStatus.OK);
+	}
+
+	@Transactional
+	@RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+	public ResponseEntity<java.lang.String> deleteFromJson(@PathVariable("id") Long id,
+			@RequestParam(value = "with", required = false) String with) {
+		Experiment experiment = Experiment.findExperiment(id);
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		if (experiment == null) {
+			logger.info("Did not find the experiment before delete");
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		} else {
+			logger.info("deleting the experiment: " + id);
+			experiment.logicalDelete();
+			if (Experiment.findExperiment(id) == null || Experiment.findExperiment(id).isIgnored()) {
+				logger.info("Did not find the experiment after delete");
+				return new ResponseEntity<String>(headers, HttpStatus.OK);
+			} else {
+				logger.info("Found the experiment after delete");
+				return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
+			}
+		}
+	}
+
+	@Transactional
+	@RequestMapping(value = "/{id}/deleteChildren", method = RequestMethod.DELETE, headers = "Accept=application/json")
+	public ResponseEntity<String> deleteAnalysisGroupsByExperiment(@PathVariable("id") Long id) {
+		Experiment experiment = Experiment.findExperiment(id);
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		if (experiment == null) {
+			logger.info("Did not find the experiment before delete");
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		} else if (experimentService.deleteAnalysisGroupsByExperiment(experiment)) {
+			return new ResponseEntity<String>(headers, HttpStatus.OK);
+		} else {
+			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
+		}
+	}
+
+	@Transactional
+	@RequestMapping(value = "/codename/{codeName}", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	public ResponseEntity<java.lang.String> jsonFindExperimentsByCodeNameEqualsRoute(
+			@PathVariable("codeName") String codeName, @RequestParam(value = "with", required = false) String with) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		Experiment experiment;
+		try {
+			experiment = Experiment.findExperimentsByCodeNameEquals(codeName).getSingleResult();
+		} catch (NoResultException e) {
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		}
+		if (with != null) {
+			if (with.equalsIgnoreCase("analysisgroups")) {
+				return new ResponseEntity<String>(experiment.toJsonStubWithAnalysisGroups(), headers, HttpStatus.OK);
+			} else if (with.equalsIgnoreCase("analysisgroupstates")) {
+				return new ResponseEntity<String>(experiment.toJsonStubWithAnalysisGroupStates(), headers,
+						HttpStatus.OK);
+			} else if (with.equalsIgnoreCase("analysisgroupvalues")) {
+				return new ResponseEntity<String>(experiment.toJsonStubWithAnalysisGroupValues(), headers,
+						HttpStatus.OK);
+			} else if (with.equalsIgnoreCase("fullobject")) {
+				return new ResponseEntity<String>(experiment.toJson(), headers, HttpStatus.OK);
+			} else if (with.equalsIgnoreCase("prettyjson")) {
+				return new ResponseEntity<String>(experiment.toPrettyJson(), headers, HttpStatus.OK);
+			} else if (with.equalsIgnoreCase("prettyjsonstub")) {
+				return new ResponseEntity<String>(experiment.toPrettyJsonStub(), headers, HttpStatus.OK);
+			} else {
+				return new ResponseEntity<String>("ERROR: with" + with + " route is not implemented. ", headers,
+						HttpStatus.NOT_IMPLEMENTED);
+			}
+		} else {
+			return new ResponseEntity<String>(experiment.toJsonStub(), headers, HttpStatus.OK);
+		}
+	}
+
+	@Transactional
+	@RequestMapping(value = "/codename/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+	@ResponseBody
+	public ResponseEntity<java.lang.String> findExperimentsByCodeNames(@RequestBody List<String> codeNames,
+			@RequestParam(value = "with", required = false) String with) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		Collection<ExperimentErrorMessageDTO> foundExperiments;
+		try {
+			foundExperiments = experimentService.findExperimentsByCodeNames(codeNames);
+		} catch (NoResultException e) {
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		}
+		if (with != null) {
+			if (with.equalsIgnoreCase("analysisgroups")) {
+				return new ResponseEntity<String>(ExperimentErrorMessageDTO.toJsonArrayStubWithAG(foundExperiments),
+						headers, HttpStatus.OK);
+			} else if (with.equalsIgnoreCase("analysisgroupstates")) {
+				return new ResponseEntity<String>(
+						ExperimentErrorMessageDTO.toJsonArrayStubWithAGStates(foundExperiments), headers,
+						HttpStatus.OK);
+			} else if (with.equalsIgnoreCase("analysisgroupvalues")) {
+				return new ResponseEntity<String>(
+						ExperimentErrorMessageDTO.toJsonArrayStubWithAGValues(foundExperiments), headers,
+						HttpStatus.OK);
+			} else if (with.equalsIgnoreCase("fullobject")) {
+				return new ResponseEntity<String>(ExperimentErrorMessageDTO.toJsonArray(foundExperiments), headers,
+						HttpStatus.OK);
+			} else if (with.equalsIgnoreCase("prettyjson")) {
+				return new ResponseEntity<String>(ExperimentErrorMessageDTO.toJsonArrayPretty(foundExperiments),
+						headers, HttpStatus.OK);
+			} else if (with.equalsIgnoreCase("prettyjsonstub")) {
+				return new ResponseEntity<String>(ExperimentErrorMessageDTO.toJsonArrayStubPretty(foundExperiments),
+						headers, HttpStatus.OK);
+			} else if (with.equalsIgnoreCase("stubwithprot")) {
+				return new ResponseEntity<String>(ExperimentErrorMessageDTO.toJsonArrayStubWithProt(foundExperiments),
+						headers, HttpStatus.OK);
+			} else {
+				return new ResponseEntity<String>("ERROR: with" + with + " route is not implemented. ", headers,
+						HttpStatus.NOT_IMPLEMENTED);
+			}
+		} else {
+			return new ResponseEntity<String>(ExperimentErrorMessageDTO.toJsonArrayStub(foundExperiments), headers,
+					HttpStatus.OK);
+		}
+	}
+
+	@Transactional
+	@RequestMapping(params = "FindByCodeName", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	public ResponseEntity<java.lang.String> jsonFindExperimentsByCodeNameEquals(
+			@RequestParam("codeName") String codeName,
+			@RequestParam(value = "with", required = false) String with) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		List<Experiment> experiments = Experiment.findExperimentsByCodeNameEquals(codeName).getResultList();
+		if (with != null) {
+			if (with.equalsIgnoreCase("analysisgroups")) {
+				return new ResponseEntity<String>(Experiment.toJsonArrayStubWithAG(experiments), headers,
+						HttpStatus.OK);
+			} else if (with.equalsIgnoreCase("fullobject")) {
+				return new ResponseEntity<String>(Experiment.toJsonArray(experiments), headers, HttpStatus.OK);
+			} else if (with.equalsIgnoreCase("prettyjson")) {
+				return new ResponseEntity<String>(Experiment.toJsonArrayPretty(experiments), headers, HttpStatus.OK);
+			} else if (with.equalsIgnoreCase("prettyjsonstub")) {
+				return new ResponseEntity<String>(Experiment.toJsonArrayStubPretty(experiments), headers,
+						HttpStatus.OK);
+			} else {
+				return new ResponseEntity<String>(Experiment.toJsonArrayStub(experiments), headers, HttpStatus.OK);
+			}
+		} else {
+			return new ResponseEntity<String>(Experiment.toJsonArrayStub(experiments), headers, HttpStatus.OK);
+		}
+	}
+
+	@Transactional
+	@RequestMapping(value = "/experimentname/**", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	public ResponseEntity<java.lang.String> jsonFindProtocolByExperimentNameEqualsRoute(HttpServletRequest request) {
+		String restOfTheUrl = (String) request.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE);
+		String experimentName = restOfTheUrl.split("experimentname\\/")[1].replaceAll("/$", "");
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		return new ResponseEntity<String>(
+				Experiment.toJsonArrayStub(Experiment.findExperimentListByExperimentNameAndIgnoredNot(experimentName)),
+				headers, HttpStatus.OK);
+	}
+
+	@Transactional
+	@RequestMapping(params = "FindByExperimentName", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	public ResponseEntity<java.lang.String> jsonFindExperimentByExperimentNameEqualsGet(
+			@RequestParam("experimentName") String experimentName,
+			@RequestParam(value = "with", required = false) String with,
+			@RequestParam(value = "protocolId", required = false) Long protocolId) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		logger.debug("incoming experiment name is " + experimentName);
+		List<Experiment> experiments;
+		if (protocolId != null && protocolId != 0) {
+			experiments = Experiment.findExperimentListByExperimentNameAndProtocolIdAndIgnoredNot(experimentName,
+					protocolId);
+		} else {
+			experiments = Experiment.findExperimentListByExperimentNameAndIgnoredNot(experimentName);
+		}
+		if (with != null) {
+			logger.debug("incoming with param is " + with);
+			if (with.equalsIgnoreCase("analysisgroups")) {
+				return new ResponseEntity<String>(Experiment.toJsonArrayStubWithAG(experiments), headers,
+						HttpStatus.OK);
+			} else if (with.equalsIgnoreCase("fullobject")) {
+				return new ResponseEntity<String>(Experiment.toJsonArray(experiments), headers, HttpStatus.OK);
+			} else if (with.equalsIgnoreCase("prettyjson")) {
+				return new ResponseEntity<String>(Experiment.toJsonArrayPretty(experiments), headers, HttpStatus.OK);
+			} else if (with.equalsIgnoreCase("prettyjsonstub")) {
+				return new ResponseEntity<String>(Experiment.toJsonArrayStubPretty(experiments), headers,
+						HttpStatus.OK);
+			} else {
+				return new ResponseEntity<String>(Experiment.toJsonArrayStub(experiments), headers, HttpStatus.OK);
+			}
+		} else {
+			return new ResponseEntity<String>(Experiment.toJsonArrayStub(experiments), headers, HttpStatus.OK);
+		}
+	}
+
+	@Transactional
+	@RequestMapping(params = "FindByName", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	public ResponseEntity<java.lang.String> jsonFindExperimentByNameGet(@RequestParam("name") String name,
+			@RequestParam(value = "with", required = false) String with,
+			@RequestParam(value = "protocolId", required = false) Long protocolId) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		List<Experiment> experiments;
+		if (protocolId != null && protocolId != 0) {
+			experiments = Experiment.findExperimentListByExperimentNameAndProtocolIdAndIgnoredNot(name, protocolId);
+		} else {
+			experiments = Experiment.findExperimentListByExperimentNameAndIgnoredNot(name);
+		}
+		if (with != null) {
+			if (with.equalsIgnoreCase("analysisgroups")) {
+				return new ResponseEntity<String>(Experiment.toJsonArrayStubWithAG(experiments), headers,
+						HttpStatus.OK);
+			} else if (with.equalsIgnoreCase("fullobject")) {
+				return new ResponseEntity<String>(Experiment.toJsonArray(experiments), headers, HttpStatus.OK);
+			} else if (with.equalsIgnoreCase("prettyjson")) {
+				return new ResponseEntity<String>(Experiment.toJsonArrayPretty(experiments), headers, HttpStatus.OK);
+			} else if (with.equalsIgnoreCase("prettyjsonstub")) {
+				return new ResponseEntity<String>(Experiment.toJsonArrayStubPretty(experiments), headers,
+						HttpStatus.OK);
+			} else {
+				return new ResponseEntity<String>("ERROR: with" + with + " route is not implemented. ", headers,
+						HttpStatus.NOT_IMPLEMENTED);
+			}
+		} else {
+			return new ResponseEntity<String>(Experiment.toJsonArrayStub(experiments), headers, HttpStatus.OK);
+		}
+	}
+
+	@Transactional
+	@RequestMapping(value = "/protocol/{codeName}", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	public ResponseEntity<java.lang.String> jsonFindExperimentsByProtocolCodeName(
+			@PathVariable("codeName") String codeName, @RequestParam(value = "with", required = false) String with) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		List<Protocol> protocols = Protocol.findProtocolsByCodeNameEqualsAndIgnoredNot(codeName, true).getResultList();
+		if (protocols.size() == 1) {
+			return new ResponseEntity<String>(
+					Experiment.toJsonArrayStub(Experiment.findExperimentsByProtocol(protocols.get(0)).getResultList()),
+					headers, HttpStatus.OK);
+		} else if (protocols.size() > 1) {
+			logger.error("ERROR: multiple protocols found with the same code name");
+			return new ResponseEntity<String>("[ ]", headers, HttpStatus.CONFLICT);
+		} else {
+			logger.warn("WARN: no protocols found with the query code name");
+			return new ResponseEntity<String>("[ ]", headers, HttpStatus.NOT_FOUND);
+		}
+	}
+
+	@Transactional
+	@RequestMapping(value = "/search", method = RequestMethod.GET)
+	@ResponseBody
+	public ResponseEntity<String> experimentBrowserSearch(
+			@RequestParam(value = "userName", required = false) String userName,
+			@RequestParam(value = "projects", required = false) List<String> projects,
+			@RequestParam(value = "q", required = true) String searchQuery) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+
 		logger.debug("############# the search query string is: " + searchQuery);
-		
+
 		try {
 			String result;
-			if (userName == null && projects == null){
+			if (userName == null && projects == null) {
 				logger.info("--------- accesing experiment search without userName ---------------");
-				result = Experiment.toJsonArrayStubWithProt(experimentService.findExperimentsByGenericMetaDataSearch(searchQuery));
-				return new ResponseEntity<String>(result, headers, HttpStatus.OK);				
+				result = Experiment
+						.toJsonArrayStubWithProt(experimentService.findExperimentsByGenericMetaDataSearch(searchQuery));
+				return new ResponseEntity<String>(result, headers, HttpStatus.OK);
 			} else if (projects == null) {
-				result = Experiment.toJsonArrayStubWithProt(experimentService.findExperimentsByGenericMetaDataSearch(searchQuery, userName));
+				result = Experiment.toJsonArrayStubWithProt(
+						experimentService.findExperimentsByGenericMetaDataSearch(searchQuery, userName));
 				return new ResponseEntity<String>(result, headers, HttpStatus.OK);
 			} else {
-				result = Experiment.toJsonArrayStubWithProt(experimentService.findExperimentsByGenericMetaDataSearch(searchQuery, projects));
+				result = Experiment.toJsonArrayStubWithProt(
+						experimentService.findExperimentsByGenericMetaDataSearch(searchQuery, projects));
 				return new ResponseEntity<String>(result, headers, HttpStatus.OK);
 			}
-		} catch(Exception e){
-			logger.error("Caught error in experiment search",e);
+		} catch (Exception e) {
+			logger.error("Caught error in experiment search", e);
 			return new ResponseEntity<String>(e.toString(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
-    
-    @RequestMapping(params = "find=ByMetadata", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    @Transactional
-    public ResponseEntity<java.lang.String> listJsonByMetadata(@RequestParam Map<String,String> requestParams) {
-//example url: http://localhost:8080/acas/api/v1/experiments?protocolName=PAMPA%20Buffer%20A&protocolType=default&protocolKind=default&protocolCodeName=PROT-00000001&name=Buffer%20A%20Test01&type=default&kind=default&codeName=EXPT-00000001
-    	//Filter parameters supported: type, kind, name, codeName
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        Set<Experiment> result = new HashSet<Experiment>();
-        
-        result = experimentService.findExperimentsByRequestMetadata(requestParams);
-        
-        return new ResponseEntity<String>(Experiment.toJsonArrayStubWithProt(result), headers, HttpStatus.OK);
-    }
-    
-    @RequestMapping(value = "/getCodeNameFromNameRequest", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> getCodeNameFromName(@RequestBody String json, 
-    		@RequestParam(value = "experimentType", required = true) String experimentType, 
-    		@RequestParam(value = "experimentKind", required = true) String experimentKind, 
-    		@RequestParam(value = "labelType", required = false) String labelType, 
-    		@RequestParam(value = "labelKind", required = false) String labelKind) {
-    	PreferredNameRequestDTO requestDTO = PreferredNameRequestDTO.fromJsonToPreferredNameRequestDTO(json);
-        logger.info("getCodeNameFromNameRequest incoming json: " + requestDTO.toJson());
-        PreferredNameResultsDTO results = experimentService.getCodeNameFromName(experimentType, experimentKind, labelType, labelKind, requestDTO);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(results.toJson(), headers, HttpStatus.OK);
-    }
-    
-    @Transactional
-    @RequestMapping(value = "/getExperimentCodesByDateValueComparison", method = RequestMethod.POST)
+	@RequestMapping(params = "find=ByMetadata", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<java.lang.String> listJsonByMetadata(@RequestParam Map<String, String> requestParams) {
+		// example url:
+		// http://localhost:8080/acas/api/v1/experiments?protocolName=PAMPA%20Buffer%20A&protocolType=default&protocolKind=default&protocolCodeName=PROT-00000001&name=Buffer%20A%20Test01&type=default&kind=default&codeName=EXPT-00000001
+		// Filter parameters supported: type, kind, name, codeName
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		Set<Experiment> result = new HashSet<Experiment>();
+
+		result = experimentService.findExperimentsByRequestMetadata(requestParams);
+
+		return new ResponseEntity<String>(Experiment.toJsonArrayStubWithProt(result), headers, HttpStatus.OK);
+	}
+
+	@RequestMapping(value = "/getCodeNameFromNameRequest", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<java.lang.String> getCodeNameFromName(@RequestBody String json,
+			@RequestParam(value = "experimentType", required = true) String experimentType,
+			@RequestParam(value = "experimentKind", required = true) String experimentKind,
+			@RequestParam(value = "labelType", required = false) String labelType,
+			@RequestParam(value = "labelKind", required = false) String labelKind) {
+		PreferredNameRequestDTO requestDTO = PreferredNameRequestDTO.fromJsonToPreferredNameRequestDTO(json);
+		logger.info("getCodeNameFromNameRequest incoming json: " + requestDTO.toJson());
+		PreferredNameResultsDTO results = experimentService.getCodeNameFromName(experimentType, experimentKind,
+				labelType, labelKind, requestDTO);
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		return new ResponseEntity<String>(results.toJson(), headers, HttpStatus.OK);
+	}
+
+	@Transactional
+	@RequestMapping(value = "/getExperimentCodesByDateValueComparison", method = RequestMethod.POST)
 	@ResponseBody
 	public ResponseEntity<String> getExperimentCodesByDateValueComparison(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
@@ -1625,9 +1727,10 @@ public ResponseEntity<String> getExperimentCodesByDateValueComparison(@RequestBo
 		DateValueComparisonRequest requestDTO = DateValueComparisonRequest.fromJsonToDateValueComparisonRequest(json);
 		try {
 			Collection<String> results = experimentService.getExperimentCodesByDateValueComparison(requestDTO);
-			return new ResponseEntity<String>(new JSONSerializer().exclude("*.class").serialize(results), headers, HttpStatus.OK);
-		} catch(Exception e){
-			logger.error("Caught error in getExperimentCodesByDateValueComparison",e);
+			return new ResponseEntity<String>(new JSONSerializer().exclude("*.class").serialize(results), headers,
+					HttpStatus.OK);
+		} catch (Exception e) {
+			logger.error("Caught error in getExperimentCodesByDateValueComparison", e);
 			return new ResponseEntity<String>(e.toString(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
diff --git a/src/main/java/com/labsynch/labseer/api/ApiExperimentLabelController.java b/src/main/java/com/labsynch/labseer/api/ApiExperimentLabelController.java
index 11b0bfd4a..1d1c5fead 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiExperimentLabelController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiExperimentLabelController.java
@@ -18,7 +18,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-
 @Transactional
 @RequestMapping("api/v1/experimentlabels")
 @Controller
@@ -26,22 +25,30 @@
 public class ApiExperimentLabelController {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiExperimentLabelController.class);
-	
+
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
-	
+
 	@RequestMapping(params = "find=ByLabelTextLikeAndLabelTypeAndKindEqualsAndPreferredNotAndIgnoredNot", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<java.lang.String> jsonFindExperimentLabelsByLabelTextLikeAndLabelTypeAndKindEqualsAndPreferredNotAndIgnoredNot(@RequestParam("labelText") String labelText, @RequestParam("labelTypeAndKind") String labelTypeAndKind, @RequestParam(value = "preferred", required = false) boolean preferred, @RequestParam(value = "ignored", required = false) boolean ignored) {
-      HttpHeaders headers = new HttpHeaders();
-      headers.add("Content-Type", "application/json; charset=utf-8");
-      return new ResponseEntity<String>(ExperimentLabel.toJsonArray(ExperimentLabel.findExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(labelText, labelTypeAndKind, preferred, ignored).getResultList()), headers, HttpStatus.OK);
+	public ResponseEntity<java.lang.String> jsonFindExperimentLabelsByLabelTextLikeAndLabelTypeAndKindEqualsAndPreferredNotAndIgnoredNot(
+			@RequestParam("labelText") String labelText, @RequestParam("labelTypeAndKind") String labelTypeAndKind,
+			@RequestParam(value = "preferred", required = false) boolean preferred,
+			@RequestParam(value = "ignored", required = false) boolean ignored) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		return new ResponseEntity<String>(
+				ExperimentLabel.toJsonArray(ExperimentLabel
+						.findExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(
+								labelText, labelTypeAndKind, preferred, ignored)
+						.getResultList()),
+				headers, HttpStatus.OK);
 	}
 
 	@Transactional
 	@RequestMapping(params = "FindByName", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<java.lang.String> jsonFindExperimentLabelByNameGet(@RequestParam("name") String name, 
+	public ResponseEntity<java.lang.String> jsonFindExperimentLabelByNameGet(@RequestParam("name") String name,
 			@RequestParam(value = "protocolId", required = false) Long protocolId) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
diff --git a/src/main/java/com/labsynch/labseer/api/ApiExportController.java b/src/main/java/com/labsynch/labseer/api/ApiExportController.java
index 508aaf830..9722b5e62 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiExportController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiExportController.java
@@ -16,32 +16,33 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-@RequestMapping(value = {"/api/v1/export"})
+@RequestMapping(value = { "/api/v1/export" })
 @Controller
 public class ApiExportController {
-	
+
 	Logger logger = LoggerFactory.getLogger(ApiExportController.class);
 
 	@Autowired
 	private ExportService exportService;
-	
+
 	@RequestMapping(value = "/searchResults", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> molconvert(@RequestBody String json){
-		if (logger.isDebugEnabled()) logger.debug("incoming json from molconvert: " + json);
+	public ResponseEntity<String> molconvert(@RequestBody String json) {
+		if (logger.isDebugEnabled())
+			logger.debug("incoming json from molconvert: " + json);
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		SearchResultExportRequestDTO searchResultExportRequestDTO = SearchResultExportRequestDTO.fromJsonToSearchResultExportRequestDTO(json);
+		SearchResultExportRequestDTO searchResultExportRequestDTO = SearchResultExportRequestDTO
+				.fromJsonToSearchResultExportRequestDTO(json);
 		ExportResultDTO resultDTO;
 		try {
-			 resultDTO = exportService.exportSearchResults(searchResultExportRequestDTO);
+			resultDTO = exportService.exportSearchResults(searchResultExportRequestDTO);
 		} catch (Exception e) {
-			logger.error("Caught error trying to export search results",e);
+			logger.error("Caught error trying to export search results", e);
 			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 
 		return new ResponseEntity<String>(resultDTO.toJson(), headers, HttpStatus.OK);
 	}
-	
 
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiFileSaveController.java b/src/main/java/com/labsynch/labseer/api/ApiFileSaveController.java
index bf8efae23..07e414e93 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiFileSaveController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiFileSaveController.java
@@ -30,12 +30,12 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
-@RequestMapping({"/api/v1/filesave", "/api/v1/MultipleFilePicker"})
+@RequestMapping({ "/api/v1/filesave", "/api/v1/MultipleFilePicker" })
 @Controller
 public class ApiFileSaveController {
 
-	//simplified controller. This will just save the file to the directory path
-	//does not save the database info
+	// simplified controller. This will just save the file to the directory path
+	// does not save the database info
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiFileSaveController.class);
 
@@ -43,7 +43,7 @@ public class ApiFileSaveController {
 	public HttpEntity<String> create(@RequestParam("description[]") List<String> description,
 			@RequestParam("subdir") String subdir,
 			@RequestParam("ie") boolean ie,
-			@RequestParam("file[]")  List<MultipartFile> file) {
+			@RequestParam("file[]") List<MultipartFile> file) {
 
 		logger.debug("receiving the post file");
 
@@ -58,33 +58,33 @@ public HttpEntity<String> create(@RequestParam("description[]") List<String> des
 
 		List<FileSaveReturnDTO> fileSaveArray = fileSave.saveFile();
 		logger.debug(FileSaveReturnDTO.toJsonArray(fileSaveArray));
-		HttpHeaders headers= new HttpHeaders();
+		HttpHeaders headers = new HttpHeaders();
 		headers.setContentType(MediaType.TEXT_HTML);
 		headers.add("Access-Control-Allow-Origin", "*");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 		return new ResponseEntity<String>(FileSaveReturnDTO.toJsonArray(fileSaveArray), headers, HttpStatus.OK);
 	}
 
 	@RequestMapping(value = "/getFile", method = RequestMethod.GET)
-	public void getfile(	@RequestParam("fileUrl") String fileUrl,
+	public void getfile(@RequestParam("fileUrl") String fileUrl,
 			HttpServletResponse response,
 			Model model) {
-		
+
 		logger.debug("raw query url: " + fileUrl);
 
-//      removing hack that was required due to Node pipe error. 
-//		fileUrl = fileUrl.replace("/", File.separator);
-//		logger.debug("replacing with File.separator   " + File.separator);
-//		logger.debug("modified query url: " + fileUrl);
+		// removing hack that was required due to Node pipe error.
+		// fileUrl = fileUrl.replace("/", File.separator);
+		// logger.debug("replacing with File.separator " + File.separator);
+		// logger.debug("modified query url: " + fileUrl);
 
-		
-		String  searchFileUrl = "getFile?fileUrl=" + fileUrl;  	// this is an ugly hack -- we should clean up this code
+		String searchFileUrl = "getFile?fileUrl=" + fileUrl; // this is an ugly hack -- we should clean up this code
 																// better to use the fileList id as a handle
 
-		// It would be better to get the content type from the database instead of from the file (performance)
+		// It would be better to get the content type from the database instead of from
+		// the file (performance)
 		// However, I am concerned about getting the info by the fileUrl -- is it unique
 		// prefer to get the unique ID to work with
 
@@ -92,7 +92,7 @@ public void getfile(	@RequestParam("fileUrl") String fileUrl,
 		FileInputStream fis = null;
 		BufferedInputStream bis = null;
 		String fileName = readFile.getName();
-		
+
 		String fileType = MimeTypeUtil.getContentTypeFromExtension(fileName);
 		logger.debug("Incoming file url: " + fileUrl);
 		logger.debug("here is the file name from the file itself: " + fileName);
@@ -100,19 +100,19 @@ public void getfile(	@RequestParam("fileUrl") String fileUrl,
 
 		try {
 			response.setHeader("Content-Disposition", "inline;filename=\"" + fileName + "\"");
-//			response.setHeader("Cache-Control","no-store, no-cache, must-revalidate");
-//			response.setHeader("Pragma","no-cache");
-			
+			// response.setHeader("Cache-Control","no-store, no-cache, must-revalidate");
+			// response.setHeader("Pragma","no-cache");
+
 			String mimeType = null;
 
-			if (fileType==null){
+			if (fileType == null) {
 				logger.debug("file extension is not a known type");
 				List<FileList> fileLists = FileList.findFileListsByUrlEquals(searchFileUrl).getResultList();
 				FileList fileList = null;
 				int numberOfFiles = fileLists.size();
 				logger.debug("number of files found with the same url: " + numberOfFiles);
-				if (numberOfFiles > 0){
-					fileList = fileLists.get(numberOfFiles-1);  // just get a single element - the most recent file
+				if (numberOfFiles > 0) {
+					fileList = fileLists.get(numberOfFiles - 1); // just get a single element - the most recent file
 				} else {
 					logger.error("did not find any files for the given url " + searchFileUrl);
 
@@ -124,7 +124,7 @@ public void getfile(	@RequestParam("fileUrl") String fileUrl,
 				mimeType = fileType;
 			}
 			logger.debug("the mime type for the file is " + mimeType);
-			
+
 			response.setContentType(mimeType);
 
 			OutputStream out = response.getOutputStream();
@@ -132,10 +132,9 @@ public void getfile(	@RequestParam("fileUrl") String fileUrl,
 			logger.debug("reading the file");
 			fis = new FileInputStream(readFile);
 			bis = new BufferedInputStream(fis);
-			IOUtils.copy( bis, out);
+			IOUtils.copy(bis, out);
 			out.flush();
 
-
 		} catch (IOException e) {
 			e.printStackTrace();
 		} catch (Exception e) {
@@ -143,9 +142,8 @@ public void getfile(	@RequestParam("fileUrl") String fileUrl,
 		}
 	}
 
-
 	@RequestMapping(value = "/showSavedFile/{id}", method = RequestMethod.GET)
-	public String showdoc(	@PathVariable("id") Long id,
+	public String showdoc(@PathVariable("id") Long id,
 			HttpServletResponse response,
 			Model model) {
 
@@ -156,17 +154,16 @@ public String showdoc(	@PathVariable("id") Long id,
 		BufferedInputStream bis = null;
 
 		try {
-			response.setHeader("Content-Disposition", "inline;filename=\"" +fileList.getFileName()+ "\"");
+			response.setHeader("Content-Disposition", "inline;filename=\"" + fileList.getFileName() + "\"");
 			OutputStream out = response.getOutputStream();
 			response.setContentType(fileList.getType());
 
 			fis = new FileInputStream(readFile);
 			bis = new BufferedInputStream(fis);
 
-			IOUtils.copy( bis, out);
+			IOUtils.copy(bis, out);
 			out.flush();
 
-
 		} catch (IOException e) {
 			e.printStackTrace();
 		} catch (Exception e) {
diff --git a/src/main/java/com/labsynch/labseer/api/ApiFileTypeController.java b/src/main/java/com/labsynch/labseer/api/ApiFileTypeController.java
index 177f0861b..6f6005010 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiFileTypeController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiFileTypeController.java
@@ -1,4 +1,5 @@
 package com.labsynch.labseer.api;
+
 import com.labsynch.labseer.domain.FileType;
 import com.labsynch.labseer.utils.PropertiesUtilService;
 
@@ -11,43 +12,44 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-@RequestMapping(value = {"/api/v1/fileTypes"})
+@RequestMapping(value = { "/api/v1/fileTypes" })
 @Controller
 public class ApiFileTypeController {
-	
+
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
 
 	@RequestMapping(headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/text; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Type");
-        headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
+	@ResponseBody
+	public ResponseEntity<String> listJson() {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/text; charset=utf-8");
+		headers.add("Access-Control-Allow-Headers", "Content-Type");
+		headers.add("Access-Control-Allow-Origin", "*");
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 
-		if (propertiesUtilService.getOrderSelectLists()){
-	        return new ResponseEntity<String>(FileType.toJsonArray(FileType.findAllFileTypes("name", "ASC")), headers, HttpStatus.OK);
+		if (propertiesUtilService.getOrderSelectLists()) {
+			return new ResponseEntity<String>(FileType.toJsonArray(FileType.findAllFileTypes("name", "ASC")), headers,
+					HttpStatus.OK);
 		} else {
-	        return new ResponseEntity<String>(FileType.toJsonArray(FileType.findAllFileTypes()), headers, HttpStatus.OK);
+			return new ResponseEntity<String>(FileType.toJsonArray(FileType.findAllFileTypes()), headers,
+					HttpStatus.OK);
 		}
-		
-    }
-	
+
+	}
+
 	@RequestMapping(method = RequestMethod.OPTIONS)
-    public ResponseEntity<String> getIsotopeOptions() {
-        HttpHeaders headers= new HttpHeaders();
-        headers.add("Content-Type", "application/text");
-        headers.add("Access-Control-Allow-Headers", "Content-Type");
-        headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
+	public ResponseEntity<String> getIsotopeOptions() {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/text");
+		headers.add("Access-Control-Allow-Headers", "Content-Type");
+		headers.add("Access-Control-Allow-Origin", "*");
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
+		return new ResponseEntity<String>(headers, HttpStatus.OK);
 	}
 
-    
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiIsotopeController.java b/src/main/java/com/labsynch/labseer/api/ApiIsotopeController.java
index a99e3e8b0..a53499c3b 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiIsotopeController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiIsotopeController.java
@@ -19,10 +19,10 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-@RequestMapping(value = {"/api/v1/isotopes"})
+@RequestMapping(value = { "/api/v1/isotopes" })
 @Controller
 public class ApiIsotopeController {
-	
+
     private static final Logger logger = LoggerFactory.getLogger(ApiIsotopeController.class);
 
     @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
@@ -33,8 +33,8 @@ public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
         headers.add("Content-Type", "application/text; charset=utf-8");
         headers.add("Access-Control-Allow-Origin", "*");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
+        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+        headers.add("Pragma", "no-cache"); // HTTP 1.0
         headers.setExpires(0); // Expire the cache
         if (isotope == null) {
             return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
@@ -49,8 +49,8 @@ public ResponseEntity<String> listJson() {
         headers.add("Content-Type", "application/text; charset=utf-8");
         headers.add("Access-Control-Allow-Origin", "*");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
+        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+        headers.add("Pragma", "no-cache"); // HTTP 1.0
         headers.setExpires(0); // Expire the cache
         return new ResponseEntity<String>(Isotope.toJsonArray(Isotope.findAllIsotopes()), headers, HttpStatus.OK);
     }
@@ -158,8 +158,8 @@ public ResponseEntity<String> getIsotopeOptions() {
         headers.add("Content-Type", "application/text");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
         headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
+        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+        headers.add("Pragma", "no-cache"); // HTTP 1.0
         headers.setExpires(0); // Expire the cache
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiItxContainerContainerController.java b/src/main/java/com/labsynch/labseer/api/ApiItxContainerContainerController.java
index e76981ace..dfbb15ba9 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiItxContainerContainerController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiItxContainerContainerController.java
@@ -68,44 +68,51 @@ public ResponseEntity<java.lang.String> createFromJson(@RequestBody ItxContainer
 
     @Transactional
     @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> createFromLsJsonArray(@RequestBody List<ItxContainerContainer> itxContainerContainers) {
-        Collection<ItxContainerContainer> savedItxContainerContainers = itxContainerContainerService.saveLsItxContainers(itxContainerContainers);
+    public ResponseEntity<java.lang.String> createFromLsJsonArray(
+            @RequestBody List<ItxContainerContainer> itxContainerContainers) {
+        Collection<ItxContainerContainer> savedItxContainerContainers = itxContainerContainerService
+                .saveLsItxContainers(itxContainerContainers);
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-        return new ResponseEntity<String>(ItxContainerContainer.toJsonArray(savedItxContainerContainers), headers, HttpStatus.CREATED);
+        return new ResponseEntity<String>(ItxContainerContainer.toJsonArray(savedItxContainerContainers), headers,
+                HttpStatus.CREATED);
     }
 
     @Transactional
-    @RequestMapping(value = { "","/", "/{id}" }, method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = { "", "/", "/{id}" }, method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateFromJson(@RequestBody String json) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
         ItxContainerContainer itxContainerContainer = ItxContainerContainer.fromJsonToItxContainerContainer(json);
         ItxContainerContainer updatedItxContainerContainer = null;
-        try{
-			updatedItxContainerContainer = itxContainerContainerService.updateItxContainerContainer(itxContainerContainer);
-	        return new ResponseEntity<String>(updatedItxContainerContainer.toJson(), headers, HttpStatus.OK);
+        try {
+            updatedItxContainerContainer = itxContainerContainerService
+                    .updateItxContainerContainer(itxContainerContainer);
+            return new ResponseEntity<String>(updatedItxContainerContainer.toJson(), headers, HttpStatus.OK);
         } catch (Exception e) {
-			logger.error("Caught error updating ItxContainerContainer from JSON",e);
-			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
+            logger.error("Caught error updating ItxContainerContainer from JSON", e);
+            return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
-    
+
     @RequestMapping(value = "/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateFromJsonArray(@RequestBody String json) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
         Collection<ItxContainerContainer> updatedItxContainerContainers = new HashSet<ItxContainerContainer>();
-        try{
-            for (ItxContainerContainer itxContainerContainer: ItxContainerContainer.fromJsonArrayToItxContainerContainers(json)) {
-            	ItxContainerContainer updatedItxContainerContainer = itxContainerContainerService.updateItxContainerContainer(itxContainerContainer);
-            	updatedItxContainerContainers.add(updatedItxContainerContainer);
+        try {
+            for (ItxContainerContainer itxContainerContainer : ItxContainerContainer
+                    .fromJsonArrayToItxContainerContainers(json)) {
+                ItxContainerContainer updatedItxContainerContainer = itxContainerContainerService
+                        .updateItxContainerContainer(itxContainerContainer);
+                updatedItxContainerContainers.add(updatedItxContainerContainer);
             }
-	        return new ResponseEntity<String>(ItxContainerContainer.toJsonArray(updatedItxContainerContainers), headers, HttpStatus.OK);
+            return new ResponseEntity<String>(ItxContainerContainer.toJsonArray(updatedItxContainerContainers), headers,
+                    HttpStatus.OK);
         } catch (Exception e) {
-			logger.error("Caught error updating ItxContainerContainers from JSON",e);
-			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
-		}
+            logger.error("Caught error updating ItxContainerContainers from JSON", e);
+            return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
+        }
     }
 
     @Transactional
diff --git a/src/main/java/com/labsynch/labseer/api/ApiItxContainerContainerValueController.java b/src/main/java/com/labsynch/labseer/api/ApiItxContainerContainerValueController.java
index a77195db2..9966c6e27 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiItxContainerContainerValueController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiItxContainerContainerValueController.java
@@ -30,182 +30,191 @@
 @Transactional
 public class ApiItxContainerContainerValueController {
 
-  private static final Logger logger = LoggerFactory.getLogger(ApiItxContainerContainerValueController.class);
-
-  @Autowired
-  private PropertiesUtilService propertiesUtilService;
-
-  @Transactional
-  @RequestMapping(value = "/{id}", headers = "Accept=application/json")
-  @ResponseBody
-  public ResponseEntity<java.lang.String> showJson(@PathVariable("id") Long id) {
-      ItxContainerContainerValue itxContainerContainerValue = ItxContainerContainerValue.findItxContainerContainerValue(id);
-      HttpHeaders headers = new HttpHeaders();
-      headers.add("Content-Type", "application/json; charset=utf-8");
-      if (itxContainerContainerValue == null) {
-          return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-      }
-      return new ResponseEntity<String>(itxContainerContainerValue.toJson(), headers, HttpStatus.OK);
-  }
-
-  @Transactional
-  @RequestMapping(headers = "Accept=application/json")
-  @ResponseBody
-  public ResponseEntity<java.lang.String> listJson() {
-      HttpHeaders headers = new HttpHeaders();
-      headers.add("Content-Type", "application/json; charset=utf-8");
-      List<ItxContainerContainerValue> result = ItxContainerContainerValue.findAllItxContainerContainerValues();
-      return new ResponseEntity<String>(ItxContainerContainerValue.toJsonArray(result), headers, HttpStatus.OK);
-  }
-
-  @Transactional
-  @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-  public ResponseEntity<java.lang.String> createFromJson(@RequestBody String json) {
-      ItxContainerContainerValue itxContainerContainerValue = ItxContainerContainerValue.fromJsonToItxContainerContainerValue(json);
-      itxContainerContainerValue.persist();
-      HttpHeaders headers = new HttpHeaders();
-      headers.add("Content-Type", "application/json");
-      return new ResponseEntity<String>(itxContainerContainerValue.toJson(), headers, HttpStatus.CREATED);
-  }
-
-  @Transactional
-  @RequestMapping(value = "/jsonFile", method = RequestMethod.POST, headers = "Accept=text/plain")
-  public ResponseEntity<java.lang.String> createFromJsonFile(@RequestBody String jsonFile) {
-      HttpHeaders headers = new HttpHeaders();
-      headers.add("Content-Type", "application/json");
-      int batchSize = propertiesUtilService.getBatchSize();
-      int i = 0;
-      logger.debug("jsonFile is : " + jsonFile);
-      try {
-          BufferedReader br = new BufferedReader(new FileReader(jsonFile));
-          JSONTokener jsonTokens = new JSONTokener(br);
-          Object token;
-          char delimiter;
-          char END_OF_ARRAY = ']';
-          while (jsonTokens.more()) {
-              delimiter = jsonTokens.nextClean();
-              logger.debug("delimiter is : " + delimiter);
-              if (delimiter != END_OF_ARRAY) {
-                  token = jsonTokens.nextValue();
-                  ItxContainerContainerValue itxContainerContainerValue = ItxContainerContainerValue.fromJsonToItxContainerContainerValue(token.toString());
-                  itxContainerContainerValue.persist();
-                  if (i % batchSize == 0) {
-                      itxContainerContainerValue.flush();
-                      itxContainerContainerValue.clear();
-                  }
-                  i++;
-              } else {
-                  break;
-              }
-          }
-      } catch (Exception e) {
-          logger.error("ERROR: " + e);
-          return new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST);
-      }
-      return new ResponseEntity<String>("[]", headers, HttpStatus.CREATED);
-  }
-
-  @Transactional
-  @RequestMapping(value = "/jsonArrayParseOld", method = RequestMethod.POST, headers = "Accept=application/json")
-  public ResponseEntity<java.lang.String> createFromJsonArrayParse(@RequestBody String json) {
-      HttpHeaders headers = new HttpHeaders();
-      headers.add("Content-Type", "application/json");
-      int batchSize = propertiesUtilService.getBatchSize();
-      int i = 0;
-      try {
-          JSONTokener jsonTokens = new JSONTokener(json);
-          Object token;
-          char delimiter;
-          char END_OF_ARRAY = ']';
-          while (jsonTokens.more()) {
-              delimiter = jsonTokens.nextClean();
-              logger.debug("delimiter is : " + delimiter);
-              if (delimiter != END_OF_ARRAY) {
-                  token = jsonTokens.nextValue();
-                  ItxContainerContainerValue itxContainerContainerValue = ItxContainerContainerValue.fromJsonToItxContainerContainerValue(token.toString());
-                  itxContainerContainerValue.persist();
-                  if (i % batchSize == 0) {
-                      itxContainerContainerValue.flush();
-                      itxContainerContainerValue.clear();
-                  }
-                  i++;
-              } else {
-                  break;
-              }
-          }
-      } catch (Exception e) {
-          logger.error("ERROR: " + e);
-          return new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST);
-      }
-      return new ResponseEntity<String>("[]", headers, HttpStatus.CREATED);
-  }
-
-  @Transactional
-  @RequestMapping(value = { "/jsonArray", "/jsonArrayParse" }, method = RequestMethod.POST, headers = "Accept=application/json")
-  public ResponseEntity<java.lang.String> createFromJsonArray(@RequestBody String json) {
-      HttpHeaders headers = new HttpHeaders();
-      headers.add("Content-Type", "application/json");
-      int batchSize = propertiesUtilService.getBatchSize();
-      int i = 0;
-      BufferedReader br = null;
-      StringReader sr = null;
-      try {
-          sr = new StringReader(json);
-          br = new BufferedReader(sr);
-          for (ItxContainerContainerValue itxContainerContainerValue : ItxContainerContainerValue.fromJsonArrayToItxContainerContainerValues(br)) {
-              itxContainerContainerValue.persist();
-              if (i % batchSize == 0) {
-                  itxContainerContainerValue.flush();
-                  itxContainerContainerValue.clear();
-              }
-              i++;
-          }
-      } catch (Exception e) {
-          logger.error("ERROR: " + e);
-          return new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST);
-      } finally {
-          IOUtils.closeQuietly(sr);
-          IOUtils.closeQuietly(br);
-      }
-      return new ResponseEntity<String>("[]", headers, HttpStatus.CREATED);
-  }
-
-  @Transactional
-  @RequestMapping(value = { "/", "/{id}" }, method = RequestMethod.PUT, headers = "Accept=application/json")
-  public ResponseEntity<java.lang.String> updateFromJson(@RequestBody String json) {
-      HttpHeaders headers = new HttpHeaders();
-      headers.add("Content-Type", "application/json");
-      ItxContainerContainerValue itxContainerContainerValue = ItxContainerContainerValue.fromJsonToItxContainerContainerValue(json);
-      if (itxContainerContainerValue.merge() == null) {
-          return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-      }
-      return new ResponseEntity<String>(headers, HttpStatus.OK);
-  }
-
-  @Transactional
-  @RequestMapping(value = "/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-  public ResponseEntity<java.lang.String> updateFromJsonArray(@RequestBody String json) {
-      HttpHeaders headers = new HttpHeaders();
-      headers.add("Content-Type", "application/json");
-      for (ItxContainerContainerValue itxContainerContainerValue : ItxContainerContainerValue.fromJsonArrayToItxContainerContainerValues(json)) {
-          if (itxContainerContainerValue.merge() == null) {
-              return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-          }
-      }
-      return new ResponseEntity<String>(headers, HttpStatus.OK);
-  }
-
-  @Transactional
-  @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-  public ResponseEntity<java.lang.String> deleteFromJson(@PathVariable("id") Long id) {
-      ItxContainerContainerValue itxContainerContainerValue = ItxContainerContainerValue.findItxContainerContainerValue(id);
-      HttpHeaders headers = new HttpHeaders();
-      headers.add("Content-Type", "application/json");
-      if (itxContainerContainerValue == null) {
-          return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-      }
-      itxContainerContainerValue.remove();
-      return new ResponseEntity<String>(headers, HttpStatus.OK);
-  }
-	
+    private static final Logger logger = LoggerFactory.getLogger(ApiItxContainerContainerValueController.class);
+
+    @Autowired
+    private PropertiesUtilService propertiesUtilService;
+
+    @Transactional
+    @RequestMapping(value = "/{id}", headers = "Accept=application/json")
+    @ResponseBody
+    public ResponseEntity<java.lang.String> showJson(@PathVariable("id") Long id) {
+        ItxContainerContainerValue itxContainerContainerValue = ItxContainerContainerValue
+                .findItxContainerContainerValue(id);
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Type", "application/json; charset=utf-8");
+        if (itxContainerContainerValue == null) {
+            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+        }
+        return new ResponseEntity<String>(itxContainerContainerValue.toJson(), headers, HttpStatus.OK);
+    }
+
+    @Transactional
+    @RequestMapping(headers = "Accept=application/json")
+    @ResponseBody
+    public ResponseEntity<java.lang.String> listJson() {
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Type", "application/json; charset=utf-8");
+        List<ItxContainerContainerValue> result = ItxContainerContainerValue.findAllItxContainerContainerValues();
+        return new ResponseEntity<String>(ItxContainerContainerValue.toJsonArray(result), headers, HttpStatus.OK);
+    }
+
+    @Transactional
+    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
+    public ResponseEntity<java.lang.String> createFromJson(@RequestBody String json) {
+        ItxContainerContainerValue itxContainerContainerValue = ItxContainerContainerValue
+                .fromJsonToItxContainerContainerValue(json);
+        itxContainerContainerValue.persist();
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Type", "application/json");
+        return new ResponseEntity<String>(itxContainerContainerValue.toJson(), headers, HttpStatus.CREATED);
+    }
+
+    @Transactional
+    @RequestMapping(value = "/jsonFile", method = RequestMethod.POST, headers = "Accept=text/plain")
+    public ResponseEntity<java.lang.String> createFromJsonFile(@RequestBody String jsonFile) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Type", "application/json");
+        int batchSize = propertiesUtilService.getBatchSize();
+        int i = 0;
+        logger.debug("jsonFile is : " + jsonFile);
+        try {
+            BufferedReader br = new BufferedReader(new FileReader(jsonFile));
+            JSONTokener jsonTokens = new JSONTokener(br);
+            Object token;
+            char delimiter;
+            char END_OF_ARRAY = ']';
+            while (jsonTokens.more()) {
+                delimiter = jsonTokens.nextClean();
+                logger.debug("delimiter is : " + delimiter);
+                if (delimiter != END_OF_ARRAY) {
+                    token = jsonTokens.nextValue();
+                    ItxContainerContainerValue itxContainerContainerValue = ItxContainerContainerValue
+                            .fromJsonToItxContainerContainerValue(token.toString());
+                    itxContainerContainerValue.persist();
+                    if (i % batchSize == 0) {
+                        itxContainerContainerValue.flush();
+                        itxContainerContainerValue.clear();
+                    }
+                    i++;
+                } else {
+                    break;
+                }
+            }
+        } catch (Exception e) {
+            logger.error("ERROR: " + e);
+            return new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST);
+        }
+        return new ResponseEntity<String>("[]", headers, HttpStatus.CREATED);
+    }
+
+    @Transactional
+    @RequestMapping(value = "/jsonArrayParseOld", method = RequestMethod.POST, headers = "Accept=application/json")
+    public ResponseEntity<java.lang.String> createFromJsonArrayParse(@RequestBody String json) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Type", "application/json");
+        int batchSize = propertiesUtilService.getBatchSize();
+        int i = 0;
+        try {
+            JSONTokener jsonTokens = new JSONTokener(json);
+            Object token;
+            char delimiter;
+            char END_OF_ARRAY = ']';
+            while (jsonTokens.more()) {
+                delimiter = jsonTokens.nextClean();
+                logger.debug("delimiter is : " + delimiter);
+                if (delimiter != END_OF_ARRAY) {
+                    token = jsonTokens.nextValue();
+                    ItxContainerContainerValue itxContainerContainerValue = ItxContainerContainerValue
+                            .fromJsonToItxContainerContainerValue(token.toString());
+                    itxContainerContainerValue.persist();
+                    if (i % batchSize == 0) {
+                        itxContainerContainerValue.flush();
+                        itxContainerContainerValue.clear();
+                    }
+                    i++;
+                } else {
+                    break;
+                }
+            }
+        } catch (Exception e) {
+            logger.error("ERROR: " + e);
+            return new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST);
+        }
+        return new ResponseEntity<String>("[]", headers, HttpStatus.CREATED);
+    }
+
+    @Transactional
+    @RequestMapping(value = { "/jsonArray",
+            "/jsonArrayParse" }, method = RequestMethod.POST, headers = "Accept=application/json")
+    public ResponseEntity<java.lang.String> createFromJsonArray(@RequestBody String json) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Type", "application/json");
+        int batchSize = propertiesUtilService.getBatchSize();
+        int i = 0;
+        BufferedReader br = null;
+        StringReader sr = null;
+        try {
+            sr = new StringReader(json);
+            br = new BufferedReader(sr);
+            for (ItxContainerContainerValue itxContainerContainerValue : ItxContainerContainerValue
+                    .fromJsonArrayToItxContainerContainerValues(br)) {
+                itxContainerContainerValue.persist();
+                if (i % batchSize == 0) {
+                    itxContainerContainerValue.flush();
+                    itxContainerContainerValue.clear();
+                }
+                i++;
+            }
+        } catch (Exception e) {
+            logger.error("ERROR: " + e);
+            return new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST);
+        } finally {
+            IOUtils.closeQuietly(sr);
+            IOUtils.closeQuietly(br);
+        }
+        return new ResponseEntity<String>("[]", headers, HttpStatus.CREATED);
+    }
+
+    @Transactional
+    @RequestMapping(value = { "/", "/{id}" }, method = RequestMethod.PUT, headers = "Accept=application/json")
+    public ResponseEntity<java.lang.String> updateFromJson(@RequestBody String json) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Type", "application/json");
+        ItxContainerContainerValue itxContainerContainerValue = ItxContainerContainerValue
+                .fromJsonToItxContainerContainerValue(json);
+        if (itxContainerContainerValue.merge() == null) {
+            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+        }
+        return new ResponseEntity<String>(headers, HttpStatus.OK);
+    }
+
+    @Transactional
+    @RequestMapping(value = "/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    public ResponseEntity<java.lang.String> updateFromJsonArray(@RequestBody String json) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Type", "application/json");
+        for (ItxContainerContainerValue itxContainerContainerValue : ItxContainerContainerValue
+                .fromJsonArrayToItxContainerContainerValues(json)) {
+            if (itxContainerContainerValue.merge() == null) {
+                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+            }
+        }
+        return new ResponseEntity<String>(headers, HttpStatus.OK);
+    }
+
+    @Transactional
+    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    public ResponseEntity<java.lang.String> deleteFromJson(@PathVariable("id") Long id) {
+        ItxContainerContainerValue itxContainerContainerValue = ItxContainerContainerValue
+                .findItxContainerContainerValue(id);
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Type", "application/json");
+        if (itxContainerContainerValue == null) {
+            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+        }
+        itxContainerContainerValue.remove();
+        return new ResponseEntity<String>(headers, HttpStatus.OK);
+    }
+
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiItxExperimentExperimentController.java b/src/main/java/com/labsynch/labseer/api/ApiItxExperimentExperimentController.java
index df6a2e391..1c2e2cde3 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiItxExperimentExperimentController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiItxExperimentExperimentController.java
@@ -34,7 +34,7 @@ public class ApiItxExperimentExperimentController {
 
     @Autowired
     private PropertiesUtilService propertiesUtilService;
-    
+
     @Transactional
     @RequestMapping(value = "/{id}", headers = "Accept=application/json")
     @ResponseBody
@@ -47,7 +47,7 @@ public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
         }
         return new ResponseEntity<String>(itxExperimentExperiment.toJson(), headers, HttpStatus.OK);
     }
-    
+
     @RequestMapping(headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listJson() {
@@ -56,104 +56,121 @@ public ResponseEntity<String> listJson() {
         List<ItxExperimentExperiment> result = ItxExperimentExperiment.findAllItxExperimentExperiments();
         return new ResponseEntity<String>(ItxExperimentExperiment.toJsonArray(result), headers, HttpStatus.OK);
     }
-    
+
     @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<java.lang.String> createFromJson(@RequestBody String json) {
-    	HttpHeaders headers = new HttpHeaders();
+        HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-        try{
-        	ItxExperimentExperiment itxExperimentExperiment = ItxExperimentExperiment.fromJsonToItxExperimentExperiment(json);
+        try {
+            ItxExperimentExperiment itxExperimentExperiment = ItxExperimentExperiment
+                    .fromJsonToItxExperimentExperiment(json);
             itxExperimentExperiment = itxExperimentExperimentService.saveLsItxExperiment(itxExperimentExperiment);
             return new ResponseEntity<String>(itxExperimentExperiment.toJson(), headers, HttpStatus.CREATED);
-        }catch (Exception e){
-        	logger.error("Uncaught exception in createFromJson",e);
+        } catch (Exception e) {
+            logger.error("Uncaught exception in createFromJson", e);
             return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 
         }
-        
+
     }
 
     @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<java.lang.String> createFromJsonArray(@RequestBody String json) {
-    	Collection<ItxExperimentExperiment> itxExperimentExperiments = ItxExperimentExperiment.fromJsonArrayToItxExperimentExperiments(json);
-    	HttpHeaders headers = new HttpHeaders();
+        Collection<ItxExperimentExperiment> itxExperimentExperiments = ItxExperimentExperiment
+                .fromJsonArrayToItxExperimentExperiments(json);
+        HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-        try{
-        	Collection<ItxExperimentExperiment> savedItxExperimentExperiments = itxExperimentExperimentService.saveLsItxExperiments(itxExperimentExperiments);
-            return new ResponseEntity<String>(ItxExperimentExperiment.toJsonArray(savedItxExperimentExperiments), headers, HttpStatus.CREATED);
-        }catch (Exception e){
-        	logger.error("Uncaught exception in createFromJsonArray",e);
+        try {
+            Collection<ItxExperimentExperiment> savedItxExperimentExperiments = itxExperimentExperimentService
+                    .saveLsItxExperiments(itxExperimentExperiments);
+            return new ResponseEntity<String>(ItxExperimentExperiment.toJsonArray(savedItxExperimentExperiments),
+                    headers, HttpStatus.CREATED);
+        } catch (Exception e) {
+            logger.error("Uncaught exception in createFromJsonArray", e);
             return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 
         }
-        
+
     }
-    
+
     @RequestMapping(method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateFromJson(@RequestBody String json) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-        ItxExperimentExperiment itxExperimentExperiment = ItxExperimentExperiment.fromJsonToItxExperimentExperiment(json);
+        ItxExperimentExperiment itxExperimentExperiment = ItxExperimentExperiment
+                .fromJsonToItxExperimentExperiment(json);
         ItxExperimentExperiment updatedItxExperimentExperiment = null;
-        try{
-			updatedItxExperimentExperiment = itxExperimentExperimentService.updateItxExperimentExperiment(itxExperimentExperiment);
-	        return new ResponseEntity<String>(updatedItxExperimentExperiment.toJson(), headers, HttpStatus.OK);
+        try {
+            updatedItxExperimentExperiment = itxExperimentExperimentService
+                    .updateItxExperimentExperiment(itxExperimentExperiment);
+            return new ResponseEntity<String>(updatedItxExperimentExperiment.toJson(), headers, HttpStatus.OK);
         } catch (Exception e) {
-			logger.error("Caught error updating ItxExperimentExperiment from JSON",e);
-			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
+            logger.error("Caught error updating ItxExperimentExperiment from JSON", e);
+            return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
-    
+
     @RequestMapping(value = "/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateFromJsonArray(@RequestBody String json) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
         Collection<ItxExperimentExperiment> updatedItxExperimentExperiments = new HashSet<ItxExperimentExperiment>();
-        try{
-            for (ItxExperimentExperiment itxExperimentExperiment: ItxExperimentExperiment.fromJsonArrayToItxExperimentExperiments(json)) {
-            	ItxExperimentExperiment updatedItxExperimentExperiment = itxExperimentExperimentService.updateItxExperimentExperiment(itxExperimentExperiment);
-            	updatedItxExperimentExperiments.add(updatedItxExperimentExperiment);
+        try {
+            for (ItxExperimentExperiment itxExperimentExperiment : ItxExperimentExperiment
+                    .fromJsonArrayToItxExperimentExperiments(json)) {
+                ItxExperimentExperiment updatedItxExperimentExperiment = itxExperimentExperimentService
+                        .updateItxExperimentExperiment(itxExperimentExperiment);
+                updatedItxExperimentExperiments.add(updatedItxExperimentExperiment);
             }
-	        return new ResponseEntity<String>(ItxExperimentExperiment.toJsonArray(updatedItxExperimentExperiments), headers, HttpStatus.OK);
+            return new ResponseEntity<String>(ItxExperimentExperiment.toJsonArray(updatedItxExperimentExperiments),
+                    headers, HttpStatus.OK);
         } catch (Exception e) {
-        	logger.error("Caught error updating ItxExperimentExperiments from JSON",e);
-			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
-		}
+            logger.error("Caught error updating ItxExperimentExperiments from JSON", e);
+            return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
+        }
     }
-    
+
     @Transactional
     @RequestMapping(value = "/findByFirstExperiment/{id}", method = RequestMethod.GET)
-    public ResponseEntity<String> findItxExperimentExperimentsByFirstExperiment(@PathVariable("id") Long firstExperimentId) {
-    	HttpHeaders headers = new HttpHeaders();
+    public ResponseEntity<String> findItxExperimentExperimentsByFirstExperiment(
+            @PathVariable("id") Long firstExperimentId) {
+        HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
         Experiment firstExperiment;
-    	try{
-    		firstExperiment = Experiment.findExperiment(firstExperimentId);
-    	} catch(Exception e){
-    		logger.error("Error in findItxExperimentExperimentsByFirstExperiment: firstExperiment "+ firstExperimentId.toString()+" not found");
-    		return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-    	}
-        Collection<ItxExperimentExperiment> itxExperimentExperiments = ItxExperimentExperiment.findItxExperimentExperimentsByFirstExperiment(firstExperiment).getResultList();
-        for (ItxExperimentExperiment itx : itxExperimentExperiments){
-        	logger.debug(itx.getCodeName() + " " + itx.getId().toString());
-        	logger.debug(itx.toJson());
+        try {
+            firstExperiment = Experiment.findExperiment(firstExperimentId);
+        } catch (Exception e) {
+            logger.error("Error in findItxExperimentExperimentsByFirstExperiment: firstExperiment "
+                    + firstExperimentId.toString() + " not found");
+            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
         }
-        return new ResponseEntity<String>(ItxExperimentExperiment.toJsonArray(itxExperimentExperiments), headers, HttpStatus.OK);
+        Collection<ItxExperimentExperiment> itxExperimentExperiments = ItxExperimentExperiment
+                .findItxExperimentExperimentsByFirstExperiment(firstExperiment).getResultList();
+        for (ItxExperimentExperiment itx : itxExperimentExperiments) {
+            logger.debug(itx.getCodeName() + " " + itx.getId().toString());
+            logger.debug(itx.toJson());
+        }
+        return new ResponseEntity<String>(ItxExperimentExperiment.toJsonArray(itxExperimentExperiments), headers,
+                HttpStatus.OK);
     }
-    
+
     @Transactional
     @RequestMapping(value = "/findBySecondExperiment/{id}", method = RequestMethod.GET)
-    public ResponseEntity<String> findItxExperimentExperimentsBySecondExperiment(@PathVariable("id") Long secondExperimentId) {
-    	HttpHeaders headers = new HttpHeaders();
+    public ResponseEntity<String> findItxExperimentExperimentsBySecondExperiment(
+            @PathVariable("id") Long secondExperimentId) {
+        HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
         Experiment secondExperiment;
-        try{
-    		secondExperiment = Experiment.findExperiment(secondExperimentId);
-    	} catch(Exception e){
-    		logger.error("Error in findItxExperimentExperimentsBySecondExperiment: secondExperiment "+ secondExperimentId.toString()+" not found");
-    		return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-    	}
-        Collection<ItxExperimentExperiment> itxExperimentExperiments = ItxExperimentExperiment.findItxExperimentExperimentsBySecondExperiment(secondExperiment).getResultList();
-        return new ResponseEntity<String>(ItxExperimentExperiment.toJsonArray(itxExperimentExperiments), headers, HttpStatus.OK);
+        try {
+            secondExperiment = Experiment.findExperiment(secondExperimentId);
+        } catch (Exception e) {
+            logger.error("Error in findItxExperimentExperimentsBySecondExperiment: secondExperiment "
+                    + secondExperimentId.toString() + " not found");
+            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+        }
+        Collection<ItxExperimentExperiment> itxExperimentExperiments = ItxExperimentExperiment
+                .findItxExperimentExperimentsBySecondExperiment(secondExperiment).getResultList();
+        return new ResponseEntity<String>(ItxExperimentExperiment.toJsonArray(itxExperimentExperiments), headers,
+                HttpStatus.OK);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiItxLsThingLsThingController.java b/src/main/java/com/labsynch/labseer/api/ApiItxLsThingLsThingController.java
index 8f19d0920..1ce2ce91f 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiItxLsThingLsThingController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiItxLsThingLsThingController.java
@@ -63,32 +63,37 @@ public ResponseEntity<java.lang.String> listAllJson() {
 		return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArray(result), headers, HttpStatus.OK);
 	}
 
-	
 	@Transactional
 	@RequestMapping(value = "/{lsType}/{lsKind}", method = RequestMethod.GET, headers = "Accept=application/json")
-	public ResponseEntity<java.lang.String> getItxLsThingsByTypeAndKind(@PathVariable("lsType") String lsType, 
+	public ResponseEntity<java.lang.String> getItxLsThingsByTypeAndKind(@PathVariable("lsType") String lsType,
 			@PathVariable("lsKind") String lsKind,
 			@RequestParam(value = "with", required = false) String with) {
 		logger.debug("----from the ApiItxLsThingLsThingController GET controller----");
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		List<ItxLsThingLsThing> itxLsThingLsThings = ItxLsThingLsThing.findItxLsThingLsThingsByLsTypeEqualsAndLsKindEquals(lsType, lsKind).getResultList();
+		List<ItxLsThingLsThing> itxLsThingLsThings = ItxLsThingLsThing
+				.findItxLsThingLsThingsByLsTypeEqualsAndLsKindEquals(lsType, lsKind).getResultList();
 		if (with != null) {
 			if (with.equalsIgnoreCase("nestedfull")) {
-				return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedFull(itxLsThingLsThings), headers, HttpStatus.OK);
+				return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedFull(itxLsThingLsThings),
+						headers, HttpStatus.OK);
 			} else if (with.equalsIgnoreCase("prettyjson")) {
-				return new ResponseEntity<String>(ItxLsThingLsThing.toPrettyJsonArray(itxLsThingLsThings), headers, HttpStatus.OK);
+				return new ResponseEntity<String>(ItxLsThingLsThing.toPrettyJsonArray(itxLsThingLsThings), headers,
+						HttpStatus.OK);
 			} else if (with.equalsIgnoreCase("nestedstub")) {
-				return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedStub(itxLsThingLsThings), headers, HttpStatus.OK);
+				return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedStub(itxLsThingLsThings),
+						headers, HttpStatus.OK);
 			} else if (with.equalsIgnoreCase("stub")) {
-				return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers, HttpStatus.OK);
+				return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers,
+						HttpStatus.OK);
 			} else if (with.equalsIgnoreCase("codetable")) {
 				Collection<CodeTableDTO> codeTables = new ArrayList<CodeTableDTO>();
 				codeTables = itxLsThingLsThingService.convertToCodeTables(itxLsThingLsThings);
 				return new ResponseEntity<String>(CodeTableDTO.toJsonArray(codeTables), headers, HttpStatus.OK);
 			}
 		}
-		return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers, HttpStatus.OK);
+		return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers,
+				HttpStatus.OK);
 	}
 
 	@Transactional
@@ -103,17 +108,17 @@ public ResponseEntity<java.lang.String> getItxLsThingsByFirstThing(
 		boolean errorsFound = false;
 		LsThing lsThing;
 		List<ItxLsThingLsThing> itxLsThingLsThings = null;
-		if(SimpleUtil.isNumeric(firstthing)) {
+		if (SimpleUtil.isNumeric(firstthing)) {
 			lsThing = LsThing.findLsThing(Long.valueOf(firstthing));
 			itxLsThingLsThings = ItxLsThingLsThing.findItxLsThingLsThingsByFirstLsThing(lsThing).getResultList();
-		} else {		
+		} else {
 			try {
 				lsThing = LsThing.findLsThingsByCodeNameEquals(firstthing).getSingleResult();
 				itxLsThingLsThings = ItxLsThingLsThing.findItxLsThingLsThingsByFirstLsThing(lsThing).getResultList();
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				ErrorMessage error = new ErrorMessage();
 				error.setErrorLevel("error");
-				error.setMessage("lsThing:" + firstthing +" not found");
+				error.setMessage("lsThing:" + firstthing + " not found");
 				errors.add(error);
 				errorsFound = true;
 			}
@@ -123,20 +128,25 @@ public ResponseEntity<java.lang.String> getItxLsThingsByFirstThing(
 		} else {
 			if (with != null) {
 				if (with.equalsIgnoreCase("nestedfull")) {
-					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedFull(itxLsThingLsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedFull(itxLsThingLsThings),
+							headers, HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("prettyjson")) {
-					return new ResponseEntity<String>(ItxLsThingLsThing.toPrettyJsonArray(itxLsThingLsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(ItxLsThingLsThing.toPrettyJsonArray(itxLsThingLsThings), headers,
+							HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("nestedstub")) {
-					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedStub(itxLsThingLsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedStub(itxLsThingLsThings),
+							headers, HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("stub")) {
-					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers,
+							HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("codetable")) {
 					Collection<CodeTableDTO> codeTables = new ArrayList<CodeTableDTO>();
 					codeTables = itxLsThingLsThingService.convertToCodeTables(itxLsThingLsThings);
 					return new ResponseEntity<String>(CodeTableDTO.toJsonArray(codeTables), headers, HttpStatus.OK);
 				}
 			}
-			return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers, HttpStatus.OK);
+			return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers,
+					HttpStatus.OK);
 		}
 	}
 
@@ -152,17 +162,17 @@ public ResponseEntity<java.lang.String> getItxLsThingsBySecondThing(
 		boolean errorsFound = false;
 		LsThing lsThing;
 		List<ItxLsThingLsThing> itxLsThingLsThings = null;
-		if(SimpleUtil.isNumeric(secondthing)) {
+		if (SimpleUtil.isNumeric(secondthing)) {
 			lsThing = LsThing.findLsThing(Long.valueOf(secondthing));
 			itxLsThingLsThings = ItxLsThingLsThing.findItxLsThingLsThingsBySecondLsThing(lsThing).getResultList();
-		} else {		
+		} else {
 			try {
 				lsThing = LsThing.findLsThingsByCodeNameEquals(secondthing).getSingleResult();
 				itxLsThingLsThings = ItxLsThingLsThing.findItxLsThingLsThingsBySecondLsThing(lsThing).getResultList();
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				ErrorMessage error = new ErrorMessage();
 				error.setErrorLevel("error");
-				error.setMessage("lsThing:" + secondthing +" not found");
+				error.setMessage("lsThing:" + secondthing + " not found");
 				errors.add(error);
 				errorsFound = true;
 			}
@@ -172,27 +182,31 @@ public ResponseEntity<java.lang.String> getItxLsThingsBySecondThing(
 		} else {
 			if (with != null) {
 				if (with.equalsIgnoreCase("nestedfull")) {
-					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedFull(itxLsThingLsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedFull(itxLsThingLsThings),
+							headers, HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("prettyjson")) {
-					return new ResponseEntity<String>(ItxLsThingLsThing.toPrettyJsonArray(itxLsThingLsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(ItxLsThingLsThing.toPrettyJsonArray(itxLsThingLsThings), headers,
+							HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("nestedstub")) {
-					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedStub(itxLsThingLsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedStub(itxLsThingLsThings),
+							headers, HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("stub")) {
-					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers,
+							HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("codetable")) {
 					Collection<CodeTableDTO> codeTables = new ArrayList<CodeTableDTO>();
 					codeTables = itxLsThingLsThingService.convertToCodeTables(itxLsThingLsThings);
 					return new ResponseEntity<String>(CodeTableDTO.toJsonArray(codeTables), headers, HttpStatus.OK);
 				}
 			}
-			return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers, HttpStatus.OK);
+			return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers,
+					HttpStatus.OK);
 		}
 	}
 
-	
 	@Transactional
 	@RequestMapping(value = "/byfirstthing/exclude/{lsType}/{lsKind}", method = RequestMethod.GET, headers = "Accept=application/json")
-	public ResponseEntity<java.lang.String> getItxLsThingsByFirstThingNotTypeKind(@PathVariable("lsType") String lsType, 
+	public ResponseEntity<java.lang.String> getItxLsThingsByFirstThingNotTypeKind(@PathVariable("lsType") String lsType,
 			@PathVariable("lsKind") String lsKind,
 			@RequestParam(value = "firstthing", required = true) String firstthing,
 			@RequestParam(value = "with", required = false) String with) {
@@ -203,17 +217,20 @@ public ResponseEntity<java.lang.String> getItxLsThingsByFirstThingNotTypeKind(@P
 		boolean errorsFound = false;
 		LsThing lsThing;
 		List<ItxLsThingLsThing> itxLsThingLsThings = null;
-		if(SimpleUtil.isNumeric(firstthing)) {
+		if (SimpleUtil.isNumeric(firstthing)) {
 			lsThing = LsThing.findLsThing(Long.valueOf(firstthing));
-			itxLsThingLsThings = ItxLsThingLsThing.findItxLsThingLsThingsNotTypeAndKindAndFirstLsThingEquals(lsType, lsKind, lsThing).getResultList();
-		} else {		
+			itxLsThingLsThings = ItxLsThingLsThing
+					.findItxLsThingLsThingsNotTypeAndKindAndFirstLsThingEquals(lsType, lsKind, lsThing).getResultList();
+		} else {
 			try {
 				lsThing = LsThing.findLsThingsByCodeNameEquals(firstthing).getSingleResult();
-				itxLsThingLsThings = ItxLsThingLsThing.findItxLsThingLsThingsNotTypeAndKindAndFirstLsThingEquals(lsType, lsKind, lsThing).getResultList();
-			} catch(Exception ex) {
+				itxLsThingLsThings = ItxLsThingLsThing
+						.findItxLsThingLsThingsNotTypeAndKindAndFirstLsThingEquals(lsType, lsKind, lsThing)
+						.getResultList();
+			} catch (Exception ex) {
 				ErrorMessage error = new ErrorMessage();
 				error.setErrorLevel("error");
-				error.setMessage("lsThing:" + firstthing +" not found");
+				error.setMessage("lsThing:" + firstthing + " not found");
 				errors.add(error);
 				errorsFound = true;
 			}
@@ -223,26 +240,32 @@ public ResponseEntity<java.lang.String> getItxLsThingsByFirstThingNotTypeKind(@P
 		} else {
 			if (with != null) {
 				if (with.equalsIgnoreCase("nestedfull")) {
-					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedFull(itxLsThingLsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedFull(itxLsThingLsThings),
+							headers, HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("prettyjson")) {
-					return new ResponseEntity<String>(ItxLsThingLsThing.toPrettyJsonArray(itxLsThingLsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(ItxLsThingLsThing.toPrettyJsonArray(itxLsThingLsThings), headers,
+							HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("nestedstub")) {
-					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedStub(itxLsThingLsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedStub(itxLsThingLsThings),
+							headers, HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("stub")) {
-					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers,
+							HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("codetable")) {
 					Collection<CodeTableDTO> codeTables = new ArrayList<CodeTableDTO>();
 					codeTables = itxLsThingLsThingService.convertToCodeTables(itxLsThingLsThings);
 					return new ResponseEntity<String>(CodeTableDTO.toJsonArray(codeTables), headers, HttpStatus.OK);
 				}
 			}
-			return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers, HttpStatus.OK);
+			return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers,
+					HttpStatus.OK);
 		}
 	}
 
 	@Transactional
 	@RequestMapping(value = "/bysecondthing/exclude/{lsType}/{lsKind}", method = RequestMethod.GET, headers = "Accept=application/json")
-	public ResponseEntity<java.lang.String> getItxLsThingsBySecondThingNotTypeKind(@PathVariable("lsType") String lsType, 
+	public ResponseEntity<java.lang.String> getItxLsThingsBySecondThingNotTypeKind(
+			@PathVariable("lsType") String lsType,
 			@PathVariable("lsKind") String lsKind,
 			@RequestParam(value = "secondthing", required = true) String secondthing,
 			@RequestParam(value = "with", required = false) String with) {
@@ -253,17 +276,21 @@ public ResponseEntity<java.lang.String> getItxLsThingsBySecondThingNotTypeKind(@
 		boolean errorsFound = false;
 		LsThing lsThing;
 		List<ItxLsThingLsThing> itxLsThingLsThings = null;
-		if(SimpleUtil.isNumeric(secondthing)) {
+		if (SimpleUtil.isNumeric(secondthing)) {
 			lsThing = LsThing.findLsThing(Long.valueOf(secondthing));
-			itxLsThingLsThings = ItxLsThingLsThing.findItxLsThingLsThingsNotTypeAndKindAndSecondLsThingEquals(lsType, lsKind, lsThing).getResultList();
-		} else {		
+			itxLsThingLsThings = ItxLsThingLsThing
+					.findItxLsThingLsThingsNotTypeAndKindAndSecondLsThingEquals(lsType, lsKind, lsThing)
+					.getResultList();
+		} else {
 			try {
 				lsThing = LsThing.findLsThingsByCodeNameEquals(secondthing).getSingleResult();
-				itxLsThingLsThings = ItxLsThingLsThing.findItxLsThingLsThingsNotTypeAndKindAndSecondLsThingEquals(lsType, lsKind, lsThing).getResultList();
-			} catch(Exception ex) {
+				itxLsThingLsThings = ItxLsThingLsThing
+						.findItxLsThingLsThingsNotTypeAndKindAndSecondLsThingEquals(lsType, lsKind, lsThing)
+						.getResultList();
+			} catch (Exception ex) {
 				ErrorMessage error = new ErrorMessage();
 				error.setErrorLevel("error");
-				error.setMessage("lsThing:" + secondthing +" not found");
+				error.setMessage("lsThing:" + secondthing + " not found");
 				errors.add(error);
 				errorsFound = true;
 			}
@@ -273,25 +300,31 @@ public ResponseEntity<java.lang.String> getItxLsThingsBySecondThingNotTypeKind(@
 		} else {
 			if (with != null) {
 				if (with.equalsIgnoreCase("nestedfull")) {
-					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedFull(itxLsThingLsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedFull(itxLsThingLsThings),
+							headers, HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("prettyjson")) {
-					return new ResponseEntity<String>(ItxLsThingLsThing.toPrettyJsonArray(itxLsThingLsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(ItxLsThingLsThing.toPrettyJsonArray(itxLsThingLsThings), headers,
+							HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("nestedstub")) {
-					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedStub(itxLsThingLsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedStub(itxLsThingLsThings),
+							headers, HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("stub")) {
-					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers,
+							HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("codetable")) {
 					Collection<CodeTableDTO> codeTables = new ArrayList<CodeTableDTO>();
 					codeTables = itxLsThingLsThingService.convertToCodeTables(itxLsThingLsThings);
 					return new ResponseEntity<String>(CodeTableDTO.toJsonArray(codeTables), headers, HttpStatus.OK);
 				}
 			}
-			return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers, HttpStatus.OK);
+			return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers,
+					HttpStatus.OK);
 		}
 	}
+
 	@Transactional
 	@RequestMapping(value = "/byfirstthing/{lsType}/{lsKind}", method = RequestMethod.GET, headers = "Accept=application/json")
-	public ResponseEntity<java.lang.String> getItxLsThingsByFirstThingAndTypeKind(@PathVariable("lsType") String lsType, 
+	public ResponseEntity<java.lang.String> getItxLsThingsByFirstThingAndTypeKind(@PathVariable("lsType") String lsType,
 			@PathVariable("lsKind") String lsKind,
 			@RequestParam(value = "firstthing", required = true) String firstthing,
 			@RequestParam(value = "with", required = false) String with) {
@@ -302,17 +335,22 @@ public ResponseEntity<java.lang.String> getItxLsThingsByFirstThingAndTypeKind(@P
 		boolean errorsFound = false;
 		LsThing lsThing;
 		List<ItxLsThingLsThing> itxLsThingLsThings = null;
-		if(SimpleUtil.isNumeric(firstthing)) {
+		if (SimpleUtil.isNumeric(firstthing)) {
 			lsThing = LsThing.findLsThing(Long.valueOf(firstthing));
-			itxLsThingLsThings = ItxLsThingLsThing.findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndFirstLsThingEquals(lsType, lsKind,  lsThing).getResultList();
-		} else {		
+			itxLsThingLsThings = ItxLsThingLsThing
+					.findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndFirstLsThingEquals(lsType, lsKind, lsThing)
+					.getResultList();
+		} else {
 			try {
 				lsThing = LsThing.findLsThingsByCodeNameEquals(firstthing).getSingleResult();
-				itxLsThingLsThings = ItxLsThingLsThing.findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndFirstLsThingEquals(lsType, lsKind, lsThing).getResultList();
-			} catch(Exception ex) {
+				itxLsThingLsThings = ItxLsThingLsThing
+						.findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndFirstLsThingEquals(lsType, lsKind,
+								lsThing)
+						.getResultList();
+			} catch (Exception ex) {
 				ErrorMessage error = new ErrorMessage();
 				error.setErrorLevel("error");
-				error.setMessage("lsThing:" + firstthing +" not found");
+				error.setMessage("lsThing:" + firstthing + " not found");
 				errors.add(error);
 				errorsFound = true;
 			}
@@ -322,26 +360,32 @@ public ResponseEntity<java.lang.String> getItxLsThingsByFirstThingAndTypeKind(@P
 		} else {
 			if (with != null) {
 				if (with.equalsIgnoreCase("nestedfull")) {
-					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedFull(itxLsThingLsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedFull(itxLsThingLsThings),
+							headers, HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("prettyjson")) {
-					return new ResponseEntity<String>(ItxLsThingLsThing.toPrettyJsonArray(itxLsThingLsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(ItxLsThingLsThing.toPrettyJsonArray(itxLsThingLsThings), headers,
+							HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("nestedstub")) {
-					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedStub(itxLsThingLsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedStub(itxLsThingLsThings),
+							headers, HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("stub")) {
-					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers,
+							HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("codetable")) {
 					Collection<CodeTableDTO> codeTables = new ArrayList<CodeTableDTO>();
 					codeTables = itxLsThingLsThingService.convertToCodeTables(itxLsThingLsThings);
 					return new ResponseEntity<String>(CodeTableDTO.toJsonArray(codeTables), headers, HttpStatus.OK);
 				}
 			}
-			return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers, HttpStatus.OK);
+			return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers,
+					HttpStatus.OK);
 		}
 	}
 
 	@Transactional
 	@RequestMapping(value = "/bysecondthing/{lsType}/{lsKind}", method = RequestMethod.GET, headers = "Accept=application/json")
-	public ResponseEntity<java.lang.String> getItxLsThingsBySecondThingAndTypeKind(@PathVariable("lsType") String lsType, 
+	public ResponseEntity<java.lang.String> getItxLsThingsBySecondThingAndTypeKind(
+			@PathVariable("lsType") String lsType,
 			@PathVariable("lsKind") String lsKind,
 			@RequestParam(value = "secondthing", required = true) String secondthing,
 			@RequestParam(value = "with", required = false) String with) {
@@ -352,17 +396,22 @@ public ResponseEntity<java.lang.String> getItxLsThingsBySecondThingAndTypeKind(@
 		boolean errorsFound = false;
 		LsThing lsThing;
 		List<ItxLsThingLsThing> itxLsThingLsThings = null;
-		if(SimpleUtil.isNumeric(secondthing)) {
+		if (SimpleUtil.isNumeric(secondthing)) {
 			lsThing = LsThing.findLsThing(Long.valueOf(secondthing));
-			itxLsThingLsThings = ItxLsThingLsThing.findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndSecondLsThingEquals(lsType, lsKind, lsThing).getResultList();
-		} else {		
+			itxLsThingLsThings = ItxLsThingLsThing
+					.findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndSecondLsThingEquals(lsType, lsKind, lsThing)
+					.getResultList();
+		} else {
 			try {
 				lsThing = LsThing.findLsThingsByCodeNameEquals(secondthing).getSingleResult();
-				itxLsThingLsThings = ItxLsThingLsThing.findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndSecondLsThingEquals(lsType, lsKind, lsThing).getResultList();
-			} catch(Exception ex) {
+				itxLsThingLsThings = ItxLsThingLsThing
+						.findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndSecondLsThingEquals(lsType, lsKind,
+								lsThing)
+						.getResultList();
+			} catch (Exception ex) {
 				ErrorMessage error = new ErrorMessage();
 				error.setErrorLevel("error");
-				error.setMessage("lsThing:" + secondthing +" not found");
+				error.setMessage("lsThing:" + secondthing + " not found");
 				errors.add(error);
 				errorsFound = true;
 			}
@@ -372,26 +421,32 @@ public ResponseEntity<java.lang.String> getItxLsThingsBySecondThingAndTypeKind(@
 		} else {
 			if (with != null) {
 				if (with.equalsIgnoreCase("nestedfull")) {
-					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedFull(itxLsThingLsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedFull(itxLsThingLsThings),
+							headers, HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("prettyjson")) {
-					return new ResponseEntity<String>(ItxLsThingLsThing.toPrettyJsonArray(itxLsThingLsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(ItxLsThingLsThing.toPrettyJsonArray(itxLsThingLsThings), headers,
+							HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("nestedstub")) {
-					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedStub(itxLsThingLsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedStub(itxLsThingLsThings),
+							headers, HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("stub")) {
-					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers,
+							HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("codetable")) {
 					Collection<CodeTableDTO> codeTables = new ArrayList<CodeTableDTO>();
 					codeTables = itxLsThingLsThingService.convertToCodeTables(itxLsThingLsThings);
 					return new ResponseEntity<String>(CodeTableDTO.toJsonArray(codeTables), headers, HttpStatus.OK);
 				}
 			}
-			return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers, HttpStatus.OK);
+			return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers,
+					HttpStatus.OK);
 		}
 	}
-	
+
 	@Transactional
 	@RequestMapping(value = "/byfirstthingandsecondthing/{lsType}/{lsKind}", method = RequestMethod.GET, headers = "Accept=application/json")
-	public ResponseEntity<java.lang.String> getItxLsThingsByFirstThingAndSecondThingAndTypeKind(@PathVariable("lsType") String lsType, 
+	public ResponseEntity<java.lang.String> getItxLsThingsByFirstThingAndSecondThingAndTypeKind(
+			@PathVariable("lsType") String lsType,
 			@PathVariable("lsKind") String lsKind,
 			@RequestParam(value = "firstthing", required = true) String firstthing,
 			@RequestParam(value = "secondthing", required = true) String secondthing,
@@ -404,28 +459,28 @@ public ResponseEntity<java.lang.String> getItxLsThingsByFirstThingAndSecondThing
 		LsThing firstLsThing = null;
 		LsThing secondLsThing = null;
 		List<ItxLsThingLsThing> itxLsThingLsThings = null;
-		if(SimpleUtil.isNumeric(firstthing)) {
+		if (SimpleUtil.isNumeric(firstthing)) {
 			firstLsThing = LsThing.findLsThing(Long.valueOf(firstthing));
-		} else {		
+		} else {
 			try {
 				firstLsThing = LsThing.findLsThingsByCodeNameEquals(firstthing).getSingleResult();
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				ErrorMessage error = new ErrorMessage();
 				error.setErrorLevel("error");
-				error.setMessage("lsThing:" + firstthing +" not found");
+				error.setMessage("lsThing:" + firstthing + " not found");
 				errors.add(error);
 				errorsFound = true;
 			}
 		}
-		if(SimpleUtil.isNumeric(secondthing)) {
+		if (SimpleUtil.isNumeric(secondthing)) {
 			secondLsThing = LsThing.findLsThing(Long.valueOf(secondthing));
-		} else {		
+		} else {
 			try {
 				secondLsThing = LsThing.findLsThingsByCodeNameEquals(secondthing).getSingleResult();
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				ErrorMessage error = new ErrorMessage();
 				error.setErrorLevel("error");
-				error.setMessage("lsThing:" + secondthing +" not found");
+				error.setMessage("lsThing:" + secondthing + " not found");
 				errors.add(error);
 				errorsFound = true;
 			}
@@ -433,41 +488,48 @@ public ResponseEntity<java.lang.String> getItxLsThingsByFirstThingAndSecondThing
 		if (errorsFound) {
 			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.NOT_FOUND);
 		} else {
-			//find them
-			itxLsThingLsThings = ItxLsThingLsThing.findItxLsThingLsThingsByTypeAndKindAndFirstLsThingEqualsAndSecondLsThingEquals(lsType, lsKind, firstLsThing, secondLsThing).getResultList();
+			// find them
+			itxLsThingLsThings = ItxLsThingLsThing
+					.findItxLsThingLsThingsByTypeAndKindAndFirstLsThingEqualsAndSecondLsThingEquals(lsType, lsKind,
+							firstLsThing, secondLsThing)
+					.getResultList();
 			if (with != null) {
 				if (with.equalsIgnoreCase("nestedfull")) {
-					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedFull(itxLsThingLsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedFull(itxLsThingLsThings),
+							headers, HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("prettyjson")) {
-					return new ResponseEntity<String>(ItxLsThingLsThing.toPrettyJsonArray(itxLsThingLsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(ItxLsThingLsThing.toPrettyJsonArray(itxLsThingLsThings), headers,
+							HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("nestedstub")) {
-					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedStub(itxLsThingLsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedStub(itxLsThingLsThings),
+							headers, HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("stub")) {
-					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers,
+							HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("codetable")) {
 					Collection<CodeTableDTO> codeTables = new ArrayList<CodeTableDTO>();
 					codeTables = itxLsThingLsThingService.convertToCodeTables(itxLsThingLsThings);
 					return new ResponseEntity<String>(CodeTableDTO.toJsonArray(codeTables), headers, HttpStatus.OK);
 				}
 			}
-			return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers, HttpStatus.OK);
+			return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(itxLsThingLsThings), headers,
+					HttpStatus.OK);
 		}
 	}
 
-	
-	
 	@Transactional
 	@RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
 	public ResponseEntity<java.lang.String> createFromJson(@RequestBody String json,
-			@RequestParam(value="with", required = false) String with) {
+			@RequestParam(value = "with", required = false) String with) {
 		ItxLsThingLsThing itxLsThingLsThing = ItxLsThingLsThing.fromJsonToItxLsThingLsThing(json);
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		try{
-			ItxLsThingLsThing savedItxLsThingLsThing = itxLsThingLsThingService.saveItxLsThingLsThing(itxLsThingLsThing);
+		try {
+			ItxLsThingLsThing savedItxLsThingLsThing = itxLsThingLsThingService
+					.saveItxLsThingLsThing(itxLsThingLsThing);
 			return new ResponseEntity<String>(savedItxLsThingLsThing.toJson(), headers, HttpStatus.CREATED);
-		}catch(Exception e){
-			logger.error("Caught error saving ItxLsThingLsThing from JSON",e);
+		} catch (Exception e) {
+			logger.error("Caught error saving ItxLsThingLsThing from JSON", e);
 			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 
@@ -475,38 +537,40 @@ public ResponseEntity<java.lang.String> createFromJson(@RequestBody String json,
 
 	@Transactional
 	@RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-	public ResponseEntity<java.lang.String> createFromLsJsonArray(@RequestBody String json,    		
-			@RequestParam(value="with", required = false) String with) {
+	public ResponseEntity<java.lang.String> createFromLsJsonArray(@RequestBody String json,
+			@RequestParam(value = "with", required = false) String with) {
 		Collection<ItxLsThingLsThing> itxLsThingLsThings = ItxLsThingLsThing.fromJsonArrayToItxLsThingLsThings(json);
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		try{
+		try {
 			Collection<ItxLsThingLsThing> savedItxLsThingLsThings = new HashSet<ItxLsThingLsThing>();
-			for (ItxLsThingLsThing itxLsThingLsThing : itxLsThingLsThings){
-				ItxLsThingLsThing savedItxLsThingLsThing = itxLsThingLsThingService.saveItxLsThingLsThing(itxLsThingLsThing);
+			for (ItxLsThingLsThing itxLsThingLsThing : itxLsThingLsThings) {
+				ItxLsThingLsThing savedItxLsThingLsThing = itxLsThingLsThingService
+						.saveItxLsThingLsThing(itxLsThingLsThing);
 				savedItxLsThingLsThings.add(savedItxLsThingLsThing);
 			}
-			return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArray(savedItxLsThingLsThings), headers, HttpStatus.CREATED);
-		}catch(Exception e){
-			logger.error("Caught error saving ItxLsThingLsThings from JSON",e);
+			return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArray(savedItxLsThingLsThings), headers,
+					HttpStatus.CREATED);
+		} catch (Exception e) {
+			logger.error("Caught error saving ItxLsThingLsThings from JSON", e);
 			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
 	@Transactional
 	@RequestMapping(value = { "/", "/{id}" }, method = RequestMethod.PUT, headers = "Accept=application/json")
-	public ResponseEntity<java.lang.String> updateFromJson(@RequestBody String json,     		
-			@RequestParam(value="with", required = false) String with) {
+	public ResponseEntity<java.lang.String> updateFromJson(@RequestBody String json,
+			@RequestParam(value = "with", required = false) String with) {
 		ItxLsThingLsThing itxLsThingLsThing = ItxLsThingLsThing.fromJsonToItxLsThingLsThing(json);
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
 		boolean errorsFound = false;
 		ItxLsThingLsThing updatedItxLsThingLsThing = null;
-		try{
+		try {
 			updatedItxLsThingLsThing = itxLsThingLsThingService.updateItxLsThingLsThing(itxLsThingLsThing);
 		} catch (Exception e) {
-			logger.error("Caught error updating ItxLsThingLsThing from JSON",e);
+			logger.error("Caught error updating ItxLsThingLsThing from JSON", e);
 			logger.error("----from the controller----"
 					+ e.getMessage().toString() + " whole message  "
 					+ e.toString());
@@ -517,14 +581,17 @@ public ResponseEntity<java.lang.String> updateFromJson(@RequestBody String json,
 			errorsFound = true;
 		}
 		if (errorsFound) {
-			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.INTERNAL_SERVER_ERROR);
-		}else if (with != null) {
+			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers,
+					HttpStatus.INTERNAL_SERVER_ERROR);
+		} else if (with != null) {
 			if (with.equalsIgnoreCase("nestedfull")) {
-				return new ResponseEntity<String>(updatedItxLsThingLsThing.toJsonWithNestedFull(), headers, HttpStatus.OK);
+				return new ResponseEntity<String>(updatedItxLsThingLsThing.toJsonWithNestedFull(), headers,
+						HttpStatus.OK);
 			} else if (with.equalsIgnoreCase("prettyjson")) {
 				return new ResponseEntity<String>(updatedItxLsThingLsThing.toPrettyJson(), headers, HttpStatus.OK);
 			} else if (with.equalsIgnoreCase("nestedstub")) {
-				return new ResponseEntity<String>(updatedItxLsThingLsThing.toJsonWithNestedStubs(), headers, HttpStatus.OK);
+				return new ResponseEntity<String>(updatedItxLsThingLsThing.toJsonWithNestedStubs(), headers,
+						HttpStatus.OK);
 			} else if (with.equalsIgnoreCase("stub")) {
 				return new ResponseEntity<String>(updatedItxLsThingLsThing.toJsonStub(), headers, HttpStatus.OK);
 			}
@@ -532,29 +599,27 @@ public ResponseEntity<java.lang.String> updateFromJson(@RequestBody String json,
 
 		return new ResponseEntity<String>(updatedItxLsThingLsThing.toJson(), headers, HttpStatus.OK);
 
-
-
-
 	}
 
 	@Transactional
 	@RequestMapping(value = "/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
 	public ResponseEntity<java.lang.String> updateFromJsonArray(@RequestBody List<ItxLsThingLsThing> itxLsThingLsThings,
-			@RequestParam(value="with", required = false) String with) {
+			@RequestParam(value = "with", required = false) String with) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
 		boolean errorsFound = false;
-		Collection<ItxLsThingLsThing> updatedItxLsThingLsThings  = null;
-		try{
+		Collection<ItxLsThingLsThing> updatedItxLsThingLsThings = null;
+		try {
 			updatedItxLsThingLsThings = new HashSet<ItxLsThingLsThing>();
-			for (ItxLsThingLsThing itxLsThingLsThing : itxLsThingLsThings){
-				ItxLsThingLsThing updatedItxLsThingLsThing = itxLsThingLsThingService.updateItxLsThingLsThing(itxLsThingLsThing);
+			for (ItxLsThingLsThing itxLsThingLsThing : itxLsThingLsThings) {
+				ItxLsThingLsThing updatedItxLsThingLsThing = itxLsThingLsThingService
+						.updateItxLsThingLsThing(itxLsThingLsThing);
 				updatedItxLsThingLsThings.add(updatedItxLsThingLsThing);
 			}
 
 		} catch (Exception e) {
-			logger.error("Caught error saving ItxLsThingLsThings from JSON",e);
+			logger.error("Caught error saving ItxLsThingLsThings from JSON", e);
 			logger.error("----from the controller----"
 					+ e.getMessage().toString() + " whole message  "
 					+ e.toString());
@@ -564,25 +629,31 @@ public ResponseEntity<java.lang.String> updateFromJsonArray(@RequestBody List<It
 			errors.add(error);
 			errorsFound = true;
 		}
-		
+
 		if (errorsFound) {
-			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.INTERNAL_SERVER_ERROR);
-		}else if (with != null) {
+			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers,
+					HttpStatus.INTERNAL_SERVER_ERROR);
+		} else if (with != null) {
 			if (with.equalsIgnoreCase("nestedfull")) {
-				return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedFull(updatedItxLsThingLsThings), headers, HttpStatus.OK);
+				return new ResponseEntity<String>(
+						ItxLsThingLsThing.toJsonArrayWithNestedFull(updatedItxLsThingLsThings), headers, HttpStatus.OK);
 			} else if (with.equalsIgnoreCase("prettyjson")) {
-				return new ResponseEntity<String>(ItxLsThingLsThing.toPrettyJsonArray(updatedItxLsThingLsThings), headers, HttpStatus.OK);
+				return new ResponseEntity<String>(ItxLsThingLsThing.toPrettyJsonArray(updatedItxLsThingLsThings),
+						headers, HttpStatus.OK);
 			} else if (with.equalsIgnoreCase("nestedstub")) {
-				return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayWithNestedStub(updatedItxLsThingLsThings), headers, HttpStatus.OK);
+				return new ResponseEntity<String>(
+						ItxLsThingLsThing.toJsonArrayWithNestedStub(updatedItxLsThingLsThings), headers, HttpStatus.OK);
 			} else if (with.equalsIgnoreCase("stub")) {
-				return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(updatedItxLsThingLsThings), headers, HttpStatus.OK);
+				return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArrayStub(updatedItxLsThingLsThings), headers,
+						HttpStatus.OK);
 			} else if (with.equalsIgnoreCase("codetable")) {
 				Collection<CodeTableDTO> codeTables = new ArrayList<CodeTableDTO>();
 				codeTables = itxLsThingLsThingService.convertToCodeTables(itxLsThingLsThings);
 				return new ResponseEntity<String>(CodeTableDTO.toJsonArray(codeTables), headers, HttpStatus.OK);
 			}
 		}
-		return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArray(updatedItxLsThingLsThings), headers, HttpStatus.OK);
+		return new ResponseEntity<String>(ItxLsThingLsThing.toJsonArray(updatedItxLsThingLsThings), headers,
+				HttpStatus.OK);
 
 	}
 
diff --git a/src/main/java/com/labsynch/labseer/api/ApiItxProtocolProtocolController.java b/src/main/java/com/labsynch/labseer/api/ApiItxProtocolProtocolController.java
index e9488498b..9c3e4eaa0 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiItxProtocolProtocolController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiItxProtocolProtocolController.java
@@ -26,10 +26,10 @@
 @RequestMapping("/api/v1/itxprotocolprotocols")
 @Controller
 public class ApiItxProtocolProtocolController {
-	
+
     private static final Logger logger = LoggerFactory.getLogger(ApiItxProtocolProtocolController.class);
-	
-	@Autowired
+
+    @Autowired
     private ItxProtocolProtocolService itxProtocolProtocolService;
 
     @RequestMapping(value = "/{id}", headers = "Accept=application/json")
@@ -55,34 +55,37 @@ public ResponseEntity<java.lang.String> listJson() {
 
     @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<java.lang.String> createFromJson(@RequestBody String json) {
-    	HttpHeaders headers = new HttpHeaders();
+        HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-        try{
-        	ItxProtocolProtocol itxProtocolProtocol = ItxProtocolProtocol.fromJsonToItxProtocolProtocol(json);
+        try {
+            ItxProtocolProtocol itxProtocolProtocol = ItxProtocolProtocol.fromJsonToItxProtocolProtocol(json);
             itxProtocolProtocol = itxProtocolProtocolService.saveLsItxProtocol(itxProtocolProtocol);
             return new ResponseEntity<String>(itxProtocolProtocol.toJson(), headers, HttpStatus.CREATED);
-        }catch (Exception e){
-        	logger.error("Uncaught exception in createFromJson",e);
+        } catch (Exception e) {
+            logger.error("Uncaught exception in createFromJson", e);
             return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 
         }
-        
+
     }
 
     @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<java.lang.String> createFromJsonArray(@RequestBody String json) {
-    	Collection<ItxProtocolProtocol> itxProtocolProtocols = ItxProtocolProtocol.fromJsonArrayToItxProtocolProtocols(json);
-    	HttpHeaders headers = new HttpHeaders();
+        Collection<ItxProtocolProtocol> itxProtocolProtocols = ItxProtocolProtocol
+                .fromJsonArrayToItxProtocolProtocols(json);
+        HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-        try{
-        	Collection<ItxProtocolProtocol> savedItxProtocolProtocols = itxProtocolProtocolService.saveLsItxProtocols(itxProtocolProtocols);
-            return new ResponseEntity<String>(ItxProtocolProtocol.toJsonArray(savedItxProtocolProtocols), headers, HttpStatus.CREATED);
-        }catch (Exception e){
-        	logger.error("Uncaught exception in createFromJsonArray",e);
+        try {
+            Collection<ItxProtocolProtocol> savedItxProtocolProtocols = itxProtocolProtocolService
+                    .saveLsItxProtocols(itxProtocolProtocols);
+            return new ResponseEntity<String>(ItxProtocolProtocol.toJsonArray(savedItxProtocolProtocols), headers,
+                    HttpStatus.CREATED);
+        } catch (Exception e) {
+            logger.error("Uncaught exception in createFromJsonArray", e);
             return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 
         }
-        
+
     }
 
     @RequestMapping(method = RequestMethod.PUT, headers = "Accept=application/json")
@@ -91,30 +94,33 @@ public ResponseEntity<String> updateFromJson(@RequestBody String json) {
         headers.add("Content-Type", "application/json");
         ItxProtocolProtocol itxProtocolProtocol = ItxProtocolProtocol.fromJsonToItxProtocolProtocol(json);
         ItxProtocolProtocol updatedItxProtocolProtocol = null;
-        try{
-			updatedItxProtocolProtocol = itxProtocolProtocolService.updateItxProtocolProtocol(itxProtocolProtocol);
-	        return new ResponseEntity<String>(updatedItxProtocolProtocol.toJson(), headers, HttpStatus.OK);
+        try {
+            updatedItxProtocolProtocol = itxProtocolProtocolService.updateItxProtocolProtocol(itxProtocolProtocol);
+            return new ResponseEntity<String>(updatedItxProtocolProtocol.toJson(), headers, HttpStatus.OK);
         } catch (Exception e) {
-			logger.error("Caught error updating ItxProtocolProtocol from JSON",e);
-			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
+            logger.error("Caught error updating ItxProtocolProtocol from JSON", e);
+            return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
-    
+
     @RequestMapping(value = "/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateFromJsonArray(@RequestBody String json) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
         Collection<ItxProtocolProtocol> updatedItxProtocolProtocols = new HashSet<ItxProtocolProtocol>();
-        try{
-            for (ItxProtocolProtocol itxProtocolProtocol: ItxProtocolProtocol.fromJsonArrayToItxProtocolProtocols(json)) {
-            	ItxProtocolProtocol updatedItxProtocolProtocol = itxProtocolProtocolService.updateItxProtocolProtocol(itxProtocolProtocol);
-            	updatedItxProtocolProtocols.add(updatedItxProtocolProtocol);
+        try {
+            for (ItxProtocolProtocol itxProtocolProtocol : ItxProtocolProtocol
+                    .fromJsonArrayToItxProtocolProtocols(json)) {
+                ItxProtocolProtocol updatedItxProtocolProtocol = itxProtocolProtocolService
+                        .updateItxProtocolProtocol(itxProtocolProtocol);
+                updatedItxProtocolProtocols.add(updatedItxProtocolProtocol);
             }
-	        return new ResponseEntity<String>(ItxProtocolProtocol.toJsonArray(updatedItxProtocolProtocols), headers, HttpStatus.OK);
+            return new ResponseEntity<String>(ItxProtocolProtocol.toJsonArray(updatedItxProtocolProtocols), headers,
+                    HttpStatus.OK);
         } catch (Exception e) {
-        	logger.error("Caught error updating ItxProtocolProtocols from JSON",e);
-			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
-		}
+            logger.error("Caught error updating ItxProtocolProtocols from JSON", e);
+            return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
+        }
     }
 
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
@@ -131,39 +137,48 @@ public ResponseEntity<java.lang.String> deleteFromJson(@PathVariable("id") Long
 
     @RequestMapping(params = "find=ByLsTransactionEquals", headers = "Accept=application/json")
     @ResponseBody
-    public ResponseEntity<java.lang.String> jsonFindItxProtocolProtocolsByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction) {
+    public ResponseEntity<java.lang.String> jsonFindItxProtocolProtocolsByLsTransactionEquals(
+            @RequestParam("lsTransaction") Long lsTransaction) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(ItxProtocolProtocol.toJsonArray(ItxProtocolProtocol.findItxProtocolProtocolsByLsTransactionEquals(lsTransaction).getResultList()), headers, HttpStatus.OK);
+        return new ResponseEntity<String>(
+                ItxProtocolProtocol.toJsonArray(ItxProtocolProtocol
+                        .findItxProtocolProtocolsByLsTransactionEquals(lsTransaction).getResultList()),
+                headers, HttpStatus.OK);
     }
-    
+
     @Transactional
     @RequestMapping(value = "/findByFirstProtocol/{id}", method = RequestMethod.GET)
     public ResponseEntity<String> findItxProtocolProtocolsByFirstProtocol(@PathVariable("id") Long firstProtocolId) {
-    	HttpHeaders headers = new HttpHeaders();
+        HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-        try{
-        	Collection<ItxProtocolProtocol> itxProtocolProtocols = itxProtocolProtocolService.findItxProtocolProtocolsByFirstProtocol( firstProtocolId);
-            return new ResponseEntity<String>(ItxProtocolProtocol.toJsonArray(itxProtocolProtocols), headers, HttpStatus.OK);
-        }catch (Exception e){
-        	logger.error("Caught exception in findByFirstProtocol",e);
-        	return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
+        try {
+            Collection<ItxProtocolProtocol> itxProtocolProtocols = itxProtocolProtocolService
+                    .findItxProtocolProtocolsByFirstProtocol(firstProtocolId);
+            return new ResponseEntity<String>(ItxProtocolProtocol.toJsonArray(itxProtocolProtocols), headers,
+                    HttpStatus.OK);
+        } catch (Exception e) {
+            logger.error("Caught exception in findByFirstProtocol", e);
+            return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
-    
+
     @Transactional
     @RequestMapping(value = "/findBySecondProtocol/{id}", method = RequestMethod.GET)
     public ResponseEntity<String> findItxProtocolProtocolsBySecondProtocol(@PathVariable("id") Long secondProtocolId) {
-    	HttpHeaders headers = new HttpHeaders();
+        HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
         Protocol secondProtocol;
-        try{
-    		secondProtocol = Protocol.findProtocol(secondProtocolId);
-    	} catch(Exception e){
-    		logger.error("Error in findItxProtocolProtocolsBySecondProtocol: secondProtocol "+ secondProtocolId.toString()+" not found");
-    		return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-    	}
-        Collection<ItxProtocolProtocol> itxProtocolProtocols = ItxProtocolProtocol.findItxProtocolProtocolsBySecondProtocol(secondProtocol).getResultList();
-        return new ResponseEntity<String>(ItxProtocolProtocol.toJsonArray(itxProtocolProtocols), headers, HttpStatus.OK);
+        try {
+            secondProtocol = Protocol.findProtocol(secondProtocolId);
+        } catch (Exception e) {
+            logger.error("Error in findItxProtocolProtocolsBySecondProtocol: secondProtocol "
+                    + secondProtocolId.toString() + " not found");
+            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+        }
+        Collection<ItxProtocolProtocol> itxProtocolProtocols = ItxProtocolProtocol
+                .findItxProtocolProtocolsBySecondProtocol(secondProtocol).getResultList();
+        return new ResponseEntity<String>(ItxProtocolProtocol.toJsonArray(itxProtocolProtocols), headers,
+                HttpStatus.OK);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiItxSubjectContainerController.java b/src/main/java/com/labsynch/labseer/api/ApiItxSubjectContainerController.java
index 3d280e0af..eea29d970 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiItxSubjectContainerController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiItxSubjectContainerController.java
@@ -48,15 +48,16 @@ public ResponseEntity<java.lang.String> showJson(@PathVariable("id") Long id) {
         }
         return new ResponseEntity<String>(itxSubjectContainer.toJson(), headers, HttpStatus.OK);
     }
-    
+
     @RequestMapping(value = "/getBySubjectIdOrCodeName/{subjectIdOrCodeName}", headers = "Accept=application/json")
     @ResponseBody
-    public ResponseEntity<java.lang.String> getBySubjectIdOrCodeName(@PathVariable("subjectIdOrCodeName") String subjectIdOrCodeName) {
+    public ResponseEntity<java.lang.String> getBySubjectIdOrCodeName(
+            @PathVariable("subjectIdOrCodeName") String subjectIdOrCodeName) {
         Subject subject = null;
-    	if (SimpleUtil.isNumeric(subjectIdOrCodeName)){
-        	subject = Subject.findSubject(Long.valueOf(subjectIdOrCodeName));
-        }else{
-        	subject = Subject.findSubjectByCodeNameEquals(subjectIdOrCodeName);
+        if (SimpleUtil.isNumeric(subjectIdOrCodeName)) {
+            subject = Subject.findSubject(Long.valueOf(subjectIdOrCodeName));
+        } else {
+            subject = Subject.findSubjectByCodeNameEquals(subjectIdOrCodeName);
         }
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json; charset=utf-8");
@@ -64,7 +65,8 @@ public ResponseEntity<java.lang.String> getBySubjectIdOrCodeName(@PathVariable("
             return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
         }
         Collection<ItxSubjectContainer> itxSubjectContainers = subject.getContainers();
-        return new ResponseEntity<String>(ItxSubjectContainer.toJsonArray(itxSubjectContainers), headers, HttpStatus.OK);
+        return new ResponseEntity<String>(ItxSubjectContainer.toJsonArray(itxSubjectContainers), headers,
+                HttpStatus.OK);
     }
 
     @RequestMapping(headers = "Accept=application/json")
@@ -78,67 +80,73 @@ public ResponseEntity<java.lang.String> listJson() {
 
     @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<java.lang.String> createFromJson(@RequestBody ItxSubjectContainer itxSubjectContainer) {
-        logger.debug("Incoming itxSubjectContainer JSON: "+itxSubjectContainer.toJson());
+        logger.debug("Incoming itxSubjectContainer JSON: " + itxSubjectContainer.toJson());
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-        try{
-        	ItxSubjectContainer savedItx = itxSubjectContainerService.saveLsItxSubjectContainer(itxSubjectContainer);
+        try {
+            ItxSubjectContainer savedItx = itxSubjectContainerService.saveLsItxSubjectContainer(itxSubjectContainer);
             return new ResponseEntity<String>(savedItx.toJson(), headers, HttpStatus.CREATED);
-        }catch(Exception e){
-        	logger.error("Caught error creating itxSubjectContainerContainer from JSON", e);
-        	return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
+        } catch (Exception e) {
+            logger.error("Caught error creating itxSubjectContainerContainer from JSON", e);
+            return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
         }
-        
+
     }
 
     @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> createFromJsonArray(@RequestBody List<ItxSubjectContainer> itxSubjectContainers) {
-    	HttpHeaders headers = new HttpHeaders();
+    public ResponseEntity<java.lang.String> createFromJsonArray(
+            @RequestBody List<ItxSubjectContainer> itxSubjectContainers) {
+        HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-        try{
-        	Collection<ItxSubjectContainer> savedItxSubjectContainers = new ArrayList<ItxSubjectContainer>();
+        try {
+            Collection<ItxSubjectContainer> savedItxSubjectContainers = new ArrayList<ItxSubjectContainer>();
             for (ItxSubjectContainer itxSubjectContainer : itxSubjectContainers) {
-                savedItxSubjectContainers.add(itxSubjectContainerService.saveLsItxSubjectContainer(itxSubjectContainer));
+                savedItxSubjectContainers
+                        .add(itxSubjectContainerService.saveLsItxSubjectContainer(itxSubjectContainer));
             }
-            return new ResponseEntity<String>(ItxSubjectContainer.toJsonArray(savedItxSubjectContainers), headers, HttpStatus.CREATED);
-        }catch(Exception e){
-        	logger.error("Caught error creating itxSubjectContainerContainer from JSON Array", e);
-        	return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
+            return new ResponseEntity<String>(ItxSubjectContainer.toJsonArray(savedItxSubjectContainers), headers,
+                    HttpStatus.CREATED);
+        } catch (Exception e) {
+            logger.error("Caught error creating itxSubjectContainerContainer from JSON Array", e);
+            return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
         }
-    	
+
     }
 
     @Transactional
-    @RequestMapping(value = { "","/", "/{id}" }, method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = { "", "/", "/{id}" }, method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateFromJson(@RequestBody String json) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
         ItxSubjectContainer itxSubjectContainer = ItxSubjectContainer.fromJsonToItxSubjectContainer(json);
         ItxSubjectContainer updatedItxSubjectContainer = null;
-        try{
-			updatedItxSubjectContainer = itxSubjectContainerService.updateItxSubjectContainer(itxSubjectContainer);
-	        return new ResponseEntity<String>(updatedItxSubjectContainer.toJson(), headers, HttpStatus.OK);
+        try {
+            updatedItxSubjectContainer = itxSubjectContainerService.updateItxSubjectContainer(itxSubjectContainer);
+            return new ResponseEntity<String>(updatedItxSubjectContainer.toJson(), headers, HttpStatus.OK);
         } catch (Exception e) {
-			logger.error("Caught error updating ItxSubjectContainer from JSON",e);
-			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
+            logger.error("Caught error updating ItxSubjectContainer from JSON", e);
+            return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
-    
+
     @RequestMapping(value = "/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateFromJsonArray(@RequestBody String json) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
         Collection<ItxSubjectContainer> updatedItxSubjectContainers = new HashSet<ItxSubjectContainer>();
-        try{
-            for (ItxSubjectContainer itxSubjectContainer: ItxSubjectContainer.fromJsonArrayToItxSubjectContainers(json)) {
-            	ItxSubjectContainer updatedItxSubjectContainer = itxSubjectContainerService.updateItxSubjectContainer(itxSubjectContainer);
-            	updatedItxSubjectContainers.add(updatedItxSubjectContainer);
+        try {
+            for (ItxSubjectContainer itxSubjectContainer : ItxSubjectContainer
+                    .fromJsonArrayToItxSubjectContainers(json)) {
+                ItxSubjectContainer updatedItxSubjectContainer = itxSubjectContainerService
+                        .updateItxSubjectContainer(itxSubjectContainer);
+                updatedItxSubjectContainers.add(updatedItxSubjectContainer);
             }
-	        return new ResponseEntity<String>(ItxSubjectContainer.toJsonArray(updatedItxSubjectContainers), headers, HttpStatus.OK);
+            return new ResponseEntity<String>(ItxSubjectContainer.toJsonArray(updatedItxSubjectContainers), headers,
+                    HttpStatus.OK);
         } catch (Exception e) {
-			logger.error("Caught error updating ItxSubjectContainers from JSON",e);
-			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
-		}
+            logger.error("Caught error updating ItxSubjectContainers from JSON", e);
+            return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
+        }
     }
 
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
diff --git a/src/main/java/com/labsynch/labseer/api/ApiKindController.java b/src/main/java/com/labsynch/labseer/api/ApiKindController.java
index d789979b1..073c76975 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiKindController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiKindController.java
@@ -35,9 +35,9 @@
 
 public class ApiKindController {
 
-	private static final Logger logger = LoggerFactory.getLogger(ApiKindController.class);
+    private static final Logger logger = LoggerFactory.getLogger(ApiKindController.class);
 
-	@RequestMapping(value = "/ddictkinds/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/ddictkinds/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showDDictKindJson(@PathVariable("id") Long id) {
         DDictKind DDictKind_ = DDictKind.findDDictKind(id);
@@ -49,7 +49,7 @@ public ResponseEntity<String> showDDictKindJson(@PathVariable("id") Long id) {
         return new ResponseEntity<String>(DDictKind_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/ddictkinds", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/ddictkinds", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listDDictKindJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -58,18 +58,18 @@ public ResponseEntity<String> listDDictKindJson() {
         return new ResponseEntity<String>(DDictKind.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/ddictkinds", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/ddictkinds", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createDDictKindFromJson(@RequestBody DDictKind DDictKind_) {
-		DDictKind_.persist();
+        DDictKind_.persist();
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
         return new ResponseEntity<String>(DDictKind_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/ddictkinds/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/ddictkinds/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createDDictKindFromJsonArray(@RequestBody List<DDictKind> dDictKinds) {
-		Collection<DDictKind> newDDictKinds = new ArrayList<DDictKind>();
-        for (DDictKind DDictKind_: dDictKinds) {
+        Collection<DDictKind> newDDictKinds = new ArrayList<DDictKind>();
+        for (DDictKind DDictKind_ : dDictKinds) {
             DDictKind_.persist();
             newDDictKinds.add(DDictKind_);
         }
@@ -78,7 +78,7 @@ public ResponseEntity<String> createDDictKindFromJsonArray(@RequestBody List<DDi
         return new ResponseEntity<String>(DDictKind.toJsonArray(newDDictKinds), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/ddictkinds/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/ddictkinds/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateDDictKindFromJson(@RequestBody DDictKind DDictKind_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -88,12 +88,12 @@ public ResponseEntity<String> updateDDictKindFromJson(@RequestBody DDictKind DDi
         return new ResponseEntity<String>(DDictKind_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/ddictkinds/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/ddictkinds/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateDDictKindFromJsonArray(@RequestBody List<DDictKind> dDictKinds) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<DDictKind> newDDictKinds = new ArrayList<DDictKind>();
-        for (DDictKind DDictKind_: dDictKinds) {
+        Collection<DDictKind> newDDictKinds = new ArrayList<DDictKind>();
+        for (DDictKind DDictKind_ : dDictKinds) {
             if (DDictKind_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -102,7 +102,7 @@ public ResponseEntity<String> updateDDictKindFromJsonArray(@RequestBody List<DDi
         return new ResponseEntity<String>(DDictKind.toJsonArray(newDDictKinds), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/ddictkinds/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/ddictkinds/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteDDictKindFromJson(@PathVariable("id") Long id) {
         DDictKind DDictKind_ = DDictKind.findDDictKind(id);
         HttpHeaders headers = new HttpHeaders();
@@ -113,8 +113,8 @@ public ResponseEntity<String> deleteDDictKindFromJson(@PathVariable("id") Long i
         DDictKind_.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-	
-	@RequestMapping(value = "/containerkinds/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/containerkinds/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showContainerKindJson(@PathVariable("id") Long id) {
         ContainerKind ContainerKind_ = ContainerKind.findContainerKind(id);
@@ -126,7 +126,7 @@ public ResponseEntity<String> showContainerKindJson(@PathVariable("id") Long id)
         return new ResponseEntity<String>(ContainerKind_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/containerkinds", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/containerkinds", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listContainerKindJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -135,7 +135,7 @@ public ResponseEntity<String> listContainerKindJson() {
         return new ResponseEntity<String>(ContainerKind.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/containerkinds", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/containerkinds", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createContainerKindFromJson(@RequestBody ContainerKind ContainerKind_) {
         ContainerKind_.persist();
         HttpHeaders headers = new HttpHeaders();
@@ -143,10 +143,10 @@ public ResponseEntity<String> createContainerKindFromJson(@RequestBody Container
         return new ResponseEntity<String>(ContainerKind_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/containerkinds/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/containerkinds/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createContainerKindFromJsonArray(@RequestBody List<ContainerKind> containerKinds) {
-		Collection<ContainerKind> newContainerKinds = new ArrayList<ContainerKind>();
-        for (ContainerKind ContainerKind_: containerKinds) {
+        Collection<ContainerKind> newContainerKinds = new ArrayList<ContainerKind>();
+        for (ContainerKind ContainerKind_ : containerKinds) {
             ContainerKind_.persist();
             newContainerKinds.add(ContainerKind_);
         }
@@ -155,7 +155,7 @@ public ResponseEntity<String> createContainerKindFromJsonArray(@RequestBody List
         return new ResponseEntity<String>(ContainerKind.toJsonArray(newContainerKinds), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/containerkinds/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/containerkinds/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateContainerKindFromJson(@RequestBody ContainerKind ContainerKind_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -165,12 +165,12 @@ public ResponseEntity<String> updateContainerKindFromJson(@RequestBody Container
         return new ResponseEntity<String>(ContainerKind_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/containerkinds/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/containerkinds/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateContainerKindFromJsonArray(@RequestBody List<ContainerKind> containerKinds) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<ContainerKind> newContainerKinds = new ArrayList<ContainerKind>();
-        for (ContainerKind ContainerKind_: containerKinds) {
+        Collection<ContainerKind> newContainerKinds = new ArrayList<ContainerKind>();
+        for (ContainerKind ContainerKind_ : containerKinds) {
             if (ContainerKind_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -179,7 +179,7 @@ public ResponseEntity<String> updateContainerKindFromJsonArray(@RequestBody List
         return new ResponseEntity<String>(ContainerKind.toJsonArray(newContainerKinds), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/containerkinds/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/containerkinds/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteContainerKindFromJson(@PathVariable("id") Long id) {
         ContainerKind ContainerKind_ = ContainerKind.findContainerKind(id);
         HttpHeaders headers = new HttpHeaders();
@@ -190,8 +190,8 @@ public ResponseEntity<String> deleteContainerKindFromJson(@PathVariable("id") Lo
         ContainerKind_.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-	
-	@RequestMapping(value = "/experimentkinds/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/experimentkinds/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showExperimentKindJson(@PathVariable("id") Long id) {
         ExperimentKind ExperimentKind_ = ExperimentKind.findExperimentKind(id);
@@ -203,7 +203,7 @@ public ResponseEntity<String> showExperimentKindJson(@PathVariable("id") Long id
         return new ResponseEntity<String>(ExperimentKind_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/experimentkinds", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/experimentkinds", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listExperimentKindJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -212,7 +212,7 @@ public ResponseEntity<String> listExperimentKindJson() {
         return new ResponseEntity<String>(ExperimentKind.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/experimentkinds", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/experimentkinds", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createExperimentKindFromJson(@RequestBody ExperimentKind ExperimentKind_) {
         ExperimentKind_.persist();
         HttpHeaders headers = new HttpHeaders();
@@ -220,10 +220,10 @@ public ResponseEntity<String> createExperimentKindFromJson(@RequestBody Experime
         return new ResponseEntity<String>(ExperimentKind_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/experimentkinds/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/experimentkinds/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createExperimentKindFromJsonArray(@RequestBody List<ExperimentKind> experimentKinds) {
-		Collection<ExperimentKind> newExperimentKinds = new ArrayList<ExperimentKind>();
-        for (ExperimentKind ExperimentKind_: experimentKinds) {
+        Collection<ExperimentKind> newExperimentKinds = new ArrayList<ExperimentKind>();
+        for (ExperimentKind ExperimentKind_ : experimentKinds) {
             ExperimentKind_.persist();
             newExperimentKinds.add(ExperimentKind_);
         }
@@ -232,7 +232,7 @@ public ResponseEntity<String> createExperimentKindFromJsonArray(@RequestBody Lis
         return new ResponseEntity<String>(ExperimentKind.toJsonArray(newExperimentKinds), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/experimentkinds/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/experimentkinds/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateExperimentKindFromJson(@RequestBody ExperimentKind ExperimentKind_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -242,12 +242,12 @@ public ResponseEntity<String> updateExperimentKindFromJson(@RequestBody Experime
         return new ResponseEntity<String>(ExperimentKind_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/experimentkinds/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/experimentkinds/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateExperimentKindFromJsonArray(@RequestBody List<ExperimentKind> experimentKinds) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<ExperimentKind> newExperimentKinds = new ArrayList<ExperimentKind>();
-        for (ExperimentKind ExperimentKind_: experimentKinds) {
+        Collection<ExperimentKind> newExperimentKinds = new ArrayList<ExperimentKind>();
+        for (ExperimentKind ExperimentKind_ : experimentKinds) {
             if (ExperimentKind_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -256,7 +256,7 @@ public ResponseEntity<String> updateExperimentKindFromJsonArray(@RequestBody Lis
         return new ResponseEntity<String>(ExperimentKind.toJsonArray(newExperimentKinds), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/experimentkinds/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/experimentkinds/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteExperimentKindFromJson(@PathVariable("id") Long id) {
         ExperimentKind ExperimentKind_ = ExperimentKind.findExperimentKind(id);
         HttpHeaders headers = new HttpHeaders();
@@ -267,8 +267,8 @@ public ResponseEntity<String> deleteExperimentKindFromJson(@PathVariable("id") L
         ExperimentKind_.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-	
-	@RequestMapping(value = "/labelkinds/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/labelkinds/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showLabelKindJson(@PathVariable("id") Long id) {
         LabelKind LabelKind_ = LabelKind.findLabelKind(id);
@@ -280,7 +280,7 @@ public ResponseEntity<String> showLabelKindJson(@PathVariable("id") Long id) {
         return new ResponseEntity<String>(LabelKind_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/labelkinds", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/labelkinds", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listLabelKindJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -289,7 +289,7 @@ public ResponseEntity<String> listLabelKindJson() {
         return new ResponseEntity<String>(LabelKind.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/labelkinds", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/labelkinds", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createLabelKindFromJson(@RequestBody LabelKind LabelKind_) {
         LabelKind_.persist();
         HttpHeaders headers = new HttpHeaders();
@@ -297,10 +297,10 @@ public ResponseEntity<String> createLabelKindFromJson(@RequestBody LabelKind Lab
         return new ResponseEntity<String>(LabelKind_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/labelkinds/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/labelkinds/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createLabelKindFromJsonArray(@RequestBody List<LabelKind> labelKinds) {
-		Collection<LabelKind> newLabelKinds = new ArrayList<LabelKind>();
-        for (LabelKind LabelKind_: labelKinds) {
+        Collection<LabelKind> newLabelKinds = new ArrayList<LabelKind>();
+        for (LabelKind LabelKind_ : labelKinds) {
             LabelKind_.persist();
             newLabelKinds.add(LabelKind_);
         }
@@ -309,7 +309,7 @@ public ResponseEntity<String> createLabelKindFromJsonArray(@RequestBody List<Lab
         return new ResponseEntity<String>(LabelKind.toJsonArray(newLabelKinds), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/labelkinds/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/labelkinds/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateLabelKindFromJson(@RequestBody LabelKind LabelKind_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -319,12 +319,12 @@ public ResponseEntity<String> updateLabelKindFromJson(@RequestBody LabelKind Lab
         return new ResponseEntity<String>(LabelKind_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/labelkinds/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/labelkinds/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateLabelKindFromJsonArray(@RequestBody List<LabelKind> labelKinds) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<LabelKind> newLabelKinds = new ArrayList<LabelKind>();
-        for (LabelKind LabelKind_: labelKinds) {
+        Collection<LabelKind> newLabelKinds = new ArrayList<LabelKind>();
+        for (LabelKind LabelKind_ : labelKinds) {
             if (LabelKind_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -333,7 +333,7 @@ public ResponseEntity<String> updateLabelKindFromJsonArray(@RequestBody List<Lab
         return new ResponseEntity<String>(LabelKind.toJsonArray(newLabelKinds), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/labelkinds/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/labelkinds/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteLabelKindFromJson(@PathVariable("id") Long id) {
         LabelKind LabelKind_ = LabelKind.findLabelKind(id);
         HttpHeaders headers = new HttpHeaders();
@@ -344,8 +344,8 @@ public ResponseEntity<String> deleteLabelKindFromJson(@PathVariable("id") Long i
         LabelKind_.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-	
-	@RequestMapping(value = "/operatorkinds/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/operatorkinds/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showOperatorKindJson(@PathVariable("id") Long id) {
         OperatorKind OperatorKind_ = OperatorKind.findOperatorKind(id);
@@ -357,7 +357,7 @@ public ResponseEntity<String> showOperatorKindJson(@PathVariable("id") Long id)
         return new ResponseEntity<String>(OperatorKind_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/operatorkinds", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/operatorkinds", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listOperatorKindJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -366,7 +366,7 @@ public ResponseEntity<String> listOperatorKindJson() {
         return new ResponseEntity<String>(OperatorKind.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/operatorkinds", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/operatorkinds", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createOperatorKindFromJson(@RequestBody OperatorKind OperatorKind_) {
         OperatorKind_.persist();
         HttpHeaders headers = new HttpHeaders();
@@ -374,10 +374,10 @@ public ResponseEntity<String> createOperatorKindFromJson(@RequestBody OperatorKi
         return new ResponseEntity<String>(OperatorKind_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/operatorkinds/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/operatorkinds/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createOperatorKindFromJsonArray(@RequestBody List<OperatorKind> operatorKinds) {
-		Collection<OperatorKind> newOperatorKinds = new ArrayList<OperatorKind>();
-        for (OperatorKind OperatorKind_: operatorKinds) {
+        Collection<OperatorKind> newOperatorKinds = new ArrayList<OperatorKind>();
+        for (OperatorKind OperatorKind_ : operatorKinds) {
             OperatorKind_.persist();
             newOperatorKinds.add(OperatorKind_);
         }
@@ -386,7 +386,7 @@ public ResponseEntity<String> createOperatorKindFromJsonArray(@RequestBody List<
         return new ResponseEntity<String>(OperatorKind.toJsonArray(newOperatorKinds), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/operatorkinds/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/operatorkinds/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateOperatorKindFromJson(@RequestBody OperatorKind OperatorKind_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -396,12 +396,12 @@ public ResponseEntity<String> updateOperatorKindFromJson(@RequestBody OperatorKi
         return new ResponseEntity<String>(OperatorKind_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/operatorkinds/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/operatorkinds/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateOperatorKindFromJsonArray(@RequestBody List<OperatorKind> operatorKinds) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<OperatorKind> newOperatorKinds = new ArrayList<OperatorKind>();
-        for (OperatorKind OperatorKind_: operatorKinds) {
+        Collection<OperatorKind> newOperatorKinds = new ArrayList<OperatorKind>();
+        for (OperatorKind OperatorKind_ : operatorKinds) {
             if (OperatorKind_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -410,7 +410,7 @@ public ResponseEntity<String> updateOperatorKindFromJsonArray(@RequestBody List<
         return new ResponseEntity<String>(OperatorKind.toJsonArray(newOperatorKinds), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/operatorkinds/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/operatorkinds/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteOperatorKindFromJson(@PathVariable("id") Long id) {
         OperatorKind OperatorKind_ = OperatorKind.findOperatorKind(id);
         HttpHeaders headers = new HttpHeaders();
@@ -421,8 +421,8 @@ public ResponseEntity<String> deleteOperatorKindFromJson(@PathVariable("id") Lon
         OperatorKind_.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-	
-	@RequestMapping(value = "/protocolkinds/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/protocolkinds/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showProtocolKindJson(@PathVariable("id") Long id) {
         ProtocolKind ProtocolKind_ = ProtocolKind.findProtocolKind(id);
@@ -434,7 +434,7 @@ public ResponseEntity<String> showProtocolKindJson(@PathVariable("id") Long id)
         return new ResponseEntity<String>(ProtocolKind_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/protocolkinds", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/protocolkinds", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listProtocolKindJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -443,7 +443,7 @@ public ResponseEntity<String> listProtocolKindJson() {
         return new ResponseEntity<String>(ProtocolKind.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/protocolkinds", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/protocolkinds", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createProtocolKindFromJson(@RequestBody ProtocolKind ProtocolKind_) {
         ProtocolKind_.persist();
         HttpHeaders headers = new HttpHeaders();
@@ -451,10 +451,10 @@ public ResponseEntity<String> createProtocolKindFromJson(@RequestBody ProtocolKi
         return new ResponseEntity<String>(ProtocolKind_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/protocolkinds/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/protocolkinds/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createProtocolKindFromJsonArray(@RequestBody List<ProtocolKind> protocolKinds) {
-		Collection<ProtocolKind> newProtocolKinds = new ArrayList<ProtocolKind>();
-        for (ProtocolKind ProtocolKind_: protocolKinds) {
+        Collection<ProtocolKind> newProtocolKinds = new ArrayList<ProtocolKind>();
+        for (ProtocolKind ProtocolKind_ : protocolKinds) {
             ProtocolKind_.persist();
             newProtocolKinds.add(ProtocolKind_);
         }
@@ -463,7 +463,7 @@ public ResponseEntity<String> createProtocolKindFromJsonArray(@RequestBody List<
         return new ResponseEntity<String>(ProtocolKind.toJsonArray(newProtocolKinds), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/protocolkinds/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/protocolkinds/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateProtocolKindFromJson(@RequestBody ProtocolKind ProtocolKind_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -473,12 +473,12 @@ public ResponseEntity<String> updateProtocolKindFromJson(@RequestBody ProtocolKi
         return new ResponseEntity<String>(ProtocolKind_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/protocolkinds/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/protocolkinds/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateProtocolKindFromJsonArray(@RequestBody List<ProtocolKind> protocolKinds) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<ProtocolKind> newProtocolKinds = new ArrayList<ProtocolKind>();
-        for (ProtocolKind ProtocolKind_: protocolKinds) {
+        Collection<ProtocolKind> newProtocolKinds = new ArrayList<ProtocolKind>();
+        for (ProtocolKind ProtocolKind_ : protocolKinds) {
             if (ProtocolKind_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -487,7 +487,7 @@ public ResponseEntity<String> updateProtocolKindFromJsonArray(@RequestBody List<
         return new ResponseEntity<String>(ProtocolKind.toJsonArray(newProtocolKinds), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/protocolkinds/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/protocolkinds/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteProtocolKindFromJson(@PathVariable("id") Long id) {
         ProtocolKind ProtocolKind_ = ProtocolKind.findProtocolKind(id);
         HttpHeaders headers = new HttpHeaders();
@@ -498,8 +498,8 @@ public ResponseEntity<String> deleteProtocolKindFromJson(@PathVariable("id") Lon
         ProtocolKind_.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-	
-	@RequestMapping(value = "/statekinds/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/statekinds/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showStateKindJson(@PathVariable("id") Long id) {
         StateKind StateKind_ = StateKind.findStateKind(id);
@@ -511,7 +511,7 @@ public ResponseEntity<String> showStateKindJson(@PathVariable("id") Long id) {
         return new ResponseEntity<String>(StateKind_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/statekinds", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/statekinds", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listStateKindJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -520,7 +520,7 @@ public ResponseEntity<String> listStateKindJson() {
         return new ResponseEntity<String>(StateKind.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/statekinds", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/statekinds", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createStateKindFromJson(@RequestBody StateKind StateKind_) {
         StateKind_.persist();
         HttpHeaders headers = new HttpHeaders();
@@ -528,10 +528,10 @@ public ResponseEntity<String> createStateKindFromJson(@RequestBody StateKind Sta
         return new ResponseEntity<String>(StateKind_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/statekinds/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/statekinds/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createStateKindFromJsonArray(@RequestBody List<StateKind> stateKinds) {
-		Collection<StateKind> newStateKinds = new ArrayList<StateKind>();
-        for (StateKind StateKind_: stateKinds) {
+        Collection<StateKind> newStateKinds = new ArrayList<StateKind>();
+        for (StateKind StateKind_ : stateKinds) {
             StateKind_.persist();
             newStateKinds.add(StateKind_);
         }
@@ -540,7 +540,7 @@ public ResponseEntity<String> createStateKindFromJsonArray(@RequestBody List<Sta
         return new ResponseEntity<String>(StateKind.toJsonArray(newStateKinds), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/statekinds/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/statekinds/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateStateKindFromJson(@RequestBody StateKind StateKind_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -550,12 +550,12 @@ public ResponseEntity<String> updateStateKindFromJson(@RequestBody StateKind Sta
         return new ResponseEntity<String>(StateKind_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/statekinds/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/statekinds/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateStateKindFromJsonArray(@RequestBody List<StateKind> stateKinds) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<StateKind> newStateKinds = new ArrayList<StateKind>();
-        for (StateKind StateKind_: stateKinds) {
+        Collection<StateKind> newStateKinds = new ArrayList<StateKind>();
+        for (StateKind StateKind_ : stateKinds) {
             if (StateKind_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -564,7 +564,7 @@ public ResponseEntity<String> updateStateKindFromJsonArray(@RequestBody List<Sta
         return new ResponseEntity<String>(StateKind.toJsonArray(newStateKinds), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/statekinds/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/statekinds/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteStateKindFromJson(@PathVariable("id") Long id) {
         StateKind StateKind_ = StateKind.findStateKind(id);
         HttpHeaders headers = new HttpHeaders();
@@ -575,8 +575,8 @@ public ResponseEntity<String> deleteStateKindFromJson(@PathVariable("id") Long i
         StateKind_.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-	
-	@RequestMapping(value = "/thingkinds/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/thingkinds/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showThingKindJson(@PathVariable("id") Long id) {
         ThingKind ThingKind_ = ThingKind.findThingKind(id);
@@ -588,7 +588,7 @@ public ResponseEntity<String> showThingKindJson(@PathVariable("id") Long id) {
         return new ResponseEntity<String>(ThingKind_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/thingkinds", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/thingkinds", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listThingKindJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -597,7 +597,7 @@ public ResponseEntity<String> listThingKindJson() {
         return new ResponseEntity<String>(ThingKind.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/thingkinds", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/thingkinds", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createThingKindFromJson(@RequestBody ThingKind ThingKind_) {
         ThingKind_.persist();
         HttpHeaders headers = new HttpHeaders();
@@ -605,10 +605,10 @@ public ResponseEntity<String> createThingKindFromJson(@RequestBody ThingKind Thi
         return new ResponseEntity<String>(ThingKind_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/thingkinds/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/thingkinds/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createThingKindFromJsonArray(@RequestBody List<ThingKind> thingKinds) {
-		Collection<ThingKind> newThingKinds = new ArrayList<ThingKind>();
-        for (ThingKind ThingKind_: thingKinds) {
+        Collection<ThingKind> newThingKinds = new ArrayList<ThingKind>();
+        for (ThingKind ThingKind_ : thingKinds) {
             ThingKind_.persist();
             newThingKinds.add(ThingKind_);
         }
@@ -617,7 +617,7 @@ public ResponseEntity<String> createThingKindFromJsonArray(@RequestBody List<Thi
         return new ResponseEntity<String>(ThingKind.toJsonArray(newThingKinds), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/thingkinds/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/thingkinds/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateThingKindFromJson(@RequestBody ThingKind ThingKind_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -627,12 +627,12 @@ public ResponseEntity<String> updateThingKindFromJson(@RequestBody ThingKind Thi
         return new ResponseEntity<String>(ThingKind_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/thingkinds/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/thingkinds/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateThingKindFromJsonArray(@RequestBody List<ThingKind> thingKinds) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<ThingKind> newThingKinds = new ArrayList<ThingKind>();
-        for (ThingKind ThingKind_: thingKinds) {
+        Collection<ThingKind> newThingKinds = new ArrayList<ThingKind>();
+        for (ThingKind ThingKind_ : thingKinds) {
             if (ThingKind_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -641,7 +641,7 @@ public ResponseEntity<String> updateThingKindFromJsonArray(@RequestBody List<Thi
         return new ResponseEntity<String>(ThingKind.toJsonArray(newThingKinds), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/thingkinds/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/thingkinds/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteThingKindFromJson(@PathVariable("id") Long id) {
         ThingKind ThingKind_ = ThingKind.findThingKind(id);
         HttpHeaders headers = new HttpHeaders();
@@ -652,8 +652,8 @@ public ResponseEntity<String> deleteThingKindFromJson(@PathVariable("id") Long i
         ThingKind_.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-	
-	@RequestMapping(value = "/unitkinds/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/unitkinds/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showUnitKindJson(@PathVariable("id") Long id) {
         UnitKind UnitKind_ = UnitKind.findUnitKind(id);
@@ -665,7 +665,7 @@ public ResponseEntity<String> showUnitKindJson(@PathVariable("id") Long id) {
         return new ResponseEntity<String>(UnitKind_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/unitkinds", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/unitkinds", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listUnitKindJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -674,7 +674,7 @@ public ResponseEntity<String> listUnitKindJson() {
         return new ResponseEntity<String>(UnitKind.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/unitkinds", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/unitkinds", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createUnitKindFromJson(@RequestBody UnitKind UnitKind_) {
         UnitKind_.persist();
         HttpHeaders headers = new HttpHeaders();
@@ -682,10 +682,10 @@ public ResponseEntity<String> createUnitKindFromJson(@RequestBody UnitKind UnitK
         return new ResponseEntity<String>(UnitKind_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/unitkinds/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/unitkinds/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createUnitKindFromJsonArray(@RequestBody List<UnitKind> unitKinds) {
-		Collection<UnitKind> newUnitKinds = new ArrayList<UnitKind>();
-        for (UnitKind UnitKind_: unitKinds) {
+        Collection<UnitKind> newUnitKinds = new ArrayList<UnitKind>();
+        for (UnitKind UnitKind_ : unitKinds) {
             UnitKind_.persist();
             unitKinds.add(UnitKind_);
         }
@@ -694,7 +694,7 @@ public ResponseEntity<String> createUnitKindFromJsonArray(@RequestBody List<Unit
         return new ResponseEntity<String>(UnitKind.toJsonArray(newUnitKinds), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/unitkinds/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/unitkinds/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateUnitKindFromJson(@RequestBody UnitKind UnitKind_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -704,12 +704,12 @@ public ResponseEntity<String> updateUnitKindFromJson(@RequestBody UnitKind UnitK
         return new ResponseEntity<String>(UnitKind_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/unitkinds/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/unitkinds/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateUnitKindFromJsonArray(@RequestBody List<UnitKind> unitKinds) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<UnitKind> newUnitKinds = new ArrayList<UnitKind>();
-        for (UnitKind UnitKind_: unitKinds) {
+        Collection<UnitKind> newUnitKinds = new ArrayList<UnitKind>();
+        for (UnitKind UnitKind_ : unitKinds) {
             if (UnitKind_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -718,7 +718,7 @@ public ResponseEntity<String> updateUnitKindFromJsonArray(@RequestBody List<Unit
         return new ResponseEntity<String>(UnitKind.toJsonArray(newUnitKinds), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/unitkinds/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/unitkinds/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteUnitKindFromJson(@PathVariable("id") Long id) {
         UnitKind UnitKind_ = UnitKind.findUnitKind(id);
         HttpHeaders headers = new HttpHeaders();
@@ -729,8 +729,8 @@ public ResponseEntity<String> deleteUnitKindFromJson(@PathVariable("id") Long id
         UnitKind_.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-	
-	@RequestMapping(value = "/valuekinds/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/valuekinds/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showValueKindJson(@PathVariable("id") Long id) {
         ValueKind ValueKind_ = ValueKind.findValueKind(id);
@@ -742,7 +742,7 @@ public ResponseEntity<String> showValueKindJson(@PathVariable("id") Long id) {
         return new ResponseEntity<String>(ValueKind_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/valuekinds", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/valuekinds", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listValueKindJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -751,7 +751,7 @@ public ResponseEntity<String> listValueKindJson() {
         return new ResponseEntity<String>(ValueKind.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/valuekinds", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/valuekinds", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createValueKindFromJson(@RequestBody ValueKind ValueKind_) {
         ValueKind_.persist();
         HttpHeaders headers = new HttpHeaders();
@@ -759,10 +759,10 @@ public ResponseEntity<String> createValueKindFromJson(@RequestBody ValueKind Val
         return new ResponseEntity<String>(ValueKind_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/valuekinds/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/valuekinds/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createValueKindFromJsonArray(@RequestBody List<ValueKind> valueKinds) {
-		Collection<ValueKind> newValueKinds = new ArrayList<ValueKind>();
-        for (ValueKind ValueKind_: valueKinds) {
+        Collection<ValueKind> newValueKinds = new ArrayList<ValueKind>();
+        for (ValueKind ValueKind_ : valueKinds) {
             ValueKind_.persist();
             newValueKinds.add(ValueKind_);
         }
@@ -771,7 +771,7 @@ public ResponseEntity<String> createValueKindFromJsonArray(@RequestBody List<Val
         return new ResponseEntity<String>(ValueKind.toJsonArray(newValueKinds), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/valuekinds/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/valuekinds/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateValueKindFromJson(@RequestBody ValueKind ValueKind_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -781,12 +781,12 @@ public ResponseEntity<String> updateValueKindFromJson(@RequestBody ValueKind Val
         return new ResponseEntity<String>(ValueKind_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/valuekinds/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/valuekinds/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateValueKindFromJsonArray(@RequestBody List<ValueKind> valueKinds) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<ValueKind> newValueKinds = new ArrayList<ValueKind>();
-        for (ValueKind ValueKind_: valueKinds) {
+        Collection<ValueKind> newValueKinds = new ArrayList<ValueKind>();
+        for (ValueKind ValueKind_ : valueKinds) {
             if (ValueKind_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -795,7 +795,7 @@ public ResponseEntity<String> updateValueKindFromJsonArray(@RequestBody List<Val
         return new ResponseEntity<String>(ValueKind.toJsonArray(newValueKinds), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/valuekinds/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/valuekinds/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteValueKindFromJson(@PathVariable("id") Long id) {
         ValueKind ValueKind_ = ValueKind.findValueKind(id);
         HttpHeaders headers = new HttpHeaders();
@@ -806,8 +806,8 @@ public ResponseEntity<String> deleteValueKindFromJson(@PathVariable("id") Long i
         ValueKind_.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-	
-	@RequestMapping(value = "/interactionkinds/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/interactionkinds/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showInteractionKindJson(@PathVariable("id") Long id) {
         InteractionKind InteractionKind_ = InteractionKind.findInteractionKind(id);
@@ -819,7 +819,7 @@ public ResponseEntity<String> showInteractionKindJson(@PathVariable("id") Long i
         return new ResponseEntity<String>(InteractionKind_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/interactionkinds", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/interactionkinds", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listInteractionKindJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -828,7 +828,7 @@ public ResponseEntity<String> listInteractionKindJson() {
         return new ResponseEntity<String>(InteractionKind.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/interactionkinds", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/interactionkinds", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createInteractionKindFromJson(@RequestBody InteractionKind InteractionKind_) {
         InteractionKind_.persist();
         HttpHeaders headers = new HttpHeaders();
@@ -836,19 +836,21 @@ public ResponseEntity<String> createInteractionKindFromJson(@RequestBody Interac
         return new ResponseEntity<String>(InteractionKind_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/interactionkinds/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> createInteractionKindFromJsonArray(@RequestBody List<InteractionKind> interactionKinds) {
-		Collection<InteractionKind> newInteractionKinds = new ArrayList<InteractionKind>();
-        for (InteractionKind InteractionKind_: interactionKinds) {
+    @RequestMapping(value = "/interactionkinds/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    public ResponseEntity<String> createInteractionKindFromJsonArray(
+            @RequestBody List<InteractionKind> interactionKinds) {
+        Collection<InteractionKind> newInteractionKinds = new ArrayList<InteractionKind>();
+        for (InteractionKind InteractionKind_ : interactionKinds) {
             InteractionKind_.persist();
             newInteractionKinds.add(InteractionKind_);
         }
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-        return new ResponseEntity<String>(InteractionKind.toJsonArray(newInteractionKinds), headers, HttpStatus.CREATED);
+        return new ResponseEntity<String>(InteractionKind.toJsonArray(newInteractionKinds), headers,
+                HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/interactionkinds/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/interactionkinds/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateInteractionKindFromJson(@RequestBody InteractionKind InteractionKind_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -858,12 +860,13 @@ public ResponseEntity<String> updateInteractionKindFromJson(@RequestBody Interac
         return new ResponseEntity<String>(InteractionKind_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/interactionkinds/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> updateInteractionKindFromJsonArray(@RequestBody List<InteractionKind> interactionKinds) {
+    @RequestMapping(value = "/interactionkinds/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    public ResponseEntity<String> updateInteractionKindFromJsonArray(
+            @RequestBody List<InteractionKind> interactionKinds) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<InteractionKind> newInteractionKinds = new ArrayList<InteractionKind>();
-        for (InteractionKind InteractionKind_: interactionKinds) {
+        Collection<InteractionKind> newInteractionKinds = new ArrayList<InteractionKind>();
+        for (InteractionKind InteractionKind_ : interactionKinds) {
             if (InteractionKind_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -872,7 +875,7 @@ public ResponseEntity<String> updateInteractionKindFromJsonArray(@RequestBody Li
         return new ResponseEntity<String>(InteractionKind.toJsonArray(newInteractionKinds), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/interactionkinds/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/interactionkinds/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteInteractionKindFromJson(@PathVariable("id") Long id) {
         InteractionKind InteractionKind_ = InteractionKind.findInteractionKind(id);
         HttpHeaders headers = new HttpHeaders();
diff --git a/src/main/java/com/labsynch/labseer/api/ApiLabelController.java b/src/main/java/com/labsynch/labseer/api/ApiLabelController.java
index de939bf04..44e5226f3 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiLabelController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiLabelController.java
@@ -25,16 +25,15 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-
 @Transactional
 @RequestMapping("api/v1")
 @Controller
 
 public class ApiLabelController {
 
-	private static final Logger logger = LoggerFactory.getLogger(ApiLabelController.class);
-	
-	@RequestMapping(value = "/protocollabels/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+    private static final Logger logger = LoggerFactory.getLogger(ApiLabelController.class);
+
+    @RequestMapping(value = "/protocollabels/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showProtocolLabelJson(@PathVariable("id") Long id) {
         ProtocolLabel ProtocolLabel_ = ProtocolLabel.findProtocolLabel(id);
@@ -46,7 +45,7 @@ public ResponseEntity<String> showProtocolLabelJson(@PathVariable("id") Long id)
         return new ResponseEntity<String>(ProtocolLabel_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/protocollabels", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/protocollabels", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listProtocolLabelJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -55,18 +54,18 @@ public ResponseEntity<String> listProtocolLabelJson() {
         return new ResponseEntity<String>(ProtocolLabel.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/protocollabels", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/protocollabels", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createProtocolLabelFromJson(@RequestBody ProtocolLabel ProtocolLabel_) {
-		ProtocolLabel_.persist();
+        ProtocolLabel_.persist();
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
         return new ResponseEntity<String>(ProtocolLabel_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/protocollabels/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/protocollabels/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createProtocolLabelFromJsonArray(@RequestBody List<ProtocolLabel> protocolLabels) {
-		Collection<ProtocolLabel> newProtocolLabels = new ArrayList<ProtocolLabel>();
-        for (ProtocolLabel ProtocolLabel_: protocolLabels) {
+        Collection<ProtocolLabel> newProtocolLabels = new ArrayList<ProtocolLabel>();
+        for (ProtocolLabel ProtocolLabel_ : protocolLabels) {
             ProtocolLabel_.persist();
             newProtocolLabels.add(ProtocolLabel_);
         }
@@ -75,7 +74,7 @@ public ResponseEntity<String> createProtocolLabelFromJsonArray(@RequestBody List
         return new ResponseEntity<String>(ProtocolLabel.toJsonArray(newProtocolLabels), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/protocollabels/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/protocollabels/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateProtocolLabelFromJson(@RequestBody ProtocolLabel ProtocolLabel_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -85,12 +84,12 @@ public ResponseEntity<String> updateProtocolLabelFromJson(@RequestBody ProtocolL
         return new ResponseEntity<String>(ProtocolLabel_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/protocollabels/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/protocollabels/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateProtocolLabelFromJsonArray(@RequestBody List<ProtocolLabel> protocolLabels) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<ProtocolLabel> newProtocolLabels = new ArrayList<ProtocolLabel>();
-        for (ProtocolLabel ProtocolLabel_: protocolLabels) {
+        Collection<ProtocolLabel> newProtocolLabels = new ArrayList<ProtocolLabel>();
+        for (ProtocolLabel ProtocolLabel_ : protocolLabels) {
             if (ProtocolLabel_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -99,7 +98,7 @@ public ResponseEntity<String> updateProtocolLabelFromJsonArray(@RequestBody List
         return new ResponseEntity<String>(ProtocolLabel.toJsonArray(newProtocolLabels), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/protocollabels/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/protocollabels/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteProtocolLabelFromJson(@PathVariable("id") Long id) {
         ProtocolLabel ProtocolLabel_ = ProtocolLabel.findProtocolLabel(id);
         HttpHeaders headers = new HttpHeaders();
@@ -110,8 +109,8 @@ public ResponseEntity<String> deleteProtocolLabelFromJson(@PathVariable("id") Lo
         ProtocolLabel_.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-	
-	@RequestMapping(value = "/experimentlabels/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/experimentlabels/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showExperimentLabelJson(@PathVariable("id") Long id) {
         ExperimentLabel ExperimentLabel_ = ExperimentLabel.findExperimentLabel(id);
@@ -123,7 +122,7 @@ public ResponseEntity<String> showExperimentLabelJson(@PathVariable("id") Long i
         return new ResponseEntity<String>(ExperimentLabel_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/experimentlabels", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/experimentlabels", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listExperimentLabelJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -132,27 +131,29 @@ public ResponseEntity<String> listExperimentLabelJson() {
         return new ResponseEntity<String>(ExperimentLabel.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/experimentlabels", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/experimentlabels", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createExperimentLabelFromJson(@RequestBody ExperimentLabel ExperimentLabel_) {
-		ExperimentLabel_.persist();
+        ExperimentLabel_.persist();
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
         return new ResponseEntity<String>(ExperimentLabel_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/experimentlabels/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> createExperimentLabelFromJsonArray(@RequestBody List<ExperimentLabel> experimentLabels) {
-		Collection<ExperimentLabel> newExperimentLabels = new ArrayList<ExperimentLabel>();
-        for (ExperimentLabel ExperimentLabel_: experimentLabels) {
+    @RequestMapping(value = "/experimentlabels/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    public ResponseEntity<String> createExperimentLabelFromJsonArray(
+            @RequestBody List<ExperimentLabel> experimentLabels) {
+        Collection<ExperimentLabel> newExperimentLabels = new ArrayList<ExperimentLabel>();
+        for (ExperimentLabel ExperimentLabel_ : experimentLabels) {
             ExperimentLabel_.persist();
             newExperimentLabels.add(ExperimentLabel_);
         }
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-        return new ResponseEntity<String>(ExperimentLabel.toJsonArray(newExperimentLabels), headers, HttpStatus.CREATED);
+        return new ResponseEntity<String>(ExperimentLabel.toJsonArray(newExperimentLabels), headers,
+                HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/experimentlabels/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/experimentlabels/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateExperimentLabelFromJson(@RequestBody ExperimentLabel ExperimentLabel_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -162,12 +163,13 @@ public ResponseEntity<String> updateExperimentLabelFromJson(@RequestBody Experim
         return new ResponseEntity<String>(ExperimentLabel_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/experimentlabels/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> updateExperimentLabelFromJsonArray(@RequestBody List<ExperimentLabel> experimentLabels) {
+    @RequestMapping(value = "/experimentlabels/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    public ResponseEntity<String> updateExperimentLabelFromJsonArray(
+            @RequestBody List<ExperimentLabel> experimentLabels) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<ExperimentLabel> newExperimentLabels = new ArrayList<ExperimentLabel>();
-        for (ExperimentLabel ExperimentLabel_: experimentLabels) {
+        Collection<ExperimentLabel> newExperimentLabels = new ArrayList<ExperimentLabel>();
+        for (ExperimentLabel ExperimentLabel_ : experimentLabels) {
             if (ExperimentLabel_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -176,7 +178,7 @@ public ResponseEntity<String> updateExperimentLabelFromJsonArray(@RequestBody Li
         return new ResponseEntity<String>(ExperimentLabel.toJsonArray(newExperimentLabels), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/experimentlabels/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/experimentlabels/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteExperimentLabelFromJson(@PathVariable("id") Long id) {
         ExperimentLabel ExperimentLabel_ = ExperimentLabel.findExperimentLabel(id);
         HttpHeaders headers = new HttpHeaders();
@@ -187,8 +189,8 @@ public ResponseEntity<String> deleteExperimentLabelFromJson(@PathVariable("id")
         ExperimentLabel_.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-	
-	@RequestMapping(value = "/analysisgrouplabels/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/analysisgrouplabels/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showAnalysisGroupLabelJson(@PathVariable("id") Long id) {
         AnalysisGroupLabel AnalysisGroupLabel_ = AnalysisGroupLabel.findAnalysisGroupLabel(id);
@@ -200,7 +202,7 @@ public ResponseEntity<String> showAnalysisGroupLabelJson(@PathVariable("id") Lon
         return new ResponseEntity<String>(AnalysisGroupLabel_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/analysisgrouplabels", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/analysisgrouplabels", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listAnalysisGroupLabelJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -209,28 +211,32 @@ public ResponseEntity<String> listAnalysisGroupLabelJson() {
         return new ResponseEntity<String>(AnalysisGroupLabel.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/analysisgrouplabels", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> createAnalysisGroupLabelFromJson(@RequestBody AnalysisGroupLabel AnalysisGroupLabel_) {
-		AnalysisGroupLabel_.persist();
+    @RequestMapping(value = "/analysisgrouplabels", method = RequestMethod.POST, headers = "Accept=application/json")
+    public ResponseEntity<String> createAnalysisGroupLabelFromJson(
+            @RequestBody AnalysisGroupLabel AnalysisGroupLabel_) {
+        AnalysisGroupLabel_.persist();
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
         return new ResponseEntity<String>(AnalysisGroupLabel_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/analysisgrouplabels/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> createAnalysisGroupLabelFromJsonArray(@RequestBody List<AnalysisGroupLabel> analysisGroupLabels) {
-		Collection<AnalysisGroupLabel> newAnalysisGroupLabels = new ArrayList<AnalysisGroupLabel>();
-        for (AnalysisGroupLabel AnalysisGroupLabel_: analysisGroupLabels) {
+    @RequestMapping(value = "/analysisgrouplabels/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    public ResponseEntity<String> createAnalysisGroupLabelFromJsonArray(
+            @RequestBody List<AnalysisGroupLabel> analysisGroupLabels) {
+        Collection<AnalysisGroupLabel> newAnalysisGroupLabels = new ArrayList<AnalysisGroupLabel>();
+        for (AnalysisGroupLabel AnalysisGroupLabel_ : analysisGroupLabels) {
             AnalysisGroupLabel_.persist();
             newAnalysisGroupLabels.add(AnalysisGroupLabel_);
         }
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-        return new ResponseEntity<String>(AnalysisGroupLabel.toJsonArray(newAnalysisGroupLabels), headers, HttpStatus.CREATED);
+        return new ResponseEntity<String>(AnalysisGroupLabel.toJsonArray(newAnalysisGroupLabels), headers,
+                HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/analysisgrouplabels/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> updateAnalysisGroupLabelFromJson(@RequestBody AnalysisGroupLabel AnalysisGroupLabel_) {
+    @RequestMapping(value = "/analysisgrouplabels/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    public ResponseEntity<String> updateAnalysisGroupLabelFromJson(
+            @RequestBody AnalysisGroupLabel AnalysisGroupLabel_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
         if (AnalysisGroupLabel_.merge() == null) {
@@ -239,21 +245,23 @@ public ResponseEntity<String> updateAnalysisGroupLabelFromJson(@RequestBody Anal
         return new ResponseEntity<String>(AnalysisGroupLabel_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/analysisgrouplabels/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> updateAnalysisGroupLabelFromJsonArray(@RequestBody List<AnalysisGroupLabel> analysisGroupLabels) {
+    @RequestMapping(value = "/analysisgrouplabels/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    public ResponseEntity<String> updateAnalysisGroupLabelFromJsonArray(
+            @RequestBody List<AnalysisGroupLabel> analysisGroupLabels) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<AnalysisGroupLabel> newAnalysisGroupLabels = new ArrayList<AnalysisGroupLabel>();
-        for (AnalysisGroupLabel AnalysisGroupLabel_: analysisGroupLabels) {
+        Collection<AnalysisGroupLabel> newAnalysisGroupLabels = new ArrayList<AnalysisGroupLabel>();
+        for (AnalysisGroupLabel AnalysisGroupLabel_ : analysisGroupLabels) {
             if (AnalysisGroupLabel_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
             newAnalysisGroupLabels.add(AnalysisGroupLabel_);
         }
-        return new ResponseEntity<String>(AnalysisGroupLabel.toJsonArray(newAnalysisGroupLabels), headers, HttpStatus.OK);
+        return new ResponseEntity<String>(AnalysisGroupLabel.toJsonArray(newAnalysisGroupLabels), headers,
+                HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/analysisgrouplabels/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/analysisgrouplabels/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteAnalysisGroupLabelFromJson(@PathVariable("id") Long id) {
         AnalysisGroupLabel AnalysisGroupLabel_ = AnalysisGroupLabel.findAnalysisGroupLabel(id);
         HttpHeaders headers = new HttpHeaders();
@@ -264,8 +272,8 @@ public ResponseEntity<String> deleteAnalysisGroupLabelFromJson(@PathVariable("id
         AnalysisGroupLabel_.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-	
-	@RequestMapping(value = "/treatmentgrouplabels/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/treatmentgrouplabels/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showTreatmentGroupLabelJson(@PathVariable("id") Long id) {
         TreatmentGroupLabel TreatmentGroupLabel_ = TreatmentGroupLabel.findTreatmentGroupLabel(id);
@@ -277,7 +285,7 @@ public ResponseEntity<String> showTreatmentGroupLabelJson(@PathVariable("id") Lo
         return new ResponseEntity<String>(TreatmentGroupLabel_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/treatmentgrouplabels", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/treatmentgrouplabels", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listTreatmentGroupLabelJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -286,28 +294,32 @@ public ResponseEntity<String> listTreatmentGroupLabelJson() {
         return new ResponseEntity<String>(TreatmentGroupLabel.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/treatmentgrouplabels", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> createTreatmentGroupLabelFromJson(@RequestBody TreatmentGroupLabel TreatmentGroupLabel_) {
-		TreatmentGroupLabel_.persist();
+    @RequestMapping(value = "/treatmentgrouplabels", method = RequestMethod.POST, headers = "Accept=application/json")
+    public ResponseEntity<String> createTreatmentGroupLabelFromJson(
+            @RequestBody TreatmentGroupLabel TreatmentGroupLabel_) {
+        TreatmentGroupLabel_.persist();
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
         return new ResponseEntity<String>(TreatmentGroupLabel_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/treatmentgrouplabels/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> createTreatmentGroupLabelFromJsonArray(@RequestBody List<TreatmentGroupLabel> treatmentGroupLabels) {
-		Collection<TreatmentGroupLabel> newTreatmentGroupLabels = new ArrayList<TreatmentGroupLabel>();
-        for (TreatmentGroupLabel TreatmentGroupLabel_: treatmentGroupLabels) {
+    @RequestMapping(value = "/treatmentgrouplabels/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    public ResponseEntity<String> createTreatmentGroupLabelFromJsonArray(
+            @RequestBody List<TreatmentGroupLabel> treatmentGroupLabels) {
+        Collection<TreatmentGroupLabel> newTreatmentGroupLabels = new ArrayList<TreatmentGroupLabel>();
+        for (TreatmentGroupLabel TreatmentGroupLabel_ : treatmentGroupLabels) {
             TreatmentGroupLabel_.persist();
             newTreatmentGroupLabels.add(TreatmentGroupLabel_);
         }
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-        return new ResponseEntity<String>(TreatmentGroupLabel.toJsonArray(newTreatmentGroupLabels), headers, HttpStatus.CREATED);
+        return new ResponseEntity<String>(TreatmentGroupLabel.toJsonArray(newTreatmentGroupLabels), headers,
+                HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/treatmentgrouplabels/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> updateTreatmentGroupLabelFromJson(@RequestBody TreatmentGroupLabel TreatmentGroupLabel_) {
+    @RequestMapping(value = "/treatmentgrouplabels/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    public ResponseEntity<String> updateTreatmentGroupLabelFromJson(
+            @RequestBody TreatmentGroupLabel TreatmentGroupLabel_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
         if (TreatmentGroupLabel_.merge() == null) {
@@ -316,21 +328,23 @@ public ResponseEntity<String> updateTreatmentGroupLabelFromJson(@RequestBody Tre
         return new ResponseEntity<String>(TreatmentGroupLabel_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/treatmentgrouplabels/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> updateTreatmentGroupLabelFromJsonArray(@RequestBody List<TreatmentGroupLabel> treatmentGroupLabels) {
+    @RequestMapping(value = "/treatmentgrouplabels/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    public ResponseEntity<String> updateTreatmentGroupLabelFromJsonArray(
+            @RequestBody List<TreatmentGroupLabel> treatmentGroupLabels) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<TreatmentGroupLabel> newTreatmentGroupLabels = new ArrayList<TreatmentGroupLabel>();
-        for (TreatmentGroupLabel TreatmentGroupLabel_: treatmentGroupLabels) {
+        Collection<TreatmentGroupLabel> newTreatmentGroupLabels = new ArrayList<TreatmentGroupLabel>();
+        for (TreatmentGroupLabel TreatmentGroupLabel_ : treatmentGroupLabels) {
             if (TreatmentGroupLabel_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
             newTreatmentGroupLabels.add(TreatmentGroupLabel_);
         }
-        return new ResponseEntity<String>(TreatmentGroupLabel.toJsonArray(newTreatmentGroupLabels), headers, HttpStatus.OK);
+        return new ResponseEntity<String>(TreatmentGroupLabel.toJsonArray(newTreatmentGroupLabels), headers,
+                HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/treatmentgrouplabels/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/treatmentgrouplabels/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteTreatmentGroupLabelFromJson(@PathVariable("id") Long id) {
         TreatmentGroupLabel TreatmentGroupLabel_ = TreatmentGroupLabel.findTreatmentGroupLabel(id);
         HttpHeaders headers = new HttpHeaders();
@@ -341,8 +355,8 @@ public ResponseEntity<String> deleteTreatmentGroupLabelFromJson(@PathVariable("i
         TreatmentGroupLabel_.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-	
-	@RequestMapping(value = "/subjectlabels/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/subjectlabels/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showSubjectLabelJson(@PathVariable("id") Long id) {
         SubjectLabel SubjectLabel_ = SubjectLabel.findSubjectLabel(id);
@@ -354,7 +368,7 @@ public ResponseEntity<String> showSubjectLabelJson(@PathVariable("id") Long id)
         return new ResponseEntity<String>(SubjectLabel_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/subjectlabels", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/subjectlabels", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listSubjectLabelJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -363,18 +377,18 @@ public ResponseEntity<String> listSubjectLabelJson() {
         return new ResponseEntity<String>(SubjectLabel.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/subjectlabels", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/subjectlabels", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createSubjectLabelFromJson(@RequestBody SubjectLabel SubjectLabel_) {
-		SubjectLabel_.persist();
+        SubjectLabel_.persist();
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
         return new ResponseEntity<String>(SubjectLabel_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/subjectlabels/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/subjectlabels/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createSubjectLabelFromJsonArray(@RequestBody List<SubjectLabel> subjectLabels) {
-		Collection<SubjectLabel> newSubjectLabels = new ArrayList<SubjectLabel>();
-        for (SubjectLabel SubjectLabel_: subjectLabels) {
+        Collection<SubjectLabel> newSubjectLabels = new ArrayList<SubjectLabel>();
+        for (SubjectLabel SubjectLabel_ : subjectLabels) {
             SubjectLabel_.persist();
             newSubjectLabels.add(SubjectLabel_);
         }
@@ -383,7 +397,7 @@ public ResponseEntity<String> createSubjectLabelFromJsonArray(@RequestBody List<
         return new ResponseEntity<String>(SubjectLabel.toJsonArray(newSubjectLabels), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/subjectlabels/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/subjectlabels/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateSubjectLabelFromJson(@RequestBody SubjectLabel SubjectLabel_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -393,12 +407,12 @@ public ResponseEntity<String> updateSubjectLabelFromJson(@RequestBody SubjectLab
         return new ResponseEntity<String>(SubjectLabel_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/subjectlabels/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/subjectlabels/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateSubjectLabelFromJsonArray(@RequestBody List<SubjectLabel> subjectLabels) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<SubjectLabel> newSubjectLabels = new ArrayList<SubjectLabel>();
-        for (SubjectLabel SubjectLabel_: subjectLabels) {
+        Collection<SubjectLabel> newSubjectLabels = new ArrayList<SubjectLabel>();
+        for (SubjectLabel SubjectLabel_ : subjectLabels) {
             if (SubjectLabel_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -407,7 +421,7 @@ public ResponseEntity<String> updateSubjectLabelFromJsonArray(@RequestBody List<
         return new ResponseEntity<String>(SubjectLabel.toJsonArray(newSubjectLabels), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/subjectlabels/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/subjectlabels/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteSubjectLabelFromJson(@PathVariable("id") Long id) {
         SubjectLabel SubjectLabel_ = SubjectLabel.findSubjectLabel(id);
         HttpHeaders headers = new HttpHeaders();
@@ -418,8 +432,8 @@ public ResponseEntity<String> deleteSubjectLabelFromJson(@PathVariable("id") Lon
         SubjectLabel_.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-	
-	@RequestMapping(value = "/lsthinglabels/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/lsthinglabels/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showLsThingLabelJson(@PathVariable("id") Long id) {
         LsThingLabel LsThingLabel_ = LsThingLabel.findLsThingLabel(id);
@@ -431,7 +445,7 @@ public ResponseEntity<String> showLsThingLabelJson(@PathVariable("id") Long id)
         return new ResponseEntity<String>(LsThingLabel_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/lsthinglabels", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/lsthinglabels", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listLsThingLabelJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -440,18 +454,18 @@ public ResponseEntity<String> listLsThingLabelJson() {
         return new ResponseEntity<String>(LsThingLabel.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/lsthinglabels", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/lsthinglabels", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createLsThingLabelFromJson(@RequestBody LsThingLabel LsThingLabel_) {
-		LsThingLabel_.persist();
+        LsThingLabel_.persist();
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
         return new ResponseEntity<String>(LsThingLabel_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/lsthinglabels/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/lsthinglabels/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createLsThingLabelFromJsonArray(@RequestBody List<LsThingLabel> lsThingLabels) {
-		Collection<LsThingLabel> newLsThingLabels = new ArrayList<LsThingLabel>();
-        for (LsThingLabel LsThingLabel_: lsThingLabels) {
+        Collection<LsThingLabel> newLsThingLabels = new ArrayList<LsThingLabel>();
+        for (LsThingLabel LsThingLabel_ : lsThingLabels) {
             LsThingLabel_.persist();
             newLsThingLabels.add(LsThingLabel_);
         }
@@ -460,7 +474,7 @@ public ResponseEntity<String> createLsThingLabelFromJsonArray(@RequestBody List<
         return new ResponseEntity<String>(LsThingLabel.toJsonArray(newLsThingLabels), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/lsthinglabels/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/lsthinglabels/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateLsThingLabelFromJson(@RequestBody LsThingLabel LsThingLabel_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -470,12 +484,12 @@ public ResponseEntity<String> updateLsThingLabelFromJson(@RequestBody LsThingLab
         return new ResponseEntity<String>(LsThingLabel_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/lsthinglabels/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/lsthinglabels/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateLsThingLabelFromJsonArray(@RequestBody List<LsThingLabel> lsThingLabels) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<LsThingLabel> newLsThingLabels = new ArrayList<LsThingLabel>();
-        for (LsThingLabel LsThingLabel_: lsThingLabels) {
+        Collection<LsThingLabel> newLsThingLabels = new ArrayList<LsThingLabel>();
+        for (LsThingLabel LsThingLabel_ : lsThingLabels) {
             if (LsThingLabel_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -484,7 +498,7 @@ public ResponseEntity<String> updateLsThingLabelFromJsonArray(@RequestBody List<
         return new ResponseEntity<String>(LsThingLabel.toJsonArray(newLsThingLabels), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/lsthinglabels/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/lsthinglabels/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteLsThingLabelFromJson(@PathVariable("id") Long id) {
         LsThingLabel LsThingLabel_ = LsThingLabel.findLsThingLabel(id);
         HttpHeaders headers = new HttpHeaders();
@@ -495,8 +509,8 @@ public ResponseEntity<String> deleteLsThingLabelFromJson(@PathVariable("id") Lon
         LsThingLabel_.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-	
-	@RequestMapping(value = "/containerlabels/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/containerlabels/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showContainerLabelJson(@PathVariable("id") Long id) {
         ContainerLabel ContainerLabel_ = ContainerLabel.findContainerLabel(id);
@@ -508,7 +522,7 @@ public ResponseEntity<String> showContainerLabelJson(@PathVariable("id") Long id
         return new ResponseEntity<String>(ContainerLabel_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/containerlabels", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/containerlabels", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listContainerLabelJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -517,18 +531,18 @@ public ResponseEntity<String> listContainerLabelJson() {
         return new ResponseEntity<String>(ContainerLabel.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/containerlabels", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/containerlabels", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createContainerLabelFromJson(@RequestBody ContainerLabel ContainerLabel_) {
-		ContainerLabel_.persist();
+        ContainerLabel_.persist();
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
         return new ResponseEntity<String>(ContainerLabel_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/containerlabels/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/containerlabels/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createContainerLabelFromJsonArray(@RequestBody List<ContainerLabel> containerLabels) {
-		Collection<ContainerLabel> newContainerLabels = new ArrayList<ContainerLabel>();
-        for (ContainerLabel ContainerLabel_: containerLabels) {
+        Collection<ContainerLabel> newContainerLabels = new ArrayList<ContainerLabel>();
+        for (ContainerLabel ContainerLabel_ : containerLabels) {
             ContainerLabel_.persist();
             newContainerLabels.add(ContainerLabel_);
         }
@@ -537,7 +551,7 @@ public ResponseEntity<String> createContainerLabelFromJsonArray(@RequestBody Lis
         return new ResponseEntity<String>(ContainerLabel.toJsonArray(newContainerLabels), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/containerlabels/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/containerlabels/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateContainerLabelFromJson(@RequestBody ContainerLabel ContainerLabel_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -547,12 +561,12 @@ public ResponseEntity<String> updateContainerLabelFromJson(@RequestBody Containe
         return new ResponseEntity<String>(ContainerLabel_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/containerlabels/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/containerlabels/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateContainerLabelFromJsonArray(@RequestBody List<ContainerLabel> containerLabels) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<ContainerLabel> newContainerLabels = new ArrayList<ContainerLabel>();
-        for (ContainerLabel ContainerLabel_: containerLabels) {
+        Collection<ContainerLabel> newContainerLabels = new ArrayList<ContainerLabel>();
+        for (ContainerLabel ContainerLabel_ : containerLabels) {
             if (ContainerLabel_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -561,7 +575,7 @@ public ResponseEntity<String> updateContainerLabelFromJsonArray(@RequestBody Lis
         return new ResponseEntity<String>(ContainerLabel.toJsonArray(newContainerLabels), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/containerlabels/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/containerlabels/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteContainerLabelFromJson(@PathVariable("id") Long id) {
         ContainerLabel ContainerLabel_ = ContainerLabel.findContainerLabel(id);
         HttpHeaders headers = new HttpHeaders();
@@ -572,5 +586,5 @@ public ResponseEntity<String> deleteContainerLabelFromJson(@PathVariable("id") L
         ContainerLabel_.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-	
+
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiLabelSequenceController.java b/src/main/java/com/labsynch/labseer/api/ApiLabelSequenceController.java
index 2fbab8189..a89623679 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiLabelSequenceController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiLabelSequenceController.java
@@ -40,7 +40,7 @@ public class ApiLabelSequenceController {
 	@Autowired
 	private LabelSequenceService labelSequenceService;
 
-	//CRUD routes
+	// CRUD routes
 	@RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	public ResponseEntity<java.lang.String> getById(@PathVariable("id") Long id) {
@@ -50,23 +50,27 @@ public ResponseEntity<java.lang.String> getById(@PathVariable("id") Long id) {
 		return new ResponseEntity<String>(result.toJson(), headers, HttpStatus.OK);
 	}
 
-
 	@RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
 	public ResponseEntity<java.lang.String> createFromJson(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		LabelSequence labelSequence = LabelSequence.fromJsonToLabelSequence(json);
-		Collection<LabelSequence> foundLabelSequences = LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals(labelSequence.getThingTypeAndKind(), labelSequence.getLabelTypeAndKind(), labelSequence.getLabelPrefix()).getResultList();
+		Collection<LabelSequence> foundLabelSequences = LabelSequence
+				.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals(
+						labelSequence.getThingTypeAndKind(), labelSequence.getLabelTypeAndKind(),
+						labelSequence.getLabelPrefix())
+				.getResultList();
 		if (!foundLabelSequences.isEmpty()) {
-			String message = "LabelSequence already exists! " + labelSequence.getLabelPrefix() +" "+labelSequence.getLabelTypeAndKind() + " " + labelSequence.getThingTypeAndKind();
+			String message = "LabelSequence already exists! " + labelSequence.getLabelPrefix() + " "
+					+ labelSequence.getLabelTypeAndKind() + " " + labelSequence.getThingTypeAndKind();
 			logger.warn(message);
-			return new ResponseEntity<String>(message,headers, HttpStatus.BAD_REQUEST);
+			return new ResponseEntity<String>(message, headers, HttpStatus.BAD_REQUEST);
 		}
-		try{
+		try {
 			labelSequence = labelSequence.save();
 			return new ResponseEntity<String>(labelSequence.toJson(), headers, HttpStatus.CREATED);
-		}catch (Exception e){
-			logger.error("Caught exception saving labelSequence",e);
+		} catch (Exception e) {
+			logger.error("Caught exception saving labelSequence", e);
 			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 
@@ -76,22 +80,28 @@ public ResponseEntity<java.lang.String> createFromJson(@RequestBody String json)
 	public ResponseEntity<java.lang.String> createFromJsonArray(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		try{
+		try {
 			Collection<LabelSequence> labelSequences = LabelSequence.fromJsonArrayToLabelSequences(json);
 			Collection<LabelSequence> savedLabelSequences = new ArrayList<LabelSequence>();
 			for (LabelSequence labelSequence : labelSequences) {
-				Collection<LabelSequence> foundLabelSequences = LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals(labelSequence.getThingTypeAndKind(), labelSequence.getLabelTypeAndKind(), labelSequence.getLabelPrefix()).getResultList();
+				Collection<LabelSequence> foundLabelSequences = LabelSequence
+						.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals(
+								labelSequence.getThingTypeAndKind(), labelSequence.getLabelTypeAndKind(),
+								labelSequence.getLabelPrefix())
+						.getResultList();
 				if (!foundLabelSequences.isEmpty()) {
-					String message = "LabelSequence already exists! " + labelSequence.getLabelPrefix() +" "+labelSequence.getLabelTypeAndKind() + " " + labelSequence.getThingTypeAndKind();
+					String message = "LabelSequence already exists! " + labelSequence.getLabelPrefix() + " "
+							+ labelSequence.getLabelTypeAndKind() + " " + labelSequence.getThingTypeAndKind();
 					logger.warn(message);
-				}else {
+				} else {
 					LabelSequence savedLabelSequence = labelSequence.save();
 					savedLabelSequences.add(savedLabelSequence);
-				}	
+				}
 			}
-			return new ResponseEntity<String>(LabelSequence.toJsonArray(savedLabelSequences), headers, HttpStatus.CREATED);
-		}catch (Exception e){
-			logger.error("Caught exception saving labelSequence",e);
+			return new ResponseEntity<String>(LabelSequence.toJsonArray(savedLabelSequences), headers,
+					HttpStatus.CREATED);
+		} catch (Exception e) {
+			logger.error("Caught exception saving labelSequence", e);
 			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 
@@ -114,7 +124,7 @@ public ResponseEntity<java.lang.String> updateFromJson(@RequestBody String json)
 	public ResponseEntity<java.lang.String> updateFromJsonArray(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		try{
+		try {
 			Collection<LabelSequence> labelSequences = LabelSequence.fromJsonArrayToLabelSequences(json);
 			Collection<LabelSequence> updatedLabelSequences = new ArrayList<LabelSequence>();
 			for (LabelSequence labelSequence : labelSequences) {
@@ -122,8 +132,8 @@ public ResponseEntity<java.lang.String> updateFromJsonArray(@RequestBody String
 				updatedLabelSequences.add(updatedLabelSequence);
 			}
 			return new ResponseEntity<String>(LabelSequence.toJsonArray(updatedLabelSequences), headers, HttpStatus.OK);
-		}catch (Exception e){
-			logger.error("Caught exception updating labelSequences",e);
+		} catch (Exception e) {
+			logger.error("Caught exception updating labelSequences", e);
 			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
@@ -140,13 +150,16 @@ public ResponseEntity<java.lang.String> deleteFromJson(@PathVariable("id") Long
 		return new ResponseEntity<String>(headers, HttpStatus.OK);
 	}
 
-	//copied only the custom methods from the LabelSequenceController.java class
+	// copied only the custom methods from the LabelSequenceController.java class
 	@RequestMapping(value = "/getNextLabelSequences", method = RequestMethod.POST, headers = "Accept=application/json")
 	public ResponseEntity<java.lang.String> updateLabelSequence(@RequestBody LabelSequenceDTO lsDTO) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		logger.info("incoming label seq: " + lsDTO.toJson());
-		List<LabelSequence> labelSequences = LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(lsDTO.getThingTypeAndKind(), lsDTO.getLabelTypeAndKind()).getResultList();
+		List<LabelSequence> labelSequences = LabelSequence
+				.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(lsDTO.getThingTypeAndKind(),
+						lsDTO.getLabelTypeAndKind())
+				.getResultList();
 		if (labelSequences.size() != 1) {
 			logger.info("did not find the label seq!!! ");
 			return new ResponseEntity<String>(headers, HttpStatus.NOT_ACCEPTABLE);
@@ -171,18 +184,22 @@ public ResponseEntity<java.lang.String> getAutoLabels(@RequestBody LabelSequence
 
 	@RequestMapping(headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> listJson(@RequestParam(value="thingTypeAndKind", required=false) String thingTypeAndKind,
-			@RequestParam(value="labelTypeAndKind", required=false) String labelTypeAndKind) {
+	public ResponseEntity<String> listJson(
+			@RequestParam(value = "thingTypeAndKind", required = false) String thingTypeAndKind,
+			@RequestParam(value = "labelTypeAndKind", required = false) String labelTypeAndKind) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		List<LabelSequence> allLabelSequences;
 		if (thingTypeAndKind != null && labelTypeAndKind != null) {
-			allLabelSequences = LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(thingTypeAndKind, labelTypeAndKind).getResultList();
-		}else if (thingTypeAndKind != null) {
-			allLabelSequences = LabelSequence.findLabelSequencesByThingTypeAndKindEquals(thingTypeAndKind).getResultList();
-		}else if (labelTypeAndKind != null) {
-			allLabelSequences = LabelSequence.findLabelSequencesByLabelTypeAndKindEquals(labelTypeAndKind).getResultList();
-		}else {
+			allLabelSequences = LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(
+					thingTypeAndKind, labelTypeAndKind).getResultList();
+		} else if (thingTypeAndKind != null) {
+			allLabelSequences = LabelSequence.findLabelSequencesByThingTypeAndKindEquals(thingTypeAndKind)
+					.getResultList();
+		} else if (labelTypeAndKind != null) {
+			allLabelSequences = LabelSequence.findLabelSequencesByLabelTypeAndKindEquals(labelTypeAndKind)
+					.getResultList();
+		} else {
 			allLabelSequences = LabelSequence.findAllLabelSequences();
 		}
 		return new ResponseEntity<String>(LabelSequence.toJsonArray(allLabelSequences), headers, HttpStatus.OK);
@@ -190,10 +207,15 @@ public ResponseEntity<String> listJson(@RequestParam(value="thingTypeAndKind", r
 
 	@RequestMapping(value = "/getNextLabelSequences", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<java.lang.String> jsonFindLabelSequencesByThingAndLabel(@RequestParam("thingTypeAndKind") String thingTypeAndKind, @RequestParam("labelTypeAndKind") String labelTypeAndKind, @RequestParam("numberOfLabels") long numberOfLabels) {
+	public ResponseEntity<java.lang.String> jsonFindLabelSequencesByThingAndLabel(
+			@RequestParam("thingTypeAndKind") String thingTypeAndKind,
+			@RequestParam("labelTypeAndKind") String labelTypeAndKind,
+			@RequestParam("numberOfLabels") long numberOfLabels) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		List<LabelSequence> labelSequences = LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(thingTypeAndKind, labelTypeAndKind).getResultList();
+		List<LabelSequence> labelSequences = LabelSequence
+				.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(thingTypeAndKind, labelTypeAndKind)
+				.getResultList();
 		if (labelSequences.size() != 1) {
 			return new ResponseEntity<String>(headers, HttpStatus.NOT_ACCEPTABLE);
 		}
@@ -204,14 +226,15 @@ public ResponseEntity<java.lang.String> jsonFindLabelSequencesByThingAndLabel(@R
 
 	@RequestMapping(value = "/getAuthorizedLabelSequences", method = RequestMethod.POST)
 	@ResponseBody
-	public ResponseEntity<java.lang.String> getAuthorizedLabelSequences(@RequestParam(value="thingTypeAndKind", required=false) String thingTypeAndKind, 
-			@RequestParam(value="labelTypeAndKind", required=false) String labelTypeAndKind,
+	public ResponseEntity<java.lang.String> getAuthorizedLabelSequences(
+			@RequestParam(value = "thingTypeAndKind", required = false) String thingTypeAndKind,
+			@RequestParam(value = "labelTypeAndKind", required = false) String labelTypeAndKind,
 			@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		Collection<AuthorRole> authorRoles = AuthorRole.fromJsonArrayToAuthorRoles(json);
-		List<LabelSequence> labelSequences = labelSequenceService.getAuthorizedLabelSequences(authorRoles, thingTypeAndKind, labelTypeAndKind);
+		List<LabelSequence> labelSequences = labelSequenceService.getAuthorizedLabelSequences(authorRoles,
+				thingTypeAndKind, labelTypeAndKind);
 		return new ResponseEntity<String>(LabelSequence.toJsonArray(labelSequences), headers, HttpStatus.OK);
 	}
 }
-
diff --git a/src/main/java/com/labsynch/labseer/api/ApiLicenseController.java b/src/main/java/com/labsynch/labseer/api/ApiLicenseController.java
index 1d10b0a28..68b8e4014 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiLicenseController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiLicenseController.java
@@ -41,7 +41,7 @@ public ResponseEntity<java.lang.String> getLicenseInfo() {
 		} catch (IOException e) {
 			logger.error(e.toString());
 			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-		} catch (PGPException  e) {
+		} catch (PGPException e) {
 			logger.error(e.toString());
 			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
 		} catch (URISyntaxException e) {
@@ -54,5 +54,4 @@ public ResponseEntity<java.lang.String> getLicenseInfo() {
 		return new ResponseEntity<String>(licenseInfo.toJson(), headers, HttpStatus.OK);
 	}
 
-
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiLsRoleController.java b/src/main/java/com/labsynch/labseer/api/ApiLsRoleController.java
index 000f9c0fb..be0631e1a 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiLsRoleController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiLsRoleController.java
@@ -27,7 +27,7 @@ public class ApiLsRoleController {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiLsRoleController.class);
 
-	//CRUD routes
+	// CRUD routes
 	@RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	public ResponseEntity<java.lang.String> getById(@PathVariable("id") Long id) {
@@ -36,22 +36,22 @@ public ResponseEntity<java.lang.String> getById(@PathVariable("id") Long id) {
 		LsRole result = LsRole.findLsRole(id);
 		return new ResponseEntity<String>(result.toJson(), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> listJson(@RequestParam(value="lsType", required=false) String lsType,
-			@RequestParam(value="lsKind", required=false) String lsKind,
-			@RequestParam(value="format", required=false) String format) {
+	public ResponseEntity<String> listJson(@RequestParam(value = "lsType", required = false) String lsType,
+			@RequestParam(value = "lsKind", required = false) String lsKind,
+			@RequestParam(value = "format", required = false) String format) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		List<LsRole> allLsRoles;
 		if (lsType != null && lsKind != null) {
 			allLsRoles = LsRole.findLsRolesByLsTypeEqualsAndLsKindEquals(lsType, lsKind).getResultList();
-		}else if (lsType != null) {
+		} else if (lsType != null) {
 			allLsRoles = LsRole.findLsRolesByLsTypeEquals(lsType).getResultList();
-		}else if (lsKind != null) {
+		} else if (lsKind != null) {
 			allLsRoles = LsRole.findLsRolesByLsKindEquals(lsKind).getResultList();
-		}else {
+		} else {
 			allLsRoles = LsRole.findAllLsRoles();
 		}
 		if (format != null && format.equalsIgnoreCase("codetable")) {
@@ -66,12 +66,12 @@ public ResponseEntity<String> listJson(@RequestParam(value="lsType", required=fa
 	public ResponseEntity<java.lang.String> createFromJson(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		try{
+		try {
 			LsRole lsRole = LsRole.fromJsonToLsRole(json);
 			lsRole.persist();
 			return new ResponseEntity<String>(lsRole.toJson(), headers, HttpStatus.CREATED);
-		}catch (Exception e){
-			logger.error("Caught exception saving lsRole",e);
+		} catch (Exception e) {
+			logger.error("Caught exception saving lsRole", e);
 			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 
@@ -81,7 +81,7 @@ public ResponseEntity<java.lang.String> createFromJson(@RequestBody String json)
 	public ResponseEntity<java.lang.String> createFromJsonArray(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		try{
+		try {
 			Collection<LsRole> lsRoles = LsRole.fromJsonArrayToLsRoles(json);
 			Collection<LsRole> savedLsRoles = new ArrayList<LsRole>();
 			for (LsRole lsRole : lsRoles) {
@@ -89,8 +89,8 @@ public ResponseEntity<java.lang.String> createFromJsonArray(@RequestBody String
 				savedLsRoles.add(lsRole);
 			}
 			return new ResponseEntity<String>(LsRole.toJsonArray(savedLsRoles), headers, HttpStatus.CREATED);
-		}catch (Exception e){
-			logger.error("Caught exception saving lsRole",e);
+		} catch (Exception e) {
+			logger.error("Caught exception saving lsRole", e);
 			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 
@@ -113,7 +113,7 @@ public ResponseEntity<java.lang.String> updateFromJson(@RequestBody String json)
 	public ResponseEntity<java.lang.String> updateFromJsonArray(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		try{
+		try {
 			Collection<LsRole> lsRoles = LsRole.fromJsonArrayToLsRoles(json);
 			Collection<LsRole> updatedLsRoles = new ArrayList<LsRole>();
 			for (LsRole lsRole : lsRoles) {
@@ -121,8 +121,8 @@ public ResponseEntity<java.lang.String> updateFromJsonArray(@RequestBody String
 				updatedLsRoles.add(updatedLsRole);
 			}
 			return new ResponseEntity<String>(LsRole.toJsonArray(updatedLsRoles), headers, HttpStatus.OK);
-		}catch (Exception e){
-			logger.error("Caught exception updating lsRoles",e);
+		} catch (Exception e) {
+			logger.error("Caught exception updating lsRoles", e);
 			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
@@ -139,4 +139,3 @@ public ResponseEntity<java.lang.String> deleteFromJson(@PathVariable("id") Long
 		return new ResponseEntity<String>(headers, HttpStatus.OK);
 	}
 }
-
diff --git a/src/main/java/com/labsynch/labseer/api/ApiLsThingController.java b/src/main/java/com/labsynch/labseer/api/ApiLsThingController.java
index 0b1dad928..da2638829 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiLsThingController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiLsThingController.java
@@ -69,19 +69,24 @@ public class ApiLsThingController {
 
 	@RequestMapping(value = "/search", method = RequestMethod.GET)
 	@ResponseBody
-	public ResponseEntity<String> genericLsThingSearch(@RequestParam(value="lsType", required = false) String lsType, @RequestParam("q") String searchQuery,
-														@RequestParam(value="lsKind", required = false) String lsKind, @RequestParam(value = "with", required = false) String with) {
+	public ResponseEntity<String> genericLsThingSearch(@RequestParam(value = "lsType", required = false) String lsType,
+			@RequestParam("q") String searchQuery,
+			@RequestParam(value = "lsKind", required = false) String lsKind,
+			@RequestParam(value = "with", required = false) String with) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		try {
-			Collection<LsThing> results = lsThingService.findLsThingsByGenericMetaDataSearch(searchQuery, lsType, lsKind);
+			Collection<LsThing> results = lsThingService.findLsThingsByGenericMetaDataSearch(searchQuery, lsType,
+					lsKind);
 			if (with != null) {
 				if (with.equalsIgnoreCase("nestedfull")) {
-					return new ResponseEntity<String>(LsThing.toJsonArrayWithNestedFull(results), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(LsThing.toJsonArrayWithNestedFull(results), headers,
+							HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("prettyjson")) {
 					return new ResponseEntity<String>(LsThing.toJsonArrayPretty(results), headers, HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("nestedstub")) {
-					return new ResponseEntity<String>(LsThing.toJsonArrayWithNestedStubs(results), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(LsThing.toJsonArrayWithNestedStubs(results), headers,
+							HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("stub")) {
 					return new ResponseEntity<String>(LsThing.toJsonArrayStub(results), headers, HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("codetable")) {
@@ -90,7 +95,7 @@ public ResponseEntity<String> genericLsThingSearch(@RequestParam(value="lsType",
 				}
 			}
 			return new ResponseEntity<String>(LsThing.toJsonArray(results), headers, HttpStatus.OK);
-		} catch(Exception e){
+		} catch (Exception e) {
 			String error = e.getMessage() + e.getStackTrace();
 			return new ResponseEntity<String>(error, headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
@@ -98,14 +103,16 @@ public ResponseEntity<String> genericLsThingSearch(@RequestParam(value="lsType",
 
 	@RequestMapping(value = "/searchProjects", method = RequestMethod.GET)
 	@ResponseBody
-	public ResponseEntity<String> projectSearch(@RequestParam(value="userName", required = true) String userName, @RequestParam("q") String searchQuery) {
+	public ResponseEntity<String> projectSearch(@RequestParam(value = "userName", required = true) String userName,
+			@RequestParam("q") String searchQuery) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		try {
-			Collection<LsThing> results = lsThingService.findLsThingProjectsByGenericMetaDataSearch(searchQuery, userName);
+			Collection<LsThing> results = lsThingService.findLsThingProjectsByGenericMetaDataSearch(searchQuery,
+					userName);
 			return new ResponseEntity<String>(LsThing.toJsonArray(results), headers, HttpStatus.OK);
-		} catch(Exception e){
-			logger.error("Caught an error searching for projects.",e);
+		} catch (Exception e) {
+			logger.error("Caught an error searching for projects.", e);
 			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
@@ -118,7 +125,8 @@ public ResponseEntity<java.lang.String> getGeneCodeNameFromName(@RequestBody Str
 		String labelType = "name";
 		String labelKind = "Entrez Gene ID";
 		logger.info("getGeneCodeNameFromNameRequest incoming json: " + requestDTO.toJson());
-		PreferredNameResultsDTO results = lsThingService.getPreferredNameFromName(thingType, thingKind, labelType, labelKind, requestDTO);
+		PreferredNameResultsDTO results = lsThingService.getPreferredNameFromName(thingType, thingKind, labelType,
+				labelKind, requestDTO);
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		return new ResponseEntity<String>(results.toJson(), headers, HttpStatus.OK);
@@ -126,14 +134,15 @@ public ResponseEntity<java.lang.String> getGeneCodeNameFromName(@RequestBody Str
 
 	@Transactional
 	@RequestMapping(value = "/getCodeNameFromNameRequest", method = RequestMethod.POST, headers = "Accept=application/json")
-	public ResponseEntity<java.lang.String> getCodeNameFromName(@RequestBody String json, 
-			@RequestParam(value = "thingType", required = true) String thingType, 
-			@RequestParam(value = "thingKind", required = true) String thingKind, 
-			@RequestParam(value = "labelType", required = false) String labelType, 
+	public ResponseEntity<java.lang.String> getCodeNameFromName(@RequestBody String json,
+			@RequestParam(value = "thingType", required = true) String thingType,
+			@RequestParam(value = "thingKind", required = true) String thingKind,
+			@RequestParam(value = "labelType", required = false) String labelType,
 			@RequestParam(value = "labelKind", required = false) String labelKind) {
 		PreferredNameRequestDTO requestDTO = PreferredNameRequestDTO.fromJsonToPreferredNameRequestDTO(json);
 		logger.info("getCodeNameFromNameRequest incoming json: " + requestDTO.toJson());
-		PreferredNameResultsDTO results = lsThingService.getCodeNameFromName(thingType, thingKind, labelType, labelKind, requestDTO);
+		PreferredNameResultsDTO results = lsThingService.getCodeNameFromName(thingType, thingKind, labelType, labelKind,
+				requestDTO);
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		return new ResponseEntity<String>(results.toJson(), headers, HttpStatus.OK);
@@ -141,9 +150,14 @@ public ResponseEntity<java.lang.String> getCodeNameFromName(@RequestBody String
 
 	@Transactional
 	@RequestMapping(value = "/getPreferredNameFromNameRequest", method = RequestMethod.POST, headers = "Accept=application/json")
-	public ResponseEntity<java.lang.String> getPreferredNameFromName(@RequestBody String json, @RequestParam(value = "thingType", required = true) String thingType, @RequestParam(value = "thingKind", required = true) String thingKind, @RequestParam(value = "labelType", required = false) String labelType, @RequestParam(value = "labelKind", required = false) String labelKind) {
+	public ResponseEntity<java.lang.String> getPreferredNameFromName(@RequestBody String json,
+			@RequestParam(value = "thingType", required = true) String thingType,
+			@RequestParam(value = "thingKind", required = true) String thingKind,
+			@RequestParam(value = "labelType", required = false) String labelType,
+			@RequestParam(value = "labelKind", required = false) String labelKind) {
 		PreferredNameRequestDTO requestDTO = PreferredNameRequestDTO.fromJsonToPreferredNameRequestDTO(json);
-		PreferredNameResultsDTO results = lsThingService.getPreferredNameFromName(thingType, thingKind, labelType, labelKind, requestDTO);
+		PreferredNameResultsDTO results = lsThingService.getPreferredNameFromName(thingType, thingKind, labelType,
+				labelKind, requestDTO);
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		return new ResponseEntity<String>(results.toJson(), headers, HttpStatus.OK);
@@ -160,13 +174,13 @@ public ResponseEntity<java.lang.String> getProjects() {
 	@Transactional
 	@RequestMapping(value = "/codetable", method = RequestMethod.GET, headers = "Accept=application/json")
 	public ResponseEntity<String> getCodeTableLsThings(@RequestParam(value = "lsType", required = true) String lsType,
-			@RequestParam(value = "lsKind", required = true) String lsKind){
+			@RequestParam(value = "lsKind", required = true) String lsKind) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		try{
+		try {
 			Collection<CodeTableDTO> codeTableLsThings = lsThingService.getCodeTableLsThings(lsType, lsKind, true);
 			return new ResponseEntity<String>(CodeTableDTO.toJsonArray(codeTableLsThings), headers, HttpStatus.OK);
-		} catch (Exception e){
+		} catch (Exception e) {
 			logger.error(e.toString());
 			return new ResponseEntity<String>(e.toString(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
@@ -175,8 +189,8 @@ public ResponseEntity<String> getCodeTableLsThings(@RequestParam(value = "lsType
 
 	@Transactional
 	@RequestMapping(value = "/{lsType}/{lsKind}", method = RequestMethod.GET, headers = "Accept=application/json")
-	public ResponseEntity<java.lang.String> getLsThingByTypeAndKindAll(@PathVariable("lsType") String lsType, 
-			@PathVariable("lsKind") String lsKind, 
+	public ResponseEntity<java.lang.String> getLsThingByTypeAndKindAll(@PathVariable("lsType") String lsType,
+			@PathVariable("lsKind") String lsKind,
 			@RequestParam(value = "labelText", required = false) String labelText,
 			@RequestParam(value = "labelType", required = false) String labelType,
 			@RequestParam(value = "labelKind", required = false) String labelKind,
@@ -186,23 +200,26 @@ public ResponseEntity<java.lang.String> getLsThingByTypeAndKindAll(@PathVariable
 		boolean withLabelType = (labelType != null && !labelType.equalsIgnoreCase(""));
 		boolean withLabelKind = (labelKind != null && !labelKind.equalsIgnoreCase(""));
 		if (withLabelText) {
-			if (withLabelType){	
-				if (withLabelKind){
-					results = LsThing.findLsThingByLabelText(lsType, lsKind, labelType, labelKind, labelText).getResultList();
-				} else results = LsThing.findLsThingByLabelTypeAndLabelText(lsType, lsKind, labelType, labelText).getResultList();
+			if (withLabelType) {
+				if (withLabelKind) {
+					results = LsThing.findLsThingByLabelText(lsType, lsKind, labelType, labelKind, labelText)
+							.getResultList();
+				} else
+					results = LsThing.findLsThingByLabelTypeAndLabelText(lsType, lsKind, labelType, labelText)
+							.getResultList();
 			} else if (withLabelKind) {
-				results = LsThing.findLsThingByLabelKindAndLabelText(lsType, lsKind, labelKind, labelText).getResultList();
-			} else results = LsThing.findLsThingByLabelText(lsType, lsKind, labelText).getResultList();
-		}
-		else if (withLabelType) {
-			if (withLabelKind){
+				results = LsThing.findLsThingByLabelKindAndLabelText(lsType, lsKind, labelKind, labelText)
+						.getResultList();
+			} else
+				results = LsThing.findLsThingByLabelText(lsType, lsKind, labelText).getResultList();
+		} else if (withLabelType) {
+			if (withLabelKind) {
 				results = LsThing.findLsThingByLabelTypeAndKind(lsType, lsKind, labelType, labelKind).getResultList();
-			} else results = LsThing.findLsThingByLabelType(lsType, lsKind, labelType).getResultList();
-		}
-		else if (withLabelKind) {
+			} else
+				results = LsThing.findLsThingByLabelType(lsType, lsKind, labelType).getResultList();
+		} else if (withLabelKind) {
 			results = LsThing.findLsThingByLabelKind(lsType, lsKind, labelKind).getResultList();
-		}
-		else {
+		} else {
 			results = LsThing.findLsThing(lsType, lsKind).getResultList();
 
 		}
@@ -219,7 +236,7 @@ else if (withLabelKind) {
 			} else if (with.equalsIgnoreCase("stub")) {
 				return new ResponseEntity<String>(LsThing.toJsonArrayStub(results), headers, HttpStatus.OK);
 			} else if (with.equalsIgnoreCase("codetable")) {
-				if (withLabelType){
+				if (withLabelType) {
 					Collection<CodeTableDTO> codeTables = lsThingService.convertToCodeTables(results, labelType);
 					return new ResponseEntity<String>(CodeTableDTO.toJsonArray(codeTables), headers, HttpStatus.OK);
 				}
@@ -232,7 +249,7 @@ else if (withLabelKind) {
 
 	@Transactional
 	@RequestMapping(value = "/{lsType}/{lsKind}/{idOrCodeName}", method = RequestMethod.GET, headers = "Accept=application/json")
-	public ResponseEntity<java.lang.String> getLsThingByIdCodeName(@PathVariable("lsType") String lsType, 
+	public ResponseEntity<java.lang.String> getLsThingByIdCodeName(@PathVariable("lsType") String lsType,
 			@PathVariable("lsKind") String lsKind,
 			@PathVariable("idOrCodeName") String idOrCodeName,
 			@RequestParam(value = "with", required = false) String with) {
@@ -242,16 +259,16 @@ public ResponseEntity<java.lang.String> getLsThingByIdCodeName(@PathVariable("ls
 		ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
 		boolean errorsFound = false;
 		LsThing lsThing;
-		if(SimpleUtil.isNumeric(idOrCodeName)) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			lsThing = LsThing.findLsThing(Long.valueOf(idOrCodeName));
-		} else {		
+		} else {
 			try {
 				lsThing = LsThing.findLsThingsByCodeNameEquals(idOrCodeName).getSingleResult();
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				lsThing = null;
 				ErrorMessage error = new ErrorMessage();
 				error.setErrorLevel("error");
-				error.setMessage("lsThing:" + idOrCodeName +" not found");
+				error.setMessage("lsThing:" + idOrCodeName + " not found");
 				errors.add(error);
 				errorsFound = true;
 			}
@@ -276,7 +293,7 @@ public ResponseEntity<java.lang.String> getLsThingByIdCodeName(@PathVariable("ls
 
 	@Transactional
 	@RequestMapping(value = "/{lsType}/{lsKind}/codeNames/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-	public ResponseEntity<java.lang.String> getLsThingsByCodeNameArray(@PathVariable("lsType") String lsType, 
+	public ResponseEntity<java.lang.String> getLsThingsByCodeNameArray(@PathVariable("lsType") String lsType,
 			@PathVariable("lsKind") String lsKind,
 			@RequestBody List<String> codeNames,
 			@RequestParam(value = "with", required = false) String with) {
@@ -285,10 +302,10 @@ public ResponseEntity<java.lang.String> getLsThingsByCodeNameArray(@PathVariable
 		headers.add("Content-Type", "application/json");
 		ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
 		boolean errorsFound = false;
-		Collection<LsThing> lsThings;		
+		Collection<LsThing> lsThings;
 		try {
 			lsThings = LsThing.findLsThingsByCodeNamesIn(codeNames);
-		} catch(Exception ex) {
+		} catch (Exception ex) {
 			lsThings = null;
 			ErrorMessage error = new ErrorMessage();
 			error.setErrorLevel("error");
@@ -301,11 +318,13 @@ public ResponseEntity<java.lang.String> getLsThingsByCodeNameArray(@PathVariable
 		} else {
 			if (with != null) {
 				if (with.equalsIgnoreCase("nestedfull")) {
-					return new ResponseEntity<String>(LsThing.toJsonArrayWithNestedFull(lsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(LsThing.toJsonArrayWithNestedFull(lsThings), headers,
+							HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("prettyjson")) {
 					return new ResponseEntity<String>(LsThing.toJsonArrayPretty(lsThings), headers, HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("nestedstub")) {
-					return new ResponseEntity<String>(LsThing.toJsonArrayWithNestedStubs(lsThings), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(LsThing.toJsonArrayWithNestedStubs(lsThings), headers,
+							HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("stub")) {
 					return new ResponseEntity<String>(LsThing.toJsonArrayStub(lsThings), headers, HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("codetable")) {
@@ -319,7 +338,7 @@ public ResponseEntity<java.lang.String> getLsThingsByCodeNameArray(@PathVariable
 
 	@Transactional
 	@RequestMapping(value = "/{lsType}/{lsKind}/{idOrCodeName}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-	public ResponseEntity<java.lang.String> deleteLsThingByIdOrCodeName(@PathVariable("lsType") String lsType, 
+	public ResponseEntity<java.lang.String> deleteLsThingByIdOrCodeName(@PathVariable("lsType") String lsType,
 			@PathVariable("lsKind") String lsKind,
 			@PathVariable("idOrCodeName") String idOrCodeName) {
 		logger.debug("----from the LsThing DELETE controller----");
@@ -328,16 +347,16 @@ public ResponseEntity<java.lang.String> deleteLsThingByIdOrCodeName(@PathVariabl
 		ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
 		boolean errorsFound = false;
 		LsThing lsThing;
-		if(SimpleUtil.isNumeric(idOrCodeName)) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			lsThing = LsThing.findLsThing(Long.valueOf(idOrCodeName));
-		} else {		
+		} else {
 			try {
 				lsThing = LsThing.findLsThingsByCodeNameEquals(idOrCodeName).getSingleResult();
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				lsThing = null;
 				ErrorMessage error = new ErrorMessage();
 				error.setErrorLevel("error");
-				error.setMessage("lsThing:" + idOrCodeName +" not found");
+				error.setMessage("lsThing:" + idOrCodeName + " not found");
 				errors.add(error);
 				errorsFound = true;
 			}
@@ -345,10 +364,10 @@ public ResponseEntity<java.lang.String> deleteLsThingByIdOrCodeName(@PathVariabl
 		if (errorsFound) {
 			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.NOT_FOUND);
 		}
-		if (lsThing != null){
-			try{
+		if (lsThing != null) {
+			try {
 				lsThing.logicalDelete();
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				ErrorMessage error = new ErrorMessage();
 				error.setErrorLevel("error");
 				error.setMessage(ex.getMessage());
@@ -357,7 +376,8 @@ public ResponseEntity<java.lang.String> deleteLsThingByIdOrCodeName(@PathVariabl
 			}
 		}
 		if (errorsFound) {
-			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.INTERNAL_SERVER_ERROR);
+			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers,
+					HttpStatus.INTERNAL_SERVER_ERROR);
 		} else {
 			return new ResponseEntity<String>(headers, HttpStatus.OK);
 		}
@@ -365,28 +385,28 @@ public ResponseEntity<java.lang.String> deleteLsThingByIdOrCodeName(@PathVariabl
 
 	@Transactional
 	@RequestMapping(value = "/{lsType}/{lsKind}/getbatches/{parentIdOrCodeName}", method = RequestMethod.GET, headers = "Accept=application/json")
-	public ResponseEntity<String> getLsThingBatchesByParentIdCodeName(@PathVariable("lsType") String lsType, 
+	public ResponseEntity<String> getLsThingBatchesByParentIdCodeName(@PathVariable("lsType") String lsType,
 			@PathVariable("lsKind") String lsKind,
 			@PathVariable("parentIdOrCodeName") String parentIdOrCodeName,
 			@RequestParam(value = "with", required = false) String with,
 			@RequestParam(value = "labelType", required = false) String labelType) {
-				
+
 		logger.debug("----from the LsThing GET controller----");
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
 		boolean errorsFound = false;
 		LsThing parent;
-		if(SimpleUtil.isNumeric(parentIdOrCodeName)) {
+		if (SimpleUtil.isNumeric(parentIdOrCodeName)) {
 			parent = LsThing.findLsThing(Long.valueOf(parentIdOrCodeName));
-		} else {		
+		} else {
 			try {
 				parent = LsThing.findLsThingsByCodeNameEquals(parentIdOrCodeName).getSingleResult();
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				parent = null;
 				ErrorMessage error = new ErrorMessage();
 				error.setErrorLevel("error");
-				error.setMessage("parent:" + parentIdOrCodeName +" not found");
+				error.setMessage("parent:" + parentIdOrCodeName + " not found");
 				errors.add(error);
 				errorsFound = true;
 			}
@@ -398,19 +418,21 @@ public ResponseEntity<String> getLsThingBatchesByParentIdCodeName(@PathVariable(
 		} else {
 			if (with != null) {
 				if (with.equalsIgnoreCase("nestedfull")) {
-					return new ResponseEntity<String>(LsThing.toJsonArrayWithNestedFull(batches), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(LsThing.toJsonArrayWithNestedFull(batches), headers,
+							HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("prettyjson")) {
 					return new ResponseEntity<String>(LsThing.toJsonArrayPretty(batches), headers, HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("nestedstub")) {
-					return new ResponseEntity<String>(LsThing.toJsonArrayWithNestedStubs(batches), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(LsThing.toJsonArrayWithNestedStubs(batches), headers,
+							HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("stub")) {
 					return new ResponseEntity<String>(LsThing.toJsonArrayStub(batches), headers, HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("codeTable")) {
 					Collection<CodeTableDTO> codeTables = new ArrayList<CodeTableDTO>();
-					if (batches != null){
-						if (labelType != null && labelType.length() > 0){
+					if (batches != null) {
+						if (labelType != null && labelType.length() > 0) {
 							codeTables = lsThingService.convertToCodeTables(batches, labelType);
-						}else{
+						} else {
 							codeTables = lsThingService.convertToCodeTables(batches);
 						}
 					}
@@ -423,7 +445,7 @@ public ResponseEntity<String> getLsThingBatchesByParentIdCodeName(@PathVariable(
 
 	@Transactional
 	@RequestMapping(value = "/{lsType}/{lsKind}/getcomposites/{componentIdOrCodeName}", method = RequestMethod.GET, headers = "Accept=application/json")
-	public ResponseEntity<String> getLsThingCompositesByComponentIdCodeName(@PathVariable("lsType") String lsType, 
+	public ResponseEntity<String> getLsThingCompositesByComponentIdCodeName(@PathVariable("lsType") String lsType,
 			@PathVariable("lsKind") String lsKind,
 			@PathVariable("componentIdOrCodeName") String componentIdOrCodeName,
 			@RequestParam(value = "with", required = false) String with) {
@@ -433,16 +455,16 @@ public ResponseEntity<String> getLsThingCompositesByComponentIdCodeName(@PathVar
 		ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
 		boolean errorsFound = false;
 		LsThing component;
-		if(SimpleUtil.isNumeric(componentIdOrCodeName)) {
+		if (SimpleUtil.isNumeric(componentIdOrCodeName)) {
 			component = LsThing.findLsThing(Long.valueOf(componentIdOrCodeName));
-		} else {		
+		} else {
 			try {
 				component = LsThing.findLsThingsByCodeNameEquals(componentIdOrCodeName).getSingleResult();
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				component = null;
 				ErrorMessage error = new ErrorMessage();
 				error.setErrorLevel("error");
-				error.setMessage("parent:" + componentIdOrCodeName +" not found");
+				error.setMessage("parent:" + componentIdOrCodeName + " not found");
 				errors.add(error);
 				errorsFound = true;
 			}
@@ -453,11 +475,13 @@ public ResponseEntity<String> getLsThingCompositesByComponentIdCodeName(@PathVar
 		} else {
 			if (with != null) {
 				if (with.equalsIgnoreCase("nestedfull")) {
-					return new ResponseEntity<String>(LsThing.toJsonArrayWithNestedFull(composites), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(LsThing.toJsonArrayWithNestedFull(composites), headers,
+							HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("prettyjson")) {
 					return new ResponseEntity<String>(LsThing.toJsonArrayPretty(composites), headers, HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("nestedstub")) {
-					return new ResponseEntity<String>(LsThing.toJsonArrayWithNestedStubs(composites), headers, HttpStatus.OK);
+					return new ResponseEntity<String>(LsThing.toJsonArrayWithNestedStubs(composites), headers,
+							HttpStatus.OK);
 				} else if (with.equalsIgnoreCase("stub")) {
 					return new ResponseEntity<String>(LsThing.toJsonArrayStub(composites), headers, HttpStatus.OK);
 				}
@@ -466,15 +490,14 @@ public ResponseEntity<String> getLsThingCompositesByComponentIdCodeName(@PathVar
 		}
 	}
 
-
 	@Transactional
-	@RequestMapping(value="/{lsType}/{lsKind}", method = RequestMethod.POST, headers = "Accept=application/json")
-	public ResponseEntity<String> createFromJson(@PathVariable("lsType") String lsType, 
+	@RequestMapping(value = "/{lsType}/{lsKind}", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> createFromJson(@PathVariable("lsType") String lsType,
 			@PathVariable("lsKind") String lsKind,
-			@RequestParam(value="parentIdOrCodeName", required = false) String parentIdOrCodeName,
-			@RequestParam(value="with", required = false) String with,
+			@RequestParam(value = "parentIdOrCodeName", required = false) String parentIdOrCodeName,
+			@RequestParam(value = "with", required = false) String with,
 			@RequestBody String json) {
-		//headers and setup
+		// headers and setup
 		logger.debug("----from the LsThing POST controller----");
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
@@ -482,38 +505,40 @@ public ResponseEntity<String> createFromJson(@PathVariable("lsType") String lsTy
 		boolean errorsFound = false;
 		Long parentId = null;
 		LsThing lsThing = LsThing.fromJsonToLsThing(json);
-		//decide what kind of special logic we need to do
+		// decide what kind of special logic we need to do
 		boolean isParent = false;
 		boolean isBatch = false;
-		if (lsType.equals("parent")) isParent = true;
-		if (lsType.equals("batch")) isBatch = true;
+		if (lsType.equals("parent"))
+			isParent = true;
+		if (lsType.equals("batch"))
+			isBatch = true;
 		LsThing parent;
-		//if it's a batch, try to make an appropriate codeName
-		if (isBatch && parentIdOrCodeName == null){
+		// if it's a batch, try to make an appropriate codeName
+		if (isBatch && parentIdOrCodeName == null) {
 			ErrorMessage error = new ErrorMessage();
 			error.setErrorLevel("error");
 			error.setMessage("must provide parentIdOrCodeName to save a batch");
 			errors.add(error);
 			errorsFound = true;
-		}else if (isBatch){
-			if(SimpleUtil.isNumeric(parentIdOrCodeName)) {
+		} else if (isBatch) {
+			if (SimpleUtil.isNumeric(parentIdOrCodeName)) {
 				parent = LsThing.findLsThing(Long.valueOf(parentIdOrCodeName));
-			} else {		
+			} else {
 				try {
 					parent = LsThing.findLsThingsByCodeNameEquals(parentIdOrCodeName).getSingleResult();
-				} catch(Exception ex) {
+				} catch (Exception ex) {
 					parent = null;
 					ErrorMessage error = new ErrorMessage();
 					error.setErrorLevel("error");
-					error.setMessage("parent:" + parentIdOrCodeName +" not found");
+					error.setMessage("parent:" + parentIdOrCodeName + " not found");
 					errors.add(error);
 					errorsFound = true;
 				}
 			}
 			parentId = parent.getId();
 		}
-		//if all's well so far, go ahead with the save
-		if (!errorsFound){
+		// if all's well so far, go ahead with the save
+		if (!errorsFound) {
 			try {
 				lsThing = lsThingService.saveLsThing(lsThing, isParent, isBatch, parentId);
 			} catch (Exception e) {
@@ -524,10 +549,10 @@ public ResponseEntity<String> createFromJson(@PathVariable("lsType") String lsTy
 				errors.add(error);
 				errorsFound = true;
 			}
-		}	
+		}
 		if (errorsFound) {
 			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.CONFLICT);
-		}else if (with != null) {
+		} else if (with != null) {
 			if (with.equalsIgnoreCase("nestedfull")) {
 				return new ResponseEntity<String>(lsThing.toJsonWithNestedFull(), headers, HttpStatus.CREATED);
 			} else if (with.equalsIgnoreCase("prettyjson")) {
@@ -542,10 +567,10 @@ public ResponseEntity<String> createFromJson(@PathVariable("lsType") String lsTy
 	}
 
 	@Transactional
-	@RequestMapping(value="/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-	public ResponseEntity<String> createFromJsonArray(@RequestParam(value="with", required = false) String with,
+	@RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> createFromJsonArray(@RequestParam(value = "with", required = false) String with,
 			@RequestBody String json) {
-		//headers and setup
+		// headers and setup
 		logger.debug("----from the LsThing POST controller----");
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
@@ -553,7 +578,7 @@ public ResponseEntity<String> createFromJsonArray(@RequestParam(value="with", re
 		boolean errorsFound = false;
 		Collection<LsThing> lsThings = LsThing.fromJsonArrayToLsThings(json);
 		Collection<LsThing> savedLsThings = new ArrayList<LsThing>();
-		for (LsThing lsThing : lsThings){
+		for (LsThing lsThing : lsThings) {
 			try {
 				LsThing savedLsThing = lsThingService.saveLsThing(lsThing);
 				savedLsThings.add(savedLsThing);
@@ -568,13 +593,16 @@ public ResponseEntity<String> createFromJsonArray(@RequestParam(value="with", re
 		}
 		if (errorsFound) {
 			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.CONFLICT);
-		}else if (with != null) {
+		} else if (with != null) {
 			if (with.equalsIgnoreCase("nestedfull")) {
-				return new ResponseEntity<String>(LsThing.toJsonArrayWithNestedFull(savedLsThings), headers, HttpStatus.CREATED);
+				return new ResponseEntity<String>(LsThing.toJsonArrayWithNestedFull(savedLsThings), headers,
+						HttpStatus.CREATED);
 			} else if (with.equalsIgnoreCase("prettyjson")) {
-				return new ResponseEntity<String>(LsThing.toJsonArrayPretty(savedLsThings), headers, HttpStatus.CREATED);
+				return new ResponseEntity<String>(LsThing.toJsonArrayPretty(savedLsThings), headers,
+						HttpStatus.CREATED);
 			} else if (with.equalsIgnoreCase("nestedstub")) {
-				return new ResponseEntity<String>(LsThing.toJsonArrayWithNestedStubs(savedLsThings), headers, HttpStatus.CREATED);
+				return new ResponseEntity<String>(LsThing.toJsonArrayWithNestedStubs(savedLsThings), headers,
+						HttpStatus.CREATED);
 			} else if (with.equalsIgnoreCase("stub")) {
 				return new ResponseEntity<String>(LsThing.toJsonArrayStub(savedLsThings), headers, HttpStatus.CREATED);
 			}
@@ -589,27 +617,27 @@ public ResponseEntity<String> validateLsThing(
 		headers.add("Content-Type", "application/json; charset=utf-8");
 
 		LsThingValidationDTO validationDTO = LsThingValidationDTO.fromJsonToLsThingValidationDTO(json);
-		logger.debug("FROM THE LSTHING VALIDATE CONTROLLER: "+validationDTO.toJson());
+		logger.debug("FROM THE LSTHING VALIDATE CONTROLLER: " + validationDTO.toJson());
 		ArrayList<LsThingValidationErrorMessage> errorMessages = lsThingService.validateLsThing(validationDTO);
-		if (!errorMessages.isEmpty()){
-			return new ResponseEntity<String>(LsThingValidationErrorMessage.toJsonArray(errorMessages), headers, HttpStatus.CONFLICT);
-		}
-		else{
+		if (!errorMessages.isEmpty()) {
+			return new ResponseEntity<String>(LsThingValidationErrorMessage.toJsonArray(errorMessages), headers,
+					HttpStatus.CONFLICT);
+		} else {
 			return new ResponseEntity<String>(headers, HttpStatus.ACCEPTED);
 		}
 	}
 
-
 	@Transactional
-	@RequestMapping(value="/{lsType}/{lsKind}/{idOrCodeName}", method = RequestMethod.PUT, headers = "Accept=application/json")
-	public ResponseEntity<java.lang.String> updateFromJson(@PathVariable("lsType") String lsType, 
+	@RequestMapping(value = "/{lsType}/{lsKind}/{idOrCodeName}", method = RequestMethod.PUT, headers = "Accept=application/json")
+	public ResponseEntity<java.lang.String> updateFromJson(@PathVariable("lsType") String lsType,
 			@PathVariable("lsKind") String lsKind,
 			@PathVariable("idOrCodeName") String idOrCodeName,
-			@RequestParam(value="with", required = false) String with,
+			@RequestParam(value = "with", required = false) String with,
 			@RequestBody String json) {
-		//headers and setup
+		// headers and setup
 		logger.debug("----from the LsThing PUT controller----");
-		if (logger.isDebugEnabled()) logger.debug("incoming JSON: " + json);
+		if (logger.isDebugEnabled())
+			logger.debug("incoming JSON: " + json);
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
@@ -629,8 +657,9 @@ public ResponseEntity<java.lang.String> updateFromJson(@PathVariable("lsType") S
 			errorsFound = true;
 		}
 		if (errorsFound) {
-			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.INTERNAL_SERVER_ERROR);
-		}else if (with != null) {
+			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers,
+					HttpStatus.INTERNAL_SERVER_ERROR);
+		} else if (with != null) {
 			logger.debug("the with option is set to: " + with);
 			if (with.equalsIgnoreCase("nestedfull")) {
 				return new ResponseEntity<String>(lsThing.toJsonWithNestedFull(), headers, HttpStatus.OK);
@@ -642,16 +671,16 @@ public ResponseEntity<java.lang.String> updateFromJson(@PathVariable("lsType") S
 				return new ResponseEntity<String>(lsThing.toJsonStub(), headers, HttpStatus.OK);
 			}
 		}
-		//		return new ResponseEntity<String>(lsThing.toJson(), headers, HttpStatus.OK);
-		return getLsThingByIdCodeName(lsThing.getLsType(), lsThing.getLsKind(), lsThing.getId().toString(), "nestedstub");
+		// return new ResponseEntity<String>(lsThing.toJson(), headers, HttpStatus.OK);
+		return getLsThingByIdCodeName(lsThing.getLsType(), lsThing.getLsKind(), lsThing.getId().toString(),
+				"nestedstub");
 
 	}
-	
-	
-	@RequestMapping(value="/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-	public ResponseEntity<String> updateFromJsonArray(@RequestParam(value="with", required = false) String with,
+
+	@RequestMapping(value = "/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+	public ResponseEntity<String> updateFromJsonArray(@RequestParam(value = "with", required = false) String with,
 			@RequestBody String json) {
-		//headers and setup
+		// headers and setup
 		logger.debug("----from the LsThing PUT jsonArray controller----");
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
@@ -659,12 +688,12 @@ public ResponseEntity<String> updateFromJsonArray(@RequestParam(value="with", re
 		boolean errorsFound = false;
 		Collection<LsThing> lsThings = LsThing.fromJsonArrayToLsThings(json);
 		Collection<LsThing> savedLsThings = new ArrayList<LsThing>();
-		for (LsThing lsThing : lsThings){
+		for (LsThing lsThing : lsThings) {
 			try {
 				lsThing = lsThingService.updateLsThing(lsThing);
 				savedLsThings.add(lsThing);
 			} catch (Exception e) {
-				logger.error("Error in update LsThings jsonArray",e);
+				logger.error("Error in update LsThings jsonArray", e);
 				ErrorMessage error = new ErrorMessage();
 				error.setErrorLevel("error");
 				error.setMessage("internal error occurred while trying to update lsThing");
@@ -674,13 +703,15 @@ public ResponseEntity<String> updateFromJsonArray(@RequestParam(value="with", re
 		}
 		if (errorsFound) {
 			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.CONFLICT);
-		}else if (with != null) {
+		} else if (with != null) {
 			if (with.equalsIgnoreCase("nestedfull")) {
-				return new ResponseEntity<String>(LsThing.toJsonArrayWithNestedFull(savedLsThings), headers, HttpStatus.OK);
+				return new ResponseEntity<String>(LsThing.toJsonArrayWithNestedFull(savedLsThings), headers,
+						HttpStatus.OK);
 			} else if (with.equalsIgnoreCase("prettyjson")) {
 				return new ResponseEntity<String>(LsThing.toJsonArrayPretty(savedLsThings), headers, HttpStatus.OK);
 			} else if (with.equalsIgnoreCase("nestedstub")) {
-				return new ResponseEntity<String>(LsThing.toJsonArrayWithNestedStubs(savedLsThings), headers, HttpStatus.OK);
+				return new ResponseEntity<String>(LsThing.toJsonArrayWithNestedStubs(savedLsThings), headers,
+						HttpStatus.OK);
 			} else if (with.equalsIgnoreCase("stub")) {
 				return new ResponseEntity<String>(LsThing.toJsonArrayStub(savedLsThings), headers, HttpStatus.OK);
 			}
@@ -689,7 +720,8 @@ public ResponseEntity<String> updateFromJsonArray(@RequestParam(value="with", re
 	}
 
 	@RequestMapping(value = "/gene/v1/loadGeneEntities", method = RequestMethod.POST, headers = "Accept=application/json")
-	public ResponseEntity<java.lang.String> loadGeneEntities(@RequestParam(value = "fileName", required = true) String fileName) {
+	public ResponseEntity<java.lang.String> loadGeneEntities(
+			@RequestParam(value = "fileName", required = true) String fileName) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		logger.info("loading genes from tab delimited file: " + fileName);
@@ -697,7 +729,8 @@ public ResponseEntity<java.lang.String> loadGeneEntities(@RequestParam(value = "
 			geneThingService.RegisterGeneThingsFromCSV(fileName);
 		} catch (IOException e) {
 			logger.error("IOException: " + e.toString());
-			return new ResponseEntity<String>("ERROR: IOError. Unable to load file. " + fileName, headers, HttpStatus.UNSUPPORTED_MEDIA_TYPE);
+			return new ResponseEntity<String>("ERROR: IOError. Unable to load file. " + fileName, headers,
+					HttpStatus.UNSUPPORTED_MEDIA_TYPE);
 		}
 		return new ResponseEntity<String>(headers, HttpStatus.OK);
 	}
@@ -706,8 +739,7 @@ public ResponseEntity<java.lang.String> loadGeneEntities(@RequestParam(value = "
 	public ResponseEntity<java.lang.String> updateGeneEntities(
 			@RequestParam(value = "entrezGenesFile", required = true) String entrezGenesFile,
 			@RequestParam(value = "geneHistoryFile", required = true) String geneHistoryFile,
-			@RequestParam(value = "taxonomyId", required = true) String taxonomyId
-			) {
+			@RequestParam(value = "taxonomyId", required = true) String taxonomyId) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		logger.info("loading genes from tab delimited file: " + entrezGenesFile);
@@ -715,14 +747,14 @@ public ResponseEntity<java.lang.String> updateGeneEntities(
 			geneThingService.updateEntrezGenes(entrezGenesFile, geneHistoryFile, taxonomyId);
 		} catch (IOException e) {
 			logger.error("IOException: " + e.toString());
-			return new ResponseEntity<String>("ERROR: IOError. Unable to load file. " + entrezGenesFile, headers, HttpStatus.UNSUPPORTED_MEDIA_TYPE);
+			return new ResponseEntity<String>("ERROR: IOError. Unable to load file. " + entrezGenesFile, headers,
+					HttpStatus.UNSUPPORTED_MEDIA_TYPE);
 		}
 		return new ResponseEntity<String>(headers, HttpStatus.OK);
 	}
 
-
 	@RequestMapping(value = "/{lsType}/{lsKind}/deleteBatch/{idOrCodeName}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-	public ResponseEntity<java.lang.String> deleteLsThingBatchByIdOrCodeName(@PathVariable("lsType") String lsType, 
+	public ResponseEntity<java.lang.String> deleteLsThingBatchByIdOrCodeName(@PathVariable("lsType") String lsType,
 			@PathVariable("lsKind") String lsKind,
 			@PathVariable("idOrCodeName") String idOrCodeName) {
 		logger.debug("----from the LsThing DELETE controller----");
@@ -731,16 +763,16 @@ public ResponseEntity<java.lang.String> deleteLsThingBatchByIdOrCodeName(@PathVa
 		ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
 		boolean errorsFound = false;
 		LsThing lsThing;
-		if(SimpleUtil.isNumeric(idOrCodeName)) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			lsThing = LsThing.findLsThing(Long.valueOf(idOrCodeName));
-		} else {		
+		} else {
 			try {
 				lsThing = LsThing.findLsThingsByCodeNameEquals(idOrCodeName).getSingleResult();
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				lsThing = null;
 				ErrorMessage error = new ErrorMessage();
 				error.setErrorLevel("error");
-				error.setMessage("lsThing:" + idOrCodeName +" not found");
+				error.setMessage("lsThing:" + idOrCodeName + " not found");
 				errors.add(error);
 				errorsFound = true;
 			}
@@ -748,18 +780,18 @@ public ResponseEntity<java.lang.String> deleteLsThingBatchByIdOrCodeName(@PathVa
 		if (errorsFound) {
 			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.NOT_FOUND);
 		}
-		if (lsThing != null){
-			if (lsType.equals("batch") && lsThing.getLsType().equals("batch")){
-				try{
+		if (lsThing != null) {
+			if (lsType.equals("batch") && lsThing.getLsType().equals("batch")) {
+				try {
 					lsThingService.deleteBatch(lsThing);
-				} catch(Exception ex) {
+				} catch (Exception ex) {
 					ErrorMessage error = new ErrorMessage();
 					error.setErrorLevel("error");
 					error.setMessage(ex.getMessage());
 					errors.add(error);
 					errorsFound = true;
 				}
-			}else{
+			} else {
 				ErrorMessage error = new ErrorMessage();
 				error.setErrorLevel("error");
 				error.setMessage("LsThing lsType provided is not batch");
@@ -769,14 +801,15 @@ public ResponseEntity<java.lang.String> deleteLsThingBatchByIdOrCodeName(@PathVa
 			}
 		}
 		if (errorsFound) {
-			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.INTERNAL_SERVER_ERROR);
+			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers,
+					HttpStatus.INTERNAL_SERVER_ERROR);
 		} else {
 			return new ResponseEntity<String>(headers, HttpStatus.OK);
 		}
 	}
 
 	@RequestMapping(value = "/{lsType}/{lsKind}/deleteParent/{idOrCodeName}", method = RequestMethod.DELETE, headers = "Accept=application/json")
-	public ResponseEntity<java.lang.String> deleteLsThingParentByIdOrCodeName(@PathVariable("lsType") String lsType, 
+	public ResponseEntity<java.lang.String> deleteLsThingParentByIdOrCodeName(@PathVariable("lsType") String lsType,
 			@PathVariable("lsKind") String lsKind,
 			@PathVariable("idOrCodeName") String idOrCodeName) {
 		logger.debug("----from the LsThing DELETE controller----");
@@ -785,16 +818,16 @@ public ResponseEntity<java.lang.String> deleteLsThingParentByIdOrCodeName(@PathV
 		ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
 		boolean errorsFound = false;
 		LsThing lsThing;
-		if(SimpleUtil.isNumeric(idOrCodeName)) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			lsThing = LsThing.findLsThing(Long.valueOf(idOrCodeName));
-		} else {		
+		} else {
 			try {
 				lsThing = LsThing.findLsThingsByCodeNameEquals(idOrCodeName).getSingleResult();
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				lsThing = null;
 				ErrorMessage error = new ErrorMessage();
 				error.setErrorLevel("error");
-				error.setMessage("lsThing:" + idOrCodeName +" not found");
+				error.setMessage("lsThing:" + idOrCodeName + " not found");
 				errors.add(error);
 				errorsFound = true;
 			}
@@ -802,18 +835,18 @@ public ResponseEntity<java.lang.String> deleteLsThingParentByIdOrCodeName(@PathV
 		if (errorsFound) {
 			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.NOT_FOUND);
 		}
-		if (lsThing != null){
-			if (lsType.equals("parent") && lsThing.getLsType().equals("parent")){
-				try{
+		if (lsThing != null) {
+			if (lsType.equals("parent") && lsThing.getLsType().equals("parent")) {
+				try {
 					lsThingService.deleteParent(lsThing);
-				} catch(Exception ex) {
+				} catch (Exception ex) {
 					ErrorMessage error = new ErrorMessage();
 					error.setErrorLevel("error");
 					error.setMessage(ex.getMessage());
 					errors.add(error);
 					errorsFound = true;
 				}
-			}else{
+			} else {
 				ErrorMessage error = new ErrorMessage();
 				error.setErrorLevel("error");
 				error.setMessage("LsThing lsType provided is not parent");
@@ -823,14 +856,15 @@ public ResponseEntity<java.lang.String> deleteLsThingParentByIdOrCodeName(@PathV
 			}
 		}
 		if (errorsFound) {
-			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.INTERNAL_SERVER_ERROR);
+			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers,
+					HttpStatus.INTERNAL_SERVER_ERROR);
 		} else {
 			return new ResponseEntity<String>(headers, HttpStatus.OK);
 		}
 	}
 
 	@RequestMapping(value = "/{lsType}/{lsKind}/checkDependencies/{idOrCodeName}", method = RequestMethod.GET, headers = "Accept=application/json")
-	public ResponseEntity<String> checkDependencies(@PathVariable("lsType") String lsType, 
+	public ResponseEntity<String> checkDependencies(@PathVariable("lsType") String lsType,
 			@PathVariable("lsKind") String lsKind,
 			@PathVariable("idOrCodeName") String idOrCodeName) {
 		logger.debug("----from the LsThing Dependency Check controller----");
@@ -839,26 +873,26 @@ public ResponseEntity<String> checkDependencies(@PathVariable("lsType") String l
 		ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
 		boolean errorsFound = false;
 		LsThing lsThing;
-		if(SimpleUtil.isNumeric(idOrCodeName)) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			lsThing = LsThing.findLsThing(Long.valueOf(idOrCodeName));
-		} else {		
+		} else {
 			try {
 				lsThing = LsThing.findLsThingsByCodeNameEquals(idOrCodeName).getSingleResult();
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				lsThing = null;
 				ErrorMessage error = new ErrorMessage();
 				error.setErrorLevel("error");
-				error.setMessage("parent:" + idOrCodeName +" not found");
+				error.setMessage("parent:" + idOrCodeName + " not found");
 				errors.add(error);
 				errorsFound = true;
 			}
 		}
 		DependencyCheckDTO result;
-		if (lsType.equals("parent") && lsThing.getLsType().equals("parent")){
+		if (lsType.equals("parent") && lsThing.getLsType().equals("parent")) {
 			result = lsThingService.checkParentDependencies(lsThing);
-		}else if(lsType.equals("batch") && lsThing.getLsType().equals("batch")){
+		} else if (lsType.equals("batch") && lsThing.getLsType().equals("batch")) {
 			result = lsThingService.checkBatchDependencies(lsThing);
-		}else{
+		} else {
 			result = null;
 			ErrorMessage error = new ErrorMessage();
 			error.setErrorLevel("error");
@@ -879,10 +913,10 @@ public ResponseEntity<java.lang.String> getStoichiometryProperties(@RequestBody
 		Collection<CodeTypeKindDTO> requests = CodeTypeKindDTO.fromJsonArrayToCoes(json);
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		try{
+		try {
 			StoichiometryPropertiesResultsDTO results = lsThingService.getStoichiometryProperties(requests);
 			return new ResponseEntity<String>(results.toJson(), headers, HttpStatus.OK);
-		}catch (Exception e){
+		} catch (Exception e) {
 			logger.error("Caught exception in getStoichiometryProperties", e);
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
@@ -893,20 +927,24 @@ public ResponseEntity<java.lang.String> getStoichiometryProperties(@RequestBody
 	public ResponseEntity<java.lang.String> structureSearch(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		try{
-			if (json.isEmpty()) logger.info("EMPTY JSON");
-			if (json.equalsIgnoreCase("")) logger.info("NO CONTENT JSON");
+		try {
+			if (json.isEmpty())
+				logger.info("EMPTY JSON");
+			if (json.equalsIgnoreCase(""))
+				logger.info("NO CONTENT JSON");
 
 			logger.info("################################### STRUCTURE JSON ########### ");
 			logger.info("incoming structure search query json: " + json);
 			logger.info("################################### ");
 
 			StructureSearchDTO query = StructureSearchDTO.fromJsonToStructureSearchDTO(json);
-			Collection<LsThing> results = lsThingService.structureSearch( query.getQueryMol(), query.getLsType(), query.getLsKind(), SearchType.getIfPresent(query.getSearchType()).orElse(SearchType.DEFAULT), query.getMaxResults(), query.getSimilarity());
+			Collection<LsThing> results = lsThingService.structureSearch(query.getQueryMol(), query.getLsType(),
+					query.getLsKind(), SearchType.getIfPresent(query.getSearchType()).orElse(SearchType.DEFAULT),
+					query.getMaxResults(), query.getSimilarity());
 
 			logger.info("##### number of results found: " + results.size());
 			return new ResponseEntity<String>(LsThing.toJsonArrayStub(results), headers, HttpStatus.OK);
-		}catch (Exception e){
+		} catch (Exception e) {
 			logger.error("Caught exception in structureSearch", e);
 			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
@@ -914,27 +952,32 @@ public ResponseEntity<java.lang.String> structureSearch(@RequestBody String json
 	}
 
 	@RequestMapping(value = "/structureAndMetaSearch", method = RequestMethod.POST, headers = "Accept=application/json")
-	public ResponseEntity<java.lang.String> structureAndMetaSearch(@RequestBody String stuctureThingQuery,  
+	public ResponseEntity<java.lang.String> structureAndMetaSearch(@RequestBody String stuctureThingQuery,
 			@RequestParam(value = "with", required = false) String with,
 			@RequestParam(value = "labelType", required = false) String labelType) {
 
 		logger.info("input json: " + stuctureThingQuery);
-		StructureAndThingSearchDTO structureAndThingQuery = StructureAndThingSearchDTO.fromJsonToStructureAndThingSearchDTO(stuctureThingQuery);
+		StructureAndThingSearchDTO structureAndThingQuery = StructureAndThingSearchDTO
+				.fromJsonToStructureAndThingSearchDTO(stuctureThingQuery);
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
 		boolean errorsFound = false;
 		Collection<Long> lsThingIds;
 		LsThingQueryResultDTO result = new LsThingQueryResultDTO();
-		try{
-			lsThingIds = lsThingService.searchLsThingIdsByQueryDTOandStructure(structureAndThingQuery.getLsThingQueryDTO(), structureAndThingQuery.getQueryMol(), SearchType.getIfPresent(structureAndThingQuery.getSearchType()).orElse(SearchType.DEFAULT), structureAndThingQuery.getMaxResults(), structureAndThingQuery.getSimilarity());
+		try {
+			lsThingIds = lsThingService.searchLsThingIdsByQueryDTOandStructure(
+					structureAndThingQuery.getLsThingQueryDTO(), structureAndThingQuery.getQueryMol(),
+					SearchType.getIfPresent(structureAndThingQuery.getSearchType()).orElse(SearchType.DEFAULT),
+					structureAndThingQuery.getMaxResults(), structureAndThingQuery.getSimilarity());
 			result.setNumberOfResults(lsThingIds.size());
 			result.setMaxResults(structureAndThingQuery.getMaxResults());
-			if (structureAndThingQuery.getMaxResults() == null || result.getNumberOfResults() <= result.getMaxResults()){
+			if (structureAndThingQuery.getMaxResults() == null
+					|| result.getNumberOfResults() <= result.getMaxResults()) {
 				result.setResults(lsThingService.getLsThingsByIds(lsThingIds));
 			}
-		}catch (Exception e){
-			logger.error("Caught searching for lsThings in generic interaction search",e);
+		} catch (Exception e) {
+			logger.error("Caught searching for lsThings in generic interaction search", e);
 			ErrorMessage error = new ErrorMessage();
 			error.setErrorLevel("error");
 			error.setMessage(e.getMessage());
@@ -958,10 +1001,10 @@ public ResponseEntity<java.lang.String> structureAndMetaSearch(@RequestBody Stri
 					LsThingQueryCodeTableResultDTO resultDTO = new LsThingQueryCodeTableResultDTO();
 					resultDTO.setMaxResults(result.getMaxResults());
 					resultDTO.setNumberOfResults(result.getNumberOfResults());
-					if (result.getResults() != null){
-						if (labelType != null && labelType.length() > 0){
+					if (result.getResults() != null) {
+						if (labelType != null && labelType.length() > 0) {
 							resultDTO.setResults(lsThingService.convertToCodeTables(result.getResults(), labelType));
-						}else{
+						} else {
 							resultDTO.setResults(lsThingService.convertToCodeTables(result.getResults()));
 						}
 					}
@@ -971,11 +1014,11 @@ public ResponseEntity<java.lang.String> structureAndMetaSearch(@RequestBody Stri
 			return new ResponseEntity<String>(result.toJson(), headers, HttpStatus.OK);
 		}
 
-	}	  
-
+	}
 
 	@RequestMapping(value = "/genericBrowserSearch", method = RequestMethod.POST, headers = "Accept=application/json")
-	public ResponseEntity<java.lang.String> genericBrowserSearch(@RequestBody String json, @RequestParam(value = "with", required = false) String with) {
+	public ResponseEntity<java.lang.String> genericBrowserSearch(@RequestBody String json,
+			@RequestParam(value = "with", required = false) String with) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		LsThingBrowserQueryDTO query = LsThingBrowserQueryDTO.fromJsonToLsThingBrowserQueryDTO(json);
@@ -983,17 +1026,18 @@ public ResponseEntity<java.lang.String> genericBrowserSearch(@RequestBody String
 		boolean errorsFound = false;
 		Collection<Long> lsThingIds;
 		LsThingQueryResultDTO result = new LsThingQueryResultDTO();
-		try{
+		try {
 			lsThingIds = lsThingService.searchLsThingIdsByBrowserQueryDTO(query);
 			int maxResults = 1000;
-			if (query.getQueryDTO().getMaxResults() != null) maxResults = query.getQueryDTO().getMaxResults();
+			if (query.getQueryDTO().getMaxResults() != null)
+				maxResults = query.getQueryDTO().getMaxResults();
 			result.setMaxResults(maxResults);
 			result.setNumberOfResults(lsThingIds.size());
-			if (result.getNumberOfResults() <= result.getMaxResults()){
+			if (result.getNumberOfResults() <= result.getMaxResults()) {
 				result.setResults(lsThingService.getLsThingsByIds(lsThingIds));
 			}
-		}catch (Exception e){
-			logger.error("Caught searching for lsThings in generic interaction search",e);
+		} catch (Exception e) {
+			logger.error("Caught searching for lsThings in generic interaction search", e);
 			ErrorMessage error = new ErrorMessage();
 			error.setErrorLevel("error");
 			error.setMessage(e.getMessage());
@@ -1017,7 +1061,7 @@ public ResponseEntity<java.lang.String> genericBrowserSearch(@RequestBody String
 					GenericQueryCodeTableResultDTO resultDTO = new GenericQueryCodeTableResultDTO();
 					resultDTO.setMaxResults(result.getMaxResults());
 					resultDTO.setNumberOfResults(result.getNumberOfResults());
-					if (result.getResults() != null){
+					if (result.getResults() != null) {
 						resultDTO.setResults(lsThingService.convertToCodeTables(result.getResults()));
 					}
 					return new ResponseEntity<String>(resultDTO.toJson(), headers, HttpStatus.OK);
@@ -1028,7 +1072,6 @@ public ResponseEntity<java.lang.String> genericBrowserSearch(@RequestBody String
 
 	}
 
-
 	@RequestMapping(value = "/checkDependentExperiments", method = RequestMethod.POST, headers = "Accept=application/json")
 	public ResponseEntity<java.lang.String> checkDependentExperiments(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
@@ -1036,22 +1079,22 @@ public ResponseEntity<java.lang.String> checkDependentExperiments(@RequestBody S
 		CodeTypeKindDTO query = CodeTypeKindDTO.fromJsonToCodeTypeKindDTO(json);
 		ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
 		boolean errorsFound = false;
-		LsThing lsThing;	
+		LsThing lsThing;
 		try {
 			lsThing = LsThing.findLsThingsByCodeNameEquals(query.getCodeName()).getSingleResult();
-		} catch(Exception ex) {
+		} catch (Exception ex) {
 			lsThing = null;
 			ErrorMessage error = new ErrorMessage();
 			error.setErrorLevel("error");
-			error.setMessage("parent:" + query.getCodeName() +" not found");
+			error.setMessage("parent:" + query.getCodeName() + " not found");
 			errors.add(error);
 			errorsFound = true;
 		}
 		DependencyCheckDTO result = null;
-		try{
+		try {
 			result = lsThingService.checkDependencies(lsThing);
-		}catch (Exception e){
-			logger.error("Caught exception checking dependencies",e);
+		} catch (Exception e) {
+			logger.error("Caught exception checking dependencies", e);
 			ErrorMessage error = new ErrorMessage();
 			error.setErrorLevel("error");
 			error.setMessage(e.getMessage());
@@ -1066,9 +1109,9 @@ public ResponseEntity<java.lang.String> checkDependentExperiments(@RequestBody S
 
 	}
 
-
 	@RequestMapping(value = "/genericInteractionSearch", method = RequestMethod.POST, headers = "Accept=application/json")
-	public ResponseEntity<java.lang.String> genericInteractionSearch(@RequestBody String json, @RequestParam(value = "with", required = false) String with,
+	public ResponseEntity<java.lang.String> genericInteractionSearch(@RequestBody String json,
+			@RequestParam(value = "with", required = false) String with,
 			@RequestParam(value = "labelType", required = false) String labelType) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
@@ -1077,15 +1120,15 @@ public ResponseEntity<java.lang.String> genericInteractionSearch(@RequestBody St
 		boolean errorsFound = false;
 		Collection<Long> lsThingIds;
 		LsThingQueryResultDTO result = new LsThingQueryResultDTO();
-		try{
+		try {
 			lsThingIds = lsThingService.searchLsThingIdsByQueryDTO(query);
 			result.setNumberOfResults(lsThingIds.size());
 			result.setMaxResults(query.getMaxResults());
-			if (query.getMaxResults() == null || result.getNumberOfResults() <= result.getMaxResults()){
+			if (query.getMaxResults() == null || result.getNumberOfResults() <= result.getMaxResults()) {
 				result.setResults(lsThingService.getLsThingsByIds(lsThingIds));
 			}
-		}catch (Exception e){
-			logger.error("Caught searching for lsThings in generic interaction search",e);
+		} catch (Exception e) {
+			logger.error("Caught searching for lsThings in generic interaction search", e);
 			ErrorMessage error = new ErrorMessage();
 			error.setErrorLevel("error");
 			error.setMessage(e.getMessage());
@@ -1109,10 +1152,10 @@ public ResponseEntity<java.lang.String> genericInteractionSearch(@RequestBody St
 					GenericQueryCodeTableResultDTO resultDTO = new GenericQueryCodeTableResultDTO();
 					resultDTO.setMaxResults(result.getMaxResults());
 					resultDTO.setNumberOfResults(result.getNumberOfResults());
-					if (result.getResults() != null){
-						if (labelType != null && labelType.length() > 0){
+					if (result.getResults() != null) {
+						if (labelType != null && labelType.length() > 0) {
 							resultDTO.setResults(lsThingService.convertToCodeTables(result.getResults(), labelType));
-						}else{
+						} else {
 							resultDTO.setResults(lsThingService.convertToCodeTables(result.getResults()));
 						}
 					}
@@ -1124,14 +1167,10 @@ public ResponseEntity<java.lang.String> genericInteractionSearch(@RequestBody St
 
 	}
 
-
-
-
 	@Transactional
 	@RequestMapping(value = "/gene/v1/loadGeneOrthologFile", method = RequestMethod.POST, headers = "Accept=application/json")
-	public ResponseEntity<java.lang.String> loadGeneOrthologs (
-			@RequestBody String json
-			) {
+	public ResponseEntity<java.lang.String> loadGeneOrthologs(
+			@RequestBody String json) {
 
 		GeneOrthologFileDTO geneOrthologFileDTO = GeneOrthologFileDTO.fromJsonToGeneOrthologFileDTO(json);
 
@@ -1139,20 +1178,25 @@ public ResponseEntity<java.lang.String> loadGeneOrthologs (
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		logger.info("loading genes from tab delimited file: " + geneOrthologFileDTO.getTestFileName());
 		try {
-			LsThing orthThing = geneThingService.saveOrthologEntity(geneOrthologFileDTO.getVersionName(), geneOrthologFileDTO.getTestFileName(), geneOrthologFileDTO.getOrthologType(), geneOrthologFileDTO.getCurationLevel(), geneOrthologFileDTO.getDescription(), geneOrthologFileDTO.getRecordedBy(), geneOrthologFileDTO.getRecordedBy());
-			geneThingService.registerGeneOrthologsFromCSV(geneOrthologFileDTO.getTestFileName(), orthThing.getCodeName(), geneOrthologFileDTO.getRecordedBy(), orthThing.getLsTransaction());
+			LsThing orthThing = geneThingService.saveOrthologEntity(geneOrthologFileDTO.getVersionName(),
+					geneOrthologFileDTO.getTestFileName(), geneOrthologFileDTO.getOrthologType(),
+					geneOrthologFileDTO.getCurationLevel(), geneOrthologFileDTO.getDescription(),
+					geneOrthologFileDTO.getRecordedBy(), geneOrthologFileDTO.getRecordedBy());
+			geneThingService.registerGeneOrthologsFromCSV(geneOrthologFileDTO.getTestFileName(),
+					orthThing.getCodeName(), geneOrthologFileDTO.getRecordedBy(), orthThing.getLsTransaction());
 		} catch (IOException e) {
 			logger.error("IOException: " + e.toString());
-			return new ResponseEntity<String>("ERROR: IOError. Unable to load file. " + geneOrthologFileDTO.getTestFileName(), headers, HttpStatus.UNSUPPORTED_MEDIA_TYPE);
+			return new ResponseEntity<String>(
+					"ERROR: IOError. Unable to load file. " + geneOrthologFileDTO.getTestFileName(), headers,
+					HttpStatus.UNSUPPORTED_MEDIA_TYPE);
 		}
 		return new ResponseEntity<String>(headers, HttpStatus.OK);
 	}
 
 	@Transactional
 	@RequestMapping(value = "/gene/v1/getGeneOrthologs", params = "find=ByGeneID", method = RequestMethod.GET, headers = "Accept=application/json")
-	public ResponseEntity<java.lang.String> getGeneOrthologs (
-			@RequestParam(value="geneID", required = true) String geneID
-			) {
+	public ResponseEntity<java.lang.String> getGeneOrthologs(
+			@RequestParam(value = "geneID", required = true) String geneID) {
 
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
@@ -1161,16 +1205,16 @@ public ResponseEntity<java.lang.String> getGeneOrthologs (
 			orthologs = geneThingService.getOrthologsFromGeneID(geneID);
 		} catch (IOException e) {
 			logger.error("IOException: " + e.toString());
-			return new ResponseEntity<String>("ERROR: IOError. Unable to load file. ", headers, HttpStatus.UNSUPPORTED_MEDIA_TYPE);
+			return new ResponseEntity<String>("ERROR: IOError. Unable to load file. ", headers,
+					HttpStatus.UNSUPPORTED_MEDIA_TYPE);
 		}
 		return new ResponseEntity<String>(GeneOrthologDTO.toJsonArray(orthologs), headers, HttpStatus.OK);
 	}
 
 	@Transactional
 	@RequestMapping(value = "/gene/v1/saveGeneOrtholog", method = RequestMethod.POST, headers = "Accept=application/json")
-	public ResponseEntity<java.lang.String> saveGeneOrtholog (
-			@RequestBody String json
-			) {
+	public ResponseEntity<java.lang.String> saveGeneOrtholog(
+			@RequestBody String json) {
 
 		GeneOrthologDTO geneOrthologDTO = GeneOrthologDTO.fromJsonToGeneOrthologDTO(json);
 		geneOrthologDTO = geneThingService.saveOrthologInteraction(geneOrthologDTO);
@@ -1179,12 +1223,10 @@ public ResponseEntity<java.lang.String> saveGeneOrtholog (
 		return new ResponseEntity<String>(geneOrthologDTO.toJson(), headers, HttpStatus.OK);
 	}
 
-
 	@Transactional
 	@RequestMapping(value = "/gene/v1/saveGeneOrthologs/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-	public ResponseEntity<java.lang.String> saveGeneOrthologs (
-			@RequestBody String json
-			) {
+	public ResponseEntity<java.lang.String> saveGeneOrthologs(
+			@RequestBody String json) {
 
 		Collection<GeneOrthologDTO> geneOrthologDTOs = GeneOrthologDTO.fromJsonArrayToGeneOrtholoes(json);
 		geneOrthologDTOs = geneThingService.saveOrthologInteractions(geneOrthologDTOs);
@@ -1193,36 +1235,39 @@ public ResponseEntity<java.lang.String> saveGeneOrthologs (
 		return new ResponseEntity<String>(GeneOrthologDTO.toJsonArray(geneOrthologDTOs), headers, HttpStatus.OK);
 	}
 
-
-	//  @RequestMapping(value = "/gene/v1/fixGeneEntities", method = RequestMethod.POST, headers = "Accept=application/json")
-	//  public ResponseEntity<java.lang.String> fixGeneEntities(
-	//		  @RequestBody String json
-	//		  ) {
-	//	  
-	//	  EntrezDbDTO entrezDb = EntrezDbDTO.fromJsonToEntrezDbDTO(json);
-	//	  
-	//      HttpHeaders headers = new HttpHeaders();
-	//      headers.add("Content-Type", "application/json; charset=utf-8");
-	//      logger.info("loading genes from tab delimited file: " + entrezDb.getEntrezGenesFile());
-	//      try {
-	//		geneThingService.fixDiscontinuedEntrezGeneIDs(entrezDb.getGeneHistoryFile(), entrezDb.getTaxonomyId());
-	//      } catch (IOException e) {
-	//          logger.error("IOException: " + e.toString());
-	//          return new ResponseEntity<String>("ERROR: IOError. Unable to load file. " + entrezDb.getGeneHistoryFile(), headers, HttpStatus.UNSUPPORTED_MEDIA_TYPE);
-	//      }
-	//      return new ResponseEntity<String>(headers, HttpStatus.OK);
-	//  }
+	// @RequestMapping(value = "/gene/v1/fixGeneEntities", method =
+	// RequestMethod.POST, headers = "Accept=application/json")
+	// public ResponseEntity<java.lang.String> fixGeneEntities(
+	// @RequestBody String json
+	// ) {
+	//
+	// EntrezDbDTO entrezDb = EntrezDbDTO.fromJsonToEntrezDbDTO(json);
+	//
+	// HttpHeaders headers = new HttpHeaders();
+	// headers.add("Content-Type", "application/json; charset=utf-8");
+	// logger.info("loading genes from tab delimited file: " +
+	// entrezDb.getEntrezGenesFile());
+	// try {
+	// geneThingService.fixDiscontinuedEntrezGeneIDs(entrezDb.getGeneHistoryFile(),
+	// entrezDb.getTaxonomyId());
+	// } catch (IOException e) {
+	// logger.error("IOException: " + e.toString());
+	// return new ResponseEntity<String>("ERROR: IOError. Unable to load file. " +
+	// entrezDb.getGeneHistoryFile(), headers, HttpStatus.UNSUPPORTED_MEDIA_TYPE);
+	// }
+	// return new ResponseEntity<String>(headers, HttpStatus.OK);
+	// }
 
 	@Transactional
 	@RequestMapping(value = "/documentmanagersearch", method = RequestMethod.GET)
-	public ResponseEntity<java.lang.String> documentManagerSearch(@RequestParam Map<String,String> searchParamsMap){
+	public ResponseEntity<java.lang.String> documentManagerSearch(@RequestParam Map<String, String> searchParamsMap) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<LsThing> results = new HashSet<LsThing>();
 		String with = searchParamsMap.get("with");
-		try{
+		try {
 			results = lsThingService.searchForDocumentThings(searchParamsMap);
-		}catch (Exception e){
+		} catch (Exception e) {
 			logger.error("Caught error in documentManagerSearch: " + e.toString());
 			return new ResponseEntity<String>(e.toString(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
@@ -1249,9 +1294,10 @@ public ResponseEntity<String> getExperimentCodesByDateValueComparison(@RequestBo
 		DateValueComparisonRequest requestDTO = DateValueComparisonRequest.fromJsonToDateValueComparisonRequest(json);
 		try {
 			Collection<String> results = lsThingService.getLsThingCodesByDateValueComparison(requestDTO);
-			return new ResponseEntity<String>(new JSONSerializer().exclude("*.class").serialize(results), headers, HttpStatus.OK);
-		} catch(Exception e){
-			logger.error("Caught error in getLsThingCodesByDateValueComparison",e);
+			return new ResponseEntity<String>(new JSONSerializer().exclude("*.class").serialize(results), headers,
+					HttpStatus.OK);
+		} catch (Exception e) {
+			logger.error("Caught error in getLsThingCodesByDateValueComparison", e);
 			return new ResponseEntity<String>(e.toString(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
diff --git a/src/main/java/com/labsynch/labseer/api/ApiLsTransactionController.java b/src/main/java/com/labsynch/labseer/api/ApiLsTransactionController.java
index 1290571dc..f50a01619 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiLsTransactionController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiLsTransactionController.java
@@ -27,11 +27,11 @@
 
 public class ApiLsTransactionController {
 
-	private static final Logger logger = LoggerFactory.getLogger(ApiLsTransactionController.class);
-	
-	@Autowired
-	private LsTransactionService lsTransactionService;
-	
+    private static final Logger logger = LoggerFactory.getLogger(ApiLsTransactionController.class);
+
+    @Autowired
+    private LsTransactionService lsTransactionService;
+
     @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<java.lang.String> showJson(@PathVariable("id") Long id) {
@@ -55,9 +55,9 @@ public ResponseEntity<java.lang.String> listJson() {
 
     @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<java.lang.String> createFromJson(@RequestBody String lsTransaction) {
-    	LsTransaction inputLsTransaction = LsTransaction.fromJsonToLsTransaction(lsTransaction);
-    	logger.info(inputLsTransaction.toJson());
-    	inputLsTransaction.persist();
+        LsTransaction inputLsTransaction = LsTransaction.fromJsonToLsTransaction(lsTransaction);
+        logger.info(inputLsTransaction.toJson());
+        inputLsTransaction.persist();
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
         return new ResponseEntity<String>(inputLsTransaction.toJson(), headers, HttpStatus.CREATED);
@@ -70,16 +70,17 @@ public ResponseEntity<java.lang.String> createFromJsonArray(@RequestBody List<Ls
         }
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-        return new ResponseEntity<String>(LsTransaction.toJsonArray(lsTransactions),headers, HttpStatus.CREATED);
+        return new ResponseEntity<String>(LsTransaction.toJsonArray(lsTransactions), headers, HttpStatus.CREATED);
     }
 
     @RequestMapping(value = { "/", "/{id}" }, method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> updateFromJson(@RequestBody String lsTransaction, @PathVariable("id") Long id) {
+    public ResponseEntity<java.lang.String> updateFromJson(@RequestBody String lsTransaction,
+            @PathVariable("id") Long id) {
+
+        LsTransaction inputLsTransaction = LsTransaction.fromJsonToLsTransaction(lsTransaction);
+        logger.info(inputLsTransaction.toJson());
 
-    	LsTransaction inputLsTransaction = LsTransaction.fromJsonToLsTransaction(lsTransaction);
-    	logger.info(inputLsTransaction.toJson());
-    	
-    	HttpHeaders headers = new HttpHeaders();
+        HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
         if (inputLsTransaction.merge() == null) {
             return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
@@ -93,7 +94,7 @@ public ResponseEntity<java.lang.String> updateFromJsonArray(@RequestBody List<Ls
         headers.add("Content-Type", "application/json");
         List<LsTransaction> updatedLsTransactions = new ArrayList<LsTransaction>();
         for (LsTransaction lsTransaction : lsTransactions) {
-        	LsTransaction updatedLsTransaction = lsTransaction.merge();
+            LsTransaction updatedLsTransaction = lsTransaction.merge();
             if (updatedLsTransaction == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -113,18 +114,18 @@ public ResponseEntity<java.lang.String> deleteFromJson(@PathVariable("id") Long
         lsTransaction.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-    
+
     @RequestMapping(value = "/search", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<java.lang.String> searchLsTransactions(@RequestBody LsTransactionQueryDTO query) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-        try{
-        	LsTransactionQueryDTO response = lsTransactionService.searchLsTransactions(query);
-        	return new ResponseEntity<String>(response.toJson(), headers, HttpStatus.OK);
-        }catch (Exception e){
-        	logger.error("Caught exception searching for LsTransactions",e);
-        	return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
+        try {
+            LsTransactionQueryDTO response = lsTransactionService.searchLsTransactions(query);
+            return new ResponseEntity<String>(response.toJson(), headers, HttpStatus.OK);
+        } catch (Exception e) {
+            logger.error("Caught exception searching for LsTransactions", e);
+            return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
         }
-        
+
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiMetalotController.java b/src/main/java/com/labsynch/labseer/api/ApiMetalotController.java
index c17dd3db8..98b49ca0a 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiMetalotController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiMetalotController.java
@@ -29,17 +29,17 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-@RequestMapping(value="/api/v1/metalots")
+@RequestMapping(value = "/api/v1/metalots")
 @Controller
-//@Transactional
+// @Transactional
 public class ApiMetalotController {
-		
+
 	@Autowired
 	private MetalotService metalotService;
-	
+
 	@Autowired
 	private ChemStructureService chemStructService;
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(ApiMetalotController.class);
 
 	@Transactional
@@ -49,16 +49,16 @@ public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Access-Control-Allow-Origin", "*");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 		headers.setContentType(MediaType.APPLICATION_JSON);
 		Metalot metaLot = new Metalot();
-		
+
 		try {
-			Lot lot = Lot.findLot(id); 
+			Lot lot = Lot.findLot(id);
 
-			if (lot == null){
+			if (lot == null) {
 				return new ResponseEntity<String>(metaLot.toJson(), headers, HttpStatus.NOT_FOUND);
 			} else {
 				metaLot.setLot(lot);
@@ -72,54 +72,53 @@ public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
 
 				System.out.println(metaLot.toJson());
 				return new ResponseEntity<String>(metaLot.toJson(), headers, HttpStatus.OK);
-			}			
-			
-		} catch (Exception e){
+			}
+
+		} catch (Exception e) {
 			logger.error("hit an exception: " + e);
-			
+
 		}
-		
+
 		return new ResponseEntity<String>("ERROR", headers, HttpStatus.OK);
 
 	}
 
-
 	@RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
 	public ResponseEntity<String> createFromJson(@RequestBody String json) {
-		HttpHeaders headers= new HttpHeaders();
+		HttpHeaders headers = new HttpHeaders();
 		headers.setContentType(MediaType.TEXT_HTML);
 		headers.add("Access-Control-Allow-Origin", "*");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 
 		logger.debug("here is the original json: " + json);
 
-		
 		MetalotReturn mr = metalotService.save(Metalot.fromJsonToMetalot(json));
 		boolean hasError = false;
-		for (ErrorMessage error : mr.getErrors()){
-			if (error.getLevel().equals("error")) hasError = true;
+		for (ErrorMessage error : mr.getErrors()) {
+			if (error.getLevel().equals("error"))
+				hasError = true;
 		}
-		if (hasError){
+		if (hasError) {
 			headers.add("lot save error", "true");
-			return new ResponseEntity<String>(ErrorMessage.toJsonArray(mr.getErrors()), headers, HttpStatus.INTERNAL_SERVER_ERROR);
+			return new ResponseEntity<String>(ErrorMessage.toJsonArray(mr.getErrors()), headers,
+					HttpStatus.INTERNAL_SERVER_ERROR);
 		} else {
-//			MetalotReturnDTO miniLot = new MetalotReturnDTO();
-//			miniLot.setId(mr.getMetalot().getLot().getId());
-//			miniLot.setCorpName(mr.getMetalot().getLot().getCorpName());
-//			miniLot.setBuid(mr.getMetalot().getLot().getBuid());
-//			Metalot returnMetaLot = mr.getMetalot();
-			return new ResponseEntity<String>(mr.toJson(), headers, HttpStatus.OK);        	
+			// MetalotReturnDTO miniLot = new MetalotReturnDTO();
+			// miniLot.setId(mr.getMetalot().getLot().getId());
+			// miniLot.setCorpName(mr.getMetalot().getLot().getCorpName());
+			// miniLot.setBuid(mr.getMetalot().getLot().getBuid());
+			// Metalot returnMetaLot = mr.getMetalot();
+			return new ResponseEntity<String>(mr.toJson(), headers, HttpStatus.OK);
 		}
 	}
 
-
 	@RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
 	public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
 		Parent parent = Parent.findParent(id);
-		HttpHeaders headers= new HttpHeaders();
+		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/text");
 		headers.add("Access-Control-Allow-Origin", "*");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
@@ -139,15 +138,15 @@ public ResponseEntity<String> jsonFindMetalotsByCorpNameEquals(@PathVariable("co
 		headers.add("Content-Type", "application/text");
 		headers.add("Access-Control-Allow-Origin", "*");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 		Metalot metaLot = new Metalot();
-		List<Lot> lots = Lot.findLotsByCorpNameEquals(corpName).getResultList(); 
-		System.out.println("Number of lots found = " + lots.size());	
+		List<Lot> lots = Lot.findLotsByCorpNameEquals(corpName).getResultList();
+		System.out.println("Number of lots found = " + lots.size());
 
 		if (lots.size() == 0) {
-			System.out.println("Did not find a lot with corpName = " + corpName);	
+			System.out.println("Did not find a lot with corpName = " + corpName);
 		}
 
 		else {
@@ -160,14 +159,13 @@ public ResponseEntity<String> jsonFindMetalotsByCorpNameEquals(@PathVariable("co
 
 			List<FileList> fileLists = FileList.findFileListsByLot(lot).getResultList();
 			metaLot.getFileList().addAll(fileLists);
-			System.out.println("From corpName/corpName --- here is the metalot for corpName = " + corpName);	
-			System.out.println(metaLot.toJson());	    		
+			System.out.println("From corpName/corpName --- here is the metalot for corpName = " + corpName);
+			System.out.println(metaLot.toJson());
 		}
 
 		return new ResponseEntity<String>(metaLot.toJson(), headers, HttpStatus.OK);
 	}
 
-
 	@Transactional
 	@RequestMapping(params = "corpName", method = RequestMethod.GET, headers = "Accept=application/json, application/text, text/html")
 	@ResponseBody
@@ -176,16 +174,16 @@ public ResponseEntity<String> jsonFindMetalotsByCorpNameParam(@RequestParam("cor
 		headers.add("Access-Control-Allow-Origin", "*");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Content-Type", "application/text");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 
 		Metalot metaLot = new Metalot();
-		List<Lot> lots = Lot.findLotsByCorpNameEquals(corpName).getResultList(); 
-		System.out.println("Number of lots found = " + lots.size());	
+		List<Lot> lots = Lot.findLotsByCorpNameEquals(corpName).getResultList();
+		System.out.println("Number of lots found = " + lots.size());
 
 		if (lots.size() == 0) {
-			System.out.println("Did not find a lot with corpName = " + corpName);	
+			System.out.println("Did not find a lot with corpName = " + corpName);
 		}
 
 		else {
@@ -198,11 +196,10 @@ public ResponseEntity<String> jsonFindMetalotsByCorpNameParam(@RequestParam("cor
 
 			List<FileList> fileLists = FileList.findFileListsByLot(lot).getResultList();
 			metaLot.getFileList().addAll(fileLists);
-			System.out.println("here is the metalot for corpName = " + corpName);	
-			System.out.println(metaLot.toJson());	    		
+			System.out.println("here is the metalot for corpName = " + corpName);
+			System.out.println(metaLot.toJson());
 		}
 
-
 		return new ResponseEntity<String>(metaLot.toJson(), headers, HttpStatus.OK);
 	}
 
diff --git a/src/main/java/com/labsynch/labseer/api/ApiOperatorController.java b/src/main/java/com/labsynch/labseer/api/ApiOperatorController.java
index a1dfe3c92..547742204 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiOperatorController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiOperatorController.java
@@ -13,7 +13,7 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-@RequestMapping(value = {"/api/v1/operators"})
+@RequestMapping(value = { "/api/v1/operators" })
 @Transactional
 @Controller
 public class ApiOperatorController {
@@ -26,8 +26,8 @@ public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
         headers.add("Content-Type", "application/text; charset=utf-8");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
         headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
+        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+        headers.add("Pragma", "no-cache"); // HTTP 1.0
         headers.setExpires(0); // Expire the cache
         if (operator == null) {
             return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
@@ -42,8 +42,8 @@ public ResponseEntity<String> listJson() {
         headers.add("Content-Type", "application/text; charset=utf-8");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
         headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
+        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+        headers.add("Pragma", "no-cache"); // HTTP 1.0
         headers.setExpires(0); // Expire the cache
         return new ResponseEntity<String>(Operator.toJsonArray(Operator.findAllOperators()), headers, HttpStatus.OK);
     }
@@ -116,8 +116,8 @@ public ResponseEntity<String> getIsotopeOptions() {
         headers.add("Content-Type", "application/text");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
         headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
+        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+        headers.add("Pragma", "no-cache"); // HTTP 1.0
         headers.setExpires(0); // Expire the cache
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiParentAnnotationController.java b/src/main/java/com/labsynch/labseer/api/ApiParentAnnotationController.java
index c4c062a0d..da22009d0 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiParentAnnotationController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiParentAnnotationController.java
@@ -1,4 +1,5 @@
 package com.labsynch.labseer.api;
+
 import com.labsynch.labseer.domain.ParentAnnotation;
 
 import org.springframework.http.HttpHeaders;
@@ -12,7 +13,7 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-@RequestMapping(value = {"/api/v1/parentAnnotations"})
+@RequestMapping(value = { "/api/v1/parentAnnotations" })
 @Transactional
 @Controller
 public class ApiParentAnnotationController {
@@ -25,8 +26,8 @@ public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
         headers.add("Content-Type", "application/text; charset=utf-8");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
         headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
+        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+        headers.add("Pragma", "no-cache"); // HTTP 1.0
         headers.setExpires(0); // Expire the cache
         if (parentAnnotation == null) {
             return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
@@ -41,10 +42,12 @@ public ResponseEntity<String> listJson() {
         headers.add("Content-Type", "application/text; charset=utf-8");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
         headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
+        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+        headers.add("Pragma", "no-cache"); // HTTP 1.0
         headers.setExpires(0); // Expire the cache
-        return new ResponseEntity<String>(ParentAnnotation.toJsonArray(ParentAnnotation.findAllParentAnnotations("displayOrder", "ASC")), headers, HttpStatus.OK);
+        return new ResponseEntity<String>(
+                ParentAnnotation.toJsonArray(ParentAnnotation.findAllParentAnnotations("displayOrder", "ASC")), headers,
+                HttpStatus.OK);
     }
 
     @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
diff --git a/src/main/java/com/labsynch/labseer/api/ApiParentController.java b/src/main/java/com/labsynch/labseer/api/ApiParentController.java
index 34069191e..152f9ea47 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiParentController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiParentController.java
@@ -21,7 +21,7 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-@RequestMapping(value = {"/api/v1/parents"})
+@RequestMapping(value = { "/api/v1/parents" })
 @Controller
 public class ApiParentController {
 
@@ -33,19 +33,20 @@ public class ApiParentController {
 	@Transactional
 	@RequestMapping(value = "/validateParent", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> validateParent(@RequestBody String json){
+	public ResponseEntity<String> validateParent(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		try{
+		try {
 			Parent queryParent = Parent.fromJsonToParent(json);
 			ParentValidationDTO validationDTO = parentService.validateUniqueParent(queryParent);
-			if (validationDTO.isParentUnique() && validationDTO.getErrors().isEmpty()){
-				return new ResponseEntity<String>(CodeTableDTO.toJsonArray(validationDTO.getAffectedLots()), headers, HttpStatus.OK);
-			}else{
+			if (validationDTO.isParentUnique() && validationDTO.getErrors().isEmpty()) {
+				return new ResponseEntity<String>(CodeTableDTO.toJsonArray(validationDTO.getAffectedLots()), headers,
+						HttpStatus.OK);
+			} else {
 				return new ResponseEntity<String>(validationDTO.toJson(), headers, HttpStatus.BAD_REQUEST);
 			}
-		}catch(Exception e){
-			logger.error("Caught error trying to validate parent",e);
+		} catch (Exception e) {
+			logger.error("Caught error trying to validate parent", e);
 			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
@@ -53,30 +54,29 @@ public ResponseEntity<String> validateParent(@RequestBody String json){
 	@Transactional
 	@RequestMapping(value = "/updateParent", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> updateParent(@RequestBody String json){
+	public ResponseEntity<String> updateParent(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		try{
+		try {
 			Parent parent = Parent.fromJsonToParent(json);
 			Collection<CodeTableDTO> affectedLots = parentService.updateParent(parent);
 			return new ResponseEntity<String>(CodeTableDTO.toJsonArray(affectedLots), headers, HttpStatus.OK);
-		}catch(Exception e){
-			logger.error("Caught error trying to update parent",e);
+		} catch (Exception e) {
+			logger.error("Caught error trying to update parent", e);
 			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
-	
 
 	@RequestMapping(value = "/updateParent/metadata/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> updateParentMetaArray(@RequestBody String json){
+	public ResponseEntity<String> updateParentMetaArray(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		try{
+		try {
 			String results = parentService.updateParentMetaArray(json);
 			return new ResponseEntity<String>(results, headers, HttpStatus.OK);
-		}catch(Exception e){
-			logger.error("Caught error trying to update parent",e);
+		} catch (Exception e) {
+			logger.error("Caught error trying to update parent", e);
 			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
@@ -84,15 +84,15 @@ public ResponseEntity<String> updateParentMetaArray(@RequestBody String json){
 	@Transactional
 	@RequestMapping(value = "/updateParent/metadata", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> updateParentMeta(@RequestBody String json){
+	public ResponseEntity<String> updateParentMeta(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		try{
+		try {
 			ParentEditDTO parentDTO = ParentEditDTO.fromJsonToParentEditDTO(json);
 			Parent parent = parentService.updateParentMeta(parentDTO);
 			return new ResponseEntity<String>(parent.toJson(), headers, HttpStatus.OK);
-		}catch(Exception e){
-			logger.error("Caught error trying to update parent",e);
+		} catch (Exception e) {
+			logger.error("Caught error trying to update parent", e);
 			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
diff --git a/src/main/java/com/labsynch/labseer/api/ApiParentLotController.java b/src/main/java/com/labsynch/labseer/api/ApiParentLotController.java
index 713e9cb3e..950d94f3d 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiParentLotController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiParentLotController.java
@@ -26,69 +26,71 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-@RequestMapping(value = {"/api/v1/parentLot"})
+@RequestMapping(value = { "/api/v1/parentLot" })
 @Controller
 public class ApiParentLotController {
-	
+
 	Logger logger = LoggerFactory.getLogger(ApiParentLotController.class);
-	
+
 	@Autowired
 	private ParentLotService parentLotService;
 
 	@Autowired
 	private LotService lotService;
-	
+
 	@Transactional
 	@RequestMapping(value = "/getLotsByParent", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> getParentByAliasName(@RequestParam String parentCorpName, @RequestParam(value = "with", required = false) String with){
+	public ResponseEntity<String> getParentByAliasName(@RequestParam String parentCorpName,
+			@RequestParam(value = "with", required = false) String with) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		try{
-	        boolean fullObject = false;
-	        if (with != null) {
-	            if (with.equalsIgnoreCase("fullobject")) {
-	                fullObject = true;
-	            }
-	        }
-	        if(fullObject) {
+		try {
+			boolean fullObject = false;
+			if (with != null) {
+				if (with.equalsIgnoreCase("fullobject")) {
+					fullObject = true;
+				}
+			}
+			if (fullObject) {
 				Collection<Lot> lots = parentLotService.getLotsByParentCorpName(parentCorpName);
-				return new ResponseEntity<String>(Lot.toJsonArray(lots), headers, HttpStatus.OK);	        	
-	        } else {
-				Collection<CodeTableDTO> codeTableLots = parentLotService.getCodeTableLotsByParentCorpName(parentCorpName);
-				return new ResponseEntity<String>(CodeTableDTO.toJsonArray(codeTableLots), headers, HttpStatus.OK);	        	
-	        }
-		}catch(Exception e){
+				return new ResponseEntity<String>(Lot.toJsonArray(lots), headers, HttpStatus.OK);
+			} else {
+				Collection<CodeTableDTO> codeTableLots = parentLotService
+						.getCodeTableLotsByParentCorpName(parentCorpName);
+				return new ResponseEntity<String>(CodeTableDTO.toJsonArray(codeTableLots), headers, HttpStatus.OK);
+			}
+		} catch (Exception e) {
 			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
 		}
 	}
-	
+
 	@Transactional
 	@RequestMapping(value = "/getLotsByParentAlias", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> getLotCodesByParentAlias(@RequestBody Collection<ParentLotCodeDTO> requestDTOs){
+	public ResponseEntity<String> getLotCodesByParentAlias(@RequestBody Collection<ParentLotCodeDTO> requestDTOs) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		try{
+		try {
 			Collection<ParentLotCodeDTO> responseDTO = parentLotService.getLotCodesByParentAlias(requestDTOs);
 			return new ResponseEntity<String>(ParentLotCodeDTO.toJsonArray(responseDTO), headers, HttpStatus.OK);
-		}catch(Exception e){
-			logger.error("Caught exception searching for lots by parent alias",e);
+		} catch (Exception e) {
+			logger.error("Caught exception searching for lots by parent alias", e);
 			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
 		}
 	}
-	
+
 	@Transactional
 	@RequestMapping(value = "/updateLot", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> updateLotAndParent(@RequestBody Collection<ParentLotCodeDTO> requestDTOs){
+	public ResponseEntity<String> updateLotAndParent(@RequestBody Collection<ParentLotCodeDTO> requestDTOs) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		try{
+		try {
 			Collection<ParentLotCodeDTO> responseDTO = parentLotService.getLotCodesByParentAlias(requestDTOs);
 			return new ResponseEntity<String>(ParentLotCodeDTO.toJsonArray(responseDTO), headers, HttpStatus.OK);
-		}catch(Exception e){
-			logger.error("Caught exception searching for lots by parent alias",e);
+		} catch (Exception e) {
+			logger.error("Caught exception searching for lots by parent alias", e);
 			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
 		}
 	}
@@ -96,46 +98,47 @@ public ResponseEntity<String> updateLotAndParent(@RequestBody Collection<ParentL
 	@Transactional
 	@RequestMapping(value = "/updateLot/metadata", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> updateLotMetadata(@RequestBody String json){
+	public ResponseEntity<String> updateLotMetadata(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		try{
+		try {
 			LotDTO lotDTO = LotDTO.fromJsonToLotDTO(json);
 			Lot lot = lotService.updateLotMeta(lotDTO);
 			return new ResponseEntity<String>(lot.toJsonIncludeAliases(), headers, HttpStatus.OK);
-		}catch(Exception e){
-			logger.error("Caught exception updating lot metadata",e);
+		} catch (Exception e) {
+			logger.error("Caught exception updating lot metadata", e);
 			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
 		}
 	}
-	
+
 	@Transactional
 	@RequestMapping(value = "/updateLot/metadata/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> updateLotMetaArray(@RequestBody String json){
+	public ResponseEntity<String> updateLotMetaArray(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		try{
+		try {
 			String results = lotService.updateLotMetaArray(json);
 			return new ResponseEntity<String>(results, headers, HttpStatus.OK);
-		}catch(Exception e){
-			logger.error("Caught error trying to update lot metadata",e);
+		} catch (Exception e) {
+			logger.error("Caught error trying to update lot metadata", e);
 			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
-	
+
 	@Transactional
 	@RequestMapping(value = "/reparentLot", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> reparentLot(@RequestBody String json){
+	public ResponseEntity<String> reparentLot(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		try{
+		try {
 			ReparentLotDTO lotDTO = ReparentLotDTO.fromJsonToReparentLotDTO(json);
-			Lot lot = lotService.reparentLot(lotDTO.getLotCorpName(), lotDTO.getParentCorpName(), lotDTO.getModifiedBy());
+			Lot lot = lotService.reparentLot(lotDTO.getLotCorpName(), lotDTO.getParentCorpName(),
+					lotDTO.getModifiedBy());
 			return new ResponseEntity<String>(lot.toJsonIncludeAliases(), headers, HttpStatus.OK);
-		}catch(Exception e){
-			logger.error("Caught exception updating lot metadata",e);
+		} catch (Exception e) {
+			logger.error("Caught exception updating lot metadata", e);
 			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
 		}
 	}
@@ -143,19 +146,19 @@ public ResponseEntity<String> reparentLot(@RequestBody String json){
 	@Transactional
 	@RequestMapping(value = "/reparentLot/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> reparentLotArray(@RequestBody String json){
+	public ResponseEntity<String> reparentLotArray(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		int lotCount = 0;
-		try{
+		try {
 			Collection<ReparentLotDTO> lotDTOs = ReparentLotDTO.fromJsonArrayToReparentLoes(json);
-			for (ReparentLotDTO lotDTO : lotDTOs){
+			for (ReparentLotDTO lotDTO : lotDTOs) {
 				lotService.reparentLot(lotDTO.getLotCorpName(), lotDTO.getParentCorpName(), lotDTO.getModifiedBy());
 				lotCount++;
 			}
 			return new ResponseEntity<String>("number of lots reparented: " + lotCount, headers, HttpStatus.OK);
-		}catch(Exception e){
-			logger.error("Caught exception updating lot metadata",e);
+		} catch (Exception e) {
+			logger.error("Caught exception updating lot metadata", e);
 			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
 		}
 	}
@@ -163,14 +166,14 @@ public ResponseEntity<String> reparentLotArray(@RequestBody String json){
 	@Transactional
 	@RequestMapping(value = "/getLotsByProjectsList", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> getLotsByProjectsList(@RequestBody List<String> allowedProjects){
+	public ResponseEntity<String> getLotsByProjectsList(@RequestBody List<String> allowedProjects) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		try{
+		try {
 			Collection<LotsByProjectDTO> lots = lotService.getLotsByProjectsList(allowedProjects);
-			return new ResponseEntity<String>(LotsByProjectDTO.toJsonArray(lots), headers, HttpStatus.OK);	        	
-		}catch(Exception e){
-			logger.error("Caught exception updating lot metadata",e);
+			return new ResponseEntity<String>(LotsByProjectDTO.toJsonArray(lots), headers, HttpStatus.OK);
+		} catch (Exception e) {
+			logger.error("Caught exception updating lot metadata", e);
 			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
 		}
 	}
diff --git a/src/main/java/com/labsynch/labseer/api/ApiPhysicalStateController.java b/src/main/java/com/labsynch/labseer/api/ApiPhysicalStateController.java
index 95e73f696..0abce2532 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiPhysicalStateController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiPhysicalStateController.java
@@ -1,4 +1,5 @@
 package com.labsynch.labseer.api;
+
 import com.labsynch.labseer.domain.PhysicalState;
 import com.labsynch.labseer.utils.PropertiesUtilService;
 
@@ -14,14 +15,13 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-@RequestMapping(value = {"/api/v1/physicalStates"})
+@RequestMapping(value = { "/api/v1/physicalStates" })
 @Transactional
 @Controller
 public class ApiPhysicalStateController {
-	
-	@Autowired
-	private PropertiesUtilService propertiesUtilService;
 
+    @Autowired
+    private PropertiesUtilService propertiesUtilService;
 
     @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
@@ -31,8 +31,8 @@ public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
         headers.add("Content-Type", "application/text; charset=utf-8");
         headers.add("Access-Control-Allow-Origin", "*");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
+        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+        headers.add("Pragma", "no-cache"); // HTTP 1.0
         headers.setExpires(0); // Expire the cache
         if (physicalstate == null) {
             return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
@@ -47,15 +47,18 @@ public ResponseEntity<String> listJson() {
         headers.add("Content-Type", "application/text; charset=utf-8");
         headers.add("Access-Control-Allow-Origin", "*");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
+        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+        headers.add("Pragma", "no-cache"); // HTTP 1.0
         headers.setExpires(0); // Expire the cache
-        
-		if (propertiesUtilService.getOrderSelectLists()){
-	        return new ResponseEntity<String>(PhysicalState.toJsonArray(PhysicalState.findAllPhysicalStates("name", "ASC")), headers, HttpStatus.OK);
-		} else {
-	        return new ResponseEntity<String>(PhysicalState.toJsonArray(PhysicalState.findAllPhysicalStates()), headers, HttpStatus.OK);
-		}
+
+        if (propertiesUtilService.getOrderSelectLists()) {
+            return new ResponseEntity<String>(
+                    PhysicalState.toJsonArray(PhysicalState.findAllPhysicalStates("name", "ASC")), headers,
+                    HttpStatus.OK);
+        } else {
+            return new ResponseEntity<String>(PhysicalState.toJsonArray(PhysicalState.findAllPhysicalStates()), headers,
+                    HttpStatus.OK);
+        }
     }
 
     @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
@@ -127,11 +130,10 @@ public ResponseEntity<String> getPhysicalStateOptions() {
         headers.add("Content-Type", "application/text");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
         headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
+        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+        headers.add("Pragma", "no-cache"); // HTTP 1.0
         headers.setExpires(0); // Expire the cache
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
 
-    
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiPreferredIdController.java b/src/main/java/com/labsynch/labseer/api/ApiPreferredIdController.java
index 14699e9b3..974e3cfa3 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiPreferredIdController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiPreferredIdController.java
@@ -18,16 +18,16 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-@RequestMapping(value = {"/api/v1"})
+@RequestMapping(value = { "/api/v1" })
 @Controller
 public class ApiPreferredIdController {
-	
+
 	Logger logger = LoggerFactory.getLogger(ApiPreferredIdController.class);
 
 	@Transactional
 	@RequestMapping(value = "/getPreferredName", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> jsonArrayCheckCorpNameExists(@RequestBody String json){
+	public ResponseEntity<String> jsonArrayCheckCorpNameExists(@RequestBody String json) {
 		logger.debug("incoming json from getPreferredName: " + json);
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
@@ -35,11 +35,11 @@ public ResponseEntity<String> jsonArrayCheckCorpNameExists(@RequestBody String j
 		preferredNameDTOs = PreferredNameDTO.getPreferredNames(preferredNameDTOs);
 		return new ResponseEntity<String>(PreferredNameDTO.toJsonArray(preferredNameDTOs), headers, HttpStatus.OK);
 	}
-	
+
 	@Transactional
 	@RequestMapping(value = "/getPreferredName/parent", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> jsonArrayCheckParentCorpNameExists(@RequestBody String json){
+	public ResponseEntity<String> jsonArrayCheckParentCorpNameExists(@RequestBody String json) {
 		logger.debug("incoming json from getPreferredName: " + json);
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
@@ -47,17 +47,17 @@ public ResponseEntity<String> jsonArrayCheckParentCorpNameExists(@RequestBody St
 		preferredNameDTOs = PreferredNameDTO.getParentPreferredNames(preferredNameDTOs);
 		return new ResponseEntity<String>(PreferredNameDTO.toJsonArray(preferredNameDTOs), headers, HttpStatus.OK);
 	}
-	
+
 	@Transactional
 	@RequestMapping(value = "/getPreferredName", method = RequestMethod.GET, headers = "Accept=application/json, application/text, text/html")
 	@ResponseBody
-	public ResponseEntity<String> checkCorpNameExists(@RequestParam String requestName){
+	public ResponseEntity<String> checkCorpNameExists(@RequestParam String requestName) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/text");
 		headers.add("Access-Control-Allow-Origin", "*");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 		Collection<PreferredNameDTO> preferredNameDTOs = new HashSet<PreferredNameDTO>();
 		PreferredNameDTO preferredNameDTO = new PreferredNameDTO();
diff --git a/src/main/java/com/labsynch/labseer/api/ApiProjectController.java b/src/main/java/com/labsynch/labseer/api/ApiProjectController.java
index 997a7510a..187786def 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiProjectController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiProjectController.java
@@ -15,27 +15,27 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-@RequestMapping(value = {"/api/v1/projects"})
+@RequestMapping(value = { "/api/v1/projects" })
 @Controller
 public class ApiProjectController {
-	
+
 	Logger logger = LoggerFactory.getLogger(ApiProjectController.class);
-		
+
 	@RequestMapping(value = "/getBatchProjects", method = RequestMethod.POST, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> getBatchProjects(@RequestBody String json) {
+	@ResponseBody
+	public ResponseEntity<String> getBatchProjects(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        headers.add("Access-Control-Allow-Headers", "Content-Type");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
-        headers.setExpires(0); // Expire the cache
-		try{
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		headers.add("Access-Control-Allow-Headers", "Content-Type");
+		headers.add("Access-Control-Allow-Origin", "*");
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
+		headers.setExpires(0); // Expire the cache
+		try {
 			Collection<BatchProjectDTO> requestDTOs = BatchProjectDTO.fromJsonArrayToBatchProes(json);
 			Collection<BatchProjectDTO> resultDTOs = BatchProjectDTO.getBatchProjects(requestDTOs);
-		    return new ResponseEntity<String>(BatchProjectDTO.toJsonArray(resultDTOs), headers, HttpStatus.OK);
-		}catch (Exception e){
+			return new ResponseEntity<String>(BatchProjectDTO.toJsonArray(resultDTOs), headers, HttpStatus.OK);
+		} catch (Exception e) {
 			logger.error("Caught exception getting batch projects", e);
 			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
diff --git a/src/main/java/com/labsynch/labseer/api/ApiProtocolController.java b/src/main/java/com/labsynch/labseer/api/ApiProtocolController.java
index b5c08395d..06901b652 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiProtocolController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiProtocolController.java
@@ -56,31 +56,33 @@ public class ApiProtocolController {
 
     @Autowired
     private ProtocolService protocolService;
-    
+
     @Autowired
     private ProtocolValueService protocolValueService;
 
     @Autowired
     private ExperimentValueService experimentValueService;
-    
+
     @Autowired
     private PropertiesUtilService propertiesUtilService;
-    
-//    @Transactional
-//	@RequestMapping(value = "/find=bymetadata", method = RequestMethod.GET, headers = "Accept=application/json")
-//    @ResponseBody
-//    public ResponseEntity<java.lang.String> findProtocolsByMetadata(
-//			@RequestBody String json,
-//			@RequestParam(value = "with", required = false) String with) {
-//        HttpHeaders headers = new HttpHeaders();
-//        headers.add("Content-Type", "application/json; charset=utf-8");
-//        
-//		Collection<Protocol> protocols = protocolService.findProtocolsByMetadataJson(json);
-//
-//        
-//        return new ResponseEntity<String>(Protocol.toJsonArray(protocols), headers, HttpStatus.OK);
-//    }
 
+    // @Transactional
+    // @RequestMapping(value = "/find=bymetadata", method = RequestMethod.GET,
+    // headers = "Accept=application/json")
+    // @ResponseBody
+    // public ResponseEntity<java.lang.String> findProtocolsByMetadata(
+    // @RequestBody String json,
+    // @RequestParam(value = "with", required = false) String with) {
+    // HttpHeaders headers = new HttpHeaders();
+    // headers.add("Content-Type", "application/json; charset=utf-8");
+    //
+    // Collection<Protocol> protocols =
+    // protocolService.findProtocolsByMetadataJson(json);
+    //
+    //
+    // return new ResponseEntity<String>(Protocol.toJsonArray(protocols), headers,
+    // HttpStatus.OK);
+    // }
 
     @Transactional
     @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
@@ -98,7 +100,9 @@ public ResponseEntity<java.lang.String> showJson(@PathVariable("id") Long id) {
     @Transactional
     @RequestMapping(value = "/{lstype}/{lskind}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
-    public ResponseEntity<java.lang.String> listJsonByPath(@PathVariable("lstype") String lsType, @PathVariable("lskind") String lsKind, @RequestParam(value = "with", required = false) String with, @RequestParam(value = "prettyjson", required = false) String prettyjson) {
+    public ResponseEntity<java.lang.String> listJsonByPath(@PathVariable("lstype") String lsType,
+            @PathVariable("lskind") String lsKind, @RequestParam(value = "with", required = false) String with,
+            @RequestParam(value = "prettyjson", required = false) String prettyjson) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json; charset=utf-8");
         boolean prettyJson = false;
@@ -123,13 +127,17 @@ public ResponseEntity<java.lang.String> listJsonByPath(@PathVariable("lstype") S
         } else {
             protocols = Protocol.findAllProtocols();
         }
-        return new ResponseEntity<String>(Protocol.toJsonArray(protocols, prettyJson, includeExperiments), headers, HttpStatus.OK);
+        return new ResponseEntity<String>(Protocol.toJsonArray(protocols, prettyJson, includeExperiments), headers,
+                HttpStatus.OK);
     }
 
     @Transactional
     @RequestMapping(method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
-    public ResponseEntity<java.lang.String> listJson(@RequestParam(value = "with", required = false) String with, @RequestParam(value = "prettyjson", required = false) String prettyjson, @RequestParam(value = "lstype", required = false) String lsType, @RequestParam(value = "lskind", required = false) String lsKind) {
+    public ResponseEntity<java.lang.String> listJson(@RequestParam(value = "with", required = false) String with,
+            @RequestParam(value = "prettyjson", required = false) String prettyjson,
+            @RequestParam(value = "lstype", required = false) String lsType,
+            @RequestParam(value = "lskind", required = false) String lsKind) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json; charset=utf-8");
         logger.debug("value for prettyjson: " + prettyjson);
@@ -156,26 +164,27 @@ public ResponseEntity<java.lang.String> listJson(@RequestParam(value = "with", r
         } else {
             protocols = Protocol.findAllProtocols();
         }
-        return new ResponseEntity<String>(Protocol.toJsonArray(protocols, prettyJson, includeExperiments), headers, HttpStatus.OK);
+        return new ResponseEntity<String>(Protocol.toJsonArray(protocols, prettyJson, includeExperiments), headers,
+                HttpStatus.OK);
     }
 
     @Transactional
     @RequestMapping(value = "/codetable", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<java.lang.String> listJsonCodeTable(
-    		@RequestParam(value = "with", required = false) String with, 
-    		@RequestParam(value = "prettyjson", required = false) String prettyjson, 
-    		@RequestParam(value = "lstype", required = false) String lsType, 
-    		@RequestParam(value = "lskind", required = false) String lsKind, 
-    		@RequestParam(value = "protocolName", required = false) String protocolName) {
+            @RequestParam(value = "with", required = false) String with,
+            @RequestParam(value = "prettyjson", required = false) String prettyjson,
+            @RequestParam(value = "lstype", required = false) String lsType,
+            @RequestParam(value = "lskind", required = false) String lsKind,
+            @RequestParam(value = "protocolName", required = false) String protocolName) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json; charset=utf-8");
         List<CodeTableDTO> result;
         if (lsKind != null) {
             result = Protocol.getProtocolCodeTableByKindEquals(lsKind);
         } else if (protocolName != null) {
-        	result = Protocol.getProtocolCodeTableByNameLike(protocolName);
-        }else {
+            result = Protocol.getProtocolCodeTableByNameLike(protocolName);
+        } else {
             result = Protocol.getProtocolCodeTable();
         }
         result = CodeTableDTO.sortCodeTables(result);
@@ -184,15 +193,15 @@ public ResponseEntity<java.lang.String> listJsonCodeTable(
 
     @Transactional
     @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> createFromJson(@RequestBody Protocol protocol){
+    public ResponseEntity<java.lang.String> createFromJson(@RequestBody Protocol protocol) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
         ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
         boolean errorsFound = false;
-        try{
+        try {
             protocol = protocolService.saveLsProtocol(protocol);
-        } catch(UniqueNameException e){
-        	logger.error("----from the controller----" + e.getMessage().toString() + " whole message  " + e.toString());
+        } catch (UniqueNameException e) {
+            logger.error("----from the controller----" + e.getMessage().toString() + " whole message  " + e.toString());
             ErrorMessage error = new ErrorMessage();
             error.setErrorLevel("error");
             error.setMessage("not unique protocol name");
@@ -236,10 +245,10 @@ public ResponseEntity<java.lang.String> updateFromJson(@RequestBody Protocol pro
         headers.add("Content-Type", "application/json");
         ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
         boolean errorsFound = false;
-        try{
-        	protocol = protocolService.updateProtocol(protocol);
-        } catch(UniqueNameException e){
-        	logger.error("----from the controller----" + e.getMessage().toString() + " whole message  " + e.toString());
+        try {
+            protocol = protocolService.updateProtocol(protocol);
+        } catch (UniqueNameException e) {
+            logger.error("----from the controller----" + e.getMessage().toString() + " whole message  " + e.toString());
             ErrorMessage error = new ErrorMessage();
             error.setErrorLevel("error");
             error.setMessage("not unique protocol name");
@@ -263,17 +272,18 @@ public ResponseEntity<java.lang.String> updateFromJsonArray(@RequestBody List<Pr
         ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
         boolean errorsFound = false;
         for (Protocol protocol : protocols) {
-        	try{
-        		updatedProtocols.add(protocolService.updateProtocol(protocol));
-            } catch(UniqueNameException e){
-            	logger.error("----from the controller----" + e.getMessage().toString() + " whole message  " + e.toString());
+            try {
+                updatedProtocols.add(protocolService.updateProtocol(protocol));
+            } catch (UniqueNameException e) {
+                logger.error(
+                        "----from the controller----" + e.getMessage().toString() + " whole message  " + e.toString());
                 ErrorMessage error = new ErrorMessage();
                 error.setErrorLevel("error");
                 error.setMessage("not unique experiment name");
                 errors.add(error);
                 errorsFound = true;
             }
-        	if (errorsFound) {
+            if (errorsFound) {
                 return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.CONFLICT);
             }
         }
@@ -289,12 +299,12 @@ public ResponseEntity<java.lang.String> deleteFromJson(@PathVariable("id") Long
         if (protocol == null) {
             return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
         }
-//        protocol.remove();
+        // protocol.remove();
         protocol.setIgnored(true);
         protocol.setDeleted(true);
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-    
+
     @RequestMapping(value = "/browser/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> softDeleteById(@PathVariable("id") Long id) {
         Protocol protocol = Protocol.findProtocol(id);
@@ -303,18 +313,21 @@ public ResponseEntity<String> softDeleteById(@PathVariable("id") Long id) {
         if (protocol == null) {
             return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
         }
-        ProtocolValue protocolValue = protocolValueService.updateProtocolValue(protocol.getCodeName(), "metadata", "protocol metadata", "codeValue", "protocol status", "deleted");
-		protocol.setIgnored(true);
-		for (Experiment experiment : Experiment.findExperimentsByProtocol(protocol).getResultList()){
-			ExperimentValue experimentValue = experimentValueService.updateExperimentValue(experiment.getCodeName(), "metadata", "experiment metadata", "codeValue", "experiment status", "deleted");
-			experiment.setIgnored(true);
-		}
+        ProtocolValue protocolValue = protocolValueService.updateProtocolValue(protocol.getCodeName(), "metadata",
+                "protocol metadata", "codeValue", "protocol status", "deleted");
+        protocol.setIgnored(true);
+        for (Experiment experiment : Experiment.findExperimentsByProtocol(protocol).getResultList()) {
+            ExperimentValue experimentValue = experimentValueService.updateExperimentValue(experiment.getCodeName(),
+                    "metadata", "experiment metadata", "codeValue", "experiment status", "deleted");
+            experiment.setIgnored(true);
+        }
         return new ResponseEntity<String>(protocolValue.toJson(), headers, HttpStatus.OK);
     }
 
     @Transactional
     @RequestMapping(value = "/lsprotocols", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> createLsProtocolFromJson(@RequestBody Protocol protocol) throws UniqueNameException {
+    public ResponseEntity<java.lang.String> createLsProtocolFromJson(@RequestBody Protocol protocol)
+            throws UniqueNameException {
         protocol = protocolService.saveLsProtocol(protocol);
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -324,14 +337,15 @@ public ResponseEntity<java.lang.String> createLsProtocolFromJson(@RequestBody Pr
     @Transactional
     @RequestMapping(value = "/codename/{codeName}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
-    public ResponseEntity<java.lang.String> jsonFindProtocolsByCodeNameEqualsRoute(@PathVariable("codeName") String codeName) {
-    	HttpHeaders headers = new HttpHeaders();
+    public ResponseEntity<java.lang.String> jsonFindProtocolsByCodeNameEqualsRoute(
+            @PathVariable("codeName") String codeName) {
+        HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json; charset=utf-8");
         Protocol protocol;
-        try{
-        	protocol = Protocol.findProtocolsByCodeNameEquals(codeName).getSingleResult();
-        } catch (NoResultException e){
-        	return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+        try {
+            protocol = Protocol.findProtocolsByCodeNameEquals(codeName).getSingleResult();
+        } catch (NoResultException e) {
+            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
         }
         return new ResponseEntity<String>(protocol.toJsonStub(), headers, HttpStatus.OK);
     }
@@ -339,10 +353,14 @@ public ResponseEntity<java.lang.String> jsonFindProtocolsByCodeNameEqualsRoute(@
     @Transactional
     @RequestMapping(params = "FindByCodeName", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
-    public ResponseEntity<java.lang.String> jsonFindProtocolsByCodeNameEquals(@RequestParam("codeName") String codeName) {
+    public ResponseEntity<java.lang.String> jsonFindProtocolsByCodeNameEquals(
+            @RequestParam("codeName") String codeName) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(Protocol.toJsonArray(Protocol.findProtocolsByCodeNameEqualsAndIgnoredNot(codeName, true).getResultList()), headers, HttpStatus.OK);
+        return new ResponseEntity<String>(
+                Protocol.toJsonArray(
+                        Protocol.findProtocolsByCodeNameEqualsAndIgnoredNot(codeName, true).getResultList()),
+                headers, HttpStatus.OK);
     }
 
     @Transactional
@@ -353,16 +371,19 @@ public ResponseEntity<java.lang.String> jsonFindProtocolsByProtocolNameEqualsRou
         String protocolName = restOfTheUrl.split("protocolname\\/")[1].replaceAll("/$", "");
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(Protocol.toJsonArray(Protocol.findProtocolByProtocolName(protocolName)), headers, HttpStatus.OK);
+        return new ResponseEntity<String>(Protocol.toJsonArray(Protocol.findProtocolByProtocolName(protocolName)),
+                headers, HttpStatus.OK);
     }
 
     @Transactional
     @RequestMapping(params = "FindByProtocolName", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
-    public ResponseEntity<java.lang.String> jsonFindProtocolsByProtocolNameEqualsGet(@RequestParam("protocolName") String protocolName) {
+    public ResponseEntity<java.lang.String> jsonFindProtocolsByProtocolNameEqualsGet(
+            @RequestParam("protocolName") String protocolName) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(Protocol.toJsonArray(Protocol.findProtocolByProtocolName(protocolName)), headers, HttpStatus.OK);
+        return new ResponseEntity<String>(Protocol.toJsonArray(Protocol.findProtocolByProtocolName(protocolName)),
+                headers, HttpStatus.OK);
     }
 
     @Transactional
@@ -371,144 +392,176 @@ public ResponseEntity<java.lang.String> jsonFindProtocolsByProtocolNameEqualsGet
     public ResponseEntity<java.lang.String> jsonFindProtocolByNameGet(@RequestParam("name") String name) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(Protocol.toJsonArray(Protocol.findProtocolByName(name)), headers, HttpStatus.OK);
+        return new ResponseEntity<String>(Protocol.toJsonArray(Protocol.findProtocolByName(name)), headers,
+                HttpStatus.OK);
     }
 
-	@RequestMapping(params = "find=ByIgnoredNot", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(params = "find=ByIgnoredNot", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
-    public ResponseEntity<String> jsonFindProtocolsByIgnoredNot(@RequestParam(value = "ignored", required = false) boolean ignored) {
+    public ResponseEntity<String> jsonFindProtocolsByIgnoredNot(
+            @RequestParam(value = "ignored", required = false) boolean ignored) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(Protocol.toJsonArray(Protocol.findProtocolsByIgnoredNot(ignored).getResultList()), headers, HttpStatus.OK);
+        return new ResponseEntity<String>(
+                Protocol.toJsonArray(Protocol.findProtocolsByIgnoredNot(ignored).getResultList()), headers,
+                HttpStatus.OK);
     }
 
-	@RequestMapping(params = "find=ByLsKindEquals", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(params = "find=ByLsKindEquals", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> jsonFindProtocolsByLsKindEquals(@RequestParam("lsKind") String lsKind) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(Protocol.toJsonArray(Protocol.findProtocolsByLsKindEquals(lsKind).getResultList()), headers, HttpStatus.OK);
+        return new ResponseEntity<String>(
+                Protocol.toJsonArray(Protocol.findProtocolsByLsKindEquals(lsKind).getResultList()), headers,
+                HttpStatus.OK);
     }
 
-	@RequestMapping(params = "find=ByLsTransactionEquals", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(params = "find=ByLsTransactionEquals", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
-    public ResponseEntity<String> jsonFindProtocolsByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction) {
+    public ResponseEntity<String> jsonFindProtocolsByLsTransactionEquals(
+            @RequestParam("lsTransaction") Long lsTransaction) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(Protocol.toJsonArray(Protocol.findProtocolsByLsTransactionEquals(lsTransaction).getResultList()), headers, HttpStatus.OK);
+        return new ResponseEntity<String>(
+                Protocol.toJsonArray(Protocol.findProtocolsByLsTransactionEquals(lsTransaction).getResultList()),
+                headers, HttpStatus.OK);
     }
 
-	@RequestMapping(params = "find=ByLsTypeAndKindEquals", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(params = "find=ByLsTypeAndKindEquals", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
-    public ResponseEntity<String> jsonFindProtocolsByLsTypeAndKindEquals(@RequestParam("lsTypeAndKind") String lsTypeAndKind) {
+    public ResponseEntity<String> jsonFindProtocolsByLsTypeAndKindEquals(
+            @RequestParam("lsTypeAndKind") String lsTypeAndKind) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(Protocol.toJsonArray(Protocol.findProtocolsByLsTypeAndKindEquals(lsTypeAndKind).getResultList()), headers, HttpStatus.OK);
+        return new ResponseEntity<String>(
+                Protocol.toJsonArray(Protocol.findProtocolsByLsTypeAndKindEquals(lsTypeAndKind).getResultList()),
+                headers, HttpStatus.OK);
     }
 
-	@RequestMapping(params = "find=ByLsTypeEquals", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(params = "find=ByLsTypeEquals", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> jsonFindProtocolsByLsTypeEquals(@RequestParam("lsType") String lsType) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(Protocol.toJsonArray(Protocol.findProtocolsByLsTypeEquals(lsType).getResultList()), headers, HttpStatus.OK);
+        return new ResponseEntity<String>(
+                Protocol.toJsonArray(Protocol.findProtocolsByLsTypeEquals(lsType).getResultList()), headers,
+                HttpStatus.OK);
     }
 
-	@RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEquals", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEquals", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
-    public ResponseEntity<String> jsonFindProtocolsByLsTypeEqualsAndLsKindEquals(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind) {
+    public ResponseEntity<String> jsonFindProtocolsByLsTypeEqualsAndLsKindEquals(@RequestParam("lsType") String lsType,
+            @RequestParam("lsKind") String lsKind) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(Protocol.toJsonArray(Protocol.findProtocolsByLsTypeEqualsAndLsKindEquals(lsType, lsKind).getResultList()), headers, HttpStatus.OK);
+        return new ResponseEntity<String>(
+                Protocol.toJsonArray(
+                        Protocol.findProtocolsByLsTypeEqualsAndLsKindEquals(lsType, lsKind).getResultList()),
+                headers, HttpStatus.OK);
     }
-	
+
     @RequestMapping(params = "find=ByMetadata", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     @Transactional
-    public ResponseEntity<java.lang.String> listJsonByMetadata(@RequestParam Map<String,String> requestParams) {
-//example url: http://localhost:8080/acas/api/v1/protocols/?find=ByMetadata&name=Target%20Y&codeName=PROT-00000004&type=default&kind=default
-    	//Filter parameters supported: type, kind, name, codeName
+    public ResponseEntity<java.lang.String> listJsonByMetadata(@RequestParam Map<String, String> requestParams) {
+        // example url:
+        // http://localhost:8080/acas/api/v1/protocols/?find=ByMetadata&name=Target%20Y&codeName=PROT-00000004&type=default&kind=default
+        // Filter parameters supported: type, kind, name, codeName
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json; charset=utf-8");
         Set<Protocol> result = new HashSet<Protocol>();
-        
+
         result = protocolService.findProtocolsByRequestMetadata(requestParams);
-        
+
         return new ResponseEntity<String>(Protocol.toJsonArrayStub(result), headers, HttpStatus.OK);
     }
-	
-	@RequestMapping(value = "/search", method = RequestMethod.GET)
-	@ResponseBody
-	public ResponseEntity<String> protocolBrowserSearch(@RequestParam(value="userName", required = false) String userName, @RequestParam(value="projects", required = false) List<String> projects, @RequestParam("q") String searchQuery) {
-		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/json; charset=utf-8");
-		try {
-			if (userName == null && projects == null){
-				logger.info("--------- accesing protocol search without userName ---------------");
-                Collection<ProtocolDTO> result = ProtocolDTO.convertCollectionToProtocolDTO(protocolService.findProtocolsByGenericMetaDataSearch(searchQuery));
-				return new ResponseEntity<String>(ProtocolDTO.toJsonArrayStub(result), headers, HttpStatus.OK);				
-			} else if (projects == null) {
-                Collection<ProtocolDTO> result = ProtocolDTO.convertCollectionToProtocolDTO(protocolService.findProtocolsByGenericMetaDataSearch(searchQuery, userName));
-				return new ResponseEntity<String>(ProtocolDTO.toJsonArrayStub(result), headers, HttpStatus.OK);
-			} else {
-                Collection<ProtocolDTO> result = ProtocolDTO.convertCollectionToProtocolDTO(protocolService.findProtocolsByGenericMetaDataSearch(searchQuery, projects));
-				return new ResponseEntity<String>(ProtocolDTO.toJsonArrayStub(result), headers, HttpStatus.OK);
-			}
-		}catch(Exception e){
-			String error = e.getMessage() + e.getStackTrace();
-			return new ResponseEntity<String>(error, headers, HttpStatus.INTERNAL_SERVER_ERROR);
-		}
-	}
-	
-	@RequestMapping(value= "/experimentCount/{codeName}", method = RequestMethod.GET)
-	@ResponseBody
-	public ResponseEntity<String> experimentCount(@PathVariable String codeName) {
-		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/json");
-		int numberOfExperiments = Protocol.findProtocolsByCodeNameEquals(codeName).getSingleResult().getExperiments().size();
+
+    @RequestMapping(value = "/search", method = RequestMethod.GET)
+    @ResponseBody
+    public ResponseEntity<String> protocolBrowserSearch(
+            @RequestParam(value = "userName", required = false) String userName,
+            @RequestParam(value = "projects", required = false) List<String> projects,
+            @RequestParam("q") String searchQuery) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Type", "application/json; charset=utf-8");
+        try {
+            if (userName == null && projects == null) {
+                logger.info("--------- accesing protocol search without userName ---------------");
+                Collection<ProtocolDTO> result = ProtocolDTO.convertCollectionToProtocolDTO(
+                        protocolService.findProtocolsByGenericMetaDataSearch(searchQuery));
+                return new ResponseEntity<String>(ProtocolDTO.toJsonArrayStub(result), headers, HttpStatus.OK);
+            } else if (projects == null) {
+                Collection<ProtocolDTO> result = ProtocolDTO.convertCollectionToProtocolDTO(
+                        protocolService.findProtocolsByGenericMetaDataSearch(searchQuery, userName));
+                return new ResponseEntity<String>(ProtocolDTO.toJsonArrayStub(result), headers, HttpStatus.OK);
+            } else {
+                Collection<ProtocolDTO> result = ProtocolDTO.convertCollectionToProtocolDTO(
+                        protocolService.findProtocolsByGenericMetaDataSearch(searchQuery, projects));
+                return new ResponseEntity<String>(ProtocolDTO.toJsonArrayStub(result), headers, HttpStatus.OK);
+            }
+        } catch (Exception e) {
+            String error = e.getMessage() + e.getStackTrace();
+            return new ResponseEntity<String>(error, headers, HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+    }
+
+    @RequestMapping(value = "/experimentCount/{codeName}", method = RequestMethod.GET)
+    @ResponseBody
+    public ResponseEntity<String> experimentCount(@PathVariable String codeName) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Type", "application/json");
+        int numberOfExperiments = Protocol.findProtocolsByCodeNameEquals(codeName).getSingleResult().getExperiments()
+                .size();
         String result = new JSONSerializer().serialize(numberOfExperiments);
-		return new ResponseEntity<String>(result, headers, HttpStatus.OK);
-	}
-	
-	@Transactional
+        return new ResponseEntity<String>(result, headers, HttpStatus.OK);
+    }
+
+    @Transactional
     @RequestMapping(value = "/codename/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     @ResponseBody
-    public ResponseEntity<java.lang.String> findProtocolsByCodeNames(@RequestBody List<String> codeNames, @RequestParam(value = "with", required = false) String with) {
+    public ResponseEntity<java.lang.String> findProtocolsByCodeNames(@RequestBody List<String> codeNames,
+            @RequestParam(value = "with", required = false) String with) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json; charset=utf-8");
         Collection<ProtocolErrorMessageDTO> foundProtocols;
-        try{
-        	foundProtocols = protocolService.findProtocolsByCodeNames(codeNames);
-        } catch (NoResultException e){
-        	return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+        try {
+            foundProtocols = protocolService.findProtocolsByCodeNames(codeNames);
+        } catch (NoResultException e) {
+            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
         }
         if (with != null) {
             if (with.equalsIgnoreCase("fullobject")) {
-                return new ResponseEntity<String>(ProtocolErrorMessageDTO.toJsonArray(foundProtocols), headers, HttpStatus.OK);
+                return new ResponseEntity<String>(ProtocolErrorMessageDTO.toJsonArray(foundProtocols), headers,
+                        HttpStatus.OK);
             } else if (with.equalsIgnoreCase("stub")) {
-                return new ResponseEntity<String>(ProtocolErrorMessageDTO.toJsonArrayStub(foundProtocols), headers, HttpStatus.OK);
+                return new ResponseEntity<String>(ProtocolErrorMessageDTO.toJsonArrayStub(foundProtocols), headers,
+                        HttpStatus.OK);
             } else {
-                return new ResponseEntity<String>("ERROR: with" + with + " format option not recognized. ", headers, HttpStatus.INTERNAL_SERVER_ERROR);
+                return new ResponseEntity<String>("ERROR: with" + with + " format option not recognized. ", headers,
+                        HttpStatus.INTERNAL_SERVER_ERROR);
             }
         } else {
-            return new ResponseEntity<String>(ProtocolErrorMessageDTO.toJsonArrayStub(foundProtocols), headers, HttpStatus.OK);
+            return new ResponseEntity<String>(ProtocolErrorMessageDTO.toJsonArrayStub(foundProtocols), headers,
+                    HttpStatus.OK);
         }
     }
-	
-	@Transactional
+
+    @Transactional
     @RequestMapping(value = "/getProtocolCodesByDateValueComparison", method = RequestMethod.POST)
-	@ResponseBody
-	public ResponseEntity<String> getExperimentCodesByDateValueComparison(@RequestBody String json) {
-		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/json");
-		DateValueComparisonRequest requestDTO = DateValueComparisonRequest.fromJsonToDateValueComparisonRequest(json);
-		try {
-			Collection<String> results = protocolService.getProtocolCodesByDateValueComparison(requestDTO);
-			return new ResponseEntity<String>(new JSONSerializer().exclude("*.class").serialize(results), headers, HttpStatus.OK);
-		} catch(Exception e){
-			logger.error("Caught error in getProtocolCodesByDateValueComparison",e);
-			return new ResponseEntity<String>(e.toString(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
-		}
-	}
-	
+    @ResponseBody
+    public ResponseEntity<String> getExperimentCodesByDateValueComparison(@RequestBody String json) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Type", "application/json");
+        DateValueComparisonRequest requestDTO = DateValueComparisonRequest.fromJsonToDateValueComparisonRequest(json);
+        try {
+            Collection<String> results = protocolService.getProtocolCodesByDateValueComparison(requestDTO);
+            return new ResponseEntity<String>(new JSONSerializer().exclude("*.class").serialize(results), headers,
+                    HttpStatus.OK);
+        } catch (Exception e) {
+            logger.error("Caught error in getProtocolCodesByDateValueComparison", e);
+            return new ResponseEntity<String>(e.toString(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+    }
+
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiPurityMeasuredByController.java b/src/main/java/com/labsynch/labseer/api/ApiPurityMeasuredByController.java
index 63bc4699d..8c9d0cd31 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiPurityMeasuredByController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiPurityMeasuredByController.java
@@ -1,4 +1,5 @@
 package com.labsynch.labseer.api;
+
 import com.labsynch.labseer.domain.PurityMeasuredBy;
 import com.labsynch.labseer.utils.PropertiesUtilService;
 
@@ -13,18 +14,15 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-
-@RequestMapping(value = {"/api/v1/purityMeasuredBys"})
+@RequestMapping(value = { "/api/v1/purityMeasuredBys" })
 @Controller
 
 public class ApiPurityMeasuredByController {
 
+    @Autowired
+    private PropertiesUtilService propertiesUtilService;
 
-	@Autowired
-	private PropertiesUtilService propertiesUtilService;
-
-	
-	@RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
         PurityMeasuredBy puritymeasuredby = PurityMeasuredBy.findPurityMeasuredBy(id);
@@ -32,9 +30,9 @@ public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
         headers.add("Content-Type", "application/text; charset=utf-8");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
         headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
-		headers.setExpires(0); // Expire the cache
+        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+        headers.add("Pragma", "no-cache"); // HTTP 1.0
+        headers.setExpires(0); // Expire the cache
 
         if (puritymeasuredby == null) {
             return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
@@ -42,49 +40,52 @@ public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
         return new ResponseEntity<String>(puritymeasuredby.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(headers = "Accept=application/json")
+    @RequestMapping(headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listJson() {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/text; charset=utf-8");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
         headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
-		headers.setExpires(0); // Expire the cache
-
-		if (propertiesUtilService.getOrderSelectLists()){
-	        return new ResponseEntity<String>(PurityMeasuredBy.toJsonArray(PurityMeasuredBy.findAllPurityMeasuredBys("name", "ASC")), headers, HttpStatus.OK);
-		} else {
-	        return new ResponseEntity<String>(PurityMeasuredBy.toJsonArray(PurityMeasuredBy.findAllPurityMeasuredBys()), headers, HttpStatus.OK);
-		}
+        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+        headers.add("Pragma", "no-cache"); // HTTP 1.0
+        headers.setExpires(0); // Expire the cache
+
+        if (propertiesUtilService.getOrderSelectLists()) {
+            return new ResponseEntity<String>(
+                    PurityMeasuredBy.toJsonArray(PurityMeasuredBy.findAllPurityMeasuredBys("name", "ASC")), headers,
+                    HttpStatus.OK);
+        } else {
+            return new ResponseEntity<String>(PurityMeasuredBy.toJsonArray(PurityMeasuredBy.findAllPurityMeasuredBys()),
+                    headers, HttpStatus.OK);
+        }
     }
 
-	@RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createFromJson(@RequestBody String json) {
         PurityMeasuredBy.fromJsonToPurityMeasuredBy(json).persist();
-        HttpHeaders headers= new HttpHeaders();
+        HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/text");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
         headers.add("Access-Control-Allow-Origin", "*");
         return new ResponseEntity<String>(headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createFromJsonArray(@RequestBody String json) {
-        for (PurityMeasuredBy purityMeasuredBy: PurityMeasuredBy.fromJsonArrayToPurityMeasuredBys(json)) {
+        for (PurityMeasuredBy purityMeasuredBy : PurityMeasuredBy.fromJsonArrayToPurityMeasuredBys(json)) {
             purityMeasuredBy.persist();
         }
-        HttpHeaders headers= new HttpHeaders();
+        HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/text");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
         headers.add("Access-Control-Allow-Origin", "*");
         return new ResponseEntity<String>(headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateFromJson(@RequestBody String json) {
-        HttpHeaders headers= new HttpHeaders();
+        HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/text");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
         headers.add("Access-Control-Allow-Origin", "*");
@@ -92,16 +93,15 @@ public ResponseEntity<String> updateFromJson(@RequestBody String json) {
             return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
         }
         return new ResponseEntity<String>(headers, HttpStatus.OK);
-	}
-
+    }
 
-	@RequestMapping(value = "/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateFromJsonArray(@RequestBody String json) {
-        HttpHeaders headers= new HttpHeaders();
+        HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/text");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
         headers.add("Access-Control-Allow-Origin", "*");
-        for (PurityMeasuredBy purityMeasuredBy: PurityMeasuredBy.fromJsonArrayToPurityMeasuredBys(json)) {
+        for (PurityMeasuredBy purityMeasuredBy : PurityMeasuredBy.fromJsonArrayToPurityMeasuredBys(json)) {
             if (purityMeasuredBy.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -109,18 +109,18 @@ public ResponseEntity<String> updateFromJsonArray(@RequestBody String json) {
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
         PurityMeasuredBy puritymeasuredby = PurityMeasuredBy.findPurityMeasuredBy(id);
-        HttpHeaders headers= new HttpHeaders();
+        HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/text");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
-        headers.add("Access-Control-Allow-Origin", "*");       
+        headers.add("Access-Control-Allow-Origin", "*");
         if (puritymeasuredby == null) {
             return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
         }
         puritymeasuredby.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-	
+
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiRegSearchController.java b/src/main/java/com/labsynch/labseer/api/ApiRegSearchController.java
index 5a99015c3..5268f6fba 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiRegSearchController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiRegSearchController.java
@@ -19,25 +19,25 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-@RequestMapping(value ={"/api/v1/regsearches", "/api/v1/regSearches"})
+@RequestMapping(value = { "/api/v1/regsearches", "/api/v1/regSearches" })
 @Controller
 public class ApiRegSearchController {
-	
+
 	@Autowired
 	private RegSearchService regSearchService;
-	
+
 	Logger logger = LoggerFactory.getLogger(ApiRegSearchController.class);
 
 	@RequestMapping(value = "/parent", method = RequestMethod.POST, headers = "Accept=application/json")
 	public ResponseEntity<String> getParentsbyParamsPost(@RequestBody String searchParams) {
-		logger.debug("using the /regsearches/parent controller" );
-		
-		HttpHeaders headers= new HttpHeaders();
+		logger.debug("using the /regsearches/parent controller");
+
+		HttpHeaders headers = new HttpHeaders();
 		headers.setContentType(MediaType.TEXT_HTML);
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+
 		RegSearchDTO regSearchDTO = null;
 		try {
 			regSearchDTO = regSearchService.getParentsbyParams(searchParams);
@@ -50,17 +50,17 @@ public ResponseEntity<String> getParentsbyParamsPost(@RequestBody String searchP
 
 		return new ResponseEntity<String>(regSearchDTO.toJson(), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/parent", method = RequestMethod.GET, headers = "Accept=application/json")
 	public ResponseEntity<String> getParentsbyParams(@RequestParam String searchParams) {
-		logger.debug("using the /regsearches/parent controller" );
-		
-		HttpHeaders headers= new HttpHeaders();
+		logger.debug("using the /regsearches/parent controller");
+
+		HttpHeaders headers = new HttpHeaders();
 		headers.setContentType(MediaType.TEXT_HTML);
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+
 		RegSearchDTO regSearchDTO = null;
 		try {
 			regSearchDTO = regSearchService.getParentsbyParams(searchParams);
diff --git a/src/main/java/com/labsynch/labseer/api/ApiSaltController.java b/src/main/java/com/labsynch/labseer/api/ApiSaltController.java
index 15ebd0a03..d64f61a7c 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiSaltController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSaltController.java
@@ -27,11 +27,11 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-@RequestMapping(value = {"/api/v1/salts"})
+@RequestMapping(value = { "/api/v1/salts" })
 @Transactional
 @Controller
 public class ApiSaltController {
-	
+
 	Logger logger = LoggerFactory.getLogger(ApiSaltController.class);
 
 	@Autowired
@@ -42,26 +42,26 @@ public class ApiSaltController {
 
 	@Autowired
 	private ChemStructureService chemStructureService;
-		
+
 	@RequestMapping(value = "/load", method = RequestMethod.POST, headers = "Accept=application/json")
 	public ResponseEntity<String> loadSalts(
-			@RequestParam (value = "saltSD_fileName", required = true) String saltSD_fileName
-			) {
-		
+			@RequestParam(value = "saltSD_fileName", required = true) String saltSD_fileName) {
+
 		logger.debug("hit the controller to register the salts: " + saltSD_fileName);
-		
-        HttpHeaders headers= new HttpHeaders();
-        headers.add("Content-Type", "application/text");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Access-Control-Allow-Headers", "Content-Type");
-		
-        int saltsSaved = saltService.loadSalts(saltSD_fileName);
+
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/text");
+		headers.add("Access-Control-Allow-Origin", "*");
+		headers.add("Access-Control-Allow-Headers", "Content-Type");
+
+		int saltsSaved = saltService.loadSalts(saltSD_fileName);
 		logger.debug("number of salts saved: " + saltsSaved);
-		
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
 
-//        example curl to call the method
-//        curl -i -X POST -H "Accept: application/json" 'http://localhost:8080/cmpdreg/api/v1/salts/load?saltSD_fileName=/tmp/Initial_Salts.sdf'
+		return new ResponseEntity<String>(headers, HttpStatus.OK);
+
+		// example curl to call the method
+		// curl -i -X POST -H "Accept: application/json"
+		// 'http://localhost:8080/cmpdreg/api/v1/salts/load?saltSD_fileName=/tmp/Initial_Salts.sdf'
 
 	}
 
@@ -73,8 +73,8 @@ public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
 		headers.add("Content-Type", "application/text; charset=utf-8");
 		headers.add("Access-Control-Allow-Origin", "*");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 		if (salt == null) {
 			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
@@ -89,8 +89,8 @@ public ResponseEntity<String> listJson() {
 		headers.add("Content-Type", "application/text; charset=utf-8");
 		headers.add("Access-Control-Allow-Origin", "*");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 		return new ResponseEntity<String>(Salt.toJsonArray(Salt.findAllSalts()), headers, HttpStatus.OK);
 	}
@@ -125,7 +125,7 @@ public ResponseEntity<String> createFromJson(@RequestBody String json) throws Cm
 			errors.add(error);
 		}
 		if (validSalt) {
-			try{
+			try {
 				salt = saltStructureService.saveStructure(salt);
 			} catch (CmpdRegMolFormatException e) {
 				logger.error("Error saving salt: " + e.getMessage());
@@ -157,12 +157,12 @@ public ResponseEntity<String> createFromJson(@RequestBody String json) throws Cm
 
 	// @RequestMapping(method = RequestMethod.OPTIONS)
 	// public ResponseEntity<String> getSaltOptions() {
-	// 	HttpHeaders headers = new HttpHeaders();
-	// 	headers.add("Content-Type", "application/text, text/html");
-	// 	headers.add("Access-Control-Allow-Headers", "Content-Type");
-	// 	headers.add("Access-Control-Allow-Origin", "*");
-	// 	headers.add("Access-Control-Max-Age", "86400");
-	// 	return new ResponseEntity<String>(headers, HttpStatus.OK);
+	// HttpHeaders headers = new HttpHeaders();
+	// headers.add("Content-Type", "application/text, text/html");
+	// headers.add("Access-Control-Allow-Headers", "Content-Type");
+	// headers.add("Access-Control-Allow-Origin", "*");
+	// headers.add("Access-Control-Max-Age", "86400");
+	// return new ResponseEntity<String>(headers, HttpStatus.OK);
 	// }
 
 	@RequestMapping(method = RequestMethod.PUT, headers = "Accept=application/json")
@@ -177,8 +177,9 @@ public ResponseEntity<String> updateFromJson(@RequestBody String json) {
 			} else {
 				return new ResponseEntity<String>(updatedSalt.toJson(), headers, HttpStatus.OK);
 			}
-		}catch (CmpdRegMolFormatException e) {
-			return new ResponseEntity<String>("ERROR: Bad molfile:"+e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
+		} catch (CmpdRegMolFormatException e) {
+			return new ResponseEntity<String>("ERROR: Bad molfile:" + e.getMessage(), headers,
+					HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -188,14 +189,15 @@ public ResponseEntity<String> saveMissingStructures() {
 		headers.add("Content-Type", "application/text; charset=utf-8");
 		headers.add("Access-Control-Allow-Origin", "*");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 		try {
 			Collection<Salt> missingSaltStructures = saltStructureService.saveMissingStructures();
 			return new ResponseEntity<String>(Salt.toJsonArray(missingSaltStructures), headers, HttpStatus.OK);
-		}catch (StructureSaveException e) {
-			return new ResponseEntity<String>("ERROR: Saving missing structures:"+e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
+		} catch (StructureSaveException e) {
+			return new ResponseEntity<String>("ERROR: Saving missing structures:" + e.getMessage(), headers,
+					HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 
 	}
diff --git a/src/main/java/com/labsynch/labseer/api/ApiSearchFormController.java b/src/main/java/com/labsynch/labseer/api/ApiSearchFormController.java
index 17a0175be..557569a15 100755
--- a/src/main/java/com/labsynch/labseer/api/ApiSearchFormController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSearchFormController.java
@@ -22,96 +22,100 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-@RequestMapping(value = {"/api/v1/searchforms", "/api/v1/search"})
+@RequestMapping(value = { "/api/v1/searchforms", "/api/v1/search" })
 @Controller
 public class ApiSearchFormController {
-	
+
 	Logger logger = LoggerFactory.getLogger(ApiSearchFormController.class);
 
-	
-	
 	@Autowired
 	private SearchFormService searchFormService;
 
 	@RequestMapping(value = "/cmpds", method = RequestMethod.GET, headers = "Accept=application/json")
 	public ResponseEntity<String> searchCmpdsByParams(@RequestParam String searchParams) {
-		HttpHeaders headers= new HttpHeaders();
+		HttpHeaders headers = new HttpHeaders();
 		headers.setContentType(MediaType.TEXT_HTML);
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
-		
+
 		SearchFormDTO searchParamsJson = SearchFormDTO.fromJsonToSearchFormDTO(searchParams);
 		System.out.println("incoming search params: " + searchParamsJson.toJson());
 
-		try{
+		try {
 			SearchFormReturnDTO foundCompounds = searchFormService.findQuerySaltForms(searchParamsJson);
-			if (foundCompounds.getFoundCompounds().size() > 1000){
+			if (foundCompounds.getFoundCompounds().size() > 1000) {
 				ErrorMessage searchError = new ErrorMessage();
 				searchError.setLevel("error");
-				searchError.setMessage("Too many search results returned. Found " + foundCompounds.getFoundCompounds().size() + " compounds. The search limit is 1000.");
+				searchError.setMessage("Too many search results returned. Found "
+						+ foundCompounds.getFoundCompounds().size() + " compounds. The search limit is 1000.");
 				List<ErrorMessage> errors = new ArrayList<ErrorMessage>();
 				errors.add(searchError);
-				return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.OK);						
+				return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.OK);
 			} else {
-//				logger.debug("here is the search return: " + SearchCompoundReturnDTO.toJsonArray(foundCompounds));
-				return new ResponseEntity<String>(foundCompounds.toJson(), headers, HttpStatus.OK);			
+				// logger.debug("here is the search return: " +
+				// SearchCompoundReturnDTO.toJsonArray(foundCompounds));
+				return new ResponseEntity<String>(foundCompounds.toJson(), headers, HttpStatus.OK);
 			}
-		}catch (Exception e){
-			logger.error("Uncaught error in searchCmpdsByParams",e);
+		} catch (Exception e) {
+			logger.error("Uncaught error in searchCmpdsByParams", e);
 			ErrorMessage searchError = new ErrorMessage();
 			searchError.setLevel("error");
 			searchError.setMessage("An internal error has occurred. Please contact your system administrator.");
 			List<ErrorMessage> errors = new ArrayList<ErrorMessage>();
 			errors.add(searchError);
-			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.INTERNAL_SERVER_ERROR); 
+			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers,
+					HttpStatus.INTERNAL_SERVER_ERROR);
 		}
-		
+
 	}
 
 	@RequestMapping(value = "/cmpds", method = RequestMethod.POST, headers = "Accept=application/json")
 	public ResponseEntity<String> searchCmpdsByParamsPost(@RequestBody String searchParams) {
-		HttpHeaders headers= new HttpHeaders();
+		HttpHeaders headers = new HttpHeaders();
 		headers.setContentType(MediaType.TEXT_HTML);
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
-		
+
 		SearchFormDTO searchParamsJson = SearchFormDTO.fromJsonToSearchFormDTO(searchParams);
 		System.out.println("incoming search params: " + searchParamsJson.toJson());
-		
-		try{
+
+		try {
 			SearchFormReturnDTO foundCompounds = searchFormService.findQuerySaltForms(searchParamsJson);
-			if (foundCompounds.getFoundCompounds().size() > 1000){
+			if (foundCompounds.getFoundCompounds().size() > 1000) {
 				ErrorMessage searchError = new ErrorMessage();
 				searchError.setLevel("error");
-				searchError.setMessage("Too many search results returned. Found " + foundCompounds.getFoundCompounds().size() + " compounds. The search limit is 1000.");
+				searchError.setMessage("Too many search results returned. Found "
+						+ foundCompounds.getFoundCompounds().size() + " compounds. The search limit is 1000.");
 				List<ErrorMessage> errors = new ArrayList<ErrorMessage>();
 				errors.add(searchError);
-				return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.OK);						
+				return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.OK);
 			} else {
-//				logger.debug("here is the search return: " + SearchCompoundReturnDTO.toJsonArray(foundCompounds));
-				return new ResponseEntity<String>(foundCompounds.toJson(), headers, HttpStatus.OK);			
+				// logger.debug("here is the search return: " +
+				// SearchCompoundReturnDTO.toJsonArray(foundCompounds));
+				return new ResponseEntity<String>(foundCompounds.toJson(), headers, HttpStatus.OK);
 			}
-		} catch (CmpdRegMolFormatException e){
+		} catch (CmpdRegMolFormatException e) {
 			ErrorMessage searchError = new ErrorMessage();
 			searchError.setLevel("error");
 			searchError.setMessage(e.getMessage());
 			List<ErrorMessage> errors = new ArrayList<ErrorMessage>();
 			errors.add(searchError);
-			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.BAD_REQUEST); 
-		} catch (Exception e){
-			logger.error("Uncaught error in searchCmpdsByParams",e);
+			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.BAD_REQUEST);
+		} catch (Exception e) {
+			logger.error("Uncaught error in searchCmpdsByParams", e);
 			ErrorMessage searchError = new ErrorMessage();
 			searchError.setLevel("error");
 			searchError.setMessage("An internal error has occurred. Please contact your system administrator.");
 			List<ErrorMessage> errors = new ArrayList<ErrorMessage>();
 			errors.add(searchError);
-			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.INTERNAL_SERVER_ERROR); 
-		}	
+			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers,
+					HttpStatus.INTERNAL_SERVER_ERROR);
+		}
 	}
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiSetupController.java b/src/main/java/com/labsynch/labseer/api/ApiSetupController.java
index 49fb41e2b..252dee804 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiSetupController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSetupController.java
@@ -1,6 +1,5 @@
 package com.labsynch.labseer.api;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -52,258 +51,258 @@
 @RequestMapping("api/v1/setup")
 @Transactional
 public class ApiSetupController {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(ApiSetupController.class);
-	
+
 	@Autowired
 	private DataDictionaryService dataDictionaryService;
-	
+
 	@Autowired
 	private LabelSequenceService labelSequenceService;
-	
+
 	@Transactional
-    @RequestMapping(value = "/protocoltypes", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> getOrCreateProtocolTypes(@RequestBody List<TypeDTO> types) {
+	@RequestMapping(value = "/protocoltypes", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> getOrCreateProtocolTypes(@RequestBody List<TypeDTO> types) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<ProtocolType> results = TypeDTO.getOrCreateProtocolTypes(types);
 		return new ResponseEntity<String>(ProtocolType.toJsonArray(results), headers, HttpStatus.CREATED);
 	}
-	
+
 	@Transactional
-    @RequestMapping(value = "/protocolkinds", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> getOrCreateProtocolKinds(@RequestBody List<TypeKindDTO> typeKinds) {
+	@RequestMapping(value = "/protocolkinds", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> getOrCreateProtocolKinds(@RequestBody List<TypeKindDTO> typeKinds) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<ProtocolKind> results = TypeKindDTO.getOrCreateProtocolKinds(typeKinds);
 		return new ResponseEntity<String>(ProtocolKind.toJsonArray(results), headers, HttpStatus.CREATED);
 	}
-	
+
 	@Transactional
-    @RequestMapping(value = "/experimenttypes", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> getOrCreateExperimentTypes(@RequestBody List<TypeDTO> types) {
+	@RequestMapping(value = "/experimenttypes", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> getOrCreateExperimentTypes(@RequestBody List<TypeDTO> types) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<ExperimentType> results = TypeDTO.getOrCreateExperimentTypes(types);
 		return new ResponseEntity<String>(ExperimentType.toJsonArray(results), headers, HttpStatus.CREATED);
 	}
-	
+
 	@Transactional
-    @RequestMapping(value = "/experimentkinds", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> getOrCreateExperimentKinds(@RequestBody List<TypeKindDTO> typeKinds) {
+	@RequestMapping(value = "/experimentkinds", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> getOrCreateExperimentKinds(@RequestBody List<TypeKindDTO> typeKinds) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<ExperimentKind> results = TypeKindDTO.getOrCreateExperimentKinds(typeKinds);
 		return new ResponseEntity<String>(ExperimentKind.toJsonArray(results), headers, HttpStatus.CREATED);
 	}
-	
+
 	@Transactional
-    @RequestMapping(value = "/interactiontypes", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> getOrCreateInteractionTypes(@RequestBody List<InteractionType> types) {
+	@RequestMapping(value = "/interactiontypes", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> getOrCreateInteractionTypes(@RequestBody List<InteractionType> types) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<InteractionType> results = TypeDTO.getOrCreateInteractionTypes(types);
 		return new ResponseEntity<String>(InteractionType.toJsonArray(results), headers, HttpStatus.CREATED);
 	}
-	
+
 	@Transactional
-    @RequestMapping(value = "/interactionkinds", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> getOrCreateInteractionKinds(@RequestBody List<TypeKindDTO> typeKinds) {
+	@RequestMapping(value = "/interactionkinds", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> getOrCreateInteractionKinds(@RequestBody List<TypeKindDTO> typeKinds) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<InteractionKind> results = TypeKindDTO.getOrCreateInteractionKinds(typeKinds);
 		return new ResponseEntity<String>(InteractionKind.toJsonArray(results), headers, HttpStatus.CREATED);
 	}
-	
+
 	@Transactional
-    @RequestMapping(value = "/containertypes", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> getOrCreateContainerTypes(@RequestBody List<TypeDTO> types) {
+	@RequestMapping(value = "/containertypes", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> getOrCreateContainerTypes(@RequestBody List<TypeDTO> types) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<ContainerType> results = TypeDTO.getOrCreateContainerTypes(types);
 		return new ResponseEntity<String>(ContainerType.toJsonArray(results), headers, HttpStatus.CREATED);
 	}
-	
+
 	@Transactional
-    @RequestMapping(value = "/containerkinds", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> getOrCreateContainerKinds(@RequestBody List<TypeKindDTO> typeKinds) {
+	@RequestMapping(value = "/containerkinds", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> getOrCreateContainerKinds(@RequestBody List<TypeKindDTO> typeKinds) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<ContainerKind> results = TypeKindDTO.getOrCreateContainerKinds(typeKinds);
 		return new ResponseEntity<String>(ContainerKind.toJsonArray(results), headers, HttpStatus.CREATED);
 	}
-	
+
 	@Transactional
-    @RequestMapping(value = "/statetypes", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> getOrCreateStateTypes(@RequestBody List<TypeDTO> types) {
+	@RequestMapping(value = "/statetypes", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> getOrCreateStateTypes(@RequestBody List<TypeDTO> types) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<StateType> results = TypeDTO.getOrCreateStateTypes(types);
 		return new ResponseEntity<String>(StateType.toJsonArray(results), headers, HttpStatus.CREATED);
 	}
-	
+
 	@Transactional
-    @RequestMapping(value = "/statekinds", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> getOrCreateStateKinds(@RequestBody List<TypeKindDTO> typeKinds) {
+	@RequestMapping(value = "/statekinds", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> getOrCreateStateKinds(@RequestBody List<TypeKindDTO> typeKinds) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<StateKind> results = TypeKindDTO.getOrCreateStateKinds(typeKinds);
 		return new ResponseEntity<String>(StateKind.toJsonArray(results), headers, HttpStatus.CREATED);
 	}
-	
+
 	@Transactional
-    @RequestMapping(value = "/valuetypes", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> getOrCreateValueTypes(@RequestBody List<TypeDTO> types) {
+	@RequestMapping(value = "/valuetypes", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> getOrCreateValueTypes(@RequestBody List<TypeDTO> types) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<ValueType> results = TypeDTO.getOrCreateValueTypes(types);
 		return new ResponseEntity<String>(ValueType.toJsonArray(results), headers, HttpStatus.CREATED);
 	}
-	
+
 	@Transactional
-    @RequestMapping(value = "/valuekinds", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> getOrCreateValueKinds(@RequestBody List<TypeKindDTO> typeKinds) {
+	@RequestMapping(value = "/valuekinds", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> getOrCreateValueKinds(@RequestBody List<TypeKindDTO> typeKinds) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<ValueKind> results = TypeKindDTO.getOrCreateValueKinds(typeKinds);
 		return new ResponseEntity<String>(ValueKind.toJsonArray(results), headers, HttpStatus.CREATED);
 	}
-	
+
 	@Transactional
-    @RequestMapping(value = "/labeltypes", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> getOrCreateLabelTypes(@RequestBody List<TypeDTO> types) {
+	@RequestMapping(value = "/labeltypes", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> getOrCreateLabelTypes(@RequestBody List<TypeDTO> types) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<LabelType> results = TypeDTO.getOrCreateLabelTypes(types);
 		return new ResponseEntity<String>(LabelType.toJsonArray(results), headers, HttpStatus.CREATED);
 	}
-	
+
 	@Transactional
-    @RequestMapping(value = "/labelkinds", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> getOrCreateLabelKinds(@RequestBody List<TypeKindDTO> typeKinds) {
+	@RequestMapping(value = "/labelkinds", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> getOrCreateLabelKinds(@RequestBody List<TypeKindDTO> typeKinds) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<LabelKind> results = TypeKindDTO.getOrCreateLabelKinds(typeKinds);
 		return new ResponseEntity<String>(LabelKind.toJsonArray(results), headers, HttpStatus.CREATED);
 	}
-	
+
 	@Transactional
-    @RequestMapping(value = "/thingtypes", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> getOrCreateThingTypes(@RequestBody List<TypeDTO> types) {
+	@RequestMapping(value = "/thingtypes", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> getOrCreateThingTypes(@RequestBody List<TypeDTO> types) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<ThingType> results = TypeDTO.getOrCreateThingTypes(types);
 		return new ResponseEntity<String>(ThingType.toJsonArray(results), headers, HttpStatus.CREATED);
 	}
-	
+
 	@Transactional
-    @RequestMapping(value = "/thingkinds", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> getOrCreateThingKinds(@RequestBody List<TypeKindDTO> typeKinds) {
+	@RequestMapping(value = "/thingkinds", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> getOrCreateThingKinds(@RequestBody List<TypeKindDTO> typeKinds) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<ThingKind> results = TypeKindDTO.getOrCreateThingKinds(typeKinds);
 		return new ResponseEntity<String>(ThingKind.toJsonArray(results), headers, HttpStatus.CREATED);
 	}
-	
+
 	@Transactional
-    @RequestMapping(value = "/operatortypes", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> getOrCreateOperatorTypes(@RequestBody List<TypeDTO> types) {
+	@RequestMapping(value = "/operatortypes", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> getOrCreateOperatorTypes(@RequestBody List<TypeDTO> types) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<OperatorType> results = TypeDTO.getOrCreateOperatorTypes(types);
 		return new ResponseEntity<String>(OperatorType.toJsonArray(results), headers, HttpStatus.CREATED);
 	}
-	
+
 	@Transactional
-    @RequestMapping(value = "/operatorkinds", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> getOrCreateOperatorKinds(@RequestBody List<TypeKindDTO> typeKinds) {
+	@RequestMapping(value = "/operatorkinds", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> getOrCreateOperatorKinds(@RequestBody List<TypeKindDTO> typeKinds) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<OperatorKind> results = TypeKindDTO.getOrCreateOperatorKinds(typeKinds);
 		return new ResponseEntity<String>(OperatorKind.toJsonArray(results), headers, HttpStatus.CREATED);
 	}
-	
+
 	@Transactional
-    @RequestMapping(value = "/unittypes", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> getOrCreateUnitTypes(@RequestBody List<TypeDTO> types) {
+	@RequestMapping(value = "/unittypes", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> getOrCreateUnitTypes(@RequestBody List<TypeDTO> types) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<UnitType> results = TypeDTO.getOrCreateUnitTypes(types);
 		return new ResponseEntity<String>(UnitType.toJsonArray(results), headers, HttpStatus.CREATED);
 	}
-	
+
 	@Transactional
-    @RequestMapping(value = "/unitkinds", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> getOrCreateUnitKinds(@RequestBody List<TypeKindDTO> typeKinds) {
+	@RequestMapping(value = "/unitkinds", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> getOrCreateUnitKinds(@RequestBody List<TypeKindDTO> typeKinds) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<UnitKind> results = TypeKindDTO.getOrCreateUnitKinds(typeKinds);
 		return new ResponseEntity<String>(UnitKind.toJsonArray(results), headers, HttpStatus.CREATED);
 	}
-	
+
 	@Transactional
-    @RequestMapping(value = "/ddicttypes", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> getOrCreateDDictTypes(@RequestBody List<TypeDTO> types) {
+	@RequestMapping(value = "/ddicttypes", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> getOrCreateDDictTypes(@RequestBody List<TypeDTO> types) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<DDictType> results = TypeDTO.getOrCreateDDictTypes(types);
 		return new ResponseEntity<String>(DDictType.toJsonArray(results), headers, HttpStatus.CREATED);
 	}
-	
+
 	@Transactional
-    @RequestMapping(value = "/ddictkinds", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> getOrCreateDDictKinds(@RequestBody List<TypeKindDTO> typeKinds) {
+	@RequestMapping(value = "/ddictkinds", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> getOrCreateDDictKinds(@RequestBody List<TypeKindDTO> typeKinds) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<DDictKind> results = TypeKindDTO.getOrCreateDDictKinds(typeKinds);
 		return new ResponseEntity<String>(DDictKind.toJsonArray(results), headers, HttpStatus.CREATED);
 	}
-	
+
 	@Transactional
-    @RequestMapping(value = "/roletypes", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> getOrCreateRoleTypes(@RequestBody List<TypeDTO> types) {
+	@RequestMapping(value = "/roletypes", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> getOrCreateRoleTypes(@RequestBody List<TypeDTO> types) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<RoleType> results = TypeDTO.getOrCreateRoleTypes(types);
 		return new ResponseEntity<String>(RoleType.toJsonArray(results), headers, HttpStatus.CREATED);
 	}
-	
+
 	@Transactional
-    @RequestMapping(value = "/rolekinds", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> getOrCreateRoleKinds(@RequestBody List<TypeKindDTO> typeKinds) {
+	@RequestMapping(value = "/rolekinds", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> getOrCreateRoleKinds(@RequestBody List<TypeKindDTO> typeKinds) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<RoleKind> results = TypeKindDTO.getOrCreateRoleKinds(typeKinds);
 		return new ResponseEntity<String>(RoleKind.toJsonArray(results), headers, HttpStatus.CREATED);
 	}
-	
+
 	@Transactional
 	@RequestMapping(value = "/codetables", method = RequestMethod.POST, headers = "Accept=application/json")
 	public ResponseEntity<String> getOrCreateCodeTables(@RequestBody List<CodeTableDTO> codeTableDTOs) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Boolean createTypeKind = true;
-		List<CodeTableDTO> savedCodeTableValues = dataDictionaryService.getOrCreateCodeTableArray(codeTableDTOs, createTypeKind);
+		List<CodeTableDTO> savedCodeTableValues = dataDictionaryService.getOrCreateCodeTableArray(codeTableDTOs,
+				createTypeKind);
 		return new ResponseEntity<String>(CodeTableDTO.toJsonArray(savedCodeTableValues), headers, HttpStatus.CREATED);
 	}
-	
+
 	@Transactional
 	@RequestMapping(value = "/labelsequences", method = RequestMethod.POST, headers = "Accept=application/json")
 	public ResponseEntity<java.lang.String> getOrCreateLabelSequences(@RequestBody List<LabelSequence> labelSequences) {
 		HttpHeaders headers = new HttpHeaders();
-	    headers.add("Content-Type", "application/json");
-	    Collection<LabelSequence> savedLabelSequences = labelSequenceService.saveLabelSequenceArray(labelSequences);
-	    return new ResponseEntity<String>(LabelSequence.toJsonArray(savedLabelSequences), headers, HttpStatus.CREATED);
+		headers.add("Content-Type", "application/json");
+		Collection<LabelSequence> savedLabelSequences = labelSequenceService.saveLabelSequenceArray(labelSequences);
+		return new ResponseEntity<String>(LabelSequence.toJsonArray(savedLabelSequences), headers, HttpStatus.CREATED);
 	}
-	
+
 	@Transactional
-    @RequestMapping(value = "/lsroles", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> getOrCreateLsRoles(@RequestBody List<LsRole> lsRoles) {
+	@RequestMapping(value = "/lsroles", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> getOrCreateLsRoles(@RequestBody List<LsRole> lsRoles) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		Collection<LsRole> results = LsRole.getOrCreateRoles(lsRoles);
 		return new ResponseEntity<String>(LsRole.toJsonArray(results), headers, HttpStatus.CREATED);
 	}
-	
-	
+
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java b/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java
index 7e6f316f7..fd0bdf292 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSolutionUnitController.java
@@ -1,4 +1,5 @@
 package com.labsynch.labseer.api;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -27,7 +28,7 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-@RequestMapping(value = {"/api/v1/solutionUnits"})
+@RequestMapping(value = { "/api/v1/solutionUnits" })
 @Transactional
 @Controller
 public class ApiSolutionUnitController {
@@ -40,8 +41,8 @@ public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
         headers.add("Content-Type", "application/text; charset=utf-8");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
         headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
+        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+        headers.add("Pragma", "no-cache"); // HTTP 1.0
         headers.setExpires(0); // Expire the cache
         if (solutionunit == null) {
             return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
@@ -56,10 +57,11 @@ public ResponseEntity<String> listJson() {
         headers.add("Content-Type", "application/text; charset=utf-8");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
         headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
+        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+        headers.add("Pragma", "no-cache"); // HTTP 1.0
         headers.setExpires(0); // Expire the cache
-        return new ResponseEntity<String>(SolutionUnit.toJsonArray(SolutionUnit.findAllSolutionUnits()), headers, HttpStatus.OK);
+        return new ResponseEntity<String>(SolutionUnit.toJsonArray(SolutionUnit.findAllSolutionUnits()), headers,
+                HttpStatus.OK);
     }
 
     @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
@@ -69,8 +71,8 @@ public ResponseEntity<String> createFromJson(@RequestBody String json) {
         headers.add("Content-Type", "application/text; charset=utf-8");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
         headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
+        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+        headers.add("Pragma", "no-cache"); // HTTP 1.0
         headers.setExpires(0); // Expire the cache
         return new ResponseEntity<String>(headers, HttpStatus.CREATED);
     }
@@ -84,8 +86,8 @@ public ResponseEntity<String> createFromJsonArray(@RequestBody String json) {
         headers.add("Content-Type", "application/text; charset=utf-8");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
         headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
+        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+        headers.add("Pragma", "no-cache"); // HTTP 1.0
         headers.setExpires(0); // Expire the cache
         return new ResponseEntity<String>(headers, HttpStatus.CREATED);
     }
@@ -96,8 +98,8 @@ public ResponseEntity<String> updateFromJson(@RequestBody String json) {
         headers.add("Content-Type", "application/text; charset=utf-8");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
         headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
+        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+        headers.add("Pragma", "no-cache"); // HTTP 1.0
         headers.setExpires(0); // Expire the cache
         if (SolutionUnit.fromJsonToSolutionUnit(json).merge() == null) {
             return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
@@ -111,8 +113,8 @@ public ResponseEntity<String> updateFromJsonArray(@RequestBody String json) {
         headers.add("Content-Type", "application/text; charset=utf-8");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
         headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
+        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+        headers.add("Pragma", "no-cache"); // HTTP 1.0
         headers.setExpires(0); // Expire the cache
         for (SolutionUnit solutionUnit : SolutionUnit.fromJsonArrayToSolutionUnits(json)) {
             if (solutionUnit.merge() == null) {
@@ -129,8 +131,8 @@ public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
         headers.add("Content-Type", "application/text; charset=utf-8");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
         headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
+        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+        headers.add("Pragma", "no-cache"); // HTTP 1.0
         headers.setExpires(0); // Expire the cache
         if (solutionunit == null) {
             return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
@@ -139,19 +141,18 @@ public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
 
-	public BeanWrapper beanWrapper;
-
+    public BeanWrapper beanWrapper;
 
-	public Map<String, String> populateParametersMap(HttpServletRequest request) {
+    public Map<String, String> populateParametersMap(HttpServletRequest request) {
         Map<String, Object> params;
         if (request == null) {
             params = Collections.emptyMap();
         } else {
             params = new HashMap<String, Object>(request.getParameterMap());
         }
-        
+
         Map<String, String> allParams = new HashMap<String, String>(params.size());
-        
+
         String value;
         Object objValue;
         for (String key : params.keySet()) {
@@ -166,22 +167,23 @@ public Map<String, String> populateParametersMap(HttpServletRequest request) {
         return allParams;
     }
 
-	public Map<String, Object> getPropertyMap(SolutionUnit SolutionUnit, Enumeration<Map<String, String>> propertyNames) {
+    public Map<String, Object> getPropertyMap(SolutionUnit SolutionUnit,
+            Enumeration<Map<String, String>> propertyNames) {
         Map<String, Object> propertyValuesMap = new HashMap<String, Object>();
-        
+
         // If no entity or properties given, return empty Map
-        if(SolutionUnit == null || propertyNames == null) {
+        if (SolutionUnit == null || propertyNames == null) {
             return propertyValuesMap;
         }
-        
+
         List<String> properties = new ArrayList<String>();
         CollectionUtils.addAll(properties, propertyNames);
-        
+
         // There must be at least one property name, otherwise return empty Map
         if (properties.isEmpty()) {
             return propertyValuesMap;
         }
-        
+
         // Iterate over given properties to get each property value
         BeanWrapper entityBean = new BeanWrapperImpl(SolutionUnit);
         for (String propertyName : properties) {
@@ -189,7 +191,7 @@ public Map<String, Object> getPropertyMap(SolutionUnit SolutionUnit, Enumeration
                 Object propertyValue = null;
                 try {
                     propertyValue = entityBean.getPropertyValue(propertyName);
-                } catch (Exception e){
+                } catch (Exception e) {
                     // TODO log warning
                     continue;
                 }
@@ -199,32 +201,33 @@ public Map<String, Object> getPropertyMap(SolutionUnit SolutionUnit, Enumeration
         return propertyValuesMap;
     }
 
-	public List<SolutionUnit> findSolutionUnitsByParameters(SolutionUnit SolutionUnit, Enumeration<Map<String, String>> propertyNames) {
+    public List<SolutionUnit> findSolutionUnitsByParameters(SolutionUnit SolutionUnit,
+            Enumeration<Map<String, String>> propertyNames) {
         // Gets propertyMap
         Map<String, Object> propertyMap = getPropertyMap(SolutionUnit, propertyNames);
-        
+
         // if there is a filter
         if (!propertyMap.isEmpty()) {
             // Prepare a predicate
             BooleanBuilder baseFilterPredicate = new BooleanBuilder();
-            
+
             // Base filter. Using BooleanBuilder, a cascading builder for
             // Predicate expressions
             PathBuilder<SolutionUnit> entity = new PathBuilder<SolutionUnit>(SolutionUnit.class, "entity");
-            
+
             // Build base filter
             for (String key : propertyMap.keySet()) {
                 baseFilterPredicate.and(entity.get(key).eq(propertyMap.get(key)));
             }
-            
+
             // Create a query with filter
             JPAQuery query = new JPAQuery(SolutionUnit.entityManager());
             query = query.from(entity);
-            
+
             // execute query
             return query.where(baseFilterPredicate).list(entity);
         }
-        
+
         // no filter: return all elements
         return SolutionUnit.findAllSolutionUnits();
     }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiStandardizationServicesController.java b/src/main/java/com/labsynch/labseer/api/ApiStandardizationServicesController.java
index 57693a624..4aabfaef5 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiStandardizationServicesController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiStandardizationServicesController.java
@@ -27,7 +27,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-@RequestMapping(value = {"/api/v1/standardization"})
+@RequestMapping(value = { "/api/v1/standardization" })
 @Controller
 public class ApiStandardizationServicesController {
 
@@ -39,23 +39,24 @@ public class ApiStandardizationServicesController {
 	@Transactional
 	@RequestMapping(value = "/resetDryRunTables", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> reset(){
+	public ResponseEntity<String> reset() {
 		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/json");		
-		// reset standardization compound tables if the correct code is sent (basic guard)
+		headers.add("Content-Type", "application/json");
+		// reset standardization compound tables if the correct code is sent (basic
+		// guard)
 		logger.info("resetting Dry Run tables");
 		standardizationService.reset();
 		return new ResponseEntity<String>("Standardization tables reset", headers, HttpStatus.OK);
 
 	}
 
-
 	@Transactional
 	@RequestMapping(value = "/populateDryRunTables", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> populateDryRunTable() throws CmpdRegMolFormatException, IOException, StandardizerException{
+	public ResponseEntity<String> populateDryRunTable()
+			throws CmpdRegMolFormatException, IOException, StandardizerException {
 		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/json");		
+		headers.add("Content-Type", "application/json");
 		logger.info("checking parent structs and saving to dry run table");
 		int numberOfDisplayChanges = 0;
 		numberOfDisplayChanges = standardizationService.populateStandardizationDryRunTable();
@@ -65,14 +66,15 @@ public ResponseEntity<String> populateDryRunTable() throws CmpdRegMolFormatExcep
 
 	@RequestMapping(value = "/dryRun", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> dryRun(@RequestParam(value="reportOnly", required = false) Boolean reportOnly) throws CmpdRegMolFormatException, IOException, StandardizerException{
+	public ResponseEntity<String> dryRun(@RequestParam(value = "reportOnly", required = false) Boolean reportOnly)
+			throws CmpdRegMolFormatException, IOException, StandardizerException {
 		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/json");		
+		headers.add("Content-Type", "application/json");
 		boolean onlyReport = true;
-		if (reportOnly != null && reportOnly == false){
+		if (reportOnly != null && reportOnly == false) {
 			onlyReport = false;
 		}
-		if(!onlyReport) {
+		if (!onlyReport) {
 			logger.info("reseting dry run table, populating dryrun table, dupe checking, and returning results");
 			standardizationService.executeDryRun();
 		}
@@ -83,78 +85,86 @@ public ResponseEntity<String> dryRun(@RequestParam(value="reportOnly", required
 
 	@RequestMapping(value = "/dryRunSearch", method = RequestMethod.POST, headers = "Accept=application/json")
 	public ResponseEntity<java.lang.String> dryRunSearch(
-			@RequestParam(value="countOnly", required = false) Boolean countOnly,
+			@RequestParam(value = "countOnly", required = false) Boolean countOnly,
 			@RequestBody String json) {
-		StandardizationDryRunSearchDTO searchCriteria = StandardizationDryRunSearchDTO.fromJsonToStandardizationDryRunSearchDTO(json);
+		StandardizationDryRunSearchDTO searchCriteria = StandardizationDryRunSearchDTO
+				.fromJsonToStandardizationDryRunSearchDTO(json);
 		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/json");		
-		if (countOnly != null && countOnly == true){
-			return new ResponseEntity<String>("{\"count\":" + StandardizationDryRunCompound.searchStandardiationDryRunCount(searchCriteria).getSingleResult() + "}", headers, HttpStatus.OK);
+		headers.add("Content-Type", "application/json");
+		if (countOnly != null && countOnly == true) {
+			return new ResponseEntity<String>("{\"count\":"
+					+ StandardizationDryRunCompound.searchStandardiationDryRunCount(searchCriteria).getSingleResult()
+					+ "}", headers, HttpStatus.OK);
 		} else {
-			TypedQuery<StandardizationDryRunCompound> dryRunCompounds = StandardizationDryRunCompound.searchStandardiationDryRun(searchCriteria);
-			return new ResponseEntity<String>(StandardizationDryRunCompound.toJsonArray(dryRunCompounds.getResultList()), headers, HttpStatus.OK);
+			TypedQuery<StandardizationDryRunCompound> dryRunCompounds = StandardizationDryRunCompound
+					.searchStandardiationDryRun(searchCriteria);
+			return new ResponseEntity<String>(
+					StandardizationDryRunCompound.toJsonArray(dryRunCompounds.getResultList()), headers, HttpStatus.OK);
 		}
 	}
 
 	@RequestMapping(value = "/dryRunSearchExport", method = RequestMethod.POST, headers = "Accept=application/json")
 	public ResponseEntity<java.lang.String> dryRunSearchExport(
-			@RequestBody String json)  throws IOException, CmpdRegMolFormatException {
+			@RequestBody String json) throws IOException, CmpdRegMolFormatException {
 		logger.debug("incoming json: " + json);
-		StandardizationDryRunSearchDTO searchCriteria = StandardizationDryRunSearchDTO.fromJsonToStandardizationDryRunSearchDTO(json);
+		StandardizationDryRunSearchDTO searchCriteria = StandardizationDryRunSearchDTO
+				.fromJsonToStandardizationDryRunSearchDTO(json);
 		HttpHeaders headers = new HttpHeaders();
 		String outputFilePath = standardizationService.getStandardizationDryRunReportFiles(searchCriteria);
 		return new ResponseEntity<String>(outputFilePath, headers, HttpStatus.OK);
 	}
 
-
 	@RequestMapping(value = "/dryRunReportFiles", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> dryRunReportFile(@RequestBody String filePath) throws IOException, CmpdRegMolFormatException{	
+	public ResponseEntity<String> dryRunReportFile(@RequestBody String filePath)
+			throws IOException, CmpdRegMolFormatException {
 		HttpHeaders headers = new HttpHeaders();
 		// Get most recent standardization history
 		String outputFilePath = standardizationService.getStandardizationDryRunReportFiles(filePath);
 		return new ResponseEntity<String>(outputFilePath, headers, HttpStatus.OK);
 	}
 
-
 	@Transactional
 	@RequestMapping(value = "/findStandardizationDupeStructs", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> findDryRunDupeStructs(){
+	public ResponseEntity<String> findDryRunDupeStructs() {
 		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/json");		
+		headers.add("Content-Type", "application/json");
 		logger.info("checking parent structs and saving to stanardization dryrun compound table");
 		int numberOfDisplayChanges = 0;
 		try {
 			numberOfDisplayChanges = standardizationService.dupeCheckStandardizationStructures();
 		} catch (CmpdRegMolFormatException e) {
-			return new ResponseEntity<String>("Encountered error in searching: "+e.toString(), headers, HttpStatus.BAD_REQUEST);
+			return new ResponseEntity<String>("Encountered error in searching: " + e.toString(), headers,
+					HttpStatus.BAD_REQUEST);
 		}
 		logger.info("number of compounds with display change: " + numberOfDisplayChanges);
-		return new ResponseEntity<String>("Qc Compound check done. Number of display changes: " + numberOfDisplayChanges, headers, HttpStatus.OK);
+		return new ResponseEntity<String>(
+				"Qc Compound check done. Number of display changes: " + numberOfDisplayChanges, headers, HttpStatus.OK);
 
 	}
 
 	@RequestMapping(value = "/execute", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> execute(@RequestParam(value="username", required = true) String username, @RequestParam(value="reason", required = true) String reason){
+	public ResponseEntity<String> execute(@RequestParam(value = "username", required = true) String username,
+			@RequestParam(value = "reason", required = true) String reason) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 		logger.info("standardizing parent structs");
-		try{
+		try {
 			String summary = standardizationService.executeStandardization(username, reason);
 			return new ResponseEntity<String>(summary, headers, HttpStatus.OK);
-		}catch(Exception e){
-			logger.error("Caught error trying to standardize parent structures: ",e);
+		} catch (Exception e) {
+			logger.error("Caught error trying to standardize parent structures: ", e);
 			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
-
 	@Transactional
 	@RequestMapping(value = "/singleMol", method = RequestMethod.POST, headers = "Accept=text/plain")
 	@ResponseBody
-	public ResponseEntity<String> standardizeSingleMol(@RequestBody String mol) throws CmpdRegMolFormatException, StandardizerException, IOException{
+	public ResponseEntity<String> standardizeSingleMol(@RequestBody String mol)
+			throws CmpdRegMolFormatException, StandardizerException, IOException {
 		logger.debug("incoming json from standardizeMol: " + mol);
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "text/plain");
@@ -165,9 +175,9 @@ public ResponseEntity<String> standardizeSingleMol(@RequestBody String mol) thro
 	@Transactional
 	@RequestMapping(value = "/settings", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> getCurrentStandardizationSettings(){
+	public ResponseEntity<String> getCurrentStandardizationSettings() {
 		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/json");		
+		headers.add("Content-Type", "application/json");
 		StandardizationSettings stndardizationSettings = standardizationService.getStandardizationSettings();
 		return new ResponseEntity<String>(stndardizationSettings.toJson(), headers, HttpStatus.OK);
 	}
@@ -175,19 +185,20 @@ public ResponseEntity<String> getCurrentStandardizationSettings(){
 	@Transactional
 	@RequestMapping(value = "/history", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> getStandardizationHistory(){
+	public ResponseEntity<String> getStandardizationHistory() {
 		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/json");		
+		headers.add("Content-Type", "application/json");
 		List<StandardizationHistory> standardizationHistory = standardizationService.getStandardizationHistory();
-		return new ResponseEntity<String>(StandardizationHistory.toJsonArray(standardizationHistory), headers, HttpStatus.OK);
+		return new ResponseEntity<String>(StandardizationHistory.toJsonArray(standardizationHistory), headers,
+				HttpStatus.OK);
 	}
 
 	@Transactional
 	@RequestMapping(value = "/dryRunStats", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> getDryRunStats() throws StandardizerException{
+	public ResponseEntity<String> getDryRunStats() throws StandardizerException {
 		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/json");		
+		headers.add("Content-Type", "application/json");
 		String dryRunStats = standardizationService.getDryRunStats();
 		return new ResponseEntity<String>(dryRunStats, headers, HttpStatus.OK);
 	}
diff --git a/src/main/java/com/labsynch/labseer/api/ApiStateController.java b/src/main/java/com/labsynch/labseer/api/ApiStateController.java
index 47f9a264f..7d84d1adc 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiStateController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiStateController.java
@@ -53,898 +53,999 @@
 @RequestMapping("api/v1")
 @Transactional
 public class ApiStateController {
-private static final Logger logger = LoggerFactory.getLogger(ApiStateController.class);
-
-@Autowired
-private ProtocolStateService protocolStateService;
-
-@Autowired
-private ExperimentStateService experimentStateService;
-
-@Autowired
-private AnalysisGroupStateService analysisGroupStateService;
-
-@Autowired
-private TreatmentGroupStateService treatmentGroupStateService;
-
-@Autowired
-private SubjectStateService subjectStateService;
-
-@Autowired
-private LsThingStateService lsThingStateService;
-
-@Autowired
-private ContainerStateService containerStateService;
-
-@Autowired
-private ItxContainerContainerStateService itxContainerContainerStateService;
-
-@Autowired
-private ItxExperimentExperimentStateService itxExperimentExperimentStateService;
-
-@Autowired
-private ItxProtocolProtocolStateService itxProtocolProtocolStateService;
-
-@Autowired
-private ItxSubjectContainerStateService itxSubjectContainerStateService;
-
-@RequestMapping(value = "/states/{entity}/{idOrCodeName}/bystate/{stateType}/{stateKind}", method = RequestMethod.GET, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> getStateByPath (
-		@PathVariable("entity") String entity,
-		@PathVariable("idOrCodeName") String idOrCodeName,
-		@PathVariable("stateType") String stateType,
-		@PathVariable("stateKind") String stateKind) {
-
-	HttpHeaders headers = new HttpHeaders();
-	headers.add("Content-Type", "application/json; charset=utf-8");
-	//this if/else if block controls which lsThing is being hit
-	logger.debug("ENTITY IS: " + entity);
-	if (entity.equals("protocol")) {
-		ProtocolState protocolState = protocolStateService.getProtocolState(idOrCodeName, stateType, stateKind);
-		if (protocolState==null) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-		else return new ResponseEntity<String>(protocolState.toJson(), headers, HttpStatus.OK);
-	}
-	if (entity.equals("experiment")) {
-		ExperimentState experimentState = experimentStateService.getExperimentState(idOrCodeName, stateType, stateKind);
-		if (experimentState==null) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-		else return new ResponseEntity<String>(experimentState.toJson(), headers, HttpStatus.OK);
-	}
-	if (entity.equals("analysisGroup")) {
-		AnalysisGroupState analysisGroupState = analysisGroupStateService.getAnalysisGroupState(idOrCodeName, stateType, stateKind);
-		if (analysisGroupState==null) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-		else return new ResponseEntity<String>(analysisGroupState.toJson(), headers, HttpStatus.OK);
-	}
-	if (entity.equals("treatmentGroup")) {
-		TreatmentGroupState treatmentGroupState = treatmentGroupStateService.getTreatmentGroupState(idOrCodeName, stateType, stateKind);
-		if (treatmentGroupState==null) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-		else return new ResponseEntity<String>(treatmentGroupState.toJson(), headers, HttpStatus.OK);
-	}
-	if (entity.equals("subject")) {
-		SubjectState subjectState = subjectStateService.getSubjectState(idOrCodeName, stateType, stateKind);
-		if (subjectState==null) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-		else return new ResponseEntity<String>(subjectState.toJson(), headers, HttpStatus.OK);
-	}
-	if (entity.equals("lsThing")) {
-		LsThingState lsThingState = lsThingStateService.getLsThingState(idOrCodeName, stateType, stateKind);
-		if (lsThingState==null) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-		else return new ResponseEntity<String>(lsThingState.toJson(), headers, HttpStatus.OK);
-	}
-	if (entity.equals("container")) {
-		ContainerState containerState = containerStateService.getContainerState(idOrCodeName, stateType, stateKind);
-		if (containerState==null) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-		else return new ResponseEntity<String>(containerState.toJson(), headers, HttpStatus.OK);
-	}
-	
-	return new ResponseEntity<String>("INVALID ENTITY", headers, HttpStatus.BAD_REQUEST);
-}
-
-@RequestMapping(value = "/states/{entity}/getStatesByIdOrCodeNameAndStateTypeAndKind", method = RequestMethod.POST, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> getStatesByPaths (
-		@PathVariable("entity") String entity,
-		@RequestBody String json) {
-	Collection<GenericStatePathRequest> genericRequests = GenericStatePathRequest.fromJsonArrayToGenericStatePathRequests(json);
-	HttpHeaders headers = new HttpHeaders();
-	headers.add("Content-Type", "application/json; charset=utf-8");
-	//this if/else if block controls which lsThing is being hit
-	logger.debug("ENTITY IS: " + entity);
-	if (entity.equals("protocol")) {
-		Collection<ProtocolStatePathDTO> results = protocolStateService.getProtocolStates(genericRequests);
-		return new ResponseEntity<String>(ProtocolStatePathDTO.toJsonArray(results), headers, HttpStatus.OK);
-	}
-	if (entity.equals("experiment")) {
-		Collection<ExperimentStatePathDTO> results = experimentStateService.getExperimentStates(genericRequests);
-		return new ResponseEntity<String>(ExperimentStatePathDTO.toJsonArray(results), headers, HttpStatus.OK);
-	}
-	if (entity.equals("analysisGroup")) {
-		Collection<AnalysisGroupStatePathDTO> results = analysisGroupStateService.getAnalysisGroupStates(genericRequests);
-		return new ResponseEntity<String>(AnalysisGroupStatePathDTO.toJsonArray(results), headers, HttpStatus.OK);
-	}
-	if (entity.equals("treatmentGroup")) {
-		Collection<TreatmentGroupStatePathDTO> results = treatmentGroupStateService.getTreatmentGroupStates(genericRequests);
-		return new ResponseEntity<String>(TreatmentGroupStatePathDTO.toJsonArray(results), headers, HttpStatus.OK);
-	}
-	if (entity.equals("subject")) {
-		Collection<SubjectStatePathDTO> results = subjectStateService.getSubjectStates(genericRequests);
-		return new ResponseEntity<String>(SubjectStatePathDTO.toJsonArray(results), headers, HttpStatus.OK);
-	}
-	if (entity.equals("lsThing")) {
-		Collection<LsThingStatePathDTO> results = lsThingStateService.getLsThingStates(genericRequests);
-		return new ResponseEntity<String>(LsThingStatePathDTO.toJsonArray(results), headers, HttpStatus.OK);
-	}
-	if (entity.equals("container")) {
-		Collection<ContainerStatePathDTO> results = containerStateService.getContainerStates(genericRequests);
-		return new ResponseEntity<String>(ContainerStatePathDTO.toJsonArray(results), headers, HttpStatus.OK);
-	}
-	
-	return new ResponseEntity<String>("INVALID ENTITY", headers, HttpStatus.BAD_REQUEST);
-}
-
-//ListStatesJsonArray
-
-@RequestMapping(value = "/protocolstates", method = RequestMethod.GET, headers = "Accept=application/json")
-@ResponseBody
-public ResponseEntity<String> listProtocolStatesJsonArray() {
-    HttpHeaders headers = new HttpHeaders();
-    headers.add("Content-Type", "application/json; charset=utf-8");
-    List<ProtocolState> result = ProtocolState.findAllProtocolStates();
-    List<ProtocolState> finalResult = new ArrayList<ProtocolState>();
-    for (ProtocolState protocolState: result) {
-    	if (!protocolState.isIgnored()) finalResult.add(protocolState);
-    }
-    return new ResponseEntity<String>(ProtocolState.toJsonArray(finalResult), headers, HttpStatus.OK);
-}
+	private static final Logger logger = LoggerFactory.getLogger(ApiStateController.class);
+
+	@Autowired
+	private ProtocolStateService protocolStateService;
+
+	@Autowired
+	private ExperimentStateService experimentStateService;
+
+	@Autowired
+	private AnalysisGroupStateService analysisGroupStateService;
+
+	@Autowired
+	private TreatmentGroupStateService treatmentGroupStateService;
+
+	@Autowired
+	private SubjectStateService subjectStateService;
+
+	@Autowired
+	private LsThingStateService lsThingStateService;
+
+	@Autowired
+	private ContainerStateService containerStateService;
+
+	@Autowired
+	private ItxContainerContainerStateService itxContainerContainerStateService;
+
+	@Autowired
+	private ItxExperimentExperimentStateService itxExperimentExperimentStateService;
+
+	@Autowired
+	private ItxProtocolProtocolStateService itxProtocolProtocolStateService;
+
+	@Autowired
+	private ItxSubjectContainerStateService itxSubjectContainerStateService;
+
+	@RequestMapping(value = "/states/{entity}/{idOrCodeName}/bystate/{stateType}/{stateKind}", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> getStateByPath(
+			@PathVariable("entity") String entity,
+			@PathVariable("idOrCodeName") String idOrCodeName,
+			@PathVariable("stateType") String stateType,
+			@PathVariable("stateKind") String stateKind) {
+
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		// this if/else if block controls which lsThing is being hit
+		logger.debug("ENTITY IS: " + entity);
+		if (entity.equals("protocol")) {
+			ProtocolState protocolState = protocolStateService.getProtocolState(idOrCodeName, stateType, stateKind);
+			if (protocolState == null)
+				return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+			else
+				return new ResponseEntity<String>(protocolState.toJson(), headers, HttpStatus.OK);
+		}
+		if (entity.equals("experiment")) {
+			ExperimentState experimentState = experimentStateService.getExperimentState(idOrCodeName, stateType,
+					stateKind);
+			if (experimentState == null)
+				return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+			else
+				return new ResponseEntity<String>(experimentState.toJson(), headers, HttpStatus.OK);
+		}
+		if (entity.equals("analysisGroup")) {
+			AnalysisGroupState analysisGroupState = analysisGroupStateService.getAnalysisGroupState(idOrCodeName,
+					stateType, stateKind);
+			if (analysisGroupState == null)
+				return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+			else
+				return new ResponseEntity<String>(analysisGroupState.toJson(), headers, HttpStatus.OK);
+		}
+		if (entity.equals("treatmentGroup")) {
+			TreatmentGroupState treatmentGroupState = treatmentGroupStateService.getTreatmentGroupState(idOrCodeName,
+					stateType, stateKind);
+			if (treatmentGroupState == null)
+				return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+			else
+				return new ResponseEntity<String>(treatmentGroupState.toJson(), headers, HttpStatus.OK);
+		}
+		if (entity.equals("subject")) {
+			SubjectState subjectState = subjectStateService.getSubjectState(idOrCodeName, stateType, stateKind);
+			if (subjectState == null)
+				return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+			else
+				return new ResponseEntity<String>(subjectState.toJson(), headers, HttpStatus.OK);
+		}
+		if (entity.equals("lsThing")) {
+			LsThingState lsThingState = lsThingStateService.getLsThingState(idOrCodeName, stateType, stateKind);
+			if (lsThingState == null)
+				return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+			else
+				return new ResponseEntity<String>(lsThingState.toJson(), headers, HttpStatus.OK);
+		}
+		if (entity.equals("container")) {
+			ContainerState containerState = containerStateService.getContainerState(idOrCodeName, stateType, stateKind);
+			if (containerState == null)
+				return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+			else
+				return new ResponseEntity<String>(containerState.toJson(), headers, HttpStatus.OK);
+		}
+
+		return new ResponseEntity<String>("INVALID ENTITY", headers, HttpStatus.BAD_REQUEST);
+	}
 
-@RequestMapping(value = "/experimentstates", method = RequestMethod.GET, headers = "Accept=application/json")
-@ResponseBody
-public ResponseEntity<String> listExperimentStatesJsonArray() {
-    HttpHeaders headers = new HttpHeaders();
-    headers.add("Content-Type", "application/json; charset=utf-8");
-    List<ExperimentState> result = ExperimentState.findAllExperimentStates();
-    List<ExperimentState> finalResult = new ArrayList<ExperimentState>();
-    for (ExperimentState experimentState: result) {
-    	if (!experimentState.isIgnored()) finalResult.add(experimentState);
-    }
-    return new ResponseEntity<String>(ExperimentState.toJsonArray(finalResult), headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/states/{entity}/getStatesByIdOrCodeNameAndStateTypeAndKind", method = RequestMethod.POST, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> getStatesByPaths(
+			@PathVariable("entity") String entity,
+			@RequestBody String json) {
+		Collection<GenericStatePathRequest> genericRequests = GenericStatePathRequest
+				.fromJsonArrayToGenericStatePathRequests(json);
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		// this if/else if block controls which lsThing is being hit
+		logger.debug("ENTITY IS: " + entity);
+		if (entity.equals("protocol")) {
+			Collection<ProtocolStatePathDTO> results = protocolStateService.getProtocolStates(genericRequests);
+			return new ResponseEntity<String>(ProtocolStatePathDTO.toJsonArray(results), headers, HttpStatus.OK);
+		}
+		if (entity.equals("experiment")) {
+			Collection<ExperimentStatePathDTO> results = experimentStateService.getExperimentStates(genericRequests);
+			return new ResponseEntity<String>(ExperimentStatePathDTO.toJsonArray(results), headers, HttpStatus.OK);
+		}
+		if (entity.equals("analysisGroup")) {
+			Collection<AnalysisGroupStatePathDTO> results = analysisGroupStateService
+					.getAnalysisGroupStates(genericRequests);
+			return new ResponseEntity<String>(AnalysisGroupStatePathDTO.toJsonArray(results), headers, HttpStatus.OK);
+		}
+		if (entity.equals("treatmentGroup")) {
+			Collection<TreatmentGroupStatePathDTO> results = treatmentGroupStateService
+					.getTreatmentGroupStates(genericRequests);
+			return new ResponseEntity<String>(TreatmentGroupStatePathDTO.toJsonArray(results), headers, HttpStatus.OK);
+		}
+		if (entity.equals("subject")) {
+			Collection<SubjectStatePathDTO> results = subjectStateService.getSubjectStates(genericRequests);
+			return new ResponseEntity<String>(SubjectStatePathDTO.toJsonArray(results), headers, HttpStatus.OK);
+		}
+		if (entity.equals("lsThing")) {
+			Collection<LsThingStatePathDTO> results = lsThingStateService.getLsThingStates(genericRequests);
+			return new ResponseEntity<String>(LsThingStatePathDTO.toJsonArray(results), headers, HttpStatus.OK);
+		}
+		if (entity.equals("container")) {
+			Collection<ContainerStatePathDTO> results = containerStateService.getContainerStates(genericRequests);
+			return new ResponseEntity<String>(ContainerStatePathDTO.toJsonArray(results), headers, HttpStatus.OK);
+		}
+
+		return new ResponseEntity<String>("INVALID ENTITY", headers, HttpStatus.BAD_REQUEST);
+	}
 
-@RequestMapping(value = "/analysisgroupstates", method = RequestMethod.GET, headers = "Accept=application/json")
-@ResponseBody
-public ResponseEntity<String> listAnalysisGroupStatesJsonArray() {
-    HttpHeaders headers = new HttpHeaders();
-    headers.add("Content-Type", "application/json; charset=utf-8");
-    List<AnalysisGroupState> result = AnalysisGroupState.findAllAnalysisGroupStates();
-    List<AnalysisGroupState> finalResult = new ArrayList<AnalysisGroupState>();
-    for (AnalysisGroupState analysisGroupState: result) {
-    	if (!analysisGroupState.isIgnored()) finalResult.add(analysisGroupState);
-    }
-    return new ResponseEntity<String>(AnalysisGroupState.toJsonArray(finalResult), headers, HttpStatus.OK);
-}
+	// ListStatesJsonArray
+
+	@RequestMapping(value = "/protocolstates", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	public ResponseEntity<String> listProtocolStatesJsonArray() {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		List<ProtocolState> result = ProtocolState.findAllProtocolStates();
+		List<ProtocolState> finalResult = new ArrayList<ProtocolState>();
+		for (ProtocolState protocolState : result) {
+			if (!protocolState.isIgnored())
+				finalResult.add(protocolState);
+		}
+		return new ResponseEntity<String>(ProtocolState.toJsonArray(finalResult), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/treatmentgroupstates", method = RequestMethod.GET, headers = "Accept=application/json")
-@ResponseBody
-public ResponseEntity<String> listTreatmentGroupStatesJsonArray() {
-    HttpHeaders headers = new HttpHeaders();
-    headers.add("Content-Type", "application/json; charset=utf-8");
-    List<TreatmentGroupState> result = TreatmentGroupState.findAllTreatmentGroupStates();
-    List<TreatmentGroupState> finalResult = new ArrayList<TreatmentGroupState>();
-    for (TreatmentGroupState treatmentGroupState: result) {
-    	if (!treatmentGroupState.isIgnored()) finalResult.add(treatmentGroupState);
-    }
-    return new ResponseEntity<String>(TreatmentGroupState.toJsonArray(finalResult), headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/experimentstates", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	public ResponseEntity<String> listExperimentStatesJsonArray() {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		List<ExperimentState> result = ExperimentState.findAllExperimentStates();
+		List<ExperimentState> finalResult = new ArrayList<ExperimentState>();
+		for (ExperimentState experimentState : result) {
+			if (!experimentState.isIgnored())
+				finalResult.add(experimentState);
+		}
+		return new ResponseEntity<String>(ExperimentState.toJsonArray(finalResult), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/subjectstates", method = RequestMethod.GET, headers = "Accept=application/json")
-@ResponseBody
-public ResponseEntity<String> listSubjectStatesJsonArray() {
-    HttpHeaders headers = new HttpHeaders();
-    headers.add("Content-Type", "application/json; charset=utf-8");
-    List<SubjectState> result = SubjectState.findAllSubjectStates();
-    List<SubjectState> finalResult = new ArrayList<SubjectState>();
-    for (SubjectState subjectState: result) {
-    	if (!subjectState.isIgnored()) finalResult.add(subjectState);
-    }
-    return new ResponseEntity<String>(SubjectState.toJsonArray(finalResult), headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/analysisgroupstates", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	public ResponseEntity<String> listAnalysisGroupStatesJsonArray() {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		List<AnalysisGroupState> result = AnalysisGroupState.findAllAnalysisGroupStates();
+		List<AnalysisGroupState> finalResult = new ArrayList<AnalysisGroupState>();
+		for (AnalysisGroupState analysisGroupState : result) {
+			if (!analysisGroupState.isIgnored())
+				finalResult.add(analysisGroupState);
+		}
+		return new ResponseEntity<String>(AnalysisGroupState.toJsonArray(finalResult), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/lsthingstates", method = RequestMethod.GET, headers = "Accept=application/json")
-@ResponseBody
-public ResponseEntity<String> listLsThingStatesJsonArray() {
-    HttpHeaders headers = new HttpHeaders();
-    headers.add("Content-Type", "application/json; charset=utf-8");
-    List<LsThingState> result = LsThingState.findAllLsThingStates();
-    List<LsThingState> finalResult = new ArrayList<LsThingState>();
-    for (LsThingState lsThingState: result) {
-    	if (!lsThingState.isIgnored()) finalResult.add(lsThingState);
-    }
-    return new ResponseEntity<String>(LsThingState.toJsonArray(finalResult), headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/treatmentgroupstates", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	public ResponseEntity<String> listTreatmentGroupStatesJsonArray() {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		List<TreatmentGroupState> result = TreatmentGroupState.findAllTreatmentGroupStates();
+		List<TreatmentGroupState> finalResult = new ArrayList<TreatmentGroupState>();
+		for (TreatmentGroupState treatmentGroupState : result) {
+			if (!treatmentGroupState.isIgnored())
+				finalResult.add(treatmentGroupState);
+		}
+		return new ResponseEntity<String>(TreatmentGroupState.toJsonArray(finalResult), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/containerstates", method = RequestMethod.GET, headers = "Accept=application/json")
-@ResponseBody
-public ResponseEntity<String> listContainerStatesJsonArray() {
-    HttpHeaders headers = new HttpHeaders();
-    headers.add("Content-Type", "application/json; charset=utf-8");
-    List<ContainerState> result = ContainerState.findAllContainerStates();
-    List<ContainerState> finalResult = new ArrayList<ContainerState>();
-    for (ContainerState containerState: result) {
-    	if (!containerState.isIgnored()) finalResult.add(containerState);
-    }
-    return new ResponseEntity<String>(ContainerState.toJsonArray(finalResult), headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/subjectstates", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	public ResponseEntity<String> listSubjectStatesJsonArray() {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		List<SubjectState> result = SubjectState.findAllSubjectStates();
+		List<SubjectState> finalResult = new ArrayList<SubjectState>();
+		for (SubjectState subjectState : result) {
+			if (!subjectState.isIgnored())
+				finalResult.add(subjectState);
+		}
+		return new ResponseEntity<String>(SubjectState.toJsonArray(finalResult), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/itxcontainercontainerstates", method = RequestMethod.GET, headers = "Accept=application/json")
-@ResponseBody
-public ResponseEntity<String> listItxContainerContainerStatesJsonArray() {
-    HttpHeaders headers = new HttpHeaders();
-    headers.add("Content-Type", "application/json; charset=utf-8");
-    List<ItxContainerContainerState> result = ItxContainerContainerState.findAllItxContainerContainerStates();
-    List<ItxContainerContainerState> finalResult = new ArrayList<ItxContainerContainerState>();
-    for (ItxContainerContainerState itxContainerContainerState: result) {
-    	if (!itxContainerContainerState.isIgnored()) finalResult.add(itxContainerContainerState);
-    }
-    return new ResponseEntity<String>(ItxContainerContainerState.toJsonArray(finalResult), headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/lsthingstates", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	public ResponseEntity<String> listLsThingStatesJsonArray() {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		List<LsThingState> result = LsThingState.findAllLsThingStates();
+		List<LsThingState> finalResult = new ArrayList<LsThingState>();
+		for (LsThingState lsThingState : result) {
+			if (!lsThingState.isIgnored())
+				finalResult.add(lsThingState);
+		}
+		return new ResponseEntity<String>(LsThingState.toJsonArray(finalResult), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/itxexperimentexperimentstates", method = RequestMethod.GET, headers = "Accept=application/json")
-@ResponseBody
-public ResponseEntity<String> listItxExperimentExperimentStatesJsonArray() {
-    HttpHeaders headers = new HttpHeaders();
-    headers.add("Content-Type", "application/json; charset=utf-8");
-    List<ItxExperimentExperimentState> result = ItxExperimentExperimentState.findAllItxExperimentExperimentStates();
-    List<ItxExperimentExperimentState> finalResult = new ArrayList<ItxExperimentExperimentState>();
-    for (ItxExperimentExperimentState itxExperimentExperimentState: result) {
-    	if (!itxExperimentExperimentState.isIgnored()) finalResult.add(itxExperimentExperimentState);
-    }
-    return new ResponseEntity<String>(ItxExperimentExperimentState.toJsonArray(finalResult), headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/containerstates", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	public ResponseEntity<String> listContainerStatesJsonArray() {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		List<ContainerState> result = ContainerState.findAllContainerStates();
+		List<ContainerState> finalResult = new ArrayList<ContainerState>();
+		for (ContainerState containerState : result) {
+			if (!containerState.isIgnored())
+				finalResult.add(containerState);
+		}
+		return new ResponseEntity<String>(ContainerState.toJsonArray(finalResult), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/itxprotocolprotocolstates", method = RequestMethod.GET, headers = "Accept=application/json")
-@ResponseBody
-public ResponseEntity<String> listItxProtocolProtocolStatesJsonArray() {
-    HttpHeaders headers = new HttpHeaders();
-    headers.add("Content-Type", "application/json; charset=utf-8");
-    List<ItxProtocolProtocolState> result = ItxProtocolProtocolState.findAllItxProtocolProtocolStates();
-    List<ItxProtocolProtocolState> finalResult = new ArrayList<ItxProtocolProtocolState>();
-    for (ItxProtocolProtocolState itxProtocolProtocolState: result) {
-    	if (!itxProtocolProtocolState.isIgnored()) finalResult.add(itxProtocolProtocolState);
-    }
-    return new ResponseEntity<String>(ItxProtocolProtocolState.toJsonArray(finalResult), headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/itxcontainercontainerstates", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	public ResponseEntity<String> listItxContainerContainerStatesJsonArray() {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		List<ItxContainerContainerState> result = ItxContainerContainerState.findAllItxContainerContainerStates();
+		List<ItxContainerContainerState> finalResult = new ArrayList<ItxContainerContainerState>();
+		for (ItxContainerContainerState itxContainerContainerState : result) {
+			if (!itxContainerContainerState.isIgnored())
+				finalResult.add(itxContainerContainerState);
+		}
+		return new ResponseEntity<String>(ItxContainerContainerState.toJsonArray(finalResult), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/itxsubjectcontainerstates", method = RequestMethod.GET, headers = "Accept=application/json")
-@ResponseBody
-public ResponseEntity<String> listItxSubjectContainerStatesJsonArray() {
-    HttpHeaders headers = new HttpHeaders();
-    headers.add("Content-Type", "application/json; charset=utf-8");
-    List<ItxSubjectContainerState> result = ItxSubjectContainerState.findAllItxSubjectContainerStates();
-    List<ItxSubjectContainerState> finalResult = new ArrayList<ItxSubjectContainerState>();
-    for (ItxSubjectContainerState itxSubjectContainerState: result) {
-    	if (!itxSubjectContainerState.isIgnored()) finalResult.add(itxSubjectContainerState);
-    }
-    return new ResponseEntity<String>(ItxSubjectContainerState.toJsonArray(finalResult), headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/itxexperimentexperimentstates", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	public ResponseEntity<String> listItxExperimentExperimentStatesJsonArray() {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		List<ItxExperimentExperimentState> result = ItxExperimentExperimentState.findAllItxExperimentExperimentStates();
+		List<ItxExperimentExperimentState> finalResult = new ArrayList<ItxExperimentExperimentState>();
+		for (ItxExperimentExperimentState itxExperimentExperimentState : result) {
+			if (!itxExperimentExperimentState.isIgnored())
+				finalResult.add(itxExperimentExperimentState);
+		}
+		return new ResponseEntity<String>(ItxExperimentExperimentState.toJsonArray(finalResult), headers,
+				HttpStatus.OK);
+	}
 
-//showStateJson
+	@RequestMapping(value = "/itxprotocolprotocolstates", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	public ResponseEntity<String> listItxProtocolProtocolStatesJsonArray() {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		List<ItxProtocolProtocolState> result = ItxProtocolProtocolState.findAllItxProtocolProtocolStates();
+		List<ItxProtocolProtocolState> finalResult = new ArrayList<ItxProtocolProtocolState>();
+		for (ItxProtocolProtocolState itxProtocolProtocolState : result) {
+			if (!itxProtocolProtocolState.isIgnored())
+				finalResult.add(itxProtocolProtocolState);
+		}
+		return new ResponseEntity<String>(ItxProtocolProtocolState.toJsonArray(finalResult), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/protocolstates/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> showProtocolStateJson (@PathVariable("id") Long id) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-ProtocolState protocolState = ProtocolState.findProtocolState(id);
-if (protocolState == null || protocolState.isIgnored()) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-return new ResponseEntity<String>(protocolState.toJson(), headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/itxsubjectcontainerstates", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	public ResponseEntity<String> listItxSubjectContainerStatesJsonArray() {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		List<ItxSubjectContainerState> result = ItxSubjectContainerState.findAllItxSubjectContainerStates();
+		List<ItxSubjectContainerState> finalResult = new ArrayList<ItxSubjectContainerState>();
+		for (ItxSubjectContainerState itxSubjectContainerState : result) {
+			if (!itxSubjectContainerState.isIgnored())
+				finalResult.add(itxSubjectContainerState);
+		}
+		return new ResponseEntity<String>(ItxSubjectContainerState.toJsonArray(finalResult), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/experimentstates/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> showExperimentStateJson (@PathVariable("id") Long id) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-ExperimentState experimentState = ExperimentState.findExperimentState(id);
-if (experimentState == null || experimentState.isIgnored()) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-return new ResponseEntity<String>(experimentState.toJson(), headers, HttpStatus.OK);
-}
+	// showStateJson
+
+	@RequestMapping(value = "/protocolstates/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> showProtocolStateJson(@PathVariable("id") Long id) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		ProtocolState protocolState = ProtocolState.findProtocolState(id);
+		if (protocolState == null || protocolState.isIgnored())
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		return new ResponseEntity<String>(protocolState.toJson(), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/analysisgroupstates/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> showAnalysisGroupStateJson (@PathVariable("id") Long id) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-AnalysisGroupState analysisGroupState = AnalysisGroupState.findAnalysisGroupState(id);
-if (analysisGroupState == null || analysisGroupState.isIgnored()) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-return new ResponseEntity<String>(analysisGroupState.toJson(), headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/experimentstates/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> showExperimentStateJson(@PathVariable("id") Long id) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		ExperimentState experimentState = ExperimentState.findExperimentState(id);
+		if (experimentState == null || experimentState.isIgnored())
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		return new ResponseEntity<String>(experimentState.toJson(), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/treatmentgroupstates/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> showTreatmentGroupStateJson (@PathVariable("id") Long id) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-TreatmentGroupState treatmentGroupState = TreatmentGroupState.findTreatmentGroupState(id);
-if (treatmentGroupState == null || treatmentGroupState.isIgnored()) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-return new ResponseEntity<String>(treatmentGroupState.toJson(), headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/analysisgroupstates/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> showAnalysisGroupStateJson(@PathVariable("id") Long id) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		AnalysisGroupState analysisGroupState = AnalysisGroupState.findAnalysisGroupState(id);
+		if (analysisGroupState == null || analysisGroupState.isIgnored())
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		return new ResponseEntity<String>(analysisGroupState.toJson(), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/subjectstates/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> showSubjectStateJson (@PathVariable("id") Long id) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-SubjectState subjectState = SubjectState.findSubjectState(id);
-if (subjectState == null || subjectState.isIgnored()) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-return new ResponseEntity<String>(subjectState.toJson(), headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/treatmentgroupstates/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> showTreatmentGroupStateJson(@PathVariable("id") Long id) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		TreatmentGroupState treatmentGroupState = TreatmentGroupState.findTreatmentGroupState(id);
+		if (treatmentGroupState == null || treatmentGroupState.isIgnored())
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		return new ResponseEntity<String>(treatmentGroupState.toJson(), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/lsthingstates/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> showLsThingStateJson (@PathVariable("id") Long id) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-LsThingState lsThingState = LsThingState.findLsThingState(id);
-if (lsThingState == null || lsThingState.isIgnored()) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-return new ResponseEntity<String>(lsThingState.toJson(), headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/subjectstates/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> showSubjectStateJson(@PathVariable("id") Long id) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		SubjectState subjectState = SubjectState.findSubjectState(id);
+		if (subjectState == null || subjectState.isIgnored())
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		return new ResponseEntity<String>(subjectState.toJson(), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/containerstates/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> showContainerStateJson (@PathVariable("id") Long id) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-ContainerState containerState = ContainerState.findContainerState(id);
-if (containerState == null || containerState.isIgnored()) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-return new ResponseEntity<String>(containerState.toJson(), headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/lsthingstates/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> showLsThingStateJson(@PathVariable("id") Long id) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		LsThingState lsThingState = LsThingState.findLsThingState(id);
+		if (lsThingState == null || lsThingState.isIgnored())
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		return new ResponseEntity<String>(lsThingState.toJson(), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/itxcontainercontainerstates/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> showItxContainerContainerStateJson (@PathVariable("id") Long id) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-ItxContainerContainerState itxContainerContainerState = ItxContainerContainerState.findItxContainerContainerState(id);
-if (itxContainerContainerState == null || itxContainerContainerState.isIgnored()) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-return new ResponseEntity<String>(itxContainerContainerState.toJson(), headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/containerstates/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> showContainerStateJson(@PathVariable("id") Long id) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		ContainerState containerState = ContainerState.findContainerState(id);
+		if (containerState == null || containerState.isIgnored())
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		return new ResponseEntity<String>(containerState.toJson(), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/itxexperimentexperimentstates/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> showItxExperimentExperimentStateJson (@PathVariable("id") Long id) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-ItxExperimentExperimentState itxExperimentExperimentState = ItxExperimentExperimentState.findItxExperimentExperimentState(id);
-if (itxExperimentExperimentState == null || itxExperimentExperimentState.isIgnored()) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-return new ResponseEntity<String>(itxExperimentExperimentState.toJson(), headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/itxcontainercontainerstates/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> showItxContainerContainerStateJson(@PathVariable("id") Long id) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		ItxContainerContainerState itxContainerContainerState = ItxContainerContainerState
+				.findItxContainerContainerState(id);
+		if (itxContainerContainerState == null || itxContainerContainerState.isIgnored())
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		return new ResponseEntity<String>(itxContainerContainerState.toJson(), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/itxprotocolprotocolstates/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> showItxProtocolProtocolStateJson (@PathVariable("id") Long id) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-ItxProtocolProtocolState itxProtocolProtocolState = ItxProtocolProtocolState.findItxProtocolProtocolState(id);
-if (itxProtocolProtocolState == null || itxProtocolProtocolState.isIgnored()) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-return new ResponseEntity<String>(itxProtocolProtocolState.toJson(), headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/itxexperimentexperimentstates/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> showItxExperimentExperimentStateJson(@PathVariable("id") Long id) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		ItxExperimentExperimentState itxExperimentExperimentState = ItxExperimentExperimentState
+				.findItxExperimentExperimentState(id);
+		if (itxExperimentExperimentState == null || itxExperimentExperimentState.isIgnored())
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		return new ResponseEntity<String>(itxExperimentExperimentState.toJson(), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/itxsubjectcontainerstates/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> showItxSubjectContainerStateJson (@PathVariable("id") Long id) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-ItxSubjectContainerState itxSubjectContainerState = ItxSubjectContainerState.findItxSubjectContainerState(id);
-if (itxSubjectContainerState == null || itxSubjectContainerState.isIgnored()) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-return new ResponseEntity<String>(itxSubjectContainerState.toJson(), headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/itxprotocolprotocolstates/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> showItxProtocolProtocolStateJson(@PathVariable("id") Long id) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		ItxProtocolProtocolState itxProtocolProtocolState = ItxProtocolProtocolState.findItxProtocolProtocolState(id);
+		if (itxProtocolProtocolState == null || itxProtocolProtocolState.isIgnored())
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		return new ResponseEntity<String>(itxProtocolProtocolState.toJson(), headers, HttpStatus.OK);
+	}
 
+	@RequestMapping(value = "/itxsubjectcontainerstates/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> showItxSubjectContainerStateJson(@PathVariable("id") Long id) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		ItxSubjectContainerState itxSubjectContainerState = ItxSubjectContainerState.findItxSubjectContainerState(id);
+		if (itxSubjectContainerState == null || itxSubjectContainerState.isIgnored())
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		return new ResponseEntity<String>(itxSubjectContainerState.toJson(), headers, HttpStatus.OK);
+	}
 
-//Update state from json (PUT)
-@RequestMapping(value = "/protocolstates", method = RequestMethod.PUT, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> updateProtocolStateFromJson (@RequestBody ProtocolState protocolState) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-if (ProtocolState.findProtocolState(protocolState.getId()) == null) {
-	return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-}
-protocolState = protocolStateService.updateProtocolState(protocolState);
-return new ResponseEntity<String>(protocolState.toJson(),headers, HttpStatus.OK);
-}
+	// Update state from json (PUT)
+	@RequestMapping(value = "/protocolstates", method = RequestMethod.PUT, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> updateProtocolStateFromJson(@RequestBody ProtocolState protocolState) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		if (ProtocolState.findProtocolState(protocolState.getId()) == null) {
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		}
+		protocolState = protocolStateService.updateProtocolState(protocolState);
+		return new ResponseEntity<String>(protocolState.toJson(), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/experimentstates", method = RequestMethod.PUT, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> updateExperimentStateFromJson (@RequestBody ExperimentState experimentState) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-if (ExperimentState.findExperimentState(experimentState.getId()) == null) {
-	return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-}
-experimentState = experimentStateService.updateExperimentState(experimentState);
-return new ResponseEntity<String>(experimentState.toJson(),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/experimentstates", method = RequestMethod.PUT, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> updateExperimentStateFromJson(@RequestBody ExperimentState experimentState) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		if (ExperimentState.findExperimentState(experimentState.getId()) == null) {
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		}
+		experimentState = experimentStateService.updateExperimentState(experimentState);
+		return new ResponseEntity<String>(experimentState.toJson(), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/analysisgroupstates", method = RequestMethod.PUT, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> updateAnalysisGroupStateFromJson (@RequestBody AnalysisGroupState analysisGroupState) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-if (AnalysisGroupState.findAnalysisGroupState(analysisGroupState.getId()) == null) {
-	return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-}
-analysisGroupState = analysisGroupStateService.updateAnalysisGroupState(analysisGroupState);
-return new ResponseEntity<String>(analysisGroupState.toJson(),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/analysisgroupstates", method = RequestMethod.PUT, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> updateAnalysisGroupStateFromJson(@RequestBody AnalysisGroupState analysisGroupState) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		if (AnalysisGroupState.findAnalysisGroupState(analysisGroupState.getId()) == null) {
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		}
+		analysisGroupState = analysisGroupStateService.updateAnalysisGroupState(analysisGroupState);
+		return new ResponseEntity<String>(analysisGroupState.toJson(), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/treatmentgroupstates", method = RequestMethod.PUT, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> updateTreatmentGroupStateFromJson (@RequestBody TreatmentGroupState treatmentGroupState) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-if (TreatmentGroupState.findTreatmentGroupState(treatmentGroupState.getId()) == null) {
-	return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-}
-treatmentGroupState = treatmentGroupStateService.updateTreatmentGroupState(treatmentGroupState);
-return new ResponseEntity<String>(treatmentGroupState.toJson(),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/treatmentgroupstates", method = RequestMethod.PUT, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> updateTreatmentGroupStateFromJson(
+			@RequestBody TreatmentGroupState treatmentGroupState) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		if (TreatmentGroupState.findTreatmentGroupState(treatmentGroupState.getId()) == null) {
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		}
+		treatmentGroupState = treatmentGroupStateService.updateTreatmentGroupState(treatmentGroupState);
+		return new ResponseEntity<String>(treatmentGroupState.toJson(), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/subjectstates", method = RequestMethod.PUT, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> updateSubjectStateFromJson (@RequestBody SubjectState subjectState) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-if (SubjectState.findSubjectState(subjectState.getId()) == null) {
-	return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-}
-subjectState = subjectStateService.updateSubjectState(subjectState);
-return new ResponseEntity<String>(subjectState.toJson(),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/subjectstates", method = RequestMethod.PUT, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> updateSubjectStateFromJson(@RequestBody SubjectState subjectState) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		if (SubjectState.findSubjectState(subjectState.getId()) == null) {
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		}
+		subjectState = subjectStateService.updateSubjectState(subjectState);
+		return new ResponseEntity<String>(subjectState.toJson(), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/lsthingstates", method = RequestMethod.PUT, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> updateLsThingStateFromJson (@RequestBody LsThingState lsThingState) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-if (LsThingState.findLsThingState(lsThingState.getId()) == null) {
-	return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-}
-lsThingState = lsThingStateService.updateLsThingState(lsThingState);
-return new ResponseEntity<String>(lsThingState.toJson(),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/lsthingstates", method = RequestMethod.PUT, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> updateLsThingStateFromJson(@RequestBody LsThingState lsThingState) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		if (LsThingState.findLsThingState(lsThingState.getId()) == null) {
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		}
+		lsThingState = lsThingStateService.updateLsThingState(lsThingState);
+		return new ResponseEntity<String>(lsThingState.toJson(), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/containerstates", method = RequestMethod.PUT, headers = "Accept=application/json")
-@ResponseBody
-public ResponseEntity<String> updateContainerStateFromJson (@RequestBody ContainerState containerState) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-try{
-	containerState = containerStateService.updateContainerState(containerState);
-	return new ResponseEntity<String>(containerState.toJson(),headers, HttpStatus.OK);
-}catch (Exception e){
-	logger.error("Caught exception in update container state", e);
-	return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
-}
+	@RequestMapping(value = "/containerstates", method = RequestMethod.PUT, headers = "Accept=application/json")
+	@ResponseBody
+	public ResponseEntity<String> updateContainerStateFromJson(@RequestBody ContainerState containerState) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		try {
+			containerState = containerStateService.updateContainerState(containerState);
+			return new ResponseEntity<String>(containerState.toJson(), headers, HttpStatus.OK);
+		} catch (Exception e) {
+			logger.error("Caught exception in update container state", e);
+			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
+		}
 
-}
+	}
 
-@RequestMapping(value = "/itxcontainercontainerstates", method = RequestMethod.PUT, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> updateItxContainerContainerStateFromJson (@RequestBody ItxContainerContainerState itxContainerContainerState) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-if (ItxContainerContainerState.findItxContainerContainerState(itxContainerContainerState.getId()) == null) {
-	return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-}
-itxContainerContainerState = itxContainerContainerStateService.updateItxContainerContainerState(itxContainerContainerState);
-return new ResponseEntity<String>(itxContainerContainerState.toJson(),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/itxcontainercontainerstates", method = RequestMethod.PUT, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> updateItxContainerContainerStateFromJson(
+			@RequestBody ItxContainerContainerState itxContainerContainerState) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		if (ItxContainerContainerState.findItxContainerContainerState(itxContainerContainerState.getId()) == null) {
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		}
+		itxContainerContainerState = itxContainerContainerStateService
+				.updateItxContainerContainerState(itxContainerContainerState);
+		return new ResponseEntity<String>(itxContainerContainerState.toJson(), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/itxexperimentexperimentstates", method = RequestMethod.PUT, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> updateItxExperimentExperimentStateFromJson (@RequestBody ItxExperimentExperimentState itxExperimentExperimentState) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-if (ItxExperimentExperimentState.findItxExperimentExperimentState(itxExperimentExperimentState.getId()) == null) {
-	return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-}
-itxExperimentExperimentState = itxExperimentExperimentStateService.updateItxExperimentExperimentState(itxExperimentExperimentState);
-return new ResponseEntity<String>(itxExperimentExperimentState.toJson(),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/itxexperimentexperimentstates", method = RequestMethod.PUT, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> updateItxExperimentExperimentStateFromJson(
+			@RequestBody ItxExperimentExperimentState itxExperimentExperimentState) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		if (ItxExperimentExperimentState
+				.findItxExperimentExperimentState(itxExperimentExperimentState.getId()) == null) {
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		}
+		itxExperimentExperimentState = itxExperimentExperimentStateService
+				.updateItxExperimentExperimentState(itxExperimentExperimentState);
+		return new ResponseEntity<String>(itxExperimentExperimentState.toJson(), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/itxprotocolprotocolstates", method = RequestMethod.PUT, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> updateItxProtocolProtocolStateFromJson (@RequestBody ItxProtocolProtocolState itxProtocolProtocolState) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-if (ItxProtocolProtocolState.findItxProtocolProtocolState(itxProtocolProtocolState.getId()) == null) {
-	return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-}
-itxProtocolProtocolState = itxProtocolProtocolStateService.updateItxProtocolProtocolState(itxProtocolProtocolState);
-return new ResponseEntity<String>(itxProtocolProtocolState.toJson(),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/itxprotocolprotocolstates", method = RequestMethod.PUT, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> updateItxProtocolProtocolStateFromJson(
+			@RequestBody ItxProtocolProtocolState itxProtocolProtocolState) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		if (ItxProtocolProtocolState.findItxProtocolProtocolState(itxProtocolProtocolState.getId()) == null) {
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		}
+		itxProtocolProtocolState = itxProtocolProtocolStateService
+				.updateItxProtocolProtocolState(itxProtocolProtocolState);
+		return new ResponseEntity<String>(itxProtocolProtocolState.toJson(), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/itxsubjectcontainerstates", method = RequestMethod.PUT, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> updateItxSubjectContainerStateFromJson (@RequestBody ItxSubjectContainerState itxSubjectContainerState) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-if (ItxSubjectContainerState.findItxSubjectContainerState(itxSubjectContainerState.getId()) == null) {
-	return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-}
-itxSubjectContainerState = itxSubjectContainerStateService.updateItxSubjectContainerState(itxSubjectContainerState);
-return new ResponseEntity<String>(itxSubjectContainerState.toJson(),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/itxsubjectcontainerstates", method = RequestMethod.PUT, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> updateItxSubjectContainerStateFromJson(
+			@RequestBody ItxSubjectContainerState itxSubjectContainerState) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		if (ItxSubjectContainerState.findItxSubjectContainerState(itxSubjectContainerState.getId()) == null) {
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		}
+		itxSubjectContainerState = itxSubjectContainerStateService
+				.updateItxSubjectContainerState(itxSubjectContainerState);
+		return new ResponseEntity<String>(itxSubjectContainerState.toJson(), headers, HttpStatus.OK);
+	}
 
-//Update states from jsonArray (PUT)
+	// Update states from jsonArray (PUT)
 
-@RequestMapping(value = "/protocolstates/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> updateProtocolStatesFromJsonArray (@RequestBody List<ProtocolState> protocolStates) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-protocolStates = (List<ProtocolState>) protocolStateService.updateProtocolStates(protocolStates);
-return new ResponseEntity<String>(ProtocolState.toJsonArray(protocolStates),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/protocolstates/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> updateProtocolStatesFromJsonArray(@RequestBody List<ProtocolState> protocolStates) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		protocolStates = (List<ProtocolState>) protocolStateService.updateProtocolStates(protocolStates);
+		return new ResponseEntity<String>(ProtocolState.toJsonArray(protocolStates), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/experimentstates/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> updateExperimentStatesFromJsonArray (@RequestBody List<ExperimentState> experimentStates) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-experimentStates = (List<ExperimentState>) experimentStateService.updateExperimentStates(experimentStates);
-return new ResponseEntity<String>(ExperimentState.toJsonArray(experimentStates),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/experimentstates/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> updateExperimentStatesFromJsonArray(
+			@RequestBody List<ExperimentState> experimentStates) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		experimentStates = (List<ExperimentState>) experimentStateService.updateExperimentStates(experimentStates);
+		return new ResponseEntity<String>(ExperimentState.toJsonArray(experimentStates), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/analysisgroupstates/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> updateAnalysisGroupStatesFromJsonArray (@RequestBody List<AnalysisGroupState> analysisGroupStates) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-analysisGroupStates = (List<AnalysisGroupState>) analysisGroupStateService.updateAnalysisGroupStates(analysisGroupStates);
-return new ResponseEntity<String>(AnalysisGroupState.toJsonArray(analysisGroupStates),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/analysisgroupstates/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> updateAnalysisGroupStatesFromJsonArray(
+			@RequestBody List<AnalysisGroupState> analysisGroupStates) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		analysisGroupStates = (List<AnalysisGroupState>) analysisGroupStateService
+				.updateAnalysisGroupStates(analysisGroupStates);
+		return new ResponseEntity<String>(AnalysisGroupState.toJsonArray(analysisGroupStates), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/treatmentgroupstates/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> updateTreatmentGroupStatesFromJsonArray (@RequestBody List<TreatmentGroupState> treatmentGroupStates) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-treatmentGroupStates = (List<TreatmentGroupState>) treatmentGroupStateService.updateTreatmentGroupStates(treatmentGroupStates);
-return new ResponseEntity<String>(TreatmentGroupState.toJsonArray(treatmentGroupStates),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/treatmentgroupstates/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> updateTreatmentGroupStatesFromJsonArray(
+			@RequestBody List<TreatmentGroupState> treatmentGroupStates) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		treatmentGroupStates = (List<TreatmentGroupState>) treatmentGroupStateService
+				.updateTreatmentGroupStates(treatmentGroupStates);
+		return new ResponseEntity<String>(TreatmentGroupState.toJsonArray(treatmentGroupStates), headers,
+				HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/subjectstates/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> updateSubjectStatesFromJsonArray (@RequestBody List<SubjectState> subjectStates) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-subjectStates = (List<SubjectState>) subjectStateService.updateSubjectStates(subjectStates);
-return new ResponseEntity<String>(SubjectState.toJsonArray(subjectStates),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/subjectstates/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> updateSubjectStatesFromJsonArray(@RequestBody List<SubjectState> subjectStates) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		subjectStates = (List<SubjectState>) subjectStateService.updateSubjectStates(subjectStates);
+		return new ResponseEntity<String>(SubjectState.toJsonArray(subjectStates), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/lsthingstates/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> updateLsThingStatesFromJsonArray (@RequestBody List<LsThingState> lsThingStates) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-lsThingStates = (List<LsThingState>) lsThingStateService.updateLsThingStates(lsThingStates);
-return new ResponseEntity<String>(LsThingState.toJsonArray(lsThingStates),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/lsthingstates/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> updateLsThingStatesFromJsonArray(@RequestBody List<LsThingState> lsThingStates) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		lsThingStates = (List<LsThingState>) lsThingStateService.updateLsThingStates(lsThingStates);
+		return new ResponseEntity<String>(LsThingState.toJsonArray(lsThingStates), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/containerstates/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-@ResponseBody
-public ResponseEntity<String> updateContainerStatesFromJsonArray (@RequestBody List<ContainerState> containerStates) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-try{
-	containerStates = (List<ContainerState>) containerStateService.updateContainerStates(containerStates);
-	return new ResponseEntity<String>(ContainerState.toJsonArray(containerStates),headers, HttpStatus.OK);
-}catch (Exception e){
-	logger.error("Caught exception in update container state", e);
-	return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
-}
+	@RequestMapping(value = "/containerstates/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+	@ResponseBody
+	public ResponseEntity<String> updateContainerStatesFromJsonArray(
+			@RequestBody List<ContainerState> containerStates) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		try {
+			containerStates = (List<ContainerState>) containerStateService.updateContainerStates(containerStates);
+			return new ResponseEntity<String>(ContainerState.toJsonArray(containerStates), headers, HttpStatus.OK);
+		} catch (Exception e) {
+			logger.error("Caught exception in update container state", e);
+			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
+		}
 
-}
+	}
 
-@RequestMapping(value = "/itxcontainercontainerstates/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> updateItxContainerContainerStatesFromJsonArray (@RequestBody List<ItxContainerContainerState> itxContainerContainerStates) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-itxContainerContainerStates = (List<ItxContainerContainerState>) itxContainerContainerStateService.updateItxContainerContainerStates(itxContainerContainerStates);
-return new ResponseEntity<String>(ItxContainerContainerState.toJsonArray(itxContainerContainerStates),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/itxcontainercontainerstates/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> updateItxContainerContainerStatesFromJsonArray(
+			@RequestBody List<ItxContainerContainerState> itxContainerContainerStates) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		itxContainerContainerStates = (List<ItxContainerContainerState>) itxContainerContainerStateService
+				.updateItxContainerContainerStates(itxContainerContainerStates);
+		return new ResponseEntity<String>(ItxContainerContainerState.toJsonArray(itxContainerContainerStates), headers,
+				HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/itxexperimentexperimentstates/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> updateItxExperimentExperimentStatesFromJsonArray (@RequestBody List<ItxExperimentExperimentState> itxExperimentExperimentStates) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-itxExperimentExperimentStates = (List<ItxExperimentExperimentState>) itxExperimentExperimentStateService.updateItxExperimentExperimentStates(itxExperimentExperimentStates);
-return new ResponseEntity<String>(ItxExperimentExperimentState.toJsonArray(itxExperimentExperimentStates),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/itxexperimentexperimentstates/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> updateItxExperimentExperimentStatesFromJsonArray(
+			@RequestBody List<ItxExperimentExperimentState> itxExperimentExperimentStates) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		itxExperimentExperimentStates = (List<ItxExperimentExperimentState>) itxExperimentExperimentStateService
+				.updateItxExperimentExperimentStates(itxExperimentExperimentStates);
+		return new ResponseEntity<String>(ItxExperimentExperimentState.toJsonArray(itxExperimentExperimentStates),
+				headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/itxprotocolprotocolstates/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> updateItxProtocolProtocolStatesFromJsonArray (@RequestBody List<ItxProtocolProtocolState> itxProtocolProtocolStates) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-itxProtocolProtocolStates = (List<ItxProtocolProtocolState>) itxProtocolProtocolStateService.updateItxProtocolProtocolStates(itxProtocolProtocolStates);
-return new ResponseEntity<String>(ItxProtocolProtocolState.toJsonArray(itxProtocolProtocolStates),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/itxprotocolprotocolstates/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> updateItxProtocolProtocolStatesFromJsonArray(
+			@RequestBody List<ItxProtocolProtocolState> itxProtocolProtocolStates) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		itxProtocolProtocolStates = (List<ItxProtocolProtocolState>) itxProtocolProtocolStateService
+				.updateItxProtocolProtocolStates(itxProtocolProtocolStates);
+		return new ResponseEntity<String>(ItxProtocolProtocolState.toJsonArray(itxProtocolProtocolStates), headers,
+				HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/itxsubjectcontainerstates/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> updateItxSubjectContainerStatesFromJsonArray (@RequestBody List<ItxSubjectContainerState> itxSubjectContainerStates) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-itxSubjectContainerStates = (List<ItxSubjectContainerState>) itxSubjectContainerStateService.updateItxSubjectContainerStates(itxSubjectContainerStates);
-return new ResponseEntity<String>(ItxSubjectContainerState.toJsonArray(itxSubjectContainerStates),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/itxsubjectcontainerstates/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> updateItxSubjectContainerStatesFromJsonArray(
+			@RequestBody List<ItxSubjectContainerState> itxSubjectContainerStates) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		itxSubjectContainerStates = (List<ItxSubjectContainerState>) itxSubjectContainerStateService
+				.updateItxSubjectContainerStates(itxSubjectContainerStates);
+		return new ResponseEntity<String>(ItxSubjectContainerState.toJsonArray(itxSubjectContainerStates), headers,
+				HttpStatus.OK);
+	}
 
-//Create state from json (POST)
+	// Create state from json (POST)
 
-@RequestMapping(value = "/protocolstates", method = RequestMethod.POST, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> createProtocolStateFromJson (@RequestBody ProtocolState protocolState) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-protocolState = protocolStateService.saveProtocolState(protocolState);
-return new ResponseEntity<String>(protocolState.toJson(),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/protocolstates", method = RequestMethod.POST, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> createProtocolStateFromJson(@RequestBody ProtocolState protocolState) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		protocolState = protocolStateService.saveProtocolState(protocolState);
+		return new ResponseEntity<String>(protocolState.toJson(), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/experimentstates", method = RequestMethod.POST, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> createExperimentStateFromJson (@RequestBody ExperimentState experimentState) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-experimentState = experimentStateService.saveExperimentState(experimentState);
-return new ResponseEntity<String>(experimentState.toJson(),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/experimentstates", method = RequestMethod.POST, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> createExperimentStateFromJson(@RequestBody ExperimentState experimentState) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		experimentState = experimentStateService.saveExperimentState(experimentState);
+		return new ResponseEntity<String>(experimentState.toJson(), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/analysisgroupstates", method = RequestMethod.POST, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> createAnalysisGroupStateFromJson (@RequestBody AnalysisGroupState analysisGroupState) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-analysisGroupState = analysisGroupStateService.saveAnalysisGroupState(analysisGroupState);
-return new ResponseEntity<String>(analysisGroupState.toJson(),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/analysisgroupstates", method = RequestMethod.POST, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> createAnalysisGroupStateFromJson(@RequestBody AnalysisGroupState analysisGroupState) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		analysisGroupState = analysisGroupStateService.saveAnalysisGroupState(analysisGroupState);
+		return new ResponseEntity<String>(analysisGroupState.toJson(), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/treatmentgroupstates", method = RequestMethod.POST, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> createTreatmentGroupStateFromJson (@RequestBody TreatmentGroupState treatmentGroupState) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-treatmentGroupState = treatmentGroupStateService.saveTreatmentGroupState(treatmentGroupState);
-return new ResponseEntity<String>(treatmentGroupState.toJson(),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/treatmentgroupstates", method = RequestMethod.POST, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> createTreatmentGroupStateFromJson(
+			@RequestBody TreatmentGroupState treatmentGroupState) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		treatmentGroupState = treatmentGroupStateService.saveTreatmentGroupState(treatmentGroupState);
+		return new ResponseEntity<String>(treatmentGroupState.toJson(), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/subjectstates", method = RequestMethod.POST, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> createSubjectStateFromJson (@RequestBody SubjectState subjectState) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-subjectState = subjectStateService.saveSubjectState(subjectState);
-return new ResponseEntity<String>(subjectState.toJson(),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/subjectstates", method = RequestMethod.POST, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> createSubjectStateFromJson(@RequestBody SubjectState subjectState) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		subjectState = subjectStateService.saveSubjectState(subjectState);
+		return new ResponseEntity<String>(subjectState.toJson(), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/lsthingstates", method = RequestMethod.POST, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> createLsThingStateFromJson (@RequestBody LsThingState lsThingState) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-lsThingState = lsThingStateService.saveLsThingState(lsThingState);
-return new ResponseEntity<String>(lsThingState.toJson(),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/lsthingstates", method = RequestMethod.POST, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> createLsThingStateFromJson(@RequestBody LsThingState lsThingState) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		lsThingState = lsThingStateService.saveLsThingState(lsThingState);
+		return new ResponseEntity<String>(lsThingState.toJson(), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/containerstates", method = RequestMethod.POST, headers = "Accept=application/json")
-@ResponseBody
-public ResponseEntity<String> createContainerStateFromJson (@RequestBody ContainerState containerState) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-try{
-	containerState = containerStateService.saveContainerState(containerState);
-	return new ResponseEntity<String>(containerState.toJson(),headers, HttpStatus.OK);
-}catch (Exception e){
-	logger.error("Caught exception in create container state", e);
-	return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
-}
-}
+	@RequestMapping(value = "/containerstates", method = RequestMethod.POST, headers = "Accept=application/json")
+	@ResponseBody
+	public ResponseEntity<String> createContainerStateFromJson(@RequestBody ContainerState containerState) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		try {
+			containerState = containerStateService.saveContainerState(containerState);
+			return new ResponseEntity<String>(containerState.toJson(), headers, HttpStatus.OK);
+		} catch (Exception e) {
+			logger.error("Caught exception in create container state", e);
+			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
+		}
+	}
 
-@RequestMapping(value = "/itxcontainercontainerstates", method = RequestMethod.POST, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> createItxContainerContainerStateFromJson (@RequestBody ItxContainerContainerState itxContainerContainerState) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-itxContainerContainerState = itxContainerContainerStateService.saveItxContainerContainerState(itxContainerContainerState);
-return new ResponseEntity<String>(itxContainerContainerState.toJson(),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/itxcontainercontainerstates", method = RequestMethod.POST, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> createItxContainerContainerStateFromJson(
+			@RequestBody ItxContainerContainerState itxContainerContainerState) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		itxContainerContainerState = itxContainerContainerStateService
+				.saveItxContainerContainerState(itxContainerContainerState);
+		return new ResponseEntity<String>(itxContainerContainerState.toJson(), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/itxexperimentexperimentstates", method = RequestMethod.POST, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> createItxExperimentExperimentStateFromJson (@RequestBody ItxExperimentExperimentState itxExperimentExperimentState) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-itxExperimentExperimentState = itxExperimentExperimentStateService.saveItxExperimentExperimentState(itxExperimentExperimentState);
-return new ResponseEntity<String>(itxExperimentExperimentState.toJson(),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/itxexperimentexperimentstates", method = RequestMethod.POST, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> createItxExperimentExperimentStateFromJson(
+			@RequestBody ItxExperimentExperimentState itxExperimentExperimentState) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		itxExperimentExperimentState = itxExperimentExperimentStateService
+				.saveItxExperimentExperimentState(itxExperimentExperimentState);
+		return new ResponseEntity<String>(itxExperimentExperimentState.toJson(), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/itxprotocolprotocolstates", method = RequestMethod.POST, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> createItxProtocolProtocolStateFromJson (@RequestBody ItxProtocolProtocolState itxProtocolProtocolState) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-itxProtocolProtocolState = itxProtocolProtocolStateService.saveItxProtocolProtocolState(itxProtocolProtocolState);
-return new ResponseEntity<String>(itxProtocolProtocolState.toJson(),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/itxprotocolprotocolstates", method = RequestMethod.POST, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> createItxProtocolProtocolStateFromJson(
+			@RequestBody ItxProtocolProtocolState itxProtocolProtocolState) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		itxProtocolProtocolState = itxProtocolProtocolStateService
+				.saveItxProtocolProtocolState(itxProtocolProtocolState);
+		return new ResponseEntity<String>(itxProtocolProtocolState.toJson(), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/itxsubjectcontainerstates", method = RequestMethod.POST, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> createItxSubjectContainerStateFromJson (@RequestBody ItxSubjectContainerState itxSubjectContainerState) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-itxSubjectContainerState = itxSubjectContainerStateService.saveItxSubjectContainerState(itxSubjectContainerState);
-return new ResponseEntity<String>(itxSubjectContainerState.toJson(),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/itxsubjectcontainerstates", method = RequestMethod.POST, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> createItxSubjectContainerStateFromJson(
+			@RequestBody ItxSubjectContainerState itxSubjectContainerState) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		itxSubjectContainerState = itxSubjectContainerStateService
+				.saveItxSubjectContainerState(itxSubjectContainerState);
+		return new ResponseEntity<String>(itxSubjectContainerState.toJson(), headers, HttpStatus.OK);
+	}
 
-//Create states from jsonArray (POST)
+	// Create states from jsonArray (POST)
 
-@RequestMapping(value = "/protocolstates/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> createProtocolStatesFromJsonArray (@RequestBody List<ProtocolState> protocolStates) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-protocolStates = (List<ProtocolState>) protocolStateService.saveProtocolStates(protocolStates);
-return new ResponseEntity<String>(ProtocolState.toJsonArray(protocolStates),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/protocolstates/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> createProtocolStatesFromJsonArray(@RequestBody List<ProtocolState> protocolStates) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		protocolStates = (List<ProtocolState>) protocolStateService.saveProtocolStates(protocolStates);
+		return new ResponseEntity<String>(ProtocolState.toJsonArray(protocolStates), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/experimentstates/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> createExperimentStatesFromJsonArray (@RequestBody List<ExperimentState> experimentStates) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-experimentStates = (List<ExperimentState>) experimentStateService.saveExperimentStates(experimentStates);
-return new ResponseEntity<String>(ExperimentState.toJsonArray(experimentStates),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/experimentstates/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> createExperimentStatesFromJsonArray(
+			@RequestBody List<ExperimentState> experimentStates) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		experimentStates = (List<ExperimentState>) experimentStateService.saveExperimentStates(experimentStates);
+		return new ResponseEntity<String>(ExperimentState.toJsonArray(experimentStates), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/analysisgroupstates/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> createAnalysisGroupStatesFromJsonArray (@RequestBody List<AnalysisGroupState> analysisGroupStates) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-analysisGroupStates = (List<AnalysisGroupState>) analysisGroupStateService.saveAnalysisGroupStates(analysisGroupStates);
-return new ResponseEntity<String>(AnalysisGroupState.toJsonArray(analysisGroupStates),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/analysisgroupstates/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> createAnalysisGroupStatesFromJsonArray(
+			@RequestBody List<AnalysisGroupState> analysisGroupStates) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		analysisGroupStates = (List<AnalysisGroupState>) analysisGroupStateService
+				.saveAnalysisGroupStates(analysisGroupStates);
+		return new ResponseEntity<String>(AnalysisGroupState.toJsonArray(analysisGroupStates), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/treatmentgroupstates/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> createTreatmentGroupStatesFromJsonArray (@RequestBody List<TreatmentGroupState> treatmentGroupStates) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-treatmentGroupStates = (List<TreatmentGroupState>) treatmentGroupStateService.saveTreatmentGroupStates(treatmentGroupStates);
-return new ResponseEntity<String>(TreatmentGroupState.toJsonArray(treatmentGroupStates),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/treatmentgroupstates/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> createTreatmentGroupStatesFromJsonArray(
+			@RequestBody List<TreatmentGroupState> treatmentGroupStates) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		treatmentGroupStates = (List<TreatmentGroupState>) treatmentGroupStateService
+				.saveTreatmentGroupStates(treatmentGroupStates);
+		return new ResponseEntity<String>(TreatmentGroupState.toJsonArray(treatmentGroupStates), headers,
+				HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/subjectstates/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> createSubjectStatesFromJsonArray (@RequestBody List<SubjectState> subjectStates) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-subjectStates = (List<SubjectState>) subjectStateService.saveSubjectStates(subjectStates);
-return new ResponseEntity<String>(SubjectState.toJsonArray(subjectStates),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/subjectstates/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> createSubjectStatesFromJsonArray(@RequestBody List<SubjectState> subjectStates) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		subjectStates = (List<SubjectState>) subjectStateService.saveSubjectStates(subjectStates);
+		return new ResponseEntity<String>(SubjectState.toJsonArray(subjectStates), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/lsthingstates/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> createLsThingStatesFromJsonArray (@RequestBody List<LsThingState> lsThingStates) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-lsThingStates = (List<LsThingState>) lsThingStateService.saveLsThingStates(lsThingStates);
-return new ResponseEntity<String>(LsThingState.toJsonArray(lsThingStates),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/lsthingstates/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> createLsThingStatesFromJsonArray(@RequestBody List<LsThingState> lsThingStates) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		lsThingStates = (List<LsThingState>) lsThingStateService.saveLsThingStates(lsThingStates);
+		return new ResponseEntity<String>(LsThingState.toJsonArray(lsThingStates), headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/containerstates/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-@ResponseBody
-public ResponseEntity<String> createContainerStatesFromJsonArray (@RequestBody List<ContainerState> containerStates) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-try{
-	containerStates = (List<ContainerState>) containerStateService.saveContainerStates(containerStates);
-	return new ResponseEntity<String>(ContainerState.toJsonArray(containerStates),headers, HttpStatus.OK);
-}catch (Exception e){
-	logger.error("Caught exception in create container state", e);
-	return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
-}
-}
+	@RequestMapping(value = "/containerstates/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+	@ResponseBody
+	public ResponseEntity<String> createContainerStatesFromJsonArray(
+			@RequestBody List<ContainerState> containerStates) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		try {
+			containerStates = (List<ContainerState>) containerStateService.saveContainerStates(containerStates);
+			return new ResponseEntity<String>(ContainerState.toJsonArray(containerStates), headers, HttpStatus.OK);
+		} catch (Exception e) {
+			logger.error("Caught exception in create container state", e);
+			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
+		}
+	}
 
-@RequestMapping(value = "/itxcontainercontainerstates/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> createItxContainerContainerStatesFromJsonArray (@RequestBody List<ItxContainerContainerState> itxContainerContainerStates) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-itxContainerContainerStates = (List<ItxContainerContainerState>) itxContainerContainerStateService.saveItxContainerContainerStates(itxContainerContainerStates);
-return new ResponseEntity<String>(ItxContainerContainerState.toJsonArray(itxContainerContainerStates),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/itxcontainercontainerstates/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> createItxContainerContainerStatesFromJsonArray(
+			@RequestBody List<ItxContainerContainerState> itxContainerContainerStates) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		itxContainerContainerStates = (List<ItxContainerContainerState>) itxContainerContainerStateService
+				.saveItxContainerContainerStates(itxContainerContainerStates);
+		return new ResponseEntity<String>(ItxContainerContainerState.toJsonArray(itxContainerContainerStates), headers,
+				HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/itxexperimentexperimentstates/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> createItxExperimentExperimentStatesFromJsonArray (@RequestBody List<ItxExperimentExperimentState> itxExperimentExperimentStates) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-itxExperimentExperimentStates = (List<ItxExperimentExperimentState>) itxExperimentExperimentStateService.saveItxExperimentExperimentStates(itxExperimentExperimentStates);
-return new ResponseEntity<String>(ItxExperimentExperimentState.toJsonArray(itxExperimentExperimentStates),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/itxexperimentexperimentstates/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> createItxExperimentExperimentStatesFromJsonArray(
+			@RequestBody List<ItxExperimentExperimentState> itxExperimentExperimentStates) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		itxExperimentExperimentStates = (List<ItxExperimentExperimentState>) itxExperimentExperimentStateService
+				.saveItxExperimentExperimentStates(itxExperimentExperimentStates);
+		return new ResponseEntity<String>(ItxExperimentExperimentState.toJsonArray(itxExperimentExperimentStates),
+				headers, HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/itxprotocolprotocolstates/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> createItxProtocolProtocolStatesFromJsonArray (@RequestBody List<ItxProtocolProtocolState> itxProtocolProtocolStates) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-itxProtocolProtocolStates = (List<ItxProtocolProtocolState>) itxProtocolProtocolStateService.saveItxProtocolProtocolStates(itxProtocolProtocolStates);
-return new ResponseEntity<String>(ItxProtocolProtocolState.toJsonArray(itxProtocolProtocolStates),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/itxprotocolprotocolstates/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> createItxProtocolProtocolStatesFromJsonArray(
+			@RequestBody List<ItxProtocolProtocolState> itxProtocolProtocolStates) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		itxProtocolProtocolStates = (List<ItxProtocolProtocolState>) itxProtocolProtocolStateService
+				.saveItxProtocolProtocolStates(itxProtocolProtocolStates);
+		return new ResponseEntity<String>(ItxProtocolProtocolState.toJsonArray(itxProtocolProtocolStates), headers,
+				HttpStatus.OK);
+	}
 
-@RequestMapping(value = "/itxsubjectcontainerstates/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-@ResponseBody
-@Transactional
-public ResponseEntity<String> createItxSubjectContainerStatesFromJsonArray (@RequestBody List<ItxSubjectContainerState> itxSubjectContainerStates) {
-HttpHeaders headers = new HttpHeaders();
-headers.add("Content-Type", "application/json; charset=utf-8");
-itxSubjectContainerStates = (List<ItxSubjectContainerState>) itxSubjectContainerStateService.saveItxSubjectContainerStates(itxSubjectContainerStates);
-return new ResponseEntity<String>(ItxSubjectContainerState.toJsonArray(itxSubjectContainerStates),headers, HttpStatus.OK);
-}
+	@RequestMapping(value = "/itxsubjectcontainerstates/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> createItxSubjectContainerStatesFromJsonArray(
+			@RequestBody List<ItxSubjectContainerState> itxSubjectContainerStates) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		itxSubjectContainerStates = (List<ItxSubjectContainerState>) itxSubjectContainerStateService
+				.saveItxSubjectContainerStates(itxSubjectContainerStates);
+		return new ResponseEntity<String>(ItxSubjectContainerState.toJsonArray(itxSubjectContainerStates), headers,
+				HttpStatus.OK);
+	}
 
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiStereoCategoryController.java b/src/main/java/com/labsynch/labseer/api/ApiStereoCategoryController.java
index 0ca9a8198..18a5c9904 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiStereoCategoryController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiStereoCategoryController.java
@@ -22,7 +22,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-@RequestMapping(value = {"/api/v1/stereoCategories"})
+@RequestMapping(value = { "/api/v1/stereoCategories" })
 @Controller
 public class ApiStereoCategoryController {
 
@@ -33,21 +33,21 @@ public class ApiStereoCategoryController {
 
 	@RequestMapping(value = "/validate", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<Boolean> validate(@RequestParam(value="code", required = true) String code) {
+	public ResponseEntity<Boolean> validate(@RequestParam(value = "code", required = true) String code) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 
-		if (StereoCategory.countFindStereoCategorysByCodeEquals(code) > 0){
-			return new ResponseEntity<Boolean>(false, headers,HttpStatus.CONFLICT );
+		if (StereoCategory.countFindStereoCategorysByCodeEquals(code) > 0) {
+			return new ResponseEntity<Boolean>(false, headers, HttpStatus.CONFLICT);
 		} else {
-			return new ResponseEntity<Boolean>(true, headers,HttpStatus.ACCEPTED );	        	
+			return new ResponseEntity<Boolean>(true, headers, HttpStatus.ACCEPTED);
 		}
-	}	
+	}
 
 	@RequestMapping(value = "/validateBeforeSave", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
@@ -67,14 +67,16 @@ public ResponseEntity<String> validateNewStereoCategory(@RequestBody String json
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 
 		Long stereoCategoryByCodeCount = 0L;
-		List<StereoCategory> queryStereoCategorys = StereoCategory.findStereoCategorysByCodeEquals(queryStereoCategory.getCode()).getResultList();
-		for (StereoCategory stereoCategory : queryStereoCategorys){
-			if (queryStereoCategory.getId() == null || stereoCategory.getId().longValue() != queryStereoCategory.getId().longValue()){
+		List<StereoCategory> queryStereoCategorys = StereoCategory
+				.findStereoCategorysByCodeEquals(queryStereoCategory.getCode()).getResultList();
+		for (StereoCategory stereoCategory : queryStereoCategorys) {
+			if (queryStereoCategory.getId() == null
+					|| stereoCategory.getId().longValue() != queryStereoCategory.getId().longValue()) {
 				++stereoCategoryByCodeCount;
 				logger.debug("current stereoCategory: " + stereoCategory.toJson());
 				logger.debug("stereoCategory id: " + stereoCategory.getId());
@@ -83,49 +85,51 @@ public ResponseEntity<String> validateNewStereoCategory(@RequestBody String json
 			}
 		}
 
-		if (stereoCategoryByCodeCount > 0  ){
+		if (stereoCategoryByCodeCount > 0) {
 			ErrorMessage error = new ErrorMessage();
 			error.setLevel("ERROR");
 			error.setMessage("Found another stereo category with the same code name");
 			errors.add(error);
-			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers,HttpStatus.CONFLICT );
+			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.CONFLICT);
 		} else {
-			return new ResponseEntity<String>(queryStereoCategory.toJson(), headers,HttpStatus.OK );	        	
+			return new ResponseEntity<String>(queryStereoCategory.toJson(), headers, HttpStatus.OK);
 		}
 	}
 
 	@RequestMapping(value = "/findByCodeEquals", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> findByCodeEquals(@RequestParam(value="code", required = true) String code) {
+	public ResponseEntity<String> findByCodeEquals(@RequestParam(value = "code", required = true) String code) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 		List<StereoCategory> stereoCategorys = StereoCategory.findStereoCategorysByCodeEquals(code).getResultList();
 		logger.debug("number of stereoCategorys found: " + stereoCategorys.size());
-		if (stereoCategorys.size() != 1){
-			return new ResponseEntity<String>("[]", headers, HttpStatus.CONFLICT);       	
+		if (stereoCategorys.size() != 1) {
+			return new ResponseEntity<String>("[]", headers, HttpStatus.CONFLICT);
 		} else {
 			return new ResponseEntity<String>(stereoCategorys.get(0).toJson(), headers, HttpStatus.OK);
 		}
 
-	}	 
+	}
 
 	@RequestMapping(value = "/findByCodeLike", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> findByCodeLike(@RequestParam(value="code", required = true) String code) {
+	public ResponseEntity<String> findByCodeLike(@RequestParam(value = "code", required = true) String code) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
-		return new ResponseEntity<String>(StereoCategory.toJsonArray(StereoCategory.findStereoCategorysByCodeLike(code).getResultList()), headers, HttpStatus.OK);
-	}	 
+		return new ResponseEntity<String>(
+				StereoCategory.toJsonArray(StereoCategory.findStereoCategorysByCodeLike(code).getResultList()), headers,
+				HttpStatus.OK);
+	}
 
 	@RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
@@ -135,8 +139,8 @@ public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
 		headers.add("Content-Type", "application/text; charset=utf-8");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 		if (stereoCategory == null) {
 			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
@@ -151,14 +155,17 @@ public ResponseEntity<String> listJson() {
 		headers.add("Content-Type", "application/text; charset=utf-8");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 
-		if (propertiesUtilService.getOrderSelectLists()){
-			return new ResponseEntity<String>(StereoCategory.toJsonArray(StereoCategory.findAllStereoCategorys("name", "ASC")), headers, HttpStatus.OK);
+		if (propertiesUtilService.getOrderSelectLists()) {
+			return new ResponseEntity<String>(
+					StereoCategory.toJsonArray(StereoCategory.findAllStereoCategorys("name", "ASC")), headers,
+					HttpStatus.OK);
 		} else {
-			return new ResponseEntity<String>(StereoCategory.toJsonArray(StereoCategory.findAllStereoCategorys()), headers, HttpStatus.OK);
+			return new ResponseEntity<String>(StereoCategory.toJsonArray(StereoCategory.findAllStereoCategorys()),
+					headers, HttpStatus.OK);
 		}
 	}
 
@@ -174,8 +181,8 @@ public ResponseEntity<String> createFromJson(@RequestBody String json) {
 		headers.add("Content-Type", "application/text; charset=utf-8");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 		return new ResponseEntity<String>(newStereoCategory.toJson(), headers, HttpStatus.CREATED);
 	}
@@ -193,8 +200,8 @@ public ResponseEntity<String> createFromJsonArray(@RequestBody String json) {
 		headers.add("Content-Type", "application/text; charset=utf-8");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 		return new ResponseEntity<String>(headers, HttpStatus.CREATED);
 	}
@@ -205,8 +212,8 @@ public ResponseEntity<String> updateFromJson(@RequestBody String json) {
 		headers.add("Content-Type", "application/text; charset=utf-8");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 		if (StereoCategory.fromJsonToStereoCategory(json).merge() == null) {
 			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
@@ -220,8 +227,8 @@ public ResponseEntity<String> updateFromJsonArray(@RequestBody String json) {
 		headers.add("Content-Type", "application/text; charset=utf-8");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 		for (StereoCategory stereoCategory : StereoCategory.fromJsonArrayToStereoCategorys(json)) {
 			if (stereoCategory.merge() == null) {
@@ -238,8 +245,8 @@ public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
 		headers.add("Content-Type", "application/text; charset=utf-8");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 		if (stereoCategory == null) {
 			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
@@ -248,15 +255,17 @@ public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
 		ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
 		try {
 			stereoCategory.remove();
-		} catch (Exception e){
+		} catch (Exception e) {
 			logger.info("Hit an exception: " + e);
 			Long parentCount = Parent.countParentsByStereoCategory(stereoCategory);
-			logger.info("Unable to delete the stereoCategory. " + parentCount + " parents associated with the stereoCategory " + stereoCategory.getName());
+			logger.info("Unable to delete the stereoCategory. " + parentCount
+					+ " parents associated with the stereoCategory " + stereoCategory.getName());
 			ErrorMessage error = new ErrorMessage();
 			error.setLevel("ERROR");
-			error.setMessage("Unable to delete the stereoCategory. " + parentCount + " parents associated with the stereoCategory " + stereoCategory.getName());
+			error.setMessage("Unable to delete the stereoCategory. " + parentCount
+					+ " parents associated with the stereoCategory " + stereoCategory.getName());
 			errors.add(error);
-			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers,HttpStatus.CONFLICT );
+			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.CONFLICT);
 		}
 
 		return new ResponseEntity<String>(headers, HttpStatus.OK);
@@ -264,15 +273,18 @@ public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
 
 	@RequestMapping(value = "/search", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> searchBySearchTerms(@RequestParam(value="searchTerm", required = true) String searchTerm) {
+	public ResponseEntity<String> searchBySearchTerms(
+			@RequestParam(value = "searchTerm", required = true) String searchTerm) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
-		return new ResponseEntity<String>(StereoCategory.toJsonArray(StereoCategory.findStereoCategoriesBySearchTerm(searchTerm).getResultList()), headers, HttpStatus.OK);
-	}	
+		return new ResponseEntity<String>(
+				StereoCategory.toJsonArray(StereoCategory.findStereoCategoriesBySearchTerm(searchTerm).getResultList()),
+				headers, HttpStatus.OK);
+	}
 
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiStructureController.java b/src/main/java/com/labsynch/labseer/api/ApiStructureController.java
index cbadf5574..de2296b64 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiStructureController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiStructureController.java
@@ -38,208 +38,212 @@ public class ApiStructureController {
 
 	@Autowired
 	private StructureService structureService;
-	
+
 	@Autowired
 	private LsThingService lsThingService;
 
 	@RequestMapping(value = "/renderMolStructure", method = RequestMethod.POST)
 	@ResponseBody
 	public ResponseEntity<byte[]> renderMolStructure(@RequestBody String json) {
-	    HttpHeaders headers = new HttpHeaders();
-	    headers.setContentType(MediaType.IMAGE_PNG);
-	    headers.add("Access-Control-Allow-Headers", "Content-Type");
-	    headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
+		HttpHeaders headers = new HttpHeaders();
+		headers.setContentType(MediaType.IMAGE_PNG);
+		headers.add("Access-Control-Allow-Headers", "Content-Type");
+		headers.add("Access-Control-Allow-Origin", "*");
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
-		
+
 		RenderMolRequestDTO request = RenderMolRequestDTO.fromJsonToRenderMolRequestDTO(json);
 		logger.info("########## render mol structure route #############");
 		logger.info("incoming request json: " + request.toJson());
-		try{
-			byte[] image = structureService.renderMolStructure(request.getMolStructure(), request.getHeight(), request.getWidth(), request.getFormat());  
+		try {
+			byte[] image = structureService.renderMolStructure(request.getMolStructure(), request.getHeight(),
+					request.getWidth(), request.getFormat());
 			return new ResponseEntity<byte[]>(image, headers, HttpStatus.OK);
-		}catch (Exception e){
-			logger.error("Caught exception in renderMolStructure",e);
+		} catch (Exception e) {
+			logger.error("Caught exception in renderMolStructure", e);
 			return new ResponseEntity<byte[]>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
-	
+
 	@RequestMapping(value = "/renderMolStructureBase64", method = RequestMethod.POST)
 	@ResponseBody
 	public ResponseEntity<String> renderMolStructureBase64(@RequestBody String json) {
-	    HttpHeaders headers = new HttpHeaders();
-	    headers.setContentType(MediaType.IMAGE_PNG);
-	    headers.add("Access-Control-Allow-Headers", "Content-Type");
-	    headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
+		HttpHeaders headers = new HttpHeaders();
+		headers.setContentType(MediaType.IMAGE_PNG);
+		headers.add("Access-Control-Allow-Headers", "Content-Type");
+		headers.add("Access-Control-Allow-Origin", "*");
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
-		
+
 		RenderMolRequestDTO request = RenderMolRequestDTO.fromJsonToRenderMolRequestDTO(json);
 		logger.info("########## render mol structure route #############");
 		logger.info("incoming request json: " + request.toJson());
-		try{
-			String image = structureService.renderMolStructureBase64(request.getMolStructure(), request.getHeight(), request.getWidth(), request.getFormat());  
+		try {
+			String image = structureService.renderMolStructureBase64(request.getMolStructure(), request.getHeight(),
+					request.getWidth(), request.getFormat());
 			return new ResponseEntity<String>(image, headers, HttpStatus.OK);
-		}catch (Exception e){
-			logger.error("Caught exception in renderMolStructure",e);
+		} catch (Exception e) {
+			logger.error("Caught exception in renderMolStructure", e);
 			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
-	
+
 	@RequestMapping(value = "/calculateMoleculeProperties", method = RequestMethod.POST)
 	@ResponseBody
-	public ResponseEntity<String> calculateMoleculeProperties(@RequestBody String json){
+	public ResponseEntity<String> calculateMoleculeProperties(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        
-        RenderMolRequestDTO request = RenderMolRequestDTO.fromJsonToRenderMolRequestDTO(json);
-        try{
-        	MolPropertiesDTO responseDTO = structureService.calculateMoleculeProperties(request.getMolStructure());
-        	return new ResponseEntity<String>(responseDTO.toJson(), headers, HttpStatus.OK);
-        }catch (Exception e){
-        	logger.error("Caught exception in calculateMoleculeProperties",e);
+		headers.add("Content-Type", "application/json; charset=utf-8");
+
+		RenderMolRequestDTO request = RenderMolRequestDTO.fromJsonToRenderMolRequestDTO(json);
+		try {
+			MolPropertiesDTO responseDTO = structureService.calculateMoleculeProperties(request.getMolStructure());
+			return new ResponseEntity<String>(responseDTO.toJson(), headers, HttpStatus.OK);
+		} catch (Exception e) {
+			logger.error("Caught exception in calculateMoleculeProperties", e);
 			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-        
+		}
+
 	}
-	
+
 	@Transactional
-    @RequestMapping(value = "/getByCodeName/{codeName}", method = RequestMethod.GET, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> getByCodeName(
-    		@PathVariable("codeName") String codeName) {
-    	HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-    	try{
-    		ChemStructure structure = ChemStructure.findStructureByCodeName(codeName);
-            return new ResponseEntity<String>(structure.toJson(), headers, HttpStatus.OK);
-    	}catch (NoResultException empty){
-    		return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-    	}catch (Exception e){
-    		logger.error("Caught exception saving structure",e);
-    		return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
-    	}
-        
-    }
-	
+	@RequestMapping(value = "/getByCodeName/{codeName}", method = RequestMethod.GET, headers = "Accept=application/json")
+	public ResponseEntity<java.lang.String> getByCodeName(
+			@PathVariable("codeName") String codeName) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		try {
+			ChemStructure structure = ChemStructure.findStructureByCodeName(codeName);
+			return new ResponseEntity<String>(structure.toJson(), headers, HttpStatus.OK);
+		} catch (NoResultException empty) {
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		} catch (Exception e) {
+			logger.error("Caught exception saving structure", e);
+			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
+		}
+
+	}
+
 	@RequestMapping(value = "/renderStructureByCodeName", method = RequestMethod.GET)
 	@ResponseBody
-	public ResponseEntity<byte[]> renderStructureByCodeName(@RequestParam(value="codeName", required=true) String codeName,
-			@RequestParam(value="height", required=true) int height,
-			@RequestParam(value="width", required=true) int width,
-			@RequestParam(value="format", required=true) String format) {
-	    HttpHeaders headers = new HttpHeaders();
-	    headers.setContentType(MediaType.IMAGE_PNG);
-	    headers.add("Access-Control-Allow-Headers", "Content-Type");
-	    headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
+	public ResponseEntity<byte[]> renderStructureByCodeName(
+			@RequestParam(value = "codeName", required = true) String codeName,
+			@RequestParam(value = "height", required = true) int height,
+			@RequestParam(value = "width", required = true) int width,
+			@RequestParam(value = "format", required = true) String format) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.setContentType(MediaType.IMAGE_PNG);
+		headers.add("Access-Control-Allow-Headers", "Content-Type");
+		headers.add("Access-Control-Allow-Origin", "*");
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
-		
-		try{
-			byte[] image = structureService.renderStructureByCodeName(codeName, height, width, format);  
+
+		try {
+			byte[] image = structureService.renderStructureByCodeName(codeName, height, width, format);
 			return new ResponseEntity<byte[]>(image, headers, HttpStatus.OK);
-		}catch (NoResultException empty){
+		} catch (NoResultException empty) {
 			return new ResponseEntity<byte[]>(headers, HttpStatus.NOT_FOUND);
-		}catch (Exception e){
-			logger.error("Caught exception in renderStructureByCodeName",e);
+		} catch (Exception e) {
+			logger.error("Caught exception in renderStructureByCodeName", e);
 			return new ResponseEntity<byte[]>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
-	
+
 	@RequestMapping(value = "/renderStructureByLsThingCodeName", method = RequestMethod.GET)
 	@ResponseBody
-	public ResponseEntity<byte[]> renderStructureByLsThingCodeName(@RequestParam(value="codeName", required=true) String codeName,
-			@RequestParam(value="height", required=true) int height,
-			@RequestParam(value="width", required=true) int width,
-			@RequestParam(value="format", required=true) String format) {
-	    HttpHeaders headers = new HttpHeaders();
-	    headers.setContentType(MediaType.IMAGE_PNG);
-	    headers.add("Access-Control-Allow-Headers", "Content-Type");
-	    headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control","no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma","no-cache"); //HTTP 1.0
+	public ResponseEntity<byte[]> renderStructureByLsThingCodeName(
+			@RequestParam(value = "codeName", required = true) String codeName,
+			@RequestParam(value = "height", required = true) int height,
+			@RequestParam(value = "width", required = true) int width,
+			@RequestParam(value = "format", required = true) String format) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.setContentType(MediaType.IMAGE_PNG);
+		headers.add("Access-Control-Allow-Headers", "Content-Type");
+		headers.add("Access-Control-Allow-Origin", "*");
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
-		
-		try{
-			byte[] image = lsThingService.renderStructureByLsThingCodeName(codeName, height, width, format);  
+
+		try {
+			byte[] image = lsThingService.renderStructureByLsThingCodeName(codeName, height, width, format);
 			return new ResponseEntity<byte[]>(image, headers, HttpStatus.OK);
-		}catch (NoResultException empty){
+		} catch (NoResultException empty) {
 			return new ResponseEntity<byte[]>(headers, HttpStatus.NOT_FOUND);
-		}catch (NotFoundException notFound){
+		} catch (NotFoundException notFound) {
 			return new ResponseEntity<byte[]>(headers, HttpStatus.NOT_FOUND);
-		}catch (Exception e){
-			logger.error("Caught exception in renderStructureByLsThingCodeName",e);
+		} catch (Exception e) {
+			logger.error("Caught exception in renderStructureByLsThingCodeName", e);
 			return new ResponseEntity<byte[]>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
-	
+
 	@Transactional
-    @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> createFromJson(@RequestBody String json) {
-    	HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-    	try{
-    		ChemStructure structure = ChemStructure.fromJsonToChemStructure(json);
-    		structure = structureService.saveStructure(structure);
-    		structure.flush();
-            return new ResponseEntity<String>(structure.toJson(), headers, HttpStatus.CREATED);
-    	}catch (Exception e){
-    		logger.error("Caught exception saving structure",e);
-    		return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
-    	}
-        
-    }
+	@RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<java.lang.String> createFromJson(@RequestBody String json) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		try {
+			ChemStructure structure = ChemStructure.fromJsonToChemStructure(json);
+			structure = structureService.saveStructure(structure);
+			structure.flush();
+			return new ResponseEntity<String>(structure.toJson(), headers, HttpStatus.CREATED);
+		} catch (Exception e) {
+			logger.error("Caught exception saving structure", e);
+			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
+		}
+
+	}
 
 	@RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> createFromJsonArray(@RequestBody String json) {
-    	HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        try{
-        	Collection<ChemStructure> structures = ChemStructure.fromJsonArrayToChemStructures(json);
-            Collection<ChemStructure> savedStructures = new ArrayList<ChemStructure>();
-        	for (ChemStructure structure : structures) {
-                ChemStructure savedStructure = structureService.saveStructure(structure);
-                savedStructures.add(savedStructure);
-            }
-            return new ResponseEntity<String>(ChemStructure.toJsonArray(savedStructures), headers, HttpStatus.CREATED);
-        }catch (Exception e){
-    		logger.error("Caught exception saving structure",e);
-    		return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
-    	}
-    	
-    }
+	public ResponseEntity<java.lang.String> createFromJsonArray(@RequestBody String json) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		try {
+			Collection<ChemStructure> structures = ChemStructure.fromJsonArrayToChemStructures(json);
+			Collection<ChemStructure> savedStructures = new ArrayList<ChemStructure>();
+			for (ChemStructure structure : structures) {
+				ChemStructure savedStructure = structureService.saveStructure(structure);
+				savedStructures.add(savedStructure);
+			}
+			return new ResponseEntity<String>(ChemStructure.toJsonArray(savedStructures), headers, HttpStatus.CREATED);
+		} catch (Exception e) {
+			logger.error("Caught exception saving structure", e);
+			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
+		}
+
+	}
 
 	@Transactional
-    @RequestMapping(value = { "/{id}", "/" }, method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> updateFromJson(@RequestBody String json) {
-        ChemStructure structure = ChemStructure.fromJsonToChemStructure(json);
-    	HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        structure = structureService.updateStructure(structure);
-        if (structure.getId() == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        return new ResponseEntity<String>(structure.toJson(), headers, HttpStatus.OK);
-    }
+	@RequestMapping(value = { "/{id}", "/" }, method = RequestMethod.PUT, headers = "Accept=application/json")
+	public ResponseEntity<java.lang.String> updateFromJson(@RequestBody String json) {
+		ChemStructure structure = ChemStructure.fromJsonToChemStructure(json);
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		structure = structureService.updateStructure(structure);
+		if (structure.getId() == null) {
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		}
+		return new ResponseEntity<String>(structure.toJson(), headers, HttpStatus.OK);
+	}
 
 	@RequestMapping(value = "/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
 	public ResponseEntity<java.lang.String> updateFromJsonArray(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
-		try{
+		try {
 			Collection<ChemStructure> structures = ChemStructure.fromJsonArrayToChemStructures(json);
 			Collection<ChemStructure> updatedStructures = new ArrayList<ChemStructure>();
 			for (ChemStructure structure : structures) {
 				ChemStructure updatedStructure = structureService.saveStructure(structure);
 				updatedStructures.add(updatedStructure);
 			}
-            return new ResponseEntity<String>(ChemStructure.toJsonArray(updatedStructures), headers, HttpStatus.OK);
-        }catch (Exception e){
-    		logger.error("Caught exception updating structures",e);
-    		return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
-    	}
+			return new ResponseEntity<String>(ChemStructure.toJsonArray(updatedStructures), headers, HttpStatus.OK);
+		} catch (Exception e) {
+			logger.error("Caught exception updating structures", e);
+			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
+		}
 	}
 
 	@RequestMapping(value = "/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
@@ -253,64 +257,68 @@ public ResponseEntity<java.lang.String> deleteFromJson(@PathVariable("id") Long
 		structure.remove();
 		return new ResponseEntity<String>(headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/searchStructures", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> searchStructures(@RequestBody String json) {
-    	HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json;charset=utf-8");
-        Collection<ChemStructure> structures;
-        try{
-        	logger.info("##################################################################");
-
-        	logger.info("incoming JSON: " + json);
-        	StructureSearchDTO query = StructureSearchDTO.fromJsonToStructureSearchDTO(json);
-        	logger.info("incoming query: " + query.getLsType() + "  " + query.getLsKind());
-        	if (query.getLsType() != null && query.getLsKind() != null){
-            	structures = structureService.searchStructuresByTypeKind( query.getQueryMol(), query.getLsType(), query.getLsKind(), SearchType.getIfPresent(query.getSearchType()).orElse(SearchType.DEFAULT), query.getMaxResults(), query.getSimilarity());
-        	} else {
-            	structures = structureService.searchStructures( query.getQueryMol(), SearchType.getIfPresent(query.getSearchType()).orElse(SearchType.DEFAULT), query.getMaxResults(), query.getSimilarity());
-        	}
-        	logger.info("number of structs found: " + structures.size());
-            return new ResponseEntity<String>(ChemStructure.toJsonArray(structures), headers, HttpStatus.OK);
-        }catch (Exception e){
-    		logger.error("Caught exception saving structure",e);
-    		return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
-    	}
-    	
-    }
-	
+	public ResponseEntity<java.lang.String> searchStructures(@RequestBody String json) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json;charset=utf-8");
+		Collection<ChemStructure> structures;
+		try {
+			logger.info("##################################################################");
+
+			logger.info("incoming JSON: " + json);
+			StructureSearchDTO query = StructureSearchDTO.fromJsonToStructureSearchDTO(json);
+			logger.info("incoming query: " + query.getLsType() + "  " + query.getLsKind());
+			if (query.getLsType() != null && query.getLsKind() != null) {
+				structures = structureService.searchStructuresByTypeKind(query.getQueryMol(), query.getLsType(),
+						query.getLsKind(), SearchType.getIfPresent(query.getSearchType()).orElse(SearchType.DEFAULT),
+						query.getMaxResults(), query.getSimilarity());
+			} else {
+				structures = structureService.searchStructures(query.getQueryMol(),
+						SearchType.getIfPresent(query.getSearchType()).orElse(SearchType.DEFAULT),
+						query.getMaxResults(), query.getSimilarity());
+			}
+			logger.info("number of structs found: " + structures.size());
+			return new ResponseEntity<String>(ChemStructure.toJsonArray(structures), headers, HttpStatus.OK);
+		} catch (Exception e) {
+			logger.error("Caught exception saving structure", e);
+			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
+		}
+
+	}
+
 	@Transactional
-    @RequestMapping(value = "/convertSmilesToMol", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> convertSmilesToMol(
-    		@RequestBody String smiles) {
-    	HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-    	try{
-    		String molStructure = structureService.convertSmilesToMol(smiles);
-            return new ResponseEntity<String>(molStructure, headers, HttpStatus.OK);
-    	}catch (NoResultException empty){
-    		return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-    	}catch (Exception e){
-    		logger.error("Caught exception converting smiles to MOL",e);
-    		return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
-    	}
-        
-    }
-	
+	@RequestMapping(value = "/convertSmilesToMol", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<java.lang.String> convertSmilesToMol(
+			@RequestBody String smiles) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		try {
+			String molStructure = structureService.convertSmilesToMol(smiles);
+			return new ResponseEntity<String>(molStructure, headers, HttpStatus.OK);
+		} catch (NoResultException empty) {
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		} catch (Exception e) {
+			logger.error("Caught exception converting smiles to MOL", e);
+			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
+		}
+
+	}
+
 	@Transactional
-    @RequestMapping(value = "/cleanMolStructure", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> cleanMolStructure(
-    		@RequestBody String molStructure) {
-    	HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-    	try{
-    		String cleanedMolStructure = structureService.cleanMolStructure(molStructure);
-            return new ResponseEntity<String>(cleanedMolStructure, headers, HttpStatus.OK);
-    	}catch (NoResultException empty){
-    		return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-    	}catch (Exception e){
-    		logger.error("Caught exception cleaning MOL structure",e);
-    		return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
-    	}
-    }
+	@RequestMapping(value = "/cleanMolStructure", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<java.lang.String> cleanMolStructure(
+			@RequestBody String molStructure) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		try {
+			String cleanedMolStructure = structureService.cleanMolStructure(molStructure);
+			return new ResponseEntity<String>(cleanedMolStructure, headers, HttpStatus.OK);
+		} catch (NoResultException empty) {
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		} catch (Exception e) {
+			logger.error("Caught exception cleaning MOL structure", e);
+			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
+		}
+	}
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiStructureServicesController.java b/src/main/java/com/labsynch/labseer/api/ApiStructureServicesController.java
index 20dc9eaec..4e1cae6a6 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiStructureServicesController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiStructureServicesController.java
@@ -23,10 +23,10 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-@RequestMapping(value = {"/api/v1/structureServices"})
+@RequestMapping(value = { "/api/v1/structureServices" })
 @Controller
 public class ApiStructureServicesController {
-	
+
 	Logger logger = LoggerFactory.getLogger(ApiStructureServicesController.class);
 
 	@Autowired
@@ -34,13 +34,14 @@ public class ApiStructureServicesController {
 
 	@RequestMapping(value = "/standardize", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> standardize(@RequestBody String json){
-		if (logger.isDebugEnabled()) logger.debug("incoming json from molconvert: " + json);
+	public ResponseEntity<String> standardize(@RequestBody String json) {
+		if (logger.isDebugEnabled())
+			logger.debug("incoming json from molconvert: " + json);
 		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/json");		
+		headers.add("Content-Type", "application/json");
 		MolConvertInputDTO inputDTO = MolConvertInputDTO.fromJsonToMolConvertInputDTO(json);
 		MolConvertOutputDTO output = new MolConvertOutputDTO();
-		String standardizedMol= "" ;
+		String standardizedMol = "";
 		try {
 			standardizedMol = chemStructureService.standardizeStructure(inputDTO.getStructure());
 		} catch (IOException e) {
@@ -48,84 +49,96 @@ public ResponseEntity<String> standardize(@RequestBody String json){
 			return new ResponseEntity<String>("IO ERROR", headers, HttpStatus.BAD_REQUEST);
 		} catch (CmpdRegMolFormatException e) {
 			logger.error(e.toString());
-			return new ResponseEntity<String>("Cannot read input molfile: "+e.toString(), headers, HttpStatus.BAD_REQUEST);
+			return new ResponseEntity<String>("Cannot read input molfile: " + e.toString(), headers,
+					HttpStatus.BAD_REQUEST);
 		} catch (StandardizerException e) {
 			logger.error(e.toString());
-			return new ResponseEntity<String>("Standardization ERROR: "+e.toString(), headers, HttpStatus.BAD_REQUEST);
+			return new ResponseEntity<String>("Standardization ERROR: " + e.toString(), headers,
+					HttpStatus.BAD_REQUEST);
 		}
 		output.setStructure(standardizedMol);
 		output.setFormat("mol");
 
 		return new ResponseEntity<String>(output.toJson(), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/molconvert", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> molconvert(@RequestBody String json){
-		if (logger.isDebugEnabled()) logger.debug("incoming json from molconvert: " + json);
+	public ResponseEntity<String> molconvert(@RequestBody String json) {
+		if (logger.isDebugEnabled())
+			logger.debug("incoming json from molconvert: " + json);
 		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/json");		
+		headers.add("Content-Type", "application/json");
 		MolConvertInputDTO inputDTO = MolConvertInputDTO.fromJsonToMolConvertInputDTO(json);
 		MolConvertOutputDTO output = null;
 		try {
-			output = chemStructureService.toFormat(inputDTO.getStructure(), inputDTO.getInputFormat(), inputDTO.getParameters());
+			output = chemStructureService.toFormat(inputDTO.getStructure(), inputDTO.getInputFormat(),
+					inputDTO.getParameters());
 		} catch (IOException e) {
 			logger.error(e.toString());
 			return new ResponseEntity<String>("IO ERROR", headers, HttpStatus.BAD_REQUEST);
 		} catch (CmpdRegMolFormatException e) {
 			logger.error(e.toString());
-			return new ResponseEntity<String>("Cannot read input molfile: "+e.toString(), headers, HttpStatus.BAD_REQUEST);
+			return new ResponseEntity<String>("Cannot read input molfile: " + e.toString(), headers,
+					HttpStatus.BAD_REQUEST);
 		}
 
 		return new ResponseEntity<String>(output.toJson(), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/clean", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> cleanMol(@RequestBody String json){
-		if (logger.isDebugEnabled()) logger.debug("incoming json from mol clean: " + json);
+	public ResponseEntity<String> cleanMol(@RequestBody String json) {
+		if (logger.isDebugEnabled())
+			logger.debug("incoming json from mol clean: " + json);
 		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "plain/text");		
+		headers.add("Content-Type", "plain/text");
 		MolCleanInputDTO inputDTO = MolCleanInputDTO.fromJsonToMolCleanInputDTO(json);
 		MolConvertOutputDTO output = null;
 		try {
-			output = chemStructureService.cleanStructure(inputDTO.getStructure(), inputDTO.getParameters().getDim(), inputDTO.getParameters().getOpts());
+			output = chemStructureService.cleanStructure(inputDTO.getStructure(), inputDTO.getParameters().getDim(),
+					inputDTO.getParameters().getOpts());
 		} catch (IOException e) {
 			logger.error(e.toString());
 			return new ResponseEntity<String>("IO ERROR", headers, HttpStatus.BAD_REQUEST);
 		} catch (CmpdRegMolFormatException e) {
 			logger.error(e.toString());
-			return new ResponseEntity<String>("Cannot read input molfile: "+e.toString(), headers, HttpStatus.BAD_REQUEST);
+			return new ResponseEntity<String>("Cannot read input molfile: " + e.toString(), headers,
+					HttpStatus.BAD_REQUEST);
 		}
 		return new ResponseEntity<String>(output.getStructure(), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/hydrogenizer", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> hydrogenizeMol(@RequestBody String json){
-		if (logger.isDebugEnabled()) logger.debug("incoming json from mol hydrogenize: " + json);
+	public ResponseEntity<String> hydrogenizeMol(@RequestBody String json) {
+		if (logger.isDebugEnabled())
+			logger.debug("incoming json from mol hydrogenize: " + json);
 		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "plain/text");		
+		headers.add("Content-Type", "plain/text");
 		HydrogenizeMolInputDTO inputDTO = HydrogenizeMolInputDTO.fromJsonToHydrogenizeMolInputDTO(json);
 		String output = null;
 		try {
-			output = chemStructureService.hydrogenizeMol(inputDTO.getStructure(), inputDTO.getInputFormat(), inputDTO.getParameters().getMethod());
+			output = chemStructureService.hydrogenizeMol(inputDTO.getStructure(), inputDTO.getInputFormat(),
+					inputDTO.getParameters().getMethod());
 		} catch (IOException e) {
 			logger.error(e.toString());
 			return new ResponseEntity<String>("IO ERROR", headers, HttpStatus.BAD_REQUEST);
 		} catch (CmpdRegMolFormatException e) {
 			logger.error(e.toString());
-			return new ResponseEntity<String>("Cannot read input molfile: "+e.toString(), headers, HttpStatus.BAD_REQUEST);
+			return new ResponseEntity<String>("Cannot read input molfile: " + e.toString(), headers,
+					HttpStatus.BAD_REQUEST);
 		}
 		return new ResponseEntity<String>(output, headers, HttpStatus.OK);
 	}
 
 	@RequestMapping(value = "/cipStereoInfo", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> cipStereoInfo(@RequestBody String json){
-		if (logger.isDebugEnabled()) logger.debug("incoming json from mol get cipStereoInfo: " + json);
+	public ResponseEntity<String> cipStereoInfo(@RequestBody String json) {
+		if (logger.isDebugEnabled())
+			logger.debug("incoming json from mol get cipStereoInfo: " + json);
 		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "plain/text");		
+		headers.add("Content-Type", "plain/text");
 		MolInputDTO inputDTO = MolInputDTO.fromJsonToMolInputDTO(json);
 		String output = null;
 		try {
@@ -135,9 +148,10 @@ public ResponseEntity<String> cipStereoInfo(@RequestBody String json){
 			return new ResponseEntity<String>("IO ERROR", headers, HttpStatus.BAD_REQUEST);
 		} catch (CmpdRegMolFormatException e) {
 			logger.error(e.toString());
-			return new ResponseEntity<String>("Cannot read input molfile: "+e.toString(), headers, HttpStatus.BAD_REQUEST);
+			return new ResponseEntity<String>("Cannot read input molfile: " + e.toString(), headers,
+					HttpStatus.BAD_REQUEST);
 		}
 		return new ResponseEntity<String>(output, headers, HttpStatus.OK);
 	}
-	
+
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiSubjectController.java b/src/main/java/com/labsynch/labseer/api/ApiSubjectController.java
index 3eb4a4227..c530a3ff5 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiSubjectController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSubjectController.java
@@ -46,328 +46,344 @@
 @RequestMapping("api/v1/subjects")
 @Transactional
 public class ApiSubjectController {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(ApiSubjectController.class);
-	
+
 	@Autowired
 	private SubjectValueService subjectValueService;
-	
+
 	@Autowired
 	private SubjectService subjectService;
-	
-
-//	@RequestMapping(value = "/{SubjectIdOrCodeName}/values/{SubjectValueId}", method = RequestMethod.GET, headers = "Accept=application/json")
-//	@ResponseBody
-//	public ResponseEntity<String> getSubjectValueByIdOrCodeName (
-//			@PathVariable("SubjectIdOrCodeName") String subjectIdOrCodeName,
-//			@PathVariable("SubjectValueId") Long subjectValueId) {
-//		HttpHeaders headers = new HttpHeaders();
-//		headers.add("Content-Type", "application/json; charset=utf-8");
-//
-//		SubjectValue result = SubjectValue.findSubjectValue(subjectValueId);
-//
-//		return (result == null) ?
-//			new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND) :
-//			new ResponseEntity<String>(result.toJson(), headers, HttpStatus.OK);
-//	}
-	
+
+	// @RequestMapping(value = "/{SubjectIdOrCodeName}/values/{SubjectValueId}",
+	// method = RequestMethod.GET, headers = "Accept=application/json")
+	// @ResponseBody
+	// public ResponseEntity<String> getSubjectValueByIdOrCodeName (
+	// @PathVariable("SubjectIdOrCodeName") String subjectIdOrCodeName,
+	// @PathVariable("SubjectValueId") Long subjectValueId) {
+	// HttpHeaders headers = new HttpHeaders();
+	// headers.add("Content-Type", "application/json; charset=utf-8");
+	//
+	// SubjectValue result = SubjectValue.findSubjectValue(subjectValueId);
+	//
+	// return (result == null) ?
+	// new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND) :
+	// new ResponseEntity<String>(result.toJson(), headers, HttpStatus.OK);
+	// }
+
 	@RequestMapping(value = "/{SubjectIdOrCodeName}/values", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> getSubjectValuesForSubjectByIdOrCodeName (
-			@PathVariable("SubjectIdOrCodeName") String subjectIdOrCodeName) {		
+	public ResponseEntity<String> getSubjectValuesForSubjectByIdOrCodeName(
+			@PathVariable("SubjectIdOrCodeName") String subjectIdOrCodeName) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		
+
 		List<SubjectValue> subjectValues = null;
-		Long subjectId = SimpleUtil.isNumeric(subjectIdOrCodeName) ?
-				Long.valueOf(subjectIdOrCodeName) :
-				retrieveSubjectIdFromCodeName(subjectIdOrCodeName);
-		if(subjectId != null) {
+		Long subjectId = SimpleUtil.isNumeric(subjectIdOrCodeName) ? Long.valueOf(subjectIdOrCodeName)
+				: retrieveSubjectIdFromCodeName(subjectIdOrCodeName);
+		if (subjectId != null) {
 			subjectValues = subjectValueService.getSubjectValuesBySubjectId(subjectId);
 		}
-		
-		return (subjectValues == null) ?
-			new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND) :
-			new ResponseEntity<String>(SubjectValue.toJsonArray(subjectValues), headers, HttpStatus.OK);
+
+		return (subjectValues == null) ? new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND)
+				: new ResponseEntity<String>(SubjectValue.toJsonArray(subjectValues), headers, HttpStatus.OK);
 	}
-	
+
 	private static Long retrieveSubjectIdFromCodeName(String codeName) {
 		List<Subject> subjects = Subject.findSubjectsByCodeNameEquals(codeName).getResultList();
-		return (subjects == null || subjects.size() == 0) ? 
-					null :
-					subjects.get(0).getId();
+		return (subjects == null || subjects.size() == 0) ? null : subjects.get(0).getId();
 	}
-	
-//	@RequestMapping(value = "/values", method = RequestMethod.POST, headers = "Accept=application/json")
-//    public @ResponseBody ResponseEntity<String> saveSubjectFromJson(@RequestBody SubjectValue subjectValue) {
-//		HttpHeaders headers = new HttpHeaders();
-//        headers.add("Content-Type", "application/json");
-//                     
-//	    return (subjectValueService.saveSubjectValue(subjectValue) == null) ?
-//	    	new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST) :
-//	    	new ResponseEntity<String>(headers, HttpStatus.OK);
-//    }
-
-//	@RequestMapping(value = "{SubjectIdOrCodeName}/values/{SubjectValueId}", method = RequestMethod.PUT, headers = "Accept=application/json")
-//    public @ResponseBody ResponseEntity<String> updateSubjectFromJsonWithId(
-//    		@RequestBody SubjectValue subjectValue,
-//    		@PathVariable("SubjectValueId") String subjectValueId,
-//    		@PathVariable("SubjectIdOrCodeName") String subjectIdOrCodeName) {
-//        HttpHeaders headers = new HttpHeaders();
-//        headers.add("Content-Type", "application/json");
-//        
-//        if(subjectValue.getId() == null) {
-//        	return (subjectValueService.saveSubjectValue(subjectValue) == null) ?
-//        	    	new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST) :
-//        	    	new ResponseEntity<String>(headers, HttpStatus.OK);
-//        }      
-//        return ((subjectValueService.updateSubjectValue(subjectValue)) == null) ? 
-//        		new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST) : 
-//        		new ResponseEntity<String>(headers, HttpStatus.OK);
-//    }
-	
-//	@RequestMapping(value = "{SubjectIdOrCodeName}/values", method = RequestMethod.PUT, headers = "Accept=application/json")
-//    public @ResponseBody ResponseEntity<String> updateSubjectFromJsonWithId(
-//    		@RequestBody SubjectValue subjectValue,
-//    		@PathVariable("SubjectIdOrCodeName") String subjectIdOrCodeName) {
-//        HttpHeaders headers = new HttpHeaders();
-//        headers.add("Content-Type", "application/json");
-//        
-//        if(subjectValue.getId() == null) {
-//        	return (subjectValueService.saveSubjectValue(subjectValue) == null) ?
-//        	    	new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST) :
-//        	    	new ResponseEntity<String>(headers, HttpStatus.OK);
-//        }      
-//        return ((subjectValueService.updateSubjectValue(subjectValue)) == null) ? 
-//        		new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST) : 
-//        		new ResponseEntity<String>(headers, HttpStatus.OK);
-//    }
-	
+
+	// @RequestMapping(value = "/values", method = RequestMethod.POST, headers =
+	// "Accept=application/json")
+	// public @ResponseBody ResponseEntity<String> saveSubjectFromJson(@RequestBody
+	// SubjectValue subjectValue) {
+	// HttpHeaders headers = new HttpHeaders();
+	// headers.add("Content-Type", "application/json");
+	//
+	// return (subjectValueService.saveSubjectValue(subjectValue) == null) ?
+	// new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST) :
+	// new ResponseEntity<String>(headers, HttpStatus.OK);
+	// }
+
+	// @RequestMapping(value = "{SubjectIdOrCodeName}/values/{SubjectValueId}",
+	// method = RequestMethod.PUT, headers = "Accept=application/json")
+	// public @ResponseBody ResponseEntity<String> updateSubjectFromJsonWithId(
+	// @RequestBody SubjectValue subjectValue,
+	// @PathVariable("SubjectValueId") String subjectValueId,
+	// @PathVariable("SubjectIdOrCodeName") String subjectIdOrCodeName) {
+	// HttpHeaders headers = new HttpHeaders();
+	// headers.add("Content-Type", "application/json");
+	//
+	// if(subjectValue.getId() == null) {
+	// return (subjectValueService.saveSubjectValue(subjectValue) == null) ?
+	// new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST) :
+	// new ResponseEntity<String>(headers, HttpStatus.OK);
+	// }
+	// return ((subjectValueService.updateSubjectValue(subjectValue)) == null) ?
+	// new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST) :
+	// new ResponseEntity<String>(headers, HttpStatus.OK);
+	// }
+
+	// @RequestMapping(value = "{SubjectIdOrCodeName}/values", method =
+	// RequestMethod.PUT, headers = "Accept=application/json")
+	// public @ResponseBody ResponseEntity<String> updateSubjectFromJsonWithId(
+	// @RequestBody SubjectValue subjectValue,
+	// @PathVariable("SubjectIdOrCodeName") String subjectIdOrCodeName) {
+	// HttpHeaders headers = new HttpHeaders();
+	// headers.add("Content-Type", "application/json");
+	//
+	// if(subjectValue.getId() == null) {
+	// return (subjectValueService.saveSubjectValue(subjectValue) == null) ?
+	// new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST) :
+	// new ResponseEntity<String>(headers, HttpStatus.OK);
+	// }
+	// return ((subjectValueService.updateSubjectValue(subjectValue)) == null) ?
+	// new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST) :
+	// new ResponseEntity<String>(headers, HttpStatus.OK);
+	// }
 
 	@Transactional
-    @RequestMapping(method = RequestMethod.GET, value = "/{idOrCodeName}", headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<java.lang.String> showJson(@PathVariable("idOrCodeName") String idOrCodeName) {
-    	Subject subject;
-    	if(SimpleUtil.isNumeric(idOrCodeName)) {
-    	    	subject = Subject.findSubject(Long.valueOf(idOrCodeName));
- 		} else {
- 			subject = Subject.findSubjectByCodeNameEquals(idOrCodeName);
- 		}
-    	HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        if (subject == null) {
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        return new ResponseEntity<String>(subject.toJson(), headers, HttpStatus.OK);
-    }
+	@RequestMapping(method = RequestMethod.GET, value = "/{idOrCodeName}", headers = "Accept=application/json")
+	@ResponseBody
+	public ResponseEntity<java.lang.String> showJson(@PathVariable("idOrCodeName") String idOrCodeName) {
+		Subject subject;
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
+			subject = Subject.findSubject(Long.valueOf(idOrCodeName));
+		} else {
+			subject = Subject.findSubjectByCodeNameEquals(idOrCodeName);
+		}
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		if (subject == null) {
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		}
+		return new ResponseEntity<String>(subject.toJson(), headers, HttpStatus.OK);
+	}
 
 	@RequestMapping(method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> listJson() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        List<Subject> result = Subject.findAllSubjects();
-        return new ResponseEntity<String>(Subject.toJsonArray(result), headers, HttpStatus.OK);
-    }
+	@ResponseBody
+	public ResponseEntity<String> listJson() {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		List<Subject> result = Subject.findAllSubjects();
+		return new ResponseEntity<String>(Subject.toJsonArray(result), headers, HttpStatus.OK);
+	}
 
 	@RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> createFromJson(@RequestBody String json) {
-        Subject subject = Subject.fromJsonToSubject(json);
-        subject = subjectService.saveSubject(subject);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        return new ResponseEntity<String>(subject.toJson(), headers, HttpStatus.CREATED);
-    }
+	public ResponseEntity<String> createFromJson(@RequestBody String json) {
+		Subject subject = Subject.fromJsonToSubject(json);
+		subject = subjectService.saveSubject(subject);
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		return new ResponseEntity<String>(subject.toJson(), headers, HttpStatus.CREATED);
+	}
 
 	@RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> createFromJsonArray(@RequestBody String json) {
-        Collection<Subject> savedSubjects = new HashSet<Subject>();
-		for (Subject subject: Subject.fromJsonArrayToSubjects(json)) {
-            savedSubjects.add(subjectService.saveSubject(subject));
-        }
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        return new ResponseEntity<String>(Subject.toJsonArray(savedSubjects), headers, HttpStatus.CREATED);
-    }
-
-	@RequestMapping(value={"/","/{id}"}, method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> updateFromJson(@RequestBody String json) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        Subject subject = Subject.fromJsonToSubject(json);
-        try{
-        	Subject foundSubject = Subject.findSubject(subject.getId());
-        }catch(NoResultException e){
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        }
-        subject = subjectService.updateSubject(subject);
-        return new ResponseEntity<String>(subject.toJson(), headers, HttpStatus.OK);
-    }
+	public ResponseEntity<String> createFromJsonArray(@RequestBody String json) {
+		Collection<Subject> savedSubjects = new HashSet<Subject>();
+		for (Subject subject : Subject.fromJsonArrayToSubjects(json)) {
+			savedSubjects.add(subjectService.saveSubject(subject));
+		}
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		return new ResponseEntity<String>(Subject.toJsonArray(savedSubjects), headers, HttpStatus.CREATED);
+	}
+
+	@RequestMapping(value = { "/", "/{id}" }, method = RequestMethod.PUT, headers = "Accept=application/json")
+	public ResponseEntity<String> updateFromJson(@RequestBody String json) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		Subject subject = Subject.fromJsonToSubject(json);
+		try {
+			Subject foundSubject = Subject.findSubject(subject.getId());
+		} catch (NoResultException e) {
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		}
+		subject = subjectService.updateSubject(subject);
+		return new ResponseEntity<String>(subject.toJson(), headers, HttpStatus.OK);
+	}
 
 	@RequestMapping(value = "/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> updateFromJsonArray(@RequestBody String json) {
-        Collection<Subject> updatedSubjects = new HashSet<Subject>();
+	public ResponseEntity<String> updateFromJsonArray(@RequestBody String json) {
+		Collection<Subject> updatedSubjects = new HashSet<Subject>();
 		HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        for (Subject subject: Subject.fromJsonArrayToSubjects(json)) {
-        	try{
-            	Subject foundSubject = Subject.findSubject(subject.getId());
-            }catch(NoResultException e){
-                return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-            }
-            updatedSubjects.add(subjectService.updateSubject(subject));
-        }
-        return new ResponseEntity<String>(Subject.toJsonArray(updatedSubjects), headers, HttpStatus.OK);
-    }
+		headers.add("Content-Type", "application/json");
+		for (Subject subject : Subject.fromJsonArrayToSubjects(json)) {
+			try {
+				Subject foundSubject = Subject.findSubject(subject.getId());
+			} catch (NoResultException e) {
+				return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+			}
+			updatedSubjects.add(subjectService.updateSubject(subject));
+		}
+		return new ResponseEntity<String>(Subject.toJsonArray(updatedSubjects), headers, HttpStatus.OK);
+	}
 
 	@Transactional
-    @RequestMapping(value = "/{idOrCodeName}", method = RequestMethod.DELETE)
-    public ResponseEntity<java.lang.String> deleteFromJson(@PathVariable("idOrCodeName") String idOrCodeName,
-    		@RequestParam(value = "lsTransaction", required = false) Long lsTransaction,
-    		@RequestParam(value = "modifiedBy", required = false) String modifiedBy) {
-    	Subject subject;
-    	if(SimpleUtil.isNumeric(idOrCodeName)) {
-	    	subject = Subject.findSubject(Long.valueOf(idOrCodeName));
- 		} else {
- 			subject = Subject.findSubjectByCodeNameEquals(idOrCodeName);
- 		}
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json");
-        if (subject == null || (subject.isIgnored() && subject.isDeleted())) {
-            logger.info("Did not find the subject before delete");
-            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        } else {
-            logger.info("deleting the subject: " + idOrCodeName);
-            if (lsTransaction != null) subject.setLsTransaction(lsTransaction);
-            if (modifiedBy != null) subject.setModifiedBy(modifiedBy);
-            subject.setModifiedDate(new Date());
-            subject.logicalDelete();
-            subject.merge();
-            if (Subject.findSubject(subject.getId()) == null || Subject.findSubject(subject.getId()).isIgnored()) {
-                logger.info("Did not find the subject after delete");
-                return new ResponseEntity<String>(headers, HttpStatus.OK);
-            } else {
-                logger.info("Found the subject after delete");
-                return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
-            }
-        }
-    }
+	@RequestMapping(value = "/{idOrCodeName}", method = RequestMethod.DELETE)
+	public ResponseEntity<java.lang.String> deleteFromJson(@PathVariable("idOrCodeName") String idOrCodeName,
+			@RequestParam(value = "lsTransaction", required = false) Long lsTransaction,
+			@RequestParam(value = "modifiedBy", required = false) String modifiedBy) {
+		Subject subject;
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
+			subject = Subject.findSubject(Long.valueOf(idOrCodeName));
+		} else {
+			subject = Subject.findSubjectByCodeNameEquals(idOrCodeName);
+		}
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json");
+		if (subject == null || (subject.isIgnored() && subject.isDeleted())) {
+			logger.info("Did not find the subject before delete");
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		} else {
+			logger.info("deleting the subject: " + idOrCodeName);
+			if (lsTransaction != null)
+				subject.setLsTransaction(lsTransaction);
+			if (modifiedBy != null)
+				subject.setModifiedBy(modifiedBy);
+			subject.setModifiedDate(new Date());
+			subject.logicalDelete();
+			subject.merge();
+			if (Subject.findSubject(subject.getId()) == null || Subject.findSubject(subject.getId()).isIgnored()) {
+				logger.info("Did not find the subject after delete");
+				return new ResponseEntity<String>(headers, HttpStatus.OK);
+			} else {
+				logger.info("Found the subject after delete");
+				return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
+			}
+		}
+	}
 
 	@RequestMapping(params = "find=ByCodeNameEquals", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> jsonFindSubjectsByCodeNameEquals(@RequestParam("codeName") String codeName) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(Subject.toJsonArray(Subject.findSubjectsByCodeNameEquals(codeName).getResultList()), headers, HttpStatus.OK);
-    }
+	@ResponseBody
+	public ResponseEntity<String> jsonFindSubjectsByCodeNameEquals(@RequestParam("codeName") String codeName) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		return new ResponseEntity<String>(
+				Subject.toJsonArray(Subject.findSubjectsByCodeNameEquals(codeName).getResultList()), headers,
+				HttpStatus.OK);
+	}
 
 	@RequestMapping(params = "find=ByLsTransactionEquals", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> jsonFindSubjectsByLsTransactionEquals(@RequestParam("lsTransaction") Long lsTransaction) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(Subject.toJsonArray(Subject.findSubjectsByLsTransactionEquals(lsTransaction).getResultList()), headers, HttpStatus.OK);
-    }
-
-//	@RequestMapping(params = "find=ByTreatmentGroup", headers = "Accept=application/json")
-//    @ResponseBody
-//    public ResponseEntity<String> jsonFindSubjectsByTreatmentGroup(@RequestParam("treatmentGroup") TreatmentGroup treatmentGroup) {
-//        HttpHeaders headers = new HttpHeaders();
-//        headers.add("Content-Type", "application/json; charset=utf-8");
-//        return new ResponseEntity<String>(Subject.toJsonArray(Subject.findSubjectsByTreatmentGroups(treatmentGroup).getResultList()), headers, HttpStatus.OK);
-//    }
-	
-    @Transactional
-    @RequestMapping(value = "/getSubjectsByCodeNames", method = RequestMethod.POST, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<java.lang.String> getSubjectsByCodeNames(@RequestBody List<String> codeNames) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try{
-        	Collection<SubjectCodeNameDTO> searchResults = subjectService.getSubjectsByCodeNames(codeNames);
-        	return new ResponseEntity<String>(SubjectCodeNameDTO.toJsonArray(searchResults), headers, HttpStatus.OK);
-        } catch (Exception e){
-        	logger.error("Uncaught error in getSubjectsByCodeNames",e);
-            return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @Transactional	
+	@ResponseBody
+	public ResponseEntity<String> jsonFindSubjectsByLsTransactionEquals(
+			@RequestParam("lsTransaction") Long lsTransaction) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		return new ResponseEntity<String>(
+				Subject.toJsonArray(Subject.findSubjectsByLsTransactionEquals(lsTransaction).getResultList()), headers,
+				HttpStatus.OK);
+	}
+
+	// @RequestMapping(params = "find=ByTreatmentGroup", headers =
+	// "Accept=application/json")
+	// @ResponseBody
+	// public ResponseEntity<String>
+	// jsonFindSubjectsByTreatmentGroup(@RequestParam("treatmentGroup")
+	// TreatmentGroup treatmentGroup) {
+	// HttpHeaders headers = new HttpHeaders();
+	// headers.add("Content-Type", "application/json; charset=utf-8");
+	// return new
+	// ResponseEntity<String>(Subject.toJsonArray(Subject.findSubjectsByTreatmentGroups(treatmentGroup).getResultList()),
+	// headers, HttpStatus.OK);
+	// }
+
+	@Transactional
+	@RequestMapping(value = "/getSubjectsByCodeNames", method = RequestMethod.POST, headers = "Accept=application/json")
+	@ResponseBody
+	public ResponseEntity<java.lang.String> getSubjectsByCodeNames(@RequestBody List<String> codeNames) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		try {
+			Collection<SubjectCodeNameDTO> searchResults = subjectService.getSubjectsByCodeNames(codeNames);
+			return new ResponseEntity<String>(SubjectCodeNameDTO.toJsonArray(searchResults), headers, HttpStatus.OK);
+		} catch (Exception e) {
+			logger.error("Uncaught error in getSubjectsByCodeNames", e);
+			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
+		}
+	}
+
+	@Transactional
 	@RequestMapping(value = "/savefromtsv", method = RequestMethod.POST, headers = "Accept=application/json")
 	public @ResponseBody ResponseEntity<String> saveSubjectsFromCsv(@RequestBody SubjectCsvDataDTO subjectCsvDataDTO) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json");
 
 		logger.info("loading data from tsv files: " + subjectCsvDataDTO.toJson());
-		
+
 		String subjectFilePath = subjectCsvDataDTO.getSubjectCsvFilePath();
-		try{
+		try {
 			long startTime = new Date().getTime();
-			HashMap<String, TempThingDTO> resultMap = subjectService.createOnlySubjectsFromCSV(subjectFilePath, subjectCsvDataDTO.getTreatmentGroupIds());
+			HashMap<String, TempThingDTO> resultMap = subjectService.createOnlySubjectsFromCSV(subjectFilePath,
+					subjectCsvDataDTO.getTreatmentGroupIds());
 			long endTime = new Date().getTime();
 			long totalTime = endTime - startTime;
 			logger.info("dataLoaded: " + "true" + "   total elapsed time: " + totalTime);
 			Collection<TempThingDTO> resultArray = resultMap.values();
-			return new ResponseEntity<String>(TempThingDTO.toJsonArray(resultArray), headers, HttpStatus.OK) ;
-		}catch (Exception e){
-			logger.error("Error in api/v1/subjects/savefromtsv",e);
+			return new ResponseEntity<String>(TempThingDTO.toJsonArray(resultArray), headers, HttpStatus.OK);
+		} catch (Exception e) {
+			logger.error("Error in api/v1/subjects/savefromtsv", e);
 			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
-    
-    @Transactional
-    @RequestMapping(value = "/getSubjectsByContainerInteractions", method = RequestMethod.POST, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<java.lang.String> getSubjectsByContainerInteractions(@RequestBody String json,
-    		@RequestParam(value = "with", required = false) String with) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        try{
-        	Collection<ContainerSubjectsDTO> requests = ContainerSubjectsDTO.fromJsonArrayToCoes(json);
-        	Collection<ContainerSubjectsDTO> results = subjectService.getSubjectsByContainerAndInteraction(requests);
-        	if (with != null && with.equalsIgnoreCase("stub")){
-            	return new ResponseEntity<String>(ContainerSubjectsDTO.toJsonArrayStub(results), headers, HttpStatus.OK);
-        	}
-        	return new ResponseEntity<String>(ContainerSubjectsDTO.toJsonArray(results), headers, HttpStatus.OK);
-        } catch (Exception e){
-        	logger.error("Uncaught error in getSubjectsByCodeNames",e);
-            return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-    
-    @Transactional
-    @RequestMapping(value = "/searchSubjects", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> searchSubjects(@RequestBody String json, @RequestParam(value = "with", required = false) String with) {
-    	HttpHeaders headers = new HttpHeaders();
-    	headers.add("Content-Type", "application/json; charset=utf-8");
-    	SubjectSearchRequest query = SubjectSearchRequest.fromJsonToSubjectSearchRequest(json);
-    	ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
-    	boolean errorsFound = false;Collection<Long> subjectIds;
-    	SubjectSearchResultDTO result = new SubjectSearchResultDTO();
-    	try{
-    		subjectIds = subjectService.searchSubjectIdsByQueryDTO(query);
-    		int maxResults = 1000;
-    		if (query.getMaxResults() != null) maxResults = query.getMaxResults();
-    		result.setMaxResults(maxResults);
-    		result.setNumberOfResults(subjectIds.size());
-    		if (result.getNumberOfResults() <= result.getMaxResults()){
-    			result.setResults(subjectService.getSubjectsByIds(subjectIds));
-    		}
-    	}catch (Exception e){
-    		logger.error("Caught searching for subjects in generic interaction search",e);
-    		ErrorMessage error = new ErrorMessage();
-    	    error.setErrorLevel("error");
-    	    error.setMessage(e.getMessage());
-    	    errors.add(error);
-    	    errorsFound = true;
-    	}
-    	
-    	if (errorsFound) {
-    	    return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.NOT_FOUND);
-    	} else if (with != null) {
-    		if (with.equalsIgnoreCase("nestedfull")) {
-    			return new ResponseEntity<String>(result.toJsonWithNestedFull(), headers, HttpStatus.OK);
+
+	@Transactional
+	@RequestMapping(value = "/getSubjectsByContainerInteractions", method = RequestMethod.POST, headers = "Accept=application/json")
+	@ResponseBody
+	public ResponseEntity<java.lang.String> getSubjectsByContainerInteractions(@RequestBody String json,
+			@RequestParam(value = "with", required = false) String with) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		try {
+			Collection<ContainerSubjectsDTO> requests = ContainerSubjectsDTO.fromJsonArrayToCoes(json);
+			Collection<ContainerSubjectsDTO> results = subjectService.getSubjectsByContainerAndInteraction(requests);
+			if (with != null && with.equalsIgnoreCase("stub")) {
+				return new ResponseEntity<String>(ContainerSubjectsDTO.toJsonArrayStub(results), headers,
+						HttpStatus.OK);
+			}
+			return new ResponseEntity<String>(ContainerSubjectsDTO.toJsonArray(results), headers, HttpStatus.OK);
+		} catch (Exception e) {
+			logger.error("Uncaught error in getSubjectsByCodeNames", e);
+			return new ResponseEntity<String>(e.getMessage(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
+		}
+	}
+
+	@Transactional
+	@RequestMapping(value = "/searchSubjects", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<java.lang.String> searchSubjects(@RequestBody String json,
+			@RequestParam(value = "with", required = false) String with) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		SubjectSearchRequest query = SubjectSearchRequest.fromJsonToSubjectSearchRequest(json);
+		ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
+		boolean errorsFound = false;
+		Collection<Long> subjectIds;
+		SubjectSearchResultDTO result = new SubjectSearchResultDTO();
+		try {
+			subjectIds = subjectService.searchSubjectIdsByQueryDTO(query);
+			int maxResults = 1000;
+			if (query.getMaxResults() != null)
+				maxResults = query.getMaxResults();
+			result.setMaxResults(maxResults);
+			result.setNumberOfResults(subjectIds.size());
+			if (result.getNumberOfResults() <= result.getMaxResults()) {
+				result.setResults(subjectService.getSubjectsByIds(subjectIds));
+			}
+		} catch (Exception e) {
+			logger.error("Caught searching for subjects in generic interaction search", e);
+			ErrorMessage error = new ErrorMessage();
+			error.setErrorLevel("error");
+			error.setMessage(e.getMessage());
+			errors.add(error);
+			errorsFound = true;
+		}
+
+		if (errorsFound) {
+			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.NOT_FOUND);
+		} else if (with != null) {
+			if (with.equalsIgnoreCase("nestedfull")) {
+				return new ResponseEntity<String>(result.toJsonWithNestedFull(), headers, HttpStatus.OK);
 			} else if (with.equalsIgnoreCase("prettyjson")) {
 				return new ResponseEntity<String>(result.toPrettyJson(), headers, HttpStatus.OK);
 			} else if (with.equalsIgnoreCase("nestedstub")) {
@@ -376,46 +392,49 @@ public ResponseEntity<java.lang.String> searchSubjects(@RequestBody String json,
 				return new ResponseEntity<String>(result.toJsonStub(), headers, HttpStatus.OK);
 			}
 		}
-    		return new ResponseEntity<String>(result.toJson(), headers, HttpStatus.OK);
-    }
-    
-    @Transactional
-    @RequestMapping(value = "/searchSubjectsWithContainerCodeArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<java.lang.String> searchSubjectsWithContainerCodeArray(@RequestBody String json, @RequestParam(value = "with", required = false) String with) {
-    	HttpHeaders headers = new HttpHeaders();
-    	headers.add("Content-Type", "application/json; charset=utf-8");
-    	MultiContainerSubjectSearchRequest query = MultiContainerSubjectSearchRequest.fromJsonToMultiContainerSubjectSearchRequest(json);
-    	ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
-    	boolean errorsFound = false;
-    	Map<String, List<Long>> containerSubjectIdMaps;
-    	MultiContainerSubjectSearchResultDTO result = new MultiContainerSubjectSearchResultDTO();
-    	try{
-    		containerSubjectIdMaps = subjectService.searchSubjectIdsByMultiContainerQueryDTO(query);
-    		int maxResults = 1000;
-    		if (query.getMaxResults() != null) maxResults = query.getMaxResults();
-    		result.setMaxResults(maxResults);
-    		int numberOfSubjects = 0;
-    		for (List<Long> idList : containerSubjectIdMaps.values()){
-    			numberOfSubjects += idList.size();
-    		}
-    		result.setNumberOfResults(numberOfSubjects);
-    		if (result.getNumberOfResults() <= result.getMaxResults()){
-    			result.setResults(subjectService.getContainerSubjectsByIds(containerSubjectIdMaps));
-    		}
-    	}catch (Exception e){
-    		logger.error("Caught searching for subjects in multi container generic interaction search",e);
-    		ErrorMessage error = new ErrorMessage();
-    	    error.setErrorLevel("error");
-    	    error.setMessage(e.getMessage());
-    	    errors.add(error);
-    	    errorsFound = true;
-    	}
-    	
-    	if (errorsFound) {
-    	    return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.NOT_FOUND);
-    	} else if (with != null) {
-    		if (with.equalsIgnoreCase("nestedfull")) {
-    			return new ResponseEntity<String>(result.toJsonWithNestedFull(), headers, HttpStatus.OK);
+		return new ResponseEntity<String>(result.toJson(), headers, HttpStatus.OK);
+	}
+
+	@Transactional
+	@RequestMapping(value = "/searchSubjectsWithContainerCodeArray", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<java.lang.String> searchSubjectsWithContainerCodeArray(@RequestBody String json,
+			@RequestParam(value = "with", required = false) String with) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		MultiContainerSubjectSearchRequest query = MultiContainerSubjectSearchRequest
+				.fromJsonToMultiContainerSubjectSearchRequest(json);
+		ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
+		boolean errorsFound = false;
+		Map<String, List<Long>> containerSubjectIdMaps;
+		MultiContainerSubjectSearchResultDTO result = new MultiContainerSubjectSearchResultDTO();
+		try {
+			containerSubjectIdMaps = subjectService.searchSubjectIdsByMultiContainerQueryDTO(query);
+			int maxResults = 1000;
+			if (query.getMaxResults() != null)
+				maxResults = query.getMaxResults();
+			result.setMaxResults(maxResults);
+			int numberOfSubjects = 0;
+			for (List<Long> idList : containerSubjectIdMaps.values()) {
+				numberOfSubjects += idList.size();
+			}
+			result.setNumberOfResults(numberOfSubjects);
+			if (result.getNumberOfResults() <= result.getMaxResults()) {
+				result.setResults(subjectService.getContainerSubjectsByIds(containerSubjectIdMaps));
+			}
+		} catch (Exception e) {
+			logger.error("Caught searching for subjects in multi container generic interaction search", e);
+			ErrorMessage error = new ErrorMessage();
+			error.setErrorLevel("error");
+			error.setMessage(e.getMessage());
+			errors.add(error);
+			errorsFound = true;
+		}
+
+		if (errorsFound) {
+			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.NOT_FOUND);
+		} else if (with != null) {
+			if (with.equalsIgnoreCase("nestedfull")) {
+				return new ResponseEntity<String>(result.toJsonWithNestedFull(), headers, HttpStatus.OK);
 			} else if (with.equalsIgnoreCase("prettyjson")) {
 				return new ResponseEntity<String>(result.toPrettyJson(), headers, HttpStatus.OK);
 			} else if (with.equalsIgnoreCase("nestedstub")) {
@@ -424,55 +443,52 @@ public ResponseEntity<java.lang.String> searchSubjectsWithContainerCodeArray(@Re
 				return new ResponseEntity<String>(result.toJsonStub(), headers, HttpStatus.OK);
 			}
 		}
-    		return new ResponseEntity<String>(result.toJson(), headers, HttpStatus.OK);
-    }
-    
-    @RequestMapping(value = "/setSubjectValues/{idOrCodeName}", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> setSubjectValues(@RequestBody String json, 
-    		@PathVariable("idOrCodeName") String idOrCodeName,
-    		@RequestParam(value = "modifiedBy", required = true) String modifiedBy,
-    		@RequestParam(value = "lsTransaction", required = true) Long lsTransaction){
-    	HttpHeaders headers = new HttpHeaders();
-    	headers.add("Content-Type", "application/json; charset=utf-8");
-    	try{
-    		ValueQueryDTO pathDTO = ValueQueryDTO.fromJsonToValueQueryDTO(json);
-    		
-    		if (pathDTO.getValueType() == null){
-    			return new ResponseEntity<String>("ERROR: Must provide valueType", headers, HttpStatus.BAD_REQUEST);
-    		}
-    		
-    		Subject subject = null;
-	    	if (SimpleUtil.isNumeric(idOrCodeName)){
-	        	subject = Subject.findSubject(Long.valueOf(idOrCodeName));
-	        }else{
-	        	subject = Subject.findSubjectByCodeNameEquals(idOrCodeName);
-	        }
-	        if (subject == null) {
-	            return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-	        }
-    		subjectService.setSubjectValuesByPath(subject, pathDTO, modifiedBy, lsTransaction);
-    		return new ResponseEntity<String>(headers, HttpStatus.OK);
-    	}catch (Exception e){
-    		logger.error("Caught error in setSubjectValues",e);
-    		return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
-    	}
-    }
-    
-    @RequestMapping(value = "/getExperimentCodes", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> getExperimentCodes(@RequestBody String json){
-    	HttpHeaders headers = new HttpHeaders();
-    	headers.add("Content-Type", "application/json; charset=utf-8");
-    	try{
-    		Collection<SubjectCodeDTO> subjectCodeDTOs = SubjectCodeDTO.fromJsonArrayToSubjectCoes(json);
-    		subjectCodeDTOs = subjectService.getExperimentCodes(subjectCodeDTOs);
-    		return new ResponseEntity<String>(SubjectCodeDTO.toJsonArray(subjectCodeDTOs), headers, HttpStatus.OK);
-    	}catch (Exception e){
-    		logger.error("Caught error in getExperimentCodes",e);
-    		return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
-    	}
-    }
-    
-    
+		return new ResponseEntity<String>(result.toJson(), headers, HttpStatus.OK);
+	}
+
+	@RequestMapping(value = "/setSubjectValues/{idOrCodeName}", method = RequestMethod.PUT, headers = "Accept=application/json")
+	public ResponseEntity<String> setSubjectValues(@RequestBody String json,
+			@PathVariable("idOrCodeName") String idOrCodeName,
+			@RequestParam(value = "modifiedBy", required = true) String modifiedBy,
+			@RequestParam(value = "lsTransaction", required = true) Long lsTransaction) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		try {
+			ValueQueryDTO pathDTO = ValueQueryDTO.fromJsonToValueQueryDTO(json);
 
+			if (pathDTO.getValueType() == null) {
+				return new ResponseEntity<String>("ERROR: Must provide valueType", headers, HttpStatus.BAD_REQUEST);
+			}
+
+			Subject subject = null;
+			if (SimpleUtil.isNumeric(idOrCodeName)) {
+				subject = Subject.findSubject(Long.valueOf(idOrCodeName));
+			} else {
+				subject = Subject.findSubjectByCodeNameEquals(idOrCodeName);
+			}
+			if (subject == null) {
+				return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+			}
+			subjectService.setSubjectValuesByPath(subject, pathDTO, modifiedBy, lsTransaction);
+			return new ResponseEntity<String>(headers, HttpStatus.OK);
+		} catch (Exception e) {
+			logger.error("Caught error in setSubjectValues", e);
+			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
+		}
+	}
+
+	@RequestMapping(value = "/getExperimentCodes", method = RequestMethod.POST, headers = "Accept=application/json")
+	public ResponseEntity<String> getExperimentCodes(@RequestBody String json) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		try {
+			Collection<SubjectCodeDTO> subjectCodeDTOs = SubjectCodeDTO.fromJsonArrayToSubjectCoes(json);
+			subjectCodeDTOs = subjectService.getExperimentCodes(subjectCodeDTOs);
+			return new ResponseEntity<String>(SubjectCodeDTO.toJsonArray(subjectCodeDTOs), headers, HttpStatus.OK);
+		} catch (Exception e) {
+			logger.error("Caught error in getExperimentCodes", e);
+			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
+		}
+	}
 
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiSubjectValueController.java b/src/main/java/com/labsynch/labseer/api/ApiSubjectValueController.java
index b2d70ec5a..79f8a5fd5 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiSubjectValueController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiSubjectValueController.java
@@ -23,13 +23,12 @@
 public class ApiSubjectValueController {
 
     private static final Logger logger = LoggerFactory.getLogger(ApiSubjectValueController.class);
-    
+
     @RequestMapping(value = "/updatevalue/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     public ResponseEntity<String> updateSubjectValue(
             @RequestParam("lsType") String lsType,
             @RequestParam("lsValue") String lsValue,
-            @PathVariable("id") Long id
-            ) {
+            @PathVariable("id") Long id) {
         logger.info("in updateSubjectValue");
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -58,15 +57,22 @@ public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
     public ResponseEntity<String> jsonFindSubjectValuesByCodeValueEquals(@RequestParam("codeValue") String codeValue) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(SubjectValue.toJsonArray(SubjectValue.findSubjectValuesByCodeValueEquals(codeValue).getResultList()), headers, HttpStatus.OK);
+        return new ResponseEntity<String>(
+                SubjectValue.toJsonArray(SubjectValue.findSubjectValuesByCodeValueEquals(codeValue).getResultList()),
+                headers, HttpStatus.OK);
     }
 
     @RequestMapping(params = "find=ByIgnoredNotAndCodeValueEquals", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
-    public ResponseEntity<String> jsonFindSubjectValuesByIgnoredNotAndCodeValueEquals(@RequestParam(value = "ignored", required = false) boolean ignored, @RequestParam("codeValue") String codeValue) {
+    public ResponseEntity<String> jsonFindSubjectValuesByIgnoredNotAndCodeValueEquals(
+            @RequestParam(value = "ignored", required = false) boolean ignored,
+            @RequestParam("codeValue") String codeValue) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(SubjectValue.toJsonArray(SubjectValue.findSubjectValuesByIgnoredNotAndCodeValueEquals(ignored, codeValue).getResultList()), headers, HttpStatus.OK);
+        return new ResponseEntity<String>(
+                SubjectValue.toJsonArray(SubjectValue
+                        .findSubjectValuesByIgnoredNotAndCodeValueEquals(ignored, codeValue).getResultList()),
+                headers, HttpStatus.OK);
     }
 
     @RequestMapping(params = "find=ByLsState", method = RequestMethod.GET, headers = "Accept=application/json")
@@ -74,22 +80,32 @@ public ResponseEntity<String> jsonFindSubjectValuesByIgnoredNotAndCodeValueEqual
     public ResponseEntity<String> jsonFindSubjectValuesByLsState(@RequestParam("lsState") SubjectState lsState) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(SubjectValue.toJsonArray(SubjectValue.findSubjectValuesByLsState(lsState).getResultList()), headers, HttpStatus.OK);
+        return new ResponseEntity<String>(
+                SubjectValue.toJsonArray(SubjectValue.findSubjectValuesByLsState(lsState).getResultList()), headers,
+                HttpStatus.OK);
     }
 
     @RequestMapping(params = "find=ByLsTypeEqualsAndLsKindEquals", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
-    public ResponseEntity<String> jsonFindSubjectValuesByLsTypeEqualsAndLsKindEquals(@RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind) {
+    public ResponseEntity<String> jsonFindSubjectValuesByLsTypeEqualsAndLsKindEquals(
+            @RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(SubjectValue.toJsonArray(SubjectValue.findSubjectValuesByLsTypeEqualsAndLsKindEquals(lsType, lsKind).getResultList()), headers, HttpStatus.OK);
+        return new ResponseEntity<String>(
+                SubjectValue.toJsonArray(
+                        SubjectValue.findSubjectValuesByLsTypeEqualsAndLsKindEquals(lsType, lsKind).getResultList()),
+                headers, HttpStatus.OK);
     }
 
-	@RequestMapping(params = "find=ByLsStateAndLsTypeEqualsAndLsKindEquals", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(params = "find=ByLsStateAndLsTypeEqualsAndLsKindEquals", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
-    public ResponseEntity<String> jsonFindSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals(@RequestParam("lsState") SubjectState lsState, @RequestParam("lsType") String lsType, @RequestParam("lsKind") String lsKind) {
+    public ResponseEntity<String> jsonFindSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals(
+            @RequestParam("lsState") SubjectState lsState, @RequestParam("lsType") String lsType,
+            @RequestParam("lsKind") String lsKind) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(SubjectValue.toJsonArray(SubjectValue.findSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals(lsState, lsType, lsKind).getResultList()), headers, HttpStatus.OK);
+        return new ResponseEntity<String>(SubjectValue.toJsonArray(SubjectValue
+                .findSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals(lsState, lsType, lsKind).getResultList()),
+                headers, HttpStatus.OK);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiTreatmentGroupController.java b/src/main/java/com/labsynch/labseer/api/ApiTreatmentGroupController.java
index 3ea5fa169..5e35c4183 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiTreatmentGroupController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiTreatmentGroupController.java
@@ -26,8 +26,8 @@
 @RequestMapping("api/v1/treatmentgroups")
 @Transactional
 public class ApiTreatmentGroupController {
-	
-	private static final Logger logger = LoggerFactory.getLogger(ApiTreatmentGroupController.class);
+
+    private static final Logger logger = LoggerFactory.getLogger(ApiTreatmentGroupController.class);
 
     @Autowired
     private PropertiesUtilService propertiesUtilService;
@@ -58,7 +58,7 @@ public ResponseEntity<java.lang.String> listJson() {
 
     @RequestMapping(method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<java.lang.String> createFromJson(@RequestBody String json) {
-    	TreatmentGroup treatmentGroup = TreatmentGroup.fromJsonToTreatmentGroup(json);
+        TreatmentGroup treatmentGroup = TreatmentGroup.fromJsonToTreatmentGroup(json);
         TreatmentGroup savedTreatmentGroup = treatmentGroupService.saveLsTreatmentGroup(treatmentGroup);
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -67,7 +67,7 @@ public ResponseEntity<java.lang.String> createFromJson(@RequestBody String json)
 
     @RequestMapping(value = "/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<java.lang.String> createFromJsonArray(@RequestBody String json) {
-    	Collection<TreatmentGroup> treatmentGroups = TreatmentGroup.fromJsonArrayToTreatmentGroups(json);
+        Collection<TreatmentGroup> treatmentGroups = TreatmentGroup.fromJsonArrayToTreatmentGroups(json);
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
         Collection<TreatmentGroup> savedTreatmentGroups = new ArrayList<TreatmentGroup>();
@@ -80,7 +80,8 @@ public ResponseEntity<java.lang.String> createFromJsonArray(@RequestBody String
             logger.error("ERROR: " + e);
             return new ResponseEntity<String>(headers, HttpStatus.BAD_REQUEST);
         }
-        return new ResponseEntity<String>(TreatmentGroup.toJsonArray(savedTreatmentGroups), headers, HttpStatus.CREATED);
+        return new ResponseEntity<String>(TreatmentGroup.toJsonArray(savedTreatmentGroups), headers,
+                HttpStatus.CREATED);
     }
 
     @RequestMapping(method = RequestMethod.PUT, headers = "Accept=application/json")
diff --git a/src/main/java/com/labsynch/labseer/api/ApiTypeController.java b/src/main/java/com/labsynch/labseer/api/ApiTypeController.java
index 9951cd3c3..5e67a3a6a 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiTypeController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiTypeController.java
@@ -35,11 +35,9 @@
 
 public class ApiTypeController {
 
-	private static final Logger logger = LoggerFactory.getLogger(ApiTypeController.class);
+    private static final Logger logger = LoggerFactory.getLogger(ApiTypeController.class);
 
-
-
-	@RequestMapping(value = "/ddicttypes/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/ddicttypes/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showDDictTypeJson(@PathVariable("id") Long id) {
         DDictType DDictType_ = DDictType.findDDictType(id);
@@ -51,7 +49,7 @@ public ResponseEntity<String> showDDictTypeJson(@PathVariable("id") Long id) {
         return new ResponseEntity<String>(DDictType_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/ddicttypes", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/ddicttypes", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listDDictTypeJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -60,18 +58,18 @@ public ResponseEntity<String> listDDictTypeJson() {
         return new ResponseEntity<String>(DDictType.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/ddicttypes", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/ddicttypes", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createDDictTypeFromJson(@RequestBody DDictType DDictType_) {
-		DDictType_.persist();
+        DDictType_.persist();
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
         return new ResponseEntity<String>(DDictType_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/ddicttypes/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/ddicttypes/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createDDictTypeFromJsonArray(@RequestBody List<DDictType> dDictTypes) {
-		Collection<DDictType> newDDictTypes = new ArrayList<DDictType>();
-        for (DDictType DDictType_: dDictTypes) {
+        Collection<DDictType> newDDictTypes = new ArrayList<DDictType>();
+        for (DDictType DDictType_ : dDictTypes) {
             DDictType_.persist();
             newDDictTypes.add(DDictType_);
         }
@@ -80,7 +78,7 @@ public ResponseEntity<String> createDDictTypeFromJsonArray(@RequestBody List<DDi
         return new ResponseEntity<String>(DDictType.toJsonArray(newDDictTypes), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/ddicttypes/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/ddicttypes/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateDDictTypeFromJson(@RequestBody DDictType DDictType_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -90,12 +88,12 @@ public ResponseEntity<String> updateDDictTypeFromJson(@RequestBody DDictType DDi
         return new ResponseEntity<String>(DDictType_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/ddicttypes/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/ddicttypes/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateDDictTypeFromJsonArray(@RequestBody List<DDictType> dDictTypes) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<DDictType> newDDictTypes = new ArrayList<DDictType>();
-        for (DDictType DDictType_: dDictTypes) {
+        Collection<DDictType> newDDictTypes = new ArrayList<DDictType>();
+        for (DDictType DDictType_ : dDictTypes) {
             if (DDictType_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -104,7 +102,7 @@ public ResponseEntity<String> updateDDictTypeFromJsonArray(@RequestBody List<DDi
         return new ResponseEntity<String>(DDictType.toJsonArray(newDDictTypes), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/ddicttypes/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/ddicttypes/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteDDictTypeFromJson(@PathVariable("id") Long id) {
         DDictType DDictType_ = DDictType.findDDictType(id);
         HttpHeaders headers = new HttpHeaders();
@@ -115,8 +113,8 @@ public ResponseEntity<String> deleteDDictTypeFromJson(@PathVariable("id") Long i
         DDictType_.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-	
-	@RequestMapping(value = "/containertypes/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/containertypes/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showContainerTypeJson(@PathVariable("id") Long id) {
         ContainerType ContainerType_ = ContainerType.findContainerType(id);
@@ -128,7 +126,7 @@ public ResponseEntity<String> showContainerTypeJson(@PathVariable("id") Long id)
         return new ResponseEntity<String>(ContainerType_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/containertypes", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/containertypes", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listContainerTypeJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -137,7 +135,7 @@ public ResponseEntity<String> listContainerTypeJson() {
         return new ResponseEntity<String>(ContainerType.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/containertypes", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/containertypes", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createContainerTypeFromJson(@RequestBody ContainerType ContainerType_) {
         ContainerType_.persist();
         HttpHeaders headers = new HttpHeaders();
@@ -145,10 +143,10 @@ public ResponseEntity<String> createContainerTypeFromJson(@RequestBody Container
         return new ResponseEntity<String>(ContainerType_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/containertypes/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/containertypes/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createContainerTypeFromJsonArray(@RequestBody List<ContainerType> containerTypes) {
-		Collection<ContainerType> newContainerTypes = new ArrayList<ContainerType>();
-        for (ContainerType ContainerType_: containerTypes) {
+        Collection<ContainerType> newContainerTypes = new ArrayList<ContainerType>();
+        for (ContainerType ContainerType_ : containerTypes) {
             ContainerType_.persist();
             newContainerTypes.add(ContainerType_);
         }
@@ -157,7 +155,7 @@ public ResponseEntity<String> createContainerTypeFromJsonArray(@RequestBody List
         return new ResponseEntity<String>(ContainerType.toJsonArray(newContainerTypes), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/containertypes/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/containertypes/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateContainerTypeFromJson(@RequestBody ContainerType ContainerType_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -167,12 +165,12 @@ public ResponseEntity<String> updateContainerTypeFromJson(@RequestBody Container
         return new ResponseEntity<String>(ContainerType_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/containertypes/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/containertypes/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateContainerTypeFromJsonArray(@RequestBody List<ContainerType> containerTypes) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<ContainerType> newContainerTypes = new ArrayList<ContainerType>();
-        for (ContainerType ContainerType_: containerTypes) {
+        Collection<ContainerType> newContainerTypes = new ArrayList<ContainerType>();
+        for (ContainerType ContainerType_ : containerTypes) {
             if (ContainerType_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -181,7 +179,7 @@ public ResponseEntity<String> updateContainerTypeFromJsonArray(@RequestBody List
         return new ResponseEntity<String>(ContainerType.toJsonArray(newContainerTypes), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/containertypes/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/containertypes/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteContainerTypeFromJson(@PathVariable("id") Long id) {
         ContainerType ContainerType_ = ContainerType.findContainerType(id);
         HttpHeaders headers = new HttpHeaders();
@@ -192,8 +190,8 @@ public ResponseEntity<String> deleteContainerTypeFromJson(@PathVariable("id") Lo
         ContainerType_.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-	
-	@RequestMapping(value = "/experimenttypes/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/experimenttypes/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showExperimentTypeJson(@PathVariable("id") Long id) {
         ExperimentType ExperimentType_ = ExperimentType.findExperimentType(id);
@@ -205,7 +203,7 @@ public ResponseEntity<String> showExperimentTypeJson(@PathVariable("id") Long id
         return new ResponseEntity<String>(ExperimentType_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/experimenttypes", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/experimenttypes", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listExperimentTypeJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -214,7 +212,7 @@ public ResponseEntity<String> listExperimentTypeJson() {
         return new ResponseEntity<String>(ExperimentType.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/experimenttypes", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/experimenttypes", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createExperimentTypeFromJson(@RequestBody ExperimentType ExperimentType_) {
         ExperimentType_.persist();
         HttpHeaders headers = new HttpHeaders();
@@ -222,10 +220,10 @@ public ResponseEntity<String> createExperimentTypeFromJson(@RequestBody Experime
         return new ResponseEntity<String>(ExperimentType_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/experimenttypes/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/experimenttypes/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createExperimentTypeFromJsonArray(@RequestBody List<ExperimentType> experimentTypes) {
-		Collection<ExperimentType> newExperimentTypes = new ArrayList<ExperimentType>();
-        for (ExperimentType ExperimentType_: experimentTypes) {
+        Collection<ExperimentType> newExperimentTypes = new ArrayList<ExperimentType>();
+        for (ExperimentType ExperimentType_ : experimentTypes) {
             ExperimentType_.persist();
             newExperimentTypes.add(ExperimentType_);
         }
@@ -234,7 +232,7 @@ public ResponseEntity<String> createExperimentTypeFromJsonArray(@RequestBody Lis
         return new ResponseEntity<String>(ExperimentType.toJsonArray(newExperimentTypes), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/experimenttypes/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/experimenttypes/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateExperimentTypeFromJson(@RequestBody ExperimentType ExperimentType_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -244,12 +242,12 @@ public ResponseEntity<String> updateExperimentTypeFromJson(@RequestBody Experime
         return new ResponseEntity<String>(ExperimentType_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/experimenttypes/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/experimenttypes/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateExperimentTypeFromJsonArray(@RequestBody List<ExperimentType> experimentTypes) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<ExperimentType> newExperimentTypes = new ArrayList<ExperimentType>();
-        for (ExperimentType ExperimentType_: experimentTypes) {
+        Collection<ExperimentType> newExperimentTypes = new ArrayList<ExperimentType>();
+        for (ExperimentType ExperimentType_ : experimentTypes) {
             if (ExperimentType_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -258,7 +256,7 @@ public ResponseEntity<String> updateExperimentTypeFromJsonArray(@RequestBody Lis
         return new ResponseEntity<String>(ExperimentType.toJsonArray(newExperimentTypes), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/experimenttypes/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/experimenttypes/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteExperimentTypeFromJson(@PathVariable("id") Long id) {
         ExperimentType ExperimentType_ = ExperimentType.findExperimentType(id);
         HttpHeaders headers = new HttpHeaders();
@@ -269,8 +267,8 @@ public ResponseEntity<String> deleteExperimentTypeFromJson(@PathVariable("id") L
         ExperimentType_.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-	
-	@RequestMapping(value = "/labeltypes/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/labeltypes/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showLabelTypeJson(@PathVariable("id") Long id) {
         LabelType LabelType_ = LabelType.findLabelType(id);
@@ -282,7 +280,7 @@ public ResponseEntity<String> showLabelTypeJson(@PathVariable("id") Long id) {
         return new ResponseEntity<String>(LabelType_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/labeltypes", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/labeltypes", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listLabelTypeJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -291,7 +289,7 @@ public ResponseEntity<String> listLabelTypeJson() {
         return new ResponseEntity<String>(LabelType.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/labeltypes", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/labeltypes", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createLabelTypeFromJson(@RequestBody LabelType LabelType_) {
         LabelType_.persist();
         HttpHeaders headers = new HttpHeaders();
@@ -299,10 +297,10 @@ public ResponseEntity<String> createLabelTypeFromJson(@RequestBody LabelType Lab
         return new ResponseEntity<String>(LabelType_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/labeltypes/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/labeltypes/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createLabelTypeFromJsonArray(@RequestBody List<LabelType> labelTypes) {
-		Collection<LabelType> newLabelTypes = new ArrayList<LabelType>();
-        for (LabelType LabelType_: labelTypes) {
+        Collection<LabelType> newLabelTypes = new ArrayList<LabelType>();
+        for (LabelType LabelType_ : labelTypes) {
             LabelType_.persist();
             newLabelTypes.add(LabelType_);
         }
@@ -311,7 +309,7 @@ public ResponseEntity<String> createLabelTypeFromJsonArray(@RequestBody List<Lab
         return new ResponseEntity<String>(LabelType.toJsonArray(newLabelTypes), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/labeltypes/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/labeltypes/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateLabelTypeFromJson(@RequestBody LabelType LabelType_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -321,12 +319,12 @@ public ResponseEntity<String> updateLabelTypeFromJson(@RequestBody LabelType Lab
         return new ResponseEntity<String>(LabelType_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/labeltypes/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/labeltypes/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateLabelTypeFromJsonArray(@RequestBody List<LabelType> labelTypes) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<LabelType> newLabelTypes = new ArrayList<LabelType>();
-        for (LabelType LabelType_: labelTypes) {
+        Collection<LabelType> newLabelTypes = new ArrayList<LabelType>();
+        for (LabelType LabelType_ : labelTypes) {
             if (LabelType_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -335,7 +333,7 @@ public ResponseEntity<String> updateLabelTypeFromJsonArray(@RequestBody List<Lab
         return new ResponseEntity<String>(LabelType.toJsonArray(newLabelTypes), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/labeltypes/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/labeltypes/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteLabelTypeFromJson(@PathVariable("id") Long id) {
         LabelType LabelType_ = LabelType.findLabelType(id);
         HttpHeaders headers = new HttpHeaders();
@@ -346,8 +344,8 @@ public ResponseEntity<String> deleteLabelTypeFromJson(@PathVariable("id") Long i
         LabelType_.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-	
-	@RequestMapping(value = "/operatortypes/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/operatortypes/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showOperatorTypeJson(@PathVariable("id") Long id) {
         OperatorType OperatorType_ = OperatorType.findOperatorType(id);
@@ -359,7 +357,7 @@ public ResponseEntity<String> showOperatorTypeJson(@PathVariable("id") Long id)
         return new ResponseEntity<String>(OperatorType_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/operatortypes", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/operatortypes", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listOperatorTypeJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -368,7 +366,7 @@ public ResponseEntity<String> listOperatorTypeJson() {
         return new ResponseEntity<String>(OperatorType.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/operatortypes", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/operatortypes", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createOperatorTypeFromJson(@RequestBody OperatorType OperatorType_) {
         OperatorType_.persist();
         HttpHeaders headers = new HttpHeaders();
@@ -376,10 +374,10 @@ public ResponseEntity<String> createOperatorTypeFromJson(@RequestBody OperatorTy
         return new ResponseEntity<String>(OperatorType_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/operatortypes/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/operatortypes/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createOperatorTypeFromJsonArray(@RequestBody List<OperatorType> operatorTypes) {
-		Collection<OperatorType> newOperatorTypes = new ArrayList<OperatorType>();
-        for (OperatorType OperatorType_: operatorTypes) {
+        Collection<OperatorType> newOperatorTypes = new ArrayList<OperatorType>();
+        for (OperatorType OperatorType_ : operatorTypes) {
             OperatorType_.persist();
             newOperatorTypes.add(OperatorType_);
         }
@@ -388,7 +386,7 @@ public ResponseEntity<String> createOperatorTypeFromJsonArray(@RequestBody List<
         return new ResponseEntity<String>(OperatorType.toJsonArray(newOperatorTypes), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/operatortypes/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/operatortypes/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateOperatorTypeFromJson(@RequestBody OperatorType OperatorType_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -398,12 +396,12 @@ public ResponseEntity<String> updateOperatorTypeFromJson(@RequestBody OperatorTy
         return new ResponseEntity<String>(OperatorType_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/operatortypes/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/operatortypes/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateOperatorTypeFromJsonArray(@RequestBody List<OperatorType> operatorTypes) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<OperatorType> newOperatorTypes = new ArrayList<OperatorType>();
-        for (OperatorType OperatorType_: operatorTypes) {
+        Collection<OperatorType> newOperatorTypes = new ArrayList<OperatorType>();
+        for (OperatorType OperatorType_ : operatorTypes) {
             if (OperatorType_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -412,7 +410,7 @@ public ResponseEntity<String> updateOperatorTypeFromJsonArray(@RequestBody List<
         return new ResponseEntity<String>(OperatorType.toJsonArray(newOperatorTypes), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/operatortypes/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/operatortypes/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteOperatorTypeFromJson(@PathVariable("id") Long id) {
         OperatorType OperatorType_ = OperatorType.findOperatorType(id);
         HttpHeaders headers = new HttpHeaders();
@@ -423,8 +421,8 @@ public ResponseEntity<String> deleteOperatorTypeFromJson(@PathVariable("id") Lon
         OperatorType_.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-	
-	@RequestMapping(value = "/protocoltypes/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/protocoltypes/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showProtocolTypeJson(@PathVariable("id") Long id) {
         ProtocolType ProtocolType_ = ProtocolType.findProtocolType(id);
@@ -436,7 +434,7 @@ public ResponseEntity<String> showProtocolTypeJson(@PathVariable("id") Long id)
         return new ResponseEntity<String>(ProtocolType_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/protocoltypes", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/protocoltypes", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listProtocolTypeJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -445,7 +443,7 @@ public ResponseEntity<String> listProtocolTypeJson() {
         return new ResponseEntity<String>(ProtocolType.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/protocoltypes", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/protocoltypes", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createProtocolTypeFromJson(@RequestBody ProtocolType ProtocolType_) {
         ProtocolType_.persist();
         HttpHeaders headers = new HttpHeaders();
@@ -453,10 +451,10 @@ public ResponseEntity<String> createProtocolTypeFromJson(@RequestBody ProtocolTy
         return new ResponseEntity<String>(ProtocolType_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/protocoltypes/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/protocoltypes/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createProtocolTypeFromJsonArray(@RequestBody List<ProtocolType> protocolTypes) {
-		Collection<ProtocolType> newProtocolTypes = new ArrayList<ProtocolType>();
-        for (ProtocolType ProtocolType_: protocolTypes) {
+        Collection<ProtocolType> newProtocolTypes = new ArrayList<ProtocolType>();
+        for (ProtocolType ProtocolType_ : protocolTypes) {
             ProtocolType_.persist();
             newProtocolTypes.add(ProtocolType_);
         }
@@ -465,7 +463,7 @@ public ResponseEntity<String> createProtocolTypeFromJsonArray(@RequestBody List<
         return new ResponseEntity<String>(ProtocolType.toJsonArray(newProtocolTypes), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/protocoltypes/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/protocoltypes/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateProtocolTypeFromJson(@RequestBody ProtocolType ProtocolType_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -475,12 +473,12 @@ public ResponseEntity<String> updateProtocolTypeFromJson(@RequestBody ProtocolTy
         return new ResponseEntity<String>(ProtocolType_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/protocoltypes/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/protocoltypes/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateProtocolTypeFromJsonArray(@RequestBody List<ProtocolType> protocolTypes) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<ProtocolType> newProtocolTypes = new ArrayList<ProtocolType>();
-        for (ProtocolType ProtocolType_: protocolTypes) {
+        Collection<ProtocolType> newProtocolTypes = new ArrayList<ProtocolType>();
+        for (ProtocolType ProtocolType_ : protocolTypes) {
             if (ProtocolType_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -489,7 +487,7 @@ public ResponseEntity<String> updateProtocolTypeFromJsonArray(@RequestBody List<
         return new ResponseEntity<String>(ProtocolType.toJsonArray(newProtocolTypes), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/protocoltypes/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/protocoltypes/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteProtocolTypeFromJson(@PathVariable("id") Long id) {
         ProtocolType ProtocolType_ = ProtocolType.findProtocolType(id);
         HttpHeaders headers = new HttpHeaders();
@@ -500,8 +498,8 @@ public ResponseEntity<String> deleteProtocolTypeFromJson(@PathVariable("id") Lon
         ProtocolType_.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-	
-	@RequestMapping(value = "/statetypes/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/statetypes/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showStateTypeJson(@PathVariable("id") Long id) {
         StateType StateType_ = StateType.findStateType(id);
@@ -513,7 +511,7 @@ public ResponseEntity<String> showStateTypeJson(@PathVariable("id") Long id) {
         return new ResponseEntity<String>(StateType_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/statetypes", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/statetypes", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listStateTypeJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -522,7 +520,7 @@ public ResponseEntity<String> listStateTypeJson() {
         return new ResponseEntity<String>(StateType.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/statetypes", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/statetypes", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createStateTypeFromJson(@RequestBody StateType StateType_) {
         StateType_.persist();
         HttpHeaders headers = new HttpHeaders();
@@ -530,10 +528,10 @@ public ResponseEntity<String> createStateTypeFromJson(@RequestBody StateType Sta
         return new ResponseEntity<String>(StateType_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/statetypes/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/statetypes/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createStateTypeFromJsonArray(@RequestBody List<StateType> stateTypes) {
-		Collection<StateType> newStateTypes = new ArrayList<StateType>();
-        for (StateType StateType_: stateTypes) {
+        Collection<StateType> newStateTypes = new ArrayList<StateType>();
+        for (StateType StateType_ : stateTypes) {
             StateType_.persist();
             newStateTypes.add(StateType_);
         }
@@ -542,7 +540,7 @@ public ResponseEntity<String> createStateTypeFromJsonArray(@RequestBody List<Sta
         return new ResponseEntity<String>(StateType.toJsonArray(newStateTypes), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/statetypes/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/statetypes/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateStateTypeFromJson(@RequestBody StateType StateType_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -552,12 +550,12 @@ public ResponseEntity<String> updateStateTypeFromJson(@RequestBody StateType Sta
         return new ResponseEntity<String>(StateType_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/statetypes/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/statetypes/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateStateTypeFromJsonArray(@RequestBody List<StateType> stateTypes) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<StateType> newStateTypes = new ArrayList<StateType>();
-        for (StateType StateType_: stateTypes) {
+        Collection<StateType> newStateTypes = new ArrayList<StateType>();
+        for (StateType StateType_ : stateTypes) {
             if (StateType_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -566,7 +564,7 @@ public ResponseEntity<String> updateStateTypeFromJsonArray(@RequestBody List<Sta
         return new ResponseEntity<String>(StateType.toJsonArray(newStateTypes), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/statetypes/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/statetypes/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteStateTypeFromJson(@PathVariable("id") Long id) {
         StateType StateType_ = StateType.findStateType(id);
         HttpHeaders headers = new HttpHeaders();
@@ -577,8 +575,8 @@ public ResponseEntity<String> deleteStateTypeFromJson(@PathVariable("id") Long i
         StateType_.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-	
-	@RequestMapping(value = "/thingtypes/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/thingtypes/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showThingTypeJson(@PathVariable("id") Long id) {
         ThingType ThingType_ = ThingType.findThingType(id);
@@ -590,7 +588,7 @@ public ResponseEntity<String> showThingTypeJson(@PathVariable("id") Long id) {
         return new ResponseEntity<String>(ThingType_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/thingtypes", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/thingtypes", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listThingTypeJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -599,7 +597,7 @@ public ResponseEntity<String> listThingTypeJson() {
         return new ResponseEntity<String>(ThingType.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/thingtypes", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/thingtypes", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createThingTypeFromJson(@RequestBody ThingType ThingType_) {
         ThingType_.persist();
         HttpHeaders headers = new HttpHeaders();
@@ -607,10 +605,10 @@ public ResponseEntity<String> createThingTypeFromJson(@RequestBody ThingType Thi
         return new ResponseEntity<String>(ThingType_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/thingtypes/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/thingtypes/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createThingTypeFromJsonArray(@RequestBody List<ThingType> thingTypes) {
-		Collection<ThingType> newThingTypes = new ArrayList<ThingType>();
-        for (ThingType ThingType_: thingTypes) {
+        Collection<ThingType> newThingTypes = new ArrayList<ThingType>();
+        for (ThingType ThingType_ : thingTypes) {
             ThingType_.persist();
             newThingTypes.add(ThingType_);
         }
@@ -619,7 +617,7 @@ public ResponseEntity<String> createThingTypeFromJsonArray(@RequestBody List<Thi
         return new ResponseEntity<String>(ThingType.toJsonArray(newThingTypes), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/thingtypes/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/thingtypes/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateThingTypeFromJson(@RequestBody ThingType ThingType_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -629,12 +627,12 @@ public ResponseEntity<String> updateThingTypeFromJson(@RequestBody ThingType Thi
         return new ResponseEntity<String>(ThingType_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/thingtypes/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/thingtypes/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateThingTypeFromJsonArray(@RequestBody List<ThingType> thingTypes) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<ThingType> newThingTypes = new ArrayList<ThingType>();
-        for (ThingType ThingType_: thingTypes) {
+        Collection<ThingType> newThingTypes = new ArrayList<ThingType>();
+        for (ThingType ThingType_ : thingTypes) {
             if (ThingType_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -643,7 +641,7 @@ public ResponseEntity<String> updateThingTypeFromJsonArray(@RequestBody List<Thi
         return new ResponseEntity<String>(ThingType.toJsonArray(newThingTypes), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/thingtypes/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/thingtypes/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteThingTypeFromJson(@PathVariable("id") Long id) {
         ThingType ThingType_ = ThingType.findThingType(id);
         HttpHeaders headers = new HttpHeaders();
@@ -654,8 +652,8 @@ public ResponseEntity<String> deleteThingTypeFromJson(@PathVariable("id") Long i
         ThingType_.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-	
-	@RequestMapping(value = "/unittypes/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/unittypes/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showUnitTypeJson(@PathVariable("id") Long id) {
         UnitType UnitType_ = UnitType.findUnitType(id);
@@ -667,7 +665,7 @@ public ResponseEntity<String> showUnitTypeJson(@PathVariable("id") Long id) {
         return new ResponseEntity<String>(UnitType_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/unittypes", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/unittypes", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listUnitTypeJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -676,7 +674,7 @@ public ResponseEntity<String> listUnitTypeJson() {
         return new ResponseEntity<String>(UnitType.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/unittypes", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/unittypes", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createUnitTypeFromJson(@RequestBody UnitType UnitType_) {
         UnitType_.persist();
         HttpHeaders headers = new HttpHeaders();
@@ -684,10 +682,10 @@ public ResponseEntity<String> createUnitTypeFromJson(@RequestBody UnitType UnitT
         return new ResponseEntity<String>(UnitType_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/unittypes/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/unittypes/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createUnitTypeFromJsonArray(@RequestBody List<UnitType> unitTypes) {
-		Collection<UnitType> newUnitTypes = new ArrayList<UnitType>();
-        for (UnitType UnitType_: unitTypes) {
+        Collection<UnitType> newUnitTypes = new ArrayList<UnitType>();
+        for (UnitType UnitType_ : unitTypes) {
             UnitType_.persist();
             unitTypes.add(UnitType_);
         }
@@ -696,7 +694,7 @@ public ResponseEntity<String> createUnitTypeFromJsonArray(@RequestBody List<Unit
         return new ResponseEntity<String>(UnitType.toJsonArray(newUnitTypes), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/unittypes/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/unittypes/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateUnitTypeFromJson(@RequestBody UnitType UnitType_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -706,12 +704,12 @@ public ResponseEntity<String> updateUnitTypeFromJson(@RequestBody UnitType UnitT
         return new ResponseEntity<String>(UnitType_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/unittypes/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/unittypes/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateUnitTypeFromJsonArray(@RequestBody List<UnitType> unitTypes) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<UnitType> newUnitTypes = new ArrayList<UnitType>();
-        for (UnitType UnitType_: unitTypes) {
+        Collection<UnitType> newUnitTypes = new ArrayList<UnitType>();
+        for (UnitType UnitType_ : unitTypes) {
             if (UnitType_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -720,7 +718,7 @@ public ResponseEntity<String> updateUnitTypeFromJsonArray(@RequestBody List<Unit
         return new ResponseEntity<String>(UnitType.toJsonArray(newUnitTypes), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/unittypes/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/unittypes/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteUnitTypeFromJson(@PathVariable("id") Long id) {
         UnitType UnitType_ = UnitType.findUnitType(id);
         HttpHeaders headers = new HttpHeaders();
@@ -731,8 +729,8 @@ public ResponseEntity<String> deleteUnitTypeFromJson(@PathVariable("id") Long id
         UnitType_.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-	
-	@RequestMapping(value = "/valuetypes/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/valuetypes/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showValueTypeJson(@PathVariable("id") Long id) {
         ValueType ValueType_ = ValueType.findValueType(id);
@@ -744,7 +742,7 @@ public ResponseEntity<String> showValueTypeJson(@PathVariable("id") Long id) {
         return new ResponseEntity<String>(ValueType_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/valuetypes", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/valuetypes", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listValueTypeJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -753,7 +751,7 @@ public ResponseEntity<String> listValueTypeJson() {
         return new ResponseEntity<String>(ValueType.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/valuetypes", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/valuetypes", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createValueTypeFromJson(@RequestBody ValueType ValueType_) {
         ValueType_.persist();
         HttpHeaders headers = new HttpHeaders();
@@ -761,10 +759,10 @@ public ResponseEntity<String> createValueTypeFromJson(@RequestBody ValueType Val
         return new ResponseEntity<String>(ValueType_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/valuetypes/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/valuetypes/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createValueTypeFromJsonArray(@RequestBody List<ValueType> valueTypes) {
-		Collection<ValueType> newValueTypes = new ArrayList<ValueType>();
-        for (ValueType ValueType_: valueTypes) {
+        Collection<ValueType> newValueTypes = new ArrayList<ValueType>();
+        for (ValueType ValueType_ : valueTypes) {
             ValueType_.persist();
             newValueTypes.add(ValueType_);
         }
@@ -773,7 +771,7 @@ public ResponseEntity<String> createValueTypeFromJsonArray(@RequestBody List<Val
         return new ResponseEntity<String>(ValueType.toJsonArray(newValueTypes), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/valuetypes/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/valuetypes/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateValueTypeFromJson(@RequestBody ValueType ValueType_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -783,12 +781,12 @@ public ResponseEntity<String> updateValueTypeFromJson(@RequestBody ValueType Val
         return new ResponseEntity<String>(ValueType_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/valuetypes/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/valuetypes/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateValueTypeFromJsonArray(@RequestBody List<ValueType> valueTypes) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<ValueType> newValueTypes = new ArrayList<ValueType>();
-        for (ValueType ValueType_: valueTypes) {
+        Collection<ValueType> newValueTypes = new ArrayList<ValueType>();
+        for (ValueType ValueType_ : valueTypes) {
             if (ValueType_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -797,7 +795,7 @@ public ResponseEntity<String> updateValueTypeFromJsonArray(@RequestBody List<Val
         return new ResponseEntity<String>(ValueType.toJsonArray(newValueTypes), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/valuetypes/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/valuetypes/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteValueTypeFromJson(@PathVariable("id") Long id) {
         ValueType ValueType_ = ValueType.findValueType(id);
         HttpHeaders headers = new HttpHeaders();
@@ -808,8 +806,8 @@ public ResponseEntity<String> deleteValueTypeFromJson(@PathVariable("id") Long i
         ValueType_.remove();
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
-	
-	@RequestMapping(value = "/interactiontypes/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+
+    @RequestMapping(value = "/interactiontypes/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showInteractionTypeJson(@PathVariable("id") Long id) {
         InteractionType InteractionType_ = InteractionType.findInteractionType(id);
@@ -821,7 +819,7 @@ public ResponseEntity<String> showInteractionTypeJson(@PathVariable("id") Long i
         return new ResponseEntity<String>(InteractionType_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/interactiontypes", method = RequestMethod.GET, headers = "Accept=application/json")
+    @RequestMapping(value = "/interactiontypes", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> listInteractionTypeJson() {
         HttpHeaders headers = new HttpHeaders();
@@ -830,7 +828,7 @@ public ResponseEntity<String> listInteractionTypeJson() {
         return new ResponseEntity<String>(InteractionType.toJsonArray(result), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/interactiontypes", method = RequestMethod.POST, headers = "Accept=application/json")
+    @RequestMapping(value = "/interactiontypes", method = RequestMethod.POST, headers = "Accept=application/json")
     public ResponseEntity<String> createInteractionTypeFromJson(@RequestBody InteractionType InteractionType_) {
         InteractionType_.persist();
         HttpHeaders headers = new HttpHeaders();
@@ -838,19 +836,21 @@ public ResponseEntity<String> createInteractionTypeFromJson(@RequestBody Interac
         return new ResponseEntity<String>(InteractionType_.toJson(), headers, HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/interactiontypes/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-    public ResponseEntity<String> createInteractionTypeFromJsonArray(@RequestBody List<InteractionType> interactionTypes) {
-		Collection<InteractionType> newInteractionTypes = new ArrayList<InteractionType>();
-        for (InteractionType InteractionType_: interactionTypes) {
+    @RequestMapping(value = "/interactiontypes/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
+    public ResponseEntity<String> createInteractionTypeFromJsonArray(
+            @RequestBody List<InteractionType> interactionTypes) {
+        Collection<InteractionType> newInteractionTypes = new ArrayList<InteractionType>();
+        for (InteractionType InteractionType_ : interactionTypes) {
             InteractionType_.persist();
             interactionTypes.add(InteractionType_);
         }
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-        return new ResponseEntity<String>(InteractionType.toJsonArray(newInteractionTypes), headers, HttpStatus.CREATED);
+        return new ResponseEntity<String>(InteractionType.toJsonArray(newInteractionTypes), headers,
+                HttpStatus.CREATED);
     }
 
-	@RequestMapping(value = "/interactiontypes/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
+    @RequestMapping(value = "/interactiontypes/{id}", method = RequestMethod.PUT, headers = "Accept=application/json")
     public ResponseEntity<String> updateInteractionTypeFromJson(@RequestBody InteractionType InteractionType_) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
@@ -860,12 +860,13 @@ public ResponseEntity<String> updateInteractionTypeFromJson(@RequestBody Interac
         return new ResponseEntity<String>(InteractionType_.toJson(), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/interactiontypes/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
-    public ResponseEntity<String> updateInteractionTypeFromJsonArray(@RequestBody List<InteractionType> interactionTypes) {
+    @RequestMapping(value = "/interactiontypes/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
+    public ResponseEntity<String> updateInteractionTypeFromJsonArray(
+            @RequestBody List<InteractionType> interactionTypes) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/json");
-		Collection<InteractionType> newInteractionTypes = new ArrayList<InteractionType>();
-        for (InteractionType InteractionType_: interactionTypes) {
+        Collection<InteractionType> newInteractionTypes = new ArrayList<InteractionType>();
+        for (InteractionType InteractionType_ : interactionTypes) {
             if (InteractionType_.merge() == null) {
                 return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
             }
@@ -874,7 +875,7 @@ public ResponseEntity<String> updateInteractionTypeFromJsonArray(@RequestBody Li
         return new ResponseEntity<String>(InteractionType.toJsonArray(newInteractionTypes), headers, HttpStatus.OK);
     }
 
-	@RequestMapping(value = "/interactiontypes/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
+    @RequestMapping(value = "/interactiontypes/{id}", method = RequestMethod.DELETE, headers = "Accept=application/json")
     public ResponseEntity<String> deleteInteractionTypeFromJson(@PathVariable("id") Long id) {
         InteractionType InteractionType_ = InteractionType.findInteractionType(id);
         HttpHeaders headers = new HttpHeaders();
diff --git a/src/main/java/com/labsynch/labseer/api/ApiUnitsController.java b/src/main/java/com/labsynch/labseer/api/ApiUnitsController.java
index 39bb98c45..595c1a4eb 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiUnitsController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiUnitsController.java
@@ -14,13 +14,13 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-@RequestMapping(value = {"/api/v1/units"})
+@RequestMapping(value = { "/api/v1/units" })
 @Controller
 public class ApiUnitsController {
-	
-	Logger logger = LoggerFactory.getLogger(ApiUnitsController.class);
 
-	@RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+    Logger logger = LoggerFactory.getLogger(ApiUnitsController.class);
+
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
     @ResponseBody
     public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
         Unit unit = Unit.findUnit(id);
@@ -28,8 +28,8 @@ public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
         headers.add("Content-Type", "application/text; charset=utf-8");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
         headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
+        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+        headers.add("Pragma", "no-cache"); // HTTP 1.0
         headers.setExpires(0); // Expire the cache
         if (unit == null) {
             return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
@@ -44,8 +44,8 @@ public ResponseEntity<String> listJson() {
         headers.add("Content-Type", "application/text; charset=utf-8");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
         headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
+        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+        headers.add("Pragma", "no-cache"); // HTTP 1.0
         headers.setExpires(0); // Expire the cache
         return new ResponseEntity<String>(Unit.toJsonArray(Unit.findAllUnits()), headers, HttpStatus.OK);
     }
@@ -118,8 +118,8 @@ public ResponseEntity<String> getIsotopeOptions() {
         headers.add("Content-Type", "application/text");
         headers.add("Access-Control-Allow-Headers", "Content-Type");
         headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-        headers.add("Pragma", "no-cache"); //HTTP 1.0
+        headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+        headers.add("Pragma", "no-cache"); // HTTP 1.0
         headers.setExpires(0); // Expire the cache
         return new ResponseEntity<String>(headers, HttpStatus.OK);
     }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiValueController.java b/src/main/java/com/labsynch/labseer/api/ApiValueController.java
index e2fdd8e1d..d9176fd50 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiValueController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiValueController.java
@@ -52,28 +52,28 @@
 public class ApiValueController {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiValueController.class);
-	
+
 	@Autowired
 	private ProtocolValueService protocolValueService;
-	
+
 	@Autowired
 	private ExperimentService experimentService;
-	
+
 	@Autowired
 	private ExperimentStateService experimentStateService;
-	
+
 	@Autowired
 	private ExperimentValueService experimentValueService;
 
 	@Autowired
 	private AnalysisGroupService analysisGroupService;
-	
+
 	@Autowired
 	private ExperimentStateService analysisGroupStateService;
-	
+
 	@Autowired
 	private AnalysisGroupValueService analysisGroupValueService;
-	
+
 	@Autowired
 	private ExperimentStateService treatmentGroupStateService;
 
@@ -82,22 +82,22 @@ public class ApiValueController {
 
 	@Autowired
 	private ExperimentStateService subjectStateService;
-	
+
 	@Autowired
 	private SubjectValueService subjectValueService;
-	
+
 	@Autowired
 	private LsThingValueService lsThingValueService;
-	
+
 	@Autowired
 	private ContainerValueService containerValueService;
 
-	//special path
-	
+	// special path
+
 	@RequestMapping(value = "values/{entity}/{idOrCodeName}/bystate/{stateType}/{stateKind}/byvalue/{valueType}/{valueKind}/", method = RequestMethod.PUT, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> putValueByPath (
+	public ResponseEntity<String> putValueByPath(
 			@PathVariable("entity") String entity,
 			@PathVariable("idOrCodeName") String idOrCodeName,
 			@PathVariable("stateType") String stateType,
@@ -108,123 +108,148 @@ public ResponseEntity<String> putValueByPath (
 
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		//this if/else if block controls which lsThing is being hit
+		// this if/else if block controls which lsThing is being hit
 		logger.debug("ENTITY IS: " + entity);
 		if (entity.equals("protocol")) {
-			ProtocolValue protocolValue = protocolValueService.updateProtocolValue(idOrCodeName, stateType, stateKind, valueType, valueKind, value);
+			ProtocolValue protocolValue = protocolValueService.updateProtocolValue(idOrCodeName, stateType, stateKind,
+					valueType, valueKind, value);
 			return new ResponseEntity<String>(protocolValue.toJson(), headers, HttpStatus.OK);
 		}
 		if (entity.equals("experiment")) {
-			ExperimentValue experimentValue = experimentValueService.updateExperimentValue(idOrCodeName, stateType, stateKind, valueType, valueKind, value);
+			ExperimentValue experimentValue = experimentValueService.updateExperimentValue(idOrCodeName, stateType,
+					stateKind, valueType, valueKind, value);
 			return new ResponseEntity<String>(experimentValue.toJson(), headers, HttpStatus.OK);
 		}
 		if (entity.equals("analysisGroup")) {
-			AnalysisGroupValue analysisGroupValue = analysisGroupValueService.updateAnalysisGroupValue(idOrCodeName, stateType, stateKind, valueType, valueKind, value);
+			AnalysisGroupValue analysisGroupValue = analysisGroupValueService.updateAnalysisGroupValue(idOrCodeName,
+					stateType, stateKind, valueType, valueKind, value);
 			return new ResponseEntity<String>(analysisGroupValue.toJson(), headers, HttpStatus.OK);
 		}
 		if (entity.equals("treatmentGroup")) {
-			TreatmentGroupValue treatmentGroupValue = treatmentGroupValueService.updateTreatmentGroupValue(idOrCodeName, stateType, stateKind, valueType, valueKind, value);
+			TreatmentGroupValue treatmentGroupValue = treatmentGroupValueService.updateTreatmentGroupValue(idOrCodeName,
+					stateType, stateKind, valueType, valueKind, value);
 			return new ResponseEntity<String>(treatmentGroupValue.toJson(), headers, HttpStatus.OK);
 		}
 		if (entity.equals("subject")) {
-			SubjectValue subjectValue = subjectValueService.updateSubjectValue(idOrCodeName, stateType, stateKind, valueType, valueKind, value);
+			SubjectValue subjectValue = subjectValueService.updateSubjectValue(idOrCodeName, stateType, stateKind,
+					valueType, valueKind, value);
 			return new ResponseEntity<String>(subjectValue.toJson(), headers, HttpStatus.OK);
 		}
 		if (entity.equals("lsThing")) {
-			LsThingValue lsThingValue = lsThingValueService.updateLsThingValue(idOrCodeName, stateType, stateKind, valueType, valueKind, value);
+			LsThingValue lsThingValue = lsThingValueService.updateLsThingValue(idOrCodeName, stateType, stateKind,
+					valueType, valueKind, value);
 			return new ResponseEntity<String>(lsThingValue.toJson(), headers, HttpStatus.OK);
 		}
 		if (entity.equals("container")) {
-			ContainerValue containerValue = containerValueService.updateContainerValue(idOrCodeName, stateType, stateKind, valueType, valueKind, value);
+			ContainerValue containerValue = containerValueService.updateContainerValue(idOrCodeName, stateType,
+					stateKind, valueType, valueKind, value);
 			return new ResponseEntity<String>(containerValue.toJson(), headers, HttpStatus.OK);
 		}
-		
+
 		return new ResponseEntity<String>("INVALID ENTITY", headers, HttpStatus.BAD_REQUEST);
 	}
-	
+
 	@RequestMapping(value = "/values/{entity}/jsonArray/bystate/{stateType}/{stateKind}/byvalue/{valueType}/{valueKind}/", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> getValueByPathWithCodeNameArray (
+	public ResponseEntity<String> getValueByPathWithCodeNameArray(
 			@PathVariable("entity") String entity,
 			@RequestBody Collection<String> codeNames,
 			@PathVariable("stateType") String stateType,
 			@PathVariable("stateKind") String stateKind,
 			@PathVariable("valueType") String valueType,
 			@PathVariable("valueKind") String valueKind) {
-		
+
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		//this if/else if block controls which lsThing is being hit
+		// this if/else if block controls which lsThing is being hit
 		logger.debug("ENTITY IS: " + entity);
 		if (entity.equals("protocol")) {
 			Collection<CodeNameValueDTO> values = new ArrayList<CodeNameValueDTO>();
-			for (String codeName : codeNames){
-				ProtocolValue protocolValue = protocolValueService.getProtocolValue(codeName, stateType, stateKind, valueType, valueKind);
+			for (String codeName : codeNames) {
+				ProtocolValue protocolValue = protocolValueService.getProtocolValue(codeName, stateType, stateKind,
+						valueType, valueKind);
 				CodeNameValueDTO valueDTO = new CodeNameValueDTO(codeName, protocolValue);
 				values.add(valueDTO);
 			}
-			if (values.isEmpty()) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-			else return new ResponseEntity<String>(CodeNameValueDTO.toJsonArray(values), headers, HttpStatus.OK);
+			if (values.isEmpty())
+				return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+			else
+				return new ResponseEntity<String>(CodeNameValueDTO.toJsonArray(values), headers, HttpStatus.OK);
 		}
 		if (entity.equals("experiment")) {
 			Collection<CodeNameValueDTO> values = new ArrayList<CodeNameValueDTO>();
-			for (String codeName : codeNames){
-				ExperimentValue experimentValue = experimentValueService.getExperimentValue(codeName, stateType, stateKind, valueType, valueKind);
+			for (String codeName : codeNames) {
+				ExperimentValue experimentValue = experimentValueService.getExperimentValue(codeName, stateType,
+						stateKind, valueType, valueKind);
 				CodeNameValueDTO valueDTO = new CodeNameValueDTO(codeName, experimentValue);
 				values.add(valueDTO);
 			}
-			if (values.isEmpty()) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-			else return new ResponseEntity<String>(CodeNameValueDTO.toJsonArray(values), headers, HttpStatus.OK);
+			if (values.isEmpty())
+				return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+			else
+				return new ResponseEntity<String>(CodeNameValueDTO.toJsonArray(values), headers, HttpStatus.OK);
 		}
 		if (entity.equals("analysisGroup")) {
 			Collection<CodeNameValueDTO> values = new ArrayList<CodeNameValueDTO>();
-			for (String codeName : codeNames){
-				AnalysisGroupValue analysisGroupValue = analysisGroupValueService.getAnalysisGroupValue(codeName, stateType, stateKind, valueType, valueKind);
+			for (String codeName : codeNames) {
+				AnalysisGroupValue analysisGroupValue = analysisGroupValueService.getAnalysisGroupValue(codeName,
+						stateType, stateKind, valueType, valueKind);
 				CodeNameValueDTO valueDTO = new CodeNameValueDTO(codeName, analysisGroupValue);
 				values.add(valueDTO);
 			}
-			if (values.isEmpty()) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-			else return new ResponseEntity<String>(CodeNameValueDTO.toJsonArray(values), headers, HttpStatus.OK);
+			if (values.isEmpty())
+				return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+			else
+				return new ResponseEntity<String>(CodeNameValueDTO.toJsonArray(values), headers, HttpStatus.OK);
 		}
 		if (entity.equals("treatmentGroup")) {
 			Collection<CodeNameValueDTO> values = new ArrayList<CodeNameValueDTO>();
-			for (String codeName : codeNames){
-				TreatmentGroupValue treatmentGroupValue = treatmentGroupValueService.getTreatmentGroupValue(codeName, stateType, stateKind, valueType, valueKind);
+			for (String codeName : codeNames) {
+				TreatmentGroupValue treatmentGroupValue = treatmentGroupValueService.getTreatmentGroupValue(codeName,
+						stateType, stateKind, valueType, valueKind);
 				CodeNameValueDTO valueDTO = new CodeNameValueDTO(codeName, treatmentGroupValue);
 				values.add(valueDTO);
 			}
-			if (values.isEmpty()) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-			else return new ResponseEntity<String>(CodeNameValueDTO.toJsonArray(values), headers, HttpStatus.OK);
+			if (values.isEmpty())
+				return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+			else
+				return new ResponseEntity<String>(CodeNameValueDTO.toJsonArray(values), headers, HttpStatus.OK);
 		}
 		if (entity.equals("subject")) {
 			Collection<CodeNameValueDTO> values = new ArrayList<CodeNameValueDTO>();
-			for (String codeName : codeNames){
-				SubjectValue subjectValue = subjectValueService.getSubjectValue(codeName, stateType, stateKind, valueType, valueKind);
+			for (String codeName : codeNames) {
+				SubjectValue subjectValue = subjectValueService.getSubjectValue(codeName, stateType, stateKind,
+						valueType, valueKind);
 				CodeNameValueDTO valueDTO = new CodeNameValueDTO(codeName, subjectValue);
 				values.add(valueDTO);
 			}
-			if (values.isEmpty()) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-			else return new ResponseEntity<String>(CodeNameValueDTO.toJsonArray(values), headers, HttpStatus.OK);
+			if (values.isEmpty())
+				return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+			else
+				return new ResponseEntity<String>(CodeNameValueDTO.toJsonArray(values), headers, HttpStatus.OK);
 		}
 		if (entity.equals("lsThing")) {
 			Collection<CodeNameValueDTO> values = new ArrayList<CodeNameValueDTO>();
-			for (String codeName : codeNames){
-				LsThingValue lsThingValue = lsThingValueService.getLsThingValue(codeName, stateType, stateKind, valueType, valueKind);
+			for (String codeName : codeNames) {
+				LsThingValue lsThingValue = lsThingValueService.getLsThingValue(codeName, stateType, stateKind,
+						valueType, valueKind);
 				CodeNameValueDTO valueDTO = new CodeNameValueDTO(codeName, lsThingValue);
 				values.add(valueDTO);
 			}
-			if (values.isEmpty()) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-			else return new ResponseEntity<String>(CodeNameValueDTO.toJsonArray(values), headers, HttpStatus.OK);
+			if (values.isEmpty())
+				return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+			else
+				return new ResponseEntity<String>(CodeNameValueDTO.toJsonArray(values), headers, HttpStatus.OK);
 		}
-		
+
 		return new ResponseEntity<String>("INVALID ENTITY", headers, HttpStatus.BAD_REQUEST);
 	}
-	
+
 	@RequestMapping(value = "/values/{entity}/{idOrCodeName}/bystate/{stateType}/{stateKind}/byvalue/{valueType}/{valueKind}/", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> getValueByPath (
+	public ResponseEntity<String> getValueByPath(
 			@PathVariable("entity") String entity,
 			@PathVariable("idOrCodeName") String idOrCodeName,
 			@PathVariable("stateType") String stateType,
@@ -234,57 +259,79 @@ public ResponseEntity<String> getValueByPath (
 
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		//this if/else if block controls which lsThing is being hit
+		// this if/else if block controls which lsThing is being hit
 		logger.debug("ENTITY IS: " + entity);
 		if (entity.equals("protocol")) {
-			ProtocolValue protocolValue = protocolValueService.getProtocolValue(idOrCodeName, stateType, stateKind, valueType, valueKind);
-			if (protocolValue==null) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-			else return new ResponseEntity<String>(protocolValue.toJson(), headers, HttpStatus.OK);
+			ProtocolValue protocolValue = protocolValueService.getProtocolValue(idOrCodeName, stateType, stateKind,
+					valueType, valueKind);
+			if (protocolValue == null)
+				return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+			else
+				return new ResponseEntity<String>(protocolValue.toJson(), headers, HttpStatus.OK);
 		}
 		if (entity.equals("experiment")) {
-			ExperimentValue experimentValue = experimentValueService.getExperimentValue(idOrCodeName, stateType, stateKind, valueType, valueKind);
-			if (experimentValue==null) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-			else return new ResponseEntity<String>(experimentValue.toJson(), headers, HttpStatus.OK);
+			ExperimentValue experimentValue = experimentValueService.getExperimentValue(idOrCodeName, stateType,
+					stateKind, valueType, valueKind);
+			if (experimentValue == null)
+				return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+			else
+				return new ResponseEntity<String>(experimentValue.toJson(), headers, HttpStatus.OK);
 		}
 		if (entity.equals("analysisGroup")) {
-			AnalysisGroupValue analysisGroupValue = analysisGroupValueService.getAnalysisGroupValue(idOrCodeName, stateType, stateKind, valueType, valueKind);
-			if (analysisGroupValue==null) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-			else return new ResponseEntity<String>(analysisGroupValue.toJson(), headers, HttpStatus.OK);
+			AnalysisGroupValue analysisGroupValue = analysisGroupValueService.getAnalysisGroupValue(idOrCodeName,
+					stateType, stateKind, valueType, valueKind);
+			if (analysisGroupValue == null)
+				return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+			else
+				return new ResponseEntity<String>(analysisGroupValue.toJson(), headers, HttpStatus.OK);
 		}
 		if (entity.equals("treatmentGroup")) {
-			TreatmentGroupValue treatmentGroupValue = treatmentGroupValueService.getTreatmentGroupValue(idOrCodeName, stateType, stateKind, valueType, valueKind);
-			if (treatmentGroupValue==null) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-			else return new ResponseEntity<String>(treatmentGroupValue.toJson(), headers, HttpStatus.OK);
+			TreatmentGroupValue treatmentGroupValue = treatmentGroupValueService.getTreatmentGroupValue(idOrCodeName,
+					stateType, stateKind, valueType, valueKind);
+			if (treatmentGroupValue == null)
+				return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+			else
+				return new ResponseEntity<String>(treatmentGroupValue.toJson(), headers, HttpStatus.OK);
 		}
 		if (entity.equals("subject")) {
-			SubjectValue subjectValue = subjectValueService.getSubjectValue(idOrCodeName, stateType, stateKind, valueType, valueKind);
-			if (subjectValue==null) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-			else return new ResponseEntity<String>(subjectValue.toJson(), headers, HttpStatus.OK);
+			SubjectValue subjectValue = subjectValueService.getSubjectValue(idOrCodeName, stateType, stateKind,
+					valueType, valueKind);
+			if (subjectValue == null)
+				return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+			else
+				return new ResponseEntity<String>(subjectValue.toJson(), headers, HttpStatus.OK);
 		}
 		if (entity.equals("lsThing")) {
-			LsThingValue lsThingValue = lsThingValueService.getLsThingValue(idOrCodeName, stateType, stateKind, valueType, valueKind);
-			if (lsThingValue==null) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-			else return new ResponseEntity<String>(lsThingValue.toJson(), headers, HttpStatus.OK);
+			LsThingValue lsThingValue = lsThingValueService.getLsThingValue(idOrCodeName, stateType, stateKind,
+					valueType, valueKind);
+			if (lsThingValue == null)
+				return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+			else
+				return new ResponseEntity<String>(lsThingValue.toJson(), headers, HttpStatus.OK);
 		}
 		if (entity.equals("container")) {
-			ContainerValue containerValue = containerValueService.getContainerValue(idOrCodeName, stateType, stateKind, valueType, valueKind);
-			if (containerValue==null) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-			else return new ResponseEntity<String>(containerValue.toJson(), headers, HttpStatus.OK);
+			ContainerValue containerValue = containerValueService.getContainerValue(idOrCodeName, stateType, stateKind,
+					valueType, valueKind);
+			if (containerValue == null)
+				return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+			else
+				return new ResponseEntity<String>(containerValue.toJson(), headers, HttpStatus.OK);
 		}
-		
+
 		return new ResponseEntity<String>("INVALID ENTITY", headers, HttpStatus.BAD_REQUEST);
 	}
-	
+
 	@RequestMapping(value = "/values/{entity}/getValuesByIdOrCodeNameAndStateTypeAndKindAndValueTypeAndKind", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> getValuesByPaths (
+	public ResponseEntity<String> getValuesByPaths(
 			@PathVariable("entity") String entity,
 			@RequestBody String json) {
-		Collection<GenericValuePathRequest> genericRequests = GenericValuePathRequest.fromJsonArrayToGenericValuePathRequests(json);
+		Collection<GenericValuePathRequest> genericRequests = GenericValuePathRequest
+				.fromJsonArrayToGenericValuePathRequests(json);
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		//this if/else if block controls which lsThing is being hit
+		// this if/else if block controls which lsThing is being hit
 		logger.debug("ENTITY IS: " + entity);
 		if (entity.equals("protocol")) {
 			Collection<ProtocolValuePathDTO> results = protocolValueService.getProtocolValues(genericRequests);
@@ -295,11 +342,13 @@ public ResponseEntity<String> getValuesByPaths (
 			return new ResponseEntity<String>(ExperimentValuePathDTO.toJsonArray(results), headers, HttpStatus.OK);
 		}
 		if (entity.equals("analysisGroup")) {
-			Collection<AnalysisGroupValuePathDTO> results = analysisGroupValueService.getAnalysisGroupValues(genericRequests);
+			Collection<AnalysisGroupValuePathDTO> results = analysisGroupValueService
+					.getAnalysisGroupValues(genericRequests);
 			return new ResponseEntity<String>(AnalysisGroupValuePathDTO.toJsonArray(results), headers, HttpStatus.OK);
 		}
 		if (entity.equals("treatmentGroup")) {
-			Collection<TreatmentGroupValuePathDTO> results = treatmentGroupValueService.getTreatmentGroupValues(genericRequests);
+			Collection<TreatmentGroupValuePathDTO> results = treatmentGroupValueService
+					.getTreatmentGroupValues(genericRequests);
 			return new ResponseEntity<String>(TreatmentGroupValuePathDTO.toJsonArray(results), headers, HttpStatus.OK);
 		}
 		if (entity.equals("subject")) {
@@ -314,510 +363,541 @@ public ResponseEntity<String> getValuesByPaths (
 			Collection<ContainerValuePathDTO> results = containerValueService.getContainerValues(genericRequests);
 			return new ResponseEntity<String>(ContainerValuePathDTO.toJsonArray(results), headers, HttpStatus.OK);
 		}
-		
+
 		return new ResponseEntity<String>("INVALID ENTITY", headers, HttpStatus.BAD_REQUEST);
 	}
-	
-	//List values as jsonArray (GET)
-	
+
+	// List values as jsonArray (GET)
+
 	@RequestMapping(value = "/protocolvalues", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> listProtocolValuesJsonArray() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        List<ProtocolValue> result = ProtocolValue.findAllProtocolValues();
-        List<ProtocolValue> finalResult = new ArrayList<ProtocolValue>();
-        for (ProtocolValue protocolValue: result) {
-        	if (!protocolValue.isIgnored()) finalResult.add(protocolValue);
-        }
-        return new ResponseEntity<String>(ProtocolValue.toJsonArray(finalResult), headers, HttpStatus.OK);
-    }
-	
+	@ResponseBody
+	public ResponseEntity<String> listProtocolValuesJsonArray() {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		List<ProtocolValue> result = ProtocolValue.findAllProtocolValues();
+		List<ProtocolValue> finalResult = new ArrayList<ProtocolValue>();
+		for (ProtocolValue protocolValue : result) {
+			if (!protocolValue.isIgnored())
+				finalResult.add(protocolValue);
+		}
+		return new ResponseEntity<String>(ProtocolValue.toJsonArray(finalResult), headers, HttpStatus.OK);
+	}
+
 	@RequestMapping(value = "/experimentvalues", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> listExperimentValuesJsonArray() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        List<ExperimentValue> result = ExperimentValue.findAllExperimentValues();
-        List<ExperimentValue> finalResult = new ArrayList<ExperimentValue>();
-        for (ExperimentValue experimentValue: result) {
-        	if (!experimentValue.isIgnored()) finalResult.add(experimentValue);
-        }
-        return new ResponseEntity<String>(ExperimentValue.toJsonArray(finalResult), headers, HttpStatus.OK);
-    }
-	
+	@ResponseBody
+	public ResponseEntity<String> listExperimentValuesJsonArray() {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		List<ExperimentValue> result = ExperimentValue.findAllExperimentValues();
+		List<ExperimentValue> finalResult = new ArrayList<ExperimentValue>();
+		for (ExperimentValue experimentValue : result) {
+			if (!experimentValue.isIgnored())
+				finalResult.add(experimentValue);
+		}
+		return new ResponseEntity<String>(ExperimentValue.toJsonArray(finalResult), headers, HttpStatus.OK);
+	}
+
 	@RequestMapping(value = "/analysisgroupvalues", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> listAnalysisGroupValuesJsonArray() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        List<AnalysisGroupValue> result = AnalysisGroupValue.findAllAnalysisGroupValues();
-        List<AnalysisGroupValue> finalResult = new ArrayList<AnalysisGroupValue>();
-        for (AnalysisGroupValue analysisGroupValue: result) {
-        	if (!analysisGroupValue.isIgnored()) finalResult.add(analysisGroupValue);
-        }
-        return new ResponseEntity<String>(AnalysisGroupValue.toJsonArray(finalResult), headers, HttpStatus.OK);
-    }
-	
+	@ResponseBody
+	public ResponseEntity<String> listAnalysisGroupValuesJsonArray() {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		List<AnalysisGroupValue> result = AnalysisGroupValue.findAllAnalysisGroupValues();
+		List<AnalysisGroupValue> finalResult = new ArrayList<AnalysisGroupValue>();
+		for (AnalysisGroupValue analysisGroupValue : result) {
+			if (!analysisGroupValue.isIgnored())
+				finalResult.add(analysisGroupValue);
+		}
+		return new ResponseEntity<String>(AnalysisGroupValue.toJsonArray(finalResult), headers, HttpStatus.OK);
+	}
+
 	@RequestMapping(value = "/treatmentgroupvalues", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> listTreatmentGroupValuesJsonArray() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        List<TreatmentGroupValue> result = TreatmentGroupValue.findAllTreatmentGroupValues();
-        List<TreatmentGroupValue> finalResult = new ArrayList<TreatmentGroupValue>();
-        for (TreatmentGroupValue treatmentGroupValue: result) {
-        	if (!treatmentGroupValue.isIgnored()) finalResult.add(treatmentGroupValue);
-        }
-        return new ResponseEntity<String>(TreatmentGroupValue.toJsonArray(finalResult), headers, HttpStatus.OK);
-    }
-	
+	@ResponseBody
+	public ResponseEntity<String> listTreatmentGroupValuesJsonArray() {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		List<TreatmentGroupValue> result = TreatmentGroupValue.findAllTreatmentGroupValues();
+		List<TreatmentGroupValue> finalResult = new ArrayList<TreatmentGroupValue>();
+		for (TreatmentGroupValue treatmentGroupValue : result) {
+			if (!treatmentGroupValue.isIgnored())
+				finalResult.add(treatmentGroupValue);
+		}
+		return new ResponseEntity<String>(TreatmentGroupValue.toJsonArray(finalResult), headers, HttpStatus.OK);
+	}
+
 	@RequestMapping(value = "/subjectvalues", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> listSubjectValuesJsonArray() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        List<SubjectValue> result = SubjectValue.findAllSubjectValues();
-        List<SubjectValue> finalResult = new ArrayList<SubjectValue>();
-        for (SubjectValue subjectValue: result) {
-        	if (!subjectValue.isIgnored()) finalResult.add(subjectValue);
-        }
-        return new ResponseEntity<String>(SubjectValue.toJsonArray(finalResult), headers, HttpStatus.OK);
-    }
-	
+	@ResponseBody
+	public ResponseEntity<String> listSubjectValuesJsonArray() {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		List<SubjectValue> result = SubjectValue.findAllSubjectValues();
+		List<SubjectValue> finalResult = new ArrayList<SubjectValue>();
+		for (SubjectValue subjectValue : result) {
+			if (!subjectValue.isIgnored())
+				finalResult.add(subjectValue);
+		}
+		return new ResponseEntity<String>(SubjectValue.toJsonArray(finalResult), headers, HttpStatus.OK);
+	}
+
 	@RequestMapping(value = "/lsthingvalues", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> listLsThingValuesJsonArray() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        List<LsThingValue> result = LsThingValue.findAllLsThingValues();
-        List<LsThingValue> finalResult = new ArrayList<LsThingValue>();
-        for (LsThingValue lsThingValue: result) {
-        	if (!lsThingValue.isIgnored()) finalResult.add(lsThingValue);
-        }
-        return new ResponseEntity<String>(LsThingValue.toJsonArray(finalResult), headers, HttpStatus.OK);
-    }
-	
+	@ResponseBody
+	public ResponseEntity<String> listLsThingValuesJsonArray() {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		List<LsThingValue> result = LsThingValue.findAllLsThingValues();
+		List<LsThingValue> finalResult = new ArrayList<LsThingValue>();
+		for (LsThingValue lsThingValue : result) {
+			if (!lsThingValue.isIgnored())
+				finalResult.add(lsThingValue);
+		}
+		return new ResponseEntity<String>(LsThingValue.toJsonArray(finalResult), headers, HttpStatus.OK);
+	}
+
 	@RequestMapping(value = "/containervalues", method = RequestMethod.GET, headers = "Accept=application/json")
-    @ResponseBody
-    public ResponseEntity<String> listContainerValuesJsonArray() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        List<ContainerValue> result = ContainerValue.findAllContainerValues();
-        List<ContainerValue> finalResult = new ArrayList<ContainerValue>();
-        for (ContainerValue containerValue: result) {
-        	if (!containerValue.isIgnored()) finalResult.add(containerValue);
-        }
-        return new ResponseEntity<String>(ContainerValue.toJsonArray(finalResult), headers, HttpStatus.OK);
-    }
-	
-	//Show value json by id (GET)
-	
-		@RequestMapping(value = "/protocolvalues/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
-		@ResponseBody
-		@Transactional
-	public ResponseEntity<String> showProtocolValueJson (@PathVariable("id") Long id) {
+	@ResponseBody
+	public ResponseEntity<String> listContainerValuesJsonArray() {
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		List<ContainerValue> result = ContainerValue.findAllContainerValues();
+		List<ContainerValue> finalResult = new ArrayList<ContainerValue>();
+		for (ContainerValue containerValue : result) {
+			if (!containerValue.isIgnored())
+				finalResult.add(containerValue);
+		}
+		return new ResponseEntity<String>(ContainerValue.toJsonArray(finalResult), headers, HttpStatus.OK);
+	}
+
+	// Show value json by id (GET)
+
+	@RequestMapping(value = "/protocolvalues/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	@Transactional
+	public ResponseEntity<String> showProtocolValueJson(@PathVariable("id") Long id) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		ProtocolValue protocolValue = ProtocolValue.findProtocolValue(id);
-        if (protocolValue == null || protocolValue.isIgnored()) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        return new ResponseEntity<String>(protocolValue.toJson(), headers, HttpStatus.OK);
+		if (protocolValue == null || protocolValue.isIgnored())
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		return new ResponseEntity<String>(protocolValue.toJson(), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/experimentvalues/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> showExperimentValueJson (@PathVariable("id") Long id) {
+	public ResponseEntity<String> showExperimentValueJson(@PathVariable("id") Long id) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		ExperimentValue experimentValue = ExperimentValue.findExperimentValue(id);
-        if (experimentValue == null || experimentValue.isIgnored()) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        return new ResponseEntity<String>(experimentValue.toJson(), headers, HttpStatus.OK);
+		if (experimentValue == null || experimentValue.isIgnored())
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		return new ResponseEntity<String>(experimentValue.toJson(), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/analysisgroupvalues/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> showAnalysisGroupValueJson (@PathVariable("id") Long id) {
+	public ResponseEntity<String> showAnalysisGroupValueJson(@PathVariable("id") Long id) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		AnalysisGroupValue analysisGroupValue = AnalysisGroupValue.findAnalysisGroupValue(id);
-        if (analysisGroupValue == null || analysisGroupValue.isIgnored()) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        return new ResponseEntity<String>(analysisGroupValue.toJson(), headers, HttpStatus.OK);
+		if (analysisGroupValue == null || analysisGroupValue.isIgnored())
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		return new ResponseEntity<String>(analysisGroupValue.toJson(), headers, HttpStatus.OK);
 	}
 
 	@RequestMapping(value = "/treatmentgroupvalues/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> showTreatmentGroupValueJson (@PathVariable("id") Long id) {
+	public ResponseEntity<String> showTreatmentGroupValueJson(@PathVariable("id") Long id) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		TreatmentGroupValue treatmentGroupValue = TreatmentGroupValue.findTreatmentGroupValue(id);
-        if (treatmentGroupValue == null || treatmentGroupValue.isIgnored()) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        return new ResponseEntity<String>(treatmentGroupValue.toJson(), headers, HttpStatus.OK);
+		if (treatmentGroupValue == null || treatmentGroupValue.isIgnored())
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		return new ResponseEntity<String>(treatmentGroupValue.toJson(), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/subjectvalues/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> showSubjectValueJson (@PathVariable("id") Long id) {
+	public ResponseEntity<String> showSubjectValueJson(@PathVariable("id") Long id) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		SubjectValue subjectValue = SubjectValue.findSubjectValue(id);
-        if (subjectValue == null || subjectValue.isIgnored()) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        return new ResponseEntity<String>(subjectValue.toJson(), headers, HttpStatus.OK);
+		if (subjectValue == null || subjectValue.isIgnored())
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		return new ResponseEntity<String>(subjectValue.toJson(), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/lsthingvalues/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> showLsThingValueJson (@PathVariable("id") Long id, @RequestParam(value="format", required = false) String format) {
+	public ResponseEntity<String> showLsThingValueJson(@PathVariable("id") Long id,
+			@RequestParam(value = "format", required = false) String format) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		LsThingValue lsThingValue = LsThingValue.findLsThingValue(id);
-        if (lsThingValue == null || lsThingValue.isIgnored()) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-		if(format != null && format.equalsIgnoreCase("withblobvalue")) {
+		if (lsThingValue == null || lsThingValue.isIgnored())
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		if (format != null && format.equalsIgnoreCase("withblobvalue")) {
 			return new ResponseEntity<String>(lsThingValue.toJsonWithBlobValue(), headers, HttpStatus.OK);
 		} else {
 			return new ResponseEntity<String>(lsThingValue.toJson(), headers, HttpStatus.OK);
 		}
 	}
-	
+
 	@RequestMapping(value = "/containervalues/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> showContainerValueJson (@PathVariable("id") Long id) {
+	public ResponseEntity<String> showContainerValueJson(@PathVariable("id") Long id) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		ContainerValue containerValue = ContainerValue.findContainerValue(id);
-        if (containerValue == null || containerValue.isIgnored()) return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
-        return new ResponseEntity<String>(containerValue.toJson(), headers, HttpStatus.OK);
+		if (containerValue == null || containerValue.isIgnored())
+			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
+		return new ResponseEntity<String>(containerValue.toJson(), headers, HttpStatus.OK);
 	}
-	
-	//Update value from json (PUT)
+
+	// Update value from json (PUT)
 	@RequestMapping(value = "/protocolvalues", method = RequestMethod.PUT, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> updateProtocolValueFromJson (@RequestBody ProtocolValue protocolValue) {
+	public ResponseEntity<String> updateProtocolValueFromJson(@RequestBody ProtocolValue protocolValue) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		if (ProtocolValue.findProtocolValue(protocolValue.getId()) == null) {
 			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
 		}
 		protocolValue = protocolValueService.updateProtocolValue(protocolValue);
-        return new ResponseEntity<String>(protocolValue.toJson(),headers, HttpStatus.OK);
+		return new ResponseEntity<String>(protocolValue.toJson(), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/experimentvalues", method = RequestMethod.PUT, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> updateExperimentValueFromJson (@RequestBody ExperimentValue experimentValue) {
+	public ResponseEntity<String> updateExperimentValueFromJson(@RequestBody ExperimentValue experimentValue) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		if (ExperimentValue.findExperimentValue(experimentValue.getId()) == null) {
 			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
 		}
 		experimentValue = experimentValueService.updateExperimentValue(experimentValue);
-        return new ResponseEntity<String>(experimentValue.toJson(),headers, HttpStatus.OK);
+		return new ResponseEntity<String>(experimentValue.toJson(), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/analysisgroupvalues", method = RequestMethod.PUT, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> updateAnalysisGroupValueFromJson (@RequestBody AnalysisGroupValue analysisGroupValue) {
+	public ResponseEntity<String> updateAnalysisGroupValueFromJson(@RequestBody AnalysisGroupValue analysisGroupValue) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		if (AnalysisGroupValue.findAnalysisGroupValue(analysisGroupValue.getId()) == null) {
 			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
 		}
 		analysisGroupValue = analysisGroupValueService.updateAnalysisGroupValue(analysisGroupValue);
-        return new ResponseEntity<String>(analysisGroupValue.toJson(),headers, HttpStatus.OK);
+		return new ResponseEntity<String>(analysisGroupValue.toJson(), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/treatmentgroupvalues", method = RequestMethod.PUT, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> updateTreatmentGroupValueFromJson (@RequestBody TreatmentGroupValue treatmentGroupValue) {
+	public ResponseEntity<String> updateTreatmentGroupValueFromJson(
+			@RequestBody TreatmentGroupValue treatmentGroupValue) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		if (TreatmentGroupValue.findTreatmentGroupValue(treatmentGroupValue.getId()) == null) {
 			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
 		}
 		treatmentGroupValue = treatmentGroupValueService.updateTreatmentGroupValue(treatmentGroupValue);
-        return new ResponseEntity<String>(treatmentGroupValue.toJson(),headers, HttpStatus.OK);
+		return new ResponseEntity<String>(treatmentGroupValue.toJson(), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/subjectvalues", method = RequestMethod.PUT, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> updateSubjectValueFromJson (@RequestBody SubjectValue subjectValue) {
+	public ResponseEntity<String> updateSubjectValueFromJson(@RequestBody SubjectValue subjectValue) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		if (SubjectValue.findSubjectValue(subjectValue.getId()) == null) {
 			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
 		}
 		subjectValue = subjectValueService.updateSubjectValue(subjectValue);
-        return new ResponseEntity<String>(subjectValue.toJson(),headers, HttpStatus.OK);
+		return new ResponseEntity<String>(subjectValue.toJson(), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/lsthingvalues", method = RequestMethod.PUT, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> updateLsThingValueFromJson (@RequestBody LsThingValue lsThingValue) {
+	public ResponseEntity<String> updateLsThingValueFromJson(@RequestBody LsThingValue lsThingValue) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		if (LsThingValue.findLsThingValue(lsThingValue.getId()) == null) {
 			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
 		}
 		lsThingValue = lsThingValueService.updateLsThingValue(lsThingValue);
-        return new ResponseEntity<String>(lsThingValue.toJson(),headers, HttpStatus.OK);
+		return new ResponseEntity<String>(lsThingValue.toJson(), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/containervalues", method = RequestMethod.PUT, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> updateContainerValueFromJson (@RequestBody ContainerValue containerValue) {
+	public ResponseEntity<String> updateContainerValueFromJson(@RequestBody ContainerValue containerValue) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		if (ContainerValue.findContainerValue(containerValue.getId()) == null) {
 			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
 		}
 		containerValue = containerValueService.updateContainerValue(containerValue);
-        return new ResponseEntity<String>(containerValue.toJson(),headers, HttpStatus.OK);
+		return new ResponseEntity<String>(containerValue.toJson(), headers, HttpStatus.OK);
 	}
-	
-	//Update values from jsonArray (PUT)
-	
+
+	// Update values from jsonArray (PUT)
+
 	@RequestMapping(value = "/protocolvalues/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> updateProtocolValuesFromJsonArray (@RequestBody List<ProtocolValue> protocolValues) {
+	public ResponseEntity<String> updateProtocolValuesFromJsonArray(@RequestBody List<ProtocolValue> protocolValues) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		protocolValues = (List<ProtocolValue>) protocolValueService.updateProtocolValues(protocolValues);
-        return new ResponseEntity<String>(ProtocolValue.toJsonArray(protocolValues),headers, HttpStatus.OK);
+		return new ResponseEntity<String>(ProtocolValue.toJsonArray(protocolValues), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/experimentvalues/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> updateExperimentValuesFromJsonArray (@RequestBody List<ExperimentValue> experimentValues) {
+	public ResponseEntity<String> updateExperimentValuesFromJsonArray(
+			@RequestBody List<ExperimentValue> experimentValues) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		experimentValues = (List<ExperimentValue>) experimentValueService.updateExperimentValues(experimentValues);
-        return new ResponseEntity<String>(ExperimentValue.toJsonArray(experimentValues),headers, HttpStatus.OK);
+		return new ResponseEntity<String>(ExperimentValue.toJsonArray(experimentValues), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/analysisgroupvalues/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> updateAnalysisGroupValuesFromJsonArray (@RequestBody List<AnalysisGroupValue> analysisGroupValues) {
+	public ResponseEntity<String> updateAnalysisGroupValuesFromJsonArray(
+			@RequestBody List<AnalysisGroupValue> analysisGroupValues) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		analysisGroupValues = (List<AnalysisGroupValue>) analysisGroupValueService.updateAnalysisGroupValues(analysisGroupValues);
-        return new ResponseEntity<String>(AnalysisGroupValue.toJsonArray(analysisGroupValues),headers, HttpStatus.OK);
+		analysisGroupValues = (List<AnalysisGroupValue>) analysisGroupValueService
+				.updateAnalysisGroupValues(analysisGroupValues);
+		return new ResponseEntity<String>(AnalysisGroupValue.toJsonArray(analysisGroupValues), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/treatmentgroupvalues/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> updateTreatmentGroupValuesFromJsonArray (@RequestBody List<TreatmentGroupValue> treatmentGroupValues) {
+	public ResponseEntity<String> updateTreatmentGroupValuesFromJsonArray(
+			@RequestBody List<TreatmentGroupValue> treatmentGroupValues) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		treatmentGroupValues = (List<TreatmentGroupValue>) treatmentGroupValueService.updateTreatmentGroupValues(treatmentGroupValues);
-        return new ResponseEntity<String>(TreatmentGroupValue.toJsonArray(treatmentGroupValues),headers, HttpStatus.OK);
+		treatmentGroupValues = (List<TreatmentGroupValue>) treatmentGroupValueService
+				.updateTreatmentGroupValues(treatmentGroupValues);
+		return new ResponseEntity<String>(TreatmentGroupValue.toJsonArray(treatmentGroupValues), headers,
+				HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/subjectvalues/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> updateSubjectValuesFromJsonArray (@RequestBody List<SubjectValue> subjectValues) {
+	public ResponseEntity<String> updateSubjectValuesFromJsonArray(@RequestBody List<SubjectValue> subjectValues) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		subjectValues = (List<SubjectValue>) subjectValueService.updateSubjectValues(subjectValues);
-        return new ResponseEntity<String>(SubjectValue.toJsonArray(subjectValues),headers, HttpStatus.OK);
+		return new ResponseEntity<String>(SubjectValue.toJsonArray(subjectValues), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/lsthingvalues/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> updateLsThingValuesFromJsonArray (@RequestBody List<LsThingValue> lsThingValues) {
+	public ResponseEntity<String> updateLsThingValuesFromJsonArray(@RequestBody List<LsThingValue> lsThingValues) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		lsThingValues = (List<LsThingValue>) lsThingValueService.updateLsThingValues(lsThingValues);
-        return new ResponseEntity<String>(LsThingValue.toJsonArray(lsThingValues),headers, HttpStatus.OK);
+		return new ResponseEntity<String>(LsThingValue.toJsonArray(lsThingValues), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/containervalues/jsonArray", method = RequestMethod.PUT, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> updateContainerValuesFromJsonArray (@RequestBody List<ContainerValue> containerValues) {
+	public ResponseEntity<String> updateContainerValuesFromJsonArray(
+			@RequestBody List<ContainerValue> containerValues) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		containerValues = (List<ContainerValue>) containerValueService.updateContainerValues(containerValues);
-        return new ResponseEntity<String>(ContainerValue.toJsonArray(containerValues),headers, HttpStatus.OK);
+		return new ResponseEntity<String>(ContainerValue.toJsonArray(containerValues), headers, HttpStatus.OK);
 	}
-	
-	//Create value from json (POST)
-	
+
+	// Create value from json (POST)
+
 	@RequestMapping(value = "/protocolvalues", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> createProtocolValueFromJson (@RequestBody ProtocolValue protocolValue) {
+	public ResponseEntity<String> createProtocolValueFromJson(@RequestBody ProtocolValue protocolValue) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		protocolValue = protocolValueService.saveProtocolValue(protocolValue);
-        return new ResponseEntity<String>(protocolValue.toJson(),headers, HttpStatus.OK);
+		return new ResponseEntity<String>(protocolValue.toJson(), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/experimentvalues", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> createExperimentValueFromJson (@RequestBody ExperimentValue experimentValue) {
+	public ResponseEntity<String> createExperimentValueFromJson(@RequestBody ExperimentValue experimentValue) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		experimentValue = experimentValueService.saveExperimentValue(experimentValue);
-        return new ResponseEntity<String>(experimentValue.toJson(),headers, HttpStatus.OK);
+		return new ResponseEntity<String>(experimentValue.toJson(), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/analysisgroupvalues", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> createAnalysisGroupValueFromJson (@RequestBody AnalysisGroupValue analysisGroupValue) {
+	public ResponseEntity<String> createAnalysisGroupValueFromJson(@RequestBody AnalysisGroupValue analysisGroupValue) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		analysisGroupValue = analysisGroupValueService.saveAnalysisGroupValue(analysisGroupValue);
-        return new ResponseEntity<String>(analysisGroupValue.toJson(),headers, HttpStatus.OK);
+		return new ResponseEntity<String>(analysisGroupValue.toJson(), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/treatmentgroupvalues", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> createTreatmentGroupValueFromJson (@RequestBody TreatmentGroupValue treatmentGroupValue) {
+	public ResponseEntity<String> createTreatmentGroupValueFromJson(
+			@RequestBody TreatmentGroupValue treatmentGroupValue) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		treatmentGroupValue = treatmentGroupValueService.saveTreatmentGroupValue(treatmentGroupValue);
-        return new ResponseEntity<String>(treatmentGroupValue.toJson(),headers, HttpStatus.OK);
+		return new ResponseEntity<String>(treatmentGroupValue.toJson(), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/subjectvalues", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> createSubjectValueFromJson (@RequestBody SubjectValue subjectValue) {
+	public ResponseEntity<String> createSubjectValueFromJson(@RequestBody SubjectValue subjectValue) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		subjectValue = subjectValueService.saveSubjectValue(subjectValue);
-        return new ResponseEntity<String>(subjectValue.toJson(),headers, HttpStatus.OK);
+		return new ResponseEntity<String>(subjectValue.toJson(), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/lsthingvalues", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> createLsThingValueFromJson (@RequestBody LsThingValue lsThingValue) {
+	public ResponseEntity<String> createLsThingValueFromJson(@RequestBody LsThingValue lsThingValue) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		lsThingValue = lsThingValueService.saveLsThingValue(lsThingValue);
-        return new ResponseEntity<String>(lsThingValue.toJson(),headers, HttpStatus.OK);
+		return new ResponseEntity<String>(lsThingValue.toJson(), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/containervalues", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> createContainerValueFromJson (@RequestBody ContainerValue containerValue) {
+	public ResponseEntity<String> createContainerValueFromJson(@RequestBody ContainerValue containerValue) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		containerValue = containerValueService.saveContainerValue(containerValue);
-        return new ResponseEntity<String>(containerValue.toJson(),headers, HttpStatus.OK);
+		return new ResponseEntity<String>(containerValue.toJson(), headers, HttpStatus.OK);
 	}
-	
-	//Create values from jsonArray (POST)
-	
+
+	// Create values from jsonArray (POST)
+
 	@RequestMapping(value = "/protocolvalues/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> createProtocolValuesFromJsonArray (@RequestBody List<ProtocolValue> protocolValues) {
+	public ResponseEntity<String> createProtocolValuesFromJsonArray(@RequestBody List<ProtocolValue> protocolValues) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		protocolValues = (List<ProtocolValue>) protocolValueService.saveProtocolValues(protocolValues);
-        return new ResponseEntity<String>(ProtocolValue.toJsonArray(protocolValues),headers, HttpStatus.OK);
+		return new ResponseEntity<String>(ProtocolValue.toJsonArray(protocolValues), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/experimentvalues/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> createExperimentValuesFromJsonArray (@RequestBody List<ExperimentValue> experimentValues) {
+	public ResponseEntity<String> createExperimentValuesFromJsonArray(
+			@RequestBody List<ExperimentValue> experimentValues) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		experimentValues = (List<ExperimentValue>) experimentValueService.saveExperimentValues(experimentValues);
-        return new ResponseEntity<String>(ExperimentValue.toJsonArray(experimentValues),headers, HttpStatus.OK);
+		return new ResponseEntity<String>(ExperimentValue.toJsonArray(experimentValues), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/analysisgroupvalues/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> createAnalysisGroupValuesFromJsonArray (@RequestBody List<AnalysisGroupValue> analysisGroupValues) {
+	public ResponseEntity<String> createAnalysisGroupValuesFromJsonArray(
+			@RequestBody List<AnalysisGroupValue> analysisGroupValues) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		analysisGroupValues = (List<AnalysisGroupValue>) analysisGroupValueService.saveAnalysisGroupValues(analysisGroupValues);
-        return new ResponseEntity<String>(AnalysisGroupValue.toJsonArray(analysisGroupValues),headers, HttpStatus.OK);
+		analysisGroupValues = (List<AnalysisGroupValue>) analysisGroupValueService
+				.saveAnalysisGroupValues(analysisGroupValues);
+		return new ResponseEntity<String>(AnalysisGroupValue.toJsonArray(analysisGroupValues), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/treatmentgroupvalues/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> createTreatmentGroupValuesFromJsonArray (@RequestBody List<TreatmentGroupValue> treatmentGroupValues) {
+	public ResponseEntity<String> createTreatmentGroupValuesFromJsonArray(
+			@RequestBody List<TreatmentGroupValue> treatmentGroupValues) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		treatmentGroupValues = (List<TreatmentGroupValue>) treatmentGroupValueService.saveTreatmentGroupValues(treatmentGroupValues);
-        return new ResponseEntity<String>(TreatmentGroupValue.toJsonArray(treatmentGroupValues),headers, HttpStatus.OK);
+		treatmentGroupValues = (List<TreatmentGroupValue>) treatmentGroupValueService
+				.saveTreatmentGroupValues(treatmentGroupValues);
+		return new ResponseEntity<String>(TreatmentGroupValue.toJsonArray(treatmentGroupValues), headers,
+				HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/subjectvalues/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> createSubjectValuesFromJsonArray (@RequestBody List<SubjectValue> subjectValues) {
+	public ResponseEntity<String> createSubjectValuesFromJsonArray(@RequestBody List<SubjectValue> subjectValues) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		subjectValues = (List<SubjectValue>) subjectValueService.saveSubjectValues(subjectValues);
-        return new ResponseEntity<String>(SubjectValue.toJsonArray(subjectValues),headers, HttpStatus.OK);
+		return new ResponseEntity<String>(SubjectValue.toJsonArray(subjectValues), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/lsthingvalues/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> createLsThingValuesFromJsonArray (@RequestBody List<LsThingValue> lsThingValues) {
+	public ResponseEntity<String> createLsThingValuesFromJsonArray(@RequestBody List<LsThingValue> lsThingValues) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		lsThingValues = (List<LsThingValue>) lsThingValueService.saveLsThingValues(lsThingValues);
-        return new ResponseEntity<String>(LsThingValue.toJsonArray(lsThingValues),headers, HttpStatus.OK);
+		return new ResponseEntity<String>(LsThingValue.toJsonArray(lsThingValues), headers, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/containervalues/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> createContainerValuesFromJsonArray (@RequestBody List<ContainerValue> containerValues) {
+	public ResponseEntity<String> createContainerValuesFromJsonArray(
+			@RequestBody List<ContainerValue> containerValues) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		containerValues = (List<ContainerValue>) containerValueService.saveContainerValues(containerValues);
-        return new ResponseEntity<String>(ContainerValue.toJsonArray(containerValues),headers, HttpStatus.OK);
+		return new ResponseEntity<String>(ContainerValue.toJsonArray(containerValues), headers, HttpStatus.OK);
 	}
-	
-	//finders
+
+	// finders
 	@RequestMapping(value = "/lsthingvalues/findByCodeValueEquals", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	@Transactional
-	public ResponseEntity<String> createLsThingValuesFromJsonArray (@RequestParam("codeValue") String codeValue) {
+	public ResponseEntity<String> createLsThingValuesFromJsonArray(@RequestParam("codeValue") String codeValue) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		try{
-			Collection<LsThingValue> lsThingValues = LsThingValue.findLsThingValuesByCodeValueEquals(codeValue).getResultList();
-			return new ResponseEntity<String>(LsThingValue.toJsonArray(lsThingValues),headers, HttpStatus.OK);
-		}catch (Exception e){
-			logger.error("Caught exception trying to find LsThingValues by codeValue equals: "+codeValue,e);
+		try {
+			Collection<LsThingValue> lsThingValues = LsThingValue.findLsThingValuesByCodeValueEquals(codeValue)
+					.getResultList();
+			return new ResponseEntity<String>(LsThingValue.toJsonArray(lsThingValues), headers, HttpStatus.OK);
+		} catch (Exception e) {
+			logger.error("Caught exception trying to find LsThingValues by codeValue equals: " + codeValue, e);
 			return new ResponseEntity<String>(headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
-        
+
 	}
-		
-	
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/api/ApiValueKindController.java b/src/main/java/com/labsynch/labseer/api/ApiValueKindController.java
index 5a77efe95..9f317e710 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiValueKindController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiValueKindController.java
@@ -30,56 +30,56 @@ public class ApiValueKindController {
 	private static final Logger logger = LoggerFactory.getLogger(ApiValueKindController.class);
 
 	@RequestMapping(value = "/getOrCreate/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-	public ResponseEntity<String> getOrCreateValueKinds(@RequestBody String json ){
+	public ResponseEntity<String> getOrCreateValueKinds(@RequestBody String json) {
 		Collection<ValueTypeKindDTO> valueTypeKindDTOs = ValueTypeKindDTO.fromJsonArrayToValueTypeKindDTO(json);
 		Collection<ValueKind> valueKinds = new HashSet<ValueKind>();
-        for (ValueTypeKindDTO typeKind : valueTypeKindDTOs){
-        	String lsType = typeKind.getLsType();
-        	String lsKind = typeKind.getLsKind();
-        	ValueType valueType;
-        	try{
-        		valueType = ValueType.findValueTypesByTypeNameEquals(lsType).getSingleResult();
-        	} catch(NoResultException e){
-        		valueType = new ValueType();
-        		valueType.setTypeName(lsType);
-        		valueType.persist();
-        	}
-        	ValueKind valueKind;
-        	try{
-        		valueKind = ValueKind.findValueKindsByKindNameEqualsAndLsType(lsKind, valueType).getSingleResult();
-        		valueKinds.add(valueKind);
-        	} catch(NoResultException e){
-        		valueKind = new ValueKind();
-        		valueKind.setKindName(lsKind);
-        		valueKind.setLsType(valueType);
-        		valueKind.setLsTypeAndKind(lsType+"_"+lsKind);
-        		valueKind.persist();
-        		valueKinds.add(valueKind);
-        	}
-        }
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-        return new ResponseEntity<String>(ValueKind.toJsonArray(valueKinds), headers, HttpStatus.CREATED);
+		for (ValueTypeKindDTO typeKind : valueTypeKindDTOs) {
+			String lsType = typeKind.getLsType();
+			String lsKind = typeKind.getLsKind();
+			ValueType valueType;
+			try {
+				valueType = ValueType.findValueTypesByTypeNameEquals(lsType).getSingleResult();
+			} catch (NoResultException e) {
+				valueType = new ValueType();
+				valueType.setTypeName(lsType);
+				valueType.persist();
+			}
+			ValueKind valueKind;
+			try {
+				valueKind = ValueKind.findValueKindsByKindNameEqualsAndLsType(lsKind, valueType).getSingleResult();
+				valueKinds.add(valueKind);
+			} catch (NoResultException e) {
+				valueKind = new ValueKind();
+				valueKind.setKindName(lsKind);
+				valueKind.setLsType(valueType);
+				valueKind.setLsTypeAndKind(lsType + "_" + lsKind);
+				valueKind.persist();
+				valueKinds.add(valueKind);
+			}
+		}
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		return new ResponseEntity<String>(ValueKind.toJsonArray(valueKinds), headers, HttpStatus.CREATED);
 	}
-	
+
 	@RequestMapping(value = "/get/jsonArray", method = RequestMethod.POST, headers = "Accept=application/json")
-	public ResponseEntity<String> getValueKindsWithValueTypeKindDTO(@RequestBody String json){
+	public ResponseEntity<String> getValueKindsWithValueTypeKindDTO(@RequestBody String json) {
 		HttpHeaders headers = new HttpHeaders();
-        headers.add("Content-Type", "application/json; charset=utf-8");
-		logger.info("incoming json:"+json);
-        List<ValueTypeKindDTO> valueTypeKindDTOs = (List<ValueTypeKindDTO>) ValueTypeKindDTO.fromJsonArrayToValueTypeKindDTO(json);
-        try{
-			for (ValueTypeKindDTO valueTypeKindDTO : valueTypeKindDTOs){
+		headers.add("Content-Type", "application/json; charset=utf-8");
+		logger.info("incoming json:" + json);
+		List<ValueTypeKindDTO> valueTypeKindDTOs = (List<ValueTypeKindDTO>) ValueTypeKindDTO
+				.fromJsonArrayToValueTypeKindDTO(json);
+		try {
+			for (ValueTypeKindDTO valueTypeKindDTO : valueTypeKindDTOs) {
 				valueTypeKindDTO.findValueKind();
 				logger.info(valueTypeKindDTO.toJson());
 			}
-	        return new ResponseEntity<String>(ValueTypeKindDTO.toJsonArray(valueTypeKindDTOs), headers, HttpStatus.OK);
-		}catch (Exception e){
+			return new ResponseEntity<String>(ValueTypeKindDTO.toJsonArray(valueTypeKindDTOs), headers, HttpStatus.OK);
+		} catch (Exception e) {
 			logger.error(e.toString());
 			return new ResponseEntity<String>(e.toString(), headers, HttpStatus.INTERNAL_SERVER_ERROR);
 		}
-		
+
 	}
-	
-	
+
 }
diff --git a/src/main/java/com/labsynch/labseer/api/ApiVendorController.java b/src/main/java/com/labsynch/labseer/api/ApiVendorController.java
index d03e05dce..335f9fb1a 100644
--- a/src/main/java/com/labsynch/labseer/api/ApiVendorController.java
+++ b/src/main/java/com/labsynch/labseer/api/ApiVendorController.java
@@ -22,7 +22,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-@RequestMapping(value = {"/api/v1/vendors"})
+@RequestMapping(value = { "/api/v1/vendors" })
 @Controller
 public class ApiVendorController {
 
@@ -31,28 +31,27 @@ public class ApiVendorController {
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
 
-
-	//check if vendor already exists by code
+	// check if vendor already exists by code
 	// if exists -- return false else true
 	@RequestMapping(value = "/validate", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<Boolean> validate(@RequestParam(value="code", required = true) String code) {
+	public ResponseEntity<Boolean> validate(@RequestParam(value = "code", required = true) String code) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 
-		if (Vendor.countFindVendorsByCodeEquals(code) > 0){
-			return new ResponseEntity<Boolean>(false, headers,HttpStatus.CONFLICT );
+		if (Vendor.countFindVendorsByCodeEquals(code) > 0) {
+			return new ResponseEntity<Boolean>(false, headers, HttpStatus.CONFLICT);
 		} else {
-			return new ResponseEntity<Boolean>(true, headers,HttpStatus.ACCEPTED );	        	
+			return new ResponseEntity<Boolean>(true, headers, HttpStatus.ACCEPTED);
 		}
-	}	
+	}
 
-	//validate vendor before saving
+	// validate vendor before saving
 	// is vendor code still unique?
 	// is vendor name unique? (optional)
 	@RequestMapping(value = "/validateBeforeSave", method = RequestMethod.POST, headers = "Accept=application/json")
@@ -73,14 +72,14 @@ public ResponseEntity<String> validateNewVendor(@RequestBody String json) {
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 
 		Long vendorByCodeCount = 0L;
 		List<Vendor> queryVendors = Vendor.findVendorsByCodeEquals(queryVendor.getCode()).getResultList();
-		for (Vendor vendor : queryVendors){
-			if (queryVendor.getId() == null || vendor.getId().longValue() != queryVendor.getId().longValue()){
+		for (Vendor vendor : queryVendors) {
+			if (queryVendor.getId() == null || vendor.getId().longValue() != queryVendor.getId().longValue()) {
 				++vendorByCodeCount;
 				logger.debug("current vendor: " + vendor.toJson());
 				logger.debug("vendor id: " + vendor.getId());
@@ -89,49 +88,50 @@ public ResponseEntity<String> validateNewVendor(@RequestBody String json) {
 			}
 		}
 
-		if (vendorByCodeCount > 0  ){
+		if (vendorByCodeCount > 0) {
 			ErrorMessage error = new ErrorMessage();
 			error.setLevel("ERROR");
 			error.setMessage("Found another vendor with the same code name");
 			errors.add(error);
-			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers,HttpStatus.CONFLICT );
+			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.CONFLICT);
 		} else {
-			return new ResponseEntity<String>(queryVendor.toJson(), headers,HttpStatus.OK );	        	
+			return new ResponseEntity<String>(queryVendor.toJson(), headers, HttpStatus.OK);
 		}
 	}
 
 	@RequestMapping(value = "/findByCodeEquals", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> findByCodeEquals(@RequestParam(value="code", required = true) String code) {
+	public ResponseEntity<String> findByCodeEquals(@RequestParam(value = "code", required = true) String code) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 		List<Vendor> vendors = Vendor.findVendorsByCodeEquals(code).getResultList();
 		logger.debug("number of vendors found: " + vendors.size());
-		if (vendors.size() != 1){
-			return new ResponseEntity<String>("[]", headers, HttpStatus.CONFLICT);       	
+		if (vendors.size() != 1) {
+			return new ResponseEntity<String>("[]", headers, HttpStatus.CONFLICT);
 		} else {
 			return new ResponseEntity<String>(vendors.get(0).toJson(), headers, HttpStatus.OK);
 		}
 
-	}	 
+	}
 
 	@RequestMapping(value = "/findByCodeLike", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> findByCodeLike(@RequestParam(value="code", required = true) String code) {
+	public ResponseEntity<String> findByCodeLike(@RequestParam(value = "code", required = true) String code) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
-		return new ResponseEntity<String>(Vendor.toJsonArray(Vendor.findVendorsByCodeLike(code).getResultList()), headers, HttpStatus.OK);
-	}	 
+		return new ResponseEntity<String>(Vendor.toJsonArray(Vendor.findVendorsByCodeLike(code).getResultList()),
+				headers, HttpStatus.OK);
+	}
 
 	@RequestMapping(value = "/{id}", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
@@ -141,8 +141,8 @@ public ResponseEntity<String> showJson(@PathVariable("id") Long id) {
 		headers.add("Content-Type", "application/text; charset=utf-8");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 		if (vendor == null) {
 			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
@@ -157,12 +157,13 @@ public ResponseEntity<String> listJson() {
 		headers.add("Content-Type", "application/text; charset=utf-8");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 
-		if (propertiesUtilService.getOrderSelectLists()){
-			return new ResponseEntity<String>(Vendor.toJsonArray(Vendor.findAllVendors("name", "ASC")), headers, HttpStatus.OK);
+		if (propertiesUtilService.getOrderSelectLists()) {
+			return new ResponseEntity<String>(Vendor.toJsonArray(Vendor.findAllVendors("name", "ASC")), headers,
+					HttpStatus.OK);
 		} else {
 			return new ResponseEntity<String>(Vendor.toJsonArray(Vendor.findAllVendors()), headers, HttpStatus.OK);
 		}
@@ -180,8 +181,8 @@ public ResponseEntity<String> createFromJson(@RequestBody String json) {
 		headers.add("Content-Type", "application/text; charset=utf-8");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 		return new ResponseEntity<String>(newVendor.toJson(), headers, HttpStatus.CREATED);
 	}
@@ -199,8 +200,8 @@ public ResponseEntity<String> createFromJsonArray(@RequestBody String json) {
 		headers.add("Content-Type", "application/text; charset=utf-8");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 		return new ResponseEntity<String>(headers, HttpStatus.CREATED);
 	}
@@ -211,8 +212,8 @@ public ResponseEntity<String> updateFromJson(@RequestBody String json) {
 		headers.add("Content-Type", "application/text; charset=utf-8");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 		if (Vendor.fromJsonToVendor(json).merge() == null) {
 			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
@@ -226,8 +227,8 @@ public ResponseEntity<String> updateFromJsonArray(@RequestBody String json) {
 		headers.add("Content-Type", "application/text; charset=utf-8");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 		for (Vendor vendor : Vendor.fromJsonArrayToVendors(json)) {
 			if (vendor.merge() == null) {
@@ -244,8 +245,8 @@ public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
 		headers.add("Content-Type", "application/text; charset=utf-8");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
 		if (vendor == null) {
 			return new ResponseEntity<String>(headers, HttpStatus.NOT_FOUND);
@@ -253,15 +254,17 @@ public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
 		ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
 		try {
 			vendor.remove();
-		} catch (Exception e){
+		} catch (Exception e) {
 			logger.info("Hit an exception: " + e);
 			Long lotCount = Lot.countLotsByVendor(vendor);
-			logger.info("Unable to delete the vendor. " + lotCount + " lots associated with the vendor " + vendor.getName());
+			logger.info("Unable to delete the vendor. " + lotCount + " lots associated with the vendor "
+					+ vendor.getName());
 			ErrorMessage error = new ErrorMessage();
 			error.setLevel("ERROR");
-			error.setMessage("Unable to delete the vendor. " + lotCount + " lots associated with the vendor " + vendor.getName());
+			error.setMessage("Unable to delete the vendor. " + lotCount + " lots associated with the vendor "
+					+ vendor.getName());
 			errors.add(error);
-			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers,HttpStatus.CONFLICT );
+			return new ResponseEntity<String>(ErrorMessage.toJsonArray(errors), headers, HttpStatus.CONFLICT);
 		}
 
 		return new ResponseEntity<String>(headers, HttpStatus.OK);
@@ -269,15 +272,17 @@ public ResponseEntity<String> deleteFromJson(@PathVariable("id") Long id) {
 
 	@RequestMapping(value = "/search", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
-	public ResponseEntity<String> searchBySearchTerms(@RequestParam(value="searchTerm", required = true) String searchTerm) {
+	public ResponseEntity<String> searchBySearchTerms(
+			@RequestParam(value = "searchTerm", required = true) String searchTerm) {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		headers.add("Access-Control-Allow-Headers", "Content-Type");
 		headers.add("Access-Control-Allow-Origin", "*");
-		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); //HTTP 1.1
-		headers.add("Pragma", "no-cache"); //HTTP 1.0
+		headers.add("Cache-Control", "no-store, no-cache, must-revalidate"); // HTTP 1.1
+		headers.add("Pragma", "no-cache"); // HTTP 1.0
 		headers.setExpires(0); // Expire the cache
-		return new ResponseEntity<String>(Vendor.toJsonArray(Vendor.findVendorsBySearchTerm(searchTerm).getResultList()), headers, HttpStatus.OK);
-	}	
+		return new ResponseEntity<String>(
+				Vendor.toJsonArray(Vendor.findVendorsBySearchTerm(searchTerm).getResultList()), headers, HttpStatus.OK);
+	}
 
 }
diff --git a/src/main/java/com/labsynch/labseer/api/RegisterCompoundsController.java b/src/main/java/com/labsynch/labseer/api/RegisterCompoundsController.java
index b091758be..859b7a1c1 100755
--- a/src/main/java/com/labsynch/labseer/api/RegisterCompoundsController.java
+++ b/src/main/java/com/labsynch/labseer/api/RegisterCompoundsController.java
@@ -15,53 +15,62 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-@RequestMapping(value = {"/api/v1/registration"})
+@RequestMapping(value = { "/api/v1/registration" })
 @Controller
 public class RegisterCompoundsController {
-	
+
 	Logger logger = LoggerFactory.getLogger(RegisterCompoundsController.class);
 
 	@Autowired
 	private LoadFullCompoundsUtil lcu;
-	
+
 	@RequestMapping(value = "/cmpds", method = RequestMethod.POST, headers = "Accept=application/json")
 	public ResponseEntity<String> searchCmpdsByParamsPost(
-			@RequestParam (value = "inputFileName", required = true) String inputFileName,
-			@RequestParam (value = "errorFileName", required = true) String errorFileName,
-			@RequestParam (value = "compoundAlias", required = false) String compoundAlias,
-			@RequestParam (value = "supplierId", required = false) String supplierId,
-			@RequestParam (value = "project", required = false) String project,
-			@RequestParam (value = "supplier", required = false) String supplier,
-			@RequestParam (value = "notebook", required = false) String notebook,
-			@RequestParam (value = "stereoCategory", required = false) String stereoCategory,
-			@RequestParam (value = "compoundChemist", required = false) String compoundChemist,
-			@RequestParam (value = "compoundChemistCode", required = false) String compoundChemistCode
+			@RequestParam(value = "inputFileName", required = true) String inputFileName,
+			@RequestParam(value = "errorFileName", required = true) String errorFileName,
+			@RequestParam(value = "compoundAlias", required = false) String compoundAlias,
+			@RequestParam(value = "supplierId", required = false) String supplierId,
+			@RequestParam(value = "project", required = false) String project,
+			@RequestParam(value = "supplier", required = false) String supplier,
+			@RequestParam(value = "notebook", required = false) String notebook,
+			@RequestParam(value = "stereoCategory", required = false) String stereoCategory,
+			@RequestParam(value = "compoundChemist", required = false) String compoundChemist,
+			@RequestParam(value = "compoundChemistCode", required = false) String compoundChemistCode
+
+	) {
 
-			) {
-		
 		logger.debug("hit the controller to register the compounds: " + inputFileName + " out: " + errorFileName);
-		
-        HttpHeaders headers= new HttpHeaders();
-        headers.add("Content-Type", "application/text");
-        headers.add("Access-Control-Allow-Origin", "*");
-        headers.add("Access-Control-Allow-Headers", "Content-Type");
-		
+
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Content-Type", "application/text");
+		headers.add("Access-Control-Allow-Origin", "*");
+		headers.add("Access-Control-Allow-Headers", "Content-Type");
+
 		HashMap<String, String> propertiesMap = new HashMap<String, String>();
-		if (compoundAlias != null) propertiesMap.put("compound_alias", compoundAlias);
-		if (supplierId != null) propertiesMap.put("supplier_id", supplierId);
-		if (project != null) propertiesMap.put("project", project);
-		if (supplier != null) propertiesMap.put("supplier", supplier);
-		if (notebook != null) propertiesMap.put("notebook", notebook);
-		if (stereoCategory != null) propertiesMap.put("stereo_category", stereoCategory);
-		if (compoundChemist != null) propertiesMap.put("compound_chemist", compoundChemist);
-		if (compoundChemistCode != null) propertiesMap.put("compound_chemist_code", compoundChemistCode);
-		
-		lcu.loadCompounds(inputFileName, errorFileName, propertiesMap);	
-		
-        return new ResponseEntity<String>(headers, HttpStatus.OK);
+		if (compoundAlias != null)
+			propertiesMap.put("compound_alias", compoundAlias);
+		if (supplierId != null)
+			propertiesMap.put("supplier_id", supplierId);
+		if (project != null)
+			propertiesMap.put("project", project);
+		if (supplier != null)
+			propertiesMap.put("supplier", supplier);
+		if (notebook != null)
+			propertiesMap.put("notebook", notebook);
+		if (stereoCategory != null)
+			propertiesMap.put("stereo_category", stereoCategory);
+		if (compoundChemist != null)
+			propertiesMap.put("compound_chemist", compoundChemist);
+		if (compoundChemistCode != null)
+			propertiesMap.put("compound_chemist_code", compoundChemistCode);
+
+		lcu.loadCompounds(inputFileName, errorFileName, propertiesMap);
+
+		return new ResponseEntity<String>(headers, HttpStatus.OK);
 
-//        example curl to call the method
-//        curl -i -X POST -H "Accept: application/json" 'http://localhost:8080/cmpdreg/api/v1/registration/cmpds?inputFileName=/tmp/spark1.sdf&errorFileName=/tmp/spark1_errorMols.sdf&compoundAlias=ALIAS&supplierId=VENDORCATNO&project=PROJECT&supplier=IGNYTA&notebook=NOTEBOOK&stereoCategory=unknown&compoundChemist=CHEMIST&compoundChemistCode=chemadmin'        
+		// example curl to call the method
+		// curl -i -X POST -H "Accept: application/json"
+		// 'http://localhost:8080/cmpdreg/api/v1/registration/cmpds?inputFileName=/tmp/spark1.sdf&errorFileName=/tmp/spark1_errorMols.sdf&compoundAlias=ALIAS&supplierId=VENDORCATNO&project=PROJECT&supplier=IGNYTA&notebook=NOTEBOOK&stereoCategory=unknown&compoundChemist=CHEMIST&compoundChemistCode=chemadmin'
 	}
 
 }
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/CmpdRegMolecule.java b/src/main/java/com/labsynch/labseer/chemclasses/CmpdRegMolecule.java
index d8d8a245d..11cc55332 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/CmpdRegMolecule.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/CmpdRegMolecule.java
@@ -5,17 +5,18 @@
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
 
 import org.springframework.stereotype.Component;
+
 @Component
 public interface CmpdRegMolecule {
-		
+
 	public void setProperty(String key, String value);
-	
+
 	public String getProperty(String key);
-	
+
 	public String[] getPropertyKeys();
-	
+
 	public String getPropertyType(String key);
-	
+
 	public String getMolStructure() throws CmpdRegMolFormatException;
 
 	public String getFormula();
@@ -27,16 +28,17 @@ public interface CmpdRegMolecule {
 	public int getTotalCharge();
 
 	public String getSmiles();
-	
+
 	public CmpdRegMolecule replaceStructure(String newStructure) throws CmpdRegMolFormatException;
 
 	public String getMrvStructure();
-	
+
 	public byte[] toBinary(CmpdRegMolecule molecule, String imageFormat, String hSize, String wSize) throws IOException;
 
 	public void dearomatize();
 
 	public StandardizationStatus getStandardizationStatus();
+
 	public enum StandardizationStatus {
 		SUCCESS,
 		ERROR,
@@ -46,6 +48,7 @@ public enum StandardizationStatus {
 	public String getStandardizationComment();
 
 	public RegistrationStatus getRegistrationStatus();
+
 	public enum RegistrationStatus {
 		SUCCESS,
 		ERROR,
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/CmpdRegMoleculeFactory.java b/src/main/java/com/labsynch/labseer/chemclasses/CmpdRegMoleculeFactory.java
index 6f33e53cc..d518c2185 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/CmpdRegMoleculeFactory.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/CmpdRegMoleculeFactory.java
@@ -2,9 +2,8 @@
 
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
 
-
 public interface CmpdRegMoleculeFactory {
-	
+
 	public CmpdRegMolecule getCmpdRegMolecule(String molStructure) throws CmpdRegMolFormatException;
 
 }
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/CmpdRegSDFReader.java b/src/main/java/com/labsynch/labseer/chemclasses/CmpdRegSDFReader.java
index 43bf90518..ec51e91f2 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/CmpdRegSDFReader.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/CmpdRegSDFReader.java
@@ -5,9 +5,9 @@
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
 
 public interface CmpdRegSDFReader {
-	
+
 	public void close() throws IOException;
-	
+
 	public CmpdRegMolecule readNextMol() throws IOException, CmpdRegMolFormatException;
 
 }
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/CmpdRegSDFReaderFactory.java b/src/main/java/com/labsynch/labseer/chemclasses/CmpdRegSDFReaderFactory.java
index c926333f2..eeb2e6e77 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/CmpdRegSDFReaderFactory.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/CmpdRegSDFReaderFactory.java
@@ -6,7 +6,8 @@
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
 
 public interface CmpdRegSDFReaderFactory {
-	
-	public CmpdRegSDFReader getCmpdRegSDFReader(String fileName) throws FileNotFoundException, CmpdRegMolFormatException, IOException;
+
+	public CmpdRegSDFReader getCmpdRegSDFReader(String fileName)
+			throws FileNotFoundException, CmpdRegMolFormatException, IOException;
 
 }
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/CmpdRegSDFWriter.java b/src/main/java/com/labsynch/labseer/chemclasses/CmpdRegSDFWriter.java
index dd63e5e0a..995b048a7 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/CmpdRegSDFWriter.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/CmpdRegSDFWriter.java
@@ -7,9 +7,9 @@
 public interface CmpdRegSDFWriter {
 
 	public boolean writeMol(CmpdRegMolecule mol) throws CmpdRegMolFormatException, IOException;
-	
+
 	public void close() throws IOException;
-	
+
 	public String getBufferString();
-	
+
 }
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/CmpdRegSDFWriterFactory.java b/src/main/java/com/labsynch/labseer/chemclasses/CmpdRegSDFWriterFactory.java
index f031bcb75..8c914d14d 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/CmpdRegSDFWriterFactory.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/CmpdRegSDFWriterFactory.java
@@ -3,9 +3,9 @@
 import java.io.IOException;
 
 public interface CmpdRegSDFWriterFactory {
-	
+
 	public CmpdRegSDFWriter getCmpdRegSDFWriter(String fileName) throws IllegalArgumentException, IOException;
-	
+
 	public CmpdRegSDFWriter getCmpdRegSDFBufferWriter() throws IllegalArgumentException, IOException;
 
 }
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure.java
index 3570c9759..e3b4529ed 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemDryRunStructure.java
@@ -21,42 +21,43 @@
 @Entity
 public class BBChemDryRunStructure extends AbstractBBChemStructure {
 
-
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static BBChemDryRunStructure fromJsonToBBChemDryRunStructure(String json) {
+    public static BBChemDryRunStructure fromJsonToBBChemDryRunStructure(String json) {
         return new JSONDeserializer<BBChemDryRunStructure>()
-        .use(null, BBChemDryRunStructure.class).deserialize(json);
+                .use(null, BBChemDryRunStructure.class).deserialize(json);
     }
 
-	public static Collection<BBChemDryRunStructure> fromJsonArrayToBBChemDryRunStructures(String json) {
+    public static Collection<BBChemDryRunStructure> fromJsonArrayToBBChemDryRunStructures(String json) {
         return new JSONDeserializer<List<BBChemDryRunStructure>>()
-        .use("values", BBChemDryRunStructure.class).deserialize(json);
+                .use("values", BBChemDryRunStructure.class).deserialize(json);
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
 
-	public static long countBBChemDryRunStructures() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM BBChemDryRunStructure o", Long.class).getSingleResult();
+    public static long countBBChemDryRunStructures() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM BBChemDryRunStructure o", Long.class)
+                .getSingleResult();
     }
 
-	public static List<BBChemDryRunStructure> findAllBBChemDryRunStructures() {
-        return entityManager().createQuery("SELECT o FROM BBChemDryRunStructure o", BBChemDryRunStructure.class).getResultList();
+    public static List<BBChemDryRunStructure> findAllBBChemDryRunStructures() {
+        return entityManager().createQuery("SELECT o FROM BBChemDryRunStructure o", BBChemDryRunStructure.class)
+                .getResultList();
     }
 
-	public static List<BBChemDryRunStructure> findAllBBChemDryRunStructures(String sortFieldName, String sortOrder) {
+    public static List<BBChemDryRunStructure> findAllBBChemDryRunStructures(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM BBChemDryRunStructure o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -67,16 +68,19 @@ public static List<BBChemDryRunStructure> findAllBBChemDryRunStructures(String s
         return entityManager().createQuery(jpaQuery, BBChemDryRunStructure.class).getResultList();
     }
 
-	public static BBChemDryRunStructure findBBChemDryRunStructure(Long id) {
-        if (id == null) return null;
+    public static BBChemDryRunStructure findBBChemDryRunStructure(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(BBChemDryRunStructure.class, id);
     }
 
-	public static List<BBChemDryRunStructure> findBBChemDryRunStructureEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM BBChemDryRunStructure o", BBChemDryRunStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<BBChemDryRunStructure> findBBChemDryRunStructureEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM BBChemDryRunStructure o", BBChemDryRunStructure.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<BBChemDryRunStructure> findBBChemDryRunStructureEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<BBChemDryRunStructure> findBBChemDryRunStructureEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM BBChemDryRunStructure o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -84,45 +88,55 @@ public static List<BBChemDryRunStructure> findBBChemDryRunStructureEntries(int f
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, BBChemDryRunStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, BBChemDryRunStructure.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public BBChemDryRunStructure merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         BBChemDryRunStructure merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public static Long countFindBBChemDryRunStructuresByPreRegEquals(String preReg) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+    public static Long countFindBBChemDryRunStructuresByPreRegEquals(String preReg) {
+        if (preReg == null || preReg.length() == 0)
+            throw new IllegalArgumentException("The preReg argument is required");
         EntityManager em = BBChemDryRunStructure.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemDryRunStructure AS o WHERE o.preReg = :preReg", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemDryRunStructure AS o WHERE o.preReg = :preReg",
+                Long.class);
         q.setParameter("preReg", preReg);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindBBChemDryRunStructuresByRegEquals(String reg) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+    public static Long countFindBBChemDryRunStructuresByRegEquals(String reg) {
+        if (reg == null || reg.length() == 0)
+            throw new IllegalArgumentException("The reg argument is required");
         EntityManager em = BBChemDryRunStructure.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemDryRunStructure AS o WHERE o.reg = :reg", Long.class);
         q.setParameter("reg", reg);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<BBChemDryRunStructure> findBBChemDryRunStructuresByPreRegEquals(String preReg) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+    public static TypedQuery<BBChemDryRunStructure> findBBChemDryRunStructuresByPreRegEquals(String preReg) {
+        if (preReg == null || preReg.length() == 0)
+            throw new IllegalArgumentException("The preReg argument is required");
         EntityManager em = BBChemDryRunStructure.entityManager();
-        TypedQuery<BBChemDryRunStructure> q = em.createQuery("SELECT o FROM BBChemDryRunStructure AS o WHERE o.preReg = :preReg", BBChemDryRunStructure.class);
+        TypedQuery<BBChemDryRunStructure> q = em.createQuery(
+                "SELECT o FROM BBChemDryRunStructure AS o WHERE o.preReg = :preReg", BBChemDryRunStructure.class);
         q.setParameter("preReg", preReg);
         return q;
     }
 
-	public static TypedQuery<BBChemDryRunStructure> findBBChemDryRunStructuresByPreRegEquals(String preReg, String sortFieldName, String sortOrder) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+    public static TypedQuery<BBChemDryRunStructure> findBBChemDryRunStructuresByPreRegEquals(String preReg,
+            String sortFieldName, String sortOrder) {
+        if (preReg == null || preReg.length() == 0)
+            throw new IllegalArgumentException("The preReg argument is required");
         EntityManager em = BBChemDryRunStructure.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemDryRunStructure AS o WHERE o.preReg = :preReg");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM BBChemDryRunStructure AS o WHERE o.preReg = :preReg");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -134,16 +148,20 @@ public static TypedQuery<BBChemDryRunStructure> findBBChemDryRunStructuresByPreR
         return q;
     }
 
-	public static TypedQuery<BBChemDryRunStructure> findBBChemDryRunStructuresByRegEquals(String reg) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+    public static TypedQuery<BBChemDryRunStructure> findBBChemDryRunStructuresByRegEquals(String reg) {
+        if (reg == null || reg.length() == 0)
+            throw new IllegalArgumentException("The reg argument is required");
         EntityManager em = BBChemDryRunStructure.entityManager();
-        TypedQuery<BBChemDryRunStructure> q = em.createQuery("SELECT o FROM BBChemDryRunStructure AS o WHERE o.reg = :reg", BBChemDryRunStructure.class);
+        TypedQuery<BBChemDryRunStructure> q = em.createQuery(
+                "SELECT o FROM BBChemDryRunStructure AS o WHERE o.reg = :reg", BBChemDryRunStructure.class);
         q.setParameter("reg", reg);
         return q;
     }
 
-	public static TypedQuery<BBChemDryRunStructure> findBBChemDryRunStructuresByRegEquals(String reg, String sortFieldName, String sortOrder) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+    public static TypedQuery<BBChemDryRunStructure> findBBChemDryRunStructuresByRegEquals(String reg,
+            String sortFieldName, String sortOrder) {
+        if (reg == null || reg.length() == 0)
+            throw new IllegalArgumentException("The reg argument is required");
         EntityManager em = BBChemDryRunStructure.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemDryRunStructure AS o WHERE o.reg = :reg");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure.java
index a1431fde9..fbc911f03 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemParentStructure.java
@@ -25,49 +25,55 @@
 
 public class BBChemParentStructure extends AbstractBBChemStructure {
 
-    public static List<BBChemParentStructure> findBBChemParentStructuresBySubstructure(BitSet substructure, int maxResults) {
-        if (substructure == null || substructure.length() == 0) throw new IllegalArgumentException("The substructure argument is required");
+    public static List<BBChemParentStructure> findBBChemParentStructuresBySubstructure(BitSet substructure,
+            int maxResults) {
+        if (substructure == null || substructure.length() == 0)
+            throw new IllegalArgumentException("The substructure argument is required");
         EntityManager em = BBChemParentStructure.entityManager();
         String fingerprintString = SimpleUtil.bitSetToString(substructure);
-        Query q = em.createNativeQuery("SELECT o.* FROM bbchem_parent_structure AS o WHERE (o.substructure \\& CAST(:fingerprintString AS bit(2048))) = CAST(:fingerprintString AS bit(2048))  ", BBChemParentStructure.class);
+        Query q = em.createNativeQuery(
+                "SELECT o.* FROM bbchem_parent_structure AS o WHERE (o.substructure \\& CAST(:fingerprintString AS bit(2048))) = CAST(:fingerprintString AS bit(2048))  ",
+                BBChemParentStructure.class);
         q.setParameter("fingerprintString", fingerprintString);
-        if(maxResults > -1) {
-			q.setMaxResults(maxResults);
-		}
+        if (maxResults > -1) {
+            q.setMaxResults(maxResults);
+        }
         return q.getResultList();
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static BBChemParentStructure fromJsonToBBChemParentStructure(String json) {
+    public static BBChemParentStructure fromJsonToBBChemParentStructure(String json) {
         return new JSONDeserializer<BBChemParentStructure>()
-        .use(null, BBChemParentStructure.class).deserialize(json);
+                .use(null, BBChemParentStructure.class).deserialize(json);
     }
 
-	public static Collection<BBChemParentStructure> fromJsonArrayToBBChemParentStructures(String json) {
+    public static Collection<BBChemParentStructure> fromJsonArrayToBBChemParentStructures(String json) {
         return new JSONDeserializer<List<BBChemParentStructure>>()
-        .use("values", BBChemParentStructure.class).deserialize(json);
+                .use("values", BBChemParentStructure.class).deserialize(json);
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
 
-	public static long countBBChemParentStructures() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM BBChemParentStructure o", Long.class).getSingleResult();
+    public static long countBBChemParentStructures() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM BBChemParentStructure o", Long.class)
+                .getSingleResult();
     }
 
-	public static List<BBChemParentStructure> findAllBBChemParentStructures() {
-        return entityManager().createQuery("SELECT o FROM BBChemParentStructure o", BBChemParentStructure.class).getResultList();
+    public static List<BBChemParentStructure> findAllBBChemParentStructures() {
+        return entityManager().createQuery("SELECT o FROM BBChemParentStructure o", BBChemParentStructure.class)
+                .getResultList();
     }
 
-	public static List<BBChemParentStructure> findAllBBChemParentStructures(String sortFieldName, String sortOrder) {
+    public static List<BBChemParentStructure> findAllBBChemParentStructures(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM BBChemParentStructure o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -78,16 +84,19 @@ public static List<BBChemParentStructure> findAllBBChemParentStructures(String s
         return entityManager().createQuery(jpaQuery, BBChemParentStructure.class).getResultList();
     }
 
-	public static BBChemParentStructure findBBChemParentStructure(Long id) {
-        if (id == null) return null;
+    public static BBChemParentStructure findBBChemParentStructure(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(BBChemParentStructure.class, id);
     }
 
-	public static List<BBChemParentStructure> findBBChemParentStructureEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM BBChemParentStructure o", BBChemParentStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<BBChemParentStructure> findBBChemParentStructureEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM BBChemParentStructure o", BBChemParentStructure.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<BBChemParentStructure> findBBChemParentStructureEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<BBChemParentStructure> findBBChemParentStructureEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM BBChemParentStructure o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -95,49 +104,59 @@ public static List<BBChemParentStructure> findBBChemParentStructureEntries(int f
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, BBChemParentStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, BBChemParentStructure.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public BBChemParentStructure merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         BBChemParentStructure merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static Long countFindBBChemParentStructuresByPreRegEquals(String preReg) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+    public static Long countFindBBChemParentStructuresByPreRegEquals(String preReg) {
+        if (preReg == null || preReg.length() == 0)
+            throw new IllegalArgumentException("The preReg argument is required");
         EntityManager em = BBChemParentStructure.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemParentStructure AS o WHERE o.preReg = :preReg", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemParentStructure AS o WHERE o.preReg = :preReg",
+                Long.class);
         q.setParameter("preReg", preReg);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindBBChemParentStructuresByRegEquals(String reg) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+    public static Long countFindBBChemParentStructuresByRegEquals(String reg) {
+        if (reg == null || reg.length() == 0)
+            throw new IllegalArgumentException("The reg argument is required");
         EntityManager em = BBChemParentStructure.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemParentStructure AS o WHERE o.reg = :reg", Long.class);
         q.setParameter("reg", reg);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<BBChemParentStructure> findBBChemParentStructuresByPreRegEquals(String preReg) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+    public static TypedQuery<BBChemParentStructure> findBBChemParentStructuresByPreRegEquals(String preReg) {
+        if (preReg == null || preReg.length() == 0)
+            throw new IllegalArgumentException("The preReg argument is required");
         EntityManager em = BBChemParentStructure.entityManager();
-        TypedQuery<BBChemParentStructure> q = em.createQuery("SELECT o FROM BBChemParentStructure AS o WHERE o.preReg = :preReg", BBChemParentStructure.class);
+        TypedQuery<BBChemParentStructure> q = em.createQuery(
+                "SELECT o FROM BBChemParentStructure AS o WHERE o.preReg = :preReg", BBChemParentStructure.class);
         q.setParameter("preReg", preReg);
         return q;
     }
 
-	public static TypedQuery<BBChemParentStructure> findBBChemParentStructuresByPreRegEquals(String preReg, String sortFieldName, String sortOrder) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+    public static TypedQuery<BBChemParentStructure> findBBChemParentStructuresByPreRegEquals(String preReg,
+            String sortFieldName, String sortOrder) {
+        if (preReg == null || preReg.length() == 0)
+            throw new IllegalArgumentException("The preReg argument is required");
         EntityManager em = BBChemParentStructure.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemParentStructure AS o WHERE o.preReg = :preReg");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM BBChemParentStructure AS o WHERE o.preReg = :preReg");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -149,16 +168,20 @@ public static TypedQuery<BBChemParentStructure> findBBChemParentStructuresByPreR
         return q;
     }
 
-	public static TypedQuery<BBChemParentStructure> findBBChemParentStructuresByRegEquals(String reg) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+    public static TypedQuery<BBChemParentStructure> findBBChemParentStructuresByRegEquals(String reg) {
+        if (reg == null || reg.length() == 0)
+            throw new IllegalArgumentException("The reg argument is required");
         EntityManager em = BBChemParentStructure.entityManager();
-        TypedQuery<BBChemParentStructure> q = em.createQuery("SELECT o FROM BBChemParentStructure AS o WHERE o.reg = :reg", BBChemParentStructure.class);
+        TypedQuery<BBChemParentStructure> q = em.createQuery(
+                "SELECT o FROM BBChemParentStructure AS o WHERE o.reg = :reg", BBChemParentStructure.class);
         q.setParameter("reg", reg);
         return q;
     }
 
-	public static TypedQuery<BBChemParentStructure> findBBChemParentStructuresByRegEquals(String reg, String sortFieldName, String sortOrder) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+    public static TypedQuery<BBChemParentStructure> findBBChemParentStructuresByRegEquals(String reg,
+            String sortFieldName, String sortOrder) {
+        if (reg == null || reg.length() == 0)
+            throw new IllegalArgumentException("The reg argument is required");
         EntityManager em = BBChemParentStructure.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemParentStructure AS o WHERE o.reg = :reg");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure.java
index 19e32127c..64fb14269 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltFormStructure.java
@@ -23,49 +23,61 @@
 @Entity
 @Configurable
 
-public class BBChemSaltFormStructure  extends AbstractBBChemStructure {
+public class BBChemSaltFormStructure extends AbstractBBChemStructure {
 
-    public static List<BBChemSaltFormStructure> findBBChemSaltFormStructuresBySubstructure(BitSet substructure, int maxResults) {
-        if (substructure == null || substructure.length() == 0) throw new IllegalArgumentException("The substructure argument is required");
+    public static List<BBChemSaltFormStructure> findBBChemSaltFormStructuresBySubstructure(BitSet substructure,
+            int maxResults) {
+        if (substructure == null || substructure.length() == 0)
+            throw new IllegalArgumentException("The substructure argument is required");
         EntityManager em = BBChemSaltFormStructure.entityManager();
         String fingerprintString = SimpleUtil.bitSetToString(substructure);
-        Query q = em.createNativeQuery("SELECT o.* FROM bbchem_salt_form_structure AS o WHERE (o.substructure \\& CAST(:fingerprintString AS bit(2048))) = CAST(:fingerprintString AS bit(2048)) ", BBChemSaltFormStructure.class);
+        Query q = em.createNativeQuery(
+                "SELECT o.* FROM bbchem_salt_form_structure AS o WHERE (o.substructure \\& CAST(:fingerprintString AS bit(2048))) = CAST(:fingerprintString AS bit(2048)) ",
+                BBChemSaltFormStructure.class);
         q.setParameter("fingerprintString", fingerprintString);
-       if(maxResults > -1) {
-			q.setMaxResults(maxResults);
-		}
+        if (maxResults > -1) {
+            q.setMaxResults(maxResults);
+        }
         return q.getResultList();
     }
 
-
-	public static Long countFindBBChemSaltFormStructuresByPreRegEquals(String preReg) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+    public static Long countFindBBChemSaltFormStructuresByPreRegEquals(String preReg) {
+        if (preReg == null || preReg.length() == 0)
+            throw new IllegalArgumentException("The preReg argument is required");
         EntityManager em = BBChemSaltFormStructure.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemSaltFormStructure AS o WHERE o.preReg = :preReg", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemSaltFormStructure AS o WHERE o.preReg = :preReg",
+                Long.class);
         q.setParameter("preReg", preReg);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindBBChemSaltFormStructuresByRegEquals(String reg) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+    public static Long countFindBBChemSaltFormStructuresByRegEquals(String reg) {
+        if (reg == null || reg.length() == 0)
+            throw new IllegalArgumentException("The reg argument is required");
         EntityManager em = BBChemSaltFormStructure.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemSaltFormStructure AS o WHERE o.reg = :reg", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemSaltFormStructure AS o WHERE o.reg = :reg",
+                Long.class);
         q.setParameter("reg", reg);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<BBChemSaltFormStructure> findBBChemSaltFormStructuresByPreRegEquals(String preReg) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+    public static TypedQuery<BBChemSaltFormStructure> findBBChemSaltFormStructuresByPreRegEquals(String preReg) {
+        if (preReg == null || preReg.length() == 0)
+            throw new IllegalArgumentException("The preReg argument is required");
         EntityManager em = BBChemSaltFormStructure.entityManager();
-        TypedQuery<BBChemSaltFormStructure> q = em.createQuery("SELECT o FROM BBChemSaltFormStructure AS o WHERE o.preReg = :preReg", BBChemSaltFormStructure.class);
+        TypedQuery<BBChemSaltFormStructure> q = em.createQuery(
+                "SELECT o FROM BBChemSaltFormStructure AS o WHERE o.preReg = :preReg", BBChemSaltFormStructure.class);
         q.setParameter("preReg", preReg);
         return q;
     }
 
-	public static TypedQuery<BBChemSaltFormStructure> findBBChemSaltFormStructuresByPreRegEquals(String preReg, String sortFieldName, String sortOrder) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+    public static TypedQuery<BBChemSaltFormStructure> findBBChemSaltFormStructuresByPreRegEquals(String preReg,
+            String sortFieldName, String sortOrder) {
+        if (preReg == null || preReg.length() == 0)
+            throw new IllegalArgumentException("The preReg argument is required");
         EntityManager em = BBChemSaltFormStructure.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemSaltFormStructure AS o WHERE o.preReg = :preReg");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM BBChemSaltFormStructure AS o WHERE o.preReg = :preReg");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -77,16 +89,20 @@ public static TypedQuery<BBChemSaltFormStructure> findBBChemSaltFormStructuresBy
         return q;
     }
 
-	public static TypedQuery<BBChemSaltFormStructure> findBBChemSaltFormStructuresByRegEquals(String reg) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+    public static TypedQuery<BBChemSaltFormStructure> findBBChemSaltFormStructuresByRegEquals(String reg) {
+        if (reg == null || reg.length() == 0)
+            throw new IllegalArgumentException("The reg argument is required");
         EntityManager em = BBChemSaltFormStructure.entityManager();
-        TypedQuery<BBChemSaltFormStructure> q = em.createQuery("SELECT o FROM BBChemSaltFormStructure AS o WHERE o.reg = :reg", BBChemSaltFormStructure.class);
+        TypedQuery<BBChemSaltFormStructure> q = em.createQuery(
+                "SELECT o FROM BBChemSaltFormStructure AS o WHERE o.reg = :reg", BBChemSaltFormStructure.class);
         q.setParameter("reg", reg);
         return q;
     }
 
-	public static TypedQuery<BBChemSaltFormStructure> findBBChemSaltFormStructuresByRegEquals(String reg, String sortFieldName, String sortOrder) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+    public static TypedQuery<BBChemSaltFormStructure> findBBChemSaltFormStructuresByRegEquals(String reg,
+            String sortFieldName, String sortOrder) {
+        if (reg == null || reg.length() == 0)
+            throw new IllegalArgumentException("The reg argument is required");
         EntityManager em = BBChemSaltFormStructure.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemSaltFormStructure AS o WHERE o.reg = :reg");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -100,21 +116,24 @@ public static TypedQuery<BBChemSaltFormStructure> findBBChemSaltFormStructuresBy
         return q;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
 
-	public static long countBBChemSaltFormStructures() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM BBChemSaltFormStructure o", Long.class).getSingleResult();
+    public static long countBBChemSaltFormStructures() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM BBChemSaltFormStructure o", Long.class)
+                .getSingleResult();
     }
 
-	public static List<BBChemSaltFormStructure> findAllBBChemSaltFormStructures() {
-        return entityManager().createQuery("SELECT o FROM BBChemSaltFormStructure o", BBChemSaltFormStructure.class).getResultList();
+    public static List<BBChemSaltFormStructure> findAllBBChemSaltFormStructures() {
+        return entityManager().createQuery("SELECT o FROM BBChemSaltFormStructure o", BBChemSaltFormStructure.class)
+                .getResultList();
     }
 
-	public static List<BBChemSaltFormStructure> findAllBBChemSaltFormStructures(String sortFieldName, String sortOrder) {
+    public static List<BBChemSaltFormStructure> findAllBBChemSaltFormStructures(String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM BBChemSaltFormStructure o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -125,16 +144,19 @@ public static List<BBChemSaltFormStructure> findAllBBChemSaltFormStructures(Stri
         return entityManager().createQuery(jpaQuery, BBChemSaltFormStructure.class).getResultList();
     }
 
-	public static BBChemSaltFormStructure findBBChemSaltFormStructure(Long id) {
-        if (id == null) return null;
+    public static BBChemSaltFormStructure findBBChemSaltFormStructure(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(BBChemSaltFormStructure.class, id);
     }
 
-	public static List<BBChemSaltFormStructure> findBBChemSaltFormStructureEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM BBChemSaltFormStructure o", BBChemSaltFormStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<BBChemSaltFormStructure> findBBChemSaltFormStructureEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM BBChemSaltFormStructure o", BBChemSaltFormStructure.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<BBChemSaltFormStructure> findBBChemSaltFormStructureEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<BBChemSaltFormStructure> findBBChemSaltFormStructureEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM BBChemSaltFormStructure o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -142,34 +164,36 @@ public static List<BBChemSaltFormStructure> findBBChemSaltFormStructureEntries(i
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, BBChemSaltFormStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, BBChemSaltFormStructure.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public BBChemSaltFormStructure merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         BBChemSaltFormStructure merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static BBChemSaltFormStructure fromJsonToBBChemSaltFormStructure(String json) {
+    public static BBChemSaltFormStructure fromJsonToBBChemSaltFormStructure(String json) {
         return new JSONDeserializer<BBChemSaltFormStructure>()
-        .use(null, BBChemSaltFormStructure.class).deserialize(json);
+                .use(null, BBChemSaltFormStructure.class).deserialize(json);
     }
 
-	public static Collection<BBChemSaltFormStructure> fromJsonArrayToBBChemSaltFormStructures(String json) {
+    public static Collection<BBChemSaltFormStructure> fromJsonArrayToBBChemSaltFormStructures(String json) {
         return new JSONDeserializer<List<BBChemSaltFormStructure>>()
-        .use("values", BBChemSaltFormStructure.class).deserialize(json);
+                .use("values", BBChemSaltFormStructure.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure.java
index 8d6b6796b..85790e25a 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemSaltStructure.java
@@ -22,35 +22,42 @@
 
 public class BBChemSaltStructure extends AbstractBBChemStructure {
 
-
-	public static Long countFindBBChemSaltStructuresByPreRegEquals(String preReg) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+    public static Long countFindBBChemSaltStructuresByPreRegEquals(String preReg) {
+        if (preReg == null || preReg.length() == 0)
+            throw new IllegalArgumentException("The preReg argument is required");
         EntityManager em = BBChemSaltStructure.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemSaltStructure AS o WHERE o.preReg = :preReg", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemSaltStructure AS o WHERE o.preReg = :preReg",
+                Long.class);
         q.setParameter("preReg", preReg);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindBBChemSaltStructuresByRegEquals(String reg) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+    public static Long countFindBBChemSaltStructuresByRegEquals(String reg) {
+        if (reg == null || reg.length() == 0)
+            throw new IllegalArgumentException("The reg argument is required");
         EntityManager em = BBChemSaltStructure.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemSaltStructure AS o WHERE o.reg = :reg", Long.class);
         q.setParameter("reg", reg);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<BBChemSaltStructure> findBBChemSaltStructuresByPreRegEquals(String preReg) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+    public static TypedQuery<BBChemSaltStructure> findBBChemSaltStructuresByPreRegEquals(String preReg) {
+        if (preReg == null || preReg.length() == 0)
+            throw new IllegalArgumentException("The preReg argument is required");
         EntityManager em = BBChemSaltStructure.entityManager();
-        TypedQuery<BBChemSaltStructure> q = em.createQuery("SELECT o FROM BBChemSaltStructure AS o WHERE o.preReg = :preReg", BBChemSaltStructure.class);
+        TypedQuery<BBChemSaltStructure> q = em.createQuery(
+                "SELECT o FROM BBChemSaltStructure AS o WHERE o.preReg = :preReg", BBChemSaltStructure.class);
         q.setParameter("preReg", preReg);
         return q;
     }
 
-	public static TypedQuery<BBChemSaltStructure> findBBChemSaltStructuresByPreRegEquals(String preReg, String sortFieldName, String sortOrder) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+    public static TypedQuery<BBChemSaltStructure> findBBChemSaltStructuresByPreRegEquals(String preReg,
+            String sortFieldName, String sortOrder) {
+        if (preReg == null || preReg.length() == 0)
+            throw new IllegalArgumentException("The preReg argument is required");
         EntityManager em = BBChemSaltStructure.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemSaltStructure AS o WHERE o.preReg = :preReg");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM BBChemSaltStructure AS o WHERE o.preReg = :preReg");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -62,16 +69,20 @@ public static TypedQuery<BBChemSaltStructure> findBBChemSaltStructuresByPreRegEq
         return q;
     }
 
-	public static TypedQuery<BBChemSaltStructure> findBBChemSaltStructuresByRegEquals(String reg) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+    public static TypedQuery<BBChemSaltStructure> findBBChemSaltStructuresByRegEquals(String reg) {
+        if (reg == null || reg.length() == 0)
+            throw new IllegalArgumentException("The reg argument is required");
         EntityManager em = BBChemSaltStructure.entityManager();
-        TypedQuery<BBChemSaltStructure> q = em.createQuery("SELECT o FROM BBChemSaltStructure AS o WHERE o.reg = :reg", BBChemSaltStructure.class);
+        TypedQuery<BBChemSaltStructure> q = em.createQuery("SELECT o FROM BBChemSaltStructure AS o WHERE o.reg = :reg",
+                BBChemSaltStructure.class);
         q.setParameter("reg", reg);
         return q;
     }
 
-	public static TypedQuery<BBChemSaltStructure> findBBChemSaltStructuresByRegEquals(String reg, String sortFieldName, String sortOrder) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+    public static TypedQuery<BBChemSaltStructure> findBBChemSaltStructuresByRegEquals(String reg, String sortFieldName,
+            String sortOrder) {
+        if (reg == null || reg.length() == 0)
+            throw new IllegalArgumentException("The reg argument is required");
         EntityManager em = BBChemSaltStructure.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemSaltStructure AS o WHERE o.reg = :reg");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -85,17 +96,18 @@ public static TypedQuery<BBChemSaltStructure> findBBChemSaltStructuresByRegEqual
         return q;
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
 
-	public static long countBBChemSaltStructures() {
+    public static long countBBChemSaltStructures() {
         return entityManager().createQuery("SELECT COUNT(o) FROM BBChemSaltStructure o", Long.class).getSingleResult();
     }
 
-	public static List<BBChemSaltStructure> findAllBBChemSaltStructures() {
-        return entityManager().createQuery("SELECT o FROM BBChemSaltStructure o", BBChemSaltStructure.class).getResultList();
+    public static List<BBChemSaltStructure> findAllBBChemSaltStructures() {
+        return entityManager().createQuery("SELECT o FROM BBChemSaltStructure o", BBChemSaltStructure.class)
+                .getResultList();
     }
 
-	public static List<BBChemSaltStructure> findAllBBChemSaltStructures(String sortFieldName, String sortOrder) {
+    public static List<BBChemSaltStructure> findAllBBChemSaltStructures(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM BBChemSaltStructure o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -106,16 +118,19 @@ public static List<BBChemSaltStructure> findAllBBChemSaltStructures(String sortF
         return entityManager().createQuery(jpaQuery, BBChemSaltStructure.class).getResultList();
     }
 
-	public static BBChemSaltStructure findBBChemSaltStructure(Long id) {
-        if (id == null) return null;
+    public static BBChemSaltStructure findBBChemSaltStructure(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(BBChemSaltStructure.class, id);
     }
 
-	public static List<BBChemSaltStructure> findBBChemSaltStructureEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM BBChemSaltStructure o", BBChemSaltStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<BBChemSaltStructure> findBBChemSaltStructureEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM BBChemSaltStructure o", BBChemSaltStructure.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<BBChemSaltStructure> findBBChemSaltStructureEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<BBChemSaltStructure> findBBChemSaltStructureEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM BBChemSaltStructure o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -123,38 +138,40 @@ public static List<BBChemSaltStructure> findBBChemSaltStructureEntries(int first
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, BBChemSaltStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, BBChemSaltStructure.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public BBChemSaltStructure merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         BBChemSaltStructure merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static BBChemSaltStructure fromJsonToBBChemSaltStructure(String json) {
+    public static BBChemSaltStructure fromJsonToBBChemSaltStructure(String json) {
         return new JSONDeserializer<BBChemSaltStructure>()
-        .use(null, BBChemSaltStructure.class).deserialize(json);
+                .use(null, BBChemSaltStructure.class).deserialize(json);
     }
 
-	public static Collection<BBChemSaltStructure> fromJsonArrayToBBChemSaltStructures(String json) {
+    public static Collection<BBChemSaltStructure> fromJsonArrayToBBChemSaltStructures(String json) {
         return new JSONDeserializer<List<BBChemSaltStructure>>()
-        .use("values", BBChemSaltStructure.class).deserialize(json);
+                .use("values", BBChemSaltStructure.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure.java
index 5c3b68579..4953e81a6 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStandardizationDryRunStructure.java
@@ -22,84 +22,106 @@
 
 public class BBChemStandardizationDryRunStructure extends AbstractBBChemStructure {
 
-
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static Long countFindBBChemStandardizationDryRunStructuresByPreRegEquals(String preReg) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+    public static Long countFindBBChemStandardizationDryRunStructuresByPreRegEquals(String preReg) {
+        if (preReg == null || preReg.length() == 0)
+            throw new IllegalArgumentException("The preReg argument is required");
         EntityManager em = BBChemStandardizationDryRunStructure.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemStandardizationDryRunStructure AS o WHERE o.preReg = :preReg", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM BBChemStandardizationDryRunStructure AS o WHERE o.preReg = :preReg", Long.class);
         q.setParameter("preReg", preReg);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindBBChemStandardizationDryRunStructuresByRegEquals(String reg) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+    public static Long countFindBBChemStandardizationDryRunStructuresByRegEquals(String reg) {
+        if (reg == null || reg.length() == 0)
+            throw new IllegalArgumentException("The reg argument is required");
         EntityManager em = BBChemStandardizationDryRunStructure.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BBChemStandardizationDryRunStructure AS o WHERE o.reg = :reg", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM BBChemStandardizationDryRunStructure AS o WHERE o.reg = :reg", Long.class);
         q.setParameter("reg", reg);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<BBChemStandardizationDryRunStructure> findBBChemStandardizationDryRunStructuresByPreRegEquals(String preReg) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+    public static TypedQuery<BBChemStandardizationDryRunStructure> findBBChemStandardizationDryRunStructuresByPreRegEquals(
+            String preReg) {
+        if (preReg == null || preReg.length() == 0)
+            throw new IllegalArgumentException("The preReg argument is required");
         EntityManager em = BBChemStandardizationDryRunStructure.entityManager();
-        TypedQuery<BBChemStandardizationDryRunStructure> q = em.createQuery("SELECT o FROM BBChemStandardizationDryRunStructure AS o WHERE o.preReg = :preReg", BBChemStandardizationDryRunStructure.class);
+        TypedQuery<BBChemStandardizationDryRunStructure> q = em.createQuery(
+                "SELECT o FROM BBChemStandardizationDryRunStructure AS o WHERE o.preReg = :preReg",
+                BBChemStandardizationDryRunStructure.class);
         q.setParameter("preReg", preReg);
         return q;
     }
 
-	public static TypedQuery<BBChemStandardizationDryRunStructure> findBBChemStandardizationDryRunStructuresByPreRegEquals(String preReg, String sortFieldName, String sortOrder) {
-        if (preReg == null || preReg.length() == 0) throw new IllegalArgumentException("The preReg argument is required");
+    public static TypedQuery<BBChemStandardizationDryRunStructure> findBBChemStandardizationDryRunStructuresByPreRegEquals(
+            String preReg, String sortFieldName, String sortOrder) {
+        if (preReg == null || preReg.length() == 0)
+            throw new IllegalArgumentException("The preReg argument is required");
         EntityManager em = BBChemStandardizationDryRunStructure.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemStandardizationDryRunStructure AS o WHERE o.preReg = :preReg");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM BBChemStandardizationDryRunStructure AS o WHERE o.preReg = :preReg");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
                 queryBuilder.append(" ").append(sortOrder);
             }
         }
-        TypedQuery<BBChemStandardizationDryRunStructure> q = em.createQuery(queryBuilder.toString(), BBChemStandardizationDryRunStructure.class);
+        TypedQuery<BBChemStandardizationDryRunStructure> q = em.createQuery(queryBuilder.toString(),
+                BBChemStandardizationDryRunStructure.class);
         q.setParameter("preReg", preReg);
         return q;
     }
 
-	public static TypedQuery<BBChemStandardizationDryRunStructure> findBBChemStandardizationDryRunStructuresByRegEquals(String reg) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+    public static TypedQuery<BBChemStandardizationDryRunStructure> findBBChemStandardizationDryRunStructuresByRegEquals(
+            String reg) {
+        if (reg == null || reg.length() == 0)
+            throw new IllegalArgumentException("The reg argument is required");
         EntityManager em = BBChemStandardizationDryRunStructure.entityManager();
-        TypedQuery<BBChemStandardizationDryRunStructure> q = em.createQuery("SELECT o FROM BBChemStandardizationDryRunStructure AS o WHERE o.reg = :reg", BBChemStandardizationDryRunStructure.class);
+        TypedQuery<BBChemStandardizationDryRunStructure> q = em.createQuery(
+                "SELECT o FROM BBChemStandardizationDryRunStructure AS o WHERE o.reg = :reg",
+                BBChemStandardizationDryRunStructure.class);
         q.setParameter("reg", reg);
         return q;
     }
 
-	public static TypedQuery<BBChemStandardizationDryRunStructure> findBBChemStandardizationDryRunStructuresByRegEquals(String reg, String sortFieldName, String sortOrder) {
-        if (reg == null || reg.length() == 0) throw new IllegalArgumentException("The reg argument is required");
+    public static TypedQuery<BBChemStandardizationDryRunStructure> findBBChemStandardizationDryRunStructuresByRegEquals(
+            String reg, String sortFieldName, String sortOrder) {
+        if (reg == null || reg.length() == 0)
+            throw new IllegalArgumentException("The reg argument is required");
         EntityManager em = BBChemStandardizationDryRunStructure.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BBChemStandardizationDryRunStructure AS o WHERE o.reg = :reg");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM BBChemStandardizationDryRunStructure AS o WHERE o.reg = :reg");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
                 queryBuilder.append(" ").append(sortOrder);
             }
         }
-        TypedQuery<BBChemStandardizationDryRunStructure> q = em.createQuery(queryBuilder.toString(), BBChemStandardizationDryRunStructure.class);
+        TypedQuery<BBChemStandardizationDryRunStructure> q = em.createQuery(queryBuilder.toString(),
+                BBChemStandardizationDryRunStructure.class);
         q.setParameter("reg", reg);
         return q;
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
 
-	public static long countBBChemStandardizationDryRunStructures() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM BBChemStandardizationDryRunStructure o", Long.class).getSingleResult();
+    public static long countBBChemStandardizationDryRunStructures() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM BBChemStandardizationDryRunStructure o", Long.class)
+                .getSingleResult();
     }
 
-	public static List<BBChemStandardizationDryRunStructure> findAllBBChemStandardizationDryRunStructures() {
-        return entityManager().createQuery("SELECT o FROM BBChemStandardizationDryRunStructure o", BBChemStandardizationDryRunStructure.class).getResultList();
+    public static List<BBChemStandardizationDryRunStructure> findAllBBChemStandardizationDryRunStructures() {
+        return entityManager().createQuery("SELECT o FROM BBChemStandardizationDryRunStructure o",
+                BBChemStandardizationDryRunStructure.class).getResultList();
     }
 
-	public static List<BBChemStandardizationDryRunStructure> findAllBBChemStandardizationDryRunStructures(String sortFieldName, String sortOrder) {
+    public static List<BBChemStandardizationDryRunStructure> findAllBBChemStandardizationDryRunStructures(
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM BBChemStandardizationDryRunStructure o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -110,16 +132,22 @@ public static List<BBChemStandardizationDryRunStructure> findAllBBChemStandardiz
         return entityManager().createQuery(jpaQuery, BBChemStandardizationDryRunStructure.class).getResultList();
     }
 
-	public static BBChemStandardizationDryRunStructure findBBChemStandardizationDryRunStructure(Long id) {
-        if (id == null) return null;
+    public static BBChemStandardizationDryRunStructure findBBChemStandardizationDryRunStructure(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(BBChemStandardizationDryRunStructure.class, id);
     }
 
-	public static List<BBChemStandardizationDryRunStructure> findBBChemStandardizationDryRunStructureEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM BBChemStandardizationDryRunStructure o", BBChemStandardizationDryRunStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<BBChemStandardizationDryRunStructure> findBBChemStandardizationDryRunStructureEntries(
+            int firstResult, int maxResults) {
+        return entityManager()
+                .createQuery("SELECT o FROM BBChemStandardizationDryRunStructure o",
+                        BBChemStandardizationDryRunStructure.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<BBChemStandardizationDryRunStructure> findBBChemStandardizationDryRunStructureEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<BBChemStandardizationDryRunStructure> findBBChemStandardizationDryRunStructureEntries(
+            int firstResult, int maxResults, String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM BBChemStandardizationDryRunStructure o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -127,34 +155,37 @@ public static List<BBChemStandardizationDryRunStructure> findBBChemStandardizati
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, BBChemStandardizationDryRunStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, BBChemStandardizationDryRunStructure.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public BBChemStandardizationDryRunStructure merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         BBChemStandardizationDryRunStructure merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static BBChemStandardizationDryRunStructure fromJsonToBBChemStandardizationDryRunStructure(String json) {
+    public static BBChemStandardizationDryRunStructure fromJsonToBBChemStandardizationDryRunStructure(String json) {
         return new JSONDeserializer<BBChemStandardizationDryRunStructure>()
-        .use(null, BBChemStandardizationDryRunStructure.class).deserialize(json);
+                .use(null, BBChemStandardizationDryRunStructure.class).deserialize(json);
     }
 
-	public static Collection<BBChemStandardizationDryRunStructure> fromJsonArrayToBBChemStandardizationDryRunStructures(String json) {
+    public static Collection<BBChemStandardizationDryRunStructure> fromJsonArrayToBBChemStandardizationDryRunStructures(
+            String json) {
         return new JSONDeserializer<List<BBChemStandardizationDryRunStructure>>()
-        .use("values", BBChemStandardizationDryRunStructure.class).deserialize(json);
+                .use("values", BBChemStandardizationDryRunStructure.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStructureService.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStructureService.java
index 8361f5de8..833f3fea6 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStructureService.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStructureService.java
@@ -1,4 +1,5 @@
 package com.labsynch.labseer.chemclasses.bbchem;
+
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
@@ -17,19 +18,23 @@ public interface BBChemStructureService {
 
     public JsonNode postToProcessService(String molfile) throws IOException;
 
-    public BBChemParentStructure getProcessedStructure(String molfile, Boolean includeFingerprints) throws CmpdRegMolFormatException;
+    public BBChemParentStructure getProcessedStructure(String molfile, Boolean includeFingerprints)
+            throws CmpdRegMolFormatException;
 
-    public HashMap<String, BBChemParentStructure> getProcessedStructures(HashMap<String, String> structures, Boolean includeFingerprints) throws CmpdRegMolFormatException;
+    public HashMap<String, BBChemParentStructure> getProcessedStructures(HashMap<String, String> structures,
+            Boolean includeFingerprints) throws CmpdRegMolFormatException;
 
     // HashMap<OriginalKey, Entry<PreprocessorStatus, PreprocessorStructure>>
-    public HashMap<String, Entry<String, String>> getPreprocessedStructures(HashMap<String, String> structures) throws CmpdRegMolFormatException, IOException;
+    public HashMap<String, Entry<String, String>> getPreprocessedStructures(HashMap<String, String> structures)
+            throws CmpdRegMolFormatException, IOException;
 
     public String getSDF(BBChemParentStructure structure) throws IOException;
 
     public List<BBChemParentStructure> parseSDF(String molfile) throws CmpdRegMolFormatException;
-    
+
     public List<String> getMolFragments(String molfile) throws CmpdRegMolFormatException;
 
-    public HashMap<? extends AbstractBBChemStructure, Boolean> substructureMatch(String queryMol, List<? extends AbstractBBChemStructure> needMatchMolFiles) throws CmpdRegMolFormatException;
+    public HashMap<? extends AbstractBBChemStructure, Boolean> substructureMatch(String queryMol,
+            List<? extends AbstractBBChemStructure> needMatchMolFiles) throws CmpdRegMolFormatException;
 
 }
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStructureServiceImpl.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStructureServiceImpl.java
index 8df07ca83..5bd0ac7eb 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStructureServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/BBChemStructureServiceImpl.java
@@ -37,7 +37,7 @@
 import org.springframework.stereotype.Component;
 
 @Component
-public class BBChemStructureServiceImpl  implements BBChemStructureService {
+public class BBChemStructureServiceImpl implements BBChemStructureService {
 
 	Logger logger = LoggerFactory.getLogger(BBChemStructureServiceImpl.class);
 
@@ -58,17 +58,17 @@ private String getUrlFromPreprocessorSettings(String propertyKey) throws IOExcep
 		JsonNode jsonNode = null;
 		jsonNode = getPreprocessorSettings();
 		JsonNode urlNode = jsonNode.get(propertyKey);
-		if(urlNode == null || urlNode.isNull()) {
-			logger.error("Missing preprocessorSettings "+propertyKey+"!!");
-			throw new IOException("Missing preprocessorSettings "+propertyKey+"!!");
+		if (urlNode == null || urlNode.isNull()) {
+			logger.error("Missing preprocessorSettings " + propertyKey + "!!");
+			throw new IOException("Missing preprocessorSettings " + propertyKey + "!!");
 		}
 		String url = urlNode.asText();
 		return url;
 
 	}
 
-
-	private HashMap<String, BitSet> molsToFingerprints(HashMap<String, String> structures, String type)  throws CmpdRegMolFormatException{
+	private HashMap<String, BitSet> molsToFingerprints(HashMap<String, String> structures, String type)
+			throws CmpdRegMolFormatException {
 		// Fetch the fingerprint from the BBChem fingerprint service
 		String url = null;
 		try {
@@ -76,14 +76,15 @@ private HashMap<String, BitSet> molsToFingerprints(HashMap<String, String> struc
 		} catch (IOException e) {
 			throw new CmpdRegMolFormatException(e);
 		}
-		
+
 		// Create the request data object
 		ObjectMapper mapper = new ObjectMapper();
 		ObjectNode requestData = mapper.createObjectNode();
 
-		// Split the list of structures into chunks of propertiesUtilService.getExternalStructureProcessingBatchSize()
+		// Split the list of structures into chunks of
+		// propertiesUtilService.getExternalStructureProcessingBatchSize()
 		List<List<String>> structureGroups = splitIntoListOfLists(structures);
-		
+
 		Collection<Callable<Response>> tasks = new ArrayList<>();
 		// Create the tasks and include an id for the task
 		for (int i = 0; i < structureGroups.size(); i++) {
@@ -104,12 +105,12 @@ private HashMap<String, BitSet> molsToFingerprints(HashMap<String, String> struc
 			logger.debug("requestString: " + requestString);
 			tasks.add(new Request(i, url, requestString));
 		}
-		
+
 		ForkJoinPool pool = new ForkJoinPool(Runtime.getRuntime().availableProcessors());
 		logger.info("Invoking " + tasks.size() + " fingerprint tasks");
 		List<Future<Response>> results = pool.invokeAll(tasks);
 		HashMap<Integer, JsonNode> responseMap = new HashMap<Integer, JsonNode>();
-		for(Future<Response> response : results){
+		for (Future<Response> response : results) {
 			String responseBody;
 			int responseCode;
 			Integer responseId;
@@ -121,7 +122,7 @@ private HashMap<String, BitSet> molsToFingerprints(HashMap<String, String> struc
 				throw new CmpdRegMolFormatException("Error posting to fingerprint service: " + e.getMessage());
 			}
 
-			if(responseCode != 200) {
+			if (responseCode != 200) {
 				logger.error("Response Body: " + responseBody);
 				logger.error("URL was: " + url);
 				throw new CmpdRegMolFormatException("Error posting to fingerprint service: " + responseBody);
@@ -139,16 +140,17 @@ private HashMap<String, BitSet> molsToFingerprints(HashMap<String, String> struc
 		}
 		logger.info("Got response for all " + tasks.size() + " fingerprint tasks");
 
-        // The output array is guaranteed to be in the same order as its inputs
+		// The output array is guaranteed to be in the same order as its inputs
 		// Sort the response hashmap by the keys
 		List<Integer> responseIds = new ArrayList<Integer>(responseMap.keySet());
 		Collections.sort(responseIds);
-		
-        // Return hashmap with the String key from the input hashmap and the fingerprint BitSet
+
+		// Return hashmap with the String key from the input hashmap and the fingerprint
+		// BitSet
 		HashMap<String, BitSet> fingerprints = new HashMap<String, BitSet>();
 		Object[] structuresArray = structures.keySet().toArray();
 		int s = 0;
-		for(Integer responseId : responseIds) {			
+		for (Integer responseId : responseIds) {
 			logger.debug("Response ID: " + responseId);
 			// Combine the json nodes
 			JsonNode responseNode = responseMap.get(responseId);
@@ -165,7 +167,7 @@ private HashMap<String, BitSet> molsToFingerprints(HashMap<String, String> struc
 		return fingerprints;
 	}
 
-	private BitSet getFingerprint(String molStructure, String type)  throws CmpdRegMolFormatException{
+	private BitSet getFingerprint(String molStructure, String type) throws CmpdRegMolFormatException {
 		// Get a single fingerprint by calling the BBChem fingerprint service
 		try {
 			// Create the request data object
@@ -183,23 +185,27 @@ private BitSet getFingerprint(String molStructure, String type)  throws CmpdRegM
 	}
 
 	List<List<String>> splitIntoListOfLists(HashMap<String, String> stringHashMap) {
-		// Split the hashmap into chunks of propertiesUtilService.getExternalStructureProcessingBatchSize()
+		// Split the hashmap into chunks of
+		// propertiesUtilService.getExternalStructureProcessingBatchSize()
 		List<List<String>> groups = new ArrayList<List<String>>();
 		List<String> group = new ArrayList<String>();
 		Object[] array = stringHashMap.keySet().toArray();
 		for (String key : stringHashMap.keySet()) {
 			group.add(stringHashMap.get(key));
 
-			// Check if structure group size is now propertiesUtilService.getExternalStructureProcessingBatchSize() or this is the last item in the original hashmap
-			if (group.size() == propertiesUtilService.getExternalStructureProcessingBatchSize() || key == array[array.length - 1]) {
+			// Check if structure group size is now
+			// propertiesUtilService.getExternalStructureProcessingBatchSize() or this is
+			// the last item in the original hashmap
+			if (group.size() == propertiesUtilService.getExternalStructureProcessingBatchSize()
+					|| key == array[array.length - 1]) {
 				groups.add(group);
 				group = new ArrayList<String>();
 			}
 		}
 		return groups;
 	}
-	
-	private JsonNode postToProcessService(HashMap<String, String> structures)  throws IOException {
+
+	private JsonNode postToProcessService(HashMap<String, String> structures) throws IOException {
 
 		String url = getUrlFromPreprocessorSettings("processURL");
 
@@ -212,7 +218,8 @@ private JsonNode postToProcessService(HashMap<String, String> structures)  throw
 		// Get the standardization actions and options
 		ObjectNode options = (ObjectNode) jsonNode.get("process_options");
 
-		// We do not want standardization here but the route requires a standardization object to be sent in.
+		// We do not want standardization here but the route requires a standardization
+		// object to be sent in.
 		// Adding an empty standardizer actions so to avoid any standardization
 		options.put("standardizer_actions", mapper.createObjectNode());
 		requestData.put("options", options);
@@ -243,7 +250,7 @@ private JsonNode postToProcessService(HashMap<String, String> structures)  throw
 		logger.info("Invoking " + tasks.size() + " process tasks");
 		List<Future<Response>> results = pool.invokeAll(tasks);
 		HashMap<Integer, JsonNode> responseMap = new HashMap<Integer, JsonNode>();
-		for(Future<Response> response : results){
+		for (Future<Response> response : results) {
 			String responseBody;
 			int responseCode;
 			int responseId;
@@ -255,7 +262,7 @@ private JsonNode postToProcessService(HashMap<String, String> structures)  throw
 				throw new IOException("Error posting to process service: " + e.getMessage());
 			}
 
-			if(responseCode != 200) {
+			if (responseCode != 200) {
 				logger.error("Response Body: " + responseBody);
 				logger.error("URL was: " + url);
 				throw new IOException("Error posting to process service: " + responseBody);
@@ -271,9 +278,9 @@ private JsonNode postToProcessService(HashMap<String, String> structures)  throw
 		// Sort the response hashmap by the keys
 		List<Integer> responseIds = new ArrayList<Integer>(responseMap.keySet());
 		Collections.sort(responseIds);
-		//Empty json node array
+		// Empty json node array
 		ArrayNode responseArray = mapper.createArrayNode();
-		for(Integer responseId : responseIds) {
+		for (Integer responseId : responseIds) {
 			logger.debug("Response ID: " + responseId);
 			// Combine the json nodes
 			JsonNode responseNode = responseMap.get(responseId);
@@ -284,19 +291,20 @@ private JsonNode postToProcessService(HashMap<String, String> structures)  throw
 
 	@Override
 	public JsonNode postToProcessService(String molfile) throws IOException {
-		
-		//New hashamp
+
+		// New hashamp
 		HashMap<String, String> structures = new HashMap<String, String>();
-		//Add the molfile to the hashmap
+		// Add the molfile to the hashmap
 		structures.put("mol", molfile);
-		//Post to the service
+		// Post to the service
 		JsonNode jsonNode = postToProcessService(structures);
 
 		return jsonNode;
 	}
 
 	@Override
-	public HashMap<String, Entry<String, String>> getPreprocessedStructures(HashMap<String, String> structures)  throws CmpdRegMolFormatException, IOException{
+	public HashMap<String, Entry<String, String>> getPreprocessedStructures(HashMap<String, String> structures)
+			throws CmpdRegMolFormatException, IOException {
 		// Return a hashmap of the preprocessed structures
 		// HashMap<OriginalKey, Entry<PreprocessorStatus, PreprocessedStructure>>
 
@@ -311,13 +319,15 @@ public HashMap<String, Entry<String, String>> getPreprocessedStructures(HashMap<
 		requestData.put("config", standardizerActions);
 		requestData.put("output_format", "MOL");
 
-		// Split the list of structures into chunks of propertiesUtilService.getExternalStructureProcessingBatchSize()
+		// Split the list of structures into chunks of
+		// propertiesUtilService.getExternalStructureProcessingBatchSize()
 		List<HashMap<String, String>> structureGroups = new ArrayList<HashMap<String, String>>();
 		HashMap<String, String> structureGroup = new HashMap<String, String>();
 		Object[] structuresArray = structures.keySet().toArray();
 		for (String structure : structures.keySet()) {
 			structureGroup.put(structure, structures.get(structure));
-			if(structureGroup.size() == propertiesUtilService.getExternalStructureProcessingBatchSize() || structure == structuresArray[structuresArray.length - 1]) {
+			if (structureGroup.size() == propertiesUtilService.getExternalStructureProcessingBatchSize()
+					|| structure == structuresArray[structuresArray.length - 1]) {
 				structureGroups.add(structureGroup);
 				structureGroup = new HashMap<String, String>();
 			}
@@ -331,8 +341,9 @@ public HashMap<String, Entry<String, String>> getPreprocessedStructures(HashMap<
 			// Add the structures to the request
 			ObjectNode structuresNode = mapper.createObjectNode();
 
-			// Create a "structures": { "structure-id": "molfile" } object and add it to the request
-			for (String structureId : structureGroupList.keySet()){
+			// Create a "structures": { "structure-id": "molfile" } object and add it to the
+			// request
+			for (String structureId : structureGroupList.keySet()) {
 				String structure = structureGroupList.get(structureId);
 				structuresNode.put(structureId, structure);
 			}
@@ -348,7 +359,7 @@ public HashMap<String, Entry<String, String>> getPreprocessedStructures(HashMap<
 		logger.info("Invoking " + tasks.size() + " preprocess tasks");
 		List<Future<Response>> results = pool.invokeAll(tasks);
 		HashMap<Integer, JsonNode> responseMap = new HashMap<Integer, JsonNode>();
-		for(Future<Response> response : results){
+		for (Future<Response> response : results) {
 			String responseBody;
 			int responseCode;
 			Integer responseId;
@@ -360,7 +371,7 @@ public HashMap<String, Entry<String, String>> getPreprocessedStructures(HashMap<
 				throw new IOException("Error posting to process service: " + e.getMessage());
 			}
 
-			if(responseCode != 200) {
+			if (responseCode != 200) {
 				logger.error("Response Body: " + responseBody);
 				logger.error("URL was: " + url);
 				throw new IOException("Error posting to preprocess service: " + responseBody);
@@ -376,9 +387,9 @@ public HashMap<String, Entry<String, String>> getPreprocessedStructures(HashMap<
 		// Sort the response hashmap by the keys
 		List<Integer> responseIds = new ArrayList<Integer>(responseMap.keySet());
 		Collections.sort(responseIds);
-		//Empty hashmap
+		// Empty hashmap
 		HashMap<String, Entry<String, String>> standardizedStructures = new HashMap<String, Entry<String, String>>();
-		for(Integer responseId : responseIds) {
+		for (Integer responseId : responseIds) {
 			logger.debug("Response ID: " + responseId);
 			// Combine the json nodes
 			JsonNode responseNode = responseMap.get(responseId);
@@ -389,7 +400,7 @@ public HashMap<String, Entry<String, String>> getPreprocessedStructures(HashMap<
 				JsonNode node = structuresResponseNode.get(structureId);
 				String status = node.get("status").asText();
 				String structure = node.get("structure").asText();
-				Map.Entry<String,String> entry = new AbstractMap.SimpleEntry<String, String>(status, structure);
+				Map.Entry<String, String> entry = new AbstractMap.SimpleEntry<String, String>(status, structure);
 				standardizedStructures.put(structureId, entry);
 			});
 		}
@@ -398,11 +409,12 @@ public HashMap<String, Entry<String, String>> getPreprocessedStructures(HashMap<
 	}
 
 	@Override
-	public HashMap<String, BBChemParentStructure> getProcessedStructures(HashMap<String, String> structures, Boolean includeFingerprints) throws CmpdRegMolFormatException {
+	public HashMap<String, BBChemParentStructure> getProcessedStructures(HashMap<String, String> structures,
+			Boolean includeFingerprints) throws CmpdRegMolFormatException {
 
 		// Return map
 		HashMap<String, BBChemParentStructure> processedStructures = new HashMap<String, BBChemParentStructure>();
-		
+
 		// Post to the service and parse the response
 		try {
 			JsonNode responseNode;
@@ -418,9 +430,9 @@ public HashMap<String, BBChemParentStructure> getProcessedStructures(HashMap<Str
 			Object[] structuresArray = structures.keySet().toArray();
 			// Loop through length of response node
 			for (int i = 0; i < responseNode.size(); i++) {
-				
+
 				JsonNode responseJsonNode = responseNode.get(i);
-				
+
 				BBChemParentStructure bbChemStructure = new BBChemParentStructure();
 
 				// The output array is guaranteed to be in the same order as its inputs
@@ -431,10 +443,10 @@ public HashMap<String, BBChemParentStructure> getProcessedStructures(HashMap<Str
 				JsonNode errorCodeNode = responseJsonNode.get("error_code");
 
 				// Check if we have an error code
-				if( errorCodeNode != null) {
+				if (errorCodeNode != null) {
 					String errorCode = errorCodeNode.asText();
 					String msg = responseJsonNode.get("error_msg").asText();
-					if(errorCode.equals("4004")) {
+					if (errorCode.equals("4004")) {
 						logger.warn("Processor error code '" + errorCode + "' for '" + structureKey + "': " + msg);
 						bbChemStructure.setReg(EMPTY_STRUCTURE);
 						bbChemStructure.setPreReg(EMPTY_STRUCTURE);
@@ -459,34 +471,35 @@ public HashMap<String, BBChemParentStructure> getProcessedStructures(HashMap<Str
 					JsonNode registrationHashesNode = responseJsonNode.get("registration_hash");
 					String registrationHash = registrationHashesNode.get(0).asText();
 					bbChemStructure.setReg(registrationHashesNode.get(0).asText());
-	
+
 					JsonNode noStereoHashNode = responseJsonNode.get("no_stereo_hash");
 					bbChemStructure.setPreReg(noStereoHashNode.asText());
-	
+
 					JsonNode sdfNode = responseJsonNode.get("sdf");
 					bbChemStructure.setMol(sdfNode.asText());
-	
+
 					JsonNode averageMolWeightNode = responseJsonNode.get("molecular_weight");
 					bbChemStructure.setAverageMolWeight(averageMolWeightNode.asDouble());
-	
+
 					JsonNode exactMolWeightNode = responseJsonNode.get("exact_molecular_weight");
 					bbChemStructure.setExactMolWeight(exactMolWeightNode.asDouble());
-	
+
 					JsonNode totalChargeNode = responseJsonNode.get("total_charge");
 					bbChemStructure.setTotalCharge(Integer.valueOf(totalChargeNode.asInt()));
-	
+
 					JsonNode smilesNode = responseJsonNode.get("smiles");
 					bbChemStructure.setSmiles(smilesNode.asText());
-	
+
 					JsonNode molecularFormulaNode = responseJsonNode.get("molecular_formula");
 					bbChemStructure.setMolecularFormula(molecularFormulaNode.asText());
 
 					bbChemStructure.setRegistrationStatus(CmpdRegMolecule.RegistrationStatus.SUCCESS);
 					bbChemStructure.setRegistrationComment(null);
-					
+
 				}
 
-				// Set recorded date todays date. This simplifies the code when we need to persist the structure
+				// Set recorded date todays date. This simplifies the code when we need to
+				// persist the structure
 				// in various places.
 				bbChemStructure.setRecordedDate(new Date());
 
@@ -494,27 +507,29 @@ public HashMap<String, BBChemParentStructure> getProcessedStructures(HashMap<Str
 				processedStructures.put(structureKey, bbChemStructure);
 			}
 
-			if(includeFingerprints) {
+			if (includeFingerprints) {
 				// Input fingerprint hashes
 				HashMap<String, String> processedStructureHash = new HashMap<String, String>();
-				for (String structureId : processedStructures.keySet()){
+				for (String structureId : processedStructures.keySet()) {
 					BBChemParentStructure processedStructure = processedStructures.get(structureId);
-					if(processedStructure.getRegistrationStatus() == CmpdRegMolecule.RegistrationStatus.SUCCESS) {
+					if (processedStructure.getRegistrationStatus() == CmpdRegMolecule.RegistrationStatus.SUCCESS) {
 						processedStructureHash.put(structureId, processedStructure.getMol());
 					}
 				}
 
 				// Get the fingerprints
-				HashMap<String, BitSet> substructureHashMap = molsToFingerprints(processedStructureHash, "substructure_search");
-				HashMap<String, BitSet> similarityHashMap = molsToFingerprints(processedStructureHash, "similarity_score");
+				HashMap<String, BitSet> substructureHashMap = molsToFingerprints(processedStructureHash,
+						"substructure_search");
+				HashMap<String, BitSet> similarityHashMap = molsToFingerprints(processedStructureHash,
+						"similarity_score");
 
 				// Add the substructure fingerprints to the processed structures
-				for (String structureId : substructureHashMap.keySet()){
+				for (String structureId : substructureHashMap.keySet()) {
 					processedStructures.get(structureId).setSubstructure(substructureHashMap.get(structureId));
 				}
 
 				// Add the similarity fingerprints to the processed structures
-				for (String structureId : similarityHashMap.keySet()){
+				for (String structureId : similarityHashMap.keySet()) {
 					processedStructures.get(structureId).setSimilarity(similarityHashMap.get(structureId));
 				}
 			}
@@ -528,15 +543,17 @@ public HashMap<String, BBChemParentStructure> getProcessedStructures(HashMap<Str
 	}
 
 	@Override
-	public BBChemParentStructure getProcessedStructure(String molfile, Boolean includeFingerprints) throws CmpdRegMolFormatException {
+	public BBChemParentStructure getProcessedStructure(String molfile, Boolean includeFingerprints)
+			throws CmpdRegMolFormatException {
 		BBChemParentStructure bbChemStructure = new BBChemParentStructure();
 		// Post to the service and parse the response
 		try {
-			// Input hashmap 
+			// Input hashmap
 			HashMap<String, String> structures = new HashMap<String, String>();
 			structures.put("molstructure", molfile);
 
-			HashMap<String, BBChemParentStructure> processedStructuresHashMap = getProcessedStructures(structures, includeFingerprints);
+			HashMap<String, BBChemParentStructure> processedStructuresHashMap = getProcessedStructures(structures,
+					includeFingerprints);
 
 			// Get the first structure
 			bbChemStructure = processedStructuresHashMap.get("molstructure");
@@ -549,11 +566,10 @@ public BBChemParentStructure getProcessedStructure(String molfile, Boolean inclu
 	}
 
 	@Override
-	public String getSDF(BBChemParentStructure bbChemStructure) throws IOException{
+	public String getSDF(BBChemParentStructure bbChemStructure) throws IOException {
 
 		String url = getUrlFromPreprocessorSettings("exportSDFURL");
 
-
 		// Create the request data object
 		ObjectMapper mapper = new ObjectMapper();
 		ObjectNode requestData = mapper.createObjectNode();
@@ -562,10 +578,9 @@ public String getSDF(BBChemParentStructure bbChemStructure) throws IOException{
 		ArrayNode sdfsNode = mapper.createArrayNode();
 		ObjectNode molNode = mapper.createObjectNode();
 
-
 		// Add the properties to the mol node
 		ArrayNode propertiesNode = mapper.createArrayNode();
-		for (Map.Entry<String,String> entry : bbChemStructure.getProperties().entrySet()) {
+		for (Map.Entry<String, String> entry : bbChemStructure.getProperties().entrySet()) {
 			ObjectNode propertyNode = mapper.createObjectNode();
 			propertyNode.put("name", entry.getKey());
 			propertyNode.put("value", entry.getValue());
@@ -587,7 +602,7 @@ public String getSDF(BBChemParentStructure bbChemStructure) throws IOException{
 		String requestString = requestData.toString();
 		logger.debug("requestString: " + requestString);
 		String postResponse = SimpleUtil.postRequestToExternalServer(url, requestString, logger);
-		logger.debug("Got response: "+ postResponse);
+		logger.debug("Got response: " + postResponse);
 
 		// Parse the response json
 		ObjectMapper responseMapper = new ObjectMapper();
@@ -612,7 +627,7 @@ public List<BBChemParentStructure> parseSDF(String molfile) throws CmpdRegMolFor
 
 		// Add the structures to the request
 		Base64.Encoder encoder = Base64.getEncoder();
-		String encodedString = encoder.encodeToString(molfile.getBytes(StandardCharsets.UTF_8) );
+		String encodedString = encoder.encodeToString(molfile.getBytes(StandardCharsets.UTF_8));
 		requestData.put("molv3", encodedString);
 
 		// Post to the service and parse the response
@@ -621,7 +636,7 @@ public List<BBChemParentStructure> parseSDF(String molfile) throws CmpdRegMolFor
 			logger.debug("requestString: " + requestString);
 			HttpURLConnection connection = SimpleUtil.postRequest(url, requestString, logger);
 			String postResponse = null;
-			if(connection.getResponseCode() != 200) {
+			if (connection.getResponseCode() != 200) {
 				logger.error("Error posting to sdf parse service: " + connection.getResponseMessage());
 				String body = SimpleUtil.getStringBody(connection);
 				logger.error("Response Body: " + body);
@@ -631,12 +646,12 @@ public List<BBChemParentStructure> parseSDF(String molfile) throws CmpdRegMolFor
 			} else {
 				postResponse = SimpleUtil.getStringBody(connection);
 			}
-			logger.debug("Got response: "+ postResponse);
+			logger.debug("Got response: " + postResponse);
 
 			// Parse the response json to get the standardized mol
 			ObjectMapper responseMapper = new ObjectMapper();
 			JsonNode responseNode = responseMapper.readTree(postResponse);
-			for (JsonNode responseJsonNode : responseNode)  {
+			for (JsonNode responseJsonNode : responseNode) {
 				BBChemParentStructure bbChemStructure = new BBChemParentStructure();
 				JsonNode molNode = responseJsonNode.get("mol");
 				bbChemStructure.setMol(molNode.asText());
@@ -651,7 +666,6 @@ public List<BBChemParentStructure> parseSDF(String molfile) throws CmpdRegMolFor
 				bbChemStructures.add(bbChemStructure);
 			}
 
-
 		} catch (Exception e) {
 			logger.error("Error posting to parse service: " + e);
 			throw new CmpdRegMolFormatException(e.getMessage());
@@ -687,24 +701,25 @@ public List<String> getMolFragments(String molfile) throws CmpdRegMolFormatExcep
 			logger.debug("requestString: " + requestString);
 			HttpURLConnection connection = SimpleUtil.postRequest(url, requestString, logger);
 			String postResponse = null;
-			if(connection.getResponseCode() != 200) {
+			if (connection.getResponseCode() != 200) {
 				logger.error("Error posting to split service: " + connection.getResponseMessage());
 				logger.error("Response Body: " + SimpleUtil.getStringBody(connection));
 				logger.error("URL was: " + url);
 				logger.error("Request was : " + requestString);
-				throw new CmpdRegMolFormatException("Error posting to split service: " + connection.getResponseMessage());
+				throw new CmpdRegMolFormatException(
+						"Error posting to split service: " + connection.getResponseMessage());
 			} else {
 				postResponse = SimpleUtil.getStringBody(connection);
 			}
-			logger.debug("Got response: "+ postResponse);
+			logger.debug("Got response: " + postResponse);
 
 			// Parse the response json to get the standardized mol
 			ObjectMapper responseMapper = new ObjectMapper();
 			JsonNode responseNode = responseMapper.readTree(postResponse);
 			JsonNode resultsNode = responseNode.get("results");
-			for (JsonNode resultNode : resultsNode)  {
+			for (JsonNode resultNode : resultsNode) {
 				JsonNode splitSDFS = resultNode.get("split_sdfs");
-				for (JsonNode sdfNode : splitSDFS)  {
+				for (JsonNode sdfNode : splitSDFS) {
 					molStrings.add(sdfNode.asText());
 				}
 			}
@@ -717,7 +732,8 @@ public List<String> getMolFragments(String molfile) throws CmpdRegMolFormatExcep
 	}
 
 	@Override
-	public HashMap<? extends AbstractBBChemStructure, Boolean> substructureMatch(String queryMol, List<? extends AbstractBBChemStructure> needsMatchStructures)
+	public HashMap<? extends AbstractBBChemStructure, Boolean> substructureMatch(String queryMol,
+			List<? extends AbstractBBChemStructure> needsMatchStructures)
 			throws CmpdRegMolFormatException {
 		// Fetch the fingerprint from the BBChem finerprint service
 
@@ -727,14 +743,14 @@ public HashMap<? extends AbstractBBChemStructure, Boolean> substructureMatch(Str
 		} catch (IOException e) {
 			throw new CmpdRegMolFormatException(e);
 		}
-		
+
 		// Create the request data object
 		ObjectMapper mapper = new ObjectMapper();
 		ObjectNode requestData = mapper.createObjectNode();
 
 		// Add the structures to the request
 		ArrayNode arrayNode = mapper.createArrayNode();
-		for(AbstractBBChemStructure needsMatch : needsMatchStructures) {
+		for (AbstractBBChemStructure needsMatch : needsMatchStructures) {
 			arrayNode.add(needsMatch.getMol());
 		}
 		requestData.put("needs_match", arrayNode);
@@ -747,16 +763,17 @@ public HashMap<? extends AbstractBBChemStructure, Boolean> substructureMatch(Str
 			logger.debug("requestString: " + requestString);
 			HttpURLConnection connection = SimpleUtil.postRequest(url, requestString, logger);
 			String postResponse = null;
-			if(connection.getResponseCode() != 200) {
+			if (connection.getResponseCode() != 200) {
 				logger.error("Error posting to substructure match service: " + connection.getResponseMessage());
 				logger.error("Response Body: " + SimpleUtil.getStringBody(connection));
 				logger.error("URL was: " + url);
 				logger.error("Request was : " + requestString);
-				throw new CmpdRegMolFormatException("Error posting to substructure match service: " + connection.getResponseMessage());
+				throw new CmpdRegMolFormatException(
+						"Error posting to substructure match service: " + connection.getResponseMessage());
 			} else {
 				postResponse = SimpleUtil.getStringBody(connection);
 			}
-			logger.debug("Got response: "+ postResponse);
+			logger.debug("Got response: " + postResponse);
 
 			// Parse the response json to get the standardized mol
 			ObjectMapper responseMapper = new ObjectMapper();
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/ChemStructureServiceBBChemImpl.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/ChemStructureServiceBBChemImpl.java
index 1dc104c8f..863d387e7 100755
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/ChemStructureServiceBBChemImpl.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/ChemStructureServiceBBChemImpl.java
@@ -43,6 +43,7 @@
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
+
 @Component
 public class ChemStructureServiceBBChemImpl implements ChemStructureService {
 
@@ -56,7 +57,7 @@ public class ChemStructureServiceBBChemImpl implements ChemStructureService {
 
 	@Autowired
 	private JdbcTemplate basicJdbcTemplate;
-	
+
 	public void setJdbcTemplate(JdbcTemplate jdbcTemplate) {
 		this.basicJdbcTemplate = jdbcTemplate;
 	}
@@ -66,54 +67,66 @@ public JdbcTemplate getJdbcTemplate() {
 	}
 
 	@Override
-	public CmpdRegMolecule[] searchMols(String molfile, StructureType structureType, int[] cdHitList, SearchType searchType, Float simlarityPercent) throws CmpdRegMolFormatException {
+	public CmpdRegMolecule[] searchMols(String molfile, StructureType structureType, int[] cdHitList,
+			SearchType searchType, Float simlarityPercent) throws CmpdRegMolFormatException {
 		int maxResults = propertiesUtilService.getMaxSearchResults();
 		return searchMols(molfile, structureType, cdHitList, searchType, simlarityPercent, maxResults);
 	}
 
-	private List<? extends AbstractBBChemStructure> searchBBChemStructures(String molfile, StructureType structureType, int[] inputCdIdHitList, SearchType searchType, Float simlarityPercent, int maxResults) throws CmpdRegMolFormatException {
+	private List<? extends AbstractBBChemStructure> searchBBChemStructures(String molfile, StructureType structureType,
+			int[] inputCdIdHitList, SearchType searchType, Float simlarityPercent, int maxResults)
+			throws CmpdRegMolFormatException {
 
 		BBChemParentStructure serviceBBChemStructure = null;
-		if (searchType == SearchType.FULL_TAUTOMER | searchType == SearchType.DUPLICATE_TAUTOMER | searchType == SearchType.EXACT){
-			// We don't need to do fingerprint matching for these searches so pass false here
+		if (searchType == SearchType.FULL_TAUTOMER | searchType == SearchType.DUPLICATE_TAUTOMER
+				| searchType == SearchType.EXACT) {
+			// We don't need to do fingerprint matching for these searches so pass false
+			// here
 			serviceBBChemStructure = bbChemStructureService.getProcessedStructure(molfile, false);
 		} else {
 			// We need to do fingerprint matching for these searches so pass true here
 			serviceBBChemStructure = bbChemStructureService.getProcessedStructure(molfile, true);
 		}
-		if(serviceBBChemStructure.getRegistrationStatus() == RegistrationStatus.ERROR){
+		if (serviceBBChemStructure.getRegistrationStatus() == RegistrationStatus.ERROR) {
 			throw new CmpdRegMolFormatException(serviceBBChemStructure.getRegistrationComment());
 		}
-		return searchBBChemStructures(serviceBBChemStructure, structureType, inputCdIdHitList, searchType, simlarityPercent, maxResults);
+		return searchBBChemStructures(serviceBBChemStructure, structureType, inputCdIdHitList, searchType,
+				simlarityPercent, maxResults);
 	}
 
-	private List<? extends AbstractBBChemStructure> searchBBChemStructures(BBChemParentStructure bbchemStructure, StructureType structureType, int[] inputCdIdHitList, SearchType searchType, Float simlarityPercent, int maxResults) throws CmpdRegMolFormatException {
+	private List<? extends AbstractBBChemStructure> searchBBChemStructures(BBChemParentStructure bbchemStructure,
+			StructureType structureType, int[] inputCdIdHitList, SearchType searchType, Float simlarityPercent,
+			int maxResults) throws CmpdRegMolFormatException {
 
 		// Create empty list
 		List<? extends AbstractBBChemStructure> bbChemStructures = new ArrayList<AbstractBBChemStructure>();
 
-		if (searchType == SearchType.FULL_TAUTOMER | searchType == SearchType.DUPLICATE_TAUTOMER | searchType == SearchType.EXACT){
+		if (searchType == SearchType.FULL_TAUTOMER | searchType == SearchType.DUPLICATE_TAUTOMER
+				| searchType == SearchType.EXACT) {
 			// Don't need to calculate fingerprint if not doing similarity or substructure
 			TypedQuery<? extends AbstractBBChemStructure> query;
 
-			if (searchType == SearchType.FULL_TAUTOMER){
+			if (searchType == SearchType.FULL_TAUTOMER) {
 				// FULL TAUTOMER hashes are stored on the pre reg hash column
-				if(structureType == StructureType.PARENT) {
+				if (structureType == StructureType.PARENT) {
 					query = BBChemParentStructure.findBBChemParentStructuresByPreRegEquals(bbchemStructure.getPreReg());
 				} else if (structureType == StructureType.SALT) {
 					query = BBChemSaltStructure.findBBChemSaltStructuresByPreRegEquals(bbchemStructure.getPreReg());
 				} else if (structureType == StructureType.SALT_FORM) {
-					query = BBChemSaltFormStructure.findBBChemSaltFormStructuresByPreRegEquals(bbchemStructure.getPreReg());
+					query = BBChemSaltFormStructure
+							.findBBChemSaltFormStructuresByPreRegEquals(bbchemStructure.getPreReg());
 				} else if (structureType == StructureType.DRY_RUN) {
 					query = BBChemDryRunStructure.findBBChemDryRunStructuresByPreRegEquals(bbchemStructure.getPreReg());
 				} else if (structureType == StructureType.STANDARDIZATION_DRY_RUN) {
-					query = BBChemStandardizationDryRunStructure.findBBChemStandardizationDryRunStructuresByPreRegEquals(bbchemStructure.getPreReg());
+					query = BBChemStandardizationDryRunStructure
+							.findBBChemStandardizationDryRunStructuresByPreRegEquals(bbchemStructure.getPreReg());
 				} else {
-					throw new CmpdRegMolFormatException("Structure type not implemented for BBChem searches on " + structureType);
+					throw new CmpdRegMolFormatException(
+							"Structure type not implemented for BBChem searches on " + structureType);
 				}
-			} else if (searchType == SearchType.DUPLICATE_TAUTOMER | searchType == SearchType.EXACT){
+			} else if (searchType == SearchType.DUPLICATE_TAUTOMER | searchType == SearchType.EXACT) {
 				// DUPLICATE TAUTOMER hashes are stored on the reg column
-				if(structureType == StructureType.PARENT) {
+				if (structureType == StructureType.PARENT) {
 					query = BBChemParentStructure.findBBChemParentStructuresByRegEquals(bbchemStructure.getReg());
 				} else if (structureType == StructureType.SALT) {
 					query = BBChemSaltStructure.findBBChemSaltStructuresByRegEquals(bbchemStructure.getReg());
@@ -122,102 +135,118 @@ private List<? extends AbstractBBChemStructure> searchBBChemStructures(BBChemPar
 				} else if (structureType == StructureType.DRY_RUN) {
 					query = BBChemDryRunStructure.findBBChemDryRunStructuresByRegEquals(bbchemStructure.getReg());
 				} else if (structureType == StructureType.STANDARDIZATION_DRY_RUN) {
-					query = BBChemStandardizationDryRunStructure.findBBChemStandardizationDryRunStructuresByRegEquals(bbchemStructure.getReg());
+					query = BBChemStandardizationDryRunStructure
+							.findBBChemStandardizationDryRunStructuresByRegEquals(bbchemStructure.getReg());
 				} else {
-					throw new CmpdRegMolFormatException("Structure type not implemented for BBChem searches on " + structureType);
+					throw new CmpdRegMolFormatException(
+							"Structure type not implemented for BBChem searches on " + structureType);
 				}
 			} else {
-				throw new CmpdRegMolFormatException("Structure type not implemented for BBChem searches on " + structureType);
+				throw new CmpdRegMolFormatException(
+						"Structure type not implemented for BBChem searches on " + structureType);
 			}
 
 			// int is not nullable so you either have a valid maxResults passed in
 			// or -1 to express unlimited
-			if(maxResults > -1) {
+			if (maxResults > -1) {
 				query.setMaxResults(maxResults);
 			}
 
 			bbChemStructures = query.getResultList();
-			
-		} else if (searchType == SearchType.SUBSTRUCTURE | searchType == SearchType.SIMILARITY){
-			if(searchType == SearchType.SUBSTRUCTURE) {
-				if(structureType == StructureType.PARENT) {
+
+		} else if (searchType == SearchType.SUBSTRUCTURE | searchType == SearchType.SIMILARITY) {
+			if (searchType == SearchType.SUBSTRUCTURE) {
+				if (structureType == StructureType.PARENT) {
 					// Get basic fingerprint substructure matchs
-					List<BBChemParentStructure> fingerprintMatchBBChemStructures = BBChemParentStructure.findBBChemParentStructuresBySubstructure(bbchemStructure.getSubstructure(), maxResults);
-					
+					List<BBChemParentStructure> fingerprintMatchBBChemStructures = BBChemParentStructure
+							.findBBChemParentStructuresBySubstructure(bbchemStructure.getSubstructure(), maxResults);
+
 					// Narrow list down to those that match a true subgraph substructure search
-					HashMap<? extends AbstractBBChemStructure, Boolean> bbchemSubstructureMatchMap = bbChemStructureService.substructureMatch(bbchemStructure.getMol(), fingerprintMatchBBChemStructures);
+					HashMap<? extends AbstractBBChemStructure, Boolean> bbchemSubstructureMatchMap = bbChemStructureService
+							.substructureMatch(bbchemStructure.getMol(), fingerprintMatchBBChemStructures);
 
 					// Loop through the llist of all and only keep those which have a true match
 					List<BBChemParentStructure> bbchemMatchStructures = new ArrayList<BBChemParentStructure>();
-					for(Map.Entry<? extends AbstractBBChemStructure, Boolean> v : bbchemSubstructureMatchMap.entrySet()) {
-						if(v.getValue()) {
+					for (Map.Entry<? extends AbstractBBChemStructure, Boolean> v : bbchemSubstructureMatchMap
+							.entrySet()) {
+						if (v.getValue()) {
 							bbchemMatchStructures.add((BBChemParentStructure) v.getKey());
 						}
 					}
 					bbChemStructures = bbchemMatchStructures;
 				} else if (structureType == StructureType.SALT_FORM) {
 					// Get basic fingerprint substructure matchs
-					List<BBChemSaltFormStructure> fingerprintMatchBBChemStructures = BBChemSaltFormStructure.findBBChemSaltFormStructuresBySubstructure(bbchemStructure.getSubstructure(), maxResults);
+					List<BBChemSaltFormStructure> fingerprintMatchBBChemStructures = BBChemSaltFormStructure
+							.findBBChemSaltFormStructuresBySubstructure(bbchemStructure.getSubstructure(), maxResults);
 
 					// Narrow list down to those that match a true subgraph substructure search
-					HashMap<? extends AbstractBBChemStructure, Boolean> bbchemSubstructureMatchMap = bbChemStructureService.substructureMatch(bbchemStructure.getMol(), fingerprintMatchBBChemStructures);
+					HashMap<? extends AbstractBBChemStructure, Boolean> bbchemSubstructureMatchMap = bbChemStructureService
+							.substructureMatch(bbchemStructure.getMol(), fingerprintMatchBBChemStructures);
 
 					// Loop through the llist of all and only keep those which have a true match
 					List<BBChemSaltFormStructure> bbchemMatchStructures = new ArrayList<BBChemSaltFormStructure>();
-					for(Map.Entry<? extends AbstractBBChemStructure, Boolean> v : bbchemSubstructureMatchMap.entrySet()) {
-						if(v.getValue()) {
+					for (Map.Entry<? extends AbstractBBChemStructure, Boolean> v : bbchemSubstructureMatchMap
+							.entrySet()) {
+						if (v.getValue()) {
 							bbchemMatchStructures.add((BBChemSaltFormStructure) v.getKey());
 						}
 					}
 					bbChemStructures = bbchemMatchStructures;
 				} else {
-					throw new CmpdRegMolFormatException("Structure type not implemented for BBChem searches " + structureType);
+					throw new CmpdRegMolFormatException(
+							"Structure type not implemented for BBChem searches " + structureType);
 				}
 
 			} else {
-				throw new CmpdRegMolFormatException("Structure type not implemented for BBChem searches " + structureType);
+				throw new CmpdRegMolFormatException(
+						"Structure type not implemented for BBChem searches " + structureType);
 			}
 
 		} else {
 			throw new CmpdRegMolFormatException("Search type not implemented for BBChem searches on " + searchType);
 		}
-		
-		return(bbChemStructures);
+
+		return (bbChemStructures);
 	}
 
 	@Override
-	public CmpdRegMolecule[] searchMols(String molfile, StructureType structureType, int[] inputCdIdHitList, SearchType searchType, Float simlarityPercent, int maxResults)
+	public CmpdRegMolecule[] searchMols(String molfile, StructureType structureType, int[] inputCdIdHitList,
+			SearchType searchType, Float simlarityPercent, int maxResults)
 			throws CmpdRegMolFormatException {
-		
-			List<? extends AbstractBBChemStructure>  bbChemStructures = searchBBChemStructures(molfile, structureType, inputCdIdHitList, searchType, simlarityPercent, maxResults);
-
-			List<CmpdRegMolecule> resultList = new ArrayList<CmpdRegMolecule>();
-			for (AbstractBBChemStructure hit : bbChemStructures) {
-				CmpdRegMoleculeBBChemImpl molecule = new CmpdRegMoleculeBBChemImpl(hit.getMol(), bbChemStructureService);
-				molecule.setProperty("cd_id", String.valueOf(hit.getId()));
-				resultList.add(molecule);
-			}
-			CmpdRegMolecule[] resultArray = new CmpdRegMolecule[resultList.size()];
-			
-			return resultList.toArray(resultArray);
-	}
 
+		List<? extends AbstractBBChemStructure> bbChemStructures = searchBBChemStructures(molfile, structureType,
+				inputCdIdHitList, searchType, simlarityPercent, maxResults);
+
+		List<CmpdRegMolecule> resultList = new ArrayList<CmpdRegMolecule>();
+		for (AbstractBBChemStructure hit : bbChemStructures) {
+			CmpdRegMoleculeBBChemImpl molecule = new CmpdRegMoleculeBBChemImpl(hit.getMol(), bbChemStructureService);
+			molecule.setProperty("cd_id", String.valueOf(hit.getId()));
+			resultList.add(molecule);
+		}
+		CmpdRegMolecule[] resultArray = new CmpdRegMolecule[resultList.size()];
+
+		return resultList.toArray(resultArray);
+	}
 
 	@Override
-	public int[] searchMolStructures(String molfile, StructureType structureType, SearchType searchType) throws CmpdRegMolFormatException {
+	public int[] searchMolStructures(String molfile, StructureType structureType, SearchType searchType)
+			throws CmpdRegMolFormatException {
 		return searchMolStructures(molfile, structureType, searchType, -1F, -1);
 
 	}
 
 	@Override
-	public int[] searchMolStructures(String molfile, StructureType structureType, SearchType searchType, Float simlarityPercent) throws CmpdRegMolFormatException {
-		return searchMolStructures(molfile, structureType, searchType, simlarityPercent, -1);	
+	public int[] searchMolStructures(String molfile, StructureType structureType, SearchType searchType,
+			Float simlarityPercent) throws CmpdRegMolFormatException {
+		return searchMolStructures(molfile, structureType, searchType, simlarityPercent, -1);
 	}
 
 	@Override
-	public int[] searchMolStructures(String molfile, StructureType structureType, SearchType searchType, Float simlarityPercent, int maxResults) throws CmpdRegMolFormatException {
+	public int[] searchMolStructures(String molfile, StructureType structureType, SearchType searchType,
+			Float simlarityPercent, int maxResults) throws CmpdRegMolFormatException {
 
-		List<? extends AbstractBBChemStructure> bbChemStructures = searchBBChemStructures(molfile, structureType,  new int[0] , searchType, simlarityPercent, maxResults);
+		List<? extends AbstractBBChemStructure> bbChemStructures = searchBBChemStructures(molfile, structureType,
+				new int[0], searchType, simlarityPercent, maxResults);
 
 		// Create empty int hit list
 		int[] hits = new int[bbChemStructures.size()];
@@ -240,18 +269,18 @@ public void closeConnection() {
 
 	public String getBBChemStructureTableNameFromStructureType(StructureType structureType) {
 		String plainTable = null;
-		if (structureType == StructureType.PARENT){
+		if (structureType == StructureType.PARENT) {
 			plainTable = "bbchem_parent_structure";
-		} else if (structureType == StructureType.SALT_FORM){
+		} else if (structureType == StructureType.SALT_FORM) {
 			plainTable = "bbchem_salt_form_structure";
-		} else if (structureType == StructureType.SALT){
+		} else if (structureType == StructureType.SALT) {
 			plainTable = "bbchem_salt_structure";
-		} else if (structureType == StructureType.DRY_RUN){
+		} else if (structureType == StructureType.DRY_RUN) {
 			plainTable = "bbchem_dry_run_structure";
-		} else if (structureType == StructureType.STANDARDIZATION_DRY_RUN){
+		} else if (structureType == StructureType.STANDARDIZATION_DRY_RUN) {
 			plainTable = "bbchem_standardization_dry_run_structure";
 		}
-		return(plainTable);
+		return (plainTable);
 	}
 
 	@Override
@@ -262,73 +291,85 @@ public boolean truncateStructureTable(StructureType structureType) {
 		return true;
 	}
 
-	private int saveStructure(BBChemParentStructure bbChemStructure, StructureType structureType, boolean checkForDupes) {
-		Long cdId=0L;
+	private int saveStructure(BBChemParentStructure bbChemStructure, StructureType structureType,
+			boolean checkForDupes) {
+		Long cdId = 0L;
 		try {
-			if(bbChemStructure.getRegistrationStatus() != RegistrationStatus.ERROR && (bbChemStructure.getReg() == null || bbChemStructure.getSubstructure() == null)) {
-				logger.info("Reg or Substructure is null for bbchem structure so calling processStructure to generate them before saving");
+			if (bbChemStructure.getRegistrationStatus() != RegistrationStatus.ERROR
+					&& (bbChemStructure.getReg() == null || bbChemStructure.getSubstructure() == null)) {
+				logger.info(
+						"Reg or Substructure is null for bbchem structure so calling processStructure to generate them before saving");
 				bbChemStructure = bbChemStructureService.getProcessedStructure(bbChemStructure.getMol(), true);
 			}
 
-			if (structureType == StructureType.PARENT){
-				if(checkForDupes){
-					List<BBChemParentStructure> bbChemStructures =  BBChemParentStructure.findBBChemParentStructuresByRegEquals(bbChemStructure.getReg()).getResultList();
-					if(bbChemStructures.size() > 0){
-						logger.error("BBChem structure for " + structureType + " type already exists with id "+ bbChemStructures.get(0).getId());
+			if (structureType == StructureType.PARENT) {
+				if (checkForDupes) {
+					List<BBChemParentStructure> bbChemStructures = BBChemParentStructure
+							.findBBChemParentStructuresByRegEquals(bbChemStructure.getReg()).getResultList();
+					if (bbChemStructures.size() > 0) {
+						logger.error("BBChem structure for " + structureType + " type already exists with id "
+								+ bbChemStructures.get(0).getId());
 						return 0;
 					}
 				}
 				bbChemStructure.persist();
 				cdId = bbChemStructure.getId();
-			} else if (structureType == StructureType.SALT_FORM){
+			} else if (structureType == StructureType.SALT_FORM) {
 				BBChemSaltFormStructure bbChemSaltFormStructure = new BBChemSaltFormStructure();
 				bbChemSaltFormStructure.updateStructureInfo(bbChemStructure);
 
-				if(checkForDupes){
-					List<BBChemSaltFormStructure> bbChemStructures =  BBChemSaltFormStructure.findBBChemSaltFormStructuresByRegEquals(bbChemSaltFormStructure.getReg()).getResultList();
-					if(bbChemStructures.size() > 0){
-						logger.error("Salt form structure already exists with id "+ bbChemStructures.get(0).getId());
+				if (checkForDupes) {
+					List<BBChemSaltFormStructure> bbChemStructures = BBChemSaltFormStructure
+							.findBBChemSaltFormStructuresByRegEquals(bbChemSaltFormStructure.getReg()).getResultList();
+					if (bbChemStructures.size() > 0) {
+						logger.error("Salt form structure already exists with id " + bbChemStructures.get(0).getId());
 						return 0;
 					}
 				}
 				bbChemSaltFormStructure.persist();
 				cdId = bbChemSaltFormStructure.getId();
-			} else if (structureType == StructureType.SALT){
+			} else if (structureType == StructureType.SALT) {
 				BBChemSaltStructure bbChemStructureSalt = new BBChemSaltStructure();
 				bbChemStructureSalt.updateStructureInfo(bbChemStructure);
 
-				if(checkForDupes){
-					List<BBChemSaltStructure> bbChemStructures =  BBChemSaltStructure.findBBChemSaltStructuresByRegEquals(bbChemStructureSalt.getReg()).getResultList();
-					if(bbChemStructures.size() > 0){
-						logger.error("Salt structure already exists with id "+ bbChemStructures.get(0).getId());
+				if (checkForDupes) {
+					List<BBChemSaltStructure> bbChemStructures = BBChemSaltStructure
+							.findBBChemSaltStructuresByRegEquals(bbChemStructureSalt.getReg()).getResultList();
+					if (bbChemStructures.size() > 0) {
+						logger.error("Salt structure already exists with id " + bbChemStructures.get(0).getId());
 						return 0;
 					}
 				}
 				bbChemStructureSalt.persist();
 				cdId = bbChemStructureSalt.getId();
-			} else if (structureType == StructureType.DRY_RUN){
+			} else if (structureType == StructureType.DRY_RUN) {
 				// Can't type cast from subclass to superclass so we go to json and back
 				BBChemDryRunStructure bbChemStructureDryRun = new BBChemDryRunStructure();
 				bbChemStructureDryRun.updateStructureInfo(bbChemStructure);
 
-				if(checkForDupes){
-					List<BBChemDryRunStructure> bbChemStructures =  BBChemDryRunStructure.findBBChemDryRunStructuresByRegEquals(bbChemStructureDryRun.getReg()).getResultList();
-					if(bbChemStructures.size() > 0){
-						logger.error("DryRun structure already exists with id "+ bbChemStructures.get(0).getId());
+				if (checkForDupes) {
+					List<BBChemDryRunStructure> bbChemStructures = BBChemDryRunStructure
+							.findBBChemDryRunStructuresByRegEquals(bbChemStructureDryRun.getReg()).getResultList();
+					if (bbChemStructures.size() > 0) {
+						logger.error("DryRun structure already exists with id " + bbChemStructures.get(0).getId());
 						return 0;
 					}
 				}
 				bbChemStructureDryRun.persist();
 				cdId = bbChemStructureDryRun.getId();
-			} else if (structureType == StructureType.STANDARDIZATION_DRY_RUN){
+			} else if (structureType == StructureType.STANDARDIZATION_DRY_RUN) {
 				// Can't type cast from subclass to superclass so we go to json and back
 				BBChemStandardizationDryRunStructure bbChemStructureStandardizationDryRun = new BBChemStandardizationDryRunStructure();
 				bbChemStructureStandardizationDryRun.updateStructureInfo(bbChemStructure);
 
-				if(checkForDupes){
-					List<BBChemStandardizationDryRunStructure> bbChemStructures =  BBChemStandardizationDryRunStructure.findBBChemStandardizationDryRunStructuresByRegEquals(bbChemStructureStandardizationDryRun.getReg()).getResultList();
-					if(bbChemStructures.size() > 0){
-						logger.error("StandardizationDryRun structure already exists with id "+ bbChemStructures.get(0).getId());
+				if (checkForDupes) {
+					List<BBChemStandardizationDryRunStructure> bbChemStructures = BBChemStandardizationDryRunStructure
+							.findBBChemStandardizationDryRunStructuresByRegEquals(
+									bbChemStructureStandardizationDryRun.getReg())
+							.getResultList();
+					if (bbChemStructures.size() > 0) {
+						logger.error("StandardizationDryRun structure already exists with id "
+								+ bbChemStructures.get(0).getId());
 						return 0;
 					}
 				}
@@ -355,7 +396,7 @@ public int saveStructure(CmpdRegMolecule cmpdRegMolecule, StructureType structur
 
 	@Override
 	public int saveStructure(String molfile, StructureType structureType, boolean checkForDupes) {
-		
+
 		try {
 			// Process the molfile and calculate fingerprints = true
 			BBChemParentStructure bbChemStructure = bbChemStructureService.getProcessedStructure(molfile, true);
@@ -391,7 +432,7 @@ public String toSmiles(String molStructure) throws CmpdRegMolFormatException {
 	@Override
 	public int[] checkDupeMol(String molStructure, StructureType structureType)
 			throws CmpdRegMolFormatException {
-		return searchMolStructures(molStructure, structureType, SearchType.DUPLICATE_TAUTOMER); 
+		return searchMolStructures(molStructure, structureType, SearchType.DUPLICATE_TAUTOMER);
 	}
 
 	@Override
@@ -416,47 +457,51 @@ public boolean updateStructure(String molStructure, StructureType structureType,
 	}
 
 	private Boolean updateStructure(BBChemParentStructure bbChemStructure, StructureType structureType, int cdId) {
-		Long id= new Long(cdId);
-		if(bbChemStructure.getRegistrationStatus() != RegistrationStatus.ERROR && (bbChemStructure.getReg() == null || bbChemStructure.getSubstructure() == null)) {
-			logger.info("Reg or Substructure is null for bbchem structure so calling processStructure to generate them before saving");
-			try{
+		Long id = new Long(cdId);
+		if (bbChemStructure.getRegistrationStatus() != RegistrationStatus.ERROR
+				&& (bbChemStructure.getReg() == null || bbChemStructure.getSubstructure() == null)) {
+			logger.info(
+					"Reg or Substructure is null for bbchem structure so calling processStructure to generate them before saving");
+			try {
 				bbChemStructure = bbChemStructureService.getProcessedStructure(bbChemStructure.getMol(), true);
 			} catch (CmpdRegMolFormatException e) {
 				logger.error("Error processing molfile: " + e.getMessage());
 				return false;
 			}
 		}
-		if (structureType == StructureType.PARENT){
+		if (structureType == StructureType.PARENT) {
 			BBChemParentStructure bbChemStructureSaved = BBChemParentStructure.findBBChemParentStructure(id);
-			if(bbChemStructureSaved == null) {
+			if (bbChemStructureSaved == null) {
 				return false;
 			}
 			bbChemStructureSaved.updateStructureInfo(bbChemStructure);
 			bbChemStructureSaved.persist();
-		} else if (structureType == StructureType.SALT_FORM){
-			BBChemSaltFormStructure bbChemSaltFormStructureSaved = BBChemSaltFormStructure.findBBChemSaltFormStructure(id);
-			if(bbChemSaltFormStructureSaved == null) {
+		} else if (structureType == StructureType.SALT_FORM) {
+			BBChemSaltFormStructure bbChemSaltFormStructureSaved = BBChemSaltFormStructure
+					.findBBChemSaltFormStructure(id);
+			if (bbChemSaltFormStructureSaved == null) {
 				return false;
 			}
 			bbChemSaltFormStructureSaved.updateStructureInfo(bbChemStructure);
 			bbChemSaltFormStructureSaved.persist();
-		} else if (structureType == StructureType.SALT){
+		} else if (structureType == StructureType.SALT) {
 			BBChemSaltStructure bbChemSaltStructureSaved = BBChemSaltStructure.findBBChemSaltStructure(id);
-			if(bbChemSaltStructureSaved == null) {
+			if (bbChemSaltStructureSaved == null) {
 				return false;
 			}
 			bbChemSaltStructureSaved.updateStructureInfo(bbChemStructure);
 			bbChemSaltStructureSaved.persist();
-		} else if (structureType == StructureType.DRY_RUN){
+		} else if (structureType == StructureType.DRY_RUN) {
 			BBChemDryRunStructure bbChemDryRunStructureSaved = BBChemDryRunStructure.findBBChemDryRunStructure(id);
-			if(bbChemDryRunStructureSaved == null) {
+			if (bbChemDryRunStructureSaved == null) {
 				return false;
 			}
 			bbChemDryRunStructureSaved.updateStructureInfo(bbChemStructure);
 			bbChemDryRunStructureSaved.persist();
-		} else if (structureType == StructureType.STANDARDIZATION_DRY_RUN){
-			BBChemStandardizationDryRunStructure bbChemStandardizationDryRunStructureSaved = BBChemStandardizationDryRunStructure.findBBChemStandardizationDryRunStructure(id);
-			if(bbChemStandardizationDryRunStructureSaved == null) {
+		} else if (structureType == StructureType.STANDARDIZATION_DRY_RUN) {
+			BBChemStandardizationDryRunStructure bbChemStandardizationDryRunStructureSaved = BBChemStandardizationDryRunStructure
+					.findBBChemStandardizationDryRunStructure(id);
+			if (bbChemStandardizationDryRunStructureSaved == null) {
 				return false;
 			}
 			bbChemStandardizationDryRunStructureSaved.updateStructureInfo(bbChemStructure);
@@ -475,7 +520,7 @@ public boolean checkForSalt(String molfile) throws CmpdRegMolFormatException {
 		boolean foundNonCovalentSalt = false;
 		// Get all fragments
 		List<String> allFrags = bbChemStructureService.getMolFragments(molfile);
-		if(allFrags.size() > 1.0) {
+		if (allFrags.size() > 1.0) {
 			foundNonCovalentSalt = true;
 		}
 		return foundNonCovalentSalt;
@@ -489,7 +534,8 @@ public boolean updateStructure(CmpdRegMolecule cmpdRegMolecule, StructureType st
 
 	@Override
 	public double getExactMass(String molStructure) throws CmpdRegMolFormatException {
-		// Processor doesn't return exact mass so we need to populate it and then return it
+		// Processor doesn't return exact mass so we need to populate it and then return
+		// it
 		BBChemParentStructure bbChemStructure = bbChemStructureService.getProcessedStructure(molStructure, false);
 		return bbChemStructure.getExactMolWeight();
 	}
@@ -497,33 +543,34 @@ public double getExactMass(String molStructure) throws CmpdRegMolFormatException
 	@Override
 	public boolean deleteStructure(StructureType structureType, int cdId) {
 		Long id = new Long(cdId);
-		if (structureType == StructureType.PARENT){
+		if (structureType == StructureType.PARENT) {
 			BBChemParentStructure bbChemStructure = BBChemParentStructure.findBBChemParentStructure(id);
-			if(bbChemStructure == null) {
+			if (bbChemStructure == null) {
 				return false;
 			}
 			bbChemStructure.remove();
-		} else if (structureType == StructureType.SALT_FORM){
+		} else if (structureType == StructureType.SALT_FORM) {
 			BBChemSaltFormStructure bbChemSaltFormStructure = BBChemSaltFormStructure.findBBChemSaltFormStructure(id);
-			if(bbChemSaltFormStructure == null) {
+			if (bbChemSaltFormStructure == null) {
 				return false;
 			}
 			bbChemSaltFormStructure.remove();
-		} else if (structureType == StructureType.SALT){
+		} else if (structureType == StructureType.SALT) {
 			BBChemSaltStructure bbChemSaltStructure = BBChemSaltStructure.findBBChemSaltStructure(id);
-			if(bbChemSaltStructure == null) {
+			if (bbChemSaltStructure == null) {
 				return false;
 			}
 			bbChemSaltStructure.remove();
-		} else if (structureType == StructureType.DRY_RUN){
+		} else if (structureType == StructureType.DRY_RUN) {
 			BBChemDryRunStructure bbChemDryRunStructure = BBChemDryRunStructure.findBBChemDryRunStructure(id);
-			if(bbChemDryRunStructure == null) {
+			if (bbChemDryRunStructure == null) {
 				return false;
 			}
 			bbChemDryRunStructure.remove();
-		} else if (structureType == StructureType.STANDARDIZATION_DRY_RUN){
-			BBChemStandardizationDryRunStructure bbChemStandardizationDryRunStructure = BBChemStandardizationDryRunStructure.findBBChemStandardizationDryRunStructure(id);
-			if(bbChemStandardizationDryRunStructure == null) {
+		} else if (structureType == StructureType.STANDARDIZATION_DRY_RUN) {
+			BBChemStandardizationDryRunStructure bbChemStandardizationDryRunStructure = BBChemStandardizationDryRunStructure
+					.findBBChemStandardizationDryRunStructure(id);
+			if (bbChemStandardizationDryRunStructure == null) {
 				return false;
 			}
 			bbChemStandardizationDryRunStructure.remove();
@@ -544,8 +591,10 @@ private String getServiceFormat(String format) {
 	}
 
 	@Override
-	public MolConvertOutputDTO toFormat(String structure, String inputFormat, String outputFormat) throws IOException, CmpdRegMolFormatException {
-		// Calls preprocessor URL and gets the standardized structure from the preprocessor URL
+	public MolConvertOutputDTO toFormat(String structure, String inputFormat, String outputFormat)
+			throws IOException, CmpdRegMolFormatException {
+		// Calls preprocessor URL and gets the standardized structure from the
+		// preprocessor URL
 		MolConvertOutputDTO output = new MolConvertOutputDTO();
 
 		// Read the preprocessor settings as json
@@ -553,7 +602,7 @@ public MolConvertOutputDTO toFormat(String structure, String inputFormat, String
 
 		// Extract the url to call
 		JsonNode urlNode = jsonNode.get("converterURL");
-		if(urlNode == null || urlNode.isNull()) {
+		if (urlNode == null || urlNode.isNull()) {
 			logger.error("Missing preprocessorSettings converterURL!!");
 		}
 
@@ -568,11 +617,11 @@ public MolConvertOutputDTO toFormat(String structure, String inputFormat, String
 
 		ArrayNode inputsNode = mapper.createArrayNode();
 		inputsNode.add(structure);
-		requestData.put("inputs", inputsNode);		
+		requestData.put("inputs", inputsNode);
 
 		// Post to the service
 		String postResponse = SimpleUtil.postRequestToExternalServer(url, requestData.toString(), logger);
-		logger.debug("Got response: "+ postResponse);
+		logger.debug("Got response: " + postResponse);
 
 		// Parse the response json
 		ObjectMapper responseMapper = new ObjectMapper();
@@ -587,23 +636,23 @@ public MolConvertOutputDTO toFormat(String structure, String inputFormat, String
 	@Override
 	public MolConvertOutputDTO cleanStructure(String structure, int dim, String opts)
 			throws IOException, CmpdRegMolFormatException {
-			throw new CmpdRegMolFormatException("Hydrogenization not implemented");
+		throw new CmpdRegMolFormatException("Hydrogenization not implemented");
 	}
 
 	@Override
 	public String hydrogenizeMol(String structure, String inputFormat, String method)
 			throws IOException, CmpdRegMolFormatException {
-			//Not implmented
-			throw new CmpdRegMolFormatException("Hydrogenization not implemented");
+		// Not implmented
+		throw new CmpdRegMolFormatException("Hydrogenization not implemented");
 	}
 
 	@Override
 	public String getCipStereo(String structure) throws IOException, CmpdRegMolFormatException {
-		//Jchem implementation returns something like
-		//e.g. [TH: 1{0,3,2} S]
-		//Indigo implementaiton returns the mol file after running some Indigo function
-		//No implementing this function because its not used anywhere that I can find
-		//Perhaps it was used as a utility function at somepoint
+		// Jchem implementation returns something like
+		// e.g. [TH: 1{0,3,2} S]
+		// Indigo implementaiton returns the mol file after running some Indigo function
+		// No implementing this function because its not used anywhere that I can find
+		// Perhaps it was used as a utility function at somepoint
 		throw new CmpdRegMolFormatException("Hydrogenization not implemented");
 
 	}
@@ -613,19 +662,21 @@ public StrippedSaltDTO stripSalts(CmpdRegMolecule inputStructure) throws CmpdReg
 
 		// Get all fragments
 		List<String> allFrags = bbChemStructureService.getMolFragments(inputStructure.getMolStructure());
-	
+
 		// Loop through the fragments and search for salts that match
 		// If a fragment matches, add it to the salt counts
 		// If a fragment doesn't match, then add it to the unidentified fragments
 		Map<Salt, Integer> saltCounts = new HashMap<Salt, Integer>();
 		Set<CmpdRegMoleculeBBChemImpl> unidentifiedFragments = new HashSet<CmpdRegMoleculeBBChemImpl>();
-		for (String fragment : allFrags){
+		for (String fragment : allFrags) {
 			int[] cdIdMatches = searchMolStructures(fragment, StructureType.SALT, SearchType.DUPLICATE_TAUTOMER);
-			if (cdIdMatches.length>0){
+			if (cdIdMatches.length > 0) {
 				Salt foundSalt = Salt.findSaltsByCdId(cdIdMatches[0]).getSingleResult();
-				if (saltCounts.containsKey(foundSalt)) saltCounts.put(foundSalt, saltCounts.get(foundSalt)+1);
-				else saltCounts.put(foundSalt, 1);
-			}else{
+				if (saltCounts.containsKey(foundSalt))
+					saltCounts.put(foundSalt, saltCounts.get(foundSalt) + 1);
+				else
+					saltCounts.put(foundSalt, 1);
+			} else {
 				CmpdRegMoleculeBBChemImpl fragWrapper = new CmpdRegMoleculeBBChemImpl(fragment, bbChemStructureService);
 				unidentifiedFragments.add(fragWrapper);
 			}
@@ -638,32 +689,36 @@ public StrippedSaltDTO stripSalts(CmpdRegMolecule inputStructure) throws CmpdReg
 
 		// Some debug lines to prnt identified salts
 		logger.debug("Identified stripped salts:");
-		for (Salt salt : saltCounts.keySet()){
-			logger.debug("Salt Abbrev: "+salt.getAbbrev());
-			logger.debug("Salt Count: "+ saltCounts.get(salt));
+		for (Salt salt : saltCounts.keySet()) {
+			logger.debug("Salt Abbrev: " + salt.getAbbrev());
+			logger.debug("Salt Count: " + saltCounts.get(salt));
 		}
 		return resultDTO;
 	}
 
 	@Override
-	public HashMap<String, CmpdRegMolecule> standardizeStructures(HashMap<String, String> structures) throws CmpdRegMolFormatException {
+	public HashMap<String, CmpdRegMolecule> standardizeStructures(HashMap<String, String> structures)
+			throws CmpdRegMolFormatException {
 
 		// Get preprocessed structures (standardized mol structures)
-		HashMap<String, Entry<String, String>>preprocessedStructures = new HashMap<String, Entry<String, String>>();
+		HashMap<String, Entry<String, String>> preprocessedStructures = new HashMap<String, Entry<String, String>>();
 		try {
 			preprocessedStructures = bbChemStructureService.getPreprocessedStructures(structures);
 		} catch (IOException e) {
-			logger.error("Error getting preprocessed structures: "+e.getMessage());
-			throw new CmpdRegMolFormatException("Error getting preprocessed structures: "+e.getMessage());
+			logger.error("Error getting preprocessed structures: " + e.getMessage());
+			throw new CmpdRegMolFormatException("Error getting preprocessed structures: " + e.getMessage());
 		}
 
 		// Filling in preprocessor failures with their original structure
-		// Loop through the preprocessStructures and remove any structures that have an error
+		// Loop through the preprocessStructures and remove any structures that have an
+		// error
 		HashMap<String, String> structuresToProcess = new HashMap<String, String>();
-		for (String structureKey : preprocessedStructures.keySet()){
+		for (String structureKey : preprocessedStructures.keySet()) {
 			Entry<String, String> preprocessedStructure = preprocessedStructures.get(structureKey);
 			if (!preprocessedStructure.getKey().equals("SUCCESS")) {
-				logger.error("Got unexpected status '"+preprocessedStructure.getKey()+"' when preprocessing structure for id:'"+structureKey+"' molstruture: '" + structures.get(structureKey) + "'");
+				logger.error("Got unexpected status '" + preprocessedStructure.getKey()
+						+ "' when preprocessing structure for id:'" + structureKey + "' molstruture: '"
+						+ structures.get(structureKey) + "'");
 				// Just add the original structure to the list of structures to process
 				// We will add the error message to the structure later
 				structuresToProcess.put(structureKey, structures.get(structureKey));
@@ -674,16 +729,17 @@ public HashMap<String, CmpdRegMolecule> standardizeStructures(HashMap<String, St
 		}
 
 		// Get processed structures (hashes and include fingerprints)
-		HashMap<String, BBChemParentStructure> standardizedStructures = bbChemStructureService.getProcessedStructures(structuresToProcess, true);
+		HashMap<String, BBChemParentStructure> standardizedStructures = bbChemStructureService
+				.getProcessedStructures(structuresToProcess, true);
 
 		// Return hashmap
 		HashMap<String, CmpdRegMolecule> result = new HashMap<String, CmpdRegMolecule>();
-		for(String key : standardizedStructures.keySet()){
+		for (String key : standardizedStructures.keySet()) {
 			BBChemParentStructure bbchemStructure = standardizedStructures.get(key);
 
 			// Fill in the standardization status and standardization comments
 			Entry<String, String> preprocessedStructure = preprocessedStructures.get(key);
-			if(preprocessedStructure.getKey().equals("SUCCESS")) {
+			if (preprocessedStructure.getKey().equals("SUCCESS")) {
 				bbchemStructure.setStandardizationStatus(StandardizationStatus.SUCCESS);
 			} else {
 				bbchemStructure.setStandardizationStatus(StandardizationStatus.ERROR);
@@ -693,17 +749,17 @@ public HashMap<String, CmpdRegMolecule> standardizeStructures(HashMap<String, St
 			result.put(key, molStructure);
 		}
 		return result;
-	} 
+	}
 
 	@Override
 	public String standardizeStructure(String molfile) throws CmpdRegMolFormatException, IOException {
-		
+
 		// Create input hashmap
 		HashMap<String, String> inputStructures = new HashMap<String, String>();
 		inputStructures.put("molfile", molfile);
-		
+
 		// Call the service
-		HashMap<String, CmpdRegMolecule>  standardizedStructureHashMap = standardizeStructures(inputStructures);
+		HashMap<String, CmpdRegMolecule> standardizedStructureHashMap = standardizeStructures(inputStructures);
 
 		// Get the standardized structure
 		CmpdRegMolecule standardizedMolecule = standardizedStructureHashMap.get("molfile");
@@ -733,15 +789,15 @@ public boolean standardizedMolCompare(String queryMol, String targetMol) throws
 	public boolean isEmpty(String molFile) throws CmpdRegMolFormatException {
 		// Response from service looks like this if the mol is empty:
 		// [
-		// 	{
-		// 		"error_code": "4004",
-		// 		"error_msg": "No atoms present"
-		// 	}
+		// {
+		// "error_code": "4004",
+		// "error_msg": "No atoms present"
+		// }
 		// ]
-		try{
+		try {
 			JsonNode responseNode = bbChemStructureService.postToProcessService(molFile);
 			JsonNode errorCodeNode = responseNode.get(0).get("error_code");
-			if( errorCodeNode != null && errorCodeNode.asText().equals("4004")){
+			if (errorCodeNode != null && errorCodeNode.asText().equals("4004")) {
 				return true;
 			} else {
 				return false;
@@ -754,11 +810,11 @@ public boolean isEmpty(String molFile) throws CmpdRegMolFormatException {
 	}
 
 	@Override
-	public StandardizerSettingsConfigDTO getStandardizerSettings() throws StandardizerException{
+	public StandardizerSettingsConfigDTO getStandardizerSettings() throws StandardizerException {
 		// Read the preprocessor settings as json
 		ObjectMapper objectMapper = new ObjectMapper();
 		JsonNode jsonNode = null;
-		try{
+		try {
 			jsonNode = bbChemStructureService.getPreprocessorSettings().get("standardizer_actions");
 		} catch (IOException e) {
 			logger.error("Error parsing preprocessor settings json", e);
@@ -774,10 +830,11 @@ public StandardizerSettingsConfigDTO getStandardizerSettings() throws Standardiz
 	}
 
 	@Override
-	public HashMap<String, Integer> saveStructures(HashMap<String, CmpdRegMolecule> structures, StructureType structureType, Boolean checkForDupes) {
+	public HashMap<String, Integer> saveStructures(HashMap<String, CmpdRegMolecule> structures,
+			StructureType structureType, Boolean checkForDupes) {
 		// return hash
 		HashMap<String, Integer> result = new HashMap<String, Integer>();
-		for(String key : structures.keySet()){
+		for (String key : structures.keySet()) {
 			CmpdRegMolecule cmpdRegMolecule = structures.get(key);
 			BBChemParentStructure bbchemStructure = ((CmpdRegMoleculeBBChemImpl) cmpdRegMolecule).getMolecule();
 			result.put(key, saveStructure(bbchemStructure, structureType, checkForDupes));
@@ -788,22 +845,23 @@ public HashMap<String, Integer> saveStructures(HashMap<String, CmpdRegMolecule>
 	@Override
 	public HashMap<String, CmpdRegMolecule> getCmpdRegMolecules(HashMap<String, Integer> keyIdToStructureId,
 			StructureType structureType) throws CmpdRegMolFormatException {
-		
+
 		// For each structure, get the mol structure
 		HashMap<String, CmpdRegMolecule> result = new HashMap<String, CmpdRegMolecule>();
-		for(String key : keyIdToStructureId.keySet()){
+		for (String key : keyIdToStructureId.keySet()) {
 			Integer structureId = keyIdToStructureId.get(key);
 			AbstractBBChemStructure structure = null;
-			if(structureType == StructureType.PARENT) {
+			if (structureType == StructureType.PARENT) {
 				structure = BBChemParentStructure.findBBChemParentStructure(structureId.longValue());
 			} else if (structureType == StructureType.SALT) {
-			    structure = BBChemSaltStructure.findBBChemSaltStructure(structureId.longValue());
+				structure = BBChemSaltStructure.findBBChemSaltStructure(structureId.longValue());
 			} else if (structureType == StructureType.SALT_FORM) {
 				structure = BBChemSaltFormStructure.findBBChemSaltFormStructure(structureId.longValue());
 			} else if (structureType == StructureType.DRY_RUN) {
 				structure = BBChemDryRunStructure.findBBChemDryRunStructure(structureId.longValue());
 			} else if (structureType == StructureType.STANDARDIZATION_DRY_RUN) {
-				structure = BBChemStandardizationDryRunStructure.findBBChemStandardizationDryRunStructure(structureId.longValue());
+				structure = BBChemStandardizationDryRunStructure
+						.findBBChemStandardizationDryRunStructure(structureId.longValue());
 			}
 			BBChemParentStructure bbchemParentStructure = new BBChemParentStructure();
 			bbchemParentStructure.updateStructureInfo(structure);
@@ -813,14 +871,16 @@ public HashMap<String, CmpdRegMolecule> getCmpdRegMolecules(HashMap<String, Inte
 	}
 
 	@Override
-	public int[] searchMolStructures(CmpdRegMolecule cmpdRegMolecule, StructureType structureType, SearchType searchType, Float simlarityPercent, int maxResults) throws CmpdRegMolFormatException {
-		
+	public int[] searchMolStructures(CmpdRegMolecule cmpdRegMolecule, StructureType structureType,
+			SearchType searchType, Float simlarityPercent, int maxResults) throws CmpdRegMolFormatException {
+
 		// Get the mol structure
 		CmpdRegMoleculeBBChemImpl bbChemCmpdRegMolecule = (CmpdRegMoleculeBBChemImpl) cmpdRegMolecule;
 		BBChemParentStructure structure = bbChemCmpdRegMolecule.getMolecule();
-		
+
 		// Search for the structure
-		List<? extends AbstractBBChemStructure> bbChemStructures = searchBBChemStructures(structure, structureType,  new int[0], searchType, simlarityPercent, maxResults);
+		List<? extends AbstractBBChemStructure> bbChemStructures = searchBBChemStructures(structure, structureType,
+				new int[0], searchType, simlarityPercent, maxResults);
 
 		// Create empty int hit list
 		int[] hits = new int[bbChemStructures.size()];
@@ -830,21 +890,23 @@ public int[] searchMolStructures(CmpdRegMolecule cmpdRegMolecule, StructureType
 		return hits;
 	}
 
-
 	List<BigInteger> getStructureTypeIdsMissingStructures(StructureType structureType) {
 
 		EntityManager em = BBChemParentStructure.entityManager();
-		Query q = em.createNativeQuery("SELECT p.id FROM " + structureType.name() + " p LEFT JOIN "+getBBChemStructureTableNameFromStructureType(structureType) + " b on p.cd_id=b.id where p.mol_structure is not null and b.id is null");
+		Query q = em.createNativeQuery("SELECT p.id FROM " + structureType.name() + " p LEFT JOIN "
+				+ getBBChemStructureTableNameFromStructureType(structureType)
+				+ " b on p.cd_id=b.id where p.mol_structure is not null and b.id is null");
 		return q.getResultList();
 	}
 
 	public void fillMissingParentStructures() throws CmpdRegMolFormatException {
 		// Parents
 		List<BigInteger> missingIds = getStructureTypeIdsMissingStructures(StructureType.PARENT);
-		if(missingIds.size() > 0) {
-			logger.warn("Found " + missingIds.size() + " " + StructureType.PARENT + " ids missing structure representations");
+		if (missingIds.size() > 0) {
+			logger.warn("Found " + missingIds.size() + " " + StructureType.PARENT
+					+ " ids missing structure representations");
 		} else {
-			logger.info("No "+ StructureType.PARENT + " ids missing structure representations");
+			logger.info("No " + StructureType.PARENT + " ids missing structure representations");
 			return;
 		}
 
@@ -860,28 +922,31 @@ public void fillMissingParentStructures() throws CmpdRegMolFormatException {
 		float previousPercent = percent;
 		EntityManager em = BBChemParentStructure.entityManager();
 
-		for(List<Long> group : groups) {
+		for (List<Long> group : groups) {
 			logger.info("Started fetching " + group.size() + " " + StructureType.PARENT + " molstructures to save");
 			HashMap<String, String> structureIdParentMolStructureMap = new HashMap<String, String>();
 			List<Parent> parents = em.createQuery("SELECT p FROM Parent p where id in (:ids)", Parent.class)
-				.setParameter("ids", group)
-				.getResultList();
-			for(Parent parent : parents) {
+					.setParameter("ids", group)
+					.getResultList();
+			for (Parent parent : parents) {
 				structureIdParentMolStructureMap.put(String.valueOf(parent.getCdId()), parent.getMolStructure());
 			}
-			logger.info("Finished fetching " + group.size()+ " " + StructureType.PARENT + " molstructures to save");
+			logger.info("Finished fetching " + group.size() + " " + StructureType.PARENT + " molstructures to save");
 			logger.info("Started processing " + structureIdParentMolStructureMap.size() + " parent structures");
-			HashMap<String, BBChemParentStructure> processedStructures = bbChemStructureService.getProcessedStructures(structureIdParentMolStructureMap, true);
-			logger.info("Finished processing " + structureIdParentMolStructureMap.size()+ " " + StructureType.PARENT + " structures");
-			logger.info("Started saving " + processedStructures.size()+ " " + StructureType.PARENT + " structures");
+			HashMap<String, BBChemParentStructure> processedStructures = bbChemStructureService
+					.getProcessedStructures(structureIdParentMolStructureMap, true);
+			logger.info("Finished processing " + structureIdParentMolStructureMap.size() + " " + StructureType.PARENT
+					+ " structures");
+			logger.info("Started saving " + processedStructures.size() + " " + StructureType.PARENT + " structures");
 			// Loop through parents
-			for(Parent parent : parents) {
+			for (Parent parent : parents) {
 				String originalCdId = String.valueOf(parent.getCdId());
 				BBChemParentStructure processedParentStructure = processedStructures.get(originalCdId);
 				int savedCdId = saveStructure(processedParentStructure, StructureType.PARENT, checkForDupes);
 				parent.setCdId(savedCdId);
 				parent.persist();
-				logger.info("CdId for parent corp name " + parent.getCorpName()+ " " + StructureType.PARENT + " changed from " + originalCdId + " to " + savedCdId);
+				logger.info("CdId for parent corp name " + parent.getCorpName() + " " + StructureType.PARENT
+						+ " changed from " + originalCdId + " to " + savedCdId);
 				p++;
 			}
 
@@ -892,10 +957,12 @@ public void fillMissingParentStructures() throws CmpdRegMolFormatException {
 			if (percent != previousPercent) {
 				currentTime = new Date().getTime();
 				// Output if different from the last time.
-				logger.info("filling "+ " " + StructureType.PARENT + " structure representations " + percent + "% complete (" + p + " of "
-				+ totalCount + ") average speed (rows/min):"+ (p/((currentTime - startTime) / 60.0 / 1000.0)));
+				logger.info("filling " + " " + StructureType.PARENT + " structure representations " + percent
+						+ "% complete (" + p + " of "
+						+ totalCount + ") average speed (rows/min):"
+						+ (p / ((currentTime - startTime) / 60.0 / 1000.0)));
 				currentTime = new Date().getTime();
-				logger.debug("Time Elapsed:"+ (currentTime - startTime));
+				logger.debug("Time Elapsed:" + (currentTime - startTime));
 			}
 			// Update the percentage.
 			previousPercent = percent;
@@ -905,10 +972,11 @@ public void fillMissingParentStructures() throws CmpdRegMolFormatException {
 	public void fillMissingSaltFormStructures() throws CmpdRegMolFormatException {
 		// Salt Forms
 		List<BigInteger> missingIds = getStructureTypeIdsMissingStructures(StructureType.SALT_FORM);
-		if(missingIds.size() > 0) {
-			logger.warn("Found " + missingIds.size() + " " + StructureType.SALT_FORM + " ids missing structure representations");
+		if (missingIds.size() > 0) {
+			logger.warn("Found " + missingIds.size() + " " + StructureType.SALT_FORM
+					+ " ids missing structure representations");
 		} else {
-			logger.info("No "+ StructureType.SALT_FORM + " ids missing structure representations");
+			logger.info("No " + StructureType.SALT_FORM + " ids missing structure representations");
 			return;
 		}
 
@@ -924,28 +992,32 @@ public void fillMissingSaltFormStructures() throws CmpdRegMolFormatException {
 		float previousPercent = percent;
 		EntityManager em = BBChemSaltFormStructure.entityManager();
 
-		for(List<Long> group : groups) {
+		for (List<Long> group : groups) {
 			logger.info("Started fetching " + group.size() + " " + StructureType.SALT_FORM + " molstructures to save");
 			HashMap<String, String> structureIdSaltFormMolStructureMap = new HashMap<String, String>();
 			List<SaltForm> saltForms = em.createQuery("SELECT p FROM SaltForm p where id in (:ids)", SaltForm.class)
-				.setParameter("ids", group)
-				.getResultList();
-			for(SaltForm saltForm : saltForms) {
+					.setParameter("ids", group)
+					.getResultList();
+			for (SaltForm saltForm : saltForms) {
 				structureIdSaltFormMolStructureMap.put(String.valueOf(saltForm.getCdId()), saltForm.getMolStructure());
 			}
-			logger.info("Finished fetching " + group.size()+ " " + StructureType.SALT_FORM + " molstructures to save");
-			logger.info("Started processing " + structureIdSaltFormMolStructureMap.size() + " " + StructureType.SALT_FORM + " structures");
-			HashMap<String, BBChemParentStructure> processedStructures = bbChemStructureService.getProcessedStructures(structureIdSaltFormMolStructureMap, true);
-			logger.info("Finished processing " + structureIdSaltFormMolStructureMap.size()+ " " + StructureType.SALT_FORM + " structures");
-			logger.info("Started saving " + processedStructures.size()+ " " + StructureType.SALT_FORM + " structures");
+			logger.info("Finished fetching " + group.size() + " " + StructureType.SALT_FORM + " molstructures to save");
+			logger.info("Started processing " + structureIdSaltFormMolStructureMap.size() + " "
+					+ StructureType.SALT_FORM + " structures");
+			HashMap<String, BBChemParentStructure> processedStructures = bbChemStructureService
+					.getProcessedStructures(structureIdSaltFormMolStructureMap, true);
+			logger.info("Finished processing " + structureIdSaltFormMolStructureMap.size() + " "
+					+ StructureType.SALT_FORM + " structures");
+			logger.info("Started saving " + processedStructures.size() + " " + StructureType.SALT_FORM + " structures");
 			// Loop through parents
-			for(SaltForm saltForm : saltForms) {
+			for (SaltForm saltForm : saltForms) {
 				String originalCdId = String.valueOf(saltForm.getCdId());
 				BBChemParentStructure processedParentStructure = processedStructures.get(originalCdId);
 				int savedCdId = saveStructure(processedParentStructure, StructureType.SALT_FORM, checkForDupes);
 				saltForm.setCdId(savedCdId);
 				saltForm.persist();
-				logger.info("CdId for corp name " + saltForm.getCorpName()+ " " + StructureType.SALT_FORM + " changed from " + originalCdId + " to " + savedCdId);
+				logger.info("CdId for corp name " + saltForm.getCorpName() + " " + StructureType.SALT_FORM
+						+ " changed from " + originalCdId + " to " + savedCdId);
 				p++;
 			}
 
@@ -956,10 +1028,12 @@ public void fillMissingSaltFormStructures() throws CmpdRegMolFormatException {
 			if (percent != previousPercent) {
 				currentTime = new Date().getTime();
 				// Output if different from the last time.
-				logger.info("filling "+ " " + StructureType.PARENT + " structure representations " + percent + "% complete (" + p + " of "
-				+ totalCount + ") average speed (rows/min):"+ (p/((currentTime - startTime) / 60.0 / 1000.0)));
+				logger.info("filling " + " " + StructureType.PARENT + " structure representations " + percent
+						+ "% complete (" + p + " of "
+						+ totalCount + ") average speed (rows/min):"
+						+ (p / ((currentTime - startTime) / 60.0 / 1000.0)));
 				currentTime = new Date().getTime();
-				logger.debug("Time Elapsed:"+ (currentTime - startTime));
+				logger.debug("Time Elapsed:" + (currentTime - startTime));
 			}
 			// Update the percentage.
 			previousPercent = percent;
@@ -977,8 +1051,4 @@ public void fillMissingStructures() throws CmpdRegMolFormatException {
 
 	}
 
-	
-	
-
 }
-
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/CmpdRegMoleculeBBChemImpl.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/CmpdRegMoleculeBBChemImpl.java
index bca52352a..dae61e8db 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/CmpdRegMoleculeBBChemImpl.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/CmpdRegMoleculeBBChemImpl.java
@@ -25,7 +25,8 @@ public CmpdRegMoleculeBBChemImpl(BBChemParentStructure molecule, BBChemStructure
 		this.bbChemStructureService = bbChemStructureService;
 	}
 
-	public CmpdRegMoleculeBBChemImpl(String singleSDF, BBChemStructureService bbChemStructureService) throws CmpdRegMolFormatException {
+	public CmpdRegMoleculeBBChemImpl(String singleSDF, BBChemStructureService bbChemStructureService)
+			throws CmpdRegMolFormatException {
 		this.bbChemStructureService = bbChemStructureService;
 		this.molecule = bbChemStructureService.parseSDF(singleSDF).get(0);
 	}
@@ -38,7 +39,7 @@ public void setProperty(String key, String value) {
 	@Override
 	public String getProperty(String key) {
 		String prop = this.molecule.getProperties().get(key);
-		if(prop.equals("")) {
+		if (prop.equals("")) {
 			return null;
 		} else {
 			return prop;
@@ -67,9 +68,9 @@ public String getMolStructure() throws CmpdRegMolFormatException {
 
 	@Override
 	public String getFormula() {
-		if(this.getRegistrationStatus() == RegistrationStatus.ERROR) { 
-			return null; 
-		} else if(this.molecule.getMolecularFormula() != null) {
+		if (this.getRegistrationStatus() == RegistrationStatus.ERROR) {
+			return null;
+		} else if (this.molecule.getMolecularFormula() != null) {
 			return this.molecule.getMolecularFormula();
 		} else {
 			try {
@@ -84,9 +85,9 @@ public String getFormula() {
 
 	@Override
 	public Double getExactMass() {
-		if(this.getRegistrationStatus() == RegistrationStatus.ERROR) { 
-			return null; 
-		} else if(this.molecule.getExactMolWeight() != null) {
+		if (this.getRegistrationStatus() == RegistrationStatus.ERROR) {
+			return null;
+		} else if (this.molecule.getExactMolWeight() != null) {
 			return this.molecule.getExactMolWeight();
 		} else {
 			try {
@@ -96,14 +97,14 @@ public Double getExactMass() {
 				logger.error(e.getMessage());
 				return null;
 			}
-		}	
+		}
 	}
 
 	@Override
 	public Double getMass() {
-		if(this.getRegistrationStatus() == RegistrationStatus.ERROR) { 
-			return null; 
-		} else if(this.molecule.getAverageMolWeight() != null) {
+		if (this.getRegistrationStatus() == RegistrationStatus.ERROR) {
+			return null;
+		} else if (this.molecule.getAverageMolWeight() != null) {
 			return this.molecule.getAverageMolWeight();
 		} else {
 			try {
@@ -118,9 +119,9 @@ public Double getMass() {
 
 	@Override
 	public int getTotalCharge() {
-		if(this.getRegistrationStatus() == RegistrationStatus.ERROR) { 
-			return -1; 
-		} else if(this.molecule.getTotalCharge() != null) {
+		if (this.getRegistrationStatus() == RegistrationStatus.ERROR) {
+			return -1;
+		} else if (this.molecule.getTotalCharge() != null) {
 			return this.molecule.getTotalCharge();
 		} else {
 			try {
@@ -135,9 +136,9 @@ public int getTotalCharge() {
 
 	@Override
 	public String getSmiles() {
-		if(this.getRegistrationStatus() == RegistrationStatus.ERROR) { 
-			return null; 
-		} else if(this.molecule.getSmiles() != null) {
+		if (this.getRegistrationStatus() == RegistrationStatus.ERROR) {
+			return null;
+		} else if (this.molecule.getSmiles() != null) {
 			return this.molecule.getSmiles();
 		} else {
 			try {
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/CmpdRegMoleculeFactoryBBChemImpl.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/CmpdRegMoleculeFactoryBBChemImpl.java
index f73eef637..a55bc8e9e 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/CmpdRegMoleculeFactoryBBChemImpl.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/CmpdRegMoleculeFactoryBBChemImpl.java
@@ -8,18 +8,16 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
 
-
 @Component
 @Configurable
-public class CmpdRegMoleculeFactoryBBChemImpl implements CmpdRegMoleculeFactory{
+public class CmpdRegMoleculeFactoryBBChemImpl implements CmpdRegMoleculeFactory {
 
-    @Autowired
-    private BBChemStructureService bbChemStructureService;
+  @Autowired
+  private BBChemStructureService bbChemStructureService;
 
-    @Override
-    public CmpdRegMolecule getCmpdRegMolecule(String molStructure) throws CmpdRegMolFormatException {
-      return new CmpdRegMoleculeBBChemImpl(molStructure, bbChemStructureService);
-    }
-	
+  @Override
+  public CmpdRegMolecule getCmpdRegMolecule(String molStructure) throws CmpdRegMolFormatException {
+    return new CmpdRegMoleculeBBChemImpl(molStructure, bbChemStructureService);
+  }
 
 }
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/CmpdRegSDFReaderBBChemImpl.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/CmpdRegSDFReaderBBChemImpl.java
index 68728ec7c..4a2528fd7 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/CmpdRegSDFReaderBBChemImpl.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/CmpdRegSDFReaderBBChemImpl.java
@@ -18,15 +18,16 @@ public class CmpdRegSDFReaderBBChemImpl implements CmpdRegSDFReader {
     public CmpdRegSDFReaderBBChemImpl(String fileName, BBChemStructureService bbChemStructureService) {
         this.bbChemStructureService = bbChemStructureService;
         Scanner scanner;
-		try {
-			scanner = new Scanner(new File(fileName));
-            // \\R was added in java 8 and it matches any combination of line endings \r, \n, \r\n, \n\r
+        try {
+            scanner = new Scanner(new File(fileName));
+            // \\R was added in java 8 and it matches any combination of line endings \r,
+            // \n, \r\n, \n\r
             scanner.useDelimiter("\\$\\$\\$\\$\\R");
             this.scanner = scanner;
-		} catch (FileNotFoundException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+        } catch (FileNotFoundException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
     }
 
     @Override
@@ -38,7 +39,8 @@ public void close() throws IOException {
     @Override
     public CmpdRegMolecule readNextMol() throws IOException, CmpdRegMolFormatException {
         if (this.scanner.hasNext()) {
-            CmpdRegMoleculeBBChemImpl molecule = new CmpdRegMoleculeBBChemImpl(scanner.next()+"$$$$", this.bbChemStructureService);
+            CmpdRegMoleculeBBChemImpl molecule = new CmpdRegMoleculeBBChemImpl(scanner.next() + "$$$$",
+                    this.bbChemStructureService);
             return molecule;
         } else {
             return null;
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/CmpdRegSDFWriterBBChemImpl.java b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/CmpdRegSDFWriterBBChemImpl.java
index c178411ca..f80cdd007 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/bbchem/CmpdRegSDFWriterBBChemImpl.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/bbchem/CmpdRegSDFWriterBBChemImpl.java
@@ -13,7 +13,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 
-
 @Configurable
 public class CmpdRegSDFWriterBBChemImpl implements CmpdRegSDFWriter {
 
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/indigo/ChemStructureServiceIndigoImpl.java b/src/main/java/com/labsynch/labseer/chemclasses/indigo/ChemStructureServiceIndigoImpl.java
index 6dae07a38..f4421abd8 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/indigo/ChemStructureServiceIndigoImpl.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/indigo/ChemStructureServiceIndigoImpl.java
@@ -48,48 +48,43 @@ public class ChemStructureServiceIndigoImpl implements ChemStructureService {
 
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
-	
+
 	private boolean shouldCloseConnection = false;
 
-	public void setShouldCloseConnection(boolean shouldCloseConnection)
-	{
+	public void setShouldCloseConnection(boolean shouldCloseConnection) {
 		this.shouldCloseConnection = shouldCloseConnection;
 	}
 
-	public boolean getShouldCloseConnection()
-	{
+	public boolean getShouldCloseConnection() {
 		return shouldCloseConnection;
 	}
 
 	@Autowired
 	private JdbcTemplate basicJdbcTemplate;
 
-	public void setJdbcTemplate(JdbcTemplate jdbcTemplate)
-	{
+	public void setJdbcTemplate(JdbcTemplate jdbcTemplate) {
 		this.basicJdbcTemplate = jdbcTemplate;
 	}
 
-	public JdbcTemplate getJdbcTemplate()
-	{
+	public JdbcTemplate getJdbcTemplate() {
 		return basicJdbcTemplate;
 	}
-	
+
 	private Indigo indigo = new Indigo();
 
 	@Override
-	public boolean compareStructures(String preMolStruct, String postMolStruct, SearchType searchType){
+	public boolean compareStructures(String preMolStruct, String postMolStruct, SearchType searchType) {
 
-
-		//logger.info("SearchType is: " + searchType);
+		// logger.info("SearchType is: " + searchType);
 		boolean compoundsMatch = false;
 		try {
 			IndigoObject queryMol = indigo.loadMolecule(preMolStruct);
 			IndigoObject targetMol = indigo.loadMolecule(preMolStruct);
 
 			compoundsMatch = (indigo.exactMatch(queryMol, targetMol, "ALL") != null);
-			if (!compoundsMatch){
+			if (!compoundsMatch) {
 				logger.info(queryMol.smiles());
-				logger.info(targetMol.smiles());				
+				logger.info(targetMol.smiles());
 			}
 
 		} catch (IndigoException e) {
@@ -100,26 +95,21 @@ public boolean compareStructures(String preMolStruct, String postMolStruct, Sear
 		return compoundsMatch;
 	}
 
-
-
 	@Override
-	public String standardizeStructure(String molfile) throws CmpdRegMolFormatException{
-		//Call method below after parsing molfile
+	public String standardizeStructure(String molfile) throws CmpdRegMolFormatException {
+		// Call method below after parsing molfile
 		CmpdRegMoleculeIndigoImpl molWrapper = new CmpdRegMoleculeIndigoImpl(molfile);
 		return standardizeMolecule(molWrapper.molecule).molfile();
 	}
 
-
 	public IndigoObject standardizeMolecule(IndigoObject molecule) {
-		//Indigo standardizer configs
+		// Indigo standardizer configs
 		logger.error("Standardizer with Indigo chemistry services is not implemented!");
-//		indigo.setOption("standardize-stereo", true);
-		molecule.standardize();		
+		// indigo.setOption("standardize-stereo", true);
+		molecule.standardize();
 		return molecule;
 	}
 
-
-
 	@Override
 	public int saveStructure(String molfile, StructureType structureType) {
 		boolean checkForDupes = false;
@@ -128,171 +118,182 @@ public int saveStructure(String molfile, StructureType structureType) {
 
 	@Override
 	public int saveStructure(String molfile, StructureType structureType, boolean checkForDupes) {
-		return  (int) Parent.countParents() + 1;
+		return (int) Parent.countParents() + 1;
 	}
 
 	@Override
 	public void closeConnection() {
-		//do nothing
+		// do nothing
 	}
 
 	@Override
-	public int[] searchMolStructures(String molfile, StructureType structureType, SearchType searchType) throws CmpdRegMolFormatException {
-		return searchMolStructures(molfile, structureType, searchType, 0f);	
+	public int[] searchMolStructures(String molfile, StructureType structureType, SearchType searchType)
+			throws CmpdRegMolFormatException {
+		return searchMolStructures(molfile, structureType, searchType, 0f);
 	}
 
 	@Override
-	public int[] searchMolStructures(String molfile, StructureType structureType, SearchType searchType, Float simlarityPercent) throws CmpdRegMolFormatException {
+	public int[] searchMolStructures(String molfile, StructureType structureType, SearchType searchType,
+			Float simlarityPercent) throws CmpdRegMolFormatException {
 		int maxResultCount = propertiesUtilService.getMaxSearchResults();
-		return searchMolStructures(molfile, structureType, searchType, simlarityPercent, maxResultCount);	
+		return searchMolStructures(molfile, structureType, searchType, simlarityPercent, maxResultCount);
 
 	}
 
 	@Override
 	@Transactional
-	public int[] searchMolStructures(String molfile, StructureType structureType, SearchType searchType, 
+	public int[] searchMolStructures(String molfile, StructureType structureType, SearchType searchType,
 			Float simlarityPercent, int maxResults) throws CmpdRegMolFormatException {
 
-		Connection conn = DataSourceUtils.getConnection(basicJdbcTemplate.getDataSource());	
+		Connection conn = DataSourceUtils.getConnection(basicJdbcTemplate.getDataSource());
 		try {
 			conn.setAutoCommit(true);
 		} catch (SQLException e1) {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
 		}
-		
+
 		long maxTime = propertiesUtilService.getMaxSearchTime();
 		int maxResultCount = maxResults;
-		//Indigo: the structures in the plainTable are being used. Ignore structureTable from here on out.
-		logger.debug("Search table is  " + structureType.entityTable);		
-		logger.debug("Search type is  " + searchType);		
-		logger.debug("Max number of results is  " + maxResults);		
+		// Indigo: the structures in the plainTable are being used. Ignore
+		// structureTable from here on out.
+		logger.debug("Search table is  " + structureType.entityTable);
+		logger.debug("Search type is  " + searchType);
+		logger.debug("Max number of results is  " + maxResults);
 
-		logger.debug("Dissimilarity similarity is  " + simlarityPercent);		
+		logger.debug("Dissimilarity similarity is  " + simlarityPercent);
 
 		float indSimilarity = 1.0f - simlarityPercent;
-		logger.debug("Indigo search similarity is  " + indSimilarity);		
-
+		logger.debug("Indigo search similarity is  " + indSimilarity);
 
-		if (searchType == SearchType.EXACT){
+		if (searchType == SearchType.EXACT) {
 			searchType = propertiesUtilService.getExactMatchDef();
 		}
 
 		try {
 			CmpdRegMoleculeIndigoImpl molWrapper = new CmpdRegMoleculeIndigoImpl(molfile);
 			IndigoObject mol = molWrapper.molecule;
-			
+
 			String baseQuery = "SELECT cd_id FROM " + structureType.entityTable + " WHERE mol_structure @ ";
 			String bingoFunction = null;
 			String orderBy = " ORDER BY cd_id";
-			
-			if (propertiesUtilService.getUseExternalStandardizerConfig()){
+
+			if (propertiesUtilService.getUseExternalStandardizerConfig()) {
 				mol = standardizeMolecule(mol);
-				mol.dearomatize();				
+				mol.dearomatize();
 			} else {
-				mol.dearomatize();				
+				mol.dearomatize();
 			}
 
 			logger.debug("definition of exact search: " + propertiesUtilService.getExactMatchDef());
 			logger.debug("selected search type: " + searchType);
-			
+
 			if (searchType == SearchType.SUBSTRUCTURE) {
 				bingoFunction = "cast( ( :queryMol , :parameters ) as bingo.sub)";
-			}else if (searchType == SearchType.SIMILARITY) {
+			} else if (searchType == SearchType.SIMILARITY) {
 				bingoFunction = "cast( ( :minSimilarity , :maxSimilarity , :queryMol , :metric ) as bingo.sim)";
-				orderBy = " ORDER BY "+bingoFunction;
-			}else { 
+				orderBy = " ORDER BY " + bingoFunction;
+			} else {
 				bingoFunction = "cast(( :queryMol , :parameters ) as bingo.exact)";
 			}
-			
+
 			EntityManager em = Parent.entityManager();
 			Query query = em.createNativeQuery(baseQuery + bingoFunction + orderBy);
-			
+
 			query.setParameter("queryMol", mol.molfile());
 			query.setMaxResults(maxResults);
-			
-			//May need additional research / decisions around which options to use
-			//Basic Indigo search types corresponding to JChem search types
-			//CReg: "DUPLICATE" or "DUPLICATE_NO_TAUTOMER" :: JChem: "DUPLICATE", "TAUTOMER_SEARCH_OFF" :: Bingo.Exact, "ALL"
-			//CReg: "DUPLICATE_TAUTOMER" :: JChem: "DUPLICATE", "TAUTOMER_SEARCH_ON" :: Bingo.Exact, "TAU"
-			//CReg: "STEREO_IGNORE" :: JChem: "STEREO_IGNORE" :: Bingo.Exact "ALL -STE"
-			//(NOT SURE ABOUT THIS) CReg: "FULL_TAUTOMER", or default/unrecognized searchType :: JChem: "FULL", "CHARGE_MATCHING_IGNORE", "ISOTOPE_MATCHING_IGNORE", "STEREO_IGNORE", "TAUTOMER_SEARCH_ON" :: Bingo.Exact "TAU ALL -ELE -MAS -STE"
-			//CReg: "SUBSTRUCTURE" :: JChem: "SUBSTRUCTURE" :: Bingo.Sub
-			//CReg: "SIMILARITY" :: JChem "SIMILARITY" :: Bingo.Sim > $min
-			//CReg: "FULL" :: JChem "FULL", "CHARGE_MATCHING_IGNORE", "ISOTOPE_MATCHING_IGNORE", "STEREO_IGNORE", "TAUTOMER_SEARCH_OFF" :: Bingo.Exact "ALL -ELE -MAS -STE"
-			
+
+			// May need additional research / decisions around which options to use
+			// Basic Indigo search types corresponding to JChem search types
+			// CReg: "DUPLICATE" or "DUPLICATE_NO_TAUTOMER" :: JChem: "DUPLICATE",
+			// "TAUTOMER_SEARCH_OFF" :: Bingo.Exact, "ALL"
+			// CReg: "DUPLICATE_TAUTOMER" :: JChem: "DUPLICATE", "TAUTOMER_SEARCH_ON" ::
+			// Bingo.Exact, "TAU"
+			// CReg: "STEREO_IGNORE" :: JChem: "STEREO_IGNORE" :: Bingo.Exact "ALL -STE"
+			// (NOT SURE ABOUT THIS) CReg: "FULL_TAUTOMER", or default/unrecognized
+			// searchType :: JChem: "FULL", "CHARGE_MATCHING_IGNORE",
+			// "ISOTOPE_MATCHING_IGNORE", "STEREO_IGNORE", "TAUTOMER_SEARCH_ON" ::
+			// Bingo.Exact "TAU ALL -ELE -MAS -STE"
+			// CReg: "SUBSTRUCTURE" :: JChem: "SUBSTRUCTURE" :: Bingo.Sub
+			// CReg: "SIMILARITY" :: JChem "SIMILARITY" :: Bingo.Sim > $min
+			// CReg: "FULL" :: JChem "FULL", "CHARGE_MATCHING_IGNORE",
+			// "ISOTOPE_MATCHING_IGNORE", "STEREO_IGNORE", "TAUTOMER_SEARCH_OFF" ::
+			// Bingo.Exact "ALL -ELE -MAS -STE"
+
 			if (searchType == SearchType.SUBSTRUCTURE) {
 				query.setParameter("parameters", "");
-			}else if (searchType == SearchType.SIMILARITY) {
+			} else if (searchType == SearchType.SIMILARITY) {
 				query.setParameter("minSimilarity", indSimilarity);
 				query.setParameter("maxSimilarity", 1.0);
 				query.setParameter("metric", "Tanimoto");
-			}else {
+			} else {
 				String parameters = null;
 				switch (searchType) {
-				case DUPLICATE:
-					parameters = "ALL";
-					break;
-				case DUPLICATE_TAUTOMER:
-					parameters = "TAU";
-					break;
-				case STEREO_IGNORE:
-					parameters = "ALL -STE";
-					break;
-				case FULL_TAUTOMER:
-					parameters = "TAU";
-					break;
-				case FULL:
-					parameters = "ALL -ELE -MAS -STE";
-					break;
-				default:
-					//TODO: this should match FULL_TAUTOMER if possible
-					parameters = "ALL";
-					break;
+					case DUPLICATE:
+						parameters = "ALL";
+						break;
+					case DUPLICATE_TAUTOMER:
+						parameters = "TAU";
+						break;
+					case STEREO_IGNORE:
+						parameters = "ALL -STE";
+						break;
+					case FULL_TAUTOMER:
+						parameters = "TAU";
+						break;
+					case FULL:
+						parameters = "ALL -ELE -MAS -STE";
+						break;
+					default:
+						// TODO: this should match FULL_TAUTOMER if possible
+						parameters = "ALL";
+						break;
 				}
 				query.setParameter("parameters", parameters);
 			}
-			if (logger.isDebugEnabled()) logger.debug(query.unwrap(org.hibernate.Query.class).getQueryString());
-			//TODO: should do an audit of the search types being used by CReg.
-			
+			if (logger.isDebugEnabled())
+				logger.debug(query.unwrap(org.hibernate.Query.class).getQueryString());
+			// TODO: should do an audit of the search types being used by CReg.
+
 			List<Integer> hitListList = query.getResultList();
-			
-			//if we are searching in DUPLICATE_TAUTOMER mode and the above TAU search returned results
-			//we need to also check the stereochemistry matches since we can't do both at once.
-			//the overall results should be the intersection of both queries
+
+			// if we are searching in DUPLICATE_TAUTOMER mode and the above TAU search
+			// returned results
+			// we need to also check the stereochemistry matches since we can't do both at
+			// once.
+			// the overall results should be the intersection of both queries
 			if (hitListList.size() > 0 && mol.countAtoms() > 0 && searchType == SearchType.DUPLICATE_TAUTOMER) {
 				query.setParameter("parameters", "STE");
 				List<Integer> stereoHitListList = query.getResultList();
 				hitListList.retainAll(stereoHitListList);
 			}
-			
-			
-			if (hitListList.size() > 0){
+
+			if (hitListList.size() > 0) {
 				logger.debug("found a matching molecule!!!  " + hitListList.size());
 			}
-			
+
 			int[] hitList = ArrayUtils.toPrimitive(hitListList.toArray(new Integer[hitListList.size()]));
 
 			return hitList;
-			
-		}catch (JpaSystemException sqlException) {
+
+		} catch (JpaSystemException sqlException) {
 			logger.error("Caught search error", sqlException);
-			Exception rootCause = new Exception(ExceptionUtils.getRootCause(sqlException).getMessage(), ExceptionUtils.getRootCause(sqlException));
+			Exception rootCause = new Exception(ExceptionUtils.getRootCause(sqlException).getMessage(),
+					ExceptionUtils.getRootCause(sqlException));
 			throw new CmpdRegMolFormatException(rootCause);
-		}  catch (Exception e) {
+		} catch (Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 			return null;
 		}
 	}
 
-
 	@Override
-	public boolean checkForSalt(String molfile) throws CmpdRegMolFormatException{
+	public boolean checkForSalt(String molfile) throws CmpdRegMolFormatException {
 		IndigoObject mol = indigo.loadMolecule(molfile);
 		int fragCount = mol.countComponents();
 		boolean foundNonCovalentSalt = false;
-		if (fragCount > 1){
+		if (fragCount > 1) {
 			foundNonCovalentSalt = true;
 		}
 
@@ -301,24 +302,27 @@ public boolean checkForSalt(String molfile) throws CmpdRegMolFormatException{
 	}
 
 	@Override
-	public StrippedSaltDTO stripSalts(CmpdRegMolecule inputStructure) throws CmpdRegMolFormatException{
+	public StrippedSaltDTO stripSalts(CmpdRegMolecule inputStructure) throws CmpdRegMolFormatException {
 		CmpdRegMoleculeIndigoImpl molWrapper = (CmpdRegMoleculeIndigoImpl) inputStructure;
 		IndigoObject rawMolecule = molWrapper.molecule;
 		IndigoObject clone = rawMolecule.clone();
 		List<CmpdRegMoleculeIndigoImpl> allFrags = new ArrayList<CmpdRegMoleculeIndigoImpl>();
-		for (IndigoObject component : clone.iterateComponents()){
+		for (IndigoObject component : clone.iterateComponents()) {
 			CmpdRegMoleculeIndigoImpl fragMolecule = new CmpdRegMoleculeIndigoImpl(component.clone());
 			allFrags.add(fragMolecule);
-		}		
+		}
 		Map<Salt, Integer> saltCounts = new HashMap<Salt, Integer>();
 		Set<CmpdRegMoleculeIndigoImpl> unidentifiedFragments = new HashSet<CmpdRegMoleculeIndigoImpl>();
-		for (CmpdRegMoleculeIndigoImpl fragment : allFrags){
-			int[] cdIdMatches = searchMolStructures(fragment.getMolStructure(), StructureType.SALT, SearchType.DUPLICATE_TAUTOMER);
-			if (cdIdMatches.length>0){
+		for (CmpdRegMoleculeIndigoImpl fragment : allFrags) {
+			int[] cdIdMatches = searchMolStructures(fragment.getMolStructure(), StructureType.SALT,
+					SearchType.DUPLICATE_TAUTOMER);
+			if (cdIdMatches.length > 0) {
 				Salt foundSalt = Salt.findSaltsByCdId(cdIdMatches[0]).getSingleResult();
-				if (saltCounts.containsKey(foundSalt)) saltCounts.put(foundSalt, saltCounts.get(foundSalt)+1);
-				else saltCounts.put(foundSalt, 1);
-			}else{
+				if (saltCounts.containsKey(foundSalt))
+					saltCounts.put(foundSalt, saltCounts.get(foundSalt) + 1);
+				else
+					saltCounts.put(foundSalt, 1);
+			} else {
 				unidentifiedFragments.add(fragment);
 			}
 		}
@@ -326,16 +330,17 @@ public StrippedSaltDTO stripSalts(CmpdRegMolecule inputStructure) throws CmpdReg
 		resultDTO.setSaltCounts(saltCounts);
 		resultDTO.setUnidentifiedFragments(unidentifiedFragments);
 		logger.debug("Identified stripped salts:");
-		for (Salt salt : saltCounts.keySet()){
-			logger.debug("Salt Abbrev: "+salt.getAbbrev());
-			logger.debug("Salt Count: "+ saltCounts.get(salt));
+		for (Salt salt : saltCounts.keySet()) {
+			logger.debug("Salt Abbrev: " + salt.getAbbrev());
+			logger.debug("Salt Count: " + saltCounts.get(salt));
 		}
 		return resultDTO;
 	}
 
 	@Override
 	@Transactional
-	public CmpdRegMolecule[] searchMols(String molfile, StructureType structureType, int[] inputCdIdHitList, SearchType searchType, Float simlarityPercent) throws CmpdRegMolFormatException {
+	public CmpdRegMolecule[] searchMols(String molfile, StructureType structureType, int[] inputCdIdHitList,
+			SearchType searchType, Float simlarityPercent) throws CmpdRegMolFormatException {
 		int maxResults = propertiesUtilService.getMaxSearchResults();
 		return searchMols(molfile, structureType, inputCdIdHitList, searchType, simlarityPercent, maxResults);
 	}
@@ -343,135 +348,145 @@ public CmpdRegMolecule[] searchMols(String molfile, StructureType structureType,
 	@Override
 	@Transactional
 	public boolean truncateStructureTable(StructureType structureType) {
-		//TODO: Implment validation mode for indigo builds
+		// TODO: Implment validation mode for indigo builds
 		return true;
 	}
 
 	@Override
 	@Transactional
-	public CmpdRegMolecule[] searchMols(String molfile, StructureType structureType, int[] inputCdIdHitList, 
+	public CmpdRegMolecule[] searchMols(String molfile, StructureType structureType, int[] inputCdIdHitList,
 			SearchType searchType, Float simlarityPercent, int maxResults) throws CmpdRegMolFormatException {
 
-		Connection conn = DataSourceUtils.getConnection(basicJdbcTemplate.getDataSource());	
+		Connection conn = DataSourceUtils.getConnection(basicJdbcTemplate.getDataSource());
 		try {
 			conn.setAutoCommit(true);
 		} catch (SQLException e1) {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
 		}
-		
+
 		long maxTime = propertiesUtilService.getMaxSearchTime();
 		int maxResultCount = maxResults;
-		//Indigo: the structures in the plainTable are being used. Ignore structureTable from here on out.
-		logger.debug("Search table is  " + structureType.entityTable);		
-		logger.debug("Search type is  " + searchType);		
-		logger.debug("Max number of results is  " + maxResults);	
-		
-		logger.debug("Dissimilarity similarity is  " + simlarityPercent);		
+		// Indigo: the structures in the plainTable are being used. Ignore
+		// structureTable from here on out.
+		logger.debug("Search table is  " + structureType.entityTable);
+		logger.debug("Search type is  " + searchType);
+		logger.debug("Max number of results is  " + maxResults);
 
-		float indSimilarity = 1.0f - simlarityPercent;
-		logger.debug("Indigo search similarity is  " + indSimilarity);		
+		logger.debug("Dissimilarity similarity is  " + simlarityPercent);
 
+		float indSimilarity = 1.0f - simlarityPercent;
+		logger.debug("Indigo search similarity is  " + indSimilarity);
 
-		if (searchType == SearchType.EXACT){
+		if (searchType == SearchType.EXACT) {
 			searchType = propertiesUtilService.getExactMatchDef();
 		}
-		
+
 		List<CmpdRegMoleculeIndigoImpl> moleculeList = new ArrayList<CmpdRegMoleculeIndigoImpl>();
 		try {
 			CmpdRegMoleculeIndigoImpl molWrapper = new CmpdRegMoleculeIndigoImpl(molfile);
 			IndigoObject mol = molWrapper.molecule;
-			
-			String baseQuery = "SELECT cd_id, mol_structure FROM " + structureType.entityTable + " WHERE mol_structure @ ";
+
+			String baseQuery = "SELECT cd_id, mol_structure FROM " + structureType.entityTable
+					+ " WHERE mol_structure @ ";
 			String bingoFunction = null;
 			String orderBy = " ORDER BY cd_id";
 			String filterIdsClause = "";
-			
-			if (propertiesUtilService.getUseExternalStandardizerConfig()){
+
+			if (propertiesUtilService.getUseExternalStandardizerConfig()) {
 				mol = standardizeMolecule(mol);
-				mol.aromatize();				
+				mol.aromatize();
 			} else {
-				mol.aromatize();				
+				mol.aromatize();
 			}
 
 			logger.debug("definition of exact search: " + propertiesUtilService.getExactMatchDef());
 			logger.debug("selected search type: " + searchType);
-			
+
 			if (searchType == SearchType.SUBSTRUCTURE) {
 				bingoFunction = "cast(( :queryMol , :parameters ) as bingo.sub) ";
-			}else if (searchType == SearchType.SIMILARITY) {
+			} else if (searchType == SearchType.SIMILARITY) {
 				bingoFunction = "cast( ( :minSimilarity , :maxSimilarity , :queryMol , :metric ) as bingo.sim)";
-				orderBy = " ORDER BY "+bingoFunction;
-			}else { 
+				orderBy = " ORDER BY " + bingoFunction;
+			} else {
 				bingoFunction = "cast( ( :queryMol , :parameters ) as bingo.exact)";
 			}
-			
-			if (inputCdIdHitList != null && inputCdIdHitList.length > 0) filterIdsClause = " AND cd_id IN :filterCdIds ";
-			
+
+			if (inputCdIdHitList != null && inputCdIdHitList.length > 0)
+				filterIdsClause = " AND cd_id IN :filterCdIds ";
+
 			EntityManager em = Parent.entityManager();
 			Query query = em.createNativeQuery(baseQuery + bingoFunction + filterIdsClause + orderBy);
-			
+
 			query.setParameter("queryMol", mol.molfile());
 			query.setMaxResults(maxResults);
-			
-			if (inputCdIdHitList != null && inputCdIdHitList.length > 0) query.setParameter("filterCdIds", Arrays.asList(ArrayUtils.toObject(inputCdIdHitList)));
-
-			//May need additional research / decisions around which options to use
-			//Basic Indigo search types corresponding to JChem search types
-			//CReg: "DUPLICATE" or "DUPLICATE_NO_TAUTOMER" :: JChem: "DUPLICATE", "TAUTOMER_SEARCH_OFF" :: Bingo.Exact, "ALL"
-			//CReg: "DUPLICATE_TAUTOMER" :: JChem: "DUPLICATE", "TAUTOMER_SEARCH_ON" :: Bingo.Exact, "TAU"
-			//CReg: "STEREO_IGNORE" :: JChem: "STEREO_IGNORE" :: Bingo.Exact "ALL -STE"
-			//(NOT SURE ABOUT THIS) CReg: "FULL_TAUTOMER", or default/unrecognized searchType :: JChem: "FULL", "CHARGE_MATCHING_IGNORE", "ISOTOPE_MATCHING_IGNORE", "STEREO_IGNORE", "TAUTOMER_SEARCH_ON" :: Bingo.Exact "TAU ALL -ELE -MAS -STE"
-			//CReg: "SUBSTRUCTURE" :: JChem: "SUBSTRUCTURE" :: Bingo.Sub
-			//CReg: "SIMILARITY" :: JChem "SIMILARITY" :: Bingo.Sim > $min
-			//CReg: "FULL" :: JChem "FULL", "CHARGE_MATCHING_IGNORE", "ISOTOPE_MATCHING_IGNORE", "STEREO_IGNORE", "TAUTOMER_SEARCH_OFF" :: Bingo.Exact "ALL -ELE -MAS -STE"
-			
+
+			if (inputCdIdHitList != null && inputCdIdHitList.length > 0)
+				query.setParameter("filterCdIds", Arrays.asList(ArrayUtils.toObject(inputCdIdHitList)));
+
+			// May need additional research / decisions around which options to use
+			// Basic Indigo search types corresponding to JChem search types
+			// CReg: "DUPLICATE" or "DUPLICATE_NO_TAUTOMER" :: JChem: "DUPLICATE",
+			// "TAUTOMER_SEARCH_OFF" :: Bingo.Exact, "ALL"
+			// CReg: "DUPLICATE_TAUTOMER" :: JChem: "DUPLICATE", "TAUTOMER_SEARCH_ON" ::
+			// Bingo.Exact, "TAU"
+			// CReg: "STEREO_IGNORE" :: JChem: "STEREO_IGNORE" :: Bingo.Exact "ALL -STE"
+			// (NOT SURE ABOUT THIS) CReg: "FULL_TAUTOMER", or default/unrecognized
+			// searchType :: JChem: "FULL", "CHARGE_MATCHING_IGNORE",
+			// "ISOTOPE_MATCHING_IGNORE", "STEREO_IGNORE", "TAUTOMER_SEARCH_ON" ::
+			// Bingo.Exact "TAU ALL -ELE -MAS -STE"
+			// CReg: "SUBSTRUCTURE" :: JChem: "SUBSTRUCTURE" :: Bingo.Sub
+			// CReg: "SIMILARITY" :: JChem "SIMILARITY" :: Bingo.Sim > $min
+			// CReg: "FULL" :: JChem "FULL", "CHARGE_MATCHING_IGNORE",
+			// "ISOTOPE_MATCHING_IGNORE", "STEREO_IGNORE", "TAUTOMER_SEARCH_OFF" ::
+			// Bingo.Exact "ALL -ELE -MAS -STE"
+
 			if (searchType == SearchType.SUBSTRUCTURE) {
 				query.setParameter("parameters", "");
-			}else if (searchType == SearchType.SIMILARITY) {
+			} else if (searchType == SearchType.SIMILARITY) {
 				query.setParameter("minSimilarity", indSimilarity);
 				query.setParameter("maxSimilarity", 1.0);
 				query.setParameter("metric", "Tanimoto");
-			}else {
+			} else {
 				String parameters = null;
 				switch (searchType) {
-				case DUPLICATE:
-					parameters = "ALL";
-					break;
-				case DUPLICATE_TAUTOMER:
-					parameters = "TAU";
-					break;
-				case STEREO_IGNORE:
-					parameters = "ALL -STE";
-					break;
-				case FULL_TAUTOMER:
-					parameters = "TAU";
-					break;
-				case FULL:
-					parameters = "ALL -ELE -MAS -STE";
-					break;
-				default:
-					//TODO: this should match FULL_TAUTOMER if possible
-					parameters = "ALL";
-					break;
+					case DUPLICATE:
+						parameters = "ALL";
+						break;
+					case DUPLICATE_TAUTOMER:
+						parameters = "TAU";
+						break;
+					case STEREO_IGNORE:
+						parameters = "ALL -STE";
+						break;
+					case FULL_TAUTOMER:
+						parameters = "TAU";
+						break;
+					case FULL:
+						parameters = "ALL -ELE -MAS -STE";
+						break;
+					default:
+						// TODO: this should match FULL_TAUTOMER if possible
+						parameters = "ALL";
+						break;
 				}
 				query.setParameter("parameters", parameters);
 			}
-			if (logger.isDebugEnabled()) logger.debug(query.unwrap(org.hibernate.Query.class).getQueryString());
-			//TODO: should do an audit of the search types being used by CReg.
-			
-			//list of maps of {"cdId": ###, "molStructure": "molfile string"}
+			if (logger.isDebugEnabled())
+				logger.debug(query.unwrap(org.hibernate.Query.class).getQueryString());
+			// TODO: should do an audit of the search types being used by CReg.
+
+			// list of maps of {"cdId": ###, "molStructure": "molfile string"}
 			List<Object[]> hitListList = query.getResultList();
 			for (Object[] hit : hitListList) {
 				Integer cdId = (Integer) hit[0];
-				String molStructure = (String)  hit[1];
-				CmpdRegMoleculeIndigoImpl molecule = new  CmpdRegMoleculeIndigoImpl(molStructure);
+				String molStructure = (String) hit[1];
+				CmpdRegMoleculeIndigoImpl molecule = new CmpdRegMoleculeIndigoImpl(molStructure);
 				molecule.setProperty("cd_id", String.valueOf(cdId));
 				moleculeList.add(molecule);
 			}
 
-
-			if (moleculeList.size() > 0){
+			if (moleculeList.size() > 0) {
 				logger.debug("found a matching molecule!!!  " + moleculeList.size());
 			}
 
@@ -482,25 +497,25 @@ public CmpdRegMolecule[] searchMols(String molfile, StructureType structureType,
 		} catch (SQLException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
-		}catch (JpaSystemException sqlException) {
+		} catch (JpaSystemException sqlException) {
 			logger.error("Caught search error", sqlException);
-			Exception rootCause = new Exception(ExceptionUtils.getRootCause(sqlException).getMessage(), ExceptionUtils.getRootCause(sqlException));
+			Exception rootCause = new Exception(ExceptionUtils.getRootCause(sqlException).getMessage(),
+					ExceptionUtils.getRootCause(sqlException));
 			throw new CmpdRegMolFormatException(rootCause);
 		}
 
 		CmpdRegMoleculeIndigoImpl[] moleculeHits = moleculeList.toArray(new CmpdRegMoleculeIndigoImpl[0]);
-		
+
 		return moleculeHits;
 	}
 
-
 	@Override
 	public CmpdRegMolecule toMolecule(String molStructure) {
 		boolean badStructureFlag = false;
 		IndigoObject mol = null;
 		String lineEnd = System.getProperty("line.separator");
 		try {
-			mol = indigo.loadMolecule(molStructure);	
+			mol = indigo.loadMolecule(molStructure);
 		} catch (IndigoException e1) {
 			logger.debug("failed first attempt: bad mol structure: " + molStructure);
 			// clean up the molString and try again
@@ -512,9 +527,9 @@ public CmpdRegMolecule toMolecule(String molStructure) {
 				badStructureFlag = true;
 				logger.error("bad mol structure: " + molStructure);
 			}
-		}	
+		}
 
-		if (!badStructureFlag){
+		if (!badStructureFlag) {
 			return new CmpdRegMoleculeIndigoImpl(mol);
 		} else {
 			return null;
@@ -527,11 +542,11 @@ public String toMolfile(String molStructure) throws CmpdRegMolFormatException {
 		IndigoObject rawMolecule = molecule.molecule;
 		rawMolecule.dearomatize();
 		return rawMolecule.molfile();
-		
+
 	}
 
 	@Override
-	public String getCipStereo(String structure) throws IOException, CmpdRegMolFormatException{	
+	public String getCipStereo(String structure) throws IOException, CmpdRegMolFormatException {
 		CmpdRegMoleculeIndigoImpl molWrapper = new CmpdRegMoleculeIndigoImpl(structure);
 		IndigoObject molecule = molWrapper.molecule;
 		indigo.setOption("molfile-saving-add-stereo-desc", "1");
@@ -539,7 +554,8 @@ public String getCipStereo(String structure) throws IOException, CmpdRegMolForma
 	}
 
 	@Override
-	public String hydrogenizeMol(String structure, String inputFormat, String method) throws IOException, CmpdRegMolFormatException{	
+	public String hydrogenizeMol(String structure, String inputFormat, String method)
+			throws IOException, CmpdRegMolFormatException {
 		CmpdRegMoleculeIndigoImpl molWrapper = new CmpdRegMoleculeIndigoImpl(structure);
 		IndigoObject molecule = molWrapper.molecule;
 		molecule.unfoldHydrogens();
@@ -547,7 +563,8 @@ public String hydrogenizeMol(String structure, String inputFormat, String method
 	}
 
 	@Override
-	public MolConvertOutputDTO cleanStructure(String structure, int dim, String opts) throws IOException, CmpdRegMolFormatException {				
+	public MolConvertOutputDTO cleanStructure(String structure, int dim, String opts)
+			throws IOException, CmpdRegMolFormatException {
 		CmpdRegMoleculeIndigoImpl molWrapper = new CmpdRegMoleculeIndigoImpl(structure);
 		IndigoObject molecule = molWrapper.molecule;
 		molecule.layout();
@@ -558,10 +575,12 @@ public MolConvertOutputDTO cleanStructure(String structure, int dim, String opts
 	}
 
 	@Override
-	public MolConvertOutputDTO toFormat(String structure, String inputFormat, String outputFormat) throws IOException, CmpdRegMolFormatException {			
+	public MolConvertOutputDTO toFormat(String structure, String inputFormat, String outputFormat)
+			throws IOException, CmpdRegMolFormatException {
 		CmpdRegMoleculeIndigoImpl molWrapper = new CmpdRegMoleculeIndigoImpl(structure);
 		IndigoObject molecule = molWrapper.molecule;
-		if (inputFormat.equalsIgnoreCase("smiles")) molecule.layout();
+		if (inputFormat.equalsIgnoreCase("smiles"))
+			molecule.layout();
 		MolConvertOutputDTO output = new MolConvertOutputDTO();
 		output.setFormat("mol");
 		output.setStructure(molecule.molfile());
@@ -570,19 +589,19 @@ public MolConvertOutputDTO toFormat(String structure, String inputFormat, String
 
 	@Override
 	public String toInchi(String molStructure) {
-//		boolean badStructureFlag = false;
-//		IndigoObject mol = null;
-//		try {
-//			mol = indigo.loadMolecule(molStructure);			
-//		} catch (IndigoException e) {
-//			badStructureFlag = true;
-//		}
-//
-//		if (!badStructureFlag){
-//			return mol.toFormat("inchi");
-//		} else {
-//			return molStructure;
-//		}
+		// boolean badStructureFlag = false;
+		// IndigoObject mol = null;
+		// try {
+		// mol = indigo.loadMolecule(molStructure);
+		// } catch (IndigoException e) {
+		// badStructureFlag = true;
+		// }
+		//
+		// if (!badStructureFlag){
+		// return mol.toFormat("inchi");
+		// } else {
+		// return molStructure;
+		// }
 		logger.error("inChi not implemented with Indigo Services");
 		return molStructure;
 	}
@@ -592,12 +611,12 @@ public String toSmiles(String molStructure) {
 		boolean badStructureFlag = false;
 		IndigoObject mol = null;
 		try {
-			mol = indigo.loadMolecule(molStructure);			
+			mol = indigo.loadMolecule(molStructure);
 		} catch (IndigoException e) {
 			badStructureFlag = true;
 		}
 
-		if (!badStructureFlag){
+		if (!badStructureFlag) {
 			return mol.smiles();
 		} else {
 			return molStructure;
@@ -609,8 +628,8 @@ public boolean isEmpty(String molStructure) throws CmpdRegMolFormatException {
 		// Return empty if no atoms bonds or SGroups
 		CmpdRegMoleculeIndigoImpl molWrapper = new CmpdRegMoleculeIndigoImpl(molStructure);
 		IndigoObject mol = molWrapper.molecule;
-		Boolean hasAtoms =  mol.countAtoms() == 0.0;
-		Boolean hasBonds =  mol.countBonds() == 0.0;
+		Boolean hasAtoms = mol.countAtoms() == 0.0;
+		Boolean hasBonds = mol.countBonds() == 0.0;
 		Boolean hasSGroups = mol.countGenericSGroups() == 0.0 && mol.countDataSGroups() == 0.0;
 		return !hasAtoms && !hasBonds && !hasSGroups;
 	}
@@ -628,7 +647,7 @@ public double getExactMass(String molStructure) throws CmpdRegMolFormatException
 	}
 
 	@Override
-	public  String getMolFormula(String molStructure) throws CmpdRegMolFormatException {
+	public String getMolFormula(String molStructure) throws CmpdRegMolFormatException {
 		CmpdRegMoleculeIndigoImpl mol = new CmpdRegMoleculeIndigoImpl(molStructure);
 		return mol.getFormula();
 	}
@@ -636,24 +655,24 @@ public  String getMolFormula(String molStructure) throws CmpdRegMolFormatExcepti
 	@Override
 	public int[] checkDupeMol(String molStructure, StructureType structureType) throws CmpdRegMolFormatException {
 
-		return searchMolStructures(molStructure, structureType, SearchType.DUPLICATE_TAUTOMER); 
+		return searchMolStructures(molStructure, structureType, SearchType.DUPLICATE_TAUTOMER);
 	}
 
 	@Override
 	public boolean updateStructure(String molStructure, StructureType structureType, int cdId) {
-		//no-op
+		// no-op
 		return true;
-	}	
+	}
 
 	@Override
 	public boolean updateStructure(CmpdRegMolecule mol, StructureType structureType, int cdId) {
-		//no-op
+		// no-op
 		return true;
 	}
 
 	@Override
-	public boolean deleteStructure(StructureType structureType, int cdId){
-		//no-op
+	public boolean deleteStructure(StructureType structureType, int cdId) {
+		// no-op
 		return true;
 	}
 
@@ -667,8 +686,9 @@ public boolean standardizedMolCompare(String queryMol, String targetMol) throws
 	}
 
 	@Override
-	public StandardizerSettingsConfigDTO getStandardizerSettings() throws StandardizerException{
-		//There are no standardizer settings for Indigo implmented so returning empty string
+	public StandardizerSettingsConfigDTO getStandardizerSettings() throws StandardizerException {
+		// There are no standardizer settings for Indigo implmented so returning empty
+		// string
 		StandardizerSettingsConfigDTO standardizationConfigDTO = new StandardizerSettingsConfigDTO();
 		standardizationConfigDTO.setSettings("");
 		standardizationConfigDTO.setType("indigo");
@@ -679,11 +699,12 @@ public StandardizerSettingsConfigDTO getStandardizerSettings() throws Standardiz
 	public HashMap<String, CmpdRegMolecule> standardizeStructures(HashMap<String, String> structures)
 			throws CmpdRegMolFormatException, StandardizerException {
 		HashMap<String, CmpdRegMolecule> standardizedStructures = new HashMap<String, CmpdRegMolecule>();
-		for(String structureKey : structures.keySet()){
+		for (String structureKey : structures.keySet()) {
 			String structure = structures.get(structureKey);
-			try{
+			try {
 				String standardizedStructure = standardizeStructure(structure);
-				CmpdRegMoleculeIndigoImpl standardizedCmpdRegMolecule = new CmpdRegMoleculeIndigoImpl(standardizedStructure);
+				CmpdRegMoleculeIndigoImpl standardizedCmpdRegMolecule = new CmpdRegMoleculeIndigoImpl(
+						standardizedStructure);
 				standardizedStructures.put(structureKey, standardizedCmpdRegMolecule);
 			} catch (Exception e) {
 				logger.error("Got error trying to standardize structure " + structure, e);
@@ -704,10 +725,11 @@ public int saveStructure(CmpdRegMolecule cmpdregMolecule, StructureType structur
 	}
 
 	@Override
-	public HashMap<String, Integer> saveStructures(HashMap<String, CmpdRegMolecule> structures, StructureType structureType, Boolean checkForDupes) {
+	public HashMap<String, Integer> saveStructures(HashMap<String, CmpdRegMolecule> structures,
+			StructureType structureType, Boolean checkForDupes) {
 		// return hash
 		HashMap<String, Integer> result = new HashMap<String, Integer>();
-		for(String key : structures.keySet()){
+		for (String key : structures.keySet()) {
 			CmpdRegMolecule cmpdRegMolecule = structures.get(key);
 			result.put(key, saveStructure(cmpdRegMolecule, structureType, checkForDupes));
 		}
@@ -722,7 +744,7 @@ public HashMap<String, CmpdRegMolecule> getCmpdRegMolecules(HashMap<String, Inte
 		String baseQuery = "SELECT mol_structure FROM " + structureType.entityTable + " WHERE cd_id = :cd_id";
 		EntityManager em = Parent.entityManager();
 		Query query = em.createNativeQuery(baseQuery);
-		for(String key : keyIdToStructureId.keySet()){
+		for (String key : keyIdToStructureId.keySet()) {
 			query.setParameter("cd_id", keyIdToStructureId.get(key));
 			String molStructure = (String) query.getSingleResult();
 			CmpdRegMoleculeIndigoImpl cmpdRegMolecule = new CmpdRegMoleculeIndigoImpl(molStructure);
@@ -734,13 +756,14 @@ public HashMap<String, CmpdRegMolecule> getCmpdRegMolecules(HashMap<String, Inte
 	@Override
 	public int[] searchMolStructures(CmpdRegMolecule cmpdRegMolecule, StructureType structureType,
 			SearchType searchType, Float simlarityPercent, int maxResults) throws CmpdRegMolFormatException {
-		return searchMolStructures(cmpdRegMolecule.getMolStructure(), structureType, searchType, simlarityPercent, maxResults);
+		return searchMolStructures(cmpdRegMolecule.getMolStructure(), structureType, searchType, simlarityPercent,
+				maxResults);
 	}
 
 	@Override
 	public void fillMissingStructures() throws CmpdRegMolFormatException {
-		// Not currently implemented for indigo as there is no use case currently to switch to indigo from another chemistry engine
-		
+		// Not currently implemented for indigo as there is no use case currently to
+		// switch to indigo from another chemistry engine
+
 	}
 }
-
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/indigo/CmpdRegMoleculeFactoryIndigoImpl.java b/src/main/java/com/labsynch/labseer/chemclasses/indigo/CmpdRegMoleculeFactoryIndigoImpl.java
index cdbcf0b32..b6d30fe7f 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/indigo/CmpdRegMoleculeFactoryIndigoImpl.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/indigo/CmpdRegMoleculeFactoryIndigoImpl.java
@@ -9,7 +9,7 @@
 
 @Component
 public class CmpdRegMoleculeFactoryIndigoImpl implements CmpdRegMoleculeFactory {
-	
+
 	public CmpdRegMolecule getCmpdRegMolecule(String molStructure) throws CmpdRegMolFormatException {
 		return new CmpdRegMoleculeIndigoImpl(molStructure);
 	}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/indigo/CmpdRegMoleculeIndigoImpl.java b/src/main/java/com/labsynch/labseer/chemclasses/indigo/CmpdRegMoleculeIndigoImpl.java
index 86a531012..9aa892859 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/indigo/CmpdRegMoleculeIndigoImpl.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/indigo/CmpdRegMoleculeIndigoImpl.java
@@ -15,41 +15,41 @@
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
 
 public class CmpdRegMoleculeIndigoImpl implements CmpdRegMolecule {
-	
+
 	Logger logger = LoggerFactory.getLogger(CmpdRegMoleculeIndigoImpl.class);
-	
+
 	private Indigo indigo = new Indigo();
-	
+
 	IndigoObject molecule;
-	
-	public CmpdRegMoleculeIndigoImpl(String molStructure) throws CmpdRegMolFormatException{
-		try{
+
+	public CmpdRegMoleculeIndigoImpl(String molStructure) throws CmpdRegMolFormatException {
+		try {
 			this.molecule = indigo.loadMolecule(molStructure);
-		}catch (IndigoException e) {
+		} catch (IndigoException e) {
 			throw new CmpdRegMolFormatException(e);
 		}
 	}
-	
-	public CmpdRegMoleculeIndigoImpl(IndigoObject molecule){
+
+	public CmpdRegMoleculeIndigoImpl(IndigoObject molecule) {
 		this.molecule = molecule;
 	}
-	
-	public String getProperty(String key){
-		if (molecule.hasProperty(key)){
+
+	public String getProperty(String key) {
+		if (molecule.hasProperty(key)) {
 			return molecule.getProperty(key);
-		}else {
+		} else {
 			return null;
 		}
 	}
-	
-	public void setProperty(String key, String value){
+
+	public void setProperty(String key, String value) {
 		this.molecule.setProperty(key, value);
 	}
 
 	@Override
 	public String[] getPropertyKeys() {
 		List<String> propertyKeys = new ArrayList<String>();
-		for (IndigoObject prop:  this.molecule.iterateProperties()) {
+		for (IndigoObject prop : this.molecule.iterateProperties()) {
 			propertyKeys.add(prop.name());
 		}
 		String[] keys = new String[propertyKeys.size()];
@@ -58,29 +58,29 @@ public String[] getPropertyKeys() {
 
 	@Override
 	public String getPropertyType(String key) {
-		//Does not seem to exist
+		// Does not seem to exist
 		return null;
 	}
 
 	@Override
 	public String getMolStructure() throws CmpdRegMolFormatException {
-		try{
+		try {
 			return this.molecule.molfile();
-		}catch (IndigoException e) {
+		} catch (IndigoException e) {
 			throw new CmpdRegMolFormatException(e);
 		}
 	}
-	
+
 	@Override
 	public String getSmiles() {
 		return this.molecule.smiles();
 	}
-	
+
 	@Override
 	public String getMrvStructure() {
 		// not implemented in Indigo
 		return null;
-	}; 
+	};
 
 	@Override
 	public String getFormula() {
@@ -116,7 +116,8 @@ public CmpdRegMolecule replaceStructure(String newStructure) throws CmpdRegMolFo
 	}
 
 	@Override
-	public byte[] toBinary(CmpdRegMolecule molecule, String imageFormat, String hSize, String wSize) throws IOException {
+	public byte[] toBinary(CmpdRegMolecule molecule, String imageFormat, String hSize, String wSize)
+			throws IOException {
 		IndigoObject mol = ((CmpdRegMoleculeIndigoImpl) molecule).molecule;
 		try {
 			IndigoRenderer renderer = new IndigoRenderer(indigo);
@@ -124,9 +125,8 @@ public byte[] toBinary(CmpdRegMolecule molecule, String imageFormat, String hSiz
 			indigo.setOption("render-image-height", hSize);
 			indigo.setOption("render-image-width", wSize);
 			return renderer.renderToBuffer(mol);
-		}
-		catch (Exception e) {
-			logger.error("cannot render",e);
+		} catch (Exception e) {
+			logger.error("cannot render", e);
 			return null;
 		}
 	}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/indigo/CmpdRegSDFReaderFactoryIndigoImpl.java b/src/main/java/com/labsynch/labseer/chemclasses/indigo/CmpdRegSDFReaderFactoryIndigoImpl.java
index 8b1886c73..9b098fba8 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/indigo/CmpdRegSDFReaderFactoryIndigoImpl.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/indigo/CmpdRegSDFReaderFactoryIndigoImpl.java
@@ -11,9 +11,10 @@
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
 
 @Component
-public class CmpdRegSDFReaderFactoryIndigoImpl implements CmpdRegSDFReaderFactory{
-	
-	public CmpdRegSDFReader getCmpdRegSDFReader(String fileName) throws FileNotFoundException, CmpdRegMolFormatException, IOException {
+public class CmpdRegSDFReaderFactoryIndigoImpl implements CmpdRegSDFReaderFactory {
+
+	public CmpdRegSDFReader getCmpdRegSDFReader(String fileName)
+			throws FileNotFoundException, CmpdRegMolFormatException, IOException {
 		return new CmpdRegSDFReaderIndigoImpl(fileName);
 	}
 
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/indigo/CmpdRegSDFReaderIndigoImpl.java b/src/main/java/com/labsynch/labseer/chemclasses/indigo/CmpdRegSDFReaderIndigoImpl.java
index 5ec1fd65b..e31c44a2e 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/indigo/CmpdRegSDFReaderIndigoImpl.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/indigo/CmpdRegSDFReaderIndigoImpl.java
@@ -9,11 +9,11 @@
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
 
 public class CmpdRegSDFReaderIndigoImpl implements CmpdRegSDFReader {
-	
+
 	private Indigo indigo = new Indigo();
-	
+
 	private IndigoObject reader;
-	
+
 	public CmpdRegSDFReaderIndigoImpl(String fileName) {
 		this.reader = indigo.iterateSDFile(fileName);
 	}
@@ -28,7 +28,7 @@ public CmpdRegMolecule readNextMol() throws IOException, CmpdRegMolFormatExcepti
 		if (reader.hasNext()) {
 			CmpdRegMoleculeIndigoImpl molecule = new CmpdRegMoleculeIndigoImpl(reader.next());
 			return molecule;
-		}else {
+		} else {
 			return null;
 		}
 	}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/indigo/CmpdRegSDFWriterFactoryIndigoImpl.java b/src/main/java/com/labsynch/labseer/chemclasses/indigo/CmpdRegSDFWriterFactoryIndigoImpl.java
index 050965417..377871171 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/indigo/CmpdRegSDFWriterFactoryIndigoImpl.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/indigo/CmpdRegSDFWriterFactoryIndigoImpl.java
@@ -9,8 +9,8 @@
 import com.labsynch.labseer.chemclasses.indigo.CmpdRegSDFWriterIndigoImpl;
 
 @Component
-public class CmpdRegSDFWriterFactoryIndigoImpl implements CmpdRegSDFWriterFactory{
-	
+public class CmpdRegSDFWriterFactoryIndigoImpl implements CmpdRegSDFWriterFactory {
+
 	public CmpdRegSDFWriter getCmpdRegSDFWriter(String fileName) throws IllegalArgumentException, IOException {
 		return new CmpdRegSDFWriterIndigoImpl(fileName);
 	}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/indigo/CmpdRegSDFWriterIndigoImpl.java b/src/main/java/com/labsynch/labseer/chemclasses/indigo/CmpdRegSDFWriterIndigoImpl.java
index e7944b30d..14d76c84d 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/indigo/CmpdRegSDFWriterIndigoImpl.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/indigo/CmpdRegSDFWriterIndigoImpl.java
@@ -12,17 +12,17 @@
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
 
 public class CmpdRegSDFWriterIndigoImpl implements CmpdRegSDFWriter {
-	
+
 	Logger logger = LoggerFactory.getLogger(CmpdRegSDFWriterIndigoImpl.class);
-	
+
 	private Indigo indigo = new Indigo();
-	
+
 	private IndigoObject writer;
-	
+
 	public CmpdRegSDFWriterIndigoImpl(String fileName) {
 		this.writer = indigo.writeFile(fileName);
 	}
-	
+
 	public CmpdRegSDFWriterIndigoImpl() {
 		this.writer = indigo.writeBuffer();
 	}
@@ -31,14 +31,14 @@ public CmpdRegSDFWriterIndigoImpl() {
 	public boolean writeMol(CmpdRegMolecule molecule) throws CmpdRegMolFormatException, IOException {
 		CmpdRegMoleculeIndigoImpl molWrapper = (CmpdRegMoleculeIndigoImpl) molecule;
 		String molStructure = molWrapper.molecule.molfile();
-		try{
+		try {
 			IndigoObject mol = indigo.loadMolecule(molStructure);
 			for (IndigoObject prop : molWrapper.molecule.iterateProperties()) {
 				mol.setProperty(prop.name(), prop.rawData());
 			}
 			this.writer.sdfAppend(mol);
-		}catch (Exception e){
-			logger.error("Unable to write mol",e);
+		} catch (Exception e) {
+			logger.error("Unable to write mol", e);
 			return false;
 		}
 		return true;
@@ -48,7 +48,7 @@ public boolean writeMol(CmpdRegMolecule molecule) throws CmpdRegMolFormatExcepti
 	public void close() throws IOException {
 		writer.close();
 	}
-	
+
 	@Override
 	public String getBufferString() {
 		return this.writer.toString();
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/jchem/ChemStructureServiceJChemImpl.java b/src/main/java/com/labsynch/labseer/chemclasses/jchem/ChemStructureServiceJChemImpl.java
index 0150795e0..55a380d0c 100755
--- a/src/main/java/com/labsynch/labseer/chemclasses/jchem/ChemStructureServiceJChemImpl.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/jchem/ChemStructureServiceJChemImpl.java
@@ -73,26 +73,22 @@ public class ChemStructureServiceJChemImpl implements ChemStructureService {
 
 	private boolean shouldCloseConnection = false;
 
-	public void setShouldCloseConnection(boolean shouldCloseConnection)
-	{
+	public void setShouldCloseConnection(boolean shouldCloseConnection) {
 		this.shouldCloseConnection = shouldCloseConnection;
 	}
 
-	public boolean getShouldCloseConnection()
-	{
+	public boolean getShouldCloseConnection() {
 		return shouldCloseConnection;
 	}
 
 	@Autowired
 	private JdbcTemplate basicJdbcTemplate;
 
-	public void setJdbcTemplate(JdbcTemplate jdbcTemplate)
-	{
+	public void setJdbcTemplate(JdbcTemplate jdbcTemplate) {
 		this.basicJdbcTemplate = jdbcTemplate;
 	}
 
-	public JdbcTemplate getJdbcTemplate()
-	{
+	public JdbcTemplate getJdbcTemplate() {
 		return basicJdbcTemplate;
 	}
 
@@ -100,10 +96,9 @@ public JdbcTemplate getJdbcTemplate()
 	private PropertiesUtilService propertiesUtilService;
 
 	@Override
-	public boolean compareStructures(String preMolStruct, String postMolStruct, SearchType searchType){
+	public boolean compareStructures(String preMolStruct, String postMolStruct, SearchType searchType) {
 
-
-		//logger.info("SearchType is: " + searchType);
+		// logger.info("SearchType is: " + searchType);
 		boolean compoundsMatch = false;
 		try {
 			MolSearch molSearch = new MolSearch();
@@ -119,9 +114,9 @@ public boolean compareStructures(String preMolStruct, String postMolStruct, Sear
 			options.setChargeMatching(MolSearchOptions.CHARGE_MATCHING_EXACT);
 			molSearch.setSearchOptions(options);
 			compoundsMatch = molSearch.isMatching();
-			if (!compoundsMatch){
+			if (!compoundsMatch) {
 				logger.info(queryMol.toFormat("smiles"));
-				logger.info(targetMol.toFormat("smiles"));				
+				logger.info(targetMol.toFormat("smiles"));
 			}
 
 		} catch (MolFormatException e) {
@@ -135,25 +130,24 @@ public boolean compareStructures(String preMolStruct, String postMolStruct, Sear
 		return compoundsMatch;
 	}
 
-
-
 	@Override
 	public String standardizeStructure(String molfile) throws LicenseException, MolFormatException, IOException {
 		// service to standardize input structure
 		// return standardized structre
-		// error conditions? 
+		// error conditions?
 		// throw or catch errors
 		// create Standardizer based on a XML configuration file
 		String molOut = null;
 		try {
-			Standardizer standardizer = new Standardizer(new File(propertiesUtilService.getStandardizerConfigFilePath()));
+			Standardizer standardizer = new Standardizer(
+					new File(propertiesUtilService.getStandardizerConfigFilePath()));
 			MolHandler mh = new MolHandler(molfile);
 			Molecule molecule = mh.getMolecule();
 			// standardize molecule
 			standardizer.standardize(molecule);
 			// export standardized molecule
 			molOut = MolExporter.exportToFormat(molecule, "mol");
-			
+
 		} catch (MolFormatException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -161,11 +155,10 @@ public String standardizeStructure(String molfile) throws LicenseException, MolF
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		
+
 		return molOut;
 	}
 
-
 	public Molecule standardizeMolecule(Molecule molecule) {
 		// service to standardize input structure
 		// return standardized structure
@@ -182,8 +175,6 @@ public Molecule standardizeMolecule(Molecule molecule) {
 		return molecule;
 	}
 
-
-
 	@Override
 	public int saveStructure(String molfile, StructureType structureType) {
 		boolean checkForDupes = false;
@@ -193,16 +184,18 @@ public int saveStructure(String molfile, StructureType structureType) {
 	@Override
 	public int saveStructure(String molfile, StructureType structureType, boolean checkForDupes) {
 		String structureTable = getJchemStructureTableFromStructureType(structureType);
-		if (logger.isDebugEnabled()) logger.debug("saving structure " + molfile);
-		if (logger.isDebugEnabled()) logger.debug("saving structure to table " + structureTable);
-
+		if (logger.isDebugEnabled())
+			logger.debug("saving structure " + molfile);
+		if (logger.isDebugEnabled())
+			logger.debug("saving structure to table " + structureTable);
 
-		Connection conn = DataSourceUtils.getConnection(basicJdbcTemplate.getDataSource());	
+		Connection conn = DataSourceUtils.getConnection(basicJdbcTemplate.getDataSource());
 		ConnectionHandler ch = new ConnectionHandler();
 		CacheRegistrationUtil cru = null;
 
 		try {
-			if (logger.isDebugEnabled()) logger.debug("the connection closed: " + conn.isClosed());
+			if (logger.isDebugEnabled())
+				logger.debug("the connection closed: " + conn.isClosed());
 			conn.setAutoCommit(true);
 			ch.setConnection(conn);
 		} catch (SQLException e1) {
@@ -224,60 +217,60 @@ public int saveStructure(String molfile, StructureType structureType, boolean ch
 		}
 
 		boolean foundDupe = false;
-		if (checkForDupes){
+		if (checkForDupes) {
 			int[] hitCount = this.searchMolStructures(molfile, structureType, SearchType.DUPLICATE_TAUTOMER);
-			if (hitCount.length > 0){
+			if (hitCount.length > 0) {
 				foundDupe = true;
 			}
 		}
 
-
 		try {
 
 			cru = new CacheRegistrationUtil(ch);
-			if (structureType == StructureType.SALT_FORM){
+			if (structureType == StructureType.SALT_FORM) {
 				String cacheIdentifier = "labsynch_saltform_cache";
-				if (!cru.isCacheIDRegistered(cacheIdentifier)){
-					cru.registerPermanentCache(cacheIdentifier);	
+				if (!cru.isCacheIDRegistered(cacheIdentifier)) {
+					cru.registerPermanentCache(cacheIdentifier);
 				}
-				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);	
+				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);
 
 			} else if (structureType == StructureType.PARENT) {
 				String cacheIdentifier = "labsynch_cmpd_cache";
-				if (!cru.isCacheIDRegistered(cacheIdentifier)){
-					cru.registerPermanentCache(cacheIdentifier);	
+				if (!cru.isCacheIDRegistered(cacheIdentifier)) {
+					cru.registerPermanentCache(cacheIdentifier);
 				}
 				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);
 
 			} else if (structureType == StructureType.COMPOUND) {
 				String cacheIdentifier = "labsynch_cmpd_dupe_cache";
-				if (!cru.isCacheIDRegistered(cacheIdentifier)){
-					cru.registerPermanentCache(cacheIdentifier);	
+				if (!cru.isCacheIDRegistered(cacheIdentifier)) {
+					cru.registerPermanentCache(cacheIdentifier);
 				}
 				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);
-			}  else if (structureType == StructureType.SALT) {
+			} else if (structureType == StructureType.SALT) {
 				String cacheIdentifier = "labsynch_salt_cache";
-				if (!cru.isCacheIDRegistered(cacheIdentifier)){
-					cru.registerPermanentCache(cacheIdentifier);	
+				if (!cru.isCacheIDRegistered(cacheIdentifier)) {
+					cru.registerPermanentCache(cacheIdentifier);
 				}
-				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);				
+				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);
 			} else if (structureType == StructureType.STANDARDIZATION_DRY_RUN) {
 				String cacheIdentifier = "labsync_standardization_dry_run_cache";
-				if (!cru.isCacheIDRegistered(cacheIdentifier)){
-					cru.registerPermanentCache(cacheIdentifier);	
+				if (!cru.isCacheIDRegistered(cacheIdentifier)) {
+					cru.registerPermanentCache(cacheIdentifier);
 				}
 				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);
 			}
 
-
 			String cacheID = CacheRegistrationUtil.getCacheID();
-			if (logger.isDebugEnabled()) logger.debug("current cache ID: " + cacheID);
-			if (logger.isDebugEnabled()) logger.debug("cache status: " + cru.isCacheIDRegistered(cacheID));
+			if (logger.isDebugEnabled())
+				logger.debug("current cache ID: " + cacheID);
+			if (logger.isDebugEnabled())
+				logger.debug("cache status: " + cru.isCacheIDRegistered(cacheID));
 
 			uh2 = new UpdateHandler(ch,
 					UpdateHandler.INSERT, structureTable, "");
 
-			if (!badStructureFlag && !foundDupe){
+			if (!badStructureFlag && !foundDupe) {
 				Molecule mol = mh.getMolecule();
 				mol.aromatize();
 				uh2.setStructure(MolExporter.exportToFormat(mol, "mol"));
@@ -285,10 +278,11 @@ public int saveStructure(String molfile, StructureType structureType, boolean ch
 
 				cdId = uh2.execute(true);
 				uh2.saveUpdateLogs();
-			} else if (foundDupe){
+			} else if (foundDupe) {
 				cdId = 0;
 			} else {
-				if (logger.isDebugEnabled()) logger.debug("offending molformat:  " + molfile);
+				if (logger.isDebugEnabled())
+					logger.debug("offending molformat:  " + molfile);
 				cdId = -1;
 			}
 
@@ -300,11 +294,11 @@ public int saveStructure(String molfile, StructureType structureType, boolean ch
 			}
 
 		} catch (SQLException e) {
-			logger.error("Caught SQLException saving structure to "+structureTable +" table.",e);
+			logger.error("Caught SQLException saving structure to " + structureTable + " table.", e);
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
-		} 
+		}
 
 		return cdId;
 	}
@@ -314,8 +308,8 @@ public void closeConnection() {
 
 		if (this.shouldCloseConnection) {
 
-			Connection conn = DataSourceUtils.getConnection(basicJdbcTemplate.getDataSource());	
-			ConnectionHandler ch = new ConnectionHandler();	 
+			Connection conn = DataSourceUtils.getConnection(basicJdbcTemplate.getDataSource());
+			ConnectionHandler ch = new ConnectionHandler();
 			ch.setConnection(conn);
 
 			try {
@@ -326,31 +320,30 @@ public void closeConnection() {
 				e.printStackTrace();
 			}
 
-
-			System.out.println("closed the connection");		
+			System.out.println("closed the connection");
 		}
 
 	}
 
-	
 	@Override
 	public int[] searchMolStructures(String molfile, StructureType structureType, SearchType searchType) {
-		return searchMolStructures(molfile, structureType, searchType, 0f);	
+		return searchMolStructures(molfile, structureType, searchType, 0f);
 	}
 
 	@Override
-	public int[] searchMolStructures(String molfile, StructureType structureType, SearchType searchType, Float simlarityPercent) {
+	public int[] searchMolStructures(String molfile, StructureType structureType, SearchType searchType,
+			Float simlarityPercent) {
 		int maxResultCount = propertiesUtilService.getMaxSearchResults();
-		return searchMolStructures(molfile, structureType, searchType, simlarityPercent, maxResultCount);	
+		return searchMolStructures(molfile, structureType, searchType, simlarityPercent, maxResultCount);
 
 	}
 
 	@Override
 	@Transactional
-	public int[] searchMolStructures(String molfile, StructureType structureType, SearchType searchType, 
+	public int[] searchMolStructures(String molfile, StructureType structureType, SearchType searchType,
 			Float simlarityPercent, int maxResults) {
 
-		Connection conn = DataSourceUtils.getConnection(basicJdbcTemplate.getDataSource());	
+		Connection conn = DataSourceUtils.getConnection(basicJdbcTemplate.getDataSource());
 		try {
 			conn.setAutoCommit(true);
 		} catch (SQLException e1) {
@@ -364,12 +357,14 @@ public int[] searchMolStructures(String molfile, StructureType structureType, Se
 		long maxTime = propertiesUtilService.getMaxSearchTime();
 		int maxResultCount = maxResults;
 		String structureTable = getJchemStructureTableFromStructureType(structureType);
-		if (logger.isDebugEnabled()) logger.debug("Search table is  " + structureTable);		
-		if (logger.isDebugEnabled()) logger.debug("Search type is  " + searchType);		
-		if (logger.isDebugEnabled()) logger.debug("Max number of results is  " + maxResults);		
-
-
-		if (searchType == SearchType.EXACT){
+		if (logger.isDebugEnabled())
+			logger.debug("Search table is  " + structureTable);
+		if (logger.isDebugEnabled())
+			logger.debug("Search type is  " + searchType);
+		if (logger.isDebugEnabled())
+			logger.debug("Max number of results is  " + maxResults);
+
+		if (searchType == SearchType.EXACT) {
 			searchType = propertiesUtilService.getExactMatchDef();
 		}
 
@@ -378,57 +373,58 @@ public int[] searchMolStructures(String molfile, StructureType structureType, Se
 
 		try {
 			cru = new CacheRegistrationUtil(ch);
-			if (structureType == StructureType.SALT_FORM){
+			if (structureType == StructureType.SALT_FORM) {
 				String cacheIdentifier = "labsynch_saltform_cache";
-				if (!cru.isCacheIDRegistered(cacheIdentifier)){
-					cru.registerPermanentCache(cacheIdentifier);	
+				if (!cru.isCacheIDRegistered(cacheIdentifier)) {
+					cru.registerPermanentCache(cacheIdentifier);
 				}
-				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);	
+				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);
 			} else if (structureType == StructureType.SALT) {
 				String cacheIdentifier = "labsynch_salt_cache";
-				if (!cru.isCacheIDRegistered(cacheIdentifier)){
-					cru.registerPermanentCache(cacheIdentifier);	
+				if (!cru.isCacheIDRegistered(cacheIdentifier)) {
+					cru.registerPermanentCache(cacheIdentifier);
 				}
-				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);				
+				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);
 			} else if (structureType == StructureType.COMPOUND) {
 				String cacheIdentifier = "labsynch_cmpd_dupe_cache";
-				if (!cru.isCacheIDRegistered(cacheIdentifier)){
-					cru.registerPermanentCache(cacheIdentifier);	
+				if (!cru.isCacheIDRegistered(cacheIdentifier)) {
+					cru.registerPermanentCache(cacheIdentifier);
 				}
-				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);		
+				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);
 			} else if (structureType == StructureType.DRY_RUN) {
 				String cacheIdentifier = "labsynch_dr_cmpd_cache";
-				if (!cru.isCacheIDRegistered(cacheIdentifier)){
-					cru.registerPermanentCache(cacheIdentifier);	
+				if (!cru.isCacheIDRegistered(cacheIdentifier)) {
+					cru.registerPermanentCache(cacheIdentifier);
 				}
 				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);
 			} else if (structureType == StructureType.STANDARDIZATION_DRY_RUN) {
 				String cacheIdentifier = "labsynch_standardization_dry_run_cache";
-				if (!cru.isCacheIDRegistered(cacheIdentifier)){
-					cru.registerPermanentCache(cacheIdentifier);	
+				if (!cru.isCacheIDRegistered(cacheIdentifier)) {
+					cru.registerPermanentCache(cacheIdentifier);
 				}
 				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);
 			} else {
 				String cacheIdentifier = "labsynch_cmpd_cache";
-				if (!cru.isCacheIDRegistered(cacheIdentifier)){
-					cru.registerPermanentCache(cacheIdentifier);	
+				if (!cru.isCacheIDRegistered(cacheIdentifier)) {
+					cru.registerPermanentCache(cacheIdentifier);
 				}
-				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);				
+				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);
 			}
 
-
 			String cacheID = CacheRegistrationUtil.getCacheID();
-			if (logger.isDebugEnabled()) logger.debug("current cache ID: " + cacheID);
-			if (logger.isDebugEnabled()) logger.debug("cache status: " + cru.isCacheIDRegistered(cacheID));
+			if (logger.isDebugEnabled())
+				logger.debug("current cache ID: " + cacheID);
+			if (logger.isDebugEnabled())
+				logger.debug("cache status: " + cru.isCacheIDRegistered(cacheID));
 
 			mh = new MolHandler(molfile);
 			Molecule mol = mh.getMolecule();
 
-			if (propertiesUtilService.getUseExternalStandardizerConfig()){
+			if (propertiesUtilService.getUseExternalStandardizerConfig()) {
 				mol = standardizeMolecule(mol);
-				mol.aromatize();				
+				mol.aromatize();
 			} else {
-				mol.aromatize();				
+				mol.aromatize();
 			}
 
 			searcher = new JChemSearch();
@@ -436,55 +432,65 @@ public int[] searchMolStructures(String molfile, StructureType structureType, Se
 			searcher.setConnectionHandler(ch);
 			searcher.setStructureTable(structureTable);
 
-			if (logger.isDebugEnabled()) logger.debug("definition of exact search: " + propertiesUtilService.getExactMatchDef());
-			if (logger.isDebugEnabled()) logger.debug("selected search type: " + searchType);
+			if (logger.isDebugEnabled())
+				logger.debug("definition of exact search: " + propertiesUtilService.getExactMatchDef());
+			if (logger.isDebugEnabled())
+				logger.debug("selected search type: " + searchType);
 
 			JChemSearchOptions searchOptions = null;
-			if (searchType == SearchType.DUPLICATE){
-				if (logger.isDebugEnabled()) logger.debug("search type is DUPLICATE  ");
+			if (searchType == SearchType.DUPLICATE) {
+				if (logger.isDebugEnabled())
+					logger.debug("search type is DUPLICATE  ");
 				searchOptions = new JChemSearchOptions(SearchConstants.DUPLICATE);
 				searchOptions.setTautomerSearch(SearchConstants.TAUTOMER_SEARCH_OFF);
 
-			} else if (searchType == SearchType.DUPLICATE_TAUTOMER){
-				if (logger.isDebugEnabled()) logger.debug("Search type is DUPLICATE_TAUTOMER");		
+			} else if (searchType == SearchType.DUPLICATE_TAUTOMER) {
+				if (logger.isDebugEnabled())
+					logger.debug("Search type is DUPLICATE_TAUTOMER");
 				searchOptions = new JChemSearchOptions(SearchConstants.DUPLICATE);
 				searchOptions.setTautomerSearch(SearchConstants.TAUTOMER_SEARCH_ON);
 
-			} else if (searchType == SearchType.DUPLICATE_NO_TAUTOMER){
-				if (logger.isDebugEnabled()) logger.debug("Search type is DUPLICATE_NO_TAUTOMER");		
+			} else if (searchType == SearchType.DUPLICATE_NO_TAUTOMER) {
+				if (logger.isDebugEnabled())
+					logger.debug("Search type is DUPLICATE_NO_TAUTOMER");
 				searchOptions = new JChemSearchOptions(SearchConstants.DUPLICATE);
 				searchOptions.setTautomerSearch(SearchConstants.TAUTOMER_SEARCH_OFF);
 
-			}else if (searchType == SearchType.STEREO_IGNORE){
-				if (logger.isDebugEnabled()) logger.debug("Search type is no stereo");		
+			} else if (searchType == SearchType.STEREO_IGNORE) {
+				if (logger.isDebugEnabled())
+					logger.debug("Search type is no stereo");
 				searchOptions = new JChemSearchOptions(SearchConstants.STEREO_IGNORE);
 				searchOptions.setStereoSearchType(JChemSearchOptions.STEREO_IGNORE);
 
-			} else if (searchType == SearchType.FULL_TAUTOMER){
-				if (logger.isDebugEnabled()) logger.debug("Search type is exact FULL_TAUTOMER");		
+			} else if (searchType == SearchType.FULL_TAUTOMER) {
+				if (logger.isDebugEnabled())
+					logger.debug("Search type is exact FULL_TAUTOMER");
 				searchOptions = new JChemSearchOptions(SearchConstants.FULL);
 				searchOptions.setChargeMatching(JChemSearchOptions.CHARGE_MATCHING_IGNORE);
 				searchOptions.setIsotopeMatching(JChemSearchOptions.ISOTOPE_MATCHING_IGNORE);
 				searchOptions.setStereoSearchType(JChemSearchOptions.STEREO_IGNORE);
 				searchOptions.setTautomerSearch(SearchConstants.TAUTOMER_SEARCH_ON);
 
-			} else if (searchType == SearchType.SUBSTRUCTURE){
-				if (logger.isDebugEnabled()) logger.debug("Search type is substructure");	
+			} else if (searchType == SearchType.SUBSTRUCTURE) {
+				if (logger.isDebugEnabled())
+					logger.debug("Search type is substructure");
 				searchOptions = new JChemSearchOptions(SearchConstants.SUBSTRUCTURE);
 
-			} else if (searchType == SearchType.SIMILARITY){
+			} else if (searchType == SearchType.SIMILARITY) {
 				searchOptions = new JChemSearchOptions(SearchConstants.SIMILARITY);
 				searchOptions.setDissimilarityThreshold(simlarityPercent);
-				//				searchOptions.setMaxTime(maxTime);	
-			} else if (searchType == SearchType.FULL){
-				if (logger.isDebugEnabled()) logger.debug("Selected Search type is full with no tautomer search");		
+				// searchOptions.setMaxTime(maxTime);
+			} else if (searchType == SearchType.FULL) {
+				if (logger.isDebugEnabled())
+					logger.debug("Selected Search type is full with no tautomer search");
 				searchOptions = new JChemSearchOptions(SearchConstants.FULL);
 				searchOptions.setChargeMatching(JChemSearchOptions.CHARGE_MATCHING_IGNORE);
 				searchOptions.setIsotopeMatching(JChemSearchOptions.ISOTOPE_MATCHING_IGNORE);
 				searchOptions.setStereoSearchType(JChemSearchOptions.STEREO_IGNORE);
 				searchOptions.setTautomerSearch(SearchConstants.TAUTOMER_SEARCH_OFF);
 			} else {
-				if (logger.isDebugEnabled()) logger.debug("Default Search type is full with tautomer search");		
+				if (logger.isDebugEnabled())
+					logger.debug("Default Search type is full with tautomer search");
 				searchOptions = new JChemSearchOptions(SearchConstants.FULL);
 				searchOptions.setChargeMatching(JChemSearchOptions.CHARGE_MATCHING_IGNORE);
 				searchOptions.setIsotopeMatching(JChemSearchOptions.ISOTOPE_MATCHING_IGNORE);
@@ -492,11 +498,10 @@ public int[] searchMolStructures(String molfile, StructureType structureType, Se
 				searchOptions.setTautomerSearch(SearchConstants.TAUTOMER_SEARCH_ON);
 			}
 
-
-			if (searchType == SearchType.SUBSTRUCTURE){
-				searchOptions.setFilterQuery("select cd_id from "+ structureType.entityTable + " where id > 0");				
+			if (searchType == SearchType.SUBSTRUCTURE) {
+				searchOptions.setFilterQuery("select cd_id from " + structureType.entityTable + " where id > 0");
 			}
-			if(maxResultCount > -1) {
+			if (maxResultCount > -1) {
 				searchOptions.setMaxResultCount(maxResultCount);
 			}
 			searcher.setOrder(JChemSearch.ORDERING_BY_ID_OR_SIMILARITY);
@@ -521,81 +526,87 @@ public int[] searchMolStructures(String molfile, StructureType structureType, Se
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
-		} 
-
+		}
 
 		int[] hitList = searcher.getResults();
 
-		if (hitList.length > 0){
-			if (logger.isDebugEnabled()) logger.debug("found a matching molecule!!!  " + hitList.length);
+		if (hitList.length > 0) {
+			if (logger.isDebugEnabled())
+				logger.debug("found a matching molecule!!!  " + hitList.length);
 		}
 
 		return hitList;
 	}
 
-
 	@Override
-	public boolean checkForSalt(String molfile) throws CmpdRegMolFormatException{
+	public boolean checkForSalt(String molfile) throws CmpdRegMolFormatException {
 		try {
 			MolHandler mh = new MolHandler(molfile);
 			Molecule mol = mh.getMolecule();
 			int fragCount = mol.getFragCount(MoleculeGraph.FRAG_BASIC);
 			boolean foundNonCovalentSalt = false;
-			if (fragCount > 1){
+			if (fragCount > 1) {
 				foundNonCovalentSalt = true;
 			}
 
 			return foundNonCovalentSalt;
-		}catch (Exception e) {
+		} catch (Exception e) {
 			throw new CmpdRegMolFormatException(e);
 		}
 	}
 
 	@Override
-	public StrippedSaltDTO stripSalts(CmpdRegMolecule inputStructure){
+	public StrippedSaltDTO stripSalts(CmpdRegMolecule inputStructure) {
 		CmpdRegMoleculeJChemImpl molWrapper = (CmpdRegMoleculeJChemImpl) inputStructure;
 		Molecule mol = molWrapper.molecule;
 		Molecule clone = mol.clone();
 		Molecule[] rawFrags = clone.findFrags(Molecule.class, MoleculeGraph.FRAG_BASIC);
 		List<Molecule> allFrags = new ArrayList<Molecule>();
-		for (Molecule fragment : rawFrags){
+		for (Molecule fragment : rawFrags) {
 			allFrags.add(fragment);
 		}
 		Map<Salt, Integer> saltCounts = new HashMap<Salt, Integer>();
 		Set<Molecule> unidentifiedFragments = new HashSet<Molecule>();
-		for (Molecule fragment : allFrags){
-			int[] cdIdMatches = searchMolStructures(fragment.toFormat("mol"), StructureType.SALT, SearchType.DUPLICATE_TAUTOMER);
-			if (cdIdMatches.length>0){
+		for (Molecule fragment : allFrags) {
+			int[] cdIdMatches = searchMolStructures(fragment.toFormat("mol"), StructureType.SALT,
+					SearchType.DUPLICATE_TAUTOMER);
+			if (cdIdMatches.length > 0) {
 				Salt foundSalt = Salt.findSaltsByCdId(cdIdMatches[0]).getSingleResult();
-				if (saltCounts.containsKey(foundSalt)) saltCounts.put(foundSalt, saltCounts.get(foundSalt)+1);
-				else saltCounts.put(foundSalt, 1);
-			}else{
+				if (saltCounts.containsKey(foundSalt))
+					saltCounts.put(foundSalt, saltCounts.get(foundSalt) + 1);
+				else
+					saltCounts.put(foundSalt, 1);
+			} else {
 				unidentifiedFragments.add(fragment);
 			}
 		}
-		
+
 		Set<CmpdRegMolecule> unidentifiedFragmentMolecules = new HashSet<CmpdRegMolecule>();
 		for (Molecule fragment : unidentifiedFragments) {
 			CmpdRegMoleculeJChemImpl fragMol = new CmpdRegMoleculeJChemImpl(fragment);
 			unidentifiedFragmentMolecules.add(fragMol);
 		}
-		
+
 		StrippedSaltDTO resultDTO = new StrippedSaltDTO();
 		resultDTO.setSaltCounts(saltCounts);
 		resultDTO.setUnidentifiedFragments(unidentifiedFragmentMolecules);
-		if (logger.isDebugEnabled()) logger.debug("Identified stripped salts:");
-		for (Salt salt : saltCounts.keySet()){
-			if (logger.isDebugEnabled()) logger.debug("Salt Abbrev: "+salt.getAbbrev());
-			if (logger.isDebugEnabled()) logger.debug("Salt Count: "+ saltCounts.get(salt));
+		if (logger.isDebugEnabled())
+			logger.debug("Identified stripped salts:");
+		for (Salt salt : saltCounts.keySet()) {
+			if (logger.isDebugEnabled())
+				logger.debug("Salt Abbrev: " + salt.getAbbrev());
+			if (logger.isDebugEnabled())
+				logger.debug("Salt Count: " + saltCounts.get(salt));
 		}
 		return resultDTO;
 	}
 
 	@Override
 	@Transactional
-	public CmpdRegMolecule[] searchMols(String molfile, StructureType structureType, int[] inputCdIdHitList, SearchType searchType, Float simlarityPercent) {
+	public CmpdRegMolecule[] searchMols(String molfile, StructureType structureType, int[] inputCdIdHitList,
+			SearchType searchType, Float simlarityPercent) {
 
-		Connection conn = DataSourceUtils.getConnection(basicJdbcTemplate.getDataSource());	
+		Connection conn = DataSourceUtils.getConnection(basicJdbcTemplate.getDataSource());
 		ConnectionHandler ch = new ConnectionHandler();
 		ch.setConnection(conn);
 		try {
@@ -609,11 +620,14 @@ public CmpdRegMolecule[] searchMols(String molfile, StructureType structureType,
 		long maxTime = propertiesUtilService.getMaxSearchTime();
 		int maxResultCount = propertiesUtilService.getMaxSearchResults();
 		String structureTable = getJchemStructureTableFromStructureType(structureType);
-		if (logger.isDebugEnabled()) logger.debug("Search table is  " + structureTable);		
-		if (logger.isDebugEnabled()) logger.debug("Search type is  " + searchType);	
-		if (logger.isDebugEnabled()) logger.debug("search mol is: " + molfile);
-
-		if (searchType == SearchType.EXACT){
+		if (logger.isDebugEnabled())
+			logger.debug("Search table is  " + structureTable);
+		if (logger.isDebugEnabled())
+			logger.debug("Search type is  " + searchType);
+		if (logger.isDebugEnabled())
+			logger.debug("search mol is: " + molfile);
+
+		if (searchType == SearchType.EXACT) {
 			searchType = propertiesUtilService.getExactMatchDef();
 		}
 
@@ -623,35 +637,37 @@ public CmpdRegMolecule[] searchMols(String molfile, StructureType structureType,
 
 		try {
 			cru = new CacheRegistrationUtil(ch);
-			if (structureType == StructureType.SALT_FORM){
+			if (structureType == StructureType.SALT_FORM) {
 				String cacheIdentifier = "labsynch_saltform_cache";
-				if (!cru.isCacheIDRegistered(cacheIdentifier)){
-					cru.registerPermanentCache(cacheIdentifier);	
+				if (!cru.isCacheIDRegistered(cacheIdentifier)) {
+					cru.registerPermanentCache(cacheIdentifier);
 				}
-				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);	
+				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);
 			} else if (structureType == StructureType.SALT) {
 				String cacheIdentifier = "labsynch_salt_cache";
-				if (!cru.isCacheIDRegistered(cacheIdentifier)){
-					cru.registerPermanentCache(cacheIdentifier);	
+				if (!cru.isCacheIDRegistered(cacheIdentifier)) {
+					cru.registerPermanentCache(cacheIdentifier);
 				}
-				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);		
+				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);
 			} else if (structureType == StructureType.STANDARDIZATION_DRY_RUN) {
 				String cacheIdentifier = "labsynch_standardization_dry_run_cache";
-				if (!cru.isCacheIDRegistered(cacheIdentifier)){
-					cru.registerPermanentCache(cacheIdentifier);	
+				if (!cru.isCacheIDRegistered(cacheIdentifier)) {
+					cru.registerPermanentCache(cacheIdentifier);
 				}
-				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);				
+				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);
 			} else {
 				String cacheIdentifier = "labsynch_cmpd_cache";
-				if (!cru.isCacheIDRegistered(cacheIdentifier)){
-					cru.registerPermanentCache(cacheIdentifier);	
+				if (!cru.isCacheIDRegistered(cacheIdentifier)) {
+					cru.registerPermanentCache(cacheIdentifier);
 				}
-				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);				
+				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);
 			}
 
 			String cacheID = CacheRegistrationUtil.getCacheID();
-			if (logger.isDebugEnabled()) logger.debug("current cache ID: " + cacheID);
-			if (logger.isDebugEnabled()) logger.debug("cache status: " + cru.isCacheIDRegistered(cacheID));
+			if (logger.isDebugEnabled())
+				logger.debug("current cache ID: " + cacheID);
+			if (logger.isDebugEnabled())
+				logger.debug("cache status: " + cru.isCacheIDRegistered(cacheID));
 
 			mh = new MolHandler(molfile);
 			Molecule mol = mh.getMolecule();
@@ -662,78 +678,82 @@ public CmpdRegMolecule[] searchMols(String molfile, StructureType structureType,
 			searcher.setStructureTable(structureTable);
 			JChemSearchOptions searchOptions = null;
 
-			if (logger.isDebugEnabled()) logger.debug("definition of exact search: " + propertiesUtilService.getExactMatchDef());
-			if (logger.isDebugEnabled()) logger.debug("selected search type: " + searchType);
-
+			if (logger.isDebugEnabled())
+				logger.debug("definition of exact search: " + propertiesUtilService.getExactMatchDef());
+			if (logger.isDebugEnabled())
+				logger.debug("selected search type: " + searchType);
 
 			HitColoringAndAlignmentOptions hitColorOptions = null;
-			if (searchType == SearchType.DUPLICATE){
+			if (searchType == SearchType.DUPLICATE) {
 				searchOptions = new JChemSearchOptions(SearchConstants.DUPLICATE);
 				searchOptions.setTautomerSearch(SearchConstants.TAUTOMER_SEARCH_OFF);
-				if (logger.isDebugEnabled()) logger.debug("selected DUPLICATE search for " + searchType);
+				if (logger.isDebugEnabled())
+					logger.debug("selected DUPLICATE search for " + searchType);
 
-			}else if (searchType == SearchType.DUPLICATE_TAUTOMER){
-				System.out.println("Search type is DUPLICATE_TAUTOMER");		
+			} else if (searchType == SearchType.DUPLICATE_TAUTOMER) {
+				System.out.println("Search type is DUPLICATE_TAUTOMER");
 				searchOptions = new JChemSearchOptions(SearchConstants.DUPLICATE);
 				searchOptions.setTautomerSearch(SearchConstants.TAUTOMER_SEARCH_ON);
 
-			}else if (searchType == SearchType.DUPLICATE_NO_TAUTOMER){
-				System.out.println("Search type is DUPLICATE_NO_TAUTOMER");		
+			} else if (searchType == SearchType.DUPLICATE_NO_TAUTOMER) {
+				System.out.println("Search type is DUPLICATE_NO_TAUTOMER");
 				searchOptions = new JChemSearchOptions(SearchConstants.DUPLICATE);
 				searchOptions.setTautomerSearch(SearchConstants.TAUTOMER_SEARCH_OFF);
 
-			}else if (searchType == SearchType.STEREO_IGNORE){
-				System.out.println("Search type is  no stereo");		
+			} else if (searchType == SearchType.STEREO_IGNORE) {
+				System.out.println("Search type is  no stereo");
 				searchOptions = new JChemSearchOptions(SearchConstants.STEREO_IGNORE);
 				searchOptions.setStereoSearchType(JChemSearchOptions.STEREO_IGNORE);
 
-			} else if (searchType == SearchType.FULL_TAUTOMER){
-				System.out.println("Search type is exact FULL_TAUTOMER");		
+			} else if (searchType == SearchType.FULL_TAUTOMER) {
+				System.out.println("Search type is exact FULL_TAUTOMER");
 				searchOptions = new JChemSearchOptions(SearchConstants.FULL);
 				searchOptions.setChargeMatching(JChemSearchOptions.CHARGE_MATCHING_IGNORE);
 				searchOptions.setIsotopeMatching(JChemSearchOptions.ISOTOPE_MATCHING_IGNORE);
 				searchOptions.setStereoSearchType(JChemSearchOptions.STEREO_IGNORE);
 				searchOptions.setTautomerSearch(SearchConstants.TAUTOMER_SEARCH_ON);
 
-			} else if (searchType == SearchType.SUBSTRUCTURE){
-				System.out.println("Search type is substructure");	
+			} else if (searchType == SearchType.SUBSTRUCTURE) {
+				System.out.println("Search type is substructure");
 				searchOptions = new JChemSearchOptions(SearchConstants.SUBSTRUCTURE);
-				// One can also specify coloring and alignment options 
+				// One can also specify coloring and alignment options
 				hitColorOptions = new HitColoringAndAlignmentOptions();
 				boolean coloringEnabled = true;
 				Color hitColor = Color.blue;
 				Color nonHitColor = Color.black;
 				hitColorOptions.coloring = true;
 				hitColorOptions.hitColor = hitColor;
-				hitColorOptions.nonHitColor = nonHitColor;						
-				//				hitColorOptions.setColoringEnabled(coloringEnabled);
-				//				hitColorOptions.setHitColor(hitColor);
-				//				hitColorOptions.setNonHitColor(nonHitColor);
+				hitColorOptions.nonHitColor = nonHitColor;
+				// hitColorOptions.setColoringEnabled(coloringEnabled);
+				// hitColorOptions.setHitColor(hitColor);
+				// hitColorOptions.setNonHitColor(nonHitColor);
 
-			} else if (searchType == SearchType.SIMILARITY){
+			} else if (searchType == SearchType.SIMILARITY) {
 				searchOptions = new JChemSearchOptions(SearchConstants.SIMILARITY);
 				searchOptions.setDissimilarityThreshold(simlarityPercent);
-				//				searchOptions.setMaxTime(maxTime);
-				hitColorOptions = new HitColoringAndAlignmentOptions();	
-				boolean coloringEnabled = true;		
+				// searchOptions.setMaxTime(maxTime);
+				hitColorOptions = new HitColoringAndAlignmentOptions();
+				boolean coloringEnabled = true;
 				Color hitColor = Color.blue;
 				Color nonHitColor = Color.black;
-				//				hitColorOptions.coloring = true;
-				//				hitColorOptions.hitColor = hitColor;
-				//				hitColorOptions.nonHitColor = nonHitColor;					
+				// hitColorOptions.coloring = true;
+				// hitColorOptions.hitColor = hitColor;
+				// hitColorOptions.nonHitColor = nonHitColor;
 				hitColorOptions.setColoringEnabled(coloringEnabled);
 				hitColorOptions.setHitColor(hitColor);
 				hitColorOptions.setNonHitColor(nonHitColor);
 
-			} else if (searchType == SearchType.FULL){
-				if (logger.isDebugEnabled()) logger.debug("Default Search type is full with no tautomer search");		
+			} else if (searchType == SearchType.FULL) {
+				if (logger.isDebugEnabled())
+					logger.debug("Default Search type is full with no tautomer search");
 				searchOptions = new JChemSearchOptions(SearchConstants.FULL);
 				searchOptions.setChargeMatching(JChemSearchOptions.CHARGE_MATCHING_IGNORE);
 				searchOptions.setIsotopeMatching(JChemSearchOptions.ISOTOPE_MATCHING_IGNORE);
 				searchOptions.setStereoSearchType(JChemSearchOptions.STEREO_IGNORE);
 				searchOptions.setTautomerSearch(SearchConstants.TAUTOMER_SEARCH_OFF);
 			} else {
-				if (logger.isDebugEnabled()) logger.debug("Default Search type is exact");		
+				if (logger.isDebugEnabled())
+					logger.debug("Default Search type is exact");
 				searchOptions = new JChemSearchOptions(SearchConstants.FULL);
 				searchOptions.setChargeMatching(JChemSearchOptions.CHARGE_MATCHING_IGNORE);
 				searchOptions.setIsotopeMatching(JChemSearchOptions.ISOTOPE_MATCHING_IGNORE);
@@ -741,16 +761,18 @@ public CmpdRegMolecule[] searchMols(String molfile, StructureType structureType,
 				searchOptions.setTautomerSearch(SearchConstants.TAUTOMER_SEARCH_OFF);
 			}
 
-			if (inputCdIdHitList != null && inputCdIdHitList.length > 0){
-				searcher.setFilterIDList(inputCdIdHitList);		
-			} 
-			else if (inputCdIdHitList == null && searchType == SearchType.SUBSTRUCTURE){
-				searchOptions.setFilterQuery("select cd_id from "+ structureType.entityTable + " where id > 0");				
+			if (inputCdIdHitList != null && inputCdIdHitList.length > 0) {
+				searcher.setFilterIDList(inputCdIdHitList);
+			} else if (inputCdIdHitList == null && searchType == SearchType.SUBSTRUCTURE) {
+				searchOptions.setFilterQuery("select cd_id from " + structureType.entityTable + " where id > 0");
 			}
 
-			if (logger.isDebugEnabled()) logger.debug("max result count is: " + maxResultCount );
-			if (logger.isDebugEnabled()) logger.debug("JChemSearch.ORDERING_BY_ID_OR_SIMILARITY: " + JChemSearch.ORDERING_BY_ID_OR_SIMILARITY );
-			if (logger.isDebugEnabled()) logger.debug("JChemSearch.RUN_MODE_SYNCH_COMPLETE: " + JChemSearch.RUN_MODE_SYNCH_COMPLETE );
+			if (logger.isDebugEnabled())
+				logger.debug("max result count is: " + maxResultCount);
+			if (logger.isDebugEnabled())
+				logger.debug("JChemSearch.ORDERING_BY_ID_OR_SIMILARITY: " + JChemSearch.ORDERING_BY_ID_OR_SIMILARITY);
+			if (logger.isDebugEnabled())
+				logger.debug("JChemSearch.RUN_MODE_SYNCH_COMPLETE: " + JChemSearch.RUN_MODE_SYNCH_COMPLETE);
 
 			searchOptions.setMaxResultCount(maxResultCount);
 			searcher.setOrder(JChemSearch.ORDERING_BY_ID_OR_SIMILARITY);
@@ -759,13 +781,13 @@ else if (inputCdIdHitList == null && searchType == SearchType.SUBSTRUCTURE){
 			searcher.run();
 
 			// Specifying database fields to retrieve
-			List<String> fieldNames = new ArrayList<String>(); 
-			fieldNames.add("cd_id"); 
-			fieldNames.add("cd_formula"); 
+			List<String> fieldNames = new ArrayList<String>();
+			fieldNames.add("cd_id");
+			fieldNames.add("cd_formula");
 			fieldNames.add("cd_molweight");
 
 			// ArrayList for returned database field values
-			//			List<Object[]> fieldValues = new ArrayList<Object[]>();
+			// List<Object[]> fieldValues = new ArrayList<Object[]>();
 			List<Object[]> fieldValues = new ArrayList<Object[]>();
 
 			// Retrieving result molecules // filedValues will be also filled!
@@ -776,19 +798,19 @@ else if (inputCdIdHitList == null && searchType == SearchType.SUBSTRUCTURE){
 
 			hitList = searcher.getHitsAsMolecules(hitList_cdId, hitColorOptions, fieldNames, fieldValues);
 
-			for (int i = 0; i < hitList_cdId.length; i++) { 
+			for (int i = 0; i < hitList_cdId.length; i++) {
 				System.out.println("ID: " + hitList_cdId[i]);
 				hitList[i].setProperty("cd_id", Integer.toString(hitList_cdId[i]));
-				Object[] values = (Object[]) fieldValues.get(i); 
+				Object[] values = (Object[]) fieldValues.get(i);
 				for (int j = 0; j < values.length; j++) {
 					System.out.println(fieldNames.get(j) + ": " + values[j]);
 				}
 				System.out.println();
 			}
 
-
-			if (hitList.length > 0){
-				if (logger.isDebugEnabled()) logger.debug("found a matching molecule!!!  " + hitList.length);
+			if (hitList.length > 0) {
+				if (logger.isDebugEnabled())
+					logger.debug("found a matching molecule!!!  " + hitList.length);
 			}
 
 			if (this.shouldCloseConnection) {
@@ -821,16 +843,16 @@ else if (inputCdIdHitList == null && searchType == SearchType.SUBSTRUCTURE){
 			resultList.add(new CmpdRegMoleculeJChemImpl(hit));
 		}
 		CmpdRegMolecule[] resultArray = new CmpdRegMolecule[resultList.size()];
-		
+
 		return resultList.toArray(resultArray);
 	}
 
 	@Override
 	@Transactional
-	public CmpdRegMolecule[] searchMols(String molfile, StructureType structureType, int[] inputCdIdHitList, 
+	public CmpdRegMolecule[] searchMols(String molfile, StructureType structureType, int[] inputCdIdHitList,
 			SearchType searchType, Float simlarityPercent, int maxResults) {
 
-		Connection conn = DataSourceUtils.getConnection(basicJdbcTemplate.getDataSource());	
+		Connection conn = DataSourceUtils.getConnection(basicJdbcTemplate.getDataSource());
 		ConnectionHandler ch = new ConnectionHandler();
 		ch.setConnection(conn);
 		try {
@@ -845,11 +867,14 @@ public CmpdRegMolecule[] searchMols(String molfile, StructureType structureType,
 		int maxResultCount = maxResults;
 
 		String structureTable = getJchemStructureTableFromStructureType(structureType);
-		if (logger.isDebugEnabled()) logger.debug("Search table is  " + structureTable);		
-		if (logger.isDebugEnabled()) logger.debug("Search type is  " + searchType);	
-		if (logger.isDebugEnabled()) logger.debug("search mol is: " + molfile);
-
-		if (searchType == SearchType.EXACT){
+		if (logger.isDebugEnabled())
+			logger.debug("Search table is  " + structureTable);
+		if (logger.isDebugEnabled())
+			logger.debug("Search type is  " + searchType);
+		if (logger.isDebugEnabled())
+			logger.debug("search mol is: " + molfile);
+
+		if (searchType == SearchType.EXACT) {
 			searchType = propertiesUtilService.getExactMatchDef();
 		}
 
@@ -859,35 +884,37 @@ public CmpdRegMolecule[] searchMols(String molfile, StructureType structureType,
 
 		try {
 			cru = new CacheRegistrationUtil(ch);
-			if (structureType == StructureType.SALT_FORM){
+			if (structureType == StructureType.SALT_FORM) {
 				String cacheIdentifier = "labsynch_saltform_cache";
-				if (!cru.isCacheIDRegistered(cacheIdentifier)){
-					cru.registerPermanentCache(cacheIdentifier);	
+				if (!cru.isCacheIDRegistered(cacheIdentifier)) {
+					cru.registerPermanentCache(cacheIdentifier);
 				}
-				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);	
+				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);
 			} else if (structureType == StructureType.SALT) {
 				String cacheIdentifier = "labsynch_salt_cache";
-				if (!cru.isCacheIDRegistered(cacheIdentifier)){
-					cru.registerPermanentCache(cacheIdentifier);	
-				}	
-				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);				
+				if (!cru.isCacheIDRegistered(cacheIdentifier)) {
+					cru.registerPermanentCache(cacheIdentifier);
+				}
+				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);
 			} else if (structureType == StructureType.STANDARDIZATION_DRY_RUN) {
 				String cacheIdentifier = "labsynch_standardization_dry_run_cache";
-				if (!cru.isCacheIDRegistered(cacheIdentifier)){
-					cru.registerPermanentCache(cacheIdentifier);	
+				if (!cru.isCacheIDRegistered(cacheIdentifier)) {
+					cru.registerPermanentCache(cacheIdentifier);
 				}
-				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);				
+				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);
 			} else {
 				String cacheIdentifier = "labsynch_cmpd_cache";
-				if (!cru.isCacheIDRegistered(cacheIdentifier)){
-					cru.registerPermanentCache(cacheIdentifier);	
+				if (!cru.isCacheIDRegistered(cacheIdentifier)) {
+					cru.registerPermanentCache(cacheIdentifier);
 				}
-				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);				
+				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);
 			}
 
 			String cacheID = CacheRegistrationUtil.getCacheID();
-			if (logger.isDebugEnabled()) logger.debug("current cache ID: " + cacheID);
-			if (logger.isDebugEnabled()) logger.debug("cache status: " + cru.isCacheIDRegistered(cacheID));
+			if (logger.isDebugEnabled())
+				logger.debug("current cache ID: " + cacheID);
+			if (logger.isDebugEnabled())
+				logger.debug("cache status: " + cru.isCacheIDRegistered(cacheID));
 
 			mh = new MolHandler(molfile);
 			Molecule mol = mh.getMolecule();
@@ -898,78 +925,82 @@ public CmpdRegMolecule[] searchMols(String molfile, StructureType structureType,
 			searcher.setStructureTable(structureTable);
 			JChemSearchOptions searchOptions = null;
 
-			if (logger.isDebugEnabled()) logger.debug("definition of exact search: " + propertiesUtilService.getExactMatchDef());
-			if (logger.isDebugEnabled()) logger.debug("selected search type: " + searchType);
-
+			if (logger.isDebugEnabled())
+				logger.debug("definition of exact search: " + propertiesUtilService.getExactMatchDef());
+			if (logger.isDebugEnabled())
+				logger.debug("selected search type: " + searchType);
 
 			HitColoringAndAlignmentOptions hitColorOptions = null;
-			if (searchType == SearchType.DUPLICATE){
+			if (searchType == SearchType.DUPLICATE) {
 				searchOptions = new JChemSearchOptions(SearchConstants.DUPLICATE);
 				searchOptions.setTautomerSearch(SearchConstants.TAUTOMER_SEARCH_OFF);
-				if (logger.isDebugEnabled()) logger.debug("selected DUPLICATE search for " + searchType);
+				if (logger.isDebugEnabled())
+					logger.debug("selected DUPLICATE search for " + searchType);
 
-			}else if (searchType == SearchType.DUPLICATE_TAUTOMER){
-				System.out.println("Search type is DUPLICATE_TAUTOMER");		
+			} else if (searchType == SearchType.DUPLICATE_TAUTOMER) {
+				System.out.println("Search type is DUPLICATE_TAUTOMER");
 				searchOptions = new JChemSearchOptions(SearchConstants.DUPLICATE);
 				searchOptions.setTautomerSearch(SearchConstants.TAUTOMER_SEARCH_ON);
 
-			}else if (searchType == SearchType.DUPLICATE_NO_TAUTOMER){
-				System.out.println("Search type is DUPLICATE_NO_TAUTOMER");		
+			} else if (searchType == SearchType.DUPLICATE_NO_TAUTOMER) {
+				System.out.println("Search type is DUPLICATE_NO_TAUTOMER");
 				searchOptions = new JChemSearchOptions(SearchConstants.DUPLICATE);
 				searchOptions.setTautomerSearch(SearchConstants.TAUTOMER_SEARCH_OFF);
 
-			}else if (searchType == SearchType.STEREO_IGNORE){
-				System.out.println("Search type is  no stereo");		
+			} else if (searchType == SearchType.STEREO_IGNORE) {
+				System.out.println("Search type is  no stereo");
 				searchOptions = new JChemSearchOptions(SearchConstants.STEREO_IGNORE);
 				searchOptions.setStereoSearchType(JChemSearchOptions.STEREO_IGNORE);
 
-			} else if (searchType == SearchType.FULL_TAUTOMER){
-				System.out.println("Search type is exact FULL_TAUTOMER");		
+			} else if (searchType == SearchType.FULL_TAUTOMER) {
+				System.out.println("Search type is exact FULL_TAUTOMER");
 				searchOptions = new JChemSearchOptions(SearchConstants.FULL);
 				searchOptions.setChargeMatching(JChemSearchOptions.CHARGE_MATCHING_IGNORE);
 				searchOptions.setIsotopeMatching(JChemSearchOptions.ISOTOPE_MATCHING_IGNORE);
 				searchOptions.setStereoSearchType(JChemSearchOptions.STEREO_IGNORE);
 				searchOptions.setTautomerSearch(SearchConstants.TAUTOMER_SEARCH_ON);
 
-			} else if (searchType == SearchType.SUBSTRUCTURE){
-				System.out.println("Search type is substructure");	
+			} else if (searchType == SearchType.SUBSTRUCTURE) {
+				System.out.println("Search type is substructure");
 				searchOptions = new JChemSearchOptions(SearchConstants.SUBSTRUCTURE);
-				// One can also specify coloring and alignment options 
+				// One can also specify coloring and alignment options
 				hitColorOptions = new HitColoringAndAlignmentOptions();
 				boolean coloringEnabled = true;
 				Color hitColor = Color.blue;
 				Color nonHitColor = Color.black;
 				hitColorOptions.coloring = true;
 				hitColorOptions.hitColor = hitColor;
-				hitColorOptions.nonHitColor = nonHitColor;						
-				//				hitColorOptions.setColoringEnabled(coloringEnabled);
-				//				hitColorOptions.setHitColor(hitColor);
-				//				hitColorOptions.setNonHitColor(nonHitColor);
+				hitColorOptions.nonHitColor = nonHitColor;
+				// hitColorOptions.setColoringEnabled(coloringEnabled);
+				// hitColorOptions.setHitColor(hitColor);
+				// hitColorOptions.setNonHitColor(nonHitColor);
 
-			} else if (searchType == SearchType.SIMILARITY){
+			} else if (searchType == SearchType.SIMILARITY) {
 				searchOptions = new JChemSearchOptions(SearchConstants.SIMILARITY);
 				searchOptions.setDissimilarityThreshold(simlarityPercent);
-				//				searchOptions.setMaxTime(maxTime);
-				hitColorOptions = new HitColoringAndAlignmentOptions();	
-				boolean coloringEnabled = true;		
+				// searchOptions.setMaxTime(maxTime);
+				hitColorOptions = new HitColoringAndAlignmentOptions();
+				boolean coloringEnabled = true;
 				Color hitColor = Color.blue;
 				Color nonHitColor = Color.black;
-				//				hitColorOptions.coloring = true;
-				//				hitColorOptions.hitColor = hitColor;
-				//				hitColorOptions.nonHitColor = nonHitColor;					
+				// hitColorOptions.coloring = true;
+				// hitColorOptions.hitColor = hitColor;
+				// hitColorOptions.nonHitColor = nonHitColor;
 				hitColorOptions.setColoringEnabled(coloringEnabled);
 				hitColorOptions.setHitColor(hitColor);
 				hitColorOptions.setNonHitColor(nonHitColor);
 
-			} else if (searchType == SearchType.FULL){
-				if (logger.isDebugEnabled()) logger.debug("Default Search type is full with no tautomer search");		
+			} else if (searchType == SearchType.FULL) {
+				if (logger.isDebugEnabled())
+					logger.debug("Default Search type is full with no tautomer search");
 				searchOptions = new JChemSearchOptions(SearchConstants.FULL);
 				searchOptions.setChargeMatching(JChemSearchOptions.CHARGE_MATCHING_IGNORE);
 				searchOptions.setIsotopeMatching(JChemSearchOptions.ISOTOPE_MATCHING_IGNORE);
 				searchOptions.setStereoSearchType(JChemSearchOptions.STEREO_IGNORE);
 				searchOptions.setTautomerSearch(SearchConstants.TAUTOMER_SEARCH_OFF);
 			} else {
-				if (logger.isDebugEnabled()) logger.debug("Default Search type is exact");		
+				if (logger.isDebugEnabled())
+					logger.debug("Default Search type is exact");
 				searchOptions = new JChemSearchOptions(SearchConstants.FULL);
 				searchOptions.setChargeMatching(JChemSearchOptions.CHARGE_MATCHING_IGNORE);
 				searchOptions.setIsotopeMatching(JChemSearchOptions.ISOTOPE_MATCHING_IGNORE);
@@ -977,16 +1008,18 @@ public CmpdRegMolecule[] searchMols(String molfile, StructureType structureType,
 				searchOptions.setTautomerSearch(SearchConstants.TAUTOMER_SEARCH_OFF);
 			}
 
-			if (inputCdIdHitList != null && inputCdIdHitList.length > 0){
-				searcher.setFilterIDList(inputCdIdHitList);		
-			} 
-			else if (inputCdIdHitList == null && searchType == SearchType.SUBSTRUCTURE){
-				searchOptions.setFilterQuery("select cd_id from "+ structureType.entityTable + " where id > 0");				
+			if (inputCdIdHitList != null && inputCdIdHitList.length > 0) {
+				searcher.setFilterIDList(inputCdIdHitList);
+			} else if (inputCdIdHitList == null && searchType == SearchType.SUBSTRUCTURE) {
+				searchOptions.setFilterQuery("select cd_id from " + structureType.entityTable + " where id > 0");
 			}
 
-			if (logger.isDebugEnabled()) logger.debug("max result count is: " + maxResultCount );
-			if (logger.isDebugEnabled()) logger.debug("JChemSearch.ORDERING_BY_ID_OR_SIMILARITY: " + JChemSearch.ORDERING_BY_ID_OR_SIMILARITY );
-			if (logger.isDebugEnabled()) logger.debug("JChemSearch.RUN_MODE_SYNCH_COMPLETE: " + JChemSearch.RUN_MODE_SYNCH_COMPLETE );
+			if (logger.isDebugEnabled())
+				logger.debug("max result count is: " + maxResultCount);
+			if (logger.isDebugEnabled())
+				logger.debug("JChemSearch.ORDERING_BY_ID_OR_SIMILARITY: " + JChemSearch.ORDERING_BY_ID_OR_SIMILARITY);
+			if (logger.isDebugEnabled())
+				logger.debug("JChemSearch.RUN_MODE_SYNCH_COMPLETE: " + JChemSearch.RUN_MODE_SYNCH_COMPLETE);
 
 			searchOptions.setMaxResultCount(maxResultCount);
 			searcher.setOrder(JChemSearch.ORDERING_BY_ID_OR_SIMILARITY);
@@ -995,13 +1028,13 @@ else if (inputCdIdHitList == null && searchType == SearchType.SUBSTRUCTURE){
 			searcher.run();
 
 			// Specifying database fields to retrieve
-			List<String> fieldNames = new ArrayList<String>(); 
-			fieldNames.add("cd_id"); 
-			fieldNames.add("cd_formula"); 
+			List<String> fieldNames = new ArrayList<String>();
+			fieldNames.add("cd_id");
+			fieldNames.add("cd_formula");
 			fieldNames.add("cd_molweight");
 
 			// ArrayList for returned database field values
-			//			List<Object[]> fieldValues = new ArrayList<Object[]>();
+			// List<Object[]> fieldValues = new ArrayList<Object[]>();
 			List<Object[]> fieldValues = new ArrayList<Object[]>();
 
 			// Retrieving result molecules // filedValues will be also filled!
@@ -1012,19 +1045,19 @@ else if (inputCdIdHitList == null && searchType == SearchType.SUBSTRUCTURE){
 				hitList = searcher.getHitsAsMolecules(hitList_cdId, hitColorOptions, fieldNames, fieldValues);
 			}
 
-			for (int i = 0; i < hitList_cdId.length; i++) { 
+			for (int i = 0; i < hitList_cdId.length; i++) {
 				System.out.println("ID: " + hitList_cdId[i]);
 				hitList[i].setProperty("cd_id", Integer.toString(hitList_cdId[i]));
-				Object[] values = (Object[]) fieldValues.get(i); 
+				Object[] values = (Object[]) fieldValues.get(i);
 				for (int j = 0; j < values.length; j++) {
 					System.out.println(fieldNames.get(j) + ": " + values[j]);
 				}
 				System.out.println();
 			}
 
-
-			if (hitList != null && hitList.length > 0){
-				if (logger.isDebugEnabled()) logger.debug("found a matching molecule!!!  " + hitList.length);
+			if (hitList != null && hitList.length > 0) {
+				if (logger.isDebugEnabled())
+					logger.debug("found a matching molecule!!!  " + hitList.length);
 			}
 
 			if (this.shouldCloseConnection) {
@@ -1053,17 +1086,16 @@ else if (inputCdIdHitList == null && searchType == SearchType.SUBSTRUCTURE){
 		}
 
 		List<CmpdRegMolecule> resultList = new ArrayList<CmpdRegMolecule>();
-		if (hitList != null){
+		if (hitList != null) {
 			for (Molecule hit : hitList) {
 				resultList.add(new CmpdRegMoleculeJChemImpl(hit));
 			}
 		}
 		CmpdRegMolecule[] resultArray = new CmpdRegMolecule[resultList.size()];
-		
+
 		return resultList.toArray(resultArray);
 	}
 
-
 	@Override
 	public CmpdRegMoleculeJChemImpl toMolecule(String molStructure) {
 		MolHandler mh = null;
@@ -1072,22 +1104,24 @@ public CmpdRegMoleculeJChemImpl toMolecule(String molStructure) {
 		String lineEnd = System.getProperty("line.separator");
 		try {
 			mh = new MolHandler(molStructure);
-			mol = mh.getMolecule();		
+			mol = mh.getMolecule();
 		} catch (MolFormatException e1) {
-			if (logger.isDebugEnabled()) logger.debug("failed first attempt: bad mol structure: " + molStructure);
+			if (logger.isDebugEnabled())
+				logger.debug("failed first attempt: bad mol structure: " + molStructure);
 			// clean up the molString and try again
 			try {
 				molStructure = new StringBuilder().append(lineEnd).append(molStructure).append(lineEnd).toString();
 				mh = new MolHandler(molStructure);
 				mol = mh.getMolecule();
 			} catch (MolFormatException e2) {
-				if (logger.isDebugEnabled()) logger.debug("failed second attempt: bad mol structure: " + molStructure);
+				if (logger.isDebugEnabled())
+					logger.debug("failed second attempt: bad mol structure: " + molStructure);
 				badStructureFlag = true;
 				logger.error("bad mol structure: " + molStructure);
 			}
-		}	
+		}
 
-		if (!badStructureFlag){
+		if (!badStructureFlag) {
 			return new CmpdRegMoleculeJChemImpl(mol);
 		} else {
 			return null;
@@ -1096,34 +1130,40 @@ public CmpdRegMoleculeJChemImpl toMolecule(String molStructure) {
 
 	@Override
 	public String toMolfile(String molStructure) {
-		if (logger.isDebugEnabled()) logger.debug("here is the incoming molStructure: " +  molStructure);
+		if (logger.isDebugEnabled())
+			logger.debug("here is the incoming molStructure: " + molStructure);
 		MolHandler mh = null;
 		boolean badStructureFlag = false;
 		Molecule mol = null;
 		String lineEnd = System.getProperty("line.separator");
 		try {
-			//molStructure = new StringBuilder().append(lineEnd).append(molStructure).append(lineEnd).toString();
+			// molStructure = new
+			// StringBuilder().append(lineEnd).append(molStructure).append(lineEnd).toString();
 			mh = new MolHandler(molStructure);
 			mol = mh.getMolecule();
 			mol.dearomatize();
 		} catch (MolFormatException e1) {
-			if (logger.isDebugEnabled()) logger.debug("failed first attempt: bad mol structure: " + molStructure);
+			if (logger.isDebugEnabled())
+				logger.debug("failed first attempt: bad mol structure: " + molStructure);
 			// clean up the molString and try again
 			try {
 				molStructure = new StringBuilder().append(lineEnd).append(molStructure).append(lineEnd).toString();
 				mh = new MolHandler(molStructure);
 				mol = mh.getMolecule();
-				mol.dearomatize();				
+				mol.dearomatize();
 			} catch (MolFormatException e2) {
-				if (logger.isDebugEnabled()) logger.debug("failed second attempt: bad mol structure: " + molStructure);
+				if (logger.isDebugEnabled())
+					logger.debug("failed second attempt: bad mol structure: " + molStructure);
 				badStructureFlag = true;
 				logger.error("bad mol structure: " + molStructure);
 			}
 		}
-		if (logger.isDebugEnabled()) logger.debug("The badStructureFlag " + badStructureFlag);
-		if (logger.isDebugEnabled()) logger.debug("The molfile " + mol.toFormat("mol"));
+		if (logger.isDebugEnabled())
+			logger.debug("The badStructureFlag " + badStructureFlag);
+		if (logger.isDebugEnabled())
+			logger.debug("The molfile " + mol.toFormat("mol"));
 
-		if (!badStructureFlag){
+		if (!badStructureFlag) {
 			return mol.toFormat("mol");
 		} else {
 			return molStructure;
@@ -1131,26 +1171,27 @@ public String toMolfile(String molStructure) {
 	}
 
 	@Override
-	public String getCipStereo(String structure) throws IOException{	
+	public String getCipStereo(String structure) throws IOException {
 		MolHandler mh = new MolHandler(structure);
 		Molecule mol = mh.getMolecule();
 		Collection<CIPStereoDescriptorIface> output = CIPStereoCalculator.calculateCIPStereoDescriptors(mol);
 
-		if (logger.isDebugEnabled()){
-			for (CIPStereoDescriptorIface single : output){
-				if (logger.isDebugEnabled()) logger.debug(single.toString());
-			}			
+		if (logger.isDebugEnabled()) {
+			for (CIPStereoDescriptorIface single : output) {
+				if (logger.isDebugEnabled())
+					logger.debug(single.toString());
+			}
 		}
 
 		return output.toString();
 	}
 
 	@Override
-	public String hydrogenizeMol(String structure, String inputFormat, String method) throws IOException{	
+	public String hydrogenizeMol(String structure, String inputFormat, String method) throws IOException {
 		MolHandler mh = new MolHandler(structure);
 		Molecule mol = mh.getMolecule();
-		if (method.equalsIgnoreCase("HYDROGENIZE")){
-			Hydrogenize.convertImplicitHToExplicit(mol);				
+		if (method.equalsIgnoreCase("HYDROGENIZE")) {
+			Hydrogenize.convertImplicitHToExplicit(mol);
 		} else {
 			Hydrogenize.convertExplicitHToImplicit(mol);
 		}
@@ -1158,25 +1199,25 @@ public String hydrogenizeMol(String structure, String inputFormat, String method
 	}
 
 	@Override
-	public MolConvertOutputDTO cleanStructure(String structure, int dim, String opts) throws IOException {				
+	public MolConvertOutputDTO cleanStructure(String structure, int dim, String opts) throws IOException {
 		boolean badStructureFlag = false;
-		MolConvertOutputDTO output = new MolConvertOutputDTO();		
+		MolConvertOutputDTO output = new MolConvertOutputDTO();
 		Molecule mol = null;
 		try {
 			mol = MolImporter.importMol(structure);
 		} catch (MolFormatException e) {
 			badStructureFlag = true;
 		}
-		if (!badStructureFlag){
+		if (!badStructureFlag) {
 			Cleaner.clean(mol, dim, opts);
 			output.setStructure(MolExporter.exportToFormat(mol, "mrv"));
 			output.setFormat("mrv");
-		} 
+		}
 		return output;
 	}
 
 	@Override
-	public MolConvertOutputDTO toFormat(String structure, String inputFormat, String outputFormat) throws IOException {				
+	public MolConvertOutputDTO toFormat(String structure, String inputFormat, String outputFormat) throws IOException {
 		boolean badStructureFlag = false;
 		Molecule mol = null;
 		try {
@@ -1185,13 +1226,13 @@ public MolConvertOutputDTO toFormat(String structure, String inputFormat, String
 			badStructureFlag = true;
 		}
 
-		MolConvertOutputDTO output = new MolConvertOutputDTO();		
-		if (!badStructureFlag){
+		MolConvertOutputDTO output = new MolConvertOutputDTO();
+		if (!badStructureFlag) {
 			output.setStructure(MolExporter.exportToFormat(mol, outputFormat));
 			output.setFormat(outputFormat);
 			String contentUrl = "TO DO: Download Link";
 			output.setContentUrl(contentUrl);
-		} 
+		}
 
 		return output;
 	}
@@ -1203,12 +1244,12 @@ public String toInchi(String molStructure) {
 		Molecule mol = null;
 		try {
 			mh = new MolHandler(molStructure);
-			mol = mh.getMolecule();			
+			mol = mh.getMolecule();
 		} catch (MolFormatException e) {
 			badStructureFlag = true;
 		}
 
-		if (!badStructureFlag){
+		if (!badStructureFlag) {
 			return mol.toFormat("inchi");
 		} else {
 			return molStructure;
@@ -1222,12 +1263,12 @@ public String toSmiles(String molStructure) {
 		Molecule mol = null;
 		try {
 			mh = new MolHandler(molStructure);
-			mol = mh.getMolecule();			
+			mol = mh.getMolecule();
 		} catch (MolFormatException e) {
 			badStructureFlag = true;
 		}
 
-		if (!badStructureFlag){
+		if (!badStructureFlag) {
 			return mol.toFormat("smiles");
 		} else {
 			return molStructure;
@@ -1241,12 +1282,12 @@ public double getMolWeight(String molStructure) {
 		Molecule mol = null;
 		try {
 			mh = new MolHandler(molStructure);
-			mol = mh.getMolecule();			
+			mol = mh.getMolecule();
 		} catch (MolFormatException e) {
 			badStructureFlag = true;
 		}
 
-		if (!badStructureFlag){
+		if (!badStructureFlag) {
 			return mol.getMass();
 		} else {
 			return 0d;
@@ -1260,12 +1301,12 @@ public double getExactMass(String molStructure) {
 		Molecule mol = null;
 		try {
 			mh = new MolHandler(molStructure);
-			mol = mh.getMolecule();			
+			mol = mh.getMolecule();
 		} catch (MolFormatException e) {
 			badStructureFlag = true;
 		}
 
-		if (!badStructureFlag){
+		if (!badStructureFlag) {
 			return mol.getExactMass();
 		} else {
 			return 0d;
@@ -1273,18 +1314,18 @@ public double getExactMass(String molStructure) {
 	}
 
 	@Override
-	public  String getMolFormula(String molStructure) {
+	public String getMolFormula(String molStructure) {
 		MolHandler mh = null;
 		boolean badStructureFlag = false;
 		Molecule mol = null;
 		try {
 			mh = new MolHandler(molStructure);
-			mol = mh.getMolecule();			
+			mol = mh.getMolecule();
 		} catch (MolFormatException e) {
 			badStructureFlag = true;
 		}
 
-		if (!badStructureFlag){
+		if (!badStructureFlag) {
 			return mol.getFormula();
 		} else {
 			return null;
@@ -1293,7 +1334,7 @@ public  String getMolFormula(String molStructure) {
 
 	public boolean createJChemTable(String tableName, boolean tautomerDupe) {
 		boolean tableCreated = false;
-		Connection conn = DataSourceUtils.getConnection(basicJdbcTemplate.getDataSource());	
+		Connection conn = DataSourceUtils.getConnection(basicJdbcTemplate.getDataSource());
 		ConnectionHandler ch = new ConnectionHandler();
 		ch.setConnection(conn);
 		try {
@@ -1303,29 +1344,30 @@ public boolean createJChemTable(String tableName, boolean tautomerDupe) {
 			e1.printStackTrace();
 		}
 
-		StructureTableOptions options = new StructureTableOptions(tableName, StructureTableOptions.TABLE_TYPE_MOLECULES);
+		StructureTableOptions options = new StructureTableOptions(tableName,
+				StructureTableOptions.TABLE_TYPE_MOLECULES);
 		options.setTautomerDuplicateChecking(tautomerDupe);
 
 		try {
 			String[] tables = UpdateHandler.getStructureTables(ch);
-			List<String> tableList = Arrays.asList(tables); 
-			if (!tableList.contains(tableName)){
-				UpdateHandler.createStructureTable(ch, options );
-				logger.info("created the Jchem structure table " + tableName );
+			List<String> tableList = Arrays.asList(tables);
+			if (!tableList.contains(tableName)) {
+				UpdateHandler.createStructureTable(ch, options);
+				logger.info("created the Jchem structure table " + tableName);
 				tableCreated = true;
 			}
 		} catch (SQLException e) {
-			logger.error("SQL error. Unable to create the Jchem structure table " + tableName );
+			logger.error("SQL error. Unable to create the Jchem structure table " + tableName);
 			e.printStackTrace();
 		}
 
 		return tableCreated;
-	}	
+	}
 
 	@Transactional
 	public boolean dropJChemTable(String tableName) {
 		boolean tableDropped = false;
-		Connection conn = DataSourceUtils.getConnection(basicJdbcTemplate.getDataSource());	
+		Connection conn = DataSourceUtils.getConnection(basicJdbcTemplate.getDataSource());
 		ConnectionHandler ch = new ConnectionHandler();
 		ch.setConnection(conn);
 		logger.info("is the connection active: " + ch.isConnected());
@@ -1337,25 +1379,25 @@ public boolean dropJChemTable(String tableName) {
 		}
 		try {
 			String[] tables = UpdateHandler.getStructureTables(ch);
-			List<String> tableList = Arrays.asList(tables); 
-			for (String table : tableList){
+			List<String> tableList = Arrays.asList(tables);
+			for (String table : tableList) {
 				logger.info("tables: " + table);
 			}
 			String matchingTable = null;
 			for (String t : tables) {
-				if(t.toLowerCase().contains(tableName.toLowerCase())){
+				if (t.toLowerCase().contains(tableName.toLowerCase())) {
 					matchingTable = t;
 					break;
 				}
 			}
-			if (matchingTable != null){
-				UpdateHandler.dropStructureTable(ch, matchingTable);				
+			if (matchingTable != null) {
+				UpdateHandler.dropStructureTable(ch, matchingTable);
 			} else {
 				logger.info(tableName + " does not exist");
 			}
 			tables = UpdateHandler.getStructureTables(ch);
-			tableList = Arrays.asList(tables); 
-			if (tableList.contains(tableName)){
+			tableList = Arrays.asList(tables);
+			if (tableList.contains(tableName)) {
 				tableDropped = false;
 			} else {
 				tableDropped = true;
@@ -1369,18 +1411,18 @@ public boolean dropJChemTable(String tableName) {
 
 	public String getJchemStructureTableFromStructureType(StructureType structureType) {
 		String plainTable = null;
-		if (structureType == StructureType.PARENT){
+		if (structureType == StructureType.PARENT) {
 			plainTable = "PARENT_STRUCTURE";
-		} else if (structureType == StructureType.SALT_FORM){
+		} else if (structureType == StructureType.SALT_FORM) {
 			plainTable = "SALTFORM_STRUCTURE";
-		} else if (structureType == StructureType.SALT){
+		} else if (structureType == StructureType.SALT) {
 			plainTable = "SALT_STRUCTURE";
-		} else if (structureType == StructureType.DRY_RUN){
+		} else if (structureType == StructureType.DRY_RUN) {
 			plainTable = "DRY_RUN_COMPOUND_STRUCTURE";
-		} else if(structureType == StructureType.STANDARDIZATION_DRY_RUN) {
+		} else if (structureType == StructureType.STANDARDIZATION_DRY_RUN) {
 			plainTable = "STANDARDIZATION_DRY_RUN_STRUCTURE";
 		}
-		return(plainTable);
+		return (plainTable);
 	}
 
 	@Override
@@ -1396,13 +1438,13 @@ public boolean truncateStructureTable(StructureType structureType) {
 	@Override
 	public int[] checkDupeMol(String molStructure, StructureType structureType) {
 
-		return searchMolStructures(molStructure, structureType, SearchType.DUPLICATE_TAUTOMER); 
+		return searchMolStructures(molStructure, structureType, SearchType.DUPLICATE_TAUTOMER);
 	}
 
 	@Override
 	public boolean updateStructure(String molStructure, StructureType structureType, int cdId) {
 
-		Connection conn = DataSourceUtils.getConnection(basicJdbcTemplate.getDataSource());	
+		Connection conn = DataSourceUtils.getConnection(basicJdbcTemplate.getDataSource());
 		ConnectionHandler ch = new ConnectionHandler();
 		CacheRegistrationUtil cru = null;
 
@@ -1431,66 +1473,68 @@ public boolean updateStructure(String molStructure, StructureType structureType,
 				logger.info("adding more new lines");
 				molStructure = lineEnd + lineEnd + molStructure;
 				mh = new MolHandler(molStructure);
-			} catch (MolFormatException e2){
-				badStructureFlag = true;				
+			} catch (MolFormatException e2) {
+				badStructureFlag = true;
 			}
 
 		}
 
-		if (logger.isDebugEnabled()) logger.debug("attempt to update structure: " + molStructure);
-
+		if (logger.isDebugEnabled())
+			logger.debug("attempt to update structure: " + molStructure);
 
 		try {
 
 			cru = new CacheRegistrationUtil(ch);
-			if (structureType == StructureType.SALT_FORM){
+			if (structureType == StructureType.SALT_FORM) {
 				String cacheIdentifier = "labsynch_saltform_cache";
-				if (!cru.isCacheIDRegistered(cacheIdentifier)){
-					cru.registerPermanentCache(cacheIdentifier);	
+				if (!cru.isCacheIDRegistered(cacheIdentifier)) {
+					cru.registerPermanentCache(cacheIdentifier);
 				}
-				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);	
+				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);
 
 			} else if (structureType == StructureType.PARENT) {
 				String cacheIdentifier = "labsynch_cmpd_cache";
-				if (!cru.isCacheIDRegistered(cacheIdentifier)){
-					cru.registerPermanentCache(cacheIdentifier);	
+				if (!cru.isCacheIDRegistered(cacheIdentifier)) {
+					cru.registerPermanentCache(cacheIdentifier);
 				}
 				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);
 
 			} else if (structureType == StructureType.SALT) {
 				String cacheIdentifier = "labsynch_salt_cache";
-				if (!cru.isCacheIDRegistered(cacheIdentifier)){
-					cru.registerPermanentCache(cacheIdentifier);	
+				if (!cru.isCacheIDRegistered(cacheIdentifier)) {
+					cru.registerPermanentCache(cacheIdentifier);
 				}
-				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);				
+				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);
 			} else if (structureType == StructureType.STANDARDIZATION_DRY_RUN) {
 				String cacheIdentifier = "labsynch_standardization_dry_run_cache";
-				if (!cru.isCacheIDRegistered(cacheIdentifier)){
-					cru.registerPermanentCache(cacheIdentifier);	
+				if (!cru.isCacheIDRegistered(cacheIdentifier)) {
+					cru.registerPermanentCache(cacheIdentifier);
 				}
-				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);				
+				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);
 			}
 
-
 			String cacheID = CacheRegistrationUtil.getCacheID();
-			if (logger.isDebugEnabled()) logger.debug("current cache ID: " + cacheID);
-			if (logger.isDebugEnabled()) logger.debug("cache status: " + cru.isCacheIDRegistered(cacheID));
+			if (logger.isDebugEnabled())
+				logger.debug("current cache ID: " + cacheID);
+			if (logger.isDebugEnabled())
+				logger.debug("cache status: " + cru.isCacheIDRegistered(cacheID));
 
 			String structureTable = getJchemStructureTableFromStructureType(structureType);
 			uh2 = new UpdateHandler(ch,
 					UpdateHandler.UPDATE, structureTable, "");
 
-			if (!badStructureFlag){
+			if (!badStructureFlag) {
 				Molecule mol = mh.getMolecule();
 				mol.aromatize();
 				uh2.setStructure(MolExporter.exportToFormat(mol, "mol"));
 				uh2.setEmptyStructuresAllowed(true);
 				uh2.setID(cdId);
 				uh2.execute(true);
-				uh2.saveUpdateLogs(); 
+				uh2.saveUpdateLogs();
 				updatedStructure = true;
 			} else {
-				if (logger.isDebugEnabled()) logger.debug("offending molformat:  " + molStructure);
+				if (logger.isDebugEnabled())
+					logger.debug("offending molformat:  " + molStructure);
 				updatedStructure = false;
 			}
 
@@ -1500,7 +1544,6 @@ public boolean updateStructure(String molStructure, StructureType structureType,
 				conn.close();
 			}
 
-
 		} catch (SQLException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -1509,15 +1552,14 @@ public boolean updateStructure(String molStructure, StructureType structureType,
 			e.printStackTrace();
 		}
 
-
 		return updatedStructure;
-	}	
+	}
 
 	@Override
 	public boolean updateStructure(CmpdRegMolecule molecule, StructureType structureType, int cdId) {
 		CmpdRegMoleculeJChemImpl molWrapper = (CmpdRegMoleculeJChemImpl) molecule;
 		Molecule mol = molWrapper.molecule;
-		Connection conn = DataSourceUtils.getConnection(basicJdbcTemplate.getDataSource());	
+		Connection conn = DataSourceUtils.getConnection(basicJdbcTemplate.getDataSource());
 		ConnectionHandler ch = new ConnectionHandler();
 		CacheRegistrationUtil cru = null;
 		String structureTable = getJchemStructureTableFromStructureType(structureType);
@@ -1539,40 +1581,42 @@ public boolean updateStructure(CmpdRegMolecule molecule, StructureType structure
 		try {
 
 			cru = new CacheRegistrationUtil(ch);
-			if (structureType == StructureType.SALT_FORM){
+			if (structureType == StructureType.SALT_FORM) {
 				String cacheIdentifier = "labsynch_saltform_cache";
-				if (!cru.isCacheIDRegistered(cacheIdentifier)){
-					cru.registerPermanentCache(cacheIdentifier);	
+				if (!cru.isCacheIDRegistered(cacheIdentifier)) {
+					cru.registerPermanentCache(cacheIdentifier);
 				}
-				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);	
+				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);
 			} else if (structureType == StructureType.PARENT) {
 				String cacheIdentifier = "labsynch_cmpd_cache";
-				if (!cru.isCacheIDRegistered(cacheIdentifier)){
-					cru.registerPermanentCache(cacheIdentifier);	
+				if (!cru.isCacheIDRegistered(cacheIdentifier)) {
+					cru.registerPermanentCache(cacheIdentifier);
 				}
 				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);
 			} else if (structureType == StructureType.SALT) {
 				String cacheIdentifier = "labsynch_salt_cache";
-				if (!cru.isCacheIDRegistered(cacheIdentifier)){
-					cru.registerPermanentCache(cacheIdentifier);	
+				if (!cru.isCacheIDRegistered(cacheIdentifier)) {
+					cru.registerPermanentCache(cacheIdentifier);
 				}
-				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);				
+				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);
 			} else if (structureType == StructureType.STANDARDIZATION_DRY_RUN) {
 				String cacheIdentifier = "labsynch_standardization_dry_run_cache";
-				if (!cru.isCacheIDRegistered(cacheIdentifier)){
-					cru.registerPermanentCache(cacheIdentifier);	
+				if (!cru.isCacheIDRegistered(cacheIdentifier)) {
+					cru.registerPermanentCache(cacheIdentifier);
 				}
 				CacheRegistrationUtil.setPermanentCacheID(cacheIdentifier);
 			}
 
 			String cacheID = CacheRegistrationUtil.getCacheID();
-			if (logger.isDebugEnabled()) logger.debug("current cache ID: " + cacheID);
-			if (logger.isDebugEnabled()) logger.debug("cache status: " + cru.isCacheIDRegistered(cacheID));
+			if (logger.isDebugEnabled())
+				logger.debug("current cache ID: " + cacheID);
+			if (logger.isDebugEnabled())
+				logger.debug("cache status: " + cru.isCacheIDRegistered(cacheID));
 
 			uh2 = new UpdateHandler(ch,
 					UpdateHandler.UPDATE, structureTable, "");
 
-			if (!badStructureFlag){
+			if (!badStructureFlag) {
 				mol.aromatize();
 				uh2.setStructure(MolExporter.exportToFormat(mol, "mol"));
 				uh2.setEmptyStructuresAllowed(true);
@@ -1580,26 +1624,28 @@ public boolean updateStructure(CmpdRegMolecule molecule, StructureType structure
 
 				// This does not throw and error if the structure id does not exist
 				uh2.execute(true);
-				uh2.saveUpdateLogs(); 
+				uh2.saveUpdateLogs();
 
 				// Hashmap to fetch structure id
 				// Verify that the structure exists
 
 				HashMap<String, Integer> structureIdMap = new HashMap<String, Integer>();
 				structureIdMap.put("structureId", cdId);
-				try{
-					HashMap<String, CmpdRegMolecule> cmpdRegMolecule = getCmpdRegMolecules(structureIdMap, structureType);
+				try {
+					HashMap<String, CmpdRegMolecule> cmpdRegMolecule = getCmpdRegMolecules(structureIdMap,
+							structureType);
 					// Verify that the structure exists
-					if (cmpdRegMolecule.size() > 0){
+					if (cmpdRegMolecule.size() > 0) {
 						updatedStructure = true;
 					} else {
 						updatedStructure = false;
 					}
-				} catch (Exception e){
+				} catch (Exception e) {
 					logger.error("Error in retrieving structure id: " + e.getMessage());
 				}
 			} else {
-				if (logger.isDebugEnabled()) logger.debug("offending molformat:  " + MolExporter.exportToFormat(mol, "mol"));
+				if (logger.isDebugEnabled())
+					logger.debug("offending molformat:  " + MolExporter.exportToFormat(mol, "mol"));
 				updatedStructure = false;
 			}
 
@@ -1609,7 +1655,6 @@ public boolean updateStructure(CmpdRegMolecule molecule, StructureType structure
 				conn.close();
 			}
 
-
 		} catch (SQLException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -1618,13 +1663,12 @@ public boolean updateStructure(CmpdRegMolecule molecule, StructureType structure
 			e.printStackTrace();
 		}
 
-
 		return updatedStructure;
 	}
 
 	@Override
-	public boolean deleteStructure(StructureType structureType, int cdId){
-		Connection conn = DataSourceUtils.getConnection(basicJdbcTemplate.getDataSource());	
+	public boolean deleteStructure(StructureType structureType, int cdId) {
+		Connection conn = DataSourceUtils.getConnection(basicJdbcTemplate.getDataSource());
 		ConnectionHandler ch = new ConnectionHandler();
 		CacheRegistrationUtil cru = null;
 
@@ -1640,11 +1684,12 @@ public boolean deleteStructure(StructureType structureType, int cdId){
 			e1.printStackTrace();
 		}
 		String structureTable = getJchemStructureTableFromStructureType(structureType);
-		try{
+		try {
 			UpdateHandler.deleteRow(ch, structureTable, cdId);
 			deleteSuccessful = true;
-		}catch (Exception e){
-			logger.error("Caught exception trying to delete structure from "+structureTable+" with cdId "+cdId, e);
+		} catch (Exception e) {
+			logger.error("Caught exception trying to delete structure from " + structureTable + " with cdId " + cdId,
+					e);
 			deleteSuccessful = false;
 		}
 		return deleteSuccessful;
@@ -1657,12 +1702,12 @@ public boolean isEmpty(String molStructure) {
 		Molecule mol = null;
 		try {
 			mh = new MolHandler(molStructure);
-			mol = mh.getMolecule();			
+			mol = mh.getMolecule();
 		} catch (MolFormatException e) {
 			badStructureFlag = true;
 		}
 
-		if (!badStructureFlag){
+		if (!badStructureFlag) {
 			return mol.isEmpty();
 		} else {
 			return true;
@@ -1670,10 +1715,11 @@ public boolean isEmpty(String molStructure) {
 	}
 
 	@Override
-	public boolean standardizedMolCompare(String queryMol, String targetMol) throws CmpdRegMolFormatException{
-		try{
+	public boolean standardizedMolCompare(String queryMol, String targetMol) throws CmpdRegMolFormatException {
+		try {
 			// If both mols are empty then they are equal
-			if(isEmpty(queryMol) && isEmpty(targetMol)) return true;
+			if (isEmpty(queryMol) && isEmpty(targetMol))
+				return true;
 			CmpdRegMoleculeJChemImpl queryMolWrapper = new CmpdRegMoleculeJChemImpl(queryMol);
 			CmpdRegMoleculeJChemImpl targetMolWrapper = new CmpdRegMoleculeJChemImpl(queryMol);
 			StandardizedMolSearch molSearch = new StandardizedMolSearch();
@@ -1682,22 +1728,22 @@ public boolean standardizedMolCompare(String queryMol, String targetMol) throws
 			int[][] hits = null;
 			hits = molSearch.findAll();
 			return false;
-		}catch (MolFormatException e) {
+		} catch (MolFormatException e) {
 			throw new CmpdRegMolFormatException(e);
-		}catch (SearchException e2) {
-			//TODO: throw better error
+		} catch (SearchException e2) {
+			// TODO: throw better error
 			throw new CmpdRegMolFormatException(e2);
 		}
 	}
 
 	@Override
-	public StandardizerSettingsConfigDTO getStandardizerSettings() throws StandardizerException{
+	public StandardizerSettingsConfigDTO getStandardizerSettings() throws StandardizerException {
 		StandardizerSettingsConfigDTO standardizationConfigDTO = new StandardizerSettingsConfigDTO();
 		standardizationConfigDTO.setType("jchem");
 		standardizationConfigDTO.setShouldStandardize(false);
 
 		// Check if standardizer turned on
-		if(propertiesUtilService.getUseExternalStandardizerConfig()){
+		if (propertiesUtilService.getUseExternalStandardizerConfig()) {
 			standardizationConfigDTO.setShouldStandardize(true);
 			File standardizationSettingsFile = new File(propertiesUtilService.getStandardizerConfigFilePath());
 			String standardizerSettingsFileContents = "";
@@ -1705,7 +1751,8 @@ public StandardizerSettingsConfigDTO getStandardizerSettings() throws Standardiz
 				standardizerSettingsFileContents = FileUtils.readFileToString(standardizationSettingsFile);
 				standardizationConfigDTO.setSettings(standardizerSettingsFileContents);
 			} catch (IOException e) {
-				throw new StandardizerException("Got error trying to read jchem standardizer file at " + standardizationSettingsFile.getAbsolutePath(), e);
+				throw new StandardizerException("Got error trying to read jchem standardizer file at "
+						+ standardizationSettingsFile.getAbsolutePath(), e);
 			}
 		}
 		return standardizationConfigDTO;
@@ -1715,13 +1762,14 @@ public StandardizerSettingsConfigDTO getStandardizerSettings() throws Standardiz
 	public HashMap<String, CmpdRegMolecule> standardizeStructures(HashMap<String, String> structures)
 			throws CmpdRegMolFormatException, StandardizerException {
 		HashMap<String, CmpdRegMolecule> standardizedStructures = new HashMap<String, CmpdRegMolecule>();
-		for(String structureKey : structures.keySet()){
+		for (String structureKey : structures.keySet()) {
 			String structure = structures.get(structureKey);
-			try{
+			try {
 				String standardizedStructure = standardizeStructure(structure);
-				CmpdRegMoleculeJChemImpl standardizedCmpdRegMolecule = new CmpdRegMoleculeJChemImpl(standardizedStructure);
+				CmpdRegMoleculeJChemImpl standardizedCmpdRegMolecule = new CmpdRegMoleculeJChemImpl(
+						standardizedStructure);
 				standardizedStructures.put(structureKey, standardizedCmpdRegMolecule);
-			}catch (Exception e) {
+			} catch (Exception e) {
 				logger.error("Got error trying to standardize structure " + structure, e);
 				throw new CmpdRegMolFormatException(e);
 			}
@@ -1740,35 +1788,35 @@ public int saveStructure(CmpdRegMolecule cmpdregMolecule, StructureType structur
 	}
 
 	@Override
-	public HashMap<String, Integer> saveStructures(HashMap<String, CmpdRegMolecule> structures, StructureType structureType, Boolean checkForDupes) {
+	public HashMap<String, Integer> saveStructures(HashMap<String, CmpdRegMolecule> structures,
+			StructureType structureType, Boolean checkForDupes) {
 		// return hash
 		HashMap<String, Integer> result = new HashMap<String, Integer>();
-		for(String key : structures.keySet()){
+		for (String key : structures.keySet()) {
 			CmpdRegMolecule cmpdRegMolecule = structures.get(key);
 			result.put(key, saveStructure(cmpdRegMolecule, structureType, checkForDupes));
 		}
 		return result;
 	}
 
-
 	@Override
 	@Transactional
 	public HashMap<String, CmpdRegMolecule> getCmpdRegMolecules(HashMap<String, Integer> keyIdToStructureId,
-			StructureType structureType)  throws CmpdRegMolFormatException {
-		
+			StructureType structureType) throws CmpdRegMolFormatException {
+
 		// Get hashmap values as int array
 		int[] cdIds = new int[keyIdToStructureId.size()];
 		int c = 0;
-		for(Integer cdId : keyIdToStructureId.values()){
+		for (Integer cdId : keyIdToStructureId.values()) {
 			cdIds[c] = cdId;
 			c++;
 		}
 
-		Connection conn = DataSourceUtils.getConnection(basicJdbcTemplate.getDataSource());	
+		Connection conn = DataSourceUtils.getConnection(basicJdbcTemplate.getDataSource());
 		ConnectionHandler ch = new ConnectionHandler();
 		ch.setConnection(conn);
 		CacheRegistrationUtil cru = null;
-		
+
 		// Search for cdids and fetch cooresponding molecules
 		HashMap<String, CmpdRegMolecule> result = new HashMap<String, CmpdRegMolecule>();
 		JChemSearch searcher = new JChemSearch();
@@ -1776,22 +1824,22 @@ public HashMap<String, CmpdRegMolecule> getCmpdRegMolecules(HashMap<String, Inte
 		searcher.setStructureTable(structureTable);
 		searcher.setFilterIDList(cdIds);
 		searcher.setConnectionHandler(ch);
-		
+
 		try {
 
 			searcher.run();
 			int[] hitList = searcher.getResults();
 			HitColoringAndAlignmentOptions hitColorOptions = null;
-			List<String> fieldNames = new ArrayList<String>(); 
-			fieldNames.add("cd_id"); 
-			fieldNames.add("cd_formula"); 
+			List<String> fieldNames = new ArrayList<String>();
+			fieldNames.add("cd_id");
+			fieldNames.add("cd_formula");
 			fieldNames.add("cd_molweight");
 			List<Object[]> fieldValues = new ArrayList<Object[]>();
 			String[] keys = keyIdToStructureId.keySet().toArray(new String[0]);
 			Molecule[] molecules;
 
 			molecules = searcher.getHitsAsMolecules(hitList, hitColorOptions, fieldNames, fieldValues);
-			for (int i = 0; i < hitList.length; i++) { 
+			for (int i = 0; i < hitList.length; i++) {
 				molecules[i].setProperty("cd_id", Integer.toString(hitList[i]));
 				result.put(keys[i], new CmpdRegMoleculeJChemImpl(molecules[i]));
 			}
@@ -1812,16 +1860,17 @@ public HashMap<String, CmpdRegMolecule> getCmpdRegMolecules(HashMap<String, Inte
 	}
 
 	@Override
-	public int[] searchMolStructures(CmpdRegMolecule cmpdRegMolecule, StructureType structureType, SearchType searchType, Float simlarityPercent, int maxResults) throws CmpdRegMolFormatException {
-		return searchMolStructures(cmpdRegMolecule.getMolStructure(), structureType, searchType, simlarityPercent, maxResults);
+	public int[] searchMolStructures(CmpdRegMolecule cmpdRegMolecule, StructureType structureType,
+			SearchType searchType, Float simlarityPercent, int maxResults) throws CmpdRegMolFormatException {
+		return searchMolStructures(cmpdRegMolecule.getMolStructure(), structureType, searchType, simlarityPercent,
+				maxResults);
 	}
 
 	@Override
 	public void fillMissingStructures() throws CmpdRegMolFormatException {
-		// Not currently implemented for jchem as there is no use case currently to switch to jchem from another chemistry engine
-		
+		// Not currently implemented for jchem as there is no use case currently to
+		// switch to jchem from another chemistry engine
+
 	}
-	
 
 }
-
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/jchem/CmpdRegMoleculeFactoryJChemImpl.java b/src/main/java/com/labsynch/labseer/chemclasses/jchem/CmpdRegMoleculeFactoryJChemImpl.java
index 295d93950..3a08aa0d6 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/jchem/CmpdRegMoleculeFactoryJChemImpl.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/jchem/CmpdRegMoleculeFactoryJChemImpl.java
@@ -10,8 +10,8 @@
 import chemaxon.formats.MolFormatException;
 
 @Component
-public class CmpdRegMoleculeFactoryJChemImpl implements CmpdRegMoleculeFactory{
-	
+public class CmpdRegMoleculeFactoryJChemImpl implements CmpdRegMoleculeFactory {
+
 	@Override
 	public CmpdRegMolecule getCmpdRegMolecule(String molStructure) throws CmpdRegMolFormatException {
 		try {
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/jchem/CmpdRegMoleculeJChemImpl.java b/src/main/java/com/labsynch/labseer/chemclasses/jchem/CmpdRegMoleculeJChemImpl.java
index f99833de6..706bf5ca5 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/jchem/CmpdRegMoleculeJChemImpl.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/jchem/CmpdRegMoleculeJChemImpl.java
@@ -15,20 +15,19 @@
 import chemaxon.util.MolHandler;
 
 public class CmpdRegMoleculeJChemImpl implements CmpdRegMolecule {
-	
+
 	Logger logger = LoggerFactory.getLogger(CmpdRegMoleculeJChemImpl.class);
 
-	
 	Molecule molecule;
-	
-	public CmpdRegMoleculeJChemImpl(String molStructure) throws MolFormatException{
+
+	public CmpdRegMoleculeJChemImpl(String molStructure) throws MolFormatException {
 		MolHandler mh = null;
 		boolean badStructureFlag = false;
 		Molecule mol = null;
 		String lineEnd = System.getProperty("line.separator");
 		try {
 			mh = new MolHandler(molStructure);
-			mol = mh.getMolecule();		
+			mol = mh.getMolecule();
 		} catch (MolFormatException e1) {
 			logger.debug("failed first attempt: bad mol structure: " + molStructure);
 			// clean up the molString and try again
@@ -41,36 +40,36 @@ public CmpdRegMoleculeJChemImpl(String molStructure) throws MolFormatException{
 				badStructureFlag = true;
 				logger.error("bad mol structure: " + molStructure);
 			}
-		}	
+		}
 
-		if (!badStructureFlag){
+		if (!badStructureFlag) {
 			this.molecule = mol;
 		} else {
 			this.molecule = null;
 		}
 	}
-	
-	public CmpdRegMoleculeJChemImpl(Molecule mol){
+
+	public CmpdRegMoleculeJChemImpl(Molecule mol) {
 		this.molecule = mol;
 	}
-	
+
 	@Override
-	public String getProperty(String key){
+	public String getProperty(String key) {
 		return molecule.getProperty(key);
 	}
-	
+
 	@Override
-	public void setProperty(String key, String value){
+	public void setProperty(String key, String value) {
 		this.molecule.setProperty(key, value);
-	}; 
-	
+	};
+
 	@Override
-	public String[] getPropertyKeys(){
+	public String[] getPropertyKeys() {
 		return this.molecule.properties().getKeys();
 	};
 
 	@Override
-	public String getPropertyType(String key){
+	public String getPropertyType(String key) {
 		MProp prop = molecule.properties().get(key);
 		return prop.getPropType();
 	}
@@ -79,12 +78,12 @@ public String getPropertyType(String key){
 	public String getMolStructure() {
 		return this.molecule.toFormat("mol");
 	}
-	
+
 	@Override
 	public String getSmiles() {
 		return this.molecule.toFormat("smiles");
 	}
-	
+
 	@Override
 	public String getMrvStructure() {
 		return this.molecule.toFormat("mrv");
@@ -126,7 +125,8 @@ public CmpdRegMolecule replaceStructure(String newStructure) throws CmpdRegMolFo
 	}
 
 	@Override
-	public byte[] toBinary(CmpdRegMolecule molecule, String imageFormat, String hSize, String wSize) throws IOException {
+	public byte[] toBinary(CmpdRegMolecule molecule, String imageFormat, String hSize, String wSize)
+			throws IOException {
 		Molecule mol = ((CmpdRegMoleculeJChemImpl) molecule).molecule;
 		String format = imageFormat + ":" + "h" + hSize + ",w" + wSize + ",maxScale28";
 		return MolExporter.exportToBinFormat(mol, format);
@@ -134,7 +134,7 @@ public byte[] toBinary(CmpdRegMolecule molecule, String imageFormat, String hSiz
 
 	@Override
 	public void dearomatize() {
-		this.molecule.dearomatize();	
+		this.molecule.dearomatize();
 	}
 
 	@Override
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/jchem/CmpdRegSDFReaderFactoryJChemImpl.java b/src/main/java/com/labsynch/labseer/chemclasses/jchem/CmpdRegSDFReaderFactoryJChemImpl.java
index 424afa13f..ec1046774 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/jchem/CmpdRegSDFReaderFactoryJChemImpl.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/jchem/CmpdRegSDFReaderFactoryJChemImpl.java
@@ -11,10 +11,11 @@
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
 
 @Component
-public class CmpdRegSDFReaderFactoryJChemImpl implements CmpdRegSDFReaderFactory{
-	
+public class CmpdRegSDFReaderFactoryJChemImpl implements CmpdRegSDFReaderFactory {
+
 	@Override
-	public CmpdRegSDFReader getCmpdRegSDFReader(String fileName) throws FileNotFoundException, CmpdRegMolFormatException, IOException {
+	public CmpdRegSDFReader getCmpdRegSDFReader(String fileName)
+			throws FileNotFoundException, CmpdRegMolFormatException, IOException {
 		return new CmpdRegSDFReaderJChemImpl(fileName);
 	}
 
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/jchem/CmpdRegSDFReaderJChemImpl.java b/src/main/java/com/labsynch/labseer/chemclasses/jchem/CmpdRegSDFReaderJChemImpl.java
index 8473dd047..2260e3454 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/jchem/CmpdRegSDFReaderJChemImpl.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/jchem/CmpdRegSDFReaderJChemImpl.java
@@ -15,26 +15,28 @@
 public class CmpdRegSDFReaderJChemImpl implements CmpdRegSDFReader {
 
 	private MolImporter molImporter;
-	
-	public CmpdRegSDFReaderJChemImpl(String fileName) throws CmpdRegMolFormatException, FileNotFoundException, IOException{
+
+	public CmpdRegSDFReaderJChemImpl(String fileName)
+			throws CmpdRegMolFormatException, FileNotFoundException, IOException {
 		FileInputStream fis;
-		fis = new FileInputStream (fileName);
-		try{
+		fis = new FileInputStream(fileName);
+		try {
 			this.molImporter = new MolImporter(fis);
-		}catch (MolFormatException e) {
+		} catch (MolFormatException e) {
 			throw new CmpdRegMolFormatException(e);
 		}
 	};
-	
+
 	@Override
-	public void close() throws IOException{
+	public void close() throws IOException {
 		this.molImporter.close();
 	}
-	
+
 	@Override
 	public CmpdRegMolecule readNextMol() throws IOException, CmpdRegMolFormatException {
 		Molecule mol = this.molImporter.read();
-		if (mol == null) return null;
+		if (mol == null)
+			return null;
 		CmpdRegMoleculeJChemImpl molecule = new CmpdRegMoleculeJChemImpl(mol);
 		return molecule;
 	}
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/jchem/CmpdRegSDFWriterFactoryJChemImpl.java b/src/main/java/com/labsynch/labseer/chemclasses/jchem/CmpdRegSDFWriterFactoryJChemImpl.java
index 915d8ff02..ebe47c954 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/jchem/CmpdRegSDFWriterFactoryJChemImpl.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/jchem/CmpdRegSDFWriterFactoryJChemImpl.java
@@ -9,8 +9,8 @@
 import com.labsynch.labseer.chemclasses.jchem.CmpdRegSDFWriterJChemImpl;
 
 @Component
-public class CmpdRegSDFWriterFactoryJChemImpl implements CmpdRegSDFWriterFactory{
-	
+public class CmpdRegSDFWriterFactoryJChemImpl implements CmpdRegSDFWriterFactory {
+
 	@Override
 	public CmpdRegSDFWriter getCmpdRegSDFWriter(String fileName) throws IllegalArgumentException, IOException {
 		return new CmpdRegSDFWriterJChemImpl(fileName);
diff --git a/src/main/java/com/labsynch/labseer/chemclasses/jchem/CmpdRegSDFWriterJChemImpl.java b/src/main/java/com/labsynch/labseer/chemclasses/jchem/CmpdRegSDFWriterJChemImpl.java
index 262846185..5b10b4b62 100644
--- a/src/main/java/com/labsynch/labseer/chemclasses/jchem/CmpdRegSDFWriterJChemImpl.java
+++ b/src/main/java/com/labsynch/labseer/chemclasses/jchem/CmpdRegSDFWriterJChemImpl.java
@@ -16,39 +16,39 @@
 public class CmpdRegSDFWriterJChemImpl implements CmpdRegSDFWriter {
 
 	private MolExporter molExporter;
-	
+
 	private ByteArrayOutputStream outstream;
-	
-	public CmpdRegSDFWriterJChemImpl(String fileName) throws IllegalArgumentException, IOException{
-		FileOutputStream outStream = new FileOutputStream (fileName);
+
+	public CmpdRegSDFWriterJChemImpl(String fileName) throws IllegalArgumentException, IOException {
+		FileOutputStream outStream = new FileOutputStream(fileName);
 		this.molExporter = new MolExporter(outStream, "sdf");
 	};
-	
-	public CmpdRegSDFWriterJChemImpl(FileOutputStream outStream) throws IllegalArgumentException, IOException{
+
+	public CmpdRegSDFWriterJChemImpl(FileOutputStream outStream) throws IllegalArgumentException, IOException {
 		this.molExporter = new MolExporter(outStream, "sdf");
 	}
-	
+
 	public CmpdRegSDFWriterJChemImpl() throws IllegalArgumentException, IOException {
 		this.outstream = new ByteArrayOutputStream();
 		this.molExporter = new MolExporter(outstream, "sdf");
 	}
-	
+
 	@Override
-	public void close() throws IOException{
+	public void close() throws IOException {
 		this.molExporter.close();
 	}
-	
+
 	@Override
-	public boolean writeMol(CmpdRegMolecule molecule) throws CmpdRegMolFormatException, IOException{
+	public boolean writeMol(CmpdRegMolecule molecule) throws CmpdRegMolFormatException, IOException {
 		CmpdRegMoleculeJChemImpl molWrapper = (CmpdRegMoleculeJChemImpl) molecule;
 		Molecule mol = molWrapper.molecule;
-		try{
+		try {
 			return this.molExporter.write(mol);
-		}catch (MolExportException e) {
+		} catch (MolExportException e) {
 			throw new CmpdRegMolFormatException(e);
 		}
 	}
-	
+
 	@Override
 	public String getBufferString() {
 		return this.outstream.toString();
diff --git a/src/main/java/com/labsynch/labseer/db/migration/postgres/V1_0_4_2__copy_clob_values.java b/src/main/java/com/labsynch/labseer/db/migration/postgres/V1_0_4_2__copy_clob_values.java
index 9b11e20d8..2e8b750d0 100644
--- a/src/main/java/com/labsynch/labseer/db/migration/postgres/V1_0_4_2__copy_clob_values.java
+++ b/src/main/java/com/labsynch/labseer/db/migration/postgres/V1_0_4_2__copy_clob_values.java
@@ -18,7 +18,7 @@ public class V1_0_4_2__copy_clob_values implements SpringJdbcMigration {
 	public void migrate(JdbcTemplate jdbcTemplate) throws Exception {
 
 		migrateClobValue("analysis_group_value", jdbcTemplate);
-//		migrateClobValue("author_value", jdbcTemplate);
+		// migrateClobValue("author_value", jdbcTemplate);
 		migrateClobValue("container_value", jdbcTemplate);
 		migrateClobValue("experiment_value", jdbcTemplate);
 		migrateClobValue("itx_container_container_value", jdbcTemplate);
@@ -30,55 +30,55 @@ public void migrate(JdbcTemplate jdbcTemplate) throws Exception {
 		migrateClobValue("protocol_value", jdbcTemplate);
 		migrateClobValue("subject_value", jdbcTemplate);
 		migrateClobValue("treatment_group_value", jdbcTemplate);
-		
+
 		migratePageContent("thing_page", jdbcTemplate);
 		migratePageContent("thing_page_archive", jdbcTemplate);
 
 	}
-	
+
 	@SuppressWarnings("unchecked")
-	public void migrateClobValue(String table_name, JdbcTemplate jdbcTemplate){
-		String selectIds = "SELECT id FROM "+table_name+" WHERE id IS NOT null AND clob_value IS NOT NULL";
-		String selectClobValueById = "SELECT id, clob_value FROM "+table_name+" WHERE id = ?";
-		String updateClobValue = "UPDATE "+table_name+" SET clob_value_temp = ? WHERE id = ?";
-		
+	public void migrateClobValue(String table_name, JdbcTemplate jdbcTemplate) {
+		String selectIds = "SELECT id FROM " + table_name + " WHERE id IS NOT null AND clob_value IS NOT NULL";
+		String selectClobValueById = "SELECT id, clob_value FROM " + table_name + " WHERE id = ?";
+		String updateClobValue = "UPDATE " + table_name + " SET clob_value_temp = ? WHERE id = ?";
+
 		List<Long> ids = jdbcTemplate.queryForList(selectIds, Long.class);
-		
-		for (Long id : ids){
-			ClobValueObject clobValue = (ClobValueObject) jdbcTemplate.queryForObject(selectClobValueById, new Object[] { id }, new ClobValueRowMapper());
-			int rs2 = jdbcTemplate.update(updateClobValue, new Object[] {clobValue.getClobValue(), id});
+
+		for (Long id : ids) {
+			ClobValueObject clobValue = (ClobValueObject) jdbcTemplate.queryForObject(selectClobValueById,
+					new Object[] { id }, new ClobValueRowMapper());
+			int rs2 = jdbcTemplate.update(updateClobValue, new Object[] { clobValue.getClobValue(), id });
 		}
 	}
-	
-	private class ClobValueObject{
+
+	private class ClobValueObject {
 		private long id;
 		private String clobValue;
-		
-		public long getId(){
+
+		public long getId() {
 			return this.id;
 		}
-		
-		public String getClobValue(){
+
+		public String getClobValue() {
 			return this.clobValue;
 		}
-		
-		public void setId(long id){
+
+		public void setId(long id) {
 			this.id = id;
 		}
-		
-		public void setClobValue(String clobValue){
+
+		public void setClobValue(String clobValue) {
 			this.clobValue = clobValue;
 		}
 	}
-	
+
 	@SuppressWarnings("rawtypes")
-	public class ClobValueRowMapper implements RowMapper
-	{
+	public class ClobValueRowMapper implements RowMapper {
 		@Override
 		public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			ClobValueObject clobValue = new ClobValueObject();
 			clobValue.setId(rs.getLong("id"));
-			//Additional code to deal with the clob data
+			// Additional code to deal with the clob data
 			Clob molClob = rs.getClob("clob_value");
 			InputStream in = molClob.getAsciiStream();
 			StringWriter w = new StringWriter();
@@ -93,50 +93,50 @@ public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			return clobValue;
 		}
 	}
-	
+
 	@SuppressWarnings("unchecked")
-	public void migratePageContent(String table_name, JdbcTemplate jdbcTemplate){
-		String selectIds = "SELECT id FROM "+table_name+" WHERE id IS NOT null";
-		String selectPageContentById = "SELECT id, page_content FROM "+table_name+" WHERE id = ?";
-		String updatePageContent = "UPDATE "+table_name+" SET page_content_temp = ? WHERE id = ?";
-		
+	public void migratePageContent(String table_name, JdbcTemplate jdbcTemplate) {
+		String selectIds = "SELECT id FROM " + table_name + " WHERE id IS NOT null";
+		String selectPageContentById = "SELECT id, page_content FROM " + table_name + " WHERE id = ?";
+		String updatePageContent = "UPDATE " + table_name + " SET page_content_temp = ? WHERE id = ?";
+
 		List<Long> ids = jdbcTemplate.queryForList(selectIds, Long.class);
-		
-		for (Long id : ids){
-			PageContentObject pageContent = (PageContentObject) jdbcTemplate.queryForObject(selectPageContentById, new Object[] { id }, new PageContentRowMapper());
-			int rs2 = jdbcTemplate.update(updatePageContent, new Object[] {pageContent.getPageContent(), id});
+
+		for (Long id : ids) {
+			PageContentObject pageContent = (PageContentObject) jdbcTemplate.queryForObject(selectPageContentById,
+					new Object[] { id }, new PageContentRowMapper());
+			int rs2 = jdbcTemplate.update(updatePageContent, new Object[] { pageContent.getPageContent(), id });
 		}
 	}
-	
-	private class PageContentObject{
+
+	private class PageContentObject {
 		private long id;
 		private String pageContent;
-		
-		public long getId(){
+
+		public long getId() {
 			return this.id;
 		}
-		
-		public String getPageContent(){
+
+		public String getPageContent() {
 			return this.pageContent;
 		}
-		
-		public void setId(long id){
+
+		public void setId(long id) {
 			this.id = id;
 		}
-		
-		public void setPageContent(String pageContent){
+
+		public void setPageContent(String pageContent) {
 			this.pageContent = pageContent;
 		}
 	}
-	
+
 	@SuppressWarnings("rawtypes")
-	public class PageContentRowMapper implements RowMapper
-	{
+	public class PageContentRowMapper implements RowMapper {
 		@Override
 		public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			PageContentObject pageContent = new PageContentObject();
 			pageContent.setId(rs.getLong("id"));
-			//Additional code to deal with the clob data
+			// Additional code to deal with the clob data
 			Clob molClob = rs.getClob("page_content");
 			InputStream in = molClob.getAsciiStream();
 			StringWriter w = new StringWriter();
@@ -151,6 +151,5 @@ public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			return pageContent;
 		}
 	}
-	
-	
+
 }
diff --git a/src/main/java/com/labsynch/labseer/db/migration/postgres/V1_0_4_6__copy_blob_values.java b/src/main/java/com/labsynch/labseer/db/migration/postgres/V1_0_4_6__copy_blob_values.java
index 3e65a2632..def6a0b74 100644
--- a/src/main/java/com/labsynch/labseer/db/migration/postgres/V1_0_4_6__copy_blob_values.java
+++ b/src/main/java/com/labsynch/labseer/db/migration/postgres/V1_0_4_6__copy_blob_values.java
@@ -14,7 +14,7 @@ public class V1_0_4_6__copy_blob_values implements SpringJdbcMigration {
 	public void migrate(JdbcTemplate jdbcTemplate) throws Exception {
 
 		migrateBlobValue("analysis_group_value", jdbcTemplate);
-//		migrateBlobValue("author_value", jdbcTemplate);
+		// migrateBlobValue("author_value", jdbcTemplate);
 		migrateBlobValue("container_value", jdbcTemplate);
 		migrateBlobValue("experiment_value", jdbcTemplate);
 		migrateBlobValue("itx_container_container_value", jdbcTemplate);
@@ -28,56 +28,56 @@ public void migrate(JdbcTemplate jdbcTemplate) throws Exception {
 		migrateBlobValue("treatment_group_value", jdbcTemplate);
 
 	}
-	
+
 	@SuppressWarnings("unchecked")
-	public void migrateBlobValue(String table_name, JdbcTemplate jdbcTemplate){
-		String selectIds = "SELECT id FROM "+table_name+" WHERE id IS NOT null AND blob_value IS NOT NULL";
-		String selectBlobValueById = "SELECT id, blob_value FROM "+table_name+" WHERE id = ?";
-		String updateBlobValue = "UPDATE "+table_name+" SET blob_value_temp = ? WHERE id = ?";
-		
+	public void migrateBlobValue(String table_name, JdbcTemplate jdbcTemplate) {
+		String selectIds = "SELECT id FROM " + table_name + " WHERE id IS NOT null AND blob_value IS NOT NULL";
+		String selectBlobValueById = "SELECT id, blob_value FROM " + table_name + " WHERE id = ?";
+		String updateBlobValue = "UPDATE " + table_name + " SET blob_value_temp = ? WHERE id = ?";
+
 		List<Long> ids = jdbcTemplate.queryForList(selectIds, Long.class);
-		
-		for (Long id : ids){
-			BlobValueObject blobValue = (BlobValueObject) jdbcTemplate.queryForObject(selectBlobValueById, new Object[] { id }, new BlobValueRowMapper());
-			int rs2 = jdbcTemplate.update(updateBlobValue, new Object[] {blobValue.getBlobValue(), id});
+
+		for (Long id : ids) {
+			BlobValueObject blobValue = (BlobValueObject) jdbcTemplate.queryForObject(selectBlobValueById,
+					new Object[] { id }, new BlobValueRowMapper());
+			int rs2 = jdbcTemplate.update(updateBlobValue, new Object[] { blobValue.getBlobValue(), id });
 		}
 	}
-	
-	private class BlobValueObject{
+
+	private class BlobValueObject {
 		private long id;
 		private byte[] blobValue;
-		
-		public long getId(){
+
+		public long getId() {
 			return this.id;
 		}
-		
-		public byte[] getBlobValue(){
+
+		public byte[] getBlobValue() {
 			return this.blobValue;
 		}
-		
-		public void setId(long id){
+
+		public void setId(long id) {
 			this.id = id;
 		}
-		
-		public void setBlobValue(byte[] blobValue){
+
+		public void setBlobValue(byte[] blobValue) {
 			this.blobValue = blobValue;
 		}
 	}
-	
+
 	@SuppressWarnings("rawtypes")
-	public class BlobValueRowMapper implements RowMapper
-	{
+	public class BlobValueRowMapper implements RowMapper {
 		@Override
 		public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			BlobValueObject blobValue = new BlobValueObject();
 			blobValue.setId(rs.getLong("id"));
-			//Additional code to deal with the blob data
+			// Additional code to deal with the blob data
 			Blob blob = rs.getBlob("blob_value");
-			int blobLength = (int) blob.length();  
+			int blobLength = (int) blob.length();
 			byte[] blobAsBytes = blob.getBytes(1, blobLength);
 			blobValue.setBlobValue(blobAsBytes);
 			return blobValue;
 		}
-	}	
-	
+	}
+
 }
diff --git a/src/main/java/com/labsynch/labseer/db/migration/postgres/V1_0_6_2__copy_author_value_clob_values.java b/src/main/java/com/labsynch/labseer/db/migration/postgres/V1_0_6_2__copy_author_value_clob_values.java
index 0f77b36be..706ff0764 100644
--- a/src/main/java/com/labsynch/labseer/db/migration/postgres/V1_0_6_2__copy_author_value_clob_values.java
+++ b/src/main/java/com/labsynch/labseer/db/migration/postgres/V1_0_6_2__copy_author_value_clob_values.java
@@ -20,50 +20,50 @@ public void migrate(JdbcTemplate jdbcTemplate) throws Exception {
 		migrateClobValue("author_value", jdbcTemplate);
 
 	}
-	
+
 	@SuppressWarnings("unchecked")
-	public void migrateClobValue(String table_name, JdbcTemplate jdbcTemplate){
-		String selectIds = "SELECT id FROM "+table_name+" WHERE id IS NOT null AND clob_value IS NOT NULL";
-		String selectClobValueById = "SELECT id, clob_value FROM "+table_name+" WHERE id = ?";
-		String updateClobValue = "UPDATE "+table_name+" SET clob_value_temp = ? WHERE id = ?";
-		
+	public void migrateClobValue(String table_name, JdbcTemplate jdbcTemplate) {
+		String selectIds = "SELECT id FROM " + table_name + " WHERE id IS NOT null AND clob_value IS NOT NULL";
+		String selectClobValueById = "SELECT id, clob_value FROM " + table_name + " WHERE id = ?";
+		String updateClobValue = "UPDATE " + table_name + " SET clob_value_temp = ? WHERE id = ?";
+
 		List<Long> ids = jdbcTemplate.queryForList(selectIds, Long.class);
-		
-		for (Long id : ids){
-			ClobValueObject clobValue = (ClobValueObject) jdbcTemplate.queryForObject(selectClobValueById, new Object[] { id }, new ClobValueRowMapper());
-			int rs2 = jdbcTemplate.update(updateClobValue, new Object[] {clobValue.getClobValue(), id});
+
+		for (Long id : ids) {
+			ClobValueObject clobValue = (ClobValueObject) jdbcTemplate.queryForObject(selectClobValueById,
+					new Object[] { id }, new ClobValueRowMapper());
+			int rs2 = jdbcTemplate.update(updateClobValue, new Object[] { clobValue.getClobValue(), id });
 		}
 	}
-	
-	private class ClobValueObject{
+
+	private class ClobValueObject {
 		private long id;
 		private String clobValue;
-		
-		public long getId(){
+
+		public long getId() {
 			return this.id;
 		}
-		
-		public String getClobValue(){
+
+		public String getClobValue() {
 			return this.clobValue;
 		}
-		
-		public void setId(long id){
+
+		public void setId(long id) {
 			this.id = id;
 		}
-		
-		public void setClobValue(String clobValue){
+
+		public void setClobValue(String clobValue) {
 			this.clobValue = clobValue;
 		}
 	}
-	
+
 	@SuppressWarnings("rawtypes")
-	public class ClobValueRowMapper implements RowMapper
-	{
+	public class ClobValueRowMapper implements RowMapper {
 		@Override
 		public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			ClobValueObject clobValue = new ClobValueObject();
 			clobValue.setId(rs.getLong("id"));
-			//Additional code to deal with the clob data
+			// Additional code to deal with the clob data
 			Clob molClob = rs.getClob("clob_value");
 			InputStream in = molClob.getAsciiStream();
 			StringWriter w = new StringWriter();
@@ -78,50 +78,50 @@ public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			return clobValue;
 		}
 	}
-	
+
 	@SuppressWarnings("unchecked")
-	public void migratePageContent(String table_name, JdbcTemplate jdbcTemplate){
-		String selectIds = "SELECT id FROM "+table_name+" WHERE id IS NOT null";
-		String selectPageContentById = "SELECT id, page_content FROM "+table_name+" WHERE id = ?";
-		String updatePageContent = "UPDATE "+table_name+" SET page_content_temp = ? WHERE id = ?";
-		
+	public void migratePageContent(String table_name, JdbcTemplate jdbcTemplate) {
+		String selectIds = "SELECT id FROM " + table_name + " WHERE id IS NOT null";
+		String selectPageContentById = "SELECT id, page_content FROM " + table_name + " WHERE id = ?";
+		String updatePageContent = "UPDATE " + table_name + " SET page_content_temp = ? WHERE id = ?";
+
 		List<Long> ids = jdbcTemplate.queryForList(selectIds, Long.class);
-		
-		for (Long id : ids){
-			PageContentObject pageContent = (PageContentObject) jdbcTemplate.queryForObject(selectPageContentById, new Object[] { id }, new PageContentRowMapper());
-			int rs2 = jdbcTemplate.update(updatePageContent, new Object[] {pageContent.getPageContent(), id});
+
+		for (Long id : ids) {
+			PageContentObject pageContent = (PageContentObject) jdbcTemplate.queryForObject(selectPageContentById,
+					new Object[] { id }, new PageContentRowMapper());
+			int rs2 = jdbcTemplate.update(updatePageContent, new Object[] { pageContent.getPageContent(), id });
 		}
 	}
-	
-	private class PageContentObject{
+
+	private class PageContentObject {
 		private long id;
 		private String pageContent;
-		
-		public long getId(){
+
+		public long getId() {
 			return this.id;
 		}
-		
-		public String getPageContent(){
+
+		public String getPageContent() {
 			return this.pageContent;
 		}
-		
-		public void setId(long id){
+
+		public void setId(long id) {
 			this.id = id;
 		}
-		
-		public void setPageContent(String pageContent){
+
+		public void setPageContent(String pageContent) {
 			this.pageContent = pageContent;
 		}
 	}
-	
+
 	@SuppressWarnings("rawtypes")
-	public class PageContentRowMapper implements RowMapper
-	{
+	public class PageContentRowMapper implements RowMapper {
 		@Override
 		public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			PageContentObject pageContent = new PageContentObject();
 			pageContent.setId(rs.getLong("id"));
-			//Additional code to deal with the clob data
+			// Additional code to deal with the clob data
 			Clob molClob = rs.getClob("page_content");
 			InputStream in = molClob.getAsciiStream();
 			StringWriter w = new StringWriter();
@@ -136,6 +136,5 @@ public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			return pageContent;
 		}
 	}
-	
-	
+
 }
diff --git a/src/main/java/com/labsynch/labseer/db/migration/postgres/V1_0_6_6__copy_author_value_blob_values.java b/src/main/java/com/labsynch/labseer/db/migration/postgres/V1_0_6_6__copy_author_value_blob_values.java
index ba8c362f6..7bdd6825f 100644
--- a/src/main/java/com/labsynch/labseer/db/migration/postgres/V1_0_6_6__copy_author_value_blob_values.java
+++ b/src/main/java/com/labsynch/labseer/db/migration/postgres/V1_0_6_6__copy_author_value_blob_values.java
@@ -15,56 +15,56 @@ public void migrate(JdbcTemplate jdbcTemplate) throws Exception {
 
 		migrateBlobValue("author_value", jdbcTemplate);
 	}
-	
+
 	@SuppressWarnings("unchecked")
-	public void migrateBlobValue(String table_name, JdbcTemplate jdbcTemplate){
-		String selectIds = "SELECT id FROM "+table_name+" WHERE id IS NOT null AND blob_value IS NOT NULL";
-		String selectBlobValueById = "SELECT id, blob_value FROM "+table_name+" WHERE id = ?";
-		String updateBlobValue = "UPDATE "+table_name+" SET blob_value_temp = ? WHERE id = ?";
-		
+	public void migrateBlobValue(String table_name, JdbcTemplate jdbcTemplate) {
+		String selectIds = "SELECT id FROM " + table_name + " WHERE id IS NOT null AND blob_value IS NOT NULL";
+		String selectBlobValueById = "SELECT id, blob_value FROM " + table_name + " WHERE id = ?";
+		String updateBlobValue = "UPDATE " + table_name + " SET blob_value_temp = ? WHERE id = ?";
+
 		List<Long> ids = jdbcTemplate.queryForList(selectIds, Long.class);
-		
-		for (Long id : ids){
-			BlobValueObject blobValue = (BlobValueObject) jdbcTemplate.queryForObject(selectBlobValueById, new Object[] { id }, new BlobValueRowMapper());
-			int rs2 = jdbcTemplate.update(updateBlobValue, new Object[] {blobValue.getBlobValue(), id});
+
+		for (Long id : ids) {
+			BlobValueObject blobValue = (BlobValueObject) jdbcTemplate.queryForObject(selectBlobValueById,
+					new Object[] { id }, new BlobValueRowMapper());
+			int rs2 = jdbcTemplate.update(updateBlobValue, new Object[] { blobValue.getBlobValue(), id });
 		}
 	}
-	
-	private class BlobValueObject{
+
+	private class BlobValueObject {
 		private long id;
 		private byte[] blobValue;
-		
-		public long getId(){
+
+		public long getId() {
 			return this.id;
 		}
-		
-		public byte[] getBlobValue(){
+
+		public byte[] getBlobValue() {
 			return this.blobValue;
 		}
-		
-		public void setId(long id){
+
+		public void setId(long id) {
 			this.id = id;
 		}
-		
-		public void setBlobValue(byte[] blobValue){
+
+		public void setBlobValue(byte[] blobValue) {
 			this.blobValue = blobValue;
 		}
 	}
-	
+
 	@SuppressWarnings("rawtypes")
-	public class BlobValueRowMapper implements RowMapper
-	{
+	public class BlobValueRowMapper implements RowMapper {
 		@Override
 		public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			BlobValueObject blobValue = new BlobValueObject();
 			blobValue.setId(rs.getLong("id"));
-			//Additional code to deal with the blob data
+			// Additional code to deal with the blob data
 			Blob blob = rs.getBlob("blob_value");
-			int blobLength = (int) blob.length();  
+			int blobLength = (int) blob.length();
 			byte[] blobAsBytes = blob.getBytes(1, blobLength);
 			blobValue.setBlobValue(blobAsBytes);
 			return blobValue;
 		}
-	}	
-	
+	}
+
 }
diff --git a/src/main/java/com/labsynch/labseer/db/migration/postgres/V2_0_1_1__copy_mol_structures.java b/src/main/java/com/labsynch/labseer/db/migration/postgres/V2_0_1_1__copy_mol_structures.java
index b31aab5e2..c5c0dd40c 100644
--- a/src/main/java/com/labsynch/labseer/db/migration/postgres/V2_0_1_1__copy_mol_structures.java
+++ b/src/main/java/com/labsynch/labseer/db/migration/postgres/V2_0_1_1__copy_mol_structures.java
@@ -29,9 +29,9 @@ public void migrate(JdbcTemplate jdbcTemplate) throws Exception {
 		migrateSaltFormStructures(jdbcTemplate);
 
 	}
-	
+
 	@SuppressWarnings("unchecked")
-	public void migrateParentStructures(JdbcTemplate jdbcTemplate){
+	public void migrateParentStructures(JdbcTemplate jdbcTemplate) {
 		logger.info("attempting to pull out parent mol structure");
 
 		String selectParentIds = "SELECT id FROM parent WHERE id IS NOT null";
@@ -40,18 +40,19 @@ public void migrateParentStructures(JdbcTemplate jdbcTemplate){
 
 		List<Integer> ids = jdbcTemplate.queryForList(selectParentIds, Integer.class);
 
-		for (Integer id : ids){
-			ParentStructureObject parent = (ParentStructureObject)jdbcTemplate.queryForObject(selectParentByIdSQL, new Object[] { id }, new ParentRowMapper());
+		for (Integer id : ids) {
+			ParentStructureObject parent = (ParentStructureObject) jdbcTemplate.queryForObject(selectParentByIdSQL,
+					new Object[] { id }, new ParentRowMapper());
 			logger.info("here is the mol_structure in the migration: " + parent.getMolStructure());
-			
-			int rs2 = jdbcTemplate.update(updateParentStructure,  new Object[] { parent.getMolStructure(), id });
+
+			int rs2 = jdbcTemplate.update(updateParentStructure, new Object[] { parent.getMolStructure(), id });
 			logger.info("number mol_structure updated: " + rs2);
 
 		}
 	}
-	
+
 	@SuppressWarnings("unchecked")
-	public void migrateLotStructures(JdbcTemplate jdbcTemplate){
+	public void migrateLotStructures(JdbcTemplate jdbcTemplate) {
 		logger.info("attempting to pull out lot as_drawn_struct");
 
 		String selectLotIds = "SELECT id FROM lot";
@@ -60,18 +61,19 @@ public void migrateLotStructures(JdbcTemplate jdbcTemplate){
 
 		List<Integer> ids = jdbcTemplate.queryForList(selectLotIds, Integer.class);
 
-		for (Integer id : ids){
-			LotStructureObject lot = (LotStructureObject)jdbcTemplate.queryForObject(selectLotByIdSQL, new Object[] { id }, new LotRowMapper());
+		for (Integer id : ids) {
+			LotStructureObject lot = (LotStructureObject) jdbcTemplate.queryForObject(selectLotByIdSQL,
+					new Object[] { id }, new LotRowMapper());
 			logger.info("here is the as_drawn_struct in the migration: " + lot.getAsDrawnStruct());
-			
-			int rs2 = jdbcTemplate.update(updateLotStructure,  new Object[] { lot.getAsDrawnStruct(), id });
+
+			int rs2 = jdbcTemplate.update(updateLotStructure, new Object[] { lot.getAsDrawnStruct(), id });
 			logger.info("number as_drawn_struct updated: " + rs2);
 
 		}
 	}
 
 	@SuppressWarnings("unchecked")
-	public void migrateSaltStructures(JdbcTemplate jdbcTemplate){
+	public void migrateSaltStructures(JdbcTemplate jdbcTemplate) {
 		logger.info("attempting to pull out salt mol structure");
 
 		String selectSaltIds = "SELECT id FROM salt";
@@ -81,22 +83,24 @@ public void migrateSaltStructures(JdbcTemplate jdbcTemplate){
 
 		List<Integer> ids = jdbcTemplate.queryForList(selectSaltIds, Integer.class);
 
-		for (Integer id : ids){
-			SaltStructureObject salt = (SaltStructureObject)jdbcTemplate.queryForObject(selectSaltByIdSQL, new Object[] { id }, new SaltRowMapper());
+		for (Integer id : ids) {
+			SaltStructureObject salt = (SaltStructureObject) jdbcTemplate.queryForObject(selectSaltByIdSQL,
+					new Object[] { id }, new SaltRowMapper());
 			logger.info("here is the mol_structure in the migration: " + salt.getMolStructure());
-			
-			int rs2 = jdbcTemplate.update(updateSaltMolStructure,  new Object[] { salt.getMolStructure(), id });
+
+			int rs2 = jdbcTemplate.update(updateSaltMolStructure, new Object[] { salt.getMolStructure(), id });
 			logger.info("number mol_structure updated: " + rs2);
-			
+
 			logger.info("here is the original_structure in the migration: " + salt.getOriginalStructure());
-			int rs3 = jdbcTemplate.update(updateSaltOriginalStructure,  new Object[] { salt.getOriginalStructure(), id });
+			int rs3 = jdbcTemplate.update(updateSaltOriginalStructure,
+					new Object[] { salt.getOriginalStructure(), id });
 			logger.info("number original_structure updated: " + rs3);
 
 		}
 	}
-	
+
 	@SuppressWarnings("unchecked")
-	public void migrateSaltFormStructures(JdbcTemplate jdbcTemplate){
+	public void migrateSaltFormStructures(JdbcTemplate jdbcTemplate) {
 		logger.info("attempting to pull out saltForm mol structure");
 
 		String selectSaltFormIds = "SELECT id FROM salt_form";
@@ -105,117 +109,117 @@ public void migrateSaltFormStructures(JdbcTemplate jdbcTemplate){
 
 		List<Integer> ids = jdbcTemplate.queryForList(selectSaltFormIds, Integer.class);
 
-		for (Integer id : ids){
-			SaltFormStructureObject saltForm = (SaltFormStructureObject)jdbcTemplate.queryForObject(selectSaltFormByIdSQL, new Object[] { id }, new SaltFormRowMapper());
+		for (Integer id : ids) {
+			SaltFormStructureObject saltForm = (SaltFormStructureObject) jdbcTemplate
+					.queryForObject(selectSaltFormByIdSQL, new Object[] { id }, new SaltFormRowMapper());
 			logger.info("here is the mol_structure in the migration: " + saltForm.getMolStructure());
-			
-			int rs2 = jdbcTemplate.update(updateSaltFormStructure,  new Object[] { saltForm.getMolStructure(), id });
+
+			int rs2 = jdbcTemplate.update(updateSaltFormStructure, new Object[] { saltForm.getMolStructure(), id });
 			logger.info("number mol_structure updated: " + rs2);
 
 		}
 	}
 
-	private class ParentStructureObject{
+	private class ParentStructureObject {
 		private long id;
 		private String molStructure;
-		
-		public long getId(){
+
+		public long getId() {
 			return this.id;
 		}
-		
-		public String getMolStructure(){
+
+		public String getMolStructure() {
 			return this.molStructure;
 		}
-		
-		public void setId(long id){
+
+		public void setId(long id) {
 			this.id = id;
 		}
-		
-		public void setMolStructure(String molStructure){
+
+		public void setMolStructure(String molStructure) {
 			this.molStructure = molStructure;
 		}
 	}
-	
-	private class LotStructureObject{
+
+	private class LotStructureObject {
 		private long id;
 		private String asDrawnStruct;
-		
-		public long getId(){
+
+		public long getId() {
 			return this.id;
 		}
-		
-		public String getAsDrawnStruct(){
+
+		public String getAsDrawnStruct() {
 			return this.asDrawnStruct;
 		}
-		
-		public void setId(long id){
+
+		public void setId(long id) {
 			this.id = id;
 		}
-		
-		public void setAsDrawnStruct(String asDrawnStruct){
+
+		public void setAsDrawnStruct(String asDrawnStruct) {
 			this.asDrawnStruct = asDrawnStruct;
 		}
 	}
-	
-	private class SaltStructureObject{
+
+	private class SaltStructureObject {
 		private long id;
 		private String molStructure;
 		private String originalStructure;
-		
-		public long getId(){
+
+		public long getId() {
 			return this.id;
 		}
-		
-		public String getMolStructure(){
+
+		public String getMolStructure() {
 			return this.molStructure;
 		}
-		
-		public String getOriginalStructure(){
+
+		public String getOriginalStructure() {
 			return this.originalStructure;
 		}
-		
-		public void setId(long id){
+
+		public void setId(long id) {
 			this.id = id;
 		}
-		
-		public void setMolStructure(String molStructure){
+
+		public void setMolStructure(String molStructure) {
 			this.molStructure = molStructure;
 		}
-		
-		public void setOriginalStructure(String originalStructure){
+
+		public void setOriginalStructure(String originalStructure) {
 			this.originalStructure = originalStructure;
 		}
 	}
-	
-	private class SaltFormStructureObject{
+
+	private class SaltFormStructureObject {
 		private long id;
 		private String molStructure;
-		
-		public long getId(){
+
+		public long getId() {
 			return this.id;
 		}
-		
-		public String getMolStructure(){
+
+		public String getMolStructure() {
 			return this.molStructure;
 		}
-		
-		public void setId(long id){
+
+		public void setId(long id) {
 			this.id = id;
 		}
-		
-		public void setMolStructure(String molStructure){
+
+		public void setMolStructure(String molStructure) {
 			this.molStructure = molStructure;
 		}
 	}
-	
+
 	@SuppressWarnings("rawtypes")
-	public class ParentRowMapper implements RowMapper
-	{
+	public class ParentRowMapper implements RowMapper {
 		@Override
 		public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			ParentStructureObject parent = new ParentStructureObject();
 			parent.setId(rs.getLong("id"));
-			//Additional code to deal with the clob data
+			// Additional code to deal with the clob data
 			Clob molClob = rs.getClob("mol_structure");
 			InputStream in = molClob.getAsciiStream();
 			StringWriter w = new StringWriter();
@@ -230,15 +234,14 @@ public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			return parent;
 		}
 	}
-	
+
 	@SuppressWarnings("rawtypes")
-	public class LotRowMapper implements RowMapper
-	{
+	public class LotRowMapper implements RowMapper {
 		@Override
 		public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			LotStructureObject lot = new LotStructureObject();
 			Clob molClob = rs.getClob("as_drawn_struct");
-			if (molClob!= null){
+			if (molClob != null) {
 				InputStream in = molClob.getAsciiStream();
 				StringWriter w = new StringWriter();
 				try {
@@ -253,10 +256,9 @@ public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			return lot;
 		}
 	}
-	
+
 	@SuppressWarnings("rawtypes")
-	public class SaltRowMapper implements RowMapper
-	{
+	public class SaltRowMapper implements RowMapper {
 		@Override
 		public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			SaltStructureObject salt = new SaltStructureObject();
@@ -270,7 +272,7 @@ public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			}
 			String clobAsString = w.toString();
 			salt.setMolStructure(clobAsString);
-			
+
 			Clob molClob2 = rs.getClob("original_structure");
 			InputStream in2 = molClob2.getAsciiStream();
 			StringWriter w2 = new StringWriter();
@@ -281,15 +283,14 @@ public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			}
 			String clobAsString2 = w2.toString();
 			salt.setOriginalStructure(clobAsString2);
-			
+
 			salt.setId(rs.getLong("id"));
 			return salt;
 		}
 	}
-	
+
 	@SuppressWarnings("rawtypes")
-	public class SaltFormRowMapper implements RowMapper
-	{
+	public class SaltFormRowMapper implements RowMapper {
 		@Override
 		public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			SaltFormStructureObject saltForm = new SaltFormStructureObject();
@@ -308,4 +309,3 @@ public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 		}
 	}
 }
-
diff --git a/src/main/java/com/labsynch/labseer/db/migration/postgres/V2_0_1_4__set_defaults.java b/src/main/java/com/labsynch/labseer/db/migration/postgres/V2_0_1_4__set_defaults.java
index 49ad638ed..6a4740072 100644
--- a/src/main/java/com/labsynch/labseer/db/migration/postgres/V2_0_1_4__set_defaults.java
+++ b/src/main/java/com/labsynch/labseer/db/migration/postgres/V2_0_1_4__set_defaults.java
@@ -8,7 +8,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-
 import org.flywaydb.core.api.migration.spring.SpringJdbcMigration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -16,14 +15,13 @@
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
 public class V2_0_1_4__set_defaults implements SpringJdbcMigration {
 
 	Logger logger = LoggerFactory.getLogger(V2_0_1_4__set_defaults.class);
-	
+
 	@Override
 	public void migrate(JdbcTemplate jdbcTemplate) throws Exception {
 		savePhysicalStates(jdbcTemplate);
@@ -33,210 +31,216 @@ public void migrate(JdbcTemplate jdbcTemplate) throws Exception {
 		saveUnits(jdbcTemplate);
 		saveFileTypes(jdbcTemplate);
 		savePurityMeasuredBys(jdbcTemplate);
-				
+
 	}
-	
-	private void savePhysicalStates(JdbcTemplate jdbcTemplate){
+
+	private void savePhysicalStates(JdbcTemplate jdbcTemplate) {
 		String json = "["
-				+"{ \"code\": \"solid\", \"name\": \"solid\"},"
-				+"{ \"code\": \"liquid\", \"name\": \"liquid\"},"
-				+"{ \"code\": \"glass\", \"name\": \"glass\"},"
-				+"{ \"code\": \"oil\", \"name\": \"oil\"},"
-				+"{ \"code\": \"resin\", \"name\": \"resin\"},"
-				+"{ \"code\": \"solution\", \"name\": \"solution\"}"
-				+"]";
+				+ "{ \"code\": \"solid\", \"name\": \"solid\"},"
+				+ "{ \"code\": \"liquid\", \"name\": \"liquid\"},"
+				+ "{ \"code\": \"glass\", \"name\": \"glass\"},"
+				+ "{ \"code\": \"oil\", \"name\": \"oil\"},"
+				+ "{ \"code\": \"resin\", \"name\": \"resin\"},"
+				+ "{ \"code\": \"solution\", \"name\": \"solution\"}"
+				+ "]";
 		String objectTable = "physical_state";
 		Collection<CodeAndNameObject> objects = CodeAndNameObject.fromJsonArrayToCodeAndNameObjects(json);
-		for (CodeAndNameObject object : objects){
-			try{
+		for (CodeAndNameObject object : objects) {
+			try {
 				String select = "SELECT * FROM " + objectTable
-						+ " WHERE code = '"+object.getCode()+"' "
-						+ "AND  name = '"+object.getName()+"'";
-				CodeAndNameObject foundObject = (CodeAndNameObject) jdbcTemplate.queryForObject(select, new CodeAndNameRowMapper());
-			}catch(EmptyResultDataAccessException e){
+						+ " WHERE code = '" + object.getCode() + "' "
+						+ "AND  name = '" + object.getName() + "'";
+				CodeAndNameObject foundObject = (CodeAndNameObject) jdbcTemplate.queryForObject(select,
+						new CodeAndNameRowMapper());
+			} catch (EmptyResultDataAccessException e) {
 				String insert = "INSERT INTO " + objectTable
 						+ " (id, code, name, version) VALUES "
 						+ "((SELECT nextval('hibernate_sequence')), "
-						+ "'"+object.getCode()+"', "
-						+ "'"+object.getName()+"', "
+						+ "'" + object.getCode() + "', "
+						+ "'" + object.getName() + "', "
 						+ " 0)";
 				jdbcTemplate.update(insert);
 			}
 		}
-		
+
 	}
-	
-	private void saveStereoCategorys(JdbcTemplate jdbcTemplate){
+
+	private void saveStereoCategorys(JdbcTemplate jdbcTemplate) {
 		String json = "["
-				+"{\"code\": \"scalemic\", \"name\": \"Scalemic\"},"
-				+"{\"code\": \"racemic\", \"name\": \"Racemic\"},"
-				+"{\"code\": \"achiral\", \"name\": \"Achiral\"},"
-				+"{\"code\": \"see_comments\", \"name\": \"See Comments\"},"
-				+"{\"code\": \"unknown\", \"name\": \"Unknown\"}"
-				+"]";
+				+ "{\"code\": \"scalemic\", \"name\": \"Scalemic\"},"
+				+ "{\"code\": \"racemic\", \"name\": \"Racemic\"},"
+				+ "{\"code\": \"achiral\", \"name\": \"Achiral\"},"
+				+ "{\"code\": \"see_comments\", \"name\": \"See Comments\"},"
+				+ "{\"code\": \"unknown\", \"name\": \"Unknown\"}"
+				+ "]";
 		String objectTable = "stereo_category";
 		Collection<CodeAndNameObject> objects = CodeAndNameObject.fromJsonArrayToCodeAndNameObjects(json);
-		for (CodeAndNameObject object : objects){
-			try{
+		for (CodeAndNameObject object : objects) {
+			try {
 				String select = "SELECT * FROM " + objectTable
-						+ " WHERE code = '"+object.getCode()+"' "
-						+ "AND  name = '"+object.getName()+"'";
-				CodeAndNameObject foundObject =  (CodeAndNameObject) jdbcTemplate.queryForObject(select, new CodeAndNameRowMapper());
-			}catch(EmptyResultDataAccessException e){
+						+ " WHERE code = '" + object.getCode() + "' "
+						+ "AND  name = '" + object.getName() + "'";
+				CodeAndNameObject foundObject = (CodeAndNameObject) jdbcTemplate.queryForObject(select,
+						new CodeAndNameRowMapper());
+			} catch (EmptyResultDataAccessException e) {
 				String insert = "INSERT INTO " + objectTable
 						+ " (id, code, name, version) VALUES "
 						+ "((SELECT nextval('hibernate_sequence')), "
-						+ "'"+object.getCode()+"', "
-						+ "'"+object.getName()+"', "
+						+ "'" + object.getCode() + "', "
+						+ "'" + object.getName() + "', "
 						+ " 0)";
 				jdbcTemplate.update(insert);
 			}
 		}
 	}
-	
-	private void saveIsotopes(JdbcTemplate jdbcTemplate){
-		String json =  "["
-				+"{\"name\":\"Deuterium labeled\",\"abbrev\":\"2H\",\"massChange\":1},"
-				+"{\"name\":\"Tritium labeled\",\"abbrev\":\"3H\",\"massChange\":2},"
-				+"{\"name\":\"13C labeled\",\"abbrev\":\"13C\",\"massChange\":1},"
-				+"{\"name\":\"14C labeled\",\"abbrev\":\"14C\",\"massChange\":2}"
-				+"]";
+
+	private void saveIsotopes(JdbcTemplate jdbcTemplate) {
+		String json = "["
+				+ "{\"name\":\"Deuterium labeled\",\"abbrev\":\"2H\",\"massChange\":1},"
+				+ "{\"name\":\"Tritium labeled\",\"abbrev\":\"3H\",\"massChange\":2},"
+				+ "{\"name\":\"13C labeled\",\"abbrev\":\"13C\",\"massChange\":1},"
+				+ "{\"name\":\"14C labeled\",\"abbrev\":\"14C\",\"massChange\":2}"
+				+ "]";
 		String objectTable = "isotope";
 		Collection<IsotopeObject> objects = IsotopeObject.fromJsonArrayToIsotopeObjects(json);
-		for (IsotopeObject object : objects){
-			try{
+		for (IsotopeObject object : objects) {
+			try {
 				String select = "SELECT * FROM " + objectTable
-						+ " WHERE abbrev = '"+object.getAbbrev()+"' "
-						+ "AND  name = '"+object.getName()+"'";
+						+ " WHERE abbrev = '" + object.getAbbrev() + "' "
+						+ "AND  name = '" + object.getName() + "'";
 				IsotopeObject foundObject = (IsotopeObject) jdbcTemplate.queryForObject(select, new IsotopeRowMapper());
-			}catch(EmptyResultDataAccessException e){
+			} catch (EmptyResultDataAccessException e) {
 				String insert = "INSERT INTO " + objectTable
 						+ " (id, abbrev, ignore, mass_change, name, version) VALUES "
 						+ "((SELECT nextval('hibernate_sequence')), "
-						+ "'"+object.getAbbrev()+"', "
+						+ "'" + object.getAbbrev() + "', "
 						+ " FALSE, "
-						+ object.getMassChange()+", "
-						+ "'"+object.getName()+"', "
+						+ object.getMassChange() + ", "
+						+ "'" + object.getName() + "', "
 						+ " 0)";
 				jdbcTemplate.update(insert);
 			}
 		}
 	}
-	
-	private void saveOperators(JdbcTemplate jdbcTemplate){
+
+	private void saveOperators(JdbcTemplate jdbcTemplate) {
 		String json = "["
-				+"{\"code\": \"=\", \"name\": \"=\"},"
-				+"{\"code\": \"<\", \"name\": \"<\"},"
-				+"{\"code\": \">\", \"name\": \">\"}"
-				+"]";
+				+ "{\"code\": \"=\", \"name\": \"=\"},"
+				+ "{\"code\": \"<\", \"name\": \"<\"},"
+				+ "{\"code\": \">\", \"name\": \">\"}"
+				+ "]";
 		String objectTable = "operator";
 		Collection<CodeAndNameObject> objects = CodeAndNameObject.fromJsonArrayToCodeAndNameObjects(json);
-		for (CodeAndNameObject object : objects){
-			try{
+		for (CodeAndNameObject object : objects) {
+			try {
 				String select = "SELECT * FROM " + objectTable
-						+ " WHERE code = '"+object.getCode()+"' "
-						+ "AND  name = '"+object.getName()+"'";
-				CodeAndNameObject foundObject = (CodeAndNameObject) jdbcTemplate.queryForObject(select, new CodeAndNameRowMapper());
-			}catch(EmptyResultDataAccessException e){
+						+ " WHERE code = '" + object.getCode() + "' "
+						+ "AND  name = '" + object.getName() + "'";
+				CodeAndNameObject foundObject = (CodeAndNameObject) jdbcTemplate.queryForObject(select,
+						new CodeAndNameRowMapper());
+			} catch (EmptyResultDataAccessException e) {
 				String insert = "INSERT INTO " + objectTable
 						+ " (id, code, name, version) VALUES "
 						+ "((SELECT nextval('hibernate_sequence')), "
-						+ "'"+object.getCode()+"', "
-						+ "'"+object.getName()+"', "
+						+ "'" + object.getCode() + "', "
+						+ "'" + object.getName() + "', "
 						+ " 0)";
 				jdbcTemplate.update(insert);
 			}
 		}
 	}
-	
-	private void saveUnits(JdbcTemplate jdbcTemplate){
+
+	private void saveUnits(JdbcTemplate jdbcTemplate) {
 		String json = "["
-				+"{\"code\": \"mg\", \"name\": \"mg\"},"
-				+"{\"code\": \"g\", \"name\": \"g\"},"
-				+"{\"code\": \"kg\", \"name\": \"kg\"},"
-				+"{\"code\": \"mL\", \"name\": \"mL\"}"
-				+"]";
+				+ "{\"code\": \"mg\", \"name\": \"mg\"},"
+				+ "{\"code\": \"g\", \"name\": \"g\"},"
+				+ "{\"code\": \"kg\", \"name\": \"kg\"},"
+				+ "{\"code\": \"mL\", \"name\": \"mL\"}"
+				+ "]";
 		String objectTable = "unit";
 		Collection<CodeAndNameObject> objects = CodeAndNameObject.fromJsonArrayToCodeAndNameObjects(json);
-		for (CodeAndNameObject object : objects){
-			try{
+		for (CodeAndNameObject object : objects) {
+			try {
 				String select = "SELECT * FROM " + objectTable
-						+ " WHERE code = '"+object.getCode()+"' "
-						+ "AND  name = '"+object.getName()+"'";
-				CodeAndNameObject foundObject = (CodeAndNameObject) jdbcTemplate.queryForObject(select, new CodeAndNameRowMapper());
-			}catch(EmptyResultDataAccessException e){
+						+ " WHERE code = '" + object.getCode() + "' "
+						+ "AND  name = '" + object.getName() + "'";
+				CodeAndNameObject foundObject = (CodeAndNameObject) jdbcTemplate.queryForObject(select,
+						new CodeAndNameRowMapper());
+			} catch (EmptyResultDataAccessException e) {
 				String insert = "INSERT INTO " + objectTable
 						+ " (id, code, name, version) VALUES "
 						+ "((SELECT nextval('hibernate_sequence')), "
-						+ "'"+object.getCode()+"', "
-						+ "'"+object.getName()+"', "
+						+ "'" + object.getCode() + "', "
+						+ "'" + object.getName() + "', "
 						+ " 0)";
 				jdbcTemplate.update(insert);
 			}
 		}
 	}
-	
-	private void saveFileTypes(JdbcTemplate jdbcTemplate){
+
+	private void saveFileTypes(JdbcTemplate jdbcTemplate) {
 		String json = "["
-				+"{\"code\":\"HPLC\",\"name\":\"HPLC\",\"version\":0},"
-				+"{\"code\":\"LCMS\",\"name\":\"LCMS\",\"version\":0},"
-				+"{\"code\":\"NMR\",\"name\":\"NMR\",\"version\":0}"
-				+"]";
+				+ "{\"code\":\"HPLC\",\"name\":\"HPLC\",\"version\":0},"
+				+ "{\"code\":\"LCMS\",\"name\":\"LCMS\",\"version\":0},"
+				+ "{\"code\":\"NMR\",\"name\":\"NMR\",\"version\":0}"
+				+ "]";
 		String objectTable = "file_type";
 		Collection<CodeAndNameObject> objects = CodeAndNameObject.fromJsonArrayToCodeAndNameObjects(json);
-		for (CodeAndNameObject object : objects){
-			try{
+		for (CodeAndNameObject object : objects) {
+			try {
 				String select = "SELECT * FROM " + objectTable
-						+ " WHERE code = '"+object.getCode()+"' "
-						+ "AND  name = '"+object.getName()+"'";
-				CodeAndNameObject foundObject = (CodeAndNameObject) jdbcTemplate.queryForObject(select, new CodeAndNameRowMapper());
-			}catch(EmptyResultDataAccessException e){
+						+ " WHERE code = '" + object.getCode() + "' "
+						+ "AND  name = '" + object.getName() + "'";
+				CodeAndNameObject foundObject = (CodeAndNameObject) jdbcTemplate.queryForObject(select,
+						new CodeAndNameRowMapper());
+			} catch (EmptyResultDataAccessException e) {
 				String insert = "INSERT INTO " + objectTable
 						+ " (id, code, name, version) VALUES "
 						+ "((SELECT nextval('hibernate_sequence')), "
-						+ "'"+object.getCode()+"', "
-						+ "'"+object.getName()+"', "
+						+ "'" + object.getCode() + "', "
+						+ "'" + object.getName() + "', "
 						+ " 0)";
 				jdbcTemplate.update(insert);
 			}
 		}
-		
+
 	}
-	
-	private void savePurityMeasuredBys(JdbcTemplate jdbcTemplate){
+
+	private void savePurityMeasuredBys(JdbcTemplate jdbcTemplate) {
 		String json = "["
-				+"{\"code\":\"HPLC\",\"name\":\"HPLC\",\"version\":0},"
-				+"{\"code\":\"NMR\",\"name\":\"NMR\",\"version\":0},"
-				+"{\"code\":\"GC\",\"name\":\"GC\",\"version\":0},"
-				+"{\"code\":\"Not Done\",\"name\":\"Not Done\",\"version\":0}"
-				+"]";
+				+ "{\"code\":\"HPLC\",\"name\":\"HPLC\",\"version\":0},"
+				+ "{\"code\":\"NMR\",\"name\":\"NMR\",\"version\":0},"
+				+ "{\"code\":\"GC\",\"name\":\"GC\",\"version\":0},"
+				+ "{\"code\":\"Not Done\",\"name\":\"Not Done\",\"version\":0}"
+				+ "]";
 		String objectTable = "purity_measured_by";
 		Collection<CodeAndNameObject> objects = CodeAndNameObject.fromJsonArrayToCodeAndNameObjects(json);
-		for (CodeAndNameObject object : objects){
-			try{
+		for (CodeAndNameObject object : objects) {
+			try {
 				String select = "SELECT * FROM " + objectTable
-						+ " WHERE code = '"+object.getCode()+"' "
-						+ "AND  name = '"+object.getName()+"'";
-				CodeAndNameObject foundObject = (CodeAndNameObject) jdbcTemplate.queryForObject(select, new CodeAndNameRowMapper());
-			}catch(EmptyResultDataAccessException e){
+						+ " WHERE code = '" + object.getCode() + "' "
+						+ "AND  name = '" + object.getName() + "'";
+				CodeAndNameObject foundObject = (CodeAndNameObject) jdbcTemplate.queryForObject(select,
+						new CodeAndNameRowMapper());
+			} catch (EmptyResultDataAccessException e) {
 				String insert = "INSERT INTO " + objectTable
 						+ " (id, code, name, version) VALUES "
 						+ "((SELECT nextval('hibernate_sequence')), "
-						+ "'"+object.getCode()+"', "
-						+ "'"+object.getName()+"', "
+						+ "'" + object.getCode() + "', "
+						+ "'" + object.getName() + "', "
 						+ " 0)";
 				jdbcTemplate.update(insert);
 			}
 		}
 	}
-	
-	protected void processLine(String aLine, JdbcTemplate jdbcTemplate){
-		//use a second Scanner to parse the content of each line 
+
+	protected void processLine(String aLine, JdbcTemplate jdbcTemplate) {
+		// use a second Scanner to parse the content of each line
 		Scanner scanner = new Scanner(aLine);
 		scanner.useDelimiter(",");
-		if ( scanner.hasNext() ){
-			
-			//"id","corpname","used","skip"
+		if (scanner.hasNext()) {
+
+			// "id","corpname","used","skip"
 			String id = scanner.next();
 			String corpName = scanner.next().replaceAll("\"", "");
 			long corpNumber = convertToParentNumber(corpName);
@@ -244,98 +248,95 @@ protected void processLine(String aLine, JdbcTemplate jdbcTemplate){
 			String skipString = scanner.next();
 			boolean used;
 			boolean skip;
-			
-			if (usedString.equalsIgnoreCase("1")){
+
+			if (usedString.equalsIgnoreCase("1")) {
 				used = true;
 			} else {
 				used = false;
 			}
-			
-			if (skipString.equalsIgnoreCase("1")){
+
+			if (skipString.equalsIgnoreCase("1")) {
 				skip = true;
 			} else {
 				skip = false;
 			}
-			
-			
+
 			String objectTable = "pre_def_corp_name";
 			String insert = "INSERT INTO " + objectTable
 					+ " (id, corp_name, corp_number, used, skip, version) VALUES "
 					+ "((SELECT nextval('hibernate_sequence')), "
-					+ "'"+corpName+"', "
-					+ corpNumber+", "
-					+ used+", "
-					+ skip+", "
+					+ "'" + corpName + "', "
+					+ corpNumber + ", "
+					+ used + ", "
+					+ skip + ", "
 					+ " 0)";
 			jdbcTemplate.update(insert);
-		}
-		else {
+		} else {
 			logger.error("Empty or invalid line. Unable to process.");
 		}
 	}
-	
-	private static class CodeAndNameObject{
+
+	private static class CodeAndNameObject {
 		private long id;
 		private String code;
 		private String name;
 		private int version;
-		
-		public long getId(){
+
+		public long getId() {
 			return this.id;
 		}
-		
-		public void setId(long id){
+
+		public void setId(long id) {
 			this.id = id;
 		}
-		
-		public String getCode(){
+
+		public String getCode() {
 			return this.code;
 		}
-		
-		public void setCode(String code){
+
+		public void setCode(String code) {
 			this.code = code;
 		}
-		
-		public String getName(){
+
+		public String getName() {
 			return this.name;
 		}
-		
-		public void setName(String name){
+
+		public void setName(String name) {
 			this.name = name;
 		}
-		
-		public int getVersion(){
+
+		public int getVersion() {
 			return this.version;
 		}
-		
-		public void setVersion(int version){
+
+		public void setVersion(int version) {
 			this.version = version;
 		}
-		
+
 		CodeAndNameObject fromJsonToCodeAndNameObject(String json) {
-	        return new JSONDeserializer<CodeAndNameObject>()
-	        .use(null, CodeAndNameObject.class).deserialize(json);
-	    }
-	    
-	    String toJsonArray(Collection<CodeAndNameObject> collection) {
-	        return new JSONSerializer()
-	        .exclude("*.class").serialize(collection);
-	    }
-	    
-	    String toJsonArray(Collection<CodeAndNameObject> collection, String[] fields) {
-	        return new JSONSerializer()
-	        .include(fields).exclude("*.class").serialize(collection);
-	    }
-	    
-	    static Collection<CodeAndNameObject> fromJsonArrayToCodeAndNameObjects(String json) {
-	        return new JSONDeserializer<List<CodeAndNameObject>>()
-	        .use("values", CodeAndNameObject.class).deserialize(json);
-	    }
+			return new JSONDeserializer<CodeAndNameObject>()
+					.use(null, CodeAndNameObject.class).deserialize(json);
+		}
+
+		String toJsonArray(Collection<CodeAndNameObject> collection) {
+			return new JSONSerializer()
+					.exclude("*.class").serialize(collection);
+		}
+
+		String toJsonArray(Collection<CodeAndNameObject> collection, String[] fields) {
+			return new JSONSerializer()
+					.include(fields).exclude("*.class").serialize(collection);
+		}
+
+		static Collection<CodeAndNameObject> fromJsonArrayToCodeAndNameObjects(String json) {
+			return new JSONDeserializer<List<CodeAndNameObject>>()
+					.use("values", CodeAndNameObject.class).deserialize(json);
+		}
 	}
-	
+
 	@SuppressWarnings("rawtypes")
-	public class CodeAndNameRowMapper implements RowMapper
-	{
+	public class CodeAndNameRowMapper implements RowMapper {
 		@Override
 		public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			CodeAndNameObject object = new CodeAndNameObject();
@@ -346,78 +347,77 @@ public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			return object;
 		}
 	}
-	
-	private static class IsotopeObject{
+
+	private static class IsotopeObject {
 		private long id;
 		private String name;
 		private String abbrev;
 		private Double massChange;
 		private int version;
-		
-		public long getId(){
+
+		public long getId() {
 			return this.id;
 		}
-		
-		public void setId(long id){
+
+		public void setId(long id) {
 			this.id = id;
 		}
-		
-		public String getAbbrev(){
+
+		public String getAbbrev() {
 			return this.abbrev;
 		}
-		
-		public void setAbbrev(String abbrev){
+
+		public void setAbbrev(String abbrev) {
 			this.abbrev = abbrev;
 		}
-		
-		public String getName(){
+
+		public String getName() {
 			return this.name;
 		}
-		
-		public void setName(String name){
+
+		public void setName(String name) {
 			this.name = name;
 		}
-		
-		public Double getMassChange(){
+
+		public Double getMassChange() {
 			return this.massChange;
 		}
-		
-		public void setMassChange(Double massChange){
+
+		public void setMassChange(Double massChange) {
 			this.massChange = massChange;
 		}
-		
-		public int getVersion(){
+
+		public int getVersion() {
 			return this.version;
 		}
-		
-		public void setVersion(int version){
+
+		public void setVersion(int version) {
 			this.version = version;
 		}
-		
+
 		IsotopeObject fromJsonToIsotopeObject(String json) {
-	        return new JSONDeserializer<IsotopeObject>()
-	        .use(null, IsotopeObject.class).deserialize(json);
-	    }
-	    
-	    String toJsonArray(Collection<IsotopeObject> collection) {
-	        return new JSONSerializer()
-	        .exclude("*.class").serialize(collection);
-	    }
-	    
-	    String toJsonArray(Collection<IsotopeObject> collection, String[] fields) {
-	        return new JSONSerializer()
-	        .include(fields).exclude("*.class").serialize(collection);
-	    }
-	    
-	    static Collection<IsotopeObject> fromJsonArrayToIsotopeObjects(String json) {
-	        return new JSONDeserializer<List<IsotopeObject>>()
-	        .use("values", IsotopeObject.class).deserialize(json);
-	    }
+			return new JSONDeserializer<IsotopeObject>()
+					.use(null, IsotopeObject.class).deserialize(json);
+		}
+
+		String toJsonArray(Collection<IsotopeObject> collection) {
+			return new JSONSerializer()
+					.exclude("*.class").serialize(collection);
+		}
+
+		String toJsonArray(Collection<IsotopeObject> collection, String[] fields) {
+			return new JSONSerializer()
+					.include(fields).exclude("*.class").serialize(collection);
+		}
+
+		static Collection<IsotopeObject> fromJsonArrayToIsotopeObjects(String json) {
+			return new JSONDeserializer<List<IsotopeObject>>()
+					.use("values", IsotopeObject.class).deserialize(json);
+		}
 	}
-	
+
 	@SuppressWarnings("rawtypes")
-	public class IsotopeRowMapper implements RowMapper
-	{
+	public class IsotopeRowMapper implements RowMapper {
 		@Override
 		public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			IsotopeObject object = new IsotopeObject();
@@ -429,7 +429,7 @@ public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			return object;
 		}
 	}
-	
+
 	Long convertToParentNumber(String corpName) {
 		corpName = corpName.trim();
 		Pattern corpNamePattern = Pattern.compile("^" + ".*?" + "([0-9]{1,9})" + ".*?$", Pattern.CASE_INSENSITIVE);
@@ -439,20 +439,17 @@ Long convertToParentNumber(String corpName) {
 		Long corpNumber = parseCorpNumber(corpNumberString);
 		return corpNumber;
 	}
-	
+
 	Long parseCorpNumber(String corpName) {
 		corpName = corpName.trim();
 		long corpNumber;
 		try {
 			corpNumber = Long.parseLong(corpName);
-		} catch (Exception e){
+		} catch (Exception e) {
 			logger.debug("caught an exception parsing the corp number. set to default 0");
 			corpNumber = 0L;
 		}
 		return corpNumber;
 	}
-	
 
-	
 }
-
diff --git a/src/main/java/com/labsynch/labseer/db/migration/postgres/V2_0_7_1__Recalculate_exact_mass.java b/src/main/java/com/labsynch/labseer/db/migration/postgres/V2_0_7_1__Recalculate_exact_mass.java
index 1f98f2090..405775aaa 100644
--- a/src/main/java/com/labsynch/labseer/db/migration/postgres/V2_0_7_1__Recalculate_exact_mass.java
+++ b/src/main/java/com/labsynch/labseer/db/migration/postgres/V2_0_7_1__Recalculate_exact_mass.java
@@ -17,9 +17,9 @@
 import com.labsynch.labseer.chemclasses.CmpdRegMoleculeFactory;
 
 public class V2_0_7_1__Recalculate_exact_mass implements SpringJdbcMigration {
- 
+
 	Logger logger = LoggerFactory.getLogger(V2_0_7_1__Recalculate_exact_mass.class);
-	
+
 	@Autowired
 	CmpdRegMoleculeFactory cmpdRegMoleculeFactory;
 
@@ -33,40 +33,41 @@ public void migrate(JdbcTemplate jdbcTemplate) throws Exception {
 
 		List<Integer> ids = jdbcTemplate.queryForList(selectParentIds, Integer.class);
 
-		for (Integer id : ids){
-			ParentStructureObject parent = (ParentStructureObject)jdbcTemplate.queryForObject(selectParentByIdSQL, new Object[] { id }, new ParentRowMapper());
-			if (logger.isDebugEnabled()) logger.debug(parent.getMolStructure());
+		for (Integer id : ids) {
+			ParentStructureObject parent = (ParentStructureObject) jdbcTemplate.queryForObject(selectParentByIdSQL,
+					new Object[] { id }, new ParentRowMapper());
+			if (logger.isDebugEnabled())
+				logger.debug(parent.getMolStructure());
 			Double molWeight = getMolWeight(parent.getMolStructure());
 			Double exactMass = getExactMass(parent.getMolStructure());
-			
-			int rs2 = jdbcTemplate.update(updateParentWeights,  new Object[] { molWeight, exactMass, id });
+
+			int rs2 = jdbcTemplate.update(updateParentWeights, new Object[] { molWeight, exactMass, id });
 		}
 	}
-	
-	private class ParentStructureObject{
+
+	private class ParentStructureObject {
 		private long id;
 		private String molStructure;
-		
-		public long getId(){
+
+		public long getId() {
 			return this.id;
 		}
-		
-		public String getMolStructure(){
+
+		public String getMolStructure() {
 			return this.molStructure;
 		}
-		
-		public void setId(long id){
+
+		public void setId(long id) {
 			this.id = id;
 		}
-		
-		public void setMolStructure(String molStructure){
+
+		public void setMolStructure(String molStructure) {
 			this.molStructure = molStructure;
 		}
 	}
-	
+
 	@SuppressWarnings("rawtypes")
-	public class ParentRowMapper implements RowMapper
-	{
+	public class ParentRowMapper implements RowMapper {
 		@Override
 		public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			ParentStructureObject parent = new ParentStructureObject();
@@ -75,26 +76,24 @@ public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			return parent;
 		}
 	}
-	
+
 	private double getMolWeight(String molStructure) {
-		try{
+		try {
 			CmpdRegMolecule molecule = cmpdRegMoleculeFactory.getCmpdRegMolecule(molStructure);
 			return molecule.getMass();
-		}catch (Exception e) {
+		} catch (Exception e) {
 			return 0d;
 		}
-		
+
 	}
 
 	private double getExactMass(String molStructure) {
-		try{
+		try {
 			CmpdRegMolecule molecule = cmpdRegMoleculeFactory.getCmpdRegMolecule(molStructure);
 			return molecule.getExactMass();
-		}catch (Exception e) {
+		} catch (Exception e) {
 			return 0d;
 		}
 	}
 
-
 }
-
diff --git a/src/main/java/com/labsynch/labseer/db/migration/postgres/V2_3_0_6__url_encode_cmpdreg_filelist_urls.java b/src/main/java/com/labsynch/labseer/db/migration/postgres/V2_3_0_6__url_encode_cmpdreg_filelist_urls.java
index 3604c2c22..66396de7a 100644
--- a/src/main/java/com/labsynch/labseer/db/migration/postgres/V2_3_0_6__url_encode_cmpdreg_filelist_urls.java
+++ b/src/main/java/com/labsynch/labseer/db/migration/postgres/V2_3_0_6__url_encode_cmpdreg_filelist_urls.java
@@ -13,10 +13,8 @@
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 
-
-
 public class V2_3_0_6__url_encode_cmpdreg_filelist_urls implements SpringJdbcMigration {
- 
+
 	Logger logger = LoggerFactory.getLogger(V2_3_0_6__url_encode_cmpdreg_filelist_urls.class);
 
 	@Transactional
@@ -29,39 +27,40 @@ public void migrate(JdbcTemplate jdbcTemplate) throws Exception {
 
 		List<Integer> ids = jdbcTemplate.queryForList(selectFileIds, Integer.class);
 
-		for (Integer id : ids){
-			FileObject file = (FileObject)jdbcTemplate.queryForObject(selectFileByIdSQL, new Object[] { id }, new FileRowMapper());
-			if (logger.isDebugEnabled()) logger.debug(file.getUrl());
+		for (Integer id : ids) {
+			FileObject file = (FileObject) jdbcTemplate.queryForObject(selectFileByIdSQL, new Object[] { id },
+					new FileRowMapper());
+			if (logger.isDebugEnabled())
+				logger.debug(file.getUrl());
 			String url = getEncodedUrl(file.getUrl());
-			
-			int rs2 = jdbcTemplate.update(updateFileURLs,  new Object[] { url, id });
+
+			int rs2 = jdbcTemplate.update(updateFileURLs, new Object[] { url, id });
 		}
 	}
-	
-	private class FileObject{
+
+	private class FileObject {
 		private long id;
 		private String url;
-		
-		public long getId(){
+
+		public long getId() {
 			return this.id;
 		}
-		
-		public String getUrl(){
+
+		public String getUrl() {
 			return this.url;
 		}
-		
-		public void setId(long id){
+
+		public void setId(long id) {
 			this.id = id;
 		}
-		
-		public void setUrl(String url){
+
+		public void setUrl(String url) {
 			this.url = url;
 		}
 	}
-	
+
 	@SuppressWarnings("rawtypes")
-	public class FileRowMapper implements RowMapper
-	{
+	public class FileRowMapper implements RowMapper {
 		@Override
 		public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			FileObject file = new FileObject();
@@ -70,15 +69,15 @@ public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			return file;
 		}
 	}
-	
+
 	private String getEncodedUrl(String url) {
-		try{
+		try {
 			// Split url on = and encode the second part (file path) of the url
 			String[] urlParts = url.split("=");
 			String charset = "UTF-8";
 			String encodedUrl = urlParts[0] + "=" + URLEncoder.encode(urlParts[1], charset);
 			return encodedUrl;
-		} catch (Exception e){
+		} catch (Exception e) {
 			logger.error("error encoding url: " + url);
 			// log the stacktrace
 			e.printStackTrace();
@@ -87,4 +86,3 @@ private String getEncodedUrl(String url) {
 	}
 
 }
-
diff --git a/src/main/java/com/labsynch/labseer/db/migration/postgres/jchem/V2_0_0_7__Create_Jchem_Tables.java b/src/main/java/com/labsynch/labseer/db/migration/postgres/jchem/V2_0_0_7__Create_Jchem_Tables.java
index cc3937de2..e4a4ceffd 100644
--- a/src/main/java/com/labsynch/labseer/db/migration/postgres/jchem/V2_0_0_7__Create_Jchem_Tables.java
+++ b/src/main/java/com/labsynch/labseer/db/migration/postgres/jchem/V2_0_0_7__Create_Jchem_Tables.java
@@ -23,29 +23,29 @@ public void migrate(Connection conn) throws Exception {
 		conn.setAutoCommit(true);
 		logger.info("conneciton autocommit mode: " + conn.getAutoCommit());
 		logger.info("getTransactionIsolation  " + conn.getTransactionIsolation());
-		
+
 		createJchemPropertyTable(conn);
 		createJChemTable(conn, "Salt_Structure", false);
 		createJChemTable(conn, "SaltForm_Structure", true);
-		createJChemTable(conn, "Parent_Structure", true);	
-	
+		createJChemTable(conn, "Parent_Structure", true);
+
 		conn.setAutoCommit(false);
 		logger.info("conneciton autocommit mode: " + conn.getAutoCommit());
-		
-	}	
-	
+
+	}
+
 	private boolean createJchemPropertyTable(Connection conn) throws SQLException {
 		ConnectionHandler ch = new ConnectionHandler();
 		ch.setConnection(conn);
 
 		boolean tableCreated = true;
-		try{
-			if (!DatabaseProperties.propertyTableExists(ch)){
-				DatabaseProperties.createPropertyTable(ch);				
-				logger.info("created the Jchem property table" );
+		try {
+			if (!DatabaseProperties.propertyTableExists(ch)) {
+				DatabaseProperties.createPropertyTable(ch);
+				logger.info("created the Jchem property table");
 			}
 		} catch (SQLException e) {
-			logger.error("SQL error - unable to create the Jchem property table: " + e );
+			logger.error("SQL error - unable to create the Jchem property table: " + e);
 			tableCreated = false;
 			throw new SQLException("SQL error - unable to create the Jchem property table");
 		}
@@ -56,18 +56,19 @@ private boolean createJchemPropertyTable(Connection conn) throws SQLException {
 	private boolean createJChemTable(Connection conn, String tableName, boolean tautomerDupe) throws SQLException {
 		ConnectionHandler ch = new ConnectionHandler();
 		ch.setConnection(conn);
-		StructureTableOptions options = new StructureTableOptions(tableName, StructureTableOptions.TABLE_TYPE_MOLECULES);
+		StructureTableOptions options = new StructureTableOptions(tableName,
+				StructureTableOptions.TABLE_TYPE_MOLECULES);
 		options.setTautomerDuplicateChecking(tautomerDupe);
-		
+
 		try {
 			String[] tables = UpdateHandler.getStructureTables(ch);
-			List<String> tableList = Arrays.asList(tables); 
-			if (!tableList.contains(tableName)){
-				UpdateHandler.createStructureTable(ch, options );
-				logger.info("created the Jchem structure table " + tableName );
+			List<String> tableList = Arrays.asList(tables);
+			if (!tableList.contains(tableName)) {
+				UpdateHandler.createStructureTable(ch, options);
+				logger.info("created the Jchem structure table " + tableName);
 			}
 		} catch (SQLException e) {
-			logger.error("SQL error. Unable to create the Jchem structure table " + e + "  " + tableName );
+			logger.error("SQL error. Unable to create the Jchem structure table " + e + "  " + tableName);
 			throw new SQLException("SQL error. Unable to create the Jchem structure table");
 		}
 
@@ -75,4 +76,3 @@ private boolean createJChemTable(Connection conn, String tableName, boolean taut
 	}
 
 }
-
diff --git a/src/main/java/com/labsynch/labseer/db/migration/postgres/jchem/V2_0_2_0__Upgrade_Jchem_Tables.java b/src/main/java/com/labsynch/labseer/db/migration/postgres/jchem/V2_0_2_0__Upgrade_Jchem_Tables.java
index 63bc2c53b..94b1a5fd7 100644
--- a/src/main/java/com/labsynch/labseer/db/migration/postgres/jchem/V2_0_2_0__Upgrade_Jchem_Tables.java
+++ b/src/main/java/com/labsynch/labseer/db/migration/postgres/jchem/V2_0_2_0__Upgrade_Jchem_Tables.java
@@ -12,9 +12,8 @@
 import chemaxon.util.ConnectionHandler;
 
 public class V2_0_2_0__Upgrade_Jchem_Tables implements JdbcMigration {
- 
-	Logger logger = LoggerFactory.getLogger(V2_0_2_0__Upgrade_Jchem_Tables.class);
 
+	Logger logger = LoggerFactory.getLogger(V2_0_2_0__Upgrade_Jchem_Tables.class);
 
 	public void migrate(Connection conn) throws Exception {
 		logger.info("ATTEMPTING TO UPGRADE JCHEM TABLES");
@@ -27,7 +26,7 @@ public void migrate(Connection conn) throws Exception {
 		conn.setAutoCommit(false);
 		logger.info("connection autocommit mode: " + conn.getAutoCommit());
 
-	}	
+	}
 
 	private boolean recalculateJChemTable(Connection conn) throws UpdateHandlerException, SQLException {
 		ConnectionHandler ch = new ConnectionHandler();
@@ -43,13 +42,9 @@ private boolean recalculateJChemTable(Connection conn) throws UpdateHandlerExcep
 			logger.info(message);
 		}
 
-		logger.info("updated the Jchem structure tables " );
+		logger.info("updated the Jchem structure tables ");
 
 		return false;
 	}
 
-
-
-
 }
-
diff --git a/src/main/java/com/labsynch/labseer/db/migration/postgres/jchem/V2_0_3_4_1__Add_compound_Jchem_Tables.java b/src/main/java/com/labsynch/labseer/db/migration/postgres/jchem/V2_0_3_4_1__Add_compound_Jchem_Tables.java
index 29c754114..d29d366df 100644
--- a/src/main/java/com/labsynch/labseer/db/migration/postgres/jchem/V2_0_3_4_1__Add_compound_Jchem_Tables.java
+++ b/src/main/java/com/labsynch/labseer/db/migration/postgres/jchem/V2_0_3_4_1__Add_compound_Jchem_Tables.java
@@ -14,10 +14,10 @@
 import chemaxon.util.ConnectionHandler;
 
 public class V2_0_3_4_1__Add_compound_Jchem_Tables implements JdbcMigration {
- 
+
 	Logger logger = LoggerFactory.getLogger(V2_0_3_4_1__Add_compound_Jchem_Tables.class);
 
-	//create the jchem table to store the compounds
+	// create the jchem table to store the compounds
 
 	public void migrate(Connection conn) throws Exception {
 		logger.info("Creating Compound Structure Table");
@@ -30,7 +30,7 @@ public void migrate(Connection conn) throws Exception {
 		conn.setAutoCommit(false);
 		logger.info("connection autocommit mode: " + conn.getAutoCommit());
 
-	}	
+	}
 
 	private boolean createJChemTable(Connection conn, String tableName, boolean tautomerDupe) {
 		ConnectionHandler ch = new ConnectionHandler();
@@ -41,26 +41,24 @@ private boolean createJChemTable(Connection conn, String tableName, boolean taut
 			e1.printStackTrace();
 		}
 
-		StructureTableOptions options = new StructureTableOptions(tableName, StructureTableOptions.TABLE_TYPE_MOLECULES);
+		StructureTableOptions options = new StructureTableOptions(tableName,
+				StructureTableOptions.TABLE_TYPE_MOLECULES);
 		options.setTautomerDuplicateChecking(tautomerDupe);
 
 		try {
 			String[] tables = UpdateHandler.getStructureTables(ch);
-			List<String> tableList = Arrays.asList(tables); 
-			if (!tableList.contains(tableName)){
-				UpdateHandler.createStructureTable(ch, options );
-				logger.info("created the Jchem structure table " + tableName );
+			List<String> tableList = Arrays.asList(tables);
+			if (!tableList.contains(tableName)) {
+				UpdateHandler.createStructureTable(ch, options);
+				logger.info("created the Jchem structure table " + tableName);
 			}
 		} catch (SQLException e) {
-			logger.error("SQL error. Unable to create the Jchem structure table " + tableName );
+			logger.error("SQL error. Unable to create the Jchem structure table " + tableName);
 			e.printStackTrace();
 		}
 
 		return true;
-		
-	}
-
 
+	}
 
 }
-
diff --git a/src/main/java/com/labsynch/labseer/db/migration/postgres/jchem/V2_0_4_3__Upgrade_Jchem_Tables.java b/src/main/java/com/labsynch/labseer/db/migration/postgres/jchem/V2_0_4_3__Upgrade_Jchem_Tables.java
index e4a9d03e9..b368f1b01 100644
--- a/src/main/java/com/labsynch/labseer/db/migration/postgres/jchem/V2_0_4_3__Upgrade_Jchem_Tables.java
+++ b/src/main/java/com/labsynch/labseer/db/migration/postgres/jchem/V2_0_4_3__Upgrade_Jchem_Tables.java
@@ -12,9 +12,8 @@
 import chemaxon.util.ConnectionHandler;
 
 public class V2_0_4_3__Upgrade_Jchem_Tables implements JdbcMigration {
- 
-	Logger logger = LoggerFactory.getLogger(V2_0_4_3__Upgrade_Jchem_Tables.class);
 
+	Logger logger = LoggerFactory.getLogger(V2_0_4_3__Upgrade_Jchem_Tables.class);
 
 	public void migrate(Connection conn) throws Exception {
 		logger.info("ATTEMPTING TO UPGRADE JCHEM TABLES");
@@ -27,7 +26,7 @@ public void migrate(Connection conn) throws Exception {
 		conn.setAutoCommit(false);
 		logger.info("connection autocommit mode: " + conn.getAutoCommit());
 
-	}	
+	}
 
 	private boolean recalculateJChemTable(Connection conn) throws UpdateHandlerException, SQLException {
 		ConnectionHandler ch = new ConnectionHandler();
@@ -43,13 +42,9 @@ private boolean recalculateJChemTable(Connection conn) throws UpdateHandlerExcep
 			logger.info(message);
 		}
 
-		logger.info("updated the Jchem structure tables " );
+		logger.info("updated the Jchem structure tables ");
 
 		return false;
 	}
 
-
-
-
 }
-
diff --git a/src/main/java/com/labsynch/labseer/db/migration/postgres/jchem/V2_0_8_1_1__Upgrade_Jchem_Tables.java b/src/main/java/com/labsynch/labseer/db/migration/postgres/jchem/V2_0_8_1_1__Upgrade_Jchem_Tables.java
index 39934d47b..db9eec0ca 100644
--- a/src/main/java/com/labsynch/labseer/db/migration/postgres/jchem/V2_0_8_1_1__Upgrade_Jchem_Tables.java
+++ b/src/main/java/com/labsynch/labseer/db/migration/postgres/jchem/V2_0_8_1_1__Upgrade_Jchem_Tables.java
@@ -12,9 +12,8 @@
 import chemaxon.util.ConnectionHandler;
 
 public class V2_0_8_1_1__Upgrade_Jchem_Tables implements JdbcMigration {
- 
-	Logger logger = LoggerFactory.getLogger(V2_0_8_1_1__Upgrade_Jchem_Tables.class);
 
+	Logger logger = LoggerFactory.getLogger(V2_0_8_1_1__Upgrade_Jchem_Tables.class);
 
 	public void migrate(Connection conn) throws Exception {
 		logger.info("ATTEMPTING TO UPGRADE JCHEM TABLES");
@@ -27,7 +26,7 @@ public void migrate(Connection conn) throws Exception {
 		conn.setAutoCommit(false);
 		logger.info("connection autocommit mode: " + conn.getAutoCommit());
 
-	}	
+	}
 
 	private boolean recalculateJChemTable(Connection conn) throws UpdateHandlerException, SQLException {
 		ConnectionHandler ch = new ConnectionHandler();
@@ -43,13 +42,9 @@ private boolean recalculateJChemTable(Connection conn) throws UpdateHandlerExcep
 			logger.info(message);
 		}
 
-		logger.info("updated the Jchem structure tables " );
+		logger.info("updated the Jchem structure tables ");
 
 		return false;
 	}
 
-
-
-
 }
-
diff --git a/src/main/java/com/labsynch/labseer/db/migration/postgres/jchem/V2_0_8_1__Add_qc_compound_Jchem_Tables.java b/src/main/java/com/labsynch/labseer/db/migration/postgres/jchem/V2_0_8_1__Add_qc_compound_Jchem_Tables.java
index 0fcb41665..28a4bdef8 100644
--- a/src/main/java/com/labsynch/labseer/db/migration/postgres/jchem/V2_0_8_1__Add_qc_compound_Jchem_Tables.java
+++ b/src/main/java/com/labsynch/labseer/db/migration/postgres/jchem/V2_0_8_1__Add_qc_compound_Jchem_Tables.java
@@ -14,10 +14,10 @@
 import chemaxon.util.ConnectionHandler;
 
 public class V2_0_8_1__Add_qc_compound_Jchem_Tables implements JdbcMigration {
- 
+
 	Logger logger = LoggerFactory.getLogger(V2_0_8_1__Add_qc_compound_Jchem_Tables.class);
 
-	//create the jchem table to store the compounds
+	// create the jchem table to store the compounds
 
 	public void migrate(Connection conn) throws Exception {
 		logger.info("Creating QC Compound Structure Table");
@@ -30,7 +30,7 @@ public void migrate(Connection conn) throws Exception {
 		conn.setAutoCommit(false);
 		logger.info("connection autocommit mode: " + conn.getAutoCommit());
 
-	}	
+	}
 
 	private boolean createJChemTable(Connection conn, String tableName, boolean tautomerDupe) {
 		ConnectionHandler ch = new ConnectionHandler();
@@ -41,26 +41,24 @@ private boolean createJChemTable(Connection conn, String tableName, boolean taut
 			e1.printStackTrace();
 		}
 
-		StructureTableOptions options = new StructureTableOptions(tableName, StructureTableOptions.TABLE_TYPE_MOLECULES);
+		StructureTableOptions options = new StructureTableOptions(tableName,
+				StructureTableOptions.TABLE_TYPE_MOLECULES);
 		options.setTautomerDuplicateChecking(tautomerDupe);
 
 		try {
 			String[] tables = UpdateHandler.getStructureTables(ch);
-			List<String> tableList = Arrays.asList(tables); 
-			if (!tableList.contains(tableName)){
-				UpdateHandler.createStructureTable(ch, options );
-				logger.info("created the Jchem structure table " + tableName );
+			List<String> tableList = Arrays.asList(tables);
+			if (!tableList.contains(tableName)) {
+				UpdateHandler.createStructureTable(ch, options);
+				logger.info("created the Jchem structure table " + tableName);
 			}
 		} catch (SQLException e) {
-			logger.error("SQL error. Unable to create the Jchem structure table " + tableName );
+			logger.error("SQL error. Unable to create the Jchem structure table " + tableName);
 			e.printStackTrace();
 		}
 
 		return true;
-		
-	}
-
 
+	}
 
 }
-
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure.java b/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure.java
index 9432dbcf5..ca1500538 100644
--- a/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure.java
+++ b/src/main/java/com/labsynch/labseer/domain/AbstractBBChemStructure.java
@@ -47,13 +47,13 @@ public abstract class AbstractBBChemStructure {
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "bbChemStructureGen")
     private Long id;
 
-	public Long getId() {
-		return this.id;
-	}
+    public Long getId() {
+        return this.id;
+    }
 
-	public void setId(Long id) {
-		this.id = id;
-	}
+    public void setId(Long id) {
+        this.id = id;
+    }
 
     @Column(columnDefinition = "CHAR(40)")
     private String preReg;
@@ -74,18 +74,18 @@ public void setId(Long id) {
     private BitSet similarity;
 
     @NotNull
-    @DateTimeFormat(style="M-")
+    @DateTimeFormat(style = "M-")
     private Date recordedDate;
 
-	@Enumerated(EnumType.STRING)
-	private CmpdRegMolecule.StandardizationStatus standardizationStatus;
+    @Enumerated(EnumType.STRING)
+    private CmpdRegMolecule.StandardizationStatus standardizationStatus;
 
-	private String standardizationComment;
+    private String standardizationComment;
 
-	@Enumerated(EnumType.STRING)
-	private CmpdRegMolecule.RegistrationStatus registrationStatus;
+    @Enumerated(EnumType.STRING)
+    private CmpdRegMolecule.RegistrationStatus registrationStatus;
 
-	private String registrationComment;
+    private String registrationComment;
 
     @Transient
     private Double exactMolWeight;
@@ -106,7 +106,7 @@ public void setId(Long id) {
     private String molecularFormula;
 
     @Transient
-    private HashMap<String, String> properties =  new HashMap<>();
+    private HashMap<String, String> properties = new HashMap<>();
 
     public void updateStructureInfo(AbstractBBChemStructure updatedBbChemStructure) {
         this.setMol(updatedBbChemStructure.getMol());
@@ -124,31 +124,37 @@ public void updateStructureInfo(AbstractBBChemStructure updatedBbChemStructure)
         this.setRegistrationStatus(updatedBbChemStructure.getRegistrationStatus());
         this.setRegistrationComment(updatedBbChemStructure.getRegistrationComment());
         this.setRecordedDate(updatedBbChemStructure.getRecordedDate());
-    } 
-
+    }
 
-	@PersistenceContext
-    protected
-    transient EntityManager entityManager;
+    @PersistenceContext
+    protected transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("id", "preReg", "reg", "mol", "substructure", "similarity", "recordedDate", "standardizationStatus", "standardizationComment", "registrationStatus", "registrationComment", "exactMolWeight", "averageMolWeight", "totalCharge", "smiles", "inchi", "molecularFormula", "properties");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("id", "preReg", "reg",
+            "mol", "substructure", "similarity", "recordedDate", "standardizationStatus", "standardizationComment",
+            "registrationStatus", "registrationComment", "exactMolWeight", "averageMolWeight", "totalCharge", "smiles",
+            "inchi", "molecularFormula", "properties");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new AbstractBBChemStructure() {
         }.entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countAbstractBBChemStructures() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM AbstractBBChemStructure o", Long.class).getSingleResult();
+    public static long countAbstractBBChemStructures() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM AbstractBBChemStructure o", Long.class)
+                .getSingleResult();
     }
 
-	public static List<AbstractBBChemStructure> findAllAbstractBBChemStructures() {
-        return entityManager().createQuery("SELECT o FROM AbstractBBChemStructure o", AbstractBBChemStructure.class).getResultList();
+    public static List<AbstractBBChemStructure> findAllAbstractBBChemStructures() {
+        return entityManager().createQuery("SELECT o FROM AbstractBBChemStructure o", AbstractBBChemStructure.class)
+                .getResultList();
     }
 
-	public static List<AbstractBBChemStructure> findAllAbstractBBChemStructures(String sortFieldName, String sortOrder) {
+    public static List<AbstractBBChemStructure> findAllAbstractBBChemStructures(String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM AbstractBBChemStructure o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -159,16 +165,19 @@ public static List<AbstractBBChemStructure> findAllAbstractBBChemStructures(Stri
         return entityManager().createQuery(jpaQuery, AbstractBBChemStructure.class).getResultList();
     }
 
-	public static AbstractBBChemStructure findAbstractBBChemStructure(Long id) {
-        if (id == null) return null;
+    public static AbstractBBChemStructure findAbstractBBChemStructure(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(AbstractBBChemStructure.class, id);
     }
 
-	public static List<AbstractBBChemStructure> findAbstractBBChemStructureEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM AbstractBBChemStructure o", AbstractBBChemStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<AbstractBBChemStructure> findAbstractBBChemStructureEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM AbstractBBChemStructure o", AbstractBBChemStructure.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<AbstractBBChemStructure> findAbstractBBChemStructureEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<AbstractBBChemStructure> findAbstractBBChemStructureEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM AbstractBBChemStructure o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -176,18 +185,21 @@ public static List<AbstractBBChemStructure> findAbstractBBChemStructureEntries(i
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, AbstractBBChemStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, AbstractBBChemStructure.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -196,205 +208,208 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public AbstractBBChemStructure merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         AbstractBBChemStructure merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String getPreReg() {
+    public String getPreReg() {
         return this.preReg;
     }
 
-	public void setPreReg(String preReg) {
+    public void setPreReg(String preReg) {
         this.preReg = preReg;
     }
 
-	public String getReg() {
+    public String getReg() {
         return this.reg;
     }
 
-	public void setReg(String reg) {
+    public void setReg(String reg) {
         this.reg = reg;
     }
 
-	public String getMol() {
+    public String getMol() {
         return this.mol;
     }
 
-	public void setMol(String mol) {
+    public void setMol(String mol) {
         this.mol = mol;
     }
 
-	public BitSet getSubstructure() {
+    public BitSet getSubstructure() {
         return this.substructure;
     }
 
-	public void setSubstructure(BitSet substructure) {
+    public void setSubstructure(BitSet substructure) {
         this.substructure = substructure;
     }
 
-	public BitSet getSimilarity() {
+    public BitSet getSimilarity() {
         return this.similarity;
     }
 
-	public void setSimilarity(BitSet similarity) {
+    public void setSimilarity(BitSet similarity) {
         this.similarity = similarity;
     }
 
-	public Date getRecordedDate() {
+    public Date getRecordedDate() {
         return this.recordedDate;
     }
 
-	public void setRecordedDate(Date recordedDate) {
+    public void setRecordedDate(Date recordedDate) {
         this.recordedDate = recordedDate;
     }
 
-	public StandardizationStatus getStandardizationStatus() {
+    public StandardizationStatus getStandardizationStatus() {
         return this.standardizationStatus;
     }
 
-	public void setStandardizationStatus(StandardizationStatus standardizationStatus) {
+    public void setStandardizationStatus(StandardizationStatus standardizationStatus) {
         this.standardizationStatus = standardizationStatus;
     }
 
-	public String getStandardizationComment() {
+    public String getStandardizationComment() {
         return this.standardizationComment;
     }
 
-	public void setStandardizationComment(String standardizationComment) {
+    public void setStandardizationComment(String standardizationComment) {
         this.standardizationComment = standardizationComment;
     }
 
-	public RegistrationStatus getRegistrationStatus() {
+    public RegistrationStatus getRegistrationStatus() {
         return this.registrationStatus;
     }
 
-	public void setRegistrationStatus(RegistrationStatus registrationStatus) {
+    public void setRegistrationStatus(RegistrationStatus registrationStatus) {
         this.registrationStatus = registrationStatus;
     }
 
-	public String getRegistrationComment() {
+    public String getRegistrationComment() {
         return this.registrationComment;
     }
 
-	public void setRegistrationComment(String registrationComment) {
+    public void setRegistrationComment(String registrationComment) {
         this.registrationComment = registrationComment;
     }
 
-	public Double getExactMolWeight() {
+    public Double getExactMolWeight() {
         return this.exactMolWeight;
     }
 
-	public void setExactMolWeight(Double exactMolWeight) {
+    public void setExactMolWeight(Double exactMolWeight) {
         this.exactMolWeight = exactMolWeight;
     }
 
-	public Double getAverageMolWeight() {
+    public Double getAverageMolWeight() {
         return this.averageMolWeight;
     }
 
-	public void setAverageMolWeight(Double averageMolWeight) {
+    public void setAverageMolWeight(Double averageMolWeight) {
         this.averageMolWeight = averageMolWeight;
     }
 
-	public Integer getTotalCharge() {
+    public Integer getTotalCharge() {
         return this.totalCharge;
     }
 
-	public void setTotalCharge(Integer totalCharge) {
+    public void setTotalCharge(Integer totalCharge) {
         this.totalCharge = totalCharge;
     }
 
-	public String getSmiles() {
+    public String getSmiles() {
         return this.smiles;
     }
 
-	public void setSmiles(String smiles) {
+    public void setSmiles(String smiles) {
         this.smiles = smiles;
     }
 
-	public String getInchi() {
+    public String getInchi() {
         return this.inchi;
     }
 
-	public void setInchi(String inchi) {
+    public void setInchi(String inchi) {
         this.inchi = inchi;
     }
 
-	public String getMolecularFormula() {
+    public String getMolecularFormula() {
         return this.molecularFormula;
     }
 
-	public void setMolecularFormula(String molecularFormula) {
+    public void setMolecularFormula(String molecularFormula) {
         this.molecularFormula = molecularFormula;
     }
 
-	public HashMap<String, String> getProperties() {
+    public HashMap<String, String> getProperties() {
         return this.properties;
     }
 
-	public void setProperties(HashMap<String, String> properties) {
+    public void setProperties(HashMap<String, String> properties) {
         this.properties = properties;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static AbstractBBChemStructure fromJsonToAbstractBBChemStructure(String json) {
+    public static AbstractBBChemStructure fromJsonToAbstractBBChemStructure(String json) {
         return new JSONDeserializer<AbstractBBChemStructure>()
-        .use(null, AbstractBBChemStructure.class).deserialize(json);
+                .use(null, AbstractBBChemStructure.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<AbstractBBChemStructure> collection) {
+    public static String toJsonArray(Collection<AbstractBBChemStructure> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<AbstractBBChemStructure> collection, String[] fields) {
+    public static String toJsonArray(Collection<AbstractBBChemStructure> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<AbstractBBChemStructure> fromJsonArrayToAbstractBBChemStructures(String json) {
+    public static Collection<AbstractBBChemStructure> fromJsonArrayToAbstractBBChemStructures(String json) {
         return new JSONDeserializer<List<AbstractBBChemStructure>>()
-        .use("values", AbstractBBChemStructure.class).deserialize(json);
+                .use("values", AbstractBBChemStructure.class).deserialize(json);
     }
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractLabel.java b/src/main/java/com/labsynch/labseer/domain/AbstractLabel.java
index 56ef85911..7580d9c01 100755
--- a/src/main/java/com/labsynch/labseer/domain/AbstractLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/AbstractLabel.java
@@ -32,7 +32,7 @@
 @Transactional
 public abstract class AbstractLabel {
 
-//	@Column(unique = true)
+	// @Column(unique = true)
 	@NotNull
 	@Size(max = 255)
 	private String labelText;
@@ -71,14 +71,14 @@ public abstract class AbstractLabel {
 
 	@NotNull
 	private boolean ignored;
-	
+
 	@NotNull
 	private boolean deleted;
 
 	private Long lsTransaction;
 
 	@Id
-	@SequenceGenerator(name = "abstractLabelGen", sequenceName = "LABEL_PKSEQ", allocationSize=20)
+	@SequenceGenerator(name = "abstractLabelGen", sequenceName = "LABEL_PKSEQ", allocationSize = 20)
 	@GeneratedValue(strategy = GenerationType.AUTO, generator = "abstractLabelGen")
 	@Column(name = "id")
 	private Long id;
@@ -91,217 +91,229 @@ public void setId(Long id) {
 		this.id = id;
 	}
 
-
 	@PersistenceContext
 	transient EntityManager entityManager;
 
 	public static final EntityManager entityManager() {
 		EntityManager em = new AbstractLabel() {
 		}.entityManager;
-		if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+		if (em == null)
+			throw new IllegalStateException(
+					"Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
 		return em;
 	}
 
-
 	@Transactional
 	public void persist() {
-		if (this.entityManager == null) this.entityManager = entityManager();
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
 		this.setLsTypeAndKind(new StringBuilder().append(this.lsType).append("_").append(this.lsKind).toString());
-		if (this.recordedDate == null) this.recordedDate = new Date();
+		if (this.recordedDate == null)
+			this.recordedDate = new Date();
 		this.entityManager.persist(this);
 	}
 
 	@Transactional
 	public AbstractLabel merge() {
-		if (this.entityManager == null) this.entityManager = entityManager();
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
 		AbstractLabel merged = this.entityManager.merge(this);
 		this.setLsTypeAndKind(new StringBuilder().append(this.lsType).append("_").append(this.lsKind).toString());
-		this.modifiedDate = new Date();		
+		this.modifiedDate = new Date();
 		this.entityManager.flush();
 		return merged;
 	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 
 	@Version
-    @Column(name = "version")
-    private Integer version;
+	@Column(name = "version")
+	private Integer version;
 
 	public Integer getVersion() {
-        return this.version;
-    }
+		return this.version;
+	}
 
 	public void setVersion(Integer version) {
-        this.version = version;
-    }
+		this.version = version;
+	}
 
 	public String getLabelText() {
-        return this.labelText;
-    }
+		return this.labelText;
+	}
 
 	public void setLabelText(String labelText) {
-        this.labelText = labelText;
-    }
+		this.labelText = labelText;
+	}
 
 	public String getRecordedBy() {
-        return this.recordedBy;
-    }
+		return this.recordedBy;
+	}
 
 	public void setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
+		this.recordedBy = recordedBy;
+	}
 
 	public Date getRecordedDate() {
-        return this.recordedDate;
-    }
+		return this.recordedDate;
+	}
 
 	public void setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
+		this.recordedDate = recordedDate;
+	}
 
 	public Date getModifiedDate() {
-        return this.modifiedDate;
-    }
+		return this.modifiedDate;
+	}
 
 	public void setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
+		this.modifiedDate = modifiedDate;
+	}
 
 	public boolean isPhysicallyLabled() {
-        return this.physicallyLabled;
-    }
+		return this.physicallyLabled;
+	}
 
 	public void setPhysicallyLabled(boolean physicallyLabled) {
-        this.physicallyLabled = physicallyLabled;
-    }
+		this.physicallyLabled = physicallyLabled;
+	}
 
 	public String getImageFile() {
-        return this.imageFile;
-    }
+		return this.imageFile;
+	}
 
 	public void setImageFile(String imageFile) {
-        this.imageFile = imageFile;
-    }
+		this.imageFile = imageFile;
+	}
 
 	public String getLsType() {
-        return this.lsType;
-    }
+		return this.lsType;
+	}
 
 	public void setLsType(String lsType) {
-        this.lsType = lsType;
-    }
+		this.lsType = lsType;
+	}
 
 	public String getLsKind() {
-        return this.lsKind;
-    }
+		return this.lsKind;
+	}
 
 	public void setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
+		this.lsKind = lsKind;
+	}
 
 	public String getLsTypeAndKind() {
-        return this.lsTypeAndKind;
-    }
+		return this.lsTypeAndKind;
+	}
 
 	public void setLsTypeAndKind(String lsTypeAndKind) {
-        this.lsTypeAndKind = lsTypeAndKind;
-    }
+		this.lsTypeAndKind = lsTypeAndKind;
+	}
 
 	public boolean isPreferred() {
-        return this.preferred;
-    }
+		return this.preferred;
+	}
 
 	public void setPreferred(boolean preferred) {
-        this.preferred = preferred;
-    }
+		this.preferred = preferred;
+	}
 
 	public boolean isIgnored() {
-        return this.ignored;
-    }
+		return this.ignored;
+	}
 
 	public void setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
+		this.ignored = ignored;
+	}
 
 	public boolean isDeleted() {
-        return this.deleted;
-    }
+		return this.deleted;
+	}
 
 	public void setDeleted(boolean deleted) {
-        this.deleted = deleted;
-    }
+		this.deleted = deleted;
+	}
 
 	public Long getLsTransaction() {
-        return this.lsTransaction;
-    }
+		return this.lsTransaction;
+	}
 
 	public void setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
+		this.lsTransaction = lsTransaction;
+	}
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("labelText", "recordedBy", "recordedDate", "modifiedDate", "physicallyLabled", "imageFile", "lsType", "lsKind", "lsTypeAndKind", "preferred", "ignored", "deleted", "lsTransaction", "id", "entityManager");
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("labelText", "recordedBy",
+			"recordedDate", "modifiedDate", "physicallyLabled", "imageFile", "lsType", "lsKind", "lsTypeAndKind",
+			"preferred", "ignored", "deleted", "lsTransaction", "id", "entityManager");
 
 	public static long countAbstractLabels() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM AbstractLabel o", Long.class).getSingleResult();
-    }
+		return entityManager().createQuery("SELECT COUNT(o) FROM AbstractLabel o", Long.class).getSingleResult();
+	}
 
 	public static List<AbstractLabel> findAllAbstractLabels() {
-        return entityManager().createQuery("SELECT o FROM AbstractLabel o", AbstractLabel.class).getResultList();
-    }
+		return entityManager().createQuery("SELECT o FROM AbstractLabel o", AbstractLabel.class).getResultList();
+	}
 
 	public static List<AbstractLabel> findAllAbstractLabels(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AbstractLabel o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AbstractLabel.class).getResultList();
-    }
+		String jpaQuery = "SELECT o FROM AbstractLabel o";
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				jpaQuery = jpaQuery + " " + sortOrder;
+			}
+		}
+		return entityManager().createQuery(jpaQuery, AbstractLabel.class).getResultList();
+	}
 
 	public static AbstractLabel findAbstractLabel(Long id) {
-        if (id == null) return null;
-        return entityManager().find(AbstractLabel.class, id);
-    }
+		if (id == null)
+			return null;
+		return entityManager().find(AbstractLabel.class, id);
+	}
 
 	public static List<AbstractLabel> findAbstractLabelEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM AbstractLabel o", AbstractLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-
-	public static List<AbstractLabel> findAbstractLabelEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AbstractLabel o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AbstractLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
+		return entityManager().createQuery("SELECT o FROM AbstractLabel o", AbstractLabel.class)
+				.setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+	}
+
+	public static List<AbstractLabel> findAbstractLabelEntries(int firstResult, int maxResults, String sortFieldName,
+			String sortOrder) {
+		String jpaQuery = "SELECT o FROM AbstractLabel o";
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				jpaQuery = jpaQuery + " " + sortOrder;
+			}
+		}
+		return entityManager().createQuery(jpaQuery, AbstractLabel.class).setFirstResult(firstResult)
+				.setMaxResults(maxResults).getResultList();
+	}
 
 	@Transactional
-    public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            AbstractLabel attached = AbstractLabel.findAbstractLabel(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
+	public void remove() {
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
+		if (this.entityManager.contains(this)) {
+			this.entityManager.remove(this);
+		} else {
+			AbstractLabel attached = AbstractLabel.findAbstractLabel(this.id);
+			this.entityManager.remove(attached);
+		}
+	}
 
 	@Transactional
-    public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
+	public void flush() {
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
+		this.entityManager.flush();
+	}
 
 	@Transactional
-    public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
+	public void clear() {
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
+		this.entityManager.clear();
+	}
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractState.java b/src/main/java/com/labsynch/labseer/domain/AbstractState.java
index b4a03b21a..6771ffb5f 100755
--- a/src/main/java/com/labsynch/labseer/domain/AbstractState.java
+++ b/src/main/java/com/labsynch/labseer/domain/AbstractState.java
@@ -64,14 +64,14 @@ public abstract class AbstractState {
 
 	@NotNull
 	private boolean ignored;
-	
+
 	@NotNull
 	private boolean deleted;
 
 	private Long lsTransaction;
 
 	@Id
-	@SequenceGenerator(name = "abstractStateGen", sequenceName = "STATE_PKSEQ", allocationSize=20)
+	@SequenceGenerator(name = "abstractStateGen", sequenceName = "STATE_PKSEQ", allocationSize = 20)
 	@GeneratedValue(strategy = GenerationType.AUTO, generator = "abstractStateGen")
 	@Column(name = "id")
 	private Long id;
@@ -90,21 +90,26 @@ public void setId(Long id) {
 	public static final EntityManager entityManager() {
 		EntityManager em = new AbstractState() {
 		}.entityManager;
-		if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+		if (em == null)
+			throw new IllegalStateException(
+					"Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
 		return em;
 	}
 
 	@Transactional
 	public void persist() {
-		if (this.entityManager == null) this.entityManager = entityManager();
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
 		this.setLsTypeAndKind(new StringBuilder().append(this.lsType).append("_").append(this.lsKind).toString());
-		if (this.recordedDate == null) this.recordedDate = new Date();
+		if (this.recordedDate == null)
+			this.recordedDate = new Date();
 		this.entityManager.persist(this);
 	}
 
 	@Transactional
 	public AbstractState merge() {
-		if (this.entityManager == null) this.entityManager = entityManager();
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
 		this.setLsTypeAndKind(new StringBuilder().append(this.lsType).append("_").append(this.lsKind).toString());
 		this.modifiedDate = new Date();
 		AbstractState merged = this.entityManager.merge(this);
@@ -112,172 +117,180 @@ public AbstractState merge() {
 		return merged;
 	}
 
-
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 
 	@Version
-    @Column(name = "version")
-    private Integer version;
+	@Column(name = "version")
+	private Integer version;
 
 	public Integer getVersion() {
-        return this.version;
-    }
+		return this.version;
+	}
 
 	public void setVersion(Integer version) {
-        this.version = version;
-    }
+		this.version = version;
+	}
 
 	public String getRecordedBy() {
-        return this.recordedBy;
-    }
+		return this.recordedBy;
+	}
 
 	public void setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
+		this.recordedBy = recordedBy;
+	}
 
 	public Date getRecordedDate() {
-        return this.recordedDate;
-    }
+		return this.recordedDate;
+	}
 
 	public void setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
+		this.recordedDate = recordedDate;
+	}
 
 	public String getModifiedBy() {
-        return this.modifiedBy;
-    }
+		return this.modifiedBy;
+	}
 
 	public void setModifiedBy(String modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
+		this.modifiedBy = modifiedBy;
+	}
 
 	public Date getModifiedDate() {
-        return this.modifiedDate;
-    }
+		return this.modifiedDate;
+	}
 
 	public void setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
+		this.modifiedDate = modifiedDate;
+	}
 
 	public String getLsType() {
-        return this.lsType;
-    }
+		return this.lsType;
+	}
 
 	public void setLsType(String lsType) {
-        this.lsType = lsType;
-    }
+		this.lsType = lsType;
+	}
 
 	public String getLsKind() {
-        return this.lsKind;
-    }
+		return this.lsKind;
+	}
 
 	public void setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
+		this.lsKind = lsKind;
+	}
 
 	public String getLsTypeAndKind() {
-        return this.lsTypeAndKind;
-    }
+		return this.lsTypeAndKind;
+	}
 
 	public void setLsTypeAndKind(String lsTypeAndKind) {
-        this.lsTypeAndKind = lsTypeAndKind;
-    }
+		this.lsTypeAndKind = lsTypeAndKind;
+	}
 
 	public String getComments() {
-        return this.comments;
-    }
+		return this.comments;
+	}
 
 	public void setComments(String comments) {
-        this.comments = comments;
-    }
+		this.comments = comments;
+	}
 
 	public boolean isIgnored() {
-        return this.ignored;
-    }
+		return this.ignored;
+	}
 
 	public void setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
+		this.ignored = ignored;
+	}
 
 	public boolean isDeleted() {
-        return this.deleted;
-    }
+		return this.deleted;
+	}
 
 	public void setDeleted(boolean deleted) {
-        this.deleted = deleted;
-    }
+		this.deleted = deleted;
+	}
 
 	public Long getLsTransaction() {
-        return this.lsTransaction;
-    }
+		return this.lsTransaction;
+	}
 
 	public void setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
+		this.lsTransaction = lsTransaction;
+	}
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("recordedBy", "recordedDate", "modifiedBy", "modifiedDate", "lsType", "lsKind", "lsTypeAndKind", "comments", "ignored", "deleted", "lsTransaction", "id", "entityManager");
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("recordedBy",
+			"recordedDate", "modifiedBy", "modifiedDate", "lsType", "lsKind", "lsTypeAndKind", "comments", "ignored",
+			"deleted", "lsTransaction", "id", "entityManager");
 
 	public static long countAbstractStates() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM AbstractState o", Long.class).getSingleResult();
-    }
+		return entityManager().createQuery("SELECT COUNT(o) FROM AbstractState o", Long.class).getSingleResult();
+	}
 
 	public static List<AbstractState> findAllAbstractStates() {
-        return entityManager().createQuery("SELECT o FROM AbstractState o", AbstractState.class).getResultList();
-    }
+		return entityManager().createQuery("SELECT o FROM AbstractState o", AbstractState.class).getResultList();
+	}
 
 	public static List<AbstractState> findAllAbstractStates(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AbstractState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AbstractState.class).getResultList();
-    }
+		String jpaQuery = "SELECT o FROM AbstractState o";
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				jpaQuery = jpaQuery + " " + sortOrder;
+			}
+		}
+		return entityManager().createQuery(jpaQuery, AbstractState.class).getResultList();
+	}
 
 	public static AbstractState findAbstractState(Long id) {
-        if (id == null) return null;
-        return entityManager().find(AbstractState.class, id);
-    }
+		if (id == null)
+			return null;
+		return entityManager().find(AbstractState.class, id);
+	}
 
 	public static List<AbstractState> findAbstractStateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM AbstractState o", AbstractState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-
-	public static List<AbstractState> findAbstractStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AbstractState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AbstractState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
+		return entityManager().createQuery("SELECT o FROM AbstractState o", AbstractState.class)
+				.setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+	}
+
+	public static List<AbstractState> findAbstractStateEntries(int firstResult, int maxResults, String sortFieldName,
+			String sortOrder) {
+		String jpaQuery = "SELECT o FROM AbstractState o";
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				jpaQuery = jpaQuery + " " + sortOrder;
+			}
+		}
+		return entityManager().createQuery(jpaQuery, AbstractState.class).setFirstResult(firstResult)
+				.setMaxResults(maxResults).getResultList();
+	}
 
 	@Transactional
-    public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            AbstractState attached = AbstractState.findAbstractState(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
+	public void remove() {
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
+		if (this.entityManager.contains(this)) {
+			this.entityManager.remove(this);
+		} else {
+			AbstractState attached = AbstractState.findAbstractState(this.id);
+			this.entityManager.remove(attached);
+		}
+	}
 
 	@Transactional
-    public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
+	public void flush() {
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
+		this.entityManager.flush();
+	}
 
 	@Transactional
-    public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
+	public void clear() {
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
+		this.entityManager.clear();
+	}
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractThing.java b/src/main/java/com/labsynch/labseer/domain/AbstractThing.java
index 8f09c076c..cdc8ee369 100755
--- a/src/main/java/com/labsynch/labseer/domain/AbstractThing.java
+++ b/src/main/java/com/labsynch/labseer/domain/AbstractThing.java
@@ -36,125 +36,130 @@
 @Transactional
 public abstract class AbstractThing {
 
-	@Id
-	@SequenceGenerator(name = "abstractThingGen", sequenceName = "THING_PKSEQ", allocationSize=10)
-	@GeneratedValue(strategy = GenerationType.AUTO, generator = "abstractThingGen")
-	@Column(name = "id")
-	private Long id;
-	
+    @Id
+    @SequenceGenerator(name = "abstractThingGen", sequenceName = "THING_PKSEQ", allocationSize = 10)
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "abstractThingGen")
+    @Column(name = "id")
+    private Long id;
+
     @Version
     @Column(name = "version")
     private Integer version;
-	
-	@NotNull
-	@Size(max = 255)
-	private String lsType;
-	
-	@NotNull
-	@Size(max = 255)
-	private String lsKind;	
-
-	@Size(max = 255)
-	private String lsTypeAndKind;
-	
+
+    @NotNull
+    @Size(max = 255)
+    private String lsType;
+
+    @NotNull
+    @Size(max = 255)
+    private String lsKind;
+
+    @Size(max = 255)
+    private String lsTypeAndKind;
+
     @Column(unique = true)
-	@Size(max = 255)
-	private String codeName;
+    @Size(max = 255)
+    private String codeName;
 
-	@NotNull
-	@Size(max = 255)
-	private String recordedBy;
+    @NotNull
+    @Size(max = 255)
+    private String recordedBy;
 
-	@NotNull
-	@Temporal(TemporalType.TIMESTAMP)
-	@DateTimeFormat(style = "MM")   
-	private Date recordedDate;
+    @NotNull
+    @Temporal(TemporalType.TIMESTAMP)
+    @DateTimeFormat(style = "MM")
+    private Date recordedDate;
 
-	@Size(max = 255)
-	private String modifiedBy;
+    @Size(max = 255)
+    private String modifiedBy;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@DateTimeFormat(style = "MM")
-	private Date modifiedDate;
+    @Temporal(TemporalType.TIMESTAMP)
+    @DateTimeFormat(style = "MM")
+    private Date modifiedDate;
 
-	@NotNull
-	private boolean ignored;
-	
-	@NotNull
-	private boolean deleted;
+    @NotNull
+    private boolean ignored;
 
-	private Long lsTransaction;
+    @NotNull
+    private boolean deleted;
 
-	@OneToMany(cascade = CascadeType.ALL, mappedBy = "thing")
-	private Set<ThingPage> thingPage = new HashSet<ThingPage>();
+    private Long lsTransaction;
 
-	public Long getId() {
-		return this.id;
-	}
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "thing")
+    private Set<ThingPage> thingPage = new HashSet<ThingPage>();
 
-	public void setId(Long id) {
-		this.id = id;
-	}
+    public Long getId() {
+        return this.id;
+    }
 
+    public void setId(Long id) {
+        this.id = id;
+    }
 
-    
     public Integer getVersion() {
         return this.version;
     }
-    
+
     public void setVersion(Integer version) {
         this.version = version;
     }
 
-	@PersistenceContext
-	transient EntityManager entityManager;
-
-	public static final EntityManager entityManager() {
-		EntityManager em = new AbstractThing() {
-		}.entityManager;
-		if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-		return em;
-	}
-
-	@Transactional
-	public void persist() {
-		if (this.entityManager == null) this.entityManager = entityManager();
-		this.setLsTypeAndKind(new StringBuilder().append(this.lsType).append("_").append(this.lsKind).toString());
-		if (this.recordedDate == null) this.recordedDate = new Date();
-		this.entityManager.persist(this);
-	}
-		
-	@Transactional
-	public AbstractThing merge() {
-		if (this.entityManager == null) this.entityManager = entityManager();
-		this.setLsTypeAndKind(new StringBuilder().append(this.lsType).append("_").append(this.lsKind).toString());
-		this.modifiedDate = new Date();
-		AbstractThing merged = this.entityManager.merge(this);
-		this.entityManager.flush();
-		return merged;
-	}
-
-
-	public static long countAbstractThings() {
+    @PersistenceContext
+    transient EntityManager entityManager;
+
+    public static final EntityManager entityManager() {
+        EntityManager em = new AbstractThing() {
+        }.entityManager;
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+    @Transactional
+    public void persist() {
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
+        this.setLsTypeAndKind(new StringBuilder().append(this.lsType).append("_").append(this.lsKind).toString());
+        if (this.recordedDate == null)
+            this.recordedDate = new Date();
+        this.entityManager.persist(this);
+    }
+
+    @Transactional
+    public AbstractThing merge() {
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
+        this.setLsTypeAndKind(new StringBuilder().append(this.lsType).append("_").append(this.lsKind).toString());
+        this.modifiedDate = new Date();
+        AbstractThing merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+    public static long countAbstractThings() {
         return entityManager().createQuery("SELECT COUNT(o) FROM AbstractThing o", Long.class).getSingleResult();
     }
 
-	public static List<AbstractThing> findAllAbstractThings() {
+    public static List<AbstractThing> findAllAbstractThings() {
         return entityManager().createQuery("SELECT o FROM AbstractThing o", AbstractThing.class).getResultList();
     }
 
-	public static AbstractThing findAbstractThing(Long id) {
-        if (id == null) return null;
+    public static AbstractThing findAbstractThing(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(AbstractThing.class, id);
     }
 
-	public static List<AbstractThing> findAbstractThingEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM AbstractThing o", AbstractThing.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<AbstractThing> findAbstractThingEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM AbstractThing o", AbstractThing.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -162,115 +167,114 @@ public void remove() {
             this.entityManager.remove(attached);
         }
     }
-	
+
     @Transactional
     public void logicalDelete() {
-    	this.setIgnored(true);
-    	this.setDeleted(true);
+        this.setIgnored(true);
+        this.setDeleted(true);
     }
 
-
-	
-
-	public String getLsType() {
+    public String getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(String lsType) {
+    public void setLsType(String lsType) {
         this.lsType = lsType;
     }
 
-	public String getLsKind() {
+    public String getLsKind() {
         return this.lsKind;
     }
 
-	public void setLsKind(String lsKind) {
+    public void setLsKind(String lsKind) {
         this.lsKind = lsKind;
     }
 
-	public String getLsTypeAndKind() {
+    public String getLsTypeAndKind() {
         return this.lsTypeAndKind;
     }
 
-	public void setLsTypeAndKind(String lsTypeAndKind) {
+    public void setLsTypeAndKind(String lsTypeAndKind) {
         this.lsTypeAndKind = lsTypeAndKind;
     }
 
-	public String getCodeName() {
+    public String getCodeName() {
         return this.codeName;
     }
 
-	public void setCodeName(String codeName) {
+    public void setCodeName(String codeName) {
         this.codeName = codeName;
     }
 
-	public String getRecordedBy() {
+    public String getRecordedBy() {
         return this.recordedBy;
     }
 
-	public void setRecordedBy(String recordedBy) {
+    public void setRecordedBy(String recordedBy) {
         this.recordedBy = recordedBy;
     }
 
-	public Date getRecordedDate() {
+    public Date getRecordedDate() {
         return this.recordedDate;
     }
 
-	public void setRecordedDate(Date recordedDate) {
+    public void setRecordedDate(Date recordedDate) {
         this.recordedDate = recordedDate;
     }
 
-	public String getModifiedBy() {
+    public String getModifiedBy() {
         return this.modifiedBy;
     }
 
-	public void setModifiedBy(String modifiedBy) {
+    public void setModifiedBy(String modifiedBy) {
         this.modifiedBy = modifiedBy;
     }
 
-	public Date getModifiedDate() {
+    public Date getModifiedDate() {
         return this.modifiedDate;
     }
 
-	public void setModifiedDate(Date modifiedDate) {
+    public void setModifiedDate(Date modifiedDate) {
         this.modifiedDate = modifiedDate;
     }
 
-	public boolean isIgnored() {
+    public boolean isIgnored() {
         return this.ignored;
     }
 
-	public void setIgnored(boolean ignored) {
+    public void setIgnored(boolean ignored) {
         this.ignored = ignored;
     }
 
-	public boolean isDeleted() {
+    public boolean isDeleted() {
         return this.deleted;
     }
 
-	public void setDeleted(boolean deleted) {
+    public void setDeleted(boolean deleted) {
         this.deleted = deleted;
     }
 
-	public Long getLsTransaction() {
+    public Long getLsTransaction() {
         return this.lsTransaction;
     }
 
-	public void setLsTransaction(Long lsTransaction) {
+    public void setLsTransaction(Long lsTransaction) {
         this.lsTransaction = lsTransaction;
     }
 
-	public Set<ThingPage> getThingPage() {
+    public Set<ThingPage> getThingPage() {
         return this.thingPage;
     }
 
-	public void setThingPage(Set<ThingPage> thingPage) {
+    public void setThingPage(Set<ThingPage> thingPage) {
         this.thingPage = thingPage;
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("id", "version", "lsType", "lsKind", "lsTypeAndKind", "codeName", "recordedBy", "recordedDate", "modifiedBy", "modifiedDate", "ignored", "deleted", "lsTransaction", "thingPage", "entityManager");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("id", "version", "lsType",
+            "lsKind", "lsTypeAndKind", "codeName", "recordedBy", "recordedDate", "modifiedBy", "modifiedDate",
+            "ignored", "deleted", "lsTransaction", "thingPage", "entityManager");
 
-	public static List<AbstractThing> findAllAbstractThings(String sortFieldName, String sortOrder) {
+    public static List<AbstractThing> findAllAbstractThings(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM AbstractThing o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -281,7 +285,8 @@ public static List<AbstractThing> findAllAbstractThings(String sortFieldName, St
         return entityManager().createQuery(jpaQuery, AbstractThing.class).getResultList();
     }
 
-	public static List<AbstractThing> findAbstractThingEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<AbstractThing> findAbstractThingEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM AbstractThing o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -289,22 +294,25 @@ public static List<AbstractThing> findAbstractThingEntries(int firstResult, int
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, AbstractThing.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, AbstractThing.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/AbstractValue.java b/src/main/java/com/labsynch/labseer/domain/AbstractValue.java
index cfbf6c597..21c0635ea 100755
--- a/src/main/java/com/labsynch/labseer/domain/AbstractValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/AbstractValue.java
@@ -37,7 +37,6 @@
 @Transactional
 public abstract class AbstractValue {
 
-	
 	@NotNull
 	@Size(max = 64)
 	private String lsType;
@@ -51,7 +50,7 @@ public abstract class AbstractValue {
 
 	@Size(max = 255)
 	private String codeOrigin;
-	
+
 	@Size(max = 255)
 	private String codeType;
 
@@ -60,13 +59,13 @@ public abstract class AbstractValue {
 
 	@Size(max = 350)
 	private String codeTypeAndKind;
-	
+
 	@Size(max = 255)
 	protected String stringValue;
 
 	@Size(max = 255)
 	protected String codeValue;
-	
+
 	@Size(max = 512)
 	private String fileValue;
 
@@ -77,32 +76,32 @@ public abstract class AbstractValue {
 	@DateTimeFormat(style = "MM")
 	private Date dateValue;
 
-	@Column(columnDefinition="text")
-    @Basic(fetch = FetchType.LAZY)
-    private String clobValue;
-    
-    @Basic(fetch = FetchType.LAZY)
-    private byte[] blobValue;
-    
+	@Column(columnDefinition = "text")
+	@Basic(fetch = FetchType.LAZY)
+	private String clobValue;
+
+	@Basic(fetch = FetchType.LAZY)
+	private byte[] blobValue;
+
 	@Size(max = 25)
 	private String operatorType;
 
-    @Size(max = 10)
+	@Size(max = 10)
 	private String operatorKind;
-    
+
 	@Size(max = 50)
 	private String operatorTypeAndKind;
 
-	@Column(precision=38, scale=18)
+	@Column(precision = 38, scale = 18)
 	private BigDecimal numericValue;
 
 	private Integer sigFigs;
-	
-	@Column(precision=38, scale=18)
+
+	@Column(precision = 38, scale = 18)
 	private BigDecimal uncertainty;
-	
+
 	private Integer numberOfReplicates;
-	
+
 	@Size(max = 255)
 	private String uncertaintyType;
 
@@ -111,31 +110,31 @@ public abstract class AbstractValue {
 
 	@Size(max = 25)
 	private String unitKind;
-	
+
 	@Size(max = 55)
 	private String unitTypeAndKind;
-	
+
 	private Double concentration;
-	
+
 	@Size(max = 25)
 	private String concUnit;
-	
+
 	@Size(max = 512)
 	private String comments;
 
 	@NotNull
 	private boolean ignored;
-	
+
 	@NotNull
 	private boolean deleted;
-	
+
 	private Long lsTransaction;
 
 	@NotNull
 	@Temporal(TemporalType.TIMESTAMP)
 	@DateTimeFormat(style = "MM")
 	private Date recordedDate;
-	
+
 	@NotNull
 	@Size(max = 255)
 	private String recordedBy;
@@ -143,20 +142,19 @@ public abstract class AbstractValue {
 	@Temporal(TemporalType.TIMESTAMP)
 	@DateTimeFormat(style = "MM")
 	private Date modifiedDate;
-	
+
 	@Size(max = 255)
 	private String modifiedBy;
-	
 
 	@NotNull
 	private boolean publicData;
 
 	@Id
-	@SequenceGenerator(name = "abstractValueGen", sequenceName = "VALUE_PKSEQ", allocationSize=50)
+	@SequenceGenerator(name = "abstractValueGen", sequenceName = "VALUE_PKSEQ", allocationSize = 50)
 	@GeneratedValue(strategy = GenerationType.AUTO, generator = "abstractValueGen")
 	@Column(name = "id")
 	private Long id;
-  
+
 	public Long getId() {
 		return this.id;
 	}
@@ -165,70 +163,76 @@ public void setId(Long id) {
 		this.id = id;
 	}
 
-    public void setLsTypeAndKind(String lsTypeAndKind) {
-        this.lsTypeAndKind = lsTypeAndKind;
-    }
-    
-    public void setOperatorTypeAndKind(String operatorTypeAndKind) {
-    	this.operatorTypeAndKind = operatorTypeAndKind;
-    }
-    
-    public void setUnitTypeAndKind(String unitTypeAndKind) {
-        this.unitTypeAndKind = unitTypeAndKind;
-    }
-    
-    public void setNumericValue(BigDecimal numericValue) {
-        this.numericValue = numericValue;
-    }
-    
-
-    public boolean getIgnored() {
-        return this.ignored;
-    }
-
-    public boolean getPublicData() {
-        return this.publicData;
-    }
-
-    public boolean getDeleted() {
-        return this.deleted;
-    }
-    
+	public void setLsTypeAndKind(String lsTypeAndKind) {
+		this.lsTypeAndKind = lsTypeAndKind;
+	}
+
+	public void setOperatorTypeAndKind(String operatorTypeAndKind) {
+		this.operatorTypeAndKind = operatorTypeAndKind;
+	}
+
+	public void setUnitTypeAndKind(String unitTypeAndKind) {
+		this.unitTypeAndKind = unitTypeAndKind;
+	}
+
+	public void setNumericValue(BigDecimal numericValue) {
+		this.numericValue = numericValue;
+	}
+
+	public boolean getIgnored() {
+		return this.ignored;
+	}
+
+	public boolean getPublicData() {
+		return this.publicData;
+	}
+
+	public boolean getDeleted() {
+		return this.deleted;
+	}
+
 	@PersistenceContext
 	transient EntityManager entityManager;
 
 	public static final EntityManager entityManager() {
 		EntityManager em = new AbstractValue() {
 		}.entityManager;
-		if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+		if (em == null)
+			throw new IllegalStateException(
+					"Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
 		return em;
 	}
 
 	@Transactional
 	public void persist() {
-		if (this.entityManager == null) this.entityManager = entityManager();
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
 		this.setLsTypeAndKind(new StringBuilder().append(this.lsType).append("_").append(this.lsKind).toString());
 		this.setCodeTypeAndKind(new StringBuilder().append(this.codeType).append("_").append(this.codeKind).toString());
 		this.setUnitTypeAndKind(new StringBuilder().append(this.unitType).append("_").append(this.unitKind).toString());
-		this.setOperatorTypeAndKind(new StringBuilder().append(this.operatorType).append("_").append(this.operatorKind).toString());
-		if (this.recordedDate == null) this.recordedDate = new Date();
+		this.setOperatorTypeAndKind(
+				new StringBuilder().append(this.operatorType).append("_").append(this.operatorKind).toString());
+		if (this.recordedDate == null)
+			this.recordedDate = new Date();
 		this.entityManager.persist(this);
 	}
 
 	@Transactional
 	public AbstractValue merge() {
-		if (this.entityManager == null) this.entityManager = entityManager();
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
 		this.setLsTypeAndKind(new StringBuilder().append(this.lsType).append("_").append(this.lsKind).toString());
 		this.setCodeTypeAndKind(new StringBuilder().append(this.codeType).append("_").append(this.codeKind).toString());
 		this.setUnitTypeAndKind(new StringBuilder().append(this.unitType).append("_").append(this.unitKind).toString());
-		this.setOperatorTypeAndKind(new StringBuilder().append(this.operatorType).append("_").append(this.operatorKind).toString());
+		this.setOperatorTypeAndKind(
+				new StringBuilder().append(this.operatorType).append("_").append(this.operatorKind).toString());
 		this.modifiedDate = new Date();
 		AbstractValue merged = this.entityManager.merge(this);
 		this.entityManager.flush();
 		return merged;
 	}
 
-	public static String[] getColumns(){
+	public static String[] getColumns() {
 		String[] headerColumns = new String[] {
 				"id",
 				"lsType",
@@ -237,7 +241,7 @@ public static String[] getColumns(){
 				"codeKind",
 				"codeValue",
 				"stringValue",
-				
+
 				"fileValue",
 				"urlValue",
 				"dateValue",
@@ -248,7 +252,7 @@ public static String[] getColumns(){
 				"sigFigs",
 				"uncertainty",
 				"numberOfReplicates",
-				
+
 				"uncertaintyType",
 				"unitType",
 				"unitKind",
@@ -259,17 +263,17 @@ public static String[] getColumns(){
 				"recordedBy",
 				"modifiedDate",
 				"modifiedBy",
-				
+
 				"publicData"
 		};
-//31 columns
+		// 31 columns
 		return headerColumns;
 
 	}
 
 	public static CellProcessor[] getProcessors() {
-		final CellProcessor[] processors = new CellProcessor[] { 
-				
+		final CellProcessor[] processors = new CellProcessor[] {
+
 				new Optional(),
 				new Optional(),
 				new Optional(),
@@ -302,364 +306,373 @@ public static CellProcessor[] getProcessors() {
 
 				new Optional()
 
-
 		};
 
 		return processors;
 	}
-	
-	
-	
 
 	public String getLsType() {
-        return this.lsType;
-    }
+		return this.lsType;
+	}
 
 	public void setLsType(String lsType) {
-        this.lsType = lsType;
-    }
+		this.lsType = lsType;
+	}
 
 	public String getLsKind() {
-        return this.lsKind;
-    }
+		return this.lsKind;
+	}
 
 	public void setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
+		this.lsKind = lsKind;
+	}
 
 	public String getLsTypeAndKind() {
-        return this.lsTypeAndKind;
-    }
+		return this.lsTypeAndKind;
+	}
 
 	public String getCodeOrigin() {
-        return this.codeOrigin;
-    }
+		return this.codeOrigin;
+	}
 
 	public void setCodeOrigin(String codeOrigin) {
-        this.codeOrigin = codeOrigin;
-    }
+		this.codeOrigin = codeOrigin;
+	}
 
 	public String getCodeType() {
-        return this.codeType;
-    }
+		return this.codeType;
+	}
 
 	public void setCodeType(String codeType) {
-        this.codeType = codeType;
-    }
+		this.codeType = codeType;
+	}
 
 	public String getCodeKind() {
-        return this.codeKind;
-    }
+		return this.codeKind;
+	}
 
 	public void setCodeKind(String codeKind) {
-        this.codeKind = codeKind;
-    }
+		this.codeKind = codeKind;
+	}
 
 	public String getCodeTypeAndKind() {
-        return this.codeTypeAndKind;
-    }
+		return this.codeTypeAndKind;
+	}
 
 	public void setCodeTypeAndKind(String codeTypeAndKind) {
-        this.codeTypeAndKind = codeTypeAndKind;
-    }
+		this.codeTypeAndKind = codeTypeAndKind;
+	}
 
 	public String getStringValue() {
-        return this.stringValue;
-    }
+		return this.stringValue;
+	}
 
 	public void setStringValue(String stringValue) {
-        this.stringValue = stringValue;
-    }
+		this.stringValue = stringValue;
+	}
 
 	public String getCodeValue() {
-        return this.codeValue;
-    }
+		return this.codeValue;
+	}
 
 	public void setCodeValue(String codeValue) {
-        this.codeValue = codeValue;
-    }
+		this.codeValue = codeValue;
+	}
 
 	public String getFileValue() {
-        return this.fileValue;
-    }
+		return this.fileValue;
+	}
 
 	public void setFileValue(String fileValue) {
-        this.fileValue = fileValue;
-    }
+		this.fileValue = fileValue;
+	}
 
 	public String getUrlValue() {
-        return this.urlValue;
-    }
+		return this.urlValue;
+	}
 
 	public void setUrlValue(String urlValue) {
-        this.urlValue = urlValue;
-    }
+		this.urlValue = urlValue;
+	}
 
 	public Date getDateValue() {
-        return this.dateValue;
-    }
+		return this.dateValue;
+	}
 
 	public void setDateValue(Date dateValue) {
-        this.dateValue = dateValue;
-    }
+		this.dateValue = dateValue;
+	}
 
 	public String getClobValue() {
-        return this.clobValue;
-    }
+		return this.clobValue;
+	}
 
 	public void setClobValue(String clobValue) {
-        this.clobValue = clobValue;
-    }
+		this.clobValue = clobValue;
+	}
 
 	public byte[] getBlobValue() {
-        return this.blobValue;
-    }
+		return this.blobValue;
+	}
 
 	public void setBlobValue(byte[] blobValue) {
-        this.blobValue = blobValue;
-    }
+		this.blobValue = blobValue;
+	}
 
 	public String getOperatorType() {
-        return this.operatorType;
-    }
+		return this.operatorType;
+	}
 
 	public void setOperatorType(String operatorType) {
-        this.operatorType = operatorType;
-    }
+		this.operatorType = operatorType;
+	}
 
 	public String getOperatorKind() {
-        return this.operatorKind;
-    }
+		return this.operatorKind;
+	}
 
 	public void setOperatorKind(String operatorKind) {
-        this.operatorKind = operatorKind;
-    }
+		this.operatorKind = operatorKind;
+	}
 
 	public String getOperatorTypeAndKind() {
-        return this.operatorTypeAndKind;
-    }
+		return this.operatorTypeAndKind;
+	}
 
 	public BigDecimal getNumericValue() {
-        return this.numericValue;
-    }
+		return this.numericValue;
+	}
 
 	public Integer getSigFigs() {
-        return this.sigFigs;
-    }
+		return this.sigFigs;
+	}
 
 	public void setSigFigs(Integer sigFigs) {
-        this.sigFigs = sigFigs;
-    }
+		this.sigFigs = sigFigs;
+	}
 
 	public BigDecimal getUncertainty() {
-        return this.uncertainty;
-    }
+		return this.uncertainty;
+	}
 
 	public void setUncertainty(BigDecimal uncertainty) {
-        this.uncertainty = uncertainty;
-    }
+		this.uncertainty = uncertainty;
+	}
 
 	public Integer getNumberOfReplicates() {
-        return this.numberOfReplicates;
-    }
+		return this.numberOfReplicates;
+	}
 
 	public void setNumberOfReplicates(Integer numberOfReplicates) {
-        this.numberOfReplicates = numberOfReplicates;
-    }
+		this.numberOfReplicates = numberOfReplicates;
+	}
 
 	public String getUncertaintyType() {
-        return this.uncertaintyType;
-    }
+		return this.uncertaintyType;
+	}
 
 	public void setUncertaintyType(String uncertaintyType) {
-        this.uncertaintyType = uncertaintyType;
-    }
+		this.uncertaintyType = uncertaintyType;
+	}
 
 	public String getUnitType() {
-        return this.unitType;
-    }
+		return this.unitType;
+	}
 
 	public void setUnitType(String unitType) {
-        this.unitType = unitType;
-    }
+		this.unitType = unitType;
+	}
 
 	public String getUnitKind() {
-        return this.unitKind;
-    }
+		return this.unitKind;
+	}
 
 	public void setUnitKind(String unitKind) {
-        this.unitKind = unitKind;
-    }
+		this.unitKind = unitKind;
+	}
 
 	public String getUnitTypeAndKind() {
-        return this.unitTypeAndKind;
-    }
+		return this.unitTypeAndKind;
+	}
 
 	public Double getConcentration() {
-        return this.concentration;
-    }
+		return this.concentration;
+	}
 
 	public void setConcentration(Double concentration) {
-        this.concentration = concentration;
-    }
+		this.concentration = concentration;
+	}
 
 	public String getConcUnit() {
-        return this.concUnit;
-    }
+		return this.concUnit;
+	}
 
 	public void setConcUnit(String concUnit) {
-        this.concUnit = concUnit;
-    }
+		this.concUnit = concUnit;
+	}
 
 	public String getComments() {
-        return this.comments;
-    }
+		return this.comments;
+	}
 
 	public void setComments(String comments) {
-        this.comments = comments;
-    }
+		this.comments = comments;
+	}
 
 	public boolean isIgnored() {
-        return this.ignored;
-    }
+		return this.ignored;
+	}
 
 	public void setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
+		this.ignored = ignored;
+	}
 
 	public boolean isDeleted() {
-        return this.deleted;
-    }
+		return this.deleted;
+	}
 
 	public void setDeleted(boolean deleted) {
-        this.deleted = deleted;
-    }
+		this.deleted = deleted;
+	}
 
 	public Long getLsTransaction() {
-        return this.lsTransaction;
-    }
+		return this.lsTransaction;
+	}
 
 	public void setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
+		this.lsTransaction = lsTransaction;
+	}
 
 	public Date getRecordedDate() {
-        return this.recordedDate;
-    }
+		return this.recordedDate;
+	}
 
 	public void setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
+		this.recordedDate = recordedDate;
+	}
 
 	public String getRecordedBy() {
-        return this.recordedBy;
-    }
+		return this.recordedBy;
+	}
 
 	public void setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
+		this.recordedBy = recordedBy;
+	}
 
 	public Date getModifiedDate() {
-        return this.modifiedDate;
-    }
+		return this.modifiedDate;
+	}
 
 	public void setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
+		this.modifiedDate = modifiedDate;
+	}
 
 	public String getModifiedBy() {
-        return this.modifiedBy;
-    }
+		return this.modifiedBy;
+	}
 
 	public void setModifiedBy(String modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
+		this.modifiedBy = modifiedBy;
+	}
 
 	public boolean isPublicData() {
-        return this.publicData;
-    }
+		return this.publicData;
+	}
 
 	public void setPublicData(boolean publicData) {
-        this.publicData = publicData;
-    }
+		this.publicData = publicData;
+	}
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "lsKind", "lsTypeAndKind", "codeOrigin", "codeType", "codeKind", "codeTypeAndKind", "stringValue", "codeValue", "fileValue", "urlValue", "dateValue", "clobValue", "blobValue", "operatorType", "operatorKind", "operatorTypeAndKind", "numericValue", "sigFigs", "uncertainty", "numberOfReplicates", "uncertaintyType", "unitType", "unitKind", "unitTypeAndKind", "concentration", "concUnit", "comments", "ignored", "deleted", "lsTransaction", "recordedDate", "recordedBy", "modifiedDate", "modifiedBy", "publicData", "id", "entityManager");
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "lsKind",
+			"lsTypeAndKind", "codeOrigin", "codeType", "codeKind", "codeTypeAndKind", "stringValue", "codeValue",
+			"fileValue", "urlValue", "dateValue", "clobValue", "blobValue", "operatorType", "operatorKind",
+			"operatorTypeAndKind", "numericValue", "sigFigs", "uncertainty", "numberOfReplicates", "uncertaintyType",
+			"unitType", "unitKind", "unitTypeAndKind", "concentration", "concUnit", "comments", "ignored", "deleted",
+			"lsTransaction", "recordedDate", "recordedBy", "modifiedDate", "modifiedBy", "publicData", "id",
+			"entityManager");
 
 	public static long countAbstractValues() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM AbstractValue o", Long.class).getSingleResult();
-    }
+		return entityManager().createQuery("SELECT COUNT(o) FROM AbstractValue o", Long.class).getSingleResult();
+	}
 
 	public static List<AbstractValue> findAllAbstractValues() {
-        return entityManager().createQuery("SELECT o FROM AbstractValue o", AbstractValue.class).getResultList();
-    }
+		return entityManager().createQuery("SELECT o FROM AbstractValue o", AbstractValue.class).getResultList();
+	}
 
 	public static List<AbstractValue> findAllAbstractValues(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AbstractValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AbstractValue.class).getResultList();
-    }
+		String jpaQuery = "SELECT o FROM AbstractValue o";
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				jpaQuery = jpaQuery + " " + sortOrder;
+			}
+		}
+		return entityManager().createQuery(jpaQuery, AbstractValue.class).getResultList();
+	}
 
 	public static AbstractValue findAbstractValue(Long id) {
-        if (id == null) return null;
-        return entityManager().find(AbstractValue.class, id);
-    }
+		if (id == null)
+			return null;
+		return entityManager().find(AbstractValue.class, id);
+	}
 
 	public static List<AbstractValue> findAbstractValueEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM AbstractValue o", AbstractValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-
-	public static List<AbstractValue> findAbstractValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AbstractValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AbstractValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
+		return entityManager().createQuery("SELECT o FROM AbstractValue o", AbstractValue.class)
+				.setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+	}
+
+	public static List<AbstractValue> findAbstractValueEntries(int firstResult, int maxResults, String sortFieldName,
+			String sortOrder) {
+		String jpaQuery = "SELECT o FROM AbstractValue o";
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				jpaQuery = jpaQuery + " " + sortOrder;
+			}
+		}
+		return entityManager().createQuery(jpaQuery, AbstractValue.class).setFirstResult(firstResult)
+				.setMaxResults(maxResults).getResultList();
+	}
 
 	@Transactional
-    public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            AbstractValue attached = AbstractValue.findAbstractValue(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
+	public void remove() {
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
+		if (this.entityManager.contains(this)) {
+			this.entityManager.remove(this);
+		} else {
+			AbstractValue attached = AbstractValue.findAbstractValue(this.id);
+			this.entityManager.remove(attached);
+		}
+	}
 
 	@Transactional
-    public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
+	public void flush() {
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
+		this.entityManager.flush();
+	}
 
 	@Transactional
-    public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
+	public void clear() {
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
+		this.entityManager.clear();
+	}
 
 	@Version
-    @Column(name = "version")
-    private Integer version;
+	@Column(name = "version")
+	private Integer version;
 
 	public Integer getVersion() {
-        return this.version;
-    }
+		return this.version;
+	}
 
 	public void setVersion(Integer version) {
-        this.version = version;
-    }
+		this.version = version;
+	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroup.java b/src/main/java/com/labsynch/labseer/domain/AnalysisGroup.java
index 4f1c718f0..2bbb444ce 100755
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroup.java
+++ b/src/main/java/com/labsynch/labseer/domain/AnalysisGroup.java
@@ -38,22 +38,24 @@
 public class AnalysisGroup extends AbstractThing {
 
     private static final Logger logger = LoggerFactory.getLogger(AnalysisGroup.class);
-    
-    //Subject is grandparent
-    @ManyToMany(cascade = {CascadeType.PERSIST, CascadeType.MERGE}, fetch = FetchType.LAZY)
-    @JoinTable(name = "EXPERIMENT_ANALYSISGROUP", joinColumns = { @javax.persistence.JoinColumn(name = "analysis_group_id") }, inverseJoinColumns = { @javax.persistence.JoinColumn(name = "experiment_id") })
+
+    // Subject is grandparent
+    @ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE }, fetch = FetchType.LAZY)
+    @JoinTable(name = "EXPERIMENT_ANALYSISGROUP", joinColumns = {
+            @javax.persistence.JoinColumn(name = "analysis_group_id") }, inverseJoinColumns = {
+                    @javax.persistence.JoinColumn(name = "experiment_id") })
     private Set<Experiment> experiments = new HashSet<Experiment>();
-    
+
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "analysisGroup", fetch = FetchType.LAZY)
     private Set<AnalysisGroupLabel> lsLabels = new HashSet<AnalysisGroupLabel>();
 
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "analysisGroup", fetch = FetchType.LAZY)
     private Set<AnalysisGroupState> lsStates = new HashSet<AnalysisGroupState>();
 
-    //Subject is grandparent
-    @ManyToMany(cascade = {CascadeType.PERSIST, CascadeType.MERGE}, mappedBy = "analysisGroups")
+    // Subject is grandparent
+    @ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE }, mappedBy = "analysisGroups")
     private Set<TreatmentGroup> treatmentGroups = new HashSet<TreatmentGroup>();
-    
+
     public AnalysisGroup() {
     }
 
@@ -95,95 +97,141 @@ public AnalysisGroup(FlatThingCsvDTO analysisGroupDTO) {
         this.setLsType(analysisGroupDTO.getLsType());
     }
 
-    public static com.labsynch.labseer.domain.AnalysisGroup update(com.labsynch.labseer.domain.AnalysisGroup analysisGroup) {
-		if (AnalysisGroup.findAnalysisGroup(analysisGroup.getId()) != null){        
-			AnalysisGroup updatedAnalysisGroup = AnalysisGroup.findAnalysisGroup(analysisGroup.getId());
-        	if(analysisGroup.getRecordedBy() != null) updatedAnalysisGroup.setRecordedBy(analysisGroup.getRecordedBy());
-        	if(analysisGroup.getRecordedDate() != null) updatedAnalysisGroup.setRecordedDate(analysisGroup.getRecordedDate());
-        	if(analysisGroup.getLsTransaction() != null) updatedAnalysisGroup.setLsTransaction(analysisGroup.getLsTransaction());
-        	if(analysisGroup.getModifiedBy() != null) updatedAnalysisGroup.setModifiedBy(analysisGroup.getModifiedBy());
-        	updatedAnalysisGroup.setModifiedDate(new Date());
-        	if(analysisGroup.getCodeName() != null) updatedAnalysisGroup.setCodeName(analysisGroup.getCodeName());
-        	if(analysisGroup.getLsKind() != null) updatedAnalysisGroup.setLsKind(analysisGroup.getLsKind());
-        	if(analysisGroup.getLsType() != null) updatedAnalysisGroup.setLsType(analysisGroup.getLsType());
-        	for (Experiment experiment : analysisGroup.getExperiments()) {
-          	  updatedAnalysisGroup.getExperiments().add(experiment);
-        	}
-        	return updatedAnalysisGroup;
-		} else {
-    		logger.error("DID not find the requested analysis group " + analysisGroup.getId() );
-    		return null;
-		}
+    public static com.labsynch.labseer.domain.AnalysisGroup update(
+            com.labsynch.labseer.domain.AnalysisGroup analysisGroup) {
+        if (AnalysisGroup.findAnalysisGroup(analysisGroup.getId()) != null) {
+            AnalysisGroup updatedAnalysisGroup = AnalysisGroup.findAnalysisGroup(analysisGroup.getId());
+            if (analysisGroup.getRecordedBy() != null)
+                updatedAnalysisGroup.setRecordedBy(analysisGroup.getRecordedBy());
+            if (analysisGroup.getRecordedDate() != null)
+                updatedAnalysisGroup.setRecordedDate(analysisGroup.getRecordedDate());
+            if (analysisGroup.getLsTransaction() != null)
+                updatedAnalysisGroup.setLsTransaction(analysisGroup.getLsTransaction());
+            if (analysisGroup.getModifiedBy() != null)
+                updatedAnalysisGroup.setModifiedBy(analysisGroup.getModifiedBy());
+            updatedAnalysisGroup.setModifiedDate(new Date());
+            if (analysisGroup.getCodeName() != null)
+                updatedAnalysisGroup.setCodeName(analysisGroup.getCodeName());
+            if (analysisGroup.getLsKind() != null)
+                updatedAnalysisGroup.setLsKind(analysisGroup.getLsKind());
+            if (analysisGroup.getLsType() != null)
+                updatedAnalysisGroup.setLsType(analysisGroup.getLsType());
+            for (Experiment experiment : analysisGroup.getExperiments()) {
+                updatedAnalysisGroup.getExperiments().add(experiment);
+            }
+            return updatedAnalysisGroup;
+        } else {
+            logger.error("DID not find the requested analysis group " + analysisGroup.getId());
+            return null;
+        }
     }
 
     public String toFullJson() {
-        return new JSONSerializer().exclude("*.class", "lsStates.analysisGroup", "lsLabels.analysisGroup", "treatmentGroups.analysisGroup", "experiment.protocol").include("lsLabels", "lsStates.lsValues", "treatmentGroups.lsStates.lsValues", "treatmentGroups.lsLabels", "treatmentGroups.subjects.lsStates.lsValues", "treatmentGroups.subjects.lsLabels").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "lsStates.analysisGroup", "lsLabels.analysisGroup", "treatmentGroups.analysisGroup",
+                        "experiment.protocol")
+                .include("lsLabels", "lsStates.lsValues", "treatmentGroups.lsStates.lsValues",
+                        "treatmentGroups.lsLabels", "treatmentGroups.subjects.lsStates.lsValues",
+                        "treatmentGroups.subjects.lsLabels")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     public String toPrettyFullJson() {
-        return new JSONSerializer().exclude("*.class", "lsStates.analysisGroup", "lsLabels.analysisGroup", "treatmentGroups.analysisGroup", "experiments.protocol", "experiment.protocol").include("experiments", "lsLabels", "lsStates.lsValues", "treatmentGroups.lsStates.lsValues", "treatmentGroups.lsLabels", "treatmentGroups.subjects.lsStates.lsValues", "treatmentGroups.subjects.lsLabels").prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "lsStates.analysisGroup", "lsLabels.analysisGroup", "treatmentGroups.analysisGroup",
+                        "experiments.protocol", "experiment.protocol")
+                .include("experiments", "lsLabels", "lsStates.lsValues", "treatmentGroups.lsStates.lsValues",
+                        "treatmentGroups.lsLabels", "treatmentGroups.subjects.lsStates.lsValues",
+                        "treatmentGroups.subjects.lsLabels")
+                .prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     public String toJson() {
-        return new JSONSerializer().exclude("*.class", "lsStates.analysisGroup", "lsLabels.analysisGroup", "treatmentGroups.analysisGroup", "experiments.protocol").include("lsLabels", "lsStates.lsValues", "treatmentGroups.lsStates.lsValues").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "lsStates.analysisGroup", "lsLabels.analysisGroup", "treatmentGroups.analysisGroup",
+                        "experiments.protocol")
+                .include("lsLabels", "lsStates.lsValues", "treatmentGroups.lsStates.lsValues")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     public String toJsonStub() {
-        return new JSONSerializer().exclude("*.class", "lsStates.analysisGroup", "lsLabels.analysisGroup", "treatmentGroups.analysisGroup", "experiment.protocol").include("lsLabels", "lsStates.lsValues").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "lsStates.analysisGroup", "lsLabels.analysisGroup", "treatmentGroups.analysisGroup",
+                        "experiment.protocol")
+                .include("lsLabels", "lsStates.lsValues").transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     public String toPrettyJson() {
-        return new JSONSerializer().exclude("*.class", "lsStates.analysisGroup", "lsLabels.analysisGroup", "treatmentGroups.analysisGroup", "experiment.protocol").include("lsLabels", "lsStates.lsValues", "treatmentGroups.lsStates.lsValues").prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "lsStates.analysisGroup", "lsLabels.analysisGroup", "treatmentGroups.analysisGroup",
+                        "experiment.protocol")
+                .include("lsLabels", "lsStates.lsValues", "treatmentGroups.lsStates.lsValues").prettyPrint(true)
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     public String toPrettyJsonStub() {
-        return new JSONSerializer().exclude("*.class", "lsStates.analysisGroup", "lsLabels.analysisGroup", "treatmentGroups.analysisGroup", "experiment.protocol").include("lsLabels", "lsStates.lsValues").prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "lsStates.analysisGroup", "lsLabels.analysisGroup", "treatmentGroups.analysisGroup",
+                        "experiment.protocol")
+                .include("lsLabels", "lsStates.lsValues").prettyPrint(true).transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
 
     public static String toJsonArray(Collection<com.labsynch.labseer.domain.AnalysisGroup> collection) {
-        return new JSONSerializer().exclude("*.class", "experiment.protocol").transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer().exclude("*.class", "experiment.protocol").transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
 
     public static com.labsynch.labseer.domain.AnalysisGroup fromJsonToAnalysisGroup(String json) {
-        return new JSONDeserializer<AnalysisGroup>().use(null, AnalysisGroup.class).use("analysisGroup.lsStates", AnalysisGroupState.class).use("analysisGroup.lsStates.lsValues", AnalysisGroupValue.class).deserialize(json, AnalysisGroup.class);
+        return new JSONDeserializer<AnalysisGroup>().use(null, AnalysisGroup.class)
+                .use("analysisGroup.lsStates", AnalysisGroupState.class)
+                .use("analysisGroup.lsStates.lsValues", AnalysisGroupValue.class)
+                .deserialize(json, AnalysisGroup.class);
     }
 
     public static com.labsynch.labseer.domain.AnalysisGroup fromJsonToAnalysisGroup2(Reader json) {
-        return new JSONDeserializer<AnalysisGroup>().use(null, AnalysisGroup.class).use("analysisGroup.lsStates", AnalysisGroupState.class).use("analysisGroup.lsStates.lsValues", AnalysisGroupValue.class).deserialize(json);
+        return new JSONDeserializer<AnalysisGroup>().use(null, AnalysisGroup.class)
+                .use("analysisGroup.lsStates", AnalysisGroupState.class)
+                .use("analysisGroup.lsStates.lsValues", AnalysisGroupValue.class).deserialize(json);
     }
 
     public static Collection<com.labsynch.labseer.domain.AnalysisGroup> fromJsonArrayToAnalysisGroups(Reader json) {
-        return new JSONDeserializer<List<AnalysisGroup>>().use(null, ArrayList.class).use("values", AnalysisGroup.class).deserialize(json);
+        return new JSONDeserializer<List<AnalysisGroup>>().use(null, ArrayList.class).use("values", AnalysisGroup.class)
+                .deserialize(json);
     }
 
     public static Collection<com.labsynch.labseer.domain.AnalysisGroup> fromJsonArrayToAnalysisGroups(String json) {
-        return new JSONDeserializer<List<AnalysisGroup>>().use(null, ArrayList.class).use("values", AnalysisGroup.class).deserialize(json);
+        return new JSONDeserializer<List<AnalysisGroup>>().use(null, ArrayList.class).use("values", AnalysisGroup.class)
+                .deserialize(json);
     }
 
-    //@Transactional
-    //TODO: later fix with direct hsql if possible
+    // @Transactional
+    // TODO: later fix with direct hsql if possible
     public static int deleteByExperimentID(Long experimentId) {
-//        Experiment experiment = Experiment.findExperiment(experimentId);
-//        Set<Experiment> experiments = new HashSet<Experiment>();
-//        experiments.add(experiment);
-//        List<AnalysisGroup> analysisgroups = AnalysisGroup.findAnalysisGroupsByExperiments(experiments).getResultList();
-//        int numberOfAnalysisGroups = analysisgroups.size();
-//        for (AnalysisGroup analysisgroup : analysisgroups) {
-//            logger.debug("removing analysis group: " + analysisgroup.getCodeName());
-//            analysisgroup.remove();
-//        }
-//        
-//        return numberOfAnalysisGroups;
-        
-        if (experimentId == null) return 0;
+        // Experiment experiment = Experiment.findExperiment(experimentId);
+        // Set<Experiment> experiments = new HashSet<Experiment>();
+        // experiments.add(experiment);
+        // List<AnalysisGroup> analysisgroups =
+        // AnalysisGroup.findAnalysisGroupsByExperiments(experiments).getResultList();
+        // int numberOfAnalysisGroups = analysisgroups.size();
+        // for (AnalysisGroup analysisgroup : analysisgroups) {
+        // logger.debug("removing analysis group: " + analysisgroup.getCodeName());
+        // analysisgroup.remove();
+        // }
+        //
+        // return numberOfAnalysisGroups;
+
+        if (experimentId == null)
+            return 0;
         EntityManager em = SubjectValue.entityManager();
-        
-        Query q1 = em.createQuery("SELECT ag.id FROM AnalysisGroup as ag JOIN ag.experiments exp WHERE exp.id = :experimentId");
+
+        Query q1 = em.createQuery(
+                "SELECT ag.id FROM AnalysisGroup as ag JOIN ag.experiments exp WHERE exp.id = :experimentId");
         q1.setParameter("experimentId", experimentId);
         @SuppressWarnings("unchecked")
-		List<Long> agIds = q1.getResultList();
+        List<Long> agIds = q1.getResultList();
         logger.info("Found number of agroups: " + agIds.size());
-        
+
         Query q2 = em.createNativeQuery("DELETE FROM experiment_analysisgroup o WHERE o.experiment_id = :experimentId");
         q2.setParameter("experimentId", experimentId);
         int numberOfDeletes = q2.executeUpdate();
@@ -195,23 +243,24 @@ public static int deleteByExperimentID(Long experimentId) {
         int numberOfDeletedEntities = q.executeUpdate();
         logger.info("Deleted number of numberOfDeletedEntities: " + numberOfDeletedEntities);
 
-        
         return numberOfDeletedEntities;
-//        return 0;
-    }
-    
-//    public static int removeOrphans() {
-//    	Set<Experiment> emptySet = new HashSet<Experiment>();
-//    	emptySet.add(null);
-//    	List<AnalysisGroup> orphansList = AnalysisGroup.findAnalysisGroupsByExperimentsAndIgnoredNot(emptySet, !false).getResultList();
-//    	int numberOfOrphans = orphansList.size();
-//    	for (AnalysisGroup orphan: orphansList) {
-//    		orphan.remove();
-//    	}
-//    	return numberOfOrphans;
-//    }
-    
-    //@Transactional
+        // return 0;
+    }
+
+    // public static int removeOrphans() {
+    // Set<Experiment> emptySet = new HashSet<Experiment>();
+    // emptySet.add(null);
+    // List<AnalysisGroup> orphansList =
+    // AnalysisGroup.findAnalysisGroupsByExperimentsAndIgnoredNot(emptySet,
+    // !false).getResultList();
+    // int numberOfOrphans = orphansList.size();
+    // for (AnalysisGroup orphan: orphansList) {
+    // orphan.remove();
+    // }
+    // return numberOfOrphans;
+    // }
+
+    // @Transactional
     public static void removeByExperimentID(Long id) {
         Experiment experiment = Experiment.findExperiment(id);
         Set<Experiment> experiments = new HashSet<Experiment>();
@@ -219,84 +268,95 @@ public static void removeByExperimentID(Long id) {
         List<AnalysisGroup> analysisgroups = AnalysisGroup.findAnalysisGroupsByExperiments(experiments).getResultList();
         for (AnalysisGroup analysisgroup : analysisgroups) {
             logger.debug("removing analysis group: " + analysisgroup.getCodeName());
-            //analysisgroup.getTreatmentGroups().clear();
+            // analysisgroup.getTreatmentGroups().clear();
             analysisgroup.remove();
         }
     }
 
-    public static TypedQuery<com.labsynch.labseer.domain.AnalysisGroup> findAnalysisGroupsByExperimentIdAndIgnored(Long id, boolean includeIgnored) {
-        if (id == null) throw new IllegalArgumentException("The id argument is required");
+    public static TypedQuery<com.labsynch.labseer.domain.AnalysisGroup> findAnalysisGroupsByExperimentIdAndIgnored(
+            Long id, boolean includeIgnored) {
+        if (id == null)
+            throw new IllegalArgumentException("The id argument is required");
         Experiment experiment = Experiment.findExperiment(id);
         Set<Experiment> experiments = new HashSet<Experiment>();
         experiments.add(experiment);
-        //EntityManager em = Experiment.entityManager();
-        //String sqlQuery;
-//        if (includeIgnored) {
-//            sqlQuery = "SELECT o FROM AnalysisGroup AS o WHERE AnalysisGroup IN (SELECT o FROM AnalysisGroup o JOIN o.experiments e WHERE e.id = :experimentId)";
-//        } else {
-//            sqlQuery = "SELECT o FROM AnalysisGroup AS o WHERE AnalysisGroup IN (SELECT o FROM AnalysisGroup o JOIN o.experiments e WHERE e.id = :experimentId) AND o.ignored != true";
-//        }
-//        TypedQuery<AnalysisGroup> q1 = em.createQuery(sqlQuery, AnalysisGroup.class);
-        TypedQuery<AnalysisGroup> q2 = AnalysisGroup.findAnalysisGroupsByExperimentsAndIgnoredNot(experiments, !includeIgnored);
-//        q1.setParameter("id", id);
-        //q2.setParameter("id", id);
+        // EntityManager em = Experiment.entityManager();
+        // String sqlQuery;
+        // if (includeIgnored) {
+        // sqlQuery = "SELECT o FROM AnalysisGroup AS o WHERE AnalysisGroup IN (SELECT o
+        // FROM AnalysisGroup o JOIN o.experiments e WHERE e.id = :experimentId)";
+        // } else {
+        // sqlQuery = "SELECT o FROM AnalysisGroup AS o WHERE AnalysisGroup IN (SELECT o
+        // FROM AnalysisGroup o JOIN o.experiments e WHERE e.id = :experimentId) AND
+        // o.ignored != true";
+        // }
+        // TypedQuery<AnalysisGroup> q1 = em.createQuery(sqlQuery, AnalysisGroup.class);
+        TypedQuery<AnalysisGroup> q2 = AnalysisGroup.findAnalysisGroupsByExperimentsAndIgnoredNot(experiments,
+                !includeIgnored);
+        // q1.setParameter("id", id);
+        // q2.setParameter("id", id);
         return q2;
     }
 
-    public static TypedQuery<com.labsynch.labseer.domain.AnalysisGroup> findAnalysisGroupsByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static TypedQuery<com.labsynch.labseer.domain.AnalysisGroup> findAnalysisGroupsByCodeNameEquals(
+            String codeName) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = Experiment.entityManager();
-        TypedQuery<AnalysisGroup> q = em.createQuery("SELECT o FROM AnalysisGroup AS o WHERE o.codeName = :codeName", AnalysisGroup.class);
+        TypedQuery<AnalysisGroup> q = em.createQuery("SELECT o FROM AnalysisGroup AS o WHERE o.codeName = :codeName",
+                AnalysisGroup.class);
         q.setParameter("codeName", codeName);
         return q;
     }
 
-	@Transactional
+    @Transactional
     public static Collection<Long> removeOrphans(Collection<Long> analysisGroupIds) {
-		Collection<Long> treatmentGroupIds = new HashSet<Long>();
-		for (Long id: analysisGroupIds) {
-			AnalysisGroup analysisGroup = AnalysisGroup.findAnalysisGroup(id);
-			if (analysisGroup.getExperiments().isEmpty()) {
-				treatmentGroupIds.addAll(AnalysisGroup.removeCascadeAware(id));
-			}
-		}
-		
-		return treatmentGroupIds;
-	}
-
-	@Transactional
-	private static Collection<Long> removeCascadeAware(Long id) {
-		AnalysisGroup analysisGroup = findAnalysisGroup(id);
+        Collection<Long> treatmentGroupIds = new HashSet<Long>();
+        for (Long id : analysisGroupIds) {
+            AnalysisGroup analysisGroup = AnalysisGroup.findAnalysisGroup(id);
+            if (analysisGroup.getExperiments().isEmpty()) {
+                treatmentGroupIds.addAll(AnalysisGroup.removeCascadeAware(id));
+            }
+        }
+
+        return treatmentGroupIds;
+    }
+
+    @Transactional
+    private static Collection<Long> removeCascadeAware(Long id) {
+        AnalysisGroup analysisGroup = findAnalysisGroup(id);
         Collection<TreatmentGroup> treatmentGroups = analysisGroup.getTreatmentGroups();
         Set<Long> treatmentGroupIds = new HashSet<Long>();
         for (TreatmentGroup treatmentGroup : treatmentGroups) {
-        	treatmentGroupIds.add(treatmentGroup.getId());
+            treatmentGroupIds.add(treatmentGroup.getId());
         }
         treatmentGroups.clear();
         EntityManager em = AnalysisGroup.entityManager();
-        Query q1 = em.createNativeQuery("DELETE FROM analysisGroup_treatmentgroup o WHERE o.analysis_Group_id = :id", AnalysisGroup.class);
+        Query q1 = em.createNativeQuery("DELETE FROM analysisGroup_treatmentgroup o WHERE o.analysis_Group_id = :id",
+                AnalysisGroup.class);
         q1.setParameter("id", id);
         q1.executeUpdate();
         analysisGroup.remove();
         return treatmentGroupIds;
-		
-	}
 
-	public String toString() {
+    }
+
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "experiments", "lsLabels", "lsStates", "treatmentGroups");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "experiments",
+            "lsLabels", "lsStates", "treatmentGroups");
 
-	public static long countAnalysisGroups() {
+    public static long countAnalysisGroups() {
         return entityManager().createQuery("SELECT COUNT(o) FROM AnalysisGroup o", Long.class).getSingleResult();
     }
 
-	public static List<AnalysisGroup> findAllAnalysisGroups() {
+    public static List<AnalysisGroup> findAllAnalysisGroups() {
         return entityManager().createQuery("SELECT o FROM AnalysisGroup o", AnalysisGroup.class).getResultList();
     }
 
-	public static List<AnalysisGroup> findAllAnalysisGroups(String sortFieldName, String sortOrder) {
+    public static List<AnalysisGroup> findAllAnalysisGroups(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM AnalysisGroup o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -307,16 +367,19 @@ public static List<AnalysisGroup> findAllAnalysisGroups(String sortFieldName, St
         return entityManager().createQuery(jpaQuery, AnalysisGroup.class).getResultList();
     }
 
-	public static AnalysisGroup findAnalysisGroup(Long id) {
-        if (id == null) return null;
+    public static AnalysisGroup findAnalysisGroup(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(AnalysisGroup.class, id);
     }
 
-	public static List<AnalysisGroup> findAnalysisGroupEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM AnalysisGroup o", AnalysisGroup.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<AnalysisGroup> findAnalysisGroupEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM AnalysisGroup o", AnalysisGroup.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<AnalysisGroup> findAnalysisGroupEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<AnalysisGroup> findAnalysisGroupEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM AnalysisGroup o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -324,81 +387,95 @@ public static List<AnalysisGroup> findAnalysisGroupEntries(int firstResult, int
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, AnalysisGroup.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, AnalysisGroup.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public AnalysisGroup merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         AnalysisGroup merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public static Long countFindAnalysisGroupsByExperiments(Set<Experiment> experiments) {
-        if (experiments == null) throw new IllegalArgumentException("The experiments argument is required");
+    public static Long countFindAnalysisGroupsByExperiments(Set<Experiment> experiments) {
+        if (experiments == null)
+            throw new IllegalArgumentException("The experiments argument is required");
         EntityManager em = AnalysisGroup.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT COUNT(o) FROM AnalysisGroup AS o WHERE");
         for (int i = 0; i < experiments.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
+            if (i > 0)
+                queryBuilder.append(" AND");
             queryBuilder.append(" :experiments_item").append(i).append(" MEMBER OF o.experiments");
         }
         TypedQuery q = em.createQuery(queryBuilder.toString(), Long.class);
         int experimentsIndex = 0;
-        for (Experiment _experiment: experiments) {
+        for (Experiment _experiment : experiments) {
             q.setParameter("experiments_item" + experimentsIndex++, _experiment);
         }
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindAnalysisGroupsByExperimentsAndIgnoredNot(Set<Experiment> experiments, boolean ignored) {
-        if (experiments == null) throw new IllegalArgumentException("The experiments argument is required");
+    public static Long countFindAnalysisGroupsByExperimentsAndIgnoredNot(Set<Experiment> experiments, boolean ignored) {
+        if (experiments == null)
+            throw new IllegalArgumentException("The experiments argument is required");
         EntityManager em = AnalysisGroup.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT COUNT(o) FROM AnalysisGroup AS o WHERE o.ignored IS NOT :ignored");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT COUNT(o) FROM AnalysisGroup AS o WHERE o.ignored IS NOT :ignored");
         queryBuilder.append(" AND");
         for (int i = 0; i < experiments.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
+            if (i > 0)
+                queryBuilder.append(" AND");
             queryBuilder.append(" :experiments_item").append(i).append(" MEMBER OF o.experiments");
         }
         TypedQuery q = em.createQuery(queryBuilder.toString(), Long.class);
         int experimentsIndex = 0;
-        for (Experiment _experiment: experiments) {
+        for (Experiment _experiment : experiments) {
             q.setParameter("experiments_item" + experimentsIndex++, _experiment);
         }
         q.setParameter("ignored", ignored);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindAnalysisGroupsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static Long countFindAnalysisGroupsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = AnalysisGroup.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroup AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroup AS o WHERE o.lsTransaction = :lsTransaction",
+                Long.class);
         q.setParameter("lsTransaction", lsTransaction);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<AnalysisGroup> findAnalysisGroupsByExperiments(Set<Experiment> experiments) {
-        if (experiments == null) throw new IllegalArgumentException("The experiments argument is required");
+    public static TypedQuery<AnalysisGroup> findAnalysisGroupsByExperiments(Set<Experiment> experiments) {
+        if (experiments == null)
+            throw new IllegalArgumentException("The experiments argument is required");
         EntityManager em = AnalysisGroup.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroup AS o WHERE");
         for (int i = 0; i < experiments.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
+            if (i > 0)
+                queryBuilder.append(" AND");
             queryBuilder.append(" :experiments_item").append(i).append(" MEMBER OF o.experiments");
         }
         TypedQuery<AnalysisGroup> q = em.createQuery(queryBuilder.toString(), AnalysisGroup.class);
         int experimentsIndex = 0;
-        for (Experiment _experiment: experiments) {
+        for (Experiment _experiment : experiments) {
             q.setParameter("experiments_item" + experimentsIndex++, _experiment);
         }
         return q;
     }
 
-	public static TypedQuery<AnalysisGroup> findAnalysisGroupsByExperiments(Set<Experiment> experiments, String sortFieldName, String sortOrder) {
-        if (experiments == null) throw new IllegalArgumentException("The experiments argument is required");
+    public static TypedQuery<AnalysisGroup> findAnalysisGroupsByExperiments(Set<Experiment> experiments,
+            String sortFieldName, String sortOrder) {
+        if (experiments == null)
+            throw new IllegalArgumentException("The experiments argument is required");
         EntityManager em = AnalysisGroup.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroup AS o WHERE");
         for (int i = 0; i < experiments.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
+            if (i > 0)
+                queryBuilder.append(" AND");
             queryBuilder.append(" :experiments_item").append(i).append(" MEMBER OF o.experiments");
         }
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -409,37 +486,45 @@ public static TypedQuery<AnalysisGroup> findAnalysisGroupsByExperiments(Set<Expe
         }
         TypedQuery<AnalysisGroup> q = em.createQuery(queryBuilder.toString(), AnalysisGroup.class);
         int experimentsIndex = 0;
-        for (Experiment _experiment: experiments) {
+        for (Experiment _experiment : experiments) {
             q.setParameter("experiments_item" + experimentsIndex++, _experiment);
         }
         return q;
     }
 
-	public static TypedQuery<AnalysisGroup> findAnalysisGroupsByExperimentsAndIgnoredNot(Set<Experiment> experiments, boolean ignored) {
-        if (experiments == null) throw new IllegalArgumentException("The experiments argument is required");
+    public static TypedQuery<AnalysisGroup> findAnalysisGroupsByExperimentsAndIgnoredNot(Set<Experiment> experiments,
+            boolean ignored) {
+        if (experiments == null)
+            throw new IllegalArgumentException("The experiments argument is required");
         EntityManager em = AnalysisGroup.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroup AS o WHERE o.ignored IS NOT :ignored");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM AnalysisGroup AS o WHERE o.ignored IS NOT :ignored");
         queryBuilder.append(" AND");
         for (int i = 0; i < experiments.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
+            if (i > 0)
+                queryBuilder.append(" AND");
             queryBuilder.append(" :experiments_item").append(i).append(" MEMBER OF o.experiments");
         }
         TypedQuery<AnalysisGroup> q = em.createQuery(queryBuilder.toString(), AnalysisGroup.class);
         int experimentsIndex = 0;
-        for (Experiment _experiment: experiments) {
+        for (Experiment _experiment : experiments) {
             q.setParameter("experiments_item" + experimentsIndex++, _experiment);
         }
         q.setParameter("ignored", ignored);
         return q;
     }
 
-	public static TypedQuery<AnalysisGroup> findAnalysisGroupsByExperimentsAndIgnoredNot(Set<Experiment> experiments, boolean ignored, String sortFieldName, String sortOrder) {
-        if (experiments == null) throw new IllegalArgumentException("The experiments argument is required");
+    public static TypedQuery<AnalysisGroup> findAnalysisGroupsByExperimentsAndIgnoredNot(Set<Experiment> experiments,
+            boolean ignored, String sortFieldName, String sortOrder) {
+        if (experiments == null)
+            throw new IllegalArgumentException("The experiments argument is required");
         EntityManager em = AnalysisGroup.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroup AS o WHERE o.ignored IS NOT :ignored");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM AnalysisGroup AS o WHERE o.ignored IS NOT :ignored");
         queryBuilder.append(" AND");
         for (int i = 0; i < experiments.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
+            if (i > 0)
+                queryBuilder.append(" AND");
             queryBuilder.append(" :experiments_item").append(i).append(" MEMBER OF o.experiments");
         }
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -450,25 +535,30 @@ public static TypedQuery<AnalysisGroup> findAnalysisGroupsByExperimentsAndIgnore
         }
         TypedQuery<AnalysisGroup> q = em.createQuery(queryBuilder.toString(), AnalysisGroup.class);
         int experimentsIndex = 0;
-        for (Experiment _experiment: experiments) {
+        for (Experiment _experiment : experiments) {
             q.setParameter("experiments_item" + experimentsIndex++, _experiment);
         }
         q.setParameter("ignored", ignored);
         return q;
     }
 
-	public static TypedQuery<AnalysisGroup> findAnalysisGroupsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<AnalysisGroup> findAnalysisGroupsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = AnalysisGroup.entityManager();
-        TypedQuery<AnalysisGroup> q = em.createQuery("SELECT o FROM AnalysisGroup AS o WHERE o.lsTransaction = :lsTransaction", AnalysisGroup.class);
+        TypedQuery<AnalysisGroup> q = em.createQuery(
+                "SELECT o FROM AnalysisGroup AS o WHERE o.lsTransaction = :lsTransaction", AnalysisGroup.class);
         q.setParameter("lsTransaction", lsTransaction);
         return q;
     }
 
-	public static TypedQuery<AnalysisGroup> findAnalysisGroupsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<AnalysisGroup> findAnalysisGroupsByLsTransactionEquals(Long lsTransaction,
+            String sortFieldName, String sortOrder) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = AnalysisGroup.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroup AS o WHERE o.lsTransaction = :lsTransaction");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM AnalysisGroup AS o WHERE o.lsTransaction = :lsTransaction");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -480,35 +570,35 @@ public static TypedQuery<AnalysisGroup> findAnalysisGroupsByLsTransactionEquals(
         return q;
     }
 
-	public Set<Experiment> getExperiments() {
+    public Set<Experiment> getExperiments() {
         return this.experiments;
     }
 
-	public void setExperiments(Set<Experiment> experiments) {
+    public void setExperiments(Set<Experiment> experiments) {
         this.experiments = experiments;
     }
 
-	public Set<AnalysisGroupLabel> getLsLabels() {
+    public Set<AnalysisGroupLabel> getLsLabels() {
         return this.lsLabels;
     }
 
-	public void setLsLabels(Set<AnalysisGroupLabel> lsLabels) {
+    public void setLsLabels(Set<AnalysisGroupLabel> lsLabels) {
         this.lsLabels = lsLabels;
     }
 
-	public Set<AnalysisGroupState> getLsStates() {
+    public Set<AnalysisGroupState> getLsStates() {
         return this.lsStates;
     }
 
-	public void setLsStates(Set<AnalysisGroupState> lsStates) {
+    public void setLsStates(Set<AnalysisGroupState> lsStates) {
         this.lsStates = lsStates;
     }
 
-	public Set<TreatmentGroup> getTreatmentGroups() {
+    public Set<TreatmentGroup> getTreatmentGroups() {
         return this.treatmentGroups;
     }
 
-	public void setTreatmentGroups(Set<TreatmentGroup> treatmentGroups) {
+    public void setTreatmentGroups(Set<TreatmentGroup> treatmentGroups) {
         this.treatmentGroups = treatmentGroups;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel.java b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel.java
index 21a4a07a3..d0b64ca9b 100755
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupLabel.java
@@ -44,113 +44,126 @@ public AnalysisGroupLabel(AnalysisGroupLabel analysisGroupLabel) {
         super.setRecordedDate(analysisGroupLabel.getRecordedDate());
         super.setPhysicallyLabled(analysisGroupLabel.isPhysicallyLabled());
     }
- 
+
     public static AnalysisGroupLabel update(AnalysisGroupLabel analysisGroupLabel) {
-    	AnalysisGroupLabel updatedAnalysisGroupLabel = AnalysisGroupLabel.findAnalysisGroupLabel(analysisGroupLabel.getId());
-    	updatedAnalysisGroupLabel.setLsType(analysisGroupLabel.getLsType());
-    	updatedAnalysisGroupLabel.setLsKind(analysisGroupLabel.getLsKind());
-    	updatedAnalysisGroupLabel.setLsTypeAndKind(analysisGroupLabel.getLsType() + "_" + analysisGroupLabel.getLsKind());
-    	updatedAnalysisGroupLabel.setLabelText(analysisGroupLabel.getLabelText());
-    	updatedAnalysisGroupLabel.setPreferred(analysisGroupLabel.isPreferred());
-    	updatedAnalysisGroupLabel.setLsTransaction(analysisGroupLabel.getLsTransaction());
-    	updatedAnalysisGroupLabel.setRecordedBy(analysisGroupLabel.getRecordedBy());
-    	updatedAnalysisGroupLabel.setRecordedDate(analysisGroupLabel.getRecordedDate());
-    	updatedAnalysisGroupLabel.setModifiedDate(new Date());
-    	updatedAnalysisGroupLabel.setPhysicallyLabled(analysisGroupLabel.isPhysicallyLabled());
-    	updatedAnalysisGroupLabel.merge();
-    	return updatedAnalysisGroupLabel;
-    }
-    
+        AnalysisGroupLabel updatedAnalysisGroupLabel = AnalysisGroupLabel
+                .findAnalysisGroupLabel(analysisGroupLabel.getId());
+        updatedAnalysisGroupLabel.setLsType(analysisGroupLabel.getLsType());
+        updatedAnalysisGroupLabel.setLsKind(analysisGroupLabel.getLsKind());
+        updatedAnalysisGroupLabel
+                .setLsTypeAndKind(analysisGroupLabel.getLsType() + "_" + analysisGroupLabel.getLsKind());
+        updatedAnalysisGroupLabel.setLabelText(analysisGroupLabel.getLabelText());
+        updatedAnalysisGroupLabel.setPreferred(analysisGroupLabel.isPreferred());
+        updatedAnalysisGroupLabel.setLsTransaction(analysisGroupLabel.getLsTransaction());
+        updatedAnalysisGroupLabel.setRecordedBy(analysisGroupLabel.getRecordedBy());
+        updatedAnalysisGroupLabel.setRecordedDate(analysisGroupLabel.getRecordedDate());
+        updatedAnalysisGroupLabel.setModifiedDate(new Date());
+        updatedAnalysisGroupLabel.setPhysicallyLabled(analysisGroupLabel.isPhysicallyLabled());
+        updatedAnalysisGroupLabel.merge();
+        return updatedAnalysisGroupLabel;
+    }
+
     public static Collection<AnalysisGroupLabel> fromJsonArrayToAnalysisGroupLabels(String json) {
-        return new JSONDeserializer<List<AnalysisGroupLabel>>().use(null, ArrayList.class).use("values", AnalysisGroupLabel.class).deserialize(json);
+        return new JSONDeserializer<List<AnalysisGroupLabel>>().use(null, ArrayList.class)
+                .use("values", AnalysisGroupLabel.class).deserialize(json);
     }
-    
+
     public static Collection<AnalysisGroupLabel> fromJsonArrayToAnalysisGroupLabels(Reader json) {
-        return new JSONDeserializer<List<AnalysisGroupLabel>>().use(null, ArrayList.class).use("values", AnalysisGroupLabel.class).deserialize(json);
+        return new JSONDeserializer<List<AnalysisGroupLabel>>().use(null, ArrayList.class)
+                .use("values", AnalysisGroupLabel.class).deserialize(json);
     }
 
-	public static int deleteByExperimentID(Long experimentId) {
-		if (experimentId == null) return 0;
-		EntityManager em = SubjectValue.entityManager();
-		String deleteSQL = "DELETE FROM AnalysisGroupLabel oo WHERE id in (select o.id from AnalysisGroupLabel o where o.analysisGroup.experiment.id = :experimentId)";
+    public static int deleteByExperimentID(Long experimentId) {
+        if (experimentId == null)
+            return 0;
+        EntityManager em = SubjectValue.entityManager();
+        String deleteSQL = "DELETE FROM AnalysisGroupLabel oo WHERE id in (select o.id from AnalysisGroupLabel o where o.analysisGroup.experiment.id = :experimentId)";
 
-		Query q = em.createQuery(deleteSQL);
-		q.setParameter("experimentId", experimentId);
-		int numberOfDeletedEntities = q.executeUpdate();
-		return numberOfDeletedEntities;
-	}
-    
-    
+        Query q = em.createQuery(deleteSQL);
+        q.setParameter("experimentId", experimentId);
+        int numberOfDeletedEntities = q.executeUpdate();
+        return numberOfDeletedEntities;
+    }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static AnalysisGroupLabel fromJsonToAnalysisGroupLabel(String json) {
+    public static AnalysisGroupLabel fromJsonToAnalysisGroupLabel(String json) {
         return new JSONDeserializer<AnalysisGroupLabel>()
-        .use(null, AnalysisGroupLabel.class).deserialize(json);
+                .use(null, AnalysisGroupLabel.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<AnalysisGroupLabel> collection) {
+    public static String toJsonArray(Collection<AnalysisGroupLabel> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<AnalysisGroupLabel> collection, String[] fields) {
+    public static String toJsonArray(Collection<AnalysisGroupLabel> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public AnalysisGroupLabel() {
+    public AnalysisGroupLabel() {
         super();
     }
 
-	public AnalysisGroup getAnalysisGroup() {
+    public AnalysisGroup getAnalysisGroup() {
         return this.analysisGroup;
     }
 
-	public void setAnalysisGroup(AnalysisGroup analysisGroup) {
+    public void setAnalysisGroup(AnalysisGroup analysisGroup) {
         this.analysisGroup = analysisGroup;
     }
 
-	public static Long countFindAnalysisGroupLabelsByAnalysisGroup(AnalysisGroup analysisGroup) {
-        if (analysisGroup == null) throw new IllegalArgumentException("The analysisGroup argument is required");
+    public static Long countFindAnalysisGroupLabelsByAnalysisGroup(AnalysisGroup analysisGroup) {
+        if (analysisGroup == null)
+            throw new IllegalArgumentException("The analysisGroup argument is required");
         EntityManager em = AnalysisGroupLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupLabel AS o WHERE o.analysisGroup = :analysisGroup", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM AnalysisGroupLabel AS o WHERE o.analysisGroup = :analysisGroup", Long.class);
         q.setParameter("analysisGroup", analysisGroup);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindAnalysisGroupLabelsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static Long countFindAnalysisGroupLabelsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = AnalysisGroupLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupLabel AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM AnalysisGroupLabel AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
         q.setParameter("lsTransaction", lsTransaction);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<AnalysisGroupLabel> findAnalysisGroupLabelsByAnalysisGroup(AnalysisGroup analysisGroup) {
-        if (analysisGroup == null) throw new IllegalArgumentException("The analysisGroup argument is required");
+    public static TypedQuery<AnalysisGroupLabel> findAnalysisGroupLabelsByAnalysisGroup(AnalysisGroup analysisGroup) {
+        if (analysisGroup == null)
+            throw new IllegalArgumentException("The analysisGroup argument is required");
         EntityManager em = AnalysisGroupLabel.entityManager();
-        TypedQuery<AnalysisGroupLabel> q = em.createQuery("SELECT o FROM AnalysisGroupLabel AS o WHERE o.analysisGroup = :analysisGroup", AnalysisGroupLabel.class);
+        TypedQuery<AnalysisGroupLabel> q = em.createQuery(
+                "SELECT o FROM AnalysisGroupLabel AS o WHERE o.analysisGroup = :analysisGroup",
+                AnalysisGroupLabel.class);
         q.setParameter("analysisGroup", analysisGroup);
         return q;
     }
 
-	public static TypedQuery<AnalysisGroupLabel> findAnalysisGroupLabelsByAnalysisGroup(AnalysisGroup analysisGroup, String sortFieldName, String sortOrder) {
-        if (analysisGroup == null) throw new IllegalArgumentException("The analysisGroup argument is required");
+    public static TypedQuery<AnalysisGroupLabel> findAnalysisGroupLabelsByAnalysisGroup(AnalysisGroup analysisGroup,
+            String sortFieldName, String sortOrder) {
+        if (analysisGroup == null)
+            throw new IllegalArgumentException("The analysisGroup argument is required");
         EntityManager em = AnalysisGroupLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupLabel AS o WHERE o.analysisGroup = :analysisGroup");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM AnalysisGroupLabel AS o WHERE o.analysisGroup = :analysisGroup");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -162,18 +175,24 @@ public static TypedQuery<AnalysisGroupLabel> findAnalysisGroupLabelsByAnalysisGr
         return q;
     }
 
-	public static TypedQuery<AnalysisGroupLabel> findAnalysisGroupLabelsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<AnalysisGroupLabel> findAnalysisGroupLabelsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = AnalysisGroupLabel.entityManager();
-        TypedQuery<AnalysisGroupLabel> q = em.createQuery("SELECT o FROM AnalysisGroupLabel AS o WHERE o.lsTransaction = :lsTransaction", AnalysisGroupLabel.class);
+        TypedQuery<AnalysisGroupLabel> q = em.createQuery(
+                "SELECT o FROM AnalysisGroupLabel AS o WHERE o.lsTransaction = :lsTransaction",
+                AnalysisGroupLabel.class);
         q.setParameter("lsTransaction", lsTransaction);
         return q;
     }
 
-	public static TypedQuery<AnalysisGroupLabel> findAnalysisGroupLabelsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<AnalysisGroupLabel> findAnalysisGroupLabelsByLsTransactionEquals(Long lsTransaction,
+            String sortFieldName, String sortOrder) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = AnalysisGroupLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupLabel AS o WHERE o.lsTransaction = :lsTransaction");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM AnalysisGroupLabel AS o WHERE o.lsTransaction = :lsTransaction");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -185,17 +204,18 @@ public static TypedQuery<AnalysisGroupLabel> findAnalysisGroupLabelsByLsTransact
         return q;
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("analysisGroup");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("analysisGroup");
 
-	public static long countAnalysisGroupLabels() {
+    public static long countAnalysisGroupLabels() {
         return entityManager().createQuery("SELECT COUNT(o) FROM AnalysisGroupLabel o", Long.class).getSingleResult();
     }
 
-	public static List<AnalysisGroupLabel> findAllAnalysisGroupLabels() {
-        return entityManager().createQuery("SELECT o FROM AnalysisGroupLabel o", AnalysisGroupLabel.class).getResultList();
+    public static List<AnalysisGroupLabel> findAllAnalysisGroupLabels() {
+        return entityManager().createQuery("SELECT o FROM AnalysisGroupLabel o", AnalysisGroupLabel.class)
+                .getResultList();
     }
 
-	public static List<AnalysisGroupLabel> findAllAnalysisGroupLabels(String sortFieldName, String sortOrder) {
+    public static List<AnalysisGroupLabel> findAllAnalysisGroupLabels(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM AnalysisGroupLabel o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -206,16 +226,19 @@ public static List<AnalysisGroupLabel> findAllAnalysisGroupLabels(String sortFie
         return entityManager().createQuery(jpaQuery, AnalysisGroupLabel.class).getResultList();
     }
 
-	public static AnalysisGroupLabel findAnalysisGroupLabel(Long id) {
-        if (id == null) return null;
+    public static AnalysisGroupLabel findAnalysisGroupLabel(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(AnalysisGroupLabel.class, id);
     }
 
-	public static List<AnalysisGroupLabel> findAnalysisGroupLabelEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM AnalysisGroupLabel o", AnalysisGroupLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<AnalysisGroupLabel> findAnalysisGroupLabelEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM AnalysisGroupLabel o", AnalysisGroupLabel.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<AnalysisGroupLabel> findAnalysisGroupLabelEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<AnalysisGroupLabel> findAnalysisGroupLabelEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM AnalysisGroupLabel o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -223,12 +246,14 @@ public static List<AnalysisGroupLabel> findAnalysisGroupLabelEntries(int firstRe
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, AnalysisGroupLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, AnalysisGroupLabel.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public AnalysisGroupLabel merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         AnalysisGroupLabel merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState.java b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState.java
index bba9d3316..2daefaae9 100755
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState.java
+++ b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupState.java
@@ -37,172 +37,203 @@
 @Transactional
 public class AnalysisGroupState extends AbstractState {
 
-	
-	@NotNull
-	@ManyToOne
-	@JoinColumn(name = "analysis_group_id")
-	private AnalysisGroup analysisGroup;
-
-	@OneToMany(cascade = CascadeType.ALL, mappedBy = "lsState", fetch = FetchType.LAZY)
-	private Set<AnalysisGroupValue> lsValues = new HashSet<AnalysisGroupValue>();
-
-	public AnalysisGroupState(com.labsynch.labseer.domain.AnalysisGroupState analysisGroupState) {
-		this.setRecordedBy(analysisGroupState.getRecordedBy());
-		this.setRecordedDate(analysisGroupState.getRecordedDate());
-		this.setLsTransaction(analysisGroupState.getLsTransaction());
-		this.setModifiedBy(analysisGroupState.getModifiedBy());
-		this.setModifiedDate(analysisGroupState.getModifiedDate());
-		this.setLsType(analysisGroupState.getLsType());
-		this.setLsKind(analysisGroupState.getLsKind());
-	}
-
-	public AnalysisGroupState(AnalysisGroupCsvDTO analysisGroupDTO) {
-		this.setRecordedBy(analysisGroupDTO.getRecordedBy());
-		this.setRecordedDate(analysisGroupDTO.getRecordedDate());
-		this.setLsTransaction(analysisGroupDTO.getLsTransaction());
-		this.setModifiedBy(analysisGroupDTO.getModifiedBy());
-		this.setModifiedDate(analysisGroupDTO.getModifiedDate());
-		this.setLsType(analysisGroupDTO.getStateType());
-		this.setLsKind(analysisGroupDTO.getStateKind());
-	}
-
-	public AnalysisGroupState(FlatThingCsvDTO analysisGroupDTO) {
-		this.setRecordedBy(analysisGroupDTO.getRecordedBy());
-		this.setRecordedDate(analysisGroupDTO.getRecordedDate());
-		this.setLsTransaction(analysisGroupDTO.getLsTransaction());
-		this.setModifiedBy(analysisGroupDTO.getModifiedBy());
-		this.setModifiedDate(analysisGroupDTO.getModifiedDate());
-		this.setLsType(analysisGroupDTO.getStateType());
-		this.setLsKind(analysisGroupDTO.getStateKind());
-	}
-
-	public static com.labsynch.labseer.domain.AnalysisGroupState update(com.labsynch.labseer.domain.AnalysisGroupState analysisGroupState) {
-		AnalysisGroupState updatedAnalysisGroupState = AnalysisGroupState.findAnalysisGroupState(analysisGroupState.getId());
-		updatedAnalysisGroupState.setRecordedBy(analysisGroupState.getRecordedBy());
-		updatedAnalysisGroupState.setRecordedDate(analysisGroupState.getRecordedDate());
-		updatedAnalysisGroupState.setLsTransaction(analysisGroupState.getLsTransaction());
-		updatedAnalysisGroupState.setModifiedBy(analysisGroupState.getModifiedBy());
-		updatedAnalysisGroupState.setModifiedDate(new Date());
-		updatedAnalysisGroupState.setLsType(analysisGroupState.getLsType());
-		updatedAnalysisGroupState.setLsKind(analysisGroupState.getLsKind());
-		updatedAnalysisGroupState.merge();
-		return updatedAnalysisGroupState;
-	}
-
-	public String toJson() {
-		return new JSONSerializer().include("lsValues").exclude("*.class", "analysisGroup.experiment").transform(new ExcludeNulls(), void.class).serialize(this);
-	}
-
-	public static com.labsynch.labseer.domain.AnalysisGroupState fromJsonToAnalysisGroupState(String json) {
-		return new JSONDeserializer<AnalysisGroupState>().use(null, AnalysisGroupState.class).deserialize(json);
-	}
-
-	public static String toJsonArray(Collection<com.labsynch.labseer.domain.AnalysisGroupState> collection) {
-		return new JSONSerializer().exclude("*.class", "analysisGroup.experiment").transform(new ExcludeNulls(), void.class).serialize(collection);
-	}
-
-	public static String toJsonArrayStub(Collection<com.labsynch.labseer.domain.AnalysisGroupState> collection) {
-		return new JSONSerializer().exclude("*.class", "analysisGroup").transform(new ExcludeNulls(), void.class).serialize(collection);
-	}
-
-	public static Collection<com.labsynch.labseer.domain.AnalysisGroupState> fromJsonArrayToAnalysisGroupStates(String json) {
-		return new JSONDeserializer<List<AnalysisGroupState>>().use(null, ArrayList.class).use("values", AnalysisGroupState.class).deserialize(json);
-	}
-
-	public static Collection<com.labsynch.labseer.domain.AnalysisGroupState> fromJsonArrayToAnalysisGroupStates(Reader json) {
-		return new JSONDeserializer<List<AnalysisGroupState>>().use(null, ArrayList.class).use("values", AnalysisGroupState.class).deserialize(json);
-	}
-
-	public static int deleteByExperimentID(Long experimentId) {
-		if (experimentId == null) return 0;
-		EntityManager em = SubjectValue.entityManager();
-		String deleteSQL = "DELETE FROM AnalysisGroupState oo WHERE id in (select o.id from AnalysisGroupState o where o.analysisGroup.experiment.id = :experimentId)";
-		Query q = em.createQuery(deleteSQL);
-		q.setParameter("experimentId", experimentId);
-		int numberOfDeletedEntities = q.executeUpdate();
-		return numberOfDeletedEntities;
-	}
-	
-	public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByAnalysisGroupIDAndStateTypeKind(Long analysisGroupId, 
-			String stateType, 
-			String stateKind) {
-			if (stateType == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-			if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-			
-			EntityManager em = entityManager();
-			String hsqlQuery = "SELECT ags FROM AnalysisGroupState AS ags " +
-			"JOIN ags.analysisGroup ag " +
-			"WHERE ags.lsType = :stateType AND ags.lsKind = :stateKind AND ags.ignored IS NOT :ignored " +
-			"AND ag.id = :analysisGroupId ";
-			TypedQuery<AnalysisGroupState> q = em.createQuery(hsqlQuery, AnalysisGroupState.class);
-			q.setParameter("analysisGroupId", analysisGroupId);
-			q.setParameter("stateType", stateType);
-			q.setParameter("stateKind", stateKind);
-			q.setParameter("ignored", true);
-			return q;
-		}
-
-	public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByAnalysisGroupCodeNameAndStateTypeKind(String analysisGroupCodeName, 
-			String stateType, 
-			String stateKind) {
-			if (stateType == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-			if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-			
-			EntityManager em = entityManager();
-			String hsqlQuery = "SELECT ags FROM AnalysisGroupState AS ags " +
-			"JOIN ags.analysisGroup ag " +
-			"WHERE ags.lsType = :stateType AND ags.lsKind = :stateKind AND ags.ignored IS NOT :ignored " +
-			"AND ag.codeName = :analysisGroupCodeName ";
-			TypedQuery<AnalysisGroupState> q = em.createQuery(hsqlQuery, AnalysisGroupState.class);
-			q.setParameter("analysisGroupCodeName", analysisGroupCodeName);
-			q.setParameter("stateType", stateType);
-			q.setParameter("stateKind", stateKind);
-			q.setParameter("ignored", true);
-			return q;
-		}
-
-    public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(AnalysisGroup analysisGroup, String lsType, String lsKind, boolean ignored) {
-        if (analysisGroup == null) throw new IllegalArgumentException("The analysisGroup argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    @NotNull
+    @ManyToOne
+    @JoinColumn(name = "analysis_group_id")
+    private AnalysisGroup analysisGroup;
+
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "lsState", fetch = FetchType.LAZY)
+    private Set<AnalysisGroupValue> lsValues = new HashSet<AnalysisGroupValue>();
+
+    public AnalysisGroupState(com.labsynch.labseer.domain.AnalysisGroupState analysisGroupState) {
+        this.setRecordedBy(analysisGroupState.getRecordedBy());
+        this.setRecordedDate(analysisGroupState.getRecordedDate());
+        this.setLsTransaction(analysisGroupState.getLsTransaction());
+        this.setModifiedBy(analysisGroupState.getModifiedBy());
+        this.setModifiedDate(analysisGroupState.getModifiedDate());
+        this.setLsType(analysisGroupState.getLsType());
+        this.setLsKind(analysisGroupState.getLsKind());
+    }
+
+    public AnalysisGroupState(AnalysisGroupCsvDTO analysisGroupDTO) {
+        this.setRecordedBy(analysisGroupDTO.getRecordedBy());
+        this.setRecordedDate(analysisGroupDTO.getRecordedDate());
+        this.setLsTransaction(analysisGroupDTO.getLsTransaction());
+        this.setModifiedBy(analysisGroupDTO.getModifiedBy());
+        this.setModifiedDate(analysisGroupDTO.getModifiedDate());
+        this.setLsType(analysisGroupDTO.getStateType());
+        this.setLsKind(analysisGroupDTO.getStateKind());
+    }
+
+    public AnalysisGroupState(FlatThingCsvDTO analysisGroupDTO) {
+        this.setRecordedBy(analysisGroupDTO.getRecordedBy());
+        this.setRecordedDate(analysisGroupDTO.getRecordedDate());
+        this.setLsTransaction(analysisGroupDTO.getLsTransaction());
+        this.setModifiedBy(analysisGroupDTO.getModifiedBy());
+        this.setModifiedDate(analysisGroupDTO.getModifiedDate());
+        this.setLsType(analysisGroupDTO.getStateType());
+        this.setLsKind(analysisGroupDTO.getStateKind());
+    }
+
+    public static com.labsynch.labseer.domain.AnalysisGroupState update(
+            com.labsynch.labseer.domain.AnalysisGroupState analysisGroupState) {
+        AnalysisGroupState updatedAnalysisGroupState = AnalysisGroupState
+                .findAnalysisGroupState(analysisGroupState.getId());
+        updatedAnalysisGroupState.setRecordedBy(analysisGroupState.getRecordedBy());
+        updatedAnalysisGroupState.setRecordedDate(analysisGroupState.getRecordedDate());
+        updatedAnalysisGroupState.setLsTransaction(analysisGroupState.getLsTransaction());
+        updatedAnalysisGroupState.setModifiedBy(analysisGroupState.getModifiedBy());
+        updatedAnalysisGroupState.setModifiedDate(new Date());
+        updatedAnalysisGroupState.setLsType(analysisGroupState.getLsType());
+        updatedAnalysisGroupState.setLsKind(analysisGroupState.getLsKind());
+        updatedAnalysisGroupState.merge();
+        return updatedAnalysisGroupState;
+    }
+
+    public String toJson() {
+        return new JSONSerializer().include("lsValues").exclude("*.class", "analysisGroup.experiment")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
+    }
+
+    public static com.labsynch.labseer.domain.AnalysisGroupState fromJsonToAnalysisGroupState(String json) {
+        return new JSONDeserializer<AnalysisGroupState>().use(null, AnalysisGroupState.class).deserialize(json);
+    }
+
+    public static String toJsonArray(Collection<com.labsynch.labseer.domain.AnalysisGroupState> collection) {
+        return new JSONSerializer().exclude("*.class", "analysisGroup.experiment")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
+    }
+
+    public static String toJsonArrayStub(Collection<com.labsynch.labseer.domain.AnalysisGroupState> collection) {
+        return new JSONSerializer().exclude("*.class", "analysisGroup").transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
+    }
+
+    public static Collection<com.labsynch.labseer.domain.AnalysisGroupState> fromJsonArrayToAnalysisGroupStates(
+            String json) {
+        return new JSONDeserializer<List<AnalysisGroupState>>().use(null, ArrayList.class)
+                .use("values", AnalysisGroupState.class).deserialize(json);
+    }
+
+    public static Collection<com.labsynch.labseer.domain.AnalysisGroupState> fromJsonArrayToAnalysisGroupStates(
+            Reader json) {
+        return new JSONDeserializer<List<AnalysisGroupState>>().use(null, ArrayList.class)
+                .use("values", AnalysisGroupState.class).deserialize(json);
+    }
+
+    public static int deleteByExperimentID(Long experimentId) {
+        if (experimentId == null)
+            return 0;
+        EntityManager em = SubjectValue.entityManager();
+        String deleteSQL = "DELETE FROM AnalysisGroupState oo WHERE id in (select o.id from AnalysisGroupState o where o.analysisGroup.experiment.id = :experimentId)";
+        Query q = em.createQuery(deleteSQL);
+        q.setParameter("experimentId", experimentId);
+        int numberOfDeletedEntities = q.executeUpdate();
+        return numberOfDeletedEntities;
+    }
+
+    public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByAnalysisGroupIDAndStateTypeKind(
+            Long analysisGroupId,
+            String stateType,
+            String stateKind) {
+        if (stateType == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateType argument is required");
+        if (stateKind == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateKind argument is required");
+
+        EntityManager em = entityManager();
+        String hsqlQuery = "SELECT ags FROM AnalysisGroupState AS ags " +
+                "JOIN ags.analysisGroup ag " +
+                "WHERE ags.lsType = :stateType AND ags.lsKind = :stateKind AND ags.ignored IS NOT :ignored " +
+                "AND ag.id = :analysisGroupId ";
+        TypedQuery<AnalysisGroupState> q = em.createQuery(hsqlQuery, AnalysisGroupState.class);
+        q.setParameter("analysisGroupId", analysisGroupId);
+        q.setParameter("stateType", stateType);
+        q.setParameter("stateKind", stateKind);
+        q.setParameter("ignored", true);
+        return q;
+    }
+
+    public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByAnalysisGroupCodeNameAndStateTypeKind(
+            String analysisGroupCodeName,
+            String stateType,
+            String stateKind) {
+        if (stateType == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateType argument is required");
+        if (stateKind == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateKind argument is required");
+
+        EntityManager em = entityManager();
+        String hsqlQuery = "SELECT ags FROM AnalysisGroupState AS ags " +
+                "JOIN ags.analysisGroup ag " +
+                "WHERE ags.lsType = :stateType AND ags.lsKind = :stateKind AND ags.ignored IS NOT :ignored " +
+                "AND ag.codeName = :analysisGroupCodeName ";
+        TypedQuery<AnalysisGroupState> q = em.createQuery(hsqlQuery, AnalysisGroupState.class);
+        q.setParameter("analysisGroupCodeName", analysisGroupCodeName);
+        q.setParameter("stateType", stateType);
+        q.setParameter("stateKind", stateKind);
+        q.setParameter("ignored", true);
+        return q;
+    }
+
+    public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(
+            AnalysisGroup analysisGroup, String lsType, String lsKind, boolean ignored) {
+        if (analysisGroup == null)
+            throw new IllegalArgumentException("The analysisGroup argument is required");
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = AnalysisGroupState.entityManager();
-        TypedQuery<AnalysisGroupState> q = em.createQuery("SELECT o FROM AnalysisGroupState AS o WHERE o.analysisGroup = :analysisGroup AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored", AnalysisGroupState.class);
+        TypedQuery<AnalysisGroupState> q = em.createQuery(
+                "SELECT o FROM AnalysisGroupState AS o WHERE o.analysisGroup = :analysisGroup AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored",
+                AnalysisGroupState.class);
         q.setParameter("analysisGroup", analysisGroup);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         q.setParameter("ignored", ignored);
         return q;
     }
-    
+
     public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByLsTypeAndKindEquals(String lsTypeAndKind) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = AnalysisGroupState.entityManager();
-        TypedQuery<AnalysisGroupState> q = em.createQuery("SELECT o FROM AnalysisGroupState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", AnalysisGroupState.class);
+        TypedQuery<AnalysisGroupState> q = em.createQuery(
+                "SELECT o FROM AnalysisGroupState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind",
+                AnalysisGroupState.class);
         q.setParameter("lsTypeAndKind", lsTypeAndKind);
         return q;
     }
-    
-    public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+
+    public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByLsTypeEqualsAndLsKindEquals(String lsType,
+            String lsKind) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = AnalysisGroupState.entityManager();
-        TypedQuery<AnalysisGroupState> q = em.createQuery("SELECT o FROM AnalysisGroupState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", AnalysisGroupState.class);
+        TypedQuery<AnalysisGroupState> q = em.createQuery(
+                "SELECT o FROM AnalysisGroupState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind",
+                AnalysisGroupState.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         return q;
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("analysisGroup", "lsValues");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("analysisGroup",
+            "lsValues");
 
-	public static long countAnalysisGroupStates() {
+    public static long countAnalysisGroupStates() {
         return entityManager().createQuery("SELECT COUNT(o) FROM AnalysisGroupState o", Long.class).getSingleResult();
     }
 
-	public static List<AnalysisGroupState> findAllAnalysisGroupStates() {
-        return entityManager().createQuery("SELECT o FROM AnalysisGroupState o", AnalysisGroupState.class).getResultList();
+    public static List<AnalysisGroupState> findAllAnalysisGroupStates() {
+        return entityManager().createQuery("SELECT o FROM AnalysisGroupState o", AnalysisGroupState.class)
+                .getResultList();
     }
 
-	public static List<AnalysisGroupState> findAllAnalysisGroupStates(String sortFieldName, String sortOrder) {
+    public static List<AnalysisGroupState> findAllAnalysisGroupStates(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM AnalysisGroupState o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -213,16 +244,19 @@ public static List<AnalysisGroupState> findAllAnalysisGroupStates(String sortFie
         return entityManager().createQuery(jpaQuery, AnalysisGroupState.class).getResultList();
     }
 
-	public static AnalysisGroupState findAnalysisGroupState(Long id) {
-        if (id == null) return null;
+    public static AnalysisGroupState findAnalysisGroupState(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(AnalysisGroupState.class, id);
     }
 
-	public static List<AnalysisGroupState> findAnalysisGroupStateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM AnalysisGroupState o", AnalysisGroupState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<AnalysisGroupState> findAnalysisGroupStateEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM AnalysisGroupState o", AnalysisGroupState.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<AnalysisGroupState> findAnalysisGroupStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<AnalysisGroupState> findAnalysisGroupStateEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM AnalysisGroupState o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -230,39 +264,49 @@ public static List<AnalysisGroupState> findAnalysisGroupStateEntries(int firstRe
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, AnalysisGroupState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, AnalysisGroupState.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public AnalysisGroupState merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         AnalysisGroupState merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public AnalysisGroupState() {
+    public AnalysisGroupState() {
         super();
     }
 
-	public static Long countFindAnalysisGroupStatesByAnalysisGroup(AnalysisGroup analysisGroup) {
-        if (analysisGroup == null) throw new IllegalArgumentException("The analysisGroup argument is required");
+    public static Long countFindAnalysisGroupStatesByAnalysisGroup(AnalysisGroup analysisGroup) {
+        if (analysisGroup == null)
+            throw new IllegalArgumentException("The analysisGroup argument is required");
         EntityManager em = AnalysisGroupState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupState AS o WHERE o.analysisGroup = :analysisGroup", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM AnalysisGroupState AS o WHERE o.analysisGroup = :analysisGroup", Long.class);
         q.setParameter("analysisGroup", analysisGroup);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(AnalysisGroup analysisGroup, String lsType, String lsKind, boolean ignored) {
-        if (analysisGroup == null) throw new IllegalArgumentException("The analysisGroup argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static Long countFindAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(
+            AnalysisGroup analysisGroup, String lsType, String lsKind, boolean ignored) {
+        if (analysisGroup == null)
+            throw new IllegalArgumentException("The analysisGroup argument is required");
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = AnalysisGroupState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupState AS o WHERE o.analysisGroup = :analysisGroup AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM AnalysisGroupState AS o WHERE o.analysisGroup = :analysisGroup AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored",
+                Long.class);
         q.setParameter("analysisGroup", analysisGroup);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
@@ -270,44 +314,58 @@ public static Long countFindAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAnd
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindAnalysisGroupStatesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static Long countFindAnalysisGroupStatesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = AnalysisGroupState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupState AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM AnalysisGroupState AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
         q.setParameter("lsTransaction", lsTransaction);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindAnalysisGroupStatesByLsTypeAndKindEquals(String lsTypeAndKind) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+    public static Long countFindAnalysisGroupStatesByLsTypeAndKindEquals(String lsTypeAndKind) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = AnalysisGroupState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM AnalysisGroupState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", Long.class);
         q.setParameter("lsTypeAndKind", lsTypeAndKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindAnalysisGroupStatesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static Long countFindAnalysisGroupStatesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = AnalysisGroupState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM AnalysisGroupState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind",
+                Long.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByAnalysisGroup(AnalysisGroup analysisGroup) {
-        if (analysisGroup == null) throw new IllegalArgumentException("The analysisGroup argument is required");
+    public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByAnalysisGroup(AnalysisGroup analysisGroup) {
+        if (analysisGroup == null)
+            throw new IllegalArgumentException("The analysisGroup argument is required");
         EntityManager em = AnalysisGroupState.entityManager();
-        TypedQuery<AnalysisGroupState> q = em.createQuery("SELECT o FROM AnalysisGroupState AS o WHERE o.analysisGroup = :analysisGroup", AnalysisGroupState.class);
+        TypedQuery<AnalysisGroupState> q = em.createQuery(
+                "SELECT o FROM AnalysisGroupState AS o WHERE o.analysisGroup = :analysisGroup",
+                AnalysisGroupState.class);
         q.setParameter("analysisGroup", analysisGroup);
         return q;
     }
 
-	public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByAnalysisGroup(AnalysisGroup analysisGroup, String sortFieldName, String sortOrder) {
-        if (analysisGroup == null) throw new IllegalArgumentException("The analysisGroup argument is required");
+    public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByAnalysisGroup(AnalysisGroup analysisGroup,
+            String sortFieldName, String sortOrder) {
+        if (analysisGroup == null)
+            throw new IllegalArgumentException("The analysisGroup argument is required");
         EntityManager em = AnalysisGroupState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupState AS o WHERE o.analysisGroup = :analysisGroup");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM AnalysisGroupState AS o WHERE o.analysisGroup = :analysisGroup");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -319,12 +377,18 @@ public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByAnalysisGr
         return q;
     }
 
-	public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(AnalysisGroup analysisGroup, String lsType, String lsKind, boolean ignored, String sortFieldName, String sortOrder) {
-        if (analysisGroup == null) throw new IllegalArgumentException("The analysisGroup argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(
+            AnalysisGroup analysisGroup, String lsType, String lsKind, boolean ignored, String sortFieldName,
+            String sortOrder) {
+        if (analysisGroup == null)
+            throw new IllegalArgumentException("The analysisGroup argument is required");
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = AnalysisGroupState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupState AS o WHERE o.analysisGroup = :analysisGroup AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM AnalysisGroupState AS o WHERE o.analysisGroup = :analysisGroup AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -339,18 +403,24 @@ public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByAnalysisGr
         return q;
     }
 
-	public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = AnalysisGroupState.entityManager();
-        TypedQuery<AnalysisGroupState> q = em.createQuery("SELECT o FROM AnalysisGroupState AS o WHERE o.lsTransaction = :lsTransaction", AnalysisGroupState.class);
+        TypedQuery<AnalysisGroupState> q = em.createQuery(
+                "SELECT o FROM AnalysisGroupState AS o WHERE o.lsTransaction = :lsTransaction",
+                AnalysisGroupState.class);
         q.setParameter("lsTransaction", lsTransaction);
         return q;
     }
 
-	public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByLsTransactionEquals(Long lsTransaction,
+            String sortFieldName, String sortOrder) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = AnalysisGroupState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupState AS o WHERE o.lsTransaction = :lsTransaction");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM AnalysisGroupState AS o WHERE o.lsTransaction = :lsTransaction");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -362,10 +432,13 @@ public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByLsTransact
         return q;
     }
 
-	public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByLsTypeAndKindEquals(String lsTypeAndKind, String sortFieldName, String sortOrder) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+    public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByLsTypeAndKindEquals(String lsTypeAndKind,
+            String sortFieldName, String sortOrder) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = AnalysisGroupState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM AnalysisGroupState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -377,11 +450,15 @@ public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByLsTypeAndK
         return q;
     }
 
-	public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByLsTypeEqualsAndLsKindEquals(String lsType,
+            String lsKind, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = AnalysisGroupState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM AnalysisGroupState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -394,19 +471,19 @@ public static TypedQuery<AnalysisGroupState> findAnalysisGroupStatesByLsTypeEqua
         return q;
     }
 
-	public AnalysisGroup getAnalysisGroup() {
+    public AnalysisGroup getAnalysisGroup() {
         return this.analysisGroup;
     }
 
-	public void setAnalysisGroup(AnalysisGroup analysisGroup) {
+    public void setAnalysisGroup(AnalysisGroup analysisGroup) {
         this.analysisGroup = analysisGroup;
     }
 
-	public Set<AnalysisGroupValue> getLsValues() {
+    public Set<AnalysisGroupValue> getLsValues() {
         return this.lsValues;
     }
 
-	public void setLsValues(Set<AnalysisGroupValue> lsValues) {
+    public void setLsValues(Set<AnalysisGroupValue> lsValues) {
         this.lsValues = lsValues;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue.java b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue.java
index 5adc85746..7175ea4f5 100755
--- a/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/AnalysisGroupValue.java
@@ -52,75 +52,74 @@ public class AnalysisGroupValue extends AbstractValue {
 
 	private static final int PARAMETER_LIMIT = 999;
 
-    @NotNull
-    @ManyToOne
-    @JoinColumn(name = "analysis_state_id")
-    private AnalysisGroupState lsState;
-    
-    public AnalysisGroupValue(AnalysisGroupCsvDTO analysisGroupDTO) {
-    	this.setCodeValue(analysisGroupDTO.getCodeValue());
-    	this.setCodeOrigin(analysisGroupDTO.getCodeOrigin());
-    	this.setCodeType(analysisGroupDTO.getCodeType());
-    	this.setCodeKind(analysisGroupDTO.getCodeKind());
-    	this.setLsType(analysisGroupDTO.getValueType());
-    	this.setLsKind(analysisGroupDTO.getValueKind());
-    	this.setClobValue(analysisGroupDTO.getClobValue());
-    	this.setStringValue(analysisGroupDTO.getStringValue());
-    	this.setFileValue(analysisGroupDTO.getFileValue());
-    	this.setUrlValue(analysisGroupDTO.getUrlValue());
-    	this.setDateValue(analysisGroupDTO.getDateValue());
-    	this.setOperatorKind(analysisGroupDTO.getValueOperator());
-    	this.setNumericValue(analysisGroupDTO.getNumericValue());
-    	this.setFileValue(analysisGroupDTO.getFileValue());
-    	this.setUncertainty(analysisGroupDTO.getUncertainty());
-    	this.setUncertaintyType(analysisGroupDTO.getUncertaintyType());
-    	this.setUnitKind(analysisGroupDTO.getValueUnit());
-    	this.setConcentration(analysisGroupDTO.getConcentration());
-    	this.setConcUnit(analysisGroupDTO.getConcUnit());
-    	this.setNumberOfReplicates(analysisGroupDTO.getNumberOfReplicates());
-        this.setRecordedBy(analysisGroupDTO.getRecordedBy());
-        this.setRecordedDate(analysisGroupDTO.getRecordedDate());
-        this.setLsTransaction(analysisGroupDTO.getLsTransaction());
-        this.setModifiedBy(analysisGroupDTO.getModifiedBy());
-        this.setModifiedDate(analysisGroupDTO.getModifiedDate());
-        this.setComments(analysisGroupDTO.getComments());
-        this.setIgnored(analysisGroupDTO.isIgnored());
-        this.setPublicData(analysisGroupDTO.isPublicData());
-        this.setSigFigs(analysisGroupDTO.getSigFigs());
+	@NotNull
+	@ManyToOne
+	@JoinColumn(name = "analysis_state_id")
+	private AnalysisGroupState lsState;
+
+	public AnalysisGroupValue(AnalysisGroupCsvDTO analysisGroupDTO) {
+		this.setCodeValue(analysisGroupDTO.getCodeValue());
+		this.setCodeOrigin(analysisGroupDTO.getCodeOrigin());
+		this.setCodeType(analysisGroupDTO.getCodeType());
+		this.setCodeKind(analysisGroupDTO.getCodeKind());
+		this.setLsType(analysisGroupDTO.getValueType());
+		this.setLsKind(analysisGroupDTO.getValueKind());
+		this.setClobValue(analysisGroupDTO.getClobValue());
+		this.setStringValue(analysisGroupDTO.getStringValue());
+		this.setFileValue(analysisGroupDTO.getFileValue());
+		this.setUrlValue(analysisGroupDTO.getUrlValue());
+		this.setDateValue(analysisGroupDTO.getDateValue());
+		this.setOperatorKind(analysisGroupDTO.getValueOperator());
+		this.setNumericValue(analysisGroupDTO.getNumericValue());
+		this.setFileValue(analysisGroupDTO.getFileValue());
+		this.setUncertainty(analysisGroupDTO.getUncertainty());
+		this.setUncertaintyType(analysisGroupDTO.getUncertaintyType());
+		this.setUnitKind(analysisGroupDTO.getValueUnit());
+		this.setConcentration(analysisGroupDTO.getConcentration());
+		this.setConcUnit(analysisGroupDTO.getConcUnit());
+		this.setNumberOfReplicates(analysisGroupDTO.getNumberOfReplicates());
+		this.setRecordedBy(analysisGroupDTO.getRecordedBy());
+		this.setRecordedDate(analysisGroupDTO.getRecordedDate());
+		this.setLsTransaction(analysisGroupDTO.getLsTransaction());
+		this.setModifiedBy(analysisGroupDTO.getModifiedBy());
+		this.setModifiedDate(analysisGroupDTO.getModifiedDate());
+		this.setComments(analysisGroupDTO.getComments());
+		this.setIgnored(analysisGroupDTO.isIgnored());
+		this.setPublicData(analysisGroupDTO.isPublicData());
+		this.setSigFigs(analysisGroupDTO.getSigFigs());
 	}
 
 	public AnalysisGroupValue(FlatThingCsvDTO analysisGroupDTO) {
-    	this.setCodeValue(analysisGroupDTO.getCodeValue());
-    	this.setCodeOrigin(analysisGroupDTO.getCodeOrigin());
-    	this.setCodeType(analysisGroupDTO.getCodeType());
-    	this.setCodeKind(analysisGroupDTO.getCodeKind());
-    	this.setLsType(analysisGroupDTO.getValueType());
-    	this.setLsKind(analysisGroupDTO.getValueKind());
-    	this.setStringValue(analysisGroupDTO.getStringValue());
-    	this.setClobValue(analysisGroupDTO.getClobValue());
-    	this.setFileValue(analysisGroupDTO.getFileValue());
-    	this.setUrlValue(analysisGroupDTO.getUrlValue());
-    	this.setDateValue(analysisGroupDTO.getDateValue());
-    	this.setOperatorKind(analysisGroupDTO.getOperatorKind());
-    	this.setNumericValue(analysisGroupDTO.getNumericValue());
-    	this.setFileValue(analysisGroupDTO.getFileValue());
-    	this.setUncertainty(analysisGroupDTO.getUncertainty());
-    	this.setUncertaintyType(analysisGroupDTO.getUncertaintyType());
-    	this.setUnitKind(analysisGroupDTO.getUnitKind());
-    	this.setConcentration(analysisGroupDTO.getConcentration());
-    	this.setConcUnit(analysisGroupDTO.getConcUnit());
-    	this.setNumberOfReplicates(analysisGroupDTO.getNumberOfReplicates());
-        this.setRecordedBy(analysisGroupDTO.getRecordedBy());
-        this.setRecordedDate(analysisGroupDTO.getRecordedDate());
-        this.setLsTransaction(analysisGroupDTO.getLsTransaction());
-        this.setModifiedBy(analysisGroupDTO.getModifiedBy());
-        this.setModifiedDate(analysisGroupDTO.getModifiedDate());
-        this.setComments(analysisGroupDTO.getComments());
-        this.setIgnored(analysisGroupDTO.isIgnored());
-        this.setPublicData(analysisGroupDTO.isPublicData());
-        this.setSigFigs(analysisGroupDTO.getSigFigs());
-   }
-
+		this.setCodeValue(analysisGroupDTO.getCodeValue());
+		this.setCodeOrigin(analysisGroupDTO.getCodeOrigin());
+		this.setCodeType(analysisGroupDTO.getCodeType());
+		this.setCodeKind(analysisGroupDTO.getCodeKind());
+		this.setLsType(analysisGroupDTO.getValueType());
+		this.setLsKind(analysisGroupDTO.getValueKind());
+		this.setStringValue(analysisGroupDTO.getStringValue());
+		this.setClobValue(analysisGroupDTO.getClobValue());
+		this.setFileValue(analysisGroupDTO.getFileValue());
+		this.setUrlValue(analysisGroupDTO.getUrlValue());
+		this.setDateValue(analysisGroupDTO.getDateValue());
+		this.setOperatorKind(analysisGroupDTO.getOperatorKind());
+		this.setNumericValue(analysisGroupDTO.getNumericValue());
+		this.setFileValue(analysisGroupDTO.getFileValue());
+		this.setUncertainty(analysisGroupDTO.getUncertainty());
+		this.setUncertaintyType(analysisGroupDTO.getUncertaintyType());
+		this.setUnitKind(analysisGroupDTO.getUnitKind());
+		this.setConcentration(analysisGroupDTO.getConcentration());
+		this.setConcUnit(analysisGroupDTO.getConcUnit());
+		this.setNumberOfReplicates(analysisGroupDTO.getNumberOfReplicates());
+		this.setRecordedBy(analysisGroupDTO.getRecordedBy());
+		this.setRecordedDate(analysisGroupDTO.getRecordedDate());
+		this.setLsTransaction(analysisGroupDTO.getLsTransaction());
+		this.setModifiedBy(analysisGroupDTO.getModifiedBy());
+		this.setModifiedDate(analysisGroupDTO.getModifiedDate());
+		this.setComments(analysisGroupDTO.getComments());
+		this.setIgnored(analysisGroupDTO.isIgnored());
+		this.setPublicData(analysisGroupDTO.isPublicData());
+		this.setSigFigs(analysisGroupDTO.getSigFigs());
+	}
 
 	public Long getStateId() {
 		return this.lsState.getId();
@@ -154,8 +153,11 @@ public String getAnalysisGroupCode() {
 		return this.lsState.getAnalysisGroup().getCodeName();
 	}
 
-	public static com.labsynch.labseer.domain.AnalysisGroupValue create(com.labsynch.labseer.domain.AnalysisGroupValue analysisGroupValue) {
-		AnalysisGroupValue newAnalysisGroupValue = new JSONDeserializer<AnalysisGroupValue>().use(null, AnalysisGroupValue.class).deserializeInto(analysisGroupValue.toJson(), new AnalysisGroupValue());
+	public static com.labsynch.labseer.domain.AnalysisGroupValue create(
+			com.labsynch.labseer.domain.AnalysisGroupValue analysisGroupValue) {
+		AnalysisGroupValue newAnalysisGroupValue = new JSONDeserializer<AnalysisGroupValue>()
+				.use(null, AnalysisGroupValue.class)
+				.deserializeInto(analysisGroupValue.toJson(), new AnalysisGroupValue());
 		return newAnalysisGroupValue;
 	}
 
@@ -171,16 +173,19 @@ public static Query findBatchCodeBySearchFilter(String advancedFilterSQL) {
 		return q;
 	}
 
-	public static TypedQuery<com.labsynch.labseer.dto.AnalysisGroupValueBaseDTO> findAnalysisGroupValueExptCodeAndStateTypeKindAndValueTypeKind(String experimentCode, String stateType, String stateKind, String valueType, String valueKind) {
-		String sqlQuery = "select new com.labsynch.labseer.dto.AnalysisGroupValueBaseDTO( " 
-				+ "agv.id, ags.id as stateId, ag.codeName as agCodeName, agv.lsType, agv.lsKind, agv.stringValue, " 
-				+ "agv.codeValue, agv.fileValue, agv.urlValue, agv.dateValue, " 
-				+ "agv.clobValue, agv.operatorType, agv.operatorKind, agv.numericValue, " 
-				+ "agv.sigFigs, agv.uncertainty, agv.numberOfReplicates, agv.uncertaintyType, " 
-				+ "agv.unitType, agv.unitKind, agv.comments, agv.ignored, " + "agv.lsTransaction, agv.publicData) " 
-				+ "FROM AnalysisGroupValue agv " + "join agv.lsState ags with ags.ignored = false " 
-				+ "join ags.analysisGroup ag with ag.ignored = false " + "join ag.experiments exp with exp.ignored = false " 
-				+ "where ags.lsType = :stateType AND ags.lsKind = :stateKind " + "and agv.lsType = :valueType AND agv.lsKind = :valueKind and agv.ignored = false " 
+	public static TypedQuery<com.labsynch.labseer.dto.AnalysisGroupValueBaseDTO> findAnalysisGroupValueExptCodeAndStateTypeKindAndValueTypeKind(
+			String experimentCode, String stateType, String stateKind, String valueType, String valueKind) {
+		String sqlQuery = "select new com.labsynch.labseer.dto.AnalysisGroupValueBaseDTO( "
+				+ "agv.id, ags.id as stateId, ag.codeName as agCodeName, agv.lsType, agv.lsKind, agv.stringValue, "
+				+ "agv.codeValue, agv.fileValue, agv.urlValue, agv.dateValue, "
+				+ "agv.clobValue, agv.operatorType, agv.operatorKind, agv.numericValue, "
+				+ "agv.sigFigs, agv.uncertainty, agv.numberOfReplicates, agv.uncertaintyType, "
+				+ "agv.unitType, agv.unitKind, agv.comments, agv.ignored, " + "agv.lsTransaction, agv.publicData) "
+				+ "FROM AnalysisGroupValue agv " + "join agv.lsState ags with ags.ignored = false "
+				+ "join ags.analysisGroup ag with ag.ignored = false "
+				+ "join ag.experiments exp with exp.ignored = false "
+				+ "where ags.lsType = :stateType AND ags.lsKind = :stateKind "
+				+ "and agv.lsType = :valueType AND agv.lsKind = :valueKind and agv.ignored = false "
 				+ "and exp.codeName = :experimentCode";
 		EntityManager em = entityManager();
 		TypedQuery<AnalysisGroupValueBaseDTO> q = em.createQuery(sqlQuery, AnalysisGroupValueBaseDTO.class);
@@ -192,16 +197,18 @@ public static TypedQuery<com.labsynch.labseer.dto.AnalysisGroupValueBaseDTO> fin
 		return q;
 	}
 
-	public static TypedQuery<com.labsynch.labseer.dto.AnalysisGroupValueBaseDTO> findAnalysisGroupValueByLsTypeKindAndExptCode(String lsType, String lsKind, String experimentCode) {
-		String sqlQuery = "select new com.labsynch.labseer.dto.AnalysisGroupValueBaseDTO( " 
-				+ "agv.id, ags.id as stateId, ag.codeName as agCodeName, agv.lsType, agv.lsKind, agv.stringValue, " 
-				+ "agv.codeValue, agv.fileValue, agv.urlValue, agv.dateValue, " 
-				+ "agv.clobValue, agv.operatorType, agv.operatorKind, agv.numericValue, " 
-				+ "agv.sigFigs, agv.uncertainty, agv.numberOfReplicates, agv.uncertaintyType, " 
-				+ "agv.unitType, agv.unitKind, agv.comments, agv.ignored, " + "agv.lsTransaction, agv.publicData) " 
-				+ "FROM AnalysisGroupValue agv " + "join agv.lsState ags with ags.ignored = false " 
-				+ "join ags.analysisGroup ag with ag.ignored = false " + "join ag.experiments exp with exp.ignored = false " 
-				+ "where ags.lsType = :lsType AND ags.lsKind = :lsKind and agv.ignored = false " 
+	public static TypedQuery<com.labsynch.labseer.dto.AnalysisGroupValueBaseDTO> findAnalysisGroupValueByLsTypeKindAndExptCode(
+			String lsType, String lsKind, String experimentCode) {
+		String sqlQuery = "select new com.labsynch.labseer.dto.AnalysisGroupValueBaseDTO( "
+				+ "agv.id, ags.id as stateId, ag.codeName as agCodeName, agv.lsType, agv.lsKind, agv.stringValue, "
+				+ "agv.codeValue, agv.fileValue, agv.urlValue, agv.dateValue, "
+				+ "agv.clobValue, agv.operatorType, agv.operatorKind, agv.numericValue, "
+				+ "agv.sigFigs, agv.uncertainty, agv.numberOfReplicates, agv.uncertaintyType, "
+				+ "agv.unitType, agv.unitKind, agv.comments, agv.ignored, " + "agv.lsTransaction, agv.publicData) "
+				+ "FROM AnalysisGroupValue agv " + "join agv.lsState ags with ags.ignored = false "
+				+ "join ags.analysisGroup ag with ag.ignored = false "
+				+ "join ag.experiments exp with exp.ignored = false "
+				+ "where ags.lsType = :lsType AND ags.lsKind = :lsKind and agv.ignored = false "
 				+ "and exp.codeName = :experimentCode";
 		EntityManager em = entityManager();
 		TypedQuery<AnalysisGroupValueBaseDTO> q = em.createQuery(sqlQuery, AnalysisGroupValueBaseDTO.class);
@@ -211,13 +218,17 @@ public static TypedQuery<com.labsynch.labseer.dto.AnalysisGroupValueBaseDTO> fin
 		return q;
 	}
 
-	public static TypedQuery<com.labsynch.labseer.dto.AnalysisGroupValueBaseDTO> findAnalysisGroupValueByLsTypeKindAndExptCodeAll(String lsType, String lsKind, String experimentCode) {
-		String sqlQuery = "select new com.labsynch.labseer.dto.AnalysisGroupValueBaseDTO( " + "agv.id, ags.id as stateId, ag.codeName as agCodeName, agv.lsType, agv.lsKind, agv.stringValue, " +
-				"agv.codeValue, agv.fileValue, agv.urlValue, agv.dateValue, " + "agv.clobValue, agv.operatorType, agv.operatorKind, agv.numericValue, " +
-				"agv.sigFigs, agv.uncertainty, agv.numberOfReplicates, agv.uncertaintyType, " + "agv.unitType, agv.unitKind, agv.comments, agv.ignored, " + 
-				"agv.lsTransaction, agv.publicData) " + 
-				"FROM AnalysisGroupValue agv " + "join agv.lsState ags " + "join ags.analysisGroup ag " + 
-				"join ag.experiments exp " + "where ags.lsType = :lsType AND ags.lsKind = :lsKind " + 
+	public static TypedQuery<com.labsynch.labseer.dto.AnalysisGroupValueBaseDTO> findAnalysisGroupValueByLsTypeKindAndExptCodeAll(
+			String lsType, String lsKind, String experimentCode) {
+		String sqlQuery = "select new com.labsynch.labseer.dto.AnalysisGroupValueBaseDTO( "
+				+ "agv.id, ags.id as stateId, ag.codeName as agCodeName, agv.lsType, agv.lsKind, agv.stringValue, " +
+				"agv.codeValue, agv.fileValue, agv.urlValue, agv.dateValue, "
+				+ "agv.clobValue, agv.operatorType, agv.operatorKind, agv.numericValue, " +
+				"agv.sigFigs, agv.uncertainty, agv.numberOfReplicates, agv.uncertaintyType, "
+				+ "agv.unitType, agv.unitKind, agv.comments, agv.ignored, " +
+				"agv.lsTransaction, agv.publicData) " +
+				"FROM AnalysisGroupValue agv " + "join agv.lsState ags " + "join ags.analysisGroup ag " +
+				"join ag.experiments exp " + "where ags.lsType = :lsType AND ags.lsKind = :lsKind " +
 				"and exp.codeName = :experimentCode";
 		EntityManager em = entityManager();
 		TypedQuery<AnalysisGroupValueBaseDTO> q = em.createQuery(sqlQuery, AnalysisGroupValueBaseDTO.class);
@@ -227,56 +238,58 @@ public static TypedQuery<com.labsynch.labseer.dto.AnalysisGroupValueBaseDTO> fin
 		return q;
 	}
 
-	public static TypedQuery<com.labsynch.labseer.dto.AnalysisGroupValueDTO> findAnalysisGroupValueDTO(String batchCode, boolean showOnlyPublicData) {
+	public static TypedQuery<com.labsynch.labseer.dto.AnalysisGroupValueDTO> findAnalysisGroupValueDTO(String batchCode,
+			boolean showOnlyPublicData) {
 		String sqlQuery;
-		if (showOnlyPublicData){
-			sqlQuery = "select new com.labsynch.labseer.dto.AnalysisGroupValueDTO(agv.id, ags.id as stateId, expt.id as experimentId, prot.id as protocolId, expt.codeName, el.labelText as prefName, " 
-					+ "agv.lsType as lsType, agv.lsKind as lsKind, " + "agv.stringValue as stringValue, agv.numericValue as numericValue, " 
-					+ "agv2.codeValue AS testedLot, tl.labelText as geneId  " 
-					+ " ) FROM AnalysisGroup ag, LsThing thing " 
-					+ "JOIN ag.lsStates ags with ags.lsType = 'data' and ags.ignored = false " 
-					+ "JOIN ags.lsValues agv with agv.lsKind != 'tested concentration' AND agv.lsKind != 'batch code' AND agv.lsKind != 'time' and agv.ignored = false " 
-					+ "JOIN ags.lsValues agv2 with agv2.lsKind = 'batch code' and agv2.ignored = false " 
-					+ "JOIN thing.lsLabels tl with tl.ignored = false and tl.lsType = 'name' and tl.ignored = false and tl.preferred = true " 
+		if (showOnlyPublicData) {
+			sqlQuery = "select new com.labsynch.labseer.dto.AnalysisGroupValueDTO(agv.id, ags.id as stateId, expt.id as experimentId, prot.id as protocolId, expt.codeName, el.labelText as prefName, "
+					+ "agv.lsType as lsType, agv.lsKind as lsKind, "
+					+ "agv.stringValue as stringValue, agv.numericValue as numericValue, "
+					+ "agv2.codeValue AS testedLot, tl.labelText as geneId  "
+					+ " ) FROM AnalysisGroup ag, LsThing thing "
+					+ "JOIN ag.lsStates ags with ags.lsType = 'data' and ags.ignored = false "
+					+ "JOIN ags.lsValues agv with agv.lsKind != 'tested concentration' AND agv.lsKind != 'batch code' AND agv.lsKind != 'time' and agv.ignored = false "
+					+ "JOIN ags.lsValues agv2 with agv2.lsKind = 'batch code' and agv2.ignored = false "
+					+ "JOIN thing.lsLabels tl with tl.ignored = false and tl.lsType = 'name' and tl.ignored = false and tl.preferred = true "
 					+ "JOIN ag.experiments expt with expt.ignored = false "
 					+ "JOIN expt.protocol prot "
-					+ "JOIN expt.lsLabels el with el.lsType = 'name' and el.lsKind = 'experiment name' and el.preferred = true and el.ignored = false " 
+					+ "JOIN expt.lsLabels el with el.lsType = 'name' and el.lsKind = 'experiment name' and el.preferred = true and el.ignored = false "
 					+ "WHERE ag.ignored = false AND thing.codeName = agv2.codeValue AND agv2.codeValue = :batchCode "
-					+ "AND agv.publicData = :showOnlyPublicData " 
-					;
+					+ "AND agv.publicData = :showOnlyPublicData ";
 		} else {
-			sqlQuery = "select new com.labsynch.labseer.dto.AnalysisGroupValueDTO(agv.id, ags.id as stateId, expt.id as experimentId, prot.id as protocolId, expt.codeName, el.labelText as prefName, " 
-					+ "agv.lsType as lsType, agv.lsKind as lsKind, " + "agv.stringValue as stringValue, agv.numericValue as numericValue, " 
-					+ "agv2.codeValue AS testedLot, tl.labelText as geneId  " 
-					+ " ) FROM AnalysisGroup ag, LsThing thing " 
-					+ "JOIN ag.lsStates ags with ags.lsType = 'data' and ags.ignored = false " 
-					+ "JOIN ags.lsValues agv with agv.lsKind != 'tested concentration' AND agv.lsKind != 'batch code' AND agv.lsKind != 'time' and agv.ignored = false " 
-					+ "JOIN ags.lsValues agv2 with agv2.lsKind = 'batch code' and agv2.ignored = false " 
-					+ "JOIN thing.lsLabels tl with tl.ignored = false and tl.lsType = 'name' and tl.ignored = false and tl.preferred = true " 
+			sqlQuery = "select new com.labsynch.labseer.dto.AnalysisGroupValueDTO(agv.id, ags.id as stateId, expt.id as experimentId, prot.id as protocolId, expt.codeName, el.labelText as prefName, "
+					+ "agv.lsType as lsType, agv.lsKind as lsKind, "
+					+ "agv.stringValue as stringValue, agv.numericValue as numericValue, "
+					+ "agv2.codeValue AS testedLot, tl.labelText as geneId  "
+					+ " ) FROM AnalysisGroup ag, LsThing thing "
+					+ "JOIN ag.lsStates ags with ags.lsType = 'data' and ags.ignored = false "
+					+ "JOIN ags.lsValues agv with agv.lsKind != 'tested concentration' AND agv.lsKind != 'batch code' AND agv.lsKind != 'time' and agv.ignored = false "
+					+ "JOIN ags.lsValues agv2 with agv2.lsKind = 'batch code' and agv2.ignored = false "
+					+ "JOIN thing.lsLabels tl with tl.ignored = false and tl.lsType = 'name' and tl.ignored = false and tl.preferred = true "
 					+ "JOIN ag.experiments expt with expt.ignored = false "
 					+ "JOIN expt.protocol prot "
-					+ "JOIN expt.lsLabels el with el.lsType = 'name' and el.lsKind = 'experiment name' and el.preferred = true and el.ignored = false " 
+					+ "JOIN expt.lsLabels el with el.lsType = 'name' and el.lsKind = 'experiment name' and el.preferred = true and el.ignored = false "
 					+ "WHERE ag.ignored = false AND thing.codeName = agv2.codeValue AND agv2.codeValue = :batchCode ";
 		}
 		EntityManager em = entityManager();
 		TypedQuery<AnalysisGroupValueDTO> q = em.createQuery(sqlQuery, AnalysisGroupValueDTO.class);
 		q.setParameter("batchCode", batchCode);
-		if (showOnlyPublicData) q.setParameter("showOnlyPublicData", showOnlyPublicData);
+		if (showOnlyPublicData)
+			q.setParameter("showOnlyPublicData", showOnlyPublicData);
 		return q;
 	}
 
-
-
-	public static TypedQuery<com.labsynch.labseer.dto.AnalysisGroupValueDTO> findAnalysisGroupValueDTOCmpds(Set<java.lang.String> batchCodeList) {
-		String sqlQuery = "select new com.labsynch.labseer.dto.AnalysisGroupValueDTO(agv.id, ags.id as stateId, expt.id as experimentId, prot.id as protocolId, expt.codeName, el.labelText as prefName, " 
-				+ "agv.lsType as lsType, agv.lsKind as lsKind, " 
-				+ "agv.stringValue as stringValue, agv.numericValue as numericValue, " 
-				+ "agv2.codeValue AS testedLot, agv2.codeValue AS geneId " + " ) FROM AnalysisGroup ag " 
-				+ "JOIN ag.lsStates ags with ags.lsType = 'data' " 
-				+ "JOIN ags.lsValues agv with agv.lsKind != 'tested concentration' AND agv.lsKind != 'batch code' AND agv.lsKind != 'time' " 
-				+ "JOIN ags.lsValues agv2 with agv2.lsKind = 'batch code' " 
-				+ "JOIN ag.experiments expt with expt.ignored = false " 
-				+ "JOIN expt.lsLabels el with el.lsType = 'name' and el.lsKind = 'experiment name' and el.preferred = true and el.ignored = false " 
+	public static TypedQuery<com.labsynch.labseer.dto.AnalysisGroupValueDTO> findAnalysisGroupValueDTOCmpds(
+			Set<java.lang.String> batchCodeList) {
+		String sqlQuery = "select new com.labsynch.labseer.dto.AnalysisGroupValueDTO(agv.id, ags.id as stateId, expt.id as experimentId, prot.id as protocolId, expt.codeName, el.labelText as prefName, "
+				+ "agv.lsType as lsType, agv.lsKind as lsKind, "
+				+ "agv.stringValue as stringValue, agv.numericValue as numericValue, "
+				+ "agv2.codeValue AS testedLot, agv2.codeValue AS geneId " + " ) FROM AnalysisGroup ag "
+				+ "JOIN ag.lsStates ags with ags.lsType = 'data' "
+				+ "JOIN ags.lsValues agv with agv.lsKind != 'tested concentration' AND agv.lsKind != 'batch code' AND agv.lsKind != 'time' "
+				+ "JOIN ags.lsValues agv2 with agv2.lsKind = 'batch code' "
+				+ "JOIN ag.experiments expt with expt.ignored = false "
+				+ "JOIN expt.lsLabels el with el.lsType = 'name' and el.lsKind = 'experiment name' and el.preferred = true and el.ignored = false "
 				+ "JOIN expt.protocol prot "
 				+ "WHERE ag.ignored = false and agv2.codeValue IN (:batchCodeList) ";
 		EntityManager em = entityManager();
@@ -286,18 +299,21 @@ public static TypedQuery<com.labsynch.labseer.dto.AnalysisGroupValueDTO> findAna
 		return q;
 	}
 
-	public static TypedQuery<com.labsynch.labseer.dto.AnalysisGroupValueDTO> findAnalysisGroupValueDTO(Set<java.lang.String> batchCodeList) {
-		String sqlQuery = "select new com.labsynch.labseer.dto.AnalysisGroupValueDTO(agv.id, ags.id as stateId, expt.id as experimentId, prot.id as protocolId, expt.codeName, el.labelText as prefName, " 
-				+ "agv.lsType as lsType, agv.lsKind as lsKind, " + "agv.stringValue as stringValue, agv.numericValue as numericValue, " 
-				+ "agv2.codeValue AS testedLot, agv2.codeValue as geneId  " 
+	public static TypedQuery<com.labsynch.labseer.dto.AnalysisGroupValueDTO> findAnalysisGroupValueDTO(
+			Set<java.lang.String> batchCodeList) {
+		String sqlQuery = "select new com.labsynch.labseer.dto.AnalysisGroupValueDTO(agv.id, ags.id as stateId, expt.id as experimentId, prot.id as protocolId, expt.codeName, el.labelText as prefName, "
+				+ "agv.lsType as lsType, agv.lsKind as lsKind, "
+				+ "agv.stringValue as stringValue, agv.numericValue as numericValue, "
+				+ "agv2.codeValue AS testedLot, agv2.codeValue as geneId  "
 				+ " ) FROM AnalysisGroup ag"
-//				+ ", LsThing thing " 
-				+ "JOIN ag.lsStates ags with ags.lsType = 'data' and ags.ignored = false " 
-				+ "JOIN ags.lsValues agv with agv.lsKind != 'tested concentration' AND agv.lsKind != 'batch code' AND agv.lsKind != 'time' and agv.ignored = false " 
-				+ "JOIN ags.lsValues agv2 with agv2.lsKind = 'batch code' and agv2.ignored = false " 
-//				+ "JOIN thing.lsLabels tl with tl.ignored = false and tl.lsType = 'name' and tl.ignored = false and tl.preferred = true " 
-				+ "JOIN ag.experiments expt with expt.ignored = false " 
-				+ "JOIN expt.lsLabels el with el.lsType = 'name' and el.lsKind = 'experiment name' and el.preferred = true and el.ignored = false " 
+				// + ", LsThing thing "
+				+ "JOIN ag.lsStates ags with ags.lsType = 'data' and ags.ignored = false "
+				+ "JOIN ags.lsValues agv with agv.lsKind != 'tested concentration' AND agv.lsKind != 'batch code' AND agv.lsKind != 'time' and agv.ignored = false "
+				+ "JOIN ags.lsValues agv2 with agv2.lsKind = 'batch code' and agv2.ignored = false "
+				// + "JOIN thing.lsLabels tl with tl.ignored = false and tl.lsType = 'name' and
+				// tl.ignored = false and tl.preferred = true "
+				+ "JOIN ag.experiments expt with expt.ignored = false "
+				+ "JOIN expt.lsLabels el with el.lsType = 'name' and el.lsKind = 'experiment name' and el.preferred = true and el.ignored = false "
 				+ "WHERE ag.ignored = false AND thing.codeName = agv2.codeValue AND agv2.codeValue IN (:batchCodeList) ";
 
 		EntityManager em = entityManager();
@@ -307,18 +323,21 @@ public static TypedQuery<com.labsynch.labseer.dto.AnalysisGroupValueDTO> findAna
 		return q;
 	}
 
-	public static TypedQuery<AnalysisGroupValueDTO> findAnalysisGroupValueDTO(Set<String> batchCodeList, boolean publicData) {
-		String sqlQuery = "select new com.labsynch.labseer.dto.AnalysisGroupValueDTO(agv.id, ags.id as stateId, expt.id as experimentId, prot.id as protocolId, expt.codeName, el.labelText as prefName, " 
-				+ "agv.lsType as lsType, agv.lsKind as lsKind, " + "agv.stringValue as stringValue, agv.numericValue as numericValue, " 
-				+ "agv2.codeValue AS testedLot, agv2.codeValue as geneId  " 
-				+ " ) FROM AnalysisGroup ag " 
-				+ "JOIN ag.lsStates ags with ags.lsType = 'data' and ags.ignored = false " 
-				+ "JOIN ags.lsValues agv with agv.lsKind != 'tested concentration' AND agv.lsKind != 'batch code' AND agv.lsKind != 'time' and agv.ignored = false " 
-				+ "JOIN ags.lsValues agv2 with agv2.lsKind = 'batch code' and agv2.ignored = false " 
-//				+ "LEFT OUTER JOIN LsThing thing with thing.codeName = agv2.codeValue "
-//				+ "LEFT OUTER JOIN thing.lsLabels tl with tl.ignored = false and tl.lsType = 'name' and tl.ignored = false and tl.preferred = true  " 
-				+ "JOIN ag.experiments expt with expt.ignored = false " 
-				+ "JOIN expt.lsLabels el with el.lsType = 'name' and el.lsKind = 'experiment name' and el.preferred = true and el.ignored = false " 
+	public static TypedQuery<AnalysisGroupValueDTO> findAnalysisGroupValueDTO(Set<String> batchCodeList,
+			boolean publicData) {
+		String sqlQuery = "select new com.labsynch.labseer.dto.AnalysisGroupValueDTO(agv.id, ags.id as stateId, expt.id as experimentId, prot.id as protocolId, expt.codeName, el.labelText as prefName, "
+				+ "agv.lsType as lsType, agv.lsKind as lsKind, "
+				+ "agv.stringValue as stringValue, agv.numericValue as numericValue, "
+				+ "agv2.codeValue AS testedLot, agv2.codeValue as geneId  "
+				+ " ) FROM AnalysisGroup ag "
+				+ "JOIN ag.lsStates ags with ags.lsType = 'data' and ags.ignored = false "
+				+ "JOIN ags.lsValues agv with agv.lsKind != 'tested concentration' AND agv.lsKind != 'batch code' AND agv.lsKind != 'time' and agv.ignored = false "
+				+ "JOIN ags.lsValues agv2 with agv2.lsKind = 'batch code' and agv2.ignored = false "
+				// + "LEFT OUTER JOIN LsThing thing with thing.codeName = agv2.codeValue "
+				// + "LEFT OUTER JOIN thing.lsLabels tl with tl.ignored = false and tl.lsType =
+				// 'name' and tl.ignored = false and tl.preferred = true "
+				+ "JOIN ag.experiments expt with expt.ignored = false "
+				+ "JOIN expt.lsLabels el with el.lsType = 'name' and el.lsKind = 'experiment name' and el.preferred = true and el.ignored = false "
 				+ "WHERE ag.ignored = false AND agv2.codeValue IN (:batchCodeList) AND agv.publicData = :publicData  ";
 		EntityManager em = entityManager();
 		TypedQuery<AnalysisGroupValueDTO> q = em.createQuery(sqlQuery, AnalysisGroupValueDTO.class);
@@ -328,15 +347,15 @@ public static TypedQuery<AnalysisGroupValueDTO> findAnalysisGroupValueDTO(Set<St
 		return q;
 	}
 
-
-	public static TypedQuery<com.labsynch.labseer.dto.AnalysisGroupValueDTO> findAnalysisGroupValueDTO(Set<java.lang.String> batchCodeList, Set<java.lang.String> experimentCodeList) {
+	public static TypedQuery<com.labsynch.labseer.dto.AnalysisGroupValueDTO> findAnalysisGroupValueDTO(
+			Set<java.lang.String> batchCodeList, Set<java.lang.String> experimentCodeList) {
 		logger.debug("size for batchCodeList: " + batchCodeList.size());
 		logger.debug("size for experimentCodeList: " + experimentCodeList.size());
 		String sqlQuery = "select new com.labsynch.labseer.dto.AnalysisGroupValueDTO(agv.id, prot.id as protocolId, protLabel.labelText as protocolName, "
-		+ "expt.id as experimentId, expt.codeName, el.labelText as prefName, agv.lsType as lsType, agv.lsKind as lsKind, "
-				+ "agv.stringValue as stringValue, agv.numericValue as numericValue, agv.codeValue as codeValue, agv.dateValue as dateValue, agv.fileValue as fileValue, " 
+				+ "expt.id as experimentId, expt.codeName, el.labelText as prefName, agv.lsType as lsType, agv.lsKind as lsKind, "
+				+ "agv.stringValue as stringValue, agv.numericValue as numericValue, agv.codeValue as codeValue, agv.dateValue as dateValue, agv.fileValue as fileValue, "
 				+ "agv2.codeValue AS testedLot "
-				+ ", agv2.codeValue as geneId  " 
+				+ ", agv2.codeValue as geneId  "
 				+ ", agv.unitKind as resultUnit "
 				+ ", agv.operatorKind as operator "
 				+ ", agv.uncertainty as uncertainty "
@@ -346,48 +365,51 @@ public static TypedQuery<com.labsynch.labseer.dto.AnalysisGroupValueDTO> findAna
 				+ ", agv3.numericValue as testedTime "
 				+ ", agv3.unitKind as testedTimeUnit "
 				+ " ) FROM AnalysisGroup ag "
-		+ "JOIN ag.lsStates ags with ags.ignored = false AND ags.lsType in ('data', 'metadata') " 
-		+ "JOIN ags.lsValues agv with agv.lsKind NOT IN ('tested concentration', 'batch code', 'time') and agv.ignored = false "
-		+ "JOIN ags.lsValues agv2 with agv2.lsKind = 'batch code' and agv2.ignored = false " 
-		+ "LEFT OUTER JOIN ags.lsValues agv3 with agv3.lsKind = 'time' and agv3.ignored = false "
-		+ "JOIN ag.experiments expt with expt.ignored = false " 
-		+ "JOIN expt.protocol prot with prot.ignored = false "
-        + "JOIN prot.lsLabels protLabel with protLabel.ignored = false and protLabel.preferred = true "
-		+ "JOIN expt.lsLabels el with el.lsType = 'name' and el.lsKind = 'experiment name' and el.preferred = true and el.ignored = false " 
+				+ "JOIN ag.lsStates ags with ags.ignored = false AND ags.lsType in ('data', 'metadata') "
+				+ "JOIN ags.lsValues agv with agv.lsKind NOT IN ('tested concentration', 'batch code', 'time') and agv.ignored = false "
+				+ "JOIN ags.lsValues agv2 with agv2.lsKind = 'batch code' and agv2.ignored = false "
+				+ "LEFT OUTER JOIN ags.lsValues agv3 with agv3.lsKind = 'time' and agv3.ignored = false "
+				+ "JOIN ag.experiments expt with expt.ignored = false "
+				+ "JOIN expt.protocol prot with prot.ignored = false "
+				+ "JOIN prot.lsLabels protLabel with protLabel.ignored = false and protLabel.preferred = true "
+				+ "JOIN expt.lsLabels el with el.lsType = 'name' and el.lsKind = 'experiment name' and el.preferred = true and el.ignored = false "
 				+ "WHERE ag.ignored = false  "
-				+ "AND agv2.codeValue IN (:batchCodeList) " + "AND expt.codeName IN  (:experimentCodeList) and expt.ignored = false";
-		
-		logger.debug("Query: "  + sqlQuery);
+				+ "AND agv2.codeValue IN (:batchCodeList) "
+				+ "AND expt.codeName IN  (:experimentCodeList) and expt.ignored = false";
+
+		logger.debug("Query: " + sqlQuery);
 		EntityManager em = entityManager();
 		TypedQuery<AnalysisGroupValueDTO> q = em.createQuery(sqlQuery, AnalysisGroupValueDTO.class);
 		q.setParameter("batchCodeList", batchCodeList);
 		q.setParameter("experimentCodeList", experimentCodeList);
 		return q;
 	}
-	
-	public static List<AnalysisGroupValueDTO> findAnalysisGroupValueDTO(Set<java.lang.String> batchCodeList, Set<java.lang.String> experimentCodeList, boolean publicData) {
+
+	public static List<AnalysisGroupValueDTO> findAnalysisGroupValueDTO(Set<java.lang.String> batchCodeList,
+			Set<java.lang.String> experimentCodeList, boolean publicData) {
 		logger.debug("size of batchCodeList: " + batchCodeList.size());
 		logger.debug("size of experimentCodeList: " + experimentCodeList.size());
-		
+
 		List<AnalysisGroupValueDTO> results;
-		
-		if (batchCodeList.size() > 500 || experimentCodeList.size() > 500){
+
+		if (batchCodeList.size() > 500 || experimentCodeList.size() > 500) {
 			results = findAnalysisGroupValueDTOByTempTables(batchCodeList, experimentCodeList, publicData);
 		} else {
 			results = findAnalysisGroupValueDTOByInClause(batchCodeList, experimentCodeList, publicData);
 		}
-		
+
 		return results;
 	}
 
-	public static List<AnalysisGroupValueDTO> findAnalysisGroupValueDTOByInClause(Set<java.lang.String> batchCodeList, Set<java.lang.String> experimentCodeList, boolean publicData) {
-			
-		String sqlQuery = "select new com.labsynch.labseer.dto.AnalysisGroupValueDTO( agv.id, prot.id as protocolId, protLabel.labelText as protocolName, " 
+	public static List<AnalysisGroupValueDTO> findAnalysisGroupValueDTOByInClause(Set<java.lang.String> batchCodeList,
+			Set<java.lang.String> experimentCodeList, boolean publicData) {
+
+		String sqlQuery = "select new com.labsynch.labseer.dto.AnalysisGroupValueDTO( agv.id, prot.id as protocolId, protLabel.labelText as protocolName, "
 				+ "expt.id as experimentId, expt.codeName, el.labelText as prefName, "
 				+ "ag.id as agId, ags.id as agStateId, "
-				+ "agv.lsType as lsType, agv.lsKind as lsKind, " 
-				+ "agv.stringValue as stringValue, agv.numericValue as numericValue, agv.codeValue as codeValue, agv.dateValue as dateValue, agv.fileValue as fileValue, " 
-				+ "agv2.codeValue AS testedLot, agv2.codeValue as geneId  " 
+				+ "agv.lsType as lsType, agv.lsKind as lsKind, "
+				+ "agv.stringValue as stringValue, agv.numericValue as numericValue, agv.codeValue as codeValue, agv.dateValue as dateValue, agv.fileValue as fileValue, "
+				+ "agv2.codeValue AS testedLot, agv2.codeValue as geneId  "
 				+ ", agv.unitKind as resultUnit "
 				+ ", agv.operatorKind as operator "
 				+ ", agv.uncertainty as uncertainty "
@@ -396,17 +418,17 @@ public static List<AnalysisGroupValueDTO> findAnalysisGroupValueDTOByInClause(Se
 				+ ", agv2.concUnit as testedConcentrationUnit "
 				+ ", agv3.numericValue as testedTime "
 				+ ", agv3.unitKind as testedTimeUnit "
-		+ " ) FROM AnalysisGroup ag  "
-		+ "JOIN ag.lsStates ags with ags.lsType IN ('data', 'metadata') and ags.ignored = false " 
-		+ "JOIN ags.lsValues agv with agv.lsKind NOT IN ('tested concentration', 'batch code', 'time') and agv.ignored = false " 
-		+ "JOIN ags.lsValues agv2 with agv2.lsKind = 'batch code' and agv2.ignored = false "
-		+ "LEFT OUTER JOIN ags.lsValues agv3 with agv3.lsKind = 'time' and agv3.ignored = false "
-		+ "JOIN ag.experiments expt with expt.ignored = false " 
-		+ "LEFT OUTER JOIN expt.protocol prot with prot.ignored = false "
-		+ "JOIN expt.protocol prot with prot.ignored = false "
-        + "JOIN prot.lsLabels protLabel with protLabel.ignored = false and protLabel.preferred = true "
-		+ "LEFT OUTER JOIN expt.lsLabels el with el.lsType = 'name' and el.lsKind = 'experiment name' and el.preferred = true and el.ignored = false " 
-		+ "WHERE ag.ignored = false AND agv.publicData = :publicData ";
+				+ " ) FROM AnalysisGroup ag  "
+				+ "JOIN ag.lsStates ags with ags.lsType IN ('data', 'metadata') and ags.ignored = false "
+				+ "JOIN ags.lsValues agv with agv.lsKind NOT IN ('tested concentration', 'batch code', 'time') and agv.ignored = false "
+				+ "JOIN ags.lsValues agv2 with agv2.lsKind = 'batch code' and agv2.ignored = false "
+				+ "LEFT OUTER JOIN ags.lsValues agv3 with agv3.lsKind = 'time' and agv3.ignored = false "
+				+ "JOIN ag.experiments expt with expt.ignored = false "
+				+ "LEFT OUTER JOIN expt.protocol prot with prot.ignored = false "
+				+ "JOIN expt.protocol prot with prot.ignored = false "
+				+ "JOIN prot.lsLabels protLabel with protLabel.ignored = false and protLabel.preferred = true "
+				+ "LEFT OUTER JOIN expt.lsLabels el with el.lsType = 'name' and el.lsKind = 'experiment name' and el.preferred = true and el.ignored = false "
+				+ "WHERE ag.ignored = false AND agv.publicData = :publicData ";
 		if (!batchCodeList.isEmpty()) {
 			sqlQuery += "AND agv2.codeValue IN (:batchCodeList) ";
 
@@ -414,33 +436,36 @@ public static List<AnalysisGroupValueDTO> findAnalysisGroupValueDTOByInClause(Se
 		if (!experimentCodeList.isEmpty()) {
 			sqlQuery += "AND expt.codeName IN (:experimentCodeList) ";
 		}
-		
+
 		logger.debug("query sql: " + sqlQuery);
 
 		EntityManager em = entityManager();
 		TypedQuery<AnalysisGroupValueDTO> q = em.createQuery(sqlQuery, AnalysisGroupValueDTO.class);
-		if (!batchCodeList.isEmpty()) q.setParameter("batchCodeList", batchCodeList);
-		if (!experimentCodeList.isEmpty()) q.setParameter("experimentCodeList", experimentCodeList);
+		if (!batchCodeList.isEmpty())
+			q.setParameter("batchCodeList", batchCodeList);
+		if (!experimentCodeList.isEmpty())
+			q.setParameter("experimentCodeList", experimentCodeList);
 		q.setParameter("publicData", publicData);
-		
+
 		List<AnalysisGroupValueDTO> results = q.getResultList();
-		
+
 		return results;
 	}
-	
-	public static List<AnalysisGroupValueDTO> findAnalysisGroupValueDTOByTempTables(Set<java.lang.String> batchCodeList, Set<java.lang.String> experimentCodeList, boolean publicData) {
-		
+
+	public static List<AnalysisGroupValueDTO> findAnalysisGroupValueDTOByTempTables(Set<java.lang.String> batchCodeList,
+			Set<java.lang.String> experimentCodeList, boolean publicData) {
+
 		Date recordedDate = new Date();
 		String recordedBy = "system";
-		long batchTransactionId = TempSelectTable.saveStrings(batchCodeList,  recordedBy, recordedDate);
-		long expTransactionId = TempSelectTable.saveStrings(experimentCodeList,  recordedBy, recordedDate);
+		long batchTransactionId = TempSelectTable.saveStrings(batchCodeList, recordedBy, recordedDate);
+		long expTransactionId = TempSelectTable.saveStrings(experimentCodeList, recordedBy, recordedDate);
 
-		String sqlQuery = "select new com.labsynch.labseer.dto.AnalysisGroupValueDTO( agv.id, prot.id as protocolId, protLabel.labelText as protocolName, " 
-				+ "expt.id as experimentId, expt.codeName, el.labelText as prefName, " 
+		String sqlQuery = "select new com.labsynch.labseer.dto.AnalysisGroupValueDTO( agv.id, prot.id as protocolId, protLabel.labelText as protocolName, "
+				+ "expt.id as experimentId, expt.codeName, el.labelText as prefName, "
 				+ "ag.id as agId, ags.id as agStateId, "
-				+ "agv.lsType as lsType, agv.lsKind as lsKind, " 
-				+ "agv.stringValue as stringValue, agv.numericValue as numericValue, agv.codeValue as codeValue, agv.dateValue as dateValue, agv.fileValue as fileValue, " 
-				+ "agv2.codeValue AS testedLot, agv2.codeValue as geneId  " 
+				+ "agv.lsType as lsType, agv.lsKind as lsKind, "
+				+ "agv.stringValue as stringValue, agv.numericValue as numericValue, agv.codeValue as codeValue, agv.dateValue as dateValue, agv.fileValue as fileValue, "
+				+ "agv2.codeValue AS testedLot, agv2.codeValue as geneId  "
 				+ ", agv.unitKind as resultUnit "
 				+ ", agv.operatorKind as operator "
 				+ ", agv.uncertainty as uncertainty "
@@ -449,24 +474,23 @@ public static List<AnalysisGroupValueDTO> findAnalysisGroupValueDTOByTempTables(
 				+ ", agv2.concUnit as testedConcentrationUnit "
 				+ ", agv3.numericValue as testedTime "
 				+ ", agv3.unitKind as testedTimeUnit "
-		+ " ) FROM AnalysisGroup ag, TempSelectTable tst, TempSelectTable tst2 "
-		+ "JOIN ag.lsStates ags with ags.lsType IN ('data', 'metadata') and ags.ignored = false " 
-		+ "JOIN ags.lsValues agv with agv.lsKind NOT IN ('tested concentration', 'batch code', 'time') and agv.ignored = false " 
-		+ "JOIN ags.lsValues agv2 with agv2.lsKind = 'batch code' and agv2.ignored = false "
-		+ "LEFT OUTER JOIN ags.lsValues agv3 with agv3.lsKind = 'time' and agv3.ignored = false "
-		+ "JOIN ag.experiments expt with expt.ignored = false " 
-		+ "LEFT OUTER JOIN expt.protocol prot with prot.ignored = false "
-		+ "JOIN expt.protocol prot with prot.ignored = false "
-        + "JOIN prot.lsLabels protLabel with protLabel.ignored = false and protLabel.preferred = true "
-		+ "LEFT OUTER JOIN expt.lsLabels el with el.lsType = 'name' and el.lsKind = 'experiment name' and el.preferred = true and el.ignored = false " 
-//        + "JOIN TempSelectTable tst with tst.lsTransaction = :transactionId "
-		+ "WHERE ag.ignored = false "
-		+ "AND tst.lsTransaction = :batchTransactionId "
-		+ "AND tst2.lsTransaction = :expTransactionId "
-		+ "AND agv2.codeValue = tst.stringVar AND agv.publicData = :publicData " 
-		+ "AND expt.codeName = tst2.stringVar and expt.ignored = false";
-		
-		
+				+ " ) FROM AnalysisGroup ag, TempSelectTable tst, TempSelectTable tst2 "
+				+ "JOIN ag.lsStates ags with ags.lsType IN ('data', 'metadata') and ags.ignored = false "
+				+ "JOIN ags.lsValues agv with agv.lsKind NOT IN ('tested concentration', 'batch code', 'time') and agv.ignored = false "
+				+ "JOIN ags.lsValues agv2 with agv2.lsKind = 'batch code' and agv2.ignored = false "
+				+ "LEFT OUTER JOIN ags.lsValues agv3 with agv3.lsKind = 'time' and agv3.ignored = false "
+				+ "JOIN ag.experiments expt with expt.ignored = false "
+				+ "LEFT OUTER JOIN expt.protocol prot with prot.ignored = false "
+				+ "JOIN expt.protocol prot with prot.ignored = false "
+				+ "JOIN prot.lsLabels protLabel with protLabel.ignored = false and protLabel.preferred = true "
+				+ "LEFT OUTER JOIN expt.lsLabels el with el.lsType = 'name' and el.lsKind = 'experiment name' and el.preferred = true and el.ignored = false "
+				// + "JOIN TempSelectTable tst with tst.lsTransaction = :transactionId "
+				+ "WHERE ag.ignored = false "
+				+ "AND tst.lsTransaction = :batchTransactionId "
+				+ "AND tst2.lsTransaction = :expTransactionId "
+				+ "AND agv2.codeValue = tst.stringVar AND agv.publicData = :publicData "
+				+ "AND expt.codeName = tst2.stringVar and expt.ignored = false";
+
 		logger.debug("query sql: " + sqlQuery);
 
 		EntityManager em = entityManager();
@@ -474,25 +498,26 @@ public static List<AnalysisGroupValueDTO> findAnalysisGroupValueDTOByTempTables(
 		q.setParameter("batchTransactionId", batchTransactionId);
 		q.setParameter("expTransactionId", expTransactionId);
 		q.setParameter("publicData", publicData);
-		
+
 		List<AnalysisGroupValueDTO> results = q.getResultList();
-		
+
 		int numberOfEntries = TempSelectTable.deleteTempSelectTableEntries(expTransactionId);
 		int numberOfBatchEntries = TempSelectTable.deleteTempSelectTableEntries(batchTransactionId);
 		logger.info("Deleted number of batch entries: " + numberOfBatchEntries);
 		logger.info("Deleted number of experiemnt entries: " + numberOfEntries);
-		
+
 		return results;
 	}
-	
-	public static TypedQuery<com.labsynch.labseer.dto.AnalysisGroupValueDTO> findAnalysisGroupValueDTOByExperiments(Set<java.lang.String> experimentCodeList) {
+
+	public static TypedQuery<com.labsynch.labseer.dto.AnalysisGroupValueDTO> findAnalysisGroupValueDTOByExperiments(
+			Set<java.lang.String> experimentCodeList) {
 		String sqlQuery = "select new com.labsynch.labseer.dto.AnalysisGroupValueDTO(agv.id, prot.id as protocolId, protLabel.labelText as protocolName, "
 				+ "expt.id as experimentId, expt.codeName, el.labelText as prefName, "
-				+ "ag.id as agId, ags.id as agStateId, "				
+				+ "ag.id as agId, ags.id as agStateId, "
 				+ "agv.lsType as lsType, agv.lsKind as lsKind, "
-				+ "agv.stringValue as stringValue, agv.numericValue as numericValue, agv.codeValue as codeValue, agv.dateValue as dateValue, agv.fileValue as fileValue, " 
+				+ "agv.stringValue as stringValue, agv.numericValue as numericValue, agv.codeValue as codeValue, agv.dateValue as dateValue, agv.fileValue as fileValue, "
 				+ "agv2.codeValue AS testedLot "
-				+ ", agv2.codeValue as geneId  " 
+				+ ", agv2.codeValue as geneId  "
 				+ ", agv.unitKind as resultUnit "
 				+ ", agv.operatorKind as operator "
 				+ ", agv.uncertainty as uncertainty "
@@ -502,18 +527,18 @@ public static TypedQuery<com.labsynch.labseer.dto.AnalysisGroupValueDTO> findAna
 				+ ", agv3.numericValue as testedTime "
 				+ ", agv3.unitKind as testedTimeUnit "
 				+ " ) FROM AnalysisGroup ag "
-				+ "JOIN ag.lsStates ags with ags.ignored = false AND ags.lsType in ('data', 'metadata') " 
+				+ "JOIN ag.lsStates ags with ags.ignored = false AND ags.lsType in ('data', 'metadata') "
 				+ "JOIN ags.lsValues agv with agv.lsKind NOT IN ('tested concentration', 'batch code', 'time') and agv.ignored = false "
-				+ "JOIN ags.lsValues agv2 with agv2.lsKind = 'batch code' and agv2.ignored = false " 
+				+ "JOIN ags.lsValues agv2 with agv2.lsKind = 'batch code' and agv2.ignored = false "
 				+ "LEFT OUTER JOIN ags.lsValues agv3 with agv3.lsKind = 'time' and agv3.ignored = false "
-				+ "JOIN ag.experiments expt with expt.ignored = false " 
+				+ "JOIN ag.experiments expt with expt.ignored = false "
 				+ "JOIN expt.protocol prot with prot.ignored = false "
 				+ "JOIN prot.lsLabels protLabel with protLabel.ignored = false and protLabel.preferred = true "
-				+ "JOIN expt.lsLabels el with el.lsType = 'name' and el.lsKind = 'experiment name' and el.preferred = true and el.ignored = false " 
+				+ "JOIN expt.lsLabels el with el.lsType = 'name' and el.lsKind = 'experiment name' and el.preferred = true and el.ignored = false "
 				+ "WHERE ag.ignored = false  "
-				+ "AND agv2.codeValue IN (:batchCodeList) " + "AND expt.codeName IN  (:experimentCodeList) and expt.ignored = false";
+				+ "AND agv2.codeValue IN (:batchCodeList) "
+				+ "AND expt.codeName IN  (:experimentCodeList) and expt.ignored = false";
 
-	
 		logger.debug("query sql: " + sqlQuery);
 		EntityManager em = entityManager();
 		TypedQuery<AnalysisGroupValueDTO> q = em.createQuery(sqlQuery, AnalysisGroupValueDTO.class);
@@ -521,14 +546,15 @@ public static TypedQuery<com.labsynch.labseer.dto.AnalysisGroupValueDTO> findAna
 		return q;
 	}
 
-	public static TypedQuery<com.labsynch.labseer.dto.AnalysisGroupValueDTO> findAnalysisGroupValueDTOByExperiments(Set<java.lang.String> experimentCodeList, boolean publicData) {
+	public static TypedQuery<com.labsynch.labseer.dto.AnalysisGroupValueDTO> findAnalysisGroupValueDTOByExperiments(
+			Set<java.lang.String> experimentCodeList, boolean publicData) {
 		String sqlQuery = "select new com.labsynch.labseer.dto.AnalysisGroupValueDTO(agv.id, prot.id as protocolId, protLabel.labelText as protocolName, "
 				+ "expt.id as experimentId, expt.codeName, el.labelText as prefName, "
-				+ "ag.id as agId, ags.id as agStateId, "				
+				+ "ag.id as agId, ags.id as agStateId, "
 				+ "agv.lsType as lsType, agv.lsKind as lsKind, "
-				+ "agv.stringValue as stringValue, agv.numericValue as numericValue, agv.codeValue as codeValue, agv.dateValue as dateValue, agv.fileValue as fileValue, " 
+				+ "agv.stringValue as stringValue, agv.numericValue as numericValue, agv.codeValue as codeValue, agv.dateValue as dateValue, agv.fileValue as fileValue, "
 				+ "agv2.codeValue AS testedLot "
-				+ ", agv2.codeValue as geneId  " 
+				+ ", agv2.codeValue as geneId  "
 				+ ", agv.unitKind as resultUnit "
 				+ ", agv.operatorKind as operator "
 				+ ", agv.uncertainty as uncertainty "
@@ -538,17 +564,17 @@ public static TypedQuery<com.labsynch.labseer.dto.AnalysisGroupValueDTO> findAna
 				+ ", agv3.numericValue as testedTime "
 				+ ", agv3.unitKind as testedTimeUnit "
 				+ " ) FROM AnalysisGroup ag "
-				+ "JOIN ag.lsStates ags with ags.ignored = false AND ags.lsType in ('data', 'metadata') " 
+				+ "JOIN ag.lsStates ags with ags.ignored = false AND ags.lsType in ('data', 'metadata') "
 				+ "JOIN ags.lsValues agv with agv.lsKind NOT IN ('tested concentration', 'batch code', 'time') and agv.ignored = false "
-				+ "JOIN ags.lsValues agv2 with agv2.lsKind = 'batch code' and agv2.ignored = false " 
+				+ "JOIN ags.lsValues agv2 with agv2.lsKind = 'batch code' and agv2.ignored = false "
 				+ "LEFT OUTER JOIN ags.lsValues agv3 with agv3.lsKind = 'time' and agv3.ignored = false "
-				+ "JOIN ag.experiments expt with expt.ignored = false " 
+				+ "JOIN ag.experiments expt with expt.ignored = false "
 				+ "JOIN expt.protocol prot with prot.ignored = false "
 				+ "JOIN prot.lsLabels protLabel with protLabel.ignored = false and protLabel.preferred = true "
-				+ "JOIN expt.lsLabels el with el.lsType = 'name' and el.lsKind = 'experiment name' and el.preferred = true and el.ignored = false " 
+				+ "JOIN expt.lsLabels el with el.lsType = 'name' and el.lsKind = 'experiment name' and el.preferred = true and el.ignored = false "
 				+ "WHERE ag.ignored = false AND agv.publicData = :publicData "
 				+ "AND expt.codeName IN  (:experimentCodeList) and expt.ignored = false";
-		
+
 		logger.debug("query sql: " + sqlQuery);
 		EntityManager em = entityManager();
 		TypedQuery<AnalysisGroupValueDTO> q = em.createQuery(sqlQuery, AnalysisGroupValueDTO.class);
@@ -557,14 +583,15 @@ public static TypedQuery<com.labsynch.labseer.dto.AnalysisGroupValueDTO> findAna
 		return q;
 	}
 
-	public static TypedQuery<com.labsynch.labseer.dto.ValueTypeKindDTO> findAnalysisGroupValueTypeKindDTO(Collection<java.lang.String> exptCodeList) {
-		String sqlQuery = "select new com.labsynch.labseer.dto.ValueTypeKindDTO(agv.lsType as lsType, agv.lsKind as lsKind) " 
-				+ "FROM AnalysisGroupValue agv " + "join agv.lsState ags " 
-				+ "join ags.analysisGroup ag " 
-				+ "join ag.experiments exp " 
-				+ "where exp.codeName in (:exptCodeList) " 
-				+ "AND agv.lsType IN ('stringValue', 'numericValue') " 
-				+ "and ags.lsType = 'data' and agv.ignored = false and ags.ignored = false and ag.ignored = false " 
+	public static TypedQuery<com.labsynch.labseer.dto.ValueTypeKindDTO> findAnalysisGroupValueTypeKindDTO(
+			Collection<java.lang.String> exptCodeList) {
+		String sqlQuery = "select new com.labsynch.labseer.dto.ValueTypeKindDTO(agv.lsType as lsType, agv.lsKind as lsKind) "
+				+ "FROM AnalysisGroupValue agv " + "join agv.lsState ags "
+				+ "join ags.analysisGroup ag "
+				+ "join ag.experiments exp "
+				+ "where exp.codeName in (:exptCodeList) "
+				+ "AND agv.lsType IN ('stringValue', 'numericValue') "
+				+ "and ags.lsType = 'data' and agv.ignored = false and ags.ignored = false and ag.ignored = false "
 				+ "group by agv.lsType, agv.lsKind";
 		EntityManager em = entityManager();
 		TypedQuery<ValueTypeKindDTO> q = em.createQuery(sqlQuery, ValueTypeKindDTO.class);
@@ -573,15 +600,16 @@ public static TypedQuery<com.labsynch.labseer.dto.ValueTypeKindDTO> findAnalysis
 	}
 
 	@Transactional
-	public static TypedQuery<com.labsynch.labseer.dto.ValueTypeKindDTO> findAnalysisGroupValueTypeKindDTO(String exptCode) {
-		String sqlQuery = "select new com.labsynch.labseer.dto.ValueTypeKindDTO(agv.lsType as lsType, agv.lsKind as lsKind) " 
-				+ "FROM AnalysisGroupValue agv " 
-				+ "JOIN agv.lsState ags " 
-				+ "JOIN ags.analysisGroup ag " 
-				+ "JOIN ag.experiments exp " 
-				+ "where exp.codeName = :exptCode " 
-				+ "AND agv.lsType IN ('stringValue', 'numericValue', 'dateValue', 'fileValue', 'urlValue') " 
-				+ "AND ags.lsType = 'data' and agv.ignored = false and ags.ignored = false and ag.ignored = false " 
+	public static TypedQuery<com.labsynch.labseer.dto.ValueTypeKindDTO> findAnalysisGroupValueTypeKindDTO(
+			String exptCode) {
+		String sqlQuery = "select new com.labsynch.labseer.dto.ValueTypeKindDTO(agv.lsType as lsType, agv.lsKind as lsKind) "
+				+ "FROM AnalysisGroupValue agv "
+				+ "JOIN agv.lsState ags "
+				+ "JOIN ags.analysisGroup ag "
+				+ "JOIN ag.experiments exp "
+				+ "where exp.codeName = :exptCode "
+				+ "AND agv.lsType IN ('stringValue', 'numericValue', 'dateValue', 'fileValue', 'urlValue') "
+				+ "AND ags.lsType = 'data' and agv.ignored = false and ags.ignored = false and ag.ignored = false "
 				+ "group by agv.lsType, agv.lsKind";
 		EntityManager em = entityManager();
 		TypedQuery<ValueTypeKindDTO> q = em.createQuery(sqlQuery, ValueTypeKindDTO.class);
@@ -590,79 +618,92 @@ public static TypedQuery<com.labsynch.labseer.dto.ValueTypeKindDTO> findAnalysis
 	}
 
 	@Transactional
-	public static TypedQuery<com.labsynch.labseer.dto.ValueTypeKindDTO> findAnalysisGroupValueTypeKindDTO(String exptCode, boolean showOnlyPublicData) {
+	public static TypedQuery<com.labsynch.labseer.dto.ValueTypeKindDTO> findAnalysisGroupValueTypeKindDTO(
+			String exptCode, boolean showOnlyPublicData) {
 		String sqlQuery;
-		if (showOnlyPublicData){
-			sqlQuery = "select new com.labsynch.labseer.dto.ValueTypeKindDTO(agv.lsType as lsType, agv.lsKind as lsKind) " 
-					+ "FROM AnalysisGroupValue agv " 
-					+ "join agv.lsState ags " 
-					+ "join ags.analysisGroup ag " 
-					+ "join ag.experiments exp " 
-					+ "where exp.codeName = :exptCode " 
-					+ "AND agv.publicData = :showOnlyPublicData " 
-					+ "and ags.lsType = 'data' and agv.ignored = false and ags.ignored = false and ag.ignored = false " 
+		if (showOnlyPublicData) {
+			sqlQuery = "select new com.labsynch.labseer.dto.ValueTypeKindDTO(agv.lsType as lsType, agv.lsKind as lsKind) "
+					+ "FROM AnalysisGroupValue agv "
+					+ "join agv.lsState ags "
+					+ "join ags.analysisGroup ag "
+					+ "join ag.experiments exp "
+					+ "where exp.codeName = :exptCode "
+					+ "AND agv.publicData = :showOnlyPublicData "
+					+ "and ags.lsType = 'data' and agv.ignored = false and ags.ignored = false and ag.ignored = false "
 					+ "group by agv.lsType, agv.lsKind ORDER by agv.lsKind";
 
 		} else {
-			sqlQuery = "select new com.labsynch.labseer.dto.ValueTypeKindDTO(agv.lsType as lsType, agv.lsKind as lsKind) " 
-					+ "FROM AnalysisGroupValue agv " 
-					+ "join agv.lsState ags " 
-					+ "join ags.analysisGroup ag " 
-					+ "join ag.experiments exp " 
-					+ "where exp.codeName = :exptCode " 
-					+ "and ags.lsType = 'data' and agv.ignored = false and ags.ignored = false and ag.ignored = false " 
-					+ "group by agv.lsType, agv.lsKind ORDER by agv.lsKind";			
+			sqlQuery = "select new com.labsynch.labseer.dto.ValueTypeKindDTO(agv.lsType as lsType, agv.lsKind as lsKind) "
+					+ "FROM AnalysisGroupValue agv "
+					+ "join agv.lsState ags "
+					+ "join ags.analysisGroup ag "
+					+ "join ag.experiments exp "
+					+ "where exp.codeName = :exptCode "
+					+ "and ags.lsType = 'data' and agv.ignored = false and ags.ignored = false and ag.ignored = false "
+					+ "group by agv.lsType, agv.lsKind ORDER by agv.lsKind";
 		}
 
 		EntityManager em = entityManager();
 		TypedQuery<ValueTypeKindDTO> q = em.createQuery(sqlQuery, ValueTypeKindDTO.class);
 		q.setParameter("exptCode", exptCode);
-		if (showOnlyPublicData) q.setParameter("showOnlyPublicData", showOnlyPublicData);
+		if (showOnlyPublicData)
+			q.setParameter("showOnlyPublicData", showOnlyPublicData);
 		return q;
 	}
 
 	@Transactional
 	public static List<com.labsynch.labseer.domain.AnalysisGroupValue> findAllAnalysisGroupValues() {
-		return entityManager().createQuery("SELECT o FROM AnalysisGroupValue o", AnalysisGroupValue.class).getResultList();
+		return entityManager().createQuery("SELECT o FROM AnalysisGroupValue o", AnalysisGroupValue.class)
+				.getResultList();
 	}
 
 	@Transactional
 	public static com.labsynch.labseer.domain.AnalysisGroupValue findAnalysisGroupValue(Long id) {
-		if (id == null) return null;
+		if (id == null)
+			return null;
 		return entityManager().find(AnalysisGroupValue.class, id);
 	}
 
 	@Transactional
-	public static List<com.labsynch.labseer.domain.AnalysisGroupValue> findAnalysisGroupValueEntries(int firstResult, int maxResults) {
-		return entityManager().createQuery("SELECT o FROM AnalysisGroupValue o", AnalysisGroupValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+	public static List<com.labsynch.labseer.domain.AnalysisGroupValue> findAnalysisGroupValueEntries(int firstResult,
+			int maxResults) {
+		return entityManager().createQuery("SELECT o FROM AnalysisGroupValue o", AnalysisGroupValue.class)
+				.setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
 	}
 
 	@Transactional
 	public static com.labsynch.labseer.domain.AnalysisGroupValue fromJsonToAnalysisGroupValue(String json) {
-		AnalysisGroupValue analysisGroupValue = new JSONDeserializer<AnalysisGroupValue>().deserialize(json, AnalysisGroupValue.class);
+		AnalysisGroupValue analysisGroupValue = new JSONDeserializer<AnalysisGroupValue>().deserialize(json,
+				AnalysisGroupValue.class);
 		return analysisGroupValue;
 	}
 
 	@Transactional
-	public static Collection<com.labsynch.labseer.domain.AnalysisGroupValue> fromJsonArrayToAnalysisGroupValues(String json) {
-		return new JSONDeserializer<List<AnalysisGroupValue>>().use(null, ArrayList.class).use("values", AnalysisGroupValue.class).deserialize(json);
+	public static Collection<com.labsynch.labseer.domain.AnalysisGroupValue> fromJsonArrayToAnalysisGroupValues(
+			String json) {
+		return new JSONDeserializer<List<AnalysisGroupValue>>().use(null, ArrayList.class)
+				.use("values", AnalysisGroupValue.class).deserialize(json);
 	}
 
 	@Transactional
-	public static Collection<com.labsynch.labseer.domain.AnalysisGroupValue> fromJsonArrayToAnalysisGroupValues(Reader json) {
-		return new JSONDeserializer<List<AnalysisGroupValue>>().use(null, ArrayList.class).use("values", AnalysisGroupValue.class).deserialize(json);
+	public static Collection<com.labsynch.labseer.domain.AnalysisGroupValue> fromJsonArrayToAnalysisGroupValues(
+			Reader json) {
+		return new JSONDeserializer<List<AnalysisGroupValue>>().use(null, ArrayList.class)
+				.use("values", AnalysisGroupValue.class).deserialize(json);
 	}
 
 	@Transactional
 	public String toPrettyJson() {
-		return new JSONSerializer().exclude("*.class").prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(this);
+		return new JSONSerializer().exclude("*.class").prettyPrint(true).transform(new ExcludeNulls(), void.class)
+				.serialize(this);
 	}
 
 	@Transactional
 	public String toJson() {
 		return new JSONSerializer()
 				.include("lsState.analysisGroup")
-				.exclude("*.class", "lsState.analysisGroup.experiment").transform(new ExcludeNulls(), void.class).serialize(this);
+				.exclude("*.class", "lsState.analysisGroup.experiment").transform(new ExcludeNulls(), void.class)
+				.serialize(this);
 	}
 
 	@Transactional
@@ -676,17 +717,20 @@ public static String toJsonArray(Collection<com.labsynch.labseer.domain.Analysis
 
 	@Transactional
 	public static String toPrettyJsonArray(Collection<com.labsynch.labseer.domain.AnalysisGroupValue> collection) {
-		return new JSONSerializer().exclude("*.class", "lsState.analysisGroup.experiment").transform(new ExcludeNulls(), void.class).prettyPrint(true).serialize(collection);
+		return new JSONSerializer().exclude("*.class", "lsState.analysisGroup.experiment")
+				.transform(new ExcludeNulls(), void.class).prettyPrint(true).serialize(collection);
 	}
 
 	@Transactional
 	public static String toJsonArrayStub(Collection<com.labsynch.labseer.domain.AnalysisGroupValue> collection) {
-		return new JSONSerializer().exclude("*.class", "lsState").transform(new ExcludeNulls(), void.class).serialize(collection);
+		return new JSONSerializer().exclude("*.class", "lsState").transform(new ExcludeNulls(), void.class)
+				.serialize(collection);
 	}
 
 	@Transactional
 	public com.labsynch.labseer.domain.AnalysisGroupValue merge() {
-		if (this.entityManager == null) this.entityManager = entityManager();
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
 		AnalysisGroupValue merged = this.entityManager.merge(this);
 		this.entityManager.flush();
 		return merged;
@@ -714,14 +758,16 @@ public static String getAnalysisGroupValueCollectionJson(List<java.lang.Long> id
 		Collection<AnalysisGroupValue> analysisGroupValues = new HashSet<AnalysisGroupValue>();
 		for (Long id : idList) {
 			AnalysisGroupValue query = AnalysisGroupValue.findAnalysisGroupValue(id);
-			if (query != null) analysisGroupValues.add(query);
+			if (query != null)
+				analysisGroupValues.add(query);
 		}
 		return AnalysisGroupValue.toJsonArray(analysisGroupValues);
 	}
 
 	@Transactional
 	public static int deleteByExperimentID(Long experimentId) {
-		if (experimentId == null) return 0;
+		if (experimentId == null)
+			return 0;
 		EntityManager em = TreatmentGroupValue.entityManager();
 		String deleteSQL = "DELETE FROM AnalysisGroupValue oo WHERE id in (select o.id from AnalysisGroupValue o where o.lsState.analysisGroup.experiment.id = :experimentId)";
 		Query q = em.createQuery(deleteSQL);
@@ -730,14 +776,17 @@ public static int deleteByExperimentID(Long experimentId) {
 		return numberOfDeletedEntities;
 	}
 
-	public static com.labsynch.labseer.domain.AnalysisGroupValue update(com.labsynch.labseer.domain.AnalysisGroupValue analysisGroupValue) {
-		AnalysisGroupValue updatedAnalysisGroupValue = new JSONDeserializer<AnalysisGroupValue>().deserializeInto(analysisGroupValue.toJson(), analysisGroupValue);
+	public static com.labsynch.labseer.domain.AnalysisGroupValue update(
+			com.labsynch.labseer.domain.AnalysisGroupValue analysisGroupValue) {
+		AnalysisGroupValue updatedAnalysisGroupValue = new JSONDeserializer<AnalysisGroupValue>()
+				.deserializeInto(analysisGroupValue.toJson(), analysisGroupValue);
 		updatedAnalysisGroupValue.setModifiedDate(new Date());
 		updatedAnalysisGroupValue.merge();
 		return updatedAnalysisGroupValue;
 	}
 
-	public static TypedQuery<java.lang.String> findBatchCodedBySearchFilter(Collection<com.labsynch.labseer.dto.ExperimentFilterSearchDTO> searchFilters) {
+	public static TypedQuery<java.lang.String> findBatchCodedBySearchFilter(
+			Collection<com.labsynch.labseer.dto.ExperimentFilterSearchDTO> searchFilters) {
 		EntityManager em = AnalysisGroupValue.entityManager();
 		CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
 		CriteriaQuery<String> criteria = criteriaBuilder.createQuery(String.class);
@@ -747,7 +796,8 @@ public static TypedQuery<java.lang.String> findBatchCodedBySearchFilter(Collecti
 		criteria.select(agvRoot2.<String>get("codeValue"));
 		Predicate[] predicates = new Predicate[0];
 		List<Predicate> predicateList = new ArrayList<Predicate>();
-		Predicate predicate00 = criteriaBuilder.equal(agvRoot.<Long>get("lsState").get("id"), agvRoot2.<Long>get("lsState").get("id"));
+		Predicate predicate00 = criteriaBuilder.equal(agvRoot.<Long>get("lsState").get("id"),
+				agvRoot2.<Long>get("lsState").get("id"));
 		predicateList.add(predicate00);
 		Predicate predicate01 = criteriaBuilder.equal(agvRoot2.<String>get("lsType"), "codeValue");
 		predicateList.add(predicate01);
@@ -758,20 +808,27 @@ public static TypedQuery<java.lang.String> findBatchCodedBySearchFilter(Collecti
 			predicateList.add(predicate1);
 			Predicate predicate2 = criteriaBuilder.equal(agvRoot.<String>get("lsKind"), searchFilter.getLsKind());
 			predicateList.add(predicate2);
-			Predicate predicate3 = criteriaBuilder.equal(agvRoot.<String>get("lsState").get("analysisGroup").get("experiment").get("codeName"), searchFilter.getCodeName());
+			Predicate predicate3 = criteriaBuilder.equal(
+					agvRoot.<String>get("lsState").get("analysisGroup").get("experiment").get("codeName"),
+					searchFilter.getCodeName());
 			predicateList.add(predicate3);
 			if (searchFilter.getLsType().equalsIgnoreCase("numericValue")) {
 				Predicate predicate4 = null;
 				if (searchFilter.getOperator().equalsIgnoreCase(">")) {
-					predicate4 = criteriaBuilder.gt(agvRoot.<BigDecimal>get("numericValue"), new BigDecimal(searchFilter.getFilterValue()));
+					predicate4 = criteriaBuilder.gt(agvRoot.<BigDecimal>get("numericValue"),
+							new BigDecimal(searchFilter.getFilterValue()));
 				} else if (searchFilter.getOperator().equalsIgnoreCase("<")) {
-					predicate4 = criteriaBuilder.lt(agvRoot.<BigDecimal>get("numericValue"), new BigDecimal(searchFilter.getFilterValue()));
+					predicate4 = criteriaBuilder.lt(agvRoot.<BigDecimal>get("numericValue"),
+							new BigDecimal(searchFilter.getFilterValue()));
 				} else if (searchFilter.getOperator().equalsIgnoreCase("=")) {
-					predicate4 = criteriaBuilder.equal(agvRoot.<BigDecimal>get("numericValue"), new BigDecimal(searchFilter.getFilterValue()));
+					predicate4 = criteriaBuilder.equal(agvRoot.<BigDecimal>get("numericValue"),
+							new BigDecimal(searchFilter.getFilterValue()));
 				} else if (searchFilter.getOperator().equalsIgnoreCase("!=")) {
-					predicate4 = criteriaBuilder.notEqual(agvRoot.<BigDecimal>get("numericValue"), new BigDecimal(searchFilter.getFilterValue()));
+					predicate4 = criteriaBuilder.notEqual(agvRoot.<BigDecimal>get("numericValue"),
+							new BigDecimal(searchFilter.getFilterValue()));
 				} else {
-					predicate4 = criteriaBuilder.notEqual(agvRoot.<BigDecimal>get("numericValue"), new BigDecimal(searchFilter.getFilterValue()));
+					predicate4 = criteriaBuilder.notEqual(agvRoot.<BigDecimal>get("numericValue"),
+							new BigDecimal(searchFilter.getFilterValue()));
 				}
 				Predicate predicate5 = criteriaBuilder.isNull(agvRoot.<BigDecimal>get("numericValue"));
 				if (predicate4 != null) {
@@ -784,9 +841,11 @@ public static TypedQuery<java.lang.String> findBatchCodedBySearchFilter(Collecti
 			} else if (searchFilter.getLsType().equalsIgnoreCase("stringValue")) {
 				Predicate predicate4 = null;
 				if (searchFilter.getOperator().equalsIgnoreCase("equals")) {
-					predicate4 = criteriaBuilder.equal(agvRoot.<String>get("stringValue"), searchFilter.getFilterValue());
+					predicate4 = criteriaBuilder.equal(agvRoot.<String>get("stringValue"),
+							searchFilter.getFilterValue());
 				} else if (searchFilter.getOperator().equalsIgnoreCase("contains")) {
-					predicate4 = criteriaBuilder.like(agvRoot.<String>get("stringValue"), "%" + searchFilter.getFilterValue() + "%");
+					predicate4 = criteriaBuilder.like(agvRoot.<String>get("stringValue"),
+							"%" + searchFilter.getFilterValue() + "%");
 				}
 				Predicate predicate5 = criteriaBuilder.isNull(agvRoot.<String>get("stringValue"));
 				if (predicate4 != null) {
@@ -803,19 +862,20 @@ public static TypedQuery<java.lang.String> findBatchCodedBySearchFilter(Collecti
 		return q;
 	}
 
-
-	public static TypedQuery<java.lang.String> findBatchCodeBySearchFilters(Set<java.lang.String> batchCodeList, Set<java.lang.String> experimentCodeList, 
+	public static TypedQuery<java.lang.String> findBatchCodeBySearchFilters(Set<java.lang.String> batchCodeList,
+			Set<java.lang.String> experimentCodeList,
 			Set<com.labsynch.labseer.dto.ExperimentFilterSearchDTO> searchFilters,
 			boolean includeHiddenData) {
 
-		if (includeHiddenData){
+		if (includeHiddenData) {
 			return findBatchCodeBySearchFilters(batchCodeList, experimentCodeList, searchFilters, false);
 		} else {
 			return findBatchCodeBySearchFilters(batchCodeList, experimentCodeList, searchFilters, true);
 		}
 	}
 
-	public static TypedQuery<java.lang.String> findBatchCodeBySearchFilters(Set<java.lang.String> batchCodeList, Set<java.lang.String> experimentCodeList, 
+	public static TypedQuery<java.lang.String> findBatchCodeBySearchFilters(Set<java.lang.String> batchCodeList,
+			Set<java.lang.String> experimentCodeList,
 			Set<com.labsynch.labseer.dto.ExperimentFilterSearchDTO> searchFilters, Boolean excludeHiddenData) {
 		EntityManager em = AnalysisGroupValue.entityManager();
 		CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
@@ -826,7 +886,8 @@ public static TypedQuery<java.lang.String> findBatchCodeBySearchFilters(Set<java
 		criteria.select(agvRoot2.<String>get("codeValue"));
 		Predicate[] predicates = new Predicate[0];
 		List<Predicate> predicateList = new ArrayList<Predicate>();
-		Predicate predicate00 = criteriaBuilder.equal(agvRoot.<Long>get("lsState").get("id"), agvRoot2.<Long>get("lsState").get("id"));
+		Predicate predicate00 = criteriaBuilder.equal(agvRoot.<Long>get("lsState").get("id"),
+				agvRoot2.<Long>get("lsState").get("id"));
 		predicateList.add(predicate00);
 
 		if (excludeHiddenData != null && excludeHiddenData == true) {
@@ -846,11 +907,13 @@ public static TypedQuery<java.lang.String> findBatchCodeBySearchFilters(Set<java
 			logger.debug("no batchCodeList present");
 		}
 		if (experimentCodeList != null && experimentCodeList.size() > 0) {
-			Expression<String> exp04 = agvRoot.<String>get("lsState").get("analysisGroup").get("experiment").get("codeName");
+			Expression<String> exp04 = agvRoot.<String>get("lsState").get("analysisGroup").get("experiment")
+					.get("codeName");
 			Predicate predicate04 = exp04.in(experimentCodeList);
 			predicateList.add(predicate04);
 		} else {
-			Predicate predicate04b = criteriaBuilder.equal(agvRoot.<Boolean>get("lsState").get("analysisGroup").get("experiment").get("ignored"), false);
+			Predicate predicate04b = criteriaBuilder.equal(
+					agvRoot.<Boolean>get("lsState").get("analysisGroup").get("experiment").get("ignored"), false);
 			predicateList.add(predicate04b);
 		}
 		logger.debug("number of search filters: " + searchFilters.size());
@@ -858,7 +921,8 @@ public static TypedQuery<java.lang.String> findBatchCodeBySearchFilters(Set<java
 			for (ExperimentFilterSearchDTO searchFilter : searchFilters) {
 				logger.debug(searchFilter.toJson());
 				Root<AnalysisGroupValue> agvRootNew = criteria.from(AnalysisGroupValue.class);
-				Predicate predicateNew = criteriaBuilder.equal(agvRoot2.<Long>get("lsState").get("id"), agvRootNew.<Long>get("lsState").get("id"));
+				Predicate predicateNew = criteriaBuilder.equal(agvRoot2.<Long>get("lsState").get("id"),
+						agvRootNew.<Long>get("lsState").get("id"));
 				predicateList.add(predicateNew);
 
 				if (excludeHiddenData != null && excludeHiddenData == true) {
@@ -870,24 +934,33 @@ public static TypedQuery<java.lang.String> findBatchCodeBySearchFilters(Set<java
 				predicateList.add(predicate11);
 				Predicate predicate12 = criteriaBuilder.equal(agvRoot2.<String>get("lsKind"), "batch code");
 				predicateList.add(predicate12);
-				Predicate predicate1 = criteriaBuilder.equal(agvRootNew.<String>get("lsType"), searchFilter.getLsType());
+				Predicate predicate1 = criteriaBuilder.equal(agvRootNew.<String>get("lsType"),
+						searchFilter.getLsType());
 				predicateList.add(predicate1);
-				Predicate predicate2 = criteriaBuilder.equal(agvRootNew.<String>get("lsKind"), searchFilter.getLsKind());
+				Predicate predicate2 = criteriaBuilder.equal(agvRootNew.<String>get("lsKind"),
+						searchFilter.getLsKind());
 				predicateList.add(predicate2);
-				Predicate predicate3 = criteriaBuilder.equal(agvRootNew.<String>get("lsState").get("analysisGroup").get("experiment").get("codeName"), searchFilter.getExperimentCode());
+				Predicate predicate3 = criteriaBuilder.equal(
+						agvRootNew.<String>get("lsState").get("analysisGroup").get("experiment").get("codeName"),
+						searchFilter.getExperimentCode());
 				predicateList.add(predicate3);
 				if (searchFilter.getLsType().equalsIgnoreCase("numericValue")) {
 					Predicate predicate4 = null;
 					if (searchFilter.getOperator().equalsIgnoreCase(">")) {
-						predicate4 = criteriaBuilder.gt(agvRootNew.<BigDecimal>get("numericValue"), new BigDecimal(searchFilter.getFilterValue()));
+						predicate4 = criteriaBuilder.gt(agvRootNew.<BigDecimal>get("numericValue"),
+								new BigDecimal(searchFilter.getFilterValue()));
 					} else if (searchFilter.getOperator().equalsIgnoreCase("<")) {
-						predicate4 = criteriaBuilder.lt(agvRootNew.<BigDecimal>get("numericValue"), new BigDecimal(searchFilter.getFilterValue()));
+						predicate4 = criteriaBuilder.lt(agvRootNew.<BigDecimal>get("numericValue"),
+								new BigDecimal(searchFilter.getFilterValue()));
 					} else if (searchFilter.getOperator().equalsIgnoreCase("=")) {
-						predicate4 = criteriaBuilder.equal(agvRootNew.<BigDecimal>get("numericValue"), new BigDecimal(searchFilter.getFilterValue()));
+						predicate4 = criteriaBuilder.equal(agvRootNew.<BigDecimal>get("numericValue"),
+								new BigDecimal(searchFilter.getFilterValue()));
 					} else if (searchFilter.getOperator().equalsIgnoreCase("!=")) {
-						predicate4 = criteriaBuilder.notEqual(agvRoot.<BigDecimal>get("numericValue"), new BigDecimal(searchFilter.getFilterValue()));
+						predicate4 = criteriaBuilder.notEqual(agvRoot.<BigDecimal>get("numericValue"),
+								new BigDecimal(searchFilter.getFilterValue()));
 					} else {
-						predicate4 = criteriaBuilder.notEqual(agvRoot.<BigDecimal>get("numericValue"), new BigDecimal(searchFilter.getFilterValue()));
+						predicate4 = criteriaBuilder.notEqual(agvRoot.<BigDecimal>get("numericValue"),
+								new BigDecimal(searchFilter.getFilterValue()));
 					}
 					Predicate predicate5 = criteriaBuilder.isNull(agvRootNew.<BigDecimal>get("numericValue"));
 					if (predicate4 != null) {
@@ -901,9 +974,11 @@ public static TypedQuery<java.lang.String> findBatchCodeBySearchFilters(Set<java
 					logger.debug("stringValue search filter " + searchFilter.getFilterValue());
 					Predicate predicate7 = null;
 					if (searchFilter.getOperator().equalsIgnoreCase("equals")) {
-						predicate7 = criteriaBuilder.like(agvRootNew.<String>get("stringValue"), searchFilter.getFilterValue());
+						predicate7 = criteriaBuilder.like(agvRootNew.<String>get("stringValue"),
+								searchFilter.getFilterValue());
 					} else if (searchFilter.getOperator().equalsIgnoreCase("contains")) {
-						predicate7 = criteriaBuilder.like(agvRootNew.<String>get("stringValue"), "%" + searchFilter.getFilterValue() + "%");
+						predicate7 = criteriaBuilder.like(agvRootNew.<String>get("stringValue"),
+								"%" + searchFilter.getFilterValue() + "%");
 					}
 					Predicate predicate8 = criteriaBuilder.isNull(agvRootNew.<String>get("stringValue"));
 					if (predicate7 != null) {
@@ -924,99 +999,130 @@ public static TypedQuery<java.lang.String> findBatchCodeBySearchFilters(Set<java
 		return q;
 	}
 
-	//	public static TypedQuery<java.lang.String> findBatchCodeBySearchFilters(Set<java.lang.String> batchCodeList, Set<java.lang.String> experimentCodeList, Set<com.labsynch.labseer.dto.ExperimentFilterSearchDTO> searchFilters) {
-	//		EntityManager em = AnalysisGroupValue.entityManager();
-	//		CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
-	//		CriteriaQuery<String> criteria = criteriaBuilder.createQuery(String.class);
-	//		Root<AnalysisGroupValue> agvRoot = criteria.from(AnalysisGroupValue.class);
-	//		Root<AnalysisGroupValue> agvRoot2 = criteria.from(AnalysisGroupValue.class);
-	//		criteria.distinct(true);
-	//		criteria.select(agvRoot2.<String>get("codeValue"));
-	//		Predicate[] predicates = new Predicate[0];
-	//		List<Predicate> predicateList = new ArrayList<Predicate>();
-	//		Predicate predicate00 = criteriaBuilder.equal(agvRoot.<Long>get("lsState").get("id"), agvRoot2.<Long>get("lsState").get("id"));
-	//		predicateList.add(predicate00);
-	//		if (batchCodeList != null && batchCodeList.size() > 0) {
-	//			Predicate predicate01 = criteriaBuilder.equal(agvRoot2.<String>get("lsType"), "codeValue");
-	//			predicateList.add(predicate01);
-	//			Predicate predicate02 = criteriaBuilder.equal(agvRoot2.<String>get("lsKind"), "batch code");
-	//			predicateList.add(predicate02);
-	//			Expression<String> exp03 = agvRoot2.get("codeValue");
-	//			Predicate predicate03 = exp03.in(batchCodeList);
-	//			predicateList.add(predicate03);
-	//		} else {
-	//			logger.debug("no batchCodeList present");
-	//		}
-	//		if (experimentCodeList != null && experimentCodeList.size() > 0) {
-	//			Expression<String> exp04 = agvRoot.<String>get("lsState").get("analysisGroup").get("experiment").get("codeName");
-	//			Predicate predicate04 = exp04.in(experimentCodeList);
-	//			predicateList.add(predicate04);
-	//		} else {
-	//			Predicate predicate04b = criteriaBuilder.equal(agvRoot.<Boolean>get("lsState").get("analysisGroup").get("experiment").get("ignored"), false);
-	//			predicateList.add(predicate04b);
-	//		}
-	//		logger.debug("number of search filters: " + searchFilters.size());
-	//		if (searchFilters != null && searchFilters.size() > 0) {
-	//			for (ExperimentFilterSearchDTO searchFilter : searchFilters) {
-	//				logger.debug(searchFilter.toJson());
-	//				Root<AnalysisGroupValue> agvRootNew = criteria.from(AnalysisGroupValue.class);
-	//				Predicate predicateNew = criteriaBuilder.equal(agvRoot2.<Long>get("lsState").get("id"), agvRootNew.<Long>get("lsState").get("id"));
-	//				predicateList.add(predicateNew);
-	//				Predicate predicate11 = criteriaBuilder.equal(agvRoot2.<String>get("lsType"), "codeValue");
-	//				predicateList.add(predicate11);
-	//				Predicate predicate12 = criteriaBuilder.equal(agvRoot2.<String>get("lsKind"), "batch code");
-	//				predicateList.add(predicate12);
-	//				Predicate predicate1 = criteriaBuilder.equal(agvRootNew.<String>get("lsType"), searchFilter.getLsType());
-	//				predicateList.add(predicate1);
-	//				Predicate predicate2 = criteriaBuilder.equal(agvRootNew.<String>get("lsKind"), searchFilter.getLsKind());
-	//				predicateList.add(predicate2);
-	//				Predicate predicate3 = criteriaBuilder.equal(agvRootNew.<String>get("lsState").get("analysisGroup").get("experiment").get("codeName"), searchFilter.getExperimentCode());
-	//				predicateList.add(predicate3);
-	//				if (searchFilter.getLsType().equalsIgnoreCase("numericValue")) {
-	//					Predicate predicate4 = null;
-	//					if (searchFilter.getOperator().equalsIgnoreCase(">")) {
-	//						predicate4 = criteriaBuilder.gt(agvRootNew.<BigDecimal>get("numericValue"), new BigDecimal(searchFilter.getFilterValue()));
-	//					} else if (searchFilter.getOperator().equalsIgnoreCase("<")) {
-	//						predicate4 = criteriaBuilder.lt(agvRootNew.<BigDecimal>get("numericValue"), new BigDecimal(searchFilter.getFilterValue()));
-	//					} else if (searchFilter.getOperator().equalsIgnoreCase("=")) {
-	//						predicate4 = criteriaBuilder.equal(agvRootNew.<BigDecimal>get("numericValue"), new BigDecimal(searchFilter.getFilterValue()));
-	//					}
-	//					Predicate predicate5 = criteriaBuilder.isNull(agvRootNew.<BigDecimal>get("numericValue"));
-	//					if (predicate4 != null) {
-	//						Predicate predicate6 = criteriaBuilder.or(predicate5, predicate4);
-	//						predicateList.add(predicate6);
-	//					} else {
-	//						Predicate predicate6 = criteriaBuilder.or(predicate5);
-	//						predicateList.add(predicate6);
-	//					}
-	//				} else if (searchFilter.getLsType().equalsIgnoreCase("stringValue")) {
-	//					logger.debug("stringValue search filter " + searchFilter.getFilterValue());
-	//					Predicate predicate7 = null;
-	//					if (searchFilter.getOperator().equalsIgnoreCase("equals")) {
-	//						predicate7 = criteriaBuilder.like(agvRootNew.<String>get("stringValue"), searchFilter.getFilterValue());
-	//					} else if (searchFilter.getOperator().equalsIgnoreCase("contains")) {
-	//						predicate7 = criteriaBuilder.like(agvRootNew.<String>get("stringValue"), "%" + searchFilter.getFilterValue() + "%");
-	//					}
-	//					Predicate predicate8 = criteriaBuilder.isNull(agvRootNew.<String>get("stringValue"));
-	//					if (predicate7 != null) {
-	//						Predicate predicate9 = criteriaBuilder.or(predicate8, predicate7);
-	//						predicateList.add(predicate9);
-	//					} else {
-	//						Predicate predicate9 = criteriaBuilder.or(predicate8);
-	//						predicateList.add(predicate9);
-	//					}
-	//				}
-	//			}
-	//		}
-	//		for (Predicate p : predicateList) {
-	//			logger.debug("predicate: " + p.toString());
-	//		}
-	//		criteria.where(criteriaBuilder.and(predicateList.toArray(predicates)));
-	//		TypedQuery<String> q = em.createQuery(criteria);
-	//		return q;
-	//	}
-
-	public static TypedQuery<java.lang.String> findBatchCodeBySearchFilter(Set<java.lang.String> batchCodeList, Set<java.lang.String> experimentCodeList, ExperimentFilterSearchDTO searchFilter, Boolean excludeHiddenData) {
+	// public static TypedQuery<java.lang.String>
+	// findBatchCodeBySearchFilters(Set<java.lang.String> batchCodeList,
+	// Set<java.lang.String> experimentCodeList,
+	// Set<com.labsynch.labseer.dto.ExperimentFilterSearchDTO> searchFilters) {
+	// EntityManager em = AnalysisGroupValue.entityManager();
+	// CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
+	// CriteriaQuery<String> criteria = criteriaBuilder.createQuery(String.class);
+	// Root<AnalysisGroupValue> agvRoot = criteria.from(AnalysisGroupValue.class);
+	// Root<AnalysisGroupValue> agvRoot2 = criteria.from(AnalysisGroupValue.class);
+	// criteria.distinct(true);
+	// criteria.select(agvRoot2.<String>get("codeValue"));
+	// Predicate[] predicates = new Predicate[0];
+	// List<Predicate> predicateList = new ArrayList<Predicate>();
+	// Predicate predicate00 =
+	// criteriaBuilder.equal(agvRoot.<Long>get("lsState").get("id"),
+	// agvRoot2.<Long>get("lsState").get("id"));
+	// predicateList.add(predicate00);
+	// if (batchCodeList != null && batchCodeList.size() > 0) {
+	// Predicate predicate01 = criteriaBuilder.equal(agvRoot2.<String>get("lsType"),
+	// "codeValue");
+	// predicateList.add(predicate01);
+	// Predicate predicate02 = criteriaBuilder.equal(agvRoot2.<String>get("lsKind"),
+	// "batch code");
+	// predicateList.add(predicate02);
+	// Expression<String> exp03 = agvRoot2.get("codeValue");
+	// Predicate predicate03 = exp03.in(batchCodeList);
+	// predicateList.add(predicate03);
+	// } else {
+	// logger.debug("no batchCodeList present");
+	// }
+	// if (experimentCodeList != null && experimentCodeList.size() > 0) {
+	// Expression<String> exp04 =
+	// agvRoot.<String>get("lsState").get("analysisGroup").get("experiment").get("codeName");
+	// Predicate predicate04 = exp04.in(experimentCodeList);
+	// predicateList.add(predicate04);
+	// } else {
+	// Predicate predicate04b =
+	// criteriaBuilder.equal(agvRoot.<Boolean>get("lsState").get("analysisGroup").get("experiment").get("ignored"),
+	// false);
+	// predicateList.add(predicate04b);
+	// }
+	// logger.debug("number of search filters: " + searchFilters.size());
+	// if (searchFilters != null && searchFilters.size() > 0) {
+	// for (ExperimentFilterSearchDTO searchFilter : searchFilters) {
+	// logger.debug(searchFilter.toJson());
+	// Root<AnalysisGroupValue> agvRootNew =
+	// criteria.from(AnalysisGroupValue.class);
+	// Predicate predicateNew =
+	// criteriaBuilder.equal(agvRoot2.<Long>get("lsState").get("id"),
+	// agvRootNew.<Long>get("lsState").get("id"));
+	// predicateList.add(predicateNew);
+	// Predicate predicate11 = criteriaBuilder.equal(agvRoot2.<String>get("lsType"),
+	// "codeValue");
+	// predicateList.add(predicate11);
+	// Predicate predicate12 = criteriaBuilder.equal(agvRoot2.<String>get("lsKind"),
+	// "batch code");
+	// predicateList.add(predicate12);
+	// Predicate predicate1 =
+	// criteriaBuilder.equal(agvRootNew.<String>get("lsType"),
+	// searchFilter.getLsType());
+	// predicateList.add(predicate1);
+	// Predicate predicate2 =
+	// criteriaBuilder.equal(agvRootNew.<String>get("lsKind"),
+	// searchFilter.getLsKind());
+	// predicateList.add(predicate2);
+	// Predicate predicate3 =
+	// criteriaBuilder.equal(agvRootNew.<String>get("lsState").get("analysisGroup").get("experiment").get("codeName"),
+	// searchFilter.getExperimentCode());
+	// predicateList.add(predicate3);
+	// if (searchFilter.getLsType().equalsIgnoreCase("numericValue")) {
+	// Predicate predicate4 = null;
+	// if (searchFilter.getOperator().equalsIgnoreCase(">")) {
+	// predicate4 = criteriaBuilder.gt(agvRootNew.<BigDecimal>get("numericValue"),
+	// new BigDecimal(searchFilter.getFilterValue()));
+	// } else if (searchFilter.getOperator().equalsIgnoreCase("<")) {
+	// predicate4 = criteriaBuilder.lt(agvRootNew.<BigDecimal>get("numericValue"),
+	// new BigDecimal(searchFilter.getFilterValue()));
+	// } else if (searchFilter.getOperator().equalsIgnoreCase("=")) {
+	// predicate4 =
+	// criteriaBuilder.equal(agvRootNew.<BigDecimal>get("numericValue"), new
+	// BigDecimal(searchFilter.getFilterValue()));
+	// }
+	// Predicate predicate5 =
+	// criteriaBuilder.isNull(agvRootNew.<BigDecimal>get("numericValue"));
+	// if (predicate4 != null) {
+	// Predicate predicate6 = criteriaBuilder.or(predicate5, predicate4);
+	// predicateList.add(predicate6);
+	// } else {
+	// Predicate predicate6 = criteriaBuilder.or(predicate5);
+	// predicateList.add(predicate6);
+	// }
+	// } else if (searchFilter.getLsType().equalsIgnoreCase("stringValue")) {
+	// logger.debug("stringValue search filter " + searchFilter.getFilterValue());
+	// Predicate predicate7 = null;
+	// if (searchFilter.getOperator().equalsIgnoreCase("equals")) {
+	// predicate7 = criteriaBuilder.like(agvRootNew.<String>get("stringValue"),
+	// searchFilter.getFilterValue());
+	// } else if (searchFilter.getOperator().equalsIgnoreCase("contains")) {
+	// predicate7 = criteriaBuilder.like(agvRootNew.<String>get("stringValue"), "%"
+	// + searchFilter.getFilterValue() + "%");
+	// }
+	// Predicate predicate8 =
+	// criteriaBuilder.isNull(agvRootNew.<String>get("stringValue"));
+	// if (predicate7 != null) {
+	// Predicate predicate9 = criteriaBuilder.or(predicate8, predicate7);
+	// predicateList.add(predicate9);
+	// } else {
+	// Predicate predicate9 = criteriaBuilder.or(predicate8);
+	// predicateList.add(predicate9);
+	// }
+	// }
+	// }
+	// }
+	// for (Predicate p : predicateList) {
+	// logger.debug("predicate: " + p.toString());
+	// }
+	// criteria.where(criteriaBuilder.and(predicateList.toArray(predicates)));
+	// TypedQuery<String> q = em.createQuery(criteria);
+	// return q;
+	// }
+
+	public static TypedQuery<java.lang.String> findBatchCodeBySearchFilter(Set<java.lang.String> batchCodeList,
+			Set<java.lang.String> experimentCodeList, ExperimentFilterSearchDTO searchFilter,
+			Boolean excludeHiddenData) {
 		EntityManager em = AnalysisGroupValue.entityManager();
 		CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
 		CriteriaQuery<String> criteria = criteriaBuilder.createQuery(String.class);
@@ -1031,14 +1137,14 @@ public static TypedQuery<java.lang.String> findBatchCodeBySearchFilter(Set<java.
 
 		Predicate[] globalPredicates = new Predicate[0];
 		List<Predicate> globalPredicateList = new ArrayList<Predicate>();
-		
+
 		List<String> batchCodes = new ArrayList<String>();
 		batchCodes.addAll(batchCodeList);
 		int batchCodeListSize = batchCodes.size();
 		logger.debug("in findBatchCodeBySearchFilter --- size of batch code list: " + batchCodeListSize);
 		logger.debug("incoming search filter" + searchFilter.toJson());
 
-		for (int i = 0; i <= batchCodeListSize; i += PARAMETER_LIMIT){
+		for (int i = 0; i <= batchCodeListSize; i += PARAMETER_LIMIT) {
 			List<String> batchCodeSubList;
 			if (batchCodeListSize > i + PARAMETER_LIMIT) {
 				batchCodeSubList = batchCodes.subList(i, (i + PARAMETER_LIMIT));
@@ -1054,7 +1160,8 @@ public static TypedQuery<java.lang.String> findBatchCodeBySearchFilter(Set<java.
 				predicateList.add(predicateHidden);
 			}
 
-			Predicate predicate00 = criteriaBuilder.equal(agvRoot.<Long>get("lsState").get("id"), agvRoot2.<Long>get("lsState").get("id"));
+			Predicate predicate00 = criteriaBuilder.equal(agvRoot.<Long>get("lsState").get("id"),
+					agvRoot2.<Long>get("lsState").get("id"));
 			predicateList.add(predicate00);
 			Predicate predicate01 = criteriaBuilder.equal(agvRoot2.<String>get("lsType"), "codeValue");
 			predicateList.add(predicate01);
@@ -1075,23 +1182,29 @@ public static TypedQuery<java.lang.String> findBatchCodeBySearchFilter(Set<java.
 				predicateList.add(predicate1);
 				Predicate predicate2 = criteriaBuilder.equal(agvRoot.<String>get("lsKind"), searchFilter.getLsKind());
 				predicateList.add(predicate2);
-				Predicate predicate3 = criteriaBuilder.equal(experiments.<String>get("codeName"), searchFilter.getExperimentCode());
+				Predicate predicate3 = criteriaBuilder.equal(experiments.<String>get("codeName"),
+						searchFilter.getExperimentCode());
 				predicateList.add(predicate3);
 				if (searchFilter.getLsType().equalsIgnoreCase("numericValue")) {
 					logger.debug("setting lsType to " + searchFilter.getLsType());
 
 					Predicate predicate4 = null;
 					if (searchFilter.getOperator().equalsIgnoreCase(">")) {
-						predicate4 = criteriaBuilder.gt(agvRoot.<BigDecimal>get("numericValue"), new BigDecimal(searchFilter.getFilterValue()));
+						predicate4 = criteriaBuilder.gt(agvRoot.<BigDecimal>get("numericValue"),
+								new BigDecimal(searchFilter.getFilterValue()));
 					} else if (searchFilter.getOperator().equalsIgnoreCase("<")) {
-						predicate4 = criteriaBuilder.lt(agvRoot.<BigDecimal>get("numericValue"), new BigDecimal(searchFilter.getFilterValue()));
+						predicate4 = criteriaBuilder.lt(agvRoot.<BigDecimal>get("numericValue"),
+								new BigDecimal(searchFilter.getFilterValue()));
 					} else if (searchFilter.getOperator().equalsIgnoreCase("=")) {
-						predicate4 = criteriaBuilder.equal(agvRoot.<BigDecimal>get("numericValue"), new BigDecimal(searchFilter.getFilterValue()));
+						predicate4 = criteriaBuilder.equal(agvRoot.<BigDecimal>get("numericValue"),
+								new BigDecimal(searchFilter.getFilterValue()));
 					} else if (searchFilter.getOperator().equalsIgnoreCase("!=")) {
 						logger.debug("setting filter != " + searchFilter.getFilterValue());
-						predicate4 = criteriaBuilder.notEqual(agvRoot.<BigDecimal>get("numericValue"), new BigDecimal(searchFilter.getFilterValue()));
+						predicate4 = criteriaBuilder.notEqual(agvRoot.<BigDecimal>get("numericValue"),
+								new BigDecimal(searchFilter.getFilterValue()));
 					} else {
-						predicate4 = criteriaBuilder.notEqual(agvRoot.<BigDecimal>get("numericValue"), new BigDecimal(searchFilter.getFilterValue()));
+						predicate4 = criteriaBuilder.notEqual(agvRoot.<BigDecimal>get("numericValue"),
+								new BigDecimal(searchFilter.getFilterValue()));
 					}
 					Predicate predicate5 = criteriaBuilder.isNull(agvRoot.<BigDecimal>get("numericValue"));
 					if (predicate4 != null) {
@@ -1104,9 +1217,11 @@ public static TypedQuery<java.lang.String> findBatchCodeBySearchFilter(Set<java.
 				} else if (searchFilter.getLsType().equalsIgnoreCase("stringValue")) {
 					Predicate predicate4 = null;
 					if (searchFilter.getOperator().equalsIgnoreCase("equals")) {
-						predicate4 = criteriaBuilder.like(agvRoot.<String>get("stringValue"), searchFilter.getFilterValue());
+						predicate4 = criteriaBuilder.like(agvRoot.<String>get("stringValue"),
+								searchFilter.getFilterValue());
 					} else if (searchFilter.getOperator().equalsIgnoreCase("contains")) {
-						predicate4 = criteriaBuilder.like(agvRoot.<String>get("stringValue"), "%" + searchFilter.getFilterValue() + "%");
+						predicate4 = criteriaBuilder.like(agvRoot.<String>get("stringValue"),
+								"%" + searchFilter.getFilterValue() + "%");
 					}
 					Predicate predicate5 = criteriaBuilder.isNull(agvRoot.<String>get("stringValue"));
 					if (predicate4 != null) {
@@ -1118,13 +1233,13 @@ public static TypedQuery<java.lang.String> findBatchCodeBySearchFilter(Set<java.
 					}
 				}
 			}
-			//join all the predicates with AND
+			// join all the predicates with AND
 			predicates = predicateList.toArray(predicates);
 			globalPredicateList.add(criteriaBuilder.and(predicates));
-			
+
 		}
-		
-		//join all the globalPredicates with OR
+
+		// join all the globalPredicates with OR
 		globalPredicates = globalPredicateList.toArray(globalPredicates);
 		criteria.where(criteriaBuilder.or(globalPredicates));
 		TypedQuery<String> q = em.createQuery(criteria);
@@ -1133,7 +1248,9 @@ public static TypedQuery<java.lang.String> findBatchCodeBySearchFilter(Set<java.
 		return q;
 	}
 
-	public static TypedQuery<AnalysisGroupValue> findAGValuesBySearchFilter(Set<java.lang.String> batchCodeList, Set<java.lang.String> experimentCodeList, ExperimentFilterSearchDTO searchFilter, Boolean excludeHiddenData) {
+	public static TypedQuery<AnalysisGroupValue> findAGValuesBySearchFilter(Set<java.lang.String> batchCodeList,
+			Set<java.lang.String> experimentCodeList, ExperimentFilterSearchDTO searchFilter,
+			Boolean excludeHiddenData) {
 		EntityManager em = AnalysisGroupValue.entityManager();
 		CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
 		CriteriaQuery<AnalysisGroupValue> criteria = criteriaBuilder.createQuery(AnalysisGroupValue.class);
@@ -1152,7 +1269,7 @@ public static TypedQuery<AnalysisGroupValue> findAGValuesBySearchFilter(Set<java
 		batchCodes.addAll(batchCodeList);
 		int batchCodeListSize = batchCodes.size();
 
-		for (int i = 0; i <= batchCodeListSize; i += PARAMETER_LIMIT){
+		for (int i = 0; i <= batchCodeListSize; i += PARAMETER_LIMIT) {
 			List<String> batchCodeSubList;
 			if (batchCodeListSize > i + PARAMETER_LIMIT) {
 				batchCodeSubList = batchCodes.subList(i, (i + PARAMETER_LIMIT));
@@ -1160,7 +1277,6 @@ public static TypedQuery<AnalysisGroupValue> findAGValuesBySearchFilter(Set<java
 				batchCodeSubList = batchCodes.subList(i, batchCodeListSize);
 			}
 
-
 			Predicate[] predicates = new Predicate[0];
 			List<Predicate> predicateList = new ArrayList<Predicate>();
 
@@ -1169,7 +1285,8 @@ public static TypedQuery<AnalysisGroupValue> findAGValuesBySearchFilter(Set<java
 				predicateList.add(predicateHidden);
 			}
 
-			Predicate predicate00 = criteriaBuilder.equal(agvRoot.<Long>get("lsState").get("id"), agvRoot2.<Long>get("lsState").get("id"));
+			Predicate predicate00 = criteriaBuilder.equal(agvRoot.<Long>get("lsState").get("id"),
+					agvRoot2.<Long>get("lsState").get("id"));
 			predicateList.add(predicate00);
 			Predicate predicate01 = criteriaBuilder.equal(agvRoot2.<String>get("lsType"), "codeValue");
 			predicateList.add(predicate01);
@@ -1190,20 +1307,26 @@ public static TypedQuery<AnalysisGroupValue> findAGValuesBySearchFilter(Set<java
 				predicateList.add(predicate1);
 				Predicate predicate2 = criteriaBuilder.equal(agvRoot.<String>get("lsKind"), searchFilter.getLsKind());
 				predicateList.add(predicate2);
-				Predicate predicate3 = criteriaBuilder.equal(experiments.<String>get("codeName"), searchFilter.getExperimentCode());
+				Predicate predicate3 = criteriaBuilder.equal(experiments.<String>get("codeName"),
+						searchFilter.getExperimentCode());
 				predicateList.add(predicate3);
 				if (searchFilter.getLsType().equalsIgnoreCase("numericValue")) {
 					Predicate predicate4 = null;
 					if (searchFilter.getOperator().equalsIgnoreCase(">")) {
-						predicate4 = criteriaBuilder.gt(agvRoot.<BigDecimal>get("numericValue"), new BigDecimal(searchFilter.getFilterValue()));
+						predicate4 = criteriaBuilder.gt(agvRoot.<BigDecimal>get("numericValue"),
+								new BigDecimal(searchFilter.getFilterValue()));
 					} else if (searchFilter.getOperator().equalsIgnoreCase("<")) {
-						predicate4 = criteriaBuilder.lt(agvRoot.<BigDecimal>get("numericValue"), new BigDecimal(searchFilter.getFilterValue()));
+						predicate4 = criteriaBuilder.lt(agvRoot.<BigDecimal>get("numericValue"),
+								new BigDecimal(searchFilter.getFilterValue()));
 					} else if (searchFilter.getOperator().equalsIgnoreCase("=")) {
-						predicate4 = criteriaBuilder.equal(agvRoot.<BigDecimal>get("numericValue"), new BigDecimal(searchFilter.getFilterValue()));
+						predicate4 = criteriaBuilder.equal(agvRoot.<BigDecimal>get("numericValue"),
+								new BigDecimal(searchFilter.getFilterValue()));
 					} else if (searchFilter.getOperator().equalsIgnoreCase("!=")) {
-						predicate4 = criteriaBuilder.notEqual(agvRoot.<BigDecimal>get("numericValue"), new BigDecimal(searchFilter.getFilterValue()));
+						predicate4 = criteriaBuilder.notEqual(agvRoot.<BigDecimal>get("numericValue"),
+								new BigDecimal(searchFilter.getFilterValue()));
 					} else {
-						predicate4 = criteriaBuilder.notEqual(agvRoot.<BigDecimal>get("numericValue"), new BigDecimal(searchFilter.getFilterValue()));
+						predicate4 = criteriaBuilder.notEqual(agvRoot.<BigDecimal>get("numericValue"),
+								new BigDecimal(searchFilter.getFilterValue()));
 					}
 					Predicate predicate5 = criteriaBuilder.isNull(agvRoot.<BigDecimal>get("numericValue"));
 					if (predicate4 != null) {
@@ -1216,9 +1339,11 @@ public static TypedQuery<AnalysisGroupValue> findAGValuesBySearchFilter(Set<java
 				} else if (searchFilter.getLsType().equalsIgnoreCase("stringValue")) {
 					Predicate predicate4 = null;
 					if (searchFilter.getOperator().equalsIgnoreCase("equals")) {
-						predicate4 = criteriaBuilder.like(agvRoot.<String>get("stringValue"), searchFilter.getFilterValue());
+						predicate4 = criteriaBuilder.like(agvRoot.<String>get("stringValue"),
+								searchFilter.getFilterValue());
 					} else if (searchFilter.getOperator().equalsIgnoreCase("contains")) {
-						predicate4 = criteriaBuilder.like(agvRoot.<String>get("stringValue"), "%" + searchFilter.getFilterValue() + "%");
+						predicate4 = criteriaBuilder.like(agvRoot.<String>get("stringValue"),
+								"%" + searchFilter.getFilterValue() + "%");
 					}
 					Predicate predicate5 = criteriaBuilder.isNull(agvRoot.<String>get("stringValue"));
 					if (predicate4 != null) {
@@ -1229,12 +1354,12 @@ public static TypedQuery<AnalysisGroupValue> findAGValuesBySearchFilter(Set<java
 						predicateList.add(predicate6);
 					}
 				}
-			}						
-			//join all the predicates with AND
+			}
+			// join all the predicates with AND
 			predicates = predicateList.toArray(predicates);
-			globalPredicateList.add(criteriaBuilder.and(predicates));	
+			globalPredicateList.add(criteriaBuilder.and(predicates));
 		}
-		
+
 		criteria.where(criteriaBuilder.and(globalPredicateList.toArray(globalPredicates)));
 		TypedQuery<AnalysisGroupValue> q = em.createQuery(criteria);
 		logger.debug(q.unwrap(org.hibernate.Query.class).getQueryString());
@@ -1242,13 +1367,13 @@ public static TypedQuery<AnalysisGroupValue> findAGValuesBySearchFilter(Set<java
 		return q;
 	}
 
-
-
-	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByExptIDAndStateTypeKind(Long experimentId, 
-			String stateType, 
+	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByExptIDAndStateTypeKind(Long experimentId,
+			String stateType,
 			String stateKind) {
-		if (stateType == null || stateType.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
+		if (stateType == null || stateType.length() == 0)
+			throw new IllegalArgumentException("The stateType argument is required");
+		if (stateKind == null || stateKind.length() == 0)
+			throw new IllegalArgumentException("The stateKind argument is required");
 
 		EntityManager em = entityManager();
 		String hsqlQuery = "SELECT agv FROM AnalysisGroupValue AS agv " +
@@ -1267,9 +1392,12 @@ public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByExptIDAndS
 		return q;
 	}
 
-	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByAnalysisGroupIDAndStateTypeKind(Long analysisGroupId, String stateType, String stateKind) {
-		if (stateType == null || stateType.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
+	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByAnalysisGroupIDAndStateTypeKind(
+			Long analysisGroupId, String stateType, String stateKind) {
+		if (stateType == null || stateType.length() == 0)
+			throw new IllegalArgumentException("The stateType argument is required");
+		if (stateKind == null || stateKind.length() == 0)
+			throw new IllegalArgumentException("The stateKind argument is required");
 
 		EntityManager em = entityManager();
 		String hsqlQuery = "SELECT agv from AnalysisGroupValue AS agv " +
@@ -1288,12 +1416,17 @@ public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByAnalysisGr
 		return q;
 	}
 
-	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByExptIDAndStateTypeKindAndValueTypeKind(Long experimentId, String stateType,
+	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByExptIDAndStateTypeKindAndValueTypeKind(
+			Long experimentId, String stateType,
 			String stateKind, String valueType, String valueKind) {
-		if (stateType == null || stateType.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-		if (valueType == null || valueType.length() == 0) throw new IllegalArgumentException("The valueType argument is required");
-		if (valueKind == null || valueKind.length() == 0) throw new IllegalArgumentException("The valueKind argument is required");
+		if (stateType == null || stateType.length() == 0)
+			throw new IllegalArgumentException("The stateType argument is required");
+		if (stateKind == null || stateKind.length() == 0)
+			throw new IllegalArgumentException("The stateKind argument is required");
+		if (valueType == null || valueType.length() == 0)
+			throw new IllegalArgumentException("The valueType argument is required");
+		if (valueKind == null || valueKind.length() == 0)
+			throw new IllegalArgumentException("The valueKind argument is required");
 
 		EntityManager em = entityManager();
 		String hsqlQuery = "SELECT agv FROM AnalysisGroupValue AS agv " +
@@ -1313,45 +1446,52 @@ public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByExptIDAndS
 		q.setParameter("ignored", true);
 		return q;
 	}
-	
-	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByIdList(Set<Long> idList, Boolean onlyPublicData) {
-		if (idList == null ) throw new IllegalArgumentException("The idList argument is required");
-		if (onlyPublicData == null ) throw new IllegalArgumentException("The onlyPublicData argument is required");
+
+	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByIdList(Set<Long> idList,
+			Boolean onlyPublicData) {
+		if (idList == null)
+			throw new IllegalArgumentException("The idList argument is required");
+		if (onlyPublicData == null)
+			throw new IllegalArgumentException("The onlyPublicData argument is required");
 
 		EntityManager em = entityManager();
-		
-		
+
 		String hsqlQuery = "SELECT agv FROM AnalysisGroupValue AS agv " +
 				"WHERE agv.id in (:idList) AND agv.ignored IS NOT :ignored ";
-		
+
 		String hsqlQueryPublic = "SELECT agv FROM AnalysisGroupValue AS agv " +
 				"WHERE agv.id in (:idList) AND agv.ignored IS NOT :ignored " +
 				"AND agv.publicData IS :publicData ";
 
-		if (onlyPublicData){
+		if (onlyPublicData) {
 			TypedQuery<AnalysisGroupValue> q = em.createQuery(hsqlQueryPublic, AnalysisGroupValue.class);
 			q.setParameter("idList", idList);
 			q.setParameter("ignored", true);
 			q.setParameter("publicData", true);
 			logger.debug("query running: hsqlQueryPublic   " + hsqlQueryPublic);
 			return q;
-			
+
 		} else {
 			TypedQuery<AnalysisGroupValue> q = em.createQuery(hsqlQuery, AnalysisGroupValue.class);
 			q.setParameter("idList", idList);
 			q.setParameter("ignored", true);
 			logger.debug("query running: hsqlQuery   " + hsqlQuery);
-			return q;			
+			return q;
 		}
 	}
 
-	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByAnalysisGroupIDAndStateTypeKindAndValueTypeKind(Long analysisGroupId, String stateType,
+	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByAnalysisGroupIDAndStateTypeKindAndValueTypeKind(
+			Long analysisGroupId, String stateType,
 			String stateKind, String valueType, String valueKind) {
 
-		if (stateType == null || stateType.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-		if (valueType == null || valueType.length() == 0) throw new IllegalArgumentException("The valueType argument is required");
-		if (valueKind == null || valueKind.length() == 0) throw new IllegalArgumentException("The valueKind argument is required");
+		if (stateType == null || stateType.length() == 0)
+			throw new IllegalArgumentException("The stateType argument is required");
+		if (stateKind == null || stateKind.length() == 0)
+			throw new IllegalArgumentException("The stateKind argument is required");
+		if (valueType == null || valueType.length() == 0)
+			throw new IllegalArgumentException("The valueType argument is required");
+		if (valueKind == null || valueKind.length() == 0)
+			throw new IllegalArgumentException("The valueKind argument is required");
 
 		EntityManager em = entityManager();
 		String hsqlQuery = "SELECT agv FROM AnalysisGroupValue AS agv " +
@@ -1369,15 +1509,20 @@ public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByAnalysisGr
 		q.setParameter("valueKind", valueKind);
 		q.setParameter("ignored", true);
 		return q;
-    }
-	
-	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByAnalysisGroupCodeNameAndStateTypeKindAndValueTypeKind(String analysisGroupCodeName, String stateType,
+	}
+
+	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByAnalysisGroupCodeNameAndStateTypeKindAndValueTypeKind(
+			String analysisGroupCodeName, String stateType,
 			String stateKind, String valueType, String valueKind) {
 
-		if (stateType == null || stateType.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-		if (valueType == null || valueType.length() == 0) throw new IllegalArgumentException("The valueType argument is required");
-		if (valueKind == null || valueKind.length() == 0) throw new IllegalArgumentException("The valueKind argument is required");
+		if (stateType == null || stateType.length() == 0)
+			throw new IllegalArgumentException("The stateType argument is required");
+		if (stateKind == null || stateKind.length() == 0)
+			throw new IllegalArgumentException("The stateKind argument is required");
+		if (valueType == null || valueType.length() == 0)
+			throw new IllegalArgumentException("The valueType argument is required");
+		if (valueKind == null || valueKind.length() == 0)
+			throw new IllegalArgumentException("The valueKind argument is required");
 
 		EntityManager em = entityManager();
 		String hsqlQuery = "SELECT agv FROM AnalysisGroupValue AS agv " +
@@ -1395,12 +1540,12 @@ public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByAnalysisGr
 		q.setParameter("valueKind", valueKind);
 		q.setParameter("ignored", true);
 		return q;
-    }
-    
-	public static String[] getColumns(){
+	}
+
+	public static String[] getColumns() {
 		String[] headerColumns = new String[] {
 				"analysisGroupId",
-				"analysisGroupCode",				
+				"analysisGroupCode",
 				"stateId",
 				"stateType",
 				"stateKind",
@@ -1439,13 +1584,13 @@ public static String[] getColumns(){
 				"modifiedBy",
 				"publicData"
 		};
-		//35 columns
+		// 35 columns
 		return headerColumns;
 
 	}
 
 	public static CellProcessor[] getProcessors() {
-		final CellProcessor[] processors = new CellProcessor[] { 
+		final CellProcessor[] processors = new CellProcessor[] {
 				new Optional(),
 				new Optional(),
 				new Optional(),
@@ -1490,275 +1635,339 @@ public static CellProcessor[] getProcessors() {
 		return processors;
 	}
 
-
 	public static Long countFindAnalysisGroupValuesByCodeValueEquals(String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupValue AS o WHERE o.codeValue = :codeValue", Long.class);
-        q.setParameter("codeValue", codeValue);
-        return ((Long) q.getSingleResult());
-    }
+		if (codeValue == null || codeValue.length() == 0)
+			throw new IllegalArgumentException("The codeValue argument is required");
+		EntityManager em = AnalysisGroupValue.entityManager();
+		TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupValue AS o WHERE o.codeValue = :codeValue",
+				Long.class);
+		q.setParameter("codeValue", codeValue);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static Long countFindAnalysisGroupValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", Long.class);
-        q.setParameter("ignored", ignored);
-        q.setParameter("codeValue", codeValue);
-        return ((Long) q.getSingleResult());
-    }
+		if (codeValue == null || codeValue.length() == 0)
+			throw new IllegalArgumentException("The codeValue argument is required");
+		EntityManager em = AnalysisGroupValue.entityManager();
+		TypedQuery q = em.createQuery(
+				"SELECT COUNT(o) FROM AnalysisGroupValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue",
+				Long.class);
+		q.setParameter("ignored", ignored);
+		q.setParameter("codeValue", codeValue);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static Long countFindAnalysisGroupValuesByLsState(AnalysisGroupState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupValue AS o WHERE o.lsState = :lsState", Long.class);
-        q.setParameter("lsState", lsState);
-        return ((Long) q.getSingleResult());
-    }
+		if (lsState == null)
+			throw new IllegalArgumentException("The lsState argument is required");
+		EntityManager em = AnalysisGroupValue.entityManager();
+		TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupValue AS o WHERE o.lsState = :lsState",
+				Long.class);
+		q.setParameter("lsState", lsState);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static Long countFindAnalysisGroupValuesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupValue AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
+		if (lsTransaction == null)
+			throw new IllegalArgumentException("The lsTransaction argument is required");
+		EntityManager em = AnalysisGroupValue.entityManager();
+		TypedQuery q = em.createQuery(
+				"SELECT COUNT(o) FROM AnalysisGroupValue AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+		q.setParameter("lsTransaction", lsTransaction);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static Long countFindAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
-
-	public static Long countFindAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(String lsType, String lsKind, String stringValue, boolean ignored) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
-        stringValue = stringValue.replace('*', '%');
-        if (stringValue.charAt(0) != '%') {
-            stringValue = "%" + stringValue;
-        }
-        if (stringValue.charAt(stringValue.length() - 1) != '%') {
-            stringValue = stringValue + "%";
-        }
-        EntityManager em = AnalysisGroupValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AnalysisGroupValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)  AND o.ignored IS NOT :ignored", Long.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("stringValue", stringValue);
-        q.setParameter("ignored", ignored);
-        return ((Long) q.getSingleResult());
-    }
+		if (lsType == null || lsType.length() == 0)
+			throw new IllegalArgumentException("The lsType argument is required");
+		if (lsKind == null || lsKind.length() == 0)
+			throw new IllegalArgumentException("The lsKind argument is required");
+		EntityManager em = AnalysisGroupValue.entityManager();
+		TypedQuery q = em.createQuery(
+				"SELECT COUNT(o) FROM AnalysisGroupValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind",
+				Long.class);
+		q.setParameter("lsType", lsType);
+		q.setParameter("lsKind", lsKind);
+		return ((Long) q.getSingleResult());
+	}
+
+	public static Long countFindAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(
+			String lsType, String lsKind, String stringValue, boolean ignored) {
+		if (lsType == null || lsType.length() == 0)
+			throw new IllegalArgumentException("The lsType argument is required");
+		if (lsKind == null || lsKind.length() == 0)
+			throw new IllegalArgumentException("The lsKind argument is required");
+		if (stringValue == null || stringValue.length() == 0)
+			throw new IllegalArgumentException("The stringValue argument is required");
+		stringValue = stringValue.replace('*', '%');
+		if (stringValue.charAt(0) != '%') {
+			stringValue = "%" + stringValue;
+		}
+		if (stringValue.charAt(stringValue.length() - 1) != '%') {
+			stringValue = stringValue + "%";
+		}
+		EntityManager em = AnalysisGroupValue.entityManager();
+		TypedQuery q = em.createQuery(
+				"SELECT COUNT(o) FROM AnalysisGroupValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)  AND o.ignored IS NOT :ignored",
+				Long.class);
+		q.setParameter("lsType", lsType);
+		q.setParameter("lsKind", lsKind);
+		q.setParameter("stringValue", stringValue);
+		q.setParameter("ignored", ignored);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByCodeValueEquals(String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        TypedQuery<AnalysisGroupValue> q = em.createQuery("SELECT o FROM AnalysisGroupValue AS o WHERE o.codeValue = :codeValue", AnalysisGroupValue.class);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-
-	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByCodeValueEquals(String codeValue, String sortFieldName, String sortOrder) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupValue AS o WHERE o.codeValue = :codeValue");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AnalysisGroupValue> q = em.createQuery(queryBuilder.toString(), AnalysisGroupValue.class);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-
-	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        TypedQuery<AnalysisGroupValue> q = em.createQuery("SELECT o FROM AnalysisGroupValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", AnalysisGroupValue.class);
-        q.setParameter("ignored", ignored);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-
-	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue, String sortFieldName, String sortOrder) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AnalysisGroupValue> q = em.createQuery(queryBuilder.toString(), AnalysisGroupValue.class);
-        q.setParameter("ignored", ignored);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
+		if (codeValue == null || codeValue.length() == 0)
+			throw new IllegalArgumentException("The codeValue argument is required");
+		EntityManager em = AnalysisGroupValue.entityManager();
+		TypedQuery<AnalysisGroupValue> q = em.createQuery(
+				"SELECT o FROM AnalysisGroupValue AS o WHERE o.codeValue = :codeValue", AnalysisGroupValue.class);
+		q.setParameter("codeValue", codeValue);
+		return q;
+	}
+
+	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByCodeValueEquals(String codeValue,
+			String sortFieldName, String sortOrder) {
+		if (codeValue == null || codeValue.length() == 0)
+			throw new IllegalArgumentException("The codeValue argument is required");
+		EntityManager em = AnalysisGroupValue.entityManager();
+		StringBuilder queryBuilder = new StringBuilder(
+				"SELECT o FROM AnalysisGroupValue AS o WHERE o.codeValue = :codeValue");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<AnalysisGroupValue> q = em.createQuery(queryBuilder.toString(), AnalysisGroupValue.class);
+		q.setParameter("codeValue", codeValue);
+		return q;
+	}
+
+	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByIgnoredNotAndCodeValueEquals(boolean ignored,
+			String codeValue) {
+		if (codeValue == null || codeValue.length() == 0)
+			throw new IllegalArgumentException("The codeValue argument is required");
+		EntityManager em = AnalysisGroupValue.entityManager();
+		TypedQuery<AnalysisGroupValue> q = em.createQuery(
+				"SELECT o FROM AnalysisGroupValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue",
+				AnalysisGroupValue.class);
+		q.setParameter("ignored", ignored);
+		q.setParameter("codeValue", codeValue);
+		return q;
+	}
+
+	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByIgnoredNotAndCodeValueEquals(boolean ignored,
+			String codeValue, String sortFieldName, String sortOrder) {
+		if (codeValue == null || codeValue.length() == 0)
+			throw new IllegalArgumentException("The codeValue argument is required");
+		EntityManager em = AnalysisGroupValue.entityManager();
+		StringBuilder queryBuilder = new StringBuilder(
+				"SELECT o FROM AnalysisGroupValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<AnalysisGroupValue> q = em.createQuery(queryBuilder.toString(), AnalysisGroupValue.class);
+		q.setParameter("ignored", ignored);
+		q.setParameter("codeValue", codeValue);
+		return q;
+	}
 
 	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByLsState(AnalysisGroupState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        TypedQuery<AnalysisGroupValue> q = em.createQuery("SELECT o FROM AnalysisGroupValue AS o WHERE o.lsState = :lsState", AnalysisGroupValue.class);
-        q.setParameter("lsState", lsState);
-        return q;
-    }
-
-	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByLsState(AnalysisGroupState lsState, String sortFieldName, String sortOrder) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupValue AS o WHERE o.lsState = :lsState");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AnalysisGroupValue> q = em.createQuery(queryBuilder.toString(), AnalysisGroupValue.class);
-        q.setParameter("lsState", lsState);
-        return q;
-    }
+		if (lsState == null)
+			throw new IllegalArgumentException("The lsState argument is required");
+		EntityManager em = AnalysisGroupValue.entityManager();
+		TypedQuery<AnalysisGroupValue> q = em.createQuery(
+				"SELECT o FROM AnalysisGroupValue AS o WHERE o.lsState = :lsState", AnalysisGroupValue.class);
+		q.setParameter("lsState", lsState);
+		return q;
+	}
+
+	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByLsState(AnalysisGroupState lsState,
+			String sortFieldName, String sortOrder) {
+		if (lsState == null)
+			throw new IllegalArgumentException("The lsState argument is required");
+		EntityManager em = AnalysisGroupValue.entityManager();
+		StringBuilder queryBuilder = new StringBuilder(
+				"SELECT o FROM AnalysisGroupValue AS o WHERE o.lsState = :lsState");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<AnalysisGroupValue> q = em.createQuery(queryBuilder.toString(), AnalysisGroupValue.class);
+		q.setParameter("lsState", lsState);
+		return q;
+	}
 
 	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        TypedQuery<AnalysisGroupValue> q = em.createQuery("SELECT o FROM AnalysisGroupValue AS o WHERE o.lsTransaction = :lsTransaction", AnalysisGroupValue.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-
-	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupValue AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AnalysisGroupValue> q = em.createQuery(queryBuilder.toString(), AnalysisGroupValue.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-
-	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        TypedQuery<AnalysisGroupValue> q = em.createQuery("SELECT o FROM AnalysisGroupValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", AnalysisGroupValue.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-
-	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AnalysisGroupValue> q = em.createQuery(queryBuilder.toString(), AnalysisGroupValue.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-
-	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(String lsType, String lsKind, String stringValue, boolean ignored) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
-        stringValue = stringValue.replace('*', '%');
-        if (stringValue.charAt(0) != '%') {
-            stringValue = "%" + stringValue;
-        }
-        if (stringValue.charAt(stringValue.length() - 1) != '%') {
-            stringValue = stringValue + "%";
-        }
-        EntityManager em = AnalysisGroupValue.entityManager();
-        TypedQuery<AnalysisGroupValue> q = em.createQuery("SELECT o FROM AnalysisGroupValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)  AND o.ignored IS NOT :ignored", AnalysisGroupValue.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("stringValue", stringValue);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-
-	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(String lsType, String lsKind, String stringValue, boolean ignored, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
-        stringValue = stringValue.replace('*', '%');
-        if (stringValue.charAt(0) != '%') {
-            stringValue = "%" + stringValue;
-        }
-        if (stringValue.charAt(stringValue.length() - 1) != '%') {
-            stringValue = stringValue + "%";
-        }
-        EntityManager em = AnalysisGroupValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AnalysisGroupValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)  AND o.ignored IS NOT :ignored");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<AnalysisGroupValue> q = em.createQuery(queryBuilder.toString(), AnalysisGroupValue.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        q.setParameter("stringValue", stringValue);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "PARAMETER_LIMIT", "lsState");
+		if (lsTransaction == null)
+			throw new IllegalArgumentException("The lsTransaction argument is required");
+		EntityManager em = AnalysisGroupValue.entityManager();
+		TypedQuery<AnalysisGroupValue> q = em.createQuery(
+				"SELECT o FROM AnalysisGroupValue AS o WHERE o.lsTransaction = :lsTransaction",
+				AnalysisGroupValue.class);
+		q.setParameter("lsTransaction", lsTransaction);
+		return q;
+	}
+
+	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByLsTransactionEquals(Long lsTransaction,
+			String sortFieldName, String sortOrder) {
+		if (lsTransaction == null)
+			throw new IllegalArgumentException("The lsTransaction argument is required");
+		EntityManager em = AnalysisGroupValue.entityManager();
+		StringBuilder queryBuilder = new StringBuilder(
+				"SELECT o FROM AnalysisGroupValue AS o WHERE o.lsTransaction = :lsTransaction");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<AnalysisGroupValue> q = em.createQuery(queryBuilder.toString(), AnalysisGroupValue.class);
+		q.setParameter("lsTransaction", lsTransaction);
+		return q;
+	}
+
+	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals(String lsType,
+			String lsKind) {
+		if (lsType == null || lsType.length() == 0)
+			throw new IllegalArgumentException("The lsType argument is required");
+		if (lsKind == null || lsKind.length() == 0)
+			throw new IllegalArgumentException("The lsKind argument is required");
+		EntityManager em = AnalysisGroupValue.entityManager();
+		TypedQuery<AnalysisGroupValue> q = em.createQuery(
+				"SELECT o FROM AnalysisGroupValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind",
+				AnalysisGroupValue.class);
+		q.setParameter("lsType", lsType);
+		q.setParameter("lsKind", lsKind);
+		return q;
+	}
+
+	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByLsTypeEqualsAndLsKindEquals(String lsType,
+			String lsKind, String sortFieldName, String sortOrder) {
+		if (lsType == null || lsType.length() == 0)
+			throw new IllegalArgumentException("The lsType argument is required");
+		if (lsKind == null || lsKind.length() == 0)
+			throw new IllegalArgumentException("The lsKind argument is required");
+		EntityManager em = AnalysisGroupValue.entityManager();
+		StringBuilder queryBuilder = new StringBuilder(
+				"SELECT o FROM AnalysisGroupValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<AnalysisGroupValue> q = em.createQuery(queryBuilder.toString(), AnalysisGroupValue.class);
+		q.setParameter("lsType", lsType);
+		q.setParameter("lsKind", lsKind);
+		return q;
+	}
+
+	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(
+			String lsType, String lsKind, String stringValue, boolean ignored) {
+		if (lsType == null || lsType.length() == 0)
+			throw new IllegalArgumentException("The lsType argument is required");
+		if (lsKind == null || lsKind.length() == 0)
+			throw new IllegalArgumentException("The lsKind argument is required");
+		if (stringValue == null || stringValue.length() == 0)
+			throw new IllegalArgumentException("The stringValue argument is required");
+		stringValue = stringValue.replace('*', '%');
+		if (stringValue.charAt(0) != '%') {
+			stringValue = "%" + stringValue;
+		}
+		if (stringValue.charAt(stringValue.length() - 1) != '%') {
+			stringValue = stringValue + "%";
+		}
+		EntityManager em = AnalysisGroupValue.entityManager();
+		TypedQuery<AnalysisGroupValue> q = em.createQuery(
+				"SELECT o FROM AnalysisGroupValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)  AND o.ignored IS NOT :ignored",
+				AnalysisGroupValue.class);
+		q.setParameter("lsType", lsType);
+		q.setParameter("lsKind", lsKind);
+		q.setParameter("stringValue", stringValue);
+		q.setParameter("ignored", ignored);
+		return q;
+	}
+
+	public static TypedQuery<AnalysisGroupValue> findAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(
+			String lsType, String lsKind, String stringValue, boolean ignored, String sortFieldName, String sortOrder) {
+		if (lsType == null || lsType.length() == 0)
+			throw new IllegalArgumentException("The lsType argument is required");
+		if (lsKind == null || lsKind.length() == 0)
+			throw new IllegalArgumentException("The lsKind argument is required");
+		if (stringValue == null || stringValue.length() == 0)
+			throw new IllegalArgumentException("The stringValue argument is required");
+		stringValue = stringValue.replace('*', '%');
+		if (stringValue.charAt(0) != '%') {
+			stringValue = "%" + stringValue;
+		}
+		if (stringValue.charAt(stringValue.length() - 1) != '%') {
+			stringValue = stringValue + "%";
+		}
+		EntityManager em = AnalysisGroupValue.entityManager();
+		StringBuilder queryBuilder = new StringBuilder(
+				"SELECT o FROM AnalysisGroupValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)  AND o.ignored IS NOT :ignored");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<AnalysisGroupValue> q = em.createQuery(queryBuilder.toString(), AnalysisGroupValue.class);
+		q.setParameter("lsType", lsType);
+		q.setParameter("lsKind", lsKind);
+		q.setParameter("stringValue", stringValue);
+		q.setParameter("ignored", ignored);
+		return q;
+	}
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "PARAMETER_LIMIT",
+			"lsState");
 
 	public static List<AnalysisGroupValue> findAllAnalysisGroupValues(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AnalysisGroupValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AnalysisGroupValue.class).getResultList();
-    }
-
-	public static List<AnalysisGroupValue> findAnalysisGroupValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM AnalysisGroupValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, AnalysisGroupValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
+		String jpaQuery = "SELECT o FROM AnalysisGroupValue o";
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				jpaQuery = jpaQuery + " " + sortOrder;
+			}
+		}
+		return entityManager().createQuery(jpaQuery, AnalysisGroupValue.class).getResultList();
+	}
+
+	public static List<AnalysisGroupValue> findAnalysisGroupValueEntries(int firstResult, int maxResults,
+			String sortFieldName, String sortOrder) {
+		String jpaQuery = "SELECT o FROM AnalysisGroupValue o";
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				jpaQuery = jpaQuery + " " + sortOrder;
+			}
+		}
+		return entityManager().createQuery(jpaQuery, AnalysisGroupValue.class).setFirstResult(firstResult)
+				.setMaxResults(maxResults).getResultList();
+	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 
 	public AnalysisGroupState getLsState() {
-        return this.lsState;
-    }
+		return this.lsState;
+	}
 
 	public void setLsState(AnalysisGroupState lsState) {
-        this.lsState = lsState;
-    }
+		this.lsState = lsState;
+	}
 
 	public AnalysisGroupValue() {
-        super();
-    }
+		super();
+	}
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ApplicationSetting.java b/src/main/java/com/labsynch/labseer/domain/ApplicationSetting.java
index 5120cf3d1..2fcf9ec59 100755
--- a/src/main/java/com/labsynch/labseer/domain/ApplicationSetting.java
+++ b/src/main/java/com/labsynch/labseer/domain/ApplicationSetting.java
@@ -32,7 +32,8 @@
 
 public class ApplicationSetting {
 
-	//private static final Logger logger = LoggerFactory.getLogger(ApplicationSetting.class);
+    // private static final Logger logger =
+    // LoggerFactory.getLogger(ApplicationSetting.class);
 
     @Size(max = 255)
     private String propName;
@@ -48,44 +49,54 @@ public class ApplicationSetting {
     @Temporal(TemporalType.TIMESTAMP)
     @DateTimeFormat(style = "MM")
     private Date recordedDate;
-    
-//    @PostConstruct
-//    public void init(){
-//    	logger.info("calling the appSetting 201 init method upon startup");
-//    	this.setPropName("testing201");
-//    	this.setPropValue("testingValue201");
-//    	this.persist();
-//    }
-
-	public static Long countFindApplicationSettingsByPropNameEquals(String propName) {
-        if (propName == null || propName.length() == 0) throw new IllegalArgumentException("The propName argument is required");
+
+    // @PostConstruct
+    // public void init(){
+    // logger.info("calling the appSetting 201 init method upon startup");
+    // this.setPropName("testing201");
+    // this.setPropValue("testingValue201");
+    // this.persist();
+    // }
+
+    public static Long countFindApplicationSettingsByPropNameEquals(String propName) {
+        if (propName == null || propName.length() == 0)
+            throw new IllegalArgumentException("The propName argument is required");
         EntityManager em = ApplicationSetting.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ApplicationSetting AS o WHERE o.propName = :propName", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ApplicationSetting AS o WHERE o.propName = :propName",
+                Long.class);
         q.setParameter("propName", propName);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindApplicationSettingsByPropNameEqualsAndIgnoredNot(String propName, boolean ignored) {
-        if (propName == null || propName.length() == 0) throw new IllegalArgumentException("The propName argument is required");
+    public static Long countFindApplicationSettingsByPropNameEqualsAndIgnoredNot(String propName, boolean ignored) {
+        if (propName == null || propName.length() == 0)
+            throw new IllegalArgumentException("The propName argument is required");
         EntityManager em = ApplicationSetting.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ApplicationSetting AS o WHERE o.propName = :propName  AND o.ignored IS NOT :ignored", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ApplicationSetting AS o WHERE o.propName = :propName  AND o.ignored IS NOT :ignored",
+                Long.class);
         q.setParameter("propName", propName);
         q.setParameter("ignored", ignored);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<ApplicationSetting> findApplicationSettingsByPropNameEquals(String propName) {
-        if (propName == null || propName.length() == 0) throw new IllegalArgumentException("The propName argument is required");
+    public static TypedQuery<ApplicationSetting> findApplicationSettingsByPropNameEquals(String propName) {
+        if (propName == null || propName.length() == 0)
+            throw new IllegalArgumentException("The propName argument is required");
         EntityManager em = ApplicationSetting.entityManager();
-        TypedQuery<ApplicationSetting> q = em.createQuery("SELECT o FROM ApplicationSetting AS o WHERE o.propName = :propName", ApplicationSetting.class);
+        TypedQuery<ApplicationSetting> q = em.createQuery(
+                "SELECT o FROM ApplicationSetting AS o WHERE o.propName = :propName", ApplicationSetting.class);
         q.setParameter("propName", propName);
         return q;
     }
 
-	public static TypedQuery<ApplicationSetting> findApplicationSettingsByPropNameEquals(String propName, String sortFieldName, String sortOrder) {
-        if (propName == null || propName.length() == 0) throw new IllegalArgumentException("The propName argument is required");
+    public static TypedQuery<ApplicationSetting> findApplicationSettingsByPropNameEquals(String propName,
+            String sortFieldName, String sortOrder) {
+        if (propName == null || propName.length() == 0)
+            throw new IllegalArgumentException("The propName argument is required");
         EntityManager em = ApplicationSetting.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ApplicationSetting AS o WHERE o.propName = :propName");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ApplicationSetting AS o WHERE o.propName = :propName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -97,19 +108,26 @@ public static TypedQuery<ApplicationSetting> findApplicationSettingsByPropNameEq
         return q;
     }
 
-	public static TypedQuery<ApplicationSetting> findApplicationSettingsByPropNameEqualsAndIgnoredNot(String propName, boolean ignored) {
-        if (propName == null || propName.length() == 0) throw new IllegalArgumentException("The propName argument is required");
+    public static TypedQuery<ApplicationSetting> findApplicationSettingsByPropNameEqualsAndIgnoredNot(String propName,
+            boolean ignored) {
+        if (propName == null || propName.length() == 0)
+            throw new IllegalArgumentException("The propName argument is required");
         EntityManager em = ApplicationSetting.entityManager();
-        TypedQuery<ApplicationSetting> q = em.createQuery("SELECT o FROM ApplicationSetting AS o WHERE o.propName = :propName  AND o.ignored IS NOT :ignored", ApplicationSetting.class);
+        TypedQuery<ApplicationSetting> q = em.createQuery(
+                "SELECT o FROM ApplicationSetting AS o WHERE o.propName = :propName  AND o.ignored IS NOT :ignored",
+                ApplicationSetting.class);
         q.setParameter("propName", propName);
         q.setParameter("ignored", ignored);
         return q;
     }
 
-	public static TypedQuery<ApplicationSetting> findApplicationSettingsByPropNameEqualsAndIgnoredNot(String propName, boolean ignored, String sortFieldName, String sortOrder) {
-        if (propName == null || propName.length() == 0) throw new IllegalArgumentException("The propName argument is required");
+    public static TypedQuery<ApplicationSetting> findApplicationSettingsByPropNameEqualsAndIgnoredNot(String propName,
+            boolean ignored, String sortFieldName, String sortOrder) {
+        if (propName == null || propName.length() == 0)
+            throw new IllegalArgumentException("The propName argument is required");
         EntityManager em = ApplicationSetting.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ApplicationSetting AS o WHERE o.propName = :propName  AND o.ignored IS NOT :ignored");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ApplicationSetting AS o WHERE o.propName = :propName  AND o.ignored IS NOT :ignored");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -122,26 +140,30 @@ public static TypedQuery<ApplicationSetting> findApplicationSettingsByPropNameEq
         return q;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("propName", "propValue", "comments", "ignored", "recordedDate");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("propName", "propValue",
+            "comments", "ignored", "recordedDate");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new ApplicationSetting().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countApplicationSettings() {
+    public static long countApplicationSettings() {
         return entityManager().createQuery("SELECT COUNT(o) FROM ApplicationSetting o", Long.class).getSingleResult();
     }
 
-	public static List<ApplicationSetting> findAllApplicationSettings() {
-        return entityManager().createQuery("SELECT o FROM ApplicationSetting o", ApplicationSetting.class).getResultList();
+    public static List<ApplicationSetting> findAllApplicationSettings() {
+        return entityManager().createQuery("SELECT o FROM ApplicationSetting o", ApplicationSetting.class)
+                .getResultList();
     }
 
-	public static List<ApplicationSetting> findAllApplicationSettings(String sortFieldName, String sortOrder) {
+    public static List<ApplicationSetting> findAllApplicationSettings(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ApplicationSetting o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -152,16 +174,19 @@ public static List<ApplicationSetting> findAllApplicationSettings(String sortFie
         return entityManager().createQuery(jpaQuery, ApplicationSetting.class).getResultList();
     }
 
-	public static ApplicationSetting findApplicationSetting(Long id) {
-        if (id == null) return null;
+    public static ApplicationSetting findApplicationSetting(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ApplicationSetting.class, id);
     }
 
-	public static List<ApplicationSetting> findApplicationSettingEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ApplicationSetting o", ApplicationSetting.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ApplicationSetting> findApplicationSettingEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ApplicationSetting o", ApplicationSetting.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ApplicationSetting> findApplicationSettingEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ApplicationSetting> findApplicationSettingEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ApplicationSetting o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -169,18 +194,21 @@ public static List<ApplicationSetting> findApplicationSettingEntries(int firstRe
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ApplicationSetting.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ApplicationSetting.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -189,123 +217,126 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public ApplicationSetting merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ApplicationSetting merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ApplicationSetting fromJsonToApplicationSetting(String json) {
+    public static ApplicationSetting fromJsonToApplicationSetting(String json) {
         return new JSONDeserializer<ApplicationSetting>()
-        .use(null, ApplicationSetting.class).deserialize(json);
+                .use(null, ApplicationSetting.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ApplicationSetting> collection) {
+    public static String toJsonArray(Collection<ApplicationSetting> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ApplicationSetting> collection, String[] fields) {
+    public static String toJsonArray(Collection<ApplicationSetting> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ApplicationSetting> fromJsonArrayToApplicationSettings(String json) {
+    public static Collection<ApplicationSetting> fromJsonArrayToApplicationSettings(String json) {
         return new JSONDeserializer<List<ApplicationSetting>>()
-        .use("values", ApplicationSetting.class).deserialize(json);
+                .use("values", ApplicationSetting.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	@Id
+    @Id
     @SequenceGenerator(name = "applicationSettingGen", sequenceName = "APPSETTING_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "applicationSettingGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String getPropName() {
+    public String getPropName() {
         return this.propName;
     }
 
-	public void setPropName(String propName) {
+    public void setPropName(String propName) {
         this.propName = propName;
     }
 
-	public String getPropValue() {
+    public String getPropValue() {
         return this.propValue;
     }
 
-	public void setPropValue(String propValue) {
+    public void setPropValue(String propValue) {
         this.propValue = propValue;
     }
 
-	public String getComments() {
+    public String getComments() {
         return this.comments;
     }
 
-	public void setComments(String comments) {
+    public void setComments(String comments) {
         this.comments = comments;
     }
 
-	public boolean isIgnored() {
+    public boolean isIgnored() {
         return this.ignored;
     }
 
-	public void setIgnored(boolean ignored) {
+    public void setIgnored(boolean ignored) {
         this.ignored = ignored;
     }
 
-	public Date getRecordedDate() {
+    public Date getRecordedDate() {
         return this.recordedDate;
     }
 
-	public void setRecordedDate(Date recordedDate) {
+    public void setRecordedDate(Date recordedDate) {
         this.recordedDate = recordedDate;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/Author.java b/src/main/java/com/labsynch/labseer/domain/Author.java
index 25efa25b2..f4b459def 100755
--- a/src/main/java/com/labsynch/labseer/domain/Author.java
+++ b/src/main/java/com/labsynch/labseer/domain/Author.java
@@ -29,12 +29,13 @@
 
 @Configurable
 @Entity
-//(excludeFields = { "password", "modifiedDate", "activationKey", "activationDate", "emailAddress", "recordedDate", "modifiedDate", "enabled", "locked" })
-//(excludeFields = { "password", "authorRoles"})
+// (excludeFields = { "password", "modifiedDate", "activationKey",
+// "activationDate", "emailAddress", "recordedDate", "modifiedDate", "enabled",
+// "locked" })
+// (excludeFields = { "password", "authorRoles"})
 
 public class Author extends AbstractThing {
 
-	
     @NotNull
     @Size(max = 255)
     private String firstName;
@@ -44,18 +45,18 @@ public class Author extends AbstractThing {
     private String lastName;
 
     @NotNull
-//    @Column(unique = true)
+    // @Column(unique = true)
     @Size(max = 255)
     private String userName;
 
     @NotNull
-//    @Column(unique = true)
+    // @Column(unique = true)
     @Size(max = 255)
     private String emailAddress;
-    
+
     @Size(max = 255)
     private String password;
-    
+
     /**
      */
     @Temporal(TemporalType.TIMESTAMP)
@@ -73,152 +74,171 @@ public class Author extends AbstractThing {
     /**
      */
     private Boolean locked;
-        
-	@OneToMany(cascade = CascadeType.ALL, mappedBy = "userEntry", fetch =  FetchType.LAZY)
-	private Set<AuthorRole> authorRoles = new HashSet<AuthorRole>();
 
-	@OneToMany(cascade = CascadeType.ALL, mappedBy = "author")
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "userEntry", fetch = FetchType.LAZY)
+    private Set<AuthorRole> authorRoles = new HashSet<AuthorRole>();
+
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "author")
     private Set<AuthorState> lsStates = new HashSet<AuthorState>();
 
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "author")
     private Set<AuthorLabel> lsLabels = new HashSet<AuthorLabel>();
-	
-	public String toString() {
-		 return new StringBuilder().append(this.getId()).append(' ').append(this.userName).toString();
-//        return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).setExcludeFieldNames("password", "authorRoles").toString();
-    }
-
-//	@Id
-//    @SequenceGenerator(name = "authorGen", sequenceName = "AUTHOR_PKSEQ")
-//    @GeneratedValue(strategy = GenerationType.AUTO, generator = "authorGen")
-//    @Column(name = "id")
-//    private Long id;
-//
-//	@Version
-//    @Column(name = "version")
-//    private Integer version;
-
-//	public Long getId() {
-//        return this.id;
-//    }
-//
-//	public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//	public Integer getVersion() {
-//        return this.version;
-//    }
-//
-//	public void setVersion(Integer version) {
-//        this.version = version;
-//    }
-
-	public Author (Author author){
-		this.setRecordedBy(author.getRecordedBy());
-		this.setRecordedDate(author.getRecordedDate());
-		this.setLsTransaction(author.getLsTransaction());
-		this.setModifiedBy(author.getModifiedBy());
-		this.setModifiedDate(author.getModifiedDate());
-		this.setCodeName(author.getCodeName());
-		this.setLsKind(author.getLsKind());
-		this.setLsType(author.getLsType());
-		this.setLsTypeAndKind(author.getLsTypeAndKind());
-		this.setFirstName(author.getFirstName());
-		this.setLastName(author.getLastName());
-		this.setUserName(author.getUserName());
-		this.setEmailAddress(author.getEmailAddress());
-		this.setPassword(author.getPassword());
-		this.setActivationDate(author.getActivationDate());
-		this.setActivationKey(author.getActivationKey());
-		this.setEnabled(author.getEnabled());
-		this.setLocked(author.getLocked());
-	}
-	
-	public String toJson() {
-        return new JSONSerializer().exclude("*.class", "password").include("lsStates.lsValues","authorRoles","lsLabels").transform(new ExcludeNulls(), void.class).serialize(this);
-    }
-
-	public static Author fromJsonToAuthor(String json) {
+
+    public String toString() {
+        return new StringBuilder().append(this.getId()).append(' ').append(this.userName).toString();
+        // return new ReflectionToStringBuilder(this,
+        // ToStringStyle.SHORT_PREFIX_STYLE).setExcludeFieldNames("password",
+        // "authorRoles").toString();
+    }
+
+    // @Id
+    // @SequenceGenerator(name = "authorGen", sequenceName = "AUTHOR_PKSEQ")
+    // @GeneratedValue(strategy = GenerationType.AUTO, generator = "authorGen")
+    // @Column(name = "id")
+    // private Long id;
+    //
+    // @Version
+    // @Column(name = "version")
+    // private Integer version;
+
+    // public Long getId() {
+    // return this.id;
+    // }
+    //
+    // public void setId(Long id) {
+    // this.id = id;
+    // }
+    //
+    // public Integer getVersion() {
+    // return this.version;
+    // }
+    //
+    // public void setVersion(Integer version) {
+    // this.version = version;
+    // }
+
+    public Author(Author author) {
+        this.setRecordedBy(author.getRecordedBy());
+        this.setRecordedDate(author.getRecordedDate());
+        this.setLsTransaction(author.getLsTransaction());
+        this.setModifiedBy(author.getModifiedBy());
+        this.setModifiedDate(author.getModifiedDate());
+        this.setCodeName(author.getCodeName());
+        this.setLsKind(author.getLsKind());
+        this.setLsType(author.getLsType());
+        this.setLsTypeAndKind(author.getLsTypeAndKind());
+        this.setFirstName(author.getFirstName());
+        this.setLastName(author.getLastName());
+        this.setUserName(author.getUserName());
+        this.setEmailAddress(author.getEmailAddress());
+        this.setPassword(author.getPassword());
+        this.setActivationDate(author.getActivationDate());
+        this.setActivationKey(author.getActivationKey());
+        this.setEnabled(author.getEnabled());
+        this.setLocked(author.getLocked());
+    }
+
+    public String toJson() {
+        return new JSONSerializer().exclude("*.class", "password")
+                .include("lsStates.lsValues", "authorRoles", "lsLabels").transform(new ExcludeNulls(), void.class)
+                .serialize(this);
+    }
+
+    public static Author fromJsonToAuthor(String json) {
         return new JSONDeserializer<Author>().use(null, Author.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<Author> collection) {
-        return new JSONSerializer().exclude("*.class", "password").include("authorRoles","lsLabels","lsStates.lsValues").transform(new ExcludeNulls(), void.class).serialize(collection);
+    public static String toJsonArray(Collection<Author> collection) {
+        return new JSONSerializer().exclude("*.class", "password")
+                .include("authorRoles", "lsLabels", "lsStates.lsValues").transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
 
-	public static Collection<Author> fromJsonArrayToAuthors(String json) {
-        return new JSONDeserializer<List<Author>>().use(null, ArrayList.class).use("values", Author.class).deserialize(json);
+    public static Collection<Author> fromJsonArrayToAuthors(String json) {
+        return new JSONDeserializer<List<Author>>().use(null, ArrayList.class).use("values", Author.class)
+                .deserialize(json);
     }
 
-	@Transactional
-	public static TypedQuery<Author> findAuthorsByActivationKeyAndEmailAddress(String activationKey, String emailAddress) {
-        if (activationKey == null || activationKey.length() == 0) throw new IllegalArgumentException("The activationKey argument is required");
-        if (emailAddress == null || emailAddress.length() == 0) throw new IllegalArgumentException("The emailAddress argument is required");
+    @Transactional
+    public static TypedQuery<Author> findAuthorsByActivationKeyAndEmailAddress(String activationKey,
+            String emailAddress) {
+        if (activationKey == null || activationKey.length() == 0)
+            throw new IllegalArgumentException("The activationKey argument is required");
+        if (emailAddress == null || emailAddress.length() == 0)
+            throw new IllegalArgumentException("The emailAddress argument is required");
         EntityManager em = Author.entityManager();
-        TypedQuery<Author> q = em.createQuery("SELECT o FROM Author AS o WHERE o.ignored = FALSE AND o.activationKey = :activationKey AND o.emailAddress = :emailAddress", Author.class);
+        TypedQuery<Author> q = em.createQuery(
+                "SELECT o FROM Author AS o WHERE o.ignored = FALSE AND o.activationKey = :activationKey AND o.emailAddress = :emailAddress",
+                Author.class);
         q.setParameter("activationKey", activationKey);
         q.setParameter("emailAddress", emailAddress);
         return q;
     }
 
-	@Transactional
-	public static TypedQuery<Author> findAuthorsByEmailAddress(String emailAddress) {
-        if (emailAddress == null || emailAddress.length() == 0) throw new IllegalArgumentException("The emailAddress argument is required");
+    @Transactional
+    public static TypedQuery<Author> findAuthorsByEmailAddress(String emailAddress) {
+        if (emailAddress == null || emailAddress.length() == 0)
+            throw new IllegalArgumentException("The emailAddress argument is required");
         EntityManager em = Author.entityManager();
-        TypedQuery<Author> q = em.createQuery("SELECT o FROM Author AS o WHERE o.ignored = FALSE AND o.emailAddress = :emailAddress", Author.class);
+        TypedQuery<Author> q = em.createQuery(
+                "SELECT o FROM Author AS o WHERE o.ignored = FALSE AND o.emailAddress = :emailAddress", Author.class);
         q.setParameter("emailAddress", emailAddress);
         return q;
     }
 
-	@Transactional
-	public static TypedQuery<Author> findAuthorsByUserName(String userName) {
-        if (userName == null || userName.length() == 0) throw new IllegalArgumentException("The userName argument is required");
+    @Transactional
+    public static TypedQuery<Author> findAuthorsByUserName(String userName) {
+        if (userName == null || userName.length() == 0)
+            throw new IllegalArgumentException("The userName argument is required");
         EntityManager em = Author.entityManager();
-        TypedQuery<Author> q = em.createQuery("SELECT o FROM Author AS o WHERE o.ignored = FALSE AND LOWER(o.userName) = LOWER(:userName)", Author.class);
+        TypedQuery<Author> q = em.createQuery(
+                "SELECT o FROM Author AS o WHERE o.ignored = FALSE AND LOWER(o.userName) = LOWER(:userName)",
+                Author.class);
         q.setParameter("userName", userName);
         return q;
     }
 
-	public static Author update(Author author) {
-		Author updatedAuthor = Author.findAuthor(author.getId());
-		updatedAuthor.setRecordedBy(author.getRecordedBy());
-		updatedAuthor.setRecordedDate(author.getRecordedDate());
-		updatedAuthor.setLsTransaction(author.getLsTransaction());
-		updatedAuthor.setModifiedBy(author.getModifiedBy());
-		updatedAuthor.setModifiedDate(author.getModifiedDate());
-		updatedAuthor.setCodeName(author.getCodeName());
-		updatedAuthor.setLsKind(author.getLsKind());
-		updatedAuthor.setLsType(author.getLsType());
-		updatedAuthor.setLsTypeAndKind(author.getLsTypeAndKind());
-		updatedAuthor.setFirstName(author.getFirstName());
-		updatedAuthor.setLastName(author.getLastName());
-		updatedAuthor.setUserName(author.getUserName());
-		updatedAuthor.setEmailAddress(author.getEmailAddress());
-		if (author.getPassword() != null) updatedAuthor.setPassword(author.getPassword());
-		updatedAuthor.setActivationDate(author.getActivationDate());
-		updatedAuthor.setActivationKey(author.getActivationKey());
-		updatedAuthor.setEnabled(author.getEnabled());
-		updatedAuthor.setLocked(author.getLocked());
-		updatedAuthor.merge();
-		return updatedAuthor;
-	}
-	
-
-	public Author() {
-    }
-
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("firstName", "lastName", "userName", "emailAddress", "password", "activationDate", "activationKey", "enabled", "locked", "authorRoles", "lsStates", "lsLabels");
-
-	public static long countAuthors() {
+    public static Author update(Author author) {
+        Author updatedAuthor = Author.findAuthor(author.getId());
+        updatedAuthor.setRecordedBy(author.getRecordedBy());
+        updatedAuthor.setRecordedDate(author.getRecordedDate());
+        updatedAuthor.setLsTransaction(author.getLsTransaction());
+        updatedAuthor.setModifiedBy(author.getModifiedBy());
+        updatedAuthor.setModifiedDate(author.getModifiedDate());
+        updatedAuthor.setCodeName(author.getCodeName());
+        updatedAuthor.setLsKind(author.getLsKind());
+        updatedAuthor.setLsType(author.getLsType());
+        updatedAuthor.setLsTypeAndKind(author.getLsTypeAndKind());
+        updatedAuthor.setFirstName(author.getFirstName());
+        updatedAuthor.setLastName(author.getLastName());
+        updatedAuthor.setUserName(author.getUserName());
+        updatedAuthor.setEmailAddress(author.getEmailAddress());
+        if (author.getPassword() != null)
+            updatedAuthor.setPassword(author.getPassword());
+        updatedAuthor.setActivationDate(author.getActivationDate());
+        updatedAuthor.setActivationKey(author.getActivationKey());
+        updatedAuthor.setEnabled(author.getEnabled());
+        updatedAuthor.setLocked(author.getLocked());
+        updatedAuthor.merge();
+        return updatedAuthor;
+    }
+
+    public Author() {
+    }
+
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("firstName", "lastName",
+            "userName", "emailAddress", "password", "activationDate", "activationKey", "enabled", "locked",
+            "authorRoles", "lsStates", "lsLabels");
+
+    public static long countAuthors() {
         return entityManager().createQuery("SELECT COUNT(o) FROM Author o", Long.class).getSingleResult();
     }
 
-	public static List<Author> findAllAuthors() {
+    public static List<Author> findAllAuthors() {
         return entityManager().createQuery("SELECT o FROM Author o", Author.class).getResultList();
     }
 
-	public static List<Author> findAllAuthors(String sortFieldName, String sortOrder) {
+    public static List<Author> findAllAuthors(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM Author o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -229,16 +249,19 @@ public static List<Author> findAllAuthors(String sortFieldName, String sortOrder
         return entityManager().createQuery(jpaQuery, Author.class).getResultList();
     }
 
-	public static Author findAuthor(Long id) {
-        if (id == null) return null;
+    public static Author findAuthor(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(Author.class, id);
     }
 
-	public static List<Author> findAuthorEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM Author o", Author.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<Author> findAuthorEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM Author o", Author.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<Author> findAuthorEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<Author> findAuthorEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM Author o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -246,144 +269,157 @@ public static List<Author> findAuthorEntries(int firstResult, int maxResults, St
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, Author.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, Author.class).setFirstResult(firstResult).setMaxResults(maxResults)
+                .getResultList();
     }
 
-	@Transactional
+    @Transactional
     public Author merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         Author merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String getFirstName() {
+    public String getFirstName() {
         return this.firstName;
     }
 
-	public void setFirstName(String firstName) {
+    public void setFirstName(String firstName) {
         this.firstName = firstName;
     }
 
-	public String getLastName() {
+    public String getLastName() {
         return this.lastName;
     }
 
-	public void setLastName(String lastName) {
+    public void setLastName(String lastName) {
         this.lastName = lastName;
     }
 
-	public String getUserName() {
+    public String getUserName() {
         return this.userName;
     }
 
-	public void setUserName(String userName) {
+    public void setUserName(String userName) {
         this.userName = userName;
     }
 
-	public String getEmailAddress() {
+    public String getEmailAddress() {
         return this.emailAddress;
     }
 
-	public void setEmailAddress(String emailAddress) {
+    public void setEmailAddress(String emailAddress) {
         this.emailAddress = emailAddress;
     }
 
-	public String getPassword() {
+    public String getPassword() {
         return this.password;
     }
 
-	public void setPassword(String password) {
+    public void setPassword(String password) {
         this.password = password;
     }
 
-	public Date getActivationDate() {
+    public Date getActivationDate() {
         return this.activationDate;
     }
 
-	public void setActivationDate(Date activationDate) {
+    public void setActivationDate(Date activationDate) {
         this.activationDate = activationDate;
     }
 
-	public String getActivationKey() {
+    public String getActivationKey() {
         return this.activationKey;
     }
 
-	public void setActivationKey(String activationKey) {
+    public void setActivationKey(String activationKey) {
         this.activationKey = activationKey;
     }
 
-	public Boolean getEnabled() {
+    public Boolean getEnabled() {
         return this.enabled;
     }
 
-	public void setEnabled(Boolean enabled) {
+    public void setEnabled(Boolean enabled) {
         this.enabled = enabled;
     }
 
-	public Boolean getLocked() {
+    public Boolean getLocked() {
         return this.locked;
     }
 
-	public void setLocked(Boolean locked) {
+    public void setLocked(Boolean locked) {
         this.locked = locked;
     }
 
-	public Set<AuthorRole> getAuthorRoles() {
+    public Set<AuthorRole> getAuthorRoles() {
         return this.authorRoles;
     }
 
-	public void setAuthorRoles(Set<AuthorRole> authorRoles) {
+    public void setAuthorRoles(Set<AuthorRole> authorRoles) {
         this.authorRoles = authorRoles;
     }
 
-	public Set<AuthorState> getLsStates() {
+    public Set<AuthorState> getLsStates() {
         return this.lsStates;
     }
 
-	public void setLsStates(Set<AuthorState> lsStates) {
+    public void setLsStates(Set<AuthorState> lsStates) {
         this.lsStates = lsStates;
     }
 
-	public Set<AuthorLabel> getLsLabels() {
+    public Set<AuthorLabel> getLsLabels() {
         return this.lsLabels;
     }
 
-	public void setLsLabels(Set<AuthorLabel> lsLabels) {
+    public void setLsLabels(Set<AuthorLabel> lsLabels) {
         this.lsLabels = lsLabels;
     }
 
-	public static Long countFindAuthorsByActivationKeyAndEmailAddress(String activationKey, String emailAddress) {
-        if (activationKey == null || activationKey.length() == 0) throw new IllegalArgumentException("The activationKey argument is required");
-        if (emailAddress == null || emailAddress.length() == 0) throw new IllegalArgumentException("The emailAddress argument is required");
+    public static Long countFindAuthorsByActivationKeyAndEmailAddress(String activationKey, String emailAddress) {
+        if (activationKey == null || activationKey.length() == 0)
+            throw new IllegalArgumentException("The activationKey argument is required");
+        if (emailAddress == null || emailAddress.length() == 0)
+            throw new IllegalArgumentException("The emailAddress argument is required");
         EntityManager em = Author.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Author AS o WHERE o.activationKey = :activationKey AND o.emailAddress = :emailAddress", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM Author AS o WHERE o.activationKey = :activationKey AND o.emailAddress = :emailAddress",
+                Long.class);
         q.setParameter("activationKey", activationKey);
         q.setParameter("emailAddress", emailAddress);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindAuthorsByEmailAddress(String emailAddress) {
-        if (emailAddress == null || emailAddress.length() == 0) throw new IllegalArgumentException("The emailAddress argument is required");
+    public static Long countFindAuthorsByEmailAddress(String emailAddress) {
+        if (emailAddress == null || emailAddress.length() == 0)
+            throw new IllegalArgumentException("The emailAddress argument is required");
         EntityManager em = Author.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Author AS o WHERE o.emailAddress = :emailAddress", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Author AS o WHERE o.emailAddress = :emailAddress",
+                Long.class);
         q.setParameter("emailAddress", emailAddress);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindAuthorsByUserName(String userName) {
-        if (userName == null || userName.length() == 0) throw new IllegalArgumentException("The userName argument is required");
+    public static Long countFindAuthorsByUserName(String userName) {
+        if (userName == null || userName.length() == 0)
+            throw new IllegalArgumentException("The userName argument is required");
         EntityManager em = Author.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Author AS o WHERE o.userName = :userName", Long.class);
         q.setParameter("userName", userName);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<Author> findAuthorsByActivationKeyAndEmailAddress(String activationKey, String emailAddress, String sortFieldName, String sortOrder) {
-        if (activationKey == null || activationKey.length() == 0) throw new IllegalArgumentException("The activationKey argument is required");
-        if (emailAddress == null || emailAddress.length() == 0) throw new IllegalArgumentException("The emailAddress argument is required");
+    public static TypedQuery<Author> findAuthorsByActivationKeyAndEmailAddress(String activationKey,
+            String emailAddress, String sortFieldName, String sortOrder) {
+        if (activationKey == null || activationKey.length() == 0)
+            throw new IllegalArgumentException("The activationKey argument is required");
+        if (emailAddress == null || emailAddress.length() == 0)
+            throw new IllegalArgumentException("The emailAddress argument is required");
         EntityManager em = Author.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Author AS o WHERE o.activationKey = :activationKey AND o.emailAddress = :emailAddress");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Author AS o WHERE o.activationKey = :activationKey AND o.emailAddress = :emailAddress");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -396,10 +432,13 @@ public static TypedQuery<Author> findAuthorsByActivationKeyAndEmailAddress(Strin
         return q;
     }
 
-	public static TypedQuery<Author> findAuthorsByEmailAddress(String emailAddress, String sortFieldName, String sortOrder) {
-        if (emailAddress == null || emailAddress.length() == 0) throw new IllegalArgumentException("The emailAddress argument is required");
+    public static TypedQuery<Author> findAuthorsByEmailAddress(String emailAddress, String sortFieldName,
+            String sortOrder) {
+        if (emailAddress == null || emailAddress.length() == 0)
+            throw new IllegalArgumentException("The emailAddress argument is required");
         EntityManager em = Author.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Author AS o WHERE o.emailAddress = :emailAddress");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Author AS o WHERE o.emailAddress = :emailAddress");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -411,8 +450,9 @@ public static TypedQuery<Author> findAuthorsByEmailAddress(String emailAddress,
         return q;
     }
 
-	public static TypedQuery<Author> findAuthorsByUserName(String userName, String sortFieldName, String sortOrder) {
-        if (userName == null || userName.length() == 0) throw new IllegalArgumentException("The userName argument is required");
+    public static TypedQuery<Author> findAuthorsByUserName(String userName, String sortFieldName, String sortOrder) {
+        if (userName == null || userName.length() == 0)
+            throw new IllegalArgumentException("The userName argument is required");
         EntityManager em = Author.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Author AS o WHERE o.userName = :userName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorLabel.java b/src/main/java/com/labsynch/labseer/domain/AuthorLabel.java
index 2755e0de0..d5ad3f5b5 100644
--- a/src/main/java/com/labsynch/labseer/domain/AuthorLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/AuthorLabel.java
@@ -43,84 +43,91 @@ public AuthorLabel(AuthorLabel authorLabel) {
         super.setRecordedDate(authorLabel.getRecordedDate());
         super.setPhysicallyLabled(authorLabel.isPhysicallyLabled());
     }
- 
+
     public static AuthorLabel update(AuthorLabel authorLabel) {
-    	AuthorLabel updatedAuthorLabel = AuthorLabel.findAuthorLabel(authorLabel.getId());
-    	updatedAuthorLabel.setLsType(authorLabel.getLsType());
-    	updatedAuthorLabel.setLsKind(authorLabel.getLsKind());
-    	updatedAuthorLabel.setLsTypeAndKind(authorLabel.getLsType() + "_" + authorLabel.getLsKind());
-    	updatedAuthorLabel.setLabelText(authorLabel.getLabelText());
-    	updatedAuthorLabel.setPreferred(authorLabel.isPreferred());
-    	updatedAuthorLabel.setLsTransaction(authorLabel.getLsTransaction());
-    	updatedAuthorLabel.setRecordedBy(authorLabel.getRecordedBy());
-    	updatedAuthorLabel.setRecordedDate(authorLabel.getRecordedDate());
-    	updatedAuthorLabel.setModifiedDate(new Date());
-    	updatedAuthorLabel.setPhysicallyLabled(authorLabel.isPhysicallyLabled());
-    	updatedAuthorLabel.merge();
-    	return updatedAuthorLabel;
-    }
-    
+        AuthorLabel updatedAuthorLabel = AuthorLabel.findAuthorLabel(authorLabel.getId());
+        updatedAuthorLabel.setLsType(authorLabel.getLsType());
+        updatedAuthorLabel.setLsKind(authorLabel.getLsKind());
+        updatedAuthorLabel.setLsTypeAndKind(authorLabel.getLsType() + "_" + authorLabel.getLsKind());
+        updatedAuthorLabel.setLabelText(authorLabel.getLabelText());
+        updatedAuthorLabel.setPreferred(authorLabel.isPreferred());
+        updatedAuthorLabel.setLsTransaction(authorLabel.getLsTransaction());
+        updatedAuthorLabel.setRecordedBy(authorLabel.getRecordedBy());
+        updatedAuthorLabel.setRecordedDate(authorLabel.getRecordedDate());
+        updatedAuthorLabel.setModifiedDate(new Date());
+        updatedAuthorLabel.setPhysicallyLabled(authorLabel.isPhysicallyLabled());
+        updatedAuthorLabel.merge();
+        return updatedAuthorLabel;
+    }
+
     public static Collection<AuthorLabel> fromJsonArrayToAuthorLabels(String json) {
-        return new JSONDeserializer<List<AuthorLabel>>().use(null, ArrayList.class).use("values", AuthorLabel.class).deserialize(json);
+        return new JSONDeserializer<List<AuthorLabel>>().use(null, ArrayList.class).use("values", AuthorLabel.class)
+                .deserialize(json);
     }
-    
+
     public static Collection<AuthorLabel> fromJsonArrayToAuthorLabels(Reader json) {
-        return new JSONDeserializer<List<AuthorLabel>>().use(null, ArrayList.class).use("values", AuthorLabel.class).deserialize(json);
+        return new JSONDeserializer<List<AuthorLabel>>().use(null, ArrayList.class).use("values", AuthorLabel.class)
+                .deserialize(json);
     }
-    
-    
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static AuthorLabel fromJsonToAuthorLabel(String json) {
+    public static AuthorLabel fromJsonToAuthorLabel(String json) {
         return new JSONDeserializer<AuthorLabel>()
-        .use(null, AuthorLabel.class).deserialize(json);
+                .use(null, AuthorLabel.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<AuthorLabel> collection) {
+    public static String toJsonArray(Collection<AuthorLabel> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<AuthorLabel> collection, String[] fields) {
+    public static String toJsonArray(Collection<AuthorLabel> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Long countFindAuthorLabelsByAuthor(Author author) {
-        if (author == null) throw new IllegalArgumentException("The author argument is required");
+    public static Long countFindAuthorLabelsByAuthor(Author author) {
+        if (author == null)
+            throw new IllegalArgumentException("The author argument is required");
         EntityManager em = AuthorLabel.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorLabel AS o WHERE o.author = :author", Long.class);
         q.setParameter("author", author);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindAuthorLabelsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static Long countFindAuthorLabelsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = AuthorLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorLabel AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorLabel AS o WHERE o.lsTransaction = :lsTransaction",
+                Long.class);
         q.setParameter("lsTransaction", lsTransaction);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<AuthorLabel> findAuthorLabelsByAuthor(Author author) {
-        if (author == null) throw new IllegalArgumentException("The author argument is required");
+    public static TypedQuery<AuthorLabel> findAuthorLabelsByAuthor(Author author) {
+        if (author == null)
+            throw new IllegalArgumentException("The author argument is required");
         EntityManager em = AuthorLabel.entityManager();
-        TypedQuery<AuthorLabel> q = em.createQuery("SELECT o FROM AuthorLabel AS o WHERE o.author = :author", AuthorLabel.class);
+        TypedQuery<AuthorLabel> q = em.createQuery("SELECT o FROM AuthorLabel AS o WHERE o.author = :author",
+                AuthorLabel.class);
         q.setParameter("author", author);
         return q;
     }
 
-	public static TypedQuery<AuthorLabel> findAuthorLabelsByAuthor(Author author, String sortFieldName, String sortOrder) {
-        if (author == null) throw new IllegalArgumentException("The author argument is required");
+    public static TypedQuery<AuthorLabel> findAuthorLabelsByAuthor(Author author, String sortFieldName,
+            String sortOrder) {
+        if (author == null)
+            throw new IllegalArgumentException("The author argument is required");
         EntityManager em = AuthorLabel.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorLabel AS o WHERE o.author = :author");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -134,18 +141,23 @@ public static TypedQuery<AuthorLabel> findAuthorLabelsByAuthor(Author author, St
         return q;
     }
 
-	public static TypedQuery<AuthorLabel> findAuthorLabelsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<AuthorLabel> findAuthorLabelsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = AuthorLabel.entityManager();
-        TypedQuery<AuthorLabel> q = em.createQuery("SELECT o FROM AuthorLabel AS o WHERE o.lsTransaction = :lsTransaction", AuthorLabel.class);
+        TypedQuery<AuthorLabel> q = em.createQuery(
+                "SELECT o FROM AuthorLabel AS o WHERE o.lsTransaction = :lsTransaction", AuthorLabel.class);
         q.setParameter("lsTransaction", lsTransaction);
         return q;
     }
 
-	public static TypedQuery<AuthorLabel> findAuthorLabelsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<AuthorLabel> findAuthorLabelsByLsTransactionEquals(Long lsTransaction,
+            String sortFieldName, String sortOrder) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = AuthorLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorLabel AS o WHERE o.lsTransaction = :lsTransaction");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM AuthorLabel AS o WHERE o.lsTransaction = :lsTransaction");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -157,25 +169,25 @@ public static TypedQuery<AuthorLabel> findAuthorLabelsByLsTransactionEquals(Long
         return q;
     }
 
-	public AuthorLabel() {
+    public AuthorLabel() {
         super();
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("author");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("author");
 
-	public static long countAuthorLabels() {
+    public static long countAuthorLabels() {
         return entityManager().createQuery("SELECT COUNT(o) FROM AuthorLabel o", Long.class).getSingleResult();
     }
 
-	public static List<AuthorLabel> findAllAuthorLabels() {
+    public static List<AuthorLabel> findAllAuthorLabels() {
         return entityManager().createQuery("SELECT o FROM AuthorLabel o", AuthorLabel.class).getResultList();
     }
 
-	public static List<AuthorLabel> findAllAuthorLabels(String sortFieldName, String sortOrder) {
+    public static List<AuthorLabel> findAllAuthorLabels(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM AuthorLabel o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -186,16 +198,19 @@ public static List<AuthorLabel> findAllAuthorLabels(String sortFieldName, String
         return entityManager().createQuery(jpaQuery, AuthorLabel.class).getResultList();
     }
 
-	public static AuthorLabel findAuthorLabel(Long id) {
-        if (id == null) return null;
+    public static AuthorLabel findAuthorLabel(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(AuthorLabel.class, id);
     }
 
-	public static List<AuthorLabel> findAuthorLabelEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM AuthorLabel o", AuthorLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<AuthorLabel> findAuthorLabelEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM AuthorLabel o", AuthorLabel.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<AuthorLabel> findAuthorLabelEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<AuthorLabel> findAuthorLabelEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM AuthorLabel o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -203,22 +218,24 @@ public static List<AuthorLabel> findAuthorLabelEntries(int firstResult, int maxR
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, AuthorLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, AuthorLabel.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public AuthorLabel merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         AuthorLabel merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public Author getAuthor() {
+    public Author getAuthor() {
         return this.author;
     }
 
-	public void setAuthor(Author author) {
+    public void setAuthor(Author author) {
         this.author = author;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorRole.java b/src/main/java/com/labsynch/labseer/domain/AuthorRole.java
index 29192ccb8..aaca3dab0 100755
--- a/src/main/java/com/labsynch/labseer/domain/AuthorRole.java
+++ b/src/main/java/com/labsynch/labseer/domain/AuthorRole.java
@@ -27,9 +27,10 @@
 
 @Entity
 @Configurable
-@Table(name = "author_role", uniqueConstraints = { @javax.persistence.UniqueConstraint(columnNames = { "author_id", "lsrole_id" }) })
+@Table(name = "author_role", uniqueConstraints = {
+        @javax.persistence.UniqueConstraint(columnNames = { "author_id", "lsrole_id" }) })
 public class AuthorRole {
-	
+
     @NotNull
     @ManyToOne
     @JoinColumn(name = "author_id", referencedColumnName = "id")
@@ -83,58 +84,72 @@ public static String toJsonArray(Collection<com.labsynch.labseer.domain.AuthorRo
     }
 
     public static Collection<com.labsynch.labseer.domain.AuthorRole> fromJsonArrayToAuthorRoles(String json) {
-        return new JSONDeserializer<List<AuthorRole>>().use(null, ArrayList.class).use("values", AuthorRole.class).deserialize(json);
-    }
-
-	public static AuthorRole getOrCreateAuthorRole(Author author, LsRole userRole) {
-		List<AuthorRole> authorRoles = AuthorRole.findAuthorRolesByRoleEntryAndUserEntry(userRole, author).getResultList();
-		if (authorRoles.size() == 0){
-			AuthorRole newAuthorRole = new AuthorRole();
-			newAuthorRole.setUserEntry(author);
-			newAuthorRole.setRoleEntry(userRole);
-			newAuthorRole.persist();
-			return newAuthorRole;
-		} else {
-			return authorRoles.get(0);
-		}
-	}
-
-	public static Long countFindAuthorRolesByRoleEntry(LsRole roleEntry) {
-        if (roleEntry == null) throw new IllegalArgumentException("The roleEntry argument is required");
+        return new JSONDeserializer<List<AuthorRole>>().use(null, ArrayList.class).use("values", AuthorRole.class)
+                .deserialize(json);
+    }
+
+    public static AuthorRole getOrCreateAuthorRole(Author author, LsRole userRole) {
+        List<AuthorRole> authorRoles = AuthorRole.findAuthorRolesByRoleEntryAndUserEntry(userRole, author)
+                .getResultList();
+        if (authorRoles.size() == 0) {
+            AuthorRole newAuthorRole = new AuthorRole();
+            newAuthorRole.setUserEntry(author);
+            newAuthorRole.setRoleEntry(userRole);
+            newAuthorRole.persist();
+            return newAuthorRole;
+        } else {
+            return authorRoles.get(0);
+        }
+    }
+
+    public static Long countFindAuthorRolesByRoleEntry(LsRole roleEntry) {
+        if (roleEntry == null)
+            throw new IllegalArgumentException("The roleEntry argument is required");
         EntityManager em = AuthorRole.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorRole AS o WHERE o.roleEntry = :roleEntry", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorRole AS o WHERE o.roleEntry = :roleEntry",
+                Long.class);
         q.setParameter("roleEntry", roleEntry);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindAuthorRolesByRoleEntryAndUserEntry(LsRole roleEntry, Author userEntry) {
-        if (roleEntry == null) throw new IllegalArgumentException("The roleEntry argument is required");
-        if (userEntry == null) throw new IllegalArgumentException("The userEntry argument is required");
+    public static Long countFindAuthorRolesByRoleEntryAndUserEntry(LsRole roleEntry, Author userEntry) {
+        if (roleEntry == null)
+            throw new IllegalArgumentException("The roleEntry argument is required");
+        if (userEntry == null)
+            throw new IllegalArgumentException("The userEntry argument is required");
         EntityManager em = AuthorRole.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorRole AS o WHERE o.roleEntry = :roleEntry AND o.userEntry = :userEntry", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM AuthorRole AS o WHERE o.roleEntry = :roleEntry AND o.userEntry = :userEntry",
+                Long.class);
         q.setParameter("roleEntry", roleEntry);
         q.setParameter("userEntry", userEntry);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindAuthorRolesByUserEntry(Author userEntry) {
-        if (userEntry == null) throw new IllegalArgumentException("The userEntry argument is required");
+    public static Long countFindAuthorRolesByUserEntry(Author userEntry) {
+        if (userEntry == null)
+            throw new IllegalArgumentException("The userEntry argument is required");
         EntityManager em = AuthorRole.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorRole AS o WHERE o.userEntry = :userEntry", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorRole AS o WHERE o.userEntry = :userEntry",
+                Long.class);
         q.setParameter("userEntry", userEntry);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<AuthorRole> findAuthorRolesByRoleEntry(LsRole roleEntry) {
-        if (roleEntry == null) throw new IllegalArgumentException("The roleEntry argument is required");
+    public static TypedQuery<AuthorRole> findAuthorRolesByRoleEntry(LsRole roleEntry) {
+        if (roleEntry == null)
+            throw new IllegalArgumentException("The roleEntry argument is required");
         EntityManager em = AuthorRole.entityManager();
-        TypedQuery<AuthorRole> q = em.createQuery("SELECT o FROM AuthorRole AS o WHERE o.roleEntry = :roleEntry", AuthorRole.class);
+        TypedQuery<AuthorRole> q = em.createQuery("SELECT o FROM AuthorRole AS o WHERE o.roleEntry = :roleEntry",
+                AuthorRole.class);
         q.setParameter("roleEntry", roleEntry);
         return q;
     }
 
-	public static TypedQuery<AuthorRole> findAuthorRolesByRoleEntry(LsRole roleEntry, String sortFieldName, String sortOrder) {
-        if (roleEntry == null) throw new IllegalArgumentException("The roleEntry argument is required");
+    public static TypedQuery<AuthorRole> findAuthorRolesByRoleEntry(LsRole roleEntry, String sortFieldName,
+            String sortOrder) {
+        if (roleEntry == null)
+            throw new IllegalArgumentException("The roleEntry argument is required");
         EntityManager em = AuthorRole.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorRole AS o WHERE o.roleEntry = :roleEntry");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -148,21 +163,29 @@ public static TypedQuery<AuthorRole> findAuthorRolesByRoleEntry(LsRole roleEntry
         return q;
     }
 
-	public static TypedQuery<AuthorRole> findAuthorRolesByRoleEntryAndUserEntry(LsRole roleEntry, Author userEntry) {
-        if (roleEntry == null) throw new IllegalArgumentException("The roleEntry argument is required");
-        if (userEntry == null) throw new IllegalArgumentException("The userEntry argument is required");
+    public static TypedQuery<AuthorRole> findAuthorRolesByRoleEntryAndUserEntry(LsRole roleEntry, Author userEntry) {
+        if (roleEntry == null)
+            throw new IllegalArgumentException("The roleEntry argument is required");
+        if (userEntry == null)
+            throw new IllegalArgumentException("The userEntry argument is required");
         EntityManager em = AuthorRole.entityManager();
-        TypedQuery<AuthorRole> q = em.createQuery("SELECT o FROM AuthorRole AS o WHERE o.roleEntry = :roleEntry AND o.userEntry = :userEntry", AuthorRole.class);
+        TypedQuery<AuthorRole> q = em.createQuery(
+                "SELECT o FROM AuthorRole AS o WHERE o.roleEntry = :roleEntry AND o.userEntry = :userEntry",
+                AuthorRole.class);
         q.setParameter("roleEntry", roleEntry);
         q.setParameter("userEntry", userEntry);
         return q;
     }
 
-	public static TypedQuery<AuthorRole> findAuthorRolesByRoleEntryAndUserEntry(LsRole roleEntry, Author userEntry, String sortFieldName, String sortOrder) {
-        if (roleEntry == null) throw new IllegalArgumentException("The roleEntry argument is required");
-        if (userEntry == null) throw new IllegalArgumentException("The userEntry argument is required");
+    public static TypedQuery<AuthorRole> findAuthorRolesByRoleEntryAndUserEntry(LsRole roleEntry, Author userEntry,
+            String sortFieldName, String sortOrder) {
+        if (roleEntry == null)
+            throw new IllegalArgumentException("The roleEntry argument is required");
+        if (userEntry == null)
+            throw new IllegalArgumentException("The userEntry argument is required");
         EntityManager em = AuthorRole.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorRole AS o WHERE o.roleEntry = :roleEntry AND o.userEntry = :userEntry");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM AuthorRole AS o WHERE o.roleEntry = :roleEntry AND o.userEntry = :userEntry");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -175,16 +198,20 @@ public static TypedQuery<AuthorRole> findAuthorRolesByRoleEntryAndUserEntry(LsRo
         return q;
     }
 
-	public static TypedQuery<AuthorRole> findAuthorRolesByUserEntry(Author userEntry) {
-        if (userEntry == null) throw new IllegalArgumentException("The userEntry argument is required");
+    public static TypedQuery<AuthorRole> findAuthorRolesByUserEntry(Author userEntry) {
+        if (userEntry == null)
+            throw new IllegalArgumentException("The userEntry argument is required");
         EntityManager em = AuthorRole.entityManager();
-        TypedQuery<AuthorRole> q = em.createQuery("SELECT o FROM AuthorRole AS o WHERE o.userEntry = :userEntry", AuthorRole.class);
+        TypedQuery<AuthorRole> q = em.createQuery("SELECT o FROM AuthorRole AS o WHERE o.userEntry = :userEntry",
+                AuthorRole.class);
         q.setParameter("userEntry", userEntry);
         return q;
     }
 
-	public static TypedQuery<AuthorRole> findAuthorRolesByUserEntry(Author userEntry, String sortFieldName, String sortOrder) {
-        if (userEntry == null) throw new IllegalArgumentException("The userEntry argument is required");
+    public static TypedQuery<AuthorRole> findAuthorRolesByUserEntry(Author userEntry, String sortFieldName,
+            String sortOrder) {
+        if (userEntry == null)
+            throw new IllegalArgumentException("The userEntry argument is required");
         EntityManager em = AuthorRole.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorRole AS o WHERE o.userEntry = :userEntry");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -198,26 +225,29 @@ public static TypedQuery<AuthorRole> findAuthorRolesByUserEntry(Author userEntry
         return q;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("userEntry", "roleEntry", "id", "version");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("userEntry", "roleEntry",
+            "id", "version");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new AuthorRole().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countAuthorRoles() {
+    public static long countAuthorRoles() {
         return entityManager().createQuery("SELECT COUNT(o) FROM AuthorRole o", Long.class).getSingleResult();
     }
 
-	public static List<AuthorRole> findAllAuthorRoles() {
+    public static List<AuthorRole> findAllAuthorRoles() {
         return entityManager().createQuery("SELECT o FROM AuthorRole o", AuthorRole.class).getResultList();
     }
 
-	public static List<AuthorRole> findAllAuthorRoles(String sortFieldName, String sortOrder) {
+    public static List<AuthorRole> findAllAuthorRoles(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM AuthorRole o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -228,16 +258,19 @@ public static List<AuthorRole> findAllAuthorRoles(String sortFieldName, String s
         return entityManager().createQuery(jpaQuery, AuthorRole.class).getResultList();
     }
 
-	public static AuthorRole findAuthorRole(Long id) {
-        if (id == null) return null;
+    public static AuthorRole findAuthorRole(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(AuthorRole.class, id);
     }
 
-	public static List<AuthorRole> findAuthorRoleEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM AuthorRole o", AuthorRole.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<AuthorRole> findAuthorRoleEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM AuthorRole o", AuthorRole.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<AuthorRole> findAuthorRoleEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<AuthorRole> findAuthorRoleEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM AuthorRole o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -245,18 +278,21 @@ public static List<AuthorRole> findAuthorRoleEntries(int firstResult, int maxRes
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, AuthorRole.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, AuthorRole.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -265,39 +301,42 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public AuthorRole merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         AuthorRole merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public Author getUserEntry() {
+    public Author getUserEntry() {
         return this.userEntry;
     }
 
-	public void setUserEntry(Author userEntry) {
+    public void setUserEntry(Author userEntry) {
         this.userEntry = userEntry;
     }
 
-	public LsRole getRoleEntry() {
+    public LsRole getRoleEntry() {
         return this.roleEntry;
     }
 
-	public void setRoleEntry(LsRole roleEntry) {
+    public void setRoleEntry(LsRole roleEntry) {
         this.roleEntry = roleEntry;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorState.java b/src/main/java/com/labsynch/labseer/domain/AuthorState.java
index 6adb2b4f3..3474cb64a 100644
--- a/src/main/java/com/labsynch/labseer/domain/AuthorState.java
+++ b/src/main/java/com/labsynch/labseer/domain/AuthorState.java
@@ -34,98 +34,101 @@
 @Transactional
 public class AuthorState extends AbstractState {
 
-	@NotNull
-	@ManyToOne
-	@JoinColumn(name = "author_id")
-	private Author author;
-
-	@OneToMany(cascade = CascadeType.ALL, mappedBy = "lsState", fetch = FetchType.LAZY)
-	private Set<AuthorValue> lsValues = new HashSet<AuthorValue>();
-
-	public AuthorState(com.labsynch.labseer.domain.AuthorState authorState) {
-		this.setRecordedBy(authorState.getRecordedBy());
-		this.setRecordedDate(authorState.getRecordedDate());
-		this.setLsTransaction(authorState.getLsTransaction());
-		this.setModifiedBy(authorState.getModifiedBy());
-		this.setModifiedDate(authorState.getModifiedDate());
-		this.setLsType(authorState.getLsType());
-		this.setLsKind(authorState.getLsKind());
-	}
-
-	public AuthorState(FlatThingCsvDTO authorDTO) {
-		this.setRecordedBy(authorDTO.getRecordedBy());
-		this.setRecordedDate(authorDTO.getRecordedDate());
-		this.setLsTransaction(authorDTO.getLsTransaction());
-		this.setModifiedBy(authorDTO.getModifiedBy());
-		this.setModifiedDate(authorDTO.getModifiedDate());
-		this.setLsType(authorDTO.getStateType());
-		this.setLsKind(authorDTO.getStateKind());
-	}
-
-	public static com.labsynch.labseer.domain.AuthorState update(com.labsynch.labseer.domain.AuthorState authorState) {
-		AuthorState updatedAuthorState = AuthorState.findAuthorState(authorState.getId());
-		updatedAuthorState.setRecordedBy(authorState.getRecordedBy());
-		updatedAuthorState.setRecordedDate(authorState.getRecordedDate());
-		updatedAuthorState.setLsTransaction(authorState.getLsTransaction());
-		updatedAuthorState.setModifiedBy(authorState.getModifiedBy());
-		updatedAuthorState.setModifiedDate(new Date());
-		updatedAuthorState.setLsType(authorState.getLsType());
-		updatedAuthorState.setLsKind(authorState.getLsKind());
-		updatedAuthorState.merge();
-		return updatedAuthorState;
-	}
-
-	public static com.labsynch.labseer.domain.AuthorState fromJsonToAuthorState(String json) {
-		return new JSONDeserializer<AuthorState>().use(null, AuthorState.class).deserialize(json);
-	}
-
-	public static String toJsonArrayStub(Collection<com.labsynch.labseer.domain.AuthorState> collection) {
-		return new JSONSerializer().exclude("*.class", "author").transform(new ExcludeNulls(), void.class).serialize(collection);
-	}
-
-	public static Collection<com.labsynch.labseer.domain.AuthorState> fromJsonArrayToAuthorStates(String json) {
-		return new JSONDeserializer<List<AuthorState>>().use(null, ArrayList.class).use("values", AuthorState.class).deserialize(json);
-	}
-	
-	public String toJson() {
+    @NotNull
+    @ManyToOne
+    @JoinColumn(name = "author_id")
+    private Author author;
+
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "lsState", fetch = FetchType.LAZY)
+    private Set<AuthorValue> lsValues = new HashSet<AuthorValue>();
+
+    public AuthorState(com.labsynch.labseer.domain.AuthorState authorState) {
+        this.setRecordedBy(authorState.getRecordedBy());
+        this.setRecordedDate(authorState.getRecordedDate());
+        this.setLsTransaction(authorState.getLsTransaction());
+        this.setModifiedBy(authorState.getModifiedBy());
+        this.setModifiedDate(authorState.getModifiedDate());
+        this.setLsType(authorState.getLsType());
+        this.setLsKind(authorState.getLsKind());
+    }
+
+    public AuthorState(FlatThingCsvDTO authorDTO) {
+        this.setRecordedBy(authorDTO.getRecordedBy());
+        this.setRecordedDate(authorDTO.getRecordedDate());
+        this.setLsTransaction(authorDTO.getLsTransaction());
+        this.setModifiedBy(authorDTO.getModifiedBy());
+        this.setModifiedDate(authorDTO.getModifiedDate());
+        this.setLsType(authorDTO.getStateType());
+        this.setLsKind(authorDTO.getStateKind());
+    }
+
+    public static com.labsynch.labseer.domain.AuthorState update(com.labsynch.labseer.domain.AuthorState authorState) {
+        AuthorState updatedAuthorState = AuthorState.findAuthorState(authorState.getId());
+        updatedAuthorState.setRecordedBy(authorState.getRecordedBy());
+        updatedAuthorState.setRecordedDate(authorState.getRecordedDate());
+        updatedAuthorState.setLsTransaction(authorState.getLsTransaction());
+        updatedAuthorState.setModifiedBy(authorState.getModifiedBy());
+        updatedAuthorState.setModifiedDate(new Date());
+        updatedAuthorState.setLsType(authorState.getLsType());
+        updatedAuthorState.setLsKind(authorState.getLsKind());
+        updatedAuthorState.merge();
+        return updatedAuthorState;
+    }
+
+    public static com.labsynch.labseer.domain.AuthorState fromJsonToAuthorState(String json) {
+        return new JSONDeserializer<AuthorState>().use(null, AuthorState.class).deserialize(json);
+    }
+
+    public static String toJsonArrayStub(Collection<com.labsynch.labseer.domain.AuthorState> collection) {
+        return new JSONSerializer().exclude("*.class", "author").transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
+    }
+
+    public static Collection<com.labsynch.labseer.domain.AuthorState> fromJsonArrayToAuthorStates(String json) {
+        return new JSONDeserializer<List<AuthorState>>().use(null, ArrayList.class).use("values", AuthorState.class)
+                .deserialize(json);
+    }
+
+    public String toJson() {
         return new JSONSerializer().exclude("*.class").include("lsValues").serialize(this);
     }
-    
+
     public static String toJsonArray(Collection<AuthorState> collection) {
         return new JSONSerializer().exclude("*.class").include("lsValues").serialize(collection);
     }
-	
-	public static TypedQuery<AuthorState> findAuthorStatesByAuthorIDAndStateTypeKind(Long authorId, 
-			String stateType, 
-			String stateKind) {
-			if (stateType == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-			if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-			
-			EntityManager em = entityManager();
-			String hsqlQuery = "SELECT ags FROM AuthorState AS ags " +
-			"JOIN ags.author ag " +
-			"WHERE ags.lsType = :stateType AND ags.lsKind = :stateKind AND ags.ignored IS NOT :ignored " +
-			"AND ag.id = :authorId ";
-			TypedQuery<AuthorState> q = em.createQuery(hsqlQuery, AuthorState.class);
-			q.setParameter("authorId", authorId);
-			q.setParameter("stateType", stateType);
-			q.setParameter("stateKind", stateKind);
-			q.setParameter("ignored", true);
-			return q;
-		}
-
-
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("author", "lsValues");
-
-	public static long countAuthorStates() {
+
+    public static TypedQuery<AuthorState> findAuthorStatesByAuthorIDAndStateTypeKind(Long authorId,
+            String stateType,
+            String stateKind) {
+        if (stateType == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateType argument is required");
+        if (stateKind == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateKind argument is required");
+
+        EntityManager em = entityManager();
+        String hsqlQuery = "SELECT ags FROM AuthorState AS ags " +
+                "JOIN ags.author ag " +
+                "WHERE ags.lsType = :stateType AND ags.lsKind = :stateKind AND ags.ignored IS NOT :ignored " +
+                "AND ag.id = :authorId ";
+        TypedQuery<AuthorState> q = em.createQuery(hsqlQuery, AuthorState.class);
+        q.setParameter("authorId", authorId);
+        q.setParameter("stateType", stateType);
+        q.setParameter("stateKind", stateKind);
+        q.setParameter("ignored", true);
+        return q;
+    }
+
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("author", "lsValues");
+
+    public static long countAuthorStates() {
         return entityManager().createQuery("SELECT COUNT(o) FROM AuthorState o", Long.class).getSingleResult();
     }
 
-	public static List<AuthorState> findAllAuthorStates() {
+    public static List<AuthorState> findAllAuthorStates() {
         return entityManager().createQuery("SELECT o FROM AuthorState o", AuthorState.class).getResultList();
     }
 
-	public static List<AuthorState> findAllAuthorStates(String sortFieldName, String sortOrder) {
+    public static List<AuthorState> findAllAuthorStates(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM AuthorState o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -136,16 +139,19 @@ public static List<AuthorState> findAllAuthorStates(String sortFieldName, String
         return entityManager().createQuery(jpaQuery, AuthorState.class).getResultList();
     }
 
-	public static AuthorState findAuthorState(Long id) {
-        if (id == null) return null;
+    public static AuthorState findAuthorState(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(AuthorState.class, id);
     }
 
-	public static List<AuthorState> findAuthorStateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM AuthorState o", AuthorState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<AuthorState> findAuthorStateEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM AuthorState o", AuthorState.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<AuthorState> findAuthorStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<AuthorState> findAuthorStateEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM AuthorState o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -153,51 +159,60 @@ public static List<AuthorState> findAuthorStateEntries(int firstResult, int maxR
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, AuthorState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, AuthorState.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public AuthorState merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         AuthorState merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public AuthorState() {
+    public AuthorState() {
         super();
     }
 
-	public Author getAuthor() {
+    public Author getAuthor() {
         return this.author;
     }
 
-	public void setAuthor(Author author) {
+    public void setAuthor(Author author) {
         this.author = author;
     }
 
-	public Set<AuthorValue> getLsValues() {
+    public Set<AuthorValue> getLsValues() {
         return this.lsValues;
     }
 
-	public void setLsValues(Set<AuthorValue> lsValues) {
+    public void setLsValues(Set<AuthorValue> lsValues) {
         this.lsValues = lsValues;
     }
 
-	public static Long countFindAuthorStatesByAuthor(Author author) {
-        if (author == null) throw new IllegalArgumentException("The author argument is required");
+    public static Long countFindAuthorStatesByAuthor(Author author) {
+        if (author == null)
+            throw new IllegalArgumentException("The author argument is required");
         EntityManager em = AuthorState.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorState AS o WHERE o.author = :author", Long.class);
         q.setParameter("author", author);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindAuthorStatesByAuthorAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(Author author, String lsType, String lsKind, boolean ignored) {
-        if (author == null) throw new IllegalArgumentException("The author argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static Long countFindAuthorStatesByAuthorAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(Author author,
+            String lsType, String lsKind, boolean ignored) {
+        if (author == null)
+            throw new IllegalArgumentException("The author argument is required");
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = AuthorState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorState AS o WHERE o.author = :author AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM AuthorState AS o WHERE o.author = :author AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored",
+                Long.class);
         q.setParameter("author", author);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
@@ -205,42 +220,53 @@ public static Long countFindAuthorStatesByAuthorAndLsTypeEqualsAndLsKindEqualsAn
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindAuthorStatesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static Long countFindAuthorStatesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = AuthorState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorState AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorState AS o WHERE o.lsTransaction = :lsTransaction",
+                Long.class);
         q.setParameter("lsTransaction", lsTransaction);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindAuthorStatesByLsTypeAndKindEquals(String lsTypeAndKind) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+    public static Long countFindAuthorStatesByLsTypeAndKindEquals(String lsTypeAndKind) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = AuthorState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind",
+                Long.class);
         q.setParameter("lsTypeAndKind", lsTypeAndKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindAuthorStatesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static Long countFindAuthorStatesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = AuthorState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM AuthorState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<AuthorState> findAuthorStatesByAuthor(Author author) {
-        if (author == null) throw new IllegalArgumentException("The author argument is required");
+    public static TypedQuery<AuthorState> findAuthorStatesByAuthor(Author author) {
+        if (author == null)
+            throw new IllegalArgumentException("The author argument is required");
         EntityManager em = AuthorState.entityManager();
-        TypedQuery<AuthorState> q = em.createQuery("SELECT o FROM AuthorState AS o WHERE o.author = :author", AuthorState.class);
+        TypedQuery<AuthorState> q = em.createQuery("SELECT o FROM AuthorState AS o WHERE o.author = :author",
+                AuthorState.class);
         q.setParameter("author", author);
         return q;
     }
 
-	public static TypedQuery<AuthorState> findAuthorStatesByAuthor(Author author, String sortFieldName, String sortOrder) {
-        if (author == null) throw new IllegalArgumentException("The author argument is required");
+    public static TypedQuery<AuthorState> findAuthorStatesByAuthor(Author author, String sortFieldName,
+            String sortOrder) {
+        if (author == null)
+            throw new IllegalArgumentException("The author argument is required");
         EntityManager em = AuthorState.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorState AS o WHERE o.author = :author");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -254,12 +280,18 @@ public static TypedQuery<AuthorState> findAuthorStatesByAuthor(Author author, St
         return q;
     }
 
-	public static TypedQuery<AuthorState> findAuthorStatesByAuthorAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(Author author, String lsType, String lsKind, boolean ignored) {
-        if (author == null) throw new IllegalArgumentException("The author argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<AuthorState> findAuthorStatesByAuthorAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(
+            Author author, String lsType, String lsKind, boolean ignored) {
+        if (author == null)
+            throw new IllegalArgumentException("The author argument is required");
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = AuthorState.entityManager();
-        TypedQuery<AuthorState> q = em.createQuery("SELECT o FROM AuthorState AS o WHERE o.author = :author AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored", AuthorState.class);
+        TypedQuery<AuthorState> q = em.createQuery(
+                "SELECT o FROM AuthorState AS o WHERE o.author = :author AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored",
+                AuthorState.class);
         q.setParameter("author", author);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
@@ -267,12 +299,17 @@ public static TypedQuery<AuthorState> findAuthorStatesByAuthorAndLsTypeEqualsAnd
         return q;
     }
 
-	public static TypedQuery<AuthorState> findAuthorStatesByAuthorAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(Author author, String lsType, String lsKind, boolean ignored, String sortFieldName, String sortOrder) {
-        if (author == null) throw new IllegalArgumentException("The author argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<AuthorState> findAuthorStatesByAuthorAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(
+            Author author, String lsType, String lsKind, boolean ignored, String sortFieldName, String sortOrder) {
+        if (author == null)
+            throw new IllegalArgumentException("The author argument is required");
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = AuthorState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorState AS o WHERE o.author = :author AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM AuthorState AS o WHERE o.author = :author AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -287,18 +324,23 @@ public static TypedQuery<AuthorState> findAuthorStatesByAuthorAndLsTypeEqualsAnd
         return q;
     }
 
-	public static TypedQuery<AuthorState> findAuthorStatesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<AuthorState> findAuthorStatesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = AuthorState.entityManager();
-        TypedQuery<AuthorState> q = em.createQuery("SELECT o FROM AuthorState AS o WHERE o.lsTransaction = :lsTransaction", AuthorState.class);
+        TypedQuery<AuthorState> q = em.createQuery(
+                "SELECT o FROM AuthorState AS o WHERE o.lsTransaction = :lsTransaction", AuthorState.class);
         q.setParameter("lsTransaction", lsTransaction);
         return q;
     }
 
-	public static TypedQuery<AuthorState> findAuthorStatesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<AuthorState> findAuthorStatesByLsTransactionEquals(Long lsTransaction,
+            String sortFieldName, String sortOrder) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = AuthorState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorState AS o WHERE o.lsTransaction = :lsTransaction");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM AuthorState AS o WHERE o.lsTransaction = :lsTransaction");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -310,18 +352,23 @@ public static TypedQuery<AuthorState> findAuthorStatesByLsTransactionEquals(Long
         return q;
     }
 
-	public static TypedQuery<AuthorState> findAuthorStatesByLsTypeAndKindEquals(String lsTypeAndKind) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+    public static TypedQuery<AuthorState> findAuthorStatesByLsTypeAndKindEquals(String lsTypeAndKind) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = AuthorState.entityManager();
-        TypedQuery<AuthorState> q = em.createQuery("SELECT o FROM AuthorState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", AuthorState.class);
+        TypedQuery<AuthorState> q = em.createQuery(
+                "SELECT o FROM AuthorState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", AuthorState.class);
         q.setParameter("lsTypeAndKind", lsTypeAndKind);
         return q;
     }
 
-	public static TypedQuery<AuthorState> findAuthorStatesByLsTypeAndKindEquals(String lsTypeAndKind, String sortFieldName, String sortOrder) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+    public static TypedQuery<AuthorState> findAuthorStatesByLsTypeAndKindEquals(String lsTypeAndKind,
+            String sortFieldName, String sortOrder) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = AuthorState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM AuthorState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -333,21 +380,28 @@ public static TypedQuery<AuthorState> findAuthorStatesByLsTypeAndKindEquals(Stri
         return q;
     }
 
-	public static TypedQuery<AuthorState> findAuthorStatesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<AuthorState> findAuthorStatesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = AuthorState.entityManager();
-        TypedQuery<AuthorState> q = em.createQuery("SELECT o FROM AuthorState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", AuthorState.class);
+        TypedQuery<AuthorState> q = em.createQuery(
+                "SELECT o FROM AuthorState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", AuthorState.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         return q;
     }
 
-	public static TypedQuery<AuthorState> findAuthorStatesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<AuthorState> findAuthorStatesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind,
+            String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = AuthorState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM AuthorState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -360,7 +414,7 @@ public static TypedQuery<AuthorState> findAuthorStatesByLsTypeEqualsAndLsKindEqu
         return q;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/AuthorValue.java b/src/main/java/com/labsynch/labseer/domain/AuthorValue.java
index 3846eab4a..159385f7f 100644
--- a/src/main/java/com/labsynch/labseer/domain/AuthorValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/AuthorValue.java
@@ -34,106 +34,121 @@ public class AuthorValue extends AbstractValue {
     @JoinColumn(name = "author_state_id")
     private AuthorState lsState;
 
-//	public Long getStateId() {
-//		return this.lsState.getId();
-//	}
-//	
-//	public boolean getIgnored() {
-//		return this.isIgnored();
-//	}
-//	
-//	public boolean getDeleted() {
-//		return this.isDeleted();
-//	}
-//	
-//	public boolean getPublicData() {
-//		return this.isPublicData();
-//	}
-//	
-//	public String getStateType() {
-//		return this.lsState.getLsType();
-//	}
-//	
-//	public String getStateKind() {
-//		return this.lsState.getLsKind();
-//	}
-//	
-//	public Long getAuthorId() {
-//		return this.lsState.getAuthor().getId();
-//	}
-	
-//	public String getAuthorCode() {
-//		return this.lsState.getAuthor().getCodeName();
-//	}
-	
+    // public Long getStateId() {
+    // return this.lsState.getId();
+    // }
+    //
+    // public boolean getIgnored() {
+    // return this.isIgnored();
+    // }
+    //
+    // public boolean getDeleted() {
+    // return this.isDeleted();
+    // }
+    //
+    // public boolean getPublicData() {
+    // return this.isPublicData();
+    // }
+    //
+    // public String getStateType() {
+    // return this.lsState.getLsType();
+    // }
+    //
+    // public String getStateKind() {
+    // return this.lsState.getLsKind();
+    // }
+    //
+    // public Long getAuthorId() {
+    // return this.lsState.getAuthor().getId();
+    // }
+
+    // public String getAuthorCode() {
+    // return this.lsState.getAuthor().getCodeName();
+    // }
 
     public static long countAuthorValues() {
         return entityManager().createQuery("SELECT COUNT(o) FROM AuthorValue o", Long.class).getSingleResult();
     }
-    
+
     public static AuthorValue create(AuthorValue authorValue) {
-    	AuthorValue newAuthorValue = new JSONDeserializer<AuthorValue>().use(null, AuthorValue.class).
-        		deserializeInto(authorValue.toJson(), 
-        				new AuthorValue());	
-    
+        AuthorValue newAuthorValue = new JSONDeserializer<AuthorValue>().use(null, AuthorValue.class).deserializeInto(
+                authorValue.toJson(),
+                new AuthorValue());
+
         return newAuthorValue;
     }
-    
+
     public static AuthorValue update(AuthorValue authorValue) {
-        AuthorValue updatedAuthorValue = new JSONDeserializer<AuthorValue>().use(null, ArrayList.class).use("values", AuthorValue.class).deserializeInto(authorValue.toJson(), AuthorValue.findAuthorValue(authorValue.getId()));
+        AuthorValue updatedAuthorValue = new JSONDeserializer<AuthorValue>().use(null, ArrayList.class)
+                .use("values", AuthorValue.class)
+                .deserializeInto(authorValue.toJson(), AuthorValue.findAuthorValue(authorValue.getId()));
         updatedAuthorValue.setModifiedDate(new Date());
         updatedAuthorValue.merge();
         return updatedAuthorValue;
     }
-	
 
-	public static Long countFindAuthorValuesByCodeValueEquals(String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+    public static Long countFindAuthorValuesByCodeValueEquals(String codeValue) {
+        if (codeValue == null || codeValue.length() == 0)
+            throw new IllegalArgumentException("The codeValue argument is required");
         EntityManager em = AuthorValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorValue AS o WHERE o.codeValue = :codeValue", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorValue AS o WHERE o.codeValue = :codeValue",
+                Long.class);
         q.setParameter("codeValue", codeValue);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindAuthorValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+    public static Long countFindAuthorValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
+        if (codeValue == null || codeValue.length() == 0)
+            throw new IllegalArgumentException("The codeValue argument is required");
         EntityManager em = AuthorValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM AuthorValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue",
+                Long.class);
         q.setParameter("ignored", ignored);
         q.setParameter("codeValue", codeValue);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindAuthorValuesByLsState(AuthorState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+    public static Long countFindAuthorValuesByLsState(AuthorState lsState) {
+        if (lsState == null)
+            throw new IllegalArgumentException("The lsState argument is required");
         EntityManager em = AuthorValue.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorValue AS o WHERE o.lsState = :lsState", Long.class);
         q.setParameter("lsState", lsState);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindAuthorValuesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static Long countFindAuthorValuesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = AuthorValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorValue AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorValue AS o WHERE o.lsTransaction = :lsTransaction",
+                Long.class);
         q.setParameter("lsTransaction", lsTransaction);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindAuthorValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static Long countFindAuthorValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = AuthorValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM AuthorValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindAuthorValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(String lsType, String lsKind, String stringValue, boolean ignored) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+    public static Long countFindAuthorValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(String lsType,
+            String lsKind, String stringValue, boolean ignored) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0)
+            throw new IllegalArgumentException("The stringValue argument is required");
         stringValue = stringValue.replace('*', '%');
         if (stringValue.charAt(0) != '%') {
             stringValue = "%" + stringValue;
@@ -142,7 +157,9 @@ public static Long countFindAuthorValuesByLsTypeEqualsAndLsKindEqualsAndStringVa
             stringValue = stringValue + "%";
         }
         EntityManager em = AuthorValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM AuthorValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)  AND o.ignored IS NOT :ignored", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM AuthorValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)  AND o.ignored IS NOT :ignored",
+                Long.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         q.setParameter("stringValue", stringValue);
@@ -150,16 +167,20 @@ public static Long countFindAuthorValuesByLsTypeEqualsAndLsKindEqualsAndStringVa
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<AuthorValue> findAuthorValuesByCodeValueEquals(String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+    public static TypedQuery<AuthorValue> findAuthorValuesByCodeValueEquals(String codeValue) {
+        if (codeValue == null || codeValue.length() == 0)
+            throw new IllegalArgumentException("The codeValue argument is required");
         EntityManager em = AuthorValue.entityManager();
-        TypedQuery<AuthorValue> q = em.createQuery("SELECT o FROM AuthorValue AS o WHERE o.codeValue = :codeValue", AuthorValue.class);
+        TypedQuery<AuthorValue> q = em.createQuery("SELECT o FROM AuthorValue AS o WHERE o.codeValue = :codeValue",
+                AuthorValue.class);
         q.setParameter("codeValue", codeValue);
         return q;
     }
 
-	public static TypedQuery<AuthorValue> findAuthorValuesByCodeValueEquals(String codeValue, String sortFieldName, String sortOrder) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+    public static TypedQuery<AuthorValue> findAuthorValuesByCodeValueEquals(String codeValue, String sortFieldName,
+            String sortOrder) {
+        if (codeValue == null || codeValue.length() == 0)
+            throw new IllegalArgumentException("The codeValue argument is required");
         EntityManager em = AuthorValue.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorValue AS o WHERE o.codeValue = :codeValue");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -173,19 +194,26 @@ public static TypedQuery<AuthorValue> findAuthorValuesByCodeValueEquals(String c
         return q;
     }
 
-	public static TypedQuery<AuthorValue> findAuthorValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+    public static TypedQuery<AuthorValue> findAuthorValuesByIgnoredNotAndCodeValueEquals(boolean ignored,
+            String codeValue) {
+        if (codeValue == null || codeValue.length() == 0)
+            throw new IllegalArgumentException("The codeValue argument is required");
         EntityManager em = AuthorValue.entityManager();
-        TypedQuery<AuthorValue> q = em.createQuery("SELECT o FROM AuthorValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", AuthorValue.class);
+        TypedQuery<AuthorValue> q = em.createQuery(
+                "SELECT o FROM AuthorValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue",
+                AuthorValue.class);
         q.setParameter("ignored", ignored);
         q.setParameter("codeValue", codeValue);
         return q;
     }
 
-	public static TypedQuery<AuthorValue> findAuthorValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue, String sortFieldName, String sortOrder) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+    public static TypedQuery<AuthorValue> findAuthorValuesByIgnoredNotAndCodeValueEquals(boolean ignored,
+            String codeValue, String sortFieldName, String sortOrder) {
+        if (codeValue == null || codeValue.length() == 0)
+            throw new IllegalArgumentException("The codeValue argument is required");
         EntityManager em = AuthorValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM AuthorValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -198,16 +226,20 @@ public static TypedQuery<AuthorValue> findAuthorValuesByIgnoredNotAndCodeValueEq
         return q;
     }
 
-	public static TypedQuery<AuthorValue> findAuthorValuesByLsState(AuthorState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+    public static TypedQuery<AuthorValue> findAuthorValuesByLsState(AuthorState lsState) {
+        if (lsState == null)
+            throw new IllegalArgumentException("The lsState argument is required");
         EntityManager em = AuthorValue.entityManager();
-        TypedQuery<AuthorValue> q = em.createQuery("SELECT o FROM AuthorValue AS o WHERE o.lsState = :lsState", AuthorValue.class);
+        TypedQuery<AuthorValue> q = em.createQuery("SELECT o FROM AuthorValue AS o WHERE o.lsState = :lsState",
+                AuthorValue.class);
         q.setParameter("lsState", lsState);
         return q;
     }
 
-	public static TypedQuery<AuthorValue> findAuthorValuesByLsState(AuthorState lsState, String sortFieldName, String sortOrder) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+    public static TypedQuery<AuthorValue> findAuthorValuesByLsState(AuthorState lsState, String sortFieldName,
+            String sortOrder) {
+        if (lsState == null)
+            throw new IllegalArgumentException("The lsState argument is required");
         EntityManager em = AuthorValue.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorValue AS o WHERE o.lsState = :lsState");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -221,18 +253,23 @@ public static TypedQuery<AuthorValue> findAuthorValuesByLsState(AuthorState lsSt
         return q;
     }
 
-	public static TypedQuery<AuthorValue> findAuthorValuesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<AuthorValue> findAuthorValuesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = AuthorValue.entityManager();
-        TypedQuery<AuthorValue> q = em.createQuery("SELECT o FROM AuthorValue AS o WHERE o.lsTransaction = :lsTransaction", AuthorValue.class);
+        TypedQuery<AuthorValue> q = em.createQuery(
+                "SELECT o FROM AuthorValue AS o WHERE o.lsTransaction = :lsTransaction", AuthorValue.class);
         q.setParameter("lsTransaction", lsTransaction);
         return q;
     }
 
-	public static TypedQuery<AuthorValue> findAuthorValuesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<AuthorValue> findAuthorValuesByLsTransactionEquals(Long lsTransaction,
+            String sortFieldName, String sortOrder) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = AuthorValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorValue AS o WHERE o.lsTransaction = :lsTransaction");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM AuthorValue AS o WHERE o.lsTransaction = :lsTransaction");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -244,21 +281,28 @@ public static TypedQuery<AuthorValue> findAuthorValuesByLsTransactionEquals(Long
         return q;
     }
 
-	public static TypedQuery<AuthorValue> findAuthorValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<AuthorValue> findAuthorValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = AuthorValue.entityManager();
-        TypedQuery<AuthorValue> q = em.createQuery("SELECT o FROM AuthorValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", AuthorValue.class);
+        TypedQuery<AuthorValue> q = em.createQuery(
+                "SELECT o FROM AuthorValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", AuthorValue.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         return q;
     }
 
-	public static TypedQuery<AuthorValue> findAuthorValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<AuthorValue> findAuthorValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind,
+            String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = AuthorValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM AuthorValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -271,10 +315,14 @@ public static TypedQuery<AuthorValue> findAuthorValuesByLsTypeEqualsAndLsKindEqu
         return q;
     }
 
-	public static TypedQuery<AuthorValue> findAuthorValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(String lsType, String lsKind, String stringValue, boolean ignored) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+    public static TypedQuery<AuthorValue> findAuthorValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(
+            String lsType, String lsKind, String stringValue, boolean ignored) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0)
+            throw new IllegalArgumentException("The stringValue argument is required");
         stringValue = stringValue.replace('*', '%');
         if (stringValue.charAt(0) != '%') {
             stringValue = "%" + stringValue;
@@ -283,7 +331,9 @@ public static TypedQuery<AuthorValue> findAuthorValuesByLsTypeEqualsAndLsKindEqu
             stringValue = stringValue + "%";
         }
         EntityManager em = AuthorValue.entityManager();
-        TypedQuery<AuthorValue> q = em.createQuery("SELECT o FROM AuthorValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)  AND o.ignored IS NOT :ignored", AuthorValue.class);
+        TypedQuery<AuthorValue> q = em.createQuery(
+                "SELECT o FROM AuthorValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)  AND o.ignored IS NOT :ignored",
+                AuthorValue.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         q.setParameter("stringValue", stringValue);
@@ -291,10 +341,14 @@ public static TypedQuery<AuthorValue> findAuthorValuesByLsTypeEqualsAndLsKindEqu
         return q;
     }
 
-	public static TypedQuery<AuthorValue> findAuthorValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(String lsType, String lsKind, String stringValue, boolean ignored, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+    public static TypedQuery<AuthorValue> findAuthorValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot(
+            String lsType, String lsKind, String stringValue, boolean ignored, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0)
+            throw new IllegalArgumentException("The stringValue argument is required");
         stringValue = stringValue.replace('*', '%');
         if (stringValue.charAt(0) != '%') {
             stringValue = "%" + stringValue;
@@ -303,7 +357,8 @@ public static TypedQuery<AuthorValue> findAuthorValuesByLsTypeEqualsAndLsKindEqu
             stringValue = stringValue + "%";
         }
         EntityManager em = AuthorValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM AuthorValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)  AND o.ignored IS NOT :ignored");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM AuthorValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)  AND o.ignored IS NOT :ignored");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -318,17 +373,17 @@ public static TypedQuery<AuthorValue> findAuthorValuesByLsTypeEqualsAndLsKindEqu
         return q;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsState");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsState");
 
-	public static List<AuthorValue> findAllAuthorValues() {
+    public static List<AuthorValue> findAllAuthorValues() {
         return entityManager().createQuery("SELECT o FROM AuthorValue o", AuthorValue.class).getResultList();
     }
 
-	public static List<AuthorValue> findAllAuthorValues(String sortFieldName, String sortOrder) {
+    public static List<AuthorValue> findAllAuthorValues(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM AuthorValue o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -339,16 +394,19 @@ public static List<AuthorValue> findAllAuthorValues(String sortFieldName, String
         return entityManager().createQuery(jpaQuery, AuthorValue.class).getResultList();
     }
 
-	public static AuthorValue findAuthorValue(Long id) {
-        if (id == null) return null;
+    public static AuthorValue findAuthorValue(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(AuthorValue.class, id);
     }
 
-	public static List<AuthorValue> findAuthorValueEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM AuthorValue o", AuthorValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<AuthorValue> findAuthorValueEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM AuthorValue o", AuthorValue.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<AuthorValue> findAuthorValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<AuthorValue> findAuthorValueEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM AuthorValue o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -356,52 +414,54 @@ public static List<AuthorValue> findAuthorValueEntries(int firstResult, int maxR
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, AuthorValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, AuthorValue.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public AuthorValue merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         AuthorValue merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static AuthorValue fromJsonToAuthorValue(String json) {
+    public static AuthorValue fromJsonToAuthorValue(String json) {
         return new JSONDeserializer<AuthorValue>()
-        .use(null, AuthorValue.class).deserialize(json);
+                .use(null, AuthorValue.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<AuthorValue> collection) {
+    public static String toJsonArray(Collection<AuthorValue> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<AuthorValue> collection, String[] fields) {
+    public static String toJsonArray(Collection<AuthorValue> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<AuthorValue> fromJsonArrayToAuthorValues(String json) {
+    public static Collection<AuthorValue> fromJsonArrayToAuthorValues(String json) {
         return new JSONDeserializer<List<AuthorValue>>()
-        .use("values", AuthorValue.class).deserialize(json);
+                .use("values", AuthorValue.class).deserialize(json);
     }
 
-	public AuthorState getLsState() {
+    public AuthorState getLsState() {
         return this.lsState;
     }
 
-	public void setLsState(AuthorState lsState) {
+    public void setLsState(AuthorState lsState) {
         this.lsState = lsState;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/BulkLoadFile.java b/src/main/java/com/labsynch/labseer/domain/BulkLoadFile.java
index ce9be2fab..9a1900849 100644
--- a/src/main/java/com/labsynch/labseer/domain/BulkLoadFile.java
+++ b/src/main/java/com/labsynch/labseer/domain/BulkLoadFile.java
@@ -33,58 +33,67 @@ public class BulkLoadFile {
     private String fileName;
 
     private int numberOfMols;
-    
+
     private int fileSize;
-    
-	@Column(columnDefinition="text")
+
+    @Column(columnDefinition = "text")
     private String jsonTemplate;
-	
-	@NotNull
-	private String recordedBy;
-	
-	private Date fileDate;
-	
-	@NotNull
-	private Date recordedDate;
-    
-	public BulkLoadFile(){
-	}
-	
-	public BulkLoadFile(String fileName, int numberOfMols, int fileSize, String jsonTemplate, String recordedBy, Date recordedDate){
-		this.fileName = fileName;
-		this.numberOfMols = numberOfMols;
-		this.fileSize = fileSize;
-		this.jsonTemplate = jsonTemplate;
-		this.recordedBy = recordedBy;
-		this.recordedDate = recordedDate;
-	}
-
-	public static Long countFindBulkLoadFilesByFileNameEquals(String fileName) {
-        if (fileName == null || fileName.length() == 0) throw new IllegalArgumentException("The fileName argument is required");
+
+    @NotNull
+    private String recordedBy;
+
+    private Date fileDate;
+
+    @NotNull
+    private Date recordedDate;
+
+    public BulkLoadFile() {
+    }
+
+    public BulkLoadFile(String fileName, int numberOfMols, int fileSize, String jsonTemplate, String recordedBy,
+            Date recordedDate) {
+        this.fileName = fileName;
+        this.numberOfMols = numberOfMols;
+        this.fileSize = fileSize;
+        this.jsonTemplate = jsonTemplate;
+        this.recordedBy = recordedBy;
+        this.recordedDate = recordedDate;
+    }
+
+    public static Long countFindBulkLoadFilesByFileNameEquals(String fileName) {
+        if (fileName == null || fileName.length() == 0)
+            throw new IllegalArgumentException("The fileName argument is required");
         EntityManager em = BulkLoadFile.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BulkLoadFile AS o WHERE o.fileName = :fileName", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BulkLoadFile AS o WHERE o.fileName = :fileName",
+                Long.class);
         q.setParameter("fileName", fileName);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindBulkLoadFilesByRecordedByEquals(String recordedBy) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+    public static Long countFindBulkLoadFilesByRecordedByEquals(String recordedBy) {
+        if (recordedBy == null || recordedBy.length() == 0)
+            throw new IllegalArgumentException("The recordedBy argument is required");
         EntityManager em = BulkLoadFile.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BulkLoadFile AS o WHERE o.recordedBy = :recordedBy", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BulkLoadFile AS o WHERE o.recordedBy = :recordedBy",
+                Long.class);
         q.setParameter("recordedBy", recordedBy);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<BulkLoadFile> findBulkLoadFilesByFileNameEquals(String fileName) {
-        if (fileName == null || fileName.length() == 0) throw new IllegalArgumentException("The fileName argument is required");
+    public static TypedQuery<BulkLoadFile> findBulkLoadFilesByFileNameEquals(String fileName) {
+        if (fileName == null || fileName.length() == 0)
+            throw new IllegalArgumentException("The fileName argument is required");
         EntityManager em = BulkLoadFile.entityManager();
-        TypedQuery<BulkLoadFile> q = em.createQuery("SELECT o FROM BulkLoadFile AS o WHERE o.fileName = :fileName", BulkLoadFile.class);
+        TypedQuery<BulkLoadFile> q = em.createQuery("SELECT o FROM BulkLoadFile AS o WHERE o.fileName = :fileName",
+                BulkLoadFile.class);
         q.setParameter("fileName", fileName);
         return q;
     }
 
-	public static TypedQuery<BulkLoadFile> findBulkLoadFilesByFileNameEquals(String fileName, String sortFieldName, String sortOrder) {
-        if (fileName == null || fileName.length() == 0) throw new IllegalArgumentException("The fileName argument is required");
+    public static TypedQuery<BulkLoadFile> findBulkLoadFilesByFileNameEquals(String fileName, String sortFieldName,
+            String sortOrder) {
+        if (fileName == null || fileName.length() == 0)
+            throw new IllegalArgumentException("The fileName argument is required");
         EntityManager em = BulkLoadFile.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BulkLoadFile AS o WHERE o.fileName = :fileName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -98,18 +107,23 @@ public static TypedQuery<BulkLoadFile> findBulkLoadFilesByFileNameEquals(String
         return q;
     }
 
-	public static TypedQuery<BulkLoadFile> findBulkLoadFilesByRecordedByEquals(String recordedBy) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+    public static TypedQuery<BulkLoadFile> findBulkLoadFilesByRecordedByEquals(String recordedBy) {
+        if (recordedBy == null || recordedBy.length() == 0)
+            throw new IllegalArgumentException("The recordedBy argument is required");
         EntityManager em = BulkLoadFile.entityManager();
-        TypedQuery<BulkLoadFile> q = em.createQuery("SELECT o FROM BulkLoadFile AS o WHERE o.recordedBy = :recordedBy", BulkLoadFile.class);
+        TypedQuery<BulkLoadFile> q = em.createQuery("SELECT o FROM BulkLoadFile AS o WHERE o.recordedBy = :recordedBy",
+                BulkLoadFile.class);
         q.setParameter("recordedBy", recordedBy);
         return q;
     }
 
-	public static TypedQuery<BulkLoadFile> findBulkLoadFilesByRecordedByEquals(String recordedBy, String sortFieldName, String sortOrder) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+    public static TypedQuery<BulkLoadFile> findBulkLoadFilesByRecordedByEquals(String recordedBy, String sortFieldName,
+            String sortOrder) {
+        if (recordedBy == null || recordedBy.length() == 0)
+            throw new IllegalArgumentException("The recordedBy argument is required");
         EntityManager em = BulkLoadFile.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BulkLoadFile AS o WHERE o.recordedBy = :recordedBy");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM BulkLoadFile AS o WHERE o.recordedBy = :recordedBy");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -121,26 +135,29 @@ public static TypedQuery<BulkLoadFile> findBulkLoadFilesByRecordedByEquals(Strin
         return q;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("fileName", "numberOfMols", "fileSize", "jsonTemplate", "recordedBy", "fileDate", "recordedDate");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("fileName", "numberOfMols",
+            "fileSize", "jsonTemplate", "recordedBy", "fileDate", "recordedDate");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new BulkLoadFile().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countBulkLoadFiles() {
+    public static long countBulkLoadFiles() {
         return entityManager().createQuery("SELECT COUNT(o) FROM BulkLoadFile o", Long.class).getSingleResult();
     }
 
-	public static List<BulkLoadFile> findAllBulkLoadFiles() {
+    public static List<BulkLoadFile> findAllBulkLoadFiles() {
         return entityManager().createQuery("SELECT o FROM BulkLoadFile o", BulkLoadFile.class).getResultList();
     }
 
-	public static List<BulkLoadFile> findAllBulkLoadFiles(String sortFieldName, String sortOrder) {
+    public static List<BulkLoadFile> findAllBulkLoadFiles(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM BulkLoadFile o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -151,16 +168,19 @@ public static List<BulkLoadFile> findAllBulkLoadFiles(String sortFieldName, Stri
         return entityManager().createQuery(jpaQuery, BulkLoadFile.class).getResultList();
     }
 
-	public static BulkLoadFile findBulkLoadFile(Long id) {
-        if (id == null) return null;
+    public static BulkLoadFile findBulkLoadFile(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(BulkLoadFile.class, id);
     }
 
-	public static List<BulkLoadFile> findBulkLoadFileEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM BulkLoadFile o", BulkLoadFile.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<BulkLoadFile> findBulkLoadFileEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM BulkLoadFile o", BulkLoadFile.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<BulkLoadFile> findBulkLoadFileEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<BulkLoadFile> findBulkLoadFileEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM BulkLoadFile o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -168,18 +188,21 @@ public static List<BulkLoadFile> findBulkLoadFileEntries(int firstResult, int ma
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, BulkLoadFile.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, BulkLoadFile.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -188,138 +211,141 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public BulkLoadFile merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         BulkLoadFile merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static BulkLoadFile fromJsonToBulkLoadFile(String json) {
+    public static BulkLoadFile fromJsonToBulkLoadFile(String json) {
         return new JSONDeserializer<BulkLoadFile>()
-        .use(null, BulkLoadFile.class).deserialize(json);
+                .use(null, BulkLoadFile.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<BulkLoadFile> collection) {
+    public static String toJsonArray(Collection<BulkLoadFile> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<BulkLoadFile> collection, String[] fields) {
+    public static String toJsonArray(Collection<BulkLoadFile> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<BulkLoadFile> fromJsonArrayToBulkLoadFiles(String json) {
+    public static Collection<BulkLoadFile> fromJsonArrayToBulkLoadFiles(String json) {
         return new JSONDeserializer<List<BulkLoadFile>>()
-        .use("values", BulkLoadFile.class).deserialize(json);
+                .use("values", BulkLoadFile.class).deserialize(json);
     }
 
-	public String getFileName() {
+    public String getFileName() {
         return this.fileName;
     }
 
-	public void setFileName(String fileName) {
+    public void setFileName(String fileName) {
         this.fileName = fileName;
     }
 
-	public int getNumberOfMols() {
+    public int getNumberOfMols() {
         return this.numberOfMols;
     }
 
-	public void setNumberOfMols(int numberOfMols) {
+    public void setNumberOfMols(int numberOfMols) {
         this.numberOfMols = numberOfMols;
     }
 
-	public int getFileSize() {
+    public int getFileSize() {
         return this.fileSize;
     }
 
-	public void setFileSize(int fileSize) {
+    public void setFileSize(int fileSize) {
         this.fileSize = fileSize;
     }
 
-	public String getJsonTemplate() {
+    public String getJsonTemplate() {
         return this.jsonTemplate;
     }
 
-	public void setJsonTemplate(String jsonTemplate) {
+    public void setJsonTemplate(String jsonTemplate) {
         this.jsonTemplate = jsonTemplate;
     }
 
-	public String getRecordedBy() {
+    public String getRecordedBy() {
         return this.recordedBy;
     }
 
-	public void setRecordedBy(String recordedBy) {
+    public void setRecordedBy(String recordedBy) {
         this.recordedBy = recordedBy;
     }
 
-	public Date getFileDate() {
+    public Date getFileDate() {
         return this.fileDate;
     }
 
-	public void setFileDate(Date fileDate) {
+    public void setFileDate(Date fileDate) {
         this.fileDate = fileDate;
     }
 
-	public Date getRecordedDate() {
+    public Date getRecordedDate() {
         return this.recordedDate;
     }
 
-	public void setRecordedDate(Date recordedDate) {
+    public void setRecordedDate(Date recordedDate) {
         this.recordedDate = recordedDate;
     }
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate.java b/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate.java
index bb897e434..5b86ab0a5 100644
--- a/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate.java
+++ b/src/main/java/com/labsynch/labseer/domain/BulkLoadTemplate.java
@@ -33,106 +33,119 @@ public class BulkLoadTemplate {
 
     @Size(max = 255)
     private String templateName;
-    
-	@Column(columnDefinition="text")
+
+    @Column(columnDefinition = "text")
     private String jsonTemplate;
-	
-	@NotNull
-	private String recordedBy;
-	
-	@NotNull
-	private boolean ignored;
-    
-	public BulkLoadTemplate(){
-		this.ignored =false;
-	}
-	
-	public BulkLoadTemplate(String templateName, String jsonTemplate, String recordedBy){
-		this.templateName = templateName;
-		this.jsonTemplate = jsonTemplate;
-		this.recordedBy = recordedBy;
-		this.ignored = false;
-	}
-
-	public void update(BulkLoadTemplate templateToSave) {
-		this.templateName = templateToSave.getTemplateName();
-		this.jsonTemplate = templateToSave.getJsonTemplate();
-		this.recordedBy = templateToSave.getRecordedBy();
-		this.ignored = templateToSave.isIgnored();
-		this.merge();
-	}
-	
-	public BulkLoadTemplate(BulkLoadTemplateDTO templateDTO){
-		this.templateName = templateDTO.getTemplateName();
-		this.jsonTemplate = BulkLoadPropertyMappingDTO.toJsonArray(templateDTO.getMappings());
-		this.recordedBy = templateDTO.getRecordedBy();
-		this.ignored = templateDTO.isIgnored();
-	}
-	
-
-	@Id
+
+    @NotNull
+    private String recordedBy;
+
+    @NotNull
+    private boolean ignored;
+
+    public BulkLoadTemplate() {
+        this.ignored = false;
+    }
+
+    public BulkLoadTemplate(String templateName, String jsonTemplate, String recordedBy) {
+        this.templateName = templateName;
+        this.jsonTemplate = jsonTemplate;
+        this.recordedBy = recordedBy;
+        this.ignored = false;
+    }
+
+    public void update(BulkLoadTemplate templateToSave) {
+        this.templateName = templateToSave.getTemplateName();
+        this.jsonTemplate = templateToSave.getJsonTemplate();
+        this.recordedBy = templateToSave.getRecordedBy();
+        this.ignored = templateToSave.isIgnored();
+        this.merge();
+    }
+
+    public BulkLoadTemplate(BulkLoadTemplateDTO templateDTO) {
+        this.templateName = templateDTO.getTemplateName();
+        this.jsonTemplate = BulkLoadPropertyMappingDTO.toJsonArray(templateDTO.getMappings());
+        this.recordedBy = templateDTO.getRecordedBy();
+        this.ignored = templateDTO.isIgnored();
+    }
+
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public static Long countFindBulkLoadTemplatesByRecordedByEquals(String recordedBy) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+    public static Long countFindBulkLoadTemplatesByRecordedByEquals(String recordedBy) {
+        if (recordedBy == null || recordedBy.length() == 0)
+            throw new IllegalArgumentException("The recordedBy argument is required");
         EntityManager em = BulkLoadTemplate.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BulkLoadTemplate AS o WHERE o.recordedBy = :recordedBy", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BulkLoadTemplate AS o WHERE o.recordedBy = :recordedBy",
+                Long.class);
         q.setParameter("recordedBy", recordedBy);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindBulkLoadTemplatesByTemplateNameEquals(String templateName) {
-        if (templateName == null || templateName.length() == 0) throw new IllegalArgumentException("The templateName argument is required");
+    public static Long countFindBulkLoadTemplatesByTemplateNameEquals(String templateName) {
+        if (templateName == null || templateName.length() == 0)
+            throw new IllegalArgumentException("The templateName argument is required");
         EntityManager em = BulkLoadTemplate.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BulkLoadTemplate AS o WHERE o.templateName = :templateName", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BulkLoadTemplate AS o WHERE o.templateName = :templateName",
+                Long.class);
         q.setParameter("templateName", templateName);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals(String templateName, String recordedBy) {
-        if (templateName == null || templateName.length() == 0) throw new IllegalArgumentException("The templateName argument is required");
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+    public static Long countFindBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals(String templateName,
+            String recordedBy) {
+        if (templateName == null || templateName.length() == 0)
+            throw new IllegalArgumentException("The templateName argument is required");
+        if (recordedBy == null || recordedBy.length() == 0)
+            throw new IllegalArgumentException("The recordedBy argument is required");
         EntityManager em = BulkLoadTemplate.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM BulkLoadTemplate AS o WHERE o.templateName = :templateName  AND o.recordedBy = :recordedBy", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM BulkLoadTemplate AS o WHERE o.templateName = :templateName  AND o.recordedBy = :recordedBy",
+                Long.class);
         q.setParameter("templateName", templateName);
         q.setParameter("recordedBy", recordedBy);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<BulkLoadTemplate> findBulkLoadTemplatesByRecordedByEquals(String recordedBy) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+    public static TypedQuery<BulkLoadTemplate> findBulkLoadTemplatesByRecordedByEquals(String recordedBy) {
+        if (recordedBy == null || recordedBy.length() == 0)
+            throw new IllegalArgumentException("The recordedBy argument is required");
         EntityManager em = BulkLoadTemplate.entityManager();
-        TypedQuery<BulkLoadTemplate> q = em.createQuery("SELECT o FROM BulkLoadTemplate AS o WHERE o.recordedBy = :recordedBy", BulkLoadTemplate.class);
+        TypedQuery<BulkLoadTemplate> q = em.createQuery(
+                "SELECT o FROM BulkLoadTemplate AS o WHERE o.recordedBy = :recordedBy", BulkLoadTemplate.class);
         q.setParameter("recordedBy", recordedBy);
         return q;
     }
 
-	public static TypedQuery<BulkLoadTemplate> findBulkLoadTemplatesByRecordedByEquals(String recordedBy, String sortFieldName, String sortOrder) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+    public static TypedQuery<BulkLoadTemplate> findBulkLoadTemplatesByRecordedByEquals(String recordedBy,
+            String sortFieldName, String sortOrder) {
+        if (recordedBy == null || recordedBy.length() == 0)
+            throw new IllegalArgumentException("The recordedBy argument is required");
         EntityManager em = BulkLoadTemplate.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BulkLoadTemplate AS o WHERE o.recordedBy = :recordedBy");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM BulkLoadTemplate AS o WHERE o.recordedBy = :recordedBy");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -144,18 +157,23 @@ public static TypedQuery<BulkLoadTemplate> findBulkLoadTemplatesByRecordedByEqua
         return q;
     }
 
-	public static TypedQuery<BulkLoadTemplate> findBulkLoadTemplatesByTemplateNameEquals(String templateName) {
-        if (templateName == null || templateName.length() == 0) throw new IllegalArgumentException("The templateName argument is required");
+    public static TypedQuery<BulkLoadTemplate> findBulkLoadTemplatesByTemplateNameEquals(String templateName) {
+        if (templateName == null || templateName.length() == 0)
+            throw new IllegalArgumentException("The templateName argument is required");
         EntityManager em = BulkLoadTemplate.entityManager();
-        TypedQuery<BulkLoadTemplate> q = em.createQuery("SELECT o FROM BulkLoadTemplate AS o WHERE o.templateName = :templateName", BulkLoadTemplate.class);
+        TypedQuery<BulkLoadTemplate> q = em.createQuery(
+                "SELECT o FROM BulkLoadTemplate AS o WHERE o.templateName = :templateName", BulkLoadTemplate.class);
         q.setParameter("templateName", templateName);
         return q;
     }
 
-	public static TypedQuery<BulkLoadTemplate> findBulkLoadTemplatesByTemplateNameEquals(String templateName, String sortFieldName, String sortOrder) {
-        if (templateName == null || templateName.length() == 0) throw new IllegalArgumentException("The templateName argument is required");
+    public static TypedQuery<BulkLoadTemplate> findBulkLoadTemplatesByTemplateNameEquals(String templateName,
+            String sortFieldName, String sortOrder) {
+        if (templateName == null || templateName.length() == 0)
+            throw new IllegalArgumentException("The templateName argument is required");
         EntityManager em = BulkLoadTemplate.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BulkLoadTemplate AS o WHERE o.templateName = :templateName");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM BulkLoadTemplate AS o WHERE o.templateName = :templateName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -167,21 +185,30 @@ public static TypedQuery<BulkLoadTemplate> findBulkLoadTemplatesByTemplateNameEq
         return q;
     }
 
-	public static TypedQuery<BulkLoadTemplate> findBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals(String templateName, String recordedBy) {
-        if (templateName == null || templateName.length() == 0) throw new IllegalArgumentException("The templateName argument is required");
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+    public static TypedQuery<BulkLoadTemplate> findBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals(
+            String templateName, String recordedBy) {
+        if (templateName == null || templateName.length() == 0)
+            throw new IllegalArgumentException("The templateName argument is required");
+        if (recordedBy == null || recordedBy.length() == 0)
+            throw new IllegalArgumentException("The recordedBy argument is required");
         EntityManager em = BulkLoadTemplate.entityManager();
-        TypedQuery<BulkLoadTemplate> q = em.createQuery("SELECT o FROM BulkLoadTemplate AS o WHERE o.templateName = :templateName  AND o.recordedBy = :recordedBy", BulkLoadTemplate.class);
+        TypedQuery<BulkLoadTemplate> q = em.createQuery(
+                "SELECT o FROM BulkLoadTemplate AS o WHERE o.templateName = :templateName  AND o.recordedBy = :recordedBy",
+                BulkLoadTemplate.class);
         q.setParameter("templateName", templateName);
         q.setParameter("recordedBy", recordedBy);
         return q;
     }
 
-	public static TypedQuery<BulkLoadTemplate> findBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals(String templateName, String recordedBy, String sortFieldName, String sortOrder) {
-        if (templateName == null || templateName.length() == 0) throw new IllegalArgumentException("The templateName argument is required");
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+    public static TypedQuery<BulkLoadTemplate> findBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals(
+            String templateName, String recordedBy, String sortFieldName, String sortOrder) {
+        if (templateName == null || templateName.length() == 0)
+            throw new IllegalArgumentException("The templateName argument is required");
+        if (recordedBy == null || recordedBy.length() == 0)
+            throw new IllegalArgumentException("The recordedBy argument is required");
         EntityManager em = BulkLoadTemplate.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM BulkLoadTemplate AS o WHERE o.templateName = :templateName  AND o.recordedBy = :recordedBy");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM BulkLoadTemplate AS o WHERE o.templateName = :templateName  AND o.recordedBy = :recordedBy");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -194,30 +221,33 @@ public static TypedQuery<BulkLoadTemplate> findBulkLoadTemplatesByTemplateNameEq
         return q;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("templateName", "jsonTemplate", "recordedBy", "ignored");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("templateName",
+            "jsonTemplate", "recordedBy", "ignored");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new BulkLoadTemplate().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countBulkLoadTemplates() {
+    public static long countBulkLoadTemplates() {
         return entityManager().createQuery("SELECT COUNT(o) FROM BulkLoadTemplate o", Long.class).getSingleResult();
     }
 
-	public static List<BulkLoadTemplate> findAllBulkLoadTemplates() {
+    public static List<BulkLoadTemplate> findAllBulkLoadTemplates() {
         return entityManager().createQuery("SELECT o FROM BulkLoadTemplate o", BulkLoadTemplate.class).getResultList();
     }
 
-	public static List<BulkLoadTemplate> findAllBulkLoadTemplates(String sortFieldName, String sortOrder) {
+    public static List<BulkLoadTemplate> findAllBulkLoadTemplates(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM BulkLoadTemplate o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -228,16 +258,19 @@ public static List<BulkLoadTemplate> findAllBulkLoadTemplates(String sortFieldNa
         return entityManager().createQuery(jpaQuery, BulkLoadTemplate.class).getResultList();
     }
 
-	public static BulkLoadTemplate findBulkLoadTemplate(Long id) {
-        if (id == null) return null;
+    public static BulkLoadTemplate findBulkLoadTemplate(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(BulkLoadTemplate.class, id);
     }
 
-	public static List<BulkLoadTemplate> findBulkLoadTemplateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM BulkLoadTemplate o", BulkLoadTemplate.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<BulkLoadTemplate> findBulkLoadTemplateEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM BulkLoadTemplate o", BulkLoadTemplate.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<BulkLoadTemplate> findBulkLoadTemplateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<BulkLoadTemplate> findBulkLoadTemplateEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM BulkLoadTemplate o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -245,18 +278,21 @@ public static List<BulkLoadTemplate> findBulkLoadTemplateEntries(int firstResult
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, BulkLoadTemplate.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, BulkLoadTemplate.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -265,85 +301,88 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public BulkLoadTemplate merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         BulkLoadTemplate merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String getTemplateName() {
+    public String getTemplateName() {
         return this.templateName;
     }
 
-	public void setTemplateName(String templateName) {
+    public void setTemplateName(String templateName) {
         this.templateName = templateName;
     }
 
-	public String getJsonTemplate() {
+    public String getJsonTemplate() {
         return this.jsonTemplate;
     }
 
-	public void setJsonTemplate(String jsonTemplate) {
+    public void setJsonTemplate(String jsonTemplate) {
         this.jsonTemplate = jsonTemplate;
     }
 
-	public String getRecordedBy() {
+    public String getRecordedBy() {
         return this.recordedBy;
     }
 
-	public void setRecordedBy(String recordedBy) {
+    public void setRecordedBy(String recordedBy) {
         this.recordedBy = recordedBy;
     }
 
-	public boolean isIgnored() {
+    public boolean isIgnored() {
         return this.ignored;
     }
 
-	public void setIgnored(boolean ignored) {
+    public void setIgnored(boolean ignored) {
         this.ignored = ignored;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static BulkLoadTemplate fromJsonToBulkLoadTemplate(String json) {
+    public static BulkLoadTemplate fromJsonToBulkLoadTemplate(String json) {
         return new JSONDeserializer<BulkLoadTemplate>()
-        .use(null, BulkLoadTemplate.class).deserialize(json);
+                .use(null, BulkLoadTemplate.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<BulkLoadTemplate> collection) {
+    public static String toJsonArray(Collection<BulkLoadTemplate> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<BulkLoadTemplate> collection, String[] fields) {
+    public static String toJsonArray(Collection<BulkLoadTemplate> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<BulkLoadTemplate> fromJsonArrayToBulkLoadTemplates(String json) {
+    public static Collection<BulkLoadTemplate> fromJsonArrayToBulkLoadTemplates(String json) {
         return new JSONDeserializer<List<BulkLoadTemplate>>()
-        .use("values", BulkLoadTemplate.class).deserialize(json);
+                .use("values", BulkLoadTemplate.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ChemStructure.java b/src/main/java/com/labsynch/labseer/domain/ChemStructure.java
index 1716915cf..ed8a3a190 100644
--- a/src/main/java/com/labsynch/labseer/domain/ChemStructure.java
+++ b/src/main/java/com/labsynch/labseer/domain/ChemStructure.java
@@ -98,7 +98,8 @@ public ChemStructure(com.labsynch.labseer.domain.ChemStructure structure) {
         this.setLsTransaction(structure.getLsTransaction());
     }
 
-    public static com.labsynch.labseer.domain.ChemStructure update(com.labsynch.labseer.domain.ChemStructure structure) {
+    public static com.labsynch.labseer.domain.ChemStructure update(
+            com.labsynch.labseer.domain.ChemStructure structure) {
         ChemStructure updatedStructure = ChemStructure.findChemStructure(structure.getId());
         updatedStructure.setMolStructure(structure.getMolStructure());
         updatedStructure.setSmiles(structure.getSmiles());
@@ -131,28 +132,34 @@ public void setVersion(Integer version) {
     }
 
     public static com.labsynch.labseer.domain.ChemStructure findStructureByCodeName(String codeName) {
-    	ChemStructure result = ChemStructure.findChemStructuresByCodeNameEquals(codeName).getSingleResult();
-    	return result;
+        ChemStructure result = ChemStructure.findChemStructuresByCodeNameEquals(codeName).getSingleResult();
+        return result;
     }
 
-	public static Long countFindChemStructuresByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static Long countFindChemStructuresByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = ChemStructure.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ChemStructure AS o WHERE o.codeName = :codeName", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ChemStructure AS o WHERE o.codeName = :codeName",
+                Long.class);
         q.setParameter("codeName", codeName);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<ChemStructure> findChemStructuresByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static TypedQuery<ChemStructure> findChemStructuresByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = ChemStructure.entityManager();
-        TypedQuery<ChemStructure> q = em.createQuery("SELECT o FROM ChemStructure AS o WHERE o.codeName = :codeName", ChemStructure.class);
+        TypedQuery<ChemStructure> q = em.createQuery("SELECT o FROM ChemStructure AS o WHERE o.codeName = :codeName",
+                ChemStructure.class);
         q.setParameter("codeName", codeName);
         return q;
     }
 
-	public static TypedQuery<ChemStructure> findChemStructuresByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static TypedQuery<ChemStructure> findChemStructuresByCodeNameEquals(String codeName, String sortFieldName,
+            String sortOrder) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = ChemStructure.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ChemStructure AS o WHERE o.codeName = :codeName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -166,134 +173,138 @@ public static TypedQuery<ChemStructure> findChemStructuresByCodeNameEquals(Strin
         return q;
     }
 
-	public String getCodeName() {
+    public String getCodeName() {
         return this.codeName;
     }
 
-	public void setCodeName(String codeName) {
+    public void setCodeName(String codeName) {
         this.codeName = codeName;
     }
 
-	public String getMolStructure() {
+    public String getMolStructure() {
         return this.molStructure;
     }
 
-	public void setMolStructure(String molStructure) {
+    public void setMolStructure(String molStructure) {
         this.molStructure = molStructure;
     }
 
-	public String getSmiles() {
+    public String getSmiles() {
         return this.smiles;
     }
 
-	public void setSmiles(String smiles) {
+    public void setSmiles(String smiles) {
         this.smiles = smiles;
     }
 
-	public String getLsType() {
+    public String getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(String lsType) {
+    public void setLsType(String lsType) {
         this.lsType = lsType;
     }
 
-	public String getLsKind() {
+    public String getLsKind() {
         return this.lsKind;
     }
 
-	public void setLsKind(String lsKind) {
+    public void setLsKind(String lsKind) {
         this.lsKind = lsKind;
     }
 
-	public String getLsTypeAndKind() {
+    public String getLsTypeAndKind() {
         return this.lsTypeAndKind;
     }
 
-	public void setLsTypeAndKind(String lsTypeAndKind) {
+    public void setLsTypeAndKind(String lsTypeAndKind) {
         this.lsTypeAndKind = lsTypeAndKind;
     }
 
-	public boolean isIgnored() {
+    public boolean isIgnored() {
         return this.ignored;
     }
 
-	public void setIgnored(boolean ignored) {
+    public void setIgnored(boolean ignored) {
         this.ignored = ignored;
     }
 
-	public boolean isDeleted() {
+    public boolean isDeleted() {
         return this.deleted;
     }
 
-	public void setDeleted(boolean deleted) {
+    public void setDeleted(boolean deleted) {
         this.deleted = deleted;
     }
 
-	public String getRecordedBy() {
+    public String getRecordedBy() {
         return this.recordedBy;
     }
 
-	public void setRecordedBy(String recordedBy) {
+    public void setRecordedBy(String recordedBy) {
         this.recordedBy = recordedBy;
     }
 
-	public Date getRecordedDate() {
+    public Date getRecordedDate() {
         return this.recordedDate;
     }
 
-	public void setRecordedDate(Date recordedDate) {
+    public void setRecordedDate(Date recordedDate) {
         this.recordedDate = recordedDate;
     }
 
-	public String getModifiedBy() {
+    public String getModifiedBy() {
         return this.modifiedBy;
     }
 
-	public void setModifiedBy(String modifiedBy) {
+    public void setModifiedBy(String modifiedBy) {
         this.modifiedBy = modifiedBy;
     }
 
-	public Date getModifiedDate() {
+    public Date getModifiedDate() {
         return this.modifiedDate;
     }
 
-	public void setModifiedDate(Date modifiedDate) {
+    public void setModifiedDate(Date modifiedDate) {
         this.modifiedDate = modifiedDate;
     }
 
-	public Long getLsTransaction() {
+    public Long getLsTransaction() {
         return this.lsTransaction;
     }
 
-	public void setLsTransaction(Long lsTransaction) {
+    public void setLsTransaction(Long lsTransaction) {
         this.lsTransaction = lsTransaction;
     }
 
-	public ChemStructure() {
+    public ChemStructure() {
         super();
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "id", "codeName", "version", "molStructure", "smiles", "lsType", "lsKind", "lsTypeAndKind", "ignored", "deleted", "recordedBy", "recordedDate", "modifiedBy", "modifiedDate", "lsTransaction");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "id", "codeName",
+            "version", "molStructure", "smiles", "lsType", "lsKind", "lsTypeAndKind", "ignored", "deleted",
+            "recordedBy", "recordedDate", "modifiedBy", "modifiedDate", "lsTransaction");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new ChemStructure().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countChemStructures() {
+    public static long countChemStructures() {
         return entityManager().createQuery("SELECT COUNT(o) FROM ChemStructure o", Long.class).getSingleResult();
     }
 
-	public static List<ChemStructure> findAllChemStructures() {
+    public static List<ChemStructure> findAllChemStructures() {
         return entityManager().createQuery("SELECT o FROM ChemStructure o", ChemStructure.class).getResultList();
     }
 
-	public static List<ChemStructure> findAllChemStructures(String sortFieldName, String sortOrder) {
+    public static List<ChemStructure> findAllChemStructures(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ChemStructure o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -304,16 +315,19 @@ public static List<ChemStructure> findAllChemStructures(String sortFieldName, St
         return entityManager().createQuery(jpaQuery, ChemStructure.class).getResultList();
     }
 
-	public static ChemStructure findChemStructure(Long id) {
-        if (id == null) return null;
+    public static ChemStructure findChemStructure(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ChemStructure.class, id);
     }
 
-	public static List<ChemStructure> findChemStructureEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ChemStructure o", ChemStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ChemStructure> findChemStructureEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ChemStructure o", ChemStructure.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ChemStructure> findChemStructureEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ChemStructure> findChemStructureEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM ChemStructure o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -321,18 +335,21 @@ public static List<ChemStructure> findChemStructureEntries(int firstResult, int
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ChemStructure.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ChemStructure.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -341,57 +358,60 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public ChemStructure merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ChemStructure merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ChemStructure fromJsonToChemStructure(String json) {
+    public static ChemStructure fromJsonToChemStructure(String json) {
         return new JSONDeserializer<ChemStructure>()
-        .use(null, ChemStructure.class).deserialize(json);
+                .use(null, ChemStructure.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ChemStructure> collection) {
+    public static String toJsonArray(Collection<ChemStructure> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ChemStructure> collection, String[] fields) {
+    public static String toJsonArray(Collection<ChemStructure> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ChemStructure> fromJsonArrayToChemStructures(String json) {
+    public static Collection<ChemStructure> fromJsonArrayToChemStructures(String json) {
         return new JSONDeserializer<List<ChemStructure>>()
-        .use("values", ChemStructure.class).deserialize(json);
+                .use("values", ChemStructure.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting.java b/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting.java
index c2f8716c3..952b66b0c 100755
--- a/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting.java
+++ b/src/main/java/com/labsynch/labseer/domain/CmpdRegAppSetting.java
@@ -28,9 +28,8 @@
 @Configurable
 @Entity
 
-
 public class CmpdRegAppSetting {
-		
+
     @Size(max = 255)
     private String propName;
 
@@ -41,128 +40,130 @@ public class CmpdRegAppSetting {
     private String comments;
 
     private boolean ignored;
-       
+
     @Temporal(TemporalType.TIMESTAMP)
     @DateTimeFormat(style = "MM")
     private Date recordedDate;
-    
-    
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static CmpdRegAppSetting fromJsonToCmpdRegAppSetting(String json) {
+    public static CmpdRegAppSetting fromJsonToCmpdRegAppSetting(String json) {
         return new JSONDeserializer<CmpdRegAppSetting>()
-        .use(null, CmpdRegAppSetting.class).deserialize(json);
+                .use(null, CmpdRegAppSetting.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<CmpdRegAppSetting> collection) {
+    public static String toJsonArray(Collection<CmpdRegAppSetting> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<CmpdRegAppSetting> collection, String[] fields) {
+    public static String toJsonArray(Collection<CmpdRegAppSetting> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<CmpdRegAppSetting> fromJsonArrayToCmpdRegAppSettings(String json) {
+    public static Collection<CmpdRegAppSetting> fromJsonArrayToCmpdRegAppSettings(String json) {
         return new JSONDeserializer<List<CmpdRegAppSetting>>()
-        .use("values", CmpdRegAppSetting.class).deserialize(json);
+                .use("values", CmpdRegAppSetting.class).deserialize(json);
     }
 
-	public String getPropName() {
+    public String getPropName() {
         return this.propName;
     }
 
-	public void setPropName(String propName) {
+    public void setPropName(String propName) {
         this.propName = propName;
     }
 
-	public String getPropValue() {
+    public String getPropValue() {
         return this.propValue;
     }
 
-	public void setPropValue(String propValue) {
+    public void setPropValue(String propValue) {
         this.propValue = propValue;
     }
 
-	public String getComments() {
+    public String getComments() {
         return this.comments;
     }
 
-	public void setComments(String comments) {
+    public void setComments(String comments) {
         this.comments = comments;
     }
 
-	public boolean isIgnored() {
+    public boolean isIgnored() {
         return this.ignored;
     }
 
-	public void setIgnored(boolean ignored) {
+    public void setIgnored(boolean ignored) {
         this.ignored = ignored;
     }
 
-	public Date getRecordedDate() {
+    public Date getRecordedDate() {
         return this.recordedDate;
     }
 
-	public void setRecordedDate(Date recordedDate) {
+    public void setRecordedDate(Date recordedDate) {
         this.recordedDate = recordedDate;
     }
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("propName", "propValue", "comments", "ignored", "recordedDate");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("propName", "propValue",
+            "comments", "ignored", "recordedDate");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new CmpdRegAppSetting().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countCmpdRegAppSettings() {
+    public static long countCmpdRegAppSettings() {
         return entityManager().createQuery("SELECT COUNT(o) FROM CmpdRegAppSetting o", Long.class).getSingleResult();
     }
 
-	public static List<CmpdRegAppSetting> findAllCmpdRegAppSettings() {
-        return entityManager().createQuery("SELECT o FROM CmpdRegAppSetting o", CmpdRegAppSetting.class).getResultList();
+    public static List<CmpdRegAppSetting> findAllCmpdRegAppSettings() {
+        return entityManager().createQuery("SELECT o FROM CmpdRegAppSetting o", CmpdRegAppSetting.class)
+                .getResultList();
     }
 
-	public static List<CmpdRegAppSetting> findAllCmpdRegAppSettings(String sortFieldName, String sortOrder) {
+    public static List<CmpdRegAppSetting> findAllCmpdRegAppSettings(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM CmpdRegAppSetting o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -173,16 +174,19 @@ public static List<CmpdRegAppSetting> findAllCmpdRegAppSettings(String sortField
         return entityManager().createQuery(jpaQuery, CmpdRegAppSetting.class).getResultList();
     }
 
-	public static CmpdRegAppSetting findCmpdRegAppSetting(Long id) {
-        if (id == null) return null;
+    public static CmpdRegAppSetting findCmpdRegAppSetting(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(CmpdRegAppSetting.class, id);
     }
 
-	public static List<CmpdRegAppSetting> findCmpdRegAppSettingEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM CmpdRegAppSetting o", CmpdRegAppSetting.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<CmpdRegAppSetting> findCmpdRegAppSettingEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM CmpdRegAppSetting o", CmpdRegAppSetting.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<CmpdRegAppSetting> findCmpdRegAppSettingEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<CmpdRegAppSetting> findCmpdRegAppSettingEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM CmpdRegAppSetting o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -190,18 +194,21 @@ public static List<CmpdRegAppSetting> findCmpdRegAppSettingEntries(int firstResu
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, CmpdRegAppSetting.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, CmpdRegAppSetting.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -210,27 +217,30 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public CmpdRegAppSetting merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         CmpdRegAppSetting merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeKind.java b/src/main/java/com/labsynch/labseer/domain/CodeKind.java
index bc62b1f41..3d41b7286 100755
--- a/src/main/java/com/labsynch/labseer/domain/CodeKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/CodeKind.java
@@ -33,7 +33,7 @@
 
 public class CodeKind {
 
-	private static final Logger logger = LoggerFactory.getLogger(CodeKind.class);
+    private static final Logger logger = LoggerFactory.getLogger(CodeKind.class);
 
     @NotNull
     @ManyToOne
@@ -79,7 +79,9 @@ public void setVersion(Integer version) {
 
     public static final EntityManager entityManager() {
         EntityManager em = new CodeKind().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
@@ -92,25 +94,30 @@ public static List<com.labsynch.labseer.domain.CodeKind> findAllCodeKinds() {
     }
 
     public static com.labsynch.labseer.domain.CodeKind findCodeKind(Long id) {
-        if (id == null) return null;
+        if (id == null)
+            return null;
         return entityManager().find(CodeKind.class, id);
     }
 
     public static List<com.labsynch.labseer.domain.CodeKind> findCodeKindEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM CodeKind o", CodeKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery("SELECT o FROM CodeKind o", CodeKind.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
     @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.lsType = CodeType.findCodeType(this.getLsType().getId());
-        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_').append(this.getKindName()).toString();
+        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_')
+                .append(this.getKindName()).toString();
         this.entityManager.persist(this);
     }
 
     @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -121,51 +128,56 @@ public void remove() {
 
     @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
     @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
     @Transactional
     public com.labsynch.labseer.domain.CodeKind merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_').append(this.getKindName()).toString();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
+        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_')
+                .append(this.getKindName()).toString();
         CodeKind merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public static CodeKind getOrCreate(CodeType codeType, String kindName) {
-		
-		CodeKind codeKind = null;
-		List<CodeKind> codeKinds = CodeKind.findCodeKindsByKindNameEqualsAndLsType(kindName, codeType).getResultList();
-		
-		if (codeKinds.size() == 0){
-			codeKind = new CodeKind();
-			codeKind.setKindName(kindName);
-			codeKind.setLsType(codeType);
-			codeKind.persist();
-		} else if (codeKinds.size() == 1){
-			codeKind = codeKinds.get(0);
-		} else if (codeKinds.size() > 1){
-			logger.error("ERROR: multiple code kinds with the same name and type");
-		}
-		
-		return codeKind;
-	}
-
-	public String toString() {
+    public static CodeKind getOrCreate(CodeType codeType, String kindName) {
+
+        CodeKind codeKind = null;
+        List<CodeKind> codeKinds = CodeKind.findCodeKindsByKindNameEqualsAndLsType(kindName, codeType).getResultList();
+
+        if (codeKinds.size() == 0) {
+            codeKind = new CodeKind();
+            codeKind.setKindName(kindName);
+            codeKind.setLsType(codeType);
+            codeKind.persist();
+        } else if (codeKinds.size() == 1) {
+            codeKind = codeKinds.get(0);
+        } else if (codeKinds.size() > 1) {
+            logger.error("ERROR: multiple code kinds with the same name and type");
+        }
+
+        return codeKind;
+    }
+
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType",
+            "kindName", "lsTypeAndKind", "id", "version", "entityManager");
 
-	public static List<CodeKind> findAllCodeKinds(String sortFieldName, String sortOrder) {
+    public static List<CodeKind> findAllCodeKinds(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM CodeKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -176,7 +188,8 @@ public static List<CodeKind> findAllCodeKinds(String sortFieldName, String sortO
         return entityManager().createQuery(jpaQuery, CodeKind.class).getResultList();
     }
 
-	public static List<CodeKind> findCodeKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<CodeKind> findCodeKindEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM CodeKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -184,104 +197,118 @@ public static List<CodeKind> findCodeKindEntries(int firstResult, int maxResults
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, CodeKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, CodeKind.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static CodeKind fromJsonToCodeKind(String json) {
+    public static CodeKind fromJsonToCodeKind(String json) {
         return new JSONDeserializer<CodeKind>()
-        .use(null, CodeKind.class).deserialize(json);
+                .use(null, CodeKind.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<CodeKind> collection) {
+    public static String toJsonArray(Collection<CodeKind> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<CodeKind> collection, String[] fields) {
+    public static String toJsonArray(Collection<CodeKind> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<CodeKind> fromJsonArrayToCodeKinds(String json) {
+    public static Collection<CodeKind> fromJsonArrayToCodeKinds(String json) {
         return new JSONDeserializer<List<CodeKind>>()
-        .use("values", CodeKind.class).deserialize(json);
+                .use("values", CodeKind.class).deserialize(json);
     }
 
-	public CodeType getLsType() {
+    public CodeType getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(CodeType lsType) {
+    public void setLsType(CodeType lsType) {
         this.lsType = lsType;
     }
 
-	public String getKindName() {
+    public String getKindName() {
         return this.kindName;
     }
 
-	public void setKindName(String kindName) {
+    public void setKindName(String kindName) {
         this.kindName = kindName;
     }
 
-	public String getLsTypeAndKind() {
+    public String getLsTypeAndKind() {
         return this.lsTypeAndKind;
     }
 
-	public void setLsTypeAndKind(String lsTypeAndKind) {
+    public void setLsTypeAndKind(String lsTypeAndKind) {
         this.lsTypeAndKind = lsTypeAndKind;
     }
 
-	public static Long countFindCodeKindsByKindNameEqualsAndLsType(String kindName, CodeType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static Long countFindCodeKindsByKindNameEqualsAndLsType(String kindName, CodeType lsType) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = CodeKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM CodeKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM CodeKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
         q.setParameter("kindName", kindName);
         q.setParameter("lsType", lsType);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindCodeKindsByLsType(CodeType lsType) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static Long countFindCodeKindsByLsType(CodeType lsType) {
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = CodeKind.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM CodeKind AS o WHERE o.lsType = :lsType", Long.class);
         q.setParameter("lsType", lsType);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindCodeKindsByLsTypeAndKindEquals(String lsTypeAndKind) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+    public static Long countFindCodeKindsByLsTypeAndKindEquals(String lsTypeAndKind) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = CodeKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM CodeKind AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM CodeKind AS o WHERE o.lsTypeAndKind = :lsTypeAndKind",
+                Long.class);
         q.setParameter("lsTypeAndKind", lsTypeAndKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<CodeKind> findCodeKindsByKindNameEqualsAndLsType(String kindName, CodeType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<CodeKind> findCodeKindsByKindNameEqualsAndLsType(String kindName, CodeType lsType) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = CodeKind.entityManager();
-        TypedQuery<CodeKind> q = em.createQuery("SELECT o FROM CodeKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", CodeKind.class);
+        TypedQuery<CodeKind> q = em.createQuery(
+                "SELECT o FROM CodeKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", CodeKind.class);
         q.setParameter("kindName", kindName);
         q.setParameter("lsType", lsType);
         return q;
     }
 
-	public static TypedQuery<CodeKind> findCodeKindsByKindNameEqualsAndLsType(String kindName, CodeType lsType, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<CodeKind> findCodeKindsByKindNameEqualsAndLsType(String kindName, CodeType lsType,
+            String sortFieldName, String sortOrder) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = CodeKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM CodeKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM CodeKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -294,16 +321,18 @@ public static TypedQuery<CodeKind> findCodeKindsByKindNameEqualsAndLsType(String
         return q;
     }
 
-	public static TypedQuery<CodeKind> findCodeKindsByLsType(CodeType lsType) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<CodeKind> findCodeKindsByLsType(CodeType lsType) {
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = CodeKind.entityManager();
         TypedQuery<CodeKind> q = em.createQuery("SELECT o FROM CodeKind AS o WHERE o.lsType = :lsType", CodeKind.class);
         q.setParameter("lsType", lsType);
         return q;
     }
 
-	public static TypedQuery<CodeKind> findCodeKindsByLsType(CodeType lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<CodeKind> findCodeKindsByLsType(CodeType lsType, String sortFieldName, String sortOrder) {
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = CodeKind.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM CodeKind AS o WHERE o.lsType = :lsType");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -317,18 +346,23 @@ public static TypedQuery<CodeKind> findCodeKindsByLsType(CodeType lsType, String
         return q;
     }
 
-	public static TypedQuery<CodeKind> findCodeKindsByLsTypeAndKindEquals(String lsTypeAndKind) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+    public static TypedQuery<CodeKind> findCodeKindsByLsTypeAndKindEquals(String lsTypeAndKind) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = CodeKind.entityManager();
-        TypedQuery<CodeKind> q = em.createQuery("SELECT o FROM CodeKind AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", CodeKind.class);
+        TypedQuery<CodeKind> q = em.createQuery("SELECT o FROM CodeKind AS o WHERE o.lsTypeAndKind = :lsTypeAndKind",
+                CodeKind.class);
         q.setParameter("lsTypeAndKind", lsTypeAndKind);
         return q;
     }
 
-	public static TypedQuery<CodeKind> findCodeKindsByLsTypeAndKindEquals(String lsTypeAndKind, String sortFieldName, String sortOrder) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+    public static TypedQuery<CodeKind> findCodeKindsByLsTypeAndKindEquals(String lsTypeAndKind, String sortFieldName,
+            String sortOrder) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = CodeKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM CodeKind AS o WHERE o.lsTypeAndKind = :lsTypeAndKind");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM CodeKind AS o WHERE o.lsTypeAndKind = :lsTypeAndKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeOrigin.java b/src/main/java/com/labsynch/labseer/domain/CodeOrigin.java
index 8851d54ca..e1dd82777 100644
--- a/src/main/java/com/labsynch/labseer/domain/CodeOrigin.java
+++ b/src/main/java/com/labsynch/labseer/domain/CodeOrigin.java
@@ -31,112 +31,112 @@
 
 public class CodeOrigin {
 
-	private static final Logger logger = LoggerFactory.getLogger(CodeOrigin.class);
-
-	
-	@NotNull
-	@Column(unique = true)
-	@Size(max = 256)
-	private String name;
-
-	public static CodeOrigin getOrCreate(String name) {
-
-		CodeOrigin codeOrigin = null;
-		List<CodeOrigin> codeOrigins = CodeOrigin.findCodeOriginsByNameEquals(name).getResultList();
-		if (codeOrigins.size() == 0){
-			codeOrigin = new CodeOrigin();
-			codeOrigin.setName(name);
-			codeOrigin.persist();
-		} else if (codeOrigins.size() == 1){
-			codeOrigin = codeOrigins.get(0);
-		} else if (codeOrigins.size() > 1){
-			logger.error("ERROR: multiple code types with the same name");
-		}
-		
-
-		return codeOrigin;
-	}
-
-	public String toJson() {
+    private static final Logger logger = LoggerFactory.getLogger(CodeOrigin.class);
+
+    @NotNull
+    @Column(unique = true)
+    @Size(max = 256)
+    private String name;
+
+    public static CodeOrigin getOrCreate(String name) {
+
+        CodeOrigin codeOrigin = null;
+        List<CodeOrigin> codeOrigins = CodeOrigin.findCodeOriginsByNameEquals(name).getResultList();
+        if (codeOrigins.size() == 0) {
+            codeOrigin = new CodeOrigin();
+            codeOrigin.setName(name);
+            codeOrigin.persist();
+        } else if (codeOrigins.size() == 1) {
+            codeOrigin = codeOrigins.get(0);
+        } else if (codeOrigins.size() > 1) {
+            logger.error("ERROR: multiple code types with the same name");
+        }
+
+        return codeOrigin;
+    }
+
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static CodeOrigin fromJsonToCodeOrigin(String json) {
+    public static CodeOrigin fromJsonToCodeOrigin(String json) {
         return new JSONDeserializer<CodeOrigin>()
-        .use(null, CodeOrigin.class).deserialize(json);
+                .use(null, CodeOrigin.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<CodeOrigin> collection) {
+    public static String toJsonArray(Collection<CodeOrigin> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<CodeOrigin> collection, String[] fields) {
+    public static String toJsonArray(Collection<CodeOrigin> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<CodeOrigin> fromJsonArrayToCodeOrigins(String json) {
+    public static Collection<CodeOrigin> fromJsonArrayToCodeOrigins(String json) {
         return new JSONDeserializer<List<CodeOrigin>>()
-        .use("values", CodeOrigin.class).deserialize(json);
+                .use("values", CodeOrigin.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	@Id
+    @Id
     @SequenceGenerator(name = "codeOriginGen", sequenceName = "CODE_ORIGIN_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "codeOriginGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "name");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "name");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new CodeOrigin().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countCodeOrigins() {
+    public static long countCodeOrigins() {
         return entityManager().createQuery("SELECT COUNT(o) FROM CodeOrigin o", Long.class).getSingleResult();
     }
 
-	public static List<CodeOrigin> findAllCodeOrigins() {
+    public static List<CodeOrigin> findAllCodeOrigins() {
         return entityManager().createQuery("SELECT o FROM CodeOrigin o", CodeOrigin.class).getResultList();
     }
 
-	public static List<CodeOrigin> findAllCodeOrigins(String sortFieldName, String sortOrder) {
+    public static List<CodeOrigin> findAllCodeOrigins(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM CodeOrigin o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -147,16 +147,19 @@ public static List<CodeOrigin> findAllCodeOrigins(String sortFieldName, String s
         return entityManager().createQuery(jpaQuery, CodeOrigin.class).getResultList();
     }
 
-	public static CodeOrigin findCodeOrigin(Long id) {
-        if (id == null) return null;
+    public static CodeOrigin findCodeOrigin(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(CodeOrigin.class, id);
     }
 
-	public static List<CodeOrigin> findCodeOriginEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM CodeOrigin o", CodeOrigin.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<CodeOrigin> findCodeOriginEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM CodeOrigin o", CodeOrigin.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<CodeOrigin> findCodeOriginEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<CodeOrigin> findCodeOriginEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM CodeOrigin o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -164,18 +167,21 @@ public static List<CodeOrigin> findCodeOriginEntries(int firstResult, int maxRes
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, CodeOrigin.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, CodeOrigin.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -184,52 +190,60 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public CodeOrigin merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         CodeOrigin merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String getName() {
+    public String getName() {
         return this.name;
     }
 
-	public void setName(String name) {
+    public void setName(String name) {
         this.name = name;
     }
 
-	public static Long countFindCodeOriginsByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static Long countFindCodeOriginsByNameEquals(String name) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = CodeOrigin.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM CodeOrigin AS o WHERE o.name = :name", Long.class);
         q.setParameter("name", name);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<CodeOrigin> findCodeOriginsByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<CodeOrigin> findCodeOriginsByNameEquals(String name) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = CodeOrigin.entityManager();
-        TypedQuery<CodeOrigin> q = em.createQuery("SELECT o FROM CodeOrigin AS o WHERE o.name = :name", CodeOrigin.class);
+        TypedQuery<CodeOrigin> q = em.createQuery("SELECT o FROM CodeOrigin AS o WHERE o.name = :name",
+                CodeOrigin.class);
         q.setParameter("name", name);
         return q;
     }
 
-	public static TypedQuery<CodeOrigin> findCodeOriginsByNameEquals(String name, String sortFieldName, String sortOrder) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<CodeOrigin> findCodeOriginsByNameEquals(String name, String sortFieldName,
+            String sortOrder) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = CodeOrigin.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM CodeOrigin AS o WHERE o.name = :name");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
diff --git a/src/main/java/com/labsynch/labseer/domain/CodeType.java b/src/main/java/com/labsynch/labseer/domain/CodeType.java
index 45c70d90a..c7cb3d988 100755
--- a/src/main/java/com/labsynch/labseer/domain/CodeType.java
+++ b/src/main/java/com/labsynch/labseer/domain/CodeType.java
@@ -31,106 +31,109 @@
 
 public class CodeType {
 
-	private static final Logger logger = LoggerFactory.getLogger(CodeType.class);
-
-	
-	@NotNull
-	@Column(unique = true)
-	@Size(max = 128)
-	private String typeName;
-
-	public static CodeType getOrCreate(String name) {
-
-		CodeType codeType = null;
-		List<CodeType> codeTypes = CodeType.findCodeTypesByTypeNameEquals(name).getResultList();
-		if (codeTypes.size() == 0){
-			codeType = new CodeType();
-			codeType.setTypeName(name);
-			codeType.persist();
-		} else if (codeTypes.size() == 1){
-			codeType = codeTypes.get(0);
-		} else if (codeTypes.size() > 1){
-			logger.error("ERROR: multiple code types with the same name");
-		}
-		
-
-		return codeType;
-	}
-
-	@Id
+    private static final Logger logger = LoggerFactory.getLogger(CodeType.class);
+
+    @NotNull
+    @Column(unique = true)
+    @Size(max = 128)
+    private String typeName;
+
+    public static CodeType getOrCreate(String name) {
+
+        CodeType codeType = null;
+        List<CodeType> codeTypes = CodeType.findCodeTypesByTypeNameEquals(name).getResultList();
+        if (codeTypes.size() == 0) {
+            codeType = new CodeType();
+            codeType.setTypeName(name);
+            codeType.persist();
+        } else if (codeTypes.size() == 1) {
+            codeType = codeTypes.get(0);
+        } else if (codeTypes.size() > 1) {
+            logger.error("ERROR: multiple code types with the same name");
+        }
+
+        return codeType;
+    }
+
+    @Id
     @SequenceGenerator(name = "codeTypeGen", sequenceName = "CODE_TYPE_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "codeTypeGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static CodeType fromJsonToCodeType(String json) {
+    public static CodeType fromJsonToCodeType(String json) {
         return new JSONDeserializer<CodeType>()
-        .use(null, CodeType.class).deserialize(json);
+                .use(null, CodeType.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<CodeType> collection) {
+    public static String toJsonArray(Collection<CodeType> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<CodeType> collection, String[] fields) {
+    public static String toJsonArray(Collection<CodeType> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<CodeType> fromJsonArrayToCodeTypes(String json) {
+    public static Collection<CodeType> fromJsonArrayToCodeTypes(String json) {
         return new JSONDeserializer<List<CodeType>>()
-        .use("values", CodeType.class).deserialize(json);
+                .use("values", CodeType.class).deserialize(json);
     }
 
-	public static Long countFindCodeTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static Long countFindCodeTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = CodeType.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM CodeType AS o WHERE o.typeName = :typeName", Long.class);
         q.setParameter("typeName", typeName);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<CodeType> findCodeTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static TypedQuery<CodeType> findCodeTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = CodeType.entityManager();
-        TypedQuery<CodeType> q = em.createQuery("SELECT o FROM CodeType AS o WHERE o.typeName = :typeName", CodeType.class);
+        TypedQuery<CodeType> q = em.createQuery("SELECT o FROM CodeType AS o WHERE o.typeName = :typeName",
+                CodeType.class);
         q.setParameter("typeName", typeName);
         return q;
     }
 
-	public static TypedQuery<CodeType> findCodeTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static TypedQuery<CodeType> findCodeTypesByTypeNameEquals(String typeName, String sortFieldName,
+            String sortOrder) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = CodeType.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM CodeType AS o WHERE o.typeName = :typeName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -144,34 +147,37 @@ public static TypedQuery<CodeType> findCodeTypesByTypeNameEquals(String typeName
         return q;
     }
 
-	public String getTypeName() {
+    public String getTypeName() {
         return this.typeName;
     }
 
-	public void setTypeName(String typeName) {
+    public void setTypeName(String typeName) {
         this.typeName = typeName;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "typeName", "id", "version");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "typeName", "id",
+            "version");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new CodeType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countCodeTypes() {
+    public static long countCodeTypes() {
         return entityManager().createQuery("SELECT COUNT(o) FROM CodeType o", Long.class).getSingleResult();
     }
 
-	public static List<CodeType> findAllCodeTypes() {
+    public static List<CodeType> findAllCodeTypes() {
         return entityManager().createQuery("SELECT o FROM CodeType o", CodeType.class).getResultList();
     }
 
-	public static List<CodeType> findAllCodeTypes(String sortFieldName, String sortOrder) {
+    public static List<CodeType> findAllCodeTypes(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM CodeType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -182,16 +188,19 @@ public static List<CodeType> findAllCodeTypes(String sortFieldName, String sortO
         return entityManager().createQuery(jpaQuery, CodeType.class).getResultList();
     }
 
-	public static CodeType findCodeType(Long id) {
-        if (id == null) return null;
+    public static CodeType findCodeType(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(CodeType.class, id);
     }
 
-	public static List<CodeType> findCodeTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM CodeType o", CodeType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<CodeType> findCodeTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM CodeType o", CodeType.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<CodeType> findCodeTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<CodeType> findCodeTypeEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM CodeType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -199,18 +208,21 @@ public static List<CodeType> findCodeTypeEntries(int firstResult, int maxResults
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, CodeType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, CodeType.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -219,27 +231,30 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public CodeType merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         CodeType merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/Compound.java b/src/main/java/com/labsynch/labseer/domain/Compound.java
index fa9e7df03..31af12c6e 100644
--- a/src/main/java/com/labsynch/labseer/domain/Compound.java
+++ b/src/main/java/com/labsynch/labseer/domain/Compound.java
@@ -1,4 +1,5 @@
 package com.labsynch.labseer.domain;
+
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
@@ -55,29 +56,31 @@ public class Compound {
 
     private Boolean deleted;
 
-	public static Long countFindCompoundsByCdId(int CdId) {
+    public static Long countFindCompoundsByCdId(int CdId) {
         EntityManager em = Compound.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Compound AS o WHERE o.CdId = :CdId", Long.class);
         q.setParameter("CdId", CdId);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindCompoundsByExternal_idEquals(String external_id) {
-        if (external_id == null || external_id.length() == 0) throw new IllegalArgumentException("The external_id argument is required");
+    public static Long countFindCompoundsByExternal_idEquals(String external_id) {
+        if (external_id == null || external_id.length() == 0)
+            throw new IllegalArgumentException("The external_id argument is required");
         EntityManager em = Compound.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Compound AS o WHERE o.external_id = :external_id", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Compound AS o WHERE o.external_id = :external_id",
+                Long.class);
         q.setParameter("external_id", external_id);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<Compound> findCompoundsByCdId(int CdId) {
+    public static TypedQuery<Compound> findCompoundsByCdId(int CdId) {
         EntityManager em = Compound.entityManager();
         TypedQuery<Compound> q = em.createQuery("SELECT o FROM Compound AS o WHERE o.CdId = :CdId", Compound.class);
         q.setParameter("CdId", CdId);
         return q;
     }
 
-	public static TypedQuery<Compound> findCompoundsByCdId(int CdId, String sortFieldName, String sortOrder) {
+    public static TypedQuery<Compound> findCompoundsByCdId(int CdId, String sortFieldName, String sortOrder) {
         EntityManager em = Compound.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Compound AS o WHERE o.CdId = :CdId");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -91,18 +94,23 @@ public static TypedQuery<Compound> findCompoundsByCdId(int CdId, String sortFiel
         return q;
     }
 
-	public static TypedQuery<Compound> findCompoundsByExternal_idEquals(String external_id) {
-        if (external_id == null || external_id.length() == 0) throw new IllegalArgumentException("The external_id argument is required");
+    public static TypedQuery<Compound> findCompoundsByExternal_idEquals(String external_id) {
+        if (external_id == null || external_id.length() == 0)
+            throw new IllegalArgumentException("The external_id argument is required");
         EntityManager em = Compound.entityManager();
-        TypedQuery<Compound> q = em.createQuery("SELECT o FROM Compound AS o WHERE o.external_id = :external_id", Compound.class);
+        TypedQuery<Compound> q = em.createQuery("SELECT o FROM Compound AS o WHERE o.external_id = :external_id",
+                Compound.class);
         q.setParameter("external_id", external_id);
         return q;
     }
 
-	public static TypedQuery<Compound> findCompoundsByExternal_idEquals(String external_id, String sortFieldName, String sortOrder) {
-        if (external_id == null || external_id.length() == 0) throw new IllegalArgumentException("The external_id argument is required");
+    public static TypedQuery<Compound> findCompoundsByExternal_idEquals(String external_id, String sortFieldName,
+            String sortOrder) {
+        if (external_id == null || external_id.length() == 0)
+            throw new IllegalArgumentException("The external_id argument is required");
         EntityManager em = Compound.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Compound AS o WHERE o.external_id = :external_id");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Compound AS o WHERE o.external_id = :external_id");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -114,26 +122,29 @@ public static TypedQuery<Compound> findCompoundsByExternal_idEquals(String exter
         return q;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "corpName", "external_id", "CdId", "createdDate", "modifiedDate", "ignored", "deleted");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "corpName",
+            "external_id", "CdId", "createdDate", "modifiedDate", "ignored", "deleted");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new Compound().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countCompounds() {
+    public static long countCompounds() {
         return entityManager().createQuery("SELECT COUNT(o) FROM Compound o", Long.class).getSingleResult();
     }
 
-	public static List<Compound> findAllCompounds() {
+    public static List<Compound> findAllCompounds() {
         return entityManager().createQuery("SELECT o FROM Compound o", Compound.class).getResultList();
     }
 
-	public static List<Compound> findAllCompounds(String sortFieldName, String sortOrder) {
+    public static List<Compound> findAllCompounds(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM Compound o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -144,16 +155,19 @@ public static List<Compound> findAllCompounds(String sortFieldName, String sortO
         return entityManager().createQuery(jpaQuery, Compound.class).getResultList();
     }
 
-	public static Compound findCompound(Long id) {
-        if (id == null) return null;
+    public static Compound findCompound(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(Compound.class, id);
     }
 
-	public static List<Compound> findCompoundEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM Compound o", Compound.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<Compound> findCompoundEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM Compound o", Compound.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<Compound> findCompoundEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<Compound> findCompoundEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM Compound o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -161,18 +175,21 @@ public static List<Compound> findCompoundEntries(int firstResult, int maxResults
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, Compound.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, Compound.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -181,138 +198,141 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public Compound merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         Compound merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String getCorpName() {
+    public String getCorpName() {
         return this.corpName;
     }
 
-	public void setCorpName(String corpName) {
+    public void setCorpName(String corpName) {
         this.corpName = corpName;
     }
 
-	public String getExternal_id() {
+    public String getExternal_id() {
         return this.external_id;
     }
 
-	public void setExternal_id(String external_id) {
+    public void setExternal_id(String external_id) {
         this.external_id = external_id;
     }
 
-	public int getCdId() {
+    public int getCdId() {
         return this.CdId;
     }
 
-	public void setCdId(int CdId) {
+    public void setCdId(int CdId) {
         this.CdId = CdId;
     }
 
-	public Date getCreatedDate() {
+    public Date getCreatedDate() {
         return this.createdDate;
     }
 
-	public void setCreatedDate(Date createdDate) {
+    public void setCreatedDate(Date createdDate) {
         this.createdDate = createdDate;
     }
 
-	public Date getModifiedDate() {
+    public Date getModifiedDate() {
         return this.modifiedDate;
     }
 
-	public void setModifiedDate(Date modifiedDate) {
+    public void setModifiedDate(Date modifiedDate) {
         this.modifiedDate = modifiedDate;
     }
 
-	public Boolean getIgnored() {
+    public Boolean getIgnored() {
         return this.ignored;
     }
 
-	public void setIgnored(Boolean ignored) {
+    public void setIgnored(Boolean ignored) {
         this.ignored = ignored;
     }
 
-	public Boolean getDeleted() {
+    public Boolean getDeleted() {
         return this.deleted;
     }
 
-	public void setDeleted(Boolean deleted) {
+    public void setDeleted(Boolean deleted) {
         this.deleted = deleted;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static Compound fromJsonToCompound(String json) {
+    public static Compound fromJsonToCompound(String json) {
         return new JSONDeserializer<Compound>()
-        .use(null, Compound.class).deserialize(json);
+                .use(null, Compound.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<Compound> collection) {
+    public static String toJsonArray(Collection<Compound> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<Compound> collection, String[] fields) {
+    public static String toJsonArray(Collection<Compound> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<Compound> fromJsonArrayToCompounds(String json) {
+    public static Collection<Compound> fromJsonArrayToCompounds(String json) {
         return new JSONDeserializer<List<Compound>>()
-        .use("values", Compound.class).deserialize(json);
+                .use("values", Compound.class).deserialize(json);
     }
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/CompoundType.java b/src/main/java/com/labsynch/labseer/domain/CompoundType.java
index 467d0a7d4..740749061 100644
--- a/src/main/java/com/labsynch/labseer/domain/CompoundType.java
+++ b/src/main/java/com/labsynch/labseer/domain/CompoundType.java
@@ -27,101 +27,105 @@
 
 public class CompoundType {
 
-	@NotNull
+    @NotNull
     private String code;
-    
+
     @NotNull
     private String name;
-    
+
     private Integer displayOrder;
-    
+
     private String comment;
-    
 
-	public String getCode() {
+    public String getCode() {
         return this.code;
     }
 
-	public void setCode(String code) {
+    public void setCode(String code) {
         this.code = code;
     }
 
-	public String getName() {
+    public String getName() {
         return this.name;
     }
 
-	public void setName(String name) {
+    public void setName(String name) {
         this.name = name;
     }
 
-	public Integer getDisplayOrder() {
+    public Integer getDisplayOrder() {
         return this.displayOrder;
     }
 
-	public void setDisplayOrder(Integer displayOrder) {
+    public void setDisplayOrder(Integer displayOrder) {
         this.displayOrder = displayOrder;
     }
 
-	public String getComment() {
+    public String getComment() {
         return this.comment;
     }
 
-	public void setComment(String comment) {
+    public void setComment(String comment) {
         this.comment = comment;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static CompoundType fromJsonToCompoundType(String json) {
+    public static CompoundType fromJsonToCompoundType(String json) {
         return new JSONDeserializer<CompoundType>()
-        .use(null, CompoundType.class).deserialize(json);
+                .use(null, CompoundType.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<CompoundType> collection) {
+    public static String toJsonArray(Collection<CompoundType> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<CompoundType> collection, String[] fields) {
+    public static String toJsonArray(Collection<CompoundType> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<CompoundType> fromJsonArrayToCompoundTypes(String json) {
+    public static Collection<CompoundType> fromJsonArrayToCompoundTypes(String json) {
         return new JSONDeserializer<List<CompoundType>>()
-        .use("values", CompoundType.class).deserialize(json);
+                .use("values", CompoundType.class).deserialize(json);
     }
 
-	public static Long countFindCompoundTypesByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static Long countFindCompoundTypesByCodeEquals(String code) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = CompoundType.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM CompoundType AS o WHERE o.code = :code", Long.class);
         q.setParameter("code", code);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<CompoundType> findCompoundTypesByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static TypedQuery<CompoundType> findCompoundTypesByCodeEquals(String code) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = CompoundType.entityManager();
-        TypedQuery<CompoundType> q = em.createQuery("SELECT o FROM CompoundType AS o WHERE o.code = :code", CompoundType.class);
+        TypedQuery<CompoundType> q = em.createQuery("SELECT o FROM CompoundType AS o WHERE o.code = :code",
+                CompoundType.class);
         q.setParameter("code", code);
         return q;
     }
 
-	public static TypedQuery<CompoundType> findCompoundTypesByCodeEquals(String code, String sortFieldName, String sortOrder) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static TypedQuery<CompoundType> findCompoundTypesByCodeEquals(String code, String sortFieldName,
+            String sortOrder) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = CompoundType.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM CompoundType AS o WHERE o.code = :code");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -135,26 +139,29 @@ public static TypedQuery<CompoundType> findCompoundTypesByCodeEquals(String code
         return q;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("code", "name", "displayOrder", "comment");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("code", "name",
+            "displayOrder", "comment");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new CompoundType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countCompoundTypes() {
+    public static long countCompoundTypes() {
         return entityManager().createQuery("SELECT COUNT(o) FROM CompoundType o", Long.class).getSingleResult();
     }
 
-	public static List<CompoundType> findAllCompoundTypes() {
+    public static List<CompoundType> findAllCompoundTypes() {
         return entityManager().createQuery("SELECT o FROM CompoundType o", CompoundType.class).getResultList();
     }
 
-	public static List<CompoundType> findAllCompoundTypes(String sortFieldName, String sortOrder) {
+    public static List<CompoundType> findAllCompoundTypes(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM CompoundType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -165,16 +172,19 @@ public static List<CompoundType> findAllCompoundTypes(String sortFieldName, Stri
         return entityManager().createQuery(jpaQuery, CompoundType.class).getResultList();
     }
 
-	public static CompoundType findCompoundType(Long id) {
-        if (id == null) return null;
+    public static CompoundType findCompoundType(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(CompoundType.class, id);
     }
 
-	public static List<CompoundType> findCompoundTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM CompoundType o", CompoundType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<CompoundType> findCompoundTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM CompoundType o", CompoundType.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<CompoundType> findCompoundTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<CompoundType> findCompoundTypeEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM CompoundType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -182,18 +192,21 @@ public static List<CompoundType> findCompoundTypeEntries(int firstResult, int ma
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, CompoundType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, CompoundType.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -202,48 +215,51 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public CompoundType merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         CompoundType merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/Container.java b/src/main/java/com/labsynch/labseer/domain/Container.java
index e72da74be..ee884ac56 100755
--- a/src/main/java/com/labsynch/labseer/domain/Container.java
+++ b/src/main/java/com/labsynch/labseer/domain/Container.java
@@ -32,32 +32,31 @@
 @Entity
 @Configurable
 
-@SqlResultSetMapping(name="ContainerLocationTreeDTOResult", classes = {
-		@ConstructorResult(targetClass = ContainerLocationTreeDTO.class,
-		columns = {@ColumnResult(name="code_name"), 
-				@ColumnResult(name="parent_code_name"), 
-				@ColumnResult(name="label_text"), 
-				@ColumnResult(name="code_tree"), 
-				@ColumnResult(name="label_tree"), 
-				@ColumnResult(name="lvl", type= Integer.class), 
-				@ColumnResult(name="root_code_name"), 
-				@ColumnResult(name="code_name_bread_crumb"),	
-				@ColumnResult(name="label_text_bread_crumb"),
-				@ColumnResult(name="ls_type"),
-				@ColumnResult(name="ls_kind")
-		})})
+@SqlResultSetMapping(name = "ContainerLocationTreeDTOResult", classes = {
+		@ConstructorResult(targetClass = ContainerLocationTreeDTO.class, columns = { @ColumnResult(name = "code_name"),
+				@ColumnResult(name = "parent_code_name"),
+				@ColumnResult(name = "label_text"),
+				@ColumnResult(name = "code_tree"),
+				@ColumnResult(name = "label_tree"),
+				@ColumnResult(name = "lvl", type = Integer.class),
+				@ColumnResult(name = "root_code_name"),
+				@ColumnResult(name = "code_name_bread_crumb"),
+				@ColumnResult(name = "label_text_bread_crumb"),
+				@ColumnResult(name = "ls_type"),
+				@ColumnResult(name = "ls_kind")
+		}) })
 public class Container extends AbstractThing {
 
 	private Long locationId;
 	private Integer rowIndex;
 	private Integer columnIndex;
-	
+
 	public Container() {
-		
+
 	}
 
-	//constructor to instantiate a new Container from nested json objects
-	public Container (Container container){
+	// constructor to instantiate a new Container from nested json objects
+	public Container(Container container) {
 		this.setRecordedBy(container.getRecordedBy());
 		this.setRecordedDate(container.getRecordedDate());
 		this.setLsTransaction(container.getLsTransaction());
@@ -92,25 +91,25 @@ public static Container update(Container container) {
 
 	}
 
-	@OneToMany(cascade = CascadeType.ALL, mappedBy = "container", fetch =  FetchType.LAZY)
+	@OneToMany(cascade = CascadeType.ALL, mappedBy = "container", fetch = FetchType.LAZY)
 	private Set<ContainerLabel> lsLabels = new HashSet<ContainerLabel>();
 
-	@OneToMany(cascade = CascadeType.ALL, mappedBy = "container", fetch =  FetchType.LAZY)
+	@OneToMany(cascade = CascadeType.ALL, mappedBy = "container", fetch = FetchType.LAZY)
 	private Set<ContainerState> lsStates = new HashSet<ContainerState>();
 
-	@OneToMany(cascade = {}, mappedBy = "secondContainer", fetch =  FetchType.LAZY)
+	@OneToMany(cascade = {}, mappedBy = "secondContainer", fetch = FetchType.LAZY)
 	private Set<ItxContainerContainer> firstContainers = new HashSet<ItxContainerContainer>();
 
-	@OneToMany(cascade = {}, mappedBy = "firstContainer", fetch =  FetchType.LAZY)
+	@OneToMany(cascade = {}, mappedBy = "firstContainer", fetch = FetchType.LAZY)
 	private Set<ItxContainerContainer> secondContainers = new HashSet<ItxContainerContainer>();
 
-	@OneToMany(cascade = {}, mappedBy = "container", fetch =  FetchType.LAZY)
+	@OneToMany(cascade = {}, mappedBy = "container", fetch = FetchType.LAZY)
 	private Set<ItxSubjectContainer> subjects = new HashSet<ItxSubjectContainer>();
 
 	public String toJson() {
 		return new JSONSerializer().exclude("*.class")
 				.include("lsStates.lsValues", "lsLabels")
-				.transform(new ExcludeNulls(), void.class)       		
+				.transform(new ExcludeNulls(), void.class)
 				.serialize(this);
 	}
 
@@ -122,79 +121,84 @@ public String toJsonStub() {
 				.prettyPrint(true)
 				.serialize(this);
 	}
-	
+
 	@Transactional
-    public String toJsonWithNestedFull() {
-        return new JSONSerializer().exclude("*.class").include("lsTags", "lsLabels", "lsStates.lsValues", "firstContainers.firstContainer.lsStates.lsValues","firstContainers.firstContainer.lsLabels", "secondContainers.secondContainer.lsStates.lsValues","secondContainers.secondContainer.lsLabels","firstContainers.lsStates.lsValues","firstContainers.lsLabels","secondContainers.lsStates.lsValues","secondContainers.lsLabels").transform(new ExcludeNulls(), void.class).serialize(this);
-    }
-	
+	public String toJsonWithNestedFull() {
+		return new JSONSerializer().exclude("*.class")
+				.include("lsTags", "lsLabels", "lsStates.lsValues", "firstContainers.firstContainer.lsStates.lsValues",
+						"firstContainers.firstContainer.lsLabels", "secondContainers.secondContainer.lsStates.lsValues",
+						"secondContainers.secondContainer.lsLabels", "firstContainers.lsStates.lsValues",
+						"firstContainers.lsLabels", "secondContainers.lsStates.lsValues", "secondContainers.lsLabels")
+				.transform(new ExcludeNulls(), void.class).serialize(this);
+	}
+
 	public static Container fromJsonToContainer(String json) {
-		return new JSONDeserializer<Container>().
-				use(null, Container.class).
-				
+		return new JSONDeserializer<Container>().use(null, Container.class).
+
 				deserialize(json);
 	}
 
 	public static String toFullJsonArray(Collection<Container> collection) {
 		return new JSONSerializer()
-			.exclude("*.class")
-			.include("lsStates.lsValues", "lsLabels")
-			.transform(new ExcludeNulls(), void.class)
-			.serialize(collection);
+				.exclude("*.class")
+				.include("lsStates.lsValues", "lsLabels")
+				.transform(new ExcludeNulls(), void.class)
+				.serialize(collection);
 	}
-	
+
 	@Transactional
-    public static String toJsonArrayWithNestedFull(Collection<com.labsynch.labseer.domain.Container> collection) {
-        return new JSONSerializer().exclude("*.class").include("lsTags", "lsLabels", "lsStates.lsValues", "firstContainers.firstContainer.lsStates.lsValues","secondContainers.secondContainer.lsStates.lsValues","firstContainers.firstContainer.lsLabels","secondContainers.secondContainer.lsLabels","firstContainers.lsStates.lsValues","secondContainers.lsStates.lsValues","firstContainers.lsLabels","secondContainers.lsLabels").transform(new ExcludeNulls(), void.class).serialize(collection);
-    }
-	
+	public static String toJsonArrayWithNestedFull(Collection<com.labsynch.labseer.domain.Container> collection) {
+		return new JSONSerializer().exclude("*.class")
+				.include("lsTags", "lsLabels", "lsStates.lsValues", "firstContainers.firstContainer.lsStates.lsValues",
+						"secondContainers.secondContainer.lsStates.lsValues", "firstContainers.firstContainer.lsLabels",
+						"secondContainers.secondContainer.lsLabels", "firstContainers.lsStates.lsValues",
+						"secondContainers.lsStates.lsValues", "firstContainers.lsLabels", "secondContainers.lsLabels")
+				.transform(new ExcludeNulls(), void.class).serialize(collection);
+	}
+
 	@Transactional
 	public static String toJsonArrayWithNestedStubs(Collection<com.labsynch.labseer.domain.Container> collection) {
-        return new JSONSerializer()
-        		.exclude("*.class")
-        		.include("lsTags", "lsLabels", "lsStates.lsValues",
-        				"firstContainers.firstContainer.lsLabels","secondContainers.secondContainer.lsLabels")
-        		.transform(new ExcludeNulls(), void.class).serialize(collection);
+		return new JSONSerializer()
+				.exclude("*.class")
+				.include("lsTags", "lsLabels", "lsStates.lsValues",
+						"firstContainers.firstContainer.lsLabels", "secondContainers.secondContainer.lsLabels")
+				.transform(new ExcludeNulls(), void.class).serialize(collection);
 
 	}
-	
+
 	public static String toJsonArray(Collection<Container> collection) {
 		return new JSONSerializer()
-			.exclude("*.class")
-			.include("lsStates.lsValues", "lsLabels")
-			.transform(new ExcludeNulls(), void.class)
-			.serialize(collection);
+				.exclude("*.class")
+				.include("lsStates.lsValues", "lsLabels")
+				.transform(new ExcludeNulls(), void.class)
+				.serialize(collection);
 	}
 
 	public static String toJsonArrayStatesStub(Collection<Container> collection) {
 		return new JSONSerializer()
-			.exclude("*.class")
-			.include("lsStates")
-			.transform(new ExcludeNulls(), void.class)
-			.serialize(collection);
+				.exclude("*.class")
+				.include("lsStates")
+				.transform(new ExcludeNulls(), void.class)
+				.serialize(collection);
 	}
-	
+
 	public static String toJsonArrayStub(Collection<Container> collection) {
 		return new JSONSerializer()
-			.exclude("*.class", "lsStates")
-			.include("lsLabels")
-			.transform(new ExcludeNulls(), void.class)
-			.serialize(collection);
+				.exclude("*.class", "lsStates")
+				.include("lsLabels")
+				.transform(new ExcludeNulls(), void.class)
+				.serialize(collection);
 	}
 
 	public static Collection<Container> fromJsonArrayToContainers(String json) {
-		return new JSONDeserializer<List<Container>>().
-				use(null, ArrayList.class).
-				use("values", Container.class).        		
-				
+		return new JSONDeserializer<List<Container>>().use(null, ArrayList.class).use("values", Container.class).
+
 				deserialize(json);
 	}
-	
+
 	public static Collection<Container> fromJsonArrayToContainers(Reader json) {
-		return new JSONDeserializer<List<Container>>().
-				use(null, ArrayList.class).
-				use("values", Container.class).        		
-				
+		return new JSONDeserializer<List<Container>>().use(null, ArrayList.class).use("values", Container.class).
+
 				deserialize(json);
 	}
 
@@ -207,316 +211,359 @@ public static List<Container> findAllContainers() {
 	}
 
 	public static Container findContainer(Long id) {
-		if (id == null) return null;
+		if (id == null)
+			return null;
 		return entityManager().find(Container.class, id);
 	}
 
 	@Transactional
-	public static List<Container> findContainerByContainerLabel(String containerName){    	
-		List<ContainerLabel> foundContainerLabels = ContainerLabel.findContainerLabelsByLabelTextEqualsAndIgnoredNot(containerName, true).getResultList();		
+	public static List<Container> findContainerByContainerLabel(String containerName) {
+		List<ContainerLabel> foundContainerLabels = ContainerLabel
+				.findContainerLabelsByLabelTextEqualsAndIgnoredNot(containerName, true).getResultList();
 		List<Container> containerList = new ArrayList<Container>();
-		for (ContainerLabel containerLabel : foundContainerLabels){
+		for (ContainerLabel containerLabel : foundContainerLabels) {
 			Container container = Container.findContainer(containerLabel.getContainer().getId());
 			containerList.add(container);
-		}			
+		}
 		return containerList;
 	}
 
 	@Transactional
-	public static List<Container> findContainersByContainerLabels(String containerNamesList){
+	public static List<Container> findContainersByContainerLabels(String containerNamesList) {
 		List<Container> containerList = new ArrayList<Container>();
 		String[] containerNames = containerNamesList.split(",");
-		for (String containerName : containerNames){
-			List<ContainerLabel> foundContainerLabels = ContainerLabel.findContainerLabelsByLabelTextEqualsAndIgnoredNot(containerName, true).getResultList();		
-			for (ContainerLabel containerLabel : foundContainerLabels){
+		for (String containerName : containerNames) {
+			List<ContainerLabel> foundContainerLabels = ContainerLabel
+					.findContainerLabelsByLabelTextEqualsAndIgnoredNot(containerName, true).getResultList();
+			for (ContainerLabel containerLabel : foundContainerLabels) {
 				Container container = Container.findContainer(containerLabel.getContainer().getId());
 				containerList.add(container);
 			}
-		}			
-		return containerList;    	
+		}
+		return containerList;
 	}
 
 	public static List<Container> findContainerEntries(int firstResult, int maxResults) {
-		return entityManager().createQuery("SELECT o FROM Container o", Container.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+		return entityManager().createQuery("SELECT o FROM Container o", Container.class).setFirstResult(firstResult)
+				.setMaxResults(maxResults).getResultList();
 	}
 
 	@Transactional
 	public Container merge() {
-		if (this.entityManager == null) this.entityManager = entityManager();
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
 		Container merged = this.entityManager.merge(this);
 		this.entityManager.flush();
 		return merged;
 	}
-	
+
 	public static Container findContainerByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
-        EntityManager em = Container.entityManager();
-        TypedQuery<Container> q = em.createQuery("SELECT o FROM Container AS o WHERE o.codeName = :codeName", Container.class);
-        q.setParameter("codeName", codeName);
-        return q.getSingleResult();
-    }
-
-	public static TypedQuery<Container> findContainerByLabelText(String containerType, String containerKind, String labelText) {
-        if (containerType == null || containerType.length() == 0) throw new IllegalArgumentException("The containerType argument is required");
-        if (containerKind == null || containerKind.length() == 0) throw new IllegalArgumentException("The containerKind argument is required");
-		if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        
-        boolean ignored = true;
-        EntityManager em = Container.entityManager();
+		if (codeName == null || codeName.length() == 0)
+			throw new IllegalArgumentException("The codeName argument is required");
+		EntityManager em = Container.entityManager();
+		TypedQuery<Container> q = em.createQuery("SELECT o FROM Container AS o WHERE o.codeName = :codeName",
+				Container.class);
+		q.setParameter("codeName", codeName);
+		return q.getSingleResult();
+	}
+
+	public static TypedQuery<Container> findContainerByLabelText(String containerType, String containerKind,
+			String labelText) {
+		if (containerType == null || containerType.length() == 0)
+			throw new IllegalArgumentException("The containerType argument is required");
+		if (containerKind == null || containerKind.length() == 0)
+			throw new IllegalArgumentException("The containerKind argument is required");
+		if (labelText == null || labelText.length() == 0)
+			throw new IllegalArgumentException("The labelText argument is required");
+
+		boolean ignored = true;
+		EntityManager em = Container.entityManager();
 		String query = "SELECT DISTINCT o FROM Container o " +
 				"JOIN o.lsLabels ll with ll.ignored IS NOT :ignored AND ll.labelText = :labelText " +
 				"WHERE o.ignored IS NOT :ignored " +
 				"AND o.lsType = :containerType " +
 				"AND o.lsKind = :containerKind ";
-        
-        TypedQuery<Container> q = em.createQuery(query, Container.class);
-        q.setParameter("containerType", containerType);
-        q.setParameter("containerKind", containerKind);
-        q.setParameter("labelText", labelText);
-        q.setParameter("ignored", ignored);
-        
-        return q;
-	}
-	
-	public static TypedQuery<Container> findContainerByLabelText(String containerType, String containerKind, String labelType, String labelKind, String labelText) {
-        if (containerType == null || containerType.length() == 0) throw new IllegalArgumentException("The containerType argument is required");
-        if (containerKind == null || containerKind.length() == 0) throw new IllegalArgumentException("The containerKind argument is required");
-        if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-        if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        
-        boolean ignored = true;
-        
-        EntityManager em = Container.entityManager();
+
+		TypedQuery<Container> q = em.createQuery(query, Container.class);
+		q.setParameter("containerType", containerType);
+		q.setParameter("containerKind", containerKind);
+		q.setParameter("labelText", labelText);
+		q.setParameter("ignored", ignored);
+
+		return q;
+	}
+
+	public static TypedQuery<Container> findContainerByLabelText(String containerType, String containerKind,
+			String labelType, String labelKind, String labelText) {
+		if (containerType == null || containerType.length() == 0)
+			throw new IllegalArgumentException("The containerType argument is required");
+		if (containerKind == null || containerKind.length() == 0)
+			throw new IllegalArgumentException("The containerKind argument is required");
+		if (labelType == null || labelType.length() == 0)
+			throw new IllegalArgumentException("The labelType argument is required");
+		if (labelKind == null || labelKind.length() == 0)
+			throw new IllegalArgumentException("The labelKind argument is required");
+		if (labelText == null || labelText.length() == 0)
+			throw new IllegalArgumentException("The labelText argument is required");
+
+		boolean ignored = true;
+
+		EntityManager em = Container.entityManager();
 		String query = "SELECT DISTINCT o FROM Container o " +
 				"JOIN o.lsLabels ll " +
 				"WHERE o.ignored IS NOT :ignored " +
 				"AND o.lsType = :containerType " +
 				"AND o.lsKind = :containerKind " +
 				"AND ll.ignored IS NOT :ignored AND ll.lsType = :labelType AND ll.lsKind = :labelKind AND ll.labelText = :labelText";
-        
-        TypedQuery<Container> q = em.createQuery(query, Container.class);
-        q.setParameter("containerType", containerType);
-        q.setParameter("containerKind", containerKind);
-        q.setParameter("labelType", labelType);        
-        q.setParameter("labelKind", labelKind);
-        q.setParameter("labelText", labelText);
-        q.setParameter("ignored", ignored);
-        
-        return q;
-	}
-	
-	public static TypedQuery<Container> findContainerByLabelTextAndLabelTypeKind(String labelType, String labelKind, String labelText) {
-        if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-        if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        
-        boolean ignored = true;
-        
-        EntityManager em = Container.entityManager();
+
+		TypedQuery<Container> q = em.createQuery(query, Container.class);
+		q.setParameter("containerType", containerType);
+		q.setParameter("containerKind", containerKind);
+		q.setParameter("labelType", labelType);
+		q.setParameter("labelKind", labelKind);
+		q.setParameter("labelText", labelText);
+		q.setParameter("ignored", ignored);
+
+		return q;
+	}
+
+	public static TypedQuery<Container> findContainerByLabelTextAndLabelTypeKind(String labelType, String labelKind,
+			String labelText) {
+		if (labelType == null || labelType.length() == 0)
+			throw new IllegalArgumentException("The labelType argument is required");
+		if (labelKind == null || labelKind.length() == 0)
+			throw new IllegalArgumentException("The labelKind argument is required");
+		if (labelText == null || labelText.length() == 0)
+			throw new IllegalArgumentException("The labelText argument is required");
+
+		boolean ignored = true;
+
+		EntityManager em = Container.entityManager();
 		String query = "SELECT DISTINCT o FROM Container o " +
 				"JOIN o.lsLabels ll " +
 				"WHERE o.ignored IS NOT :ignored " +
 				"AND ll.ignored IS NOT :ignored AND ll.lsType = :labelType AND ll.lsKind = :labelKind AND ll.labelText = :labelText";
-        
-        TypedQuery<Container> q = em.createQuery(query, Container.class);
-        q.setParameter("labelType", labelType);        
-        q.setParameter("labelKind", labelKind);
-        q.setParameter("labelText", labelText);
-        q.setParameter("ignored", ignored);
-        
-        return q;
-	}
 
+		TypedQuery<Container> q = em.createQuery(query, Container.class);
+		q.setParameter("labelType", labelType);
+		q.setParameter("labelKind", labelKind);
+		q.setParameter("labelText", labelText);
+		q.setParameter("ignored", ignored);
+
+		return q;
+	}
 
 	public Long getLocationId() {
-        return this.locationId;
-    }
+		return this.locationId;
+	}
 
 	public void setLocationId(Long locationId) {
-        this.locationId = locationId;
-    }
+		this.locationId = locationId;
+	}
 
 	public Integer getRowIndex() {
-        return this.rowIndex;
-    }
+		return this.rowIndex;
+	}
 
 	public void setRowIndex(Integer rowIndex) {
-        this.rowIndex = rowIndex;
-    }
+		this.rowIndex = rowIndex;
+	}
 
 	public Integer getColumnIndex() {
-        return this.columnIndex;
-    }
+		return this.columnIndex;
+	}
 
 	public void setColumnIndex(Integer columnIndex) {
-        this.columnIndex = columnIndex;
-    }
+		this.columnIndex = columnIndex;
+	}
 
 	public Set<ContainerLabel> getLsLabels() {
-        return this.lsLabels;
-    }
+		return this.lsLabels;
+	}
 
 	public void setLsLabels(Set<ContainerLabel> lsLabels) {
-        this.lsLabels = lsLabels;
-    }
+		this.lsLabels = lsLabels;
+	}
 
 	public Set<ContainerState> getLsStates() {
-        return this.lsStates;
-    }
+		return this.lsStates;
+	}
 
 	public void setLsStates(Set<ContainerState> lsStates) {
-        this.lsStates = lsStates;
-    }
+		this.lsStates = lsStates;
+	}
 
 	public Set<ItxContainerContainer> getFirstContainers() {
-        return this.firstContainers;
-    }
+		return this.firstContainers;
+	}
 
 	public void setFirstContainers(Set<ItxContainerContainer> firstContainers) {
-        this.firstContainers = firstContainers;
-    }
+		this.firstContainers = firstContainers;
+	}
 
 	public Set<ItxContainerContainer> getSecondContainers() {
-        return this.secondContainers;
-    }
+		return this.secondContainers;
+	}
 
 	public void setSecondContainers(Set<ItxContainerContainer> secondContainers) {
-        this.secondContainers = secondContainers;
-    }
+		this.secondContainers = secondContainers;
+	}
 
 	public Set<ItxSubjectContainer> getSubjects() {
-        return this.subjects;
-    }
+		return this.subjects;
+	}
 
 	public void setSubjects(Set<ItxSubjectContainer> subjects) {
-        this.subjects = subjects;
-    }
+		this.subjects = subjects;
+	}
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("locationId", "rowIndex", "columnIndex", "lsLabels", "lsStates", "firstContainers", "secondContainers", "subjects");
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("locationId", "rowIndex",
+			"columnIndex", "lsLabels", "lsStates", "firstContainers", "secondContainers", "subjects");
 
 	public static List<Container> findAllContainers(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM Container o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, Container.class).getResultList();
-    }
-
-	public static List<Container> findContainerEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM Container o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, Container.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
+		String jpaQuery = "SELECT o FROM Container o";
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				jpaQuery = jpaQuery + " " + sortOrder;
+			}
+		}
+		return entityManager().createQuery(jpaQuery, Container.class).getResultList();
+	}
+
+	public static List<Container> findContainerEntries(int firstResult, int maxResults, String sortFieldName,
+			String sortOrder) {
+		String jpaQuery = "SELECT o FROM Container o";
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				jpaQuery = jpaQuery + " " + sortOrder;
+			}
+		}
+		return entityManager().createQuery(jpaQuery, Container.class).setFirstResult(firstResult)
+				.setMaxResults(maxResults).getResultList();
+	}
 
 	public static Long countFindContainersByLsKindEquals(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = Container.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Container AS o WHERE o.lsKind = :lsKind", Long.class);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
+		if (lsKind == null || lsKind.length() == 0)
+			throw new IllegalArgumentException("The lsKind argument is required");
+		EntityManager em = Container.entityManager();
+		TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Container AS o WHERE o.lsKind = :lsKind", Long.class);
+		q.setParameter("lsKind", lsKind);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static Long countFindContainersByLsTypeEquals(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = Container.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Container AS o WHERE o.lsType = :lsType", Long.class);
-        q.setParameter("lsType", lsType);
-        return ((Long) q.getSingleResult());
-    }
+		if (lsType == null || lsType.length() == 0)
+			throw new IllegalArgumentException("The lsType argument is required");
+		EntityManager em = Container.entityManager();
+		TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Container AS o WHERE o.lsType = :lsType", Long.class);
+		q.setParameter("lsType", lsType);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static Long countFindContainersByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = Container.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Container AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
+		if (lsType == null || lsType.length() == 0)
+			throw new IllegalArgumentException("The lsType argument is required");
+		if (lsKind == null || lsKind.length() == 0)
+			throw new IllegalArgumentException("The lsKind argument is required");
+		EntityManager em = Container.entityManager();
+		TypedQuery q = em.createQuery(
+				"SELECT COUNT(o) FROM Container AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+		q.setParameter("lsType", lsType);
+		q.setParameter("lsKind", lsKind);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static TypedQuery<Container> findContainersByLsKindEquals(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = Container.entityManager();
-        TypedQuery<Container> q = em.createQuery("SELECT o FROM Container AS o WHERE o.lsKind = :lsKind", Container.class);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-
-	public static TypedQuery<Container> findContainersByLsKindEquals(String lsKind, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = Container.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Container AS o WHERE o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Container> q = em.createQuery(queryBuilder.toString(), Container.class);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
+		if (lsKind == null || lsKind.length() == 0)
+			throw new IllegalArgumentException("The lsKind argument is required");
+		EntityManager em = Container.entityManager();
+		TypedQuery<Container> q = em.createQuery("SELECT o FROM Container AS o WHERE o.lsKind = :lsKind",
+				Container.class);
+		q.setParameter("lsKind", lsKind);
+		return q;
+	}
+
+	public static TypedQuery<Container> findContainersByLsKindEquals(String lsKind, String sortFieldName,
+			String sortOrder) {
+		if (lsKind == null || lsKind.length() == 0)
+			throw new IllegalArgumentException("The lsKind argument is required");
+		EntityManager em = Container.entityManager();
+		StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Container AS o WHERE o.lsKind = :lsKind");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<Container> q = em.createQuery(queryBuilder.toString(), Container.class);
+		q.setParameter("lsKind", lsKind);
+		return q;
+	}
 
 	public static TypedQuery<Container> findContainersByLsTypeEquals(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = Container.entityManager();
-        TypedQuery<Container> q = em.createQuery("SELECT o FROM Container AS o WHERE o.lsType = :lsType", Container.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
-
-	public static TypedQuery<Container> findContainersByLsTypeEquals(String lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        EntityManager em = Container.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Container AS o WHERE o.lsType = :lsType");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Container> q = em.createQuery(queryBuilder.toString(), Container.class);
-        q.setParameter("lsType", lsType);
-        return q;
-    }
+		if (lsType == null || lsType.length() == 0)
+			throw new IllegalArgumentException("The lsType argument is required");
+		EntityManager em = Container.entityManager();
+		TypedQuery<Container> q = em.createQuery("SELECT o FROM Container AS o WHERE o.lsType = :lsType",
+				Container.class);
+		q.setParameter("lsType", lsType);
+		return q;
+	}
+
+	public static TypedQuery<Container> findContainersByLsTypeEquals(String lsType, String sortFieldName,
+			String sortOrder) {
+		if (lsType == null || lsType.length() == 0)
+			throw new IllegalArgumentException("The lsType argument is required");
+		EntityManager em = Container.entityManager();
+		StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Container AS o WHERE o.lsType = :lsType");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<Container> q = em.createQuery(queryBuilder.toString(), Container.class);
+		q.setParameter("lsType", lsType);
+		return q;
+	}
 
 	public static TypedQuery<Container> findContainersByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = Container.entityManager();
-        TypedQuery<Container> q = em.createQuery("SELECT o FROM Container AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Container.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-
-	public static TypedQuery<Container> findContainersByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = Container.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Container AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<Container> q = em.createQuery(queryBuilder.toString(), Container.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
+		if (lsType == null || lsType.length() == 0)
+			throw new IllegalArgumentException("The lsType argument is required");
+		if (lsKind == null || lsKind.length() == 0)
+			throw new IllegalArgumentException("The lsKind argument is required");
+		EntityManager em = Container.entityManager();
+		TypedQuery<Container> q = em.createQuery(
+				"SELECT o FROM Container AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Container.class);
+		q.setParameter("lsType", lsType);
+		q.setParameter("lsKind", lsKind);
+		return q;
+	}
+
+	public static TypedQuery<Container> findContainersByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind,
+			String sortFieldName, String sortOrder) {
+		if (lsType == null || lsType.length() == 0)
+			throw new IllegalArgumentException("The lsType argument is required");
+		if (lsKind == null || lsKind.length() == 0)
+			throw new IllegalArgumentException("The lsKind argument is required");
+		EntityManager em = Container.entityManager();
+		StringBuilder queryBuilder = new StringBuilder(
+				"SELECT o FROM Container AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<Container> q = em.createQuery(queryBuilder.toString(), Container.class);
+		q.setParameter("lsType", lsType);
+		q.setParameter("lsKind", lsKind);
+		return q;
+	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerKind.java b/src/main/java/com/labsynch/labseer/domain/ContainerKind.java
index f08d95efc..e89cc6bce 100755
--- a/src/main/java/com/labsynch/labseer/domain/ContainerKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ContainerKind.java
@@ -31,71 +31,88 @@
 
 public class ContainerKind {
 
-	
-	@NotNull
-	@ManyToOne
-	@JoinColumn(name = "ls_type")
-	private ContainerType lsType;
-
-	@NotNull
-	@Size(max = 255)
-	private String kindName;
-
-	@Column(unique = true)
-	@Size(max = 255)
-	private String lsTypeAndKind;
-
-	@PersistenceContext
-	transient EntityManager entityManager;
-
-	public static final EntityManager entityManager() {
-		EntityManager em = new ContainerKind().entityManager;
-		if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-		return em;
-	}
-
-	@Transactional
-	public void persist() {
-		if (this.entityManager == null) this.entityManager = entityManager();
-		this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_').append(this.getKindName()).toString();
-		this.entityManager.persist(this);
-	}
-
-	@Transactional
-	public ContainerKind merge() {
-		if (this.entityManager == null) this.entityManager = entityManager();
-		this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_').append(this.getKindName()).toString();
-		ContainerKind merged = this.entityManager.merge(this);
-		this.entityManager.flush();
-		return merged;
-	}
-
-
-	public static Long countFindContainerKindsByKindNameEqualsAndLsType(String kindName, ContainerType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    @NotNull
+    @ManyToOne
+    @JoinColumn(name = "ls_type")
+    private ContainerType lsType;
+
+    @NotNull
+    @Size(max = 255)
+    private String kindName;
+
+    @Column(unique = true)
+    @Size(max = 255)
+    private String lsTypeAndKind;
+
+    @PersistenceContext
+    transient EntityManager entityManager;
+
+    public static final EntityManager entityManager() {
+        EntityManager em = new ContainerKind().entityManager;
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em;
+    }
+
+    @Transactional
+    public void persist() {
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
+        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_')
+                .append(this.getKindName()).toString();
+        this.entityManager.persist(this);
+    }
+
+    @Transactional
+    public ContainerKind merge() {
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
+        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_')
+                .append(this.getKindName()).toString();
+        ContainerKind merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        return merged;
+    }
+
+    public static Long countFindContainerKindsByKindNameEqualsAndLsType(String kindName, ContainerType lsType) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = ContainerKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ContainerKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType",
+                Long.class);
         q.setParameter("kindName", kindName);
         q.setParameter("lsType", lsType);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<ContainerKind> findContainerKindsByKindNameEqualsAndLsType(String kindName, ContainerType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<ContainerKind> findContainerKindsByKindNameEqualsAndLsType(String kindName,
+            ContainerType lsType) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = ContainerKind.entityManager();
-        TypedQuery<ContainerKind> q = em.createQuery("SELECT o FROM ContainerKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", ContainerKind.class);
+        TypedQuery<ContainerKind> q = em.createQuery(
+                "SELECT o FROM ContainerKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType",
+                ContainerKind.class);
         q.setParameter("kindName", kindName);
         q.setParameter("lsType", lsType);
         return q;
     }
 
-	public static TypedQuery<ContainerKind> findContainerKindsByKindNameEqualsAndLsType(String kindName, ContainerType lsType, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<ContainerKind> findContainerKindsByKindNameEqualsAndLsType(String kindName,
+            ContainerType lsType, String sortFieldName, String sortOrder) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = ContainerKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ContainerKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -108,77 +125,78 @@ public static TypedQuery<ContainerKind> findContainerKindsByKindNameEqualsAndLsT
         return q;
     }
 
-	@Id
+    @Id
     @SequenceGenerator(name = "containerKindGen", sequenceName = "CONTAINER_KIND_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "containerKindGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ContainerKind fromJsonToContainerKind(String json) {
+    public static ContainerKind fromJsonToContainerKind(String json) {
         return new JSONDeserializer<ContainerKind>()
-        .use(null, ContainerKind.class).deserialize(json);
+                .use(null, ContainerKind.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ContainerKind> collection) {
+    public static String toJsonArray(Collection<ContainerKind> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ContainerKind> collection, String[] fields) {
+    public static String toJsonArray(Collection<ContainerKind> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ContainerKind> fromJsonArrayToContainerKinds(String json) {
+    public static Collection<ContainerKind> fromJsonArrayToContainerKinds(String json) {
         return new JSONDeserializer<List<ContainerKind>>()
-        .use("values", ContainerKind.class).deserialize(json);
+                .use("values", ContainerKind.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName", "lsTypeAndKind", "entityManager");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName",
+            "lsTypeAndKind", "entityManager");
 
-	public static long countContainerKinds() {
+    public static long countContainerKinds() {
         return entityManager().createQuery("SELECT COUNT(o) FROM ContainerKind o", Long.class).getSingleResult();
     }
 
-	public static List<ContainerKind> findAllContainerKinds() {
+    public static List<ContainerKind> findAllContainerKinds() {
         return entityManager().createQuery("SELECT o FROM ContainerKind o", ContainerKind.class).getResultList();
     }
 
-	public static List<ContainerKind> findAllContainerKinds(String sortFieldName, String sortOrder) {
+    public static List<ContainerKind> findAllContainerKinds(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ContainerKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -189,16 +207,19 @@ public static List<ContainerKind> findAllContainerKinds(String sortFieldName, St
         return entityManager().createQuery(jpaQuery, ContainerKind.class).getResultList();
     }
 
-	public static ContainerKind findContainerKind(Long id) {
-        if (id == null) return null;
+    public static ContainerKind findContainerKind(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ContainerKind.class, id);
     }
 
-	public static List<ContainerKind> findContainerKindEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ContainerKind o", ContainerKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ContainerKind> findContainerKindEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ContainerKind o", ContainerKind.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ContainerKind> findContainerKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ContainerKind> findContainerKindEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM ContainerKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -206,12 +227,14 @@ public static List<ContainerKind> findContainerKindEntries(int firstResult, int
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ContainerKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ContainerKind.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -220,39 +243,41 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	public ContainerType getLsType() {
+    public ContainerType getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(ContainerType lsType) {
+    public void setLsType(ContainerType lsType) {
         this.lsType = lsType;
     }
 
-	public String getKindName() {
+    public String getKindName() {
         return this.kindName;
     }
 
-	public void setKindName(String kindName) {
+    public void setKindName(String kindName) {
         this.kindName = kindName;
     }
 
-	public String getLsTypeAndKind() {
+    public String getLsTypeAndKind() {
         return this.lsTypeAndKind;
     }
 
-	public void setLsTypeAndKind(String lsTypeAndKind) {
+    public void setLsTypeAndKind(String lsTypeAndKind) {
         this.lsTypeAndKind = lsTypeAndKind;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerLabel.java b/src/main/java/com/labsynch/labseer/domain/ContainerLabel.java
index d09175cfc..2fd349b40 100755
--- a/src/main/java/com/labsynch/labseer/domain/ContainerLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/ContainerLabel.java
@@ -32,7 +32,6 @@ public class ContainerLabel extends AbstractLabel {
     @JoinColumn(name = "container_id")
     private Container container;
 
-    
     public ContainerLabel(com.labsynch.labseer.domain.ContainerLabel containerLabel) {
         super.setLsType(containerLabel.getLsType());
         super.setLsKind(containerLabel.getLsKind());
@@ -46,151 +45,183 @@ public ContainerLabel(com.labsynch.labseer.domain.ContainerLabel containerLabel)
     }
 
     public static ContainerLabel update(ContainerLabel containerLabel) {
-    	ContainerLabel updatedContainerLabel = ContainerLabel.findContainerLabel(containerLabel.getId());
-    	updatedContainerLabel.setLsType(containerLabel.getLsType());
-    	updatedContainerLabel.setLsKind(containerLabel.getLsKind());
-    	updatedContainerLabel.setLsTypeAndKind(containerLabel.getLsType() + "_" + containerLabel.getLsKind());
-    	updatedContainerLabel.setLabelText(containerLabel.getLabelText());
-    	updatedContainerLabel.setPreferred(containerLabel.isPreferred());
-    	updatedContainerLabel.setLsTransaction(containerLabel.getLsTransaction());
-    	updatedContainerLabel.setRecordedBy(containerLabel.getRecordedBy());
-    	updatedContainerLabel.setRecordedDate(containerLabel.getRecordedDate());
-    	updatedContainerLabel.setModifiedDate(new Date());
-    	updatedContainerLabel.setPhysicallyLabled(containerLabel.isPhysicallyLabled());
-    	updatedContainerLabel.setIgnored(containerLabel.isIgnored());
-    	updatedContainerLabel.merge();
-    	return updatedContainerLabel;
+        ContainerLabel updatedContainerLabel = ContainerLabel.findContainerLabel(containerLabel.getId());
+        updatedContainerLabel.setLsType(containerLabel.getLsType());
+        updatedContainerLabel.setLsKind(containerLabel.getLsKind());
+        updatedContainerLabel.setLsTypeAndKind(containerLabel.getLsType() + "_" + containerLabel.getLsKind());
+        updatedContainerLabel.setLabelText(containerLabel.getLabelText());
+        updatedContainerLabel.setPreferred(containerLabel.isPreferred());
+        updatedContainerLabel.setLsTransaction(containerLabel.getLsTransaction());
+        updatedContainerLabel.setRecordedBy(containerLabel.getRecordedBy());
+        updatedContainerLabel.setRecordedDate(containerLabel.getRecordedDate());
+        updatedContainerLabel.setModifiedDate(new Date());
+        updatedContainerLabel.setPhysicallyLabled(containerLabel.isPhysicallyLabled());
+        updatedContainerLabel.setIgnored(containerLabel.isIgnored());
+        updatedContainerLabel.merge();
+        return updatedContainerLabel;
     }
-     
 
-	public static TypedQuery<ContainerLabel> findContainerLabelsByContainerAndIgnoredNot(Container container, boolean ignored) {
-        if (container == null) throw new IllegalArgumentException("The container argument is required");
+    public static TypedQuery<ContainerLabel> findContainerLabelsByContainerAndIgnoredNot(Container container,
+            boolean ignored) {
+        if (container == null)
+            throw new IllegalArgumentException("The container argument is required");
         EntityManager em = ContainerLabel.entityManager();
-        TypedQuery<ContainerLabel> q = em.createQuery("SELECT o FROM ContainerLabel AS o WHERE o.container = :container AND o.ignored IS NOT :ignored", ContainerLabel.class);
+        TypedQuery<ContainerLabel> q = em.createQuery(
+                "SELECT o FROM ContainerLabel AS o WHERE o.container = :container AND o.ignored IS NOT :ignored",
+                ContainerLabel.class);
         q.setParameter("container", container);
         q.setParameter("ignored", ignored);
         return q;
     }
 
-	public static TypedQuery<ContainerLabel> findContainerLabelsByLabelTextEqualsAndIgnoredNot(String labelText, boolean ignored) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+    public static TypedQuery<ContainerLabel> findContainerLabelsByLabelTextEqualsAndIgnoredNot(String labelText,
+            boolean ignored) {
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
         EntityManager em = ContainerLabel.entityManager();
-        TypedQuery<ContainerLabel> q = em.createQuery("SELECT o FROM ContainerLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored", ContainerLabel.class);
+        TypedQuery<ContainerLabel> q = em.createQuery(
+                "SELECT o FROM ContainerLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored",
+                ContainerLabel.class);
         q.setParameter("labelText", labelText);
         q.setParameter("ignored", ignored);
         return q;
     }
-	
+
     public String toJson() {
         return new JSONSerializer().exclude("*.class").serialize(this);
     }
-    
+
     public static ContainerLabel fromJsonToContainerLabel(String json) {
         return new JSONDeserializer<ContainerLabel>().use(null, ContainerLabel.class).deserialize(json);
     }
-    
+
     public static String toJsonArray(Collection<ContainerLabel> collection) {
         return new JSONSerializer().exclude("*.class").serialize(collection);
     }
-    
+
     public static Collection<ContainerLabel> fromJsonArrayToContainerLabels(String json) {
-        return new JSONDeserializer<List<ContainerLabel>>().use(null, ArrayList.class).use("values", ContainerLabel.class).deserialize(json);
+        return new JSONDeserializer<List<ContainerLabel>>().use(null, ArrayList.class)
+                .use("values", ContainerLabel.class).deserialize(json);
     }
-    
+
     public static Collection<ContainerLabel> fromJsonArrayToContainerLabels(Reader json) {
-        return new JSONDeserializer<List<ContainerLabel>>().use(null, ArrayList.class).use("values", ContainerLabel.class).deserialize(json);
+        return new JSONDeserializer<List<ContainerLabel>>().use(null, ArrayList.class)
+                .use("values", ContainerLabel.class).deserialize(json);
     }
-    
+
     public static ContainerLabel pickBestLabel(Collection<ContainerLabel> labels) {
-		if (labels.isEmpty()) return null;
-		Collection<ContainerLabel> preferredLabels = new HashSet<ContainerLabel>();
-		for (ContainerLabel label : labels){
-			if (label.isPreferred()) preferredLabels.add(label);
-		}
-		if (!preferredLabels.isEmpty()){
-			ContainerLabel bestLabel = preferredLabels.iterator().next();
-			for (ContainerLabel preferredLabel : preferredLabels){
-				if (preferredLabel.getRecordedDate().compareTo(bestLabel.getRecordedDate()) > 0) bestLabel = preferredLabel;
-			}
-			return bestLabel;
-		} else {
-			Collection<ContainerLabel> nameLabels = new HashSet<ContainerLabel>();
-			for (ContainerLabel label : labels){
-				if (label.getLsType().equals("name")) nameLabels.add(label);
-			}
-			if (!nameLabels.isEmpty()){
-				ContainerLabel bestLabel = nameLabels.iterator().next();
-				for (ContainerLabel nameLabel : nameLabels){
-					if (nameLabel.getRecordedDate().compareTo(bestLabel.getRecordedDate()) > 0) bestLabel = nameLabel;
-				}
-				return bestLabel;
-			} else {
-				Collection<ContainerLabel> notIgnoredLabels = new HashSet<ContainerLabel>();
-				for (ContainerLabel label : labels){
-					if (!label.isIgnored()) notIgnoredLabels.add(label);
-				}
-				if (!notIgnoredLabels.isEmpty()){
-					ContainerLabel bestLabel = notIgnoredLabels.iterator().next();
-					for (ContainerLabel notIgnoredLabel : notIgnoredLabels){
-						if (notIgnoredLabel.getRecordedDate().compareTo(bestLabel.getRecordedDate()) > 0) bestLabel = notIgnoredLabel;
-					}
-					return bestLabel;
-				} else {
-					return labels.iterator().next();
-				}
-			}
-		}
-	}
-
-	public Container getContainer() {
+        if (labels.isEmpty())
+            return null;
+        Collection<ContainerLabel> preferredLabels = new HashSet<ContainerLabel>();
+        for (ContainerLabel label : labels) {
+            if (label.isPreferred())
+                preferredLabels.add(label);
+        }
+        if (!preferredLabels.isEmpty()) {
+            ContainerLabel bestLabel = preferredLabels.iterator().next();
+            for (ContainerLabel preferredLabel : preferredLabels) {
+                if (preferredLabel.getRecordedDate().compareTo(bestLabel.getRecordedDate()) > 0)
+                    bestLabel = preferredLabel;
+            }
+            return bestLabel;
+        } else {
+            Collection<ContainerLabel> nameLabels = new HashSet<ContainerLabel>();
+            for (ContainerLabel label : labels) {
+                if (label.getLsType().equals("name"))
+                    nameLabels.add(label);
+            }
+            if (!nameLabels.isEmpty()) {
+                ContainerLabel bestLabel = nameLabels.iterator().next();
+                for (ContainerLabel nameLabel : nameLabels) {
+                    if (nameLabel.getRecordedDate().compareTo(bestLabel.getRecordedDate()) > 0)
+                        bestLabel = nameLabel;
+                }
+                return bestLabel;
+            } else {
+                Collection<ContainerLabel> notIgnoredLabels = new HashSet<ContainerLabel>();
+                for (ContainerLabel label : labels) {
+                    if (!label.isIgnored())
+                        notIgnoredLabels.add(label);
+                }
+                if (!notIgnoredLabels.isEmpty()) {
+                    ContainerLabel bestLabel = notIgnoredLabels.iterator().next();
+                    for (ContainerLabel notIgnoredLabel : notIgnoredLabels) {
+                        if (notIgnoredLabel.getRecordedDate().compareTo(bestLabel.getRecordedDate()) > 0)
+                            bestLabel = notIgnoredLabel;
+                    }
+                    return bestLabel;
+                } else {
+                    return labels.iterator().next();
+                }
+            }
+        }
+    }
+
+    public Container getContainer() {
         return this.container;
     }
 
-	public void setContainer(Container container) {
+    public void setContainer(Container container) {
         this.container = container;
     }
 
-	public static Long countFindContainerLabelsByContainerAndIgnoredNot(Container container, boolean ignored) {
-        if (container == null) throw new IllegalArgumentException("The container argument is required");
+    public static Long countFindContainerLabelsByContainerAndIgnoredNot(Container container, boolean ignored) {
+        if (container == null)
+            throw new IllegalArgumentException("The container argument is required");
         EntityManager em = ContainerLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerLabel AS o WHERE o.container = :container AND o.ignored IS NOT :ignored", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ContainerLabel AS o WHERE o.container = :container AND o.ignored IS NOT :ignored",
+                Long.class);
         q.setParameter("container", container);
         q.setParameter("ignored", ignored);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindContainerLabelsByLabelTextEqualsAndIgnoredNot(String labelText, boolean ignored) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+    public static Long countFindContainerLabelsByLabelTextEqualsAndIgnoredNot(String labelText, boolean ignored) {
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
         EntityManager em = ContainerLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ContainerLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored",
+                Long.class);
         q.setParameter("labelText", labelText);
         q.setParameter("ignored", ignored);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindContainerLabelsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static Long countFindContainerLabelsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = ContainerLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerLabel AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerLabel AS o WHERE o.lsTransaction = :lsTransaction",
+                Long.class);
         q.setParameter("lsTransaction", lsTransaction);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindContainerLabelsByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot(String lsType, String labelText, boolean ignored) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+    public static Long countFindContainerLabelsByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot(String lsType,
+            String labelText, boolean ignored) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
         EntityManager em = ContainerLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerLabel AS o WHERE o.lsType = :lsType  AND o.labelText = :labelText  AND o.ignored IS NOT :ignored", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ContainerLabel AS o WHERE o.lsType = :lsType  AND o.labelText = :labelText  AND o.ignored IS NOT :ignored",
+                Long.class);
         q.setParameter("lsType", lsType);
         q.setParameter("labelText", labelText);
         q.setParameter("ignored", ignored);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<ContainerLabel> findContainerLabelsByContainerAndIgnoredNot(Container container, boolean ignored, String sortFieldName, String sortOrder) {
-        if (container == null) throw new IllegalArgumentException("The container argument is required");
+    public static TypedQuery<ContainerLabel> findContainerLabelsByContainerAndIgnoredNot(Container container,
+            boolean ignored, String sortFieldName, String sortOrder) {
+        if (container == null)
+            throw new IllegalArgumentException("The container argument is required");
         EntityManager em = ContainerLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerLabel AS o WHERE o.container = :container AND o.ignored IS NOT :ignored");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ContainerLabel AS o WHERE o.container = :container AND o.ignored IS NOT :ignored");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -203,10 +234,13 @@ public static TypedQuery<ContainerLabel> findContainerLabelsByContainerAndIgnore
         return q;
     }
 
-	public static TypedQuery<ContainerLabel> findContainerLabelsByLabelTextEqualsAndIgnoredNot(String labelText, boolean ignored, String sortFieldName, String sortOrder) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+    public static TypedQuery<ContainerLabel> findContainerLabelsByLabelTextEqualsAndIgnoredNot(String labelText,
+            boolean ignored, String sortFieldName, String sortOrder) {
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
         EntityManager em = ContainerLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ContainerLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -219,18 +253,23 @@ public static TypedQuery<ContainerLabel> findContainerLabelsByLabelTextEqualsAnd
         return q;
     }
 
-	public static TypedQuery<ContainerLabel> findContainerLabelsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<ContainerLabel> findContainerLabelsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = ContainerLabel.entityManager();
-        TypedQuery<ContainerLabel> q = em.createQuery("SELECT o FROM ContainerLabel AS o WHERE o.lsTransaction = :lsTransaction", ContainerLabel.class);
+        TypedQuery<ContainerLabel> q = em.createQuery(
+                "SELECT o FROM ContainerLabel AS o WHERE o.lsTransaction = :lsTransaction", ContainerLabel.class);
         q.setParameter("lsTransaction", lsTransaction);
         return q;
     }
 
-	public static TypedQuery<ContainerLabel> findContainerLabelsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<ContainerLabel> findContainerLabelsByLsTransactionEquals(Long lsTransaction,
+            String sortFieldName, String sortOrder) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = ContainerLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerLabel AS o WHERE o.lsTransaction = :lsTransaction");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ContainerLabel AS o WHERE o.lsTransaction = :lsTransaction");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -242,22 +281,31 @@ public static TypedQuery<ContainerLabel> findContainerLabelsByLsTransactionEqual
         return q;
     }
 
-	public static TypedQuery<ContainerLabel> findContainerLabelsByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot(String lsType, String labelText, boolean ignored) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+    public static TypedQuery<ContainerLabel> findContainerLabelsByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot(
+            String lsType, String labelText, boolean ignored) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
         EntityManager em = ContainerLabel.entityManager();
-        TypedQuery<ContainerLabel> q = em.createQuery("SELECT o FROM ContainerLabel AS o WHERE o.lsType = :lsType  AND o.labelText = :labelText  AND o.ignored IS NOT :ignored", ContainerLabel.class);
+        TypedQuery<ContainerLabel> q = em.createQuery(
+                "SELECT o FROM ContainerLabel AS o WHERE o.lsType = :lsType  AND o.labelText = :labelText  AND o.ignored IS NOT :ignored",
+                ContainerLabel.class);
         q.setParameter("lsType", lsType);
         q.setParameter("labelText", labelText);
         q.setParameter("ignored", ignored);
         return q;
     }
 
-	public static TypedQuery<ContainerLabel> findContainerLabelsByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot(String lsType, String labelText, boolean ignored, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+    public static TypedQuery<ContainerLabel> findContainerLabelsByLsTypeEqualsAndLabelTextEqualsAndIgnoredNot(
+            String lsType, String labelText, boolean ignored, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
         EntityManager em = ContainerLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerLabel AS o WHERE o.lsType = :lsType  AND o.labelText = :labelText  AND o.ignored IS NOT :ignored");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ContainerLabel AS o WHERE o.lsType = :lsType  AND o.labelText = :labelText  AND o.ignored IS NOT :ignored");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -271,17 +319,17 @@ public static TypedQuery<ContainerLabel> findContainerLabelsByLsTypeEqualsAndLab
         return q;
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("container");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("container");
 
-	public static long countContainerLabels() {
+    public static long countContainerLabels() {
         return entityManager().createQuery("SELECT COUNT(o) FROM ContainerLabel o", Long.class).getSingleResult();
     }
 
-	public static List<ContainerLabel> findAllContainerLabels() {
+    public static List<ContainerLabel> findAllContainerLabels() {
         return entityManager().createQuery("SELECT o FROM ContainerLabel o", ContainerLabel.class).getResultList();
     }
 
-	public static List<ContainerLabel> findAllContainerLabels(String sortFieldName, String sortOrder) {
+    public static List<ContainerLabel> findAllContainerLabels(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ContainerLabel o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -292,16 +340,19 @@ public static List<ContainerLabel> findAllContainerLabels(String sortFieldName,
         return entityManager().createQuery(jpaQuery, ContainerLabel.class).getResultList();
     }
 
-	public static ContainerLabel findContainerLabel(Long id) {
-        if (id == null) return null;
+    public static ContainerLabel findContainerLabel(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ContainerLabel.class, id);
     }
 
-	public static List<ContainerLabel> findContainerLabelEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ContainerLabel o", ContainerLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ContainerLabel> findContainerLabelEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ContainerLabel o", ContainerLabel.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ContainerLabel> findContainerLabelEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ContainerLabel> findContainerLabelEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM ContainerLabel o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -309,22 +360,24 @@ public static List<ContainerLabel> findContainerLabelEntries(int firstResult, in
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ContainerLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ContainerLabel.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public ContainerLabel merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ContainerLabel merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public ContainerLabel() {
+    public ContainerLabel() {
         super();
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerState.java b/src/main/java/com/labsynch/labseer/domain/ContainerState.java
index e126652bf..0438a24a4 100755
--- a/src/main/java/com/labsynch/labseer/domain/ContainerState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ContainerState.java
@@ -39,7 +39,7 @@ public class ContainerState extends AbstractState {
     @JoinColumn(name = "container_id")
     private Container container;
 
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "lsState", fetch =  FetchType.LAZY)
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "lsState", fetch = FetchType.LAZY)
     private Set<ContainerValue> lsValues = new HashSet<ContainerValue>();
 
     public ContainerState(com.labsynch.labseer.domain.ContainerState containerState) {
@@ -53,35 +53,40 @@ public ContainerState(com.labsynch.labseer.domain.ContainerState containerState)
         this.setIgnored(containerState.isIgnored());
     }
 
-//    public static com.labsynch.labseer.domain.ContainerState update(com.labsynch.labseer.domain.ContainerState containerState) {
-//        ContainerState updatedContainerState = new JSONDeserializer<ContainerState>().use(null, ArrayList.class).use("values", ContainerState.class).deserializeInto(containerState.toJson(), ContainerState.findContainerState(containerState.getId()));
-//        updatedContainerState.setModifiedDate(new Date());
-//        updatedContainerState.merge();
-//        return updatedContainerState;
-//    }
-    
+    // public static com.labsynch.labseer.domain.ContainerState
+    // update(com.labsynch.labseer.domain.ContainerState containerState) {
+    // ContainerState updatedContainerState = new
+    // JSONDeserializer<ContainerState>().use(null, ArrayList.class).use("values",
+    // ContainerState.class).deserializeInto(containerState.toJson(),
+    // ContainerState.findContainerState(containerState.getId()));
+    // updatedContainerState.setModifiedDate(new Date());
+    // updatedContainerState.merge();
+    // return updatedContainerState;
+    // }
+
     public static ContainerState update(ContainerState lsState) {
-		ContainerState updatedContainerState = ContainerState.findContainerState(lsState.getId());
-		if (updatedContainerState != null){
-			updatedContainerState.setRecordedBy(lsState.getRecordedBy());
-			updatedContainerState.setRecordedDate(lsState.getRecordedDate());
-			updatedContainerState.setLsTransaction(lsState.getLsTransaction());
-			updatedContainerState.setModifiedBy(lsState.getModifiedBy());
-			updatedContainerState.setModifiedDate(new Date());
-			updatedContainerState.setLsType(lsState.getLsType());
-			updatedContainerState.setLsKind(lsState.getLsKind());
-			updatedContainerState.setIgnored(lsState.isIgnored());
-			updatedContainerState.merge();
-			return updatedContainerState;
-		} else {
-			return null;
-		}
-		
-	}
+        ContainerState updatedContainerState = ContainerState.findContainerState(lsState.getId());
+        if (updatedContainerState != null) {
+            updatedContainerState.setRecordedBy(lsState.getRecordedBy());
+            updatedContainerState.setRecordedDate(lsState.getRecordedDate());
+            updatedContainerState.setLsTransaction(lsState.getLsTransaction());
+            updatedContainerState.setModifiedBy(lsState.getModifiedBy());
+            updatedContainerState.setModifiedDate(new Date());
+            updatedContainerState.setLsType(lsState.getLsType());
+            updatedContainerState.setLsKind(lsState.getLsKind());
+            updatedContainerState.setIgnored(lsState.isIgnored());
+            updatedContainerState.merge();
+            return updatedContainerState;
+        } else {
+            return null;
+        }
+
+    }
 
     @Transactional
     public String toJson() {
-        return new JSONSerializer().exclude("*.class", "container").include("lsValues").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().exclude("*.class", "container").include("lsValues")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
@@ -95,32 +100,37 @@ public static com.labsynch.labseer.domain.ContainerState fromJsonToContainerStat
 
     @Transactional
     public static String toJsonArray(Collection<com.labsynch.labseer.domain.ContainerState> collection) {
-        return new JSONSerializer().exclude("*.class", "container", "lsValues.lsState").include("lsValues").transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer().exclude("*.class", "container", "lsValues.lsState").include("lsValues")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
     @Transactional
     public static String toJsonArrayStub(Collection<com.labsynch.labseer.domain.ContainerState> collection) {
-        return new JSONSerializer().exclude("*.class", "container").transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer().exclude("*.class", "container").transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
-    
+
     @Transactional
-	public static String toJsonArrayWithNestedContainers(Collection<ContainerState> collection) {
-        return new JSONSerializer().exclude("*.class", "lsValues.lsState").include("lsValues","container.lsLabels").transform(new ExcludeNulls(), void.class).serialize(collection);
-	}
+    public static String toJsonArrayWithNestedContainers(Collection<ContainerState> collection) {
+        return new JSONSerializer().exclude("*.class", "lsValues.lsState").include("lsValues", "container.lsLabels")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
+    }
 
     public static Collection<com.labsynch.labseer.domain.ContainerState> fromJsonArrayToContainerStates(String json) {
-        return new JSONDeserializer<List<ContainerState>>().use(null, ArrayList.class).use("values", ContainerState.class).deserialize(json);
+        return new JSONDeserializer<List<ContainerState>>().use(null, ArrayList.class)
+                .use("values", ContainerState.class).deserialize(json);
     }
-    
+
     public static Collection<com.labsynch.labseer.domain.ContainerState> fromJsonArrayToContainerStates(Reader json) {
-        return new JSONDeserializer<List<ContainerState>>().use(null, ArrayList.class).use("values", ContainerState.class).deserialize(json);
+        return new JSONDeserializer<List<ContainerState>>().use(null, ArrayList.class)
+                .use("values", ContainerState.class).deserialize(json);
     }
 
-
     public long countValidContainerValues() {
         boolean ignored = true;
         EntityManager em = ContainerValue.entityManager();
-        TypedQuery<Long> q = em.createQuery("SELECT COUNT(o) FROM ContainerState AS o WHERE o.ignored IS NOT :ignored", Long.class);
+        TypedQuery<Long> q = em.createQuery("SELECT COUNT(o) FROM ContainerState AS o WHERE o.ignored IS NOT :ignored",
+                Long.class);
         q.setParameter("ignored", ignored);
         return q.getSingleResult();
     }
@@ -128,7 +138,9 @@ public long countValidContainerValues() {
     public static List<com.labsynch.labseer.domain.ContainerState> findValidContainerStates(List<Long> containerIds) {
         boolean ignored = true;
         EntityManager em = ContainerState.entityManager();
-        TypedQuery<ContainerState> q = em.createQuery("SELECT o FROM ContainerState AS o WHERE o.container.id in (:containerIds) AND o.ignored IS NOT :ignored", ContainerState.class);
+        TypedQuery<ContainerState> q = em.createQuery(
+                "SELECT o FROM ContainerState AS o WHERE o.container.id in (:containerIds) AND o.ignored IS NOT :ignored",
+                ContainerState.class);
         q.setParameter("ignored", ignored);
         q.setParameter("containerIds", containerIds);
         return q.getResultList();
@@ -138,70 +150,74 @@ public static List<com.labsynch.labseer.domain.ContainerState> findValidContaine
     public static int ignoreStates(Long transactionId) {
         boolean ignored = true;
         EntityManager em = ContainerState.entityManager();
-        Query q = em.createQuery("UPDATE versioned ContainerState AS o set o.ignored = :ignored WHERE o.id " + "IN (  SELECT thing FROM UpdateLog " + "WHERE lsTransaction = :transactionId)");
+        Query q = em.createQuery("UPDATE versioned ContainerState AS o set o.ignored = :ignored WHERE o.id "
+                + "IN (  SELECT thing FROM UpdateLog " + "WHERE lsTransaction = :transactionId)");
         q.setParameter("ignored", ignored);
         q.setParameter("transactionId", transactionId);
         int results = q.executeUpdate();
         return results;
     }
 
-	public static TypedQuery<ContainerState> findContainerStatesByContainerIDAndStateTypeKind(Long containerId, 
-			String stateType, 
-			String stateKind) {
-			if (stateType == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-			if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-			
-			EntityManager em = entityManager();
-			String hsqlQuery = "SELECT cs FROM ContainerState AS cs " +
-			"JOIN cs.container c " +
-			"WHERE cs.lsType = :stateType AND cs.lsKind = :stateKind AND cs.ignored IS NOT :ignored " +
-			"AND c.id = :containerId ";
-			TypedQuery<ContainerState> q = em.createQuery(hsqlQuery, ContainerState.class);
-			q.setParameter("containerId", containerId);
-			q.setParameter("stateType", stateType);
-			q.setParameter("stateKind", stateKind);
-			q.setParameter("ignored", true);
-			return q;
-		}
-
-	public static TypedQuery<ContainerState> findContainerStatesByContainerCodeNameAndStateTypeKind(
-			String containerCodeName, String stateType, String stateKind) {
-		if (stateType == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-		
-		EntityManager em = entityManager();
-		String hsqlQuery = "SELECT cs FROM ContainerState AS cs " +
-		"JOIN cs.container c " +
-		"WHERE cs.lsType = :stateType AND cs.lsKind = :stateKind AND cs.ignored IS NOT :ignored " +
-		"AND c.codeName = :containerCodeName ";
-		TypedQuery<ContainerState> q = em.createQuery(hsqlQuery, ContainerState.class);
-		q.setParameter("containerCodeName", containerCodeName);
-		q.setParameter("stateType", stateType);
-		q.setParameter("stateKind", stateKind);
-		q.setParameter("ignored", true);
-		return q;
-	}
-	
-
-	public String toString() {
+    public static TypedQuery<ContainerState> findContainerStatesByContainerIDAndStateTypeKind(Long containerId,
+            String stateType,
+            String stateKind) {
+        if (stateType == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateType argument is required");
+        if (stateKind == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateKind argument is required");
+
+        EntityManager em = entityManager();
+        String hsqlQuery = "SELECT cs FROM ContainerState AS cs " +
+                "JOIN cs.container c " +
+                "WHERE cs.lsType = :stateType AND cs.lsKind = :stateKind AND cs.ignored IS NOT :ignored " +
+                "AND c.id = :containerId ";
+        TypedQuery<ContainerState> q = em.createQuery(hsqlQuery, ContainerState.class);
+        q.setParameter("containerId", containerId);
+        q.setParameter("stateType", stateType);
+        q.setParameter("stateKind", stateKind);
+        q.setParameter("ignored", true);
+        return q;
+    }
+
+    public static TypedQuery<ContainerState> findContainerStatesByContainerCodeNameAndStateTypeKind(
+            String containerCodeName, String stateType, String stateKind) {
+        if (stateType == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateType argument is required");
+        if (stateKind == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateKind argument is required");
+
+        EntityManager em = entityManager();
+        String hsqlQuery = "SELECT cs FROM ContainerState AS cs " +
+                "JOIN cs.container c " +
+                "WHERE cs.lsType = :stateType AND cs.lsKind = :stateKind AND cs.ignored IS NOT :ignored " +
+                "AND c.codeName = :containerCodeName ";
+        TypedQuery<ContainerState> q = em.createQuery(hsqlQuery, ContainerState.class);
+        q.setParameter("containerCodeName", containerCodeName);
+        q.setParameter("stateType", stateType);
+        q.setParameter("stateKind", stateKind);
+        q.setParameter("ignored", true);
+        return q;
+    }
+
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public ContainerState() {
+    public ContainerState() {
         super();
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("container", "lsValues");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("container", "lsValues");
 
-	public static long countContainerStates() {
+    public static long countContainerStates() {
         return entityManager().createQuery("SELECT COUNT(o) FROM ContainerState o", Long.class).getSingleResult();
     }
 
-	public static List<ContainerState> findAllContainerStates() {
+    public static List<ContainerState> findAllContainerStates() {
         return entityManager().createQuery("SELECT o FROM ContainerState o", ContainerState.class).getResultList();
     }
 
-	public static List<ContainerState> findAllContainerStates(String sortFieldName, String sortOrder) {
+    public static List<ContainerState> findAllContainerStates(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ContainerState o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -212,16 +228,19 @@ public static List<ContainerState> findAllContainerStates(String sortFieldName,
         return entityManager().createQuery(jpaQuery, ContainerState.class).getResultList();
     }
 
-	public static ContainerState findContainerState(Long id) {
-        if (id == null) return null;
+    public static ContainerState findContainerState(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ContainerState.class, id);
     }
 
-	public static List<ContainerState> findContainerStateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ContainerState o", ContainerState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ContainerState> findContainerStateEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ContainerState o", ContainerState.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ContainerState> findContainerStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ContainerState> findContainerStateEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM ContainerState o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -229,71 +248,86 @@ public static List<ContainerState> findContainerStateEntries(int firstResult, in
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ContainerState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ContainerState.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public ContainerState merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ContainerState merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public Container getContainer() {
+    public Container getContainer() {
         return this.container;
     }
 
-	public void setContainer(Container container) {
+    public void setContainer(Container container) {
         this.container = container;
     }
 
-	public Set<ContainerValue> getLsValues() {
+    public Set<ContainerValue> getLsValues() {
         return this.lsValues;
     }
 
-	public void setLsValues(Set<ContainerValue> lsValues) {
+    public void setLsValues(Set<ContainerValue> lsValues) {
         this.lsValues = lsValues;
     }
 
-	public static Long countFindContainerStatesByContainer(Container container) {
-        if (container == null) throw new IllegalArgumentException("The container argument is required");
+    public static Long countFindContainerStatesByContainer(Container container) {
+        if (container == null)
+            throw new IllegalArgumentException("The container argument is required");
         EntityManager em = ContainerState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerState AS o WHERE o.container = :container", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerState AS o WHERE o.container = :container",
+                Long.class);
         q.setParameter("container", container);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindContainerStatesByContainerAndLsKindEqualsAndIgnoredNot(Container container, String lsKind, boolean ignored) {
-        if (container == null) throw new IllegalArgumentException("The container argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static Long countFindContainerStatesByContainerAndLsKindEqualsAndIgnoredNot(Container container,
+            String lsKind, boolean ignored) {
+        if (container == null)
+            throw new IllegalArgumentException("The container argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = ContainerState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerState AS o WHERE o.container = :container AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ContainerState AS o WHERE o.container = :container AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored",
+                Long.class);
         q.setParameter("container", container);
         q.setParameter("lsKind", lsKind);
         q.setParameter("ignored", ignored);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindContainerStatesByIgnoredNot(boolean ignored) {
+    public static Long countFindContainerStatesByIgnoredNot(boolean ignored) {
         EntityManager em = ContainerState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerState AS o WHERE o.ignored IS NOT :ignored", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerState AS o WHERE o.ignored IS NOT :ignored",
+                Long.class);
         q.setParameter("ignored", ignored);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<ContainerState> findContainerStatesByContainer(Container container) {
-        if (container == null) throw new IllegalArgumentException("The container argument is required");
+    public static TypedQuery<ContainerState> findContainerStatesByContainer(Container container) {
+        if (container == null)
+            throw new IllegalArgumentException("The container argument is required");
         EntityManager em = ContainerState.entityManager();
-        TypedQuery<ContainerState> q = em.createQuery("SELECT o FROM ContainerState AS o WHERE o.container = :container", ContainerState.class);
+        TypedQuery<ContainerState> q = em
+                .createQuery("SELECT o FROM ContainerState AS o WHERE o.container = :container", ContainerState.class);
         q.setParameter("container", container);
         return q;
     }
 
-	public static TypedQuery<ContainerState> findContainerStatesByContainer(Container container, String sortFieldName, String sortOrder) {
-        if (container == null) throw new IllegalArgumentException("The container argument is required");
+    public static TypedQuery<ContainerState> findContainerStatesByContainer(Container container, String sortFieldName,
+            String sortOrder) {
+        if (container == null)
+            throw new IllegalArgumentException("The container argument is required");
         EntityManager em = ContainerState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerState AS o WHERE o.container = :container");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ContainerState AS o WHERE o.container = :container");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -305,22 +339,31 @@ public static TypedQuery<ContainerState> findContainerStatesByContainer(Containe
         return q;
     }
 
-	public static TypedQuery<ContainerState> findContainerStatesByContainerAndLsKindEqualsAndIgnoredNot(Container container, String lsKind, boolean ignored) {
-        if (container == null) throw new IllegalArgumentException("The container argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<ContainerState> findContainerStatesByContainerAndLsKindEqualsAndIgnoredNot(
+            Container container, String lsKind, boolean ignored) {
+        if (container == null)
+            throw new IllegalArgumentException("The container argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = ContainerState.entityManager();
-        TypedQuery<ContainerState> q = em.createQuery("SELECT o FROM ContainerState AS o WHERE o.container = :container AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored", ContainerState.class);
+        TypedQuery<ContainerState> q = em.createQuery(
+                "SELECT o FROM ContainerState AS o WHERE o.container = :container AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored",
+                ContainerState.class);
         q.setParameter("container", container);
         q.setParameter("lsKind", lsKind);
         q.setParameter("ignored", ignored);
         return q;
     }
 
-	public static TypedQuery<ContainerState> findContainerStatesByContainerAndLsKindEqualsAndIgnoredNot(Container container, String lsKind, boolean ignored, String sortFieldName, String sortOrder) {
-        if (container == null) throw new IllegalArgumentException("The container argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<ContainerState> findContainerStatesByContainerAndLsKindEqualsAndIgnoredNot(
+            Container container, String lsKind, boolean ignored, String sortFieldName, String sortOrder) {
+        if (container == null)
+            throw new IllegalArgumentException("The container argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = ContainerState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerState AS o WHERE o.container = :container AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ContainerState AS o WHERE o.container = :container AND o.lsKind = :lsKind  AND o.ignored IS NOT :ignored");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -334,16 +377,19 @@ public static TypedQuery<ContainerState> findContainerStatesByContainerAndLsKind
         return q;
     }
 
-	public static TypedQuery<ContainerState> findContainerStatesByIgnoredNot(boolean ignored) {
+    public static TypedQuery<ContainerState> findContainerStatesByIgnoredNot(boolean ignored) {
         EntityManager em = ContainerState.entityManager();
-        TypedQuery<ContainerState> q = em.createQuery("SELECT o FROM ContainerState AS o WHERE o.ignored IS NOT :ignored", ContainerState.class);
+        TypedQuery<ContainerState> q = em
+                .createQuery("SELECT o FROM ContainerState AS o WHERE o.ignored IS NOT :ignored", ContainerState.class);
         q.setParameter("ignored", ignored);
         return q;
     }
 
-	public static TypedQuery<ContainerState> findContainerStatesByIgnoredNot(boolean ignored, String sortFieldName, String sortOrder) {
+    public static TypedQuery<ContainerState> findContainerStatesByIgnoredNot(boolean ignored, String sortFieldName,
+            String sortOrder) {
         EntityManager em = ContainerState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerState AS o WHERE o.ignored IS NOT :ignored");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ContainerState AS o WHERE o.ignored IS NOT :ignored");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerType.java b/src/main/java/com/labsynch/labseer/domain/ContainerType.java
index 74d31c72c..3d3cfd83a 100755
--- a/src/main/java/com/labsynch/labseer/domain/ContainerType.java
+++ b/src/main/java/com/labsynch/labseer/domain/ContainerType.java
@@ -34,54 +34,60 @@ public class ContainerType {
     @Size(max = 128)
     private String typeName;
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ContainerType fromJsonToContainerType(String json) {
+    public static ContainerType fromJsonToContainerType(String json) {
         return new JSONDeserializer<ContainerType>()
-        .use(null, ContainerType.class).deserialize(json);
+                .use(null, ContainerType.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ContainerType> collection) {
+    public static String toJsonArray(Collection<ContainerType> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ContainerType> collection, String[] fields) {
+    public static String toJsonArray(Collection<ContainerType> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ContainerType> fromJsonArrayToContainerTypes(String json) {
+    public static Collection<ContainerType> fromJsonArrayToContainerTypes(String json) {
         return new JSONDeserializer<List<ContainerType>>()
-        .use("values", ContainerType.class).deserialize(json);
+                .use("values", ContainerType.class).deserialize(json);
     }
 
-	public static Long countFindContainerTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static Long countFindContainerTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = ContainerType.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerType AS o WHERE o.typeName = :typeName", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerType AS o WHERE o.typeName = :typeName",
+                Long.class);
         q.setParameter("typeName", typeName);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<ContainerType> findContainerTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static TypedQuery<ContainerType> findContainerTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = ContainerType.entityManager();
-        TypedQuery<ContainerType> q = em.createQuery("SELECT o FROM ContainerType AS o WHERE o.typeName = :typeName", ContainerType.class);
+        TypedQuery<ContainerType> q = em.createQuery("SELECT o FROM ContainerType AS o WHERE o.typeName = :typeName",
+                ContainerType.class);
         q.setParameter("typeName", typeName);
         return q;
     }
 
-	public static TypedQuery<ContainerType> findContainerTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static TypedQuery<ContainerType> findContainerTypesByTypeNameEquals(String typeName, String sortFieldName,
+            String sortOrder) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = ContainerType.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerType AS o WHERE o.typeName = :typeName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -95,56 +101,58 @@ public static TypedQuery<ContainerType> findContainerTypesByTypeNameEquals(Strin
         return q;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	@Id
+    @Id
     @SequenceGenerator(name = "containerTypeGen", sequenceName = "CONTAINER_TYPE_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "containerTypeGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new ContainerType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countContainerTypes() {
+    public static long countContainerTypes() {
         return entityManager().createQuery("SELECT COUNT(o) FROM ContainerType o", Long.class).getSingleResult();
     }
 
-	public static List<ContainerType> findAllContainerTypes() {
+    public static List<ContainerType> findAllContainerTypes() {
         return entityManager().createQuery("SELECT o FROM ContainerType o", ContainerType.class).getResultList();
     }
 
-	public static List<ContainerType> findAllContainerTypes(String sortFieldName, String sortOrder) {
+    public static List<ContainerType> findAllContainerTypes(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ContainerType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -155,16 +163,19 @@ public static List<ContainerType> findAllContainerTypes(String sortFieldName, St
         return entityManager().createQuery(jpaQuery, ContainerType.class).getResultList();
     }
 
-	public static ContainerType findContainerType(Long id) {
-        if (id == null) return null;
+    public static ContainerType findContainerType(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ContainerType.class, id);
     }
 
-	public static List<ContainerType> findContainerTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ContainerType o", ContainerType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ContainerType> findContainerTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ContainerType o", ContainerType.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ContainerType> findContainerTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ContainerType> findContainerTypeEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM ContainerType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -172,18 +183,21 @@ public static List<ContainerType> findContainerTypeEntries(int firstResult, int
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ContainerType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ContainerType.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -192,31 +206,34 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public ContainerType merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ContainerType merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String getTypeName() {
+    public String getTypeName() {
         return this.typeName;
     }
 
-	public void setTypeName(String typeName) {
+    public void setTypeName(String typeName) {
         this.typeName = typeName;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ContainerValue.java b/src/main/java/com/labsynch/labseer/domain/ContainerValue.java
index 289beb462..5507ae020 100755
--- a/src/main/java/com/labsynch/labseer/domain/ContainerValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ContainerValue.java
@@ -33,76 +33,76 @@
 public class ContainerValue extends AbstractValue {
 
     private static final Logger logger = LoggerFactory.getLogger(ContainerValue.class);
-    
+
     @SuppressWarnings("unused")
-	public ContainerValue (){
-		String lsType;
-    	String lsKind;
-    	String lsTypeAndKind;
-    	String stringValue;
-    	String codeValue;
-    	String fileValue;
-    	String urlValue;
-    	Date dateValue;
+    public ContainerValue() {
+        String lsType;
+        String lsKind;
+        String lsTypeAndKind;
+        String stringValue;
+        String codeValue;
+        String fileValue;
+        String urlValue;
+        Date dateValue;
         String clobValue;
         byte[] blobValue;
-    	String operatorType;
-    	String operatorKind;
-    	String operatorTypeAndKind;
-    	BigDecimal numericValue;
-    	Integer sigFigs;
-    	BigDecimal uncertainty;
-    	Integer numberOfReplicates;
-    	String uncertaintyType;
-    	String unitType;
-    	String unitKind;
-    	String unitTypeAndKind;
-    	String comments;
-    	boolean ignored;
-    	Long lsTransaction;
-    	Date recordedDate;
-    	String recordedBy;
-    	Date modifiedDate;
-    	String modifiedBy;
-    	boolean publicData;
+        String operatorType;
+        String operatorKind;
+        String operatorTypeAndKind;
+        BigDecimal numericValue;
+        Integer sigFigs;
+        BigDecimal uncertainty;
+        Integer numberOfReplicates;
+        String uncertaintyType;
+        String unitType;
+        String unitKind;
+        String unitTypeAndKind;
+        String comments;
+        boolean ignored;
+        Long lsTransaction;
+        Date recordedDate;
+        String recordedBy;
+        Date modifiedDate;
+        String modifiedBy;
+        boolean publicData;
     }
 
     @SuppressWarnings("unused")
-    public ContainerValue (String recordedByIn, Date recordedDateIn, Long lsTransactionIn, 
-    		String lsTypeIn, String lsKindIn, String lsTypeAndKindIn, String stringValueIn, 
-    		String codeValueIn, String batchSizeIn, String urlValueIn, Date dateValueIn, 
-    		String clobValueIn, byte[] blobValueIn, String operatorTypeIn, String operatorKindIn
-    		
-    		){
-		String lsType = lsTypeIn;
-    	String lsKind = lsKindIn;
-    	String lsTypeAndKind = lsTypeAndKindIn;
-    	String stringValue = stringValueIn;
-    	String codeValue = codeValueIn;
-    	String batchSize = batchSizeIn;
-    	String urlValue = urlValueIn;
-    	Date dateValue = dateValueIn;
+    public ContainerValue(String recordedByIn, Date recordedDateIn, Long lsTransactionIn,
+            String lsTypeIn, String lsKindIn, String lsTypeAndKindIn, String stringValueIn,
+            String codeValueIn, String batchSizeIn, String urlValueIn, Date dateValueIn,
+            String clobValueIn, byte[] blobValueIn, String operatorTypeIn, String operatorKindIn
+
+    ) {
+        String lsType = lsTypeIn;
+        String lsKind = lsKindIn;
+        String lsTypeAndKind = lsTypeAndKindIn;
+        String stringValue = stringValueIn;
+        String codeValue = codeValueIn;
+        String batchSize = batchSizeIn;
+        String urlValue = urlValueIn;
+        Date dateValue = dateValueIn;
         String clobValue = clobValueIn;
         byte[] blobValue = blobValueIn;
-    	String operatorType = operatorTypeIn;
-    	String operatorKind = operatorKindIn;
-    	String operatorTypeAndKind;
-    	BigDecimal numericValue;
-    	Integer sigFigs;
-    	BigDecimal uncertainty;
-    	Integer numberOfReplicates;
-    	String uncertaintyType;
-    	String unitType;
-    	String unitKind;
-    	String unitTypeAndKind;
-    	String comments;
-    	boolean ignored;
-    	Long lsTransaction = lsTransactionIn;
-    	Date recordedDate = recordedDateIn;
-    	String recordedBy;
-    	Date modifiedDate;
-    	String modifiedBy;
-    	boolean publicData;
+        String operatorType = operatorTypeIn;
+        String operatorKind = operatorKindIn;
+        String operatorTypeAndKind;
+        BigDecimal numericValue;
+        Integer sigFigs;
+        BigDecimal uncertainty;
+        Integer numberOfReplicates;
+        String uncertaintyType;
+        String unitType;
+        String unitKind;
+        String unitTypeAndKind;
+        String comments;
+        boolean ignored;
+        Long lsTransaction = lsTransactionIn;
+        Date recordedDate = recordedDateIn;
+        String recordedBy;
+        Date modifiedDate;
+        String modifiedBy;
+        boolean publicData;
     }
 
     public ContainerValue(ContainerValue containerValue) {
@@ -115,16 +115,15 @@ public ContainerValue(ContainerValue containerValue) {
         super.setLsKind(containerValue.getLsKind());
         super.setIgnored(containerValue.isIgnored());
     }
-    
+
     public static ContainerValue create(ContainerValue containerValue) {
-    	ContainerValue newContainerValue = new JSONDeserializer<ContainerValue>().use(null, ContainerValue.class).
-        		deserializeInto(containerValue.toJson(), 
-        				new ContainerValue());	
-    
+        ContainerValue newContainerValue = new JSONDeserializer<ContainerValue>().use(null, ContainerValue.class)
+                .deserializeInto(containerValue.toJson(),
+                        new ContainerValue());
+
         return newContainerValue;
     }
 
-    
     @NotNull
     @ManyToOne
     @JoinColumn(name = "container_state_id")
@@ -139,14 +138,16 @@ public static List<com.labsynch.labseer.domain.ContainerValue> findAllContainerV
     }
 
     public static com.labsynch.labseer.domain.ContainerValue findContainerValue(Long id) {
-        if (id == null) return null;
+        if (id == null)
+            return null;
         return entityManager().find(ContainerValue.class, id);
     }
 
     public static long countValidContainerValues() {
         boolean ignored = true;
         EntityManager em = ContainerValue.entityManager();
-        TypedQuery<Long> q = em.createQuery("SELECT COUNT(o) FROM ContainerValue AS o WHERE o.ignored IS NOT :ignored", Long.class);
+        TypedQuery<Long> q = em.createQuery("SELECT COUNT(o) FROM ContainerValue AS o WHERE o.ignored IS NOT :ignored",
+                Long.class);
         q.setParameter("ignored", ignored);
         return q.getSingleResult();
     }
@@ -154,15 +155,19 @@ public static long countValidContainerValues() {
     public static List<com.labsynch.labseer.domain.ContainerValue> findValidContainerValues(int maxResults) {
         boolean ignored = true;
         EntityManager em = ContainerValue.entityManager();
-        TypedQuery<ContainerValue> q = em.createQuery("SELECT o FROM ContainerValue AS o WHERE o.ignored IS NOT :ignored", ContainerValue.class).setMaxResults(maxResults);
+        TypedQuery<ContainerValue> q = em
+                .createQuery("SELECT o FROM ContainerValue AS o WHERE o.ignored IS NOT :ignored", ContainerValue.class)
+                .setMaxResults(maxResults);
         q.setParameter("ignored", ignored);
         return q.getResultList();
     }
-    
+
     public static long countValidContainerValuesByLsState(ContainerState lsState) {
         boolean ignored = true;
         EntityManager em = ContainerValue.entityManager();
-        TypedQuery<Long> q = em.createQuery("SELECT COUNT(o) FROM ContainerValue AS o WHERE o.ignored IS NOT :ignored AND o.lsState = :lsState", Long.class);
+        TypedQuery<Long> q = em.createQuery(
+                "SELECT COUNT(o) FROM ContainerValue AS o WHERE o.ignored IS NOT :ignored AND o.lsState = :lsState",
+                Long.class);
         q.setParameter("ignored", ignored);
         q.setParameter("lsState", lsState);
         return q.getSingleResult();
@@ -170,15 +175,19 @@ public static long countValidContainerValuesByLsState(ContainerState lsState) {
 
     public static long countContainerValuesByLsState(ContainerState lsState) {
         EntityManager em = ContainerValue.entityManager();
-        TypedQuery<Long> q = em.createQuery("SELECT COUNT(o) FROM ContainerValue AS o WHERE o.lsState = :lsState", Long.class);
+        TypedQuery<Long> q = em.createQuery("SELECT COUNT(o) FROM ContainerValue AS o WHERE o.lsState = :lsState",
+                Long.class);
         q.setParameter("lsState", lsState);
         return q.getSingleResult();
     }
-    
+
     public static List<ContainerValue> findValidContainerValuesByLsState(ContainerState lsState, int maxResults) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        if (lsState == null)
+            throw new IllegalArgumentException("The lsState argument is required");
         EntityManager em = ContainerValue.entityManager();
-        TypedQuery<ContainerValue> q = em.createQuery("SELECT o FROM ContainerValue AS o WHERE o.ignored IS NOT :ignored AND o.lsState = :lsState", ContainerValue.class).setFirstResult(0).setMaxResults(maxResults);
+        TypedQuery<ContainerValue> q = em.createQuery(
+                "SELECT o FROM ContainerValue AS o WHERE o.ignored IS NOT :ignored AND o.lsState = :lsState",
+                ContainerValue.class).setFirstResult(0).setMaxResults(maxResults);
         boolean ignored = true;
         q.setParameter("ignored", ignored);
         q.setParameter("lsState", lsState);
@@ -186,43 +195,55 @@ public static List<ContainerValue> findValidContainerValuesByLsState(ContainerSt
     }
 
     public static List<ContainerValue> findAllContainerValuesByLsState(ContainerState lsState, int maxResults) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        if (lsState == null)
+            throw new IllegalArgumentException("The lsState argument is required");
         EntityManager em = ContainerValue.entityManager();
-        TypedQuery<ContainerValue> q = em.createQuery("SELECT o FROM ContainerValue AS o WHERE o.lsState = :lsState", ContainerValue.class).setFirstResult(0).setMaxResults(maxResults);
+        TypedQuery<ContainerValue> q = em
+                .createQuery("SELECT o FROM ContainerValue AS o WHERE o.lsState = :lsState", ContainerValue.class)
+                .setFirstResult(0).setMaxResults(maxResults);
         q.setParameter("lsState", lsState);
         return q.getResultList();
     }
-    
+
     public static List<ContainerValue> findAllContainerValuesByLsState(ContainerState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+        if (lsState == null)
+            throw new IllegalArgumentException("The lsState argument is required");
         EntityManager em = ContainerValue.entityManager();
-//        Session session = em.unwrap(Session.class);
-//        Query q = session.createQuery("SELECT o FROM ContainerValue AS o WHERE o.lsState = :lsState");
+        // Session session = em.unwrap(Session.class);
+        // Query q = session.createQuery("SELECT o FROM ContainerValue AS o WHERE
+        // o.lsState = :lsState");
 
-        TypedQuery<ContainerValue> q = em.createQuery("SELECT o FROM ContainerValue AS o WHERE o.lsState = :lsState", ContainerValue.class);
+        TypedQuery<ContainerValue> q = em.createQuery("SELECT o FROM ContainerValue AS o WHERE o.lsState = :lsState",
+                ContainerValue.class);
         q.setParameter("lsState", lsState);
         return q.getResultList();
     }
-    
-    public static List<com.labsynch.labseer.domain.ContainerValue> findContainerValueEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ContainerValue o", ContainerValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+
+    public static List<com.labsynch.labseer.domain.ContainerValue> findContainerValueEntries(int firstResult,
+            int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ContainerValue o", ContainerValue.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-    
     public static com.labsynch.labseer.domain.ContainerValue fromJsonToContainerValue(String json) {
         return new JSONDeserializer<ContainerValue>().use(null, ContainerValue.class).deserialize(json);
     }
 
     public static Collection<com.labsynch.labseer.domain.ContainerValue> fromJsonArrayToContainerValues(String json) {
-        return new JSONDeserializer<List<ContainerValue>>().use(null, ArrayList.class).use("values", ContainerValue.class).deserialize(json);
+        return new JSONDeserializer<List<ContainerValue>>().use(null, ArrayList.class)
+                .use("values", ContainerValue.class).deserialize(json);
     }
 
     public static Collection<com.labsynch.labseer.domain.ContainerValue> fromJsonArrayToContainerValues(Reader json) {
-        return new JSONDeserializer<List<ContainerValue>>().use(null, ArrayList.class).use("values", ContainerValue.class).deserialize(json);
+        return new JSONDeserializer<List<ContainerValue>>().use(null, ArrayList.class)
+                .use("values", ContainerValue.class).deserialize(json);
     }
-    
-    public static com.labsynch.labseer.domain.ContainerValue update(com.labsynch.labseer.domain.ContainerValue containerValue) {
-        ContainerValue updatedContainerValue = new JSONDeserializer<ContainerValue>().use(null, ArrayList.class).use("values", ContainerValue.class).deserializeInto(containerValue.toJson(), ContainerValue.findContainerValue(containerValue.getId()));
+
+    public static com.labsynch.labseer.domain.ContainerValue update(
+            com.labsynch.labseer.domain.ContainerValue containerValue) {
+        ContainerValue updatedContainerValue = new JSONDeserializer<ContainerValue>().use(null, ArrayList.class)
+                .use("values", ContainerValue.class)
+                .deserializeInto(containerValue.toJson(), ContainerValue.findContainerValue(containerValue.getId()));
         updatedContainerValue.setModifiedDate(new Date());
         updatedContainerValue.merge();
         return updatedContainerValue;
@@ -230,7 +251,8 @@ public static com.labsynch.labseer.domain.ContainerValue update(com.labsynch.lab
 
     @Transactional
     public com.labsynch.labseer.domain.ContainerValue merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ContainerValue merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
@@ -258,7 +280,8 @@ public static String getContainerValueCollectionJson(List<java.lang.Long> idList
         Collection<ContainerValue> containerValues = new HashSet<ContainerValue>();
         for (Long id : idList) {
             ContainerValue query = ContainerValue.findContainerValue(id);
-            if (query != null) containerValues.add(query);
+            if (query != null)
+                containerValues.add(query);
         }
         return ContainerValue.toJsonArray(containerValues);
     }
@@ -275,100 +298,117 @@ public static String toJsonArray(Collection<com.labsynch.labseer.domain.Containe
 
     @Transactional
     public static String toJsonArrayStub(Collection<com.labsynch.labseer.domain.ContainerValue> collection) {
-        return new JSONSerializer().exclude("*.class", "lsState").transform(new ExcludeNulls(), void.class).serialize(collection);
-    }
-
-    public static TypedQuery<ContainerValue> findContainerValuesByContainerIDAndStateTypeKindAndValueTypeKind(Long containerId, String stateType,
-			String stateKind, String valueType, String valueKind) {
-
-		if (stateType == null || stateType.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-		if (valueType == null || valueType.length() == 0) throw new IllegalArgumentException("The valueType argument is required");
-		if (valueKind == null || valueKind.length() == 0) throw new IllegalArgumentException("The valueKind argument is required");
-
-		EntityManager em = entityManager();
-		String hsqlQuery = "SELECT cv FROM ContainerValue AS cv " +
-				"JOIN cv.lsState cs " +
-				"JOIN cs.container c " +
-				"WHERE cs.lsType = :stateType AND cs.lsKind = :stateKind AND cs.ignored IS NOT :ignored " +
-				"AND cv.lsType = :valueType AND cv.lsKind = :valueKind AND cv.ignored IS NOT :ignored " +
-				"AND c.ignored IS NOT :ignored " +
-				"AND c.id = :containerId ";
-		TypedQuery<ContainerValue> q = em.createQuery(hsqlQuery, ContainerValue.class);
-		q.setParameter("containerId", containerId);
-		q.setParameter("stateType", stateType);
-		q.setParameter("stateKind", stateKind);
-		q.setParameter("valueType", valueType);
-		q.setParameter("valueKind", valueKind);
-		q.setParameter("ignored", true);
-		
-		return q;
-    }
-    
-    public static TypedQuery<ContainerValue> findContainerValuesByContainerCodeNameAndStateTypeKindAndValueTypeKind(String codeName, String stateType,
-			String stateKind, String valueType, String valueKind) {
-
-		if (stateType == null || stateType.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-		if (valueType == null || valueType.length() == 0) throw new IllegalArgumentException("The valueType argument is required");
-		if (valueKind == null || valueKind.length() == 0) throw new IllegalArgumentException("The valueKind argument is required");
-
-		EntityManager em = entityManager();
-		String hsqlQuery = "SELECT cv FROM ContainerValue AS cv " +
-				"JOIN cv.lsState cs " +
-				"JOIN cs.container c " +
-				"WHERE cs.lsType = :stateType AND cs.lsKind = :stateKind AND cs.ignored IS NOT :ignored " +
-				"AND cv.lsType = :valueType AND cv.lsKind = :valueKind AND cv.ignored IS NOT :ignored " +
-				"AND c.ignored IS NOT :ignored " +
-				"AND c.codeName = :codeName ";
-		TypedQuery<ContainerValue> q = em.createQuery(hsqlQuery, ContainerValue.class);
-		q.setParameter("codeName", codeName);
-		q.setParameter("stateType", stateType);
-		q.setParameter("stateKind", stateKind);
-		q.setParameter("valueType", valueType);
-		q.setParameter("valueKind", valueKind);
-		q.setParameter("ignored", true);
-		
-		return q;
-    }
-
-	public ContainerState getLsState() {
+        return new JSONSerializer().exclude("*.class", "lsState").transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
+    }
+
+    public static TypedQuery<ContainerValue> findContainerValuesByContainerIDAndStateTypeKindAndValueTypeKind(
+            Long containerId, String stateType,
+            String stateKind, String valueType, String valueKind) {
+
+        if (stateType == null || stateType.length() == 0)
+            throw new IllegalArgumentException("The stateType argument is required");
+        if (stateKind == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateKind argument is required");
+        if (valueType == null || valueType.length() == 0)
+            throw new IllegalArgumentException("The valueType argument is required");
+        if (valueKind == null || valueKind.length() == 0)
+            throw new IllegalArgumentException("The valueKind argument is required");
+
+        EntityManager em = entityManager();
+        String hsqlQuery = "SELECT cv FROM ContainerValue AS cv " +
+                "JOIN cv.lsState cs " +
+                "JOIN cs.container c " +
+                "WHERE cs.lsType = :stateType AND cs.lsKind = :stateKind AND cs.ignored IS NOT :ignored " +
+                "AND cv.lsType = :valueType AND cv.lsKind = :valueKind AND cv.ignored IS NOT :ignored " +
+                "AND c.ignored IS NOT :ignored " +
+                "AND c.id = :containerId ";
+        TypedQuery<ContainerValue> q = em.createQuery(hsqlQuery, ContainerValue.class);
+        q.setParameter("containerId", containerId);
+        q.setParameter("stateType", stateType);
+        q.setParameter("stateKind", stateKind);
+        q.setParameter("valueType", valueType);
+        q.setParameter("valueKind", valueKind);
+        q.setParameter("ignored", true);
+
+        return q;
+    }
+
+    public static TypedQuery<ContainerValue> findContainerValuesByContainerCodeNameAndStateTypeKindAndValueTypeKind(
+            String codeName, String stateType,
+            String stateKind, String valueType, String valueKind) {
+
+        if (stateType == null || stateType.length() == 0)
+            throw new IllegalArgumentException("The stateType argument is required");
+        if (stateKind == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateKind argument is required");
+        if (valueType == null || valueType.length() == 0)
+            throw new IllegalArgumentException("The valueType argument is required");
+        if (valueKind == null || valueKind.length() == 0)
+            throw new IllegalArgumentException("The valueKind argument is required");
+
+        EntityManager em = entityManager();
+        String hsqlQuery = "SELECT cv FROM ContainerValue AS cv " +
+                "JOIN cv.lsState cs " +
+                "JOIN cs.container c " +
+                "WHERE cs.lsType = :stateType AND cs.lsKind = :stateKind AND cs.ignored IS NOT :ignored " +
+                "AND cv.lsType = :valueType AND cv.lsKind = :valueKind AND cv.ignored IS NOT :ignored " +
+                "AND c.ignored IS NOT :ignored " +
+                "AND c.codeName = :codeName ";
+        TypedQuery<ContainerValue> q = em.createQuery(hsqlQuery, ContainerValue.class);
+        q.setParameter("codeName", codeName);
+        q.setParameter("stateType", stateType);
+        q.setParameter("stateKind", stateKind);
+        q.setParameter("valueType", valueType);
+        q.setParameter("valueKind", valueKind);
+        q.setParameter("ignored", true);
+
+        return q;
+    }
+
+    public ContainerState getLsState() {
         return this.lsState;
     }
 
-	public void setLsState(ContainerState lsState) {
+    public void setLsState(ContainerState lsState) {
         this.lsState = lsState;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static Long countFindContainerValuesByIgnoredNot(boolean ignored) {
+    public static Long countFindContainerValuesByIgnoredNot(boolean ignored) {
         EntityManager em = ContainerValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerValue AS o WHERE o.ignored IS NOT :ignored", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerValue AS o WHERE o.ignored IS NOT :ignored",
+                Long.class);
         q.setParameter("ignored", ignored);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindContainerValuesByLsState(ContainerState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+    public static Long countFindContainerValuesByLsState(ContainerState lsState) {
+        if (lsState == null)
+            throw new IllegalArgumentException("The lsState argument is required");
         EntityManager em = ContainerValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerValue AS o WHERE o.lsState = :lsState", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ContainerValue AS o WHERE o.lsState = :lsState",
+                Long.class);
         q.setParameter("lsState", lsState);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<ContainerValue> findContainerValuesByIgnoredNot(boolean ignored) {
+    public static TypedQuery<ContainerValue> findContainerValuesByIgnoredNot(boolean ignored) {
         EntityManager em = ContainerValue.entityManager();
-        TypedQuery<ContainerValue> q = em.createQuery("SELECT o FROM ContainerValue AS o WHERE o.ignored IS NOT :ignored", ContainerValue.class);
+        TypedQuery<ContainerValue> q = em
+                .createQuery("SELECT o FROM ContainerValue AS o WHERE o.ignored IS NOT :ignored", ContainerValue.class);
         q.setParameter("ignored", ignored);
         return q;
     }
 
-	public static TypedQuery<ContainerValue> findContainerValuesByIgnoredNot(boolean ignored, String sortFieldName, String sortOrder) {
+    public static TypedQuery<ContainerValue> findContainerValuesByIgnoredNot(boolean ignored, String sortFieldName,
+            String sortOrder) {
         EntityManager em = ContainerValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerValue AS o WHERE o.ignored IS NOT :ignored");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ContainerValue AS o WHERE o.ignored IS NOT :ignored");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -380,16 +420,20 @@ public static TypedQuery<ContainerValue> findContainerValuesByIgnoredNot(boolean
         return q;
     }
 
-	public static TypedQuery<ContainerValue> findContainerValuesByLsState(ContainerState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+    public static TypedQuery<ContainerValue> findContainerValuesByLsState(ContainerState lsState) {
+        if (lsState == null)
+            throw new IllegalArgumentException("The lsState argument is required");
         EntityManager em = ContainerValue.entityManager();
-        TypedQuery<ContainerValue> q = em.createQuery("SELECT o FROM ContainerValue AS o WHERE o.lsState = :lsState", ContainerValue.class);
+        TypedQuery<ContainerValue> q = em.createQuery("SELECT o FROM ContainerValue AS o WHERE o.lsState = :lsState",
+                ContainerValue.class);
         q.setParameter("lsState", lsState);
         return q;
     }
 
-	public static TypedQuery<ContainerValue> findContainerValuesByLsState(ContainerState lsState, String sortFieldName, String sortOrder) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+    public static TypedQuery<ContainerValue> findContainerValuesByLsState(ContainerState lsState, String sortFieldName,
+            String sortOrder) {
+        if (lsState == null)
+            throw new IllegalArgumentException("The lsState argument is required");
         EntityManager em = ContainerValue.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ContainerValue AS o WHERE o.lsState = :lsState");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -403,9 +447,9 @@ public static TypedQuery<ContainerValue> findContainerValuesByLsState(ContainerS
         return q;
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsState");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsState");
 
-	public static List<ContainerValue> findAllContainerValues(String sortFieldName, String sortOrder) {
+    public static List<ContainerValue> findAllContainerValues(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ContainerValue o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -416,7 +460,8 @@ public static List<ContainerValue> findAllContainerValues(String sortFieldName,
         return entityManager().createQuery(jpaQuery, ContainerValue.class).getResultList();
     }
 
-	public static List<ContainerValue> findContainerValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ContainerValue> findContainerValueEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM ContainerValue o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -424,6 +469,7 @@ public static List<ContainerValue> findContainerValueEntries(int firstResult, in
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ContainerValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ContainerValue.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/CorpName.java b/src/main/java/com/labsynch/labseer/domain/CorpName.java
index 1b8832bcb..affa5c399 100755
--- a/src/main/java/com/labsynch/labseer/domain/CorpName.java
+++ b/src/main/java/com/labsynch/labseer/domain/CorpName.java
@@ -21,124 +21,125 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 @Entity
 @Configurable
 
 public class CorpName {
 
-	@Size(max = 50)
-	private String parentCorpName;
-
-	@Size(max = 50)
-	private String comment;
+    @Size(max = 50)
+    private String parentCorpName;
 
-	private Boolean ignore;
+    @Size(max = 50)
+    private String comment;
 
+    private Boolean ignore;
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String getParentCorpName() {
+    public String getParentCorpName() {
         return this.parentCorpName;
     }
 
-	public void setParentCorpName(String parentCorpName) {
+    public void setParentCorpName(String parentCorpName) {
         this.parentCorpName = parentCorpName;
     }
 
-	public String getComment() {
+    public String getComment() {
         return this.comment;
     }
 
-	public void setComment(String comment) {
+    public void setComment(String comment) {
         this.comment = comment;
     }
 
-	public Boolean getIgnore() {
+    public Boolean getIgnore() {
         return this.ignore;
     }
 
-	public void setIgnore(Boolean ignore) {
+    public void setIgnore(Boolean ignore) {
         this.ignore = ignore;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static CorpName fromJsonToCorpName(String json) {
+    public static CorpName fromJsonToCorpName(String json) {
         return new JSONDeserializer<CorpName>()
-        .use(null, CorpName.class).deserialize(json);
+                .use(null, CorpName.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<CorpName> collection) {
+    public static String toJsonArray(Collection<CorpName> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<CorpName> collection, String[] fields) {
+    public static String toJsonArray(Collection<CorpName> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<CorpName> fromJsonArrayToCorpNames(String json) {
+    public static Collection<CorpName> fromJsonArrayToCorpNames(String json) {
         return new JSONDeserializer<List<CorpName>>()
-        .use("values", CorpName.class).deserialize(json);
+                .use("values", CorpName.class).deserialize(json);
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("parentCorpName", "comment", "ignore");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("parentCorpName", "comment",
+            "ignore");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new CorpName().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countCorpNames() {
+    public static long countCorpNames() {
         return entityManager().createQuery("SELECT COUNT(o) FROM CorpName o", Long.class).getSingleResult();
     }
 
-	public static List<CorpName> findAllCorpNames() {
+    public static List<CorpName> findAllCorpNames() {
         return entityManager().createQuery("SELECT o FROM CorpName o", CorpName.class).getResultList();
     }
 
-	public static List<CorpName> findAllCorpNames(String sortFieldName, String sortOrder) {
+    public static List<CorpName> findAllCorpNames(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM CorpName o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -149,16 +150,19 @@ public static List<CorpName> findAllCorpNames(String sortFieldName, String sortO
         return entityManager().createQuery(jpaQuery, CorpName.class).getResultList();
     }
 
-	public static CorpName findCorpName(Long id) {
-        if (id == null) return null;
+    public static CorpName findCorpName(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(CorpName.class, id);
     }
 
-	public static List<CorpName> findCorpNameEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM CorpName o", CorpName.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<CorpName> findCorpNameEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM CorpName o", CorpName.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<CorpName> findCorpNameEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<CorpName> findCorpNameEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM CorpName o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -166,18 +170,21 @@ public static List<CorpName> findCorpNameEntries(int firstResult, int maxResults
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, CorpName.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, CorpName.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -186,21 +193,24 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public CorpName merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         CorpName merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
diff --git a/src/main/java/com/labsynch/labseer/domain/CronJob.java b/src/main/java/com/labsynch/labseer/domain/CronJob.java
index 96bdb9269..4883f73f2 100644
--- a/src/main/java/com/labsynch/labseer/domain/CronJob.java
+++ b/src/main/java/com/labsynch/labseer/domain/CronJob.java
@@ -31,44 +31,44 @@
 
 public class CronJob {
 
-	private static final Logger logger = LoggerFactory.getLogger(CronJob.class);
+    private static final Logger logger = LoggerFactory.getLogger(CronJob.class);
 
     @NotNull
     String schedule;
-    
+
     @NotNull
     String scriptType;
-    
+
     @NotNull
     String scriptFile;
-    
+
     String functionName;
-    
-    @Column(columnDefinition="text")
+
+    @Column(columnDefinition = "text")
     String scriptJSONData;
-    
+
     @NotNull
     boolean active;
-    
+
     @NotNull
     boolean ignored;
-    
+
     @NotNull
     String runUser;
-    
+
     @NotNull
-    @Column(unique=true)
+    @Column(unique = true)
     String codeName;
-    
+
     Date lastStartTime;
-    
+
     Long lastDuration;
-    
-    @Column(columnDefinition="text")
+
+    @Column(columnDefinition = "text")
     String lastResultJSON;
-    
+
     Integer numberOfExecutions;
-    
+
     public static CronJob update(CronJob cronJob) {
         CronJob updatedCronJob = CronJob.findCronJob(cronJob.getId());
         updatedCronJob.setSchedule(cronJob.getSchedule());
@@ -88,58 +88,61 @@ public static CronJob update(CronJob cronJob) {
         updatedCronJob.setVersion(CronJob.findCronJob(cronJob.getId()).getVersion());
         return updatedCronJob;
     }
-    
 
-	@Id
+    @Id
     @SequenceGenerator(name = "cronJobGen", sequenceName = "CRON_JOB_PKSEQ")
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "cronJobGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "schedule", "scriptType", "scriptFile", "functionName", "scriptJSONData", "active", "ignored", "runUser", "codeName", "lastStartTime", "lastDuration", "lastResultJSON", "numberOfExecutions", "id", "version");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "schedule",
+            "scriptType", "scriptFile", "functionName", "scriptJSONData", "active", "ignored", "runUser", "codeName",
+            "lastStartTime", "lastDuration", "lastResultJSON", "numberOfExecutions", "id", "version");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new CronJob().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countCronJobs() {
+    public static long countCronJobs() {
         return entityManager().createQuery("SELECT COUNT(o) FROM CronJob o", Long.class).getSingleResult();
     }
 
-	public static List<CronJob> findAllCronJobs() {
+    public static List<CronJob> findAllCronJobs() {
         return entityManager().createQuery("SELECT o FROM CronJob o", CronJob.class).getResultList();
     }
 
-	public static List<CronJob> findAllCronJobs(String sortFieldName, String sortOrder) {
+    public static List<CronJob> findAllCronJobs(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM CronJob o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -150,16 +153,19 @@ public static List<CronJob> findAllCronJobs(String sortFieldName, String sortOrd
         return entityManager().createQuery(jpaQuery, CronJob.class).getResultList();
     }
 
-	public static CronJob findCronJob(Long id) {
-        if (id == null) return null;
+    public static CronJob findCronJob(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(CronJob.class, id);
     }
 
-	public static List<CronJob> findCronJobEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM CronJob o", CronJob.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<CronJob> findCronJobEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM CronJob o", CronJob.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<CronJob> findCronJobEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<CronJob> findCronJobEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM CronJob o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -167,18 +173,21 @@ public static List<CronJob> findCronJobEntries(int firstResult, int maxResults,
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, CronJob.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, CronJob.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -187,178 +196,186 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public CronJob merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         CronJob merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static CronJob fromJsonToCronJob(String json) {
+    public static CronJob fromJsonToCronJob(String json) {
         return new JSONDeserializer<CronJob>()
-        .use(null, CronJob.class).deserialize(json);
+                .use(null, CronJob.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<CronJob> collection) {
+    public static String toJsonArray(Collection<CronJob> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<CronJob> collection, String[] fields) {
+    public static String toJsonArray(Collection<CronJob> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<CronJob> fromJsonArrayToCronJobs(String json) {
+    public static Collection<CronJob> fromJsonArrayToCronJobs(String json) {
         return new JSONDeserializer<List<CronJob>>()
-        .use("values", CronJob.class).deserialize(json);
+                .use("values", CronJob.class).deserialize(json);
     }
 
-	public String getSchedule() {
+    public String getSchedule() {
         return this.schedule;
     }
 
-	public void setSchedule(String schedule) {
+    public void setSchedule(String schedule) {
         this.schedule = schedule;
     }
 
-	public String getScriptType() {
+    public String getScriptType() {
         return this.scriptType;
     }
 
-	public void setScriptType(String scriptType) {
+    public void setScriptType(String scriptType) {
         this.scriptType = scriptType;
     }
 
-	public String getScriptFile() {
+    public String getScriptFile() {
         return this.scriptFile;
     }
 
-	public void setScriptFile(String scriptFile) {
+    public void setScriptFile(String scriptFile) {
         this.scriptFile = scriptFile;
     }
 
-	public String getFunctionName() {
+    public String getFunctionName() {
         return this.functionName;
     }
 
-	public void setFunctionName(String functionName) {
+    public void setFunctionName(String functionName) {
         this.functionName = functionName;
     }
 
-	public String getScriptJSONData() {
+    public String getScriptJSONData() {
         return this.scriptJSONData;
     }
 
-	public void setScriptJSONData(String scriptJSONData) {
+    public void setScriptJSONData(String scriptJSONData) {
         this.scriptJSONData = scriptJSONData;
     }
 
-	public boolean isActive() {
+    public boolean isActive() {
         return this.active;
     }
 
-	public void setActive(boolean active) {
+    public void setActive(boolean active) {
         this.active = active;
     }
 
-	public boolean isIgnored() {
+    public boolean isIgnored() {
         return this.ignored;
     }
 
-	public void setIgnored(boolean ignored) {
+    public void setIgnored(boolean ignored) {
         this.ignored = ignored;
     }
 
-	public String getRunUser() {
+    public String getRunUser() {
         return this.runUser;
     }
 
-	public void setRunUser(String runUser) {
+    public void setRunUser(String runUser) {
         this.runUser = runUser;
     }
 
-	public String getCodeName() {
+    public String getCodeName() {
         return this.codeName;
     }
 
-	public void setCodeName(String codeName) {
+    public void setCodeName(String codeName) {
         this.codeName = codeName;
     }
 
-	public Date getLastStartTime() {
+    public Date getLastStartTime() {
         return this.lastStartTime;
     }
 
-	public void setLastStartTime(Date lastStartTime) {
+    public void setLastStartTime(Date lastStartTime) {
         this.lastStartTime = lastStartTime;
     }
 
-	public Long getLastDuration() {
+    public Long getLastDuration() {
         return this.lastDuration;
     }
 
-	public void setLastDuration(Long lastDuration) {
+    public void setLastDuration(Long lastDuration) {
         this.lastDuration = lastDuration;
     }
 
-	public String getLastResultJSON() {
+    public String getLastResultJSON() {
         return this.lastResultJSON;
     }
 
-	public void setLastResultJSON(String lastResultJSON) {
+    public void setLastResultJSON(String lastResultJSON) {
         this.lastResultJSON = lastResultJSON;
     }
 
-	public Integer getNumberOfExecutions() {
+    public Integer getNumberOfExecutions() {
         return this.numberOfExecutions;
     }
 
-	public void setNumberOfExecutions(Integer numberOfExecutions) {
+    public void setNumberOfExecutions(Integer numberOfExecutions) {
         this.numberOfExecutions = numberOfExecutions;
     }
 
-	public static Long countFindCronJobsByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static Long countFindCronJobsByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = CronJob.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM CronJob AS o WHERE o.codeName = :codeName", Long.class);
         q.setParameter("codeName", codeName);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<CronJob> findCronJobsByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static TypedQuery<CronJob> findCronJobsByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = CronJob.entityManager();
-        TypedQuery<CronJob> q = em.createQuery("SELECT o FROM CronJob AS o WHERE o.codeName = :codeName", CronJob.class);
+        TypedQuery<CronJob> q = em.createQuery("SELECT o FROM CronJob AS o WHERE o.codeName = :codeName",
+                CronJob.class);
         q.setParameter("codeName", codeName);
         return q;
     }
 
-	public static TypedQuery<CronJob> findCronJobsByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static TypedQuery<CronJob> findCronJobsByCodeNameEquals(String codeName, String sortFieldName,
+            String sortOrder) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = CronJob.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM CronJob AS o WHERE o.codeName = :codeName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictKind.java b/src/main/java/com/labsynch/labseer/domain/DDictKind.java
index e7a4bd76d..fef9d9cf1 100644
--- a/src/main/java/com/labsynch/labseer/domain/DDictKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/DDictKind.java
@@ -31,96 +31,100 @@
 @Entity
 
 public class DDictKind {
-	
+
     private static final Logger logger = LoggerFactory.getLogger(DDictKind.class);
 
     @Size(max = 255)
     @JoinColumn(name = "ls_type")
     private String lsType;
-    
+
     @NotNull
     @Size(max = 255)
     private String name;
-    
+
     @Column(unique = true)
     @Size(max = 255)
-	private String lsTypeAndKind;
-    
+    private String lsTypeAndKind;
+
     @Size(max = 512)
     private String description;
 
     @Size(max = 512)
     private String comments;
-    
-	@NotNull
-	private boolean ignored;
 
-	private Integer displayOrder;
+    @NotNull
+    private boolean ignored;
 
-	
+    private Integer displayOrder;
 
-	@Id
+    @Id
     @SequenceGenerator(name = "dDictKindGen", sequenceName = "DDICT_KIND_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "dDictKindGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new DDictKind().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countDDictKinds() {
+    public static long countDDictKinds() {
         return entityManager().createQuery("SELECT COUNT(o) FROM DDictKind o", Long.class).getSingleResult();
     }
 
-	public static List<DDictKind> findAllDDictKinds() {
+    public static List<DDictKind> findAllDDictKinds() {
         return entityManager().createQuery("SELECT o FROM DDictKind o", DDictKind.class).getResultList();
     }
 
-	public static DDictKind findDDictKind(Long id) {
-        if (id == null) return null;
+    public static DDictKind findDDictKind(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(DDictKind.class, id);
     }
 
-	public static List<DDictKind> findDDictKindEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM DDictKind o", DDictKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<DDictKind> findDDictKindEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM DDictKind o", DDictKind.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-		this.setLsTypeAndKind(new StringBuilder().append(this.lsType).append("_").append(this.name).toString());
-        if (this.entityManager == null) this.entityManager = entityManager();
+        this.setLsTypeAndKind(new StringBuilder().append(this.lsType).append("_").append(this.name).toString());
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -129,108 +133,121 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public DDictKind merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-		this.setLsTypeAndKind(new StringBuilder().append(this.lsType).append("_").append(this.name).toString());
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
+        this.setLsTypeAndKind(new StringBuilder().append(this.lsType).append("_").append(this.name).toString());
         DDictKind merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String getLsType() {
+    public String getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(String lsType) {
+    public void setLsType(String lsType) {
         this.lsType = lsType;
     }
 
-	public String getName() {
+    public String getName() {
         return this.name;
     }
 
-	public void setName(String name) {
+    public void setName(String name) {
         this.name = name;
     }
 
-	public String getLsTypeAndKind() {
+    public String getLsTypeAndKind() {
         return this.lsTypeAndKind;
     }
 
-	public void setLsTypeAndKind(String lsTypeAndKind) {
+    public void setLsTypeAndKind(String lsTypeAndKind) {
         this.lsTypeAndKind = lsTypeAndKind;
     }
 
-	public String getDescription() {
+    public String getDescription() {
         return this.description;
     }
 
-	public void setDescription(String description) {
+    public void setDescription(String description) {
         this.description = description;
     }
 
-	public String getComments() {
+    public String getComments() {
         return this.comments;
     }
 
-	public void setComments(String comments) {
+    public void setComments(String comments) {
         this.comments = comments;
     }
 
-	public boolean isIgnored() {
+    public boolean isIgnored() {
         return this.ignored;
     }
 
-	public void setIgnored(boolean ignored) {
+    public void setIgnored(boolean ignored) {
         this.ignored = ignored;
     }
 
-	public Integer getDisplayOrder() {
+    public Integer getDisplayOrder() {
         return this.displayOrder;
     }
 
-	public void setDisplayOrder(Integer displayOrder) {
+    public void setDisplayOrder(Integer displayOrder) {
         this.displayOrder = displayOrder;
     }
 
-	public static Long countFindDDictKindsByLsTypeEqualsAndNameEquals(String lsType, String name) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static Long countFindDDictKindsByLsTypeEqualsAndNameEquals(String lsType, String name) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = DDictKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DDictKind AS o WHERE o.lsType = :lsType  AND o.name = :name", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM DDictKind AS o WHERE o.lsType = :lsType  AND o.name = :name", Long.class);
         q.setParameter("lsType", lsType);
         q.setParameter("name", name);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<DDictKind> findDDictKindsByLsTypeEqualsAndNameEquals(String lsType, String name) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<DDictKind> findDDictKindsByLsTypeEqualsAndNameEquals(String lsType, String name) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = DDictKind.entityManager();
-        TypedQuery<DDictKind> q = em.createQuery("SELECT o FROM DDictKind AS o WHERE o.lsType = :lsType  AND o.name = :name", DDictKind.class);
+        TypedQuery<DDictKind> q = em.createQuery(
+                "SELECT o FROM DDictKind AS o WHERE o.lsType = :lsType  AND o.name = :name", DDictKind.class);
         q.setParameter("lsType", lsType);
         q.setParameter("name", name);
         return q;
     }
 
-	public static TypedQuery<DDictKind> findDDictKindsByLsTypeEqualsAndNameEquals(String lsType, String name, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<DDictKind> findDDictKindsByLsTypeEqualsAndNameEquals(String lsType, String name,
+            String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = DDictKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DDictKind AS o WHERE o.lsType = :lsType  AND o.name = :name");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM DDictKind AS o WHERE o.lsType = :lsType  AND o.name = :name");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -243,9 +260,10 @@ public static TypedQuery<DDictKind> findDDictKindsByLsTypeEqualsAndNameEquals(St
         return q;
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType", "name", "lsTypeAndKind", "description", "comments", "ignored", "displayOrder", "id", "version", "entityManager");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType", "name",
+            "lsTypeAndKind", "description", "comments", "ignored", "displayOrder", "id", "version", "entityManager");
 
-	public static List<DDictKind> findAllDDictKinds(String sortFieldName, String sortOrder) {
+    public static List<DDictKind> findAllDDictKinds(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM DDictKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -256,7 +274,8 @@ public static List<DDictKind> findAllDDictKinds(String sortFieldName, String sor
         return entityManager().createQuery(jpaQuery, DDictKind.class).getResultList();
     }
 
-	public static List<DDictKind> findDDictKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<DDictKind> findDDictKindEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM DDictKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -264,40 +283,41 @@ public static List<DDictKind> findDDictKindEntries(int firstResult, int maxResul
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, DDictKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, DDictKind.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static DDictKind fromJsonToDDictKind(String json) {
+    public static DDictKind fromJsonToDDictKind(String json) {
         return new JSONDeserializer<DDictKind>()
-        .use(null, DDictKind.class).deserialize(json);
+                .use(null, DDictKind.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<DDictKind> collection) {
+    public static String toJsonArray(Collection<DDictKind> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<DDictKind> collection, String[] fields) {
+    public static String toJsonArray(Collection<DDictKind> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<DDictKind> fromJsonArrayToDDictKinds(String json) {
+    public static Collection<DDictKind> fromJsonArrayToDDictKinds(String json) {
         return new JSONDeserializer<List<DDictKind>>()
-        .use("values", DDictKind.class).deserialize(json);
+                .use("values", DDictKind.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictType.java b/src/main/java/com/labsynch/labseer/domain/DDictType.java
index dfd2ee644..4d2f5fcca 100644
--- a/src/main/java/com/labsynch/labseer/domain/DDictType.java
+++ b/src/main/java/com/labsynch/labseer/domain/DDictType.java
@@ -43,33 +43,34 @@ public class DDictType {
 
     @Size(max = 512)
     private String comments;
-    
-	@NotNull
-	private boolean ignored;
 
-	private Integer displayOrder;
-
-	
+    @NotNull
+    private boolean ignored;
 
+    private Integer displayOrder;
 
-	public static Long countFindDDictTypesByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static Long countFindDDictTypesByNameEquals(String name) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = DDictType.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DDictType AS o WHERE o.name = :name", Long.class);
         q.setParameter("name", name);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<DDictType> findDDictTypesByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<DDictType> findDDictTypesByNameEquals(String name) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = DDictType.entityManager();
         TypedQuery<DDictType> q = em.createQuery("SELECT o FROM DDictType AS o WHERE o.name = :name", DDictType.class);
         q.setParameter("name", name);
         return q;
     }
 
-	public static TypedQuery<DDictType> findDDictTypesByNameEquals(String name, String sortFieldName, String sortOrder) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<DDictType> findDDictTypesByNameEquals(String name, String sortFieldName,
+            String sortOrder) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = DDictType.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DDictType AS o WHERE o.name = :name");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -83,30 +84,33 @@ public static TypedQuery<DDictType> findDDictTypesByNameEquals(String name, Stri
         return q;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "name", "description", "comments", "ignored", "displayOrder");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "name",
+            "description", "comments", "ignored", "displayOrder");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new DDictType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countDDictTypes() {
+    public static long countDDictTypes() {
         return entityManager().createQuery("SELECT COUNT(o) FROM DDictType o", Long.class).getSingleResult();
     }
 
-	public static List<DDictType> findAllDDictTypes() {
+    public static List<DDictType> findAllDDictTypes() {
         return entityManager().createQuery("SELECT o FROM DDictType o", DDictType.class).getResultList();
     }
 
-	public static List<DDictType> findAllDDictTypes(String sortFieldName, String sortOrder) {
+    public static List<DDictType> findAllDDictTypes(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM DDictType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -117,16 +121,19 @@ public static List<DDictType> findAllDDictTypes(String sortFieldName, String sor
         return entityManager().createQuery(jpaQuery, DDictType.class).getResultList();
     }
 
-	public static DDictType findDDictType(Long id) {
-        if (id == null) return null;
+    public static DDictType findDDictType(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(DDictType.class, id);
     }
 
-	public static List<DDictType> findDDictTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM DDictType o", DDictType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<DDictType> findDDictTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM DDictType o", DDictType.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<DDictType> findDDictTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<DDictType> findDDictTypeEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM DDictType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -134,18 +141,21 @@ public static List<DDictType> findDDictTypeEntries(int firstResult, int maxResul
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, DDictType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, DDictType.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -154,119 +164,122 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public DDictType merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         DDictType merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String getName() {
+    public String getName() {
         return this.name;
     }
 
-	public void setName(String name) {
+    public void setName(String name) {
         this.name = name;
     }
 
-	public String getDescription() {
+    public String getDescription() {
         return this.description;
     }
 
-	public void setDescription(String description) {
+    public void setDescription(String description) {
         this.description = description;
     }
 
-	public String getComments() {
+    public String getComments() {
         return this.comments;
     }
 
-	public void setComments(String comments) {
+    public void setComments(String comments) {
         this.comments = comments;
     }
 
-	public boolean isIgnored() {
+    public boolean isIgnored() {
         return this.ignored;
     }
 
-	public void setIgnored(boolean ignored) {
+    public void setIgnored(boolean ignored) {
         this.ignored = ignored;
     }
 
-	public Integer getDisplayOrder() {
+    public Integer getDisplayOrder() {
         return this.displayOrder;
     }
 
-	public void setDisplayOrder(Integer displayOrder) {
+    public void setDisplayOrder(Integer displayOrder) {
         this.displayOrder = displayOrder;
     }
 
-	@Id
+    @Id
     @SequenceGenerator(name = "dDictTypeGen", sequenceName = "DDICT_TYPE_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "dDictTypeGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static DDictType fromJsonToDDictType(String json) {
+    public static DDictType fromJsonToDDictType(String json) {
         return new JSONDeserializer<DDictType>()
-        .use(null, DDictType.class).deserialize(json);
+                .use(null, DDictType.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<DDictType> collection) {
+    public static String toJsonArray(Collection<DDictType> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<DDictType> collection, String[] fields) {
+    public static String toJsonArray(Collection<DDictType> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<DDictType> fromJsonArrayToDDictTypes(String json) {
+    public static Collection<DDictType> fromJsonArrayToDDictTypes(String json) {
         return new JSONDeserializer<List<DDictType>>()
-        .use("values", DDictType.class).deserialize(json);
+                .use("values", DDictType.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/DDictValue.java b/src/main/java/com/labsynch/labseer/domain/DDictValue.java
index bbf32c5c1..c1da13f19 100644
--- a/src/main/java/com/labsynch/labseer/domain/DDictValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/DDictValue.java
@@ -36,7 +36,7 @@
 public class DDictValue {
 
     private static final Logger logger = LoggerFactory.getLogger(DDictValue.class);
-    
+
     @NotNull
     @Size(max = 255)
     private String lsType;
@@ -84,33 +84,32 @@ public class DDictValue {
     transient EntityManager entityManager;
 
     public DDictValue() {
-	}
-    
+    }
+
     public DDictValue(DDictValue dDict) {
-		this.lsType = dDict.getLsType();
-		this.lsKind = dDict.getLsKind();
-		this.shortName = dDict.getShortName();
-		this.labelText = dDict.getLabelText();
-		this.description = dDict.getDescription();
-		this.comments = dDict.getComments();
-		this.displayOrder = dDict.getDisplayOrder();
-		this.ignored = dDict.getIgnored();
-	}
-
-	public DDictValue(CodeTableDTO codeTableValue) {
-		this.lsType = codeTableValue.getCodeType();
-		this.lsKind = codeTableValue.getCodeKind();
-		this.shortName = codeTableValue.getCode();
-		this.labelText = codeTableValue.getName();
-		this.displayOrder = codeTableValue.getDisplayOrder();	
-		this.description = codeTableValue.getDescription();
-		this.comments = codeTableValue.getComments();
-		this.ignored = codeTableValue.isIgnored();
-		
-		}
-
-
-	public Long getId() {
+        this.lsType = dDict.getLsType();
+        this.lsKind = dDict.getLsKind();
+        this.shortName = dDict.getShortName();
+        this.labelText = dDict.getLabelText();
+        this.description = dDict.getDescription();
+        this.comments = dDict.getComments();
+        this.displayOrder = dDict.getDisplayOrder();
+        this.ignored = dDict.getIgnored();
+    }
+
+    public DDictValue(CodeTableDTO codeTableValue) {
+        this.lsType = codeTableValue.getCodeType();
+        this.lsKind = codeTableValue.getCodeKind();
+        this.shortName = codeTableValue.getCode();
+        this.labelText = codeTableValue.getName();
+        this.displayOrder = codeTableValue.getDisplayOrder();
+        this.description = codeTableValue.getDescription();
+        this.comments = codeTableValue.getComments();
+        this.ignored = codeTableValue.isIgnored();
+
+    }
+
+    public Long getId() {
         return this.id;
     }
 
@@ -140,7 +139,9 @@ public boolean getIgnored() {
 
     public static final EntityManager entityManager() {
         EntityManager em = new DDictValue().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
@@ -153,24 +154,28 @@ public static List<com.labsynch.labseer.domain.DDictValue> findAllDDictValues()
     }
 
     public static com.labsynch.labseer.domain.DDictValue findDDictValue(Long id) {
-        if (id == null) return null;
+        if (id == null)
+            return null;
         return entityManager().find(DDictValue.class, id);
     }
 
     public static List<com.labsynch.labseer.domain.DDictValue> findDDictValueEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM DDictValue o", DDictValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery("SELECT o FROM DDictValue o", DDictValue.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
     @Transactional
     public void persist() {
         this.setLsTypeAndKind(new StringBuilder().append(this.lsType).append("_").append(this.lsKind).toString());
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
     @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -181,19 +186,22 @@ public void remove() {
 
     @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
     @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
     @Transactional
     public com.labsynch.labseer.domain.DDictValue merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.setLsTypeAndKind(new StringBuilder().append(this.lsType).append("_").append(this.lsKind).toString());
         DDictValue merged = this.entityManager.merge(this);
         this.entityManager.flush();
@@ -213,7 +221,8 @@ public static String toJsonArray(Collection<com.labsynch.labseer.domain.DDictVal
     }
 
     public static Collection<com.labsynch.labseer.domain.DDictValue> fromJsonArrayToDDictValues(String json) {
-        return new JSONDeserializer<List<DDictValue>>().use(null, ArrayList.class).use("values", DDictValue.class).deserialize(json);
+        return new JSONDeserializer<List<DDictValue>>().use(null, ArrayList.class).use("values", DDictValue.class)
+                .deserialize(json);
     }
 
     public static List<com.labsynch.labseer.dto.CodeTableDTO> getDDictValueCodeTableByKindEquals(String lsKind) {
@@ -231,16 +240,17 @@ public static List<com.labsynch.labseer.dto.CodeTableDTO> getDDictValueCodeTable
         return codeTableList;
     }
 
-	
     public static TypedQuery<DDictValue> findDDictValuesByLsKindEquals(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = Experiment.entityManager();
-        TypedQuery<DDictValue> q = em.createQuery("SELECT o FROM DDictValue AS o WHERE o.lsKind = :lsKind", DDictValue.class);
+        TypedQuery<DDictValue> q = em.createQuery("SELECT o FROM DDictValue AS o WHERE o.lsKind = :lsKind",
+                DDictValue.class);
         q.setParameter("lsKind", lsKind);
         return q;
     }
 
-	@Transactional
+    @Transactional
     public static List<com.labsynch.labseer.dto.CodeTableDTO> getDDictCodeTable() {
         List<CodeTableDTO> codeTableList = new ArrayList<CodeTableDTO>();
         List<DDictValue> dDicts = DDictValue.findDDictValuesByIgnoredNot(true).getResultList();
@@ -252,53 +262,57 @@ public static List<com.labsynch.labseer.dto.CodeTableDTO> getDDictCodeTable() {
     }
 
     public static String[] getColumns() {
-        String[] headerColumns = new String[] { "id", "codeName", "shortName", "lsType", "lsKind", "labelText", "description", "comments", "ignored", "displayOrder" };
+        String[] headerColumns = new String[] { "id", "codeName", "shortName", "lsType", "lsKind", "labelText",
+                "description", "comments", "ignored", "displayOrder" };
         return headerColumns;
     }
 
     public static CellProcessor[] getProcessors() {
-        final CellProcessor[] processors = new CellProcessor[] { new Optional(), new Optional(), new Optional(), new Optional(), new Optional(), new Optional(), new Optional(), new Optional(), new Optional(), new Optional() };
+        final CellProcessor[] processors = new CellProcessor[] { new Optional(), new Optional(), new Optional(),
+                new Optional(), new Optional(), new Optional(), new Optional(), new Optional(), new Optional(),
+                new Optional() };
         return processors;
     }
 
-	public static boolean validate(DDictValue dDict) {
-		boolean validLsType = validateLsType(dDict.getLsType());
-		boolean validLsKind = validateLsKind(dDict.getLsType(), dDict.getLsKind());
-		if (validLsType && validLsKind){
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	private static boolean validateLsKind(String lsType, String lsKind) {
-		int dDictKinds = DDictKind.findDDictKindsByLsTypeEqualsAndNameEquals(lsType, lsKind).getMaxResults();
-		if (dDictKinds == 1){
-			return true;
-		} else {
-			logger.error("Did not validate the DDictKind");
-			return false;
-		}
-	}
-	
-
-	private static boolean validateLsType(String lsType) {
-		int dDictTypes = DDictType.findDDictTypesByNameEquals(lsType).getMaxResults();
-		if (dDictTypes == 1){
-			return true;
-		} else {
-			logger.error("Did not validate the DDictType");
-			return false;
-		}
-	}
-
-	public String toString() {
+    public static boolean validate(DDictValue dDict) {
+        boolean validLsType = validateLsType(dDict.getLsType());
+        boolean validLsKind = validateLsKind(dDict.getLsType(), dDict.getLsKind());
+        if (validLsType && validLsKind) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    private static boolean validateLsKind(String lsType, String lsKind) {
+        int dDictKinds = DDictKind.findDDictKindsByLsTypeEqualsAndNameEquals(lsType, lsKind).getMaxResults();
+        if (dDictKinds == 1) {
+            return true;
+        } else {
+            logger.error("Did not validate the DDictKind");
+            return false;
+        }
+    }
+
+    private static boolean validateLsType(String lsType) {
+        int dDictTypes = DDictType.findDDictTypesByNameEquals(lsType).getMaxResults();
+        if (dDictTypes == 1) {
+            return true;
+        } else {
+            logger.error("Did not validate the DDictType");
+            return false;
+        }
+    }
+
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType", "lsKind", "lsTypeAndKind", "shortName", "labelText", "description", "comments", "ignored", "displayOrder", "codeName", "id", "version", "entityManager");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType",
+            "lsKind", "lsTypeAndKind", "shortName", "labelText", "description", "comments", "ignored", "displayOrder",
+            "codeName", "id", "version", "entityManager");
 
-	public static List<DDictValue> findAllDDictValues(String sortFieldName, String sortOrder) {
+    public static List<DDictValue> findAllDDictValues(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM DDictValue o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -309,7 +323,8 @@ public static List<DDictValue> findAllDDictValues(String sortFieldName, String s
         return entityManager().createQuery(jpaQuery, DDictValue.class).getResultList();
     }
 
-	public static List<DDictValue> findDDictValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<DDictValue> findDDictValueEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM DDictValue o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -317,26 +332,30 @@ public static List<DDictValue> findDDictValueEntries(int firstResult, int maxRes
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, DDictValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, DDictValue.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static Long countFindDDictValuesByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static Long countFindDDictValuesByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = DDictValue.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DDictValue AS o WHERE o.codeName = :codeName", Long.class);
         q.setParameter("codeName", codeName);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindDDictValuesByIgnoredNot(boolean ignored) {
+    public static Long countFindDDictValuesByIgnoredNot(boolean ignored) {
         EntityManager em = DDictValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DDictValue AS o WHERE o.ignored IS NOT :ignored", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DDictValue AS o WHERE o.ignored IS NOT :ignored",
+                Long.class);
         q.setParameter("ignored", ignored);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindDDictValuesByLabelTextLike(String labelText) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+    public static Long countFindDDictValuesByLabelTextLike(String labelText) {
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
         labelText = labelText.replace('*', '%');
         if (labelText.charAt(0) != '%') {
             labelText = "%" + labelText;
@@ -345,59 +364,75 @@ public static Long countFindDDictValuesByLabelTextLike(String labelText) {
             labelText = labelText + "%";
         }
         EntityManager em = DDictValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DDictValue AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM DDictValue AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", Long.class);
         q.setParameter("labelText", labelText);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindDDictValuesByLsKindEquals(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static Long countFindDDictValuesByLsKindEquals(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = DDictValue.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DDictValue AS o WHERE o.lsKind = :lsKind", Long.class);
         q.setParameter("lsKind", lsKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindDDictValuesByLsTypeEquals(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+    public static Long countFindDDictValuesByLsTypeEquals(String lsType) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = DDictValue.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DDictValue AS o WHERE o.lsType = :lsType", Long.class);
         q.setParameter("lsType", lsType);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindDDictValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static Long countFindDDictValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = DDictValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DDictValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM DDictValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals(String lsType, String lsKind, String shortName) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (shortName == null || shortName.length() == 0) throw new IllegalArgumentException("The shortName argument is required");
+    public static Long countFindDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals(String lsType, String lsKind,
+            String shortName) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (shortName == null || shortName.length() == 0)
+            throw new IllegalArgumentException("The shortName argument is required");
         EntityManager em = DDictValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DDictValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.shortName = :shortName", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM DDictValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.shortName = :shortName",
+                Long.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         q.setParameter("shortName", shortName);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<DDictValue> findDDictValuesByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static TypedQuery<DDictValue> findDDictValuesByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = DDictValue.entityManager();
-        TypedQuery<DDictValue> q = em.createQuery("SELECT o FROM DDictValue AS o WHERE o.codeName = :codeName", DDictValue.class);
+        TypedQuery<DDictValue> q = em.createQuery("SELECT o FROM DDictValue AS o WHERE o.codeName = :codeName",
+                DDictValue.class);
         q.setParameter("codeName", codeName);
         return q;
     }
 
-	public static TypedQuery<DDictValue> findDDictValuesByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static TypedQuery<DDictValue> findDDictValuesByCodeNameEquals(String codeName, String sortFieldName,
+            String sortOrder) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = DDictValue.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DDictValue AS o WHERE o.codeName = :codeName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -411,14 +446,16 @@ public static TypedQuery<DDictValue> findDDictValuesByCodeNameEquals(String code
         return q;
     }
 
-	public static TypedQuery<DDictValue> findDDictValuesByIgnoredNot(boolean ignored) {
+    public static TypedQuery<DDictValue> findDDictValuesByIgnoredNot(boolean ignored) {
         EntityManager em = DDictValue.entityManager();
-        TypedQuery<DDictValue> q = em.createQuery("SELECT o FROM DDictValue AS o WHERE o.ignored IS NOT :ignored", DDictValue.class);
+        TypedQuery<DDictValue> q = em.createQuery("SELECT o FROM DDictValue AS o WHERE o.ignored IS NOT :ignored",
+                DDictValue.class);
         q.setParameter("ignored", ignored);
         return q;
     }
 
-	public static TypedQuery<DDictValue> findDDictValuesByIgnoredNot(boolean ignored, String sortFieldName, String sortOrder) {
+    public static TypedQuery<DDictValue> findDDictValuesByIgnoredNot(boolean ignored, String sortFieldName,
+            String sortOrder) {
         EntityManager em = DDictValue.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DDictValue AS o WHERE o.ignored IS NOT :ignored");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -432,8 +469,9 @@ public static TypedQuery<DDictValue> findDDictValuesByIgnoredNot(boolean ignored
         return q;
     }
 
-	public static TypedQuery<DDictValue> findDDictValuesByLabelTextLike(String labelText) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+    public static TypedQuery<DDictValue> findDDictValuesByLabelTextLike(String labelText) {
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
         labelText = labelText.replace('*', '%');
         if (labelText.charAt(0) != '%') {
             labelText = "%" + labelText;
@@ -442,13 +480,16 @@ public static TypedQuery<DDictValue> findDDictValuesByLabelTextLike(String label
             labelText = labelText + "%";
         }
         EntityManager em = DDictValue.entityManager();
-        TypedQuery<DDictValue> q = em.createQuery("SELECT o FROM DDictValue AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", DDictValue.class);
+        TypedQuery<DDictValue> q = em.createQuery(
+                "SELECT o FROM DDictValue AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", DDictValue.class);
         q.setParameter("labelText", labelText);
         return q;
     }
 
-	public static TypedQuery<DDictValue> findDDictValuesByLabelTextLike(String labelText, String sortFieldName, String sortOrder) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+    public static TypedQuery<DDictValue> findDDictValuesByLabelTextLike(String labelText, String sortFieldName,
+            String sortOrder) {
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
         labelText = labelText.replace('*', '%');
         if (labelText.charAt(0) != '%') {
             labelText = "%" + labelText;
@@ -457,7 +498,8 @@ public static TypedQuery<DDictValue> findDDictValuesByLabelTextLike(String label
             labelText = labelText + "%";
         }
         EntityManager em = DDictValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DDictValue AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM DDictValue AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -469,8 +511,10 @@ public static TypedQuery<DDictValue> findDDictValuesByLabelTextLike(String label
         return q;
     }
 
-	public static TypedQuery<DDictValue> findDDictValuesByLsKindEquals(String lsKind, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<DDictValue> findDDictValuesByLsKindEquals(String lsKind, String sortFieldName,
+            String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = DDictValue.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DDictValue AS o WHERE o.lsKind = :lsKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -484,16 +528,20 @@ public static TypedQuery<DDictValue> findDDictValuesByLsKindEquals(String lsKind
         return q;
     }
 
-	public static TypedQuery<DDictValue> findDDictValuesByLsTypeEquals(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<DDictValue> findDDictValuesByLsTypeEquals(String lsType) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = DDictValue.entityManager();
-        TypedQuery<DDictValue> q = em.createQuery("SELECT o FROM DDictValue AS o WHERE o.lsType = :lsType", DDictValue.class);
+        TypedQuery<DDictValue> q = em.createQuery("SELECT o FROM DDictValue AS o WHERE o.lsType = :lsType",
+                DDictValue.class);
         q.setParameter("lsType", lsType);
         return q;
     }
 
-	public static TypedQuery<DDictValue> findDDictValuesByLsTypeEquals(String lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<DDictValue> findDDictValuesByLsTypeEquals(String lsType, String sortFieldName,
+            String sortOrder) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = DDictValue.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DDictValue AS o WHERE o.lsType = :lsType");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -507,21 +555,28 @@ public static TypedQuery<DDictValue> findDDictValuesByLsTypeEquals(String lsType
         return q;
     }
 
-	public static TypedQuery<DDictValue> findDDictValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<DDictValue> findDDictValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = DDictValue.entityManager();
-        TypedQuery<DDictValue> q = em.createQuery("SELECT o FROM DDictValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", DDictValue.class);
+        TypedQuery<DDictValue> q = em.createQuery(
+                "SELECT o FROM DDictValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", DDictValue.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         return q;
     }
 
-	public static TypedQuery<DDictValue> findDDictValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<DDictValue> findDDictValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind,
+            String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = DDictValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DDictValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM DDictValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -534,24 +589,35 @@ public static TypedQuery<DDictValue> findDDictValuesByLsTypeEqualsAndLsKindEqual
         return q;
     }
 
-	public static TypedQuery<DDictValue> findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals(String lsType, String lsKind, String shortName) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (shortName == null || shortName.length() == 0) throw new IllegalArgumentException("The shortName argument is required");
+    public static TypedQuery<DDictValue> findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals(String lsType,
+            String lsKind, String shortName) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (shortName == null || shortName.length() == 0)
+            throw new IllegalArgumentException("The shortName argument is required");
         EntityManager em = DDictValue.entityManager();
-        TypedQuery<DDictValue> q = em.createQuery("SELECT o FROM DDictValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.shortName = :shortName", DDictValue.class);
+        TypedQuery<DDictValue> q = em.createQuery(
+                "SELECT o FROM DDictValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.shortName = :shortName",
+                DDictValue.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         q.setParameter("shortName", shortName);
         return q;
     }
 
-	public static TypedQuery<DDictValue> findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals(String lsType, String lsKind, String shortName, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (shortName == null || shortName.length() == 0) throw new IllegalArgumentException("The shortName argument is required");
+    public static TypedQuery<DDictValue> findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals(String lsType,
+            String lsKind, String shortName, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (shortName == null || shortName.length() == 0)
+            throw new IllegalArgumentException("The shortName argument is required");
         EntityManager em = DDictValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DDictValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.shortName = :shortName");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM DDictValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.shortName = :shortName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -565,75 +631,75 @@ public static TypedQuery<DDictValue> findDDictValuesByLsTypeEqualsAndLsKindEqual
         return q;
     }
 
-	public String getLsType() {
+    public String getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(String lsType) {
+    public void setLsType(String lsType) {
         this.lsType = lsType;
     }
 
-	public String getLsKind() {
+    public String getLsKind() {
         return this.lsKind;
     }
 
-	public void setLsKind(String lsKind) {
+    public void setLsKind(String lsKind) {
         this.lsKind = lsKind;
     }
 
-	public String getLsTypeAndKind() {
+    public String getLsTypeAndKind() {
         return this.lsTypeAndKind;
     }
 
-	public void setLsTypeAndKind(String lsTypeAndKind) {
+    public void setLsTypeAndKind(String lsTypeAndKind) {
         this.lsTypeAndKind = lsTypeAndKind;
     }
 
-	public String getShortName() {
+    public String getShortName() {
         return this.shortName;
     }
 
-	public void setShortName(String shortName) {
+    public void setShortName(String shortName) {
         this.shortName = shortName;
     }
 
-	public String getLabelText() {
+    public String getLabelText() {
         return this.labelText;
     }
 
-	public void setLabelText(String labelText) {
+    public void setLabelText(String labelText) {
         this.labelText = labelText;
     }
 
-	public String getDescription() {
+    public String getDescription() {
         return this.description;
     }
 
-	public void setDescription(String description) {
+    public void setDescription(String description) {
         this.description = description;
     }
 
-	public String getComments() {
+    public String getComments() {
         return this.comments;
     }
 
-	public void setComments(String comments) {
+    public void setComments(String comments) {
         this.comments = comments;
     }
 
-	public boolean isIgnored() {
+    public boolean isIgnored() {
         return this.ignored;
     }
 
-	public void setIgnored(boolean ignored) {
+    public void setIgnored(boolean ignored) {
         this.ignored = ignored;
     }
 
-	public Integer getDisplayOrder() {
+    public Integer getDisplayOrder() {
         return this.displayOrder;
     }
 
-	public void setDisplayOrder(Integer displayOrder) {
+    public void setDisplayOrder(Integer displayOrder) {
         this.displayOrder = displayOrder;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/DryRunCompound.java b/src/main/java/com/labsynch/labseer/domain/DryRunCompound.java
index de9df3132..e2c91fc82 100644
--- a/src/main/java/com/labsynch/labseer/domain/DryRunCompound.java
+++ b/src/main/java/com/labsynch/labseer/domain/DryRunCompound.java
@@ -1,4 +1,5 @@
 package com.labsynch.labseer.domain;
+
 import java.util.Collection;
 import java.util.List;
 
@@ -25,74 +26,75 @@
 
 public class DryRunCompound {
 
-	private String corpName;
-
-	private String stereoCategory;
-
-	private String stereoComment;
+    private String corpName;
 
-	private int CdId;
+    private String stereoCategory;
 
-	private int RecordNumber;
+    private String stereoComment;
 
-	@Column(columnDefinition = "text")
-	private String molStructure;
+    private int CdId;
 
-	public DryRunCompound() {
-	}
+    private int RecordNumber;
 
-	@Transactional
-	public void truncateTable() {
-		int output = DryRunCompound.entityManager().createNativeQuery("TRUNCATE dry_run_compound").executeUpdate();
-	}
+    @Column(columnDefinition = "text")
+    private String molStructure;
 
+    public DryRunCompound() {
+    }
 
+    @Transactional
+    public void truncateTable() {
+        int output = DryRunCompound.entityManager().createNativeQuery("TRUNCATE dry_run_compound").executeUpdate();
+    }
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("corpName", "stereoCategory", "stereoComment", "CdId", "RecordNumber", "molStructure");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("corpName",
+            "stereoCategory", "stereoComment", "CdId", "RecordNumber", "molStructure");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new DryRunCompound().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countDryRunCompounds() {
+    public static long countDryRunCompounds() {
         return entityManager().createQuery("SELECT COUNT(o) FROM DryRunCompound o", Long.class).getSingleResult();
     }
 
-	public static List<DryRunCompound> findAllDryRunCompounds() {
+    public static List<DryRunCompound> findAllDryRunCompounds() {
         return entityManager().createQuery("SELECT o FROM DryRunCompound o", DryRunCompound.class).getResultList();
     }
 
-	public static List<DryRunCompound> findAllDryRunCompounds(String sortFieldName, String sortOrder) {
+    public static List<DryRunCompound> findAllDryRunCompounds(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM DryRunCompound o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -103,16 +105,19 @@ public static List<DryRunCompound> findAllDryRunCompounds(String sortFieldName,
         return entityManager().createQuery(jpaQuery, DryRunCompound.class).getResultList();
     }
 
-	public static DryRunCompound findDryRunCompound(Long id) {
-        if (id == null) return null;
+    public static DryRunCompound findDryRunCompound(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(DryRunCompound.class, id);
     }
 
-	public static List<DryRunCompound> findDryRunCompoundEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM DryRunCompound o", DryRunCompound.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<DryRunCompound> findDryRunCompoundEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM DryRunCompound o", DryRunCompound.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<DryRunCompound> findDryRunCompoundEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<DryRunCompound> findDryRunCompoundEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM DryRunCompound o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -120,18 +125,21 @@ public static List<DryRunCompound> findDryRunCompoundEntries(int firstResult, in
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, DryRunCompound.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, DryRunCompound.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -140,97 +148,104 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public DryRunCompound merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         DryRunCompound merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String getCorpName() {
+    public String getCorpName() {
         return this.corpName;
     }
 
-	public void setCorpName(String corpName) {
+    public void setCorpName(String corpName) {
         this.corpName = corpName;
     }
 
-	public String getStereoCategory() {
+    public String getStereoCategory() {
         return this.stereoCategory;
     }
 
-	public void setStereoCategory(String stereoCategory) {
+    public void setStereoCategory(String stereoCategory) {
         this.stereoCategory = stereoCategory;
     }
 
-	public String getStereoComment() {
+    public String getStereoComment() {
         return this.stereoComment;
     }
 
-	public void setStereoComment(String stereoComment) {
+    public void setStereoComment(String stereoComment) {
         this.stereoComment = stereoComment;
     }
 
-	public int getCdId() {
+    public int getCdId() {
         return this.CdId;
     }
 
-	public void setCdId(int CdId) {
+    public void setCdId(int CdId) {
         this.CdId = CdId;
     }
 
-	public int getRecordNumber() {
+    public int getRecordNumber() {
         return this.RecordNumber;
     }
 
-	public void setRecordNumber(int RecordNumber) {
+    public void setRecordNumber(int RecordNumber) {
         this.RecordNumber = RecordNumber;
     }
 
-	public String getMolStructure() {
+    public String getMolStructure() {
         return this.molStructure;
     }
 
-	public void setMolStructure(String molStructure) {
+    public void setMolStructure(String molStructure) {
         this.molStructure = molStructure;
     }
 
-	public static Long countFindDryRunCompoundsByCdId(int CdId) {
+    public static Long countFindDryRunCompoundsByCdId(int CdId) {
         EntityManager em = DryRunCompound.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DryRunCompound AS o WHERE o.CdId = :CdId", Long.class);
         q.setParameter("CdId", CdId);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindDryRunCompoundsByCorpNameEquals(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+    public static Long countFindDryRunCompoundsByCorpNameEquals(String corpName) {
+        if (corpName == null || corpName.length() == 0)
+            throw new IllegalArgumentException("The corpName argument is required");
         EntityManager em = DryRunCompound.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DryRunCompound AS o WHERE o.corpName = :corpName", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM DryRunCompound AS o WHERE o.corpName = :corpName",
+                Long.class);
         q.setParameter("corpName", corpName);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<DryRunCompound> findDryRunCompoundsByCdId(int CdId) {
+    public static TypedQuery<DryRunCompound> findDryRunCompoundsByCdId(int CdId) {
         EntityManager em = DryRunCompound.entityManager();
-        TypedQuery<DryRunCompound> q = em.createQuery("SELECT o FROM DryRunCompound AS o WHERE o.CdId = :CdId", DryRunCompound.class);
+        TypedQuery<DryRunCompound> q = em.createQuery("SELECT o FROM DryRunCompound AS o WHERE o.CdId = :CdId",
+                DryRunCompound.class);
         q.setParameter("CdId", CdId);
         return q;
     }
 
-	public static TypedQuery<DryRunCompound> findDryRunCompoundsByCdId(int CdId, String sortFieldName, String sortOrder) {
+    public static TypedQuery<DryRunCompound> findDryRunCompoundsByCdId(int CdId, String sortFieldName,
+            String sortOrder) {
         EntityManager em = DryRunCompound.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DryRunCompound AS o WHERE o.CdId = :CdId");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -244,18 +259,23 @@ public static TypedQuery<DryRunCompound> findDryRunCompoundsByCdId(int CdId, Str
         return q;
     }
 
-	public static TypedQuery<DryRunCompound> findDryRunCompoundsByCorpNameEquals(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+    public static TypedQuery<DryRunCompound> findDryRunCompoundsByCorpNameEquals(String corpName) {
+        if (corpName == null || corpName.length() == 0)
+            throw new IllegalArgumentException("The corpName argument is required");
         EntityManager em = DryRunCompound.entityManager();
-        TypedQuery<DryRunCompound> q = em.createQuery("SELECT o FROM DryRunCompound AS o WHERE o.corpName = :corpName", DryRunCompound.class);
+        TypedQuery<DryRunCompound> q = em.createQuery("SELECT o FROM DryRunCompound AS o WHERE o.corpName = :corpName",
+                DryRunCompound.class);
         q.setParameter("corpName", corpName);
         return q;
     }
 
-	public static TypedQuery<DryRunCompound> findDryRunCompoundsByCorpNameEquals(String corpName, String sortFieldName, String sortOrder) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+    public static TypedQuery<DryRunCompound> findDryRunCompoundsByCorpNameEquals(String corpName, String sortFieldName,
+            String sortOrder) {
+        if (corpName == null || corpName.length() == 0)
+            throw new IllegalArgumentException("The corpName argument is required");
         EntityManager em = DryRunCompound.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM DryRunCompound AS o WHERE o.corpName = :corpName");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM DryRunCompound AS o WHERE o.corpName = :corpName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -267,37 +287,37 @@ public static TypedQuery<DryRunCompound> findDryRunCompoundsByCorpNameEquals(Str
         return q;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static DryRunCompound fromJsonToDryRunCompound(String json) {
+    public static DryRunCompound fromJsonToDryRunCompound(String json) {
         return new JSONDeserializer<DryRunCompound>()
-        .use(null, DryRunCompound.class).deserialize(json);
+                .use(null, DryRunCompound.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<DryRunCompound> collection) {
+    public static String toJsonArray(Collection<DryRunCompound> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<DryRunCompound> collection, String[] fields) {
+    public static String toJsonArray(Collection<DryRunCompound> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<DryRunCompound> fromJsonArrayToDryRunCompounds(String json) {
+    public static Collection<DryRunCompound> fromJsonArrayToDryRunCompounds(String json) {
         return new JSONDeserializer<List<DryRunCompound>>()
-        .use("values", DryRunCompound.class).deserialize(json);
+                .use("values", DryRunCompound.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/Experiment.java b/src/main/java/com/labsynch/labseer/domain/Experiment.java
index 80b3168c3..e526b01e7 100755
--- a/src/main/java/com/labsynch/labseer/domain/Experiment.java
+++ b/src/main/java/com/labsynch/labseer/domain/Experiment.java
@@ -51,26 +51,33 @@ public class Experiment extends AbstractThing {
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "experiment", fetch = FetchType.LAZY)
     private Set<ExperimentState> lsStates = new HashSet<ExperimentState>();
 
-    @OneToMany(cascade = { javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.MERGE }, mappedBy = "secondExperiment", fetch = FetchType.LAZY, orphanRemoval = true)
+    @OneToMany(cascade = { javax.persistence.CascadeType.PERSIST,
+            javax.persistence.CascadeType.MERGE }, mappedBy = "secondExperiment", fetch = FetchType.LAZY, orphanRemoval = true)
     private Set<ItxExperimentExperiment> firstExperiments = new HashSet<ItxExperimentExperiment>();
 
-    @OneToMany(cascade = { javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.MERGE }, mappedBy = "firstExperiment", fetch = FetchType.LAZY, orphanRemoval = true)
+    @OneToMany(cascade = { javax.persistence.CascadeType.PERSIST,
+            javax.persistence.CascadeType.MERGE }, mappedBy = "firstExperiment", fetch = FetchType.LAZY, orphanRemoval = true)
     private Set<ItxExperimentExperiment> secondExperiments = new HashSet<ItxExperimentExperiment>();
 
-    //Subject is grandparent
-    @ManyToMany(cascade = {CascadeType.PERSIST, CascadeType.MERGE}, mappedBy = "experiments", fetch = FetchType.LAZY)
+    // Subject is grandparent
+    @ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE }, mappedBy = "experiments", fetch = FetchType.LAZY)
     private Set<AnalysisGroup> analysisGroups = new HashSet<AnalysisGroup>();
-    
-    //Experiment is grandparent
-//    @ManyToMany(cascade = { javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.MERGE }, fetch = FetchType.LAZY)
-//    @JoinTable(name = "EXPERIMENT_ANALYSISGROUP", joinColumns = { @javax.persistence.JoinColumn(name = "experiment_id") }, inverseJoinColumns = { @javax.persistence.JoinColumn(name = "analysis_group_id") })
-//    private Set<AnalysisGroup> analysisGroups = new HashSet<AnalysisGroup>();
+
+    // Experiment is grandparent
+    // @ManyToMany(cascade = { javax.persistence.CascadeType.PERSIST,
+    // javax.persistence.CascadeType.MERGE }, fetch = FetchType.LAZY)
+    // @JoinTable(name = "EXPERIMENT_ANALYSISGROUP", joinColumns = {
+    // @javax.persistence.JoinColumn(name = "experiment_id") }, inverseJoinColumns =
+    // { @javax.persistence.JoinColumn(name = "analysis_group_id") })
+    // private Set<AnalysisGroup> analysisGroups = new HashSet<AnalysisGroup>();
 
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "experiment", fetch = FetchType.LAZY)
     private Set<ExperimentLabel> lsLabels = new HashSet<ExperimentLabel>();
 
-    @ManyToMany(cascade = {CascadeType.PERSIST, CascadeType.MERGE}, fetch = FetchType.LAZY)
-    @JoinTable(name = "EXPERIMENT_TAG", joinColumns = { @javax.persistence.JoinColumn(name = "experiment_id") }, inverseJoinColumns = { @javax.persistence.JoinColumn(name = "tag_id") })
+    @ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE }, fetch = FetchType.LAZY)
+    @JoinTable(name = "EXPERIMENT_TAG", joinColumns = {
+            @javax.persistence.JoinColumn(name = "experiment_id") }, inverseJoinColumns = {
+                    @javax.persistence.JoinColumn(name = "tag_id") })
     private Set<LsTag> lsTags = new HashSet<LsTag>();
 
     public Experiment() {
@@ -133,16 +140,19 @@ public static com.labsynch.labseer.domain.Experiment update(com.labsynch.labseer
         } else {
             logger.info("No experiment labels to save");
         }
-        if (experiment.getProtocol().getId() != updatedExperiment.getProtocol().getId()){
-			logger.warn("Changing protocol of experiment "+experiment.getCodeName()+" from "+updatedExperiment.getProtocol().getCodeName()+" to "+experiment.getProtocol().getCodeName());
-			updatedExperiment.setProtocol(experiment.getProtocol());
-		}
+        if (experiment.getProtocol().getId() != updatedExperiment.getProtocol().getId()) {
+            logger.warn("Changing protocol of experiment " + experiment.getCodeName() + " from "
+                    + updatedExperiment.getProtocol().getCodeName() + " to " + experiment.getProtocol().getCodeName());
+            updatedExperiment.setProtocol(experiment.getProtocol());
+        }
         updatedExperiment.merge();
         return updatedExperiment;
     }
 
-    public Collection<com.labsynch.labseer.domain.AnalysisGroup> getAnalysisGroups(Long experimentId, boolean includeIgnored) {
-        List<AnalysisGroup> results = AnalysisGroup.findAnalysisGroupsByExperimentIdAndIgnored(experimentId, includeIgnored).getResultList();
+    public Collection<com.labsynch.labseer.domain.AnalysisGroup> getAnalysisGroups(Long experimentId,
+            boolean includeIgnored) {
+        List<AnalysisGroup> results = AnalysisGroup
+                .findAnalysisGroupsByExperimentIdAndIgnored(experimentId, includeIgnored).getResultList();
         Collection<AnalysisGroup> analysisGroups = new HashSet<AnalysisGroup>();
         analysisGroups.addAll(results);
         return analysisGroups;
@@ -150,7 +160,8 @@ public Collection<com.labsynch.labseer.domain.AnalysisGroup> getAnalysisGroups(L
 
     @Transactional
     public static Collection<com.labsynch.labseer.domain.Experiment> findExperimentByName(String experimentName) {
-        List<ExperimentLabel> foundExperimentLabels = ExperimentLabel.findExperimentLabelsByName(experimentName).getResultList();
+        List<ExperimentLabel> foundExperimentLabels = ExperimentLabel.findExperimentLabelsByName(experimentName)
+                .getResultList();
         Collection<Experiment> experimentList = new HashSet<Experiment>();
         for (ExperimentLabel experimentLabel : foundExperimentLabels) {
             Experiment experiment = Experiment.findExperiment(experimentLabel.getExperiment().getId());
@@ -165,7 +176,8 @@ public static Collection<com.labsynch.labseer.domain.Experiment> findExperimentB
 
     @Transactional
     public static List<com.labsynch.labseer.domain.Experiment> findExperimentByExperimentName(String experimentName) {
-        List<ExperimentLabel> foundExperimentLabels = ExperimentLabel.findExperimentLabelsByName(experimentName).getResultList();
+        List<ExperimentLabel> foundExperimentLabels = ExperimentLabel.findExperimentLabelsByName(experimentName)
+                .getResultList();
         List<Experiment> experimentList = new ArrayList<Experiment>();
         for (ExperimentLabel experimentLabel : foundExperimentLabels) {
             Experiment experiment = Experiment.findExperiment(experimentLabel.getExperiment().getId());
@@ -173,21 +185,26 @@ public static List<com.labsynch.labseer.domain.Experiment> findExperimentByExper
         }
         return experimentList;
     }
-    
+
     @Transactional
-    public static List<com.labsynch.labseer.domain.Experiment> findExperimentListByExperimentNameAndIgnoredNot(String experimentName) {
-        List<ExperimentLabel> foundExperimentLabels = ExperimentLabel.findExperimentLabelsByName(experimentName).getResultList();
+    public static List<com.labsynch.labseer.domain.Experiment> findExperimentListByExperimentNameAndIgnoredNot(
+            String experimentName) {
+        List<ExperimentLabel> foundExperimentLabels = ExperimentLabel.findExperimentLabelsByName(experimentName)
+                .getResultList();
         List<Experiment> experimentList = new ArrayList<Experiment>();
         for (ExperimentLabel experimentLabel : foundExperimentLabels) {
             Experiment experiment = Experiment.findExperiment(experimentLabel.getExperiment().getId());
-            if (!experiment.isIgnored()) experimentList.add(experiment);
+            if (!experiment.isIgnored())
+                experimentList.add(experiment);
         }
         return experimentList;
     }
 
     @Transactional
-    public static List<com.labsynch.labseer.domain.Experiment> findExperimentByExperimentNameAndProtocolId(String experimentName, Long protocolId) {
-        List<ExperimentLabel> foundExperimentLabels = ExperimentLabel.findExperimentLabelsByNameAndProtocol(experimentName, protocolId).getResultList();
+    public static List<com.labsynch.labseer.domain.Experiment> findExperimentByExperimentNameAndProtocolId(
+            String experimentName, Long protocolId) {
+        List<ExperimentLabel> foundExperimentLabels = ExperimentLabel
+                .findExperimentLabelsByNameAndProtocol(experimentName, protocolId).getResultList();
         List<Experiment> experimentList = new ArrayList<Experiment>();
         for (ExperimentLabel experimentLabel : foundExperimentLabels) {
             Experiment experiment = Experiment.findExperiment(experimentLabel.getExperiment().getId());
@@ -195,21 +212,26 @@ public static List<com.labsynch.labseer.domain.Experiment> findExperimentByExper
         }
         return experimentList;
     }
-    
+
     @Transactional
-    public static List<com.labsynch.labseer.domain.Experiment> findExperimentListByExperimentNameAndProtocolIdAndIgnoredNot(String experimentName, Long protocolId) {
-        List<ExperimentLabel> foundExperimentLabels = ExperimentLabel.findExperimentLabelsByNameAndProtocol(experimentName, protocolId).getResultList();
+    public static List<com.labsynch.labseer.domain.Experiment> findExperimentListByExperimentNameAndProtocolIdAndIgnoredNot(
+            String experimentName, Long protocolId) {
+        List<ExperimentLabel> foundExperimentLabels = ExperimentLabel
+                .findExperimentLabelsByNameAndProtocol(experimentName, protocolId).getResultList();
         List<Experiment> experimentList = new ArrayList<Experiment>();
         for (ExperimentLabel experimentLabel : foundExperimentLabels) {
             Experiment experiment = Experiment.findExperiment(experimentLabel.getExperiment().getId());
-            if (!experiment.isIgnored()) experimentList.add(experiment);
+            if (!experiment.isIgnored())
+                experimentList.add(experiment);
         }
         return experimentList;
     }
 
     @Transactional
-    public static Collection<com.labsynch.labseer.domain.Experiment> findExperimentByNameAndProtocolId(String experimentName, Long protocolId) {
-        List<ExperimentLabel> foundExperimentLabels = ExperimentLabel.findExperimentLabelsByNameAndProtocol(experimentName, protocolId).getResultList();
+    public static Collection<com.labsynch.labseer.domain.Experiment> findExperimentByNameAndProtocolId(
+            String experimentName, Long protocolId) {
+        List<ExperimentLabel> foundExperimentLabels = ExperimentLabel
+                .findExperimentLabelsByNameAndProtocol(experimentName, protocolId).getResultList();
         Collection<Experiment> experimentList = new HashSet<Experiment>();
         for (ExperimentLabel experimentLabel : foundExperimentLabels) {
             Experiment experiment = Experiment.findExperiment(experimentLabel.getExperiment().getId());
@@ -228,37 +250,73 @@ public static Collection<com.labsynch.labseer.domain.Experiment> findExperimentB
 
     @Transactional
     public String toJson() {
-        return new JSONSerializer().exclude("*.class", "lsStates.lsValues.lsState", "lsStates.experiment", "analysisGroups.experiment", "lsLabels.experiment").include("lsTags", "lsLabels", "lsStates.lsValues", "analysisGroups.lsStates.lsValues", "analysisGroups.lsLabels", "analysisGroups.treatmentGroups.lsStates.lsValues", "analysisGroups.treatmentGroups.lsLabels", "analysisGroups.treatmentGroups.subjects.lsStates.lsValues", "analysisGroups.treatmentGroups.subjects.lsLabels").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.experiment", "analysisGroups.experiment",
+                        "lsLabels.experiment")
+                .include("lsTags", "lsLabels", "lsStates.lsValues", "analysisGroups.lsStates.lsValues",
+                        "analysisGroups.lsLabels", "analysisGroups.treatmentGroups.lsStates.lsValues",
+                        "analysisGroups.treatmentGroups.lsLabels",
+                        "analysisGroups.treatmentGroups.subjects.lsStates.lsValues",
+                        "analysisGroups.treatmentGroups.subjects.lsLabels")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public String toPrettyJson() {
-        return new JSONSerializer().exclude("*.class", "lsStates.lsValues.lsState", "lsStates.experiment", "analysisGroups.experiments", "lsLabels.experiment").include("lsTags", "lsLabels", "lsStates.lsValues", "analysisGroups", "analysisGroups.lsStates.lsValues", "analysisGroups.lsLabels", "analysisGroups.treatmentGroups.lsStates.lsValues", "analysisGroups.treatmentGroups.lsLabels", "analysisGroups.treatmentGroups.subjects.lsStates.lsValues", "analysisGroups.treatmentGroups.subjects.lsLabels").prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.experiment", "analysisGroups.experiments",
+                        "lsLabels.experiment")
+                .include("lsTags", "lsLabels", "lsStates.lsValues", "analysisGroups",
+                        "analysisGroups.lsStates.lsValues", "analysisGroups.lsLabels",
+                        "analysisGroups.treatmentGroups.lsStates.lsValues", "analysisGroups.treatmentGroups.lsLabels",
+                        "analysisGroups.treatmentGroups.subjects.lsStates.lsValues",
+                        "analysisGroups.treatmentGroups.subjects.lsLabels")
+                .prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public String toPrettyJsonStub() {
-        return new JSONSerializer().exclude("*.class", "lsStates.lsValues.lsState", "lsStates.experiment", "analysisGroups", "lsLabels.experiment").include("lsTags", "lsLabels", "lsStates.lsValues").prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.experiment", "analysisGroups",
+                        "lsLabels.experiment")
+                .include("lsTags", "lsLabels", "lsStates.lsValues").prettyPrint(true)
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public String toJsonStub() {
-        return new JSONSerializer().exclude("*.class", "lsStates.lsValues.lsState", "lsStates.experiment", "analysisGroups", "lsLabels.experiment").include("lsTags", "lsLabels", "lsStates.lsValues").prettyPrint(false).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.experiment", "analysisGroups",
+                        "lsLabels.experiment")
+                .include("lsTags", "lsLabels", "lsStates.lsValues").prettyPrint(false)
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public String toJsonStubWithAnalysisGroups() {
-        return new JSONSerializer().exclude("*.class", "lsStates.lsValues.lsState", "lsStates.experiment", "lsLabels.experiment", "analysisGroups.subjects", "analysisGroups.experiment").include("lsTags", "lsLabels", "lsStates.lsValues", "analysisGroups").prettyPrint(false).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.experiment", "lsLabels.experiment",
+                        "analysisGroups.subjects", "analysisGroups.experiment")
+                .include("lsTags", "lsLabels", "lsStates.lsValues", "analysisGroups").prettyPrint(false)
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public String toJsonStubWithAnalysisGroupValues() {
-        return new JSONSerializer().exclude("*.class", "lsStates.lsValues.lsState", "lsStates.experiment", "lsLabels.experiment", "analysisGroups.subjects", "analysisGroups.experiment").include("lsTags", "lsLabels", "lsStates.lsValues", "analysisGroups.lsStates.lsValues").prettyPrint(false).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.experiment", "lsLabels.experiment",
+                        "analysisGroups.subjects", "analysisGroups.experiment")
+                .include("lsTags", "lsLabels", "lsStates.lsValues", "analysisGroups.lsStates.lsValues")
+                .prettyPrint(false).transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public String toJsonStubWithAnalysisGroupStates() {
-        return new JSONSerializer().exclude("*.class", "lsStates.lsValues.lsState", "lsStates.experiment", "lsLabels.experiment", "analysisGroups.subjects", "analysisGroups.experiment").include("lsTags", "lsLabels", "lsStates.lsValues", "analysisGroups.lsStates").prettyPrint(false).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.experiment", "lsLabels.experiment",
+                        "analysisGroups.subjects", "analysisGroups.experiment")
+                .include("lsTags", "lsLabels", "lsStates.lsValues", "analysisGroups.lsStates").prettyPrint(false)
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
@@ -268,57 +326,91 @@ public static com.labsynch.labseer.domain.Experiment fromJsonToExperiment(String
 
     @Transactional
     public static String toJsonArray(Collection<com.labsynch.labseer.domain.Experiment> collection) {
-        return new JSONSerializer().include("lsTags", "lsLabels", "lsStates.lsValues", "analysisGroups.lsStates.lsValues", "analysisGroups.lsLabels", "analysisGroups.treatmentGroups.lsStates.lsValues", "analysisGroups.treatmentGroups.lsLabels", "analysisGroups.treatmentGroups.subjects.lsStates.lsValues", "analysisGroups.treatmentGroups.subjects.lsLabels").exclude("*.class", "lsStates.lsValues.lsState", "lsStates.experiment", "analysisGroups.experiment", "analysisGroups.subject", "lsLabels.experiment").transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer()
+                .include("lsTags", "lsLabels", "lsStates.lsValues", "analysisGroups.lsStates.lsValues",
+                        "analysisGroups.lsLabels", "analysisGroups.treatmentGroups.lsStates.lsValues",
+                        "analysisGroups.treatmentGroups.lsLabels",
+                        "analysisGroups.treatmentGroups.subjects.lsStates.lsValues",
+                        "analysisGroups.treatmentGroups.subjects.lsLabels")
+                .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.experiment", "analysisGroups.experiment",
+                        "analysisGroups.subject", "lsLabels.experiment")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
     @Transactional
     public static String toJsonArrayPretty(Collection<com.labsynch.labseer.domain.Experiment> collection) {
-        return new JSONSerializer().include("lsTags", "lsLabels", "lsStates.lsValues", "analysisGroups.lsStates.lsValues", "analysisGroups.lsLabels", "analysisGroups.treatmentGroups.lsStates.lsValues", "analysisGroups.treatmentGroups.lsLabels", "analysisGroups.treatmentGroups.subjects.lsStates.lsValues", "analysisGroups.treatmentGroups.subjects.lsLabels").exclude("*.class", "lsStates.lsValues.lsState", "lsStates.experiment", "analysisGroups.experiment", "analysisGroups.subject", "lsLabels.experiment").prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer()
+                .include("lsTags", "lsLabels", "lsStates.lsValues", "analysisGroups.lsStates.lsValues",
+                        "analysisGroups.lsLabels", "analysisGroups.treatmentGroups.lsStates.lsValues",
+                        "analysisGroups.treatmentGroups.lsLabels",
+                        "analysisGroups.treatmentGroups.subjects.lsStates.lsValues",
+                        "analysisGroups.treatmentGroups.subjects.lsLabels")
+                .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.experiment", "analysisGroups.experiment",
+                        "analysisGroups.subject", "lsLabels.experiment")
+                .prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
     @Transactional
     public static String toJsonArrayStub(Collection<com.labsynch.labseer.domain.Experiment> collection) {
-        return new JSONSerializer().include("lsTags", "lsLabels", "lsStates.lsValues").exclude("*.class", "analysisGroups", "lsStates.lsValues.lsState", "lsStates.experiment", "analysisGroups.experiment", "lsLabels.experiment").transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer().include("lsTags", "lsLabels", "lsStates.lsValues")
+                .exclude("*.class", "analysisGroups", "lsStates.lsValues.lsState", "lsStates.experiment",
+                        "analysisGroups.experiment", "lsLabels.experiment")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
-    
+
     @Transactional
-        public static String toJsonArrayStubWithProt(Collection<com.labsynch.labseer.domain.Experiment> collection) {
-            return new JSONSerializer()
-            		.include("lsTags", "lsLabels", "lsStates.lsValues", "protocol.lsLabels")
-            		.exclude("*.class", "analysisGroups", "lsStates.lsValues.lsState", "lsStates.experiment", 
-            				"analysisGroups.experiment", "lsLabels.experiment",
-            				"protocol.lsStates", "firstExperiments", "secondExperiments")
-            		.transform(new ExcludeNulls(), void.class).serialize(collection);
-        }
+    public static String toJsonArrayStubWithProt(Collection<com.labsynch.labseer.domain.Experiment> collection) {
+        return new JSONSerializer()
+                .include("lsTags", "lsLabels", "lsStates.lsValues", "protocol.lsLabels")
+                .exclude("*.class", "analysisGroups", "lsStates.lsValues.lsState", "lsStates.experiment",
+                        "analysisGroups.experiment", "lsLabels.experiment",
+                        "protocol.lsStates", "firstExperiments", "secondExperiments")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
+    }
 
     @Transactional
     public static String toJsonArrayStubWithAG(Collection<com.labsynch.labseer.domain.Experiment> collection) {
-        return new JSONSerializer().include("lsTags", "lsLabels", "lsStates.lsValues", "analysisGroups").exclude("*.class", "lsStates.lsValues.lsState", "lsStates.experiment", "analysisGroups.experiment", "analysisGroups.subjects", "lsLabels.experiment").transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer().include("lsTags", "lsLabels", "lsStates.lsValues", "analysisGroups")
+                .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.experiment", "analysisGroups.experiment",
+                        "analysisGroups.subjects", "lsLabels.experiment")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
     @Transactional
     public static String toJsonArrayStubWithAGStates(Collection<com.labsynch.labseer.domain.Experiment> collection) {
-        return new JSONSerializer().include("lsTags", "lsLabels", "lsStates.lsValues", "analysisGroups.lsStates").exclude("*.class", "lsStates.lsValues.lsState", "lsStates.experiment", "analysisGroups.experiment", "analysisGroups.subjects", "lsLabels.experiment").transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer().include("lsTags", "lsLabels", "lsStates.lsValues", "analysisGroups.lsStates")
+                .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.experiment", "analysisGroups.experiment",
+                        "analysisGroups.subjects", "lsLabels.experiment")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
     @Transactional
     public static String toJsonArrayStubWithAGValues(Collection<com.labsynch.labseer.domain.Experiment> collection) {
-        return new JSONSerializer().include("lsTags", "lsLabels", "lsStates.lsValues", "analysisGroups.lsStates.lsValues").exclude("*.class", "lsStates.lsValues.lsState", "lsStates.experiment", "analysisGroups.experiment", "analysisGroups.subjects", "lsLabels.experiment").transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer()
+                .include("lsTags", "lsLabels", "lsStates.lsValues", "analysisGroups.lsStates.lsValues")
+                .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.experiment", "analysisGroups.experiment",
+                        "analysisGroups.subjects", "lsLabels.experiment")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
     @Transactional
     public static String toJsonArrayStubPretty(Collection<com.labsynch.labseer.domain.Experiment> collection) {
-        return new JSONSerializer().include("lsTags", "lsLabels", "lsStates.lsValues").exclude("*.class", "analysisGroups", "lsStates.lsValues.lsState", "lsStates.experiment", "analysisGroups.experiment", "lsLabels.experiment").prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer().include("lsTags", "lsLabels", "lsStates.lsValues")
+                .exclude("*.class", "analysisGroups", "lsStates.lsValues.lsState", "lsStates.experiment",
+                        "analysisGroups.experiment", "lsLabels.experiment")
+                .prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
     @Transactional
     public static Collection<com.labsynch.labseer.domain.Experiment> fromJsonArrayToExperiments(String json) {
-        return new JSONDeserializer<List<Experiment>>().use(null, ArrayList.class).use("values", Experiment.class).deserialize(json);
+        return new JSONDeserializer<List<Experiment>>().use(null, ArrayList.class).use("values", Experiment.class)
+                .deserialize(json);
     }
 
     @Transactional
     public static Collection<com.labsynch.labseer.domain.Experiment> fromJsonArrayToExperiments(Reader json) {
-        return new JSONDeserializer<List<Experiment>>().use(null, ArrayList.class).use("values", Experiment.class).deserialize(json);
+        return new JSONDeserializer<List<Experiment>>().use(null, ArrayList.class).use("values", Experiment.class)
+                .deserialize(json);
     }
 
     @Transactional
@@ -337,7 +429,7 @@ public static void deleteExperiment(com.labsynch.labseer.domain.Experiment exper
             attached.remove();
         }
     }
-    
+
     @Transactional
     public static void deleteExperiment(Long experimentId) {
         EntityManager em = Experiment.entityManager();
@@ -354,7 +446,8 @@ public static void deleteExperiment(Long experimentId) {
     @Transactional
     public static void deleteExperimentBySQL(com.labsynch.labseer.domain.Experiment experiment) {
         EntityManager em = Experiment.entityManager();
-        TypedQuery<Experiment> q = em.createQuery("DELETE FROM Experiment AS o WHERE o.experiment = :experiment", Experiment.class);
+        TypedQuery<Experiment> q = em.createQuery("DELETE FROM Experiment AS o WHERE o.experiment = :experiment",
+                Experiment.class);
         q.setParameter("experiment", experiment);
         q.executeUpdate();
     }
@@ -362,13 +455,14 @@ public static void deleteExperimentBySQL(com.labsynch.labseer.domain.Experiment
     @Transactional
     public static void deleteExperimentByTransactionID(Long lsTransaction) {
         EntityManager em = Experiment.entityManager();
-        TypedQuery<Experiment> q = em.createQuery("DELETE FROM Experiment AS o WHERE o.lsTransaction = :lsTransaction", Experiment.class);
+        TypedQuery<Experiment> q = em.createQuery("DELETE FROM Experiment AS o WHERE o.lsTransaction = :lsTransaction",
+                Experiment.class);
         q.setParameter("lsTransaction", lsTransaction);
         q.executeUpdate();
     }
 
     public static void removeExperimentFullCascade(Long experimentId) {
-    	Collection<Long> analysisGroups = Experiment.removeExperimentCascadeAware(experimentId);
+        Collection<Long> analysisGroups = Experiment.removeExperimentCascadeAware(experimentId);
         logger.debug("Checking AnalysisGroups: " + analysisGroups.toString());
         Collection<Long> treatmentGroups = AnalysisGroup.removeOrphans(analysisGroups);
         logger.debug("Checking TreatmentGroups: " + treatmentGroups.toString());
@@ -376,18 +470,19 @@ public static void removeExperimentFullCascade(Long experimentId) {
         logger.debug("Checking Subjects: " + subjects.toString());
         Subject.removeOrphans(subjects);
     }
-    
+
     @Transactional
     public static Collection<Long> removeExperimentCascadeAware(Long id) {
         Experiment experiment = findExperiment(id);
         Collection<AnalysisGroup> analysisGroups = experiment.getAnalysisGroups(id, false);
         Set<Long> analysisGroupIds = new HashSet<Long>();
         for (AnalysisGroup analysisGroup : analysisGroups) {
-        	analysisGroupIds.add(analysisGroup.getId());
+            analysisGroupIds.add(analysisGroup.getId());
         }
         analysisGroups.clear();
         EntityManager em = Experiment.entityManager();
-        Query q1 = em.createNativeQuery("DELETE FROM experiment_analysisgroup o WHERE o.experiment_id = :id", Experiment.class);
+        Query q1 = em.createNativeQuery("DELETE FROM experiment_analysisgroup o WHERE o.experiment_id = :id",
+                Experiment.class);
         q1.setParameter("id", id);
         q1.executeUpdate();
         experiment.remove();
@@ -406,78 +501,116 @@ public static List<com.labsynch.labseer.domain.Experiment> findAllExperiments()
     @Transactional
     public static List<com.labsynch.labseer.domain.Experiment> findAllExperiments(boolean isIgnored) {
         EntityManager em = Experiment.entityManager();
-        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment o WHERE o.ignored = :isIgnored", Experiment.class);
+        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment o WHERE o.ignored = :isIgnored",
+                Experiment.class);
         q.setParameter("isIgnored", isIgnored);
         return q.getResultList();
     }
-    
+
     @Transactional
     public static com.labsynch.labseer.domain.Experiment findExperiment(Long id) {
-        if (id == null) return null;
+        if (id == null)
+            return null;
         return entityManager().find(Experiment.class, id);
     }
 
     @Transactional
     public static String findExperimentJson(Long id) {
-        if (id == null) return null;
+        if (id == null)
+            return null;
         return entityManager().find(Experiment.class, id).toJson();
     }
 
     public static List<com.labsynch.labseer.domain.Experiment> findExperimentEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM Experiment o", Experiment.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery("SELECT o FROM Experiment o", Experiment.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
     @Transactional
     public com.labsynch.labseer.domain.Experiment merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         Experiment merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
     public static TypedQuery<com.labsynch.labseer.domain.Experiment> findExperimentsByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = Experiment.entityManager();
-        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE o.codeName = :codeName", Experiment.class);
+        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE o.codeName = :codeName",
+                Experiment.class);
         q.setParameter("codeName", codeName);
         return q;
     }
 
-    public static TypedQuery<com.labsynch.labseer.domain.Experiment> findExperimentsByCodeNameEquals(String codeName, boolean isIgnored) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static TypedQuery<com.labsynch.labseer.domain.Experiment> findExperimentsByCodeNameEquals(String codeName,
+            boolean isIgnored) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = Experiment.entityManager();
-        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE o.codeName = :codeName AND o.ignored = :isIgnored", Experiment.class);
+        TypedQuery<Experiment> q = em.createQuery(
+                "SELECT o FROM Experiment AS o WHERE o.codeName = :codeName AND o.ignored = :isIgnored",
+                Experiment.class);
         q.setParameter("codeName", codeName);
         q.setParameter("isIgnored", isIgnored);
         return q;
     }
-    
-    public static TypedQuery<com.labsynch.labseer.domain.Experiment> findExperimentsByLsTransaction(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+
+    public static TypedQuery<com.labsynch.labseer.domain.Experiment> findExperimentsByLsTransaction(
+            Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = Experiment.entityManager();
-        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE o.lsTransaction = :lsTransaction", Experiment.class);
+        TypedQuery<Experiment> q = em
+                .createQuery("SELECT o FROM Experiment AS o WHERE o.lsTransaction = :lsTransaction", Experiment.class);
         q.setParameter("lsTransaction", lsTransaction);
         return q;
     }
 
     public static TypedQuery<com.labsynch.labseer.domain.Experiment> findExperimentsByProtocol(Protocol protocol) {
-        if (protocol == null) throw new IllegalArgumentException("The protocol argument is required");
+        if (protocol == null)
+            throw new IllegalArgumentException("The protocol argument is required");
         EntityManager em = Experiment.entityManager();
-        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE o.protocol = :protocol", Experiment.class);
+        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE o.protocol = :protocol",
+                Experiment.class);
         q.setParameter("protocol", protocol);
         return q;
     }
 
     public static Query findExperimentsByBatchCodes(Collection<java.lang.String> codeValues) {
-        if (codeValues == null) throw new IllegalArgumentException("The batchCodeList argument is required");
+        if (codeValues == null)
+            throw new IllegalArgumentException("The batchCodeList argument is required");
         EntityManager em = Experiment.entityManager();
-        String sqlQueryOld = "SELECT DISTINCT o FROM Experiment " + "WHERE o.analysisGroup.lsState.lsValues = :codeValues";
-        String sqlQuery = "select distinct exp.* " + "from analysis_group_value agv " + "join analysis_group_state ags on ags.id = agv.analysis_state_id AND ags.ignored = false " + "join analysis_group ag on ag.id = ags.analysis_group_id AND ag.ignored = false " + "join experiment exp on exp.id = ag.experiment_id AND exp.ignored = false " + "where agv.code_value in (:batchCodeList) AND agv.ignored = false";
-        String sqlQueryAA = "select distinct exp " + "from AnalysisGroupValue agv " + "join agv.lsState ags with ags.ignored = false " + "join ags.analysisGroup ag with ag.ignored = false " + "join ag.experiments exp with exp.ignored = false " + "where agv.codeValue in (:batchCodeList) AND agv.ignored = false";
-        String sqlQueryNN = "select DISTINCT o FROM Experiment AS o " + "WHERE o.analysisGroups.lsStates.lsType = 'data' " + "AND o.analysisGroups.lsStates.lsValues.lsKind = 'batch code' " + "AND o.analysisGroups.lsStates.lsValues.codeValue IN (:batchCodeList) ";
-        String sqlQueryOO = "select o FROM Experiment AS o " + "WHERE o.id in ( SELECT DISTINCT exp.id " + "FROM AnalysisGroupValue agv " + "JOIN agv.lsState.analysisGroup.experiment exp " + "WHERE agv.codeValue IN (:batchCodeList) )";
-        String sqlQueryPP = "select DISTINCT o FROM Experiment AS o " + "WHERE o.analysisGroups.lsStates.lsValues.codeValue IN (:batchCodeList) ";
-        String sqlQueryRef = "select new com.labsynch.labseer.dto.AnalysisGroupValueDTO(agv.id, expt.id as experimentId, expt.codeName, " + "agv.lsType as lsType, agv.lsKind as lsKind, " + "agv.stringValue as stringValue, agv.numericValue as numericValue, " + "agv2.codeValue AS testedLot " + " ) FROM AnalysisGroup ag " + "JOIN ag.lsStates ags with ags.lsType = 'data' " + "JOIN ags.lsValues agv with agv.lsKind != 'tested concentration' AND agv.lsKind != 'batch code' AND agv.lsKind != 'time' " + "JOIN ags.lsValues agv2 with agv2.lsKind = 'batch code' " + "JOIN ag.experiment expt " + "WHERE agv2.codeValue IN (:batchCodeList) ";
+        String sqlQueryOld = "SELECT DISTINCT o FROM Experiment "
+                + "WHERE o.analysisGroup.lsState.lsValues = :codeValues";
+        String sqlQuery = "select distinct exp.* " + "from analysis_group_value agv "
+                + "join analysis_group_state ags on ags.id = agv.analysis_state_id AND ags.ignored = false "
+                + "join analysis_group ag on ag.id = ags.analysis_group_id AND ag.ignored = false "
+                + "join experiment exp on exp.id = ag.experiment_id AND exp.ignored = false "
+                + "where agv.code_value in (:batchCodeList) AND agv.ignored = false";
+        String sqlQueryAA = "select distinct exp " + "from AnalysisGroupValue agv "
+                + "join agv.lsState ags with ags.ignored = false "
+                + "join ags.analysisGroup ag with ag.ignored = false "
+                + "join ag.experiments exp with exp.ignored = false "
+                + "where agv.codeValue in (:batchCodeList) AND agv.ignored = false";
+        String sqlQueryNN = "select DISTINCT o FROM Experiment AS o "
+                + "WHERE o.analysisGroups.lsStates.lsType = 'data' "
+                + "AND o.analysisGroups.lsStates.lsValues.lsKind = 'batch code' "
+                + "AND o.analysisGroups.lsStates.lsValues.codeValue IN (:batchCodeList) ";
+        String sqlQueryOO = "select o FROM Experiment AS o " + "WHERE o.id in ( SELECT DISTINCT exp.id "
+                + "FROM AnalysisGroupValue agv " + "JOIN agv.lsState.analysisGroup.experiment exp "
+                + "WHERE agv.codeValue IN (:batchCodeList) )";
+        String sqlQueryPP = "select DISTINCT o FROM Experiment AS o "
+                + "WHERE o.analysisGroups.lsStates.lsValues.codeValue IN (:batchCodeList) ";
+        String sqlQueryRef = "select new com.labsynch.labseer.dto.AnalysisGroupValueDTO(agv.id, expt.id as experimentId, expt.codeName, "
+                + "agv.lsType as lsType, agv.lsKind as lsKind, "
+                + "agv.stringValue as stringValue, agv.numericValue as numericValue, " + "agv2.codeValue AS testedLot "
+                + " ) FROM AnalysisGroup ag " + "JOIN ag.lsStates ags with ags.lsType = 'data' "
+                + "JOIN ags.lsValues agv with agv.lsKind != 'tested concentration' AND agv.lsKind != 'batch code' AND agv.lsKind != 'time' "
+                + "JOIN ags.lsValues agv2 with agv2.lsKind = 'batch code' " + "JOIN ag.experiment expt "
+                + "WHERE agv2.codeValue IN (:batchCodeList) ";
         Query q = em.createQuery(sqlQueryAA, Experiment.class);
         q.setParameter("batchCodeList", codeValues);
         return q;
@@ -501,9 +634,13 @@ public String findPreferredName() {
         }
     }
 
-    public static TypedQuery<com.labsynch.labseer.domain.Experiment> findExperimentsByProtocolTypeAndKindAndExperimentTypeAndKind(String protocolType, String protocolKind, String lsType, String lsKind) {
+    public static TypedQuery<com.labsynch.labseer.domain.Experiment> findExperimentsByProtocolTypeAndKindAndExperimentTypeAndKind(
+            String protocolType, String protocolKind, String lsType, String lsKind) {
         EntityManager em = Experiment.entityManager();
-        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE o.protocol.lsType = :protocolType AND " + "o.protocol.lsKind = :protocolKind AND o.lsType = :lsType AND o.lsKind = :lsKind", Experiment.class);
+        TypedQuery<Experiment> q = em.createQuery(
+                "SELECT o FROM Experiment AS o WHERE o.protocol.lsType = :protocolType AND "
+                        + "o.protocol.lsKind = :protocolKind AND o.lsType = :lsType AND o.lsKind = :lsKind",
+                Experiment.class);
         q.setParameter("protocolType", protocolType);
         q.setParameter("protocolKind", protocolKind);
         q.setParameter("lsType", lsType);
@@ -511,85 +648,107 @@ public static TypedQuery<com.labsynch.labseer.domain.Experiment> findExperiments
         return q;
     }
 
-	public static Collection<Experiment> findAllNonDeletedExperiments() {
+    public static Collection<Experiment> findAllNonDeletedExperiments() {
         EntityManager em = Experiment.entityManager();
-        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE o.deleted IS NOT :deleted", Experiment.class);
+        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE o.deleted IS NOT :deleted",
+                Experiment.class);
         q.setParameter("deleted", true);
-		return q.getResultList();
-	}
-
-//	public void statusDelete() {
-//		Long id = this.getId();
-//		Collection<ExperimentValue> statuses = ExperimentValue.findExperimentValuesByExptIDAndStateTypeKindAndValueTypeKind(id, "metadata", "experiment_metadata", "stringValue", "status").getResultList();
-//		if (statuses.isEmpty()) {
-//			{"clobValue":null,"codeKind":null,"codeOrigin":null,"codeType":null,"codeTypeAndKind":"null_null","codeValue":null,"comments":null,"dateValue":null,"fileValue":null,"id":15066,"ignored":false,"lsKind":"status","lsState":{"comments":null,"experiment":{"codeName":"EXPT-00000015","id":2165,"ignored":false,"lsKind":"default","lsTransaction":20,"lsType":"default","lsTypeAndKind":"default_default","modifiedBy":null,"modifiedDate":null,"protocol":{"codeName":"PROT-00000010","id":1599,"ignored":false,"lsKind":"default","lsTransaction":15,"lsType":"default","lsTypeAndKind":"default_default","modifiedBy":null,"modifiedDate":null,"recordedBy":"nouser","recordedDate":1396423362000,"shortDescription":"protocol created by generic data parser","version":1},"recordedBy":"nouser","recordedDate":1396590049000,"shortDescription":"experiment created by generic data parser","version":1},"id":2987,"ignored":false,"lsKind":"experiment metadata","lsTransaction":20,"lsType":"metadata","lsTypeAndKind":"metadata_experiment metadata","modifiedBy":null,"modifiedDate":null,"recordedBy":"nouser","recordedDate":1396590049000,"version":1},"lsTransaction":20,"lsType":"stringValue","lsTypeAndKind":"stringValue_status","modifiedBy":null,"modifiedDate":null,"numberOfReplicates":null,"numericValue":null,"operatorKind":null,"operatorType":null,"operatorTypeAndKind":"null_null","publicData":true,"recordedBy":"nouser","recordedDate":1396590049000,"sigFigs":null,"stringValue":"Approved","uncertainty":null,"uncertaintyType":null,"unitKind":null,"unitType":null,"unitTypeAndKind":"null_null","urlValue":null,"version":0}
-//		}
-//	}
-    
-    public static TypedQuery<Experiment> findExperimentByLabelText(String experimentType, String experimentKind, String labelText) {
-        if (experimentType == null || experimentType.length() == 0) throw new IllegalArgumentException("The experimentType argument is required");
-        if (experimentKind == null || experimentKind.length() == 0) throw new IllegalArgumentException("The experimentKind argument is required");
-		if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        
+        return q.getResultList();
+    }
+
+    // public void statusDelete() {
+    // Long id = this.getId();
+    // Collection<ExperimentValue> statuses =
+    // ExperimentValue.findExperimentValuesByExptIDAndStateTypeKindAndValueTypeKind(id,
+    // "metadata", "experiment_metadata", "stringValue", "status").getResultList();
+    // if (statuses.isEmpty()) {
+    // {"clobValue":null,"codeKind":null,"codeOrigin":null,"codeType":null,"codeTypeAndKind":"null_null","codeValue":null,"comments":null,"dateValue":null,"fileValue":null,"id":15066,"ignored":false,"lsKind":"status","lsState":{"comments":null,"experiment":{"codeName":"EXPT-00000015","id":2165,"ignored":false,"lsKind":"default","lsTransaction":20,"lsType":"default","lsTypeAndKind":"default_default","modifiedBy":null,"modifiedDate":null,"protocol":{"codeName":"PROT-00000010","id":1599,"ignored":false,"lsKind":"default","lsTransaction":15,"lsType":"default","lsTypeAndKind":"default_default","modifiedBy":null,"modifiedDate":null,"recordedBy":"nouser","recordedDate":1396423362000,"shortDescription":"protocol
+    // created by generic data
+    // parser","version":1},"recordedBy":"nouser","recordedDate":1396590049000,"shortDescription":"experiment
+    // created by generic data
+    // parser","version":1},"id":2987,"ignored":false,"lsKind":"experiment
+    // metadata","lsTransaction":20,"lsType":"metadata","lsTypeAndKind":"metadata_experiment
+    // metadata","modifiedBy":null,"modifiedDate":null,"recordedBy":"nouser","recordedDate":1396590049000,"version":1},"lsTransaction":20,"lsType":"stringValue","lsTypeAndKind":"stringValue_status","modifiedBy":null,"modifiedDate":null,"numberOfReplicates":null,"numericValue":null,"operatorKind":null,"operatorType":null,"operatorTypeAndKind":"null_null","publicData":true,"recordedBy":"nouser","recordedDate":1396590049000,"sigFigs":null,"stringValue":"Approved","uncertainty":null,"uncertaintyType":null,"unitKind":null,"unitType":null,"unitTypeAndKind":"null_null","urlValue":null,"version":0}
+    // }
+    // }
+
+    public static TypedQuery<Experiment> findExperimentByLabelText(String experimentType, String experimentKind,
+            String labelText) {
+        if (experimentType == null || experimentType.length() == 0)
+            throw new IllegalArgumentException("The experimentType argument is required");
+        if (experimentKind == null || experimentKind.length() == 0)
+            throw new IllegalArgumentException("The experimentKind argument is required");
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
+
         boolean ignored = true;
         EntityManager em = Experiment.entityManager();
-		String query = "SELECT DISTINCT o FROM Experiment o " +
-				"JOIN o.lsLabels ll with ll.ignored IS NOT :ignored AND ll.labelText = :labelText " +
-				"WHERE o.ignored IS NOT :ignored " +
-				"AND o.lsType = :experimentType " +
-				"AND o.lsKind = :experimentKind ";
-        
+        String query = "SELECT DISTINCT o FROM Experiment o " +
+                "JOIN o.lsLabels ll with ll.ignored IS NOT :ignored AND ll.labelText = :labelText " +
+                "WHERE o.ignored IS NOT :ignored " +
+                "AND o.lsType = :experimentType " +
+                "AND o.lsKind = :experimentKind ";
+
         TypedQuery<Experiment> q = em.createQuery(query, Experiment.class);
         q.setParameter("experimentType", experimentType);
         q.setParameter("experimentKind", experimentKind);
         q.setParameter("labelText", labelText);
         q.setParameter("ignored", ignored);
-        
+
         return q;
-	}
-	
-	public static TypedQuery<Experiment> findExperimentByLabelText(String experimentType, String experimentKind, String labelType, String labelKind, String labelText) {
-        if (experimentType == null || experimentType.length() == 0) throw new IllegalArgumentException("The experimentType argument is required");
-        if (experimentKind == null || experimentKind.length() == 0) throw new IllegalArgumentException("The experimentKind argument is required");
-        if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-        if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        
+    }
+
+    public static TypedQuery<Experiment> findExperimentByLabelText(String experimentType, String experimentKind,
+            String labelType, String labelKind, String labelText) {
+        if (experimentType == null || experimentType.length() == 0)
+            throw new IllegalArgumentException("The experimentType argument is required");
+        if (experimentKind == null || experimentKind.length() == 0)
+            throw new IllegalArgumentException("The experimentKind argument is required");
+        if (labelType == null || labelType.length() == 0)
+            throw new IllegalArgumentException("The labelType argument is required");
+        if (labelKind == null || labelKind.length() == 0)
+            throw new IllegalArgumentException("The labelKind argument is required");
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
+
         boolean ignored = true;
-        
+
         EntityManager em = Experiment.entityManager();
-		String query = "SELECT DISTINCT o FROM Experiment o " +
-				"JOIN o.lsLabels ll " +
-				"WHERE o.ignored IS NOT :ignored " +
-				"AND o.lsType = :experimentType " +
-				"AND o.lsKind = :experimentKind " +
-				"AND ll.ignored IS NOT :ignored AND ll.lsType = :labelType AND ll.lsKind = :labelKind AND ll.labelText = :labelText";
-        
+        String query = "SELECT DISTINCT o FROM Experiment o " +
+                "JOIN o.lsLabels ll " +
+                "WHERE o.ignored IS NOT :ignored " +
+                "AND o.lsType = :experimentType " +
+                "AND o.lsKind = :experimentKind " +
+                "AND ll.ignored IS NOT :ignored AND ll.lsType = :labelType AND ll.lsKind = :labelKind AND ll.labelText = :labelText";
+
         TypedQuery<Experiment> q = em.createQuery(query, Experiment.class);
         q.setParameter("experimentType", experimentType);
         q.setParameter("experimentKind", experimentKind);
-        q.setParameter("labelType", labelType);        
+        q.setParameter("labelType", labelType);
         q.setParameter("labelKind", labelKind);
         q.setParameter("labelText", labelText);
         q.setParameter("ignored", ignored);
-        
+
         return q;
-	}
+    }
 
-	public String toString() {
-        return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).setExcludeFieldNames("lsTags", "lsStates", "analysisGroups", "lsLabels").toString();
+    public String toString() {
+        return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+                .setExcludeFieldNames("lsTags", "lsStates", "analysisGroups", "lsLabels").toString();
     }
 
-	public static Long countFindExperimentsByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static Long countFindExperimentsByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = Experiment.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE o.codeName = :codeName", Long.class);
         q.setParameter("codeName", codeName);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindExperimentsByCodeNameLike(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static Long countFindExperimentsByCodeNameLike(String codeName) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         codeName = codeName.replace('*', '%');
         if (codeName.charAt(0) != '%') {
             codeName = "%" + codeName;
@@ -598,21 +757,24 @@ public static Long countFindExperimentsByCodeNameLike(String codeName) {
             codeName = codeName + "%";
         }
         EntityManager em = Experiment.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM Experiment AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)", Long.class);
         q.setParameter("codeName", codeName);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindExperimentsByLsKindEquals(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static Long countFindExperimentsByLsKindEquals(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = Experiment.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE o.lsKind = :lsKind", Long.class);
         q.setParameter("lsKind", lsKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindExperimentsByLsKindLike(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static Long countFindExperimentsByLsKindLike(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         lsKind = lsKind.replace('*', '%');
         if (lsKind.charAt(0) != '%') {
             lsKind = "%" + lsKind;
@@ -621,39 +783,47 @@ public static Long countFindExperimentsByLsKindLike(String lsKind) {
             lsKind = lsKind + "%";
         }
         EntityManager em = Experiment.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)",
+                Long.class);
         q.setParameter("lsKind", lsKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindExperimentsByLsTransaction(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static Long countFindExperimentsByLsTransaction(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = Experiment.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE o.lsTransaction = :lsTransaction",
+                Long.class);
         q.setParameter("lsTransaction", lsTransaction);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindExperimentsByLsTypeEquals(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+    public static Long countFindExperimentsByLsTypeEquals(String lsType) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = Experiment.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE o.lsType = :lsType", Long.class);
         q.setParameter("lsType", lsType);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindExperimentsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static Long countFindExperimentsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = Experiment.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM Experiment AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindExperimentsByLsTypeLike(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+    public static Long countFindExperimentsByLsTypeLike(String lsType) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
         lsType = lsType.replace('*', '%');
         if (lsType.charAt(0) != '%') {
             lsType = "%" + lsType;
@@ -662,21 +832,24 @@ public static Long countFindExperimentsByLsTypeLike(String lsType) {
             lsType = lsType + "%";
         }
         EntityManager em = Experiment.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE LOWER(o.lsType) LIKE LOWER(:lsType)", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE LOWER(o.lsType) LIKE LOWER(:lsType)",
+                Long.class);
         q.setParameter("lsType", lsType);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindExperimentsByProtocol(Protocol protocol) {
-        if (protocol == null) throw new IllegalArgumentException("The protocol argument is required");
+    public static Long countFindExperimentsByProtocol(Protocol protocol) {
+        if (protocol == null)
+            throw new IllegalArgumentException("The protocol argument is required");
         EntityManager em = Experiment.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE o.protocol = :protocol", Long.class);
         q.setParameter("protocol", protocol);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindExperimentsByRecordedByLike(String recordedBy) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+    public static Long countFindExperimentsByRecordedByLike(String recordedBy) {
+        if (recordedBy == null || recordedBy.length() == 0)
+            throw new IllegalArgumentException("The recordedBy argument is required");
         recordedBy = recordedBy.replace('*', '%');
         if (recordedBy.charAt(0) != '%') {
             recordedBy = "%" + recordedBy;
@@ -685,13 +858,16 @@ public static Long countFindExperimentsByRecordedByLike(String recordedBy) {
             recordedBy = recordedBy + "%";
         }
         EntityManager em = Experiment.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Experiment AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM Experiment AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)", Long.class);
         q.setParameter("recordedBy", recordedBy);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<Experiment> findExperimentsByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static TypedQuery<Experiment> findExperimentsByCodeNameEquals(String codeName, String sortFieldName,
+            String sortOrder) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = Experiment.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE o.codeName = :codeName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -705,8 +881,9 @@ public static TypedQuery<Experiment> findExperimentsByCodeNameEquals(String code
         return q;
     }
 
-	public static TypedQuery<Experiment> findExperimentsByCodeNameLike(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static TypedQuery<Experiment> findExperimentsByCodeNameLike(String codeName) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         codeName = codeName.replace('*', '%');
         if (codeName.charAt(0) != '%') {
             codeName = "%" + codeName;
@@ -715,13 +892,16 @@ public static TypedQuery<Experiment> findExperimentsByCodeNameLike(String codeNa
             codeName = codeName + "%";
         }
         EntityManager em = Experiment.entityManager();
-        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)", Experiment.class);
+        TypedQuery<Experiment> q = em.createQuery(
+                "SELECT o FROM Experiment AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)", Experiment.class);
         q.setParameter("codeName", codeName);
         return q;
     }
 
-	public static TypedQuery<Experiment> findExperimentsByCodeNameLike(String codeName, String sortFieldName, String sortOrder) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static TypedQuery<Experiment> findExperimentsByCodeNameLike(String codeName, String sortFieldName,
+            String sortOrder) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         codeName = codeName.replace('*', '%');
         if (codeName.charAt(0) != '%') {
             codeName = "%" + codeName;
@@ -730,7 +910,8 @@ public static TypedQuery<Experiment> findExperimentsByCodeNameLike(String codeNa
             codeName = codeName + "%";
         }
         EntityManager em = Experiment.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Experiment AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -742,16 +923,20 @@ public static TypedQuery<Experiment> findExperimentsByCodeNameLike(String codeNa
         return q;
     }
 
-	public static TypedQuery<Experiment> findExperimentsByLsKindEquals(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<Experiment> findExperimentsByLsKindEquals(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = Experiment.entityManager();
-        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE o.lsKind = :lsKind", Experiment.class);
+        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE o.lsKind = :lsKind",
+                Experiment.class);
         q.setParameter("lsKind", lsKind);
         return q;
     }
 
-	public static TypedQuery<Experiment> findExperimentsByLsKindEquals(String lsKind, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<Experiment> findExperimentsByLsKindEquals(String lsKind, String sortFieldName,
+            String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = Experiment.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE o.lsKind = :lsKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -765,8 +950,9 @@ public static TypedQuery<Experiment> findExperimentsByLsKindEquals(String lsKind
         return q;
     }
 
-	public static TypedQuery<Experiment> findExperimentsByLsKindLike(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<Experiment> findExperimentsByLsKindLike(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         lsKind = lsKind.replace('*', '%');
         if (lsKind.charAt(0) != '%') {
             lsKind = "%" + lsKind;
@@ -775,13 +961,16 @@ public static TypedQuery<Experiment> findExperimentsByLsKindLike(String lsKind)
             lsKind = lsKind + "%";
         }
         EntityManager em = Experiment.entityManager();
-        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)", Experiment.class);
+        TypedQuery<Experiment> q = em.createQuery(
+                "SELECT o FROM Experiment AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)", Experiment.class);
         q.setParameter("lsKind", lsKind);
         return q;
     }
 
-	public static TypedQuery<Experiment> findExperimentsByLsKindLike(String lsKind, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<Experiment> findExperimentsByLsKindLike(String lsKind, String sortFieldName,
+            String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         lsKind = lsKind.replace('*', '%');
         if (lsKind.charAt(0) != '%') {
             lsKind = "%" + lsKind;
@@ -790,7 +979,8 @@ public static TypedQuery<Experiment> findExperimentsByLsKindLike(String lsKind,
             lsKind = lsKind + "%";
         }
         EntityManager em = Experiment.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Experiment AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -802,10 +992,13 @@ public static TypedQuery<Experiment> findExperimentsByLsKindLike(String lsKind,
         return q;
     }
 
-	public static TypedQuery<Experiment> findExperimentsByLsTransaction(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<Experiment> findExperimentsByLsTransaction(Long lsTransaction, String sortFieldName,
+            String sortOrder) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = Experiment.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE o.lsTransaction = :lsTransaction");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Experiment AS o WHERE o.lsTransaction = :lsTransaction");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -817,16 +1010,20 @@ public static TypedQuery<Experiment> findExperimentsByLsTransaction(Long lsTrans
         return q;
     }
 
-	public static TypedQuery<Experiment> findExperimentsByLsTypeEquals(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<Experiment> findExperimentsByLsTypeEquals(String lsType) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = Experiment.entityManager();
-        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE o.lsType = :lsType", Experiment.class);
+        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE o.lsType = :lsType",
+                Experiment.class);
         q.setParameter("lsType", lsType);
         return q;
     }
 
-	public static TypedQuery<Experiment> findExperimentsByLsTypeEquals(String lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<Experiment> findExperimentsByLsTypeEquals(String lsType, String sortFieldName,
+            String sortOrder) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = Experiment.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE o.lsType = :lsType");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -840,21 +1037,28 @@ public static TypedQuery<Experiment> findExperimentsByLsTypeEquals(String lsType
         return q;
     }
 
-	public static TypedQuery<Experiment> findExperimentsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<Experiment> findExperimentsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = Experiment.entityManager();
-        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Experiment.class);
+        TypedQuery<Experiment> q = em.createQuery(
+                "SELECT o FROM Experiment AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Experiment.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         return q;
     }
 
-	public static TypedQuery<Experiment> findExperimentsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<Experiment> findExperimentsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind,
+            String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = Experiment.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Experiment AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -867,8 +1071,9 @@ public static TypedQuery<Experiment> findExperimentsByLsTypeEqualsAndLsKindEqual
         return q;
     }
 
-	public static TypedQuery<Experiment> findExperimentsByLsTypeLike(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<Experiment> findExperimentsByLsTypeLike(String lsType) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
         lsType = lsType.replace('*', '%');
         if (lsType.charAt(0) != '%') {
             lsType = "%" + lsType;
@@ -877,13 +1082,16 @@ public static TypedQuery<Experiment> findExperimentsByLsTypeLike(String lsType)
             lsType = lsType + "%";
         }
         EntityManager em = Experiment.entityManager();
-        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE LOWER(o.lsType) LIKE LOWER(:lsType)", Experiment.class);
+        TypedQuery<Experiment> q = em.createQuery(
+                "SELECT o FROM Experiment AS o WHERE LOWER(o.lsType) LIKE LOWER(:lsType)", Experiment.class);
         q.setParameter("lsType", lsType);
         return q;
     }
 
-	public static TypedQuery<Experiment> findExperimentsByLsTypeLike(String lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<Experiment> findExperimentsByLsTypeLike(String lsType, String sortFieldName,
+            String sortOrder) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
         lsType = lsType.replace('*', '%');
         if (lsType.charAt(0) != '%') {
             lsType = "%" + lsType;
@@ -892,7 +1100,8 @@ public static TypedQuery<Experiment> findExperimentsByLsTypeLike(String lsType,
             lsType = lsType + "%";
         }
         EntityManager em = Experiment.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE LOWER(o.lsType) LIKE LOWER(:lsType)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Experiment AS o WHERE LOWER(o.lsType) LIKE LOWER(:lsType)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -904,8 +1113,10 @@ public static TypedQuery<Experiment> findExperimentsByLsTypeLike(String lsType,
         return q;
     }
 
-	public static TypedQuery<Experiment> findExperimentsByProtocol(Protocol protocol, String sortFieldName, String sortOrder) {
-        if (protocol == null) throw new IllegalArgumentException("The protocol argument is required");
+    public static TypedQuery<Experiment> findExperimentsByProtocol(Protocol protocol, String sortFieldName,
+            String sortOrder) {
+        if (protocol == null)
+            throw new IllegalArgumentException("The protocol argument is required");
         EntityManager em = Experiment.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE o.protocol = :protocol");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -919,8 +1130,9 @@ public static TypedQuery<Experiment> findExperimentsByProtocol(Protocol protocol
         return q;
     }
 
-	public static TypedQuery<Experiment> findExperimentsByRecordedByLike(String recordedBy) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+    public static TypedQuery<Experiment> findExperimentsByRecordedByLike(String recordedBy) {
+        if (recordedBy == null || recordedBy.length() == 0)
+            throw new IllegalArgumentException("The recordedBy argument is required");
         recordedBy = recordedBy.replace('*', '%');
         if (recordedBy.charAt(0) != '%') {
             recordedBy = "%" + recordedBy;
@@ -929,13 +1141,16 @@ public static TypedQuery<Experiment> findExperimentsByRecordedByLike(String reco
             recordedBy = recordedBy + "%";
         }
         EntityManager em = Experiment.entityManager();
-        TypedQuery<Experiment> q = em.createQuery("SELECT o FROM Experiment AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)", Experiment.class);
+        TypedQuery<Experiment> q = em.createQuery(
+                "SELECT o FROM Experiment AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)", Experiment.class);
         q.setParameter("recordedBy", recordedBy);
         return q;
     }
 
-	public static TypedQuery<Experiment> findExperimentsByRecordedByLike(String recordedBy, String sortFieldName, String sortOrder) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+    public static TypedQuery<Experiment> findExperimentsByRecordedByLike(String recordedBy, String sortFieldName,
+            String sortOrder) {
+        if (recordedBy == null || recordedBy.length() == 0)
+            throw new IllegalArgumentException("The recordedBy argument is required");
         recordedBy = recordedBy.replace('*', '%');
         if (recordedBy.charAt(0) != '%') {
             recordedBy = "%" + recordedBy;
@@ -944,7 +1159,8 @@ public static TypedQuery<Experiment> findExperimentsByRecordedByLike(String reco
             recordedBy = recordedBy + "%";
         }
         EntityManager em = Experiment.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Experiment AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Experiment AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -956,9 +1172,11 @@ public static TypedQuery<Experiment> findExperimentsByRecordedByLike(String reco
         return q;
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "shortDescription", "protocol", "lsStates", "firstExperiments", "secondExperiments", "analysisGroups", "lsLabels", "lsTags");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger",
+            "shortDescription", "protocol", "lsStates", "firstExperiments", "secondExperiments", "analysisGroups",
+            "lsLabels", "lsTags");
 
-	public static List<Experiment> findAllExperiments(String sortFieldName, String sortOrder) {
+    public static List<Experiment> findAllExperiments(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM Experiment o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -969,7 +1187,8 @@ public static List<Experiment> findAllExperiments(String sortFieldName, String s
         return entityManager().createQuery(jpaQuery, Experiment.class).getResultList();
     }
 
-	public static List<Experiment> findExperimentEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<Experiment> findExperimentEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM Experiment o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -977,70 +1196,71 @@ public static List<Experiment> findExperimentEntries(int firstResult, int maxRes
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, Experiment.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, Experiment.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public String getShortDescription() {
+    public String getShortDescription() {
         return this.shortDescription;
     }
 
-	public void setShortDescription(String shortDescription) {
+    public void setShortDescription(String shortDescription) {
         this.shortDescription = shortDescription;
     }
 
-	public Protocol getProtocol() {
+    public Protocol getProtocol() {
         return this.protocol;
     }
 
-	public void setProtocol(Protocol protocol) {
+    public void setProtocol(Protocol protocol) {
         this.protocol = protocol;
     }
 
-	public Set<ExperimentState> getLsStates() {
+    public Set<ExperimentState> getLsStates() {
         return this.lsStates;
     }
 
-	public void setLsStates(Set<ExperimentState> lsStates) {
+    public void setLsStates(Set<ExperimentState> lsStates) {
         this.lsStates = lsStates;
     }
 
-	public Set<ItxExperimentExperiment> getFirstExperiments() {
+    public Set<ItxExperimentExperiment> getFirstExperiments() {
         return this.firstExperiments;
     }
 
-	public void setFirstExperiments(Set<ItxExperimentExperiment> firstExperiments) {
+    public void setFirstExperiments(Set<ItxExperimentExperiment> firstExperiments) {
         this.firstExperiments = firstExperiments;
     }
 
-	public Set<ItxExperimentExperiment> getSecondExperiments() {
+    public Set<ItxExperimentExperiment> getSecondExperiments() {
         return this.secondExperiments;
     }
 
-	public void setSecondExperiments(Set<ItxExperimentExperiment> secondExperiments) {
+    public void setSecondExperiments(Set<ItxExperimentExperiment> secondExperiments) {
         this.secondExperiments = secondExperiments;
     }
 
-	public Set<AnalysisGroup> getAnalysisGroups() {
+    public Set<AnalysisGroup> getAnalysisGroups() {
         return this.analysisGroups;
     }
 
-	public void setAnalysisGroups(Set<AnalysisGroup> analysisGroups) {
+    public void setAnalysisGroups(Set<AnalysisGroup> analysisGroups) {
         this.analysisGroups = analysisGroups;
     }
 
-	public Set<ExperimentLabel> getLsLabels() {
+    public Set<ExperimentLabel> getLsLabels() {
         return this.lsLabels;
     }
 
-	public void setLsLabels(Set<ExperimentLabel> lsLabels) {
+    public void setLsLabels(Set<ExperimentLabel> lsLabels) {
         this.lsLabels = lsLabels;
     }
 
-	public Set<LsTag> getLsTags() {
+    public Set<LsTag> getLsTags() {
         return this.lsTags;
     }
 
-	public void setLsTags(Set<LsTag> lsTags) {
+    public void setLsTags(Set<LsTag> lsTags) {
         this.lsTags = lsTags;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentKind.java b/src/main/java/com/labsynch/labseer/domain/ExperimentKind.java
index cd46d0349..70b5b942a 100755
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ExperimentKind.java
@@ -75,7 +75,9 @@ public void setVersion(Integer version) {
 
     public static final EntityManager entityManager() {
         EntityManager em = new ExperimentKind().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
@@ -88,25 +90,31 @@ public static List<com.labsynch.labseer.domain.ExperimentKind> findAllExperiment
     }
 
     public static com.labsynch.labseer.domain.ExperimentKind findExperimentKind(Long id) {
-        if (id == null) return null;
+        if (id == null)
+            return null;
         return entityManager().find(ExperimentKind.class, id);
     }
 
-    public static List<com.labsynch.labseer.domain.ExperimentKind> findExperimentKindEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ExperimentKind o", ExperimentKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<com.labsynch.labseer.domain.ExperimentKind> findExperimentKindEntries(int firstResult,
+            int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ExperimentKind o", ExperimentKind.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
     @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.lsType = ExperimentType.findExperimentType(this.getLsType().getId());
-        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_').append(this.getKindName()).toString();
+        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_')
+                .append(this.getKindName()).toString();
         this.entityManager.persist(this);
     }
 
     @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -117,28 +125,33 @@ public void remove() {
 
     @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
     @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
     @Transactional
     public com.labsynch.labseer.domain.ExperimentKind merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_').append(this.getKindName()).toString();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
+        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_')
+                .append(this.getKindName()).toString();
         ExperimentKind merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName",
+            "lsTypeAndKind", "id", "version", "entityManager");
 
-	public static List<ExperimentKind> findAllExperimentKinds(String sortFieldName, String sortOrder) {
+    public static List<ExperimentKind> findAllExperimentKinds(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ExperimentKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -149,7 +162,8 @@ public static List<ExperimentKind> findAllExperimentKinds(String sortFieldName,
         return entityManager().createQuery(jpaQuery, ExperimentKind.class).getResultList();
     }
 
-	public static List<ExperimentKind> findExperimentKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ExperimentKind> findExperimentKindEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM ExperimentKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -157,62 +171,76 @@ public static List<ExperimentKind> findExperimentKindEntries(int firstResult, in
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ExperimentKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ExperimentKind.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public ExperimentType getLsType() {
+    public ExperimentType getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(ExperimentType lsType) {
+    public void setLsType(ExperimentType lsType) {
         this.lsType = lsType;
     }
 
-	public String getKindName() {
+    public String getKindName() {
         return this.kindName;
     }
 
-	public void setKindName(String kindName) {
+    public void setKindName(String kindName) {
         this.kindName = kindName;
     }
 
-	public String getLsTypeAndKind() {
+    public String getLsTypeAndKind() {
         return this.lsTypeAndKind;
     }
 
-	public void setLsTypeAndKind(String lsTypeAndKind) {
+    public void setLsTypeAndKind(String lsTypeAndKind) {
         this.lsTypeAndKind = lsTypeAndKind;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static Long countFindExperimentKindsByLsTypeEqualsAndKindNameEquals(ExperimentType lsType, String kindName) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+    public static Long countFindExperimentKindsByLsTypeEqualsAndKindNameEquals(ExperimentType lsType, String kindName) {
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
         EntityManager em = ExperimentKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentKind AS o WHERE o.lsType = :lsType  AND o.kindName = :kindName", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ExperimentKind AS o WHERE o.lsType = :lsType  AND o.kindName = :kindName",
+                Long.class);
         q.setParameter("lsType", lsType);
         q.setParameter("kindName", kindName);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<ExperimentKind> findExperimentKindsByLsTypeEqualsAndKindNameEquals(ExperimentType lsType, String kindName) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+    public static TypedQuery<ExperimentKind> findExperimentKindsByLsTypeEqualsAndKindNameEquals(ExperimentType lsType,
+            String kindName) {
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
         EntityManager em = ExperimentKind.entityManager();
-        TypedQuery<ExperimentKind> q = em.createQuery("SELECT o FROM ExperimentKind AS o WHERE o.lsType = :lsType  AND o.kindName = :kindName", ExperimentKind.class);
+        TypedQuery<ExperimentKind> q = em.createQuery(
+                "SELECT o FROM ExperimentKind AS o WHERE o.lsType = :lsType  AND o.kindName = :kindName",
+                ExperimentKind.class);
         q.setParameter("lsType", lsType);
         q.setParameter("kindName", kindName);
         return q;
     }
 
-	public static TypedQuery<ExperimentKind> findExperimentKindsByLsTypeEqualsAndKindNameEquals(ExperimentType lsType, String kindName, String sortFieldName, String sortOrder) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+    public static TypedQuery<ExperimentKind> findExperimentKindsByLsTypeEqualsAndKindNameEquals(ExperimentType lsType,
+            String kindName, String sortFieldName, String sortOrder) {
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
         EntityManager em = ExperimentKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentKind AS o WHERE o.lsType = :lsType  AND o.kindName = :kindName");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ExperimentKind AS o WHERE o.lsType = :lsType  AND o.kindName = :kindName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -225,33 +253,33 @@ public static TypedQuery<ExperimentKind> findExperimentKindsByLsTypeEqualsAndKin
         return q;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ExperimentKind fromJsonToExperimentKind(String json) {
+    public static ExperimentKind fromJsonToExperimentKind(String json) {
         return new JSONDeserializer<ExperimentKind>()
-        .use(null, ExperimentKind.class).deserialize(json);
+                .use(null, ExperimentKind.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ExperimentKind> collection) {
+    public static String toJsonArray(Collection<ExperimentKind> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ExperimentKind> collection, String[] fields) {
+    public static String toJsonArray(Collection<ExperimentKind> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ExperimentKind> fromJsonArrayToExperimentKinds(String json) {
+    public static Collection<ExperimentKind> fromJsonArrayToExperimentKinds(String json) {
         return new JSONDeserializer<List<ExperimentKind>>()
-        .use("values", ExperimentKind.class).deserialize(json);
+                .use("values", ExperimentKind.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentLabel.java b/src/main/java/com/labsynch/labseer/domain/ExperimentLabel.java
index b815d169d..ca8d5ea9e 100755
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/ExperimentLabel.java
@@ -56,7 +56,8 @@ public ExperimentLabel(com.labsynch.labseer.domain.ExperimentLabel experimentLab
         super.setImageFile(experimentLabel.getImageFile());
     }
 
-    public static com.labsynch.labseer.domain.ExperimentLabel update(com.labsynch.labseer.domain.ExperimentLabel experimentLabel) {
+    public static com.labsynch.labseer.domain.ExperimentLabel update(
+            com.labsynch.labseer.domain.ExperimentLabel experimentLabel) {
         ExperimentLabel updatedLabel = ExperimentLabel.findExperimentLabel(experimentLabel.getId());
         updatedLabel.setLsType(experimentLabel.getLsType());
         updatedLabel.setLsKind(experimentLabel.getLsKind());
@@ -74,21 +75,28 @@ public static com.labsynch.labseer.domain.ExperimentLabel update(com.labsynch.la
         return updatedLabel;
     }
 
-    public static TypedQuery<com.labsynch.labseer.domain.ExperimentLabel> findExperimentPreferredName(Long experimentId) {
+    public static TypedQuery<com.labsynch.labseer.domain.ExperimentLabel> findExperimentPreferredName(
+            Long experimentId) {
         String labelType = "name";
         String labelKind = "experiment name";
         boolean preferred = true;
         boolean ignored = true;
-        TypedQuery<ExperimentLabel> q = findExperimentPreferredName(experimentId, labelType, labelKind, preferred, ignored);
+        TypedQuery<ExperimentLabel> q = findExperimentPreferredName(experimentId, labelType, labelKind, preferred,
+                ignored);
         return q;
     }
 
-    private static TypedQuery<com.labsynch.labseer.domain.ExperimentLabel> findExperimentPreferredName(Long experimentId, String labelType, String labelKind, boolean preferred, boolean ignored) {
-        if (experimentId == null || experimentId == 0) throw new IllegalArgumentException("The experimentId argument is required");
-        if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-        if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");
+    private static TypedQuery<com.labsynch.labseer.domain.ExperimentLabel> findExperimentPreferredName(
+            Long experimentId, String labelType, String labelKind, boolean preferred, boolean ignored) {
+        if (experimentId == null || experimentId == 0)
+            throw new IllegalArgumentException("The experimentId argument is required");
+        if (labelType == null || labelType.length() == 0)
+            throw new IllegalArgumentException("The labelType argument is required");
+        if (labelKind == null || labelKind.length() == 0)
+            throw new IllegalArgumentException("The labelKind argument is required");
         EntityManager em = ExperimentLabel.entityManager();
-        String query = "SELECT o FROM ExperimentLabel AS o WHERE o.lsType = :labelType  " + "AND o.lsKind = :labelKind " + "AND o.experiment.id = :experimentId " + "AND o.preferred = :preferred AND o.ignored IS NOT :ignored";
+        String query = "SELECT o FROM ExperimentLabel AS o WHERE o.lsType = :labelType  " + "AND o.lsKind = :labelKind "
+                + "AND o.experiment.id = :experimentId " + "AND o.preferred = :preferred AND o.ignored IS NOT :ignored";
         logger.debug("sql query " + query);
         TypedQuery<ExperimentLabel> q = em.createQuery(query, ExperimentLabel.class);
         q.setParameter("experimentId", experimentId);
@@ -101,9 +109,11 @@ private static TypedQuery<com.labsynch.labseer.domain.ExperimentLabel> findExper
 
     public static TypedQuery<com.labsynch.labseer.domain.ExperimentLabel> findExperimentLabelsByName(String labelText) {
         boolean ignored = true;
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
         EntityManager em = ProtocolLabel.entityManager();
-        String query = "SELECT o FROM ExperimentLabel AS o WHERE o.labelText = :labelText " + "AND o.ignored IS NOT :ignored";
+        String query = "SELECT o FROM ExperimentLabel AS o WHERE o.labelText = :labelText "
+                + "AND o.ignored IS NOT :ignored";
         logger.debug("sql query " + query);
         TypedQuery<ExperimentLabel> q = em.createQuery(query, ExperimentLabel.class);
         logger.debug("query label text is " + labelText);
@@ -112,12 +122,17 @@ public static TypedQuery<com.labsynch.labseer.domain.ExperimentLabel> findExperi
         return q;
     }
 
-    public static TypedQuery<com.labsynch.labseer.domain.ExperimentLabel> findExperimentLabelsByName(String labelText, String labelType, String labelKind, boolean preferred, boolean ignored) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-        if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");
+    public static TypedQuery<com.labsynch.labseer.domain.ExperimentLabel> findExperimentLabelsByName(String labelText,
+            String labelType, String labelKind, boolean preferred, boolean ignored) {
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
+        if (labelType == null || labelType.length() == 0)
+            throw new IllegalArgumentException("The labelType argument is required");
+        if (labelKind == null || labelKind.length() == 0)
+            throw new IllegalArgumentException("The labelKind argument is required");
         EntityManager em = ProtocolLabel.entityManager();
-        String query = "SELECT o FROM ExperimentLabel AS o WHERE o.lsType = :labelType  " + "AND o.lsKind = :labelKind " + "AND o.labelText = :labelText " + "AND o.preferred = :preferred AND o.ignored IS NOT :ignored";
+        String query = "SELECT o FROM ExperimentLabel AS o WHERE o.lsType = :labelType  " + "AND o.lsKind = :labelKind "
+                + "AND o.labelText = :labelText " + "AND o.preferred = :preferred AND o.ignored IS NOT :ignored";
         logger.debug("sql query " + query);
         TypedQuery<ExperimentLabel> q = em.createQuery(query, ExperimentLabel.class);
         logger.debug("query label text is " + labelText);
@@ -129,7 +144,8 @@ public static TypedQuery<com.labsynch.labseer.domain.ExperimentLabel> findExperi
         return q;
     }
 
-    public static TypedQuery<com.labsynch.labseer.domain.ExperimentLabel> findExperimentLabelsByNameAndProtocol(String labelText, long protocolId) {
+    public static TypedQuery<com.labsynch.labseer.domain.ExperimentLabel> findExperimentLabelsByNameAndProtocol(
+            String labelText, long protocolId) {
         String labelType = "name";
         String labelKind = "experiment name";
         boolean preferred = true;
@@ -137,13 +153,20 @@ public static TypedQuery<com.labsynch.labseer.domain.ExperimentLabel> findExperi
         return findExperimentLabelsByNameAndProtocol(labelText, labelType, labelKind, preferred, ignored, protocolId);
     }
 
-    public static TypedQuery<com.labsynch.labseer.domain.ExperimentLabel> findExperimentLabelsByNameAndProtocol(String labelText, String labelType, String labelKind, boolean preferred, boolean ignored, long protocolId) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-        if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");
-        if (protocolId == 0) throw new IllegalArgumentException("The protocolId argument is required");
+    public static TypedQuery<com.labsynch.labseer.domain.ExperimentLabel> findExperimentLabelsByNameAndProtocol(
+            String labelText, String labelType, String labelKind, boolean preferred, boolean ignored, long protocolId) {
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
+        if (labelType == null || labelType.length() == 0)
+            throw new IllegalArgumentException("The labelType argument is required");
+        if (labelKind == null || labelKind.length() == 0)
+            throw new IllegalArgumentException("The labelKind argument is required");
+        if (protocolId == 0)
+            throw new IllegalArgumentException("The protocolId argument is required");
         EntityManager em = ProtocolLabel.entityManager();
-        String query = "SELECT o FROM ExperimentLabel AS o WHERE o.lsType = :labelType  " + "AND o.lsKind = :labelKind " + "AND o.labelText = :labelText " + "AND o.preferred = :preferred AND o.ignored IS NOT :ignored " + "AND o.experiment.protocol.id = :protocolId";
+        String query = "SELECT o FROM ExperimentLabel AS o WHERE o.lsType = :labelType  " + "AND o.lsKind = :labelKind "
+                + "AND o.labelText = :labelText " + "AND o.preferred = :preferred AND o.ignored IS NOT :ignored "
+                + "AND o.experiment.protocol.id = :protocolId";
         logger.debug("sql query " + query);
         TypedQuery<ExperimentLabel> q = em.createQuery(query, ExperimentLabel.class);
         logger.debug("query label text is " + labelText);
@@ -155,51 +178,59 @@ public static TypedQuery<com.labsynch.labseer.domain.ExperimentLabel> findExperi
         q.setParameter("protocolId", protocolId);
         return q;
     }
-    
+
     public static ExperimentLabel pickBestLabel(Collection<ExperimentLabel> labels) {
-		if (labels.isEmpty()) return null;
-		Collection<ExperimentLabel> preferredLabels = new HashSet<ExperimentLabel>();
-		for (ExperimentLabel label : labels){
-			if (label.isPreferred()) preferredLabels.add(label);
-		}
-		if (!preferredLabels.isEmpty()){
-			ExperimentLabel bestLabel = preferredLabels.iterator().next();
-			for (ExperimentLabel preferredLabel : preferredLabels){
-				if (preferredLabel.getRecordedDate().compareTo(bestLabel.getRecordedDate()) > 0) bestLabel = preferredLabel;
-			}
-			return bestLabel;
-		} else {
-			Collection<ExperimentLabel> nameLabels = new HashSet<ExperimentLabel>();
-			for (ExperimentLabel label : labels){
-				if (label.getLsType().equals("name")) nameLabels.add(label);
-			}
-			if (!nameLabels.isEmpty()){
-				ExperimentLabel bestLabel = nameLabels.iterator().next();
-				for (ExperimentLabel nameLabel : nameLabels){
-					if (nameLabel.getRecordedDate().compareTo(bestLabel.getRecordedDate()) > 0) bestLabel = nameLabel;
-				}
-				return bestLabel;
-			} else {
-				Collection<ExperimentLabel> notIgnoredLabels = new HashSet<ExperimentLabel>();
-				for (ExperimentLabel label : labels){
-					if (!label.isIgnored()) notIgnoredLabels.add(label);
-				}
-				if (!notIgnoredLabels.isEmpty()){
-					ExperimentLabel bestLabel = notIgnoredLabels.iterator().next();
-					for (ExperimentLabel notIgnoredLabel : notIgnoredLabels){
-						if (notIgnoredLabel.getRecordedDate().compareTo(bestLabel.getRecordedDate()) > 0) bestLabel = notIgnoredLabel;
-					}
-					return bestLabel;
-				} else {
-					return labels.iterator().next();
-				}
-			}
-		}
-	}
+        if (labels.isEmpty())
+            return null;
+        Collection<ExperimentLabel> preferredLabels = new HashSet<ExperimentLabel>();
+        for (ExperimentLabel label : labels) {
+            if (label.isPreferred())
+                preferredLabels.add(label);
+        }
+        if (!preferredLabels.isEmpty()) {
+            ExperimentLabel bestLabel = preferredLabels.iterator().next();
+            for (ExperimentLabel preferredLabel : preferredLabels) {
+                if (preferredLabel.getRecordedDate().compareTo(bestLabel.getRecordedDate()) > 0)
+                    bestLabel = preferredLabel;
+            }
+            return bestLabel;
+        } else {
+            Collection<ExperimentLabel> nameLabels = new HashSet<ExperimentLabel>();
+            for (ExperimentLabel label : labels) {
+                if (label.getLsType().equals("name"))
+                    nameLabels.add(label);
+            }
+            if (!nameLabels.isEmpty()) {
+                ExperimentLabel bestLabel = nameLabels.iterator().next();
+                for (ExperimentLabel nameLabel : nameLabels) {
+                    if (nameLabel.getRecordedDate().compareTo(bestLabel.getRecordedDate()) > 0)
+                        bestLabel = nameLabel;
+                }
+                return bestLabel;
+            } else {
+                Collection<ExperimentLabel> notIgnoredLabels = new HashSet<ExperimentLabel>();
+                for (ExperimentLabel label : labels) {
+                    if (!label.isIgnored())
+                        notIgnoredLabels.add(label);
+                }
+                if (!notIgnoredLabels.isEmpty()) {
+                    ExperimentLabel bestLabel = notIgnoredLabels.iterator().next();
+                    for (ExperimentLabel notIgnoredLabel : notIgnoredLabels) {
+                        if (notIgnoredLabel.getRecordedDate().compareTo(bestLabel.getRecordedDate()) > 0)
+                            bestLabel = notIgnoredLabel;
+                    }
+                    return bestLabel;
+                } else {
+                    return labels.iterator().next();
+                }
+            }
+        }
+    }
 
     @Transactional
     public void logicalDelete() {
-        if (!this.isIgnored()) this.setIgnored(true);
+        if (!this.isIgnored())
+            this.setIgnored(true);
     }
 
     public String toJson() {
@@ -207,7 +238,8 @@ public String toJson() {
     }
 
     public String toJsonStub() {
-        return new JSONSerializer().exclude("*.class", "experiment").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().exclude("*.class", "experiment").transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
 
     public static com.labsynch.labseer.domain.ExperimentLabel fromJsonToExperimentLabel(String json) {
@@ -219,44 +251,47 @@ public static String toJsonArray(Collection<com.labsynch.labseer.domain.Experime
     }
 
     public static String toJsonArrayStub(Collection<com.labsynch.labseer.domain.ExperimentLabel> collection) {
-        return new JSONSerializer().exclude("*.class", "experiment").transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer().exclude("*.class", "experiment").transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
 
     public static Collection<com.labsynch.labseer.domain.ExperimentLabel> fromJsonArrayToExperimentLabels(String json) {
-        return new JSONDeserializer<List<ExperimentLabel>>().use(null, ArrayList.class).use("values", ExperimentLabel.class).deserialize(json);
+        return new JSONDeserializer<List<ExperimentLabel>>().use(null, ArrayList.class)
+                .use("values", ExperimentLabel.class).deserialize(json);
     }
 
     public static Collection<com.labsynch.labseer.domain.ExperimentLabel> fromJsonArrayToExperimentLabels(Reader json) {
-        return new JSONDeserializer<List<ExperimentLabel>>().use(null, ArrayList.class).use("values", ExperimentLabel.class).deserialize(json);
+        return new JSONDeserializer<List<ExperimentLabel>>().use(null, ArrayList.class)
+                .use("values", ExperimentLabel.class).deserialize(json);
     }
 
-	public ExperimentLabel() {
+    public ExperimentLabel() {
         super();
     }
 
-	public Experiment getExperiment() {
+    public Experiment getExperiment() {
         return this.experiment;
     }
 
-	public void setExperiment(Experiment experiment) {
+    public void setExperiment(Experiment experiment) {
         this.experiment = experiment;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "experiment");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "experiment");
 
-	public static long countExperimentLabels() {
+    public static long countExperimentLabels() {
         return entityManager().createQuery("SELECT COUNT(o) FROM ExperimentLabel o", Long.class).getSingleResult();
     }
 
-	public static List<ExperimentLabel> findAllExperimentLabels() {
+    public static List<ExperimentLabel> findAllExperimentLabels() {
         return entityManager().createQuery("SELECT o FROM ExperimentLabel o", ExperimentLabel.class).getResultList();
     }
 
-	public static List<ExperimentLabel> findAllExperimentLabels(String sortFieldName, String sortOrder) {
+    public static List<ExperimentLabel> findAllExperimentLabels(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ExperimentLabel o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -267,16 +302,19 @@ public static List<ExperimentLabel> findAllExperimentLabels(String sortFieldName
         return entityManager().createQuery(jpaQuery, ExperimentLabel.class).getResultList();
     }
 
-	public static ExperimentLabel findExperimentLabel(Long id) {
-        if (id == null) return null;
+    public static ExperimentLabel findExperimentLabel(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ExperimentLabel.class, id);
     }
 
-	public static List<ExperimentLabel> findExperimentLabelEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ExperimentLabel o", ExperimentLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ExperimentLabel> findExperimentLabelEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ExperimentLabel o", ExperimentLabel.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ExperimentLabel> findExperimentLabelEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ExperimentLabel> findExperimentLabelEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ExperimentLabel o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -284,36 +322,44 @@ public static List<ExperimentLabel> findExperimentLabelEntries(int firstResult,
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ExperimentLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ExperimentLabel.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public ExperimentLabel merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ExperimentLabel merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public static Long countFindExperimentLabelsByExperiment(Experiment experiment) {
-        if (experiment == null) throw new IllegalArgumentException("The experiment argument is required");
+    public static Long countFindExperimentLabelsByExperiment(Experiment experiment) {
+        if (experiment == null)
+            throw new IllegalArgumentException("The experiment argument is required");
         EntityManager em = ExperimentLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentLabel AS o WHERE o.experiment = :experiment", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentLabel AS o WHERE o.experiment = :experiment",
+                Long.class);
         q.setParameter("experiment", experiment);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindExperimentLabelsByExperimentAndIgnoredNot(Experiment experiment, boolean ignored) {
-        if (experiment == null) throw new IllegalArgumentException("The experiment argument is required");
+    public static Long countFindExperimentLabelsByExperimentAndIgnoredNot(Experiment experiment, boolean ignored) {
+        if (experiment == null)
+            throw new IllegalArgumentException("The experiment argument is required");
         EntityManager em = ExperimentLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentLabel AS o WHERE o.experiment = :experiment AND o.ignored IS NOT :ignored", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ExperimentLabel AS o WHERE o.experiment = :experiment AND o.ignored IS NOT :ignored",
+                Long.class);
         q.setParameter("experiment", experiment);
         q.setParameter("ignored", ignored);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindExperimentLabelsByLabelTextLike(String labelText) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+    public static Long countFindExperimentLabelsByLabelTextLike(String labelText) {
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
         labelText = labelText.replace('*', '%');
         if (labelText.charAt(0) != '%') {
             labelText = "%" + labelText;
@@ -322,13 +368,17 @@ public static Long countFindExperimentLabelsByLabelTextLike(String labelText) {
             labelText = labelText + "%";
         }
         EntityManager em = ExperimentLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ExperimentLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)",
+                Long.class);
         q.setParameter("labelText", labelText);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(String labelText, String lsTypeAndKind, boolean preferred, boolean ignored) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+    public static Long countFindExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(
+            String labelText, String lsTypeAndKind, boolean preferred, boolean ignored) {
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
         labelText = labelText.replace('*', '%');
         if (labelText.charAt(0) != '%') {
             labelText = "%" + labelText;
@@ -336,9 +386,12 @@ public static Long countFindExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqual
         if (labelText.charAt(labelText.length() - 1) != '%') {
             labelText = labelText + "%";
         }
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = ExperimentLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)  AND o.lsTypeAndKind = :lsTypeAndKind  AND o.preferred IS NOT :preferred  AND o.ignored IS NOT :ignored", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ExperimentLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)  AND o.lsTypeAndKind = :lsTypeAndKind  AND o.preferred IS NOT :preferred  AND o.ignored IS NOT :ignored",
+                Long.class);
         q.setParameter("labelText", labelText);
         q.setParameter("lsTypeAndKind", lsTypeAndKind);
         q.setParameter("preferred", preferred);
@@ -346,28 +399,37 @@ public static Long countFindExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqual
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindExperimentLabelsByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(String lsTypeAndKind, boolean preferred, boolean ignored) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+    public static Long countFindExperimentLabelsByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(String lsTypeAndKind,
+            boolean preferred, boolean ignored) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = ExperimentLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentLabel AS o WHERE o.lsTypeAndKind = :lsTypeAndKind  AND o.preferred IS NOT :preferred  AND o.ignored IS NOT :ignored", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ExperimentLabel AS o WHERE o.lsTypeAndKind = :lsTypeAndKind  AND o.preferred IS NOT :preferred  AND o.ignored IS NOT :ignored",
+                Long.class);
         q.setParameter("lsTypeAndKind", lsTypeAndKind);
         q.setParameter("preferred", preferred);
         q.setParameter("ignored", ignored);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<ExperimentLabel> findExperimentLabelsByExperiment(Experiment experiment) {
-        if (experiment == null) throw new IllegalArgumentException("The experiment argument is required");
+    public static TypedQuery<ExperimentLabel> findExperimentLabelsByExperiment(Experiment experiment) {
+        if (experiment == null)
+            throw new IllegalArgumentException("The experiment argument is required");
         EntityManager em = ExperimentLabel.entityManager();
-        TypedQuery<ExperimentLabel> q = em.createQuery("SELECT o FROM ExperimentLabel AS o WHERE o.experiment = :experiment", ExperimentLabel.class);
+        TypedQuery<ExperimentLabel> q = em.createQuery(
+                "SELECT o FROM ExperimentLabel AS o WHERE o.experiment = :experiment", ExperimentLabel.class);
         q.setParameter("experiment", experiment);
         return q;
     }
 
-	public static TypedQuery<ExperimentLabel> findExperimentLabelsByExperiment(Experiment experiment, String sortFieldName, String sortOrder) {
-        if (experiment == null) throw new IllegalArgumentException("The experiment argument is required");
+    public static TypedQuery<ExperimentLabel> findExperimentLabelsByExperiment(Experiment experiment,
+            String sortFieldName, String sortOrder) {
+        if (experiment == null)
+            throw new IllegalArgumentException("The experiment argument is required");
         EntityManager em = ExperimentLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentLabel AS o WHERE o.experiment = :experiment");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ExperimentLabel AS o WHERE o.experiment = :experiment");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -379,19 +441,26 @@ public static TypedQuery<ExperimentLabel> findExperimentLabelsByExperiment(Exper
         return q;
     }
 
-	public static TypedQuery<ExperimentLabel> findExperimentLabelsByExperimentAndIgnoredNot(Experiment experiment, boolean ignored) {
-        if (experiment == null) throw new IllegalArgumentException("The experiment argument is required");
+    public static TypedQuery<ExperimentLabel> findExperimentLabelsByExperimentAndIgnoredNot(Experiment experiment,
+            boolean ignored) {
+        if (experiment == null)
+            throw new IllegalArgumentException("The experiment argument is required");
         EntityManager em = ExperimentLabel.entityManager();
-        TypedQuery<ExperimentLabel> q = em.createQuery("SELECT o FROM ExperimentLabel AS o WHERE o.experiment = :experiment AND o.ignored IS NOT :ignored", ExperimentLabel.class);
+        TypedQuery<ExperimentLabel> q = em.createQuery(
+                "SELECT o FROM ExperimentLabel AS o WHERE o.experiment = :experiment AND o.ignored IS NOT :ignored",
+                ExperimentLabel.class);
         q.setParameter("experiment", experiment);
         q.setParameter("ignored", ignored);
         return q;
     }
 
-	public static TypedQuery<ExperimentLabel> findExperimentLabelsByExperimentAndIgnoredNot(Experiment experiment, boolean ignored, String sortFieldName, String sortOrder) {
-        if (experiment == null) throw new IllegalArgumentException("The experiment argument is required");
+    public static TypedQuery<ExperimentLabel> findExperimentLabelsByExperimentAndIgnoredNot(Experiment experiment,
+            boolean ignored, String sortFieldName, String sortOrder) {
+        if (experiment == null)
+            throw new IllegalArgumentException("The experiment argument is required");
         EntityManager em = ExperimentLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentLabel AS o WHERE o.experiment = :experiment AND o.ignored IS NOT :ignored");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ExperimentLabel AS o WHERE o.experiment = :experiment AND o.ignored IS NOT :ignored");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -404,8 +473,9 @@ public static TypedQuery<ExperimentLabel> findExperimentLabelsByExperimentAndIgn
         return q;
     }
 
-	public static TypedQuery<ExperimentLabel> findExperimentLabelsByLabelTextLike(String labelText) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+    public static TypedQuery<ExperimentLabel> findExperimentLabelsByLabelTextLike(String labelText) {
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
         labelText = labelText.replace('*', '%');
         if (labelText.charAt(0) != '%') {
             labelText = "%" + labelText;
@@ -414,13 +484,17 @@ public static TypedQuery<ExperimentLabel> findExperimentLabelsByLabelTextLike(St
             labelText = labelText + "%";
         }
         EntityManager em = ExperimentLabel.entityManager();
-        TypedQuery<ExperimentLabel> q = em.createQuery("SELECT o FROM ExperimentLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", ExperimentLabel.class);
+        TypedQuery<ExperimentLabel> q = em.createQuery(
+                "SELECT o FROM ExperimentLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)",
+                ExperimentLabel.class);
         q.setParameter("labelText", labelText);
         return q;
     }
 
-	public static TypedQuery<ExperimentLabel> findExperimentLabelsByLabelTextLike(String labelText, String sortFieldName, String sortOrder) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+    public static TypedQuery<ExperimentLabel> findExperimentLabelsByLabelTextLike(String labelText,
+            String sortFieldName, String sortOrder) {
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
         labelText = labelText.replace('*', '%');
         if (labelText.charAt(0) != '%') {
             labelText = "%" + labelText;
@@ -429,7 +503,8 @@ public static TypedQuery<ExperimentLabel> findExperimentLabelsByLabelTextLike(St
             labelText = labelText + "%";
         }
         EntityManager em = ExperimentLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ExperimentLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -441,8 +516,10 @@ public static TypedQuery<ExperimentLabel> findExperimentLabelsByLabelTextLike(St
         return q;
     }
 
-	public static TypedQuery<ExperimentLabel> findExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(String labelText, String lsTypeAndKind, boolean preferred, boolean ignored) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+    public static TypedQuery<ExperimentLabel> findExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(
+            String labelText, String lsTypeAndKind, boolean preferred, boolean ignored) {
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
         labelText = labelText.replace('*', '%');
         if (labelText.charAt(0) != '%') {
             labelText = "%" + labelText;
@@ -450,9 +527,12 @@ public static TypedQuery<ExperimentLabel> findExperimentLabelsByLabelTextLikeAnd
         if (labelText.charAt(labelText.length() - 1) != '%') {
             labelText = labelText + "%";
         }
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = ExperimentLabel.entityManager();
-        TypedQuery<ExperimentLabel> q = em.createQuery("SELECT o FROM ExperimentLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)  AND o.lsTypeAndKind = :lsTypeAndKind  AND o.preferred IS NOT :preferred  AND o.ignored IS NOT :ignored", ExperimentLabel.class);
+        TypedQuery<ExperimentLabel> q = em.createQuery(
+                "SELECT o FROM ExperimentLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)  AND o.lsTypeAndKind = :lsTypeAndKind  AND o.preferred IS NOT :preferred  AND o.ignored IS NOT :ignored",
+                ExperimentLabel.class);
         q.setParameter("labelText", labelText);
         q.setParameter("lsTypeAndKind", lsTypeAndKind);
         q.setParameter("preferred", preferred);
@@ -460,8 +540,11 @@ public static TypedQuery<ExperimentLabel> findExperimentLabelsByLabelTextLikeAnd
         return q;
     }
 
-	public static TypedQuery<ExperimentLabel> findExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(String labelText, String lsTypeAndKind, boolean preferred, boolean ignored, String sortFieldName, String sortOrder) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+    public static TypedQuery<ExperimentLabel> findExperimentLabelsByLabelTextLikeAndLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(
+            String labelText, String lsTypeAndKind, boolean preferred, boolean ignored, String sortFieldName,
+            String sortOrder) {
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
         labelText = labelText.replace('*', '%');
         if (labelText.charAt(0) != '%') {
             labelText = "%" + labelText;
@@ -469,9 +552,11 @@ public static TypedQuery<ExperimentLabel> findExperimentLabelsByLabelTextLikeAnd
         if (labelText.charAt(labelText.length() - 1) != '%') {
             labelText = labelText + "%";
         }
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = ExperimentLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)  AND o.lsTypeAndKind = :lsTypeAndKind  AND o.preferred IS NOT :preferred  AND o.ignored IS NOT :ignored");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ExperimentLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)  AND o.lsTypeAndKind = :lsTypeAndKind  AND o.preferred IS NOT :preferred  AND o.ignored IS NOT :ignored");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -486,20 +571,27 @@ public static TypedQuery<ExperimentLabel> findExperimentLabelsByLabelTextLikeAnd
         return q;
     }
 
-	public static TypedQuery<ExperimentLabel> findExperimentLabelsByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(String lsTypeAndKind, boolean preferred, boolean ignored) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+    public static TypedQuery<ExperimentLabel> findExperimentLabelsByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(
+            String lsTypeAndKind, boolean preferred, boolean ignored) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = ExperimentLabel.entityManager();
-        TypedQuery<ExperimentLabel> q = em.createQuery("SELECT o FROM ExperimentLabel AS o WHERE o.lsTypeAndKind = :lsTypeAndKind  AND o.preferred IS NOT :preferred  AND o.ignored IS NOT :ignored", ExperimentLabel.class);
+        TypedQuery<ExperimentLabel> q = em.createQuery(
+                "SELECT o FROM ExperimentLabel AS o WHERE o.lsTypeAndKind = :lsTypeAndKind  AND o.preferred IS NOT :preferred  AND o.ignored IS NOT :ignored",
+                ExperimentLabel.class);
         q.setParameter("lsTypeAndKind", lsTypeAndKind);
         q.setParameter("preferred", preferred);
         q.setParameter("ignored", ignored);
         return q;
     }
 
-	public static TypedQuery<ExperimentLabel> findExperimentLabelsByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(String lsTypeAndKind, boolean preferred, boolean ignored, String sortFieldName, String sortOrder) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+    public static TypedQuery<ExperimentLabel> findExperimentLabelsByLsTypeAndKindEqualsAndPreferredNotAndIgnoredNot(
+            String lsTypeAndKind, boolean preferred, boolean ignored, String sortFieldName, String sortOrder) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = ExperimentLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentLabel AS o WHERE o.lsTypeAndKind = :lsTypeAndKind  AND o.preferred IS NOT :preferred  AND o.ignored IS NOT :ignored");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ExperimentLabel AS o WHERE o.lsTypeAndKind = :lsTypeAndKind  AND o.preferred IS NOT :preferred  AND o.ignored IS NOT :ignored");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentState.java b/src/main/java/com/labsynch/labseer/domain/ExperimentState.java
index 8d1743952..f101f1029 100755
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ExperimentState.java
@@ -33,20 +33,20 @@
 
 public class ExperimentState extends AbstractState {
 
-    @NotNull
-    @ManyToOne
-    @JoinColumn(name = "experiment_id")
-    private Experiment experiment;
-
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "lsState",  fetch =  FetchType.LAZY)
-    private Set<ExperimentValue> lsValues = new HashSet<ExperimentValue>();
-
-    public ExperimentState() {
-    }
-    
-	//constructor to instantiate a new experimentState from nested json objects
+	@NotNull
+	@ManyToOne
+	@JoinColumn(name = "experiment_id")
+	private Experiment experiment;
+
+	@OneToMany(cascade = CascadeType.ALL, mappedBy = "lsState", fetch = FetchType.LAZY)
+	private Set<ExperimentValue> lsValues = new HashSet<ExperimentValue>();
+
+	public ExperimentState() {
+	}
+
+	// constructor to instantiate a new experimentState from nested json objects
 	public ExperimentState(ExperimentState experimentState) {
-		
+
 		super.setRecordedBy(experimentState.getRecordedBy());
 		super.setRecordedDate(experimentState.getRecordedDate());
 		super.setLsTransaction(experimentState.getLsTransaction());
@@ -54,9 +54,9 @@ public ExperimentState(ExperimentState experimentState) {
 		super.setModifiedDate(experimentState.getModifiedDate());
 		super.setLsType(experimentState.getLsType());
 		super.setLsKind(experimentState.getLsKind());
-	
+
 	}
-	
+
 	public static ExperimentState update(ExperimentState experimentState) {
 		ExperimentState updatedExperimentState = ExperimentState.findExperimentState(experimentState.getId());
 		updatedExperimentState.setRecordedBy(experimentState.getRecordedBy());
@@ -65,70 +65,75 @@ public static ExperimentState update(ExperimentState experimentState) {
 		updatedExperimentState.setModifiedBy(experimentState.getModifiedBy());
 		updatedExperimentState.setModifiedDate(new Date());
 		updatedExperimentState.setLsType(experimentState.getLsType());
-		updatedExperimentState.setLsKind(experimentState.getLsKind());	
+		updatedExperimentState.setLsKind(experimentState.getLsKind());
 		updatedExperimentState.setIgnored(experimentState.isIgnored());
 		updatedExperimentState.merge();
 		return updatedExperimentState;
 	}
-	
+
 	@Transactional
-    public String toJson() {
-        return new JSONSerializer().include("lsValues").exclude("*.class", "experiment").transform(new ExcludeNulls(), void.class).serialize(this);
-    }
-	
+	public String toJson() {
+		return new JSONSerializer().include("lsValues").exclude("*.class", "experiment")
+				.transform(new ExcludeNulls(), void.class).serialize(this);
+	}
+
 	public static ExperimentState fromJsonToExperimentState(String json) {
-	    return new JSONDeserializer<ExperimentState>().use(null, ExperimentState.class).deserialize(json);
+		return new JSONDeserializer<ExperimentState>().use(null, ExperimentState.class).deserialize(json);
 	}
-	
+
 	public static String toJsonArray(Collection<ExperimentState> collection) {
-	    return new JSONSerializer().exclude("*.class")
+		return new JSONSerializer().exclude("*.class")
 				.transform(new ExcludeNulls(), void.class)
-	    		.serialize(collection);
+				.serialize(collection);
 	}
-	
-	
+
 	public static Collection<ExperimentState> fromJsonArrayToExperimentStates(String json) {
-	    return new JSONDeserializer<List<ExperimentState>>().use(null, ArrayList.class).use("values", ExperimentState.class).deserialize(json);
+		return new JSONDeserializer<List<ExperimentState>>().use(null, ArrayList.class)
+				.use("values", ExperimentState.class).deserialize(json);
 	}
-	
+
 	public static Collection<ExperimentState> fromJsonArrayToExperimentStates(Reader json) {
-	    return new JSONDeserializer<List<ExperimentState>>().use(null, ArrayList.class).use("values", ExperimentState.class).deserialize(json);
+		return new JSONDeserializer<List<ExperimentState>>().use(null, ArrayList.class)
+				.use("values", ExperimentState.class).deserialize(json);
 	}
 
-
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-	
-	public static TypedQuery<ExperimentState> findExperimentStatesByExptIDAndStateTypeKind(Long experimentId, 
-			String stateType, 
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
+
+	public static TypedQuery<ExperimentState> findExperimentStatesByExptIDAndStateTypeKind(Long experimentId,
+			String stateType,
 			String stateKind) {
-			if (stateType == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-			if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-			
-			EntityManager em = entityManager();
-			String hsqlQuery = "SELECT evs FROM ExperimentState AS evs " +
-			"JOIN evs.experiment exp " +
-			"WHERE evs.lsType = :stateType AND evs.lsKind = :stateKind AND evs.ignored IS NOT :ignored " +
-			"AND exp.id = :experimentId ";
-			TypedQuery<ExperimentState> q = em.createQuery(hsqlQuery, ExperimentState.class);
-			q.setParameter("experimentId", experimentId);
-			q.setParameter("stateType", stateType);
-			q.setParameter("stateKind", stateKind);
-			q.setParameter("ignored", true);
-			return q;
-		}
+		if (stateType == null || stateKind.length() == 0)
+			throw new IllegalArgumentException("The stateType argument is required");
+		if (stateKind == null || stateKind.length() == 0)
+			throw new IllegalArgumentException("The stateKind argument is required");
+
+		EntityManager em = entityManager();
+		String hsqlQuery = "SELECT evs FROM ExperimentState AS evs " +
+				"JOIN evs.experiment exp " +
+				"WHERE evs.lsType = :stateType AND evs.lsKind = :stateKind AND evs.ignored IS NOT :ignored " +
+				"AND exp.id = :experimentId ";
+		TypedQuery<ExperimentState> q = em.createQuery(hsqlQuery, ExperimentState.class);
+		q.setParameter("experimentId", experimentId);
+		q.setParameter("stateType", stateType);
+		q.setParameter("stateKind", stateKind);
+		q.setParameter("ignored", true);
+		return q;
+	}
 
 	public static TypedQuery<ExperimentState> findExperimentStatesByExperimentCodeNameAndStateTypeKind(
 			String experimentCodeName, String stateType, String stateKind) {
-		if (stateType == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-		
+		if (stateType == null || stateKind.length() == 0)
+			throw new IllegalArgumentException("The stateType argument is required");
+		if (stateKind == null || stateKind.length() == 0)
+			throw new IllegalArgumentException("The stateKind argument is required");
+
 		EntityManager em = entityManager();
 		String hsqlQuery = "SELECT evs FROM ExperimentState AS evs " +
-		"JOIN evs.experiment exp " +
-		"WHERE evs.lsType = :stateType AND evs.lsKind = :stateKind AND evs.ignored IS NOT :ignored " +
-		"AND exp.codeName = :experimentCodeName ";
+				"JOIN evs.experiment exp " +
+				"WHERE evs.lsType = :stateType AND evs.lsKind = :stateKind AND evs.ignored IS NOT :ignored " +
+				"AND exp.codeName = :experimentCodeName ";
 		TypedQuery<ExperimentState> q = em.createQuery(hsqlQuery, ExperimentState.class);
 		q.setParameter("experimentCodeName", experimentCodeName);
 		q.setParameter("stateType", stateType);
@@ -138,98 +143,110 @@ public static TypedQuery<ExperimentState> findExperimentStatesByExperimentCodeNa
 	}
 
 	public static Long countFindExperimentStatesByExperiment(Experiment experiment) {
-        if (experiment == null) throw new IllegalArgumentException("The experiment argument is required");
-        EntityManager em = ExperimentState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentState AS o WHERE o.experiment = :experiment", Long.class);
-        q.setParameter("experiment", experiment);
-        return ((Long) q.getSingleResult());
-    }
+		if (experiment == null)
+			throw new IllegalArgumentException("The experiment argument is required");
+		EntityManager em = ExperimentState.entityManager();
+		TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentState AS o WHERE o.experiment = :experiment",
+				Long.class);
+		q.setParameter("experiment", experiment);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static TypedQuery<ExperimentState> findExperimentStatesByExperiment(Experiment experiment) {
-        if (experiment == null) throw new IllegalArgumentException("The experiment argument is required");
-        EntityManager em = ExperimentState.entityManager();
-        TypedQuery<ExperimentState> q = em.createQuery("SELECT o FROM ExperimentState AS o WHERE o.experiment = :experiment", ExperimentState.class);
-        q.setParameter("experiment", experiment);
-        return q;
-    }
-
-	public static TypedQuery<ExperimentState> findExperimentStatesByExperiment(Experiment experiment, String sortFieldName, String sortOrder) {
-        if (experiment == null) throw new IllegalArgumentException("The experiment argument is required");
-        EntityManager em = ExperimentState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentState AS o WHERE o.experiment = :experiment");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<ExperimentState> q = em.createQuery(queryBuilder.toString(), ExperimentState.class);
-        q.setParameter("experiment", experiment);
-        return q;
-    }
+		if (experiment == null)
+			throw new IllegalArgumentException("The experiment argument is required");
+		EntityManager em = ExperimentState.entityManager();
+		TypedQuery<ExperimentState> q = em.createQuery(
+				"SELECT o FROM ExperimentState AS o WHERE o.experiment = :experiment", ExperimentState.class);
+		q.setParameter("experiment", experiment);
+		return q;
+	}
+
+	public static TypedQuery<ExperimentState> findExperimentStatesByExperiment(Experiment experiment,
+			String sortFieldName, String sortOrder) {
+		if (experiment == null)
+			throw new IllegalArgumentException("The experiment argument is required");
+		EntityManager em = ExperimentState.entityManager();
+		StringBuilder queryBuilder = new StringBuilder(
+				"SELECT o FROM ExperimentState AS o WHERE o.experiment = :experiment");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<ExperimentState> q = em.createQuery(queryBuilder.toString(), ExperimentState.class);
+		q.setParameter("experiment", experiment);
+		return q;
+	}
 
 	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("experiment", "lsValues");
 
 	public static long countExperimentStates() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ExperimentState o", Long.class).getSingleResult();
-    }
+		return entityManager().createQuery("SELECT COUNT(o) FROM ExperimentState o", Long.class).getSingleResult();
+	}
 
 	public static List<ExperimentState> findAllExperimentStates() {
-        return entityManager().createQuery("SELECT o FROM ExperimentState o", ExperimentState.class).getResultList();
-    }
+		return entityManager().createQuery("SELECT o FROM ExperimentState o", ExperimentState.class).getResultList();
+	}
 
 	public static List<ExperimentState> findAllExperimentStates(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ExperimentState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ExperimentState.class).getResultList();
-    }
+		String jpaQuery = "SELECT o FROM ExperimentState o";
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				jpaQuery = jpaQuery + " " + sortOrder;
+			}
+		}
+		return entityManager().createQuery(jpaQuery, ExperimentState.class).getResultList();
+	}
 
 	public static ExperimentState findExperimentState(Long id) {
-        if (id == null) return null;
-        return entityManager().find(ExperimentState.class, id);
-    }
+		if (id == null)
+			return null;
+		return entityManager().find(ExperimentState.class, id);
+	}
 
 	public static List<ExperimentState> findExperimentStateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ExperimentState o", ExperimentState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-
-	public static List<ExperimentState> findExperimentStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM ExperimentState o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, ExperimentState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
+		return entityManager().createQuery("SELECT o FROM ExperimentState o", ExperimentState.class)
+				.setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+	}
+
+	public static List<ExperimentState> findExperimentStateEntries(int firstResult, int maxResults,
+			String sortFieldName, String sortOrder) {
+		String jpaQuery = "SELECT o FROM ExperimentState o";
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				jpaQuery = jpaQuery + " " + sortOrder;
+			}
+		}
+		return entityManager().createQuery(jpaQuery, ExperimentState.class).setFirstResult(firstResult)
+				.setMaxResults(maxResults).getResultList();
+	}
 
 	@Transactional
-    public ExperimentState merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        ExperimentState merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
+	public ExperimentState merge() {
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
+		ExperimentState merged = this.entityManager.merge(this);
+		this.entityManager.flush();
+		return merged;
+	}
 
 	public Experiment getExperiment() {
-        return this.experiment;
-    }
+		return this.experiment;
+	}
 
 	public void setExperiment(Experiment experiment) {
-        this.experiment = experiment;
-    }
+		this.experiment = experiment;
+	}
 
 	public Set<ExperimentValue> getLsValues() {
-        return this.lsValues;
-    }
+		return this.lsValues;
+	}
 
 	public void setLsValues(Set<ExperimentValue> lsValues) {
-        this.lsValues = lsValues;
-    }
+		this.lsValues = lsValues;
+	}
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentType.java b/src/main/java/com/labsynch/labseer/domain/ExperimentType.java
index 5e53e3c79..5da7a304e 100755
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentType.java
+++ b/src/main/java/com/labsynch/labseer/domain/ExperimentType.java
@@ -31,56 +31,58 @@ public class ExperimentType {
     @Size(max = 128)
     private String typeName;
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ExperimentType fromJsonToExperimentType(String json) {
+    public static ExperimentType fromJsonToExperimentType(String json) {
         return new JSONDeserializer<ExperimentType>()
-        .use(null, ExperimentType.class).deserialize(json);
+                .use(null, ExperimentType.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ExperimentType> collection) {
+    public static String toJsonArray(Collection<ExperimentType> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ExperimentType> collection, String[] fields) {
+    public static String toJsonArray(Collection<ExperimentType> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ExperimentType> fromJsonArrayToExperimentTypes(String json) {
+    public static Collection<ExperimentType> fromJsonArrayToExperimentTypes(String json) {
         return new JSONDeserializer<List<ExperimentType>>()
-        .use("values", ExperimentType.class).deserialize(json);
+                .use("values", ExperimentType.class).deserialize(json);
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new ExperimentType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countExperimentTypes() {
+    public static long countExperimentTypes() {
         return entityManager().createQuery("SELECT COUNT(o) FROM ExperimentType o", Long.class).getSingleResult();
     }
 
-	public static List<ExperimentType> findAllExperimentTypes() {
+    public static List<ExperimentType> findAllExperimentTypes() {
         return entityManager().createQuery("SELECT o FROM ExperimentType o", ExperimentType.class).getResultList();
     }
 
-	public static List<ExperimentType> findAllExperimentTypes(String sortFieldName, String sortOrder) {
+    public static List<ExperimentType> findAllExperimentTypes(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ExperimentType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -91,16 +93,19 @@ public static List<ExperimentType> findAllExperimentTypes(String sortFieldName,
         return entityManager().createQuery(jpaQuery, ExperimentType.class).getResultList();
     }
 
-	public static ExperimentType findExperimentType(Long id) {
-        if (id == null) return null;
+    public static ExperimentType findExperimentType(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ExperimentType.class, id);
     }
 
-	public static List<ExperimentType> findExperimentTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ExperimentType o", ExperimentType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ExperimentType> findExperimentTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ExperimentType o", ExperimentType.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ExperimentType> findExperimentTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ExperimentType> findExperimentTypeEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM ExperimentType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -108,18 +113,21 @@ public static List<ExperimentType> findExperimentTypeEntries(int firstResult, in
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ExperimentType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ExperimentType.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -128,46 +136,56 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public ExperimentType merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ExperimentType merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public static Long countFindExperimentTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static Long countFindExperimentTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = ExperimentType.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentType AS o WHERE o.typeName = :typeName", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentType AS o WHERE o.typeName = :typeName",
+                Long.class);
         q.setParameter("typeName", typeName);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<ExperimentType> findExperimentTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static TypedQuery<ExperimentType> findExperimentTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = ExperimentType.entityManager();
-        TypedQuery<ExperimentType> q = em.createQuery("SELECT o FROM ExperimentType AS o WHERE o.typeName = :typeName", ExperimentType.class);
+        TypedQuery<ExperimentType> q = em.createQuery("SELECT o FROM ExperimentType AS o WHERE o.typeName = :typeName",
+                ExperimentType.class);
         q.setParameter("typeName", typeName);
         return q;
     }
 
-	public static TypedQuery<ExperimentType> findExperimentTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static TypedQuery<ExperimentType> findExperimentTypesByTypeNameEquals(String typeName, String sortFieldName,
+            String sortOrder) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = ExperimentType.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentType AS o WHERE o.typeName = :typeName");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ExperimentType AS o WHERE o.typeName = :typeName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -179,41 +197,41 @@ public static TypedQuery<ExperimentType> findExperimentTypesByTypeNameEquals(Str
         return q;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	@Id
+    @Id
     @SequenceGenerator(name = "experimentTypeGen", sequenceName = "EXPERIMENT_TYPE_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "experimentTypeGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String getTypeName() {
+    public String getTypeName() {
         return this.typeName;
     }
 
-	public void setTypeName(String typeName) {
+    public void setTypeName(String typeName) {
         this.typeName = typeName;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ExperimentValue.java b/src/main/java/com/labsynch/labseer/domain/ExperimentValue.java
index a909690db..a542a04a6 100755
--- a/src/main/java/com/labsynch/labseer/domain/ExperimentValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ExperimentValue.java
@@ -43,13 +43,16 @@ public class ExperimentValue extends AbstractValue {
     public ExperimentValue() {
     }
 
-    public static com.labsynch.labseer.domain.ExperimentValue create(com.labsynch.labseer.domain.ExperimentValue experimentValue) {
-        ExperimentValue newExperimentValue = new JSONDeserializer<ExperimentValue>().use(null, ExperimentValue.class).deserializeInto(experimentValue.toJson(), new ExperimentValue());
+    public static com.labsynch.labseer.domain.ExperimentValue create(
+            com.labsynch.labseer.domain.ExperimentValue experimentValue) {
+        ExperimentValue newExperimentValue = new JSONDeserializer<ExperimentValue>().use(null, ExperimentValue.class)
+                .deserializeInto(experimentValue.toJson(), new ExperimentValue());
         return newExperimentValue;
     }
 
     public static com.labsynch.labseer.domain.ExperimentValue create(String experimentValueJson) {
-        ExperimentValue newExperimentValue = new JSONDeserializer<ExperimentValue>().use(null, ExperimentValue.class).deserializeInto(experimentValueJson, new ExperimentValue());
+        ExperimentValue newExperimentValue = new JSONDeserializer<ExperimentValue>().use(null, ExperimentValue.class)
+                .deserializeInto(experimentValueJson, new ExperimentValue());
         return newExperimentValue;
     }
 
@@ -62,12 +65,15 @@ public static List<com.labsynch.labseer.domain.ExperimentValue> findAllExperimen
     }
 
     public static com.labsynch.labseer.domain.ExperimentValue findExperimentValue(Long id) {
-        if (id == null) return null;
+        if (id == null)
+            return null;
         return entityManager().find(ExperimentValue.class, id);
     }
 
-    public static List<com.labsynch.labseer.domain.ExperimentValue> findExperimentValueEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ExperimentValue o", ExperimentValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<com.labsynch.labseer.domain.ExperimentValue> findExperimentValueEntries(int firstResult,
+            int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ExperimentValue o", ExperimentValue.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
     public static com.labsynch.labseer.domain.ExperimentValue fromJsonToExperimentValue(String json) {
@@ -76,16 +82,19 @@ public static com.labsynch.labseer.domain.ExperimentValue fromJsonToExperimentVa
     }
 
     public static Collection<com.labsynch.labseer.domain.ExperimentValue> fromJsonArrayToExperimentValues(String json) {
-        return new JSONDeserializer<List<ExperimentValue>>().use(null, ArrayList.class).use("values", ExperimentValue.class).deserialize(json);
+        return new JSONDeserializer<List<ExperimentValue>>().use(null, ArrayList.class)
+                .use("values", ExperimentValue.class).deserialize(json);
     }
 
     public static Collection<com.labsynch.labseer.domain.ExperimentValue> fromJsonArrayToExperimentValues(Reader json) {
-        return new JSONDeserializer<List<ExperimentValue>>().use(null, ArrayList.class).use("values", ExperimentValue.class).deserialize(json);
+        return new JSONDeserializer<List<ExperimentValue>>().use(null, ArrayList.class)
+                .use("values", ExperimentValue.class).deserialize(json);
     }
 
     @Transactional
     public com.labsynch.labseer.domain.ExperimentValue merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ExperimentValue merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
@@ -112,14 +121,16 @@ public static String getExperimentGroupValueCollectionJson(List<java.lang.Long>
         Collection<ExperimentValue> experimentValues = new HashSet<ExperimentValue>();
         for (Long id : idList) {
             ExperimentValue query = ExperimentValue.findExperimentValue(id);
-            if (query != null) experimentValues.add(query);
+            if (query != null)
+                experimentValues.add(query);
         }
         return ExperimentValue.toJsonArray(experimentValues);
     }
 
     @Transactional
     public static int deleteByExperimentID(Long experimentId) {
-        if (experimentId == null) return 0;
+        if (experimentId == null)
+            return 0;
         EntityManager em = TreatmentGroupValue.entityManager();
         String deleteSQL = "DELETE FROM ExperimentValue oo WHERE id in (select o.id from ExperimentValue o where o.lsState.subject.treatmentGroup.analysisGroup.experiment.id = :experimentId)";
         Query q = em.createQuery(deleteSQL);
@@ -128,20 +139,31 @@ public static int deleteByExperimentID(Long experimentId) {
         return numberOfDeletedEntities;
     }
 
-    public static com.labsynch.labseer.domain.ExperimentValue update(com.labsynch.labseer.domain.ExperimentValue experimentValue) {
-        ExperimentValue updatedExperimentValue = new JSONDeserializer<ExperimentValue>().use(null, ExperimentValue.class).deserializeInto(experimentValue.toJson(), ExperimentValue.findExperimentValue(experimentValue.getId()));
+    public static com.labsynch.labseer.domain.ExperimentValue update(
+            com.labsynch.labseer.domain.ExperimentValue experimentValue) {
+        ExperimentValue updatedExperimentValue = new JSONDeserializer<ExperimentValue>()
+                .use(null, ExperimentValue.class).deserializeInto(experimentValue.toJson(),
+                        ExperimentValue.findExperimentValue(experimentValue.getId()));
         updatedExperimentValue.setModifiedDate(new Date());
         updatedExperimentValue.merge();
         return updatedExperimentValue;
     }
 
-    public static TypedQuery<com.labsynch.labseer.domain.ExperimentValue> findExperimentValuesByExptIDAndStateTypeKindAndValueTypeKind(Long experimentId, String stateType, String stateKind, String valueType, String valueKind) {
-        if (stateType == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-        if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-        if (valueType == null || valueType.length() == 0) throw new IllegalArgumentException("The valueType argument is required");
-        if (valueKind == null || valueKind.length() == 0) throw new IllegalArgumentException("The valueKind argument is required");
+    public static TypedQuery<com.labsynch.labseer.domain.ExperimentValue> findExperimentValuesByExptIDAndStateTypeKindAndValueTypeKind(
+            Long experimentId, String stateType, String stateKind, String valueType, String valueKind) {
+        if (stateType == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateType argument is required");
+        if (stateKind == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateKind argument is required");
+        if (valueType == null || valueType.length() == 0)
+            throw new IllegalArgumentException("The valueType argument is required");
+        if (valueKind == null || valueKind.length() == 0)
+            throw new IllegalArgumentException("The valueKind argument is required");
         EntityManager em = entityManager();
-        String hsqlQuery = "SELECT ev FROM ExperimentValue AS ev " + "JOIN ev.lsState evs " + "JOIN evs.experiment exp " + "WHERE evs.lsType = :stateType AND evs.lsKind = :stateKind AND evs.ignored IS NOT :ignored " + "AND ev.lsType = :valueType AND ev.lsKind = :valueKind AND ev.ignored IS NOT :ignored " + "AND exp.id = :experimentId ";
+        String hsqlQuery = "SELECT ev FROM ExperimentValue AS ev " + "JOIN ev.lsState evs " + "JOIN evs.experiment exp "
+                + "WHERE evs.lsType = :stateType AND evs.lsKind = :stateKind AND evs.ignored IS NOT :ignored "
+                + "AND ev.lsType = :valueType AND ev.lsKind = :valueKind AND ev.ignored IS NOT :ignored "
+                + "AND exp.id = :experimentId ";
         TypedQuery<ExperimentValue> q = em.createQuery(hsqlQuery, ExperimentValue.class);
         q.setParameter("experimentId", experimentId);
         q.setParameter("stateType", stateType);
@@ -151,14 +173,22 @@ public static TypedQuery<com.labsynch.labseer.domain.ExperimentValue> findExperi
         q.setParameter("ignored", true);
         return q;
     }
-    
-    public static TypedQuery<com.labsynch.labseer.domain.ExperimentValue> findExperimentValuesByExperimentCodeNameAndStateTypeKindAndValueTypeKind(String experimentCodeName, String stateType, String stateKind, String valueType, String valueKind) {
-        if (stateType == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-        if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-        if (valueType == null || valueType.length() == 0) throw new IllegalArgumentException("The valueType argument is required");
-        if (valueKind == null || valueKind.length() == 0) throw new IllegalArgumentException("The valueKind argument is required");
+
+    public static TypedQuery<com.labsynch.labseer.domain.ExperimentValue> findExperimentValuesByExperimentCodeNameAndStateTypeKindAndValueTypeKind(
+            String experimentCodeName, String stateType, String stateKind, String valueType, String valueKind) {
+        if (stateType == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateType argument is required");
+        if (stateKind == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateKind argument is required");
+        if (valueType == null || valueType.length() == 0)
+            throw new IllegalArgumentException("The valueType argument is required");
+        if (valueKind == null || valueKind.length() == 0)
+            throw new IllegalArgumentException("The valueKind argument is required");
         EntityManager em = entityManager();
-        String hsqlQuery = "SELECT ev FROM ExperimentValue AS ev " + "JOIN ev.lsState evs " + "JOIN evs.experiment exp " + "WHERE evs.lsType = :stateType AND evs.lsKind = :stateKind AND evs.ignored IS NOT :ignored " + "AND ev.lsType = :valueType AND ev.lsKind = :valueKind AND ev.ignored IS NOT :ignored " + "AND exp.codeName = :experimentCodeName ";
+        String hsqlQuery = "SELECT ev FROM ExperimentValue AS ev " + "JOIN ev.lsState evs " + "JOIN evs.experiment exp "
+                + "WHERE evs.lsType = :stateType AND evs.lsKind = :stateKind AND evs.ignored IS NOT :ignored "
+                + "AND ev.lsType = :valueType AND ev.lsKind = :valueKind AND ev.ignored IS NOT :ignored "
+                + "AND exp.codeName = :experimentCodeName ";
         TypedQuery<ExperimentValue> q = em.createQuery(hsqlQuery, ExperimentValue.class);
         q.setParameter("experimentCodeName", experimentCodeName);
         q.setParameter("stateType", stateType);
@@ -169,11 +199,16 @@ public static TypedQuery<com.labsynch.labseer.domain.ExperimentValue> findExperi
         return q;
     }
 
-    public static TypedQuery<com.labsynch.labseer.domain.ExperimentValue> findExperimentValuesByExptIDAndStateTypeKind(Long experimentId, String stateType, String stateKind) {
-        if (stateType == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-        if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
+    public static TypedQuery<com.labsynch.labseer.domain.ExperimentValue> findExperimentValuesByExptIDAndStateTypeKind(
+            Long experimentId, String stateType, String stateKind) {
+        if (stateType == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateType argument is required");
+        if (stateKind == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateKind argument is required");
         EntityManager em = entityManager();
-        String hsqlQuery = "SELECT ev FROM ExperimentValue AS ev " + "JOIN ev.lsState evs " + "JOIN evs.experiment exp " + "WHERE evs.lsType = :stateType AND evs.lsKind = :stateKind AND evs.ignored IS NOT :ignored " + "AND ev.ignored IS NOT :ignored " + "AND exp.id = :experimentId ";
+        String hsqlQuery = "SELECT ev FROM ExperimentValue AS ev " + "JOIN ev.lsState evs " + "JOIN evs.experiment exp "
+                + "WHERE evs.lsType = :stateType AND evs.lsKind = :stateKind AND evs.ignored IS NOT :ignored "
+                + "AND ev.ignored IS NOT :ignored " + "AND exp.id = :experimentId ";
         TypedQuery<ExperimentValue> q = em.createQuery(hsqlQuery, ExperimentValue.class);
         q.setParameter("experimentId", experimentId);
         q.setParameter("stateType", stateType);
@@ -181,10 +216,13 @@ public static TypedQuery<com.labsynch.labseer.domain.ExperimentValue> findExperi
         q.setParameter("ignored", true);
         return q;
     }
-    
-    public static TypedQuery<ExperimentValue> findExperimentValuesByLsKindEqualsAndDateValueLike(String lsKind, Date dateValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (dateValue == null) throw new IllegalArgumentException("The dateValue argument is required");
+
+    public static TypedQuery<ExperimentValue> findExperimentValuesByLsKindEqualsAndDateValueLike(String lsKind,
+            Date dateValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (dateValue == null)
+            throw new IllegalArgumentException("The dateValue argument is required");
         EntityManager em = ExperimentValue.entityManager();
         Calendar cal = Calendar.getInstance();
         cal.setTime(dateValue);
@@ -193,7 +231,9 @@ public static TypedQuery<ExperimentValue> findExperimentValuesByLsKindEqualsAndD
         cal.setTime(dateValue);
         cal.add(Calendar.DATE, 1);
         Date afterDate = cal.getTime();
-        TypedQuery<ExperimentValue> q = em.createQuery("SELECT o FROM ExperimentValue AS o WHERE o.lsKind = :lsKind AND o.ignored =false AND o.dateValue > :beforeDate AND o.dateValue < :afterDate", ExperimentValue.class);
+        TypedQuery<ExperimentValue> q = em.createQuery(
+                "SELECT o FROM ExperimentValue AS o WHERE o.lsKind = :lsKind AND o.ignored =false AND o.dateValue > :beforeDate AND o.dateValue < :afterDate",
+                ExperimentValue.class);
         q.setParameter("lsKind", lsKind);
         q.setParameter("beforeDate", beforeDate);
         q.setParameter("afterDate", afterDate);
@@ -201,111 +241,110 @@ public static TypedQuery<ExperimentValue> findExperimentValuesByLsKindEqualsAndD
     }
 
     public static String[] getColumns() {
-        String[] headerColumns = new String[] { "id", "codeName", "lsType", "lsKind", "labelText", "description", "comments", "ignored", "displayOrder" };
+        String[] headerColumns = new String[] { "id", "codeName", "lsType", "lsKind", "labelText", "description",
+                "comments", "ignored", "displayOrder" };
         return headerColumns;
     }
 
     public static CellProcessor[] getProcessors() {
-        final CellProcessor[] processors = new CellProcessor[] { new Optional(), new Optional(), new Optional(), new Optional(), new Optional(), new Optional(), new Optional(), new Optional(), new Optional() };
+        final CellProcessor[] processors = new CellProcessor[] { new Optional(), new Optional(), new Optional(),
+                new Optional(), new Optional(), new Optional(), new Optional(), new Optional(), new Optional() };
         return processors;
     }
-    
-	public static String[] getAllColumns(){
-		String[] headerColumns = new String[] {
-				"lsState",
-				"id",
-				"lsType",
-				"lsKind",
-				"codeType",
-				"codeKind",
-				"codeValue",
-				"stringValue",
-				
-				"fileValue",
-				"urlValue",
-				"dateValue",
-				"clobValue",
-				"operatorType",
-				"operatorKind",
-				"numericValue",
-				"sigFigs",
-				"uncertainty",
-				"numberOfReplicates",
-				
-				"uncertaintyType",
-				"unitType",
-				"unitKind",
-				"comments",
-				"ignored",
-				"lsTransaction",
-				"recordedDate",
-				"recordedBy",
-				"modifiedDate",
-				"modifiedBy",
-				
-				"publicData"
-		};
-//31 columns
-		return headerColumns;
-
-	}
-
-	public static CellProcessor[] getAllProcessors() {
-		final CellProcessor[] processors = new CellProcessor[] { 
-				
-				new Optional(),
-
-				new Optional(),
-				new Optional(),
-				new Optional(),
-				new Optional(),
-				new Optional(),
-				new Optional(),
-				new Optional(),
-
-				new Optional(),
-				new Optional(),
-				new Optional(),
-				new Optional(),
-				new Optional(),
-				new Optional(),
-				new Optional(),
-				new Optional(),
-				new Optional(),
-				new Optional(),
-
-				new Optional(),
-				new Optional(),
-				new Optional(),
-				new Optional(),
-				new Optional(),
-				new Optional(),
-				new Optional(),
-				new Optional(),
-				new Optional(),
-				new Optional(),
-
-				new Optional()
-
-
-		};
-
-		return processors;
-	}
-	
-
-
-	public ExperimentState getLsState() {
+
+    public static String[] getAllColumns() {
+        String[] headerColumns = new String[] {
+                "lsState",
+                "id",
+                "lsType",
+                "lsKind",
+                "codeType",
+                "codeKind",
+                "codeValue",
+                "stringValue",
+
+                "fileValue",
+                "urlValue",
+                "dateValue",
+                "clobValue",
+                "operatorType",
+                "operatorKind",
+                "numericValue",
+                "sigFigs",
+                "uncertainty",
+                "numberOfReplicates",
+
+                "uncertaintyType",
+                "unitType",
+                "unitKind",
+                "comments",
+                "ignored",
+                "lsTransaction",
+                "recordedDate",
+                "recordedBy",
+                "modifiedDate",
+                "modifiedBy",
+
+                "publicData"
+        };
+        // 31 columns
+        return headerColumns;
+
+    }
+
+    public static CellProcessor[] getAllProcessors() {
+        final CellProcessor[] processors = new CellProcessor[] {
+
+                new Optional(),
+
+                new Optional(),
+                new Optional(),
+                new Optional(),
+                new Optional(),
+                new Optional(),
+                new Optional(),
+                new Optional(),
+
+                new Optional(),
+                new Optional(),
+                new Optional(),
+                new Optional(),
+                new Optional(),
+                new Optional(),
+                new Optional(),
+                new Optional(),
+                new Optional(),
+                new Optional(),
+
+                new Optional(),
+                new Optional(),
+                new Optional(),
+                new Optional(),
+                new Optional(),
+                new Optional(),
+                new Optional(),
+                new Optional(),
+                new Optional(),
+                new Optional(),
+
+                new Optional()
+
+        };
+
+        return processors;
+    }
+
+    public ExperimentState getLsState() {
         return this.lsState;
     }
 
-	public void setLsState(ExperimentState lsState) {
+    public void setLsState(ExperimentState lsState) {
         this.lsState = lsState;
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsState");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsState");
 
-	public static List<ExperimentValue> findAllExperimentValues(String sortFieldName, String sortOrder) {
+    public static List<ExperimentValue> findAllExperimentValues(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ExperimentValue o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -316,7 +355,8 @@ public static List<ExperimentValue> findAllExperimentValues(String sortFieldName
         return entityManager().createQuery(jpaQuery, ExperimentValue.class).getResultList();
     }
 
-	public static List<ExperimentValue> findExperimentValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ExperimentValue> findExperimentValueEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ExperimentValue o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -324,12 +364,15 @@ public static List<ExperimentValue> findExperimentValueEntries(int firstResult,
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ExperimentValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ExperimentValue.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static Long countFindExperimentValuesByLsKindEqualsAndCodeValueLike(String lsKind, String codeValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+    public static Long countFindExperimentValuesByLsKindEqualsAndCodeValueLike(String lsKind, String codeValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (codeValue == null || codeValue.length() == 0)
+            throw new IllegalArgumentException("The codeValue argument is required");
         codeValue = codeValue.replace('*', '%');
         if (codeValue.charAt(0) != '%') {
             codeValue = "%" + codeValue;
@@ -338,15 +381,19 @@ public static Long countFindExperimentValuesByLsKindEqualsAndCodeValueLike(Strin
             codeValue = codeValue + "%";
         }
         EntityManager em = ExperimentValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ExperimentValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)",
+                Long.class);
         q.setParameter("lsKind", lsKind);
         q.setParameter("codeValue", codeValue);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindExperimentValuesByLsKindEqualsAndStringValueLike(String lsKind, String stringValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+    public static Long countFindExperimentValuesByLsKindEqualsAndStringValueLike(String lsKind, String stringValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0)
+            throw new IllegalArgumentException("The stringValue argument is required");
         stringValue = stringValue.replace('*', '%');
         if (stringValue.charAt(0) != '%') {
             stringValue = "%" + stringValue;
@@ -355,27 +402,38 @@ public static Long countFindExperimentValuesByLsKindEqualsAndStringValueLike(Str
             stringValue = stringValue + "%";
         }
         EntityManager em = ExperimentValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ExperimentValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)",
+                Long.class);
         q.setParameter("lsKind", lsKind);
         q.setParameter("stringValue", stringValue);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindExperimentValuesByLsState(ExperimentState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+    public static Long countFindExperimentValuesByLsState(ExperimentState lsState) {
+        if (lsState == null)
+            throw new IllegalArgumentException("The lsState argument is required");
         EntityManager em = ExperimentValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentValue AS o WHERE o.lsState = :lsState", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentValue AS o WHERE o.lsState = :lsState",
+                Long.class);
         q.setParameter("lsState", lsState);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindExperimentValuesByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals(ExperimentState lsState, boolean ignored, String lsKind, String lsType, String stringValue) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+    public static Long countFindExperimentValuesByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals(
+            ExperimentState lsState, boolean ignored, String lsKind, String lsType, String stringValue) {
+        if (lsState == null)
+            throw new IllegalArgumentException("The lsState argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (stringValue == null || stringValue.length() == 0)
+            throw new IllegalArgumentException("The stringValue argument is required");
         EntityManager em = ExperimentValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ExperimentValue AS o WHERE o.lsState = :lsState AND o.ignored IS NOT :ignored  AND o.lsKind = :lsKind  AND o.lsType = :lsType  AND o.stringValue = :stringValue", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ExperimentValue AS o WHERE o.lsState = :lsState AND o.ignored IS NOT :ignored  AND o.lsKind = :lsKind  AND o.lsType = :lsType  AND o.stringValue = :stringValue",
+                Long.class);
         q.setParameter("lsState", lsState);
         q.setParameter("ignored", ignored);
         q.setParameter("lsKind", lsKind);
@@ -384,9 +442,12 @@ public static Long countFindExperimentValuesByLsStateAndIgnoredNotAndLsKindEqual
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<ExperimentValue> findExperimentValuesByLsKindEqualsAndCodeValueLike(String lsKind, String codeValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+    public static TypedQuery<ExperimentValue> findExperimentValuesByLsKindEqualsAndCodeValueLike(String lsKind,
+            String codeValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (codeValue == null || codeValue.length() == 0)
+            throw new IllegalArgumentException("The codeValue argument is required");
         codeValue = codeValue.replace('*', '%');
         if (codeValue.charAt(0) != '%') {
             codeValue = "%" + codeValue;
@@ -395,15 +456,20 @@ public static TypedQuery<ExperimentValue> findExperimentValuesByLsKindEqualsAndC
             codeValue = codeValue + "%";
         }
         EntityManager em = ExperimentValue.entityManager();
-        TypedQuery<ExperimentValue> q = em.createQuery("SELECT o FROM ExperimentValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)", ExperimentValue.class);
+        TypedQuery<ExperimentValue> q = em.createQuery(
+                "SELECT o FROM ExperimentValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)",
+                ExperimentValue.class);
         q.setParameter("lsKind", lsKind);
         q.setParameter("codeValue", codeValue);
         return q;
     }
 
-	public static TypedQuery<ExperimentValue> findExperimentValuesByLsKindEqualsAndCodeValueLike(String lsKind, String codeValue, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+    public static TypedQuery<ExperimentValue> findExperimentValuesByLsKindEqualsAndCodeValueLike(String lsKind,
+            String codeValue, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (codeValue == null || codeValue.length() == 0)
+            throw new IllegalArgumentException("The codeValue argument is required");
         codeValue = codeValue.replace('*', '%');
         if (codeValue.charAt(0) != '%') {
             codeValue = "%" + codeValue;
@@ -412,7 +478,8 @@ public static TypedQuery<ExperimentValue> findExperimentValuesByLsKindEqualsAndC
             codeValue = codeValue + "%";
         }
         EntityManager em = ExperimentValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ExperimentValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -425,9 +492,12 @@ public static TypedQuery<ExperimentValue> findExperimentValuesByLsKindEqualsAndC
         return q;
     }
 
-	public static TypedQuery<ExperimentValue> findExperimentValuesByLsKindEqualsAndStringValueLike(String lsKind, String stringValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+    public static TypedQuery<ExperimentValue> findExperimentValuesByLsKindEqualsAndStringValueLike(String lsKind,
+            String stringValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0)
+            throw new IllegalArgumentException("The stringValue argument is required");
         stringValue = stringValue.replace('*', '%');
         if (stringValue.charAt(0) != '%') {
             stringValue = "%" + stringValue;
@@ -436,15 +506,20 @@ public static TypedQuery<ExperimentValue> findExperimentValuesByLsKindEqualsAndS
             stringValue = stringValue + "%";
         }
         EntityManager em = ExperimentValue.entityManager();
-        TypedQuery<ExperimentValue> q = em.createQuery("SELECT o FROM ExperimentValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)", ExperimentValue.class);
+        TypedQuery<ExperimentValue> q = em.createQuery(
+                "SELECT o FROM ExperimentValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)",
+                ExperimentValue.class);
         q.setParameter("lsKind", lsKind);
         q.setParameter("stringValue", stringValue);
         return q;
     }
 
-	public static TypedQuery<ExperimentValue> findExperimentValuesByLsKindEqualsAndStringValueLike(String lsKind, String stringValue, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+    public static TypedQuery<ExperimentValue> findExperimentValuesByLsKindEqualsAndStringValueLike(String lsKind,
+            String stringValue, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0)
+            throw new IllegalArgumentException("The stringValue argument is required");
         stringValue = stringValue.replace('*', '%');
         if (stringValue.charAt(0) != '%') {
             stringValue = "%" + stringValue;
@@ -453,7 +528,8 @@ public static TypedQuery<ExperimentValue> findExperimentValuesByLsKindEqualsAndS
             stringValue = stringValue + "%";
         }
         EntityManager em = ExperimentValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ExperimentValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -466,16 +542,20 @@ public static TypedQuery<ExperimentValue> findExperimentValuesByLsKindEqualsAndS
         return q;
     }
 
-	public static TypedQuery<ExperimentValue> findExperimentValuesByLsState(ExperimentState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+    public static TypedQuery<ExperimentValue> findExperimentValuesByLsState(ExperimentState lsState) {
+        if (lsState == null)
+            throw new IllegalArgumentException("The lsState argument is required");
         EntityManager em = ExperimentValue.entityManager();
-        TypedQuery<ExperimentValue> q = em.createQuery("SELECT o FROM ExperimentValue AS o WHERE o.lsState = :lsState", ExperimentValue.class);
+        TypedQuery<ExperimentValue> q = em.createQuery("SELECT o FROM ExperimentValue AS o WHERE o.lsState = :lsState",
+                ExperimentValue.class);
         q.setParameter("lsState", lsState);
         return q;
     }
 
-	public static TypedQuery<ExperimentValue> findExperimentValuesByLsState(ExperimentState lsState, String sortFieldName, String sortOrder) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+    public static TypedQuery<ExperimentValue> findExperimentValuesByLsState(ExperimentState lsState,
+            String sortFieldName, String sortOrder) {
+        if (lsState == null)
+            throw new IllegalArgumentException("The lsState argument is required");
         EntityManager em = ExperimentValue.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentValue AS o WHERE o.lsState = :lsState");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -489,13 +569,20 @@ public static TypedQuery<ExperimentValue> findExperimentValuesByLsState(Experime
         return q;
     }
 
-	public static TypedQuery<ExperimentValue> findExperimentValuesByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals(ExperimentState lsState, boolean ignored, String lsKind, String lsType, String stringValue) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+    public static TypedQuery<ExperimentValue> findExperimentValuesByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals(
+            ExperimentState lsState, boolean ignored, String lsKind, String lsType, String stringValue) {
+        if (lsState == null)
+            throw new IllegalArgumentException("The lsState argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (stringValue == null || stringValue.length() == 0)
+            throw new IllegalArgumentException("The stringValue argument is required");
         EntityManager em = ExperimentValue.entityManager();
-        TypedQuery<ExperimentValue> q = em.createQuery("SELECT o FROM ExperimentValue AS o WHERE o.lsState = :lsState AND o.ignored IS NOT :ignored  AND o.lsKind = :lsKind  AND o.lsType = :lsType  AND o.stringValue = :stringValue", ExperimentValue.class);
+        TypedQuery<ExperimentValue> q = em.createQuery(
+                "SELECT o FROM ExperimentValue AS o WHERE o.lsState = :lsState AND o.ignored IS NOT :ignored  AND o.lsKind = :lsKind  AND o.lsType = :lsType  AND o.stringValue = :stringValue",
+                ExperimentValue.class);
         q.setParameter("lsState", lsState);
         q.setParameter("ignored", ignored);
         q.setParameter("lsKind", lsKind);
@@ -504,13 +591,20 @@ public static TypedQuery<ExperimentValue> findExperimentValuesByLsStateAndIgnore
         return q;
     }
 
-	public static TypedQuery<ExperimentValue> findExperimentValuesByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals(ExperimentState lsState, boolean ignored, String lsKind, String lsType, String stringValue, String sortFieldName, String sortOrder) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+    public static TypedQuery<ExperimentValue> findExperimentValuesByLsStateAndIgnoredNotAndLsKindEqualsAndLsTypeEqualsAndStringValueEquals(
+            ExperimentState lsState, boolean ignored, String lsKind, String lsType, String stringValue,
+            String sortFieldName, String sortOrder) {
+        if (lsState == null)
+            throw new IllegalArgumentException("The lsState argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (stringValue == null || stringValue.length() == 0)
+            throw new IllegalArgumentException("The stringValue argument is required");
         EntityManager em = ExperimentValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ExperimentValue AS o WHERE o.lsState = :lsState AND o.ignored IS NOT :ignored  AND o.lsKind = :lsKind  AND o.lsType = :lsType  AND o.stringValue = :stringValue");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ExperimentValue AS o WHERE o.lsState = :lsState AND o.ignored IS NOT :ignored  AND o.lsKind = :lsKind  AND o.lsType = :lsType  AND o.stringValue = :stringValue");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -526,27 +620,27 @@ public static TypedQuery<ExperimentValue> findExperimentValuesByLsStateAndIgnore
         return q;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static String toJsonArray(Collection<ExperimentValue> collection) {
+    public static String toJsonArray(Collection<ExperimentValue> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ExperimentValue> collection, String[] fields) {
+    public static String toJsonArray(Collection<ExperimentValue> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/FileList.java b/src/main/java/com/labsynch/labseer/domain/FileList.java
index ed1f6522f..86e48ff19 100755
--- a/src/main/java/com/labsynch/labseer/domain/FileList.java
+++ b/src/main/java/com/labsynch/labseer/domain/FileList.java
@@ -39,7 +39,6 @@
 
 public class FileList {
 
-	
     private static final Logger logger = LoggerFactory.getLogger(FileList.class);
 
     @ManyToOne(fetch = FetchType.LAZY)
@@ -86,7 +85,8 @@ public void saveFile(MultipartFile file) {
                 logger.debug("new directory created " + savePath);
             }
             logger.debug(" Saving file: " + this.name + " to  " + saveFileName);
-            String urlString = "http://localhost:8888/imageFolder/" + this.getSubdir() + File.separator + this.getFileName();
+            String urlString = "http://localhost:8888/imageFolder/" + this.getSubdir() + File.separator
+                    + this.getFileName();
             logger.debug("url string " + urlString);
             FileOutputStream f = new FileOutputStream(saveFileName);
             int ch = 0;
@@ -187,67 +187,72 @@ public String getSubdir() {
     public void setSubdir(String subdir) {
         this.subdir = subdir;
     }
-    
+
     public static TypedQuery<FileList> findFileListsByLot(Lot lot) {
-        if (lot == null) throw new IllegalArgumentException("The lot argument is required");
+        if (lot == null)
+            throw new IllegalArgumentException("The lot argument is required");
         EntityManager em = FileList.entityManager();
         TypedQuery<FileList> q = em.createQuery("SELECT o FROM FileList AS o WHERE o.lot = :lot", FileList.class);
         q.setParameter("lot", lot);
         return q;
     }
-    
+
     public static TypedQuery<FileList> findFileListsByUrlEquals(String url) {
-        if (url == null || url.length() == 0) throw new IllegalArgumentException("The url argument is required");
+        if (url == null || url.length() == 0)
+            throw new IllegalArgumentException("The url argument is required");
         EntityManager em = FileList.entityManager();
-        TypedQuery<FileList> q = em.createQuery("SELECT o FROM FileList AS o WHERE o.url = :url ORDER by o", FileList.class);
+        TypedQuery<FileList> q = em.createQuery("SELECT o FROM FileList AS o WHERE o.url = :url ORDER by o",
+                FileList.class);
         q.setParameter("url", url);
         return q;
     }
-    
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public static Long countFindFileListsByLot(Lot lot) {
-        if (lot == null) throw new IllegalArgumentException("The lot argument is required");
+    public static Long countFindFileListsByLot(Lot lot) {
+        if (lot == null)
+            throw new IllegalArgumentException("The lot argument is required");
         EntityManager em = FileList.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM FileList AS o WHERE o.lot = :lot", Long.class);
         q.setParameter("lot", lot);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindFileListsByUrlEquals(String url) {
-        if (url == null || url.length() == 0) throw new IllegalArgumentException("The url argument is required");
+    public static Long countFindFileListsByUrlEquals(String url) {
+        if (url == null || url.length() == 0)
+            throw new IllegalArgumentException("The url argument is required");
         EntityManager em = FileList.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM FileList AS o WHERE o.url = :url", Long.class);
         q.setParameter("url", url);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<FileList> findFileListsByLot(Lot lot, String sortFieldName, String sortOrder) {
-        if (lot == null) throw new IllegalArgumentException("The lot argument is required");
+    public static TypedQuery<FileList> findFileListsByLot(Lot lot, String sortFieldName, String sortOrder) {
+        if (lot == null)
+            throw new IllegalArgumentException("The lot argument is required");
         EntityManager em = FileList.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM FileList AS o WHERE o.lot = :lot");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -261,8 +266,9 @@ public static TypedQuery<FileList> findFileListsByLot(Lot lot, String sortFieldN
         return q;
     }
 
-	public static TypedQuery<FileList> findFileListsByUrlEquals(String url, String sortFieldName, String sortOrder) {
-        if (url == null || url.length() == 0) throw new IllegalArgumentException("The url argument is required");
+    public static TypedQuery<FileList> findFileListsByUrlEquals(String url, String sortFieldName, String sortOrder) {
+        if (url == null || url.length() == 0)
+            throw new IllegalArgumentException("The url argument is required");
         EntityManager em = FileList.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM FileList AS o WHERE o.url = :url");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -276,56 +282,59 @@ public static TypedQuery<FileList> findFileListsByUrlEquals(String url, String s
         return q;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static FileList fromJsonToFileList(String json) {
+    public static FileList fromJsonToFileList(String json) {
         return new JSONDeserializer<FileList>()
-        .use(null, FileList.class).deserialize(json);
+                .use(null, FileList.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<FileList> collection) {
+    public static String toJsonArray(Collection<FileList> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<FileList> collection, String[] fields) {
+    public static String toJsonArray(Collection<FileList> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<FileList> fromJsonArrayToFileLists(String json) {
+    public static Collection<FileList> fromJsonArrayToFileLists(String json) {
         return new JSONDeserializer<List<FileList>>()
-        .use("values", FileList.class).deserialize(json);
+                .use("values", FileList.class).deserialize(json);
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lot", "description", "name", "type", "size", "url", "ie", "uploaded", "file", "fileName", "subdir", "filePath");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lot",
+            "description", "name", "type", "size", "url", "ie", "uploaded", "file", "fileName", "subdir", "filePath");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new FileList().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countFileLists() {
+    public static long countFileLists() {
         return entityManager().createQuery("SELECT COUNT(o) FROM FileList o", Long.class).getSingleResult();
     }
 
-	public static List<FileList> findAllFileLists() {
+    public static List<FileList> findAllFileLists() {
         return entityManager().createQuery("SELECT o FROM FileList o", FileList.class).getResultList();
     }
 
-	public static List<FileList> findAllFileLists(String sortFieldName, String sortOrder) {
+    public static List<FileList> findAllFileLists(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM FileList o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -336,16 +345,19 @@ public static List<FileList> findAllFileLists(String sortFieldName, String sortO
         return entityManager().createQuery(jpaQuery, FileList.class).getResultList();
     }
 
-	public static FileList findFileList(Long id) {
-        if (id == null) return null;
+    public static FileList findFileList(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(FileList.class, id);
     }
 
-	public static List<FileList> findFileListEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM FileList o", FileList.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<FileList> findFileListEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM FileList o", FileList.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<FileList> findFileListEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<FileList> findFileListEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM FileList o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -353,18 +365,21 @@ public static List<FileList> findFileListEntries(int firstResult, int maxResults
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, FileList.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, FileList.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -373,35 +388,38 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public FileList merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         FileList merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getFilePath() {
+    public String getFilePath() {
         return this.filePath;
     }
 
-	public void setFilePath(String filePath) {
+    public void setFilePath(String filePath) {
         this.filePath = filePath;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/FileThing.java b/src/main/java/com/labsynch/labseer/domain/FileThing.java
index 9dd3546a8..85d1505de 100755
--- a/src/main/java/com/labsynch/labseer/domain/FileThing.java
+++ b/src/main/java/com/labsynch/labseer/domain/FileThing.java
@@ -21,13 +21,13 @@ public class FileThing extends AbstractThing {
 
     @Size(max = 512)
     private String name;
-    
+
     @Size(max = 512)
     private String description;
 
     @Size(max = 255)
     private String fileExtension;
-    
+
     @Size(max = 512)
     private String applicationType;
 
@@ -38,7 +38,7 @@ public class FileThing extends AbstractThing {
     private String fileURL;
 
     private Long fileSize;
-    
+
     public FileThing(FileThing fileThing) {
         super.setRecordedBy(fileThing.getRecordedBy());
         super.setRecordedDate(fileThing.getRecordedDate());
@@ -55,53 +55,51 @@ public FileThing(FileThing fileThing) {
         this.applicationType = fileThing.getApplicationType();
         this.mimeType = fileThing.getMimeType();
         this.fileURL = fileThing.getFileURL();
-        this.fileSize = fileThing.getFileSize();        
+        this.fileSize = fileThing.getFileSize();
     }
 
-
-	
-
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static FileThing fromJsonToFileThing(String json) {
+    public static FileThing fromJsonToFileThing(String json) {
         return new JSONDeserializer<FileThing>()
-        .use(null, FileThing.class).deserialize(json);
+                .use(null, FileThing.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<FileThing> collection) {
+    public static String toJsonArray(Collection<FileThing> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<FileThing> collection, String[] fields) {
+    public static String toJsonArray(Collection<FileThing> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<FileThing> fromJsonArrayToFileThings(String json) {
+    public static Collection<FileThing> fromJsonArrayToFileThings(String json) {
         return new JSONDeserializer<List<FileThing>>()
-        .use("values", FileThing.class).deserialize(json);
+                .use("values", FileThing.class).deserialize(json);
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "description", "fileExtension", "applicationType", "mimeType", "fileURL", "fileSize");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "description",
+            "fileExtension", "applicationType", "mimeType", "fileURL", "fileSize");
 
-	public static long countFileThings() {
+    public static long countFileThings() {
         return entityManager().createQuery("SELECT COUNT(o) FROM FileThing o", Long.class).getSingleResult();
     }
 
-	public static List<FileThing> findAllFileThings() {
+    public static List<FileThing> findAllFileThings() {
         return entityManager().createQuery("SELECT o FROM FileThing o", FileThing.class).getResultList();
     }
 
-	public static List<FileThing> findAllFileThings(String sortFieldName, String sortOrder) {
+    public static List<FileThing> findAllFileThings(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM FileThing o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -112,16 +110,19 @@ public static List<FileThing> findAllFileThings(String sortFieldName, String sor
         return entityManager().createQuery(jpaQuery, FileThing.class).getResultList();
     }
 
-	public static FileThing findFileThing(Long id) {
-        if (id == null) return null;
+    public static FileThing findFileThing(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(FileThing.class, id);
     }
 
-	public static List<FileThing> findFileThingEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM FileThing o", FileThing.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<FileThing> findFileThingEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM FileThing o", FileThing.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<FileThing> findFileThingEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<FileThing> findFileThingEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM FileThing o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -129,78 +130,80 @@ public static List<FileThing> findFileThingEntries(int firstResult, int maxResul
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, FileThing.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, FileThing.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public FileThing merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         FileThing merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public FileThing() {
+    public FileThing() {
         super();
     }
 
-	public String getName() {
+    public String getName() {
         return this.name;
     }
 
-	public void setName(String name) {
+    public void setName(String name) {
         this.name = name;
     }
 
-	public String getDescription() {
+    public String getDescription() {
         return this.description;
     }
 
-	public void setDescription(String description) {
+    public void setDescription(String description) {
         this.description = description;
     }
 
-	public String getFileExtension() {
+    public String getFileExtension() {
         return this.fileExtension;
     }
 
-	public void setFileExtension(String fileExtension) {
+    public void setFileExtension(String fileExtension) {
         this.fileExtension = fileExtension;
     }
 
-	public String getApplicationType() {
+    public String getApplicationType() {
         return this.applicationType;
     }
 
-	public void setApplicationType(String applicationType) {
+    public void setApplicationType(String applicationType) {
         this.applicationType = applicationType;
     }
 
-	public String getMimeType() {
+    public String getMimeType() {
         return this.mimeType;
     }
 
-	public void setMimeType(String mimeType) {
+    public void setMimeType(String mimeType) {
         this.mimeType = mimeType;
     }
 
-	public String getFileURL() {
+    public String getFileURL() {
         return this.fileURL;
     }
 
-	public void setFileURL(String fileURL) {
+    public void setFileURL(String fileURL) {
         this.fileURL = fileURL;
     }
 
-	public Long getFileSize() {
+    public Long getFileSize() {
         return this.fileSize;
     }
 
-	public void setFileSize(Long fileSize) {
+    public void setFileSize(Long fileSize) {
         this.fileSize = fileSize;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/FileType.java b/src/main/java/com/labsynch/labseer/domain/FileType.java
index 1abdb8e47..9a629645f 100755
--- a/src/main/java/com/labsynch/labseer/domain/FileType.java
+++ b/src/main/java/com/labsynch/labseer/domain/FileType.java
@@ -27,62 +27,63 @@
 
 public class FileType {
 
-	
     @Size(max = 255)
     private String name;
 
     @Size(max = 255)
     private String code;
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new FileType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countFileTypes() {
+    public static long countFileTypes() {
         return entityManager().createQuery("SELECT COUNT(o) FROM FileType o", Long.class).getSingleResult();
     }
 
-	public static List<FileType> findAllFileTypes() {
+    public static List<FileType> findAllFileTypes() {
         return entityManager().createQuery("SELECT o FROM FileType o", FileType.class).getResultList();
     }
 
-	public static List<FileType> findAllFileTypes(String sortFieldName, String sortOrder) {
+    public static List<FileType> findAllFileTypes(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM FileType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -93,16 +94,19 @@ public static List<FileType> findAllFileTypes(String sortFieldName, String sortO
         return entityManager().createQuery(jpaQuery, FileType.class).getResultList();
     }
 
-	public static FileType findFileType(Long id) {
-        if (id == null) return null;
+    public static FileType findFileType(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(FileType.class, id);
     }
 
-	public static List<FileType> findFileTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM FileType o", FileType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<FileType> findFileTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM FileType o", FileType.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<FileType> findFileTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<FileType> findFileTypeEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM FileType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -110,18 +114,21 @@ public static List<FileType> findFileTypeEntries(int firstResult, int maxResults
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, FileType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, FileType.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -130,44 +137,50 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public FileType merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         FileType merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public static Long countFindFileTypesByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static Long countFindFileTypesByCodeEquals(String code) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = FileType.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM FileType AS o WHERE o.code = :code", Long.class);
         q.setParameter("code", code);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<FileType> findFileTypesByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static TypedQuery<FileType> findFileTypesByCodeEquals(String code) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = FileType.entityManager();
         TypedQuery<FileType> q = em.createQuery("SELECT o FROM FileType AS o WHERE o.code = :code", FileType.class);
         q.setParameter("code", code);
         return q;
     }
 
-	public static TypedQuery<FileType> findFileTypesByCodeEquals(String code, String sortFieldName, String sortOrder) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static TypedQuery<FileType> findFileTypesByCodeEquals(String code, String sortFieldName, String sortOrder) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = FileType.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM FileType AS o WHERE o.code = :code");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -181,49 +194,49 @@ public static TypedQuery<FileType> findFileTypesByCodeEquals(String code, String
         return q;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static FileType fromJsonToFileType(String json) {
+    public static FileType fromJsonToFileType(String json) {
         return new JSONDeserializer<FileType>()
-        .use(null, FileType.class).deserialize(json);
+                .use(null, FileType.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<FileType> collection) {
+    public static String toJsonArray(Collection<FileType> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<FileType> collection, String[] fields) {
+    public static String toJsonArray(Collection<FileType> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<FileType> fromJsonArrayToFileTypes(String json) {
+    public static Collection<FileType> fromJsonArrayToFileTypes(String json) {
         return new JSONDeserializer<List<FileType>>()
-        .use("values", FileType.class).deserialize(json);
+                .use("values", FileType.class).deserialize(json);
     }
 
-	public String getName() {
+    public String getName() {
         return this.name;
     }
 
-	public void setName(String name) {
+    public void setName(String name) {
         this.name = name;
     }
 
-	public String getCode() {
+    public String getCode() {
         return this.code;
     }
 
-	public void setCode(String code) {
+    public void setCode(String code) {
         this.code = code;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/InteractionKind.java b/src/main/java/com/labsynch/labseer/domain/InteractionKind.java
index d7db803d9..8d3a7cc67 100755
--- a/src/main/java/com/labsynch/labseer/domain/InteractionKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/InteractionKind.java
@@ -32,9 +32,8 @@
 @Configurable
 
 public class InteractionKind {
-	
-	private static final Logger logger = LoggerFactory.getLogger(InteractionKind.class);
 
+    private static final Logger logger = LoggerFactory.getLogger(InteractionKind.class);
 
     @NotNull
     @ManyToOne
@@ -80,7 +79,9 @@ public void setVersion(Integer version) {
 
     public static final EntityManager entityManager() {
         EntityManager em = new InteractionKind().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
@@ -93,24 +94,30 @@ public static List<com.labsynch.labseer.domain.InteractionKind> findAllInteracti
     }
 
     public static com.labsynch.labseer.domain.InteractionKind findInteractionKind(Long id_) {
-        if (id_ == null) return null;
+        if (id_ == null)
+            return null;
         return entityManager().find(InteractionKind.class, id_);
     }
 
-    public static List<com.labsynch.labseer.domain.InteractionKind> findInteractionKindEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM InteractionKind o", InteractionKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<com.labsynch.labseer.domain.InteractionKind> findInteractionKindEntries(int firstResult,
+            int maxResults) {
+        return entityManager().createQuery("SELECT o FROM InteractionKind o", InteractionKind.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
     @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_').append(this.getKindName()).toString();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
+        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_')
+                .append(this.getKindName()).toString();
         this.entityManager.persist(this);
     }
 
     @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -121,20 +128,24 @@ public void remove() {
 
     @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
     @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
     @Transactional
     public com.labsynch.labseer.domain.InteractionKind merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_').append(this.getKindName()).toString();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
+        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_')
+                .append(this.getKindName()).toString();
         InteractionKind merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
@@ -142,32 +153,34 @@ public com.labsynch.labseer.domain.InteractionKind merge() {
 
     @Transactional
     public static InteractionKind getOrCreate(String typeName, String kindName) {
-    	InteractionType itxType = InteractionType.findInteractionTypesByTypeNameEquals(typeName).getSingleResult();
-    	InteractionKind itxKind = null;
-    	List<InteractionKind> itxKinds = InteractionKind.findInteractionKindsByKindNameEqualsAndLsType(kindName, itxType).getResultList();
+        InteractionType itxType = InteractionType.findInteractionTypesByTypeNameEquals(typeName).getSingleResult();
+        InteractionKind itxKind = null;
+        List<InteractionKind> itxKinds = InteractionKind
+                .findInteractionKindsByKindNameEqualsAndLsType(kindName, itxType).getResultList();
         if (itxKinds.size() == 0) {
-        	itxKind = new InteractionKind();
-        	itxKind.setLsType(itxType);
-        	itxKind.setKindName(kindName);
-        	itxKind.persist();
+            itxKind = new InteractionKind();
+            itxKind.setLsType(itxType);
+            itxKind.setKindName(kindName);
+            itxKind.persist();
         } else if (itxKinds.size() == 1) {
-        	itxKind = itxKinds.get(0);
+            itxKind = itxKinds.get(0);
         } else if (itxKinds.size() > 1) {
-        	//ERROR CASE
-        	logger.error("ERROR: Found multiple interaction kinds for " + kindName);
-        	throw new RuntimeException("ERROR: Found multiple interaction kinds for " + kindName);
+            // ERROR CASE
+            logger.error("ERROR: Found multiple interaction kinds for " + kindName);
+            throw new RuntimeException("ERROR: Found multiple interaction kinds for " + kindName);
         }
-        
+
         return itxKind;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType",
+            "kindName", "lsTypeAndKind", "id", "version", "entityManager");
 
-	public static List<InteractionKind> findAllInteractionKinds(String sortFieldName, String sortOrder) {
+    public static List<InteractionKind> findAllInteractionKinds(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM InteractionKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -178,7 +191,8 @@ public static List<InteractionKind> findAllInteractionKinds(String sortFieldName
         return entityManager().createQuery(jpaQuery, InteractionKind.class).getResultList();
     }
 
-	public static List<InteractionKind> findInteractionKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<InteractionKind> findInteractionKindEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM InteractionKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -186,39 +200,51 @@ public static List<InteractionKind> findInteractionKindEntries(int firstResult,
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, InteractionKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, InteractionKind.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static Long countFindInteractionKindsByKindNameEquals(String kindName) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+    public static Long countFindInteractionKindsByKindNameEquals(String kindName) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
         EntityManager em = InteractionKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM InteractionKind AS o WHERE o.kindName = :kindName", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM InteractionKind AS o WHERE o.kindName = :kindName",
+                Long.class);
         q.setParameter("kindName", kindName);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindInteractionKindsByKindNameEqualsAndLsType(String kindName, InteractionType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static Long countFindInteractionKindsByKindNameEqualsAndLsType(String kindName, InteractionType lsType) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = InteractionKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM InteractionKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM InteractionKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType",
+                Long.class);
         q.setParameter("kindName", kindName);
         q.setParameter("lsType", lsType);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<InteractionKind> findInteractionKindsByKindNameEquals(String kindName) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+    public static TypedQuery<InteractionKind> findInteractionKindsByKindNameEquals(String kindName) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
         EntityManager em = InteractionKind.entityManager();
-        TypedQuery<InteractionKind> q = em.createQuery("SELECT o FROM InteractionKind AS o WHERE o.kindName = :kindName", InteractionKind.class);
+        TypedQuery<InteractionKind> q = em
+                .createQuery("SELECT o FROM InteractionKind AS o WHERE o.kindName = :kindName", InteractionKind.class);
         q.setParameter("kindName", kindName);
         return q;
     }
 
-	public static TypedQuery<InteractionKind> findInteractionKindsByKindNameEquals(String kindName, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+    public static TypedQuery<InteractionKind> findInteractionKindsByKindNameEquals(String kindName,
+            String sortFieldName, String sortOrder) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
         EntityManager em = InteractionKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM InteractionKind AS o WHERE o.kindName = :kindName");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM InteractionKind AS o WHERE o.kindName = :kindName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -230,21 +256,30 @@ public static TypedQuery<InteractionKind> findInteractionKindsByKindNameEquals(S
         return q;
     }
 
-	public static TypedQuery<InteractionKind> findInteractionKindsByKindNameEqualsAndLsType(String kindName, InteractionType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<InteractionKind> findInteractionKindsByKindNameEqualsAndLsType(String kindName,
+            InteractionType lsType) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = InteractionKind.entityManager();
-        TypedQuery<InteractionKind> q = em.createQuery("SELECT o FROM InteractionKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", InteractionKind.class);
+        TypedQuery<InteractionKind> q = em.createQuery(
+                "SELECT o FROM InteractionKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType",
+                InteractionKind.class);
         q.setParameter("kindName", kindName);
         q.setParameter("lsType", lsType);
         return q;
     }
 
-	public static TypedQuery<InteractionKind> findInteractionKindsByKindNameEqualsAndLsType(String kindName, InteractionType lsType, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<InteractionKind> findInteractionKindsByKindNameEqualsAndLsType(String kindName,
+            InteractionType lsType, String sortFieldName, String sortOrder) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = InteractionKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM InteractionKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM InteractionKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -257,57 +292,57 @@ public static TypedQuery<InteractionKind> findInteractionKindsByKindNameEqualsAn
         return q;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static InteractionKind fromJsonToInteractionKind(String json) {
+    public static InteractionKind fromJsonToInteractionKind(String json) {
         return new JSONDeserializer<InteractionKind>()
-        .use(null, InteractionKind.class).deserialize(json);
+                .use(null, InteractionKind.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<InteractionKind> collection) {
+    public static String toJsonArray(Collection<InteractionKind> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<InteractionKind> collection, String[] fields) {
+    public static String toJsonArray(Collection<InteractionKind> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<InteractionKind> fromJsonArrayToInteractionKinds(String json) {
+    public static Collection<InteractionKind> fromJsonArrayToInteractionKinds(String json) {
         return new JSONDeserializer<List<InteractionKind>>()
-        .use("values", InteractionKind.class).deserialize(json);
+                .use("values", InteractionKind.class).deserialize(json);
     }
 
-	public InteractionType getLsType() {
+    public InteractionType getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(InteractionType lsType) {
+    public void setLsType(InteractionType lsType) {
         this.lsType = lsType;
     }
 
-	public String getKindName() {
+    public String getKindName() {
         return this.kindName;
     }
 
-	public void setKindName(String kindName) {
+    public void setKindName(String kindName) {
         this.kindName = kindName;
     }
 
-	public String getLsTypeAndKind() {
+    public String getLsTypeAndKind() {
         return this.lsTypeAndKind;
     }
 
-	public void setLsTypeAndKind(String lsTypeAndKind) {
+    public void setLsTypeAndKind(String lsTypeAndKind) {
         this.lsTypeAndKind = lsTypeAndKind;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/InteractionType.java b/src/main/java/com/labsynch/labseer/domain/InteractionType.java
index cd0c6a659..cd178f3b4 100755
--- a/src/main/java/com/labsynch/labseer/domain/InteractionType.java
+++ b/src/main/java/com/labsynch/labseer/domain/InteractionType.java
@@ -45,7 +45,8 @@ public class InteractionType {
     @Transactional
     public static com.labsynch.labseer.domain.InteractionType getOrCreate(String typeVerb, String typeName) {
         InteractionType itxType = null;
-        List<InteractionType> itxTypes = InteractionType.findInteractionTypesByTypeNameEqualsAndTypeVerbEquals(typeName, typeVerb).getResultList();
+        List<InteractionType> itxTypes = InteractionType
+                .findInteractionTypesByTypeNameEqualsAndTypeVerbEquals(typeName, typeVerb).getResultList();
         if (itxTypes.size() == 0) {
             itxType = new InteractionType();
             itxType.setTypeVerb(typeVerb);
@@ -60,52 +61,55 @@ public static com.labsynch.labseer.domain.InteractionType getOrCreate(String typ
         return itxType;
     }
 
-	@Id
+    @Id
     @SequenceGenerator(name = "interactionTypeGen", sequenceName = "INTERACTION_TYPE_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "interactionTypeGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "typeName", "typeVerb");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "typeName",
+            "typeVerb");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new InteractionType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countInteractionTypes() {
+    public static long countInteractionTypes() {
         return entityManager().createQuery("SELECT COUNT(o) FROM InteractionType o", Long.class).getSingleResult();
     }
 
-	public static List<InteractionType> findAllInteractionTypes() {
+    public static List<InteractionType> findAllInteractionTypes() {
         return entityManager().createQuery("SELECT o FROM InteractionType o", InteractionType.class).getResultList();
     }
 
-	public static List<InteractionType> findAllInteractionTypes(String sortFieldName, String sortOrder) {
+    public static List<InteractionType> findAllInteractionTypes(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM InteractionType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -116,16 +120,19 @@ public static List<InteractionType> findAllInteractionTypes(String sortFieldName
         return entityManager().createQuery(jpaQuery, InteractionType.class).getResultList();
     }
 
-	public static InteractionType findInteractionType(Long id) {
-        if (id == null) return null;
+    public static InteractionType findInteractionType(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(InteractionType.class, id);
     }
 
-	public static List<InteractionType> findInteractionTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM InteractionType o", InteractionType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<InteractionType> findInteractionTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM InteractionType o", InteractionType.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<InteractionType> findInteractionTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<InteractionType> findInteractionTypeEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM InteractionType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -133,18 +140,21 @@ public static List<InteractionType> findInteractionTypeEntries(int firstResult,
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, InteractionType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, InteractionType.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -153,106 +163,120 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public InteractionType merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         InteractionType merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String getTypeName() {
+    public String getTypeName() {
         return this.typeName;
     }
 
-	public void setTypeName(String typeName) {
+    public void setTypeName(String typeName) {
         this.typeName = typeName;
     }
 
-	public String getTypeVerb() {
+    public String getTypeVerb() {
         return this.typeVerb;
     }
 
-	public void setTypeVerb(String typeVerb) {
+    public void setTypeVerb(String typeVerb) {
         this.typeVerb = typeVerb;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static InteractionType fromJsonToInteractionType(String json) {
+    public static InteractionType fromJsonToInteractionType(String json) {
         return new JSONDeserializer<InteractionType>()
-        .use(null, InteractionType.class).deserialize(json);
+                .use(null, InteractionType.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<InteractionType> collection) {
+    public static String toJsonArray(Collection<InteractionType> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<InteractionType> collection, String[] fields) {
+    public static String toJsonArray(Collection<InteractionType> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<InteractionType> fromJsonArrayToInteractionTypes(String json) {
+    public static Collection<InteractionType> fromJsonArrayToInteractionTypes(String json) {
         return new JSONDeserializer<List<InteractionType>>()
-        .use("values", InteractionType.class).deserialize(json);
+                .use("values", InteractionType.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static Long countFindInteractionTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static Long countFindInteractionTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = InteractionType.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM InteractionType AS o WHERE o.typeName = :typeName", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM InteractionType AS o WHERE o.typeName = :typeName",
+                Long.class);
         q.setParameter("typeName", typeName);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindInteractionTypesByTypeNameEqualsAndTypeVerbEquals(String typeName, String typeVerb) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        if (typeVerb == null || typeVerb.length() == 0) throw new IllegalArgumentException("The typeVerb argument is required");
+    public static Long countFindInteractionTypesByTypeNameEqualsAndTypeVerbEquals(String typeName, String typeVerb) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
+        if (typeVerb == null || typeVerb.length() == 0)
+            throw new IllegalArgumentException("The typeVerb argument is required");
         EntityManager em = InteractionType.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM InteractionType AS o WHERE o.typeName = :typeName  AND o.typeVerb = :typeVerb", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM InteractionType AS o WHERE o.typeName = :typeName  AND o.typeVerb = :typeVerb",
+                Long.class);
         q.setParameter("typeName", typeName);
         q.setParameter("typeVerb", typeVerb);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<InteractionType> findInteractionTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static TypedQuery<InteractionType> findInteractionTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = InteractionType.entityManager();
-        TypedQuery<InteractionType> q = em.createQuery("SELECT o FROM InteractionType AS o WHERE o.typeName = :typeName", InteractionType.class);
+        TypedQuery<InteractionType> q = em
+                .createQuery("SELECT o FROM InteractionType AS o WHERE o.typeName = :typeName", InteractionType.class);
         q.setParameter("typeName", typeName);
         return q;
     }
 
-	public static TypedQuery<InteractionType> findInteractionTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static TypedQuery<InteractionType> findInteractionTypesByTypeNameEquals(String typeName,
+            String sortFieldName, String sortOrder) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = InteractionType.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM InteractionType AS o WHERE o.typeName = :typeName");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM InteractionType AS o WHERE o.typeName = :typeName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -264,21 +288,30 @@ public static TypedQuery<InteractionType> findInteractionTypesByTypeNameEquals(S
         return q;
     }
 
-	public static TypedQuery<InteractionType> findInteractionTypesByTypeNameEqualsAndTypeVerbEquals(String typeName, String typeVerb) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        if (typeVerb == null || typeVerb.length() == 0) throw new IllegalArgumentException("The typeVerb argument is required");
+    public static TypedQuery<InteractionType> findInteractionTypesByTypeNameEqualsAndTypeVerbEquals(String typeName,
+            String typeVerb) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
+        if (typeVerb == null || typeVerb.length() == 0)
+            throw new IllegalArgumentException("The typeVerb argument is required");
         EntityManager em = InteractionType.entityManager();
-        TypedQuery<InteractionType> q = em.createQuery("SELECT o FROM InteractionType AS o WHERE o.typeName = :typeName  AND o.typeVerb = :typeVerb", InteractionType.class);
+        TypedQuery<InteractionType> q = em.createQuery(
+                "SELECT o FROM InteractionType AS o WHERE o.typeName = :typeName  AND o.typeVerb = :typeVerb",
+                InteractionType.class);
         q.setParameter("typeName", typeName);
         q.setParameter("typeVerb", typeVerb);
         return q;
     }
 
-	public static TypedQuery<InteractionType> findInteractionTypesByTypeNameEqualsAndTypeVerbEquals(String typeName, String typeVerb, String sortFieldName, String sortOrder) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
-        if (typeVerb == null || typeVerb.length() == 0) throw new IllegalArgumentException("The typeVerb argument is required");
+    public static TypedQuery<InteractionType> findInteractionTypesByTypeNameEqualsAndTypeVerbEquals(String typeName,
+            String typeVerb, String sortFieldName, String sortOrder) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
+        if (typeVerb == null || typeVerb.length() == 0)
+            throw new IllegalArgumentException("The typeVerb argument is required");
         EntityManager em = InteractionType.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM InteractionType AS o WHERE o.typeName = :typeName  AND o.typeVerb = :typeVerb");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM InteractionType AS o WHERE o.typeName = :typeName  AND o.typeVerb = :typeVerb");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
diff --git a/src/main/java/com/labsynch/labseer/domain/IsoSalt.java b/src/main/java/com/labsynch/labseer/domain/IsoSalt.java
index 81dedb4e4..4b442143e 100755
--- a/src/main/java/com/labsynch/labseer/domain/IsoSalt.java
+++ b/src/main/java/com/labsynch/labseer/domain/IsoSalt.java
@@ -33,7 +33,7 @@
 
 public class IsoSalt {
 
-	private static final Logger logger = LoggerFactory.getLogger(IsoSalt.class);
+    private static final Logger logger = LoggerFactory.getLogger(IsoSalt.class);
 
     @ManyToOne
     @JoinColumn(name = "isotope")
@@ -54,7 +54,6 @@ public class IsoSalt {
     @JoinColumn(name = "salt_form")
     private SaltForm saltForm;
 
-    
     public String toJson() {
         return new JSONSerializer().exclude("*.class", "saltForm").serialize(this);
     }
@@ -68,30 +67,33 @@ public static String toJsonArray(Collection<IsoSalt> collection) {
     }
 
     public static Collection<IsoSalt> fromJsonArrayToIsoSalts(String json) {
-        return new JSONDeserializer<List<IsoSalt>>().use(null, ArrayList.class).use("values", IsoSalt.class).deserialize(json);
+        return new JSONDeserializer<List<IsoSalt>>().use(null, ArrayList.class).use("values", IsoSalt.class)
+                .deserialize(json);
     }
-    
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "isotope", "salt", "type", "equivalents", "ignore", "saltForm");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "isotope", "salt",
+            "type", "equivalents", "ignore", "saltForm");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new IsoSalt().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countIsoSalts() {
+    public static long countIsoSalts() {
         return entityManager().createQuery("SELECT COUNT(o) FROM IsoSalt o", Long.class).getSingleResult();
     }
 
-	public static List<IsoSalt> findAllIsoSalts() {
+    public static List<IsoSalt> findAllIsoSalts() {
         return entityManager().createQuery("SELECT o FROM IsoSalt o", IsoSalt.class).getResultList();
     }
 
-	public static List<IsoSalt> findAllIsoSalts(String sortFieldName, String sortOrder) {
+    public static List<IsoSalt> findAllIsoSalts(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM IsoSalt o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -102,16 +104,19 @@ public static List<IsoSalt> findAllIsoSalts(String sortFieldName, String sortOrd
         return entityManager().createQuery(jpaQuery, IsoSalt.class).getResultList();
     }
 
-	public static IsoSalt findIsoSalt(Long id) {
-        if (id == null) return null;
+    public static IsoSalt findIsoSalt(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(IsoSalt.class, id);
     }
 
-	public static List<IsoSalt> findIsoSaltEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM IsoSalt o", IsoSalt.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<IsoSalt> findIsoSaltEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM IsoSalt o", IsoSalt.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<IsoSalt> findIsoSaltEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<IsoSalt> findIsoSaltEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM IsoSalt o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -119,18 +124,21 @@ public static List<IsoSalt> findIsoSaltEntries(int firstResult, int maxResults,
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, IsoSalt.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, IsoSalt.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -139,131 +147,142 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public IsoSalt merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         IsoSalt merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public Isotope getIsotope() {
+    public Isotope getIsotope() {
         return this.isotope;
     }
 
-	public void setIsotope(Isotope isotope) {
+    public void setIsotope(Isotope isotope) {
         this.isotope = isotope;
     }
 
-	public Salt getSalt() {
+    public Salt getSalt() {
         return this.salt;
     }
 
-	public void setSalt(Salt salt) {
+    public void setSalt(Salt salt) {
         this.salt = salt;
     }
 
-	public String getType() {
+    public String getType() {
         return this.type;
     }
 
-	public void setType(String type) {
+    public void setType(String type) {
         this.type = type;
     }
 
-	public Double getEquivalents() {
+    public Double getEquivalents() {
         return this.equivalents;
     }
 
-	public void setEquivalents(Double equivalents) {
+    public void setEquivalents(Double equivalents) {
         this.equivalents = equivalents;
     }
 
-	public Boolean getIgnore() {
+    public Boolean getIgnore() {
         return this.ignore;
     }
 
-	public void setIgnore(Boolean ignore) {
+    public void setIgnore(Boolean ignore) {
         this.ignore = ignore;
     }
 
-	public SaltForm getSaltForm() {
+    public SaltForm getSaltForm() {
         return this.saltForm;
     }
 
-	public void setSaltForm(SaltForm saltForm) {
+    public void setSaltForm(SaltForm saltForm) {
         this.saltForm = saltForm;
     }
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static Long countFindIsoSaltsBySaltForm(SaltForm saltForm) {
-        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
+    public static Long countFindIsoSaltsBySaltForm(SaltForm saltForm) {
+        if (saltForm == null)
+            throw new IllegalArgumentException("The saltForm argument is required");
         EntityManager em = IsoSalt.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM IsoSalt AS o WHERE o.saltForm = :saltForm", Long.class);
         q.setParameter("saltForm", saltForm);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindIsoSaltsBySaltFormAndType(SaltForm saltForm, String type) {
-        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
-        if (type == null || type.length() == 0) throw new IllegalArgumentException("The type argument is required");
+    public static Long countFindIsoSaltsBySaltFormAndType(SaltForm saltForm, String type) {
+        if (saltForm == null)
+            throw new IllegalArgumentException("The saltForm argument is required");
+        if (type == null || type.length() == 0)
+            throw new IllegalArgumentException("The type argument is required");
         EntityManager em = IsoSalt.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM IsoSalt AS o WHERE o.saltForm = :saltForm AND o.type = :type", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM IsoSalt AS o WHERE o.saltForm = :saltForm AND o.type = :type", Long.class);
         q.setParameter("saltForm", saltForm);
         q.setParameter("type", type);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<IsoSalt> findIsoSaltsBySaltForm(SaltForm saltForm) {
-        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
+    public static TypedQuery<IsoSalt> findIsoSaltsBySaltForm(SaltForm saltForm) {
+        if (saltForm == null)
+            throw new IllegalArgumentException("The saltForm argument is required");
         EntityManager em = IsoSalt.entityManager();
-        TypedQuery<IsoSalt> q = em.createQuery("SELECT o FROM IsoSalt AS o WHERE o.saltForm = :saltForm", IsoSalt.class);
+        TypedQuery<IsoSalt> q = em.createQuery("SELECT o FROM IsoSalt AS o WHERE o.saltForm = :saltForm",
+                IsoSalt.class);
         q.setParameter("saltForm", saltForm);
         return q;
     }
 
-	public static TypedQuery<IsoSalt> findIsoSaltsBySaltForm(SaltForm saltForm, String sortFieldName, String sortOrder) {
-        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
+    public static TypedQuery<IsoSalt> findIsoSaltsBySaltForm(SaltForm saltForm, String sortFieldName,
+            String sortOrder) {
+        if (saltForm == null)
+            throw new IllegalArgumentException("The saltForm argument is required");
         EntityManager em = IsoSalt.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM IsoSalt AS o WHERE o.saltForm = :saltForm");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -277,21 +296,28 @@ public static TypedQuery<IsoSalt> findIsoSaltsBySaltForm(SaltForm saltForm, Stri
         return q;
     }
 
-	public static TypedQuery<IsoSalt> findIsoSaltsBySaltFormAndType(SaltForm saltForm, String type) {
-        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
-        if (type == null || type.length() == 0) throw new IllegalArgumentException("The type argument is required");
+    public static TypedQuery<IsoSalt> findIsoSaltsBySaltFormAndType(SaltForm saltForm, String type) {
+        if (saltForm == null)
+            throw new IllegalArgumentException("The saltForm argument is required");
+        if (type == null || type.length() == 0)
+            throw new IllegalArgumentException("The type argument is required");
         EntityManager em = IsoSalt.entityManager();
-        TypedQuery<IsoSalt> q = em.createQuery("SELECT o FROM IsoSalt AS o WHERE o.saltForm = :saltForm AND o.type = :type", IsoSalt.class);
+        TypedQuery<IsoSalt> q = em.createQuery(
+                "SELECT o FROM IsoSalt AS o WHERE o.saltForm = :saltForm AND o.type = :type", IsoSalt.class);
         q.setParameter("saltForm", saltForm);
         q.setParameter("type", type);
         return q;
     }
 
-	public static TypedQuery<IsoSalt> findIsoSaltsBySaltFormAndType(SaltForm saltForm, String type, String sortFieldName, String sortOrder) {
-        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
-        if (type == null || type.length() == 0) throw new IllegalArgumentException("The type argument is required");
+    public static TypedQuery<IsoSalt> findIsoSaltsBySaltFormAndType(SaltForm saltForm, String type,
+            String sortFieldName, String sortOrder) {
+        if (saltForm == null)
+            throw new IllegalArgumentException("The saltForm argument is required");
+        if (type == null || type.length() == 0)
+            throw new IllegalArgumentException("The type argument is required");
         EntityManager em = IsoSalt.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM IsoSalt AS o WHERE o.saltForm = :saltForm AND o.type = :type");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM IsoSalt AS o WHERE o.saltForm = :saltForm AND o.type = :type");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
diff --git a/src/main/java/com/labsynch/labseer/domain/Isotope.java b/src/main/java/com/labsynch/labseer/domain/Isotope.java
index 05f364973..a6c0bb538 100755
--- a/src/main/java/com/labsynch/labseer/domain/Isotope.java
+++ b/src/main/java/com/labsynch/labseer/domain/Isotope.java
@@ -32,7 +32,6 @@
 
 public class Isotope {
 
-	
     @Size(max = 255)
     private String name;
 
@@ -44,21 +43,25 @@ public class Isotope {
     private Boolean ignore;
 
     public static TypedQuery<Isotope> findIsotopesByAbbrevEquals(String abbrev) {
-        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
+        if (abbrev == null || abbrev.length() == 0)
+            throw new IllegalArgumentException("The abbrev argument is required");
         EntityManager em = Isotope.entityManager();
         CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
         CriteriaQuery<Isotope> criteria = criteriaBuilder.createQuery(Isotope.class);
         Root<Isotope> isotopeRoot = criteria.from(Isotope.class);
         criteria.select(isotopeRoot);
-        Predicate predicate = criteriaBuilder.equal(criteriaBuilder.upper(isotopeRoot.<String>get("abbrev")), abbrev.toUpperCase().trim());
+        Predicate predicate = criteriaBuilder.equal(criteriaBuilder.upper(isotopeRoot.<String>get("abbrev")),
+                abbrev.toUpperCase().trim());
         criteria.where(criteriaBuilder.and(predicate));
         TypedQuery<Isotope> q = em.createQuery(criteria);
         return q;
     }
 
     public static TypedQuery<Isotope> findIsotopesByAbbrevEqualsAndNameEquals(String abbrev, String name) {
-        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        if (abbrev == null || abbrev.length() == 0)
+            throw new IllegalArgumentException("The abbrev argument is required");
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = Isotope.entityManager();
         CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
         CriteriaQuery<Isotope> criteria = criteriaBuilder.createQuery(Isotope.class);
@@ -66,8 +69,10 @@ public static TypedQuery<Isotope> findIsotopesByAbbrevEqualsAndNameEquals(String
         criteria.select(isotopeRoot);
         Predicate[] predicates = new Predicate[0];
         List<Predicate> predicateList = new ArrayList<Predicate>();
-        Predicate predicate1 = criteriaBuilder.equal(criteriaBuilder.upper(isotopeRoot.<String>get("abbrev")), abbrev.toUpperCase().trim());
-        Predicate predicate2 = criteriaBuilder.equal(criteriaBuilder.upper(isotopeRoot.<String>get("name")), name.toUpperCase().trim());
+        Predicate predicate1 = criteriaBuilder.equal(criteriaBuilder.upper(isotopeRoot.<String>get("abbrev")),
+                abbrev.toUpperCase().trim());
+        Predicate predicate2 = criteriaBuilder.equal(criteriaBuilder.upper(isotopeRoot.<String>get("name")),
+                name.toUpperCase().trim());
         predicateList.add(predicate1);
         predicateList.add(predicate2);
         predicates = predicateList.toArray(predicates);
@@ -76,130 +81,135 @@ public static TypedQuery<Isotope> findIsotopesByAbbrevEqualsAndNameEquals(String
         return q;
     }
 
-	public static TypedQuery<Isotope> findIsotopesByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<Isotope> findIsotopesByNameEquals(String name) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = Isotope.entityManager();
         CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
         CriteriaQuery<Isotope> criteria = criteriaBuilder.createQuery(Isotope.class);
         Root<Isotope> isotopeRoot = criteria.from(Isotope.class);
         criteria.select(isotopeRoot);
-        Predicate predicate = criteriaBuilder.equal(criteriaBuilder.upper(isotopeRoot.<String>get("name")), name.toUpperCase().trim());
+        Predicate predicate = criteriaBuilder.equal(criteriaBuilder.upper(isotopeRoot.<String>get("name")),
+                name.toUpperCase().trim());
         criteria.where(criteriaBuilder.and(predicate));
         TypedQuery<Isotope> q = em.createQuery(criteria);
         return q;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String getName() {
+    public String getName() {
         return this.name;
     }
 
-	public void setName(String name) {
+    public void setName(String name) {
         this.name = name;
     }
 
-	public String getAbbrev() {
+    public String getAbbrev() {
         return this.abbrev;
     }
 
-	public void setAbbrev(String abbrev) {
+    public void setAbbrev(String abbrev) {
         this.abbrev = abbrev;
     }
 
-	public Double getMassChange() {
+    public Double getMassChange() {
         return this.massChange;
     }
 
-	public void setMassChange(Double massChange) {
+    public void setMassChange(Double massChange) {
         this.massChange = massChange;
     }
 
-	public Boolean getIgnore() {
+    public Boolean getIgnore() {
         return this.ignore;
     }
 
-	public void setIgnore(Boolean ignore) {
+    public void setIgnore(Boolean ignore) {
         this.ignore = ignore;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static Isotope fromJsonToIsotope(String json) {
+    public static Isotope fromJsonToIsotope(String json) {
         return new JSONDeserializer<Isotope>()
-        .use(null, Isotope.class).deserialize(json);
+                .use(null, Isotope.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<Isotope> collection) {
+    public static String toJsonArray(Collection<Isotope> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<Isotope> collection, String[] fields) {
+    public static String toJsonArray(Collection<Isotope> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<Isotope> fromJsonArrayToIsotopes(String json) {
+    public static Collection<Isotope> fromJsonArrayToIsotopes(String json) {
         return new JSONDeserializer<List<Isotope>>()
-        .use("values", Isotope.class).deserialize(json);
+                .use("values", Isotope.class).deserialize(json);
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "abbrev", "massChange", "ignore");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "abbrev",
+            "massChange", "ignore");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new Isotope().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countIsotopes() {
+    public static long countIsotopes() {
         return entityManager().createQuery("SELECT COUNT(o) FROM Isotope o", Long.class).getSingleResult();
     }
 
-	public static List<Isotope> findAllIsotopes() {
+    public static List<Isotope> findAllIsotopes() {
         return entityManager().createQuery("SELECT o FROM Isotope o", Isotope.class).getResultList();
     }
 
-	public static List<Isotope> findAllIsotopes(String sortFieldName, String sortOrder) {
+    public static List<Isotope> findAllIsotopes(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM Isotope o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -210,16 +220,19 @@ public static List<Isotope> findAllIsotopes(String sortFieldName, String sortOrd
         return entityManager().createQuery(jpaQuery, Isotope.class).getResultList();
     }
 
-	public static Isotope findIsotope(Long id) {
-        if (id == null) return null;
+    public static Isotope findIsotope(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(Isotope.class, id);
     }
 
-	public static List<Isotope> findIsotopeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM Isotope o", Isotope.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<Isotope> findIsotopeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM Isotope o", Isotope.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<Isotope> findIsotopeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<Isotope> findIsotopeEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM Isotope o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -227,18 +240,21 @@ public static List<Isotope> findIsotopeEntries(int firstResult, int maxResults,
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, Isotope.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, Isotope.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -247,54 +263,64 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public Isotope merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         Isotope merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public static Long countFindIsotopesByAbbrevEquals(String abbrev) {
-        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
+    public static Long countFindIsotopesByAbbrevEquals(String abbrev) {
+        if (abbrev == null || abbrev.length() == 0)
+            throw new IllegalArgumentException("The abbrev argument is required");
         EntityManager em = Isotope.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Isotope AS o WHERE o.abbrev = :abbrev", Long.class);
         q.setParameter("abbrev", abbrev);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindIsotopesByAbbrevEqualsAndNameEquals(String abbrev, String name) {
-        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static Long countFindIsotopesByAbbrevEqualsAndNameEquals(String abbrev, String name) {
+        if (abbrev == null || abbrev.length() == 0)
+            throw new IllegalArgumentException("The abbrev argument is required");
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = Isotope.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Isotope AS o WHERE o.abbrev = :abbrev  AND o.name = :name", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Isotope AS o WHERE o.abbrev = :abbrev  AND o.name = :name",
+                Long.class);
         q.setParameter("abbrev", abbrev);
         q.setParameter("name", name);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindIsotopesByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static Long countFindIsotopesByNameEquals(String name) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = Isotope.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Isotope AS o WHERE o.name = :name", Long.class);
         q.setParameter("name", name);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<Isotope> findIsotopesByAbbrevEquals(String abbrev, String sortFieldName, String sortOrder) {
-        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
+    public static TypedQuery<Isotope> findIsotopesByAbbrevEquals(String abbrev, String sortFieldName,
+            String sortOrder) {
+        if (abbrev == null || abbrev.length() == 0)
+            throw new IllegalArgumentException("The abbrev argument is required");
         EntityManager em = Isotope.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Isotope AS o WHERE o.abbrev = :abbrev");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -308,11 +334,15 @@ public static TypedQuery<Isotope> findIsotopesByAbbrevEquals(String abbrev, Stri
         return q;
     }
 
-	public static TypedQuery<Isotope> findIsotopesByAbbrevEqualsAndNameEquals(String abbrev, String name, String sortFieldName, String sortOrder) {
-        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<Isotope> findIsotopesByAbbrevEqualsAndNameEquals(String abbrev, String name,
+            String sortFieldName, String sortOrder) {
+        if (abbrev == null || abbrev.length() == 0)
+            throw new IllegalArgumentException("The abbrev argument is required");
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = Isotope.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Isotope AS o WHERE o.abbrev = :abbrev  AND o.name = :name");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Isotope AS o WHERE o.abbrev = :abbrev  AND o.name = :name");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -325,8 +355,9 @@ public static TypedQuery<Isotope> findIsotopesByAbbrevEqualsAndNameEquals(String
         return q;
     }
 
-	public static TypedQuery<Isotope> findIsotopesByNameEquals(String name, String sortFieldName, String sortOrder) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<Isotope> findIsotopesByNameEquals(String name, String sortFieldName, String sortOrder) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = Isotope.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Isotope AS o WHERE o.name = :name");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer.java b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer.java
index 74d32a115..7d0ffda53 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainer.java
@@ -37,7 +37,7 @@
 
 public class ItxContainerContainer extends AbstractThing {
 
-	private static final Logger logger = LoggerFactory.getLogger(ItxContainerContainer.class);
+    private static final Logger logger = LoggerFactory.getLogger(ItxContainerContainer.class);
 
     @NotNull
     @ManyToOne(fetch = FetchType.EAGER)
@@ -53,222 +53,262 @@ public class ItxContainerContainer extends AbstractThing {
     private Set<ItxContainerContainerState> lsStates = new HashSet<ItxContainerContainerState>();
 
     public ItxContainerContainer(com.labsynch.labseer.domain.ItxContainerContainer itxContainer) {
-    	this.setRecordedBy(itxContainer.getRecordedBy());
-    	this.setRecordedDate(itxContainer.getRecordedDate());
-    	this.setLsTransaction(itxContainer.getLsTransaction());
-    	this.setModifiedBy(itxContainer.getModifiedBy());
-    	this.setModifiedDate(itxContainer.getModifiedDate());
-    	this.setCodeName(itxContainer.getCodeName());
-    	this.setLsType(itxContainer.getLsType());
-    	this.setLsKind(itxContainer.getLsKind());
-    	this.setLsTypeAndKind(itxContainer.getLsTypeAndKind());
+        this.setRecordedBy(itxContainer.getRecordedBy());
+        this.setRecordedDate(itxContainer.getRecordedDate());
+        this.setLsTransaction(itxContainer.getLsTransaction());
+        this.setModifiedBy(itxContainer.getModifiedBy());
+        this.setModifiedDate(itxContainer.getModifiedDate());
+        this.setCodeName(itxContainer.getCodeName());
+        this.setLsType(itxContainer.getLsType());
+        this.setLsKind(itxContainer.getLsKind());
+        this.setLsTypeAndKind(itxContainer.getLsTypeAndKind());
         this.firstContainer = itxContainer.getFirstContainer();
         this.secondContainer = itxContainer.getSecondContainer();
     }
-    
+
     public static ItxContainerContainer update(ItxContainerContainer object) {
-    	ItxContainerContainer updatedObject = new JSONDeserializer<ItxContainerContainer>().use(null, ItxContainerContainer.class).
-        		deserializeInto(object.toJson(), 
-        				ItxContainerContainer.findItxContainerContainer(object.getId()));
-    	updatedObject.setModifiedDate(new Date());
-    	updatedObject.merge();
+        ItxContainerContainer updatedObject = new JSONDeserializer<ItxContainerContainer>()
+                .use(null, ItxContainerContainer.class).deserializeInto(object.toJson(),
+                        ItxContainerContainer.findItxContainerContainer(object.getId()));
+        updatedObject.setModifiedDate(new Date());
+        updatedObject.merge();
         return updatedObject;
     }
-    
+
     public String toJson() {
         return new JSONSerializer().exclude("*.class")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(this);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
-    
+
     public static ItxContainerContainer fromJsonToItxContainerContainer(String json) {
         return new JSONDeserializer<ItxContainerContainer>()
-        		.use(null, ItxContainerContainer.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use(null, ItxContainerContainer.class)
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
-    
+
     public static String toJsonArray(Collection<ItxContainerContainer> collection) {
         return new JSONSerializer().exclude("*.class")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(collection);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
-    
+
     public static Collection<ItxContainerContainer> fromJsonArrayToItxContainerContainers(String json) {
         return new JSONDeserializer<List<ItxContainerContainer>>().use(null, ArrayList.class)
-        		.use("values", ItxContainerContainer.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use("values", ItxContainerContainer.class)
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
-    
+
     public static Collection<ItxContainerContainer> fromJsonArrayToItxContainerContainers(Reader json) {
         return new JSONDeserializer<List<ItxContainerContainer>>().use(null, ArrayList.class)
-        		.use("values", ItxContainerContainer.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use("values", ItxContainerContainer.class)
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
-    
+
     public static ItxContainerContainer updateNoStates(ItxContainerContainer itxContainerContainer) {
-    	ItxContainerContainer updatedItxContainerContainer = ItxContainerContainer.findItxContainerContainer(itxContainerContainer.getId());
-    	updatedItxContainerContainer.setRecordedBy(itxContainerContainer.getRecordedBy());
-    	updatedItxContainerContainer.setRecordedDate(itxContainerContainer.getRecordedDate());
-    	updatedItxContainerContainer.setIgnored(itxContainerContainer.isIgnored());
-    	updatedItxContainerContainer.setDeleted(itxContainerContainer.isDeleted());
-    	updatedItxContainerContainer.setLsTransaction(itxContainerContainer.getLsTransaction());
-    	updatedItxContainerContainer.setModifiedBy(itxContainerContainer.getModifiedBy());
-    	updatedItxContainerContainer.setCodeName(itxContainerContainer.getCodeName());
-    	updatedItxContainerContainer.setLsType(itxContainerContainer.getLsType());
-    	updatedItxContainerContainer.setLsKind(itxContainerContainer.getLsKind());
-    	updatedItxContainerContainer.setLsTypeAndKind(itxContainerContainer.getLsTypeAndKind());
-    	updatedItxContainerContainer.firstContainer = Container.findContainer(itxContainerContainer.getFirstContainer().getId());
-    	updatedItxContainerContainer.secondContainer = Container.findContainer(itxContainerContainer.getSecondContainer().getId());    	
-    	updatedItxContainerContainer.setModifiedDate(new Date());
-    	updatedItxContainerContainer.merge();
-    	
-    	logger.debug("------------ Just updated the itxContainerContainer: ");
-    	if(logger.isDebugEnabled()) logger.debug(updatedItxContainerContainer.toJson());
-    	
+        ItxContainerContainer updatedItxContainerContainer = ItxContainerContainer
+                .findItxContainerContainer(itxContainerContainer.getId());
+        updatedItxContainerContainer.setRecordedBy(itxContainerContainer.getRecordedBy());
+        updatedItxContainerContainer.setRecordedDate(itxContainerContainer.getRecordedDate());
+        updatedItxContainerContainer.setIgnored(itxContainerContainer.isIgnored());
+        updatedItxContainerContainer.setDeleted(itxContainerContainer.isDeleted());
+        updatedItxContainerContainer.setLsTransaction(itxContainerContainer.getLsTransaction());
+        updatedItxContainerContainer.setModifiedBy(itxContainerContainer.getModifiedBy());
+        updatedItxContainerContainer.setCodeName(itxContainerContainer.getCodeName());
+        updatedItxContainerContainer.setLsType(itxContainerContainer.getLsType());
+        updatedItxContainerContainer.setLsKind(itxContainerContainer.getLsKind());
+        updatedItxContainerContainer.setLsTypeAndKind(itxContainerContainer.getLsTypeAndKind());
+        updatedItxContainerContainer.firstContainer = Container
+                .findContainer(itxContainerContainer.getFirstContainer().getId());
+        updatedItxContainerContainer.secondContainer = Container
+                .findContainer(itxContainerContainer.getSecondContainer().getId());
+        updatedItxContainerContainer.setModifiedDate(new Date());
+        updatedItxContainerContainer.merge();
+
+        logger.debug("------------ Just updated the itxContainerContainer: ");
+        if (logger.isDebugEnabled())
+            logger.debug(updatedItxContainerContainer.toJson());
+
         return updatedItxContainerContainer;
     }
-    
-    public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTypeEqualsAndLsKindEqualsAndFirstContainerEquals(String lsType, String lsKind, Container firstContainer){
-    	if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (firstContainer == null) throw new IllegalArgumentException("The firstContainer argument is required");
-        
+
+    public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTypeEqualsAndLsKindEqualsAndFirstContainerEquals(
+            String lsType, String lsKind, Container firstContainer) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (firstContainer == null)
+            throw new IllegalArgumentException("The firstContainer argument is required");
+
         boolean ignored = true;
-        
+
         EntityManager em = ItxContainerContainer.entityManager();
-		String query = "SELECT DISTINCT o FROM ItxContainerContainer o " +
-				"WHERE o.ignored IS NOT :ignored " +
-				"AND o.lsType = :lsType " +
-				"AND o.lsKind = :lsKind " +
-				"AND o.firstContainer = :firstContainer ";
-        
+        String query = "SELECT DISTINCT o FROM ItxContainerContainer o " +
+                "WHERE o.ignored IS NOT :ignored " +
+                "AND o.lsType = :lsType " +
+                "AND o.lsKind = :lsKind " +
+                "AND o.firstContainer = :firstContainer ";
+
         TypedQuery<ItxContainerContainer> q = em.createQuery(query, ItxContainerContainer.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
-        q.setParameter("firstContainer", firstContainer);        
+        q.setParameter("firstContainer", firstContainer);
         q.setParameter("ignored", ignored);
-        
+
         return q;
     }
-    
-    public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTypeEqualsAndLsKindEqualsAndSecondContainerEquals(String lsType, String lsKind, Container secondContainer){
-    	if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (secondContainer == null) throw new IllegalArgumentException("The secondContainer argument is required");
-        
+
+    public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTypeEqualsAndLsKindEqualsAndSecondContainerEquals(
+            String lsType, String lsKind, Container secondContainer) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (secondContainer == null)
+            throw new IllegalArgumentException("The secondContainer argument is required");
+
         boolean ignored = true;
-        
+
         EntityManager em = ItxContainerContainer.entityManager();
-		String query = "SELECT DISTINCT o FROM ItxContainerContainer o " +
-				"WHERE o.ignored IS NOT :ignored " +
-				"AND o.lsType = :lsType " +
-				"AND o.lsKind = :lsKind " +
-				"AND o.secondContainer = :secondContainer ";
-        
+        String query = "SELECT DISTINCT o FROM ItxContainerContainer o " +
+                "WHERE o.ignored IS NOT :ignored " +
+                "AND o.lsType = :lsType " +
+                "AND o.lsKind = :lsKind " +
+                "AND o.secondContainer = :secondContainer ";
+
         TypedQuery<ItxContainerContainer> q = em.createQuery(query, ItxContainerContainer.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
-        q.setParameter("secondContainer", secondContainer);        
+        q.setParameter("secondContainer", secondContainer);
         q.setParameter("ignored", ignored);
-        
+
         return q;
     }
-    
-    public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTypeEqualsAndLsKindEqualsAndSecondContainerEqualsAndOrderEquals(String lsType, String lsKind, Container secondContainer, int order){
-    	if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (secondContainer == null) throw new IllegalArgumentException("The secondContainer argument is required");
-        
+
+    public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTypeEqualsAndLsKindEqualsAndSecondContainerEqualsAndOrderEquals(
+            String lsType, String lsKind, Container secondContainer, int order) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (secondContainer == null)
+            throw new IllegalArgumentException("The secondContainer argument is required");
+
         boolean ignored = true;
-        
+
         EntityManager em = ItxContainerContainer.entityManager();
-		String query = "SELECT DISTINCT o FROM ItxContainerContainer o " +
-				"JOIN o.lsStates itxstate JOIN itxstate.lsValues itxvalue WITH itxvalue.lsKind = 'order' " +
-				"WHERE o.ignored IS NOT :ignored " +
-				"AND o.lsType = :lsType " +
-				"AND o.lsKind = :lsKind " +
-				"AND itxvalue.numericValue = :order " +
-				"AND o.secondContainer = :secondContainer ";
-        
+        String query = "SELECT DISTINCT o FROM ItxContainerContainer o " +
+                "JOIN o.lsStates itxstate JOIN itxstate.lsValues itxvalue WITH itxvalue.lsKind = 'order' " +
+                "WHERE o.ignored IS NOT :ignored " +
+                "AND o.lsType = :lsType " +
+                "AND o.lsKind = :lsKind " +
+                "AND itxvalue.numericValue = :order " +
+                "AND o.secondContainer = :secondContainer ";
+
         TypedQuery<ItxContainerContainer> q = em.createQuery(query, ItxContainerContainer.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         q.setParameter("order", new BigDecimal(order));
-        q.setParameter("secondContainer", secondContainer);        
+        q.setParameter("secondContainer", secondContainer);
         q.setParameter("ignored", ignored);
-        
+
         return q;
     }
-    
-    public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTypeEqualsAndLsKindEqualsAndFirstContainerEqualsAndSecondContainerEquals(String lsType, String lsKind, Container firstContainer, Container secondContainer){
-    	if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (firstContainer == null) throw new IllegalArgumentException("The firstContainer argument is required");
-        if (secondContainer == null) throw new IllegalArgumentException("The secondContainer argument is required");
-        
+
+    public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTypeEqualsAndLsKindEqualsAndFirstContainerEqualsAndSecondContainerEquals(
+            String lsType, String lsKind, Container firstContainer, Container secondContainer) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (firstContainer == null)
+            throw new IllegalArgumentException("The firstContainer argument is required");
+        if (secondContainer == null)
+            throw new IllegalArgumentException("The secondContainer argument is required");
+
         boolean ignored = true;
-        
+
         EntityManager em = ItxContainerContainer.entityManager();
-		String query = "SELECT DISTINCT o FROM ItxContainerContainer o " +
-				"WHERE o.ignored IS NOT :ignored " +
-				"AND o.lsType = :lsType " +
-				"AND o.lsKind = :lsKind " +
-				"AND o.firstContainer = :firstContainer " +
-				"AND o.secondContainer = :secondContainer ";
-        
+        String query = "SELECT DISTINCT o FROM ItxContainerContainer o " +
+                "WHERE o.ignored IS NOT :ignored " +
+                "AND o.lsType = :lsType " +
+                "AND o.lsKind = :lsKind " +
+                "AND o.firstContainer = :firstContainer " +
+                "AND o.secondContainer = :secondContainer ";
+
         TypedQuery<ItxContainerContainer> q = em.createQuery(query, ItxContainerContainer.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
-        q.setParameter("firstContainer", firstContainer);        
-        q.setParameter("secondContainer", secondContainer);        
+        q.setParameter("firstContainer", firstContainer);
+        q.setParameter("secondContainer", secondContainer);
         q.setParameter("ignored", ignored);
-        
+
         return q;
     }
 
-	public static Long countFindItxContainerContainersByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static Long countFindItxContainerContainersByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = ItxContainerContainer.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxContainerContainer AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ItxContainerContainer AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
         q.setParameter("lsTransaction", lsTransaction);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindItxContainerContainersByLsTypeEqualsAndFirstContainerEquals(String lsType, Container firstContainer) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (firstContainer == null) throw new IllegalArgumentException("The firstContainer argument is required");
+    public static Long countFindItxContainerContainersByLsTypeEqualsAndFirstContainerEquals(String lsType,
+            Container firstContainer) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (firstContainer == null)
+            throw new IllegalArgumentException("The firstContainer argument is required");
         EntityManager em = ItxContainerContainer.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxContainerContainer AS o WHERE o.lsType = :lsType  AND o.firstContainer = :firstContainer", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ItxContainerContainer AS o WHERE o.lsType = :lsType  AND o.firstContainer = :firstContainer",
+                Long.class);
         q.setParameter("lsType", lsType);
         q.setParameter("firstContainer", firstContainer);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindItxContainerContainersByLsTypeEqualsAndSecondContainerEquals(String lsType, Container secondContainer) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (secondContainer == null) throw new IllegalArgumentException("The secondContainer argument is required");
+    public static Long countFindItxContainerContainersByLsTypeEqualsAndSecondContainerEquals(String lsType,
+            Container secondContainer) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (secondContainer == null)
+            throw new IllegalArgumentException("The secondContainer argument is required");
         EntityManager em = ItxContainerContainer.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxContainerContainer AS o WHERE o.lsType = :lsType  AND o.secondContainer = :secondContainer", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ItxContainerContainer AS o WHERE o.lsType = :lsType  AND o.secondContainer = :secondContainer",
+                Long.class);
         q.setParameter("lsType", lsType);
         q.setParameter("secondContainer", secondContainer);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTransactionEquals(
+            Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = ItxContainerContainer.entityManager();
-        TypedQuery<ItxContainerContainer> q = em.createQuery("SELECT o FROM ItxContainerContainer AS o WHERE o.lsTransaction = :lsTransaction", ItxContainerContainer.class);
+        TypedQuery<ItxContainerContainer> q = em.createQuery(
+                "SELECT o FROM ItxContainerContainer AS o WHERE o.lsTransaction = :lsTransaction",
+                ItxContainerContainer.class);
         q.setParameter("lsTransaction", lsTransaction);
         return q;
     }
 
-	public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTransactionEquals(Long lsTransaction,
+            String sortFieldName, String sortOrder) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = ItxContainerContainer.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxContainerContainer AS o WHERE o.lsTransaction = :lsTransaction");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ItxContainerContainer AS o WHERE o.lsTransaction = :lsTransaction");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -280,21 +320,30 @@ public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTr
         return q;
     }
 
-	public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTypeEqualsAndFirstContainerEquals(String lsType, Container firstContainer) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (firstContainer == null) throw new IllegalArgumentException("The firstContainer argument is required");
+    public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTypeEqualsAndFirstContainerEquals(
+            String lsType, Container firstContainer) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (firstContainer == null)
+            throw new IllegalArgumentException("The firstContainer argument is required");
         EntityManager em = ItxContainerContainer.entityManager();
-        TypedQuery<ItxContainerContainer> q = em.createQuery("SELECT o FROM ItxContainerContainer AS o WHERE o.lsType = :lsType  AND o.firstContainer = :firstContainer", ItxContainerContainer.class);
+        TypedQuery<ItxContainerContainer> q = em.createQuery(
+                "SELECT o FROM ItxContainerContainer AS o WHERE o.lsType = :lsType  AND o.firstContainer = :firstContainer",
+                ItxContainerContainer.class);
         q.setParameter("lsType", lsType);
         q.setParameter("firstContainer", firstContainer);
         return q;
     }
 
-	public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTypeEqualsAndFirstContainerEquals(String lsType, Container firstContainer, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (firstContainer == null) throw new IllegalArgumentException("The firstContainer argument is required");
+    public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTypeEqualsAndFirstContainerEquals(
+            String lsType, Container firstContainer, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (firstContainer == null)
+            throw new IllegalArgumentException("The firstContainer argument is required");
         EntityManager em = ItxContainerContainer.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxContainerContainer AS o WHERE o.lsType = :lsType  AND o.firstContainer = :firstContainer");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ItxContainerContainer AS o WHERE o.lsType = :lsType  AND o.firstContainer = :firstContainer");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -307,21 +356,30 @@ public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTy
         return q;
     }
 
-	public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTypeEqualsAndSecondContainerEquals(String lsType, Container secondContainer) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (secondContainer == null) throw new IllegalArgumentException("The secondContainer argument is required");
+    public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTypeEqualsAndSecondContainerEquals(
+            String lsType, Container secondContainer) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (secondContainer == null)
+            throw new IllegalArgumentException("The secondContainer argument is required");
         EntityManager em = ItxContainerContainer.entityManager();
-        TypedQuery<ItxContainerContainer> q = em.createQuery("SELECT o FROM ItxContainerContainer AS o WHERE o.lsType = :lsType  AND o.secondContainer = :secondContainer", ItxContainerContainer.class);
+        TypedQuery<ItxContainerContainer> q = em.createQuery(
+                "SELECT o FROM ItxContainerContainer AS o WHERE o.lsType = :lsType  AND o.secondContainer = :secondContainer",
+                ItxContainerContainer.class);
         q.setParameter("lsType", lsType);
         q.setParameter("secondContainer", secondContainer);
         return q;
     }
 
-	public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTypeEqualsAndSecondContainerEquals(String lsType, Container secondContainer, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (secondContainer == null) throw new IllegalArgumentException("The secondContainer argument is required");
+    public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTypeEqualsAndSecondContainerEquals(
+            String lsType, Container secondContainer, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (secondContainer == null)
+            throw new IllegalArgumentException("The secondContainer argument is required");
         EntityManager em = ItxContainerContainer.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxContainerContainer AS o WHERE o.lsType = :lsType  AND o.secondContainer = :secondContainer");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ItxContainerContainer AS o WHERE o.lsType = :lsType  AND o.secondContainer = :secondContainer");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -334,49 +392,52 @@ public static TypedQuery<ItxContainerContainer> findItxContainerContainersByLsTy
         return q;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public ItxContainerContainer() {
+    public ItxContainerContainer() {
         super();
     }
 
-	public Container getFirstContainer() {
+    public Container getFirstContainer() {
         return this.firstContainer;
     }
 
-	public void setFirstContainer(Container firstContainer) {
+    public void setFirstContainer(Container firstContainer) {
         this.firstContainer = firstContainer;
     }
 
-	public Container getSecondContainer() {
+    public Container getSecondContainer() {
         return this.secondContainer;
     }
 
-	public void setSecondContainer(Container secondContainer) {
+    public void setSecondContainer(Container secondContainer) {
         this.secondContainer = secondContainer;
     }
 
-	public Set<ItxContainerContainerState> getLsStates() {
+    public Set<ItxContainerContainerState> getLsStates() {
         return this.lsStates;
     }
 
-	public void setLsStates(Set<ItxContainerContainerState> lsStates) {
+    public void setLsStates(Set<ItxContainerContainerState> lsStates) {
         this.lsStates = lsStates;
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "firstContainer", "secondContainer", "lsStates");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "firstContainer",
+            "secondContainer", "lsStates");
 
-	public static long countItxContainerContainers() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ItxContainerContainer o", Long.class).getSingleResult();
+    public static long countItxContainerContainers() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ItxContainerContainer o", Long.class)
+                .getSingleResult();
     }
 
-	public static List<ItxContainerContainer> findAllItxContainerContainers() {
-        return entityManager().createQuery("SELECT o FROM ItxContainerContainer o", ItxContainerContainer.class).getResultList();
+    public static List<ItxContainerContainer> findAllItxContainerContainers() {
+        return entityManager().createQuery("SELECT o FROM ItxContainerContainer o", ItxContainerContainer.class)
+                .getResultList();
     }
 
-	public static List<ItxContainerContainer> findAllItxContainerContainers(String sortFieldName, String sortOrder) {
+    public static List<ItxContainerContainer> findAllItxContainerContainers(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxContainerContainer o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -387,16 +448,19 @@ public static List<ItxContainerContainer> findAllItxContainerContainers(String s
         return entityManager().createQuery(jpaQuery, ItxContainerContainer.class).getResultList();
     }
 
-	public static ItxContainerContainer findItxContainerContainer(Long id) {
-        if (id == null) return null;
+    public static ItxContainerContainer findItxContainerContainer(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ItxContainerContainer.class, id);
     }
 
-	public static List<ItxContainerContainer> findItxContainerContainerEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxContainerContainer o", ItxContainerContainer.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ItxContainerContainer> findItxContainerContainerEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ItxContainerContainer o", ItxContainerContainer.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ItxContainerContainer> findItxContainerContainerEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ItxContainerContainer> findItxContainerContainerEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxContainerContainer o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -404,12 +468,14 @@ public static List<ItxContainerContainer> findItxContainerContainerEntries(int f
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ItxContainerContainer.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ItxContainerContainer.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public ItxContainerContainer merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ItxContainerContainer merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState.java b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState.java
index 7da7d1824..690f4b137 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerState.java
@@ -33,94 +33,96 @@
 public class ItxContainerContainerState extends AbstractState {
 
     public ItxContainerContainerState(ItxContainerContainerState itxState) {
-    		super.setLsType(itxState.getLsType());
-    		super.setLsKind(itxState.getLsKind());
-		super.setRecordedBy(itxState.getRecordedBy());
-		super.setRecordedDate(itxState.getRecordedDate());
-		super.setLsTransaction(itxState.getLsTransaction());
-		super.setModifiedBy(itxState.getModifiedBy());
-		super.setModifiedDate(itxState.getModifiedDate());
-		
-    }
-    
+        super.setLsType(itxState.getLsType());
+        super.setLsKind(itxState.getLsKind());
+        super.setRecordedBy(itxState.getRecordedBy());
+        super.setRecordedDate(itxState.getRecordedDate());
+        super.setLsTransaction(itxState.getLsTransaction());
+        super.setModifiedBy(itxState.getModifiedBy());
+        super.setModifiedDate(itxState.getModifiedDate());
+
+    }
+
     public static ItxContainerContainerState update(ItxContainerContainerState object) {
-    	ItxContainerContainerState updatedObject = new JSONDeserializer<ItxContainerContainerState>().use(null, ItxContainerContainerState.class).
-        		deserializeInto(object.toJson(), 
-        				ItxContainerContainerState.findItxContainerContainerState(object.getId()));
-    	updatedObject.setModifiedDate(new Date());
-    	updatedObject.merge();
+        ItxContainerContainerState updatedObject = new JSONDeserializer<ItxContainerContainerState>()
+                .use(null, ItxContainerContainerState.class).deserializeInto(object.toJson(),
+                        ItxContainerContainerState.findItxContainerContainerState(object.getId()));
+        updatedObject.setModifiedDate(new Date());
+        updatedObject.merge();
         return updatedObject;
     }
 
-	@ManyToOne
-	@JoinColumn(name = "itx_container_container")
+    @ManyToOne
+    @JoinColumn(name = "itx_container_container")
     private ItxContainerContainer itxContainerContainer;
 
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "lsState",  fetch =  FetchType.LAZY)
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "lsState", fetch = FetchType.LAZY)
     private Set<ItxContainerContainerValue> lsValues = new HashSet<ItxContainerContainerValue>();
-    
-    
-	@Transactional
+
+    @Transactional
     public String toJson() {
         return new JSONSerializer().exclude("*.class")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(this);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
 
-	@Transactional
+    @Transactional
     public String toJsonStub() {
         return new JSONSerializer().exclude("*.class", "itxContainerContainer")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(this);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
 
     public static ItxContainerContainerState fromJsonToItxContainerContainerState(String json) {
         return new JSONDeserializer<ItxContainerContainerState>().use(null, ItxContainerContainerState.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
-    
-	@Transactional
+
+    @Transactional
     public static String toJsonArray(Collection<ItxContainerContainerState> collection) {
         return new JSONSerializer().exclude("*.class")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(collection);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
 
-	@Transactional
+    @Transactional
     public static String toJsonArrayStub(Collection<ItxContainerContainerState> collection) {
         return new JSONSerializer().exclude("*.class", "itxContainerContainer")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(collection);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
-    
+
     public static Collection<ItxContainerContainerState> fromJsonArrayToItxContainerContainerStates(String json) {
         return new JSONDeserializer<List<ItxContainerContainerState>>().use(null, ArrayList.class)
-        		.use("values", ItxContainerContainerState.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use("values", ItxContainerContainerState.class)
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
 
     public static Collection<ItxContainerContainerState> fromJsonArrayToItxContainerContainerStates(Reader json) {
         return new JSONDeserializer<List<ItxContainerContainerState>>().use(null, ArrayList.class)
-        		.use("values", ItxContainerContainerState.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use("values", ItxContainerContainerState.class)
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
 
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("itxContainerContainer",
+            "lsValues");
 
-
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("itxContainerContainer", "lsValues");
-
-	public static long countItxContainerContainerStates() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ItxContainerContainerState o", Long.class).getSingleResult();
+    public static long countItxContainerContainerStates() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ItxContainerContainerState o", Long.class)
+                .getSingleResult();
     }
 
-	public static List<ItxContainerContainerState> findAllItxContainerContainerStates() {
-        return entityManager().createQuery("SELECT o FROM ItxContainerContainerState o", ItxContainerContainerState.class).getResultList();
+    public static List<ItxContainerContainerState> findAllItxContainerContainerStates() {
+        return entityManager()
+                .createQuery("SELECT o FROM ItxContainerContainerState o", ItxContainerContainerState.class)
+                .getResultList();
     }
 
-	public static List<ItxContainerContainerState> findAllItxContainerContainerStates(String sortFieldName, String sortOrder) {
+    public static List<ItxContainerContainerState> findAllItxContainerContainerStates(String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxContainerContainerState o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -131,16 +133,21 @@ public static List<ItxContainerContainerState> findAllItxContainerContainerState
         return entityManager().createQuery(jpaQuery, ItxContainerContainerState.class).getResultList();
     }
 
-	public static ItxContainerContainerState findItxContainerContainerState(Long id) {
-        if (id == null) return null;
+    public static ItxContainerContainerState findItxContainerContainerState(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ItxContainerContainerState.class, id);
     }
 
-	public static List<ItxContainerContainerState> findItxContainerContainerStateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxContainerContainerState o", ItxContainerContainerState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ItxContainerContainerState> findItxContainerContainerStateEntries(int firstResult,
+            int maxResults) {
+        return entityManager()
+                .createQuery("SELECT o FROM ItxContainerContainerState o", ItxContainerContainerState.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ItxContainerContainerState> findItxContainerContainerStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ItxContainerContainerState> findItxContainerContainerStateEntries(int firstResult,
+            int maxResults, String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxContainerContainerState o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -148,38 +155,40 @@ public static List<ItxContainerContainerState> findItxContainerContainerStateEnt
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ItxContainerContainerState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ItxContainerContainerState.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public ItxContainerContainerState merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ItxContainerContainerState merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public ItxContainerContainerState() {
+    public ItxContainerContainerState() {
         super();
     }
 
-	public ItxContainerContainer getItxContainerContainer() {
+    public ItxContainerContainer getItxContainerContainer() {
         return this.itxContainerContainer;
     }
 
-	public void setItxContainerContainer(ItxContainerContainer itxContainerContainer) {
+    public void setItxContainerContainer(ItxContainerContainer itxContainerContainer) {
         this.itxContainerContainer = itxContainerContainer;
     }
 
-	public Set<ItxContainerContainerValue> getLsValues() {
+    public Set<ItxContainerContainerValue> getLsValues() {
         return this.lsValues;
     }
 
-	public void setLsValues(Set<ItxContainerContainerValue> lsValues) {
+    public void setLsValues(Set<ItxContainerContainerValue> lsValues) {
         this.lsValues = lsValues;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue.java b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue.java
index bad269722..854deb6ec 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxContainerContainerValue.java
@@ -24,14 +24,14 @@
 @Entity
 
 public class ItxContainerContainerValue extends AbstractValue {
-		
+
     @ManyToOne
     @JoinColumn(name = "ls_state")
     private ItxContainerContainerState lsState;
-    
+
     public ItxContainerContainerValue(
-			ItxContainerContainerValue itxContainerContainerValue) {
-    	super.setBlobValue(itxContainerContainerValue.getBlobValue());
+            ItxContainerContainerValue itxContainerContainerValue) {
+        super.setBlobValue(itxContainerContainerValue.getBlobValue());
         super.setClobValue(itxContainerContainerValue.getClobValue());
         super.setCodeKind(itxContainerContainerValue.getCodeKind());
         super.setCodeOrigin(itxContainerContainerValue.getCodeOrigin());
@@ -68,88 +68,89 @@ public ItxContainerContainerValue(
         super.setUnitTypeAndKind(itxContainerContainerValue.getUnitTypeAndKind());
         super.setUrlValue(itxContainerContainerValue.getUrlValue());
         super.setVersion(itxContainerContainerValue.getVersion());
-	}
-
-
-	public ItxContainerContainerValue() {
-		// TODO Auto-generated constructor stub
-	}
+    }
 
+    public ItxContainerContainerValue() {
+        // TODO Auto-generated constructor stub
+    }
 
-	public static ItxContainerContainerValue update(ItxContainerContainerValue object) {
-    	ItxContainerContainerValue updatedObject = new JSONDeserializer<ItxContainerContainerValue>().use(null, ItxContainerContainerValue.class).
-        		deserializeInto(object.toJson(), 
-        				ItxContainerContainerValue.findItxContainerContainerValue(object.getId()));
-    	updatedObject.setModifiedDate(new Date());
-    	updatedObject.merge();
+    public static ItxContainerContainerValue update(ItxContainerContainerValue object) {
+        ItxContainerContainerValue updatedObject = new JSONDeserializer<ItxContainerContainerValue>()
+                .use(null, ItxContainerContainerValue.class).deserializeInto(object.toJson(),
+                        ItxContainerContainerValue.findItxContainerContainerValue(object.getId()));
+        updatedObject.setModifiedDate(new Date());
+        updatedObject.merge();
         return updatedObject;
     }
-    
-    
+
     public static ItxContainerContainerValue fromJsonToItxContainerContainerValue(String json) {
-        return new JSONDeserializer<ItxContainerContainerValue>().
-        		use(null, ItxContainerContainerValue.class).
-        		
-        		deserialize(json);
+        return new JSONDeserializer<ItxContainerContainerValue>().use(null, ItxContainerContainerValue.class).
+
+                deserialize(json);
     }
-    
+
     public static Collection<ItxContainerContainerValue> fromJsonArrayToItxContainerContainerValues(String json) {
-        return new JSONDeserializer<List<ItxContainerContainerValue>>().
-        		use(null, ArrayList.class).
-        		use("values", ItxContainerContainerValue.class).
-        		
-        		deserialize(json);
+        return new JSONDeserializer<List<ItxContainerContainerValue>>().use(null, ArrayList.class)
+                .use("values", ItxContainerContainerValue.class).
+
+                deserialize(json);
     }
-    
+
     public static Collection<ItxContainerContainerValue> fromJsonArrayToItxContainerContainerValues(Reader json) {
-        return new JSONDeserializer<List<ItxContainerContainerValue>>().
-        		use(null, ArrayList.class).
-        		use("values", ItxContainerContainerValue.class).
-        		
-        		deserialize(json);
-    }
-    
-	@Transactional
+        return new JSONDeserializer<List<ItxContainerContainerValue>>().use(null, ArrayList.class)
+                .use("values", ItxContainerContainerValue.class).
+
+                deserialize(json);
+    }
+
+    @Transactional
     public String toJson() {
         return new JSONSerializer().exclude("*.class")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(this);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
-    
-	@Transactional
+
+    @Transactional
     public static String toJsonArray(Collection<ItxContainerContainerValue> collection) {
         return new JSONSerializer().exclude("*.class")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(collection);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
 
-	@Transactional
+    @Transactional
     public static String toJsonArrayStub(Collection<ItxContainerContainerValue> collection) {
         return new JSONSerializer().exclude("*.class", "lsState")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(collection);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
-	
-	public static com.labsynch.labseer.domain.ItxContainerContainerValue create(com.labsynch.labseer.domain.ItxContainerContainerValue lsThingValue) {
-        ItxContainerContainerValue newItxContainerContainerValue = new JSONDeserializer<ItxContainerContainerValue>().use(null, ItxContainerContainerValue.class).deserializeInto(lsThingValue.toJson(), new ItxContainerContainerValue());
+
+    public static com.labsynch.labseer.domain.ItxContainerContainerValue create(
+            com.labsynch.labseer.domain.ItxContainerContainerValue lsThingValue) {
+        ItxContainerContainerValue newItxContainerContainerValue = new JSONDeserializer<ItxContainerContainerValue>()
+                .use(null, ItxContainerContainerValue.class)
+                .deserializeInto(lsThingValue.toJson(), new ItxContainerContainerValue());
         return newItxContainerContainerValue;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsState");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsState");
 
-	public static long countItxContainerContainerValues() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ItxContainerContainerValue o", Long.class).getSingleResult();
+    public static long countItxContainerContainerValues() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ItxContainerContainerValue o", Long.class)
+                .getSingleResult();
     }
 
-	public static List<ItxContainerContainerValue> findAllItxContainerContainerValues() {
-        return entityManager().createQuery("SELECT o FROM ItxContainerContainerValue o", ItxContainerContainerValue.class).getResultList();
+    public static List<ItxContainerContainerValue> findAllItxContainerContainerValues() {
+        return entityManager()
+                .createQuery("SELECT o FROM ItxContainerContainerValue o", ItxContainerContainerValue.class)
+                .getResultList();
     }
 
-	public static List<ItxContainerContainerValue> findAllItxContainerContainerValues(String sortFieldName, String sortOrder) {
+    public static List<ItxContainerContainerValue> findAllItxContainerContainerValues(String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxContainerContainerValue o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -160,16 +161,21 @@ public static List<ItxContainerContainerValue> findAllItxContainerContainerValue
         return entityManager().createQuery(jpaQuery, ItxContainerContainerValue.class).getResultList();
     }
 
-	public static ItxContainerContainerValue findItxContainerContainerValue(Long id) {
-        if (id == null) return null;
+    public static ItxContainerContainerValue findItxContainerContainerValue(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ItxContainerContainerValue.class, id);
     }
 
-	public static List<ItxContainerContainerValue> findItxContainerContainerValueEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxContainerContainerValue o", ItxContainerContainerValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ItxContainerContainerValue> findItxContainerContainerValueEntries(int firstResult,
+            int maxResults) {
+        return entityManager()
+                .createQuery("SELECT o FROM ItxContainerContainerValue o", ItxContainerContainerValue.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ItxContainerContainerValue> findItxContainerContainerValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ItxContainerContainerValue> findItxContainerContainerValueEntries(int firstResult,
+            int maxResults, String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxContainerContainerValue o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -177,22 +183,24 @@ public static List<ItxContainerContainerValue> findItxContainerContainerValueEnt
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ItxContainerContainerValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ItxContainerContainerValue.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public ItxContainerContainerValue merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ItxContainerContainerValue merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public ItxContainerContainerState getLsState() {
+    public ItxContainerContainerState getLsState() {
         return this.lsState;
     }
 
-	public void setLsState(ItxContainerContainerState lsState) {
+    public void setLsState(ItxContainerContainerState lsState) {
         this.lsState = lsState;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment.java b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment.java
index 0d8c87cf6..8040abd3a 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperiment.java
@@ -36,10 +36,10 @@
 @Configurable
 @Entity
 
-@Table(name="ITX_EXPT_EXPT")
+@Table(name = "ITX_EXPT_EXPT")
 public class ItxExperimentExperiment extends AbstractThing {
 
-	private static final Logger logger = LoggerFactory.getLogger(ItxExperimentExperiment.class);
+    private static final Logger logger = LoggerFactory.getLogger(ItxExperimentExperiment.class);
 
     @NotNull
     @ManyToOne(fetch = FetchType.EAGER)
@@ -55,123 +55,142 @@ public class ItxExperimentExperiment extends AbstractThing {
     private Set<ItxExperimentExperimentState> lsStates = new HashSet<ItxExperimentExperimentState>();
 
     public ItxExperimentExperiment(com.labsynch.labseer.domain.ItxExperimentExperiment itxExperiment) {
-    	this.setRecordedBy(itxExperiment.getRecordedBy());
-    	this.setRecordedDate(itxExperiment.getRecordedDate());
-    	this.setLsTransaction(itxExperiment.getLsTransaction());
-    	this.setModifiedBy(itxExperiment.getModifiedBy());
-    	this.setModifiedDate(itxExperiment.getModifiedDate());
-    	this.setCodeName(itxExperiment.getCodeName());
-    	this.setLsType(itxExperiment.getLsType());
-    	this.setLsKind(itxExperiment.getLsKind());
-    	this.setLsTypeAndKind(itxExperiment.getLsTypeAndKind());
+        this.setRecordedBy(itxExperiment.getRecordedBy());
+        this.setRecordedDate(itxExperiment.getRecordedDate());
+        this.setLsTransaction(itxExperiment.getLsTransaction());
+        this.setModifiedBy(itxExperiment.getModifiedBy());
+        this.setModifiedDate(itxExperiment.getModifiedDate());
+        this.setCodeName(itxExperiment.getCodeName());
+        this.setLsType(itxExperiment.getLsType());
+        this.setLsKind(itxExperiment.getLsKind());
+        this.setLsTypeAndKind(itxExperiment.getLsTypeAndKind());
         this.firstExperiment = itxExperiment.getFirstExperiment();
         this.secondExperiment = itxExperiment.getSecondExperiment();
     }
-    
+
     public static ItxExperimentExperiment update(ItxExperimentExperiment object) {
-    	ItxExperimentExperiment updatedObject = new JSONDeserializer<ItxExperimentExperiment>().use(null, ItxExperimentExperiment.class).
-        		deserializeInto(object.toJson(), 
-        				ItxExperimentExperiment.findItxExperimentExperiment(object.getId()));
-    	updatedObject.setModifiedDate(new Date());
-    	updatedObject.merge();
+        ItxExperimentExperiment updatedObject = new JSONDeserializer<ItxExperimentExperiment>()
+                .use(null, ItxExperimentExperiment.class).deserializeInto(object.toJson(),
+                        ItxExperimentExperiment.findItxExperimentExperiment(object.getId()));
+        updatedObject.setModifiedDate(new Date());
+        updatedObject.merge();
         return updatedObject;
     }
-    
+
     public String toJson() {
         return new JSONSerializer()
-        		.exclude("*.class")
-        		.include("firstExperiment.lsLabels", "secondExperiment.lsLabels")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(this);
+                .exclude("*.class")
+                .include("firstExperiment.lsLabels", "secondExperiment.lsLabels")
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
-    
+
     public static ItxExperimentExperiment fromJsonToItxExperimentExperiment(String json) {
         return new JSONDeserializer<ItxExperimentExperiment>()
-        		.use(null, ItxExperimentExperiment.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use(null, ItxExperimentExperiment.class)
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
-    
+
     public static String toJsonArray(Collection<ItxExperimentExperiment> collection) {
         return new JSONSerializer().exclude("*.class")
-        		.include("firstExperiment.lsLabels", "secondExperiment.lsLabels")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(collection);
+                .include("firstExperiment.lsLabels", "secondExperiment.lsLabels")
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
-    
+
     public static Collection<ItxExperimentExperiment> fromJsonArrayToItxExperimentExperiments(String json) {
         return new JSONDeserializer<List<ItxExperimentExperiment>>().use(null, ArrayList.class)
-        		.use("values", ItxExperimentExperiment.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use("values", ItxExperimentExperiment.class)
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
-    
+
     public static Collection<ItxExperimentExperiment> fromJsonArrayToItxExperimentExperiments(Reader json) {
         return new JSONDeserializer<List<ItxExperimentExperiment>>().use(null, ArrayList.class)
-        		.use("values", ItxExperimentExperiment.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use("values", ItxExperimentExperiment.class)
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
-    
+
     public static ItxExperimentExperiment updateNoStates(ItxExperimentExperiment itxExperimentExperiment) {
-    	ItxExperimentExperiment updatedItxExperimentExperiment = ItxExperimentExperiment.findItxExperimentExperiment(itxExperimentExperiment.getId());
-    	updatedItxExperimentExperiment.setRecordedBy(itxExperimentExperiment.getRecordedBy());
-    	updatedItxExperimentExperiment.setRecordedDate(itxExperimentExperiment.getRecordedDate());
-    	updatedItxExperimentExperiment.setIgnored(itxExperimentExperiment.isIgnored());
-    	updatedItxExperimentExperiment.setDeleted(itxExperimentExperiment.isDeleted());
-    	updatedItxExperimentExperiment.setLsTransaction(itxExperimentExperiment.getLsTransaction());
-    	updatedItxExperimentExperiment.setModifiedBy(itxExperimentExperiment.getModifiedBy());
-    	updatedItxExperimentExperiment.setCodeName(itxExperimentExperiment.getCodeName());
-    	updatedItxExperimentExperiment.setLsType(itxExperimentExperiment.getLsType());
-    	updatedItxExperimentExperiment.setLsKind(itxExperimentExperiment.getLsKind());
-    	updatedItxExperimentExperiment.setLsTypeAndKind(itxExperimentExperiment.getLsTypeAndKind());
-    	updatedItxExperimentExperiment.firstExperiment = Experiment.findExperiment(itxExperimentExperiment.getFirstExperiment().getId());
-    	updatedItxExperimentExperiment.secondExperiment = Experiment.findExperiment(itxExperimentExperiment.getSecondExperiment().getId());    	
-    	updatedItxExperimentExperiment.setModifiedDate(new Date());
-    	updatedItxExperimentExperiment.merge();
-    	
-    	logger.debug("------------ Just updated the itxExperimentExperiment: ");
-    	if(logger.isDebugEnabled()) logger.debug(updatedItxExperimentExperiment.toJson());
-    	
+        ItxExperimentExperiment updatedItxExperimentExperiment = ItxExperimentExperiment
+                .findItxExperimentExperiment(itxExperimentExperiment.getId());
+        updatedItxExperimentExperiment.setRecordedBy(itxExperimentExperiment.getRecordedBy());
+        updatedItxExperimentExperiment.setRecordedDate(itxExperimentExperiment.getRecordedDate());
+        updatedItxExperimentExperiment.setIgnored(itxExperimentExperiment.isIgnored());
+        updatedItxExperimentExperiment.setDeleted(itxExperimentExperiment.isDeleted());
+        updatedItxExperimentExperiment.setLsTransaction(itxExperimentExperiment.getLsTransaction());
+        updatedItxExperimentExperiment.setModifiedBy(itxExperimentExperiment.getModifiedBy());
+        updatedItxExperimentExperiment.setCodeName(itxExperimentExperiment.getCodeName());
+        updatedItxExperimentExperiment.setLsType(itxExperimentExperiment.getLsType());
+        updatedItxExperimentExperiment.setLsKind(itxExperimentExperiment.getLsKind());
+        updatedItxExperimentExperiment.setLsTypeAndKind(itxExperimentExperiment.getLsTypeAndKind());
+        updatedItxExperimentExperiment.firstExperiment = Experiment
+                .findExperiment(itxExperimentExperiment.getFirstExperiment().getId());
+        updatedItxExperimentExperiment.secondExperiment = Experiment
+                .findExperiment(itxExperimentExperiment.getSecondExperiment().getId());
+        updatedItxExperimentExperiment.setModifiedDate(new Date());
+        updatedItxExperimentExperiment.merge();
+
+        logger.debug("------------ Just updated the itxExperimentExperiment: ");
+        if (logger.isDebugEnabled())
+            logger.debug(updatedItxExperimentExperiment.toJson());
+
         return updatedItxExperimentExperiment;
     }
 
-	public static Long countFindItxExperimentExperimentsByFirstExperiment(Experiment firstExperiment) {
-        if (firstExperiment == null) throw new IllegalArgumentException("The firstExperiment argument is required");
+    public static Long countFindItxExperimentExperimentsByFirstExperiment(Experiment firstExperiment) {
+        if (firstExperiment == null)
+            throw new IllegalArgumentException("The firstExperiment argument is required");
         EntityManager em = ItxExperimentExperiment.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxExperimentExperiment AS o WHERE o.firstExperiment = :firstExperiment", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ItxExperimentExperiment AS o WHERE o.firstExperiment = :firstExperiment",
+                Long.class);
         q.setParameter("firstExperiment", firstExperiment);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindItxExperimentExperimentsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static Long countFindItxExperimentExperimentsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = ItxExperimentExperiment.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxExperimentExperiment AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ItxExperimentExperiment AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
         q.setParameter("lsTransaction", lsTransaction);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindItxExperimentExperimentsBySecondExperiment(Experiment secondExperiment) {
-        if (secondExperiment == null) throw new IllegalArgumentException("The secondExperiment argument is required");
+    public static Long countFindItxExperimentExperimentsBySecondExperiment(Experiment secondExperiment) {
+        if (secondExperiment == null)
+            throw new IllegalArgumentException("The secondExperiment argument is required");
         EntityManager em = ItxExperimentExperiment.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxExperimentExperiment AS o WHERE o.secondExperiment = :secondExperiment", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ItxExperimentExperiment AS o WHERE o.secondExperiment = :secondExperiment",
+                Long.class);
         q.setParameter("secondExperiment", secondExperiment);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<ItxExperimentExperiment> findItxExperimentExperimentsByFirstExperiment(Experiment firstExperiment) {
-        if (firstExperiment == null) throw new IllegalArgumentException("The firstExperiment argument is required");
+    public static TypedQuery<ItxExperimentExperiment> findItxExperimentExperimentsByFirstExperiment(
+            Experiment firstExperiment) {
+        if (firstExperiment == null)
+            throw new IllegalArgumentException("The firstExperiment argument is required");
         EntityManager em = ItxExperimentExperiment.entityManager();
-        TypedQuery<ItxExperimentExperiment> q = em.createQuery("SELECT o FROM ItxExperimentExperiment AS o WHERE o.firstExperiment = :firstExperiment", ItxExperimentExperiment.class);
+        TypedQuery<ItxExperimentExperiment> q = em.createQuery(
+                "SELECT o FROM ItxExperimentExperiment AS o WHERE o.firstExperiment = :firstExperiment",
+                ItxExperimentExperiment.class);
         q.setParameter("firstExperiment", firstExperiment);
         return q;
     }
 
-	public static TypedQuery<ItxExperimentExperiment> findItxExperimentExperimentsByFirstExperiment(Experiment firstExperiment, String sortFieldName, String sortOrder) {
-        if (firstExperiment == null) throw new IllegalArgumentException("The firstExperiment argument is required");
+    public static TypedQuery<ItxExperimentExperiment> findItxExperimentExperimentsByFirstExperiment(
+            Experiment firstExperiment, String sortFieldName, String sortOrder) {
+        if (firstExperiment == null)
+            throw new IllegalArgumentException("The firstExperiment argument is required");
         EntityManager em = ItxExperimentExperiment.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxExperimentExperiment AS o WHERE o.firstExperiment = :firstExperiment");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ItxExperimentExperiment AS o WHERE o.firstExperiment = :firstExperiment");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -183,18 +202,25 @@ public static TypedQuery<ItxExperimentExperiment> findItxExperimentExperimentsBy
         return q;
     }
 
-	public static TypedQuery<ItxExperimentExperiment> findItxExperimentExperimentsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<ItxExperimentExperiment> findItxExperimentExperimentsByLsTransactionEquals(
+            Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = ItxExperimentExperiment.entityManager();
-        TypedQuery<ItxExperimentExperiment> q = em.createQuery("SELECT o FROM ItxExperimentExperiment AS o WHERE o.lsTransaction = :lsTransaction", ItxExperimentExperiment.class);
+        TypedQuery<ItxExperimentExperiment> q = em.createQuery(
+                "SELECT o FROM ItxExperimentExperiment AS o WHERE o.lsTransaction = :lsTransaction",
+                ItxExperimentExperiment.class);
         q.setParameter("lsTransaction", lsTransaction);
         return q;
     }
 
-	public static TypedQuery<ItxExperimentExperiment> findItxExperimentExperimentsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<ItxExperimentExperiment> findItxExperimentExperimentsByLsTransactionEquals(
+            Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = ItxExperimentExperiment.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxExperimentExperiment AS o WHERE o.lsTransaction = :lsTransaction");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ItxExperimentExperiment AS o WHERE o.lsTransaction = :lsTransaction");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -206,18 +232,25 @@ public static TypedQuery<ItxExperimentExperiment> findItxExperimentExperimentsBy
         return q;
     }
 
-	public static TypedQuery<ItxExperimentExperiment> findItxExperimentExperimentsBySecondExperiment(Experiment secondExperiment) {
-        if (secondExperiment == null) throw new IllegalArgumentException("The secondExperiment argument is required");
+    public static TypedQuery<ItxExperimentExperiment> findItxExperimentExperimentsBySecondExperiment(
+            Experiment secondExperiment) {
+        if (secondExperiment == null)
+            throw new IllegalArgumentException("The secondExperiment argument is required");
         EntityManager em = ItxExperimentExperiment.entityManager();
-        TypedQuery<ItxExperimentExperiment> q = em.createQuery("SELECT o FROM ItxExperimentExperiment AS o WHERE o.secondExperiment = :secondExperiment", ItxExperimentExperiment.class);
+        TypedQuery<ItxExperimentExperiment> q = em.createQuery(
+                "SELECT o FROM ItxExperimentExperiment AS o WHERE o.secondExperiment = :secondExperiment",
+                ItxExperimentExperiment.class);
         q.setParameter("secondExperiment", secondExperiment);
         return q;
     }
 
-	public static TypedQuery<ItxExperimentExperiment> findItxExperimentExperimentsBySecondExperiment(Experiment secondExperiment, String sortFieldName, String sortOrder) {
-        if (secondExperiment == null) throw new IllegalArgumentException("The secondExperiment argument is required");
+    public static TypedQuery<ItxExperimentExperiment> findItxExperimentExperimentsBySecondExperiment(
+            Experiment secondExperiment, String sortFieldName, String sortOrder) {
+        if (secondExperiment == null)
+            throw new IllegalArgumentException("The secondExperiment argument is required");
         EntityManager em = ItxExperimentExperiment.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxExperimentExperiment AS o WHERE o.secondExperiment = :secondExperiment");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ItxExperimentExperiment AS o WHERE o.secondExperiment = :secondExperiment");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -229,41 +262,45 @@ public static TypedQuery<ItxExperimentExperiment> findItxExperimentExperimentsBy
         return q;
     }
 
-	public Experiment getFirstExperiment() {
+    public Experiment getFirstExperiment() {
         return this.firstExperiment;
     }
 
-	public void setFirstExperiment(Experiment firstExperiment) {
+    public void setFirstExperiment(Experiment firstExperiment) {
         this.firstExperiment = firstExperiment;
     }
 
-	public Experiment getSecondExperiment() {
+    public Experiment getSecondExperiment() {
         return this.secondExperiment;
     }
 
-	public void setSecondExperiment(Experiment secondExperiment) {
+    public void setSecondExperiment(Experiment secondExperiment) {
         this.secondExperiment = secondExperiment;
     }
 
-	public Set<ItxExperimentExperimentState> getLsStates() {
+    public Set<ItxExperimentExperimentState> getLsStates() {
         return this.lsStates;
     }
 
-	public void setLsStates(Set<ItxExperimentExperimentState> lsStates) {
+    public void setLsStates(Set<ItxExperimentExperimentState> lsStates) {
         this.lsStates = lsStates;
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "firstExperiment", "secondExperiment", "lsStates");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "firstExperiment",
+            "secondExperiment", "lsStates");
 
-	public static long countItxExperimentExperiments() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ItxExperimentExperiment o", Long.class).getSingleResult();
+    public static long countItxExperimentExperiments() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ItxExperimentExperiment o", Long.class)
+                .getSingleResult();
     }
 
-	public static List<ItxExperimentExperiment> findAllItxExperimentExperiments() {
-        return entityManager().createQuery("SELECT o FROM ItxExperimentExperiment o", ItxExperimentExperiment.class).getResultList();
+    public static List<ItxExperimentExperiment> findAllItxExperimentExperiments() {
+        return entityManager().createQuery("SELECT o FROM ItxExperimentExperiment o", ItxExperimentExperiment.class)
+                .getResultList();
     }
 
-	public static List<ItxExperimentExperiment> findAllItxExperimentExperiments(String sortFieldName, String sortOrder) {
+    public static List<ItxExperimentExperiment> findAllItxExperimentExperiments(String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxExperimentExperiment o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -274,16 +311,19 @@ public static List<ItxExperimentExperiment> findAllItxExperimentExperiments(Stri
         return entityManager().createQuery(jpaQuery, ItxExperimentExperiment.class).getResultList();
     }
 
-	public static ItxExperimentExperiment findItxExperimentExperiment(Long id) {
-        if (id == null) return null;
+    public static ItxExperimentExperiment findItxExperimentExperiment(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ItxExperimentExperiment.class, id);
     }
 
-	public static List<ItxExperimentExperiment> findItxExperimentExperimentEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxExperimentExperiment o", ItxExperimentExperiment.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ItxExperimentExperiment> findItxExperimentExperimentEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ItxExperimentExperiment o", ItxExperimentExperiment.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ItxExperimentExperiment> findItxExperimentExperimentEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ItxExperimentExperiment> findItxExperimentExperimentEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxExperimentExperiment o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -291,22 +331,24 @@ public static List<ItxExperimentExperiment> findItxExperimentExperimentEntries(i
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ItxExperimentExperiment.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ItxExperimentExperiment.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public ItxExperimentExperiment merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ItxExperimentExperiment merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public ItxExperimentExperiment() {
+    public ItxExperimentExperiment() {
         super();
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState.java b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState.java
index 6041f5d92..3e541cbe6 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentState.java
@@ -31,116 +31,118 @@
 @Entity
 @Configurable
 
-@Table(name="ITX_EXPT_EXPT_STATE")
+@Table(name = "ITX_EXPT_EXPT_STATE")
 public class ItxExperimentExperimentState extends AbstractState {
 
     public ItxExperimentExperimentState(ItxExperimentExperimentState itxState) {
-		this.setRecordedBy(itxState.getRecordedBy());
-		this.setRecordedDate(itxState.getRecordedDate());
-		this.setLsTransaction(itxState.getLsTransaction());
-		this.setModifiedBy(itxState.getModifiedBy());
-		this.setModifiedDate(itxState.getModifiedDate());
-		
-    }
-    
+        this.setRecordedBy(itxState.getRecordedBy());
+        this.setRecordedDate(itxState.getRecordedDate());
+        this.setLsTransaction(itxState.getLsTransaction());
+        this.setModifiedBy(itxState.getModifiedBy());
+        this.setModifiedDate(itxState.getModifiedDate());
+
+    }
+
     public static ItxExperimentExperimentState update(ItxExperimentExperimentState object) {
-    	ItxExperimentExperimentState updatedObject = new JSONDeserializer<ItxExperimentExperimentState>().use(null, ItxExperimentExperimentState.class).
-        		deserializeInto(object.toJson(), 
-        				ItxExperimentExperimentState.findItxExperimentExperimentState(object.getId()));
-    	updatedObject.setModifiedDate(new Date());
-    	updatedObject.merge();
+        ItxExperimentExperimentState updatedObject = new JSONDeserializer<ItxExperimentExperimentState>()
+                .use(null, ItxExperimentExperimentState.class).deserializeInto(object.toJson(),
+                        ItxExperimentExperimentState.findItxExperimentExperimentState(object.getId()));
+        updatedObject.setModifiedDate(new Date());
+        updatedObject.merge();
         return updatedObject;
     }
 
-	@ManyToOne
-	@JoinColumn(name = "itx_experiment_experiment")
+    @ManyToOne
+    @JoinColumn(name = "itx_experiment_experiment")
     private ItxExperimentExperiment itxExperimentExperiment;
 
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "lsState",  fetch =  FetchType.LAZY)
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "lsState", fetch = FetchType.LAZY)
     private Set<ItxExperimentExperimentValue> lsValues = new HashSet<ItxExperimentExperimentValue>();
-    
-    
-	@Transactional
+
+    @Transactional
     public String toJson() {
         return new JSONSerializer().exclude("*.class")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(this);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
 
-	@Transactional
+    @Transactional
     public String toJsonStub() {
         return new JSONSerializer().exclude("*.class", "itxExperimentExperiment")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(this);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
 
     public static ItxExperimentExperimentState fromJsonToItxContainerContainerState(String json) {
         return new JSONDeserializer<ItxExperimentExperimentState>().use(null, ItxExperimentExperimentState.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
-    
-	@Transactional
+
+    @Transactional
     public static String toJsonArray(Collection<ItxExperimentExperimentState> collection) {
         return new JSONSerializer().exclude("*.class")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(collection);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
 
-	@Transactional
+    @Transactional
     public static String toJsonArrayStub(Collection<ItxExperimentExperimentState> collection) {
         return new JSONSerializer().exclude("*.class", "itxExperimentExperiment")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(collection);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
-    
+
     public static Collection<ItxExperimentExperimentState> fromJsonArrayToItxExperimentExperimentStates(String json) {
         return new JSONDeserializer<List<ItxExperimentExperimentState>>().use(null, ArrayList.class)
-        		.use("values", ItxExperimentExperimentState.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use("values", ItxExperimentExperimentState.class)
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
 
     public static Collection<ItxExperimentExperimentState> fromJsonArrayToItxExperimentExperimentStates(Reader json) {
         return new JSONDeserializer<List<ItxExperimentExperimentState>>().use(null, ArrayList.class)
-        		.use("values", ItxExperimentExperimentState.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use("values", ItxExperimentExperimentState.class)
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
 
-
-
-	public ItxExperimentExperiment getItxExperimentExperiment() {
+    public ItxExperimentExperiment getItxExperimentExperiment() {
         return this.itxExperimentExperiment;
     }
 
-	public void setItxExperimentExperiment(ItxExperimentExperiment itxExperimentExperiment) {
+    public void setItxExperimentExperiment(ItxExperimentExperiment itxExperimentExperiment) {
         this.itxExperimentExperiment = itxExperimentExperiment;
     }
 
-	public Set<ItxExperimentExperimentValue> getLsValues() {
+    public Set<ItxExperimentExperimentValue> getLsValues() {
         return this.lsValues;
     }
 
-	public void setLsValues(Set<ItxExperimentExperimentValue> lsValues) {
+    public void setLsValues(Set<ItxExperimentExperimentValue> lsValues) {
         this.lsValues = lsValues;
     }
 
-	public ItxExperimentExperimentState() {
+    public ItxExperimentExperimentState() {
         super();
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("itxExperimentExperiment", "lsValues");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("itxExperimentExperiment",
+            "lsValues");
 
-	public static long countItxExperimentExperimentStates() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ItxExperimentExperimentState o", Long.class).getSingleResult();
+    public static long countItxExperimentExperimentStates() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ItxExperimentExperimentState o", Long.class)
+                .getSingleResult();
     }
 
-	public static List<ItxExperimentExperimentState> findAllItxExperimentExperimentStates() {
-        return entityManager().createQuery("SELECT o FROM ItxExperimentExperimentState o", ItxExperimentExperimentState.class).getResultList();
+    public static List<ItxExperimentExperimentState> findAllItxExperimentExperimentStates() {
+        return entityManager()
+                .createQuery("SELECT o FROM ItxExperimentExperimentState o", ItxExperimentExperimentState.class)
+                .getResultList();
     }
 
-	public static List<ItxExperimentExperimentState> findAllItxExperimentExperimentStates(String sortFieldName, String sortOrder) {
+    public static List<ItxExperimentExperimentState> findAllItxExperimentExperimentStates(String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxExperimentExperimentState o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -151,16 +153,21 @@ public static List<ItxExperimentExperimentState> findAllItxExperimentExperimentS
         return entityManager().createQuery(jpaQuery, ItxExperimentExperimentState.class).getResultList();
     }
 
-	public static ItxExperimentExperimentState findItxExperimentExperimentState(Long id) {
-        if (id == null) return null;
+    public static ItxExperimentExperimentState findItxExperimentExperimentState(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ItxExperimentExperimentState.class, id);
     }
 
-	public static List<ItxExperimentExperimentState> findItxExperimentExperimentStateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxExperimentExperimentState o", ItxExperimentExperimentState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ItxExperimentExperimentState> findItxExperimentExperimentStateEntries(int firstResult,
+            int maxResults) {
+        return entityManager()
+                .createQuery("SELECT o FROM ItxExperimentExperimentState o", ItxExperimentExperimentState.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ItxExperimentExperimentState> findItxExperimentExperimentStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ItxExperimentExperimentState> findItxExperimentExperimentStateEntries(int firstResult,
+            int maxResults, String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxExperimentExperimentState o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -168,23 +175,25 @@ public static List<ItxExperimentExperimentState> findItxExperimentExperimentStat
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ItxExperimentExperimentState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ItxExperimentExperimentState.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public ItxExperimentExperimentState merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ItxExperimentExperimentState merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public static ItxExperimentExperimentState fromJsonToItxExperimentExperimentState(String json) {
+    public static ItxExperimentExperimentState fromJsonToItxExperimentExperimentState(String json) {
         return new JSONDeserializer<ItxExperimentExperimentState>()
-        .use(null, ItxExperimentExperimentState.class).deserialize(json);
+                .use(null, ItxExperimentExperimentState.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue.java b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue.java
index 6ee9f3f62..f9d76b47a 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxExperimentExperimentValue.java
@@ -24,95 +24,97 @@
 @Configurable
 @Entity
 
-@Table(name="ITX_EXPT_EXPT_VALUE")
+@Table(name = "ITX_EXPT_EXPT_VALUE")
 public class ItxExperimentExperimentValue extends AbstractValue {
-		
+
     @ManyToOne
     @JoinColumn(name = "ls_state")
     private ItxExperimentExperimentState lsState;
-    
+
     public static ItxExperimentExperimentValue update(ItxExperimentExperimentValue object) {
-    	ItxExperimentExperimentValue updatedObject = new JSONDeserializer<ItxExperimentExperimentValue>().use(null, ItxExperimentExperimentValue.class).
-        		deserializeInto(object.toJson(), 
-        				ItxExperimentExperimentValue.findItxExperimentExperimentValue(object.getId()));
-    	updatedObject.setModifiedDate(new Date());
-    	updatedObject.merge();
+        ItxExperimentExperimentValue updatedObject = new JSONDeserializer<ItxExperimentExperimentValue>()
+                .use(null, ItxExperimentExperimentValue.class).deserializeInto(object.toJson(),
+                        ItxExperimentExperimentValue.findItxExperimentExperimentValue(object.getId()));
+        updatedObject.setModifiedDate(new Date());
+        updatedObject.merge();
         return updatedObject;
     }
-    
-    
+
     public static ItxExperimentExperimentValue fromJsonToItxExperimentExperimentValue(String json) {
-        return new JSONDeserializer<ItxExperimentExperimentValue>().
-        		use(null, ItxExperimentExperimentValue.class).
-        		
-        		deserialize(json);
+        return new JSONDeserializer<ItxExperimentExperimentValue>().use(null, ItxExperimentExperimentValue.class).
+
+                deserialize(json);
     }
-    
+
     public static Collection<ItxExperimentExperimentValue> fromJsonArrayToItxExperimentExperimentValues(String json) {
-        return new JSONDeserializer<List<ItxExperimentExperimentValue>>().
-        		use(null, ArrayList.class).
-        		use("values", ItxExperimentExperimentValue.class).
-        		
-        		deserialize(json);
+        return new JSONDeserializer<List<ItxExperimentExperimentValue>>().use(null, ArrayList.class)
+                .use("values", ItxExperimentExperimentValue.class).
+
+                deserialize(json);
     }
-    
+
     public static Collection<ItxExperimentExperimentValue> fromJsonArrayToItxExperimentExperimentValues(Reader json) {
-        return new JSONDeserializer<List<ItxExperimentExperimentValue>>().
-        		use(null, ArrayList.class).
-        		use("values", ItxExperimentExperimentValue.class).
-        		
-        		deserialize(json);
-    }
-    
-	@Transactional
+        return new JSONDeserializer<List<ItxExperimentExperimentValue>>().use(null, ArrayList.class)
+                .use("values", ItxExperimentExperimentValue.class).
+
+                deserialize(json);
+    }
+
+    @Transactional
     public String toJson() {
         return new JSONSerializer().exclude("*.class")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(this);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
-    
-	@Transactional
+
+    @Transactional
     public static String toJsonArray(Collection<ItxExperimentExperimentValue> collection) {
         return new JSONSerializer().exclude("*.class")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(collection);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
 
-	@Transactional
+    @Transactional
     public static String toJsonArrayStub(Collection<ItxExperimentExperimentValue> collection) {
         return new JSONSerializer().exclude("*.class", "lsState")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(collection);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
-	
-	public static ItxExperimentExperimentValue create(ItxExperimentExperimentValue lsThingValue) {
-        ItxExperimentExperimentValue newItxExperimentExperimentValue = new JSONDeserializer<ItxExperimentExperimentValue>().use(null, ItxExperimentExperimentValue.class).deserializeInto(lsThingValue.toJson(), new ItxExperimentExperimentValue());
+
+    public static ItxExperimentExperimentValue create(ItxExperimentExperimentValue lsThingValue) {
+        ItxExperimentExperimentValue newItxExperimentExperimentValue = new JSONDeserializer<ItxExperimentExperimentValue>()
+                .use(null, ItxExperimentExperimentValue.class)
+                .deserializeInto(lsThingValue.toJson(), new ItxExperimentExperimentValue());
         return newItxExperimentExperimentValue;
     }
 
-	public ItxExperimentExperimentState getLsState() {
+    public ItxExperimentExperimentState getLsState() {
         return this.lsState;
     }
 
-	public void setLsState(ItxExperimentExperimentState lsState) {
+    public void setLsState(ItxExperimentExperimentState lsState) {
         this.lsState = lsState;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsState");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsState");
 
-	public static long countItxExperimentExperimentValues() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ItxExperimentExperimentValue o", Long.class).getSingleResult();
+    public static long countItxExperimentExperimentValues() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ItxExperimentExperimentValue o", Long.class)
+                .getSingleResult();
     }
 
-	public static List<ItxExperimentExperimentValue> findAllItxExperimentExperimentValues() {
-        return entityManager().createQuery("SELECT o FROM ItxExperimentExperimentValue o", ItxExperimentExperimentValue.class).getResultList();
+    public static List<ItxExperimentExperimentValue> findAllItxExperimentExperimentValues() {
+        return entityManager()
+                .createQuery("SELECT o FROM ItxExperimentExperimentValue o", ItxExperimentExperimentValue.class)
+                .getResultList();
     }
 
-	public static List<ItxExperimentExperimentValue> findAllItxExperimentExperimentValues(String sortFieldName, String sortOrder) {
+    public static List<ItxExperimentExperimentValue> findAllItxExperimentExperimentValues(String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxExperimentExperimentValue o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -123,16 +125,21 @@ public static List<ItxExperimentExperimentValue> findAllItxExperimentExperimentV
         return entityManager().createQuery(jpaQuery, ItxExperimentExperimentValue.class).getResultList();
     }
 
-	public static ItxExperimentExperimentValue findItxExperimentExperimentValue(Long id) {
-        if (id == null) return null;
+    public static ItxExperimentExperimentValue findItxExperimentExperimentValue(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ItxExperimentExperimentValue.class, id);
     }
 
-	public static List<ItxExperimentExperimentValue> findItxExperimentExperimentValueEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxExperimentExperimentValue o", ItxExperimentExperimentValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ItxExperimentExperimentValue> findItxExperimentExperimentValueEntries(int firstResult,
+            int maxResults) {
+        return entityManager()
+                .createQuery("SELECT o FROM ItxExperimentExperimentValue o", ItxExperimentExperimentValue.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ItxExperimentExperimentValue> findItxExperimentExperimentValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ItxExperimentExperimentValue> findItxExperimentExperimentValueEntries(int firstResult,
+            int maxResults, String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxExperimentExperimentValue o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -140,12 +147,14 @@ public static List<ItxExperimentExperimentValue> findItxExperimentExperimentValu
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ItxExperimentExperimentValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ItxExperimentExperimentValue.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public ItxExperimentExperimentValue merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ItxExperimentExperimentValue merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing.java b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing.java
index 95b366555..1b99d82e1 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThing.java
@@ -38,7 +38,7 @@
 
 public class ItxLsThingLsThing extends AbstractThing {
 
-	private static final Logger logger = LoggerFactory.getLogger(ItxLsThingLsThing.class);
+    private static final Logger logger = LoggerFactory.getLogger(ItxLsThingLsThing.class);
 
     @NotNull
     @ManyToOne(fetch = FetchType.EAGER)
@@ -54,303 +54,337 @@ public class ItxLsThingLsThing extends AbstractThing {
     private Set<ItxLsThingLsThingState> lsStates = new HashSet<ItxLsThingLsThingState>();
 
     public ItxLsThingLsThing(com.labsynch.labseer.domain.ItxLsThingLsThing itxLsThingLsThing) {
-    	this.setRecordedBy(itxLsThingLsThing.getRecordedBy());
-    	this.setRecordedDate(itxLsThingLsThing.getRecordedDate());
-    	this.setIgnored(itxLsThingLsThing.isIgnored());
-    	this.setDeleted(itxLsThingLsThing.isDeleted());
-    	this.setLsTransaction(itxLsThingLsThing.getLsTransaction());
-    	this.setModifiedBy(itxLsThingLsThing.getModifiedBy());
-    	this.setModifiedDate(itxLsThingLsThing.getModifiedDate());
-    	this.setCodeName(itxLsThingLsThing.getCodeName());
-    	this.setLsType(itxLsThingLsThing.getLsType());
-    	this.setLsKind(itxLsThingLsThing.getLsKind());
-    	this.setLsTypeAndKind(itxLsThingLsThing.getLsTypeAndKind());
+        this.setRecordedBy(itxLsThingLsThing.getRecordedBy());
+        this.setRecordedDate(itxLsThingLsThing.getRecordedDate());
+        this.setIgnored(itxLsThingLsThing.isIgnored());
+        this.setDeleted(itxLsThingLsThing.isDeleted());
+        this.setLsTransaction(itxLsThingLsThing.getLsTransaction());
+        this.setModifiedBy(itxLsThingLsThing.getModifiedBy());
+        this.setModifiedDate(itxLsThingLsThing.getModifiedDate());
+        this.setCodeName(itxLsThingLsThing.getCodeName());
+        this.setLsType(itxLsThingLsThing.getLsType());
+        this.setLsKind(itxLsThingLsThing.getLsKind());
+        this.setLsTypeAndKind(itxLsThingLsThing.getLsTypeAndKind());
         this.firstLsThing = LsThing.findLsThing(itxLsThingLsThing.getFirstLsThing().getId());
         this.secondLsThing = LsThing.findLsThing(itxLsThingLsThing.getSecondLsThing().getId());
     }
-        
+
     public static ItxLsThingLsThing update(ItxLsThingLsThing itxLsThingLsThing) {
-    	ItxLsThingLsThing updatedItxLsThingLsThing = ItxLsThingLsThing.findItxLsThingLsThing(itxLsThingLsThing.getId());
-    	updatedItxLsThingLsThing.setRecordedBy(itxLsThingLsThing.getRecordedBy());
-    	updatedItxLsThingLsThing.setRecordedDate(itxLsThingLsThing.getRecordedDate());
-    	updatedItxLsThingLsThing.setIgnored(itxLsThingLsThing.isIgnored());
-    	updatedItxLsThingLsThing.setDeleted(itxLsThingLsThing.isDeleted());
-    	updatedItxLsThingLsThing.setLsTransaction(itxLsThingLsThing.getLsTransaction());
-    	updatedItxLsThingLsThing.setModifiedBy(itxLsThingLsThing.getModifiedBy());
-    	updatedItxLsThingLsThing.setCodeName(itxLsThingLsThing.getCodeName());
-    	updatedItxLsThingLsThing.setLsType(itxLsThingLsThing.getLsType());
-    	updatedItxLsThingLsThing.setLsKind(itxLsThingLsThing.getLsKind());
-    	updatedItxLsThingLsThing.setLsTypeAndKind(itxLsThingLsThing.getLsTypeAndKind());
-    	updatedItxLsThingLsThing.firstLsThing = LsThing.findLsThing(itxLsThingLsThing.getFirstLsThing().getId());
-    	updatedItxLsThingLsThing.secondLsThing = LsThing.findLsThing(itxLsThingLsThing.getSecondLsThing().getId());    	
-    	updatedItxLsThingLsThing.setModifiedDate(new Date());
-    	updatedItxLsThingLsThing.setLsStates(itxLsThingLsThing.getLsStates());
-    	updatedItxLsThingLsThing.merge();
+        ItxLsThingLsThing updatedItxLsThingLsThing = ItxLsThingLsThing.findItxLsThingLsThing(itxLsThingLsThing.getId());
+        updatedItxLsThingLsThing.setRecordedBy(itxLsThingLsThing.getRecordedBy());
+        updatedItxLsThingLsThing.setRecordedDate(itxLsThingLsThing.getRecordedDate());
+        updatedItxLsThingLsThing.setIgnored(itxLsThingLsThing.isIgnored());
+        updatedItxLsThingLsThing.setDeleted(itxLsThingLsThing.isDeleted());
+        updatedItxLsThingLsThing.setLsTransaction(itxLsThingLsThing.getLsTransaction());
+        updatedItxLsThingLsThing.setModifiedBy(itxLsThingLsThing.getModifiedBy());
+        updatedItxLsThingLsThing.setCodeName(itxLsThingLsThing.getCodeName());
+        updatedItxLsThingLsThing.setLsType(itxLsThingLsThing.getLsType());
+        updatedItxLsThingLsThing.setLsKind(itxLsThingLsThing.getLsKind());
+        updatedItxLsThingLsThing.setLsTypeAndKind(itxLsThingLsThing.getLsTypeAndKind());
+        updatedItxLsThingLsThing.firstLsThing = LsThing.findLsThing(itxLsThingLsThing.getFirstLsThing().getId());
+        updatedItxLsThingLsThing.secondLsThing = LsThing.findLsThing(itxLsThingLsThing.getSecondLsThing().getId());
+        updatedItxLsThingLsThing.setModifiedDate(new Date());
+        updatedItxLsThingLsThing.setLsStates(itxLsThingLsThing.getLsStates());
+        updatedItxLsThingLsThing.merge();
         return updatedItxLsThingLsThing;
     }
-    
+
     public static ItxLsThingLsThing updateNoMerge(ItxLsThingLsThing itxLsThingLsThing) {
-    	ItxLsThingLsThing updatedItxLsThingLsThing = ItxLsThingLsThing.findItxLsThingLsThing(itxLsThingLsThing.getId());
-    	updatedItxLsThingLsThing.setRecordedBy(itxLsThingLsThing.getRecordedBy());
-    	updatedItxLsThingLsThing.setRecordedDate(itxLsThingLsThing.getRecordedDate());
-    	updatedItxLsThingLsThing.setIgnored(itxLsThingLsThing.isIgnored());
-    	updatedItxLsThingLsThing.setDeleted(itxLsThingLsThing.isDeleted());
-    	updatedItxLsThingLsThing.setLsTransaction(itxLsThingLsThing.getLsTransaction());
-    	updatedItxLsThingLsThing.setModifiedBy(itxLsThingLsThing.getModifiedBy());
-    	updatedItxLsThingLsThing.setCodeName(itxLsThingLsThing.getCodeName());
-    	updatedItxLsThingLsThing.setLsType(itxLsThingLsThing.getLsType());
-    	updatedItxLsThingLsThing.setLsKind(itxLsThingLsThing.getLsKind());
-    	updatedItxLsThingLsThing.setLsTypeAndKind(itxLsThingLsThing.getLsTypeAndKind());
-    	updatedItxLsThingLsThing.firstLsThing = LsThing.findLsThing(itxLsThingLsThing.getFirstLsThing().getId());
-    	updatedItxLsThingLsThing.secondLsThing = LsThing.findLsThing(itxLsThingLsThing.getSecondLsThing().getId());    	
-    	updatedItxLsThingLsThing.setModifiedDate(new Date());
-    	updatedItxLsThingLsThing.setLsStates(itxLsThingLsThing.getLsStates());
+        ItxLsThingLsThing updatedItxLsThingLsThing = ItxLsThingLsThing.findItxLsThingLsThing(itxLsThingLsThing.getId());
+        updatedItxLsThingLsThing.setRecordedBy(itxLsThingLsThing.getRecordedBy());
+        updatedItxLsThingLsThing.setRecordedDate(itxLsThingLsThing.getRecordedDate());
+        updatedItxLsThingLsThing.setIgnored(itxLsThingLsThing.isIgnored());
+        updatedItxLsThingLsThing.setDeleted(itxLsThingLsThing.isDeleted());
+        updatedItxLsThingLsThing.setLsTransaction(itxLsThingLsThing.getLsTransaction());
+        updatedItxLsThingLsThing.setModifiedBy(itxLsThingLsThing.getModifiedBy());
+        updatedItxLsThingLsThing.setCodeName(itxLsThingLsThing.getCodeName());
+        updatedItxLsThingLsThing.setLsType(itxLsThingLsThing.getLsType());
+        updatedItxLsThingLsThing.setLsKind(itxLsThingLsThing.getLsKind());
+        updatedItxLsThingLsThing.setLsTypeAndKind(itxLsThingLsThing.getLsTypeAndKind());
+        updatedItxLsThingLsThing.firstLsThing = LsThing.findLsThing(itxLsThingLsThing.getFirstLsThing().getId());
+        updatedItxLsThingLsThing.secondLsThing = LsThing.findLsThing(itxLsThingLsThing.getSecondLsThing().getId());
+        updatedItxLsThingLsThing.setModifiedDate(new Date());
+        updatedItxLsThingLsThing.setLsStates(itxLsThingLsThing.getLsStates());
         return updatedItxLsThingLsThing;
     }
-    
+
     public static ItxLsThingLsThing updateNoStates(ItxLsThingLsThing itxLsThingLsThing) {
-    	ItxLsThingLsThing updatedItxLsThingLsThing = ItxLsThingLsThing.findItxLsThingLsThing(itxLsThingLsThing.getId());
-    	updatedItxLsThingLsThing.setRecordedBy(itxLsThingLsThing.getRecordedBy());
-    	updatedItxLsThingLsThing.setRecordedDate(itxLsThingLsThing.getRecordedDate());
-    	updatedItxLsThingLsThing.setIgnored(itxLsThingLsThing.isIgnored());
-    	updatedItxLsThingLsThing.setDeleted(itxLsThingLsThing.isDeleted());
-    	updatedItxLsThingLsThing.setLsTransaction(itxLsThingLsThing.getLsTransaction());
-    	updatedItxLsThingLsThing.setModifiedBy(itxLsThingLsThing.getModifiedBy());
-    	updatedItxLsThingLsThing.setCodeName(itxLsThingLsThing.getCodeName());
-    	updatedItxLsThingLsThing.setLsType(itxLsThingLsThing.getLsType());
-    	updatedItxLsThingLsThing.setLsKind(itxLsThingLsThing.getLsKind());
-    	updatedItxLsThingLsThing.setLsTypeAndKind(itxLsThingLsThing.getLsTypeAndKind());
-    	updatedItxLsThingLsThing.firstLsThing = LsThing.findLsThing(itxLsThingLsThing.getFirstLsThing().getId());
-    	updatedItxLsThingLsThing.secondLsThing = LsThing.findLsThing(itxLsThingLsThing.getSecondLsThing().getId());    	
-    	updatedItxLsThingLsThing.setModifiedDate(new Date());
-    	updatedItxLsThingLsThing.merge();
-    	
-    	logger.debug("------------ Just updated the itxLsThingLsthing: ");
-    	if(logger.isDebugEnabled()) logger.debug(updatedItxLsThingLsThing.toJson());
-    	
+        ItxLsThingLsThing updatedItxLsThingLsThing = ItxLsThingLsThing.findItxLsThingLsThing(itxLsThingLsThing.getId());
+        updatedItxLsThingLsThing.setRecordedBy(itxLsThingLsThing.getRecordedBy());
+        updatedItxLsThingLsThing.setRecordedDate(itxLsThingLsThing.getRecordedDate());
+        updatedItxLsThingLsThing.setIgnored(itxLsThingLsThing.isIgnored());
+        updatedItxLsThingLsThing.setDeleted(itxLsThingLsThing.isDeleted());
+        updatedItxLsThingLsThing.setLsTransaction(itxLsThingLsThing.getLsTransaction());
+        updatedItxLsThingLsThing.setModifiedBy(itxLsThingLsThing.getModifiedBy());
+        updatedItxLsThingLsThing.setCodeName(itxLsThingLsThing.getCodeName());
+        updatedItxLsThingLsThing.setLsType(itxLsThingLsThing.getLsType());
+        updatedItxLsThingLsThing.setLsKind(itxLsThingLsThing.getLsKind());
+        updatedItxLsThingLsThing.setLsTypeAndKind(itxLsThingLsThing.getLsTypeAndKind());
+        updatedItxLsThingLsThing.firstLsThing = LsThing.findLsThing(itxLsThingLsThing.getFirstLsThing().getId());
+        updatedItxLsThingLsThing.secondLsThing = LsThing.findLsThing(itxLsThingLsThing.getSecondLsThing().getId());
+        updatedItxLsThingLsThing.setModifiedDate(new Date());
+        updatedItxLsThingLsThing.merge();
+
+        logger.debug("------------ Just updated the itxLsThingLsthing: ");
+        if (logger.isDebugEnabled())
+            logger.debug(updatedItxLsThingLsThing.toJson());
+
         return updatedItxLsThingLsThing;
     }
-        
+
     public static ItxLsThingLsThing fromJsonToItxLsThingLsThing(String json) {
         return new JSONDeserializer<ItxLsThingLsThing>()
-        		.use(null, ItxLsThingLsThing.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use(null, ItxLsThingLsThing.class)
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
-    
+
     public static String toJsonArray(Collection<ItxLsThingLsThing> collection) {
-        return new JSONSerializer().include("lsStates.lsValues").exclude("*.class", "lsStates.itxLsThingLsThing", "lsStates.lsValues.lsState")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(collection);
+        return new JSONSerializer().include("lsStates.lsValues")
+                .exclude("*.class", "lsStates.itxLsThingLsThing", "lsStates.lsValues.lsState")
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
-    
+
     public static Collection<ItxLsThingLsThing> fromJsonArrayToItxLsThingLsThings(String json) {
         return new JSONDeserializer<List<ItxLsThingLsThing>>().use(null, ArrayList.class)
-        		.use("values", ItxLsThingLsThing.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use("values", ItxLsThingLsThing.class)
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
-    
+
     public static Collection<ItxLsThingLsThing> fromJsonArrayToItxLsThingLsThings(Reader json) {
         return new JSONDeserializer<List<ItxLsThingLsThing>>().use(null, ArrayList.class)
-        		.use("values", ItxLsThingLsThing.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
-    }
-    
-    public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind){
-    	if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+                .use("values", ItxLsThingLsThing.class)
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
+    }
+
+    public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsByLsTypeEqualsAndLsKindEquals(String lsType,
+            String lsKind) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         boolean ignored = true;
         EntityManager em = ItxLsThingLsThing.entityManager();
-		String query = "SELECT DISTINCT o FROM ItxLsThingLsThing o " +
-				"WHERE o.ignored IS NOT :ignored " +
-				"AND o.lsType = :lsType " +
-				"AND o.lsKind = :lsKind ";
+        String query = "SELECT DISTINCT o FROM ItxLsThingLsThing o " +
+                "WHERE o.ignored IS NOT :ignored " +
+                "AND o.lsType = :lsType " +
+                "AND o.lsKind = :lsKind ";
         TypedQuery<ItxLsThingLsThing> q = em.createQuery(query, ItxLsThingLsThing.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         q.setParameter("ignored", ignored);
-        
+
         return q;
     }
-    
-    public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsByTypeAndKindAndFirstLsThingEqualsAndSecondLsThingEquals(String lsType, String lsKind, LsThing firstLsThing, LsThing secondLsThing){
-    	if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (firstLsThing == null) throw new IllegalArgumentException("The firstLsThing argument is required");
-        if (secondLsThing == null) throw new IllegalArgumentException("The secondLsThing argument is required");
+
+    public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsByTypeAndKindAndFirstLsThingEqualsAndSecondLsThingEquals(
+            String lsType, String lsKind, LsThing firstLsThing, LsThing secondLsThing) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (firstLsThing == null)
+            throw new IllegalArgumentException("The firstLsThing argument is required");
+        if (secondLsThing == null)
+            throw new IllegalArgumentException("The secondLsThing argument is required");
         boolean ignored = true;
         EntityManager em = ItxLsThingLsThing.entityManager();
-		String query = "SELECT DISTINCT o FROM ItxLsThingLsThing o " +
-				"WHERE o.ignored IS NOT :ignored " +
-				"AND o.lsType = :lsType " +
-				"AND o.lsKind = :lsKind " +
-				"AND o.firstLsThing = :firstLsThing " +
-				"AND o.secondLsThing = :secondLsThing ";
+        String query = "SELECT DISTINCT o FROM ItxLsThingLsThing o " +
+                "WHERE o.ignored IS NOT :ignored " +
+                "AND o.lsType = :lsType " +
+                "AND o.lsKind = :lsKind " +
+                "AND o.firstLsThing = :firstLsThing " +
+                "AND o.secondLsThing = :secondLsThing ";
         TypedQuery<ItxLsThingLsThing> q = em.createQuery(query, ItxLsThingLsThing.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         q.setParameter("firstLsThing", firstLsThing);
         q.setParameter("secondLsThing", secondLsThing);
         q.setParameter("ignored", ignored);
-        
+
         return q;
     }
-    
-    public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsNotTypeAndKindAndFirstLsThingEquals(String lsType, String lsKind, LsThing firstLsThing){
-    	if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (firstLsThing == null) throw new IllegalArgumentException("The firstLsThing argument is required");
+
+    public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsNotTypeAndKindAndFirstLsThingEquals(String lsType,
+            String lsKind, LsThing firstLsThing) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (firstLsThing == null)
+            throw new IllegalArgumentException("The firstLsThing argument is required");
         boolean ignored = true;
         EntityManager em = ItxLsThingLsThing.entityManager();
-		String query = "SELECT DISTINCT o FROM ItxLsThingLsThing o " +
-				"WHERE o.ignored IS NOT :ignored " +
-				"AND o.lsType <> :lsType " +
-				"AND o.lsKind <> :lsKind " +
-				"AND o.firstLsThing = :firstLsThing ";
+        String query = "SELECT DISTINCT o FROM ItxLsThingLsThing o " +
+                "WHERE o.ignored IS NOT :ignored " +
+                "AND o.lsType <> :lsType " +
+                "AND o.lsKind <> :lsKind " +
+                "AND o.firstLsThing = :firstLsThing ";
         TypedQuery<ItxLsThingLsThing> q = em.createQuery(query, ItxLsThingLsThing.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
-        q.setParameter("firstLsThing", firstLsThing);        
+        q.setParameter("firstLsThing", firstLsThing);
         q.setParameter("ignored", ignored);
-        
+
         return q;
     }
 
-    public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsNotTypeAndKindAndSecondLsThingEquals(String lsType, String lsKind, LsThing secondLsThing){
-    	if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (secondLsThing == null) throw new IllegalArgumentException("The secondLsThing argument is required");
+    public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsNotTypeAndKindAndSecondLsThingEquals(
+            String lsType, String lsKind, LsThing secondLsThing) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (secondLsThing == null)
+            throw new IllegalArgumentException("The secondLsThing argument is required");
         boolean ignored = true;
         EntityManager em = ItxLsThingLsThing.entityManager();
-		String query = "SELECT DISTINCT o FROM ItxLsThingLsThing o " +
-				"WHERE o.ignored IS NOT :ignored " +
-				"AND o.lsType <> :lsType " +
-				"AND o.lsKind <> :lsKind " +
-				"AND o.secondLsThing = :secondLsThing ";
+        String query = "SELECT DISTINCT o FROM ItxLsThingLsThing o " +
+                "WHERE o.ignored IS NOT :ignored " +
+                "AND o.lsType <> :lsType " +
+                "AND o.lsKind <> :lsKind " +
+                "AND o.secondLsThing = :secondLsThing ";
         TypedQuery<ItxLsThingLsThing> q = em.createQuery(query, ItxLsThingLsThing.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
-        q.setParameter("secondLsThing", secondLsThing);        
+        q.setParameter("secondLsThing", secondLsThing);
         q.setParameter("ignored", ignored);
-        
+
         return q;
     }
 
-    
-    public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndFirstLsThingEquals(String lsType, String lsKind, LsThing firstLsThing){
-    	if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (firstLsThing == null) throw new IllegalArgumentException("The firstLsThing argument is required");
+    public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndFirstLsThingEquals(
+            String lsType, String lsKind, LsThing firstLsThing) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (firstLsThing == null)
+            throw new IllegalArgumentException("The firstLsThing argument is required");
         boolean ignored = true;
         EntityManager em = ItxLsThingLsThing.entityManager();
-		String query = "SELECT DISTINCT o FROM ItxLsThingLsThing o " +
-				"WHERE o.ignored IS NOT :ignored " +
-				"AND o.lsType = :lsType " +
-				"AND o.lsKind = :lsKind " +
-				"AND o.firstLsThing = :firstLsThing ";
+        String query = "SELECT DISTINCT o FROM ItxLsThingLsThing o " +
+                "WHERE o.ignored IS NOT :ignored " +
+                "AND o.lsType = :lsType " +
+                "AND o.lsKind = :lsKind " +
+                "AND o.firstLsThing = :firstLsThing ";
         TypedQuery<ItxLsThingLsThing> q = em.createQuery(query, ItxLsThingLsThing.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
-        q.setParameter("firstLsThing", firstLsThing);        
+        q.setParameter("firstLsThing", firstLsThing);
         q.setParameter("ignored", ignored);
-        
+
         return q;
     }
-    
-    public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndSecondLsThingEquals(String lsType, String lsKind, LsThing secondLsThing){
-    	if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (secondLsThing == null) throw new IllegalArgumentException("The secondLsThing argument is required");
+
+    public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndSecondLsThingEquals(
+            String lsType, String lsKind, LsThing secondLsThing) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (secondLsThing == null)
+            throw new IllegalArgumentException("The secondLsThing argument is required");
         boolean ignored = true;
         EntityManager em = ItxLsThingLsThing.entityManager();
-		String query = "SELECT DISTINCT o FROM ItxLsThingLsThing o " +
-				"WHERE o.ignored IS NOT :ignored " +
-				"AND o.lsType = :lsType " +
-				"AND o.lsKind = :lsKind " +
-				"AND o.secondLsThing = :secondLsThing ";
+        String query = "SELECT DISTINCT o FROM ItxLsThingLsThing o " +
+                "WHERE o.ignored IS NOT :ignored " +
+                "AND o.lsType = :lsType " +
+                "AND o.lsKind = :lsKind " +
+                "AND o.secondLsThing = :secondLsThing ";
         TypedQuery<ItxLsThingLsThing> q = em.createQuery(query, ItxLsThingLsThing.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
-        q.setParameter("secondLsThing", secondLsThing);        
+        q.setParameter("secondLsThing", secondLsThing);
         q.setParameter("ignored", ignored);
-        
+
         return q;
     }
-    
-    public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndSecondLsThingEqualsAndOrderEquals(String lsType, String lsKind, LsThing secondLsThing, int order){
-    	if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (secondLsThing == null) throw new IllegalArgumentException("The secondLsThing argument is required");
-        
+
+    public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndSecondLsThingEqualsAndOrderEquals(
+            String lsType, String lsKind, LsThing secondLsThing, int order) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (secondLsThing == null)
+            throw new IllegalArgumentException("The secondLsThing argument is required");
+
         boolean ignored = true;
-        
+
         EntityManager em = ItxLsThingLsThing.entityManager();
-		String query = "SELECT DISTINCT o FROM ItxLsThingLsThing o " +
-				"JOIN o.lsStates itxstate JOIN itxstate.lsValues itxvalue WITH itxvalue.lsKind = 'order' " +
-				"WHERE o.ignored IS NOT :ignored " +
-				"AND o.lsType = :lsType " +
-				"AND o.lsKind = :lsKind " +
-				"AND itxvalue.numericValue = :order " +
-				"AND o.secondLsThing = :secondLsThing ";
-        
+        String query = "SELECT DISTINCT o FROM ItxLsThingLsThing o " +
+                "JOIN o.lsStates itxstate JOIN itxstate.lsValues itxvalue WITH itxvalue.lsKind = 'order' " +
+                "WHERE o.ignored IS NOT :ignored " +
+                "AND o.lsType = :lsType " +
+                "AND o.lsKind = :lsKind " +
+                "AND itxvalue.numericValue = :order " +
+                "AND o.secondLsThing = :secondLsThing ";
+
         TypedQuery<ItxLsThingLsThing> q = em.createQuery(query, ItxLsThingLsThing.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         q.setParameter("order", new BigDecimal(order));
-        q.setParameter("secondLsThing", secondLsThing);        
+        q.setParameter("secondLsThing", secondLsThing);
         q.setParameter("ignored", ignored);
-        
+
         return q;
     }
-    
-    public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndFirstLsThingEqualsAndSecondLsThingEquals(String lsType, String lsKind, LsThing firstLsThing, LsThing secondLsThing){
-    	if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (firstLsThing == null) throw new IllegalArgumentException("The firstLsThing argument is required");
-        if (secondLsThing == null) throw new IllegalArgumentException("The secondLsThing argument is required");
-        
+
+    public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndFirstLsThingEqualsAndSecondLsThingEquals(
+            String lsType, String lsKind, LsThing firstLsThing, LsThing secondLsThing) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (firstLsThing == null)
+            throw new IllegalArgumentException("The firstLsThing argument is required");
+        if (secondLsThing == null)
+            throw new IllegalArgumentException("The secondLsThing argument is required");
+
         boolean ignored = true;
-        
+
         EntityManager em = ItxLsThingLsThing.entityManager();
-		String query = "SELECT DISTINCT o FROM ItxLsThingLsThing o " +
-				"WHERE o.ignored IS NOT :ignored " +
-				"AND o.lsType = :lsType " +
-				"AND o.lsKind = :lsKind " +
-				"AND o.firstLsThing = :firstLsThing " +
-				"AND o.secondLsThing = :secondLsThing ";
-        
+        String query = "SELECT DISTINCT o FROM ItxLsThingLsThing o " +
+                "WHERE o.ignored IS NOT :ignored " +
+                "AND o.lsType = :lsType " +
+                "AND o.lsKind = :lsKind " +
+                "AND o.firstLsThing = :firstLsThing " +
+                "AND o.secondLsThing = :secondLsThing ";
+
         TypedQuery<ItxLsThingLsThing> q = em.createQuery(query, ItxLsThingLsThing.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
-        q.setParameter("firstLsThing", firstLsThing);        
-        q.setParameter("secondLsThing", secondLsThing);        
+        q.setParameter("firstLsThing", firstLsThing);
+        q.setParameter("secondLsThing", secondLsThing);
         q.setParameter("ignored", ignored);
-        
+
         return q;
     }
-    
+
     public int retrieveOrder() {
-    	EntityManager em = ItxLsThingLsThing.entityManager();
-		String query = "SELECT v.numericValue FROM ItxLsThingLsThingValue v " +
-				"JOIN v.lsState s " + 
-				"JOIN s.itxLsThingLsThing iltilt " +
-				"WHERE s.lsType = 'metadata' " +
-				"AND s.lsKind = 'composition' " +
-				"AND v.lsType = 'numericValue' " +
-				"AND v.lsKind = 'order' " +
-				"AND iltilt = :itxLsThingLsThing ";
-        
+        EntityManager em = ItxLsThingLsThing.entityManager();
+        String query = "SELECT v.numericValue FROM ItxLsThingLsThingValue v " +
+                "JOIN v.lsState s " +
+                "JOIN s.itxLsThingLsThing iltilt " +
+                "WHERE s.lsType = 'metadata' " +
+                "AND s.lsKind = 'composition' " +
+                "AND v.lsType = 'numericValue' " +
+                "AND v.lsKind = 'order' " +
+                "AND iltilt = :itxLsThingLsThing ";
+
         TypedQuery<Integer> q = em.createQuery(query, Integer.class);
-        q.setParameter("itxLsThingLsThing", this); 
+        q.setParameter("itxLsThingLsThing", this);
         int order;
         try {
-        	order = q.getSingleResult();
-        } catch (NoResultException e){
-        	order = -1;
+            order = q.getSingleResult();
+        } catch (NoResultException e) {
+            order = -1;
         }
-    	return order;
+        return order;
     }
 
     public int grabItxOrder() {
@@ -365,135 +399,131 @@ public int grabItxOrder() {
         }
         return 0;
     }
-    
+
     public String toJson() {
         return new JSONSerializer()
-        	.include("lsStates.lsValues")
-        	.exclude("*.class", "lsStates.itxLsThingLsThing")
-        	.transform(new ExcludeNulls(), void.class)
-        	.serialize(this);
-    }
-
-	public String toJsonWithNestedFull() {
-		return new JSONSerializer()
-				.exclude("*.class", "lsStates.lsValues.lsState", "lsStates.itxLsThingLsThing", "lsLabels.itxLsThingLsThing")
-				.include("lsStates.lsValues", 
-						"firstLsThing.lsStates.lsValues", 
-						"firstLsThing.lsLabels", 
-						"secondLsThing.lsStates.lsValues",
-						"secondLsThing.lsLabels")
-				.transform(new ExcludeNulls(), void.class)
-				.serialize(this);
-	}
-
-	public String toPrettyJson() {
+                .include("lsStates.lsValues")
+                .exclude("*.class", "lsStates.itxLsThingLsThing")
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(this);
+    }
+
+    public String toJsonWithNestedFull() {
         return new JSONSerializer()
-        		.exclude("*.class", "lsStates.itxLsThingLsThing")
-            	.include("lsStates.lsValues")
-        		.prettyPrint(true)
-        		.transform(new ExcludeNulls(), void.class)
-        		.serialize(this);
-
-	}
-
-	public String toJsonWithNestedStubs() {
-        return new JSONSerializer().
-        		exclude("*.class").
-        		include("lsStates.lsValues", 
-						"firstLsThing.lsLabels", 
-						"secondLsThing.lsLabels").
-        		transform(new ExcludeNulls(), void.class).
-        		serialize(this);
-
-	}
-
-	public String toJsonStub() {
+                .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.itxLsThingLsThing",
+                        "lsLabels.itxLsThingLsThing")
+                .include("lsStates.lsValues",
+                        "firstLsThing.lsStates.lsValues",
+                        "firstLsThing.lsLabels",
+                        "secondLsThing.lsStates.lsValues",
+                        "secondLsThing.lsLabels")
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(this);
+    }
+
+    public String toPrettyJson() {
+        return new JSONSerializer()
+                .exclude("*.class", "lsStates.itxLsThingLsThing")
+                .include("lsStates.lsValues")
+                .prettyPrint(true)
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(this);
+
+    }
+
+    public String toJsonWithNestedStubs() {
+        return new JSONSerializer().exclude("*.class").include("lsStates.lsValues",
+                "firstLsThing.lsLabels",
+                "secondLsThing.lsLabels").transform(new ExcludeNulls(), void.class).serialize(this);
+
+    }
+
+    public String toJsonStub() {
         return new JSONSerializer()
-    	.include()
-    	.exclude("*.class")
-    	.transform(new ExcludeNulls(), void.class)
-    	.serialize(this);
-	}
-
-	public static String toJsonArrayWithNestedFull(
-			Collection<ItxLsThingLsThing> updatedItxLsThingLsThings) {
-        return new JSONSerializer().
-        		exclude("*.class").
-        		include("lsStates.lsValues", 
-						"firstLsThing.lsStates.lsValues", 
-						"firstLsThing.lsLabels", 
-						"secondLsThing.lsStates.lsValues",
-						"secondLsThing.lsLabels").
-        		transform(new ExcludeNulls(), void.class).serialize(updatedItxLsThingLsThings);
-
-	}
-
-	public static String toPrettyJsonArray(
-			Collection<ItxLsThingLsThing> updatedItxLsThingLsThings) {
-        return new JSONSerializer().
-        		exclude("*.class").
-        		include("lsStates.lsValues", 
-						"firstLsThing.lsStates.lsValues", 
-						"firstLsThing.lsLabels", 
-						"secondLsThing.lsStates.lsValues",
-						"secondLsThing.lsLabels").
-		        prettyPrint(true).
-        		transform(new ExcludeNulls(), void.class).serialize(updatedItxLsThingLsThings);
-	}
-
-	public static String toJsonArrayWithNestedStub(
-			Collection<ItxLsThingLsThing> updatedItxLsThingLsThings) {
-        return new JSONSerializer().
-        		exclude("*.class").
-        		include("lsStates.lsValues", 
-						"firstLsThing.lsLabels", 
-						"secondLsThing.lsLabels").
-        		transform(new ExcludeNulls(), void.class).serialize(updatedItxLsThingLsThings);
-	}
-
-	public static String toJsonArrayStub(
-			Collection<ItxLsThingLsThing> updatedItxLsThingLsThings) {
-        return new JSONSerializer().
-        		exclude("*.class").
-        		include("lsStates.lsValues").
-        		transform(new ExcludeNulls(), void.class).serialize(updatedItxLsThingLsThings);
-	}
-
-	public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+                .include()
+                .exclude("*.class")
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(this);
+    }
+
+    public static String toJsonArrayWithNestedFull(
+            Collection<ItxLsThingLsThing> updatedItxLsThingLsThings) {
+        return new JSONSerializer().exclude("*.class").include("lsStates.lsValues",
+                "firstLsThing.lsStates.lsValues",
+                "firstLsThing.lsLabels",
+                "secondLsThing.lsStates.lsValues",
+                "secondLsThing.lsLabels").transform(new ExcludeNulls(), void.class)
+                .serialize(updatedItxLsThingLsThings);
+
+    }
+
+    public static String toPrettyJsonArray(
+            Collection<ItxLsThingLsThing> updatedItxLsThingLsThings) {
+        return new JSONSerializer().exclude("*.class").include("lsStates.lsValues",
+                "firstLsThing.lsStates.lsValues",
+                "firstLsThing.lsLabels",
+                "secondLsThing.lsStates.lsValues",
+                "secondLsThing.lsLabels").prettyPrint(true).transform(new ExcludeNulls(), void.class)
+                .serialize(updatedItxLsThingLsThings);
+    }
+
+    public static String toJsonArrayWithNestedStub(
+            Collection<ItxLsThingLsThing> updatedItxLsThingLsThings) {
+        return new JSONSerializer().exclude("*.class").include("lsStates.lsValues",
+                "firstLsThing.lsLabels",
+                "secondLsThing.lsLabels").transform(new ExcludeNulls(), void.class)
+                .serialize(updatedItxLsThingLsThings);
+    }
+
+    public static String toJsonArrayStub(
+            Collection<ItxLsThingLsThing> updatedItxLsThingLsThings) {
+        return new JSONSerializer().exclude("*.class").include("lsStates.lsValues")
+                .transform(new ExcludeNulls(), void.class).serialize(updatedItxLsThingLsThings);
+    }
+
+    public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = ItxLsThingLsThing.entityManager();
-        TypedQuery<ItxLsThingLsThing> q = em.createQuery("SELECT o FROM ItxLsThingLsThing AS o WHERE o.codeName = :codeName", ItxLsThingLsThing.class);
+        TypedQuery<ItxLsThingLsThing> q = em.createQuery(
+                "SELECT o FROM ItxLsThingLsThing AS o WHERE o.codeName = :codeName", ItxLsThingLsThing.class);
         q.setParameter("codeName", codeName);
         return q;
     }
 
-	public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsByFirstLsThing(LsThing firstLsThing) {
-        if (firstLsThing == null) throw new IllegalArgumentException("The firstLsThing argument is required");
+    public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsByFirstLsThing(LsThing firstLsThing) {
+        if (firstLsThing == null)
+            throw new IllegalArgumentException("The firstLsThing argument is required");
         EntityManager em = ItxLsThingLsThing.entityManager();
-        TypedQuery<ItxLsThingLsThing> q = em.createQuery("SELECT o FROM ItxLsThingLsThing AS o WHERE o.firstLsThing = :firstLsThing", ItxLsThingLsThing.class);
+        TypedQuery<ItxLsThingLsThing> q = em.createQuery(
+                "SELECT o FROM ItxLsThingLsThing AS o WHERE o.firstLsThing = :firstLsThing", ItxLsThingLsThing.class);
         q.setParameter("firstLsThing", firstLsThing);
         return q;
     }
 
-	public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsBySecondLsThing(LsThing secondLsThing) {
-        if (secondLsThing == null) throw new IllegalArgumentException("The secondLsThing argument is required");
+    public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsBySecondLsThing(LsThing secondLsThing) {
+        if (secondLsThing == null)
+            throw new IllegalArgumentException("The secondLsThing argument is required");
         EntityManager em = ItxLsThingLsThing.entityManager();
-        TypedQuery<ItxLsThingLsThing> q = em.createQuery("SELECT o FROM ItxLsThingLsThing AS o WHERE o.secondLsThing = :secondLsThing", ItxLsThingLsThing.class);
+        TypedQuery<ItxLsThingLsThing> q = em.createQuery(
+                "SELECT o FROM ItxLsThingLsThing AS o WHERE o.secondLsThing = :secondLsThing", ItxLsThingLsThing.class);
         q.setParameter("secondLsThing", secondLsThing);
         return q;
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "firstLsThing", "secondLsThing", "lsStates");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "firstLsThing",
+            "secondLsThing", "lsStates");
 
-	public static long countItxLsThingLsThings() {
+    public static long countItxLsThingLsThings() {
         return entityManager().createQuery("SELECT COUNT(o) FROM ItxLsThingLsThing o", Long.class).getSingleResult();
     }
 
-	public static List<ItxLsThingLsThing> findAllItxLsThingLsThings() {
-        return entityManager().createQuery("SELECT o FROM ItxLsThingLsThing o", ItxLsThingLsThing.class).getResultList();
+    public static List<ItxLsThingLsThing> findAllItxLsThingLsThings() {
+        return entityManager().createQuery("SELECT o FROM ItxLsThingLsThing o", ItxLsThingLsThing.class)
+                .getResultList();
     }
 
-	public static List<ItxLsThingLsThing> findAllItxLsThingLsThings(String sortFieldName, String sortOrder) {
+    public static List<ItxLsThingLsThing> findAllItxLsThingLsThings(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxLsThingLsThing o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -504,16 +534,19 @@ public static List<ItxLsThingLsThing> findAllItxLsThingLsThings(String sortField
         return entityManager().createQuery(jpaQuery, ItxLsThingLsThing.class).getResultList();
     }
 
-	public static ItxLsThingLsThing findItxLsThingLsThing(Long id) {
-        if (id == null) return null;
+    public static ItxLsThingLsThing findItxLsThingLsThing(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ItxLsThingLsThing.class, id);
     }
 
-	public static List<ItxLsThingLsThing> findItxLsThingLsThingEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxLsThingLsThing o", ItxLsThingLsThing.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ItxLsThingLsThing> findItxLsThingLsThingEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ItxLsThingLsThing o", ItxLsThingLsThing.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ItxLsThingLsThing> findItxLsThingLsThingEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ItxLsThingLsThing> findItxLsThingLsThingEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxLsThingLsThing o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -521,49 +554,60 @@ public static List<ItxLsThingLsThing> findItxLsThingLsThingEntries(int firstResu
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ItxLsThingLsThing.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ItxLsThingLsThing.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public ItxLsThingLsThing merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ItxLsThingLsThing merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static Long countFindItxLsThingLsThingsByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static Long countFindItxLsThingLsThingsByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = ItxLsThingLsThing.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxLsThingLsThing AS o WHERE o.codeName = :codeName", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxLsThingLsThing AS o WHERE o.codeName = :codeName",
+                Long.class);
         q.setParameter("codeName", codeName);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindItxLsThingLsThingsByFirstLsThing(LsThing firstLsThing) {
-        if (firstLsThing == null) throw new IllegalArgumentException("The firstLsThing argument is required");
+    public static Long countFindItxLsThingLsThingsByFirstLsThing(LsThing firstLsThing) {
+        if (firstLsThing == null)
+            throw new IllegalArgumentException("The firstLsThing argument is required");
         EntityManager em = ItxLsThingLsThing.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxLsThingLsThing AS o WHERE o.firstLsThing = :firstLsThing", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ItxLsThingLsThing AS o WHERE o.firstLsThing = :firstLsThing", Long.class);
         q.setParameter("firstLsThing", firstLsThing);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindItxLsThingLsThingsBySecondLsThing(LsThing secondLsThing) {
-        if (secondLsThing == null) throw new IllegalArgumentException("The secondLsThing argument is required");
+    public static Long countFindItxLsThingLsThingsBySecondLsThing(LsThing secondLsThing) {
+        if (secondLsThing == null)
+            throw new IllegalArgumentException("The secondLsThing argument is required");
         EntityManager em = ItxLsThingLsThing.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxLsThingLsThing AS o WHERE o.secondLsThing = :secondLsThing", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ItxLsThingLsThing AS o WHERE o.secondLsThing = :secondLsThing", Long.class);
         q.setParameter("secondLsThing", secondLsThing);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsByCodeNameEquals(String codeName,
+            String sortFieldName, String sortOrder) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = ItxLsThingLsThing.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxLsThingLsThing AS o WHERE o.codeName = :codeName");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ItxLsThingLsThing AS o WHERE o.codeName = :codeName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -575,10 +619,13 @@ public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsByCodeNameEqua
         return q;
     }
 
-	public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsByFirstLsThing(LsThing firstLsThing, String sortFieldName, String sortOrder) {
-        if (firstLsThing == null) throw new IllegalArgumentException("The firstLsThing argument is required");
+    public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsByFirstLsThing(LsThing firstLsThing,
+            String sortFieldName, String sortOrder) {
+        if (firstLsThing == null)
+            throw new IllegalArgumentException("The firstLsThing argument is required");
         EntityManager em = ItxLsThingLsThing.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxLsThingLsThing AS o WHERE o.firstLsThing = :firstLsThing");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ItxLsThingLsThing AS o WHERE o.firstLsThing = :firstLsThing");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -590,10 +637,13 @@ public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsByFirstLsThing
         return q;
     }
 
-	public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsBySecondLsThing(LsThing secondLsThing, String sortFieldName, String sortOrder) {
-        if (secondLsThing == null) throw new IllegalArgumentException("The secondLsThing argument is required");
+    public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsBySecondLsThing(LsThing secondLsThing,
+            String sortFieldName, String sortOrder) {
+        if (secondLsThing == null)
+            throw new IllegalArgumentException("The secondLsThing argument is required");
         EntityManager em = ItxLsThingLsThing.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxLsThingLsThing AS o WHERE o.secondLsThing = :secondLsThing");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ItxLsThingLsThing AS o WHERE o.secondLsThing = :secondLsThing");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -605,31 +655,31 @@ public static TypedQuery<ItxLsThingLsThing> findItxLsThingLsThingsBySecondLsThin
         return q;
     }
 
-	public LsThing getFirstLsThing() {
+    public LsThing getFirstLsThing() {
         return this.firstLsThing;
     }
 
-	public void setFirstLsThing(LsThing firstLsThing) {
+    public void setFirstLsThing(LsThing firstLsThing) {
         this.firstLsThing = firstLsThing;
     }
 
-	public LsThing getSecondLsThing() {
+    public LsThing getSecondLsThing() {
         return this.secondLsThing;
     }
 
-	public void setSecondLsThing(LsThing secondLsThing) {
+    public void setSecondLsThing(LsThing secondLsThing) {
         this.secondLsThing = secondLsThing;
     }
 
-	public Set<ItxLsThingLsThingState> getLsStates() {
+    public Set<ItxLsThingLsThingState> getLsStates() {
         return this.lsStates;
     }
 
-	public void setLsStates(Set<ItxLsThingLsThingState> lsStates) {
+    public void setLsStates(Set<ItxLsThingLsThingState> lsStates) {
         this.lsStates = lsStates;
     }
 
-	public ItxLsThingLsThing() {
+    public ItxLsThingLsThing() {
         super();
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState.java b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState.java
index e4345e60a..26933cb44 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingState.java
@@ -33,130 +33,129 @@
 @Configurable
 
 public class ItxLsThingLsThingState extends AbstractState {
-	
-	private static final Logger logger = LoggerFactory.getLogger(ItxLsThingLsThingState.class);
 
+    private static final Logger logger = LoggerFactory.getLogger(ItxLsThingLsThingState.class);
 
     public ItxLsThingLsThingState(ItxLsThingLsThingState itxState) {
-		super.setLsType(itxState.getLsType());
-		super.setLsKind(itxState.getLsKind());
-		super.setIgnored(itxState.isIgnored());
-		super.setDeleted(itxState.isDeleted());
-    	super.setRecordedBy(itxState.getRecordedBy());
-		super.setRecordedDate(itxState.getRecordedDate());
-		super.setLsTransaction(itxState.getLsTransaction());
-		super.setModifiedBy(itxState.getModifiedBy());
-		super.setModifiedDate(itxState.getModifiedDate());
-		
-    }
-    
+        super.setLsType(itxState.getLsType());
+        super.setLsKind(itxState.getLsKind());
+        super.setIgnored(itxState.isIgnored());
+        super.setDeleted(itxState.isDeleted());
+        super.setRecordedBy(itxState.getRecordedBy());
+        super.setRecordedDate(itxState.getRecordedDate());
+        super.setLsTransaction(itxState.getLsTransaction());
+        super.setModifiedBy(itxState.getModifiedBy());
+        super.setModifiedDate(itxState.getModifiedDate());
+
+    }
+
     public static ItxLsThingLsThingState update(ItxLsThingLsThingState itxState) {
-    	ItxLsThingLsThingState updatedObject = ItxLsThingLsThingState.findItxLsThingLsThingState(itxState.getId());
-    	updatedObject.setLsType(itxState.getLsType());
-    	updatedObject.setLsKind(itxState.getLsKind());
-    	updatedObject.setIgnored(itxState.isIgnored());
-    	updatedObject.setDeleted(itxState.isDeleted());
-    	updatedObject.setRecordedBy(itxState.getRecordedBy());
-    	updatedObject.setRecordedDate(itxState.getRecordedDate());
-    	updatedObject.setLsTransaction(itxState.getLsTransaction());
-    	updatedObject.setModifiedDate(new Date());
-    	updatedObject.merge();
+        ItxLsThingLsThingState updatedObject = ItxLsThingLsThingState.findItxLsThingLsThingState(itxState.getId());
+        updatedObject.setLsType(itxState.getLsType());
+        updatedObject.setLsKind(itxState.getLsKind());
+        updatedObject.setIgnored(itxState.isIgnored());
+        updatedObject.setDeleted(itxState.isDeleted());
+        updatedObject.setRecordedBy(itxState.getRecordedBy());
+        updatedObject.setRecordedDate(itxState.getRecordedDate());
+        updatedObject.setLsTransaction(itxState.getLsTransaction());
+        updatedObject.setModifiedDate(new Date());
+        updatedObject.merge();
         return updatedObject;
     }
-    
-//    public static ItxLsThingLsThingState update(ItxLsThingLsThingState object) {
-//    	ItxLsThingLsThingState updatedObject = new JSONDeserializer<ItxLsThingLsThingState>().use(null, ItxLsThingLsThingState.class).
-//        		deserializeInto(object.toJson(), 
-//        				ItxLsThingLsThingState.findItxLsThingLsThingState(object.getId()));
-//    	updatedObject.setModifiedDate(new Date());
-//    	updatedObject.merge();
-//        return updatedObject;
-//    }
-    
-	public static ItxLsThingLsThingState updateNoMerge(
-			ItxLsThingLsThingState object) {
-		ItxLsThingLsThingState updatedObject = new JSONDeserializer<ItxLsThingLsThingState>().use(null, ItxLsThingLsThingState.class).
-        		deserializeInto(object.toJson(), 
-        				ItxLsThingLsThingState.findItxLsThingLsThingState(object.getId()));
-    	updatedObject.setModifiedDate(new Date());
-        return updatedObject;
-	}
 
+    // public static ItxLsThingLsThingState update(ItxLsThingLsThingState object) {
+    // ItxLsThingLsThingState updatedObject = new
+    // JSONDeserializer<ItxLsThingLsThingState>().use(null,
+    // ItxLsThingLsThingState.class).
+    // deserializeInto(object.toJson(),
+    // ItxLsThingLsThingState.findItxLsThingLsThingState(object.getId()));
+    // updatedObject.setModifiedDate(new Date());
+    // updatedObject.merge();
+    // return updatedObject;
+    // }
+
+    public static ItxLsThingLsThingState updateNoMerge(
+            ItxLsThingLsThingState object) {
+        ItxLsThingLsThingState updatedObject = new JSONDeserializer<ItxLsThingLsThingState>()
+                .use(null, ItxLsThingLsThingState.class).deserializeInto(object.toJson(),
+                        ItxLsThingLsThingState.findItxLsThingLsThingState(object.getId()));
+        updatedObject.setModifiedDate(new Date());
+        return updatedObject;
+    }
 
-	@ManyToOne
-	@JoinColumn(name = "itx_ls_thing_ls_thing")
+    @ManyToOne
+    @JoinColumn(name = "itx_ls_thing_ls_thing")
     private ItxLsThingLsThing itxLsThingLsThing;
 
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "lsState",  fetch =  FetchType.LAZY)
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "lsState", fetch = FetchType.LAZY)
     private Set<ItxLsThingLsThingValue> lsValues = new HashSet<ItxLsThingLsThingValue>();
-    
-    
-	@Transactional
+
+    @Transactional
     public String toJson() {
         return new JSONSerializer().exclude("*.class")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(this);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
 
-	@Transactional
+    @Transactional
     public String toJsonStub() {
         return new JSONSerializer().exclude("*.class", "itxLsThingLsThing")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(this);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
 
     public static ItxLsThingLsThingState fromJsonToItxLsThingLsThingState(String json) {
         return new JSONDeserializer<ItxLsThingLsThingState>().use(null, ItxLsThingLsThingState.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
-    
-	@Transactional
+
+    @Transactional
     public static String toJsonArray(Collection<ItxLsThingLsThingState> collection) {
         return new JSONSerializer().exclude("*.class")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(collection);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
 
-	@Transactional
+    @Transactional
     public static String toJsonArrayStub(Collection<ItxLsThingLsThingState> collection) {
         return new JSONSerializer().exclude("*.class", "itxLsThingLsThing")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(collection);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
-    
+
     public static Collection<ItxLsThingLsThingState> fromJsonArrayToItxLsThingLsThingStates(String json) {
         return new JSONDeserializer<List<ItxLsThingLsThingState>>().use(null, ArrayList.class)
-        		.use("values", ItxLsThingLsThingState.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use("values", ItxLsThingLsThingState.class)
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
 
     public static Collection<ItxLsThingLsThingState> fromJsonArrayToItxLsThingLsThingStates(Reader json) {
         return new JSONDeserializer<List<ItxLsThingLsThingState>>().use(null, ArrayList.class)
-        		.use("values", ItxLsThingLsThingState.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use("values", ItxLsThingLsThingState.class)
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
 
-
-
-
-	public ItxLsThingLsThingState() {
+    public ItxLsThingLsThingState() {
         super();
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "itxLsThingLsThing", "lsValues");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger",
+            "itxLsThingLsThing", "lsValues");
 
-	public static long countItxLsThingLsThingStates() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ItxLsThingLsThingState o", Long.class).getSingleResult();
+    public static long countItxLsThingLsThingStates() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ItxLsThingLsThingState o", Long.class)
+                .getSingleResult();
     }
 
-	public static List<ItxLsThingLsThingState> findAllItxLsThingLsThingStates() {
-        return entityManager().createQuery("SELECT o FROM ItxLsThingLsThingState o", ItxLsThingLsThingState.class).getResultList();
+    public static List<ItxLsThingLsThingState> findAllItxLsThingLsThingStates() {
+        return entityManager().createQuery("SELECT o FROM ItxLsThingLsThingState o", ItxLsThingLsThingState.class)
+                .getResultList();
     }
 
-	public static List<ItxLsThingLsThingState> findAllItxLsThingLsThingStates(String sortFieldName, String sortOrder) {
+    public static List<ItxLsThingLsThingState> findAllItxLsThingLsThingStates(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxLsThingLsThingState o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -167,16 +166,19 @@ public static List<ItxLsThingLsThingState> findAllItxLsThingLsThingStates(String
         return entityManager().createQuery(jpaQuery, ItxLsThingLsThingState.class).getResultList();
     }
 
-	public static ItxLsThingLsThingState findItxLsThingLsThingState(Long id) {
-        if (id == null) return null;
+    public static ItxLsThingLsThingState findItxLsThingLsThingState(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ItxLsThingLsThingState.class, id);
     }
 
-	public static List<ItxLsThingLsThingState> findItxLsThingLsThingStateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxLsThingLsThingState o", ItxLsThingLsThingState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ItxLsThingLsThingState> findItxLsThingLsThingStateEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ItxLsThingLsThingState o", ItxLsThingLsThingState.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ItxLsThingLsThingState> findItxLsThingLsThingStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ItxLsThingLsThingState> findItxLsThingLsThingStateEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxLsThingLsThingState o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -184,34 +186,36 @@ public static List<ItxLsThingLsThingState> findItxLsThingLsThingStateEntries(int
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ItxLsThingLsThingState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ItxLsThingLsThingState.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public ItxLsThingLsThingState merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ItxLsThingLsThingState merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public ItxLsThingLsThing getItxLsThingLsThing() {
+    public ItxLsThingLsThing getItxLsThingLsThing() {
         return this.itxLsThingLsThing;
     }
 
-	public void setItxLsThingLsThing(ItxLsThingLsThing itxLsThingLsThing) {
+    public void setItxLsThingLsThing(ItxLsThingLsThing itxLsThingLsThing) {
         this.itxLsThingLsThing = itxLsThingLsThing;
     }
 
-	public Set<ItxLsThingLsThingValue> getLsValues() {
+    public Set<ItxLsThingLsThingValue> getLsValues() {
         return this.lsValues;
     }
 
-	public void setLsValues(Set<ItxLsThingLsThingValue> lsValues) {
+    public void setLsValues(Set<ItxLsThingLsThingValue> lsValues) {
         this.lsValues = lsValues;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue.java b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue.java
index f2a0da63e..91f23cb44 100644
--- a/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxLsThingLsThingValue.java
@@ -74,15 +74,21 @@ public ItxLsThingLsThingValue(com.labsynch.labseer.domain.ItxLsThingLsThingValue
     public ItxLsThingLsThingValue() {
     }
 
-    public static com.labsynch.labseer.domain.ItxLsThingLsThingValue update(com.labsynch.labseer.domain.ItxLsThingLsThingValue object) {
-        ItxLsThingLsThingValue updatedObject = new JSONDeserializer<ItxLsThingLsThingValue>().use(null, ItxLsThingLsThingValue.class).deserializeInto(object.toJson(), ItxLsThingLsThingValue.findItxLsThingLsThingValue(object.getId()));
+    public static com.labsynch.labseer.domain.ItxLsThingLsThingValue update(
+            com.labsynch.labseer.domain.ItxLsThingLsThingValue object) {
+        ItxLsThingLsThingValue updatedObject = new JSONDeserializer<ItxLsThingLsThingValue>()
+                .use(null, ItxLsThingLsThingValue.class)
+                .deserializeInto(object.toJson(), ItxLsThingLsThingValue.findItxLsThingLsThingValue(object.getId()));
         updatedObject.setModifiedDate(new Date());
         updatedObject.merge();
         return updatedObject;
     }
 
-    public static com.labsynch.labseer.domain.ItxLsThingLsThingValue updateNoMerge(com.labsynch.labseer.domain.ItxLsThingLsThingValue object) {
-        ItxLsThingLsThingValue updatedObject = new JSONDeserializer<ItxLsThingLsThingValue>().use(null, ItxLsThingLsThingValue.class).deserializeInto(object.toJson(), ItxLsThingLsThingValue.findItxLsThingLsThingValue(object.getId()));
+    public static com.labsynch.labseer.domain.ItxLsThingLsThingValue updateNoMerge(
+            com.labsynch.labseer.domain.ItxLsThingLsThingValue object) {
+        ItxLsThingLsThingValue updatedObject = new JSONDeserializer<ItxLsThingLsThingValue>()
+                .use(null, ItxLsThingLsThingValue.class)
+                .deserializeInto(object.toJson(), ItxLsThingLsThingValue.findItxLsThingLsThingValue(object.getId()));
         updatedObject.setModifiedDate(new Date());
         return updatedObject;
     }
@@ -91,12 +97,16 @@ public static com.labsynch.labseer.domain.ItxLsThingLsThingValue fromJsonToItxLs
         return new JSONDeserializer<ItxLsThingLsThingValue>().use(null, ItxLsThingLsThingValue.class).deserialize(json);
     }
 
-    public static Collection<com.labsynch.labseer.domain.ItxLsThingLsThingValue> fromJsonArrayToItxLsThingLsThingValues(String json) {
-        return new JSONDeserializer<List<ItxLsThingLsThingValue>>().use(null, ArrayList.class).use("values", ItxLsThingLsThingValue.class).deserialize(json);
+    public static Collection<com.labsynch.labseer.domain.ItxLsThingLsThingValue> fromJsonArrayToItxLsThingLsThingValues(
+            String json) {
+        return new JSONDeserializer<List<ItxLsThingLsThingValue>>().use(null, ArrayList.class)
+                .use("values", ItxLsThingLsThingValue.class).deserialize(json);
     }
 
-    public static Collection<com.labsynch.labseer.domain.ItxLsThingLsThingValue> fromJsonArrayToItxLsThingLsThingValues(Reader json) {
-        return new JSONDeserializer<List<ItxLsThingLsThingValue>>().use(null, ArrayList.class).use("values", ItxLsThingLsThingValue.class).deserialize(json);
+    public static Collection<com.labsynch.labseer.domain.ItxLsThingLsThingValue> fromJsonArrayToItxLsThingLsThingValues(
+            Reader json) {
+        return new JSONDeserializer<List<ItxLsThingLsThingValue>>().use(null, ArrayList.class)
+                .use("values", ItxLsThingLsThingValue.class).deserialize(json);
     }
 
     @Transactional
@@ -111,26 +121,33 @@ public static String toJsonArray(Collection<com.labsynch.labseer.domain.ItxLsThi
 
     @Transactional
     public static String toJsonArrayStub(Collection<com.labsynch.labseer.domain.ItxLsThingLsThingValue> collection) {
-        return new JSONSerializer().exclude("*.class", "lsState").transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer().exclude("*.class", "lsState").transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
 
-    public static com.labsynch.labseer.domain.ItxLsThingLsThingValue create(com.labsynch.labseer.domain.ItxLsThingLsThingValue lsThingValue) {
-        ItxLsThingLsThingValue newItxLsThingLsThingValue = new JSONDeserializer<ItxLsThingLsThingValue>().use(null, ItxLsThingLsThingValue.class).deserializeInto(lsThingValue.toJson(), new ItxLsThingLsThingValue());
+    public static com.labsynch.labseer.domain.ItxLsThingLsThingValue create(
+            com.labsynch.labseer.domain.ItxLsThingLsThingValue lsThingValue) {
+        ItxLsThingLsThingValue newItxLsThingLsThingValue = new JSONDeserializer<ItxLsThingLsThingValue>()
+                .use(null, ItxLsThingLsThingValue.class)
+                .deserializeInto(lsThingValue.toJson(), new ItxLsThingLsThingValue());
         return newItxLsThingLsThingValue;
     }
 
-    public static TypedQuery<ItxLsThingLsThingValue> findItxLsValueByItxThingAndStateTypeStateKindAndValueTypeKind(Long itxOrthologId, String stateType,
-    		String stateKind, String valueType, String valueKind) {
-        if (valueType == null || valueType.length() == 0) throw new IllegalArgumentException("The valueType argument is required");
-        if (valueKind == null || valueKind.length() == 0) throw new IllegalArgumentException("The valueKind argument is required");
+    public static TypedQuery<ItxLsThingLsThingValue> findItxLsValueByItxThingAndStateTypeStateKindAndValueTypeKind(
+            Long itxOrthologId, String stateType,
+            String stateKind, String valueType, String valueKind) {
+        if (valueType == null || valueType.length() == 0)
+            throw new IllegalArgumentException("The valueType argument is required");
+        if (valueKind == null || valueKind.length() == 0)
+            throw new IllegalArgumentException("The valueKind argument is required");
 
         EntityManager em = ItxLsThingLsThingValue.entityManager();
         String hqlQuery = "SELECT o FROM ItxLsThingLsThingValue AS o "
-        		+ "JOIN o.lsState its with its.ignored = false AND its.lsType = :stateType and its.lsKind = :stateKind "
-        		+ "JOIN its.itxLsThingLsThing itxThing with itxThing.ignored = false "
-        		+ "WHERE o.lsType = :valueType AND o.lsKind = :valueKind "
-        		+ "AND itxThing.id = :itxOrthologId";
-                
+                + "JOIN o.lsState its with its.ignored = false AND its.lsType = :stateType and its.lsKind = :stateKind "
+                + "JOIN its.itxLsThingLsThing itxThing with itxThing.ignored = false "
+                + "WHERE o.lsType = :valueType AND o.lsKind = :valueKind "
+                + "AND itxThing.id = :itxOrthologId";
+
         TypedQuery<ItxLsThingLsThingValue> q = em.createQuery(hqlQuery, ItxLsThingLsThingValue.class);
         q.setParameter("stateType", stateType);
         q.setParameter("stateKind", stateKind);
@@ -141,37 +158,44 @@ public static TypedQuery<ItxLsThingLsThingValue> findItxLsValueByItxThingAndStat
     }
 
     public static TypedQuery<ItxLsThingLsThingValue> findItxLsThingLsThingValuesByLsKindEquals(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = ItxLsThingLsThingValue.entityManager();
-        TypedQuery<ItxLsThingLsThingValue> q = em.createQuery("SELECT o FROM ItxLsThingLsThingValue AS o WHERE o.lsKind = :lsKind", ItxLsThingLsThingValue.class);
+        TypedQuery<ItxLsThingLsThingValue> q = em.createQuery(
+                "SELECT o FROM ItxLsThingLsThingValue AS o WHERE o.lsKind = :lsKind", ItxLsThingLsThingValue.class);
         q.setParameter("lsKind", lsKind);
         return q;
     }
-    
-    public static TypedQuery<ItxLsThingLsThingValue> findItxLsThingLsThingValuesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+
+    public static TypedQuery<ItxLsThingLsThingValue> findItxLsThingLsThingValuesByLsTransactionEquals(
+            Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = ItxLsThingLsThingValue.entityManager();
-        TypedQuery<ItxLsThingLsThingValue> q = em.createQuery("SELECT o FROM ItxLsThingLsThingValue AS o WHERE o.lsTransaction = :lsTransaction", ItxLsThingLsThingValue.class);
+        TypedQuery<ItxLsThingLsThingValue> q = em.createQuery(
+                "SELECT o FROM ItxLsThingLsThingValue AS o WHERE o.lsTransaction = :lsTransaction",
+                ItxLsThingLsThingValue.class);
         q.setParameter("lsTransaction", lsTransaction);
         return q;
     }
-    
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsState");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsState");
 
-	public static long countItxLsThingLsThingValues() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ItxLsThingLsThingValue o", Long.class).getSingleResult();
+    public static long countItxLsThingLsThingValues() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ItxLsThingLsThingValue o", Long.class)
+                .getSingleResult();
     }
 
-	public static List<ItxLsThingLsThingValue> findAllItxLsThingLsThingValues() {
-        return entityManager().createQuery("SELECT o FROM ItxLsThingLsThingValue o", ItxLsThingLsThingValue.class).getResultList();
+    public static List<ItxLsThingLsThingValue> findAllItxLsThingLsThingValues() {
+        return entityManager().createQuery("SELECT o FROM ItxLsThingLsThingValue o", ItxLsThingLsThingValue.class)
+                .getResultList();
     }
 
-	public static List<ItxLsThingLsThingValue> findAllItxLsThingLsThingValues(String sortFieldName, String sortOrder) {
+    public static List<ItxLsThingLsThingValue> findAllItxLsThingLsThingValues(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxLsThingLsThingValue o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -182,16 +206,19 @@ public static List<ItxLsThingLsThingValue> findAllItxLsThingLsThingValues(String
         return entityManager().createQuery(jpaQuery, ItxLsThingLsThingValue.class).getResultList();
     }
 
-	public static ItxLsThingLsThingValue findItxLsThingLsThingValue(Long id) {
-        if (id == null) return null;
+    public static ItxLsThingLsThingValue findItxLsThingLsThingValue(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ItxLsThingLsThingValue.class, id);
     }
 
-	public static List<ItxLsThingLsThingValue> findItxLsThingLsThingValueEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxLsThingLsThingValue o", ItxLsThingLsThingValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ItxLsThingLsThingValue> findItxLsThingLsThingValueEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ItxLsThingLsThingValue o", ItxLsThingLsThingValue.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ItxLsThingLsThingValue> findItxLsThingLsThingValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ItxLsThingLsThingValue> findItxLsThingLsThingValueEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxLsThingLsThingValue o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -199,37 +226,46 @@ public static List<ItxLsThingLsThingValue> findItxLsThingLsThingValueEntries(int
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ItxLsThingLsThingValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ItxLsThingLsThingValue.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public ItxLsThingLsThingValue merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ItxLsThingLsThingValue merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public static Long countFindItxLsThingLsThingValuesByLsKindEquals(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static Long countFindItxLsThingLsThingValuesByLsKindEquals(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = ItxLsThingLsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxLsThingLsThingValue AS o WHERE o.lsKind = :lsKind", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxLsThingLsThingValue AS o WHERE o.lsKind = :lsKind",
+                Long.class);
         q.setParameter("lsKind", lsKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindItxLsThingLsThingValuesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static Long countFindItxLsThingLsThingValuesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = ItxLsThingLsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxLsThingLsThingValue AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ItxLsThingLsThingValue AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
         q.setParameter("lsTransaction", lsTransaction);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<ItxLsThingLsThingValue> findItxLsThingLsThingValuesByLsKindEquals(String lsKind, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<ItxLsThingLsThingValue> findItxLsThingLsThingValuesByLsKindEquals(String lsKind,
+            String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = ItxLsThingLsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxLsThingLsThingValue AS o WHERE o.lsKind = :lsKind");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ItxLsThingLsThingValue AS o WHERE o.lsKind = :lsKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -241,10 +277,13 @@ public static TypedQuery<ItxLsThingLsThingValue> findItxLsThingLsThingValuesByLs
         return q;
     }
 
-	public static TypedQuery<ItxLsThingLsThingValue> findItxLsThingLsThingValuesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<ItxLsThingLsThingValue> findItxLsThingLsThingValuesByLsTransactionEquals(
+            Long lsTransaction, String sortFieldName, String sortOrder) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = ItxLsThingLsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxLsThingLsThingValue AS o WHERE o.lsTransaction = :lsTransaction");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ItxLsThingLsThingValue AS o WHERE o.lsTransaction = :lsTransaction");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -256,11 +295,11 @@ public static TypedQuery<ItxLsThingLsThingValue> findItxLsThingLsThingValuesByLs
         return q;
     }
 
-	public ItxLsThingLsThingState getLsState() {
+    public ItxLsThingLsThingState getLsState() {
         return this.lsState;
     }
 
-	public void setLsState(ItxLsThingLsThingState lsState) {
+    public void setLsState(ItxLsThingLsThingState lsState) {
         this.lsState = lsState;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol.java b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol.java
index c5e38e1f9..288485af0 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocol.java
@@ -36,8 +36,8 @@
 @Entity
 
 public class ItxProtocolProtocol extends AbstractThing {
-	
-	private static final Logger logger = LoggerFactory.getLogger(ItxProtocolProtocol.class);
+
+    private static final Logger logger = LoggerFactory.getLogger(ItxProtocolProtocol.class);
 
     @NotNull
     @ManyToOne(fetch = FetchType.EAGER)
@@ -53,147 +53,168 @@ public class ItxProtocolProtocol extends AbstractThing {
     private Set<ItxProtocolProtocolState> lsStates = new HashSet<ItxProtocolProtocolState>();
 
     public ItxProtocolProtocol(com.labsynch.labseer.domain.ItxProtocolProtocol itxProtocol) {
-    	this.setRecordedBy(itxProtocol.getRecordedBy());
-    	this.setRecordedDate(itxProtocol.getRecordedDate());
-    	this.setLsTransaction(itxProtocol.getLsTransaction());
-    	this.setModifiedBy(itxProtocol.getModifiedBy());
-    	this.setModifiedDate(itxProtocol.getModifiedDate());
-    	this.setCodeName(itxProtocol.getCodeName());
-    	this.setLsType(itxProtocol.getLsType());
-    	this.setLsKind(itxProtocol.getLsKind());
-    	this.setLsTypeAndKind(itxProtocol.getLsTypeAndKind());
+        this.setRecordedBy(itxProtocol.getRecordedBy());
+        this.setRecordedDate(itxProtocol.getRecordedDate());
+        this.setLsTransaction(itxProtocol.getLsTransaction());
+        this.setModifiedBy(itxProtocol.getModifiedBy());
+        this.setModifiedDate(itxProtocol.getModifiedDate());
+        this.setCodeName(itxProtocol.getCodeName());
+        this.setLsType(itxProtocol.getLsType());
+        this.setLsKind(itxProtocol.getLsKind());
+        this.setLsTypeAndKind(itxProtocol.getLsTypeAndKind());
         this.firstProtocol = itxProtocol.getFirstProtocol();
         this.secondProtocol = itxProtocol.getSecondProtocol();
     }
-    
+
     public static ItxProtocolProtocol update(ItxProtocolProtocol object) {
-    	ItxProtocolProtocol updatedObject = new JSONDeserializer<ItxProtocolProtocol>().use(null, ItxProtocolProtocol.class).
-        		deserializeInto(object.toJson(), 
-        				ItxProtocolProtocol.findItxProtocolProtocol(object.getId()));
-    	updatedObject.setModifiedDate(new Date());
-    	updatedObject.merge();
+        ItxProtocolProtocol updatedObject = new JSONDeserializer<ItxProtocolProtocol>()
+                .use(null, ItxProtocolProtocol.class).deserializeInto(object.toJson(),
+                        ItxProtocolProtocol.findItxProtocolProtocol(object.getId()));
+        updatedObject.setModifiedDate(new Date());
+        updatedObject.merge();
         return updatedObject;
     }
-    
+
     @Transactional
     public String toJson() {
         return new JSONSerializer().exclude("*.class")
-        		.include("firstProtocol","secondProtocol","lsStates.lsValues")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(this);
+                .include("firstProtocol", "secondProtocol", "lsStates.lsValues")
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
-    
+
     public static ItxProtocolProtocol fromJsonToItxProtocolProtocol(String json) {
         return new JSONDeserializer<ItxProtocolProtocol>()
-        		.use(null, ItxProtocolProtocol.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use(null, ItxProtocolProtocol.class)
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
-    
+
     public static String toJsonArray(Collection<ItxProtocolProtocol> collection) {
         return new JSONSerializer().exclude("*.class")
-        		.include("firstProtocol","secondProtocol","lsStates.lsValues")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(collection);
+                .include("firstProtocol", "secondProtocol", "lsStates.lsValues")
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
-    
+
     public static Collection<ItxProtocolProtocol> fromJsonArrayToItxProtocolProtocols(String json) {
         return new JSONDeserializer<List<ItxProtocolProtocol>>().use(null, ArrayList.class)
-        		.use("values", ItxProtocolProtocol.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use("values", ItxProtocolProtocol.class)
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
-    
+
     public static Collection<ItxProtocolProtocol> fromJsonArrayToItxProtocolProtocols(Reader json) {
         return new JSONDeserializer<List<ItxProtocolProtocol>>().use(null, ArrayList.class)
-        		.use("values", ItxProtocolProtocol.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use("values", ItxProtocolProtocol.class)
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
-    
+
     public static ItxProtocolProtocol updateNoStates(ItxProtocolProtocol itxProtocolProtocol) {
-    	ItxProtocolProtocol updatedItxProtocolProtocol = ItxProtocolProtocol.findItxProtocolProtocol(itxProtocolProtocol.getId());
-    	updatedItxProtocolProtocol.setRecordedBy(itxProtocolProtocol.getRecordedBy());
-    	updatedItxProtocolProtocol.setRecordedDate(itxProtocolProtocol.getRecordedDate());
-    	updatedItxProtocolProtocol.setIgnored(itxProtocolProtocol.isIgnored());
-    	updatedItxProtocolProtocol.setDeleted(itxProtocolProtocol.isDeleted());
-    	updatedItxProtocolProtocol.setLsTransaction(itxProtocolProtocol.getLsTransaction());
-    	updatedItxProtocolProtocol.setModifiedBy(itxProtocolProtocol.getModifiedBy());
-    	updatedItxProtocolProtocol.setCodeName(itxProtocolProtocol.getCodeName());
-    	updatedItxProtocolProtocol.setLsType(itxProtocolProtocol.getLsType());
-    	updatedItxProtocolProtocol.setLsKind(itxProtocolProtocol.getLsKind());
-    	updatedItxProtocolProtocol.setLsTypeAndKind(itxProtocolProtocol.getLsTypeAndKind());
-    	updatedItxProtocolProtocol.firstProtocol = Protocol.findProtocol(itxProtocolProtocol.getFirstProtocol().getId());
-    	updatedItxProtocolProtocol.secondProtocol = Protocol.findProtocol(itxProtocolProtocol.getSecondProtocol().getId());    	
-    	updatedItxProtocolProtocol.setModifiedDate(new Date());
-    	updatedItxProtocolProtocol.merge();
-    	
-    	logger.debug("------------ Just updated the itxProtocolProtocol: ");
-    	if(logger.isDebugEnabled()) logger.debug(updatedItxProtocolProtocol.toJson());
-    	
+        ItxProtocolProtocol updatedItxProtocolProtocol = ItxProtocolProtocol
+                .findItxProtocolProtocol(itxProtocolProtocol.getId());
+        updatedItxProtocolProtocol.setRecordedBy(itxProtocolProtocol.getRecordedBy());
+        updatedItxProtocolProtocol.setRecordedDate(itxProtocolProtocol.getRecordedDate());
+        updatedItxProtocolProtocol.setIgnored(itxProtocolProtocol.isIgnored());
+        updatedItxProtocolProtocol.setDeleted(itxProtocolProtocol.isDeleted());
+        updatedItxProtocolProtocol.setLsTransaction(itxProtocolProtocol.getLsTransaction());
+        updatedItxProtocolProtocol.setModifiedBy(itxProtocolProtocol.getModifiedBy());
+        updatedItxProtocolProtocol.setCodeName(itxProtocolProtocol.getCodeName());
+        updatedItxProtocolProtocol.setLsType(itxProtocolProtocol.getLsType());
+        updatedItxProtocolProtocol.setLsKind(itxProtocolProtocol.getLsKind());
+        updatedItxProtocolProtocol.setLsTypeAndKind(itxProtocolProtocol.getLsTypeAndKind());
+        updatedItxProtocolProtocol.firstProtocol = Protocol
+                .findProtocol(itxProtocolProtocol.getFirstProtocol().getId());
+        updatedItxProtocolProtocol.secondProtocol = Protocol
+                .findProtocol(itxProtocolProtocol.getSecondProtocol().getId());
+        updatedItxProtocolProtocol.setModifiedDate(new Date());
+        updatedItxProtocolProtocol.merge();
+
+        logger.debug("------------ Just updated the itxProtocolProtocol: ");
+        if (logger.isDebugEnabled())
+            logger.debug(updatedItxProtocolProtocol.toJson());
+
         return updatedItxProtocolProtocol;
     }
-    
-    
+
     @Transactional
     public static TypedQuery<ItxProtocolProtocol> findItxProtocolProtocolsByFirstProtocol(Protocol firstProtocol) {
-        if (firstProtocol == null) throw new IllegalArgumentException("The firstProtocol argument is required");
+        if (firstProtocol == null)
+            throw new IllegalArgumentException("The firstProtocol argument is required");
         EntityManager em = ItxProtocolProtocol.entityManager();
-        TypedQuery<ItxProtocolProtocol> q = em.createQuery("SELECT o FROM ItxProtocolProtocol AS o WHERE o.firstProtocol = :firstProtocol", ItxProtocolProtocol.class);
+        TypedQuery<ItxProtocolProtocol> q = em.createQuery(
+                "SELECT o FROM ItxProtocolProtocol AS o WHERE o.firstProtocol = :firstProtocol",
+                ItxProtocolProtocol.class);
         q.setParameter("firstProtocol", firstProtocol);
         return q;
     }
-    
+
     @Transactional
     public static TypedQuery<ItxProtocolProtocol> findItxProtocolProtocolsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = ItxProtocolProtocol.entityManager();
-        TypedQuery<ItxProtocolProtocol> q = em.createQuery("SELECT o FROM ItxProtocolProtocol AS o WHERE o.lsTransaction = :lsTransaction", ItxProtocolProtocol.class);
+        TypedQuery<ItxProtocolProtocol> q = em.createQuery(
+                "SELECT o FROM ItxProtocolProtocol AS o WHERE o.lsTransaction = :lsTransaction",
+                ItxProtocolProtocol.class);
         q.setParameter("lsTransaction", lsTransaction);
         return q;
     }
-    
+
     @Transactional
     public static TypedQuery<ItxProtocolProtocol> findItxProtocolProtocolsBySecondProtocol(Protocol secondProtocol) {
-        if (secondProtocol == null) throw new IllegalArgumentException("The secondProtocol argument is required");
+        if (secondProtocol == null)
+            throw new IllegalArgumentException("The secondProtocol argument is required");
         EntityManager em = ItxProtocolProtocol.entityManager();
-        TypedQuery<ItxProtocolProtocol> q = em.createQuery("SELECT o FROM ItxProtocolProtocol AS o WHERE o.secondProtocol = :secondProtocol", ItxProtocolProtocol.class);
+        TypedQuery<ItxProtocolProtocol> q = em.createQuery(
+                "SELECT o FROM ItxProtocolProtocol AS o WHERE o.secondProtocol = :secondProtocol",
+                ItxProtocolProtocol.class);
         q.setParameter("secondProtocol", secondProtocol);
         return q;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static Long countFindItxProtocolProtocolsByFirstProtocol(Protocol firstProtocol) {
-        if (firstProtocol == null) throw new IllegalArgumentException("The firstProtocol argument is required");
+    public static Long countFindItxProtocolProtocolsByFirstProtocol(Protocol firstProtocol) {
+        if (firstProtocol == null)
+            throw new IllegalArgumentException("The firstProtocol argument is required");
         EntityManager em = ItxProtocolProtocol.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxProtocolProtocol AS o WHERE o.firstProtocol = :firstProtocol", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ItxProtocolProtocol AS o WHERE o.firstProtocol = :firstProtocol", Long.class);
         q.setParameter("firstProtocol", firstProtocol);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindItxProtocolProtocolsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static Long countFindItxProtocolProtocolsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = ItxProtocolProtocol.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxProtocolProtocol AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ItxProtocolProtocol AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
         q.setParameter("lsTransaction", lsTransaction);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindItxProtocolProtocolsBySecondProtocol(Protocol secondProtocol) {
-        if (secondProtocol == null) throw new IllegalArgumentException("The secondProtocol argument is required");
+    public static Long countFindItxProtocolProtocolsBySecondProtocol(Protocol secondProtocol) {
+        if (secondProtocol == null)
+            throw new IllegalArgumentException("The secondProtocol argument is required");
         EntityManager em = ItxProtocolProtocol.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxProtocolProtocol AS o WHERE o.secondProtocol = :secondProtocol", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ItxProtocolProtocol AS o WHERE o.secondProtocol = :secondProtocol", Long.class);
         q.setParameter("secondProtocol", secondProtocol);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<ItxProtocolProtocol> findItxProtocolProtocolsByFirstProtocol(Protocol firstProtocol, String sortFieldName, String sortOrder) {
-        if (firstProtocol == null) throw new IllegalArgumentException("The firstProtocol argument is required");
+    public static TypedQuery<ItxProtocolProtocol> findItxProtocolProtocolsByFirstProtocol(Protocol firstProtocol,
+            String sortFieldName, String sortOrder) {
+        if (firstProtocol == null)
+            throw new IllegalArgumentException("The firstProtocol argument is required");
         EntityManager em = ItxProtocolProtocol.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxProtocolProtocol AS o WHERE o.firstProtocol = :firstProtocol");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ItxProtocolProtocol AS o WHERE o.firstProtocol = :firstProtocol");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -205,10 +226,13 @@ public static TypedQuery<ItxProtocolProtocol> findItxProtocolProtocolsByFirstPro
         return q;
     }
 
-	public static TypedQuery<ItxProtocolProtocol> findItxProtocolProtocolsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<ItxProtocolProtocol> findItxProtocolProtocolsByLsTransactionEquals(Long lsTransaction,
+            String sortFieldName, String sortOrder) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = ItxProtocolProtocol.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxProtocolProtocol AS o WHERE o.lsTransaction = :lsTransaction");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ItxProtocolProtocol AS o WHERE o.lsTransaction = :lsTransaction");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -220,10 +244,13 @@ public static TypedQuery<ItxProtocolProtocol> findItxProtocolProtocolsByLsTransa
         return q;
     }
 
-	public static TypedQuery<ItxProtocolProtocol> findItxProtocolProtocolsBySecondProtocol(Protocol secondProtocol, String sortFieldName, String sortOrder) {
-        if (secondProtocol == null) throw new IllegalArgumentException("The secondProtocol argument is required");
+    public static TypedQuery<ItxProtocolProtocol> findItxProtocolProtocolsBySecondProtocol(Protocol secondProtocol,
+            String sortFieldName, String sortOrder) {
+        if (secondProtocol == null)
+            throw new IllegalArgumentException("The secondProtocol argument is required");
         EntityManager em = ItxProtocolProtocol.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxProtocolProtocol AS o WHERE o.secondProtocol = :secondProtocol");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ItxProtocolProtocol AS o WHERE o.secondProtocol = :secondProtocol");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -235,17 +262,19 @@ public static TypedQuery<ItxProtocolProtocol> findItxProtocolProtocolsBySecondPr
         return q;
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "firstProtocol", "secondProtocol", "lsStates");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "firstProtocol",
+            "secondProtocol", "lsStates");
 
-	public static long countItxProtocolProtocols() {
+    public static long countItxProtocolProtocols() {
         return entityManager().createQuery("SELECT COUNT(o) FROM ItxProtocolProtocol o", Long.class).getSingleResult();
     }
 
-	public static List<ItxProtocolProtocol> findAllItxProtocolProtocols() {
-        return entityManager().createQuery("SELECT o FROM ItxProtocolProtocol o", ItxProtocolProtocol.class).getResultList();
+    public static List<ItxProtocolProtocol> findAllItxProtocolProtocols() {
+        return entityManager().createQuery("SELECT o FROM ItxProtocolProtocol o", ItxProtocolProtocol.class)
+                .getResultList();
     }
 
-	public static List<ItxProtocolProtocol> findAllItxProtocolProtocols(String sortFieldName, String sortOrder) {
+    public static List<ItxProtocolProtocol> findAllItxProtocolProtocols(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxProtocolProtocol o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -256,16 +285,19 @@ public static List<ItxProtocolProtocol> findAllItxProtocolProtocols(String sortF
         return entityManager().createQuery(jpaQuery, ItxProtocolProtocol.class).getResultList();
     }
 
-	public static ItxProtocolProtocol findItxProtocolProtocol(Long id) {
-        if (id == null) return null;
+    public static ItxProtocolProtocol findItxProtocolProtocol(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ItxProtocolProtocol.class, id);
     }
 
-	public static List<ItxProtocolProtocol> findItxProtocolProtocolEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxProtocolProtocol o", ItxProtocolProtocol.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ItxProtocolProtocol> findItxProtocolProtocolEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ItxProtocolProtocol o", ItxProtocolProtocol.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ItxProtocolProtocol> findItxProtocolProtocolEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ItxProtocolProtocol> findItxProtocolProtocolEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxProtocolProtocol o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -273,42 +305,44 @@ public static List<ItxProtocolProtocol> findItxProtocolProtocolEntries(int first
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ItxProtocolProtocol.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ItxProtocolProtocol.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public ItxProtocolProtocol merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ItxProtocolProtocol merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public ItxProtocolProtocol() {
+    public ItxProtocolProtocol() {
         super();
     }
 
-	public Protocol getFirstProtocol() {
+    public Protocol getFirstProtocol() {
         return this.firstProtocol;
     }
 
-	public void setFirstProtocol(Protocol firstProtocol) {
+    public void setFirstProtocol(Protocol firstProtocol) {
         this.firstProtocol = firstProtocol;
     }
 
-	public Protocol getSecondProtocol() {
+    public Protocol getSecondProtocol() {
         return this.secondProtocol;
     }
 
-	public void setSecondProtocol(Protocol secondProtocol) {
+    public void setSecondProtocol(Protocol secondProtocol) {
         this.secondProtocol = secondProtocol;
     }
 
-	public Set<ItxProtocolProtocolState> getLsStates() {
+    public Set<ItxProtocolProtocolState> getLsStates() {
         return this.lsStates;
     }
 
-	public void setLsStates(Set<ItxProtocolProtocolState> lsStates) {
+    public void setLsStates(Set<ItxProtocolProtocolState> lsStates) {
         this.lsStates = lsStates;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState.java b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState.java
index 1ce66c533..1602dd81b 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolState.java
@@ -33,92 +33,93 @@
 public class ItxProtocolProtocolState extends AbstractState {
 
     public ItxProtocolProtocolState(ItxProtocolProtocolState itxState) {
-		this.setRecordedBy(itxState.getRecordedBy());
-		this.setRecordedDate(itxState.getRecordedDate());
-		this.setLsTransaction(itxState.getLsTransaction());
-		this.setModifiedBy(itxState.getModifiedBy());
-		this.setModifiedDate(itxState.getModifiedDate());
-		
-    }
-    
+        this.setRecordedBy(itxState.getRecordedBy());
+        this.setRecordedDate(itxState.getRecordedDate());
+        this.setLsTransaction(itxState.getLsTransaction());
+        this.setModifiedBy(itxState.getModifiedBy());
+        this.setModifiedDate(itxState.getModifiedDate());
+
+    }
+
     public static ItxProtocolProtocolState update(ItxProtocolProtocolState object) {
-    	ItxProtocolProtocolState updatedObject = new JSONDeserializer<ItxProtocolProtocolState>().use(null, ItxProtocolProtocolState.class).
-        		deserializeInto(object.toJson(), 
-        				ItxProtocolProtocolState.findItxProtocolProtocolState(object.getId()));
-    	updatedObject.setModifiedDate(new Date());
-    	updatedObject.merge();
+        ItxProtocolProtocolState updatedObject = new JSONDeserializer<ItxProtocolProtocolState>()
+                .use(null, ItxProtocolProtocolState.class).deserializeInto(object.toJson(),
+                        ItxProtocolProtocolState.findItxProtocolProtocolState(object.getId()));
+        updatedObject.setModifiedDate(new Date());
+        updatedObject.merge();
         return updatedObject;
     }
 
-	@ManyToOne
-	@JoinColumn(name = "itx_protocol_protocol")
+    @ManyToOne
+    @JoinColumn(name = "itx_protocol_protocol")
     private ItxProtocolProtocol itxProtocolProtocol;
 
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "lsState",  fetch =  FetchType.LAZY)
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "lsState", fetch = FetchType.LAZY)
     private Set<ItxProtocolProtocolValue> lsValues = new HashSet<ItxProtocolProtocolValue>();
-    
-    
-	@Transactional
+
+    @Transactional
     public String toJson() {
         return new JSONSerializer().exclude("*.class")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(this);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
 
-	@Transactional
+    @Transactional
     public String toJsonStub() {
         return new JSONSerializer().exclude("*.class", "itxProtocolProtocol")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(this);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
 
     public static ItxProtocolProtocolState fromJsonToItxContainerContainerState(String json) {
         return new JSONDeserializer<ItxProtocolProtocolState>().use(null, ItxProtocolProtocolState.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
-    
-	@Transactional
+
+    @Transactional
     public static String toJsonArray(Collection<ItxProtocolProtocolState> collection) {
         return new JSONSerializer().exclude("*.class")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(collection);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
 
-	@Transactional
+    @Transactional
     public static String toJsonArrayStub(Collection<ItxProtocolProtocolState> collection) {
         return new JSONSerializer().exclude("*.class", "itxProtocolProtocol")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(collection);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
-    
+
     public static Collection<ItxProtocolProtocolState> fromJsonArrayToItxProtocolProtocolStates(String json) {
         return new JSONDeserializer<List<ItxProtocolProtocolState>>().use(null, ArrayList.class)
-        		.use("values", ItxProtocolProtocolState.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use("values", ItxProtocolProtocolState.class)
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
 
     public static Collection<ItxProtocolProtocolState> fromJsonArrayToItxProtocolProtocolStates(Reader json) {
         return new JSONDeserializer<List<ItxProtocolProtocolState>>().use(null, ArrayList.class)
-        		.use("values", ItxProtocolProtocolState.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use("values", ItxProtocolProtocolState.class)
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
 
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("itxProtocolProtocol",
+            "lsValues");
 
-
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("itxProtocolProtocol", "lsValues");
-
-	public static long countItxProtocolProtocolStates() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ItxProtocolProtocolState o", Long.class).getSingleResult();
+    public static long countItxProtocolProtocolStates() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ItxProtocolProtocolState o", Long.class)
+                .getSingleResult();
     }
 
-	public static List<ItxProtocolProtocolState> findAllItxProtocolProtocolStates() {
-        return entityManager().createQuery("SELECT o FROM ItxProtocolProtocolState o", ItxProtocolProtocolState.class).getResultList();
+    public static List<ItxProtocolProtocolState> findAllItxProtocolProtocolStates() {
+        return entityManager().createQuery("SELECT o FROM ItxProtocolProtocolState o", ItxProtocolProtocolState.class)
+                .getResultList();
     }
 
-	public static List<ItxProtocolProtocolState> findAllItxProtocolProtocolStates(String sortFieldName, String sortOrder) {
+    public static List<ItxProtocolProtocolState> findAllItxProtocolProtocolStates(String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxProtocolProtocolState o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -129,16 +130,19 @@ public static List<ItxProtocolProtocolState> findAllItxProtocolProtocolStates(St
         return entityManager().createQuery(jpaQuery, ItxProtocolProtocolState.class).getResultList();
     }
 
-	public static ItxProtocolProtocolState findItxProtocolProtocolState(Long id) {
-        if (id == null) return null;
+    public static ItxProtocolProtocolState findItxProtocolProtocolState(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ItxProtocolProtocolState.class, id);
     }
 
-	public static List<ItxProtocolProtocolState> findItxProtocolProtocolStateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxProtocolProtocolState o", ItxProtocolProtocolState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ItxProtocolProtocolState> findItxProtocolProtocolStateEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ItxProtocolProtocolState o", ItxProtocolProtocolState.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ItxProtocolProtocolState> findItxProtocolProtocolStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ItxProtocolProtocolState> findItxProtocolProtocolStateEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxProtocolProtocolState o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -146,43 +150,45 @@ public static List<ItxProtocolProtocolState> findItxProtocolProtocolStateEntries
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ItxProtocolProtocolState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ItxProtocolProtocolState.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public ItxProtocolProtocolState merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ItxProtocolProtocolState merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public ItxProtocolProtocolState() {
+    public ItxProtocolProtocolState() {
         super();
     }
 
-	public ItxProtocolProtocol getItxProtocolProtocol() {
+    public ItxProtocolProtocol getItxProtocolProtocol() {
         return this.itxProtocolProtocol;
     }
 
-	public void setItxProtocolProtocol(ItxProtocolProtocol itxProtocolProtocol) {
+    public void setItxProtocolProtocol(ItxProtocolProtocol itxProtocolProtocol) {
         this.itxProtocolProtocol = itxProtocolProtocol;
     }
 
-	public Set<ItxProtocolProtocolValue> getLsValues() {
+    public Set<ItxProtocolProtocolValue> getLsValues() {
         return this.lsValues;
     }
 
-	public void setLsValues(Set<ItxProtocolProtocolValue> lsValues) {
+    public void setLsValues(Set<ItxProtocolProtocolValue> lsValues) {
         this.lsValues = lsValues;
     }
 
-	public static ItxProtocolProtocolState fromJsonToItxProtocolProtocolState(String json) {
+    public static ItxProtocolProtocolState fromJsonToItxProtocolProtocolState(String json) {
         return new JSONDeserializer<ItxProtocolProtocolState>()
-        .use(null, ItxProtocolProtocolState.class).deserialize(json);
+                .use(null, ItxProtocolProtocolState.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue.java b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue.java
index 7914fc207..5d350aea5 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxProtocolProtocolValue.java
@@ -24,85 +24,86 @@
 @Entity
 
 public class ItxProtocolProtocolValue extends AbstractValue {
-		
+
     @ManyToOne
     @JoinColumn(name = "ls_state")
     private ItxProtocolProtocolState lsState;
-    
+
     public static ItxProtocolProtocolValue update(ItxProtocolProtocolValue object) {
-    	ItxProtocolProtocolValue updatedObject = new JSONDeserializer<ItxProtocolProtocolValue>().use(null, ItxProtocolProtocolValue.class).
-        		deserializeInto(object.toJson(), 
-        				ItxProtocolProtocolValue.findItxProtocolProtocolValue(object.getId()));
-    	updatedObject.setModifiedDate(new Date());
-    	updatedObject.merge();
+        ItxProtocolProtocolValue updatedObject = new JSONDeserializer<ItxProtocolProtocolValue>()
+                .use(null, ItxProtocolProtocolValue.class).deserializeInto(object.toJson(),
+                        ItxProtocolProtocolValue.findItxProtocolProtocolValue(object.getId()));
+        updatedObject.setModifiedDate(new Date());
+        updatedObject.merge();
         return updatedObject;
     }
-    
-    
+
     public static ItxProtocolProtocolValue fromJsonToItxProtocolProtocolValue(String json) {
-        return new JSONDeserializer<ItxProtocolProtocolValue>().
-        		use(null, ItxProtocolProtocolValue.class).
-        		
-        		deserialize(json);
+        return new JSONDeserializer<ItxProtocolProtocolValue>().use(null, ItxProtocolProtocolValue.class).
+
+                deserialize(json);
     }
-    
+
     public static Collection<ItxProtocolProtocolValue> fromJsonArrayToItxProtocolProtocolValues(String json) {
-        return new JSONDeserializer<List<ItxProtocolProtocolValue>>().
-        		use(null, ArrayList.class).
-        		use("values", ItxProtocolProtocolValue.class).
-        		
-        		deserialize(json);
+        return new JSONDeserializer<List<ItxProtocolProtocolValue>>().use(null, ArrayList.class)
+                .use("values", ItxProtocolProtocolValue.class).
+
+                deserialize(json);
     }
-    
+
     public static Collection<ItxProtocolProtocolValue> fromJsonArrayToItxProtocolProtocolValues(Reader json) {
-        return new JSONDeserializer<List<ItxProtocolProtocolValue>>().
-        		use(null, ArrayList.class).
-        		use("values", ItxProtocolProtocolValue.class).
-        		
-        		deserialize(json);
-    }
-    
-	@Transactional
+        return new JSONDeserializer<List<ItxProtocolProtocolValue>>().use(null, ArrayList.class)
+                .use("values", ItxProtocolProtocolValue.class).
+
+                deserialize(json);
+    }
+
+    @Transactional
     public String toJson() {
         return new JSONSerializer().exclude("*.class")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(this);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
-    
-	@Transactional
+
+    @Transactional
     public static String toJsonArray(Collection<ItxProtocolProtocolValue> collection) {
         return new JSONSerializer().exclude("*.class")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(collection);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
 
-	@Transactional
+    @Transactional
     public static String toJsonArrayStub(Collection<ItxProtocolProtocolValue> collection) {
         return new JSONSerializer().exclude("*.class", "lsState")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(collection);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
-	
-	public static ItxProtocolProtocolValue create(ItxProtocolProtocolValue lsThingValue) {
-        ItxProtocolProtocolValue newItxProtocolProtocolValue = new JSONDeserializer<ItxProtocolProtocolValue>().use(null, ItxProtocolProtocolValue.class).deserializeInto(lsThingValue.toJson(), new ItxProtocolProtocolValue());
+
+    public static ItxProtocolProtocolValue create(ItxProtocolProtocolValue lsThingValue) {
+        ItxProtocolProtocolValue newItxProtocolProtocolValue = new JSONDeserializer<ItxProtocolProtocolValue>()
+                .use(null, ItxProtocolProtocolValue.class)
+                .deserializeInto(lsThingValue.toJson(), new ItxProtocolProtocolValue());
         return newItxProtocolProtocolValue;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsState");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsState");
 
-	public static long countItxProtocolProtocolValues() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ItxProtocolProtocolValue o", Long.class).getSingleResult();
+    public static long countItxProtocolProtocolValues() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ItxProtocolProtocolValue o", Long.class)
+                .getSingleResult();
     }
 
-	public static List<ItxProtocolProtocolValue> findAllItxProtocolProtocolValues() {
-        return entityManager().createQuery("SELECT o FROM ItxProtocolProtocolValue o", ItxProtocolProtocolValue.class).getResultList();
+    public static List<ItxProtocolProtocolValue> findAllItxProtocolProtocolValues() {
+        return entityManager().createQuery("SELECT o FROM ItxProtocolProtocolValue o", ItxProtocolProtocolValue.class)
+                .getResultList();
     }
 
-	public static List<ItxProtocolProtocolValue> findAllItxProtocolProtocolValues(String sortFieldName, String sortOrder) {
+    public static List<ItxProtocolProtocolValue> findAllItxProtocolProtocolValues(String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxProtocolProtocolValue o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -113,16 +114,19 @@ public static List<ItxProtocolProtocolValue> findAllItxProtocolProtocolValues(St
         return entityManager().createQuery(jpaQuery, ItxProtocolProtocolValue.class).getResultList();
     }
 
-	public static ItxProtocolProtocolValue findItxProtocolProtocolValue(Long id) {
-        if (id == null) return null;
+    public static ItxProtocolProtocolValue findItxProtocolProtocolValue(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ItxProtocolProtocolValue.class, id);
     }
 
-	public static List<ItxProtocolProtocolValue> findItxProtocolProtocolValueEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxProtocolProtocolValue o", ItxProtocolProtocolValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ItxProtocolProtocolValue> findItxProtocolProtocolValueEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ItxProtocolProtocolValue o", ItxProtocolProtocolValue.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ItxProtocolProtocolValue> findItxProtocolProtocolValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ItxProtocolProtocolValue> findItxProtocolProtocolValueEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxProtocolProtocolValue o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -130,22 +134,24 @@ public static List<ItxProtocolProtocolValue> findItxProtocolProtocolValueEntries
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ItxProtocolProtocolValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ItxProtocolProtocolValue.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public ItxProtocolProtocolValue merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ItxProtocolProtocolValue merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public ItxProtocolProtocolState getLsState() {
+    public ItxProtocolProtocolState getLsState() {
         return this.lsState;
     }
 
-	public void setLsState(ItxProtocolProtocolState lsState) {
+    public void setLsState(ItxProtocolProtocolState lsState) {
         this.lsState = lsState;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer.java b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer.java
index af685d341..f7247987b 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainer.java
@@ -37,8 +37,8 @@
 @Entity
 
 public class ItxSubjectContainer extends AbstractThing {
-	
-	private static final Logger logger = LoggerFactory.getLogger(ItxSubjectContainer.class);
+
+    private static final Logger logger = LoggerFactory.getLogger(ItxSubjectContainer.class);
 
     @NotNull
     @ManyToOne(fetch = FetchType.EAGER)
@@ -55,7 +55,7 @@ public class ItxSubjectContainer extends AbstractThing {
 
     public ItxSubjectContainer() {
     }
-    
+
     public ItxSubjectContainer(com.labsynch.labseer.domain.ItxSubjectContainer itxSubjectContainer) {
         super.setRecordedBy(itxSubjectContainer.getRecordedBy());
         super.setRecordedDate(itxSubjectContainer.getRecordedDate());
@@ -69,185 +69,205 @@ public ItxSubjectContainer(com.labsynch.labseer.domain.ItxSubjectContainer itxSu
         this.subject = itxSubjectContainer.getSubject();
         this.container = itxSubjectContainer.getContainer();
     }
-    
+
     public static ItxSubjectContainer update(ItxSubjectContainer object) {
-    	ItxSubjectContainer updatedObject = new JSONDeserializer<ItxSubjectContainer>().use(null, ItxSubjectContainer.class).
-        		deserializeInto(object.toJson(), 
-        				ItxSubjectContainer.findItxSubjectContainer(object.getId()));
-    	updatedObject.setModifiedDate(new Date());
-    	updatedObject.merge();
+        ItxSubjectContainer updatedObject = new JSONDeserializer<ItxSubjectContainer>()
+                .use(null, ItxSubjectContainer.class).deserializeInto(object.toJson(),
+                        ItxSubjectContainer.findItxSubjectContainer(object.getId()));
+        updatedObject.setModifiedDate(new Date());
+        updatedObject.merge();
         return updatedObject;
     }
-  
 
-	public static long countItxSubjectContainers() {
+    public static long countItxSubjectContainers() {
         return entityManager().createQuery("SELECT COUNT(o) FROM ItxSubjectContainer o", Long.class).getSingleResult();
     }
 
-	public static List<ItxSubjectContainer> findAllItxSubjectContainers() {
-        return entityManager().createQuery("SELECT o FROM ItxSubjectContainer o", ItxSubjectContainer.class).getResultList();
+    public static List<ItxSubjectContainer> findAllItxSubjectContainers() {
+        return entityManager().createQuery("SELECT o FROM ItxSubjectContainer o", ItxSubjectContainer.class)
+                .getResultList();
     }
 
-	public static ItxSubjectContainer findItxSubjectContainer(Long id) {
-        if (id == null) return null;
+    public static ItxSubjectContainer findItxSubjectContainer(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ItxSubjectContainer.class, id);
     }
-	
-	public static List<ItxSubjectContainer> findItxSubjectContainerByExperimentID(Long experimentId) {
-        if (experimentId == null) return null;
-		String selectSQL = "SELECT oo FROM ItxSubjectContainer oo WHERE oo.id in (select o.id from ItxSubjectContainer o where o.subject.treatmentGroup.analysisGroup.experiment.id = :experimentId)";
-		EntityManager em = ItxSubjectContainer.entityManager();
-		TypedQuery<ItxSubjectContainer> q = em.createQuery(selectSQL, ItxSubjectContainer.class);
-		q.setParameter("experimentId", experimentId);
-		return q.getResultList();
+
+    public static List<ItxSubjectContainer> findItxSubjectContainerByExperimentID(Long experimentId) {
+        if (experimentId == null)
+            return null;
+        String selectSQL = "SELECT oo FROM ItxSubjectContainer oo WHERE oo.id in (select o.id from ItxSubjectContainer o where o.subject.treatmentGroup.analysisGroup.experiment.id = :experimentId)";
+        EntityManager em = ItxSubjectContainer.entityManager();
+        TypedQuery<ItxSubjectContainer> q = em.createQuery(selectSQL, ItxSubjectContainer.class);
+        q.setParameter("experimentId", experimentId);
+        return q.getResultList();
     }
 
-	public static List<ItxSubjectContainer> findItxSubjectContainerEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxSubjectContainer o", ItxSubjectContainer.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ItxSubjectContainer> findItxSubjectContainerEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ItxSubjectContainer o", ItxSubjectContainer.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public ItxSubjectContainer merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ItxSubjectContainer merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
-	
-	@Transactional
-	public static int deleteByExperimentID(Long experimentId) {
-		if (experimentId == null) return 0;
-		EntityManager em = ItxSubjectContainer.entityManager();
-		String deleteSQL = "DELETE FROM ItxSubjectContainer oo WHERE id in (select o.id from ItxSubjectContainer o where o.subject.treatmentGroup.analysisGroup.experiment.id = :experimentId)";
-		Query q = em.createQuery(deleteSQL);
-		q.setParameter("experimentId", experimentId);
-		int numberOfDeletedEntities = q.executeUpdate();
-		return numberOfDeletedEntities;
-	}
-	
+
+    @Transactional
+    public static int deleteByExperimentID(Long experimentId) {
+        if (experimentId == null)
+            return 0;
+        EntityManager em = ItxSubjectContainer.entityManager();
+        String deleteSQL = "DELETE FROM ItxSubjectContainer oo WHERE id in (select o.id from ItxSubjectContainer o where o.subject.treatmentGroup.analysisGroup.experiment.id = :experimentId)";
+        Query q = em.createQuery(deleteSQL);
+        q.setParameter("experimentId", experimentId);
+        int numberOfDeletedEntities = q.executeUpdate();
+        return numberOfDeletedEntities;
+    }
+
     public String toJson() {
         return new JSONSerializer().exclude("*.class")
-            	.transform(new ExcludeNulls(), void.class)
-            	.serialize(this);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
-    
+
     public static ItxSubjectContainer fromJsonToItxSubjectContainer(String json) {
         return new JSONDeserializer<ItxSubjectContainer>().use(null, ItxSubjectContainer.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
-    
+
     public static String toJsonArray(Collection<ItxSubjectContainer> collection) {
-        return new JSONSerializer().exclude("*.class")            	
-        		.transform(new ExcludeNulls(), void.class)
-        		.serialize(collection);
+        return new JSONSerializer().exclude("*.class")
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
-    
-    
+
     public static Collection<ItxSubjectContainer> fromJsonArrayToItxSubjectContainers(String json) {
-        return new JSONDeserializer<List<ItxSubjectContainer>>().use(null, ArrayList.class).use("values", ItxSubjectContainer.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+        return new JSONDeserializer<List<ItxSubjectContainer>>().use(null, ArrayList.class)
+                .use("values", ItxSubjectContainer.class)
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
 
     public static Collection<ItxSubjectContainer> fromJsonArrayToItxSubjectContainers(Reader json) {
-        return new JSONDeserializer<List<ItxSubjectContainer>>().use(null, ArrayList.class).use("values", ItxSubjectContainer.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+        return new JSONDeserializer<List<ItxSubjectContainer>>().use(null, ArrayList.class)
+                .use("values", ItxSubjectContainer.class)
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
 
     public static ItxSubjectContainer updateNoStates(ItxSubjectContainer itxSubjectContainer) {
-    	ItxSubjectContainer updatedItxSubjectContainer = ItxSubjectContainer.findItxSubjectContainer(itxSubjectContainer.getId());
-    	updatedItxSubjectContainer.setRecordedBy(itxSubjectContainer.getRecordedBy());
-    	updatedItxSubjectContainer.setRecordedDate(itxSubjectContainer.getRecordedDate());
-    	updatedItxSubjectContainer.setIgnored(itxSubjectContainer.isIgnored());
-    	updatedItxSubjectContainer.setDeleted(itxSubjectContainer.isDeleted());
-    	updatedItxSubjectContainer.setLsTransaction(itxSubjectContainer.getLsTransaction());
-    	updatedItxSubjectContainer.setModifiedBy(itxSubjectContainer.getModifiedBy());
-    	updatedItxSubjectContainer.setCodeName(itxSubjectContainer.getCodeName());
-    	updatedItxSubjectContainer.setLsType(itxSubjectContainer.getLsType());
-    	updatedItxSubjectContainer.setLsKind(itxSubjectContainer.getLsKind());
-    	updatedItxSubjectContainer.setLsTypeAndKind(itxSubjectContainer.getLsTypeAndKind());
-    	updatedItxSubjectContainer.subject = Subject.findSubject(itxSubjectContainer.getSubject().getId());
-    	updatedItxSubjectContainer.container = Container.findContainer(itxSubjectContainer.getContainer().getId());    	
-    	updatedItxSubjectContainer.setModifiedDate(new Date());
-    	updatedItxSubjectContainer.merge();
-    	
-    	logger.debug("------------ Just updated the itxSubjectContainer: ");
-    	if(logger.isDebugEnabled()) logger.debug(updatedItxSubjectContainer.toJson());
-    	
+        ItxSubjectContainer updatedItxSubjectContainer = ItxSubjectContainer
+                .findItxSubjectContainer(itxSubjectContainer.getId());
+        updatedItxSubjectContainer.setRecordedBy(itxSubjectContainer.getRecordedBy());
+        updatedItxSubjectContainer.setRecordedDate(itxSubjectContainer.getRecordedDate());
+        updatedItxSubjectContainer.setIgnored(itxSubjectContainer.isIgnored());
+        updatedItxSubjectContainer.setDeleted(itxSubjectContainer.isDeleted());
+        updatedItxSubjectContainer.setLsTransaction(itxSubjectContainer.getLsTransaction());
+        updatedItxSubjectContainer.setModifiedBy(itxSubjectContainer.getModifiedBy());
+        updatedItxSubjectContainer.setCodeName(itxSubjectContainer.getCodeName());
+        updatedItxSubjectContainer.setLsType(itxSubjectContainer.getLsType());
+        updatedItxSubjectContainer.setLsKind(itxSubjectContainer.getLsKind());
+        updatedItxSubjectContainer.setLsTypeAndKind(itxSubjectContainer.getLsTypeAndKind());
+        updatedItxSubjectContainer.subject = Subject.findSubject(itxSubjectContainer.getSubject().getId());
+        updatedItxSubjectContainer.container = Container.findContainer(itxSubjectContainer.getContainer().getId());
+        updatedItxSubjectContainer.setModifiedDate(new Date());
+        updatedItxSubjectContainer.merge();
+
+        logger.debug("------------ Just updated the itxSubjectContainer: ");
+        if (logger.isDebugEnabled())
+            logger.debug(updatedItxSubjectContainer.toJson());
+
         return updatedItxSubjectContainer;
     }
 
-
-	public Subject getSubject() {
+    public Subject getSubject() {
         return this.subject;
     }
 
-	public void setSubject(Subject subject) {
+    public void setSubject(Subject subject) {
         this.subject = subject;
     }
 
-	public Container getContainer() {
+    public Container getContainer() {
         return this.container;
     }
 
-	public void setContainer(Container container) {
+    public void setContainer(Container container) {
         this.container = container;
     }
 
-	public Set<ItxSubjectContainerState> getLsStates() {
+    public Set<ItxSubjectContainerState> getLsStates() {
         return this.lsStates;
     }
 
-	public void setLsStates(Set<ItxSubjectContainerState> lsStates) {
+    public void setLsStates(Set<ItxSubjectContainerState> lsStates) {
         this.lsStates = lsStates;
     }
 
-	public static Long countFindItxSubjectContainersByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static Long countFindItxSubjectContainersByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = ItxSubjectContainer.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxSubjectContainer AS o WHERE o.codeName = :codeName", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxSubjectContainer AS o WHERE o.codeName = :codeName",
+                Long.class);
         q.setParameter("codeName", codeName);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindItxSubjectContainersByContainer(Container container) {
-        if (container == null) throw new IllegalArgumentException("The container argument is required");
+    public static Long countFindItxSubjectContainersByContainer(Container container) {
+        if (container == null)
+            throw new IllegalArgumentException("The container argument is required");
         EntityManager em = ItxSubjectContainer.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxSubjectContainer AS o WHERE o.container = :container", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxSubjectContainer AS o WHERE o.container = :container",
+                Long.class);
         q.setParameter("container", container);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindItxSubjectContainersByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static Long countFindItxSubjectContainersByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = ItxSubjectContainer.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxSubjectContainer AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ItxSubjectContainer AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
         q.setParameter("lsTransaction", lsTransaction);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindItxSubjectContainersBySubject(Subject subject) {
-        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
+    public static Long countFindItxSubjectContainersBySubject(Subject subject) {
+        if (subject == null)
+            throw new IllegalArgumentException("The subject argument is required");
         EntityManager em = ItxSubjectContainer.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxSubjectContainer AS o WHERE o.subject = :subject", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ItxSubjectContainer AS o WHERE o.subject = :subject",
+                Long.class);
         q.setParameter("subject", subject);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<ItxSubjectContainer> findItxSubjectContainersByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static TypedQuery<ItxSubjectContainer> findItxSubjectContainersByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = ItxSubjectContainer.entityManager();
-        TypedQuery<ItxSubjectContainer> q = em.createQuery("SELECT o FROM ItxSubjectContainer AS o WHERE o.codeName = :codeName", ItxSubjectContainer.class);
+        TypedQuery<ItxSubjectContainer> q = em.createQuery(
+                "SELECT o FROM ItxSubjectContainer AS o WHERE o.codeName = :codeName", ItxSubjectContainer.class);
         q.setParameter("codeName", codeName);
         return q;
     }
 
-	public static TypedQuery<ItxSubjectContainer> findItxSubjectContainersByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static TypedQuery<ItxSubjectContainer> findItxSubjectContainersByCodeNameEquals(String codeName,
+            String sortFieldName, String sortOrder) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = ItxSubjectContainer.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxSubjectContainer AS o WHERE o.codeName = :codeName");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ItxSubjectContainer AS o WHERE o.codeName = :codeName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -259,18 +279,23 @@ public static TypedQuery<ItxSubjectContainer> findItxSubjectContainersByCodeName
         return q;
     }
 
-	public static TypedQuery<ItxSubjectContainer> findItxSubjectContainersByContainer(Container container) {
-        if (container == null) throw new IllegalArgumentException("The container argument is required");
+    public static TypedQuery<ItxSubjectContainer> findItxSubjectContainersByContainer(Container container) {
+        if (container == null)
+            throw new IllegalArgumentException("The container argument is required");
         EntityManager em = ItxSubjectContainer.entityManager();
-        TypedQuery<ItxSubjectContainer> q = em.createQuery("SELECT o FROM ItxSubjectContainer AS o WHERE o.container = :container", ItxSubjectContainer.class);
+        TypedQuery<ItxSubjectContainer> q = em.createQuery(
+                "SELECT o FROM ItxSubjectContainer AS o WHERE o.container = :container", ItxSubjectContainer.class);
         q.setParameter("container", container);
         return q;
     }
 
-	public static TypedQuery<ItxSubjectContainer> findItxSubjectContainersByContainer(Container container, String sortFieldName, String sortOrder) {
-        if (container == null) throw new IllegalArgumentException("The container argument is required");
+    public static TypedQuery<ItxSubjectContainer> findItxSubjectContainersByContainer(Container container,
+            String sortFieldName, String sortOrder) {
+        if (container == null)
+            throw new IllegalArgumentException("The container argument is required");
         EntityManager em = ItxSubjectContainer.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxSubjectContainer AS o WHERE o.container = :container");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ItxSubjectContainer AS o WHERE o.container = :container");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -282,18 +307,24 @@ public static TypedQuery<ItxSubjectContainer> findItxSubjectContainersByContaine
         return q;
     }
 
-	public static TypedQuery<ItxSubjectContainer> findItxSubjectContainersByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<ItxSubjectContainer> findItxSubjectContainersByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = ItxSubjectContainer.entityManager();
-        TypedQuery<ItxSubjectContainer> q = em.createQuery("SELECT o FROM ItxSubjectContainer AS o WHERE o.lsTransaction = :lsTransaction", ItxSubjectContainer.class);
+        TypedQuery<ItxSubjectContainer> q = em.createQuery(
+                "SELECT o FROM ItxSubjectContainer AS o WHERE o.lsTransaction = :lsTransaction",
+                ItxSubjectContainer.class);
         q.setParameter("lsTransaction", lsTransaction);
         return q;
     }
 
-	public static TypedQuery<ItxSubjectContainer> findItxSubjectContainersByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<ItxSubjectContainer> findItxSubjectContainersByLsTransactionEquals(Long lsTransaction,
+            String sortFieldName, String sortOrder) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = ItxSubjectContainer.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxSubjectContainer AS o WHERE o.lsTransaction = :lsTransaction");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ItxSubjectContainer AS o WHERE o.lsTransaction = :lsTransaction");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -305,18 +336,23 @@ public static TypedQuery<ItxSubjectContainer> findItxSubjectContainersByLsTransa
         return q;
     }
 
-	public static TypedQuery<ItxSubjectContainer> findItxSubjectContainersBySubject(Subject subject) {
-        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
+    public static TypedQuery<ItxSubjectContainer> findItxSubjectContainersBySubject(Subject subject) {
+        if (subject == null)
+            throw new IllegalArgumentException("The subject argument is required");
         EntityManager em = ItxSubjectContainer.entityManager();
-        TypedQuery<ItxSubjectContainer> q = em.createQuery("SELECT o FROM ItxSubjectContainer AS o WHERE o.subject = :subject", ItxSubjectContainer.class);
+        TypedQuery<ItxSubjectContainer> q = em.createQuery(
+                "SELECT o FROM ItxSubjectContainer AS o WHERE o.subject = :subject", ItxSubjectContainer.class);
         q.setParameter("subject", subject);
         return q;
     }
 
-	public static TypedQuery<ItxSubjectContainer> findItxSubjectContainersBySubject(Subject subject, String sortFieldName, String sortOrder) {
-        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
+    public static TypedQuery<ItxSubjectContainer> findItxSubjectContainersBySubject(Subject subject,
+            String sortFieldName, String sortOrder) {
+        if (subject == null)
+            throw new IllegalArgumentException("The subject argument is required");
         EntityManager em = ItxSubjectContainer.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ItxSubjectContainer AS o WHERE o.subject = :subject");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ItxSubjectContainer AS o WHERE o.subject = :subject");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -328,13 +364,14 @@ public static TypedQuery<ItxSubjectContainer> findItxSubjectContainersBySubject(
         return q;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "subject", "container", "lsStates");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "subject",
+            "container", "lsStates");
 
-	public static List<ItxSubjectContainer> findAllItxSubjectContainers(String sortFieldName, String sortOrder) {
+    public static List<ItxSubjectContainer> findAllItxSubjectContainers(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxSubjectContainer o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -345,7 +382,8 @@ public static List<ItxSubjectContainer> findAllItxSubjectContainers(String sortF
         return entityManager().createQuery(jpaQuery, ItxSubjectContainer.class).getResultList();
     }
 
-	public static List<ItxSubjectContainer> findItxSubjectContainerEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ItxSubjectContainer> findItxSubjectContainerEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxSubjectContainer o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -353,6 +391,7 @@ public static List<ItxSubjectContainer> findItxSubjectContainerEntries(int first
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ItxSubjectContainer.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ItxSubjectContainer.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState.java b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState.java
index 2dc77ae54..fdec084d0 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerState.java
@@ -35,120 +35,124 @@ public class ItxSubjectContainerState extends AbstractState {
 
     public ItxSubjectContainerState() {
     }
-    
+
     public ItxSubjectContainerState(ItxSubjectContainerState itxState) {
-		super.setRecordedBy(itxState.getRecordedBy());
-		super.setRecordedDate(itxState.getRecordedDate());
-		super.setLsTransaction(itxState.getLsTransaction());
-		super.setModifiedBy(itxState.getModifiedBy());
-		super.setModifiedDate(itxState.getModifiedDate());
-//		this.itxSubjectContainer = itxState.getItxSubjectContainer();
-//		this.itxSubjectContainerValues = itxState.getItxSubjectContainerValues();		
-	}
+        super.setRecordedBy(itxState.getRecordedBy());
+        super.setRecordedDate(itxState.getRecordedDate());
+        super.setLsTransaction(itxState.getLsTransaction());
+        super.setModifiedBy(itxState.getModifiedBy());
+        super.setModifiedDate(itxState.getModifiedDate());
+        // this.itxSubjectContainer = itxState.getItxSubjectContainer();
+        // this.itxSubjectContainerValues = itxState.getItxSubjectContainerValues();
+    }
 
     public static ItxSubjectContainerState update(ItxSubjectContainerState object) {
-    	ItxSubjectContainerState updatedObject = new JSONDeserializer<ItxSubjectContainerState>().use(null, ItxSubjectContainerState.class).
-        		deserializeInto(object.toJson(), 
-        				ItxSubjectContainerState.findItxSubjectContainerState(object.getId()));
-    	updatedObject.setModifiedDate(new Date());
-    	updatedObject.merge();
+        ItxSubjectContainerState updatedObject = new JSONDeserializer<ItxSubjectContainerState>()
+                .use(null, ItxSubjectContainerState.class).deserializeInto(object.toJson(),
+                        ItxSubjectContainerState.findItxSubjectContainerState(object.getId()));
+        updatedObject.setModifiedDate(new Date());
+        updatedObject.merge();
         return updatedObject;
     }
-  
-	@ManyToOne
-	@JoinColumn(name = "itx_subject_container")
+
+    @ManyToOne
+    @JoinColumn(name = "itx_subject_container")
     private ItxSubjectContainer itxSubjectContainer;
 
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "lsState")
     private Set<ItxSubjectContainerValue> lsValues = new HashSet<ItxSubjectContainerValue>();
-    
-	@Transactional
+
+    @Transactional
     public String toJson() {
         return new JSONSerializer().exclude("*.class")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(this);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
-    
+
     public static ItxSubjectContainerState fromJsonToItxSubjectContainerState(String json) {
         return new JSONDeserializer<ItxSubjectContainerState>().use(null, ItxSubjectContainerState.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
-    
-	@Transactional
+
+    @Transactional
     public static String toJsonArray(Collection<ItxSubjectContainerState> collection) {
         return new JSONSerializer().exclude("*.class")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(collection);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
 
-	@Transactional
+    @Transactional
     public static String toJsonArrayStub(Collection<ItxSubjectContainerState> collection) {
         return new JSONSerializer().exclude("*.class", "itxSubjectContainer")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(collection);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
 
-	
     public static Collection<ItxSubjectContainerState> fromJsonArrayToItxSubjectContainerStates(String json) {
         return new JSONDeserializer<List<ItxSubjectContainerState>>()
-        		.use(null, ArrayList.class)
-        		.use("values", ItxSubjectContainerState.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use(null, ArrayList.class)
+                .use("values", ItxSubjectContainerState.class)
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
-    
+
     public static Collection<ItxSubjectContainerState> fromJsonArrayToItxSubjectContainerStates(Reader json) {
         return new JSONDeserializer<List<ItxSubjectContainerState>>()
-        		.use(null, ArrayList.class)
-        		.use("values", ItxSubjectContainerState.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use(null, ArrayList.class)
+                .use("values", ItxSubjectContainerState.class)
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
 
-	@Transactional
-	public static int deleteByExperimentID(Long experimentId) {
-		if (experimentId == null) return 0;
-		EntityManager em = TreatmentGroupValue.entityManager();
-		String deleteSQL = "DELETE FROM ItxSubjectContainerState oo WHERE id in (select o.id from ItxSubjectContainerState o where o.itxSubjectContainer.subject.treatmentGroup.analysisGroup.experiment.id = :experimentId)";
+    @Transactional
+    public static int deleteByExperimentID(Long experimentId) {
+        if (experimentId == null)
+            return 0;
+        EntityManager em = TreatmentGroupValue.entityManager();
+        String deleteSQL = "DELETE FROM ItxSubjectContainerState oo WHERE id in (select o.id from ItxSubjectContainerState o where o.itxSubjectContainer.subject.treatmentGroup.analysisGroup.experiment.id = :experimentId)";
 
-		Query q = em.createQuery(deleteSQL);
-		q.setParameter("experimentId", experimentId);
-		int numberOfDeletedEntities = q.executeUpdate();
-		return numberOfDeletedEntities;
-	}
+        Query q = em.createQuery(deleteSQL);
+        q.setParameter("experimentId", experimentId);
+        int numberOfDeletedEntities = q.executeUpdate();
+        return numberOfDeletedEntities;
+    }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public ItxSubjectContainer getItxSubjectContainer() {
+    public ItxSubjectContainer getItxSubjectContainer() {
         return this.itxSubjectContainer;
     }
 
-	public void setItxSubjectContainer(ItxSubjectContainer itxSubjectContainer) {
+    public void setItxSubjectContainer(ItxSubjectContainer itxSubjectContainer) {
         this.itxSubjectContainer = itxSubjectContainer;
     }
 
-	public Set<ItxSubjectContainerValue> getLsValues() {
+    public Set<ItxSubjectContainerValue> getLsValues() {
         return this.lsValues;
     }
 
-	public void setLsValues(Set<ItxSubjectContainerValue> lsValues) {
+    public void setLsValues(Set<ItxSubjectContainerValue> lsValues) {
         this.lsValues = lsValues;
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("itxSubjectContainer", "lsValues");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("itxSubjectContainer",
+            "lsValues");
 
-	public static long countItxSubjectContainerStates() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ItxSubjectContainerState o", Long.class).getSingleResult();
+    public static long countItxSubjectContainerStates() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ItxSubjectContainerState o", Long.class)
+                .getSingleResult();
     }
 
-	public static List<ItxSubjectContainerState> findAllItxSubjectContainerStates() {
-        return entityManager().createQuery("SELECT o FROM ItxSubjectContainerState o", ItxSubjectContainerState.class).getResultList();
+    public static List<ItxSubjectContainerState> findAllItxSubjectContainerStates() {
+        return entityManager().createQuery("SELECT o FROM ItxSubjectContainerState o", ItxSubjectContainerState.class)
+                .getResultList();
     }
 
-	public static List<ItxSubjectContainerState> findAllItxSubjectContainerStates(String sortFieldName, String sortOrder) {
+    public static List<ItxSubjectContainerState> findAllItxSubjectContainerStates(String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxSubjectContainerState o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -159,16 +163,19 @@ public static List<ItxSubjectContainerState> findAllItxSubjectContainerStates(St
         return entityManager().createQuery(jpaQuery, ItxSubjectContainerState.class).getResultList();
     }
 
-	public static ItxSubjectContainerState findItxSubjectContainerState(Long id) {
-        if (id == null) return null;
+    public static ItxSubjectContainerState findItxSubjectContainerState(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ItxSubjectContainerState.class, id);
     }
 
-	public static List<ItxSubjectContainerState> findItxSubjectContainerStateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxSubjectContainerState o", ItxSubjectContainerState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ItxSubjectContainerState> findItxSubjectContainerStateEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ItxSubjectContainerState o", ItxSubjectContainerState.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ItxSubjectContainerState> findItxSubjectContainerStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ItxSubjectContainerState> findItxSubjectContainerStateEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxSubjectContainerState o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -176,12 +183,14 @@ public static List<ItxSubjectContainerState> findItxSubjectContainerStateEntries
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ItxSubjectContainerState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ItxSubjectContainerState.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public ItxSubjectContainerState merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ItxSubjectContainerState merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
diff --git a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue.java b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue.java
index 1a7199ef6..b9881d128 100755
--- a/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ItxSubjectContainerValue.java
@@ -28,97 +28,98 @@
 public class ItxSubjectContainerValue extends AbstractValue {
 
     @ManyToOne
-	@JoinColumn(name = "ls_state")
+    @JoinColumn(name = "ls_state")
     private ItxSubjectContainerState lsState;
-    
+
     public static ItxSubjectContainerValue update(ItxSubjectContainerValue object) {
-    	ItxSubjectContainerValue updatedObject = new JSONDeserializer<ItxSubjectContainerValue>().use(null, ItxSubjectContainerValue.class).
-        		deserializeInto(object.toJson(), 
-        				ItxSubjectContainerValue.findItxSubjectContainerValue(object.getId()));
-    	updatedObject.setModifiedDate(new Date());
-    	updatedObject.merge();
+        ItxSubjectContainerValue updatedObject = new JSONDeserializer<ItxSubjectContainerValue>()
+                .use(null, ItxSubjectContainerValue.class).deserializeInto(object.toJson(),
+                        ItxSubjectContainerValue.findItxSubjectContainerValue(object.getId()));
+        updatedObject.setModifiedDate(new Date());
+        updatedObject.merge();
         return updatedObject;
     }
-  
-    
+
     public static ItxSubjectContainerValue fromJsonToItxSubjectContainerValue(String json) {
-        return new JSONDeserializer<ItxSubjectContainerValue>().
-        		use(null, ItxSubjectContainerValue.class).
-        		
-        		deserialize(json);
+        return new JSONDeserializer<ItxSubjectContainerValue>().use(null, ItxSubjectContainerValue.class).
+
+                deserialize(json);
     }
-    
+
     public static Collection<ItxSubjectContainerValue> fromJsonArrayToItxSubjectContainerValues(String json) {
-        return new JSONDeserializer<List<ItxSubjectContainerValue>>().
-        		use(null, ArrayList.class).
-        		use("values", ItxSubjectContainerValue.class).
-        		
-        		deserialize(json);
+        return new JSONDeserializer<List<ItxSubjectContainerValue>>().use(null, ArrayList.class)
+                .use("values", ItxSubjectContainerValue.class).
+
+                deserialize(json);
     }
-    
+
     public static Collection<ItxSubjectContainerValue> fromJsonArrayToItxSubjectContainerValues(Reader json) {
-        return new JSONDeserializer<List<ItxSubjectContainerValue>>().
-        		use(null, ArrayList.class).
-        		use("values", ItxSubjectContainerValue.class).
-        		
-        		deserialize(json);
+        return new JSONDeserializer<List<ItxSubjectContainerValue>>().use(null, ArrayList.class)
+                .use("values", ItxSubjectContainerValue.class).
+
+                deserialize(json);
     }
-    
+
     @Transactional
     public String toJson() {
         return new JSONSerializer().exclude("*.class")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(this);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
-    
+
     @Transactional
     public static String toJsonArray(Collection<ItxSubjectContainerValue> collection) {
         return new JSONSerializer().exclude("*.class")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(collection);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
 
     @Transactional
     public static String toJsonArrayStub(Collection<ItxSubjectContainerValue> collection) {
         return new JSONSerializer().exclude("*.class", "lsState")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(collection);
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
 
-	@Transactional
-	public static int deleteByExperimentID(Long experimentId) {
-		if (experimentId == null) return 0;
-		EntityManager em = TreatmentGroupValue.entityManager();
-		String deleteSQL = "DELETE FROM ItxSubjectContainerValue oo WHERE id in (select o.id from ItxSubjectContainerValue o where o.lsState.itxSubjectContainer.subject.treatmentGroup.analysisGroup.experiment.id = :experimentId)";
-
-		Query q = em.createQuery(deleteSQL);
-		q.setParameter("experimentId", experimentId);
-		int numberOfDeletedEntities = q.executeUpdate();
-		return numberOfDeletedEntities;
-	}
-
-
-	public static ItxSubjectContainerValue create(
-			ItxSubjectContainerValue itxSubjectContainerValue) {
-		ItxSubjectContainerValue newItxSubjectContainerValue = new JSONDeserializer<ItxSubjectContainerValue>().use(null, ItxSubjectContainerValue.class).deserializeInto(itxSubjectContainerValue.toJson(), new ItxSubjectContainerValue());
+    @Transactional
+    public static int deleteByExperimentID(Long experimentId) {
+        if (experimentId == null)
+            return 0;
+        EntityManager em = TreatmentGroupValue.entityManager();
+        String deleteSQL = "DELETE FROM ItxSubjectContainerValue oo WHERE id in (select o.id from ItxSubjectContainerValue o where o.lsState.itxSubjectContainer.subject.treatmentGroup.analysisGroup.experiment.id = :experimentId)";
+
+        Query q = em.createQuery(deleteSQL);
+        q.setParameter("experimentId", experimentId);
+        int numberOfDeletedEntities = q.executeUpdate();
+        return numberOfDeletedEntities;
+    }
+
+    public static ItxSubjectContainerValue create(
+            ItxSubjectContainerValue itxSubjectContainerValue) {
+        ItxSubjectContainerValue newItxSubjectContainerValue = new JSONDeserializer<ItxSubjectContainerValue>()
+                .use(null, ItxSubjectContainerValue.class)
+                .deserializeInto(itxSubjectContainerValue.toJson(), new ItxSubjectContainerValue());
         return newItxSubjectContainerValue;
-	}
+    }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsState");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsState");
 
-	public static long countItxSubjectContainerValues() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM ItxSubjectContainerValue o", Long.class).getSingleResult();
+    public static long countItxSubjectContainerValues() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM ItxSubjectContainerValue o", Long.class)
+                .getSingleResult();
     }
 
-	public static List<ItxSubjectContainerValue> findAllItxSubjectContainerValues() {
-        return entityManager().createQuery("SELECT o FROM ItxSubjectContainerValue o", ItxSubjectContainerValue.class).getResultList();
+    public static List<ItxSubjectContainerValue> findAllItxSubjectContainerValues() {
+        return entityManager().createQuery("SELECT o FROM ItxSubjectContainerValue o", ItxSubjectContainerValue.class)
+                .getResultList();
     }
 
-	public static List<ItxSubjectContainerValue> findAllItxSubjectContainerValues(String sortFieldName, String sortOrder) {
+    public static List<ItxSubjectContainerValue> findAllItxSubjectContainerValues(String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxSubjectContainerValue o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -129,16 +130,19 @@ public static List<ItxSubjectContainerValue> findAllItxSubjectContainerValues(St
         return entityManager().createQuery(jpaQuery, ItxSubjectContainerValue.class).getResultList();
     }
 
-	public static ItxSubjectContainerValue findItxSubjectContainerValue(Long id) {
-        if (id == null) return null;
+    public static ItxSubjectContainerValue findItxSubjectContainerValue(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ItxSubjectContainerValue.class, id);
     }
 
-	public static List<ItxSubjectContainerValue> findItxSubjectContainerValueEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ItxSubjectContainerValue o", ItxSubjectContainerValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ItxSubjectContainerValue> findItxSubjectContainerValueEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ItxSubjectContainerValue o", ItxSubjectContainerValue.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ItxSubjectContainerValue> findItxSubjectContainerValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ItxSubjectContainerValue> findItxSubjectContainerValueEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ItxSubjectContainerValue o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -146,22 +150,24 @@ public static List<ItxSubjectContainerValue> findItxSubjectContainerValueEntries
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ItxSubjectContainerValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ItxSubjectContainerValue.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public ItxSubjectContainerValue merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ItxSubjectContainerValue merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public ItxSubjectContainerState getLsState() {
+    public ItxSubjectContainerState getLsState() {
         return this.lsState;
     }
 
-	public void setLsState(ItxSubjectContainerState lsState) {
+    public void setLsState(ItxSubjectContainerState lsState) {
         this.lsState = lsState;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelKind.java b/src/main/java/com/labsynch/labseer/domain/LabelKind.java
index 7bd8eea65..fb093b052 100755
--- a/src/main/java/com/labsynch/labseer/domain/LabelKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/LabelKind.java
@@ -32,9 +32,8 @@
 @Entity
 
 public class LabelKind {
-	
-	private static final Logger logger = LoggerFactory.getLogger(LabelKind.class);
 
+    private static final Logger logger = LoggerFactory.getLogger(LabelKind.class);
 
     @ManyToOne
     @JoinColumn(name = "ls_type")
@@ -79,7 +78,9 @@ public void setVersion(Integer version) {
 
     public static final EntityManager entityManager() {
         EntityManager em = new LabelKind().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
@@ -92,25 +93,30 @@ public static List<com.labsynch.labseer.domain.LabelKind> findAllLabelKinds() {
     }
 
     public static com.labsynch.labseer.domain.LabelKind findLabelKind(Long id) {
-        if (id == null) return null;
+        if (id == null)
+            return null;
         return entityManager().find(LabelKind.class, id);
     }
 
     public static List<com.labsynch.labseer.domain.LabelKind> findLabelKindEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LabelKind o", LabelKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery("SELECT o FROM LabelKind o", LabelKind.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
     @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.lsType = LabelType.findLabelType(this.getLsType().getId());
-        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_').append(this.getKindName()).toString();
+        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_')
+                .append(this.getKindName()).toString();
         this.entityManager.persist(this);
     }
 
     @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -121,48 +127,52 @@ public void remove() {
 
     @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
     @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
     @Transactional
     public com.labsynch.labseer.domain.LabelKind merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_').append(this.getKindName()).toString();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
+        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_')
+                .append(this.getKindName()).toString();
         LabelKind merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
-    
-
-	public static LabelKind getOrCreate(LabelType lsType, String kindName) {
-		
-		LabelKind lsKind = null;
-		List<LabelKind> lsKinds = LabelKind.findLabelKindsByKindNameEqualsAndLsType(kindName, lsType).getResultList();
-		
-		if (lsKinds.size() == 0){
-			lsKind = new LabelKind();
-			lsKind.setKindName(kindName);
-			lsKind.setLsType(lsType);
-			lsKind.persist();
-		} else if (lsKinds.size() == 1){
-			lsKind = lsKinds.get(0);
-		} else if (lsKinds.size() > 1){
-			logger.error("ERROR: multiple label kinds with the same name and type");
-		}
-		
-		return lsKind;
-	}
-
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
-
-	public static List<LabelKind> findAllLabelKinds(String sortFieldName, String sortOrder) {
+
+    public static LabelKind getOrCreate(LabelType lsType, String kindName) {
+
+        LabelKind lsKind = null;
+        List<LabelKind> lsKinds = LabelKind.findLabelKindsByKindNameEqualsAndLsType(kindName, lsType).getResultList();
+
+        if (lsKinds.size() == 0) {
+            lsKind = new LabelKind();
+            lsKind.setKindName(kindName);
+            lsKind.setLsType(lsType);
+            lsKind.persist();
+        } else if (lsKinds.size() == 1) {
+            lsKind = lsKinds.get(0);
+        } else if (lsKinds.size() > 1) {
+            logger.error("ERROR: multiple label kinds with the same name and type");
+        }
+
+        return lsKind;
+    }
+
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType",
+            "kindName", "lsTypeAndKind", "id", "version", "entityManager");
+
+    public static List<LabelKind> findAllLabelKinds(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LabelKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -173,7 +183,8 @@ public static List<LabelKind> findAllLabelKinds(String sortFieldName, String sor
         return entityManager().createQuery(jpaQuery, LabelKind.class).getResultList();
     }
 
-	public static List<LabelKind> findLabelKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<LabelKind> findLabelKindEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM LabelKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -181,79 +192,89 @@ public static List<LabelKind> findLabelKindEntries(int firstResult, int maxResul
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, LabelKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, LabelKind.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static LabelKind fromJsonToLabelKind(String json) {
+    public static LabelKind fromJsonToLabelKind(String json) {
         return new JSONDeserializer<LabelKind>()
-        .use(null, LabelKind.class).deserialize(json);
+                .use(null, LabelKind.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<LabelKind> collection) {
+    public static String toJsonArray(Collection<LabelKind> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<LabelKind> collection, String[] fields) {
+    public static String toJsonArray(Collection<LabelKind> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<LabelKind> fromJsonArrayToLabelKinds(String json) {
+    public static Collection<LabelKind> fromJsonArrayToLabelKinds(String json) {
         return new JSONDeserializer<List<LabelKind>>()
-        .use("values", LabelKind.class).deserialize(json);
+                .use("values", LabelKind.class).deserialize(json);
     }
 
-	public static Long countFindLabelKindsByKindNameEquals(String kindName) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+    public static Long countFindLabelKindsByKindNameEquals(String kindName) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
         EntityManager em = LabelKind.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LabelKind AS o WHERE o.kindName = :kindName", Long.class);
         q.setParameter("kindName", kindName);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLabelKindsByKindNameEqualsAndLsType(String kindName, LabelType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static Long countFindLabelKindsByKindNameEqualsAndLsType(String kindName, LabelType lsType) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = LabelKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LabelKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM LabelKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
         q.setParameter("kindName", kindName);
         q.setParameter("lsType", lsType);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLabelKindsByLsType(LabelType lsType) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static Long countFindLabelKindsByLsType(LabelType lsType) {
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = LabelKind.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LabelKind AS o WHERE o.lsType = :lsType", Long.class);
         q.setParameter("lsType", lsType);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<LabelKind> findLabelKindsByKindNameEquals(String kindName) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+    public static TypedQuery<LabelKind> findLabelKindsByKindNameEquals(String kindName) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
         EntityManager em = LabelKind.entityManager();
-        TypedQuery<LabelKind> q = em.createQuery("SELECT o FROM LabelKind AS o WHERE o.kindName = :kindName", LabelKind.class);
+        TypedQuery<LabelKind> q = em.createQuery("SELECT o FROM LabelKind AS o WHERE o.kindName = :kindName",
+                LabelKind.class);
         q.setParameter("kindName", kindName);
         return q;
     }
 
-	public static TypedQuery<LabelKind> findLabelKindsByKindNameEquals(String kindName, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+    public static TypedQuery<LabelKind> findLabelKindsByKindNameEquals(String kindName, String sortFieldName,
+            String sortOrder) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
         EntityManager em = LabelKind.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LabelKind AS o WHERE o.kindName = :kindName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -267,21 +288,28 @@ public static TypedQuery<LabelKind> findLabelKindsByKindNameEquals(String kindNa
         return q;
     }
 
-	public static TypedQuery<LabelKind> findLabelKindsByKindNameEqualsAndLsType(String kindName, LabelType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<LabelKind> findLabelKindsByKindNameEqualsAndLsType(String kindName, LabelType lsType) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = LabelKind.entityManager();
-        TypedQuery<LabelKind> q = em.createQuery("SELECT o FROM LabelKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", LabelKind.class);
+        TypedQuery<LabelKind> q = em.createQuery(
+                "SELECT o FROM LabelKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", LabelKind.class);
         q.setParameter("kindName", kindName);
         q.setParameter("lsType", lsType);
         return q;
     }
 
-	public static TypedQuery<LabelKind> findLabelKindsByKindNameEqualsAndLsType(String kindName, LabelType lsType, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<LabelKind> findLabelKindsByKindNameEqualsAndLsType(String kindName, LabelType lsType,
+            String sortFieldName, String sortOrder) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = LabelKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LabelKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LabelKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -294,16 +322,20 @@ public static TypedQuery<LabelKind> findLabelKindsByKindNameEqualsAndLsType(Stri
         return q;
     }
 
-	public static TypedQuery<LabelKind> findLabelKindsByLsType(LabelType lsType) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<LabelKind> findLabelKindsByLsType(LabelType lsType) {
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = LabelKind.entityManager();
-        TypedQuery<LabelKind> q = em.createQuery("SELECT o FROM LabelKind AS o WHERE o.lsType = :lsType", LabelKind.class);
+        TypedQuery<LabelKind> q = em.createQuery("SELECT o FROM LabelKind AS o WHERE o.lsType = :lsType",
+                LabelKind.class);
         q.setParameter("lsType", lsType);
         return q;
     }
 
-	public static TypedQuery<LabelKind> findLabelKindsByLsType(LabelType lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<LabelKind> findLabelKindsByLsType(LabelType lsType, String sortFieldName,
+            String sortOrder) {
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = LabelKind.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LabelKind AS o WHERE o.lsType = :lsType");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -317,27 +349,27 @@ public static TypedQuery<LabelKind> findLabelKindsByLsType(LabelType lsType, Str
         return q;
     }
 
-	public LabelType getLsType() {
+    public LabelType getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(LabelType lsType) {
+    public void setLsType(LabelType lsType) {
         this.lsType = lsType;
     }
 
-	public String getKindName() {
+    public String getKindName() {
         return this.kindName;
     }
 
-	public void setKindName(String kindName) {
+    public void setKindName(String kindName) {
         this.kindName = kindName;
     }
 
-	public String getLsTypeAndKind() {
+    public String getLsTypeAndKind() {
         return this.lsTypeAndKind;
     }
 
-	public void setLsTypeAndKind(String lsTypeAndKind) {
+    public void setLsTypeAndKind(String lsTypeAndKind) {
         this.lsTypeAndKind = lsTypeAndKind;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelSequence.java b/src/main/java/com/labsynch/labseer/domain/LabelSequence.java
index 0472edb4e..6256b8227 100755
--- a/src/main/java/com/labsynch/labseer/domain/LabelSequence.java
+++ b/src/main/java/com/labsynch/labseer/domain/LabelSequence.java
@@ -54,263 +54,292 @@
 @Entity
 public class LabelSequence {
 
-	@NotNull
-	@Size(max = 255)
-	private String thingTypeAndKind;
-
-	@NotNull
-	@Size(max = 255)
-	private String labelTypeAndKind;
-
-	@NotNull
-	@Size(max = 50)
-	private String labelPrefix;
-
-	@Size(max = 10)
-	private String labelSeparator;
-
-	private boolean groupDigits;
-
-	private Integer digits;
-
-	@NotNull
-	private Long startingNumber;
-
-	@NotNull
-	private boolean ignored;
-
-	@Temporal(TemporalType.TIMESTAMP)
-	@DateTimeFormat(style = "MM")
-	private Date modifiedDate;
-
-	@NotNull
-	private String dbSequence;
-
-	@OneToMany(cascade = CascadeType.ALL, mappedBy = "labelSequenceEntry", fetch =  FetchType.LAZY)
-	private Set<LabelSequenceRole> labelSequenceRoles;
-
-	@Transactional
-	public LabelSequence save() {
-		if (this.getLabelSequenceRoles() != null) {
-			for (LabelSequenceRole labelSeqRole : this.getLabelSequenceRoles()) {
-				labelSeqRole.setLabelSequenceEntry(this);
-				if (labelSeqRole.getRoleEntry() != null && labelSeqRole.getRoleEntry().getId() != null) {
-					LsRole savedRole = LsRole.findLsRole(labelSeqRole.getRoleEntry().getId());
-					labelSeqRole.setRoleEntry(savedRole);
-				}
-			}
-		}
-		EntityManager em = LabelSequence.entityManager();
-		if (this.getDbSequence() == null) {
-			//set to temp sequence first so we can persist, get and id and then use the id to create a unique sequence name
-			this.setDbSequence("tempseq");
-			this.persist();
-			String dbSequence = "labelseq_"+this.getId()+"_"+this.getLabelPrefix()+"_"+this.getLabelTypeAndKind()+"_"+this.getThingTypeAndKind();
-			dbSequence = dbSequence.replaceAll("[^a-zA-Z0-9_]+", "_");
-			//Limit to 30 characters to be compatible with Oracle Version <= 12.1 if applicable
-			String databaseType = null;
-			Float databaseVersion = 0.0f;
-			try{
-				org.hibernate.engine.spi.SessionImplementor sessionImp = 
-					     (org.hibernate.engine.spi.SessionImplementor) em.getDelegate();
-				DatabaseMetaData metadata = sessionImp.connection().getMetaData();
-				databaseType = metadata.getDatabaseProductName();
-				databaseVersion = Float.parseFloat(metadata.getDatabaseMajorVersion()+"."+metadata.getDatabaseMinorVersion());
-			}catch (SQLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-			if(databaseType.equalsIgnoreCase("Oracle") && (databaseVersion < 12.2f)) {
-				int MAX_CHAR = 30;
-				int maxLength = (dbSequence.length() < MAX_CHAR)?dbSequence.length():MAX_CHAR;
-				dbSequence = dbSequence.substring(0, maxLength);
-			}
-			this.setDbSequence(dbSequence);
-		}
-		if (this.getStartingNumber() < 1L) this.setStartingNumber(1L);
-		Query q = em.createNativeQuery("CREATE SEQUENCE "+this.dbSequence+" START WITH "+this.getStartingNumber());
-		q.executeUpdate();
-		this.merge();
-		return this;
-	}
-
-	public List<AutoLabelDTO> generateNextLabels(Long numberOfLabels){
-		List<AutoLabelDTO> labels = new ArrayList<AutoLabelDTO>();
-		int numGenerated = 0;
-		while (numGenerated < numberOfLabels) {
-			AutoLabelDTO label = this.generateNextLabel();
-			labels.add(label);
-			numGenerated++;
-		}
-		return labels;
-	}
-
-	public AutoLabelDTO generateNextLabel() {
-		Long labelNumber = this.incrementSequence(this.getDbSequence());
-		String formatLabelNumber = "%";
-		formatLabelNumber = formatLabelNumber.concat("0").concat(this.getDigits().toString()).concat("d");
-		String label = this.getLabelPrefix().concat(this.getLabelSeparator()).concat(String.format(formatLabelNumber, labelNumber));
-		AutoLabelDTO autoLabel = new AutoLabelDTO(label, labelNumber);
-		return autoLabel;
-
-	}
-
-	public Long incrementSequence(final String sequenceName) {
-		ReturningWork<Long> maxReturningWork = new ReturningWork<Long>() {
-			@Override
-			public Long execute(Connection connection) throws SQLException {
-				DialectResolver dialectResolver = new StandardDialectResolver();
-				Dialect dialect =  dialectResolver.resolveDialect(new DatabaseMetaDataDialectResolutionInfoAdapter(connection.getMetaData()));
-				PreparedStatement preparedStatement = null;
-				ResultSet resultSet = null;
-				try {
-					preparedStatement = connection.prepareStatement( dialect.getSequenceNextValString(sequenceName));
-					resultSet = preparedStatement.executeQuery();
-					resultSet.next();
-					return resultSet.getLong(1);
-				}catch (SQLException e) {
-					throw e;
-				} finally {
-					if(preparedStatement != null) {
-						preparedStatement.close();
-					}
-					if(resultSet != null) {
-						resultSet.close();
-					}
-				}
-
-			}
-		};
-		EntityManager em = LabelSequence.entityManager();
-		Long maxRecord = em.unwrap(Session.class).doReturningWork(maxReturningWork);
-		return maxRecord;
-	}
-
-	@Transactional
-	public Long decrementSequence() {
-		final String sequenceName = this.getDbSequence();
-		ReturningWork<Long> maxReturningWork = new ReturningWork<Long>() {
-			@Override
-			public Long execute(Connection connection) throws SQLException {
-				String currentValueString = "";
-				DbType dbType = SimpleUtil.getDatabaseType(connection.getMetaData());
-				if (dbType == DbType.POSTGRES) {
-					currentValueString = "SELECT currval('"+sequenceName+"')";
-					long currentValue;
-					try (PreparedStatement preparedStatement = connection.prepareStatement( currentValueString);
-							ResultSet resultSet = preparedStatement.executeQuery()) {
-						resultSet.next();
-						currentValue = resultSet.getLong(1);
-					}
-					String setValueString = "SELECT setval('"+sequenceName+"', "+currentValue+")";
-					try (PreparedStatement preparedStatement = connection.prepareStatement( setValueString);
-							ResultSet resultSet = preparedStatement.executeQuery();){
-						resultSet.next();
-						return resultSet.getLong(1);	
-					}
-				}else if (dbType == DbType.ORACLE) {
-					throw new SQLException("Decrement sequence not implemented for Oracle");
-				}else {
-					throw new SQLException("Unssupported database type");
-				}
-			}
-		};
-		EntityManager em = LabelSequence.entityManager();
-		Long maxRecord = em.unwrap(Session.class).doReturningWork(maxReturningWork);
-		return maxRecord;
-	}
-
-	public long fetchCurrentValue() {
-		final String sequenceName = this.getDbSequence();
-		ReturningWork<Long> maxReturningWork = new ReturningWork<Long>() {
-			@Override
-			public Long execute(Connection connection) throws SQLException {
-				DbType dbType = SimpleUtil.getDatabaseType(connection.getMetaData());
-				try {
-					String currentValueString = "";
-					if (dbType == DbType.POSTGRES) {
-						currentValueString = "SELECT last_value FROM "+sequenceName;
-					}else if (dbType == DbType.ORACLE) {
-						currentValueString = "SELECT last_number FROM all_sequences WHERE sequence_name = '"+sequenceName+"'";
-					}
-					try (
-							PreparedStatement preparedStatement = connection.prepareStatement( currentValueString);
-							ResultSet resultSet = preparedStatement.executeQuery()) {
-						resultSet.next();
-						return resultSet.getLong(1);
-					}
-				}catch (SQLException e) {
-					throw e;
-				}
-
-			}
-		};
-		EntityManager em = LabelSequence.entityManager();
-		Long maxRecord = em.unwrap(Session.class).doReturningWork(maxReturningWork);
-		return maxRecord;
-	}
-
-	public String toJson() {
-		return new JSONSerializer().exclude("*.class","labelSequenceRoles.labelSequenceEntry").include("labelSequenceRoles.roleEntry").transform(new ExcludeNulls(), void.class).serialize(this);
-	}
-
-	public static String toJsonArray(Collection<LabelSequence> collection) {
-		return new JSONSerializer().exclude("*.class","labelSequenceRoles.labelSequenceEntry").include("labelSequenceRoles.roleEntry").transform(new ExcludeNulls(), void.class).serialize(collection);
-	}
-
-
-
-
-	public static Long countFindLabelSequencesByLabelTypeAndKindEquals(String labelTypeAndKind) {
-        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0) throw new IllegalArgumentException("The labelTypeAndKind argument is required");
+    @NotNull
+    @Size(max = 255)
+    private String thingTypeAndKind;
+
+    @NotNull
+    @Size(max = 255)
+    private String labelTypeAndKind;
+
+    @NotNull
+    @Size(max = 50)
+    private String labelPrefix;
+
+    @Size(max = 10)
+    private String labelSeparator;
+
+    private boolean groupDigits;
+
+    private Integer digits;
+
+    @NotNull
+    private Long startingNumber;
+
+    @NotNull
+    private boolean ignored;
+
+    @Temporal(TemporalType.TIMESTAMP)
+    @DateTimeFormat(style = "MM")
+    private Date modifiedDate;
+
+    @NotNull
+    private String dbSequence;
+
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "labelSequenceEntry", fetch = FetchType.LAZY)
+    private Set<LabelSequenceRole> labelSequenceRoles;
+
+    @Transactional
+    public LabelSequence save() {
+        if (this.getLabelSequenceRoles() != null) {
+            for (LabelSequenceRole labelSeqRole : this.getLabelSequenceRoles()) {
+                labelSeqRole.setLabelSequenceEntry(this);
+                if (labelSeqRole.getRoleEntry() != null && labelSeqRole.getRoleEntry().getId() != null) {
+                    LsRole savedRole = LsRole.findLsRole(labelSeqRole.getRoleEntry().getId());
+                    labelSeqRole.setRoleEntry(savedRole);
+                }
+            }
+        }
+        EntityManager em = LabelSequence.entityManager();
+        if (this.getDbSequence() == null) {
+            // set to temp sequence first so we can persist, get and id and then use the id
+            // to create a unique sequence name
+            this.setDbSequence("tempseq");
+            this.persist();
+            String dbSequence = "labelseq_" + this.getId() + "_" + this.getLabelPrefix() + "_"
+                    + this.getLabelTypeAndKind() + "_" + this.getThingTypeAndKind();
+            dbSequence = dbSequence.replaceAll("[^a-zA-Z0-9_]+", "_");
+            // Limit to 30 characters to be compatible with Oracle Version <= 12.1 if
+            // applicable
+            String databaseType = null;
+            Float databaseVersion = 0.0f;
+            try {
+                org.hibernate.engine.spi.SessionImplementor sessionImp = (org.hibernate.engine.spi.SessionImplementor) em
+                        .getDelegate();
+                DatabaseMetaData metadata = sessionImp.connection().getMetaData();
+                databaseType = metadata.getDatabaseProductName();
+                databaseVersion = Float
+                        .parseFloat(metadata.getDatabaseMajorVersion() + "." + metadata.getDatabaseMinorVersion());
+            } catch (SQLException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+            if (databaseType.equalsIgnoreCase("Oracle") && (databaseVersion < 12.2f)) {
+                int MAX_CHAR = 30;
+                int maxLength = (dbSequence.length() < MAX_CHAR) ? dbSequence.length() : MAX_CHAR;
+                dbSequence = dbSequence.substring(0, maxLength);
+            }
+            this.setDbSequence(dbSequence);
+        }
+        if (this.getStartingNumber() < 1L)
+            this.setStartingNumber(1L);
+        Query q = em
+                .createNativeQuery("CREATE SEQUENCE " + this.dbSequence + " START WITH " + this.getStartingNumber());
+        q.executeUpdate();
+        this.merge();
+        return this;
+    }
+
+    public List<AutoLabelDTO> generateNextLabels(Long numberOfLabels) {
+        List<AutoLabelDTO> labels = new ArrayList<AutoLabelDTO>();
+        int numGenerated = 0;
+        while (numGenerated < numberOfLabels) {
+            AutoLabelDTO label = this.generateNextLabel();
+            labels.add(label);
+            numGenerated++;
+        }
+        return labels;
+    }
+
+    public AutoLabelDTO generateNextLabel() {
+        Long labelNumber = this.incrementSequence(this.getDbSequence());
+        String formatLabelNumber = "%";
+        formatLabelNumber = formatLabelNumber.concat("0").concat(this.getDigits().toString()).concat("d");
+        String label = this.getLabelPrefix().concat(this.getLabelSeparator())
+                .concat(String.format(formatLabelNumber, labelNumber));
+        AutoLabelDTO autoLabel = new AutoLabelDTO(label, labelNumber);
+        return autoLabel;
+
+    }
+
+    public Long incrementSequence(final String sequenceName) {
+        ReturningWork<Long> maxReturningWork = new ReturningWork<Long>() {
+            @Override
+            public Long execute(Connection connection) throws SQLException {
+                DialectResolver dialectResolver = new StandardDialectResolver();
+                Dialect dialect = dialectResolver
+                        .resolveDialect(new DatabaseMetaDataDialectResolutionInfoAdapter(connection.getMetaData()));
+                PreparedStatement preparedStatement = null;
+                ResultSet resultSet = null;
+                try {
+                    preparedStatement = connection.prepareStatement(dialect.getSequenceNextValString(sequenceName));
+                    resultSet = preparedStatement.executeQuery();
+                    resultSet.next();
+                    return resultSet.getLong(1);
+                } catch (SQLException e) {
+                    throw e;
+                } finally {
+                    if (preparedStatement != null) {
+                        preparedStatement.close();
+                    }
+                    if (resultSet != null) {
+                        resultSet.close();
+                    }
+                }
+
+            }
+        };
+        EntityManager em = LabelSequence.entityManager();
+        Long maxRecord = em.unwrap(Session.class).doReturningWork(maxReturningWork);
+        return maxRecord;
+    }
+
+    @Transactional
+    public Long decrementSequence() {
+        final String sequenceName = this.getDbSequence();
+        ReturningWork<Long> maxReturningWork = new ReturningWork<Long>() {
+            @Override
+            public Long execute(Connection connection) throws SQLException {
+                String currentValueString = "";
+                DbType dbType = SimpleUtil.getDatabaseType(connection.getMetaData());
+                if (dbType == DbType.POSTGRES) {
+                    currentValueString = "SELECT currval('" + sequenceName + "')";
+                    long currentValue;
+                    try (PreparedStatement preparedStatement = connection.prepareStatement(currentValueString);
+                            ResultSet resultSet = preparedStatement.executeQuery()) {
+                        resultSet.next();
+                        currentValue = resultSet.getLong(1);
+                    }
+                    String setValueString = "SELECT setval('" + sequenceName + "', " + currentValue + ")";
+                    try (PreparedStatement preparedStatement = connection.prepareStatement(setValueString);
+                            ResultSet resultSet = preparedStatement.executeQuery();) {
+                        resultSet.next();
+                        return resultSet.getLong(1);
+                    }
+                } else if (dbType == DbType.ORACLE) {
+                    throw new SQLException("Decrement sequence not implemented for Oracle");
+                } else {
+                    throw new SQLException("Unssupported database type");
+                }
+            }
+        };
+        EntityManager em = LabelSequence.entityManager();
+        Long maxRecord = em.unwrap(Session.class).doReturningWork(maxReturningWork);
+        return maxRecord;
+    }
+
+    public long fetchCurrentValue() {
+        final String sequenceName = this.getDbSequence();
+        ReturningWork<Long> maxReturningWork = new ReturningWork<Long>() {
+            @Override
+            public Long execute(Connection connection) throws SQLException {
+                DbType dbType = SimpleUtil.getDatabaseType(connection.getMetaData());
+                try {
+                    String currentValueString = "";
+                    if (dbType == DbType.POSTGRES) {
+                        currentValueString = "SELECT last_value FROM " + sequenceName;
+                    } else if (dbType == DbType.ORACLE) {
+                        currentValueString = "SELECT last_number FROM all_sequences WHERE sequence_name = '"
+                                + sequenceName + "'";
+                    }
+                    try (
+                            PreparedStatement preparedStatement = connection.prepareStatement(currentValueString);
+                            ResultSet resultSet = preparedStatement.executeQuery()) {
+                        resultSet.next();
+                        return resultSet.getLong(1);
+                    }
+                } catch (SQLException e) {
+                    throw e;
+                }
+
+            }
+        };
+        EntityManager em = LabelSequence.entityManager();
+        Long maxRecord = em.unwrap(Session.class).doReturningWork(maxReturningWork);
+        return maxRecord;
+    }
+
+    public String toJson() {
+        return new JSONSerializer().exclude("*.class", "labelSequenceRoles.labelSequenceEntry")
+                .include("labelSequenceRoles.roleEntry").transform(new ExcludeNulls(), void.class).serialize(this);
+    }
+
+    public static String toJsonArray(Collection<LabelSequence> collection) {
+        return new JSONSerializer().exclude("*.class", "labelSequenceRoles.labelSequenceEntry")
+                .include("labelSequenceRoles.roleEntry").transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
+    }
+
+    public static Long countFindLabelSequencesByLabelTypeAndKindEquals(String labelTypeAndKind) {
+        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The labelTypeAndKind argument is required");
         EntityManager em = LabelSequence.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LabelSequence AS o WHERE o.labelTypeAndKind = :labelTypeAndKind", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM LabelSequence AS o WHERE o.labelTypeAndKind = :labelTypeAndKind", Long.class);
         q.setParameter("labelTypeAndKind", labelTypeAndKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLabelSequencesByThingTypeAndKindEquals(String thingTypeAndKind) {
-        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0) throw new IllegalArgumentException("The thingTypeAndKind argument is required");
+    public static Long countFindLabelSequencesByThingTypeAndKindEquals(String thingTypeAndKind) {
+        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The thingTypeAndKind argument is required");
         EntityManager em = LabelSequence.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind", Long.class);
         q.setParameter("thingTypeAndKind", thingTypeAndKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(String thingTypeAndKind, String labelTypeAndKind) {
-        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0) throw new IllegalArgumentException("The thingTypeAndKind argument is required");
-        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0) throw new IllegalArgumentException("The labelTypeAndKind argument is required");
+    public static Long countFindLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(String thingTypeAndKind,
+            String labelTypeAndKind) {
+        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The thingTypeAndKind argument is required");
+        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The labelTypeAndKind argument is required");
         EntityManager em = LabelSequence.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind  AND o.labelTypeAndKind = :labelTypeAndKind", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind  AND o.labelTypeAndKind = :labelTypeAndKind",
+                Long.class);
         q.setParameter("thingTypeAndKind", thingTypeAndKind);
         q.setParameter("labelTypeAndKind", labelTypeAndKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals(String thingTypeAndKind, String labelTypeAndKind, String labelPrefix) {
-        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0) throw new IllegalArgumentException("The thingTypeAndKind argument is required");
-        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0) throw new IllegalArgumentException("The labelTypeAndKind argument is required");
-        if (labelPrefix == null || labelPrefix.length() == 0) throw new IllegalArgumentException("The labelPrefix argument is required");
+    public static Long countFindLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals(
+            String thingTypeAndKind, String labelTypeAndKind, String labelPrefix) {
+        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The thingTypeAndKind argument is required");
+        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The labelTypeAndKind argument is required");
+        if (labelPrefix == null || labelPrefix.length() == 0)
+            throw new IllegalArgumentException("The labelPrefix argument is required");
         EntityManager em = LabelSequence.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind  AND o.labelTypeAndKind = :labelTypeAndKind  AND o.labelPrefix = :labelPrefix", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind  AND o.labelTypeAndKind = :labelTypeAndKind  AND o.labelPrefix = :labelPrefix",
+                Long.class);
         q.setParameter("thingTypeAndKind", thingTypeAndKind);
         q.setParameter("labelTypeAndKind", labelTypeAndKind);
         q.setParameter("labelPrefix", labelPrefix);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<LabelSequence> findLabelSequencesByLabelTypeAndKindEquals(String labelTypeAndKind) {
-        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0) throw new IllegalArgumentException("The labelTypeAndKind argument is required");
+    public static TypedQuery<LabelSequence> findLabelSequencesByLabelTypeAndKindEquals(String labelTypeAndKind) {
+        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The labelTypeAndKind argument is required");
         EntityManager em = LabelSequence.entityManager();
-        TypedQuery<LabelSequence> q = em.createQuery("SELECT o FROM LabelSequence AS o WHERE o.labelTypeAndKind = :labelTypeAndKind", LabelSequence.class);
+        TypedQuery<LabelSequence> q = em.createQuery(
+                "SELECT o FROM LabelSequence AS o WHERE o.labelTypeAndKind = :labelTypeAndKind", LabelSequence.class);
         q.setParameter("labelTypeAndKind", labelTypeAndKind);
         return q;
     }
 
-	public static TypedQuery<LabelSequence> findLabelSequencesByLabelTypeAndKindEquals(String labelTypeAndKind, String sortFieldName, String sortOrder) {
-        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0) throw new IllegalArgumentException("The labelTypeAndKind argument is required");
+    public static TypedQuery<LabelSequence> findLabelSequencesByLabelTypeAndKindEquals(String labelTypeAndKind,
+            String sortFieldName, String sortOrder) {
+        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The labelTypeAndKind argument is required");
         EntityManager em = LabelSequence.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LabelSequence AS o WHERE o.labelTypeAndKind = :labelTypeAndKind");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LabelSequence AS o WHERE o.labelTypeAndKind = :labelTypeAndKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -322,18 +351,23 @@ public static TypedQuery<LabelSequence> findLabelSequencesByLabelTypeAndKindEqua
         return q;
     }
 
-	public static TypedQuery<LabelSequence> findLabelSequencesByThingTypeAndKindEquals(String thingTypeAndKind) {
-        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0) throw new IllegalArgumentException("The thingTypeAndKind argument is required");
+    public static TypedQuery<LabelSequence> findLabelSequencesByThingTypeAndKindEquals(String thingTypeAndKind) {
+        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The thingTypeAndKind argument is required");
         EntityManager em = LabelSequence.entityManager();
-        TypedQuery<LabelSequence> q = em.createQuery("SELECT o FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind", LabelSequence.class);
+        TypedQuery<LabelSequence> q = em.createQuery(
+                "SELECT o FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind", LabelSequence.class);
         q.setParameter("thingTypeAndKind", thingTypeAndKind);
         return q;
     }
 
-	public static TypedQuery<LabelSequence> findLabelSequencesByThingTypeAndKindEquals(String thingTypeAndKind, String sortFieldName, String sortOrder) {
-        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0) throw new IllegalArgumentException("The thingTypeAndKind argument is required");
+    public static TypedQuery<LabelSequence> findLabelSequencesByThingTypeAndKindEquals(String thingTypeAndKind,
+            String sortFieldName, String sortOrder) {
+        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The thingTypeAndKind argument is required");
         EntityManager em = LabelSequence.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -345,21 +379,30 @@ public static TypedQuery<LabelSequence> findLabelSequencesByThingTypeAndKindEqua
         return q;
     }
 
-	public static TypedQuery<LabelSequence> findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(String thingTypeAndKind, String labelTypeAndKind) {
-        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0) throw new IllegalArgumentException("The thingTypeAndKind argument is required");
-        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0) throw new IllegalArgumentException("The labelTypeAndKind argument is required");
+    public static TypedQuery<LabelSequence> findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(
+            String thingTypeAndKind, String labelTypeAndKind) {
+        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The thingTypeAndKind argument is required");
+        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The labelTypeAndKind argument is required");
         EntityManager em = LabelSequence.entityManager();
-        TypedQuery<LabelSequence> q = em.createQuery("SELECT o FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind  AND o.labelTypeAndKind = :labelTypeAndKind", LabelSequence.class);
+        TypedQuery<LabelSequence> q = em.createQuery(
+                "SELECT o FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind  AND o.labelTypeAndKind = :labelTypeAndKind",
+                LabelSequence.class);
         q.setParameter("thingTypeAndKind", thingTypeAndKind);
         q.setParameter("labelTypeAndKind", labelTypeAndKind);
         return q;
     }
 
-	public static TypedQuery<LabelSequence> findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(String thingTypeAndKind, String labelTypeAndKind, String sortFieldName, String sortOrder) {
-        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0) throw new IllegalArgumentException("The thingTypeAndKind argument is required");
-        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0) throw new IllegalArgumentException("The labelTypeAndKind argument is required");
+    public static TypedQuery<LabelSequence> findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(
+            String thingTypeAndKind, String labelTypeAndKind, String sortFieldName, String sortOrder) {
+        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The thingTypeAndKind argument is required");
+        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The labelTypeAndKind argument is required");
         EntityManager em = LabelSequence.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind  AND o.labelTypeAndKind = :labelTypeAndKind");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind  AND o.labelTypeAndKind = :labelTypeAndKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -372,24 +415,36 @@ public static TypedQuery<LabelSequence> findLabelSequencesByThingTypeAndKindEqua
         return q;
     }
 
-	public static TypedQuery<LabelSequence> findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals(String thingTypeAndKind, String labelTypeAndKind, String labelPrefix) {
-        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0) throw new IllegalArgumentException("The thingTypeAndKind argument is required");
-        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0) throw new IllegalArgumentException("The labelTypeAndKind argument is required");
-        if (labelPrefix == null || labelPrefix.length() == 0) throw new IllegalArgumentException("The labelPrefix argument is required");
+    public static TypedQuery<LabelSequence> findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals(
+            String thingTypeAndKind, String labelTypeAndKind, String labelPrefix) {
+        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The thingTypeAndKind argument is required");
+        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The labelTypeAndKind argument is required");
+        if (labelPrefix == null || labelPrefix.length() == 0)
+            throw new IllegalArgumentException("The labelPrefix argument is required");
         EntityManager em = LabelSequence.entityManager();
-        TypedQuery<LabelSequence> q = em.createQuery("SELECT o FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind  AND o.labelTypeAndKind = :labelTypeAndKind  AND o.labelPrefix = :labelPrefix", LabelSequence.class);
+        TypedQuery<LabelSequence> q = em.createQuery(
+                "SELECT o FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind  AND o.labelTypeAndKind = :labelTypeAndKind  AND o.labelPrefix = :labelPrefix",
+                LabelSequence.class);
         q.setParameter("thingTypeAndKind", thingTypeAndKind);
         q.setParameter("labelTypeAndKind", labelTypeAndKind);
         q.setParameter("labelPrefix", labelPrefix);
         return q;
     }
 
-	public static TypedQuery<LabelSequence> findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals(String thingTypeAndKind, String labelTypeAndKind, String labelPrefix, String sortFieldName, String sortOrder) {
-        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0) throw new IllegalArgumentException("The thingTypeAndKind argument is required");
-        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0) throw new IllegalArgumentException("The labelTypeAndKind argument is required");
-        if (labelPrefix == null || labelPrefix.length() == 0) throw new IllegalArgumentException("The labelPrefix argument is required");
+    public static TypedQuery<LabelSequence> findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals(
+            String thingTypeAndKind, String labelTypeAndKind, String labelPrefix, String sortFieldName,
+            String sortOrder) {
+        if (thingTypeAndKind == null || thingTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The thingTypeAndKind argument is required");
+        if (labelTypeAndKind == null || labelTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The labelTypeAndKind argument is required");
+        if (labelPrefix == null || labelPrefix.length() == 0)
+            throw new IllegalArgumentException("The labelPrefix argument is required");
         EntityManager em = LabelSequence.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind  AND o.labelTypeAndKind = :labelTypeAndKind  AND o.labelPrefix = :labelPrefix");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LabelSequence AS o WHERE o.thingTypeAndKind = :thingTypeAndKind  AND o.labelTypeAndKind = :labelTypeAndKind  AND o.labelPrefix = :labelPrefix");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -403,144 +458,148 @@ public static TypedQuery<LabelSequence> findLabelSequencesByThingTypeAndKindEqua
         return q;
     }
 
-	@Id
+    @Id
     @SequenceGenerator(name = "labelSequenceGen", sequenceName = "LABEL_SEQUENCE_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "labelSequenceGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getThingTypeAndKind() {
+    public String getThingTypeAndKind() {
         return this.thingTypeAndKind;
     }
 
-	public void setThingTypeAndKind(String thingTypeAndKind) {
+    public void setThingTypeAndKind(String thingTypeAndKind) {
         this.thingTypeAndKind = thingTypeAndKind;
     }
 
-	public String getLabelTypeAndKind() {
+    public String getLabelTypeAndKind() {
         return this.labelTypeAndKind;
     }
 
-	public void setLabelTypeAndKind(String labelTypeAndKind) {
+    public void setLabelTypeAndKind(String labelTypeAndKind) {
         this.labelTypeAndKind = labelTypeAndKind;
     }
 
-	public String getLabelPrefix() {
+    public String getLabelPrefix() {
         return this.labelPrefix;
     }
 
-	public void setLabelPrefix(String labelPrefix) {
+    public void setLabelPrefix(String labelPrefix) {
         this.labelPrefix = labelPrefix;
     }
 
-	public String getLabelSeparator() {
+    public String getLabelSeparator() {
         return this.labelSeparator;
     }
 
-	public void setLabelSeparator(String labelSeparator) {
+    public void setLabelSeparator(String labelSeparator) {
         this.labelSeparator = labelSeparator;
     }
 
-	public boolean isGroupDigits() {
+    public boolean isGroupDigits() {
         return this.groupDigits;
     }
 
-	public void setGroupDigits(boolean groupDigits) {
+    public void setGroupDigits(boolean groupDigits) {
         this.groupDigits = groupDigits;
     }
 
-	public Integer getDigits() {
+    public Integer getDigits() {
         return this.digits;
     }
 
-	public void setDigits(Integer digits) {
+    public void setDigits(Integer digits) {
         this.digits = digits;
     }
 
-	public Long getStartingNumber() {
+    public Long getStartingNumber() {
         return this.startingNumber;
     }
 
-	public void setStartingNumber(Long startingNumber) {
+    public void setStartingNumber(Long startingNumber) {
         this.startingNumber = startingNumber;
     }
 
-	public boolean isIgnored() {
+    public boolean isIgnored() {
         return this.ignored;
     }
 
-	public void setIgnored(boolean ignored) {
+    public void setIgnored(boolean ignored) {
         this.ignored = ignored;
     }
 
-	public Date getModifiedDate() {
+    public Date getModifiedDate() {
         return this.modifiedDate;
     }
 
-	public void setModifiedDate(Date modifiedDate) {
+    public void setModifiedDate(Date modifiedDate) {
         this.modifiedDate = modifiedDate;
     }
 
-	public String getDbSequence() {
+    public String getDbSequence() {
         return this.dbSequence;
     }
 
-	public void setDbSequence(String dbSequence) {
+    public void setDbSequence(String dbSequence) {
         this.dbSequence = dbSequence;
     }
 
-	public Set<LabelSequenceRole> getLabelSequenceRoles() {
+    public Set<LabelSequenceRole> getLabelSequenceRoles() {
         return this.labelSequenceRoles;
     }
 
-	public void setLabelSequenceRoles(Set<LabelSequenceRole> labelSequenceRoles) {
+    public void setLabelSequenceRoles(Set<LabelSequenceRole> labelSequenceRoles) {
         this.labelSequenceRoles = labelSequenceRoles;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("thingTypeAndKind", "labelTypeAndKind", "labelPrefix", "labelSeparator", "groupDigits", "digits", "startingNumber", "ignored", "modifiedDate", "dbSequence", "labelSequenceRoles");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("thingTypeAndKind",
+            "labelTypeAndKind", "labelPrefix", "labelSeparator", "groupDigits", "digits", "startingNumber", "ignored",
+            "modifiedDate", "dbSequence", "labelSequenceRoles");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new LabelSequence().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countLabelSequences() {
+    public static long countLabelSequences() {
         return entityManager().createQuery("SELECT COUNT(o) FROM LabelSequence o", Long.class).getSingleResult();
     }
 
-	public static List<LabelSequence> findAllLabelSequences() {
+    public static List<LabelSequence> findAllLabelSequences() {
         return entityManager().createQuery("SELECT o FROM LabelSequence o", LabelSequence.class).getResultList();
     }
 
-	public static List<LabelSequence> findAllLabelSequences(String sortFieldName, String sortOrder) {
+    public static List<LabelSequence> findAllLabelSequences(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LabelSequence o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -551,16 +610,19 @@ public static List<LabelSequence> findAllLabelSequences(String sortFieldName, St
         return entityManager().createQuery(jpaQuery, LabelSequence.class).getResultList();
     }
 
-	public static LabelSequence findLabelSequence(Long id) {
-        if (id == null) return null;
+    public static LabelSequence findLabelSequence(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(LabelSequence.class, id);
     }
 
-	public static List<LabelSequence> findLabelSequenceEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LabelSequence o", LabelSequence.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<LabelSequence> findLabelSequenceEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LabelSequence o", LabelSequence.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<LabelSequence> findLabelSequenceEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<LabelSequence> findLabelSequenceEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM LabelSequence o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -568,18 +630,21 @@ public static List<LabelSequence> findLabelSequenceEntries(int firstResult, int
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, LabelSequence.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, LabelSequence.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -588,33 +653,36 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public LabelSequence merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         LabelSequence merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public static LabelSequence fromJsonToLabelSequence(String json) {
+    public static LabelSequence fromJsonToLabelSequence(String json) {
         return new JSONDeserializer<LabelSequence>()
-        .use(null, LabelSequence.class).deserialize(json);
+                .use(null, LabelSequence.class).deserialize(json);
     }
 
-	public static Collection<LabelSequence> fromJsonArrayToLabelSequences(String json) {
+    public static Collection<LabelSequence> fromJsonArrayToLabelSequences(String json) {
         return new JSONDeserializer<List<LabelSequence>>()
-        .use("values", LabelSequence.class).deserialize(json);
+                .use("values", LabelSequence.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole.java b/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole.java
index 9ad4f8ba7..e3a7e9375 100644
--- a/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole.java
+++ b/src/main/java/com/labsynch/labseer/domain/LabelSequenceRole.java
@@ -26,12 +26,12 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 @Configurable
 @Entity
-@Table(name = "label_sequence_ls_role", uniqueConstraints = { @javax.persistence.UniqueConstraint(columnNames = { "label_sequence_id", "ls_role_id" }) })
+@Table(name = "label_sequence_ls_role", uniqueConstraints = {
+        @javax.persistence.UniqueConstraint(columnNames = { "label_sequence_id", "ls_role_id" }) })
 public class LabelSequenceRole {
-	
+
     @NotNull
     @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     @JoinColumn(name = "label_sequence_id", referencedColumnName = "id")
@@ -72,85 +72,90 @@ public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public static LabelSequenceRole getOrCreateLabelSequenceRole(LabelSequence labelSequence, LsRole userRole) {
-		List<LabelSequenceRole> labelSequenceRoles = LabelSequenceRole.findLabelSequenceRolesByRoleEntryAndLabelSequenceEntry(userRole, labelSequence).getResultList();
-		if (labelSequenceRoles.size() == 0){
-			LabelSequenceRole newLabelSequenceRole = new LabelSequenceRole();
-			newLabelSequenceRole.setLabelSequenceEntry(labelSequence);
-			newLabelSequenceRole.setRoleEntry(userRole);
-			newLabelSequenceRole.persist();
-			return newLabelSequenceRole;
-		} else {
-			return labelSequenceRoles.get(0);
-		}
-	}
-
-	public String toJson() {
+    public static LabelSequenceRole getOrCreateLabelSequenceRole(LabelSequence labelSequence, LsRole userRole) {
+        List<LabelSequenceRole> labelSequenceRoles = LabelSequenceRole
+                .findLabelSequenceRolesByRoleEntryAndLabelSequenceEntry(userRole, labelSequence).getResultList();
+        if (labelSequenceRoles.size() == 0) {
+            LabelSequenceRole newLabelSequenceRole = new LabelSequenceRole();
+            newLabelSequenceRole.setLabelSequenceEntry(labelSequence);
+            newLabelSequenceRole.setRoleEntry(userRole);
+            newLabelSequenceRole.persist();
+            return newLabelSequenceRole;
+        } else {
+            return labelSequenceRoles.get(0);
+        }
+    }
+
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static LabelSequenceRole fromJsonToLabelSequenceRole(String json) {
+    public static LabelSequenceRole fromJsonToLabelSequenceRole(String json) {
         return new JSONDeserializer<LabelSequenceRole>()
-        .use(null, LabelSequenceRole.class).deserialize(json);
+                .use(null, LabelSequenceRole.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<LabelSequenceRole> collection) {
+    public static String toJsonArray(Collection<LabelSequenceRole> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<LabelSequenceRole> collection, String[] fields) {
+    public static String toJsonArray(Collection<LabelSequenceRole> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<LabelSequenceRole> fromJsonArrayToLabelSequenceRoles(String json) {
+    public static Collection<LabelSequenceRole> fromJsonArrayToLabelSequenceRoles(String json) {
         return new JSONDeserializer<List<LabelSequenceRole>>()
-        .use("values", LabelSequenceRole.class).deserialize(json);
+                .use("values", LabelSequenceRole.class).deserialize(json);
     }
 
-	public LabelSequence getLabelSequenceEntry() {
+    public LabelSequence getLabelSequenceEntry() {
         return this.labelSequenceEntry;
     }
 
-	public void setLabelSequenceEntry(LabelSequence labelSequenceEntry) {
+    public void setLabelSequenceEntry(LabelSequence labelSequenceEntry) {
         this.labelSequenceEntry = labelSequenceEntry;
     }
 
-	public LsRole getRoleEntry() {
+    public LsRole getRoleEntry() {
         return this.roleEntry;
     }
 
-	public void setRoleEntry(LsRole roleEntry) {
+    public void setRoleEntry(LsRole roleEntry) {
         this.roleEntry = roleEntry;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("labelSequenceEntry", "roleEntry", "id", "version");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("labelSequenceEntry",
+            "roleEntry", "id", "version");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new LabelSequenceRole().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countLabelSequenceRoles() {
+    public static long countLabelSequenceRoles() {
         return entityManager().createQuery("SELECT COUNT(o) FROM LabelSequenceRole o", Long.class).getSingleResult();
     }
 
-	public static List<LabelSequenceRole> findAllLabelSequenceRoles() {
-        return entityManager().createQuery("SELECT o FROM LabelSequenceRole o", LabelSequenceRole.class).getResultList();
+    public static List<LabelSequenceRole> findAllLabelSequenceRoles() {
+        return entityManager().createQuery("SELECT o FROM LabelSequenceRole o", LabelSequenceRole.class)
+                .getResultList();
     }
 
-	public static List<LabelSequenceRole> findAllLabelSequenceRoles(String sortFieldName, String sortOrder) {
+    public static List<LabelSequenceRole> findAllLabelSequenceRoles(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LabelSequenceRole o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -161,16 +166,19 @@ public static List<LabelSequenceRole> findAllLabelSequenceRoles(String sortField
         return entityManager().createQuery(jpaQuery, LabelSequenceRole.class).getResultList();
     }
 
-	public static LabelSequenceRole findLabelSequenceRole(Long id) {
-        if (id == null) return null;
+    public static LabelSequenceRole findLabelSequenceRole(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(LabelSequenceRole.class, id);
     }
 
-	public static List<LabelSequenceRole> findLabelSequenceRoleEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LabelSequenceRole o", LabelSequenceRole.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<LabelSequenceRole> findLabelSequenceRoleEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LabelSequenceRole o", LabelSequenceRole.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<LabelSequenceRole> findLabelSequenceRoleEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<LabelSequenceRole> findLabelSequenceRoleEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LabelSequenceRole o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -178,18 +186,21 @@ public static List<LabelSequenceRole> findLabelSequenceRoleEntries(int firstResu
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, LabelSequenceRole.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, LabelSequenceRole.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -198,51 +209,68 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public LabelSequenceRole merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         LabelSequenceRole merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public static Long countFindLabelSequenceRolesByRoleEntryAndLabelSequenceEntry(LsRole roleEntry, LabelSequence labelSequenceEntry) {
-        if (roleEntry == null) throw new IllegalArgumentException("The roleEntry argument is required");
-        if (labelSequenceEntry == null) throw new IllegalArgumentException("The labelSequenceEntry argument is required");
+    public static Long countFindLabelSequenceRolesByRoleEntryAndLabelSequenceEntry(LsRole roleEntry,
+            LabelSequence labelSequenceEntry) {
+        if (roleEntry == null)
+            throw new IllegalArgumentException("The roleEntry argument is required");
+        if (labelSequenceEntry == null)
+            throw new IllegalArgumentException("The labelSequenceEntry argument is required");
         EntityManager em = LabelSequenceRole.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LabelSequenceRole AS o WHERE o.roleEntry = :roleEntry AND o.labelSequenceEntry = :labelSequenceEntry", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM LabelSequenceRole AS o WHERE o.roleEntry = :roleEntry AND o.labelSequenceEntry = :labelSequenceEntry",
+                Long.class);
         q.setParameter("roleEntry", roleEntry);
         q.setParameter("labelSequenceEntry", labelSequenceEntry);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<LabelSequenceRole> findLabelSequenceRolesByRoleEntryAndLabelSequenceEntry(LsRole roleEntry, LabelSequence labelSequenceEntry) {
-        if (roleEntry == null) throw new IllegalArgumentException("The roleEntry argument is required");
-        if (labelSequenceEntry == null) throw new IllegalArgumentException("The labelSequenceEntry argument is required");
+    public static TypedQuery<LabelSequenceRole> findLabelSequenceRolesByRoleEntryAndLabelSequenceEntry(LsRole roleEntry,
+            LabelSequence labelSequenceEntry) {
+        if (roleEntry == null)
+            throw new IllegalArgumentException("The roleEntry argument is required");
+        if (labelSequenceEntry == null)
+            throw new IllegalArgumentException("The labelSequenceEntry argument is required");
         EntityManager em = LabelSequenceRole.entityManager();
-        TypedQuery<LabelSequenceRole> q = em.createQuery("SELECT o FROM LabelSequenceRole AS o WHERE o.roleEntry = :roleEntry AND o.labelSequenceEntry = :labelSequenceEntry", LabelSequenceRole.class);
+        TypedQuery<LabelSequenceRole> q = em.createQuery(
+                "SELECT o FROM LabelSequenceRole AS o WHERE o.roleEntry = :roleEntry AND o.labelSequenceEntry = :labelSequenceEntry",
+                LabelSequenceRole.class);
         q.setParameter("roleEntry", roleEntry);
         q.setParameter("labelSequenceEntry", labelSequenceEntry);
         return q;
     }
 
-	public static TypedQuery<LabelSequenceRole> findLabelSequenceRolesByRoleEntryAndLabelSequenceEntry(LsRole roleEntry, LabelSequence labelSequenceEntry, String sortFieldName, String sortOrder) {
-        if (roleEntry == null) throw new IllegalArgumentException("The roleEntry argument is required");
-        if (labelSequenceEntry == null) throw new IllegalArgumentException("The labelSequenceEntry argument is required");
+    public static TypedQuery<LabelSequenceRole> findLabelSequenceRolesByRoleEntryAndLabelSequenceEntry(LsRole roleEntry,
+            LabelSequence labelSequenceEntry, String sortFieldName, String sortOrder) {
+        if (roleEntry == null)
+            throw new IllegalArgumentException("The roleEntry argument is required");
+        if (labelSequenceEntry == null)
+            throw new IllegalArgumentException("The labelSequenceEntry argument is required");
         EntityManager em = LabelSequenceRole.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LabelSequenceRole AS o WHERE o.roleEntry = :roleEntry AND o.labelSequenceEntry = :labelSequenceEntry");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LabelSequenceRole AS o WHERE o.roleEntry = :roleEntry AND o.labelSequenceEntry = :labelSequenceEntry");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
diff --git a/src/main/java/com/labsynch/labseer/domain/LabelType.java b/src/main/java/com/labsynch/labseer/domain/LabelType.java
index 9fac8ffc4..70e6e4636 100755
--- a/src/main/java/com/labsynch/labseer/domain/LabelType.java
+++ b/src/main/java/com/labsynch/labseer/domain/LabelType.java
@@ -31,80 +31,83 @@
 
 public class LabelType {
 
-	private static final Logger logger = LoggerFactory.getLogger(LabelType.class);
+    private static final Logger logger = LoggerFactory.getLogger(LabelType.class);
 
     @NotNull
     @Column(unique = true)
     @Size(max = 255)
     private String typeName;
-    
-	public static LabelType getOrCreate(String name) {
-
-		LabelType lsType = null;
-		List<LabelType> lsTypes = LabelType.findLabelTypesByTypeNameEquals(name).getResultList();
-		if (lsTypes.size() == 0){
-			lsType = new LabelType();
-			lsType.setTypeName(name);
-			lsType.persist();
-		} else if (lsTypes.size() == 1){
-			lsType = lsTypes.get(0);
-		} else if (lsTypes.size() > 1){
-			logger.error("ERROR: multiple Label types with the same name");
-		}
-
-		return lsType;
-	}
-
-	@Id
+
+    public static LabelType getOrCreate(String name) {
+
+        LabelType lsType = null;
+        List<LabelType> lsTypes = LabelType.findLabelTypesByTypeNameEquals(name).getResultList();
+        if (lsTypes.size() == 0) {
+            lsType = new LabelType();
+            lsType.setTypeName(name);
+            lsType.persist();
+        } else if (lsTypes.size() == 1) {
+            lsType = lsTypes.get(0);
+        } else if (lsTypes.size() > 1) {
+            logger.error("ERROR: multiple Label types with the same name");
+        }
+
+        return lsType;
+    }
+
+    @Id
     @SequenceGenerator(name = "labelTypeGen", sequenceName = "LABEL_TYPE_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "labelTypeGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "typeName", "id", "version");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "typeName", "id",
+            "version");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new LabelType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countLabelTypes() {
+    public static long countLabelTypes() {
         return entityManager().createQuery("SELECT COUNT(o) FROM LabelType o", Long.class).getSingleResult();
     }
 
-	public static List<LabelType> findAllLabelTypes() {
+    public static List<LabelType> findAllLabelTypes() {
         return entityManager().createQuery("SELECT o FROM LabelType o", LabelType.class).getResultList();
     }
 
-	public static List<LabelType> findAllLabelTypes(String sortFieldName, String sortOrder) {
+    public static List<LabelType> findAllLabelTypes(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LabelType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -115,16 +118,19 @@ public static List<LabelType> findAllLabelTypes(String sortFieldName, String sor
         return entityManager().createQuery(jpaQuery, LabelType.class).getResultList();
     }
 
-	public static LabelType findLabelType(Long id) {
-        if (id == null) return null;
+    public static LabelType findLabelType(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(LabelType.class, id);
     }
 
-	public static List<LabelType> findLabelTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LabelType o", LabelType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<LabelType> findLabelTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LabelType o", LabelType.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<LabelType> findLabelTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<LabelType> findLabelTypeEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM LabelType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -132,18 +138,21 @@ public static List<LabelType> findLabelTypeEntries(int firstResult, int maxResul
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, LabelType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, LabelType.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -152,82 +161,90 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public LabelType merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         LabelType merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String getTypeName() {
+    public String getTypeName() {
         return this.typeName;
     }
 
-	public void setTypeName(String typeName) {
+    public void setTypeName(String typeName) {
         this.typeName = typeName;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static LabelType fromJsonToLabelType(String json) {
+    public static LabelType fromJsonToLabelType(String json) {
         return new JSONDeserializer<LabelType>()
-        .use(null, LabelType.class).deserialize(json);
+                .use(null, LabelType.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<LabelType> collection) {
+    public static String toJsonArray(Collection<LabelType> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<LabelType> collection, String[] fields) {
+    public static String toJsonArray(Collection<LabelType> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<LabelType> fromJsonArrayToLabelTypes(String json) {
+    public static Collection<LabelType> fromJsonArrayToLabelTypes(String json) {
         return new JSONDeserializer<List<LabelType>>()
-        .use("values", LabelType.class).deserialize(json);
+                .use("values", LabelType.class).deserialize(json);
     }
 
-	public static Long countFindLabelTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static Long countFindLabelTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = LabelType.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LabelType AS o WHERE o.typeName = :typeName", Long.class);
         q.setParameter("typeName", typeName);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<LabelType> findLabelTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static TypedQuery<LabelType> findLabelTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = LabelType.entityManager();
-        TypedQuery<LabelType> q = em.createQuery("SELECT o FROM LabelType AS o WHERE o.typeName = :typeName", LabelType.class);
+        TypedQuery<LabelType> q = em.createQuery("SELECT o FROM LabelType AS o WHERE o.typeName = :typeName",
+                LabelType.class);
         q.setParameter("typeName", typeName);
         return q;
     }
 
-	public static TypedQuery<LabelType> findLabelTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static TypedQuery<LabelType> findLabelTypesByTypeNameEquals(String typeName, String sortFieldName,
+            String sortOrder) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = LabelType.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LabelType AS o WHERE o.typeName = :typeName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
diff --git a/src/main/java/com/labsynch/labseer/domain/Lot.java b/src/main/java/com/labsynch/labseer/domain/Lot.java
index 5e70b93f0..8fee8108f 100755
--- a/src/main/java/com/labsynch/labseer/domain/Lot.java
+++ b/src/main/java/com/labsynch/labseer/domain/Lot.java
@@ -53,10 +53,10 @@
 @Configurable
 @Transactional
 public class Lot {
-	
+
     private static final Logger logger = LoggerFactory.getLogger(Lot.class);
-    
-	@Column(columnDefinition="text")
+
+    @Column(columnDefinition = "text")
     private String asDrawnStruct;
 
     private int lotAsDrawnCdId;
@@ -79,18 +79,18 @@ public class Lot {
     @Temporal(TemporalType.TIMESTAMP)
     @DateTimeFormat(style = "S-")
     private Date registrationDate;
-    
-	private String registeredBy;
-    
-	@Temporal(TemporalType.TIMESTAMP)
-	@DateTimeFormat(style = "S-")
-	private Date modifiedDate;
-	
-	private String modifiedBy;
+
+    private String registeredBy;
+
+    @Temporal(TemporalType.TIMESTAMP)
+    @DateTimeFormat(style = "S-")
+    private Date modifiedDate;
+
+    private String modifiedBy;
 
     @Size(max = 255)
     private String barcode;
-    
+
     @Size(max = 255)
     private String color;
 
@@ -105,10 +105,10 @@ public class Lot {
 
     private Double solutionAmount;
 
-    @ManyToOne    
+    @ManyToOne
     @JoinColumn(name = "solution_amount_units")
     private SolutionUnit solutionAmountUnits;
-    
+
     @Size(max = 255)
     private String supplier;
 
@@ -129,14 +129,13 @@ public class Lot {
 
     private Double percentEE;
 
-    @Column(columnDefinition="text")
+    @Column(columnDefinition = "text")
     private String comments;
 
     private Boolean isVirtual;
 
     private Boolean ignore;
 
-    
     @ManyToOne
     @JoinColumn(name = "physical_state")
     private PhysicalState physicalState;
@@ -161,7 +160,7 @@ public class Lot {
     @ManyToOne
     @JoinColumn(name = "retain_units")
     private Unit retainUnits;
-    
+
     private String retainLocation;
 
     private Double meltingPoint;
@@ -175,49 +174,49 @@ public class Lot {
 
     @Transient
     private Parent parent;
-    
+
     @ManyToOne
     @JoinColumn(name = "bulk_load_file")
     private BulkLoadFile bulkLoadFile;
-    
+
     private Double lambda;
-    
+
     private Double absorbance;
-    
+
     private String stockSolvent;
-    
+
     private String stockLocation;
-    
+
     private Double observedMassOne;
-    
+
     private Double observedMassTwo;
-    
+
     private Double tareWeight;
-    
+
     @ManyToOne
     @JoinColumn(name = "tare_weight_units")
     private Unit tareWeightUnits;
-    
+
     private Double totalAmountStored;
-    
+
     @ManyToOne
     @JoinColumn(name = "total_amount_stored_units")
     private Unit totalAmountStoredUnits;
-    
+
     @OneToMany(cascade = CascadeType.MERGE, mappedBy = "lot", fetch = FetchType.LAZY)
-	private Set<LotAlias> lotAliases = new HashSet<LotAlias>();
-   
+    private Set<LotAlias> lotAliases = new HashSet<LotAlias>();
+
     @Transient
     private transient String storageLocation;
-    
+
     public String getStorageLocation() {
-    		return this.storageLocation;
+        return this.storageLocation;
     }
-    
+
     public void setStorageLocation(String storageLocation) {
-    		this.storageLocation = storageLocation;
+        this.storageLocation = storageLocation;
     }
-    
+
     public Long getBuid() {
         return this.buid;
     }
@@ -248,63 +247,67 @@ public void setSaltForm(SaltForm saltForm) {
             this.saltForm.setParent(this.parent);
         }
     }
-	
+
     @Transactional
     public static List<Lot> findLotsByLessMolWeight(double molWeight) {
-		EntityManager em = Lot.entityManager();
-		String sqlQuery = "SELECT o FROM Lot o WHERE o.lotMolWeight < :molWeight ";
-		TypedQuery<Lot> query = em.createQuery(sqlQuery, Lot.class);
-		query.setParameter("molWeight", molWeight);
-		List<Lot> lots = query.getResultList();
+        EntityManager em = Lot.entityManager();
+        String sqlQuery = "SELECT o FROM Lot o WHERE o.lotMolWeight < :molWeight ";
+        TypedQuery<Lot> query = em.createQuery(sqlQuery, Lot.class);
+        query.setParameter("molWeight", molWeight);
+        List<Lot> lots = query.getResultList();
 
-		return lots;       
+        return lots;
     }
-  
-    
-	public static double calculateLotMolWeight(Lot lot) {
-		double totalLotWeight = lot.getSaltForm().getSaltWeight() + lot.getParent().getMolWeight();
-		logger.debug("the new lot weight: " + totalLotWeight);
-		return totalLotWeight;
-	}
 
+    public static double calculateLotMolWeight(Lot lot) {
+        double totalLotWeight = lot.getSaltForm().getSaltWeight() + lot.getParent().getMolWeight();
+        logger.debug("the new lot weight: " + totalLotWeight);
+        return totalLotWeight;
+    }
 
     @Transactional
     public static List<Lot> findAllLots() {
         return Lot.entityManager().createQuery("SELECT o FROM Lot o", Lot.class).getResultList();
     }
-    
-    @Transactional  
+
+    @Transactional
     public static List<Lot> findLotEntries(int firstResult, int maxResults) {
-        return Lot.entityManager().createQuery("SELECT o FROM Lot o", Lot.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return Lot.entityManager().createQuery("SELECT o FROM Lot o", Lot.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
-    
-    @Transactional  
+
+    @Transactional
     public static Lot findLot(Long id) {
-        if (id == null) return null;
+        if (id == null)
+            return null;
         return Lot.entityManager().find(Lot.class, id);
     }
-    
 
     public static TypedQuery<Lot> findLotsByBuidNumber(Long buidNumber) {
-        if (buidNumber == null) throw new IllegalArgumentException("The buidNumber argument is required");
+        if (buidNumber == null)
+            throw new IllegalArgumentException("The buidNumber argument is required");
         EntityManager em = Lot.entityManager();
-        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.buid = :buidNumber AND o.ignore IS null", Lot.class);
+        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.buid = :buidNumber AND o.ignore IS null",
+                Lot.class);
         q.setParameter("buidNumber", buidNumber);
         return q;
     }
-    
+
     public static TypedQuery<Lot> findLotsByNotebookPageEquals(String notebookPage) {
-        if (notebookPage == null || notebookPage.length() == 0) throw new IllegalArgumentException("The notebookPage argument is required");
+        if (notebookPage == null || notebookPage.length() == 0)
+            throw new IllegalArgumentException("The notebookPage argument is required");
         EntityManager em = Lot.entityManager();
-//        boolean ignore = true;
-        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.notebookPage = :notebookPage AND o.ignore IS null", Lot.class);
+        // boolean ignore = true;
+        TypedQuery<Lot> q = em.createQuery(
+                "SELECT o FROM Lot AS o WHERE o.notebookPage = :notebookPage AND o.ignore IS null", Lot.class);
         q.setParameter("notebookPage", notebookPage);
-//        q.setParameter("ignore", ignore);
+        // q.setParameter("ignore", ignore);
         return q;
     }
 
     public static TypedQuery<Lot> findLotsByDate(Date synthesisDate) {
-        if (synthesisDate == null) throw new IllegalArgumentException("The synthesisDate argument is required");
+        if (synthesisDate == null)
+            throw new IllegalArgumentException("The synthesisDate argument is required");
         EntityManager em = Lot.entityManager();
         TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.synthesisDate > :synthesisDate", Lot.class);
         q.setParameter("synthesisDate", synthesisDate);
@@ -348,17 +351,22 @@ public static TypedQuery<Lot> findLotsByMetaQuery(Author chemist, Date minSynthe
     }
 
     public static Long countNonVirtualSaltFormLots(SaltForm saltForm, Boolean isVirtual) {
-        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
-        if (isVirtual == null) throw new IllegalArgumentException("The isVirtual argument is required");
+        if (saltForm == null)
+            throw new IllegalArgumentException("The saltForm argument is required");
+        if (isVirtual == null)
+            throw new IllegalArgumentException("The isVirtual argument is required");
         EntityManager em = Lot.entityManager();
-        TypedQuery<Long> q = em.createQuery("SELECT COUNT(o) FROM Lot o WHERE o.saltForm = :saltForm AND o.isVirtual IS NOT :isVirtual", Long.class);
+        TypedQuery<Long> q = em.createQuery(
+                "SELECT COUNT(o) FROM Lot o WHERE o.saltForm = :saltForm AND o.isVirtual IS NOT :isVirtual",
+                Long.class);
         q.setParameter("saltForm", saltForm);
         q.setParameter("isVirtual", isVirtual);
         return q.getSingleResult();
     }
 
     public static Integer getMaxSaltFormLotNumber(SaltForm saltForm) {
-        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
+        if (saltForm == null)
+            throw new IllegalArgumentException("The saltForm argument is required");
         EntityManager em = Lot.entityManager();
         CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
         CriteriaQuery<Integer> criteria = criteriaBuilder.createQuery(Integer.class);
@@ -372,7 +380,8 @@ public static Integer getMaxSaltFormLotNumber(SaltForm saltForm) {
     }
 
     public static Integer getMaxParentLotNumber(Parent parent) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
+        if (parent == null)
+            throw new IllegalArgumentException("The parent argument is required");
         logger.debug("get max parent lot number for parent " + parent.getCorpName());
         EntityManager em = Lot.entityManager();
         CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
@@ -387,26 +396,30 @@ public static Integer getMaxParentLotNumber(Parent parent) {
         return q.getSingleResult();
     }
 
-	@SuppressWarnings("unchecked")
-	public static List<Long> generateCustomLotSequence() {
+    @SuppressWarnings("unchecked")
+    public static List<Long> generateCustomLotSequence() {
         String sqlQuery = "SELECT nextval('custom_lot_pkseq')";
         logger.info(sqlQuery);
         EntityManager em = Lot.entityManager();
         Query q = em.createNativeQuery(sqlQuery);
         return q.getResultList();
     }
-    
+
     public static Long countLotsByParent(Parent parent) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
+        if (parent == null)
+            throw new IllegalArgumentException("The parent argument is required");
         EntityManager em = Lot.entityManager();
-        TypedQuery<Long> q = em.createQuery("SELECT COUNT(l) FROM Lot l, SaltForm sf WHERE l.saltForm = sf AND sf.parent = :parent AND l.isVirtual IS NOT :isVirtual", Long.class);
+        TypedQuery<Long> q = em.createQuery(
+                "SELECT COUNT(l) FROM Lot l, SaltForm sf WHERE l.saltForm = sf AND sf.parent = :parent AND l.isVirtual IS NOT :isVirtual",
+                Long.class);
         q.setParameter("parent", parent);
         q.setParameter("isVirtual", true);
         return q.getSingleResult();
     }
 
     public static Long countLotsByVendor(Vendor vendor) {
-        if (vendor == null) throw new IllegalArgumentException("The vendor argument is required");
+        if (vendor == null)
+            throw new IllegalArgumentException("The vendor argument is required");
         EntityManager em = Lot.entityManager();
         TypedQuery<Long> q = em.createQuery("SELECT COUNT(l) FROM Lot l WHERE l.vendor = :vendor ", Long.class);
         q.setParameter("vendor", vendor);
@@ -414,16 +427,18 @@ public static Long countLotsByVendor(Vendor vendor) {
     }
 
     public static Long countLotsByRegisteredBy(Author registeredBy) {
-        if (registeredBy == null) throw new IllegalArgumentException("The registeredBy argument is required");
+        if (registeredBy == null)
+            throw new IllegalArgumentException("The registeredBy argument is required");
         EntityManager em = Lot.entityManager();
-        TypedQuery<Long> q = em.createQuery("SELECT COUNT(l) FROM Lot l WHERE l.registeredBy = :registeredBy ", Long.class);
+        TypedQuery<Long> q = em.createQuery("SELECT COUNT(l) FROM Lot l WHERE l.registeredBy = :registeredBy ",
+                Long.class);
         q.setParameter("registeredBy", registeredBy);
         return q.getSingleResult();
     }
-    
-    
+
     public static TypedQuery<Lot> findLotsByParent(Parent parent) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
+        if (parent == null)
+            throw new IllegalArgumentException("The parent argument is required");
         EntityManager em = Lot.entityManager();
         CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
         CriteriaQuery<Lot> criteria = criteriaBuilder.createQuery(Lot.class);
@@ -437,10 +452,10 @@ public static TypedQuery<Lot> findLotsByParent(Parent parent) {
         TypedQuery<Lot> q = em.createQuery(criteria);
         return q;
     }
-    
 
     public static TypedQuery<Lot> findFirstLotByParent(Parent parent) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
+        if (parent == null)
+            throw new IllegalArgumentException("The parent argument is required");
         EntityManager em = Lot.entityManager();
         CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
         CriteriaQuery<Lot> criteria = criteriaBuilder.createQuery(Lot.class);
@@ -453,33 +468,42 @@ public static TypedQuery<Lot> findFirstLotByParent(Parent parent) {
         TypedQuery<Lot> q = em.createQuery(criteria);
         return q;
     }
-    
+
     public static TypedQuery<Lot> findLotByParentAndLotNumber(Parent parent, int lotNumber) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
+        if (parent == null)
+            throw new IllegalArgumentException("The parent argument is required");
         EntityManager em = Lot.entityManager();
-        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.saltForm.parent = :parent AND o.lotNumber = :lotNumber ORDER BY o.lotNumber desc", Lot.class);
+        TypedQuery<Lot> q = em.createQuery(
+                "SELECT o FROM Lot AS o WHERE o.saltForm.parent = :parent AND o.lotNumber = :lotNumber ORDER BY o.lotNumber desc",
+                Lot.class);
         q.setParameter("parent", parent);
         q.setParameter("lotNumber", lotNumber);
         return q;
     }
 
     public static TypedQuery<Lot> findLotByParentAndLowestLotNumber(Parent parent) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
+        if (parent == null)
+            throw new IllegalArgumentException("The parent argument is required");
         EntityManager em = Lot.entityManager();
-        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.saltForm.parent = :parent AND (o.ignore IS NULL OR o.ignore IS :ignore) AND o.lotNumber = (select min(l.lotNumber) FROM Lot AS l WHERE l.saltForm.parent = :parent AND (l.ignore IS NULL OR l.ignore IS :ignore ))", Lot.class);
+        TypedQuery<Lot> q = em.createQuery(
+                "SELECT o FROM Lot AS o WHERE o.saltForm.parent = :parent AND (o.ignore IS NULL OR o.ignore IS :ignore) AND o.lotNumber = (select min(l.lotNumber) FROM Lot AS l WHERE l.saltForm.parent = :parent AND (l.ignore IS NULL OR l.ignore IS :ignore ))",
+                Lot.class);
         q.setParameter("parent", parent);
         q.setParameter("ignore", false);
         return q;
     }
 
     public static String getOriginallyDrawnAsStructure(Parent parent) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
+        if (parent == null)
+            throw new IllegalArgumentException("The parent argument is required");
         String parentStructure = parent.getMolStructure();
         EntityManager em = Lot.entityManager();
-        TypedQuery<String> q = em.createQuery("SELECT o.asDrawnStruct FROM Lot AS o WHERE o.saltForm.parent = :parent AND (o.ignore IS NULL OR o.ignore IS :ignore) AND o.lotNumber = (select min(l.lotNumber) FROM Lot AS l WHERE l.saltForm.parent = :parent AND (l.ignore IS NULL OR l.ignore IS :ignore ))", String.class);
+        TypedQuery<String> q = em.createQuery(
+                "SELECT o.asDrawnStruct FROM Lot AS o WHERE o.saltForm.parent = :parent AND (o.ignore IS NULL OR o.ignore IS :ignore) AND o.lotNumber = (select min(l.lotNumber) FROM Lot AS l WHERE l.saltForm.parent = :parent AND (l.ignore IS NULL OR l.ignore IS :ignore ))",
+                String.class);
         q.setParameter("parent", parent);
         q.setParameter("ignore", false);
-        
+
         // Get string result from typed query
         String lotAsDrawnStrucucture = q.getSingleResult();
         if (lotAsDrawnStrucucture == null) {
@@ -490,26 +514,30 @@ public static String getOriginallyDrawnAsStructure(Parent parent) {
     }
 
     public static TypedQuery<Lot> findLotsBySaltForm(SaltForm saltForm) {
-        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
+        if (saltForm == null)
+            throw new IllegalArgumentException("The saltForm argument is required");
         EntityManager em = Lot.entityManager();
-        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.saltForm = :saltForm ORDER BY ID desc", Lot.class);
+        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.saltForm = :saltForm ORDER BY ID desc",
+                Lot.class);
         q.setParameter("saltForm", saltForm);
         return q;
     }
 
     public static TypedQuery<Lot> findLotsBySaltFormAndMeta(SaltForm saltForm, SearchFormDTO searchParams) {
-        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
-        if (searchParams == null) throw new IllegalArgumentException("The searchParams argument is required");
+        if (saltForm == null)
+            throw new IllegalArgumentException("The saltForm argument is required");
+        if (searchParams == null)
+            throw new IllegalArgumentException("The searchParams argument is required");
         EntityManager em = Lot.entityManager();
         CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
         CriteriaQuery<Lot> criteria = criteriaBuilder.createQuery(Lot.class);
         Root<Lot> lotRoot = criteria.from(Lot.class);
         Join<Lot, SaltForm> lotSaltForm = lotRoot.join("saltForm");
         Join<SaltForm, Parent> saltFormParent = lotSaltForm.join("parent");
-		Join<Parent, ParentAlias> parentAliases = saltFormParent.join("parentAliases", JoinType.LEFT);
+        Join<Parent, ParentAlias> parentAliases = saltFormParent.join("parentAliases", JoinType.LEFT);
 
         criteria.select(lotRoot);
-//        criteria.distinct(true);
+        // criteria.distinct(true);
         ParameterExpression<Date> firstDate = criteriaBuilder.parameter(Date.class);
         ParameterExpression<Date> lastDate = criteriaBuilder.parameter(Date.class);
         Predicate[] predicates = new Predicate[0];
@@ -543,12 +571,14 @@ public static TypedQuery<Lot> findLotsBySaltFormAndMeta(SaltForm saltForm, Searc
         }
         if (searchParams.getSaltFormCorpName() != null) {
             logger.debug("incoming saltFormCorpName :" + searchParams.getSaltFormCorpName());
-            Predicate predicate = criteriaBuilder.equal(lotSaltForm.get("corpName"), searchParams.getSaltFormCorpName());
+            Predicate predicate = criteriaBuilder.equal(lotSaltForm.get("corpName"),
+                    searchParams.getSaltFormCorpName());
             predicateList.add(predicate);
         }
         if (searchParams.getParentCorpName() != null) {
             logger.debug("incoming parentCorpName :" + searchParams.getParentCorpName());
-            Predicate predicate = criteriaBuilder.equal(saltFormParent.get("corpName"), searchParams.getParentCorpName());
+            Predicate predicate = criteriaBuilder.equal(saltFormParent.get("corpName"),
+                    searchParams.getParentCorpName());
             predicateList.add(predicate);
         }
         if (searchParams.getAlias() != null && !searchParams.getAlias().equals("")) {
@@ -557,14 +587,16 @@ public static TypedQuery<Lot> findLotsBySaltFormAndMeta(SaltForm saltForm, Searc
             String aliasName = searchParams.getAlias().trim().toUpperCase();
             logger.debug("incoming alias name :" + searchParams.getAlias());
             if (searchParams.getAliasContSelect().equalsIgnoreCase("exact")) {
-            	Predicate notIgnored = criteriaBuilder.not(parentAliases.<Boolean>get("ignored"));
-                Predicate nameEquals = criteriaBuilder.equal(criteriaBuilder.upper(parentAliases.<String>get("aliasName")), aliasName);
+                Predicate notIgnored = criteriaBuilder.not(parentAliases.<Boolean>get("ignored"));
+                Predicate nameEquals = criteriaBuilder
+                        .equal(criteriaBuilder.upper(parentAliases.<String>get("aliasName")), aliasName);
                 predicate = criteriaBuilder.and(notIgnored, nameEquals);
             } else {
                 aliasName = "%" + aliasName + "%";
                 logger.debug("looking for a like match on the alias   " + aliasName);
                 Predicate notIgnored = criteriaBuilder.not(parentAliases.<Boolean>get("ignored"));
-                Predicate nameLike = criteriaBuilder.like(criteriaBuilder.upper(parentAliases.<String>get("aliasName")), aliasName);
+                Predicate nameLike = criteriaBuilder.like(criteriaBuilder.upper(parentAliases.<String>get("aliasName")),
+                        aliasName);
                 predicate = criteriaBuilder.and(notIgnored, nameLike);
             }
             predicateList.add(predicate);
@@ -579,483 +611,491 @@ public static TypedQuery<Lot> findLotsBySaltFormAndMeta(SaltForm saltForm, Searc
         if (searchParams.getMinSynthDate() != null) {
             q.setParameter(firstDate, searchParams.getMinSynthDate(), TemporalType.DATE);
         }
-        
-        if (searchParams.getMaxResults() != null) q.setMaxResults(searchParams.getMaxResults());
-        
+
+        if (searchParams.getMaxResults() != null)
+            q.setMaxResults(searchParams.getMaxResults());
+
         return q;
     }
 
     public static TypedQuery<LotsByProjectDTO> findLotsByProjectsList(List<String> projects) {
-		
-		EntityManager em = Lot.entityManager();
-		String query = "SELECT new com.labsynch.labseer.dto.LotsByProjectDTO( "
-				+ "lt.id as id, lt.corpName as lotCorpName, lt.lotNumber as lotNumber, lt.registrationDate as registrationDate, prnt.corpName as parentCorpName, lt.project as project) " 
+
+        EntityManager em = Lot.entityManager();
+        String query = "SELECT new com.labsynch.labseer.dto.LotsByProjectDTO( "
+                + "lt.id as id, lt.corpName as lotCorpName, lt.lotNumber as lotNumber, lt.registrationDate as registrationDate, prnt.corpName as parentCorpName, lt.project as project) "
                 + "FROM Lot AS lt "
-				+ "JOIN lt.saltForm sltfrm "
-				+ "JOIN sltfrm.parent prnt "
-				+ "WHERE lt.project in (:projects) ";
-		
-		logger.debug("sql query " + query);
+                + "JOIN lt.saltForm sltfrm "
+                + "JOIN sltfrm.parent prnt "
+                + "WHERE lt.project in (:projects) ";
+
+        logger.debug("sql query " + query);
         TypedQuery<LotsByProjectDTO> q = em.createQuery(query, LotsByProjectDTO.class);
         q.setParameter("projects", projects);
 
-		return q;
-	}
-	
-    
+        return q;
+    }
+
     public String toJsonIncludeAliases() {
         return new JSONSerializer()
-        		.include("lotAliases")
-        .exclude("*.class").serialize(this);
+                .include("lotAliases")
+                .exclude("*.class").serialize(this);
     }
 
-    
-
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String getAsDrawnStruct() {
+    public String getAsDrawnStruct() {
         return this.asDrawnStruct;
     }
 
-	public void setAsDrawnStruct(String asDrawnStruct) {
+    public void setAsDrawnStruct(String asDrawnStruct) {
         this.asDrawnStruct = asDrawnStruct;
     }
 
-	public int getLotAsDrawnCdId() {
+    public int getLotAsDrawnCdId() {
         return this.lotAsDrawnCdId;
     }
 
-	public void setLotAsDrawnCdId(int lotAsDrawnCdId) {
+    public void setLotAsDrawnCdId(int lotAsDrawnCdId) {
         this.lotAsDrawnCdId = lotAsDrawnCdId;
     }
 
-	public void setBuid(Long buid) {
+    public void setBuid(Long buid) {
         this.buid = buid;
     }
 
-	public String getCorpName() {
+    public String getCorpName() {
         return this.corpName;
     }
 
-	public void setCorpName(String corpName) {
+    public void setCorpName(String corpName) {
         this.corpName = corpName;
     }
 
-	public Integer getLotNumber() {
+    public Integer getLotNumber() {
         return this.lotNumber;
     }
 
-	public void setLotNumber(Integer lotNumber) {
+    public void setLotNumber(Integer lotNumber) {
         this.lotNumber = lotNumber;
     }
 
-	public Double getLotMolWeight() {
+    public Double getLotMolWeight() {
         return this.lotMolWeight;
     }
 
-	public void setLotMolWeight(Double lotMolWeight) {
+    public void setLotMolWeight(Double lotMolWeight) {
         this.lotMolWeight = lotMolWeight;
     }
 
-	public Date getSynthesisDate() {
+    public Date getSynthesisDate() {
         return this.synthesisDate;
     }
 
-	public void setSynthesisDate(Date synthesisDate) {
+    public void setSynthesisDate(Date synthesisDate) {
         this.synthesisDate = synthesisDate;
     }
 
-	public Date getRegistrationDate() {
+    public Date getRegistrationDate() {
         return this.registrationDate;
     }
 
-	public void setRegistrationDate(Date registrationDate) {
+    public void setRegistrationDate(Date registrationDate) {
         this.registrationDate = registrationDate;
     }
 
-	public String getRegisteredBy() {
+    public String getRegisteredBy() {
         return this.registeredBy;
     }
 
-	public void setRegisteredBy(String registeredBy) {
+    public void setRegisteredBy(String registeredBy) {
         this.registeredBy = registeredBy;
     }
 
-	public Date getModifiedDate() {
+    public Date getModifiedDate() {
         return this.modifiedDate;
     }
 
-	public void setModifiedDate(Date modifiedDate) {
+    public void setModifiedDate(Date modifiedDate) {
         this.modifiedDate = modifiedDate;
     }
 
-	public String getModifiedBy() {
+    public String getModifiedBy() {
         return this.modifiedBy;
     }
 
-	public void setModifiedBy(String modifiedBy) {
+    public void setModifiedBy(String modifiedBy) {
         this.modifiedBy = modifiedBy;
     }
 
-	public String getBarcode() {
+    public String getBarcode() {
         return this.barcode;
     }
 
-	public void setBarcode(String barcode) {
+    public void setBarcode(String barcode) {
         this.barcode = barcode;
     }
 
-	public String getColor() {
+    public String getColor() {
         return this.color;
     }
 
-	public void setColor(String color) {
+    public void setColor(String color) {
         this.color = color;
     }
 
-	public String getNotebookPage() {
+    public String getNotebookPage() {
         return this.notebookPage;
     }
 
-	public void setNotebookPage(String notebookPage) {
+    public void setNotebookPage(String notebookPage) {
         this.notebookPage = notebookPage;
     }
 
-	public Double getAmount() {
+    public Double getAmount() {
         return this.amount;
     }
 
-	public void setAmount(Double amount) {
+    public void setAmount(Double amount) {
         this.amount = amount;
     }
 
-	public Unit getAmountUnits() {
+    public Unit getAmountUnits() {
         return this.amountUnits;
     }
 
-	public void setAmountUnits(Unit amountUnits) {
+    public void setAmountUnits(Unit amountUnits) {
         this.amountUnits = amountUnits;
     }
 
-	public Double getSolutionAmount() {
+    public Double getSolutionAmount() {
         return this.solutionAmount;
     }
 
-	public void setSolutionAmount(Double solutionAmount) {
+    public void setSolutionAmount(Double solutionAmount) {
         this.solutionAmount = solutionAmount;
     }
 
-	public SolutionUnit getSolutionAmountUnits() {
+    public SolutionUnit getSolutionAmountUnits() {
         return this.solutionAmountUnits;
     }
 
-	public void setSolutionAmountUnits(SolutionUnit solutionAmountUnits) {
+    public void setSolutionAmountUnits(SolutionUnit solutionAmountUnits) {
         this.solutionAmountUnits = solutionAmountUnits;
     }
 
-	public String getSupplier() {
+    public String getSupplier() {
         return this.supplier;
     }
 
-	public void setSupplier(String supplier) {
+    public void setSupplier(String supplier) {
         this.supplier = supplier;
     }
 
-	public String getSupplierID() {
+    public String getSupplierID() {
         return this.supplierID;
     }
 
-	public void setSupplierID(String supplierID) {
+    public void setSupplierID(String supplierID) {
         this.supplierID = supplierID;
     }
 
-	public Double getPurity() {
+    public Double getPurity() {
         return this.purity;
     }
 
-	public void setPurity(Double purity) {
+    public void setPurity(Double purity) {
         this.purity = purity;
     }
 
-	public Operator getPurityOperator() {
+    public Operator getPurityOperator() {
         return this.purityOperator;
     }
 
-	public void setPurityOperator(Operator purityOperator) {
+    public void setPurityOperator(Operator purityOperator) {
         this.purityOperator = purityOperator;
     }
 
-	public PurityMeasuredBy getPurityMeasuredBy() {
+    public PurityMeasuredBy getPurityMeasuredBy() {
         return this.purityMeasuredBy;
     }
 
-	public void setPurityMeasuredBy(PurityMeasuredBy purityMeasuredBy) {
+    public void setPurityMeasuredBy(PurityMeasuredBy purityMeasuredBy) {
         this.purityMeasuredBy = purityMeasuredBy;
     }
 
-	public String getChemist() {
+    public String getChemist() {
         return this.chemist;
     }
 
-	public void setChemist(String chemist) {
+    public void setChemist(String chemist) {
         this.chemist = chemist;
     }
 
-	public Double getPercentEE() {
+    public Double getPercentEE() {
         return this.percentEE;
     }
 
-	public void setPercentEE(Double percentEE) {
+    public void setPercentEE(Double percentEE) {
         this.percentEE = percentEE;
     }
 
-	public String getComments() {
+    public String getComments() {
         return this.comments;
     }
 
-	public void setComments(String comments) {
+    public void setComments(String comments) {
         this.comments = comments;
     }
 
-	public Boolean getIsVirtual() {
+    public Boolean getIsVirtual() {
         return this.isVirtual;
     }
 
-	public void setIsVirtual(Boolean isVirtual) {
+    public void setIsVirtual(Boolean isVirtual) {
         this.isVirtual = isVirtual;
     }
 
-	public Boolean getIgnore() {
+    public Boolean getIgnore() {
         return this.ignore;
     }
 
-	public void setIgnore(Boolean ignore) {
+    public void setIgnore(Boolean ignore) {
         this.ignore = ignore;
     }
 
-	public PhysicalState getPhysicalState() {
+    public PhysicalState getPhysicalState() {
         return this.physicalState;
     }
 
-	public void setPhysicalState(PhysicalState physicalState) {
+    public void setPhysicalState(PhysicalState physicalState) {
         this.physicalState = physicalState;
     }
 
-	public Vendor getVendor() {
+    public Vendor getVendor() {
         return this.vendor;
     }
 
-	public void setVendor(Vendor vendor) {
+    public void setVendor(Vendor vendor) {
         this.vendor = vendor;
     }
 
-	public String getVendorId() {
+    public String getVendorId() {
         return this.vendorId;
     }
 
-	public void setVendorId(String vendorId) {
+    public void setVendorId(String vendorId) {
         this.vendorId = vendorId;
     }
 
-	public Set<FileList> getFileLists() {
+    public Set<FileList> getFileLists() {
         return this.fileLists;
     }
 
-	public void setFileLists(Set<FileList> fileLists) {
+    public void setFileLists(Set<FileList> fileLists) {
         this.fileLists = fileLists;
     }
 
-	public Double getRetain() {
+    public Double getRetain() {
         return this.retain;
     }
 
-	public void setRetain(Double retain) {
+    public void setRetain(Double retain) {
         this.retain = retain;
     }
 
-	public Unit getRetainUnits() {
+    public Unit getRetainUnits() {
         return this.retainUnits;
     }
 
-	public void setRetainUnits(Unit retainUnits) {
+    public void setRetainUnits(Unit retainUnits) {
         this.retainUnits = retainUnits;
     }
 
-	public String getRetainLocation() {
+    public String getRetainLocation() {
         return this.retainLocation;
     }
 
-	public void setRetainLocation(String retainLocation) {
+    public void setRetainLocation(String retainLocation) {
         this.retainLocation = retainLocation;
     }
 
-	public Double getMeltingPoint() {
+    public Double getMeltingPoint() {
         return this.meltingPoint;
     }
 
-	public void setMeltingPoint(Double meltingPoint) {
+    public void setMeltingPoint(Double meltingPoint) {
         this.meltingPoint = meltingPoint;
     }
 
-	public Double getBoilingPoint() {
+    public Double getBoilingPoint() {
         return this.boilingPoint;
     }
 
-	public void setBoilingPoint(Double boilingPoint) {
+    public void setBoilingPoint(Double boilingPoint) {
         this.boilingPoint = boilingPoint;
     }
 
-	public String getSupplierLot() {
+    public String getSupplierLot() {
         return this.supplierLot;
     }
 
-	public void setSupplierLot(String supplierLot) {
+    public void setSupplierLot(String supplierLot) {
         this.supplierLot = supplierLot;
     }
 
-	public String getProject() {
+    public String getProject() {
         return this.project;
     }
 
-	public void setProject(String project) {
+    public void setProject(String project) {
         this.project = project;
     }
 
-	public BulkLoadFile getBulkLoadFile() {
+    public BulkLoadFile getBulkLoadFile() {
         return this.bulkLoadFile;
     }
 
-	public void setBulkLoadFile(BulkLoadFile bulkLoadFile) {
+    public void setBulkLoadFile(BulkLoadFile bulkLoadFile) {
         this.bulkLoadFile = bulkLoadFile;
     }
 
-	public Double getLambda() {
+    public Double getLambda() {
         return this.lambda;
     }
 
-	public void setLambda(Double lambda) {
+    public void setLambda(Double lambda) {
         this.lambda = lambda;
     }
 
-	public Double getAbsorbance() {
+    public Double getAbsorbance() {
         return this.absorbance;
     }
 
-	public void setAbsorbance(Double absorbance) {
+    public void setAbsorbance(Double absorbance) {
         this.absorbance = absorbance;
     }
 
-	public String getStockSolvent() {
+    public String getStockSolvent() {
         return this.stockSolvent;
     }
 
-	public void setStockSolvent(String stockSolvent) {
+    public void setStockSolvent(String stockSolvent) {
         this.stockSolvent = stockSolvent;
     }
 
-	public String getStockLocation() {
+    public String getStockLocation() {
         return this.stockLocation;
     }
 
-	public void setStockLocation(String stockLocation) {
+    public void setStockLocation(String stockLocation) {
         this.stockLocation = stockLocation;
     }
 
-	public Double getObservedMassOne() {
+    public Double getObservedMassOne() {
         return this.observedMassOne;
     }
 
-	public void setObservedMassOne(Double observedMassOne) {
+    public void setObservedMassOne(Double observedMassOne) {
         this.observedMassOne = observedMassOne;
     }
 
-	public Double getObservedMassTwo() {
+    public Double getObservedMassTwo() {
         return this.observedMassTwo;
     }
 
-	public void setObservedMassTwo(Double observedMassTwo) {
+    public void setObservedMassTwo(Double observedMassTwo) {
         this.observedMassTwo = observedMassTwo;
     }
 
-	public Double getTareWeight() {
+    public Double getTareWeight() {
         return this.tareWeight;
     }
 
-	public void setTareWeight(Double tareWeight) {
+    public void setTareWeight(Double tareWeight) {
         this.tareWeight = tareWeight;
     }
 
-	public Unit getTareWeightUnits() {
+    public Unit getTareWeightUnits() {
         return this.tareWeightUnits;
     }
 
-	public void setTareWeightUnits(Unit tareWeightUnits) {
+    public void setTareWeightUnits(Unit tareWeightUnits) {
         this.tareWeightUnits = tareWeightUnits;
     }
 
-	public Double getTotalAmountStored() {
+    public Double getTotalAmountStored() {
         return this.totalAmountStored;
     }
 
-	public void setTotalAmountStored(Double totalAmountStored) {
+    public void setTotalAmountStored(Double totalAmountStored) {
         this.totalAmountStored = totalAmountStored;
     }
 
-	public Unit getTotalAmountStoredUnits() {
+    public Unit getTotalAmountStoredUnits() {
         return this.totalAmountStoredUnits;
     }
 
-	public void setTotalAmountStoredUnits(Unit totalAmountStoredUnits) {
+    public void setTotalAmountStoredUnits(Unit totalAmountStoredUnits) {
         this.totalAmountStoredUnits = totalAmountStoredUnits;
     }
 
-	public Set<LotAlias> getLotAliases() {
+    public Set<LotAlias> getLotAliases() {
         return this.lotAliases;
     }
 
-	public void setLotAliases(Set<LotAlias> lotAliases) {
+    public void setLotAliases(Set<LotAlias> lotAliases) {
         this.lotAliases = lotAliases;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "asDrawnStruct", "lotAsDrawnCdId", "buid", "corpName", "lotNumber", "lotMolWeight", "synthesisDate", "registrationDate", "registeredBy", "modifiedDate", "modifiedBy", "barcode", "color", "notebookPage", "amount", "amountUnits", "solutionAmount", "solutionAmountUnits", "supplier", "supplierID", "purity", "purityOperator", "purityMeasuredBy", "chemist", "percentEE", "comments", "isVirtual", "ignore", "physicalState", "vendor", "vendorId", "saltForm", "fileLists", "retain", "retainUnits", "retainLocation", "meltingPoint", "boilingPoint", "supplierLot", "project", "parent", "bulkLoadFile", "lambda", "absorbance", "stockSolvent", "stockLocation", "observedMassOne", "observedMassTwo", "tareWeight", "tareWeightUnits", "totalAmountStored", "totalAmountStoredUnits", "lotAliases", "storageLocation");
-
-	public static final EntityManager entityManager() {
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "asDrawnStruct",
+            "lotAsDrawnCdId", "buid", "corpName", "lotNumber", "lotMolWeight", "synthesisDate", "registrationDate",
+            "registeredBy", "modifiedDate", "modifiedBy", "barcode", "color", "notebookPage", "amount", "amountUnits",
+            "solutionAmount", "solutionAmountUnits", "supplier", "supplierID", "purity", "purityOperator",
+            "purityMeasuredBy", "chemist", "percentEE", "comments", "isVirtual", "ignore", "physicalState", "vendor",
+            "vendorId", "saltForm", "fileLists", "retain", "retainUnits", "retainLocation", "meltingPoint",
+            "boilingPoint", "supplierLot", "project", "parent", "bulkLoadFile", "lambda", "absorbance", "stockSolvent",
+            "stockLocation", "observedMassOne", "observedMassTwo", "tareWeight", "tareWeightUnits", "totalAmountStored",
+            "totalAmountStoredUnits", "lotAliases", "storageLocation");
+
+    public static final EntityManager entityManager() {
         EntityManager em = new Lot().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countLots() {
+    public static long countLots() {
         return entityManager().createQuery("SELECT COUNT(o) FROM Lot o", Long.class).getSingleResult();
     }
 
-	public static List<Lot> findAllLots(String sortFieldName, String sortOrder) {
+    public static List<Lot> findAllLots(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM Lot o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -1066,7 +1106,7 @@ public static List<Lot> findAllLots(String sortFieldName, String sortOrder) {
         return entityManager().createQuery(jpaQuery, Lot.class).getResultList();
     }
 
-	public static List<Lot> findLotEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<Lot> findLotEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM Lot o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -1074,18 +1114,21 @@ public static List<Lot> findLotEntries(int firstResult, int maxResults, String s
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, Lot.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, Lot.class).setFirstResult(firstResult).setMaxResults(maxResults)
+                .getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -1094,64 +1137,77 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public Lot merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         Lot merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public static Long countFindLotsByBuid(Long buid) {
-        if (buid == null) throw new IllegalArgumentException("The buid argument is required");
+    public static Long countFindLotsByBuid(Long buid) {
+        if (buid == null)
+            throw new IllegalArgumentException("The buid argument is required");
         EntityManager em = Lot.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.buid = :buid", Long.class);
         q.setParameter("buid", buid);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLotsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile) {
-        if (bulkLoadFile == null) throw new IllegalArgumentException("The bulkLoadFile argument is required");
+    public static Long countFindLotsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile) {
+        if (bulkLoadFile == null)
+            throw new IllegalArgumentException("The bulkLoadFile argument is required");
         EntityManager em = Lot.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.bulkLoadFile = :bulkLoadFile", Long.class);
         q.setParameter("bulkLoadFile", bulkLoadFile);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLotsByChemistAndSynthesisDateBetween(String chemist, Date minSynthesisDate, Date maxSynthesisDate) {
-        if (chemist == null || chemist.length() == 0) throw new IllegalArgumentException("The chemist argument is required");
-        if (minSynthesisDate == null) throw new IllegalArgumentException("The minSynthesisDate argument is required");
-        if (maxSynthesisDate == null) throw new IllegalArgumentException("The maxSynthesisDate argument is required");
+    public static Long countFindLotsByChemistAndSynthesisDateBetween(String chemist, Date minSynthesisDate,
+            Date maxSynthesisDate) {
+        if (chemist == null || chemist.length() == 0)
+            throw new IllegalArgumentException("The chemist argument is required");
+        if (minSynthesisDate == null)
+            throw new IllegalArgumentException("The minSynthesisDate argument is required");
+        if (maxSynthesisDate == null)
+            throw new IllegalArgumentException("The maxSynthesisDate argument is required");
         EntityManager em = Lot.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.chemist = :chemist AND o.synthesisDate BETWEEN :minSynthesisDate AND :maxSynthesisDate", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM Lot AS o WHERE o.chemist = :chemist AND o.synthesisDate BETWEEN :minSynthesisDate AND :maxSynthesisDate",
+                Long.class);
         q.setParameter("chemist", chemist);
         q.setParameter("minSynthesisDate", minSynthesisDate);
         q.setParameter("maxSynthesisDate", maxSynthesisDate);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLotsByCorpNameEquals(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+    public static Long countFindLotsByCorpNameEquals(String corpName) {
+        if (corpName == null || corpName.length() == 0)
+            throw new IllegalArgumentException("The corpName argument is required");
         EntityManager em = Lot.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.corpName = :corpName", Long.class);
         q.setParameter("corpName", corpName);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLotsByCorpNameLike(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+    public static Long countFindLotsByCorpNameLike(String corpName) {
+        if (corpName == null || corpName.length() == 0)
+            throw new IllegalArgumentException("The corpName argument is required");
         corpName = corpName.replace('*', '%');
         if (corpName.charAt(0) != '%') {
             corpName = "%" + corpName;
@@ -1160,81 +1216,99 @@ public static Long countFindLotsByCorpNameLike(String corpName) {
             corpName = corpName + "%";
         }
         EntityManager em = Lot.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)",
+                Long.class);
         q.setParameter("corpName", corpName);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLotsByIsVirtualNot(Boolean isVirtual) {
-        if (isVirtual == null) throw new IllegalArgumentException("The isVirtual argument is required");
+    public static Long countFindLotsByIsVirtualNot(Boolean isVirtual) {
+        if (isVirtual == null)
+            throw new IllegalArgumentException("The isVirtual argument is required");
         EntityManager em = Lot.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.isVirtual IS NOT :isVirtual", Long.class);
         q.setParameter("isVirtual", isVirtual);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLotsByNotebookPageEquals(String notebookPage) {
-        if (notebookPage == null || notebookPage.length() == 0) throw new IllegalArgumentException("The notebookPage argument is required");
+    public static Long countFindLotsByNotebookPageEquals(String notebookPage) {
+        if (notebookPage == null || notebookPage.length() == 0)
+            throw new IllegalArgumentException("The notebookPage argument is required");
         EntityManager em = Lot.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.notebookPage = :notebookPage", Long.class);
         q.setParameter("notebookPage", notebookPage);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLotsByNotebookPageEqualsAndIgnoreNot(String notebookPage, Boolean ignore) {
-        if (notebookPage == null || notebookPage.length() == 0) throw new IllegalArgumentException("The notebookPage argument is required");
-        if (ignore == null) throw new IllegalArgumentException("The ignore argument is required");
+    public static Long countFindLotsByNotebookPageEqualsAndIgnoreNot(String notebookPage, Boolean ignore) {
+        if (notebookPage == null || notebookPage.length() == 0)
+            throw new IllegalArgumentException("The notebookPage argument is required");
+        if (ignore == null)
+            throw new IllegalArgumentException("The ignore argument is required");
         EntityManager em = Lot.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.notebookPage = :notebookPage  AND o.ignore IS NOT :ignore", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM Lot AS o WHERE o.notebookPage = :notebookPage  AND o.ignore IS NOT :ignore",
+                Long.class);
         q.setParameter("notebookPage", notebookPage);
         q.setParameter("ignore", ignore);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLotsBySaltForm(SaltForm saltForm) {
-        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
+    public static Long countFindLotsBySaltForm(SaltForm saltForm) {
+        if (saltForm == null)
+            throw new IllegalArgumentException("The saltForm argument is required");
         EntityManager em = Lot.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.saltForm = :saltForm", Long.class);
         q.setParameter("saltForm", saltForm);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLotsBySynthesisDateBetween(Date minSynthesisDate, Date maxSynthesisDate) {
-        if (minSynthesisDate == null) throw new IllegalArgumentException("The minSynthesisDate argument is required");
-        if (maxSynthesisDate == null) throw new IllegalArgumentException("The maxSynthesisDate argument is required");
+    public static Long countFindLotsBySynthesisDateBetween(Date minSynthesisDate, Date maxSynthesisDate) {
+        if (minSynthesisDate == null)
+            throw new IllegalArgumentException("The minSynthesisDate argument is required");
+        if (maxSynthesisDate == null)
+            throw new IllegalArgumentException("The maxSynthesisDate argument is required");
         EntityManager em = Lot.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.synthesisDate BETWEEN :minSynthesisDate AND :maxSynthesisDate", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM Lot AS o WHERE o.synthesisDate BETWEEN :minSynthesisDate AND :maxSynthesisDate",
+                Long.class);
         q.setParameter("minSynthesisDate", minSynthesisDate);
         q.setParameter("maxSynthesisDate", maxSynthesisDate);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLotsBySynthesisDateGreaterThan(Date synthesisDate) {
-        if (synthesisDate == null) throw new IllegalArgumentException("The synthesisDate argument is required");
+    public static Long countFindLotsBySynthesisDateGreaterThan(Date synthesisDate) {
+        if (synthesisDate == null)
+            throw new IllegalArgumentException("The synthesisDate argument is required");
         EntityManager em = Lot.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.synthesisDate > :synthesisDate", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.synthesisDate > :synthesisDate",
+                Long.class);
         q.setParameter("synthesisDate", synthesisDate);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLotsBySynthesisDateLessThan(Date synthesisDate) {
-        if (synthesisDate == null) throw new IllegalArgumentException("The synthesisDate argument is required");
+    public static Long countFindLotsBySynthesisDateLessThan(Date synthesisDate) {
+        if (synthesisDate == null)
+            throw new IllegalArgumentException("The synthesisDate argument is required");
         EntityManager em = Lot.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.synthesisDate < :synthesisDate", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Lot AS o WHERE o.synthesisDate < :synthesisDate",
+                Long.class);
         q.setParameter("synthesisDate", synthesisDate);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<Lot> findLotsByBuid(Long buid) {
-        if (buid == null) throw new IllegalArgumentException("The buid argument is required");
+    public static TypedQuery<Lot> findLotsByBuid(Long buid) {
+        if (buid == null)
+            throw new IllegalArgumentException("The buid argument is required");
         EntityManager em = Lot.entityManager();
         TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.buid = :buid", Lot.class);
         q.setParameter("buid", buid);
         return q;
     }
 
-	public static TypedQuery<Lot> findLotsByBuid(Long buid, String sortFieldName, String sortOrder) {
-        if (buid == null) throw new IllegalArgumentException("The buid argument is required");
+    public static TypedQuery<Lot> findLotsByBuid(Long buid, String sortFieldName, String sortOrder) {
+        if (buid == null)
+            throw new IllegalArgumentException("The buid argument is required");
         EntityManager em = Lot.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.buid = :buid");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -1248,16 +1322,19 @@ public static TypedQuery<Lot> findLotsByBuid(Long buid, String sortFieldName, St
         return q;
     }
 
-	public static TypedQuery<Lot> findLotsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile) {
-        if (bulkLoadFile == null) throw new IllegalArgumentException("The bulkLoadFile argument is required");
+    public static TypedQuery<Lot> findLotsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile) {
+        if (bulkLoadFile == null)
+            throw new IllegalArgumentException("The bulkLoadFile argument is required");
         EntityManager em = Lot.entityManager();
         TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.bulkLoadFile = :bulkLoadFile", Lot.class);
         q.setParameter("bulkLoadFile", bulkLoadFile);
         return q;
     }
 
-	public static TypedQuery<Lot> findLotsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile, String sortFieldName, String sortOrder) {
-        if (bulkLoadFile == null) throw new IllegalArgumentException("The bulkLoadFile argument is required");
+    public static TypedQuery<Lot> findLotsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile, String sortFieldName,
+            String sortOrder) {
+        if (bulkLoadFile == null)
+            throw new IllegalArgumentException("The bulkLoadFile argument is required");
         EntityManager em = Lot.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.bulkLoadFile = :bulkLoadFile");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -1271,24 +1348,35 @@ public static TypedQuery<Lot> findLotsByBulkLoadFileEquals(BulkLoadFile bulkLoad
         return q;
     }
 
-	public static TypedQuery<Lot> findLotsByChemistAndSynthesisDateBetween(String chemist, Date minSynthesisDate, Date maxSynthesisDate) {
-        if (chemist == null || chemist.length() == 0) throw new IllegalArgumentException("The chemist argument is required");
-        if (minSynthesisDate == null) throw new IllegalArgumentException("The minSynthesisDate argument is required");
-        if (maxSynthesisDate == null) throw new IllegalArgumentException("The maxSynthesisDate argument is required");
+    public static TypedQuery<Lot> findLotsByChemistAndSynthesisDateBetween(String chemist, Date minSynthesisDate,
+            Date maxSynthesisDate) {
+        if (chemist == null || chemist.length() == 0)
+            throw new IllegalArgumentException("The chemist argument is required");
+        if (minSynthesisDate == null)
+            throw new IllegalArgumentException("The minSynthesisDate argument is required");
+        if (maxSynthesisDate == null)
+            throw new IllegalArgumentException("The maxSynthesisDate argument is required");
         EntityManager em = Lot.entityManager();
-        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.chemist = :chemist AND o.synthesisDate BETWEEN :minSynthesisDate AND :maxSynthesisDate", Lot.class);
+        TypedQuery<Lot> q = em.createQuery(
+                "SELECT o FROM Lot AS o WHERE o.chemist = :chemist AND o.synthesisDate BETWEEN :minSynthesisDate AND :maxSynthesisDate",
+                Lot.class);
         q.setParameter("chemist", chemist);
         q.setParameter("minSynthesisDate", minSynthesisDate);
         q.setParameter("maxSynthesisDate", maxSynthesisDate);
         return q;
     }
 
-	public static TypedQuery<Lot> findLotsByChemistAndSynthesisDateBetween(String chemist, Date minSynthesisDate, Date maxSynthesisDate, String sortFieldName, String sortOrder) {
-        if (chemist == null || chemist.length() == 0) throw new IllegalArgumentException("The chemist argument is required");
-        if (minSynthesisDate == null) throw new IllegalArgumentException("The minSynthesisDate argument is required");
-        if (maxSynthesisDate == null) throw new IllegalArgumentException("The maxSynthesisDate argument is required");
+    public static TypedQuery<Lot> findLotsByChemistAndSynthesisDateBetween(String chemist, Date minSynthesisDate,
+            Date maxSynthesisDate, String sortFieldName, String sortOrder) {
+        if (chemist == null || chemist.length() == 0)
+            throw new IllegalArgumentException("The chemist argument is required");
+        if (minSynthesisDate == null)
+            throw new IllegalArgumentException("The minSynthesisDate argument is required");
+        if (maxSynthesisDate == null)
+            throw new IllegalArgumentException("The maxSynthesisDate argument is required");
         EntityManager em = Lot.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.chemist = :chemist AND o.synthesisDate BETWEEN :minSynthesisDate AND :maxSynthesisDate");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Lot AS o WHERE o.chemist = :chemist AND o.synthesisDate BETWEEN :minSynthesisDate AND :maxSynthesisDate");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -1302,16 +1390,18 @@ public static TypedQuery<Lot> findLotsByChemistAndSynthesisDateBetween(String ch
         return q;
     }
 
-	public static TypedQuery<Lot> findLotsByCorpNameEquals(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+    public static TypedQuery<Lot> findLotsByCorpNameEquals(String corpName) {
+        if (corpName == null || corpName.length() == 0)
+            throw new IllegalArgumentException("The corpName argument is required");
         EntityManager em = Lot.entityManager();
         TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.corpName = :corpName", Lot.class);
         q.setParameter("corpName", corpName);
         return q;
     }
 
-	public static TypedQuery<Lot> findLotsByCorpNameEquals(String corpName, String sortFieldName, String sortOrder) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+    public static TypedQuery<Lot> findLotsByCorpNameEquals(String corpName, String sortFieldName, String sortOrder) {
+        if (corpName == null || corpName.length() == 0)
+            throw new IllegalArgumentException("The corpName argument is required");
         EntityManager em = Lot.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.corpName = :corpName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -1325,8 +1415,9 @@ public static TypedQuery<Lot> findLotsByCorpNameEquals(String corpName, String s
         return q;
     }
 
-	public static TypedQuery<Lot> findLotsByCorpNameLike(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+    public static TypedQuery<Lot> findLotsByCorpNameLike(String corpName) {
+        if (corpName == null || corpName.length() == 0)
+            throw new IllegalArgumentException("The corpName argument is required");
         corpName = corpName.replace('*', '%');
         if (corpName.charAt(0) != '%') {
             corpName = "%" + corpName;
@@ -1335,13 +1426,15 @@ public static TypedQuery<Lot> findLotsByCorpNameLike(String corpName) {
             corpName = corpName + "%";
         }
         EntityManager em = Lot.entityManager();
-        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)", Lot.class);
+        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)",
+                Lot.class);
         q.setParameter("corpName", corpName);
         return q;
     }
 
-	public static TypedQuery<Lot> findLotsByCorpNameLike(String corpName, String sortFieldName, String sortOrder) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+    public static TypedQuery<Lot> findLotsByCorpNameLike(String corpName, String sortFieldName, String sortOrder) {
+        if (corpName == null || corpName.length() == 0)
+            throw new IllegalArgumentException("The corpName argument is required");
         corpName = corpName.replace('*', '%');
         if (corpName.charAt(0) != '%') {
             corpName = "%" + corpName;
@@ -1350,7 +1443,8 @@ public static TypedQuery<Lot> findLotsByCorpNameLike(String corpName, String sor
             corpName = corpName + "%";
         }
         EntityManager em = Lot.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Lot AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -1362,16 +1456,18 @@ public static TypedQuery<Lot> findLotsByCorpNameLike(String corpName, String sor
         return q;
     }
 
-	public static TypedQuery<Lot> findLotsByIsVirtualNot(Boolean isVirtual) {
-        if (isVirtual == null) throw new IllegalArgumentException("The isVirtual argument is required");
+    public static TypedQuery<Lot> findLotsByIsVirtualNot(Boolean isVirtual) {
+        if (isVirtual == null)
+            throw new IllegalArgumentException("The isVirtual argument is required");
         EntityManager em = Lot.entityManager();
         TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.isVirtual IS NOT :isVirtual", Lot.class);
         q.setParameter("isVirtual", isVirtual);
         return q;
     }
 
-	public static TypedQuery<Lot> findLotsByIsVirtualNot(Boolean isVirtual, String sortFieldName, String sortOrder) {
-        if (isVirtual == null) throw new IllegalArgumentException("The isVirtual argument is required");
+    public static TypedQuery<Lot> findLotsByIsVirtualNot(Boolean isVirtual, String sortFieldName, String sortOrder) {
+        if (isVirtual == null)
+            throw new IllegalArgumentException("The isVirtual argument is required");
         EntityManager em = Lot.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.isVirtual IS NOT :isVirtual");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -1385,8 +1481,10 @@ public static TypedQuery<Lot> findLotsByIsVirtualNot(Boolean isVirtual, String s
         return q;
     }
 
-	public static TypedQuery<Lot> findLotsByNotebookPageEquals(String notebookPage, String sortFieldName, String sortOrder) {
-        if (notebookPage == null || notebookPage.length() == 0) throw new IllegalArgumentException("The notebookPage argument is required");
+    public static TypedQuery<Lot> findLotsByNotebookPageEquals(String notebookPage, String sortFieldName,
+            String sortOrder) {
+        if (notebookPage == null || notebookPage.length() == 0)
+            throw new IllegalArgumentException("The notebookPage argument is required");
         EntityManager em = Lot.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.notebookPage = :notebookPage");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -1400,21 +1498,28 @@ public static TypedQuery<Lot> findLotsByNotebookPageEquals(String notebookPage,
         return q;
     }
 
-	public static TypedQuery<Lot> findLotsByNotebookPageEqualsAndIgnoreNot(String notebookPage, Boolean ignore) {
-        if (notebookPage == null || notebookPage.length() == 0) throw new IllegalArgumentException("The notebookPage argument is required");
-        if (ignore == null) throw new IllegalArgumentException("The ignore argument is required");
+    public static TypedQuery<Lot> findLotsByNotebookPageEqualsAndIgnoreNot(String notebookPage, Boolean ignore) {
+        if (notebookPage == null || notebookPage.length() == 0)
+            throw new IllegalArgumentException("The notebookPage argument is required");
+        if (ignore == null)
+            throw new IllegalArgumentException("The ignore argument is required");
         EntityManager em = Lot.entityManager();
-        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.notebookPage = :notebookPage  AND o.ignore IS NOT :ignore", Lot.class);
+        TypedQuery<Lot> q = em.createQuery(
+                "SELECT o FROM Lot AS o WHERE o.notebookPage = :notebookPage  AND o.ignore IS NOT :ignore", Lot.class);
         q.setParameter("notebookPage", notebookPage);
         q.setParameter("ignore", ignore);
         return q;
     }
 
-	public static TypedQuery<Lot> findLotsByNotebookPageEqualsAndIgnoreNot(String notebookPage, Boolean ignore, String sortFieldName, String sortOrder) {
-        if (notebookPage == null || notebookPage.length() == 0) throw new IllegalArgumentException("The notebookPage argument is required");
-        if (ignore == null) throw new IllegalArgumentException("The ignore argument is required");
+    public static TypedQuery<Lot> findLotsByNotebookPageEqualsAndIgnoreNot(String notebookPage, Boolean ignore,
+            String sortFieldName, String sortOrder) {
+        if (notebookPage == null || notebookPage.length() == 0)
+            throw new IllegalArgumentException("The notebookPage argument is required");
+        if (ignore == null)
+            throw new IllegalArgumentException("The ignore argument is required");
         EntityManager em = Lot.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.notebookPage = :notebookPage  AND o.ignore IS NOT :ignore");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Lot AS o WHERE o.notebookPage = :notebookPage  AND o.ignore IS NOT :ignore");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -1427,8 +1532,9 @@ public static TypedQuery<Lot> findLotsByNotebookPageEqualsAndIgnoreNot(String no
         return q;
     }
 
-	public static TypedQuery<Lot> findLotsBySaltForm(SaltForm saltForm, String sortFieldName, String sortOrder) {
-        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
+    public static TypedQuery<Lot> findLotsBySaltForm(SaltForm saltForm, String sortFieldName, String sortOrder) {
+        if (saltForm == null)
+            throw new IllegalArgumentException("The saltForm argument is required");
         EntityManager em = Lot.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.saltForm = :saltForm");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -1442,21 +1548,29 @@ public static TypedQuery<Lot> findLotsBySaltForm(SaltForm saltForm, String sortF
         return q;
     }
 
-	public static TypedQuery<Lot> findLotsBySynthesisDateBetween(Date minSynthesisDate, Date maxSynthesisDate) {
-        if (minSynthesisDate == null) throw new IllegalArgumentException("The minSynthesisDate argument is required");
-        if (maxSynthesisDate == null) throw new IllegalArgumentException("The maxSynthesisDate argument is required");
+    public static TypedQuery<Lot> findLotsBySynthesisDateBetween(Date minSynthesisDate, Date maxSynthesisDate) {
+        if (minSynthesisDate == null)
+            throw new IllegalArgumentException("The minSynthesisDate argument is required");
+        if (maxSynthesisDate == null)
+            throw new IllegalArgumentException("The maxSynthesisDate argument is required");
         EntityManager em = Lot.entityManager();
-        TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.synthesisDate BETWEEN :minSynthesisDate AND :maxSynthesisDate", Lot.class);
+        TypedQuery<Lot> q = em.createQuery(
+                "SELECT o FROM Lot AS o WHERE o.synthesisDate BETWEEN :minSynthesisDate AND :maxSynthesisDate",
+                Lot.class);
         q.setParameter("minSynthesisDate", minSynthesisDate);
         q.setParameter("maxSynthesisDate", maxSynthesisDate);
         return q;
     }
 
-	public static TypedQuery<Lot> findLotsBySynthesisDateBetween(Date minSynthesisDate, Date maxSynthesisDate, String sortFieldName, String sortOrder) {
-        if (minSynthesisDate == null) throw new IllegalArgumentException("The minSynthesisDate argument is required");
-        if (maxSynthesisDate == null) throw new IllegalArgumentException("The maxSynthesisDate argument is required");
+    public static TypedQuery<Lot> findLotsBySynthesisDateBetween(Date minSynthesisDate, Date maxSynthesisDate,
+            String sortFieldName, String sortOrder) {
+        if (minSynthesisDate == null)
+            throw new IllegalArgumentException("The minSynthesisDate argument is required");
+        if (maxSynthesisDate == null)
+            throw new IllegalArgumentException("The maxSynthesisDate argument is required");
         EntityManager em = Lot.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.synthesisDate BETWEEN :minSynthesisDate AND :maxSynthesisDate");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Lot AS o WHERE o.synthesisDate BETWEEN :minSynthesisDate AND :maxSynthesisDate");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -1469,16 +1583,19 @@ public static TypedQuery<Lot> findLotsBySynthesisDateBetween(Date minSynthesisDa
         return q;
     }
 
-	public static TypedQuery<Lot> findLotsBySynthesisDateGreaterThan(Date synthesisDate) {
-        if (synthesisDate == null) throw new IllegalArgumentException("The synthesisDate argument is required");
+    public static TypedQuery<Lot> findLotsBySynthesisDateGreaterThan(Date synthesisDate) {
+        if (synthesisDate == null)
+            throw new IllegalArgumentException("The synthesisDate argument is required");
         EntityManager em = Lot.entityManager();
         TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.synthesisDate > :synthesisDate", Lot.class);
         q.setParameter("synthesisDate", synthesisDate);
         return q;
     }
 
-	public static TypedQuery<Lot> findLotsBySynthesisDateGreaterThan(Date synthesisDate, String sortFieldName, String sortOrder) {
-        if (synthesisDate == null) throw new IllegalArgumentException("The synthesisDate argument is required");
+    public static TypedQuery<Lot> findLotsBySynthesisDateGreaterThan(Date synthesisDate, String sortFieldName,
+            String sortOrder) {
+        if (synthesisDate == null)
+            throw new IllegalArgumentException("The synthesisDate argument is required");
         EntityManager em = Lot.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.synthesisDate > :synthesisDate");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -1492,16 +1609,19 @@ public static TypedQuery<Lot> findLotsBySynthesisDateGreaterThan(Date synthesisD
         return q;
     }
 
-	public static TypedQuery<Lot> findLotsBySynthesisDateLessThan(Date synthesisDate) {
-        if (synthesisDate == null) throw new IllegalArgumentException("The synthesisDate argument is required");
+    public static TypedQuery<Lot> findLotsBySynthesisDateLessThan(Date synthesisDate) {
+        if (synthesisDate == null)
+            throw new IllegalArgumentException("The synthesisDate argument is required");
         EntityManager em = Lot.entityManager();
         TypedQuery<Lot> q = em.createQuery("SELECT o FROM Lot AS o WHERE o.synthesisDate < :synthesisDate", Lot.class);
         q.setParameter("synthesisDate", synthesisDate);
         return q;
     }
 
-	public static TypedQuery<Lot> findLotsBySynthesisDateLessThan(Date synthesisDate, String sortFieldName, String sortOrder) {
-        if (synthesisDate == null) throw new IllegalArgumentException("The synthesisDate argument is required");
+    public static TypedQuery<Lot> findLotsBySynthesisDateLessThan(Date synthesisDate, String sortFieldName,
+            String sortOrder) {
+        if (synthesisDate == null)
+            throw new IllegalArgumentException("The synthesisDate argument is required");
         EntityManager em = Lot.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Lot AS o WHERE o.synthesisDate < :synthesisDate");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -1515,37 +1635,37 @@ public static TypedQuery<Lot> findLotsBySynthesisDateLessThan(Date synthesisDate
         return q;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static Lot fromJsonToLot(String json) {
+    public static Lot fromJsonToLot(String json) {
         return new JSONDeserializer<Lot>()
-        .use(null, Lot.class).deserialize(json);
+                .use(null, Lot.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<Lot> collection) {
+    public static String toJsonArray(Collection<Lot> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<Lot> collection, String[] fields) {
+    public static String toJsonArray(Collection<Lot> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<Lot> fromJsonArrayToLots(String json) {
+    public static Collection<Lot> fromJsonArrayToLots(String json) {
         return new JSONDeserializer<List<Lot>>()
-        .use("values", Lot.class).deserialize(json);
+                .use("values", Lot.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAlias.java b/src/main/java/com/labsynch/labseer/domain/LotAlias.java
index 3d63a933d..1e41f2edf 100644
--- a/src/main/java/com/labsynch/labseer/domain/LotAlias.java
+++ b/src/main/java/com/labsynch/labseer/domain/LotAlias.java
@@ -32,185 +32,188 @@
 @Configurable
 public class LotAlias {
 
-	private static final Logger logger = LoggerFactory.getLogger(LotAlias.class);
-	
-	@ManyToOne
-    @org.hibernate.annotations.Index(name="LotAlias_Parent_IDX")
-	@JoinColumn(name = "lot")
-	private Lot lot;
-	
+    private static final Logger logger = LoggerFactory.getLogger(LotAlias.class);
+
+    @ManyToOne
+    @org.hibernate.annotations.Index(name = "LotAlias_Parent_IDX")
+    @JoinColumn(name = "lot")
+    private Lot lot;
+
     private String lsType;
 
     private String lsKind;
-    
+
     private String aliasName;
-    
-	private boolean preferred;
-	
-	private boolean ignored;
-	
-	private boolean deleted;
-    
-	public LotAlias(){
-	}
-	
-	public LotAlias(Lot lot, String lsType, String lsKind, String aliasName, boolean preferred){
-		this.lot = lot;
-		this.lsType = lsType;
-		this.lsKind = lsKind;
-		this.aliasName = aliasName;
-		this.preferred = preferred;
-	}
-	
-	public LotAlias(LotAliasDTO lotAliasDTO) throws LotNotFoundException{
-		try{
-			Lot lot = Lot.findLotsByCorpNameEquals(lotAliasDTO.getLotCorpName()).getSingleResult();
-			this.lot = lot;
-		}catch (Exception e){
-			logger.error("Lot "+lotAliasDTO.getLotCorpName()+" could not be found.",e);
-			throw new LotNotFoundException("Lot "+lotAliasDTO.getLotCorpName()+" could not be found.");
-		}
-		this.lsType = lotAliasDTO.getLsType();
-		this.lsKind = lotAliasDTO.getLsKind();
-		this.aliasName = lotAliasDTO.getAliasName();
-		this.preferred = lotAliasDTO.isPreferred();
-	}
-
-	public Lot getLot() {
+
+    private boolean preferred;
+
+    private boolean ignored;
+
+    private boolean deleted;
+
+    public LotAlias() {
+    }
+
+    public LotAlias(Lot lot, String lsType, String lsKind, String aliasName, boolean preferred) {
+        this.lot = lot;
+        this.lsType = lsType;
+        this.lsKind = lsKind;
+        this.aliasName = aliasName;
+        this.preferred = preferred;
+    }
+
+    public LotAlias(LotAliasDTO lotAliasDTO) throws LotNotFoundException {
+        try {
+            Lot lot = Lot.findLotsByCorpNameEquals(lotAliasDTO.getLotCorpName()).getSingleResult();
+            this.lot = lot;
+        } catch (Exception e) {
+            logger.error("Lot " + lotAliasDTO.getLotCorpName() + " could not be found.", e);
+            throw new LotNotFoundException("Lot " + lotAliasDTO.getLotCorpName() + " could not be found.");
+        }
+        this.lsType = lotAliasDTO.getLsType();
+        this.lsKind = lotAliasDTO.getLsKind();
+        this.aliasName = lotAliasDTO.getAliasName();
+        this.preferred = lotAliasDTO.isPreferred();
+    }
+
+    public Lot getLot() {
         return this.lot;
     }
 
-	public void setLot(Lot lot) {
+    public void setLot(Lot lot) {
         this.lot = lot;
     }
 
-	public String getLsType() {
+    public String getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(String lsType) {
+    public void setLsType(String lsType) {
         this.lsType = lsType;
     }
 
-	public String getLsKind() {
+    public String getLsKind() {
         return this.lsKind;
     }
 
-	public void setLsKind(String lsKind) {
+    public void setLsKind(String lsKind) {
         this.lsKind = lsKind;
     }
 
-	public String getAliasName() {
+    public String getAliasName() {
         return this.aliasName;
     }
 
-	public void setAliasName(String aliasName) {
+    public void setAliasName(String aliasName) {
         this.aliasName = aliasName;
     }
 
-	public boolean isPreferred() {
+    public boolean isPreferred() {
         return this.preferred;
     }
 
-	public void setPreferred(boolean preferred) {
+    public void setPreferred(boolean preferred) {
         this.preferred = preferred;
     }
 
-	public boolean isIgnored() {
+    public boolean isIgnored() {
         return this.ignored;
     }
 
-	public void setIgnored(boolean ignored) {
+    public void setIgnored(boolean ignored) {
         this.ignored = ignored;
     }
 
-	public boolean isDeleted() {
+    public boolean isDeleted() {
         return this.deleted;
     }
 
-	public void setDeleted(boolean deleted) {
+    public void setDeleted(boolean deleted) {
         this.deleted = deleted;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static LotAlias fromJsonToLotAlias(String json) {
+    public static LotAlias fromJsonToLotAlias(String json) {
         return new JSONDeserializer<LotAlias>()
-        .use(null, LotAlias.class).deserialize(json);
+                .use(null, LotAlias.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<LotAlias> collection) {
+    public static String toJsonArray(Collection<LotAlias> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<LotAlias> collection, String[] fields) {
+    public static String toJsonArray(Collection<LotAlias> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<LotAlias> fromJsonArrayToLotAliases(String json) {
+    public static Collection<LotAlias> fromJsonArrayToLotAliases(String json) {
         return new JSONDeserializer<List<LotAlias>>()
-        .use("values", LotAlias.class).deserialize(json);
+                .use("values", LotAlias.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lot", "lsType", "lsKind", "aliasName", "preferred", "ignored", "deleted");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lot", "lsType",
+            "lsKind", "aliasName", "preferred", "ignored", "deleted");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new LotAlias().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countLotAliases() {
+    public static long countLotAliases() {
         return entityManager().createQuery("SELECT COUNT(o) FROM LotAlias o", Long.class).getSingleResult();
     }
 
-	public static List<LotAlias> findAllLotAliases() {
+    public static List<LotAlias> findAllLotAliases() {
         return entityManager().createQuery("SELECT o FROM LotAlias o", LotAlias.class).getResultList();
     }
 
-	public static List<LotAlias> findAllLotAliases(String sortFieldName, String sortOrder) {
+    public static List<LotAlias> findAllLotAliases(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LotAlias o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -221,16 +224,19 @@ public static List<LotAlias> findAllLotAliases(String sortFieldName, String sort
         return entityManager().createQuery(jpaQuery, LotAlias.class).getResultList();
     }
 
-	public static LotAlias findLotAlias(Long id) {
-        if (id == null) return null;
+    public static LotAlias findLotAlias(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(LotAlias.class, id);
     }
 
-	public static List<LotAlias> findLotAliasEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LotAlias o", LotAlias.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<LotAlias> findLotAliasEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LotAlias o", LotAlias.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<LotAlias> findLotAliasEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<LotAlias> findLotAliasEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM LotAlias o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -238,18 +244,21 @@ public static List<LotAlias> findLotAliasEntries(int firstResult, int maxResults
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, LotAlias.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, LotAlias.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -258,76 +267,102 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public LotAlias merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         LotAlias merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public static Long countFindLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName, String lsType, String lsKind) {
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static Long countFindLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName,
+            String lsType, String lsKind) {
+        if (aliasName == null || aliasName.length() == 0)
+            throw new IllegalArgumentException("The aliasName argument is required");
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = LotAlias.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LotAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM LotAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind",
+                Long.class);
         q.setParameter("aliasName", aliasName);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLotAliasesByLot(Lot lot) {
-        if (lot == null) throw new IllegalArgumentException("The lot argument is required");
+    public static Long countFindLotAliasesByLot(Lot lot) {
+        if (lot == null)
+            throw new IllegalArgumentException("The lot argument is required");
         EntityManager em = LotAlias.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LotAlias AS o WHERE o.lot = :lot", Long.class);
         q.setParameter("lot", lot);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLotAliasesByLotAndLsTypeEqualsAndLsKindEquals(Lot lot, String lsType, String lsKind) {
-        if (lot == null) throw new IllegalArgumentException("The lot argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static Long countFindLotAliasesByLotAndLsTypeEqualsAndLsKindEquals(Lot lot, String lsType, String lsKind) {
+        if (lot == null)
+            throw new IllegalArgumentException("The lot argument is required");
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = LotAlias.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LotAlias AS o WHERE o.lot = :lot AND o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM LotAlias AS o WHERE o.lot = :lot AND o.lsType = :lsType  AND o.lsKind = :lsKind",
+                Long.class);
         q.setParameter("lot", lot);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<LotAlias> findLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName, String lsType, String lsKind) {
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<LotAlias> findLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName,
+            String lsType, String lsKind) {
+        if (aliasName == null || aliasName.length() == 0)
+            throw new IllegalArgumentException("The aliasName argument is required");
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = LotAlias.entityManager();
-        TypedQuery<LotAlias> q = em.createQuery("SELECT o FROM LotAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind", LotAlias.class);
+        TypedQuery<LotAlias> q = em.createQuery(
+                "SELECT o FROM LotAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind",
+                LotAlias.class);
         q.setParameter("aliasName", aliasName);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         return q;
     }
 
-	public static TypedQuery<LotAlias> findLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName, String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<LotAlias> findLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName,
+            String lsType, String lsKind, String sortFieldName, String sortOrder) {
+        if (aliasName == null || aliasName.length() == 0)
+            throw new IllegalArgumentException("The aliasName argument is required");
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = LotAlias.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LotAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LotAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -341,16 +376,18 @@ public static TypedQuery<LotAlias> findLotAliasesByAliasNameEqualsAndLsTypeEqual
         return q;
     }
 
-	public static TypedQuery<LotAlias> findLotAliasesByLot(Lot lot) {
-        if (lot == null) throw new IllegalArgumentException("The lot argument is required");
+    public static TypedQuery<LotAlias> findLotAliasesByLot(Lot lot) {
+        if (lot == null)
+            throw new IllegalArgumentException("The lot argument is required");
         EntityManager em = LotAlias.entityManager();
         TypedQuery<LotAlias> q = em.createQuery("SELECT o FROM LotAlias AS o WHERE o.lot = :lot", LotAlias.class);
         q.setParameter("lot", lot);
         return q;
     }
 
-	public static TypedQuery<LotAlias> findLotAliasesByLot(Lot lot, String sortFieldName, String sortOrder) {
-        if (lot == null) throw new IllegalArgumentException("The lot argument is required");
+    public static TypedQuery<LotAlias> findLotAliasesByLot(Lot lot, String sortFieldName, String sortOrder) {
+        if (lot == null)
+            throw new IllegalArgumentException("The lot argument is required");
         EntityManager em = LotAlias.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LotAlias AS o WHERE o.lot = :lot");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -364,24 +401,35 @@ public static TypedQuery<LotAlias> findLotAliasesByLot(Lot lot, String sortField
         return q;
     }
 
-	public static TypedQuery<LotAlias> findLotAliasesByLotAndLsTypeEqualsAndLsKindEquals(Lot lot, String lsType, String lsKind) {
-        if (lot == null) throw new IllegalArgumentException("The lot argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<LotAlias> findLotAliasesByLotAndLsTypeEqualsAndLsKindEquals(Lot lot, String lsType,
+            String lsKind) {
+        if (lot == null)
+            throw new IllegalArgumentException("The lot argument is required");
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = LotAlias.entityManager();
-        TypedQuery<LotAlias> q = em.createQuery("SELECT o FROM LotAlias AS o WHERE o.lot = :lot AND o.lsType = :lsType  AND o.lsKind = :lsKind", LotAlias.class);
+        TypedQuery<LotAlias> q = em.createQuery(
+                "SELECT o FROM LotAlias AS o WHERE o.lot = :lot AND o.lsType = :lsType  AND o.lsKind = :lsKind",
+                LotAlias.class);
         q.setParameter("lot", lot);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         return q;
     }
 
-	public static TypedQuery<LotAlias> findLotAliasesByLotAndLsTypeEqualsAndLsKindEquals(Lot lot, String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (lot == null) throw new IllegalArgumentException("The lot argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<LotAlias> findLotAliasesByLotAndLsTypeEqualsAndLsKindEquals(Lot lot, String lsType,
+            String lsKind, String sortFieldName, String sortOrder) {
+        if (lot == null)
+            throw new IllegalArgumentException("The lot argument is required");
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = LotAlias.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LotAlias AS o WHERE o.lot = :lot AND o.lsType = :lsType  AND o.lsKind = :lsKind");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LotAlias AS o WHERE o.lot = :lot AND o.lsType = :lsType  AND o.lsKind = :lsKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAliasKind.java b/src/main/java/com/labsynch/labseer/domain/LotAliasKind.java
index d1a537e2c..fb76f1a67 100644
--- a/src/main/java/com/labsynch/labseer/domain/LotAliasKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/LotAliasKind.java
@@ -28,7 +28,7 @@
 @Configurable
 
 public class LotAliasKind {
-	
+
     @NotNull
     @ManyToOne
     @JoinColumn(name = "ls_type")
@@ -36,58 +36,58 @@ public class LotAliasKind {
 
     @Size(max = 255)
     private String kindName;
- 
-    
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new LotAliasKind().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countLotAliasKinds() {
+    public static long countLotAliasKinds() {
         return entityManager().createQuery("SELECT COUNT(o) FROM LotAliasKind o", Long.class).getSingleResult();
     }
 
-	public static List<LotAliasKind> findAllLotAliasKinds() {
+    public static List<LotAliasKind> findAllLotAliasKinds() {
         return entityManager().createQuery("SELECT o FROM LotAliasKind o", LotAliasKind.class).getResultList();
     }
 
-	public static List<LotAliasKind> findAllLotAliasKinds(String sortFieldName, String sortOrder) {
+    public static List<LotAliasKind> findAllLotAliasKinds(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LotAliasKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -98,16 +98,19 @@ public static List<LotAliasKind> findAllLotAliasKinds(String sortFieldName, Stri
         return entityManager().createQuery(jpaQuery, LotAliasKind.class).getResultList();
     }
 
-	public static LotAliasKind findLotAliasKind(Long id) {
-        if (id == null) return null;
+    public static LotAliasKind findLotAliasKind(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(LotAliasKind.class, id);
     }
 
-	public static List<LotAliasKind> findLotAliasKindEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LotAliasKind o", LotAliasKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<LotAliasKind> findLotAliasKindEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LotAliasKind o", LotAliasKind.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<LotAliasKind> findLotAliasKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<LotAliasKind> findLotAliasKindEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM LotAliasKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -115,18 +118,21 @@ public static List<LotAliasKind> findLotAliasKindEntries(int firstResult, int ma
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, LotAliasKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, LotAliasKind.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -135,69 +141,72 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public LotAliasKind merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         LotAliasKind merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public LotAliasType getLsType() {
+    public LotAliasType getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(LotAliasType lsType) {
+    public void setLsType(LotAliasType lsType) {
         this.lsType = lsType;
     }
 
-	public String getKindName() {
+    public String getKindName() {
         return this.kindName;
     }
 
-	public void setKindName(String kindName) {
+    public void setKindName(String kindName) {
         this.kindName = kindName;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static LotAliasKind fromJsonToLotAliasKind(String json) {
+    public static LotAliasKind fromJsonToLotAliasKind(String json) {
         return new JSONDeserializer<LotAliasKind>()
-        .use(null, LotAliasKind.class).deserialize(json);
+                .use(null, LotAliasKind.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<LotAliasKind> collection) {
+    public static String toJsonArray(Collection<LotAliasKind> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<LotAliasKind> collection, String[] fields) {
+    public static String toJsonArray(Collection<LotAliasKind> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<LotAliasKind> fromJsonArrayToLotAliasKinds(String json) {
+    public static Collection<LotAliasKind> fromJsonArrayToLotAliasKinds(String json) {
         return new JSONDeserializer<List<LotAliasKind>>()
-        .use("values", LotAliasKind.class).deserialize(json);
+                .use("values", LotAliasKind.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LotAliasType.java b/src/main/java/com/labsynch/labseer/domain/LotAliasType.java
index b7c5f398e..6db5b965a 100644
--- a/src/main/java/com/labsynch/labseer/domain/LotAliasType.java
+++ b/src/main/java/com/labsynch/labseer/domain/LotAliasType.java
@@ -28,58 +28,59 @@ public class LotAliasType {
 
     @Size(max = 255)
     private String typeName;
-        
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static LotAliasType fromJsonToLotAliasType(String json) {
+    public static LotAliasType fromJsonToLotAliasType(String json) {
         return new JSONDeserializer<LotAliasType>()
-        .use(null, LotAliasType.class).deserialize(json);
+                .use(null, LotAliasType.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<LotAliasType> collection) {
+    public static String toJsonArray(Collection<LotAliasType> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<LotAliasType> collection, String[] fields) {
+    public static String toJsonArray(Collection<LotAliasType> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<LotAliasType> fromJsonArrayToLotAliasTypes(String json) {
+    public static Collection<LotAliasType> fromJsonArrayToLotAliasTypes(String json) {
         return new JSONDeserializer<List<LotAliasType>>()
-        .use("values", LotAliasType.class).deserialize(json);
+                .use("values", LotAliasType.class).deserialize(json);
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new LotAliasType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countLotAliasTypes() {
+    public static long countLotAliasTypes() {
         return entityManager().createQuery("SELECT COUNT(o) FROM LotAliasType o", Long.class).getSingleResult();
     }
 
-	public static List<LotAliasType> findAllLotAliasTypes() {
+    public static List<LotAliasType> findAllLotAliasTypes() {
         return entityManager().createQuery("SELECT o FROM LotAliasType o", LotAliasType.class).getResultList();
     }
 
-	public static List<LotAliasType> findAllLotAliasTypes(String sortFieldName, String sortOrder) {
+    public static List<LotAliasType> findAllLotAliasTypes(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LotAliasType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -90,16 +91,19 @@ public static List<LotAliasType> findAllLotAliasTypes(String sortFieldName, Stri
         return entityManager().createQuery(jpaQuery, LotAliasType.class).getResultList();
     }
 
-	public static LotAliasType findLotAliasType(Long id) {
-        if (id == null) return null;
+    public static LotAliasType findLotAliasType(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(LotAliasType.class, id);
     }
 
-	public static List<LotAliasType> findLotAliasTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LotAliasType o", LotAliasType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<LotAliasType> findLotAliasTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LotAliasType o", LotAliasType.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<LotAliasType> findLotAliasTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<LotAliasType> findLotAliasTypeEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM LotAliasType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -107,18 +111,21 @@ public static List<LotAliasType> findLotAliasTypeEntries(int firstResult, int ma
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, LotAliasType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, LotAliasType.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -127,60 +134,63 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public LotAliasType merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         LotAliasType merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String getTypeName() {
+    public String getTypeName() {
         return this.typeName;
     }
 
-	public void setTypeName(String typeName) {
+    public void setTypeName(String typeName) {
         this.typeName = typeName;
     }
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LsInteraction.java b/src/main/java/com/labsynch/labseer/domain/LsInteraction.java
index 5f7ac7857..11a3a6c62 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsInteraction.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsInteraction.java
@@ -28,17 +28,18 @@ public class LsInteraction extends AbstractThing {
     @Column(name = "second_thing_id")
     private Long secondThing;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("firstThing", "secondThing");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("firstThing",
+            "secondThing");
 
-	public static long countLsInteractions() {
+    public static long countLsInteractions() {
         return entityManager().createQuery("SELECT COUNT(o) FROM LsInteraction o", Long.class).getSingleResult();
     }
 
-	public static List<LsInteraction> findAllLsInteractions() {
+    public static List<LsInteraction> findAllLsInteractions() {
         return entityManager().createQuery("SELECT o FROM LsInteraction o", LsInteraction.class).getResultList();
     }
 
-	public static List<LsInteraction> findAllLsInteractions(String sortFieldName, String sortOrder) {
+    public static List<LsInteraction> findAllLsInteractions(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LsInteraction o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -49,16 +50,19 @@ public static List<LsInteraction> findAllLsInteractions(String sortFieldName, St
         return entityManager().createQuery(jpaQuery, LsInteraction.class).getResultList();
     }
 
-	public static LsInteraction findLsInteraction(Long id) {
-        if (id == null) return null;
+    public static LsInteraction findLsInteraction(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(LsInteraction.class, id);
     }
 
-	public static List<LsInteraction> findLsInteractionEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsInteraction o", LsInteraction.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<LsInteraction> findLsInteractionEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsInteraction o", LsInteraction.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<LsInteraction> findLsInteractionEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<LsInteraction> findLsInteractionEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM LsInteraction o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -66,64 +70,66 @@ public static List<LsInteraction> findLsInteractionEntries(int firstResult, int
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, LsInteraction.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, LsInteraction.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public LsInteraction merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         LsInteraction merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static LsInteraction fromJsonToLsInteraction(String json) {
+    public static LsInteraction fromJsonToLsInteraction(String json) {
         return new JSONDeserializer<LsInteraction>()
-        .use(null, LsInteraction.class).deserialize(json);
+                .use(null, LsInteraction.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<LsInteraction> collection) {
+    public static String toJsonArray(Collection<LsInteraction> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<LsInteraction> collection, String[] fields) {
+    public static String toJsonArray(Collection<LsInteraction> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<LsInteraction> fromJsonArrayToLsInteractions(String json) {
+    public static Collection<LsInteraction> fromJsonArrayToLsInteractions(String json) {
         return new JSONDeserializer<List<LsInteraction>>()
-        .use("values", LsInteraction.class).deserialize(json);
+                .use("values", LsInteraction.class).deserialize(json);
     }
 
-	public Long getFirstThing() {
+    public Long getFirstThing() {
         return this.firstThing;
     }
 
-	public void setFirstThing(Long firstThing) {
+    public void setFirstThing(Long firstThing) {
         this.firstThing = firstThing;
     }
 
-	public Long getSecondThing() {
+    public Long getSecondThing() {
         return this.secondThing;
     }
 
-	public void setSecondThing(Long secondThing) {
+    public void setSecondThing(Long secondThing) {
         this.secondThing = secondThing;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LsRole.java b/src/main/java/com/labsynch/labseer/domain/LsRole.java
index cf183e7ed..6310c4c02 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsRole.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsRole.java
@@ -46,7 +46,7 @@ public class LsRole {
 
     @Size(max = 200)
     private String roleDescription;
-    
+
     @Size(max = 255)
     private String lsTypeAndKind;
 
@@ -64,7 +64,8 @@ public class LsRole {
     private Integer version;
 
     public String toString() {
-        return new StringBuilder().append(this.id).append(' ').append(this.lsType).append(' ').append(this.lsKind).append(' ').append(this.roleName).toString();
+        return new StringBuilder().append(this.id).append(' ').append(this.lsType).append(' ').append(this.lsKind)
+                .append(' ').append(this.roleName).toString();
     }
 
     public Long getId() {
@@ -82,25 +83,28 @@ public Integer getVersion() {
     public void setVersion(Integer version) {
         this.version = version;
     }
-    public static Collection<LsRole> getOrCreateRoles(Collection<LsRole> queryRoles){
-    	Collection<LsRole> resultRoles = new ArrayList<LsRole>();
-    	for (LsRole queryRole : queryRoles){
-    		LsRole resultRole = LsRole.getOrCreateRole(queryRole);
-    		resultRoles.add(resultRole);
-    	}
-    	return resultRoles;
+
+    public static Collection<LsRole> getOrCreateRoles(Collection<LsRole> queryRoles) {
+        Collection<LsRole> resultRoles = new ArrayList<LsRole>();
+        for (LsRole queryRole : queryRoles) {
+            LsRole resultRole = LsRole.getOrCreateRole(queryRole);
+            resultRoles.add(resultRole);
+        }
+        return resultRoles;
     }
+
     public static LsRole getOrCreateRole(LsRole queryRole) {
-    	String lsType = queryRole.getLsType();
-    	String lsKind = queryRole.getLsKind();
-    	String roleName = queryRole.getRoleName();
-        List<LsRole> lsRoles = LsRole.findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals(lsType, lsKind, roleName).getResultList();
+        String lsType = queryRole.getLsType();
+        String lsKind = queryRole.getLsKind();
+        String roleName = queryRole.getRoleName();
+        List<LsRole> lsRoles = LsRole
+                .findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals(lsType, lsKind, roleName).getResultList();
         if (lsRoles.size() == 0) {
             LsRole newRole = new LsRole();
             newRole.setLsType(lsType);
             newRole.setLsKind(lsKind);
             newRole.setRoleName(roleName);
-            newRole.setRoleDescription(roleName+" autocreated by ACAS");
+            newRole.setRoleDescription(roleName + " autocreated by ACAS");
             newRole.persist();
             return newRole;
         } else {
@@ -122,54 +126,59 @@ public static com.labsynch.labseer.domain.LsRole getOrCreateRole(String roleName
     }
 
     public static TypedQuery<com.labsynch.labseer.domain.LsRole> findLsRolesByRoleNameEquals(String roleName) {
-        if (roleName == null || roleName.length() == 0) throw new IllegalArgumentException("The roleName argument is required");
+        if (roleName == null || roleName.length() == 0)
+            throw new IllegalArgumentException("The roleName argument is required");
         EntityManager em = LsRole.entityManager();
         TypedQuery<LsRole> q = em.createQuery("SELECT o FROM LsRole AS o WHERE o.roleName = :roleName", LsRole.class);
         q.setParameter("roleName", roleName);
         return q;
     }
-    
+
     @Transactional
-	public void persist() {
-		if (this.entityManager == null) this.entityManager = entityManager();
-		this.setLsTypeAndKind(new StringBuilder().append(this.lsType).append("_").append(this.lsKind).toString());
-		this.entityManager.persist(this);
-	}
-
-	public static Collection<CodeTableDTO> toCodeTables(List<LsRole> lsRoles) {
-		Collection<CodeTableDTO> codeTables = new ArrayList<CodeTableDTO>();
-		for (LsRole lsRole: lsRoles) {
-			CodeTableDTO codeTable = new CodeTableDTO();
-			codeTable.setId(lsRole.getId());
-			String code = lsRole.getLsType()+"_"+lsRole.getLsKind()+"_"+lsRole.getRoleName();
-			codeTable.setCode(code);
-			String name = lsRole.getLsType()+" : "+lsRole.getLsKind()+" : "+lsRole.getRoleName();
-			codeTable.setName(name);
-			codeTables.add(codeTable);
-		}
-		return codeTables;
-	}
-
-	@PersistenceContext
+    public void persist() {
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
+        this.setLsTypeAndKind(new StringBuilder().append(this.lsType).append("_").append(this.lsKind).toString());
+        this.entityManager.persist(this);
+    }
+
+    public static Collection<CodeTableDTO> toCodeTables(List<LsRole> lsRoles) {
+        Collection<CodeTableDTO> codeTables = new ArrayList<CodeTableDTO>();
+        for (LsRole lsRole : lsRoles) {
+            CodeTableDTO codeTable = new CodeTableDTO();
+            codeTable.setId(lsRole.getId());
+            String code = lsRole.getLsType() + "_" + lsRole.getLsKind() + "_" + lsRole.getRoleName();
+            codeTable.setCode(code);
+            String name = lsRole.getLsType() + " : " + lsRole.getLsKind() + " : " + lsRole.getRoleName();
+            codeTable.setName(name);
+            codeTables.add(codeTable);
+        }
+        return codeTables;
+    }
+
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "lsKind", "roleName", "roleDescription", "lsTypeAndKind", "authorRoles", "id", "version");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "lsKind",
+            "roleName", "roleDescription", "lsTypeAndKind", "authorRoles", "id", "version");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new LsRole().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countLsRoles() {
+    public static long countLsRoles() {
         return entityManager().createQuery("SELECT COUNT(o) FROM LsRole o", Long.class).getSingleResult();
     }
 
-	public static List<LsRole> findAllLsRoles() {
+    public static List<LsRole> findAllLsRoles() {
         return entityManager().createQuery("SELECT o FROM LsRole o", LsRole.class).getResultList();
     }
 
-	public static List<LsRole> findAllLsRoles(String sortFieldName, String sortOrder) {
+    public static List<LsRole> findAllLsRoles(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LsRole o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -180,16 +189,19 @@ public static List<LsRole> findAllLsRoles(String sortFieldName, String sortOrder
         return entityManager().createQuery(jpaQuery, LsRole.class).getResultList();
     }
 
-	public static LsRole findLsRole(Long id) {
-        if (id == null) return null;
+    public static LsRole findLsRole(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(LsRole.class, id);
     }
 
-	public static List<LsRole> findLsRoleEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsRole o", LsRole.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<LsRole> findLsRoleEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsRole o", LsRole.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<LsRole> findLsRoleEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<LsRole> findLsRoleEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM LsRole o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -197,12 +209,14 @@ public static List<LsRole> findLsRoleEntries(int firstResult, int maxResults, St
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, LsRole.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, LsRole.class).setFirstResult(firstResult).setMaxResults(maxResults)
+                .getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -211,170 +225,190 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public LsRole merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         LsRole merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static LsRole fromJsonToLsRole(String json) {
+    public static LsRole fromJsonToLsRole(String json) {
         return new JSONDeserializer<LsRole>()
-        .use(null, LsRole.class).deserialize(json);
+                .use(null, LsRole.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<LsRole> collection) {
+    public static String toJsonArray(Collection<LsRole> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<LsRole> collection, String[] fields) {
+    public static String toJsonArray(Collection<LsRole> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<LsRole> fromJsonArrayToLsRoles(String json) {
+    public static Collection<LsRole> fromJsonArrayToLsRoles(String json) {
         return new JSONDeserializer<List<LsRole>>()
-        .use("values", LsRole.class).deserialize(json);
+                .use("values", LsRole.class).deserialize(json);
     }
 
-	public String getLsType() {
+    public String getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(String lsType) {
+    public void setLsType(String lsType) {
         this.lsType = lsType;
     }
 
-	public String getLsKind() {
+    public String getLsKind() {
         return this.lsKind;
     }
 
-	public void setLsKind(String lsKind) {
+    public void setLsKind(String lsKind) {
         this.lsKind = lsKind;
     }
 
-	public String getRoleName() {
+    public String getRoleName() {
         return this.roleName;
     }
 
-	public void setRoleName(String roleName) {
+    public void setRoleName(String roleName) {
         this.roleName = roleName;
     }
 
-	public String getRoleDescription() {
+    public String getRoleDescription() {
         return this.roleDescription;
     }
 
-	public void setRoleDescription(String roleDescription) {
+    public void setRoleDescription(String roleDescription) {
         this.roleDescription = roleDescription;
     }
 
-	public String getLsTypeAndKind() {
+    public String getLsTypeAndKind() {
         return this.lsTypeAndKind;
     }
 
-	public void setLsTypeAndKind(String lsTypeAndKind) {
+    public void setLsTypeAndKind(String lsTypeAndKind) {
         this.lsTypeAndKind = lsTypeAndKind;
     }
 
-	public Set<AuthorRole> getAuthorRoles() {
+    public Set<AuthorRole> getAuthorRoles() {
         return this.authorRoles;
     }
 
-	public void setAuthorRoles(Set<AuthorRole> authorRoles) {
+    public void setAuthorRoles(Set<AuthorRole> authorRoles) {
         this.authorRoles = authorRoles;
     }
 
-	public static Long countFindLsRolesByLsKindEquals(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static Long countFindLsRolesByLsKindEquals(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = LsRole.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsRole AS o WHERE o.lsKind = :lsKind", Long.class);
         q.setParameter("lsKind", lsKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsRolesByLsTypeEquals(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+    public static Long countFindLsRolesByLsTypeEquals(String lsType) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = LsRole.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsRole AS o WHERE o.lsType = :lsType", Long.class);
         q.setParameter("lsType", lsType);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsRolesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static Long countFindLsRolesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = LsRole.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsRole AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM LsRole AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals(String lsType, String lsKind, String roleName) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (roleName == null || roleName.length() == 0) throw new IllegalArgumentException("The roleName argument is required");
+    public static Long countFindLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals(String lsType, String lsKind,
+            String roleName) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (roleName == null || roleName.length() == 0)
+            throw new IllegalArgumentException("The roleName argument is required");
         EntityManager em = LsRole.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsRole AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.roleName = :roleName", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM LsRole AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.roleName = :roleName",
+                Long.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         q.setParameter("roleName", roleName);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsRolesByLsTypeEqualsAndRoleNameEquals(String lsType, String roleName) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (roleName == null || roleName.length() == 0) throw new IllegalArgumentException("The roleName argument is required");
+    public static Long countFindLsRolesByLsTypeEqualsAndRoleNameEquals(String lsType, String roleName) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (roleName == null || roleName.length() == 0)
+            throw new IllegalArgumentException("The roleName argument is required");
         EntityManager em = LsRole.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsRole AS o WHERE o.lsType = :lsType  AND o.roleName = :roleName", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM LsRole AS o WHERE o.lsType = :lsType  AND o.roleName = :roleName", Long.class);
         q.setParameter("lsType", lsType);
         q.setParameter("roleName", roleName);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsRolesByRoleNameEquals(String roleName) {
-        if (roleName == null || roleName.length() == 0) throw new IllegalArgumentException("The roleName argument is required");
+    public static Long countFindLsRolesByRoleNameEquals(String roleName) {
+        if (roleName == null || roleName.length() == 0)
+            throw new IllegalArgumentException("The roleName argument is required");
         EntityManager em = LsRole.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsRole AS o WHERE o.roleName = :roleName", Long.class);
         q.setParameter("roleName", roleName);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<LsRole> findLsRolesByLsKindEquals(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<LsRole> findLsRolesByLsKindEquals(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = LsRole.entityManager();
         TypedQuery<LsRole> q = em.createQuery("SELECT o FROM LsRole AS o WHERE o.lsKind = :lsKind", LsRole.class);
         q.setParameter("lsKind", lsKind);
         return q;
     }
 
-	public static TypedQuery<LsRole> findLsRolesByLsKindEquals(String lsKind, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<LsRole> findLsRolesByLsKindEquals(String lsKind, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = LsRole.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsRole AS o WHERE o.lsKind = :lsKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -388,16 +422,18 @@ public static TypedQuery<LsRole> findLsRolesByLsKindEquals(String lsKind, String
         return q;
     }
 
-	public static TypedQuery<LsRole> findLsRolesByLsTypeEquals(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<LsRole> findLsRolesByLsTypeEquals(String lsType) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = LsRole.entityManager();
         TypedQuery<LsRole> q = em.createQuery("SELECT o FROM LsRole AS o WHERE o.lsType = :lsType", LsRole.class);
         q.setParameter("lsType", lsType);
         return q;
     }
 
-	public static TypedQuery<LsRole> findLsRolesByLsTypeEquals(String lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<LsRole> findLsRolesByLsTypeEquals(String lsType, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = LsRole.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsRole AS o WHERE o.lsType = :lsType");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -411,21 +447,28 @@ public static TypedQuery<LsRole> findLsRolesByLsTypeEquals(String lsType, String
         return q;
     }
 
-	public static TypedQuery<LsRole> findLsRolesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<LsRole> findLsRolesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = LsRole.entityManager();
-        TypedQuery<LsRole> q = em.createQuery("SELECT o FROM LsRole AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", LsRole.class);
+        TypedQuery<LsRole> q = em.createQuery(
+                "SELECT o FROM LsRole AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", LsRole.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         return q;
     }
 
-	public static TypedQuery<LsRole> findLsRolesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<LsRole> findLsRolesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind,
+            String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = LsRole.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsRole AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LsRole AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -438,24 +481,35 @@ public static TypedQuery<LsRole> findLsRolesByLsTypeEqualsAndLsKindEquals(String
         return q;
     }
 
-	public static TypedQuery<LsRole> findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals(String lsType, String lsKind, String roleName) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (roleName == null || roleName.length() == 0) throw new IllegalArgumentException("The roleName argument is required");
+    public static TypedQuery<LsRole> findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals(String lsType,
+            String lsKind, String roleName) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (roleName == null || roleName.length() == 0)
+            throw new IllegalArgumentException("The roleName argument is required");
         EntityManager em = LsRole.entityManager();
-        TypedQuery<LsRole> q = em.createQuery("SELECT o FROM LsRole AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.roleName = :roleName", LsRole.class);
+        TypedQuery<LsRole> q = em.createQuery(
+                "SELECT o FROM LsRole AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.roleName = :roleName",
+                LsRole.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         q.setParameter("roleName", roleName);
         return q;
     }
 
-	public static TypedQuery<LsRole> findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals(String lsType, String lsKind, String roleName, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (roleName == null || roleName.length() == 0) throw new IllegalArgumentException("The roleName argument is required");
+    public static TypedQuery<LsRole> findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals(String lsType,
+            String lsKind, String roleName, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (roleName == null || roleName.length() == 0)
+            throw new IllegalArgumentException("The roleName argument is required");
         EntityManager em = LsRole.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsRole AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.roleName = :roleName");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LsRole AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.roleName = :roleName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -469,21 +523,28 @@ public static TypedQuery<LsRole> findLsRolesByLsTypeEqualsAndLsKindEqualsAndRole
         return q;
     }
 
-	public static TypedQuery<LsRole> findLsRolesByLsTypeEqualsAndRoleNameEquals(String lsType, String roleName) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (roleName == null || roleName.length() == 0) throw new IllegalArgumentException("The roleName argument is required");
+    public static TypedQuery<LsRole> findLsRolesByLsTypeEqualsAndRoleNameEquals(String lsType, String roleName) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (roleName == null || roleName.length() == 0)
+            throw new IllegalArgumentException("The roleName argument is required");
         EntityManager em = LsRole.entityManager();
-        TypedQuery<LsRole> q = em.createQuery("SELECT o FROM LsRole AS o WHERE o.lsType = :lsType  AND o.roleName = :roleName", LsRole.class);
+        TypedQuery<LsRole> q = em.createQuery(
+                "SELECT o FROM LsRole AS o WHERE o.lsType = :lsType  AND o.roleName = :roleName", LsRole.class);
         q.setParameter("lsType", lsType);
         q.setParameter("roleName", roleName);
         return q;
     }
 
-	public static TypedQuery<LsRole> findLsRolesByLsTypeEqualsAndRoleNameEquals(String lsType, String roleName, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (roleName == null || roleName.length() == 0) throw new IllegalArgumentException("The roleName argument is required");
+    public static TypedQuery<LsRole> findLsRolesByLsTypeEqualsAndRoleNameEquals(String lsType, String roleName,
+            String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (roleName == null || roleName.length() == 0)
+            throw new IllegalArgumentException("The roleName argument is required");
         EntityManager em = LsRole.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsRole AS o WHERE o.lsType = :lsType  AND o.roleName = :roleName");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LsRole AS o WHERE o.lsType = :lsType  AND o.roleName = :roleName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -496,8 +557,10 @@ public static TypedQuery<LsRole> findLsRolesByLsTypeEqualsAndRoleNameEquals(Stri
         return q;
     }
 
-	public static TypedQuery<LsRole> findLsRolesByRoleNameEquals(String roleName, String sortFieldName, String sortOrder) {
-        if (roleName == null || roleName.length() == 0) throw new IllegalArgumentException("The roleName argument is required");
+    public static TypedQuery<LsRole> findLsRolesByRoleNameEquals(String roleName, String sortFieldName,
+            String sortOrder) {
+        if (roleName == null || roleName.length() == 0)
+            throw new IllegalArgumentException("The roleName argument is required");
         EntityManager em = LsRole.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsRole AS o WHERE o.roleName = :roleName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqAnlGrp.java b/src/main/java/com/labsynch/labseer/domain/LsSeqAnlGrp.java
index a106cb820..dc362faf2 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqAnlGrp.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqAnlGrp.java
@@ -18,55 +18,55 @@
 @Entity
 @Configurable
 public class LsSeqAnlGrp {
-	
-	
 
-	@Id
+    @Id
     @SequenceGenerator(name = "lsSeqAnlGrpGen", sequenceName = "LSSEQ_ANLGRP_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqAnlGrpGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new LsSeqAnlGrp().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countLsSeqAnlGrps() {
+    public static long countLsSeqAnlGrps() {
         return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqAnlGrp o", Long.class).getSingleResult();
     }
 
-	public static List<LsSeqAnlGrp> findAllLsSeqAnlGrps() {
+    public static List<LsSeqAnlGrp> findAllLsSeqAnlGrps() {
         return entityManager().createQuery("SELECT o FROM LsSeqAnlGrp o", LsSeqAnlGrp.class).getResultList();
     }
 
-	public static List<LsSeqAnlGrp> findAllLsSeqAnlGrps(String sortFieldName, String sortOrder) {
+    public static List<LsSeqAnlGrp> findAllLsSeqAnlGrps(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LsSeqAnlGrp o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -77,16 +77,19 @@ public static List<LsSeqAnlGrp> findAllLsSeqAnlGrps(String sortFieldName, String
         return entityManager().createQuery(jpaQuery, LsSeqAnlGrp.class).getResultList();
     }
 
-	public static LsSeqAnlGrp findLsSeqAnlGrp(Long id) {
-        if (id == null) return null;
+    public static LsSeqAnlGrp findLsSeqAnlGrp(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(LsSeqAnlGrp.class, id);
     }
 
-	public static List<LsSeqAnlGrp> findLsSeqAnlGrpEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsSeqAnlGrp o", LsSeqAnlGrp.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<LsSeqAnlGrp> findLsSeqAnlGrpEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsSeqAnlGrp o", LsSeqAnlGrp.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<LsSeqAnlGrp> findLsSeqAnlGrpEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<LsSeqAnlGrp> findLsSeqAnlGrpEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM LsSeqAnlGrp o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -94,18 +97,21 @@ public static List<LsSeqAnlGrp> findLsSeqAnlGrpEntries(int firstResult, int maxR
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, LsSeqAnlGrp.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, LsSeqAnlGrp.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -114,21 +120,24 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public LsSeqAnlGrp merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         LsSeqAnlGrp merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqContainer.java b/src/main/java/com/labsynch/labseer/domain/LsSeqContainer.java
index decf26a36..841b0db37 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqContainer.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqContainer.java
@@ -19,55 +19,55 @@
 @Entity
 
 public class LsSeqContainer {
-	
-	
 
-	@Id
+    @Id
     @SequenceGenerator(name = "lsSeqContainerGen", sequenceName = "LSSEQ_CONTAINER_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqContainerGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new LsSeqContainer().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countLsSeqContainers() {
+    public static long countLsSeqContainers() {
         return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqContainer o", Long.class).getSingleResult();
     }
 
-	public static List<LsSeqContainer> findAllLsSeqContainers() {
+    public static List<LsSeqContainer> findAllLsSeqContainers() {
         return entityManager().createQuery("SELECT o FROM LsSeqContainer o", LsSeqContainer.class).getResultList();
     }
 
-	public static List<LsSeqContainer> findAllLsSeqContainers(String sortFieldName, String sortOrder) {
+    public static List<LsSeqContainer> findAllLsSeqContainers(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LsSeqContainer o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -78,16 +78,19 @@ public static List<LsSeqContainer> findAllLsSeqContainers(String sortFieldName,
         return entityManager().createQuery(jpaQuery, LsSeqContainer.class).getResultList();
     }
 
-	public static LsSeqContainer findLsSeqContainer(Long id) {
-        if (id == null) return null;
+    public static LsSeqContainer findLsSeqContainer(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(LsSeqContainer.class, id);
     }
 
-	public static List<LsSeqContainer> findLsSeqContainerEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsSeqContainer o", LsSeqContainer.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<LsSeqContainer> findLsSeqContainerEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsSeqContainer o", LsSeqContainer.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<LsSeqContainer> findLsSeqContainerEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<LsSeqContainer> findLsSeqContainerEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM LsSeqContainer o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -95,18 +98,21 @@ public static List<LsSeqContainer> findLsSeqContainerEntries(int firstResult, in
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, LsSeqContainer.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, LsSeqContainer.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -115,21 +121,24 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public LsSeqContainer merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         LsSeqContainer merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqExpt.java b/src/main/java/com/labsynch/labseer/domain/LsSeqExpt.java
index 2a93cace3..7149aa3f0 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqExpt.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqExpt.java
@@ -19,55 +19,55 @@
 @Entity
 
 public class LsSeqExpt {
-	
-	
 
-	@Id
+    @Id
     @SequenceGenerator(name = "lsSeqExptGen", sequenceName = "LSSEQ_EXPT_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqExptGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new LsSeqExpt().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countLsSeqExpts() {
+    public static long countLsSeqExpts() {
         return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqExpt o", Long.class).getSingleResult();
     }
 
-	public static List<LsSeqExpt> findAllLsSeqExpts() {
+    public static List<LsSeqExpt> findAllLsSeqExpts() {
         return entityManager().createQuery("SELECT o FROM LsSeqExpt o", LsSeqExpt.class).getResultList();
     }
 
-	public static List<LsSeqExpt> findAllLsSeqExpts(String sortFieldName, String sortOrder) {
+    public static List<LsSeqExpt> findAllLsSeqExpts(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LsSeqExpt o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -78,16 +78,19 @@ public static List<LsSeqExpt> findAllLsSeqExpts(String sortFieldName, String sor
         return entityManager().createQuery(jpaQuery, LsSeqExpt.class).getResultList();
     }
 
-	public static LsSeqExpt findLsSeqExpt(Long id) {
-        if (id == null) return null;
+    public static LsSeqExpt findLsSeqExpt(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(LsSeqExpt.class, id);
     }
 
-	public static List<LsSeqExpt> findLsSeqExptEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsSeqExpt o", LsSeqExpt.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<LsSeqExpt> findLsSeqExptEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsSeqExpt o", LsSeqExpt.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<LsSeqExpt> findLsSeqExptEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<LsSeqExpt> findLsSeqExptEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM LsSeqExpt o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -95,18 +98,21 @@ public static List<LsSeqExpt> findLsSeqExptEntries(int firstResult, int maxResul
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, LsSeqExpt.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, LsSeqExpt.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -115,21 +121,24 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public LsSeqExpt merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         LsSeqExpt merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxCntrCntr.java b/src/main/java/com/labsynch/labseer/domain/LsSeqItxCntrCntr.java
index 349a8746c..98f430eab 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxCntrCntr.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqItxCntrCntr.java
@@ -15,34 +15,33 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-
 @Entity
 @Configurable
 
 public class LsSeqItxCntrCntr {
-	
-	
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new LsSeqItxCntrCntr().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countLsSeqItxCntrCntrs() {
+    public static long countLsSeqItxCntrCntrs() {
         return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqItxCntrCntr o", Long.class).getSingleResult();
     }
 
-	public static List<LsSeqItxCntrCntr> findAllLsSeqItxCntrCntrs() {
+    public static List<LsSeqItxCntrCntr> findAllLsSeqItxCntrCntrs() {
         return entityManager().createQuery("SELECT o FROM LsSeqItxCntrCntr o", LsSeqItxCntrCntr.class).getResultList();
     }
 
-	public static List<LsSeqItxCntrCntr> findAllLsSeqItxCntrCntrs(String sortFieldName, String sortOrder) {
+    public static List<LsSeqItxCntrCntr> findAllLsSeqItxCntrCntrs(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LsSeqItxCntrCntr o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -53,16 +52,19 @@ public static List<LsSeqItxCntrCntr> findAllLsSeqItxCntrCntrs(String sortFieldNa
         return entityManager().createQuery(jpaQuery, LsSeqItxCntrCntr.class).getResultList();
     }
 
-	public static LsSeqItxCntrCntr findLsSeqItxCntrCntr(Long id) {
-        if (id == null) return null;
+    public static LsSeqItxCntrCntr findLsSeqItxCntrCntr(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(LsSeqItxCntrCntr.class, id);
     }
 
-	public static List<LsSeqItxCntrCntr> findLsSeqItxCntrCntrEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsSeqItxCntrCntr o", LsSeqItxCntrCntr.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<LsSeqItxCntrCntr> findLsSeqItxCntrCntrEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsSeqItxCntrCntr o", LsSeqItxCntrCntr.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<LsSeqItxCntrCntr> findLsSeqItxCntrCntrEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<LsSeqItxCntrCntr> findLsSeqItxCntrCntrEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LsSeqItxCntrCntr o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -70,18 +72,21 @@ public static List<LsSeqItxCntrCntr> findLsSeqItxCntrCntrEntries(int firstResult
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, LsSeqItxCntrCntr.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, LsSeqItxCntrCntr.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -90,49 +95,52 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public LsSeqItxCntrCntr merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         LsSeqItxCntrCntr merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	@Id
+    @Id
     @SequenceGenerator(name = "lsSeqItxCntrCntrGen", sequenceName = "LSSEQ_ITXCNTRCNTR_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqItxCntrCntrGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxExperimentExperiment.java b/src/main/java/com/labsynch/labseer/domain/LsSeqItxExperimentExperiment.java
index df44f4a1f..d04cb6a5b 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxExperimentExperiment.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqItxExperimentExperiment.java
@@ -18,31 +18,35 @@
 
 @Configurable
 @Entity
-@Table(name="LS_SEQ_ITX_EXPT_EXPT")
+@Table(name = "LS_SEQ_ITX_EXPT_EXPT")
 public class LsSeqItxExperimentExperiment {
-	
-	
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new LsSeqItxExperimentExperiment().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countLsSeqItxExperimentExperiments() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqItxExperimentExperiment o", Long.class).getSingleResult();
+    public static long countLsSeqItxExperimentExperiments() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqItxExperimentExperiment o", Long.class)
+                .getSingleResult();
     }
 
-	public static List<LsSeqItxExperimentExperiment> findAllLsSeqItxExperimentExperiments() {
-        return entityManager().createQuery("SELECT o FROM LsSeqItxExperimentExperiment o", LsSeqItxExperimentExperiment.class).getResultList();
+    public static List<LsSeqItxExperimentExperiment> findAllLsSeqItxExperimentExperiments() {
+        return entityManager()
+                .createQuery("SELECT o FROM LsSeqItxExperimentExperiment o", LsSeqItxExperimentExperiment.class)
+                .getResultList();
     }
 
-	public static List<LsSeqItxExperimentExperiment> findAllLsSeqItxExperimentExperiments(String sortFieldName, String sortOrder) {
+    public static List<LsSeqItxExperimentExperiment> findAllLsSeqItxExperimentExperiments(String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM LsSeqItxExperimentExperiment o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -53,16 +57,21 @@ public static List<LsSeqItxExperimentExperiment> findAllLsSeqItxExperimentExperi
         return entityManager().createQuery(jpaQuery, LsSeqItxExperimentExperiment.class).getResultList();
     }
 
-	public static LsSeqItxExperimentExperiment findLsSeqItxExperimentExperiment(Long id) {
-        if (id == null) return null;
+    public static LsSeqItxExperimentExperiment findLsSeqItxExperimentExperiment(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(LsSeqItxExperimentExperiment.class, id);
     }
 
-	public static List<LsSeqItxExperimentExperiment> findLsSeqItxExperimentExperimentEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsSeqItxExperimentExperiment o", LsSeqItxExperimentExperiment.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<LsSeqItxExperimentExperiment> findLsSeqItxExperimentExperimentEntries(int firstResult,
+            int maxResults) {
+        return entityManager()
+                .createQuery("SELECT o FROM LsSeqItxExperimentExperiment o", LsSeqItxExperimentExperiment.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<LsSeqItxExperimentExperiment> findLsSeqItxExperimentExperimentEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<LsSeqItxExperimentExperiment> findLsSeqItxExperimentExperimentEntries(int firstResult,
+            int maxResults, String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LsSeqItxExperimentExperiment o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -70,69 +79,76 @@ public static List<LsSeqItxExperimentExperiment> findLsSeqItxExperimentExperimen
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, LsSeqItxExperimentExperiment.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, LsSeqItxExperimentExperiment.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
-            LsSeqItxExperimentExperiment attached = LsSeqItxExperimentExperiment.findLsSeqItxExperimentExperiment(this.id);
+            LsSeqItxExperimentExperiment attached = LsSeqItxExperimentExperiment
+                    .findLsSeqItxExperimentExperiment(this.id);
             this.entityManager.remove(attached);
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public LsSeqItxExperimentExperiment merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         LsSeqItxExperimentExperiment merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	@Id
+    @Id
     @SequenceGenerator(name = "lsSeqItxExperimentExperimentGen", sequenceName = "LSSEQ_ITXEXPTEXPT_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqItxExperimentExperimentGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxLsThingLsThing.java b/src/main/java/com/labsynch/labseer/domain/LsSeqItxLsThingLsThing.java
index d02cd9c06..2302304fb 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxLsThingLsThing.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqItxLsThingLsThing.java
@@ -18,54 +18,57 @@
 @Configurable
 @Entity
 public class LsSeqItxLsThingLsThing {
-	
 
-	@Id
+    @Id
     @SequenceGenerator(name = "lsSeqItxLsThingLsThingGen", sequenceName = "LSSEQ_ITXTHGTHG_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqItxLsThingLsThingGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new LsSeqItxLsThingLsThing().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countLsSeqItxLsThingLsThings() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqItxLsThingLsThing o", Long.class).getSingleResult();
+    public static long countLsSeqItxLsThingLsThings() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqItxLsThingLsThing o", Long.class)
+                .getSingleResult();
     }
 
-	public static List<LsSeqItxLsThingLsThing> findAllLsSeqItxLsThingLsThings() {
-        return entityManager().createQuery("SELECT o FROM LsSeqItxLsThingLsThing o", LsSeqItxLsThingLsThing.class).getResultList();
+    public static List<LsSeqItxLsThingLsThing> findAllLsSeqItxLsThingLsThings() {
+        return entityManager().createQuery("SELECT o FROM LsSeqItxLsThingLsThing o", LsSeqItxLsThingLsThing.class)
+                .getResultList();
     }
 
-	public static List<LsSeqItxLsThingLsThing> findAllLsSeqItxLsThingLsThings(String sortFieldName, String sortOrder) {
+    public static List<LsSeqItxLsThingLsThing> findAllLsSeqItxLsThingLsThings(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LsSeqItxLsThingLsThing o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -76,16 +79,19 @@ public static List<LsSeqItxLsThingLsThing> findAllLsSeqItxLsThingLsThings(String
         return entityManager().createQuery(jpaQuery, LsSeqItxLsThingLsThing.class).getResultList();
     }
 
-	public static LsSeqItxLsThingLsThing findLsSeqItxLsThingLsThing(Long id) {
-        if (id == null) return null;
+    public static LsSeqItxLsThingLsThing findLsSeqItxLsThingLsThing(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(LsSeqItxLsThingLsThing.class, id);
     }
 
-	public static List<LsSeqItxLsThingLsThing> findLsSeqItxLsThingLsThingEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsSeqItxLsThingLsThing o", LsSeqItxLsThingLsThing.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<LsSeqItxLsThingLsThing> findLsSeqItxLsThingLsThingEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsSeqItxLsThingLsThing o", LsSeqItxLsThingLsThing.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<LsSeqItxLsThingLsThing> findLsSeqItxLsThingLsThingEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<LsSeqItxLsThingLsThing> findLsSeqItxLsThingLsThingEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LsSeqItxLsThingLsThing o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -93,18 +99,21 @@ public static List<LsSeqItxLsThingLsThing> findLsSeqItxLsThingLsThingEntries(int
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, LsSeqItxLsThingLsThing.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, LsSeqItxLsThingLsThing.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -113,21 +122,24 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public LsSeqItxLsThingLsThing merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         LsSeqItxLsThingLsThing merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxProtocolProtocol.java b/src/main/java/com/labsynch/labseer/domain/LsSeqItxProtocolProtocol.java
index df200e4b1..d8aa0e289 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxProtocolProtocol.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqItxProtocolProtocol.java
@@ -15,60 +15,62 @@
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.transaction.annotation.Transactional;
 
-
 @Entity
 @Configurable
 
 public class LsSeqItxProtocolProtocol {
-	
-	
 
-	@Id
+    @Id
     @SequenceGenerator(name = "lsSeqItxProtocolProtocolGen", sequenceName = "LSSEQ_ITXPROTPROT_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqItxProtocolProtocolGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new LsSeqItxProtocolProtocol().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countLsSeqItxProtocolProtocols() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqItxProtocolProtocol o", Long.class).getSingleResult();
+    public static long countLsSeqItxProtocolProtocols() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqItxProtocolProtocol o", Long.class)
+                .getSingleResult();
     }
 
-	public static List<LsSeqItxProtocolProtocol> findAllLsSeqItxProtocolProtocols() {
-        return entityManager().createQuery("SELECT o FROM LsSeqItxProtocolProtocol o", LsSeqItxProtocolProtocol.class).getResultList();
+    public static List<LsSeqItxProtocolProtocol> findAllLsSeqItxProtocolProtocols() {
+        return entityManager().createQuery("SELECT o FROM LsSeqItxProtocolProtocol o", LsSeqItxProtocolProtocol.class)
+                .getResultList();
     }
 
-	public static List<LsSeqItxProtocolProtocol> findAllLsSeqItxProtocolProtocols(String sortFieldName, String sortOrder) {
+    public static List<LsSeqItxProtocolProtocol> findAllLsSeqItxProtocolProtocols(String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM LsSeqItxProtocolProtocol o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -79,16 +81,19 @@ public static List<LsSeqItxProtocolProtocol> findAllLsSeqItxProtocolProtocols(St
         return entityManager().createQuery(jpaQuery, LsSeqItxProtocolProtocol.class).getResultList();
     }
 
-	public static LsSeqItxProtocolProtocol findLsSeqItxProtocolProtocol(Long id) {
-        if (id == null) return null;
+    public static LsSeqItxProtocolProtocol findLsSeqItxProtocolProtocol(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(LsSeqItxProtocolProtocol.class, id);
     }
 
-	public static List<LsSeqItxProtocolProtocol> findLsSeqItxProtocolProtocolEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsSeqItxProtocolProtocol o", LsSeqItxProtocolProtocol.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<LsSeqItxProtocolProtocol> findLsSeqItxProtocolProtocolEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsSeqItxProtocolProtocol o", LsSeqItxProtocolProtocol.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<LsSeqItxProtocolProtocol> findLsSeqItxProtocolProtocolEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<LsSeqItxProtocolProtocol> findLsSeqItxProtocolProtocolEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LsSeqItxProtocolProtocol o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -96,18 +101,21 @@ public static List<LsSeqItxProtocolProtocol> findLsSeqItxProtocolProtocolEntries
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, LsSeqItxProtocolProtocol.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, LsSeqItxProtocolProtocol.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -116,21 +124,24 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public LsSeqItxProtocolProtocol merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         LsSeqItxProtocolProtocol merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqItxSubjCntr.java b/src/main/java/com/labsynch/labseer/domain/LsSeqItxSubjCntr.java
index 14f9f458f..46876b98f 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqItxSubjCntr.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqItxSubjCntr.java
@@ -19,55 +19,55 @@
 @Configurable
 
 public class LsSeqItxSubjCntr {
-	
-	
 
-	@Id
+    @Id
     @SequenceGenerator(name = "lsSeqItxSubjCntrGen", sequenceName = "LSSEQ_ITXSUBJCNTR_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqItxSubjCntrGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new LsSeqItxSubjCntr().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countLsSeqItxSubjCntrs() {
+    public static long countLsSeqItxSubjCntrs() {
         return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqItxSubjCntr o", Long.class).getSingleResult();
     }
 
-	public static List<LsSeqItxSubjCntr> findAllLsSeqItxSubjCntrs() {
+    public static List<LsSeqItxSubjCntr> findAllLsSeqItxSubjCntrs() {
         return entityManager().createQuery("SELECT o FROM LsSeqItxSubjCntr o", LsSeqItxSubjCntr.class).getResultList();
     }
 
-	public static List<LsSeqItxSubjCntr> findAllLsSeqItxSubjCntrs(String sortFieldName, String sortOrder) {
+    public static List<LsSeqItxSubjCntr> findAllLsSeqItxSubjCntrs(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LsSeqItxSubjCntr o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -78,16 +78,19 @@ public static List<LsSeqItxSubjCntr> findAllLsSeqItxSubjCntrs(String sortFieldNa
         return entityManager().createQuery(jpaQuery, LsSeqItxSubjCntr.class).getResultList();
     }
 
-	public static LsSeqItxSubjCntr findLsSeqItxSubjCntr(Long id) {
-        if (id == null) return null;
+    public static LsSeqItxSubjCntr findLsSeqItxSubjCntr(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(LsSeqItxSubjCntr.class, id);
     }
 
-	public static List<LsSeqItxSubjCntr> findLsSeqItxSubjCntrEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsSeqItxSubjCntr o", LsSeqItxSubjCntr.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<LsSeqItxSubjCntr> findLsSeqItxSubjCntrEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsSeqItxSubjCntr o", LsSeqItxSubjCntr.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<LsSeqItxSubjCntr> findLsSeqItxSubjCntrEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<LsSeqItxSubjCntr> findLsSeqItxSubjCntrEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LsSeqItxSubjCntr o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -95,18 +98,21 @@ public static List<LsSeqItxSubjCntr> findLsSeqItxSubjCntrEntries(int firstResult
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, LsSeqItxSubjCntr.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, LsSeqItxSubjCntr.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -115,21 +121,24 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public LsSeqItxSubjCntr merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         LsSeqItxSubjCntr merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqProtocol.java b/src/main/java/com/labsynch/labseer/domain/LsSeqProtocol.java
index 9670c1e3f..862d0a092 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqProtocol.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqProtocol.java
@@ -18,55 +18,55 @@
 @Entity
 @Configurable
 public class LsSeqProtocol {
-	
-	
 
-	@Id
+    @Id
     @SequenceGenerator(name = "lsSeqProtocolGen", sequenceName = "LSSEQ_PROT_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqProtocolGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new LsSeqProtocol().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countLsSeqProtocols() {
+    public static long countLsSeqProtocols() {
         return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqProtocol o", Long.class).getSingleResult();
     }
 
-	public static List<LsSeqProtocol> findAllLsSeqProtocols() {
+    public static List<LsSeqProtocol> findAllLsSeqProtocols() {
         return entityManager().createQuery("SELECT o FROM LsSeqProtocol o", LsSeqProtocol.class).getResultList();
     }
 
-	public static List<LsSeqProtocol> findAllLsSeqProtocols(String sortFieldName, String sortOrder) {
+    public static List<LsSeqProtocol> findAllLsSeqProtocols(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LsSeqProtocol o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -77,16 +77,19 @@ public static List<LsSeqProtocol> findAllLsSeqProtocols(String sortFieldName, St
         return entityManager().createQuery(jpaQuery, LsSeqProtocol.class).getResultList();
     }
 
-	public static LsSeqProtocol findLsSeqProtocol(Long id) {
-        if (id == null) return null;
+    public static LsSeqProtocol findLsSeqProtocol(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(LsSeqProtocol.class, id);
     }
 
-	public static List<LsSeqProtocol> findLsSeqProtocolEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsSeqProtocol o", LsSeqProtocol.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<LsSeqProtocol> findLsSeqProtocolEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsSeqProtocol o", LsSeqProtocol.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<LsSeqProtocol> findLsSeqProtocolEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<LsSeqProtocol> findLsSeqProtocolEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM LsSeqProtocol o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -94,18 +97,21 @@ public static List<LsSeqProtocol> findLsSeqProtocolEntries(int firstResult, int
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, LsSeqProtocol.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, LsSeqProtocol.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -114,21 +120,24 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public LsSeqProtocol merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         LsSeqProtocol merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqSubject.java b/src/main/java/com/labsynch/labseer/domain/LsSeqSubject.java
index 483171167..1e8ef4480 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqSubject.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqSubject.java
@@ -18,29 +18,29 @@
 @Configurable
 @Entity
 public class LsSeqSubject {
-	
-	
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new LsSeqSubject().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countLsSeqSubjects() {
+    public static long countLsSeqSubjects() {
         return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqSubject o", Long.class).getSingleResult();
     }
 
-	public static List<LsSeqSubject> findAllLsSeqSubjects() {
+    public static List<LsSeqSubject> findAllLsSeqSubjects() {
         return entityManager().createQuery("SELECT o FROM LsSeqSubject o", LsSeqSubject.class).getResultList();
     }
 
-	public static List<LsSeqSubject> findAllLsSeqSubjects(String sortFieldName, String sortOrder) {
+    public static List<LsSeqSubject> findAllLsSeqSubjects(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LsSeqSubject o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -51,16 +51,19 @@ public static List<LsSeqSubject> findAllLsSeqSubjects(String sortFieldName, Stri
         return entityManager().createQuery(jpaQuery, LsSeqSubject.class).getResultList();
     }
 
-	public static LsSeqSubject findLsSeqSubject(Long id) {
-        if (id == null) return null;
+    public static LsSeqSubject findLsSeqSubject(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(LsSeqSubject.class, id);
     }
 
-	public static List<LsSeqSubject> findLsSeqSubjectEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsSeqSubject o", LsSeqSubject.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<LsSeqSubject> findLsSeqSubjectEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsSeqSubject o", LsSeqSubject.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<LsSeqSubject> findLsSeqSubjectEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<LsSeqSubject> findLsSeqSubjectEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM LsSeqSubject o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -68,18 +71,21 @@ public static List<LsSeqSubject> findLsSeqSubjectEntries(int firstResult, int ma
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, LsSeqSubject.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, LsSeqSubject.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -88,49 +94,52 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public LsSeqSubject merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         LsSeqSubject merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	@Id
+    @Id
     @SequenceGenerator(name = "lsSeqSubjectGen", sequenceName = "LSSEQ_SUBJ_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqSubjectGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LsSeqTrtGrp.java b/src/main/java/com/labsynch/labseer/domain/LsSeqTrtGrp.java
index 913015b43..e27db49b6 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsSeqTrtGrp.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsSeqTrtGrp.java
@@ -18,29 +18,29 @@
 @Configurable
 @Entity
 public class LsSeqTrtGrp {
-	
-	
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new LsSeqTrtGrp().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countLsSeqTrtGrps() {
+    public static long countLsSeqTrtGrps() {
         return entityManager().createQuery("SELECT COUNT(o) FROM LsSeqTrtGrp o", Long.class).getSingleResult();
     }
 
-	public static List<LsSeqTrtGrp> findAllLsSeqTrtGrps() {
+    public static List<LsSeqTrtGrp> findAllLsSeqTrtGrps() {
         return entityManager().createQuery("SELECT o FROM LsSeqTrtGrp o", LsSeqTrtGrp.class).getResultList();
     }
 
-	public static List<LsSeqTrtGrp> findAllLsSeqTrtGrps(String sortFieldName, String sortOrder) {
+    public static List<LsSeqTrtGrp> findAllLsSeqTrtGrps(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LsSeqTrtGrp o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -51,16 +51,19 @@ public static List<LsSeqTrtGrp> findAllLsSeqTrtGrps(String sortFieldName, String
         return entityManager().createQuery(jpaQuery, LsSeqTrtGrp.class).getResultList();
     }
 
-	public static LsSeqTrtGrp findLsSeqTrtGrp(Long id) {
-        if (id == null) return null;
+    public static LsSeqTrtGrp findLsSeqTrtGrp(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(LsSeqTrtGrp.class, id);
     }
 
-	public static List<LsSeqTrtGrp> findLsSeqTrtGrpEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsSeqTrtGrp o", LsSeqTrtGrp.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<LsSeqTrtGrp> findLsSeqTrtGrpEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsSeqTrtGrp o", LsSeqTrtGrp.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<LsSeqTrtGrp> findLsSeqTrtGrpEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<LsSeqTrtGrp> findLsSeqTrtGrpEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM LsSeqTrtGrp o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -68,18 +71,21 @@ public static List<LsSeqTrtGrp> findLsSeqTrtGrpEntries(int firstResult, int maxR
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, LsSeqTrtGrp.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, LsSeqTrtGrp.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -88,49 +94,52 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public LsSeqTrtGrp merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         LsSeqTrtGrp merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	@Id
+    @Id
     @SequenceGenerator(name = "lsSeqTrtGrpGen", sequenceName = "LSSEQ_TRTGRP_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsSeqTrtGrpGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LsTag.java b/src/main/java/com/labsynch/labseer/domain/LsTag.java
index 966b673f2..0da53cbbc 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsTag.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsTag.java
@@ -36,7 +36,6 @@
 @Entity
 public class LsTag {
 
-	
     @Size(max = 255)
     private String tagText;
 
@@ -52,7 +51,7 @@ public class LsTag {
 
     @ManyToMany(cascade = CascadeType.ALL, mappedBy = "lsTags")
     private Set<LsThing> lsThings = new HashSet<LsThing>();
-    
+
     public LsTag(com.labsynch.labseer.domain.LsTag lsTag) {
         this.tagText = lsTag.getTagText();
         if (lsTag.getRecordedDate() == null) {
@@ -78,19 +77,22 @@ public static String toJsonArray(Collection<com.labsynch.labseer.domain.LsTag> c
     }
 
     public static Collection<com.labsynch.labseer.domain.LsTag> fromJsonArrayToLsTags(String json) {
-        return new JSONDeserializer<List<LsTag>>().use(null, ArrayList.class).use("values", LsTag.class).deserialize(json);
+        return new JSONDeserializer<List<LsTag>>().use(null, ArrayList.class).use("values", LsTag.class)
+                .deserialize(json);
     }
 
-	public static Long countFindLsTagsByTagTextEquals(String tagText) {
-        if (tagText == null || tagText.length() == 0) throw new IllegalArgumentException("The tagText argument is required");
+    public static Long countFindLsTagsByTagTextEquals(String tagText) {
+        if (tagText == null || tagText.length() == 0)
+            throw new IllegalArgumentException("The tagText argument is required");
         EntityManager em = LsTag.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsTag AS o WHERE o.tagText = :tagText", Long.class);
         q.setParameter("tagText", tagText);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsTagsByTagTextLike(String tagText) {
-        if (tagText == null || tagText.length() == 0) throw new IllegalArgumentException("The tagText argument is required");
+    public static Long countFindLsTagsByTagTextLike(String tagText) {
+        if (tagText == null || tagText.length() == 0)
+            throw new IllegalArgumentException("The tagText argument is required");
         tagText = tagText.replace('*', '%');
         if (tagText.charAt(0) != '%') {
             tagText = "%" + tagText;
@@ -99,21 +101,24 @@ public static Long countFindLsTagsByTagTextLike(String tagText) {
             tagText = tagText + "%";
         }
         EntityManager em = LsTag.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsTag AS o WHERE LOWER(o.tagText) LIKE LOWER(:tagText)", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsTag AS o WHERE LOWER(o.tagText) LIKE LOWER(:tagText)",
+                Long.class);
         q.setParameter("tagText", tagText);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<LsTag> findLsTagsByTagTextEquals(String tagText) {
-        if (tagText == null || tagText.length() == 0) throw new IllegalArgumentException("The tagText argument is required");
+    public static TypedQuery<LsTag> findLsTagsByTagTextEquals(String tagText) {
+        if (tagText == null || tagText.length() == 0)
+            throw new IllegalArgumentException("The tagText argument is required");
         EntityManager em = LsTag.entityManager();
         TypedQuery<LsTag> q = em.createQuery("SELECT o FROM LsTag AS o WHERE o.tagText = :tagText", LsTag.class);
         q.setParameter("tagText", tagText);
         return q;
     }
 
-	public static TypedQuery<LsTag> findLsTagsByTagTextEquals(String tagText, String sortFieldName, String sortOrder) {
-        if (tagText == null || tagText.length() == 0) throw new IllegalArgumentException("The tagText argument is required");
+    public static TypedQuery<LsTag> findLsTagsByTagTextEquals(String tagText, String sortFieldName, String sortOrder) {
+        if (tagText == null || tagText.length() == 0)
+            throw new IllegalArgumentException("The tagText argument is required");
         EntityManager em = LsTag.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsTag AS o WHERE o.tagText = :tagText");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -127,8 +132,9 @@ public static TypedQuery<LsTag> findLsTagsByTagTextEquals(String tagText, String
         return q;
     }
 
-	public static TypedQuery<LsTag> findLsTagsByTagTextLike(String tagText) {
-        if (tagText == null || tagText.length() == 0) throw new IllegalArgumentException("The tagText argument is required");
+    public static TypedQuery<LsTag> findLsTagsByTagTextLike(String tagText) {
+        if (tagText == null || tagText.length() == 0)
+            throw new IllegalArgumentException("The tagText argument is required");
         tagText = tagText.replace('*', '%');
         if (tagText.charAt(0) != '%') {
             tagText = "%" + tagText;
@@ -137,13 +143,15 @@ public static TypedQuery<LsTag> findLsTagsByTagTextLike(String tagText) {
             tagText = tagText + "%";
         }
         EntityManager em = LsTag.entityManager();
-        TypedQuery<LsTag> q = em.createQuery("SELECT o FROM LsTag AS o WHERE LOWER(o.tagText) LIKE LOWER(:tagText)", LsTag.class);
+        TypedQuery<LsTag> q = em.createQuery("SELECT o FROM LsTag AS o WHERE LOWER(o.tagText) LIKE LOWER(:tagText)",
+                LsTag.class);
         q.setParameter("tagText", tagText);
         return q;
     }
 
-	public static TypedQuery<LsTag> findLsTagsByTagTextLike(String tagText, String sortFieldName, String sortOrder) {
-        if (tagText == null || tagText.length() == 0) throw new IllegalArgumentException("The tagText argument is required");
+    public static TypedQuery<LsTag> findLsTagsByTagTextLike(String tagText, String sortFieldName, String sortOrder) {
+        if (tagText == null || tagText.length() == 0)
+            throw new IllegalArgumentException("The tagText argument is required");
         tagText = tagText.replace('*', '%');
         if (tagText.charAt(0) != '%') {
             tagText = "%" + tagText;
@@ -152,7 +160,8 @@ public static TypedQuery<LsTag> findLsTagsByTagTextLike(String tagText, String s
             tagText = tagText + "%";
         }
         EntityManager em = LsTag.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsTag AS o WHERE LOWER(o.tagText) LIKE LOWER(:tagText)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LsTag AS o WHERE LOWER(o.tagText) LIKE LOWER(:tagText)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -164,96 +173,100 @@ public static TypedQuery<LsTag> findLsTagsByTagTextLike(String tagText, String s
         return q;
     }
 
-	public String toString() {
-        return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).setExcludeFieldNames("experiments", "protocols", "recordedDate", "version").toString();
+    public String toString() {
+        return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+                .setExcludeFieldNames("experiments", "protocols", "recordedDate", "version").toString();
     }
 
-	public String getTagText() {
+    public String getTagText() {
         return this.tagText;
     }
 
-	public void setTagText(String tagText) {
+    public void setTagText(String tagText) {
         this.tagText = tagText;
     }
 
-	public Date getRecordedDate() {
+    public Date getRecordedDate() {
         return this.recordedDate;
     }
 
-	public void setRecordedDate(Date recordedDate) {
+    public void setRecordedDate(Date recordedDate) {
         this.recordedDate = recordedDate;
     }
 
-	public Set<Experiment> getExperiments() {
+    public Set<Experiment> getExperiments() {
         return this.experiments;
     }
 
-	public void setExperiments(Set<Experiment> experiments) {
+    public void setExperiments(Set<Experiment> experiments) {
         this.experiments = experiments;
     }
 
-	public Set<Protocol> getProtocols() {
+    public Set<Protocol> getProtocols() {
         return this.protocols;
     }
 
-	public void setProtocols(Set<Protocol> protocols) {
+    public void setProtocols(Set<Protocol> protocols) {
         this.protocols = protocols;
     }
 
-	public Set<LsThing> getLsThings() {
+    public Set<LsThing> getLsThings() {
         return this.lsThings;
     }
 
-	public void setLsThings(Set<LsThing> lsThings) {
+    public void setLsThings(Set<LsThing> lsThings) {
         this.lsThings = lsThings;
     }
 
-	@Id
+    @Id
     @SequenceGenerator(name = "lsTagGen", sequenceName = "LS_TAG_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsTagGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("tagText", "recordedDate", "experiments", "protocols", "lsThings");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("tagText", "recordedDate",
+            "experiments", "protocols", "lsThings");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new LsTag().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countLsTags() {
+    public static long countLsTags() {
         return entityManager().createQuery("SELECT COUNT(o) FROM LsTag o", Long.class).getSingleResult();
     }
 
-	public static List<LsTag> findAllLsTags() {
+    public static List<LsTag> findAllLsTags() {
         return entityManager().createQuery("SELECT o FROM LsTag o", LsTag.class).getResultList();
     }
 
-	public static List<LsTag> findAllLsTags(String sortFieldName, String sortOrder) {
+    public static List<LsTag> findAllLsTags(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LsTag o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -264,16 +277,19 @@ public static List<LsTag> findAllLsTags(String sortFieldName, String sortOrder)
         return entityManager().createQuery(jpaQuery, LsTag.class).getResultList();
     }
 
-	public static LsTag findLsTag(Long id) {
-        if (id == null) return null;
+    public static LsTag findLsTag(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(LsTag.class, id);
     }
 
-	public static List<LsTag> findLsTagEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsTag o", LsTag.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<LsTag> findLsTagEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsTag o", LsTag.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<LsTag> findLsTagEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<LsTag> findLsTagEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM LsTag o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -281,18 +297,21 @@ public static List<LsTag> findLsTagEntries(int firstResult, int maxResults, Stri
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, LsTag.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, LsTag.class).setFirstResult(firstResult).setMaxResults(maxResults)
+                .getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -301,21 +320,24 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public LsTag merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         LsTag merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThing.java b/src/main/java/com/labsynch/labseer/domain/LsThing.java
index bfe05c792..97a4fd12e 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsThing.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsThing.java
@@ -37,8 +37,8 @@
 @Configurable
 public class LsThing extends AbstractThing {
 
-	private static final Logger logger = LoggerFactory.getLogger(LsThing.class);
-	
+    private static final Logger logger = LoggerFactory.getLogger(LsThing.class);
+
     @OneToMany(cascade = CascadeType.REFRESH, mappedBy = "lsThing")
     private Set<LsThingState> lsStates = new HashSet<LsThingState>();
 
@@ -46,14 +46,14 @@ public class LsThing extends AbstractThing {
     private Set<LsThingLabel> lsLabels = new HashSet<LsThingLabel>();
 
     @ManyToMany(cascade = CascadeType.REFRESH, fetch = FetchType.LAZY)
-    @JoinTable(name = "LSTHING_TAG", 
-    joinColumns = { @JoinColumn(name="lsthing_id") }, inverseJoinColumns = { @JoinColumn(name="tag_id") })
+    @JoinTable(name = "LSTHING_TAG", joinColumns = { @JoinColumn(name = "lsthing_id") }, inverseJoinColumns = {
+            @JoinColumn(name = "tag_id") })
     private Set<LsTag> lsTags = new HashSet<LsTag>();
-    
-    @OneToMany(cascade={}, mappedBy = "secondLsThing", fetch = FetchType.LAZY)
+
+    @OneToMany(cascade = {}, mappedBy = "secondLsThing", fetch = FetchType.LAZY)
     private Set<ItxLsThingLsThing> firstLsThings = new HashSet<ItxLsThingLsThing>();
 
-    @OneToMany(cascade={}, mappedBy = "firstLsThing", fetch = FetchType.LAZY)
+    @OneToMany(cascade = {}, mappedBy = "firstLsThing", fetch = FetchType.LAZY)
     private Set<ItxLsThingLsThing> secondLsThings = new HashSet<ItxLsThingLsThing>();
 
     public LsThing(com.labsynch.labseer.domain.LsThing lsThing) {
@@ -82,13 +82,13 @@ public LsThing(com.labsynch.labseer.domain.LsThing lsThing) {
     }
 
     public LsThing() {
-    	
+
     }
-    
-	
+
     @Transactional
     public String toJson() {
-        return new JSONSerializer().exclude("*.class").include("lsTags", "lsLabels", "lsStates.lsValues").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().exclude("*.class").include("lsTags", "lsLabels", "lsStates.lsValues")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     public static com.labsynch.labseer.domain.LsThing fromJsonToProtocol(String json) {
@@ -97,629 +97,719 @@ public static com.labsynch.labseer.domain.LsThing fromJsonToProtocol(String json
 
     @Transactional
     public static String toJsonArray(Collection<com.labsynch.labseer.domain.LsThing> collection) {
-        return new JSONSerializer().exclude("*.class").include("lsTags", "lsLabels", "lsStates.lsValues").transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer().exclude("*.class").include("lsTags", "lsLabels", "lsStates.lsValues")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
     public static Collection<com.labsynch.labseer.domain.LsThing> fromJsonArrayToProtocols(String json) {
-        return new JSONDeserializer<List<LsThing>>().use(null, ArrayList.class).use("values", LsThing.class).deserialize(json);
+        return new JSONDeserializer<List<LsThing>>().use(null, ArrayList.class).use("values", LsThing.class)
+                .deserialize(json);
     }
 
     public static Collection<com.labsynch.labseer.domain.LsThing> fromJsonArrayToProtocols(Reader json) {
-        return new JSONDeserializer<List<LsThing>>().use(null, ArrayList.class).use("values", LsThing.class).deserialize(json);
+        return new JSONDeserializer<List<LsThing>>().use(null, ArrayList.class).use("values", LsThing.class)
+                .deserialize(json);
     }
-    
+
     @Transactional
     public String toJsonWithNestedStubs() {
-        return new JSONSerializer().
-        		exclude("*.class","lsStates.lsValues.lsState", "lsStates.lsThing", "lsLabels.lsThing").
-        		include("lsTags", "lsLabels", "lsStates.lsValues", "firstLsThings.firstLsThing.lsLabels","secondLsThings.secondLsThing.lsLabels").
-                transform(new ExcludeNulls(), void.class).
-        		serialize(this);
-     }
-
-     @Transactional
-     public String toJsonWithNestedStubsWithBlobValues() {
-         return new JSONSerializer().
-                 exclude("*.class","lsStates.lsValues.lsState", "lsStates.lsThing", "lsLabels.lsThing").
-                 include("lsTags", "lsLabels", "lsStates.lsValues", "firstLsThings.firstLsThing.lsLabels","secondLsThings.secondLsThing.lsLabels").
-                 transform(new ExcludeNulls(), void.class).
-                 transform(new ByteArrayTransformer(), "lsStates.lsValues.blobValue").
-                 serialize(this);
-      }
-    
+        return new JSONSerializer()
+                .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.lsThing", "lsLabels.lsThing")
+                .include("lsTags", "lsLabels", "lsStates.lsValues", "firstLsThings.firstLsThing.lsLabels",
+                        "secondLsThings.secondLsThing.lsLabels")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
+    }
+
+    @Transactional
+    public String toJsonWithNestedStubsWithBlobValues() {
+        return new JSONSerializer()
+                .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.lsThing", "lsLabels.lsThing")
+                .include("lsTags", "lsLabels", "lsStates.lsValues", "firstLsThings.firstLsThing.lsLabels",
+                        "secondLsThings.secondLsThing.lsLabels")
+                .transform(new ExcludeNulls(), void.class)
+                .transform(new ByteArrayTransformer(), "lsStates.lsValues.blobValue").serialize(this);
+    }
+
     @Transactional
     public String toJsonWithNestedFull() {
-        return new JSONSerializer().
-        		exclude("*.class", "lsStates.lsValues.lsState", "lsStates.lsThing", "lsLabels.lsThing").
-        		include("lsTags", "lsLabels", "lsStates.lsValues", "firstLsThings.firstLsThing.lsStates.lsValues","firstLsThings.firstLsThing.lsLabels", "secondLsThings.secondLsThing.lsStates.lsValues","secondLsThings.secondLsThing.lsLabels","firstLsThings.lsStates.lsValues","firstLsThings.lsLabels","secondLsThings.lsStates.lsValues","secondLsThings.lsLabels").
-                transform(new ExcludeNulls(), void.class).
-        		serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.lsThing", "lsLabels.lsThing")
+                .include("lsTags", "lsLabels", "lsStates.lsValues", "firstLsThings.firstLsThing.lsStates.lsValues",
+                        "firstLsThings.firstLsThing.lsLabels", "secondLsThings.secondLsThing.lsStates.lsValues",
+                        "secondLsThings.secondLsThing.lsLabels", "firstLsThings.lsStates.lsValues",
+                        "firstLsThings.lsLabels", "secondLsThings.lsStates.lsValues", "secondLsThings.lsLabels")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public String toPrettyJson() {
-        return new JSONSerializer().
-        		exclude("*.class", "lsStates.lsValues.lsState", "lsStates.lsThing", "lsLabels.lsThing").
-        		include("lsTags", "lsLabels", "lsStates.lsValues").prettyPrint(true).
-                transform(new ExcludeNulls(), void.class).
-        		serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.lsThing", "lsLabels.lsThing")
+                .include("lsTags", "lsLabels", "lsStates.lsValues").prettyPrint(true)
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public String toJsonStub() {
-        return new JSONSerializer().exclude("*.class", "lsStates").include("lsTags", "lsLabels").prettyPrint(false).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().exclude("*.class", "lsStates").include("lsTags", "lsLabels").prettyPrint(false)
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
-    
+
     @Transactional
     public static String toJsonArrayWithNestedStubs(Collection<com.labsynch.labseer.domain.LsThing> collection) {
-        return new JSONSerializer().
-        		exclude("*.class","lsStates.lsValues.lsState", "lsStates.lsThing", "lsLabels.lsThing").
-        		include("lsTags", "lsLabels", "lsStates.lsValues", "firstLsThings.firstLsThing.lsLabels","secondLsThings.secondLsThing.lsLabels").
-                transform(new ExcludeNulls(), void.class).
-        		serialize(collection);
+        return new JSONSerializer()
+                .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.lsThing", "lsLabels.lsThing")
+                .include("lsTags", "lsLabels", "lsStates.lsValues", "firstLsThings.firstLsThing.lsLabels",
+                        "secondLsThings.secondLsThing.lsLabels")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
 
     }
-    
+
     @Transactional
     public static String toJsonArrayWithNestedFull(Collection<com.labsynch.labseer.domain.LsThing> collection) {
-        return new JSONSerializer().
-        		exclude("*.class","lsStates.lsValues.lsState", "lsStates.lsThing", "lsLabels.lsThing").
-        		include("lsTags", "lsLabels", "lsStates.lsValues", "firstLsThings.firstLsThing.lsStates.lsValues","secondLsThings.secondLsThing.lsStates.lsValues","firstLsThings.firstLsThing.lsLabels","secondLsThings.secondLsThing.lsLabels","firstLsThings.lsStates.lsValues","secondLsThings.lsStates.lsValues","firstLsThings.lsLabels","secondLsThings.lsLabels").
-                transform(new ExcludeNulls(), void.class).
-        		serialize(collection);
+        return new JSONSerializer()
+                .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.lsThing", "lsLabels.lsThing")
+                .include("lsTags", "lsLabels", "lsStates.lsValues", "firstLsThings.firstLsThing.lsStates.lsValues",
+                        "secondLsThings.secondLsThing.lsStates.lsValues", "firstLsThings.firstLsThing.lsLabels",
+                        "secondLsThings.secondLsThing.lsLabels", "firstLsThings.lsStates.lsValues",
+                        "secondLsThings.lsStates.lsValues", "firstLsThings.lsLabels", "secondLsThings.lsLabels")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
 
     }
-    
+
     @Transactional
-    public static String toJsonArrayWithNestedFirstLsThings(Collection<com.labsynch.labseer.domain.LsThing> collection) {
-        return new JSONSerializer().exclude("*.class").include("lsTags", "lsLabels", "lsStates.lsValues", "firstLsThings.firstLsThing.lsStates.lsValues","firstLsThings.firstLsThing.lsLabels","firstLsThings.lsStates.lsValues","firstLsThings.lsLabels").
-        transform(new ExcludeNulls(), void.class).
-        serialize(collection);
+    public static String toJsonArrayWithNestedFirstLsThings(
+            Collection<com.labsynch.labseer.domain.LsThing> collection) {
+        return new JSONSerializer().exclude("*.class")
+                .include("lsTags", "lsLabels", "lsStates.lsValues", "firstLsThings.firstLsThing.lsStates.lsValues",
+                        "firstLsThings.firstLsThing.lsLabels", "firstLsThings.lsStates.lsValues",
+                        "firstLsThings.lsLabels")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
-    
+
     @Transactional
-    public static String toJsonArrayWithNestedSecondLsThings(Collection<com.labsynch.labseer.domain.LsThing> collection) {
-        return new JSONSerializer().exclude("*.class").include("lsTags", "lsLabels", "lsStates.lsValues", "secondLsThings.secondLsThing.lsStates.lsValues","secondLsThings.secondLsThing.lsLabels","secondLsThings.lsStates.lsValues","secondLsThings.lsLabels").
-        transform(new ExcludeNulls(), void.class).
-        serialize(collection);
+    public static String toJsonArrayWithNestedSecondLsThings(
+            Collection<com.labsynch.labseer.domain.LsThing> collection) {
+        return new JSONSerializer().exclude("*.class")
+                .include("lsTags", "lsLabels", "lsStates.lsValues", "secondLsThings.secondLsThing.lsStates.lsValues",
+                        "secondLsThings.secondLsThing.lsLabels", "secondLsThings.lsStates.lsValues",
+                        "secondLsThings.lsLabels")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
-    
+
     @Transactional
     public static String toJsonArrayPretty(Collection<com.labsynch.labseer.domain.LsThing> collection) {
-        return new JSONSerializer().
-        		exclude("*.class", "lsStates.lsValues.lsState", "lsStates.lsThing", "lsLabels.lsThing").
-        		include("lsTags", "lsLabels", "lsStates.lsValues").prettyPrint(true).
-                transform(new ExcludeNulls(), void.class).
-        		serialize(collection);
+        return new JSONSerializer()
+                .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.lsThing", "lsLabels.lsThing")
+                .include("lsTags", "lsLabels", "lsStates.lsValues").prettyPrint(true)
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
     @Transactional
     public static String toJsonArrayStub(Collection<com.labsynch.labseer.domain.LsThing> collection) {
-        return new JSONSerializer().
-        		exclude("*.class","lsStates").
-        		include("lsTags", "lsLabels").prettyPrint(false).
-                transform(new ExcludeNulls(), void.class).
-        		serialize(collection);
+        return new JSONSerializer().exclude("*.class", "lsStates").include("lsTags", "lsLabels").prettyPrint(false)
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
     @Transactional
     public String toPrettyJsonStub() {
         return new JSONSerializer()
-        .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.lsThing", "lsLabels.lsThing")
-        .include("lsTags", "lsLabels", "lsStates.lsValues")
-        .prettyPrint(true).
-        transform(new ExcludeNulls(), void.class).
-        serialize(this);
+                .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.lsThing", "lsLabels.lsThing")
+                .include("lsTags", "lsLabels", "lsStates.lsValues")
+                .prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
-	public static TypedQuery<LsThing> findLsThing(String thingType, String thingKind) {
-        if (thingType == null || thingType.length() == 0) throw new IllegalArgumentException("The thingType argument is required");
-        if (thingKind == null || thingKind.length() == 0) throw new IllegalArgumentException("The thingKind argument is required");
-        
+    public static TypedQuery<LsThing> findLsThing(String thingType, String thingKind) {
+        if (thingType == null || thingType.length() == 0)
+            throw new IllegalArgumentException("The thingType argument is required");
+        if (thingKind == null || thingKind.length() == 0)
+            throw new IllegalArgumentException("The thingKind argument is required");
+
         boolean ignored = true;
-        
+
         EntityManager em = LsThing.entityManager();
-		String query = "SELECT DISTINCT o FROM LsThing o " +
-				"WHERE o.ignored IS NOT :ignored " +
-				"AND o.lsType = :thingType " +
-				"AND o.lsKind = :thingKind ";
-        
+        String query = "SELECT DISTINCT o FROM LsThing o " +
+                "WHERE o.ignored IS NOT :ignored " +
+                "AND o.lsType = :thingType " +
+                "AND o.lsKind = :thingKind ";
+
         TypedQuery<LsThing> q = em.createQuery(query, LsThing.class);
         q.setParameter("thingType", thingType);
         q.setParameter("thingKind", thingKind);
         q.setParameter("ignored", ignored);
-        
+
         return q;
-	}
-
-//	public static TypedQuery<LsThing> findLsThing(String thingType, String thingKind, String labelText) {
-//        if (thingType == null || thingType.length() == 0) throw new IllegalArgumentException("The thingType argument is required");
-//        if (thingKind == null || thingKind.length() == 0) throw new IllegalArgumentException("The thingKind argument is required");
-//        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-//        
-//        boolean ignored = true;
-//        
-//        EntityManager em = LsThing.entityManager();
-//		String query = "SELECT o FROM LsThing o " +
-//				"JOIN o.lsLabels ll with ll.ignored IS NOT :ignored AND ll.labelText = :labelText " +
-//				"WHERE o.ignored IS NOT :ignored " +
-//				"AND o.lsType = :thingType " +
-//				"AND o.lsKind = :thingKind ";
-//        
-//        TypedQuery<LsThing> q = em.createQuery(query, LsThing.class);
-//        q.setParameter("thingType", thingType);
-//        q.setParameter("thingKind", thingKind);
-//        q.setParameter("labelText", labelText);
-//        q.setParameter("ignored", ignored);
-//        
-//        return q;
-//	}
-
-    
+    }
+
+    // public static TypedQuery<LsThing> findLsThing(String thingType, String
+    // thingKind, String labelText) {
+    // if (thingType == null || thingType.length() == 0) throw new
+    // IllegalArgumentException("The thingType argument is required");
+    // if (thingKind == null || thingKind.length() == 0) throw new
+    // IllegalArgumentException("The thingKind argument is required");
+    // if (labelText == null || labelText.length() == 0) throw new
+    // IllegalArgumentException("The labelText argument is required");
+    //
+    // boolean ignored = true;
+    //
+    // EntityManager em = LsThing.entityManager();
+    // String query = "SELECT o FROM LsThing o " +
+    // "JOIN o.lsLabels ll with ll.ignored IS NOT :ignored AND ll.labelText =
+    // :labelText " +
+    // "WHERE o.ignored IS NOT :ignored " +
+    // "AND o.lsType = :thingType " +
+    // "AND o.lsKind = :thingKind ";
+    //
+    // TypedQuery<LsThing> q = em.createQuery(query, LsThing.class);
+    // q.setParameter("thingType", thingType);
+    // q.setParameter("thingKind", thingKind);
+    // q.setParameter("labelText", labelText);
+    // q.setParameter("ignored", ignored);
+    //
+    // return q;
+    // }
+
     public static TypedQuery<LsThing> findLsThingByLabelText(String labelText) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
+
         boolean ignored = true;
-        
+
         EntityManager em = LsThing.entityManager();
-		String query = "SELECT DISTINCT o FROM LsThing o " +
-				"JOIN o.lsLabels ll with ll.ignored IS NOT :ignored AND ll.labelText = :labelText " +
-				"WHERE o.ignored IS NOT :ignored ";
-        
+        String query = "SELECT DISTINCT o FROM LsThing o " +
+                "JOIN o.lsLabels ll with ll.ignored IS NOT :ignored AND ll.labelText = :labelText " +
+                "WHERE o.ignored IS NOT :ignored ";
+
         TypedQuery<LsThing> q = em.createQuery(query, LsThing.class);
         q.setParameter("labelText", labelText);
         q.setParameter("ignored", ignored);
-        
+
         return q;
     }
-    
+
     public static TypedQuery<LsThing> findLsThingByLabelTextAndLsKind(String labelText, String lsKind) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
+
         boolean ignored = true;
-        
+
         EntityManager em = LsThing.entityManager();
-		String query = "SELECT DISTINCT o FROM LsThing o " +
-				"JOIN o.lsLabels ll with ll.ignored IS NOT :ignored AND ll.labelText = :labelText " +
-				"WHERE o.ignored IS NOT :ignored " +
-				"AND o.lsKind = :lsKind ";
-        
+        String query = "SELECT DISTINCT o FROM LsThing o " +
+                "JOIN o.lsLabels ll with ll.ignored IS NOT :ignored AND ll.labelText = :labelText " +
+                "WHERE o.ignored IS NOT :ignored " +
+                "AND o.lsKind = :lsKind ";
+
         TypedQuery<LsThing> q = em.createQuery(query, LsThing.class);
         q.setParameter("labelText", labelText);
         q.setParameter("lsKind", lsKind);
         q.setParameter("ignored", ignored);
-        
+
         return q;
     }
-       
+
     public static TypedQuery<LsThing> findLsThingByLabelTextList(List<String> labelTextList) {
-        if (labelTextList == null || labelTextList.size() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        
+        if (labelTextList == null || labelTextList.size() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
+
         boolean ignored = true;
-        
+
         EntityManager em = LsThing.entityManager();
-		String query = "SELECT DISTINCT o FROM LsThing o " +
-				"JOIN o.lsLabels ll with ll.ignored IS NOT :ignored AND ll.labelText in (:labelTextList) " +
-				"WHERE o.ignored IS NOT :ignored ";
-        
+        String query = "SELECT DISTINCT o FROM LsThing o " +
+                "JOIN o.lsLabels ll with ll.ignored IS NOT :ignored AND ll.labelText in (:labelTextList) " +
+                "WHERE o.ignored IS NOT :ignored ";
+
         TypedQuery<LsThing> q = em.createQuery(query, LsThing.class);
         q.setParameter("labelTextList", labelTextList);
         q.setParameter("ignored", ignored);
-        
+
         return q;
     }
 
-	public static TypedQuery<LsThing> findLsThingByLabelText(String thingType, String thingKind, String labelText) {
-        if (thingType == null || thingType.length() == 0) throw new IllegalArgumentException("The thingType argument is required");
-        if (thingKind == null || thingKind.length() == 0) throw new IllegalArgumentException("The thingKind argument is required");
-		if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        
+    public static TypedQuery<LsThing> findLsThingByLabelText(String thingType, String thingKind, String labelText) {
+        if (thingType == null || thingType.length() == 0)
+            throw new IllegalArgumentException("The thingType argument is required");
+        if (thingKind == null || thingKind.length() == 0)
+            throw new IllegalArgumentException("The thingKind argument is required");
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
+
         boolean ignored = true;
         EntityManager em = LsThing.entityManager();
-		String query = "SELECT DISTINCT o FROM LsThing o " +
-				"JOIN o.lsLabels ll with ll.ignored IS NOT :ignored AND ll.labelText = :labelText " +
-				"WHERE o.ignored IS NOT :ignored " +
-				"AND o.lsType = :thingType " +
-				"AND o.lsKind = :thingKind ";
-        
+        String query = "SELECT DISTINCT o FROM LsThing o " +
+                "JOIN o.lsLabels ll with ll.ignored IS NOT :ignored AND ll.labelText = :labelText " +
+                "WHERE o.ignored IS NOT :ignored " +
+                "AND o.lsType = :thingType " +
+                "AND o.lsKind = :thingKind ";
+
         TypedQuery<LsThing> q = em.createQuery(query, LsThing.class);
         q.setParameter("thingType", thingType);
         q.setParameter("thingKind", thingKind);
         q.setParameter("labelText", labelText);
         q.setParameter("ignored", ignored);
-        
+
         return q;
-	}
-	
-	public static TypedQuery<LsThing> findLsThingByLabelText(String thingType, String thingKind, String labelType, String labelKind, String labelText) {
-        if (thingType == null || thingType.length() == 0) throw new IllegalArgumentException("The thingType argument is required");
-        if (thingKind == null || thingKind.length() == 0) throw new IllegalArgumentException("The thingKind argument is required");
-        if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-        if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        
+    }
+
+    public static TypedQuery<LsThing> findLsThingByLabelText(String thingType, String thingKind, String labelType,
+            String labelKind, String labelText) {
+        if (thingType == null || thingType.length() == 0)
+            throw new IllegalArgumentException("The thingType argument is required");
+        if (thingKind == null || thingKind.length() == 0)
+            throw new IllegalArgumentException("The thingKind argument is required");
+        if (labelType == null || labelType.length() == 0)
+            throw new IllegalArgumentException("The labelType argument is required");
+        if (labelKind == null || labelKind.length() == 0)
+            throw new IllegalArgumentException("The labelKind argument is required");
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
+
         boolean ignored = true;
-        
+
         EntityManager em = LsThing.entityManager();
-		String query = "SELECT DISTINCT o FROM LsThing o " +
-				"JOIN o.lsLabels ll " +
-				"WHERE o.ignored IS NOT :ignored " +
-				"AND o.lsType = :thingType " +
-				"AND o.lsKind = :thingKind " +
-				"AND ll.ignored IS NOT :ignored AND ll.lsType = :labelType AND ll.lsKind = :labelKind AND ll.labelText = :labelText";
-        
+        String query = "SELECT DISTINCT o FROM LsThing o " +
+                "JOIN o.lsLabels ll " +
+                "WHERE o.ignored IS NOT :ignored " +
+                "AND o.lsType = :thingType " +
+                "AND o.lsKind = :thingKind " +
+                "AND ll.ignored IS NOT :ignored AND ll.lsType = :labelType AND ll.lsKind = :labelKind AND ll.labelText = :labelText";
+
         TypedQuery<LsThing> q = em.createQuery(query, LsThing.class);
         q.setParameter("thingType", thingType);
         q.setParameter("thingKind", thingKind);
-        q.setParameter("labelType", labelType);        
+        q.setParameter("labelType", labelType);
         q.setParameter("labelKind", labelKind);
         q.setParameter("labelText", labelText);
         q.setParameter("ignored", ignored);
-        
+
         return q;
-	}
-
-	public static TypedQuery<LsThing> findAllLsThingByLabelText(String thingType, String thingKind, String labelType, String labelKind, String labelText) {
-        if (thingType == null || thingType.length() == 0) throw new IllegalArgumentException("The thingType argument is required");
-        if (thingKind == null || thingKind.length() == 0) throw new IllegalArgumentException("The thingKind argument is required");
-        if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-        if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        
+    }
+
+    public static TypedQuery<LsThing> findAllLsThingByLabelText(String thingType, String thingKind, String labelType,
+            String labelKind, String labelText) {
+        if (thingType == null || thingType.length() == 0)
+            throw new IllegalArgumentException("The thingType argument is required");
+        if (thingKind == null || thingKind.length() == 0)
+            throw new IllegalArgumentException("The thingKind argument is required");
+        if (labelType == null || labelType.length() == 0)
+            throw new IllegalArgumentException("The labelType argument is required");
+        if (labelKind == null || labelKind.length() == 0)
+            throw new IllegalArgumentException("The labelKind argument is required");
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
+
         boolean ignored = true;
-        
+
         EntityManager em = LsThing.entityManager();
-		String query = "SELECT DISTINCT o FROM LsThing o " +
-				"JOIN o.lsLabels ll " +
-				"WHERE o.lsType = :thingType " +
-				"AND o.lsKind = :thingKind " +
-				"AND ll.ignored IS NOT :ignored AND ll.lsType = :labelType AND ll.lsKind = :labelKind AND ll.labelText = :labelText";
-        
+        String query = "SELECT DISTINCT o FROM LsThing o " +
+                "JOIN o.lsLabels ll " +
+                "WHERE o.lsType = :thingType " +
+                "AND o.lsKind = :thingKind " +
+                "AND ll.ignored IS NOT :ignored AND ll.lsType = :labelType AND ll.lsKind = :labelKind AND ll.labelText = :labelText";
+
         TypedQuery<LsThing> q = em.createQuery(query, LsThing.class);
         q.setParameter("thingType", thingType);
         q.setParameter("thingKind", thingKind);
-        q.setParameter("labelType", labelType);        
+        q.setParameter("labelType", labelType);
         q.setParameter("labelKind", labelKind);
         q.setParameter("labelText", labelText);
         q.setParameter("ignored", ignored);
-        
+
         return q;
-	}
-	
-//	public static TypedQuery<LsThing> findLsThingByLabelText(String thingType,
-//			String thingKind, String labelType, String labelKind,
-//			Object batchCode, int firstResult, int resultSetSize) {
-//		// TODO Auto-generated method stub
-//		return null;
-//	}
-
-	public static TypedQuery<LsThing> findLsThingByLabelTypeAndLabelText(
-			String thingType, String thingKind, String labelType,
-			String labelText) {
-		if (thingType == null || thingType.length() == 0) throw new IllegalArgumentException("The thingType argument is required");
-        if (thingKind == null || thingKind.length() == 0) throw new IllegalArgumentException("The thingKind argument is required");
-        if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        
+    }
+
+    // public static TypedQuery<LsThing> findLsThingByLabelText(String thingType,
+    // String thingKind, String labelType, String labelKind,
+    // Object batchCode, int firstResult, int resultSetSize) {
+    // // TODO Auto-generated method stub
+    // return null;
+    // }
+
+    public static TypedQuery<LsThing> findLsThingByLabelTypeAndLabelText(
+            String thingType, String thingKind, String labelType,
+            String labelText) {
+        if (thingType == null || thingType.length() == 0)
+            throw new IllegalArgumentException("The thingType argument is required");
+        if (thingKind == null || thingKind.length() == 0)
+            throw new IllegalArgumentException("The thingKind argument is required");
+        if (labelType == null || labelType.length() == 0)
+            throw new IllegalArgumentException("The labelType argument is required");
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
+
         boolean ignored = true;
-        
+
         EntityManager em = LsThing.entityManager();
-		String query = "SELECT DISTINCT o FROM LsThing o " +
-				"JOIN o.lsLabels ll with ll.ignored IS NOT :ignored AND ll.lsType = :labelType AND ll.labelText = :labelText " +
-				"WHERE o.ignored IS NOT :ignored " +
-				"AND o.lsType = :thingType " +
-				"AND o.lsKind = :thingKind ";
-        
+        String query = "SELECT DISTINCT o FROM LsThing o " +
+                "JOIN o.lsLabels ll with ll.ignored IS NOT :ignored AND ll.lsType = :labelType AND ll.labelText = :labelText "
+                +
+                "WHERE o.ignored IS NOT :ignored " +
+                "AND o.lsType = :thingType " +
+                "AND o.lsKind = :thingKind ";
+
         TypedQuery<LsThing> q = em.createQuery(query, LsThing.class);
         q.setParameter("thingType", thingType);
         q.setParameter("thingKind", thingKind);
-        q.setParameter("labelType", labelType);        
+        q.setParameter("labelType", labelType);
         q.setParameter("labelText", labelText);
         q.setParameter("ignored", ignored);
-        
+
         return q;
-	}
-
-	public static TypedQuery<LsThing> findLsThingByLabelKindAndLabelText(
-			String thingType, String thingKind, String labelKind,
-			String labelText) {
-		if (thingType == null || thingType.length() == 0) throw new IllegalArgumentException("The thingType argument is required");
-        if (thingKind == null || thingKind.length() == 0) throw new IllegalArgumentException("The thingKind argument is required");
-        if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        
+    }
+
+    public static TypedQuery<LsThing> findLsThingByLabelKindAndLabelText(
+            String thingType, String thingKind, String labelKind,
+            String labelText) {
+        if (thingType == null || thingType.length() == 0)
+            throw new IllegalArgumentException("The thingType argument is required");
+        if (thingKind == null || thingKind.length() == 0)
+            throw new IllegalArgumentException("The thingKind argument is required");
+        if (labelKind == null || labelKind.length() == 0)
+            throw new IllegalArgumentException("The labelKind argument is required");
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
+
         boolean ignored = true;
-        
+
         EntityManager em = LsThing.entityManager();
-		String query = "SELECT DISTINCT o FROM LsThing o " +
-				"JOIN o.lsLabels ll with ll.ignored IS NOT :ignored AND ll.lsKind = :labelKind AND ll.labelText = :labelText " +
-				"WHERE o.ignored IS NOT :ignored " +
-				"AND o.lsType = :thingType " +
-				"AND o.lsKind = :thingKind ";
-        
+        String query = "SELECT DISTINCT o FROM LsThing o " +
+                "JOIN o.lsLabels ll with ll.ignored IS NOT :ignored AND ll.lsKind = :labelKind AND ll.labelText = :labelText "
+                +
+                "WHERE o.ignored IS NOT :ignored " +
+                "AND o.lsType = :thingType " +
+                "AND o.lsKind = :thingKind ";
+
         TypedQuery<LsThing> q = em.createQuery(query, LsThing.class);
         q.setParameter("thingType", thingType);
         q.setParameter("thingKind", thingKind);
         q.setParameter("labelKind", labelKind);
         q.setParameter("labelText", labelText);
         q.setParameter("ignored", ignored);
-        
+
         return q;
-	}
-
-	public static TypedQuery<LsThing> findLsThingByLabelTypeAndKind(
-			String thingType, String thingKind, String labelType,
-			String labelKind) {
-		if (thingType == null || thingType.length() == 0) throw new IllegalArgumentException("The thingType argument is required");
-        if (thingKind == null || thingKind.length() == 0) throw new IllegalArgumentException("The thingKind argument is required");
-        if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-        if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");
-        
+    }
+
+    public static TypedQuery<LsThing> findLsThingByLabelTypeAndKind(
+            String thingType, String thingKind, String labelType,
+            String labelKind) {
+        if (thingType == null || thingType.length() == 0)
+            throw new IllegalArgumentException("The thingType argument is required");
+        if (thingKind == null || thingKind.length() == 0)
+            throw new IllegalArgumentException("The thingKind argument is required");
+        if (labelType == null || labelType.length() == 0)
+            throw new IllegalArgumentException("The labelType argument is required");
+        if (labelKind == null || labelKind.length() == 0)
+            throw new IllegalArgumentException("The labelKind argument is required");
+
         boolean ignored = true;
-        
+
         EntityManager em = LsThing.entityManager();
-		String query = "SELECT DISTINCT o FROM LsThing o " +
-				"JOIN o.lsLabels ll with ll.ignored IS NOT :ignored AND ll.lsType = :labelType AND ll.lsKind = :labelKind " +
-				"WHERE o.ignored IS NOT :ignored " +
-				"AND o.lsType = :thingType " +
-				"AND o.lsKind = :thingKind ";
-        
+        String query = "SELECT DISTINCT o FROM LsThing o " +
+                "JOIN o.lsLabels ll with ll.ignored IS NOT :ignored AND ll.lsType = :labelType AND ll.lsKind = :labelKind "
+                +
+                "WHERE o.ignored IS NOT :ignored " +
+                "AND o.lsType = :thingType " +
+                "AND o.lsKind = :thingKind ";
+
         TypedQuery<LsThing> q = em.createQuery(query, LsThing.class);
         q.setParameter("thingType", thingType);
         q.setParameter("thingKind", thingKind);
-        q.setParameter("labelType", labelType);        
+        q.setParameter("labelType", labelType);
         q.setParameter("labelKind", labelKind);
         q.setParameter("ignored", ignored);
-        
+
         return q;
-	}
-	
-	public static TypedQuery<LsThing> findLsThingByLabelTypeAndKindAndLabelText(
-			String thingType, String thingKind, String labelType,
-			String labelKind, String labelText) {
-		if (thingType == null || thingType.length() == 0) throw new IllegalArgumentException("The thingType argument is required");
-        if (thingKind == null || thingKind.length() == 0) throw new IllegalArgumentException("The thingKind argument is required");
-        if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-        if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        
+    }
+
+    public static TypedQuery<LsThing> findLsThingByLabelTypeAndKindAndLabelText(
+            String thingType, String thingKind, String labelType,
+            String labelKind, String labelText) {
+        if (thingType == null || thingType.length() == 0)
+            throw new IllegalArgumentException("The thingType argument is required");
+        if (thingKind == null || thingKind.length() == 0)
+            throw new IllegalArgumentException("The thingKind argument is required");
+        if (labelType == null || labelType.length() == 0)
+            throw new IllegalArgumentException("The labelType argument is required");
+        if (labelKind == null || labelKind.length() == 0)
+            throw new IllegalArgumentException("The labelKind argument is required");
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
+
         boolean ignored = true;
-        
+
         EntityManager em = LsThing.entityManager();
-		String query = "SELECT DISTINCT o FROM LsThing o " +
-				"JOIN o.lsLabels ll with ll.ignored IS NOT :ignored AND ll.lsType = :labelType AND ll.lsKind = :labelKind " +
-				"WHERE o.ignored IS NOT :ignored " +
-				"AND o.lsType = :thingType " +
-				"AND o.lsKind = :thingKind " +
-				"AND ll.labelText = :labelText ";
-        
+        String query = "SELECT DISTINCT o FROM LsThing o " +
+                "JOIN o.lsLabels ll with ll.ignored IS NOT :ignored AND ll.lsType = :labelType AND ll.lsKind = :labelKind "
+                +
+                "WHERE o.ignored IS NOT :ignored " +
+                "AND o.lsType = :thingType " +
+                "AND o.lsKind = :thingKind " +
+                "AND ll.labelText = :labelText ";
+
         TypedQuery<LsThing> q = em.createQuery(query, LsThing.class);
         q.setParameter("thingType", thingType);
         q.setParameter("thingKind", thingKind);
-        q.setParameter("labelType", labelType);        
+        q.setParameter("labelType", labelType);
         q.setParameter("labelKind", labelKind);
         q.setParameter("labelText", labelText);
         q.setParameter("ignored", ignored);
-        
+
         return q;
-	}
-	
-	public static TypedQuery<LsThing> findAllLsThingByLabelTypeAndKindAndLabelText(
-			String thingType, String thingKind, String labelType,
-			String labelKind, String labelText) {
-		if (thingType == null || thingType.length() == 0) throw new IllegalArgumentException("The thingType argument is required");
-        if (thingKind == null || thingKind.length() == 0) throw new IllegalArgumentException("The thingKind argument is required");
-        if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-        if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        
+    }
+
+    public static TypedQuery<LsThing> findAllLsThingByLabelTypeAndKindAndLabelText(
+            String thingType, String thingKind, String labelType,
+            String labelKind, String labelText) {
+        if (thingType == null || thingType.length() == 0)
+            throw new IllegalArgumentException("The thingType argument is required");
+        if (thingKind == null || thingKind.length() == 0)
+            throw new IllegalArgumentException("The thingKind argument is required");
+        if (labelType == null || labelType.length() == 0)
+            throw new IllegalArgumentException("The labelType argument is required");
+        if (labelKind == null || labelKind.length() == 0)
+            throw new IllegalArgumentException("The labelKind argument is required");
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
+
         boolean ignored = true;
-        
+
         EntityManager em = LsThing.entityManager();
-		String query = "SELECT DISTINCT o FROM LsThing o " +
-				"JOIN o.lsLabels ll with ll.ignored IS NOT :ignored AND ll.lsType = :labelType AND ll.lsKind = :labelKind " +
-				"WHERE o.deleted IS NOT :deleted " +
-				"AND o.lsType = :thingType " +
-				"AND o.lsKind = :thingKind " +
-				"AND ll.labelText = :labelText ";
-        
+        String query = "SELECT DISTINCT o FROM LsThing o " +
+                "JOIN o.lsLabels ll with ll.ignored IS NOT :ignored AND ll.lsType = :labelType AND ll.lsKind = :labelKind "
+                +
+                "WHERE o.deleted IS NOT :deleted " +
+                "AND o.lsType = :thingType " +
+                "AND o.lsKind = :thingKind " +
+                "AND ll.labelText = :labelText ";
+
         TypedQuery<LsThing> q = em.createQuery(query, LsThing.class);
         q.setParameter("thingType", thingType);
         q.setParameter("thingKind", thingKind);
-        q.setParameter("labelType", labelType);        
+        q.setParameter("labelType", labelType);
         q.setParameter("labelKind", labelKind);
         q.setParameter("labelText", labelText);
         q.setParameter("ignored", ignored);
         q.setParameter("deleted", true);
-        
+
         return q;
-	}
-	
-	public static TypedQuery<LsThing> findLsThingByAllLabelTypeAndKindAndLabelText(
-			String thingType, String thingKind, String labelType,
-			String labelKind, String labelText) {
-		if (thingType == null || thingType.length() == 0) throw new IllegalArgumentException("The thingType argument is required");
-        if (thingKind == null || thingKind.length() == 0) throw new IllegalArgumentException("The thingKind argument is required");
-        if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-        if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        
+    }
+
+    public static TypedQuery<LsThing> findLsThingByAllLabelTypeAndKindAndLabelText(
+            String thingType, String thingKind, String labelType,
+            String labelKind, String labelText) {
+        if (thingType == null || thingType.length() == 0)
+            throw new IllegalArgumentException("The thingType argument is required");
+        if (thingKind == null || thingKind.length() == 0)
+            throw new IllegalArgumentException("The thingKind argument is required");
+        if (labelType == null || labelType.length() == 0)
+            throw new IllegalArgumentException("The labelType argument is required");
+        if (labelKind == null || labelKind.length() == 0)
+            throw new IllegalArgumentException("The labelKind argument is required");
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
+
         boolean ignored = true;
-        
+
         EntityManager em = LsThing.entityManager();
-		String query = "SELECT DISTINCT o FROM LsThing o " +
-				"JOIN o.lsLabels ll with ll.lsType = :labelType AND ll.lsKind = :labelKind " +
-				"WHERE o.ignored IS NOT :ignored " +
-				"AND o.lsType = :thingType " +
-				"AND o.lsKind = :thingKind " +
-				"AND ll.labelText = :labelText ";
-        
+        String query = "SELECT DISTINCT o FROM LsThing o " +
+                "JOIN o.lsLabels ll with ll.lsType = :labelType AND ll.lsKind = :labelKind " +
+                "WHERE o.ignored IS NOT :ignored " +
+                "AND o.lsType = :thingType " +
+                "AND o.lsKind = :thingKind " +
+                "AND ll.labelText = :labelText ";
+
         TypedQuery<LsThing> q = em.createQuery(query, LsThing.class);
         q.setParameter("thingType", thingType);
         q.setParameter("thingKind", thingKind);
-        q.setParameter("labelType", labelType);        
+        q.setParameter("labelType", labelType);
         q.setParameter("labelKind", labelKind);
         q.setParameter("labelText", labelText);
         q.setParameter("ignored", ignored);
-        
+
         return q;
-	}
-
-	public static TypedQuery<LsThing> findLsThingByLabelKind(String thingType,
-			String thingKind, String labelKind) {
-		if (thingType == null || thingType.length() == 0) throw new IllegalArgumentException("The thingType argument is required");
-        if (thingKind == null || thingKind.length() == 0) throw new IllegalArgumentException("The thingKind argument is required");
-        if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");
-        
+    }
+
+    public static TypedQuery<LsThing> findLsThingByLabelKind(String thingType,
+            String thingKind, String labelKind) {
+        if (thingType == null || thingType.length() == 0)
+            throw new IllegalArgumentException("The thingType argument is required");
+        if (thingKind == null || thingKind.length() == 0)
+            throw new IllegalArgumentException("The thingKind argument is required");
+        if (labelKind == null || labelKind.length() == 0)
+            throw new IllegalArgumentException("The labelKind argument is required");
+
         boolean ignored = true;
-        
+
         EntityManager em = LsThing.entityManager();
-		String query = "SELECT DISTINCT o FROM LsThing o " +
-				"JOIN o.lsLabels ll with ll.ignored IS NOT :ignored AND ll.lsKind = :labelKind " +
-				"WHERE o.ignored IS NOT :ignored " +
-				"AND o.lsType = :thingType " +
-				"AND o.lsKind = :thingKind ";
-        
+        String query = "SELECT DISTINCT o FROM LsThing o " +
+                "JOIN o.lsLabels ll with ll.ignored IS NOT :ignored AND ll.lsKind = :labelKind " +
+                "WHERE o.ignored IS NOT :ignored " +
+                "AND o.lsType = :thingType " +
+                "AND o.lsKind = :thingKind ";
+
         TypedQuery<LsThing> q = em.createQuery(query, LsThing.class);
         q.setParameter("thingType", thingType);
         q.setParameter("thingKind", thingKind);
         q.setParameter("labelKind", labelKind);
         q.setParameter("ignored", ignored);
-        
+
         return q;
-	}
-
-	public static TypedQuery<LsThing> findLsThingByLabelType(String thingType,
-			String thingKind, String labelType) {
-		if (thingType == null || thingType.length() == 0) throw new IllegalArgumentException("The thingType argument is required");
-        if (thingKind == null || thingKind.length() == 0) throw new IllegalArgumentException("The thingKind argument is required");
-        if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-        
+    }
+
+    public static TypedQuery<LsThing> findLsThingByLabelType(String thingType,
+            String thingKind, String labelType) {
+        if (thingType == null || thingType.length() == 0)
+            throw new IllegalArgumentException("The thingType argument is required");
+        if (thingKind == null || thingKind.length() == 0)
+            throw new IllegalArgumentException("The thingKind argument is required");
+        if (labelType == null || labelType.length() == 0)
+            throw new IllegalArgumentException("The labelType argument is required");
+
         boolean ignored = true;
-        
+
         EntityManager em = LsThing.entityManager();
-		String query = "SELECT DISTINCT o FROM LsThing o " +
-				"JOIN o.lsLabels ll with ll.ignored IS NOT :ignored AND ll.lsType = :labelType " +
-				"WHERE o.ignored IS NOT :ignored " +
-				"AND o.lsType = :thingType " +
-				"AND o.lsKind = :thingKind ";
-        
+        String query = "SELECT DISTINCT o FROM LsThing o " +
+                "JOIN o.lsLabels ll with ll.ignored IS NOT :ignored AND ll.lsType = :labelType " +
+                "WHERE o.ignored IS NOT :ignored " +
+                "AND o.lsType = :thingType " +
+                "AND o.lsKind = :thingKind ";
+
         TypedQuery<LsThing> q = em.createQuery(query, LsThing.class);
         q.setParameter("thingType", thingType);
         q.setParameter("thingKind", thingKind);
-        q.setParameter("labelType", labelType);        
+        q.setParameter("labelType", labelType);
         q.setParameter("ignored", ignored);
-        
+
         return q;
-	}
-	
-	public static TypedQuery<LsThing> findFirstLsThingsByItxTypeKindEqualsAndSecondLsThingEquals(String lsType,
-			String lsKind, LsThing secondLsThing) {
-		if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (secondLsThing == null) throw new IllegalArgumentException("The secondLsThing argument is required");
-        
+    }
+
+    public static TypedQuery<LsThing> findFirstLsThingsByItxTypeKindEqualsAndSecondLsThingEquals(String lsType,
+            String lsKind, LsThing secondLsThing) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (secondLsThing == null)
+            throw new IllegalArgumentException("The secondLsThing argument is required");
+
         boolean ignored = true;
-        
+
         EntityManager em = LsThing.entityManager();
-		String query = "SELECT DISTINCT itx.firstLsThing FROM LsThing secondLsThing " +
-				"JOIN secondLsThing.firstLsThings itx with itx.ignored IS NOT :ignored AND itx.lsType = :lsType AND itx.lsKind = :lsKind " +
-				"WHERE secondLsThing.ignored IS NOT :ignored " +
-				"AND secondLsThing = :secondLsThing ";
-		
+        String query = "SELECT DISTINCT itx.firstLsThing FROM LsThing secondLsThing " +
+                "JOIN secondLsThing.firstLsThings itx with itx.ignored IS NOT :ignored AND itx.lsType = :lsType AND itx.lsKind = :lsKind "
+                +
+                "WHERE secondLsThing.ignored IS NOT :ignored " +
+                "AND secondLsThing = :secondLsThing ";
+
         TypedQuery<LsThing> q = em.createQuery(query, LsThing.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
-        q.setParameter("secondLsThing", secondLsThing);        
+        q.setParameter("secondLsThing", secondLsThing);
         q.setParameter("ignored", ignored);
-        
+
         return q;
-	}
-	
-	public static TypedQuery<LsThing> findSecondLsThingsByItxTypeKindEqualsAndFirstLsThingEquals(String lsType,
-			String lsKind, LsThing firstLsThing) {
-		if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (firstLsThing == null) throw new IllegalArgumentException("The firstLsThing argument is required");
-        
+    }
+
+    public static TypedQuery<LsThing> findSecondLsThingsByItxTypeKindEqualsAndFirstLsThingEquals(String lsType,
+            String lsKind, LsThing firstLsThing) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (firstLsThing == null)
+            throw new IllegalArgumentException("The firstLsThing argument is required");
+
         boolean ignored = true;
-        
+
         EntityManager em = LsThing.entityManager();
-		String query = "SELECT DISTINCT itx.secondLsThing FROM LsThing firstLsThing " +
-				"JOIN firstLsThing.secondLsThings itx with itx.ignored IS NOT :ignored AND itx.lsType = :lsType AND itx.lsKind = :lsKind " +
-				"WHERE firstLsThing.ignored IS NOT :ignored " +
-				"AND firstLsThing = :firstLsThing ";
-		
+        String query = "SELECT DISTINCT itx.secondLsThing FROM LsThing firstLsThing " +
+                "JOIN firstLsThing.secondLsThings itx with itx.ignored IS NOT :ignored AND itx.lsType = :lsType AND itx.lsKind = :lsKind "
+                +
+                "WHERE firstLsThing.ignored IS NOT :ignored " +
+                "AND firstLsThing = :firstLsThing ";
+
         TypedQuery<LsThing> q = em.createQuery(query, LsThing.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
-        q.setParameter("firstLsThing", firstLsThing);        
+        q.setParameter("firstLsThing", firstLsThing);
         q.setParameter("ignored", ignored);
-        
+
         return q;
-	}
-	
-	public static TypedQuery<LsThing> findFirstLsThingsByItxTypeKindEqualsAndSecondLsThingEqualsAndOrderEquals(String lsType,
-			String lsKind, LsThing secondLsThing, int order) {
-		if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (secondLsThing == null) throw new IllegalArgumentException("The secondLsThing argument is required");
-        
+    }
+
+    public static TypedQuery<LsThing> findFirstLsThingsByItxTypeKindEqualsAndSecondLsThingEqualsAndOrderEquals(
+            String lsType,
+            String lsKind, LsThing secondLsThing, int order) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (secondLsThing == null)
+            throw new IllegalArgumentException("The secondLsThing argument is required");
+
         boolean ignored = true;
-        
+
         EntityManager em = LsThing.entityManager();
-		String query = "SELECT DISTINCT itx.firstLsThing FROM LsThing secondLsThing " +
-				"JOIN secondLsThing.firstLsThings itx with itx.ignored IS NOT :ignored AND itx.lsType = :lsType AND itx.lsKind = :lsKind " +
-				"JOIN itx.lsStates itxstate JOIN itxstate.lsValues itxvalue WITH itxvalue.lsKind = 'order' " +
-				"WHERE secondLsThing.ignored IS NOT :ignored " +
-				"AND itxvalue.numericValue = :order " +
-				"AND secondLsThing = :secondLsThing ";
-		
+        String query = "SELECT DISTINCT itx.firstLsThing FROM LsThing secondLsThing " +
+                "JOIN secondLsThing.firstLsThings itx with itx.ignored IS NOT :ignored AND itx.lsType = :lsType AND itx.lsKind = :lsKind "
+                +
+                "JOIN itx.lsStates itxstate JOIN itxstate.lsValues itxvalue WITH itxvalue.lsKind = 'order' " +
+                "WHERE secondLsThing.ignored IS NOT :ignored " +
+                "AND itxvalue.numericValue = :order " +
+                "AND secondLsThing = :secondLsThing ";
+
         TypedQuery<LsThing> q = em.createQuery(query, LsThing.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         q.setParameter("order", order);
-        q.setParameter("secondLsThing", secondLsThing);        
+        q.setParameter("secondLsThing", secondLsThing);
         q.setParameter("ignored", ignored);
-        
+
         return q;
-	}
-	
-	public static TypedQuery<LsThing> findSecondLsThingsByItxTypeKindEqualsAndFirstLsThingEqualsAndOrderEquals(String lsType,
-			String lsKind, LsThing firstLsThing, int order) {
-		if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (firstLsThing == null) throw new IllegalArgumentException("The firstLsThing argument is required");
-        
+    }
+
+    public static TypedQuery<LsThing> findSecondLsThingsByItxTypeKindEqualsAndFirstLsThingEqualsAndOrderEquals(
+            String lsType,
+            String lsKind, LsThing firstLsThing, int order) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (firstLsThing == null)
+            throw new IllegalArgumentException("The firstLsThing argument is required");
+
         boolean ignored = true;
-        
+
         EntityManager em = LsThing.entityManager();
-		String query = "SELECT DISTINCT itx.secondLsThing FROM LsThing firstLsThing " +
-				"JOIN firstLsThing.secondLsThings itx with itx.ignored IS NOT :ignored AND itx.lsType = :lsType AND itx.lsKind = :lsKind " +
-				"JOIN itx.lsStates itxstate JOIN itxstate.lsValues itxvalue WITH itxvalue.lsKind = 'order' " +
-				"WHERE firstLsThing.ignored IS NOT :ignored " +
-				"AND itxvalue.numericValue = :order " +
-				"AND firstLsThing = :firstLsThing ";
-		
+        String query = "SELECT DISTINCT itx.secondLsThing FROM LsThing firstLsThing " +
+                "JOIN firstLsThing.secondLsThings itx with itx.ignored IS NOT :ignored AND itx.lsType = :lsType AND itx.lsKind = :lsKind "
+                +
+                "JOIN itx.lsStates itxstate JOIN itxstate.lsValues itxvalue WITH itxvalue.lsKind = 'order' " +
+                "WHERE firstLsThing.ignored IS NOT :ignored " +
+                "AND itxvalue.numericValue = :order " +
+                "AND firstLsThing = :firstLsThing ";
+
         TypedQuery<LsThing> q = em.createQuery(query, LsThing.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         q.setParameter("order", order);
-        q.setParameter("firstLsThing", firstLsThing);        
+        q.setParameter("firstLsThing", firstLsThing);
         q.setParameter("ignored", ignored);
-        
+
         return q;
-	}
-	
-	public static com.labsynch.labseer.domain.LsThing update(com.labsynch.labseer.domain.LsThing lsThing) throws StaleObjectStateException {
+    }
+
+    public static com.labsynch.labseer.domain.LsThing update(com.labsynch.labseer.domain.LsThing lsThing)
+            throws StaleObjectStateException {
         LsThing updatedLsThing = LsThing.findLsThing(lsThing.getId());
-        if (lsThing.getVersion() == null){
-        	logger.warn("LsThing with id: "+lsThing.getId().toString()+" passed in with no version - skipping update");
-        	return updatedLsThing;
+        if (lsThing.getVersion() == null) {
+            logger.warn(
+                    "LsThing with id: " + lsThing.getId().toString() + " passed in with no version - skipping update");
+            return updatedLsThing;
         }
-        if (!lsThing.getVersion().equals(updatedLsThing.getVersion())){
-            logger.debug("incoming version: "+lsThing.getVersion()+" existing version: "+updatedLsThing.getVersion());
-        	throw new StaleObjectStateException("LsThing", lsThing.getId());
+        if (!lsThing.getVersion().equals(updatedLsThing.getVersion())) {
+            logger.debug(
+                    "incoming version: " + lsThing.getVersion() + " existing version: " + updatedLsThing.getVersion());
+            throw new StaleObjectStateException("LsThing", lsThing.getId());
         }
         updatedLsThing.setRecordedBy(lsThing.getRecordedBy());
         updatedLsThing.setRecordedDate(lsThing.getRecordedDate());
@@ -749,8 +839,8 @@ public static com.labsynch.labseer.domain.LsThing update(com.labsynch.labseer.do
         updatedLsThing.merge();
         return updatedLsThing;
     }
-	
-	public static com.labsynch.labseer.domain.LsThing updateNoMerge(com.labsynch.labseer.domain.LsThing lsThing) {
+
+    public static com.labsynch.labseer.domain.LsThing updateNoMerge(com.labsynch.labseer.domain.LsThing lsThing) {
         LsThing updatedLsThing = LsThing.findLsThing(lsThing.getId());
         updatedLsThing.setRecordedBy(lsThing.getRecordedBy());
         updatedLsThing.setRecordedDate(lsThing.getRecordedDate());
@@ -780,206 +870,234 @@ public static com.labsynch.labseer.domain.LsThing updateNoMerge(com.labsynch.lab
         return updatedLsThing;
     }
 
-	public static TypedQuery<LsThing> findFirstLsThingsByItxTypeEqualsAndSecondLsThingEquals(
-			String lsType, LsThing secondLsThing) {
-		if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (secondLsThing == null) throw new IllegalArgumentException("The secondLsThing argument is required");
-        
+    public static TypedQuery<LsThing> findFirstLsThingsByItxTypeEqualsAndSecondLsThingEquals(
+            String lsType, LsThing secondLsThing) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (secondLsThing == null)
+            throw new IllegalArgumentException("The secondLsThing argument is required");
+
         boolean ignored = true;
-        
+
         EntityManager em = LsThing.entityManager();
-		String query = "SELECT DISTINCT itx.firstLsThing FROM LsThing secondLsThing " +
-				"JOIN secondLsThing.firstLsThings itx with itx.ignored IS NOT :ignored AND itx.lsType = :lsType " +
-				"WHERE secondLsThing.ignored IS NOT :ignored " +
-				"AND secondLsThing = :secondLsThing ";
-		
+        String query = "SELECT DISTINCT itx.firstLsThing FROM LsThing secondLsThing " +
+                "JOIN secondLsThing.firstLsThings itx with itx.ignored IS NOT :ignored AND itx.lsType = :lsType " +
+                "WHERE secondLsThing.ignored IS NOT :ignored " +
+                "AND secondLsThing = :secondLsThing ";
+
         TypedQuery<LsThing> q = em.createQuery(query, LsThing.class);
         q.setParameter("lsType", lsType);
-        q.setParameter("secondLsThing", secondLsThing);        
+        q.setParameter("secondLsThing", secondLsThing);
         q.setParameter("ignored", ignored);
-        
+
         return q;
-	}
-
-	public LsThingLabel pickBestCorpName() {
-		Collection<LsThingLabel> labels = this.getLsLabels();
-		if (labels.isEmpty()) return null;
-		Collection<LsThingLabel> corpNames = new HashSet<LsThingLabel>();
-		for (LsThingLabel label : labels){
-			if (label.getLsType().equals("corpName")) corpNames.add(label);
-		}
-		Collection<LsThingLabel> preferredCorpNameLabels = new HashSet<LsThingLabel>();
-		for (LsThingLabel label : corpNames){
-			if (label.isPreferred()) preferredCorpNameLabels.add(label);
-		}
-		if (!preferredCorpNameLabels.isEmpty()){
-			LsThingLabel bestLabel = preferredCorpNameLabels.iterator().next();
-			for (LsThingLabel preferredLabel : preferredCorpNameLabels){
-				if (preferredLabel.getRecordedDate().compareTo(bestLabel.getRecordedDate()) > 0) bestLabel = preferredLabel;
-			}
-			return bestLabel;
-		}else if (!corpNames.isEmpty()){
-			LsThingLabel bestLabel = corpNames.iterator().next();
-			for (LsThingLabel preferredLabel : corpNames){
-				if (preferredLabel.getRecordedDate().compareTo(bestLabel.getRecordedDate()) > 0) bestLabel = preferredLabel;
-			}
-			return bestLabel;
-		}else{
-			return null;
-		}
-	}
-	
-	public LsThingLabel pickBestName() {
-		Collection<LsThingLabel> labels = this.getLsLabels();
-		if (labels.isEmpty()) return null;
-		Collection<LsThingLabel> names = new HashSet<LsThingLabel>();
-		for (LsThingLabel label : labels){
-			if (label.getLsType().equals("name")) names.add(label);
-		}
-		Collection<LsThingLabel> preferredNameLabels = new HashSet<LsThingLabel>();
-		for (LsThingLabel label : names){
-			if (label.isPreferred()) preferredNameLabels.add(label);
-		}
-		if (!preferredNameLabels.isEmpty()){
-			LsThingLabel bestLabel = preferredNameLabels.iterator().next();
-			for (LsThingLabel preferredLabel : preferredNameLabels){
-				if (preferredLabel.getRecordedDate().compareTo(bestLabel.getRecordedDate()) > 0) bestLabel = preferredLabel;
-			}
-			return bestLabel;
-		}else if (!names.isEmpty()){
-			LsThingLabel bestLabel = names.iterator().next();
-			for (LsThingLabel preferredLabel : names){
-				if (preferredLabel.getRecordedDate().compareTo(bestLabel.getRecordedDate()) > 0) bestLabel = preferredLabel;
-			}
-			return bestLabel;
-		}else{
-			return null;
-		}
-	}
-	
-	public static Collection<LsThing> findLsThingsByCodeNamesIn(List<String> codeNames){
-		EntityManager em = LsThing.entityManager();
-		String query = "SELECT DISTINCT lsThing FROM LsThing lsThing " +
-				"WHERE lsThing.ignored IS NOT :ignored AND ";		
-		TypedQuery<LsThing> q = (TypedQuery<LsThing>) SimpleUtil.addHqlInClause(em, query, "lsThing.codeName", codeNames);
-		q.setParameter("ignored", true);
-		return q.getResultList();
-		}
-	
-	public static TypedQuery<LsThing> findLsThingByPreferredLabelText(String thingType,
-			String thingKind, String labelType, String labelKind,
-			String labelText) {
-		if (thingType == null || thingType.length() == 0) throw new IllegalArgumentException("The thingType argument is required");
-        if (thingKind == null || thingKind.length() == 0) throw new IllegalArgumentException("The thingKind argument is required");
-        if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-        if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        
+    }
+
+    public LsThingLabel pickBestCorpName() {
+        Collection<LsThingLabel> labels = this.getLsLabels();
+        if (labels.isEmpty())
+            return null;
+        Collection<LsThingLabel> corpNames = new HashSet<LsThingLabel>();
+        for (LsThingLabel label : labels) {
+            if (label.getLsType().equals("corpName"))
+                corpNames.add(label);
+        }
+        Collection<LsThingLabel> preferredCorpNameLabels = new HashSet<LsThingLabel>();
+        for (LsThingLabel label : corpNames) {
+            if (label.isPreferred())
+                preferredCorpNameLabels.add(label);
+        }
+        if (!preferredCorpNameLabels.isEmpty()) {
+            LsThingLabel bestLabel = preferredCorpNameLabels.iterator().next();
+            for (LsThingLabel preferredLabel : preferredCorpNameLabels) {
+                if (preferredLabel.getRecordedDate().compareTo(bestLabel.getRecordedDate()) > 0)
+                    bestLabel = preferredLabel;
+            }
+            return bestLabel;
+        } else if (!corpNames.isEmpty()) {
+            LsThingLabel bestLabel = corpNames.iterator().next();
+            for (LsThingLabel preferredLabel : corpNames) {
+                if (preferredLabel.getRecordedDate().compareTo(bestLabel.getRecordedDate()) > 0)
+                    bestLabel = preferredLabel;
+            }
+            return bestLabel;
+        } else {
+            return null;
+        }
+    }
+
+    public LsThingLabel pickBestName() {
+        Collection<LsThingLabel> labels = this.getLsLabels();
+        if (labels.isEmpty())
+            return null;
+        Collection<LsThingLabel> names = new HashSet<LsThingLabel>();
+        for (LsThingLabel label : labels) {
+            if (label.getLsType().equals("name"))
+                names.add(label);
+        }
+        Collection<LsThingLabel> preferredNameLabels = new HashSet<LsThingLabel>();
+        for (LsThingLabel label : names) {
+            if (label.isPreferred())
+                preferredNameLabels.add(label);
+        }
+        if (!preferredNameLabels.isEmpty()) {
+            LsThingLabel bestLabel = preferredNameLabels.iterator().next();
+            for (LsThingLabel preferredLabel : preferredNameLabels) {
+                if (preferredLabel.getRecordedDate().compareTo(bestLabel.getRecordedDate()) > 0)
+                    bestLabel = preferredLabel;
+            }
+            return bestLabel;
+        } else if (!names.isEmpty()) {
+            LsThingLabel bestLabel = names.iterator().next();
+            for (LsThingLabel preferredLabel : names) {
+                if (preferredLabel.getRecordedDate().compareTo(bestLabel.getRecordedDate()) > 0)
+                    bestLabel = preferredLabel;
+            }
+            return bestLabel;
+        } else {
+            return null;
+        }
+    }
+
+    public static Collection<LsThing> findLsThingsByCodeNamesIn(List<String> codeNames) {
+        EntityManager em = LsThing.entityManager();
+        String query = "SELECT DISTINCT lsThing FROM LsThing lsThing " +
+                "WHERE lsThing.ignored IS NOT :ignored AND ";
+        TypedQuery<LsThing> q = (TypedQuery<LsThing>) SimpleUtil.addHqlInClause(em, query, "lsThing.codeName",
+                codeNames);
+        q.setParameter("ignored", true);
+        return q.getResultList();
+    }
+
+    public static TypedQuery<LsThing> findLsThingByPreferredLabelText(String thingType,
+            String thingKind, String labelType, String labelKind,
+            String labelText) {
+        if (thingType == null || thingType.length() == 0)
+            throw new IllegalArgumentException("The thingType argument is required");
+        if (thingKind == null || thingKind.length() == 0)
+            throw new IllegalArgumentException("The thingKind argument is required");
+        if (labelType == null || labelType.length() == 0)
+            throw new IllegalArgumentException("The labelType argument is required");
+        if (labelKind == null || labelKind.length() == 0)
+            throw new IllegalArgumentException("The labelKind argument is required");
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
+
         boolean ignored = true;
         boolean preferred = true;
 
         EntityManager em = LsThing.entityManager();
-		String query = "SELECT DISTINCT o FROM LsThing o " +
-				"JOIN o.lsLabels ll " +
-				"WHERE o.ignored IS NOT :ignored " +
-				"AND o.lsType = :thingType " +
-				"AND o.lsKind = :thingKind " +
-				"AND ll.ignored IS NOT :ignored AND ll.lsType = :labelType " +
-				"AND ll.lsKind = :labelKind AND ll.labelText = :labelText " +
-				"AND ll.preferred = :preferred";
-        
+        String query = "SELECT DISTINCT o FROM LsThing o " +
+                "JOIN o.lsLabels ll " +
+                "WHERE o.ignored IS NOT :ignored " +
+                "AND o.lsType = :thingType " +
+                "AND o.lsKind = :thingKind " +
+                "AND ll.ignored IS NOT :ignored AND ll.lsType = :labelType " +
+                "AND ll.lsKind = :labelKind AND ll.labelText = :labelText " +
+                "AND ll.preferred = :preferred";
+
         TypedQuery<LsThing> q = em.createQuery(query, LsThing.class);
         q.setParameter("thingType", thingType);
         q.setParameter("thingKind", thingKind);
-        q.setParameter("labelType", labelType);        
+        q.setParameter("labelType", labelType);
         q.setParameter("labelKind", labelKind);
         q.setParameter("labelText", labelText);
         q.setParameter("ignored", ignored);
         q.setParameter("preferred", preferred);
-        
+
         return q;
-	
-	}
-	
-	public static TypedQuery<LsThing> findAllLsThingByPreferredLabelText(String thingType,
-			String thingKind, String labelType, String labelKind,
-			String labelText) {
-		if (thingType == null || thingType.length() == 0) throw new IllegalArgumentException("The thingType argument is required");
-        if (thingKind == null || thingKind.length() == 0) throw new IllegalArgumentException("The thingKind argument is required");
-        if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-        if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        
+
+    }
+
+    public static TypedQuery<LsThing> findAllLsThingByPreferredLabelText(String thingType,
+            String thingKind, String labelType, String labelKind,
+            String labelText) {
+        if (thingType == null || thingType.length() == 0)
+            throw new IllegalArgumentException("The thingType argument is required");
+        if (thingKind == null || thingKind.length() == 0)
+            throw new IllegalArgumentException("The thingKind argument is required");
+        if (labelType == null || labelType.length() == 0)
+            throw new IllegalArgumentException("The labelType argument is required");
+        if (labelKind == null || labelKind.length() == 0)
+            throw new IllegalArgumentException("The labelKind argument is required");
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
+
         boolean ignored = true;
         boolean deleted = true;
         boolean preferred = true;
 
         EntityManager em = LsThing.entityManager();
-		String query = "SELECT DISTINCT o FROM LsThing o " +
-				"JOIN o.lsLabels ll " +
-				"WHERE o.deleted IS NOT :deleted " +
-				"AND o.lsType = :thingType " +
-				"AND o.lsKind = :thingKind " +
-				"AND ll.ignored IS NOT :ignored AND ll.lsType = :labelType " +
-				"AND ll.lsKind = :labelKind AND ll.labelText = :labelText " +
-				"AND ll.preferred = :preferred";
-        
+        String query = "SELECT DISTINCT o FROM LsThing o " +
+                "JOIN o.lsLabels ll " +
+                "WHERE o.deleted IS NOT :deleted " +
+                "AND o.lsType = :thingType " +
+                "AND o.lsKind = :thingKind " +
+                "AND ll.ignored IS NOT :ignored AND ll.lsType = :labelType " +
+                "AND ll.lsKind = :labelKind AND ll.labelText = :labelText " +
+                "AND ll.preferred = :preferred";
+
         TypedQuery<LsThing> q = em.createQuery(query, LsThing.class);
         q.setParameter("thingType", thingType);
         q.setParameter("thingKind", thingKind);
-        q.setParameter("labelType", labelType);        
+        q.setParameter("labelType", labelType);
         q.setParameter("labelKind", labelKind);
         q.setParameter("labelText", labelText);
         q.setParameter("ignored", ignored);
         q.setParameter("deleted", deleted);
         q.setParameter("preferred", preferred);
-        
+
         return q;
-	
-	}
-
-	public static TypedQuery<LsThing> findLsThingByAllLabelText(String thingType,
-			String thingKind, String labelType, String labelKind,
-			String labelText) {
-		if (thingType == null || thingType.length() == 0) throw new IllegalArgumentException("The thingType argument is required");
-        if (thingKind == null || thingKind.length() == 0) throw new IllegalArgumentException("The thingKind argument is required");
-        if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-        if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        
+
+    }
+
+    public static TypedQuery<LsThing> findLsThingByAllLabelText(String thingType,
+            String thingKind, String labelType, String labelKind,
+            String labelText) {
+        if (thingType == null || thingType.length() == 0)
+            throw new IllegalArgumentException("The thingType argument is required");
+        if (thingKind == null || thingKind.length() == 0)
+            throw new IllegalArgumentException("The thingKind argument is required");
+        if (labelType == null || labelType.length() == 0)
+            throw new IllegalArgumentException("The labelType argument is required");
+        if (labelKind == null || labelKind.length() == 0)
+            throw new IllegalArgumentException("The labelKind argument is required");
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
+
         EntityManager em = LsThing.entityManager();
-		String query = "SELECT DISTINCT o FROM LsThing o " +
-				"JOIN o.lsLabels ll " +
-				"WHERE o.deleted IS NOT :deleted " + 
-				"AND o.lsType = :thingType " +
-				"AND o.lsKind = :thingKind " +
-				"AND ll.lsType = :labelType " +
-				"AND ll.lsKind = :labelKind AND ll.labelText = :labelText ";
-        
+        String query = "SELECT DISTINCT o FROM LsThing o " +
+                "JOIN o.lsLabels ll " +
+                "WHERE o.deleted IS NOT :deleted " +
+                "AND o.lsType = :thingType " +
+                "AND o.lsKind = :thingKind " +
+                "AND ll.lsType = :labelType " +
+                "AND ll.lsKind = :labelKind AND ll.labelText = :labelText ";
+
         TypedQuery<LsThing> q = em.createQuery(query, LsThing.class);
         q.setParameter("thingType", thingType);
         q.setParameter("thingKind", thingKind);
-        q.setParameter("labelType", labelType);        
+        q.setParameter("labelType", labelType);
         q.setParameter("labelKind", labelKind);
         q.setParameter("labelText", labelText);
         q.setParameter("deleted", true);
-        
+
         return q;
-	
-	}
 
+    }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsStates", "lsLabels", "lsTags", "firstLsThings", "secondLsThings");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsStates",
+            "lsLabels", "lsTags", "firstLsThings", "secondLsThings");
 
-	public static long countLsThings() {
+    public static long countLsThings() {
         return entityManager().createQuery("SELECT COUNT(o) FROM LsThing o", Long.class).getSingleResult();
     }
 
-	public static List<LsThing> findAllLsThings() {
+    public static List<LsThing> findAllLsThings() {
         return entityManager().createQuery("SELECT o FROM LsThing o", LsThing.class).getResultList();
     }
 
-	public static List<LsThing> findAllLsThings(String sortFieldName, String sortOrder) {
+    public static List<LsThing> findAllLsThings(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LsThing o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -990,16 +1108,19 @@ public static List<LsThing> findAllLsThings(String sortFieldName, String sortOrd
         return entityManager().createQuery(jpaQuery, LsThing.class).getResultList();
     }
 
-	public static LsThing findLsThing(Long id) {
-        if (id == null) return null;
+    public static LsThing findLsThing(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(LsThing.class, id);
     }
 
-	public static List<LsThing> findLsThingEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsThing o", LsThing.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<LsThing> findLsThingEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsThing o", LsThing.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<LsThing> findLsThingEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<LsThing> findLsThingEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM LsThing o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -1007,41 +1128,46 @@ public static List<LsThing> findLsThingEntries(int firstResult, int maxResults,
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, LsThing.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, LsThing.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public LsThing merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         LsThing merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public static LsThing fromJsonToLsThing(String json) {
+    public static LsThing fromJsonToLsThing(String json) {
         return new JSONDeserializer<LsThing>()
-        .use(null, LsThing.class).deserialize(json);
+                .use(null, LsThing.class).deserialize(json);
     }
 
-	public static Collection<LsThing> fromJsonArrayToLsThings(String json) {
+    public static Collection<LsThing> fromJsonArrayToLsThings(String json) {
         return new JSONDeserializer<List<LsThing>>()
-        .use("values", LsThing.class).deserialize(json);
+                .use("values", LsThing.class).deserialize(json);
     }
 
-	public String toString() {
-        return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).setExcludeFieldNames("lsTags", "lsStates", "lsLabels").toString();
+    public String toString() {
+        return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+                .setExcludeFieldNames("lsTags", "lsStates", "lsLabels").toString();
     }
 
-	public static Long countFindLsThingsByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static Long countFindLsThingsByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = LsThing.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE o.codeName = :codeName", Long.class);
         q.setParameter("codeName", codeName);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsThingsByCodeNameLike(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static Long countFindLsThingsByCodeNameLike(String codeName) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         codeName = codeName.replace('*', '%');
         if (codeName.charAt(0) != '%') {
             codeName = "%" + codeName;
@@ -1050,21 +1176,24 @@ public static Long countFindLsThingsByCodeNameLike(String codeName) {
             codeName = codeName + "%";
         }
         EntityManager em = LsThing.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)",
+                Long.class);
         q.setParameter("codeName", codeName);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsThingsByLsKindEquals(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static Long countFindLsThingsByLsKindEquals(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = LsThing.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE o.lsKind = :lsKind", Long.class);
         q.setParameter("lsKind", lsKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsThingsByLsKindLike(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static Long countFindLsThingsByLsKindLike(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         lsKind = lsKind.replace('*', '%');
         if (lsKind.charAt(0) != '%') {
             lsKind = "%" + lsKind;
@@ -1073,47 +1202,57 @@ public static Long countFindLsThingsByLsKindLike(String lsKind) {
             lsKind = lsKind + "%";
         }
         EntityManager em = LsThing.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)",
+                Long.class);
         q.setParameter("lsKind", lsKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsThingsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static Long countFindLsThingsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = LsThing.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE o.lsTransaction = :lsTransaction",
+                Long.class);
         q.setParameter("lsTransaction", lsTransaction);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsThingsByLsTypeAndKindEquals(String lsTypeAndKind) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+    public static Long countFindLsThingsByLsTypeAndKindEquals(String lsTypeAndKind) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = LsThing.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE o.lsTypeAndKind = :lsTypeAndKind",
+                Long.class);
         q.setParameter("lsTypeAndKind", lsTypeAndKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsThingsByLsTypeEquals(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+    public static Long countFindLsThingsByLsTypeEquals(String lsType) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = LsThing.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE o.lsType = :lsType", Long.class);
         q.setParameter("lsType", lsType);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsThingsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static Long countFindLsThingsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = LsThing.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM LsThing AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsThingsByRecordedByLike(String recordedBy) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+    public static Long countFindLsThingsByRecordedByLike(String recordedBy) {
+        if (recordedBy == null || recordedBy.length() == 0)
+            throw new IllegalArgumentException("The recordedBy argument is required");
         recordedBy = recordedBy.replace('*', '%');
         if (recordedBy.charAt(0) != '%') {
             recordedBy = "%" + recordedBy;
@@ -1122,37 +1261,46 @@ public static Long countFindLsThingsByRecordedByLike(String recordedBy) {
             recordedBy = recordedBy + "%";
         }
         EntityManager em = LsThing.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM LsThing AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)", Long.class);
         q.setParameter("recordedBy", recordedBy);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsThingsByRecordedDateGreaterThan(Date recordedDate) {
-        if (recordedDate == null) throw new IllegalArgumentException("The recordedDate argument is required");
+    public static Long countFindLsThingsByRecordedDateGreaterThan(Date recordedDate) {
+        if (recordedDate == null)
+            throw new IllegalArgumentException("The recordedDate argument is required");
         EntityManager em = LsThing.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE o.recordedDate > :recordedDate", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE o.recordedDate > :recordedDate",
+                Long.class);
         q.setParameter("recordedDate", recordedDate);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsThingsByRecordedDateLessThan(Date recordedDate) {
-        if (recordedDate == null) throw new IllegalArgumentException("The recordedDate argument is required");
+    public static Long countFindLsThingsByRecordedDateLessThan(Date recordedDate) {
+        if (recordedDate == null)
+            throw new IllegalArgumentException("The recordedDate argument is required");
         EntityManager em = LsThing.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE o.recordedDate < :recordedDate", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThing AS o WHERE o.recordedDate < :recordedDate",
+                Long.class);
         q.setParameter("recordedDate", recordedDate);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<LsThing> findLsThingsByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static TypedQuery<LsThing> findLsThingsByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = LsThing.entityManager();
-        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.codeName = :codeName", LsThing.class);
+        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.codeName = :codeName",
+                LsThing.class);
         q.setParameter("codeName", codeName);
         return q;
     }
 
-	public static TypedQuery<LsThing> findLsThingsByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static TypedQuery<LsThing> findLsThingsByCodeNameEquals(String codeName, String sortFieldName,
+            String sortOrder) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = LsThing.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE o.codeName = :codeName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -1166,8 +1314,9 @@ public static TypedQuery<LsThing> findLsThingsByCodeNameEquals(String codeName,
         return q;
     }
 
-	public static TypedQuery<LsThing> findLsThingsByCodeNameLike(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static TypedQuery<LsThing> findLsThingsByCodeNameLike(String codeName) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         codeName = codeName.replace('*', '%');
         if (codeName.charAt(0) != '%') {
             codeName = "%" + codeName;
@@ -1176,13 +1325,16 @@ public static TypedQuery<LsThing> findLsThingsByCodeNameLike(String codeName) {
             codeName = codeName + "%";
         }
         EntityManager em = LsThing.entityManager();
-        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)", LsThing.class);
+        TypedQuery<LsThing> q = em
+                .createQuery("SELECT o FROM LsThing AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)", LsThing.class);
         q.setParameter("codeName", codeName);
         return q;
     }
 
-	public static TypedQuery<LsThing> findLsThingsByCodeNameLike(String codeName, String sortFieldName, String sortOrder) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static TypedQuery<LsThing> findLsThingsByCodeNameLike(String codeName, String sortFieldName,
+            String sortOrder) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         codeName = codeName.replace('*', '%');
         if (codeName.charAt(0) != '%') {
             codeName = "%" + codeName;
@@ -1191,7 +1343,8 @@ public static TypedQuery<LsThing> findLsThingsByCodeNameLike(String codeName, St
             codeName = codeName + "%";
         }
         EntityManager em = LsThing.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LsThing AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -1203,16 +1356,19 @@ public static TypedQuery<LsThing> findLsThingsByCodeNameLike(String codeName, St
         return q;
     }
 
-	public static TypedQuery<LsThing> findLsThingsByLsKindEquals(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<LsThing> findLsThingsByLsKindEquals(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = LsThing.entityManager();
         TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.lsKind = :lsKind", LsThing.class);
         q.setParameter("lsKind", lsKind);
         return q;
     }
 
-	public static TypedQuery<LsThing> findLsThingsByLsKindEquals(String lsKind, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<LsThing> findLsThingsByLsKindEquals(String lsKind, String sortFieldName,
+            String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = LsThing.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE o.lsKind = :lsKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -1226,8 +1382,9 @@ public static TypedQuery<LsThing> findLsThingsByLsKindEquals(String lsKind, Stri
         return q;
     }
 
-	public static TypedQuery<LsThing> findLsThingsByLsKindLike(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<LsThing> findLsThingsByLsKindLike(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         lsKind = lsKind.replace('*', '%');
         if (lsKind.charAt(0) != '%') {
             lsKind = "%" + lsKind;
@@ -1236,13 +1393,15 @@ public static TypedQuery<LsThing> findLsThingsByLsKindLike(String lsKind) {
             lsKind = lsKind + "%";
         }
         EntityManager em = LsThing.entityManager();
-        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)", LsThing.class);
+        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)",
+                LsThing.class);
         q.setParameter("lsKind", lsKind);
         return q;
     }
 
-	public static TypedQuery<LsThing> findLsThingsByLsKindLike(String lsKind, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<LsThing> findLsThingsByLsKindLike(String lsKind, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         lsKind = lsKind.replace('*', '%');
         if (lsKind.charAt(0) != '%') {
             lsKind = "%" + lsKind;
@@ -1251,7 +1410,8 @@ public static TypedQuery<LsThing> findLsThingsByLsKindLike(String lsKind, String
             lsKind = lsKind + "%";
         }
         EntityManager em = LsThing.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LsThing AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -1263,18 +1423,23 @@ public static TypedQuery<LsThing> findLsThingsByLsKindLike(String lsKind, String
         return q;
     }
 
-	public static TypedQuery<LsThing> findLsThingsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<LsThing> findLsThingsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = LsThing.entityManager();
-        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.lsTransaction = :lsTransaction", LsThing.class);
+        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.lsTransaction = :lsTransaction",
+                LsThing.class);
         q.setParameter("lsTransaction", lsTransaction);
         return q;
     }
 
-	public static TypedQuery<LsThing> findLsThingsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<LsThing> findLsThingsByLsTransactionEquals(Long lsTransaction, String sortFieldName,
+            String sortOrder) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = LsThing.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE o.lsTransaction = :lsTransaction");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LsThing AS o WHERE o.lsTransaction = :lsTransaction");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -1286,18 +1451,23 @@ public static TypedQuery<LsThing> findLsThingsByLsTransactionEquals(Long lsTrans
         return q;
     }
 
-	public static TypedQuery<LsThing> findLsThingsByLsTypeAndKindEquals(String lsTypeAndKind) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+    public static TypedQuery<LsThing> findLsThingsByLsTypeAndKindEquals(String lsTypeAndKind) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = LsThing.entityManager();
-        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", LsThing.class);
+        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.lsTypeAndKind = :lsTypeAndKind",
+                LsThing.class);
         q.setParameter("lsTypeAndKind", lsTypeAndKind);
         return q;
     }
 
-	public static TypedQuery<LsThing> findLsThingsByLsTypeAndKindEquals(String lsTypeAndKind, String sortFieldName, String sortOrder) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+    public static TypedQuery<LsThing> findLsThingsByLsTypeAndKindEquals(String lsTypeAndKind, String sortFieldName,
+            String sortOrder) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = LsThing.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE o.lsTypeAndKind = :lsTypeAndKind");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LsThing AS o WHERE o.lsTypeAndKind = :lsTypeAndKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -1309,16 +1479,19 @@ public static TypedQuery<LsThing> findLsThingsByLsTypeAndKindEquals(String lsTyp
         return q;
     }
 
-	public static TypedQuery<LsThing> findLsThingsByLsTypeEquals(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<LsThing> findLsThingsByLsTypeEquals(String lsType) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = LsThing.entityManager();
         TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.lsType = :lsType", LsThing.class);
         q.setParameter("lsType", lsType);
         return q;
     }
 
-	public static TypedQuery<LsThing> findLsThingsByLsTypeEquals(String lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<LsThing> findLsThingsByLsTypeEquals(String lsType, String sortFieldName,
+            String sortOrder) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = LsThing.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE o.lsType = :lsType");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -1332,21 +1505,28 @@ public static TypedQuery<LsThing> findLsThingsByLsTypeEquals(String lsType, Stri
         return q;
     }
 
-	public static TypedQuery<LsThing> findLsThingsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<LsThing> findLsThingsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = LsThing.entityManager();
-        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", LsThing.class);
+        TypedQuery<LsThing> q = em.createQuery(
+                "SELECT o FROM LsThing AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", LsThing.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         return q;
     }
 
-	public static TypedQuery<LsThing> findLsThingsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<LsThing> findLsThingsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind,
+            String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = LsThing.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LsThing AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -1359,8 +1539,9 @@ public static TypedQuery<LsThing> findLsThingsByLsTypeEqualsAndLsKindEquals(Stri
         return q;
     }
 
-	public static TypedQuery<LsThing> findLsThingsByRecordedByLike(String recordedBy) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+    public static TypedQuery<LsThing> findLsThingsByRecordedByLike(String recordedBy) {
+        if (recordedBy == null || recordedBy.length() == 0)
+            throw new IllegalArgumentException("The recordedBy argument is required");
         recordedBy = recordedBy.replace('*', '%');
         if (recordedBy.charAt(0) != '%') {
             recordedBy = "%" + recordedBy;
@@ -1369,13 +1550,16 @@ public static TypedQuery<LsThing> findLsThingsByRecordedByLike(String recordedBy
             recordedBy = recordedBy + "%";
         }
         EntityManager em = LsThing.entityManager();
-        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)", LsThing.class);
+        TypedQuery<LsThing> q = em.createQuery(
+                "SELECT o FROM LsThing AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)", LsThing.class);
         q.setParameter("recordedBy", recordedBy);
         return q;
     }
 
-	public static TypedQuery<LsThing> findLsThingsByRecordedByLike(String recordedBy, String sortFieldName, String sortOrder) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+    public static TypedQuery<LsThing> findLsThingsByRecordedByLike(String recordedBy, String sortFieldName,
+            String sortOrder) {
+        if (recordedBy == null || recordedBy.length() == 0)
+            throw new IllegalArgumentException("The recordedBy argument is required");
         recordedBy = recordedBy.replace('*', '%');
         if (recordedBy.charAt(0) != '%') {
             recordedBy = "%" + recordedBy;
@@ -1384,7 +1568,8 @@ public static TypedQuery<LsThing> findLsThingsByRecordedByLike(String recordedBy
             recordedBy = recordedBy + "%";
         }
         EntityManager em = LsThing.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LsThing AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -1396,18 +1581,23 @@ public static TypedQuery<LsThing> findLsThingsByRecordedByLike(String recordedBy
         return q;
     }
 
-	public static TypedQuery<LsThing> findLsThingsByRecordedDateGreaterThan(Date recordedDate) {
-        if (recordedDate == null) throw new IllegalArgumentException("The recordedDate argument is required");
+    public static TypedQuery<LsThing> findLsThingsByRecordedDateGreaterThan(Date recordedDate) {
+        if (recordedDate == null)
+            throw new IllegalArgumentException("The recordedDate argument is required");
         EntityManager em = LsThing.entityManager();
-        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.recordedDate > :recordedDate", LsThing.class);
+        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.recordedDate > :recordedDate",
+                LsThing.class);
         q.setParameter("recordedDate", recordedDate);
         return q;
     }
 
-	public static TypedQuery<LsThing> findLsThingsByRecordedDateGreaterThan(Date recordedDate, String sortFieldName, String sortOrder) {
-        if (recordedDate == null) throw new IllegalArgumentException("The recordedDate argument is required");
+    public static TypedQuery<LsThing> findLsThingsByRecordedDateGreaterThan(Date recordedDate, String sortFieldName,
+            String sortOrder) {
+        if (recordedDate == null)
+            throw new IllegalArgumentException("The recordedDate argument is required");
         EntityManager em = LsThing.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE o.recordedDate > :recordedDate");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LsThing AS o WHERE o.recordedDate > :recordedDate");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -1419,18 +1609,23 @@ public static TypedQuery<LsThing> findLsThingsByRecordedDateGreaterThan(Date rec
         return q;
     }
 
-	public static TypedQuery<LsThing> findLsThingsByRecordedDateLessThan(Date recordedDate) {
-        if (recordedDate == null) throw new IllegalArgumentException("The recordedDate argument is required");
+    public static TypedQuery<LsThing> findLsThingsByRecordedDateLessThan(Date recordedDate) {
+        if (recordedDate == null)
+            throw new IllegalArgumentException("The recordedDate argument is required");
         EntityManager em = LsThing.entityManager();
-        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.recordedDate < :recordedDate", LsThing.class);
+        TypedQuery<LsThing> q = em.createQuery("SELECT o FROM LsThing AS o WHERE o.recordedDate < :recordedDate",
+                LsThing.class);
         q.setParameter("recordedDate", recordedDate);
         return q;
     }
 
-	public static TypedQuery<LsThing> findLsThingsByRecordedDateLessThan(Date recordedDate, String sortFieldName, String sortOrder) {
-        if (recordedDate == null) throw new IllegalArgumentException("The recordedDate argument is required");
+    public static TypedQuery<LsThing> findLsThingsByRecordedDateLessThan(Date recordedDate, String sortFieldName,
+            String sortOrder) {
+        if (recordedDate == null)
+            throw new IllegalArgumentException("The recordedDate argument is required");
         EntityManager em = LsThing.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThing AS o WHERE o.recordedDate < :recordedDate");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LsThing AS o WHERE o.recordedDate < :recordedDate");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -1442,43 +1637,43 @@ public static TypedQuery<LsThing> findLsThingsByRecordedDateLessThan(Date record
         return q;
     }
 
-	public Set<LsThingState> getLsStates() {
+    public Set<LsThingState> getLsStates() {
         return this.lsStates;
     }
 
-	public void setLsStates(Set<LsThingState> lsStates) {
+    public void setLsStates(Set<LsThingState> lsStates) {
         this.lsStates = lsStates;
     }
 
-	public Set<LsThingLabel> getLsLabels() {
+    public Set<LsThingLabel> getLsLabels() {
         return this.lsLabels;
     }
 
-	public void setLsLabels(Set<LsThingLabel> lsLabels) {
+    public void setLsLabels(Set<LsThingLabel> lsLabels) {
         this.lsLabels = lsLabels;
     }
 
-	public Set<LsTag> getLsTags() {
+    public Set<LsTag> getLsTags() {
         return this.lsTags;
     }
 
-	public void setLsTags(Set<LsTag> lsTags) {
+    public void setLsTags(Set<LsTag> lsTags) {
         this.lsTags = lsTags;
     }
 
-	public Set<ItxLsThingLsThing> getFirstLsThings() {
+    public Set<ItxLsThingLsThing> getFirstLsThings() {
         return this.firstLsThings;
     }
 
-	public void setFirstLsThings(Set<ItxLsThingLsThing> firstLsThings) {
+    public void setFirstLsThings(Set<ItxLsThingLsThing> firstLsThings) {
         this.firstLsThings = firstLsThings;
     }
 
-	public Set<ItxLsThingLsThing> getSecondLsThings() {
+    public Set<ItxLsThingLsThing> getSecondLsThings() {
         return this.secondLsThings;
     }
 
-	public void setSecondLsThings(Set<ItxLsThingLsThing> secondLsThings) {
+    public void setSecondLsThings(Set<ItxLsThingLsThing> secondLsThings) {
         this.secondLsThings = secondLsThings;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingLabel.java b/src/main/java/com/labsynch/labseer/domain/LsThingLabel.java
index 4e4831678..f6c0abd8a 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsThingLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsThingLabel.java
@@ -39,10 +39,10 @@ public class LsThingLabel extends AbstractLabel {
 	private LsThing lsThing;
 
 	private String lsThingTypeAndKind;
-	
-    public LsThingLabel() {
-    }
-    
+
+	public LsThingLabel() {
+	}
+
 	public LsThingLabel(LsThingLabel lsLabel) {
 		super.setLsType(lsLabel.getLsType());
 		super.setLsKind(lsLabel.getLsKind());
@@ -71,17 +71,22 @@ public static LsThingLabel update(LsThingLabel lsLabel) {
 		updatedLsThingLabel.merge();
 		return updatedLsThingLabel;
 	}
-	
-	public static Long countOfLsThingLabelsByLabel(LsThing lsThing, String labelType, String labelKind, String labelText) {
-		if (lsThing == null ) throw new IllegalArgumentException("The lsThing argument is required");
-		if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-		if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");	
-		if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+
+	public static Long countOfLsThingLabelsByLabel(LsThing lsThing, String labelType, String labelKind,
+			String labelText) {
+		if (lsThing == null)
+			throw new IllegalArgumentException("The lsThing argument is required");
+		if (labelType == null || labelType.length() == 0)
+			throw new IllegalArgumentException("The labelType argument is required");
+		if (labelKind == null || labelKind.length() == 0)
+			throw new IllegalArgumentException("The labelKind argument is required");
+		if (labelText == null || labelText.length() == 0)
+			throw new IllegalArgumentException("The labelText argument is required");
 
 		boolean ignored = true;
 
 		EntityManager em = LsThingLabel.entityManager();
-		String query = "SELECT count(DISTINCT o) " 
+		String query = "SELECT count(DISTINCT o) "
 				+ "FROM LsThingLabel AS o "
 				+ "WHERE o.lsThing = :lsThing "
 				+ "AND o.lsType = :labelType  "
@@ -98,19 +103,26 @@ public static Long countOfLsThingLabelsByLabel(LsThing lsThing, String labelType
 		q.setParameter("ignored", ignored);
 		return q.getSingleResult();
 	}
-	
-	public static Long countOfLsThingByName(String thingType, String thingKind, String labelType, String labelKind, String labelText) {
-		if (thingType == null || thingType.length() == 0) throw new IllegalArgumentException("The thingType argument is required");
-		if (thingKind == null || thingKind.length() == 0) throw new IllegalArgumentException("The thingKind argument is required");		
-		if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-		if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");	
-		if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+
+	public static Long countOfLsThingByName(String thingType, String thingKind, String labelType, String labelKind,
+			String labelText) {
+		if (thingType == null || thingType.length() == 0)
+			throw new IllegalArgumentException("The thingType argument is required");
+		if (thingKind == null || thingKind.length() == 0)
+			throw new IllegalArgumentException("The thingKind argument is required");
+		if (labelType == null || labelType.length() == 0)
+			throw new IllegalArgumentException("The labelType argument is required");
+		if (labelKind == null || labelKind.length() == 0)
+			throw new IllegalArgumentException("The labelKind argument is required");
+		if (labelText == null || labelText.length() == 0)
+			throw new IllegalArgumentException("The labelText argument is required");
 
 		boolean ignored = true;
 
 		EntityManager em = LsThingLabel.entityManager();
 		String query = "SELECT count(DISTINCT o) FROM LsThing AS o " +
-				"JOIN o.lsLabels AS ll1 with ll1.ignored IS NOT :ignored AND ll1.labelText = :labelText AND ll1.lsType = :labelType AND ll1.lsKind = :labelKind " +
+				"JOIN o.lsLabels AS ll1 with ll1.ignored IS NOT :ignored AND ll1.labelText = :labelText AND ll1.lsType = :labelType AND ll1.lsKind = :labelKind "
+				+
 				"WHERE o.ignored IS NOT :ignored AND o.lsType = :thingType AND o.lsKind = :thingKind ";
 		logger.debug("sql query " + query);
 		TypedQuery<Long> q = em.createQuery(query, Long.class);
@@ -123,13 +135,19 @@ public static Long countOfLsThingByName(String thingType, String thingKind, Stri
 		q.setParameter("ignored", ignored);
 		return q.getSingleResult();
 	}
-	
-	public static Long countOfLsThingByPreferredName(String thingType, String thingKind, String labelType, String labelKind, String labelText) {
-		if (thingType == null || thingType.length() == 0) throw new IllegalArgumentException("The thingType argument is required");
-		if (thingKind == null || thingKind.length() == 0) throw new IllegalArgumentException("The thingKind argument is required");		
-		if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-		if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");	
-		if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+
+	public static Long countOfLsThingByPreferredName(String thingType, String thingKind, String labelType,
+			String labelKind, String labelText) {
+		if (thingType == null || thingType.length() == 0)
+			throw new IllegalArgumentException("The thingType argument is required");
+		if (thingKind == null || thingKind.length() == 0)
+			throw new IllegalArgumentException("The thingKind argument is required");
+		if (labelType == null || labelType.length() == 0)
+			throw new IllegalArgumentException("The labelType argument is required");
+		if (labelKind == null || labelKind.length() == 0)
+			throw new IllegalArgumentException("The labelKind argument is required");
+		if (labelText == null || labelText.length() == 0)
+			throw new IllegalArgumentException("The labelText argument is required");
 
 		boolean ignored = true;
 		boolean preferred = true;
@@ -152,14 +170,19 @@ public static Long countOfLsThingByPreferredName(String thingType, String thingK
 
 		return q.getSingleResult();
 	}
-	
-	
-	public static Long countOfAllLsThingByPreferredName(String thingType, String thingKind, String labelType, String labelKind, String labelText) {
-		if (thingType == null || thingType.length() == 0) throw new IllegalArgumentException("The thingType argument is required");
-		if (thingKind == null || thingKind.length() == 0) throw new IllegalArgumentException("The thingKind argument is required");		
-		if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-		if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");	
-		if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+
+	public static Long countOfAllLsThingByPreferredName(String thingType, String thingKind, String labelType,
+			String labelKind, String labelText) {
+		if (thingType == null || thingType.length() == 0)
+			throw new IllegalArgumentException("The thingType argument is required");
+		if (thingKind == null || thingKind.length() == 0)
+			throw new IllegalArgumentException("The thingKind argument is required");
+		if (labelType == null || labelType.length() == 0)
+			throw new IllegalArgumentException("The labelType argument is required");
+		if (labelKind == null || labelKind.length() == 0)
+			throw new IllegalArgumentException("The labelKind argument is required");
+		if (labelText == null || labelText.length() == 0)
+			throw new IllegalArgumentException("The labelText argument is required");
 
 		boolean ignored = true;
 		boolean preferred = true;
@@ -183,19 +206,26 @@ public static Long countOfAllLsThingByPreferredName(String thingType, String thi
 
 		return q.getSingleResult();
 	}
-	
-	public static TypedQuery<LsThingLabel> findLsThingName(String thingType, String thingKind, String labelType, String labelKind, String labelText) {
-		if (thingType == null || thingType.length() == 0) throw new IllegalArgumentException("The thingType argument is required");
-		if (thingKind == null || thingKind.length() == 0) throw new IllegalArgumentException("The thingKind argument is required");		
-		if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-		if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");	
-		if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+
+	public static TypedQuery<LsThingLabel> findLsThingName(String thingType, String thingKind, String labelType,
+			String labelKind, String labelText) {
+		if (thingType == null || thingType.length() == 0)
+			throw new IllegalArgumentException("The thingType argument is required");
+		if (thingKind == null || thingKind.length() == 0)
+			throw new IllegalArgumentException("The thingKind argument is required");
+		if (labelType == null || labelType.length() == 0)
+			throw new IllegalArgumentException("The labelType argument is required");
+		if (labelKind == null || labelKind.length() == 0)
+			throw new IllegalArgumentException("The labelKind argument is required");
+		if (labelText == null || labelText.length() == 0)
+			throw new IllegalArgumentException("The labelText argument is required");
 
 		boolean ignored = true;
 
 		EntityManager em = LsThingLabel.entityManager();
 		String query = "SELECT DISTINCT ll2 FROM LsThing AS o " +
-				"JOIN o.lsLabels AS ll1 with ll1.ignored IS NOT :ignored AND ll1.labelText = :labelText AND ll1.lsType = :labelType AND ll1.lsKind = :labelKind " +
+				"JOIN o.lsLabels AS ll1 with ll1.ignored IS NOT :ignored AND ll1.labelText = :labelText AND ll1.lsType = :labelType AND ll1.lsKind = :labelKind "
+				+
 				"JOIN o.lsLabels AS ll2 with ll2.ignored IS NOT :ignored " +
 				"WHERE o.ignored IS NOT :ignored AND o.lsType = :thingType AND o.lsKind = :thingKind ";
 		logger.debug("sql query " + query);
@@ -209,20 +239,27 @@ public static TypedQuery<LsThingLabel> findLsThingName(String thingType, String
 		q.setParameter("ignored", ignored);
 		return q;
 	}
-	
-	public static TypedQuery<LsThingLabel> findLsThingPreferredName(String thingType, String thingKind, String labelType, String labelKind, String labelText) {
-		if (thingType == null || thingType.length() == 0) throw new IllegalArgumentException("The thingType argument is required");
-		if (thingKind == null || thingKind.length() == 0) throw new IllegalArgumentException("The thingKind argument is required");		
-		if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-		if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");	
-		if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+
+	public static TypedQuery<LsThingLabel> findLsThingPreferredName(String thingType, String thingKind,
+			String labelType, String labelKind, String labelText) {
+		if (thingType == null || thingType.length() == 0)
+			throw new IllegalArgumentException("The thingType argument is required");
+		if (thingKind == null || thingKind.length() == 0)
+			throw new IllegalArgumentException("The thingKind argument is required");
+		if (labelType == null || labelType.length() == 0)
+			throw new IllegalArgumentException("The labelType argument is required");
+		if (labelKind == null || labelKind.length() == 0)
+			throw new IllegalArgumentException("The labelKind argument is required");
+		if (labelText == null || labelText.length() == 0)
+			throw new IllegalArgumentException("The labelText argument is required");
 
 		boolean preferred = true;
 		boolean ignored = true;
 
 		EntityManager em = LsThingLabel.entityManager();
 		String query = "SELECT DISTINCT ll2 FROM LsThing AS o " +
-				"JOIN o.lsLabels AS ll1 with ll1.ignored IS NOT :ignored AND ll1.labelText = :labelText AND ll1.lsType = :labelType AND ll1.lsKind = :labelKind " +
+				"JOIN o.lsLabels AS ll1 with ll1.ignored IS NOT :ignored AND ll1.labelText = :labelText AND ll1.lsType = :labelType AND ll1.lsKind = :labelKind "
+				+
 				"JOIN o.lsLabels AS ll2 with ll2.ignored IS NOT :ignored AND ll2.preferred IS :preferred " +
 				"WHERE o.ignored IS NOT :ignored AND o.lsType = :thingType AND o.lsKind = :thingKind ";
 		logger.debug("sql query " + query);
@@ -238,10 +275,14 @@ public static TypedQuery<LsThingLabel> findLsThingPreferredName(String thingType
 		return q;
 	}
 
-	public static TypedQuery<LsThingLabel> findLsThingPreferredName(String thingType, String thingKind, String labelText) {
-		if (thingType == null || thingType.length() == 0) throw new IllegalArgumentException("The thingType argument is required");
-		if (thingKind == null || thingKind.length() == 0) throw new IllegalArgumentException("The thingKind argument is required");		
-		if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+	public static TypedQuery<LsThingLabel> findLsThingPreferredName(String thingType, String thingKind,
+			String labelText) {
+		if (thingType == null || thingType.length() == 0)
+			throw new IllegalArgumentException("The thingType argument is required");
+		if (thingKind == null || thingKind.length() == 0)
+			throw new IllegalArgumentException("The thingKind argument is required");
+		if (labelText == null || labelText.length() == 0)
+			throw new IllegalArgumentException("The labelText argument is required");
 
 		boolean preferred = true;
 		boolean ignored = true;
@@ -261,10 +302,11 @@ public static TypedQuery<LsThingLabel> findLsThingPreferredName(String thingType
 		q.setParameter("ignored", ignored);
 		return q;
 	}
-	
+
 	public static TypedQuery<LsThingLabel> findLsThingPreferredName(String labelText) {
-		if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-		
+		if (labelText == null || labelText.length() == 0)
+			throw new IllegalArgumentException("The labelText argument is required");
+
 		boolean preferred = true;
 		boolean ignored = true;
 
@@ -282,23 +324,31 @@ public static TypedQuery<LsThingLabel> findLsThingPreferredName(String labelText
 		return q;
 	}
 
-	public static TypedQuery<LsThingLabel> findLsThingPreferredName(Long lsThingId, String labelType, String labelKind) {
-		if (lsThingId == null || lsThingId == 0) throw new IllegalArgumentException("The lsThingId argument is required");
-		if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-		if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");
-		
+	public static TypedQuery<LsThingLabel> findLsThingPreferredName(Long lsThingId, String labelType,
+			String labelKind) {
+		if (lsThingId == null || lsThingId == 0)
+			throw new IllegalArgumentException("The lsThingId argument is required");
+		if (labelType == null || labelType.length() == 0)
+			throw new IllegalArgumentException("The labelType argument is required");
+		if (labelKind == null || labelKind.length() == 0)
+			throw new IllegalArgumentException("The labelKind argument is required");
+
 		boolean preferred = true;
 		boolean ignored = true;
 
-		TypedQuery<LsThingLabel> q = findLsThingPreferredName(lsThingId, labelType, labelKind,  preferred,  ignored);
+		TypedQuery<LsThingLabel> q = findLsThingPreferredName(lsThingId, labelType, labelKind, preferred, ignored);
 		return q;
 	}
-	
-	public static TypedQuery<LsThingLabel> findLsThingAllPreferredName(Long lsThingId, String labelType, String labelKind) {
-		if (lsThingId == null || lsThingId == 0) throw new IllegalArgumentException("The lsThingId argument is required");
-		if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-		if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");
-		
+
+	public static TypedQuery<LsThingLabel> findLsThingAllPreferredName(Long lsThingId, String labelType,
+			String labelKind) {
+		if (lsThingId == null || lsThingId == 0)
+			throw new IllegalArgumentException("The lsThingId argument is required");
+		if (labelType == null || labelType.length() == 0)
+			throw new IllegalArgumentException("The labelType argument is required");
+		if (labelKind == null || labelKind.length() == 0)
+			throw new IllegalArgumentException("The labelKind argument is required");
+
 		boolean preferred = true;
 
 		EntityManager em = LsThingLabel.entityManager();
@@ -314,15 +364,18 @@ public static TypedQuery<LsThingLabel> findLsThingAllPreferredName(Long lsThingI
 		q.setParameter("preferred", preferred);
 		return q;
 	}
-	
+
 	public static TypedQuery<LsThingLabel> findLsThingPreferredName(
 			Long lsThingId, String labelType, String labelKind,
 			boolean preferred, boolean ignored) {
-		
-		if (lsThingId == null || lsThingId == 0) throw new IllegalArgumentException("The lsThingId argument is required");
-		if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-		if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");
-		
+
+		if (lsThingId == null || lsThingId == 0)
+			throw new IllegalArgumentException("The lsThingId argument is required");
+		if (labelType == null || labelType.length() == 0)
+			throw new IllegalArgumentException("The labelType argument is required");
+		if (labelKind == null || labelKind.length() == 0)
+			throw new IllegalArgumentException("The labelKind argument is required");
+
 		EntityManager em = LsThingLabel.entityManager();
 		String query = "SELECT DISTINCT o FROM LsThingLabel AS o WHERE o.lsType = :labelType  "
 				+ "AND o.lsKind = :labelKind "
@@ -338,7 +391,6 @@ public static TypedQuery<LsThingLabel> findLsThingPreferredName(
 		return q;
 	}
 
-	
 	public String toJson() {
 		return new JSONSerializer().exclude("*.class").serialize(this);
 	}
@@ -352,15 +404,18 @@ public static String toJsonArray(Collection<LsThingLabel> collection) {
 	}
 
 	public static Collection<LsThingLabel> fromJsonArrayToLsThingLabels(String json) {
-		return new JSONDeserializer<List<LsThingLabel>>().use(null, ArrayList.class).use("values", LsThingLabel.class).deserialize(json);
+		return new JSONDeserializer<List<LsThingLabel>>().use(null, ArrayList.class).use("values", LsThingLabel.class)
+				.deserialize(json);
 	}
 
 	public static Collection<LsThingLabel> fromJsonArrayToLsThingLabels(Reader json) {
-		return new JSONDeserializer<List<LsThingLabel>>().use(null, ArrayList.class).use("values", LsThingLabel.class).deserialize(json);
+		return new JSONDeserializer<List<LsThingLabel>>().use(null, ArrayList.class).use("values", LsThingLabel.class)
+				.deserialize(json);
 	}
 
 	@Transactional
-	public static LsThingLabel saveLsThingLabel(LsTransaction lsTransaction, String recordedBy, LsThing lsThing, String labelType, String labelKind, boolean preferred, String label) {
+	public static LsThingLabel saveLsThingLabel(LsTransaction lsTransaction, String recordedBy, LsThing lsThing,
+			String labelType, String labelKind, boolean preferred, String label) {
 		LsThingLabel lsLabel = new LsThingLabel();
 		lsLabel.setLsThing(lsThing);
 		lsLabel.setLsThingTypeAndKind(lsThing.getLsTypeAndKind());
@@ -371,29 +426,31 @@ public static LsThingLabel saveLsThingLabel(LsTransaction lsTransaction, String
 		lsLabel.setLsTransaction(lsTransaction.getId());
 		lsLabel.setRecordedBy(recordedBy);
 		lsLabel.persist();
-		logger.info("saving thing label: " + label);		
+		logger.info("saving thing label: " + label);
 
 		return lsLabel;
 
 	}
 
 	@Transactional
-	public static List<LsThingLabel> saveLsThingLabels(LsTransaction lsTransaction, String recordedBy, LsThing lsThing, String labelType, String labelKind, boolean preferred, String labels,  String labelSeparator) {
+	public static List<LsThingLabel> saveLsThingLabels(LsTransaction lsTransaction, String recordedBy, LsThing lsThing,
+			String labelType, String labelKind, boolean preferred, String labels, String labelSeparator) {
 		List<LsThingLabel> lsLabels = new ArrayList<LsThingLabel>();
 		String[] labelList = labels.split(labelSeparator);
-		for (String label : labelList){
+		for (String label : labelList) {
 			lsLabels.add(saveLsThingLabel(lsTransaction, recordedBy, lsThing, labelType, labelKind, preferred, label));
 		}
-		
+
 		return lsLabels;
 
 	}
 
-	public static TypedQuery<PreferredNameDTO> findLsThingPreferredName(String thingType, String thingKind, String labelType, String labelKind, Collection<String> requestNameList) {
-		
+	public static TypedQuery<PreferredNameDTO> findLsThingPreferredName(String thingType, String thingKind,
+			String labelType, String labelKind, Collection<String> requestNameList) {
+
 		EntityManager em = LsThingLabel.entityManager();
 		String query = "SELECT new com.labsynch.labseer.dto.PreferredNameDTO( "
-				+ "tl1.labelText as requestName, tl2.labelText as preferredName, lst.codeName as referenceName) " 
+				+ "tl1.labelText as requestName, tl2.labelText as preferredName, lst.codeName as referenceName) "
 				+ "FROM LsThing AS lst "
 				+ "JOIN lst.lsLabels tl1 "
 				+ "JOIN lst.lsLabels tl2 "
@@ -407,28 +464,28 @@ public static TypedQuery<PreferredNameDTO> findLsThingPreferredName(String thing
 				+ "AND lst.lsKind = :thingKind "
 				+ "AND lst.ignored IS NOT :ignored  "
 				+ "AND tl1.labelText in (:requestNameList) ";
-		
-//		+ "FROM LsThingLabel AS o "
-//		+ ", LsThingLabel AS o2 "
-//		+ "JOIN o.lsThing lst "
-//		+ "WHERE o.lsType = :labelType  "
-//		+ "AND o.lsKind = :labelKind "
-//		+ "AND lst.lsType = :thingType "
-//		+ "AND lst.lsKind = :thingKind "
-//		+ "AND lst.ignored IS NOT :ignored  "
-//		+ "AND o.preferred = :preferred AND o.ignored IS NOT :ignored "
-//		+ "AND o.labelText in (:requestNameList) "
-//		+ "AND o.lsThing = o2.lsThing "
-//		+ "AND o2.preferred != :preferred "
-//		+ "AND o2.lsType = :labelType  "
-//		+ "AND o2.lsKind = :labelKind ";
-		
-//		select tl2.label_text as reference, tl1.label_text as other, tl1.preferred
-//		from ls_thing lst
-//		join  ls_thing_label tl1 on lst.id = tl1.lsthing_id
-//		join  ls_thing_label tl2 on lst.id = tl2.lsthing_id AND tl2.preferred = 1
-//		where tl1.label_text in ('380653','380654') ;		
-		
+
+		// + "FROM LsThingLabel AS o "
+		// + ", LsThingLabel AS o2 "
+		// + "JOIN o.lsThing lst "
+		// + "WHERE o.lsType = :labelType "
+		// + "AND o.lsKind = :labelKind "
+		// + "AND lst.lsType = :thingType "
+		// + "AND lst.lsKind = :thingKind "
+		// + "AND lst.ignored IS NOT :ignored "
+		// + "AND o.preferred = :preferred AND o.ignored IS NOT :ignored "
+		// + "AND o.labelText in (:requestNameList) "
+		// + "AND o.lsThing = o2.lsThing "
+		// + "AND o2.preferred != :preferred "
+		// + "AND o2.lsType = :labelType "
+		// + "AND o2.lsKind = :labelKind ";
+
+		// select tl2.label_text as reference, tl1.label_text as other, tl1.preferred
+		// from ls_thing lst
+		// join ls_thing_label tl1 on lst.id = tl1.lsthing_id
+		// join ls_thing_label tl2 on lst.id = tl2.lsthing_id AND tl2.preferred = 1
+		// where tl1.label_text in ('380653','380654') ;
+
 		logger.debug("sql query " + query);
 		TypedQuery<PreferredNameDTO> q = em.createQuery(query, PreferredNameDTO.class);
 		q.setParameter("labelType", labelType);
@@ -440,20 +497,20 @@ public static TypedQuery<PreferredNameDTO> findLsThingPreferredName(String thing
 		q.setParameter("ignored", true);
 		return q;
 	}
-	
-public static TypedQuery<PreferredNameDTO> findLsThingPreferredName(Set<String> requestNameList) {
-	
+
+	public static TypedQuery<PreferredNameDTO> findLsThingPreferredName(Set<String> requestNameList) {
+
 		logger.info("in the correct sql generation");
-		
+
 		EntityManager em = LsThingLabel.entityManager();
-		String query = "SELECT new com.labsynch.labseer.dto.PreferredNameDTO( o.labelText as requestName, o2.labelText as preferredName, lst.codeName as referenceName) " 
+		String query = "SELECT new com.labsynch.labseer.dto.PreferredNameDTO( o.labelText as requestName, o2.labelText as preferredName, lst.codeName as referenceName) "
 				+ "FROM LsThingLabel AS o, LsThingLabel AS o2 "
 				+ "JOIN o.lsThing lst "
 				+ "JOIN o2.lsThing lst2 "
-//				+ "JOIN o o2"
+				// + "JOIN o o2"
 				+ "WHERE o.ignored IS NOT :ignored AND o.labelText in (:requestNameList) AND lst.codeName = lst2.codeName "
 				+ "AND o2.preferred = :preferred AND o2.ignored IS NOT :ignored";
-		
+
 		logger.debug("sql query " + query);
 		TypedQuery<PreferredNameDTO> q = em.createQuery(query, PreferredNameDTO.class);
 		q.setParameter("requestNameList", requestNameList);
@@ -461,39 +518,46 @@ public static TypedQuery<PreferredNameDTO> findLsThingPreferredName(Set<String>
 		q.setParameter("ignored", true);
 		return q;
 	}
-	
+
 	public static LsThingLabel pickBestLabel(Collection<LsThingLabel> labels) {
-		if (labels.isEmpty()) return null;
+		if (labels.isEmpty())
+			return null;
 		Collection<LsThingLabel> preferredLabels = new HashSet<LsThingLabel>();
-		for (LsThingLabel label : labels){
-			if (label.isPreferred()) preferredLabels.add(label);
+		for (LsThingLabel label : labels) {
+			if (label.isPreferred())
+				preferredLabels.add(label);
 		}
-		if (!preferredLabels.isEmpty()){
+		if (!preferredLabels.isEmpty()) {
 			LsThingLabel bestLabel = preferredLabels.iterator().next();
-			for (LsThingLabel preferredLabel : preferredLabels){
-				if (preferredLabel.getRecordedDate().compareTo(bestLabel.getRecordedDate()) > 0) bestLabel = preferredLabel;
+			for (LsThingLabel preferredLabel : preferredLabels) {
+				if (preferredLabel.getRecordedDate().compareTo(bestLabel.getRecordedDate()) > 0)
+					bestLabel = preferredLabel;
 			}
 			return bestLabel;
 		} else {
 			Collection<LsThingLabel> nameLabels = new HashSet<LsThingLabel>();
-			for (LsThingLabel label : labels){
-				if (label.getLsType().equals("name")) nameLabels.add(label);
+			for (LsThingLabel label : labels) {
+				if (label.getLsType().equals("name"))
+					nameLabels.add(label);
 			}
-			if (!nameLabels.isEmpty()){
+			if (!nameLabels.isEmpty()) {
 				LsThingLabel bestLabel = nameLabels.iterator().next();
-				for (LsThingLabel nameLabel : nameLabels){
-					if (nameLabel.getRecordedDate().compareTo(bestLabel.getRecordedDate()) > 0) bestLabel = nameLabel;
+				for (LsThingLabel nameLabel : nameLabels) {
+					if (nameLabel.getRecordedDate().compareTo(bestLabel.getRecordedDate()) > 0)
+						bestLabel = nameLabel;
 				}
 				return bestLabel;
 			} else {
 				Collection<LsThingLabel> notIgnoredLabels = new HashSet<LsThingLabel>();
-				for (LsThingLabel label : labels){
-					if (!label.isIgnored()) notIgnoredLabels.add(label);
+				for (LsThingLabel label : labels) {
+					if (!label.isIgnored())
+						notIgnoredLabels.add(label);
 				}
-				if (!notIgnoredLabels.isEmpty()){
+				if (!notIgnoredLabels.isEmpty()) {
 					LsThingLabel bestLabel = notIgnoredLabels.iterator().next();
-					for (LsThingLabel notIgnoredLabel : notIgnoredLabels){
-						if (notIgnoredLabel.getRecordedDate().compareTo(bestLabel.getRecordedDate()) > 0) bestLabel = notIgnoredLabel;
+					for (LsThingLabel notIgnoredLabel : notIgnoredLabels) {
+						if (notIgnoredLabel.getRecordedDate().compareTo(bestLabel.getRecordedDate()) > 0)
+							bestLabel = notIgnoredLabel;
 					}
 					return bestLabel;
 				} else {
@@ -505,12 +569,16 @@ public static LsThingLabel pickBestLabel(Collection<LsThingLabel> labels) {
 
 	public static TypedQuery<LsThingLabel> findLsThingLabelsByLsThingAndLsTypeAndLsKindAndLabelText(
 			LsThing lsThing, String labelType, String labelKind, String labelText) {
-		
-		if (lsThing == null ) throw new IllegalArgumentException("The lsThing argument is required");
-		if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-		if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");
-		if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-		
+
+		if (lsThing == null)
+			throw new IllegalArgumentException("The lsThing argument is required");
+		if (labelType == null || labelType.length() == 0)
+			throw new IllegalArgumentException("The labelType argument is required");
+		if (labelKind == null || labelKind.length() == 0)
+			throw new IllegalArgumentException("The labelKind argument is required");
+		if (labelText == null || labelText.length() == 0)
+			throw new IllegalArgumentException("The labelText argument is required");
+
 		EntityManager em = LsThingLabel.entityManager();
 		String query = "SELECT DISTINCT o FROM LsThingLabel AS o WHERE o.lsType = :labelType  "
 				+ "AND o.lsKind = :labelKind "
@@ -528,15 +596,19 @@ public static TypedQuery<LsThingLabel> findLsThingLabelsByLsThingAndLsTypeAndLsK
 
 		return q;
 	}
-	
+
 	public static TypedQuery<LsThingLabel> findAllLsThingLabelsByLsThingAndLsTypeAndLsKindAndLabelText(
 			LsThing lsThing, String labelType, String labelKind, String labelText) {
-		
-		if (lsThing == null ) throw new IllegalArgumentException("The lsThing argument is required");
-		if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-		if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");
-		if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-		
+
+		if (lsThing == null)
+			throw new IllegalArgumentException("The lsThing argument is required");
+		if (labelType == null || labelType.length() == 0)
+			throw new IllegalArgumentException("The labelType argument is required");
+		if (labelKind == null || labelKind.length() == 0)
+			throw new IllegalArgumentException("The labelKind argument is required");
+		if (labelText == null || labelText.length() == 0)
+			throw new IllegalArgumentException("The labelText argument is required");
+
 		EntityManager em = LsThingLabel.entityManager();
 		String query = "SELECT DISTINCT o FROM LsThingLabel AS o WHERE o.lsType = :labelType  "
 				+ "AND o.lsKind = :labelKind "
@@ -555,10 +627,13 @@ public static TypedQuery<LsThingLabel> findAllLsThingLabelsByLsThingAndLsTypeAnd
 
 	public static TypedQuery<LsThingLabel> findLsThingLabelsByLsThingAndLsTypeAndLsKind(
 			LsThing lsThing, String labelType, String labelKind) {
-		if (lsThing == null ) throw new IllegalArgumentException("The lsThing argument is required");
-		if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-		if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");
-		
+		if (lsThing == null)
+			throw new IllegalArgumentException("The lsThing argument is required");
+		if (labelType == null || labelType.length() == 0)
+			throw new IllegalArgumentException("The labelType argument is required");
+		if (labelKind == null || labelKind.length() == 0)
+			throw new IllegalArgumentException("The labelKind argument is required");
+
 		EntityManager em = LsThingLabel.entityManager();
 		String query = "SELECT DISTINCT o FROM LsThingLabel AS o WHERE o.lsType = :labelType  "
 				+ "AND o.lsKind = :labelKind "
@@ -575,10 +650,13 @@ public static TypedQuery<LsThingLabel> findLsThingLabelsByLsThingAndLsTypeAndLsK
 
 	public static TypedQuery<LsThingLabel> findLsThingLabelsByLsThingAndLsTypeAndLsKindNotIgnored(
 			LsThing lsThing, String labelType, String labelKind, boolean ignored) {
-		if (lsThing == null ) throw new IllegalArgumentException("The lsThing argument is required");
-		if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-		if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");
-		
+		if (lsThing == null)
+			throw new IllegalArgumentException("The lsThing argument is required");
+		if (labelType == null || labelType.length() == 0)
+			throw new IllegalArgumentException("The labelType argument is required");
+		if (labelKind == null || labelKind.length() == 0)
+			throw new IllegalArgumentException("The labelKind argument is required");
+
 		EntityManager em = LsThingLabel.entityManager();
 		String query = "SELECT DISTINCT o FROM LsThingLabel AS o WHERE o.lsType = :labelType  "
 				+ "AND o.lsKind = :labelKind "
@@ -595,254 +673,293 @@ public static TypedQuery<LsThingLabel> findLsThingLabelsByLsThingAndLsTypeAndLsK
 		return q;
 	}
 
-
-	
-
 	public LsThing getLsThing() {
-        return this.lsThing;
-    }
+		return this.lsThing;
+	}
 
 	public void setLsThing(LsThing lsThing) {
-        this.lsThing = lsThing;
-    }
+		this.lsThing = lsThing;
+	}
 
 	public String getLsThingTypeAndKind() {
-        return this.lsThingTypeAndKind;
-    }
+		return this.lsThingTypeAndKind;
+	}
 
 	public void setLsThingTypeAndKind(String lsThingTypeAndKind) {
-        this.lsThingTypeAndKind = lsThingTypeAndKind;
-    }
+		this.lsThingTypeAndKind = lsThingTypeAndKind;
+	}
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsThing", "lsThingTypeAndKind");
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsThing",
+			"lsThingTypeAndKind");
 
 	public static long countLsThingLabels() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM LsThingLabel o", Long.class).getSingleResult();
-    }
+		return entityManager().createQuery("SELECT COUNT(o) FROM LsThingLabel o", Long.class).getSingleResult();
+	}
 
 	public static List<LsThingLabel> findAllLsThingLabels() {
-        return entityManager().createQuery("SELECT o FROM LsThingLabel o", LsThingLabel.class).getResultList();
-    }
+		return entityManager().createQuery("SELECT o FROM LsThingLabel o", LsThingLabel.class).getResultList();
+	}
 
 	public static List<LsThingLabel> findAllLsThingLabels(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsThingLabel o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsThingLabel.class).getResultList();
-    }
+		String jpaQuery = "SELECT o FROM LsThingLabel o";
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				jpaQuery = jpaQuery + " " + sortOrder;
+			}
+		}
+		return entityManager().createQuery(jpaQuery, LsThingLabel.class).getResultList();
+	}
 
 	public static LsThingLabel findLsThingLabel(Long id) {
-        if (id == null) return null;
-        return entityManager().find(LsThingLabel.class, id);
-    }
+		if (id == null)
+			return null;
+		return entityManager().find(LsThingLabel.class, id);
+	}
 
 	public static List<LsThingLabel> findLsThingLabelEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsThingLabel o", LsThingLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-
-	public static List<LsThingLabel> findLsThingLabelEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM LsThingLabel o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, LsThingLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
+		return entityManager().createQuery("SELECT o FROM LsThingLabel o", LsThingLabel.class)
+				.setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+	}
+
+	public static List<LsThingLabel> findLsThingLabelEntries(int firstResult, int maxResults, String sortFieldName,
+			String sortOrder) {
+		String jpaQuery = "SELECT o FROM LsThingLabel o";
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				jpaQuery = jpaQuery + " " + sortOrder;
+			}
+		}
+		return entityManager().createQuery(jpaQuery, LsThingLabel.class).setFirstResult(firstResult)
+				.setMaxResults(maxResults).getResultList();
+	}
 
 	@Transactional
-    public LsThingLabel merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        LsThingLabel merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
+	public LsThingLabel merge() {
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
+		LsThingLabel merged = this.entityManager.merge(this);
+		this.entityManager.flush();
+		return merged;
+	}
 
 	public static Long countFindLsThingLabelsByLabelTextEquals(String labelText) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        EntityManager em = LsThingLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingLabel AS o WHERE o.labelText = :labelText", Long.class);
-        q.setParameter("labelText", labelText);
-        return ((Long) q.getSingleResult());
-    }
+		if (labelText == null || labelText.length() == 0)
+			throw new IllegalArgumentException("The labelText argument is required");
+		EntityManager em = LsThingLabel.entityManager();
+		TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingLabel AS o WHERE o.labelText = :labelText",
+				Long.class);
+		q.setParameter("labelText", labelText);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static Long countFindLsThingLabelsByLabelTextEqualsAndIgnoredNot(String labelText, boolean ignored) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        EntityManager em = LsThingLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored", Long.class);
-        q.setParameter("labelText", labelText);
-        q.setParameter("ignored", ignored);
-        return ((Long) q.getSingleResult());
-    }
+		if (labelText == null || labelText.length() == 0)
+			throw new IllegalArgumentException("The labelText argument is required");
+		EntityManager em = LsThingLabel.entityManager();
+		TypedQuery q = em.createQuery(
+				"SELECT COUNT(o) FROM LsThingLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored",
+				Long.class);
+		q.setParameter("labelText", labelText);
+		q.setParameter("ignored", ignored);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static Long countFindLsThingLabelsByLabelTextLike(String labelText) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        labelText = labelText.replace('*', '%');
-        if (labelText.charAt(0) != '%') {
-            labelText = "%" + labelText;
-        }
-        if (labelText.charAt(labelText.length() - 1) != '%') {
-            labelText = labelText + "%";
-        }
-        EntityManager em = LsThingLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", Long.class);
-        q.setParameter("labelText", labelText);
-        return ((Long) q.getSingleResult());
-    }
+		if (labelText == null || labelText.length() == 0)
+			throw new IllegalArgumentException("The labelText argument is required");
+		labelText = labelText.replace('*', '%');
+		if (labelText.charAt(0) != '%') {
+			labelText = "%" + labelText;
+		}
+		if (labelText.charAt(labelText.length() - 1) != '%') {
+			labelText = labelText + "%";
+		}
+		EntityManager em = LsThingLabel.entityManager();
+		TypedQuery q = em.createQuery(
+				"SELECT COUNT(o) FROM LsThingLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", Long.class);
+		q.setParameter("labelText", labelText);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static Long countFindLsThingLabelsByLsThing(LsThing lsThing) {
-        if (lsThing == null) throw new IllegalArgumentException("The lsThing argument is required");
-        EntityManager em = LsThingLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingLabel AS o WHERE o.lsThing = :lsThing", Long.class);
-        q.setParameter("lsThing", lsThing);
-        return ((Long) q.getSingleResult());
-    }
+		if (lsThing == null)
+			throw new IllegalArgumentException("The lsThing argument is required");
+		EntityManager em = LsThingLabel.entityManager();
+		TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingLabel AS o WHERE o.lsThing = :lsThing", Long.class);
+		q.setParameter("lsThing", lsThing);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static Long countFindLsThingLabelsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = LsThingLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingLabel AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
+		if (lsTransaction == null)
+			throw new IllegalArgumentException("The lsTransaction argument is required");
+		EntityManager em = LsThingLabel.entityManager();
+		TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingLabel AS o WHERE o.lsTransaction = :lsTransaction",
+				Long.class);
+		q.setParameter("lsTransaction", lsTransaction);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static TypedQuery<LsThingLabel> findLsThingLabelsByLabelTextEquals(String labelText) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        EntityManager em = LsThingLabel.entityManager();
-        TypedQuery<LsThingLabel> q = em.createQuery("SELECT o FROM LsThingLabel AS o WHERE o.labelText = :labelText", LsThingLabel.class);
-        q.setParameter("labelText", labelText);
-        return q;
-    }
-
-	public static TypedQuery<LsThingLabel> findLsThingLabelsByLabelTextEquals(String labelText, String sortFieldName, String sortOrder) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        EntityManager em = LsThingLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingLabel AS o WHERE o.labelText = :labelText");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThingLabel> q = em.createQuery(queryBuilder.toString(), LsThingLabel.class);
-        q.setParameter("labelText", labelText);
-        return q;
-    }
-
-	public static TypedQuery<LsThingLabel> findLsThingLabelsByLabelTextEqualsAndIgnoredNot(String labelText, boolean ignored) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        EntityManager em = LsThingLabel.entityManager();
-        TypedQuery<LsThingLabel> q = em.createQuery("SELECT o FROM LsThingLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored", LsThingLabel.class);
-        q.setParameter("labelText", labelText);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
-
-	public static TypedQuery<LsThingLabel> findLsThingLabelsByLabelTextEqualsAndIgnoredNot(String labelText, boolean ignored, String sortFieldName, String sortOrder) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        EntityManager em = LsThingLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThingLabel> q = em.createQuery(queryBuilder.toString(), LsThingLabel.class);
-        q.setParameter("labelText", labelText);
-        q.setParameter("ignored", ignored);
-        return q;
-    }
+		if (labelText == null || labelText.length() == 0)
+			throw new IllegalArgumentException("The labelText argument is required");
+		EntityManager em = LsThingLabel.entityManager();
+		TypedQuery<LsThingLabel> q = em.createQuery("SELECT o FROM LsThingLabel AS o WHERE o.labelText = :labelText",
+				LsThingLabel.class);
+		q.setParameter("labelText", labelText);
+		return q;
+	}
+
+	public static TypedQuery<LsThingLabel> findLsThingLabelsByLabelTextEquals(String labelText, String sortFieldName,
+			String sortOrder) {
+		if (labelText == null || labelText.length() == 0)
+			throw new IllegalArgumentException("The labelText argument is required");
+		EntityManager em = LsThingLabel.entityManager();
+		StringBuilder queryBuilder = new StringBuilder(
+				"SELECT o FROM LsThingLabel AS o WHERE o.labelText = :labelText");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<LsThingLabel> q = em.createQuery(queryBuilder.toString(), LsThingLabel.class);
+		q.setParameter("labelText", labelText);
+		return q;
+	}
+
+	public static TypedQuery<LsThingLabel> findLsThingLabelsByLabelTextEqualsAndIgnoredNot(String labelText,
+			boolean ignored) {
+		if (labelText == null || labelText.length() == 0)
+			throw new IllegalArgumentException("The labelText argument is required");
+		EntityManager em = LsThingLabel.entityManager();
+		TypedQuery<LsThingLabel> q = em.createQuery(
+				"SELECT o FROM LsThingLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored",
+				LsThingLabel.class);
+		q.setParameter("labelText", labelText);
+		q.setParameter("ignored", ignored);
+		return q;
+	}
+
+	public static TypedQuery<LsThingLabel> findLsThingLabelsByLabelTextEqualsAndIgnoredNot(String labelText,
+			boolean ignored, String sortFieldName, String sortOrder) {
+		if (labelText == null || labelText.length() == 0)
+			throw new IllegalArgumentException("The labelText argument is required");
+		EntityManager em = LsThingLabel.entityManager();
+		StringBuilder queryBuilder = new StringBuilder(
+				"SELECT o FROM LsThingLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<LsThingLabel> q = em.createQuery(queryBuilder.toString(), LsThingLabel.class);
+		q.setParameter("labelText", labelText);
+		q.setParameter("ignored", ignored);
+		return q;
+	}
 
 	public static TypedQuery<LsThingLabel> findLsThingLabelsByLabelTextLike(String labelText) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        labelText = labelText.replace('*', '%');
-        if (labelText.charAt(0) != '%') {
-            labelText = "%" + labelText;
-        }
-        if (labelText.charAt(labelText.length() - 1) != '%') {
-            labelText = labelText + "%";
-        }
-        EntityManager em = LsThingLabel.entityManager();
-        TypedQuery<LsThingLabel> q = em.createQuery("SELECT o FROM LsThingLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", LsThingLabel.class);
-        q.setParameter("labelText", labelText);
-        return q;
-    }
-
-	public static TypedQuery<LsThingLabel> findLsThingLabelsByLabelTextLike(String labelText, String sortFieldName, String sortOrder) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        labelText = labelText.replace('*', '%');
-        if (labelText.charAt(0) != '%') {
-            labelText = "%" + labelText;
-        }
-        if (labelText.charAt(labelText.length() - 1) != '%') {
-            labelText = labelText + "%";
-        }
-        EntityManager em = LsThingLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThingLabel> q = em.createQuery(queryBuilder.toString(), LsThingLabel.class);
-        q.setParameter("labelText", labelText);
-        return q;
-    }
+		if (labelText == null || labelText.length() == 0)
+			throw new IllegalArgumentException("The labelText argument is required");
+		labelText = labelText.replace('*', '%');
+		if (labelText.charAt(0) != '%') {
+			labelText = "%" + labelText;
+		}
+		if (labelText.charAt(labelText.length() - 1) != '%') {
+			labelText = labelText + "%";
+		}
+		EntityManager em = LsThingLabel.entityManager();
+		TypedQuery<LsThingLabel> q = em.createQuery(
+				"SELECT o FROM LsThingLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", LsThingLabel.class);
+		q.setParameter("labelText", labelText);
+		return q;
+	}
+
+	public static TypedQuery<LsThingLabel> findLsThingLabelsByLabelTextLike(String labelText, String sortFieldName,
+			String sortOrder) {
+		if (labelText == null || labelText.length() == 0)
+			throw new IllegalArgumentException("The labelText argument is required");
+		labelText = labelText.replace('*', '%');
+		if (labelText.charAt(0) != '%') {
+			labelText = "%" + labelText;
+		}
+		if (labelText.charAt(labelText.length() - 1) != '%') {
+			labelText = labelText + "%";
+		}
+		EntityManager em = LsThingLabel.entityManager();
+		StringBuilder queryBuilder = new StringBuilder(
+				"SELECT o FROM LsThingLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<LsThingLabel> q = em.createQuery(queryBuilder.toString(), LsThingLabel.class);
+		q.setParameter("labelText", labelText);
+		return q;
+	}
 
 	public static TypedQuery<LsThingLabel> findLsThingLabelsByLsThing(LsThing lsThing) {
-        if (lsThing == null) throw new IllegalArgumentException("The lsThing argument is required");
-        EntityManager em = LsThingLabel.entityManager();
-        TypedQuery<LsThingLabel> q = em.createQuery("SELECT o FROM LsThingLabel AS o WHERE o.lsThing = :lsThing", LsThingLabel.class);
-        q.setParameter("lsThing", lsThing);
-        return q;
-    }
-
-	public static TypedQuery<LsThingLabel> findLsThingLabelsByLsThing(LsThing lsThing, String sortFieldName, String sortOrder) {
-        if (lsThing == null) throw new IllegalArgumentException("The lsThing argument is required");
-        EntityManager em = LsThingLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingLabel AS o WHERE o.lsThing = :lsThing");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThingLabel> q = em.createQuery(queryBuilder.toString(), LsThingLabel.class);
-        q.setParameter("lsThing", lsThing);
-        return q;
-    }
+		if (lsThing == null)
+			throw new IllegalArgumentException("The lsThing argument is required");
+		EntityManager em = LsThingLabel.entityManager();
+		TypedQuery<LsThingLabel> q = em.createQuery("SELECT o FROM LsThingLabel AS o WHERE o.lsThing = :lsThing",
+				LsThingLabel.class);
+		q.setParameter("lsThing", lsThing);
+		return q;
+	}
+
+	public static TypedQuery<LsThingLabel> findLsThingLabelsByLsThing(LsThing lsThing, String sortFieldName,
+			String sortOrder) {
+		if (lsThing == null)
+			throw new IllegalArgumentException("The lsThing argument is required");
+		EntityManager em = LsThingLabel.entityManager();
+		StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingLabel AS o WHERE o.lsThing = :lsThing");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<LsThingLabel> q = em.createQuery(queryBuilder.toString(), LsThingLabel.class);
+		q.setParameter("lsThing", lsThing);
+		return q;
+	}
 
 	public static TypedQuery<LsThingLabel> findLsThingLabelsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = LsThingLabel.entityManager();
-        TypedQuery<LsThingLabel> q = em.createQuery("SELECT o FROM LsThingLabel AS o WHERE o.lsTransaction = :lsTransaction", LsThingLabel.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-
-	public static TypedQuery<LsThingLabel> findLsThingLabelsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = LsThingLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingLabel AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<LsThingLabel> q = em.createQuery(queryBuilder.toString(), LsThingLabel.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
+		if (lsTransaction == null)
+			throw new IllegalArgumentException("The lsTransaction argument is required");
+		EntityManager em = LsThingLabel.entityManager();
+		TypedQuery<LsThingLabel> q = em.createQuery(
+				"SELECT o FROM LsThingLabel AS o WHERE o.lsTransaction = :lsTransaction", LsThingLabel.class);
+		q.setParameter("lsTransaction", lsTransaction);
+		return q;
+	}
+
+	public static TypedQuery<LsThingLabel> findLsThingLabelsByLsTransactionEquals(Long lsTransaction,
+			String sortFieldName, String sortOrder) {
+		if (lsTransaction == null)
+			throw new IllegalArgumentException("The lsTransaction argument is required");
+		EntityManager em = LsThingLabel.entityManager();
+		StringBuilder queryBuilder = new StringBuilder(
+				"SELECT o FROM LsThingLabel AS o WHERE o.lsTransaction = :lsTransaction");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<LsThingLabel> q = em.createQuery(queryBuilder.toString(), LsThingLabel.class);
+		q.setParameter("lsTransaction", lsTransaction);
+		return q;
+	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingState.java b/src/main/java/com/labsynch/labseer/domain/LsThingState.java
index ba58e2f1b..5b93a72d9 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsThingState.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsThingState.java
@@ -43,7 +43,7 @@ public class LsThingState extends AbstractState {
 
     public LsThingState() {
     }
-    
+
     public LsThingState(com.labsynch.labseer.domain.LsThingState lsState) {
         super.setRecordedBy(lsState.getRecordedBy());
         super.setRecordedDate(lsState.getRecordedDate());
@@ -54,94 +54,101 @@ public LsThingState(com.labsynch.labseer.domain.LsThingState lsState) {
         super.setLsKind(lsState.getLsKind());
     }
 
-	public static LsThingState update(LsThingState lsState) {
-		LsThingState updatedLsThingState = LsThingState.findLsThingState(lsState.getId());
-		if (updatedLsThingState != null){
-			updatedLsThingState.setRecordedBy(lsState.getRecordedBy());
-			updatedLsThingState.setRecordedDate(lsState.getRecordedDate());
-			updatedLsThingState.setLsTransaction(lsState.getLsTransaction());
-			updatedLsThingState.setModifiedBy(lsState.getModifiedBy());
-			updatedLsThingState.setModifiedDate(new Date());
-			updatedLsThingState.setLsType(lsState.getLsType());
-			updatedLsThingState.setLsKind(lsState.getLsKind());
-			updatedLsThingState.setIgnored(lsState.isIgnored());
-			updatedLsThingState.merge();
-			return updatedLsThingState;
-		} else {
-			return null;
-		}
-		
-	}
-
-	@Transactional
+    public static LsThingState update(LsThingState lsState) {
+        LsThingState updatedLsThingState = LsThingState.findLsThingState(lsState.getId());
+        if (updatedLsThingState != null) {
+            updatedLsThingState.setRecordedBy(lsState.getRecordedBy());
+            updatedLsThingState.setRecordedDate(lsState.getRecordedDate());
+            updatedLsThingState.setLsTransaction(lsState.getLsTransaction());
+            updatedLsThingState.setModifiedBy(lsState.getModifiedBy());
+            updatedLsThingState.setModifiedDate(new Date());
+            updatedLsThingState.setLsType(lsState.getLsType());
+            updatedLsThingState.setLsKind(lsState.getLsKind());
+            updatedLsThingState.setIgnored(lsState.isIgnored());
+            updatedLsThingState.merge();
+            return updatedLsThingState;
+        } else {
+            return null;
+        }
+
+    }
+
+    @Transactional
     public String toJson() {
-        return new JSONSerializer().include("lsValues").exclude("*.class", "lsThing").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().include("lsValues").exclude("*.class", "lsThing")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
-    
+
     public static LsThingState fromJsonToLsThingState(String json) {
         return new JSONDeserializer<LsThingState>().use(null, LsThingState.class).deserialize(json);
     }
-    
+
     public static String toJsonArray(Collection<LsThingState> collection) {
         return new JSONSerializer().exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
     }
-    
+
     public static Collection<LsThingState> fromJsonArrayToLsThingStates(String json) {
-        return new JSONDeserializer<List<LsThingState>>().use(null, ArrayList.class).use("values", LsThingState.class).deserialize(json);
+        return new JSONDeserializer<List<LsThingState>>().use(null, ArrayList.class).use("values", LsThingState.class)
+                .deserialize(json);
     }
 
     public static Collection<LsThingState> fromJsonArrayToLsThingStates(Reader json) {
-        return new JSONDeserializer<List<LsThingState>>().use(null, ArrayList.class).use("values", LsThingState.class).deserialize(json);
+        return new JSONDeserializer<List<LsThingState>>().use(null, ArrayList.class).use("values", LsThingState.class)
+                .deserialize(json);
     }
 
-	public static TypedQuery<LsThingState> findLsThingStatesByLsThingIDAndStateTypeKind(
-			Long lsThingId, String stateType, String stateKind) {
-		
-		if (stateType == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-		
-		EntityManager em = entityManager();
-		String hsqlQuery = "SELECT lsts FROM LsThingState AS lsts " +
-		"JOIN lsts.lsThing lst " +
-		"WHERE lsts.lsType = :stateType AND lsts.lsKind = :stateKind AND lsts.ignored IS NOT :ignored " +
-		"AND lst.id = :lsThingId ";
-		TypedQuery<LsThingState> q = em.createQuery(hsqlQuery, LsThingState.class);
-		q.setParameter("lsThingId", lsThingId);
-		q.setParameter("stateType", stateType);
-		q.setParameter("stateKind", stateKind);
-		q.setParameter("ignored", true);
-		return q;
-	}
-
-	public static TypedQuery<LsThingState> findLsThingStatesByLsThingCodeNameAndStateTypeKind(
-			String lsThingCodeName, String stateType, String stateKind) {
-		if (stateType == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-		
-		EntityManager em = entityManager();
-		String hsqlQuery = "SELECT lsts FROM LsThingState AS lsts " +
-		"JOIN lsts.lsThing lst " +
-		"WHERE lsts.lsType = :stateType AND lsts.lsKind = :stateKind AND lsts.ignored IS NOT :ignored " +
-		"AND lst.codeName = :lsThingCodeName ";
-		TypedQuery<LsThingState> q = em.createQuery(hsqlQuery, LsThingState.class);
-		q.setParameter("lsThingCodeName", lsThingCodeName);
-		q.setParameter("stateType", stateType);
-		q.setParameter("stateKind", stateKind);
-		q.setParameter("ignored", true);
-		return q;
-	}
-
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsThing", "lsValues");
-
-	public static long countLsThingStates() {
+    public static TypedQuery<LsThingState> findLsThingStatesByLsThingIDAndStateTypeKind(
+            Long lsThingId, String stateType, String stateKind) {
+
+        if (stateType == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateType argument is required");
+        if (stateKind == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateKind argument is required");
+
+        EntityManager em = entityManager();
+        String hsqlQuery = "SELECT lsts FROM LsThingState AS lsts " +
+                "JOIN lsts.lsThing lst " +
+                "WHERE lsts.lsType = :stateType AND lsts.lsKind = :stateKind AND lsts.ignored IS NOT :ignored " +
+                "AND lst.id = :lsThingId ";
+        TypedQuery<LsThingState> q = em.createQuery(hsqlQuery, LsThingState.class);
+        q.setParameter("lsThingId", lsThingId);
+        q.setParameter("stateType", stateType);
+        q.setParameter("stateKind", stateKind);
+        q.setParameter("ignored", true);
+        return q;
+    }
+
+    public static TypedQuery<LsThingState> findLsThingStatesByLsThingCodeNameAndStateTypeKind(
+            String lsThingCodeName, String stateType, String stateKind) {
+        if (stateType == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateType argument is required");
+        if (stateKind == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateKind argument is required");
+
+        EntityManager em = entityManager();
+        String hsqlQuery = "SELECT lsts FROM LsThingState AS lsts " +
+                "JOIN lsts.lsThing lst " +
+                "WHERE lsts.lsType = :stateType AND lsts.lsKind = :stateKind AND lsts.ignored IS NOT :ignored " +
+                "AND lst.codeName = :lsThingCodeName ";
+        TypedQuery<LsThingState> q = em.createQuery(hsqlQuery, LsThingState.class);
+        q.setParameter("lsThingCodeName", lsThingCodeName);
+        q.setParameter("stateType", stateType);
+        q.setParameter("stateKind", stateKind);
+        q.setParameter("ignored", true);
+        return q;
+    }
+
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsThing", "lsValues");
+
+    public static long countLsThingStates() {
         return entityManager().createQuery("SELECT COUNT(o) FROM LsThingState o", Long.class).getSingleResult();
     }
 
-	public static List<LsThingState> findAllLsThingStates() {
+    public static List<LsThingState> findAllLsThingStates() {
         return entityManager().createQuery("SELECT o FROM LsThingState o", LsThingState.class).getResultList();
     }
 
-	public static List<LsThingState> findAllLsThingStates(String sortFieldName, String sortOrder) {
+    public static List<LsThingState> findAllLsThingStates(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LsThingState o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -152,16 +159,19 @@ public static List<LsThingState> findAllLsThingStates(String sortFieldName, Stri
         return entityManager().createQuery(jpaQuery, LsThingState.class).getResultList();
     }
 
-	public static LsThingState findLsThingState(Long id) {
-        if (id == null) return null;
+    public static LsThingState findLsThingState(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(LsThingState.class, id);
     }
 
-	public static List<LsThingState> findLsThingStateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsThingState o", LsThingState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<LsThingState> findLsThingStateEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsThingState o", LsThingState.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<LsThingState> findLsThingStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<LsThingState> findLsThingStateEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM LsThingState o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -169,47 +179,56 @@ public static List<LsThingState> findLsThingStateEntries(int firstResult, int ma
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, LsThingState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, LsThingState.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public LsThingState merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         LsThingState merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static Long countFindLsThingStatesByLsThing(LsThing lsThing) {
-        if (lsThing == null) throw new IllegalArgumentException("The lsThing argument is required");
+    public static Long countFindLsThingStatesByLsThing(LsThing lsThing) {
+        if (lsThing == null)
+            throw new IllegalArgumentException("The lsThing argument is required");
         EntityManager em = LsThingState.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingState AS o WHERE o.lsThing = :lsThing", Long.class);
         q.setParameter("lsThing", lsThing);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsThingStatesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static Long countFindLsThingStatesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = LsThingState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingState AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingState AS o WHERE o.lsTransaction = :lsTransaction",
+                Long.class);
         q.setParameter("lsTransaction", lsTransaction);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<LsThingState> findLsThingStatesByLsThing(LsThing lsThing) {
-        if (lsThing == null) throw new IllegalArgumentException("The lsThing argument is required");
+    public static TypedQuery<LsThingState> findLsThingStatesByLsThing(LsThing lsThing) {
+        if (lsThing == null)
+            throw new IllegalArgumentException("The lsThing argument is required");
         EntityManager em = LsThingState.entityManager();
-        TypedQuery<LsThingState> q = em.createQuery("SELECT o FROM LsThingState AS o WHERE o.lsThing = :lsThing", LsThingState.class);
+        TypedQuery<LsThingState> q = em.createQuery("SELECT o FROM LsThingState AS o WHERE o.lsThing = :lsThing",
+                LsThingState.class);
         q.setParameter("lsThing", lsThing);
         return q;
     }
 
-	public static TypedQuery<LsThingState> findLsThingStatesByLsThing(LsThing lsThing, String sortFieldName, String sortOrder) {
-        if (lsThing == null) throw new IllegalArgumentException("The lsThing argument is required");
+    public static TypedQuery<LsThingState> findLsThingStatesByLsThing(LsThing lsThing, String sortFieldName,
+            String sortOrder) {
+        if (lsThing == null)
+            throw new IllegalArgumentException("The lsThing argument is required");
         EntityManager em = LsThingState.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingState AS o WHERE o.lsThing = :lsThing");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -223,18 +242,23 @@ public static TypedQuery<LsThingState> findLsThingStatesByLsThing(LsThing lsThin
         return q;
     }
 
-	public static TypedQuery<LsThingState> findLsThingStatesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<LsThingState> findLsThingStatesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = LsThingState.entityManager();
-        TypedQuery<LsThingState> q = em.createQuery("SELECT o FROM LsThingState AS o WHERE o.lsTransaction = :lsTransaction", LsThingState.class);
+        TypedQuery<LsThingState> q = em.createQuery(
+                "SELECT o FROM LsThingState AS o WHERE o.lsTransaction = :lsTransaction", LsThingState.class);
         q.setParameter("lsTransaction", lsTransaction);
         return q;
     }
 
-	public static TypedQuery<LsThingState> findLsThingStatesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<LsThingState> findLsThingStatesByLsTransactionEquals(Long lsTransaction,
+            String sortFieldName, String sortOrder) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = LsThingState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingState AS o WHERE o.lsTransaction = :lsTransaction");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LsThingState AS o WHERE o.lsTransaction = :lsTransaction");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -246,19 +270,19 @@ public static TypedQuery<LsThingState> findLsThingStatesByLsTransactionEquals(Lo
         return q;
     }
 
-	public LsThing getLsThing() {
+    public LsThing getLsThing() {
         return this.lsThing;
     }
 
-	public void setLsThing(LsThing lsThing) {
+    public void setLsThing(LsThing lsThing) {
         this.lsThing = lsThing;
     }
 
-	public Set<LsThingValue> getLsValues() {
+    public Set<LsThingValue> getLsValues() {
         return this.lsValues;
     }
 
-	public void setLsValues(Set<LsThingValue> lsValues) {
+    public void setLsValues(Set<LsThingValue> lsValues) {
         this.lsValues = lsValues;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LsThingValue.java b/src/main/java/com/labsynch/labseer/domain/LsThingValue.java
index 85816ec67..d1b18eecf 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsThingValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsThingValue.java
@@ -30,14 +30,13 @@
 @Configurable
 public class LsThingValue extends AbstractValue {
 
-	private static final Logger logger = LoggerFactory.getLogger(LsThingValue.class);
+    private static final Logger logger = LoggerFactory.getLogger(LsThingValue.class);
 
-	
     @NotNull
     @ManyToOne
     @JoinColumn(name = "lsthing_state_id")
     private LsThingState lsState;
-    
+
     public LsThingValue(LsThingValue lsThingValue) {
         super.setBlobValue(lsThingValue.getBlobValue());
         super.setClobValue(lsThingValue.getClobValue());
@@ -76,164 +75,180 @@ public LsThingValue(LsThingValue lsThingValue) {
         super.setUnitTypeAndKind(lsThingValue.getUnitTypeAndKind());
         super.setUrlValue(lsThingValue.getUrlValue());
         super.setVersion(lsThingValue.getVersion());
-        
-	}
+
+    }
+
     public LsThingValue() {
     }
 
-	public static LsThingValue fromJsonToLsThingValue(String json) {
-        return new JSONDeserializer<LsThingValue>().
-        		use(null, LsThingValue.class).
-        		
-        		deserialize(json);
+    public static LsThingValue fromJsonToLsThingValue(String json) {
+        return new JSONDeserializer<LsThingValue>().use(null, LsThingValue.class).
+
+                deserialize(json);
     }
-        
+
     public static Collection<LsThingValue> fromJsonArrayToLsThingValues(String json) {
-        return new JSONDeserializer<List<LsThingValue>>().
-        		use(null, ArrayList.class).
-        		use("values", LsThingValue.class).
-        		
-        		deserialize(json);
+        return new JSONDeserializer<List<LsThingValue>>().use(null, ArrayList.class).use("values", LsThingValue.class).
+
+                deserialize(json);
     }
-    
+
     public static Collection<LsThingValue> fromJsonArrayToLsThingValues(Reader json) {
-        return new JSONDeserializer<List<LsThingValue>>().
-        		use(null, ArrayList.class).
-        		use("values", LsThingValue.class).
-        		
-        		deserialize(json);
-    }
-
-
-	public static LsThingValue update(LsThingValue lsThingValue) {
-		
-		logger.debug("attempting to update lsThingValue: "  + lsThingValue.toJson());
-		LsThingValue updatedLsThingValue = null;
-		try {
-			updatedLsThingValue = new JSONDeserializer<LsThingValue>().
-					use(null, LsThingValue.class).
-					
-					deserializeInto(lsThingValue.toJson(), LsThingValue.findLsThingValue(lsThingValue.getId()));	
-			LsThingState lsThingState = LsThingState.findLsThingState(lsThingValue.getLsState().getId());
-			updatedLsThingValue.setLsState(lsThingState);
-			updatedLsThingValue.merge();
-			
-		} catch (Exception e){
-			logger.error("caught the error " + e);
-		}
-		return updatedLsThingValue;
-	}
-
-	@Transactional
-	public static LsThingValue saveLsThingValue(LsTransaction lsTransaction,
-			LsThingState lsThingState, String lsType, String lsKind,
-			String lsValue) {
-
-		LsThingValue newLsValue = new LsThingValue();
-		newLsValue.setLsTransaction(lsTransaction.getId());
-		newLsValue.setLsState(lsThingState);
-		newLsValue.setLsType(lsType);
-		newLsValue.setLsKind(lsKind);
-		newLsValue.setStringValue(lsValue);
-
-		return newLsValue;
-		
-	}
-
-	public static LsThingValue saveLsThingValue(LsTransaction lsTransaction,
-			LsThingState lsThingState, String lsType, String lsKind, Date lsValue) {
-
-		LsThingValue newLsValue = new LsThingValue();
-		newLsValue.setLsTransaction(lsTransaction.getId());
-		newLsValue.setLsState(lsThingState);
-		newLsValue.setLsType(lsType);
-		newLsValue.setLsKind(lsKind);
-		newLsValue.setDateValue(lsValue);
-		
-		return newLsValue;
-		
-	}
-
-	public static TypedQuery<LsThingValue> findLsThingValuesByLsThingIDAndStateTypeKindAndValueTypeKind(
-			Long lsThingId, String stateType, String stateKind,
-			String valueType, String valueKind) {
-		
-		if (stateType == null || stateType.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-		if (valueType == null || valueType.length() == 0) throw new IllegalArgumentException("The valueType argument is required");
-		if (valueKind == null || valueKind.length() == 0) throw new IllegalArgumentException("The valueKind argument is required");
-		
-		EntityManager em = entityManager();
-		String hsqlQuery = "SELECT lstv FROM LsThingValue AS lstv " +
-				"JOIN lstv.lsState lsts " +
-				"JOIN lsts.lsThing lst " +
-				"WHERE lsts.lsType = :stateType AND lsts.lsKind = :stateKind AND lsts.ignored IS NOT :ignored " +
-				"AND lstv.lsType = :valueType AND lstv.lsKind = :valueKind AND lstv.ignored IS NOT :ignored " +
-				"AND lst.ignored IS NOT :ignored " +
-				"AND lst.id = :lsThingId ";
-		TypedQuery<LsThingValue> q = em.createQuery(hsqlQuery, LsThingValue.class);
-		q.setParameter("lsThingId", lsThingId);
-		q.setParameter("stateType", stateType);
-		q.setParameter("stateKind", stateKind);
-		q.setParameter("valueType", valueType);
-		q.setParameter("valueKind", valueKind);
-		q.setParameter("ignored", true);
-		return q;
-	}
-	
-	public static TypedQuery<LsThingValue> findLsThingValuesByLsThingCodeNameAndStateTypeKindAndValueTypeKind(
-			String lsThingCodeName, String stateType, String stateKind,
-			String valueType, String valueKind) {
-		
-		if (stateType == null || stateType.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-		if (valueType == null || valueType.length() == 0) throw new IllegalArgumentException("The valueType argument is required");
-		if (valueKind == null || valueKind.length() == 0) throw new IllegalArgumentException("The valueKind argument is required");
-		
-		EntityManager em = entityManager();
-		String hsqlQuery = "SELECT lstv FROM LsThingValue AS lstv " +
-				"JOIN lstv.lsState lsts " +
-				"JOIN lsts.lsThing lst " +
-				"WHERE lsts.lsType = :stateType AND lsts.lsKind = :stateKind AND lsts.ignored IS NOT :ignored " +
-				"AND lstv.lsType = :valueType AND lstv.lsKind = :valueKind AND lstv.ignored IS NOT :ignored " +
-				"AND lst.ignored IS NOT :ignored " +
-				"AND lst.codeName = :lsThingCodeName ";
-		TypedQuery<LsThingValue> q = em.createQuery(hsqlQuery, LsThingValue.class);
-		q.setParameter("lsThingCodeName", lsThingCodeName);
-		q.setParameter("stateType", stateType);
-		q.setParameter("stateKind", stateKind);
-		q.setParameter("valueType", valueType);
-		q.setParameter("valueKind", valueKind);
-		q.setParameter("ignored", true);
-		return q;
-	}
-	
-	public static com.labsynch.labseer.domain.LsThingValue create(com.labsynch.labseer.domain.LsThingValue lsThingValue) {
-        LsThingValue newLsThingValue = new JSONDeserializer<LsThingValue>().use(null, LsThingValue.class).deserializeInto(lsThingValue.toJson(), new LsThingValue());
+        return new JSONDeserializer<List<LsThingValue>>().use(null, ArrayList.class).use("values", LsThingValue.class).
+
+                deserialize(json);
+    }
+
+    public static LsThingValue update(LsThingValue lsThingValue) {
+
+        logger.debug("attempting to update lsThingValue: " + lsThingValue.toJson());
+        LsThingValue updatedLsThingValue = null;
+        try {
+            updatedLsThingValue = new JSONDeserializer<LsThingValue>().use(null, LsThingValue.class).
+
+                    deserializeInto(lsThingValue.toJson(), LsThingValue.findLsThingValue(lsThingValue.getId()));
+            LsThingState lsThingState = LsThingState.findLsThingState(lsThingValue.getLsState().getId());
+            updatedLsThingValue.setLsState(lsThingState);
+            updatedLsThingValue.merge();
+
+        } catch (Exception e) {
+            logger.error("caught the error " + e);
+        }
+        return updatedLsThingValue;
+    }
+
+    @Transactional
+    public static LsThingValue saveLsThingValue(LsTransaction lsTransaction,
+            LsThingState lsThingState, String lsType, String lsKind,
+            String lsValue) {
+
+        LsThingValue newLsValue = new LsThingValue();
+        newLsValue.setLsTransaction(lsTransaction.getId());
+        newLsValue.setLsState(lsThingState);
+        newLsValue.setLsType(lsType);
+        newLsValue.setLsKind(lsKind);
+        newLsValue.setStringValue(lsValue);
+
+        return newLsValue;
+
+    }
+
+    public static LsThingValue saveLsThingValue(LsTransaction lsTransaction,
+            LsThingState lsThingState, String lsType, String lsKind, Date lsValue) {
+
+        LsThingValue newLsValue = new LsThingValue();
+        newLsValue.setLsTransaction(lsTransaction.getId());
+        newLsValue.setLsState(lsThingState);
+        newLsValue.setLsType(lsType);
+        newLsValue.setLsKind(lsKind);
+        newLsValue.setDateValue(lsValue);
+
+        return newLsValue;
+
+    }
+
+    public static TypedQuery<LsThingValue> findLsThingValuesByLsThingIDAndStateTypeKindAndValueTypeKind(
+            Long lsThingId, String stateType, String stateKind,
+            String valueType, String valueKind) {
+
+        if (stateType == null || stateType.length() == 0)
+            throw new IllegalArgumentException("The stateType argument is required");
+        if (stateKind == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateKind argument is required");
+        if (valueType == null || valueType.length() == 0)
+            throw new IllegalArgumentException("The valueType argument is required");
+        if (valueKind == null || valueKind.length() == 0)
+            throw new IllegalArgumentException("The valueKind argument is required");
+
+        EntityManager em = entityManager();
+        String hsqlQuery = "SELECT lstv FROM LsThingValue AS lstv " +
+                "JOIN lstv.lsState lsts " +
+                "JOIN lsts.lsThing lst " +
+                "WHERE lsts.lsType = :stateType AND lsts.lsKind = :stateKind AND lsts.ignored IS NOT :ignored " +
+                "AND lstv.lsType = :valueType AND lstv.lsKind = :valueKind AND lstv.ignored IS NOT :ignored " +
+                "AND lst.ignored IS NOT :ignored " +
+                "AND lst.id = :lsThingId ";
+        TypedQuery<LsThingValue> q = em.createQuery(hsqlQuery, LsThingValue.class);
+        q.setParameter("lsThingId", lsThingId);
+        q.setParameter("stateType", stateType);
+        q.setParameter("stateKind", stateKind);
+        q.setParameter("valueType", valueType);
+        q.setParameter("valueKind", valueKind);
+        q.setParameter("ignored", true);
+        return q;
+    }
+
+    public static TypedQuery<LsThingValue> findLsThingValuesByLsThingCodeNameAndStateTypeKindAndValueTypeKind(
+            String lsThingCodeName, String stateType, String stateKind,
+            String valueType, String valueKind) {
+
+        if (stateType == null || stateType.length() == 0)
+            throw new IllegalArgumentException("The stateType argument is required");
+        if (stateKind == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateKind argument is required");
+        if (valueType == null || valueType.length() == 0)
+            throw new IllegalArgumentException("The valueType argument is required");
+        if (valueKind == null || valueKind.length() == 0)
+            throw new IllegalArgumentException("The valueKind argument is required");
+
+        EntityManager em = entityManager();
+        String hsqlQuery = "SELECT lstv FROM LsThingValue AS lstv " +
+                "JOIN lstv.lsState lsts " +
+                "JOIN lsts.lsThing lst " +
+                "WHERE lsts.lsType = :stateType AND lsts.lsKind = :stateKind AND lsts.ignored IS NOT :ignored " +
+                "AND lstv.lsType = :valueType AND lstv.lsKind = :valueKind AND lstv.ignored IS NOT :ignored " +
+                "AND lst.ignored IS NOT :ignored " +
+                "AND lst.codeName = :lsThingCodeName ";
+        TypedQuery<LsThingValue> q = em.createQuery(hsqlQuery, LsThingValue.class);
+        q.setParameter("lsThingCodeName", lsThingCodeName);
+        q.setParameter("stateType", stateType);
+        q.setParameter("stateKind", stateKind);
+        q.setParameter("valueType", valueType);
+        q.setParameter("valueKind", valueKind);
+        q.setParameter("ignored", true);
+        return q;
+    }
+
+    public static com.labsynch.labseer.domain.LsThingValue create(
+            com.labsynch.labseer.domain.LsThingValue lsThingValue) {
+        LsThingValue newLsThingValue = new JSONDeserializer<LsThingValue>().use(null, LsThingValue.class)
+                .deserializeInto(lsThingValue.toJson(), new LsThingValue());
         return newLsThingValue;
     }
-	
-	public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndDateValueLike(String lsKind, Date dateValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (dateValue == null) throw new IllegalArgumentException("The dateValue argument is required");
+
+    public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndDateValueLike(String lsKind,
+            Date dateValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (dateValue == null)
+            throw new IllegalArgumentException("The dateValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        TypedQuery<LsThingValue> q = em.createQuery("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind AND o.ignored IS false AND date(o.dateValue) = CAST(:dateValue AS date) ", LsThingValue.class);
+        TypedQuery<LsThingValue> q = em.createQuery(
+                "SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind AND o.ignored IS false AND date(o.dateValue) = CAST(:dateValue AS date) ",
+                LsThingValue.class);
         q.setParameter("lsKind", lsKind);
         q.setParameter("dateValue", dateValue);
         return q;
     }
-	public static TypedQuery<LsThingValue> findLsThingValuesByStringValueLike(
-			String stringValue) {
-		if (stringValue == null) throw new IllegalArgumentException("The stringValue argument is required");
+
+    public static TypedQuery<LsThingValue> findLsThingValuesByStringValueLike(
+            String stringValue) {
+        if (stringValue == null)
+            throw new IllegalArgumentException("The stringValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        TypedQuery<LsThingValue> q = em.createQuery("SELECT o FROM LsThingValue AS o WHERE o.ignored IS false AND o.stringValue LIKE :stringValue ", LsThingValue.class);
+        TypedQuery<LsThingValue> q = em.createQuery(
+                "SELECT o FROM LsThingValue AS o WHERE o.ignored IS false AND o.stringValue LIKE :stringValue ",
+                LsThingValue.class);
         q.setParameter("stringValue", stringValue);
         return q;
-	}
-	
-	public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndCodeValueLike(String lsKind, String codeValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+    }
+
+    public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndCodeValueLike(String lsKind,
+            String codeValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (codeValue == null || codeValue.length() == 0)
+            throw new IllegalArgumentException("The codeValue argument is required");
         codeValue = codeValue.replace('*', '%');
         if (codeValue.charAt(0) != '%') {
             codeValue = "%" + codeValue;
@@ -242,65 +257,95 @@ public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndCodeVal
             codeValue = codeValue + "%";
         }
         EntityManager em = LsThingValue.entityManager();
-        TypedQuery<LsThingValue> q = em.createQuery("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind AND o.ignored IS false AND LOWER(o.codeValue) LIKE LOWER(:codeValue)", LsThingValue.class);
+        TypedQuery<LsThingValue> q = em.createQuery(
+                "SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind AND o.ignored IS false AND LOWER(o.codeValue) LIKE LOWER(:codeValue)",
+                LsThingValue.class);
         q.setParameter("lsKind", lsKind);
         q.setParameter("codeValue", codeValue);
         return q;
     }
-    
-    public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndDateValueGreaterThanEquals(String lsKind, Date dateValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (dateValue == null) throw new IllegalArgumentException("The dateValue argument is required");
+
+    public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndDateValueGreaterThanEquals(String lsKind,
+            Date dateValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (dateValue == null)
+            throw new IllegalArgumentException("The dateValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        TypedQuery<LsThingValue> q = em.createQuery("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind AND o.ignored IS false AND o.dateValue >= :dateValue", LsThingValue.class);
+        TypedQuery<LsThingValue> q = em.createQuery(
+                "SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind AND o.ignored IS false AND o.dateValue >= :dateValue",
+                LsThingValue.class);
         q.setParameter("lsKind", lsKind);
         q.setParameter("dateValue", dateValue);
         return q;
     }
-    
-    public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndDateValueLessThanEquals(String lsKind, Date dateValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (dateValue == null) throw new IllegalArgumentException("The dateValue argument is required");
+
+    public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndDateValueLessThanEquals(String lsKind,
+            Date dateValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (dateValue == null)
+            throw new IllegalArgumentException("The dateValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        TypedQuery<LsThingValue> q = em.createQuery("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind AND o.ignored IS false AND o.dateValue <= :dateValue", LsThingValue.class);
+        TypedQuery<LsThingValue> q = em.createQuery(
+                "SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind AND o.ignored IS false AND o.dateValue <= :dateValue",
+                LsThingValue.class);
         q.setParameter("lsKind", lsKind);
         q.setParameter("dateValue", dateValue);
         return q;
     }
-    
-    public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndNumericValueEquals(String lsKind, BigDecimal numericValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (numericValue == null) throw new IllegalArgumentException("The numericValue argument is required");
+
+    public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndNumericValueEquals(String lsKind,
+            BigDecimal numericValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (numericValue == null)
+            throw new IllegalArgumentException("The numericValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        TypedQuery<LsThingValue> q = em.createQuery("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind AND o.ignored IS false AND o.numericValue = :numericValue", LsThingValue.class);
+        TypedQuery<LsThingValue> q = em.createQuery(
+                "SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind AND o.ignored IS false AND o.numericValue = :numericValue",
+                LsThingValue.class);
         q.setParameter("lsKind", lsKind);
         q.setParameter("numericValue", numericValue);
         return q;
     }
-    
-    public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndNumericValueGreaterThanEquals(String lsKind, BigDecimal numericValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (numericValue == null) throw new IllegalArgumentException("The numericValue argument is required");
+
+    public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndNumericValueGreaterThanEquals(
+            String lsKind, BigDecimal numericValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (numericValue == null)
+            throw new IllegalArgumentException("The numericValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        TypedQuery<LsThingValue> q = em.createQuery("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind AND o.ignored IS false AND o.numericValue >= :numericValue", LsThingValue.class);
+        TypedQuery<LsThingValue> q = em.createQuery(
+                "SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind AND o.ignored IS false AND o.numericValue >= :numericValue",
+                LsThingValue.class);
         q.setParameter("lsKind", lsKind);
         q.setParameter("numericValue", numericValue);
         return q;
     }
-    
-    public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndNumericValueLessThanEquals(String lsKind, BigDecimal numericValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (numericValue == null) throw new IllegalArgumentException("The numericValue argument is required");
+
+    public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndNumericValueLessThanEquals(String lsKind,
+            BigDecimal numericValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (numericValue == null)
+            throw new IllegalArgumentException("The numericValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        TypedQuery<LsThingValue> q = em.createQuery("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind AND o.ignored IS false AND o.numericValue <= :numericValue", LsThingValue.class);
+        TypedQuery<LsThingValue> q = em.createQuery(
+                "SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind AND o.ignored IS false AND o.numericValue <= :numericValue",
+                LsThingValue.class);
         q.setParameter("lsKind", lsKind);
         q.setParameter("numericValue", numericValue);
         return q;
     }
-    
-    public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndStringValueLike(String lsKind, String stringValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+
+    public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndStringValueLike(String lsKind,
+            String stringValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0)
+            throw new IllegalArgumentException("The stringValue argument is required");
         stringValue = stringValue.replace('*', '%');
         if (stringValue.charAt(0) != '%') {
             stringValue = "%" + stringValue;
@@ -309,106 +354,120 @@ public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndStringV
             stringValue = stringValue + "%";
         }
         EntityManager em = LsThingValue.entityManager();
-        TypedQuery<LsThingValue> q = em.createQuery("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind AND o.ignored IS false AND LOWER(o.stringValue) LIKE LOWER(:stringValue)", LsThingValue.class);
+        TypedQuery<LsThingValue> q = em.createQuery(
+                "SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind AND o.ignored IS false AND LOWER(o.stringValue) LIKE LOWER(:stringValue)",
+                LsThingValue.class);
         q.setParameter("lsKind", lsKind);
         q.setParameter("stringValue", stringValue);
         return q;
     }
-    
-    public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndStringValueEqualsIgnoreCase(String lsKind, String stringValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+
+    public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndStringValueEqualsIgnoreCase(String lsKind,
+            String stringValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0)
+            throw new IllegalArgumentException("The stringValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        TypedQuery<LsThingValue> q = em.createQuery("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind AND o.ignored IS false AND LOWER(o.stringValue) = LOWER(:stringValue)", LsThingValue.class);
+        TypedQuery<LsThingValue> q = em.createQuery(
+                "SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind AND o.ignored IS false AND LOWER(o.stringValue) = LOWER(:stringValue)",
+                LsThingValue.class);
         q.setParameter("lsKind", lsKind);
         q.setParameter("stringValue", stringValue);
         return q;
     }
-    
-    public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndStringValueEquals(String lsKind, String stringValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+
+    public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndStringValueEquals(String lsKind,
+            String stringValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0)
+            throw new IllegalArgumentException("The stringValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        TypedQuery<LsThingValue> q = em.createQuery("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind AND o.ignored IS false AND o.stringValue = :stringValue", LsThingValue.class);
+        TypedQuery<LsThingValue> q = em.createQuery(
+                "SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind AND o.ignored IS false AND o.stringValue = :stringValue",
+                LsThingValue.class);
         q.setParameter("lsKind", lsKind);
         q.setParameter("stringValue", stringValue);
         return q;
     }
-    
+
     public static TypedQuery<LsThingValue> findLsThingValuesByTypeKindFullPath(
-			String thingType, String thingKind,
-			String stateType, String stateKind,
-			String valueType, String valueKind) {
-    	if (thingType == null || thingType.length() == 0) throw new IllegalArgumentException("The thingType argument is required");
-		if (thingKind == null || thingKind.length() == 0) throw new IllegalArgumentException("The thingKind argument is required");
-		if (stateType == null || stateType.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-		if (valueType == null || valueType.length() == 0) throw new IllegalArgumentException("The valueType argument is required");
-		if (valueKind == null || valueKind.length() == 0) throw new IllegalArgumentException("The valueKind argument is required");
-		
-		EntityManager em = entityManager();
-		String hsqlQuery = "SELECT lstv FROM LsThingValue AS lstv " +
-				"JOIN lstv.lsState lsts " +
-				"JOIN lsts.lsThing lst " +
-				"WHERE lst.lsType = :thingType AND lst.lsKind = :thingKind AND lst.ignored IS NOT :ignored " +
-				"AND lsts.lsType = :stateType AND lsts.lsKind = :stateKind AND lsts.ignored IS NOT :ignored " +
-				"AND lstv.lsType = :valueType AND lstv.lsKind = :valueKind AND lstv.ignored IS NOT :ignored "
-				;
-		TypedQuery<LsThingValue> q = em.createQuery(hsqlQuery, LsThingValue.class);
-		q.setParameter("thingType", thingType);
-		q.setParameter("thingKind", thingKind);
-		q.setParameter("stateType", stateType);
-		q.setParameter("stateKind", stateKind);
-		q.setParameter("valueType", valueType);
-		q.setParameter("valueKind", valueKind);
-		q.setParameter("ignored", true);
-		return q;
-	}
+            String thingType, String thingKind,
+            String stateType, String stateKind,
+            String valueType, String valueKind) {
+        if (thingType == null || thingType.length() == 0)
+            throw new IllegalArgumentException("The thingType argument is required");
+        if (thingKind == null || thingKind.length() == 0)
+            throw new IllegalArgumentException("The thingKind argument is required");
+        if (stateType == null || stateType.length() == 0)
+            throw new IllegalArgumentException("The stateType argument is required");
+        if (stateKind == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateKind argument is required");
+        if (valueType == null || valueType.length() == 0)
+            throw new IllegalArgumentException("The valueType argument is required");
+        if (valueKind == null || valueKind.length() == 0)
+            throw new IllegalArgumentException("The valueKind argument is required");
+
+        EntityManager em = entityManager();
+        String hsqlQuery = "SELECT lstv FROM LsThingValue AS lstv " +
+                "JOIN lstv.lsState lsts " +
+                "JOIN lsts.lsThing lst " +
+                "WHERE lst.lsType = :thingType AND lst.lsKind = :thingKind AND lst.ignored IS NOT :ignored " +
+                "AND lsts.lsType = :stateType AND lsts.lsKind = :stateKind AND lsts.ignored IS NOT :ignored " +
+                "AND lstv.lsType = :valueType AND lstv.lsKind = :valueKind AND lstv.ignored IS NOT :ignored ";
+        TypedQuery<LsThingValue> q = em.createQuery(hsqlQuery, LsThingValue.class);
+        q.setParameter("thingType", thingType);
+        q.setParameter("thingKind", thingKind);
+        q.setParameter("stateType", stateType);
+        q.setParameter("stateKind", stateKind);
+        q.setParameter("valueType", valueType);
+        q.setParameter("valueKind", valueKind);
+        q.setParameter("ignored", true);
+        return q;
+    }
 
     @Transactional
     public String toJsonWithBlobValue() {
-        return new JSONSerializer().
-                exclude("*.class").
-                include("blobValue").
-                transform(new ByteArrayTransformer(), "blobValue").
-                serialize(this);
-     }
-
-	public String toString() {
+        return new JSONSerializer().exclude("*.class").include("blobValue")
+                .transform(new ByteArrayTransformer(), "blobValue").serialize(this);
+    }
+
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static String toJsonArray(Collection<LsThingValue> collection) {
+    public static String toJsonArray(Collection<LsThingValue> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<LsThingValue> collection, String[] fields) {
+    public static String toJsonArray(Collection<LsThingValue> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsState");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsState");
 
-	public static long countLsThingValues() {
+    public static long countLsThingValues() {
         return entityManager().createQuery("SELECT COUNT(o) FROM LsThingValue o", Long.class).getSingleResult();
     }
 
-	public static List<LsThingValue> findAllLsThingValues() {
+    public static List<LsThingValue> findAllLsThingValues() {
         return entityManager().createQuery("SELECT o FROM LsThingValue o", LsThingValue.class).getResultList();
     }
 
-	public static List<LsThingValue> findAllLsThingValues(String sortFieldName, String sortOrder) {
+    public static List<LsThingValue> findAllLsThingValues(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LsThingValue o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -419,16 +478,19 @@ public static List<LsThingValue> findAllLsThingValues(String sortFieldName, Stri
         return entityManager().createQuery(jpaQuery, LsThingValue.class).getResultList();
     }
 
-	public static LsThingValue findLsThingValue(Long id) {
-        if (id == null) return null;
+    public static LsThingValue findLsThingValue(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(LsThingValue.class, id);
     }
 
-	public static List<LsThingValue> findLsThingValueEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsThingValue o", LsThingValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<LsThingValue> findLsThingValueEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsThingValue o", LsThingValue.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<LsThingValue> findLsThingValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<LsThingValue> findLsThingValueEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM LsThingValue o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -436,37 +498,46 @@ public static List<LsThingValue> findLsThingValueEntries(int firstResult, int ma
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, LsThingValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, LsThingValue.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public LsThingValue merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         LsThingValue merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public static Long countFindLsThingValuesByCodeValueEquals(String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+    public static Long countFindLsThingValuesByCodeValueEquals(String codeValue) {
+        if (codeValue == null || codeValue.length() == 0)
+            throw new IllegalArgumentException("The codeValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.codeValue = :codeValue", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.codeValue = :codeValue",
+                Long.class);
         q.setParameter("codeValue", codeValue);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsThingValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+    public static Long countFindLsThingValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
+        if (codeValue == null || codeValue.length() == 0)
+            throw new IllegalArgumentException("The codeValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM LsThingValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue",
+                Long.class);
         q.setParameter("ignored", ignored);
         q.setParameter("codeValue", codeValue);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsThingValuesByLsKindEqualsAndCodeValueLike(String lsKind, String codeValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+    public static Long countFindLsThingValuesByLsKindEqualsAndCodeValueLike(String lsKind, String codeValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (codeValue == null || codeValue.length() == 0)
+            throw new IllegalArgumentException("The codeValue argument is required");
         codeValue = codeValue.replace('*', '%');
         if (codeValue.charAt(0) != '%') {
             codeValue = "%" + codeValue;
@@ -475,85 +546,121 @@ public static Long countFindLsThingValuesByLsKindEqualsAndCodeValueLike(String l
             codeValue = codeValue + "%";
         }
         EntityManager em = LsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)",
+                Long.class);
         q.setParameter("lsKind", lsKind);
         q.setParameter("codeValue", codeValue);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsThingValuesByLsKindEqualsAndDateValueGreaterThanEquals(String lsKind, Date dateValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (dateValue == null) throw new IllegalArgumentException("The dateValue argument is required");
+    public static Long countFindLsThingValuesByLsKindEqualsAndDateValueGreaterThanEquals(String lsKind,
+            Date dateValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (dateValue == null)
+            throw new IllegalArgumentException("The dateValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.dateValue >= :dateValue", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.dateValue >= :dateValue",
+                Long.class);
         q.setParameter("lsKind", lsKind);
         q.setParameter("dateValue", dateValue);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsThingValuesByLsKindEqualsAndDateValueLessThanEquals(String lsKind, Date dateValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (dateValue == null) throw new IllegalArgumentException("The dateValue argument is required");
+    public static Long countFindLsThingValuesByLsKindEqualsAndDateValueLessThanEquals(String lsKind, Date dateValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (dateValue == null)
+            throw new IllegalArgumentException("The dateValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.dateValue <= :dateValue", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.dateValue <= :dateValue",
+                Long.class);
         q.setParameter("lsKind", lsKind);
         q.setParameter("dateValue", dateValue);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsThingValuesByLsKindEqualsAndDateValueLike(String lsKind, Date dateValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (dateValue == null) throw new IllegalArgumentException("The dateValue argument is required");
+    public static Long countFindLsThingValuesByLsKindEqualsAndDateValueLike(String lsKind, Date dateValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (dateValue == null)
+            throw new IllegalArgumentException("The dateValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.dateValue) LIKE LOWER(:dateValue)", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.dateValue) LIKE LOWER(:dateValue)",
+                Long.class);
         q.setParameter("lsKind", lsKind);
         q.setParameter("dateValue", dateValue);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsThingValuesByLsKindEqualsAndNumericValueEquals(String lsKind, BigDecimal numericValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (numericValue == null) throw new IllegalArgumentException("The numericValue argument is required");
+    public static Long countFindLsThingValuesByLsKindEqualsAndNumericValueEquals(String lsKind,
+            BigDecimal numericValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (numericValue == null)
+            throw new IllegalArgumentException("The numericValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.numericValue = :numericValue", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.numericValue = :numericValue",
+                Long.class);
         q.setParameter("lsKind", lsKind);
         q.setParameter("numericValue", numericValue);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsThingValuesByLsKindEqualsAndNumericValueGreaterThanEquals(String lsKind, BigDecimal numericValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (numericValue == null) throw new IllegalArgumentException("The numericValue argument is required");
+    public static Long countFindLsThingValuesByLsKindEqualsAndNumericValueGreaterThanEquals(String lsKind,
+            BigDecimal numericValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (numericValue == null)
+            throw new IllegalArgumentException("The numericValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.numericValue >= :numericValue", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.numericValue >= :numericValue",
+                Long.class);
         q.setParameter("lsKind", lsKind);
         q.setParameter("numericValue", numericValue);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsThingValuesByLsKindEqualsAndNumericValueLessThanEquals(String lsKind, BigDecimal numericValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (numericValue == null) throw new IllegalArgumentException("The numericValue argument is required");
+    public static Long countFindLsThingValuesByLsKindEqualsAndNumericValueLessThanEquals(String lsKind,
+            BigDecimal numericValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (numericValue == null)
+            throw new IllegalArgumentException("The numericValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.numericValue <= :numericValue", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.numericValue <= :numericValue",
+                Long.class);
         q.setParameter("lsKind", lsKind);
         q.setParameter("numericValue", numericValue);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsThingValuesByLsKindEqualsAndStringValueEquals(String lsKind, String stringValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+    public static Long countFindLsThingValuesByLsKindEqualsAndStringValueEquals(String lsKind, String stringValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0)
+            throw new IllegalArgumentException("The stringValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.stringValue = :stringValue", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.stringValue = :stringValue",
+                Long.class);
         q.setParameter("lsKind", lsKind);
         q.setParameter("stringValue", stringValue);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsThingValuesByLsKindEqualsAndStringValueLike(String lsKind, String stringValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+    public static Long countFindLsThingValuesByLsKindEqualsAndStringValueLike(String lsKind, String stringValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0)
+            throw new IllegalArgumentException("The stringValue argument is required");
         stringValue = stringValue.replace('*', '%');
         if (stringValue.charAt(0) != '%') {
             stringValue = "%" + stringValue;
@@ -562,40 +669,50 @@ public static Long countFindLsThingValuesByLsKindEqualsAndStringValueLike(String
             stringValue = stringValue + "%";
         }
         EntityManager em = LsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)",
+                Long.class);
         q.setParameter("lsKind", lsKind);
         q.setParameter("stringValue", stringValue);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsThingValuesByLsState(LsThingState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+    public static Long countFindLsThingValuesByLsState(LsThingState lsState) {
+        if (lsState == null)
+            throw new IllegalArgumentException("The lsState argument is required");
         EntityManager em = LsThingValue.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsState = :lsState", Long.class);
         q.setParameter("lsState", lsState);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindLsThingValuesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static Long countFindLsThingValuesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = LsThingValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM LsThingValue AS o WHERE o.lsTransaction = :lsTransaction",
+                Long.class);
         q.setParameter("lsTransaction", lsTransaction);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<LsThingValue> findLsThingValuesByCodeValueEquals(String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+    public static TypedQuery<LsThingValue> findLsThingValuesByCodeValueEquals(String codeValue) {
+        if (codeValue == null || codeValue.length() == 0)
+            throw new IllegalArgumentException("The codeValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        TypedQuery<LsThingValue> q = em.createQuery("SELECT o FROM LsThingValue AS o WHERE o.codeValue = :codeValue", LsThingValue.class);
+        TypedQuery<LsThingValue> q = em.createQuery("SELECT o FROM LsThingValue AS o WHERE o.codeValue = :codeValue",
+                LsThingValue.class);
         q.setParameter("codeValue", codeValue);
         return q;
     }
 
-	public static TypedQuery<LsThingValue> findLsThingValuesByCodeValueEquals(String codeValue, String sortFieldName, String sortOrder) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+    public static TypedQuery<LsThingValue> findLsThingValuesByCodeValueEquals(String codeValue, String sortFieldName,
+            String sortOrder) {
+        if (codeValue == null || codeValue.length() == 0)
+            throw new IllegalArgumentException("The codeValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.codeValue = :codeValue");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LsThingValue AS o WHERE o.codeValue = :codeValue");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -607,19 +724,26 @@ public static TypedQuery<LsThingValue> findLsThingValuesByCodeValueEquals(String
         return q;
     }
 
-	public static TypedQuery<LsThingValue> findLsThingValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+    public static TypedQuery<LsThingValue> findLsThingValuesByIgnoredNotAndCodeValueEquals(boolean ignored,
+            String codeValue) {
+        if (codeValue == null || codeValue.length() == 0)
+            throw new IllegalArgumentException("The codeValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        TypedQuery<LsThingValue> q = em.createQuery("SELECT o FROM LsThingValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", LsThingValue.class);
+        TypedQuery<LsThingValue> q = em.createQuery(
+                "SELECT o FROM LsThingValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue",
+                LsThingValue.class);
         q.setParameter("ignored", ignored);
         q.setParameter("codeValue", codeValue);
         return q;
     }
 
-	public static TypedQuery<LsThingValue> findLsThingValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue, String sortFieldName, String sortOrder) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+    public static TypedQuery<LsThingValue> findLsThingValuesByIgnoredNotAndCodeValueEquals(boolean ignored,
+            String codeValue, String sortFieldName, String sortOrder) {
+        if (codeValue == null || codeValue.length() == 0)
+            throw new IllegalArgumentException("The codeValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LsThingValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -632,9 +756,12 @@ public static TypedQuery<LsThingValue> findLsThingValuesByIgnoredNotAndCodeValue
         return q;
     }
 
-	public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndCodeValueLike(String lsKind, String codeValue, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+    public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndCodeValueLike(String lsKind,
+            String codeValue, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (codeValue == null || codeValue.length() == 0)
+            throw new IllegalArgumentException("The codeValue argument is required");
         codeValue = codeValue.replace('*', '%');
         if (codeValue.charAt(0) != '%') {
             codeValue = "%" + codeValue;
@@ -643,7 +770,8 @@ public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndCodeVal
             codeValue = codeValue + "%";
         }
         EntityManager em = LsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -656,11 +784,15 @@ public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndCodeVal
         return q;
     }
 
-	public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndDateValueGreaterThanEquals(String lsKind, Date dateValue, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (dateValue == null) throw new IllegalArgumentException("The dateValue argument is required");
+    public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndDateValueGreaterThanEquals(String lsKind,
+            Date dateValue, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (dateValue == null)
+            throw new IllegalArgumentException("The dateValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.dateValue >= :dateValue");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.dateValue >= :dateValue");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -673,11 +805,15 @@ public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndDateVal
         return q;
     }
 
-	public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndDateValueLessThanEquals(String lsKind, Date dateValue, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (dateValue == null) throw new IllegalArgumentException("The dateValue argument is required");
+    public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndDateValueLessThanEquals(String lsKind,
+            Date dateValue, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (dateValue == null)
+            throw new IllegalArgumentException("The dateValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.dateValue <= :dateValue");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.dateValue <= :dateValue");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -690,11 +826,15 @@ public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndDateVal
         return q;
     }
 
-	public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndDateValueLike(String lsKind, Date dateValue, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (dateValue == null) throw new IllegalArgumentException("The dateValue argument is required");
+    public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndDateValueLike(String lsKind,
+            Date dateValue, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (dateValue == null)
+            throw new IllegalArgumentException("The dateValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.dateValue) LIKE LOWER(:dateValue)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.dateValue) LIKE LOWER(:dateValue)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -707,11 +847,15 @@ public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndDateVal
         return q;
     }
 
-	public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndNumericValueEquals(String lsKind, BigDecimal numericValue, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (numericValue == null) throw new IllegalArgumentException("The numericValue argument is required");
+    public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndNumericValueEquals(String lsKind,
+            BigDecimal numericValue, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (numericValue == null)
+            throw new IllegalArgumentException("The numericValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.numericValue = :numericValue");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.numericValue = :numericValue");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -724,11 +868,15 @@ public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndNumeric
         return q;
     }
 
-	public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndNumericValueGreaterThanEquals(String lsKind, BigDecimal numericValue, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (numericValue == null) throw new IllegalArgumentException("The numericValue argument is required");
+    public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndNumericValueGreaterThanEquals(
+            String lsKind, BigDecimal numericValue, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (numericValue == null)
+            throw new IllegalArgumentException("The numericValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.numericValue >= :numericValue");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.numericValue >= :numericValue");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -741,11 +889,15 @@ public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndNumeric
         return q;
     }
 
-	public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndNumericValueLessThanEquals(String lsKind, BigDecimal numericValue, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (numericValue == null) throw new IllegalArgumentException("The numericValue argument is required");
+    public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndNumericValueLessThanEquals(String lsKind,
+            BigDecimal numericValue, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (numericValue == null)
+            throw new IllegalArgumentException("The numericValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.numericValue <= :numericValue");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.numericValue <= :numericValue");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -758,11 +910,15 @@ public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndNumeric
         return q;
     }
 
-	public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndStringValueEquals(String lsKind, String stringValue, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+    public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndStringValueEquals(String lsKind,
+            String stringValue, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0)
+            throw new IllegalArgumentException("The stringValue argument is required");
         EntityManager em = LsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.stringValue = :stringValue");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND o.stringValue = :stringValue");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -775,9 +931,12 @@ public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndStringV
         return q;
     }
 
-	public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndStringValueLike(String lsKind, String stringValue, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+    public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndStringValueLike(String lsKind,
+            String stringValue, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0)
+            throw new IllegalArgumentException("The stringValue argument is required");
         stringValue = stringValue.replace('*', '%');
         if (stringValue.charAt(0) != '%') {
             stringValue = "%" + stringValue;
@@ -786,7 +945,8 @@ public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndStringV
             stringValue = stringValue + "%";
         }
         EntityManager em = LsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LsThingValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -799,16 +959,20 @@ public static TypedQuery<LsThingValue> findLsThingValuesByLsKindEqualsAndStringV
         return q;
     }
 
-	public static TypedQuery<LsThingValue> findLsThingValuesByLsState(LsThingState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+    public static TypedQuery<LsThingValue> findLsThingValuesByLsState(LsThingState lsState) {
+        if (lsState == null)
+            throw new IllegalArgumentException("The lsState argument is required");
         EntityManager em = LsThingValue.entityManager();
-        TypedQuery<LsThingValue> q = em.createQuery("SELECT o FROM LsThingValue AS o WHERE o.lsState = :lsState", LsThingValue.class);
+        TypedQuery<LsThingValue> q = em.createQuery("SELECT o FROM LsThingValue AS o WHERE o.lsState = :lsState",
+                LsThingValue.class);
         q.setParameter("lsState", lsState);
         return q;
     }
 
-	public static TypedQuery<LsThingValue> findLsThingValuesByLsState(LsThingState lsState, String sortFieldName, String sortOrder) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+    public static TypedQuery<LsThingValue> findLsThingValuesByLsState(LsThingState lsState, String sortFieldName,
+            String sortOrder) {
+        if (lsState == null)
+            throw new IllegalArgumentException("The lsState argument is required");
         EntityManager em = LsThingValue.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsState = :lsState");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -822,18 +986,23 @@ public static TypedQuery<LsThingValue> findLsThingValuesByLsState(LsThingState l
         return q;
     }
 
-	public static TypedQuery<LsThingValue> findLsThingValuesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<LsThingValue> findLsThingValuesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = LsThingValue.entityManager();
-        TypedQuery<LsThingValue> q = em.createQuery("SELECT o FROM LsThingValue AS o WHERE o.lsTransaction = :lsTransaction", LsThingValue.class);
+        TypedQuery<LsThingValue> q = em.createQuery(
+                "SELECT o FROM LsThingValue AS o WHERE o.lsTransaction = :lsTransaction", LsThingValue.class);
         q.setParameter("lsTransaction", lsTransaction);
         return q;
     }
 
-	public static TypedQuery<LsThingValue> findLsThingValuesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<LsThingValue> findLsThingValuesByLsTransactionEquals(Long lsTransaction,
+            String sortFieldName, String sortOrder) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = LsThingValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM LsThingValue AS o WHERE o.lsTransaction = :lsTransaction");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM LsThingValue AS o WHERE o.lsTransaction = :lsTransaction");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -845,11 +1014,11 @@ public static TypedQuery<LsThingValue> findLsThingValuesByLsTransactionEquals(Lo
         return q;
     }
 
-	public LsThingState getLsState() {
+    public LsThingState getLsState() {
         return this.lsState;
     }
 
-	public void setLsState(LsThingState lsState) {
+    public void setLsState(LsThingState lsState) {
         this.lsState = lsState;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/LsTransaction.java b/src/main/java/com/labsynch/labseer/domain/LsTransaction.java
index 60d422889..8ea9d4d33 100755
--- a/src/main/java/com/labsynch/labseer/domain/LsTransaction.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsTransaction.java
@@ -41,136 +41,139 @@ public class LsTransaction {
     @Temporal(TemporalType.TIMESTAMP)
     @DateTimeFormat(style = "MM")
     private Date recordedDate;
-    
+
     @Size(max = 255)
     private String recordedBy;
-    
+
     @Enumerated(EnumType.STRING)
-	private LsTransactionStatus status;
-    
+    private LsTransactionStatus status;
+
     @Enumerated(EnumType.STRING)
-	private LsTransactionType type;
+    private LsTransactionType type;
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static LsTransaction fromJsonToLsTransaction(String json) {
+    public static LsTransaction fromJsonToLsTransaction(String json) {
         return new JSONDeserializer<LsTransaction>()
-        .use(null, LsTransaction.class).deserialize(json);
+                .use(null, LsTransaction.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<LsTransaction> collection) {
+    public static String toJsonArray(Collection<LsTransaction> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<LsTransaction> collection, String[] fields) {
+    public static String toJsonArray(Collection<LsTransaction> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<LsTransaction> fromJsonArrayToLsTransactions(String json) {
+    public static Collection<LsTransaction> fromJsonArrayToLsTransactions(String json) {
         return new JSONDeserializer<List<LsTransaction>>()
-        .use("values", LsTransaction.class).deserialize(json);
+                .use("values", LsTransaction.class).deserialize(json);
     }
 
-	@Id
+    @Id
     @SequenceGenerator(name = "lsTransactionGen", sequenceName = "LS_TRANSACTION_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "lsTransactionGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String getComments() {
+    public String getComments() {
         return this.comments;
     }
 
-	public void setComments(String comments) {
+    public void setComments(String comments) {
         this.comments = comments;
     }
 
-	public Date getRecordedDate() {
+    public Date getRecordedDate() {
         return this.recordedDate;
     }
 
-	public void setRecordedDate(Date recordedDate) {
+    public void setRecordedDate(Date recordedDate) {
         this.recordedDate = recordedDate;
     }
 
-	public String getRecordedBy() {
+    public String getRecordedBy() {
         return this.recordedBy;
     }
 
-	public void setRecordedBy(String recordedBy) {
+    public void setRecordedBy(String recordedBy) {
         this.recordedBy = recordedBy;
     }
 
-	public LsTransactionStatus getStatus() {
+    public LsTransactionStatus getStatus() {
         return this.status;
     }
 
-	public void setStatus(LsTransactionStatus status) {
+    public void setStatus(LsTransactionStatus status) {
         this.status = status;
     }
 
-	public LsTransactionType getType() {
+    public LsTransactionType getType() {
         return this.type;
     }
 
-	public void setType(LsTransactionType type) {
+    public void setType(LsTransactionType type) {
         this.type = type;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("comments", "recordedDate", "recordedBy", "status", "type");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("comments", "recordedDate",
+            "recordedBy", "status", "type");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new LsTransaction().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countLsTransactions() {
+    public static long countLsTransactions() {
         return entityManager().createQuery("SELECT COUNT(o) FROM LsTransaction o", Long.class).getSingleResult();
     }
 
-	public static List<LsTransaction> findAllLsTransactions() {
+    public static List<LsTransaction> findAllLsTransactions() {
         return entityManager().createQuery("SELECT o FROM LsTransaction o", LsTransaction.class).getResultList();
     }
 
-	public static List<LsTransaction> findAllLsTransactions(String sortFieldName, String sortOrder) {
+    public static List<LsTransaction> findAllLsTransactions(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM LsTransaction o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -181,16 +184,19 @@ public static List<LsTransaction> findAllLsTransactions(String sortFieldName, St
         return entityManager().createQuery(jpaQuery, LsTransaction.class).getResultList();
     }
 
-	public static LsTransaction findLsTransaction(Long id) {
-        if (id == null) return null;
+    public static LsTransaction findLsTransaction(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(LsTransaction.class, id);
     }
 
-	public static List<LsTransaction> findLsTransactionEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM LsTransaction o", LsTransaction.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<LsTransaction> findLsTransactionEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM LsTransaction o", LsTransaction.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<LsTransaction> findLsTransactionEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<LsTransaction> findLsTransactionEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM LsTransaction o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -198,18 +204,21 @@ public static List<LsTransaction> findLsTransactionEntries(int firstResult, int
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, LsTransaction.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, LsTransaction.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -218,21 +227,24 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public LsTransaction merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         LsTransaction merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
diff --git a/src/main/java/com/labsynch/labseer/domain/LsTransactionStatus.java b/src/main/java/com/labsynch/labseer/domain/LsTransactionStatus.java
index 867056167..04c3b659b 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsTransactionStatus.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsTransactionStatus.java
@@ -1,3 +1,5 @@
 package com.labsynch.labseer.domain;
 
-public enum LsTransactionStatus {PENDING, COMPLETED, FAILED};
+public enum LsTransactionStatus {
+    PENDING, COMPLETED, FAILED
+};
diff --git a/src/main/java/com/labsynch/labseer/domain/LsTransactionType.java b/src/main/java/com/labsynch/labseer/domain/LsTransactionType.java
index b3c1d90d8..f635d5c8d 100644
--- a/src/main/java/com/labsynch/labseer/domain/LsTransactionType.java
+++ b/src/main/java/com/labsynch/labseer/domain/LsTransactionType.java
@@ -1,3 +1,5 @@
 package com.labsynch.labseer.domain;
 
-public enum LsTransactionType {NEW, CHANGE, DELETION};
+public enum LsTransactionType {
+    NEW, CHANGE, DELETION
+};
diff --git a/src/main/java/com/labsynch/labseer/domain/Operator.java b/src/main/java/com/labsynch/labseer/domain/Operator.java
index e6e0c8cf6..2a2f16361 100755
--- a/src/main/java/com/labsynch/labseer/domain/Operator.java
+++ b/src/main/java/com/labsynch/labseer/domain/Operator.java
@@ -32,109 +32,112 @@ public class Operator {
 
     @Size(max = 255)
     private String code;
-    
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static Operator fromJsonToOperator(String json) {
+    public static Operator fromJsonToOperator(String json) {
         return new JSONDeserializer<Operator>()
-        .use(null, Operator.class).deserialize(json);
+                .use(null, Operator.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<Operator> collection) {
+    public static String toJsonArray(Collection<Operator> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<Operator> collection, String[] fields) {
+    public static String toJsonArray(Collection<Operator> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<Operator> fromJsonArrayToOperators(String json) {
+    public static Collection<Operator> fromJsonArrayToOperators(String json) {
         return new JSONDeserializer<List<Operator>>()
-        .use("values", Operator.class).deserialize(json);
+                .use("values", Operator.class).deserialize(json);
     }
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String getName() {
+    public String getName() {
         return this.name;
     }
 
-	public void setName(String name) {
+    public void setName(String name) {
         this.name = name;
     }
 
-	public String getCode() {
+    public String getCode() {
         return this.code;
     }
 
-	public void setCode(String code) {
+    public void setCode(String code) {
         this.code = code;
     }
 
-	public static Long countFindOperatorsByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static Long countFindOperatorsByCodeEquals(String code) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = Operator.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Operator AS o WHERE o.code = :code", Long.class);
         q.setParameter("code", code);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindOperatorsByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static Long countFindOperatorsByNameEquals(String name) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = Operator.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Operator AS o WHERE o.name = :name", Long.class);
         q.setParameter("name", name);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<Operator> findOperatorsByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static TypedQuery<Operator> findOperatorsByCodeEquals(String code) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = Operator.entityManager();
         TypedQuery<Operator> q = em.createQuery("SELECT o FROM Operator AS o WHERE o.code = :code", Operator.class);
         q.setParameter("code", code);
         return q;
     }
 
-	public static TypedQuery<Operator> findOperatorsByCodeEquals(String code, String sortFieldName, String sortOrder) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static TypedQuery<Operator> findOperatorsByCodeEquals(String code, String sortFieldName, String sortOrder) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = Operator.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Operator AS o WHERE o.code = :code");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -148,16 +151,18 @@ public static TypedQuery<Operator> findOperatorsByCodeEquals(String code, String
         return q;
     }
 
-	public static TypedQuery<Operator> findOperatorsByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<Operator> findOperatorsByNameEquals(String name) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = Operator.entityManager();
         TypedQuery<Operator> q = em.createQuery("SELECT o FROM Operator AS o WHERE o.name = :name", Operator.class);
         q.setParameter("name", name);
         return q;
     }
 
-	public static TypedQuery<Operator> findOperatorsByNameEquals(String name, String sortFieldName, String sortOrder) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<Operator> findOperatorsByNameEquals(String name, String sortFieldName, String sortOrder) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = Operator.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Operator AS o WHERE o.name = :name");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -171,26 +176,28 @@ public static TypedQuery<Operator> findOperatorsByNameEquals(String name, String
         return q;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new Operator().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countOperators() {
+    public static long countOperators() {
         return entityManager().createQuery("SELECT COUNT(o) FROM Operator o", Long.class).getSingleResult();
     }
 
-	public static List<Operator> findAllOperators() {
+    public static List<Operator> findAllOperators() {
         return entityManager().createQuery("SELECT o FROM Operator o", Operator.class).getResultList();
     }
 
-	public static List<Operator> findAllOperators(String sortFieldName, String sortOrder) {
+    public static List<Operator> findAllOperators(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM Operator o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -201,16 +208,19 @@ public static List<Operator> findAllOperators(String sortFieldName, String sortO
         return entityManager().createQuery(jpaQuery, Operator.class).getResultList();
     }
 
-	public static Operator findOperator(Long id) {
-        if (id == null) return null;
+    public static Operator findOperator(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(Operator.class, id);
     }
 
-	public static List<Operator> findOperatorEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM Operator o", Operator.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<Operator> findOperatorEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM Operator o", Operator.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<Operator> findOperatorEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<Operator> findOperatorEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM Operator o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -218,18 +228,21 @@ public static List<Operator> findOperatorEntries(int firstResult, int maxResults
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, Operator.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, Operator.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -238,21 +251,24 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public Operator merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         Operator merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
diff --git a/src/main/java/com/labsynch/labseer/domain/OperatorKind.java b/src/main/java/com/labsynch/labseer/domain/OperatorKind.java
index 5e0e8d833..daf681ce8 100755
--- a/src/main/java/com/labsynch/labseer/domain/OperatorKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/OperatorKind.java
@@ -44,69 +44,76 @@ public class OperatorKind {
     @Size(max = 255)
     private String lsTypeAndKind;
 
-	@Id
+    @Id
     @SequenceGenerator(name = "operatorKindGen", sequenceName = "OPERATOR_KIND_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "operatorKindGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new OperatorKind().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countOperatorKinds() {
+    public static long countOperatorKinds() {
         return entityManager().createQuery("SELECT COUNT(o) FROM OperatorKind o", Long.class).getSingleResult();
     }
 
-	public static List<OperatorKind> findAllOperatorKinds() {
+    public static List<OperatorKind> findAllOperatorKinds() {
         return entityManager().createQuery("SELECT o FROM OperatorKind o", OperatorKind.class).getResultList();
     }
 
-	public static OperatorKind findOperatorKind(Long id) {
-        if (id == null) return null;
+    public static OperatorKind findOperatorKind(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(OperatorKind.class, id);
     }
 
-	public static List<OperatorKind> findOperatorKindEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM OperatorKind o", OperatorKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<OperatorKind> findOperatorKindEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM OperatorKind o", OperatorKind.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.lsType = OperatorType.findOperatorType(this.getLsType().getId());
-		this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_').append(this.getKindName()).toString();
+        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_')
+                .append(this.getKindName()).toString();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -115,52 +122,69 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public OperatorKind merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-		this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_').append(this.getKindName()).toString();
-       OperatorKind merged = this.entityManager.merge(this);
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
+        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_')
+                .append(this.getKindName()).toString();
+        OperatorKind merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public static Long countFindOperatorKindsByKindNameEqualsAndLsType(String kindName, OperatorType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static Long countFindOperatorKindsByKindNameEqualsAndLsType(String kindName, OperatorType lsType) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = OperatorKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM OperatorKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM OperatorKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType",
+                Long.class);
         q.setParameter("kindName", kindName);
         q.setParameter("lsType", lsType);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<OperatorKind> findOperatorKindsByKindNameEqualsAndLsType(String kindName, OperatorType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<OperatorKind> findOperatorKindsByKindNameEqualsAndLsType(String kindName,
+            OperatorType lsType) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = OperatorKind.entityManager();
-        TypedQuery<OperatorKind> q = em.createQuery("SELECT o FROM OperatorKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", OperatorKind.class);
+        TypedQuery<OperatorKind> q = em.createQuery(
+                "SELECT o FROM OperatorKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType",
+                OperatorKind.class);
         q.setParameter("kindName", kindName);
         q.setParameter("lsType", lsType);
         return q;
     }
 
-	public static TypedQuery<OperatorKind> findOperatorKindsByKindNameEqualsAndLsType(String kindName, OperatorType lsType, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<OperatorKind> findOperatorKindsByKindNameEqualsAndLsType(String kindName,
+            OperatorType lsType, String sortFieldName, String sortOrder) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = OperatorKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM OperatorKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM OperatorKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -173,33 +197,34 @@ public static TypedQuery<OperatorKind> findOperatorKindsByKindNameEqualsAndLsTyp
         return q;
     }
 
-	public OperatorType getLsType() {
+    public OperatorType getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(OperatorType lsType) {
+    public void setLsType(OperatorType lsType) {
         this.lsType = lsType;
     }
 
-	public String getKindName() {
+    public String getKindName() {
         return this.kindName;
     }
 
-	public void setKindName(String kindName) {
+    public void setKindName(String kindName) {
         this.kindName = kindName;
     }
 
-	public String getLsTypeAndKind() {
+    public String getLsTypeAndKind() {
         return this.lsTypeAndKind;
     }
 
-	public void setLsTypeAndKind(String lsTypeAndKind) {
+    public void setLsTypeAndKind(String lsTypeAndKind) {
         this.lsTypeAndKind = lsTypeAndKind;
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName",
+            "lsTypeAndKind", "id", "version", "entityManager");
 
-	public static List<OperatorKind> findAllOperatorKinds(String sortFieldName, String sortOrder) {
+    public static List<OperatorKind> findAllOperatorKinds(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM OperatorKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -210,7 +235,8 @@ public static List<OperatorKind> findAllOperatorKinds(String sortFieldName, Stri
         return entityManager().createQuery(jpaQuery, OperatorKind.class).getResultList();
     }
 
-	public static List<OperatorKind> findOperatorKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<OperatorKind> findOperatorKindEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM OperatorKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -218,40 +244,41 @@ public static List<OperatorKind> findOperatorKindEntries(int firstResult, int ma
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, OperatorKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, OperatorKind.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static OperatorKind fromJsonToOperatorKind(String json) {
+    public static OperatorKind fromJsonToOperatorKind(String json) {
         return new JSONDeserializer<OperatorKind>()
-        .use(null, OperatorKind.class).deserialize(json);
+                .use(null, OperatorKind.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<OperatorKind> collection) {
+    public static String toJsonArray(Collection<OperatorKind> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<OperatorKind> collection, String[] fields) {
+    public static String toJsonArray(Collection<OperatorKind> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<OperatorKind> fromJsonArrayToOperatorKinds(String json) {
+    public static Collection<OperatorKind> fromJsonArrayToOperatorKinds(String json) {
         return new JSONDeserializer<List<OperatorKind>>()
-        .use("values", OperatorKind.class).deserialize(json);
+                .use("values", OperatorKind.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/OperatorType.java b/src/main/java/com/labsynch/labseer/domain/OperatorType.java
index 9e9fc653f..ece10c816 100755
--- a/src/main/java/com/labsynch/labseer/domain/OperatorType.java
+++ b/src/main/java/com/labsynch/labseer/domain/OperatorType.java
@@ -34,50 +34,56 @@ public class OperatorType {
     @Size(max = 25)
     private String typeName;
 
-	@Id
+    @Id
     @SequenceGenerator(name = "operatorTypeGen", sequenceName = "OPERATOR_TYPE_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "operatorTypeGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public static Long countFindOperatorTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static Long countFindOperatorTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = OperatorType.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM OperatorType AS o WHERE o.typeName = :typeName", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM OperatorType AS o WHERE o.typeName = :typeName",
+                Long.class);
         q.setParameter("typeName", typeName);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<OperatorType> findOperatorTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static TypedQuery<OperatorType> findOperatorTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = OperatorType.entityManager();
-        TypedQuery<OperatorType> q = em.createQuery("SELECT o FROM OperatorType AS o WHERE o.typeName = :typeName", OperatorType.class);
+        TypedQuery<OperatorType> q = em.createQuery("SELECT o FROM OperatorType AS o WHERE o.typeName = :typeName",
+                OperatorType.class);
         q.setParameter("typeName", typeName);
         return q;
     }
 
-	public static TypedQuery<OperatorType> findOperatorTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static TypedQuery<OperatorType> findOperatorTypesByTypeNameEquals(String typeName, String sortFieldName,
+            String sortOrder) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = OperatorType.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM OperatorType AS o WHERE o.typeName = :typeName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -91,34 +97,37 @@ public static TypedQuery<OperatorType> findOperatorTypesByTypeNameEquals(String
         return q;
     }
 
-	public String getTypeName() {
+    public String getTypeName() {
         return this.typeName;
     }
 
-	public void setTypeName(String typeName) {
+    public void setTypeName(String typeName) {
         this.typeName = typeName;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName", "id", "version");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName", "id",
+            "version");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new OperatorType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countOperatorTypes() {
+    public static long countOperatorTypes() {
         return entityManager().createQuery("SELECT COUNT(o) FROM OperatorType o", Long.class).getSingleResult();
     }
 
-	public static List<OperatorType> findAllOperatorTypes() {
+    public static List<OperatorType> findAllOperatorTypes() {
         return entityManager().createQuery("SELECT o FROM OperatorType o", OperatorType.class).getResultList();
     }
 
-	public static List<OperatorType> findAllOperatorTypes(String sortFieldName, String sortOrder) {
+    public static List<OperatorType> findAllOperatorTypes(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM OperatorType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -129,16 +138,19 @@ public static List<OperatorType> findAllOperatorTypes(String sortFieldName, Stri
         return entityManager().createQuery(jpaQuery, OperatorType.class).getResultList();
     }
 
-	public static OperatorType findOperatorType(Long id) {
-        if (id == null) return null;
+    public static OperatorType findOperatorType(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(OperatorType.class, id);
     }
 
-	public static List<OperatorType> findOperatorTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM OperatorType o", OperatorType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<OperatorType> findOperatorTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM OperatorType o", OperatorType.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<OperatorType> findOperatorTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<OperatorType> findOperatorTypeEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM OperatorType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -146,18 +158,21 @@ public static List<OperatorType> findOperatorTypeEntries(int firstResult, int ma
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, OperatorType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, OperatorType.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -166,57 +181,60 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public OperatorType merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         OperatorType merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static OperatorType fromJsonToOperatorType(String json) {
+    public static OperatorType fromJsonToOperatorType(String json) {
         return new JSONDeserializer<OperatorType>()
-        .use(null, OperatorType.class).deserialize(json);
+                .use(null, OperatorType.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<OperatorType> collection) {
+    public static String toJsonArray(Collection<OperatorType> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<OperatorType> collection, String[] fields) {
+    public static String toJsonArray(Collection<OperatorType> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<OperatorType> fromJsonArrayToOperatorTypes(String json) {
+    public static Collection<OperatorType> fromJsonArrayToOperatorTypes(String json) {
         return new JSONDeserializer<List<OperatorType>>()
-        .use("values", OperatorType.class).deserialize(json);
+                .use("values", OperatorType.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/Parent.java b/src/main/java/com/labsynch/labseer/domain/Parent.java
index c67912d3b..34a6e1962 100755
--- a/src/main/java/com/labsynch/labseer/domain/Parent.java
+++ b/src/main/java/com/labsynch/labseer/domain/Parent.java
@@ -54,379 +54,391 @@
 
 public class Parent {
 
-	private static final Logger logger = LoggerFactory.getLogger(Parent.class);
-	
-//	@Autowired
-//	private ChemStructureService chemService;
-	
-	@Column(unique = true)
-	@NotNull
-	@Size(max = 255)
-	@org.hibernate.annotations.Index(name="Parent_corpName_IDX")
-	private String corpName;
-
-	@org.hibernate.annotations.Index(name="Parent_parentNumber_IDX")
-	private long parentNumber;
-
-	private String chemist;
-
-	@Size(max = 1000)
-	@org.hibernate.annotations.Index(name="Parent_commonName_IDX")
-	private String commonName;
-
-	@ManyToOne
-	@org.hibernate.annotations.Index(name="Parent_stereoCategory_IDX")
-	@JoinColumn(name = "stereo_category")
-	private StereoCategory stereoCategory;
-
-	@Size(max = 1000)
-	private String stereoComment;
-
-	@Column(columnDefinition="text")
-	private String molStructure;
-
-	private Double molWeight;
-	
-	private Double exactMass;
-
-	@Size(max = 4000)
-	private String molFormula;
-
-	@NotNull
-	@org.hibernate.annotations.Index(name="Parent_CdId_IDX")
-	private int CdId;
-
-	@Temporal(TemporalType.TIMESTAMP)
-	@DateTimeFormat(style = "S-")
-	@org.hibernate.annotations.Index(name="Parent_RegDate_IDX")
-	private Date registrationDate;
-	
-	private String registeredBy;
-	
-	@Temporal(TemporalType.TIMESTAMP)
-	@DateTimeFormat(style = "S-")
-	private Date modifiedDate;
-	
-	private String modifiedBy;
-
-	private Boolean ignore;
-
-	@OneToMany(cascade = CascadeType.MERGE, mappedBy = "parent", fetch = FetchType.LAZY)
-	private Set<SaltForm> saltForms = new HashSet<SaltForm>();
-	
-	@OneToMany(cascade = CascadeType.MERGE, mappedBy = "parent", fetch = FetchType.LAZY)
-	private Set<ParentAlias> parentAliases = new HashSet<ParentAlias>();
+    private static final Logger logger = LoggerFactory.getLogger(Parent.class);
+
+    // @Autowired
+    // private ChemStructureService chemService;
+
+    @Column(unique = true)
+    @NotNull
+    @Size(max = 255)
+    @org.hibernate.annotations.Index(name = "Parent_corpName_IDX")
+    private String corpName;
+
+    @org.hibernate.annotations.Index(name = "Parent_parentNumber_IDX")
+    private long parentNumber;
+
+    private String chemist;
+
+    @Size(max = 1000)
+    @org.hibernate.annotations.Index(name = "Parent_commonName_IDX")
+    private String commonName;
 
     @ManyToOne
-	@JoinColumn(name = "bulk_load_file")
+    @org.hibernate.annotations.Index(name = "Parent_stereoCategory_IDX")
+    @JoinColumn(name = "stereo_category")
+    private StereoCategory stereoCategory;
+
+    @Size(max = 1000)
+    private String stereoComment;
+
+    @Column(columnDefinition = "text")
+    private String molStructure;
+
+    private Double molWeight;
+
+    private Double exactMass;
+
+    @Size(max = 4000)
+    private String molFormula;
+
+    @NotNull
+    @org.hibernate.annotations.Index(name = "Parent_CdId_IDX")
+    private int CdId;
+
+    @Temporal(TemporalType.TIMESTAMP)
+    @DateTimeFormat(style = "S-")
+    @org.hibernate.annotations.Index(name = "Parent_RegDate_IDX")
+    private Date registrationDate;
+
+    private String registeredBy;
+
+    @Temporal(TemporalType.TIMESTAMP)
+    @DateTimeFormat(style = "S-")
+    private Date modifiedDate;
+
+    private String modifiedBy;
+
+    private Boolean ignore;
+
+    @OneToMany(cascade = CascadeType.MERGE, mappedBy = "parent", fetch = FetchType.LAZY)
+    private Set<SaltForm> saltForms = new HashSet<SaltForm>();
+
+    @OneToMany(cascade = CascadeType.MERGE, mappedBy = "parent", fetch = FetchType.LAZY)
+    private Set<ParentAlias> parentAliases = new HashSet<ParentAlias>();
+
+    @ManyToOne
+    @JoinColumn(name = "bulk_load_file")
     private BulkLoadFile bulkLoadFile;
-    
+
     @ManyToOne
-	@JoinColumn(name = "parent_annotation")
+    @JoinColumn(name = "parent_annotation")
     private ParentAnnotation parentAnnotation;
-    
+
     @ManyToOne
-	@JoinColumn(name = "compound_type")
+    @JoinColumn(name = "compound_type")
     private CompoundType compoundType;
-    
-    @Column(columnDefinition="text")
+
+    @Column(columnDefinition = "text")
     private String comment;
-    
+
     private Boolean isMixture;
-    
+
     @Transient
     private transient LabelPrefixDTO labelPrefix;
-    
 
-	@Transactional
-	public static void deleteAllParents(){        
-		List<Parent> parents = Parent.findAllParents();
-		for (Parent parent : parents){
-			parent.remove();
-		}   	
-	}
+    @Transactional
+    public static void deleteAllParents() {
+        List<Parent> parents = Parent.findAllParents();
+        for (Parent parent : parents) {
+            parent.remove();
+        }
+    }
 
     @Transactional
     public static List<Parent> findAllParents() {
         return Parent.entityManager().createQuery("SELECT o FROM Parent o", Parent.class).getResultList();
     }
-    
+
     @Transactional
     public static Parent findParent(Long id) {
-        if (id == null) return null;
+        if (id == null)
+            return null;
         return Parent.entityManager().find(Parent.class, id);
     }
 
     @Transactional
     public static List<Parent> findParentEntries(int firstResult, int maxResults) {
-        return Parent.entityManager().createQuery("SELECT o FROM Parent o", Parent.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return Parent.entityManager().createQuery("SELECT o FROM Parent o", Parent.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
-    
+
     public static TypedQuery<Parent> findParentsByCdId(int CdId) {
         EntityManager em = Parent.entityManager();
-        TypedQuery<Parent> q = em.createQuery("SELECT o FROM Parent AS o WHERE o.CdId = :CdId AND (o.ignore is null OR o.ignore = :ignore)", Parent.class);
+        TypedQuery<Parent> q = em.createQuery(
+                "SELECT o FROM Parent AS o WHERE o.CdId = :CdId AND (o.ignore is null OR o.ignore = :ignore)",
+                Parent.class);
         q.setParameter("CdId", CdId);
         q.setParameter("ignore", false);
         return q;
     }
 
-	public static TypedQuery<Integer> findParentIdsByCdIdInAndProjectIn(List<Integer> cdIds, List<String> projectNames) {
-		EntityManager em = Parent.entityManager();
-		CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
-		CriteriaQuery<Integer> criteria = criteriaBuilder.createQuery(Integer.class);
-		Root<Parent> parentRoot = criteria.from(Parent.class);
-
-		// Join to lots so we can filter out parents that are not in the project list
-		Join<Parent, SaltForm> parentSaltForm = parentRoot.join("saltForms");
-		Join<SaltForm, Lot> saltFormLot = parentRoot.join("saltForms").join("lots");
-
-		Predicate[] predicates = new Predicate[0];
-		List<Predicate> predicateList = new ArrayList<Predicate>();
-
-		// Boolean return empty to break queries if cdIds or project names are empty
-		Boolean return_empty_query = false;
-
-		// Filter the results by cdIds list or return no results if no cdIds
-		if(cdIds != null && !cdIds.isEmpty()){
-			predicateList.add(parentRoot.get("CdId").in(cdIds));
-		} else {
-			// Return 0 rows on purpose because there are no corp names to search for
-			return_empty_query = true;
-		}
-
-		// Filter the results by projects list or return no results if no projects
-		if(projectNames != null && !projectNames.isEmpty()){
-			predicateList.add(saltFormLot.get("project").in(projectNames));
-		} else {
-			// Return 0 rows on purpose because there are no projects to search for
-			return_empty_query = true;
-		}
-		
-		// Return no results if return empty query is true
-		if(return_empty_query){
-			predicateList.add(criteriaBuilder.equal(parentRoot.get("id"), -1));
-		}
-
-		criteria.select(parentRoot.<Integer>get("id"));
-
-		// Select distinct because we joined one to many lots
-		criteria.distinct(true);
-
-		// Add the predicates and create the query
-		predicates = predicateList.toArray(predicates);
-		criteria.where(criteriaBuilder.and(predicates));
-		TypedQuery<Integer> q = em.createQuery(criteria);
+    public static TypedQuery<Integer> findParentIdsByCdIdInAndProjectIn(List<Integer> cdIds,
+            List<String> projectNames) {
+        EntityManager em = Parent.entityManager();
+        CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
+        CriteriaQuery<Integer> criteria = criteriaBuilder.createQuery(Integer.class);
+        Root<Parent> parentRoot = criteria.from(Parent.class);
+
+        // Join to lots so we can filter out parents that are not in the project list
+        Join<Parent, SaltForm> parentSaltForm = parentRoot.join("saltForms");
+        Join<SaltForm, Lot> saltFormLot = parentRoot.join("saltForms").join("lots");
+
+        Predicate[] predicates = new Predicate[0];
+        List<Predicate> predicateList = new ArrayList<Predicate>();
+
+        // Boolean return empty to break queries if cdIds or project names are empty
+        Boolean return_empty_query = false;
+
+        // Filter the results by cdIds list or return no results if no cdIds
+        if (cdIds != null && !cdIds.isEmpty()) {
+            predicateList.add(parentRoot.get("CdId").in(cdIds));
+        } else {
+            // Return 0 rows on purpose because there are no corp names to search for
+            return_empty_query = true;
+        }
+
+        // Filter the results by projects list or return no results if no projects
+        if (projectNames != null && !projectNames.isEmpty()) {
+            predicateList.add(saltFormLot.get("project").in(projectNames));
+        } else {
+            // Return 0 rows on purpose because there are no projects to search for
+            return_empty_query = true;
+        }
+
+        // Return no results if return empty query is true
+        if (return_empty_query) {
+            predicateList.add(criteriaBuilder.equal(parentRoot.get("id"), -1));
+        }
+
+        criteria.select(parentRoot.<Integer>get("id"));
+
+        // Select distinct because we joined one to many lots
+        criteria.distinct(true);
+
+        // Add the predicates and create the query
+        predicates = predicateList.toArray(predicates);
+        criteria.where(criteriaBuilder.and(predicates));
+        TypedQuery<Integer> q = em.createQuery(criteria);
         return q;
     }
-    
+
     @Transactional
     public static List<Parent> findParentsByLessMolWeight(double molWeight) {
-		EntityManager em = Parent.entityManager();
-		String sqlQuery = "SELECT o FROM Parent o WHERE o.molWeight < :molWeight ";
-		TypedQuery<Parent> query = em.createQuery(sqlQuery, Parent.class);
-		query.setParameter("molWeight", molWeight);
-		List<Parent> parents = query.getResultList();
-
-		return parents;       
-    }
-    
-    
-    @Transactional	
-	public static List<Integer> findParentCdIdsByMeta(SearchFormDTO searchParams) {
-		EntityManager em = Parent.entityManager();
-		CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
-		CriteriaQuery<Integer> criteria = criteriaBuilder.createQuery(Integer.class);
-		Root<Parent> parentRoot = criteria.from(Parent.class);
-		Join<Parent, SaltForm> parentSaltForm = parentRoot.join("saltForms");
-		Join<SaltForm, Lot> saltFormLot = parentRoot.join("saltForms").join("lots");
-		Join<Parent, ParentAlias> parentAliases = parentRoot.join("parentAliases", JoinType.LEFT);
-
-		criteria.select(parentRoot.<Integer>get("CdId"));
-		criteria.distinct(true);
-		ParameterExpression<Date> firstDate = criteriaBuilder.parameter(Date.class);
-		ParameterExpression<Date> lastDate = criteriaBuilder.parameter(Date.class);
-		Predicate[] predicates = new Predicate[0];
-		List<Predicate> predicateList = new ArrayList<Predicate>();
-		if (searchParams.getChemist() != null) {
-			logger.debug("incoming chemist :" + searchParams.getChemist().toString());
-			Predicate predicate = criteriaBuilder.equal(saltFormLot.<Author>get("chemist"), searchParams.getChemist());
-			predicateList.add(predicate);
-		}
-		if (searchParams.getBuidNumber() != null) {
-			logger.debug("incoming buid number :" + searchParams.getBuidNumber());
-			Predicate predicate = criteriaBuilder.equal(saltFormLot.get("buid"), searchParams.getBuidNumber());
-			predicateList.add(predicate);
-		}
-		if (searchParams.getMinSynthDate() != null) {
-			logger.debug("incoming minSynthesisDate :" + searchParams.getDateFrom());
-			Predicate predicate = criteriaBuilder.greaterThanOrEqualTo(saltFormLot.<Date>get("synthesisDate"), firstDate);
-			predicateList.add(predicate);
-		}
-		if (searchParams.getMaxSynthDate() != null) {
-			logger.debug("incoming maxSynthesisDate :" + searchParams.getDateTo());
-			Predicate predicate = criteriaBuilder.lessThanOrEqualTo(saltFormLot.<Date>get("synthesisDate"), lastDate);
-			predicateList.add(predicate);
-		}
-		if (searchParams.getLotCorpName() != null) {
-			logger.debug("incoming lotCorpName :" + searchParams.getLotCorpName());
-			Predicate predicate = criteriaBuilder.equal(saltFormLot.get("corpName"), searchParams.getLotCorpName());
-			predicateList.add(predicate);
-		}
-		if (searchParams.getSaltFormCorpName() != null) {
-			logger.debug("incoming saltFormCorpName :" + searchParams.getSaltFormCorpName());
-			Predicate predicate = criteriaBuilder.equal(parentSaltForm.get("corpName"), searchParams.getSaltFormCorpName());
-			predicateList.add(predicate);
-		}
-		if (searchParams.getParentCorpName() != null) {
-			logger.debug("incoming parentCorpName :" + searchParams.getParentCorpName());
-			Predicate predicate = criteriaBuilder.equal(parentRoot.get("corpName"), searchParams.getParentCorpName());
-			predicateList.add(predicate);
-		}
-		if (searchParams.getAlias() != null && !searchParams.getAlias().equals("")) {
-			Predicate predicate = null;
-			String aliasName = searchParams.getAlias().trim().toUpperCase();
-			logger.debug("incoming alias name :" + searchParams.getAlias());
-			if (searchParams.getAliasContSelect().equalsIgnoreCase("exact")) {
-				predicate = criteriaBuilder.equal(criteriaBuilder.upper(parentAliases.<String>get("aliasName")), aliasName.toUpperCase());
-			} else {
-				logger.debug("setting up a like query: " + searchParams.getAliasContSelect());
-				aliasName = "%" + aliasName + "%";
-				predicate = criteriaBuilder.like(criteriaBuilder.upper(parentAliases.<String>get("aliasName")), aliasName);				
-			}
-			predicateList.add(predicate);
-		}
-		if (searchParams.getMinParentNumber() != null && searchParams.getMaxParentNumber() != null) {
-			Predicate predicate1 = criteriaBuilder.greaterThanOrEqualTo(parentRoot.<Long>get("parentNumber"), searchParams.getMinParentNumber());
-			Predicate predicate2 = criteriaBuilder.lessThanOrEqualTo(parentRoot.<Long>get("parentNumber"), searchParams.getMaxParentNumber());
-			predicateList.add(predicate1);
-			predicateList.add(predicate2);
-		}
-		predicates = predicateList.toArray(predicates);
-		criteria.where(criteriaBuilder.and(predicates));
-		TypedQuery<Integer> q = em.createQuery(criteria);
-		if (searchParams.getMinSynthDate() != null) {
-			q.setParameter(firstDate, searchParams.getMinSynthDate(), TemporalType.DATE);
-		}
-		if (searchParams.getMaxSynthDate() != null) {
-			q.setParameter(lastDate, searchParams.getMaxSynthDate(), TemporalType.DATE);
-		}
-		List<Integer> parentCdIds = null;
-		if (predicates.length == 0 && searchParams.getMaxSynthDate() == null && searchParams.getMaxSynthDate() == null) {
-			logger.debug("No search criteria. Returning null.");
-		} else {
-			logger.debug("parent search query string: " + q.toString());
-			parentCdIds = q.getResultList();
-		}
-		if (searchParams.getMaxResults() != null) q.setMaxResults(searchParams.getMaxResults());
-		
-		return parentCdIds;
-	}
-
-
-    @Transactional	
-	public static List<Integer> findAllCdIds() {
-		EntityManager em = Parent.entityManager();
-		CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
-		CriteriaQuery<Integer> criteria = criteriaBuilder.createQuery(Integer.class);
-		Root<Parent> parentRoot = criteria.from(Parent.class);
-		criteria.select(parentRoot.<Integer>get("CdId"));
-		criteria.distinct(true);
-		TypedQuery<Integer> q = em.createQuery(criteria);
-		return q.getResultList();
-	}
-    
-	public static Parent update(Parent inputParent) {
-		Parent parent = Parent.findParent(inputParent.getId());
-		parent.setChemist(inputParent.getChemist());
-		parent.setCommonName(inputParent.getCommonName());
-		parent.setCorpName(inputParent.getCorpName());
-		parent.setIgnore(inputParent.getIgnore());
-		parent.setParentNumber(inputParent.getParentNumber());
-		parent.setRegistrationDate(inputParent.getRegistrationDate());
-		parent.setStereoCategory(inputParent.getStereoCategory());
-		parent.setStereoComment(inputParent.getStereoComment());
-		parent.setCompoundType(inputParent.getCompoundType());
-		parent.setParentAnnotation(inputParent.getParentAnnotation());
-		parent.setComment(inputParent.getComment());
-		parent.setIsMixture(inputParent.getIsMixture());
-		return parent;
-	}
-
-	public static List<Long> getParentIds() {
-		EntityManager em = Parent.entityManager();
-		String sqlQuery = "SELECT o.id FROM Parent o WHERE o.ignore IS NOT :ignore OR o.ignore is null";
-		boolean ignore = true;
-		TypedQuery<Long> query = em.createQuery(sqlQuery, Long.class);
-		query.setParameter("ignore", ignore);
-		List<Long> parentIds = query.getResultList();		
-		return parentIds;
-	}
-	
-	public LabelPrefixDTO getLabelPrefix() {
-		return this.labelPrefix;
-	}
-	
-	public void setLabelPrefix(LabelPrefixDTO labelPrefix) {
-		this.labelPrefix = labelPrefix;
-	}
-	
+        EntityManager em = Parent.entityManager();
+        String sqlQuery = "SELECT o FROM Parent o WHERE o.molWeight < :molWeight ";
+        TypedQuery<Parent> query = em.createQuery(sqlQuery, Parent.class);
+        query.setParameter("molWeight", molWeight);
+        List<Parent> parents = query.getResultList();
+
+        return parents;
+    }
+
+    @Transactional
+    public static List<Integer> findParentCdIdsByMeta(SearchFormDTO searchParams) {
+        EntityManager em = Parent.entityManager();
+        CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
+        CriteriaQuery<Integer> criteria = criteriaBuilder.createQuery(Integer.class);
+        Root<Parent> parentRoot = criteria.from(Parent.class);
+        Join<Parent, SaltForm> parentSaltForm = parentRoot.join("saltForms");
+        Join<SaltForm, Lot> saltFormLot = parentRoot.join("saltForms").join("lots");
+        Join<Parent, ParentAlias> parentAliases = parentRoot.join("parentAliases", JoinType.LEFT);
+
+        criteria.select(parentRoot.<Integer>get("CdId"));
+        criteria.distinct(true);
+        ParameterExpression<Date> firstDate = criteriaBuilder.parameter(Date.class);
+        ParameterExpression<Date> lastDate = criteriaBuilder.parameter(Date.class);
+        Predicate[] predicates = new Predicate[0];
+        List<Predicate> predicateList = new ArrayList<Predicate>();
+        if (searchParams.getChemist() != null) {
+            logger.debug("incoming chemist :" + searchParams.getChemist().toString());
+            Predicate predicate = criteriaBuilder.equal(saltFormLot.<Author>get("chemist"), searchParams.getChemist());
+            predicateList.add(predicate);
+        }
+        if (searchParams.getBuidNumber() != null) {
+            logger.debug("incoming buid number :" + searchParams.getBuidNumber());
+            Predicate predicate = criteriaBuilder.equal(saltFormLot.get("buid"), searchParams.getBuidNumber());
+            predicateList.add(predicate);
+        }
+        if (searchParams.getMinSynthDate() != null) {
+            logger.debug("incoming minSynthesisDate :" + searchParams.getDateFrom());
+            Predicate predicate = criteriaBuilder.greaterThanOrEqualTo(saltFormLot.<Date>get("synthesisDate"),
+                    firstDate);
+            predicateList.add(predicate);
+        }
+        if (searchParams.getMaxSynthDate() != null) {
+            logger.debug("incoming maxSynthesisDate :" + searchParams.getDateTo());
+            Predicate predicate = criteriaBuilder.lessThanOrEqualTo(saltFormLot.<Date>get("synthesisDate"), lastDate);
+            predicateList.add(predicate);
+        }
+        if (searchParams.getLotCorpName() != null) {
+            logger.debug("incoming lotCorpName :" + searchParams.getLotCorpName());
+            Predicate predicate = criteriaBuilder.equal(saltFormLot.get("corpName"), searchParams.getLotCorpName());
+            predicateList.add(predicate);
+        }
+        if (searchParams.getSaltFormCorpName() != null) {
+            logger.debug("incoming saltFormCorpName :" + searchParams.getSaltFormCorpName());
+            Predicate predicate = criteriaBuilder.equal(parentSaltForm.get("corpName"),
+                    searchParams.getSaltFormCorpName());
+            predicateList.add(predicate);
+        }
+        if (searchParams.getParentCorpName() != null) {
+            logger.debug("incoming parentCorpName :" + searchParams.getParentCorpName());
+            Predicate predicate = criteriaBuilder.equal(parentRoot.get("corpName"), searchParams.getParentCorpName());
+            predicateList.add(predicate);
+        }
+        if (searchParams.getAlias() != null && !searchParams.getAlias().equals("")) {
+            Predicate predicate = null;
+            String aliasName = searchParams.getAlias().trim().toUpperCase();
+            logger.debug("incoming alias name :" + searchParams.getAlias());
+            if (searchParams.getAliasContSelect().equalsIgnoreCase("exact")) {
+                predicate = criteriaBuilder.equal(criteriaBuilder.upper(parentAliases.<String>get("aliasName")),
+                        aliasName.toUpperCase());
+            } else {
+                logger.debug("setting up a like query: " + searchParams.getAliasContSelect());
+                aliasName = "%" + aliasName + "%";
+                predicate = criteriaBuilder.like(criteriaBuilder.upper(parentAliases.<String>get("aliasName")),
+                        aliasName);
+            }
+            predicateList.add(predicate);
+        }
+        if (searchParams.getMinParentNumber() != null && searchParams.getMaxParentNumber() != null) {
+            Predicate predicate1 = criteriaBuilder.greaterThanOrEqualTo(parentRoot.<Long>get("parentNumber"),
+                    searchParams.getMinParentNumber());
+            Predicate predicate2 = criteriaBuilder.lessThanOrEqualTo(parentRoot.<Long>get("parentNumber"),
+                    searchParams.getMaxParentNumber());
+            predicateList.add(predicate1);
+            predicateList.add(predicate2);
+        }
+        predicates = predicateList.toArray(predicates);
+        criteria.where(criteriaBuilder.and(predicates));
+        TypedQuery<Integer> q = em.createQuery(criteria);
+        if (searchParams.getMinSynthDate() != null) {
+            q.setParameter(firstDate, searchParams.getMinSynthDate(), TemporalType.DATE);
+        }
+        if (searchParams.getMaxSynthDate() != null) {
+            q.setParameter(lastDate, searchParams.getMaxSynthDate(), TemporalType.DATE);
+        }
+        List<Integer> parentCdIds = null;
+        if (predicates.length == 0 && searchParams.getMaxSynthDate() == null
+                && searchParams.getMaxSynthDate() == null) {
+            logger.debug("No search criteria. Returning null.");
+        } else {
+            logger.debug("parent search query string: " + q.toString());
+            parentCdIds = q.getResultList();
+        }
+        if (searchParams.getMaxResults() != null)
+            q.setMaxResults(searchParams.getMaxResults());
+
+        return parentCdIds;
+    }
+
+    @Transactional
+    public static List<Integer> findAllCdIds() {
+        EntityManager em = Parent.entityManager();
+        CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
+        CriteriaQuery<Integer> criteria = criteriaBuilder.createQuery(Integer.class);
+        Root<Parent> parentRoot = criteria.from(Parent.class);
+        criteria.select(parentRoot.<Integer>get("CdId"));
+        criteria.distinct(true);
+        TypedQuery<Integer> q = em.createQuery(criteria);
+        return q.getResultList();
+    }
+
+    public static Parent update(Parent inputParent) {
+        Parent parent = Parent.findParent(inputParent.getId());
+        parent.setChemist(inputParent.getChemist());
+        parent.setCommonName(inputParent.getCommonName());
+        parent.setCorpName(inputParent.getCorpName());
+        parent.setIgnore(inputParent.getIgnore());
+        parent.setParentNumber(inputParent.getParentNumber());
+        parent.setRegistrationDate(inputParent.getRegistrationDate());
+        parent.setStereoCategory(inputParent.getStereoCategory());
+        parent.setStereoComment(inputParent.getStereoComment());
+        parent.setCompoundType(inputParent.getCompoundType());
+        parent.setParentAnnotation(inputParent.getParentAnnotation());
+        parent.setComment(inputParent.getComment());
+        parent.setIsMixture(inputParent.getIsMixture());
+        return parent;
+    }
+
+    public static List<Long> getParentIds() {
+        EntityManager em = Parent.entityManager();
+        String sqlQuery = "SELECT o.id FROM Parent o WHERE o.ignore IS NOT :ignore OR o.ignore is null";
+        boolean ignore = true;
+        TypedQuery<Long> query = em.createQuery(sqlQuery, Long.class);
+        query.setParameter("ignore", ignore);
+        List<Long> parentIds = query.getResultList();
+        return parentIds;
+    }
+
+    public LabelPrefixDTO getLabelPrefix() {
+        return this.labelPrefix;
+    }
+
+    public void setLabelPrefix(LabelPrefixDTO labelPrefix) {
+        this.labelPrefix = labelPrefix;
+    }
 
     public static Long countParentsByStereoCategory(StereoCategory stereoCategory) {
-        if (stereoCategory == null) throw new IllegalArgumentException("The stereoCategory argument is required");
+        if (stereoCategory == null)
+            throw new IllegalArgumentException("The stereoCategory argument is required");
         EntityManager em = Lot.entityManager();
-        TypedQuery<Long> q = em.createQuery("SELECT COUNT(p) FROM Parent p WHERE p.stereoCategory = :stereoCategory ", Long.class);
+        TypedQuery<Long> q = em.createQuery("SELECT COUNT(p) FROM Parent p WHERE p.stereoCategory = :stereoCategory ",
+                Long.class);
         q.setParameter("stereoCategory", stereoCategory);
         return q.getSingleResult();
     }
-    
-
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static Long countFindParentsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile) {
-        if (bulkLoadFile == null) throw new IllegalArgumentException("The bulkLoadFile argument is required");
+    public static Long countFindParentsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile) {
+        if (bulkLoadFile == null)
+            throw new IllegalArgumentException("The bulkLoadFile argument is required");
         EntityManager em = Parent.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Parent AS o WHERE o.bulkLoadFile = :bulkLoadFile", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Parent AS o WHERE o.bulkLoadFile = :bulkLoadFile",
+                Long.class);
         q.setParameter("bulkLoadFile", bulkLoadFile);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindParentsByCdId(int CdId) {
+    public static Long countFindParentsByCdId(int CdId) {
         EntityManager em = Parent.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Parent AS o WHERE o.CdId = :CdId", Long.class);
         q.setParameter("CdId", CdId);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindParentsByCommonNameLike(String commonName) {
-        if (commonName == null || commonName.length() == 0) throw new IllegalArgumentException("The commonName argument is required");
+    public static Long countFindParentsByCommonNameLike(String commonName) {
+        if (commonName == null || commonName.length() == 0)
+            throw new IllegalArgumentException("The commonName argument is required");
         commonName = commonName.replace('*', '%');
         if (commonName.charAt(0) != '%') {
             commonName = "%" + commonName;
@@ -435,21 +447,24 @@ public static Long countFindParentsByCommonNameLike(String commonName) {
             commonName = commonName + "%";
         }
         EntityManager em = Parent.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Parent AS o WHERE LOWER(o.commonName) LIKE LOWER(:commonName)", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM Parent AS o WHERE LOWER(o.commonName) LIKE LOWER(:commonName)", Long.class);
         q.setParameter("commonName", commonName);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindParentsByCorpNameEquals(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+    public static Long countFindParentsByCorpNameEquals(String corpName) {
+        if (corpName == null || corpName.length() == 0)
+            throw new IllegalArgumentException("The corpName argument is required");
         EntityManager em = Parent.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Parent AS o WHERE o.corpName = :corpName", Long.class);
         q.setParameter("corpName", corpName);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindParentsByCorpNameLike(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+    public static Long countFindParentsByCorpNameLike(String corpName) {
+        if (corpName == null || corpName.length() == 0)
+            throw new IllegalArgumentException("The corpName argument is required");
         corpName = corpName.replace('*', '%');
         if (corpName.charAt(0) != '%') {
             corpName = "%" + corpName;
@@ -458,39 +473,47 @@ public static Long countFindParentsByCorpNameLike(String corpName) {
             corpName = corpName + "%";
         }
         EntityManager em = Parent.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Parent AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Parent AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)",
+                Long.class);
         q.setParameter("corpName", corpName);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindParentsBySaltForms(Set<SaltForm> saltForms) {
-        if (saltForms == null) throw new IllegalArgumentException("The saltForms argument is required");
+    public static Long countFindParentsBySaltForms(Set<SaltForm> saltForms) {
+        if (saltForms == null)
+            throw new IllegalArgumentException("The saltForms argument is required");
         EntityManager em = Parent.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT COUNT(o) FROM Parent AS o WHERE");
         for (int i = 0; i < saltForms.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
+            if (i > 0)
+                queryBuilder.append(" AND");
             queryBuilder.append(" :saltForms_item").append(i).append(" MEMBER OF o.saltForms");
         }
         TypedQuery q = em.createQuery(queryBuilder.toString(), Long.class);
         int saltFormsIndex = 0;
-        for (SaltForm _saltform: saltForms) {
+        for (SaltForm _saltform : saltForms) {
             q.setParameter("saltForms_item" + saltFormsIndex++, _saltform);
         }
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<Parent> findParentsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile) {
-        if (bulkLoadFile == null) throw new IllegalArgumentException("The bulkLoadFile argument is required");
+    public static TypedQuery<Parent> findParentsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile) {
+        if (bulkLoadFile == null)
+            throw new IllegalArgumentException("The bulkLoadFile argument is required");
         EntityManager em = Parent.entityManager();
-        TypedQuery<Parent> q = em.createQuery("SELECT o FROM Parent AS o WHERE o.bulkLoadFile = :bulkLoadFile", Parent.class);
+        TypedQuery<Parent> q = em.createQuery("SELECT o FROM Parent AS o WHERE o.bulkLoadFile = :bulkLoadFile",
+                Parent.class);
         q.setParameter("bulkLoadFile", bulkLoadFile);
         return q;
     }
 
-	public static TypedQuery<Parent> findParentsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile, String sortFieldName, String sortOrder) {
-        if (bulkLoadFile == null) throw new IllegalArgumentException("The bulkLoadFile argument is required");
+    public static TypedQuery<Parent> findParentsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile, String sortFieldName,
+            String sortOrder) {
+        if (bulkLoadFile == null)
+            throw new IllegalArgumentException("The bulkLoadFile argument is required");
         EntityManager em = Parent.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Parent AS o WHERE o.bulkLoadFile = :bulkLoadFile");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Parent AS o WHERE o.bulkLoadFile = :bulkLoadFile");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -502,7 +525,7 @@ public static TypedQuery<Parent> findParentsByBulkLoadFileEquals(BulkLoadFile bu
         return q;
     }
 
-	public static TypedQuery<Parent> findParentsByCdId(int CdId, String sortFieldName, String sortOrder) {
+    public static TypedQuery<Parent> findParentsByCdId(int CdId, String sortFieldName, String sortOrder) {
         EntityManager em = Parent.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Parent AS o WHERE o.CdId = :CdId");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -516,8 +539,9 @@ public static TypedQuery<Parent> findParentsByCdId(int CdId, String sortFieldNam
         return q;
     }
 
-	public static TypedQuery<Parent> findParentsByCommonNameLike(String commonName) {
-        if (commonName == null || commonName.length() == 0) throw new IllegalArgumentException("The commonName argument is required");
+    public static TypedQuery<Parent> findParentsByCommonNameLike(String commonName) {
+        if (commonName == null || commonName.length() == 0)
+            throw new IllegalArgumentException("The commonName argument is required");
         commonName = commonName.replace('*', '%');
         if (commonName.charAt(0) != '%') {
             commonName = "%" + commonName;
@@ -526,13 +550,16 @@ public static TypedQuery<Parent> findParentsByCommonNameLike(String commonName)
             commonName = commonName + "%";
         }
         EntityManager em = Parent.entityManager();
-        TypedQuery<Parent> q = em.createQuery("SELECT o FROM Parent AS o WHERE LOWER(o.commonName) LIKE LOWER(:commonName)", Parent.class);
+        TypedQuery<Parent> q = em.createQuery(
+                "SELECT o FROM Parent AS o WHERE LOWER(o.commonName) LIKE LOWER(:commonName)", Parent.class);
         q.setParameter("commonName", commonName);
         return q;
     }
 
-	public static TypedQuery<Parent> findParentsByCommonNameLike(String commonName, String sortFieldName, String sortOrder) {
-        if (commonName == null || commonName.length() == 0) throw new IllegalArgumentException("The commonName argument is required");
+    public static TypedQuery<Parent> findParentsByCommonNameLike(String commonName, String sortFieldName,
+            String sortOrder) {
+        if (commonName == null || commonName.length() == 0)
+            throw new IllegalArgumentException("The commonName argument is required");
         commonName = commonName.replace('*', '%');
         if (commonName.charAt(0) != '%') {
             commonName = "%" + commonName;
@@ -541,7 +568,8 @@ public static TypedQuery<Parent> findParentsByCommonNameLike(String commonName,
             commonName = commonName + "%";
         }
         EntityManager em = Parent.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Parent AS o WHERE LOWER(o.commonName) LIKE LOWER(:commonName)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Parent AS o WHERE LOWER(o.commonName) LIKE LOWER(:commonName)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -553,16 +581,19 @@ public static TypedQuery<Parent> findParentsByCommonNameLike(String commonName,
         return q;
     }
 
-	public static TypedQuery<Parent> findParentsByCorpNameEquals(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+    public static TypedQuery<Parent> findParentsByCorpNameEquals(String corpName) {
+        if (corpName == null || corpName.length() == 0)
+            throw new IllegalArgumentException("The corpName argument is required");
         EntityManager em = Parent.entityManager();
         TypedQuery<Parent> q = em.createQuery("SELECT o FROM Parent AS o WHERE o.corpName = :corpName", Parent.class);
         q.setParameter("corpName", corpName);
         return q;
     }
 
-	public static TypedQuery<Parent> findParentsByCorpNameEquals(String corpName, String sortFieldName, String sortOrder) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+    public static TypedQuery<Parent> findParentsByCorpNameEquals(String corpName, String sortFieldName,
+            String sortOrder) {
+        if (corpName == null || corpName.length() == 0)
+            throw new IllegalArgumentException("The corpName argument is required");
         EntityManager em = Parent.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Parent AS o WHERE o.corpName = :corpName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -576,8 +607,9 @@ public static TypedQuery<Parent> findParentsByCorpNameEquals(String corpName, St
         return q;
     }
 
-	public static TypedQuery<Parent> findParentsByCorpNameLike(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+    public static TypedQuery<Parent> findParentsByCorpNameLike(String corpName) {
+        if (corpName == null || corpName.length() == 0)
+            throw new IllegalArgumentException("The corpName argument is required");
         corpName = corpName.replace('*', '%');
         if (corpName.charAt(0) != '%') {
             corpName = "%" + corpName;
@@ -586,13 +618,16 @@ public static TypedQuery<Parent> findParentsByCorpNameLike(String corpName) {
             corpName = corpName + "%";
         }
         EntityManager em = Parent.entityManager();
-        TypedQuery<Parent> q = em.createQuery("SELECT o FROM Parent AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)", Parent.class);
+        TypedQuery<Parent> q = em.createQuery("SELECT o FROM Parent AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)",
+                Parent.class);
         q.setParameter("corpName", corpName);
         return q;
     }
 
-	public static TypedQuery<Parent> findParentsByCorpNameLike(String corpName, String sortFieldName, String sortOrder) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
+    public static TypedQuery<Parent> findParentsByCorpNameLike(String corpName, String sortFieldName,
+            String sortOrder) {
+        if (corpName == null || corpName.length() == 0)
+            throw new IllegalArgumentException("The corpName argument is required");
         corpName = corpName.replace('*', '%');
         if (corpName.charAt(0) != '%') {
             corpName = "%" + corpName;
@@ -601,7 +636,8 @@ public static TypedQuery<Parent> findParentsByCorpNameLike(String corpName, Stri
             corpName = corpName + "%";
         }
         EntityManager em = Parent.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Parent AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Parent AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -613,28 +649,33 @@ public static TypedQuery<Parent> findParentsByCorpNameLike(String corpName, Stri
         return q;
     }
 
-	public static TypedQuery<Parent> findParentsBySaltForms(Set<SaltForm> saltForms) {
-        if (saltForms == null) throw new IllegalArgumentException("The saltForms argument is required");
+    public static TypedQuery<Parent> findParentsBySaltForms(Set<SaltForm> saltForms) {
+        if (saltForms == null)
+            throw new IllegalArgumentException("The saltForms argument is required");
         EntityManager em = Parent.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Parent AS o WHERE");
         for (int i = 0; i < saltForms.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
+            if (i > 0)
+                queryBuilder.append(" AND");
             queryBuilder.append(" :saltForms_item").append(i).append(" MEMBER OF o.saltForms");
         }
         TypedQuery<Parent> q = em.createQuery(queryBuilder.toString(), Parent.class);
         int saltFormsIndex = 0;
-        for (SaltForm _saltform: saltForms) {
+        for (SaltForm _saltform : saltForms) {
             q.setParameter("saltForms_item" + saltFormsIndex++, _saltform);
         }
         return q;
     }
 
-	public static TypedQuery<Parent> findParentsBySaltForms(Set<SaltForm> saltForms, String sortFieldName, String sortOrder) {
-        if (saltForms == null) throw new IllegalArgumentException("The saltForms argument is required");
+    public static TypedQuery<Parent> findParentsBySaltForms(Set<SaltForm> saltForms, String sortFieldName,
+            String sortOrder) {
+        if (saltForms == null)
+            throw new IllegalArgumentException("The saltForms argument is required");
         EntityManager em = Parent.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Parent AS o WHERE");
         for (int i = 0; i < saltForms.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
+            if (i > 0)
+                queryBuilder.append(" AND");
             queryBuilder.append(" :saltForms_item").append(i).append(" MEMBER OF o.saltForms");
         }
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -645,242 +686,248 @@ public static TypedQuery<Parent> findParentsBySaltForms(Set<SaltForm> saltForms,
         }
         TypedQuery<Parent> q = em.createQuery(queryBuilder.toString(), Parent.class);
         int saltFormsIndex = 0;
-        for (SaltForm _saltform: saltForms) {
+        for (SaltForm _saltform : saltForms) {
             q.setParameter("saltForms_item" + saltFormsIndex++, _saltform);
         }
         return q;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static Parent fromJsonToParent(String json) {
+    public static Parent fromJsonToParent(String json) {
         return new JSONDeserializer<Parent>()
-        .use(null, Parent.class).deserialize(json);
+                .use(null, Parent.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<Parent> collection) {
+    public static String toJsonArray(Collection<Parent> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<Parent> collection, String[] fields) {
+    public static String toJsonArray(Collection<Parent> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<Parent> fromJsonArrayToParents(String json) {
+    public static Collection<Parent> fromJsonArrayToParents(String json) {
         return new JSONDeserializer<List<Parent>>()
-        .use("values", Parent.class).deserialize(json);
+                .use("values", Parent.class).deserialize(json);
     }
 
-	public String getCorpName() {
+    public String getCorpName() {
         return this.corpName;
     }
 
-	public void setCorpName(String corpName) {
+    public void setCorpName(String corpName) {
         this.corpName = corpName;
     }
 
-	public long getParentNumber() {
+    public long getParentNumber() {
         return this.parentNumber;
     }
 
-	public void setParentNumber(long parentNumber) {
+    public void setParentNumber(long parentNumber) {
         this.parentNumber = parentNumber;
     }
 
-	public String getChemist() {
+    public String getChemist() {
         return this.chemist;
     }
 
-	public void setChemist(String chemist) {
+    public void setChemist(String chemist) {
         this.chemist = chemist;
     }
 
-	public String getCommonName() {
+    public String getCommonName() {
         return this.commonName;
     }
 
-	public void setCommonName(String commonName) {
+    public void setCommonName(String commonName) {
         this.commonName = commonName;
     }
 
-	public StereoCategory getStereoCategory() {
+    public StereoCategory getStereoCategory() {
         return this.stereoCategory;
     }
 
-	public void setStereoCategory(StereoCategory stereoCategory) {
+    public void setStereoCategory(StereoCategory stereoCategory) {
         this.stereoCategory = stereoCategory;
     }
 
-	public String getStereoComment() {
+    public String getStereoComment() {
         return this.stereoComment;
     }
 
-	public void setStereoComment(String stereoComment) {
+    public void setStereoComment(String stereoComment) {
         this.stereoComment = stereoComment;
     }
 
-	public String getMolStructure() {
+    public String getMolStructure() {
         return this.molStructure;
     }
 
-	public void setMolStructure(String molStructure) {
+    public void setMolStructure(String molStructure) {
         this.molStructure = molStructure;
     }
 
-	public Double getMolWeight() {
+    public Double getMolWeight() {
         return this.molWeight;
     }
 
-	public void setMolWeight(Double molWeight) {
+    public void setMolWeight(Double molWeight) {
         this.molWeight = molWeight;
     }
 
-	public Double getExactMass() {
+    public Double getExactMass() {
         return this.exactMass;
     }
 
-	public void setExactMass(Double exactMass) {
+    public void setExactMass(Double exactMass) {
         this.exactMass = exactMass;
     }
 
-	public String getMolFormula() {
+    public String getMolFormula() {
         return this.molFormula;
     }
 
-	public void setMolFormula(String molFormula) {
+    public void setMolFormula(String molFormula) {
         this.molFormula = molFormula;
     }
 
-	public int getCdId() {
+    public int getCdId() {
         return this.CdId;
     }
 
-	public void setCdId(int CdId) {
+    public void setCdId(int CdId) {
         this.CdId = CdId;
     }
 
-	public Date getRegistrationDate() {
+    public Date getRegistrationDate() {
         return this.registrationDate;
     }
 
-	public void setRegistrationDate(Date registrationDate) {
+    public void setRegistrationDate(Date registrationDate) {
         this.registrationDate = registrationDate;
     }
 
-	public String getRegisteredBy() {
+    public String getRegisteredBy() {
         return this.registeredBy;
     }
 
-	public void setRegisteredBy(String registeredBy) {
+    public void setRegisteredBy(String registeredBy) {
         this.registeredBy = registeredBy;
     }
 
-	public Date getModifiedDate() {
+    public Date getModifiedDate() {
         return this.modifiedDate;
     }
 
-	public void setModifiedDate(Date modifiedDate) {
+    public void setModifiedDate(Date modifiedDate) {
         this.modifiedDate = modifiedDate;
     }
 
-	public String getModifiedBy() {
+    public String getModifiedBy() {
         return this.modifiedBy;
     }
 
-	public void setModifiedBy(String modifiedBy) {
+    public void setModifiedBy(String modifiedBy) {
         this.modifiedBy = modifiedBy;
     }
 
-	public Boolean getIgnore() {
+    public Boolean getIgnore() {
         return this.ignore;
     }
 
-	public void setIgnore(Boolean ignore) {
+    public void setIgnore(Boolean ignore) {
         this.ignore = ignore;
     }
 
-	public Set<SaltForm> getSaltForms() {
+    public Set<SaltForm> getSaltForms() {
         return this.saltForms;
     }
 
-	public void setSaltForms(Set<SaltForm> saltForms) {
+    public void setSaltForms(Set<SaltForm> saltForms) {
         this.saltForms = saltForms;
     }
 
-	public Set<ParentAlias> getParentAliases() {
+    public Set<ParentAlias> getParentAliases() {
         return this.parentAliases;
     }
 
-	public void setParentAliases(Set<ParentAlias> parentAliases) {
+    public void setParentAliases(Set<ParentAlias> parentAliases) {
         this.parentAliases = parentAliases;
     }
 
-	public BulkLoadFile getBulkLoadFile() {
+    public BulkLoadFile getBulkLoadFile() {
         return this.bulkLoadFile;
     }
 
-	public void setBulkLoadFile(BulkLoadFile bulkLoadFile) {
+    public void setBulkLoadFile(BulkLoadFile bulkLoadFile) {
         this.bulkLoadFile = bulkLoadFile;
     }
 
-	public ParentAnnotation getParentAnnotation() {
+    public ParentAnnotation getParentAnnotation() {
         return this.parentAnnotation;
     }
 
-	public void setParentAnnotation(ParentAnnotation parentAnnotation) {
+    public void setParentAnnotation(ParentAnnotation parentAnnotation) {
         this.parentAnnotation = parentAnnotation;
     }
 
-	public CompoundType getCompoundType() {
+    public CompoundType getCompoundType() {
         return this.compoundType;
     }
 
-	public void setCompoundType(CompoundType compoundType) {
+    public void setCompoundType(CompoundType compoundType) {
         this.compoundType = compoundType;
     }
 
-	public String getComment() {
+    public String getComment() {
         return this.comment;
     }
 
-	public void setComment(String comment) {
+    public void setComment(String comment) {
         this.comment = comment;
     }
 
-	public Boolean getIsMixture() {
+    public Boolean getIsMixture() {
         return this.isMixture;
     }
 
-	public void setIsMixture(Boolean isMixture) {
+    public void setIsMixture(Boolean isMixture) {
         this.isMixture = isMixture;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "corpName", "parentNumber", "chemist", "commonName", "stereoCategory", "stereoComment", "molStructure", "molWeight", "exactMass", "molFormula", "CdId", "registrationDate", "registeredBy", "modifiedDate", "modifiedBy", "ignore", "saltForms", "parentAliases", "bulkLoadFile", "parentAnnotation", "compoundType", "comment", "isMixture", "labelPrefix");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "corpName",
+            "parentNumber", "chemist", "commonName", "stereoCategory", "stereoComment", "molStructure", "molWeight",
+            "exactMass", "molFormula", "CdId", "registrationDate", "registeredBy", "modifiedDate", "modifiedBy",
+            "ignore", "saltForms", "parentAliases", "bulkLoadFile", "parentAnnotation", "compoundType", "comment",
+            "isMixture", "labelPrefix");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new Parent().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countParents() {
+    public static long countParents() {
         return entityManager().createQuery("SELECT COUNT(o) FROM Parent o", Long.class).getSingleResult();
     }
 
-	public static List<Parent> findAllParents(String sortFieldName, String sortOrder) {
+    public static List<Parent> findAllParents(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM Parent o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -891,7 +938,8 @@ public static List<Parent> findAllParents(String sortFieldName, String sortOrder
         return entityManager().createQuery(jpaQuery, Parent.class).getResultList();
     }
 
-	public static List<Parent> findParentEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<Parent> findParentEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM Parent o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -899,18 +947,21 @@ public static List<Parent> findParentEntries(int firstResult, int maxResults, St
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, Parent.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, Parent.class).setFirstResult(firstResult).setMaxResults(maxResults)
+                .getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -919,21 +970,24 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public Parent merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         Parent merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAlias.java b/src/main/java/com/labsynch/labseer/domain/ParentAlias.java
index ca0294983..b58aac91d 100644
--- a/src/main/java/com/labsynch/labseer/domain/ParentAlias.java
+++ b/src/main/java/com/labsynch/labseer/domain/ParentAlias.java
@@ -32,103 +32,124 @@
 @Entity
 public class ParentAlias {
 
-	private static final Logger logger = LoggerFactory.getLogger(ParentAlias.class);
-	
-	@ManyToOne
-    @org.hibernate.annotations.Index(name="ParentAlias_Parent_IDX")
-	@JoinColumn(name = "parent")
-	private Parent parent;
-	
+    private static final Logger logger = LoggerFactory.getLogger(ParentAlias.class);
+
+    @ManyToOne
+    @org.hibernate.annotations.Index(name = "ParentAlias_Parent_IDX")
+    @JoinColumn(name = "parent")
+    private Parent parent;
+
     private String lsType;
 
     private String lsKind;
-    
+
     private String aliasName;
-    
-	private boolean preferred;
-	
-	private boolean ignored;
-	
-	private boolean deleted;
-	
-	private Integer sortId;
-	
-
-	public ParentAlias(){
-	}
-	
-	public ParentAlias(Parent parent, String lsType, String lsKind, String aliasName, boolean preferred){
-		this.parent = parent;
-		this.lsType = lsType;
-		this.lsKind = lsKind;
-		this.aliasName = aliasName;
-		this.preferred = preferred;
-	}
-	
-	public ParentAlias(ParentAliasDTO parentAliasDTO) throws ParentNotFoundException{
-		try{
-			Parent parent = Parent.findParentsByCorpNameEquals(parentAliasDTO.getParentCorpName()).getSingleResult();
-			this.parent = parent;
-		}catch (Exception e){
-			logger.error("Parent "+parentAliasDTO.getParentCorpName()+" could not be found.",e);
-			throw new ParentNotFoundException("Parent "+parentAliasDTO.getParentCorpName()+" could not be found.");
-		}
-		this.lsType = parentAliasDTO.getLsType();
-		this.lsKind = parentAliasDTO.getLsKind();
-		this.aliasName = parentAliasDTO.getAliasName();
-		this.preferred = parentAliasDTO.isPreferred();
-		this.ignored = parentAliasDTO.getIgnored();
-		this.setId(parentAliasDTO.getId());
-		this.setVersion(parentAliasDTO.getVersion());
-	}
-
-	public static Long countFindParentAliasesByAliasNameEquals(String aliasName) {
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
+
+    private boolean preferred;
+
+    private boolean ignored;
+
+    private boolean deleted;
+
+    private Integer sortId;
+
+    public ParentAlias() {
+    }
+
+    public ParentAlias(Parent parent, String lsType, String lsKind, String aliasName, boolean preferred) {
+        this.parent = parent;
+        this.lsType = lsType;
+        this.lsKind = lsKind;
+        this.aliasName = aliasName;
+        this.preferred = preferred;
+    }
+
+    public ParentAlias(ParentAliasDTO parentAliasDTO) throws ParentNotFoundException {
+        try {
+            Parent parent = Parent.findParentsByCorpNameEquals(parentAliasDTO.getParentCorpName()).getSingleResult();
+            this.parent = parent;
+        } catch (Exception e) {
+            logger.error("Parent " + parentAliasDTO.getParentCorpName() + " could not be found.", e);
+            throw new ParentNotFoundException("Parent " + parentAliasDTO.getParentCorpName() + " could not be found.");
+        }
+        this.lsType = parentAliasDTO.getLsType();
+        this.lsKind = parentAliasDTO.getLsKind();
+        this.aliasName = parentAliasDTO.getAliasName();
+        this.preferred = parentAliasDTO.isPreferred();
+        this.ignored = parentAliasDTO.getIgnored();
+        this.setId(parentAliasDTO.getId());
+        this.setVersion(parentAliasDTO.getVersion());
+    }
+
+    public static Long countFindParentAliasesByAliasNameEquals(String aliasName) {
+        if (aliasName == null || aliasName.length() == 0)
+            throw new IllegalArgumentException("The aliasName argument is required");
         EntityManager em = ParentAlias.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ParentAlias AS o WHERE o.aliasName = :aliasName", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ParentAlias AS o WHERE o.aliasName = :aliasName",
+                Long.class);
         q.setParameter("aliasName", aliasName);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName, String lsType, String lsKind) {
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static Long countFindParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName,
+            String lsType, String lsKind) {
+        if (aliasName == null || aliasName.length() == 0)
+            throw new IllegalArgumentException("The aliasName argument is required");
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = ParentAlias.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ParentAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ParentAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind",
+                Long.class);
         q.setParameter("aliasName", aliasName);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindParentAliasesByParent(Parent parent) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
+    public static Long countFindParentAliasesByParent(Parent parent) {
+        if (parent == null)
+            throw new IllegalArgumentException("The parent argument is required");
         EntityManager em = ParentAlias.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ParentAlias AS o WHERE o.parent = :parent", Long.class);
         q.setParameter("parent", parent);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindParentAliasesByParentAndLsTypeEqualsAndLsKindEquals(Parent parent, String lsType, String lsKind) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static Long countFindParentAliasesByParentAndLsTypeEqualsAndLsKindEquals(Parent parent, String lsType,
+            String lsKind) {
+        if (parent == null)
+            throw new IllegalArgumentException("The parent argument is required");
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = ParentAlias.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ParentAlias AS o WHERE o.parent = :parent AND o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ParentAlias AS o WHERE o.parent = :parent AND o.lsType = :lsType  AND o.lsKind = :lsKind",
+                Long.class);
         q.setParameter("parent", parent);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals(Parent parent, String lsType, String lsKind, String aliasName) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
+    public static Long countFindParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals(Parent parent,
+            String lsType, String lsKind, String aliasName) {
+        if (parent == null)
+            throw new IllegalArgumentException("The parent argument is required");
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (aliasName == null || aliasName.length() == 0)
+            throw new IllegalArgumentException("The aliasName argument is required");
         EntityManager em = ParentAlias.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ParentAlias AS o WHERE o.parent = :parent AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.aliasName = :aliasName", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ParentAlias AS o WHERE o.parent = :parent AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.aliasName = :aliasName",
+                Long.class);
         q.setParameter("parent", parent);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
@@ -136,16 +157,20 @@ public static Long countFindParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsA
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<ParentAlias> findParentAliasesByAliasNameEquals(String aliasName) {
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
+    public static TypedQuery<ParentAlias> findParentAliasesByAliasNameEquals(String aliasName) {
+        if (aliasName == null || aliasName.length() == 0)
+            throw new IllegalArgumentException("The aliasName argument is required");
         EntityManager em = ParentAlias.entityManager();
-        TypedQuery<ParentAlias> q = em.createQuery("SELECT o FROM ParentAlias AS o WHERE o.aliasName = :aliasName", ParentAlias.class);
+        TypedQuery<ParentAlias> q = em.createQuery("SELECT o FROM ParentAlias AS o WHERE o.aliasName = :aliasName",
+                ParentAlias.class);
         q.setParameter("aliasName", aliasName);
         return q;
     }
 
-	public static TypedQuery<ParentAlias> findParentAliasesByAliasNameEquals(String aliasName, String sortFieldName, String sortOrder) {
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
+    public static TypedQuery<ParentAlias> findParentAliasesByAliasNameEquals(String aliasName, String sortFieldName,
+            String sortOrder) {
+        if (aliasName == null || aliasName.length() == 0)
+            throw new IllegalArgumentException("The aliasName argument is required");
         EntityManager em = ParentAlias.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ParentAlias AS o WHERE o.aliasName = :aliasName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -159,24 +184,35 @@ public static TypedQuery<ParentAlias> findParentAliasesByAliasNameEquals(String
         return q;
     }
 
-	public static TypedQuery<ParentAlias> findParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName, String lsType, String lsKind) {
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<ParentAlias> findParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(
+            String aliasName, String lsType, String lsKind) {
+        if (aliasName == null || aliasName.length() == 0)
+            throw new IllegalArgumentException("The aliasName argument is required");
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = ParentAlias.entityManager();
-        TypedQuery<ParentAlias> q = em.createQuery("SELECT o FROM ParentAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind", ParentAlias.class);
+        TypedQuery<ParentAlias> q = em.createQuery(
+                "SELECT o FROM ParentAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind",
+                ParentAlias.class);
         q.setParameter("aliasName", aliasName);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         return q;
     }
 
-	public static TypedQuery<ParentAlias> findParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName, String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<ParentAlias> findParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(
+            String aliasName, String lsType, String lsKind, String sortFieldName, String sortOrder) {
+        if (aliasName == null || aliasName.length() == 0)
+            throw new IllegalArgumentException("The aliasName argument is required");
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = ParentAlias.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ParentAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ParentAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -190,16 +226,20 @@ public static TypedQuery<ParentAlias> findParentAliasesByAliasNameEqualsAndLsTyp
         return q;
     }
 
-	public static TypedQuery<ParentAlias> findParentAliasesByParent(Parent parent) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
+    public static TypedQuery<ParentAlias> findParentAliasesByParent(Parent parent) {
+        if (parent == null)
+            throw new IllegalArgumentException("The parent argument is required");
         EntityManager em = ParentAlias.entityManager();
-        TypedQuery<ParentAlias> q = em.createQuery("SELECT o FROM ParentAlias AS o WHERE o.parent = :parent", ParentAlias.class);
+        TypedQuery<ParentAlias> q = em.createQuery("SELECT o FROM ParentAlias AS o WHERE o.parent = :parent",
+                ParentAlias.class);
         q.setParameter("parent", parent);
         return q;
     }
 
-	public static TypedQuery<ParentAlias> findParentAliasesByParent(Parent parent, String sortFieldName, String sortOrder) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
+    public static TypedQuery<ParentAlias> findParentAliasesByParent(Parent parent, String sortFieldName,
+            String sortOrder) {
+        if (parent == null)
+            throw new IllegalArgumentException("The parent argument is required");
         EntityManager em = ParentAlias.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ParentAlias AS o WHERE o.parent = :parent");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -213,24 +253,35 @@ public static TypedQuery<ParentAlias> findParentAliasesByParent(Parent parent, S
         return q;
     }
 
-	public static TypedQuery<ParentAlias> findParentAliasesByParentAndLsTypeEqualsAndLsKindEquals(Parent parent, String lsType, String lsKind) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<ParentAlias> findParentAliasesByParentAndLsTypeEqualsAndLsKindEquals(Parent parent,
+            String lsType, String lsKind) {
+        if (parent == null)
+            throw new IllegalArgumentException("The parent argument is required");
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = ParentAlias.entityManager();
-        TypedQuery<ParentAlias> q = em.createQuery("SELECT o FROM ParentAlias AS o WHERE o.parent = :parent AND o.lsType = :lsType  AND o.lsKind = :lsKind", ParentAlias.class);
+        TypedQuery<ParentAlias> q = em.createQuery(
+                "SELECT o FROM ParentAlias AS o WHERE o.parent = :parent AND o.lsType = :lsType  AND o.lsKind = :lsKind",
+                ParentAlias.class);
         q.setParameter("parent", parent);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         return q;
     }
 
-	public static TypedQuery<ParentAlias> findParentAliasesByParentAndLsTypeEqualsAndLsKindEquals(Parent parent, String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<ParentAlias> findParentAliasesByParentAndLsTypeEqualsAndLsKindEquals(Parent parent,
+            String lsType, String lsKind, String sortFieldName, String sortOrder) {
+        if (parent == null)
+            throw new IllegalArgumentException("The parent argument is required");
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = ParentAlias.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ParentAlias AS o WHERE o.parent = :parent AND o.lsType = :lsType  AND o.lsKind = :lsKind");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ParentAlias AS o WHERE o.parent = :parent AND o.lsType = :lsType  AND o.lsKind = :lsKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -244,13 +295,20 @@ public static TypedQuery<ParentAlias> findParentAliasesByParentAndLsTypeEqualsAn
         return q;
     }
 
-	public static TypedQuery<ParentAlias> findParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals(Parent parent, String lsType, String lsKind, String aliasName) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
+    public static TypedQuery<ParentAlias> findParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals(
+            Parent parent, String lsType, String lsKind, String aliasName) {
+        if (parent == null)
+            throw new IllegalArgumentException("The parent argument is required");
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (aliasName == null || aliasName.length() == 0)
+            throw new IllegalArgumentException("The aliasName argument is required");
         EntityManager em = ParentAlias.entityManager();
-        TypedQuery<ParentAlias> q = em.createQuery("SELECT o FROM ParentAlias AS o WHERE o.parent = :parent AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.aliasName = :aliasName", ParentAlias.class);
+        TypedQuery<ParentAlias> q = em.createQuery(
+                "SELECT o FROM ParentAlias AS o WHERE o.parent = :parent AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.aliasName = :aliasName",
+                ParentAlias.class);
         q.setParameter("parent", parent);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
@@ -258,13 +316,19 @@ public static TypedQuery<ParentAlias> findParentAliasesByParentAndLsTypeEqualsAn
         return q;
     }
 
-	public static TypedQuery<ParentAlias> findParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals(Parent parent, String lsType, String lsKind, String aliasName, String sortFieldName, String sortOrder) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
+    public static TypedQuery<ParentAlias> findParentAliasesByParentAndLsTypeEqualsAndLsKindEqualsAndAliasNameEquals(
+            Parent parent, String lsType, String lsKind, String aliasName, String sortFieldName, String sortOrder) {
+        if (parent == null)
+            throw new IllegalArgumentException("The parent argument is required");
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (aliasName == null || aliasName.length() == 0)
+            throw new IllegalArgumentException("The aliasName argument is required");
         EntityManager em = ParentAlias.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ParentAlias AS o WHERE o.parent = :parent AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.aliasName = :aliasName");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ParentAlias AS o WHERE o.parent = :parent AND o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.aliasName = :aliasName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -279,30 +343,33 @@ public static TypedQuery<ParentAlias> findParentAliasesByParentAndLsTypeEqualsAn
         return q;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "parent", "lsType", "lsKind", "aliasName", "preferred", "ignored", "deleted", "sortId");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "parent",
+            "lsType", "lsKind", "aliasName", "preferred", "ignored", "deleted", "sortId");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new ParentAlias().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countParentAliases() {
+    public static long countParentAliases() {
         return entityManager().createQuery("SELECT COUNT(o) FROM ParentAlias o", Long.class).getSingleResult();
     }
 
-	public static List<ParentAlias> findAllParentAliases() {
+    public static List<ParentAlias> findAllParentAliases() {
         return entityManager().createQuery("SELECT o FROM ParentAlias o", ParentAlias.class).getResultList();
     }
 
-	public static List<ParentAlias> findAllParentAliases(String sortFieldName, String sortOrder) {
+    public static List<ParentAlias> findAllParentAliases(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ParentAlias o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -313,16 +380,19 @@ public static List<ParentAlias> findAllParentAliases(String sortFieldName, Strin
         return entityManager().createQuery(jpaQuery, ParentAlias.class).getResultList();
     }
 
-	public static ParentAlias findParentAlias(Long id) {
-        if (id == null) return null;
+    public static ParentAlias findParentAlias(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ParentAlias.class, id);
     }
 
-	public static List<ParentAlias> findParentAliasEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ParentAlias o", ParentAlias.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ParentAlias> findParentAliasEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ParentAlias o", ParentAlias.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ParentAlias> findParentAliasEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ParentAlias> findParentAliasEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM ParentAlias o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -330,18 +400,21 @@ public static List<ParentAlias> findParentAliasEntries(int firstResult, int maxR
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ParentAlias.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ParentAlias.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -350,142 +423,145 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public ParentAlias merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ParentAlias merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ParentAlias fromJsonToParentAlias(String json) {
+    public static ParentAlias fromJsonToParentAlias(String json) {
         return new JSONDeserializer<ParentAlias>()
-        .use(null, ParentAlias.class).deserialize(json);
+                .use(null, ParentAlias.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ParentAlias> collection) {
+    public static String toJsonArray(Collection<ParentAlias> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ParentAlias> collection, String[] fields) {
+    public static String toJsonArray(Collection<ParentAlias> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ParentAlias> fromJsonArrayToParentAliases(String json) {
+    public static Collection<ParentAlias> fromJsonArrayToParentAliases(String json) {
         return new JSONDeserializer<List<ParentAlias>>()
-        .use("values", ParentAlias.class).deserialize(json);
+                .use("values", ParentAlias.class).deserialize(json);
     }
 
-	public Parent getParent() {
+    public Parent getParent() {
         return this.parent;
     }
 
-	public void setParent(Parent parent) {
+    public void setParent(Parent parent) {
         this.parent = parent;
     }
 
-	public String getLsType() {
+    public String getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(String lsType) {
+    public void setLsType(String lsType) {
         this.lsType = lsType;
     }
 
-	public String getLsKind() {
+    public String getLsKind() {
         return this.lsKind;
     }
 
-	public void setLsKind(String lsKind) {
+    public void setLsKind(String lsKind) {
         this.lsKind = lsKind;
     }
 
-	public String getAliasName() {
+    public String getAliasName() {
         return this.aliasName;
     }
 
-	public void setAliasName(String aliasName) {
+    public void setAliasName(String aliasName) {
         this.aliasName = aliasName;
     }
 
-	public boolean isPreferred() {
+    public boolean isPreferred() {
         return this.preferred;
     }
 
-	public void setPreferred(boolean preferred) {
+    public void setPreferred(boolean preferred) {
         this.preferred = preferred;
     }
 
-	public boolean isIgnored() {
+    public boolean isIgnored() {
         return this.ignored;
     }
 
-	public void setIgnored(boolean ignored) {
+    public void setIgnored(boolean ignored) {
         this.ignored = ignored;
     }
 
-	public boolean isDeleted() {
+    public boolean isDeleted() {
         return this.deleted;
     }
 
-	public void setDeleted(boolean deleted) {
+    public void setDeleted(boolean deleted) {
         this.deleted = deleted;
     }
 
-	public Integer getSortId() {
+    public Integer getSortId() {
         return this.sortId;
     }
 
-	public void setSortId(Integer sortId) {
+    public void setSortId(Integer sortId) {
         this.sortId = sortId;
     }
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAliasKind.java b/src/main/java/com/labsynch/labseer/domain/ParentAliasKind.java
index acef5ecdd..4a55673b9 100644
--- a/src/main/java/com/labsynch/labseer/domain/ParentAliasKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ParentAliasKind.java
@@ -28,7 +28,7 @@
 @Configurable
 
 public class ParentAliasKind {
-	
+
     @NotNull
     @ManyToOne
     @JoinColumn(name = "ls_type")
@@ -36,104 +36,104 @@ public class ParentAliasKind {
 
     @Size(max = 255)
     private String kindName;
-    
-    
 
-	public ParentAliasType getLsType() {
+    public ParentAliasType getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(ParentAliasType lsType) {
+    public void setLsType(ParentAliasType lsType) {
         this.lsType = lsType;
     }
 
-	public String getKindName() {
+    public String getKindName() {
         return this.kindName;
     }
 
-	public void setKindName(String kindName) {
+    public void setKindName(String kindName) {
         this.kindName = kindName;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ParentAliasKind fromJsonToParentAliasKind(String json) {
+    public static ParentAliasKind fromJsonToParentAliasKind(String json) {
         return new JSONDeserializer<ParentAliasKind>()
-        .use(null, ParentAliasKind.class).deserialize(json);
+                .use(null, ParentAliasKind.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ParentAliasKind> collection) {
+    public static String toJsonArray(Collection<ParentAliasKind> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ParentAliasKind> collection, String[] fields) {
+    public static String toJsonArray(Collection<ParentAliasKind> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ParentAliasKind> fromJsonArrayToParentAliasKinds(String json) {
+    public static Collection<ParentAliasKind> fromJsonArrayToParentAliasKinds(String json) {
         return new JSONDeserializer<List<ParentAliasKind>>()
-        .use("values", ParentAliasKind.class).deserialize(json);
+                .use("values", ParentAliasKind.class).deserialize(json);
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new ParentAliasKind().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countParentAliasKinds() {
+    public static long countParentAliasKinds() {
         return entityManager().createQuery("SELECT COUNT(o) FROM ParentAliasKind o", Long.class).getSingleResult();
     }
 
-	public static List<ParentAliasKind> findAllParentAliasKinds() {
+    public static List<ParentAliasKind> findAllParentAliasKinds() {
         return entityManager().createQuery("SELECT o FROM ParentAliasKind o", ParentAliasKind.class).getResultList();
     }
 
-	public static List<ParentAliasKind> findAllParentAliasKinds(String sortFieldName, String sortOrder) {
+    public static List<ParentAliasKind> findAllParentAliasKinds(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ParentAliasKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -144,16 +144,19 @@ public static List<ParentAliasKind> findAllParentAliasKinds(String sortFieldName
         return entityManager().createQuery(jpaQuery, ParentAliasKind.class).getResultList();
     }
 
-	public static ParentAliasKind findParentAliasKind(Long id) {
-        if (id == null) return null;
+    public static ParentAliasKind findParentAliasKind(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ParentAliasKind.class, id);
     }
 
-	public static List<ParentAliasKind> findParentAliasKindEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ParentAliasKind o", ParentAliasKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ParentAliasKind> findParentAliasKindEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ParentAliasKind o", ParentAliasKind.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ParentAliasKind> findParentAliasKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ParentAliasKind> findParentAliasKindEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ParentAliasKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -161,18 +164,21 @@ public static List<ParentAliasKind> findParentAliasKindEntries(int firstResult,
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ParentAliasKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ParentAliasKind.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -181,21 +187,24 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public ParentAliasKind merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ParentAliasKind merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAliasType.java b/src/main/java/com/labsynch/labseer/domain/ParentAliasType.java
index 9c6c28481..07ecddab9 100644
--- a/src/main/java/com/labsynch/labseer/domain/ParentAliasType.java
+++ b/src/main/java/com/labsynch/labseer/domain/ParentAliasType.java
@@ -28,87 +28,88 @@ public class ParentAliasType {
 
     @Size(max = 255)
     private String typeName;
-       
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ParentAliasType fromJsonToParentAliasType(String json) {
+    public static ParentAliasType fromJsonToParentAliasType(String json) {
         return new JSONDeserializer<ParentAliasType>()
-        .use(null, ParentAliasType.class).deserialize(json);
+                .use(null, ParentAliasType.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ParentAliasType> collection) {
+    public static String toJsonArray(Collection<ParentAliasType> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ParentAliasType> collection, String[] fields) {
+    public static String toJsonArray(Collection<ParentAliasType> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ParentAliasType> fromJsonArrayToParentAliasTypes(String json) {
+    public static Collection<ParentAliasType> fromJsonArrayToParentAliasTypes(String json) {
         return new JSONDeserializer<List<ParentAliasType>>()
-        .use("values", ParentAliasType.class).deserialize(json);
+                .use("values", ParentAliasType.class).deserialize(json);
     }
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new ParentAliasType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countParentAliasTypes() {
+    public static long countParentAliasTypes() {
         return entityManager().createQuery("SELECT COUNT(o) FROM ParentAliasType o", Long.class).getSingleResult();
     }
 
-	public static List<ParentAliasType> findAllParentAliasTypes() {
+    public static List<ParentAliasType> findAllParentAliasTypes() {
         return entityManager().createQuery("SELECT o FROM ParentAliasType o", ParentAliasType.class).getResultList();
     }
 
-	public static List<ParentAliasType> findAllParentAliasTypes(String sortFieldName, String sortOrder) {
+    public static List<ParentAliasType> findAllParentAliasTypes(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ParentAliasType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -119,16 +120,19 @@ public static List<ParentAliasType> findAllParentAliasTypes(String sortFieldName
         return entityManager().createQuery(jpaQuery, ParentAliasType.class).getResultList();
     }
 
-	public static ParentAliasType findParentAliasType(Long id) {
-        if (id == null) return null;
+    public static ParentAliasType findParentAliasType(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ParentAliasType.class, id);
     }
 
-	public static List<ParentAliasType> findParentAliasTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ParentAliasType o", ParentAliasType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ParentAliasType> findParentAliasTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ParentAliasType o", ParentAliasType.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ParentAliasType> findParentAliasTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ParentAliasType> findParentAliasTypeEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ParentAliasType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -136,18 +140,21 @@ public static List<ParentAliasType> findParentAliasTypeEntries(int firstResult,
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ParentAliasType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ParentAliasType.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -156,31 +163,34 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public ParentAliasType merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ParentAliasType merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String getTypeName() {
+    public String getTypeName() {
         return this.typeName;
     }
 
-	public void setTypeName(String typeName) {
+    public void setTypeName(String typeName) {
         this.typeName = typeName;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ParentAnnotation.java b/src/main/java/com/labsynch/labseer/domain/ParentAnnotation.java
index 77316a339..02685236b 100644
--- a/src/main/java/com/labsynch/labseer/domain/ParentAnnotation.java
+++ b/src/main/java/com/labsynch/labseer/domain/ParentAnnotation.java
@@ -27,36 +27,39 @@
 
 public class ParentAnnotation {
 
-	@NotNull
+    @NotNull
     private String code;
-    
+
     @NotNull
     private String name;
-    
+
     private Integer displayOrder;
-    
+
     private String comment;
-  
-    
 
-	public static Long countFindParentAnnotationsByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static Long countFindParentAnnotationsByCodeEquals(String code) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = ParentAnnotation.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ParentAnnotation AS o WHERE o.code = :code", Long.class);
         q.setParameter("code", code);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<ParentAnnotation> findParentAnnotationsByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static TypedQuery<ParentAnnotation> findParentAnnotationsByCodeEquals(String code) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = ParentAnnotation.entityManager();
-        TypedQuery<ParentAnnotation> q = em.createQuery("SELECT o FROM ParentAnnotation AS o WHERE o.code = :code", ParentAnnotation.class);
+        TypedQuery<ParentAnnotation> q = em.createQuery("SELECT o FROM ParentAnnotation AS o WHERE o.code = :code",
+                ParentAnnotation.class);
         q.setParameter("code", code);
         return q;
     }
 
-	public static TypedQuery<ParentAnnotation> findParentAnnotationsByCodeEquals(String code, String sortFieldName, String sortOrder) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static TypedQuery<ParentAnnotation> findParentAnnotationsByCodeEquals(String code, String sortFieldName,
+            String sortOrder) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = ParentAnnotation.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ParentAnnotation AS o WHERE o.code = :code");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -70,113 +73,116 @@ public static TypedQuery<ParentAnnotation> findParentAnnotationsByCodeEquals(Str
         return q;
     }
 
-	public String getCode() {
+    public String getCode() {
         return this.code;
     }
 
-	public void setCode(String code) {
+    public void setCode(String code) {
         this.code = code;
     }
 
-	public String getName() {
+    public String getName() {
         return this.name;
     }
 
-	public void setName(String name) {
+    public void setName(String name) {
         this.name = name;
     }
 
-	public Integer getDisplayOrder() {
+    public Integer getDisplayOrder() {
         return this.displayOrder;
     }
 
-	public void setDisplayOrder(Integer displayOrder) {
+    public void setDisplayOrder(Integer displayOrder) {
         this.displayOrder = displayOrder;
     }
 
-	public String getComment() {
+    public String getComment() {
         return this.comment;
     }
 
-	public void setComment(String comment) {
+    public void setComment(String comment) {
         this.comment = comment;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ParentAnnotation fromJsonToParentAnnotation(String json) {
+    public static ParentAnnotation fromJsonToParentAnnotation(String json) {
         return new JSONDeserializer<ParentAnnotation>()
-        .use(null, ParentAnnotation.class).deserialize(json);
+                .use(null, ParentAnnotation.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ParentAnnotation> collection) {
+    public static String toJsonArray(Collection<ParentAnnotation> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ParentAnnotation> collection, String[] fields) {
+    public static String toJsonArray(Collection<ParentAnnotation> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ParentAnnotation> fromJsonArrayToParentAnnotations(String json) {
+    public static Collection<ParentAnnotation> fromJsonArrayToParentAnnotations(String json) {
         return new JSONDeserializer<List<ParentAnnotation>>()
-        .use("values", ParentAnnotation.class).deserialize(json);
+                .use("values", ParentAnnotation.class).deserialize(json);
     }
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("code", "name", "displayOrder", "comment");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("code", "name",
+            "displayOrder", "comment");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new ParentAnnotation().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countParentAnnotations() {
+    public static long countParentAnnotations() {
         return entityManager().createQuery("SELECT COUNT(o) FROM ParentAnnotation o", Long.class).getSingleResult();
     }
 
-	public static List<ParentAnnotation> findAllParentAnnotations() {
+    public static List<ParentAnnotation> findAllParentAnnotations() {
         return entityManager().createQuery("SELECT o FROM ParentAnnotation o", ParentAnnotation.class).getResultList();
     }
 
-	public static List<ParentAnnotation> findAllParentAnnotations(String sortFieldName, String sortOrder) {
+    public static List<ParentAnnotation> findAllParentAnnotations(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ParentAnnotation o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -187,16 +193,19 @@ public static List<ParentAnnotation> findAllParentAnnotations(String sortFieldNa
         return entityManager().createQuery(jpaQuery, ParentAnnotation.class).getResultList();
     }
 
-	public static ParentAnnotation findParentAnnotation(Long id) {
-        if (id == null) return null;
+    public static ParentAnnotation findParentAnnotation(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ParentAnnotation.class, id);
     }
 
-	public static List<ParentAnnotation> findParentAnnotationEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ParentAnnotation o", ParentAnnotation.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ParentAnnotation> findParentAnnotationEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ParentAnnotation o", ParentAnnotation.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ParentAnnotation> findParentAnnotationEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ParentAnnotation> findParentAnnotationEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ParentAnnotation o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -204,18 +213,21 @@ public static List<ParentAnnotation> findParentAnnotationEntries(int firstResult
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ParentAnnotation.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ParentAnnotation.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -224,27 +236,30 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public ParentAnnotation merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ParentAnnotation merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/PhysicalState.java b/src/main/java/com/labsynch/labseer/domain/PhysicalState.java
index 5ae94bb7c..2ee02ae4a 100755
--- a/src/main/java/com/labsynch/labseer/domain/PhysicalState.java
+++ b/src/main/java/com/labsynch/labseer/domain/PhysicalState.java
@@ -27,33 +27,34 @@
 
 public class PhysicalState {
 
-	
     @Size(max = 255)
     private String name;
 
     @Size(max = 100)
     private String code;
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new PhysicalState().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countPhysicalStates() {
+    public static long countPhysicalStates() {
         return entityManager().createQuery("SELECT COUNT(o) FROM PhysicalState o", Long.class).getSingleResult();
     }
 
-	public static List<PhysicalState> findAllPhysicalStates() {
+    public static List<PhysicalState> findAllPhysicalStates() {
         return entityManager().createQuery("SELECT o FROM PhysicalState o", PhysicalState.class).getResultList();
     }
 
-	public static List<PhysicalState> findAllPhysicalStates(String sortFieldName, String sortOrder) {
+    public static List<PhysicalState> findAllPhysicalStates(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM PhysicalState o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -64,16 +65,19 @@ public static List<PhysicalState> findAllPhysicalStates(String sortFieldName, St
         return entityManager().createQuery(jpaQuery, PhysicalState.class).getResultList();
     }
 
-	public static PhysicalState findPhysicalState(Long id) {
-        if (id == null) return null;
+    public static PhysicalState findPhysicalState(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(PhysicalState.class, id);
     }
 
-	public static List<PhysicalState> findPhysicalStateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM PhysicalState o", PhysicalState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<PhysicalState> findPhysicalStateEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM PhysicalState o", PhysicalState.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<PhysicalState> findPhysicalStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<PhysicalState> findPhysicalStateEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM PhysicalState o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -81,18 +85,21 @@ public static List<PhysicalState> findPhysicalStateEntries(int firstResult, int
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, PhysicalState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, PhysicalState.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -101,44 +108,50 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public PhysicalState merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         PhysicalState merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public static Long countFindPhysicalStatesByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static Long countFindPhysicalStatesByCodeEquals(String code) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = PhysicalState.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM PhysicalState AS o WHERE o.code = :code", Long.class);
         q.setParameter("code", code);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindPhysicalStatesByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static Long countFindPhysicalStatesByNameEquals(String name) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = PhysicalState.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM PhysicalState AS o WHERE o.name = :name", Long.class);
         q.setParameter("name", name);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindPhysicalStatesByNameLike(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static Long countFindPhysicalStatesByNameLike(String name) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         name = name.replace('*', '%');
         if (name.charAt(0) != '%') {
             name = "%" + name;
@@ -147,21 +160,26 @@ public static Long countFindPhysicalStatesByNameLike(String name) {
             name = name + "%";
         }
         EntityManager em = PhysicalState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM PhysicalState AS o WHERE LOWER(o.name) LIKE LOWER(:name)", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM PhysicalState AS o WHERE LOWER(o.name) LIKE LOWER(:name)",
+                Long.class);
         q.setParameter("name", name);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<PhysicalState> findPhysicalStatesByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static TypedQuery<PhysicalState> findPhysicalStatesByCodeEquals(String code) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = PhysicalState.entityManager();
-        TypedQuery<PhysicalState> q = em.createQuery("SELECT o FROM PhysicalState AS o WHERE o.code = :code", PhysicalState.class);
+        TypedQuery<PhysicalState> q = em.createQuery("SELECT o FROM PhysicalState AS o WHERE o.code = :code",
+                PhysicalState.class);
         q.setParameter("code", code);
         return q;
     }
 
-	public static TypedQuery<PhysicalState> findPhysicalStatesByCodeEquals(String code, String sortFieldName, String sortOrder) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static TypedQuery<PhysicalState> findPhysicalStatesByCodeEquals(String code, String sortFieldName,
+            String sortOrder) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = PhysicalState.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM PhysicalState AS o WHERE o.code = :code");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -175,16 +193,20 @@ public static TypedQuery<PhysicalState> findPhysicalStatesByCodeEquals(String co
         return q;
     }
 
-	public static TypedQuery<PhysicalState> findPhysicalStatesByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<PhysicalState> findPhysicalStatesByNameEquals(String name) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = PhysicalState.entityManager();
-        TypedQuery<PhysicalState> q = em.createQuery("SELECT o FROM PhysicalState AS o WHERE o.name = :name", PhysicalState.class);
+        TypedQuery<PhysicalState> q = em.createQuery("SELECT o FROM PhysicalState AS o WHERE o.name = :name",
+                PhysicalState.class);
         q.setParameter("name", name);
         return q;
     }
 
-	public static TypedQuery<PhysicalState> findPhysicalStatesByNameEquals(String name, String sortFieldName, String sortOrder) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<PhysicalState> findPhysicalStatesByNameEquals(String name, String sortFieldName,
+            String sortOrder) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = PhysicalState.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM PhysicalState AS o WHERE o.name = :name");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -198,8 +220,9 @@ public static TypedQuery<PhysicalState> findPhysicalStatesByNameEquals(String na
         return q;
     }
 
-	public static TypedQuery<PhysicalState> findPhysicalStatesByNameLike(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<PhysicalState> findPhysicalStatesByNameLike(String name) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         name = name.replace('*', '%');
         if (name.charAt(0) != '%') {
             name = "%" + name;
@@ -208,13 +231,16 @@ public static TypedQuery<PhysicalState> findPhysicalStatesByNameLike(String name
             name = name + "%";
         }
         EntityManager em = PhysicalState.entityManager();
-        TypedQuery<PhysicalState> q = em.createQuery("SELECT o FROM PhysicalState AS o WHERE LOWER(o.name) LIKE LOWER(:name)", PhysicalState.class);
+        TypedQuery<PhysicalState> q = em.createQuery(
+                "SELECT o FROM PhysicalState AS o WHERE LOWER(o.name) LIKE LOWER(:name)", PhysicalState.class);
         q.setParameter("name", name);
         return q;
     }
 
-	public static TypedQuery<PhysicalState> findPhysicalStatesByNameLike(String name, String sortFieldName, String sortOrder) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<PhysicalState> findPhysicalStatesByNameLike(String name, String sortFieldName,
+            String sortOrder) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         name = name.replace('*', '%');
         if (name.charAt(0) != '%') {
             name = "%" + name;
@@ -223,7 +249,8 @@ public static TypedQuery<PhysicalState> findPhysicalStatesByNameLike(String name
             name = name + "%";
         }
         EntityManager em = PhysicalState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM PhysicalState AS o WHERE LOWER(o.name) LIKE LOWER(:name)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM PhysicalState AS o WHERE LOWER(o.name) LIKE LOWER(:name)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -235,78 +262,78 @@ public static TypedQuery<PhysicalState> findPhysicalStatesByNameLike(String name
         return q;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static PhysicalState fromJsonToPhysicalState(String json) {
+    public static PhysicalState fromJsonToPhysicalState(String json) {
         return new JSONDeserializer<PhysicalState>()
-        .use(null, PhysicalState.class).deserialize(json);
+                .use(null, PhysicalState.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<PhysicalState> collection) {
+    public static String toJsonArray(Collection<PhysicalState> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<PhysicalState> collection, String[] fields) {
+    public static String toJsonArray(Collection<PhysicalState> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<PhysicalState> fromJsonArrayToPhysicalStates(String json) {
+    public static Collection<PhysicalState> fromJsonArrayToPhysicalStates(String json) {
         return new JSONDeserializer<List<PhysicalState>>()
-        .use("values", PhysicalState.class).deserialize(json);
+                .use("values", PhysicalState.class).deserialize(json);
     }
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getName() {
+    public String getName() {
         return this.name;
     }
 
-	public void setName(String name) {
+    public void setName(String name) {
         this.name = name;
     }
 
-	public String getCode() {
+    public String getCode() {
         return this.code;
     }
 
-	public void setCode(String code) {
+    public void setCode(String code) {
         this.code = code;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName.java b/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName.java
index 0ee2c9884..7ce856282 100755
--- a/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName.java
+++ b/src/main/java/com/labsynch/labseer/domain/PreDef_CorpName.java
@@ -29,153 +29,156 @@
 
 public class PreDef_CorpName {
 
-	
-	private static final Logger logger = LoggerFactory.getLogger(PreDef_CorpName.class);
-
-    @org.hibernate.annotations.Index(name="PreDef_CorpNumber_IDX")
-	private long corpNumber;
-	
-	@Size(max = 64)
-    @org.hibernate.annotations.Index(name="PreDef_CorpName_IDX")
-	private String corpName;
-
-	@Size(max = 255)
-	private String comment;
-
-    @org.hibernate.annotations.Index(name="PreDef_Used_IDX")
-	private Boolean used;
-
-    @org.hibernate.annotations.Index(name="PreDef_Skip_IDX")
-	private Boolean skip;
-    
-    public static PreDef_CorpName findNextCorpName(){
+    private static final Logger logger = LoggerFactory.getLogger(PreDef_CorpName.class);
+
+    @org.hibernate.annotations.Index(name = "PreDef_CorpNumber_IDX")
+    private long corpNumber;
+
+    @Size(max = 64)
+    @org.hibernate.annotations.Index(name = "PreDef_CorpName_IDX")
+    private String corpName;
+
+    @Size(max = 255)
+    private String comment;
+
+    @org.hibernate.annotations.Index(name = "PreDef_Used_IDX")
+    private Boolean used;
+
+    @org.hibernate.annotations.Index(name = "PreDef_Skip_IDX")
+    private Boolean skip;
+
+    public static PreDef_CorpName findNextCorpName() {
         EntityManager em = PreDef_CorpName.entityManager();
-        TypedQuery<PreDef_CorpName> q = em.createQuery("SELECT o FROM PreDef_CorpName AS o WHERE o.skip = false AND o.used = false ORDER BY o asc", PreDef_CorpName.class);
+        TypedQuery<PreDef_CorpName> q = em.createQuery(
+                "SELECT o FROM PreDef_CorpName AS o WHERE o.skip = false AND o.used = false ORDER BY o asc",
+                PreDef_CorpName.class);
         q.setMaxResults(1);
         return q.getSingleResult();
-    	
-    }
 
+    }
 
-	public long getCorpNumber() {
+    public long getCorpNumber() {
         return this.corpNumber;
     }
 
-	public void setCorpNumber(long corpNumber) {
+    public void setCorpNumber(long corpNumber) {
         this.corpNumber = corpNumber;
     }
 
-	public String getCorpName() {
+    public String getCorpName() {
         return this.corpName;
     }
 
-	public void setCorpName(String corpName) {
+    public void setCorpName(String corpName) {
         this.corpName = corpName;
     }
 
-	public String getComment() {
+    public String getComment() {
         return this.comment;
     }
 
-	public void setComment(String comment) {
+    public void setComment(String comment) {
         this.comment = comment;
     }
 
-	public Boolean getUsed() {
+    public Boolean getUsed() {
         return this.used;
     }
 
-	public void setUsed(Boolean used) {
+    public void setUsed(Boolean used) {
         this.used = used;
     }
 
-	public Boolean getSkip() {
+    public Boolean getSkip() {
         return this.skip;
     }
 
-	public void setSkip(Boolean skip) {
+    public void setSkip(Boolean skip) {
         this.skip = skip;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static PreDef_CorpName fromJsonToPreDef_CorpName(String json) {
+    public static PreDef_CorpName fromJsonToPreDef_CorpName(String json) {
         return new JSONDeserializer<PreDef_CorpName>()
-        .use(null, PreDef_CorpName.class).deserialize(json);
+                .use(null, PreDef_CorpName.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<PreDef_CorpName> collection) {
+    public static String toJsonArray(Collection<PreDef_CorpName> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<PreDef_CorpName> collection, String[] fields) {
+    public static String toJsonArray(Collection<PreDef_CorpName> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<PreDef_CorpName> fromJsonArrayToPreDef_CorpNames(String json) {
+    public static Collection<PreDef_CorpName> fromJsonArrayToPreDef_CorpNames(String json) {
         return new JSONDeserializer<List<PreDef_CorpName>>()
-        .use("values", PreDef_CorpName.class).deserialize(json);
+                .use("values", PreDef_CorpName.class).deserialize(json);
     }
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "corpNumber", "corpName", "comment", "used", "skip");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "corpNumber",
+            "corpName", "comment", "used", "skip");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new PreDef_CorpName().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countPreDef_CorpNames() {
+    public static long countPreDef_CorpNames() {
         return entityManager().createQuery("SELECT COUNT(o) FROM PreDef_CorpName o", Long.class).getSingleResult();
     }
 
-	public static List<PreDef_CorpName> findAllPreDef_CorpNames() {
+    public static List<PreDef_CorpName> findAllPreDef_CorpNames() {
         return entityManager().createQuery("SELECT o FROM PreDef_CorpName o", PreDef_CorpName.class).getResultList();
     }
 
-	public static List<PreDef_CorpName> findAllPreDef_CorpNames(String sortFieldName, String sortOrder) {
+    public static List<PreDef_CorpName> findAllPreDef_CorpNames(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM PreDef_CorpName o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -186,16 +189,19 @@ public static List<PreDef_CorpName> findAllPreDef_CorpNames(String sortFieldName
         return entityManager().createQuery(jpaQuery, PreDef_CorpName.class).getResultList();
     }
 
-	public static PreDef_CorpName findPreDef_CorpName(Long id) {
-        if (id == null) return null;
+    public static PreDef_CorpName findPreDef_CorpName(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(PreDef_CorpName.class, id);
     }
 
-	public static List<PreDef_CorpName> findPreDef_CorpNameEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM PreDef_CorpName o", PreDef_CorpName.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<PreDef_CorpName> findPreDef_CorpNameEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM PreDef_CorpName o", PreDef_CorpName.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<PreDef_CorpName> findPreDef_CorpNameEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<PreDef_CorpName> findPreDef_CorpNameEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM PreDef_CorpName o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -203,18 +209,21 @@ public static List<PreDef_CorpName> findPreDef_CorpNameEntries(int firstResult,
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, PreDef_CorpName.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, PreDef_CorpName.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -223,21 +232,24 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public PreDef_CorpName merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         PreDef_CorpName merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
diff --git a/src/main/java/com/labsynch/labseer/domain/Protocol.java b/src/main/java/com/labsynch/labseer/domain/Protocol.java
index c04b31855..8daf15bba 100755
--- a/src/main/java/com/labsynch/labseer/domain/Protocol.java
+++ b/src/main/java/com/labsynch/labseer/domain/Protocol.java
@@ -50,13 +50,17 @@ public class Protocol extends AbstractThing {
     private Set<ProtocolLabel> lsLabels = new HashSet<ProtocolLabel>();
 
     @ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-    @JoinTable(name = "PROTOCOL_TAG", joinColumns = { @javax.persistence.JoinColumn(name = "protocol_id") }, inverseJoinColumns = { @javax.persistence.JoinColumn(name = "tag_id") })
+    @JoinTable(name = "PROTOCOL_TAG", joinColumns = {
+            @javax.persistence.JoinColumn(name = "protocol_id") }, inverseJoinColumns = {
+                    @javax.persistence.JoinColumn(name = "tag_id") })
     private Set<LsTag> lsTags = new HashSet<LsTag>();
 
-    @OneToMany(cascade = { javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.MERGE }, mappedBy = "secondProtocol", fetch = FetchType.LAZY, orphanRemoval = true)
+    @OneToMany(cascade = { javax.persistence.CascadeType.PERSIST,
+            javax.persistence.CascadeType.MERGE }, mappedBy = "secondProtocol", fetch = FetchType.LAZY, orphanRemoval = true)
     private Set<ItxProtocolProtocol> firstProtocols = new HashSet<ItxProtocolProtocol>();
 
-    @OneToMany(cascade = { javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.MERGE }, mappedBy = "firstProtocol", fetch = FetchType.LAZY, orphanRemoval = true)
+    @OneToMany(cascade = { javax.persistence.CascadeType.PERSIST,
+            javax.persistence.CascadeType.MERGE }, mappedBy = "firstProtocol", fetch = FetchType.LAZY, orphanRemoval = true)
     private Set<ItxProtocolProtocol> secondProtocols = new HashSet<ItxProtocolProtocol>();
 
     public Protocol(com.labsynch.labseer.domain.Protocol protocol) {
@@ -106,7 +110,7 @@ public static com.labsynch.labseer.domain.Protocol update(com.labsynch.labseer.d
         }
         if (protocol.getLsTags() != null) {
             for (LsTag lsTag : protocol.getLsTags()) {
-            	logger.debug("udpating tags: " + lsTag);
+                logger.debug("udpating tags: " + lsTag);
                 List<LsTag> queryTags = LsTag.findLsTagsByTagTextEquals(lsTag.getTagText()).getResultList();
                 if (queryTags.size() < 1) {
                     LsTag newLsTag = new LsTag(lsTag);
@@ -118,7 +122,8 @@ public static com.labsynch.labseer.domain.Protocol update(com.labsynch.labseer.d
             }
         }
         logger.debug("attempting to merge protocol");
-        if (logger.isDebugEnabled()) logger.debug(updatedProtocol.toPrettyJson());
+        if (logger.isDebugEnabled())
+            logger.debug(updatedProtocol.toPrettyJson());
         updatedProtocol.merge();
         logger.debug("successfully merged protocol");
         return updatedProtocol;
@@ -129,33 +134,47 @@ public static List<com.labsynch.labseer.domain.Protocol> findProtocolByProtocolN
         List<Protocol> protocolList = new ArrayList<Protocol>();
         for (ProtocolLabel protocolLabel : foundProtocolLabels) {
             Protocol protocol = Protocol.findProtocol(protocolLabel.getProtocol().getId());
-            if (!protocol.isIgnored()) protocolList.add(protocol);
+            if (!protocol.isIgnored())
+                protocolList.add(protocol);
         }
         return protocolList;
     }
 
     @Transactional
     public String toJsonStub() {
-        return new JSONSerializer().exclude("*.class", "lsStates.lsValues.lsState", "lsStates.protocol").include("lsTags", "lsLabels", "lsStates.lsValues").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().exclude("*.class", "lsStates.lsValues.lsState", "lsStates.protocol")
+                .include("lsTags", "lsLabels", "lsStates.lsValues").transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
 
     @Transactional
     public String toPrettyJsonStub() {
-        return new JSONSerializer().exclude("*.class", "lsStates.lsValues.lsState", "lsStates.protocol").include("lsTags", "lsLabels", "lsStates.lsValues").prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().exclude("*.class", "lsStates.lsValues.lsState", "lsStates.protocol")
+                .include("lsTags", "lsLabels", "lsStates.lsValues").prettyPrint(true)
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public String toJson() {
-        return new JSONSerializer().exclude("*.class", "lsStates.lsValues.lsState", "lsStates.protocol", "experiment.protocol").include("lsTags", "lsLabels", "lsStates.lsValues", "experiments.lsLabels", "experiments.lsStates.lsValues").prettyPrint(false).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.protocol", "experiment.protocol")
+                .include("lsTags", "lsLabels", "lsStates.lsValues", "experiments.lsLabels",
+                        "experiments.lsStates.lsValues")
+                .prettyPrint(false).transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public String toPrettyJson() {
-        return new JSONSerializer().exclude("*.class", "lsStates.lsValues.lsState", "lsStates.protocol", "experiment.protocol").include("lsTags", "lsLabels", "lsStates.lsValues", "experiments.lsLabels", "experiments.lsStates.lsValues").prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.protocol", "experiment.protocol")
+                .include("lsTags", "lsLabels", "lsStates.lsValues", "experiments.lsLabels",
+                        "experiments.lsStates.lsValues")
+                .prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
-    public static String toJsonArray(Collection<com.labsynch.labseer.domain.Protocol> collection, boolean prettyJson, boolean includeExperiments) {
+    public static String toJsonArray(Collection<com.labsynch.labseer.domain.Protocol> collection, boolean prettyJson,
+            boolean includeExperiments) {
         if (includeExperiments) {
             if (prettyJson) {
                 return toPrettyJsonArray(collection);
@@ -173,22 +192,30 @@ public static String toJsonArray(Collection<com.labsynch.labseer.domain.Protocol
 
     @Transactional
     public static String toPrettyJsonArray(Collection<com.labsynch.labseer.domain.Protocol> collection) {
-        return new JSONSerializer().exclude("*.class", "lsStates.lsValues.lsState", "lsStates.protocol", "experiment.protocol").include("lsTags", "lsLabels", "lsStates.lsValues", "experiments.lsLabels", "experiments.lsStates.lsValues").prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer()
+                .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.protocol", "experiment.protocol")
+                .include("lsTags", "lsLabels", "lsStates.lsValues", "experiments.lsLabels",
+                        "experiments.lsStates.lsValues")
+                .prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
     @Transactional
     public static String toPrettyJsonArrayStub(Collection<com.labsynch.labseer.domain.Protocol> collection) {
-        return new JSONSerializer().exclude("*.class", "lsStates.lsValues.lsState", "lsStates.protocol").include("lsTags", "lsLabels", "lsStates.lsValues").prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer().exclude("*.class", "lsStates.lsValues.lsState", "lsStates.protocol")
+                .include("lsTags", "lsLabels", "lsStates.lsValues").prettyPrint(true)
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
     @Transactional
     public static String toJsonArray(Collection<com.labsynch.labseer.domain.Protocol> collection) {
-        return new JSONSerializer().exclude("*.class").include("lsTags", "lsLabels", "lsStates.lsValues").transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer().exclude("*.class").include("lsTags", "lsLabels", "lsStates.lsValues")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
     @Transactional
     public static String toJsonArrayStub(Collection<com.labsynch.labseer.domain.Protocol> collection) {
-        return new JSONSerializer().exclude("*.class").include("lsTags", "lsLabels", "lsStates.lsValues").transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer().exclude("*.class").include("lsTags", "lsLabels", "lsStates.lsValues")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
     public static com.labsynch.labseer.domain.Protocol fromJsonToProtocol(String json) {
@@ -196,11 +223,13 @@ public static com.labsynch.labseer.domain.Protocol fromJsonToProtocol(String jso
     }
 
     public static Collection<com.labsynch.labseer.domain.Protocol> fromJsonArrayToProtocols(String json) {
-        return new JSONDeserializer<List<Protocol>>().use(null, ArrayList.class).use("values", Protocol.class).deserialize(json);
+        return new JSONDeserializer<List<Protocol>>().use(null, ArrayList.class).use("values", Protocol.class)
+                .deserialize(json);
     }
 
     public static Collection<com.labsynch.labseer.domain.Protocol> fromJsonArrayToProtocols(Reader json) {
-        return new JSONDeserializer<List<Protocol>>().use(null, ArrayList.class).use("values", Protocol.class).deserialize(json);
+        return new JSONDeserializer<List<Protocol>>().use(null, ArrayList.class).use("values", Protocol.class)
+                .deserialize(json);
     }
 
     @Transactional
@@ -219,8 +248,10 @@ public static Collection<com.labsynch.labseer.domain.Protocol> findProtocolByNam
     }
 
     public static com.labsynch.labseer.domain.Protocol findProtocol(Long id) {
-        if (id == null) return null;
-        else if (entityManager().find(Protocol.class, id) == null) return null;
+        if (id == null)
+            return null;
+        else if (entityManager().find(Protocol.class, id) == null)
+            return null;
         return entityManager().find(Protocol.class, id);
     }
 
@@ -289,25 +320,30 @@ public String findPreferredName() {
         }
     }
 
-	public static Long countFindProtocolsByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static Long countFindProtocolsByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = Protocol.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE o.codeName = :codeName", Long.class);
         q.setParameter("codeName", codeName);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindProtocolsByCodeNameEqualsAndIgnoredNot(String codeName, boolean ignored) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static Long countFindProtocolsByCodeNameEqualsAndIgnoredNot(String codeName, boolean ignored) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = Protocol.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE o.codeName = :codeName  AND o.ignored IS NOT :ignored", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM Protocol AS o WHERE o.codeName = :codeName  AND o.ignored IS NOT :ignored",
+                Long.class);
         q.setParameter("codeName", codeName);
         q.setParameter("ignored", ignored);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindProtocolsByCodeNameLike(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static Long countFindProtocolsByCodeNameLike(String codeName) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         codeName = codeName.replace('*', '%');
         if (codeName.charAt(0) != '%') {
             codeName = "%" + codeName;
@@ -316,28 +352,31 @@ public static Long countFindProtocolsByCodeNameLike(String codeName) {
             codeName = codeName + "%";
         }
         EntityManager em = Protocol.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM Protocol AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)", Long.class);
         q.setParameter("codeName", codeName);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindProtocolsByIgnoredNot(boolean ignored) {
+    public static Long countFindProtocolsByIgnoredNot(boolean ignored) {
         EntityManager em = Protocol.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE o.ignored IS NOT :ignored", Long.class);
         q.setParameter("ignored", ignored);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindProtocolsByLsKindEquals(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static Long countFindProtocolsByLsKindEquals(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = Protocol.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE o.lsKind = :lsKind", Long.class);
         q.setParameter("lsKind", lsKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindProtocolsByLsKindLike(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static Long countFindProtocolsByLsKindLike(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         lsKind = lsKind.replace('*', '%');
         if (lsKind.charAt(0) != '%') {
             lsKind = "%" + lsKind;
@@ -346,47 +385,57 @@ public static Long countFindProtocolsByLsKindLike(String lsKind) {
             lsKind = lsKind + "%";
         }
         EntityManager em = Protocol.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)",
+                Long.class);
         q.setParameter("lsKind", lsKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindProtocolsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static Long countFindProtocolsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = Protocol.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE o.lsTransaction = :lsTransaction",
+                Long.class);
         q.setParameter("lsTransaction", lsTransaction);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindProtocolsByLsTypeAndKindEquals(String lsTypeAndKind) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+    public static Long countFindProtocolsByLsTypeAndKindEquals(String lsTypeAndKind) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = Protocol.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE o.lsTypeAndKind = :lsTypeAndKind",
+                Long.class);
         q.setParameter("lsTypeAndKind", lsTypeAndKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindProtocolsByLsTypeEquals(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+    public static Long countFindProtocolsByLsTypeEquals(String lsType) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = Protocol.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE o.lsType = :lsType", Long.class);
         q.setParameter("lsType", lsType);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindProtocolsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static Long countFindProtocolsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = Protocol.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM Protocol AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindProtocolsByLsTypeLike(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+    public static Long countFindProtocolsByLsTypeLike(String lsType) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
         lsType = lsType.replace('*', '%');
         if (lsType.charAt(0) != '%') {
             lsType = "%" + lsType;
@@ -395,13 +444,15 @@ public static Long countFindProtocolsByLsTypeLike(String lsType) {
             lsType = lsType + "%";
         }
         EntityManager em = Protocol.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE LOWER(o.lsType) LIKE LOWER(:lsType)", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE LOWER(o.lsType) LIKE LOWER(:lsType)",
+                Long.class);
         q.setParameter("lsType", lsType);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindProtocolsByRecordedByLike(String recordedBy) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+    public static Long countFindProtocolsByRecordedByLike(String recordedBy) {
+        if (recordedBy == null || recordedBy.length() == 0)
+            throw new IllegalArgumentException("The recordedBy argument is required");
         recordedBy = recordedBy.replace('*', '%');
         if (recordedBy.charAt(0) != '%') {
             recordedBy = "%" + recordedBy;
@@ -410,21 +461,26 @@ public static Long countFindProtocolsByRecordedByLike(String recordedBy) {
             recordedBy = recordedBy + "%";
         }
         EntityManager em = Protocol.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Protocol AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM Protocol AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)", Long.class);
         q.setParameter("recordedBy", recordedBy);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<Protocol> findProtocolsByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static TypedQuery<Protocol> findProtocolsByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = Protocol.entityManager();
-        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE o.codeName = :codeName", Protocol.class);
+        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE o.codeName = :codeName",
+                Protocol.class);
         q.setParameter("codeName", codeName);
         return q;
     }
 
-	public static TypedQuery<Protocol> findProtocolsByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static TypedQuery<Protocol> findProtocolsByCodeNameEquals(String codeName, String sortFieldName,
+            String sortOrder) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = Protocol.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE o.codeName = :codeName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -438,19 +494,25 @@ public static TypedQuery<Protocol> findProtocolsByCodeNameEquals(String codeName
         return q;
     }
 
-	public static TypedQuery<Protocol> findProtocolsByCodeNameEqualsAndIgnoredNot(String codeName, boolean ignored) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static TypedQuery<Protocol> findProtocolsByCodeNameEqualsAndIgnoredNot(String codeName, boolean ignored) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = Protocol.entityManager();
-        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE o.codeName = :codeName  AND o.ignored IS NOT :ignored", Protocol.class);
+        TypedQuery<Protocol> q = em.createQuery(
+                "SELECT o FROM Protocol AS o WHERE o.codeName = :codeName  AND o.ignored IS NOT :ignored",
+                Protocol.class);
         q.setParameter("codeName", codeName);
         q.setParameter("ignored", ignored);
         return q;
     }
 
-	public static TypedQuery<Protocol> findProtocolsByCodeNameEqualsAndIgnoredNot(String codeName, boolean ignored, String sortFieldName, String sortOrder) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static TypedQuery<Protocol> findProtocolsByCodeNameEqualsAndIgnoredNot(String codeName, boolean ignored,
+            String sortFieldName, String sortOrder) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = Protocol.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE o.codeName = :codeName  AND o.ignored IS NOT :ignored");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Protocol AS o WHERE o.codeName = :codeName  AND o.ignored IS NOT :ignored");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -463,8 +525,9 @@ public static TypedQuery<Protocol> findProtocolsByCodeNameEqualsAndIgnoredNot(St
         return q;
     }
 
-	public static TypedQuery<Protocol> findProtocolsByCodeNameLike(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static TypedQuery<Protocol> findProtocolsByCodeNameLike(String codeName) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         codeName = codeName.replace('*', '%');
         if (codeName.charAt(0) != '%') {
             codeName = "%" + codeName;
@@ -473,13 +536,16 @@ public static TypedQuery<Protocol> findProtocolsByCodeNameLike(String codeName)
             codeName = codeName + "%";
         }
         EntityManager em = Protocol.entityManager();
-        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)", Protocol.class);
+        TypedQuery<Protocol> q = em.createQuery(
+                "SELECT o FROM Protocol AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)", Protocol.class);
         q.setParameter("codeName", codeName);
         return q;
     }
 
-	public static TypedQuery<Protocol> findProtocolsByCodeNameLike(String codeName, String sortFieldName, String sortOrder) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static TypedQuery<Protocol> findProtocolsByCodeNameLike(String codeName, String sortFieldName,
+            String sortOrder) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         codeName = codeName.replace('*', '%');
         if (codeName.charAt(0) != '%') {
             codeName = "%" + codeName;
@@ -488,7 +554,8 @@ public static TypedQuery<Protocol> findProtocolsByCodeNameLike(String codeName,
             codeName = codeName + "%";
         }
         EntityManager em = Protocol.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Protocol AS o WHERE LOWER(o.codeName) LIKE LOWER(:codeName)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -500,14 +567,16 @@ public static TypedQuery<Protocol> findProtocolsByCodeNameLike(String codeName,
         return q;
     }
 
-	public static TypedQuery<Protocol> findProtocolsByIgnoredNot(boolean ignored) {
+    public static TypedQuery<Protocol> findProtocolsByIgnoredNot(boolean ignored) {
         EntityManager em = Protocol.entityManager();
-        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE o.ignored IS NOT :ignored", Protocol.class);
+        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE o.ignored IS NOT :ignored",
+                Protocol.class);
         q.setParameter("ignored", ignored);
         return q;
     }
 
-	public static TypedQuery<Protocol> findProtocolsByIgnoredNot(boolean ignored, String sortFieldName, String sortOrder) {
+    public static TypedQuery<Protocol> findProtocolsByIgnoredNot(boolean ignored, String sortFieldName,
+            String sortOrder) {
         EntityManager em = Protocol.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE o.ignored IS NOT :ignored");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -521,16 +590,19 @@ public static TypedQuery<Protocol> findProtocolsByIgnoredNot(boolean ignored, St
         return q;
     }
 
-	public static TypedQuery<Protocol> findProtocolsByLsKindEquals(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<Protocol> findProtocolsByLsKindEquals(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = Protocol.entityManager();
         TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE o.lsKind = :lsKind", Protocol.class);
         q.setParameter("lsKind", lsKind);
         return q;
     }
 
-	public static TypedQuery<Protocol> findProtocolsByLsKindEquals(String lsKind, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<Protocol> findProtocolsByLsKindEquals(String lsKind, String sortFieldName,
+            String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = Protocol.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE o.lsKind = :lsKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -544,8 +616,9 @@ public static TypedQuery<Protocol> findProtocolsByLsKindEquals(String lsKind, St
         return q;
     }
 
-	public static TypedQuery<Protocol> findProtocolsByLsKindLike(String lsKind) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<Protocol> findProtocolsByLsKindLike(String lsKind) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         lsKind = lsKind.replace('*', '%');
         if (lsKind.charAt(0) != '%') {
             lsKind = "%" + lsKind;
@@ -554,13 +627,16 @@ public static TypedQuery<Protocol> findProtocolsByLsKindLike(String lsKind) {
             lsKind = lsKind + "%";
         }
         EntityManager em = Protocol.entityManager();
-        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)", Protocol.class);
+        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)",
+                Protocol.class);
         q.setParameter("lsKind", lsKind);
         return q;
     }
 
-	public static TypedQuery<Protocol> findProtocolsByLsKindLike(String lsKind, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<Protocol> findProtocolsByLsKindLike(String lsKind, String sortFieldName,
+            String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         lsKind = lsKind.replace('*', '%');
         if (lsKind.charAt(0) != '%') {
             lsKind = "%" + lsKind;
@@ -569,7 +645,8 @@ public static TypedQuery<Protocol> findProtocolsByLsKindLike(String lsKind, Stri
             lsKind = lsKind + "%";
         }
         EntityManager em = Protocol.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Protocol AS o WHERE LOWER(o.lsKind) LIKE LOWER(:lsKind)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -581,18 +658,23 @@ public static TypedQuery<Protocol> findProtocolsByLsKindLike(String lsKind, Stri
         return q;
     }
 
-	public static TypedQuery<Protocol> findProtocolsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<Protocol> findProtocolsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = Protocol.entityManager();
-        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE o.lsTransaction = :lsTransaction", Protocol.class);
+        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE o.lsTransaction = :lsTransaction",
+                Protocol.class);
         q.setParameter("lsTransaction", lsTransaction);
         return q;
     }
 
-	public static TypedQuery<Protocol> findProtocolsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<Protocol> findProtocolsByLsTransactionEquals(Long lsTransaction, String sortFieldName,
+            String sortOrder) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = Protocol.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE o.lsTransaction = :lsTransaction");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Protocol AS o WHERE o.lsTransaction = :lsTransaction");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -604,18 +686,23 @@ public static TypedQuery<Protocol> findProtocolsByLsTransactionEquals(Long lsTra
         return q;
     }
 
-	public static TypedQuery<Protocol> findProtocolsByLsTypeAndKindEquals(String lsTypeAndKind) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+    public static TypedQuery<Protocol> findProtocolsByLsTypeAndKindEquals(String lsTypeAndKind) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = Protocol.entityManager();
-        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", Protocol.class);
+        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE o.lsTypeAndKind = :lsTypeAndKind",
+                Protocol.class);
         q.setParameter("lsTypeAndKind", lsTypeAndKind);
         return q;
     }
 
-	public static TypedQuery<Protocol> findProtocolsByLsTypeAndKindEquals(String lsTypeAndKind, String sortFieldName, String sortOrder) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+    public static TypedQuery<Protocol> findProtocolsByLsTypeAndKindEquals(String lsTypeAndKind, String sortFieldName,
+            String sortOrder) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = Protocol.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE o.lsTypeAndKind = :lsTypeAndKind");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Protocol AS o WHERE o.lsTypeAndKind = :lsTypeAndKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -627,16 +714,19 @@ public static TypedQuery<Protocol> findProtocolsByLsTypeAndKindEquals(String lsT
         return q;
     }
 
-	public static TypedQuery<Protocol> findProtocolsByLsTypeEquals(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<Protocol> findProtocolsByLsTypeEquals(String lsType) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = Protocol.entityManager();
         TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE o.lsType = :lsType", Protocol.class);
         q.setParameter("lsType", lsType);
         return q;
     }
 
-	public static TypedQuery<Protocol> findProtocolsByLsTypeEquals(String lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<Protocol> findProtocolsByLsTypeEquals(String lsType, String sortFieldName,
+            String sortOrder) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = Protocol.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE o.lsType = :lsType");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -650,21 +740,28 @@ public static TypedQuery<Protocol> findProtocolsByLsTypeEquals(String lsType, St
         return q;
     }
 
-	public static TypedQuery<Protocol> findProtocolsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<Protocol> findProtocolsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = Protocol.entityManager();
-        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Protocol.class);
+        TypedQuery<Protocol> q = em.createQuery(
+                "SELECT o FROM Protocol AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Protocol.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         return q;
     }
 
-	public static TypedQuery<Protocol> findProtocolsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<Protocol> findProtocolsByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind,
+            String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = Protocol.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Protocol AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -677,8 +774,9 @@ public static TypedQuery<Protocol> findProtocolsByLsTypeEqualsAndLsKindEquals(St
         return q;
     }
 
-	public static TypedQuery<Protocol> findProtocolsByLsTypeLike(String lsType) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<Protocol> findProtocolsByLsTypeLike(String lsType) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
         lsType = lsType.replace('*', '%');
         if (lsType.charAt(0) != '%') {
             lsType = "%" + lsType;
@@ -687,13 +785,16 @@ public static TypedQuery<Protocol> findProtocolsByLsTypeLike(String lsType) {
             lsType = lsType + "%";
         }
         EntityManager em = Protocol.entityManager();
-        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE LOWER(o.lsType) LIKE LOWER(:lsType)", Protocol.class);
+        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE LOWER(o.lsType) LIKE LOWER(:lsType)",
+                Protocol.class);
         q.setParameter("lsType", lsType);
         return q;
     }
 
-	public static TypedQuery<Protocol> findProtocolsByLsTypeLike(String lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<Protocol> findProtocolsByLsTypeLike(String lsType, String sortFieldName,
+            String sortOrder) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
         lsType = lsType.replace('*', '%');
         if (lsType.charAt(0) != '%') {
             lsType = "%" + lsType;
@@ -702,7 +803,8 @@ public static TypedQuery<Protocol> findProtocolsByLsTypeLike(String lsType, Stri
             lsType = lsType + "%";
         }
         EntityManager em = Protocol.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE LOWER(o.lsType) LIKE LOWER(:lsType)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Protocol AS o WHERE LOWER(o.lsType) LIKE LOWER(:lsType)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -714,8 +816,9 @@ public static TypedQuery<Protocol> findProtocolsByLsTypeLike(String lsType, Stri
         return q;
     }
 
-	public static TypedQuery<Protocol> findProtocolsByRecordedByLike(String recordedBy) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+    public static TypedQuery<Protocol> findProtocolsByRecordedByLike(String recordedBy) {
+        if (recordedBy == null || recordedBy.length() == 0)
+            throw new IllegalArgumentException("The recordedBy argument is required");
         recordedBy = recordedBy.replace('*', '%');
         if (recordedBy.charAt(0) != '%') {
             recordedBy = "%" + recordedBy;
@@ -724,13 +827,16 @@ public static TypedQuery<Protocol> findProtocolsByRecordedByLike(String recorded
             recordedBy = recordedBy + "%";
         }
         EntityManager em = Protocol.entityManager();
-        TypedQuery<Protocol> q = em.createQuery("SELECT o FROM Protocol AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)", Protocol.class);
+        TypedQuery<Protocol> q = em.createQuery(
+                "SELECT o FROM Protocol AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)", Protocol.class);
         q.setParameter("recordedBy", recordedBy);
         return q;
     }
 
-	public static TypedQuery<Protocol> findProtocolsByRecordedByLike(String recordedBy, String sortFieldName, String sortOrder) {
-        if (recordedBy == null || recordedBy.length() == 0) throw new IllegalArgumentException("The recordedBy argument is required");
+    public static TypedQuery<Protocol> findProtocolsByRecordedByLike(String recordedBy, String sortFieldName,
+            String sortOrder) {
+        if (recordedBy == null || recordedBy.length() == 0)
+            throw new IllegalArgumentException("The recordedBy argument is required");
         recordedBy = recordedBy.replace('*', '%');
         if (recordedBy.charAt(0) != '%') {
             recordedBy = "%" + recordedBy;
@@ -739,7 +845,8 @@ public static TypedQuery<Protocol> findProtocolsByRecordedByLike(String recorded
             recordedBy = recordedBy + "%";
         }
         EntityManager em = Protocol.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Protocol AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Protocol AS o WHERE LOWER(o.recordedBy) LIKE LOWER(:recordedBy)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -751,77 +858,79 @@ public static TypedQuery<Protocol> findProtocolsByRecordedByLike(String recorded
         return q;
     }
 
-	public String toString() {
-        return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).setExcludeFieldNames("lsTags", "lsStates", "experiments", "lsLabels").toString();
+    public String toString() {
+        return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+                .setExcludeFieldNames("lsTags", "lsStates", "experiments", "lsLabels").toString();
     }
 
-	public String getShortDescription() {
+    public String getShortDescription() {
         return this.shortDescription;
     }
 
-	public void setShortDescription(String shortDescription) {
+    public void setShortDescription(String shortDescription) {
         this.shortDescription = shortDescription;
     }
 
-	public Set<ProtocolState> getLsStates() {
+    public Set<ProtocolState> getLsStates() {
         return this.lsStates;
     }
 
-	public void setLsStates(Set<ProtocolState> lsStates) {
+    public void setLsStates(Set<ProtocolState> lsStates) {
         this.lsStates = lsStates;
     }
 
-	public Set<Experiment> getExperiments() {
+    public Set<Experiment> getExperiments() {
         return this.experiments;
     }
 
-	public void setExperiments(Set<Experiment> experiments) {
+    public void setExperiments(Set<Experiment> experiments) {
         this.experiments = experiments;
     }
 
-	public Set<ProtocolLabel> getLsLabels() {
+    public Set<ProtocolLabel> getLsLabels() {
         return this.lsLabels;
     }
 
-	public void setLsLabels(Set<ProtocolLabel> lsLabels) {
+    public void setLsLabels(Set<ProtocolLabel> lsLabels) {
         this.lsLabels = lsLabels;
     }
 
-	public Set<LsTag> getLsTags() {
+    public Set<LsTag> getLsTags() {
         return this.lsTags;
     }
 
-	public void setLsTags(Set<LsTag> lsTags) {
+    public void setLsTags(Set<LsTag> lsTags) {
         this.lsTags = lsTags;
     }
 
-	public Set<ItxProtocolProtocol> getFirstProtocols() {
+    public Set<ItxProtocolProtocol> getFirstProtocols() {
         return this.firstProtocols;
     }
 
-	public void setFirstProtocols(Set<ItxProtocolProtocol> firstProtocols) {
+    public void setFirstProtocols(Set<ItxProtocolProtocol> firstProtocols) {
         this.firstProtocols = firstProtocols;
     }
 
-	public Set<ItxProtocolProtocol> getSecondProtocols() {
+    public Set<ItxProtocolProtocol> getSecondProtocols() {
         return this.secondProtocols;
     }
 
-	public void setSecondProtocols(Set<ItxProtocolProtocol> secondProtocols) {
+    public void setSecondProtocols(Set<ItxProtocolProtocol> secondProtocols) {
         this.secondProtocols = secondProtocols;
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "shortDescription", "lsStates", "experiments", "lsLabels", "lsTags", "firstProtocols", "secondProtocols");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger",
+            "shortDescription", "lsStates", "experiments", "lsLabels", "lsTags", "firstProtocols", "secondProtocols");
 
-	public static long countProtocols() {
+    public static long countProtocols() {
         return entityManager().createQuery("SELECT COUNT(o) FROM Protocol o", Long.class).getSingleResult();
     }
 
-	public static List<Protocol> findAllProtocols() {
+    public static List<Protocol> findAllProtocols() {
         return entityManager().createQuery("SELECT o FROM Protocol o", Protocol.class).getResultList();
     }
 
-	public static List<Protocol> findAllProtocols(String sortFieldName, String sortOrder) {
+    public static List<Protocol> findAllProtocols(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM Protocol o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -832,11 +941,13 @@ public static List<Protocol> findAllProtocols(String sortFieldName, String sortO
         return entityManager().createQuery(jpaQuery, Protocol.class).getResultList();
     }
 
-	public static List<Protocol> findProtocolEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM Protocol o", Protocol.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<Protocol> findProtocolEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM Protocol o", Protocol.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<Protocol> findProtocolEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<Protocol> findProtocolEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM Protocol o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -844,12 +955,14 @@ public static List<Protocol> findProtocolEntries(int firstResult, int maxResults
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, Protocol.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, Protocol.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public Protocol merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         Protocol merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolKind.java b/src/main/java/com/labsynch/labseer/domain/ProtocolKind.java
index 4ec8613ac..c5ee3b818 100755
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ProtocolKind.java
@@ -59,7 +59,9 @@ public class ProtocolKind {
 
     public static final EntityManager entityManager() {
         EntityManager em = new ProtocolKind().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
@@ -72,25 +74,31 @@ public static List<com.labsynch.labseer.domain.ProtocolKind> findAllProtocolKind
     }
 
     public static com.labsynch.labseer.domain.ProtocolKind findProtocolKind(Long id) {
-        if (id == null) return null;
+        if (id == null)
+            return null;
         return entityManager().find(ProtocolKind.class, id);
     }
 
-    public static List<com.labsynch.labseer.domain.ProtocolKind> findProtocolKindEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ProtocolKind o", ProtocolKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<com.labsynch.labseer.domain.ProtocolKind> findProtocolKindEntries(int firstResult,
+            int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ProtocolKind o", ProtocolKind.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
     @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.lsType = ProtocolType.findProtocolType(this.getLsType().getId());
-        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_').append(this.getKindName()).toString();
+        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_')
+                .append(this.getKindName()).toString();
         this.entityManager.persist(this);
     }
 
     @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -101,120 +109,137 @@ public void remove() {
 
     @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
     @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
     @Transactional
     public com.labsynch.labseer.domain.ProtocolKind merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_').append(this.getKindName()).toString();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
+        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_')
+                .append(this.getKindName()).toString();
         ProtocolKind merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ProtocolKind fromJsonToProtocolKind(String json) {
+    public static ProtocolKind fromJsonToProtocolKind(String json) {
         return new JSONDeserializer<ProtocolKind>()
-        .use(null, ProtocolKind.class).deserialize(json);
+                .use(null, ProtocolKind.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ProtocolKind> collection) {
+    public static String toJsonArray(Collection<ProtocolKind> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ProtocolKind> collection, String[] fields) {
+    public static String toJsonArray(Collection<ProtocolKind> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ProtocolKind> fromJsonArrayToProtocolKinds(String json) {
+    public static Collection<ProtocolKind> fromJsonArrayToProtocolKinds(String json) {
         return new JSONDeserializer<List<ProtocolKind>>()
-        .use("values", ProtocolKind.class).deserialize(json);
+                .use("values", ProtocolKind.class).deserialize(json);
     }
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public ProtocolType getLsType() {
+    public ProtocolType getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(ProtocolType lsType) {
+    public void setLsType(ProtocolType lsType) {
         this.lsType = lsType;
     }
 
-	public String getKindName() {
+    public String getKindName() {
         return this.kindName;
     }
 
-	public void setKindName(String kindName) {
+    public void setKindName(String kindName) {
         this.kindName = kindName;
     }
 
-	public String getLsTypeAndKind() {
+    public String getLsTypeAndKind() {
         return this.lsTypeAndKind;
     }
 
-	public void setLsTypeAndKind(String lsTypeAndKind) {
+    public void setLsTypeAndKind(String lsTypeAndKind) {
         this.lsTypeAndKind = lsTypeAndKind;
     }
 
-	public static Long countFindProtocolKindsByLsTypeEqualsAndKindNameEquals(ProtocolType lsType, String kindName) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+    public static Long countFindProtocolKindsByLsTypeEqualsAndKindNameEquals(ProtocolType lsType, String kindName) {
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
         EntityManager em = ProtocolKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolKind AS o WHERE o.lsType = :lsType  AND o.kindName = :kindName", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ProtocolKind AS o WHERE o.lsType = :lsType  AND o.kindName = :kindName",
+                Long.class);
         q.setParameter("lsType", lsType);
         q.setParameter("kindName", kindName);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<ProtocolKind> findProtocolKindsByLsTypeEqualsAndKindNameEquals(ProtocolType lsType, String kindName) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+    public static TypedQuery<ProtocolKind> findProtocolKindsByLsTypeEqualsAndKindNameEquals(ProtocolType lsType,
+            String kindName) {
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
         EntityManager em = ProtocolKind.entityManager();
-        TypedQuery<ProtocolKind> q = em.createQuery("SELECT o FROM ProtocolKind AS o WHERE o.lsType = :lsType  AND o.kindName = :kindName", ProtocolKind.class);
+        TypedQuery<ProtocolKind> q = em.createQuery(
+                "SELECT o FROM ProtocolKind AS o WHERE o.lsType = :lsType  AND o.kindName = :kindName",
+                ProtocolKind.class);
         q.setParameter("lsType", lsType);
         q.setParameter("kindName", kindName);
         return q;
     }
 
-	public static TypedQuery<ProtocolKind> findProtocolKindsByLsTypeEqualsAndKindNameEquals(ProtocolType lsType, String kindName, String sortFieldName, String sortOrder) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+    public static TypedQuery<ProtocolKind> findProtocolKindsByLsTypeEqualsAndKindNameEquals(ProtocolType lsType,
+            String kindName, String sortFieldName, String sortOrder) {
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
         EntityManager em = ProtocolKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolKind AS o WHERE o.lsType = :lsType  AND o.kindName = :kindName");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ProtocolKind AS o WHERE o.lsType = :lsType  AND o.kindName = :kindName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -227,13 +252,14 @@ public static TypedQuery<ProtocolKind> findProtocolKindsByLsTypeEqualsAndKindNam
         return q;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("id", "version", "lsType", "kindName", "lsTypeAndKind", "entityManager");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("id", "version", "lsType",
+            "kindName", "lsTypeAndKind", "entityManager");
 
-	public static List<ProtocolKind> findAllProtocolKinds(String sortFieldName, String sortOrder) {
+    public static List<ProtocolKind> findAllProtocolKinds(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ProtocolKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -244,7 +270,8 @@ public static List<ProtocolKind> findAllProtocolKinds(String sortFieldName, Stri
         return entityManager().createQuery(jpaQuery, ProtocolKind.class).getResultList();
     }
 
-	public static List<ProtocolKind> findProtocolKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ProtocolKind> findProtocolKindEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM ProtocolKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -252,6 +279,7 @@ public static List<ProtocolKind> findProtocolKindEntries(int firstResult, int ma
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ProtocolKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ProtocolKind.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolLabel.java b/src/main/java/com/labsynch/labseer/domain/ProtocolLabel.java
index 7eed59b13..42400e094 100755
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/ProtocolLabel.java
@@ -27,9 +27,8 @@
 @Entity
 
 public class ProtocolLabel extends AbstractLabel {
-	
-	private static final Logger logger = LoggerFactory.getLogger(ProtocolLabel.class);
 
+    private static final Logger logger = LoggerFactory.getLogger(ProtocolLabel.class);
 
     @NotNull
     @ManyToOne
@@ -48,7 +47,8 @@ public ProtocolLabel(com.labsynch.labseer.domain.ProtocolLabel protocolLabel) {
         super.setPhysicallyLabled(protocolLabel.isPhysicallyLabled());
     }
 
-    public static com.labsynch.labseer.domain.ProtocolLabel update(com.labsynch.labseer.domain.ProtocolLabel protocolLabel) {
+    public static com.labsynch.labseer.domain.ProtocolLabel update(
+            com.labsynch.labseer.domain.ProtocolLabel protocolLabel) {
         ProtocolLabel updatedProtocolLabel = ProtocolLabel.findProtocolLabel(protocolLabel.getId());
         updatedProtocolLabel.setLsType(protocolLabel.getLsType());
         updatedProtocolLabel.setLsKind(protocolLabel.getLsKind());
@@ -64,79 +64,86 @@ public static com.labsynch.labseer.domain.ProtocolLabel update(com.labsynch.labs
         updatedProtocolLabel.merge();
         return updatedProtocolLabel;
     }
-    
+
     public static ProtocolLabel findProtocolLabel(Long id) {
-        if (id == null) return null;
+        if (id == null)
+            return null;
         return entityManager().find(ProtocolLabel.class, id);
     }
-    
-	public static TypedQuery<ProtocolLabel> findProtocolPreferredName(Long protocolId) {
-		
-		if (protocolId == null || protocolId == 0) {
-			return null;
-		} 
-
-		String labelType = "name";
-		String labelKind = "protocol name";
-		boolean preferred = true;
-		boolean ignored = true;
-
-		TypedQuery<ProtocolLabel> q = findProtocolPreferredName(protocolId, labelType, labelKind,  preferred,  ignored);
-		return q;
-	}
-	
-	private static TypedQuery<ProtocolLabel> findProtocolPreferredName(
-			Long protocolId, String labelType, String labelKind,
-			boolean preferred, boolean ignored) {
-		
-		if (protocolId == null || protocolId == 0) throw new IllegalArgumentException("The protocolId argument is required");
-		if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-		if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");
-		
-		EntityManager em = ProtocolLabel.entityManager();
-		String query = "SELECT o FROM ProtocolLabel AS o WHERE o.lsType = :labelType  "
-				+ "AND o.lsKind = :labelKind "
-				+ "AND o.protocol.id = :protocolId "
-				+ "AND o.preferred = :preferred AND o.ignored IS NOT :ignored";
-		logger.debug("sql query " + query);
-		TypedQuery<ProtocolLabel> q = em.createQuery(query, ProtocolLabel.class);
-		q.setParameter("protocolId", protocolId);
-		q.setParameter("labelType", labelType);
-		q.setParameter("labelKind", labelKind);
-		q.setParameter("preferred", preferred);
-		q.setParameter("ignored", ignored);
-		return q;
-	}
-
-    
+
+    public static TypedQuery<ProtocolLabel> findProtocolPreferredName(Long protocolId) {
+
+        if (protocolId == null || protocolId == 0) {
+            return null;
+        }
+
+        String labelType = "name";
+        String labelKind = "protocol name";
+        boolean preferred = true;
+        boolean ignored = true;
+
+        TypedQuery<ProtocolLabel> q = findProtocolPreferredName(protocolId, labelType, labelKind, preferred, ignored);
+        return q;
+    }
+
+    private static TypedQuery<ProtocolLabel> findProtocolPreferredName(
+            Long protocolId, String labelType, String labelKind,
+            boolean preferred, boolean ignored) {
+
+        if (protocolId == null || protocolId == 0)
+            throw new IllegalArgumentException("The protocolId argument is required");
+        if (labelType == null || labelType.length() == 0)
+            throw new IllegalArgumentException("The labelType argument is required");
+        if (labelKind == null || labelKind.length() == 0)
+            throw new IllegalArgumentException("The labelKind argument is required");
+
+        EntityManager em = ProtocolLabel.entityManager();
+        String query = "SELECT o FROM ProtocolLabel AS o WHERE o.lsType = :labelType  "
+                + "AND o.lsKind = :labelKind "
+                + "AND o.protocol.id = :protocolId "
+                + "AND o.preferred = :preferred AND o.ignored IS NOT :ignored";
+        logger.debug("sql query " + query);
+        TypedQuery<ProtocolLabel> q = em.createQuery(query, ProtocolLabel.class);
+        q.setParameter("protocolId", protocolId);
+        q.setParameter("labelType", labelType);
+        q.setParameter("labelKind", labelKind);
+        q.setParameter("preferred", preferred);
+        q.setParameter("ignored", ignored);
+        return q;
+    }
+
     public String toJson() {
         return new JSONSerializer().exclude("*.class").serialize(this);
     }
-    
+
     public static ProtocolLabel fromJsonToProtocolLabel(String json) {
         return new JSONDeserializer<ProtocolLabel>().use(null, ProtocolLabel.class).deserialize(json);
     }
-    
+
     public static String toJsonArray(Collection<ProtocolLabel> collection) {
         return new JSONSerializer().exclude("*.class").serialize(collection);
     }
-    
+
     public static Collection<ProtocolLabel> fromJsonArrayToProtocolLabels(String json) {
-        return new JSONDeserializer<List<ProtocolLabel>>().use(null, ArrayList.class).use("values", ProtocolLabel.class).deserialize(json);
+        return new JSONDeserializer<List<ProtocolLabel>>().use(null, ArrayList.class).use("values", ProtocolLabel.class)
+                .deserialize(json);
     }
-    
+
     public static Collection<ProtocolLabel> fromJsonArrayToProtocolLabels(Reader json) {
-        return new JSONDeserializer<List<ProtocolLabel>>().use(null, ArrayList.class).use("values", ProtocolLabel.class).deserialize(json);
+        return new JSONDeserializer<List<ProtocolLabel>>().use(null, ArrayList.class).use("values", ProtocolLabel.class)
+                .deserialize(json);
     }
-    
 
     public static TypedQuery<com.labsynch.labseer.domain.ProtocolLabel> findProtocolNames(Protocol protocol) {
         String labelType = "name";
         String labelKind = "protocol name";
         boolean preferred = true;
-        if (protocol == null) throw new IllegalArgumentException("The protocol argument is required");
+        if (protocol == null)
+            throw new IllegalArgumentException("The protocol argument is required");
         EntityManager em = ProtocolLabel.entityManager();
-        TypedQuery<ProtocolLabel> q = em.createQuery("SELECT o FROM ProtocolLabel AS o WHERE o.protocol = :protocol " + "AND o.lsType = :labelType " + "AND o.lsKind = :labelKind " + "AND o.preferred = :preferred", ProtocolLabel.class);
+        TypedQuery<ProtocolLabel> q = em.createQuery("SELECT o FROM ProtocolLabel AS o WHERE o.protocol = :protocol "
+                + "AND o.lsType = :labelType " + "AND o.lsKind = :labelKind " + "AND o.preferred = :preferred",
+                ProtocolLabel.class);
         q.setParameter("protocol", protocol);
         q.setParameter("labelType", labelType);
         q.setParameter("labelKind", labelKind);
@@ -144,13 +151,18 @@ public static TypedQuery<com.labsynch.labseer.domain.ProtocolLabel> findProtocol
         return q;
     }
 
-    public static TypedQuery<com.labsynch.labseer.domain.ProtocolLabel> findProtocolNames(Protocol protocol, boolean ignored) {
+    public static TypedQuery<com.labsynch.labseer.domain.ProtocolLabel> findProtocolNames(Protocol protocol,
+            boolean ignored) {
         String labelType = "name";
         String labelKind = "protocol name";
         boolean preferred = true;
-        if (protocol == null) throw new IllegalArgumentException("The protocol argument is required");
+        if (protocol == null)
+            throw new IllegalArgumentException("The protocol argument is required");
         EntityManager em = ProtocolLabel.entityManager();
-        TypedQuery<ProtocolLabel> q = em.createQuery("SELECT o FROM ProtocolLabel AS o WHERE o.protocol = :protocol " + "AND o.lsType = :labelType " + "AND o.lsKind = :labelKind " + "AND o.preferred = :preferred AND o.ignored IS NOT :ignored", ProtocolLabel.class);
+        TypedQuery<ProtocolLabel> q = em.createQuery(
+                "SELECT o FROM ProtocolLabel AS o WHERE o.protocol = :protocol " + "AND o.lsType = :labelType "
+                        + "AND o.lsKind = :labelKind " + "AND o.preferred = :preferred AND o.ignored IS NOT :ignored",
+                ProtocolLabel.class);
         q.setParameter("protocol", protocol);
         q.setParameter("labelType", labelType);
         q.setParameter("labelKind", labelKind);
@@ -161,20 +173,29 @@ public static TypedQuery<com.labsynch.labseer.domain.ProtocolLabel> findProtocol
 
     public static TypedQuery<com.labsynch.labseer.domain.ProtocolLabel> findProtocolLabelsByName(String labelText) {
         boolean ignored = true;
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
         EntityManager em = ProtocolLabel.entityManager();
-        TypedQuery<ProtocolLabel> q = em.createQuery("SELECT o FROM ProtocolLabel AS o WHERE o.labelText = :labelText " + "AND o.ignored IS NOT :ignored", ProtocolLabel.class);
+        TypedQuery<ProtocolLabel> q = em.createQuery(
+                "SELECT o FROM ProtocolLabel AS o WHERE o.labelText = :labelText " + "AND o.ignored IS NOT :ignored",
+                ProtocolLabel.class);
         q.setParameter("labelText", labelText);
         q.setParameter("ignored", ignored);
         return q;
     }
 
-    public static TypedQuery<com.labsynch.labseer.domain.ProtocolLabel> findProtocolLabelsByName(String labelText, String labelType, String labelKind, boolean preferred, boolean ignored) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-        if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");
+    public static TypedQuery<com.labsynch.labseer.domain.ProtocolLabel> findProtocolLabelsByName(String labelText,
+            String labelType, String labelKind, boolean preferred, boolean ignored) {
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
+        if (labelType == null || labelType.length() == 0)
+            throw new IllegalArgumentException("The labelType argument is required");
+        if (labelKind == null || labelKind.length() == 0)
+            throw new IllegalArgumentException("The labelKind argument is required");
         EntityManager em = ProtocolLabel.entityManager();
-        TypedQuery<ProtocolLabel> q = em.createQuery("SELECT o FROM ProtocolLabel AS o WHERE o.lsType = :labelType  " + "AND o.lsKind = :labelKind " + "AND o.labelText = :labelText " + "AND o.preferred = :preferred AND o.ignored IS NOT :ignored", ProtocolLabel.class);
+        TypedQuery<ProtocolLabel> q = em.createQuery("SELECT o FROM ProtocolLabel AS o WHERE o.lsType = :labelType  "
+                + "AND o.lsKind = :labelKind " + "AND o.labelText = :labelText "
+                + "AND o.preferred = :preferred AND o.ignored IS NOT :ignored", ProtocolLabel.class);
         q.setParameter("labelText", labelText);
         q.setParameter("labelType", labelType);
         q.setParameter("labelKind", labelKind);
@@ -182,7 +203,7 @@ public static TypedQuery<com.labsynch.labseer.domain.ProtocolLabel> findProtocol
         q.setParameter("ignored", ignored);
         return q;
     }
-    
+
     public static TypedQuery<com.labsynch.labseer.domain.ProtocolLabel> findProtocolLabelsByNameLike(String labelText) {
         String labelType = "name";
         String labelKind = "protocol name";
@@ -192,12 +213,16 @@ public static TypedQuery<com.labsynch.labseer.domain.ProtocolLabel> findProtocol
         return q;
     }
 
-    public static TypedQuery<ProtocolLabel> findProtocolLabelsByNameLike(String labelText, String labelType, String labelKind, boolean preferred, boolean ignored) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
-        if (labelType == null || labelType.length() == 0) throw new IllegalArgumentException("The labelType argument is required");
-        if (labelKind == null || labelKind.length() == 0) throw new IllegalArgumentException("The labelKind argument is required");
+    public static TypedQuery<ProtocolLabel> findProtocolLabelsByNameLike(String labelText, String labelType,
+            String labelKind, boolean preferred, boolean ignored) {
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
+        if (labelType == null || labelType.length() == 0)
+            throw new IllegalArgumentException("The labelType argument is required");
+        if (labelKind == null || labelKind.length() == 0)
+            throw new IllegalArgumentException("The labelKind argument is required");
         EntityManager em = ProtocolLabel.entityManager();
-        
+
         labelText = labelText.replace('*', '%');
         if (labelText.charAt(0) != '%') {
             labelText = "%" + labelText;
@@ -205,11 +230,11 @@ public static TypedQuery<ProtocolLabel> findProtocolLabelsByNameLike(String labe
         if (labelText.charAt(labelText.length() - 1) != '%') {
             labelText = labelText + "%";
         }
-        
-        TypedQuery<ProtocolLabel> q = em.createQuery("SELECT o FROM ProtocolLabel AS o WHERE o.lsType = :labelType  " 
-        								+ "AND o.lsKind = :labelKind " 
-        								+ "AND LOWER(o.labelText) LIKE LOWER(:labelText) " 
-        								+ "AND o.preferred = :preferred AND o.ignored IS NOT :ignored", ProtocolLabel.class);
+
+        TypedQuery<ProtocolLabel> q = em.createQuery("SELECT o FROM ProtocolLabel AS o WHERE o.lsType = :labelType  "
+                + "AND o.lsKind = :labelKind "
+                + "AND LOWER(o.labelText) LIKE LOWER(:labelText) "
+                + "AND o.preferred = :preferred AND o.ignored IS NOT :ignored", ProtocolLabel.class);
         q.setParameter("labelText", labelText);
         q.setParameter("labelType", labelType);
         q.setParameter("labelKind", labelKind);
@@ -218,33 +243,33 @@ public static TypedQuery<ProtocolLabel> findProtocolLabelsByNameLike(String labe
         return q;
     }
 
-	public Protocol getProtocol() {
+    public Protocol getProtocol() {
         return this.protocol;
     }
 
-	public void setProtocol(Protocol protocol) {
+    public void setProtocol(Protocol protocol) {
         this.protocol = protocol;
     }
 
-	public ProtocolLabel() {
+    public ProtocolLabel() {
         super();
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "protocol");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "protocol");
 
-	public static long countProtocolLabels() {
+    public static long countProtocolLabels() {
         return entityManager().createQuery("SELECT COUNT(o) FROM ProtocolLabel o", Long.class).getSingleResult();
     }
 
-	public static List<ProtocolLabel> findAllProtocolLabels() {
+    public static List<ProtocolLabel> findAllProtocolLabels() {
         return entityManager().createQuery("SELECT o FROM ProtocolLabel o", ProtocolLabel.class).getResultList();
     }
 
-	public static List<ProtocolLabel> findAllProtocolLabels(String sortFieldName, String sortOrder) {
+    public static List<ProtocolLabel> findAllProtocolLabels(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ProtocolLabel o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -255,11 +280,13 @@ public static List<ProtocolLabel> findAllProtocolLabels(String sortFieldName, St
         return entityManager().createQuery(jpaQuery, ProtocolLabel.class).getResultList();
     }
 
-	public static List<ProtocolLabel> findProtocolLabelEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ProtocolLabel o", ProtocolLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ProtocolLabel> findProtocolLabelEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ProtocolLabel o", ProtocolLabel.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ProtocolLabel> findProtocolLabelEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ProtocolLabel> findProtocolLabelEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM ProtocolLabel o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -267,28 +294,34 @@ public static List<ProtocolLabel> findProtocolLabelEntries(int firstResult, int
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ProtocolLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ProtocolLabel.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public ProtocolLabel merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ProtocolLabel merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public static Long countFindProtocolLabelsByLabelTextEqualsAndIgnoredNot(String labelText, boolean ignored) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+    public static Long countFindProtocolLabelsByLabelTextEqualsAndIgnoredNot(String labelText, boolean ignored) {
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
         EntityManager em = ProtocolLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ProtocolLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored",
+                Long.class);
         q.setParameter("labelText", labelText);
         q.setParameter("ignored", ignored);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindProtocolLabelsByLabelTextLike(String labelText) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+    public static Long countFindProtocolLabelsByLabelTextLike(String labelText) {
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
         labelText = labelText.replace('*', '%');
         if (labelText.charAt(0) != '%') {
             labelText = "%" + labelText;
@@ -297,40 +330,52 @@ public static Long countFindProtocolLabelsByLabelTextLike(String labelText) {
             labelText = labelText + "%";
         }
         EntityManager em = ProtocolLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ProtocolLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", Long.class);
         q.setParameter("labelText", labelText);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindProtocolLabelsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static Long countFindProtocolLabelsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = ProtocolLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolLabel AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolLabel AS o WHERE o.lsTransaction = :lsTransaction",
+                Long.class);
         q.setParameter("lsTransaction", lsTransaction);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindProtocolLabelsByProtocol(Protocol protocol) {
-        if (protocol == null) throw new IllegalArgumentException("The protocol argument is required");
+    public static Long countFindProtocolLabelsByProtocol(Protocol protocol) {
+        if (protocol == null)
+            throw new IllegalArgumentException("The protocol argument is required");
         EntityManager em = ProtocolLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolLabel AS o WHERE o.protocol = :protocol", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolLabel AS o WHERE o.protocol = :protocol",
+                Long.class);
         q.setParameter("protocol", protocol);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<ProtocolLabel> findProtocolLabelsByLabelTextEqualsAndIgnoredNot(String labelText, boolean ignored) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+    public static TypedQuery<ProtocolLabel> findProtocolLabelsByLabelTextEqualsAndIgnoredNot(String labelText,
+            boolean ignored) {
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
         EntityManager em = ProtocolLabel.entityManager();
-        TypedQuery<ProtocolLabel> q = em.createQuery("SELECT o FROM ProtocolLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored", ProtocolLabel.class);
+        TypedQuery<ProtocolLabel> q = em.createQuery(
+                "SELECT o FROM ProtocolLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored",
+                ProtocolLabel.class);
         q.setParameter("labelText", labelText);
         q.setParameter("ignored", ignored);
         return q;
     }
 
-	public static TypedQuery<ProtocolLabel> findProtocolLabelsByLabelTextEqualsAndIgnoredNot(String labelText, boolean ignored, String sortFieldName, String sortOrder) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+    public static TypedQuery<ProtocolLabel> findProtocolLabelsByLabelTextEqualsAndIgnoredNot(String labelText,
+            boolean ignored, String sortFieldName, String sortOrder) {
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
         EntityManager em = ProtocolLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ProtocolLabel AS o WHERE o.labelText = :labelText  AND o.ignored IS NOT :ignored");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -343,8 +388,9 @@ public static TypedQuery<ProtocolLabel> findProtocolLabelsByLabelTextEqualsAndIg
         return q;
     }
 
-	public static TypedQuery<ProtocolLabel> findProtocolLabelsByLabelTextLike(String labelText) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+    public static TypedQuery<ProtocolLabel> findProtocolLabelsByLabelTextLike(String labelText) {
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
         labelText = labelText.replace('*', '%');
         if (labelText.charAt(0) != '%') {
             labelText = "%" + labelText;
@@ -353,13 +399,17 @@ public static TypedQuery<ProtocolLabel> findProtocolLabelsByLabelTextLike(String
             labelText = labelText + "%";
         }
         EntityManager em = ProtocolLabel.entityManager();
-        TypedQuery<ProtocolLabel> q = em.createQuery("SELECT o FROM ProtocolLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)", ProtocolLabel.class);
+        TypedQuery<ProtocolLabel> q = em.createQuery(
+                "SELECT o FROM ProtocolLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)",
+                ProtocolLabel.class);
         q.setParameter("labelText", labelText);
         return q;
     }
 
-	public static TypedQuery<ProtocolLabel> findProtocolLabelsByLabelTextLike(String labelText, String sortFieldName, String sortOrder) {
-        if (labelText == null || labelText.length() == 0) throw new IllegalArgumentException("The labelText argument is required");
+    public static TypedQuery<ProtocolLabel> findProtocolLabelsByLabelTextLike(String labelText, String sortFieldName,
+            String sortOrder) {
+        if (labelText == null || labelText.length() == 0)
+            throw new IllegalArgumentException("The labelText argument is required");
         labelText = labelText.replace('*', '%');
         if (labelText.charAt(0) != '%') {
             labelText = "%" + labelText;
@@ -368,7 +418,8 @@ public static TypedQuery<ProtocolLabel> findProtocolLabelsByLabelTextLike(String
             labelText = labelText + "%";
         }
         EntityManager em = ProtocolLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ProtocolLabel AS o WHERE LOWER(o.labelText) LIKE LOWER(:labelText)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -380,18 +431,23 @@ public static TypedQuery<ProtocolLabel> findProtocolLabelsByLabelTextLike(String
         return q;
     }
 
-	public static TypedQuery<ProtocolLabel> findProtocolLabelsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<ProtocolLabel> findProtocolLabelsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = ProtocolLabel.entityManager();
-        TypedQuery<ProtocolLabel> q = em.createQuery("SELECT o FROM ProtocolLabel AS o WHERE o.lsTransaction = :lsTransaction", ProtocolLabel.class);
+        TypedQuery<ProtocolLabel> q = em.createQuery(
+                "SELECT o FROM ProtocolLabel AS o WHERE o.lsTransaction = :lsTransaction", ProtocolLabel.class);
         q.setParameter("lsTransaction", lsTransaction);
         return q;
     }
 
-	public static TypedQuery<ProtocolLabel> findProtocolLabelsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<ProtocolLabel> findProtocolLabelsByLsTransactionEquals(Long lsTransaction,
+            String sortFieldName, String sortOrder) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = ProtocolLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolLabel AS o WHERE o.lsTransaction = :lsTransaction");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ProtocolLabel AS o WHERE o.lsTransaction = :lsTransaction");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -403,16 +459,20 @@ public static TypedQuery<ProtocolLabel> findProtocolLabelsByLsTransactionEquals(
         return q;
     }
 
-	public static TypedQuery<ProtocolLabel> findProtocolLabelsByProtocol(Protocol protocol) {
-        if (protocol == null) throw new IllegalArgumentException("The protocol argument is required");
+    public static TypedQuery<ProtocolLabel> findProtocolLabelsByProtocol(Protocol protocol) {
+        if (protocol == null)
+            throw new IllegalArgumentException("The protocol argument is required");
         EntityManager em = ProtocolLabel.entityManager();
-        TypedQuery<ProtocolLabel> q = em.createQuery("SELECT o FROM ProtocolLabel AS o WHERE o.protocol = :protocol", ProtocolLabel.class);
+        TypedQuery<ProtocolLabel> q = em.createQuery("SELECT o FROM ProtocolLabel AS o WHERE o.protocol = :protocol",
+                ProtocolLabel.class);
         q.setParameter("protocol", protocol);
         return q;
     }
 
-	public static TypedQuery<ProtocolLabel> findProtocolLabelsByProtocol(Protocol protocol, String sortFieldName, String sortOrder) {
-        if (protocol == null) throw new IllegalArgumentException("The protocol argument is required");
+    public static TypedQuery<ProtocolLabel> findProtocolLabelsByProtocol(Protocol protocol, String sortFieldName,
+            String sortOrder) {
+        if (protocol == null)
+            throw new IllegalArgumentException("The protocol argument is required");
         EntityManager em = ProtocolLabel.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolLabel AS o WHERE o.protocol = :protocol");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolState.java b/src/main/java/com/labsynch/labseer/domain/ProtocolState.java
index 0c7cd6945..98e983356 100755
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolState.java
+++ b/src/main/java/com/labsynch/labseer/domain/ProtocolState.java
@@ -52,132 +52,148 @@ public ProtocolState(com.labsynch.labseer.domain.ProtocolState protocolState) {
         super.setLsKind(protocolState.getLsKind());
     }
 
-	public static ProtocolState update(ProtocolState protocolState) {
-		ProtocolState updatedProtocolState = ProtocolState.findProtocolState(protocolState.getId());
-		if (updatedProtocolState != null){
-			updatedProtocolState.setRecordedBy(protocolState.getRecordedBy());
-			updatedProtocolState.setRecordedDate(protocolState.getRecordedDate());
-			updatedProtocolState.setLsTransaction(protocolState.getLsTransaction());
-			updatedProtocolState.setModifiedBy(protocolState.getModifiedBy());
-			updatedProtocolState.setModifiedDate(new Date());
-			updatedProtocolState.setLsType(protocolState.getLsType());
-			updatedProtocolState.setLsKind(protocolState.getLsKind());
-			updatedProtocolState.setIgnored(protocolState.isIgnored());
-			updatedProtocolState.merge();
-			return updatedProtocolState;
-		} else {
-			return null;
-		}
-		
-	}
-    
+    public static ProtocolState update(ProtocolState protocolState) {
+        ProtocolState updatedProtocolState = ProtocolState.findProtocolState(protocolState.getId());
+        if (updatedProtocolState != null) {
+            updatedProtocolState.setRecordedBy(protocolState.getRecordedBy());
+            updatedProtocolState.setRecordedDate(protocolState.getRecordedDate());
+            updatedProtocolState.setLsTransaction(protocolState.getLsTransaction());
+            updatedProtocolState.setModifiedBy(protocolState.getModifiedBy());
+            updatedProtocolState.setModifiedDate(new Date());
+            updatedProtocolState.setLsType(protocolState.getLsType());
+            updatedProtocolState.setLsKind(protocolState.getLsKind());
+            updatedProtocolState.setIgnored(protocolState.isIgnored());
+            updatedProtocolState.merge();
+            return updatedProtocolState;
+        } else {
+            return null;
+        }
+
+    }
+
     @Transactional
     public String toJson() {
-        return new JSONSerializer().include("lsValues").exclude("*.class", "protocol").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().include("lsValues").exclude("*.class", "protocol")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
-    
+
     public static ProtocolState fromJsonToProtocolState(String json) {
         return new JSONDeserializer<ProtocolState>().use(null, ProtocolState.class).deserialize(json);
     }
-    
+
     public static String toJsonArray(Collection<ProtocolState> collection) {
         return new JSONSerializer().exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
     }
-    
+
     public static Collection<ProtocolState> fromJsonArrayToProtocolStates(String json) {
-        return new JSONDeserializer<List<ProtocolState>>().use(null, ArrayList.class).use("values", ProtocolState.class).deserialize(json);
+        return new JSONDeserializer<List<ProtocolState>>().use(null, ArrayList.class).use("values", ProtocolState.class)
+                .deserialize(json);
     }
 
     public static Collection<ProtocolState> fromJsonArrayToProtocolStates(Reader json) {
-        return new JSONDeserializer<List<ProtocolState>>().use(null, ArrayList.class).use("values", ProtocolState.class).deserialize(json);
+        return new JSONDeserializer<List<ProtocolState>>().use(null, ArrayList.class).use("values", ProtocolState.class)
+                .deserialize(json);
     }
 
-	public static TypedQuery<ProtocolState> findProtocolStatesByProtocolIDAndStateTypeKind(
-			Long protocolId, String stateType, String stateKind) {
-
-		if (stateType == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-		
-		EntityManager em = entityManager();
-		String hsqlQuery = "SELECT ps FROM ProtocolState AS ps " +
-		"JOIN ps.protocol p " +
-		"WHERE ps.lsType = :stateType AND ps.lsKind = :stateKind AND ps.ignored IS NOT :ignored " +
-		"AND p.id = :protocolId ";
-		TypedQuery<ProtocolState> q = em.createQuery(hsqlQuery, ProtocolState.class);
-		q.setParameter("protocolId", protocolId);
-		q.setParameter("stateType", stateType);
-		q.setParameter("stateKind", stateKind);
-		q.setParameter("ignored", true);
-		return q;
-	}
-
-	@Transactional
-	public String toString() {
+    public static TypedQuery<ProtocolState> findProtocolStatesByProtocolIDAndStateTypeKind(
+            Long protocolId, String stateType, String stateKind) {
+
+        if (stateType == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateType argument is required");
+        if (stateKind == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateKind argument is required");
+
+        EntityManager em = entityManager();
+        String hsqlQuery = "SELECT ps FROM ProtocolState AS ps " +
+                "JOIN ps.protocol p " +
+                "WHERE ps.lsType = :stateType AND ps.lsKind = :stateKind AND ps.ignored IS NOT :ignored " +
+                "AND p.id = :protocolId ";
+        TypedQuery<ProtocolState> q = em.createQuery(hsqlQuery, ProtocolState.class);
+        q.setParameter("protocolId", protocolId);
+        q.setParameter("stateType", stateType);
+        q.setParameter("stateKind", stateKind);
+        q.setParameter("ignored", true);
+        return q;
+    }
+
+    @Transactional
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static TypedQuery<ProtocolState> findProtocolStatesByProtocolCodeNameAndStateTypeKind(
-			String protocolCodeName, String stateType, String stateKind) {
-		if (stateType == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-		
-		EntityManager em = entityManager();
-		String hsqlQuery = "SELECT ps FROM ProtocolState AS ps " +
-		"JOIN ps.protocol p " +
-		"WHERE ps.lsType = :stateType AND ps.lsKind = :stateKind AND ps.ignored IS NOT :ignored " +
-		"AND p.codeName = :protocolCodeName ";
-		TypedQuery<ProtocolState> q = em.createQuery(hsqlQuery, ProtocolState.class);
-		q.setParameter("protocolCodeName", protocolCodeName);
-		q.setParameter("stateType", stateType);
-		q.setParameter("stateKind", stateKind);
-		q.setParameter("ignored", true);
-		return q;
-	}
-
-	public Protocol getProtocol() {
+    public static TypedQuery<ProtocolState> findProtocolStatesByProtocolCodeNameAndStateTypeKind(
+            String protocolCodeName, String stateType, String stateKind) {
+        if (stateType == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateType argument is required");
+        if (stateKind == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateKind argument is required");
+
+        EntityManager em = entityManager();
+        String hsqlQuery = "SELECT ps FROM ProtocolState AS ps " +
+                "JOIN ps.protocol p " +
+                "WHERE ps.lsType = :stateType AND ps.lsKind = :stateKind AND ps.ignored IS NOT :ignored " +
+                "AND p.codeName = :protocolCodeName ";
+        TypedQuery<ProtocolState> q = em.createQuery(hsqlQuery, ProtocolState.class);
+        q.setParameter("protocolCodeName", protocolCodeName);
+        q.setParameter("stateType", stateType);
+        q.setParameter("stateKind", stateKind);
+        q.setParameter("ignored", true);
+        return q;
+    }
+
+    public Protocol getProtocol() {
         return this.protocol;
     }
 
-	public void setProtocol(Protocol protocol) {
+    public void setProtocol(Protocol protocol) {
         this.protocol = protocol;
     }
 
-	public Set<ProtocolValue> getLsValues() {
+    public Set<ProtocolValue> getLsValues() {
         return this.lsValues;
     }
 
-	public void setLsValues(Set<ProtocolValue> lsValues) {
+    public void setLsValues(Set<ProtocolValue> lsValues) {
         this.lsValues = lsValues;
     }
 
-	public static Long countFindProtocolStatesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static Long countFindProtocolStatesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = ProtocolState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolState AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolState AS o WHERE o.lsTransaction = :lsTransaction",
+                Long.class);
         q.setParameter("lsTransaction", lsTransaction);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindProtocolStatesByProtocol(Protocol protocol) {
-        if (protocol == null) throw new IllegalArgumentException("The protocol argument is required");
+    public static Long countFindProtocolStatesByProtocol(Protocol protocol) {
+        if (protocol == null)
+            throw new IllegalArgumentException("The protocol argument is required");
         EntityManager em = ProtocolState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolState AS o WHERE o.protocol = :protocol", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolState AS o WHERE o.protocol = :protocol",
+                Long.class);
         q.setParameter("protocol", protocol);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<ProtocolState> findProtocolStatesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<ProtocolState> findProtocolStatesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = ProtocolState.entityManager();
-        TypedQuery<ProtocolState> q = em.createQuery("SELECT o FROM ProtocolState AS o WHERE o.lsTransaction = :lsTransaction", ProtocolState.class);
+        TypedQuery<ProtocolState> q = em.createQuery(
+                "SELECT o FROM ProtocolState AS o WHERE o.lsTransaction = :lsTransaction", ProtocolState.class);
         q.setParameter("lsTransaction", lsTransaction);
         return q;
     }
 
-	public static TypedQuery<ProtocolState> findProtocolStatesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<ProtocolState> findProtocolStatesByLsTransactionEquals(Long lsTransaction,
+            String sortFieldName, String sortOrder) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = ProtocolState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolState AS o WHERE o.lsTransaction = :lsTransaction");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ProtocolState AS o WHERE o.lsTransaction = :lsTransaction");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -189,16 +205,20 @@ public static TypedQuery<ProtocolState> findProtocolStatesByLsTransactionEquals(
         return q;
     }
 
-	public static TypedQuery<ProtocolState> findProtocolStatesByProtocol(Protocol protocol) {
-        if (protocol == null) throw new IllegalArgumentException("The protocol argument is required");
+    public static TypedQuery<ProtocolState> findProtocolStatesByProtocol(Protocol protocol) {
+        if (protocol == null)
+            throw new IllegalArgumentException("The protocol argument is required");
         EntityManager em = ProtocolState.entityManager();
-        TypedQuery<ProtocolState> q = em.createQuery("SELECT o FROM ProtocolState AS o WHERE o.protocol = :protocol", ProtocolState.class);
+        TypedQuery<ProtocolState> q = em.createQuery("SELECT o FROM ProtocolState AS o WHERE o.protocol = :protocol",
+                ProtocolState.class);
         q.setParameter("protocol", protocol);
         return q;
     }
 
-	public static TypedQuery<ProtocolState> findProtocolStatesByProtocol(Protocol protocol, String sortFieldName, String sortOrder) {
-        if (protocol == null) throw new IllegalArgumentException("The protocol argument is required");
+    public static TypedQuery<ProtocolState> findProtocolStatesByProtocol(Protocol protocol, String sortFieldName,
+            String sortOrder) {
+        if (protocol == null)
+            throw new IllegalArgumentException("The protocol argument is required");
         EntityManager em = ProtocolState.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolState AS o WHERE o.protocol = :protocol");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -212,17 +232,17 @@ public static TypedQuery<ProtocolState> findProtocolStatesByProtocol(Protocol pr
         return q;
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("protocol", "lsValues");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("protocol", "lsValues");
 
-	public static long countProtocolStates() {
+    public static long countProtocolStates() {
         return entityManager().createQuery("SELECT COUNT(o) FROM ProtocolState o", Long.class).getSingleResult();
     }
 
-	public static List<ProtocolState> findAllProtocolStates() {
+    public static List<ProtocolState> findAllProtocolStates() {
         return entityManager().createQuery("SELECT o FROM ProtocolState o", ProtocolState.class).getResultList();
     }
 
-	public static List<ProtocolState> findAllProtocolStates(String sortFieldName, String sortOrder) {
+    public static List<ProtocolState> findAllProtocolStates(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ProtocolState o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -233,16 +253,19 @@ public static List<ProtocolState> findAllProtocolStates(String sortFieldName, St
         return entityManager().createQuery(jpaQuery, ProtocolState.class).getResultList();
     }
 
-	public static ProtocolState findProtocolState(Long id) {
-        if (id == null) return null;
+    public static ProtocolState findProtocolState(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ProtocolState.class, id);
     }
 
-	public static List<ProtocolState> findProtocolStateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ProtocolState o", ProtocolState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ProtocolState> findProtocolStateEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ProtocolState o", ProtocolState.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ProtocolState> findProtocolStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ProtocolState> findProtocolStateEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM ProtocolState o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -250,18 +273,20 @@ public static List<ProtocolState> findProtocolStateEntries(int firstResult, int
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ProtocolState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ProtocolState.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public ProtocolState merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ProtocolState merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public ProtocolState() {
+    public ProtocolState() {
         super();
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolType.java b/src/main/java/com/labsynch/labseer/domain/ProtocolType.java
index 46da48f99..228880872 100755
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolType.java
+++ b/src/main/java/com/labsynch/labseer/domain/ProtocolType.java
@@ -34,52 +34,55 @@ public class ProtocolType {
     @Size(max = 128)
     private String typeName;
 
-	@Id
+    @Id
     @SequenceGenerator(name = "protocolTypeGen", sequenceName = "PROTOCOL_TYPE_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "protocolTypeGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName", "id", "version");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName", "id",
+            "version");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new ProtocolType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countProtocolTypes() {
+    public static long countProtocolTypes() {
         return entityManager().createQuery("SELECT COUNT(o) FROM ProtocolType o", Long.class).getSingleResult();
     }
 
-	public static List<ProtocolType> findAllProtocolTypes() {
+    public static List<ProtocolType> findAllProtocolTypes() {
         return entityManager().createQuery("SELECT o FROM ProtocolType o", ProtocolType.class).getResultList();
     }
 
-	public static List<ProtocolType> findAllProtocolTypes(String sortFieldName, String sortOrder) {
+    public static List<ProtocolType> findAllProtocolTypes(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ProtocolType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -90,16 +93,19 @@ public static List<ProtocolType> findAllProtocolTypes(String sortFieldName, Stri
         return entityManager().createQuery(jpaQuery, ProtocolType.class).getResultList();
     }
 
-	public static ProtocolType findProtocolType(Long id) {
-        if (id == null) return null;
+    public static ProtocolType findProtocolType(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ProtocolType.class, id);
     }
 
-	public static List<ProtocolType> findProtocolTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ProtocolType o", ProtocolType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ProtocolType> findProtocolTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ProtocolType o", ProtocolType.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ProtocolType> findProtocolTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ProtocolType> findProtocolTypeEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM ProtocolType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -107,18 +113,21 @@ public static List<ProtocolType> findProtocolTypeEntries(int firstResult, int ma
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ProtocolType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ProtocolType.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -127,48 +136,57 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public ProtocolType merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ProtocolType merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static Long countFindProtocolTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static Long countFindProtocolTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = ProtocolType.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolType AS o WHERE o.typeName = :typeName", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolType AS o WHERE o.typeName = :typeName",
+                Long.class);
         q.setParameter("typeName", typeName);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<ProtocolType> findProtocolTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static TypedQuery<ProtocolType> findProtocolTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = ProtocolType.entityManager();
-        TypedQuery<ProtocolType> q = em.createQuery("SELECT o FROM ProtocolType AS o WHERE o.typeName = :typeName", ProtocolType.class);
+        TypedQuery<ProtocolType> q = em.createQuery("SELECT o FROM ProtocolType AS o WHERE o.typeName = :typeName",
+                ProtocolType.class);
         q.setParameter("typeName", typeName);
         return q;
     }
 
-	public static TypedQuery<ProtocolType> findProtocolTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static TypedQuery<ProtocolType> findProtocolTypesByTypeNameEquals(String typeName, String sortFieldName,
+            String sortOrder) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = ProtocolType.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolType AS o WHERE o.typeName = :typeName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -182,41 +200,41 @@ public static TypedQuery<ProtocolType> findProtocolTypesByTypeNameEquals(String
         return q;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ProtocolType fromJsonToProtocolType(String json) {
+    public static ProtocolType fromJsonToProtocolType(String json) {
         return new JSONDeserializer<ProtocolType>()
-        .use(null, ProtocolType.class).deserialize(json);
+                .use(null, ProtocolType.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ProtocolType> collection) {
+    public static String toJsonArray(Collection<ProtocolType> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ProtocolType> collection, String[] fields) {
+    public static String toJsonArray(Collection<ProtocolType> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ProtocolType> fromJsonArrayToProtocolTypes(String json) {
+    public static Collection<ProtocolType> fromJsonArrayToProtocolTypes(String json) {
         return new JSONDeserializer<List<ProtocolType>>()
-        .use("values", ProtocolType.class).deserialize(json);
+                .use("values", ProtocolType.class).deserialize(json);
     }
 
-	public String getTypeName() {
+    public String getTypeName() {
         return this.typeName;
     }
 
-	public void setTypeName(String typeName) {
+    public void setTypeName(String typeName) {
         this.typeName = typeName;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ProtocolValue.java b/src/main/java/com/labsynch/labseer/domain/ProtocolValue.java
index 5f2c6aa91..4acb11ff0 100755
--- a/src/main/java/com/labsynch/labseer/domain/ProtocolValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/ProtocolValue.java
@@ -33,147 +33,164 @@ public class ProtocolValue extends AbstractValue {
     private ProtocolState lsState;
 
     public ProtocolValue(ProtocolValue protocolValue) {
-            super.setBlobValue(protocolValue.getBlobValue());
-            super.setClobValue(protocolValue.getClobValue());
-            super.setCodeKind(protocolValue.getCodeKind());
-            super.setCodeOrigin(protocolValue.getCodeOrigin());
-            super.setCodeType(protocolValue.getCodeType());
-            super.setCodeTypeAndKind(protocolValue.getCodeTypeAndKind());
-            super.setCodeValue(protocolValue.getCodeValue());
-            super.setComments(protocolValue.getComments());
-            super.setConcentration(protocolValue.getConcentration());
-            super.setConcUnit(protocolValue.getConcUnit());
-            super.setDateValue(protocolValue.getDateValue());
-            super.setDeleted(protocolValue.isDeleted());
-            super.setFileValue(protocolValue.getFileValue());
-            super.setIgnored(protocolValue.isIgnored());
-            super.setLsKind(protocolValue.getLsKind());
-            super.setLsTransaction(protocolValue.getLsTransaction());
-            super.setLsType(protocolValue.getLsType());
-            super.setLsTypeAndKind(protocolValue.getLsTypeAndKind());
-            super.setModifiedBy(protocolValue.getModifiedBy());
-            super.setModifiedDate(protocolValue.getModifiedDate());
-            super.setNumberOfReplicates(protocolValue.getNumberOfReplicates());
-            super.setNumericValue(protocolValue.getNumericValue());
-            super.setOperatorKind(protocolValue.getOperatorKind());
-            super.setOperatorType(protocolValue.getOperatorType());
-            super.setOperatorTypeAndKind(protocolValue.getOperatorTypeAndKind());
-            super.setPublicData(protocolValue.isPublicData());
-            super.setRecordedBy(protocolValue.getRecordedBy());
-            super.setRecordedDate(protocolValue.getRecordedDate());
-            super.setSigFigs(protocolValue.getSigFigs());
-            super.setStringValue(protocolValue.getStringValue());
-            super.setUncertainty(protocolValue.getUncertainty());
-            super.setUncertaintyType(protocolValue.getUncertaintyType());
-            super.setUnitKind(protocolValue.getUnitKind());
-            super.setUnitType(protocolValue.getUnitType());
-            super.setUnitTypeAndKind(protocolValue.getUnitTypeAndKind());
-            super.setUrlValue(protocolValue.getUrlValue());
-            super.setVersion(protocolValue.getVersion());
-	}
-
-	public static com.labsynch.labseer.domain.ProtocolValue fromJsonToProtocolValue(String json) {
+        super.setBlobValue(protocolValue.getBlobValue());
+        super.setClobValue(protocolValue.getClobValue());
+        super.setCodeKind(protocolValue.getCodeKind());
+        super.setCodeOrigin(protocolValue.getCodeOrigin());
+        super.setCodeType(protocolValue.getCodeType());
+        super.setCodeTypeAndKind(protocolValue.getCodeTypeAndKind());
+        super.setCodeValue(protocolValue.getCodeValue());
+        super.setComments(protocolValue.getComments());
+        super.setConcentration(protocolValue.getConcentration());
+        super.setConcUnit(protocolValue.getConcUnit());
+        super.setDateValue(protocolValue.getDateValue());
+        super.setDeleted(protocolValue.isDeleted());
+        super.setFileValue(protocolValue.getFileValue());
+        super.setIgnored(protocolValue.isIgnored());
+        super.setLsKind(protocolValue.getLsKind());
+        super.setLsTransaction(protocolValue.getLsTransaction());
+        super.setLsType(protocolValue.getLsType());
+        super.setLsTypeAndKind(protocolValue.getLsTypeAndKind());
+        super.setModifiedBy(protocolValue.getModifiedBy());
+        super.setModifiedDate(protocolValue.getModifiedDate());
+        super.setNumberOfReplicates(protocolValue.getNumberOfReplicates());
+        super.setNumericValue(protocolValue.getNumericValue());
+        super.setOperatorKind(protocolValue.getOperatorKind());
+        super.setOperatorType(protocolValue.getOperatorType());
+        super.setOperatorTypeAndKind(protocolValue.getOperatorTypeAndKind());
+        super.setPublicData(protocolValue.isPublicData());
+        super.setRecordedBy(protocolValue.getRecordedBy());
+        super.setRecordedDate(protocolValue.getRecordedDate());
+        super.setSigFigs(protocolValue.getSigFigs());
+        super.setStringValue(protocolValue.getStringValue());
+        super.setUncertainty(protocolValue.getUncertainty());
+        super.setUncertaintyType(protocolValue.getUncertaintyType());
+        super.setUnitKind(protocolValue.getUnitKind());
+        super.setUnitType(protocolValue.getUnitType());
+        super.setUnitTypeAndKind(protocolValue.getUnitTypeAndKind());
+        super.setUrlValue(protocolValue.getUrlValue());
+        super.setVersion(protocolValue.getVersion());
+    }
+
+    public static com.labsynch.labseer.domain.ProtocolValue fromJsonToProtocolValue(String json) {
         return new JSONDeserializer<ProtocolValue>().use(null, ProtocolValue.class).deserialize(json);
     }
 
     public static Collection<com.labsynch.labseer.domain.ProtocolValue> fromJsonArrayToProtocolValues(String json) {
-        return new JSONDeserializer<List<ProtocolValue>>().use(null, ArrayList.class).use("values", ProtocolValue.class).deserialize(json);
+        return new JSONDeserializer<List<ProtocolValue>>().use(null, ArrayList.class).use("values", ProtocolValue.class)
+                .deserialize(json);
     }
 
     public static Collection<com.labsynch.labseer.domain.ProtocolValue> fromJsonArrayToProtocolValues(Reader json) {
-        return new JSONDeserializer<List<ProtocolValue>>().use(null, ArrayList.class).use("values", ProtocolValue.class).deserialize(json);
+        return new JSONDeserializer<List<ProtocolValue>>().use(null, ArrayList.class).use("values", ProtocolValue.class)
+                .deserialize(json);
     }
 
-    public static com.labsynch.labseer.domain.ProtocolValue update(com.labsynch.labseer.domain.ProtocolValue protocolValue) {
-        ProtocolValue updatedProtocolValue = new JSONDeserializer<ProtocolValue>().use(null, ProtocolValue.class).deserializeInto(protocolValue.toJson(), ProtocolValue.findProtocolValue(protocolValue.getId()));
+    public static com.labsynch.labseer.domain.ProtocolValue update(
+            com.labsynch.labseer.domain.ProtocolValue protocolValue) {
+        ProtocolValue updatedProtocolValue = new JSONDeserializer<ProtocolValue>().use(null, ProtocolValue.class)
+                .deserializeInto(protocolValue.toJson(), ProtocolValue.findProtocolValue(protocolValue.getId()));
         updatedProtocolValue.merge();
         return updatedProtocolValue;
     }
 
-	public static TypedQuery<ProtocolValue> findProtocolValuesByProtocolIDAndStateTypeKindAndValueTypeKind(
-			Long protocolId, String stateType, String stateKind,
-			String valueType, String valueKind) {
-
-		if (stateType == null || stateType.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-		if (valueType == null || valueType.length() == 0) throw new IllegalArgumentException("The valueType argument is required");
-		if (valueKind == null || valueKind.length() == 0) throw new IllegalArgumentException("The valueKind argument is required");
-		
-		EntityManager em = entityManager();
-		String hsqlQuery = "SELECT pv FROM ProtocolValue AS pv " +
-				"JOIN pv.lsState ps " +
-				"JOIN ps.protocol p " +
-				"WHERE ps.lsType = :stateType AND ps.lsKind = :stateKind AND ps.ignored IS NOT :ignored " +
-				"AND pv.lsType = :valueType AND pv.lsKind = :valueKind AND pv.ignored IS NOT :ignored " +
-//				"AND p.ignored IS NOT :ignored " +
-				"AND p.id = :protocolId ORDER BY pv.id";
-		TypedQuery<ProtocolValue> q = em.createQuery(hsqlQuery, ProtocolValue.class);
-		q.setParameter("protocolId", protocolId);
-		q.setParameter("stateType", stateType);
-		q.setParameter("stateKind", stateKind);
-		q.setParameter("valueType", valueType);
-		q.setParameter("valueKind", valueKind);
-		q.setParameter("ignored", true);
-		return q;
-	}
-	
-	public static TypedQuery<ProtocolValue> findProtocolValuesByProtocolCodeNameAndStateTypeKindAndValueTypeKind(
-			String protocolCodeName, String stateType, String stateKind,
-			String valueType, String valueKind) {
-
-		if (stateType == null || stateType.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-		if (valueType == null || valueType.length() == 0) throw new IllegalArgumentException("The valueType argument is required");
-		if (valueKind == null || valueKind.length() == 0) throw new IllegalArgumentException("The valueKind argument is required");
-		
-		EntityManager em = entityManager();
-		String hsqlQuery = "SELECT pv FROM ProtocolValue AS pv " +
-				"JOIN pv.lsState ps " +
-				"JOIN ps.protocol p " +
-				"WHERE ps.lsType = :stateType AND ps.lsKind = :stateKind AND ps.ignored IS NOT :ignored " +
-				"AND pv.lsType = :valueType AND pv.lsKind = :valueKind AND pv.ignored IS NOT :ignored " +
-//				"AND p.ignored IS NOT :ignored " +
-				"AND p.codeName = :protocolCodeName ";
-		TypedQuery<ProtocolValue> q = em.createQuery(hsqlQuery, ProtocolValue.class);
-		q.setParameter("protocolCodeName", protocolCodeName);
-		q.setParameter("stateType", stateType);
-		q.setParameter("stateKind", stateKind);
-		q.setParameter("valueType", valueType);
-		q.setParameter("valueKind", valueKind);
-		q.setParameter("ignored", true);
-		return q;
-	}
-	
-	 public static TypedQuery<ProtocolValue> findProtocolValuesByLsKindEqualsAndDateValueLike(String lsKind, Date dateValue) {
-	        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-	        if (dateValue == null) throw new IllegalArgumentException("The dateValue argument is required");
-	        EntityManager em = ProtocolValue.entityManager();
-	        Calendar cal = Calendar.getInstance();
-	        cal.setTime(dateValue);
-	        cal.add(Calendar.DATE, -1);
-	        Date beforeDate = cal.getTime();
-	        cal.setTime(dateValue);
-	        cal.add(Calendar.DATE, 1);
-	        Date afterDate = cal.getTime();
-	        TypedQuery<ProtocolValue> q = em.createQuery("SELECT o FROM ProtocolValue AS o WHERE o.lsKind = :lsKind AND o.ignored = false AND o.dateValue > :beforeDate AND o.dateValue < :afterDate ", ProtocolValue.class);
-	        q.setParameter("lsKind", lsKind);
-	        q.setParameter("beforeDate", beforeDate);
-	        q.setParameter("afterDate", afterDate);
-	        
-	        return q;
-	    }
-
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsState");
-
-	public static long countProtocolValues() {
+    public static TypedQuery<ProtocolValue> findProtocolValuesByProtocolIDAndStateTypeKindAndValueTypeKind(
+            Long protocolId, String stateType, String stateKind,
+            String valueType, String valueKind) {
+
+        if (stateType == null || stateType.length() == 0)
+            throw new IllegalArgumentException("The stateType argument is required");
+        if (stateKind == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateKind argument is required");
+        if (valueType == null || valueType.length() == 0)
+            throw new IllegalArgumentException("The valueType argument is required");
+        if (valueKind == null || valueKind.length() == 0)
+            throw new IllegalArgumentException("The valueKind argument is required");
+
+        EntityManager em = entityManager();
+        String hsqlQuery = "SELECT pv FROM ProtocolValue AS pv " +
+                "JOIN pv.lsState ps " +
+                "JOIN ps.protocol p " +
+                "WHERE ps.lsType = :stateType AND ps.lsKind = :stateKind AND ps.ignored IS NOT :ignored " +
+                "AND pv.lsType = :valueType AND pv.lsKind = :valueKind AND pv.ignored IS NOT :ignored " +
+                // "AND p.ignored IS NOT :ignored " +
+                "AND p.id = :protocolId ORDER BY pv.id";
+        TypedQuery<ProtocolValue> q = em.createQuery(hsqlQuery, ProtocolValue.class);
+        q.setParameter("protocolId", protocolId);
+        q.setParameter("stateType", stateType);
+        q.setParameter("stateKind", stateKind);
+        q.setParameter("valueType", valueType);
+        q.setParameter("valueKind", valueKind);
+        q.setParameter("ignored", true);
+        return q;
+    }
+
+    public static TypedQuery<ProtocolValue> findProtocolValuesByProtocolCodeNameAndStateTypeKindAndValueTypeKind(
+            String protocolCodeName, String stateType, String stateKind,
+            String valueType, String valueKind) {
+
+        if (stateType == null || stateType.length() == 0)
+            throw new IllegalArgumentException("The stateType argument is required");
+        if (stateKind == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateKind argument is required");
+        if (valueType == null || valueType.length() == 0)
+            throw new IllegalArgumentException("The valueType argument is required");
+        if (valueKind == null || valueKind.length() == 0)
+            throw new IllegalArgumentException("The valueKind argument is required");
+
+        EntityManager em = entityManager();
+        String hsqlQuery = "SELECT pv FROM ProtocolValue AS pv " +
+                "JOIN pv.lsState ps " +
+                "JOIN ps.protocol p " +
+                "WHERE ps.lsType = :stateType AND ps.lsKind = :stateKind AND ps.ignored IS NOT :ignored " +
+                "AND pv.lsType = :valueType AND pv.lsKind = :valueKind AND pv.ignored IS NOT :ignored " +
+                // "AND p.ignored IS NOT :ignored " +
+                "AND p.codeName = :protocolCodeName ";
+        TypedQuery<ProtocolValue> q = em.createQuery(hsqlQuery, ProtocolValue.class);
+        q.setParameter("protocolCodeName", protocolCodeName);
+        q.setParameter("stateType", stateType);
+        q.setParameter("stateKind", stateKind);
+        q.setParameter("valueType", valueType);
+        q.setParameter("valueKind", valueKind);
+        q.setParameter("ignored", true);
+        return q;
+    }
+
+    public static TypedQuery<ProtocolValue> findProtocolValuesByLsKindEqualsAndDateValueLike(String lsKind,
+            Date dateValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (dateValue == null)
+            throw new IllegalArgumentException("The dateValue argument is required");
+        EntityManager em = ProtocolValue.entityManager();
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(dateValue);
+        cal.add(Calendar.DATE, -1);
+        Date beforeDate = cal.getTime();
+        cal.setTime(dateValue);
+        cal.add(Calendar.DATE, 1);
+        Date afterDate = cal.getTime();
+        TypedQuery<ProtocolValue> q = em.createQuery(
+                "SELECT o FROM ProtocolValue AS o WHERE o.lsKind = :lsKind AND o.ignored = false AND o.dateValue > :beforeDate AND o.dateValue < :afterDate ",
+                ProtocolValue.class);
+        q.setParameter("lsKind", lsKind);
+        q.setParameter("beforeDate", beforeDate);
+        q.setParameter("afterDate", afterDate);
+
+        return q;
+    }
+
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsState");
+
+    public static long countProtocolValues() {
         return entityManager().createQuery("SELECT COUNT(o) FROM ProtocolValue o", Long.class).getSingleResult();
     }
 
-	public static List<ProtocolValue> findAllProtocolValues() {
+    public static List<ProtocolValue> findAllProtocolValues() {
         return entityManager().createQuery("SELECT o FROM ProtocolValue o", ProtocolValue.class).getResultList();
     }
 
-	public static List<ProtocolValue> findAllProtocolValues(String sortFieldName, String sortOrder) {
+    public static List<ProtocolValue> findAllProtocolValues(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ProtocolValue o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -184,16 +201,19 @@ public static List<ProtocolValue> findAllProtocolValues(String sortFieldName, St
         return entityManager().createQuery(jpaQuery, ProtocolValue.class).getResultList();
     }
 
-	public static ProtocolValue findProtocolValue(Long id) {
-        if (id == null) return null;
+    public static ProtocolValue findProtocolValue(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ProtocolValue.class, id);
     }
 
-	public static List<ProtocolValue> findProtocolValueEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ProtocolValue o", ProtocolValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ProtocolValue> findProtocolValueEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ProtocolValue o", ProtocolValue.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ProtocolValue> findProtocolValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ProtocolValue> findProtocolValueEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM ProtocolValue o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -201,28 +221,32 @@ public static List<ProtocolValue> findProtocolValueEntries(int firstResult, int
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ProtocolValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ProtocolValue.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public ProtocolValue merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ProtocolValue merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public ProtocolState getLsState() {
+    public ProtocolState getLsState() {
         return this.lsState;
     }
 
-	public void setLsState(ProtocolState lsState) {
+    public void setLsState(ProtocolState lsState) {
         this.lsState = lsState;
     }
 
-	public static Long countFindProtocolValuesByLsKindEqualsAndCodeValueLike(String lsKind, String codeValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+    public static Long countFindProtocolValuesByLsKindEqualsAndCodeValueLike(String lsKind, String codeValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (codeValue == null || codeValue.length() == 0)
+            throw new IllegalArgumentException("The codeValue argument is required");
         codeValue = codeValue.replace('*', '%');
         if (codeValue.charAt(0) != '%') {
             codeValue = "%" + codeValue;
@@ -231,15 +255,19 @@ public static Long countFindProtocolValuesByLsKindEqualsAndCodeValueLike(String
             codeValue = codeValue + "%";
         }
         EntityManager em = ProtocolValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ProtocolValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)",
+                Long.class);
         q.setParameter("lsKind", lsKind);
         q.setParameter("codeValue", codeValue);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindProtocolValuesByLsKindEqualsAndStringValueLike(String lsKind, String stringValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+    public static Long countFindProtocolValuesByLsKindEqualsAndStringValueLike(String lsKind, String stringValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0)
+            throw new IllegalArgumentException("The stringValue argument is required");
         stringValue = stringValue.replace('*', '%');
         if (stringValue.charAt(0) != '%') {
             stringValue = "%" + stringValue;
@@ -248,31 +276,39 @@ public static Long countFindProtocolValuesByLsKindEqualsAndStringValueLike(Strin
             stringValue = stringValue + "%";
         }
         EntityManager em = ProtocolValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ProtocolValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)",
+                Long.class);
         q.setParameter("lsKind", lsKind);
         q.setParameter("stringValue", stringValue);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindProtocolValuesByLsState(ProtocolState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+    public static Long countFindProtocolValuesByLsState(ProtocolState lsState) {
+        if (lsState == null)
+            throw new IllegalArgumentException("The lsState argument is required");
         EntityManager em = ProtocolValue.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolValue AS o WHERE o.lsState = :lsState", Long.class);
         q.setParameter("lsState", lsState);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindProtocolValuesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static Long countFindProtocolValuesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = ProtocolValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolValue AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ProtocolValue AS o WHERE o.lsTransaction = :lsTransaction",
+                Long.class);
         q.setParameter("lsTransaction", lsTransaction);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<ProtocolValue> findProtocolValuesByLsKindEqualsAndCodeValueLike(String lsKind, String codeValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+    public static TypedQuery<ProtocolValue> findProtocolValuesByLsKindEqualsAndCodeValueLike(String lsKind,
+            String codeValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (codeValue == null || codeValue.length() == 0)
+            throw new IllegalArgumentException("The codeValue argument is required");
         codeValue = codeValue.replace('*', '%');
         if (codeValue.charAt(0) != '%') {
             codeValue = "%" + codeValue;
@@ -281,15 +317,20 @@ public static TypedQuery<ProtocolValue> findProtocolValuesByLsKindEqualsAndCodeV
             codeValue = codeValue + "%";
         }
         EntityManager em = ProtocolValue.entityManager();
-        TypedQuery<ProtocolValue> q = em.createQuery("SELECT o FROM ProtocolValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)", ProtocolValue.class);
+        TypedQuery<ProtocolValue> q = em.createQuery(
+                "SELECT o FROM ProtocolValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)",
+                ProtocolValue.class);
         q.setParameter("lsKind", lsKind);
         q.setParameter("codeValue", codeValue);
         return q;
     }
 
-	public static TypedQuery<ProtocolValue> findProtocolValuesByLsKindEqualsAndCodeValueLike(String lsKind, String codeValue, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
+    public static TypedQuery<ProtocolValue> findProtocolValuesByLsKindEqualsAndCodeValueLike(String lsKind,
+            String codeValue, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (codeValue == null || codeValue.length() == 0)
+            throw new IllegalArgumentException("The codeValue argument is required");
         codeValue = codeValue.replace('*', '%');
         if (codeValue.charAt(0) != '%') {
             codeValue = "%" + codeValue;
@@ -298,7 +339,8 @@ public static TypedQuery<ProtocolValue> findProtocolValuesByLsKindEqualsAndCodeV
             codeValue = codeValue + "%";
         }
         EntityManager em = ProtocolValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ProtocolValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.codeValue) LIKE LOWER(:codeValue)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -311,9 +353,12 @@ public static TypedQuery<ProtocolValue> findProtocolValuesByLsKindEqualsAndCodeV
         return q;
     }
 
-	public static TypedQuery<ProtocolValue> findProtocolValuesByLsKindEqualsAndStringValueLike(String lsKind, String stringValue) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+    public static TypedQuery<ProtocolValue> findProtocolValuesByLsKindEqualsAndStringValueLike(String lsKind,
+            String stringValue) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0)
+            throw new IllegalArgumentException("The stringValue argument is required");
         stringValue = stringValue.replace('*', '%');
         if (stringValue.charAt(0) != '%') {
             stringValue = "%" + stringValue;
@@ -322,15 +367,20 @@ public static TypedQuery<ProtocolValue> findProtocolValuesByLsKindEqualsAndStrin
             stringValue = stringValue + "%";
         }
         EntityManager em = ProtocolValue.entityManager();
-        TypedQuery<ProtocolValue> q = em.createQuery("SELECT o FROM ProtocolValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)", ProtocolValue.class);
+        TypedQuery<ProtocolValue> q = em.createQuery(
+                "SELECT o FROM ProtocolValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)",
+                ProtocolValue.class);
         q.setParameter("lsKind", lsKind);
         q.setParameter("stringValue", stringValue);
         return q;
     }
 
-	public static TypedQuery<ProtocolValue> findProtocolValuesByLsKindEqualsAndStringValueLike(String lsKind, String stringValue, String sortFieldName, String sortOrder) {
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (stringValue == null || stringValue.length() == 0) throw new IllegalArgumentException("The stringValue argument is required");
+    public static TypedQuery<ProtocolValue> findProtocolValuesByLsKindEqualsAndStringValueLike(String lsKind,
+            String stringValue, String sortFieldName, String sortOrder) {
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (stringValue == null || stringValue.length() == 0)
+            throw new IllegalArgumentException("The stringValue argument is required");
         stringValue = stringValue.replace('*', '%');
         if (stringValue.charAt(0) != '%') {
             stringValue = "%" + stringValue;
@@ -339,7 +389,8 @@ public static TypedQuery<ProtocolValue> findProtocolValuesByLsKindEqualsAndStrin
             stringValue = stringValue + "%";
         }
         EntityManager em = ProtocolValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ProtocolValue AS o WHERE o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -352,16 +403,20 @@ public static TypedQuery<ProtocolValue> findProtocolValuesByLsKindEqualsAndStrin
         return q;
     }
 
-	public static TypedQuery<ProtocolValue> findProtocolValuesByLsState(ProtocolState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+    public static TypedQuery<ProtocolValue> findProtocolValuesByLsState(ProtocolState lsState) {
+        if (lsState == null)
+            throw new IllegalArgumentException("The lsState argument is required");
         EntityManager em = ProtocolValue.entityManager();
-        TypedQuery<ProtocolValue> q = em.createQuery("SELECT o FROM ProtocolValue AS o WHERE o.lsState = :lsState", ProtocolValue.class);
+        TypedQuery<ProtocolValue> q = em.createQuery("SELECT o FROM ProtocolValue AS o WHERE o.lsState = :lsState",
+                ProtocolValue.class);
         q.setParameter("lsState", lsState);
         return q;
     }
 
-	public static TypedQuery<ProtocolValue> findProtocolValuesByLsState(ProtocolState lsState, String sortFieldName, String sortOrder) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
+    public static TypedQuery<ProtocolValue> findProtocolValuesByLsState(ProtocolState lsState, String sortFieldName,
+            String sortOrder) {
+        if (lsState == null)
+            throw new IllegalArgumentException("The lsState argument is required");
         EntityManager em = ProtocolValue.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolValue AS o WHERE o.lsState = :lsState");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -375,18 +430,23 @@ public static TypedQuery<ProtocolValue> findProtocolValuesByLsState(ProtocolStat
         return q;
     }
 
-	public static TypedQuery<ProtocolValue> findProtocolValuesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<ProtocolValue> findProtocolValuesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = ProtocolValue.entityManager();
-        TypedQuery<ProtocolValue> q = em.createQuery("SELECT o FROM ProtocolValue AS o WHERE o.lsTransaction = :lsTransaction", ProtocolValue.class);
+        TypedQuery<ProtocolValue> q = em.createQuery(
+                "SELECT o FROM ProtocolValue AS o WHERE o.lsTransaction = :lsTransaction", ProtocolValue.class);
         q.setParameter("lsTransaction", lsTransaction);
         return q;
     }
 
-	public static TypedQuery<ProtocolValue> findProtocolValuesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<ProtocolValue> findProtocolValuesByLsTransactionEquals(Long lsTransaction,
+            String sortFieldName, String sortOrder) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = ProtocolValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ProtocolValue AS o WHERE o.lsTransaction = :lsTransaction");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ProtocolValue AS o WHERE o.lsTransaction = :lsTransaction");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -398,31 +458,31 @@ public static TypedQuery<ProtocolValue> findProtocolValuesByLsTransactionEquals(
         return q;
     }
 
-	public ProtocolValue() {
+    public ProtocolValue() {
         super();
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static String toJsonArray(Collection<ProtocolValue> collection) {
+    public static String toJsonArray(Collection<ProtocolValue> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ProtocolValue> collection, String[] fields) {
+    public static String toJsonArray(Collection<ProtocolValue> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy.java b/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy.java
index c5f87eeb0..beb2295f6 100755
--- a/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy.java
+++ b/src/main/java/com/labsynch/labseer/domain/PurityMeasuredBy.java
@@ -27,63 +27,64 @@
 
 public class PurityMeasuredBy {
 
-	
     @Size(max = 255)
     private String name;
 
     @Size(max = 255)
     private String code;
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static PurityMeasuredBy fromJsonToPurityMeasuredBy(String json) {
+    public static PurityMeasuredBy fromJsonToPurityMeasuredBy(String json) {
         return new JSONDeserializer<PurityMeasuredBy>()
-        .use(null, PurityMeasuredBy.class).deserialize(json);
+                .use(null, PurityMeasuredBy.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<PurityMeasuredBy> collection) {
+    public static String toJsonArray(Collection<PurityMeasuredBy> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<PurityMeasuredBy> collection, String[] fields) {
+    public static String toJsonArray(Collection<PurityMeasuredBy> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<PurityMeasuredBy> fromJsonArrayToPurityMeasuredBys(String json) {
+    public static Collection<PurityMeasuredBy> fromJsonArrayToPurityMeasuredBys(String json) {
         return new JSONDeserializer<List<PurityMeasuredBy>>()
-        .use("values", PurityMeasuredBy.class).deserialize(json);
+                .use("values", PurityMeasuredBy.class).deserialize(json);
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new PurityMeasuredBy().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countPurityMeasuredBys() {
+    public static long countPurityMeasuredBys() {
         return entityManager().createQuery("SELECT COUNT(o) FROM PurityMeasuredBy o", Long.class).getSingleResult();
     }
 
-	public static List<PurityMeasuredBy> findAllPurityMeasuredBys() {
+    public static List<PurityMeasuredBy> findAllPurityMeasuredBys() {
         return entityManager().createQuery("SELECT o FROM PurityMeasuredBy o", PurityMeasuredBy.class).getResultList();
     }
 
-	public static List<PurityMeasuredBy> findAllPurityMeasuredBys(String sortFieldName, String sortOrder) {
+    public static List<PurityMeasuredBy> findAllPurityMeasuredBys(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM PurityMeasuredBy o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -94,16 +95,19 @@ public static List<PurityMeasuredBy> findAllPurityMeasuredBys(String sortFieldNa
         return entityManager().createQuery(jpaQuery, PurityMeasuredBy.class).getResultList();
     }
 
-	public static PurityMeasuredBy findPurityMeasuredBy(Long id) {
-        if (id == null) return null;
+    public static PurityMeasuredBy findPurityMeasuredBy(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(PurityMeasuredBy.class, id);
     }
 
-	public static List<PurityMeasuredBy> findPurityMeasuredByEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM PurityMeasuredBy o", PurityMeasuredBy.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<PurityMeasuredBy> findPurityMeasuredByEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM PurityMeasuredBy o", PurityMeasuredBy.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<PurityMeasuredBy> findPurityMeasuredByEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<PurityMeasuredBy> findPurityMeasuredByEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM PurityMeasuredBy o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -111,18 +115,21 @@ public static List<PurityMeasuredBy> findPurityMeasuredByEntries(int firstResult
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, PurityMeasuredBy.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, PurityMeasuredBy.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -131,85 +138,91 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public PurityMeasuredBy merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         PurityMeasuredBy merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String getName() {
+    public String getName() {
         return this.name;
     }
 
-	public void setName(String name) {
+    public void setName(String name) {
         this.name = name;
     }
 
-	public String getCode() {
+    public String getCode() {
         return this.code;
     }
 
-	public void setCode(String code) {
+    public void setCode(String code) {
         this.code = code;
     }
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public static Long countFindPurityMeasuredBysByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static Long countFindPurityMeasuredBysByCodeEquals(String code) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = PurityMeasuredBy.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM PurityMeasuredBy AS o WHERE o.code = :code", Long.class);
         q.setParameter("code", code);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindPurityMeasuredBysByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static Long countFindPurityMeasuredBysByNameEquals(String name) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = PurityMeasuredBy.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM PurityMeasuredBy AS o WHERE o.name = :name", Long.class);
         q.setParameter("name", name);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindPurityMeasuredBysByNameLike(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static Long countFindPurityMeasuredBysByNameLike(String name) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         name = name.replace('*', '%');
         if (name.charAt(0) != '%') {
             name = "%" + name;
@@ -218,21 +231,26 @@ public static Long countFindPurityMeasuredBysByNameLike(String name) {
             name = name + "%";
         }
         EntityManager em = PurityMeasuredBy.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM PurityMeasuredBy AS o WHERE LOWER(o.name) LIKE LOWER(:name)", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM PurityMeasuredBy AS o WHERE LOWER(o.name) LIKE LOWER(:name)", Long.class);
         q.setParameter("name", name);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<PurityMeasuredBy> findPurityMeasuredBysByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static TypedQuery<PurityMeasuredBy> findPurityMeasuredBysByCodeEquals(String code) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = PurityMeasuredBy.entityManager();
-        TypedQuery<PurityMeasuredBy> q = em.createQuery("SELECT o FROM PurityMeasuredBy AS o WHERE o.code = :code", PurityMeasuredBy.class);
+        TypedQuery<PurityMeasuredBy> q = em.createQuery("SELECT o FROM PurityMeasuredBy AS o WHERE o.code = :code",
+                PurityMeasuredBy.class);
         q.setParameter("code", code);
         return q;
     }
 
-	public static TypedQuery<PurityMeasuredBy> findPurityMeasuredBysByCodeEquals(String code, String sortFieldName, String sortOrder) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static TypedQuery<PurityMeasuredBy> findPurityMeasuredBysByCodeEquals(String code, String sortFieldName,
+            String sortOrder) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = PurityMeasuredBy.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM PurityMeasuredBy AS o WHERE o.code = :code");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -246,16 +264,20 @@ public static TypedQuery<PurityMeasuredBy> findPurityMeasuredBysByCodeEquals(Str
         return q;
     }
 
-	public static TypedQuery<PurityMeasuredBy> findPurityMeasuredBysByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<PurityMeasuredBy> findPurityMeasuredBysByNameEquals(String name) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = PurityMeasuredBy.entityManager();
-        TypedQuery<PurityMeasuredBy> q = em.createQuery("SELECT o FROM PurityMeasuredBy AS o WHERE o.name = :name", PurityMeasuredBy.class);
+        TypedQuery<PurityMeasuredBy> q = em.createQuery("SELECT o FROM PurityMeasuredBy AS o WHERE o.name = :name",
+                PurityMeasuredBy.class);
         q.setParameter("name", name);
         return q;
     }
 
-	public static TypedQuery<PurityMeasuredBy> findPurityMeasuredBysByNameEquals(String name, String sortFieldName, String sortOrder) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<PurityMeasuredBy> findPurityMeasuredBysByNameEquals(String name, String sortFieldName,
+            String sortOrder) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = PurityMeasuredBy.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM PurityMeasuredBy AS o WHERE o.name = :name");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -269,8 +291,9 @@ public static TypedQuery<PurityMeasuredBy> findPurityMeasuredBysByNameEquals(Str
         return q;
     }
 
-	public static TypedQuery<PurityMeasuredBy> findPurityMeasuredBysByNameLike(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<PurityMeasuredBy> findPurityMeasuredBysByNameLike(String name) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         name = name.replace('*', '%');
         if (name.charAt(0) != '%') {
             name = "%" + name;
@@ -279,13 +302,16 @@ public static TypedQuery<PurityMeasuredBy> findPurityMeasuredBysByNameLike(Strin
             name = name + "%";
         }
         EntityManager em = PurityMeasuredBy.entityManager();
-        TypedQuery<PurityMeasuredBy> q = em.createQuery("SELECT o FROM PurityMeasuredBy AS o WHERE LOWER(o.name) LIKE LOWER(:name)", PurityMeasuredBy.class);
+        TypedQuery<PurityMeasuredBy> q = em.createQuery(
+                "SELECT o FROM PurityMeasuredBy AS o WHERE LOWER(o.name) LIKE LOWER(:name)", PurityMeasuredBy.class);
         q.setParameter("name", name);
         return q;
     }
 
-	public static TypedQuery<PurityMeasuredBy> findPurityMeasuredBysByNameLike(String name, String sortFieldName, String sortOrder) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<PurityMeasuredBy> findPurityMeasuredBysByNameLike(String name, String sortFieldName,
+            String sortOrder) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         name = name.replace('*', '%');
         if (name.charAt(0) != '%') {
             name = "%" + name;
@@ -294,7 +320,8 @@ public static TypedQuery<PurityMeasuredBy> findPurityMeasuredBysByNameLike(Strin
             name = name + "%";
         }
         EntityManager em = PurityMeasuredBy.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM PurityMeasuredBy AS o WHERE LOWER(o.name) LIKE LOWER(:name)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM PurityMeasuredBy AS o WHERE LOWER(o.name) LIKE LOWER(:name)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -306,7 +333,7 @@ public static TypedQuery<PurityMeasuredBy> findPurityMeasuredBysByNameLike(Strin
         return q;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/RegSearch.java b/src/main/java/com/labsynch/labseer/domain/RegSearch.java
index e8d799dc7..5a3d58cbe 100755
--- a/src/main/java/com/labsynch/labseer/domain/RegSearch.java
+++ b/src/main/java/com/labsynch/labseer/domain/RegSearch.java
@@ -11,64 +11,61 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class RegSearch {
 
-	
     private String corpName;
 
     @Lob
-    //@Size(max = 10485760)
+    // @Size(max = 10485760)
     private String molStructure;
 
-
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static RegSearch fromJsonToRegSearch(String json) {
+    public static RegSearch fromJsonToRegSearch(String json) {
         return new JSONDeserializer<RegSearch>()
-        .use(null, RegSearch.class).deserialize(json);
+                .use(null, RegSearch.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<RegSearch> collection) {
+    public static String toJsonArray(Collection<RegSearch> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<RegSearch> collection, String[] fields) {
+    public static String toJsonArray(Collection<RegSearch> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<RegSearch> fromJsonArrayToRegSearches(String json) {
+    public static Collection<RegSearch> fromJsonArrayToRegSearches(String json) {
         return new JSONDeserializer<List<RegSearch>>()
-        .use("values", RegSearch.class).deserialize(json);
+                .use("values", RegSearch.class).deserialize(json);
     }
 
-	public String getCorpName() {
+    public String getCorpName() {
         return this.corpName;
     }
 
-	public void setCorpName(String corpName) {
+    public void setCorpName(String corpName) {
         this.corpName = corpName;
     }
 
-	public String getMolStructure() {
+    public String getMolStructure() {
         return this.molStructure;
     }
 
-	public void setMolStructure(String molStructure) {
+    public void setMolStructure(String molStructure) {
         this.molStructure = molStructure;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/RoleKind.java b/src/main/java/com/labsynch/labseer/domain/RoleKind.java
index 3a70bd4f2..030feba19 100644
--- a/src/main/java/com/labsynch/labseer/domain/RoleKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/RoleKind.java
@@ -26,11 +26,10 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 @Configurable
 @Entity
 public class RoleKind {
-	
+
     @NotNull
     @ManyToOne
     @JoinColumn(name = "ls_type")
@@ -39,97 +38,101 @@ public class RoleKind {
     @NotNull
     @Size(max = 255)
     private String kindName;
-    
+
     @Column(unique = true)
     @Size(max = 255)
     private String lsTypeAndKind;
-    
+
     @Transactional
-	public void persist() {
-		if (this.entityManager == null) this.entityManager = entityManager();
-		this.setLsTypeAndKind(new StringBuilder().append(this.lsType.getTypeName()).append("_").append(this.kindName).toString());
-		this.entityManager.persist(this);
-	}
- 
-
-	public RoleType getLsType() {
+    public void persist() {
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
+        this.setLsTypeAndKind(
+                new StringBuilder().append(this.lsType.getTypeName()).append("_").append(this.kindName).toString());
+        this.entityManager.persist(this);
+    }
+
+    public RoleType getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(RoleType lsType) {
+    public void setLsType(RoleType lsType) {
         this.lsType = lsType;
     }
 
-	public String getKindName() {
+    public String getKindName() {
         return this.kindName;
     }
 
-	public void setKindName(String kindName) {
+    public void setKindName(String kindName) {
         this.kindName = kindName;
     }
 
-	public String getLsTypeAndKind() {
+    public String getLsTypeAndKind() {
         return this.lsTypeAndKind;
     }
 
-	public void setLsTypeAndKind(String lsTypeAndKind) {
+    public void setLsTypeAndKind(String lsTypeAndKind) {
         this.lsTypeAndKind = lsTypeAndKind;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static RoleKind fromJsonToRoleKind(String json) {
+    public static RoleKind fromJsonToRoleKind(String json) {
         return new JSONDeserializer<RoleKind>()
-        .use(null, RoleKind.class).deserialize(json);
+                .use(null, RoleKind.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<RoleKind> collection) {
+    public static String toJsonArray(Collection<RoleKind> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<RoleKind> collection, String[] fields) {
+    public static String toJsonArray(Collection<RoleKind> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<RoleKind> fromJsonArrayToRoleKinds(String json) {
+    public static Collection<RoleKind> fromJsonArrayToRoleKinds(String json) {
         return new JSONDeserializer<List<RoleKind>>()
-        .use("values", RoleKind.class).deserialize(json);
+                .use("values", RoleKind.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName", "lsTypeAndKind");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName",
+            "lsTypeAndKind");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new RoleKind().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countRoleKinds() {
+    public static long countRoleKinds() {
         return entityManager().createQuery("SELECT COUNT(o) FROM RoleKind o", Long.class).getSingleResult();
     }
 
-	public static List<RoleKind> findAllRoleKinds() {
+    public static List<RoleKind> findAllRoleKinds() {
         return entityManager().createQuery("SELECT o FROM RoleKind o", RoleKind.class).getResultList();
     }
 
-	public static List<RoleKind> findAllRoleKinds(String sortFieldName, String sortOrder) {
+    public static List<RoleKind> findAllRoleKinds(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM RoleKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -140,16 +143,19 @@ public static List<RoleKind> findAllRoleKinds(String sortFieldName, String sortO
         return entityManager().createQuery(jpaQuery, RoleKind.class).getResultList();
     }
 
-	public static RoleKind findRoleKind(Long id) {
-        if (id == null) return null;
+    public static RoleKind findRoleKind(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(RoleKind.class, id);
     }
 
-	public static List<RoleKind> findRoleKindEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM RoleKind o", RoleKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<RoleKind> findRoleKindEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM RoleKind o", RoleKind.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<RoleKind> findRoleKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<RoleKind> findRoleKindEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM RoleKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -157,12 +163,14 @@ public static List<RoleKind> findRoleKindEntries(int firstResult, int maxResults
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, RoleKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, RoleKind.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -171,59 +179,73 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public RoleKind merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         RoleKind merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public static Long countFindRoleKindsByKindNameEqualsAndLsType(String kindName, RoleType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static Long countFindRoleKindsByKindNameEqualsAndLsType(String kindName, RoleType lsType) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = RoleKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM RoleKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM RoleKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
         q.setParameter("kindName", kindName);
         q.setParameter("lsType", lsType);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindRoleKindsByLsType(RoleType lsType) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static Long countFindRoleKindsByLsType(RoleType lsType) {
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = RoleKind.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM RoleKind AS o WHERE o.lsType = :lsType", Long.class);
         q.setParameter("lsType", lsType);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<RoleKind> findRoleKindsByKindNameEqualsAndLsType(String kindName, RoleType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<RoleKind> findRoleKindsByKindNameEqualsAndLsType(String kindName, RoleType lsType) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = RoleKind.entityManager();
-        TypedQuery<RoleKind> q = em.createQuery("SELECT o FROM RoleKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", RoleKind.class);
+        TypedQuery<RoleKind> q = em.createQuery(
+                "SELECT o FROM RoleKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", RoleKind.class);
         q.setParameter("kindName", kindName);
         q.setParameter("lsType", lsType);
         return q;
     }
 
-	public static TypedQuery<RoleKind> findRoleKindsByKindNameEqualsAndLsType(String kindName, RoleType lsType, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<RoleKind> findRoleKindsByKindNameEqualsAndLsType(String kindName, RoleType lsType,
+            String sortFieldName, String sortOrder) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = RoleKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM RoleKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM RoleKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -236,16 +258,18 @@ public static TypedQuery<RoleKind> findRoleKindsByKindNameEqualsAndLsType(String
         return q;
     }
 
-	public static TypedQuery<RoleKind> findRoleKindsByLsType(RoleType lsType) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<RoleKind> findRoleKindsByLsType(RoleType lsType) {
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = RoleKind.entityManager();
         TypedQuery<RoleKind> q = em.createQuery("SELECT o FROM RoleKind AS o WHERE o.lsType = :lsType", RoleKind.class);
         q.setParameter("lsType", lsType);
         return q;
     }
 
-	public static TypedQuery<RoleKind> findRoleKindsByLsType(RoleType lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<RoleKind> findRoleKindsByLsType(RoleType lsType, String sortFieldName, String sortOrder) {
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = RoleKind.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM RoleKind AS o WHERE o.lsType = :lsType");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -259,29 +283,29 @@ public static TypedQuery<RoleKind> findRoleKindsByLsType(RoleType lsType, String
         return q;
     }
 
-	@Id
+    @Id
     @SequenceGenerator(name = "roleKindGen", sequenceName = "ROLE_KIND_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "roleKindGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/RoleType.java b/src/main/java/com/labsynch/labseer/domain/RoleType.java
index 68ae485f6..f638638d9 100644
--- a/src/main/java/com/labsynch/labseer/domain/RoleType.java
+++ b/src/main/java/com/labsynch/labseer/domain/RoleType.java
@@ -33,62 +33,63 @@ public class RoleType {
     @Column(unique = true)
     @Size(max = 128)
     private String typeName;
-    
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static RoleType fromJsonToRoleType(String json) {
+    public static RoleType fromJsonToRoleType(String json) {
         return new JSONDeserializer<RoleType>()
-        .use(null, RoleType.class).deserialize(json);
+                .use(null, RoleType.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<RoleType> collection) {
+    public static String toJsonArray(Collection<RoleType> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<RoleType> collection, String[] fields) {
+    public static String toJsonArray(Collection<RoleType> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<RoleType> fromJsonArrayToRoleTypes(String json) {
+    public static Collection<RoleType> fromJsonArrayToRoleTypes(String json) {
         return new JSONDeserializer<List<RoleType>>()
-        .use("values", RoleType.class).deserialize(json);
+                .use("values", RoleType.class).deserialize(json);
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new RoleType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countRoleTypes() {
+    public static long countRoleTypes() {
         return entityManager().createQuery("SELECT COUNT(o) FROM RoleType o", Long.class).getSingleResult();
     }
 
-	public static List<RoleType> findAllRoleTypes() {
+    public static List<RoleType> findAllRoleTypes() {
         return entityManager().createQuery("SELECT o FROM RoleType o", RoleType.class).getResultList();
     }
 
-	public static List<RoleType> findAllRoleTypes(String sortFieldName, String sortOrder) {
+    public static List<RoleType> findAllRoleTypes(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM RoleType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -99,16 +100,19 @@ public static List<RoleType> findAllRoleTypes(String sortFieldName, String sortO
         return entityManager().createQuery(jpaQuery, RoleType.class).getResultList();
     }
 
-	public static RoleType findRoleType(Long id) {
-        if (id == null) return null;
+    public static RoleType findRoleType(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(RoleType.class, id);
     }
 
-	public static List<RoleType> findRoleTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM RoleType o", RoleType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<RoleType> findRoleTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM RoleType o", RoleType.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<RoleType> findRoleTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<RoleType> findRoleTypeEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM RoleType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -116,18 +120,21 @@ public static List<RoleType> findRoleTypeEntries(int firstResult, int maxResults
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, RoleType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, RoleType.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -136,78 +143,86 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public RoleType merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         RoleType merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String getTypeName() {
+    public String getTypeName() {
         return this.typeName;
     }
 
-	public void setTypeName(String typeName) {
+    public void setTypeName(String typeName) {
         this.typeName = typeName;
     }
 
-	@Id
+    @Id
     @SequenceGenerator(name = "roleTypeGen", sequenceName = "ROLE_TYPE_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "roleTypeGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public static Long countFindRoleTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static Long countFindRoleTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = RoleType.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM RoleType AS o WHERE o.typeName = :typeName", Long.class);
         q.setParameter("typeName", typeName);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<RoleType> findRoleTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static TypedQuery<RoleType> findRoleTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = RoleType.entityManager();
-        TypedQuery<RoleType> q = em.createQuery("SELECT o FROM RoleType AS o WHERE o.typeName = :typeName", RoleType.class);
+        TypedQuery<RoleType> q = em.createQuery("SELECT o FROM RoleType AS o WHERE o.typeName = :typeName",
+                RoleType.class);
         q.setParameter("typeName", typeName);
         return q;
     }
 
-	public static TypedQuery<RoleType> findRoleTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static TypedQuery<RoleType> findRoleTypesByTypeNameEquals(String typeName, String sortFieldName,
+            String sortOrder) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = RoleType.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM RoleType AS o WHERE o.typeName = :typeName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
diff --git a/src/main/java/com/labsynch/labseer/domain/Salt.java b/src/main/java/com/labsynch/labseer/domain/Salt.java
index dc86af8d8..26ba83b88 100755
--- a/src/main/java/com/labsynch/labseer/domain/Salt.java
+++ b/src/main/java/com/labsynch/labseer/domain/Salt.java
@@ -33,13 +33,13 @@
 
 public class Salt {
 
-	@Column(columnDefinition="text")
+    @Column(columnDefinition = "text")
     private String molStructure;
 
     @Size(max = 255)
     private String name;
 
-    @Column(columnDefinition="text")
+    @Column(columnDefinition = "text")
     private String originalStructure;
 
     @Size(max = 100)
@@ -53,26 +53,29 @@ public class Salt {
     private int cdId;
 
     private Boolean ignore;
-    
+
     private int charge;
-    
 
     public static TypedQuery<Salt> findSaltsByAbbrevEquals(String abbrev) {
-        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
+        if (abbrev == null || abbrev.length() == 0)
+            throw new IllegalArgumentException("The abbrev argument is required");
         EntityManager em = Salt.entityManager();
         CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
         CriteriaQuery<Salt> criteria = criteriaBuilder.createQuery(Salt.class);
         Root<Salt> saltRoot = criteria.from(Salt.class);
         criteria.select(saltRoot);
-        Predicate predicate = criteriaBuilder.equal(criteriaBuilder.upper(saltRoot.<String>get("abbrev")), abbrev.toUpperCase().trim());
+        Predicate predicate = criteriaBuilder.equal(criteriaBuilder.upper(saltRoot.<String>get("abbrev")),
+                abbrev.toUpperCase().trim());
         criteria.where(criteriaBuilder.and(predicate));
         TypedQuery<Salt> q = em.createQuery(criteria);
         return q;
     }
 
     public static TypedQuery<Salt> findSaltsByAbbrevEqualsAndNameEquals(String abbrev, String name) {
-        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+        if (abbrev == null || abbrev.length() == 0)
+            throw new IllegalArgumentException("The abbrev argument is required");
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = Salt.entityManager();
         CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
         CriteriaQuery<Salt> criteria = criteriaBuilder.createQuery(Salt.class);
@@ -80,8 +83,10 @@ public static TypedQuery<Salt> findSaltsByAbbrevEqualsAndNameEquals(String abbre
         criteria.select(saltRoot);
         Predicate[] predicates = new Predicate[0];
         List<Predicate> predicateList = new ArrayList<Predicate>();
-        Predicate predicate1 = criteriaBuilder.equal(criteriaBuilder.upper(saltRoot.<String>get("abbrev")), abbrev.toUpperCase().trim());
-        Predicate predicate2 = criteriaBuilder.equal(criteriaBuilder.upper(saltRoot.<String>get("name")), name.toUpperCase().trim());
+        Predicate predicate1 = criteriaBuilder.equal(criteriaBuilder.upper(saltRoot.<String>get("abbrev")),
+                abbrev.toUpperCase().trim());
+        Predicate predicate2 = criteriaBuilder.equal(criteriaBuilder.upper(saltRoot.<String>get("name")),
+                name.toUpperCase().trim());
         predicateList.add(predicate1);
         predicateList.add(predicate2);
         predicates = predicateList.toArray(predicates);
@@ -91,7 +96,8 @@ public static TypedQuery<Salt> findSaltsByAbbrevEqualsAndNameEquals(String abbre
     }
 
     public static TypedQuery<Salt> findSaltsByAbbrevLike(String abbrev) {
-        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
+        if (abbrev == null || abbrev.length() == 0)
+            throw new IllegalArgumentException("The abbrev argument is required");
         abbrev = abbrev.replace('*', '%');
         if (abbrev.charAt(0) != '%') {
             abbrev = "%" + abbrev;
@@ -100,7 +106,8 @@ public static TypedQuery<Salt> findSaltsByAbbrevLike(String abbrev) {
             abbrev = abbrev + "%";
         }
         EntityManager em = Salt.entityManager();
-        TypedQuery<Salt> q = em.createQuery("SELECT o FROM Salt AS o WHERE LOWER(o.abbrev) LIKE LOWER(:abbrev)", Salt.class);
+        TypedQuery<Salt> q = em.createQuery("SELECT o FROM Salt AS o WHERE LOWER(o.abbrev) LIKE LOWER(:abbrev)",
+                Salt.class);
         q.setParameter("abbrev", abbrev);
         return q;
     }
@@ -112,64 +119,71 @@ public static TypedQuery<Salt> findSaltsByCdId(int cdId) {
         return q;
     }
 
-	public static TypedQuery<Salt> findSaltsByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<Salt> findSaltsByNameEquals(String name) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = Salt.entityManager();
         CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
         CriteriaQuery<Salt> criteria = criteriaBuilder.createQuery(Salt.class);
         Root<Salt> saltRoot = criteria.from(Salt.class);
         criteria.select(saltRoot);
-        Predicate predicate = criteriaBuilder.equal(criteriaBuilder.upper(saltRoot.<String>get("name")), name.toUpperCase().trim());
+        Predicate predicate = criteriaBuilder.equal(criteriaBuilder.upper(saltRoot.<String>get("name")),
+                name.toUpperCase().trim());
         criteria.where(criteriaBuilder.and(predicate));
         TypedQuery<Salt> q = em.createQuery(criteria);
         return q;
     }
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public static Long countFindSaltsByAbbrevEquals(String abbrev) {
-        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
+    public static Long countFindSaltsByAbbrevEquals(String abbrev) {
+        if (abbrev == null || abbrev.length() == 0)
+            throw new IllegalArgumentException("The abbrev argument is required");
         EntityManager em = Salt.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Salt AS o WHERE o.abbrev = :abbrev", Long.class);
         q.setParameter("abbrev", abbrev);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindSaltsByAbbrevEqualsAndNameEquals(String abbrev, String name) {
-        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static Long countFindSaltsByAbbrevEqualsAndNameEquals(String abbrev, String name) {
+        if (abbrev == null || abbrev.length() == 0)
+            throw new IllegalArgumentException("The abbrev argument is required");
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = Salt.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Salt AS o WHERE o.abbrev = :abbrev  AND o.name = :name", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Salt AS o WHERE o.abbrev = :abbrev  AND o.name = :name",
+                Long.class);
         q.setParameter("abbrev", abbrev);
         q.setParameter("name", name);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindSaltsByAbbrevLike(String abbrev) {
-        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
+    public static Long countFindSaltsByAbbrevLike(String abbrev) {
+        if (abbrev == null || abbrev.length() == 0)
+            throw new IllegalArgumentException("The abbrev argument is required");
         abbrev = abbrev.replace('*', '%');
         if (abbrev.charAt(0) != '%') {
             abbrev = "%" + abbrev;
@@ -178,28 +192,31 @@ public static Long countFindSaltsByAbbrevLike(String abbrev) {
             abbrev = abbrev + "%";
         }
         EntityManager em = Salt.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Salt AS o WHERE LOWER(o.abbrev) LIKE LOWER(:abbrev)", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Salt AS o WHERE LOWER(o.abbrev) LIKE LOWER(:abbrev)",
+                Long.class);
         q.setParameter("abbrev", abbrev);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindSaltsByCdId(int cdId) {
+    public static Long countFindSaltsByCdId(int cdId) {
         EntityManager em = Salt.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Salt AS o WHERE o.cdId = :cdId", Long.class);
         q.setParameter("cdId", cdId);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindSaltsByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static Long countFindSaltsByNameEquals(String name) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = Salt.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Salt AS o WHERE o.name = :name", Long.class);
         q.setParameter("name", name);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<Salt> findSaltsByAbbrevEquals(String abbrev, String sortFieldName, String sortOrder) {
-        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
+    public static TypedQuery<Salt> findSaltsByAbbrevEquals(String abbrev, String sortFieldName, String sortOrder) {
+        if (abbrev == null || abbrev.length() == 0)
+            throw new IllegalArgumentException("The abbrev argument is required");
         EntityManager em = Salt.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Salt AS o WHERE o.abbrev = :abbrev");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -213,11 +230,15 @@ public static TypedQuery<Salt> findSaltsByAbbrevEquals(String abbrev, String sor
         return q;
     }
 
-	public static TypedQuery<Salt> findSaltsByAbbrevEqualsAndNameEquals(String abbrev, String name, String sortFieldName, String sortOrder) {
-        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<Salt> findSaltsByAbbrevEqualsAndNameEquals(String abbrev, String name,
+            String sortFieldName, String sortOrder) {
+        if (abbrev == null || abbrev.length() == 0)
+            throw new IllegalArgumentException("The abbrev argument is required");
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = Salt.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Salt AS o WHERE o.abbrev = :abbrev  AND o.name = :name");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Salt AS o WHERE o.abbrev = :abbrev  AND o.name = :name");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -230,8 +251,9 @@ public static TypedQuery<Salt> findSaltsByAbbrevEqualsAndNameEquals(String abbre
         return q;
     }
 
-	public static TypedQuery<Salt> findSaltsByAbbrevLike(String abbrev, String sortFieldName, String sortOrder) {
-        if (abbrev == null || abbrev.length() == 0) throw new IllegalArgumentException("The abbrev argument is required");
+    public static TypedQuery<Salt> findSaltsByAbbrevLike(String abbrev, String sortFieldName, String sortOrder) {
+        if (abbrev == null || abbrev.length() == 0)
+            throw new IllegalArgumentException("The abbrev argument is required");
         abbrev = abbrev.replace('*', '%');
         if (abbrev.charAt(0) != '%') {
             abbrev = "%" + abbrev;
@@ -240,7 +262,8 @@ public static TypedQuery<Salt> findSaltsByAbbrevLike(String abbrev, String sortF
             abbrev = abbrev + "%";
         }
         EntityManager em = Salt.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Salt AS o WHERE LOWER(o.abbrev) LIKE LOWER(:abbrev)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Salt AS o WHERE LOWER(o.abbrev) LIKE LOWER(:abbrev)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -252,7 +275,7 @@ public static TypedQuery<Salt> findSaltsByAbbrevLike(String abbrev, String sortF
         return q;
     }
 
-	public static TypedQuery<Salt> findSaltsByCdId(int cdId, String sortFieldName, String sortOrder) {
+    public static TypedQuery<Salt> findSaltsByCdId(int cdId, String sortFieldName, String sortOrder) {
         EntityManager em = Salt.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Salt AS o WHERE o.cdId = :cdId");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -266,8 +289,9 @@ public static TypedQuery<Salt> findSaltsByCdId(int cdId, String sortFieldName, S
         return q;
     }
 
-	public static TypedQuery<Salt> findSaltsByNameEquals(String name, String sortFieldName, String sortOrder) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<Salt> findSaltsByNameEquals(String name, String sortFieldName, String sortOrder) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = Salt.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Salt AS o WHERE o.name = :name");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -281,30 +305,33 @@ public static TypedQuery<Salt> findSaltsByNameEquals(String name, String sortFie
         return q;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("molStructure", "name", "originalStructure", "abbrev", "molWeight", "formula", "cdId", "ignore", "charge");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("molStructure", "name",
+            "originalStructure", "abbrev", "molWeight", "formula", "cdId", "ignore", "charge");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new Salt().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countSalts() {
+    public static long countSalts() {
         return entityManager().createQuery("SELECT COUNT(o) FROM Salt o", Long.class).getSingleResult();
     }
 
-	public static List<Salt> findAllSalts() {
+    public static List<Salt> findAllSalts() {
         return entityManager().createQuery("SELECT o FROM Salt o", Salt.class).getResultList();
     }
 
-	public static List<Salt> findAllSalts(String sortFieldName, String sortOrder) {
+    public static List<Salt> findAllSalts(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM Salt o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -315,16 +342,18 @@ public static List<Salt> findAllSalts(String sortFieldName, String sortOrder) {
         return entityManager().createQuery(jpaQuery, Salt.class).getResultList();
     }
 
-	public static Salt findSalt(Long id) {
-        if (id == null) return null;
+    public static Salt findSalt(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(Salt.class, id);
     }
 
-	public static List<Salt> findSaltEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM Salt o", Salt.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<Salt> findSaltEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM Salt o", Salt.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<Salt> findSaltEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<Salt> findSaltEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM Salt o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -332,18 +361,21 @@ public static List<Salt> findSaltEntries(int firstResult, int maxResults, String
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, Salt.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, Salt.class).setFirstResult(firstResult).setMaxResults(maxResults)
+                .getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -352,125 +384,128 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public Salt merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         Salt merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String getMolStructure() {
+    public String getMolStructure() {
         return this.molStructure;
     }
 
-	public void setMolStructure(String molStructure) {
+    public void setMolStructure(String molStructure) {
         this.molStructure = molStructure;
     }
 
-	public String getName() {
+    public String getName() {
         return this.name;
     }
 
-	public void setName(String name) {
+    public void setName(String name) {
         this.name = name;
     }
 
-	public String getOriginalStructure() {
+    public String getOriginalStructure() {
         return this.originalStructure;
     }
 
-	public void setOriginalStructure(String originalStructure) {
+    public void setOriginalStructure(String originalStructure) {
         this.originalStructure = originalStructure;
     }
 
-	public String getAbbrev() {
+    public String getAbbrev() {
         return this.abbrev;
     }
 
-	public void setAbbrev(String abbrev) {
+    public void setAbbrev(String abbrev) {
         this.abbrev = abbrev;
     }
 
-	public Double getMolWeight() {
+    public Double getMolWeight() {
         return this.molWeight;
     }
 
-	public void setMolWeight(Double molWeight) {
+    public void setMolWeight(Double molWeight) {
         this.molWeight = molWeight;
     }
 
-	public String getFormula() {
+    public String getFormula() {
         return this.formula;
     }
 
-	public void setFormula(String formula) {
+    public void setFormula(String formula) {
         this.formula = formula;
     }
 
-	public int getCdId() {
+    public int getCdId() {
         return this.cdId;
     }
 
-	public void setCdId(int cdId) {
+    public void setCdId(int cdId) {
         this.cdId = cdId;
     }
 
-	public Boolean getIgnore() {
+    public Boolean getIgnore() {
         return this.ignore;
     }
 
-	public void setIgnore(Boolean ignore) {
+    public void setIgnore(Boolean ignore) {
         this.ignore = ignore;
     }
 
-	public int getCharge() {
+    public int getCharge() {
         return this.charge;
     }
 
-	public void setCharge(int charge) {
+    public void setCharge(int charge) {
         this.charge = charge;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static Salt fromJsonToSalt(String json) {
+    public static Salt fromJsonToSalt(String json) {
         return new JSONDeserializer<Salt>()
-        .use(null, Salt.class).deserialize(json);
+                .use(null, Salt.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<Salt> collection) {
+    public static String toJsonArray(Collection<Salt> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<Salt> collection, String[] fields) {
+    public static String toJsonArray(Collection<Salt> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<Salt> fromJsonArrayToSalts(String json) {
+    public static Collection<Salt> fromJsonArrayToSalts(String json) {
         return new JSONDeserializer<List<Salt>>()
-        .use("values", Salt.class).deserialize(json);
+                .use("values", Salt.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltForm.java b/src/main/java/com/labsynch/labseer/domain/SaltForm.java
index ccbf93446..ec939bae9 100755
--- a/src/main/java/com/labsynch/labseer/domain/SaltForm.java
+++ b/src/main/java/com/labsynch/labseer/domain/SaltForm.java
@@ -53,59 +53,61 @@ public class SaltForm implements Comparable {
 
 	private static final Logger logger = LoggerFactory.getLogger(SaltForm.class);
 
-	@Column(columnDefinition="text")
+	@Column(columnDefinition = "text")
 	private String molStructure;
 
 	@Size(max = 255)
-    @org.hibernate.annotations.Index(name="SaltForm_CorpName_IDX")
+	@org.hibernate.annotations.Index(name = "SaltForm_CorpName_IDX")
 	private String corpName;
 
-	@Size(max = 255)    
-	@org.hibernate.annotations.Index(name="SaltForm_casNumber_IDX")
+	@Size(max = 255)
+	@org.hibernate.annotations.Index(name = "SaltForm_casNumber_IDX")
 	private String casNumber;
 
 	private String chemist;
 
 	@Temporal(TemporalType.TIMESTAMP)
 	@DateTimeFormat(style = "S-")
-    @org.hibernate.annotations.Index(name="SaltForm_RegDate_IDX")
+	@org.hibernate.annotations.Index(name = "SaltForm_RegDate_IDX")
 	private Date registrationDate;
 
-//	@NotNull
-    @org.hibernate.annotations.Index(name="SaltForm_CdId_IDX")
+	// @NotNull
+	@org.hibernate.annotations.Index(name = "SaltForm_CdId_IDX")
 	private int CdId;
 
 	private Boolean ignore;
-	
+
 	private Double saltWeight;
 
 	@ManyToOne
-    @org.hibernate.annotations.Index(name="SaltForm_Parent_IDX")
+	@org.hibernate.annotations.Index(name = "SaltForm_Parent_IDX")
 	@JoinColumn(name = "parent")
 	private Parent parent;
 
-	@OneToMany(cascade = CascadeType.ALL, mappedBy = "saltForm", fetch=FetchType.LAZY)
+	@OneToMany(cascade = CascadeType.ALL, mappedBy = "saltForm", fetch = FetchType.LAZY)
 	private Set<Lot> lots = new HashSet<Lot>();
 
-	@OneToMany(cascade = CascadeType.ALL, mappedBy = "saltForm", fetch=FetchType.LAZY)
+	@OneToMany(cascade = CascadeType.ALL, mappedBy = "saltForm", fetch = FetchType.LAZY)
 	private Set<IsoSalt> isoSalts = new HashSet<IsoSalt>();
-	
-    @ManyToOne
+
+	@ManyToOne
 	@JoinColumn(name = "bulk_load_file")
-    private BulkLoadFile bulkLoadFile;
-	
-    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("corpName", "CdId", "parent", "bulkLoadFile");
+	private BulkLoadFile bulkLoadFile;
+
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("corpName", "CdId",
+			"parent", "bulkLoadFile");
 
-    
-    public static long countSaltFormsByCorpNameEquals(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        EntityManager em = SaltForm.entityManager();
-        TypedQuery<Long> q = em.createQuery("SELECT count(o) FROM SaltForm AS o WHERE o.corpName = :corpName", Long.class);
-        q.setParameter("corpName", corpName);
-        return q.getSingleResult();
-    }
+	public static long countSaltFormsByCorpNameEquals(String corpName) {
+		if (corpName == null || corpName.length() == 0)
+			throw new IllegalArgumentException("The corpName argument is required");
+		EntityManager em = SaltForm.entityManager();
+		TypedQuery<Long> q = em.createQuery("SELECT count(o) FROM SaltForm AS o WHERE o.corpName = :corpName",
+				Long.class);
+		q.setParameter("corpName", corpName);
+		return q.getSingleResult();
+	}
 
-    public static List<Integer> findSaltFormCdIdsByMeta(SearchFormDTO searchParams) {
+	public static List<Integer> findSaltFormCdIdsByMeta(SearchFormDTO searchParams) {
 
 		EntityManager em = SaltForm.entityManager();
 		CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
@@ -137,7 +139,8 @@ public static List<Integer> findSaltFormCdIdsByMeta(SearchFormDTO searchParams)
 		}
 		if (searchParams.getMinSynthDate() != null) {
 			logger.debug("incoming minSynthesisDate :" + searchParams.getDateFrom());
-			Predicate predicate = criteriaBuilder.greaterThanOrEqualTo(saltFormLot.<Date>get("synthesisDate"), firstDate);
+			Predicate predicate = criteriaBuilder.greaterThanOrEqualTo(saltFormLot.<Date>get("synthesisDate"),
+					firstDate);
 			predicateList.add(predicate);
 		}
 		if (searchParams.getMaxSynthDate() != null) {
@@ -152,12 +155,14 @@ public static List<Integer> findSaltFormCdIdsByMeta(SearchFormDTO searchParams)
 		}
 		if (searchParams.getSaltFormCorpName() != null) {
 			logger.debug("incoming saltFormCorpName :" + searchParams.getSaltFormCorpName());
-			Predicate predicate = criteriaBuilder.equal(saltFormRoot.get("corpName"), searchParams.getSaltFormCorpName());
+			Predicate predicate = criteriaBuilder.equal(saltFormRoot.get("corpName"),
+					searchParams.getSaltFormCorpName());
 			predicateList.add(predicate);
 		}
 		if (searchParams.getParentCorpName() != null) {
 			logger.debug("incoming parentCorpName :" + searchParams.getParentCorpName());
-			Predicate predicate = criteriaBuilder.equal(saltFormParent.get("corpName"), searchParams.getParentCorpName());
+			Predicate predicate = criteriaBuilder.equal(saltFormParent.get("corpName"),
+					searchParams.getParentCorpName());
 			predicateList.add(predicate);
 		}
 		if (searchParams.getAlias() != null && !searchParams.getAlias().equals("")) {
@@ -165,19 +170,23 @@ public static List<Integer> findSaltFormCdIdsByMeta(SearchFormDTO searchParams)
 			String aliasName = searchParams.getAlias().trim().toUpperCase();
 			logger.debug("incoming alias name : " + searchParams.getAlias());
 
-			if (searchParams.getAliasContSelect().equals("exact")){
-				predicate = criteriaBuilder.equal( criteriaBuilder.upper(parentAliases.<String>get("aliasName")), aliasName.toUpperCase());
+			if (searchParams.getAliasContSelect().equals("exact")) {
+				predicate = criteriaBuilder.equal(criteriaBuilder.upper(parentAliases.<String>get("aliasName")),
+						aliasName.toUpperCase());
 			} else {
 				aliasName = "%" + aliasName + "%";
-				predicate = criteriaBuilder.like(criteriaBuilder.upper(parentAliases.<String>get("aliasName")), aliasName.toUpperCase());				
+				predicate = criteriaBuilder.like(criteriaBuilder.upper(parentAliases.<String>get("aliasName")),
+						aliasName.toUpperCase());
 			}
 			logger.debug("aliasName: " + aliasName);
 			predicateList.add(predicate);
 		}
 
 		if (searchParams.getMinParentNumber() != null && searchParams.getMaxParentNumber() != null) {
-			Predicate predicate1 = criteriaBuilder.greaterThanOrEqualTo(saltFormParent.<Long>get("parentNumber"), searchParams.getMinParentNumber());
-			Predicate predicate2 = criteriaBuilder.lessThanOrEqualTo(saltFormParent.<Long>get("parentNumber"), searchParams.getMaxParentNumber());
+			Predicate predicate1 = criteriaBuilder.greaterThanOrEqualTo(saltFormParent.<Long>get("parentNumber"),
+					searchParams.getMinParentNumber());
+			Predicate predicate2 = criteriaBuilder.lessThanOrEqualTo(saltFormParent.<Long>get("parentNumber"),
+					searchParams.getMaxParentNumber());
 			predicateList.add(predicate1);
 			predicateList.add(predicate2);
 		}
@@ -195,18 +204,19 @@ public static List<Integer> findSaltFormCdIdsByMeta(SearchFormDTO searchParams)
 
 		logger.debug("SaltForm search: minSynthDate = " + searchParams.getMinSynthDate());
 		List<Integer> saltFormCdIds = null;
-		if (predicates.length == 0 && searchParams.getMinSynthDate() == null && searchParams.getMaxSynthDate() == null) {
+		if (predicates.length == 0 && searchParams.getMinSynthDate() == null
+				&& searchParams.getMaxSynthDate() == null) {
 			logger.debug("No search criteria. Returning null.");
 		} else {
 			saltFormCdIds = q.getResultList();
 		}
-		
-		if (searchParams.getMaxResults() != null) q.setMaxResults(searchParams.getMaxResults());
+
+		if (searchParams.getMaxResults() != null)
+			q.setMaxResults(searchParams.getMaxResults());
 
 		return saltFormCdIds;
 	}
 
-
 	public static TypedQuery<SaltForm> findSaltFormsByMeta(SearchFormDTO searchParams) {
 
 		EntityManager em = SaltForm.entityManager();
@@ -219,17 +229,17 @@ public static TypedQuery<SaltForm> findSaltFormsByMeta(SearchFormDTO searchParam
 		Join<Lot, LotAlias> lotAliases = saltFormLot.join("lotAliases", JoinType.LEFT);
 
 		criteria.select(saltFormRoot);
-//		criteria.distinct(true);
+		// criteria.distinct(true);
 
 		ParameterExpression<Date> firstDate = criteriaBuilder.parameter(Date.class);
 		ParameterExpression<Date> lastDate = criteriaBuilder.parameter(Date.class);
-		
+
 		ParameterExpression<Long> minParent = criteriaBuilder.parameter(Long.class);
-		ParameterExpression<Long> maxParent = criteriaBuilder.parameter(Long.class);		
-		
+		ParameterExpression<Long> maxParent = criteriaBuilder.parameter(Long.class);
+
 		Predicate[] predicates = new Predicate[0];
 		List<Predicate> predicateList = new ArrayList<Predicate>();
-		
+
 		if (searchParams.getChemist() != null && !searchParams.getChemist().equals("anyone")) {
 			logger.debug("incoming chemist :" + searchParams.getChemist().toString());
 			Predicate predicate = criteriaBuilder.equal(saltFormLot.<Author>get("chemist"), searchParams.getChemist());
@@ -242,7 +252,8 @@ public static TypedQuery<SaltForm> findSaltFormsByMeta(SearchFormDTO searchParam
 		}
 		if (searchParams.getMinSynthDate() != null) {
 			logger.debug("incoming minSynthesisDate :" + searchParams.getDateFrom());
-			Predicate predicate = criteriaBuilder.greaterThanOrEqualTo(saltFormLot.<Date>get("synthesisDate"), firstDate);
+			Predicate predicate = criteriaBuilder.greaterThanOrEqualTo(saltFormLot.<Date>get("synthesisDate"),
+					firstDate);
 			predicateList.add(predicate);
 		}
 		if (searchParams.getMaxSynthDate() != null) {
@@ -257,12 +268,14 @@ public static TypedQuery<SaltForm> findSaltFormsByMeta(SearchFormDTO searchParam
 		}
 		if (searchParams.getSaltFormCorpName() != null) {
 			logger.debug("incoming saltFormCorpName :" + searchParams.getSaltFormCorpName());
-			Predicate predicate = criteriaBuilder.equal(saltFormRoot.get("corpName"), searchParams.getSaltFormCorpName());
+			Predicate predicate = criteriaBuilder.equal(saltFormRoot.get("corpName"),
+					searchParams.getSaltFormCorpName());
 			predicateList.add(predicate);
 		}
 		if (searchParams.getParentCorpName() != null) {
 			logger.debug("incoming parentCorpName :" + searchParams.getParentCorpName());
-			Predicate predicate = criteriaBuilder.equal(saltFormParent.get("corpName"), searchParams.getParentCorpName());
+			Predicate predicate = criteriaBuilder.equal(saltFormParent.get("corpName"),
+					searchParams.getParentCorpName());
 			predicateList.add(predicate);
 		}
 		if (searchParams.getFormattedCorpNameList() != null) {
@@ -276,62 +289,67 @@ public static TypedQuery<SaltForm> findSaltFormsByMeta(SearchFormDTO searchParam
 			logger.debug("incoming alias name : " + searchParams.getAlias());
 
 			if (searchParams.getAliasContSelect().equalsIgnoreCase("exact")) {
-            	Predicate parentAliasNotIgnored = criteriaBuilder.not(parentAliases.<Boolean>get("ignored"));
-                Predicate parentAliasNameEquals = criteriaBuilder.equal(criteriaBuilder.upper(parentAliases.<String>get("aliasName")), aliasName);
-                Predicate parentAliasPredicate = criteriaBuilder.and(parentAliasNotIgnored, parentAliasNameEquals);
-                Predicate lotAliasNotIgnored = criteriaBuilder.not(lotAliases.<Boolean>get("ignored"));
-                Predicate lotAliasNameEquals = criteriaBuilder.equal(criteriaBuilder.upper(lotAliases.<String>get("aliasName")), aliasName);
-                Predicate lotAliasPredicate = criteriaBuilder.and(lotAliasNotIgnored, lotAliasNameEquals);
-                predicate = criteriaBuilder.or(parentAliasPredicate, lotAliasPredicate);
-            } else {
-                aliasName = "%" + aliasName + "%";
-                logger.debug("looking for a like match on the alias   " + aliasName);
-                Predicate parentAliasNotIgnored = criteriaBuilder.not(parentAliases.<Boolean>get("ignored"));
-                Predicate parentAliasNameLike = criteriaBuilder.like(criteriaBuilder.upper(parentAliases.<String>get("aliasName")), aliasName);
-                Predicate parentAliasPredicate = criteriaBuilder.and(parentAliasNotIgnored, parentAliasNameLike);
-                Predicate lotAliasNotIgnored = criteriaBuilder.not(lotAliases.<Boolean>get("ignored"));
-                Predicate lotAliasNameLike = criteriaBuilder.like(criteriaBuilder.upper(lotAliases.<String>get("aliasName")), aliasName);
-                Predicate lotAliasPredicate = criteriaBuilder.and(lotAliasNotIgnored, lotAliasNameLike);
-                predicate = criteriaBuilder.or(parentAliasPredicate, lotAliasPredicate);
-            }
+				Predicate parentAliasNotIgnored = criteriaBuilder.not(parentAliases.<Boolean>get("ignored"));
+				Predicate parentAliasNameEquals = criteriaBuilder
+						.equal(criteriaBuilder.upper(parentAliases.<String>get("aliasName")), aliasName);
+				Predicate parentAliasPredicate = criteriaBuilder.and(parentAliasNotIgnored, parentAliasNameEquals);
+				Predicate lotAliasNotIgnored = criteriaBuilder.not(lotAliases.<Boolean>get("ignored"));
+				Predicate lotAliasNameEquals = criteriaBuilder
+						.equal(criteriaBuilder.upper(lotAliases.<String>get("aliasName")), aliasName);
+				Predicate lotAliasPredicate = criteriaBuilder.and(lotAliasNotIgnored, lotAliasNameEquals);
+				predicate = criteriaBuilder.or(parentAliasPredicate, lotAliasPredicate);
+			} else {
+				aliasName = "%" + aliasName + "%";
+				logger.debug("looking for a like match on the alias   " + aliasName);
+				Predicate parentAliasNotIgnored = criteriaBuilder.not(parentAliases.<Boolean>get("ignored"));
+				Predicate parentAliasNameLike = criteriaBuilder
+						.like(criteriaBuilder.upper(parentAliases.<String>get("aliasName")), aliasName);
+				Predicate parentAliasPredicate = criteriaBuilder.and(parentAliasNotIgnored, parentAliasNameLike);
+				Predicate lotAliasNotIgnored = criteriaBuilder.not(lotAliases.<Boolean>get("ignored"));
+				Predicate lotAliasNameLike = criteriaBuilder
+						.like(criteriaBuilder.upper(lotAliases.<String>get("aliasName")), aliasName);
+				Predicate lotAliasPredicate = criteriaBuilder.and(lotAliasNotIgnored, lotAliasNameLike);
+				predicate = criteriaBuilder.or(parentAliasPredicate, lotAliasPredicate);
+			}
 			logger.debug("aliasName: " + aliasName);
 			predicateList.add(predicate);
 		}
 
 		if (searchParams.getMinParentNumber() != null && searchParams.getMaxParentNumber() != null) {
 
-			Predicate predicate1 = criteriaBuilder.greaterThanOrEqualTo(saltFormParent.<Long>get("parentNumber"), minParent);
-			Predicate predicate2 = criteriaBuilder.lessThanOrEqualTo(saltFormParent.<Long>get("parentNumber"), maxParent);
+			Predicate predicate1 = criteriaBuilder.greaterThanOrEqualTo(saltFormParent.<Long>get("parentNumber"),
+					minParent);
+			Predicate predicate2 = criteriaBuilder.lessThanOrEqualTo(saltFormParent.<Long>get("parentNumber"),
+					maxParent);
 
-			
 			predicateList.add(predicate1);
 			predicateList.add(predicate2);
 			logger.debug("searching with parent min and max numbers " + searchParams.getMaxParentNumber());
 		}
 
-
 		predicates = predicateList.toArray(predicates);
 		criteria.where(criteriaBuilder.and(predicates));
 		TypedQuery<SaltForm> q = em.createQuery(criteria);
-		
+
 		if (searchParams.getMaxSynthDate() != null) {
 			q.setParameter(lastDate, searchParams.getMaxSynthDate(), TemporalType.DATE);
 		}
-		
+
 		if (searchParams.getMinSynthDate() != null) {
 			q.setParameter(firstDate, searchParams.getMinSynthDate(), TemporalType.DATE);
 		}
 
-
 		if (searchParams.getMinParentNumber() != null && searchParams.getMaxParentNumber() != null) {
 			q.setParameter(minParent, searchParams.getMinParentNumber());
 			q.setParameter(maxParent, searchParams.getMaxParentNumber());
-			logger.debug("searching with parent min and max numbers " + searchParams.getMinParentNumber() + " " +searchParams.getMaxParentNumber());
+			logger.debug("searching with parent min and max numbers " + searchParams.getMinParentNumber() + " "
+					+ searchParams.getMaxParentNumber());
 		}
-		
-//		int maxResult = 20;
-		if (searchParams.getMaxResults() != null) q.setMaxResults(searchParams.getMaxResults());
-		
+
+		// int maxResult = 20;
+		if (searchParams.getMaxResults() != null)
+			q.setMaxResults(searchParams.getMaxResults());
+
 		return q;
 	}
 
@@ -345,7 +363,7 @@ public static TypedQuery<SaltForm> findSaltFormsByParentAndMeta(Parent parent, S
 		Join<SaltForm, Parent> saltFormParent = saltFormRoot.join("parent");
 		Join<Parent, ParentAlias> parentAliases = saltFormParent.join("parentAliases", JoinType.LEFT);
 		criteria.select(saltFormRoot);
-//		criteria.distinct(true);
+		// criteria.distinct(true);
 
 		ParameterExpression<Date> firstDate = criteriaBuilder.parameter(Date.class);
 		ParameterExpression<Date> lastDate = criteriaBuilder.parameter(Date.class);
@@ -367,7 +385,8 @@ public static TypedQuery<SaltForm> findSaltFormsByParentAndMeta(Parent parent, S
 		}
 		if (searchParams.getMinSynthDate() != null) {
 			logger.debug("incoming minSynthesisDate :" + searchParams.getDateFrom());
-			Predicate predicate = criteriaBuilder.greaterThanOrEqualTo(saltFormLot.<Date>get("synthesisDate"), firstDate);
+			Predicate predicate = criteriaBuilder.greaterThanOrEqualTo(saltFormLot.<Date>get("synthesisDate"),
+					firstDate);
 			predicateList.add(predicate);
 		}
 		if (searchParams.getMaxSynthDate() != null) {
@@ -382,32 +401,38 @@ public static TypedQuery<SaltForm> findSaltFormsByParentAndMeta(Parent parent, S
 		}
 		if (searchParams.getSaltFormCorpName() != null) {
 			logger.debug("incoming saltFormCorpName :" + searchParams.getSaltFormCorpName());
-			Predicate predicate = criteriaBuilder.equal(saltFormRoot.get("corpName"), searchParams.getSaltFormCorpName());
+			Predicate predicate = criteriaBuilder.equal(saltFormRoot.get("corpName"),
+					searchParams.getSaltFormCorpName());
 			predicateList.add(predicate);
 		}
 		if (searchParams.getParentCorpName() != null) {
 			logger.debug("incoming parentCorpName :" + searchParams.getParentCorpName());
-			Predicate predicate = criteriaBuilder.equal(saltFormParent.get("corpName"), searchParams.getParentCorpName());
+			Predicate predicate = criteriaBuilder.equal(saltFormParent.get("corpName"),
+					searchParams.getParentCorpName());
 			predicateList.add(predicate);
 		}
 		if (searchParams.getAlias() != null && !searchParams.getAlias().equals("")) {
 			logger.debug("incoming alias name : " + searchParams.getAlias());
 			Predicate predicate = null;
-			
+
 			String aliasName = searchParams.getAlias().trim().toUpperCase();
 			logger.debug("aliasName: " + aliasName);
 
-			if (searchParams.getAliasContSelect().equals("exact")){
-				predicate = criteriaBuilder.equal(criteriaBuilder.upper(parentAliases.<String>get("aliasName")), aliasName.toUpperCase());
+			if (searchParams.getAliasContSelect().equals("exact")) {
+				predicate = criteriaBuilder.equal(criteriaBuilder.upper(parentAliases.<String>get("aliasName")),
+						aliasName.toUpperCase());
 			} else {
 				aliasName = "%" + aliasName + "%";
-				predicate = criteriaBuilder.like(criteriaBuilder.upper(parentAliases.<String>get("aliasName")), aliasName);				
+				predicate = criteriaBuilder.like(criteriaBuilder.upper(parentAliases.<String>get("aliasName")),
+						aliasName);
 			}
 			predicateList.add(predicate);
 		}
 		if (searchParams.getMinParentNumber() != null && searchParams.getMaxParentNumber() != null) {
-			Predicate predicate1 = criteriaBuilder.greaterThanOrEqualTo(saltFormParent.<Long>get("parentNumber"), searchParams.getMinParentNumber());
-			Predicate predicate2 = criteriaBuilder.lessThanOrEqualTo(saltFormParent.<Long>get("parentNumber"), searchParams.getMaxParentNumber());
+			Predicate predicate1 = criteriaBuilder.greaterThanOrEqualTo(saltFormParent.<Long>get("parentNumber"),
+					searchParams.getMinParentNumber());
+			Predicate predicate2 = criteriaBuilder.lessThanOrEqualTo(saltFormParent.<Long>get("parentNumber"),
+					searchParams.getMaxParentNumber());
 			predicateList.add(predicate1);
 			predicateList.add(predicate2);
 		}
@@ -421,8 +446,9 @@ public static TypedQuery<SaltForm> findSaltFormsByParentAndMeta(Parent parent, S
 		if (searchParams.getMinSynthDate() != null) {
 			q.setParameter(firstDate, searchParams.getMinSynthDate(), TemporalType.DATE);
 		}
-		
-		if (searchParams.getMaxResults() != null) q.setMaxResults(searchParams.getMaxResults());
+
+		if (searchParams.getMaxResults() != null)
+			q.setMaxResults(searchParams.getMaxResults());
 
 		return q;
 	}
@@ -438,7 +464,7 @@ public static List<Long> findSaltFormIDsByParentAndMeta(Parent parent, SearchFor
 		Join<Parent, ParentAlias> parentAliases = saltFormParent.join("parentAliases", JoinType.LEFT);
 		criteria.select(saltFormRoot.<Long>get("id"));
 		criteria.distinct(true);
-		
+
 		ParameterExpression<Date> firstDate = criteriaBuilder.parameter(Date.class);
 		ParameterExpression<Date> lastDate = criteriaBuilder.parameter(Date.class);
 		Predicate[] predicates = new Predicate[0];
@@ -459,7 +485,8 @@ public static List<Long> findSaltFormIDsByParentAndMeta(Parent parent, SearchFor
 		}
 		if (searchParams.getMinSynthDate() != null) {
 			logger.debug("incoming minSynthesisDate :" + searchParams.getDateFrom());
-			Predicate predicate = criteriaBuilder.greaterThanOrEqualTo(saltFormLot.<Date>get("synthesisDate"), firstDate);
+			Predicate predicate = criteriaBuilder.greaterThanOrEqualTo(saltFormLot.<Date>get("synthesisDate"),
+					firstDate);
 			predicateList.add(predicate);
 		}
 		if (searchParams.getMaxSynthDate() != null) {
@@ -474,12 +501,14 @@ public static List<Long> findSaltFormIDsByParentAndMeta(Parent parent, SearchFor
 		}
 		if (searchParams.getSaltFormCorpName() != null) {
 			logger.debug("incoming saltFormCorpName :" + searchParams.getSaltFormCorpName());
-			Predicate predicate = criteriaBuilder.equal(saltFormRoot.get("corpName"), searchParams.getSaltFormCorpName());
+			Predicate predicate = criteriaBuilder.equal(saltFormRoot.get("corpName"),
+					searchParams.getSaltFormCorpName());
 			predicateList.add(predicate);
 		}
 		if (searchParams.getParentCorpName() != null) {
 			logger.debug("incoming parentCorpName :" + searchParams.getParentCorpName());
-			Predicate predicate = criteriaBuilder.equal(saltFormParent.get("corpName"), searchParams.getParentCorpName());
+			Predicate predicate = criteriaBuilder.equal(saltFormParent.get("corpName"),
+					searchParams.getParentCorpName());
 			predicateList.add(predicate);
 		}
 		if (searchParams.getAlias() != null && !searchParams.getAlias().equals("")) {
@@ -487,18 +516,21 @@ public static List<Long> findSaltFormIDsByParentAndMeta(Parent parent, SearchFor
 			String aliasName = searchParams.getAlias().trim().toUpperCase();
 			logger.debug("incoming alias name :" + searchParams.getAlias());
 
-			if (searchParams.getAliasContSelect().equals("exact")){
-				predicate = criteriaBuilder.equal(parentAliases.<String>get("aliasName"), aliasName);				
+			if (searchParams.getAliasContSelect().equals("exact")) {
+				predicate = criteriaBuilder.equal(parentAliases.<String>get("aliasName"), aliasName);
 			} else {
 				aliasName = "%" + aliasName + "%";
-				predicate = criteriaBuilder.like(criteriaBuilder.upper(parentAliases.<String>get("aliasName")), aliasName);				
+				predicate = criteriaBuilder.like(criteriaBuilder.upper(parentAliases.<String>get("aliasName")),
+						aliasName);
 			}
 			predicateList.add(predicate);
 		}
 
 		if (searchParams.getMinParentNumber() != null && searchParams.getMaxParentNumber() != null) {
-			Predicate predicate1 = criteriaBuilder.greaterThanOrEqualTo(saltFormParent.<Long>get("parentNumber"), searchParams.getMinParentNumber());
-			Predicate predicate2 = criteriaBuilder.lessThanOrEqualTo(saltFormParent.<Long>get("parentNumber"), searchParams.getMaxParentNumber());
+			Predicate predicate1 = criteriaBuilder.greaterThanOrEqualTo(saltFormParent.<Long>get("parentNumber"),
+					searchParams.getMinParentNumber());
+			Predicate predicate2 = criteriaBuilder.lessThanOrEqualTo(saltFormParent.<Long>get("parentNumber"),
+					searchParams.getMaxParentNumber());
 			predicateList.add(predicate1);
 			predicateList.add(predicate2);
 		}
@@ -512,444 +544,477 @@ public static List<Long> findSaltFormIDsByParentAndMeta(Parent parent, SearchFor
 		if (searchParams.getMinSynthDate() != null) {
 			q.setParameter(firstDate, searchParams.getMinSynthDate(), TemporalType.DATE);
 		}
-		
-		if (searchParams.getMaxResults() != null) q.setMaxResults(searchParams.getMaxResults());
+
+		if (searchParams.getMaxResults() != null)
+			q.setMaxResults(searchParams.getMaxResults());
 
 		return q.getResultList();
 	}
 
 	@Transactional
-    public static long countSaltForms() {
-        return SaltForm.entityManager().createQuery("SELECT COUNT(o) FROM SaltForm o", Long.class).getSingleResult();
-    }
-    
+	public static long countSaltForms() {
+		return SaltForm.entityManager().createQuery("SELECT COUNT(o) FROM SaltForm o", Long.class).getSingleResult();
+	}
+
 	@Transactional
-    public static List<SaltForm> findAllSaltForms() {
-        return SaltForm.entityManager().createQuery("SELECT o FROM SaltForm o", SaltForm.class).getResultList();
-    }
-    
+	public static List<SaltForm> findAllSaltForms() {
+		return SaltForm.entityManager().createQuery("SELECT o FROM SaltForm o", SaltForm.class).getResultList();
+	}
+
 	@Transactional
-    public static SaltForm findSaltForm(Long id) {
-        if (id == null) return null;
-        return SaltForm.entityManager().find(SaltForm.class, id);
-    }
-    
+	public static SaltForm findSaltForm(Long id) {
+		if (id == null)
+			return null;
+		return SaltForm.entityManager().find(SaltForm.class, id);
+	}
+
 	@Transactional
-    public static List<SaltForm> findSaltFormEntries(int firstResult, int maxResults) {
-        return SaltForm.entityManager().createQuery("SELECT o FROM SaltForm o", SaltForm.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
+	public static List<SaltForm> findSaltFormEntries(int firstResult, int maxResults) {
+		return SaltForm.entityManager().createQuery("SELECT o FROM SaltForm o", SaltForm.class)
+				.setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+	}
+
 	@Override
 	public int compareTo(Object otherSalt) {
 
-        if(!(otherSalt instanceof SaltForm)){
-            throw new ClassCastException("Invalid object");
-        }
-        
-        long salt2 = ((SaltForm) otherSalt).getId();
-       
-        if(this.getId() > salt2)    
-            return 1;
-        else if ( this.getId() < salt2 )
-            return -1;
-        else
-            return 0;
-	}
+		if (!(otherSalt instanceof SaltForm)) {
+			throw new ClassCastException("Invalid object");
+		}
 
+		long salt2 = ((SaltForm) otherSalt).getId();
+
+		if (this.getId() > salt2)
+			return 1;
+		else if (this.getId() < salt2)
+			return -1;
+		else
+			return 0;
+	}
 
 	public String toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(this);
+	}
 
 	public String toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(this);
+	}
 
 	public static SaltForm fromJsonToSaltForm(String json) {
-        return new JSONDeserializer<SaltForm>()
-        .use(null, SaltForm.class).deserialize(json);
-    }
+		return new JSONDeserializer<SaltForm>()
+				.use(null, SaltForm.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<SaltForm> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<SaltForm> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<SaltForm> fromJsonArrayToSaltForms(String json) {
-        return new JSONDeserializer<List<SaltForm>>()
-        .use("values", SaltForm.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<SaltForm>>()
+				.use("values", SaltForm.class).deserialize(json);
+	}
 
 	@Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long id;
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	@Column(name = "id")
+	private Long id;
 
 	@Version
-    @Column(name = "version")
-    private Integer version;
+	@Column(name = "version")
+	private Integer version;
 
 	public Long getId() {
-        return this.id;
-    }
+		return this.id;
+	}
 
 	public void setId(Long id) {
-        this.id = id;
-    }
+		this.id = id;
+	}
 
 	public Integer getVersion() {
-        return this.version;
-    }
+		return this.version;
+	}
 
 	public void setVersion(Integer version) {
-        this.version = version;
-    }
+		this.version = version;
+	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 
 	@PersistenceContext
-    transient EntityManager entityManager;
+	transient EntityManager entityManager;
 
 	public static final EntityManager entityManager() {
-        EntityManager em = new SaltForm().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
+		EntityManager em = new SaltForm().entityManager;
+		if (em == null)
+			throw new IllegalStateException(
+					"Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+		return em;
+	}
 
 	public static List<SaltForm> findAllSaltForms(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM SaltForm o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, SaltForm.class).getResultList();
-    }
-
-	public static List<SaltForm> findSaltFormEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM SaltForm o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, SaltForm.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
+		String jpaQuery = "SELECT o FROM SaltForm o";
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				jpaQuery = jpaQuery + " " + sortOrder;
+			}
+		}
+		return entityManager().createQuery(jpaQuery, SaltForm.class).getResultList();
+	}
+
+	public static List<SaltForm> findSaltFormEntries(int firstResult, int maxResults, String sortFieldName,
+			String sortOrder) {
+		String jpaQuery = "SELECT o FROM SaltForm o";
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				jpaQuery = jpaQuery + " " + sortOrder;
+			}
+		}
+		return entityManager().createQuery(jpaQuery, SaltForm.class).setFirstResult(firstResult)
+				.setMaxResults(maxResults).getResultList();
+	}
 
 	@Transactional
-    public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
+	public void persist() {
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
+		this.entityManager.persist(this);
+	}
 
 	@Transactional
-    public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            SaltForm attached = SaltForm.findSaltForm(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
+	public void remove() {
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
+		if (this.entityManager.contains(this)) {
+			this.entityManager.remove(this);
+		} else {
+			SaltForm attached = SaltForm.findSaltForm(this.id);
+			this.entityManager.remove(attached);
+		}
+	}
 
 	@Transactional
-    public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
+	public void flush() {
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
+		this.entityManager.flush();
+	}
 
 	@Transactional
-    public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
+	public void clear() {
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
+		this.entityManager.clear();
+	}
 
 	@Transactional
-    public SaltForm merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        SaltForm merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
+	public SaltForm merge() {
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
+		SaltForm merged = this.entityManager.merge(this);
+		this.entityManager.flush();
+		return merged;
+	}
 
 	public String getMolStructure() {
-        return this.molStructure;
-    }
+		return this.molStructure;
+	}
 
 	public void setMolStructure(String molStructure) {
-        this.molStructure = molStructure;
-    }
+		this.molStructure = molStructure;
+	}
 
 	public String getCorpName() {
-        return this.corpName;
-    }
+		return this.corpName;
+	}
 
 	public void setCorpName(String corpName) {
-        this.corpName = corpName;
-    }
+		this.corpName = corpName;
+	}
 
 	public String getCasNumber() {
-        return this.casNumber;
-    }
+		return this.casNumber;
+	}
 
 	public void setCasNumber(String casNumber) {
-        this.casNumber = casNumber;
-    }
+		this.casNumber = casNumber;
+	}
 
 	public String getChemist() {
-        return this.chemist;
-    }
+		return this.chemist;
+	}
 
 	public void setChemist(String chemist) {
-        this.chemist = chemist;
-    }
+		this.chemist = chemist;
+	}
 
 	public Date getRegistrationDate() {
-        return this.registrationDate;
-    }
+		return this.registrationDate;
+	}
 
 	public void setRegistrationDate(Date registrationDate) {
-        this.registrationDate = registrationDate;
-    }
+		this.registrationDate = registrationDate;
+	}
 
 	public int getCdId() {
-        return this.CdId;
-    }
+		return this.CdId;
+	}
 
 	public void setCdId(int CdId) {
-        this.CdId = CdId;
-    }
+		this.CdId = CdId;
+	}
 
 	public Boolean getIgnore() {
-        return this.ignore;
-    }
+		return this.ignore;
+	}
 
 	public void setIgnore(Boolean ignore) {
-        this.ignore = ignore;
-    }
+		this.ignore = ignore;
+	}
 
 	public Double getSaltWeight() {
-        return this.saltWeight;
-    }
+		return this.saltWeight;
+	}
 
 	public void setSaltWeight(Double saltWeight) {
-        this.saltWeight = saltWeight;
-    }
+		this.saltWeight = saltWeight;
+	}
 
 	public Parent getParent() {
-        return this.parent;
-    }
+		return this.parent;
+	}
 
 	public void setParent(Parent parent) {
-        this.parent = parent;
-    }
+		this.parent = parent;
+	}
 
 	public Set<Lot> getLots() {
-        return this.lots;
-    }
+		return this.lots;
+	}
 
 	public void setLots(Set<Lot> lots) {
-        this.lots = lots;
-    }
+		this.lots = lots;
+	}
 
 	public Set<IsoSalt> getIsoSalts() {
-        return this.isoSalts;
-    }
+		return this.isoSalts;
+	}
 
 	public void setIsoSalts(Set<IsoSalt> isoSalts) {
-        this.isoSalts = isoSalts;
-    }
+		this.isoSalts = isoSalts;
+	}
 
 	public BulkLoadFile getBulkLoadFile() {
-        return this.bulkLoadFile;
-    }
+		return this.bulkLoadFile;
+	}
 
 	public void setBulkLoadFile(BulkLoadFile bulkLoadFile) {
-        this.bulkLoadFile = bulkLoadFile;
-    }
+		this.bulkLoadFile = bulkLoadFile;
+	}
 
 	public static Long countFindSaltFormsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile) {
-        if (bulkLoadFile == null) throw new IllegalArgumentException("The bulkLoadFile argument is required");
-        EntityManager em = SaltForm.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SaltForm AS o WHERE o.bulkLoadFile = :bulkLoadFile", Long.class);
-        q.setParameter("bulkLoadFile", bulkLoadFile);
-        return ((Long) q.getSingleResult());
-    }
+		if (bulkLoadFile == null)
+			throw new IllegalArgumentException("The bulkLoadFile argument is required");
+		EntityManager em = SaltForm.entityManager();
+		TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SaltForm AS o WHERE o.bulkLoadFile = :bulkLoadFile",
+				Long.class);
+		q.setParameter("bulkLoadFile", bulkLoadFile);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static Long countFindSaltFormsByCdId(int CdId) {
-        EntityManager em = SaltForm.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SaltForm AS o WHERE o.CdId = :CdId", Long.class);
-        q.setParameter("CdId", CdId);
-        return ((Long) q.getSingleResult());
-    }
+		EntityManager em = SaltForm.entityManager();
+		TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SaltForm AS o WHERE o.CdId = :CdId", Long.class);
+		q.setParameter("CdId", CdId);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static Long countFindSaltFormsByCorpNameEquals(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        EntityManager em = SaltForm.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SaltForm AS o WHERE o.corpName = :corpName", Long.class);
-        q.setParameter("corpName", corpName);
-        return ((Long) q.getSingleResult());
-    }
+		if (corpName == null || corpName.length() == 0)
+			throw new IllegalArgumentException("The corpName argument is required");
+		EntityManager em = SaltForm.entityManager();
+		TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SaltForm AS o WHERE o.corpName = :corpName", Long.class);
+		q.setParameter("corpName", corpName);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static Long countFindSaltFormsByCorpNameLike(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        corpName = corpName.replace('*', '%');
-        if (corpName.charAt(0) != '%') {
-            corpName = "%" + corpName;
-        }
-        if (corpName.charAt(corpName.length() - 1) != '%') {
-            corpName = corpName + "%";
-        }
-        EntityManager em = SaltForm.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SaltForm AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)", Long.class);
-        q.setParameter("corpName", corpName);
-        return ((Long) q.getSingleResult());
-    }
+		if (corpName == null || corpName.length() == 0)
+			throw new IllegalArgumentException("The corpName argument is required");
+		corpName = corpName.replace('*', '%');
+		if (corpName.charAt(0) != '%') {
+			corpName = "%" + corpName;
+		}
+		if (corpName.charAt(corpName.length() - 1) != '%') {
+			corpName = corpName + "%";
+		}
+		EntityManager em = SaltForm.entityManager();
+		TypedQuery q = em.createQuery(
+				"SELECT COUNT(o) FROM SaltForm AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)", Long.class);
+		q.setParameter("corpName", corpName);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static Long countFindSaltFormsByParent(Parent parent) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
-        EntityManager em = SaltForm.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SaltForm AS o WHERE o.parent = :parent", Long.class);
-        q.setParameter("parent", parent);
-        return ((Long) q.getSingleResult());
-    }
+		if (parent == null)
+			throw new IllegalArgumentException("The parent argument is required");
+		EntityManager em = SaltForm.entityManager();
+		TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SaltForm AS o WHERE o.parent = :parent", Long.class);
+		q.setParameter("parent", parent);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static TypedQuery<SaltForm> findSaltFormsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile) {
-        if (bulkLoadFile == null) throw new IllegalArgumentException("The bulkLoadFile argument is required");
-        EntityManager em = SaltForm.entityManager();
-        TypedQuery<SaltForm> q = em.createQuery("SELECT o FROM SaltForm AS o WHERE o.bulkLoadFile = :bulkLoadFile", SaltForm.class);
-        q.setParameter("bulkLoadFile", bulkLoadFile);
-        return q;
-    }
-
-	public static TypedQuery<SaltForm> findSaltFormsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile, String sortFieldName, String sortOrder) {
-        if (bulkLoadFile == null) throw new IllegalArgumentException("The bulkLoadFile argument is required");
-        EntityManager em = SaltForm.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SaltForm AS o WHERE o.bulkLoadFile = :bulkLoadFile");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<SaltForm> q = em.createQuery(queryBuilder.toString(), SaltForm.class);
-        q.setParameter("bulkLoadFile", bulkLoadFile);
-        return q;
-    }
+		if (bulkLoadFile == null)
+			throw new IllegalArgumentException("The bulkLoadFile argument is required");
+		EntityManager em = SaltForm.entityManager();
+		TypedQuery<SaltForm> q = em.createQuery("SELECT o FROM SaltForm AS o WHERE o.bulkLoadFile = :bulkLoadFile",
+				SaltForm.class);
+		q.setParameter("bulkLoadFile", bulkLoadFile);
+		return q;
+	}
+
+	public static TypedQuery<SaltForm> findSaltFormsByBulkLoadFileEquals(BulkLoadFile bulkLoadFile,
+			String sortFieldName, String sortOrder) {
+		if (bulkLoadFile == null)
+			throw new IllegalArgumentException("The bulkLoadFile argument is required");
+		EntityManager em = SaltForm.entityManager();
+		StringBuilder queryBuilder = new StringBuilder(
+				"SELECT o FROM SaltForm AS o WHERE o.bulkLoadFile = :bulkLoadFile");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<SaltForm> q = em.createQuery(queryBuilder.toString(), SaltForm.class);
+		q.setParameter("bulkLoadFile", bulkLoadFile);
+		return q;
+	}
 
 	public static TypedQuery<SaltForm> findSaltFormsByCdId(int CdId) {
-        EntityManager em = SaltForm.entityManager();
-        TypedQuery<SaltForm> q = em.createQuery("SELECT o FROM SaltForm AS o WHERE o.CdId = :CdId", SaltForm.class);
-        q.setParameter("CdId", CdId);
-        return q;
-    }
+		EntityManager em = SaltForm.entityManager();
+		TypedQuery<SaltForm> q = em.createQuery("SELECT o FROM SaltForm AS o WHERE o.CdId = :CdId", SaltForm.class);
+		q.setParameter("CdId", CdId);
+		return q;
+	}
 
 	public static TypedQuery<SaltForm> findSaltFormsByCdId(int CdId, String sortFieldName, String sortOrder) {
-        EntityManager em = SaltForm.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SaltForm AS o WHERE o.CdId = :CdId");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<SaltForm> q = em.createQuery(queryBuilder.toString(), SaltForm.class);
-        q.setParameter("CdId", CdId);
-        return q;
-    }
+		EntityManager em = SaltForm.entityManager();
+		StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SaltForm AS o WHERE o.CdId = :CdId");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<SaltForm> q = em.createQuery(queryBuilder.toString(), SaltForm.class);
+		q.setParameter("CdId", CdId);
+		return q;
+	}
 
 	public static TypedQuery<SaltForm> findSaltFormsByCorpNameEquals(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        EntityManager em = SaltForm.entityManager();
-        TypedQuery<SaltForm> q = em.createQuery("SELECT o FROM SaltForm AS o WHERE o.corpName = :corpName", SaltForm.class);
-        q.setParameter("corpName", corpName);
-        return q;
-    }
-
-	public static TypedQuery<SaltForm> findSaltFormsByCorpNameEquals(String corpName, String sortFieldName, String sortOrder) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        EntityManager em = SaltForm.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SaltForm AS o WHERE o.corpName = :corpName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<SaltForm> q = em.createQuery(queryBuilder.toString(), SaltForm.class);
-        q.setParameter("corpName", corpName);
-        return q;
-    }
+		if (corpName == null || corpName.length() == 0)
+			throw new IllegalArgumentException("The corpName argument is required");
+		EntityManager em = SaltForm.entityManager();
+		TypedQuery<SaltForm> q = em.createQuery("SELECT o FROM SaltForm AS o WHERE o.corpName = :corpName",
+				SaltForm.class);
+		q.setParameter("corpName", corpName);
+		return q;
+	}
+
+	public static TypedQuery<SaltForm> findSaltFormsByCorpNameEquals(String corpName, String sortFieldName,
+			String sortOrder) {
+		if (corpName == null || corpName.length() == 0)
+			throw new IllegalArgumentException("The corpName argument is required");
+		EntityManager em = SaltForm.entityManager();
+		StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SaltForm AS o WHERE o.corpName = :corpName");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<SaltForm> q = em.createQuery(queryBuilder.toString(), SaltForm.class);
+		q.setParameter("corpName", corpName);
+		return q;
+	}
 
 	public static TypedQuery<SaltForm> findSaltFormsByCorpNameLike(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        corpName = corpName.replace('*', '%');
-        if (corpName.charAt(0) != '%') {
-            corpName = "%" + corpName;
-        }
-        if (corpName.charAt(corpName.length() - 1) != '%') {
-            corpName = corpName + "%";
-        }
-        EntityManager em = SaltForm.entityManager();
-        TypedQuery<SaltForm> q = em.createQuery("SELECT o FROM SaltForm AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)", SaltForm.class);
-        q.setParameter("corpName", corpName);
-        return q;
-    }
-
-	public static TypedQuery<SaltForm> findSaltFormsByCorpNameLike(String corpName, String sortFieldName, String sortOrder) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        corpName = corpName.replace('*', '%');
-        if (corpName.charAt(0) != '%') {
-            corpName = "%" + corpName;
-        }
-        if (corpName.charAt(corpName.length() - 1) != '%') {
-            corpName = corpName + "%";
-        }
-        EntityManager em = SaltForm.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SaltForm AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<SaltForm> q = em.createQuery(queryBuilder.toString(), SaltForm.class);
-        q.setParameter("corpName", corpName);
-        return q;
-    }
+		if (corpName == null || corpName.length() == 0)
+			throw new IllegalArgumentException("The corpName argument is required");
+		corpName = corpName.replace('*', '%');
+		if (corpName.charAt(0) != '%') {
+			corpName = "%" + corpName;
+		}
+		if (corpName.charAt(corpName.length() - 1) != '%') {
+			corpName = corpName + "%";
+		}
+		EntityManager em = SaltForm.entityManager();
+		TypedQuery<SaltForm> q = em.createQuery(
+				"SELECT o FROM SaltForm AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)", SaltForm.class);
+		q.setParameter("corpName", corpName);
+		return q;
+	}
+
+	public static TypedQuery<SaltForm> findSaltFormsByCorpNameLike(String corpName, String sortFieldName,
+			String sortOrder) {
+		if (corpName == null || corpName.length() == 0)
+			throw new IllegalArgumentException("The corpName argument is required");
+		corpName = corpName.replace('*', '%');
+		if (corpName.charAt(0) != '%') {
+			corpName = "%" + corpName;
+		}
+		if (corpName.charAt(corpName.length() - 1) != '%') {
+			corpName = corpName + "%";
+		}
+		EntityManager em = SaltForm.entityManager();
+		StringBuilder queryBuilder = new StringBuilder(
+				"SELECT o FROM SaltForm AS o WHERE LOWER(o.corpName) LIKE LOWER(:corpName)");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<SaltForm> q = em.createQuery(queryBuilder.toString(), SaltForm.class);
+		q.setParameter("corpName", corpName);
+		return q;
+	}
 
 	public static TypedQuery<SaltForm> findSaltFormsByParent(Parent parent) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
-        EntityManager em = SaltForm.entityManager();
-        TypedQuery<SaltForm> q = em.createQuery("SELECT o FROM SaltForm AS o WHERE o.parent = :parent", SaltForm.class);
-        q.setParameter("parent", parent);
-        return q;
-    }
+		if (parent == null)
+			throw new IllegalArgumentException("The parent argument is required");
+		EntityManager em = SaltForm.entityManager();
+		TypedQuery<SaltForm> q = em.createQuery("SELECT o FROM SaltForm AS o WHERE o.parent = :parent", SaltForm.class);
+		q.setParameter("parent", parent);
+		return q;
+	}
 
 	public static TypedQuery<SaltForm> findSaltFormsByParent(Parent parent, String sortFieldName, String sortOrder) {
-        if (parent == null) throw new IllegalArgumentException("The parent argument is required");
-        EntityManager em = SaltForm.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SaltForm AS o WHERE o.parent = :parent");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<SaltForm> q = em.createQuery(queryBuilder.toString(), SaltForm.class);
-        q.setParameter("parent", parent);
-        return q;
-    }
+		if (parent == null)
+			throw new IllegalArgumentException("The parent argument is required");
+		EntityManager em = SaltForm.entityManager();
+		StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SaltForm AS o WHERE o.parent = :parent");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<SaltForm> q = em.createQuery(queryBuilder.toString(), SaltForm.class);
+		q.setParameter("parent", parent);
+		return q;
+	}
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAlias.java b/src/main/java/com/labsynch/labseer/domain/SaltFormAlias.java
index 739b54b79..eebc8d6f2 100644
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAlias.java
+++ b/src/main/java/com/labsynch/labseer/domain/SaltFormAlias.java
@@ -33,122 +33,143 @@
 
 public class SaltFormAlias {
 
-	private static final Logger logger = LoggerFactory.getLogger(SaltFormAlias.class);
-	
-	@ManyToOne
-    @org.hibernate.annotations.Index(name="SaltFormAlias_SaltForm_IDX")
-	@JoinColumn(name = "salt_form")
-	private SaltForm saltForm;
-	
+    private static final Logger logger = LoggerFactory.getLogger(SaltFormAlias.class);
+
+    @ManyToOne
+    @org.hibernate.annotations.Index(name = "SaltFormAlias_SaltForm_IDX")
+    @JoinColumn(name = "salt_form")
+    private SaltForm saltForm;
+
     private String lsType;
 
     private String lsKind;
-    
+
     private String aliasName;
-    
-	private boolean preferred;
-	
-	private boolean ignored;
-	
-	private boolean deleted;
-    
-	public SaltFormAlias(){
-	}
-	
-	public SaltFormAlias(SaltForm saltForm, String lsType, String lsKind, String aliasName, boolean preferred){
-		this.saltForm = saltForm;
-		this.lsType = lsType;
-		this.lsKind = lsKind;
-		this.aliasName = aliasName;
-		this.preferred = preferred;
-	}
-	
-	public SaltFormAlias(SaltFormAliasDTO saltFormAliasDTO) throws SaltFormNotFoundException{
-		try{
-			SaltForm saltForm = SaltForm.findSaltFormsByCorpNameEquals(saltFormAliasDTO.getSaltFormCorpName()).getSingleResult();
-			this.saltForm = saltForm;
-		}catch (Exception e){
-			logger.error("SaltForm"+saltFormAliasDTO.getSaltFormCorpName()+" could not be found.",e);
-			throw new SaltFormNotFoundException("SaltForm "+saltFormAliasDTO.getSaltFormCorpName()+" could not be found.");
-		}
-		this.lsType = saltFormAliasDTO.getLsType();
-		this.lsKind = saltFormAliasDTO.getLsKind();
-		this.aliasName = saltFormAliasDTO.getAliasName();
-		this.preferred = saltFormAliasDTO.isPreferred();
-	}
-
-	public String toJson() {
+
+    private boolean preferred;
+
+    private boolean ignored;
+
+    private boolean deleted;
+
+    public SaltFormAlias() {
+    }
+
+    public SaltFormAlias(SaltForm saltForm, String lsType, String lsKind, String aliasName, boolean preferred) {
+        this.saltForm = saltForm;
+        this.lsType = lsType;
+        this.lsKind = lsKind;
+        this.aliasName = aliasName;
+        this.preferred = preferred;
+    }
+
+    public SaltFormAlias(SaltFormAliasDTO saltFormAliasDTO) throws SaltFormNotFoundException {
+        try {
+            SaltForm saltForm = SaltForm.findSaltFormsByCorpNameEquals(saltFormAliasDTO.getSaltFormCorpName())
+                    .getSingleResult();
+            this.saltForm = saltForm;
+        } catch (Exception e) {
+            logger.error("SaltForm" + saltFormAliasDTO.getSaltFormCorpName() + " could not be found.", e);
+            throw new SaltFormNotFoundException(
+                    "SaltForm " + saltFormAliasDTO.getSaltFormCorpName() + " could not be found.");
+        }
+        this.lsType = saltFormAliasDTO.getLsType();
+        this.lsKind = saltFormAliasDTO.getLsKind();
+        this.aliasName = saltFormAliasDTO.getAliasName();
+        this.preferred = saltFormAliasDTO.isPreferred();
+    }
+
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static SaltFormAlias fromJsonToSaltFormAlias(String json) {
+    public static SaltFormAlias fromJsonToSaltFormAlias(String json) {
         return new JSONDeserializer<SaltFormAlias>()
-        .use(null, SaltFormAlias.class).deserialize(json);
+                .use(null, SaltFormAlias.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<SaltFormAlias> collection) {
+    public static String toJsonArray(Collection<SaltFormAlias> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<SaltFormAlias> collection, String[] fields) {
+    public static String toJsonArray(Collection<SaltFormAlias> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<SaltFormAlias> fromJsonArrayToSaltFormAliases(String json) {
+    public static Collection<SaltFormAlias> fromJsonArrayToSaltFormAliases(String json) {
         return new JSONDeserializer<List<SaltFormAlias>>()
-        .use("values", SaltFormAlias.class).deserialize(json);
+                .use("values", SaltFormAlias.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static Long countFindSaltFormAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName, String lsType, String lsKind) {
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static Long countFindSaltFormAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName,
+            String lsType, String lsKind) {
+        if (aliasName == null || aliasName.length() == 0)
+            throw new IllegalArgumentException("The aliasName argument is required");
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = SaltFormAlias.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SaltFormAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM SaltFormAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind",
+                Long.class);
         q.setParameter("aliasName", aliasName);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindSaltFormAliasesBySaltForm(SaltForm saltForm) {
-        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
+    public static Long countFindSaltFormAliasesBySaltForm(SaltForm saltForm) {
+        if (saltForm == null)
+            throw new IllegalArgumentException("The saltForm argument is required");
         EntityManager em = SaltFormAlias.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SaltFormAlias AS o WHERE o.saltForm = :saltForm", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SaltFormAlias AS o WHERE o.saltForm = :saltForm",
+                Long.class);
         q.setParameter("saltForm", saltForm);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<SaltFormAlias> findSaltFormAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName, String lsType, String lsKind) {
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<SaltFormAlias> findSaltFormAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(
+            String aliasName, String lsType, String lsKind) {
+        if (aliasName == null || aliasName.length() == 0)
+            throw new IllegalArgumentException("The aliasName argument is required");
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = SaltFormAlias.entityManager();
-        TypedQuery<SaltFormAlias> q = em.createQuery("SELECT o FROM SaltFormAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind", SaltFormAlias.class);
+        TypedQuery<SaltFormAlias> q = em.createQuery(
+                "SELECT o FROM SaltFormAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind",
+                SaltFormAlias.class);
         q.setParameter("aliasName", aliasName);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         return q;
     }
 
-	public static TypedQuery<SaltFormAlias> findSaltFormAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(String aliasName, String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (aliasName == null || aliasName.length() == 0) throw new IllegalArgumentException("The aliasName argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
+    public static TypedQuery<SaltFormAlias> findSaltFormAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(
+            String aliasName, String lsType, String lsKind, String sortFieldName, String sortOrder) {
+        if (aliasName == null || aliasName.length() == 0)
+            throw new IllegalArgumentException("The aliasName argument is required");
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
         EntityManager em = SaltFormAlias.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SaltFormAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM SaltFormAlias AS o WHERE o.aliasName = :aliasName  AND o.lsType = :lsType  AND o.lsKind = :lsKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -162,16 +183,20 @@ public static TypedQuery<SaltFormAlias> findSaltFormAliasesByAliasNameEqualsAndL
         return q;
     }
 
-	public static TypedQuery<SaltFormAlias> findSaltFormAliasesBySaltForm(SaltForm saltForm) {
-        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
+    public static TypedQuery<SaltFormAlias> findSaltFormAliasesBySaltForm(SaltForm saltForm) {
+        if (saltForm == null)
+            throw new IllegalArgumentException("The saltForm argument is required");
         EntityManager em = SaltFormAlias.entityManager();
-        TypedQuery<SaltFormAlias> q = em.createQuery("SELECT o FROM SaltFormAlias AS o WHERE o.saltForm = :saltForm", SaltFormAlias.class);
+        TypedQuery<SaltFormAlias> q = em.createQuery("SELECT o FROM SaltFormAlias AS o WHERE o.saltForm = :saltForm",
+                SaltFormAlias.class);
         q.setParameter("saltForm", saltForm);
         return q;
     }
 
-	public static TypedQuery<SaltFormAlias> findSaltFormAliasesBySaltForm(SaltForm saltForm, String sortFieldName, String sortOrder) {
-        if (saltForm == null) throw new IllegalArgumentException("The saltForm argument is required");
+    public static TypedQuery<SaltFormAlias> findSaltFormAliasesBySaltForm(SaltForm saltForm, String sortFieldName,
+            String sortOrder) {
+        if (saltForm == null)
+            throw new IllegalArgumentException("The saltForm argument is required");
         EntityManager em = SaltFormAlias.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SaltFormAlias AS o WHERE o.saltForm = :saltForm");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -185,26 +210,29 @@ public static TypedQuery<SaltFormAlias> findSaltFormAliasesBySaltForm(SaltForm s
         return q;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "saltForm", "lsType", "lsKind", "aliasName", "preferred", "ignored", "deleted");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "saltForm",
+            "lsType", "lsKind", "aliasName", "preferred", "ignored", "deleted");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new SaltFormAlias().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countSaltFormAliases() {
+    public static long countSaltFormAliases() {
         return entityManager().createQuery("SELECT COUNT(o) FROM SaltFormAlias o", Long.class).getSingleResult();
     }
 
-	public static List<SaltFormAlias> findAllSaltFormAliases() {
+    public static List<SaltFormAlias> findAllSaltFormAliases() {
         return entityManager().createQuery("SELECT o FROM SaltFormAlias o", SaltFormAlias.class).getResultList();
     }
 
-	public static List<SaltFormAlias> findAllSaltFormAliases(String sortFieldName, String sortOrder) {
+    public static List<SaltFormAlias> findAllSaltFormAliases(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM SaltFormAlias o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -215,16 +243,19 @@ public static List<SaltFormAlias> findAllSaltFormAliases(String sortFieldName, S
         return entityManager().createQuery(jpaQuery, SaltFormAlias.class).getResultList();
     }
 
-	public static SaltFormAlias findSaltFormAlias(Long id) {
-        if (id == null) return null;
+    public static SaltFormAlias findSaltFormAlias(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(SaltFormAlias.class, id);
     }
 
-	public static List<SaltFormAlias> findSaltFormAliasEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM SaltFormAlias o", SaltFormAlias.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<SaltFormAlias> findSaltFormAliasEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM SaltFormAlias o", SaltFormAlias.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<SaltFormAlias> findSaltFormAliasEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<SaltFormAlias> findSaltFormAliasEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM SaltFormAlias o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -232,18 +263,21 @@ public static List<SaltFormAlias> findSaltFormAliasEntries(int firstResult, int
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, SaltFormAlias.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, SaltFormAlias.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -252,104 +286,107 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public SaltFormAlias merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         SaltFormAlias merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public SaltForm getSaltForm() {
+    public SaltForm getSaltForm() {
         return this.saltForm;
     }
 
-	public void setSaltForm(SaltForm saltForm) {
+    public void setSaltForm(SaltForm saltForm) {
         this.saltForm = saltForm;
     }
 
-	public String getLsType() {
+    public String getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(String lsType) {
+    public void setLsType(String lsType) {
         this.lsType = lsType;
     }
 
-	public String getLsKind() {
+    public String getLsKind() {
         return this.lsKind;
     }
 
-	public void setLsKind(String lsKind) {
+    public void setLsKind(String lsKind) {
         this.lsKind = lsKind;
     }
 
-	public String getAliasName() {
+    public String getAliasName() {
         return this.aliasName;
     }
 
-	public void setAliasName(String aliasName) {
+    public void setAliasName(String aliasName) {
         this.aliasName = aliasName;
     }
 
-	public boolean isPreferred() {
+    public boolean isPreferred() {
         return this.preferred;
     }
 
-	public void setPreferred(boolean preferred) {
+    public void setPreferred(boolean preferred) {
         this.preferred = preferred;
     }
 
-	public boolean isIgnored() {
+    public boolean isIgnored() {
         return this.ignored;
     }
 
-	public void setIgnored(boolean ignored) {
+    public void setIgnored(boolean ignored) {
         this.ignored = ignored;
     }
 
-	public boolean isDeleted() {
+    public boolean isDeleted() {
         return this.deleted;
     }
 
-	public void setDeleted(boolean deleted) {
+    public void setDeleted(boolean deleted) {
         this.deleted = deleted;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind.java b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind.java
index 6f287560e..910f920a8 100644
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasKind.java
@@ -28,7 +28,7 @@
 @Entity
 
 public class SaltFormAliasKind {
-	
+
     @NotNull
     @ManyToOne
     @JoinColumn(name = "ls_type")
@@ -36,57 +36,59 @@ public class SaltFormAliasKind {
 
     @Size(max = 255)
     private String kindName;
-    
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new SaltFormAliasKind().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countSaltFormAliasKinds() {
+    public static long countSaltFormAliasKinds() {
         return entityManager().createQuery("SELECT COUNT(o) FROM SaltFormAliasKind o", Long.class).getSingleResult();
     }
 
-	public static List<SaltFormAliasKind> findAllSaltFormAliasKinds() {
-        return entityManager().createQuery("SELECT o FROM SaltFormAliasKind o", SaltFormAliasKind.class).getResultList();
+    public static List<SaltFormAliasKind> findAllSaltFormAliasKinds() {
+        return entityManager().createQuery("SELECT o FROM SaltFormAliasKind o", SaltFormAliasKind.class)
+                .getResultList();
     }
 
-	public static List<SaltFormAliasKind> findAllSaltFormAliasKinds(String sortFieldName, String sortOrder) {
+    public static List<SaltFormAliasKind> findAllSaltFormAliasKinds(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM SaltFormAliasKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -97,16 +99,19 @@ public static List<SaltFormAliasKind> findAllSaltFormAliasKinds(String sortField
         return entityManager().createQuery(jpaQuery, SaltFormAliasKind.class).getResultList();
     }
 
-	public static SaltFormAliasKind findSaltFormAliasKind(Long id) {
-        if (id == null) return null;
+    public static SaltFormAliasKind findSaltFormAliasKind(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(SaltFormAliasKind.class, id);
     }
 
-	public static List<SaltFormAliasKind> findSaltFormAliasKindEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM SaltFormAliasKind o", SaltFormAliasKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<SaltFormAliasKind> findSaltFormAliasKindEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM SaltFormAliasKind o", SaltFormAliasKind.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<SaltFormAliasKind> findSaltFormAliasKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<SaltFormAliasKind> findSaltFormAliasKindEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM SaltFormAliasKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -114,18 +119,21 @@ public static List<SaltFormAliasKind> findSaltFormAliasKindEntries(int firstResu
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, SaltFormAliasKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, SaltFormAliasKind.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -134,69 +142,72 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public SaltFormAliasKind merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         SaltFormAliasKind merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static SaltFormAliasKind fromJsonToSaltFormAliasKind(String json) {
+    public static SaltFormAliasKind fromJsonToSaltFormAliasKind(String json) {
         return new JSONDeserializer<SaltFormAliasKind>()
-        .use(null, SaltFormAliasKind.class).deserialize(json);
+                .use(null, SaltFormAliasKind.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<SaltFormAliasKind> collection) {
+    public static String toJsonArray(Collection<SaltFormAliasKind> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<SaltFormAliasKind> collection, String[] fields) {
+    public static String toJsonArray(Collection<SaltFormAliasKind> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<SaltFormAliasKind> fromJsonArrayToSaltFormAliasKinds(String json) {
+    public static Collection<SaltFormAliasKind> fromJsonArrayToSaltFormAliasKinds(String json) {
         return new JSONDeserializer<List<SaltFormAliasKind>>()
-        .use("values", SaltFormAliasKind.class).deserialize(json);
+                .use("values", SaltFormAliasKind.class).deserialize(json);
     }
 
-	public SaltFormAliasType getLsType() {
+    public SaltFormAliasType getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(SaltFormAliasType lsType) {
+    public void setLsType(SaltFormAliasType lsType) {
         this.lsType = lsType;
     }
 
-	public String getKindName() {
+    public String getKindName() {
         return this.kindName;
     }
 
-	public void setKindName(String kindName) {
+    public void setKindName(String kindName) {
         this.kindName = kindName;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType.java b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType.java
index 5140d2c36..93c9ead38 100644
--- a/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType.java
+++ b/src/main/java/com/labsynch/labseer/domain/SaltFormAliasType.java
@@ -25,68 +25,70 @@
 @Entity
 
 public class SaltFormAliasType {
-	
+
     @Size(max = 255)
     private String typeName;
-    
 
-	public String getTypeName() {
+    public String getTypeName() {
         return this.typeName;
     }
 
-	public void setTypeName(String typeName) {
+    public void setTypeName(String typeName) {
         this.typeName = typeName;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new SaltFormAliasType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countSaltFormAliasTypes() {
+    public static long countSaltFormAliasTypes() {
         return entityManager().createQuery("SELECT COUNT(o) FROM SaltFormAliasType o", Long.class).getSingleResult();
     }
 
-	public static List<SaltFormAliasType> findAllSaltFormAliasTypes() {
-        return entityManager().createQuery("SELECT o FROM SaltFormAliasType o", SaltFormAliasType.class).getResultList();
+    public static List<SaltFormAliasType> findAllSaltFormAliasTypes() {
+        return entityManager().createQuery("SELECT o FROM SaltFormAliasType o", SaltFormAliasType.class)
+                .getResultList();
     }
 
-	public static List<SaltFormAliasType> findAllSaltFormAliasTypes(String sortFieldName, String sortOrder) {
+    public static List<SaltFormAliasType> findAllSaltFormAliasTypes(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM SaltFormAliasType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -97,16 +99,19 @@ public static List<SaltFormAliasType> findAllSaltFormAliasTypes(String sortField
         return entityManager().createQuery(jpaQuery, SaltFormAliasType.class).getResultList();
     }
 
-	public static SaltFormAliasType findSaltFormAliasType(Long id) {
-        if (id == null) return null;
+    public static SaltFormAliasType findSaltFormAliasType(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(SaltFormAliasType.class, id);
     }
 
-	public static List<SaltFormAliasType> findSaltFormAliasTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM SaltFormAliasType o", SaltFormAliasType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<SaltFormAliasType> findSaltFormAliasTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM SaltFormAliasType o", SaltFormAliasType.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<SaltFormAliasType> findSaltFormAliasTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<SaltFormAliasType> findSaltFormAliasTypeEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM SaltFormAliasType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -114,18 +119,21 @@ public static List<SaltFormAliasType> findSaltFormAliasTypeEntries(int firstResu
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, SaltFormAliasType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, SaltFormAliasType.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -134,53 +142,56 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public SaltFormAliasType merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         SaltFormAliasType merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static SaltFormAliasType fromJsonToSaltFormAliasType(String json) {
+    public static SaltFormAliasType fromJsonToSaltFormAliasType(String json) {
         return new JSONDeserializer<SaltFormAliasType>()
-        .use(null, SaltFormAliasType.class).deserialize(json);
+                .use(null, SaltFormAliasType.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<SaltFormAliasType> collection) {
+    public static String toJsonArray(Collection<SaltFormAliasType> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<SaltFormAliasType> collection, String[] fields) {
+    public static String toJsonArray(Collection<SaltFormAliasType> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<SaltFormAliasType> fromJsonArrayToSaltFormAliasTypes(String json) {
+    public static Collection<SaltFormAliasType> fromJsonArrayToSaltFormAliasTypes(String json) {
         return new JSONDeserializer<List<SaltFormAliasType>>()
-        .use("values", SaltFormAliasType.class).deserialize(json);
+                .use("values", SaltFormAliasType.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/SolutionUnit.java b/src/main/java/com/labsynch/labseer/domain/SolutionUnit.java
index 3ebb4cc89..beebb62e0 100755
--- a/src/main/java/com/labsynch/labseer/domain/SolutionUnit.java
+++ b/src/main/java/com/labsynch/labseer/domain/SolutionUnit.java
@@ -31,70 +31,71 @@ public class SolutionUnit {
     private String name;
 
     @Size(max = 255)
-    private String code; 
-    
+    private String code;
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String getName() {
+    public String getName() {
         return this.name;
     }
 
-	public void setName(String name) {
+    public void setName(String name) {
         this.name = name;
     }
 
-	public String getCode() {
+    public String getCode() {
         return this.code;
     }
 
-	public void setCode(String code) {
+    public void setCode(String code) {
         this.code = code;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new SolutionUnit().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countSolutionUnits() {
+    public static long countSolutionUnits() {
         return entityManager().createQuery("SELECT COUNT(o) FROM SolutionUnit o", Long.class).getSingleResult();
     }
 
-	public static List<SolutionUnit> findAllSolutionUnits() {
+    public static List<SolutionUnit> findAllSolutionUnits() {
         return entityManager().createQuery("SELECT o FROM SolutionUnit o", SolutionUnit.class).getResultList();
     }
 
-	public static List<SolutionUnit> findAllSolutionUnits(String sortFieldName, String sortOrder) {
+    public static List<SolutionUnit> findAllSolutionUnits(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM SolutionUnit o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -105,16 +106,19 @@ public static List<SolutionUnit> findAllSolutionUnits(String sortFieldName, Stri
         return entityManager().createQuery(jpaQuery, SolutionUnit.class).getResultList();
     }
 
-	public static SolutionUnit findSolutionUnit(Long id) {
-        if (id == null) return null;
+    public static SolutionUnit findSolutionUnit(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(SolutionUnit.class, id);
     }
 
-	public static List<SolutionUnit> findSolutionUnitEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM SolutionUnit o", SolutionUnit.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<SolutionUnit> findSolutionUnitEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM SolutionUnit o", SolutionUnit.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<SolutionUnit> findSolutionUnitEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<SolutionUnit> findSolutionUnitEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM SolutionUnit o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -122,18 +126,21 @@ public static List<SolutionUnit> findSolutionUnitEntries(int firstResult, int ma
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, SolutionUnit.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, SolutionUnit.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -142,40 +149,45 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public SolutionUnit merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         SolutionUnit merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static Long countFindSolutionUnitsByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static Long countFindSolutionUnitsByCodeEquals(String code) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = SolutionUnit.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SolutionUnit AS o WHERE o.code = :code", Long.class);
         q.setParameter("code", code);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindSolutionUnitsByCodeLike(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static Long countFindSolutionUnitsByCodeLike(String code) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         code = code.replace('*', '%');
         if (code.charAt(0) != '%') {
             code = "%" + code;
@@ -184,29 +196,35 @@ public static Long countFindSolutionUnitsByCodeLike(String code) {
             code = code + "%";
         }
         EntityManager em = SolutionUnit.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SolutionUnit AS o WHERE LOWER(o.code) LIKE LOWER(:code)", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SolutionUnit AS o WHERE LOWER(o.code) LIKE LOWER(:code)",
+                Long.class);
         q.setParameter("code", code);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindSolutionUnitsByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static Long countFindSolutionUnitsByNameEquals(String name) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = SolutionUnit.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SolutionUnit AS o WHERE o.name = :name", Long.class);
         q.setParameter("name", name);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<SolutionUnit> findSolutionUnitsByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static TypedQuery<SolutionUnit> findSolutionUnitsByCodeEquals(String code) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = SolutionUnit.entityManager();
-        TypedQuery<SolutionUnit> q = em.createQuery("SELECT o FROM SolutionUnit AS o WHERE o.code = :code", SolutionUnit.class);
+        TypedQuery<SolutionUnit> q = em.createQuery("SELECT o FROM SolutionUnit AS o WHERE o.code = :code",
+                SolutionUnit.class);
         q.setParameter("code", code);
         return q;
     }
 
-	public static TypedQuery<SolutionUnit> findSolutionUnitsByCodeEquals(String code, String sortFieldName, String sortOrder) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static TypedQuery<SolutionUnit> findSolutionUnitsByCodeEquals(String code, String sortFieldName,
+            String sortOrder) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = SolutionUnit.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SolutionUnit AS o WHERE o.code = :code");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -220,8 +238,9 @@ public static TypedQuery<SolutionUnit> findSolutionUnitsByCodeEquals(String code
         return q;
     }
 
-	public static TypedQuery<SolutionUnit> findSolutionUnitsByCodeLike(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static TypedQuery<SolutionUnit> findSolutionUnitsByCodeLike(String code) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         code = code.replace('*', '%');
         if (code.charAt(0) != '%') {
             code = "%" + code;
@@ -230,13 +249,16 @@ public static TypedQuery<SolutionUnit> findSolutionUnitsByCodeLike(String code)
             code = code + "%";
         }
         EntityManager em = SolutionUnit.entityManager();
-        TypedQuery<SolutionUnit> q = em.createQuery("SELECT o FROM SolutionUnit AS o WHERE LOWER(o.code) LIKE LOWER(:code)", SolutionUnit.class);
+        TypedQuery<SolutionUnit> q = em.createQuery(
+                "SELECT o FROM SolutionUnit AS o WHERE LOWER(o.code) LIKE LOWER(:code)", SolutionUnit.class);
         q.setParameter("code", code);
         return q;
     }
 
-	public static TypedQuery<SolutionUnit> findSolutionUnitsByCodeLike(String code, String sortFieldName, String sortOrder) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static TypedQuery<SolutionUnit> findSolutionUnitsByCodeLike(String code, String sortFieldName,
+            String sortOrder) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         code = code.replace('*', '%');
         if (code.charAt(0) != '%') {
             code = "%" + code;
@@ -245,7 +267,8 @@ public static TypedQuery<SolutionUnit> findSolutionUnitsByCodeLike(String code,
             code = code + "%";
         }
         EntityManager em = SolutionUnit.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SolutionUnit AS o WHERE LOWER(o.code) LIKE LOWER(:code)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM SolutionUnit AS o WHERE LOWER(o.code) LIKE LOWER(:code)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -257,16 +280,20 @@ public static TypedQuery<SolutionUnit> findSolutionUnitsByCodeLike(String code,
         return q;
     }
 
-	public static TypedQuery<SolutionUnit> findSolutionUnitsByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<SolutionUnit> findSolutionUnitsByNameEquals(String name) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = SolutionUnit.entityManager();
-        TypedQuery<SolutionUnit> q = em.createQuery("SELECT o FROM SolutionUnit AS o WHERE o.name = :name", SolutionUnit.class);
+        TypedQuery<SolutionUnit> q = em.createQuery("SELECT o FROM SolutionUnit AS o WHERE o.name = :name",
+                SolutionUnit.class);
         q.setParameter("name", name);
         return q;
     }
 
-	public static TypedQuery<SolutionUnit> findSolutionUnitsByNameEquals(String name, String sortFieldName, String sortOrder) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<SolutionUnit> findSolutionUnitsByNameEquals(String name, String sortFieldName,
+            String sortOrder) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = SolutionUnit.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SolutionUnit AS o WHERE o.name = :name");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -280,33 +307,33 @@ public static TypedQuery<SolutionUnit> findSolutionUnitsByNameEquals(String name
         return q;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static SolutionUnit fromJsonToSolutionUnit(String json) {
+    public static SolutionUnit fromJsonToSolutionUnit(String json) {
         return new JSONDeserializer<SolutionUnit>()
-        .use(null, SolutionUnit.class).deserialize(json);
+                .use(null, SolutionUnit.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<SolutionUnit> collection) {
+    public static String toJsonArray(Collection<SolutionUnit> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<SolutionUnit> collection, String[] fields) {
+    public static String toJsonArray(Collection<SolutionUnit> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<SolutionUnit> fromJsonArrayToSolutionUnits(String json) {
+    public static Collection<SolutionUnit> fromJsonArrayToSolutionUnits(String json) {
         return new JSONDeserializer<List<SolutionUnit>>()
-        .use("values", SolutionUnit.class).deserialize(json);
+                .use("values", SolutionUnit.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound.java b/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound.java
index 12a8ec075..8ee5f6db2 100644
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound.java
+++ b/src/main/java/com/labsynch/labseer/domain/StandardizationDryRunCompound.java
@@ -1,4 +1,5 @@
 package com.labsynch.labseer.domain;
+
 import static java.lang.Math.toIntExact;
 
 import java.util.ArrayList;
@@ -39,7 +40,7 @@
 
 @Configurable
 public class StandardizationDryRunCompound {
-	
+
 	private int runNumber;
 
 	private Date qcDate;
@@ -82,7 +83,7 @@ public class StandardizationDryRunCompound {
 	private String comment;
 
 	private boolean ignore;
-	
+
 	@Enumerated(EnumType.STRING)
 	private CmpdRegMolecule.StandardizationStatus standardizationStatus;
 
@@ -98,16 +99,19 @@ public StandardizationDryRunCompound() {
 
 	@Transactional
 	public static TypedQuery<Long> findAllIds() {
-		return StandardizationDryRunCompound.entityManager().createQuery("SELECT o.id FROM StandardizationDryRunCompound o", Long.class);
+		return StandardizationDryRunCompound.entityManager()
+				.createQuery("SELECT o.id FROM StandardizationDryRunCompound o", Long.class);
 	}
 
 	@Transactional
 	public static void truncateTable() {
-		int output = StandardizationDryRunCompound.entityManager().createNativeQuery("TRUNCATE standardization_dry_run_compound").executeUpdate();
+		int output = StandardizationDryRunCompound.entityManager()
+				.createNativeQuery("TRUNCATE standardization_dry_run_compound").executeUpdate();
 	}
 
 	public static TypedQuery<Integer> findMaxRunNumber() {
-		return StandardizationDryRunCompound.entityManager().createQuery("SELECT max(o.runNumber) FROM StandardizationDryRunCompound o", Integer.class);
+		return StandardizationDryRunCompound.entityManager()
+				.createQuery("SELECT max(o.runNumber) FROM StandardizationDryRunCompound o", Integer.class);
 	}
 
 	public static TypedQuery<StandardizationDryRunCompound> findStandardizationChanges() {
@@ -121,7 +125,9 @@ public static TypedQuery<Long> findParentIdsWithStandardizationChanges() {
 	}
 
 	public static int getStandardizationChangesCount() {
-		return toIntExact(StandardizationDryRunCompound.entityManager().createQuery("SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE changedStructure = true OR existingDuplicateCount > 0 OR newDuplicateCount > 0 OR displayChange = true", Long.class).getSingleResult());
+		return toIntExact(StandardizationDryRunCompound.entityManager().createQuery(
+				"SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE changedStructure = true OR existingDuplicateCount > 0 OR newDuplicateCount > 0 OR displayChange = true",
+				Long.class).getSingleResult());
 	}
 
 	public static TypedQuery<Long> findParentsWithDisplayChanges() {
@@ -130,31 +136,57 @@ public static TypedQuery<Long> findParentsWithDisplayChanges() {
 	}
 
 	public StandardizationHistory fetchStats() {
-//		String querySQL = "SELECT o.parentId FROM StandardizationDryRunCompound o WHERE displayChange = true";
-//		Query q = StandardizationDryRunCompound.entityManager().createNativeQuery(querySQL);
+		// String querySQL = "SELECT o.parentId FROM StandardizationDryRunCompound o
+		// WHERE displayChange = true";
+		// Query q =
+		// StandardizationDryRunCompound.entityManager().createNativeQuery(querySQL);
 		StandardizationHistory stats = new StandardizationHistory();
-		stats.setStructuresStandardizedCount(toIntExact(StandardizationDryRunCompound.entityManager().createQuery("SELECT count(s.id) FROM StandardizationDryRunCompound s", Long.class).getSingleResult()));
-		stats.setChangedStructureCount(toIntExact(StandardizationDryRunCompound.entityManager().createQuery("SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE s.changedStructure = true", Long.class).getSingleResult()));
-		stats.setExistingDuplicateCount(toIntExact(StandardizationDryRunCompound.entityManager().createQuery("SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE s.existingDuplicateCount > 0", Long.class).getSingleResult()));
-		stats.setNewDuplicateCount(toIntExact(StandardizationDryRunCompound.entityManager().createQuery("SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE s.newDuplicateCount > 0", Long.class).getSingleResult()));
-		stats.setDisplayChangeCount(toIntExact(StandardizationDryRunCompound.entityManager().createQuery("SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE s.displayChange = true", Long.class).getSingleResult()));
-		stats.setAsDrawnDisplayChangeCount(toIntExact(StandardizationDryRunCompound.entityManager().createQuery("SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE s.asDrawnDisplayChange = true", Long.class).getSingleResult()));
-
-		TypedQuery<Long> standardizationStatusCountQuery = StandardizationDryRunCompound.entityManager().createQuery("SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE s.standardizationStatus = :standardizationStatus", Long.class);
+		stats.setStructuresStandardizedCount(toIntExact(StandardizationDryRunCompound.entityManager()
+				.createQuery("SELECT count(s.id) FROM StandardizationDryRunCompound s", Long.class).getSingleResult()));
+		stats.setChangedStructureCount(toIntExact(StandardizationDryRunCompound.entityManager()
+				.createQuery("SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE s.changedStructure = true",
+						Long.class)
+				.getSingleResult()));
+		stats.setExistingDuplicateCount(toIntExact(StandardizationDryRunCompound.entityManager()
+				.createQuery(
+						"SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE s.existingDuplicateCount > 0",
+						Long.class)
+				.getSingleResult()));
+		stats.setNewDuplicateCount(toIntExact(StandardizationDryRunCompound.entityManager()
+				.createQuery("SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE s.newDuplicateCount > 0",
+						Long.class)
+				.getSingleResult()));
+		stats.setDisplayChangeCount(toIntExact(StandardizationDryRunCompound.entityManager()
+				.createQuery("SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE s.displayChange = true",
+						Long.class)
+				.getSingleResult()));
+		stats.setAsDrawnDisplayChangeCount(toIntExact(StandardizationDryRunCompound.entityManager()
+				.createQuery(
+						"SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE s.asDrawnDisplayChange = true",
+						Long.class)
+				.getSingleResult()));
+
+		TypedQuery<Long> standardizationStatusCountQuery = StandardizationDryRunCompound.entityManager().createQuery(
+				"SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE s.standardizationStatus = :standardizationStatus",
+				Long.class);
 		standardizationStatusCountQuery.setParameter("standardizationStatus", StandardizationStatus.ERROR);
 		stats.setStandardizationErrorCount(toIntExact(standardizationStatusCountQuery.getSingleResult()));
 
-
-		TypedQuery<Long> registrationStatusCountQuery = StandardizationDryRunCompound.entityManager().createQuery("SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE s.registrationStatus = :registrationStatus", Long.class);
+		TypedQuery<Long> registrationStatusCountQuery = StandardizationDryRunCompound.entityManager().createQuery(
+				"SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE s.registrationStatus = :registrationStatus",
+				Long.class);
 		registrationStatusCountQuery.setParameter("registrationStatus", RegistrationStatus.ERROR);
 		stats.setRegistrationErrorCount(toIntExact(registrationStatusCountQuery.getSingleResult()));
 
-		return(stats);
+		return (stats);
 	}
 
-	public static List<Predicate> buildPredicateFromNumericValue(CriteriaBuilder cb, Root<StandardizationDryRunCompound> root, List<Predicate> predicates, String fieldName, Double value, String operator) {
+	public static List<Predicate> buildPredicateFromNumericValue(CriteriaBuilder cb,
+			Root<StandardizationDryRunCompound> root, List<Predicate> predicates, String fieldName, Double value,
+			String operator) {
 		Predicate predicate = null;
-		if(value == null) return predicates;
+		if (value == null)
+			return predicates;
 		if (operator == null || operator.equals("=")) {
 			predicate = cb.equal(root.get(fieldName), value);
 		} else if (operator.equals(">")) {
@@ -162,65 +194,68 @@ public static List<Predicate> buildPredicateFromNumericValue(CriteriaBuilder cb,
 		} else if (operator.equals("<")) {
 			predicate = cb.lessThan(root.get(fieldName), value);
 		}
-		if(predicate != null) {
+		if (predicate != null) {
 			predicates.add(predicate);
 		}
 		return predicates;
 	}
 
-
 	public static TypedQuery<Long> searchStandardiationDryRunCount(StandardizationDryRunSearchDTO dryRunSearch) {
-        EntityManager em = StandardizationDryRunCompound.entityManager();
-        CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
-        CriteriaQuery<Long> criteria = criteriaBuilder.createQuery(Long.class);
-        Root<StandardizationDryRunCompound> root = criteria.from(StandardizationDryRunCompound.class);
+		EntityManager em = StandardizationDryRunCompound.entityManager();
+		CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
+		CriteriaQuery<Long> criteria = criteriaBuilder.createQuery(Long.class);
+		Root<StandardizationDryRunCompound> root = criteria.from(StandardizationDryRunCompound.class);
 		criteria.select(criteriaBuilder.count(root));
 		criteria.where(buildPredicatesForSearch(criteriaBuilder, root, dryRunSearch));
 
-        return em.createQuery(criteria);	
+		return em.createQuery(criteria);
 	}
 
-
-	private static Predicate buildPredicatesForSearch(CriteriaBuilder criteriaBuilder, Root<StandardizationDryRunCompound> root, StandardizationDryRunSearchDTO dryRunSearch) {
+	private static Predicate buildPredicatesForSearch(CriteriaBuilder criteriaBuilder,
+			Root<StandardizationDryRunCompound> root, StandardizationDryRunSearchDTO dryRunSearch) {
 
 		// Predicate List
 		List<Predicate> predicates = new ArrayList<Predicate>();
 
 		// New mol weight
 		if (dryRunSearch.getNewMolWeight() != null) {
-			predicates = buildPredicateFromNumericValue(criteriaBuilder, root, predicates, "newMolWeight", dryRunSearch.getNewMolWeight().getValue(), dryRunSearch.getNewMolWeight().getOperator());
+			predicates = buildPredicateFromNumericValue(criteriaBuilder, root, predicates, "newMolWeight",
+					dryRunSearch.getNewMolWeight().getValue(), dryRunSearch.getNewMolWeight().getOperator());
 		}
 
 		// Delta mol weight
 		if (dryRunSearch.getDeltaMolWeight() != null) {
-			predicates = buildPredicateFromNumericValue(criteriaBuilder, root, predicates, "deltaMolWeight", dryRunSearch.getDeltaMolWeight().getValue(), dryRunSearch.getDeltaMolWeight().getOperator());
+			predicates = buildPredicateFromNumericValue(criteriaBuilder, root, predicates, "deltaMolWeight",
+					dryRunSearch.getDeltaMolWeight().getValue(), dryRunSearch.getDeltaMolWeight().getOperator());
 		}
 
 		// Old mol weight
 		if (dryRunSearch.getOldMolWeight() != null) {
-			predicates = buildPredicateFromNumericValue(criteriaBuilder, root, predicates, "oldMolWeight", dryRunSearch.getOldMolWeight().getValue(), dryRunSearch.getOldMolWeight().getOperator());
+			predicates = buildPredicateFromNumericValue(criteriaBuilder, root, predicates, "oldMolWeight",
+					dryRunSearch.getOldMolWeight().getValue(), dryRunSearch.getOldMolWeight().getOperator());
 		}
 
 		// Corp name in list
 		if (dryRunSearch.getIncludeCorpNames() != null) {
-			if(dryRunSearch.getCorpNames() != null && dryRunSearch.getCorpNames().length > 0) {
-				if(dryRunSearch.getIncludeCorpNames()) {
+			if (dryRunSearch.getCorpNames() != null && dryRunSearch.getCorpNames().length > 0) {
+				if (dryRunSearch.getIncludeCorpNames()) {
 					predicates.add(root.get("corpName").in(dryRunSearch.getCorpNames()));
 				} else {
 					predicates.add(criteriaBuilder.not(root.get("corpName").in(dryRunSearch.getCorpNames())));
 				}
 			} else {
-				if(dryRunSearch.getIncludeCorpNames()) {
+				if (dryRunSearch.getIncludeCorpNames()) {
 					// Return 0 rows on purpose because there are no corp names to search for
 					predicates.add(criteriaBuilder.equal(root.get("id"), -1));
 				}
-				// else if not include corp names then it is excluding 0 corpnames and we don't filter
+				// else if not include corp names then it is excluding 0 corpnames and we don't
+				// filter
 			}
 		}
 
 		// Existing duplicate
 		if (dryRunSearch.getHasExistingDuplicates() != null) {
-			if(dryRunSearch.getHasExistingDuplicates()) {
+			if (dryRunSearch.getHasExistingDuplicates()) {
 				predicates.add(root.get("existingDuplicates").isNotNull());
 			} else {
 				predicates.add(root.get("existingDuplicates").isNull());
@@ -229,7 +264,7 @@ private static Predicate buildPredicatesForSearch(CriteriaBuilder criteriaBuilde
 
 		// New duplicates
 		if (dryRunSearch.getHasNewDuplicates() != null) {
-			if(dryRunSearch.getHasNewDuplicates()) {
+			if (dryRunSearch.getHasNewDuplicates()) {
 				predicates.add(root.get("newDuplicates").isNotNull());
 			} else {
 				predicates.add(root.get("newDuplicates").isNull());
@@ -250,474 +285,537 @@ private static Predicate buildPredicatesForSearch(CriteriaBuilder criteriaBuilde
 
 		// As drawn display change
 		if (dryRunSearch.getAsDrawnDisplayChange() != null) {
-			predicates.add(criteriaBuilder.equal(root.get("asDrawnDisplayChange"), dryRunSearch.getAsDrawnDisplayChange()));
+			predicates.add(
+					criteriaBuilder.equal(root.get("asDrawnDisplayChange"), dryRunSearch.getAsDrawnDisplayChange()));
 		}
 
 		// Standardization statuses
 		if (dryRunSearch.getStandardizationStatuses() != null) {
-			if(dryRunSearch.getStandardizationStatuses().length > 0) {
+			if (dryRunSearch.getStandardizationStatuses().length > 0) {
 				predicates.add(root.get("standardizationStatus").in(dryRunSearch.getStandardizationStatuses()));
 			} else {
 				predicates.add(criteriaBuilder.equal(root.get("id"), -1));
 			}
 		}
-		
+
 		// Registration statuses
 		if (dryRunSearch.getRegistrationStatuses() != null) {
-			if(dryRunSearch.getRegistrationStatuses().length > 0) {
+			if (dryRunSearch.getRegistrationStatuses().length > 0) {
 				predicates.add(root.get("registrationStatus").in(dryRunSearch.getRegistrationStatuses()));
 			} else {
 				predicates.add(criteriaBuilder.equal(root.get("id"), -1));
 			}
 		}
-		
+
 		Predicate[] predicatesToAdd = new Predicate[0];
 		predicatesToAdd = predicates.toArray(predicatesToAdd);
 		Predicate wherePredicates = criteriaBuilder.and(predicatesToAdd);
 		return wherePredicates;
 	}
 
-	public static TypedQuery<StandardizationDryRunCompound> searchStandardiationDryRun(StandardizationDryRunSearchDTO dryRunSearch) {
-        EntityManager em = StandardizationDryRunCompound.entityManager();
-        CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
-        CriteriaQuery<StandardizationDryRunCompound> criteria = criteriaBuilder.createQuery(StandardizationDryRunCompound.class);
-        Root<StandardizationDryRunCompound> root = criteria.from(StandardizationDryRunCompound.class);
-        criteria.select(root);
+	public static TypedQuery<StandardizationDryRunCompound> searchStandardiationDryRun(
+			StandardizationDryRunSearchDTO dryRunSearch) {
+		EntityManager em = StandardizationDryRunCompound.entityManager();
+		CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
+		CriteriaQuery<StandardizationDryRunCompound> criteria = criteriaBuilder
+				.createQuery(StandardizationDryRunCompound.class);
+		Root<StandardizationDryRunCompound> root = criteria.from(StandardizationDryRunCompound.class);
+		criteria.select(root);
 
 		criteria.where(buildPredicatesForSearch(criteriaBuilder, root, dryRunSearch));
-		
+
 		criteria.orderBy(criteriaBuilder.desc(root.get("corpName")));
-        TypedQuery<StandardizationDryRunCompound> q = em.createQuery(criteria);		
+		TypedQuery<StandardizationDryRunCompound> q = em.createQuery(criteria);
 
-		if(dryRunSearch.getMaxResults() != null && dryRunSearch.getMaxResults() > -1) {
+		if (dryRunSearch.getMaxResults() != null && dryRunSearch.getMaxResults() > -1) {
 			q.setMaxResults(dryRunSearch.getMaxResults());
 		}
-		
+
 		return q;
-	} 
+	}
 
 	public static StandardizationHistory addStatsToHistory(StandardizationHistory standardizationHistory) {
-		standardizationHistory.setStructuresStandardizedCount(toIntExact(StandardizationDryRunCompound.entityManager().createQuery("SELECT count(s.id) FROM StandardizationDryRunCompound s", Long.class).getSingleResult()));
-		standardizationHistory.setChangedStructureCount(toIntExact(StandardizationDryRunCompound.entityManager().createQuery("SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE s.changedStructure = true", Long.class).getSingleResult()));
-		standardizationHistory.setExistingDuplicateCount(toIntExact(StandardizationDryRunCompound.entityManager().createQuery("SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE s.existingDuplicateCount > 0", Long.class).getSingleResult()));
-		standardizationHistory.setNewDuplicateCount(toIntExact(StandardizationDryRunCompound.entityManager().createQuery("SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE s.newDuplicateCount > 0", Long.class).getSingleResult()));
-		standardizationHistory.setDisplayChangeCount(toIntExact(StandardizationDryRunCompound.entityManager().createQuery("SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE s.displayChange = true", Long.class).getSingleResult()));
-		standardizationHistory.setAsDrawnDisplayChangeCount(toIntExact(StandardizationDryRunCompound.entityManager().createQuery("SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE s.asDrawnDisplayChange = true", Long.class).getSingleResult()));
-
-		TypedQuery<Long> standardizationStatusCountQuery = StandardizationDryRunCompound.entityManager().createQuery("SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE s.standardizationStatus = :standardizationStatus", Long.class);
+		standardizationHistory.setStructuresStandardizedCount(toIntExact(StandardizationDryRunCompound.entityManager()
+				.createQuery("SELECT count(s.id) FROM StandardizationDryRunCompound s", Long.class).getSingleResult()));
+		standardizationHistory.setChangedStructureCount(toIntExact(StandardizationDryRunCompound.entityManager()
+				.createQuery("SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE s.changedStructure = true",
+						Long.class)
+				.getSingleResult()));
+		standardizationHistory.setExistingDuplicateCount(toIntExact(StandardizationDryRunCompound.entityManager()
+				.createQuery(
+						"SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE s.existingDuplicateCount > 0",
+						Long.class)
+				.getSingleResult()));
+		standardizationHistory.setNewDuplicateCount(toIntExact(StandardizationDryRunCompound.entityManager()
+				.createQuery("SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE s.newDuplicateCount > 0",
+						Long.class)
+				.getSingleResult()));
+		standardizationHistory.setDisplayChangeCount(toIntExact(StandardizationDryRunCompound.entityManager()
+				.createQuery("SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE s.displayChange = true",
+						Long.class)
+				.getSingleResult()));
+		standardizationHistory.setAsDrawnDisplayChangeCount(toIntExact(StandardizationDryRunCompound.entityManager()
+				.createQuery(
+						"SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE s.asDrawnDisplayChange = true",
+						Long.class)
+				.getSingleResult()));
+
+		TypedQuery<Long> standardizationStatusCountQuery = StandardizationDryRunCompound.entityManager().createQuery(
+				"SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE s.standardizationStatus = :standardizationStatus",
+				Long.class);
 		standardizationStatusCountQuery.setParameter("standardizationStatus", StandardizationStatus.ERROR);
-		standardizationHistory.setStandardizationErrorCount(toIntExact(standardizationStatusCountQuery.getSingleResult()));
+		standardizationHistory
+				.setStandardizationErrorCount(toIntExact(standardizationStatusCountQuery.getSingleResult()));
 
-
-		TypedQuery<Long> registrationStatusCountQuery = StandardizationDryRunCompound.entityManager().createQuery("SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE s.registrationStatus = :registrationStatus", Long.class);
+		TypedQuery<Long> registrationStatusCountQuery = StandardizationDryRunCompound.entityManager().createQuery(
+				"SELECT count(s.id) FROM StandardizationDryRunCompound s WHERE s.registrationStatus = :registrationStatus",
+				Long.class);
 		registrationStatusCountQuery.setParameter("registrationStatus", RegistrationStatus.ERROR);
 		standardizationHistory.setRegistrationErrorCount(toIntExact(registrationStatusCountQuery.getSingleResult()));
 
-		return(standardizationHistory);
+		return (standardizationHistory);
 	}
 
 	public int getRunNumber() {
-        return this.runNumber;
-    }
+		return this.runNumber;
+	}
 
 	public void setRunNumber(int runNumber) {
-        this.runNumber = runNumber;
-    }
+		this.runNumber = runNumber;
+	}
 
 	public Date getQcDate() {
-        return this.qcDate;
-    }
+		return this.qcDate;
+	}
 
 	public void setQcDate(Date qcDate) {
-        this.qcDate = qcDate;
-    }
+		this.qcDate = qcDate;
+	}
 
 	public Long getParentId() {
-        return this.parentId;
-    }
+		return this.parentId;
+	}
 
 	public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
+		this.parentId = parentId;
+	}
 
 	public String getCorpName() {
-        return this.corpName;
-    }
+		return this.corpName;
+	}
 
 	public void setCorpName(String corpName) {
-        this.corpName = corpName;
-    }
+		this.corpName = corpName;
+	}
 
 	public String getNewDuplicates() {
-        return this.newDuplicates;
-    }
+		return this.newDuplicates;
+	}
 
 	public void setNewDuplicates(String newDuplicates) {
-        this.newDuplicates = newDuplicates;
-    }
+		this.newDuplicates = newDuplicates;
+	}
 
 	public String getExistingDuplicates() {
-        return this.existingDuplicates;
-    }
+		return this.existingDuplicates;
+	}
 
 	public void setExistingDuplicates(String existingDuplicates) {
-        this.existingDuplicates = existingDuplicates;
-    }
+		this.existingDuplicates = existingDuplicates;
+	}
 
 	public boolean isChangedStructure() {
-        return this.changedStructure;
-    }
+		return this.changedStructure;
+	}
 
 	public void setChangedStructure(boolean changedStructure) {
-        this.changedStructure = changedStructure;
-    }
+		this.changedStructure = changedStructure;
+	}
 
 	public Double getOldMolWeight() {
-        return this.oldMolWeight;
-    }
+		return this.oldMolWeight;
+	}
 
 	public void setOldMolWeight(Double oldMolWeight) {
-        this.oldMolWeight = oldMolWeight;
-    }
+		this.oldMolWeight = oldMolWeight;
+	}
 
 	public Double getNewMolWeight() {
-        return this.newMolWeight;
-    }
+		return this.newMolWeight;
+	}
 
 	public void setNewMolWeight(Double newMolWeight) {
-        this.newMolWeight = newMolWeight;
-    }
+		this.newMolWeight = newMolWeight;
+	}
 
 	public Double getDeltaMolWeight() {
-        return this.deltaMolWeight;
-    }
+		return this.deltaMolWeight;
+	}
 
 	public void setDeltaMolWeight(Double deltaMolWeight) {
-        this.deltaMolWeight = deltaMolWeight;
-    }
+		this.deltaMolWeight = deltaMolWeight;
+	}
 
 	public boolean isDisplayChange() {
-        return this.displayChange;
-    }
+		return this.displayChange;
+	}
 
 	public void setDisplayChange(boolean displayChange) {
-        this.displayChange = displayChange;
-    }
+		this.displayChange = displayChange;
+	}
 
 	public boolean isAsDrawnDisplayChange() {
-        return this.asDrawnDisplayChange;
-    }
+		return this.asDrawnDisplayChange;
+	}
 
 	public void setAsDrawnDisplayChange(boolean asDrawnDisplayChange) {
-        this.asDrawnDisplayChange = asDrawnDisplayChange;
-    }
+		this.asDrawnDisplayChange = asDrawnDisplayChange;
+	}
 
 	public int getNewDuplicateCount() {
-        return this.newDuplicateCount;
-    }
+		return this.newDuplicateCount;
+	}
 
 	public void setNewDuplicateCount(int newDuplicateCount) {
-        this.newDuplicateCount = newDuplicateCount;
-    }
+		this.newDuplicateCount = newDuplicateCount;
+	}
 
 	public int getExistingDuplicateCount() {
-        return this.existingDuplicateCount;
-    }
+		return this.existingDuplicateCount;
+	}
 
 	public void setExistingDuplicateCount(int existingDuplicateCount) {
-        this.existingDuplicateCount = existingDuplicateCount;
-    }
+		this.existingDuplicateCount = existingDuplicateCount;
+	}
 
 	public String getAlias() {
-        return this.alias;
-    }
+		return this.alias;
+	}
 
 	public void setAlias(String alias) {
-        this.alias = alias;
-    }
+		this.alias = alias;
+	}
 
 	public String getStereoCategory() {
-        return this.stereoCategory;
-    }
+		return this.stereoCategory;
+	}
 
 	public void setStereoCategory(String stereoCategory) {
-        this.stereoCategory = stereoCategory;
-    }
+		this.stereoCategory = stereoCategory;
+	}
 
 	public String getStereoComment() {
-        return this.stereoComment;
-    }
+		return this.stereoComment;
+	}
 
 	public void setStereoComment(String stereoComment) {
-        this.stereoComment = stereoComment;
-    }
+		this.stereoComment = stereoComment;
+	}
 
 	public int getCdId() {
-        return this.CdId;
-    }
+		return this.CdId;
+	}
 
 	public void setCdId(int CdId) {
-        this.CdId = CdId;
-    }
+		this.CdId = CdId;
+	}
 
 	public String getMolStructure() {
-        return this.molStructure;
-    }
+		return this.molStructure;
+	}
 
 	public void setMolStructure(String molStructure) {
-        this.molStructure = molStructure;
-    }
+		this.molStructure = molStructure;
+	}
 
 	public String getComment() {
-        return this.comment;
-    }
+		return this.comment;
+	}
 
 	public void setComment(String comment) {
-        this.comment = comment;
-    }
+		this.comment = comment;
+	}
 
 	public boolean isIgnore() {
-        return this.ignore;
-    }
+		return this.ignore;
+	}
 
 	public void setIgnore(boolean ignore) {
-        this.ignore = ignore;
-    }
+		this.ignore = ignore;
+	}
 
 	public StandardizationStatus getStandardizationStatus() {
-        return this.standardizationStatus;
-    }
+		return this.standardizationStatus;
+	}
 
 	public void setStandardizationStatus(StandardizationStatus standardizationStatus) {
-        this.standardizationStatus = standardizationStatus;
-    }
+		this.standardizationStatus = standardizationStatus;
+	}
 
 	public String getStandardizationComment() {
-        return this.standardizationComment;
-    }
+		return this.standardizationComment;
+	}
 
 	public void setStandardizationComment(String standardizationComment) {
-        this.standardizationComment = standardizationComment;
-    }
+		this.standardizationComment = standardizationComment;
+	}
 
 	public RegistrationStatus getRegistrationStatus() {
-        return this.registrationStatus;
-    }
+		return this.registrationStatus;
+	}
 
 	public void setRegistrationStatus(RegistrationStatus registrationStatus) {
-        this.registrationStatus = registrationStatus;
-    }
+		this.registrationStatus = registrationStatus;
+	}
 
 	public String getRegistrationComment() {
-        return this.registrationComment;
-    }
+		return this.registrationComment;
+	}
 
 	public void setRegistrationComment(String registrationComment) {
-        this.registrationComment = registrationComment;
-    }
+		this.registrationComment = registrationComment;
+	}
 
 	public static Long countFindStandardizationDryRunCompoundsByCdId(int CdId) {
-        EntityManager em = StandardizationDryRunCompound.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StandardizationDryRunCompound AS o WHERE o.CdId = :CdId", Long.class);
-        q.setParameter("CdId", CdId);
-        return ((Long) q.getSingleResult());
-    }
+		EntityManager em = StandardizationDryRunCompound.entityManager();
+		TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StandardizationDryRunCompound AS o WHERE o.CdId = :CdId",
+				Long.class);
+		q.setParameter("CdId", CdId);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static Long countFindStandardizationDryRunCompoundsByCorpNameEquals(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        EntityManager em = StandardizationDryRunCompound.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StandardizationDryRunCompound AS o WHERE o.corpName = :corpName", Long.class);
-        q.setParameter("corpName", corpName);
-        return ((Long) q.getSingleResult());
-    }
+		if (corpName == null || corpName.length() == 0)
+			throw new IllegalArgumentException("The corpName argument is required");
+		EntityManager em = StandardizationDryRunCompound.entityManager();
+		TypedQuery q = em.createQuery(
+				"SELECT COUNT(o) FROM StandardizationDryRunCompound AS o WHERE o.corpName = :corpName", Long.class);
+		q.setParameter("corpName", corpName);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static TypedQuery<StandardizationDryRunCompound> findStandardizationDryRunCompoundsByCdId(int CdId) {
-        EntityManager em = StandardizationDryRunCompound.entityManager();
-        TypedQuery<StandardizationDryRunCompound> q = em.createQuery("SELECT o FROM StandardizationDryRunCompound AS o WHERE o.CdId = :CdId", StandardizationDryRunCompound.class);
-        q.setParameter("CdId", CdId);
-        return q;
-    }
-
-	public static TypedQuery<StandardizationDryRunCompound> findStandardizationDryRunCompoundsByCdId(int CdId, String sortFieldName, String sortOrder) {
-        EntityManager em = StandardizationDryRunCompound.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StandardizationDryRunCompound AS o WHERE o.CdId = :CdId");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<StandardizationDryRunCompound> q = em.createQuery(queryBuilder.toString(), StandardizationDryRunCompound.class);
-        q.setParameter("CdId", CdId);
-        return q;
-    }
-
-	public static TypedQuery<StandardizationDryRunCompound> findStandardizationDryRunCompoundsByCorpNameEquals(String corpName) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        EntityManager em = StandardizationDryRunCompound.entityManager();
-        TypedQuery<StandardizationDryRunCompound> q = em.createQuery("SELECT o FROM StandardizationDryRunCompound AS o WHERE o.corpName = :corpName", StandardizationDryRunCompound.class);
-        q.setParameter("corpName", corpName);
-        return q;
-    }
-
-	public static TypedQuery<StandardizationDryRunCompound> findStandardizationDryRunCompoundsByCorpNameEquals(String corpName, String sortFieldName, String sortOrder) {
-        if (corpName == null || corpName.length() == 0) throw new IllegalArgumentException("The corpName argument is required");
-        EntityManager em = StandardizationDryRunCompound.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StandardizationDryRunCompound AS o WHERE o.corpName = :corpName");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<StandardizationDryRunCompound> q = em.createQuery(queryBuilder.toString(), StandardizationDryRunCompound.class);
-        q.setParameter("corpName", corpName);
-        return q;
-    }
+		EntityManager em = StandardizationDryRunCompound.entityManager();
+		TypedQuery<StandardizationDryRunCompound> q = em.createQuery(
+				"SELECT o FROM StandardizationDryRunCompound AS o WHERE o.CdId = :CdId",
+				StandardizationDryRunCompound.class);
+		q.setParameter("CdId", CdId);
+		return q;
+	}
+
+	public static TypedQuery<StandardizationDryRunCompound> findStandardizationDryRunCompoundsByCdId(int CdId,
+			String sortFieldName, String sortOrder) {
+		EntityManager em = StandardizationDryRunCompound.entityManager();
+		StringBuilder queryBuilder = new StringBuilder(
+				"SELECT o FROM StandardizationDryRunCompound AS o WHERE o.CdId = :CdId");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<StandardizationDryRunCompound> q = em.createQuery(queryBuilder.toString(),
+				StandardizationDryRunCompound.class);
+		q.setParameter("CdId", CdId);
+		return q;
+	}
+
+	public static TypedQuery<StandardizationDryRunCompound> findStandardizationDryRunCompoundsByCorpNameEquals(
+			String corpName) {
+		if (corpName == null || corpName.length() == 0)
+			throw new IllegalArgumentException("The corpName argument is required");
+		EntityManager em = StandardizationDryRunCompound.entityManager();
+		TypedQuery<StandardizationDryRunCompound> q = em.createQuery(
+				"SELECT o FROM StandardizationDryRunCompound AS o WHERE o.corpName = :corpName",
+				StandardizationDryRunCompound.class);
+		q.setParameter("corpName", corpName);
+		return q;
+	}
+
+	public static TypedQuery<StandardizationDryRunCompound> findStandardizationDryRunCompoundsByCorpNameEquals(
+			String corpName, String sortFieldName, String sortOrder) {
+		if (corpName == null || corpName.length() == 0)
+			throw new IllegalArgumentException("The corpName argument is required");
+		EntityManager em = StandardizationDryRunCompound.entityManager();
+		StringBuilder queryBuilder = new StringBuilder(
+				"SELECT o FROM StandardizationDryRunCompound AS o WHERE o.corpName = :corpName");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<StandardizationDryRunCompound> q = em.createQuery(queryBuilder.toString(),
+				StandardizationDryRunCompound.class);
+		q.setParameter("corpName", corpName);
+		return q;
+	}
 
 	@PersistenceContext
-    transient EntityManager entityManager;
+	transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("runNumber", "qcDate", "parentId", "corpName", "newDuplicates", "existingDuplicates", "changedStructure", "oldMolWeight", "newMolWeight", "deltaMolWeight", "displayChange", "asDrawnDisplayChange", "newDuplicateCount", "existingDuplicateCount", "alias", "stereoCategory", "stereoComment", "CdId", "molStructure", "comment", "ignore", "standardizationStatus", "standardizationComment", "registrationStatus", "registrationComment");
+	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("runNumber", "qcDate",
+			"parentId", "corpName", "newDuplicates", "existingDuplicates", "changedStructure", "oldMolWeight",
+			"newMolWeight", "deltaMolWeight", "displayChange", "asDrawnDisplayChange", "newDuplicateCount",
+			"existingDuplicateCount", "alias", "stereoCategory", "stereoComment", "CdId", "molStructure", "comment",
+			"ignore", "standardizationStatus", "standardizationComment", "registrationStatus", "registrationComment");
 
 	public static final EntityManager entityManager() {
-        EntityManager em = new StandardizationDryRunCompound().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em;
-    }
+		EntityManager em = new StandardizationDryRunCompound().entityManager;
+		if (em == null)
+			throw new IllegalStateException(
+					"Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+		return em;
+	}
 
 	public static long countStandardizationDryRunCompounds() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM StandardizationDryRunCompound o", Long.class).getSingleResult();
-    }
+		return entityManager().createQuery("SELECT COUNT(o) FROM StandardizationDryRunCompound o", Long.class)
+				.getSingleResult();
+	}
 
 	public static List<StandardizationDryRunCompound> findAllStandardizationDryRunCompounds() {
-        return entityManager().createQuery("SELECT o FROM StandardizationDryRunCompound o", StandardizationDryRunCompound.class).getResultList();
-    }
-
-	public static List<StandardizationDryRunCompound> findAllStandardizationDryRunCompounds(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM StandardizationDryRunCompound o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, StandardizationDryRunCompound.class).getResultList();
-    }
+		return entityManager()
+				.createQuery("SELECT o FROM StandardizationDryRunCompound o", StandardizationDryRunCompound.class)
+				.getResultList();
+	}
+
+	public static List<StandardizationDryRunCompound> findAllStandardizationDryRunCompounds(String sortFieldName,
+			String sortOrder) {
+		String jpaQuery = "SELECT o FROM StandardizationDryRunCompound o";
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				jpaQuery = jpaQuery + " " + sortOrder;
+			}
+		}
+		return entityManager().createQuery(jpaQuery, StandardizationDryRunCompound.class).getResultList();
+	}
 
 	public static StandardizationDryRunCompound findStandardizationDryRunCompound(Long id) {
-        if (id == null) return null;
-        return entityManager().find(StandardizationDryRunCompound.class, id);
-    }
-
-	public static List<StandardizationDryRunCompound> findStandardizationDryRunCompoundEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM StandardizationDryRunCompound o", StandardizationDryRunCompound.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-
-	public static List<StandardizationDryRunCompound> findStandardizationDryRunCompoundEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM StandardizationDryRunCompound o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, StandardizationDryRunCompound.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
+		if (id == null)
+			return null;
+		return entityManager().find(StandardizationDryRunCompound.class, id);
+	}
+
+	public static List<StandardizationDryRunCompound> findStandardizationDryRunCompoundEntries(int firstResult,
+			int maxResults) {
+		return entityManager()
+				.createQuery("SELECT o FROM StandardizationDryRunCompound o", StandardizationDryRunCompound.class)
+				.setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+	}
+
+	public static List<StandardizationDryRunCompound> findStandardizationDryRunCompoundEntries(int firstResult,
+			int maxResults, String sortFieldName, String sortOrder) {
+		String jpaQuery = "SELECT o FROM StandardizationDryRunCompound o";
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				jpaQuery = jpaQuery + " " + sortOrder;
+			}
+		}
+		return entityManager().createQuery(jpaQuery, StandardizationDryRunCompound.class).setFirstResult(firstResult)
+				.setMaxResults(maxResults).getResultList();
+	}
 
 	@Transactional
-    public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.persist(this);
-    }
+	public void persist() {
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
+		this.entityManager.persist(this);
+	}
 
 	@Transactional
-    public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        if (this.entityManager.contains(this)) {
-            this.entityManager.remove(this);
-        } else {
-            StandardizationDryRunCompound attached = StandardizationDryRunCompound.findStandardizationDryRunCompound(this.id);
-            this.entityManager.remove(attached);
-        }
-    }
+	public void remove() {
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
+		if (this.entityManager.contains(this)) {
+			this.entityManager.remove(this);
+		} else {
+			StandardizationDryRunCompound attached = StandardizationDryRunCompound
+					.findStandardizationDryRunCompound(this.id);
+			this.entityManager.remove(attached);
+		}
+	}
 
 	@Transactional
-    public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.flush();
-    }
+	public void flush() {
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
+		this.entityManager.flush();
+	}
 
 	@Transactional
-    public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.entityManager.clear();
-    }
+	public void clear() {
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
+		this.entityManager.clear();
+	}
 
 	@Transactional
-    public StandardizationDryRunCompound merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        StandardizationDryRunCompound merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
+	public StandardizationDryRunCompound merge() {
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
+		StandardizationDryRunCompound merged = this.entityManager.merge(this);
+		this.entityManager.flush();
+		return merged;
+	}
 
 	@Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "id")
-    private Long id;
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	@Column(name = "id")
+	private Long id;
 
 	@Version
-    @Column(name = "version")
-    private Integer version;
+	@Column(name = "version")
+	private Integer version;
 
 	public Long getId() {
-        return this.id;
-    }
+		return this.id;
+	}
 
 	public void setId(Long id) {
-        this.id = id;
-    }
+		this.id = id;
+	}
 
 	public Integer getVersion() {
-        return this.version;
-    }
+		return this.version;
+	}
 
 	public void setVersion(Integer version) {
-        this.version = version;
-    }
+		this.version = version;
+	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 
 	public String toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(this);
+	}
 
 	public String toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(this);
+	}
 
 	public static StandardizationDryRunCompound fromJsonToStandardizationDryRunCompound(String json) {
-        return new JSONDeserializer<StandardizationDryRunCompound>()
-        .use(null, StandardizationDryRunCompound.class).deserialize(json);
-    }
+		return new JSONDeserializer<StandardizationDryRunCompound>()
+				.use(null, StandardizationDryRunCompound.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<StandardizationDryRunCompound> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<StandardizationDryRunCompound> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<StandardizationDryRunCompound> fromJsonArrayToStandardizationDryRunCompounds(String json) {
-        return new JSONDeserializer<List<StandardizationDryRunCompound>>()
-        .use("values", StandardizationDryRunCompound.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<StandardizationDryRunCompound>>()
+				.use("values", StandardizationDryRunCompound.class).deserialize(json);
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationHistory.java b/src/main/java/com/labsynch/labseer/domain/StandardizationHistory.java
index 9e84ed49d..9ee206787 100644
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationHistory.java
+++ b/src/main/java/com/labsynch/labseer/domain/StandardizationHistory.java
@@ -27,90 +27,98 @@
 
 public class StandardizationHistory {
 
-	@Id
-	@SequenceGenerator(name = "stndznHistGen", sequenceName = "STNDZN_HIST_PKSEQ")
-	@GeneratedValue(strategy = GenerationType.AUTO, generator = "stndznHistGen")
-	@Column(name = "id")
-	private Long id;
+    @Id
+    @SequenceGenerator(name = "stndznHistGen", sequenceName = "STNDZN_HIST_PKSEQ")
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "stndznHistGen")
+    @Column(name = "id")
+    private Long id;
 
-	private Date recordedDate;
+    private Date recordedDate;
 
-	private String settings;
+    private String settings;
 
-	private int settingsHash;
+    private int settingsHash;
 
-	private String dryRunStatus;
+    private String dryRunStatus;
 
-	private Date dryRunStart;
+    private Date dryRunStart;
 
-	private Date dryRunComplete;
+    private Date dryRunComplete;
 
-	private String standardizationStatus;
+    private String standardizationStatus;
 
-	private String standardizationUser;
+    private String standardizationUser;
 
-	private String standardizationReason;
+    private String standardizationReason;
 
-	private Date standardizationStart;
+    private Date standardizationStart;
 
-	private Date standardizationComplete;
+    private Date standardizationComplete;
 
-	private Integer structuresStandardizedCount;
+    private Integer structuresStandardizedCount;
 
-	private Integer structuresUpdatedCount;
+    private Integer structuresUpdatedCount;
 
-	private Integer newDuplicateCount;
+    private Integer newDuplicateCount;
 
-	private Integer existingDuplicateCount;
+    private Integer existingDuplicateCount;
 
-	private Integer displayChangeCount;
+    private Integer displayChangeCount;
 
-	private Integer asDrawnDisplayChangeCount;
+    private Integer asDrawnDisplayChangeCount;
 
-	private Integer changedStructureCount;
+    private Integer changedStructureCount;
 
-	private Integer dryRunStandardizationChangesCount;
+    private Integer dryRunStandardizationChangesCount;
 
-	private Integer standardizationErrorCount;
+    private Integer standardizationErrorCount;
 
-	private Integer registrationErrorCount;
-	
-	public StandardizationHistory() {
-	}
+    private Integer registrationErrorCount;
 
+    public StandardizationHistory() {
+    }
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("id", "recordedDate", "settings", "settingsHash", "dryRunStatus", "dryRunStart", "dryRunComplete", "standardizationStatus", "standardizationUser", "standardizationReason", "standardizationStart", "standardizationComplete", "structuresStandardizedCount", "structuresUpdatedCount", "newDuplicateCount", "existingDuplicateCount", "displayChangeCount", "asDrawnDisplayChangeCount", "changedStructureCount", "dryRunStandardizationChangesCount", "standardizationErrorCount", "registrationErrorCount");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("id", "recordedDate",
+            "settings", "settingsHash", "dryRunStatus", "dryRunStart", "dryRunComplete", "standardizationStatus",
+            "standardizationUser", "standardizationReason", "standardizationStart", "standardizationComplete",
+            "structuresStandardizedCount", "structuresUpdatedCount", "newDuplicateCount", "existingDuplicateCount",
+            "displayChangeCount", "asDrawnDisplayChangeCount", "changedStructureCount",
+            "dryRunStandardizationChangesCount", "standardizationErrorCount", "registrationErrorCount");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new StandardizationHistory().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countStandardizationHistorys() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM StandardizationHistory o", Long.class).getSingleResult();
+    public static long countStandardizationHistorys() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM StandardizationHistory o", Long.class)
+                .getSingleResult();
     }
 
-	public static List<StandardizationHistory> findAllStandardizationHistorys() {
-        return entityManager().createQuery("SELECT o FROM StandardizationHistory o", StandardizationHistory.class).getResultList();
+    public static List<StandardizationHistory> findAllStandardizationHistorys() {
+        return entityManager().createQuery("SELECT o FROM StandardizationHistory o", StandardizationHistory.class)
+                .getResultList();
     }
 
-	public static List<StandardizationHistory> findAllStandardizationHistorys(String sortFieldName, String sortOrder) {
+    public static List<StandardizationHistory> findAllStandardizationHistorys(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM StandardizationHistory o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -121,16 +129,19 @@ public static List<StandardizationHistory> findAllStandardizationHistorys(String
         return entityManager().createQuery(jpaQuery, StandardizationHistory.class).getResultList();
     }
 
-	public static StandardizationHistory findStandardizationHistory(Long id) {
-        if (id == null) return null;
+    public static StandardizationHistory findStandardizationHistory(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(StandardizationHistory.class, id);
     }
 
-	public static List<StandardizationHistory> findStandardizationHistoryEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM StandardizationHistory o", StandardizationHistory.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<StandardizationHistory> findStandardizationHistoryEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM StandardizationHistory o", StandardizationHistory.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<StandardizationHistory> findStandardizationHistoryEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<StandardizationHistory> findStandardizationHistoryEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM StandardizationHistory o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -138,18 +149,21 @@ public static List<StandardizationHistory> findStandardizationHistoryEntries(int
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, StandardizationHistory.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, StandardizationHistory.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -158,233 +172,236 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public StandardizationHistory merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         StandardizationHistory merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static StandardizationHistory fromJsonToStandardizationHistory(String json) {
+    public static StandardizationHistory fromJsonToStandardizationHistory(String json) {
         return new JSONDeserializer<StandardizationHistory>()
-        .use(null, StandardizationHistory.class).deserialize(json);
+                .use(null, StandardizationHistory.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<StandardizationHistory> collection) {
+    public static String toJsonArray(Collection<StandardizationHistory> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<StandardizationHistory> collection, String[] fields) {
+    public static String toJsonArray(Collection<StandardizationHistory> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<StandardizationHistory> fromJsonArrayToStandardizationHistorys(String json) {
+    public static Collection<StandardizationHistory> fromJsonArrayToStandardizationHistorys(String json) {
         return new JSONDeserializer<List<StandardizationHistory>>()
-        .use("values", StandardizationHistory.class).deserialize(json);
+                .use("values", StandardizationHistory.class).deserialize(json);
     }
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Date getRecordedDate() {
+    public Date getRecordedDate() {
         return this.recordedDate;
     }
 
-	public void setRecordedDate(Date recordedDate) {
+    public void setRecordedDate(Date recordedDate) {
         this.recordedDate = recordedDate;
     }
 
-	public String getSettings() {
+    public String getSettings() {
         return this.settings;
     }
 
-	public void setSettings(String settings) {
+    public void setSettings(String settings) {
         this.settings = settings;
     }
 
-	public int getSettingsHash() {
+    public int getSettingsHash() {
         return this.settingsHash;
     }
 
-	public void setSettingsHash(int settingsHash) {
+    public void setSettingsHash(int settingsHash) {
         this.settingsHash = settingsHash;
     }
 
-	public String getDryRunStatus() {
+    public String getDryRunStatus() {
         return this.dryRunStatus;
     }
 
-	public void setDryRunStatus(String dryRunStatus) {
+    public void setDryRunStatus(String dryRunStatus) {
         this.dryRunStatus = dryRunStatus;
     }
 
-	public Date getDryRunStart() {
+    public Date getDryRunStart() {
         return this.dryRunStart;
     }
 
-	public void setDryRunStart(Date dryRunStart) {
+    public void setDryRunStart(Date dryRunStart) {
         this.dryRunStart = dryRunStart;
     }
 
-	public Date getDryRunComplete() {
+    public Date getDryRunComplete() {
         return this.dryRunComplete;
     }
 
-	public void setDryRunComplete(Date dryRunComplete) {
+    public void setDryRunComplete(Date dryRunComplete) {
         this.dryRunComplete = dryRunComplete;
     }
 
-	public String getStandardizationStatus() {
+    public String getStandardizationStatus() {
         return this.standardizationStatus;
     }
 
-	public void setStandardizationStatus(String standardizationStatus) {
+    public void setStandardizationStatus(String standardizationStatus) {
         this.standardizationStatus = standardizationStatus;
     }
 
-	public String getStandardizationUser() {
+    public String getStandardizationUser() {
         return this.standardizationUser;
     }
 
-	public void setStandardizationUser(String standardizationUser) {
+    public void setStandardizationUser(String standardizationUser) {
         this.standardizationUser = standardizationUser;
     }
 
-	public String getStandardizationReason() {
+    public String getStandardizationReason() {
         return this.standardizationReason;
     }
 
-	public void setStandardizationReason(String standardizationReason) {
+    public void setStandardizationReason(String standardizationReason) {
         this.standardizationReason = standardizationReason;
     }
 
-	public Date getStandardizationStart() {
+    public Date getStandardizationStart() {
         return this.standardizationStart;
     }
 
-	public void setStandardizationStart(Date standardizationStart) {
+    public void setStandardizationStart(Date standardizationStart) {
         this.standardizationStart = standardizationStart;
     }
 
-	public Date getStandardizationComplete() {
+    public Date getStandardizationComplete() {
         return this.standardizationComplete;
     }
 
-	public void setStandardizationComplete(Date standardizationComplete) {
+    public void setStandardizationComplete(Date standardizationComplete) {
         this.standardizationComplete = standardizationComplete;
     }
 
-	public Integer getStructuresStandardizedCount() {
+    public Integer getStructuresStandardizedCount() {
         return this.structuresStandardizedCount;
     }
 
-	public void setStructuresStandardizedCount(Integer structuresStandardizedCount) {
+    public void setStructuresStandardizedCount(Integer structuresStandardizedCount) {
         this.structuresStandardizedCount = structuresStandardizedCount;
     }
 
-	public Integer getStructuresUpdatedCount() {
+    public Integer getStructuresUpdatedCount() {
         return this.structuresUpdatedCount;
     }
 
-	public void setStructuresUpdatedCount(Integer structuresUpdatedCount) {
+    public void setStructuresUpdatedCount(Integer structuresUpdatedCount) {
         this.structuresUpdatedCount = structuresUpdatedCount;
     }
 
-	public Integer getNewDuplicateCount() {
+    public Integer getNewDuplicateCount() {
         return this.newDuplicateCount;
     }
 
-	public void setNewDuplicateCount(Integer newDuplicateCount) {
+    public void setNewDuplicateCount(Integer newDuplicateCount) {
         this.newDuplicateCount = newDuplicateCount;
     }
 
-	public Integer getExistingDuplicateCount() {
+    public Integer getExistingDuplicateCount() {
         return this.existingDuplicateCount;
     }
 
-	public void setExistingDuplicateCount(Integer existingDuplicateCount) {
+    public void setExistingDuplicateCount(Integer existingDuplicateCount) {
         this.existingDuplicateCount = existingDuplicateCount;
     }
 
-	public Integer getDisplayChangeCount() {
+    public Integer getDisplayChangeCount() {
         return this.displayChangeCount;
     }
 
-	public void setDisplayChangeCount(Integer displayChangeCount) {
+    public void setDisplayChangeCount(Integer displayChangeCount) {
         this.displayChangeCount = displayChangeCount;
     }
 
-	public Integer getAsDrawnDisplayChangeCount() {
+    public Integer getAsDrawnDisplayChangeCount() {
         return this.asDrawnDisplayChangeCount;
     }
 
-	public void setAsDrawnDisplayChangeCount(Integer asDrawnDisplayChangeCount) {
+    public void setAsDrawnDisplayChangeCount(Integer asDrawnDisplayChangeCount) {
         this.asDrawnDisplayChangeCount = asDrawnDisplayChangeCount;
     }
 
-	public Integer getChangedStructureCount() {
+    public Integer getChangedStructureCount() {
         return this.changedStructureCount;
     }
 
-	public void setChangedStructureCount(Integer changedStructureCount) {
+    public void setChangedStructureCount(Integer changedStructureCount) {
         this.changedStructureCount = changedStructureCount;
     }
 
-	public Integer getDryRunStandardizationChangesCount() {
+    public Integer getDryRunStandardizationChangesCount() {
         return this.dryRunStandardizationChangesCount;
     }
 
-	public void setDryRunStandardizationChangesCount(Integer dryRunStandardizationChangesCount) {
+    public void setDryRunStandardizationChangesCount(Integer dryRunStandardizationChangesCount) {
         this.dryRunStandardizationChangesCount = dryRunStandardizationChangesCount;
     }
 
-	public Integer getStandardizationErrorCount() {
+    public Integer getStandardizationErrorCount() {
         return this.standardizationErrorCount;
     }
 
-	public void setStandardizationErrorCount(Integer standardizationErrorCount) {
+    public void setStandardizationErrorCount(Integer standardizationErrorCount) {
         this.standardizationErrorCount = standardizationErrorCount;
     }
 
-	public Integer getRegistrationErrorCount() {
+    public Integer getRegistrationErrorCount() {
         return this.registrationErrorCount;
     }
 
-	public void setRegistrationErrorCount(Integer registrationErrorCount) {
+    public void setRegistrationErrorCount(Integer registrationErrorCount) {
         this.registrationErrorCount = registrationErrorCount;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/domain/StandardizationSettings.java b/src/main/java/com/labsynch/labseer/domain/StandardizationSettings.java
index f26254191..245f81b06 100644
--- a/src/main/java/com/labsynch/labseer/domain/StandardizationSettings.java
+++ b/src/main/java/com/labsynch/labseer/domain/StandardizationSettings.java
@@ -1,4 +1,5 @@
 package com.labsynch.labseer.domain;
+
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
@@ -39,61 +40,66 @@ public class StandardizationSettings {
      */
     private Boolean needsStandardization;
 
-
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static StandardizationSettings fromJsonToStandardizationSettings(String json) {
+    public static StandardizationSettings fromJsonToStandardizationSettings(String json) {
         return new JSONDeserializer<StandardizationSettings>()
-        .use(null, StandardizationSettings.class).deserialize(json);
+                .use(null, StandardizationSettings.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<StandardizationSettings> collection) {
+    public static String toJsonArray(Collection<StandardizationSettings> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<StandardizationSettings> collection, String[] fields) {
+    public static String toJsonArray(Collection<StandardizationSettings> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<StandardizationSettings> fromJsonArrayToStandardizationSettingses(String json) {
+    public static Collection<StandardizationSettings> fromJsonArrayToStandardizationSettingses(String json) {
         return new JSONDeserializer<List<StandardizationSettings>>()
-        .use("values", StandardizationSettings.class).deserialize(json);
+                .use("values", StandardizationSettings.class).deserialize(json);
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("modifiedDate", "needsStandardization");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("modifiedDate",
+            "needsStandardization");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new StandardizationSettings().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countStandardizationSettingses() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM StandardizationSettings o", Long.class).getSingleResult();
+    public static long countStandardizationSettingses() {
+        return entityManager().createQuery("SELECT COUNT(o) FROM StandardizationSettings o", Long.class)
+                .getSingleResult();
     }
 
-	public static List<StandardizationSettings> findAllStandardizationSettingses() {
-        return entityManager().createQuery("SELECT o FROM StandardizationSettings o", StandardizationSettings.class).getResultList();
+    public static List<StandardizationSettings> findAllStandardizationSettingses() {
+        return entityManager().createQuery("SELECT o FROM StandardizationSettings o", StandardizationSettings.class)
+                .getResultList();
     }
 
-	public static List<StandardizationSettings> findAllStandardizationSettingses(String sortFieldName, String sortOrder) {
+    public static List<StandardizationSettings> findAllStandardizationSettingses(String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM StandardizationSettings o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -104,16 +110,19 @@ public static List<StandardizationSettings> findAllStandardizationSettingses(Str
         return entityManager().createQuery(jpaQuery, StandardizationSettings.class).getResultList();
     }
 
-	public static StandardizationSettings findStandardizationSettings(Long id) {
-        if (id == null) return null;
+    public static StandardizationSettings findStandardizationSettings(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(StandardizationSettings.class, id);
     }
 
-	public static List<StandardizationSettings> findStandardizationSettingsEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM StandardizationSettings o", StandardizationSettings.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<StandardizationSettings> findStandardizationSettingsEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM StandardizationSettings o", StandardizationSettings.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<StandardizationSettings> findStandardizationSettingsEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<StandardizationSettings> findStandardizationSettingsEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM StandardizationSettings o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -121,18 +130,21 @@ public static List<StandardizationSettings> findStandardizationSettingsEntries(i
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, StandardizationSettings.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, StandardizationSettings.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -141,46 +153,59 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public StandardizationSettings merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         StandardizationSettings merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public static Long countFindStandardizationSettingsesByNeedsStandardization(Boolean needsStandardization) {
-        if (needsStandardization == null) throw new IllegalArgumentException("The needsStandardization argument is required");
+    public static Long countFindStandardizationSettingsesByNeedsStandardization(Boolean needsStandardization) {
+        if (needsStandardization == null)
+            throw new IllegalArgumentException("The needsStandardization argument is required");
         EntityManager em = StandardizationSettings.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StandardizationSettings AS o WHERE o.needsStandardization = :needsStandardization", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM StandardizationSettings AS o WHERE o.needsStandardization = :needsStandardization",
+                Long.class);
         q.setParameter("needsStandardization", needsStandardization);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<StandardizationSettings> findStandardizationSettingsesByNeedsStandardization(Boolean needsStandardization) {
-        if (needsStandardization == null) throw new IllegalArgumentException("The needsStandardization argument is required");
+    public static TypedQuery<StandardizationSettings> findStandardizationSettingsesByNeedsStandardization(
+            Boolean needsStandardization) {
+        if (needsStandardization == null)
+            throw new IllegalArgumentException("The needsStandardization argument is required");
         EntityManager em = StandardizationSettings.entityManager();
-        TypedQuery<StandardizationSettings> q = em.createQuery("SELECT o FROM StandardizationSettings AS o WHERE o.needsStandardization = :needsStandardization", StandardizationSettings.class);
+        TypedQuery<StandardizationSettings> q = em.createQuery(
+                "SELECT o FROM StandardizationSettings AS o WHERE o.needsStandardization = :needsStandardization",
+                StandardizationSettings.class);
         q.setParameter("needsStandardization", needsStandardization);
         return q;
     }
 
-	public static TypedQuery<StandardizationSettings> findStandardizationSettingsesByNeedsStandardization(Boolean needsStandardization, String sortFieldName, String sortOrder) {
-        if (needsStandardization == null) throw new IllegalArgumentException("The needsStandardization argument is required");
+    public static TypedQuery<StandardizationSettings> findStandardizationSettingsesByNeedsStandardization(
+            Boolean needsStandardization, String sortFieldName, String sortOrder) {
+        if (needsStandardization == null)
+            throw new IllegalArgumentException("The needsStandardization argument is required");
         EntityManager em = StandardizationSettings.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StandardizationSettings AS o WHERE o.needsStandardization = :needsStandardization");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM StandardizationSettings AS o WHERE o.needsStandardization = :needsStandardization");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -192,44 +217,44 @@ public static TypedQuery<StandardizationSettings> findStandardizationSettingsesB
         return q;
     }
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public Date getModifiedDate() {
+    public Date getModifiedDate() {
         return this.modifiedDate;
     }
 
-	public void setModifiedDate(Date modifiedDate) {
+    public void setModifiedDate(Date modifiedDate) {
         this.modifiedDate = modifiedDate;
     }
 
-	public Boolean getNeedsStandardization() {
+    public Boolean getNeedsStandardization() {
         return this.needsStandardization;
     }
 
-	public void setNeedsStandardization(Boolean needsStandardization) {
+    public void setNeedsStandardization(Boolean needsStandardization) {
         this.needsStandardization = needsStandardization;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/domain/StateKind.java b/src/main/java/com/labsynch/labseer/domain/StateKind.java
index 3a0c08ffa..d6764f808 100755
--- a/src/main/java/com/labsynch/labseer/domain/StateKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/StateKind.java
@@ -79,7 +79,9 @@ public void setVersion(Integer version) {
 
     public static final EntityManager entityManager() {
         EntityManager em = new StateKind().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
@@ -92,25 +94,30 @@ public static List<com.labsynch.labseer.domain.StateKind> findAllStateKinds() {
     }
 
     public static com.labsynch.labseer.domain.StateKind findStateKind(Long id) {
-        if (id == null) return null;
+        if (id == null)
+            return null;
         return entityManager().find(StateKind.class, id);
     }
 
     public static List<com.labsynch.labseer.domain.StateKind> findStateKindEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM StateKind o", StateKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery("SELECT o FROM StateKind o", StateKind.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
     @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.lsType = StateType.findStateType(this.getLsType().getId());
-        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_').append(this.getKindName()).toString();
+        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_')
+                .append(this.getKindName()).toString();
         this.entityManager.persist(this);
     }
 
     @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -121,76 +128,81 @@ public void remove() {
 
     @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
     @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
     @Transactional
     public com.labsynch.labseer.domain.StateKind merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_').append(this.getKindName()).toString();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
+        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_')
+                .append(this.getKindName()).toString();
         StateKind merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
     public static StateKind getOrCreate(StateType lsType, String kindName) {
-    	StateKind lsKind = null;
-		List<StateKind> lsKinds = StateKind.findStateKindsByKindNameEqualsAndLsType(kindName, lsType).getResultList();
-		
-		if (lsKinds.size() == 0){
-			lsKind = new StateKind();
-			lsKind.setKindName(kindName);
-			lsKind.setLsType(lsType);
-			lsKind.persist();
-		} else if (lsKinds.size() == 1){
-			lsKind = lsKinds.get(0);
-		} else if (lsKinds.size() > 1){
-			logger.error("ERROR: multiple state kinds with the same name and type");
-		}
-		
-		return lsKind;
-	}
-
-	public String toJson() {
+        StateKind lsKind = null;
+        List<StateKind> lsKinds = StateKind.findStateKindsByKindNameEqualsAndLsType(kindName, lsType).getResultList();
+
+        if (lsKinds.size() == 0) {
+            lsKind = new StateKind();
+            lsKind.setKindName(kindName);
+            lsKind.setLsType(lsType);
+            lsKind.persist();
+        } else if (lsKinds.size() == 1) {
+            lsKind = lsKinds.get(0);
+        } else if (lsKinds.size() > 1) {
+            logger.error("ERROR: multiple state kinds with the same name and type");
+        }
+
+        return lsKind;
+    }
+
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static StateKind fromJsonToStateKind(String json) {
+    public static StateKind fromJsonToStateKind(String json) {
         return new JSONDeserializer<StateKind>()
-        .use(null, StateKind.class).deserialize(json);
+                .use(null, StateKind.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<StateKind> collection) {
+    public static String toJsonArray(Collection<StateKind> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<StateKind> collection, String[] fields) {
+    public static String toJsonArray(Collection<StateKind> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<StateKind> fromJsonArrayToStateKinds(String json) {
+    public static Collection<StateKind> fromJsonArrayToStateKinds(String json) {
         return new JSONDeserializer<List<StateKind>>()
-        .use("values", StateKind.class).deserialize(json);
+                .use("values", StateKind.class).deserialize(json);
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType",
+            "kindName", "lsTypeAndKind", "id", "version", "entityManager");
 
-	public static List<StateKind> findAllStateKinds(String sortFieldName, String sortOrder) {
+    public static List<StateKind> findAllStateKinds(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM StateKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -201,7 +213,8 @@ public static List<StateKind> findAllStateKinds(String sortFieldName, String sor
         return entityManager().createQuery(jpaQuery, StateKind.class).getResultList();
     }
 
-	public static List<StateKind> findStateKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<StateKind> findStateKindEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM StateKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -209,45 +222,55 @@ public static List<StateKind> findStateKindEntries(int firstResult, int maxResul
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, StateKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, StateKind.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static Long countFindStateKindsByKindNameEquals(String kindName) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+    public static Long countFindStateKindsByKindNameEquals(String kindName) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
         EntityManager em = StateKind.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StateKind AS o WHERE o.kindName = :kindName", Long.class);
         q.setParameter("kindName", kindName);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindStateKindsByKindNameEqualsAndLsType(String kindName, StateType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static Long countFindStateKindsByKindNameEqualsAndLsType(String kindName, StateType lsType) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = StateKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StateKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM StateKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
         q.setParameter("kindName", kindName);
         q.setParameter("lsType", lsType);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindStateKindsByLsType(StateType lsType) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static Long countFindStateKindsByLsType(StateType lsType) {
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = StateKind.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StateKind AS o WHERE o.lsType = :lsType", Long.class);
         q.setParameter("lsType", lsType);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<StateKind> findStateKindsByKindNameEquals(String kindName) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+    public static TypedQuery<StateKind> findStateKindsByKindNameEquals(String kindName) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
         EntityManager em = StateKind.entityManager();
-        TypedQuery<StateKind> q = em.createQuery("SELECT o FROM StateKind AS o WHERE o.kindName = :kindName", StateKind.class);
+        TypedQuery<StateKind> q = em.createQuery("SELECT o FROM StateKind AS o WHERE o.kindName = :kindName",
+                StateKind.class);
         q.setParameter("kindName", kindName);
         return q;
     }
 
-	public static TypedQuery<StateKind> findStateKindsByKindNameEquals(String kindName, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+    public static TypedQuery<StateKind> findStateKindsByKindNameEquals(String kindName, String sortFieldName,
+            String sortOrder) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
         EntityManager em = StateKind.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StateKind AS o WHERE o.kindName = :kindName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -261,21 +284,28 @@ public static TypedQuery<StateKind> findStateKindsByKindNameEquals(String kindNa
         return q;
     }
 
-	public static TypedQuery<StateKind> findStateKindsByKindNameEqualsAndLsType(String kindName, StateType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<StateKind> findStateKindsByKindNameEqualsAndLsType(String kindName, StateType lsType) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = StateKind.entityManager();
-        TypedQuery<StateKind> q = em.createQuery("SELECT o FROM StateKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", StateKind.class);
+        TypedQuery<StateKind> q = em.createQuery(
+                "SELECT o FROM StateKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", StateKind.class);
         q.setParameter("kindName", kindName);
         q.setParameter("lsType", lsType);
         return q;
     }
 
-	public static TypedQuery<StateKind> findStateKindsByKindNameEqualsAndLsType(String kindName, StateType lsType, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<StateKind> findStateKindsByKindNameEqualsAndLsType(String kindName, StateType lsType,
+            String sortFieldName, String sortOrder) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = StateKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StateKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM StateKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -288,16 +318,20 @@ public static TypedQuery<StateKind> findStateKindsByKindNameEqualsAndLsType(Stri
         return q;
     }
 
-	public static TypedQuery<StateKind> findStateKindsByLsType(StateType lsType) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<StateKind> findStateKindsByLsType(StateType lsType) {
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = StateKind.entityManager();
-        TypedQuery<StateKind> q = em.createQuery("SELECT o FROM StateKind AS o WHERE o.lsType = :lsType", StateKind.class);
+        TypedQuery<StateKind> q = em.createQuery("SELECT o FROM StateKind AS o WHERE o.lsType = :lsType",
+                StateKind.class);
         q.setParameter("lsType", lsType);
         return q;
     }
 
-	public static TypedQuery<StateKind> findStateKindsByLsType(StateType lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<StateKind> findStateKindsByLsType(StateType lsType, String sortFieldName,
+            String sortOrder) {
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = StateKind.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StateKind AS o WHERE o.lsType = :lsType");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -311,31 +345,31 @@ public static TypedQuery<StateKind> findStateKindsByLsType(StateType lsType, Str
         return q;
     }
 
-	public StateType getLsType() {
+    public StateType getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(StateType lsType) {
+    public void setLsType(StateType lsType) {
         this.lsType = lsType;
     }
 
-	public String getKindName() {
+    public String getKindName() {
         return this.kindName;
     }
 
-	public void setKindName(String kindName) {
+    public void setKindName(String kindName) {
         this.kindName = kindName;
     }
 
-	public String getLsTypeAndKind() {
+    public String getLsTypeAndKind() {
         return this.lsTypeAndKind;
     }
 
-	public void setLsTypeAndKind(String lsTypeAndKind) {
+    public void setLsTypeAndKind(String lsTypeAndKind) {
         this.lsTypeAndKind = lsTypeAndKind;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/StateType.java b/src/main/java/com/labsynch/labseer/domain/StateType.java
index 319c6deb7..19102db07 100755
--- a/src/main/java/com/labsynch/labseer/domain/StateType.java
+++ b/src/main/java/com/labsynch/labseer/domain/StateType.java
@@ -53,60 +53,63 @@ public static com.labsynch.labseer.domain.StateType getOrCreate(String name) {
         return lsType;
     }
 
-	@Id
+    @Id
     @SequenceGenerator(name = "stateTypeGen", sequenceName = "STATE_TYPE_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "stateTypeGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String getTypeName() {
+    public String getTypeName() {
         return this.typeName;
     }
 
-	public void setTypeName(String typeName) {
+    public void setTypeName(String typeName) {
         this.typeName = typeName;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "typeName", "id", "version");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "typeName", "id",
+            "version");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new StateType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countStateTypes() {
+    public static long countStateTypes() {
         return entityManager().createQuery("SELECT COUNT(o) FROM StateType o", Long.class).getSingleResult();
     }
 
-	public static List<StateType> findAllStateTypes() {
+    public static List<StateType> findAllStateTypes() {
         return entityManager().createQuery("SELECT o FROM StateType o", StateType.class).getResultList();
     }
 
-	public static List<StateType> findAllStateTypes(String sortFieldName, String sortOrder) {
+    public static List<StateType> findAllStateTypes(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM StateType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -117,16 +120,19 @@ public static List<StateType> findAllStateTypes(String sortFieldName, String sor
         return entityManager().createQuery(jpaQuery, StateType.class).getResultList();
     }
 
-	public static StateType findStateType(Long id) {
-        if (id == null) return null;
+    public static StateType findStateType(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(StateType.class, id);
     }
 
-	public static List<StateType> findStateTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM StateType o", StateType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<StateType> findStateTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM StateType o", StateType.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<StateType> findStateTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<StateType> findStateTypeEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM StateType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -134,18 +140,21 @@ public static List<StateType> findStateTypeEntries(int firstResult, int maxResul
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, StateType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, StateType.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -154,78 +163,86 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public StateType merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         StateType merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static StateType fromJsonToStateType(String json) {
+    public static StateType fromJsonToStateType(String json) {
         return new JSONDeserializer<StateType>()
-        .use(null, StateType.class).deserialize(json);
+                .use(null, StateType.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<StateType> collection) {
+    public static String toJsonArray(Collection<StateType> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<StateType> collection, String[] fields) {
+    public static String toJsonArray(Collection<StateType> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<StateType> fromJsonArrayToStateTypes(String json) {
+    public static Collection<StateType> fromJsonArrayToStateTypes(String json) {
         return new JSONDeserializer<List<StateType>>()
-        .use("values", StateType.class).deserialize(json);
+                .use("values", StateType.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static Long countFindStateTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static Long countFindStateTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = StateType.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StateType AS o WHERE o.typeName = :typeName", Long.class);
         q.setParameter("typeName", typeName);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<StateType> findStateTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static TypedQuery<StateType> findStateTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = StateType.entityManager();
-        TypedQuery<StateType> q = em.createQuery("SELECT o FROM StateType AS o WHERE o.typeName = :typeName", StateType.class);
+        TypedQuery<StateType> q = em.createQuery("SELECT o FROM StateType AS o WHERE o.typeName = :typeName",
+                StateType.class);
         q.setParameter("typeName", typeName);
         return q;
     }
 
-	public static TypedQuery<StateType> findStateTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static TypedQuery<StateType> findStateTypesByTypeNameEquals(String typeName, String sortFieldName,
+            String sortOrder) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = StateType.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StateType AS o WHERE o.typeName = :typeName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
diff --git a/src/main/java/com/labsynch/labseer/domain/StereoCategory.java b/src/main/java/com/labsynch/labseer/domain/StereoCategory.java
index b5b38c342..9b05b5df3 100755
--- a/src/main/java/com/labsynch/labseer/domain/StereoCategory.java
+++ b/src/main/java/com/labsynch/labseer/domain/StereoCategory.java
@@ -32,43 +32,47 @@ public class StereoCategory {
 
     @Size(max = 255)
     private String code;
-    
+
     public static TypedQuery<StereoCategory> findStereoCategoriesBySearchTerm(String searchTerm) {
-        if (searchTerm == null || searchTerm.length() == 0) throw new IllegalArgumentException("The searchTerm argument is required");
+        if (searchTerm == null || searchTerm.length() == 0)
+            throw new IllegalArgumentException("The searchTerm argument is required");
         searchTerm = searchTerm.replace('*', '%');
         if (searchTerm.charAt(0) != '%') {
-        	searchTerm = "%" + searchTerm;
+            searchTerm = "%" + searchTerm;
         }
         if (searchTerm.charAt(searchTerm.length() - 1) != '%') {
-        	searchTerm = searchTerm + "%";
+            searchTerm = searchTerm + "%";
         }
         EntityManager em = StereoCategory.entityManager();
-        TypedQuery<StereoCategory> q = em.createQuery("SELECT DISTINCT o FROM StereoCategory AS o WHERE (LOWER(o.code) LIKE LOWER(:searchTerm) OR LOWER(o.name) LIKE LOWER(:searchTerm))", StereoCategory.class);
+        TypedQuery<StereoCategory> q = em.createQuery(
+                "SELECT DISTINCT o FROM StereoCategory AS o WHERE (LOWER(o.code) LIKE LOWER(:searchTerm) OR LOWER(o.name) LIKE LOWER(:searchTerm))",
+                StereoCategory.class);
         q.setParameter("searchTerm", searchTerm);
         return q;
     }
-    
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new StereoCategory().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countStereoCategorys() {
+    public static long countStereoCategorys() {
         return entityManager().createQuery("SELECT COUNT(o) FROM StereoCategory o", Long.class).getSingleResult();
     }
 
-	public static List<StereoCategory> findAllStereoCategorys() {
+    public static List<StereoCategory> findAllStereoCategorys() {
         return entityManager().createQuery("SELECT o FROM StereoCategory o", StereoCategory.class).getResultList();
     }
 
-	public static List<StereoCategory> findAllStereoCategorys(String sortFieldName, String sortOrder) {
+    public static List<StereoCategory> findAllStereoCategorys(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM StereoCategory o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -79,16 +83,19 @@ public static List<StereoCategory> findAllStereoCategorys(String sortFieldName,
         return entityManager().createQuery(jpaQuery, StereoCategory.class).getResultList();
     }
 
-	public static StereoCategory findStereoCategory(Long id) {
-        if (id == null) return null;
+    public static StereoCategory findStereoCategory(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(StereoCategory.class, id);
     }
 
-	public static List<StereoCategory> findStereoCategoryEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM StereoCategory o", StereoCategory.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<StereoCategory> findStereoCategoryEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM StereoCategory o", StereoCategory.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<StereoCategory> findStereoCategoryEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<StereoCategory> findStereoCategoryEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM StereoCategory o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -96,18 +103,21 @@ public static List<StereoCategory> findStereoCategoryEntries(int firstResult, in
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, StereoCategory.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, StereoCategory.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -116,36 +126,41 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public StereoCategory merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         StereoCategory merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public static Long countFindStereoCategorysByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static Long countFindStereoCategorysByCodeEquals(String code) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = StereoCategory.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StereoCategory AS o WHERE o.code = :code", Long.class);
         q.setParameter("code", code);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindStereoCategorysByCodeLike(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static Long countFindStereoCategorysByCodeLike(String code) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         code = code.replace('*', '%');
         if (code.charAt(0) != '%') {
             code = "%" + code;
@@ -154,21 +169,26 @@ public static Long countFindStereoCategorysByCodeLike(String code) {
             code = code + "%";
         }
         EntityManager em = StereoCategory.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StereoCategory AS o WHERE LOWER(o.code) LIKE LOWER(:code)", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StereoCategory AS o WHERE LOWER(o.code) LIKE LOWER(:code)",
+                Long.class);
         q.setParameter("code", code);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<StereoCategory> findStereoCategorysByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static TypedQuery<StereoCategory> findStereoCategorysByCodeEquals(String code) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = StereoCategory.entityManager();
-        TypedQuery<StereoCategory> q = em.createQuery("SELECT o FROM StereoCategory AS o WHERE o.code = :code", StereoCategory.class);
+        TypedQuery<StereoCategory> q = em.createQuery("SELECT o FROM StereoCategory AS o WHERE o.code = :code",
+                StereoCategory.class);
         q.setParameter("code", code);
         return q;
     }
 
-	public static TypedQuery<StereoCategory> findStereoCategorysByCodeEquals(String code, String sortFieldName, String sortOrder) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static TypedQuery<StereoCategory> findStereoCategorysByCodeEquals(String code, String sortFieldName,
+            String sortOrder) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = StereoCategory.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StereoCategory AS o WHERE o.code = :code");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -182,8 +202,9 @@ public static TypedQuery<StereoCategory> findStereoCategorysByCodeEquals(String
         return q;
     }
 
-	public static TypedQuery<StereoCategory> findStereoCategorysByCodeLike(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static TypedQuery<StereoCategory> findStereoCategorysByCodeLike(String code) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         code = code.replace('*', '%');
         if (code.charAt(0) != '%') {
             code = "%" + code;
@@ -192,13 +213,16 @@ public static TypedQuery<StereoCategory> findStereoCategorysByCodeLike(String co
             code = code + "%";
         }
         EntityManager em = StereoCategory.entityManager();
-        TypedQuery<StereoCategory> q = em.createQuery("SELECT o FROM StereoCategory AS o WHERE LOWER(o.code) LIKE LOWER(:code)", StereoCategory.class);
+        TypedQuery<StereoCategory> q = em.createQuery(
+                "SELECT o FROM StereoCategory AS o WHERE LOWER(o.code) LIKE LOWER(:code)", StereoCategory.class);
         q.setParameter("code", code);
         return q;
     }
 
-	public static TypedQuery<StereoCategory> findStereoCategorysByCodeLike(String code, String sortFieldName, String sortOrder) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static TypedQuery<StereoCategory> findStereoCategorysByCodeLike(String code, String sortFieldName,
+            String sortOrder) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         code = code.replace('*', '%');
         if (code.charAt(0) != '%') {
             code = "%" + code;
@@ -207,7 +231,8 @@ public static TypedQuery<StereoCategory> findStereoCategorysByCodeLike(String co
             code = code + "%";
         }
         EntityManager em = StereoCategory.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StereoCategory AS o WHERE LOWER(o.code) LIKE LOWER(:code)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM StereoCategory AS o WHERE LOWER(o.code) LIKE LOWER(:code)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -219,78 +244,78 @@ public static TypedQuery<StereoCategory> findStereoCategorysByCodeLike(String co
         return q;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static StereoCategory fromJsonToStereoCategory(String json) {
+    public static StereoCategory fromJsonToStereoCategory(String json) {
         return new JSONDeserializer<StereoCategory>()
-        .use(null, StereoCategory.class).deserialize(json);
+                .use(null, StereoCategory.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<StereoCategory> collection) {
+    public static String toJsonArray(Collection<StereoCategory> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<StereoCategory> collection, String[] fields) {
+    public static String toJsonArray(Collection<StereoCategory> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<StereoCategory> fromJsonArrayToStereoCategorys(String json) {
+    public static Collection<StereoCategory> fromJsonArrayToStereoCategorys(String json) {
         return new JSONDeserializer<List<StereoCategory>>()
-        .use("values", StereoCategory.class).deserialize(json);
+                .use("values", StereoCategory.class).deserialize(json);
     }
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String getName() {
+    public String getName() {
         return this.name;
     }
 
-	public void setName(String name) {
+    public void setName(String name) {
         this.name = name;
     }
 
-	public String getCode() {
+    public String getCode() {
         return this.code;
     }
 
-	public void setCode(String code) {
+    public void setCode(String code) {
         this.code = code;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/StructureKind.java b/src/main/java/com/labsynch/labseer/domain/StructureKind.java
index a3cb4397a..8bb09ad9f 100644
--- a/src/main/java/com/labsynch/labseer/domain/StructureKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/StructureKind.java
@@ -78,7 +78,9 @@ public void setVersion(Integer version) {
 
     public static final EntityManager entityManager() {
         EntityManager em = new StructureKind().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
@@ -91,25 +93,31 @@ public static List<com.labsynch.labseer.domain.StructureKind> findAllStructureKi
     }
 
     public static com.labsynch.labseer.domain.StructureKind findStructureKind(Long id) {
-        if (id == null) return null;
+        if (id == null)
+            return null;
         return entityManager().find(StructureKind.class, id);
     }
 
-    public static List<com.labsynch.labseer.domain.StructureKind> findStructureKindEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM StructureKind o", StructureKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<com.labsynch.labseer.domain.StructureKind> findStructureKindEntries(int firstResult,
+            int maxResults) {
+        return entityManager().createQuery("SELECT o FROM StructureKind o", StructureKind.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
     @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.lsType = StructureType.findStructureType(this.getLsType().getId());
-        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_').append(this.getKindName()).toString();
+        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_')
+                .append(this.getKindName()).toString();
         this.entityManager.persist(this);
     }
 
     @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -120,79 +128,95 @@ public void remove() {
 
     @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
     @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
     @Transactional
     public com.labsynch.labseer.domain.StructureKind merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_').append(this.getKindName()).toString();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
+        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_')
+                .append(this.getKindName()).toString();
         StructureKind merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
     public static StructureKind getOrCreate(StructureType lsType, String kindName) {
-    	StructureKind lsKind = null;
-		List<StructureKind> lsKinds = StructureKind.findStructureKindsByKindNameEqualsAndLsType(kindName, lsType).getResultList();
-		
-		if (lsKinds.size() == 0){
-			lsKind = new StructureKind();
-			lsKind.setKindName(kindName);
-			lsKind.setLsType(lsType);
-			lsKind.persist();
-		} else if (lsKinds.size() == 1){
-			lsKind = lsKinds.get(0);
-		} else if (lsKinds.size() > 1){
-			logger.error("ERROR: multiple Structure kinds with the same name and type");
-		}
-		
-		return lsKind;
-	}
-
-	public static Long countFindStructureKindsByKindNameEquals(String kindName) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+        StructureKind lsKind = null;
+        List<StructureKind> lsKinds = StructureKind.findStructureKindsByKindNameEqualsAndLsType(kindName, lsType)
+                .getResultList();
+
+        if (lsKinds.size() == 0) {
+            lsKind = new StructureKind();
+            lsKind.setKindName(kindName);
+            lsKind.setLsType(lsType);
+            lsKind.persist();
+        } else if (lsKinds.size() == 1) {
+            lsKind = lsKinds.get(0);
+        } else if (lsKinds.size() > 1) {
+            logger.error("ERROR: multiple Structure kinds with the same name and type");
+        }
+
+        return lsKind;
+    }
+
+    public static Long countFindStructureKindsByKindNameEquals(String kindName) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
         EntityManager em = StructureKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StructureKind AS o WHERE o.kindName = :kindName", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StructureKind AS o WHERE o.kindName = :kindName",
+                Long.class);
         q.setParameter("kindName", kindName);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindStructureKindsByKindNameEqualsAndLsType(String kindName, StructureType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static Long countFindStructureKindsByKindNameEqualsAndLsType(String kindName, StructureType lsType) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = StructureKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StructureKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM StructureKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType",
+                Long.class);
         q.setParameter("kindName", kindName);
         q.setParameter("lsType", lsType);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindStructureKindsByLsType(StructureType lsType) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static Long countFindStructureKindsByLsType(StructureType lsType) {
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = StructureKind.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StructureKind AS o WHERE o.lsType = :lsType", Long.class);
         q.setParameter("lsType", lsType);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<StructureKind> findStructureKindsByKindNameEquals(String kindName) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+    public static TypedQuery<StructureKind> findStructureKindsByKindNameEquals(String kindName) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
         EntityManager em = StructureKind.entityManager();
-        TypedQuery<StructureKind> q = em.createQuery("SELECT o FROM StructureKind AS o WHERE o.kindName = :kindName", StructureKind.class);
+        TypedQuery<StructureKind> q = em.createQuery("SELECT o FROM StructureKind AS o WHERE o.kindName = :kindName",
+                StructureKind.class);
         q.setParameter("kindName", kindName);
         return q;
     }
 
-	public static TypedQuery<StructureKind> findStructureKindsByKindNameEquals(String kindName, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
+    public static TypedQuery<StructureKind> findStructureKindsByKindNameEquals(String kindName, String sortFieldName,
+            String sortOrder) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
         EntityManager em = StructureKind.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StructureKind AS o WHERE o.kindName = :kindName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -206,21 +230,30 @@ public static TypedQuery<StructureKind> findStructureKindsByKindNameEquals(Strin
         return q;
     }
 
-	public static TypedQuery<StructureKind> findStructureKindsByKindNameEqualsAndLsType(String kindName, StructureType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<StructureKind> findStructureKindsByKindNameEqualsAndLsType(String kindName,
+            StructureType lsType) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = StructureKind.entityManager();
-        TypedQuery<StructureKind> q = em.createQuery("SELECT o FROM StructureKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", StructureKind.class);
+        TypedQuery<StructureKind> q = em.createQuery(
+                "SELECT o FROM StructureKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType",
+                StructureKind.class);
         q.setParameter("kindName", kindName);
         q.setParameter("lsType", lsType);
         return q;
     }
 
-	public static TypedQuery<StructureKind> findStructureKindsByKindNameEqualsAndLsType(String kindName, StructureType lsType, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<StructureKind> findStructureKindsByKindNameEqualsAndLsType(String kindName,
+            StructureType lsType, String sortFieldName, String sortOrder) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = StructureKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StructureKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM StructureKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -233,16 +266,20 @@ public static TypedQuery<StructureKind> findStructureKindsByKindNameEqualsAndLsT
         return q;
     }
 
-	public static TypedQuery<StructureKind> findStructureKindsByLsType(StructureType lsType) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<StructureKind> findStructureKindsByLsType(StructureType lsType) {
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = StructureKind.entityManager();
-        TypedQuery<StructureKind> q = em.createQuery("SELECT o FROM StructureKind AS o WHERE o.lsType = :lsType", StructureKind.class);
+        TypedQuery<StructureKind> q = em.createQuery("SELECT o FROM StructureKind AS o WHERE o.lsType = :lsType",
+                StructureKind.class);
         q.setParameter("lsType", lsType);
         return q;
     }
 
-	public static TypedQuery<StructureKind> findStructureKindsByLsType(StructureType lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<StructureKind> findStructureKindsByLsType(StructureType lsType, String sortFieldName,
+            String sortOrder) {
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = StructureKind.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StructureKind AS o WHERE o.lsType = :lsType");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -256,33 +293,34 @@ public static TypedQuery<StructureKind> findStructureKindsByLsType(StructureType
         return q;
     }
 
-	public StructureType getLsType() {
+    public StructureType getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(StructureType lsType) {
+    public void setLsType(StructureType lsType) {
         this.lsType = lsType;
     }
 
-	public String getKindName() {
+    public String getKindName() {
         return this.kindName;
     }
 
-	public void setKindName(String kindName) {
+    public void setKindName(String kindName) {
         this.kindName = kindName;
     }
 
-	public String getLsTypeAndKind() {
+    public String getLsTypeAndKind() {
         return this.lsTypeAndKind;
     }
 
-	public void setLsTypeAndKind(String lsTypeAndKind) {
+    public void setLsTypeAndKind(String lsTypeAndKind) {
         this.lsTypeAndKind = lsTypeAndKind;
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType",
+            "kindName", "lsTypeAndKind", "id", "version", "entityManager");
 
-	public static List<StructureKind> findAllStructureKinds(String sortFieldName, String sortOrder) {
+    public static List<StructureKind> findAllStructureKinds(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM StructureKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -293,7 +331,8 @@ public static List<StructureKind> findAllStructureKinds(String sortFieldName, St
         return entityManager().createQuery(jpaQuery, StructureKind.class).getResultList();
     }
 
-	public static List<StructureKind> findStructureKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<StructureKind> findStructureKindEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM StructureKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -301,40 +340,41 @@ public static List<StructureKind> findStructureKindEntries(int firstResult, int
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, StructureKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, StructureKind.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static StructureKind fromJsonToStructureKind(String json) {
+    public static StructureKind fromJsonToStructureKind(String json) {
         return new JSONDeserializer<StructureKind>()
-        .use(null, StructureKind.class).deserialize(json);
+                .use(null, StructureKind.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<StructureKind> collection) {
+    public static String toJsonArray(Collection<StructureKind> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<StructureKind> collection, String[] fields) {
+    public static String toJsonArray(Collection<StructureKind> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<StructureKind> fromJsonArrayToStructureKinds(String json) {
+    public static Collection<StructureKind> fromJsonArrayToStructureKinds(String json) {
         return new JSONDeserializer<List<StructureKind>>()
-        .use("values", StructureKind.class).deserialize(json);
+                .use("values", StructureKind.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/StructureType.java b/src/main/java/com/labsynch/labseer/domain/StructureType.java
index 0d6bce5b4..f4cf201b3 100644
--- a/src/main/java/com/labsynch/labseer/domain/StructureType.java
+++ b/src/main/java/com/labsynch/labseer/domain/StructureType.java
@@ -53,88 +53,94 @@ public static com.labsynch.labseer.domain.StructureType getOrCreate(String name)
         return lsType;
     }
 
-	@Id
+    @Id
     @SequenceGenerator(name = "structureTypeGen", sequenceName = "STRUCTURE_TYPE_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "structureTypeGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static StructureType fromJsonToStructureType(String json) {
+    public static StructureType fromJsonToStructureType(String json) {
         return new JSONDeserializer<StructureType>()
-        .use(null, StructureType.class).deserialize(json);
+                .use(null, StructureType.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<StructureType> collection) {
+    public static String toJsonArray(Collection<StructureType> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<StructureType> collection, String[] fields) {
+    public static String toJsonArray(Collection<StructureType> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<StructureType> fromJsonArrayToStructureTypes(String json) {
+    public static Collection<StructureType> fromJsonArrayToStructureTypes(String json) {
         return new JSONDeserializer<List<StructureType>>()
-        .use("values", StructureType.class).deserialize(json);
+                .use("values", StructureType.class).deserialize(json);
     }
 
-	public String getTypeName() {
+    public String getTypeName() {
         return this.typeName;
     }
 
-	public void setTypeName(String typeName) {
+    public void setTypeName(String typeName) {
         this.typeName = typeName;
     }
 
-	public static Long countFindStructureTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static Long countFindStructureTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = StructureType.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StructureType AS o WHERE o.typeName = :typeName", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM StructureType AS o WHERE o.typeName = :typeName",
+                Long.class);
         q.setParameter("typeName", typeName);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<StructureType> findStructureTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static TypedQuery<StructureType> findStructureTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = StructureType.entityManager();
-        TypedQuery<StructureType> q = em.createQuery("SELECT o FROM StructureType AS o WHERE o.typeName = :typeName", StructureType.class);
+        TypedQuery<StructureType> q = em.createQuery("SELECT o FROM StructureType AS o WHERE o.typeName = :typeName",
+                StructureType.class);
         q.setParameter("typeName", typeName);
         return q;
     }
 
-	public static TypedQuery<StructureType> findStructureTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static TypedQuery<StructureType> findStructureTypesByTypeNameEquals(String typeName, String sortFieldName,
+            String sortOrder) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = StructureType.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM StructureType AS o WHERE o.typeName = :typeName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -148,26 +154,29 @@ public static TypedQuery<StructureType> findStructureTypesByTypeNameEquals(Strin
         return q;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "typeName", "id", "version");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "typeName", "id",
+            "version");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new StructureType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countStructureTypes() {
+    public static long countStructureTypes() {
         return entityManager().createQuery("SELECT COUNT(o) FROM StructureType o", Long.class).getSingleResult();
     }
 
-	public static List<StructureType> findAllStructureTypes() {
+    public static List<StructureType> findAllStructureTypes() {
         return entityManager().createQuery("SELECT o FROM StructureType o", StructureType.class).getResultList();
     }
 
-	public static List<StructureType> findAllStructureTypes(String sortFieldName, String sortOrder) {
+    public static List<StructureType> findAllStructureTypes(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM StructureType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -178,16 +187,19 @@ public static List<StructureType> findAllStructureTypes(String sortFieldName, St
         return entityManager().createQuery(jpaQuery, StructureType.class).getResultList();
     }
 
-	public static StructureType findStructureType(Long id) {
-        if (id == null) return null;
+    public static StructureType findStructureType(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(StructureType.class, id);
     }
 
-	public static List<StructureType> findStructureTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM StructureType o", StructureType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<StructureType> findStructureTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM StructureType o", StructureType.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<StructureType> findStructureTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<StructureType> findStructureTypeEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM StructureType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -195,18 +207,21 @@ public static List<StructureType> findStructureTypeEntries(int firstResult, int
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, StructureType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, StructureType.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -215,27 +230,30 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public StructureType merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         StructureType merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/Subject.java b/src/main/java/com/labsynch/labseer/domain/Subject.java
index f61c5a107..44f253121 100755
--- a/src/main/java/com/labsynch/labseer/domain/Subject.java
+++ b/src/main/java/com/labsynch/labseer/domain/Subject.java
@@ -36,211 +36,217 @@
 @Configurable
 
 public class Subject extends AbstractThing {
-	
-	private static final Logger logger = LoggerFactory.getLogger(Subject.class);
-	
-	//This direction: Subject is grandparent
-	@ManyToMany(cascade = {CascadeType.PERSIST, CascadeType.MERGE}, fetch =  FetchType.LAZY)
-	@JoinTable(name="TREATMENTGROUP_SUBJECT", 
-	joinColumns={@JoinColumn(name="subject_id")}, 
-	inverseJoinColumns={@JoinColumn(name="treatment_group_id")})
+
+    private static final Logger logger = LoggerFactory.getLogger(Subject.class);
+
+    // This direction: Subject is grandparent
+    @ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE }, fetch = FetchType.LAZY)
+    @JoinTable(name = "TREATMENTGROUP_SUBJECT", joinColumns = {
+            @JoinColumn(name = "subject_id") }, inverseJoinColumns = { @JoinColumn(name = "treatment_group_id") })
     private Set<TreatmentGroup> treatmentGroups = new HashSet<TreatmentGroup>();
-	
-	//This direction: Experiment is grandparent
-//	@ManyToMany(cascade = {CascadeType.PERSIST, CascadeType.MERGE}, mappedBy = "subjects")  
-//    private Set<TreatmentGroup> treatmentGroups = new HashSet<TreatmentGroup>();
 
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "subject", fetch =  FetchType.LAZY)
+    // This direction: Experiment is grandparent
+    // @ManyToMany(cascade = {CascadeType.PERSIST, CascadeType.MERGE}, mappedBy =
+    // "subjects")
+    // private Set<TreatmentGroup> treatmentGroups = new HashSet<TreatmentGroup>();
+
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "subject", fetch = FetchType.LAZY)
     private Set<SubjectLabel> lsLabels = new HashSet<SubjectLabel>();
-    
-	@OneToMany(cascade = CascadeType.ALL, mappedBy = "subject", fetch =  FetchType.LAZY)
-	private Set<SubjectState> lsStates = new HashSet<SubjectState>();
 
-	@OneToMany(cascade = {CascadeType.PERSIST, CascadeType.MERGE}, mappedBy = "subject", fetch =  FetchType.LAZY, orphanRemoval = true)
-	private Set<ItxSubjectContainer> containers = new HashSet<ItxSubjectContainer>();
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "subject", fetch = FetchType.LAZY)
+    private Set<SubjectState> lsStates = new HashSet<SubjectState>();
 
-	//constructor to instantiate a new sample from nested json objects
-	public Subject(Subject subject) {
+    @OneToMany(cascade = { CascadeType.PERSIST,
+            CascadeType.MERGE }, mappedBy = "subject", fetch = FetchType.LAZY, orphanRemoval = true)
+    private Set<ItxSubjectContainer> containers = new HashSet<ItxSubjectContainer>();
 
-		super.setRecordedBy(subject.getRecordedBy());
-		super.setRecordedDate(subject.getRecordedDate());
-		super.setLsTransaction(subject.getLsTransaction());
-		super.setModifiedBy(subject.getModifiedBy());
-		super.setModifiedDate(subject.getModifiedDate());
+    // constructor to instantiate a new sample from nested json objects
+    public Subject(Subject subject) {
+
+        super.setRecordedBy(subject.getRecordedBy());
+        super.setRecordedDate(subject.getRecordedDate());
+        super.setLsTransaction(subject.getLsTransaction());
+        super.setModifiedBy(subject.getModifiedBy());
+        super.setModifiedDate(subject.getModifiedDate());
         super.setIgnored(subject.isIgnored());
         super.setCodeName(subject.getCodeName());
         super.setLsType(subject.getLsType());
         super.setLsKind(subject.getLsKind());
         super.setLsTypeAndKind(subject.getLsTypeAndKind());
-        
+
         this.setLsLabels(subject.getLsLabels());
         this.setLsStates(subject.getLsStates());
         this.setContainers(subject.getContainers());
 
-	}
-
-	public static Subject update(Subject subject) {
-		Subject updatedSubject = Subject.findSubject(subject.getId());
-		updatedSubject.setRecordedBy(subject.getRecordedBy());
-		updatedSubject.setRecordedDate(subject.getRecordedDate());
-		updatedSubject.setLsTransaction(subject.getLsTransaction());
-		updatedSubject.setModifiedBy(subject.getModifiedBy());
-		updatedSubject.setModifiedDate(new Date());
-		updatedSubject.setCodeName(subject.getCodeName());
-		updatedSubject.setLsKind(subject.getLsKind());
-		updatedSubject.setLsType(subject.getLsType());
-		updatedSubject.setLsTypeAndKind(subject.getLsTypeAndKind());
-		updatedSubject.merge();
-		return updatedSubject;
-	}
-	
-	public String toJson() {
-		return new JSONSerializer()
-		.include("lsLabels", "lsStates.lsValues")
-		.exclude("*.class", "lsStates.subject", "lsStates.lsValues.lsState", "treatmentGroup.analysisGroup")
-		.transform(new ExcludeNulls(), void.class)
-		.serialize(this);
-	}
-	
-	public String toJsonStub() {
-		return new JSONSerializer()
-		.include("lsLabels")
-		.exclude("*.class", "lsStates", "treatmentGroup.analysisGroup")
-		.transform(new ExcludeNulls(), void.class)
-		.prettyPrint(false).serialize(this);
-	}
-	
-	public String toPrettyJson() {
-		return new JSONSerializer()
-		.include("lsLabels", "lsStates.lsValues")
-		.exclude("*.class", "lsStates.subject", "lsStates.lsValues.lsState", "treatmentGroup.analysisGroup")
-		.transform(new ExcludeNulls(), void.class)
-		.prettyPrint(true).serialize(this);
-	}
-	
-	public String toPrettyJsonStub() {
-		return new JSONSerializer()
-		.include("lsLabels")
-		.exclude("*.class", "lsStates", "treatmentGroup.analysisGroup")
-		.transform(new ExcludeNulls(), void.class)
-		.prettyPrint(true).serialize(this);
-	}
-	
-//	public String toJson() {
-//        return new JSONSerializer()
-//        .include("lsLabels", "lsStates.lsValues")
-//        .exclude("*.class", "lsStates.subject", "lsStates.lsValues.lsState", "treatmentGroup.analysisGroup")
-//        .serialize(this);
-//    }	
-
-//	.include("subjectLabels", "subjectStates.subjectValues", "containers")
-//	.include("subjectLabels", "subjectStates.subjectValues")
-//	.exclude("*.class",  "subjectLabels.subject", "subjectStates.subject", "subjectStates.subjectValues.subjectState", "treatmentGroup.analysisGroup")
-
-	public static Subject fromJsonToSample(String json) {
-		return new JSONDeserializer<Subject>().
-				use(null, Subject.class).
-        		
-				deserialize(json);
-	}
-
-	public static String toJsonArray(Collection<Subject> collection) {
-		return new JSONSerializer()
-		.include("lsLabels", "lsStates.lsValues")
-		.exclude("*.class",  "lsLabels.subject", "lsStates.subject", "lsStates.lsValues.lsState", "treatmentGroup.analysisGroup")
-		.serialize(collection);
-	}
-	
-	public static String toJsonArrayStub(Collection<Subject> collection) {
-		return new JSONSerializer()
-		.include("lsLabels")
-		.exclude("*.class", "lsStates", "treatmentGroup.analysisGroup")
-		.transform(new ExcludeNulls(), void.class)
-		.serialize(collection);
-	}
-
-
-
-	public static Subject fromJsonToSubject(String json) {
-        return new JSONDeserializer<Subject>().
-        		use(null, Subject.class).
-        		
-        		deserialize(json);
-    }
-
-	public static Collection<Subject> fromJsonArrayToSubjects(String json) {
-        return new JSONDeserializer<List<Subject>>().use(null, ArrayList.class).use("values", Subject.class).deserialize(json);
-    }
-
-	public static Collection<Subject> fromJsonArrayToSubjects(Reader json) {
-        return new JSONDeserializer<List<Subject>>().use(null, ArrayList.class).use("values", Subject.class).deserialize(json);
-    }
-	
-	@Transactional
-	public static int deleteByExperimentID(Long experimentId) {
-		if (experimentId == null) return 0;
-		EntityManager em = ItxSubjectContainer.entityManager();
-		String deleteSQL = "DELETE FROM Subject s WHERE Subject IN (SELECT s FROM Subject s JOIN s.treatmentGroups t JOIN t.analysisGroups a JOIN a.experiments e WHERE e.id = :experimentId)";
-		Query q = em.createQuery(deleteSQL);
-		q.setParameter("experimentId", experimentId);
-		//int numberOfDeletedEntities = q.executeUpdate();
-		//return numberOfDeletedEntities;
-		return 0;
-	}
-	
-	@Transactional
-	public static void removeOrphans(Collection<Long> subjectIds) {
-		for (Long id: subjectIds) {
-			Subject subject = Subject.findSubject(id);
-			if (subject.getTreatmentGroups().isEmpty()) {
-				subject.remove();
-//				Subject.removeCascadeAware(id);
-			}
-		}
-	}
-
-	@Transactional
-	private static void removeCascadeAware(Long id) {
-		Subject subject = findSubject(id);
+    }
+
+    public static Subject update(Subject subject) {
+        Subject updatedSubject = Subject.findSubject(subject.getId());
+        updatedSubject.setRecordedBy(subject.getRecordedBy());
+        updatedSubject.setRecordedDate(subject.getRecordedDate());
+        updatedSubject.setLsTransaction(subject.getLsTransaction());
+        updatedSubject.setModifiedBy(subject.getModifiedBy());
+        updatedSubject.setModifiedDate(new Date());
+        updatedSubject.setCodeName(subject.getCodeName());
+        updatedSubject.setLsKind(subject.getLsKind());
+        updatedSubject.setLsType(subject.getLsType());
+        updatedSubject.setLsTypeAndKind(subject.getLsTypeAndKind());
+        updatedSubject.merge();
+        return updatedSubject;
+    }
+
+    public String toJson() {
+        return new JSONSerializer()
+                .include("lsLabels", "lsStates.lsValues")
+                .exclude("*.class", "lsStates.subject", "lsStates.lsValues.lsState", "treatmentGroup.analysisGroup")
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(this);
+    }
+
+    public String toJsonStub() {
+        return new JSONSerializer()
+                .include("lsLabels")
+                .exclude("*.class", "lsStates", "treatmentGroup.analysisGroup")
+                .transform(new ExcludeNulls(), void.class)
+                .prettyPrint(false).serialize(this);
+    }
+
+    public String toPrettyJson() {
+        return new JSONSerializer()
+                .include("lsLabels", "lsStates.lsValues")
+                .exclude("*.class", "lsStates.subject", "lsStates.lsValues.lsState", "treatmentGroup.analysisGroup")
+                .transform(new ExcludeNulls(), void.class)
+                .prettyPrint(true).serialize(this);
+    }
+
+    public String toPrettyJsonStub() {
+        return new JSONSerializer()
+                .include("lsLabels")
+                .exclude("*.class", "lsStates", "treatmentGroup.analysisGroup")
+                .transform(new ExcludeNulls(), void.class)
+                .prettyPrint(true).serialize(this);
+    }
+
+    // public String toJson() {
+    // return new JSONSerializer()
+    // .include("lsLabels", "lsStates.lsValues")
+    // .exclude("*.class", "lsStates.subject", "lsStates.lsValues.lsState",
+    // "treatmentGroup.analysisGroup")
+    // .serialize(this);
+    // }
+
+    // .include("subjectLabels", "subjectStates.subjectValues", "containers")
+    // .include("subjectLabels", "subjectStates.subjectValues")
+    // .exclude("*.class", "subjectLabels.subject", "subjectStates.subject",
+    // "subjectStates.subjectValues.subjectState", "treatmentGroup.analysisGroup")
+
+    public static Subject fromJsonToSample(String json) {
+        return new JSONDeserializer<Subject>().use(null, Subject.class).
+
+                deserialize(json);
+    }
+
+    public static String toJsonArray(Collection<Subject> collection) {
+        return new JSONSerializer()
+                .include("lsLabels", "lsStates.lsValues")
+                .exclude("*.class", "lsLabels.subject", "lsStates.subject", "lsStates.lsValues.lsState",
+                        "treatmentGroup.analysisGroup")
+                .serialize(collection);
+    }
+
+    public static String toJsonArrayStub(Collection<Subject> collection) {
+        return new JSONSerializer()
+                .include("lsLabels")
+                .exclude("*.class", "lsStates", "treatmentGroup.analysisGroup")
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
+    }
+
+    public static Subject fromJsonToSubject(String json) {
+        return new JSONDeserializer<Subject>().use(null, Subject.class).
+
+                deserialize(json);
+    }
+
+    public static Collection<Subject> fromJsonArrayToSubjects(String json) {
+        return new JSONDeserializer<List<Subject>>().use(null, ArrayList.class).use("values", Subject.class)
+                .deserialize(json);
+    }
+
+    public static Collection<Subject> fromJsonArrayToSubjects(Reader json) {
+        return new JSONDeserializer<List<Subject>>().use(null, ArrayList.class).use("values", Subject.class)
+                .deserialize(json);
+    }
+
+    @Transactional
+    public static int deleteByExperimentID(Long experimentId) {
+        if (experimentId == null)
+            return 0;
+        EntityManager em = ItxSubjectContainer.entityManager();
+        String deleteSQL = "DELETE FROM Subject s WHERE Subject IN (SELECT s FROM Subject s JOIN s.treatmentGroups t JOIN t.analysisGroups a JOIN a.experiments e WHERE e.id = :experimentId)";
+        Query q = em.createQuery(deleteSQL);
+        q.setParameter("experimentId", experimentId);
+        // int numberOfDeletedEntities = q.executeUpdate();
+        // return numberOfDeletedEntities;
+        return 0;
+    }
+
+    @Transactional
+    public static void removeOrphans(Collection<Long> subjectIds) {
+        for (Long id : subjectIds) {
+            Subject subject = Subject.findSubject(id);
+            if (subject.getTreatmentGroups().isEmpty()) {
+                subject.remove();
+                // Subject.removeCascadeAware(id);
+            }
+        }
+    }
+
+    @Transactional
+    private static void removeCascadeAware(Long id) {
+        Subject subject = findSubject(id);
         EntityManager em = Subject.entityManager();
         subject.remove();
-		
-	}
-
-	public Subject() {
-		
-    }
-	
-	public Subject(FlatThingCsvDTO subjectDTO) {
-		this.setRecordedBy(subjectDTO.getRecordedBy());
-		this.setRecordedDate(subjectDTO.getRecordedDate());
-		this.setLsTransaction(subjectDTO.getLsTransaction());
-		this.setModifiedBy(subjectDTO.getModifiedBy());
-		this.setModifiedDate(subjectDTO.getModifiedDate());
-		this.setCodeName(subjectDTO.getCodeName());
-		this.setLsKind(subjectDTO.getLsKind());
-		this.setLsType(subjectDTO.getLsType());
-	}
-	
-	public static Subject findSubjectByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+
+    }
+
+    public Subject() {
+
+    }
+
+    public Subject(FlatThingCsvDTO subjectDTO) {
+        this.setRecordedBy(subjectDTO.getRecordedBy());
+        this.setRecordedDate(subjectDTO.getRecordedDate());
+        this.setLsTransaction(subjectDTO.getLsTransaction());
+        this.setModifiedBy(subjectDTO.getModifiedBy());
+        this.setModifiedDate(subjectDTO.getModifiedDate());
+        this.setCodeName(subjectDTO.getCodeName());
+        this.setLsKind(subjectDTO.getLsKind());
+        this.setLsType(subjectDTO.getLsType());
+    }
+
+    public static Subject findSubjectByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = Subject.entityManager();
-        TypedQuery<Subject> q = em.createQuery("SELECT o FROM Subject AS o WHERE o.codeName = :codeName", Subject.class);
+        TypedQuery<Subject> q = em.createQuery("SELECT o FROM Subject AS o WHERE o.codeName = :codeName",
+                Subject.class);
         q.setParameter("codeName", codeName);
         return q.getSingleResult();
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "treatmentGroups", "lsLabels", "lsStates", "containers");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "treatmentGroups",
+            "lsLabels", "lsStates", "containers");
 
-	public static long countSubjects() {
+    public static long countSubjects() {
         return entityManager().createQuery("SELECT COUNT(o) FROM Subject o", Long.class).getSingleResult();
     }
 
-	public static List<Subject> findAllSubjects() {
+    public static List<Subject> findAllSubjects() {
         return entityManager().createQuery("SELECT o FROM Subject o", Subject.class).getResultList();
     }
 
-	public static List<Subject> findAllSubjects(String sortFieldName, String sortOrder) {
+    public static List<Subject> findAllSubjects(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM Subject o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -251,16 +257,19 @@ public static List<Subject> findAllSubjects(String sortFieldName, String sortOrd
         return entityManager().createQuery(jpaQuery, Subject.class).getResultList();
     }
 
-	public static Subject findSubject(Long id) {
-        if (id == null) return null;
+    public static Subject findSubject(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(Subject.class, id);
     }
 
-	public static List<Subject> findSubjectEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM Subject o", Subject.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<Subject> findSubjectEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM Subject o", Subject.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<Subject> findSubjectEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<Subject> findSubjectEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM Subject o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -268,91 +277,102 @@ public static List<Subject> findSubjectEntries(int firstResult, int maxResults,
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, Subject.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, Subject.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public Subject merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         Subject merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public Set<TreatmentGroup> getTreatmentGroups() {
+    public Set<TreatmentGroup> getTreatmentGroups() {
         return this.treatmentGroups;
     }
 
-	public void setTreatmentGroups(Set<TreatmentGroup> treatmentGroups) {
+    public void setTreatmentGroups(Set<TreatmentGroup> treatmentGroups) {
         this.treatmentGroups = treatmentGroups;
     }
 
-	public Set<SubjectLabel> getLsLabels() {
+    public Set<SubjectLabel> getLsLabels() {
         return this.lsLabels;
     }
 
-	public void setLsLabels(Set<SubjectLabel> lsLabels) {
+    public void setLsLabels(Set<SubjectLabel> lsLabels) {
         this.lsLabels = lsLabels;
     }
 
-	public Set<SubjectState> getLsStates() {
+    public Set<SubjectState> getLsStates() {
         return this.lsStates;
     }
 
-	public void setLsStates(Set<SubjectState> lsStates) {
+    public void setLsStates(Set<SubjectState> lsStates) {
         this.lsStates = lsStates;
     }
 
-	public Set<ItxSubjectContainer> getContainers() {
+    public Set<ItxSubjectContainer> getContainers() {
         return this.containers;
     }
 
-	public void setContainers(Set<ItxSubjectContainer> containers) {
+    public void setContainers(Set<ItxSubjectContainer> containers) {
         this.containers = containers;
     }
 
-	public static Long countFindSubjectsByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static Long countFindSubjectsByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = Subject.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Subject AS o WHERE o.codeName = :codeName", Long.class);
         q.setParameter("codeName", codeName);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindSubjectsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static Long countFindSubjectsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = Subject.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Subject AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Subject AS o WHERE o.lsTransaction = :lsTransaction",
+                Long.class);
         q.setParameter("lsTransaction", lsTransaction);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindSubjectsByTreatmentGroups(Set<TreatmentGroup> treatmentGroups) {
-        if (treatmentGroups == null) throw new IllegalArgumentException("The treatmentGroups argument is required");
+    public static Long countFindSubjectsByTreatmentGroups(Set<TreatmentGroup> treatmentGroups) {
+        if (treatmentGroups == null)
+            throw new IllegalArgumentException("The treatmentGroups argument is required");
         EntityManager em = Subject.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT COUNT(o) FROM Subject AS o WHERE");
         for (int i = 0; i < treatmentGroups.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
+            if (i > 0)
+                queryBuilder.append(" AND");
             queryBuilder.append(" :treatmentGroups_item").append(i).append(" MEMBER OF o.treatmentGroups");
         }
         TypedQuery q = em.createQuery(queryBuilder.toString(), Long.class);
         int treatmentGroupsIndex = 0;
-        for (TreatmentGroup _treatmentgroup: treatmentGroups) {
+        for (TreatmentGroup _treatmentgroup : treatmentGroups) {
             q.setParameter("treatmentGroups_item" + treatmentGroupsIndex++, _treatmentgroup);
         }
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<Subject> findSubjectsByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static TypedQuery<Subject> findSubjectsByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = Subject.entityManager();
-        TypedQuery<Subject> q = em.createQuery("SELECT o FROM Subject AS o WHERE o.codeName = :codeName", Subject.class);
+        TypedQuery<Subject> q = em.createQuery("SELECT o FROM Subject AS o WHERE o.codeName = :codeName",
+                Subject.class);
         q.setParameter("codeName", codeName);
         return q;
     }
 
-	public static TypedQuery<Subject> findSubjectsByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static TypedQuery<Subject> findSubjectsByCodeNameEquals(String codeName, String sortFieldName,
+            String sortOrder) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = Subject.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Subject AS o WHERE o.codeName = :codeName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -366,18 +386,23 @@ public static TypedQuery<Subject> findSubjectsByCodeNameEquals(String codeName,
         return q;
     }
 
-	public static TypedQuery<Subject> findSubjectsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<Subject> findSubjectsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = Subject.entityManager();
-        TypedQuery<Subject> q = em.createQuery("SELECT o FROM Subject AS o WHERE o.lsTransaction = :lsTransaction", Subject.class);
+        TypedQuery<Subject> q = em.createQuery("SELECT o FROM Subject AS o WHERE o.lsTransaction = :lsTransaction",
+                Subject.class);
         q.setParameter("lsTransaction", lsTransaction);
         return q;
     }
 
-	public static TypedQuery<Subject> findSubjectsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<Subject> findSubjectsByLsTransactionEquals(Long lsTransaction, String sortFieldName,
+            String sortOrder) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = Subject.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Subject AS o WHERE o.lsTransaction = :lsTransaction");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Subject AS o WHERE o.lsTransaction = :lsTransaction");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -389,28 +414,33 @@ public static TypedQuery<Subject> findSubjectsByLsTransactionEquals(Long lsTrans
         return q;
     }
 
-	public static TypedQuery<Subject> findSubjectsByTreatmentGroups(Set<TreatmentGroup> treatmentGroups) {
-        if (treatmentGroups == null) throw new IllegalArgumentException("The treatmentGroups argument is required");
+    public static TypedQuery<Subject> findSubjectsByTreatmentGroups(Set<TreatmentGroup> treatmentGroups) {
+        if (treatmentGroups == null)
+            throw new IllegalArgumentException("The treatmentGroups argument is required");
         EntityManager em = Subject.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Subject AS o WHERE");
         for (int i = 0; i < treatmentGroups.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
+            if (i > 0)
+                queryBuilder.append(" AND");
             queryBuilder.append(" :treatmentGroups_item").append(i).append(" MEMBER OF o.treatmentGroups");
         }
         TypedQuery<Subject> q = em.createQuery(queryBuilder.toString(), Subject.class);
         int treatmentGroupsIndex = 0;
-        for (TreatmentGroup _treatmentgroup: treatmentGroups) {
+        for (TreatmentGroup _treatmentgroup : treatmentGroups) {
             q.setParameter("treatmentGroups_item" + treatmentGroupsIndex++, _treatmentgroup);
         }
         return q;
     }
 
-	public static TypedQuery<Subject> findSubjectsByTreatmentGroups(Set<TreatmentGroup> treatmentGroups, String sortFieldName, String sortOrder) {
-        if (treatmentGroups == null) throw new IllegalArgumentException("The treatmentGroups argument is required");
+    public static TypedQuery<Subject> findSubjectsByTreatmentGroups(Set<TreatmentGroup> treatmentGroups,
+            String sortFieldName, String sortOrder) {
+        if (treatmentGroups == null)
+            throw new IllegalArgumentException("The treatmentGroups argument is required");
         EntityManager em = Subject.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Subject AS o WHERE");
         for (int i = 0; i < treatmentGroups.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
+            if (i > 0)
+                queryBuilder.append(" AND");
             queryBuilder.append(" :treatmentGroups_item").append(i).append(" MEMBER OF o.treatmentGroups");
         }
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -421,13 +451,13 @@ public static TypedQuery<Subject> findSubjectsByTreatmentGroups(Set<TreatmentGro
         }
         TypedQuery<Subject> q = em.createQuery(queryBuilder.toString(), Subject.class);
         int treatmentGroupsIndex = 0;
-        for (TreatmentGroup _treatmentgroup: treatmentGroups) {
+        for (TreatmentGroup _treatmentgroup : treatmentGroups) {
             q.setParameter("treatmentGroups_item" + treatmentGroupsIndex++, _treatmentgroup);
         }
         return q;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectLabel.java b/src/main/java/com/labsynch/labseer/domain/SubjectLabel.java
index 2e27991c0..78e3af8d8 100755
--- a/src/main/java/com/labsynch/labseer/domain/SubjectLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/SubjectLabel.java
@@ -34,7 +34,7 @@ public class SubjectLabel extends AbstractLabel {
 
     public SubjectLabel() {
     }
-    
+
     public SubjectLabel(com.labsynch.labseer.domain.SubjectLabel subjectLabel) {
         super.setLsType(subjectLabel.getLsType());
         super.setLsKind(subjectLabel.getLsKind());
@@ -48,60 +48,67 @@ public SubjectLabel(com.labsynch.labseer.domain.SubjectLabel subjectLabel) {
     }
 
     public static SubjectLabel update(SubjectLabel subjectLabel) {
-    	SubjectLabel updatedSubjectLabel = SubjectLabel.findSubjectLabel(subjectLabel.getId());
-    	updatedSubjectLabel.setLsType(subjectLabel.getLsType());
-    	updatedSubjectLabel.setLsKind(subjectLabel.getLsKind());
-    	updatedSubjectLabel.setLsTypeAndKind(subjectLabel.getLsType() + "_" + subjectLabel.getLsKind());
-    	updatedSubjectLabel.setLabelText(subjectLabel.getLabelText());
-    	updatedSubjectLabel.setPreferred(subjectLabel.isPreferred());
-    	updatedSubjectLabel.setLsTransaction(subjectLabel.getLsTransaction());
-    	updatedSubjectLabel.setRecordedBy(subjectLabel.getRecordedBy());
-    	updatedSubjectLabel.setRecordedDate(subjectLabel.getRecordedDate());
-    	updatedSubjectLabel.setModifiedDate(new Date());
-    	updatedSubjectLabel.setPhysicallyLabled(subjectLabel.isPhysicallyLabled());
-    	updatedSubjectLabel.setIgnored(subjectLabel.isIgnored());
-    	updatedSubjectLabel.merge();
-    	return updatedSubjectLabel;
-    }   
-    
-	@Transactional
-	public static int deleteByExperimentID(Long experimentId) {
-		if (experimentId == null) return 0;
-		EntityManager em = ItxSubjectContainer.entityManager();
-		String deleteSQL = "DELETE FROM SubjectLabel oo WHERE id in (select o.id from SubjectLabel o where o.subject.treatmentGroup.analysisGroup.experiment.id = :experimentId)";
-		Query q = em.createQuery(deleteSQL);
-		q.setParameter("experimentId", experimentId);
-		int numberOfDeletedEntities = q.executeUpdate();
-		return numberOfDeletedEntities;
-	}
-	
+        SubjectLabel updatedSubjectLabel = SubjectLabel.findSubjectLabel(subjectLabel.getId());
+        updatedSubjectLabel.setLsType(subjectLabel.getLsType());
+        updatedSubjectLabel.setLsKind(subjectLabel.getLsKind());
+        updatedSubjectLabel.setLsTypeAndKind(subjectLabel.getLsType() + "_" + subjectLabel.getLsKind());
+        updatedSubjectLabel.setLabelText(subjectLabel.getLabelText());
+        updatedSubjectLabel.setPreferred(subjectLabel.isPreferred());
+        updatedSubjectLabel.setLsTransaction(subjectLabel.getLsTransaction());
+        updatedSubjectLabel.setRecordedBy(subjectLabel.getRecordedBy());
+        updatedSubjectLabel.setRecordedDate(subjectLabel.getRecordedDate());
+        updatedSubjectLabel.setModifiedDate(new Date());
+        updatedSubjectLabel.setPhysicallyLabled(subjectLabel.isPhysicallyLabled());
+        updatedSubjectLabel.setIgnored(subjectLabel.isIgnored());
+        updatedSubjectLabel.merge();
+        return updatedSubjectLabel;
+    }
+
+    @Transactional
+    public static int deleteByExperimentID(Long experimentId) {
+        if (experimentId == null)
+            return 0;
+        EntityManager em = ItxSubjectContainer.entityManager();
+        String deleteSQL = "DELETE FROM SubjectLabel oo WHERE id in (select o.id from SubjectLabel o where o.subject.treatmentGroup.analysisGroup.experiment.id = :experimentId)";
+        Query q = em.createQuery(deleteSQL);
+        q.setParameter("experimentId", experimentId);
+        int numberOfDeletedEntities = q.executeUpdate();
+        return numberOfDeletedEntities;
+    }
+
     public static Collection<SubjectLabel> fromJsonArrayToSubjectLabels(String json) {
-        return new JSONDeserializer<List<SubjectLabel>>().use(null, ArrayList.class).use("values", SubjectLabel.class).deserialize(json);
+        return new JSONDeserializer<List<SubjectLabel>>().use(null, ArrayList.class).use("values", SubjectLabel.class)
+                .deserialize(json);
     }
-    
+
     public static Collection<SubjectLabel> fromJsonArrayToSubjectLabels(Reader json) {
-        return new JSONDeserializer<List<SubjectLabel>>().use(null, ArrayList.class).use("values", SubjectLabel.class).deserialize(json);
+        return new JSONDeserializer<List<SubjectLabel>>().use(null, ArrayList.class).use("values", SubjectLabel.class)
+                .deserialize(json);
     }
-    
 
-	public static Long countFindSubjectLabelsBySubject(Subject subject) {
-        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
+    public static Long countFindSubjectLabelsBySubject(Subject subject) {
+        if (subject == null)
+            throw new IllegalArgumentException("The subject argument is required");
         EntityManager em = SubjectLabel.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SubjectLabel AS o WHERE o.subject = :subject", Long.class);
         q.setParameter("subject", subject);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<SubjectLabel> findSubjectLabelsBySubject(Subject subject) {
-        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
+    public static TypedQuery<SubjectLabel> findSubjectLabelsBySubject(Subject subject) {
+        if (subject == null)
+            throw new IllegalArgumentException("The subject argument is required");
         EntityManager em = SubjectLabel.entityManager();
-        TypedQuery<SubjectLabel> q = em.createQuery("SELECT o FROM SubjectLabel AS o WHERE o.subject = :subject", SubjectLabel.class);
+        TypedQuery<SubjectLabel> q = em.createQuery("SELECT o FROM SubjectLabel AS o WHERE o.subject = :subject",
+                SubjectLabel.class);
         q.setParameter("subject", subject);
         return q;
     }
 
-	public static TypedQuery<SubjectLabel> findSubjectLabelsBySubject(Subject subject, String sortFieldName, String sortOrder) {
-        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
+    public static TypedQuery<SubjectLabel> findSubjectLabelsBySubject(Subject subject, String sortFieldName,
+            String sortOrder) {
+        if (subject == null)
+            throw new IllegalArgumentException("The subject argument is required");
         EntityManager em = SubjectLabel.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SubjectLabel AS o WHERE o.subject = :subject");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -115,25 +122,25 @@ public static TypedQuery<SubjectLabel> findSubjectLabelsBySubject(Subject subjec
         return q;
     }
 
-	public Subject getSubject() {
+    public Subject getSubject() {
         return this.subject;
     }
 
-	public void setSubject(Subject subject) {
+    public void setSubject(Subject subject) {
         this.subject = subject;
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("subject");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("subject");
 
-	public static long countSubjectLabels() {
+    public static long countSubjectLabels() {
         return entityManager().createQuery("SELECT COUNT(o) FROM SubjectLabel o", Long.class).getSingleResult();
     }
 
-	public static List<SubjectLabel> findAllSubjectLabels() {
+    public static List<SubjectLabel> findAllSubjectLabels() {
         return entityManager().createQuery("SELECT o FROM SubjectLabel o", SubjectLabel.class).getResultList();
     }
 
-	public static List<SubjectLabel> findAllSubjectLabels(String sortFieldName, String sortOrder) {
+    public static List<SubjectLabel> findAllSubjectLabels(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM SubjectLabel o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -144,16 +151,19 @@ public static List<SubjectLabel> findAllSubjectLabels(String sortFieldName, Stri
         return entityManager().createQuery(jpaQuery, SubjectLabel.class).getResultList();
     }
 
-	public static SubjectLabel findSubjectLabel(Long id) {
-        if (id == null) return null;
+    public static SubjectLabel findSubjectLabel(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(SubjectLabel.class, id);
     }
 
-	public static List<SubjectLabel> findSubjectLabelEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM SubjectLabel o", SubjectLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<SubjectLabel> findSubjectLabelEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM SubjectLabel o", SubjectLabel.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<SubjectLabel> findSubjectLabelEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<SubjectLabel> findSubjectLabelEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM SubjectLabel o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -161,43 +171,45 @@ public static List<SubjectLabel> findSubjectLabelEntries(int firstResult, int ma
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, SubjectLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, SubjectLabel.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public SubjectLabel merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         SubjectLabel merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static SubjectLabel fromJsonToSubjectLabel(String json) {
+    public static SubjectLabel fromJsonToSubjectLabel(String json) {
         return new JSONDeserializer<SubjectLabel>()
-        .use(null, SubjectLabel.class).deserialize(json);
+                .use(null, SubjectLabel.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<SubjectLabel> collection) {
+    public static String toJsonArray(Collection<SubjectLabel> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<SubjectLabel> collection, String[] fields) {
+    public static String toJsonArray(Collection<SubjectLabel> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectState.java b/src/main/java/com/labsynch/labseer/domain/SubjectState.java
index 9840a5a9d..982fbc1f1 100755
--- a/src/main/java/com/labsynch/labseer/domain/SubjectState.java
+++ b/src/main/java/com/labsynch/labseer/domain/SubjectState.java
@@ -59,18 +59,19 @@ public SubjectState(com.labsynch.labseer.domain.SubjectState subjectState) {
         this.setLsKind(subjectState.getLsKind());
         this.setIgnored(subjectState.isIgnored());
     }
-    
+
     public SubjectState(FlatThingCsvDTO subjectDTO) {
-		this.setRecordedBy(subjectDTO.getRecordedBy());
-		this.setRecordedDate(subjectDTO.getRecordedDate());
-		this.setLsTransaction(subjectDTO.getLsTransaction());
-		this.setModifiedBy(subjectDTO.getModifiedBy());
-		this.setModifiedDate(subjectDTO.getModifiedDate());
-		this.setLsType(subjectDTO.getStateType());
-		this.setLsKind(subjectDTO.getStateKind());
-	}
-
-	public static com.labsynch.labseer.domain.SubjectState update(com.labsynch.labseer.domain.SubjectState subjectState) {
+        this.setRecordedBy(subjectDTO.getRecordedBy());
+        this.setRecordedDate(subjectDTO.getRecordedDate());
+        this.setLsTransaction(subjectDTO.getLsTransaction());
+        this.setModifiedBy(subjectDTO.getModifiedBy());
+        this.setModifiedDate(subjectDTO.getModifiedDate());
+        this.setLsType(subjectDTO.getStateType());
+        this.setLsKind(subjectDTO.getStateKind());
+    }
+
+    public static com.labsynch.labseer.domain.SubjectState update(
+            com.labsynch.labseer.domain.SubjectState subjectState) {
         SubjectState updatedSubjectState = SubjectState.findSubjectState(subjectState.getId());
         updatedSubjectState.setRecordedBy(subjectState.getRecordedBy());
         updatedSubjectState.setRecordedDate(subjectState.getRecordedDate());
@@ -83,10 +84,14 @@ public static com.labsynch.labseer.domain.SubjectState update(com.labsynch.labse
         return updatedSubjectState;
     }
 
-    public static TypedQuery<com.labsynch.labseer.domain.SubjectState> findSubjectStatesBylsTypeAndKindEquals(String lsTypeAndKind) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+    public static TypedQuery<com.labsynch.labseer.domain.SubjectState> findSubjectStatesBylsTypeAndKindEquals(
+            String lsTypeAndKind) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = SubjectState.entityManager();
-        TypedQuery<SubjectState> q = em.createQuery("SELECT o FROM SubjectState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind  AND o.ignored IS NOT :ignored", SubjectState.class);
+        TypedQuery<SubjectState> q = em.createQuery(
+                "SELECT o FROM SubjectState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind  AND o.ignored IS NOT :ignored",
+                SubjectState.class);
         q.setParameter("lsTypeAndKind", lsTypeAndKind);
         boolean ignored = true;
         q.setParameter("ignored", ignored);
@@ -94,18 +99,25 @@ public static TypedQuery<com.labsynch.labseer.domain.SubjectState> findSubjectSt
     }
 
     public static TypedQuery<com.labsynch.labseer.domain.SubjectState> findSubjectStatesBySubject(Subject subject) {
-        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
+        if (subject == null)
+            throw new IllegalArgumentException("The subject argument is required");
         EntityManager em = SubjectState.entityManager();
-        TypedQuery<SubjectState> q = em.createQuery("SELECT o FROM SubjectState AS o WHERE o.subject = :subject", SubjectState.class);
+        TypedQuery<SubjectState> q = em.createQuery("SELECT o FROM SubjectState AS o WHERE o.subject = :subject",
+                SubjectState.class);
         q.setParameter("subject", subject);
         return q;
     }
 
-    public static TypedQuery<com.labsynch.labseer.domain.SubjectState> findSubjectStatesBySubjectAndLsTypeAndKindEqualsAndIgnoredNot(Subject subject, String lsTypeAndKind) {
-        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+    public static TypedQuery<com.labsynch.labseer.domain.SubjectState> findSubjectStatesBySubjectAndLsTypeAndKindEqualsAndIgnoredNot(
+            Subject subject, String lsTypeAndKind) {
+        if (subject == null)
+            throw new IllegalArgumentException("The subject argument is required");
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = SubjectState.entityManager();
-        TypedQuery<SubjectState> q = em.createQuery("SELECT o FROM SubjectState AS o WHERE o.subject = :subject AND o.lsTypeAndKind = :lsTypeAndKind  AND o.ignored IS NOT :ignored", SubjectState.class);
+        TypedQuery<SubjectState> q = em.createQuery(
+                "SELECT o FROM SubjectState AS o WHERE o.subject = :subject AND o.lsTypeAndKind = :lsTypeAndKind  AND o.ignored IS NOT :ignored",
+                SubjectState.class);
         q.setParameter("subject", subject);
         q.setParameter("lsTypeAndKind", lsTypeAndKind);
         boolean ignored = true;
@@ -122,17 +134,21 @@ public static List<com.labsynch.labseer.domain.SubjectState> findAllSubjectState
     }
 
     public static com.labsynch.labseer.domain.SubjectState findSubjectState(Long id) {
-        if (id == null) return null;
+        if (id == null)
+            return null;
         return entityManager().find(SubjectState.class, id);
     }
 
-    public static List<com.labsynch.labseer.domain.SubjectState> findSubjectStateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM SubjectState o", SubjectState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<com.labsynch.labseer.domain.SubjectState> findSubjectStateEntries(int firstResult,
+            int maxResults) {
+        return entityManager().createQuery("SELECT o FROM SubjectState o", SubjectState.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
     @Transactional
     public com.labsynch.labseer.domain.SubjectState merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         SubjectState merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
@@ -159,13 +175,15 @@ public static String getSubjectStateCollectionJson(List<java.lang.Long> idList)
         Collection<SubjectState> subjectStates = new ArrayList<SubjectState>();
         for (Long id : idList) {
             SubjectState query = SubjectState.findSubjectState(id);
-            if (query != null) subjectStates.add(query);
+            if (query != null)
+                subjectStates.add(query);
         }
         return SubjectState.toJsonArray(subjectStates);
     }
 
     public static int deleteByExperimentID(Long experimentId) {
-        if (experimentId == null) return 0;
+        if (experimentId == null)
+            return 0;
         EntityManager em = SubjectState.entityManager();
         String deleteSQL = "DELETE FROM SubjectState oo WHERE id in (select o.id from SubjectState o where o.subject.treatmentGroup.analysisGroup.experiment.id = :experimentId)";
         logger.debug("attempting to delete subject states: " + deleteSQL);
@@ -176,7 +194,8 @@ public static int deleteByExperimentID(Long experimentId) {
     }
 
     public static int deleteByTransactionID(Long transactionId) {
-        if (transactionId == null) return 0;
+        if (transactionId == null)
+            return 0;
         EntityManager em = SubjectState.entityManager();
         String deleteSQL = "DELETE FROM SubjectState oo WHERE lsTransaction = :transactionId";
         logger.debug("attempting to delete subject states: " + deleteSQL);
@@ -191,11 +210,13 @@ public static com.labsynch.labseer.domain.SubjectState fromJsonToSubjectState(St
     }
 
     public static Collection<com.labsynch.labseer.domain.SubjectState> fromJsonArrayToSubjectStates(Reader json) {
-        return new JSONDeserializer<List<SubjectState>>().use(null, ArrayList.class).use("values", SubjectState.class).deserialize(json);
+        return new JSONDeserializer<List<SubjectState>>().use(null, ArrayList.class).use("values", SubjectState.class)
+                .deserialize(json);
     }
 
     public static Collection<com.labsynch.labseer.domain.SubjectState> fromJsonArrayToSubjectStates(String json) {
-        return new JSONDeserializer<List<SubjectState>>().use(null, ArrayList.class).use("values", SubjectState.class).deserialize(json);
+        return new JSONDeserializer<List<SubjectState>>().use(null, ArrayList.class).use("values", SubjectState.class)
+                .deserialize(json);
     }
 
     @Transactional
@@ -205,94 +226,119 @@ public static String toJsonArray(Collection<com.labsynch.labseer.domain.SubjectS
 
     @Transactional
     public static String toJsonArrayStub(Collection<com.labsynch.labseer.domain.SubjectState> collection) {
-        return new JSONSerializer().exclude("*.class", "subject").include("subject.id").transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer().exclude("*.class", "subject").include("subject.id")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
     @Transactional
     public String toJson() {
-        return new JSONSerializer().include("lsValues").exclude("*.class", "subject").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().include("lsValues").exclude("*.class", "subject")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public String toJsonStub() {
-        return new JSONSerializer().exclude("*.class", "subject").transform(new ExcludeNulls(), void.class).serialize(this);
-    }
-
-	public static TypedQuery<SubjectState> findSubjectStatesBySubjectIDAndStateTypeKind(
-			Long subjectId, String stateType, String stateKind) {
-		
-		if (stateType == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-		
-		EntityManager em = entityManager();
-		String hsqlQuery = "SELECT ss FROM SubjectState AS ss " +
-		"JOIN ss.subject s " +
-		"WHERE ss.lsType = :stateType AND ss.lsKind = :stateKind AND ss.ignored IS NOT :ignored " +
-		"AND s.id = :subjectId ";
-		TypedQuery<SubjectState> q = em.createQuery(hsqlQuery, SubjectState.class);
-		q.setParameter("subjectId", subjectId);
-		q.setParameter("stateType", stateType);
-		q.setParameter("stateKind", stateKind);
-		q.setParameter("ignored", true);
-		return q;
-	}
-
-	public static TypedQuery<SubjectState> findSubjectStatesBySubjectCodeNameAndStateTypeKind(
-			String subjectCodeName, String stateType, String stateKind) {
-		if (stateType == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-		
-		EntityManager em = entityManager();
-		String hsqlQuery = "SELECT ss FROM SubjectState AS ss " +
-		"JOIN ss.subject s " +
-		"WHERE ss.lsType = :stateType AND ss.lsKind = :stateKind AND ss.ignored IS NOT :ignored " +
-		"AND s.codeName = :subjectCodeName ";
-		TypedQuery<SubjectState> q = em.createQuery(hsqlQuery, SubjectState.class);
-		q.setParameter("subjectCodeName", subjectCodeName);
-		q.setParameter("stateType", stateType);
-		q.setParameter("stateKind", stateKind);
-		q.setParameter("ignored", true);
-		return q;
-	}
-
-	public static Long countFindSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject(String lsType, String lsKind, Subject subject) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
+        return new JSONSerializer().exclude("*.class", "subject").transform(new ExcludeNulls(), void.class)
+                .serialize(this);
+    }
+
+    public static TypedQuery<SubjectState> findSubjectStatesBySubjectIDAndStateTypeKind(
+            Long subjectId, String stateType, String stateKind) {
+
+        if (stateType == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateType argument is required");
+        if (stateKind == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateKind argument is required");
+
+        EntityManager em = entityManager();
+        String hsqlQuery = "SELECT ss FROM SubjectState AS ss " +
+                "JOIN ss.subject s " +
+                "WHERE ss.lsType = :stateType AND ss.lsKind = :stateKind AND ss.ignored IS NOT :ignored " +
+                "AND s.id = :subjectId ";
+        TypedQuery<SubjectState> q = em.createQuery(hsqlQuery, SubjectState.class);
+        q.setParameter("subjectId", subjectId);
+        q.setParameter("stateType", stateType);
+        q.setParameter("stateKind", stateKind);
+        q.setParameter("ignored", true);
+        return q;
+    }
+
+    public static TypedQuery<SubjectState> findSubjectStatesBySubjectCodeNameAndStateTypeKind(
+            String subjectCodeName, String stateType, String stateKind) {
+        if (stateType == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateType argument is required");
+        if (stateKind == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateKind argument is required");
+
+        EntityManager em = entityManager();
+        String hsqlQuery = "SELECT ss FROM SubjectState AS ss " +
+                "JOIN ss.subject s " +
+                "WHERE ss.lsType = :stateType AND ss.lsKind = :stateKind AND ss.ignored IS NOT :ignored " +
+                "AND s.codeName = :subjectCodeName ";
+        TypedQuery<SubjectState> q = em.createQuery(hsqlQuery, SubjectState.class);
+        q.setParameter("subjectCodeName", subjectCodeName);
+        q.setParameter("stateType", stateType);
+        q.setParameter("stateKind", stateKind);
+        q.setParameter("ignored", true);
+        return q;
+    }
+
+    public static Long countFindSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject(String lsType, String lsKind,
+            Subject subject) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (subject == null)
+            throw new IllegalArgumentException("The subject argument is required");
         EntityManager em = SubjectState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SubjectState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.subject = :subject", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM SubjectState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.subject = :subject",
+                Long.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         q.setParameter("subject", subject);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindSubjectStatesBySubject(Subject subject) {
-        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
+    public static Long countFindSubjectStatesBySubject(Subject subject) {
+        if (subject == null)
+            throw new IllegalArgumentException("The subject argument is required");
         EntityManager em = SubjectState.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SubjectState AS o WHERE o.subject = :subject", Long.class);
         q.setParameter("subject", subject);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<SubjectState> findSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject(String lsType, String lsKind, Subject subject) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
+    public static TypedQuery<SubjectState> findSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject(String lsType,
+            String lsKind, Subject subject) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (subject == null)
+            throw new IllegalArgumentException("The subject argument is required");
         EntityManager em = SubjectState.entityManager();
-        TypedQuery<SubjectState> q = em.createQuery("SELECT o FROM SubjectState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.subject = :subject", SubjectState.class);
+        TypedQuery<SubjectState> q = em.createQuery(
+                "SELECT o FROM SubjectState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.subject = :subject",
+                SubjectState.class);
         q.setParameter("lsType", lsType);
         q.setParameter("lsKind", lsKind);
         q.setParameter("subject", subject);
         return q;
     }
 
-	public static TypedQuery<SubjectState> findSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject(String lsType, String lsKind, Subject subject, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
+    public static TypedQuery<SubjectState> findSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject(String lsType,
+            String lsKind, Subject subject, String sortFieldName, String sortOrder) {
+        if (lsType == null || lsType.length() == 0)
+            throw new IllegalArgumentException("The lsType argument is required");
+        if (lsKind == null || lsKind.length() == 0)
+            throw new IllegalArgumentException("The lsKind argument is required");
+        if (subject == null)
+            throw new IllegalArgumentException("The subject argument is required");
         EntityManager em = SubjectState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SubjectState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.subject = :subject");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM SubjectState AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.subject = :subject");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -306,8 +352,10 @@ public static TypedQuery<SubjectState> findSubjectStatesByLsTypeEqualsAndLsKindE
         return q;
     }
 
-	public static TypedQuery<SubjectState> findSubjectStatesBySubject(Subject subject, String sortFieldName, String sortOrder) {
-        if (subject == null) throw new IllegalArgumentException("The subject argument is required");
+    public static TypedQuery<SubjectState> findSubjectStatesBySubject(Subject subject, String sortFieldName,
+            String sortOrder) {
+        if (subject == null)
+            throw new IllegalArgumentException("The subject argument is required");
         EntityManager em = SubjectState.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SubjectState AS o WHERE o.subject = :subject");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -321,29 +369,31 @@ public static TypedQuery<SubjectState> findSubjectStatesBySubject(Subject subjec
         return q;
     }
 
-	public Subject getSubject() {
+    public Subject getSubject() {
         return this.subject;
     }
 
-	public void setSubject(Subject subject) {
+    public void setSubject(Subject subject) {
         this.subject = subject;
     }
 
-	public Set<SubjectValue> getLsValues() {
+    public Set<SubjectValue> getLsValues() {
         return this.lsValues;
     }
 
-	public void setLsValues(Set<SubjectValue> lsValues) {
+    public void setLsValues(Set<SubjectValue> lsValues) {
         this.lsValues = lsValues;
     }
 
-	public String toString() {
-        return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).setExcludeFieldNames("subject", "lsValues").toString();
+    public String toString() {
+        return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+                .setExcludeFieldNames("subject", "lsValues").toString();
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "subject", "lsValues");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "subject",
+            "lsValues");
 
-	public static List<SubjectState> findAllSubjectStates(String sortFieldName, String sortOrder) {
+    public static List<SubjectState> findAllSubjectStates(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM SubjectState o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -354,7 +404,8 @@ public static List<SubjectState> findAllSubjectStates(String sortFieldName, Stri
         return entityManager().createQuery(jpaQuery, SubjectState.class).getResultList();
     }
 
-	public static List<SubjectState> findSubjectStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<SubjectState> findSubjectStateEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM SubjectState o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -362,6 +413,7 @@ public static List<SubjectState> findSubjectStateEntries(int firstResult, int ma
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, SubjectState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, SubjectState.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/SubjectValue.java b/src/main/java/com/labsynch/labseer/domain/SubjectValue.java
index 97f67e81b..4f445fb1d 100755
--- a/src/main/java/com/labsynch/labseer/domain/SubjectValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/SubjectValue.java
@@ -31,7 +31,6 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 @Configurable
 @Entity
 public class SubjectValue extends AbstractValue {
@@ -46,116 +45,117 @@ public class SubjectValue extends AbstractValue {
 	public SubjectValue() {
 	}
 
-	
 	public SubjectValue(FlatThingCsvDTO subjectDTO) {
-    	this.setCodeValue(subjectDTO.getCodeValue());
-    	this.setCodeOrigin(subjectDTO.getCodeOrigin());
-    	this.setCodeType(subjectDTO.getCodeType());
-    	this.setCodeKind(subjectDTO.getCodeKind());
-    	this.setLsType(subjectDTO.getValueType());
-    	this.setLsKind(subjectDTO.getValueKind());
-    	this.setStringValue(subjectDTO.getStringValue());
-    	this.setClobValue(subjectDTO.getClobValue());
-    	this.setFileValue(subjectDTO.getFileValue());
-    	this.setUrlValue(subjectDTO.getUrlValue());
-    	this.setDateValue(subjectDTO.getDateValue());
-    	this.setOperatorKind(subjectDTO.getOperatorKind());
-    	this.setNumericValue(subjectDTO.getNumericValue());
-    	this.setFileValue(subjectDTO.getFileValue());
-    	this.setUncertainty(subjectDTO.getUncertainty());
-    	this.setUncertaintyType(subjectDTO.getUncertaintyType());
-    	this.setUnitKind(subjectDTO.getUnitKind());
-    	this.setConcentration(subjectDTO.getConcentration());
-    	this.setConcUnit(subjectDTO.getConcUnit());
-    	this.setNumberOfReplicates(subjectDTO.getNumberOfReplicates());
-        this.setRecordedBy(subjectDTO.getRecordedBy());
-        this.setRecordedDate(subjectDTO.getRecordedDate());
-        this.setLsTransaction(subjectDTO.getLsTransaction());
-        this.setModifiedBy(subjectDTO.getModifiedBy());
-        this.setModifiedDate(subjectDTO.getModifiedDate());
-        this.setComments(subjectDTO.getComments());
-        this.setIgnored(subjectDTO.isIgnored());
-        this.setPublicData(subjectDTO.isPublicData());
-        this.setSigFigs(subjectDTO.getSigFigs());	
-    }
-	
+		this.setCodeValue(subjectDTO.getCodeValue());
+		this.setCodeOrigin(subjectDTO.getCodeOrigin());
+		this.setCodeType(subjectDTO.getCodeType());
+		this.setCodeKind(subjectDTO.getCodeKind());
+		this.setLsType(subjectDTO.getValueType());
+		this.setLsKind(subjectDTO.getValueKind());
+		this.setStringValue(subjectDTO.getStringValue());
+		this.setClobValue(subjectDTO.getClobValue());
+		this.setFileValue(subjectDTO.getFileValue());
+		this.setUrlValue(subjectDTO.getUrlValue());
+		this.setDateValue(subjectDTO.getDateValue());
+		this.setOperatorKind(subjectDTO.getOperatorKind());
+		this.setNumericValue(subjectDTO.getNumericValue());
+		this.setFileValue(subjectDTO.getFileValue());
+		this.setUncertainty(subjectDTO.getUncertainty());
+		this.setUncertaintyType(subjectDTO.getUncertaintyType());
+		this.setUnitKind(subjectDTO.getUnitKind());
+		this.setConcentration(subjectDTO.getConcentration());
+		this.setConcUnit(subjectDTO.getConcUnit());
+		this.setNumberOfReplicates(subjectDTO.getNumberOfReplicates());
+		this.setRecordedBy(subjectDTO.getRecordedBy());
+		this.setRecordedDate(subjectDTO.getRecordedDate());
+		this.setLsTransaction(subjectDTO.getLsTransaction());
+		this.setModifiedBy(subjectDTO.getModifiedBy());
+		this.setModifiedDate(subjectDTO.getModifiedDate());
+		this.setComments(subjectDTO.getComments());
+		this.setIgnored(subjectDTO.isIgnored());
+		this.setPublicData(subjectDTO.isPublicData());
+		this.setSigFigs(subjectDTO.getSigFigs());
+	}
+
 	public SubjectValue(SubjectValue subjectValue) {
-        super.setBlobValue(subjectValue.getBlobValue());
-        super.setClobValue(subjectValue.getClobValue());
-        super.setCodeKind(subjectValue.getCodeKind());
-        super.setCodeOrigin(subjectValue.getCodeOrigin());
-        super.setCodeType(subjectValue.getCodeType());
-        super.setCodeTypeAndKind(subjectValue.getCodeTypeAndKind());
-        super.setCodeValue(subjectValue.getCodeValue());
-        super.setComments(subjectValue.getComments());
-        super.setConcentration(subjectValue.getConcentration());
-        super.setConcUnit(subjectValue.getConcUnit());
-        super.setDateValue(subjectValue.getDateValue());
-        super.setDeleted(subjectValue.isDeleted());
-        super.setFileValue(subjectValue.getFileValue());
-        super.setIgnored(subjectValue.isIgnored());
-        super.setLsKind(subjectValue.getLsKind());
-        super.setLsTransaction(subjectValue.getLsTransaction());
-        super.setLsType(subjectValue.getLsType());
-        super.setLsTypeAndKind(subjectValue.getLsTypeAndKind());
-        super.setModifiedBy(subjectValue.getModifiedBy());
-        super.setModifiedDate(subjectValue.getModifiedDate());
-        super.setNumberOfReplicates(subjectValue.getNumberOfReplicates());
-        super.setNumericValue(subjectValue.getNumericValue());
-        super.setOperatorKind(subjectValue.getOperatorKind());
-        super.setOperatorType(subjectValue.getOperatorType());
-        super.setOperatorTypeAndKind(subjectValue.getOperatorTypeAndKind());
-        super.setPublicData(subjectValue.isPublicData());
-        super.setRecordedBy(subjectValue.getRecordedBy());
-        super.setRecordedDate(subjectValue.getRecordedDate());
-        super.setSigFigs(subjectValue.getSigFigs());
-        super.setStringValue(subjectValue.getStringValue());
-        super.setUncertainty(subjectValue.getUncertainty());
-        super.setUncertaintyType(subjectValue.getUncertaintyType());
-        super.setUnitKind(subjectValue.getUnitKind());
-        super.setUnitType(subjectValue.getUnitType());
-        super.setUnitTypeAndKind(subjectValue.getUnitTypeAndKind());
-        super.setUrlValue(subjectValue.getUrlValue());
+		super.setBlobValue(subjectValue.getBlobValue());
+		super.setClobValue(subjectValue.getClobValue());
+		super.setCodeKind(subjectValue.getCodeKind());
+		super.setCodeOrigin(subjectValue.getCodeOrigin());
+		super.setCodeType(subjectValue.getCodeType());
+		super.setCodeTypeAndKind(subjectValue.getCodeTypeAndKind());
+		super.setCodeValue(subjectValue.getCodeValue());
+		super.setComments(subjectValue.getComments());
+		super.setConcentration(subjectValue.getConcentration());
+		super.setConcUnit(subjectValue.getConcUnit());
+		super.setDateValue(subjectValue.getDateValue());
+		super.setDeleted(subjectValue.isDeleted());
+		super.setFileValue(subjectValue.getFileValue());
+		super.setIgnored(subjectValue.isIgnored());
+		super.setLsKind(subjectValue.getLsKind());
+		super.setLsTransaction(subjectValue.getLsTransaction());
+		super.setLsType(subjectValue.getLsType());
+		super.setLsTypeAndKind(subjectValue.getLsTypeAndKind());
+		super.setModifiedBy(subjectValue.getModifiedBy());
+		super.setModifiedDate(subjectValue.getModifiedDate());
+		super.setNumberOfReplicates(subjectValue.getNumberOfReplicates());
+		super.setNumericValue(subjectValue.getNumericValue());
+		super.setOperatorKind(subjectValue.getOperatorKind());
+		super.setOperatorType(subjectValue.getOperatorType());
+		super.setOperatorTypeAndKind(subjectValue.getOperatorTypeAndKind());
+		super.setPublicData(subjectValue.isPublicData());
+		super.setRecordedBy(subjectValue.getRecordedBy());
+		super.setRecordedDate(subjectValue.getRecordedDate());
+		super.setSigFigs(subjectValue.getSigFigs());
+		super.setStringValue(subjectValue.getStringValue());
+		super.setUncertainty(subjectValue.getUncertainty());
+		super.setUncertaintyType(subjectValue.getUncertaintyType());
+		super.setUnitKind(subjectValue.getUnitKind());
+		super.setUnitType(subjectValue.getUnitType());
+		super.setUnitTypeAndKind(subjectValue.getUnitTypeAndKind());
+		super.setUrlValue(subjectValue.getUrlValue());
 	}
 
 	public Long getStateId() {
 		return this.lsState.getId();
 	}
-	
+
 	public String getStateType() {
 		return this.lsState.getLsType();
 	}
-	
+
 	public String getStateKind() {
 		return this.lsState.getLsKind();
 	}
 
-	//TODO: work out a different strategy with the many to many
-//	public Long getTreatmentGroupId() {
-//		return 0L;
-//	}
-//	
+	// TODO: work out a different strategy with the many to many
+	// public Long getTreatmentGroupId() {
+	// return 0L;
+	// }
+	//
 	public Long getSubjectId() {
 		return this.lsState.getSubject().getId();
 	}
-	
-	
-	public static com.labsynch.labseer.domain.SubjectValue create(com.labsynch.labseer.domain.SubjectValue subjectValue) {
-		SubjectValue newsubjectValue = new JSONDeserializer<SubjectValue>().use(null, SubjectValue.class).deserializeInto(subjectValue.toJson(), new SubjectValue());
+
+	public static com.labsynch.labseer.domain.SubjectValue create(
+			com.labsynch.labseer.domain.SubjectValue subjectValue) {
+		SubjectValue newsubjectValue = new JSONDeserializer<SubjectValue>().use(null, SubjectValue.class)
+				.deserializeInto(subjectValue.toJson(), new SubjectValue());
 		return newsubjectValue;
 	}
 
 	@Transactional
 	public String toJson() {
 		return new JSONSerializer()
-			.include("lsState.subject.treatmentGroups")
-			.exclude("*.class", "lsState.subject.treatmentGroups.analysisGroups")
-			.transform(new ExcludeNulls(), void.class).serialize(this);
+				.include("lsState.subject.treatmentGroups")
+				.exclude("*.class", "lsState.subject.treatmentGroups.analysisGroups")
+				.transform(new ExcludeNulls(), void.class).serialize(this);
 	}
 
 	@Transactional
 	public String toJsonStub() {
-		return new JSONSerializer().include().exclude("*.class", "lsState").transform(new ExcludeNulls(), void.class).serialize(this);
+		return new JSONSerializer().include().exclude("*.class", "lsState").transform(new ExcludeNulls(), void.class)
+				.serialize(this);
 	}
 
 	public static com.labsynch.labseer.domain.SubjectValue fromJsonToSubjectValue(String json) {
@@ -165,22 +165,25 @@ public static com.labsynch.labseer.domain.SubjectValue fromJsonToSubjectValue(St
 	@Transactional
 	public static String toJsonArray(Collection<com.labsynch.labseer.domain.SubjectValue> collection) {
 		return new JSONSerializer()
-			.include("lsState.subject.treatmentGroups")
-			.exclude("*.class", "lsState.subject.treatmentGroups.analysisGroups")
-			.transform(new ExcludeNulls(), void.class).serialize(collection);
+				.include("lsState.subject.treatmentGroups")
+				.exclude("*.class", "lsState.subject.treatmentGroups.analysisGroups")
+				.transform(new ExcludeNulls(), void.class).serialize(collection);
 	}
 
 	@Transactional
 	public static String toJsonArrayStub(Collection<com.labsynch.labseer.domain.SubjectValue> collection) {
-		return new JSONSerializer().exclude("*.class", "lsState").transform(new ExcludeNulls(), void.class).serialize(collection);
+		return new JSONSerializer().exclude("*.class", "lsState").transform(new ExcludeNulls(), void.class)
+				.serialize(collection);
 	}
 
 	public static Collection<com.labsynch.labseer.domain.SubjectValue> fromJsonArrayToSubjectValues(Reader json) {
-		return new JSONDeserializer<List<SubjectValue>>().use(null, ArrayList.class).use("lsState", SubjectState.class).use("values", SubjectValue.class).deserialize(json);
+		return new JSONDeserializer<List<SubjectValue>>().use(null, ArrayList.class).use("lsState", SubjectState.class)
+				.use("values", SubjectValue.class).deserialize(json);
 	}
 
 	public static Collection<com.labsynch.labseer.domain.SubjectValue> fromJsonArrayToSubjectValues(String json) {
-		return new JSONDeserializer<List<SubjectValue>>().use(null, ArrayList.class).use("values", SubjectValue.class).deserialize(json);
+		return new JSONDeserializer<List<SubjectValue>>().use(null, ArrayList.class).use("values", SubjectValue.class)
+				.deserialize(json);
 	}
 
 	public static long countSubjectValues() {
@@ -194,17 +197,21 @@ public static List<com.labsynch.labseer.domain.SubjectValue> findAllSubjectValue
 
 	@Transactional
 	public static com.labsynch.labseer.domain.SubjectValue findSubjectValue(Long id) {
-		if (id == null) return null;
+		if (id == null)
+			return null;
 		return entityManager().find(SubjectValue.class, id);
 	}
 
-	public static List<com.labsynch.labseer.domain.SubjectValue> findSubjectValueEntries(int firstResult, int maxResults) {
-		return entityManager().createQuery("SELECT o FROM SubjectValue o", SubjectValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+	public static List<com.labsynch.labseer.domain.SubjectValue> findSubjectValueEntries(int firstResult,
+			int maxResults) {
+		return entityManager().createQuery("SELECT o FROM SubjectValue o", SubjectValue.class)
+				.setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
 	}
 
 	@Transactional
 	public com.labsynch.labseer.domain.SubjectValue merge() {
-		if (this.entityManager == null) this.entityManager = entityManager();
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
 		SubjectValue merged = this.entityManager.merge(this);
 		this.entityManager.flush();
 		return merged;
@@ -247,14 +254,16 @@ public static String getSubjectValueCollectionJson(List<java.lang.Long> idList)
 		Collection<SubjectValue> subjectValues = new HashSet<SubjectValue>();
 		for (Long id : idList) {
 			SubjectValue query = SubjectValue.findSubjectValue(id);
-			if (query != null) subjectValues.add(query);
+			if (query != null)
+				subjectValues.add(query);
 		}
 		return SubjectValue.toJsonArray(subjectValues);
 	}
 
 	@Transactional
 	public static int deleteByExperimentID(Long experimentId) {
-		if (experimentId == null) return 0;
+		if (experimentId == null)
+			return 0;
 		EntityManager em = SubjectValue.entityManager();
 		String deleteSQL = "DELETE FROM SubjectValue oo WHERE id in (select o.id from SubjectValue o where o.lsState.subject.treatmentGroups.analysisGroups.experiments.id = :experimentId)";
 		Query q = em.createQuery(deleteSQL);
@@ -263,21 +272,26 @@ public static int deleteByExperimentID(Long experimentId) {
 		return numberOfDeletedEntities;
 	}
 
-	public static com.labsynch.labseer.domain.SubjectValue update(com.labsynch.labseer.domain.SubjectValue subjectValue) {
-		SubjectValue updatedSubjectValue = new JSONDeserializer<SubjectValue>().use(null, SubjectValue.class).deserializeInto(subjectValue.toJson(), SubjectValue.findSubjectValue(subjectValue.getId()));
+	public static com.labsynch.labseer.domain.SubjectValue update(
+			com.labsynch.labseer.domain.SubjectValue subjectValue) {
+		SubjectValue updatedSubjectValue = new JSONDeserializer<SubjectValue>().use(null, SubjectValue.class)
+				.deserializeInto(subjectValue.toJson(), SubjectValue.findSubjectValue(subjectValue.getId()));
 		updatedSubjectValue.setModifiedDate(new Date());
 		updatedSubjectValue.merge();
 		return updatedSubjectValue;
 	}
 
-	public static TypedQuery<SubjectValue> findSubjectValuesByExptIDAndStateTypeKind(Long experimentId, String stateType, String stateKind) {
-		if (stateType == null || stateType.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
+	public static TypedQuery<SubjectValue> findSubjectValuesByExptIDAndStateTypeKind(Long experimentId,
+			String stateType, String stateKind) {
+		if (stateType == null || stateType.length() == 0)
+			throw new IllegalArgumentException("The stateType argument is required");
+		if (stateKind == null || stateKind.length() == 0)
+			throw new IllegalArgumentException("The stateKind argument is required");
 
 		EntityManager em = entityManager();
 		String hsqlQuery = "SELECT sv FROM SubjectValue AS sv " +
 				"JOIN sv.lsState svs " +
-				"JOIN svs.subject s " + 
+				"JOIN svs.subject s " +
 				"JOIN s.treatmentGroups tg " +
 				"JOIN tg.analysisGroups ag " +
 				"JOIN ag.experiments exp " +
@@ -295,17 +309,22 @@ public static TypedQuery<SubjectValue> findSubjectValuesByExptIDAndStateTypeKind
 		return q;
 	}
 
-	public static TypedQuery<SubjectValue> findSubjectValuesByExptIDAndStateTypeKindAndValueTypeKind(Long experimentId, String stateType,
+	public static TypedQuery<SubjectValue> findSubjectValuesByExptIDAndStateTypeKindAndValueTypeKind(Long experimentId,
+			String stateType,
 			String stateKind, String valueType, String valueKind) {
-		if (stateType == null || stateType.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-		if (valueType == null || valueType.length() == 0) throw new IllegalArgumentException("The valueType argument is required");
-		if (valueKind == null || valueKind.length() == 0) throw new IllegalArgumentException("The valueKind argument is required");
+		if (stateType == null || stateType.length() == 0)
+			throw new IllegalArgumentException("The stateType argument is required");
+		if (stateKind == null || stateKind.length() == 0)
+			throw new IllegalArgumentException("The stateKind argument is required");
+		if (valueType == null || valueType.length() == 0)
+			throw new IllegalArgumentException("The valueType argument is required");
+		if (valueKind == null || valueKind.length() == 0)
+			throw new IllegalArgumentException("The valueKind argument is required");
 
 		EntityManager em = entityManager();
 		String hsqlQuery = "SELECT sv FROM SubjectValue AS sv " +
 				"JOIN sv.lsState svs " +
-				"JOIN svs.subject s " + 
+				"JOIN svs.subject s " +
 				"JOIN s.treatmentGroups tg " +
 				"JOIN tg.analysisGroups ag " +
 				"JOIN ag.experiments exp " +
@@ -324,15 +343,18 @@ public static TypedQuery<SubjectValue> findSubjectValuesByExptIDAndStateTypeKind
 		q.setParameter("ignored", true);
 		return q;
 	}
-	
-	public static TypedQuery<SubjectValue> findSubjectValuesByAnalysisGroupIDAndStateTypeKind(Long analysisGroupId, String stateType, String  stateKind) {
-		if (stateType == null || stateType.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
+
+	public static TypedQuery<SubjectValue> findSubjectValuesByAnalysisGroupIDAndStateTypeKind(Long analysisGroupId,
+			String stateType, String stateKind) {
+		if (stateType == null || stateType.length() == 0)
+			throw new IllegalArgumentException("The stateType argument is required");
+		if (stateKind == null || stateKind.length() == 0)
+			throw new IllegalArgumentException("The stateKind argument is required");
 
 		EntityManager em = entityManager();
 		String hsqlQuery = "SELECT sv FROM SubjectValue AS sv " +
 				"JOIN sv.lsState svs " +
-				"JOIN svs.subject s " + 
+				"JOIN svs.subject s " +
 				"JOIN s.treatmentGroups tg " +
 				"JOIN tg.analysisGroups ag " +
 				"WHERE svs.lsType = :stateType AND svs.lsKind = :stateKind AND svs.ignored IS NOT :ignored " +
@@ -348,8 +370,8 @@ public static TypedQuery<SubjectValue> findSubjectValuesByAnalysisGroupIDAndStat
 		q.setParameter("ignored", true);
 		return q;
 	}
-	
-	public static String[] getColumns(){
+
+	public static String[] getColumns() {
 		String[] headerColumns = new String[] {
 				"treatmentGroupId",
 				"subjectId",
@@ -388,16 +410,16 @@ public static String[] getColumns(){
 				"recordedDate",
 				"recordedBy",
 				"modifiedDate",
-				"modifiedBy",				
+				"modifiedBy",
 				"publicData"
 		};
-//35 columns
+		// 35 columns
 		return headerColumns;
 
 	}
 
 	public static CellProcessor[] getProcessors() {
-		final CellProcessor[] processors = new CellProcessor[] { 
+		final CellProcessor[] processors = new CellProcessor[] {
 				new Optional(),
 				new Optional(),
 				new Optional(),
@@ -438,35 +460,36 @@ public static CellProcessor[] getProcessors() {
 				new Optional(),
 				new Optional()
 
-
 		};
 
 		return processors;
 	}
 
-
 	public Collection<SubjectValueDTO> makeDTOsByTreatmentGroupIds() {
 		Collection<SubjectValueDTO> subjectValueDTOs = new HashSet<SubjectValueDTO>();
 		Collection<TreatmentGroup> treatmentGroups = Subject.findSubject(this.getSubjectId()).getTreatmentGroups();
-		for (TreatmentGroup treatmentGroup: treatmentGroups) {
+		for (TreatmentGroup treatmentGroup : treatmentGroups) {
 			SubjectValueDTO subjectValueDTO = new SubjectValueDTO(this);
 			subjectValueDTO.setTreatmentGroupId(treatmentGroup.getId());
 			subjectValueDTOs.add(subjectValueDTO);
 		}
-		
+
 		return subjectValueDTOs;
 	}
 
-
 	public static TypedQuery<SubjectValue> findSubjectValuesBySubjectIDAndStateTypeKindAndValueTypeKind(
 			Long subjectId, String stateType, String stateKind,
 			String valueType, String valueKind) {
-		
-		if (stateType == null || stateType.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-		if (valueType == null || valueType.length() == 0) throw new IllegalArgumentException("The valueType argument is required");
-		if (valueKind == null || valueKind.length() == 0) throw new IllegalArgumentException("The valueKind argument is required");
-		
+
+		if (stateType == null || stateType.length() == 0)
+			throw new IllegalArgumentException("The stateType argument is required");
+		if (stateKind == null || stateKind.length() == 0)
+			throw new IllegalArgumentException("The stateKind argument is required");
+		if (valueType == null || valueType.length() == 0)
+			throw new IllegalArgumentException("The valueType argument is required");
+		if (valueKind == null || valueKind.length() == 0)
+			throw new IllegalArgumentException("The valueKind argument is required");
+
 		EntityManager em = entityManager();
 		String hsqlQuery = "SELECT sv FROM SubjectValue AS sv " +
 				"JOIN sv.lsState ss " +
@@ -484,16 +507,20 @@ public static TypedQuery<SubjectValue> findSubjectValuesBySubjectIDAndStateTypeK
 		q.setParameter("ignored", true);
 		return q;
 	}
-	
+
 	public static TypedQuery<SubjectValue> findSubjectValuesBySubjectCodeNameAndStateTypeKindAndValueTypeKind(
 			String subjectCodeName, String stateType, String stateKind,
 			String valueType, String valueKind) {
-		
-		if (stateType == null || stateType.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-		if (valueType == null || valueType.length() == 0) throw new IllegalArgumentException("The valueType argument is required");
-		if (valueKind == null || valueKind.length() == 0) throw new IllegalArgumentException("The valueKind argument is required");
-		
+
+		if (stateType == null || stateType.length() == 0)
+			throw new IllegalArgumentException("The stateType argument is required");
+		if (stateKind == null || stateKind.length() == 0)
+			throw new IllegalArgumentException("The stateKind argument is required");
+		if (valueType == null || valueType.length() == 0)
+			throw new IllegalArgumentException("The valueType argument is required");
+		if (valueKind == null || valueKind.length() == 0)
+			throw new IllegalArgumentException("The valueKind argument is required");
+
 		EntityManager em = entityManager();
 		String hsqlQuery = "SELECT sv FROM SubjectValue AS sv " +
 				"JOIN sv.lsState ss " +
@@ -512,216 +539,268 @@ public static TypedQuery<SubjectValue> findSubjectValuesBySubjectCodeNameAndStat
 		return q;
 	}
 
-
 	public SubjectState getLsState() {
-        return this.lsState;
-    }
+		return this.lsState;
+	}
 
 	public void setLsState(SubjectState lsState) {
-        this.lsState = lsState;
-    }
+		this.lsState = lsState;
+	}
 
 	public static Long countFindSubjectValuesByCodeValueEquals(String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SubjectValue AS o WHERE o.codeValue = :codeValue", Long.class);
-        q.setParameter("codeValue", codeValue);
-        return ((Long) q.getSingleResult());
-    }
+		if (codeValue == null || codeValue.length() == 0)
+			throw new IllegalArgumentException("The codeValue argument is required");
+		EntityManager em = SubjectValue.entityManager();
+		TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SubjectValue AS o WHERE o.codeValue = :codeValue",
+				Long.class);
+		q.setParameter("codeValue", codeValue);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static Long countFindSubjectValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SubjectValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", Long.class);
-        q.setParameter("ignored", ignored);
-        q.setParameter("codeValue", codeValue);
-        return ((Long) q.getSingleResult());
-    }
+		if (codeValue == null || codeValue.length() == 0)
+			throw new IllegalArgumentException("The codeValue argument is required");
+		EntityManager em = SubjectValue.entityManager();
+		TypedQuery q = em.createQuery(
+				"SELECT COUNT(o) FROM SubjectValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue",
+				Long.class);
+		q.setParameter("ignored", ignored);
+		q.setParameter("codeValue", codeValue);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static Long countFindSubjectValuesByLsState(SubjectState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SubjectValue AS o WHERE o.lsState = :lsState", Long.class);
-        q.setParameter("lsState", lsState);
-        return ((Long) q.getSingleResult());
-    }
-
-	public static Long countFindSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals(SubjectState lsState, String lsType, String lsKind) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SubjectValue AS o WHERE o.lsState = :lsState AND o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
-        q.setParameter("lsState", lsState);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
+		if (lsState == null)
+			throw new IllegalArgumentException("The lsState argument is required");
+		EntityManager em = SubjectValue.entityManager();
+		TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SubjectValue AS o WHERE o.lsState = :lsState", Long.class);
+		q.setParameter("lsState", lsState);
+		return ((Long) q.getSingleResult());
+	}
+
+	public static Long countFindSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals(SubjectState lsState,
+			String lsType, String lsKind) {
+		if (lsState == null)
+			throw new IllegalArgumentException("The lsState argument is required");
+		if (lsType == null || lsType.length() == 0)
+			throw new IllegalArgumentException("The lsType argument is required");
+		if (lsKind == null || lsKind.length() == 0)
+			throw new IllegalArgumentException("The lsKind argument is required");
+		EntityManager em = SubjectValue.entityManager();
+		TypedQuery q = em.createQuery(
+				"SELECT COUNT(o) FROM SubjectValue AS o WHERE o.lsState = :lsState AND o.lsType = :lsType  AND o.lsKind = :lsKind",
+				Long.class);
+		q.setParameter("lsState", lsState);
+		q.setParameter("lsType", lsType);
+		q.setParameter("lsKind", lsKind);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static Long countFindSubjectValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM SubjectValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return ((Long) q.getSingleResult());
-    }
+		if (lsType == null || lsType.length() == 0)
+			throw new IllegalArgumentException("The lsType argument is required");
+		if (lsKind == null || lsKind.length() == 0)
+			throw new IllegalArgumentException("The lsKind argument is required");
+		EntityManager em = SubjectValue.entityManager();
+		TypedQuery q = em.createQuery(
+				"SELECT COUNT(o) FROM SubjectValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", Long.class);
+		q.setParameter("lsType", lsType);
+		q.setParameter("lsKind", lsKind);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static TypedQuery<SubjectValue> findSubjectValuesByCodeValueEquals(String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        TypedQuery<SubjectValue> q = em.createQuery("SELECT o FROM SubjectValue AS o WHERE o.codeValue = :codeValue", SubjectValue.class);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-
-	public static TypedQuery<SubjectValue> findSubjectValuesByCodeValueEquals(String codeValue, String sortFieldName, String sortOrder) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SubjectValue AS o WHERE o.codeValue = :codeValue");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<SubjectValue> q = em.createQuery(queryBuilder.toString(), SubjectValue.class);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-
-	public static TypedQuery<SubjectValue> findSubjectValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        TypedQuery<SubjectValue> q = em.createQuery("SELECT o FROM SubjectValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", SubjectValue.class);
-        q.setParameter("ignored", ignored);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-
-	public static TypedQuery<SubjectValue> findSubjectValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue, String sortFieldName, String sortOrder) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SubjectValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<SubjectValue> q = em.createQuery(queryBuilder.toString(), SubjectValue.class);
-        q.setParameter("ignored", ignored);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
+		if (codeValue == null || codeValue.length() == 0)
+			throw new IllegalArgumentException("The codeValue argument is required");
+		EntityManager em = SubjectValue.entityManager();
+		TypedQuery<SubjectValue> q = em.createQuery("SELECT o FROM SubjectValue AS o WHERE o.codeValue = :codeValue",
+				SubjectValue.class);
+		q.setParameter("codeValue", codeValue);
+		return q;
+	}
+
+	public static TypedQuery<SubjectValue> findSubjectValuesByCodeValueEquals(String codeValue, String sortFieldName,
+			String sortOrder) {
+		if (codeValue == null || codeValue.length() == 0)
+			throw new IllegalArgumentException("The codeValue argument is required");
+		EntityManager em = SubjectValue.entityManager();
+		StringBuilder queryBuilder = new StringBuilder(
+				"SELECT o FROM SubjectValue AS o WHERE o.codeValue = :codeValue");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<SubjectValue> q = em.createQuery(queryBuilder.toString(), SubjectValue.class);
+		q.setParameter("codeValue", codeValue);
+		return q;
+	}
+
+	public static TypedQuery<SubjectValue> findSubjectValuesByIgnoredNotAndCodeValueEquals(boolean ignored,
+			String codeValue) {
+		if (codeValue == null || codeValue.length() == 0)
+			throw new IllegalArgumentException("The codeValue argument is required");
+		EntityManager em = SubjectValue.entityManager();
+		TypedQuery<SubjectValue> q = em.createQuery(
+				"SELECT o FROM SubjectValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue",
+				SubjectValue.class);
+		q.setParameter("ignored", ignored);
+		q.setParameter("codeValue", codeValue);
+		return q;
+	}
+
+	public static TypedQuery<SubjectValue> findSubjectValuesByIgnoredNotAndCodeValueEquals(boolean ignored,
+			String codeValue, String sortFieldName, String sortOrder) {
+		if (codeValue == null || codeValue.length() == 0)
+			throw new IllegalArgumentException("The codeValue argument is required");
+		EntityManager em = SubjectValue.entityManager();
+		StringBuilder queryBuilder = new StringBuilder(
+				"SELECT o FROM SubjectValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<SubjectValue> q = em.createQuery(queryBuilder.toString(), SubjectValue.class);
+		q.setParameter("ignored", ignored);
+		q.setParameter("codeValue", codeValue);
+		return q;
+	}
 
 	public static TypedQuery<SubjectValue> findSubjectValuesByLsState(SubjectState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        TypedQuery<SubjectValue> q = em.createQuery("SELECT o FROM SubjectValue AS o WHERE o.lsState = :lsState", SubjectValue.class);
-        q.setParameter("lsState", lsState);
-        return q;
-    }
-
-	public static TypedQuery<SubjectValue> findSubjectValuesByLsState(SubjectState lsState, String sortFieldName, String sortOrder) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SubjectValue AS o WHERE o.lsState = :lsState");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<SubjectValue> q = em.createQuery(queryBuilder.toString(), SubjectValue.class);
-        q.setParameter("lsState", lsState);
-        return q;
-    }
-
-	public static TypedQuery<SubjectValue> findSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals(SubjectState lsState, String lsType, String lsKind) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        TypedQuery<SubjectValue> q = em.createQuery("SELECT o FROM SubjectValue AS o WHERE o.lsState = :lsState AND o.lsType = :lsType  AND o.lsKind = :lsKind", SubjectValue.class);
-        q.setParameter("lsState", lsState);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-
-	public static TypedQuery<SubjectValue> findSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals(SubjectState lsState, String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SubjectValue AS o WHERE o.lsState = :lsState AND o.lsType = :lsType  AND o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<SubjectValue> q = em.createQuery(queryBuilder.toString(), SubjectValue.class);
-        q.setParameter("lsState", lsState);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-
-	public static TypedQuery<SubjectValue> findSubjectValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        TypedQuery<SubjectValue> q = em.createQuery("SELECT o FROM SubjectValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", SubjectValue.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
-
-	public static TypedQuery<SubjectValue> findSubjectValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind, String sortFieldName, String sortOrder) {
-        if (lsType == null || lsType.length() == 0) throw new IllegalArgumentException("The lsType argument is required");
-        if (lsKind == null || lsKind.length() == 0) throw new IllegalArgumentException("The lsKind argument is required");
-        EntityManager em = SubjectValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SubjectValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<SubjectValue> q = em.createQuery(queryBuilder.toString(), SubjectValue.class);
-        q.setParameter("lsType", lsType);
-        q.setParameter("lsKind", lsKind);
-        return q;
-    }
+		if (lsState == null)
+			throw new IllegalArgumentException("The lsState argument is required");
+		EntityManager em = SubjectValue.entityManager();
+		TypedQuery<SubjectValue> q = em.createQuery("SELECT o FROM SubjectValue AS o WHERE o.lsState = :lsState",
+				SubjectValue.class);
+		q.setParameter("lsState", lsState);
+		return q;
+	}
+
+	public static TypedQuery<SubjectValue> findSubjectValuesByLsState(SubjectState lsState, String sortFieldName,
+			String sortOrder) {
+		if (lsState == null)
+			throw new IllegalArgumentException("The lsState argument is required");
+		EntityManager em = SubjectValue.entityManager();
+		StringBuilder queryBuilder = new StringBuilder("SELECT o FROM SubjectValue AS o WHERE o.lsState = :lsState");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<SubjectValue> q = em.createQuery(queryBuilder.toString(), SubjectValue.class);
+		q.setParameter("lsState", lsState);
+		return q;
+	}
+
+	public static TypedQuery<SubjectValue> findSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals(
+			SubjectState lsState, String lsType, String lsKind) {
+		if (lsState == null)
+			throw new IllegalArgumentException("The lsState argument is required");
+		if (lsType == null || lsType.length() == 0)
+			throw new IllegalArgumentException("The lsType argument is required");
+		if (lsKind == null || lsKind.length() == 0)
+			throw new IllegalArgumentException("The lsKind argument is required");
+		EntityManager em = SubjectValue.entityManager();
+		TypedQuery<SubjectValue> q = em.createQuery(
+				"SELECT o FROM SubjectValue AS o WHERE o.lsState = :lsState AND o.lsType = :lsType  AND o.lsKind = :lsKind",
+				SubjectValue.class);
+		q.setParameter("lsState", lsState);
+		q.setParameter("lsType", lsType);
+		q.setParameter("lsKind", lsKind);
+		return q;
+	}
+
+	public static TypedQuery<SubjectValue> findSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals(
+			SubjectState lsState, String lsType, String lsKind, String sortFieldName, String sortOrder) {
+		if (lsState == null)
+			throw new IllegalArgumentException("The lsState argument is required");
+		if (lsType == null || lsType.length() == 0)
+			throw new IllegalArgumentException("The lsType argument is required");
+		if (lsKind == null || lsKind.length() == 0)
+			throw new IllegalArgumentException("The lsKind argument is required");
+		EntityManager em = SubjectValue.entityManager();
+		StringBuilder queryBuilder = new StringBuilder(
+				"SELECT o FROM SubjectValue AS o WHERE o.lsState = :lsState AND o.lsType = :lsType  AND o.lsKind = :lsKind");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<SubjectValue> q = em.createQuery(queryBuilder.toString(), SubjectValue.class);
+		q.setParameter("lsState", lsState);
+		q.setParameter("lsType", lsType);
+		q.setParameter("lsKind", lsKind);
+		return q;
+	}
+
+	public static TypedQuery<SubjectValue> findSubjectValuesByLsTypeEqualsAndLsKindEquals(String lsType,
+			String lsKind) {
+		if (lsType == null || lsType.length() == 0)
+			throw new IllegalArgumentException("The lsType argument is required");
+		if (lsKind == null || lsKind.length() == 0)
+			throw new IllegalArgumentException("The lsKind argument is required");
+		EntityManager em = SubjectValue.entityManager();
+		TypedQuery<SubjectValue> q = em.createQuery(
+				"SELECT o FROM SubjectValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind", SubjectValue.class);
+		q.setParameter("lsType", lsType);
+		q.setParameter("lsKind", lsKind);
+		return q;
+	}
+
+	public static TypedQuery<SubjectValue> findSubjectValuesByLsTypeEqualsAndLsKindEquals(String lsType, String lsKind,
+			String sortFieldName, String sortOrder) {
+		if (lsType == null || lsType.length() == 0)
+			throw new IllegalArgumentException("The lsType argument is required");
+		if (lsKind == null || lsKind.length() == 0)
+			throw new IllegalArgumentException("The lsKind argument is required");
+		EntityManager em = SubjectValue.entityManager();
+		StringBuilder queryBuilder = new StringBuilder(
+				"SELECT o FROM SubjectValue AS o WHERE o.lsType = :lsType  AND o.lsKind = :lsKind");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<SubjectValue> q = em.createQuery(queryBuilder.toString(), SubjectValue.class);
+		q.setParameter("lsType", lsType);
+		q.setParameter("lsKind", lsKind);
+		return q;
+	}
 
 	public String toString() {
-        return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).setExcludeFieldNames("lsState").toString();
-    }
+		return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).setExcludeFieldNames("lsState")
+				.toString();
+	}
 
 	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsState");
 
 	public static List<SubjectValue> findAllSubjectValues(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM SubjectValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, SubjectValue.class).getResultList();
-    }
-
-	public static List<SubjectValue> findSubjectValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM SubjectValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, SubjectValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
+		String jpaQuery = "SELECT o FROM SubjectValue o";
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				jpaQuery = jpaQuery + " " + sortOrder;
+			}
+		}
+		return entityManager().createQuery(jpaQuery, SubjectValue.class).getResultList();
+	}
+
+	public static List<SubjectValue> findSubjectValueEntries(int firstResult, int maxResults, String sortFieldName,
+			String sortOrder) {
+		String jpaQuery = "SELECT o FROM SubjectValue o";
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				jpaQuery = jpaQuery + " " + sortOrder;
+			}
+		}
+		return entityManager().createQuery(jpaQuery, SubjectValue.class).setFirstResult(firstResult)
+				.setMaxResults(maxResults).getResultList();
+	}
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/TempSelectTable.java b/src/main/java/com/labsynch/labseer/domain/TempSelectTable.java
index 790c0f845..5a780716d 100644
--- a/src/main/java/com/labsynch/labseer/domain/TempSelectTable.java
+++ b/src/main/java/com/labsynch/labseer/domain/TempSelectTable.java
@@ -32,186 +32,181 @@
 
 public class TempSelectTable {
 
-	private static final Logger logger = LoggerFactory.getLogger(TempSelectTable.class);
+    private static final Logger logger = LoggerFactory.getLogger(TempSelectTable.class);
 
-	
     private Long numberVar;
 
-	
-	
     @Size(max = 255)
     private String stringVar;
-    
-	
-	private Long lsTransaction;
-
-	@NotNull
-	@Temporal(TemporalType.TIMESTAMP)
-	@DateTimeFormat(style = "MM")
-	private Date recordedDate;
-	
-	@Size(max = 255)
-	private String recordedBy;
-    
-
-	@PersistenceContext
+
+    private Long lsTransaction;
+
+    @NotNull
+    @Temporal(TemporalType.TIMESTAMP)
+    @DateTimeFormat(style = "MM")
+    private Date recordedDate;
+
+    @Size(max = 255)
+    private String recordedBy;
+
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new TempSelectTable().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
-		
-	@Transactional
-	public static int deleteTempSelectTableEntries(Long lsTranscation) {
-		String sqlQuery = "DELETE FROM TempSelectTable o WHERE o.lsTransaction = :lsTranscation ";
-
-		logger.info("Input lsTranscation: " + lsTranscation);
-		logger.info("sqlQuery: " + sqlQuery);
-
-		
-		Query em = entityManager().createQuery(sqlQuery);
-		em.setParameter("lsTranscation", lsTranscation);
-		int result = em.executeUpdate();
-		return result;
+
+    @Transactional
+    public static int deleteTempSelectTableEntries(Long lsTranscation) {
+        String sqlQuery = "DELETE FROM TempSelectTable o WHERE o.lsTransaction = :lsTranscation ";
+
+        logger.info("Input lsTranscation: " + lsTranscation);
+        logger.info("sqlQuery: " + sqlQuery);
+
+        Query em = entityManager().createQuery(sqlQuery);
+        em.setParameter("lsTranscation", lsTranscation);
+        int result = em.executeUpdate();
+        return result;
+    }
+
+    public static Long saveStrings(Set<String> stringList, String recordedBy, Date recordedDate) {
+
+        LsTransaction lsTransaction = new LsTransaction();
+        lsTransaction.setRecordedDate(recordedDate);
+        lsTransaction.persist();
+
+        int batchSize = 25;
+        int batchCounter = 1;
+        TempSelectTable tst;
+        for (String batchCode : stringList) {
+            tst = new TempSelectTable();
+            tst.setStringVar(batchCode);
+            tst.setLsTransaction(lsTransaction.getId());
+            tst.setRecordedDate(recordedDate);
+            tst.setRecordedBy(recordedBy);
+            tst.persist();
+            if (batchCounter % batchSize == 0) {
+                tst.flush();
+                tst.clear();
+            }
+            batchCounter++;
+        }
+
+        return lsTransaction.getId();
+    }
+
+    public static Long saveNumbers(Set<Long> numericList, String recordedBy, Date recordedDate) {
+
+        LsTransaction lsTransaction = new LsTransaction();
+        lsTransaction.setRecordedDate(recordedDate);
+        lsTransaction.persist();
+
+        int batchSize = 25;
+        int batchCounter = 1;
+        TempSelectTable tst;
+        for (Long batchCode : numericList) {
+            tst = new TempSelectTable();
+            tst.setNumberVar(batchCode);
+            tst.setLsTransaction(lsTransaction.getId());
+            tst.setRecordedDate(recordedDate);
+            tst.setRecordedBy(recordedBy);
+            tst.persist();
+            if (batchCounter % batchSize == 0) {
+                tst.flush();
+                tst.clear();
+            }
+            batchCounter++;
+        }
+
+        return lsTransaction.getId();
     }
 
-	public static Long saveStrings(Set<String> stringList,  String recordedBy, Date recordedDate) {
-		
-		LsTransaction lsTransaction = new LsTransaction();
-		lsTransaction.setRecordedDate(recordedDate);
-		lsTransaction.persist();
-		
-		int batchSize = 25;
-		int batchCounter = 1;
-		TempSelectTable tst;
-		for (String batchCode : stringList){
-			tst = new TempSelectTable();
-			tst.setStringVar(batchCode);
-			tst.setLsTransaction(lsTransaction.getId());
-			tst.setRecordedDate(recordedDate);
-			tst.setRecordedBy(recordedBy);
-			tst.persist();
-			if (batchCounter % batchSize == 0){
-				tst.flush();
-				tst.clear();
-			}
-			batchCounter++;
-		}
-		
-		return lsTransaction.getId();
-	}
-	
-	public static Long saveNumbers(Set<Long> numericList, String recordedBy, Date recordedDate) {
-		
-		LsTransaction lsTransaction = new LsTransaction();
-		lsTransaction.setRecordedDate(recordedDate);
-		lsTransaction.persist();
-		
-		int batchSize = 25;
-		int batchCounter = 1;
-		TempSelectTable tst;
-		for (Long batchCode : numericList){
-			tst = new TempSelectTable();
-			tst.setNumberVar(batchCode);
-			tst.setLsTransaction(lsTransaction.getId());
-			tst.setRecordedDate(recordedDate);
-			tst.setRecordedBy(recordedBy);
-			tst.persist();
-			if (batchCounter % batchSize == 0){
-				tst.flush();
-				tst.clear();
-			}
-			batchCounter++;
-		}
-		
-		return lsTransaction.getId();
-	}
-
-
-
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	@Id
+    @Id
     @SequenceGenerator(name = "tempSelectTableGen", sequenceName = "TEMP_SELECT_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "tempSelectTableGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public Long getNumberVar() {
+    public Long getNumberVar() {
         return this.numberVar;
     }
 
-	public void setNumberVar(Long numberVar) {
+    public void setNumberVar(Long numberVar) {
         this.numberVar = numberVar;
     }
 
-	public String getStringVar() {
+    public String getStringVar() {
         return this.stringVar;
     }
 
-	public void setStringVar(String stringVar) {
+    public void setStringVar(String stringVar) {
         this.stringVar = stringVar;
     }
 
-	public Long getLsTransaction() {
+    public Long getLsTransaction() {
         return this.lsTransaction;
     }
 
-	public void setLsTransaction(Long lsTransaction) {
+    public void setLsTransaction(Long lsTransaction) {
         this.lsTransaction = lsTransaction;
     }
 
-	public Date getRecordedDate() {
+    public Date getRecordedDate() {
         return this.recordedDate;
     }
 
-	public void setRecordedDate(Date recordedDate) {
+    public void setRecordedDate(Date recordedDate) {
         this.recordedDate = recordedDate;
     }
 
-	public String getRecordedBy() {
+    public String getRecordedBy() {
         return this.recordedBy;
     }
 
-	public void setRecordedBy(String recordedBy) {
+    public void setRecordedBy(String recordedBy) {
         this.recordedBy = recordedBy;
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "numberVar", "stringVar", "lsTransaction", "recordedDate", "recordedBy", "entityManager");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "numberVar",
+            "stringVar", "lsTransaction", "recordedDate", "recordedBy", "entityManager");
 
-	public static long countTempSelectTables() {
+    public static long countTempSelectTables() {
         return entityManager().createQuery("SELECT COUNT(o) FROM TempSelectTable o", Long.class).getSingleResult();
     }
 
-	public static List<TempSelectTable> findAllTempSelectTables() {
+    public static List<TempSelectTable> findAllTempSelectTables() {
         return entityManager().createQuery("SELECT o FROM TempSelectTable o", TempSelectTable.class).getResultList();
     }
 
-	public static List<TempSelectTable> findAllTempSelectTables(String sortFieldName, String sortOrder) {
+    public static List<TempSelectTable> findAllTempSelectTables(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM TempSelectTable o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -222,16 +217,19 @@ public static List<TempSelectTable> findAllTempSelectTables(String sortFieldName
         return entityManager().createQuery(jpaQuery, TempSelectTable.class).getResultList();
     }
 
-	public static TempSelectTable findTempSelectTable(Long id) {
-        if (id == null) return null;
+    public static TempSelectTable findTempSelectTable(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(TempSelectTable.class, id);
     }
 
-	public static List<TempSelectTable> findTempSelectTableEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM TempSelectTable o", TempSelectTable.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<TempSelectTable> findTempSelectTableEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM TempSelectTable o", TempSelectTable.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<TempSelectTable> findTempSelectTableEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<TempSelectTable> findTempSelectTableEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM TempSelectTable o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -239,18 +237,21 @@ public static List<TempSelectTable> findTempSelectTableEntries(int firstResult,
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, TempSelectTable.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, TempSelectTable.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -259,21 +260,24 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public TempSelectTable merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         TempSelectTable merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingKind.java b/src/main/java/com/labsynch/labseer/domain/ThingKind.java
index 3a04b2866..f61845e68 100755
--- a/src/main/java/com/labsynch/labseer/domain/ThingKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ThingKind.java
@@ -33,7 +33,7 @@
 
 public class ThingKind {
 
-	private static final Logger logger = LoggerFactory.getLogger(ThingKind.class);
+    private static final Logger logger = LoggerFactory.getLogger(ThingKind.class);
 
     @NotNull
     @ManyToOne
@@ -79,7 +79,9 @@ public void setVersion(Integer version) {
 
     public static final EntityManager entityManager() {
         EntityManager em = new ThingKind().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
@@ -92,25 +94,30 @@ public static List<com.labsynch.labseer.domain.ThingKind> findAllThingKinds() {
     }
 
     public static com.labsynch.labseer.domain.ThingKind findThingKind(Long id) {
-        if (id == null) return null;
+        if (id == null)
+            return null;
         return entityManager().find(ThingKind.class, id);
     }
 
     public static List<com.labsynch.labseer.domain.ThingKind> findThingKindEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ThingKind o", ThingKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery("SELECT o FROM ThingKind o", ThingKind.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
     @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.lsType = ThingType.findThingType(this.getLsType().getId());
-        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_').append(this.getKindName()).toString();
+        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_')
+                .append(this.getKindName()).toString();
         this.entityManager.persist(this);
     }
 
     @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -121,101 +128,107 @@ public void remove() {
 
     @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
     @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
     @Transactional
     public com.labsynch.labseer.domain.ThingKind merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_').append(this.getKindName()).toString();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
+        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_')
+                .append(this.getKindName()).toString();
         ThingKind merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public static ThingKind getOrCreate(ThingType thingType, String kindName) {
-		
-		ThingKind thingKind = null;
-		List<ThingKind> thingKinds = ThingKind.findThingKindsByKindNameEqualsAndLsType(kindName, thingType).getResultList();
-		
-		if (thingKinds.size() == 0){
-			thingKind = new ThingKind();
-			thingKind.setKindName(kindName);
-			thingKind.setLsType(thingType);
-			thingKind.persist();
-		} else if (thingKinds.size() == 1){
-			thingKind = thingKinds.get(0);
-		} else if (thingKinds.size() > 1){
-			logger.error("ERROR: multiple thing kinds with the same name and type");
-		}
-		
-		return thingKind;
-	}
-
-	public String toJson() {
+    public static ThingKind getOrCreate(ThingType thingType, String kindName) {
+
+        ThingKind thingKind = null;
+        List<ThingKind> thingKinds = ThingKind.findThingKindsByKindNameEqualsAndLsType(kindName, thingType)
+                .getResultList();
+
+        if (thingKinds.size() == 0) {
+            thingKind = new ThingKind();
+            thingKind.setKindName(kindName);
+            thingKind.setLsType(thingType);
+            thingKind.persist();
+        } else if (thingKinds.size() == 1) {
+            thingKind = thingKinds.get(0);
+        } else if (thingKinds.size() > 1) {
+            logger.error("ERROR: multiple thing kinds with the same name and type");
+        }
+
+        return thingKind;
+    }
+
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ThingKind fromJsonToThingKind(String json) {
+    public static ThingKind fromJsonToThingKind(String json) {
         return new JSONDeserializer<ThingKind>()
-        .use(null, ThingKind.class).deserialize(json);
+                .use(null, ThingKind.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ThingKind> collection) {
+    public static String toJsonArray(Collection<ThingKind> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ThingKind> collection, String[] fields) {
+    public static String toJsonArray(Collection<ThingKind> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ThingKind> fromJsonArrayToThingKinds(String json) {
+    public static Collection<ThingKind> fromJsonArrayToThingKinds(String json) {
         return new JSONDeserializer<List<ThingKind>>()
-        .use("values", ThingKind.class).deserialize(json);
+                .use("values", ThingKind.class).deserialize(json);
     }
 
-	public ThingType getLsType() {
+    public ThingType getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(ThingType lsType) {
+    public void setLsType(ThingType lsType) {
         this.lsType = lsType;
     }
 
-	public String getKindName() {
+    public String getKindName() {
         return this.kindName;
     }
 
-	public void setKindName(String kindName) {
+    public void setKindName(String kindName) {
         this.kindName = kindName;
     }
 
-	public String getLsTypeAndKind() {
+    public String getLsTypeAndKind() {
         return this.lsTypeAndKind;
     }
 
-	public void setLsTypeAndKind(String lsTypeAndKind) {
+    public void setLsTypeAndKind(String lsTypeAndKind) {
         this.lsTypeAndKind = lsTypeAndKind;
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType",
+            "kindName", "lsTypeAndKind", "id", "version", "entityManager");
 
-	public static List<ThingKind> findAllThingKinds(String sortFieldName, String sortOrder) {
+    public static List<ThingKind> findAllThingKinds(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ThingKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -226,7 +239,8 @@ public static List<ThingKind> findAllThingKinds(String sortFieldName, String sor
         return entityManager().createQuery(jpaQuery, ThingKind.class).getResultList();
     }
 
-	public static List<ThingKind> findThingKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ThingKind> findThingKindEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM ThingKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -234,54 +248,68 @@ public static List<ThingKind> findThingKindEntries(int firstResult, int maxResul
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ThingKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ThingKind.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static Long countFindThingKindsByKindNameEqualsAndLsType(String kindName, ThingType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static Long countFindThingKindsByKindNameEqualsAndLsType(String kindName, ThingType lsType) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = ThingKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ThingKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ThingKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
         q.setParameter("kindName", kindName);
         q.setParameter("lsType", lsType);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindThingKindsByLsType(ThingType lsType) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static Long countFindThingKindsByLsType(ThingType lsType) {
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = ThingKind.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ThingKind AS o WHERE o.lsType = :lsType", Long.class);
         q.setParameter("lsType", lsType);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindThingKindsByLsTypeAndKindEquals(String lsTypeAndKind) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+    public static Long countFindThingKindsByLsTypeAndKindEquals(String lsTypeAndKind) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = ThingKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ThingKind AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ThingKind AS o WHERE o.lsTypeAndKind = :lsTypeAndKind",
+                Long.class);
         q.setParameter("lsTypeAndKind", lsTypeAndKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<ThingKind> findThingKindsByKindNameEqualsAndLsType(String kindName, ThingType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<ThingKind> findThingKindsByKindNameEqualsAndLsType(String kindName, ThingType lsType) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = ThingKind.entityManager();
-        TypedQuery<ThingKind> q = em.createQuery("SELECT o FROM ThingKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", ThingKind.class);
+        TypedQuery<ThingKind> q = em.createQuery(
+                "SELECT o FROM ThingKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", ThingKind.class);
         q.setParameter("kindName", kindName);
         q.setParameter("lsType", lsType);
         return q;
     }
 
-	public static TypedQuery<ThingKind> findThingKindsByKindNameEqualsAndLsType(String kindName, ThingType lsType, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<ThingKind> findThingKindsByKindNameEqualsAndLsType(String kindName, ThingType lsType,
+            String sortFieldName, String sortOrder) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = ThingKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ThingKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ThingKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -294,16 +322,20 @@ public static TypedQuery<ThingKind> findThingKindsByKindNameEqualsAndLsType(Stri
         return q;
     }
 
-	public static TypedQuery<ThingKind> findThingKindsByLsType(ThingType lsType) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<ThingKind> findThingKindsByLsType(ThingType lsType) {
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = ThingKind.entityManager();
-        TypedQuery<ThingKind> q = em.createQuery("SELECT o FROM ThingKind AS o WHERE o.lsType = :lsType", ThingKind.class);
+        TypedQuery<ThingKind> q = em.createQuery("SELECT o FROM ThingKind AS o WHERE o.lsType = :lsType",
+                ThingKind.class);
         q.setParameter("lsType", lsType);
         return q;
     }
 
-	public static TypedQuery<ThingKind> findThingKindsByLsType(ThingType lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<ThingKind> findThingKindsByLsType(ThingType lsType, String sortFieldName,
+            String sortOrder) {
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = ThingKind.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ThingKind AS o WHERE o.lsType = :lsType");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -317,18 +349,23 @@ public static TypedQuery<ThingKind> findThingKindsByLsType(ThingType lsType, Str
         return q;
     }
 
-	public static TypedQuery<ThingKind> findThingKindsByLsTypeAndKindEquals(String lsTypeAndKind) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+    public static TypedQuery<ThingKind> findThingKindsByLsTypeAndKindEquals(String lsTypeAndKind) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = ThingKind.entityManager();
-        TypedQuery<ThingKind> q = em.createQuery("SELECT o FROM ThingKind AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", ThingKind.class);
+        TypedQuery<ThingKind> q = em.createQuery("SELECT o FROM ThingKind AS o WHERE o.lsTypeAndKind = :lsTypeAndKind",
+                ThingKind.class);
         q.setParameter("lsTypeAndKind", lsTypeAndKind);
         return q;
     }
 
-	public static TypedQuery<ThingKind> findThingKindsByLsTypeAndKindEquals(String lsTypeAndKind, String sortFieldName, String sortOrder) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+    public static TypedQuery<ThingKind> findThingKindsByLsTypeAndKindEquals(String lsTypeAndKind, String sortFieldName,
+            String sortOrder) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = ThingKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ThingKind AS o WHERE o.lsTypeAndKind = :lsTypeAndKind");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ThingKind AS o WHERE o.lsTypeAndKind = :lsTypeAndKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingPage.java b/src/main/java/com/labsynch/labseer/domain/ThingPage.java
index 6ef8ff1b6..2b7c8bfb6 100755
--- a/src/main/java/com/labsynch/labseer/domain/ThingPage.java
+++ b/src/main/java/com/labsynch/labseer/domain/ThingPage.java
@@ -48,7 +48,7 @@ public class ThingPage {
     @DateTimeFormat(style = "MM")
     private Date recordedDate;
 
-    @Column(columnDefinition="text")
+    @Column(columnDefinition = "text")
     @Basic(fetch = FetchType.LAZY)
     private String pageContent;
 
@@ -80,174 +80,178 @@ public class ThingPage {
     @JoinColumn(name = "thing_id")
     private AbstractThing thing;
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ThingPage fromJsonToThingPage(String json) {
+    public static ThingPage fromJsonToThingPage(String json) {
         return new JSONDeserializer<ThingPage>()
-        .use(null, ThingPage.class).deserialize(json);
+                .use(null, ThingPage.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ThingPage> collection) {
+    public static String toJsonArray(Collection<ThingPage> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ThingPage> collection, String[] fields) {
+    public static String toJsonArray(Collection<ThingPage> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ThingPage> fromJsonArrayToThingPages(String json) {
+    public static Collection<ThingPage> fromJsonArrayToThingPages(String json) {
         return new JSONDeserializer<List<ThingPage>>()
-        .use("values", ThingPage.class).deserialize(json);
+                .use("values", ThingPage.class).deserialize(json);
     }
 
-	public String getPageName() {
+    public String getPageName() {
         return this.pageName;
     }
 
-	public void setPageName(String pageName) {
+    public void setPageName(String pageName) {
         this.pageName = pageName;
     }
 
-	public String getRecordedBy() {
+    public String getRecordedBy() {
         return this.recordedBy;
     }
 
-	public void setRecordedBy(String recordedBy) {
+    public void setRecordedBy(String recordedBy) {
         this.recordedBy = recordedBy;
     }
 
-	public Date getRecordedDate() {
+    public Date getRecordedDate() {
         return this.recordedDate;
     }
 
-	public void setRecordedDate(Date recordedDate) {
+    public void setRecordedDate(Date recordedDate) {
         this.recordedDate = recordedDate;
     }
 
-	public String getPageContent() {
+    public String getPageContent() {
         return this.pageContent;
     }
 
-	public void setPageContent(String pageContent) {
+    public void setPageContent(String pageContent) {
         this.pageContent = pageContent;
     }
 
-	public String getModifiedBy() {
+    public String getModifiedBy() {
         return this.modifiedBy;
     }
 
-	public void setModifiedBy(String modifiedBy) {
+    public void setModifiedBy(String modifiedBy) {
         this.modifiedBy = modifiedBy;
     }
 
-	public Date getModifiedDate() {
+    public Date getModifiedDate() {
         return this.modifiedDate;
     }
 
-	public void setModifiedDate(Date modifiedDate) {
+    public void setModifiedDate(Date modifiedDate) {
         this.modifiedDate = modifiedDate;
     }
 
-	public String getCurrentEditor() {
+    public String getCurrentEditor() {
         return this.currentEditor;
     }
 
-	public void setCurrentEditor(String currentEditor) {
+    public void setCurrentEditor(String currentEditor) {
         this.currentEditor = currentEditor;
     }
 
-	public boolean isIgnored() {
+    public boolean isIgnored() {
         return this.ignored;
     }
 
-	public void setIgnored(boolean ignored) {
+    public void setIgnored(boolean ignored) {
         this.ignored = ignored;
     }
 
-	public boolean isArchived() {
+    public boolean isArchived() {
         return this.archived;
     }
 
-	public void setArchived(boolean archived) {
+    public void setArchived(boolean archived) {
         this.archived = archived;
     }
 
-	public LsTransaction getLsTransaction() {
+    public LsTransaction getLsTransaction() {
         return this.lsTransaction;
     }
 
-	public void setLsTransaction(LsTransaction lsTransaction) {
+    public void setLsTransaction(LsTransaction lsTransaction) {
         this.lsTransaction = lsTransaction;
     }
 
-	public AbstractThing getThing() {
+    public AbstractThing getThing() {
         return this.thing;
     }
 
-	public void setThing(AbstractThing thing) {
+    public void setThing(AbstractThing thing) {
         this.thing = thing;
     }
 
-	@Id
+    @Id
     @SequenceGenerator(name = "thingPageGen", sequenceName = "THING_PAGE_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "thingPageGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("pageName", "recordedBy", "recordedDate", "pageContent", "modifiedBy", "modifiedDate", "currentEditor", "ignored", "archived", "lsTransaction", "thing");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("pageName", "recordedBy",
+            "recordedDate", "pageContent", "modifiedBy", "modifiedDate", "currentEditor", "ignored", "archived",
+            "lsTransaction", "thing");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new ThingPage().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countThingPages() {
+    public static long countThingPages() {
         return entityManager().createQuery("SELECT COUNT(o) FROM ThingPage o", Long.class).getSingleResult();
     }
 
-	public static List<ThingPage> findAllThingPages() {
+    public static List<ThingPage> findAllThingPages() {
         return entityManager().createQuery("SELECT o FROM ThingPage o", ThingPage.class).getResultList();
     }
 
-	public static List<ThingPage> findAllThingPages(String sortFieldName, String sortOrder) {
+    public static List<ThingPage> findAllThingPages(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ThingPage o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -258,16 +262,19 @@ public static List<ThingPage> findAllThingPages(String sortFieldName, String sor
         return entityManager().createQuery(jpaQuery, ThingPage.class).getResultList();
     }
 
-	public static ThingPage findThingPage(Long id) {
-        if (id == null) return null;
+    public static ThingPage findThingPage(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ThingPage.class, id);
     }
 
-	public static List<ThingPage> findThingPageEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ThingPage o", ThingPage.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ThingPage> findThingPageEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ThingPage o", ThingPage.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ThingPage> findThingPageEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ThingPage> findThingPageEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM ThingPage o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -275,18 +282,21 @@ public static List<ThingPage> findThingPageEntries(int firstResult, int maxResul
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ThingPage.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ThingPage.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -295,21 +305,24 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public ThingPage merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ThingPage merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingPageArchive.java b/src/main/java/com/labsynch/labseer/domain/ThingPageArchive.java
index ac3485133..da78cb573 100755
--- a/src/main/java/com/labsynch/labseer/domain/ThingPageArchive.java
+++ b/src/main/java/com/labsynch/labseer/domain/ThingPageArchive.java
@@ -46,7 +46,7 @@ public class ThingPageArchive {
     @DateTimeFormat(style = "MM")
     private Date recordedDate;
 
-    @Column(columnDefinition="text")
+    @Column(columnDefinition = "text")
     @Basic(fetch = FetchType.LAZY)
     private String pageContent;
 
@@ -74,182 +74,186 @@ public class ThingPageArchive {
 
     private Integer pageVersion;
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ThingPageArchive fromJsonToThingPageArchive(String json) {
+    public static ThingPageArchive fromJsonToThingPageArchive(String json) {
         return new JSONDeserializer<ThingPageArchive>()
-        .use(null, ThingPageArchive.class).deserialize(json);
+                .use(null, ThingPageArchive.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ThingPageArchive> collection) {
+    public static String toJsonArray(Collection<ThingPageArchive> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ThingPageArchive> collection, String[] fields) {
+    public static String toJsonArray(Collection<ThingPageArchive> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ThingPageArchive> fromJsonArrayToThingPageArchives(String json) {
+    public static Collection<ThingPageArchive> fromJsonArrayToThingPageArchives(String json) {
         return new JSONDeserializer<List<ThingPageArchive>>()
-        .use("values", ThingPageArchive.class).deserialize(json);
+                .use("values", ThingPageArchive.class).deserialize(json);
     }
 
-	@Id
+    @Id
     @SequenceGenerator(name = "thingPageArchiveGen", sequenceName = "THING_PAGE_ARCHIVE_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "thingPageArchiveGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String getPageName() {
+    public String getPageName() {
         return this.pageName;
     }
 
-	public void setPageName(String pageName) {
+    public void setPageName(String pageName) {
         this.pageName = pageName;
     }
 
-	public String getRecordedBy() {
+    public String getRecordedBy() {
         return this.recordedBy;
     }
 
-	public void setRecordedBy(String recordedBy) {
+    public void setRecordedBy(String recordedBy) {
         this.recordedBy = recordedBy;
     }
 
-	public Date getRecordedDate() {
+    public Date getRecordedDate() {
         return this.recordedDate;
     }
 
-	public void setRecordedDate(Date recordedDate) {
+    public void setRecordedDate(Date recordedDate) {
         this.recordedDate = recordedDate;
     }
 
-	public String getPageContent() {
+    public String getPageContent() {
         return this.pageContent;
     }
 
-	public void setPageContent(String pageContent) {
+    public void setPageContent(String pageContent) {
         this.pageContent = pageContent;
     }
 
-	public String getModifiedBy() {
+    public String getModifiedBy() {
         return this.modifiedBy;
     }
 
-	public void setModifiedBy(String modifiedBy) {
+    public void setModifiedBy(String modifiedBy) {
         this.modifiedBy = modifiedBy;
     }
 
-	public Date getModifiedDate() {
+    public Date getModifiedDate() {
         return this.modifiedDate;
     }
 
-	public void setModifiedDate(Date modifiedDate) {
+    public void setModifiedDate(Date modifiedDate) {
         this.modifiedDate = modifiedDate;
     }
 
-	public String getCurrentEditor() {
+    public String getCurrentEditor() {
         return this.currentEditor;
     }
 
-	public void setCurrentEditor(String currentEditor) {
+    public void setCurrentEditor(String currentEditor) {
         this.currentEditor = currentEditor;
     }
 
-	public boolean isIgnored() {
+    public boolean isIgnored() {
         return this.ignored;
     }
 
-	public void setIgnored(boolean ignored) {
+    public void setIgnored(boolean ignored) {
         this.ignored = ignored;
     }
 
-	public boolean isArchived() {
+    public boolean isArchived() {
         return this.archived;
     }
 
-	public void setArchived(boolean archived) {
+    public void setArchived(boolean archived) {
         this.archived = archived;
     }
 
-	public Long getLsTransaction() {
+    public Long getLsTransaction() {
         return this.lsTransaction;
     }
 
-	public void setLsTransaction(Long lsTransaction) {
+    public void setLsTransaction(Long lsTransaction) {
         this.lsTransaction = lsTransaction;
     }
 
-	public Long getThing() {
+    public Long getThing() {
         return this.thing;
     }
 
-	public void setThing(Long thing) {
+    public void setThing(Long thing) {
         this.thing = thing;
     }
 
-	public Integer getPageVersion() {
+    public Integer getPageVersion() {
         return this.pageVersion;
     }
 
-	public void setPageVersion(Integer pageVersion) {
+    public void setPageVersion(Integer pageVersion) {
         this.pageVersion = pageVersion;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("pageName", "recordedBy", "recordedDate", "pageContent", "modifiedBy", "modifiedDate", "currentEditor", "ignored", "archived", "lsTransaction", "thing", "pageVersion");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("pageName", "recordedBy",
+            "recordedDate", "pageContent", "modifiedBy", "modifiedDate", "currentEditor", "ignored", "archived",
+            "lsTransaction", "thing", "pageVersion");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new ThingPageArchive().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countThingPageArchives() {
+    public static long countThingPageArchives() {
         return entityManager().createQuery("SELECT COUNT(o) FROM ThingPageArchive o", Long.class).getSingleResult();
     }
 
-	public static List<ThingPageArchive> findAllThingPageArchives() {
+    public static List<ThingPageArchive> findAllThingPageArchives() {
         return entityManager().createQuery("SELECT o FROM ThingPageArchive o", ThingPageArchive.class).getResultList();
     }
 
-	public static List<ThingPageArchive> findAllThingPageArchives(String sortFieldName, String sortOrder) {
+    public static List<ThingPageArchive> findAllThingPageArchives(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ThingPageArchive o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -260,16 +264,19 @@ public static List<ThingPageArchive> findAllThingPageArchives(String sortFieldNa
         return entityManager().createQuery(jpaQuery, ThingPageArchive.class).getResultList();
     }
 
-	public static ThingPageArchive findThingPageArchive(Long id) {
-        if (id == null) return null;
+    public static ThingPageArchive findThingPageArchive(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ThingPageArchive.class, id);
     }
 
-	public static List<ThingPageArchive> findThingPageArchiveEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ThingPageArchive o", ThingPageArchive.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ThingPageArchive> findThingPageArchiveEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ThingPageArchive o", ThingPageArchive.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ThingPageArchive> findThingPageArchiveEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ThingPageArchive> findThingPageArchiveEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ThingPageArchive o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -277,18 +284,21 @@ public static List<ThingPageArchive> findThingPageArchiveEntries(int firstResult
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ThingPageArchive.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ThingPageArchive.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -297,21 +307,24 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public ThingPageArchive merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ThingPageArchive merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
diff --git a/src/main/java/com/labsynch/labseer/domain/ThingType.java b/src/main/java/com/labsynch/labseer/domain/ThingType.java
index 47f97a532..f6657b4e3 100755
--- a/src/main/java/com/labsynch/labseer/domain/ThingType.java
+++ b/src/main/java/com/labsynch/labseer/domain/ThingType.java
@@ -31,78 +31,79 @@
 
 public class ThingType {
 
-	private static final Logger logger = LoggerFactory.getLogger(ThingType.class);
-
-	
-	@NotNull
-	@Column(unique = true)
-	@Size(max = 128)
-	private String typeName;
-
-	public static ThingType getOrCreate(String name) {
-
-		ThingType thingType = null;
-		List<ThingType> thingTypes = ThingType.findThingTypesByTypeNameEquals(name).getResultList();
-		if (thingTypes.size() == 0){
-			thingType = new ThingType();
-			thingType.setTypeName(name);
-			thingType.persist();
-		} else if (thingTypes.size() == 1){
-			thingType = thingTypes.get(0);
-		} else if (thingTypes.size() > 1){
-			logger.error("ERROR: multiple thing types with the same name");
-		}
-		
-
-		return thingType;
-	}
-
-	@Id
+    private static final Logger logger = LoggerFactory.getLogger(ThingType.class);
+
+    @NotNull
+    @Column(unique = true)
+    @Size(max = 128)
+    private String typeName;
+
+    public static ThingType getOrCreate(String name) {
+
+        ThingType thingType = null;
+        List<ThingType> thingTypes = ThingType.findThingTypesByTypeNameEquals(name).getResultList();
+        if (thingTypes.size() == 0) {
+            thingType = new ThingType();
+            thingType.setTypeName(name);
+            thingType.persist();
+        } else if (thingTypes.size() == 1) {
+            thingType = thingTypes.get(0);
+        } else if (thingTypes.size() > 1) {
+            logger.error("ERROR: multiple thing types with the same name");
+        }
+
+        return thingType;
+    }
+
+    @Id
     @SequenceGenerator(name = "thingTypeGen", sequenceName = "THING_TYPE_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "thingTypeGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "typeName", "id", "version");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "typeName", "id",
+            "version");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new ThingType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countThingTypes() {
+    public static long countThingTypes() {
         return entityManager().createQuery("SELECT COUNT(o) FROM ThingType o", Long.class).getSingleResult();
     }
 
-	public static List<ThingType> findAllThingTypes() {
+    public static List<ThingType> findAllThingTypes() {
         return entityManager().createQuery("SELECT o FROM ThingType o", ThingType.class).getResultList();
     }
 
-	public static List<ThingType> findAllThingTypes(String sortFieldName, String sortOrder) {
+    public static List<ThingType> findAllThingTypes(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ThingType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -113,16 +114,19 @@ public static List<ThingType> findAllThingTypes(String sortFieldName, String sor
         return entityManager().createQuery(jpaQuery, ThingType.class).getResultList();
     }
 
-	public static ThingType findThingType(Long id) {
-        if (id == null) return null;
+    public static ThingType findThingType(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ThingType.class, id);
     }
 
-	public static List<ThingType> findThingTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ThingType o", ThingType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ThingType> findThingTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ThingType o", ThingType.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ThingType> findThingTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ThingType> findThingTypeEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM ThingType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -130,18 +134,21 @@ public static List<ThingType> findThingTypeEntries(int firstResult, int maxResul
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ThingType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ThingType.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -150,44 +157,52 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public ThingType merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ThingType merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public static Long countFindThingTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static Long countFindThingTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = ThingType.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ThingType AS o WHERE o.typeName = :typeName", Long.class);
         q.setParameter("typeName", typeName);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<ThingType> findThingTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static TypedQuery<ThingType> findThingTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = ThingType.entityManager();
-        TypedQuery<ThingType> q = em.createQuery("SELECT o FROM ThingType AS o WHERE o.typeName = :typeName", ThingType.class);
+        TypedQuery<ThingType> q = em.createQuery("SELECT o FROM ThingType AS o WHERE o.typeName = :typeName",
+                ThingType.class);
         q.setParameter("typeName", typeName);
         return q;
     }
 
-	public static TypedQuery<ThingType> findThingTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static TypedQuery<ThingType> findThingTypesByTypeNameEquals(String typeName, String sortFieldName,
+            String sortOrder) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = ThingType.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ThingType AS o WHERE o.typeName = :typeName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -201,45 +216,45 @@ public static TypedQuery<ThingType> findThingTypesByTypeNameEquals(String typeNa
         return q;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ThingType fromJsonToThingType(String json) {
+    public static ThingType fromJsonToThingType(String json) {
         return new JSONDeserializer<ThingType>()
-        .use(null, ThingType.class).deserialize(json);
+                .use(null, ThingType.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ThingType> collection) {
+    public static String toJsonArray(Collection<ThingType> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ThingType> collection, String[] fields) {
+    public static String toJsonArray(Collection<ThingType> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ThingType> fromJsonArrayToThingTypes(String json) {
+    public static Collection<ThingType> fromJsonArrayToThingTypes(String json) {
         return new JSONDeserializer<List<ThingType>>()
-        .use("values", ThingType.class).deserialize(json);
+                .use("values", ThingType.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getTypeName() {
+    public String getTypeName() {
         return this.typeName;
     }
 
-	public void setTypeName(String typeName) {
+    public void setTypeName(String typeName) {
         this.typeName = typeName;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroup.java b/src/main/java/com/labsynch/labseer/domain/TreatmentGroup.java
index ba8c56ecd..d955fdefe 100755
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroup.java
+++ b/src/main/java/com/labsynch/labseer/domain/TreatmentGroup.java
@@ -39,11 +39,15 @@ public class TreatmentGroup extends AbstractThing {
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "treatmentGroup", fetch = FetchType.LAZY)
     private Set<TreatmentGroupState> lsStates = new HashSet<TreatmentGroupState>();
 
-    @ManyToMany(cascade = { javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.MERGE }, mappedBy = "treatmentGroups")
+    @ManyToMany(cascade = { javax.persistence.CascadeType.PERSIST,
+            javax.persistence.CascadeType.MERGE }, mappedBy = "treatmentGroups")
     private Set<Subject> subjects = new HashSet<Subject>();
 
-    @ManyToMany(cascade = { javax.persistence.CascadeType.PERSIST, javax.persistence.CascadeType.MERGE }, fetch = FetchType.LAZY)
-    @JoinTable(name = "ANALYSISGROUP_TREATMENTGROUP", joinColumns = { @javax.persistence.JoinColumn(name = "treatment_group_id") }, inverseJoinColumns = { @javax.persistence.JoinColumn(name = "analysis_group_id") })
+    @ManyToMany(cascade = { javax.persistence.CascadeType.PERSIST,
+            javax.persistence.CascadeType.MERGE }, fetch = FetchType.LAZY)
+    @JoinTable(name = "ANALYSISGROUP_TREATMENTGROUP", joinColumns = {
+            @javax.persistence.JoinColumn(name = "treatment_group_id") }, inverseJoinColumns = {
+                    @javax.persistence.JoinColumn(name = "analysis_group_id") })
     private Set<AnalysisGroup> analysisGroups = new HashSet<AnalysisGroup>();
 
     public TreatmentGroup() {
@@ -73,7 +77,8 @@ public TreatmentGroup(FlatThingCsvDTO treatmentGroupDTO) {
         this.setLsType(treatmentGroupDTO.getLsType());
     }
 
-    public static com.labsynch.labseer.domain.TreatmentGroup update(com.labsynch.labseer.domain.TreatmentGroup treatmentGroup) {
+    public static com.labsynch.labseer.domain.TreatmentGroup update(
+            com.labsynch.labseer.domain.TreatmentGroup treatmentGroup) {
         TreatmentGroup updatedTreatmentGroup = TreatmentGroup.findTreatmentGroup(treatmentGroup.getId());
         updatedTreatmentGroup.setRecordedBy(treatmentGroup.getRecordedBy());
         updatedTreatmentGroup.setRecordedDate(treatmentGroup.getRecordedDate());
@@ -90,7 +95,10 @@ public static com.labsynch.labseer.domain.TreatmentGroup update(com.labsynch.lab
     }
 
     public String toJson() {
-        return new JSONSerializer().include("lsLabels", "lsStates.lsValues", "subjects").exclude("*.class", "analysisGroups.experiments", "lsStates.treatmentGroup", "lsLabels.treatmentGroup", "subjects.treatmentGroups").serialize(this);
+        return new JSONSerializer()
+                .include("lsLabels", "lsStates.lsValues", "subjects").exclude("*.class", "analysisGroups.experiments",
+                        "lsStates.treatmentGroup", "lsLabels.treatmentGroup", "subjects.treatmentGroups")
+                .serialize(this);
     }
 
     public static com.labsynch.labseer.domain.TreatmentGroup fromJsonToTreatmentGroup(String json) {
@@ -98,19 +106,25 @@ public static com.labsynch.labseer.domain.TreatmentGroup fromJsonToTreatmentGrou
     }
 
     public static String toJsonArray(Collection<com.labsynch.labseer.domain.TreatmentGroup> collection) {
-        return new JSONSerializer().include("lsLabels", "lsStates.lsValues", "subjects").exclude("*.class", "analysisGroup.experiment", "lsStates.treatmentGroup", "lsLabels.treatmentGroup", "subjects.treatmentGroup").serialize(collection);
+        return new JSONSerializer()
+                .include("lsLabels", "lsStates.lsValues", "subjects").exclude("*.class", "analysisGroup.experiment",
+                        "lsStates.treatmentGroup", "lsLabels.treatmentGroup", "subjects.treatmentGroup")
+                .serialize(collection);
     }
 
     public static Collection<com.labsynch.labseer.domain.TreatmentGroup> fromJsonArrayToTreatmentGroups(String json) {
-        return new JSONDeserializer<List<TreatmentGroup>>().use(null, ArrayList.class).use("values", TreatmentGroup.class).deserialize(json);
+        return new JSONDeserializer<List<TreatmentGroup>>().use(null, ArrayList.class)
+                .use("values", TreatmentGroup.class).deserialize(json);
     }
 
     public static Collection<com.labsynch.labseer.domain.TreatmentGroup> fromJsonArrayToTreatmentGroups(Reader json) {
-        return new JSONDeserializer<List<TreatmentGroup>>().use(null, ArrayList.class).use("values", TreatmentGroup.class).deserialize(json);
+        return new JSONDeserializer<List<TreatmentGroup>>().use(null, ArrayList.class)
+                .use("values", TreatmentGroup.class).deserialize(json);
     }
 
     public static int deleteByExperimentID(Long experimentId) {
-        if (experimentId == null) return 0;
+        if (experimentId == null)
+            return 0;
         EntityManager em = SubjectValue.entityManager();
         String deleteSQL = "DELETE FROM TreatmentGroup t WHERE TreatmentGroup IN (SELECT t FROM TreatmentGroup t JOIN t.analysisGroups a JOIN a.experiments e WHERE e.id = :experimentId)";
         Query q = em.createQuery(deleteSQL);
@@ -140,67 +154,79 @@ private static Collection<java.lang.Long> removeCascadeAware(Long id) {
         }
         subjects.clear();
         EntityManager em = TreatmentGroup.entityManager();
-        Query q1 = em.createNativeQuery("DELETE FROM treatmentGroup_subject o WHERE o.treatment_group_id = :id", TreatmentGroup.class);
+        Query q1 = em.createNativeQuery("DELETE FROM treatmentGroup_subject o WHERE o.treatment_group_id = :id",
+                TreatmentGroup.class);
         q1.setParameter("id", id);
         q1.executeUpdate();
         treatmentGroup.remove();
         return subjectIds;
     }
 
-	public static Long countFindTreatmentGroupsByAnalysisGroups(Set<AnalysisGroup> analysisGroups) {
-        if (analysisGroups == null) throw new IllegalArgumentException("The analysisGroups argument is required");
+    public static Long countFindTreatmentGroupsByAnalysisGroups(Set<AnalysisGroup> analysisGroups) {
+        if (analysisGroups == null)
+            throw new IllegalArgumentException("The analysisGroups argument is required");
         EntityManager em = TreatmentGroup.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT COUNT(o) FROM TreatmentGroup AS o WHERE");
         for (int i = 0; i < analysisGroups.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
+            if (i > 0)
+                queryBuilder.append(" AND");
             queryBuilder.append(" :analysisGroups_item").append(i).append(" MEMBER OF o.analysisGroups");
         }
         TypedQuery q = em.createQuery(queryBuilder.toString(), Long.class);
         int analysisGroupsIndex = 0;
-        for (AnalysisGroup _analysisgroup: analysisGroups) {
+        for (AnalysisGroup _analysisgroup : analysisGroups) {
             q.setParameter("analysisGroups_item" + analysisGroupsIndex++, _analysisgroup);
         }
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindTreatmentGroupsByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static Long countFindTreatmentGroupsByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = TreatmentGroup.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroup AS o WHERE o.codeName = :codeName", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroup AS o WHERE o.codeName = :codeName",
+                Long.class);
         q.setParameter("codeName", codeName);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindTreatmentGroupsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static Long countFindTreatmentGroupsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = TreatmentGroup.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroup AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroup AS o WHERE o.lsTransaction = :lsTransaction",
+                Long.class);
         q.setParameter("lsTransaction", lsTransaction);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<TreatmentGroup> findTreatmentGroupsByAnalysisGroups(Set<AnalysisGroup> analysisGroups) {
-        if (analysisGroups == null) throw new IllegalArgumentException("The analysisGroups argument is required");
+    public static TypedQuery<TreatmentGroup> findTreatmentGroupsByAnalysisGroups(Set<AnalysisGroup> analysisGroups) {
+        if (analysisGroups == null)
+            throw new IllegalArgumentException("The analysisGroups argument is required");
         EntityManager em = TreatmentGroup.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroup AS o WHERE");
         for (int i = 0; i < analysisGroups.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
+            if (i > 0)
+                queryBuilder.append(" AND");
             queryBuilder.append(" :analysisGroups_item").append(i).append(" MEMBER OF o.analysisGroups");
         }
         TypedQuery<TreatmentGroup> q = em.createQuery(queryBuilder.toString(), TreatmentGroup.class);
         int analysisGroupsIndex = 0;
-        for (AnalysisGroup _analysisgroup: analysisGroups) {
+        for (AnalysisGroup _analysisgroup : analysisGroups) {
             q.setParameter("analysisGroups_item" + analysisGroupsIndex++, _analysisgroup);
         }
         return q;
     }
 
-	public static TypedQuery<TreatmentGroup> findTreatmentGroupsByAnalysisGroups(Set<AnalysisGroup> analysisGroups, String sortFieldName, String sortOrder) {
-        if (analysisGroups == null) throw new IllegalArgumentException("The analysisGroups argument is required");
+    public static TypedQuery<TreatmentGroup> findTreatmentGroupsByAnalysisGroups(Set<AnalysisGroup> analysisGroups,
+            String sortFieldName, String sortOrder) {
+        if (analysisGroups == null)
+            throw new IllegalArgumentException("The analysisGroups argument is required");
         EntityManager em = TreatmentGroup.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroup AS o WHERE");
         for (int i = 0; i < analysisGroups.size(); i++) {
-            if (i > 0) queryBuilder.append(" AND");
+            if (i > 0)
+                queryBuilder.append(" AND");
             queryBuilder.append(" :analysisGroups_item").append(i).append(" MEMBER OF o.analysisGroups");
         }
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -211,24 +237,29 @@ public static TypedQuery<TreatmentGroup> findTreatmentGroupsByAnalysisGroups(Set
         }
         TypedQuery<TreatmentGroup> q = em.createQuery(queryBuilder.toString(), TreatmentGroup.class);
         int analysisGroupsIndex = 0;
-        for (AnalysisGroup _analysisgroup: analysisGroups) {
+        for (AnalysisGroup _analysisgroup : analysisGroups) {
             q.setParameter("analysisGroups_item" + analysisGroupsIndex++, _analysisgroup);
         }
         return q;
     }
 
-	public static TypedQuery<TreatmentGroup> findTreatmentGroupsByCodeNameEquals(String codeName) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static TypedQuery<TreatmentGroup> findTreatmentGroupsByCodeNameEquals(String codeName) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = TreatmentGroup.entityManager();
-        TypedQuery<TreatmentGroup> q = em.createQuery("SELECT o FROM TreatmentGroup AS o WHERE o.codeName = :codeName", TreatmentGroup.class);
+        TypedQuery<TreatmentGroup> q = em.createQuery("SELECT o FROM TreatmentGroup AS o WHERE o.codeName = :codeName",
+                TreatmentGroup.class);
         q.setParameter("codeName", codeName);
         return q;
     }
 
-	public static TypedQuery<TreatmentGroup> findTreatmentGroupsByCodeNameEquals(String codeName, String sortFieldName, String sortOrder) {
-        if (codeName == null || codeName.length() == 0) throw new IllegalArgumentException("The codeName argument is required");
+    public static TypedQuery<TreatmentGroup> findTreatmentGroupsByCodeNameEquals(String codeName, String sortFieldName,
+            String sortOrder) {
+        if (codeName == null || codeName.length() == 0)
+            throw new IllegalArgumentException("The codeName argument is required");
         EntityManager em = TreatmentGroup.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroup AS o WHERE o.codeName = :codeName");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM TreatmentGroup AS o WHERE o.codeName = :codeName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -240,18 +271,23 @@ public static TypedQuery<TreatmentGroup> findTreatmentGroupsByCodeNameEquals(Str
         return q;
     }
 
-	public static TypedQuery<TreatmentGroup> findTreatmentGroupsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<TreatmentGroup> findTreatmentGroupsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = TreatmentGroup.entityManager();
-        TypedQuery<TreatmentGroup> q = em.createQuery("SELECT o FROM TreatmentGroup AS o WHERE o.lsTransaction = :lsTransaction", TreatmentGroup.class);
+        TypedQuery<TreatmentGroup> q = em.createQuery(
+                "SELECT o FROM TreatmentGroup AS o WHERE o.lsTransaction = :lsTransaction", TreatmentGroup.class);
         q.setParameter("lsTransaction", lsTransaction);
         return q;
     }
 
-	public static TypedQuery<TreatmentGroup> findTreatmentGroupsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<TreatmentGroup> findTreatmentGroupsByLsTransactionEquals(Long lsTransaction,
+            String sortFieldName, String sortOrder) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = TreatmentGroup.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroup AS o WHERE o.lsTransaction = :lsTransaction");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM TreatmentGroup AS o WHERE o.lsTransaction = :lsTransaction");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -263,17 +299,18 @@ public static TypedQuery<TreatmentGroup> findTreatmentGroupsByLsTransactionEqual
         return q;
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsLabels", "lsStates", "subjects", "analysisGroups");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsLabels", "lsStates",
+            "subjects", "analysisGroups");
 
-	public static long countTreatmentGroups() {
+    public static long countTreatmentGroups() {
         return entityManager().createQuery("SELECT COUNT(o) FROM TreatmentGroup o", Long.class).getSingleResult();
     }
 
-	public static List<TreatmentGroup> findAllTreatmentGroups() {
+    public static List<TreatmentGroup> findAllTreatmentGroups() {
         return entityManager().createQuery("SELECT o FROM TreatmentGroup o", TreatmentGroup.class).getResultList();
     }
 
-	public static List<TreatmentGroup> findAllTreatmentGroups(String sortFieldName, String sortOrder) {
+    public static List<TreatmentGroup> findAllTreatmentGroups(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM TreatmentGroup o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -284,16 +321,19 @@ public static List<TreatmentGroup> findAllTreatmentGroups(String sortFieldName,
         return entityManager().createQuery(jpaQuery, TreatmentGroup.class).getResultList();
     }
 
-	public static TreatmentGroup findTreatmentGroup(Long id) {
-        if (id == null) return null;
+    public static TreatmentGroup findTreatmentGroup(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(TreatmentGroup.class, id);
     }
 
-	public static List<TreatmentGroup> findTreatmentGroupEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM TreatmentGroup o", TreatmentGroup.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<TreatmentGroup> findTreatmentGroupEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM TreatmentGroup o", TreatmentGroup.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<TreatmentGroup> findTreatmentGroupEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<TreatmentGroup> findTreatmentGroupEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM TreatmentGroup o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -301,50 +341,52 @@ public static List<TreatmentGroup> findTreatmentGroupEntries(int firstResult, in
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, TreatmentGroup.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, TreatmentGroup.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public TreatmentGroup merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         TreatmentGroup merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public Set<TreatmentGroupLabel> getLsLabels() {
+    public Set<TreatmentGroupLabel> getLsLabels() {
         return this.lsLabels;
     }
 
-	public void setLsLabels(Set<TreatmentGroupLabel> lsLabels) {
+    public void setLsLabels(Set<TreatmentGroupLabel> lsLabels) {
         this.lsLabels = lsLabels;
     }
 
-	public Set<TreatmentGroupState> getLsStates() {
+    public Set<TreatmentGroupState> getLsStates() {
         return this.lsStates;
     }
 
-	public void setLsStates(Set<TreatmentGroupState> lsStates) {
+    public void setLsStates(Set<TreatmentGroupState> lsStates) {
         this.lsStates = lsStates;
     }
 
-	public Set<Subject> getSubjects() {
+    public Set<Subject> getSubjects() {
         return this.subjects;
     }
 
-	public void setSubjects(Set<Subject> subjects) {
+    public void setSubjects(Set<Subject> subjects) {
         this.subjects = subjects;
     }
 
-	public Set<AnalysisGroup> getAnalysisGroups() {
+    public Set<AnalysisGroup> getAnalysisGroups() {
         return this.analysisGroups;
     }
 
-	public void setAnalysisGroups(Set<AnalysisGroup> analysisGroups) {
+    public void setAnalysisGroups(Set<AnalysisGroup> analysisGroups) {
         this.analysisGroups = analysisGroups;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel.java b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel.java
index 82b8b56c7..9e8ac442f 100755
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel.java
+++ b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupLabel.java
@@ -35,7 +35,7 @@ public class TreatmentGroupLabel extends AbstractLabel {
 
     public TreatmentGroupLabel() {
     }
-    
+
     public TreatmentGroupLabel(com.labsynch.labseer.domain.TreatmentGroupLabel treatmentGroupLabel) {
         super.setLsType(treatmentGroupLabel.getLsType());
         super.setLsKind(treatmentGroupLabel.getLsKind());
@@ -47,86 +47,101 @@ public TreatmentGroupLabel(com.labsynch.labseer.domain.TreatmentGroupLabel treat
         super.setRecordedDate(treatmentGroupLabel.getRecordedDate());
         super.setPhysicallyLabled(treatmentGroupLabel.isPhysicallyLabled());
     }
-    
+
     public static TreatmentGroupLabel update(TreatmentGroupLabel treatmentGroupLabel) {
-    	TreatmentGroupLabel updatedTreatmentGroupLabel = TreatmentGroupLabel.findTreatmentGroupLabel(treatmentGroupLabel.getId());
-    	updatedTreatmentGroupLabel.setLsType(treatmentGroupLabel.getLsType());
-    	updatedTreatmentGroupLabel.setLsKind(treatmentGroupLabel.getLsKind());
-    	updatedTreatmentGroupLabel.setLsTypeAndKind(treatmentGroupLabel.getLsType() + "_" + treatmentGroupLabel.getLsKind());
-    	updatedTreatmentGroupLabel.setLabelText(treatmentGroupLabel.getLabelText());
-    	updatedTreatmentGroupLabel.setPreferred(treatmentGroupLabel.isPreferred());
-    	updatedTreatmentGroupLabel.setLsTransaction(treatmentGroupLabel.getLsTransaction());
-    	updatedTreatmentGroupLabel.setRecordedBy(treatmentGroupLabel.getRecordedBy());
-    	updatedTreatmentGroupLabel.setRecordedDate(treatmentGroupLabel.getRecordedDate());
-    	updatedTreatmentGroupLabel.setModifiedDate(new Date());
-    	updatedTreatmentGroupLabel.setPhysicallyLabled(treatmentGroupLabel.isPhysicallyLabled());
-    	updatedTreatmentGroupLabel.merge();
-    	return updatedTreatmentGroupLabel;
-    }
-    
+        TreatmentGroupLabel updatedTreatmentGroupLabel = TreatmentGroupLabel
+                .findTreatmentGroupLabel(treatmentGroupLabel.getId());
+        updatedTreatmentGroupLabel.setLsType(treatmentGroupLabel.getLsType());
+        updatedTreatmentGroupLabel.setLsKind(treatmentGroupLabel.getLsKind());
+        updatedTreatmentGroupLabel
+                .setLsTypeAndKind(treatmentGroupLabel.getLsType() + "_" + treatmentGroupLabel.getLsKind());
+        updatedTreatmentGroupLabel.setLabelText(treatmentGroupLabel.getLabelText());
+        updatedTreatmentGroupLabel.setPreferred(treatmentGroupLabel.isPreferred());
+        updatedTreatmentGroupLabel.setLsTransaction(treatmentGroupLabel.getLsTransaction());
+        updatedTreatmentGroupLabel.setRecordedBy(treatmentGroupLabel.getRecordedBy());
+        updatedTreatmentGroupLabel.setRecordedDate(treatmentGroupLabel.getRecordedDate());
+        updatedTreatmentGroupLabel.setModifiedDate(new Date());
+        updatedTreatmentGroupLabel.setPhysicallyLabled(treatmentGroupLabel.isPhysicallyLabled());
+        updatedTreatmentGroupLabel.merge();
+        return updatedTreatmentGroupLabel;
+    }
+
     public String toJson() {
         return new JSONSerializer().exclude("*.class").serialize(this);
     }
-    
+
     public static TreatmentGroupLabel fromJsonToTreatmentGroupLabel(String json) {
         return new JSONDeserializer<TreatmentGroupLabel>().use(null, TreatmentGroupLabel.class).deserialize(json);
     }
-    
+
     public static String toJsonArray(Collection<TreatmentGroupLabel> collection) {
         return new JSONSerializer().exclude("*.class").serialize(collection);
     }
-    
+
     public static Collection<TreatmentGroupLabel> fromJsonArrayToTreatmentGroupLabels(String json) {
-        return new JSONDeserializer<List<TreatmentGroupLabel>>().use(null, ArrayList.class).use("values", TreatmentGroupLabel.class).deserialize(json);
+        return new JSONDeserializer<List<TreatmentGroupLabel>>().use(null, ArrayList.class)
+                .use("values", TreatmentGroupLabel.class).deserialize(json);
     }
 
     public static Collection<TreatmentGroupLabel> fromJsonArrayToTreatmentGroupLabels(Reader json) {
-        return new JSONDeserializer<List<TreatmentGroupLabel>>().use(null, ArrayList.class).use("values", TreatmentGroupLabel.class).deserialize(json);
+        return new JSONDeserializer<List<TreatmentGroupLabel>>().use(null, ArrayList.class)
+                .use("values", TreatmentGroupLabel.class).deserialize(json);
     }
 
-	public static int deleteByExperimentID(Long experimentId) {
-		if (experimentId == null) return 0;
-		EntityManager em = SubjectValue.entityManager();
-		String deleteSQL = "DELETE FROM TreatmentGroupLabel oo WHERE id in (select o.id from TreatmentGroupLabel o where o.treatmentGroup.analysisGroup.experiment.id = :experimentId)";
+    public static int deleteByExperimentID(Long experimentId) {
+        if (experimentId == null)
+            return 0;
+        EntityManager em = SubjectValue.entityManager();
+        String deleteSQL = "DELETE FROM TreatmentGroupLabel oo WHERE id in (select o.id from TreatmentGroupLabel o where o.treatmentGroup.analysisGroup.experiment.id = :experimentId)";
 
-		Query q = em.createQuery(deleteSQL);
-		q.setParameter("experimentId", experimentId);
-		int numberOfDeletedEntities = q.executeUpdate();
-		return numberOfDeletedEntities;
-	}
+        Query q = em.createQuery(deleteSQL);
+        q.setParameter("experimentId", experimentId);
+        int numberOfDeletedEntities = q.executeUpdate();
+        return numberOfDeletedEntities;
+    }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static Long countFindTreatmentGroupLabelsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static Long countFindTreatmentGroupLabelsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = TreatmentGroupLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupLabel AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM TreatmentGroupLabel AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
         q.setParameter("lsTransaction", lsTransaction);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindTreatmentGroupLabelsByTreatmentGroup(TreatmentGroup treatmentGroup) {
-        if (treatmentGroup == null) throw new IllegalArgumentException("The treatmentGroup argument is required");
+    public static Long countFindTreatmentGroupLabelsByTreatmentGroup(TreatmentGroup treatmentGroup) {
+        if (treatmentGroup == null)
+            throw new IllegalArgumentException("The treatmentGroup argument is required");
         EntityManager em = TreatmentGroupLabel.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupLabel AS o WHERE o.treatmentGroup = :treatmentGroup", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM TreatmentGroupLabel AS o WHERE o.treatmentGroup = :treatmentGroup", Long.class);
         q.setParameter("treatmentGroup", treatmentGroup);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<TreatmentGroupLabel> findTreatmentGroupLabelsByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<TreatmentGroupLabel> findTreatmentGroupLabelsByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = TreatmentGroupLabel.entityManager();
-        TypedQuery<TreatmentGroupLabel> q = em.createQuery("SELECT o FROM TreatmentGroupLabel AS o WHERE o.lsTransaction = :lsTransaction", TreatmentGroupLabel.class);
+        TypedQuery<TreatmentGroupLabel> q = em.createQuery(
+                "SELECT o FROM TreatmentGroupLabel AS o WHERE o.lsTransaction = :lsTransaction",
+                TreatmentGroupLabel.class);
         q.setParameter("lsTransaction", lsTransaction);
         return q;
     }
 
-	public static TypedQuery<TreatmentGroupLabel> findTreatmentGroupLabelsByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<TreatmentGroupLabel> findTreatmentGroupLabelsByLsTransactionEquals(Long lsTransaction,
+            String sortFieldName, String sortOrder) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = TreatmentGroupLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroupLabel AS o WHERE o.lsTransaction = :lsTransaction");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM TreatmentGroupLabel AS o WHERE o.lsTransaction = :lsTransaction");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -138,18 +153,25 @@ public static TypedQuery<TreatmentGroupLabel> findTreatmentGroupLabelsByLsTransa
         return q;
     }
 
-	public static TypedQuery<TreatmentGroupLabel> findTreatmentGroupLabelsByTreatmentGroup(TreatmentGroup treatmentGroup) {
-        if (treatmentGroup == null) throw new IllegalArgumentException("The treatmentGroup argument is required");
+    public static TypedQuery<TreatmentGroupLabel> findTreatmentGroupLabelsByTreatmentGroup(
+            TreatmentGroup treatmentGroup) {
+        if (treatmentGroup == null)
+            throw new IllegalArgumentException("The treatmentGroup argument is required");
         EntityManager em = TreatmentGroupLabel.entityManager();
-        TypedQuery<TreatmentGroupLabel> q = em.createQuery("SELECT o FROM TreatmentGroupLabel AS o WHERE o.treatmentGroup = :treatmentGroup", TreatmentGroupLabel.class);
+        TypedQuery<TreatmentGroupLabel> q = em.createQuery(
+                "SELECT o FROM TreatmentGroupLabel AS o WHERE o.treatmentGroup = :treatmentGroup",
+                TreatmentGroupLabel.class);
         q.setParameter("treatmentGroup", treatmentGroup);
         return q;
     }
 
-	public static TypedQuery<TreatmentGroupLabel> findTreatmentGroupLabelsByTreatmentGroup(TreatmentGroup treatmentGroup, String sortFieldName, String sortOrder) {
-        if (treatmentGroup == null) throw new IllegalArgumentException("The treatmentGroup argument is required");
+    public static TypedQuery<TreatmentGroupLabel> findTreatmentGroupLabelsByTreatmentGroup(
+            TreatmentGroup treatmentGroup, String sortFieldName, String sortOrder) {
+        if (treatmentGroup == null)
+            throw new IllegalArgumentException("The treatmentGroup argument is required");
         EntityManager em = TreatmentGroupLabel.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroupLabel AS o WHERE o.treatmentGroup = :treatmentGroup");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM TreatmentGroupLabel AS o WHERE o.treatmentGroup = :treatmentGroup");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -161,17 +183,18 @@ public static TypedQuery<TreatmentGroupLabel> findTreatmentGroupLabelsByTreatmen
         return q;
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("treatmentGroup");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("treatmentGroup");
 
-	public static long countTreatmentGroupLabels() {
+    public static long countTreatmentGroupLabels() {
         return entityManager().createQuery("SELECT COUNT(o) FROM TreatmentGroupLabel o", Long.class).getSingleResult();
     }
 
-	public static List<TreatmentGroupLabel> findAllTreatmentGroupLabels() {
-        return entityManager().createQuery("SELECT o FROM TreatmentGroupLabel o", TreatmentGroupLabel.class).getResultList();
+    public static List<TreatmentGroupLabel> findAllTreatmentGroupLabels() {
+        return entityManager().createQuery("SELECT o FROM TreatmentGroupLabel o", TreatmentGroupLabel.class)
+                .getResultList();
     }
 
-	public static List<TreatmentGroupLabel> findAllTreatmentGroupLabels(String sortFieldName, String sortOrder) {
+    public static List<TreatmentGroupLabel> findAllTreatmentGroupLabels(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM TreatmentGroupLabel o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -182,16 +205,19 @@ public static List<TreatmentGroupLabel> findAllTreatmentGroupLabels(String sortF
         return entityManager().createQuery(jpaQuery, TreatmentGroupLabel.class).getResultList();
     }
 
-	public static TreatmentGroupLabel findTreatmentGroupLabel(Long id) {
-        if (id == null) return null;
+    public static TreatmentGroupLabel findTreatmentGroupLabel(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(TreatmentGroupLabel.class, id);
     }
 
-	public static List<TreatmentGroupLabel> findTreatmentGroupLabelEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM TreatmentGroupLabel o", TreatmentGroupLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<TreatmentGroupLabel> findTreatmentGroupLabelEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM TreatmentGroupLabel o", TreatmentGroupLabel.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<TreatmentGroupLabel> findTreatmentGroupLabelEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<TreatmentGroupLabel> findTreatmentGroupLabelEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM TreatmentGroupLabel o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -199,22 +225,24 @@ public static List<TreatmentGroupLabel> findTreatmentGroupLabelEntries(int first
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, TreatmentGroupLabel.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, TreatmentGroupLabel.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public TreatmentGroupLabel merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         TreatmentGroupLabel merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public TreatmentGroup getTreatmentGroup() {
+    public TreatmentGroup getTreatmentGroup() {
         return this.treatmentGroup;
     }
 
-	public void setTreatmentGroup(TreatmentGroup treatmentGroup) {
+    public void setTreatmentGroup(TreatmentGroup treatmentGroup) {
         this.treatmentGroup = treatmentGroup;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState.java b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState.java
index 0ae9c5adc..6cc821403 100755
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState.java
+++ b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupState.java
@@ -46,7 +46,7 @@ public class TreatmentGroupState extends AbstractState {
 
     public TreatmentGroupState() {
     }
-    
+
     public TreatmentGroupState(com.labsynch.labseer.domain.TreatmentGroupState treatmentGroupState) {
         super.setRecordedBy(treatmentGroupState.getRecordedBy());
         super.setRecordedDate(treatmentGroupState.getRecordedDate());
@@ -57,230 +57,253 @@ public TreatmentGroupState(com.labsynch.labseer.domain.TreatmentGroupState treat
         super.setLsKind(treatmentGroupState.getLsKind());
     }
 
-	public TreatmentGroupState(FlatThingCsvDTO treatmentGroupDTO) {
-		this.setRecordedBy(treatmentGroupDTO.getRecordedBy());
-		this.setRecordedDate(treatmentGroupDTO.getRecordedDate());
-		this.setLsTransaction(treatmentGroupDTO.getLsTransaction());
-		this.setModifiedBy(treatmentGroupDTO.getModifiedBy());
-		this.setModifiedDate(treatmentGroupDTO.getModifiedDate());
-		this.setLsType(treatmentGroupDTO.getStateType());
-		this.setLsKind(treatmentGroupDTO.getStateKind());
-	}
-
-	public static TreatmentGroupState update(TreatmentGroupState treatmentGroupState) {
-		TreatmentGroupState updatedTreatmentGroupState = TreatmentGroupState.findTreatmentGroupState(treatmentGroupState.getId());
-		updatedTreatmentGroupState.setRecordedBy(treatmentGroupState.getRecordedBy());
-		updatedTreatmentGroupState.setRecordedDate(treatmentGroupState.getRecordedDate());
-		updatedTreatmentGroupState.setLsTransaction(treatmentGroupState.getLsTransaction());
-		updatedTreatmentGroupState.setModifiedBy(treatmentGroupState.getModifiedBy());
-		updatedTreatmentGroupState.setModifiedDate(new Date());
-		updatedTreatmentGroupState.setLsType(treatmentGroupState.getLsType());
-		updatedTreatmentGroupState.setLsKind(treatmentGroupState.getLsKind());		
-		updatedTreatmentGroupState.merge();
-		return updatedTreatmentGroupState;
-	}
-	
-	public static long countTreatmentGroupStates() {
+    public TreatmentGroupState(FlatThingCsvDTO treatmentGroupDTO) {
+        this.setRecordedBy(treatmentGroupDTO.getRecordedBy());
+        this.setRecordedDate(treatmentGroupDTO.getRecordedDate());
+        this.setLsTransaction(treatmentGroupDTO.getLsTransaction());
+        this.setModifiedBy(treatmentGroupDTO.getModifiedBy());
+        this.setModifiedDate(treatmentGroupDTO.getModifiedDate());
+        this.setLsType(treatmentGroupDTO.getStateType());
+        this.setLsKind(treatmentGroupDTO.getStateKind());
+    }
+
+    public static TreatmentGroupState update(TreatmentGroupState treatmentGroupState) {
+        TreatmentGroupState updatedTreatmentGroupState = TreatmentGroupState
+                .findTreatmentGroupState(treatmentGroupState.getId());
+        updatedTreatmentGroupState.setRecordedBy(treatmentGroupState.getRecordedBy());
+        updatedTreatmentGroupState.setRecordedDate(treatmentGroupState.getRecordedDate());
+        updatedTreatmentGroupState.setLsTransaction(treatmentGroupState.getLsTransaction());
+        updatedTreatmentGroupState.setModifiedBy(treatmentGroupState.getModifiedBy());
+        updatedTreatmentGroupState.setModifiedDate(new Date());
+        updatedTreatmentGroupState.setLsType(treatmentGroupState.getLsType());
+        updatedTreatmentGroupState.setLsKind(treatmentGroupState.getLsKind());
+        updatedTreatmentGroupState.merge();
+        return updatedTreatmentGroupState;
+    }
+
+    public static long countTreatmentGroupStates() {
         return entityManager().createQuery("SELECT COUNT(o) FROM TreatmentGroupState o", Long.class).getSingleResult();
     }
 
-	public static List<TreatmentGroupState> findAllTreatmentGroupStates() {
-        return entityManager().createQuery("SELECT o FROM TreatmentGroupState o", TreatmentGroupState.class).getResultList();
+    public static List<TreatmentGroupState> findAllTreatmentGroupStates() {
+        return entityManager().createQuery("SELECT o FROM TreatmentGroupState o", TreatmentGroupState.class)
+                .getResultList();
     }
 
-	public static TreatmentGroupState findTreatmentGroupState(Long id) {
-        if (id == null) return null;
+    public static TreatmentGroupState findTreatmentGroupState(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(TreatmentGroupState.class, id);
     }
 
-	public static List<TreatmentGroupState> findTreatmentGroupStateEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM TreatmentGroupState o", TreatmentGroupState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<TreatmentGroupState> findTreatmentGroupStateEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM TreatmentGroupState o", TreatmentGroupState.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public TreatmentGroupState merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         TreatmentGroupState merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
-	
-	@Transactional
-	public static List<Long> saveList(List<TreatmentGroupState> entities) {
-		//return a list of ids
-		List<Long> idList = new ArrayList<Long>();
-	    int imported = 0;
-		int batchSize = 50;
-
-	    for (TreatmentGroupState e : entities) {
-	        e.persist();  // 1. Roo introduces this method via an ITD
-	        idList.add(e.getId());
-	         if (++imported % batchSize == 0) {
-	        	 e.flush();  // 2. ... and this one
-	        	 e.clear();  // 3. ... and this one
-	        }
-	    }
-	    return idList;
-	 }
-		
-	@Transactional
-	public static String getTreatmentGroupStateCollectionJson(List<Long> idList) {
-		Collection<TreatmentGroupState> treatmentGroupStates = new ArrayList<TreatmentGroupState>();
-		for (Long id : idList){
-			TreatmentGroupState query = TreatmentGroupState.findTreatmentGroupState(id);
-			if (query != null) treatmentGroupStates.add(query);
-		}
+
+    @Transactional
+    public static List<Long> saveList(List<TreatmentGroupState> entities) {
+        // return a list of ids
+        List<Long> idList = new ArrayList<Long>();
+        int imported = 0;
+        int batchSize = 50;
+
+        for (TreatmentGroupState e : entities) {
+            e.persist(); // 1. Roo introduces this method via an ITD
+            idList.add(e.getId());
+            if (++imported % batchSize == 0) {
+                e.flush(); // 2. ... and this one
+                e.clear(); // 3. ... and this one
+            }
+        }
+        return idList;
+    }
+
+    @Transactional
+    public static String getTreatmentGroupStateCollectionJson(List<Long> idList) {
+        Collection<TreatmentGroupState> treatmentGroupStates = new ArrayList<TreatmentGroupState>();
+        for (Long id : idList) {
+            TreatmentGroupState query = TreatmentGroupState.findTreatmentGroupState(id);
+            if (query != null)
+                treatmentGroupStates.add(query);
+        }
         return TreatmentGroupState.toJsonArray(treatmentGroupStates);
     }
 
-	@Transactional
+    @Transactional
     public String toJson() {
         return new JSONSerializer()
-        		.exclude("*.class")
-        		.transform(new ExcludeNulls(), void.class)
-        		.serialize(this);
+                .exclude("*.class")
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
-    
+
     public static TreatmentGroupState fromJsonToTreatmentGroupState(String json) {
         return new JSONDeserializer<TreatmentGroupState>()
-        		.use(null, TreatmentGroupState.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use(null, TreatmentGroupState.class)
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
-    
-	@Transactional
+
+    @Transactional
     public static String toJsonArray(Collection<TreatmentGroupState> collection) {
         return new JSONSerializer()
-        		.exclude("*.class")
-        		.transform(new ExcludeNulls(), void.class)
-        		.serialize(collection);
+                .exclude("*.class")
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
 
-	@Transactional
+    @Transactional
     public static String toJsonArrayStub(Collection<TreatmentGroupState> collection) {
         return new JSONSerializer()
-        		.exclude("*.class", "treatmentGroup")
-        		.transform(new ExcludeNulls(), void.class)
-        		.serialize(collection);
+                .exclude("*.class", "treatmentGroup")
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
 
     public static Collection<TreatmentGroupState> fromJsonArrayToTreatmentGroupStates(String json) {
         return new JSONDeserializer<List<TreatmentGroupState>>()
-        		.use(null, ArrayList.class)
-        		.use("values", TreatmentGroupState.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
+                .use(null, ArrayList.class)
+                .use("values", TreatmentGroupState.class)
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
     }
-    
+
     public static Collection<TreatmentGroupState> fromJsonArrayToTreatmentGroupStates(Reader json) {
         return new JSONDeserializer<List<TreatmentGroupState>>()
-        		.use(null, ArrayList.class)
-        		.use("values", TreatmentGroupState.class)
-        		.use(BigDecimal.class, new CustomBigDecimalFactory())
-        		.deserialize(json);
-    }
-
-	public static int deleteByExperimentID(Long experimentId) {
-		if (experimentId == null) return 0;
-		EntityManager em = SubjectValue.entityManager();
-		String deleteSQL = "DELETE FROM TreatmentGroupState oo WHERE id in (select o.id from TreatmentGroupState o where o.treatmentGroup.analysisGroup.experiment.id = :experimentId)";
-
-		Query q = em.createQuery(deleteSQL);
-		q.setParameter("experimentId", experimentId);
-		int numberOfDeletedEntities = q.executeUpdate();
-		return numberOfDeletedEntities;
-	}
-
-	public static TypedQuery<TreatmentGroupState> findTreatmentGroupStatesByTreatmentGroupIDAndStateTypeKind(Long treatmentGroupId, 
-			String stateType, 
-			String stateKind) {
-			if (stateType == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-			if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-			
-			EntityManager em = entityManager();
-			String hsqlQuery = "SELECT ags FROM TreatmentGroupState AS ags " +
-			"JOIN ags.treatmentGroup ag " +
-			"WHERE ags.lsType = :stateType AND ags.lsKind = :stateKind AND ags.ignored IS NOT :ignored " +
-			"AND ag.id = :treatmentGroupId ";
-			TypedQuery<TreatmentGroupState> q = em.createQuery(hsqlQuery, TreatmentGroupState.class);
-			q.setParameter("treatmentGroupId", treatmentGroupId);
-			q.setParameter("stateType", stateType);
-			q.setParameter("stateKind", stateKind);
-			q.setParameter("ignored", true);
-			return q;
-		}
-
-	public static TypedQuery<TreatmentGroupState> findTreatmentGroupStatesByTreatmentGroupCodeNameAndStateTypeKind(
-			String treatmentGroupCodeName, String stateType, String stateKind) {
-		if (stateType == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-		
-		EntityManager em = entityManager();
-		String hsqlQuery = "SELECT ags FROM TreatmentGroupState AS ags " +
-		"JOIN ags.treatmentGroup ag " +
-		"WHERE ags.lsType = :stateType AND ags.lsKind = :stateKind AND ags.ignored IS NOT :ignored " +
-		"AND ag.codeName = :treatmentGroupCodeName ";
-		TypedQuery<TreatmentGroupState> q = em.createQuery(hsqlQuery, TreatmentGroupState.class);
-		q.setParameter("treatmentGroupCodeName", treatmentGroupCodeName);
-		q.setParameter("stateType", stateType);
-		q.setParameter("stateKind", stateKind);
-		q.setParameter("ignored", true);
-		return q;
-	}
-	
-
-	public TreatmentGroup getTreatmentGroup() {
+                .use(null, ArrayList.class)
+                .use("values", TreatmentGroupState.class)
+                .use(BigDecimal.class, new CustomBigDecimalFactory())
+                .deserialize(json);
+    }
+
+    public static int deleteByExperimentID(Long experimentId) {
+        if (experimentId == null)
+            return 0;
+        EntityManager em = SubjectValue.entityManager();
+        String deleteSQL = "DELETE FROM TreatmentGroupState oo WHERE id in (select o.id from TreatmentGroupState o where o.treatmentGroup.analysisGroup.experiment.id = :experimentId)";
+
+        Query q = em.createQuery(deleteSQL);
+        q.setParameter("experimentId", experimentId);
+        int numberOfDeletedEntities = q.executeUpdate();
+        return numberOfDeletedEntities;
+    }
+
+    public static TypedQuery<TreatmentGroupState> findTreatmentGroupStatesByTreatmentGroupIDAndStateTypeKind(
+            Long treatmentGroupId,
+            String stateType,
+            String stateKind) {
+        if (stateType == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateType argument is required");
+        if (stateKind == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateKind argument is required");
+
+        EntityManager em = entityManager();
+        String hsqlQuery = "SELECT ags FROM TreatmentGroupState AS ags " +
+                "JOIN ags.treatmentGroup ag " +
+                "WHERE ags.lsType = :stateType AND ags.lsKind = :stateKind AND ags.ignored IS NOT :ignored " +
+                "AND ag.id = :treatmentGroupId ";
+        TypedQuery<TreatmentGroupState> q = em.createQuery(hsqlQuery, TreatmentGroupState.class);
+        q.setParameter("treatmentGroupId", treatmentGroupId);
+        q.setParameter("stateType", stateType);
+        q.setParameter("stateKind", stateKind);
+        q.setParameter("ignored", true);
+        return q;
+    }
+
+    public static TypedQuery<TreatmentGroupState> findTreatmentGroupStatesByTreatmentGroupCodeNameAndStateTypeKind(
+            String treatmentGroupCodeName, String stateType, String stateKind) {
+        if (stateType == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateType argument is required");
+        if (stateKind == null || stateKind.length() == 0)
+            throw new IllegalArgumentException("The stateKind argument is required");
+
+        EntityManager em = entityManager();
+        String hsqlQuery = "SELECT ags FROM TreatmentGroupState AS ags " +
+                "JOIN ags.treatmentGroup ag " +
+                "WHERE ags.lsType = :stateType AND ags.lsKind = :stateKind AND ags.ignored IS NOT :ignored " +
+                "AND ag.codeName = :treatmentGroupCodeName ";
+        TypedQuery<TreatmentGroupState> q = em.createQuery(hsqlQuery, TreatmentGroupState.class);
+        q.setParameter("treatmentGroupCodeName", treatmentGroupCodeName);
+        q.setParameter("stateType", stateType);
+        q.setParameter("stateKind", stateKind);
+        q.setParameter("ignored", true);
+        return q;
+    }
+
+    public TreatmentGroup getTreatmentGroup() {
         return this.treatmentGroup;
     }
 
-	public void setTreatmentGroup(TreatmentGroup treatmentGroup) {
+    public void setTreatmentGroup(TreatmentGroup treatmentGroup) {
         this.treatmentGroup = treatmentGroup;
     }
 
-	public Set<TreatmentGroupValue> getLsValues() {
+    public Set<TreatmentGroupValue> getLsValues() {
         return this.lsValues;
     }
 
-	public void setLsValues(Set<TreatmentGroupValue> lsValues) {
+    public void setLsValues(Set<TreatmentGroupValue> lsValues) {
         this.lsValues = lsValues;
     }
 
-	public static Long countFindTreatmentGroupStatesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static Long countFindTreatmentGroupStatesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = TreatmentGroupState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupState AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM TreatmentGroupState AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
         q.setParameter("lsTransaction", lsTransaction);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindTreatmentGroupStatesByLsTypeAndKindEquals(String lsTypeAndKind) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+    public static Long countFindTreatmentGroupStatesByLsTypeAndKindEquals(String lsTypeAndKind) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = TreatmentGroupState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM TreatmentGroupState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", Long.class);
         q.setParameter("lsTypeAndKind", lsTypeAndKind);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindTreatmentGroupStatesByTreatmentGroup(TreatmentGroup treatmentGroup) {
-        if (treatmentGroup == null) throw new IllegalArgumentException("The treatmentGroup argument is required");
+    public static Long countFindTreatmentGroupStatesByTreatmentGroup(TreatmentGroup treatmentGroup) {
+        if (treatmentGroup == null)
+            throw new IllegalArgumentException("The treatmentGroup argument is required");
         EntityManager em = TreatmentGroupState.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupState AS o WHERE o.treatmentGroup = :treatmentGroup", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM TreatmentGroupState AS o WHERE o.treatmentGroup = :treatmentGroup", Long.class);
         q.setParameter("treatmentGroup", treatmentGroup);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<TreatmentGroupState> findTreatmentGroupStatesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<TreatmentGroupState> findTreatmentGroupStatesByLsTransactionEquals(Long lsTransaction) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = TreatmentGroupState.entityManager();
-        TypedQuery<TreatmentGroupState> q = em.createQuery("SELECT o FROM TreatmentGroupState AS o WHERE o.lsTransaction = :lsTransaction", TreatmentGroupState.class);
+        TypedQuery<TreatmentGroupState> q = em.createQuery(
+                "SELECT o FROM TreatmentGroupState AS o WHERE o.lsTransaction = :lsTransaction",
+                TreatmentGroupState.class);
         q.setParameter("lsTransaction", lsTransaction);
         return q;
     }
 
-	public static TypedQuery<TreatmentGroupState> findTreatmentGroupStatesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
+    public static TypedQuery<TreatmentGroupState> findTreatmentGroupStatesByLsTransactionEquals(Long lsTransaction,
+            String sortFieldName, String sortOrder) {
+        if (lsTransaction == null)
+            throw new IllegalArgumentException("The lsTransaction argument is required");
         EntityManager em = TreatmentGroupState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroupState AS o WHERE o.lsTransaction = :lsTransaction");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM TreatmentGroupState AS o WHERE o.lsTransaction = :lsTransaction");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -292,18 +315,24 @@ public static TypedQuery<TreatmentGroupState> findTreatmentGroupStatesByLsTransa
         return q;
     }
 
-	public static TypedQuery<TreatmentGroupState> findTreatmentGroupStatesByLsTypeAndKindEquals(String lsTypeAndKind) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+    public static TypedQuery<TreatmentGroupState> findTreatmentGroupStatesByLsTypeAndKindEquals(String lsTypeAndKind) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = TreatmentGroupState.entityManager();
-        TypedQuery<TreatmentGroupState> q = em.createQuery("SELECT o FROM TreatmentGroupState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind", TreatmentGroupState.class);
+        TypedQuery<TreatmentGroupState> q = em.createQuery(
+                "SELECT o FROM TreatmentGroupState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind",
+                TreatmentGroupState.class);
         q.setParameter("lsTypeAndKind", lsTypeAndKind);
         return q;
     }
 
-	public static TypedQuery<TreatmentGroupState> findTreatmentGroupStatesByLsTypeAndKindEquals(String lsTypeAndKind, String sortFieldName, String sortOrder) {
-        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0) throw new IllegalArgumentException("The lsTypeAndKind argument is required");
+    public static TypedQuery<TreatmentGroupState> findTreatmentGroupStatesByLsTypeAndKindEquals(String lsTypeAndKind,
+            String sortFieldName, String sortOrder) {
+        if (lsTypeAndKind == null || lsTypeAndKind.length() == 0)
+            throw new IllegalArgumentException("The lsTypeAndKind argument is required");
         EntityManager em = TreatmentGroupState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroupState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM TreatmentGroupState AS o WHERE o.lsTypeAndKind = :lsTypeAndKind");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -315,18 +344,25 @@ public static TypedQuery<TreatmentGroupState> findTreatmentGroupStatesByLsTypeAn
         return q;
     }
 
-	public static TypedQuery<TreatmentGroupState> findTreatmentGroupStatesByTreatmentGroup(TreatmentGroup treatmentGroup) {
-        if (treatmentGroup == null) throw new IllegalArgumentException("The treatmentGroup argument is required");
+    public static TypedQuery<TreatmentGroupState> findTreatmentGroupStatesByTreatmentGroup(
+            TreatmentGroup treatmentGroup) {
+        if (treatmentGroup == null)
+            throw new IllegalArgumentException("The treatmentGroup argument is required");
         EntityManager em = TreatmentGroupState.entityManager();
-        TypedQuery<TreatmentGroupState> q = em.createQuery("SELECT o FROM TreatmentGroupState AS o WHERE o.treatmentGroup = :treatmentGroup", TreatmentGroupState.class);
+        TypedQuery<TreatmentGroupState> q = em.createQuery(
+                "SELECT o FROM TreatmentGroupState AS o WHERE o.treatmentGroup = :treatmentGroup",
+                TreatmentGroupState.class);
         q.setParameter("treatmentGroup", treatmentGroup);
         return q;
     }
 
-	public static TypedQuery<TreatmentGroupState> findTreatmentGroupStatesByTreatmentGroup(TreatmentGroup treatmentGroup, String sortFieldName, String sortOrder) {
-        if (treatmentGroup == null) throw new IllegalArgumentException("The treatmentGroup argument is required");
+    public static TypedQuery<TreatmentGroupState> findTreatmentGroupStatesByTreatmentGroup(
+            TreatmentGroup treatmentGroup, String sortFieldName, String sortOrder) {
+        if (treatmentGroup == null)
+            throw new IllegalArgumentException("The treatmentGroup argument is required");
         EntityManager em = TreatmentGroupState.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroupState AS o WHERE o.treatmentGroup = :treatmentGroup");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM TreatmentGroupState AS o WHERE o.treatmentGroup = :treatmentGroup");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -338,9 +374,10 @@ public static TypedQuery<TreatmentGroupState> findTreatmentGroupStatesByTreatmen
         return q;
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("treatmentGroup", "lsValues");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("treatmentGroup",
+            "lsValues");
 
-	public static List<TreatmentGroupState> findAllTreatmentGroupStates(String sortFieldName, String sortOrder) {
+    public static List<TreatmentGroupState> findAllTreatmentGroupStates(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM TreatmentGroupState o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -351,7 +388,8 @@ public static List<TreatmentGroupState> findAllTreatmentGroupStates(String sortF
         return entityManager().createQuery(jpaQuery, TreatmentGroupState.class).getResultList();
     }
 
-	public static List<TreatmentGroupState> findTreatmentGroupStateEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<TreatmentGroupState> findTreatmentGroupStateEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM TreatmentGroupState o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -359,10 +397,11 @@ public static List<TreatmentGroupState> findTreatmentGroupStateEntries(int first
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, TreatmentGroupState.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, TreatmentGroupState.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue.java b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue.java
index 09b94965a..c37c77dfd 100755
--- a/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue.java
+++ b/src/main/java/com/labsynch/labseer/domain/TreatmentGroupValue.java
@@ -37,54 +37,54 @@ public class TreatmentGroupValue extends AbstractValue {
 
 	private static final Logger logger = LoggerFactory.getLogger(TreatmentGroupValue.class);
 
-    @NotNull
-    @ManyToOne
-    @JoinColumn(name = "treatment_state_id")
-    private TreatmentGroupState lsState;
-    
-    public TreatmentGroupValue(FlatThingCsvDTO inputDTO) {
-    	this.setCodeValue(inputDTO.getCodeValue());
-    	this.setCodeOrigin(inputDTO.getCodeOrigin());
-    	this.setCodeType(inputDTO.getCodeType());
-    	this.setCodeKind(inputDTO.getCodeKind());
-    	this.setLsType(inputDTO.getValueType());
-    	this.setLsKind(inputDTO.getValueKind());
-    	this.setStringValue(inputDTO.getStringValue());
-    	this.setClobValue(inputDTO.getClobValue());
-    	this.setFileValue(inputDTO.getFileValue());
-    	this.setUrlValue(inputDTO.getUrlValue());
-    	this.setDateValue(inputDTO.getDateValue());
-    	this.setOperatorKind(inputDTO.getOperatorKind());
-    	this.setNumericValue(inputDTO.getNumericValue());
-    	this.setFileValue(inputDTO.getFileValue());
-    	this.setUncertainty(inputDTO.getUncertainty());
-    	this.setUncertaintyType(inputDTO.getUncertaintyType());
-    	this.setUnitKind(inputDTO.getUnitKind());
-    	this.setConcentration(inputDTO.getConcentration());
-    	this.setConcUnit(inputDTO.getConcUnit());
-    	this.setNumberOfReplicates(inputDTO.getNumberOfReplicates());
-        this.setRecordedBy(inputDTO.getRecordedBy());
-        this.setRecordedDate(inputDTO.getRecordedDate());
-        this.setLsTransaction(inputDTO.getLsTransaction());
-        this.setModifiedBy(inputDTO.getModifiedBy());
-        this.setModifiedDate(inputDTO.getModifiedDate());
-        this.setComments(inputDTO.getComments());
-        this.setIgnored(inputDTO.isIgnored());
-        this.setPublicData(inputDTO.isPublicData());
-        this.setSigFigs(inputDTO.getSigFigs());	
-    }
+	@NotNull
+	@ManyToOne
+	@JoinColumn(name = "treatment_state_id")
+	private TreatmentGroupState lsState;
+
+	public TreatmentGroupValue(FlatThingCsvDTO inputDTO) {
+		this.setCodeValue(inputDTO.getCodeValue());
+		this.setCodeOrigin(inputDTO.getCodeOrigin());
+		this.setCodeType(inputDTO.getCodeType());
+		this.setCodeKind(inputDTO.getCodeKind());
+		this.setLsType(inputDTO.getValueType());
+		this.setLsKind(inputDTO.getValueKind());
+		this.setStringValue(inputDTO.getStringValue());
+		this.setClobValue(inputDTO.getClobValue());
+		this.setFileValue(inputDTO.getFileValue());
+		this.setUrlValue(inputDTO.getUrlValue());
+		this.setDateValue(inputDTO.getDateValue());
+		this.setOperatorKind(inputDTO.getOperatorKind());
+		this.setNumericValue(inputDTO.getNumericValue());
+		this.setFileValue(inputDTO.getFileValue());
+		this.setUncertainty(inputDTO.getUncertainty());
+		this.setUncertaintyType(inputDTO.getUncertaintyType());
+		this.setUnitKind(inputDTO.getUnitKind());
+		this.setConcentration(inputDTO.getConcentration());
+		this.setConcUnit(inputDTO.getConcUnit());
+		this.setNumberOfReplicates(inputDTO.getNumberOfReplicates());
+		this.setRecordedBy(inputDTO.getRecordedBy());
+		this.setRecordedDate(inputDTO.getRecordedDate());
+		this.setLsTransaction(inputDTO.getLsTransaction());
+		this.setModifiedBy(inputDTO.getModifiedBy());
+		this.setModifiedDate(inputDTO.getModifiedDate());
+		this.setComments(inputDTO.getComments());
+		this.setIgnored(inputDTO.isIgnored());
+		this.setPublicData(inputDTO.isPublicData());
+		this.setSigFigs(inputDTO.getSigFigs());
+	}
 
 	public TreatmentGroupValue() {
 	}
-	
+
 	public Long getStateId() {
 		return this.lsState.getId();
 	}
-	
+
 	public String getStateType() {
 		return this.lsState.getLsType();
 	}
-	
+
 	public String getStateKind() {
 		return this.lsState.getLsKind();
 	}
@@ -92,89 +92,94 @@ public String getStateKind() {
 	public Long getTreatmentGroupId() {
 		return this.lsState.getTreatmentGroup().getId();
 	}
-	
-	//TODO: work out a different strategy with the many to many
+
+	// TODO: work out a different strategy with the many to many
 	public Long getAnalysisGroupId() {
 		return 0L;
 	}
-	
 
 	public static TreatmentGroupValue create(TreatmentGroupValue treatmentGroupValue) {
-    	TreatmentGroupValue newTreatmentGroupValue = new JSONDeserializer<TreatmentGroupValue>().use(null, TreatmentGroupValue.class).
-        		deserializeInto(treatmentGroupValue.toJson(), 
-        				new TreatmentGroupValue());	
-    
-        return newTreatmentGroupValue;
-    }
+		TreatmentGroupValue newTreatmentGroupValue = new JSONDeserializer<TreatmentGroupValue>()
+				.use(null, TreatmentGroupValue.class).deserializeInto(treatmentGroupValue.toJson(),
+						new TreatmentGroupValue());
+
+		return newTreatmentGroupValue;
+	}
 
 	public static long countTreatmentGroupValues() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM TreatmentGroupValue o", Long.class).getSingleResult();
-    }
+		return entityManager().createQuery("SELECT COUNT(o) FROM TreatmentGroupValue o", Long.class).getSingleResult();
+	}
 
 	public static List<TreatmentGroupValue> findAllTreatmentGroupValues() {
-        return entityManager().createQuery("SELECT o FROM TreatmentGroupValue o", TreatmentGroupValue.class).getResultList();
-    }
+		return entityManager().createQuery("SELECT o FROM TreatmentGroupValue o", TreatmentGroupValue.class)
+				.getResultList();
+	}
 
 	public static TreatmentGroupValue findTreatmentGroupValue(Long id) {
-        if (id == null) return null;
-        return entityManager().find(TreatmentGroupValue.class, id);
-    }
+		if (id == null)
+			return null;
+		return entityManager().find(TreatmentGroupValue.class, id);
+	}
 
 	public static List<TreatmentGroupValue> findTreatmentGroupValueEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM TreatmentGroupValue o", TreatmentGroupValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
+		return entityManager().createQuery("SELECT o FROM TreatmentGroupValue o", TreatmentGroupValue.class)
+				.setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+	}
 
-   
 	public static TreatmentGroupValue update(TreatmentGroupValue treatmentGroupValue) {
-		TreatmentGroupValue updatedTreatmentGroupValue = new JSONDeserializer<TreatmentGroupValue>().
-		use(null, TreatmentGroupValue.class).
-		
-		deserializeInto(treatmentGroupValue.toJson(), TreatmentGroupValue.findTreatmentGroupValue(treatmentGroupValue.getId()));
+		TreatmentGroupValue updatedTreatmentGroupValue = new JSONDeserializer<TreatmentGroupValue>()
+				.use(null, TreatmentGroupValue.class).
+
+				deserializeInto(treatmentGroupValue.toJson(),
+						TreatmentGroupValue.findTreatmentGroupValue(treatmentGroupValue.getId()));
 		updatedTreatmentGroupValue.setModifiedDate(new Date());
 		updatedTreatmentGroupValue.merge();
 		return updatedTreatmentGroupValue;
 	}
-	
+
 	@Transactional
-    public TreatmentGroupValue merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        TreatmentGroupValue merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        return merged;
-    }
-	
+	public TreatmentGroupValue merge() {
+		if (this.entityManager == null)
+			this.entityManager = entityManager();
+		TreatmentGroupValue merged = this.entityManager.merge(this);
+		this.entityManager.flush();
+		return merged;
+	}
+
 	@Transactional
 	public static List<Long> saveList(List<TreatmentGroupValue> entities) {
 		logger.debug("saving the list of TreatmentGroupValues: " + entities.size());
-		//return a list of ids
+		// return a list of ids
 		List<Long> idList = new ArrayList<Long>();
 		int batchSize = 50;
 
-	    int imported = 0;
-	    for (TreatmentGroupValue e : entities) {
-	        e.persist();  // 1. Roo introduces this method via an ITD
-	        idList.add(e.getId());
-	         if (++imported % batchSize == 0) {
-	        	 e.flush();  // 2. ... and this one
-	        	 e.clear();  // 3. ... and this one
-	        }
-	    }
-	    return idList;
-	 }
-		
+		int imported = 0;
+		for (TreatmentGroupValue e : entities) {
+			e.persist(); // 1. Roo introduces this method via an ITD
+			idList.add(e.getId());
+			if (++imported % batchSize == 0) {
+				e.flush(); // 2. ... and this one
+				e.clear(); // 3. ... and this one
+			}
+		}
+		return idList;
+	}
+
 	@Transactional
 	public static String getTreatmentGroupValueCollectionJson(List<Long> idList) {
 		Collection<TreatmentGroupValue> treatmentGroupValues = new HashSet<TreatmentGroupValue>();
-		for (Long id : idList){
+		for (Long id : idList) {
 			TreatmentGroupValue query = TreatmentGroupValue.findTreatmentGroupValue(id);
-			if (query != null) treatmentGroupValues.add(query);
+			if (query != null)
+				treatmentGroupValues.add(query);
 		}
-        return TreatmentGroupValue.toJsonArray(treatmentGroupValues);
-    }
-	
+		return TreatmentGroupValue.toJsonArray(treatmentGroupValues);
+	}
+
 	@Transactional
 	public static int deleteByExperimentID(Long experimentId) {
-		if (experimentId == null) return 0;
+		if (experimentId == null)
+			return 0;
 		EntityManager em = TreatmentGroupValue.entityManager();
 		String deleteSQL = "DELETE FROM TreatmentGroupValue oo WHERE id in (select o.id from TreatmentGroupValue o where o.lsState.treatmentGroup.analysisGroups.experiments.id = :experimentId)";
 		Query q = em.createQuery(deleteSQL);
@@ -183,69 +188,69 @@ public static int deleteByExperimentID(Long experimentId) {
 		return numberOfDeletedEntities;
 	}
 
-    public static TreatmentGroupValue fromJsonToTreatmentGroupValue(String json) {
-        return new JSONDeserializer<TreatmentGroupValue>().
-        		use(null, TreatmentGroupValue.class).
-        		
-        		deserialize(json);
-    }
-        
-    public static Collection<TreatmentGroupValue> fromJsonArrayToTreatmentGroupValues(String json) {
-        return new JSONDeserializer<List<TreatmentGroupValue>>().
-        		use(null, ArrayList.class).
-        		use("values", TreatmentGroupValue.class).
-        		
-        		deserialize(json);
-    }
-    
-    public static Collection<TreatmentGroupValue> fromJsonArrayToTreatmentGroupValues(Reader json) {
-        return new JSONDeserializer<List<TreatmentGroupValue>>().
-        		use(null, ArrayList.class).
-        		use("values", TreatmentGroupValue.class).
-        		
-        		deserialize(json);
-    }
- 
+	public static TreatmentGroupValue fromJsonToTreatmentGroupValue(String json) {
+		return new JSONDeserializer<TreatmentGroupValue>().use(null, TreatmentGroupValue.class).
+
+				deserialize(json);
+	}
+
+	public static Collection<TreatmentGroupValue> fromJsonArrayToTreatmentGroupValues(String json) {
+		return new JSONDeserializer<List<TreatmentGroupValue>>().use(null, ArrayList.class)
+				.use("values", TreatmentGroupValue.class).
+
+				deserialize(json);
+	}
+
+	public static Collection<TreatmentGroupValue> fromJsonArrayToTreatmentGroupValues(Reader json) {
+		return new JSONDeserializer<List<TreatmentGroupValue>>().use(null, ArrayList.class)
+				.use("values", TreatmentGroupValue.class).
+
+				deserialize(json);
+	}
+
 	@Transactional
-    public String toJson() {
-        return new JSONSerializer()
+	public String toJson() {
+		return new JSONSerializer()
 				.exclude("*.class", "lsState.treatmentGroup.analysisGroups.experiments")
 				.include("lsState.treatmentGroup.analysisGroups")
 				.transform(new ExcludeNulls(), void.class)
-        		.serialize(this);
-    }
-    
+				.serialize(this);
+	}
+
 	@Transactional
-    public static String toJsonArray(Collection<TreatmentGroupValue> collection) {
-        return new JSONSerializer()
-        		.exclude("*.class", "lsState.treatmentGroup.analysisGroups.experiments")
-        		.include("lsState.treatmentGroup.analysisGroups")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(collection);
-    }
+	public static String toJsonArray(Collection<TreatmentGroupValue> collection) {
+		return new JSONSerializer()
+				.exclude("*.class", "lsState.treatmentGroup.analysisGroups.experiments")
+				.include("lsState.treatmentGroup.analysisGroups")
+				.transform(new ExcludeNulls(), void.class)
+				.serialize(collection);
+	}
 
 	@Transactional
-    public static String toJsonArrayStub(Collection<TreatmentGroupValue> collection) {
-        return new JSONSerializer().exclude("*.class", "lsState")
-            	.transform(new ExcludeNulls(), void.class)
-        		.serialize(collection);
-    }
-	
-	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByExptIDAndStateTypeKind(Long experimentId, String stateType, String stateKind) {
-		if (stateType == null || stateType.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-		
+	public static String toJsonArrayStub(Collection<TreatmentGroupValue> collection) {
+		return new JSONSerializer().exclude("*.class", "lsState")
+				.transform(new ExcludeNulls(), void.class)
+				.serialize(collection);
+	}
+
+	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByExptIDAndStateTypeKind(Long experimentId,
+			String stateType, String stateKind) {
+		if (stateType == null || stateType.length() == 0)
+			throw new IllegalArgumentException("The stateType argument is required");
+		if (stateKind == null || stateKind.length() == 0)
+			throw new IllegalArgumentException("The stateKind argument is required");
+
 		EntityManager em = entityManager();
 		String hsqlQuery = "SELECT tgv FROM TreatmentGroupValue AS tgv " +
-		"JOIN tgv.lsState tvs " +
-		"JOIN tvs.treatmentGroup tg " +
-		"JOIN tg.analysisGroups ag " +
-		"JOIN ag.experiments exp " +
-		"WHERE tvs.lsType = :stateType AND tvs.lsKind = :stateKind AND tvs.ignored IS NOT :ignored " +
-		"AND tgv.ignored IS NOT :ignored " +
-		"AND tg.ignored IS NOT :ignored " +
-		"AND ag.ignored IS NOT :ignored " +
-		"AND exp.id = :experimentId ";
+				"JOIN tgv.lsState tvs " +
+				"JOIN tvs.treatmentGroup tg " +
+				"JOIN tg.analysisGroups ag " +
+				"JOIN ag.experiments exp " +
+				"WHERE tvs.lsType = :stateType AND tvs.lsKind = :stateKind AND tvs.ignored IS NOT :ignored " +
+				"AND tgv.ignored IS NOT :ignored " +
+				"AND tg.ignored IS NOT :ignored " +
+				"AND ag.ignored IS NOT :ignored " +
+				"AND exp.id = :experimentId ";
 		TypedQuery<TreatmentGroupValue> q = em.createQuery(hsqlQuery, TreatmentGroupValue.class);
 		q.setParameter("experimentId", experimentId);
 		q.setParameter("stateType", stateType);
@@ -253,21 +258,24 @@ public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByExptIDAn
 		q.setParameter("ignored", true);
 		return q;
 	}
-	
-	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByAnalysisGroupIDAndStateTypeKind(Long analysisGroupId, String stateType, String stateKind) {
-		if (stateType == null || stateType.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-		
+
+	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByAnalysisGroupIDAndStateTypeKind(
+			Long analysisGroupId, String stateType, String stateKind) {
+		if (stateType == null || stateType.length() == 0)
+			throw new IllegalArgumentException("The stateType argument is required");
+		if (stateKind == null || stateKind.length() == 0)
+			throw new IllegalArgumentException("The stateKind argument is required");
+
 		EntityManager em = entityManager();
 		String hsqlQuery = "SELECT tgv FROM TreatmentGroupValue AS tgv " +
-		"JOIN tgv.lsState tvs " +
-		"JOIN tvs.treatmentGroup tg " +
-		"JOIN tg.analysisGroups ag " +
-		"WHERE tvs.lsType = :stateType AND tvs.lsKind = :stateKind AND tvs.ignored IS NOT :ignored " +
-		"AND tgv.ignored IS NOT :ignored " +
-		"AND tg.ignored IS NOT :ignored " +
-		"AND ag.ignored IS NOT :ignored " +
-		"AND ag.id = :analysisGroupId ";
+				"JOIN tgv.lsState tvs " +
+				"JOIN tvs.treatmentGroup tg " +
+				"JOIN tg.analysisGroups ag " +
+				"WHERE tvs.lsType = :stateType AND tvs.lsKind = :stateKind AND tvs.ignored IS NOT :ignored " +
+				"AND tgv.ignored IS NOT :ignored " +
+				"AND tg.ignored IS NOT :ignored " +
+				"AND ag.ignored IS NOT :ignored " +
+				"AND ag.id = :analysisGroupId ";
 		TypedQuery<TreatmentGroupValue> q = em.createQuery(hsqlQuery, TreatmentGroupValue.class);
 		q.setParameter("analysisGroupId", analysisGroupId);
 		q.setParameter("stateType", stateType);
@@ -275,14 +283,19 @@ public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByAnalysis
 		q.setParameter("ignored", true);
 		return q;
 	}
-	
-	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByExptIDAndStateTypeKindAndValueTypeKind(Long experimentId, String stateType, String stateKind,
+
+	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByExptIDAndStateTypeKindAndValueTypeKind(
+			Long experimentId, String stateType, String stateKind,
 			String valueType, String valueKind) {
-		if (stateType == null || stateType.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-		if (valueType == null || valueType.length() == 0) throw new IllegalArgumentException("The valueType argument is required");
-		if (valueKind == null || valueKind.length() == 0) throw new IllegalArgumentException("The valueKind argument is required");
-		
+		if (stateType == null || stateType.length() == 0)
+			throw new IllegalArgumentException("The stateType argument is required");
+		if (stateKind == null || stateKind.length() == 0)
+			throw new IllegalArgumentException("The stateKind argument is required");
+		if (valueType == null || valueType.length() == 0)
+			throw new IllegalArgumentException("The valueType argument is required");
+		if (valueKind == null || valueKind.length() == 0)
+			throw new IllegalArgumentException("The valueKind argument is required");
+
 		EntityManager em = entityManager();
 		String hsqlQuery = "SELECT tgv FROM TreatmentGroupValue AS tgv " +
 				"JOIN tgv.lsState tvs " +
@@ -303,8 +316,8 @@ public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByExptIDAn
 		q.setParameter("ignored", true);
 		return q;
 	}
-	
-	public static String[] getColumns(){
+
+	public static String[] getColumns() {
 		String[] headerColumns = new String[] {
 				"analysisGroupId",
 				"treatmentGroupId",
@@ -330,7 +343,7 @@ public static String[] getColumns(){
 				"sigFigs",
 
 				"uncertainty",
-				"numberOfReplicates",				
+				"numberOfReplicates",
 				"uncertaintyType",
 				"unitType",
 				"unitKind",
@@ -346,13 +359,13 @@ public static String[] getColumns(){
 				"modifiedBy",
 				"publicData"
 		};
-//35 columns
+		// 35 columns
 		return headerColumns;
 
 	}
 
 	public static CellProcessor[] getProcessors() {
-		final CellProcessor[] processors = new CellProcessor[] { 
+		final CellProcessor[] processors = new CellProcessor[] {
 				new Optional(),
 				new Optional(),
 				new Optional(),
@@ -400,24 +413,29 @@ public static CellProcessor[] getProcessors() {
 
 	public Collection<TreatmentGroupValueDTO> makeDTOsByAnalysisGroupIds() {
 		Collection<TreatmentGroupValueDTO> treatmentGroupValueDTOs = new HashSet<TreatmentGroupValueDTO>();
-		Collection<AnalysisGroup> analysisGroups = TreatmentGroup.findTreatmentGroup(this.getTreatmentGroupId()).getAnalysisGroups();
-		for (AnalysisGroup analysisGroup: analysisGroups) {
+		Collection<AnalysisGroup> analysisGroups = TreatmentGroup.findTreatmentGroup(this.getTreatmentGroupId())
+				.getAnalysisGroups();
+		for (AnalysisGroup analysisGroup : analysisGroups) {
 			TreatmentGroupValueDTO treatmentGroupValueDTO = new TreatmentGroupValueDTO(this);
 			treatmentGroupValueDTO.setAnalysisGroupId(analysisGroup.getId());
 			treatmentGroupValueDTOs.add(treatmentGroupValueDTO);
 		}
-		
+
 		return treatmentGroupValueDTOs;
 	}
 
 	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByTreatmentGroupIDAndStateTypeKindAndValueTypeKind(
 			Long treatmentGroupId, String stateType, String stateKind,
 			String valueType, String valueKind) {
-		if (stateType == null || stateType.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-		if (valueType == null || valueType.length() == 0) throw new IllegalArgumentException("The valueType argument is required");
-		if (valueKind == null || valueKind.length() == 0) throw new IllegalArgumentException("The valueKind argument is required");
-		
+		if (stateType == null || stateType.length() == 0)
+			throw new IllegalArgumentException("The stateType argument is required");
+		if (stateKind == null || stateKind.length() == 0)
+			throw new IllegalArgumentException("The stateKind argument is required");
+		if (valueType == null || valueType.length() == 0)
+			throw new IllegalArgumentException("The valueType argument is required");
+		if (valueKind == null || valueKind.length() == 0)
+			throw new IllegalArgumentException("The valueKind argument is required");
+
 		EntityManager em = entityManager();
 		String hsqlQuery = "SELECT tgv FROM TreatmentGroupValue AS tgv " +
 				"JOIN tgv.lsState tgs " +
@@ -435,15 +453,19 @@ public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByTreatmen
 		q.setParameter("ignored", true);
 		return q;
 	}
-	
+
 	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByTreatmentGroupCodeNameAndStateTypeKindAndValueTypeKind(
 			String codeName, String stateType, String stateKind,
 			String valueType, String valueKind) {
-		if (stateType == null || stateType.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
-		if (valueType == null || valueType.length() == 0) throw new IllegalArgumentException("The valueType argument is required");
-		if (valueKind == null || valueKind.length() == 0) throw new IllegalArgumentException("The valueKind argument is required");
-		
+		if (stateType == null || stateType.length() == 0)
+			throw new IllegalArgumentException("The stateType argument is required");
+		if (stateKind == null || stateKind.length() == 0)
+			throw new IllegalArgumentException("The stateKind argument is required");
+		if (valueType == null || valueType.length() == 0)
+			throw new IllegalArgumentException("The valueType argument is required");
+		if (valueKind == null || valueKind.length() == 0)
+			throw new IllegalArgumentException("The valueKind argument is required");
+
 		EntityManager em = entityManager();
 		String hsqlQuery = "SELECT tgv FROM TreatmentGroupValue AS tgv " +
 				"JOIN tgv.lsState tgs " +
@@ -462,168 +484,200 @@ public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByTreatmen
 		return q;
 	}
 
-
-
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 
 	public static Long countFindTreatmentGroupValuesByCodeValueEquals(String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = TreatmentGroupValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupValue AS o WHERE o.codeValue = :codeValue", Long.class);
-        q.setParameter("codeValue", codeValue);
-        return ((Long) q.getSingleResult());
-    }
+		if (codeValue == null || codeValue.length() == 0)
+			throw new IllegalArgumentException("The codeValue argument is required");
+		EntityManager em = TreatmentGroupValue.entityManager();
+		TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupValue AS o WHERE o.codeValue = :codeValue",
+				Long.class);
+		q.setParameter("codeValue", codeValue);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static Long countFindTreatmentGroupValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = TreatmentGroupValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", Long.class);
-        q.setParameter("ignored", ignored);
-        q.setParameter("codeValue", codeValue);
-        return ((Long) q.getSingleResult());
-    }
+		if (codeValue == null || codeValue.length() == 0)
+			throw new IllegalArgumentException("The codeValue argument is required");
+		EntityManager em = TreatmentGroupValue.entityManager();
+		TypedQuery q = em.createQuery(
+				"SELECT COUNT(o) FROM TreatmentGroupValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue",
+				Long.class);
+		q.setParameter("ignored", ignored);
+		q.setParameter("codeValue", codeValue);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static Long countFindTreatmentGroupValuesByLsState(TreatmentGroupState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = TreatmentGroupValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupValue AS o WHERE o.lsState = :lsState", Long.class);
-        q.setParameter("lsState", lsState);
-        return ((Long) q.getSingleResult());
-    }
+		if (lsState == null)
+			throw new IllegalArgumentException("The lsState argument is required");
+		EntityManager em = TreatmentGroupValue.entityManager();
+		TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupValue AS o WHERE o.lsState = :lsState",
+				Long.class);
+		q.setParameter("lsState", lsState);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static Long countFindTreatmentGroupValuesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = TreatmentGroupValue.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM TreatmentGroupValue AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return ((Long) q.getSingleResult());
-    }
+		if (lsTransaction == null)
+			throw new IllegalArgumentException("The lsTransaction argument is required");
+		EntityManager em = TreatmentGroupValue.entityManager();
+		TypedQuery q = em.createQuery(
+				"SELECT COUNT(o) FROM TreatmentGroupValue AS o WHERE o.lsTransaction = :lsTransaction", Long.class);
+		q.setParameter("lsTransaction", lsTransaction);
+		return ((Long) q.getSingleResult());
+	}
 
 	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByCodeValueEquals(String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = TreatmentGroupValue.entityManager();
-        TypedQuery<TreatmentGroupValue> q = em.createQuery("SELECT o FROM TreatmentGroupValue AS o WHERE o.codeValue = :codeValue", TreatmentGroupValue.class);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-
-	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByCodeValueEquals(String codeValue, String sortFieldName, String sortOrder) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = TreatmentGroupValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroupValue AS o WHERE o.codeValue = :codeValue");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<TreatmentGroupValue> q = em.createQuery(queryBuilder.toString(), TreatmentGroupValue.class);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-
-	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = TreatmentGroupValue.entityManager();
-        TypedQuery<TreatmentGroupValue> q = em.createQuery("SELECT o FROM TreatmentGroupValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue", TreatmentGroupValue.class);
-        q.setParameter("ignored", ignored);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
-
-	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByIgnoredNotAndCodeValueEquals(boolean ignored, String codeValue, String sortFieldName, String sortOrder) {
-        if (codeValue == null || codeValue.length() == 0) throw new IllegalArgumentException("The codeValue argument is required");
-        EntityManager em = TreatmentGroupValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroupValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<TreatmentGroupValue> q = em.createQuery(queryBuilder.toString(), TreatmentGroupValue.class);
-        q.setParameter("ignored", ignored);
-        q.setParameter("codeValue", codeValue);
-        return q;
-    }
+		if (codeValue == null || codeValue.length() == 0)
+			throw new IllegalArgumentException("The codeValue argument is required");
+		EntityManager em = TreatmentGroupValue.entityManager();
+		TypedQuery<TreatmentGroupValue> q = em.createQuery(
+				"SELECT o FROM TreatmentGroupValue AS o WHERE o.codeValue = :codeValue", TreatmentGroupValue.class);
+		q.setParameter("codeValue", codeValue);
+		return q;
+	}
+
+	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByCodeValueEquals(String codeValue,
+			String sortFieldName, String sortOrder) {
+		if (codeValue == null || codeValue.length() == 0)
+			throw new IllegalArgumentException("The codeValue argument is required");
+		EntityManager em = TreatmentGroupValue.entityManager();
+		StringBuilder queryBuilder = new StringBuilder(
+				"SELECT o FROM TreatmentGroupValue AS o WHERE o.codeValue = :codeValue");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<TreatmentGroupValue> q = em.createQuery(queryBuilder.toString(), TreatmentGroupValue.class);
+		q.setParameter("codeValue", codeValue);
+		return q;
+	}
+
+	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByIgnoredNotAndCodeValueEquals(
+			boolean ignored, String codeValue) {
+		if (codeValue == null || codeValue.length() == 0)
+			throw new IllegalArgumentException("The codeValue argument is required");
+		EntityManager em = TreatmentGroupValue.entityManager();
+		TypedQuery<TreatmentGroupValue> q = em.createQuery(
+				"SELECT o FROM TreatmentGroupValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue",
+				TreatmentGroupValue.class);
+		q.setParameter("ignored", ignored);
+		q.setParameter("codeValue", codeValue);
+		return q;
+	}
+
+	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByIgnoredNotAndCodeValueEquals(
+			boolean ignored, String codeValue, String sortFieldName, String sortOrder) {
+		if (codeValue == null || codeValue.length() == 0)
+			throw new IllegalArgumentException("The codeValue argument is required");
+		EntityManager em = TreatmentGroupValue.entityManager();
+		StringBuilder queryBuilder = new StringBuilder(
+				"SELECT o FROM TreatmentGroupValue AS o WHERE o.ignored IS NOT :ignored  AND o.codeValue = :codeValue");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<TreatmentGroupValue> q = em.createQuery(queryBuilder.toString(), TreatmentGroupValue.class);
+		q.setParameter("ignored", ignored);
+		q.setParameter("codeValue", codeValue);
+		return q;
+	}
 
 	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByLsState(TreatmentGroupState lsState) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = TreatmentGroupValue.entityManager();
-        TypedQuery<TreatmentGroupValue> q = em.createQuery("SELECT o FROM TreatmentGroupValue AS o WHERE o.lsState = :lsState", TreatmentGroupValue.class);
-        q.setParameter("lsState", lsState);
-        return q;
-    }
-
-	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByLsState(TreatmentGroupState lsState, String sortFieldName, String sortOrder) {
-        if (lsState == null) throw new IllegalArgumentException("The lsState argument is required");
-        EntityManager em = TreatmentGroupValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroupValue AS o WHERE o.lsState = :lsState");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<TreatmentGroupValue> q = em.createQuery(queryBuilder.toString(), TreatmentGroupValue.class);
-        q.setParameter("lsState", lsState);
-        return q;
-    }
+		if (lsState == null)
+			throw new IllegalArgumentException("The lsState argument is required");
+		EntityManager em = TreatmentGroupValue.entityManager();
+		TypedQuery<TreatmentGroupValue> q = em.createQuery(
+				"SELECT o FROM TreatmentGroupValue AS o WHERE o.lsState = :lsState", TreatmentGroupValue.class);
+		q.setParameter("lsState", lsState);
+		return q;
+	}
+
+	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByLsState(TreatmentGroupState lsState,
+			String sortFieldName, String sortOrder) {
+		if (lsState == null)
+			throw new IllegalArgumentException("The lsState argument is required");
+		EntityManager em = TreatmentGroupValue.entityManager();
+		StringBuilder queryBuilder = new StringBuilder(
+				"SELECT o FROM TreatmentGroupValue AS o WHERE o.lsState = :lsState");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<TreatmentGroupValue> q = em.createQuery(queryBuilder.toString(), TreatmentGroupValue.class);
+		q.setParameter("lsState", lsState);
+		return q;
+	}
 
 	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByLsTransactionEquals(Long lsTransaction) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = TreatmentGroupValue.entityManager();
-        TypedQuery<TreatmentGroupValue> q = em.createQuery("SELECT o FROM TreatmentGroupValue AS o WHERE o.lsTransaction = :lsTransaction", TreatmentGroupValue.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
-
-	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByLsTransactionEquals(Long lsTransaction, String sortFieldName, String sortOrder) {
-        if (lsTransaction == null) throw new IllegalArgumentException("The lsTransaction argument is required");
-        EntityManager em = TreatmentGroupValue.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM TreatmentGroupValue AS o WHERE o.lsTransaction = :lsTransaction");
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            queryBuilder.append(" ORDER BY ").append(sortFieldName);
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                queryBuilder.append(" ").append(sortOrder);
-            }
-        }
-        TypedQuery<TreatmentGroupValue> q = em.createQuery(queryBuilder.toString(), TreatmentGroupValue.class);
-        q.setParameter("lsTransaction", lsTransaction);
-        return q;
-    }
+		if (lsTransaction == null)
+			throw new IllegalArgumentException("The lsTransaction argument is required");
+		EntityManager em = TreatmentGroupValue.entityManager();
+		TypedQuery<TreatmentGroupValue> q = em.createQuery(
+				"SELECT o FROM TreatmentGroupValue AS o WHERE o.lsTransaction = :lsTransaction",
+				TreatmentGroupValue.class);
+		q.setParameter("lsTransaction", lsTransaction);
+		return q;
+	}
+
+	public static TypedQuery<TreatmentGroupValue> findTreatmentGroupValuesByLsTransactionEquals(Long lsTransaction,
+			String sortFieldName, String sortOrder) {
+		if (lsTransaction == null)
+			throw new IllegalArgumentException("The lsTransaction argument is required");
+		EntityManager em = TreatmentGroupValue.entityManager();
+		StringBuilder queryBuilder = new StringBuilder(
+				"SELECT o FROM TreatmentGroupValue AS o WHERE o.lsTransaction = :lsTransaction");
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			queryBuilder.append(" ORDER BY ").append(sortFieldName);
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				queryBuilder.append(" ").append(sortOrder);
+			}
+		}
+		TypedQuery<TreatmentGroupValue> q = em.createQuery(queryBuilder.toString(), TreatmentGroupValue.class);
+		q.setParameter("lsTransaction", lsTransaction);
+		return q;
+	}
 
 	public TreatmentGroupState getLsState() {
-        return this.lsState;
-    }
+		return this.lsState;
+	}
 
 	public void setLsState(TreatmentGroupState lsState) {
-        this.lsState = lsState;
-    }
+		this.lsState = lsState;
+	}
 
 	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsState");
 
 	public static List<TreatmentGroupValue> findAllTreatmentGroupValues(String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM TreatmentGroupValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, TreatmentGroupValue.class).getResultList();
-    }
-
-	public static List<TreatmentGroupValue> findTreatmentGroupValueEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
-        String jpaQuery = "SELECT o FROM TreatmentGroupValue o";
-        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
-            jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
-            if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
-                jpaQuery = jpaQuery + " " + sortOrder;
-            }
-        }
-        return entityManager().createQuery(jpaQuery, TreatmentGroupValue.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
+		String jpaQuery = "SELECT o FROM TreatmentGroupValue o";
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				jpaQuery = jpaQuery + " " + sortOrder;
+			}
+		}
+		return entityManager().createQuery(jpaQuery, TreatmentGroupValue.class).getResultList();
+	}
+
+	public static List<TreatmentGroupValue> findTreatmentGroupValueEntries(int firstResult, int maxResults,
+			String sortFieldName, String sortOrder) {
+		String jpaQuery = "SELECT o FROM TreatmentGroupValue o";
+		if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
+			jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
+			if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
+				jpaQuery = jpaQuery + " " + sortOrder;
+			}
+		}
+		return entityManager().createQuery(jpaQuery, TreatmentGroupValue.class).setFirstResult(firstResult)
+				.setMaxResults(maxResults).getResultList();
+	}
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/UncertaintyKind.java b/src/main/java/com/labsynch/labseer/domain/UncertaintyKind.java
index 8faad8075..f630098e9 100755
--- a/src/main/java/com/labsynch/labseer/domain/UncertaintyKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/UncertaintyKind.java
@@ -35,64 +35,66 @@ public class UncertaintyKind {
     @JoinColumn(name = "ls_type")
     private String kindName;
 
-	@Id
+    @Id
     @SequenceGenerator(name = "uncertaintyKindGen", sequenceName = "UNCERTAINTY_KIND_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "uncertaintyKindGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String getKindName() {
+    public String getKindName() {
         return this.kindName;
     }
 
-	public void setKindName(String kindName) {
+    public void setKindName(String kindName) {
         this.kindName = kindName;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("kindName");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("kindName");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new UncertaintyKind().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countUncertaintyKinds() {
+    public static long countUncertaintyKinds() {
         return entityManager().createQuery("SELECT COUNT(o) FROM UncertaintyKind o", Long.class).getSingleResult();
     }
 
-	public static List<UncertaintyKind> findAllUncertaintyKinds() {
+    public static List<UncertaintyKind> findAllUncertaintyKinds() {
         return entityManager().createQuery("SELECT o FROM UncertaintyKind o", UncertaintyKind.class).getResultList();
     }
 
-	public static List<UncertaintyKind> findAllUncertaintyKinds(String sortFieldName, String sortOrder) {
+    public static List<UncertaintyKind> findAllUncertaintyKinds(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM UncertaintyKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -103,16 +105,19 @@ public static List<UncertaintyKind> findAllUncertaintyKinds(String sortFieldName
         return entityManager().createQuery(jpaQuery, UncertaintyKind.class).getResultList();
     }
 
-	public static UncertaintyKind findUncertaintyKind(Long id) {
-        if (id == null) return null;
+    public static UncertaintyKind findUncertaintyKind(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(UncertaintyKind.class, id);
     }
 
-	public static List<UncertaintyKind> findUncertaintyKindEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM UncertaintyKind o", UncertaintyKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<UncertaintyKind> findUncertaintyKindEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM UncertaintyKind o", UncertaintyKind.class)
+                .setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
     }
 
-	public static List<UncertaintyKind> findUncertaintyKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<UncertaintyKind> findUncertaintyKindEntries(int firstResult, int maxResults,
+            String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM UncertaintyKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -120,18 +125,21 @@ public static List<UncertaintyKind> findUncertaintyKindEntries(int firstResult,
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, UncertaintyKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, UncertaintyKind.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -140,53 +148,56 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public UncertaintyKind merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         UncertaintyKind merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static UncertaintyKind fromJsonToUncertaintyKind(String json) {
+    public static UncertaintyKind fromJsonToUncertaintyKind(String json) {
         return new JSONDeserializer<UncertaintyKind>()
-        .use(null, UncertaintyKind.class).deserialize(json);
+                .use(null, UncertaintyKind.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<UncertaintyKind> collection) {
+    public static String toJsonArray(Collection<UncertaintyKind> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<UncertaintyKind> collection, String[] fields) {
+    public static String toJsonArray(Collection<UncertaintyKind> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<UncertaintyKind> fromJsonArrayToUncertaintyKinds(String json) {
+    public static Collection<UncertaintyKind> fromJsonArrayToUncertaintyKinds(String json) {
         return new JSONDeserializer<List<UncertaintyKind>>()
-        .use("values", UncertaintyKind.class).deserialize(json);
+                .use("values", UncertaintyKind.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/Unit.java b/src/main/java/com/labsynch/labseer/domain/Unit.java
index 07e8e6a4d..d462fdb81 100755
--- a/src/main/java/com/labsynch/labseer/domain/Unit.java
+++ b/src/main/java/com/labsynch/labseer/domain/Unit.java
@@ -32,43 +32,44 @@ public class Unit {
 
     @Size(max = 255)
     private String code;
-    
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public static Long countFindUnitsByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static Long countFindUnitsByCodeEquals(String code) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = Unit.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Unit AS o WHERE o.code = :code", Long.class);
         q.setParameter("code", code);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindUnitsByCodeLike(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static Long countFindUnitsByCodeLike(String code) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         code = code.replace('*', '%');
         if (code.charAt(0) != '%') {
             code = "%" + code;
@@ -77,29 +78,33 @@ public static Long countFindUnitsByCodeLike(String code) {
             code = code + "%";
         }
         EntityManager em = Unit.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Unit AS o WHERE LOWER(o.code) LIKE LOWER(:code)", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Unit AS o WHERE LOWER(o.code) LIKE LOWER(:code)",
+                Long.class);
         q.setParameter("code", code);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindUnitsByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static Long countFindUnitsByNameEquals(String name) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = Unit.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Unit AS o WHERE o.name = :name", Long.class);
         q.setParameter("name", name);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<Unit> findUnitsByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static TypedQuery<Unit> findUnitsByCodeEquals(String code) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = Unit.entityManager();
         TypedQuery<Unit> q = em.createQuery("SELECT o FROM Unit AS o WHERE o.code = :code", Unit.class);
         q.setParameter("code", code);
         return q;
     }
 
-	public static TypedQuery<Unit> findUnitsByCodeEquals(String code, String sortFieldName, String sortOrder) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static TypedQuery<Unit> findUnitsByCodeEquals(String code, String sortFieldName, String sortOrder) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = Unit.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Unit AS o WHERE o.code = :code");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -113,8 +118,9 @@ public static TypedQuery<Unit> findUnitsByCodeEquals(String code, String sortFie
         return q;
     }
 
-	public static TypedQuery<Unit> findUnitsByCodeLike(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static TypedQuery<Unit> findUnitsByCodeLike(String code) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         code = code.replace('*', '%');
         if (code.charAt(0) != '%') {
             code = "%" + code;
@@ -123,13 +129,15 @@ public static TypedQuery<Unit> findUnitsByCodeLike(String code) {
             code = code + "%";
         }
         EntityManager em = Unit.entityManager();
-        TypedQuery<Unit> q = em.createQuery("SELECT o FROM Unit AS o WHERE LOWER(o.code) LIKE LOWER(:code)", Unit.class);
+        TypedQuery<Unit> q = em.createQuery("SELECT o FROM Unit AS o WHERE LOWER(o.code) LIKE LOWER(:code)",
+                Unit.class);
         q.setParameter("code", code);
         return q;
     }
 
-	public static TypedQuery<Unit> findUnitsByCodeLike(String code, String sortFieldName, String sortOrder) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static TypedQuery<Unit> findUnitsByCodeLike(String code, String sortFieldName, String sortOrder) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         code = code.replace('*', '%');
         if (code.charAt(0) != '%') {
             code = "%" + code;
@@ -150,16 +158,18 @@ public static TypedQuery<Unit> findUnitsByCodeLike(String code, String sortField
         return q;
     }
 
-	public static TypedQuery<Unit> findUnitsByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<Unit> findUnitsByNameEquals(String name) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = Unit.entityManager();
         TypedQuery<Unit> q = em.createQuery("SELECT o FROM Unit AS o WHERE o.name = :name", Unit.class);
         q.setParameter("name", name);
         return q;
     }
 
-	public static TypedQuery<Unit> findUnitsByNameEquals(String name, String sortFieldName, String sortOrder) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<Unit> findUnitsByNameEquals(String name, String sortFieldName, String sortOrder) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = Unit.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Unit AS o WHERE o.name = :name");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -173,26 +183,28 @@ public static TypedQuery<Unit> findUnitsByNameEquals(String name, String sortFie
         return q;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new Unit().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countUnits() {
+    public static long countUnits() {
         return entityManager().createQuery("SELECT COUNT(o) FROM Unit o", Long.class).getSingleResult();
     }
 
-	public static List<Unit> findAllUnits() {
+    public static List<Unit> findAllUnits() {
         return entityManager().createQuery("SELECT o FROM Unit o", Unit.class).getResultList();
     }
 
-	public static List<Unit> findAllUnits(String sortFieldName, String sortOrder) {
+    public static List<Unit> findAllUnits(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM Unit o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -203,16 +215,18 @@ public static List<Unit> findAllUnits(String sortFieldName, String sortOrder) {
         return entityManager().createQuery(jpaQuery, Unit.class).getResultList();
     }
 
-	public static Unit findUnit(Long id) {
-        if (id == null) return null;
+    public static Unit findUnit(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(Unit.class, id);
     }
 
-	public static List<Unit> findUnitEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM Unit o", Unit.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<Unit> findUnitEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM Unit o", Unit.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<Unit> findUnitEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<Unit> findUnitEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM Unit o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -220,18 +234,21 @@ public static List<Unit> findUnitEntries(int firstResult, int maxResults, String
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, Unit.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, Unit.class).setFirstResult(firstResult).setMaxResults(maxResults)
+                .getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -240,73 +257,76 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public Unit merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         Unit merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String getName() {
+    public String getName() {
         return this.name;
     }
 
-	public void setName(String name) {
+    public void setName(String name) {
         this.name = name;
     }
 
-	public String getCode() {
+    public String getCode() {
         return this.code;
     }
 
-	public void setCode(String code) {
+    public void setCode(String code) {
         this.code = code;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static Unit fromJsonToUnit(String json) {
+    public static Unit fromJsonToUnit(String json) {
         return new JSONDeserializer<Unit>()
-        .use(null, Unit.class).deserialize(json);
+                .use(null, Unit.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<Unit> collection) {
+    public static String toJsonArray(Collection<Unit> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<Unit> collection, String[] fields) {
+    public static String toJsonArray(Collection<Unit> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<Unit> fromJsonArrayToUnits(String json) {
+    public static Collection<Unit> fromJsonArrayToUnits(String json) {
         return new JSONDeserializer<List<Unit>>()
-        .use("values", Unit.class).deserialize(json);
+                .use("values", Unit.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/UnitKind.java b/src/main/java/com/labsynch/labseer/domain/UnitKind.java
index 6c4c3b8ba..d5795260c 100755
--- a/src/main/java/com/labsynch/labseer/domain/UnitKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/UnitKind.java
@@ -44,69 +44,76 @@ public class UnitKind {
     @Size(max = 255)
     private String lsTypeAndKind;
 
-	@Id
+    @Id
     @SequenceGenerator(name = "unitKindGen", sequenceName = "UNITS_KIND_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "unitKindGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new UnitKind().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countUnitKinds() {
+    public static long countUnitKinds() {
         return entityManager().createQuery("SELECT COUNT(o) FROM UnitKind o", Long.class).getSingleResult();
     }
 
-	public static List<UnitKind> findAllUnitKinds() {
+    public static List<UnitKind> findAllUnitKinds() {
         return entityManager().createQuery("SELECT o FROM UnitKind o", UnitKind.class).getResultList();
     }
 
-	public static UnitKind findUnitKind(Long id) {
-        if (id == null) return null;
+    public static UnitKind findUnitKind(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(UnitKind.class, id);
     }
 
-	public static List<UnitKind> findUnitKindEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM UnitKind o", UnitKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<UnitKind> findUnitKindEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM UnitKind o", UnitKind.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.lsType = UnitType.findUnitType(this.getLsType().getId());
-		this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_').append(this.getKindName()).toString();
+        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_')
+                .append(this.getKindName()).toString();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -115,54 +122,59 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public UnitKind merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-		this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_').append(this.getKindName()).toString();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
+        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_')
+                .append(this.getKindName()).toString();
         UnitKind merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public UnitType getLsType() {
+    public UnitType getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(UnitType lsType) {
+    public void setLsType(UnitType lsType) {
         this.lsType = lsType;
     }
 
-	public String getKindName() {
+    public String getKindName() {
         return this.kindName;
     }
 
-	public void setKindName(String kindName) {
+    public void setKindName(String kindName) {
         this.kindName = kindName;
     }
 
-	public String getLsTypeAndKind() {
+    public String getLsTypeAndKind() {
         return this.lsTypeAndKind;
     }
 
-	public void setLsTypeAndKind(String lsTypeAndKind) {
+    public void setLsTypeAndKind(String lsTypeAndKind) {
         this.lsTypeAndKind = lsTypeAndKind;
     }
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("lsType", "kindName",
+            "lsTypeAndKind", "id", "version", "entityManager");
 
-	public static List<UnitKind> findAllUnitKinds(String sortFieldName, String sortOrder) {
+    public static List<UnitKind> findAllUnitKinds(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM UnitKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -173,7 +185,8 @@ public static List<UnitKind> findAllUnitKinds(String sortFieldName, String sortO
         return entityManager().createQuery(jpaQuery, UnitKind.class).getResultList();
     }
 
-	public static List<UnitKind> findUnitKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<UnitKind> findUnitKindEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM UnitKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -181,68 +194,79 @@ public static List<UnitKind> findUnitKindEntries(int firstResult, int maxResults
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, UnitKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, UnitKind.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static UnitKind fromJsonToUnitKind(String json) {
+    public static UnitKind fromJsonToUnitKind(String json) {
         return new JSONDeserializer<UnitKind>()
-        .use(null, UnitKind.class).deserialize(json);
+                .use(null, UnitKind.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<UnitKind> collection) {
+    public static String toJsonArray(Collection<UnitKind> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<UnitKind> collection, String[] fields) {
+    public static String toJsonArray(Collection<UnitKind> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<UnitKind> fromJsonArrayToUnitKinds(String json) {
+    public static Collection<UnitKind> fromJsonArrayToUnitKinds(String json) {
         return new JSONDeserializer<List<UnitKind>>()
-        .use("values", UnitKind.class).deserialize(json);
+                .use("values", UnitKind.class).deserialize(json);
     }
 
-	public static Long countFindUnitKindsByKindNameEqualsAndLsType(String kindName, UnitType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static Long countFindUnitKindsByKindNameEqualsAndLsType(String kindName, UnitType lsType) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = UnitKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM UnitKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM UnitKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
         q.setParameter("kindName", kindName);
         q.setParameter("lsType", lsType);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<UnitKind> findUnitKindsByKindNameEqualsAndLsType(String kindName, UnitType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<UnitKind> findUnitKindsByKindNameEqualsAndLsType(String kindName, UnitType lsType) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = UnitKind.entityManager();
-        TypedQuery<UnitKind> q = em.createQuery("SELECT o FROM UnitKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", UnitKind.class);
+        TypedQuery<UnitKind> q = em.createQuery(
+                "SELECT o FROM UnitKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", UnitKind.class);
         q.setParameter("kindName", kindName);
         q.setParameter("lsType", lsType);
         return q;
     }
 
-	public static TypedQuery<UnitKind> findUnitKindsByKindNameEqualsAndLsType(String kindName, UnitType lsType, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<UnitKind> findUnitKindsByKindNameEqualsAndLsType(String kindName, UnitType lsType,
+            String sortFieldName, String sortOrder) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = UnitKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM UnitKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM UnitKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
diff --git a/src/main/java/com/labsynch/labseer/domain/UnitType.java b/src/main/java/com/labsynch/labseer/domain/UnitType.java
index 19da7d0cd..0c55e5189 100755
--- a/src/main/java/com/labsynch/labseer/domain/UnitType.java
+++ b/src/main/java/com/labsynch/labseer/domain/UnitType.java
@@ -34,52 +34,55 @@ public class UnitType {
     @Size(max = 64)
     private String typeName;
 
-	@Id
+    @Id
     @SequenceGenerator(name = "unitTypeGen", sequenceName = "UNITS_TYPE_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "unitTypeGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName", "id", "version");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("typeName", "id",
+            "version");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new UnitType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countUnitTypes() {
+    public static long countUnitTypes() {
         return entityManager().createQuery("SELECT COUNT(o) FROM UnitType o", Long.class).getSingleResult();
     }
 
-	public static List<UnitType> findAllUnitTypes() {
+    public static List<UnitType> findAllUnitTypes() {
         return entityManager().createQuery("SELECT o FROM UnitType o", UnitType.class).getResultList();
     }
 
-	public static List<UnitType> findAllUnitTypes(String sortFieldName, String sortOrder) {
+    public static List<UnitType> findAllUnitTypes(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM UnitType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -90,16 +93,19 @@ public static List<UnitType> findAllUnitTypes(String sortFieldName, String sortO
         return entityManager().createQuery(jpaQuery, UnitType.class).getResultList();
     }
 
-	public static UnitType findUnitType(Long id) {
-        if (id == null) return null;
+    public static UnitType findUnitType(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(UnitType.class, id);
     }
 
-	public static List<UnitType> findUnitTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM UnitType o", UnitType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<UnitType> findUnitTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM UnitType o", UnitType.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<UnitType> findUnitTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<UnitType> findUnitTypeEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM UnitType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -107,18 +113,21 @@ public static List<UnitType> findUnitTypeEntries(int firstResult, int maxResults
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, UnitType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, UnitType.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -127,44 +136,52 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public UnitType merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         UnitType merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public static Long countFindUnitTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static Long countFindUnitTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = UnitType.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM UnitType AS o WHERE o.typeName = :typeName", Long.class);
         q.setParameter("typeName", typeName);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<UnitType> findUnitTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static TypedQuery<UnitType> findUnitTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = UnitType.entityManager();
-        TypedQuery<UnitType> q = em.createQuery("SELECT o FROM UnitType AS o WHERE o.typeName = :typeName", UnitType.class);
+        TypedQuery<UnitType> q = em.createQuery("SELECT o FROM UnitType AS o WHERE o.typeName = :typeName",
+                UnitType.class);
         q.setParameter("typeName", typeName);
         return q;
     }
 
-	public static TypedQuery<UnitType> findUnitTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static TypedQuery<UnitType> findUnitTypesByTypeNameEquals(String typeName, String sortFieldName,
+            String sortOrder) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = UnitType.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM UnitType AS o WHERE o.typeName = :typeName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -178,45 +195,45 @@ public static TypedQuery<UnitType> findUnitTypesByTypeNameEquals(String typeName
         return q;
     }
 
-	public String getTypeName() {
+    public String getTypeName() {
         return this.typeName;
     }
 
-	public void setTypeName(String typeName) {
+    public void setTypeName(String typeName) {
         this.typeName = typeName;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static UnitType fromJsonToUnitType(String json) {
+    public static UnitType fromJsonToUnitType(String json) {
         return new JSONDeserializer<UnitType>()
-        .use(null, UnitType.class).deserialize(json);
+                .use(null, UnitType.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<UnitType> collection) {
+    public static String toJsonArray(Collection<UnitType> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<UnitType> collection, String[] fields) {
+    public static String toJsonArray(Collection<UnitType> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<UnitType> fromJsonArrayToUnitTypes(String json) {
+    public static Collection<UnitType> fromJsonArrayToUnitTypes(String json) {
         return new JSONDeserializer<List<UnitType>>()
-        .use("values", UnitType.class).deserialize(json);
+                .use("values", UnitType.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/UpdateLog.java b/src/main/java/com/labsynch/labseer/domain/UpdateLog.java
index 1681eea35..71ffc85c8 100755
--- a/src/main/java/com/labsynch/labseer/domain/UpdateLog.java
+++ b/src/main/java/com/labsynch/labseer/domain/UpdateLog.java
@@ -32,42 +32,43 @@ public class UpdateLog {
 
     @Size(max = 255)
     private String updateAction;
-    
-	@Size(max = 512)
-	private String comments;
-	
-	private Long lsTransaction;
-
-	@NotNull
-	@Temporal(TemporalType.TIMESTAMP)
-	@DateTimeFormat(style = "MM")
-	private Date recordedDate;
-	
-	@Size(max = 255)
-	private String recordedBy;
-    
-    
-
-	@PersistenceContext
+
+    @Size(max = 512)
+    private String comments;
+
+    private Long lsTransaction;
+
+    @NotNull
+    @Temporal(TemporalType.TIMESTAMP)
+    @DateTimeFormat(style = "MM")
+    private Date recordedDate;
+
+    @Size(max = 255)
+    private String recordedBy;
+
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("thing", "updateAction", "comments", "lsTransaction", "recordedDate", "recordedBy");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("thing", "updateAction",
+            "comments", "lsTransaction", "recordedDate", "recordedBy");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new UpdateLog().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countUpdateLogs() {
+    public static long countUpdateLogs() {
         return entityManager().createQuery("SELECT COUNT(o) FROM UpdateLog o", Long.class).getSingleResult();
     }
 
-	public static List<UpdateLog> findAllUpdateLogs() {
+    public static List<UpdateLog> findAllUpdateLogs() {
         return entityManager().createQuery("SELECT o FROM UpdateLog o", UpdateLog.class).getResultList();
     }
 
-	public static List<UpdateLog> findAllUpdateLogs(String sortFieldName, String sortOrder) {
+    public static List<UpdateLog> findAllUpdateLogs(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM UpdateLog o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -78,16 +79,19 @@ public static List<UpdateLog> findAllUpdateLogs(String sortFieldName, String sor
         return entityManager().createQuery(jpaQuery, UpdateLog.class).getResultList();
     }
 
-	public static UpdateLog findUpdateLog(Long id) {
-        if (id == null) return null;
+    public static UpdateLog findUpdateLog(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(UpdateLog.class, id);
     }
 
-	public static List<UpdateLog> findUpdateLogEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM UpdateLog o", UpdateLog.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<UpdateLog> findUpdateLogEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM UpdateLog o", UpdateLog.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<UpdateLog> findUpdateLogEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<UpdateLog> findUpdateLogEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM UpdateLog o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -95,18 +99,21 @@ public static List<UpdateLog> findUpdateLogEntries(int firstResult, int maxResul
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, UpdateLog.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, UpdateLog.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -115,101 +122,104 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public UpdateLog merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         UpdateLog merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	@Id
+    @Id
     @SequenceGenerator(name = "updateLogGen", sequenceName = "UPDATE_LOG_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "updateLogGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public Long getThing() {
+    public Long getThing() {
         return this.thing;
     }
 
-	public void setThing(Long thing) {
+    public void setThing(Long thing) {
         this.thing = thing;
     }
 
-	public String getUpdateAction() {
+    public String getUpdateAction() {
         return this.updateAction;
     }
 
-	public void setUpdateAction(String updateAction) {
+    public void setUpdateAction(String updateAction) {
         this.updateAction = updateAction;
     }
 
-	public String getComments() {
+    public String getComments() {
         return this.comments;
     }
 
-	public void setComments(String comments) {
+    public void setComments(String comments) {
         this.comments = comments;
     }
 
-	public Long getLsTransaction() {
+    public Long getLsTransaction() {
         return this.lsTransaction;
     }
 
-	public void setLsTransaction(Long lsTransaction) {
+    public void setLsTransaction(Long lsTransaction) {
         this.lsTransaction = lsTransaction;
     }
 
-	public Date getRecordedDate() {
+    public Date getRecordedDate() {
         return this.recordedDate;
     }
 
-	public void setRecordedDate(Date recordedDate) {
+    public void setRecordedDate(Date recordedDate) {
         this.recordedDate = recordedDate;
     }
 
-	public String getRecordedBy() {
+    public String getRecordedBy() {
         return this.recordedBy;
     }
 
-	public void setRecordedBy(String recordedBy) {
+    public void setRecordedBy(String recordedBy) {
         this.recordedBy = recordedBy;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ValueKind.java b/src/main/java/com/labsynch/labseer/domain/ValueKind.java
index 976ac7770..f21e5fece 100755
--- a/src/main/java/com/labsynch/labseer/domain/ValueKind.java
+++ b/src/main/java/com/labsynch/labseer/domain/ValueKind.java
@@ -79,7 +79,9 @@ public void setVersion(Integer version) {
 
     public static final EntityManager entityManager() {
         EntityManager em = new ValueKind().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
@@ -92,25 +94,30 @@ public static List<com.labsynch.labseer.domain.ValueKind> findAllValueKinds() {
     }
 
     public static com.labsynch.labseer.domain.ValueKind findValueKind(Long id) {
-        if (id == null) return null;
+        if (id == null)
+            return null;
         return entityManager().find(ValueKind.class, id);
     }
 
     public static List<com.labsynch.labseer.domain.ValueKind> findValueKindEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ValueKind o", ValueKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery("SELECT o FROM ValueKind o", ValueKind.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
     @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.lsType = ValueType.findValueType(this.getLsType().getId());
-        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_').append(this.getKindName()).toString();
+        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_')
+                .append(this.getKindName()).toString();
         this.entityManager.persist(this);
     }
 
     @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -121,46 +128,51 @@ public void remove() {
 
     @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
     @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
     @Transactional
     public com.labsynch.labseer.domain.ValueKind merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
-        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_').append(this.getKindName()).toString();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
+        this.lsTypeAndKind = new StringBuilder().append(this.getLsType().getTypeName()).append('_')
+                .append(this.getKindName()).toString();
         ValueKind merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
-    
+
     public static ValueKind getOrCreate(ValueType lsType, String kindName) {
-    	ValueKind lsKind = null;
-		List<ValueKind> lsKinds = ValueKind.findValueKindsByKindNameEqualsAndLsType(kindName, lsType).getResultList();
-		
-		if (lsKinds.size() == 0){
-			lsKind = new ValueKind();
-			lsKind.setKindName(kindName);
-			lsKind.setLsType(lsType);
-			lsKind.persist();
-		} else if (lsKinds.size() == 1){
-			lsKind = lsKinds.get(0);
-		} else if (lsKinds.size() > 1){
-			logger.error("ERROR: multiple value kinds with the same name and type");
-		}
-		
-		return lsKind;
-	}
-
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType", "kindName", "lsTypeAndKind", "id", "version", "entityManager");
-
-	public static List<ValueKind> findAllValueKinds(String sortFieldName, String sortOrder) {
+        ValueKind lsKind = null;
+        List<ValueKind> lsKinds = ValueKind.findValueKindsByKindNameEqualsAndLsType(kindName, lsType).getResultList();
+
+        if (lsKinds.size() == 0) {
+            lsKind = new ValueKind();
+            lsKind.setKindName(kindName);
+            lsKind.setLsType(lsType);
+            lsKind.persist();
+        } else if (lsKinds.size() == 1) {
+            lsKind = lsKinds.get(0);
+        } else if (lsKinds.size() > 1) {
+            logger.error("ERROR: multiple value kinds with the same name and type");
+        }
+
+        return lsKind;
+    }
+
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "lsType",
+            "kindName", "lsTypeAndKind", "id", "version", "entityManager");
+
+    public static List<ValueKind> findAllValueKinds(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ValueKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -171,7 +183,8 @@ public static List<ValueKind> findAllValueKinds(String sortFieldName, String sor
         return entityManager().createQuery(jpaQuery, ValueKind.class).getResultList();
     }
 
-	public static List<ValueKind> findValueKindEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ValueKind> findValueKindEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM ValueKind o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -179,76 +192,88 @@ public static List<ValueKind> findValueKindEntries(int firstResult, int maxResul
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ValueKind.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ValueKind.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ValueKind fromJsonToValueKind(String json) {
+    public static ValueKind fromJsonToValueKind(String json) {
         return new JSONDeserializer<ValueKind>()
-        .use(null, ValueKind.class).deserialize(json);
+                .use(null, ValueKind.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ValueKind> collection) {
+    public static String toJsonArray(Collection<ValueKind> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ValueKind> collection, String[] fields) {
+    public static String toJsonArray(Collection<ValueKind> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ValueKind> fromJsonArrayToValueKinds(String json) {
+    public static Collection<ValueKind> fromJsonArrayToValueKinds(String json) {
         return new JSONDeserializer<List<ValueKind>>()
-        .use("values", ValueKind.class).deserialize(json);
+                .use("values", ValueKind.class).deserialize(json);
     }
 
-	public static Long countFindValueKindsByKindNameEqualsAndLsType(String kindName, ValueType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static Long countFindValueKindsByKindNameEqualsAndLsType(String kindName, ValueType lsType) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = ValueKind.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ValueKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
+        TypedQuery q = em.createQuery(
+                "SELECT COUNT(o) FROM ValueKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", Long.class);
         q.setParameter("kindName", kindName);
         q.setParameter("lsType", lsType);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindValueKindsByLsType(ValueType lsType) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static Long countFindValueKindsByLsType(ValueType lsType) {
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = ValueKind.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ValueKind AS o WHERE o.lsType = :lsType", Long.class);
         q.setParameter("lsType", lsType);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<ValueKind> findValueKindsByKindNameEqualsAndLsType(String kindName, ValueType lsType) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<ValueKind> findValueKindsByKindNameEqualsAndLsType(String kindName, ValueType lsType) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = ValueKind.entityManager();
-        TypedQuery<ValueKind> q = em.createQuery("SELECT o FROM ValueKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", ValueKind.class);
+        TypedQuery<ValueKind> q = em.createQuery(
+                "SELECT o FROM ValueKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType", ValueKind.class);
         q.setParameter("kindName", kindName);
         q.setParameter("lsType", lsType);
         return q;
     }
 
-	public static TypedQuery<ValueKind> findValueKindsByKindNameEqualsAndLsType(String kindName, ValueType lsType, String sortFieldName, String sortOrder) {
-        if (kindName == null || kindName.length() == 0) throw new IllegalArgumentException("The kindName argument is required");
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<ValueKind> findValueKindsByKindNameEqualsAndLsType(String kindName, ValueType lsType,
+            String sortFieldName, String sortOrder) {
+        if (kindName == null || kindName.length() == 0)
+            throw new IllegalArgumentException("The kindName argument is required");
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = ValueKind.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ValueKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM ValueKind AS o WHERE o.kindName = :kindName  AND o.lsType = :lsType");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -261,16 +286,20 @@ public static TypedQuery<ValueKind> findValueKindsByKindNameEqualsAndLsType(Stri
         return q;
     }
 
-	public static TypedQuery<ValueKind> findValueKindsByLsType(ValueType lsType) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<ValueKind> findValueKindsByLsType(ValueType lsType) {
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = ValueKind.entityManager();
-        TypedQuery<ValueKind> q = em.createQuery("SELECT o FROM ValueKind AS o WHERE o.lsType = :lsType", ValueKind.class);
+        TypedQuery<ValueKind> q = em.createQuery("SELECT o FROM ValueKind AS o WHERE o.lsType = :lsType",
+                ValueKind.class);
         q.setParameter("lsType", lsType);
         return q;
     }
 
-	public static TypedQuery<ValueKind> findValueKindsByLsType(ValueType lsType, String sortFieldName, String sortOrder) {
-        if (lsType == null) throw new IllegalArgumentException("The lsType argument is required");
+    public static TypedQuery<ValueKind> findValueKindsByLsType(ValueType lsType, String sortFieldName,
+            String sortOrder) {
+        if (lsType == null)
+            throw new IllegalArgumentException("The lsType argument is required");
         EntityManager em = ValueKind.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ValueKind AS o WHERE o.lsType = :lsType");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -284,27 +313,27 @@ public static TypedQuery<ValueKind> findValueKindsByLsType(ValueType lsType, Str
         return q;
     }
 
-	public ValueType getLsType() {
+    public ValueType getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(ValueType lsType) {
+    public void setLsType(ValueType lsType) {
         this.lsType = lsType;
     }
 
-	public String getKindName() {
+    public String getKindName() {
         return this.kindName;
     }
 
-	public void setKindName(String kindName) {
+    public void setKindName(String kindName) {
         this.kindName = kindName;
     }
 
-	public String getLsTypeAndKind() {
+    public String getLsTypeAndKind() {
         return this.lsTypeAndKind;
     }
 
-	public void setLsTypeAndKind(String lsTypeAndKind) {
+    public void setLsTypeAndKind(String lsTypeAndKind) {
         this.lsTypeAndKind = lsTypeAndKind;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/ValueType.java b/src/main/java/com/labsynch/labseer/domain/ValueType.java
index 41d1cabdb..f5ba9a65c 100755
--- a/src/main/java/com/labsynch/labseer/domain/ValueType.java
+++ b/src/main/java/com/labsynch/labseer/domain/ValueType.java
@@ -38,8 +38,8 @@ public class ValueType {
     @Size(max = 64)
     private String typeName;
 
-	public static ValueType getOrCreate(String name) {
-		ValueType lsType = null;
+    public static ValueType getOrCreate(String name) {
+        ValueType lsType = null;
         List<ValueType> lsTypes = ValueType.findValueTypesByTypeNameEquals(name).getResultList();
         if (lsTypes.size() == 0) {
             lsType = new ValueType();
@@ -51,54 +51,57 @@ public static ValueType getOrCreate(String name) {
             logger.error("ERROR: multiple Label types with the same name");
         }
         return lsType;
-	}
+    }
 
-	@Id
+    @Id
     @SequenceGenerator(name = "valueTypeGen", sequenceName = "VALUE_TYPE_PKSEQ")
     @GeneratedValue(strategy = GenerationType.AUTO, generator = "valueTypeGen")
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "typeName", "id", "version");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("logger", "typeName", "id",
+            "version");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new ValueType().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countValueTypes() {
+    public static long countValueTypes() {
         return entityManager().createQuery("SELECT COUNT(o) FROM ValueType o", Long.class).getSingleResult();
     }
 
-	public static List<ValueType> findAllValueTypes() {
+    public static List<ValueType> findAllValueTypes() {
         return entityManager().createQuery("SELECT o FROM ValueType o", ValueType.class).getResultList();
     }
 
-	public static List<ValueType> findAllValueTypes(String sortFieldName, String sortOrder) {
+    public static List<ValueType> findAllValueTypes(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM ValueType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -109,16 +112,19 @@ public static List<ValueType> findAllValueTypes(String sortFieldName, String sor
         return entityManager().createQuery(jpaQuery, ValueType.class).getResultList();
     }
 
-	public static ValueType findValueType(Long id) {
-        if (id == null) return null;
+    public static ValueType findValueType(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(ValueType.class, id);
     }
 
-	public static List<ValueType> findValueTypeEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM ValueType o", ValueType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<ValueType> findValueTypeEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM ValueType o", ValueType.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<ValueType> findValueTypeEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<ValueType> findValueTypeEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM ValueType o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -126,18 +132,21 @@ public static List<ValueType> findValueTypeEntries(int firstResult, int maxResul
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, ValueType.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, ValueType.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -146,48 +155,56 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public ValueType merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         ValueType merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static Long countFindValueTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static Long countFindValueTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = ValueType.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM ValueType AS o WHERE o.typeName = :typeName", Long.class);
         q.setParameter("typeName", typeName);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<ValueType> findValueTypesByTypeNameEquals(String typeName) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static TypedQuery<ValueType> findValueTypesByTypeNameEquals(String typeName) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = ValueType.entityManager();
-        TypedQuery<ValueType> q = em.createQuery("SELECT o FROM ValueType AS o WHERE o.typeName = :typeName", ValueType.class);
+        TypedQuery<ValueType> q = em.createQuery("SELECT o FROM ValueType AS o WHERE o.typeName = :typeName",
+                ValueType.class);
         q.setParameter("typeName", typeName);
         return q;
     }
 
-	public static TypedQuery<ValueType> findValueTypesByTypeNameEquals(String typeName, String sortFieldName, String sortOrder) {
-        if (typeName == null || typeName.length() == 0) throw new IllegalArgumentException("The typeName argument is required");
+    public static TypedQuery<ValueType> findValueTypesByTypeNameEquals(String typeName, String sortFieldName,
+            String sortOrder) {
+        if (typeName == null || typeName.length() == 0)
+            throw new IllegalArgumentException("The typeName argument is required");
         EntityManager em = ValueType.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM ValueType AS o WHERE o.typeName = :typeName");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -201,41 +218,41 @@ public static TypedQuery<ValueType> findValueTypesByTypeNameEquals(String typeNa
         return q;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ValueType fromJsonToValueType(String json) {
+    public static ValueType fromJsonToValueType(String json) {
         return new JSONDeserializer<ValueType>()
-        .use(null, ValueType.class).deserialize(json);
+                .use(null, ValueType.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ValueType> collection) {
+    public static String toJsonArray(Collection<ValueType> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ValueType> collection, String[] fields) {
+    public static String toJsonArray(Collection<ValueType> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ValueType> fromJsonArrayToValueTypes(String json) {
+    public static Collection<ValueType> fromJsonArrayToValueTypes(String json) {
         return new JSONDeserializer<List<ValueType>>()
-        .use("values", ValueType.class).deserialize(json);
+                .use("values", ValueType.class).deserialize(json);
     }
 
-	public String getTypeName() {
+    public String getTypeName() {
         return this.typeName;
     }
 
-	public void setTypeName(String typeName) {
+    public void setTypeName(String typeName) {
         this.typeName = typeName;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/domain/Vendor.java b/src/main/java/com/labsynch/labseer/domain/Vendor.java
index 7cdc0552e..5ca9ac592 100755
--- a/src/main/java/com/labsynch/labseer/domain/Vendor.java
+++ b/src/main/java/com/labsynch/labseer/domain/Vendor.java
@@ -33,101 +33,105 @@ public class Vendor {
     @Size(max = 255)
     private String code;
 
-    
     public static TypedQuery<Vendor> findVendorsBySearchTerm(String searchTerm) {
-        if (searchTerm == null || searchTerm.length() == 0) throw new IllegalArgumentException("The searchTerm argument is required");
+        if (searchTerm == null || searchTerm.length() == 0)
+            throw new IllegalArgumentException("The searchTerm argument is required");
         searchTerm = searchTerm.replace('*', '%');
         if (searchTerm.charAt(0) != '%') {
-        	searchTerm = "%" + searchTerm;
+            searchTerm = "%" + searchTerm;
         }
         if (searchTerm.charAt(searchTerm.length() - 1) != '%') {
-        	searchTerm = searchTerm + "%";
+            searchTerm = searchTerm + "%";
         }
         EntityManager em = Vendor.entityManager();
-        TypedQuery<Vendor> q = em.createQuery("SELECT DISTINCT o FROM Vendor AS o WHERE (LOWER(o.code) LIKE LOWER(:searchTerm) OR LOWER(o.name) LIKE LOWER(:searchTerm))", Vendor.class);
+        TypedQuery<Vendor> q = em.createQuery(
+                "SELECT DISTINCT o FROM Vendor AS o WHERE (LOWER(o.code) LIKE LOWER(:searchTerm) OR LOWER(o.name) LIKE LOWER(:searchTerm))",
+                Vendor.class);
         q.setParameter("searchTerm", searchTerm);
         return q;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static Vendor fromJsonToVendor(String json) {
+    public static Vendor fromJsonToVendor(String json) {
         return new JSONDeserializer<Vendor>()
-        .use(null, Vendor.class).deserialize(json);
+                .use(null, Vendor.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<Vendor> collection) {
+    public static String toJsonArray(Collection<Vendor> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<Vendor> collection, String[] fields) {
+    public static String toJsonArray(Collection<Vendor> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<Vendor> fromJsonArrayToVendors(String json) {
+    public static Collection<Vendor> fromJsonArrayToVendors(String json) {
         return new JSONDeserializer<List<Vendor>>()
-        .use("values", Vendor.class).deserialize(json);
+                .use("values", Vendor.class).deserialize(json);
     }
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "code");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new Vendor().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countVendors() {
+    public static long countVendors() {
         return entityManager().createQuery("SELECT COUNT(o) FROM Vendor o", Long.class).getSingleResult();
     }
 
-	public static List<Vendor> findAllVendors() {
+    public static List<Vendor> findAllVendors() {
         return entityManager().createQuery("SELECT o FROM Vendor o", Vendor.class).getResultList();
     }
 
-	public static List<Vendor> findAllVendors(String sortFieldName, String sortOrder) {
+    public static List<Vendor> findAllVendors(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM Vendor o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -138,16 +142,19 @@ public static List<Vendor> findAllVendors(String sortFieldName, String sortOrder
         return entityManager().createQuery(jpaQuery, Vendor.class).getResultList();
     }
 
-	public static Vendor findVendor(Long id) {
-        if (id == null) return null;
+    public static Vendor findVendor(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(Vendor.class, id);
     }
 
-	public static List<Vendor> findVendorEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM Vendor o", Vendor.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<Vendor> findVendorEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM Vendor o", Vendor.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<Vendor> findVendorEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<Vendor> findVendorEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM Vendor o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -155,18 +162,21 @@ public static List<Vendor> findVendorEntries(int firstResult, int maxResults, St
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, Vendor.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, Vendor.class).setFirstResult(firstResult).setMaxResults(maxResults)
+                .getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -175,52 +185,57 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public Vendor merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         Vendor merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String getName() {
+    public String getName() {
         return this.name;
     }
 
-	public void setName(String name) {
+    public void setName(String name) {
         this.name = name;
     }
 
-	public String getCode() {
+    public String getCode() {
         return this.code;
     }
 
-	public void setCode(String code) {
+    public void setCode(String code) {
         this.code = code;
     }
 
-	public static Long countFindVendorsByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static Long countFindVendorsByCodeEquals(String code) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = Vendor.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Vendor AS o WHERE o.code = :code", Long.class);
         q.setParameter("code", code);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindVendorsByCodeLike(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static Long countFindVendorsByCodeLike(String code) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         code = code.replace('*', '%');
         if (code.charAt(0) != '%') {
             code = "%" + code;
@@ -229,21 +244,24 @@ public static Long countFindVendorsByCodeLike(String code) {
             code = code + "%";
         }
         EntityManager em = Vendor.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Vendor AS o WHERE LOWER(o.code) LIKE LOWER(:code)", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Vendor AS o WHERE LOWER(o.code) LIKE LOWER(:code)",
+                Long.class);
         q.setParameter("code", code);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindVendorsByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static Long countFindVendorsByNameEquals(String name) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = Vendor.entityManager();
         TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Vendor AS o WHERE o.name = :name", Long.class);
         q.setParameter("name", name);
         return ((Long) q.getSingleResult());
     }
 
-	public static Long countFindVendorsByNameLike(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static Long countFindVendorsByNameLike(String name) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         name = name.replace('*', '%');
         if (name.charAt(0) != '%') {
             name = "%" + name;
@@ -252,21 +270,24 @@ public static Long countFindVendorsByNameLike(String name) {
             name = name + "%";
         }
         EntityManager em = Vendor.entityManager();
-        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Vendor AS o WHERE LOWER(o.name) LIKE LOWER(:name)", Long.class);
+        TypedQuery q = em.createQuery("SELECT COUNT(o) FROM Vendor AS o WHERE LOWER(o.name) LIKE LOWER(:name)",
+                Long.class);
         q.setParameter("name", name);
         return ((Long) q.getSingleResult());
     }
 
-	public static TypedQuery<Vendor> findVendorsByCodeEquals(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static TypedQuery<Vendor> findVendorsByCodeEquals(String code) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = Vendor.entityManager();
         TypedQuery<Vendor> q = em.createQuery("SELECT o FROM Vendor AS o WHERE o.code = :code", Vendor.class);
         q.setParameter("code", code);
         return q;
     }
 
-	public static TypedQuery<Vendor> findVendorsByCodeEquals(String code, String sortFieldName, String sortOrder) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static TypedQuery<Vendor> findVendorsByCodeEquals(String code, String sortFieldName, String sortOrder) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         EntityManager em = Vendor.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Vendor AS o WHERE o.code = :code");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -280,8 +301,9 @@ public static TypedQuery<Vendor> findVendorsByCodeEquals(String code, String sor
         return q;
     }
 
-	public static TypedQuery<Vendor> findVendorsByCodeLike(String code) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static TypedQuery<Vendor> findVendorsByCodeLike(String code) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         code = code.replace('*', '%');
         if (code.charAt(0) != '%') {
             code = "%" + code;
@@ -290,13 +312,15 @@ public static TypedQuery<Vendor> findVendorsByCodeLike(String code) {
             code = code + "%";
         }
         EntityManager em = Vendor.entityManager();
-        TypedQuery<Vendor> q = em.createQuery("SELECT o FROM Vendor AS o WHERE LOWER(o.code) LIKE LOWER(:code)", Vendor.class);
+        TypedQuery<Vendor> q = em.createQuery("SELECT o FROM Vendor AS o WHERE LOWER(o.code) LIKE LOWER(:code)",
+                Vendor.class);
         q.setParameter("code", code);
         return q;
     }
 
-	public static TypedQuery<Vendor> findVendorsByCodeLike(String code, String sortFieldName, String sortOrder) {
-        if (code == null || code.length() == 0) throw new IllegalArgumentException("The code argument is required");
+    public static TypedQuery<Vendor> findVendorsByCodeLike(String code, String sortFieldName, String sortOrder) {
+        if (code == null || code.length() == 0)
+            throw new IllegalArgumentException("The code argument is required");
         code = code.replace('*', '%');
         if (code.charAt(0) != '%') {
             code = "%" + code;
@@ -305,7 +329,8 @@ public static TypedQuery<Vendor> findVendorsByCodeLike(String code, String sortF
             code = code + "%";
         }
         EntityManager em = Vendor.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Vendor AS o WHERE LOWER(o.code) LIKE LOWER(:code)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Vendor AS o WHERE LOWER(o.code) LIKE LOWER(:code)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
@@ -317,16 +342,18 @@ public static TypedQuery<Vendor> findVendorsByCodeLike(String code, String sortF
         return q;
     }
 
-	public static TypedQuery<Vendor> findVendorsByNameEquals(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<Vendor> findVendorsByNameEquals(String name) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = Vendor.entityManager();
         TypedQuery<Vendor> q = em.createQuery("SELECT o FROM Vendor AS o WHERE o.name = :name", Vendor.class);
         q.setParameter("name", name);
         return q;
     }
 
-	public static TypedQuery<Vendor> findVendorsByNameEquals(String name, String sortFieldName, String sortOrder) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<Vendor> findVendorsByNameEquals(String name, String sortFieldName, String sortOrder) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         EntityManager em = Vendor.entityManager();
         StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Vendor AS o WHERE o.name = :name");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
@@ -340,8 +367,9 @@ public static TypedQuery<Vendor> findVendorsByNameEquals(String name, String sor
         return q;
     }
 
-	public static TypedQuery<Vendor> findVendorsByNameLike(String name) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<Vendor> findVendorsByNameLike(String name) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         name = name.replace('*', '%');
         if (name.charAt(0) != '%') {
             name = "%" + name;
@@ -350,13 +378,15 @@ public static TypedQuery<Vendor> findVendorsByNameLike(String name) {
             name = name + "%";
         }
         EntityManager em = Vendor.entityManager();
-        TypedQuery<Vendor> q = em.createQuery("SELECT o FROM Vendor AS o WHERE LOWER(o.name) LIKE LOWER(:name)", Vendor.class);
+        TypedQuery<Vendor> q = em.createQuery("SELECT o FROM Vendor AS o WHERE LOWER(o.name) LIKE LOWER(:name)",
+                Vendor.class);
         q.setParameter("name", name);
         return q;
     }
 
-	public static TypedQuery<Vendor> findVendorsByNameLike(String name, String sortFieldName, String sortOrder) {
-        if (name == null || name.length() == 0) throw new IllegalArgumentException("The name argument is required");
+    public static TypedQuery<Vendor> findVendorsByNameLike(String name, String sortFieldName, String sortOrder) {
+        if (name == null || name.length() == 0)
+            throw new IllegalArgumentException("The name argument is required");
         name = name.replace('*', '%');
         if (name.charAt(0) != '%') {
             name = "%" + name;
@@ -365,7 +395,8 @@ public static TypedQuery<Vendor> findVendorsByNameLike(String name, String sortF
             name = name + "%";
         }
         EntityManager em = Vendor.entityManager();
-        StringBuilder queryBuilder = new StringBuilder("SELECT o FROM Vendor AS o WHERE LOWER(o.name) LIKE LOWER(:name)");
+        StringBuilder queryBuilder = new StringBuilder(
+                "SELECT o FROM Vendor AS o WHERE LOWER(o.name) LIKE LOWER(:name)");
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             queryBuilder.append(" ORDER BY ").append(sortFieldName);
             if ("ASC".equalsIgnoreCase(sortOrder) || "DESC".equalsIgnoreCase(sortOrder)) {
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCodeDTO.java
index 45896b4fd..63050e65c 100644
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCodeDTO.java
@@ -9,65 +9,61 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class AnalysisGroupCodeDTO {
-	
-	private String analysisGroupCode;
-	private Collection<ExperimentCodeDTO> experimentCodes;
-	
-	public AnalysisGroupCodeDTO(){
-	}
-	
-
-	public String toString() {
+
+    private String analysisGroupCode;
+    private Collection<ExperimentCodeDTO> experimentCodes;
+
+    public AnalysisGroupCodeDTO() {
+    }
+
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getAnalysisGroupCode() {
+    public String getAnalysisGroupCode() {
         return this.analysisGroupCode;
     }
 
-	public void setAnalysisGroupCode(String analysisGroupCode) {
+    public void setAnalysisGroupCode(String analysisGroupCode) {
         this.analysisGroupCode = analysisGroupCode;
     }
 
-	public Collection<ExperimentCodeDTO> getExperimentCodes() {
+    public Collection<ExperimentCodeDTO> getExperimentCodes() {
         return this.experimentCodes;
     }
 
-	public void setExperimentCodes(Collection<ExperimentCodeDTO> experimentCodes) {
+    public void setExperimentCodes(Collection<ExperimentCodeDTO> experimentCodes) {
         this.experimentCodes = experimentCodes;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static AnalysisGroupCodeDTO fromJsonToAnalysisGroupCodeDTO(String json) {
+    public static AnalysisGroupCodeDTO fromJsonToAnalysisGroupCodeDTO(String json) {
         return new JSONDeserializer<AnalysisGroupCodeDTO>()
-        .use(null, AnalysisGroupCodeDTO.class).deserialize(json);
+                .use(null, AnalysisGroupCodeDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<AnalysisGroupCodeDTO> collection) {
+    public static String toJsonArray(Collection<AnalysisGroupCodeDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<AnalysisGroupCodeDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<AnalysisGroupCodeDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<AnalysisGroupCodeDTO> fromJsonArrayToAnalysisGroupCoes(String json) {
+    public static Collection<AnalysisGroupCodeDTO> fromJsonArrayToAnalysisGroupCoes(String json) {
         return new JSONDeserializer<List<AnalysisGroupCodeDTO>>()
-        .use("values", AnalysisGroupCodeDTO.class).deserialize(json);
+                .use("values", AnalysisGroupCodeDTO.class).deserialize(json);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCsvDTO.java b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCsvDTO.java
index a841d2be6..67aa8629b 100644
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCsvDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupCsvDTO.java
@@ -18,37 +18,40 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class AnalysisGroupCsvDTO {
 
-	
 	private static final Logger logger = LoggerFactory.getLogger(AnalysisGroupCsvDTO.class);
 
-	public AnalysisGroupCsvDTO(){
-		//empty constructor
+	public AnalysisGroupCsvDTO() {
+		// empty constructor
 	}
 
-	//	valueType	valueKind	numericValue	stringValue	dateValue	clobValue	urlValue	fileValue	codeValue	valueUnit	valueOperator	publicData	stateType	stateKind	stateID	analysisGroupID	experimentID	experimentVersion	lsTransaction	recordedBy	codeName
-	//	stringValue	Rendering Hint	NULL	4 parameter D-R	NULL	NULL	NULL	NULL	NULL	NULL	NULL	FALSE	data	results	1	1	1007	1	86	smeyer	AG-1
-	//	stringValue	Rendering Hint	NULL	4 parameter D-R	NULL	NULL	NULL	NULL	NULL	NULL	NULL	FALSE	data	results	5	2	1007	1	86	smeyer	AG-2
-	//	valueType,valueKind,numericValue,stringValue,dateValue,clobValue,urlValue,fileValue,codeType,codeKind,codeValue,unitKind,unitType,operatorKind,operatorType,publicData,stateType,stateKind,tempStateId,stateId,id,tempId,parentId,tempParentId,lsTransaction,recordedBy,codeName,lsType,lsKind
+	// valueType valueKind numericValue stringValue dateValue clobValue urlValue
+	// fileValue codeValue valueUnit valueOperator publicData stateType stateKind
+	// stateID analysisGroupID experimentID experimentVersion lsTransaction
+	// recordedBy codeName
+	// stringValue Rendering Hint NULL 4 parameter D-R NULL NULL NULL NULL NULL NULL
+	// NULL FALSE data results 1 1 1007 1 86 smeyer AG-1
+	// stringValue Rendering Hint NULL 4 parameter D-R NULL NULL NULL NULL NULL NULL
+	// NULL FALSE data results 5 2 1007 1 86 smeyer AG-2
+	// valueType,valueKind,numericValue,stringValue,dateValue,clobValue,urlValue,fileValue,codeType,codeKind,codeValue,unitKind,unitType,operatorKind,operatorType,publicData,stateType,stateKind,tempStateId,stateId,id,tempId,parentId,tempParentId,lsTransaction,recordedBy,codeName,lsType,lsKind
 
 	private Long experimentID;
 	private String experimentCodeName;
 	private Integer experimentVersion;
 
-	private String analysisGroupID;	
-	private Long id;	
+	private String analysisGroupID;
+	private Long id;
 	private Integer version;
 	private String lsType;
 	private String lsKind;
 	private String codeName;
 
-	private Long stateID;	
+	private Long stateID;
 	private String stateType;
 	private String stateKind;
 
-	private Long valueId;	
+	private Long valueId;
 	private String valueType;
 	private String valueKind;
 	private String codeOrigin;
@@ -79,23 +82,23 @@ public AnalysisGroupCsvDTO(){
 	private boolean publicData;
 
 	public void setLsTransaction(String lsTransaction) {
-		if (lsTransaction.equalsIgnoreCase("NULL")){
+		if (lsTransaction.equalsIgnoreCase("NULL")) {
 			this.lsTransaction = null;
 		} else {
-		this.lsTransaction = Long.valueOf(lsTransaction);
-	}
+			this.lsTransaction = Long.valueOf(lsTransaction);
 		}
+	}
 
 	public void setExperimentVersion(String experimentVersion) {
-		if (experimentVersion.equalsIgnoreCase("NULL")){
+		if (experimentVersion.equalsIgnoreCase("NULL")) {
 			this.experimentVersion = null;
 		} else {
-		this.experimentVersion = Integer.valueOf(experimentVersion);
+			this.experimentVersion = Integer.valueOf(experimentVersion);
 		}
 	}
 
 	public void setExperimentID(String experimentID) {
-		if (experimentID.equalsIgnoreCase("NULL")){
+		if (experimentID.equalsIgnoreCase("NULL")) {
 			this.experimentID = null;
 		} else {
 			this.experimentID = Long.valueOf(experimentID);
@@ -107,7 +110,7 @@ public void setStateID(String stateID) {
 	}
 
 	public void setPublicData(String publicData) {
-		if (publicData.equalsIgnoreCase("FALSE")){
+		if (publicData.equalsIgnoreCase("FALSE")) {
 			this.publicData = false;
 		} else {
 			this.publicData = true;
@@ -115,7 +118,7 @@ public void setPublicData(String publicData) {
 	}
 
 	public void setDateValue(String dateValue) throws ParseException {
-		if (dateValue.equalsIgnoreCase("NULL")){
+		if (dateValue.equalsIgnoreCase("NULL")) {
 			this.dateValue = null;
 		} else {
 			DateFormat df = new SimpleDateFormat("mm/dd/yyyy");
@@ -124,17 +127,16 @@ public void setDateValue(String dateValue) throws ParseException {
 	}
 
 	public void setNumericValue(String numericValue) {
-		if (numericValue.equalsIgnoreCase("NULL")){
+		if (numericValue.equalsIgnoreCase("NULL")) {
 			this.numericValue = null;
 		} else {
 			this.numericValue = new BigDecimal(numericValue);
 		}
 	}
 
-
-	public static String[] getColumns(){
+	public static String[] getColumns() {
 		String[] headerColumns = new String[] {
-				"id", 
+				"id",
 				"protocolId",
 				"experimentId",
 				"experimentCodeName",
@@ -142,14 +144,14 @@ public static String[] getColumns(){
 				"lsType",
 				"lsKind",
 				"testedLot",
-				"result"};
+				"result" };
 
 		return headerColumns;
 
 	}
 
 	public static CellProcessor[] getProcessors() {
-		final CellProcessor[] processors = new CellProcessor[] { 
+		final CellProcessor[] processors = new CellProcessor[] {
 				new Optional(),
 				new Optional(),
 				new Optional(),
@@ -178,369 +180,365 @@ public static CellProcessor[] getProcessors() {
 		return processors;
 	}
 
-
-
 	public Long getExperimentID() {
-        return this.experimentID;
-    }
+		return this.experimentID;
+	}
 
 	public void setExperimentID(Long experimentID) {
-        this.experimentID = experimentID;
-    }
+		this.experimentID = experimentID;
+	}
 
 	public String getExperimentCodeName() {
-        return this.experimentCodeName;
-    }
+		return this.experimentCodeName;
+	}
 
 	public void setExperimentCodeName(String experimentCodeName) {
-        this.experimentCodeName = experimentCodeName;
-    }
+		this.experimentCodeName = experimentCodeName;
+	}
 
 	public Integer getExperimentVersion() {
-        return this.experimentVersion;
-    }
+		return this.experimentVersion;
+	}
 
 	public void setExperimentVersion(Integer experimentVersion) {
-        this.experimentVersion = experimentVersion;
-    }
+		this.experimentVersion = experimentVersion;
+	}
 
 	public String getAnalysisGroupID() {
-        return this.analysisGroupID;
-    }
+		return this.analysisGroupID;
+	}
 
 	public void setAnalysisGroupID(String analysisGroupID) {
-        this.analysisGroupID = analysisGroupID;
-    }
+		this.analysisGroupID = analysisGroupID;
+	}
 
 	public Long getId() {
-        return this.id;
-    }
+		return this.id;
+	}
 
 	public void setId(Long id) {
-        this.id = id;
-    }
+		this.id = id;
+	}
 
 	public Integer getVersion() {
-        return this.version;
-    }
+		return this.version;
+	}
 
 	public void setVersion(Integer version) {
-        this.version = version;
-    }
+		this.version = version;
+	}
 
 	public String getLsType() {
-        return this.lsType;
-    }
+		return this.lsType;
+	}
 
 	public void setLsType(String lsType) {
-        this.lsType = lsType;
-    }
+		this.lsType = lsType;
+	}
 
 	public String getLsKind() {
-        return this.lsKind;
-    }
+		return this.lsKind;
+	}
 
 	public void setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
+		this.lsKind = lsKind;
+	}
 
 	public String getCodeName() {
-        return this.codeName;
-    }
+		return this.codeName;
+	}
 
 	public void setCodeName(String codeName) {
-        this.codeName = codeName;
-    }
+		this.codeName = codeName;
+	}
 
 	public Long getStateID() {
-        return this.stateID;
-    }
+		return this.stateID;
+	}
 
 	public void setStateID(Long stateID) {
-        this.stateID = stateID;
-    }
+		this.stateID = stateID;
+	}
 
 	public String getStateType() {
-        return this.stateType;
-    }
+		return this.stateType;
+	}
 
 	public void setStateType(String stateType) {
-        this.stateType = stateType;
-    }
+		this.stateType = stateType;
+	}
 
 	public String getStateKind() {
-        return this.stateKind;
-    }
+		return this.stateKind;
+	}
 
 	public void setStateKind(String stateKind) {
-        this.stateKind = stateKind;
-    }
+		this.stateKind = stateKind;
+	}
 
 	public Long getValueId() {
-        return this.valueId;
-    }
+		return this.valueId;
+	}
 
 	public void setValueId(Long valueId) {
-        this.valueId = valueId;
-    }
+		this.valueId = valueId;
+	}
 
 	public String getValueType() {
-        return this.valueType;
-    }
+		return this.valueType;
+	}
 
 	public void setValueType(String valueType) {
-        this.valueType = valueType;
-    }
+		this.valueType = valueType;
+	}
 
 	public String getValueKind() {
-        return this.valueKind;
-    }
+		return this.valueKind;
+	}
 
 	public void setValueKind(String valueKind) {
-        this.valueKind = valueKind;
-    }
+		this.valueKind = valueKind;
+	}
 
 	public String getCodeOrigin() {
-        return this.codeOrigin;
-    }
+		return this.codeOrigin;
+	}
 
 	public void setCodeOrigin(String codeOrigin) {
-        this.codeOrigin = codeOrigin;
-    }
+		this.codeOrigin = codeOrigin;
+	}
 
 	public String getCodeType() {
-        return this.codeType;
-    }
+		return this.codeType;
+	}
 
 	public void setCodeType(String codeType) {
-        this.codeType = codeType;
-    }
+		this.codeType = codeType;
+	}
 
 	public String getCodeKind() {
-        return this.codeKind;
-    }
+		return this.codeKind;
+	}
 
 	public void setCodeKind(String codeKind) {
-        this.codeKind = codeKind;
-    }
+		this.codeKind = codeKind;
+	}
 
 	public String getStringValue() {
-        return this.stringValue;
-    }
+		return this.stringValue;
+	}
 
 	public void setStringValue(String stringValue) {
-        this.stringValue = stringValue;
-    }
+		this.stringValue = stringValue;
+	}
 
 	public String getCodeValue() {
-        return this.codeValue;
-    }
+		return this.codeValue;
+	}
 
 	public void setCodeValue(String codeValue) {
-        this.codeValue = codeValue;
-    }
+		this.codeValue = codeValue;
+	}
 
 	public String getFileValue() {
-        return this.fileValue;
-    }
+		return this.fileValue;
+	}
 
 	public void setFileValue(String fileValue) {
-        this.fileValue = fileValue;
-    }
+		this.fileValue = fileValue;
+	}
 
 	public String getUrlValue() {
-        return this.urlValue;
-    }
+		return this.urlValue;
+	}
 
 	public void setUrlValue(String urlValue) {
-        this.urlValue = urlValue;
-    }
+		this.urlValue = urlValue;
+	}
 
 	public Date getDateValue() {
-        return this.dateValue;
-    }
+		return this.dateValue;
+	}
 
 	public void setDateValue(Date dateValue) {
-        this.dateValue = dateValue;
-    }
+		this.dateValue = dateValue;
+	}
 
 	public String getClobValue() {
-        return this.clobValue;
-    }
+		return this.clobValue;
+	}
 
 	public void setClobValue(String clobValue) {
-        this.clobValue = clobValue;
-    }
+		this.clobValue = clobValue;
+	}
 
 	public String getValueOperator() {
-        return this.valueOperator;
-    }
+		return this.valueOperator;
+	}
 
 	public void setValueOperator(String valueOperator) {
-        this.valueOperator = valueOperator;
-    }
+		this.valueOperator = valueOperator;
+	}
 
 	public BigDecimal getNumericValue() {
-        return this.numericValue;
-    }
+		return this.numericValue;
+	}
 
 	public void setNumericValue(BigDecimal numericValue) {
-        this.numericValue = numericValue;
-    }
+		this.numericValue = numericValue;
+	}
 
 	public Integer getSigFigs() {
-        return this.sigFigs;
-    }
+		return this.sigFigs;
+	}
 
 	public void setSigFigs(Integer sigFigs) {
-        this.sigFigs = sigFigs;
-    }
+		this.sigFigs = sigFigs;
+	}
 
 	public BigDecimal getUncertainty() {
-        return this.uncertainty;
-    }
+		return this.uncertainty;
+	}
 
 	public void setUncertainty(BigDecimal uncertainty) {
-        this.uncertainty = uncertainty;
-    }
+		this.uncertainty = uncertainty;
+	}
 
 	public Integer getNumberOfReplicates() {
-        return this.numberOfReplicates;
-    }
+		return this.numberOfReplicates;
+	}
 
 	public void setNumberOfReplicates(Integer numberOfReplicates) {
-        this.numberOfReplicates = numberOfReplicates;
-    }
+		this.numberOfReplicates = numberOfReplicates;
+	}
 
 	public String getUncertaintyType() {
-        return this.uncertaintyType;
-    }
+		return this.uncertaintyType;
+	}
 
 	public void setUncertaintyType(String uncertaintyType) {
-        this.uncertaintyType = uncertaintyType;
-    }
+		this.uncertaintyType = uncertaintyType;
+	}
 
 	public String getValueUnit() {
-        return this.valueUnit;
-    }
+		return this.valueUnit;
+	}
 
 	public void setValueUnit(String valueUnit) {
-        this.valueUnit = valueUnit;
-    }
+		this.valueUnit = valueUnit;
+	}
 
 	public Double getConcentration() {
-        return this.concentration;
-    }
+		return this.concentration;
+	}
 
 	public void setConcentration(Double concentration) {
-        this.concentration = concentration;
-    }
+		this.concentration = concentration;
+	}
 
 	public String getConcUnit() {
-        return this.concUnit;
-    }
+		return this.concUnit;
+	}
 
 	public void setConcUnit(String concUnit) {
-        this.concUnit = concUnit;
-    }
+		this.concUnit = concUnit;
+	}
 
 	public String getComments() {
-        return this.comments;
-    }
+		return this.comments;
+	}
 
 	public void setComments(String comments) {
-        this.comments = comments;
-    }
+		this.comments = comments;
+	}
 
 	public boolean isIgnored() {
-        return this.ignored;
-    }
+		return this.ignored;
+	}
 
 	public void setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
+		this.ignored = ignored;
+	}
 
 	public Long getLsTransaction() {
-        return this.lsTransaction;
-    }
+		return this.lsTransaction;
+	}
 
 	public void setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
+		this.lsTransaction = lsTransaction;
+	}
 
 	public Date getRecordedDate() {
-        return this.recordedDate;
-    }
+		return this.recordedDate;
+	}
 
 	public void setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
+		this.recordedDate = recordedDate;
+	}
 
 	public String getRecordedBy() {
-        return this.recordedBy;
-    }
+		return this.recordedBy;
+	}
 
 	public void setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
+		this.recordedBy = recordedBy;
+	}
 
 	public Date getModifiedDate() {
-        return this.modifiedDate;
-    }
+		return this.modifiedDate;
+	}
 
 	public void setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
+		this.modifiedDate = modifiedDate;
+	}
 
 	public String getModifiedBy() {
-        return this.modifiedBy;
-    }
+		return this.modifiedBy;
+	}
 
 	public void setModifiedBy(String modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
+		this.modifiedBy = modifiedBy;
+	}
 
 	public boolean isPublicData() {
-        return this.publicData;
-    }
+		return this.publicData;
+	}
 
 	public void setPublicData(boolean publicData) {
-        this.publicData = publicData;
-    }
+		this.publicData = publicData;
+	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 
 	public String toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(this);
+	}
 
 	public String toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(this);
+	}
 
 	public static AnalysisGroupCsvDTO fromJsonToAnalysisGroupCsvDTO(String json) {
-        return new JSONDeserializer<AnalysisGroupCsvDTO>()
-        .use(null, AnalysisGroupCsvDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<AnalysisGroupCsvDTO>()
+				.use(null, AnalysisGroupCsvDTO.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<AnalysisGroupCsvDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<AnalysisGroupCsvDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<AnalysisGroupCsvDTO> fromJsonArrayToAnalysisGroes(String json) {
-        return new JSONDeserializer<List<AnalysisGroupCsvDTO>>()
-        .use("values", AnalysisGroupCsvDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<AnalysisGroupCsvDTO>>()
+				.use("values", AnalysisGroupCsvDTO.class).deserialize(json);
+	}
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupStatePathDTO.java b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupStatePathDTO.java
index 12451d046..c994b0aa8 100644
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupStatePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupStatePathDTO.java
@@ -12,73 +12,72 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class AnalysisGroupStatePathDTO {
 
-	public AnalysisGroupStatePathDTO() {
-	}
+    public AnalysisGroupStatePathDTO() {
+    }
+
+    private String idOrCodeName;
+
+    private String stateType;
 
-	private String idOrCodeName;
+    private String stateKind;
 
-	private String stateType;
-	
-	private String stateKind;
-	
-	private Collection<AnalysisGroupState> states;
-	
-	public String toJson() {
-        return new JSONSerializer().include("states.lsValues").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+    private Collection<AnalysisGroupState> states;
+
+    public String toJson() {
+        return new JSONSerializer().include("states.lsValues").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
-	
-	public static String toJsonArray(Collection<AnalysisGroupStatePathDTO> collection) {
-        return new JSONSerializer().include("states.lsValues").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
+
+    public static String toJsonArray(Collection<AnalysisGroupStatePathDTO> collection) {
+        return new JSONSerializer().include("states.lsValues").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
-	public static AnalysisGroupStatePathDTO fromJsonToAnalysisGroupStatePathDTO(String json) {
+    public static AnalysisGroupStatePathDTO fromJsonToAnalysisGroupStatePathDTO(String json) {
         return new JSONDeserializer<AnalysisGroupStatePathDTO>()
-        .use(null, AnalysisGroupStatePathDTO.class).deserialize(json);
+                .use(null, AnalysisGroupStatePathDTO.class).deserialize(json);
     }
 
-	public static Collection<AnalysisGroupStatePathDTO> fromJsonArrayToAnalysisGroes(String json) {
+    public static Collection<AnalysisGroupStatePathDTO> fromJsonArrayToAnalysisGroes(String json) {
         return new JSONDeserializer<List<AnalysisGroupStatePathDTO>>()
-        .use("values", AnalysisGroupStatePathDTO.class).deserialize(json);
+                .use("values", AnalysisGroupStatePathDTO.class).deserialize(json);
     }
 
-	public String getIdOrCodeName() {
+    public String getIdOrCodeName() {
         return this.idOrCodeName;
     }
 
-	public void setIdOrCodeName(String idOrCodeName) {
+    public void setIdOrCodeName(String idOrCodeName) {
         this.idOrCodeName = idOrCodeName;
     }
 
-	public String getStateType() {
+    public String getStateType() {
         return this.stateType;
     }
 
-	public void setStateType(String stateType) {
+    public void setStateType(String stateType) {
         this.stateType = stateType;
     }
 
-	public String getStateKind() {
+    public String getStateKind() {
         return this.stateKind;
     }
 
-	public void setStateKind(String stateKind) {
+    public void setStateKind(String stateKind) {
         this.stateKind = stateKind;
     }
 
-	public Collection<AnalysisGroupState> getStates() {
+    public Collection<AnalysisGroupState> getStates() {
         return this.states;
     }
 
-	public void setStates(Collection<AnalysisGroupState> states) {
+    public void setStates(Collection<AnalysisGroupState> states) {
         this.states = states;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueBaseDTO.java b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueBaseDTO.java
index 301c4779b..f1d21d70a 100755
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueBaseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueBaseDTO.java
@@ -13,42 +13,41 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class AnalysisGroupValueBaseDTO {
 
 	private static final Logger logger = LoggerFactory.getLogger(AnalysisGroupValueBaseDTO.class);
 
-	public AnalysisGroupValueBaseDTO(){
-		//empty constructor
+	public AnalysisGroupValueBaseDTO() {
+		// empty constructor
 	}
 
 	public AnalysisGroupValueBaseDTO(
-			Long id, 
+			Long id,
 			Long stateId,
 			String agCodeName,
 			String lsType,
 			String lsKind,
-			 String stringValue,
-			 String codeValue,
-			 String fileValue,
-			 String urlValue,
-			 Date dateValue,
-		     String clobValue,
-			 String operatorType,
-			 String operatorKind,
-			 BigDecimal numericValue,
-			 Integer sigFigs,
-			 BigDecimal uncertainty,
-			 Integer numberOfReplicates,
-			 String uncertaintyType,
-			 String unitType,
-			 String unitKind,
-			 String comments,
-			 boolean ignored,
-			 Long lsTransaction,
-			 boolean publicData
-			
-			){
+			String stringValue,
+			String codeValue,
+			String fileValue,
+			String urlValue,
+			Date dateValue,
+			String clobValue,
+			String operatorType,
+			String operatorKind,
+			BigDecimal numericValue,
+			Integer sigFigs,
+			BigDecimal uncertainty,
+			Integer numberOfReplicates,
+			String uncertaintyType,
+			String unitType,
+			String unitKind,
+			String comments,
+			boolean ignored,
+			Long lsTransaction,
+			boolean publicData
+
+	) {
 
 		this.id = id;
 		this.stateId = stateId;
@@ -57,11 +56,11 @@ public AnalysisGroupValueBaseDTO(
 		this.lsKind = lsKind;
 		this.numericValue = numericValue;
 		this.stringValue = stringValue;
-		this.codeValue = codeValue;		
+		this.codeValue = codeValue;
 		this.fileValue = fileValue;
 		this.urlValue = urlValue;
 		this.dateValue = dateValue;
-	    this.clobValue = clobValue;
+		this.clobValue = clobValue;
 		this.operatorType = operatorType;
 		this.operatorKind = operatorKind;
 		this.sigFigs = sigFigs;
@@ -73,9 +72,9 @@ public AnalysisGroupValueBaseDTO(
 		this.comments = unitKind;
 		this.ignored = ignored;
 		this.lsTransaction = lsTransaction;
-		this.publicData = publicData;	
-		}
-	
+		this.publicData = publicData;
+	}
+
 	private Long id;
 	private Long stateId;
 	private String agCodeName;
@@ -86,7 +85,7 @@ public AnalysisGroupValueBaseDTO(
 	private String fileValue;
 	private String urlValue;
 	private Date dateValue;
-    private String clobValue;
+	private String clobValue;
 	private String operatorType;
 	private String operatorKind;
 	private BigDecimal numericValue;
@@ -100,233 +99,230 @@ public AnalysisGroupValueBaseDTO(
 	private boolean ignored;
 	private Long lsTransaction;
 	private boolean publicData;
-	
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 
 	public String toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(this);
+	}
 
 	public String toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(this);
+	}
 
 	public static AnalysisGroupValueBaseDTO fromJsonToAnalysisGroupValueBaseDTO(String json) {
-        return new JSONDeserializer<AnalysisGroupValueBaseDTO>()
-        .use(null, AnalysisGroupValueBaseDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<AnalysisGroupValueBaseDTO>()
+				.use(null, AnalysisGroupValueBaseDTO.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<AnalysisGroupValueBaseDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<AnalysisGroupValueBaseDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<AnalysisGroupValueBaseDTO> fromJsonArrayToAnalysisGroes(String json) {
-        return new JSONDeserializer<List<AnalysisGroupValueBaseDTO>>()
-        .use("values", AnalysisGroupValueBaseDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<AnalysisGroupValueBaseDTO>>()
+				.use("values", AnalysisGroupValueBaseDTO.class).deserialize(json);
+	}
 
 	public Long getId() {
-        return this.id;
-    }
+		return this.id;
+	}
 
 	public void setId(Long id) {
-        this.id = id;
-    }
+		this.id = id;
+	}
 
 	public Long getStateId() {
-        return this.stateId;
-    }
+		return this.stateId;
+	}
 
 	public void setStateId(Long stateId) {
-        this.stateId = stateId;
-    }
+		this.stateId = stateId;
+	}
 
 	public String getAgCodeName() {
-        return this.agCodeName;
-    }
+		return this.agCodeName;
+	}
 
 	public void setAgCodeName(String agCodeName) {
-        this.agCodeName = agCodeName;
-    }
+		this.agCodeName = agCodeName;
+	}
 
 	public String getLsType() {
-        return this.lsType;
-    }
+		return this.lsType;
+	}
 
 	public void setLsType(String lsType) {
-        this.lsType = lsType;
-    }
+		this.lsType = lsType;
+	}
 
 	public String getLsKind() {
-        return this.lsKind;
-    }
+		return this.lsKind;
+	}
 
 	public void setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
+		this.lsKind = lsKind;
+	}
 
 	public String getStringValue() {
-        return this.stringValue;
-    }
+		return this.stringValue;
+	}
 
 	public void setStringValue(String stringValue) {
-        this.stringValue = stringValue;
-    }
+		this.stringValue = stringValue;
+	}
 
 	public String getCodeValue() {
-        return this.codeValue;
-    }
+		return this.codeValue;
+	}
 
 	public void setCodeValue(String codeValue) {
-        this.codeValue = codeValue;
-    }
+		this.codeValue = codeValue;
+	}
 
 	public String getFileValue() {
-        return this.fileValue;
-    }
+		return this.fileValue;
+	}
 
 	public void setFileValue(String fileValue) {
-        this.fileValue = fileValue;
-    }
+		this.fileValue = fileValue;
+	}
 
 	public String getUrlValue() {
-        return this.urlValue;
-    }
+		return this.urlValue;
+	}
 
 	public void setUrlValue(String urlValue) {
-        this.urlValue = urlValue;
-    }
+		this.urlValue = urlValue;
+	}
 
 	public Date getDateValue() {
-        return this.dateValue;
-    }
+		return this.dateValue;
+	}
 
 	public void setDateValue(Date dateValue) {
-        this.dateValue = dateValue;
-    }
+		this.dateValue = dateValue;
+	}
 
 	public String getClobValue() {
-        return this.clobValue;
-    }
+		return this.clobValue;
+	}
 
 	public void setClobValue(String clobValue) {
-        this.clobValue = clobValue;
-    }
+		this.clobValue = clobValue;
+	}
 
 	public String getOperatorType() {
-        return this.operatorType;
-    }
+		return this.operatorType;
+	}
 
 	public void setOperatorType(String operatorType) {
-        this.operatorType = operatorType;
-    }
+		this.operatorType = operatorType;
+	}
 
 	public String getOperatorKind() {
-        return this.operatorKind;
-    }
+		return this.operatorKind;
+	}
 
 	public void setOperatorKind(String operatorKind) {
-        this.operatorKind = operatorKind;
-    }
+		this.operatorKind = operatorKind;
+	}
 
 	public BigDecimal getNumericValue() {
-        return this.numericValue;
-    }
+		return this.numericValue;
+	}
 
 	public void setNumericValue(BigDecimal numericValue) {
-        this.numericValue = numericValue;
-    }
+		this.numericValue = numericValue;
+	}
 
 	public Integer getSigFigs() {
-        return this.sigFigs;
-    }
+		return this.sigFigs;
+	}
 
 	public void setSigFigs(Integer sigFigs) {
-        this.sigFigs = sigFigs;
-    }
+		this.sigFigs = sigFigs;
+	}
 
 	public BigDecimal getUncertainty() {
-        return this.uncertainty;
-    }
+		return this.uncertainty;
+	}
 
 	public void setUncertainty(BigDecimal uncertainty) {
-        this.uncertainty = uncertainty;
-    }
+		this.uncertainty = uncertainty;
+	}
 
 	public Integer getNumberOfReplicates() {
-        return this.numberOfReplicates;
-    }
+		return this.numberOfReplicates;
+	}
 
 	public void setNumberOfReplicates(Integer numberOfReplicates) {
-        this.numberOfReplicates = numberOfReplicates;
-    }
+		this.numberOfReplicates = numberOfReplicates;
+	}
 
 	public String getUncertaintyType() {
-        return this.uncertaintyType;
-    }
+		return this.uncertaintyType;
+	}
 
 	public void setUncertaintyType(String uncertaintyType) {
-        this.uncertaintyType = uncertaintyType;
-    }
+		this.uncertaintyType = uncertaintyType;
+	}
 
 	public String getUnitType() {
-        return this.unitType;
-    }
+		return this.unitType;
+	}
 
 	public void setUnitType(String unitType) {
-        this.unitType = unitType;
-    }
+		this.unitType = unitType;
+	}
 
 	public String getUnitKind() {
-        return this.unitKind;
-    }
+		return this.unitKind;
+	}
 
 	public void setUnitKind(String unitKind) {
-        this.unitKind = unitKind;
-    }
+		this.unitKind = unitKind;
+	}
 
 	public String getComments() {
-        return this.comments;
-    }
+		return this.comments;
+	}
 
 	public void setComments(String comments) {
-        this.comments = comments;
-    }
+		this.comments = comments;
+	}
 
 	public boolean isIgnored() {
-        return this.ignored;
-    }
+		return this.ignored;
+	}
 
 	public void setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
+		this.ignored = ignored;
+	}
 
 	public Long getLsTransaction() {
-        return this.lsTransaction;
-    }
+		return this.lsTransaction;
+	}
 
 	public void setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
+		this.lsTransaction = lsTransaction;
+	}
 
 	public boolean isPublicData() {
-        return this.publicData;
-    }
+		return this.publicData;
+	}
 
 	public void setPublicData(boolean publicData) {
-        this.publicData = publicData;
-    }
+		this.publicData = publicData;
+	}
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueDTO.java b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueDTO.java
index a2ad5e6dd..b262b8d21 100755
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValueDTO.java
@@ -18,42 +18,45 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class AnalysisGroupValueDTO {
 
 	private static final Logger logger = LoggerFactory.getLogger(AnalysisGroupValueDTO.class);
 
-	public AnalysisGroupValueDTO(){
-		//empty constructor
-	}
-//	String sqlQuery = "select new com.labsynch.labseer.dto.AnalysisGroupValueDTO(agv.id, prot.id as protocolId, protLabel.labelText as protocolName, "
-//			+ "expt.id as experimentId, expt.codeName, el.labelText as prefName, "
-//			+ "ag.id as agId, ags.id as agStateId, "				
-//			+ "agv.lsType as lsType, agv.lsKind as lsKind, "
-//			+ "agv.stringValue as stringValue, agv.numericValue as numericValue, agv.codeValue as codeValue, agv.dateValue as dateValue, agv.fileValue as fileValue, " 
-//			+ "agv2.codeValue AS testedLot "
-//			+ ", agv2.codeValue as geneId  " 
-//			+ ", agv.unitKind as resultUnit "
-//			+ ", agv.operatorKind as operator "
-//			+ ", agv.uncertainty as uncertainty "
-//			+ ", agv.uncertaintyType as uncertaintyUnit "
-//			+ ", agv2.concentration as testedConcentration "
-//			+ ", agv2.concUnit as testedConcentrationUnit "
-//			+ ", agv3.numericValue as testedTime "
-//			+ ", agv3.unitKind as testedTimeUnit "
+	public AnalysisGroupValueDTO() {
+		// empty constructor
+	}
+	// String sqlQuery = "select new
+	// com.labsynch.labseer.dto.AnalysisGroupValueDTO(agv.id, prot.id as protocolId,
+	// protLabel.labelText as protocolName, "
+	// + "expt.id as experimentId, expt.codeName, el.labelText as prefName, "
+	// + "ag.id as agId, ags.id as agStateId, "
+	// + "agv.lsType as lsType, agv.lsKind as lsKind, "
+	// + "agv.stringValue as stringValue, agv.numericValue as numericValue,
+	// agv.codeValue as codeValue, agv.dateValue as dateValue, agv.fileValue as
+	// fileValue, "
+	// + "agv2.codeValue AS testedLot "
+	// + ", agv2.codeValue as geneId "
+	// + ", agv.unitKind as resultUnit "
+	// + ", agv.operatorKind as operator "
+	// + ", agv.uncertainty as uncertainty "
+	// + ", agv.uncertaintyType as uncertaintyUnit "
+	// + ", agv2.concentration as testedConcentration "
+	// + ", agv2.concUnit as testedConcentrationUnit "
+	// + ", agv3.numericValue as testedTime "
+	// + ", agv3.unitKind as testedTimeUnit "
 
 	public AnalysisGroupValueDTO(
 			Long id,
 			Long protocolId,
 			String protocolName,
-			Long experimentId, 
-			String codeName, 
+			Long experimentId,
+			String codeName,
 			String prefName,
 			Long agId,
 			Long agStateId,
-			String lsType, 
+			String lsType,
 			String lsKind,
-			String stringValue, 
+			String stringValue,
 			BigDecimal numericValue,
 			String codeValue,
 			Date dateValue,
@@ -67,15 +70,14 @@ public AnalysisGroupValueDTO(
 			Double testedConcentration,
 			String testedConcentrationUnit,
 			BigDecimal testedTime,
-			String testedTimeUnit
-			){
+			String testedTimeUnit) {
 
 		this.id = id;
 
 		this.protocolId = protocolId;
 		this.protocolName = protocolName;
 		this.experimentId = experimentId;
-		//		this.codeName = codeName;
+		// this.codeName = codeName;
 		this.experimentCodeName = codeName;
 		this.agId = agId;
 		this.agStateId = agStateId;
@@ -87,95 +89,102 @@ public AnalysisGroupValueDTO(
 		this.resultUnit = resultUnit;
 		this.operator = operator;
 		this.testedTimeUnit = testedTimeUnit;
-		if (testedConcentration != null) this.testedConcentration = testedConcentration.toString();
+		if (testedConcentration != null)
+			this.testedConcentration = testedConcentration.toString();
 		this.testedConcentrationUnit = testedConcentrationUnit;
-		if (uncertainty != null) this.uncertainty = uncertainty.toString();
+		if (uncertainty != null)
+			this.uncertainty = uncertainty.toString();
 		this.uncertaintyUnit = uncertaintyUnit;
-		if (testedTime != null) this.testedTime = testedTime.toString();
+		if (testedTime != null)
+			this.testedTime = testedTime.toString();
 
-		if (testedLot.startsWith("GENE")){
+		if (testedLot.startsWith("GENE")) {
 			this.testedLot = geneId;
-			//			Long lsThingId = LsThing.findLsThingsByCodeNameEquals(testedLot).getSingleResult().getId();
-			//			List<LsThingLabel> thingNames = LsThingLabel.findLsThingPreferredName(lsThingId, "name", "Entrez Gene ID").getResultList();
-			//			if (thingNames != null){
-			//				if (thingNames.size() == 1){
-			//					this.testedLot = thingNames.get(0).getLabelText();
-			//				} else if (thingNames.size() > 1) {
-			//					logger.error("found mulitiple preferred names");
-			//				} else {
-			//					logger.error("no preferred names");
-			//				}
-			//			}	
+			// Long lsThingId =
+			// LsThing.findLsThingsByCodeNameEquals(testedLot).getSingleResult().getId();
+			// List<LsThingLabel> thingNames =
+			// LsThingLabel.findLsThingPreferredName(lsThingId, "name", "Entrez Gene
+			// ID").getResultList();
+			// if (thingNames != null){
+			// if (thingNames.size() == 1){
+			// this.testedLot = thingNames.get(0).getLabelText();
+			// } else if (thingNames.size() > 1) {
+			// logger.error("found mulitiple preferred names");
+			// } else {
+			// logger.error("no preferred names");
+			// }
+			// }
 		} else {
 			this.testedLot = testedLot;
 		}
 
-		if (lsType != null){
-			if (lsType.equals("stringValue")){
-				this.result=stringValue;				
+		if (lsType != null) {
+			if (lsType.equals("stringValue")) {
+				this.result = stringValue;
 			} else if (numericValue != null) {
 				this.result = String.valueOf(numericValue.doubleValue());
 			} else if (stringValue != null) {
 				this.result = stringValue;
-			} else if (lsType.equals("codeValue")){
-				this.result=codeValue;
-			} else if (lsType.equals("inlineFileValue")){
-				this.result=fileValue;
-			} else if (lsType.equals("fileValue")){
-				this.result=fileValue;
-			} else if (lsType.equals("dateValue")){
+			} else if (lsType.equals("codeValue")) {
+				this.result = codeValue;
+			} else if (lsType.equals("inlineFileValue")) {
+				this.result = fileValue;
+			} else if (lsType.equals("fileValue")) {
+				this.result = fileValue;
+			} else if (lsType.equals("dateValue")) {
 				Format formatter = new SimpleDateFormat("yyyy-MM-dd");
 				String dateString = formatter.format(dateValue);
-				this.result=dateString;
+				this.result = dateString;
 			}
 		}
 
-		//		List<ExperimentLabel> experimentNames = ExperimentLabel.findExperimentPreferredName(experimentId).getResultList();
-		//		if (experimentNames != null){
-		//			if (experimentNames.size() == 1){
-		//				this.experimentName = experimentNames.get(0).getLabelText();
-		//			} else if (experimentNames.size() > 1) {
-		//				logger.error("found mulitiple preferred names");
-		//			} else {
-		//				logger.error("no preferred names");
-		//			}			
-		//		}
-
-		this.experimentName  = prefName;
-
-		//		Protocol protocol = Protocol.findProtocol(Experiment.findExperiment(experimentId).getProtocol().getId());
-		//		this.protocolId = protocol.getId();
-
-	}
-
-
-//	Long id,
-//	Long protocolId,
-//	String protocolName,
-//	Long experimentId, 
-//	String codeName, 
-//	String prefName,
-//	Long agId,
-//	Long agStateId,
-//	String lsType, 
-//	String lsKind,
-//	String stringValue, 
-//	BigDecimal numericValue,
-//	String codeValue,
-//	Date dateValue,
-//	String fileValue,
-//	String testedLot,
-//	String geneId,
-//	String resultUnit,
-//	String operator,
-//	BigDecimal uncertainty,
-//	String uncertaintyUnit,
-//	Double testedConcentration,
-//	String testedConcentrationUnit,
-//	BigDecimal testedTime,
-//	String testedTimeUnit
-	
-	private Long id;	
+		// List<ExperimentLabel> experimentNames =
+		// ExperimentLabel.findExperimentPreferredName(experimentId).getResultList();
+		// if (experimentNames != null){
+		// if (experimentNames.size() == 1){
+		// this.experimentName = experimentNames.get(0).getLabelText();
+		// } else if (experimentNames.size() > 1) {
+		// logger.error("found mulitiple preferred names");
+		// } else {
+		// logger.error("no preferred names");
+		// }
+		// }
+
+		this.experimentName = prefName;
+
+		// Protocol protocol =
+		// Protocol.findProtocol(Experiment.findExperiment(experimentId).getProtocol().getId());
+		// this.protocolId = protocol.getId();
+
+	}
+
+	// Long id,
+	// Long protocolId,
+	// String protocolName,
+	// Long experimentId,
+	// String codeName,
+	// String prefName,
+	// Long agId,
+	// Long agStateId,
+	// String lsType,
+	// String lsKind,
+	// String stringValue,
+	// BigDecimal numericValue,
+	// String codeValue,
+	// Date dateValue,
+	// String fileValue,
+	// String testedLot,
+	// String geneId,
+	// String resultUnit,
+	// String operator,
+	// BigDecimal uncertainty,
+	// String uncertaintyUnit,
+	// Double testedConcentration,
+	// String testedConcentrationUnit,
+	// BigDecimal testedTime,
+	// String testedTimeUnit
+
+	private Long id;
 	private Long protocolId;
 	private String protocolName;
 	private Long experimentId;
@@ -187,8 +196,8 @@ public AnalysisGroupValueDTO(
 	private String lsKind;
 	private String testedLot;
 	private String geneId;
-	//	private String stringValue;
-	//	private BigDecimal numericValue;
+	// private String stringValue;
+	// private BigDecimal numericValue;
 	private String result;
 	private String resultUnit;
 	private String operator;
@@ -199,75 +208,71 @@ public AnalysisGroupValueDTO(
 	private String testedTime;
 	private String testedTimeUnit;
 
-
-	public static String[] getColumns(){
+	public static String[] getColumns() {
 		String[] headerColumns = new String[] {
-				"id", 
+				"id",
 				"protocolId",
 				"protocolName",
 				"experimentId",
 				"experimentCodeName",
-				
+
 				"experimentName",
 				"agId",
-				"agStateId",				
+				"agStateId",
 				"lsType",
 				"lsKind",
-				
+
 				"testedLot",
 				"geneId",
 				"result",
 				"resultUnit",
 				"operator",
-				
+
 				"testedConcentration",
 				"testedConcentrationUnit",
 				"uncertainty",
 				"uncertaintyUnit",
 				"testedTime",
-				
+
 				"testedTimeUnit"
 		};
 
-		
 		return headerColumns;
 
 	}
 
 	public static CellProcessor[] getProcessors() {
-		final CellProcessor[] processors = new CellProcessor[] { 
+		final CellProcessor[] processors = new CellProcessor[] {
 				new Optional(),
 				new Optional(),
 				new Optional(),
 				new Optional(),
 				new Optional(),
-				
+
 				new Optional(),
 				new Optional(),
 				new Optional(),
 				new Optional(),
 				new Optional(),
-				
+
 				new Optional(),
 				new Optional(),
 				new Optional(),
 				new Optional(),
 				new Optional(),
-				
+
 				new Optional(),
 				new Optional(),
 				new Optional(),
 				new Optional(),
 				new Optional(),
-				
+
 				new Optional()
 		};
 
 		return processors;
 	}
 
-
-
 	public String toJson() {
 		return new JSONSerializer().exclude("*.class").serialize(this);
 	}
@@ -289,179 +294,179 @@ public static String toPrettyJsonArray(Collection<AnalysisGroupValueDTO> collect
 	}
 
 	public static Collection<AnalysisGroupValueDTO> fromJsonArrayToAnalysisGroes(String json) {
-		return new JSONDeserializer<List<AnalysisGroupValueDTO>>().use(null, ArrayList.class).use("values", AnalysisGroupValueDTO.class).deserialize(json);
+		return new JSONDeserializer<List<AnalysisGroupValueDTO>>().use(null, ArrayList.class)
+				.use("values", AnalysisGroupValueDTO.class).deserialize(json);
 	}
 
 	public Long getId() {
-        return this.id;
-    }
+		return this.id;
+	}
 
 	public void setId(Long id) {
-        this.id = id;
-    }
+		this.id = id;
+	}
 
 	public Long getProtocolId() {
-        return this.protocolId;
-    }
+		return this.protocolId;
+	}
 
 	public void setProtocolId(Long protocolId) {
-        this.protocolId = protocolId;
-    }
+		this.protocolId = protocolId;
+	}
 
 	public String getProtocolName() {
-        return this.protocolName;
-    }
+		return this.protocolName;
+	}
 
 	public void setProtocolName(String protocolName) {
-        this.protocolName = protocolName;
-    }
+		this.protocolName = protocolName;
+	}
 
 	public Long getExperimentId() {
-        return this.experimentId;
-    }
+		return this.experimentId;
+	}
 
 	public void setExperimentId(Long experimentId) {
-        this.experimentId = experimentId;
-    }
+		this.experimentId = experimentId;
+	}
 
 	public String getExperimentCodeName() {
-        return this.experimentCodeName;
-    }
+		return this.experimentCodeName;
+	}
 
 	public void setExperimentCodeName(String experimentCodeName) {
-        this.experimentCodeName = experimentCodeName;
-    }
+		this.experimentCodeName = experimentCodeName;
+	}
 
 	public String getExperimentName() {
-        return this.experimentName;
-    }
+		return this.experimentName;
+	}
 
 	public void setExperimentName(String experimentName) {
-        this.experimentName = experimentName;
-    }
+		this.experimentName = experimentName;
+	}
 
 	public Long getAgId() {
-        return this.agId;
-    }
+		return this.agId;
+	}
 
 	public void setAgId(Long agId) {
-        this.agId = agId;
-    }
+		this.agId = agId;
+	}
 
 	public Long getAgStateId() {
-        return this.agStateId;
-    }
+		return this.agStateId;
+	}
 
 	public void setAgStateId(Long agStateId) {
-        this.agStateId = agStateId;
-    }
+		this.agStateId = agStateId;
+	}
 
 	public String getLsType() {
-        return this.lsType;
-    }
+		return this.lsType;
+	}
 
 	public void setLsType(String lsType) {
-        this.lsType = lsType;
-    }
+		this.lsType = lsType;
+	}
 
 	public String getLsKind() {
-        return this.lsKind;
-    }
+		return this.lsKind;
+	}
 
 	public void setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
+		this.lsKind = lsKind;
+	}
 
 	public String getTestedLot() {
-        return this.testedLot;
-    }
+		return this.testedLot;
+	}
 
 	public void setTestedLot(String testedLot) {
-        this.testedLot = testedLot;
-    }
+		this.testedLot = testedLot;
+	}
 
 	public String getGeneId() {
-        return this.geneId;
-    }
+		return this.geneId;
+	}
 
 	public void setGeneId(String geneId) {
-        this.geneId = geneId;
-    }
+		this.geneId = geneId;
+	}
 
 	public String getResult() {
-        return this.result;
-    }
+		return this.result;
+	}
 
 	public void setResult(String result) {
-        this.result = result;
-    }
+		this.result = result;
+	}
 
 	public String getResultUnit() {
-        return this.resultUnit;
-    }
+		return this.resultUnit;
+	}
 
 	public void setResultUnit(String resultUnit) {
-        this.resultUnit = resultUnit;
-    }
+		this.resultUnit = resultUnit;
+	}
 
 	public String getOperator() {
-        return this.operator;
-    }
+		return this.operator;
+	}
 
 	public void setOperator(String operator) {
-        this.operator = operator;
-    }
+		this.operator = operator;
+	}
 
 	public String getTestedConcentration() {
-        return this.testedConcentration;
-    }
+		return this.testedConcentration;
+	}
 
 	public void setTestedConcentration(String testedConcentration) {
-        this.testedConcentration = testedConcentration;
-    }
+		this.testedConcentration = testedConcentration;
+	}
 
 	public String getTestedConcentrationUnit() {
-        return this.testedConcentrationUnit;
-    }
+		return this.testedConcentrationUnit;
+	}
 
 	public void setTestedConcentrationUnit(String testedConcentrationUnit) {
-        this.testedConcentrationUnit = testedConcentrationUnit;
-    }
+		this.testedConcentrationUnit = testedConcentrationUnit;
+	}
 
 	public String getUncertainty() {
-        return this.uncertainty;
-    }
+		return this.uncertainty;
+	}
 
 	public void setUncertainty(String uncertainty) {
-        this.uncertainty = uncertainty;
-    }
+		this.uncertainty = uncertainty;
+	}
 
 	public String getUncertaintyUnit() {
-        return this.uncertaintyUnit;
-    }
+		return this.uncertaintyUnit;
+	}
 
 	public void setUncertaintyUnit(String uncertaintyUnit) {
-        this.uncertaintyUnit = uncertaintyUnit;
-    }
+		this.uncertaintyUnit = uncertaintyUnit;
+	}
 
 	public String getTestedTime() {
-        return this.testedTime;
-    }
+		return this.testedTime;
+	}
 
 	public void setTestedTime(String testedTime) {
-        this.testedTime = testedTime;
-    }
+		this.testedTime = testedTime;
+	}
 
 	public String getTestedTimeUnit() {
-        return this.testedTimeUnit;
-    }
+		return this.testedTimeUnit;
+	}
 
 	public void setTestedTimeUnit(String testedTimeUnit) {
-        this.testedTimeUnit = testedTimeUnit;
-    }
+		this.testedTimeUnit = testedTimeUnit;
+	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 }
-
diff --git a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValuePathDTO.java
index e066f979f..06028aaad 100644
--- a/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AnalysisGroupValuePathDTO.java
@@ -12,93 +12,92 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class AnalysisGroupValuePathDTO {
 
-	public AnalysisGroupValuePathDTO() {
-	}
+    public AnalysisGroupValuePathDTO() {
+    }
+
+    private String idOrCodeName;
+
+    private String stateType;
+
+    private String stateKind;
 
-	private String idOrCodeName;
+    private String valueType;
 
-	private String stateType;
-	
-	private String stateKind;
-	
-	private String valueType;
-	
-	private String valueKind;
-	
-	private Collection<AnalysisGroupValue> values;
-	
-	public String toJson() {
-        return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+    private String valueKind;
+
+    private Collection<AnalysisGroupValue> values;
+
+    public String toJson() {
+        return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
-	
-	public static String toJsonArray(Collection<AnalysisGroupValuePathDTO> collection) {
-        return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
+
+    public static String toJsonArray(Collection<AnalysisGroupValuePathDTO> collection) {
+        return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
 
-	public String getIdOrCodeName() {
+    public String getIdOrCodeName() {
         return this.idOrCodeName;
     }
 
-	public void setIdOrCodeName(String idOrCodeName) {
+    public void setIdOrCodeName(String idOrCodeName) {
         this.idOrCodeName = idOrCodeName;
     }
 
-	public String getStateType() {
+    public String getStateType() {
         return this.stateType;
     }
 
-	public void setStateType(String stateType) {
+    public void setStateType(String stateType) {
         this.stateType = stateType;
     }
 
-	public String getStateKind() {
+    public String getStateKind() {
         return this.stateKind;
     }
 
-	public void setStateKind(String stateKind) {
+    public void setStateKind(String stateKind) {
         this.stateKind = stateKind;
     }
 
-	public String getValueType() {
+    public String getValueType() {
         return this.valueType;
     }
 
-	public void setValueType(String valueType) {
+    public void setValueType(String valueType) {
         this.valueType = valueType;
     }
 
-	public String getValueKind() {
+    public String getValueKind() {
         return this.valueKind;
     }
 
-	public void setValueKind(String valueKind) {
+    public void setValueKind(String valueKind) {
         this.valueKind = valueKind;
     }
 
-	public Collection<AnalysisGroupValue> getValues() {
+    public Collection<AnalysisGroupValue> getValues() {
         return this.values;
     }
 
-	public void setValues(Collection<AnalysisGroupValue> values) {
+    public void setValues(Collection<AnalysisGroupValue> values) {
         this.values = values;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static AnalysisGroupValuePathDTO fromJsonToAnalysisGroupValuePathDTO(String json) {
+    public static AnalysisGroupValuePathDTO fromJsonToAnalysisGroupValuePathDTO(String json) {
         return new JSONDeserializer<AnalysisGroupValuePathDTO>()
-        .use(null, AnalysisGroupValuePathDTO.class).deserialize(json);
+                .use(null, AnalysisGroupValuePathDTO.class).deserialize(json);
     }
 
-	public static Collection<AnalysisGroupValuePathDTO> fromJsonArrayToAnalysisGroes(String json) {
+    public static Collection<AnalysisGroupValuePathDTO> fromJsonArrayToAnalysisGroes(String json) {
         return new JSONDeserializer<List<AnalysisGroupValuePathDTO>>()
-        .use("values", AnalysisGroupValuePathDTO.class).deserialize(json);
+                .use("values", AnalysisGroupValuePathDTO.class).deserialize(json);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthGroupsAndProjectsDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthGroupsAndProjectsDTO.java
index 0fec2273e..64005a1c1 100644
--- a/src/main/java/com/labsynch/labseer/dto/AuthGroupsAndProjectsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthGroupsAndProjectsDTO.java
@@ -12,68 +12,65 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class AuthGroupsAndProjectsDTO {
-	
 
-	private Collection<AuthGroupsDTO> groups;
-	
-	private Collection<AuthProjectGroupsDTO> projects;
-	
+    private Collection<AuthGroupsDTO> groups;
+
+    private Collection<AuthProjectGroupsDTO> projects;
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        	.exclude("*.class")
-        	.include("groups.members", "projects.groups")
-        	.transform(new ExcludeNulls(), void.class)
-        	.serialize(this);
+                .exclude("*.class")
+                .include("groups.members", "projects.groups")
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
 
-	public static AuthGroupsAndProjectsDTO fromJsonToAuthProjectDTO(String json) {
-        return new JSONDeserializer<AuthGroupsAndProjectsDTO>().use(null, AuthGroupsAndProjectsDTO.class).deserialize(json);
+    public static AuthGroupsAndProjectsDTO fromJsonToAuthProjectDTO(String json) {
+        return new JSONDeserializer<AuthGroupsAndProjectsDTO>().use(null, AuthGroupsAndProjectsDTO.class)
+                .deserialize(json);
     }
 
-	public static String toJsonArray(Collection<AuthGroupsAndProjectsDTO> collection) {
+    public static String toJsonArray(Collection<AuthGroupsAndProjectsDTO> collection) {
         return new JSONSerializer()
-        	.exclude("*.class")
-        	.include("groups", "projects.groups")
-          	.transform(new ExcludeNulls(), void.class)
-        	.serialize(collection);
+                .exclude("*.class")
+                .include("groups", "projects.groups")
+                .transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
 
-	public static Collection<AuthGroupsAndProjectsDTO> fromJsonArrayToAuthProes(String json) {
-        return new JSONDeserializer<List<AuthGroupsAndProjectsDTO>>().use(null, ArrayList.class).use("values", AuthGroupsAndProjectsDTO.class).deserialize(json);
+    public static Collection<AuthGroupsAndProjectsDTO> fromJsonArrayToAuthProes(String json) {
+        return new JSONDeserializer<List<AuthGroupsAndProjectsDTO>>().use(null, ArrayList.class)
+                .use("values", AuthGroupsAndProjectsDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static AuthGroupsAndProjectsDTO fromJsonToAuthGroupsAndProjectsDTO(String json) {
+    public static AuthGroupsAndProjectsDTO fromJsonToAuthGroupsAndProjectsDTO(String json) {
         return new JSONDeserializer<AuthGroupsAndProjectsDTO>()
-        .use(null, AuthGroupsAndProjectsDTO.class).deserialize(json);
+                .use(null, AuthGroupsAndProjectsDTO.class).deserialize(json);
     }
 
-	public static Collection<AuthGroupsAndProjectsDTO> fromJsonArrayToAuthGroupsAndProes(String json) {
+    public static Collection<AuthGroupsAndProjectsDTO> fromJsonArrayToAuthGroupsAndProes(String json) {
         return new JSONDeserializer<List<AuthGroupsAndProjectsDTO>>()
-        .use("values", AuthGroupsAndProjectsDTO.class).deserialize(json);
+                .use("values", AuthGroupsAndProjectsDTO.class).deserialize(json);
     }
 
-	public Collection<AuthGroupsDTO> getGroups() {
+    public Collection<AuthGroupsDTO> getGroups() {
         return this.groups;
     }
 
-	public void setGroups(Collection<AuthGroupsDTO> groups) {
+    public void setGroups(Collection<AuthGroupsDTO> groups) {
         this.groups = groups;
     }
 
-	public Collection<AuthProjectGroupsDTO> getProjects() {
+    public Collection<AuthProjectGroupsDTO> getProjects() {
         return this.projects;
     }
 
-	public void setProjects(Collection<AuthProjectGroupsDTO> projects) {
+    public void setProjects(Collection<AuthProjectGroupsDTO> projects) {
         this.projects = projects;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthGroupsDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthGroupsDTO.java
index 762d09dc8..887fe8c85 100644
--- a/src/main/java/com/labsynch/labseer/dto/AuthGroupsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthGroupsDTO.java
@@ -10,49 +10,46 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class AuthGroupsDTO {
-	
-	private String name;
-	
-	private Collection<String> members;
-	
 
-	public String toJson() {
+    private String name;
+
+    private Collection<String> members;
+
+    public String toJson() {
         return new JSONSerializer().exclude("*.class").include("members").serialize(this);
     }
 
-	public static AuthGroupsDTO fromJsonToAuthGroupsDTO(String json) {
+    public static AuthGroupsDTO fromJsonToAuthGroupsDTO(String json) {
         return new JSONDeserializer<AuthGroupsDTO>().use(null, AuthGroupsDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<AuthGroupsDTO> collection) {
+    public static String toJsonArray(Collection<AuthGroupsDTO> collection) {
         return new JSONSerializer().exclude("*.class").include("members").serialize(collection);
     }
 
-	public static Collection<AuthGroupsDTO> fromJsonArrayToAuthGroes(String json) {
-        return new JSONDeserializer<List<AuthGroupsDTO>>().use(null, ArrayList.class).use("values", AuthGroupsDTO.class).deserialize(json);
+    public static Collection<AuthGroupsDTO> fromJsonArrayToAuthGroes(String json) {
+        return new JSONDeserializer<List<AuthGroupsDTO>>().use(null, ArrayList.class).use("values", AuthGroupsDTO.class)
+                .deserialize(json);
     }
 
-	public String getName() {
+    public String getName() {
         return this.name;
     }
 
-	public void setName(String name) {
+    public void setName(String name) {
         this.name = name;
     }
 
-	public Collection<String> getMembers() {
+    public Collection<String> getMembers() {
         return this.members;
     }
 
-	public void setMembers(Collection<String> members) {
+    public void setMembers(Collection<String> members) {
         this.members = members;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthProjectDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthProjectDTO.java
index 7cb5a37ac..423f66313 100755
--- a/src/main/java/com/labsynch/labseer/dto/AuthProjectDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthProjectDTO.java
@@ -10,55 +10,52 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class AuthProjectDTO {
-	
-	private Collection<String> projects;
-	
-	private Collection<String> projectAdmins;
 
+    private Collection<String> projects;
+
+    private Collection<String> projectAdmins;
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        	.exclude("*.class")
-        	.include("projects", "projectAdmins")
-        	.serialize(this);
+                .exclude("*.class")
+                .include("projects", "projectAdmins")
+                .serialize(this);
     }
 
-	public static AuthProjectDTO fromJsonToAuthProjectDTO(String json) {
+    public static AuthProjectDTO fromJsonToAuthProjectDTO(String json) {
         return new JSONDeserializer<AuthProjectDTO>().use(null, AuthProjectDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<AuthProjectDTO> collection) {
+    public static String toJsonArray(Collection<AuthProjectDTO> collection) {
         return new JSONSerializer()
-        	.exclude("*.class")
-        	.include("projects", "projectAdmins")
-        	.serialize(collection);
+                .exclude("*.class")
+                .include("projects", "projectAdmins")
+                .serialize(collection);
     }
 
-	public static Collection<AuthProjectDTO> fromJsonArrayToAuthProes(String json) {
-        return new JSONDeserializer<List<AuthProjectDTO>>().use(null, ArrayList.class).use("values", AuthProjectDTO.class).deserialize(json);
+    public static Collection<AuthProjectDTO> fromJsonArrayToAuthProes(String json) {
+        return new JSONDeserializer<List<AuthProjectDTO>>().use(null, ArrayList.class)
+                .use("values", AuthProjectDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public Collection<String> getProjects() {
+    public Collection<String> getProjects() {
         return this.projects;
     }
 
-	public void setProjects(Collection<String> projects) {
+    public void setProjects(Collection<String> projects) {
         this.projects = projects;
     }
 
-	public Collection<String> getProjectAdmins() {
+    public Collection<String> getProjectAdmins() {
         return this.projectAdmins;
     }
 
-	public void setProjectAdmins(Collection<String> projectAdmins) {
+    public void setProjectAdmins(Collection<String> projectAdmins) {
         this.projectAdmins = projectAdmins;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthProjectGroupsDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthProjectGroupsDTO.java
index 4853ee94d..0a72c5b28 100644
--- a/src/main/java/com/labsynch/labseer/dto/AuthProjectGroupsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthProjectGroupsDTO.java
@@ -10,118 +10,112 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class AuthProjectGroupsDTO {
-	
 
-	private String name;
-	
-	private String code;
-	
-	private String alias;
-	
-	private boolean active;
-	
-	private boolean isRestricted;
+    private String name;
+
+    private String code;
+
+    private String alias;
 
-	private Long id;
-	
-	private Collection<String> groups;
-	
+    private boolean active;
 
+    private boolean isRestricted;
 
+    private Long id;
 
-	public String toJson() {
+    private Collection<String> groups;
+
+    public String toJson() {
         return new JSONSerializer()
-        	.exclude("*.class")
-        	.include("groups")
-        	.serialize(this);
+                .exclude("*.class")
+                .include("groups")
+                .serialize(this);
     }
 
-	public static AuthProjectGroupsDTO fromJsonToAuthProjectDTO(String json) {
+    public static AuthProjectGroupsDTO fromJsonToAuthProjectDTO(String json) {
         return new JSONDeserializer<AuthProjectGroupsDTO>().use(null, AuthProjectGroupsDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<AuthProjectGroupsDTO> collection) {
+    public static String toJsonArray(Collection<AuthProjectGroupsDTO> collection) {
         return new JSONSerializer()
-        	.exclude("*.class")
-        	.include("groups")
-        	.serialize(collection);
+                .exclude("*.class")
+                .include("groups")
+                .serialize(collection);
     }
 
-	public static Collection<AuthProjectGroupsDTO> fromJsonArrayToAuthProes(String json) {
-        return new JSONDeserializer<List<AuthProjectGroupsDTO>>().use(null, ArrayList.class).use("values", AuthProjectGroupsDTO.class).deserialize(json);
+    public static Collection<AuthProjectGroupsDTO> fromJsonArrayToAuthProes(String json) {
+        return new JSONDeserializer<List<AuthProjectGroupsDTO>>().use(null, ArrayList.class)
+                .use("values", AuthProjectGroupsDTO.class).deserialize(json);
     }
 
-	public String getName() {
+    public String getName() {
         return this.name;
     }
 
-	public void setName(String name) {
+    public void setName(String name) {
         this.name = name;
     }
 
-	public String getCode() {
+    public String getCode() {
         return this.code;
     }
 
-	public void setCode(String code) {
+    public void setCode(String code) {
         this.code = code;
     }
 
-	public String getAlias() {
+    public String getAlias() {
         return this.alias;
     }
 
-	public void setAlias(String alias) {
+    public void setAlias(String alias) {
         this.alias = alias;
     }
 
-	public boolean isActive() {
+    public boolean isActive() {
         return this.active;
     }
 
-	public void setActive(boolean active) {
+    public void setActive(boolean active) {
         this.active = active;
     }
 
-	public boolean isIsRestricted() {
+    public boolean isIsRestricted() {
         return this.isRestricted;
     }
 
-	public void setIsRestricted(boolean isRestricted) {
+    public void setIsRestricted(boolean isRestricted) {
         this.isRestricted = isRestricted;
     }
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Collection<String> getGroups() {
+    public Collection<String> getGroups() {
         return this.groups;
     }
 
-	public void setGroups(Collection<String> groups) {
+    public void setGroups(Collection<String> groups) {
         this.groups = groups;
     }
 
-	public static AuthProjectGroupsDTO fromJsonToAuthProjectGroupsDTO(String json) {
+    public static AuthProjectGroupsDTO fromJsonToAuthProjectGroupsDTO(String json) {
         return new JSONDeserializer<AuthProjectGroupsDTO>()
-        .use(null, AuthProjectGroupsDTO.class).deserialize(json);
+                .use(null, AuthProjectGroupsDTO.class).deserialize(json);
     }
 
-	public static Collection<AuthProjectGroupsDTO> fromJsonArrayToAuthProjectGroes(String json) {
+    public static Collection<AuthProjectGroupsDTO> fromJsonArrayToAuthProjectGroes(String json) {
         return new JSONDeserializer<List<AuthProjectGroupsDTO>>()
-        .use("values", AuthProjectGroupsDTO.class).deserialize(json);
+                .use("values", AuthProjectGroupsDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthUserDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthUserDTO.java
index 44c435d72..b43ec9146 100755
--- a/src/main/java/com/labsynch/labseer/dto/AuthUserDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthUserDTO.java
@@ -9,53 +9,49 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class AuthUserDTO {
-	
-	private String name;
 
+    private String name;
 
-	public String getName() {
+    public String getName() {
         return this.name;
     }
 
-	public void setName(String name) {
+    public void setName(String name) {
         this.name = name;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static AuthUserDTO fromJsonToAuthUserDTO(String json) {
+    public static AuthUserDTO fromJsonToAuthUserDTO(String json) {
         return new JSONDeserializer<AuthUserDTO>()
-        .use(null, AuthUserDTO.class).deserialize(json);
+                .use(null, AuthUserDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<AuthUserDTO> collection) {
+    public static String toJsonArray(Collection<AuthUserDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<AuthUserDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<AuthUserDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<AuthUserDTO> fromJsonArrayToAuthUserDTO(String json) {
+    public static Collection<AuthUserDTO> fromJsonArrayToAuthUserDTO(String json) {
         return new JSONDeserializer<List<AuthUserDTO>>()
-        .use("values", AuthUserDTO.class).deserialize(json);
+                .use("values", AuthUserDTO.class).deserialize(json);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorBrowserQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthorBrowserQueryDTO.java
index 0f67ee5ed..ae2f75974 100644
--- a/src/main/java/com/labsynch/labseer/dto/AuthorBrowserQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthorBrowserQueryDTO.java
@@ -9,63 +9,59 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class AuthorBrowserQueryDTO {
-	
-	private String queryString;
-	
-	private AuthorQueryDTO queryDTO;
 
+    private String queryString;
+
+    private AuthorQueryDTO queryDTO;
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static AuthorBrowserQueryDTO fromJsonToAuthorBrowserQueryDTO(String json) {
+    public static AuthorBrowserQueryDTO fromJsonToAuthorBrowserQueryDTO(String json) {
         return new JSONDeserializer<AuthorBrowserQueryDTO>()
-        .use(null, AuthorBrowserQueryDTO.class).deserialize(json);
+                .use(null, AuthorBrowserQueryDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<AuthorBrowserQueryDTO> collection) {
+    public static String toJsonArray(Collection<AuthorBrowserQueryDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<AuthorBrowserQueryDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<AuthorBrowserQueryDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<AuthorBrowserQueryDTO> fromJsonArrayToAuthorBroes(String json) {
+    public static Collection<AuthorBrowserQueryDTO> fromJsonArrayToAuthorBroes(String json) {
         return new JSONDeserializer<List<AuthorBrowserQueryDTO>>()
-        .use("values", AuthorBrowserQueryDTO.class).deserialize(json);
+                .use("values", AuthorBrowserQueryDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getQueryString() {
+    public String getQueryString() {
         return this.queryString;
     }
 
-	public void setQueryString(String queryString) {
+    public void setQueryString(String queryString) {
         this.queryString = queryString;
     }
 
-	public AuthorQueryDTO getQueryDTO() {
+    public AuthorQueryDTO getQueryDTO() {
         return this.queryDTO;
     }
 
-	public void setQueryDTO(AuthorQueryDTO queryDTO) {
+    public void setQueryDTO(AuthorQueryDTO queryDTO) {
         this.queryDTO = queryDTO;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorNameDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthorNameDTO.java
index 70a06bf2c..02b168713 100755
--- a/src/main/java/com/labsynch/labseer/dto/AuthorNameDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthorNameDTO.java
@@ -9,53 +9,49 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class AuthorNameDTO {
-	
-	private String name;
 
+    private String name;
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static AuthorNameDTO fromJsonToAuthorNameDTO(String json) {
+    public static AuthorNameDTO fromJsonToAuthorNameDTO(String json) {
         return new JSONDeserializer<AuthorNameDTO>()
-        .use(null, AuthorNameDTO.class).deserialize(json);
+                .use(null, AuthorNameDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<AuthorNameDTO> collection) {
+    public static String toJsonArray(Collection<AuthorNameDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<AuthorNameDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<AuthorNameDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<AuthorNameDTO> fromJsonArrayToAuthoes(String json) {
+    public static Collection<AuthorNameDTO> fromJsonArrayToAuthoes(String json) {
         return new JSONDeserializer<List<AuthorNameDTO>>()
-        .use("values", AuthorNameDTO.class).deserialize(json);
+                .use("values", AuthorNameDTO.class).deserialize(json);
     }
 
-	public String getName() {
+    public String getName() {
         return this.name;
     }
 
-	public void setName(String name) {
+    public void setName(String name) {
         this.name = name;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthorQueryDTO.java
index a26523b6f..1914c0188 100644
--- a/src/main/java/com/labsynch/labseer/dto/AuthorQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthorQueryDTO.java
@@ -10,168 +10,167 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class AuthorQueryDTO {
 
-	Date recordedDateGreaterThan;
-	
-	Date recordedDateLessThan;
-	
-	String recordedBy;
-	
-	Integer maxResults;
-	
-	String lsType;
-	
-	String lsKind;
-	
-	String firstName;
-	
-	String lastName;
-	
-	String userName;
-		
-	Collection<ValueQueryDTO> values;
-	
-	Collection<LabelQueryDTO> labels;
-	
-	public AuthorQueryDTO(){
-		
-	}
-	
-	public AuthorQueryDTO(AuthorQueryDTO queryDTO){
-		this.recordedDateGreaterThan = queryDTO.getRecordedDateGreaterThan();
-		this.recordedDateLessThan = queryDTO.getRecordedDateLessThan();
-		this.lsType = queryDTO.getLsType();
-		this.lsKind = queryDTO.getLsKind();
-		this.firstName = queryDTO.getFirstName();
-		this.lastName = queryDTO.getLastName();
-		this.userName = queryDTO.getUserName();
-		this.recordedBy = queryDTO.getRecordedBy();
-		this.maxResults = queryDTO.getMaxResults();
-		this.values = queryDTO.getValues();
-		this.labels = queryDTO.getLabels();
-	}
-
-	public String toJson() {
+    Date recordedDateGreaterThan;
+
+    Date recordedDateLessThan;
+
+    String recordedBy;
+
+    Integer maxResults;
+
+    String lsType;
+
+    String lsKind;
+
+    String firstName;
+
+    String lastName;
+
+    String userName;
+
+    Collection<ValueQueryDTO> values;
+
+    Collection<LabelQueryDTO> labels;
+
+    public AuthorQueryDTO() {
+
+    }
+
+    public AuthorQueryDTO(AuthorQueryDTO queryDTO) {
+        this.recordedDateGreaterThan = queryDTO.getRecordedDateGreaterThan();
+        this.recordedDateLessThan = queryDTO.getRecordedDateLessThan();
+        this.lsType = queryDTO.getLsType();
+        this.lsKind = queryDTO.getLsKind();
+        this.firstName = queryDTO.getFirstName();
+        this.lastName = queryDTO.getLastName();
+        this.userName = queryDTO.getUserName();
+        this.recordedBy = queryDTO.getRecordedBy();
+        this.maxResults = queryDTO.getMaxResults();
+        this.values = queryDTO.getValues();
+        this.labels = queryDTO.getLabels();
+    }
+
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static AuthorQueryDTO fromJsonToAuthorQueryDTO(String json) {
+    public static AuthorQueryDTO fromJsonToAuthorQueryDTO(String json) {
         return new JSONDeserializer<AuthorQueryDTO>()
-        .use(null, AuthorQueryDTO.class).deserialize(json);
+                .use(null, AuthorQueryDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<AuthorQueryDTO> collection) {
+    public static String toJsonArray(Collection<AuthorQueryDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<AuthorQueryDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<AuthorQueryDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<AuthorQueryDTO> fromJsonArrayToAuthoes(String json) {
+    public static Collection<AuthorQueryDTO> fromJsonArrayToAuthoes(String json) {
         return new JSONDeserializer<List<AuthorQueryDTO>>()
-        .use("values", AuthorQueryDTO.class).deserialize(json);
+                .use("values", AuthorQueryDTO.class).deserialize(json);
     }
 
-	public Date getRecordedDateGreaterThan() {
+    public Date getRecordedDateGreaterThan() {
         return this.recordedDateGreaterThan;
     }
 
-	public void setRecordedDateGreaterThan(Date recordedDateGreaterThan) {
+    public void setRecordedDateGreaterThan(Date recordedDateGreaterThan) {
         this.recordedDateGreaterThan = recordedDateGreaterThan;
     }
 
-	public Date getRecordedDateLessThan() {
+    public Date getRecordedDateLessThan() {
         return this.recordedDateLessThan;
     }
 
-	public void setRecordedDateLessThan(Date recordedDateLessThan) {
+    public void setRecordedDateLessThan(Date recordedDateLessThan) {
         this.recordedDateLessThan = recordedDateLessThan;
     }
 
-	public String getRecordedBy() {
+    public String getRecordedBy() {
         return this.recordedBy;
     }
 
-	public void setRecordedBy(String recordedBy) {
+    public void setRecordedBy(String recordedBy) {
         this.recordedBy = recordedBy;
     }
 
-	public Integer getMaxResults() {
+    public Integer getMaxResults() {
         return this.maxResults;
     }
 
-	public void setMaxResults(Integer maxResults) {
+    public void setMaxResults(Integer maxResults) {
         this.maxResults = maxResults;
     }
 
-	public String getLsType() {
+    public String getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(String lsType) {
+    public void setLsType(String lsType) {
         this.lsType = lsType;
     }
 
-	public String getLsKind() {
+    public String getLsKind() {
         return this.lsKind;
     }
 
-	public void setLsKind(String lsKind) {
+    public void setLsKind(String lsKind) {
         this.lsKind = lsKind;
     }
 
-	public String getFirstName() {
+    public String getFirstName() {
         return this.firstName;
     }
 
-	public void setFirstName(String firstName) {
+    public void setFirstName(String firstName) {
         this.firstName = firstName;
     }
 
-	public String getLastName() {
+    public String getLastName() {
         return this.lastName;
     }
 
-	public void setLastName(String lastName) {
+    public void setLastName(String lastName) {
         this.lastName = lastName;
     }
 
-	public String getUserName() {
+    public String getUserName() {
         return this.userName;
     }
 
-	public void setUserName(String userName) {
+    public void setUserName(String userName) {
         this.userName = userName;
     }
 
-	public Collection<ValueQueryDTO> getValues() {
+    public Collection<ValueQueryDTO> getValues() {
         return this.values;
     }
 
-	public void setValues(Collection<ValueQueryDTO> values) {
+    public void setValues(Collection<ValueQueryDTO> values) {
         this.values = values;
     }
 
-	public Collection<LabelQueryDTO> getLabels() {
+    public Collection<LabelQueryDTO> getLabels() {
         return this.labels;
     }
 
-	public void setLabels(Collection<LabelQueryDTO> labels) {
+    public void setLabels(Collection<LabelQueryDTO> labels) {
         this.labels = labels;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorQueryResultDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthorQueryResultDTO.java
index c8e9a1076..61be2f2f1 100644
--- a/src/main/java/com/labsynch/labseer/dto/AuthorQueryResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthorQueryResultDTO.java
@@ -13,70 +13,71 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class AuthorQueryResultDTO {
 
-	Integer maxResults;
-	
-	Integer numberOfResults;
-	
-	Collection<Author> results;
-	
-	public AuthorQueryResultDTO(){
-		
-	}
-	
-	@Transactional
+    Integer maxResults;
+
+    Integer numberOfResults;
+
+    Collection<Author> results;
+
+    public AuthorQueryResultDTO() {
+
+    }
+
+    @Transactional
     public String toJson() {
-        return new JSONSerializer().exclude("*.class", "results.password").include("results.lsTags", "results.lsLabels", "results.lsStates.lsValues", "results.authorRoles.roleEntry").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "results.password").include("results.lsTags", "results.lsLabels",
+                        "results.lsStates.lsValues", "results.authorRoles.roleEntry")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
-	
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public Integer getMaxResults() {
+    public Integer getMaxResults() {
         return this.maxResults;
     }
 
-	public void setMaxResults(Integer maxResults) {
+    public void setMaxResults(Integer maxResults) {
         this.maxResults = maxResults;
     }
 
-	public Integer getNumberOfResults() {
+    public Integer getNumberOfResults() {
         return this.numberOfResults;
     }
 
-	public void setNumberOfResults(Integer numberOfResults) {
+    public void setNumberOfResults(Integer numberOfResults) {
         this.numberOfResults = numberOfResults;
     }
 
-	public Collection<Author> getResults() {
+    public Collection<Author> getResults() {
         return this.results;
     }
 
-	public void setResults(Collection<Author> results) {
+    public void setResults(Collection<Author> results) {
         this.results = results;
     }
 
-	public static AuthorQueryResultDTO fromJsonToAuthorQueryResultDTO(String json) {
+    public static AuthorQueryResultDTO fromJsonToAuthorQueryResultDTO(String json) {
         return new JSONDeserializer<AuthorQueryResultDTO>()
-        .use(null, AuthorQueryResultDTO.class).deserialize(json);
+                .use(null, AuthorQueryResultDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<AuthorQueryResultDTO> collection) {
+    public static String toJsonArray(Collection<AuthorQueryResultDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<AuthorQueryResultDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<AuthorQueryResultDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<AuthorQueryResultDTO> fromJsonArrayToAuthoes(String json) {
+    public static Collection<AuthorQueryResultDTO> fromJsonArrayToAuthoes(String json) {
         return new JSONDeserializer<List<AuthorQueryResultDTO>>()
-        .use("values", AuthorQueryResultDTO.class).deserialize(json);
+                .use("values", AuthorQueryResultDTO.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/AuthorRoleDTO.java b/src/main/java/com/labsynch/labseer/dto/AuthorRoleDTO.java
index 612c30148..ccdfe54be 100644
--- a/src/main/java/com/labsynch/labseer/dto/AuthorRoleDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AuthorRoleDTO.java
@@ -9,83 +9,79 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class AuthorRoleDTO {
-	
-	private String roleType;
-	
-	private String roleKind;
-	
-	private String roleName;
-	
-	private String userName;
-	
-
-	public String getRoleType() {
+
+    private String roleType;
+
+    private String roleKind;
+
+    private String roleName;
+
+    private String userName;
+
+    public String getRoleType() {
         return this.roleType;
     }
 
-	public void setRoleType(String roleType) {
+    public void setRoleType(String roleType) {
         this.roleType = roleType;
     }
 
-	public String getRoleKind() {
+    public String getRoleKind() {
         return this.roleKind;
     }
 
-	public void setRoleKind(String roleKind) {
+    public void setRoleKind(String roleKind) {
         this.roleKind = roleKind;
     }
 
-	public String getRoleName() {
+    public String getRoleName() {
         return this.roleName;
     }
 
-	public void setRoleName(String roleName) {
+    public void setRoleName(String roleName) {
         this.roleName = roleName;
     }
 
-	public String getUserName() {
+    public String getUserName() {
         return this.userName;
     }
 
-	public void setUserName(String userName) {
+    public void setUserName(String userName) {
         this.userName = userName;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static AuthorRoleDTO fromJsonToAuthorRoleDTO(String json) {
+    public static AuthorRoleDTO fromJsonToAuthorRoleDTO(String json) {
         return new JSONDeserializer<AuthorRoleDTO>()
-        .use(null, AuthorRoleDTO.class).deserialize(json);
+                .use(null, AuthorRoleDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<AuthorRoleDTO> collection) {
+    public static String toJsonArray(Collection<AuthorRoleDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<AuthorRoleDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<AuthorRoleDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<AuthorRoleDTO> fromJsonArrayToAuthorRoes(String json) {
+    public static Collection<AuthorRoleDTO> fromJsonArrayToAuthorRoes(String json) {
         return new JSONDeserializer<List<AuthorRoleDTO>>()
-        .use("values", AuthorRoleDTO.class).deserialize(json);
+                .use("values", AuthorRoleDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/AutoLabelDTO.java b/src/main/java/com/labsynch/labseer/dto/AutoLabelDTO.java
index a34e09b0a..605d1ff2e 100755
--- a/src/main/java/com/labsynch/labseer/dto/AutoLabelDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/AutoLabelDTO.java
@@ -9,70 +9,68 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class AutoLabelDTO {
-	
+
     private String autoLabel;
 
     private Long labelNumber;
-    
-    public AutoLabelDTO () {
-    	
-    }
-    
-    public AutoLabelDTO (String autoLabel, Long labelNumber){
-    		this.autoLabel = autoLabel;
-    		this.labelNumber = labelNumber;
+
+    public AutoLabelDTO() {
+
     }
 
+    public AutoLabelDTO(String autoLabel, Long labelNumber) {
+        this.autoLabel = autoLabel;
+        this.labelNumber = labelNumber;
+    }
 
-	public String getAutoLabel() {
+    public String getAutoLabel() {
         return this.autoLabel;
     }
 
-	public void setAutoLabel(String autoLabel) {
+    public void setAutoLabel(String autoLabel) {
         this.autoLabel = autoLabel;
     }
 
-	public Long getLabelNumber() {
+    public Long getLabelNumber() {
         return this.labelNumber;
     }
 
-	public void setLabelNumber(Long labelNumber) {
+    public void setLabelNumber(Long labelNumber) {
         this.labelNumber = labelNumber;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static AutoLabelDTO fromJsonToAutoLabelDTO(String json) {
+    public static AutoLabelDTO fromJsonToAutoLabelDTO(String json) {
         return new JSONDeserializer<AutoLabelDTO>()
-        .use(null, AutoLabelDTO.class).deserialize(json);
+                .use(null, AutoLabelDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<AutoLabelDTO> collection) {
+    public static String toJsonArray(Collection<AutoLabelDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<AutoLabelDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<AutoLabelDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<AutoLabelDTO> fromJsonArrayToAutoes(String json) {
+    public static Collection<AutoLabelDTO> fromJsonArrayToAutoes(String json) {
         return new JSONDeserializer<List<AutoLabelDTO>>()
-        .use("values", AutoLabelDTO.class).deserialize(json);
+                .use("values", AutoLabelDTO.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/BatchCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/BatchCodeDTO.java
index 790d54f5a..e918f5471 100755
--- a/src/main/java/com/labsynch/labseer/dto/BatchCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BatchCodeDTO.java
@@ -11,69 +11,65 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class BatchCodeDTO {
-	
-	private String batchCode;
-	
-	public static String[] getColumns(){
-		String[] headerColumns = new String[] {
-				"batchCode"};
 
-		return headerColumns;
+    private String batchCode;
+
+    public static String[] getColumns() {
+        String[] headerColumns = new String[] {
+                "batchCode" };
 
-	}
+        return headerColumns;
 
-	public static CellProcessor[] getProcessors() {
-		final CellProcessor[] processors = new CellProcessor[] { 
-				new Optional()
-		};
+    }
 
-		return processors;
-	}
+    public static CellProcessor[] getProcessors() {
+        final CellProcessor[] processors = new CellProcessor[] {
+                new Optional()
+        };
 
+        return processors;
+    }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static BatchCodeDTO fromJsonToBatchCodeDTO(String json) {
+    public static BatchCodeDTO fromJsonToBatchCodeDTO(String json) {
         return new JSONDeserializer<BatchCodeDTO>()
-        .use(null, BatchCodeDTO.class).deserialize(json);
+                .use(null, BatchCodeDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<BatchCodeDTO> collection) {
+    public static String toJsonArray(Collection<BatchCodeDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<BatchCodeDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<BatchCodeDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<BatchCodeDTO> fromJsonArrayToBatchCoes(String json) {
+    public static Collection<BatchCodeDTO> fromJsonArrayToBatchCoes(String json) {
         return new JSONDeserializer<List<BatchCodeDTO>>()
-        .use("values", BatchCodeDTO.class).deserialize(json);
+                .use("values", BatchCodeDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getBatchCode() {
+    public String getBatchCode() {
         return this.batchCode;
     }
 
-	public void setBatchCode(String batchCode) {
+    public void setBatchCode(String batchCode) {
         this.batchCode = batchCode;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO.java b/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO.java
index 43b087507..d791e248d 100644
--- a/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BatchCodeDependencyDTO.java
@@ -13,86 +13,84 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class BatchCodeDependencyDTO {
-	
-	private static final Logger logger = LoggerFactory.getLogger(BatchCodeDependencyDTO.class);
-
-	private Collection<String> batchCodes;
-	
-	private Boolean linkedDataExists;
-	
-	private Collection<CodeTableDTO> linkedExperiments;
-	
-	private Collection<ErrorMessage> errors;
-	
-	public BatchCodeDependencyDTO() {
-	}
-    
+
+    private static final Logger logger = LoggerFactory.getLogger(BatchCodeDependencyDTO.class);
+
+    private Collection<String> batchCodes;
+
+    private Boolean linkedDataExists;
+
+    private Collection<CodeTableDTO> linkedExperiments;
+
+    private Collection<ErrorMessage> errors;
+
+    public BatchCodeDependencyDTO() {
+    }
+
     public BatchCodeDependencyDTO(Collection<String> batchCodes) {
-		this.setBatchCodes(batchCodes);
-	}
-    
+        this.setBatchCodes(batchCodes);
+    }
+
     public String toJson() {
         return new JSONSerializer()
-        .include("batchCodes", "linkedExperiments", "errors")
-        .exclude("*.class").serialize(this);
+                .include("batchCodes", "linkedExperiments", "errors")
+                .exclude("*.class").serialize(this);
     }
-    
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static BatchCodeDependencyDTO fromJsonToBatchCodeDependencyDTO(String json) {
+    public static BatchCodeDependencyDTO fromJsonToBatchCodeDependencyDTO(String json) {
         return new JSONDeserializer<BatchCodeDependencyDTO>()
-        .use(null, BatchCodeDependencyDTO.class).deserialize(json);
+                .use(null, BatchCodeDependencyDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<BatchCodeDependencyDTO> collection) {
+    public static String toJsonArray(Collection<BatchCodeDependencyDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<BatchCodeDependencyDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<BatchCodeDependencyDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<BatchCodeDependencyDTO> fromJsonArrayToBatchCoes(String json) {
+    public static Collection<BatchCodeDependencyDTO> fromJsonArrayToBatchCoes(String json) {
         return new JSONDeserializer<List<BatchCodeDependencyDTO>>()
-        .use("values", BatchCodeDependencyDTO.class).deserialize(json);
+                .use("values", BatchCodeDependencyDTO.class).deserialize(json);
     }
 
-	public Collection<String> getBatchCodes() {
+    public Collection<String> getBatchCodes() {
         return this.batchCodes;
     }
 
-	public void setBatchCodes(Collection<String> batchCodes) {
+    public void setBatchCodes(Collection<String> batchCodes) {
         this.batchCodes = batchCodes;
     }
 
-	public Boolean getLinkedDataExists() {
+    public Boolean getLinkedDataExists() {
         return this.linkedDataExists;
     }
 
-	public void setLinkedDataExists(Boolean linkedDataExists) {
+    public void setLinkedDataExists(Boolean linkedDataExists) {
         this.linkedDataExists = linkedDataExists;
     }
 
-	public Collection<CodeTableDTO> getLinkedExperiments() {
+    public Collection<CodeTableDTO> getLinkedExperiments() {
         return this.linkedExperiments;
     }
 
-	public void setLinkedExperiments(Collection<CodeTableDTO> linkedExperiments) {
+    public void setLinkedExperiments(Collection<CodeTableDTO> linkedExperiments) {
         this.linkedExperiments = linkedExperiments;
     }
 
-	public Collection<ErrorMessage> getErrors() {
+    public Collection<ErrorMessage> getErrors() {
         return this.errors;
     }
 
-	public void setErrors(Collection<ErrorMessage> errors) {
+    public void setErrors(Collection<ErrorMessage> errors) {
         this.errors = errors;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/BatchProjectDTO.java b/src/main/java/com/labsynch/labseer/dto/BatchProjectDTO.java
index 532efb599..02d2cb8b3 100644
--- a/src/main/java/com/labsynch/labseer/dto/BatchProjectDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BatchProjectDTO.java
@@ -18,97 +18,95 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class BatchProjectDTO {
-	
-	private static final Logger logger = LoggerFactory.getLogger(BatchProjectDTO.class);
+
+    private static final Logger logger = LoggerFactory.getLogger(BatchProjectDTO.class);
 
     private String requestName;
-    
+
     private String projectCode;
-    
-    public BatchProjectDTO(){
-    	
+
+    public BatchProjectDTO() {
+
     }
-    
-    public BatchProjectDTO(String requestName, String projectCode){
-    	this.requestName = requestName;
-    	this.projectCode = projectCode;
+
+    public BatchProjectDTO(String requestName, String projectCode) {
+        this.requestName = requestName;
+        this.projectCode = projectCode;
     }
-    
-    public static Collection<BatchProjectDTO> getBatchProjects(Collection<BatchProjectDTO> requestDTOs){
-    	EntityManager em = Lot.entityManager();
-    	List<String> batchCodes = new ArrayList<String>();
-    	for (BatchProjectDTO requestDTO : requestDTOs){
-    		batchCodes.add(requestDTO.getRequestName());
-    	}
-    	String queryString = "Select new com.labsynch.labseer.dto.BatchProjectDTO(lot.corpName, lot.project) "
-    			+ "FROM Lot lot "
-    			+ "WHERE ";
-    	Collection<Query> queries = SimpleUtil.splitHqlInClause(em, queryString, "lot.corpName", batchCodes);
-    	Collection<BatchProjectDTO> results = new ArrayList<BatchProjectDTO>();
-		logger.debug("Querying for "+batchCodes.size()+" lot corpnames");
-		for (Query q : queries){
-			if (logger.isDebugEnabled()) logger.debug(q.unwrap(org.hibernate.Query.class).getQueryString());
-			results.addAll(q.getResultList());
-		}
-		for (BatchProjectDTO result : results){
-			if (result.getProjectCode() == null){
-				result.setProjectCode("");
-			}
-		}
-		return results;
+
+    public static Collection<BatchProjectDTO> getBatchProjects(Collection<BatchProjectDTO> requestDTOs) {
+        EntityManager em = Lot.entityManager();
+        List<String> batchCodes = new ArrayList<String>();
+        for (BatchProjectDTO requestDTO : requestDTOs) {
+            batchCodes.add(requestDTO.getRequestName());
+        }
+        String queryString = "Select new com.labsynch.labseer.dto.BatchProjectDTO(lot.corpName, lot.project) "
+                + "FROM Lot lot "
+                + "WHERE ";
+        Collection<Query> queries = SimpleUtil.splitHqlInClause(em, queryString, "lot.corpName", batchCodes);
+        Collection<BatchProjectDTO> results = new ArrayList<BatchProjectDTO>();
+        logger.debug("Querying for " + batchCodes.size() + " lot corpnames");
+        for (Query q : queries) {
+            if (logger.isDebugEnabled())
+                logger.debug(q.unwrap(org.hibernate.Query.class).getQueryString());
+            results.addAll(q.getResultList());
+        }
+        for (BatchProjectDTO result : results) {
+            if (result.getProjectCode() == null) {
+                result.setProjectCode("");
+            }
+        }
+        return results;
     }
-    
-   
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static BatchProjectDTO fromJsonToBatchProjectDTO(String json) {
+    public static BatchProjectDTO fromJsonToBatchProjectDTO(String json) {
         return new JSONDeserializer<BatchProjectDTO>()
-        .use(null, BatchProjectDTO.class).deserialize(json);
+                .use(null, BatchProjectDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<BatchProjectDTO> collection) {
+    public static String toJsonArray(Collection<BatchProjectDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<BatchProjectDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<BatchProjectDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<BatchProjectDTO> fromJsonArrayToBatchProes(String json) {
+    public static Collection<BatchProjectDTO> fromJsonArrayToBatchProes(String json) {
         return new JSONDeserializer<List<BatchProjectDTO>>()
-        .use("values", BatchProjectDTO.class).deserialize(json);
+                .use("values", BatchProjectDTO.class).deserialize(json);
     }
 
-	public String getRequestName() {
+    public String getRequestName() {
         return this.requestName;
     }
 
-	public void setRequestName(String requestName) {
+    public void setRequestName(String requestName) {
         this.requestName = requestName;
     }
 
-	public String getProjectCode() {
+    public String getProjectCode() {
         return this.projectCode;
     }
 
-	public void setProjectCode(String projectCode) {
+    public void setProjectCode(String projectCode) {
         this.projectCode = projectCode;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO.java
index e39162b46..bf7c64684 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertiesDTO.java
@@ -19,218 +19,235 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class BulkLoadPropertiesDTO {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(BulkLoadPropertiesDTO.class);
 
-    private Collection<SimpleBulkLoadPropertyDTO> sdfProperties;
-    
-    private Collection<SimpleBulkLoadPropertyDTO> dbProperties;
-    
-    private Collection<BulkLoadPropertyMappingDTO> bulkLoadProperties;
-    
-    private Collection<ErrorMessage> errors;
-    
-    private int numRecordsRead;
-    
-    private String templateName;
-    
-    public BulkLoadPropertiesDTO(Collection<SimpleBulkLoadPropertyDTO> dbProperties){
-    	this.dbProperties = dbProperties;
-    }
-    
-    public String toJson() {
-        return new JSONSerializer()
-        .include("sdfProperties", "dbProperties", "bulkLoadProperties", "errors").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
-    }
-    
-    private List<String> listAllMappedSdfProperties(){
-    	List<String> allPropNames = new ArrayList<String>();
-    	for (BulkLoadPropertyMappingDTO prop : this.bulkLoadProperties){
-    		allPropNames.add(prop.getSdfProperty());
-    	}
-    	return allPropNames;
-    }
-    
-    private List<String> listAllMappedDbProperties(){
-    	List<String> allPropNames = new ArrayList<String>();
-    	for (BulkLoadPropertyMappingDTO prop : this.bulkLoadProperties){
-    		allPropNames.add(prop.getDbProperty());
-    	}
-    	return allPropNames;
-    }
+	private Collection<SimpleBulkLoadPropertyDTO> sdfProperties;
+
+	private Collection<SimpleBulkLoadPropertyDTO> dbProperties;
+
+	private Collection<BulkLoadPropertyMappingDTO> bulkLoadProperties;
+
+	private Collection<ErrorMessage> errors;
+
+	private int numRecordsRead;
+
+	private String templateName;
+
+	public BulkLoadPropertiesDTO(Collection<SimpleBulkLoadPropertyDTO> dbProperties) {
+		this.dbProperties = dbProperties;
+	}
+
+	public String toJson() {
+		return new JSONSerializer()
+				.include("sdfProperties", "dbProperties", "bulkLoadProperties", "errors").exclude("*.class")
+				.transform(new ExcludeNulls(), void.class).serialize(this);
+	}
+
+	private List<String> listAllMappedSdfProperties() {
+		List<String> allPropNames = new ArrayList<String>();
+		for (BulkLoadPropertyMappingDTO prop : this.bulkLoadProperties) {
+			allPropNames.add(prop.getSdfProperty());
+		}
+		return allPropNames;
+	}
+
+	private List<String> listAllMappedDbProperties() {
+		List<String> allPropNames = new ArrayList<String>();
+		for (BulkLoadPropertyMappingDTO prop : this.bulkLoadProperties) {
+			allPropNames.add(prop.getDbProperty());
+		}
+		return allPropNames;
+	}
 
 	public void autoAssignMappings() {
-		if (this.bulkLoadProperties == null) this.bulkLoadProperties = new HashSet<BulkLoadPropertyMappingDTO>();
+		if (this.bulkLoadProperties == null)
+			this.bulkLoadProperties = new HashSet<BulkLoadPropertyMappingDTO>();
 		List<String> mappedSdfProperties = listAllMappedSdfProperties();
 		List<String> mappedDbProperties = listAllMappedDbProperties();
-		for (SimpleBulkLoadPropertyDTO sdfProp : this.sdfProperties){
-			//if this sdf property has not already been mapped
-			if (!mappedSdfProperties.contains(sdfProp.getName())){
+		for (SimpleBulkLoadPropertyDTO sdfProp : this.sdfProperties) {
+			// if this sdf property has not already been mapped
+			if (!mappedSdfProperties.contains(sdfProp.getName())) {
 				SimpleBulkLoadPropertyDTO dbPropMatch = null;
-				//we look for a matching db property that has not already been used
-				for (SimpleBulkLoadPropertyDTO dbProp : this.dbProperties){
-					if (sdfProp.getName().equalsIgnoreCase(dbProp.getName()) && !mappedDbProperties.contains(dbProp.getName())){
+				// we look for a matching db property that has not already been used
+				for (SimpleBulkLoadPropertyDTO dbProp : this.dbProperties) {
+					if (sdfProp.getName().equalsIgnoreCase(dbProp.getName())
+							&& !mappedDbProperties.contains(dbProp.getName())) {
 						dbPropMatch = dbProp;
 						break;
 					}
 				}
-				//if there was a new match, add the mapping
+				// if there was a new match, add the mapping
 				if (dbPropMatch != null && (dbPropMatch.getIgnored() == null || !dbPropMatch.getIgnored())) {
-					BulkLoadPropertyMappingDTO newMapping = new BulkLoadPropertyMappingDTO(dbPropMatch.getName(), sdfProp.getName(), dbPropMatch.getRequired(), null, null, false);
+					BulkLoadPropertyMappingDTO newMapping = new BulkLoadPropertyMappingDTO(dbPropMatch.getName(),
+							sdfProp.getName(), dbPropMatch.getRequired(), null, null, false);
 					this.bulkLoadProperties.add(newMapping);
 				}
 			}
 		}
-		
+
 	}
 
 	public void applyTemplateMappings(String templateName, String userName) {
-		if (this.bulkLoadProperties == null) this.bulkLoadProperties = new HashSet<BulkLoadPropertyMappingDTO>();
+		if (this.bulkLoadProperties == null)
+			this.bulkLoadProperties = new HashSet<BulkLoadPropertyMappingDTO>();
 		BulkLoadTemplate foundTemplate = null;
-		try{
-			foundTemplate = BulkLoadTemplate.findBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals(templateName, userName).getSingleResult();
-		}catch (NoResultException e){
-			logger.error("Template name: "+templateName+" with userName: "+userName+" could not be found.");
+		try {
+			foundTemplate = BulkLoadTemplate
+					.findBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals(templateName, userName)
+					.getSingleResult();
+		} catch (NoResultException e) {
+			logger.error("Template name: " + templateName + " with userName: " + userName + " could not be found.");
 			return;
 		}
-		Collection<BulkLoadPropertyMappingDTO> templateMappings = BulkLoadPropertyMappingDTO.fromJsonArrayToBulkLoadProes(foundTemplate.getJsonTemplate());
-		
+		Collection<BulkLoadPropertyMappingDTO> templateMappings = BulkLoadPropertyMappingDTO
+				.fromJsonArrayToBulkLoadProes(foundTemplate.getJsonTemplate());
+
 	}
 
 	public void cleanMappings() {
 		Collection<String> sdfPropertyNames = new HashSet<String>();
-		for (SimpleBulkLoadPropertyDTO prop : this.sdfProperties){
+		for (SimpleBulkLoadPropertyDTO prop : this.sdfProperties) {
 			sdfPropertyNames.add(prop.getName());
 		}
 		Collection<BulkLoadPropertyMappingDTO> cleanedMappings = new HashSet<BulkLoadPropertyMappingDTO>();
-		for (BulkLoadPropertyMappingDTO mapping : this.bulkLoadProperties){
-			if (mapping.getSdfProperty() != null && mapping.getSdfProperty().length() > 0 && !sdfPropertyNames.contains(mapping.getSdfProperty())) continue;
-			else cleanedMappings.add(mapping);
+		for (BulkLoadPropertyMappingDTO mapping : this.bulkLoadProperties) {
+			if (mapping.getSdfProperty() != null && mapping.getSdfProperty().length() > 0
+					&& !sdfPropertyNames.contains(mapping.getSdfProperty()))
+				continue;
+			else
+				cleanedMappings.add(mapping);
 		}
 		this.bulkLoadProperties = cleanedMappings;
-		
+
 	}
 
 	public void checkAgainstTemplate(String templateName) {
-		try{
+		try {
 			Collection<BulkLoadPropertyMappingDTO> templateMappings = null;
 			HashSet<String> templateSdfProperties = new HashSet<String>();
 			HashSet<String> mappingSdfProperties = new HashSet<String>();
-			
-			if (templateName != null ){
-				BulkLoadTemplate template = BulkLoadTemplate.findBulkLoadTemplatesByTemplateNameEquals(templateName).getSingleResult();	
+
+			if (templateName != null) {
+				BulkLoadTemplate template = BulkLoadTemplate.findBulkLoadTemplatesByTemplateNameEquals(templateName)
+						.getSingleResult();
 				templateMappings = BulkLoadPropertyMappingDTO.fromJsonArrayToBulkLoadProes(template.getJsonTemplate());
 
-				for (BulkLoadPropertyMappingDTO mapping : templateMappings){
-					if (mapping.getSdfProperty() != null) templateSdfProperties.add(mapping.getSdfProperty());
+				for (BulkLoadPropertyMappingDTO mapping : templateMappings) {
+					if (mapping.getSdfProperty() != null)
+						templateSdfProperties.add(mapping.getSdfProperty());
 				}
-				for (BulkLoadPropertyMappingDTO mapping : this.bulkLoadProperties){
-					if (mapping.getSdfProperty() != null) mappingSdfProperties.add(mapping.getSdfProperty());
+				for (BulkLoadPropertyMappingDTO mapping : this.bulkLoadProperties) {
+					if (mapping.getSdfProperty() != null)
+						mappingSdfProperties.add(mapping.getSdfProperty());
 				}
 				templateSdfProperties.removeAll(mappingSdfProperties);
 			}
-			
-			if (templateSdfProperties.size() != 0){
+
+			if (templateSdfProperties.size() != 0) {
 				ErrorMessage error = new ErrorMessage("warning", "");
 				String message = "The following sdf properties differ between the template and the mappings: ";
-				for (String sdfPropertyName : templateSdfProperties){
-					message += sdfPropertyName+", ";
+				for (String sdfPropertyName : templateSdfProperties) {
+					message += sdfPropertyName + ", ";
 				}
-				message = message.substring(0,message.length()-2);
+				message = message.substring(0, message.length() - 2);
 				error.setMessage(message);
 				this.errors.add(error);
-			}else{
-				//all sdf properties match. We check if their mapped db properties align.
-				for (BulkLoadPropertyMappingDTO mapping : this.bulkLoadProperties){
-					if (mapping.getSdfProperty() != null && templateMappings != null){
-						BulkLoadPropertyMappingDTO templateMapping = BulkLoadPropertyMappingDTO.findMappingBySdfPropertyEquals(templateMappings, mapping.getSdfProperty());
-						if (templateMapping != null && !mapping.getDbProperty().equals(templateMapping.getDbProperty())){
-							ErrorMessage error = new ErrorMessage("warning","");
+			} else {
+				// all sdf properties match. We check if their mapped db properties align.
+				for (BulkLoadPropertyMappingDTO mapping : this.bulkLoadProperties) {
+					if (mapping.getSdfProperty() != null && templateMappings != null) {
+						BulkLoadPropertyMappingDTO templateMapping = BulkLoadPropertyMappingDTO
+								.findMappingBySdfPropertyEquals(templateMappings, mapping.getSdfProperty());
+						if (templateMapping != null
+								&& !mapping.getDbProperty().equals(templateMapping.getDbProperty())) {
+							ErrorMessage error = new ErrorMessage("warning", "");
 							String message = "There is a mismatch in sdfProperty:dbProperty mappings between the template and the mappings: ";
-							message += templateMapping.getSdfProperty()+":"+templateMapping.getDbProperty()+" in the template vs. ";
-							message += mapping.getSdfProperty()+":"+mapping.getDbProperty()+" in the current mapping.";
+							message += templateMapping.getSdfProperty() + ":" + templateMapping.getDbProperty()
+									+ " in the template vs. ";
+							message += mapping.getSdfProperty() + ":" + mapping.getDbProperty()
+									+ " in the current mapping.";
 							error.setMessage(message);
 							this.errors.add(error);
 						}
 					}
 				}
 			}
-		}catch (Exception e){
-			logger.error("Caught exception comparing template to mappings.",e);
+		} catch (Exception e) {
+			logger.error("Caught exception comparing template to mappings.", e);
 		}
 	}
 
 	public Collection<SimpleBulkLoadPropertyDTO> getSdfProperties() {
-        return this.sdfProperties;
-    }
+		return this.sdfProperties;
+	}
 
 	public void setSdfProperties(Collection<SimpleBulkLoadPropertyDTO> sdfProperties) {
-        this.sdfProperties = sdfProperties;
-    }
+		this.sdfProperties = sdfProperties;
+	}
 
 	public Collection<SimpleBulkLoadPropertyDTO> getDbProperties() {
-        return this.dbProperties;
-    }
+		return this.dbProperties;
+	}
 
 	public void setDbProperties(Collection<SimpleBulkLoadPropertyDTO> dbProperties) {
-        this.dbProperties = dbProperties;
-    }
+		this.dbProperties = dbProperties;
+	}
 
 	public Collection<BulkLoadPropertyMappingDTO> getBulkLoadProperties() {
-        return this.bulkLoadProperties;
-    }
+		return this.bulkLoadProperties;
+	}
 
 	public void setBulkLoadProperties(Collection<BulkLoadPropertyMappingDTO> bulkLoadProperties) {
-        this.bulkLoadProperties = bulkLoadProperties;
-    }
+		this.bulkLoadProperties = bulkLoadProperties;
+	}
 
 	public Collection<ErrorMessage> getErrors() {
-        return this.errors;
-    }
+		return this.errors;
+	}
 
 	public void setErrors(Collection<ErrorMessage> errors) {
-        this.errors = errors;
-    }
+		this.errors = errors;
+	}
 
 	public int getNumRecordsRead() {
-        return this.numRecordsRead;
-    }
+		return this.numRecordsRead;
+	}
 
 	public void setNumRecordsRead(int numRecordsRead) {
-        this.numRecordsRead = numRecordsRead;
-    }
+		this.numRecordsRead = numRecordsRead;
+	}
 
 	public String getTemplateName() {
-        return this.templateName;
-    }
+		return this.templateName;
+	}
 
 	public void setTemplateName(String templateName) {
-        this.templateName = templateName;
-    }
+		this.templateName = templateName;
+	}
 
 	public static BulkLoadPropertiesDTO fromJsonToBulkLoadPropertiesDTO(String json) {
-        return new JSONDeserializer<BulkLoadPropertiesDTO>()
-        .use(null, BulkLoadPropertiesDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<BulkLoadPropertiesDTO>()
+				.use(null, BulkLoadPropertiesDTO.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<BulkLoadPropertiesDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<BulkLoadPropertiesDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<BulkLoadPropertiesDTO> fromJsonArrayToBulkLoadProes(String json) {
-        return new JSONDeserializer<List<BulkLoadPropertiesDTO>>()
-        .use("values", BulkLoadPropertiesDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<BulkLoadPropertiesDTO>>()
+				.use("values", BulkLoadPropertiesDTO.class).deserialize(json);
+	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertyMappingDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertyMappingDTO.java
index a0a1fe493..e2ce6d81f 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertyMappingDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadPropertyMappingDTO.java
@@ -14,134 +14,141 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class BulkLoadPropertyMappingDTO {
-	
+
     private static final Logger logger = LoggerFactory.getLogger(BulkLoadPropertyMappingDTO.class);
 
     private String dbProperty;
-    
+
     private String sdfProperty;
-    
+
     private boolean required;
 
     private Collection<String> invalidValues;
 
     private String defaultVal;
-	
+
     private boolean ignored;
-    
-    public BulkLoadPropertyMappingDTO(){
-    	
-    }
-    
-    public BulkLoadPropertyMappingDTO(String dbProperty, String sdfProperty, boolean required, String defaultVal, Collection<String> invalidValues, boolean ignored){
-    	this.dbProperty = dbProperty;
-    	this.sdfProperty = sdfProperty;
-    	this.required = required;
-    	this.defaultVal = defaultVal;
-    	this.invalidValues = invalidValues;
-    	this.ignored = ignored;
-    }
-    
+
+    public BulkLoadPropertyMappingDTO() {
+
+    }
+
+    public BulkLoadPropertyMappingDTO(String dbProperty, String sdfProperty, boolean required, String defaultVal,
+            Collection<String> invalidValues, boolean ignored) {
+        this.dbProperty = dbProperty;
+        this.sdfProperty = sdfProperty;
+        this.required = required;
+        this.defaultVal = defaultVal;
+        this.invalidValues = invalidValues;
+        this.ignored = ignored;
+    }
+
     public String toJson() {
-        return new JSONSerializer().exclude("*.class", "class").include("dbProperty","sdfProperty","required","defaultVal","ignored").transform(new ExcludeNulls(), void.class).serialize(this);
-    }
-    
-    public static BulkLoadPropertyMappingDTO findMappingByDbPropertyEquals(Collection<BulkLoadPropertyMappingDTO> mappings, String dbProperty){
-    	for (BulkLoadPropertyMappingDTO mapping: mappings){
-    		if (mapping.getDbProperty().equals(dbProperty)) return mapping;
-    	}
-    	return null;
-    }
-    
-    public static Collection<BulkLoadPropertyMappingDTO> findMappingsByDbPropertyEquals(Collection<BulkLoadPropertyMappingDTO> mappings, String dbProperty){
-    	Collection<BulkLoadPropertyMappingDTO> foundMappings = new HashSet<BulkLoadPropertyMappingDTO>();
-    	for (BulkLoadPropertyMappingDTO mapping: mappings){
-    		if (mapping.getDbProperty().equals(dbProperty)) foundMappings.add(mapping);
-    	}
-    	return foundMappings;
-    }
-    
-    public static BulkLoadPropertyMappingDTO findMappingBySdfPropertyEquals(Collection<BulkLoadPropertyMappingDTO> mappings, String sdfProperty){
-    	for (BulkLoadPropertyMappingDTO mapping: mappings){
-    		logger.debug(mapping.toJson());
-    		logger.debug(sdfProperty);
-    		if (mapping.getSdfProperty() != null && sdfProperty != null && mapping.getSdfProperty().equals(sdfProperty)) return mapping;
-    	}
-    	return null;
-    }
-    
-
-	public static BulkLoadPropertyMappingDTO fromJsonToBulkLoadPropertyMappingDTO(String json) {
+        return new JSONSerializer().exclude("*.class", "class")
+                .include("dbProperty", "sdfProperty", "required", "defaultVal", "ignored")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
+    }
+
+    public static BulkLoadPropertyMappingDTO findMappingByDbPropertyEquals(
+            Collection<BulkLoadPropertyMappingDTO> mappings, String dbProperty) {
+        for (BulkLoadPropertyMappingDTO mapping : mappings) {
+            if (mapping.getDbProperty().equals(dbProperty))
+                return mapping;
+        }
+        return null;
+    }
+
+    public static Collection<BulkLoadPropertyMappingDTO> findMappingsByDbPropertyEquals(
+            Collection<BulkLoadPropertyMappingDTO> mappings, String dbProperty) {
+        Collection<BulkLoadPropertyMappingDTO> foundMappings = new HashSet<BulkLoadPropertyMappingDTO>();
+        for (BulkLoadPropertyMappingDTO mapping : mappings) {
+            if (mapping.getDbProperty().equals(dbProperty))
+                foundMappings.add(mapping);
+        }
+        return foundMappings;
+    }
+
+    public static BulkLoadPropertyMappingDTO findMappingBySdfPropertyEquals(
+            Collection<BulkLoadPropertyMappingDTO> mappings, String sdfProperty) {
+        for (BulkLoadPropertyMappingDTO mapping : mappings) {
+            logger.debug(mapping.toJson());
+            logger.debug(sdfProperty);
+            if (mapping.getSdfProperty() != null && sdfProperty != null && mapping.getSdfProperty().equals(sdfProperty))
+                return mapping;
+        }
+        return null;
+    }
+
+    public static BulkLoadPropertyMappingDTO fromJsonToBulkLoadPropertyMappingDTO(String json) {
         return new JSONDeserializer<BulkLoadPropertyMappingDTO>()
-        .use(null, BulkLoadPropertyMappingDTO.class).deserialize(json);
+                .use(null, BulkLoadPropertyMappingDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<BulkLoadPropertyMappingDTO> collection) {
+    public static String toJsonArray(Collection<BulkLoadPropertyMappingDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<BulkLoadPropertyMappingDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<BulkLoadPropertyMappingDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<BulkLoadPropertyMappingDTO> fromJsonArrayToBulkLoadProes(String json) {
+    public static Collection<BulkLoadPropertyMappingDTO> fromJsonArrayToBulkLoadProes(String json) {
         return new JSONDeserializer<List<BulkLoadPropertyMappingDTO>>()
-        .use("values", BulkLoadPropertyMappingDTO.class).deserialize(json);
+                .use("values", BulkLoadPropertyMappingDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getDbProperty() {
+    public String getDbProperty() {
         return this.dbProperty;
     }
 
-	public void setDbProperty(String dbProperty) {
+    public void setDbProperty(String dbProperty) {
         this.dbProperty = dbProperty;
     }
 
-	public String getSdfProperty() {
+    public String getSdfProperty() {
         return this.sdfProperty;
     }
 
-	public void setSdfProperty(String sdfProperty) {
+    public void setSdfProperty(String sdfProperty) {
         this.sdfProperty = sdfProperty;
     }
 
-	public boolean isRequired() {
+    public boolean isRequired() {
         return this.required;
     }
 
-	public void setRequired(boolean required) {
+    public void setRequired(boolean required) {
         this.required = required;
     }
 
-	public Collection<String> getInvalidValues() {
+    public Collection<String> getInvalidValues() {
         return this.invalidValues;
     }
 
-	public void setInvalidValues(Collection<String> invalidValues) {
+    public void setInvalidValues(Collection<String> invalidValues) {
         this.invalidValues = invalidValues;
     }
 
-	public String getDefaultVal() {
+    public String getDefaultVal() {
         return this.defaultVal;
     }
 
-	public void setDefaultVal(String defaultVal) {
+    public void setDefaultVal(String defaultVal) {
         this.defaultVal = defaultVal;
     }
 
-	public boolean isIgnored() {
+    public boolean isIgnored() {
         return this.ignored;
     }
 
-	public void setIgnored(boolean ignored) {
+    public void setIgnored(boolean ignored) {
         this.ignored = ignored;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFRequestDTO.java
index 9c1e667c0..e8719fb38 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFRequestDTO.java
@@ -12,108 +12,108 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class BulkLoadRegisterSDFRequestDTO {
 
     private String filePath;
-            
+
     private String userName;
-    
+
     private Date fileDate;
-    
+
     private LabelPrefixDTO labelPrefix;
 
     private Boolean validate;
 
     private Collection<BulkLoadPropertyMappingDTO> mappings;
-    
-    public BulkLoadRegisterSDFRequestDTO(){
-    	
-    }
-    
-    public BulkLoadRegisterSDFRequestDTO(String filePath, String userName, Date fileDate, Boolean validate, Collection<BulkLoadPropertyMappingDTO> mappings){
-    	this.filePath = filePath;
-    	this.userName = userName;
-    	this.fileDate = fileDate;
-    	this.validate = validate;
-    	this.mappings = mappings;
-    }
-    
+
+    public BulkLoadRegisterSDFRequestDTO() {
+
+    }
+
+    public BulkLoadRegisterSDFRequestDTO(String filePath, String userName, Date fileDate, Boolean validate,
+            Collection<BulkLoadPropertyMappingDTO> mappings) {
+        this.filePath = filePath;
+        this.userName = userName;
+        this.fileDate = fileDate;
+        this.validate = validate;
+        this.mappings = mappings;
+    }
+
     public String toJson() {
         return new JSONSerializer()
-        .include("filePath", "fileDate", "userName",  "validate", "mappings").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+                .include("filePath", "fileDate", "userName", "validate", "mappings").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
-    
 
-	public String getFilePath() {
+    public String getFilePath() {
         return this.filePath;
     }
 
-	public void setFilePath(String filePath) {
+    public void setFilePath(String filePath) {
         this.filePath = filePath;
     }
 
-	public String getUserName() {
+    public String getUserName() {
         return this.userName;
     }
 
-	public void setUserName(String userName) {
+    public void setUserName(String userName) {
         this.userName = userName;
     }
 
-	public Date getFileDate() {
+    public Date getFileDate() {
         return this.fileDate;
     }
 
-	public void setFileDate(Date fileDate) {
+    public void setFileDate(Date fileDate) {
         this.fileDate = fileDate;
     }
 
-	public LabelPrefixDTO getLabelPrefix() {
+    public LabelPrefixDTO getLabelPrefix() {
         return this.labelPrefix;
     }
 
-	public void setLabelPrefix(LabelPrefixDTO labelPrefix) {
+    public void setLabelPrefix(LabelPrefixDTO labelPrefix) {
         this.labelPrefix = labelPrefix;
     }
 
-	public Boolean getValidate() {
+    public Boolean getValidate() {
         return this.validate;
     }
 
-	public void setValidate(Boolean validate) {
+    public void setValidate(Boolean validate) {
         this.validate = validate;
     }
 
-	public Collection<BulkLoadPropertyMappingDTO> getMappings() {
+    public Collection<BulkLoadPropertyMappingDTO> getMappings() {
         return this.mappings;
     }
 
-	public void setMappings(Collection<BulkLoadPropertyMappingDTO> mappings) {
+    public void setMappings(Collection<BulkLoadPropertyMappingDTO> mappings) {
         this.mappings = mappings;
     }
 
-	public static BulkLoadRegisterSDFRequestDTO fromJsonToBulkLoadRegisterSDFRequestDTO(String json) {
+    public static BulkLoadRegisterSDFRequestDTO fromJsonToBulkLoadRegisterSDFRequestDTO(String json) {
         return new JSONDeserializer<BulkLoadRegisterSDFRequestDTO>()
-        .use(null, BulkLoadRegisterSDFRequestDTO.class).deserialize(json);
+                .use(null, BulkLoadRegisterSDFRequestDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<BulkLoadRegisterSDFRequestDTO> collection) {
+    public static String toJsonArray(Collection<BulkLoadRegisterSDFRequestDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<BulkLoadRegisterSDFRequestDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<BulkLoadRegisterSDFRequestDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<BulkLoadRegisterSDFRequestDTO> fromJsonArrayToBulkLoes(String json) {
+    public static Collection<BulkLoadRegisterSDFRequestDTO> fromJsonArrayToBulkLoes(String json) {
         return new JSONDeserializer<List<BulkLoadRegisterSDFRequestDTO>>()
-        .use("values", BulkLoadRegisterSDFRequestDTO.class).deserialize(json);
+                .use("values", BulkLoadRegisterSDFRequestDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFResponseDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFResponseDTO.java
index ce8224e82..c19b71301 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFResponseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadRegisterSDFResponseDTO.java
@@ -11,76 +11,76 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class BulkLoadRegisterSDFResponseDTO {
 
     private String summary;
 
     private Collection<ValidationResponseDTO> results;
-    
+
     private Collection<String> reportFiles;
-    
-    public BulkLoadRegisterSDFResponseDTO(){
-    	
+
+    public BulkLoadRegisterSDFResponseDTO() {
+
     }
-    
-    public BulkLoadRegisterSDFResponseDTO(String summary, Collection<ValidationResponseDTO> results, Collection<String> reportFiles){
-    	this.summary = summary;
-    	this.results = results;
-    	this.reportFiles = reportFiles;
+
+    public BulkLoadRegisterSDFResponseDTO(String summary, Collection<ValidationResponseDTO> results,
+            Collection<String> reportFiles) {
+        this.summary = summary;
+        this.results = results;
+        this.reportFiles = reportFiles;
     }
-    
+
     public String toJson() {
         return new JSONSerializer()
-        .include("reportFiles", "results").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+                .include("reportFiles", "results").exclude("*.class").transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
-    
 
-	public String getSummary() {
+    public String getSummary() {
         return this.summary;
     }
 
-	public void setSummary(String summary) {
+    public void setSummary(String summary) {
         this.summary = summary;
     }
 
-	public Collection<ValidationResponseDTO> getResults() {
+    public Collection<ValidationResponseDTO> getResults() {
         return this.results;
     }
 
-	public void setResults(Collection<ValidationResponseDTO> results) {
+    public void setResults(Collection<ValidationResponseDTO> results) {
         this.results = results;
     }
 
-	public Collection<String> getReportFiles() {
+    public Collection<String> getReportFiles() {
         return this.reportFiles;
     }
 
-	public void setReportFiles(Collection<String> reportFiles) {
+    public void setReportFiles(Collection<String> reportFiles) {
         this.reportFiles = reportFiles;
     }
 
-	public static BulkLoadRegisterSDFResponseDTO fromJsonToBulkLoadRegisterSDFResponseDTO(String json) {
+    public static BulkLoadRegisterSDFResponseDTO fromJsonToBulkLoadRegisterSDFResponseDTO(String json) {
         return new JSONDeserializer<BulkLoadRegisterSDFResponseDTO>()
-        .use(null, BulkLoadRegisterSDFResponseDTO.class).deserialize(json);
+                .use(null, BulkLoadRegisterSDFResponseDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<BulkLoadRegisterSDFResponseDTO> collection) {
+    public static String toJsonArray(Collection<BulkLoadRegisterSDFResponseDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<BulkLoadRegisterSDFResponseDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<BulkLoadRegisterSDFResponseDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<BulkLoadRegisterSDFResponseDTO> fromJsonArrayToBulkLoadRegisterSDFRespoes(String json) {
+    public static Collection<BulkLoadRegisterSDFResponseDTO> fromJsonArrayToBulkLoadRegisterSDFRespoes(String json) {
         return new JSONDeserializer<List<BulkLoadRegisterSDFResponseDTO>>()
-        .use("values", BulkLoadRegisterSDFResponseDTO.class).deserialize(json);
+                .use("values", BulkLoadRegisterSDFResponseDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFPropertyRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFPropertyRequestDTO.java
index 615484acc..3c0399eec 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFPropertyRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFPropertyRequestDTO.java
@@ -9,103 +9,102 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class BulkLoadSDFPropertyRequestDTO {
 
     private String fileName;
-    
+
     private int numRecords;
-    
+
     private String templateName;
-    
+
     private String userName;
-    
+
     private Collection<BulkLoadPropertyMappingDTO> mappings;
-    
-    public BulkLoadSDFPropertyRequestDTO(){
-    	
+
+    public BulkLoadSDFPropertyRequestDTO() {
+
     }
-    
-    public BulkLoadSDFPropertyRequestDTO(String fileName, int numRecords, String templateName, String userName, Collection<BulkLoadPropertyMappingDTO> mappings){
-    	this.fileName = fileName;
-    	this.numRecords = numRecords;
-    	this.templateName = templateName;
-    	this.userName = userName;
-    	this.mappings = mappings;
+
+    public BulkLoadSDFPropertyRequestDTO(String fileName, int numRecords, String templateName, String userName,
+            Collection<BulkLoadPropertyMappingDTO> mappings) {
+        this.fileName = fileName;
+        this.numRecords = numRecords;
+        this.templateName = templateName;
+        this.userName = userName;
+        this.mappings = mappings;
     }
-    
 
-	public String getFileName() {
+    public String getFileName() {
         return this.fileName;
     }
 
-	public void setFileName(String fileName) {
+    public void setFileName(String fileName) {
         this.fileName = fileName;
     }
 
-	public int getNumRecords() {
+    public int getNumRecords() {
         return this.numRecords;
     }
 
-	public void setNumRecords(int numRecords) {
+    public void setNumRecords(int numRecords) {
         this.numRecords = numRecords;
     }
 
-	public String getTemplateName() {
+    public String getTemplateName() {
         return this.templateName;
     }
 
-	public void setTemplateName(String templateName) {
+    public void setTemplateName(String templateName) {
         this.templateName = templateName;
     }
 
-	public String getUserName() {
+    public String getUserName() {
         return this.userName;
     }
 
-	public void setUserName(String userName) {
+    public void setUserName(String userName) {
         this.userName = userName;
     }
 
-	public Collection<BulkLoadPropertyMappingDTO> getMappings() {
+    public Collection<BulkLoadPropertyMappingDTO> getMappings() {
         return this.mappings;
     }
 
-	public void setMappings(Collection<BulkLoadPropertyMappingDTO> mappings) {
+    public void setMappings(Collection<BulkLoadPropertyMappingDTO> mappings) {
         this.mappings = mappings;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static BulkLoadSDFPropertyRequestDTO fromJsonToBulkLoadSDFPropertyRequestDTO(String json) {
+    public static BulkLoadSDFPropertyRequestDTO fromJsonToBulkLoadSDFPropertyRequestDTO(String json) {
         return new JSONDeserializer<BulkLoadSDFPropertyRequestDTO>()
-        .use(null, BulkLoadSDFPropertyRequestDTO.class).deserialize(json);
+                .use(null, BulkLoadSDFPropertyRequestDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<BulkLoadSDFPropertyRequestDTO> collection) {
+    public static String toJsonArray(Collection<BulkLoadSDFPropertyRequestDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<BulkLoadSDFPropertyRequestDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<BulkLoadSDFPropertyRequestDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<BulkLoadSDFPropertyRequestDTO> fromJsonArrayToBulkLoadSDFProes(String json) {
+    public static Collection<BulkLoadSDFPropertyRequestDTO> fromJsonArrayToBulkLoadSDFProes(String json) {
         return new JSONDeserializer<List<BulkLoadSDFPropertyRequestDTO>>()
-        .use("values", BulkLoadSDFPropertyRequestDTO.class).deserialize(json);
+                .use("values", BulkLoadSDFPropertyRequestDTO.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO.java
index bc042c406..d397a6538 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadSDFValidationPropertiesResponseDTO.java
@@ -11,60 +11,63 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class BulkLoadSDFValidationPropertiesResponseDTO {
-		
+
     private Collection<String> chemists;
-    
+
     private Collection<String> projects;
-    
-    public BulkLoadSDFValidationPropertiesResponseDTO(Collection<String> chemists, Collection<String> projects){
-    	this.chemists = chemists;
-    	this.projects = projects;
+
+    public BulkLoadSDFValidationPropertiesResponseDTO(Collection<String> chemists, Collection<String> projects) {
+        this.chemists = chemists;
+        this.projects = projects;
     }
 
     public String toJson() {
         return new JSONSerializer()
-        .include("chemists","projects").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+                .include("chemists", "projects").exclude("*.class").transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
 
-	public Collection<String> getChemists() {
+    public Collection<String> getChemists() {
         return this.chemists;
     }
 
-	public void setChemists(Collection<String> chemists) {
+    public void setChemists(Collection<String> chemists) {
         this.chemists = chemists;
     }
 
-	public Collection<String> getProjects() {
+    public Collection<String> getProjects() {
         return this.projects;
     }
 
-	public void setProjects(Collection<String> projects) {
+    public void setProjects(Collection<String> projects) {
         this.projects = projects;
     }
 
-	public static BulkLoadSDFValidationPropertiesResponseDTO fromJsonToBulkLoadSDFValidationPropertiesResponseDTO(String json) {
+    public static BulkLoadSDFValidationPropertiesResponseDTO fromJsonToBulkLoadSDFValidationPropertiesResponseDTO(
+            String json) {
         return new JSONDeserializer<BulkLoadSDFValidationPropertiesResponseDTO>()
-        .use(null, BulkLoadSDFValidationPropertiesResponseDTO.class).deserialize(json);
+                .use(null, BulkLoadSDFValidationPropertiesResponseDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<BulkLoadSDFValidationPropertiesResponseDTO> collection) {
+    public static String toJsonArray(Collection<BulkLoadSDFValidationPropertiesResponseDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<BulkLoadSDFValidationPropertiesResponseDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<BulkLoadSDFValidationPropertiesResponseDTO> collection,
+            String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<BulkLoadSDFValidationPropertiesResponseDTO> fromJsonArrayToBulkLoadSDFValidationPropertiesRespoes(String json) {
+    public static Collection<BulkLoadSDFValidationPropertiesResponseDTO> fromJsonArrayToBulkLoadSDFValidationPropertiesRespoes(
+            String json) {
         return new JSONDeserializer<List<BulkLoadSDFValidationPropertiesResponseDTO>>()
-        .use("values", BulkLoadSDFValidationPropertiesResponseDTO.class).deserialize(json);
+                .use("values", BulkLoadSDFValidationPropertiesResponseDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO.java b/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO.java
index b4fdb3762..11159cd6f 100644
--- a/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkLoadTemplateDTO.java
@@ -9,84 +9,82 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class BulkLoadTemplateDTO {
-    
+
     private String templateName;
-    
+
     private String recordedBy;
-    
+
     private boolean ignored;
-    
+
     private Collection<BulkLoadPropertyMappingDTO> mappings;
-    
-    public BulkLoadTemplateDTO(){
-    }
 
+    public BulkLoadTemplateDTO() {
+    }
 
-	public String getTemplateName() {
+    public String getTemplateName() {
         return this.templateName;
     }
 
-	public void setTemplateName(String templateName) {
+    public void setTemplateName(String templateName) {
         this.templateName = templateName;
     }
 
-	public String getRecordedBy() {
+    public String getRecordedBy() {
         return this.recordedBy;
     }
 
-	public void setRecordedBy(String recordedBy) {
+    public void setRecordedBy(String recordedBy) {
         this.recordedBy = recordedBy;
     }
 
-	public boolean isIgnored() {
+    public boolean isIgnored() {
         return this.ignored;
     }
 
-	public void setIgnored(boolean ignored) {
+    public void setIgnored(boolean ignored) {
         this.ignored = ignored;
     }
 
-	public Collection<BulkLoadPropertyMappingDTO> getMappings() {
+    public Collection<BulkLoadPropertyMappingDTO> getMappings() {
         return this.mappings;
     }
 
-	public void setMappings(Collection<BulkLoadPropertyMappingDTO> mappings) {
+    public void setMappings(Collection<BulkLoadPropertyMappingDTO> mappings) {
         this.mappings = mappings;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static BulkLoadTemplateDTO fromJsonToBulkLoadTemplateDTO(String json) {
+    public static BulkLoadTemplateDTO fromJsonToBulkLoadTemplateDTO(String json) {
         return new JSONDeserializer<BulkLoadTemplateDTO>()
-        .use(null, BulkLoadTemplateDTO.class).deserialize(json);
+                .use(null, BulkLoadTemplateDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<BulkLoadTemplateDTO> collection) {
+    public static String toJsonArray(Collection<BulkLoadTemplateDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<BulkLoadTemplateDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<BulkLoadTemplateDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<BulkLoadTemplateDTO> fromJsonArrayToBulkLoes(String json) {
+    public static Collection<BulkLoadTemplateDTO> fromJsonArrayToBulkLoes(String json) {
         return new JSONDeserializer<List<BulkLoadTemplateDTO>>()
-        .use("values", BulkLoadTemplateDTO.class).deserialize(json);
+                .use("values", BulkLoadTemplateDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/BulkTransferPart1DTO.java b/src/main/java/com/labsynch/labseer/dto/BulkTransferPart1DTO.java
index 03cd3cd18..46507d1c8 100755
--- a/src/main/java/com/labsynch/labseer/dto/BulkTransferPart1DTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/BulkTransferPart1DTO.java
@@ -10,9 +10,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class BulkTransferPart1DTO {
-	
+
     private String sourceBarcode;
     private String sourceWell;
     private String destinationBarcode;
@@ -26,178 +25,175 @@ public class BulkTransferPart1DTO {
     private String volumeUnits;
     private String liquidType;
     private Date dateTime;
-    
+
     private String transferProtocol;
     private boolean isNewPlate;
     private String possibleTransferError;
-    
-    
-//    Source Barcode,Source Well,Destination Barcode,Destination Plate Size,
-//    Destination Well,Amount Transferred,Amount Units,Final Concentration,
-//    Concentration Units,Final Volume,Final Volume Units,Liquid Type,Date Time,
-//    Protocol,Is New Plate,Possible Transfer Error
-
 
+    // Source Barcode,Source Well,Destination Barcode,Destination Plate Size,
+    // Destination Well,Amount Transferred,Amount Units,Final Concentration,
+    // Concentration Units,Final Volume,Final Volume Units,Liquid Type,Date Time,
+    // Protocol,Is New Plate,Possible Transfer Error
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static BulkTransferPart1DTO fromJsonToBulkTransferPart1DTO(String json) {
+    public static BulkTransferPart1DTO fromJsonToBulkTransferPart1DTO(String json) {
         return new JSONDeserializer<BulkTransferPart1DTO>()
-        .use(null, BulkTransferPart1DTO.class).deserialize(json);
+                .use(null, BulkTransferPart1DTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<BulkTransferPart1DTO> collection) {
+    public static String toJsonArray(Collection<BulkTransferPart1DTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<BulkTransferPart1DTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<BulkTransferPart1DTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<BulkTransferPart1DTO> fromJsonArrayToBulkTransferPart1DTO(String json) {
+    public static Collection<BulkTransferPart1DTO> fromJsonArrayToBulkTransferPart1DTO(String json) {
         return new JSONDeserializer<List<BulkTransferPart1DTO>>()
-        .use("values", BulkTransferPart1DTO.class).deserialize(json);
+                .use("values", BulkTransferPart1DTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getSourceBarcode() {
+    public String getSourceBarcode() {
         return this.sourceBarcode;
     }
 
-	public void setSourceBarcode(String sourceBarcode) {
+    public void setSourceBarcode(String sourceBarcode) {
         this.sourceBarcode = sourceBarcode;
     }
 
-	public String getSourceWell() {
+    public String getSourceWell() {
         return this.sourceWell;
     }
 
-	public void setSourceWell(String sourceWell) {
+    public void setSourceWell(String sourceWell) {
         this.sourceWell = sourceWell;
     }
 
-	public String getDestinationBarcode() {
+    public String getDestinationBarcode() {
         return this.destinationBarcode;
     }
 
-	public void setDestinationBarcode(String destinationBarcode) {
+    public void setDestinationBarcode(String destinationBarcode) {
         this.destinationBarcode = destinationBarcode;
     }
 
-	public String getDestinationWell() {
+    public String getDestinationWell() {
         return this.destinationWell;
     }
 
-	public void setDestinationWell(String destinationWell) {
+    public void setDestinationWell(String destinationWell) {
         this.destinationWell = destinationWell;
     }
 
-	public String getDestinationPlateSize() {
+    public String getDestinationPlateSize() {
         return this.destinationPlateSize;
     }
 
-	public void setDestinationPlateSize(String destinationPlateSize) {
+    public void setDestinationPlateSize(String destinationPlateSize) {
         this.destinationPlateSize = destinationPlateSize;
     }
 
-	public String getAmountTransferred() {
+    public String getAmountTransferred() {
         return this.amountTransferred;
     }
 
-	public void setAmountTransferred(String amountTransferred) {
+    public void setAmountTransferred(String amountTransferred) {
         this.amountTransferred = amountTransferred;
     }
 
-	public String getAmountUnits() {
+    public String getAmountUnits() {
         return this.amountUnits;
     }
 
-	public void setAmountUnits(String amountUnits) {
+    public void setAmountUnits(String amountUnits) {
         this.amountUnits = amountUnits;
     }
 
-	public String getFinalConcentration() {
+    public String getFinalConcentration() {
         return this.finalConcentration;
     }
 
-	public void setFinalConcentration(String finalConcentration) {
+    public void setFinalConcentration(String finalConcentration) {
         this.finalConcentration = finalConcentration;
     }
 
-	public String getConcUnits() {
+    public String getConcUnits() {
         return this.concUnits;
     }
 
-	public void setConcUnits(String concUnits) {
+    public void setConcUnits(String concUnits) {
         this.concUnits = concUnits;
     }
 
-	public String getFinalVolume() {
+    public String getFinalVolume() {
         return this.finalVolume;
     }
 
-	public void setFinalVolume(String finalVolume) {
+    public void setFinalVolume(String finalVolume) {
         this.finalVolume = finalVolume;
     }
 
-	public String getVolumeUnits() {
+    public String getVolumeUnits() {
         return this.volumeUnits;
     }
 
-	public void setVolumeUnits(String volumeUnits) {
+    public void setVolumeUnits(String volumeUnits) {
         this.volumeUnits = volumeUnits;
     }
 
-	public String getLiquidType() {
+    public String getLiquidType() {
         return this.liquidType;
     }
 
-	public void setLiquidType(String liquidType) {
+    public void setLiquidType(String liquidType) {
         this.liquidType = liquidType;
     }
 
-	public Date getDateTime() {
+    public Date getDateTime() {
         return this.dateTime;
     }
 
-	public void setDateTime(Date dateTime) {
+    public void setDateTime(Date dateTime) {
         this.dateTime = dateTime;
     }
 
-	public String getTransferProtocol() {
+    public String getTransferProtocol() {
         return this.transferProtocol;
     }
 
-	public void setTransferProtocol(String transferProtocol) {
+    public void setTransferProtocol(String transferProtocol) {
         this.transferProtocol = transferProtocol;
     }
 
-	public boolean isIsNewPlate() {
+    public boolean isIsNewPlate() {
         return this.isNewPlate;
     }
 
-	public void setIsNewPlate(boolean isNewPlate) {
+    public void setIsNewPlate(boolean isNewPlate) {
         this.isNewPlate = isNewPlate;
     }
 
-	public String getPossibleTransferError() {
+    public String getPossibleTransferError() {
         return this.possibleTransferError;
     }
 
-	public void setPossibleTransferError(String possibleTransferError) {
+    public void setPossibleTransferError(String possibleTransferError) {
         this.possibleTransferError = possibleTransferError;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ChangePasswordDTO.java b/src/main/java/com/labsynch/labseer/dto/ChangePasswordDTO.java
index fe23f49c2..a387960a2 100644
--- a/src/main/java/com/labsynch/labseer/dto/ChangePasswordDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ChangePasswordDTO.java
@@ -9,85 +9,82 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ChangePasswordDTO {
-	
-	private String username;
-	
-	private String oldPassword;
-	
-	private String newPassword;
-	
-	private String newPasswordAgain;
-	
-	public ChangePasswordDTO(){
-	}
-
-	public String getUsername() {
+
+    private String username;
+
+    private String oldPassword;
+
+    private String newPassword;
+
+    private String newPasswordAgain;
+
+    public ChangePasswordDTO() {
+    }
+
+    public String getUsername() {
         return this.username;
     }
 
-	public void setUsername(String username) {
+    public void setUsername(String username) {
         this.username = username;
     }
 
-	public String getOldPassword() {
+    public String getOldPassword() {
         return this.oldPassword;
     }
 
-	public void setOldPassword(String oldPassword) {
+    public void setOldPassword(String oldPassword) {
         this.oldPassword = oldPassword;
     }
 
-	public String getNewPassword() {
+    public String getNewPassword() {
         return this.newPassword;
     }
 
-	public void setNewPassword(String newPassword) {
+    public void setNewPassword(String newPassword) {
         this.newPassword = newPassword;
     }
 
-	public String getNewPasswordAgain() {
+    public String getNewPasswordAgain() {
         return this.newPasswordAgain;
     }
 
-	public void setNewPasswordAgain(String newPasswordAgain) {
+    public void setNewPasswordAgain(String newPasswordAgain) {
         this.newPasswordAgain = newPasswordAgain;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ChangePasswordDTO fromJsonToChangePasswordDTO(String json) {
+    public static ChangePasswordDTO fromJsonToChangePasswordDTO(String json) {
         return new JSONDeserializer<ChangePasswordDTO>()
-        .use(null, ChangePasswordDTO.class).deserialize(json);
+                .use(null, ChangePasswordDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ChangePasswordDTO> collection) {
+    public static String toJsonArray(Collection<ChangePasswordDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ChangePasswordDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<ChangePasswordDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ChangePasswordDTO> fromJsonArrayToChangePasswoes(String json) {
+    public static Collection<ChangePasswordDTO> fromJsonArrayToChangePasswoes(String json) {
         return new JSONDeserializer<List<ChangePasswordDTO>>()
-        .use("values", ChangePasswordDTO.class).deserialize(json);
+                .use("values", ChangePasswordDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/CleanMolOptionsDTO.java b/src/main/java/com/labsynch/labseer/dto/CleanMolOptionsDTO.java
index 0d6679628..6538dcd87 100644
--- a/src/main/java/com/labsynch/labseer/dto/CleanMolOptionsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CleanMolOptionsDTO.java
@@ -9,62 +9,59 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class CleanMolOptionsDTO {
-	
-	private int dim;
-	
-	private String opts;
-	
-	
-
-	public String toJson() {
+
+    private int dim;
+
+    private String opts;
+
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static CleanMolOptionsDTO fromJsonToCleanMolOptionsDTO(String json) {
+    public static CleanMolOptionsDTO fromJsonToCleanMolOptionsDTO(String json) {
         return new JSONDeserializer<CleanMolOptionsDTO>()
-        .use(null, CleanMolOptionsDTO.class).deserialize(json);
+                .use(null, CleanMolOptionsDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<CleanMolOptionsDTO> collection) {
+    public static String toJsonArray(Collection<CleanMolOptionsDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<CleanMolOptionsDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<CleanMolOptionsDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<CleanMolOptionsDTO> fromJsonArrayToCleanMolOptioes(String json) {
+    public static Collection<CleanMolOptionsDTO> fromJsonArrayToCleanMolOptioes(String json) {
         return new JSONDeserializer<List<CleanMolOptionsDTO>>()
-        .use("values", CleanMolOptionsDTO.class).deserialize(json);
+                .use("values", CleanMolOptionsDTO.class).deserialize(json);
     }
 
-	public int getDim() {
+    public int getDim() {
         return this.dim;
     }
 
-	public void setDim(int dim) {
+    public void setDim(int dim) {
         this.dim = dim;
     }
 
-	public String getOpts() {
+    public String getOpts() {
         return this.opts;
     }
 
-	public void setOpts(String opts) {
+    public void setOpts(String opts) {
         this.opts = opts;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTO.java
index 80e9cf899..1cee9ed5b 100644
--- a/src/main/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTO.java
@@ -23,37 +23,38 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class CmpdRegBatchCodeDTO {
-	
+
 	public CmpdRegBatchCodeDTO() {
 	}
-	
+
 	public CmpdRegBatchCodeDTO(Collection<String> batchCodes) {
 		this.setBatchCodes(batchCodes);
 	}
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(CmpdRegBatchCodeDTO.class);
-	
+
 	private Collection<String> batchCodes;
-	
+
 	private Boolean linkedDataExists;
-	
+
 	private Collection<CodeTableDTO> linkedExperiments;
-	
+
 	private Collection<ErrorMessageDTO> errors;
-	
+
 	@Transactional
 	public String toJson() {
-	        return new JSONSerializer().exclude("*.class").include("linkedExperiments.*", "batchCodes.*").transform(new ExcludeNulls(), void.class).serialize(this);
-	    }
+		return new JSONSerializer().exclude("*.class").include("linkedExperiments.*", "batchCodes.*")
+				.transform(new ExcludeNulls(), void.class).serialize(this);
+	}
+
 	@Transactional
-	public void checkForDependentData(){
+	public void checkForDependentData() {
 		linkedDataExists = false;
 		linkedExperiments = new HashSet<CodeTableDTO>();
 		errors = new HashSet<ErrorMessageDTO>();
 		try {
-			if(countExperimentValueBatchCodes() > 0){
+			if (countExperimentValueBatchCodes() > 0) {
 				linkedDataExists = true;
 				logger.debug("Found Experiment values referencing provided batch codes. Retrieving experiment info.");
 				linkedExperiments.addAll(findExperimentCodeTableDTOsFromExperimentValueBatchCodes());
@@ -64,31 +65,31 @@ public void checkForDependentData(){
 			error.setMessage(e.getMessage());
 			errors.add(error);
 		}
-		if(countTreatmentGroupValueBatchCodes() > 0){
+		if (countTreatmentGroupValueBatchCodes() > 0) {
 			linkedDataExists = true;
 			logger.debug("Found TreatmentGroup values referencing provided batch codes. Retrieving experiment info.");
 			linkedExperiments.addAll(findExperimentCodeTableDTOsFromTreatmentGroupValueBatchCodes());
 		}
-		if(countAnalysisGroupValueBatchCodes() > 0){
+		if (countAnalysisGroupValueBatchCodes() > 0) {
 			linkedDataExists = true;
 			logger.debug("Found AnalysisGroup values referencing provided batch codes. Retrieving experiment info.");
 			linkedExperiments.addAll(findExperimentCodeTableDTOsFromAnalysisGroupValueBatchCodes());
 		}
-		if(countSubjectValueBatchCodes() > 0){
+		if (countSubjectValueBatchCodes() > 0) {
 			linkedDataExists = true;
 			logger.debug("Found Subject values referencing provided batch codes. Retrieving experiment info.");
 			linkedExperiments.addAll(findExperimentCodeTableDTOsFromSubjectValueBatchCodes());
 		}
-		if(countProtocolValueBatchCodes() > 0){
+		if (countProtocolValueBatchCodes() > 0) {
 			linkedDataExists = true;
 		}
-		if(countLsThingValueBatchCodes() > 0){
+		if (countLsThingValueBatchCodes() > 0) {
 			linkedDataExists = true;
 		}
-		if(countContainerValueBatchCodes() > 0){
+		if (countContainerValueBatchCodes() > 0) {
 			linkedDataExists = true;
 		}
-//		dedupeLinkedExperiments();
+		// dedupeLinkedExperiments();
 	}
 
 	private Collection<CodeTableDTO> findExperimentCodeTableDTOsFromExperimentValueBatchCodes() {
@@ -105,12 +106,12 @@ private Collection<CodeTableDTO> findExperimentCodeTableDTOsFromExperimentValueB
 				+ "AND e.ignored = false "
 				+ "AND el.ignored = false "
 				+ "AND ev.codeValue IN :batchCodes";
-		
+
 		TypedQuery<Map> q = em.createQuery(sql, Map.class);
 		q.setParameter("batchCodes", this.batchCodes);
-		
+
 		Collection<CodeTableDTO> experimentCodeTableDTOs = new HashSet<CodeTableDTO>();
-		for (Map<String,String> map : q.getResultList()){
+		for (Map<String, String> map : q.getResultList()) {
 			CodeTableDTO codeTable = new CodeTableDTO();
 			codeTable.setCode(map.get("code"));
 			codeTable.setName(map.get("name"));
@@ -137,12 +138,12 @@ private Collection<CodeTableDTO> findExperimentCodeTableDTOsFromAnalysisGroupVal
 				+ "AND e.ignored = false "
 				+ "AND el.ignored = false "
 				+ "AND agv.codeValue IN :batchCodes";
-		
+
 		TypedQuery<Map> q = em.createQuery(sql, Map.class);
 		q.setParameter("batchCodes", this.batchCodes);
-		
+
 		Collection<CodeTableDTO> experimentCodeTableDTOs = new HashSet<CodeTableDTO>();
-		for (Map<String,String> map : q.getResultList()){
+		for (Map<String, String> map : q.getResultList()) {
 			CodeTableDTO codeTable = new CodeTableDTO();
 			codeTable.setCode(map.get("code"));
 			codeTable.setName(map.get("name"));
@@ -172,12 +173,12 @@ private Collection<CodeTableDTO> findExperimentCodeTableDTOsFromSubjectValueBatc
 				+ "AND e.ignored = false "
 				+ "AND el.ignored = false "
 				+ "AND sv.codeValue IN :batchCodes";
-		
+
 		TypedQuery<Map> q = em.createQuery(sql, Map.class);
 		q.setParameter("batchCodes", this.batchCodes);
-		
+
 		Collection<CodeTableDTO> experimentCodeTableDTOs = new HashSet<CodeTableDTO>();
-		for (Map<String,String> map : q.getResultList()){
+		for (Map<String, String> map : q.getResultList()) {
 			CodeTableDTO codeTable = new CodeTableDTO();
 			codeTable.setCode(map.get("code"));
 			codeTable.setName(map.get("name"));
@@ -186,7 +187,7 @@ private Collection<CodeTableDTO> findExperimentCodeTableDTOsFromSubjectValueBatc
 		}
 		return experimentCodeTableDTOs;
 	}
-	
+
 	private Collection<CodeTableDTO> findExperimentCodeTableDTOsFromTreatmentGroupValueBatchCodes() {
 		EntityManager em = SubjectValue.entityManager();
 		String sql = "SELECT DISTINCT NEW MAP(e.codeName as code, el.labelText as name, tgv.codeValue as comments) "
@@ -206,12 +207,12 @@ private Collection<CodeTableDTO> findExperimentCodeTableDTOsFromTreatmentGroupVa
 				+ "AND e.ignored = false "
 				+ "AND el.ignored = false "
 				+ "AND tgv.codeValue IN :batchCodes";
-		
+
 		TypedQuery<Map> q = em.createQuery(sql, Map.class);
 		q.setParameter("batchCodes", this.batchCodes);
-		
+
 		Collection<CodeTableDTO> experimentCodeTableDTOs = new HashSet<CodeTableDTO>();
-		for (Map<String,String> map : q.getResultList()){
+		for (Map<String, String> map : q.getResultList()) {
 			CodeTableDTO codeTable = new CodeTableDTO();
 			codeTable.setCode(map.get("code"));
 			codeTable.setName(map.get("name"));
@@ -239,12 +240,12 @@ private int countSubjectValueBatchCodes() {
 				+ "AND ag.ignored = false "
 				+ "AND e.ignored = false "
 				+ "AND sv.codeValue IN :batchCodes";
-		
+
 		TypedQuery<Long> q = em.createQuery(sql, Long.class);
 		q.setParameter("batchCodes", this.batchCodes);
 		return q.getSingleResult().intValue();
 	}
-	
+
 	private int countTreatmentGroupValueBatchCodes() {
 		EntityManager em = TreatmentGroupValue.entityManager();
 		String sql = "SELECT COUNT(*) "
@@ -261,12 +262,12 @@ private int countTreatmentGroupValueBatchCodes() {
 				+ "AND ag.ignored = false "
 				+ "AND e.ignored = false "
 				+ "AND tgv.codeValue IN :batchCodes";
-		
+
 		TypedQuery<Long> q = em.createQuery(sql, Long.class);
 		q.setParameter("batchCodes", this.batchCodes);
 		return q.getSingleResult().intValue();
 	}
-	
+
 	private int countAnalysisGroupValueBatchCodes() {
 		EntityManager em = AnalysisGroupValue.entityManager();
 		String sql = "SELECT COUNT(*) "
@@ -281,12 +282,12 @@ private int countAnalysisGroupValueBatchCodes() {
 				+ "AND ag.ignored = false "
 				+ "AND e.ignored = false "
 				+ "AND agv.codeValue IN :batchCodes";
-		
+
 		TypedQuery<Long> q = em.createQuery(sql, Long.class);
 		q.setParameter("batchCodes", this.batchCodes);
 		return q.getSingleResult().intValue();
 	}
-	
+
 	private int countExperimentValueBatchCodes() {
 		EntityManager em = TreatmentGroupValue.entityManager();
 		String sql = "SELECT COUNT(*) "
@@ -299,12 +300,12 @@ private int countExperimentValueBatchCodes() {
 				+ "AND es.ignored = false "
 				+ "AND e.ignored = false "
 				+ "AND ev.codeValue IN :batchCodes";
-		
+
 		TypedQuery<Long> q = em.createQuery(sql, Long.class);
 		q.setParameter("batchCodes", batchCodes);
 		return q.getSingleResult().intValue();
 	}
-	
+
 	private int countLsThingValueBatchCodes() {
 		EntityManager em = TreatmentGroupValue.entityManager();
 		String sql = "SELECT COUNT(*) "
@@ -317,12 +318,12 @@ private int countLsThingValueBatchCodes() {
 				+ "AND lsts.ignored = false "
 				+ "AND lst.ignored = false "
 				+ "AND lstv.codeValue IN :batchCodes";
-		
+
 		TypedQuery<Long> q = em.createQuery(sql, Long.class);
 		q.setParameter("batchCodes", batchCodes);
 		return q.getSingleResult().intValue();
 	}
-	
+
 	private int countContainerValueBatchCodes() {
 		EntityManager em = TreatmentGroupValue.entityManager();
 		String sql = "SELECT COUNT(*) "
@@ -335,12 +336,12 @@ private int countContainerValueBatchCodes() {
 				+ "AND cs.ignored = false "
 				+ "AND c.ignored = false "
 				+ "AND cv.codeValue IN :batchCodes";
-		
+
 		TypedQuery<Long> q = em.createQuery(sql, Long.class);
 		q.setParameter("batchCodes", batchCodes);
 		return q.getSingleResult().intValue();
 	}
-	
+
 	private int countProtocolValueBatchCodes() {
 		EntityManager em = TreatmentGroupValue.entityManager();
 		String sql = "SELECT COUNT(*) "
@@ -353,85 +354,82 @@ private int countProtocolValueBatchCodes() {
 				+ "AND ps.ignored = false "
 				+ "AND p.ignored = false "
 				+ "AND pv.codeValue IN :batchCodes";
-		
+
 		TypedQuery<Long> q = em.createQuery(sql, Long.class);
 		q.setParameter("batchCodes", batchCodes);
 		return q.getSingleResult().intValue();
 	}
-	
+
 	private void dedupeLinkedExperiments() {
-		HashMap<String,String> experimentMap = new HashMap<String,String>();
-		logger.debug("Incoming size: "+linkedExperiments.size());
-		for (CodeTableDTO codeTable : linkedExperiments){
+		HashMap<String, String> experimentMap = new HashMap<String, String>();
+		logger.debug("Incoming size: " + linkedExperiments.size());
+		for (CodeTableDTO codeTable : linkedExperiments) {
 			experimentMap.put(codeTable.getCode(), codeTable.getName());
 		}
 		HashSet<CodeTableDTO> dedupedExperimentSet = new HashSet<CodeTableDTO>();
-		for (String key : experimentMap.keySet()){
+		for (String key : experimentMap.keySet()) {
 			CodeTableDTO experimentCodeTable = new CodeTableDTO();
 			experimentCodeTable.setCode(key);
 			experimentCodeTable.setName(experimentMap.get(key));
 			dedupedExperimentSet.add(experimentCodeTable);
 		}
 		linkedExperiments = dedupedExperimentSet;
-		logger.debug("Deduped size: "+linkedExperiments.size());
+		logger.debug("Deduped size: " + linkedExperiments.size());
 	}
 
-
 	public Collection<String> getBatchCodes() {
-        return this.batchCodes;
-    }
+		return this.batchCodes;
+	}
 
 	public void setBatchCodes(Collection<String> batchCodes) {
-        this.batchCodes = batchCodes;
-    }
+		this.batchCodes = batchCodes;
+	}
 
 	public Boolean getLinkedDataExists() {
-        return this.linkedDataExists;
-    }
+		return this.linkedDataExists;
+	}
 
 	public void setLinkedDataExists(Boolean linkedDataExists) {
-        this.linkedDataExists = linkedDataExists;
-    }
+		this.linkedDataExists = linkedDataExists;
+	}
 
 	public Collection<CodeTableDTO> getLinkedExperiments() {
-        return this.linkedExperiments;
-    }
+		return this.linkedExperiments;
+	}
 
 	public void setLinkedExperiments(Collection<CodeTableDTO> linkedExperiments) {
-        this.linkedExperiments = linkedExperiments;
-    }
+		this.linkedExperiments = linkedExperiments;
+	}
 
 	public Collection<ErrorMessageDTO> getErrors() {
-        return this.errors;
-    }
+		return this.errors;
+	}
 
 	public void setErrors(Collection<ErrorMessageDTO> errors) {
-        this.errors = errors;
-    }
+		this.errors = errors;
+	}
 
 	public static CmpdRegBatchCodeDTO fromJsonToCmpdRegBatchCodeDTO(String json) {
-        return new JSONDeserializer<CmpdRegBatchCodeDTO>()
-        .use(null, CmpdRegBatchCodeDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<CmpdRegBatchCodeDTO>()
+				.use(null, CmpdRegBatchCodeDTO.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<CmpdRegBatchCodeDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<CmpdRegBatchCodeDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<CmpdRegBatchCodeDTO> fromJsonArrayToCmpdRegBatchCoes(String json) {
-        return new JSONDeserializer<List<CmpdRegBatchCodeDTO>>()
-        .use("values", CmpdRegBatchCodeDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<CmpdRegBatchCodeDTO>>()
+				.use("values", CmpdRegBatchCodeDTO.class).deserialize(json);
+	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/CmpdRegStructureSearchDTO.java b/src/main/java/com/labsynch/labseer/dto/CmpdRegStructureSearchDTO.java
index 0000eb1ee..b6c38da7d 100755
--- a/src/main/java/com/labsynch/labseer/dto/CmpdRegStructureSearchDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CmpdRegStructureSearchDTO.java
@@ -9,92 +9,89 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+public class CmpdRegStructureSearchDTO {
 
+    private List<String> projects;
 
-public class CmpdRegStructureSearchDTO{
-	
-	private List<String> projects;
-	
-	private String searchType;
+    private String searchType;
 
-	private Float percentSimilarity;
-	
-	private String molStructure;
-  
-	private Integer maxResults;
+    private Float percentSimilarity;
 
+    private String molStructure;
 
-	public String toString() {
+    private Integer maxResults;
+
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static CmpdRegStructureSearchDTO fromJsonToCmpdRegStructureSearchDTO(String json) {
+    public static CmpdRegStructureSearchDTO fromJsonToCmpdRegStructureSearchDTO(String json) {
         return new JSONDeserializer<CmpdRegStructureSearchDTO>()
-        .use(null, CmpdRegStructureSearchDTO.class).deserialize(json);
+                .use(null, CmpdRegStructureSearchDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<CmpdRegStructureSearchDTO> collection) {
+    public static String toJsonArray(Collection<CmpdRegStructureSearchDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<CmpdRegStructureSearchDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<CmpdRegStructureSearchDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<CmpdRegStructureSearchDTO> fromJsonArrayToCmpdRegStructureSearchDTO(String json) {
+    public static Collection<CmpdRegStructureSearchDTO> fromJsonArrayToCmpdRegStructureSearchDTO(String json) {
         return new JSONDeserializer<List<CmpdRegStructureSearchDTO>>()
-        .use("values", CmpdRegStructureSearchDTO.class).deserialize(json);
+                .use("values", CmpdRegStructureSearchDTO.class).deserialize(json);
     }
 
-	public List<String> getProjects() {
+    public List<String> getProjects() {
         return this.projects;
     }
 
-	public void setProjects(List<String> projects) {
+    public void setProjects(List<String> projects) {
         this.projects = projects;
     }
 
-	public String getSearchType() {
+    public String getSearchType() {
         return this.searchType;
     }
 
-	public void setSearchType(String searchType) {
+    public void setSearchType(String searchType) {
         this.searchType = searchType;
     }
 
-	public Float getPercentSimilarity() {
+    public Float getPercentSimilarity() {
         return this.percentSimilarity;
     }
 
-	public void setPercentSimilarity(Float percentSimilarity) {
+    public void setPercentSimilarity(Float percentSimilarity) {
         this.percentSimilarity = percentSimilarity;
     }
 
-	public String getMolStructure() {
+    public String getMolStructure() {
         return this.molStructure;
     }
 
-	public void setMolStructure(String molStructure) {
+    public void setMolStructure(String molStructure) {
         this.molStructure = molStructure;
     }
 
-	public Integer getMaxResults() {
+    public Integer getMaxResults() {
         return this.maxResults;
     }
 
-	public void setMaxResults(Integer maxResults) {
+    public void setMaxResults(Integer maxResults) {
         this.maxResults = maxResults;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeLabelDTO.java b/src/main/java/com/labsynch/labseer/dto/CodeLabelDTO.java
index 07e1f29f4..3ef5ee916 100644
--- a/src/main/java/com/labsynch/labseer/dto/CodeLabelDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CodeLabelDTO.java
@@ -11,86 +11,83 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class CodeLabelDTO {
-	
-	private List<String> foundCodeNames;
-	
-	private String level;
-	
-	private String message;
-	
-	private String requestLabel;
-	
-	public CodeLabelDTO(){
-	}
-	
-	public CodeLabelDTO(String requestLabel, List<String> foundCodeNames){
-		this.requestLabel = requestLabel;
-		this.foundCodeNames = foundCodeNames;
-	}
-	
-	public CodeLabelDTO(String requestLabel, String level, String message){
-		this.requestLabel = requestLabel;
-		this.level = level;
-		this.message = message;
-	}
-	
-	public String toJson() {
-        return new JSONSerializer().include("foundCodeNames").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
-    }
-	
-	public static String toJsonArray(Collection<CodeLabelDTO> collection) {
-        return new JSONSerializer().include("foundCodeNames").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
-    }
-	
-
-
-	public List<String> getFoundCodeNames() {
+
+    private List<String> foundCodeNames;
+
+    private String level;
+
+    private String message;
+
+    private String requestLabel;
+
+    public CodeLabelDTO() {
+    }
+
+    public CodeLabelDTO(String requestLabel, List<String> foundCodeNames) {
+        this.requestLabel = requestLabel;
+        this.foundCodeNames = foundCodeNames;
+    }
+
+    public CodeLabelDTO(String requestLabel, String level, String message) {
+        this.requestLabel = requestLabel;
+        this.level = level;
+        this.message = message;
+    }
+
+    public String toJson() {
+        return new JSONSerializer().include("foundCodeNames").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
+    }
+
+    public static String toJsonArray(Collection<CodeLabelDTO> collection) {
+        return new JSONSerializer().include("foundCodeNames").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
+    }
+
+    public List<String> getFoundCodeNames() {
         return this.foundCodeNames;
     }
 
-	public void setFoundCodeNames(List<String> foundCodeNames) {
+    public void setFoundCodeNames(List<String> foundCodeNames) {
         this.foundCodeNames = foundCodeNames;
     }
 
-	public String getLevel() {
+    public String getLevel() {
         return this.level;
     }
 
-	public void setLevel(String level) {
+    public void setLevel(String level) {
         this.level = level;
     }
 
-	public String getMessage() {
+    public String getMessage() {
         return this.message;
     }
 
-	public void setMessage(String message) {
+    public void setMessage(String message) {
         this.message = message;
     }
 
-	public String getRequestLabel() {
+    public String getRequestLabel() {
         return this.requestLabel;
     }
 
-	public void setRequestLabel(String requestLabel) {
+    public void setRequestLabel(String requestLabel) {
         this.requestLabel = requestLabel;
     }
 
-	public static CodeLabelDTO fromJsonToCodeLabelDTO(String json) {
+    public static CodeLabelDTO fromJsonToCodeLabelDTO(String json) {
         return new JSONDeserializer<CodeLabelDTO>()
-        .use(null, CodeLabelDTO.class).deserialize(json);
+                .use(null, CodeLabelDTO.class).deserialize(json);
     }
 
-	public static Collection<CodeLabelDTO> fromJsonArrayToCoes(String json) {
+    public static Collection<CodeLabelDTO> fromJsonArrayToCoes(String json) {
         return new JSONDeserializer<List<CodeLabelDTO>>()
-        .use("values", CodeLabelDTO.class).deserialize(json);
+                .use("values", CodeLabelDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeNameQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/CodeNameQueryDTO.java
index b1a20d936..827aafcd2 100644
--- a/src/main/java/com/labsynch/labseer/dto/CodeNameQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CodeNameQueryDTO.java
@@ -9,63 +9,62 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class CodeNameQueryDTO {
 
-	String codeName;
-	String operator;
-	
-	public CodeNameQueryDTO(){
-		
-	}
+    String codeName;
+    String operator;
+
+    public CodeNameQueryDTO() {
+
+    }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getCodeName() {
+    public String getCodeName() {
         return this.codeName;
     }
 
-	public void setCodeName(String codeName) {
+    public void setCodeName(String codeName) {
         this.codeName = codeName;
     }
 
-	public String getOperator() {
+    public String getOperator() {
         return this.operator;
     }
 
-	public void setOperator(String operator) {
+    public void setOperator(String operator) {
         this.operator = operator;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static CodeNameQueryDTO fromJsonToCodeNameQueryDTO(String json) {
+    public static CodeNameQueryDTO fromJsonToCodeNameQueryDTO(String json) {
         return new JSONDeserializer<CodeNameQueryDTO>()
-        .use(null, CodeNameQueryDTO.class).deserialize(json);
+                .use(null, CodeNameQueryDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<CodeNameQueryDTO> collection) {
+    public static String toJsonArray(Collection<CodeNameQueryDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<CodeNameQueryDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<CodeNameQueryDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<CodeNameQueryDTO> fromJsonArrayToCoes(String json) {
+    public static Collection<CodeNameQueryDTO> fromJsonArrayToCoes(String json) {
         return new JSONDeserializer<List<CodeNameQueryDTO>>()
-        .use("values", CodeNameQueryDTO.class).deserialize(json);
+                .use("values", CodeNameQueryDTO.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeNameValueDTO.java b/src/main/java/com/labsynch/labseer/dto/CodeNameValueDTO.java
index 011fb1395..cf7c351b2 100644
--- a/src/main/java/com/labsynch/labseer/dto/CodeNameValueDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CodeNameValueDTO.java
@@ -12,60 +12,57 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class CodeNameValueDTO {
-		
-	private String codeName;
-	
-	private AbstractValue value;
-		
-	public CodeNameValueDTO(){
-	}
-	
-	public CodeNameValueDTO(String codeName, AbstractValue value){
-		this.codeName = codeName;
-		this.value = value;
-	}
-	
-	public String toJson() {
-        return new JSONSerializer().include("value").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+
+    private String codeName;
+
+    private AbstractValue value;
+
+    public CodeNameValueDTO() {
+    }
+
+    public CodeNameValueDTO(String codeName, AbstractValue value) {
+        this.codeName = codeName;
+        this.value = value;
     }
-	
-	public static String toJsonArray(Collection<CodeNameValueDTO> collection) {
-        return new JSONSerializer().include("value").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
+
+    public String toJson() {
+        return new JSONSerializer().include("value").exclude("*.class").transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
-	
 
+    public static String toJsonArray(Collection<CodeNameValueDTO> collection) {
+        return new JSONSerializer().include("value").exclude("*.class").transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
+    }
 
-	public static CodeNameValueDTO fromJsonToCodeNameValueDTO(String json) {
+    public static CodeNameValueDTO fromJsonToCodeNameValueDTO(String json) {
         return new JSONDeserializer<CodeNameValueDTO>()
-        .use(null, CodeNameValueDTO.class).deserialize(json);
+                .use(null, CodeNameValueDTO.class).deserialize(json);
     }
 
-	public static Collection<CodeNameValueDTO> fromJsonArrayToCoes(String json) {
+    public static Collection<CodeNameValueDTO> fromJsonArrayToCoes(String json) {
         return new JSONDeserializer<List<CodeNameValueDTO>>()
-        .use("values", CodeNameValueDTO.class).deserialize(json);
+                .use("values", CodeNameValueDTO.class).deserialize(json);
     }
 
-	public String getCodeName() {
+    public String getCodeName() {
         return this.codeName;
     }
 
-	public void setCodeName(String codeName) {
+    public void setCodeName(String codeName) {
         this.codeName = codeName;
     }
 
-	public AbstractValue getValue() {
+    public AbstractValue getValue() {
         return this.value;
     }
 
-	public void setValue(AbstractValue value) {
+    public void setValue(AbstractValue value) {
         this.value = value;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeTableDTO.java b/src/main/java/com/labsynch/labseer/dto/CodeTableDTO.java
index 4c373a871..fe8ba9a39 100755
--- a/src/main/java/com/labsynch/labseer/dto/CodeTableDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CodeTableDTO.java
@@ -16,13 +16,11 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class CodeTableDTO {
 
 	public CodeTableDTO() {
 	}
 
-	
 	public CodeTableDTO(DDictValue dDictVal) {
 		this.setId(dDictVal.getId());
 		this.setCode(dDictVal.getShortName());
@@ -34,14 +32,15 @@ public CodeTableDTO(DDictValue dDictVal) {
 		this.setCodeKind(dDictVal.getLsKind());
 		this.setCodeType(dDictVal.getLsType());
 	}
-	
+
 	public CodeTableDTO(Experiment experiment) {
 		this.setId(experiment.getId());
 		this.setCode(experiment.getCodeName());
-		try{
-			ExperimentLabel experimentLabel = ExperimentLabel.findExperimentPreferredName(experiment.getId()).getSingleResult();
+		try {
+			ExperimentLabel experimentLabel = ExperimentLabel.findExperimentPreferredName(experiment.getId())
+					.getSingleResult();
 			this.setName(experimentLabel.getLabelText());
-		}catch (IncorrectResultSizeDataAccessException e){
+		} catch (IncorrectResultSizeDataAccessException e) {
 			this.setName(experiment.getCodeName());
 		}
 		this.setIgnored(experiment.isIgnored());
@@ -49,193 +48,200 @@ public CodeTableDTO(Experiment experiment) {
 
 	private String code;
 
-//	private String codeName;  //code and codeName should be the same. Prefer to use codeName but older client code may be using code.
-//	//some classes use code, some use codeName
+	// private String codeName; //code and codeName should be the same. Prefer to
+	// use codeName but older client code may be using code.
+	// //some classes use code, some use codeName
 
 	private String name;
-	
+
 	private boolean ignored;
-	
+
 	private Integer displayOrder;
-	
+
 	private Long id;
-	
+
 	private String description;
 
 	private String comments;
-	
+
 	private String codeType;
-	
+
 	private String codeKind;
-	
-	private String codeOrigin;
 
+	private String codeOrigin;
 
-	
-	public static List<CodeTableDTO> sortCodeTables(List<CodeTableDTO> list){
+	public static List<CodeTableDTO> sortCodeTables(List<CodeTableDTO> list) {
 		List<CodeTableDTO> byDisplayOrder = new ArrayList<CodeTableDTO>();
 		List<CodeTableDTO> byName = new ArrayList<CodeTableDTO>();
 		for (CodeTableDTO e : list) {
-			if (e.displayOrder!=null) byDisplayOrder.add(e);
-			else byName.add(e);
+			if (e.displayOrder != null)
+				byDisplayOrder.add(e);
+			else
+				byName.add(e);
 		}
 		byDisplayOrder = mergesort(byDisplayOrder, "displayOrder");
 		byName = mergesort(byName, "name");
 		byDisplayOrder.addAll(byName);
 		return byDisplayOrder;
 	}
-	
-	private static List<CodeTableDTO> mergesort(List<CodeTableDTO> list, String sortBy){
-		if (list.size()<=1) return list;
-		
+
+	private static List<CodeTableDTO> mergesort(List<CodeTableDTO> list, String sortBy) {
+		if (list.size() <= 1)
+			return list;
+
 		List<CodeTableDTO> left = new ArrayList<CodeTableDTO>();
 		List<CodeTableDTO> right = new ArrayList<CodeTableDTO>();
-		int middle = list.size()/2;
-		for (int i=0; i<list.size(); i++) {
-			if (i<middle) left.add(list.get(i));
-			else right.add(list.get(i));
+		int middle = list.size() / 2;
+		for (int i = 0; i < list.size(); i++) {
+			if (i < middle)
+				left.add(list.get(i));
+			else
+				right.add(list.get(i));
 		}
 		left = mergesort(left, sortBy);
 		right = mergesort(right, sortBy);
 		return merge(left, right, sortBy);
 	}
-	
-	private static List<CodeTableDTO> merge(List<CodeTableDTO> left, List<CodeTableDTO> right, String sortBy){
+
+	private static List<CodeTableDTO> merge(List<CodeTableDTO> left, List<CodeTableDTO> right, String sortBy) {
 		List<CodeTableDTO> result = new ArrayList<CodeTableDTO>();
-		//loop through until both left and right are empty
-		while (left.size()>0 || right.size()>0){
-			if (left.size() > 0 && right.size() > 0) {			//if neither is empty, we must compare
-				int comp = 0;									//initialize our comparison result
-				if (sortBy.equals("displayOrder")) comp = left.get(0).compareByDisplayOrder(right.get(0));
-				if (sortBy.equals("name")) comp = left.get(0).compareByName(right.get(0));
-				
-				if (comp<=0) {									//if the first of the left comes before (or equal) the first of the right, add first(left)
+		// loop through until both left and right are empty
+		while (left.size() > 0 || right.size() > 0) {
+			if (left.size() > 0 && right.size() > 0) { // if neither is empty, we must compare
+				int comp = 0; // initialize our comparison result
+				if (sortBy.equals("displayOrder"))
+					comp = left.get(0).compareByDisplayOrder(right.get(0));
+				if (sortBy.equals("name"))
+					comp = left.get(0).compareByName(right.get(0));
+
+				if (comp <= 0) { // if the first of the left comes before (or equal) the first of the right, add
+									// first(left)
 					result.add(left.remove(0));
-				}else {
-					result.add(right.remove(0));				//else use the first from the right
+				} else {
+					result.add(right.remove(0)); // else use the first from the right
 				}
-				
-			} else if (left.size() > 0){ 						//if right is empty and left isn't, add first(left)
+
+			} else if (left.size() > 0) { // if right is empty and left isn't, add first(left)
 				result.add(left.remove(0));
-			}
-			else if (right.size() > 0){							//if left is empty and right isn't, add first(right)
+			} else if (right.size() > 0) { // if left is empty and right isn't, add first(right)
 				result.add(right.remove(0));
 			}
 		}
 		return result;
 	}
-	
+
 	private int compareByDisplayOrder(CodeTableDTO that) {
-		if (this.displayOrder < that.displayOrder) return -1;
-		if (this.displayOrder > that.displayOrder) return 1;
-		else return 0;
+		if (this.displayOrder < that.displayOrder)
+			return -1;
+		if (this.displayOrder > that.displayOrder)
+			return 1;
+		else
+			return 0;
 	}
-	
+
 	private int compareByName(CodeTableDTO that) {
 		return this.name.compareTo(that.name);
 	}
-	
+
 	public String toJson() {
-        return new JSONSerializer().exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
-    }
-	
+		return new JSONSerializer().exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+	}
+
 	public static String toJsonArray(Collection<CodeTableDTO> collection) {
-        return new JSONSerializer().exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
-    }
+		return new JSONSerializer().exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
+	}
 
 	public static CodeTableDTO fromJsonToCodeTableDTO(String json) {
-        return new JSONDeserializer<CodeTableDTO>()
-        .use(null, CodeTableDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<CodeTableDTO>()
+				.use(null, CodeTableDTO.class).deserialize(json);
+	}
 
 	public static Collection<CodeTableDTO> fromJsonArrayToCoes(String json) {
-        return new JSONDeserializer<List<CodeTableDTO>>()
-        .use("values", CodeTableDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<CodeTableDTO>>()
+				.use("values", CodeTableDTO.class).deserialize(json);
+	}
 
 	public String getCode() {
-        return this.code;
-    }
+		return this.code;
+	}
 
 	public void setCode(String code) {
-        this.code = code;
-    }
+		this.code = code;
+	}
 
 	public String getName() {
-        return this.name;
-    }
+		return this.name;
+	}
 
 	public void setName(String name) {
-        this.name = name;
-    }
+		this.name = name;
+	}
 
 	public boolean isIgnored() {
-        return this.ignored;
-    }
+		return this.ignored;
+	}
 
 	public void setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
+		this.ignored = ignored;
+	}
 
 	public Integer getDisplayOrder() {
-        return this.displayOrder;
-    }
+		return this.displayOrder;
+	}
 
 	public void setDisplayOrder(Integer displayOrder) {
-        this.displayOrder = displayOrder;
-    }
+		this.displayOrder = displayOrder;
+	}
 
 	public Long getId() {
-        return this.id;
-    }
+		return this.id;
+	}
 
 	public void setId(Long id) {
-        this.id = id;
-    }
+		this.id = id;
+	}
 
 	public String getDescription() {
-        return this.description;
-    }
+		return this.description;
+	}
 
 	public void setDescription(String description) {
-        this.description = description;
-    }
+		this.description = description;
+	}
 
 	public String getComments() {
-        return this.comments;
-    }
+		return this.comments;
+	}
 
 	public void setComments(String comments) {
-        this.comments = comments;
-    }
+		this.comments = comments;
+	}
 
 	public String getCodeType() {
-        return this.codeType;
-    }
+		return this.codeType;
+	}
 
 	public void setCodeType(String codeType) {
-        this.codeType = codeType;
-    }
+		this.codeType = codeType;
+	}
 
 	public String getCodeKind() {
-        return this.codeKind;
-    }
+		return this.codeKind;
+	}
 
 	public void setCodeKind(String codeKind) {
-        this.codeKind = codeKind;
-    }
+		this.codeKind = codeKind;
+	}
 
 	public String getCodeOrigin() {
-        return this.codeOrigin;
-    }
+		return this.codeOrigin;
+	}
 
 	public void setCodeOrigin(String codeOrigin) {
-        this.codeOrigin = codeOrigin;
-    }
+		this.codeOrigin = codeOrigin;
+	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/CodeTypeKindDTO.java b/src/main/java/com/labsynch/labseer/dto/CodeTypeKindDTO.java
index 2ddb86145..cbb35b6f4 100644
--- a/src/main/java/com/labsynch/labseer/dto/CodeTypeKindDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CodeTypeKindDTO.java
@@ -11,71 +11,66 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class CodeTypeKindDTO {
-		
-	private String codeName;
-	
-	private String lsType;
-	
-	private String lsKind;
-	
-	public CodeTypeKindDTO(){
-	}
-	
-	public CodeTypeKindDTO(String codeName, String lsType, String lsKind){
-		this.codeName = codeName;
-		this.lsType = lsType;
-		this.lsKind = lsKind;
-	}
-	
-	public String toJson() {
+
+    private String codeName;
+
+    private String lsType;
+
+    private String lsKind;
+
+    public CodeTypeKindDTO() {
+    }
+
+    public CodeTypeKindDTO(String codeName, String lsType, String lsKind) {
+        this.codeName = codeName;
+        this.lsType = lsType;
+        this.lsKind = lsKind;
+    }
+
+    public String toJson() {
         return new JSONSerializer().exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
     }
-	
-	public static String toJsonArray(Collection<CodeTypeKindDTO> collection) {
+
+    public static String toJsonArray(Collection<CodeTypeKindDTO> collection) {
         return new JSONSerializer().exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
     }
-	
-
 
-	public static CodeTypeKindDTO fromJsonToCodeTypeKindDTO(String json) {
+    public static CodeTypeKindDTO fromJsonToCodeTypeKindDTO(String json) {
         return new JSONDeserializer<CodeTypeKindDTO>()
-        .use(null, CodeTypeKindDTO.class).deserialize(json);
+                .use(null, CodeTypeKindDTO.class).deserialize(json);
     }
 
-	public static Collection<CodeTypeKindDTO> fromJsonArrayToCoes(String json) {
+    public static Collection<CodeTypeKindDTO> fromJsonArrayToCoes(String json) {
         return new JSONDeserializer<List<CodeTypeKindDTO>>()
-        .use("values", CodeTypeKindDTO.class).deserialize(json);
+                .use("values", CodeTypeKindDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getCodeName() {
+    public String getCodeName() {
         return this.codeName;
     }
 
-	public void setCodeName(String codeName) {
+    public void setCodeName(String codeName) {
         this.codeName = codeName;
     }
 
-	public String getLsType() {
+    public String getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(String lsType) {
+    public void setLsType(String lsType) {
         this.lsType = lsType;
     }
 
-	public String getLsKind() {
+    public String getLsKind() {
         return this.lsKind;
     }
 
-	public void setLsKind(String lsKind) {
+    public void setLsKind(String lsKind) {
         this.lsKind = lsKind;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerBatchCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerBatchCodeDTO.java
index e70e9de6c..578ed3410 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerBatchCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerBatchCodeDTO.java
@@ -11,93 +11,89 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ContainerBatchCodeDTO {
-	
-	private String batchCode;
-	
-	private String containerCodeName;
-	
-	private String containerBarcode;
-	
-	private String wellCodeName;
-	
-	private String wellName;
-		
-	public ContainerBatchCodeDTO(){
-	}
-	
-	public ContainerBatchCodeDTO(String batchCode, String containerCodeName, String containerBarcode, String wellCodeName, String wellName){
-		this.batchCode = batchCode;
-		this.containerCodeName = containerCodeName;
-		this.containerBarcode = containerBarcode;
-		this.wellCodeName = wellCodeName;
-		this.wellName = wellName;
-	}
-	
-	public String toJson() {
+
+    private String batchCode;
+
+    private String containerCodeName;
+
+    private String containerBarcode;
+
+    private String wellCodeName;
+
+    private String wellName;
+
+    public ContainerBatchCodeDTO() {
+    }
+
+    public ContainerBatchCodeDTO(String batchCode, String containerCodeName, String containerBarcode,
+            String wellCodeName, String wellName) {
+        this.batchCode = batchCode;
+        this.containerCodeName = containerCodeName;
+        this.containerBarcode = containerBarcode;
+        this.wellCodeName = wellCodeName;
+        this.wellName = wellName;
+    }
+
+    public String toJson() {
         return new JSONSerializer().exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
     }
-	
-	public static String toJsonArray(Collection<ContainerBatchCodeDTO> collection) {
+
+    public static String toJsonArray(Collection<ContainerBatchCodeDTO> collection) {
         return new JSONSerializer().exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
     }
-	
-
 
-	public String getBatchCode() {
+    public String getBatchCode() {
         return this.batchCode;
     }
 
-	public void setBatchCode(String batchCode) {
+    public void setBatchCode(String batchCode) {
         this.batchCode = batchCode;
     }
 
-	public String getContainerCodeName() {
+    public String getContainerCodeName() {
         return this.containerCodeName;
     }
 
-	public void setContainerCodeName(String containerCodeName) {
+    public void setContainerCodeName(String containerCodeName) {
         this.containerCodeName = containerCodeName;
     }
 
-	public String getContainerBarcode() {
+    public String getContainerBarcode() {
         return this.containerBarcode;
     }
 
-	public void setContainerBarcode(String containerBarcode) {
+    public void setContainerBarcode(String containerBarcode) {
         this.containerBarcode = containerBarcode;
     }
 
-	public String getWellCodeName() {
+    public String getWellCodeName() {
         return this.wellCodeName;
     }
 
-	public void setWellCodeName(String wellCodeName) {
+    public void setWellCodeName(String wellCodeName) {
         this.wellCodeName = wellCodeName;
     }
 
-	public String getWellName() {
+    public String getWellName() {
         return this.wellName;
     }
 
-	public void setWellName(String wellName) {
+    public void setWellName(String wellName) {
         this.wellName = wellName;
     }
 
-	public static ContainerBatchCodeDTO fromJsonToContainerBatchCodeDTO(String json) {
+    public static ContainerBatchCodeDTO fromJsonToContainerBatchCodeDTO(String json) {
         return new JSONDeserializer<ContainerBatchCodeDTO>()
-        .use(null, ContainerBatchCodeDTO.class).deserialize(json);
+                .use(null, ContainerBatchCodeDTO.class).deserialize(json);
     }
 
-	public static Collection<ContainerBatchCodeDTO> fromJsonArrayToContainerBatchCoes(String json) {
+    public static Collection<ContainerBatchCodeDTO> fromJsonArrayToContainerBatchCoes(String json) {
         return new JSONDeserializer<List<ContainerBatchCodeDTO>>()
-        .use("values", ContainerBatchCodeDTO.class).deserialize(json);
+                .use("values", ContainerBatchCodeDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerBrowserQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerBrowserQueryDTO.java
index 4421d6e85..a5e1f15aa 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerBrowserQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerBrowserQueryDTO.java
@@ -9,63 +9,59 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ContainerBrowserQueryDTO {
-	
-	private String queryString;
-	
-	private ContainerQueryDTO queryDTO;
 
+    private String queryString;
+
+    private ContainerQueryDTO queryDTO;
 
-	public String getQueryString() {
+    public String getQueryString() {
         return this.queryString;
     }
 
-	public void setQueryString(String queryString) {
+    public void setQueryString(String queryString) {
         this.queryString = queryString;
     }
 
-	public ContainerQueryDTO getQueryDTO() {
+    public ContainerQueryDTO getQueryDTO() {
         return this.queryDTO;
     }
 
-	public void setQueryDTO(ContainerQueryDTO queryDTO) {
+    public void setQueryDTO(ContainerQueryDTO queryDTO) {
         this.queryDTO = queryDTO;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ContainerBrowserQueryDTO fromJsonToContainerBrowserQueryDTO(String json) {
+    public static ContainerBrowserQueryDTO fromJsonToContainerBrowserQueryDTO(String json) {
         return new JSONDeserializer<ContainerBrowserQueryDTO>()
-        .use(null, ContainerBrowserQueryDTO.class).deserialize(json);
+                .use(null, ContainerBrowserQueryDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ContainerBrowserQueryDTO> collection) {
+    public static String toJsonArray(Collection<ContainerBrowserQueryDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ContainerBrowserQueryDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<ContainerBrowserQueryDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ContainerBrowserQueryDTO> fromJsonArrayToContainerBroes(String json) {
+    public static Collection<ContainerBrowserQueryDTO> fromJsonArrayToContainerBroes(String json) {
         return new JSONDeserializer<List<ContainerBrowserQueryDTO>>()
-        .use("values", ContainerBrowserQueryDTO.class).deserialize(json);
+                .use("values", ContainerBrowserQueryDTO.class).deserialize(json);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerCodeNameStateDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerCodeNameStateDTO.java
index b7d32ffe9..33308dbdc 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerCodeNameStateDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerCodeNameStateDTO.java
@@ -12,57 +12,57 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ContainerCodeNameStateDTO {
-	
-	 public ContainerCodeNameStateDTO() {
-	 }
-	
-    public ContainerCodeNameStateDTO(String containerCodeName, ContainerState state) {
-    		this.containerCodeName = containerCodeName;
-    		this.lsState = state;
+
+    public ContainerCodeNameStateDTO() {
     }
 
-	private String containerCodeName;
-	
-	private ContainerState lsState;
-	
-	public String toJson() {
-        return new JSONSerializer().include("lsState.lsValues").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+    public ContainerCodeNameStateDTO(String containerCodeName, ContainerState state) {
+        this.containerCodeName = containerCodeName;
+        this.lsState = state;
     }
-	
-	public static String toJsonArray(Collection<ContainerCodeNameStateDTO> collection) {
-        return new JSONSerializer().include("lsState.lsValues").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
+
+    private String containerCodeName;
+
+    private ContainerState lsState;
+
+    public String toJson() {
+        return new JSONSerializer().include("lsState.lsValues").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
+    public static String toJsonArray(Collection<ContainerCodeNameStateDTO> collection) {
+        return new JSONSerializer().include("lsState.lsValues").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
+    }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getContainerCodeName() {
+    public String getContainerCodeName() {
         return this.containerCodeName;
     }
 
-	public void setContainerCodeName(String containerCodeName) {
+    public void setContainerCodeName(String containerCodeName) {
         this.containerCodeName = containerCodeName;
     }
 
-	public ContainerState getLsState() {
+    public ContainerState getLsState() {
         return this.lsState;
     }
 
-	public void setLsState(ContainerState lsState) {
+    public void setLsState(ContainerState lsState) {
         this.lsState = lsState;
     }
 
-	public static ContainerCodeNameStateDTO fromJsonToContainerCodeNameStateDTO(String json) {
+    public static ContainerCodeNameStateDTO fromJsonToContainerCodeNameStateDTO(String json) {
         return new JSONDeserializer<ContainerCodeNameStateDTO>()
-        .use(null, ContainerCodeNameStateDTO.class).deserialize(json);
+                .use(null, ContainerCodeNameStateDTO.class).deserialize(json);
     }
 
-	public static Collection<ContainerCodeNameStateDTO> fromJsonArrayToContainerCoes(String json) {
+    public static Collection<ContainerCodeNameStateDTO> fromJsonArrayToContainerCoes(String json) {
         return new JSONDeserializer<List<ContainerCodeNameStateDTO>>()
-        .use("values", ContainerCodeNameStateDTO.class).deserialize(json);
+                .use("values", ContainerCodeNameStateDTO.class).deserialize(json);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerDependencyCheckDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerDependencyCheckDTO.java
index 769012b8b..b250a0a7e 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerDependencyCheckDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerDependencyCheckDTO.java
@@ -23,170 +23,172 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ContainerDependencyCheckDTO {
-	
+
 	public ContainerDependencyCheckDTO() {
 		this.linkedDataExists = false;
 		this.dependentCorpNames = new HashSet<String>();
 		this.linkedExperiments = new HashSet<CodeTableDTO>();
 	}
-	
+
 	public ContainerDependencyCheckDTO(Container queryContainer) {
 		this.setQueryContainer(queryContainer);
 	}
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(ContainerDependencyCheckDTO.class);
-	
+
 	private Container queryContainer;
-	
+
 	private Collection<String> dependentCorpNames;
-	
+
 	private boolean linkedDataExists;
-	
+
 	private Collection<CodeTableDTO> linkedExperiments;
-	
+
 	private Collection<ErrorMessageDTO> errors;
-	
+
 	@Transactional
 	public String toJson() {
-	        return new JSONSerializer().exclude("*.class").include("linkedExperiments.*", "queryCodeNames.*", "dependentCorpNames.*").transform(new ExcludeNulls(), void.class).serialize(this);
-	    }
-	
+		return new JSONSerializer().exclude("*.class")
+				.include("linkedExperiments.*", "queryCodeNames.*", "dependentCorpNames.*")
+				.transform(new ExcludeNulls(), void.class).serialize(this);
+	}
+
 	@Transactional
-	public void checkForDependentData(Container container, Collection<Container> members){
+	public void checkForDependentData(Container container, Collection<Container> members) {
 		errors = new HashSet<ErrorMessageDTO>();
 		checkForSubjectInteractions(container);
-		if (!members.isEmpty()) checkMemberSubjectInteractions(members);
+		if (!members.isEmpty())
+			checkMemberSubjectInteractions(members);
 	}
 
 	private void checkMemberSubjectInteractions(Collection<Container> members) {
 		Collection<Subject> referencedSubjects = new HashSet<Subject>();
-		for (Container member : members){
+		for (Container member : members) {
 			Collection<ItxSubjectContainer> subjectItxs = member.getSubjects();
-			for (ItxSubjectContainer subjectItx : subjectItxs){
-				if (!subjectItx.isIgnored() && !subjectItx.getSubject().isIgnored()) referencedSubjects.add(subjectItx.getSubject());
+			for (ItxSubjectContainer subjectItx : subjectItxs) {
+				if (!subjectItx.isIgnored() && !subjectItx.getSubject().isIgnored())
+					referencedSubjects.add(subjectItx.getSubject());
 			}
 		}
-		if (!referencedSubjects.isEmpty()){
+		if (!referencedSubjects.isEmpty()) {
 			Collection<Experiment> referencedExperiments = getReferencedExperiments(referencedSubjects);
-			for (Experiment experiment : referencedExperiments){
+			for (Experiment experiment : referencedExperiments) {
 				this.linkedExperiments.add(new CodeTableDTO(experiment));
 			}
-			if (!this.linkedExperiments.isEmpty()) this.linkedDataExists = true;
+			if (!this.linkedExperiments.isEmpty())
+				this.linkedDataExists = true;
 		}
 	}
 
 	private void checkForSubjectInteractions(Container container) {
 		Collection<Subject> referencedSubjects = new HashSet<Subject>();
 		Collection<ItxSubjectContainer> subjectItxs = container.getSubjects();
-		for (ItxSubjectContainer subjectItx : subjectItxs){
-			if (!subjectItx.isIgnored() && !subjectItx.getSubject().isIgnored()) referencedSubjects.add(subjectItx.getSubject());
+		for (ItxSubjectContainer subjectItx : subjectItxs) {
+			if (!subjectItx.isIgnored() && !subjectItx.getSubject().isIgnored())
+				referencedSubjects.add(subjectItx.getSubject());
 		}
-		if (!referencedSubjects.isEmpty()){
+		if (!referencedSubjects.isEmpty()) {
 			Collection<Experiment> referencedExperiments = getReferencedExperiments(referencedSubjects);
-			for (Experiment experiment : referencedExperiments){
+			for (Experiment experiment : referencedExperiments) {
 				this.linkedExperiments.add(new CodeTableDTO(experiment));
 			}
-			if (!this.linkedExperiments.isEmpty()) this.linkedDataExists = true;
+			if (!this.linkedExperiments.isEmpty())
+				this.linkedDataExists = true;
 		}
 	}
 
-
 	private void dedupeLinkedExperiments() {
-		HashMap<String,String> experimentMap = new HashMap<String,String>();
-		logger.debug("Incoming size: "+linkedExperiments.size());
-		for (CodeTableDTO codeTable : linkedExperiments){
+		HashMap<String, String> experimentMap = new HashMap<String, String>();
+		logger.debug("Incoming size: " + linkedExperiments.size());
+		for (CodeTableDTO codeTable : linkedExperiments) {
 			experimentMap.put(codeTable.getCode(), codeTable.getName());
 		}
 		HashSet<CodeTableDTO> dedupedExperimentSet = new HashSet<CodeTableDTO>();
-		for (String key : experimentMap.keySet()){
+		for (String key : experimentMap.keySet()) {
 			CodeTableDTO experimentCodeTable = new CodeTableDTO();
 			experimentCodeTable.setCode(key);
 			experimentCodeTable.setName(experimentMap.get(key));
 			dedupedExperimentSet.add(experimentCodeTable);
 		}
 		linkedExperiments = dedupedExperimentSet;
-		logger.debug("Deduped size: "+linkedExperiments.size());
+		logger.debug("Deduped size: " + linkedExperiments.size());
 	}
-	
-	private Collection<Experiment> getReferencedExperiments(Collection<Subject> subjects){
+
+	private Collection<Experiment> getReferencedExperiments(Collection<Subject> subjects) {
 		String hql = "SELECT experiment.id FROM Subject subject JOIN subject.treatmentGroups as treatmentGroup JOIN treatmentGroup.analysisGroups as analysisGroup JOIN analysisGroup.experiments as experiment WHERE subject IN :subjects";
 		EntityManager em = Subject.entityManager();
 		TypedQuery<Long> query = em.createQuery(hql, Long.class);
 		query.setParameter("subjects", subjects);
 		Collection<Long> experimentIds = query.getResultList();
 		Collection<Experiment> results = new HashSet<Experiment>();
-		for (Long experimentId : experimentIds){
+		for (Long experimentId : experimentIds) {
 			results.add(Experiment.findExperiment(experimentId));
 		}
 		return results;
 	}
-	
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 
 	public Container getQueryContainer() {
-        return this.queryContainer;
-    }
+		return this.queryContainer;
+	}
 
 	public void setQueryContainer(Container queryContainer) {
-        this.queryContainer = queryContainer;
-    }
+		this.queryContainer = queryContainer;
+	}
 
 	public Collection<String> getDependentCorpNames() {
-        return this.dependentCorpNames;
-    }
+		return this.dependentCorpNames;
+	}
 
 	public void setDependentCorpNames(Collection<String> dependentCorpNames) {
-        this.dependentCorpNames = dependentCorpNames;
-    }
+		this.dependentCorpNames = dependentCorpNames;
+	}
 
 	public boolean isLinkedDataExists() {
-        return this.linkedDataExists;
-    }
+		return this.linkedDataExists;
+	}
 
 	public void setLinkedDataExists(boolean linkedDataExists) {
-        this.linkedDataExists = linkedDataExists;
-    }
+		this.linkedDataExists = linkedDataExists;
+	}
 
 	public Collection<CodeTableDTO> getLinkedExperiments() {
-        return this.linkedExperiments;
-    }
+		return this.linkedExperiments;
+	}
 
 	public void setLinkedExperiments(Collection<CodeTableDTO> linkedExperiments) {
-        this.linkedExperiments = linkedExperiments;
-    }
+		this.linkedExperiments = linkedExperiments;
+	}
 
 	public Collection<ErrorMessageDTO> getErrors() {
-        return this.errors;
-    }
+		return this.errors;
+	}
 
 	public void setErrors(Collection<ErrorMessageDTO> errors) {
-        this.errors = errors;
-    }
+		this.errors = errors;
+	}
 
 	public static ContainerDependencyCheckDTO fromJsonToContainerDependencyCheckDTO(String json) {
-        return new JSONDeserializer<ContainerDependencyCheckDTO>()
-        .use(null, ContainerDependencyCheckDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<ContainerDependencyCheckDTO>()
+				.use(null, ContainerDependencyCheckDTO.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<ContainerDependencyCheckDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<ContainerDependencyCheckDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<ContainerDependencyCheckDTO> fromJsonArrayToCoes(String json) {
-        return new JSONDeserializer<List<ContainerDependencyCheckDTO>>()
-        .use("values", ContainerDependencyCheckDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<ContainerDependencyCheckDTO>>()
+				.use("values", ContainerDependencyCheckDTO.class).deserialize(json);
+	}
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerErrorMessageDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerErrorMessageDTO.java
index ce03163f1..16aebc096 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerErrorMessageDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerErrorMessageDTO.java
@@ -12,87 +12,91 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ContainerErrorMessageDTO {
 
-	String containerCodeName;
-	
-	String level;
-	
-	String message;
-	
-	Container container;
-	
-	Container definition;
-	
-	public String toJson() {
-        return new JSONSerializer().include("container.lsStates.lsValues","container.lsLabels","definition.lsStates.lsValues","definition.lsLabels").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
-    }
-	
-	public static String toJsonArray(Collection<ContainerErrorMessageDTO> collection) {
-        return new JSONSerializer().include("container.lsStates.lsValues","container.lsLabels","definition.lsStates.lsValues","definition.lsLabels").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
-    }
-	
-	public ContainerErrorMessageDTO(){
-	}
-	
-	public ContainerErrorMessageDTO(String containerCodeName, Container container){
-		this.containerCodeName = containerCodeName;
-		this.container = container;
-	}
-	
-
-	public String toString() {
+    String containerCodeName;
+
+    String level;
+
+    String message;
+
+    Container container;
+
+    Container definition;
+
+    public String toJson() {
+        return new JSONSerializer()
+                .include("container.lsStates.lsValues", "container.lsLabels", "definition.lsStates.lsValues",
+                        "definition.lsLabels")
+                .exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+    }
+
+    public static String toJsonArray(Collection<ContainerErrorMessageDTO> collection) {
+        return new JSONSerializer()
+                .include("container.lsStates.lsValues", "container.lsLabels", "definition.lsStates.lsValues",
+                        "definition.lsLabels")
+                .exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
+    }
+
+    public ContainerErrorMessageDTO() {
+    }
+
+    public ContainerErrorMessageDTO(String containerCodeName, Container container) {
+        this.containerCodeName = containerCodeName;
+        this.container = container;
+    }
+
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static ContainerErrorMessageDTO fromJsonToContainerErrorMessageDTO(String json) {
+    public static ContainerErrorMessageDTO fromJsonToContainerErrorMessageDTO(String json) {
         return new JSONDeserializer<ContainerErrorMessageDTO>()
-        .use(null, ContainerErrorMessageDTO.class).deserialize(json);
+                .use(null, ContainerErrorMessageDTO.class).deserialize(json);
     }
 
-	public static Collection<ContainerErrorMessageDTO> fromJsonArrayToContainerErroes(String json) {
+    public static Collection<ContainerErrorMessageDTO> fromJsonArrayToContainerErroes(String json) {
         return new JSONDeserializer<List<ContainerErrorMessageDTO>>()
-        .use("values", ContainerErrorMessageDTO.class).deserialize(json);
+                .use("values", ContainerErrorMessageDTO.class).deserialize(json);
     }
 
-	public String getContainerCodeName() {
+    public String getContainerCodeName() {
         return this.containerCodeName;
     }
 
-	public void setContainerCodeName(String containerCodeName) {
+    public void setContainerCodeName(String containerCodeName) {
         this.containerCodeName = containerCodeName;
     }
 
-	public String getLevel() {
+    public String getLevel() {
         return this.level;
     }
 
-	public void setLevel(String level) {
+    public void setLevel(String level) {
         this.level = level;
     }
 
-	public String getMessage() {
+    public String getMessage() {
         return this.message;
     }
 
-	public void setMessage(String message) {
+    public void setMessage(String message) {
         this.message = message;
     }
 
-	public Container getContainer() {
+    public Container getContainer() {
         return this.container;
     }
 
-	public void setContainer(Container container) {
+    public void setContainer(Container container) {
         this.container = container;
     }
 
-	public Container getDefinition() {
+    public Container getDefinition() {
         return this.definition;
     }
 
-	public void setDefinition(Container definition) {
+    public void setDefinition(Container definition) {
         this.definition = definition;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerLocationDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerLocationDTO.java
index 66e64c5a8..6c6bfa36e 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerLocationDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerLocationDTO.java
@@ -12,111 +12,106 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ContainerLocationDTO {
-	
-	private String locationCodeName;
-	
-	private String containerCodeName;
-	
-	private String containerBarcode;
-	
-	private String level;
-	
-	private String message;
-	
-	private String modifiedBy;
-	
-	private Date modifiedDate;
-	
-	public ContainerLocationDTO(){
-	}
-	
-	public ContainerLocationDTO(String locationCodeName, String containerCodeName, String containerBarcode){
-		this.locationCodeName = locationCodeName;
-		this.containerCodeName = containerCodeName;
-		this.containerBarcode = containerBarcode;
-	}
-	
-	public String toJson() {
+
+    private String locationCodeName;
+
+    private String containerCodeName;
+
+    private String containerBarcode;
+
+    private String level;
+
+    private String message;
+
+    private String modifiedBy;
+
+    private Date modifiedDate;
+
+    public ContainerLocationDTO() {
+    }
+
+    public ContainerLocationDTO(String locationCodeName, String containerCodeName, String containerBarcode) {
+        this.locationCodeName = locationCodeName;
+        this.containerCodeName = containerCodeName;
+        this.containerBarcode = containerBarcode;
+    }
+
+    public String toJson() {
         return new JSONSerializer().exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
     }
-	
-	public static String toJsonArray(Collection<ContainerLocationDTO> collection) {
+
+    public static String toJsonArray(Collection<ContainerLocationDTO> collection) {
         return new JSONSerializer().exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
     }
-	
-
 
-	public static ContainerLocationDTO fromJsonToContainerLocationDTO(String json) {
+    public static ContainerLocationDTO fromJsonToContainerLocationDTO(String json) {
         return new JSONDeserializer<ContainerLocationDTO>()
-        .use(null, ContainerLocationDTO.class).deserialize(json);
+                .use(null, ContainerLocationDTO.class).deserialize(json);
     }
 
-	public static Collection<ContainerLocationDTO> fromJsonArrayToContainerLocatioes(String json) {
+    public static Collection<ContainerLocationDTO> fromJsonArrayToContainerLocatioes(String json) {
         return new JSONDeserializer<List<ContainerLocationDTO>>()
-        .use("values", ContainerLocationDTO.class).deserialize(json);
+                .use("values", ContainerLocationDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getLocationCodeName() {
+    public String getLocationCodeName() {
         return this.locationCodeName;
     }
 
-	public void setLocationCodeName(String locationCodeName) {
+    public void setLocationCodeName(String locationCodeName) {
         this.locationCodeName = locationCodeName;
     }
 
-	public String getContainerCodeName() {
+    public String getContainerCodeName() {
         return this.containerCodeName;
     }
 
-	public void setContainerCodeName(String containerCodeName) {
+    public void setContainerCodeName(String containerCodeName) {
         this.containerCodeName = containerCodeName;
     }
 
-	public String getContainerBarcode() {
+    public String getContainerBarcode() {
         return this.containerBarcode;
     }
 
-	public void setContainerBarcode(String containerBarcode) {
+    public void setContainerBarcode(String containerBarcode) {
         this.containerBarcode = containerBarcode;
     }
 
-	public String getLevel() {
+    public String getLevel() {
         return this.level;
     }
 
-	public void setLevel(String level) {
+    public void setLevel(String level) {
         this.level = level;
     }
 
-	public String getMessage() {
+    public String getMessage() {
         return this.message;
     }
 
-	public void setMessage(String message) {
+    public void setMessage(String message) {
         this.message = message;
     }
 
-	public String getModifiedBy() {
+    public String getModifiedBy() {
         return this.modifiedBy;
     }
 
-	public void setModifiedBy(String modifiedBy) {
+    public void setModifiedBy(String modifiedBy) {
         this.modifiedBy = modifiedBy;
     }
 
-	public Date getModifiedDate() {
+    public Date getModifiedDate() {
         return this.modifiedDate;
     }
 
-	public void setModifiedDate(Date modifiedDate) {
+    public void setModifiedDate(Date modifiedDate) {
         this.modifiedDate = modifiedDate;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerLocationTreeDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerLocationTreeDTO.java
index 4435a970a..b906b8573 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerLocationTreeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerLocationTreeDTO.java
@@ -9,156 +9,156 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ContainerLocationTreeDTO {
-	
-	private String codeName;
-	private String parentCodeName;
-	private String labelText;
-	private String codeTree;
-	private String labelTree;
-	private Integer level;
-	private String rootCodeName;
-	private String codeNameBreadcrumb;
-	private String labelTextBreadcrumb;
-	private String lsType;
-	private String lsKind;
-	
-	public ContainerLocationTreeDTO (String codeName, String parentCodeName, String labelText, String codeTree, String labelTree, 
-			Integer level, String rootCodeName, String codeNameBreadcrumb, String labelTextBreadcrumb, String lsType, String lsKind) {
-		this.codeName = codeName;
-		this.parentCodeName = parentCodeName;
-		this.labelText = labelText;
-		this.codeTree = codeTree;
-		this.labelTree = labelTree;
-		this.level =  level;
-		this.rootCodeName = rootCodeName;
-		this.codeNameBreadcrumb = codeNameBreadcrumb;
-		this.labelTextBreadcrumb = labelTextBreadcrumb;
-		this.lsType = lsType;
-		this.lsKind = lsKind;
-	}
-
-
-	public String toString() {
+
+    private String codeName;
+    private String parentCodeName;
+    private String labelText;
+    private String codeTree;
+    private String labelTree;
+    private Integer level;
+    private String rootCodeName;
+    private String codeNameBreadcrumb;
+    private String labelTextBreadcrumb;
+    private String lsType;
+    private String lsKind;
+
+    public ContainerLocationTreeDTO(String codeName, String parentCodeName, String labelText, String codeTree,
+            String labelTree,
+            Integer level, String rootCodeName, String codeNameBreadcrumb, String labelTextBreadcrumb, String lsType,
+            String lsKind) {
+        this.codeName = codeName;
+        this.parentCodeName = parentCodeName;
+        this.labelText = labelText;
+        this.codeTree = codeTree;
+        this.labelTree = labelTree;
+        this.level = level;
+        this.rootCodeName = rootCodeName;
+        this.codeNameBreadcrumb = codeNameBreadcrumb;
+        this.labelTextBreadcrumb = labelTextBreadcrumb;
+        this.lsType = lsType;
+        this.lsKind = lsKind;
+    }
+
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ContainerLocationTreeDTO fromJsonToContainerLocationTreeDTO(String json) {
+    public static ContainerLocationTreeDTO fromJsonToContainerLocationTreeDTO(String json) {
         return new JSONDeserializer<ContainerLocationTreeDTO>()
-        .use(null, ContainerLocationTreeDTO.class).deserialize(json);
+                .use(null, ContainerLocationTreeDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ContainerLocationTreeDTO> collection) {
+    public static String toJsonArray(Collection<ContainerLocationTreeDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ContainerLocationTreeDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<ContainerLocationTreeDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ContainerLocationTreeDTO> fromJsonArrayToContainerLocatioes(String json) {
+    public static Collection<ContainerLocationTreeDTO> fromJsonArrayToContainerLocatioes(String json) {
         return new JSONDeserializer<List<ContainerLocationTreeDTO>>()
-        .use("values", ContainerLocationTreeDTO.class).deserialize(json);
+                .use("values", ContainerLocationTreeDTO.class).deserialize(json);
     }
 
-	public String getCodeName() {
+    public String getCodeName() {
         return this.codeName;
     }
 
-	public void setCodeName(String codeName) {
+    public void setCodeName(String codeName) {
         this.codeName = codeName;
     }
 
-	public String getParentCodeName() {
+    public String getParentCodeName() {
         return this.parentCodeName;
     }
 
-	public void setParentCodeName(String parentCodeName) {
+    public void setParentCodeName(String parentCodeName) {
         this.parentCodeName = parentCodeName;
     }
 
-	public String getLabelText() {
+    public String getLabelText() {
         return this.labelText;
     }
 
-	public void setLabelText(String labelText) {
+    public void setLabelText(String labelText) {
         this.labelText = labelText;
     }
 
-	public String getCodeTree() {
+    public String getCodeTree() {
         return this.codeTree;
     }
 
-	public void setCodeTree(String codeTree) {
+    public void setCodeTree(String codeTree) {
         this.codeTree = codeTree;
     }
 
-	public String getLabelTree() {
+    public String getLabelTree() {
         return this.labelTree;
     }
 
-	public void setLabelTree(String labelTree) {
+    public void setLabelTree(String labelTree) {
         this.labelTree = labelTree;
     }
 
-	public Integer getLevel() {
+    public Integer getLevel() {
         return this.level;
     }
 
-	public void setLevel(Integer level) {
+    public void setLevel(Integer level) {
         this.level = level;
     }
 
-	public String getRootCodeName() {
+    public String getRootCodeName() {
         return this.rootCodeName;
     }
 
-	public void setRootCodeName(String rootCodeName) {
+    public void setRootCodeName(String rootCodeName) {
         this.rootCodeName = rootCodeName;
     }
 
-	public String getCodeNameBreadcrumb() {
+    public String getCodeNameBreadcrumb() {
         return this.codeNameBreadcrumb;
     }
 
-	public void setCodeNameBreadcrumb(String codeNameBreadcrumb) {
+    public void setCodeNameBreadcrumb(String codeNameBreadcrumb) {
         this.codeNameBreadcrumb = codeNameBreadcrumb;
     }
 
-	public String getLabelTextBreadcrumb() {
+    public String getLabelTextBreadcrumb() {
         return this.labelTextBreadcrumb;
     }
 
-	public void setLabelTextBreadcrumb(String labelTextBreadcrumb) {
+    public void setLabelTextBreadcrumb(String labelTextBreadcrumb) {
         this.labelTextBreadcrumb = labelTextBreadcrumb;
     }
 
-	public String getLsType() {
+    public String getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(String lsType) {
+    public void setLsType(String lsType) {
         this.lsType = lsType;
     }
 
-	public String getLsKind() {
+    public String getLsKind() {
         return this.lsKind;
     }
 
-	public void setLsKind(String lsKind) {
+    public void setLsKind(String lsKind) {
         this.lsKind = lsKind;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerMiniDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerMiniDTO.java
index 1db8ce5ae..dae0322b1 100755
--- a/src/main/java/com/labsynch/labseer/dto/ContainerMiniDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerMiniDTO.java
@@ -11,69 +11,64 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ContainerMiniDTO {
-	
+
     public ContainerMiniDTO(Container container) {
-    	this.setId(container.getId());
-    	this.setVersion(container.getVersion());
+        this.setId(container.getId());
+        this.setVersion(container.getVersion());
     }
 
-	private Long id;
-    
-	private Integer version;
-	
+    private Long id;
 
+    private Integer version;
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ContainerMiniDTO fromJsonToContainerMiniDTO(String json) {
+    public static ContainerMiniDTO fromJsonToContainerMiniDTO(String json) {
         return new JSONDeserializer<ContainerMiniDTO>()
-        .use(null, ContainerMiniDTO.class).deserialize(json);
+                .use(null, ContainerMiniDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ContainerMiniDTO> collection) {
+    public static String toJsonArray(Collection<ContainerMiniDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ContainerMiniDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<ContainerMiniDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ContainerMiniDTO> fromJsonArrayToCoes(String json) {
+    public static Collection<ContainerMiniDTO> fromJsonArrayToCoes(String json) {
         return new JSONDeserializer<List<ContainerMiniDTO>>()
-        .use("values", ContainerMiniDTO.class).deserialize(json);
+                .use("values", ContainerMiniDTO.class).deserialize(json);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerQueryDTO.java
index 50dc31640..ca742d147 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerQueryDTO.java
@@ -10,167 +10,166 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ContainerQueryDTO {
 
-	Date recordedDateGreaterThan;
-	
-	Date recordedDateLessThan;
-	
-	String recordedBy;
-	
-	Integer maxResults;
-	
-	String lsType;
-	
-	String lsKind;
-	
-	Collection<ItxQueryDTO> firstInteractions;
-	
-	Collection<ItxQueryDTO> secondInteractions;
-	
-	Collection<ItxQueryDTO> subjects;
-	
-	Collection<ValueQueryDTO> values;
-	
-	Collection<LabelQueryDTO> labels;
-	
-	public ContainerQueryDTO(){
-		
-	}
-	
-	public ContainerQueryDTO(ContainerQueryDTO queryDTO){
-		this.recordedDateGreaterThan = queryDTO.getRecordedDateGreaterThan();
-		this.recordedDateLessThan = queryDTO.getRecordedDateLessThan();
-		this.lsType = queryDTO.getLsType();
-		this.lsKind = queryDTO.getLsKind();
-		this.recordedBy = queryDTO.getRecordedBy();
-		this.maxResults = queryDTO.getMaxResults();
-		this.firstInteractions = queryDTO.getFirstInteractions();
-		this.secondInteractions = queryDTO.getSecondInteractions();
-		this.values = queryDTO.getValues();
-		this.labels = queryDTO.getLabels();
-	}
-
-	public Date getRecordedDateGreaterThan() {
+    Date recordedDateGreaterThan;
+
+    Date recordedDateLessThan;
+
+    String recordedBy;
+
+    Integer maxResults;
+
+    String lsType;
+
+    String lsKind;
+
+    Collection<ItxQueryDTO> firstInteractions;
+
+    Collection<ItxQueryDTO> secondInteractions;
+
+    Collection<ItxQueryDTO> subjects;
+
+    Collection<ValueQueryDTO> values;
+
+    Collection<LabelQueryDTO> labels;
+
+    public ContainerQueryDTO() {
+
+    }
+
+    public ContainerQueryDTO(ContainerQueryDTO queryDTO) {
+        this.recordedDateGreaterThan = queryDTO.getRecordedDateGreaterThan();
+        this.recordedDateLessThan = queryDTO.getRecordedDateLessThan();
+        this.lsType = queryDTO.getLsType();
+        this.lsKind = queryDTO.getLsKind();
+        this.recordedBy = queryDTO.getRecordedBy();
+        this.maxResults = queryDTO.getMaxResults();
+        this.firstInteractions = queryDTO.getFirstInteractions();
+        this.secondInteractions = queryDTO.getSecondInteractions();
+        this.values = queryDTO.getValues();
+        this.labels = queryDTO.getLabels();
+    }
+
+    public Date getRecordedDateGreaterThan() {
         return this.recordedDateGreaterThan;
     }
 
-	public void setRecordedDateGreaterThan(Date recordedDateGreaterThan) {
+    public void setRecordedDateGreaterThan(Date recordedDateGreaterThan) {
         this.recordedDateGreaterThan = recordedDateGreaterThan;
     }
 
-	public Date getRecordedDateLessThan() {
+    public Date getRecordedDateLessThan() {
         return this.recordedDateLessThan;
     }
 
-	public void setRecordedDateLessThan(Date recordedDateLessThan) {
+    public void setRecordedDateLessThan(Date recordedDateLessThan) {
         this.recordedDateLessThan = recordedDateLessThan;
     }
 
-	public String getRecordedBy() {
+    public String getRecordedBy() {
         return this.recordedBy;
     }
 
-	public void setRecordedBy(String recordedBy) {
+    public void setRecordedBy(String recordedBy) {
         this.recordedBy = recordedBy;
     }
 
-	public Integer getMaxResults() {
+    public Integer getMaxResults() {
         return this.maxResults;
     }
 
-	public void setMaxResults(Integer maxResults) {
+    public void setMaxResults(Integer maxResults) {
         this.maxResults = maxResults;
     }
 
-	public String getLsType() {
+    public String getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(String lsType) {
+    public void setLsType(String lsType) {
         this.lsType = lsType;
     }
 
-	public String getLsKind() {
+    public String getLsKind() {
         return this.lsKind;
     }
 
-	public void setLsKind(String lsKind) {
+    public void setLsKind(String lsKind) {
         this.lsKind = lsKind;
     }
 
-	public Collection<ItxQueryDTO> getFirstInteractions() {
+    public Collection<ItxQueryDTO> getFirstInteractions() {
         return this.firstInteractions;
     }
 
-	public void setFirstInteractions(Collection<ItxQueryDTO> firstInteractions) {
+    public void setFirstInteractions(Collection<ItxQueryDTO> firstInteractions) {
         this.firstInteractions = firstInteractions;
     }
 
-	public Collection<ItxQueryDTO> getSecondInteractions() {
+    public Collection<ItxQueryDTO> getSecondInteractions() {
         return this.secondInteractions;
     }
 
-	public void setSecondInteractions(Collection<ItxQueryDTO> secondInteractions) {
+    public void setSecondInteractions(Collection<ItxQueryDTO> secondInteractions) {
         this.secondInteractions = secondInteractions;
     }
 
-	public Collection<ItxQueryDTO> getSubjects() {
+    public Collection<ItxQueryDTO> getSubjects() {
         return this.subjects;
     }
 
-	public void setSubjects(Collection<ItxQueryDTO> subjects) {
+    public void setSubjects(Collection<ItxQueryDTO> subjects) {
         this.subjects = subjects;
     }
 
-	public Collection<ValueQueryDTO> getValues() {
+    public Collection<ValueQueryDTO> getValues() {
         return this.values;
     }
 
-	public void setValues(Collection<ValueQueryDTO> values) {
+    public void setValues(Collection<ValueQueryDTO> values) {
         this.values = values;
     }
 
-	public Collection<LabelQueryDTO> getLabels() {
+    public Collection<LabelQueryDTO> getLabels() {
         return this.labels;
     }
 
-	public void setLabels(Collection<LabelQueryDTO> labels) {
+    public void setLabels(Collection<LabelQueryDTO> labels) {
         this.labels = labels;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ContainerQueryDTO fromJsonToContainerQueryDTO(String json) {
+    public static ContainerQueryDTO fromJsonToContainerQueryDTO(String json) {
         return new JSONDeserializer<ContainerQueryDTO>()
-        .use(null, ContainerQueryDTO.class).deserialize(json);
+                .use(null, ContainerQueryDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ContainerQueryDTO> collection) {
+    public static String toJsonArray(Collection<ContainerQueryDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ContainerQueryDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<ContainerQueryDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ContainerQueryDTO> fromJsonArrayToCoes(String json) {
+    public static Collection<ContainerQueryDTO> fromJsonArrayToCoes(String json) {
         return new JSONDeserializer<List<ContainerQueryDTO>>()
-        .use("values", ContainerQueryDTO.class).deserialize(json);
+                .use("values", ContainerQueryDTO.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerQueryResultDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerQueryResultDTO.java
index 179f3d177..06d9d436e 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerQueryResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerQueryResultDTO.java
@@ -13,90 +13,108 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ContainerQueryResultDTO {
 
-	Integer maxResults;
-	
-	Integer numberOfResults;
-	
-	Collection<Container> results;
-	
-	public ContainerQueryResultDTO(){
-		
-	}
-	
-	@Transactional
+    Integer maxResults;
+
+    Integer numberOfResults;
+
+    Collection<Container> results;
+
+    public ContainerQueryResultDTO() {
+
+    }
+
+    @Transactional
     public String toJson() {
-        return new JSONSerializer().exclude("*.class").include("results.lsTags", "results.lsLabels", "results.lsStates.lsValues").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().exclude("*.class")
+                .include("results.lsTags", "results.lsLabels", "results.lsStates.lsValues")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
-	
-	 @Transactional
+
+    @Transactional
     public String toJsonWithNestedStubs() {
-        return new JSONSerializer().exclude("*.class").include("results.lsTags", "results.lsLabels", "results.lsStates.lsValues", "results.firstContainers.firstContainer.lsLabels","results.secondContainers.secondContainer.lsLabels").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().exclude("*.class")
+                .include("results.lsTags", "results.lsLabels", "results.lsStates.lsValues",
+                        "results.firstContainers.firstContainer.lsLabels",
+                        "results.secondContainers.secondContainer.lsLabels")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
-    
+
     @Transactional
     public String toJsonWithNestedFull() {
-        return new JSONSerializer().exclude("*.class").include("results.lsTags", "results.lsLabels", "results.lsStates.lsValues", "results.firstContainers.firstContainer.lsStates.lsValues","results.firstContainers.firstContainer.lsLabels", "results.secondContainers.secondContainer.lsStates.lsValues","results.secondContainers.secondContainer.lsLabels","results.firstContainers.lsStates.lsValues","results.firstContainers.lsLabels","results.secondContainers.lsStates.lsValues","results.secondContainers.lsLabels").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().exclude("*.class")
+                .include("results.lsTags", "results.lsLabels", "results.lsStates.lsValues",
+                        "results.firstContainers.firstContainer.lsStates.lsValues",
+                        "results.firstContainers.firstContainer.lsLabels",
+                        "results.secondContainers.secondContainer.lsStates.lsValues",
+                        "results.secondContainers.secondContainer.lsLabels",
+                        "results.firstContainers.lsStates.lsValues", "results.firstContainers.lsLabels",
+                        "results.secondContainers.lsStates.lsValues", "results.secondContainers.lsLabels")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public String toPrettyJson() {
-        return new JSONSerializer().exclude("*.class", "results.lsStates.lsValues.lsState", "results.lsStates.lsThing", "results.lsLabels.lsThing").include("results.lsTags", "results.lsLabels", "results.lsStates.lsValues").prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "results.lsStates.lsValues.lsState", "results.lsStates.lsThing",
+                        "results.lsLabels.lsThing")
+                .include("results.lsTags", "results.lsLabels", "results.lsStates.lsValues").prettyPrint(true)
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public String toJsonStub() {
-        return new JSONSerializer().exclude("*.class", "results.lsStates.lsThing").include("results.lsTags", "results.lsLabels").prettyPrint(false).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().exclude("*.class", "results.lsStates.lsThing")
+                .include("results.lsTags", "results.lsLabels").prettyPrint(false)
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
-	
 
-	public Integer getMaxResults() {
+    public Integer getMaxResults() {
         return this.maxResults;
     }
 
-	public void setMaxResults(Integer maxResults) {
+    public void setMaxResults(Integer maxResults) {
         this.maxResults = maxResults;
     }
 
-	public Integer getNumberOfResults() {
+    public Integer getNumberOfResults() {
         return this.numberOfResults;
     }
 
-	public void setNumberOfResults(Integer numberOfResults) {
+    public void setNumberOfResults(Integer numberOfResults) {
         this.numberOfResults = numberOfResults;
     }
 
-	public Collection<Container> getResults() {
+    public Collection<Container> getResults() {
         return this.results;
     }
 
-	public void setResults(Collection<Container> results) {
+    public void setResults(Collection<Container> results) {
         this.results = results;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static ContainerQueryResultDTO fromJsonToContainerQueryResultDTO(String json) {
+    public static ContainerQueryResultDTO fromJsonToContainerQueryResultDTO(String json) {
         return new JSONDeserializer<ContainerQueryResultDTO>()
-        .use(null, ContainerQueryResultDTO.class).deserialize(json);
+                .use(null, ContainerQueryResultDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ContainerQueryResultDTO> collection) {
+    public static String toJsonArray(Collection<ContainerQueryResultDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ContainerQueryResultDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<ContainerQueryResultDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ContainerQueryResultDTO> fromJsonArrayToCoes(String json) {
+    public static Collection<ContainerQueryResultDTO> fromJsonArrayToCoes(String json) {
         return new JSONDeserializer<List<ContainerQueryResultDTO>>()
-        .use("values", ContainerQueryResultDTO.class).deserialize(json);
+                .use("values", ContainerQueryResultDTO.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerRequestDTO.java
index 6a0032440..4d8e5084a 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerRequestDTO.java
@@ -11,99 +11,94 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ContainerRequestDTO {
-	
-	private String containerCodeName;
-	private BigDecimal amount;
-	private String amountUnits;
-	private String modifiedBy;
-	private Date modifiedDate;
-	
-	public ContainerRequestDTO(){
-	}
-	
-	public ContainerRequestDTO(String containerCodeName, String modifiedBy, Date modifiedDate){
-		this.containerCodeName = containerCodeName;
-		this.modifiedBy = modifiedBy;
-		this.modifiedDate = modifiedDate;
-	}
-	
-
-
-	public String toJson() {
+
+    private String containerCodeName;
+    private BigDecimal amount;
+    private String amountUnits;
+    private String modifiedBy;
+    private Date modifiedDate;
+
+    public ContainerRequestDTO() {
+    }
+
+    public ContainerRequestDTO(String containerCodeName, String modifiedBy, Date modifiedDate) {
+        this.containerCodeName = containerCodeName;
+        this.modifiedBy = modifiedBy;
+        this.modifiedDate = modifiedDate;
+    }
+
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ContainerRequestDTO fromJsonToContainerRequestDTO(String json) {
+    public static ContainerRequestDTO fromJsonToContainerRequestDTO(String json) {
         return new JSONDeserializer<ContainerRequestDTO>()
-        .use(null, ContainerRequestDTO.class).deserialize(json);
+                .use(null, ContainerRequestDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ContainerRequestDTO> collection) {
+    public static String toJsonArray(Collection<ContainerRequestDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ContainerRequestDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<ContainerRequestDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ContainerRequestDTO> fromJsonArrayToCoes(String json) {
+    public static Collection<ContainerRequestDTO> fromJsonArrayToCoes(String json) {
         return new JSONDeserializer<List<ContainerRequestDTO>>()
-        .use("values", ContainerRequestDTO.class).deserialize(json);
+                .use("values", ContainerRequestDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getContainerCodeName() {
+    public String getContainerCodeName() {
         return this.containerCodeName;
     }
 
-	public void setContainerCodeName(String containerCodeName) {
+    public void setContainerCodeName(String containerCodeName) {
         this.containerCodeName = containerCodeName;
     }
 
-	public BigDecimal getAmount() {
+    public BigDecimal getAmount() {
         return this.amount;
     }
 
-	public void setAmount(BigDecimal amount) {
+    public void setAmount(BigDecimal amount) {
         this.amount = amount;
     }
 
-	public String getAmountUnits() {
+    public String getAmountUnits() {
         return this.amountUnits;
     }
 
-	public void setAmountUnits(String amountUnits) {
+    public void setAmountUnits(String amountUnits) {
         this.amountUnits = amountUnits;
     }
 
-	public String getModifiedBy() {
+    public String getModifiedBy() {
         return this.modifiedBy;
     }
 
-	public void setModifiedBy(String modifiedBy) {
+    public void setModifiedBy(String modifiedBy) {
         this.modifiedBy = modifiedBy;
     }
 
-	public Date getModifiedDate() {
+    public Date getModifiedDate() {
         return this.modifiedDate;
     }
 
-	public void setModifiedDate(Date modifiedDate) {
+    public void setModifiedDate(Date modifiedDate) {
         this.modifiedDate = modifiedDate;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerSearchRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerSearchRequestDTO.java
index 3db448b2e..813be8cad 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerSearchRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerSearchRequestDTO.java
@@ -9,118 +9,115 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ContainerSearchRequestDTO {
 
-	private String barcode;
-	
-	private String definition;
-	
-	private String status;
-	
-	private String description;
-	
-	private String createdUser;
-	
-	private String type;
-	
-//	private String requestId;
-	
-	private String lsType;
-	
-	private String lsKind;
-	
-	
-	public String toJson() {
+    private String barcode;
+
+    private String definition;
+
+    private String status;
+
+    private String description;
+
+    private String createdUser;
+
+    private String type;
+
+    // private String requestId;
+
+    private String lsType;
+
+    private String lsKind;
+
+    public String toJson() {
         return new JSONSerializer().exclude("*.class").serialize(this);
     }
-	
 
-	public static ContainerSearchRequestDTO fromJsonToContainerSearchRequestDTO(String json) {
+    public static ContainerSearchRequestDTO fromJsonToContainerSearchRequestDTO(String json) {
         return new JSONDeserializer<ContainerSearchRequestDTO>()
-        .use(null, ContainerSearchRequestDTO.class).deserialize(json);
+                .use(null, ContainerSearchRequestDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ContainerSearchRequestDTO> collection) {
+    public static String toJsonArray(Collection<ContainerSearchRequestDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ContainerSearchRequestDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<ContainerSearchRequestDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ContainerSearchRequestDTO> fromJsonArrayToCoes(String json) {
+    public static Collection<ContainerSearchRequestDTO> fromJsonArrayToCoes(String json) {
         return new JSONDeserializer<List<ContainerSearchRequestDTO>>()
-        .use("values", ContainerSearchRequestDTO.class).deserialize(json);
+                .use("values", ContainerSearchRequestDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getBarcode() {
+    public String getBarcode() {
         return this.barcode;
     }
 
-	public void setBarcode(String barcode) {
+    public void setBarcode(String barcode) {
         this.barcode = barcode;
     }
 
-	public String getDefinition() {
+    public String getDefinition() {
         return this.definition;
     }
 
-	public void setDefinition(String definition) {
+    public void setDefinition(String definition) {
         this.definition = definition;
     }
 
-	public String getStatus() {
+    public String getStatus() {
         return this.status;
     }
 
-	public void setStatus(String status) {
+    public void setStatus(String status) {
         this.status = status;
     }
 
-	public String getDescription() {
+    public String getDescription() {
         return this.description;
     }
 
-	public void setDescription(String description) {
+    public void setDescription(String description) {
         this.description = description;
     }
 
-	public String getCreatedUser() {
+    public String getCreatedUser() {
         return this.createdUser;
     }
 
-	public void setCreatedUser(String createdUser) {
+    public void setCreatedUser(String createdUser) {
         this.createdUser = createdUser;
     }
 
-	public String getType() {
+    public String getType() {
         return this.type;
     }
 
-	public void setType(String type) {
+    public void setType(String type) {
         this.type = type;
     }
 
-	public String getLsType() {
+    public String getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(String lsType) {
+    public void setLsType(String lsType) {
         this.lsType = lsType;
     }
 
-	public String getLsKind() {
+    public String getLsKind() {
         return this.lsKind;
     }
 
-	public void setLsKind(String lsKind) {
+    public void setLsKind(String lsKind) {
         this.lsKind = lsKind;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerStateMiniDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerStateMiniDTO.java
index af7180c6b..fd1210d7d 100755
--- a/src/main/java/com/labsynch/labseer/dto/ContainerStateMiniDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerStateMiniDTO.java
@@ -11,76 +11,73 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ContainerStateMiniDTO {
-	
+
     public ContainerStateMiniDTO(ContainerState state) {
-    	this.setId(state.getId());
+        this.setId(state.getId());
     }
 
-	private Long id;
-	
-	private Integer version;
+    private Long id;
 
-	private ContainerMiniDTO container;
+    private Integer version;
 
+    private ContainerMiniDTO container;
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ContainerStateMiniDTO fromJsonToContainerStateMiniDTO(String json) {
+    public static ContainerStateMiniDTO fromJsonToContainerStateMiniDTO(String json) {
         return new JSONDeserializer<ContainerStateMiniDTO>()
-        .use(null, ContainerStateMiniDTO.class).deserialize(json);
+                .use(null, ContainerStateMiniDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ContainerStateMiniDTO> collection) {
+    public static String toJsonArray(Collection<ContainerStateMiniDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ContainerStateMiniDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<ContainerStateMiniDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ContainerStateMiniDTO> fromJsonArrayToCoes(String json) {
+    public static Collection<ContainerStateMiniDTO> fromJsonArrayToCoes(String json) {
         return new JSONDeserializer<List<ContainerStateMiniDTO>>()
-        .use("values", ContainerStateMiniDTO.class).deserialize(json);
+                .use("values", ContainerStateMiniDTO.class).deserialize(json);
     }
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public ContainerMiniDTO getContainer() {
+    public ContainerMiniDTO getContainer() {
         return this.container;
     }
 
-	public void setContainer(ContainerMiniDTO container) {
+    public void setContainer(ContainerMiniDTO container) {
         this.container = container;
     }
 }
-
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerStatePathDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerStatePathDTO.java
index 61df6a080..7be0767a4 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerStatePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerStatePathDTO.java
@@ -12,73 +12,72 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ContainerStatePathDTO {
 
-	public ContainerStatePathDTO() {
-	}
+    public ContainerStatePathDTO() {
+    }
+
+    private String idOrCodeName;
+
+    private String stateType;
 
-	private String idOrCodeName;
+    private String stateKind;
 
-	private String stateType;
-	
-	private String stateKind;
-	
-	private Collection<ContainerState> states;
-	
-	public String toJson() {
-        return new JSONSerializer().include("states.lsValues").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+    private Collection<ContainerState> states;
+
+    public String toJson() {
+        return new JSONSerializer().include("states.lsValues").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
-	
-	public static String toJsonArray(Collection<ContainerStatePathDTO> collection) {
-        return new JSONSerializer().include("states.lsValues").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
+
+    public static String toJsonArray(Collection<ContainerStatePathDTO> collection) {
+        return new JSONSerializer().include("states.lsValues").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static ContainerStatePathDTO fromJsonToContainerStatePathDTO(String json) {
+    public static ContainerStatePathDTO fromJsonToContainerStatePathDTO(String json) {
         return new JSONDeserializer<ContainerStatePathDTO>()
-        .use(null, ContainerStatePathDTO.class).deserialize(json);
+                .use(null, ContainerStatePathDTO.class).deserialize(json);
     }
 
-	public static Collection<ContainerStatePathDTO> fromJsonArrayToCoes(String json) {
+    public static Collection<ContainerStatePathDTO> fromJsonArrayToCoes(String json) {
         return new JSONDeserializer<List<ContainerStatePathDTO>>()
-        .use("values", ContainerStatePathDTO.class).deserialize(json);
+                .use("values", ContainerStatePathDTO.class).deserialize(json);
     }
 
-	public String getIdOrCodeName() {
+    public String getIdOrCodeName() {
         return this.idOrCodeName;
     }
 
-	public void setIdOrCodeName(String idOrCodeName) {
+    public void setIdOrCodeName(String idOrCodeName) {
         this.idOrCodeName = idOrCodeName;
     }
 
-	public String getStateType() {
+    public String getStateType() {
         return this.stateType;
     }
 
-	public void setStateType(String stateType) {
+    public void setStateType(String stateType) {
         this.stateType = stateType;
     }
 
-	public String getStateKind() {
+    public String getStateKind() {
         return this.stateKind;
     }
 
-	public void setStateKind(String stateKind) {
+    public void setStateKind(String stateKind) {
         this.stateKind = stateKind;
     }
 
-	public Collection<ContainerState> getStates() {
+    public Collection<ContainerState> getStates() {
         return this.states;
     }
 
-	public void setStates(Collection<ContainerState> states) {
+    public void setStates(Collection<ContainerState> states) {
         this.states = states;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerSubjectsDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerSubjectsDTO.java
index ab9f24d52..62c4dfcc3 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerSubjectsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerSubjectsDTO.java
@@ -13,79 +13,79 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ContainerSubjectsDTO {
-	
-	private String containerIdOrCodeName;
-	private String interactionType; 
-	private String interactionKind;
-	private Collection<Subject> subjects = new ArrayList<Subject>();
-	
-	public ContainerSubjectsDTO(){
-	}
-	
-	public String toJson() {
-        return new JSONSerializer().include("subjects.lsStates.lsValues","subjects.lsLabels").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+
+    private String containerIdOrCodeName;
+    private String interactionType;
+    private String interactionKind;
+    private Collection<Subject> subjects = new ArrayList<Subject>();
+
+    public ContainerSubjectsDTO() {
     }
-	
-	public static String toJsonArray(Collection<ContainerSubjectsDTO> collection) {
-        return new JSONSerializer().include("subjects.lsStates.lsValues","subjects.lsLabels").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
+
+    public String toJson() {
+        return new JSONSerializer().include("subjects.lsStates.lsValues", "subjects.lsLabels").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
-	
-	public String toJsonStub() {
-        return new JSONSerializer().include("subjects").exclude("*.class","subjects.lsStates","subjects.lsLabels").transform(new ExcludeNulls(), void.class).serialize(this);
+
+    public static String toJsonArray(Collection<ContainerSubjectsDTO> collection) {
+        return new JSONSerializer().include("subjects.lsStates.lsValues", "subjects.lsLabels").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
-	
-	public static String toJsonArrayStub(Collection<ContainerSubjectsDTO> collection) {
-        return new JSONSerializer().include("subjects").exclude("*.class","subjects.lsStates","subjects.lsLabels").transform(new ExcludeNulls(), void.class).serialize(collection);
+
+    public String toJsonStub() {
+        return new JSONSerializer().include("subjects").exclude("*.class", "subjects.lsStates", "subjects.lsLabels")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
+    public static String toJsonArrayStub(Collection<ContainerSubjectsDTO> collection) {
+        return new JSONSerializer().include("subjects").exclude("*.class", "subjects.lsStates", "subjects.lsLabels")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
+    }
 
-	public String getContainerIdOrCodeName() {
+    public String getContainerIdOrCodeName() {
         return this.containerIdOrCodeName;
     }
 
-	public void setContainerIdOrCodeName(String containerIdOrCodeName) {
+    public void setContainerIdOrCodeName(String containerIdOrCodeName) {
         this.containerIdOrCodeName = containerIdOrCodeName;
     }
 
-	public String getInteractionType() {
+    public String getInteractionType() {
         return this.interactionType;
     }
 
-	public void setInteractionType(String interactionType) {
+    public void setInteractionType(String interactionType) {
         this.interactionType = interactionType;
     }
 
-	public String getInteractionKind() {
+    public String getInteractionKind() {
         return this.interactionKind;
     }
 
-	public void setInteractionKind(String interactionKind) {
+    public void setInteractionKind(String interactionKind) {
         this.interactionKind = interactionKind;
     }
 
-	public Collection<Subject> getSubjects() {
+    public Collection<Subject> getSubjects() {
         return this.subjects;
     }
 
-	public void setSubjects(Collection<Subject> subjects) {
+    public void setSubjects(Collection<Subject> subjects) {
         this.subjects = subjects;
     }
 
-	public static ContainerSubjectsDTO fromJsonToContainerSubjectsDTO(String json) {
+    public static ContainerSubjectsDTO fromJsonToContainerSubjectsDTO(String json) {
         return new JSONDeserializer<ContainerSubjectsDTO>()
-        .use(null, ContainerSubjectsDTO.class).deserialize(json);
+                .use(null, ContainerSubjectsDTO.class).deserialize(json);
     }
 
-	public static Collection<ContainerSubjectsDTO> fromJsonArrayToCoes(String json) {
+    public static Collection<ContainerSubjectsDTO> fromJsonArrayToCoes(String json) {
         return new JSONDeserializer<List<ContainerSubjectsDTO>>()
-        .use("values", ContainerSubjectsDTO.class).deserialize(json);
+                .use("values", ContainerSubjectsDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerValuePathDTO.java
index e5bc9a26d..0bb71bdc7 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerValuePathDTO.java
@@ -12,93 +12,92 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ContainerValuePathDTO {
 
-	public ContainerValuePathDTO() {
-	}
+    public ContainerValuePathDTO() {
+    }
+
+    private String idOrCodeName;
+
+    private String stateType;
+
+    private String stateKind;
 
-	private String idOrCodeName;
+    private String valueType;
 
-	private String stateType;
-	
-	private String stateKind;
-	
-	private String valueType;
-	
-	private String valueKind;
-	
-	private Collection<ContainerValue> values;
-	
-	public String toJson() {
-        return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+    private String valueKind;
+
+    private Collection<ContainerValue> values;
+
+    public String toJson() {
+        return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
-	
-	public static String toJsonArray(Collection<ContainerValuePathDTO> collection) {
-        return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
+
+    public static String toJsonArray(Collection<ContainerValuePathDTO> collection) {
+        return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getIdOrCodeName() {
+    public String getIdOrCodeName() {
         return this.idOrCodeName;
     }
 
-	public void setIdOrCodeName(String idOrCodeName) {
+    public void setIdOrCodeName(String idOrCodeName) {
         this.idOrCodeName = idOrCodeName;
     }
 
-	public String getStateType() {
+    public String getStateType() {
         return this.stateType;
     }
 
-	public void setStateType(String stateType) {
+    public void setStateType(String stateType) {
         this.stateType = stateType;
     }
 
-	public String getStateKind() {
+    public String getStateKind() {
         return this.stateKind;
     }
 
-	public void setStateKind(String stateKind) {
+    public void setStateKind(String stateKind) {
         this.stateKind = stateKind;
     }
 
-	public String getValueType() {
+    public String getValueType() {
         return this.valueType;
     }
 
-	public void setValueType(String valueType) {
+    public void setValueType(String valueType) {
         this.valueType = valueType;
     }
 
-	public String getValueKind() {
+    public String getValueKind() {
         return this.valueKind;
     }
 
-	public void setValueKind(String valueKind) {
+    public void setValueKind(String valueKind) {
         this.valueKind = valueKind;
     }
 
-	public Collection<ContainerValue> getValues() {
+    public Collection<ContainerValue> getValues() {
         return this.values;
     }
 
-	public void setValues(Collection<ContainerValue> values) {
+    public void setValues(Collection<ContainerValue> values) {
         this.values = values;
     }
 
-	public static ContainerValuePathDTO fromJsonToContainerValuePathDTO(String json) {
+    public static ContainerValuePathDTO fromJsonToContainerValuePathDTO(String json) {
         return new JSONDeserializer<ContainerValuePathDTO>()
-        .use(null, ContainerValuePathDTO.class).deserialize(json);
+                .use(null, ContainerValuePathDTO.class).deserialize(json);
     }
 
-	public static Collection<ContainerValuePathDTO> fromJsonArrayToCoes(String json) {
+    public static Collection<ContainerValuePathDTO> fromJsonArrayToCoes(String json) {
         return new JSONDeserializer<List<ContainerValuePathDTO>>()
-        .use("values", ContainerValuePathDTO.class).deserialize(json);
+                .use("values", ContainerValuePathDTO.class).deserialize(json);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerValueRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerValueRequestDTO.java
index f9a60378d..f7d42748f 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerValueRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerValueRequestDTO.java
@@ -9,108 +9,103 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ContainerValueRequestDTO {
 
-	private String containerType;
-	private String containerKind;
-	private String stateType;
-	private String stateKind;
-	private String valueType;
-	private String valueKind;
-	private String value;
-	
-
+    private String containerType;
+    private String containerKind;
+    private String stateType;
+    private String stateKind;
+    private String valueType;
+    private String valueKind;
+    private String value;
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ContainerValueRequestDTO fromJsonToContainerValueRequestDTO(String json) {
+    public static ContainerValueRequestDTO fromJsonToContainerValueRequestDTO(String json) {
         return new JSONDeserializer<ContainerValueRequestDTO>()
-        .use(null, ContainerValueRequestDTO.class).deserialize(json);
+                .use(null, ContainerValueRequestDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ContainerValueRequestDTO> collection) {
+    public static String toJsonArray(Collection<ContainerValueRequestDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ContainerValueRequestDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<ContainerValueRequestDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ContainerValueRequestDTO> fromJsonArrayToCoes(String json) {
+    public static Collection<ContainerValueRequestDTO> fromJsonArrayToCoes(String json) {
         return new JSONDeserializer<List<ContainerValueRequestDTO>>()
-        .use("values", ContainerValueRequestDTO.class).deserialize(json);
+                .use("values", ContainerValueRequestDTO.class).deserialize(json);
     }
 
-	public String getContainerType() {
+    public String getContainerType() {
         return this.containerType;
     }
 
-	public void setContainerType(String containerType) {
+    public void setContainerType(String containerType) {
         this.containerType = containerType;
     }
 
-	public String getContainerKind() {
+    public String getContainerKind() {
         return this.containerKind;
     }
 
-	public void setContainerKind(String containerKind) {
+    public void setContainerKind(String containerKind) {
         this.containerKind = containerKind;
     }
 
-	public String getStateType() {
+    public String getStateType() {
         return this.stateType;
     }
 
-	public void setStateType(String stateType) {
+    public void setStateType(String stateType) {
         this.stateType = stateType;
     }
 
-	public String getStateKind() {
+    public String getStateKind() {
         return this.stateKind;
     }
 
-	public void setStateKind(String stateKind) {
+    public void setStateKind(String stateKind) {
         this.stateKind = stateKind;
     }
 
-	public String getValueType() {
+    public String getValueType() {
         return this.valueType;
     }
 
-	public void setValueType(String valueType) {
+    public void setValueType(String valueType) {
         this.valueType = valueType;
     }
 
-	public String getValueKind() {
+    public String getValueKind() {
         return this.valueKind;
     }
 
-	public void setValueKind(String valueKind) {
+    public void setValueKind(String valueKind) {
         this.valueKind = valueKind;
     }
 
-	public String getValue() {
+    public String getValue() {
         return this.value;
     }
 
-	public void setValue(String value) {
+    public void setValue(String value) {
         this.value = value;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/ContainerWellCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/ContainerWellCodeDTO.java
index 2f1b23fd6..2edda29c7 100644
--- a/src/main/java/com/labsynch/labseer/dto/ContainerWellCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ContainerWellCodeDTO.java
@@ -11,58 +11,56 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ContainerWellCodeDTO {
-	
-	private String requestCodeName;
-	private List<String> wellCodeNames;
-	
-	public ContainerWellCodeDTO(){
-	}
-	
-	public ContainerWellCodeDTO(String requestCodeName, List<String> wellCodeNames){
-		this.requestCodeName = requestCodeName;
-		this.wellCodeNames = wellCodeNames;
-	}
-	
-	public String toJson() {
-        return new JSONSerializer().include("wellCodeNames").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+
+    private String requestCodeName;
+    private List<String> wellCodeNames;
+
+    public ContainerWellCodeDTO() {
     }
-	
-	public static String toJsonArray(Collection<ContainerWellCodeDTO> collection) {
-        return new JSONSerializer().include("wellCodeNames").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
+
+    public ContainerWellCodeDTO(String requestCodeName, List<String> wellCodeNames) {
+        this.requestCodeName = requestCodeName;
+        this.wellCodeNames = wellCodeNames;
     }
 
+    public String toJson() {
+        return new JSONSerializer().include("wellCodeNames").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
+    }
+
+    public static String toJsonArray(Collection<ContainerWellCodeDTO> collection) {
+        return new JSONSerializer().include("wellCodeNames").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
+    }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static ContainerWellCodeDTO fromJsonToContainerWellCodeDTO(String json) {
+    public static ContainerWellCodeDTO fromJsonToContainerWellCodeDTO(String json) {
         return new JSONDeserializer<ContainerWellCodeDTO>()
-        .use(null, ContainerWellCodeDTO.class).deserialize(json);
+                .use(null, ContainerWellCodeDTO.class).deserialize(json);
     }
 
-	public static Collection<ContainerWellCodeDTO> fromJsonArrayToContainerWellCoes(String json) {
+    public static Collection<ContainerWellCodeDTO> fromJsonArrayToContainerWellCoes(String json) {
         return new JSONDeserializer<List<ContainerWellCodeDTO>>()
-        .use("values", ContainerWellCodeDTO.class).deserialize(json);
+                .use("values", ContainerWellCodeDTO.class).deserialize(json);
     }
 
-	public String getRequestCodeName() {
+    public String getRequestCodeName() {
         return this.requestCodeName;
     }
 
-	public void setRequestCodeName(String requestCodeName) {
+    public void setRequestCodeName(String requestCodeName) {
         this.requestCodeName = requestCodeName;
     }
 
-	public List<String> getWellCodeNames() {
+    public List<String> getWellCodeNames() {
         return this.wellCodeNames;
     }
 
-	public void setWellCodeNames(List<String> wellCodeNames) {
+    public void setWellCodeNames(List<String> wellCodeNames) {
         this.wellCodeNames = wellCodeNames;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/CorpNameDTO.java b/src/main/java/com/labsynch/labseer/dto/CorpNameDTO.java
index d778d0780..bfb3a5979 100644
--- a/src/main/java/com/labsynch/labseer/dto/CorpNameDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CorpNameDTO.java
@@ -9,61 +9,59 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+public class CorpNameDTO {
 
-public class CorpNameDTO{
+    private int corpNumber;
 
-	private int corpNumber;
-	
-	private String corpName;
+    private String corpName;
 
-
-	public int getCorpNumber() {
+    public int getCorpNumber() {
         return this.corpNumber;
     }
 
-	public void setCorpNumber(int corpNumber) {
+    public void setCorpNumber(int corpNumber) {
         this.corpNumber = corpNumber;
     }
 
-	public String getCorpName() {
+    public String getCorpName() {
         return this.corpName;
     }
 
-	public void setCorpName(String corpName) {
+    public void setCorpName(String corpName) {
         this.corpName = corpName;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static CorpNameDTO fromJsonToCorpNameDTO(String json) {
+    public static CorpNameDTO fromJsonToCorpNameDTO(String json) {
         return new JSONDeserializer<CorpNameDTO>()
-        .use(null, CorpNameDTO.class).deserialize(json);
+                .use(null, CorpNameDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<CorpNameDTO> collection) {
+    public static String toJsonArray(Collection<CorpNameDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<CorpNameDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<CorpNameDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<CorpNameDTO> fromJsonArrayToCoes(String json) {
+    public static Collection<CorpNameDTO> fromJsonArrayToCoes(String json) {
         return new JSONDeserializer<List<CorpNameDTO>>()
-        .use("values", CorpNameDTO.class).deserialize(json);
+                .use("values", CorpNameDTO.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/CreatePlateRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/CreatePlateRequestDTO.java
index df58ca47c..21bcb0dbb 100644
--- a/src/main/java/com/labsynch/labseer/dto/CreatePlateRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CreatePlateRequestDTO.java
@@ -11,135 +11,133 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class CreatePlateRequestDTO {
 
-	private String barcode;
-	
-	private String definition;
-	
-	private String template;
-	
-	private String description;
-	
-	private String recordedBy;
-	
-	private String createdUser;
-	
-	private Date createdDate;
-	
-	private String physicalState;
-	
-	private String batchConcentrationUnits;
-	
-	private Collection<WellContentDTO> wells = new ArrayList<WellContentDTO>();
-	
-	public String toJson() {
+    private String barcode;
+
+    private String definition;
+
+    private String template;
+
+    private String description;
+
+    private String recordedBy;
+
+    private String createdUser;
+
+    private Date createdDate;
+
+    private String physicalState;
+
+    private String batchConcentrationUnits;
+
+    private Collection<WellContentDTO> wells = new ArrayList<WellContentDTO>();
+
+    public String toJson() {
         return new JSONSerializer().include("wells").exclude("*.class").serialize(this);
     }
-	
 
-	public String getBarcode() {
+    public String getBarcode() {
         return this.barcode;
     }
 
-	public void setBarcode(String barcode) {
+    public void setBarcode(String barcode) {
         this.barcode = barcode;
     }
 
-	public String getDefinition() {
+    public String getDefinition() {
         return this.definition;
     }
 
-	public void setDefinition(String definition) {
+    public void setDefinition(String definition) {
         this.definition = definition;
     }
 
-	public String getTemplate() {
+    public String getTemplate() {
         return this.template;
     }
 
-	public void setTemplate(String template) {
+    public void setTemplate(String template) {
         this.template = template;
     }
 
-	public String getDescription() {
+    public String getDescription() {
         return this.description;
     }
 
-	public void setDescription(String description) {
+    public void setDescription(String description) {
         this.description = description;
     }
 
-	public String getRecordedBy() {
+    public String getRecordedBy() {
         return this.recordedBy;
     }
 
-	public void setRecordedBy(String recordedBy) {
+    public void setRecordedBy(String recordedBy) {
         this.recordedBy = recordedBy;
     }
 
-	public String getCreatedUser() {
+    public String getCreatedUser() {
         return this.createdUser;
     }
 
-	public void setCreatedUser(String createdUser) {
+    public void setCreatedUser(String createdUser) {
         this.createdUser = createdUser;
     }
 
-	public Date getCreatedDate() {
+    public Date getCreatedDate() {
         return this.createdDate;
     }
 
-	public void setCreatedDate(Date createdDate) {
+    public void setCreatedDate(Date createdDate) {
         this.createdDate = createdDate;
     }
 
-	public String getPhysicalState() {
+    public String getPhysicalState() {
         return this.physicalState;
     }
 
-	public void setPhysicalState(String physicalState) {
+    public void setPhysicalState(String physicalState) {
         this.physicalState = physicalState;
     }
 
-	public String getBatchConcentrationUnits() {
+    public String getBatchConcentrationUnits() {
         return this.batchConcentrationUnits;
     }
 
-	public void setBatchConcentrationUnits(String batchConcentrationUnits) {
+    public void setBatchConcentrationUnits(String batchConcentrationUnits) {
         this.batchConcentrationUnits = batchConcentrationUnits;
     }
 
-	public Collection<WellContentDTO> getWells() {
+    public Collection<WellContentDTO> getWells() {
         return this.wells;
     }
 
-	public void setWells(Collection<WellContentDTO> wells) {
+    public void setWells(Collection<WellContentDTO> wells) {
         this.wells = wells;
     }
 
-	public static CreatePlateRequestDTO fromJsonToCreatePlateRequestDTO(String json) {
+    public static CreatePlateRequestDTO fromJsonToCreatePlateRequestDTO(String json) {
         return new JSONDeserializer<CreatePlateRequestDTO>()
-        .use(null, CreatePlateRequestDTO.class).deserialize(json);
+                .use(null, CreatePlateRequestDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<CreatePlateRequestDTO> collection) {
+    public static String toJsonArray(Collection<CreatePlateRequestDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<CreatePlateRequestDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<CreatePlateRequestDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<CreatePlateRequestDTO> fromJsonArrayToCreatePlateRequestDTO(String json) {
+    public static Collection<CreatePlateRequestDTO> fromJsonArrayToCreatePlateRequestDTO(String json) {
         return new JSONDeserializer<List<CreatePlateRequestDTO>>()
-        .use("values", CreatePlateRequestDTO.class).deserialize(json);
+                .use("values", CreatePlateRequestDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/CurveFitDTO.java b/src/main/java/com/labsynch/labseer/dto/CurveFitDTO.java
index b6ccb5c0f..1137bbd9c 100644
--- a/src/main/java/com/labsynch/labseer/dto/CurveFitDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/CurveFitDTO.java
@@ -39,20 +39,19 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class CurveFitDTO {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(CurveFitDTO.class);
 
-	public CurveFitDTO(){
-		//empty constructor
+	public CurveFitDTO() {
+		// empty constructor
 	}
-	
+
 	public CurveFitDTO(String curveId) {
 		this.curveId = curveId;
 	}
-	
-	public CurveFitDTO(Map dataMap){
+
+	public CurveFitDTO(Map dataMap) {
 		this.curveId = (String) dataMap.get("curveId");
 		this.analysisGroupCode = (String) dataMap.get("analysisGroupCode");
 		this.recordedBy = (String) dataMap.get("recordedBy");
@@ -61,14 +60,22 @@ public CurveFitDTO(Map dataMap){
 		this.batchCode = (String) dataMap.get("batchCode");
 		this.category = (String) dataMap.get("category");
 		this.renderingHint = (String) dataMap.get("renderingHint");
-		if (dataMap.get("minNumeric") != null) this.min = ((BigDecimal) dataMap.get("minNumeric")).toString();
-		else this.min = (String) dataMap.get("minString");
-		if (dataMap.get("maxNumeric") != null) this.max = ((BigDecimal) dataMap.get("maxNumeric")).toString();
-		else this.max = (String) dataMap.get("maxString");
-		if (dataMap.get("ec50Numeric") != null) this.ec50 = ((BigDecimal) dataMap.get("ec50Numeric")).toString();
-		else this.ec50 = (String) dataMap.get("ec50String");
-		if (dataMap.get("slopeNumeric") != null) this.slope = ((BigDecimal) dataMap.get("slopeNumeric")).toString();
-		else this.slope = (String) dataMap.get("slopeString");
+		if (dataMap.get("minNumeric") != null)
+			this.min = ((BigDecimal) dataMap.get("minNumeric")).toString();
+		else
+			this.min = (String) dataMap.get("minString");
+		if (dataMap.get("maxNumeric") != null)
+			this.max = ((BigDecimal) dataMap.get("maxNumeric")).toString();
+		else
+			this.max = (String) dataMap.get("maxString");
+		if (dataMap.get("ec50Numeric") != null)
+			this.ec50 = ((BigDecimal) dataMap.get("ec50Numeric")).toString();
+		else
+			this.ec50 = (String) dataMap.get("ec50String");
+		if (dataMap.get("slopeNumeric") != null)
+			this.slope = ((BigDecimal) dataMap.get("slopeNumeric")).toString();
+		else
+			this.slope = (String) dataMap.get("slopeString");
 		this.minUnits = (String) dataMap.get("minUnits");
 		this.maxUnits = (String) dataMap.get("maxUnits");
 		this.ec50Units = (String) dataMap.get("ec50Units");
@@ -108,62 +115,65 @@ public CurveFitDTO(Map dataMap){
 		this.userFlagStatus = (String) dataMap.get("userFlagStatus");
 		this.algorithmFlagStatus = (String) dataMap.get("algorithmFlagStatus");
 	}
-	
-	public CurveFitDTO(HashMap<String, String> stringMap, HashMap<String, BigDecimal> numericMap)
-			{
-		// These keys must be exactly the same as what is used in the database. Case sensitive.
-		//TODO: finalize these kinds, make sure they match exactly what is being used.
-				this.curveId = stringMap.get("curve id");
-				this.batchCode = stringMap.get("batch code");
-				this.category = stringMap.get("category");
-				this.renderingHint = stringMap.get("Rendering Hint");
-				this.min = String.valueOf(numericMap.get("Min"));
-				if (this.min.equals("null")) this.min = stringMap.get("Min");
-				this.max = String.valueOf(numericMap.get("Max"));
-				if (this.max.equals("null")) this.max = stringMap.get("Max");
-				this.ec50 = String.valueOf(numericMap.get("EC50"));
-				if (this.ec50.equals("null")) this.ec50 = stringMap.get("EC50");
-				this.minUnits = stringMap.get("Min units");
-				this.maxUnits = stringMap.get("Max units");
-				this.ec50Units = stringMap.get("EC50 units");
-				this.slope = String.valueOf(numericMap.get("Slope"));
-				if (this.slope.equals("null")) this.slope = stringMap.get("Slope");
-				this.minUncertainty = numericMap.get("Min uncertainty");
-				this.maxUncertainty = numericMap.get("Max uncertainty");
-				this.ec50Uncertainty = numericMap.get("EC50 uncertainty");
-				this.slopeUncertainty = numericMap.get("Slope uncertainty");
-				this.minUncertaintyType = stringMap.get("Min uncertainty type");
-				this.maxUncertaintyType = stringMap.get("Max uncertainty type");
-				this.ec50UncertaintyType = stringMap.get("EC50 uncertainty type");
-				this.slopeUncertaintyType = stringMap.get("Slope uncertainty type");
-				this.minOperatorKind = stringMap.get("Min operator kind");
-				this.maxOperatorKind = stringMap.get("Max operator kind");
-				this.ec50OperatorKind = stringMap.get("EC50 operator kind");
-				this.slopeOperatorKind = stringMap.get("Slope operator kind");
-				this.fittedMin = numericMap.get("Fitted Min");
-				this.fittedMax = numericMap.get("Fitted Max");
-				this.fittedEC50 = numericMap.get("Fitted EC50");
-				this.fittedSlope = numericMap.get("Fitted Slope");
-				this.fittedMinUncertainty = numericMap.get("Fitted Min uncertainty");
-				this.fittedMaxUncertainty = numericMap.get("Fitted Max uncertainty");
-				this.fittedEc50Uncertainty = numericMap.get("Fitted EC50 uncertainty");
-				this.fittedSlopeUncertainty = numericMap.get("Fitted Slope uncertainty");
-				this.fittedMinUncertaintyType = stringMap.get("Fitted Min uncertainty type");
-				this.fittedMaxUncertaintyType = stringMap.get("Fitted Max uncertainty type");
-				this.fittedEc50UncertaintyType = stringMap.get("Fitted EC50 uncertainty type");
-				this.fittedSlopeUncertaintyType = stringMap.get("Fitted Slope uncertainty type");
-				this.sse = numericMap.get("SSE");
-				this.sst = numericMap.get("SST");
-				this.rsquared = numericMap.get("rSquared");
-				this.curveErrorsClob = stringMap.get("curveErrorsClob");
-				this.reportedValuesClob = stringMap.get("reportedValuesClob");
-				this.parameterStdErrorsClob = stringMap.get("parameterStdErrorsClob");
-				this.fitSettings = stringMap.get("fitSettings");
-				this.fitSummaryClob = stringMap.get("fitSummaryClob");
-				this.userFlagStatus = stringMap.get("user flag status");
-				this.algorithmFlagStatus = stringMap.get("algorithm flag status");
-	}
 
+	public CurveFitDTO(HashMap<String, String> stringMap, HashMap<String, BigDecimal> numericMap) {
+		// These keys must be exactly the same as what is used in the database. Case
+		// sensitive.
+		// TODO: finalize these kinds, make sure they match exactly what is being used.
+		this.curveId = stringMap.get("curve id");
+		this.batchCode = stringMap.get("batch code");
+		this.category = stringMap.get("category");
+		this.renderingHint = stringMap.get("Rendering Hint");
+		this.min = String.valueOf(numericMap.get("Min"));
+		if (this.min.equals("null"))
+			this.min = stringMap.get("Min");
+		this.max = String.valueOf(numericMap.get("Max"));
+		if (this.max.equals("null"))
+			this.max = stringMap.get("Max");
+		this.ec50 = String.valueOf(numericMap.get("EC50"));
+		if (this.ec50.equals("null"))
+			this.ec50 = stringMap.get("EC50");
+		this.minUnits = stringMap.get("Min units");
+		this.maxUnits = stringMap.get("Max units");
+		this.ec50Units = stringMap.get("EC50 units");
+		this.slope = String.valueOf(numericMap.get("Slope"));
+		if (this.slope.equals("null"))
+			this.slope = stringMap.get("Slope");
+		this.minUncertainty = numericMap.get("Min uncertainty");
+		this.maxUncertainty = numericMap.get("Max uncertainty");
+		this.ec50Uncertainty = numericMap.get("EC50 uncertainty");
+		this.slopeUncertainty = numericMap.get("Slope uncertainty");
+		this.minUncertaintyType = stringMap.get("Min uncertainty type");
+		this.maxUncertaintyType = stringMap.get("Max uncertainty type");
+		this.ec50UncertaintyType = stringMap.get("EC50 uncertainty type");
+		this.slopeUncertaintyType = stringMap.get("Slope uncertainty type");
+		this.minOperatorKind = stringMap.get("Min operator kind");
+		this.maxOperatorKind = stringMap.get("Max operator kind");
+		this.ec50OperatorKind = stringMap.get("EC50 operator kind");
+		this.slopeOperatorKind = stringMap.get("Slope operator kind");
+		this.fittedMin = numericMap.get("Fitted Min");
+		this.fittedMax = numericMap.get("Fitted Max");
+		this.fittedEC50 = numericMap.get("Fitted EC50");
+		this.fittedSlope = numericMap.get("Fitted Slope");
+		this.fittedMinUncertainty = numericMap.get("Fitted Min uncertainty");
+		this.fittedMaxUncertainty = numericMap.get("Fitted Max uncertainty");
+		this.fittedEc50Uncertainty = numericMap.get("Fitted EC50 uncertainty");
+		this.fittedSlopeUncertainty = numericMap.get("Fitted Slope uncertainty");
+		this.fittedMinUncertaintyType = stringMap.get("Fitted Min uncertainty type");
+		this.fittedMaxUncertaintyType = stringMap.get("Fitted Max uncertainty type");
+		this.fittedEc50UncertaintyType = stringMap.get("Fitted EC50 uncertainty type");
+		this.fittedSlopeUncertaintyType = stringMap.get("Fitted Slope uncertainty type");
+		this.sse = numericMap.get("SSE");
+		this.sst = numericMap.get("SST");
+		this.rsquared = numericMap.get("rSquared");
+		this.curveErrorsClob = stringMap.get("curveErrorsClob");
+		this.reportedValuesClob = stringMap.get("reportedValuesClob");
+		this.parameterStdErrorsClob = stringMap.get("parameterStdErrorsClob");
+		this.fitSettings = stringMap.get("fitSettings");
+		this.fitSummaryClob = stringMap.get("fitSummaryClob");
+		this.userFlagStatus = stringMap.get("user flag status");
+		this.algorithmFlagStatus = stringMap.get("algorithm flag status");
+	}
 
 	private String curveId;
 	private String analysisGroupCode;
@@ -214,11 +224,8 @@ public CurveFitDTO(HashMap<String, String> stringMap, HashMap<String, BigDecimal
 	private String fitSummaryClob;
 	private String userFlagStatus;
 	private String algorithmFlagStatus;
-	
-	
-
 
-	public static String[] getColumns(){
+	public static String[] getColumns() {
 		String[] headerColumns = new String[] {
 				"curveId",
 				"analysisGroupCode",
@@ -269,14 +276,14 @@ public static String[] getColumns(){
 				"fitSummaryClob",
 				"userFlagStatus",
 				"algorithmFlagStatus"
-				};
+		};
 
 		return headerColumns;
 
 	}
 
 	public static CellProcessor[] getProcessors() {
-		final CellProcessor[] processors = new CellProcessor[] { 
+		final CellProcessor[] processors = new CellProcessor[] {
 				new Optional(),
 				new Optional(),
 				new Optional(),
@@ -330,67 +337,68 @@ public static CellProcessor[] getProcessors() {
 
 		return processors;
 	}
-	
+
 	@Transactional
-	public static Collection<CurveFitDTO> getFitData(Collection<String> curveIds){
+	public static Collection<CurveFitDTO> getFitData(Collection<String> curveIds) {
 		EntityManager em = SubjectValue.entityManager();
-		if (curveIds.isEmpty()) return new ArrayList<CurveFitDTO>();
+		if (curveIds.isEmpty())
+			return new ArrayList<CurveFitDTO>();
 		String queryString = "SELECT NEW MAP( curveIdValue.stringValue as curveId, "
 				+ "ag.codeName as analysisGroupCode, "
 				+ "curveIdValue.recordedBy as recordedBy, "
-        		+ "curveIdValue.lsTransaction as lsTransaction, "
-        		+ "curveIdValue.recordedDate as recordedDate, "
-        		+ "batchCodeValue.codeValue as batchCode, "
-        		+ "categoryValue.stringValue as category, "
-        		+ "renderingHintValue.stringValue as renderingHint, "
-        		+ "minValue.stringValue as minString, "
-        		+ "minValue.numericValue as minNumeric, "
-        		+ "maxValue.stringValue as maxString, "
-        		+ "maxValue.numericValue as maxNumeric, "
-        		+ "ec50Value.stringValue as ec50String, "
-        		+ "ec50Value.numericValue as ec50Numeric, "
-        		+ "slopeValue.stringValue as slopeString, "
-        		+ "slopeValue.numericValue as slopeNumeric, "
-        		+ "minValue.unitKind as minUnits, "
-        		+ "maxValue.unitKind as maxUnits, "
-        		+ "ec50Value.unitKind as ec50Units, "
-        		+ "minValue.uncertainty as minUncertainty, "
-        		+ "maxValue.uncertainty as maxUncertainty, "
-        		+ "ec50Value.uncertainty as ec50Uncertainty, "
-        		+ "slopeValue.uncertainty as slopeUncertainty, "
-        		+ "minValue.uncertaintyType as minUncertaintyType, "
-        		+ "maxValue.uncertaintyType as maxUncertaintyType, "
-        		+ "ec50Value.uncertaintyType as ec50UncertaintyType, "
-        		+ "slopeValue.uncertaintyType as slopeUncertaintyType, "
-        		+ "minValue.operatorKind as minOperatorKind, "
-        		+ "maxValue.operatorKind as maxOperatorKind, "
-        		+ "ec50Value.operatorKind as ec50OperatorKind, "
-        		+ "slopeValue.operatorKind as slopeOperatorKind, "
-        		+ "fittedMinValue.numericValue as fittedMin, "
-        		+ "fittedMaxValue.numericValue as fittedMax, "
-        		+ "fittedEc50Value.numericValue as fittedEC50, "
-        		+ "fittedSlopeValue.numericValue as fittedSlope, "
-        		+ "fittedMinValue.uncertainty as fittedMinUncertainty, "
-        		+ "fittedMaxValue.uncertainty as fittedMaxUncertainty, "
-        		+ "fittedEc50Value.uncertainty as fittedEc50Uncertainty, "
-        		+ "fittedSlopeValue.uncertainty as fittedSlopeUncertainty, "
-        		+ "fittedMinValue.uncertaintyType as fittedMinUncertaintyType, "
-        		+ "fittedMaxValue.uncertaintyType as fittedMaxUncertaintyType, "
-        		+ "fittedEc50Value.uncertaintyType as fittedEc50UncertaintyType, "
-        		+ "fittedSlopeValue.uncertaintyType as fittedSlopeUncertaintyType, "
-        		+ "sseValue.numericValue as sse, "
-        		+ "sstValue.numericValue as sst, "
-        		+ "rSquaredValue.numericValue as rsquared, "
-        		+ "curveErrorsClobValue.clobValue as curveErrorsClob, "
-        		+ "reportedValuesClobValue.clobValue as reportedValuesClob, "
-        		+ "parameterStdErrorsClobValue.clobValue as parameterStdErrorsClob, "
-        		+ "fitSettingsValue.clobValue as fitSettings, "
-        		+ "fitSummaryClobValue.clobValue as fitSummaryClob, "
-        		+ "userFlagStatusValue.codeValue as userFlagStatus, "
-        		+ "algorithmFlagStatusValue.codeValue as algorithmFlagStatus "
-        		+ " ) " 
-        		+ "FROM AnalysisGroup ag "
-        		+ "JOIN ag.lsStates as ags "
+				+ "curveIdValue.lsTransaction as lsTransaction, "
+				+ "curveIdValue.recordedDate as recordedDate, "
+				+ "batchCodeValue.codeValue as batchCode, "
+				+ "categoryValue.stringValue as category, "
+				+ "renderingHintValue.stringValue as renderingHint, "
+				+ "minValue.stringValue as minString, "
+				+ "minValue.numericValue as minNumeric, "
+				+ "maxValue.stringValue as maxString, "
+				+ "maxValue.numericValue as maxNumeric, "
+				+ "ec50Value.stringValue as ec50String, "
+				+ "ec50Value.numericValue as ec50Numeric, "
+				+ "slopeValue.stringValue as slopeString, "
+				+ "slopeValue.numericValue as slopeNumeric, "
+				+ "minValue.unitKind as minUnits, "
+				+ "maxValue.unitKind as maxUnits, "
+				+ "ec50Value.unitKind as ec50Units, "
+				+ "minValue.uncertainty as minUncertainty, "
+				+ "maxValue.uncertainty as maxUncertainty, "
+				+ "ec50Value.uncertainty as ec50Uncertainty, "
+				+ "slopeValue.uncertainty as slopeUncertainty, "
+				+ "minValue.uncertaintyType as minUncertaintyType, "
+				+ "maxValue.uncertaintyType as maxUncertaintyType, "
+				+ "ec50Value.uncertaintyType as ec50UncertaintyType, "
+				+ "slopeValue.uncertaintyType as slopeUncertaintyType, "
+				+ "minValue.operatorKind as minOperatorKind, "
+				+ "maxValue.operatorKind as maxOperatorKind, "
+				+ "ec50Value.operatorKind as ec50OperatorKind, "
+				+ "slopeValue.operatorKind as slopeOperatorKind, "
+				+ "fittedMinValue.numericValue as fittedMin, "
+				+ "fittedMaxValue.numericValue as fittedMax, "
+				+ "fittedEc50Value.numericValue as fittedEC50, "
+				+ "fittedSlopeValue.numericValue as fittedSlope, "
+				+ "fittedMinValue.uncertainty as fittedMinUncertainty, "
+				+ "fittedMaxValue.uncertainty as fittedMaxUncertainty, "
+				+ "fittedEc50Value.uncertainty as fittedEc50Uncertainty, "
+				+ "fittedSlopeValue.uncertainty as fittedSlopeUncertainty, "
+				+ "fittedMinValue.uncertaintyType as fittedMinUncertaintyType, "
+				+ "fittedMaxValue.uncertaintyType as fittedMaxUncertaintyType, "
+				+ "fittedEc50Value.uncertaintyType as fittedEc50UncertaintyType, "
+				+ "fittedSlopeValue.uncertaintyType as fittedSlopeUncertaintyType, "
+				+ "sseValue.numericValue as sse, "
+				+ "sstValue.numericValue as sst, "
+				+ "rSquaredValue.numericValue as rsquared, "
+				+ "curveErrorsClobValue.clobValue as curveErrorsClob, "
+				+ "reportedValuesClobValue.clobValue as reportedValuesClob, "
+				+ "parameterStdErrorsClobValue.clobValue as parameterStdErrorsClob, "
+				+ "fitSettingsValue.clobValue as fitSettings, "
+				+ "fitSummaryClobValue.clobValue as fitSummaryClob, "
+				+ "userFlagStatusValue.codeValue as userFlagStatus, "
+				+ "algorithmFlagStatusValue.codeValue as algorithmFlagStatus "
+				+ " ) "
+				+ "FROM AnalysisGroup ag "
+				+ "JOIN ag.lsStates as ags "
 				+ "LEFT JOIN ags.lsValues as curveIdValue WITH curveIdValue.lsKind = 'curve id' "
 				+ "LEFT JOIN ags.lsValues as batchCodeValue WITH batchCodeValue.lsKind = 'batch code' "
 				+ "LEFT JOIN ags.lsValues as categoryValue WITH categoryValue.lsKind = 'category' "
@@ -413,60 +421,63 @@ public static Collection<CurveFitDTO> getFitData(Collection<String> curveIds){
 				+ "LEFT JOIN ags.lsValues as fitSummaryClobValue WITH fitSummaryClobValue.lsKind = 'fitSummaryClob' "
 				+ "LEFT JOIN ags.lsValues as userFlagStatusValue WITH userFlagStatusValue.lsKind = 'user flag status' "
 				+ "LEFT JOIN ags.lsValues as algorithmFlagStatusValue WITH algorithmFlagStatusValue.lsKind = 'algorithm flag status' "
-        		+ "WHERE ag.ignored = false " 
-        		+ "AND ags.ignored = false "
-        		+ "AND curveIdValue.ignored = false "
-        		+ "AND (";
-        Map<String, Collection<String>> sqlCurveIdMap = new HashMap<String, Collection<String>>();
-    	List<String> allCurveIds = new ArrayList<String>();
-    	allCurveIds.addAll(curveIds);
-    	int startIndex = 0;
-    	while (startIndex < curveIds.size()){
-    		int endIndex;
-    		if (startIndex+999 < curveIds.size()) endIndex = startIndex+999;
-    		else endIndex = curveIds.size();
-    		List<String> nextCurveIds = allCurveIds.subList(startIndex, endIndex);
-    		String groupName = "curveIds"+startIndex;
-    		String sqlClause = " curveIdValue.stringValue IN (:"+groupName+")";
-    		sqlCurveIdMap.put(sqlClause, nextCurveIds);
-    		startIndex=endIndex;
-    	}
-    	int numClause = 1;
-    	for (String sqlClause : sqlCurveIdMap.keySet()){
-    		if (numClause == 1){
-    			queryString = queryString + sqlClause;
-    		}else{
-    			queryString = queryString + " OR " + sqlClause;
-    		}
-    		numClause++;
-    	}
-    	queryString = queryString + " )";
+				+ "WHERE ag.ignored = false "
+				+ "AND ags.ignored = false "
+				+ "AND curveIdValue.ignored = false "
+				+ "AND (";
+		Map<String, Collection<String>> sqlCurveIdMap = new HashMap<String, Collection<String>>();
+		List<String> allCurveIds = new ArrayList<String>();
+		allCurveIds.addAll(curveIds);
+		int startIndex = 0;
+		while (startIndex < curveIds.size()) {
+			int endIndex;
+			if (startIndex + 999 < curveIds.size())
+				endIndex = startIndex + 999;
+			else
+				endIndex = curveIds.size();
+			List<String> nextCurveIds = allCurveIds.subList(startIndex, endIndex);
+			String groupName = "curveIds" + startIndex;
+			String sqlClause = " curveIdValue.stringValue IN (:" + groupName + ")";
+			sqlCurveIdMap.put(sqlClause, nextCurveIds);
+			startIndex = endIndex;
+		}
+		int numClause = 1;
+		for (String sqlClause : sqlCurveIdMap.keySet()) {
+			if (numClause == 1) {
+				queryString = queryString + sqlClause;
+			} else {
+				queryString = queryString + " OR " + sqlClause;
+			}
+			numClause++;
+		}
+		queryString = queryString + " )";
 		TypedQuery<Map> q = em.createQuery(queryString, Map.class);
-        for (String sqlClause : sqlCurveIdMap.keySet()){
-        	String groupName = sqlClause.split(":")[1].replace(")","");
-        	q.setParameter(groupName, sqlCurveIdMap.get(sqlClause));
-        }
-        logger.debug("Querying with string: \n"+queryString);
-        List<Map> queryResults = q.getResultList();
-        logger.debug(queryResults.size()+" results found");
-        List<CurveFitDTO> curveFitDTOList = new ArrayList<CurveFitDTO>();
+		for (String sqlClause : sqlCurveIdMap.keySet()) {
+			String groupName = sqlClause.split(":")[1].replace(")", "");
+			q.setParameter(groupName, sqlCurveIdMap.get(sqlClause));
+		}
+		logger.debug("Querying with string: \n" + queryString);
+		List<Map> queryResults = q.getResultList();
+		logger.debug(queryResults.size() + " results found");
+		List<CurveFitDTO> curveFitDTOList = new ArrayList<CurveFitDTO>();
 		for (Map result : queryResults) {
 			CurveFitDTO curveFitDTO = new CurveFitDTO(result);
 			curveFitDTOList.add(curveFitDTO);
 		}
 		return curveFitDTOList;
-		
+
 	}
-	
+
 	@Transactional
-	public static CurveFitDTO getFitData(CurveFitDTO curveFitDTO){
+	public static CurveFitDTO getFitData(CurveFitDTO curveFitDTO) {
 		AnalysisGroupValue curveIdValue = findCurveIdValue(curveFitDTO.getCurveId());
 		if (curveIdValue == null || curveIdValue.getStateId() == null) {
 			logger.debug("No data found for curve id: " + curveFitDTO.getCurveId());
 			return new CurveFitDTO();
 		}
 		AnalysisGroupState doseResponseState = AnalysisGroupState.findAnalysisGroupState(curveIdValue.getStateId());
-//		List<AnalysisGroupValue> agValues = AnalysisGroupValue.findAnalysisGroupValuesByLsState(doseResponseState).getResultList();
+		// List<AnalysisGroupValue> agValues =
+		// AnalysisGroupValue.findAnalysisGroupValuesByLsState(doseResponseState).getResultList();
 		Collection<AnalysisGroupValue> agValues = doseResponseState.getLsValues();
 		HashMap<String, String> stringMap = new HashMap<String, String>();
 		HashMap<String, BigDecimal> numericMap = new HashMap<String, BigDecimal>();
@@ -477,19 +488,19 @@ public static CurveFitDTO getFitData(CurveFitDTO curveFitDTO){
 				stringMap.put(agValue.getLsKind(), agValue.getClobValue());
 			} else if (agValue.getLsType().equals("numericValue")) {
 				numericMap.put(agValue.getLsKind(), agValue.getNumericValue());
-				if(agValue.getUnitKind() != null) {
-					stringMap.put(agValue.getLsKind()+" units", agValue.getUnitKind());
+				if (agValue.getUnitKind() != null) {
+					stringMap.put(agValue.getLsKind() + " units", agValue.getUnitKind());
 				}
-				if(agValue.getUncertainty() != null){
-					numericMap.put(agValue.getLsKind()+" uncertainty", agValue.getUncertainty());
+				if (agValue.getUncertainty() != null) {
+					numericMap.put(agValue.getLsKind() + " uncertainty", agValue.getUncertainty());
 				}
-				if(agValue.getUncertaintyType() != null){
-					stringMap.put(agValue.getLsKind()+" uncertainty type", agValue.getUncertaintyType());
+				if (agValue.getUncertaintyType() != null) {
+					stringMap.put(agValue.getLsKind() + " uncertainty type", agValue.getUncertaintyType());
 				}
-				if(agValue.getOperatorKind() != null){
-					stringMap.put(agValue.getLsKind()+" operator kind", agValue.getOperatorKind());
+				if (agValue.getOperatorKind() != null) {
+					stringMap.put(agValue.getLsKind() + " operator kind", agValue.getOperatorKind());
 				}
-			} else if  (agValue.getLsType().equals("codeValue")) {
+			} else if (agValue.getLsType().equals("codeValue")) {
 				stringMap.put(agValue.getLsKind(), agValue.getCodeValue());
 			}
 		}
@@ -498,70 +509,83 @@ public static CurveFitDTO getFitData(CurveFitDTO curveFitDTO){
 		curveFitDTO.setLsTransaction(curveIdValue.getLsTransaction());
 		return curveFitDTO;
 	}
-	
+
 	public static String getCsvList(Collection<CurveFitDTO> curveFitDTOs, String format) {
-		//format is ALWAYS tsv or csv (not case sensitive)
+		// format is ALWAYS tsv or csv (not case sensitive)
 		StringWriter outFile = new StringWriter();
-        ICsvBeanWriter beanWriter = null;
-        try {
-            if (format.equalsIgnoreCase("csv")) beanWriter = new CsvBeanWriter(outFile, CsvPreference.STANDARD_PREFERENCE);
-            else beanWriter = new CsvBeanWriter(outFile, CsvPreference.TAB_PREFERENCE);
-            final String[] header = CurveFitDTO.getColumns();
-            final CellProcessor[] processors = CurveFitDTO.getProcessors();
-            beanWriter.writeHeader(header);
-            for (final CurveFitDTO curveFitDTO : curveFitDTOs) {
-                beanWriter.write(curveFitDTO, header, processors);
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            if (beanWriter != null) {
-                try {
-                    beanWriter.close();
-                    outFile.flush();
-                    outFile.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return outFile.toString();
-	}
-
-	public static void updateFitData( Collection<CurveFitDTO> curveFitDTOs) {
+		ICsvBeanWriter beanWriter = null;
+		try {
+			if (format.equalsIgnoreCase("csv"))
+				beanWriter = new CsvBeanWriter(outFile, CsvPreference.STANDARD_PREFERENCE);
+			else
+				beanWriter = new CsvBeanWriter(outFile, CsvPreference.TAB_PREFERENCE);
+			final String[] header = CurveFitDTO.getColumns();
+			final CellProcessor[] processors = CurveFitDTO.getProcessors();
+			beanWriter.writeHeader(header);
+			for (final CurveFitDTO curveFitDTO : curveFitDTOs) {
+				beanWriter.write(curveFitDTO, header, processors);
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
+		} finally {
+			if (beanWriter != null) {
+				try {
+					beanWriter.close();
+					outFile.flush();
+					outFile.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+		return outFile.toString();
+	}
+
+	public static void updateFitData(Collection<CurveFitDTO> curveFitDTOs) {
 		for (CurveFitDTO curveFitDTO : curveFitDTOs) {
-			if (curveFitDTO.getAnalysisGroupCode() == null) logger.error("FIELD MISSING: analysisGroupCode");
-			if (curveFitDTO.getRecordedBy() == null) logger.error("FIELD MISSING: recordedBy");
-			if (curveFitDTO.getLsTransaction() == null) logger.error("FIELD MISSING: lsTransaction");
-			AnalysisGroup analysisGroup = AnalysisGroup.findAnalysisGroupsByCodeNameEquals(curveFitDTO.getAnalysisGroupCode()).getSingleResult();
+			if (curveFitDTO.getAnalysisGroupCode() == null)
+				logger.error("FIELD MISSING: analysisGroupCode");
+			if (curveFitDTO.getRecordedBy() == null)
+				logger.error("FIELD MISSING: recordedBy");
+			if (curveFitDTO.getLsTransaction() == null)
+				logger.error("FIELD MISSING: lsTransaction");
+			AnalysisGroup analysisGroup = AnalysisGroup
+					.findAnalysisGroupsByCodeNameEquals(curveFitDTO.getAnalysisGroupCode()).getSingleResult();
 			try {
-				AnalysisGroupState oldState = AnalysisGroupState.findAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(analysisGroup, "data", "dose response", true).getSingleResult();
+				AnalysisGroupState oldState = AnalysisGroupState
+						.findAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(
+								analysisGroup, "data", "dose response", true)
+						.getSingleResult();
 				oldState.setIgnored(true);
 				oldState.merge();
-//				oldState.flush();
-			} catch(NoResultException e) {
-				logger.debug("Old state of typekind data/dose response not found for AG Code " + curveFitDTO.getAnalysisGroupCode() + " , creating new one");
+				// oldState.flush();
+			} catch (NoResultException e) {
+				logger.debug("Old state of typekind data/dose response not found for AG Code "
+						+ curveFitDTO.getAnalysisGroupCode() + " , creating new one");
 			}
-			AnalysisGroupState newState = createCurveFitState(analysisGroup.getId(), "data", "dose response", curveFitDTO.getRecordedBy(), curveFitDTO.getLsTransaction());
+			AnalysisGroupState newState = createCurveFitState(analysisGroup.getId(), "data", "dose response",
+					curveFitDTO.getRecordedBy(), curveFitDTO.getLsTransaction());
 			newState.setLsTransaction(curveFitDTO.getLsTransaction());
 			saveFitData(newState, curveFitDTO);
 		}
 	}
-	
+
 	@Transactional
 	private static void saveFitData(AnalysisGroupState state, CurveFitDTO curveFitDTO) {
 		Collection<AnalysisGroupValue> newValues = new HashSet<AnalysisGroupValue>();
-		//non-optional fields
+		// non-optional fields
 		String recordedBy = curveFitDTO.getRecordedBy();
 		Long lsTransaction = curveFitDTO.getLsTransaction();
 		String batchCode = curveFitDTO.getBatchCode();
-		AnalysisGroupValue batchCodeValue = createCurveFitValue(state, "codeValue", "batch code", curveFitDTO.getBatchCode(), recordedBy, lsTransaction);
+		AnalysisGroupValue batchCodeValue = createCurveFitValue(state, "codeValue", "batch code",
+				curveFitDTO.getBatchCode(), recordedBy, lsTransaction);
 		batchCodeValue.setPublicData(true);
 		newValues.add(batchCodeValue);
-		AnalysisGroupValue curveIdValue = createCurveFitValue(state, "stringValue", "curve id", curveFitDTO.getCurveId(), recordedBy, lsTransaction);
+		AnalysisGroupValue curveIdValue = createCurveFitValue(state, "stringValue", "curve id",
+				curveFitDTO.getCurveId(), recordedBy, lsTransaction);
 		curveIdValue.setPublicData(true);
 		newValues.add(curveIdValue);
-		//all the rest of the fields (may be null)
+		// all the rest of the fields (may be null)
 		String category = curveFitDTO.getCategory();
 		String renderingHint = curveFitDTO.getRenderingHint();
 		String min = curveFitDTO.getMin();
@@ -582,23 +606,27 @@ private static void saveFitData(AnalysisGroupState state, CurveFitDTO curveFitDT
 		String fitSummaryClob = curveFitDTO.getFitSummaryClob();
 		String userFlagStatus = curveFitDTO.getUserFlagStatus();
 		String algorithmFlagStatus = curveFitDTO.getAlgorithmFlagStatus();
-		
-		//only create AnalysisGroupValues if they would not be empty/null
 
-		if (!(category==null)){
-			AnalysisGroupValue categoryValue = createCurveFitValue(state, "stringValue", "category", category, recordedBy, lsTransaction);
+		// only create AnalysisGroupValues if they would not be empty/null
+
+		if (!(category == null)) {
+			AnalysisGroupValue categoryValue = createCurveFitValue(state, "stringValue", "category", category,
+					recordedBy, lsTransaction);
 			categoryValue.setCodeValue(batchCode);
 			newValues.add(categoryValue);
 		}
-		if (!(renderingHint==null)){
-			AnalysisGroupValue renderingHintValue = createCurveFitValue(state, "stringValue", "Rendering Hint", renderingHint, recordedBy, lsTransaction);
+		if (!(renderingHint == null)) {
+			AnalysisGroupValue renderingHintValue = createCurveFitValue(state, "stringValue", "Rendering Hint",
+					renderingHint, recordedBy, lsTransaction);
 			renderingHintValue.setCodeValue(batchCode);
 			newValues.add(renderingHintValue);
 		}
-		//Min, Max, EC50, and Slope are special cases. They must be filled in with something for Seurat,
-		//so we fill them in as stringValues if their value is not numeric
-		if (!(min==null) && SimpleUtil.isDecimalNumeric(min)) {
-			AnalysisGroupValue minValue = createCurveFitValue(state, "numericValue", "Min", new BigDecimal(min), recordedBy, lsTransaction);
+		// Min, Max, EC50, and Slope are special cases. They must be filled in with
+		// something for Seurat,
+		// so we fill them in as stringValues if their value is not numeric
+		if (!(min == null) && SimpleUtil.isDecimalNumeric(min)) {
+			AnalysisGroupValue minValue = createCurveFitValue(state, "numericValue", "Min", new BigDecimal(min),
+					recordedBy, lsTransaction);
 			minValue.setUnitKind(curveFitDTO.getMinUnits());
 			minValue.setUncertainty(curveFitDTO.getMinUncertainty());
 			minValue.setUncertaintyType(curveFitDTO.getMinUncertaintyType());
@@ -607,13 +635,15 @@ private static void saveFitData(AnalysisGroupState state, CurveFitDTO curveFitDT
 			minValue.setPublicData(true);
 			newValues.add(minValue);
 		} else {
-			AnalysisGroupValue minValue = createCurveFitValue(state, "stringValue", "Min", min, recordedBy, lsTransaction);
+			AnalysisGroupValue minValue = createCurveFitValue(state, "stringValue", "Min", min, recordedBy,
+					lsTransaction);
 			minValue.setCodeValue(batchCode);
 			minValue.setPublicData(true);
 			newValues.add(minValue);
 		}
-		if (!(max==null) && SimpleUtil.isDecimalNumeric(max)) {
-			AnalysisGroupValue maxValue = createCurveFitValue(state, "numericValue", "Max", new BigDecimal(max), recordedBy, lsTransaction);
+		if (!(max == null) && SimpleUtil.isDecimalNumeric(max)) {
+			AnalysisGroupValue maxValue = createCurveFitValue(state, "numericValue", "Max", new BigDecimal(max),
+					recordedBy, lsTransaction);
 			maxValue.setUnitKind(curveFitDTO.getMaxUnits());
 			maxValue.setUncertainty(curveFitDTO.getMaxUncertainty());
 			maxValue.setUncertaintyType(curveFitDTO.getMaxUncertaintyType());
@@ -622,13 +652,15 @@ private static void saveFitData(AnalysisGroupState state, CurveFitDTO curveFitDT
 			maxValue.setPublicData(true);
 			newValues.add(maxValue);
 		} else {
-			AnalysisGroupValue maxValue = createCurveFitValue(state, "stringValue", "Max", max, recordedBy, lsTransaction);
+			AnalysisGroupValue maxValue = createCurveFitValue(state, "stringValue", "Max", max, recordedBy,
+					lsTransaction);
 			maxValue.setCodeValue(batchCode);
 			maxValue.setPublicData(true);
 			newValues.add(maxValue);
 		}
-		if (!(ec50==null) && SimpleUtil.isDecimalNumeric(ec50)) {
-			AnalysisGroupValue ec50Value = createCurveFitValue(state, "numericValue", "EC50", new BigDecimal(ec50), recordedBy, lsTransaction);
+		if (!(ec50 == null) && SimpleUtil.isDecimalNumeric(ec50)) {
+			AnalysisGroupValue ec50Value = createCurveFitValue(state, "numericValue", "EC50", new BigDecimal(ec50),
+					recordedBy, lsTransaction);
 			ec50Value.setUnitKind(curveFitDTO.getEc50Units());
 			ec50Value.setUncertainty(curveFitDTO.getEc50Uncertainty());
 			ec50Value.setUncertaintyType(curveFitDTO.getEc50UncertaintyType());
@@ -637,13 +669,15 @@ private static void saveFitData(AnalysisGroupState state, CurveFitDTO curveFitDT
 			ec50Value.setPublicData(true);
 			newValues.add(ec50Value);
 		} else {
-			AnalysisGroupValue ec50Value = createCurveFitValue(state, "stringValue", "EC50", ec50, recordedBy, lsTransaction);
+			AnalysisGroupValue ec50Value = createCurveFitValue(state, "stringValue", "EC50", ec50, recordedBy,
+					lsTransaction);
 			ec50Value.setCodeValue(batchCode);
 			ec50Value.setPublicData(true);
 			newValues.add(ec50Value);
 		}
-		if (!(slope==null) && SimpleUtil.isDecimalNumeric(slope)) {
-			AnalysisGroupValue slopeValue = createCurveFitValue(state, "numericValue", "Slope", new BigDecimal(slope), recordedBy, lsTransaction);
+		if (!(slope == null) && SimpleUtil.isDecimalNumeric(slope)) {
+			AnalysisGroupValue slopeValue = createCurveFitValue(state, "numericValue", "Slope", new BigDecimal(slope),
+					recordedBy, lsTransaction);
 			slopeValue.setCodeValue(batchCode);
 			slopeValue.setUncertainty(curveFitDTO.getSlopeUncertainty());
 			slopeValue.setUncertaintyType(curveFitDTO.getSlopeUncertaintyType());
@@ -651,136 +685,158 @@ private static void saveFitData(AnalysisGroupState state, CurveFitDTO curveFitDT
 			slopeValue.setPublicData(true);
 			newValues.add(slopeValue);
 		} else {
-			AnalysisGroupValue slopeValue = createCurveFitValue(state, "stringValue", "Slope", slope, recordedBy, lsTransaction);
+			AnalysisGroupValue slopeValue = createCurveFitValue(state, "stringValue", "Slope", slope, recordedBy,
+					lsTransaction);
 			slopeValue.setCodeValue(batchCode);
 			slopeValue.setPublicData(true);
 			newValues.add(slopeValue);
 		}
-		//Remaining non-special numericValues
-		if (!(fittedMin==null)){
-			AnalysisGroupValue fittedMinValue = createCurveFitValue(state, "numericValue", "Fitted Min", fittedMin, recordedBy, lsTransaction);
+		// Remaining non-special numericValues
+		if (!(fittedMin == null)) {
+			AnalysisGroupValue fittedMinValue = createCurveFitValue(state, "numericValue", "Fitted Min", fittedMin,
+					recordedBy, lsTransaction);
 			fittedMinValue.setCodeValue(batchCode);
 			fittedMinValue.setUncertainty(curveFitDTO.getFittedMinUncertainty());
 			fittedMinValue.setUncertaintyType(curveFitDTO.getFittedMinUncertaintyType());
 			newValues.add(fittedMinValue);
 		}
-		if (!(fittedMax==null)){
-			AnalysisGroupValue fittedMaxValue = createCurveFitValue(state, "numericValue", "Fitted Max", fittedMax, recordedBy, lsTransaction);
+		if (!(fittedMax == null)) {
+			AnalysisGroupValue fittedMaxValue = createCurveFitValue(state, "numericValue", "Fitted Max", fittedMax,
+					recordedBy, lsTransaction);
 			fittedMaxValue.setCodeValue(batchCode);
 			fittedMaxValue.setUncertainty(curveFitDTO.getFittedMaxUncertainty());
 			fittedMaxValue.setUncertaintyType(curveFitDTO.getFittedMaxUncertaintyType());
 			newValues.add(fittedMaxValue);
 		}
-		if (!(fittedEC50==null)){
-			AnalysisGroupValue fittedEC50Value = createCurveFitValue(state, "numericValue", "Fitted EC50", fittedEC50, recordedBy, lsTransaction);
+		if (!(fittedEC50 == null)) {
+			AnalysisGroupValue fittedEC50Value = createCurveFitValue(state, "numericValue", "Fitted EC50", fittedEC50,
+					recordedBy, lsTransaction);
 			fittedEC50Value.setCodeValue(batchCode);
 			fittedEC50Value.setUncertainty(curveFitDTO.getFittedEc50Uncertainty());
 			fittedEC50Value.setUncertaintyType(curveFitDTO.getFittedEc50UncertaintyType());
 			newValues.add(fittedEC50Value);
 		}
-		if (!(fittedSlope==null)){
-			AnalysisGroupValue fittedSlopeValue = createCurveFitValue(state, "numericValue", "Fitted Slope", fittedSlope, recordedBy, lsTransaction);
+		if (!(fittedSlope == null)) {
+			AnalysisGroupValue fittedSlopeValue = createCurveFitValue(state, "numericValue", "Fitted Slope",
+					fittedSlope, recordedBy, lsTransaction);
 			fittedSlopeValue.setCodeValue(batchCode);
 			fittedSlopeValue.setUncertainty(curveFitDTO.getFittedSlopeUncertainty());
 			fittedSlopeValue.setUncertaintyType(curveFitDTO.getFittedSlopeUncertaintyType());
 			newValues.add(fittedSlopeValue);
 		}
-		if (!(sse==null)){
-			AnalysisGroupValue sseValue = createCurveFitValue(state, "numericValue", "SSE", sse, recordedBy, lsTransaction);
+		if (!(sse == null)) {
+			AnalysisGroupValue sseValue = createCurveFitValue(state, "numericValue", "SSE", sse, recordedBy,
+					lsTransaction);
 			sseValue.setCodeValue(batchCode);
 			newValues.add(sseValue);
 		}
-		if (!(sst==null)){
-			AnalysisGroupValue sstValue = createCurveFitValue(state, "numericValue", "SST", sst, recordedBy, lsTransaction);
+		if (!(sst == null)) {
+			AnalysisGroupValue sstValue = createCurveFitValue(state, "numericValue", "SST", sst, recordedBy,
+					lsTransaction);
 			sstValue.setCodeValue(batchCode);
 			newValues.add(sstValue);
 		}
-		if (!(rSquared==null)){
-			AnalysisGroupValue rSquaredValue = createCurveFitValue(state, "numericValue", "rSquared", rSquared, recordedBy, lsTransaction);
+		if (!(rSquared == null)) {
+			AnalysisGroupValue rSquaredValue = createCurveFitValue(state, "numericValue", "rSquared", rSquared,
+					recordedBy, lsTransaction);
 			rSquaredValue.setCodeValue(batchCode);
 			newValues.add(rSquaredValue);
 		}
-		//clob values
-		if (!(curveErrorsClob==null)){
-			AnalysisGroupValue curveErrorsClobValue = createCurveFitValue(state, "clobValue", "curveErrorsClob", curveErrorsClob, recordedBy, lsTransaction);
+		// clob values
+		if (!(curveErrorsClob == null)) {
+			AnalysisGroupValue curveErrorsClobValue = createCurveFitValue(state, "clobValue", "curveErrorsClob",
+					curveErrorsClob, recordedBy, lsTransaction);
 			curveErrorsClobValue.setCodeValue(batchCode);
 			newValues.add(curveErrorsClobValue);
 		}
-		if (!(reportedValuesClob==null)){
-			AnalysisGroupValue reportedValuesClobValue = createCurveFitValue(state, "clobValue", "reportedValuesClob", reportedValuesClob, recordedBy, lsTransaction);
+		if (!(reportedValuesClob == null)) {
+			AnalysisGroupValue reportedValuesClobValue = createCurveFitValue(state, "clobValue", "reportedValuesClob",
+					reportedValuesClob, recordedBy, lsTransaction);
 			reportedValuesClobValue.setCodeValue(batchCode);
 			newValues.add(reportedValuesClobValue);
 		}
-		if (!(parameterStdErrorsClob==null)){
-			AnalysisGroupValue parameterStdErrorsClobValue = createCurveFitValue(state, "clobValue", "parameterStdErrorsClob", parameterStdErrorsClob, recordedBy, lsTransaction);
+		if (!(parameterStdErrorsClob == null)) {
+			AnalysisGroupValue parameterStdErrorsClobValue = createCurveFitValue(state, "clobValue",
+					"parameterStdErrorsClob", parameterStdErrorsClob, recordedBy, lsTransaction);
 			parameterStdErrorsClobValue.setCodeValue(batchCode);
 			newValues.add(parameterStdErrorsClobValue);
 		}
-		if (!(fitSettings==null)){
-			AnalysisGroupValue fitSettingsValue = createCurveFitValue(state, "clobValue", "fitSettings", fitSettings, recordedBy, lsTransaction);
+		if (!(fitSettings == null)) {
+			AnalysisGroupValue fitSettingsValue = createCurveFitValue(state, "clobValue", "fitSettings", fitSettings,
+					recordedBy, lsTransaction);
 			fitSettingsValue.setCodeValue(batchCode);
 			newValues.add(fitSettingsValue);
 		}
-		if (!(fitSummaryClob==null)){
-			AnalysisGroupValue fitSummaryClobValue = createCurveFitValue(state, "clobValue", "fitSummaryClob", fitSummaryClob, recordedBy, lsTransaction);
+		if (!(fitSummaryClob == null)) {
+			AnalysisGroupValue fitSummaryClobValue = createCurveFitValue(state, "clobValue", "fitSummaryClob",
+					fitSummaryClob, recordedBy, lsTransaction);
 			fitSummaryClobValue.setCodeValue(batchCode);
 			newValues.add(fitSummaryClobValue);
 		}
-		//flags
-		if (!(userFlagStatus==null)){
-			AnalysisGroupValue userFlagStatusValue = createCurveFitValue(state, "codeValue", "user flag status", userFlagStatus, recordedBy, lsTransaction);
+		// flags
+		if (!(userFlagStatus == null)) {
+			AnalysisGroupValue userFlagStatusValue = createCurveFitValue(state, "codeValue", "user flag status",
+					userFlagStatus, recordedBy, lsTransaction);
 			userFlagStatusValue.setCodeType("user flags");
 			userFlagStatusValue.setCodeKind("flag status");
 			userFlagStatusValue.setCodeOrigin("ACAS DDICT");
 			newValues.add(userFlagStatusValue);
 		}
-		if (!(algorithmFlagStatus==null)){
-			AnalysisGroupValue algorithmFlagStatusValue = createCurveFitValue(state, "codeValue", "algorithm flag status", algorithmFlagStatus, recordedBy, lsTransaction);
+		if (!(algorithmFlagStatus == null)) {
+			AnalysisGroupValue algorithmFlagStatusValue = createCurveFitValue(state, "codeValue",
+					"algorithm flag status", algorithmFlagStatus, recordedBy, lsTransaction);
 			algorithmFlagStatusValue.setCodeType("algorithm flags");
 			algorithmFlagStatusValue.setCodeKind("flag status");
 			algorithmFlagStatusValue.setCodeOrigin("ACAS DDICT");
 			newValues.add(algorithmFlagStatusValue);
 		}
-		
-		//persist and flush all the new values
-		for (AnalysisGroupValue value: newValues){
+
+		// persist and flush all the new values
+		for (AnalysisGroupValue value : newValues) {
 			value.persist();
-//			value.flush();
-		}		
+			// value.flush();
+		}
 	}
-	
+
 	@Transactional
-	private static AnalysisGroupValue createCurveFitValue(AnalysisGroupState lsState, String lsType, String lsKind, String value, String recordedBy, Long lsTransaction) {
+	private static AnalysisGroupValue createCurveFitValue(AnalysisGroupState lsState, String lsType, String lsKind,
+			String value, String recordedBy, Long lsTransaction) {
 		AnalysisGroupValue analysisGroupValue = new AnalysisGroupValue();
 		analysisGroupValue.setLsState(lsState);
 		analysisGroupValue.setLsType(lsType);
 		analysisGroupValue.setLsKind(lsKind);
-		if (lsType.equals("stringValue")) analysisGroupValue.setStringValue(value);
-		if (lsType.equals("clobValue")) analysisGroupValue.setClobValue(value);
-		if (lsType.equals("codeValue")) analysisGroupValue.setCodeValue(value);
+		if (lsType.equals("stringValue"))
+			analysisGroupValue.setStringValue(value);
+		if (lsType.equals("clobValue"))
+			analysisGroupValue.setClobValue(value);
+		if (lsType.equals("codeValue"))
+			analysisGroupValue.setCodeValue(value);
 		analysisGroupValue.setRecordedBy(recordedBy);
 		analysisGroupValue.setLsTransaction(lsTransaction);
 		logger.debug("Creating value kind: " + analysisGroupValue.toJson());
 		analysisGroupValue.persist();
 		return analysisGroupValue;
 	}
-	
+
 	@Transactional
-	private static AnalysisGroupValue createCurveFitValue(AnalysisGroupState lsState, String lsType, String lsKind, BigDecimal value, String recordedBy, Long lsTransaction) {
+	private static AnalysisGroupValue createCurveFitValue(AnalysisGroupState lsState, String lsType, String lsKind,
+			BigDecimal value, String recordedBy, Long lsTransaction) {
 		AnalysisGroupValue analysisGroupValue = new AnalysisGroupValue();
 		analysisGroupValue.setLsState(lsState);
 		analysisGroupValue.setLsType(lsType);
 		analysisGroupValue.setLsKind(lsKind);
-		if (lsType.equals("numericValue")) analysisGroupValue.setNumericValue(value);
+		if (lsType.equals("numericValue"))
+			analysisGroupValue.setNumericValue(value);
 		analysisGroupValue.setRecordedBy(recordedBy);
 		analysisGroupValue.setLsTransaction(lsTransaction);
 		logger.debug("Creating value kind: " + analysisGroupValue.toJson());
 		analysisGroupValue.persist();
 		return analysisGroupValue;
 	}
-	
+
 	@Transactional
-	private static AnalysisGroupState createCurveFitState(Long analysisGroupId, String stateType, String stateKind, String recordedBy, Long lsTransaction) {
+	private static AnalysisGroupState createCurveFitState(Long analysisGroupId, String stateType, String stateKind,
+			String recordedBy, Long lsTransaction) {
 		AnalysisGroupState analysisGroupState = new AnalysisGroupState();
 		AnalysisGroup analysisGroup = AnalysisGroup.findAnalysisGroup(analysisGroupId);
 		analysisGroupState.setAnalysisGroup(analysisGroup);
@@ -791,62 +847,66 @@ private static AnalysisGroupState createCurveFitState(Long analysisGroupId, Stri
 		analysisGroupState.persist();
 		return analysisGroupState;
 	}
-	
+
 	@Transactional
-	private static AnalysisGroupValue findCurveIdValue(String curveId){
-		//		AnalysisGroupValue curveIdValue = AnalysisGroupValue.findAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot("stringValue", "curve id", curveFitDTO.getCurveId(), true).getSingleResult();
-        if (curveId == null || curveId.length() == 0) throw new IllegalArgumentException("The curveId argument is required");
-        EntityManager em = AnalysisGroupValue.entityManager();
-        TypedQuery<AnalysisGroupValue> q = em.createQuery("SELECT o FROM AnalysisGroupValue AS o JOIN o.lsState AS state JOIN state.analysisGroup AS ag WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.stringValue = :stringValue  AND o.ignored IS NOT :ignored AND state.ignored IS NOT :ignored AND ag.ignored IS NOT :ignored AND state.lsType = :stateType AND state.lsKind = :stateKind", AnalysisGroupValue.class);
-        q.setParameter("lsType", "stringValue");
-        q.setParameter("lsKind", "curve id");
-        q.setParameter("stateType", "data");
-        q.setParameter("stateKind", "dose response");
-        q.setParameter("stringValue", curveId);
-        q.setParameter("ignored", true);
-        try{
-        	return q.getSingleResult();
-        }catch(NoResultException e1) {
-        	logger.warn("No curve id found");
-        	return null;
-        }
-        	catch(Exception e2){
-	        	logger.error("Caught error trying to find curve id: " + curveId);
-	        	logger.error("Specific error: " + e2.getMessage());
-        	return null;
-        }
-	}
-	
+	private static AnalysisGroupValue findCurveIdValue(String curveId) {
+		// AnalysisGroupValue curveIdValue =
+		// AnalysisGroupValue.findAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot("stringValue",
+		// "curve id", curveFitDTO.getCurveId(), true).getSingleResult();
+		if (curveId == null || curveId.length() == 0)
+			throw new IllegalArgumentException("The curveId argument is required");
+		EntityManager em = AnalysisGroupValue.entityManager();
+		TypedQuery<AnalysisGroupValue> q = em.createQuery(
+				"SELECT o FROM AnalysisGroupValue AS o JOIN o.lsState AS state JOIN state.analysisGroup AS ag WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND o.stringValue = :stringValue  AND o.ignored IS NOT :ignored AND state.ignored IS NOT :ignored AND ag.ignored IS NOT :ignored AND state.lsType = :stateType AND state.lsKind = :stateKind",
+				AnalysisGroupValue.class);
+		q.setParameter("lsType", "stringValue");
+		q.setParameter("lsKind", "curve id");
+		q.setParameter("stateType", "data");
+		q.setParameter("stateKind", "dose response");
+		q.setParameter("stringValue", curveId);
+		q.setParameter("ignored", true);
+		try {
+			return q.getSingleResult();
+		} catch (NoResultException e1) {
+			logger.warn("No curve id found");
+			return null;
+		} catch (Exception e2) {
+			logger.error("Caught error trying to find curve id: " + curveId);
+			logger.error("Specific error: " + e2.getMessage());
+			return null;
+		}
+	}
+
 	@Transactional
-	public static Collection<String> findAllCurveIdsByExperiment(String experimentIdOrCodeName){
+	public static Collection<String> findAllCurveIdsByExperiment(String experimentIdOrCodeName) {
 		Experiment experiment = null;
-		if(SimpleUtil.isNumeric(experimentIdOrCodeName)) {
+		if (SimpleUtil.isNumeric(experimentIdOrCodeName)) {
 			experiment = Experiment.findExperiment(Long.valueOf(experimentIdOrCodeName));
-		} else {		
+		} else {
 			experiment = Experiment.findExperimentsByCodeNameEquals(experimentIdOrCodeName).getSingleResult();
 		}
-        EntityManager em = AnalysisGroupValue.entityManager();
-        TypedQuery<String> q = em.createQuery("SELECT agv.stringValue FROM AnalysisGroupValue AS agv "
-        		+ "JOIN agv.lsState AS state "
-        		+ "JOIN state.analysisGroup AS ag  "
-        		+ "JOIN ag.experiments AS exp "
-        		+ "WHERE exp = :experiment "
-        		+ "AND agv.lsType = :lsType  "
-        		+ "AND agv.lsKind = :lsKind  "
-        		+ "AND agv.ignored IS NOT :ignored "
-        		+ "AND state.ignored IS NOT :ignored "
-        		+ "AND ag.ignored IS NOT :ignored "
-        		+ "AND state.lsType = :stateType "
-        		+ "AND state.lsKind = :stateKind", String.class);
-        q.setParameter("lsType", "stringValue");
-        q.setParameter("lsKind", "curve id");
-        q.setParameter("stateType", "data");
-        q.setParameter("stateKind", "dose response");
-        q.setParameter("experiment", experiment);
-        q.setParameter("ignored", true);
-        return q.getResultList();
-	}
-	
+		EntityManager em = AnalysisGroupValue.entityManager();
+		TypedQuery<String> q = em.createQuery("SELECT agv.stringValue FROM AnalysisGroupValue AS agv "
+				+ "JOIN agv.lsState AS state "
+				+ "JOIN state.analysisGroup AS ag  "
+				+ "JOIN ag.experiments AS exp "
+				+ "WHERE exp = :experiment "
+				+ "AND agv.lsType = :lsType  "
+				+ "AND agv.lsKind = :lsKind  "
+				+ "AND agv.ignored IS NOT :ignored "
+				+ "AND state.ignored IS NOT :ignored "
+				+ "AND ag.ignored IS NOT :ignored "
+				+ "AND state.lsType = :stateType "
+				+ "AND state.lsKind = :stateKind", String.class);
+		q.setParameter("lsType", "stringValue");
+		q.setParameter("lsKind", "curve id");
+		q.setParameter("stateType", "data");
+		q.setParameter("stateKind", "dose response");
+		q.setParameter("experiment", experiment);
+		q.setParameter("ignored", true);
+		return q.getResultList();
+	}
+
 	private static Collection<CurveFitDTO> makeCurveFitDTOsFromCurveIdList(Collection<String> curveIdList) {
 		Collection<CurveFitDTO> curveFitDTOs = new HashSet<CurveFitDTO>();
 		for (String curveId : curveIdList) {
@@ -869,7 +929,7 @@ public static String findRenderingHint(TreatmentGroup treatmentGroup) {
 				+ "AND state.lsKind = :stateKind "
 				+ "AND value.lsType = :valueType "
 				+ "AND value.lsKind = :valueKind ", String.class);
-		
+
 		q.setParameter("stateType", "data");
 		q.setParameter("stateKind", "dose response");
 		q.setParameter("valueType", "stringValue");
@@ -878,7 +938,7 @@ public static String findRenderingHint(TreatmentGroup treatmentGroup) {
 		q.setParameter("ignored", true);
 		return q.getSingleResult();
 	}
-	
+
 	public static String findRenderingHint(AnalysisGroup analysisGroup) {
 		EntityManager em = SubjectValue.entityManager();
 		TypedQuery<String> q = em.createQuery("SELECT value.stringValue "
@@ -892,7 +952,7 @@ public static String findRenderingHint(AnalysisGroup analysisGroup) {
 				+ "AND state.lsKind = :stateKind "
 				+ "AND value.lsType = :valueType "
 				+ "AND value.lsKind = :valueKind ", String.class);
-		
+
 		q.setParameter("stateType", "data");
 		q.setParameter("stateKind", "dose response");
 		q.setParameter("valueType", "stringValue");
@@ -902,7 +962,6 @@ public static String findRenderingHint(AnalysisGroup analysisGroup) {
 		return q.getSingleResult();
 	}
 
-
 	public static String findRenderingHint(Subject subject) {
 		EntityManager em = SubjectValue.entityManager();
 		TypedQuery<String> q = em.createQuery("SELECT value.stringValue "
@@ -918,7 +977,7 @@ public static String findRenderingHint(Subject subject) {
 				+ "AND state.lsKind = :stateKind "
 				+ "AND value.lsType = :valueType "
 				+ "AND value.lsKind = :valueKind ", String.class);
-		
+
 		q.setParameter("stateType", "data");
 		q.setParameter("stateKind", "dose response");
 		q.setParameter("valueType", "stringValue");
@@ -927,479 +986,485 @@ public static String findRenderingHint(Subject subject) {
 		q.setParameter("ignored", true);
 		return q.getSingleResult();
 	}
-	
+
 	public static String findRenderingHint(String curveId) {
 		AnalysisGroupValue curveIdValue = findCurveIdValue(curveId);
-		if (curveIdValue == null) return null;
+		if (curveIdValue == null)
+			return null;
 		AnalysisGroup analysisGroup = curveIdValue.getLsState().getAnalysisGroup();
 		return findRenderingHint(analysisGroup);
 	}
 
 	public static String findFirstRenderingHint(List<String> curveIds) {
 		String renderingHint = "4 parameter D-R";
-		for (String curveId: curveIds){
-			try{
+		for (String curveId : curveIds) {
+			try {
 				String newRenderingHint = findRenderingHint(curveId);
-				if (newRenderingHint != null){
-					if (!newRenderingHint.equals(renderingHint)) logger.debug("Changing rendering hint from: " + renderingHint + " to: " + newRenderingHint);
+				if (newRenderingHint != null) {
+					if (!newRenderingHint.equals(renderingHint))
+						logger.debug("Changing rendering hint from: " + renderingHint + " to: " + newRenderingHint);
 					renderingHint = newRenderingHint;
 				}
-			} catch (NoResultException e){
+			} catch (NoResultException e) {
 				logger.warn("No rendering hint found for curve Id: " + curveId);
 			}
 		}
 		return renderingHint;
 	}
-	
+
 	private static Collection<Long> findProtocolIdsByCurveId(String curveId) {
 		Collection<Long> protocolIds = new HashSet<Long>();
 		AnalysisGroupValue curveIdValue = findCurveIdValue(curveId);
-		if (curveIdValue == null) return new ArrayList<Long>();
+		if (curveIdValue == null)
+			return new ArrayList<Long>();
 		AnalysisGroup analysisGroup = curveIdValue.getLsState().getAnalysisGroup();
 		Collection<Experiment> experiments = analysisGroup.getExperiments();
-		for (Experiment experiment: experiments){
+		for (Experiment experiment : experiments) {
 			protocolIds.add(experiment.getProtocol().getId());
 		}
 		return protocolIds;
 	}
-	
-	private static Collection<ProtocolValue> getDisplayMinMaxByProtocolIds(Collection<Long> protocolIds){
+
+	private static Collection<ProtocolValue> getDisplayMinMaxByProtocolIds(Collection<Long> protocolIds) {
 		Collection<ProtocolValue> protocolValues = new HashSet<ProtocolValue>();
-		for (Long protocolId: protocolIds){
-			protocolValues.addAll(ProtocolValue.findProtocolValuesByProtocolIDAndStateTypeKindAndValueTypeKind(protocolId, "metadata", "screening assay", "numericValue", "curve display min").getResultList());
-			protocolValues.addAll(ProtocolValue.findProtocolValuesByProtocolIDAndStateTypeKindAndValueTypeKind(protocolId, "metadata", "screening assay", "numericValue", "curve display max").getResultList());
+		for (Long protocolId : protocolIds) {
+			protocolValues
+					.addAll(ProtocolValue.findProtocolValuesByProtocolIDAndStateTypeKindAndValueTypeKind(protocolId,
+							"metadata", "screening assay", "numericValue", "curve display min").getResultList());
+			protocolValues
+					.addAll(ProtocolValue.findProtocolValuesByProtocolIDAndStateTypeKindAndValueTypeKind(protocolId,
+							"metadata", "screening assay", "numericValue", "curve display max").getResultList());
 		}
 		return protocolValues;
 	}
-	
-	public static Collection<ProtocolValue> findDisplayMinMaxByCurveId(String curveId){
+
+	public static Collection<ProtocolValue> findDisplayMinMaxByCurveId(String curveId) {
 		return getDisplayMinMaxByProtocolIds(findProtocolIdsByCurveId(curveId));
 	}
-	
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 
 	public String toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(this);
+	}
 
 	public String toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(this);
+	}
 
 	public static CurveFitDTO fromJsonToCurveFitDTO(String json) {
-        return new JSONDeserializer<CurveFitDTO>()
-        .use(null, CurveFitDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<CurveFitDTO>()
+				.use(null, CurveFitDTO.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<CurveFitDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<CurveFitDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<CurveFitDTO> fromJsonArrayToCurveFitDTO(String json) {
-        return new JSONDeserializer<List<CurveFitDTO>>()
-        .use("values", CurveFitDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<CurveFitDTO>>()
+				.use("values", CurveFitDTO.class).deserialize(json);
+	}
 
 	public String getCurveId() {
-        return this.curveId;
-    }
+		return this.curveId;
+	}
 
 	public void setCurveId(String curveId) {
-        this.curveId = curveId;
-    }
+		this.curveId = curveId;
+	}
 
 	public String getAnalysisGroupCode() {
-        return this.analysisGroupCode;
-    }
+		return this.analysisGroupCode;
+	}
 
 	public void setAnalysisGroupCode(String analysisGroupCode) {
-        this.analysisGroupCode = analysisGroupCode;
-    }
+		this.analysisGroupCode = analysisGroupCode;
+	}
 
 	public String getRecordedBy() {
-        return this.recordedBy;
-    }
+		return this.recordedBy;
+	}
 
 	public void setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
+		this.recordedBy = recordedBy;
+	}
 
 	public Date getRecordedDate() {
-        return this.recordedDate;
-    }
+		return this.recordedDate;
+	}
 
 	public void setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
+		this.recordedDate = recordedDate;
+	}
 
 	public Long getLsTransaction() {
-        return this.lsTransaction;
-    }
+		return this.lsTransaction;
+	}
 
 	public void setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
+		this.lsTransaction = lsTransaction;
+	}
 
 	public String getBatchCode() {
-        return this.batchCode;
-    }
+		return this.batchCode;
+	}
 
 	public void setBatchCode(String batchCode) {
-        this.batchCode = batchCode;
-    }
+		this.batchCode = batchCode;
+	}
 
 	public String getCategory() {
-        return this.category;
-    }
+		return this.category;
+	}
 
 	public void setCategory(String category) {
-        this.category = category;
-    }
+		this.category = category;
+	}
 
 	public String getRenderingHint() {
-        return this.renderingHint;
-    }
+		return this.renderingHint;
+	}
 
 	public void setRenderingHint(String renderingHint) {
-        this.renderingHint = renderingHint;
-    }
+		this.renderingHint = renderingHint;
+	}
 
 	public String getMin() {
-        return this.min;
-    }
+		return this.min;
+	}
 
 	public void setMin(String min) {
-        this.min = min;
-    }
+		this.min = min;
+	}
 
 	public String getMax() {
-        return this.max;
-    }
+		return this.max;
+	}
 
 	public void setMax(String max) {
-        this.max = max;
-    }
+		this.max = max;
+	}
 
 	public String getEc50() {
-        return this.ec50;
-    }
+		return this.ec50;
+	}
 
 	public void setEc50(String ec50) {
-        this.ec50 = ec50;
-    }
+		this.ec50 = ec50;
+	}
 
 	public String getMinUnits() {
-        return this.minUnits;
-    }
+		return this.minUnits;
+	}
 
 	public void setMinUnits(String minUnits) {
-        this.minUnits = minUnits;
-    }
+		this.minUnits = minUnits;
+	}
 
 	public String getMaxUnits() {
-        return this.maxUnits;
-    }
+		return this.maxUnits;
+	}
 
 	public void setMaxUnits(String maxUnits) {
-        this.maxUnits = maxUnits;
-    }
+		this.maxUnits = maxUnits;
+	}
 
 	public String getEc50Units() {
-        return this.ec50Units;
-    }
+		return this.ec50Units;
+	}
 
 	public void setEc50Units(String ec50Units) {
-        this.ec50Units = ec50Units;
-    }
+		this.ec50Units = ec50Units;
+	}
 
 	public String getSlope() {
-        return this.slope;
-    }
+		return this.slope;
+	}
 
 	public void setSlope(String slope) {
-        this.slope = slope;
-    }
+		this.slope = slope;
+	}
 
 	public BigDecimal getMinUncertainty() {
-        return this.minUncertainty;
-    }
+		return this.minUncertainty;
+	}
 
 	public void setMinUncertainty(BigDecimal minUncertainty) {
-        this.minUncertainty = minUncertainty;
-    }
+		this.minUncertainty = minUncertainty;
+	}
 
 	public BigDecimal getMaxUncertainty() {
-        return this.maxUncertainty;
-    }
+		return this.maxUncertainty;
+	}
 
 	public void setMaxUncertainty(BigDecimal maxUncertainty) {
-        this.maxUncertainty = maxUncertainty;
-    }
+		this.maxUncertainty = maxUncertainty;
+	}
 
 	public BigDecimal getEc50Uncertainty() {
-        return this.ec50Uncertainty;
-    }
+		return this.ec50Uncertainty;
+	}
 
 	public void setEc50Uncertainty(BigDecimal ec50Uncertainty) {
-        this.ec50Uncertainty = ec50Uncertainty;
-    }
+		this.ec50Uncertainty = ec50Uncertainty;
+	}
 
 	public BigDecimal getSlopeUncertainty() {
-        return this.slopeUncertainty;
-    }
+		return this.slopeUncertainty;
+	}
 
 	public void setSlopeUncertainty(BigDecimal slopeUncertainty) {
-        this.slopeUncertainty = slopeUncertainty;
-    }
+		this.slopeUncertainty = slopeUncertainty;
+	}
 
 	public String getMinUncertaintyType() {
-        return this.minUncertaintyType;
-    }
+		return this.minUncertaintyType;
+	}
 
 	public void setMinUncertaintyType(String minUncertaintyType) {
-        this.minUncertaintyType = minUncertaintyType;
-    }
+		this.minUncertaintyType = minUncertaintyType;
+	}
 
 	public String getMaxUncertaintyType() {
-        return this.maxUncertaintyType;
-    }
+		return this.maxUncertaintyType;
+	}
 
 	public void setMaxUncertaintyType(String maxUncertaintyType) {
-        this.maxUncertaintyType = maxUncertaintyType;
-    }
+		this.maxUncertaintyType = maxUncertaintyType;
+	}
 
 	public String getEc50UncertaintyType() {
-        return this.ec50UncertaintyType;
-    }
+		return this.ec50UncertaintyType;
+	}
 
 	public void setEc50UncertaintyType(String ec50UncertaintyType) {
-        this.ec50UncertaintyType = ec50UncertaintyType;
-    }
+		this.ec50UncertaintyType = ec50UncertaintyType;
+	}
 
 	public String getSlopeUncertaintyType() {
-        return this.slopeUncertaintyType;
-    }
+		return this.slopeUncertaintyType;
+	}
 
 	public void setSlopeUncertaintyType(String slopeUncertaintyType) {
-        this.slopeUncertaintyType = slopeUncertaintyType;
-    }
+		this.slopeUncertaintyType = slopeUncertaintyType;
+	}
 
 	public String getMinOperatorKind() {
-        return this.minOperatorKind;
-    }
+		return this.minOperatorKind;
+	}
 
 	public void setMinOperatorKind(String minOperatorKind) {
-        this.minOperatorKind = minOperatorKind;
-    }
+		this.minOperatorKind = minOperatorKind;
+	}
 
 	public String getMaxOperatorKind() {
-        return this.maxOperatorKind;
-    }
+		return this.maxOperatorKind;
+	}
 
 	public void setMaxOperatorKind(String maxOperatorKind) {
-        this.maxOperatorKind = maxOperatorKind;
-    }
+		this.maxOperatorKind = maxOperatorKind;
+	}
 
 	public String getEc50OperatorKind() {
-        return this.ec50OperatorKind;
-    }
+		return this.ec50OperatorKind;
+	}
 
 	public void setEc50OperatorKind(String ec50OperatorKind) {
-        this.ec50OperatorKind = ec50OperatorKind;
-    }
+		this.ec50OperatorKind = ec50OperatorKind;
+	}
 
 	public String getSlopeOperatorKind() {
-        return this.slopeOperatorKind;
-    }
+		return this.slopeOperatorKind;
+	}
 
 	public void setSlopeOperatorKind(String slopeOperatorKind) {
-        this.slopeOperatorKind = slopeOperatorKind;
-    }
+		this.slopeOperatorKind = slopeOperatorKind;
+	}
 
 	public BigDecimal getFittedMin() {
-        return this.fittedMin;
-    }
+		return this.fittedMin;
+	}
 
 	public void setFittedMin(BigDecimal fittedMin) {
-        this.fittedMin = fittedMin;
-    }
+		this.fittedMin = fittedMin;
+	}
 
 	public BigDecimal getFittedMax() {
-        return this.fittedMax;
-    }
+		return this.fittedMax;
+	}
 
 	public void setFittedMax(BigDecimal fittedMax) {
-        this.fittedMax = fittedMax;
-    }
+		this.fittedMax = fittedMax;
+	}
 
 	public BigDecimal getFittedEC50() {
-        return this.fittedEC50;
-    }
+		return this.fittedEC50;
+	}
 
 	public void setFittedEC50(BigDecimal fittedEC50) {
-        this.fittedEC50 = fittedEC50;
-    }
+		this.fittedEC50 = fittedEC50;
+	}
 
 	public BigDecimal getFittedSlope() {
-        return this.fittedSlope;
-    }
+		return this.fittedSlope;
+	}
 
 	public void setFittedSlope(BigDecimal fittedSlope) {
-        this.fittedSlope = fittedSlope;
-    }
+		this.fittedSlope = fittedSlope;
+	}
 
 	public BigDecimal getFittedMinUncertainty() {
-        return this.fittedMinUncertainty;
-    }
+		return this.fittedMinUncertainty;
+	}
 
 	public void setFittedMinUncertainty(BigDecimal fittedMinUncertainty) {
-        this.fittedMinUncertainty = fittedMinUncertainty;
-    }
+		this.fittedMinUncertainty = fittedMinUncertainty;
+	}
 
 	public BigDecimal getFittedMaxUncertainty() {
-        return this.fittedMaxUncertainty;
-    }
+		return this.fittedMaxUncertainty;
+	}
 
 	public void setFittedMaxUncertainty(BigDecimal fittedMaxUncertainty) {
-        this.fittedMaxUncertainty = fittedMaxUncertainty;
-    }
+		this.fittedMaxUncertainty = fittedMaxUncertainty;
+	}
 
 	public BigDecimal getFittedEc50Uncertainty() {
-        return this.fittedEc50Uncertainty;
-    }
+		return this.fittedEc50Uncertainty;
+	}
 
 	public void setFittedEc50Uncertainty(BigDecimal fittedEc50Uncertainty) {
-        this.fittedEc50Uncertainty = fittedEc50Uncertainty;
-    }
+		this.fittedEc50Uncertainty = fittedEc50Uncertainty;
+	}
 
 	public BigDecimal getFittedSlopeUncertainty() {
-        return this.fittedSlopeUncertainty;
-    }
+		return this.fittedSlopeUncertainty;
+	}
 
 	public void setFittedSlopeUncertainty(BigDecimal fittedSlopeUncertainty) {
-        this.fittedSlopeUncertainty = fittedSlopeUncertainty;
-    }
+		this.fittedSlopeUncertainty = fittedSlopeUncertainty;
+	}
 
 	public String getFittedMinUncertaintyType() {
-        return this.fittedMinUncertaintyType;
-    }
+		return this.fittedMinUncertaintyType;
+	}
 
 	public void setFittedMinUncertaintyType(String fittedMinUncertaintyType) {
-        this.fittedMinUncertaintyType = fittedMinUncertaintyType;
-    }
+		this.fittedMinUncertaintyType = fittedMinUncertaintyType;
+	}
 
 	public String getFittedMaxUncertaintyType() {
-        return this.fittedMaxUncertaintyType;
-    }
+		return this.fittedMaxUncertaintyType;
+	}
 
 	public void setFittedMaxUncertaintyType(String fittedMaxUncertaintyType) {
-        this.fittedMaxUncertaintyType = fittedMaxUncertaintyType;
-    }
+		this.fittedMaxUncertaintyType = fittedMaxUncertaintyType;
+	}
 
 	public String getFittedEc50UncertaintyType() {
-        return this.fittedEc50UncertaintyType;
-    }
+		return this.fittedEc50UncertaintyType;
+	}
 
 	public void setFittedEc50UncertaintyType(String fittedEc50UncertaintyType) {
-        this.fittedEc50UncertaintyType = fittedEc50UncertaintyType;
-    }
+		this.fittedEc50UncertaintyType = fittedEc50UncertaintyType;
+	}
 
 	public String getFittedSlopeUncertaintyType() {
-        return this.fittedSlopeUncertaintyType;
-    }
+		return this.fittedSlopeUncertaintyType;
+	}
 
 	public void setFittedSlopeUncertaintyType(String fittedSlopeUncertaintyType) {
-        this.fittedSlopeUncertaintyType = fittedSlopeUncertaintyType;
-    }
+		this.fittedSlopeUncertaintyType = fittedSlopeUncertaintyType;
+	}
 
 	public BigDecimal getSse() {
-        return this.sse;
-    }
+		return this.sse;
+	}
 
 	public void setSse(BigDecimal sse) {
-        this.sse = sse;
-    }
+		this.sse = sse;
+	}
 
 	public BigDecimal getSst() {
-        return this.sst;
-    }
+		return this.sst;
+	}
 
 	public void setSst(BigDecimal sst) {
-        this.sst = sst;
-    }
+		this.sst = sst;
+	}
 
 	public BigDecimal getRsquared() {
-        return this.rsquared;
-    }
+		return this.rsquared;
+	}
 
 	public void setRsquared(BigDecimal rsquared) {
-        this.rsquared = rsquared;
-    }
+		this.rsquared = rsquared;
+	}
 
 	public String getCurveErrorsClob() {
-        return this.curveErrorsClob;
-    }
+		return this.curveErrorsClob;
+	}
 
 	public void setCurveErrorsClob(String curveErrorsClob) {
-        this.curveErrorsClob = curveErrorsClob;
-    }
+		this.curveErrorsClob = curveErrorsClob;
+	}
 
 	public String getReportedValuesClob() {
-        return this.reportedValuesClob;
-    }
+		return this.reportedValuesClob;
+	}
 
 	public void setReportedValuesClob(String reportedValuesClob) {
-        this.reportedValuesClob = reportedValuesClob;
-    }
+		this.reportedValuesClob = reportedValuesClob;
+	}
 
 	public String getParameterStdErrorsClob() {
-        return this.parameterStdErrorsClob;
-    }
+		return this.parameterStdErrorsClob;
+	}
 
 	public void setParameterStdErrorsClob(String parameterStdErrorsClob) {
-        this.parameterStdErrorsClob = parameterStdErrorsClob;
-    }
+		this.parameterStdErrorsClob = parameterStdErrorsClob;
+	}
 
 	public String getFitSettings() {
-        return this.fitSettings;
-    }
+		return this.fitSettings;
+	}
 
 	public void setFitSettings(String fitSettings) {
-        this.fitSettings = fitSettings;
-    }
+		this.fitSettings = fitSettings;
+	}
 
 	public String getFitSummaryClob() {
-        return this.fitSummaryClob;
-    }
+		return this.fitSummaryClob;
+	}
 
 	public void setFitSummaryClob(String fitSummaryClob) {
-        this.fitSummaryClob = fitSummaryClob;
-    }
+		this.fitSummaryClob = fitSummaryClob;
+	}
 
 	public String getUserFlagStatus() {
-        return this.userFlagStatus;
-    }
+		return this.userFlagStatus;
+	}
 
 	public void setUserFlagStatus(String userFlagStatus) {
-        this.userFlagStatus = userFlagStatus;
-    }
+		this.userFlagStatus = userFlagStatus;
+	}
 
 	public String getAlgorithmFlagStatus() {
-        return this.algorithmFlagStatus;
-    }
+		return this.algorithmFlagStatus;
+	}
 
 	public void setAlgorithmFlagStatus(String algorithmFlagStatus) {
-        this.algorithmFlagStatus = algorithmFlagStatus;
-    }
+		this.algorithmFlagStatus = algorithmFlagStatus;
+	}
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/DateValueComparisonRequest.java b/src/main/java/com/labsynch/labseer/dto/DateValueComparisonRequest.java
index 1b40bb314..3d8fd3bee 100644
--- a/src/main/java/com/labsynch/labseer/dto/DateValueComparisonRequest.java
+++ b/src/main/java/com/labsynch/labseer/dto/DateValueComparisonRequest.java
@@ -9,113 +9,109 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class DateValueComparisonRequest {
-	
-	private String lsType;
-	
-	private String lsKind;
-	
-	private String stateType;
-	
-	private String stateKind;
-	
-	private String valueKind;
-	
-	private Integer secondsDelta;
-	
-	private Boolean newerThanModified; 
-	
-
-	public String getLsType() {
+
+    private String lsType;
+
+    private String lsKind;
+
+    private String stateType;
+
+    private String stateKind;
+
+    private String valueKind;
+
+    private Integer secondsDelta;
+
+    private Boolean newerThanModified;
+
+    public String getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(String lsType) {
+    public void setLsType(String lsType) {
         this.lsType = lsType;
     }
 
-	public String getLsKind() {
+    public String getLsKind() {
         return this.lsKind;
     }
 
-	public void setLsKind(String lsKind) {
+    public void setLsKind(String lsKind) {
         this.lsKind = lsKind;
     }
 
-	public String getStateType() {
+    public String getStateType() {
         return this.stateType;
     }
 
-	public void setStateType(String stateType) {
+    public void setStateType(String stateType) {
         this.stateType = stateType;
     }
 
-	public String getStateKind() {
+    public String getStateKind() {
         return this.stateKind;
     }
 
-	public void setStateKind(String stateKind) {
+    public void setStateKind(String stateKind) {
         this.stateKind = stateKind;
     }
 
-	public String getValueKind() {
+    public String getValueKind() {
         return this.valueKind;
     }
 
-	public void setValueKind(String valueKind) {
+    public void setValueKind(String valueKind) {
         this.valueKind = valueKind;
     }
 
-	public Integer getSecondsDelta() {
+    public Integer getSecondsDelta() {
         return this.secondsDelta;
     }
 
-	public void setSecondsDelta(Integer secondsDelta) {
+    public void setSecondsDelta(Integer secondsDelta) {
         this.secondsDelta = secondsDelta;
     }
 
-	public Boolean getNewerThanModified() {
+    public Boolean getNewerThanModified() {
         return this.newerThanModified;
     }
 
-	public void setNewerThanModified(Boolean newerThanModified) {
+    public void setNewerThanModified(Boolean newerThanModified) {
         this.newerThanModified = newerThanModified;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static DateValueComparisonRequest fromJsonToDateValueComparisonRequest(String json) {
+    public static DateValueComparisonRequest fromJsonToDateValueComparisonRequest(String json) {
         return new JSONDeserializer<DateValueComparisonRequest>()
-        .use(null, DateValueComparisonRequest.class).deserialize(json);
+                .use(null, DateValueComparisonRequest.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<DateValueComparisonRequest> collection) {
+    public static String toJsonArray(Collection<DateValueComparisonRequest> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<DateValueComparisonRequest> collection, String[] fields) {
+    public static String toJsonArray(Collection<DateValueComparisonRequest> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<DateValueComparisonRequest> fromJsonArrayToDateValueComparisonRequests(String json) {
+    public static Collection<DateValueComparisonRequest> fromJsonArrayToDateValueComparisonRequests(String json) {
         return new JSONDeserializer<List<DateValueComparisonRequest>>()
-        .use("values", DateValueComparisonRequest.class).deserialize(json);
+                .use("values", DateValueComparisonRequest.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/DependencyCheckDTO.java b/src/main/java/com/labsynch/labseer/dto/DependencyCheckDTO.java
index b3ee82144..131cd45c3 100644
--- a/src/main/java/com/labsynch/labseer/dto/DependencyCheckDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/DependencyCheckDTO.java
@@ -24,43 +24,45 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class DependencyCheckDTO {
-	
+
 	public DependencyCheckDTO() {
 		this.queryCodeNames = new HashSet<String>();
 		this.dependentCorpNames = new HashSet<String>();
 		this.linkedExperiments = new HashSet<CodeTableDTO>();
 		this.linkedContainers = new HashSet<CodeTableDTO>();
 	}
-	
+
 	public DependencyCheckDTO(Collection<String> queryCodeNames) {
 		this.setQueryCodeNames(queryCodeNames);
 	}
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(DependencyCheckDTO.class);
-	
+
 	private Collection<String> queryCodeNames;
-	
+
 	private Collection<String> dependentCorpNames;
-	
+
 	private Boolean linkedDataExists;
-	
+
 	private Collection<CodeTableDTO> linkedExperiments;
-	
+
 	private Collection<CodeTableDTO> linkedContainers;
 
 	private Collection<ErrorMessageDTO> errors;
-	
+
 	@Transactional
 	public String toJson() {
-	        return new JSONSerializer().exclude("*.class").include("linkedExperiments.*", "linkedContainers.*", "queryCodeNames.*", "dependentCorpNames.*").transform(new ExcludeNulls(), void.class).serialize(this);
-	    }
+		return new JSONSerializer().exclude("*.class")
+				.include("linkedExperiments.*", "linkedContainers.*", "queryCodeNames.*", "dependentCorpNames.*")
+				.transform(new ExcludeNulls(), void.class).serialize(this);
+	}
+
 	@Transactional
-	public void checkForDependentData(){
+	public void checkForDependentData() {
 		errors = new HashSet<ErrorMessageDTO>();
 		try {
-			if(countExperimentValueBatchCodes() > 0){
+			if (countExperimentValueBatchCodes() > 0) {
 				linkedDataExists = true;
 				logger.debug("Found Experiment values referencing provided batch codes. Retrieving experiment info.");
 				linkedExperiments.addAll(findExperimentCodeTableDTOsFromExperimentValueBatchCodes());
@@ -71,30 +73,30 @@ public void checkForDependentData(){
 			error.setMessage(e.getMessage());
 			errors.add(error);
 		}
-		if(countTreatmentGroupValueBatchCodes() > 0){
+		if (countTreatmentGroupValueBatchCodes() > 0) {
 			linkedDataExists = true;
 			logger.debug("Found TreatmentGroup values referencing provided batch codes. Retrieving experiment info.");
 			linkedExperiments.addAll(findExperimentCodeTableDTOsFromTreatmentGroupValueBatchCodes());
 		}
-		if(countAnalysisGroupValueBatchCodes() > 0){
+		if (countAnalysisGroupValueBatchCodes() > 0) {
 			linkedDataExists = true;
 			logger.debug("Found AnalysisGroup values referencing provided batch codes. Retrieving experiment info.");
 			linkedExperiments.addAll(findExperimentCodeTableDTOsFromAnalysisGroupValueBatchCodes());
 		}
-		if(countSubjectValueBatchCodes() > 0){
+		if (countSubjectValueBatchCodes() > 0) {
 			linkedDataExists = true;
 			logger.debug("Found Subject values referencing provided batch codes. Retrieving experiment info.");
 			linkedExperiments.addAll(findExperimentCodeTableDTOsFromSubjectValueBatchCodes());
 		}
-		if(countProtocolValueBatchCodes() > 0){
+		if (countProtocolValueBatchCodes() > 0) {
 			logger.debug("Found Protocol values referencing provided batch codes.");
 			linkedDataExists = true;
 		}
-		if(countLsThingValueBatchCodes() > 0){
+		if (countLsThingValueBatchCodes() > 0) {
 			logger.debug("Found LsThing values referencing provided batch codes.");
 			linkedDataExists = true;
 		}
-		if(countContainerValueBatchCodes() > 0){
+		if (countContainerValueBatchCodes() > 0) {
 			logger.debug("Found Container values referencing provided batch codes. Retrieving container info.");
 			linkedDataExists = true;
 			linkedContainers.addAll(findContainerCodeTableDTOsFromContainerValueBatchCodes());
@@ -115,12 +117,12 @@ private Collection<CodeTableDTO> findContainerCodeTableDTOsFromContainerValueBat
 				+ "AND c.ignored = false "
 				+ "AND cl.ignored = false "
 				+ "AND cv.codeValue IN :batchCodes";
-		
+
 		TypedQuery<Map> q = em.createQuery(sql, Map.class);
 		q.setParameter("batchCodes", this.queryCodeNames);
-		
+
 		Collection<CodeTableDTO> containerCodeTableDTOs = new HashSet<CodeTableDTO>();
-		for (Map<String,String> map : q.getResultList()){
+		for (Map<String, String> map : q.getResultList()) {
 			CodeTableDTO codeTable = new CodeTableDTO();
 			codeTable.setCode(map.get("code"));
 			codeTable.setName(map.get("name"));
@@ -144,12 +146,12 @@ private Collection<CodeTableDTO> findExperimentCodeTableDTOsFromExperimentValueB
 				+ "AND e.ignored = false "
 				+ "AND el.ignored = false "
 				+ "AND ev.codeValue IN :batchCodes";
-		
+
 		TypedQuery<Map> q = em.createQuery(sql, Map.class);
 		q.setParameter("batchCodes", this.queryCodeNames);
-		
+
 		Collection<CodeTableDTO> experimentCodeTableDTOs = new HashSet<CodeTableDTO>();
-		for (Map<String,String> map : q.getResultList()){
+		for (Map<String, String> map : q.getResultList()) {
 			CodeTableDTO codeTable = new CodeTableDTO();
 			codeTable.setCode(map.get("code"));
 			codeTable.setName(map.get("name"));
@@ -176,12 +178,12 @@ private Collection<CodeTableDTO> findExperimentCodeTableDTOsFromAnalysisGroupVal
 				+ "AND e.ignored = false "
 				+ "AND el.ignored = false "
 				+ "AND agv.codeValue IN :batchCodes";
-		
+
 		TypedQuery<Map> q = em.createQuery(sql, Map.class);
 		q.setParameter("batchCodes", this.queryCodeNames);
-		
+
 		Collection<CodeTableDTO> experimentCodeTableDTOs = new HashSet<CodeTableDTO>();
-		for (Map<String,String> map : q.getResultList()){
+		for (Map<String, String> map : q.getResultList()) {
 			CodeTableDTO codeTable = new CodeTableDTO();
 			codeTable.setCode(map.get("code"));
 			codeTable.setName(map.get("name"));
@@ -211,12 +213,12 @@ private Collection<CodeTableDTO> findExperimentCodeTableDTOsFromSubjectValueBatc
 				+ "AND e.ignored = false "
 				+ "AND el.ignored = false "
 				+ "AND sv.codeValue IN :batchCodes";
-		
+
 		TypedQuery<Map> q = em.createQuery(sql, Map.class);
 		q.setParameter("batchCodes", this.queryCodeNames);
-		
+
 		Collection<CodeTableDTO> experimentCodeTableDTOs = new HashSet<CodeTableDTO>();
-		for (Map<String,String> map : q.getResultList()){
+		for (Map<String, String> map : q.getResultList()) {
 			CodeTableDTO codeTable = new CodeTableDTO();
 			codeTable.setCode(map.get("code"));
 			codeTable.setName(map.get("name"));
@@ -225,7 +227,7 @@ private Collection<CodeTableDTO> findExperimentCodeTableDTOsFromSubjectValueBatc
 		}
 		return experimentCodeTableDTOs;
 	}
-	
+
 	private Collection<CodeTableDTO> findExperimentCodeTableDTOsFromTreatmentGroupValueBatchCodes() {
 		EntityManager em = SubjectValue.entityManager();
 		String sql = "SELECT DISTINCT NEW MAP(e.codeName as code, el.labelText as name, tgv.codeValue as comments) "
@@ -245,12 +247,12 @@ private Collection<CodeTableDTO> findExperimentCodeTableDTOsFromTreatmentGroupVa
 				+ "AND e.ignored = false "
 				+ "AND el.ignored = false "
 				+ "AND tgv.codeValue IN :batchCodes";
-		
+
 		TypedQuery<Map> q = em.createQuery(sql, Map.class);
 		q.setParameter("batchCodes", this.queryCodeNames);
-		
+
 		Collection<CodeTableDTO> experimentCodeTableDTOs = new HashSet<CodeTableDTO>();
-		for (Map<String,String> map : q.getResultList()){
+		for (Map<String, String> map : q.getResultList()) {
 			CodeTableDTO codeTable = new CodeTableDTO();
 			codeTable.setCode(map.get("code"));
 			codeTable.setName(map.get("name"));
@@ -278,12 +280,12 @@ private int countSubjectValueBatchCodes() {
 				+ "AND ag.ignored = false "
 				+ "AND e.ignored = false "
 				+ "AND sv.codeValue IN :batchCodes";
-		
+
 		TypedQuery<Long> q = em.createQuery(sql, Long.class);
 		q.setParameter("batchCodes", this.queryCodeNames);
 		return q.getSingleResult().intValue();
 	}
-	
+
 	private int countTreatmentGroupValueBatchCodes() {
 		EntityManager em = TreatmentGroupValue.entityManager();
 		String sql = "SELECT COUNT(*) "
@@ -300,12 +302,12 @@ private int countTreatmentGroupValueBatchCodes() {
 				+ "AND ag.ignored = false "
 				+ "AND e.ignored = false "
 				+ "AND tgv.codeValue IN :batchCodes";
-		
+
 		TypedQuery<Long> q = em.createQuery(sql, Long.class);
 		q.setParameter("batchCodes", this.queryCodeNames);
 		return q.getSingleResult().intValue();
 	}
-	
+
 	private int countAnalysisGroupValueBatchCodes() {
 		EntityManager em = AnalysisGroupValue.entityManager();
 		String sql = "SELECT COUNT(*) "
@@ -320,12 +322,12 @@ private int countAnalysisGroupValueBatchCodes() {
 				+ "AND ag.ignored = false "
 				+ "AND e.ignored = false "
 				+ "AND agv.codeValue IN :batchCodes";
-		
+
 		TypedQuery<Long> q = em.createQuery(sql, Long.class);
 		q.setParameter("batchCodes", this.queryCodeNames);
 		return q.getSingleResult().intValue();
 	}
-	
+
 	private int countExperimentValueBatchCodes() {
 		EntityManager em = TreatmentGroupValue.entityManager();
 		String sql = "SELECT COUNT(*) "
@@ -338,12 +340,12 @@ private int countExperimentValueBatchCodes() {
 				+ "AND es.ignored = false "
 				+ "AND e.ignored = false "
 				+ "AND ev.codeValue IN :batchCodes";
-		
+
 		TypedQuery<Long> q = em.createQuery(sql, Long.class);
 		q.setParameter("batchCodes", queryCodeNames);
 		return q.getSingleResult().intValue();
 	}
-	
+
 	private int countLsThingValueBatchCodes() {
 		EntityManager em = TreatmentGroupValue.entityManager();
 		String sql = "SELECT COUNT(*) "
@@ -356,12 +358,12 @@ private int countLsThingValueBatchCodes() {
 				+ "AND lsts.ignored = false "
 				+ "AND lst.ignored = false "
 				+ "AND lstv.codeValue IN :batchCodes";
-		
+
 		TypedQuery<Long> q = em.createQuery(sql, Long.class);
 		q.setParameter("batchCodes", queryCodeNames);
 		return q.getSingleResult().intValue();
 	}
-	
+
 	private int countContainerValueBatchCodes() {
 		EntityManager em = TreatmentGroupValue.entityManager();
 		String sql = "SELECT COUNT(*) "
@@ -374,12 +376,12 @@ private int countContainerValueBatchCodes() {
 				+ "AND cs.ignored = false "
 				+ "AND c.ignored = false "
 				+ "AND cv.codeValue IN :batchCodes";
-		
+
 		TypedQuery<Long> q = em.createQuery(sql, Long.class);
 		q.setParameter("batchCodes", queryCodeNames);
 		return q.getSingleResult().intValue();
 	}
-	
+
 	private int countProtocolValueBatchCodes() {
 		EntityManager em = TreatmentGroupValue.entityManager();
 		String sql = "SELECT COUNT(*) "
@@ -392,101 +394,98 @@ private int countProtocolValueBatchCodes() {
 				+ "AND ps.ignored = false "
 				+ "AND p.ignored = false "
 				+ "AND pv.codeValue IN :batchCodes";
-		
+
 		TypedQuery<Long> q = em.createQuery(sql, Long.class);
 		q.setParameter("batchCodes", queryCodeNames);
 		return q.getSingleResult().intValue();
 	}
-	
+
 	private void dedupeLinkedExperiments() {
-		HashMap<String,String> experimentMap = new HashMap<String,String>();
-		logger.debug("Incoming size: "+linkedExperiments.size());
-		for (CodeTableDTO codeTable : linkedExperiments){
+		HashMap<String, String> experimentMap = new HashMap<String, String>();
+		logger.debug("Incoming size: " + linkedExperiments.size());
+		for (CodeTableDTO codeTable : linkedExperiments) {
 			experimentMap.put(codeTable.getCode(), codeTable.getName());
 		}
 		HashSet<CodeTableDTO> dedupedExperimentSet = new HashSet<CodeTableDTO>();
-		for (String key : experimentMap.keySet()){
+		for (String key : experimentMap.keySet()) {
 			CodeTableDTO experimentCodeTable = new CodeTableDTO();
 			experimentCodeTable.setCode(key);
 			experimentCodeTable.setName(experimentMap.get(key));
 			dedupedExperimentSet.add(experimentCodeTable);
 		}
 		linkedExperiments = dedupedExperimentSet;
-		logger.debug("Deduped size: "+linkedExperiments.size());
+		logger.debug("Deduped size: " + linkedExperiments.size());
 	}
 
-
 	public Collection<String> getQueryCodeNames() {
-        return this.queryCodeNames;
-    }
+		return this.queryCodeNames;
+	}
 
 	public void setQueryCodeNames(Collection<String> queryCodeNames) {
-        this.queryCodeNames = queryCodeNames;
-    }
+		this.queryCodeNames = queryCodeNames;
+	}
 
 	public Collection<String> getDependentCorpNames() {
-        return this.dependentCorpNames;
-    }
+		return this.dependentCorpNames;
+	}
 
 	public void setDependentCorpNames(Collection<String> dependentCorpNames) {
-        this.dependentCorpNames = dependentCorpNames;
-    }
+		this.dependentCorpNames = dependentCorpNames;
+	}
 
 	public Boolean getLinkedDataExists() {
-        return this.linkedDataExists;
-    }
+		return this.linkedDataExists;
+	}
 
 	public void setLinkedDataExists(Boolean linkedDataExists) {
-        this.linkedDataExists = linkedDataExists;
-    }
+		this.linkedDataExists = linkedDataExists;
+	}
 
 	public Collection<CodeTableDTO> getLinkedExperiments() {
-        return this.linkedExperiments;
-    }
+		return this.linkedExperiments;
+	}
 
 	public void setLinkedExperiments(Collection<CodeTableDTO> linkedExperiments) {
-        this.linkedExperiments = linkedExperiments;
-    }
+		this.linkedExperiments = linkedExperiments;
+	}
 
 	public Collection<CodeTableDTO> getLinkedContainers() {
-        return this.linkedContainers;
-    }
+		return this.linkedContainers;
+	}
 
 	public void setLinkedContainers(Collection<CodeTableDTO> linkedContainers) {
-        this.linkedContainers = linkedContainers;
-    }
+		this.linkedContainers = linkedContainers;
+	}
 
 	public Collection<ErrorMessageDTO> getErrors() {
-        return this.errors;
-    }
+		return this.errors;
+	}
 
 	public void setErrors(Collection<ErrorMessageDTO> errors) {
-        this.errors = errors;
-    }
+		this.errors = errors;
+	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 
 	public static DependencyCheckDTO fromJsonToDependencyCheckDTO(String json) {
-        return new JSONDeserializer<DependencyCheckDTO>()
-        .use(null, DependencyCheckDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<DependencyCheckDTO>()
+				.use(null, DependencyCheckDTO.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<DependencyCheckDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<DependencyCheckDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<DependencyCheckDTO> fromJsonArrayToDependencyCheckDTO(String json) {
-        return new JSONDeserializer<List<DependencyCheckDTO>>()
-        .use("values", DependencyCheckDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<DependencyCheckDTO>>()
+				.use("values", DependencyCheckDTO.class).deserialize(json);
+	}
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/DoseReponseParamsDTO.java b/src/main/java/com/labsynch/labseer/dto/DoseReponseParamsDTO.java
index 786ac8a2a..37735d960 100755
--- a/src/main/java/com/labsynch/labseer/dto/DoseReponseParamsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/DoseReponseParamsDTO.java
@@ -12,17 +12,16 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class DoseReponseParamsDTO {
 
 	private static final Logger logger = LoggerFactory.getLogger(DoseReponseParamsDTO.class);
 
-	public DoseReponseParamsDTO(){
-		//empty constructor
+	public DoseReponseParamsDTO() {
+		// empty constructor
 	}
 
 	public DoseReponseParamsDTO(
-			Long id, 
+			Long id,
 			Integer version,
 			String agCodeName,
 			String curveId,
@@ -43,8 +42,7 @@ public DoseReponseParamsDTO(
 			String comments,
 			boolean ignored,
 			Long lsTransaction,
-			boolean publicData
-			){
+			boolean publicData) {
 
 		this.id = id;
 		this.lsType = lsType;
@@ -54,18 +52,18 @@ public DoseReponseParamsDTO(
 		this.codeValue = codeValue;
 		this.clobValue = clobValue;
 
-		//		private String operatorType;
-		//		private String operatorKind;
-		//		private Integer sigFigs;
-		//		private BigDecimal uncertainty;
-		//		private Integer numberOfReplicates;
-		//		private String uncertaintyType;
-		//		private String unitType;
-		//		private String unitKind;
-		//		private String comments;
-		//		private boolean ignored;
-		//		private Long lsTransaction;
-		//		private boolean publicData;	
+		// private String operatorType;
+		// private String operatorKind;
+		// private Integer sigFigs;
+		// private BigDecimal uncertainty;
+		// private Integer numberOfReplicates;
+		// private String uncertaintyType;
+		// private String unitType;
+		// private String unitKind;
+		// private String comments;
+		// private boolean ignored;
+		// private Long lsTransaction;
+		// private boolean publicData;
 	}
 
 	private Long id;
@@ -92,224 +90,221 @@ public DoseReponseParamsDTO(
 	private Long lsTransaction;
 	private boolean publicData;
 
-
 	public String toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(this);
+	}
 
 	public String toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(this);
+	}
 
 	public static DoseReponseParamsDTO fromJsonToDoseReponseParamsDTO(String json) {
-        return new JSONDeserializer<DoseReponseParamsDTO>()
-        .use(null, DoseReponseParamsDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<DoseReponseParamsDTO>()
+				.use(null, DoseReponseParamsDTO.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<DoseReponseParamsDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<DoseReponseParamsDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<DoseReponseParamsDTO> fromJsonArrayToDoseRepoes(String json) {
-        return new JSONDeserializer<List<DoseReponseParamsDTO>>()
-        .use("values", DoseReponseParamsDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<DoseReponseParamsDTO>>()
+				.use("values", DoseReponseParamsDTO.class).deserialize(json);
+	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 
 	public Long getId() {
-        return this.id;
-    }
+		return this.id;
+	}
 
 	public void setId(Long id) {
-        this.id = id;
-    }
+		this.id = id;
+	}
 
 	public Integer getVersion() {
-        return this.version;
-    }
+		return this.version;
+	}
 
 	public void setVersion(Integer version) {
-        this.version = version;
-    }
+		this.version = version;
+	}
 
 	public Long getStateid() {
-        return this.Stateid;
-    }
+		return this.Stateid;
+	}
 
 	public void setStateid(Long Stateid) {
-        this.Stateid = Stateid;
-    }
+		this.Stateid = Stateid;
+	}
 
 	public String getAgCodeName() {
-        return this.agCodeName;
-    }
+		return this.agCodeName;
+	}
 
 	public void setAgCodeName(String agCodeName) {
-        this.agCodeName = agCodeName;
-    }
+		this.agCodeName = agCodeName;
+	}
 
 	public String getCurveId() {
-        return this.curveId;
-    }
+		return this.curveId;
+	}
 
 	public void setCurveId(String curveId) {
-        this.curveId = curveId;
-    }
+		this.curveId = curveId;
+	}
 
 	public String getLsType() {
-        return this.lsType;
-    }
+		return this.lsType;
+	}
 
 	public void setLsType(String lsType) {
-        this.lsType = lsType;
-    }
+		this.lsType = lsType;
+	}
 
 	public String getLsKind() {
-        return this.lsKind;
-    }
+		return this.lsKind;
+	}
 
 	public void setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
+		this.lsKind = lsKind;
+	}
 
 	public String getStringValue() {
-        return this.stringValue;
-    }
+		return this.stringValue;
+	}
 
 	public void setStringValue(String stringValue) {
-        this.stringValue = stringValue;
-    }
+		this.stringValue = stringValue;
+	}
 
 	public String getCodeValue() {
-        return this.codeValue;
-    }
+		return this.codeValue;
+	}
 
 	public void setCodeValue(String codeValue) {
-        this.codeValue = codeValue;
-    }
+		this.codeValue = codeValue;
+	}
 
 	public String getClobValue() {
-        return this.clobValue;
-    }
+		return this.clobValue;
+	}
 
 	public void setClobValue(String clobValue) {
-        this.clobValue = clobValue;
-    }
+		this.clobValue = clobValue;
+	}
 
 	public String getOperatorType() {
-        return this.operatorType;
-    }
+		return this.operatorType;
+	}
 
 	public void setOperatorType(String operatorType) {
-        this.operatorType = operatorType;
-    }
+		this.operatorType = operatorType;
+	}
 
 	public String getOperatorKind() {
-        return this.operatorKind;
-    }
+		return this.operatorKind;
+	}
 
 	public void setOperatorKind(String operatorKind) {
-        this.operatorKind = operatorKind;
-    }
+		this.operatorKind = operatorKind;
+	}
 
 	public BigDecimal getNumericValue() {
-        return this.numericValue;
-    }
+		return this.numericValue;
+	}
 
 	public void setNumericValue(BigDecimal numericValue) {
-        this.numericValue = numericValue;
-    }
+		this.numericValue = numericValue;
+	}
 
 	public Integer getSigFigs() {
-        return this.sigFigs;
-    }
+		return this.sigFigs;
+	}
 
 	public void setSigFigs(Integer sigFigs) {
-        this.sigFigs = sigFigs;
-    }
+		this.sigFigs = sigFigs;
+	}
 
 	public BigDecimal getUncertainty() {
-        return this.uncertainty;
-    }
+		return this.uncertainty;
+	}
 
 	public void setUncertainty(BigDecimal uncertainty) {
-        this.uncertainty = uncertainty;
-    }
+		this.uncertainty = uncertainty;
+	}
 
 	public Integer getNumberOfReplicates() {
-        return this.numberOfReplicates;
-    }
+		return this.numberOfReplicates;
+	}
 
 	public void setNumberOfReplicates(Integer numberOfReplicates) {
-        this.numberOfReplicates = numberOfReplicates;
-    }
+		this.numberOfReplicates = numberOfReplicates;
+	}
 
 	public String getUncertaintyType() {
-        return this.uncertaintyType;
-    }
+		return this.uncertaintyType;
+	}
 
 	public void setUncertaintyType(String uncertaintyType) {
-        this.uncertaintyType = uncertaintyType;
-    }
+		this.uncertaintyType = uncertaintyType;
+	}
 
 	public String getUnitType() {
-        return this.unitType;
-    }
+		return this.unitType;
+	}
 
 	public void setUnitType(String unitType) {
-        this.unitType = unitType;
-    }
+		this.unitType = unitType;
+	}
 
 	public String getUnitKind() {
-        return this.unitKind;
-    }
+		return this.unitKind;
+	}
 
 	public void setUnitKind(String unitKind) {
-        this.unitKind = unitKind;
-    }
+		this.unitKind = unitKind;
+	}
 
 	public String getComments() {
-        return this.comments;
-    }
+		return this.comments;
+	}
 
 	public void setComments(String comments) {
-        this.comments = comments;
-    }
+		this.comments = comments;
+	}
 
 	public boolean isIgnored() {
-        return this.ignored;
-    }
+		return this.ignored;
+	}
 
 	public void setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
+		this.ignored = ignored;
+	}
 
 	public Long getLsTransaction() {
-        return this.lsTransaction;
-    }
+		return this.lsTransaction;
+	}
 
 	public void setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
+		this.lsTransaction = lsTransaction;
+	}
 
 	public boolean isPublicData() {
-        return this.publicData;
-    }
+		return this.publicData;
+	}
 
 	public void setPublicData(boolean publicData) {
-        this.publicData = publicData;
-    }
+		this.publicData = publicData;
+	}
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/EntrezDbDTO.java b/src/main/java/com/labsynch/labseer/dto/EntrezDbDTO.java
index 404a1b1fe..3958334d1 100644
--- a/src/main/java/com/labsynch/labseer/dto/EntrezDbDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/EntrezDbDTO.java
@@ -9,69 +9,67 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class EntrezDbDTO {
-	
+
     private String taxonomyId;
     private String entrezGenesFile;
     private String geneHistoryFile;
 
-
-	public String getTaxonomyId() {
+    public String getTaxonomyId() {
         return this.taxonomyId;
     }
 
-	public void setTaxonomyId(String taxonomyId) {
+    public void setTaxonomyId(String taxonomyId) {
         this.taxonomyId = taxonomyId;
     }
 
-	public String getEntrezGenesFile() {
+    public String getEntrezGenesFile() {
         return this.entrezGenesFile;
     }
 
-	public void setEntrezGenesFile(String entrezGenesFile) {
+    public void setEntrezGenesFile(String entrezGenesFile) {
         this.entrezGenesFile = entrezGenesFile;
     }
 
-	public String getGeneHistoryFile() {
+    public String getGeneHistoryFile() {
         return this.geneHistoryFile;
     }
 
-	public void setGeneHistoryFile(String geneHistoryFile) {
+    public void setGeneHistoryFile(String geneHistoryFile) {
         this.geneHistoryFile = geneHistoryFile;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static EntrezDbDTO fromJsonToEntrezDbDTO(String json) {
+    public static EntrezDbDTO fromJsonToEntrezDbDTO(String json) {
         return new JSONDeserializer<EntrezDbDTO>()
-        .use(null, EntrezDbDTO.class).deserialize(json);
+                .use(null, EntrezDbDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<EntrezDbDTO> collection) {
+    public static String toJsonArray(Collection<EntrezDbDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<EntrezDbDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<EntrezDbDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<EntrezDbDTO> fromJsonArrayToEntrezDbDTO(String json) {
+    public static Collection<EntrezDbDTO> fromJsonArrayToEntrezDbDTO(String json) {
         return new JSONDeserializer<List<EntrezDbDTO>>()
-        .use("values", EntrezDbDTO.class).deserialize(json);
+                .use("values", EntrezDbDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/EntrezDbGeneDTO.java b/src/main/java/com/labsynch/labseer/dto/EntrezDbGeneDTO.java
index 72bd02a25..f21b726e7 100755
--- a/src/main/java/com/labsynch/labseer/dto/EntrezDbGeneDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/EntrezDbGeneDTO.java
@@ -10,9 +10,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class EntrezDbGeneDTO {
-	
+
     private String taxId;
     private String geneId;
     private String symbol;
@@ -29,158 +28,157 @@ public class EntrezDbGeneDTO {
     private String otherDesignations;
     private Date modificationDate;
 
-
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static EntrezDbGeneDTO fromJsonToEntrezDbGeneDTO(String json) {
+    public static EntrezDbGeneDTO fromJsonToEntrezDbGeneDTO(String json) {
         return new JSONDeserializer<EntrezDbGeneDTO>()
-        .use(null, EntrezDbGeneDTO.class).deserialize(json);
+                .use(null, EntrezDbGeneDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<EntrezDbGeneDTO> collection) {
+    public static String toJsonArray(Collection<EntrezDbGeneDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<EntrezDbGeneDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<EntrezDbGeneDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<EntrezDbGeneDTO> fromJsonArrayToEntrezDbGeneDTO(String json) {
+    public static Collection<EntrezDbGeneDTO> fromJsonArrayToEntrezDbGeneDTO(String json) {
         return new JSONDeserializer<List<EntrezDbGeneDTO>>()
-        .use("values", EntrezDbGeneDTO.class).deserialize(json);
+                .use("values", EntrezDbGeneDTO.class).deserialize(json);
     }
 
-	public String getTaxId() {
+    public String getTaxId() {
         return this.taxId;
     }
 
-	public void setTaxId(String taxId) {
+    public void setTaxId(String taxId) {
         this.taxId = taxId;
     }
 
-	public String getGeneId() {
+    public String getGeneId() {
         return this.geneId;
     }
 
-	public void setGeneId(String geneId) {
+    public void setGeneId(String geneId) {
         this.geneId = geneId;
     }
 
-	public String getSymbol() {
+    public String getSymbol() {
         return this.symbol;
     }
 
-	public void setSymbol(String symbol) {
+    public void setSymbol(String symbol) {
         this.symbol = symbol;
     }
 
-	public String getLocusTag() {
+    public String getLocusTag() {
         return this.locusTag;
     }
 
-	public void setLocusTag(String locusTag) {
+    public void setLocusTag(String locusTag) {
         this.locusTag = locusTag;
     }
 
-	public String getSynonyms() {
+    public String getSynonyms() {
         return this.synonyms;
     }
 
-	public void setSynonyms(String synonyms) {
+    public void setSynonyms(String synonyms) {
         this.synonyms = synonyms;
     }
 
-	public String getDbXrefs() {
+    public String getDbXrefs() {
         return this.dbXrefs;
     }
 
-	public void setDbXrefs(String dbXrefs) {
+    public void setDbXrefs(String dbXrefs) {
         this.dbXrefs = dbXrefs;
     }
 
-	public String getChromosome() {
+    public String getChromosome() {
         return this.chromosome;
     }
 
-	public void setChromosome(String chromosome) {
+    public void setChromosome(String chromosome) {
         this.chromosome = chromosome;
     }
 
-	public String getMapLocation() {
+    public String getMapLocation() {
         return this.mapLocation;
     }
 
-	public void setMapLocation(String mapLocation) {
+    public void setMapLocation(String mapLocation) {
         this.mapLocation = mapLocation;
     }
 
-	public String getDescription() {
+    public String getDescription() {
         return this.description;
     }
 
-	public void setDescription(String description) {
+    public void setDescription(String description) {
         this.description = description;
     }
 
-	public String getTypeOfGene() {
+    public String getTypeOfGene() {
         return this.typeOfGene;
     }
 
-	public void setTypeOfGene(String typeOfGene) {
+    public void setTypeOfGene(String typeOfGene) {
         this.typeOfGene = typeOfGene;
     }
 
-	public String getSymbolFromAuthority() {
+    public String getSymbolFromAuthority() {
         return this.symbolFromAuthority;
     }
 
-	public void setSymbolFromAuthority(String symbolFromAuthority) {
+    public void setSymbolFromAuthority(String symbolFromAuthority) {
         this.symbolFromAuthority = symbolFromAuthority;
     }
 
-	public String getFullNameFromAuthority() {
+    public String getFullNameFromAuthority() {
         return this.fullNameFromAuthority;
     }
 
-	public void setFullNameFromAuthority(String fullNameFromAuthority) {
+    public void setFullNameFromAuthority(String fullNameFromAuthority) {
         this.fullNameFromAuthority = fullNameFromAuthority;
     }
 
-	public String getNomenclatureStatus() {
+    public String getNomenclatureStatus() {
         return this.nomenclatureStatus;
     }
 
-	public void setNomenclatureStatus(String nomenclatureStatus) {
+    public void setNomenclatureStatus(String nomenclatureStatus) {
         this.nomenclatureStatus = nomenclatureStatus;
     }
 
-	public String getOtherDesignations() {
+    public String getOtherDesignations() {
         return this.otherDesignations;
     }
 
-	public void setOtherDesignations(String otherDesignations) {
+    public void setOtherDesignations(String otherDesignations) {
         this.otherDesignations = otherDesignations;
     }
 
-	public Date getModificationDate() {
+    public Date getModificationDate() {
         return this.modificationDate;
     }
 
-	public void setModificationDate(Date modificationDate) {
+    public void setModificationDate(Date modificationDate) {
         this.modificationDate = modificationDate;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/EntrezDiscontinuedGeneDTO.java b/src/main/java/com/labsynch/labseer/dto/EntrezDiscontinuedGeneDTO.java
index 7e4b43e34..21d0b02c8 100644
--- a/src/main/java/com/labsynch/labseer/dto/EntrezDiscontinuedGeneDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/EntrezDiscontinuedGeneDTO.java
@@ -10,89 +10,87 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class EntrezDiscontinuedGeneDTO {
-	
-	//tax_id  GeneID  Discontinued_GeneID     Discontinued_Symbol     Discontinue_Date
-	
+
+    // tax_id GeneID Discontinued_GeneID Discontinued_Symbol Discontinue_Date
+
     private String taxId;
     private String geneId;
     private String discontinuedGeneId;
-    private String discontinuedSymbol;    
+    private String discontinuedSymbol;
     private Date discontinuedDate;
 
-
-	public String getTaxId() {
+    public String getTaxId() {
         return this.taxId;
     }
 
-	public void setTaxId(String taxId) {
+    public void setTaxId(String taxId) {
         this.taxId = taxId;
     }
 
-	public String getGeneId() {
+    public String getGeneId() {
         return this.geneId;
     }
 
-	public void setGeneId(String geneId) {
+    public void setGeneId(String geneId) {
         this.geneId = geneId;
     }
 
-	public String getDiscontinuedGeneId() {
+    public String getDiscontinuedGeneId() {
         return this.discontinuedGeneId;
     }
 
-	public void setDiscontinuedGeneId(String discontinuedGeneId) {
+    public void setDiscontinuedGeneId(String discontinuedGeneId) {
         this.discontinuedGeneId = discontinuedGeneId;
     }
 
-	public String getDiscontinuedSymbol() {
+    public String getDiscontinuedSymbol() {
         return this.discontinuedSymbol;
     }
 
-	public void setDiscontinuedSymbol(String discontinuedSymbol) {
+    public void setDiscontinuedSymbol(String discontinuedSymbol) {
         this.discontinuedSymbol = discontinuedSymbol;
     }
 
-	public Date getDiscontinuedDate() {
+    public Date getDiscontinuedDate() {
         return this.discontinuedDate;
     }
 
-	public void setDiscontinuedDate(Date discontinuedDate) {
+    public void setDiscontinuedDate(Date discontinuedDate) {
         this.discontinuedDate = discontinuedDate;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static EntrezDiscontinuedGeneDTO fromJsonToEntrezDiscontinuedGeneDTO(String json) {
+    public static EntrezDiscontinuedGeneDTO fromJsonToEntrezDiscontinuedGeneDTO(String json) {
         return new JSONDeserializer<EntrezDiscontinuedGeneDTO>()
-        .use(null, EntrezDiscontinuedGeneDTO.class).deserialize(json);
+                .use(null, EntrezDiscontinuedGeneDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<EntrezDiscontinuedGeneDTO> collection) {
+    public static String toJsonArray(Collection<EntrezDiscontinuedGeneDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<EntrezDiscontinuedGeneDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<EntrezDiscontinuedGeneDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<EntrezDiscontinuedGeneDTO> fromJsonArrayToEntrezDiscoes(String json) {
+    public static Collection<EntrezDiscontinuedGeneDTO> fromJsonArrayToEntrezDiscoes(String json) {
         return new JSONDeserializer<List<EntrezDiscontinuedGeneDTO>>()
-        .use("values", EntrezDiscontinuedGeneDTO.class).deserialize(json);
+                .use("values", EntrezDiscontinuedGeneDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ErrorMessageDTO.java b/src/main/java/com/labsynch/labseer/dto/ErrorMessageDTO.java
index 4c2f7fec4..2b436dfba 100755
--- a/src/main/java/com/labsynch/labseer/dto/ErrorMessageDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ErrorMessageDTO.java
@@ -9,70 +9,68 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ErrorMessageDTO {
 
-	String level;
-	
-	String message;
-	
-	public ErrorMessageDTO(){
-		
-	}
-	
-	public ErrorMessageDTO(String level, String message){
-		this.level = level;
-		this.message = message;
-	}
-	
-
-	public String toJson() {
+    String level;
+
+    String message;
+
+    public ErrorMessageDTO() {
+
+    }
+
+    public ErrorMessageDTO(String level, String message) {
+        this.level = level;
+        this.message = message;
+    }
+
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ErrorMessageDTO fromJsonToErrorMessageDTO(String json) {
+    public static ErrorMessageDTO fromJsonToErrorMessageDTO(String json) {
         return new JSONDeserializer<ErrorMessageDTO>()
-        .use(null, ErrorMessageDTO.class).deserialize(json);
+                .use(null, ErrorMessageDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ErrorMessageDTO> collection) {
+    public static String toJsonArray(Collection<ErrorMessageDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ErrorMessageDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<ErrorMessageDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ErrorMessageDTO> fromJsonArrayToErroes(String json) {
+    public static Collection<ErrorMessageDTO> fromJsonArrayToErroes(String json) {
         return new JSONDeserializer<List<ErrorMessageDTO>>()
-        .use("values", ErrorMessageDTO.class).deserialize(json);
+                .use("values", ErrorMessageDTO.class).deserialize(json);
     }
 
-	public String getLevel() {
+    public String getLevel() {
         return this.level;
     }
 
-	public void setLevel(String level) {
+    public void setLevel(String level) {
         this.level = level;
     }
 
-	public String getMessage() {
+    public String getMessage() {
         return this.message;
     }
 
-	public void setMessage(String message) {
+    public void setMessage(String message) {
         this.message = message;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentCodeDTO.java
index f20920987..05abd1d4d 100644
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentCodeDTO.java
@@ -9,65 +9,61 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ExperimentCodeDTO {
-	
-	private String experimentCode;
-	private String protocolCode;
-	
-	public ExperimentCodeDTO(){
-	}
 
+    private String experimentCode;
+    private String protocolCode;
+
+    public ExperimentCodeDTO() {
+    }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ExperimentCodeDTO fromJsonToExperimentCodeDTO(String json) {
+    public static ExperimentCodeDTO fromJsonToExperimentCodeDTO(String json) {
         return new JSONDeserializer<ExperimentCodeDTO>()
-        .use(null, ExperimentCodeDTO.class).deserialize(json);
+                .use(null, ExperimentCodeDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ExperimentCodeDTO> collection) {
+    public static String toJsonArray(Collection<ExperimentCodeDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ExperimentCodeDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<ExperimentCodeDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ExperimentCodeDTO> fromJsonArrayToExperimentCoes(String json) {
+    public static Collection<ExperimentCodeDTO> fromJsonArrayToExperimentCoes(String json) {
         return new JSONDeserializer<List<ExperimentCodeDTO>>()
-        .use("values", ExperimentCodeDTO.class).deserialize(json);
+                .use("values", ExperimentCodeDTO.class).deserialize(json);
     }
 
-	public String getExperimentCode() {
+    public String getExperimentCode() {
         return this.experimentCode;
     }
 
-	public void setExperimentCode(String experimentCode) {
+    public void setExperimentCode(String experimentCode) {
         this.experimentCode = experimentCode;
     }
 
-	public String getProtocolCode() {
+    public String getProtocolCode() {
         return this.protocolCode;
     }
 
-	public void setProtocolCode(String protocolCode) {
+    public void setProtocolCode(String protocolCode) {
         this.protocolCode = protocolCode;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentCsvDataDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentCsvDataDTO.java
index 4eab6db47..4781bd8cf 100644
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentCsvDataDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentCsvDataDTO.java
@@ -9,83 +9,79 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ExperimentCsvDataDTO {
-	
-	private String experimentCsvFilePath;
-	
-	private String analysisGroupCsvFilePath;
 
-	private String treatmentGroupCsvFilePath;
+    private String experimentCsvFilePath;
+
+    private String analysisGroupCsvFilePath;
+
+    private String treatmentGroupCsvFilePath;
 
-	private String subjectCsvFilePath;
-	
+    private String subjectCsvFilePath;
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ExperimentCsvDataDTO fromJsonToExperimentCsvDataDTO(String json) {
+    public static ExperimentCsvDataDTO fromJsonToExperimentCsvDataDTO(String json) {
         return new JSONDeserializer<ExperimentCsvDataDTO>()
-        .use(null, ExperimentCsvDataDTO.class).deserialize(json);
+                .use(null, ExperimentCsvDataDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ExperimentCsvDataDTO> collection) {
+    public static String toJsonArray(Collection<ExperimentCsvDataDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ExperimentCsvDataDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<ExperimentCsvDataDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ExperimentCsvDataDTO> fromJsonArrayToExperimentCsvDataDTO(String json) {
+    public static Collection<ExperimentCsvDataDTO> fromJsonArrayToExperimentCsvDataDTO(String json) {
         return new JSONDeserializer<List<ExperimentCsvDataDTO>>()
-        .use("values", ExperimentCsvDataDTO.class).deserialize(json);
+                .use("values", ExperimentCsvDataDTO.class).deserialize(json);
     }
 
-	public String getExperimentCsvFilePath() {
+    public String getExperimentCsvFilePath() {
         return this.experimentCsvFilePath;
     }
 
-	public void setExperimentCsvFilePath(String experimentCsvFilePath) {
+    public void setExperimentCsvFilePath(String experimentCsvFilePath) {
         this.experimentCsvFilePath = experimentCsvFilePath;
     }
 
-	public String getAnalysisGroupCsvFilePath() {
+    public String getAnalysisGroupCsvFilePath() {
         return this.analysisGroupCsvFilePath;
     }
 
-	public void setAnalysisGroupCsvFilePath(String analysisGroupCsvFilePath) {
+    public void setAnalysisGroupCsvFilePath(String analysisGroupCsvFilePath) {
         this.analysisGroupCsvFilePath = analysisGroupCsvFilePath;
     }
 
-	public String getTreatmentGroupCsvFilePath() {
+    public String getTreatmentGroupCsvFilePath() {
         return this.treatmentGroupCsvFilePath;
     }
 
-	public void setTreatmentGroupCsvFilePath(String treatmentGroupCsvFilePath) {
+    public void setTreatmentGroupCsvFilePath(String treatmentGroupCsvFilePath) {
         this.treatmentGroupCsvFilePath = treatmentGroupCsvFilePath;
     }
 
-	public String getSubjectCsvFilePath() {
+    public String getSubjectCsvFilePath() {
         return this.subjectCsvFilePath;
     }
 
-	public void setSubjectCsvFilePath(String subjectCsvFilePath) {
+    public void setSubjectCsvFilePath(String subjectCsvFilePath) {
         this.subjectCsvFilePath = subjectCsvFilePath;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentDataDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentDataDTO.java
index 50bd942a3..bc216cc55 100644
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentDataDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentDataDTO.java
@@ -14,183 +14,170 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
-
 public class ExperimentDataDTO {
 
-
 	private String protocolName;
-	
+
 	private String protocolCodeName;
 
 	private Long protocolId;
-	
+
 	private String assayFolderRule;
-	
+
 	private String protocolShortDescription;
 
 	private String experimentName;
-	
+
 	private String experimentCodeName;
 
 	private Long experimentId;
-		
+
 	private String experimentShortDescription;
-	
+
 	private String displayResults;
 
 	private String renderData;
 
 	private Set<LsTag> lsTags = new HashSet<LsTag>();
-	
-	private Set<AnalysisGroupValueDTO> analysisGroupValues = new HashSet<AnalysisGroupValueDTO>();
-	
 
+	private Set<AnalysisGroupValueDTO> analysisGroupValues = new HashSet<AnalysisGroupValueDTO>();
 
 	public String toJson() {
-        return new JSONSerializer().
-        		exclude("*.class", "analysisGroupValues.experimentName", 
-        				"analysisGroupValues.experimentCodeName", 
-        				"analysisGroupValues.protocolId",
-        				"analysisGroupValues.stateId",
-        				"analysisGroupValues.experimentId",
-        				"analysisGroupValues.geneId",
-        				"analysisGroupValues.testedLot").
-        		include("lsTags", "analysisGroupValues").
-        		serialize(this);
-    }
+		return new JSONSerializer().exclude("*.class", "analysisGroupValues.experimentName",
+				"analysisGroupValues.experimentCodeName",
+				"analysisGroupValues.protocolId",
+				"analysisGroupValues.stateId",
+				"analysisGroupValues.experimentId",
+				"analysisGroupValues.geneId",
+				"analysisGroupValues.testedLot").include("lsTags", "analysisGroupValues").serialize(this);
+	}
 
 	public static ExperimentDataDTO fromJsonToExperimentDataDTO(String json) {
-        return new JSONDeserializer<ExperimentDataDTO>().use(null, ExperimentDataDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<ExperimentDataDTO>().use(null, ExperimentDataDTO.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<ExperimentDataDTO> collection) {
-        return new JSONSerializer().
-        		exclude("*.class").
-        		include("lsTags", "analysisGroupValues").
-        		exclude("*.class", "analysisGroupValues.experimentName", 
-        				"analysisGroupValues.experimentCodeName", 
-        				"analysisGroupValues.protocolId",
-        				"analysisGroupValues.stateId",
-        				"analysisGroupValues.experimentId",
-        				"analysisGroupValues.geneId",
-        				"analysisGroupValues.testedLot").
-        		serialize(collection);
-    }
+		return new JSONSerializer().exclude("*.class").include("lsTags", "analysisGroupValues")
+				.exclude("*.class", "analysisGroupValues.experimentName",
+						"analysisGroupValues.experimentCodeName",
+						"analysisGroupValues.protocolId",
+						"analysisGroupValues.stateId",
+						"analysisGroupValues.experimentId",
+						"analysisGroupValues.geneId",
+						"analysisGroupValues.testedLot")
+				.serialize(collection);
+	}
 
 	public static Collection<ExperimentDataDTO> fromJsonArrayToExperimentDataDTO(String json) {
-        return new JSONDeserializer<List<ExperimentDataDTO>>().use(null, ArrayList.class).use("values", ExperimentDataDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<ExperimentDataDTO>>().use(null, ArrayList.class)
+				.use("values", ExperimentDataDTO.class).deserialize(json);
+	}
 
 	public String getProtocolName() {
-        return this.protocolName;
-    }
+		return this.protocolName;
+	}
 
 	public void setProtocolName(String protocolName) {
-        this.protocolName = protocolName;
-    }
+		this.protocolName = protocolName;
+	}
 
 	public String getProtocolCodeName() {
-        return this.protocolCodeName;
-    }
+		return this.protocolCodeName;
+	}
 
 	public void setProtocolCodeName(String protocolCodeName) {
-        this.protocolCodeName = protocolCodeName;
-    }
+		this.protocolCodeName = protocolCodeName;
+	}
 
 	public Long getProtocolId() {
-        return this.protocolId;
-    }
+		return this.protocolId;
+	}
 
 	public void setProtocolId(Long protocolId) {
-        this.protocolId = protocolId;
-    }
+		this.protocolId = protocolId;
+	}
 
 	public String getAssayFolderRule() {
-        return this.assayFolderRule;
-    }
+		return this.assayFolderRule;
+	}
 
 	public void setAssayFolderRule(String assayFolderRule) {
-        this.assayFolderRule = assayFolderRule;
-    }
+		this.assayFolderRule = assayFolderRule;
+	}
 
 	public String getProtocolShortDescription() {
-        return this.protocolShortDescription;
-    }
+		return this.protocolShortDescription;
+	}
 
 	public void setProtocolShortDescription(String protocolShortDescription) {
-        this.protocolShortDescription = protocolShortDescription;
-    }
+		this.protocolShortDescription = protocolShortDescription;
+	}
 
 	public String getExperimentName() {
-        return this.experimentName;
-    }
+		return this.experimentName;
+	}
 
 	public void setExperimentName(String experimentName) {
-        this.experimentName = experimentName;
-    }
+		this.experimentName = experimentName;
+	}
 
 	public String getExperimentCodeName() {
-        return this.experimentCodeName;
-    }
+		return this.experimentCodeName;
+	}
 
 	public void setExperimentCodeName(String experimentCodeName) {
-        this.experimentCodeName = experimentCodeName;
-    }
+		this.experimentCodeName = experimentCodeName;
+	}
 
 	public Long getExperimentId() {
-        return this.experimentId;
-    }
+		return this.experimentId;
+	}
 
 	public void setExperimentId(Long experimentId) {
-        this.experimentId = experimentId;
-    }
+		this.experimentId = experimentId;
+	}
 
 	public String getExperimentShortDescription() {
-        return this.experimentShortDescription;
-    }
+		return this.experimentShortDescription;
+	}
 
 	public void setExperimentShortDescription(String experimentShortDescription) {
-        this.experimentShortDescription = experimentShortDescription;
-    }
+		this.experimentShortDescription = experimentShortDescription;
+	}
 
 	public String getDisplayResults() {
-        return this.displayResults;
-    }
+		return this.displayResults;
+	}
 
 	public void setDisplayResults(String displayResults) {
-        this.displayResults = displayResults;
-    }
+		this.displayResults = displayResults;
+	}
 
 	public String getRenderData() {
-        return this.renderData;
-    }
+		return this.renderData;
+	}
 
 	public void setRenderData(String renderData) {
-        this.renderData = renderData;
-    }
+		this.renderData = renderData;
+	}
 
 	public Set<LsTag> getLsTags() {
-        return this.lsTags;
-    }
+		return this.lsTags;
+	}
 
 	public void setLsTags(Set<LsTag> lsTags) {
-        this.lsTags = lsTags;
-    }
+		this.lsTags = lsTags;
+	}
 
 	public Set<AnalysisGroupValueDTO> getAnalysisGroupValues() {
-        return this.analysisGroupValues;
-    }
+		return this.analysisGroupValues;
+	}
 
 	public void setAnalysisGroupValues(Set<AnalysisGroupValueDTO> analysisGroupValues) {
-        this.analysisGroupValues = analysisGroupValues;
-    }
+		this.analysisGroupValues = analysisGroupValues;
+	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 }
-	
-
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentErrorMessageDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentErrorMessageDTO.java
index b73e3bcd7..384cd6f13 100644
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentErrorMessageDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentErrorMessageDTO.java
@@ -13,144 +13,239 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ExperimentErrorMessageDTO {
 
-	String experimentCodeName;
-	
-	String level;
-	
-	String message;
-	
-	Experiment experiment;
-		
-	@Transactional
+    String experimentCodeName;
+
+    String level;
+
+    String message;
+
+    Experiment experiment;
+
+    @Transactional
     public String toJson() {
-        return new JSONSerializer().exclude("*.class", "experiment.lsStates.lsValues.lsState", "experiment.lsStates.experiment", "experiment.analysisGroups.experiment", "experiment.lsLabels.experiment").include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues", "experiment.analysisGroups.lsStates.lsValues", "experiment.analysisGroups.lsLabels", "experiment.analysisGroups.treatmentGroups.lsStates.lsValues", "experiment.analysisGroups.treatmentGroups.lsLabels", "experiment.analysisGroups.treatmentGroups.subjects.lsStates.lsValues", "experiment.analysisGroups.treatmentGroups.subjects.lsLabels").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "experiment.lsStates.lsValues.lsState", "experiment.lsStates.experiment",
+                        "experiment.analysisGroups.experiment", "experiment.lsLabels.experiment")
+                .include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues",
+                        "experiment.analysisGroups.lsStates.lsValues", "experiment.analysisGroups.lsLabels",
+                        "experiment.analysisGroups.treatmentGroups.lsStates.lsValues",
+                        "experiment.analysisGroups.treatmentGroups.lsLabels",
+                        "experiment.analysisGroups.treatmentGroups.subjects.lsStates.lsValues",
+                        "experiment.analysisGroups.treatmentGroups.subjects.lsLabels")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public String toPrettyJson() {
-        return new JSONSerializer().exclude("*.class", "experiment.lsStates.lsValues.lsState", "experiment.lsStates.experiment", "experiment.analysisGroups.experiments", "experiment.lsLabels.experiment").include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues", "experiment.analysisGroups", "experiment.analysisGroups.lsStates.lsValues", "experiment.analysisGroups.lsLabels", "experiment.analysisGroups.treatmentGroups.lsStates.lsValues", "experiment.analysisGroups.treatmentGroups.lsLabels", "experiment.analysisGroups.treatmentGroups.subjects.lsStates.lsValues", "experiment.analysisGroups.treatmentGroups.subjects.lsLabels").prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "experiment.lsStates.lsValues.lsState", "experiment.lsStates.experiment",
+                        "experiment.analysisGroups.experiments", "experiment.lsLabels.experiment")
+                .include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues",
+                        "experiment.analysisGroups", "experiment.analysisGroups.lsStates.lsValues",
+                        "experiment.analysisGroups.lsLabels",
+                        "experiment.analysisGroups.treatmentGroups.lsStates.lsValues",
+                        "experiment.analysisGroups.treatmentGroups.lsLabels",
+                        "experiment.analysisGroups.treatmentGroups.subjects.lsStates.lsValues",
+                        "experiment.analysisGroups.treatmentGroups.subjects.lsLabels")
+                .prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public String toPrettyJsonStub() {
-        return new JSONSerializer().exclude("*.class", "experiment.lsStates.lsValues.lsState", "experiment.lsStates.experiment", "experiment.analysisGroups", "experiment.lsLabels.experiment").include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues").prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "experiment.lsStates.lsValues.lsState", "experiment.lsStates.experiment",
+                        "experiment.analysisGroups", "experiment.lsLabels.experiment")
+                .include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues").prettyPrint(true)
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public String toJsonStub() {
-        return new JSONSerializer().exclude("*.class", "experiment.lsStates.lsValues.lsState", "experiment.lsStates.experiment", "experiment.analysisGroups", "experiment.lsLabels.experiment").include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues").prettyPrint(false).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "experiment.lsStates.lsValues.lsState", "experiment.lsStates.experiment",
+                        "experiment.analysisGroups", "experiment.lsLabels.experiment")
+                .include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues").prettyPrint(false)
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public String toJsonStubWithAnalysisGroups() {
-        return new JSONSerializer().exclude("*.class", "experiment.lsStates.lsValues.lsState", "experiment.lsStates.experiment", "experiment.lsLabels.experiment", "experiment.analysisGroups.subjects", "experiment.analysisGroups.experiment").include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues", "experiment.analysisGroups").prettyPrint(false).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "experiment.lsStates.lsValues.lsState", "experiment.lsStates.experiment",
+                        "experiment.lsLabels.experiment", "experiment.analysisGroups.subjects",
+                        "experiment.analysisGroups.experiment")
+                .include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues",
+                        "experiment.analysisGroups")
+                .prettyPrint(false).transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public String toJsonStubWithAnalysisGroupValues() {
-        return new JSONSerializer().exclude("*.class", "experiment.lsStates.lsValues.lsState", "experiment.lsStates.experiment", "experiment.lsLabels.experiment", "experiment.analysisGroups.subjects", "experiment.analysisGroups.experiment").include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues", "experiment.analysisGroups.lsStates.lsValues").prettyPrint(false).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "experiment.lsStates.lsValues.lsState", "experiment.lsStates.experiment",
+                        "experiment.lsLabels.experiment", "experiment.analysisGroups.subjects",
+                        "experiment.analysisGroups.experiment")
+                .include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues",
+                        "experiment.analysisGroups.lsStates.lsValues")
+                .prettyPrint(false).transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public String toJsonStubWithAnalysisGroupStates() {
-        return new JSONSerializer().exclude("*.class", "experiment.lsStates.lsValues.lsState", "experiment.lsStates.experiment", "experiment.lsLabels.experiment", "experiment.analysisGroups.subjects", "experiment.analysisGroups.experiment").include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues", "experiment.analysisGroups.lsStates").prettyPrint(false).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "experiment.lsStates.lsValues.lsState", "experiment.lsStates.experiment",
+                        "experiment.lsLabels.experiment", "experiment.analysisGroups.subjects",
+                        "experiment.analysisGroups.experiment")
+                .include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues",
+                        "experiment.analysisGroups.lsStates")
+                .prettyPrint(false).transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public static String toJsonArray(Collection<ExperimentErrorMessageDTO> collection) {
-        return new JSONSerializer().include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues", "experiment.analysisGroups.lsStates.lsValues", "experiment.analysisGroups.lsLabels", "experiment.analysisGroups.treatmentGroups.lsStates.lsValues", "experiment.analysisGroups.treatmentGroups.lsLabels", "experiment.analysisGroups.treatmentGroups.subjects.lsStates.lsValues", "experiment.analysisGroups.treatmentGroups.subjects.lsLabels").exclude("*.class", "experiment.lsStates.lsValues.lsState", "experiment.lsStates.experiment", "experiment.analysisGroups.experiment", "experiment.analysisGroups.subject", "experiment.lsLabels.experiment").transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer()
+                .include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues",
+                        "experiment.analysisGroups.lsStates.lsValues", "experiment.analysisGroups.lsLabels",
+                        "experiment.analysisGroups.treatmentGroups.lsStates.lsValues",
+                        "experiment.analysisGroups.treatmentGroups.lsLabels",
+                        "experiment.analysisGroups.treatmentGroups.subjects.lsStates.lsValues",
+                        "experiment.analysisGroups.treatmentGroups.subjects.lsLabels")
+                .exclude("*.class", "experiment.lsStates.lsValues.lsState", "experiment.lsStates.experiment",
+                        "experiment.analysisGroups.experiment", "experiment.analysisGroups.subject",
+                        "experiment.lsLabels.experiment")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
     @Transactional
     public static String toJsonArrayPretty(Collection<ExperimentErrorMessageDTO> collection) {
-        return new JSONSerializer().include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues", "experiment.analysisGroups.lsStates.lsValues", "experiment.analysisGroups.lsLabels", "experiment.analysisGroups.treatmentGroups.lsStates.lsValues", "experiment.analysisGroups.treatmentGroups.lsLabels", "experiment.analysisGroups.treatmentGroups.subjects.lsStates.lsValues", "experiment.analysisGroups.treatmentGroups.subjects.lsLabels").exclude("*.class", "experiment.lsStates.lsValues.lsState", "experiment.lsStates.experiment", "experiment.analysisGroups.experiment", "experiment.analysisGroups.subject", "experiment.lsLabels.experiment").prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer()
+                .include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues",
+                        "experiment.analysisGroups.lsStates.lsValues", "experiment.analysisGroups.lsLabels",
+                        "experiment.analysisGroups.treatmentGroups.lsStates.lsValues",
+                        "experiment.analysisGroups.treatmentGroups.lsLabels",
+                        "experiment.analysisGroups.treatmentGroups.subjects.lsStates.lsValues",
+                        "experiment.analysisGroups.treatmentGroups.subjects.lsLabels")
+                .exclude("*.class", "experiment.lsStates.lsValues.lsState", "experiment.lsStates.experiment",
+                        "experiment.analysisGroups.experiment", "experiment.analysisGroups.subject",
+                        "experiment.lsLabels.experiment")
+                .prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
     @Transactional
     public static String toJsonArrayStub(Collection<ExperimentErrorMessageDTO> collection) {
-        return new JSONSerializer().include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues").exclude("*.class", "experiment.analysisGroups", "experiment.lsStates.lsValues.lsState", "experiment.lsStates.experiment", "experiment.analysisGroups.experiment", "experiment.lsLabels.experiment").transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer().include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues")
+                .exclude("*.class", "experiment.analysisGroups", "experiment.lsStates.lsValues.lsState",
+                        "experiment.lsStates.experiment", "experiment.analysisGroups.experiment",
+                        "experiment.lsLabels.experiment")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
-    
+
     @Transactional
-        public static String toJsonArrayStubWithProt(Collection<ExperimentErrorMessageDTO> collection) {
-            return new JSONSerializer().include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues", "experiment.protocol.lsLabels").exclude("*.class", "experiment.analysisGroups", "experiment.lsStates.lsValues.lsState", "experiment.lsStates.experiment", "experiment.analysisGroups.experiment", "experiment.lsLabels.experiment").transform(new ExcludeNulls(), void.class).serialize(collection);
-        }
+    public static String toJsonArrayStubWithProt(Collection<ExperimentErrorMessageDTO> collection) {
+        return new JSONSerializer()
+                .include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues",
+                        "experiment.protocol.lsLabels")
+                .exclude("*.class", "experiment.analysisGroups", "experiment.lsStates.lsValues.lsState",
+                        "experiment.lsStates.experiment", "experiment.analysisGroups.experiment",
+                        "experiment.lsLabels.experiment")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
+    }
 
     @Transactional
     public static String toJsonArrayStubWithAG(Collection<ExperimentErrorMessageDTO> collection) {
-        return new JSONSerializer().include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues", "experiment.analysisGroups").exclude("*.class", "experiment.lsStates.lsValues.lsState", "experiment.lsStates.experiment", "experiment.analysisGroups.experiment", "experiment.analysisGroups.subjects", "experiment.lsLabels.experiment").transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer()
+                .include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues",
+                        "experiment.analysisGroups")
+                .exclude("*.class", "experiment.lsStates.lsValues.lsState", "experiment.lsStates.experiment",
+                        "experiment.analysisGroups.experiment", "experiment.analysisGroups.subjects",
+                        "experiment.lsLabels.experiment")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
     @Transactional
     public static String toJsonArrayStubWithAGStates(Collection<ExperimentErrorMessageDTO> collection) {
-        return new JSONSerializer().include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues", "experiment.analysisGroups.lsStates").exclude("*.class", "experiment.lsStates.lsValues.lsState", "experiment.lsStates.experiment", "experiment.analysisGroups.experiment", "experiment.analysisGroups.subjects", "experiment.lsLabels.experiment").transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer()
+                .include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues",
+                        "experiment.analysisGroups.lsStates")
+                .exclude("*.class", "experiment.lsStates.lsValues.lsState", "experiment.lsStates.experiment",
+                        "experiment.analysisGroups.experiment", "experiment.analysisGroups.subjects",
+                        "experiment.lsLabels.experiment")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
     @Transactional
     public static String toJsonArrayStubWithAGValues(Collection<ExperimentErrorMessageDTO> collection) {
-        return new JSONSerializer().include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues", "experiment.analysisGroups.lsStates.lsValues").exclude("*.class", "experiment.lsStates.lsValues.lsState", "experiment.lsStates.experiment", "experiment.analysisGroups.experiment", "experiment.analysisGroups.subjects", "experiment.lsLabels.experiment").transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer()
+                .include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues",
+                        "experiment.analysisGroups.lsStates.lsValues")
+                .exclude("*.class", "experiment.lsStates.lsValues.lsState", "experiment.lsStates.experiment",
+                        "experiment.analysisGroups.experiment", "experiment.analysisGroups.subjects",
+                        "experiment.lsLabels.experiment")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
     @Transactional
     public static String toJsonArrayStubPretty(Collection<ExperimentErrorMessageDTO> collection) {
-        return new JSONSerializer().include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues").exclude("*.class", "experiment.analysisGroups", "experiment.lsStates.lsValues.lsState", "experiment.lsStates.experiment", "experiment.analysisGroups.experiment", "experiment.lsLabels.experiment").prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(collection);
-    }
-    
-	public ExperimentErrorMessageDTO(){
-	}
-	
-	public ExperimentErrorMessageDTO(String experimentCodeName, Experiment experiment){
-		this.experimentCodeName = experimentCodeName;
-		this.experiment = experiment;
-	}
-	
-
-	public static ExperimentErrorMessageDTO fromJsonToExperimentErrorMessageDTO(String json) {
+        return new JSONSerializer().include("experiment.lsTags", "experiment.lsLabels", "experiment.lsStates.lsValues")
+                .exclude("*.class", "experiment.analysisGroups", "experiment.lsStates.lsValues.lsState",
+                        "experiment.lsStates.experiment", "experiment.analysisGroups.experiment",
+                        "experiment.lsLabels.experiment")
+                .prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(collection);
+    }
+
+    public ExperimentErrorMessageDTO() {
+    }
+
+    public ExperimentErrorMessageDTO(String experimentCodeName, Experiment experiment) {
+        this.experimentCodeName = experimentCodeName;
+        this.experiment = experiment;
+    }
+
+    public static ExperimentErrorMessageDTO fromJsonToExperimentErrorMessageDTO(String json) {
         return new JSONDeserializer<ExperimentErrorMessageDTO>()
-        .use(null, ExperimentErrorMessageDTO.class).deserialize(json);
+                .use(null, ExperimentErrorMessageDTO.class).deserialize(json);
     }
 
-	public static Collection<ExperimentErrorMessageDTO> fromJsonArrayToExperimentErroes(String json) {
+    public static Collection<ExperimentErrorMessageDTO> fromJsonArrayToExperimentErroes(String json) {
         return new JSONDeserializer<List<ExperimentErrorMessageDTO>>()
-        .use("values", ExperimentErrorMessageDTO.class).deserialize(json);
+                .use("values", ExperimentErrorMessageDTO.class).deserialize(json);
     }
 
-	public String getExperimentCodeName() {
+    public String getExperimentCodeName() {
         return this.experimentCodeName;
     }
 
-	public void setExperimentCodeName(String experimentCodeName) {
+    public void setExperimentCodeName(String experimentCodeName) {
         this.experimentCodeName = experimentCodeName;
     }
 
-	public String getLevel() {
+    public String getLevel() {
         return this.level;
     }
 
-	public void setLevel(String level) {
+    public void setLevel(String level) {
         this.level = level;
     }
 
-	public String getMessage() {
+    public String getMessage() {
         return this.message;
     }
 
-	public void setMessage(String message) {
+    public void setMessage(String message) {
         this.message = message;
     }
 
-	public Experiment getExperiment() {
+    public Experiment getExperiment() {
         return this.experiment;
     }
 
-	public void setExperiment(Experiment experiment) {
+    public void setExperiment(Experiment experiment) {
         this.experiment = experiment;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentFilterDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentFilterDTO.java
index 94ace067d..adb14ed6c 100755
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentFilterDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentFilterDTO.java
@@ -11,77 +11,70 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ExperimentFilterDTO {
-	
-	private Long experimentId;
-
-	private String experimentCode;
-	
-	private String experimentName;
 
-	private Collection<ValueTypeKindDTO> valueKinds = new HashSet<ValueTypeKindDTO>();
+    private Long experimentId;
 
+    private String experimentCode;
 
-	
+    private String experimentName;
 
-	
+    private Collection<ValueTypeKindDTO> valueKinds = new HashSet<ValueTypeKindDTO>();
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer().exclude("*.class").serialize(this);
     }
 
-	public static ExperimentFilterDTO fromJsonToExperimentFilterDTO(String json) {
+    public static ExperimentFilterDTO fromJsonToExperimentFilterDTO(String json) {
         return new JSONDeserializer<ExperimentFilterDTO>().use(null, ExperimentFilterDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ExperimentFilterDTO> collection) {
+    public static String toJsonArray(Collection<ExperimentFilterDTO> collection) {
         return new JSONSerializer().include("valueKinds").exclude("*.class").serialize(collection);
     }
-	
-	public static String toPrettyJsonArray(Collection<ExperimentFilterDTO> collection) {
+
+    public static String toPrettyJsonArray(Collection<ExperimentFilterDTO> collection) {
         return new JSONSerializer().include("valueKinds").exclude("*.class").prettyPrint(true).serialize(collection);
     }
 
-	public static Collection<ExperimentFilterDTO> fromJsonArrayToExperimentFilterDTO(String json) {
-        return new JSONDeserializer<List<ExperimentFilterDTO>>().use(null, ArrayList.class).use("values", ExperimentFilterDTO.class).deserialize(json);
+    public static Collection<ExperimentFilterDTO> fromJsonArrayToExperimentFilterDTO(String json) {
+        return new JSONDeserializer<List<ExperimentFilterDTO>>().use(null, ArrayList.class)
+                .use("values", ExperimentFilterDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public Long getExperimentId() {
+    public Long getExperimentId() {
         return this.experimentId;
     }
 
-	public void setExperimentId(Long experimentId) {
+    public void setExperimentId(Long experimentId) {
         this.experimentId = experimentId;
     }
 
-	public String getExperimentCode() {
+    public String getExperimentCode() {
         return this.experimentCode;
     }
 
-	public void setExperimentCode(String experimentCode) {
+    public void setExperimentCode(String experimentCode) {
         this.experimentCode = experimentCode;
     }
 
-	public String getExperimentName() {
+    public String getExperimentName() {
         return this.experimentName;
     }
 
-	public void setExperimentName(String experimentName) {
+    public void setExperimentName(String experimentName) {
         this.experimentName = experimentName;
     }
 
-	public Collection<ValueTypeKindDTO> getValueKinds() {
+    public Collection<ValueTypeKindDTO> getValueKinds() {
         return this.valueKinds;
     }
 
-	public void setValueKinds(Collection<ValueTypeKindDTO> valueKinds) {
+    public void setValueKinds(Collection<ValueTypeKindDTO> valueKinds) {
         this.valueKinds = valueKinds;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentFilterSearchDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentFilterSearchDTO.java
index e503d5af9..5708ecd41 100755
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentFilterSearchDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentFilterSearchDTO.java
@@ -9,133 +9,129 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ExperimentFilterSearchDTO {
-	
-	private String queryId;
 
-	private String termName;
+    private String queryId;
+
+    private String termName;
 
-	private Long experimentId;
+    private Long experimentId;
 
-	private String codeName;
-	
-	private String experimentCode;
+    private String codeName;
 
-	private String lsType;
+    private String experimentCode;
 
-	private String lsKind;
+    private String lsType;
 
-	private String operator;
+    private String lsKind;
 
-	private String filterValue;
+    private String operator;
 
+    private String filterValue;
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ExperimentFilterSearchDTO fromJsonToExperimentFilterSearchDTO(String json) {
+    public static ExperimentFilterSearchDTO fromJsonToExperimentFilterSearchDTO(String json) {
         return new JSONDeserializer<ExperimentFilterSearchDTO>()
-        .use(null, ExperimentFilterSearchDTO.class).deserialize(json);
+                .use(null, ExperimentFilterSearchDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ExperimentFilterSearchDTO> collection) {
+    public static String toJsonArray(Collection<ExperimentFilterSearchDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ExperimentFilterSearchDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<ExperimentFilterSearchDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ExperimentFilterSearchDTO> fromJsonArrayToExperimentFilterSearchDTO(String json) {
+    public static Collection<ExperimentFilterSearchDTO> fromJsonArrayToExperimentFilterSearchDTO(String json) {
         return new JSONDeserializer<List<ExperimentFilterSearchDTO>>()
-        .use("values", ExperimentFilterSearchDTO.class).deserialize(json);
+                .use("values", ExperimentFilterSearchDTO.class).deserialize(json);
     }
 
-	public String getQueryId() {
+    public String getQueryId() {
         return this.queryId;
     }
 
-	public void setQueryId(String queryId) {
+    public void setQueryId(String queryId) {
         this.queryId = queryId;
     }
 
-	public String getTermName() {
+    public String getTermName() {
         return this.termName;
     }
 
-	public void setTermName(String termName) {
+    public void setTermName(String termName) {
         this.termName = termName;
     }
 
-	public Long getExperimentId() {
+    public Long getExperimentId() {
         return this.experimentId;
     }
 
-	public void setExperimentId(Long experimentId) {
+    public void setExperimentId(Long experimentId) {
         this.experimentId = experimentId;
     }
 
-	public String getCodeName() {
+    public String getCodeName() {
         return this.codeName;
     }
 
-	public void setCodeName(String codeName) {
+    public void setCodeName(String codeName) {
         this.codeName = codeName;
     }
 
-	public String getExperimentCode() {
+    public String getExperimentCode() {
         return this.experimentCode;
     }
 
-	public void setExperimentCode(String experimentCode) {
+    public void setExperimentCode(String experimentCode) {
         this.experimentCode = experimentCode;
     }
 
-	public String getLsType() {
+    public String getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(String lsType) {
+    public void setLsType(String lsType) {
         this.lsType = lsType;
     }
 
-	public String getLsKind() {
+    public String getLsKind() {
         return this.lsKind;
     }
 
-	public void setLsKind(String lsKind) {
+    public void setLsKind(String lsKind) {
         this.lsKind = lsKind;
     }
 
-	public String getOperator() {
+    public String getOperator() {
         return this.operator;
     }
 
-	public void setOperator(String operator) {
+    public void setOperator(String operator) {
         this.operator = operator;
     }
 
-	public String getFilterValue() {
+    public String getFilterValue() {
         return this.filterValue;
     }
 
-	public void setFilterValue(String filterValue) {
+    public void setFilterValue(String filterValue) {
         this.filterValue = filterValue;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentGuiStubDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentGuiStubDTO.java
index 1713b6de3..e4f494b04 100755
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentGuiStubDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentGuiStubDTO.java
@@ -18,11 +18,10 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ExperimentGuiStubDTO {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(ExperimentGuiStubDTO.class);
-	
+
 	private Long experimentId;
 
 	private Long protocolId;
@@ -30,13 +29,13 @@ public class ExperimentGuiStubDTO {
 	private String protocolName;
 
 	private String code;
-	
+
 	private String name;
-	
+
 	private String lsType;
-	
+
 	private String lsKind;
-	
+
 	private String scientist;
 
 	private Date completionDate;
@@ -53,11 +52,10 @@ public class ExperimentGuiStubDTO {
 
 	private String longDescription;
 
-
-	public ExperimentGuiStubDTO(){
-		//empty constructor
+	public ExperimentGuiStubDTO() {
+		// empty constructor
 	}
-	
+
 	public ExperimentGuiStubDTO(Experiment experiment) {
 		// TODO Auto-generated constructor stub
 		this.experimentId = experiment.getId();
@@ -69,188 +67,191 @@ public ExperimentGuiStubDTO(Experiment experiment) {
 		this.name = Experiment.findExperiment(experiment.getId()).findPreferredName();
 		this.shortDescription = experiment.getShortDescription();
 
-		//get experiment meta data
+		// get experiment meta data
 		Set<ExperimentState> states = experiment.getLsStates();
-		for (ExperimentState state : states){
-			if (state.getLsType().equals("metadata") && state.getLsKind().equals("experiment metadata") && !state.isIgnored()){
+		for (ExperimentState state : states) {
+			if (state.getLsType().equals("metadata") && state.getLsKind().equals("experiment metadata")
+					&& !state.isIgnored()) {
 				Set<ExperimentValue> values = state.getLsValues();
-				for (ExperimentValue value : values){
-					if (value.getLsType().equals("codeValue") && value.getLsKind().equals("scientist") && !value.isIgnored()){
+				for (ExperimentValue value : values) {
+					if (value.getLsType().equals("codeValue") && value.getLsKind().equals("scientist")
+							&& !value.isIgnored()) {
 						this.scientist = value.getCodeValue();
-					} else if (value.getLsType().equals("dateValue") && value.getLsKind().equals("completion date") && !value.isIgnored()){
+					} else if (value.getLsType().equals("dateValue") && value.getLsKind().equals("completion date")
+							&& !value.isIgnored()) {
 						this.completionDate = value.getDateValue();
-					} else if (value.getLsType().equals("stringValue") && value.getLsKind().equals("status") && !value.isIgnored()){
+					} else if (value.getLsType().equals("stringValue") && value.getLsKind().equals("status")
+							&& !value.isIgnored()) {
 						this.status = value.getStringValue();
-					} else if (value.getLsType().equals("stringValue") && value.getLsKind().equals("analysis status") && !value.isIgnored()){
+					} else if (value.getLsType().equals("stringValue") && value.getLsKind().equals("analysis status")
+							&& !value.isIgnored()) {
 						this.analysisStatus = value.getStringValue();
-					} else if (value.getLsType().equals("stringValue") && value.getLsKind().equals("notebook") && !value.isIgnored()){
+					} else if (value.getLsType().equals("stringValue") && value.getLsKind().equals("notebook")
+							&& !value.isIgnored()) {
 						this.notebook = value.getStringValue();
-					} else if (value.getLsType().equals("stringValue") && value.getLsKind().equals("notebook page") && !value.isIgnored()){
+					} else if (value.getLsType().equals("stringValue") && value.getLsKind().equals("notebook page")
+							&& !value.isIgnored()) {
 						this.notebookPage = value.getStringValue();
-					} else if (value.getLsType().equals("clobValue") && value.getLsKind().equals("long description") && !value.isIgnored()){
+					} else if (value.getLsType().equals("clobValue") && value.getLsKind().equals("long description")
+							&& !value.isIgnored()) {
 						this.longDescription = value.getClobValue();
-					}				
+					}
 				}
 			}
 		}
 	}
 
-
-
-
 	public Long getExperimentId() {
-        return this.experimentId;
-    }
+		return this.experimentId;
+	}
 
 	public void setExperimentId(Long experimentId) {
-        this.experimentId = experimentId;
-    }
+		this.experimentId = experimentId;
+	}
 
 	public Long getProtocolId() {
-        return this.protocolId;
-    }
+		return this.protocolId;
+	}
 
 	public void setProtocolId(Long protocolId) {
-        this.protocolId = protocolId;
-    }
+		this.protocolId = protocolId;
+	}
 
 	public String getProtocolName() {
-        return this.protocolName;
-    }
+		return this.protocolName;
+	}
 
 	public void setProtocolName(String protocolName) {
-        this.protocolName = protocolName;
-    }
+		this.protocolName = protocolName;
+	}
 
 	public String getCode() {
-        return this.code;
-    }
+		return this.code;
+	}
 
 	public void setCode(String code) {
-        this.code = code;
-    }
+		this.code = code;
+	}
 
 	public String getName() {
-        return this.name;
-    }
+		return this.name;
+	}
 
 	public void setName(String name) {
-        this.name = name;
-    }
+		this.name = name;
+	}
 
 	public String getLsType() {
-        return this.lsType;
-    }
+		return this.lsType;
+	}
 
 	public void setLsType(String lsType) {
-        this.lsType = lsType;
-    }
+		this.lsType = lsType;
+	}
 
 	public String getLsKind() {
-        return this.lsKind;
-    }
+		return this.lsKind;
+	}
 
 	public void setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
+		this.lsKind = lsKind;
+	}
 
 	public String getScientist() {
-        return this.scientist;
-    }
+		return this.scientist;
+	}
 
 	public void setScientist(String scientist) {
-        this.scientist = scientist;
-    }
+		this.scientist = scientist;
+	}
 
 	public Date getCompletionDate() {
-        return this.completionDate;
-    }
+		return this.completionDate;
+	}
 
 	public void setCompletionDate(Date completionDate) {
-        this.completionDate = completionDate;
-    }
+		this.completionDate = completionDate;
+	}
 
 	public String getNotebook() {
-        return this.notebook;
-    }
+		return this.notebook;
+	}
 
 	public void setNotebook(String notebook) {
-        this.notebook = notebook;
-    }
+		this.notebook = notebook;
+	}
 
 	public String getNotebookPage() {
-        return this.notebookPage;
-    }
+		return this.notebookPage;
+	}
 
 	public void setNotebookPage(String notebookPage) {
-        this.notebookPage = notebookPage;
-    }
+		this.notebookPage = notebookPage;
+	}
 
 	public String getStatus() {
-        return this.status;
-    }
+		return this.status;
+	}
 
 	public void setStatus(String status) {
-        this.status = status;
-    }
+		this.status = status;
+	}
 
 	public String getAnalysisStatus() {
-        return this.analysisStatus;
-    }
+		return this.analysisStatus;
+	}
 
 	public void setAnalysisStatus(String analysisStatus) {
-        this.analysisStatus = analysisStatus;
-    }
+		this.analysisStatus = analysisStatus;
+	}
 
 	public String getShortDescription() {
-        return this.shortDescription;
-    }
+		return this.shortDescription;
+	}
 
 	public void setShortDescription(String shortDescription) {
-        this.shortDescription = shortDescription;
-    }
+		this.shortDescription = shortDescription;
+	}
 
 	public String getLongDescription() {
-        return this.longDescription;
-    }
+		return this.longDescription;
+	}
 
 	public void setLongDescription(String longDescription) {
-        this.longDescription = longDescription;
-    }
+		this.longDescription = longDescription;
+	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 
 	public String toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(this);
+	}
 
 	public String toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(this);
+	}
 
 	public static ExperimentGuiStubDTO fromJsonToExperimentGuiStubDTO(String json) {
-        return new JSONDeserializer<ExperimentGuiStubDTO>()
-        .use(null, ExperimentGuiStubDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<ExperimentGuiStubDTO>()
+				.use(null, ExperimentGuiStubDTO.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<ExperimentGuiStubDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<ExperimentGuiStubDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<ExperimentGuiStubDTO> fromJsonArrayToExperimentGuiStubDTO(String json) {
-        return new JSONDeserializer<List<ExperimentGuiStubDTO>>()
-        .use("values", ExperimentGuiStubDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<ExperimentGuiStubDTO>>()
+				.use("values", ExperimentGuiStubDTO.class).deserialize(json);
+	}
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentSearchRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentSearchRequestDTO.java
index 05ca13ce1..0bbd51de6 100755
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentSearchRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentSearchRequestDTO.java
@@ -12,101 +12,98 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 /**
-*
-* @model ExperimentSearchRequestDTO
-*
-*/
-
+ *
+ * @model ExperimentSearchRequestDTO
+ *
+ */
 
 public class ExperimentSearchRequestDTO {
 
-	/**
-	  * @property advancedFilter:string "example (Q1 and Q2) or (Q3 and Q4)"
-	  */
-	private String advancedFilter;
-	
-	private String advancedFilterSQL;
-	
-	private String booleanFilter;
+    /**
+     * @property advancedFilter:string "example (Q1 and Q2) or (Q3 and Q4)"
+     */
+    private String advancedFilter;
+
+    private String advancedFilterSQL;
+
+    private String booleanFilter;
 
-	private Set<ExperimentFilterSearchDTO> searchFilters = new HashSet<ExperimentFilterSearchDTO>();
+    private Set<ExperimentFilterSearchDTO> searchFilters = new HashSet<ExperimentFilterSearchDTO>();
 
-	private Set<String> batchCodeList = new HashSet<String>();
-	
-	private Set<String> experimentCodeList = new HashSet<String>();
-	
+    private Set<String> batchCodeList = new HashSet<String>();
 
-	public String toJson() {
-        return new JSONSerializer().include("searchFilters", "batchCodeList", "experimentCodeList").exclude("*.class").serialize(this);
+    private Set<String> experimentCodeList = new HashSet<String>();
+
+    public String toJson() {
+        return new JSONSerializer().include("searchFilters", "batchCodeList", "experimentCodeList").exclude("*.class")
+                .serialize(this);
     }
 
-	public static ExperimentSearchRequestDTO fromJsonToExperimentSearchRequestDTO(String json) {
-        return new JSONDeserializer<ExperimentSearchRequestDTO>().use(null, ExperimentSearchRequestDTO.class).deserialize(json);
+    public static ExperimentSearchRequestDTO fromJsonToExperimentSearchRequestDTO(String json) {
+        return new JSONDeserializer<ExperimentSearchRequestDTO>().use(null, ExperimentSearchRequestDTO.class)
+                .deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ExperimentSearchRequestDTO> collection) {
-        return new JSONSerializer().include("searchFilters", "batchCodeList", "experimentCodeList").exclude("*.class").serialize(collection);
+    public static String toJsonArray(Collection<ExperimentSearchRequestDTO> collection) {
+        return new JSONSerializer().include("searchFilters", "batchCodeList", "experimentCodeList").exclude("*.class")
+                .serialize(collection);
     }
 
-	public static Collection<ExperimentSearchRequestDTO> fromJsonArrayToExperimentSearchRequestDTO(String json) {
-        return new JSONDeserializer<List<ExperimentSearchRequestDTO>>().use(null, ArrayList.class).use("values", ExperimentSearchRequestDTO.class).deserialize(json);
+    public static Collection<ExperimentSearchRequestDTO> fromJsonArrayToExperimentSearchRequestDTO(String json) {
+        return new JSONDeserializer<List<ExperimentSearchRequestDTO>>().use(null, ArrayList.class)
+                .use("values", ExperimentSearchRequestDTO.class).deserialize(json);
     }
 
-	public String getAdvancedFilter() {
+    public String getAdvancedFilter() {
         return this.advancedFilter;
     }
 
-	public void setAdvancedFilter(String advancedFilter) {
+    public void setAdvancedFilter(String advancedFilter) {
         this.advancedFilter = advancedFilter;
     }
 
-	public String getAdvancedFilterSQL() {
+    public String getAdvancedFilterSQL() {
         return this.advancedFilterSQL;
     }
 
-	public void setAdvancedFilterSQL(String advancedFilterSQL) {
+    public void setAdvancedFilterSQL(String advancedFilterSQL) {
         this.advancedFilterSQL = advancedFilterSQL;
     }
 
-	public String getBooleanFilter() {
+    public String getBooleanFilter() {
         return this.booleanFilter;
     }
 
-	public void setBooleanFilter(String booleanFilter) {
+    public void setBooleanFilter(String booleanFilter) {
         this.booleanFilter = booleanFilter;
     }
 
-	public Set<ExperimentFilterSearchDTO> getSearchFilters() {
+    public Set<ExperimentFilterSearchDTO> getSearchFilters() {
         return this.searchFilters;
     }
 
-	public void setSearchFilters(Set<ExperimentFilterSearchDTO> searchFilters) {
+    public void setSearchFilters(Set<ExperimentFilterSearchDTO> searchFilters) {
         this.searchFilters = searchFilters;
     }
 
-	public Set<String> getBatchCodeList() {
+    public Set<String> getBatchCodeList() {
         return this.batchCodeList;
     }
 
-	public void setBatchCodeList(Set<String> batchCodeList) {
+    public void setBatchCodeList(Set<String> batchCodeList) {
         this.batchCodeList = batchCodeList;
     }
 
-	public Set<String> getExperimentCodeList() {
+    public Set<String> getExperimentCodeList() {
         return this.experimentCodeList;
     }
 
-	public void setExperimentCodeList(Set<String> experimentCodeList) {
+    public void setExperimentCodeList(Set<String> experimentCodeList) {
         this.experimentCodeList = experimentCodeList;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
-	
-
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentStatePathDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentStatePathDTO.java
index ec0a9c10c..e4b63db9b 100644
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentStatePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentStatePathDTO.java
@@ -12,73 +12,72 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ExperimentStatePathDTO {
 
-	public ExperimentStatePathDTO() {
-	}
+    public ExperimentStatePathDTO() {
+    }
+
+    private String idOrCodeName;
+
+    private String stateType;
 
-	private String idOrCodeName;
+    private String stateKind;
 
-	private String stateType;
-	
-	private String stateKind;
-	
-	private Collection<ExperimentState> states;
-	
-	public String toJson() {
-        return new JSONSerializer().include("states.lsValues").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+    private Collection<ExperimentState> states;
+
+    public String toJson() {
+        return new JSONSerializer().include("states.lsValues").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
-	
-	public static String toJsonArray(Collection<ExperimentStatePathDTO> collection) {
-        return new JSONSerializer().include("states.lsValues").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
+
+    public static String toJsonArray(Collection<ExperimentStatePathDTO> collection) {
+        return new JSONSerializer().include("states.lsValues").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
-	public String getIdOrCodeName() {
+    public String getIdOrCodeName() {
         return this.idOrCodeName;
     }
 
-	public void setIdOrCodeName(String idOrCodeName) {
+    public void setIdOrCodeName(String idOrCodeName) {
         this.idOrCodeName = idOrCodeName;
     }
 
-	public String getStateType() {
+    public String getStateType() {
         return this.stateType;
     }
 
-	public void setStateType(String stateType) {
+    public void setStateType(String stateType) {
         this.stateType = stateType;
     }
 
-	public String getStateKind() {
+    public String getStateKind() {
         return this.stateKind;
     }
 
-	public void setStateKind(String stateKind) {
+    public void setStateKind(String stateKind) {
         this.stateKind = stateKind;
     }
 
-	public Collection<ExperimentState> getStates() {
+    public Collection<ExperimentState> getStates() {
         return this.states;
     }
 
-	public void setStates(Collection<ExperimentState> states) {
+    public void setStates(Collection<ExperimentState> states) {
         this.states = states;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static ExperimentStatePathDTO fromJsonToExperimentStatePathDTO(String json) {
+    public static ExperimentStatePathDTO fromJsonToExperimentStatePathDTO(String json) {
         return new JSONDeserializer<ExperimentStatePathDTO>()
-        .use(null, ExperimentStatePathDTO.class).deserialize(json);
+                .use(null, ExperimentStatePathDTO.class).deserialize(json);
     }
 
-	public static Collection<ExperimentStatePathDTO> fromJsonArrayToExperimentStatePathDTO(String json) {
+    public static Collection<ExperimentStatePathDTO> fromJsonArrayToExperimentStatePathDTO(String json) {
         return new JSONDeserializer<List<ExperimentStatePathDTO>>()
-        .use("values", ExperimentStatePathDTO.class).deserialize(json);
+                .use("values", ExperimentStatePathDTO.class).deserialize(json);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/ExperimentValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/ExperimentValuePathDTO.java
index 4b0916348..739496c52 100644
--- a/src/main/java/com/labsynch/labseer/dto/ExperimentValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExperimentValuePathDTO.java
@@ -12,93 +12,92 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ExperimentValuePathDTO {
 
-	public ExperimentValuePathDTO() {
-	}
+    public ExperimentValuePathDTO() {
+    }
+
+    private String idOrCodeName;
+
+    private String stateType;
+
+    private String stateKind;
 
-	private String idOrCodeName;
+    private String valueType;
 
-	private String stateType;
-	
-	private String stateKind;
-	
-	private String valueType;
-	
-	private String valueKind;
-	
-	private Collection<ExperimentValue> values;
-	
-	public String toJson() {
-        return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+    private String valueKind;
+
+    private Collection<ExperimentValue> values;
+
+    public String toJson() {
+        return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
-	
-	public static String toJsonArray(Collection<ExperimentValuePathDTO> collection) {
-        return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
+
+    public static String toJsonArray(Collection<ExperimentValuePathDTO> collection) {
+        return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static ExperimentValuePathDTO fromJsonToExperimentValuePathDTO(String json) {
+    public static ExperimentValuePathDTO fromJsonToExperimentValuePathDTO(String json) {
         return new JSONDeserializer<ExperimentValuePathDTO>()
-        .use(null, ExperimentValuePathDTO.class).deserialize(json);
+                .use(null, ExperimentValuePathDTO.class).deserialize(json);
     }
 
-	public static Collection<ExperimentValuePathDTO> fromJsonArrayToExperimentValuePathDTO(String json) {
+    public static Collection<ExperimentValuePathDTO> fromJsonArrayToExperimentValuePathDTO(String json) {
         return new JSONDeserializer<List<ExperimentValuePathDTO>>()
-        .use("values", ExperimentValuePathDTO.class).deserialize(json);
+                .use("values", ExperimentValuePathDTO.class).deserialize(json);
     }
 
-	public String getIdOrCodeName() {
+    public String getIdOrCodeName() {
         return this.idOrCodeName;
     }
 
-	public void setIdOrCodeName(String idOrCodeName) {
+    public void setIdOrCodeName(String idOrCodeName) {
         this.idOrCodeName = idOrCodeName;
     }
 
-	public String getStateType() {
+    public String getStateType() {
         return this.stateType;
     }
 
-	public void setStateType(String stateType) {
+    public void setStateType(String stateType) {
         this.stateType = stateType;
     }
 
-	public String getStateKind() {
+    public String getStateKind() {
         return this.stateKind;
     }
 
-	public void setStateKind(String stateKind) {
+    public void setStateKind(String stateKind) {
         this.stateKind = stateKind;
     }
 
-	public String getValueType() {
+    public String getValueType() {
         return this.valueType;
     }
 
-	public void setValueType(String valueType) {
+    public void setValueType(String valueType) {
         this.valueType = valueType;
     }
 
-	public String getValueKind() {
+    public String getValueKind() {
         return this.valueKind;
     }
 
-	public void setValueKind(String valueKind) {
+    public void setValueKind(String valueKind) {
         this.valueKind = valueKind;
     }
 
-	public Collection<ExperimentValue> getValues() {
+    public Collection<ExperimentValue> getValues() {
         return this.values;
     }
 
-	public void setValues(Collection<ExperimentValue> values) {
+    public void setValues(Collection<ExperimentValue> values) {
         this.values = values;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/ExportResultDTO.java b/src/main/java/com/labsynch/labseer/dto/ExportResultDTO.java
index a1ae3fced..e3e96cd81 100644
--- a/src/main/java/com/labsynch/labseer/dto/ExportResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ExportResultDTO.java
@@ -11,84 +11,82 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ExportResultDTO {
 
     private String summary;
-    
+
     private String level;
-    
+
     private String message;
-    
+
     private String reportFilePath;
-    
-    public ExportResultDTO(){
-    	
+
+    public ExportResultDTO() {
+
     }
-    
-    public ExportResultDTO(String summary, String reportFilePath){
-    	this.summary = summary;
-    	this.reportFilePath = reportFilePath;
+
+    public ExportResultDTO(String summary, String reportFilePath) {
+        this.summary = summary;
+        this.reportFilePath = reportFilePath;
     }
-    
+
     public String toJson() {
         return new JSONSerializer().exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
     }
-    
 
-	public static ExportResultDTO fromJsonToExportResultDTO(String json) {
+    public static ExportResultDTO fromJsonToExportResultDTO(String json) {
         return new JSONDeserializer<ExportResultDTO>()
-        .use(null, ExportResultDTO.class).deserialize(json);
+                .use(null, ExportResultDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ExportResultDTO> collection) {
+    public static String toJsonArray(Collection<ExportResultDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ExportResultDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<ExportResultDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ExportResultDTO> fromJsonArrayToExpoes(String json) {
+    public static Collection<ExportResultDTO> fromJsonArrayToExpoes(String json) {
         return new JSONDeserializer<List<ExportResultDTO>>()
-        .use("values", ExportResultDTO.class).deserialize(json);
+                .use("values", ExportResultDTO.class).deserialize(json);
     }
 
-	public String getSummary() {
+    public String getSummary() {
         return this.summary;
     }
 
-	public void setSummary(String summary) {
+    public void setSummary(String summary) {
         this.summary = summary;
     }
 
-	public String getLevel() {
+    public String getLevel() {
         return this.level;
     }
 
-	public void setLevel(String level) {
+    public void setLevel(String level) {
         this.level = level;
     }
 
-	public String getMessage() {
+    public String getMessage() {
         return this.message;
     }
 
-	public void setMessage(String message) {
+    public void setMessage(String message) {
         this.message = message;
     }
 
-	public String getReportFilePath() {
+    public String getReportFilePath() {
         return this.reportFilePath;
     }
 
-	public void setReportFilePath(String reportFilePath) {
+    public void setReportFilePath(String reportFilePath) {
         this.reportFilePath = reportFilePath;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/FileSaveReturnArrayDTO.java b/src/main/java/com/labsynch/labseer/dto/FileSaveReturnArrayDTO.java
index 4c7246cbc..8c8b2e502 100755
--- a/src/main/java/com/labsynch/labseer/dto/FileSaveReturnArrayDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/FileSaveReturnArrayDTO.java
@@ -10,42 +10,40 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+public class FileSaveReturnArrayDTO {
 
-public class FileSaveReturnArrayDTO{
-			 
-	private List<FileSaveReturnDTO> returnFileList = new ArrayList<FileSaveReturnDTO>();
+    private List<FileSaveReturnDTO> returnFileList = new ArrayList<FileSaveReturnDTO>();
 
-
-
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer().exclude("*.class")
-        		.exclude("returnFileList.file")
-        		.serialize(this);
+                .exclude("returnFileList.file")
+                .serialize(this);
     }
 
-	public static FileSaveReturnArrayDTO fromJsonToFileSaveReturnArrayDTO(String json) {
+    public static FileSaveReturnArrayDTO fromJsonToFileSaveReturnArrayDTO(String json) {
         return new JSONDeserializer<FileSaveReturnArrayDTO>().use(null, FileSaveReturnArrayDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<FileSaveReturnArrayDTO> collection) {
+    public static String toJsonArray(Collection<FileSaveReturnArrayDTO> collection) {
         return new JSONSerializer().exclude("*.class")
-        		.exclude("returnFileList.file")
-        		.serialize(collection);
+                .exclude("returnFileList.file")
+                .serialize(collection);
     }
 
-	public static Collection<FileSaveReturnArrayDTO> fromJsonArrayToFileSaveReturnArrayDTO(String json) {
-        return new JSONDeserializer<List<FileSaveReturnArrayDTO>>().use(null, ArrayList.class).use("values", FileSaveReturnArrayDTO.class).deserialize(json);
+    public static Collection<FileSaveReturnArrayDTO> fromJsonArrayToFileSaveReturnArrayDTO(String json) {
+        return new JSONDeserializer<List<FileSaveReturnArrayDTO>>().use(null, ArrayList.class)
+                .use("values", FileSaveReturnArrayDTO.class).deserialize(json);
     }
 
-	public List<FileSaveReturnDTO> getReturnFileList() {
+    public List<FileSaveReturnDTO> getReturnFileList() {
         return this.returnFileList;
     }
 
-	public void setReturnFileList(List<FileSaveReturnDTO> returnFileList) {
+    public void setReturnFileList(List<FileSaveReturnDTO> returnFileList) {
         this.returnFileList = returnFileList;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/FileSaveReturnDTO.java b/src/main/java/com/labsynch/labseer/dto/FileSaveReturnDTO.java
index c9ca47390..5e7f23d48 100755
--- a/src/main/java/com/labsynch/labseer/dto/FileSaveReturnDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/FileSaveReturnDTO.java
@@ -20,11 +20,9 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+public class FileSaveReturnDTO {
 
-public class FileSaveReturnDTO{
-			 
-
-	private static final Logger logger = LoggerFactory.getLogger(FileSaveReturnDTO.class);
+    private static final Logger logger = LoggerFactory.getLogger(FileSaveReturnDTO.class);
 
     private String name;
 
@@ -40,149 +38,149 @@ public class FileSaveReturnDTO{
 
     private Boolean ie;
 
-    private String subdir; // added 
-    
-    @Transient 
-    private MultipartFile file; // added 
+    private String subdir; // added
 
+    @Transient
+    private MultipartFile file; // added
 
-    public MultipartFile getFile() { 
-        return file; 
-    } 
+    public MultipartFile getFile() {
+        return file;
+    }
 
-       // save file to disk ,save filename , file size to database  
-    public void saveFile(MultipartFile file) { 
+    // save file to disk ,save filename , file size to database
+    public void saveFile(MultipartFile file) {
 
-        try { 
-            InputStream in = file.getInputStream(); 
-            String rootSavePath = "/Applications/MAMP/htdocs/imageFolder/"; 
+        try {
+            InputStream in = file.getInputStream();
+            String rootSavePath = "/Applications/MAMP/htdocs/imageFolder/";
             logger.debug(rootSavePath);
-            String savePath = rootSavePath + this.getSubdir() +  File.separator ;
+            String savePath = rootSavePath + this.getSubdir() + File.separator;
             logger.debug(savePath);
 
-            String saveFileName = savePath + this.getName();            
+            String saveFileName = savePath + this.getName();
             logger.debug(saveFileName);
 
             boolean createdDir = new File(savePath).mkdirs();
-            if (createdDir){
-            	logger.debug("new directory created " + savePath);
+            if (createdDir) {
+                logger.debug("new directory created " + savePath);
             }
-            logger.debug(" Saving file: " + this.name + " to  " + saveFileName); 
-            String urlString = "http://localhost:8888/imageFolder/" + this.getSubdir() + File.separator + this.getName();
+            logger.debug(" Saving file: " + this.name + " to  " + saveFileName);
+            String urlString = "http://localhost:8888/imageFolder/" + this.getSubdir() + File.separator
+                    + this.getName();
             logger.debug("url string " + urlString);
 
-            FileOutputStream f = new FileOutputStream(saveFileName); 
+            FileOutputStream f = new FileOutputStream(saveFileName);
+
+            int ch = 0;
+            while ((ch = in.read()) != -1) {
+                f.write(ch);
+            }
+            f.flush();
+            f.close();
 
-            int ch = 0; 
-            while ((ch = in.read()) != -1) { 
-                f.write(ch); 
-            } 
-            f.flush(); 
-            f.close(); 
-       
             this.setUploaded(true);
             this.setUrl(urlString);
-            
-        } catch (FileNotFoundException e) { 
-            // TODO Auto-generated catch block 
-            e.printStackTrace(); 
-        } catch (IOException e) { 
-            // TODO Auto-generated catch block 
-            e.printStackTrace(); 
-        } 
 
-    } 
+        } catch (FileNotFoundException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
 
+    }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer().exclude("*.class")
-        		.exclude("file")
-        		.serialize(this);
+                .exclude("file")
+                .serialize(this);
     }
 
-	public static FileSaveReturnDTO fromJsonToFileSaveReturnDTO(String json) {
+    public static FileSaveReturnDTO fromJsonToFileSaveReturnDTO(String json) {
         return new JSONDeserializer<FileSaveReturnDTO>().use(null, FileSaveReturnDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<FileSaveReturnDTO> collection) {
+    public static String toJsonArray(Collection<FileSaveReturnDTO> collection) {
         return new JSONSerializer().exclude("*.class")
-        		.exclude("file")
-        		.serialize(collection);
+                .exclude("file")
+                .serialize(collection);
     }
 
-	public static Collection<FileSaveReturnDTO> fromJsonArrayToFileSaveReturnDTO(String json) {
-        return new JSONDeserializer<List<FileSaveReturnDTO>>().use(null, ArrayList.class).use("values", FileSaveReturnDTO.class).deserialize(json);
+    public static Collection<FileSaveReturnDTO> fromJsonArrayToFileSaveReturnDTO(String json) {
+        return new JSONDeserializer<List<FileSaveReturnDTO>>().use(null, ArrayList.class)
+                .use("values", FileSaveReturnDTO.class).deserialize(json);
     }
 
-	public String getName() {
+    public String getName() {
         return this.name;
     }
 
-	public void setName(String name) {
+    public void setName(String name) {
         this.name = name;
     }
 
-	public long getSize() {
+    public long getSize() {
         return this.size;
     }
 
-	public void setSize(long size) {
+    public void setSize(long size) {
         this.size = size;
     }
 
-	public String getType() {
+    public String getType() {
         return this.type;
     }
 
-	public void setType(String type) {
+    public void setType(String type) {
         this.type = type;
     }
 
-	public String getUrl() {
+    public String getUrl() {
         return this.url;
     }
 
-	public void setUrl(String url) {
+    public void setUrl(String url) {
         this.url = url;
     }
 
-	public String getDescription() {
+    public String getDescription() {
         return this.description;
     }
 
-	public void setDescription(String description) {
+    public void setDescription(String description) {
         this.description = description;
     }
 
-	public Boolean getUploaded() {
+    public Boolean getUploaded() {
         return this.uploaded;
     }
 
-	public void setUploaded(Boolean uploaded) {
+    public void setUploaded(Boolean uploaded) {
         this.uploaded = uploaded;
     }
 
-	public Boolean getIe() {
+    public Boolean getIe() {
         return this.ie;
     }
 
-	public void setIe(Boolean ie) {
+    public void setIe(Boolean ie) {
         this.ie = ie;
     }
 
-	public String getSubdir() {
+    public String getSubdir() {
         return this.subdir;
     }
 
-	public void setSubdir(String subdir) {
+    public void setSubdir(String subdir) {
         this.subdir = subdir;
     }
 
-	public void setFile(MultipartFile file) {
+    public void setFile(MultipartFile file) {
         this.file = file;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/FileSaveSendDTO.java b/src/main/java/com/labsynch/labseer/dto/FileSaveSendDTO.java
index be5823dd7..997836817 100755
--- a/src/main/java/com/labsynch/labseer/dto/FileSaveSendDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/FileSaveSendDTO.java
@@ -28,30 +28,28 @@
 
 @Configurable
 
-public class FileSaveSendDTO{
-
+public class FileSaveSendDTO {
 
 	private static final Logger logger = LoggerFactory.getLogger(FileSaveSendDTO.class);
 
-
 	private Boolean ie;
 
-	private String subdir; // added 
+	private String subdir; // added
 
 	private List<String> description = new ArrayList<String>();
 
-	@Transient 
+	@Transient
 	private List<MultipartFile> file = new ArrayList<MultipartFile>();
 
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
 
-	public List<MultipartFile> getFile() { 
-		return file; 
-	} 
+	public List<MultipartFile> getFile() {
+		return file;
+	}
 
-	// save file to disk, save filename , file size to database  
-	public List<FileSaveReturnDTO> saveFile() { 
+	// save file to disk, save filename , file size to database
+	public List<FileSaveReturnDTO> saveFile() {
 
 		List<MultipartFile> fileList = this.file;
 
@@ -60,29 +58,29 @@ public List<FileSaveReturnDTO> saveFile() {
 		List<FileSaveReturnDTO> fileSaveArray = new ArrayList<FileSaveReturnDTO>();
 
 		logger.debug("FileSaveSendDTO: Number of files to save: " + fileList.size());
-		for (int i = 0; i < fileList.size(); i++){
-			logger.debug("current file number: " + i); 
+		for (int i = 0; i < fileList.size(); i++) {
+			logger.debug("current file number: " + i);
 			MultipartFile file = fileList.get(i);
 			logger.debug("is the file empty: " + file.isEmpty());
 
-			if (!file.isEmpty()){
+			if (!file.isEmpty()) {
 				String description = descriptionList.get(i);
 				FileSaveReturnDTO fileSaveReturn = new FileSaveReturnDTO();
-				try { 
-					InputStream in = file.getInputStream(); 
-					String rootSavePath = propertiesUtilService.getNotebookSavePath(); 
+				try {
+					InputStream in = file.getInputStream();
+					String rootSavePath = propertiesUtilService.getNotebookSavePath();
 					logger.debug(rootSavePath);
-					String savePath = rootSavePath + this.getSubdir() +  File.separator ;
+					String savePath = rootSavePath + this.getSubdir() + File.separator;
 					logger.debug(savePath);
-					String saveFileName = savePath + file.getOriginalFilename();            
+					String saveFileName = savePath + file.getOriginalFilename();
 					logger.debug(saveFileName);
 					boolean createdDir = new File(savePath).mkdirs();
-					if (createdDir){
+					if (createdDir) {
 						logger.debug("new directory created " + savePath);
 					} else {
 						logger.error("unable to create the directory " + savePath);
 					}
-					logger.debug(" Saving file: " + file.getOriginalFilename() + " to  " + saveFileName); 
+					logger.debug(" Saving file: " + file.getOriginalFilename() + " to  " + saveFileName);
 
 					// URL encode the file name
 					String charset = "UTF-8";
@@ -90,21 +88,20 @@ public List<FileSaveReturnDTO> saveFile() {
 
 					logger.debug("url string " + urlString);
 
-					FileOutputStream f = new FileOutputStream(saveFileName); 
-
-					int ch = 0; 
-					while ((ch = in.read()) != -1) { 
-						f.write(ch); 
-					} 
-					f.flush(); 
-					f.close();   
+					FileOutputStream f = new FileOutputStream(saveFileName);
 
+					int ch = 0;
+					while ((ch = in.read()) != -1) {
+						f.write(ch);
+					}
+					f.flush();
+					f.close();
 
 					String contentType = null;
 					contentType = MimeTypeUtil.getContentTypeFromExtension(file.getOriginalFilename());
-					if (contentType==null){
-//						logger.debug("content type was null -- try to get it from the file itself");
-//						contentType = file.getContentType();
+					if (contentType == null) {
+						// logger.debug("content type was null -- try to get it from the file itself");
+						// contentType = file.getContentType();
 						logger.debug("unknown content type -- set to default binary type");
 						contentType = MimeTypeUtil.getContentTypeFromExtension("fileName.defaultbin");
 
@@ -119,94 +116,92 @@ public List<FileSaveReturnDTO> saveFile() {
 					fileSaveReturn.setIe(this.getIe());
 					fileSaveReturn.setSubdir(this.getSubdir());
 
-					logger.debug("Ready to save the file " + fileSaveReturn.getType() + "  " + fileSaveReturn.getName() + " " + fileSaveReturn.getUrl());
+					logger.debug("Ready to save the file " + fileSaveReturn.getType() + "  " + fileSaveReturn.getName()
+							+ " " + fileSaveReturn.getUrl());
 
 					fileSaveArray.add(fileSaveReturn);
 
-				} catch (FileNotFoundException e) { 
-					// TODO Auto-generated catch block 
-					e.printStackTrace(); 
-				} catch (IOException e) { 
-					// TODO Auto-generated catch block 
-					e.printStackTrace(); 
-				}     			
+				} catch (FileNotFoundException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				} catch (IOException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 			}
 		}
 
-
 		return fileSaveArray;
 
 	}
-	
 
-	
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 
 	public String toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(this);
+	}
 
 	public String toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(this);
+	}
 
 	public static FileSaveSendDTO fromJsonToFileSaveSendDTO(String json) {
-        return new JSONDeserializer<FileSaveSendDTO>()
-        .use(null, FileSaveSendDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<FileSaveSendDTO>()
+				.use(null, FileSaveSendDTO.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<FileSaveSendDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<FileSaveSendDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<FileSaveSendDTO> fromJsonArrayToFileSaveSendDTO(String json) {
-        return new JSONDeserializer<List<FileSaveSendDTO>>()
-        .use("values", FileSaveSendDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<FileSaveSendDTO>>()
+				.use("values", FileSaveSendDTO.class).deserialize(json);
+	}
 
 	public Boolean getIe() {
-        return this.ie;
-    }
+		return this.ie;
+	}
 
 	public void setIe(Boolean ie) {
-        this.ie = ie;
-    }
+		this.ie = ie;
+	}
 
 	public String getSubdir() {
-        return this.subdir;
-    }
+		return this.subdir;
+	}
 
 	public void setSubdir(String subdir) {
-        this.subdir = subdir;
-    }
+		this.subdir = subdir;
+	}
 
 	public List<String> getDescription() {
-        return this.description;
-    }
+		return this.description;
+	}
 
 	public void setDescription(List<String> description) {
-        this.description = description;
-    }
+		this.description = description;
+	}
 
 	public void setFile(List<MultipartFile> file) {
-        this.file = file;
-    }
+		this.file = file;
+	}
 
 	public PropertiesUtilService getPropertiesUtilService() {
-        return this.propertiesUtilService;
-    }
+		return this.propertiesUtilService;
+	}
 
 	public void setPropertiesUtilService(PropertiesUtilService propertiesUtilService) {
-        this.propertiesUtilService = propertiesUtilService;
-    }
+		this.propertiesUtilService = propertiesUtilService;
+	}
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/FlagWellDTO.java b/src/main/java/com/labsynch/labseer/dto/FlagWellDTO.java
index 750d99089..8405ac383 100644
--- a/src/main/java/com/labsynch/labseer/dto/FlagWellDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/FlagWellDTO.java
@@ -31,11 +31,10 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class FlagWellDTO {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(FlagWellDTO.class);
-	
+
 	private Long responseSubjectValueId;
 	private String recordedBy;
 	private Long lsTransaction;
@@ -51,12 +50,13 @@ public class FlagWellDTO {
 	private String userFlagObservation;
 	private String userFlagCause;
 	private String userFlagComment;
-	
-	public FlagWellDTO(){
-		//empty constructor
+
+	public FlagWellDTO() {
+		// empty constructor
 	}
-	
-	public FlagWellDTO(Long responseSubjectValueId, String recordedBy, Long lsTransaction, Map<String, String> flagMap) {
+
+	public FlagWellDTO(Long responseSubjectValueId, String recordedBy, Long lsTransaction,
+			Map<String, String> flagMap) {
 		this.responseSubjectValueId = responseSubjectValueId;
 		this.recordedBy = recordedBy;
 		this.lsTransaction = lsTransaction;
@@ -74,7 +74,7 @@ public FlagWellDTO(Long responseSubjectValueId, String recordedBy, Long lsTransa
 		this.userFlagComment = flagMap.get("userFlagComment");
 	}
 
-	public static String[] getColumns(){
+	public static String[] getColumns() {
 		String[] headerColumns = new String[] {
 				"responseSubjectValueId",
 				"recordedBy",
@@ -91,14 +91,14 @@ public static String[] getColumns(){
 				"userFlagObservation",
 				"userFlagCause",
 				"userFlagComment"
-				};
+		};
 
 		return headerColumns;
 
 	}
 
 	public static CellProcessor[] getProcessors() {
-		final CellProcessor[] processors = new CellProcessor[] { 
+		final CellProcessor[] processors = new CellProcessor[] {
 				new Optional(),
 				new Optional(),
 				new Optional(),
@@ -120,125 +120,148 @@ public static CellProcessor[] getProcessors() {
 	}
 
 	@Transactional
-	public static void updateWellFlags( Collection<FlagWellDTO> flagWellDTOs) {
+	public static void updateWellFlags(Collection<FlagWellDTO> flagWellDTOs) {
 		Collection<TreatmentGroup> allTreatmentGroups = new HashSet<TreatmentGroup>();
 		String recordedBy = null;
 		Long lsTransaction = null;
 		for (FlagWellDTO flagWellDTO : flagWellDTOs) {
-			if (flagWellDTO.getResponseSubjectValueId() == null) logger.error("FIELD MISSING: responseSubjectValueId");
-			if (flagWellDTO.getRecordedBy() == null) logger.error("FIELD MISSING: recordedBy");
+			if (flagWellDTO.getResponseSubjectValueId() == null)
+				logger.error("FIELD MISSING: responseSubjectValueId");
+			if (flagWellDTO.getRecordedBy() == null)
+				logger.error("FIELD MISSING: recordedBy");
 			recordedBy = flagWellDTO.getRecordedBy();
 			lsTransaction = flagWellDTO.getLsTransaction();
 			Subject subject = findSubject(flagWellDTO.getResponseSubjectValueId());
 			Collection<TreatmentGroup> treatmentGroups = subject.getTreatmentGroups();
 			allTreatmentGroups.addAll(treatmentGroups);
-			if ( !(flagWellDTO.getAlgorithmFlagStatus()==null) || !(flagWellDTO.getAlgorithmFlagObservation()==null) || !(flagWellDTO.getAlgorithmFlagCause()==null) || !(flagWellDTO.getAlgorithmFlagComment()==null)) {
+			if (!(flagWellDTO.getAlgorithmFlagStatus() == null) || !(flagWellDTO.getAlgorithmFlagObservation() == null)
+					|| !(flagWellDTO.getAlgorithmFlagCause() == null)
+					|| !(flagWellDTO.getAlgorithmFlagComment() == null)) {
 				logger.debug("Change in algorithm flags detected. Attempting to ignore old state.");
 				try {
 					SubjectState oldAlgorithmFlagState = findAlgorithmFlagState(subject).getSingleResult();
 					oldAlgorithmFlagState.setIgnored(true);
 					oldAlgorithmFlagState.merge();
-//					oldAlgorithmFlagState.flush();
+					// oldAlgorithmFlagState.flush();
 					logger.debug("Old algorithm flag state ignored.");
-				}catch(NoResultException e) {
-					logger.debug("Old state of typekind data/auto flag not found for Subject " + subject.getCodeName() + " , creating new one");
+				} catch (NoResultException e) {
+					logger.debug("Old state of typekind data/auto flag not found for Subject " + subject.getCodeName()
+							+ " , creating new one");
 				}
-				SubjectState newAlgorithmState = createWellFlagState(subject.getId(), "data", "auto flag", recordedBy, lsTransaction);
+				SubjectState newAlgorithmState = createWellFlagState(subject.getId(), "data", "auto flag", recordedBy,
+						lsTransaction);
 				saveWellFlags(newAlgorithmState, flagWellDTO);
 			}
-			if ( !(flagWellDTO.getPreprocessFlagStatus()==null) || !(flagWellDTO.getPreprocessFlagObservation()==null) || !(flagWellDTO.getPreprocessFlagCause()==null) || !(flagWellDTO.getPreprocessFlagComment()==null)) {
+			if (!(flagWellDTO.getPreprocessFlagStatus() == null)
+					|| !(flagWellDTO.getPreprocessFlagObservation() == null)
+					|| !(flagWellDTO.getPreprocessFlagCause() == null)
+					|| !(flagWellDTO.getPreprocessFlagComment() == null)) {
 				logger.debug("Change in preprocess flags detected. Attempting to ignore old state.");
 				try {
 					SubjectState oldPreprocessFlagState = findPreprocessFlagState(subject).getSingleResult();
 					oldPreprocessFlagState.setIgnored(true);
 					oldPreprocessFlagState.merge();
-//					oldPreprocessFlagState.flush();
+					// oldPreprocessFlagState.flush();
 					logger.debug("Old preprocess flag state ignored.");
-				}catch(NoResultException e) {
-					logger.debug("Old state of typekind data/preprocess flag not found for Subject " + subject.getCodeName() + " , creating new one");
+				} catch (NoResultException e) {
+					logger.debug("Old state of typekind data/preprocess flag not found for Subject "
+							+ subject.getCodeName() + " , creating new one");
 				}
-				SubjectState newPreprocessState = createWellFlagState(subject.getId(), "data", "preprocess flag", recordedBy, lsTransaction);
+				SubjectState newPreprocessState = createWellFlagState(subject.getId(), "data", "preprocess flag",
+						recordedBy, lsTransaction);
 				saveWellFlags(newPreprocessState, flagWellDTO);
 			}
-			if ( !(flagWellDTO.getUserFlagStatus()==null) || !(flagWellDTO.getUserFlagObservation()==null) || !(flagWellDTO.getUserFlagCause()==null) || !(flagWellDTO.getUserFlagComment()==null)) {
+			if (!(flagWellDTO.getUserFlagStatus() == null) || !(flagWellDTO.getUserFlagObservation() == null)
+					|| !(flagWellDTO.getUserFlagCause() == null) || !(flagWellDTO.getUserFlagComment() == null)) {
 				logger.debug("Change in user flags detected. Attempting to ignore old state.");
 				try {
 					SubjectState oldUserFlagState = findUserFlagState(subject).getSingleResult();
 					oldUserFlagState.setIgnored(true);
 					oldUserFlagState.merge();
-//					oldUserFlagState.flush();
+					// oldUserFlagState.flush();
 					logger.debug("Old user flag state ignored.");
-				}catch(NoResultException e) {
-					logger.debug("Old state of typekind data/user flag not found for Subject " + subject.getCodeName() + " , creating new one");
+				} catch (NoResultException e) {
+					logger.debug("Old state of typekind data/user flag not found for Subject " + subject.getCodeName()
+							+ " , creating new one");
 				}
-				SubjectState newUserState = createWellFlagState(subject.getId(), "data", "user flag", recordedBy, lsTransaction);
+				SubjectState newUserState = createWellFlagState(subject.getId(), "data", "user flag", recordedBy,
+						lsTransaction);
 				saveWellFlags(newUserState, flagWellDTO);
 			}
 		}
-		//Then go update all of the aggregate values in the treatment groups
-		for (TreatmentGroup treatmentGroup: allTreatmentGroups){
-				Collection<SubjectValue> notKONumericValueSubjectValues = findNotKONumericValueSubjectValues(treatmentGroup);
-				Map<String, Collection<SubjectValue>> numericSubjectValueMapByLsKind = new HashMap<String, Collection<SubjectValue>>();
-				for (SubjectValue subjectValue : notKONumericValueSubjectValues){
-					String lsKind = subjectValue.getLsKind();
-					if (!numericSubjectValueMapByLsKind.containsKey(lsKind)){
-						Collection<SubjectValue> collection = new HashSet<SubjectValue>();
-						collection.add(subjectValue);
-						numericSubjectValueMapByLsKind.put(lsKind, collection);
-					} else{
-						Collection<SubjectValue> collection = numericSubjectValueMapByLsKind.get(lsKind);
-						collection.add(subjectValue);
-					}
-				}
-				try {
-					TreatmentGroupState oldState = TreatmentGroupState.findTreatmentGroupStatesByTreatmentGroupIDAndStateTypeKind(treatmentGroup.getId(), "data", "results").getSingleResult();
-					oldState.setIgnored(true);
-					oldState.merge();
-//					oldState.flush();
-					logger.debug("Old TreatmentGroupState ignored.");
-				}catch(NoResultException e){
-					logger.debug("No state data/results found. Creating a new state.");
+		// Then go update all of the aggregate values in the treatment groups
+		for (TreatmentGroup treatmentGroup : allTreatmentGroups) {
+			Collection<SubjectValue> notKONumericValueSubjectValues = findNotKONumericValueSubjectValues(
+					treatmentGroup);
+			Map<String, Collection<SubjectValue>> numericSubjectValueMapByLsKind = new HashMap<String, Collection<SubjectValue>>();
+			for (SubjectValue subjectValue : notKONumericValueSubjectValues) {
+				String lsKind = subjectValue.getLsKind();
+				if (!numericSubjectValueMapByLsKind.containsKey(lsKind)) {
+					Collection<SubjectValue> collection = new HashSet<SubjectValue>();
+					collection.add(subjectValue);
+					numericSubjectValueMapByLsKind.put(lsKind, collection);
+				} else {
+					Collection<SubjectValue> collection = numericSubjectValueMapByLsKind.get(lsKind);
+					collection.add(subjectValue);
 				}
-				TreatmentGroupState newState = createResultsTreatmentGroupState(treatmentGroup.getId(), "data", "results", recordedBy, lsTransaction);
-				//fill in the batch code, using the batch code from one of the subjects (they are all the same under a treatmentGroup)
-				SubjectValue batchCodeSubjectValue = findBatchCodeSubjectValue(treatmentGroup);
-				if (batchCodeSubjectValue == null) logger.error("Unable to find batch code subject value for treatmentgroup: " + treatmentGroup.getCodeName());
-				TreatmentGroupValue newBatchCodeTreatmentGroupValue = createTreatmentGroupValue(newState, batchCodeSubjectValue.getLsType(), batchCodeSubjectValue.getLsKind(), recordedBy, lsTransaction);
-				newBatchCodeTreatmentGroupValue.setCodeValue(batchCodeSubjectValue.getCodeValue());
-				newBatchCodeTreatmentGroupValue.setConcentration(batchCodeSubjectValue.getConcentration());
-				newBatchCodeTreatmentGroupValue.setConcUnit(batchCodeSubjectValue.getConcUnit());
-				newBatchCodeTreatmentGroupValue.setCodeType(batchCodeSubjectValue.getCodeType());
-				newBatchCodeTreatmentGroupValue.setCodeKind(batchCodeSubjectValue.getCodeKind());
-				newBatchCodeTreatmentGroupValue.setCodeTypeAndKind(batchCodeSubjectValue.getCodeTypeAndKind());
-				newBatchCodeTreatmentGroupValue.merge();
-				//calculate a new averaged treatmentGroupValue for each lsKind of numericValue found in the not knocked out subjects
-				for (String key : numericSubjectValueMapByLsKind.keySet()){
-					String lsType = "numericValue";
-					String lsKind = key;
-					Collection<SubjectValue> subjectValues = numericSubjectValueMapByLsKind.get(key);
-					String unitKind = subjectValues.iterator().next().getUnitKind();
-					String uncertaintyType = "standard deviation";
-					StatCalc statCalc = new StatCalc();
-					for (SubjectValue subjectValue : subjectValues){
-						statCalc.add(subjectValue.getNumericValue().doubleValue()); 
-					}
-					TreatmentGroupValue newNumericTreatmentGroupValue = createTreatmentGroupValue(newState, lsType, lsKind, recordedBy, lsTransaction);
-					newNumericTreatmentGroupValue.setNumericValue(BigDecimal.valueOf(statCalc.getArithmeticMean()));
-					newNumericTreatmentGroupValue.setUnitKind(unitKind);
-					newNumericTreatmentGroupValue.setNumberOfReplicates(statCalc.getCount());
-					newNumericTreatmentGroupValue.setUncertainty(BigDecimal.valueOf(statCalc.getStandardDeviation()));
-					newNumericTreatmentGroupValue.setUncertaintyType(uncertaintyType);
-					newNumericTreatmentGroupValue.merge();
+			}
+			try {
+				TreatmentGroupState oldState = TreatmentGroupState
+						.findTreatmentGroupStatesByTreatmentGroupIDAndStateTypeKind(treatmentGroup.getId(), "data",
+								"results")
+						.getSingleResult();
+				oldState.setIgnored(true);
+				oldState.merge();
+				// oldState.flush();
+				logger.debug("Old TreatmentGroupState ignored.");
+			} catch (NoResultException e) {
+				logger.debug("No state data/results found. Creating a new state.");
+			}
+			TreatmentGroupState newState = createResultsTreatmentGroupState(treatmentGroup.getId(), "data", "results",
+					recordedBy, lsTransaction);
+			// fill in the batch code, using the batch code from one of the subjects (they
+			// are all the same under a treatmentGroup)
+			SubjectValue batchCodeSubjectValue = findBatchCodeSubjectValue(treatmentGroup);
+			if (batchCodeSubjectValue == null)
+				logger.error(
+						"Unable to find batch code subject value for treatmentgroup: " + treatmentGroup.getCodeName());
+			TreatmentGroupValue newBatchCodeTreatmentGroupValue = createTreatmentGroupValue(newState,
+					batchCodeSubjectValue.getLsType(), batchCodeSubjectValue.getLsKind(), recordedBy, lsTransaction);
+			newBatchCodeTreatmentGroupValue.setCodeValue(batchCodeSubjectValue.getCodeValue());
+			newBatchCodeTreatmentGroupValue.setConcentration(batchCodeSubjectValue.getConcentration());
+			newBatchCodeTreatmentGroupValue.setConcUnit(batchCodeSubjectValue.getConcUnit());
+			newBatchCodeTreatmentGroupValue.setCodeType(batchCodeSubjectValue.getCodeType());
+			newBatchCodeTreatmentGroupValue.setCodeKind(batchCodeSubjectValue.getCodeKind());
+			newBatchCodeTreatmentGroupValue.setCodeTypeAndKind(batchCodeSubjectValue.getCodeTypeAndKind());
+			newBatchCodeTreatmentGroupValue.merge();
+			// calculate a new averaged treatmentGroupValue for each lsKind of numericValue
+			// found in the not knocked out subjects
+			for (String key : numericSubjectValueMapByLsKind.keySet()) {
+				String lsType = "numericValue";
+				String lsKind = key;
+				Collection<SubjectValue> subjectValues = numericSubjectValueMapByLsKind.get(key);
+				String unitKind = subjectValues.iterator().next().getUnitKind();
+				String uncertaintyType = "standard deviation";
+				StatCalc statCalc = new StatCalc();
+				for (SubjectValue subjectValue : subjectValues) {
+					statCalc.add(subjectValue.getNumericValue().doubleValue());
 				}
+				TreatmentGroupValue newNumericTreatmentGroupValue = createTreatmentGroupValue(newState, lsType, lsKind,
+						recordedBy, lsTransaction);
+				newNumericTreatmentGroupValue.setNumericValue(BigDecimal.valueOf(statCalc.getArithmeticMean()));
+				newNumericTreatmentGroupValue.setUnitKind(unitKind);
+				newNumericTreatmentGroupValue.setNumberOfReplicates(statCalc.getCount());
+				newNumericTreatmentGroupValue.setUncertainty(BigDecimal.valueOf(statCalc.getStandardDeviation()));
+				newNumericTreatmentGroupValue.setUncertaintyType(uncertaintyType);
+				newNumericTreatmentGroupValue.merge();
+			}
 		}
 	}
 
-
-
 	public static Collection<SubjectValue> findNotKONumericValueSubjectValues(
 			TreatmentGroup treatmentGroup) {
 		EntityManager em = SubjectValue.entityManager();
-		Query q = em.createNativeQuery( "SELECT lsvalues4_.* "
+		Query q = em.createNativeQuery("SELECT lsvalues4_.* "
 				+ "FROM treatment_group treatmentg0_ "
 				+ "INNER JOIN treatmentgroup_subject subjects1_ "
 				+ "ON treatmentg0_.id=subjects1_.treatment_group_id "
@@ -276,7 +299,7 @@ public static Collection<SubjectValue> findNotKONumericValueSubjectValues(
 				+ "  AND lsvalues9_.ls_kind   = ?10 "
 				+ "  AND lsvalues9_.code_value= ?11 "
 				+ "  )) ", SubjectValue.class);
-		
+
 		q.setParameter(1, treatmentGroup.getId());
 		q.setParameter(2, true);
 		q.setParameter(3, true);
@@ -288,10 +311,10 @@ public static Collection<SubjectValue> findNotKONumericValueSubjectValues(
 		q.setParameter(9, "codeValue");
 		q.setParameter(10, "flag status");
 		q.setParameter(11, "knocked out");
-		
+
 		return q.getResultList();
 	}
-	
+
 	public static SubjectValue findBatchCodeSubjectValue(
 			TreatmentGroup treatmentGroup) {
 		EntityManager em = SubjectValue.entityManager();
@@ -307,7 +330,7 @@ public static SubjectValue findBatchCodeSubjectValue(
 				+ "AND resultsState.lsKind = :resultsStateKind "
 				+ "AND batchCodeValue.lsType = :batchCodeValueType "
 				+ "AND batchCodeValue.lsKind = :batchCodeValueKind ", SubjectValue.class);
-		
+
 		q.setParameter("resultsStateType", "data");
 		q.setParameter("resultsStateKind", "results");
 		q.setParameter("batchCodeValueType", "codeValue");
@@ -315,10 +338,12 @@ public static SubjectValue findBatchCodeSubjectValue(
 		q.setParameter("treatmentGroup", treatmentGroup);
 		q.setParameter("ignored", true);
 		Collection<SubjectValue> results = q.getResultList();
-		if (!results.isEmpty()) return results.iterator().next();
-		else return null;
+		if (!results.isEmpty())
+			return results.iterator().next();
+		else
+			return null;
 	}
-	
+
 	@Transactional
 	private static TypedQuery<SubjectState> findAlgorithmFlagState(Subject subject) {
 		EntityManager em = SubjectState.entityManager();
@@ -334,7 +359,7 @@ private static TypedQuery<SubjectState> findAlgorithmFlagState(Subject subject)
 		q.setParameter("ignored", true);
 		return q;
 	}
-	
+
 	@Transactional
 	private static TypedQuery<SubjectState> findPreprocessFlagState(Subject subject) {
 		EntityManager em = SubjectState.entityManager();
@@ -350,7 +375,7 @@ private static TypedQuery<SubjectState> findPreprocessFlagState(Subject subject)
 		q.setParameter("ignored", true);
 		return q;
 	}
-	
+
 	@Transactional
 	private static TypedQuery<SubjectState> findUserFlagState(Subject subject) {
 		EntityManager em = SubjectState.entityManager();
@@ -383,7 +408,7 @@ private static Subject findSubject(Long responseSubjectValueId) {
 
 		return result;
 	}
-	
+
 	@Transactional
 	private static void saveWellFlags(SubjectState state, FlagWellDTO flagWellDTO) {
 		Collection<SubjectValue> newValues = new HashSet<SubjectValue>();
@@ -414,40 +439,45 @@ private static void saveWellFlags(SubjectState state, FlagWellDTO flagWellDTO) {
 		}
 		String recordedBy = flagWellDTO.getRecordedBy();
 		Long lsTransaction = flagWellDTO.getLsTransaction();
-		//only create SubjectValues if they would not be empty/null
-		if (!(flagStatus==null)){
-			SubjectValue flagStatusValue = createWellFlagValue(state, "codeValue", "flag status", flagStatus, recordedBy, lsTransaction);
-			flagStatusValue.setCodeType(flagType+" well flags");
+		// only create SubjectValues if they would not be empty/null
+		if (!(flagStatus == null)) {
+			SubjectValue flagStatusValue = createWellFlagValue(state, "codeValue", "flag status", flagStatus,
+					recordedBy, lsTransaction);
+			flagStatusValue.setCodeType(flagType + " well flags");
 			flagStatusValue.setCodeKind("flag status");
 			newValues.add(flagStatusValue);
 		}
-		if (!(flagObservation==null)){
-			SubjectValue flagObservationValue = createWellFlagValue(state, "codeValue", "flag observation", flagObservation, recordedBy, lsTransaction);
-			flagObservationValue.setCodeType(flagType+" well flags");
+		if (!(flagObservation == null)) {
+			SubjectValue flagObservationValue = createWellFlagValue(state, "codeValue", "flag observation",
+					flagObservation, recordedBy, lsTransaction);
+			flagObservationValue.setCodeType(flagType + " well flags");
 			flagObservationValue.setCodeKind("flag observation");
 			newValues.add(flagObservationValue);
 		}
-		if (!(flagCause==null)){
-			SubjectValue flagCauseValue = createWellFlagValue(state, "codeValue", "flag cause", flagCause, recordedBy, lsTransaction);
-			flagCauseValue.setCodeType(flagType+" well flags");
+		if (!(flagCause == null)) {
+			SubjectValue flagCauseValue = createWellFlagValue(state, "codeValue", "flag cause", flagCause, recordedBy,
+					lsTransaction);
+			flagCauseValue.setCodeType(flagType + " well flags");
 			flagCauseValue.setCodeKind("flag cause");
 			newValues.add(flagCauseValue);
 		}
-		if (!(flagComment==null)){
-			SubjectValue flagCommentValue = createWellFlagValue(state, "stringValue", "comment", flagComment, recordedBy, lsTransaction);
+		if (!(flagComment == null)) {
+			SubjectValue flagCommentValue = createWellFlagValue(state, "stringValue", "comment", flagComment,
+					recordedBy, lsTransaction);
 			newValues.add(flagCommentValue);
 		}
-		//persist and flush all the new values
-		for (SubjectValue value: newValues){
+		// persist and flush all the new values
+		for (SubjectValue value : newValues) {
 			value.setCodeOrigin("ACAS DDICT");
 			value.setRecordedBy(recordedBy);
 			value.persist();
-//			value.flush();
-		}		
+			// value.flush();
+		}
 	}
-	
+
 	@Transactional
-	private static TreatmentGroupValue createTreatmentGroupValue(TreatmentGroupState lsState, String lsType, String lsKind, String recordedBy, Long lsTransaction) {
+	private static TreatmentGroupValue createTreatmentGroupValue(TreatmentGroupState lsState, String lsType,
+			String lsKind, String recordedBy, Long lsTransaction) {
 		TreatmentGroupValue treatmentGroupValue = new TreatmentGroupValue();
 		treatmentGroupValue.setLsState(lsState);
 		treatmentGroupValue.setLsType(lsType);
@@ -458,9 +488,10 @@ private static TreatmentGroupValue createTreatmentGroupValue(TreatmentGroupState
 		treatmentGroupValue.persist();
 		return treatmentGroupValue;
 	}
-	
+
 	@Transactional
-	private static TreatmentGroupState createResultsTreatmentGroupState(Long treatmentGroupId, String stateType, String stateKind, String recordedBy, Long lsTransaction) {
+	private static TreatmentGroupState createResultsTreatmentGroupState(Long treatmentGroupId, String stateType,
+			String stateKind, String recordedBy, Long lsTransaction) {
 		TreatmentGroupState treatmentGroupState = new TreatmentGroupState();
 		TreatmentGroup treatmentGroup = TreatmentGroup.findTreatmentGroup(treatmentGroupId);
 		treatmentGroupState.setTreatmentGroup(treatmentGroup);
@@ -472,26 +503,28 @@ private static TreatmentGroupState createResultsTreatmentGroupState(Long treatme
 		treatmentGroupState.persist();
 		return treatmentGroupState;
 	}
-	
-	
+
 	@Transactional
-	private static SubjectValue createWellFlagValue(SubjectState lsState, String lsType, String lsKind, String value, String recordedBy, Long lsTransaction) {
+	private static SubjectValue createWellFlagValue(SubjectState lsState, String lsType, String lsKind, String value,
+			String recordedBy, Long lsTransaction) {
 		SubjectValue subjectValue = new SubjectValue();
 		subjectValue.setLsState(lsState);
 		subjectValue.setLsType(lsType);
 		subjectValue.setLsKind(lsKind);
-		if (lsType.equals("stringValue")) subjectValue.setStringValue(value);
-		if (lsType.equals("codeValue")) subjectValue.setCodeValue(value);
+		if (lsType.equals("stringValue"))
+			subjectValue.setStringValue(value);
+		if (lsType.equals("codeValue"))
+			subjectValue.setCodeValue(value);
 		subjectValue.setRecordedBy(recordedBy);
 		subjectValue.setLsTransaction(lsTransaction);
 		logger.debug("Creating value: " + subjectValue.toJson());
 		subjectValue.persist();
 		return subjectValue;
 	}
-	
 
 	@Transactional
-	private static SubjectState createWellFlagState(Long subjectId, String stateType, String stateKind, String recordedBy, Long lsTransaction) {
+	private static SubjectState createWellFlagState(Long subjectId, String stateType, String stateKind,
+			String recordedBy, Long lsTransaction) {
 		SubjectState subjectState = new SubjectState();
 		Subject subject = Subject.findSubject(subjectId);
 		subjectState.setSubject(subject);
@@ -504,159 +537,157 @@ private static SubjectState createWellFlagState(Long subjectId, String stateType
 		return subjectState;
 	}
 
-
-
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 
 	public Long getResponseSubjectValueId() {
-        return this.responseSubjectValueId;
-    }
+		return this.responseSubjectValueId;
+	}
 
 	public void setResponseSubjectValueId(Long responseSubjectValueId) {
-        this.responseSubjectValueId = responseSubjectValueId;
-    }
+		this.responseSubjectValueId = responseSubjectValueId;
+	}
 
 	public String getRecordedBy() {
-        return this.recordedBy;
-    }
+		return this.recordedBy;
+	}
 
 	public void setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
+		this.recordedBy = recordedBy;
+	}
 
 	public Long getLsTransaction() {
-        return this.lsTransaction;
-    }
+		return this.lsTransaction;
+	}
 
 	public void setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
+		this.lsTransaction = lsTransaction;
+	}
 
 	public String getAlgorithmFlagStatus() {
-        return this.algorithmFlagStatus;
-    }
+		return this.algorithmFlagStatus;
+	}
 
 	public void setAlgorithmFlagStatus(String algorithmFlagStatus) {
-        this.algorithmFlagStatus = algorithmFlagStatus;
-    }
+		this.algorithmFlagStatus = algorithmFlagStatus;
+	}
 
 	public String getAlgorithmFlagObservation() {
-        return this.algorithmFlagObservation;
-    }
+		return this.algorithmFlagObservation;
+	}
 
 	public void setAlgorithmFlagObservation(String algorithmFlagObservation) {
-        this.algorithmFlagObservation = algorithmFlagObservation;
-    }
+		this.algorithmFlagObservation = algorithmFlagObservation;
+	}
 
 	public String getAlgorithmFlagCause() {
-        return this.algorithmFlagCause;
-    }
+		return this.algorithmFlagCause;
+	}
 
 	public void setAlgorithmFlagCause(String algorithmFlagCause) {
-        this.algorithmFlagCause = algorithmFlagCause;
-    }
+		this.algorithmFlagCause = algorithmFlagCause;
+	}
 
 	public String getAlgorithmFlagComment() {
-        return this.algorithmFlagComment;
-    }
+		return this.algorithmFlagComment;
+	}
 
 	public void setAlgorithmFlagComment(String algorithmFlagComment) {
-        this.algorithmFlagComment = algorithmFlagComment;
-    }
+		this.algorithmFlagComment = algorithmFlagComment;
+	}
 
 	public String getPreprocessFlagStatus() {
-        return this.preprocessFlagStatus;
-    }
+		return this.preprocessFlagStatus;
+	}
 
 	public void setPreprocessFlagStatus(String preprocessFlagStatus) {
-        this.preprocessFlagStatus = preprocessFlagStatus;
-    }
+		this.preprocessFlagStatus = preprocessFlagStatus;
+	}
 
 	public String getPreprocessFlagObservation() {
-        return this.preprocessFlagObservation;
-    }
+		return this.preprocessFlagObservation;
+	}
 
 	public void setPreprocessFlagObservation(String preprocessFlagObservation) {
-        this.preprocessFlagObservation = preprocessFlagObservation;
-    }
+		this.preprocessFlagObservation = preprocessFlagObservation;
+	}
 
 	public String getPreprocessFlagCause() {
-        return this.preprocessFlagCause;
-    }
+		return this.preprocessFlagCause;
+	}
 
 	public void setPreprocessFlagCause(String preprocessFlagCause) {
-        this.preprocessFlagCause = preprocessFlagCause;
-    }
+		this.preprocessFlagCause = preprocessFlagCause;
+	}
 
 	public String getPreprocessFlagComment() {
-        return this.preprocessFlagComment;
-    }
+		return this.preprocessFlagComment;
+	}
 
 	public void setPreprocessFlagComment(String preprocessFlagComment) {
-        this.preprocessFlagComment = preprocessFlagComment;
-    }
+		this.preprocessFlagComment = preprocessFlagComment;
+	}
 
 	public String getUserFlagStatus() {
-        return this.userFlagStatus;
-    }
+		return this.userFlagStatus;
+	}
 
 	public void setUserFlagStatus(String userFlagStatus) {
-        this.userFlagStatus = userFlagStatus;
-    }
+		this.userFlagStatus = userFlagStatus;
+	}
 
 	public String getUserFlagObservation() {
-        return this.userFlagObservation;
-    }
+		return this.userFlagObservation;
+	}
 
 	public void setUserFlagObservation(String userFlagObservation) {
-        this.userFlagObservation = userFlagObservation;
-    }
+		this.userFlagObservation = userFlagObservation;
+	}
 
 	public String getUserFlagCause() {
-        return this.userFlagCause;
-    }
+		return this.userFlagCause;
+	}
 
 	public void setUserFlagCause(String userFlagCause) {
-        this.userFlagCause = userFlagCause;
-    }
+		this.userFlagCause = userFlagCause;
+	}
 
 	public String getUserFlagComment() {
-        return this.userFlagComment;
-    }
+		return this.userFlagComment;
+	}
 
 	public void setUserFlagComment(String userFlagComment) {
-        this.userFlagComment = userFlagComment;
-    }
+		this.userFlagComment = userFlagComment;
+	}
 
 	public String toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(this);
+	}
 
 	public String toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(this);
+	}
 
 	public static FlagWellDTO fromJsonToFlagWellDTO(String json) {
-        return new JSONDeserializer<FlagWellDTO>()
-        .use(null, FlagWellDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<FlagWellDTO>()
+				.use(null, FlagWellDTO.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<FlagWellDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<FlagWellDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<FlagWellDTO> fromJsonArrayToFlagWellDTO(String json) {
-        return new JSONDeserializer<List<FlagWellDTO>>()
-        .use("values", FlagWellDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<FlagWellDTO>>()
+				.use("values", FlagWellDTO.class).deserialize(json);
+	}
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/FlatThingCsvDTO.java b/src/main/java/com/labsynch/labseer/dto/FlatThingCsvDTO.java
index 1ca4c04bb..917dd2d67 100644
--- a/src/main/java/com/labsynch/labseer/dto/FlatThingCsvDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/FlatThingCsvDTO.java
@@ -18,41 +18,43 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class FlatThingCsvDTO {
 
 	private static final Logger logger = LoggerFactory.getLogger(FlatThingCsvDTO.class);
 
-	public FlatThingCsvDTO(){
-		//empty constructor
+	public FlatThingCsvDTO() {
+		// empty constructor
 	}
 
-
-	//	valueType	valueKind	numericValue	stringValue	dateValue	clobValue	urlValue	fileValue	codeValue	valueUnit	valueOperator	publicData	stateType	stateKind	stateID	analysisGroupID	experimentID	experimentVersion	lsTransaction	recordedBy	codeName
-	//	stringValue	Rendering Hint	NULL	4 parameter D-R	NULL	NULL	NULL	NULL	NULL	NULL	NULL	FALSE	data	results	1	1	1007	1	86	smeyer	AG-1
-	//	stringValue	Rendering Hint	NULL	4 parameter D-R	NULL	NULL	NULL	NULL	NULL	NULL	NULL	FALSE	data	results	5	2	1007	1	86	smeyer	AG-2
-	//	valueType,valueKind,numericValue,stringValue,dateValue,clobValue,urlValue,
-	//	fileValue,codeType,codeKind,codeValue,unitKind,unitType,operatorKind,operatorType,
-	//	publicData,stateType,stateKind,tempStateId,stateId,id,tempId,parentId,tempParentId,
-	//	lsTransaction,recordedBy,codeName,lsType,lsKind
-
+	// valueType valueKind numericValue stringValue dateValue clobValue urlValue
+	// fileValue codeValue valueUnit valueOperator publicData stateType stateKind
+	// stateID analysisGroupID experimentID experimentVersion lsTransaction
+	// recordedBy codeName
+	// stringValue Rendering Hint NULL 4 parameter D-R NULL NULL NULL NULL NULL NULL
+	// NULL FALSE data results 1 1 1007 1 86 smeyer AG-1
+	// stringValue Rendering Hint NULL 4 parameter D-R NULL NULL NULL NULL NULL NULL
+	// NULL FALSE data results 5 2 1007 1 86 smeyer AG-2
+	// valueType,valueKind,numericValue,stringValue,dateValue,clobValue,urlValue,
+	// fileValue,codeType,codeKind,codeValue,unitKind,unitType,operatorKind,operatorType,
+	// publicData,stateType,stateKind,tempStateId,stateId,id,tempId,parentId,tempParentId,
+	// lsTransaction,recordedBy,codeName,lsType,lsKind
 
 	private Long parentId;
 	private String tempParentId;
 
-	private Long id;	
-	private String tempId;	
+	private Long id;
+	private String tempId;
 	private String codeName;
 	private String lsType;
 	private String lsKind;
 
-	private Long stateId;	
-	private String tempStateId;	
+	private Long stateId;
+	private String tempStateId;
 	private String stateType;
 	private String stateKind;
 
 	private Long valueId;
-	private String tempValueId;	
+	private String tempValueId;
 	private String valueType;
 	private String valueKind;
 	private String codeOrigin;
@@ -84,9 +86,8 @@ public FlatThingCsvDTO(){
 	private String modifiedBy;
 	private boolean publicData;
 
-
 	public void setLsTransaction(String lsTransaction) {
-		if (lsTransaction.equalsIgnoreCase("NULL")){
+		if (lsTransaction.equalsIgnoreCase("NULL")) {
 			this.lsTransaction = null;
 		} else {
 			this.lsTransaction = Long.valueOf(lsTransaction);
@@ -94,15 +95,15 @@ public void setLsTransaction(String lsTransaction) {
 	}
 
 	public void setCodeName(String codeName) {
-		if (codeName.equalsIgnoreCase("NULL")){
+		if (codeName.equalsIgnoreCase("NULL")) {
 			this.codeName = null;
 		} else {
 			this.codeName = codeName;
 		}
 	}
-	
+
 	public void setParentId(String parentId) {
-		if (parentId.equalsIgnoreCase("NULL")){
+		if (parentId.equalsIgnoreCase("NULL")) {
 			this.parentId = null;
 		} else {
 			this.parentId = Long.valueOf(parentId);
@@ -114,15 +115,15 @@ public void setStateId(String stateId) {
 	}
 
 	public void setPublicData(String publicData) {
-		if (publicData.equalsIgnoreCase("FALSE")){
+		if (publicData.equalsIgnoreCase("FALSE")) {
 			this.publicData = false;
 		} else {
 			this.publicData = true;
 		}
 	}
-	
+
 	public void setIgnored(String ignored) {
-		if (ignored.equalsIgnoreCase("FALSE")){
+		if (ignored.equalsIgnoreCase("FALSE")) {
 			this.ignored = false;
 		} else {
 			this.ignored = true;
@@ -130,26 +131,26 @@ public void setIgnored(String ignored) {
 	}
 
 	public void setDateValue(String dateValue) throws ParseException {
-		if (dateValue.equalsIgnoreCase("NULL")){
+		if (dateValue.equalsIgnoreCase("NULL")) {
 			this.dateValue = null;
 		} else {
 			try {
 				DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
 				this.dateValue = df.parse(dateValue);
-			} catch(Exception e) {
+			} catch (Exception e) {
 				try {
 					this.dateValue = new Date(Long.parseLong(dateValue));
-				} catch(Exception e2) {
+				} catch (Exception e2) {
 					DateFormat df = new SimpleDateFormat("MM/dd/yyyy");
 					this.dateValue = df.parse(dateValue);
 				}
-				
+
 			}
 		}
 	}
 
 	public void setNumericValue(String numericValue) {
-		if (numericValue.equalsIgnoreCase("NULL")){
+		if (numericValue.equalsIgnoreCase("NULL")) {
 			this.numericValue = null;
 		} else {
 			this.numericValue = new BigDecimal(numericValue);
@@ -157,39 +158,39 @@ public void setNumericValue(String numericValue) {
 	}
 
 	public void setUncertainty(String uncertainty) {
-		if (uncertainty.equalsIgnoreCase("NULL")){
+		if (uncertainty.equalsIgnoreCase("NULL")) {
 			this.uncertainty = null;
 		} else {
 			this.uncertainty = new BigDecimal(uncertainty);
 		}
 	}
-	
+
 	public void setConcentration(String concentration) {
-		if (concentration.equalsIgnoreCase("NULL")){
+		if (concentration.equalsIgnoreCase("NULL")) {
 			this.concentration = null;
 		} else {
 			this.concentration = new Double(concentration);
 		}
 	}
-	
+
 	public void setId(String id) {
-		if (id.equalsIgnoreCase("NULL")){
+		if (id.equalsIgnoreCase("NULL")) {
 			this.id = null;
 		} else {
 			this.id = Long.valueOf(id);
 		}
 	}
-	
+
 	public void setValueId(String valueId) {
-		if (valueId.equalsIgnoreCase("NULL")){
+		if (valueId.equalsIgnoreCase("NULL")) {
 			this.valueId = null;
 		} else {
 			this.valueId = Long.valueOf(valueId);
 		}
 	}
-	
+
 	public void setSigFigs(String sigFigs) {
-		if (sigFigs.equalsIgnoreCase("NULL")){
+		if (sigFigs.equalsIgnoreCase("NULL")) {
 			this.sigFigs = null;
 		} else {
 			this.sigFigs = Integer.valueOf(sigFigs);
@@ -197,17 +198,16 @@ public void setSigFigs(String sigFigs) {
 	}
 
 	public void setNumberOfReplicates(String numberOfReplicates) {
-		if (numberOfReplicates.equalsIgnoreCase("NULL")){
+		if (numberOfReplicates.equalsIgnoreCase("NULL")) {
 			this.numberOfReplicates = null;
 		} else {
 			this.numberOfReplicates = Integer.valueOf(numberOfReplicates);
 		}
 	}
-	
-	
-	public static String[] getColumns(){
+
+	public static String[] getColumns() {
 		String[] headerColumns = new String[] {
-				"parentId", 
+				"parentId",
 				"tempParentId",
 				"id",
 				"tempId",
@@ -217,7 +217,7 @@ public static String[] getColumns(){
 				"stateId",
 				"tempStateId",
 				"stateType",
-				
+
 				"stateKind",
 				"tempValueId",
 				"valueType",
@@ -229,7 +229,7 @@ public static String[] getColumns(){
 				"stringValue",
 				"fileValue",
 				"urlValue",
-				
+
 				"dateValue",
 				"clobValue",
 				"operatorType",
@@ -240,32 +240,32 @@ public static String[] getColumns(){
 				"numberOfReplicates",
 				"uncertaintyType",
 				"unitType",
-				
+
 				"unitKind",
 				"concentration",
 				"concUnit",
 				"comments",
-				//				"ignored",
+				// "ignored",
 				"lsTransaction",
-				//				"recordedDate",
+				// "recordedDate",
 				"recordedBy",
-				//				"modifiedDate",
-				//				"modifiedBy",
+				// "modifiedDate",
+				// "modifiedBy",
 				"publicData"
 				// 37 values
 		};
 
-		//		valueType,valueKind,numericValue,stringValue,dateValue,clobValue,urlValue,
-		//		fileValue,codeType,codeKind,codeValue,unitKind,unitType,operatorKind,operatorType,
-		//		publicData,stateType,stateKind,tempStateId,stateId,id,tempId,parentId,tempParentId,
-		//		lsTransaction,recordedBy,codeName,lsType,lsKind
+		// valueType,valueKind,numericValue,stringValue,dateValue,clobValue,urlValue,
+		// fileValue,codeType,codeKind,codeValue,unitKind,unitType,operatorKind,operatorType,
+		// publicData,stateType,stateKind,tempStateId,stateId,id,tempId,parentId,tempParentId,
+		// lsTransaction,recordedBy,codeName,lsType,lsKind
 
 		return headerColumns;
 
 	}
 
 	public static CellProcessor[] getProcessors() {
-		final CellProcessor[] processors = new CellProcessor[] { 
+		final CellProcessor[] processors = new CellProcessor[] {
 				new Optional(),
 				new Optional(),
 				new Optional(),
@@ -302,394 +302,389 @@ public static CellProcessor[] getProcessors() {
 				new Optional(),
 				new Optional(),
 				new Optional(),
-				
+
 				new Optional(),
 				new Optional(),
 				new Optional(),
 				new Optional(),
 				new Optional()
 
-
 		};
 
 		return processors;
 	}
 
-
-
 	public String toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(this);
+	}
 
 	public String toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(this);
+	}
 
 	public static FlatThingCsvDTO fromJsonToFlatThingCsvDTO(String json) {
-        return new JSONDeserializer<FlatThingCsvDTO>()
-        .use(null, FlatThingCsvDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<FlatThingCsvDTO>()
+				.use(null, FlatThingCsvDTO.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<FlatThingCsvDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<FlatThingCsvDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<FlatThingCsvDTO> fromJsonArrayToFlatThingCsvDTO(String json) {
-        return new JSONDeserializer<List<FlatThingCsvDTO>>()
-        .use("values", FlatThingCsvDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<FlatThingCsvDTO>>()
+				.use("values", FlatThingCsvDTO.class).deserialize(json);
+	}
 
 	public Long getParentId() {
-        return this.parentId;
-    }
+		return this.parentId;
+	}
 
 	public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
+		this.parentId = parentId;
+	}
 
 	public String getTempParentId() {
-        return this.tempParentId;
-    }
+		return this.tempParentId;
+	}
 
 	public void setTempParentId(String tempParentId) {
-        this.tempParentId = tempParentId;
-    }
+		this.tempParentId = tempParentId;
+	}
 
 	public Long getId() {
-        return this.id;
-    }
+		return this.id;
+	}
 
 	public void setId(Long id) {
-        this.id = id;
-    }
+		this.id = id;
+	}
 
 	public String getTempId() {
-        return this.tempId;
-    }
+		return this.tempId;
+	}
 
 	public void setTempId(String tempId) {
-        this.tempId = tempId;
-    }
+		this.tempId = tempId;
+	}
 
 	public String getCodeName() {
-        return this.codeName;
-    }
+		return this.codeName;
+	}
 
 	public String getLsType() {
-        return this.lsType;
-    }
+		return this.lsType;
+	}
 
 	public void setLsType(String lsType) {
-        this.lsType = lsType;
-    }
+		this.lsType = lsType;
+	}
 
 	public String getLsKind() {
-        return this.lsKind;
-    }
+		return this.lsKind;
+	}
 
 	public void setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
+		this.lsKind = lsKind;
+	}
 
 	public Long getStateId() {
-        return this.stateId;
-    }
+		return this.stateId;
+	}
 
 	public void setStateId(Long stateId) {
-        this.stateId = stateId;
-    }
+		this.stateId = stateId;
+	}
 
 	public String getTempStateId() {
-        return this.tempStateId;
-    }
+		return this.tempStateId;
+	}
 
 	public void setTempStateId(String tempStateId) {
-        this.tempStateId = tempStateId;
-    }
+		this.tempStateId = tempStateId;
+	}
 
 	public String getStateType() {
-        return this.stateType;
-    }
+		return this.stateType;
+	}
 
 	public void setStateType(String stateType) {
-        this.stateType = stateType;
-    }
+		this.stateType = stateType;
+	}
 
 	public String getStateKind() {
-        return this.stateKind;
-    }
+		return this.stateKind;
+	}
 
 	public void setStateKind(String stateKind) {
-        this.stateKind = stateKind;
-    }
+		this.stateKind = stateKind;
+	}
 
 	public Long getValueId() {
-        return this.valueId;
-    }
+		return this.valueId;
+	}
 
 	public void setValueId(Long valueId) {
-        this.valueId = valueId;
-    }
+		this.valueId = valueId;
+	}
 
 	public String getTempValueId() {
-        return this.tempValueId;
-    }
+		return this.tempValueId;
+	}
 
 	public void setTempValueId(String tempValueId) {
-        this.tempValueId = tempValueId;
-    }
+		this.tempValueId = tempValueId;
+	}
 
 	public String getValueType() {
-        return this.valueType;
-    }
+		return this.valueType;
+	}
 
 	public void setValueType(String valueType) {
-        this.valueType = valueType;
-    }
+		this.valueType = valueType;
+	}
 
 	public String getValueKind() {
-        return this.valueKind;
-    }
+		return this.valueKind;
+	}
 
 	public void setValueKind(String valueKind) {
-        this.valueKind = valueKind;
-    }
+		this.valueKind = valueKind;
+	}
 
 	public String getCodeOrigin() {
-        return this.codeOrigin;
-    }
+		return this.codeOrigin;
+	}
 
 	public void setCodeOrigin(String codeOrigin) {
-        this.codeOrigin = codeOrigin;
-    }
+		this.codeOrigin = codeOrigin;
+	}
 
 	public String getCodeType() {
-        return this.codeType;
-    }
+		return this.codeType;
+	}
 
 	public void setCodeType(String codeType) {
-        this.codeType = codeType;
-    }
+		this.codeType = codeType;
+	}
 
 	public String getCodeKind() {
-        return this.codeKind;
-    }
+		return this.codeKind;
+	}
 
 	public void setCodeKind(String codeKind) {
-        this.codeKind = codeKind;
-    }
+		this.codeKind = codeKind;
+	}
 
 	public String getCodeValue() {
-        return this.codeValue;
-    }
+		return this.codeValue;
+	}
 
 	public void setCodeValue(String codeValue) {
-        this.codeValue = codeValue;
-    }
+		this.codeValue = codeValue;
+	}
 
 	public String getStringValue() {
-        return this.stringValue;
-    }
+		return this.stringValue;
+	}
 
 	public void setStringValue(String stringValue) {
-        this.stringValue = stringValue;
-    }
+		this.stringValue = stringValue;
+	}
 
 	public String getFileValue() {
-        return this.fileValue;
-    }
+		return this.fileValue;
+	}
 
 	public void setFileValue(String fileValue) {
-        this.fileValue = fileValue;
-    }
+		this.fileValue = fileValue;
+	}
 
 	public String getUrlValue() {
-        return this.urlValue;
-    }
+		return this.urlValue;
+	}
 
 	public void setUrlValue(String urlValue) {
-        this.urlValue = urlValue;
-    }
+		this.urlValue = urlValue;
+	}
 
 	public Date getDateValue() {
-        return this.dateValue;
-    }
+		return this.dateValue;
+	}
 
 	public void setDateValue(Date dateValue) {
-        this.dateValue = dateValue;
-    }
+		this.dateValue = dateValue;
+	}
 
 	public String getClobValue() {
-        return this.clobValue;
-    }
+		return this.clobValue;
+	}
 
 	public void setClobValue(String clobValue) {
-        this.clobValue = clobValue;
-    }
+		this.clobValue = clobValue;
+	}
 
 	public String getOperatorType() {
-        return this.operatorType;
-    }
+		return this.operatorType;
+	}
 
 	public void setOperatorType(String operatorType) {
-        this.operatorType = operatorType;
-    }
+		this.operatorType = operatorType;
+	}
 
 	public String getOperatorKind() {
-        return this.operatorKind;
-    }
+		return this.operatorKind;
+	}
 
 	public void setOperatorKind(String operatorKind) {
-        this.operatorKind = operatorKind;
-    }
+		this.operatorKind = operatorKind;
+	}
 
 	public BigDecimal getNumericValue() {
-        return this.numericValue;
-    }
+		return this.numericValue;
+	}
 
 	public void setNumericValue(BigDecimal numericValue) {
-        this.numericValue = numericValue;
-    }
+		this.numericValue = numericValue;
+	}
 
 	public Integer getSigFigs() {
-        return this.sigFigs;
-    }
+		return this.sigFigs;
+	}
 
 	public void setSigFigs(Integer sigFigs) {
-        this.sigFigs = sigFigs;
-    }
+		this.sigFigs = sigFigs;
+	}
 
 	public BigDecimal getUncertainty() {
-        return this.uncertainty;
-    }
+		return this.uncertainty;
+	}
 
 	public void setUncertainty(BigDecimal uncertainty) {
-        this.uncertainty = uncertainty;
-    }
+		this.uncertainty = uncertainty;
+	}
 
 	public Integer getNumberOfReplicates() {
-        return this.numberOfReplicates;
-    }
+		return this.numberOfReplicates;
+	}
 
 	public void setNumberOfReplicates(Integer numberOfReplicates) {
-        this.numberOfReplicates = numberOfReplicates;
-    }
+		this.numberOfReplicates = numberOfReplicates;
+	}
 
 	public String getUncertaintyType() {
-        return this.uncertaintyType;
-    }
+		return this.uncertaintyType;
+	}
 
 	public void setUncertaintyType(String uncertaintyType) {
-        this.uncertaintyType = uncertaintyType;
-    }
+		this.uncertaintyType = uncertaintyType;
+	}
 
 	public String getUnitType() {
-        return this.unitType;
-    }
+		return this.unitType;
+	}
 
 	public void setUnitType(String unitType) {
-        this.unitType = unitType;
-    }
+		this.unitType = unitType;
+	}
 
 	public String getUnitKind() {
-        return this.unitKind;
-    }
+		return this.unitKind;
+	}
 
 	public void setUnitKind(String unitKind) {
-        this.unitKind = unitKind;
-    }
+		this.unitKind = unitKind;
+	}
 
 	public Double getConcentration() {
-        return this.concentration;
-    }
+		return this.concentration;
+	}
 
 	public void setConcentration(Double concentration) {
-        this.concentration = concentration;
-    }
+		this.concentration = concentration;
+	}
 
 	public String getConcUnit() {
-        return this.concUnit;
-    }
+		return this.concUnit;
+	}
 
 	public void setConcUnit(String concUnit) {
-        this.concUnit = concUnit;
-    }
+		this.concUnit = concUnit;
+	}
 
 	public String getComments() {
-        return this.comments;
-    }
+		return this.comments;
+	}
 
 	public void setComments(String comments) {
-        this.comments = comments;
-    }
+		this.comments = comments;
+	}
 
 	public boolean isIgnored() {
-        return this.ignored;
-    }
+		return this.ignored;
+	}
 
 	public void setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
+		this.ignored = ignored;
+	}
 
 	public Long getLsTransaction() {
-        return this.lsTransaction;
-    }
+		return this.lsTransaction;
+	}
 
 	public void setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
+		this.lsTransaction = lsTransaction;
+	}
 
 	public Date getRecordedDate() {
-        return this.recordedDate;
-    }
+		return this.recordedDate;
+	}
 
 	public void setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
+		this.recordedDate = recordedDate;
+	}
 
 	public String getRecordedBy() {
-        return this.recordedBy;
-    }
+		return this.recordedBy;
+	}
 
 	public void setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
+		this.recordedBy = recordedBy;
+	}
 
 	public Date getModifiedDate() {
-        return this.modifiedDate;
-    }
+		return this.modifiedDate;
+	}
 
 	public void setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
+		this.modifiedDate = modifiedDate;
+	}
 
 	public String getModifiedBy() {
-        return this.modifiedBy;
-    }
+		return this.modifiedBy;
+	}
 
 	public void setModifiedBy(String modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
+		this.modifiedBy = modifiedBy;
+	}
 
 	public boolean isPublicData() {
-        return this.publicData;
-    }
+		return this.publicData;
+	}
 
 	public void setPublicData(boolean publicData) {
-        this.publicData = publicData;
-    }
+		this.publicData = publicData;
+	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/GeneIdDTO.java b/src/main/java/com/labsynch/labseer/dto/GeneIdDTO.java
index 6ae5bddb9..b2e9f7bbc 100755
--- a/src/main/java/com/labsynch/labseer/dto/GeneIdDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/GeneIdDTO.java
@@ -9,53 +9,49 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class GeneIdDTO {
-	
-	private String gid;
 
+    private String gid;
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static GeneIdDTO fromJsonToGeneIdDTO(String json) {
+    public static GeneIdDTO fromJsonToGeneIdDTO(String json) {
         return new JSONDeserializer<GeneIdDTO>()
-        .use(null, GeneIdDTO.class).deserialize(json);
+                .use(null, GeneIdDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<GeneIdDTO> collection) {
+    public static String toJsonArray(Collection<GeneIdDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<GeneIdDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<GeneIdDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<GeneIdDTO> fromJsonArrayToGeneIdDTO(String json) {
+    public static Collection<GeneIdDTO> fromJsonArrayToGeneIdDTO(String json) {
         return new JSONDeserializer<List<GeneIdDTO>>()
-        .use("values", GeneIdDTO.class).deserialize(json);
+                .use("values", GeneIdDTO.class).deserialize(json);
     }
 
-	public String getGid() {
+    public String getGid() {
         return this.gid;
     }
 
-	public void setGid(String gid) {
+    public void setGid(String gid) {
         this.gid = gid;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/GeneOrthologDTO.java b/src/main/java/com/labsynch/labseer/dto/GeneOrthologDTO.java
index bbd33745e..5887201e8 100644
--- a/src/main/java/com/labsynch/labseer/dto/GeneOrthologDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/GeneOrthologDTO.java
@@ -10,15 +10,14 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class GeneOrthologDTO {
-	
-	private Long id;
-	private String recordedBy;
+
+    private Long id;
+    private String recordedBy;
 
     private Integer rowIndex;
 
-	private String geneId;
+    private String geneId;
     private String symbol;
     private String taxId;
     private String species;
@@ -29,231 +28,231 @@ public class GeneOrthologDTO {
     private String mappedTaxId;
     private String mappedSpecies;
     private String mappedTypeOfGene;
-    
+
     private Integer mappedScore;
     private Integer mappedPerc;
     private Integer mappedHitLen;
     private Double mappedPercRatio;
-    
+
     private Integer mappedLocalIndex;
     private Integer mappedGeneIndex;
     private Integer mappedIsoformIndex;
-    
+
     private String orthCode;
     private String versionName;
     private Integer curationLevel;
     private String curator;
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer().exclude("*.class").serialize(this);
     }
-	
 
-	public static GeneOrthologDTO fromJsonToGeneOrthologDTO(String json) {
+    public static GeneOrthologDTO fromJsonToGeneOrthologDTO(String json) {
         return new JSONDeserializer<GeneOrthologDTO>().use(null, GeneOrthologDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<GeneOrthologDTO> collection) {
+    public static String toJsonArray(Collection<GeneOrthologDTO> collection) {
         return new JSONSerializer().exclude("*.class").serialize(collection);
     }
-	
-	public static Collection<GeneOrthologDTO> fromJsonArrayToGeneOrtholoes(String json) {
-        return new JSONDeserializer<List<GeneOrthologDTO>>().use(null, ArrayList.class).use("values", GeneOrthologDTO.class).deserialize(json);
+
+    public static Collection<GeneOrthologDTO> fromJsonArrayToGeneOrtholoes(String json) {
+        return new JSONDeserializer<List<GeneOrthologDTO>>().use(null, ArrayList.class)
+                .use("values", GeneOrthologDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public String getRecordedBy() {
+    public String getRecordedBy() {
         return this.recordedBy;
     }
 
-	public void setRecordedBy(String recordedBy) {
+    public void setRecordedBy(String recordedBy) {
         this.recordedBy = recordedBy;
     }
 
-	public Integer getRowIndex() {
+    public Integer getRowIndex() {
         return this.rowIndex;
     }
 
-	public void setRowIndex(Integer rowIndex) {
+    public void setRowIndex(Integer rowIndex) {
         this.rowIndex = rowIndex;
     }
 
-	public String getGeneId() {
+    public String getGeneId() {
         return this.geneId;
     }
 
-	public void setGeneId(String geneId) {
+    public void setGeneId(String geneId) {
         this.geneId = geneId;
     }
 
-	public String getSymbol() {
+    public String getSymbol() {
         return this.symbol;
     }
 
-	public void setSymbol(String symbol) {
+    public void setSymbol(String symbol) {
         this.symbol = symbol;
     }
 
-	public String getTaxId() {
+    public String getTaxId() {
         return this.taxId;
     }
 
-	public void setTaxId(String taxId) {
+    public void setTaxId(String taxId) {
         this.taxId = taxId;
     }
 
-	public String getSpecies() {
+    public String getSpecies() {
         return this.species;
     }
 
-	public void setSpecies(String species) {
+    public void setSpecies(String species) {
         this.species = species;
     }
 
-	public String getTypeOfGene() {
+    public String getTypeOfGene() {
         return this.typeOfGene;
     }
 
-	public void setTypeOfGene(String typeOfGene) {
+    public void setTypeOfGene(String typeOfGene) {
         this.typeOfGene = typeOfGene;
     }
 
-	public String getMappedGeneId() {
+    public String getMappedGeneId() {
         return this.mappedGeneId;
     }
 
-	public void setMappedGeneId(String mappedGeneId) {
+    public void setMappedGeneId(String mappedGeneId) {
         this.mappedGeneId = mappedGeneId;
     }
 
-	public String getMappedSymbol() {
+    public String getMappedSymbol() {
         return this.mappedSymbol;
     }
 
-	public void setMappedSymbol(String mappedSymbol) {
+    public void setMappedSymbol(String mappedSymbol) {
         this.mappedSymbol = mappedSymbol;
     }
 
-	public String getMappedTaxId() {
+    public String getMappedTaxId() {
         return this.mappedTaxId;
     }
 
-	public void setMappedTaxId(String mappedTaxId) {
+    public void setMappedTaxId(String mappedTaxId) {
         this.mappedTaxId = mappedTaxId;
     }
 
-	public String getMappedSpecies() {
+    public String getMappedSpecies() {
         return this.mappedSpecies;
     }
 
-	public void setMappedSpecies(String mappedSpecies) {
+    public void setMappedSpecies(String mappedSpecies) {
         this.mappedSpecies = mappedSpecies;
     }
 
-	public String getMappedTypeOfGene() {
+    public String getMappedTypeOfGene() {
         return this.mappedTypeOfGene;
     }
 
-	public void setMappedTypeOfGene(String mappedTypeOfGene) {
+    public void setMappedTypeOfGene(String mappedTypeOfGene) {
         this.mappedTypeOfGene = mappedTypeOfGene;
     }
 
-	public Integer getMappedScore() {
+    public Integer getMappedScore() {
         return this.mappedScore;
     }
 
-	public void setMappedScore(Integer mappedScore) {
+    public void setMappedScore(Integer mappedScore) {
         this.mappedScore = mappedScore;
     }
 
-	public Integer getMappedPerc() {
+    public Integer getMappedPerc() {
         return this.mappedPerc;
     }
 
-	public void setMappedPerc(Integer mappedPerc) {
+    public void setMappedPerc(Integer mappedPerc) {
         this.mappedPerc = mappedPerc;
     }
 
-	public Integer getMappedHitLen() {
+    public Integer getMappedHitLen() {
         return this.mappedHitLen;
     }
 
-	public void setMappedHitLen(Integer mappedHitLen) {
+    public void setMappedHitLen(Integer mappedHitLen) {
         this.mappedHitLen = mappedHitLen;
     }
 
-	public Double getMappedPercRatio() {
+    public Double getMappedPercRatio() {
         return this.mappedPercRatio;
     }
 
-	public void setMappedPercRatio(Double mappedPercRatio) {
+    public void setMappedPercRatio(Double mappedPercRatio) {
         this.mappedPercRatio = mappedPercRatio;
     }
 
-	public Integer getMappedLocalIndex() {
+    public Integer getMappedLocalIndex() {
         return this.mappedLocalIndex;
     }
 
-	public void setMappedLocalIndex(Integer mappedLocalIndex) {
+    public void setMappedLocalIndex(Integer mappedLocalIndex) {
         this.mappedLocalIndex = mappedLocalIndex;
     }
 
-	public Integer getMappedGeneIndex() {
+    public Integer getMappedGeneIndex() {
         return this.mappedGeneIndex;
     }
 
-	public void setMappedGeneIndex(Integer mappedGeneIndex) {
+    public void setMappedGeneIndex(Integer mappedGeneIndex) {
         this.mappedGeneIndex = mappedGeneIndex;
     }
 
-	public Integer getMappedIsoformIndex() {
+    public Integer getMappedIsoformIndex() {
         return this.mappedIsoformIndex;
     }
 
-	public void setMappedIsoformIndex(Integer mappedIsoformIndex) {
+    public void setMappedIsoformIndex(Integer mappedIsoformIndex) {
         this.mappedIsoformIndex = mappedIsoformIndex;
     }
 
-	public String getOrthCode() {
+    public String getOrthCode() {
         return this.orthCode;
     }
 
-	public void setOrthCode(String orthCode) {
+    public void setOrthCode(String orthCode) {
         this.orthCode = orthCode;
     }
 
-	public String getVersionName() {
+    public String getVersionName() {
         return this.versionName;
     }
 
-	public void setVersionName(String versionName) {
+    public void setVersionName(String versionName) {
         this.versionName = versionName;
     }
 
-	public Integer getCurationLevel() {
+    public Integer getCurationLevel() {
         return this.curationLevel;
     }
 
-	public void setCurationLevel(Integer curationLevel) {
+    public void setCurationLevel(Integer curationLevel) {
         this.curationLevel = curationLevel;
     }
 
-	public String getCurator() {
+    public String getCurator() {
         return this.curator;
     }
 
-	public void setCurator(String curator) {
+    public void setCurator(String curator) {
         this.curator = curator;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/GeneOrthologFileDTO.java b/src/main/java/com/labsynch/labseer/dto/GeneOrthologFileDTO.java
index 7e5b818f0..6a248371c 100644
--- a/src/main/java/com/labsynch/labseer/dto/GeneOrthologFileDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/GeneOrthologFileDTO.java
@@ -9,105 +9,103 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class GeneOrthologFileDTO {
-	
-	private String versionName;
-	private String testFileName;
+
+    private String versionName;
+    private String testFileName;
     private String orthologType;
     private Long curationLevel;
     private String description;
     private String curator;
     private String recordedBy;
-    
 
-	public String getVersionName() {
+    public String getVersionName() {
         return this.versionName;
     }
 
-	public void setVersionName(String versionName) {
+    public void setVersionName(String versionName) {
         this.versionName = versionName;
     }
 
-	public String getTestFileName() {
+    public String getTestFileName() {
         return this.testFileName;
     }
 
-	public void setTestFileName(String testFileName) {
+    public void setTestFileName(String testFileName) {
         this.testFileName = testFileName;
     }
 
-	public String getOrthologType() {
+    public String getOrthologType() {
         return this.orthologType;
     }
 
-	public void setOrthologType(String orthologType) {
+    public void setOrthologType(String orthologType) {
         this.orthologType = orthologType;
     }
 
-	public Long getCurationLevel() {
+    public Long getCurationLevel() {
         return this.curationLevel;
     }
 
-	public void setCurationLevel(Long curationLevel) {
+    public void setCurationLevel(Long curationLevel) {
         this.curationLevel = curationLevel;
     }
 
-	public String getDescription() {
+    public String getDescription() {
         return this.description;
     }
 
-	public void setDescription(String description) {
+    public void setDescription(String description) {
         this.description = description;
     }
 
-	public String getCurator() {
+    public String getCurator() {
         return this.curator;
     }
 
-	public void setCurator(String curator) {
+    public void setCurator(String curator) {
         this.curator = curator;
     }
 
-	public String getRecordedBy() {
+    public String getRecordedBy() {
         return this.recordedBy;
     }
 
-	public void setRecordedBy(String recordedBy) {
+    public void setRecordedBy(String recordedBy) {
         this.recordedBy = recordedBy;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static GeneOrthologFileDTO fromJsonToGeneOrthologFileDTO(String json) {
+    public static GeneOrthologFileDTO fromJsonToGeneOrthologFileDTO(String json) {
         return new JSONDeserializer<GeneOrthologFileDTO>()
-        .use(null, GeneOrthologFileDTO.class).deserialize(json);
+                .use(null, GeneOrthologFileDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<GeneOrthologFileDTO> collection) {
+    public static String toJsonArray(Collection<GeneOrthologFileDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<GeneOrthologFileDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<GeneOrthologFileDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<GeneOrthologFileDTO> fromJsonArrayToGeneOrtholoes(String json) {
+    public static Collection<GeneOrthologFileDTO> fromJsonArrayToGeneOrtholoes(String json) {
         return new JSONDeserializer<List<GeneOrthologFileDTO>>()
-        .use("values", GeneOrthologFileDTO.class).deserialize(json);
+                .use("values", GeneOrthologFileDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/GenericQueryCodeTableResultDTO.java b/src/main/java/com/labsynch/labseer/dto/GenericQueryCodeTableResultDTO.java
index ce1daf8ab..36d817715 100644
--- a/src/main/java/com/labsynch/labseer/dto/GenericQueryCodeTableResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/GenericQueryCodeTableResultDTO.java
@@ -12,70 +12,69 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class GenericQueryCodeTableResultDTO {
 
-	Integer maxResults;
-	
-	Integer numberOfResults;
-	
-	Collection<CodeTableDTO> results;
-	
-	public GenericQueryCodeTableResultDTO(){
-		
-	}
-	
-	@Transactional
+    Integer maxResults;
+
+    Integer numberOfResults;
+
+    Collection<CodeTableDTO> results;
+
+    public GenericQueryCodeTableResultDTO() {
+
+    }
+
+    @Transactional
     public String toJson() {
-        return new JSONSerializer().exclude("*.class").include("results").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().exclude("*.class").include("results").transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
-	
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static GenericQueryCodeTableResultDTO fromJsonToGenericQueryCodeTableResultDTO(String json) {
+    public static GenericQueryCodeTableResultDTO fromJsonToGenericQueryCodeTableResultDTO(String json) {
         return new JSONDeserializer<GenericQueryCodeTableResultDTO>()
-        .use(null, GenericQueryCodeTableResultDTO.class).deserialize(json);
+                .use(null, GenericQueryCodeTableResultDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<GenericQueryCodeTableResultDTO> collection) {
+    public static String toJsonArray(Collection<GenericQueryCodeTableResultDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<GenericQueryCodeTableResultDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<GenericQueryCodeTableResultDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<GenericQueryCodeTableResultDTO> fromJsonArrayToGenericQueryCoes(String json) {
+    public static Collection<GenericQueryCodeTableResultDTO> fromJsonArrayToGenericQueryCoes(String json) {
         return new JSONDeserializer<List<GenericQueryCodeTableResultDTO>>()
-        .use("values", GenericQueryCodeTableResultDTO.class).deserialize(json);
+                .use("values", GenericQueryCodeTableResultDTO.class).deserialize(json);
     }
 
-	public Integer getMaxResults() {
+    public Integer getMaxResults() {
         return this.maxResults;
     }
 
-	public void setMaxResults(Integer maxResults) {
+    public void setMaxResults(Integer maxResults) {
         this.maxResults = maxResults;
     }
 
-	public Integer getNumberOfResults() {
+    public Integer getNumberOfResults() {
         return this.numberOfResults;
     }
 
-	public void setNumberOfResults(Integer numberOfResults) {
+    public void setNumberOfResults(Integer numberOfResults) {
         this.numberOfResults = numberOfResults;
     }
 
-	public Collection<CodeTableDTO> getResults() {
+    public Collection<CodeTableDTO> getResults() {
         return this.results;
     }
 
-	public void setResults(Collection<CodeTableDTO> results) {
+    public void setResults(Collection<CodeTableDTO> results) {
         this.results = results;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/GenericStatePathRequest.java b/src/main/java/com/labsynch/labseer/dto/GenericStatePathRequest.java
index 8310e246b..c1c387a73 100644
--- a/src/main/java/com/labsynch/labseer/dto/GenericStatePathRequest.java
+++ b/src/main/java/com/labsynch/labseer/dto/GenericStatePathRequest.java
@@ -11,63 +11,60 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class GenericStatePathRequest {
 
-	public GenericStatePathRequest() {
-	}
+    public GenericStatePathRequest() {
+    }
+
+    private String idOrCodeName;
+
+    private String stateType;
 
-	private String idOrCodeName;
+    private String stateKind;
 
-	private String stateType;
-	
-	private String stateKind;
-	
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer().exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
     }
-	
-	public static String toJsonArray(Collection<GenericStatePathRequest> collection) {
+
+    public static String toJsonArray(Collection<GenericStatePathRequest> collection) {
         return new JSONSerializer().exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
-	public String getIdOrCodeName() {
+    public String getIdOrCodeName() {
         return this.idOrCodeName;
     }
 
-	public void setIdOrCodeName(String idOrCodeName) {
+    public void setIdOrCodeName(String idOrCodeName) {
         this.idOrCodeName = idOrCodeName;
     }
 
-	public String getStateType() {
+    public String getStateType() {
         return this.stateType;
     }
 
-	public void setStateType(String stateType) {
+    public void setStateType(String stateType) {
         this.stateType = stateType;
     }
 
-	public String getStateKind() {
+    public String getStateKind() {
         return this.stateKind;
     }
 
-	public void setStateKind(String stateKind) {
+    public void setStateKind(String stateKind) {
         this.stateKind = stateKind;
     }
 
-	public static GenericStatePathRequest fromJsonToGenericStatePathRequest(String json) {
+    public static GenericStatePathRequest fromJsonToGenericStatePathRequest(String json) {
         return new JSONDeserializer<GenericStatePathRequest>()
-        .use(null, GenericStatePathRequest.class).deserialize(json);
+                .use(null, GenericStatePathRequest.class).deserialize(json);
     }
 
-	public static Collection<GenericStatePathRequest> fromJsonArrayToGenericStatePathRequests(String json) {
+    public static Collection<GenericStatePathRequest> fromJsonArrayToGenericStatePathRequests(String json) {
         return new JSONDeserializer<List<GenericStatePathRequest>>()
-        .use("values", GenericStatePathRequest.class).deserialize(json);
+                .use("values", GenericStatePathRequest.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/GenericValuePathRequest.java b/src/main/java/com/labsynch/labseer/dto/GenericValuePathRequest.java
index a39674cf2..81dfa2a05 100644
--- a/src/main/java/com/labsynch/labseer/dto/GenericValuePathRequest.java
+++ b/src/main/java/com/labsynch/labseer/dto/GenericValuePathRequest.java
@@ -11,83 +11,80 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class GenericValuePathRequest {
 
-	public GenericValuePathRequest() {
-	}
+    public GenericValuePathRequest() {
+    }
+
+    private String idOrCodeName;
+
+    private String stateType;
+
+    private String stateKind;
 
-	private String idOrCodeName;
+    private String valueType;
 
-	private String stateType;
-	
-	private String stateKind;
-	
-	private String valueType;
-	
-	private String valueKind;
-	
-	public String toJson() {
+    private String valueKind;
+
+    public String toJson() {
         return new JSONSerializer().exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
     }
-	
-	public static String toJsonArray(Collection<GenericValuePathRequest> collection) {
+
+    public static String toJsonArray(Collection<GenericValuePathRequest> collection) {
         return new JSONSerializer().exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
-	public static GenericValuePathRequest fromJsonToGenericValuePathRequest(String json) {
+    public static GenericValuePathRequest fromJsonToGenericValuePathRequest(String json) {
         return new JSONDeserializer<GenericValuePathRequest>()
-        .use(null, GenericValuePathRequest.class).deserialize(json);
+                .use(null, GenericValuePathRequest.class).deserialize(json);
     }
 
-	public static Collection<GenericValuePathRequest> fromJsonArrayToGenericValuePathRequests(String json) {
+    public static Collection<GenericValuePathRequest> fromJsonArrayToGenericValuePathRequests(String json) {
         return new JSONDeserializer<List<GenericValuePathRequest>>()
-        .use("values", GenericValuePathRequest.class).deserialize(json);
+                .use("values", GenericValuePathRequest.class).deserialize(json);
     }
 
-	public String getIdOrCodeName() {
+    public String getIdOrCodeName() {
         return this.idOrCodeName;
     }
 
-	public void setIdOrCodeName(String idOrCodeName) {
+    public void setIdOrCodeName(String idOrCodeName) {
         this.idOrCodeName = idOrCodeName;
     }
 
-	public String getStateType() {
+    public String getStateType() {
         return this.stateType;
     }
 
-	public void setStateType(String stateType) {
+    public void setStateType(String stateType) {
         this.stateType = stateType;
     }
 
-	public String getStateKind() {
+    public String getStateKind() {
         return this.stateKind;
     }
 
-	public void setStateKind(String stateKind) {
+    public void setStateKind(String stateKind) {
         this.stateKind = stateKind;
     }
 
-	public String getValueType() {
+    public String getValueType() {
         return this.valueType;
     }
 
-	public void setValueType(String valueType) {
+    public void setValueType(String valueType) {
         this.valueType = valueType;
     }
 
-	public String getValueKind() {
+    public String getValueKind() {
         return this.valueKind;
     }
 
-	public void setValueKind(String valueKind) {
+    public void setValueKind(String valueKind) {
         this.valueKind = valueKind;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/HydrogenizeMolInputDTO.java b/src/main/java/com/labsynch/labseer/dto/HydrogenizeMolInputDTO.java
index fc1c2fd39..c2e91ebc3 100644
--- a/src/main/java/com/labsynch/labseer/dto/HydrogenizeMolInputDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/HydrogenizeMolInputDTO.java
@@ -7,71 +7,69 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-
 public class HydrogenizeMolInputDTO {
-	
-	private String structure;
-	
-	private String inputFormat;
-	
-	private MethodOptionDTO parameters;
 
+    private String structure;
+
+    private String inputFormat;
+
+    private MethodOptionDTO parameters;
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static HydrogenizeMolInputDTO fromJsonToHydrogenizeMolInputDTO(String json) {
+    public static HydrogenizeMolInputDTO fromJsonToHydrogenizeMolInputDTO(String json) {
         return new JSONDeserializer<HydrogenizeMolInputDTO>()
-        .use(null, HydrogenizeMolInputDTO.class).deserialize(json);
+                .use(null, HydrogenizeMolInputDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<HydrogenizeMolInputDTO> collection) {
+    public static String toJsonArray(Collection<HydrogenizeMolInputDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<HydrogenizeMolInputDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<HydrogenizeMolInputDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<HydrogenizeMolInputDTO> fromJsonArrayToHydrogenizeMoes(String json) {
+    public static Collection<HydrogenizeMolInputDTO> fromJsonArrayToHydrogenizeMoes(String json) {
         return new JSONDeserializer<List<HydrogenizeMolInputDTO>>()
-        .use("values", HydrogenizeMolInputDTO.class).deserialize(json);
+                .use("values", HydrogenizeMolInputDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getStructure() {
+    public String getStructure() {
         return this.structure;
     }
 
-	public void setStructure(String structure) {
+    public void setStructure(String structure) {
         this.structure = structure;
     }
 
-	public String getInputFormat() {
+    public String getInputFormat() {
         return this.inputFormat;
     }
 
-	public void setInputFormat(String inputFormat) {
+    public void setInputFormat(String inputFormat) {
         this.inputFormat = inputFormat;
     }
 
-	public MethodOptionDTO getParameters() {
+    public MethodOptionDTO getParameters() {
         return this.parameters;
     }
 
-	public void setParameters(MethodOptionDTO parameters) {
+    public void setParameters(MethodOptionDTO parameters) {
         this.parameters = parameters;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/IdCollectionDTO.java b/src/main/java/com/labsynch/labseer/dto/IdCollectionDTO.java
index 6cd176918..45872ab35 100755
--- a/src/main/java/com/labsynch/labseer/dto/IdCollectionDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/IdCollectionDTO.java
@@ -7,63 +7,59 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-
 public class IdCollectionDTO {
-	
-	private Long id;
 
-	private Integer version;
+    private Long id;
 
+    private Integer version;
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static IdCollectionDTO fromJsonToIdCollectionDTO(String json) {
+    public static IdCollectionDTO fromJsonToIdCollectionDTO(String json) {
         return new JSONDeserializer<IdCollectionDTO>()
-        .use(null, IdCollectionDTO.class).deserialize(json);
+                .use(null, IdCollectionDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<IdCollectionDTO> collection) {
+    public static String toJsonArray(Collection<IdCollectionDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<IdCollectionDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<IdCollectionDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<IdCollectionDTO> fromJsonArrayToIdCollectioes(String json) {
+    public static Collection<IdCollectionDTO> fromJsonArrayToIdCollectioes(String json) {
         return new JSONDeserializer<List<IdCollectionDTO>>()
-        .use("values", IdCollectionDTO.class).deserialize(json);
+                .use("values", IdCollectionDTO.class).deserialize(json);
     }
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/IdSetDTO.java b/src/main/java/com/labsynch/labseer/dto/IdSetDTO.java
index 8f57564e7..da4208438 100644
--- a/src/main/java/com/labsynch/labseer/dto/IdSetDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/IdSetDTO.java
@@ -10,40 +10,36 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-
 public class IdSetDTO {
-	
-	private Set<Long> idSet = new HashSet<Long>();
 
-	
+    private Set<Long> idSet = new HashSet<Long>();
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer().include("idSet").exclude("*.class").serialize(this);
     }
 
-	public static IdSetDTO fromJsonToIdSetDTO(String json) {
+    public static IdSetDTO fromJsonToIdSetDTO(String json) {
         return new JSONDeserializer<IdSetDTO>().use(null, IdSetDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<IdSetDTO> collection) {
+    public static String toJsonArray(Collection<IdSetDTO> collection) {
         return new JSONSerializer().include("idSet").exclude("*.class").serialize(collection);
     }
 
-	public static Collection<IdSetDTO> fromJsonArrayToIdSetDTO(String json) {
-        return new JSONDeserializer<List<IdSetDTO>>().use(null, ArrayList.class).use("values", IdSetDTO.class).deserialize(json);
+    public static Collection<IdSetDTO> fromJsonArrayToIdSetDTO(String json) {
+        return new JSONDeserializer<List<IdSetDTO>>().use(null, ArrayList.class).use("values", IdSetDTO.class)
+                .deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public Set<Long> getIdSet() {
+    public Set<Long> getIdSet() {
         return this.idSet;
     }
 
-	public void setIdSet(Set<Long> idSet) {
+    public void setIdSet(Set<Long> idSet) {
         this.idSet = idSet;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/ItxQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/ItxQueryDTO.java
index 934b4508f..7006f84b1 100644
--- a/src/main/java/com/labsynch/labseer/dto/ItxQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ItxQueryDTO.java
@@ -9,137 +9,135 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ItxQueryDTO {
 
-	
-	String interactionType;
-	String interactionKind;
-	String thingType;
-	String thingKind;
-	String thingLabelText;
-	String thingLabelType;
-	String thingLabelKind;
-	String thingCodeName;
-	String operator;
-	
-	Collection<ValueQueryDTO> thingValues;
-		
-	public ItxQueryDTO(){
-		
-	}
-
-	public String getInteractionType() {
+    String interactionType;
+    String interactionKind;
+    String thingType;
+    String thingKind;
+    String thingLabelText;
+    String thingLabelType;
+    String thingLabelKind;
+    String thingCodeName;
+    String operator;
+
+    Collection<ValueQueryDTO> thingValues;
+
+    public ItxQueryDTO() {
+
+    }
+
+    public String getInteractionType() {
         return this.interactionType;
     }
 
-	public void setInteractionType(String interactionType) {
+    public void setInteractionType(String interactionType) {
         this.interactionType = interactionType;
     }
 
-	public String getInteractionKind() {
+    public String getInteractionKind() {
         return this.interactionKind;
     }
 
-	public void setInteractionKind(String interactionKind) {
+    public void setInteractionKind(String interactionKind) {
         this.interactionKind = interactionKind;
     }
 
-	public String getThingType() {
+    public String getThingType() {
         return this.thingType;
     }
 
-	public void setThingType(String thingType) {
+    public void setThingType(String thingType) {
         this.thingType = thingType;
     }
 
-	public String getThingKind() {
+    public String getThingKind() {
         return this.thingKind;
     }
 
-	public void setThingKind(String thingKind) {
+    public void setThingKind(String thingKind) {
         this.thingKind = thingKind;
     }
 
-	public String getThingLabelText() {
+    public String getThingLabelText() {
         return this.thingLabelText;
     }
 
-	public void setThingLabelText(String thingLabelText) {
+    public void setThingLabelText(String thingLabelText) {
         this.thingLabelText = thingLabelText;
     }
 
-	public String getThingLabelType() {
+    public String getThingLabelType() {
         return this.thingLabelType;
     }
 
-	public void setThingLabelType(String thingLabelType) {
+    public void setThingLabelType(String thingLabelType) {
         this.thingLabelType = thingLabelType;
     }
 
-	public String getThingLabelKind() {
+    public String getThingLabelKind() {
         return this.thingLabelKind;
     }
 
-	public void setThingLabelKind(String thingLabelKind) {
+    public void setThingLabelKind(String thingLabelKind) {
         this.thingLabelKind = thingLabelKind;
     }
 
-	public String getThingCodeName() {
+    public String getThingCodeName() {
         return this.thingCodeName;
     }
 
-	public void setThingCodeName(String thingCodeName) {
+    public void setThingCodeName(String thingCodeName) {
         this.thingCodeName = thingCodeName;
     }
 
-	public String getOperator() {
+    public String getOperator() {
         return this.operator;
     }
 
-	public void setOperator(String operator) {
+    public void setOperator(String operator) {
         this.operator = operator;
     }
 
-	public Collection<ValueQueryDTO> getThingValues() {
+    public Collection<ValueQueryDTO> getThingValues() {
         return this.thingValues;
     }
 
-	public void setThingValues(Collection<ValueQueryDTO> thingValues) {
+    public void setThingValues(Collection<ValueQueryDTO> thingValues) {
         this.thingValues = thingValues;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ItxQueryDTO fromJsonToItxQueryDTO(String json) {
+    public static ItxQueryDTO fromJsonToItxQueryDTO(String json) {
         return new JSONDeserializer<ItxQueryDTO>()
-        .use(null, ItxQueryDTO.class).deserialize(json);
+                .use(null, ItxQueryDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ItxQueryDTO> collection) {
+    public static String toJsonArray(Collection<ItxQueryDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ItxQueryDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<ItxQueryDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ItxQueryDTO> fromJsonArrayToItxQueryDTO(String json) {
+    public static Collection<ItxQueryDTO> fromJsonArrayToItxQueryDTO(String json) {
         return new JSONDeserializer<List<ItxQueryDTO>>()
-        .use("values", ItxQueryDTO.class).deserialize(json);
+                .use("values", ItxQueryDTO.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/JSTreeNodeDTO.java b/src/main/java/com/labsynch/labseer/dto/JSTreeNodeDTO.java
index ab289fd34..a7a961af4 100755
--- a/src/main/java/com/labsynch/labseer/dto/JSTreeNodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/JSTreeNodeDTO.java
@@ -16,50 +16,42 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class JSTreeNodeDTO {
-	
-	private String id; // use codeName
-	private String parent; //ref node parent id -- use # to set as root
-	private String text; // node text
-	private String description; // node text
-	private Set<LsTag> lsTags = new HashSet<LsTag>();
 
+    private String id; // use codeName
+    private String parent; // ref node parent id -- use # to set as root
+    private String text; // node text
+    private String description; // node text
+    private Set<LsTag> lsTags = new HashSet<LsTag>();
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer().exclude("*.class").serialize(this);
     }
 
-	public static JSTreeNodeDTO fromJsonToJSTreeNodeDTO(String json) {
+    public static JSTreeNodeDTO fromJsonToJSTreeNodeDTO(String json) {
         return new JSONDeserializer<JSTreeNodeDTO>().use(null, JSTreeNodeDTO.class).deserialize(json);
     }
 
-
-	public static String toJsonArray(Collection<JSTreeNodeDTO> collection) {
+    public static String toJsonArray(Collection<JSTreeNodeDTO> collection) {
         return toJsonArray(collection, false);
     }
-	
-	public static String toPrettyJsonArray(Collection<JSTreeNodeDTO> collection) {
+
+    public static String toPrettyJsonArray(Collection<JSTreeNodeDTO> collection) {
         return toJsonArray(collection, true);
     }
 
-	public static String toJsonArray(Collection<JSTreeNodeDTO> collection, boolean pretty) {
-        return new JSONSerializer().
-        		prettyPrint(pretty).
-        		include("lsTags").
-        		exclude("*.class").
-        		serialize(collection);
+    public static String toJsonArray(Collection<JSTreeNodeDTO> collection, boolean pretty) {
+        return new JSONSerializer().prettyPrint(pretty).include("lsTags").exclude("*.class").serialize(collection);
     }
 
-	public static Collection<JSTreeNodeDTO> fromJsonArrayToJSTreeNoes(String json) {
-        return new JSONDeserializer<List<JSTreeNodeDTO>>().use(null, ArrayList.class).use("values", JSTreeNodeDTO.class).deserialize(json);
+    public static Collection<JSTreeNodeDTO> fromJsonArrayToJSTreeNoes(String json) {
+        return new JSONDeserializer<List<JSTreeNodeDTO>>().use(null, ArrayList.class).use("values", JSTreeNodeDTO.class)
+                .deserialize(json);
     }
-	
+
     public int hashCode() {
         return new HashCodeBuilder(17, 31). // two randomly chosen prime numbers
-            append(id).
-            append(parent).
-            toHashCode();
+                append(id).append(parent).toHashCode();
     }
 
     public boolean equals(Object obj) {
@@ -71,55 +63,50 @@ public boolean equals(Object obj) {
             return false;
 
         JSTreeNodeDTO rhs = (JSTreeNodeDTO) obj;
-        return new EqualsBuilder().
-            append(id, rhs.id).
-            append(parent, rhs.parent).
-            isEquals();
+        return new EqualsBuilder().append(id, rhs.id).append(parent, rhs.parent).isEquals();
     }
 
-	public String getId() {
+    public String getId() {
         return this.id;
     }
 
-	public void setId(String id) {
+    public void setId(String id) {
         this.id = id;
     }
 
-	public String getParent() {
+    public String getParent() {
         return this.parent;
     }
 
-	public void setParent(String parent) {
+    public void setParent(String parent) {
         this.parent = parent;
     }
 
-	public String getText() {
+    public String getText() {
         return this.text;
     }
 
-	public void setText(String text) {
+    public void setText(String text) {
         this.text = text;
     }
 
-	public String getDescription() {
+    public String getDescription() {
         return this.description;
     }
 
-	public void setDescription(String description) {
+    public void setDescription(String description) {
         this.description = description;
     }
 
-	public Set<LsTag> getLsTags() {
+    public Set<LsTag> getLsTags() {
         return this.lsTags;
     }
 
-	public void setLsTags(Set<LsTag> lsTags) {
+    public void setLsTags(Set<LsTag> lsTags) {
         this.lsTags = lsTags;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/KeyValueDTO.java b/src/main/java/com/labsynch/labseer/dto/KeyValueDTO.java
index 7806dd051..5e12a2b73 100644
--- a/src/main/java/com/labsynch/labseer/dto/KeyValueDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/KeyValueDTO.java
@@ -9,63 +9,59 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class KeyValueDTO {
 
-	private String key;
+    private String key;
 
-	private String value;
-	
+    private String value;
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static KeyValueDTO fromJsonToKeyValueDTO(String json) {
+    public static KeyValueDTO fromJsonToKeyValueDTO(String json) {
         return new JSONDeserializer<KeyValueDTO>()
-        .use(null, KeyValueDTO.class).deserialize(json);
+                .use(null, KeyValueDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<KeyValueDTO> collection) {
+    public static String toJsonArray(Collection<KeyValueDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<KeyValueDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<KeyValueDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<KeyValueDTO> fromJsonArrayToKeyValueDTO(String json) {
+    public static Collection<KeyValueDTO> fromJsonArrayToKeyValueDTO(String json) {
         return new JSONDeserializer<List<KeyValueDTO>>()
-        .use("values", KeyValueDTO.class).deserialize(json);
+                .use("values", KeyValueDTO.class).deserialize(json);
     }
 
-	public String getKey() {
+    public String getKey() {
         return this.key;
     }
 
-	public void setKey(String key) {
+    public void setKey(String key) {
         this.key = key;
     }
 
-	public String getValue() {
+    public String getValue() {
         return this.value;
     }
 
-	public void setValue(String value) {
+    public void setValue(String value) {
         this.value = value;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/KiCurveFitDTO.java b/src/main/java/com/labsynch/labseer/dto/KiCurveFitDTO.java
index c61257cb4..0aeaf9bc8 100644
--- a/src/main/java/com/labsynch/labseer/dto/KiCurveFitDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/KiCurveFitDTO.java
@@ -34,20 +34,19 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class KiCurveFitDTO {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(KiCurveFitDTO.class);
 
-	public KiCurveFitDTO(){
-		//empty constructor
+	public KiCurveFitDTO() {
+		// empty constructor
 	}
-	
+
 	public KiCurveFitDTO(String curveId) {
 		this.curveId = curveId;
 	}
-	
-	public KiCurveFitDTO(Map dataMap){
+
+	public KiCurveFitDTO(Map dataMap) {
 		this.curveId = (String) dataMap.get("curveId");
 		this.analysisGroupCode = (String) dataMap.get("analysisGroupCode");
 		this.recordedBy = (String) dataMap.get("recordedBy");
@@ -56,12 +55,18 @@ public KiCurveFitDTO(Map dataMap){
 		this.batchCode = (String) dataMap.get("batchCode");
 		this.category = (String) dataMap.get("category");
 		this.renderingHint = (String) dataMap.get("renderingHint");
-		if (dataMap.get("minNumeric") != null) this.min = ((BigDecimal) dataMap.get("minNumeric")).toString();
-		else this.min = (String) dataMap.get("minString");
-		if (dataMap.get("maxNumeric") != null) this.max = ((BigDecimal) dataMap.get("maxNumeric")).toString();
-		else this.max = (String) dataMap.get("maxString");
-		if (dataMap.get("kiNumeric") != null) this.ki = ((BigDecimal) dataMap.get("kiNumeric")).toString();
-		else this.ki = (String) dataMap.get("kiString");
+		if (dataMap.get("minNumeric") != null)
+			this.min = ((BigDecimal) dataMap.get("minNumeric")).toString();
+		else
+			this.min = (String) dataMap.get("minString");
+		if (dataMap.get("maxNumeric") != null)
+			this.max = ((BigDecimal) dataMap.get("maxNumeric")).toString();
+		else
+			this.max = (String) dataMap.get("maxString");
+		if (dataMap.get("kiNumeric") != null)
+			this.ki = ((BigDecimal) dataMap.get("kiNumeric")).toString();
+		else
+			this.ki = (String) dataMap.get("kiString");
 		this.minUnits = (String) dataMap.get("minUnits");
 		this.maxUnits = (String) dataMap.get("maxUnits");
 		this.kiUnits = (String) dataMap.get("kiUnits");
@@ -105,7 +110,6 @@ public KiCurveFitDTO(Map dataMap){
 		this.algorithmFlagStatus = (String) dataMap.get("algorithmFlagStatus");
 	}
 
-
 	private String curveId;
 	private String analysisGroupCode;
 	private String recordedBy;
@@ -158,11 +162,8 @@ public KiCurveFitDTO(Map dataMap){
 	private String fitSummaryClob;
 	private String userFlagStatus;
 	private String algorithmFlagStatus;
-	
-	
 
-
-	public static String[] getColumns(){
+	public static String[] getColumns() {
 		String[] headerColumns = new String[] {
 				"curveId",
 				"analysisGroupCode",
@@ -216,14 +217,14 @@ public static String[] getColumns(){
 				"fitSummaryClob",
 				"userFlagStatus",
 				"algorithmFlagStatus"
-				};
+		};
 
 		return headerColumns;
 
 	}
 
 	public static CellProcessor[] getProcessors() {
-		final CellProcessor[] processors = new CellProcessor[] { 
+		final CellProcessor[] processors = new CellProcessor[] {
 				new Optional(),
 				new Optional(),
 				new Optional(),
@@ -280,69 +281,70 @@ public static CellProcessor[] getProcessors() {
 
 		return processors;
 	}
-	
+
 	@Transactional
-	public static Collection<KiCurveFitDTO> getFitData(Collection<String> curveIds){
+	public static Collection<KiCurveFitDTO> getFitData(Collection<String> curveIds) {
 		EntityManager em = SubjectValue.entityManager();
-		if (curveIds.isEmpty()) return new ArrayList<KiCurveFitDTO>();
+		if (curveIds.isEmpty())
+			return new ArrayList<KiCurveFitDTO>();
 		String queryString = "SELECT NEW MAP( curveIdValue.stringValue as curveId, "
 				+ "ag.codeName as analysisGroupCode, "
 				+ "curveIdValue.recordedBy as recordedBy, "
-        		+ "curveIdValue.lsTransaction as lsTransaction, "
+				+ "curveIdValue.lsTransaction as lsTransaction, "
 				+ "curveIdValue.recordedDate as recordedDate, "
-        		+ "batchCodeValue.codeValue as batchCode, "
-        		+ "categoryValue.stringValue as category, "
-        		+ "renderingHintValue.stringValue as renderingHint, "
-        		+ "minValue.stringValue as minString, "
-        		+ "minValue.numericValue as minNumeric, "
-        		+ "maxValue.stringValue as maxString, "
-        		+ "maxValue.numericValue as maxNumeric, "
-        		+ "kiValue.stringValue as kiString, "
-        		+ "kiValue.numericValue as kiNumeric, "
-        		+ "minValue.unitKind as minUnits, "
-        		+ "maxValue.unitKind as maxUnits, "
-        		+ "kiValue.unitKind as kiUnits, "
-        		+ "kdValue.numericValue as kd, "
-        		+ "kdValue.unitKind as kdUnits, "
-        		+ "kdValue.uncertainty as kdUncertainty, "
-        		+ "kdValue.uncertaintyType as kdUncertaintyType, "
-        		+ "ligandConcValue.numericValue as ligandConc, "
-        		+ "ligandConcValue.unitKind as ligandConcUnits, "
-        		+ "ligandConcValue.uncertainty as ligandConcUncertainty, "
-        		+ "ligandConcValue.uncertaintyType as ligandConcUncertaintyType, "
-        		+ "minValue.uncertainty as minUncertainty, "
-        		+ "maxValue.uncertainty as maxUncertainty, "
-        		+ "kiValue.uncertainty as kiUncertainty, "
-        		+ "minValue.uncertaintyType as minUncertaintyType, "
-        		+ "maxValue.uncertaintyType as maxUncertaintyType, "
-        		+ "kiValue.uncertaintyType as kiUncertaintyType, "
-        		+ "minValue.operatorKind as minOperatorKind, "
-        		+ "maxValue.operatorKind as maxOperatorKind, "
-        		+ "kiValue.operatorKind as kiOperatorKind, "
-        		+ "ligandConcValue.operatorKind as ligandConcOperatorKind, "
-        		+ "kdValue.operatorKind as kdValueOperatorKind, "
-        		+ "fittedMinValue.numericValue as fittedMin, "
-        		+ "fittedMaxValue.numericValue as fittedMax, "
-        		+ "fittedKiValue.numericValue as fittedKi, "
-        		+ "fittedMinValue.uncertainty as fittedMinUncertainty, "
-        		+ "fittedMaxValue.uncertainty as fittedMaxUncertainty, "
-        		+ "fittedKiValue.uncertainty as fittedKiUncertainty, "
-        		+ "fittedMinValue.uncertaintyType as fittedMinUncertaintyType, "
-        		+ "fittedMaxValue.uncertaintyType as fittedMaxUncertaintyType, "
-        		+ "fittedKiValue.uncertaintyType as fittedKiUncertaintyType, "
-        		+ "sseValue.numericValue as sse, "
-        		+ "sstValue.numericValue as sst, "
-        		+ "rSquaredValue.numericValue as rsquared, "
-        		+ "curveErrorsClobValue.clobValue as curveErrorsClob, "
-        		+ "reportedValuesClobValue.clobValue as reportedValuesClob, "
-        		+ "parameterStdErrorsClobValue.clobValue as parameterStdErrorsClob, "
-        		+ "fitSettingsValue.clobValue as fitSettings, "
-        		+ "fitSummaryClobValue.clobValue as fitSummaryClob, "
-        		+ "userFlagStatusValue.codeValue as userFlagStatus, "
-        		+ "algorithmFlagStatusValue.codeValue as algorithmFlagStatus "
-        		+ " ) " 
-        		+ "FROM AnalysisGroup ag "
-        		+ "JOIN ag.lsStates as ags "
+				+ "batchCodeValue.codeValue as batchCode, "
+				+ "categoryValue.stringValue as category, "
+				+ "renderingHintValue.stringValue as renderingHint, "
+				+ "minValue.stringValue as minString, "
+				+ "minValue.numericValue as minNumeric, "
+				+ "maxValue.stringValue as maxString, "
+				+ "maxValue.numericValue as maxNumeric, "
+				+ "kiValue.stringValue as kiString, "
+				+ "kiValue.numericValue as kiNumeric, "
+				+ "minValue.unitKind as minUnits, "
+				+ "maxValue.unitKind as maxUnits, "
+				+ "kiValue.unitKind as kiUnits, "
+				+ "kdValue.numericValue as kd, "
+				+ "kdValue.unitKind as kdUnits, "
+				+ "kdValue.uncertainty as kdUncertainty, "
+				+ "kdValue.uncertaintyType as kdUncertaintyType, "
+				+ "ligandConcValue.numericValue as ligandConc, "
+				+ "ligandConcValue.unitKind as ligandConcUnits, "
+				+ "ligandConcValue.uncertainty as ligandConcUncertainty, "
+				+ "ligandConcValue.uncertaintyType as ligandConcUncertaintyType, "
+				+ "minValue.uncertainty as minUncertainty, "
+				+ "maxValue.uncertainty as maxUncertainty, "
+				+ "kiValue.uncertainty as kiUncertainty, "
+				+ "minValue.uncertaintyType as minUncertaintyType, "
+				+ "maxValue.uncertaintyType as maxUncertaintyType, "
+				+ "kiValue.uncertaintyType as kiUncertaintyType, "
+				+ "minValue.operatorKind as minOperatorKind, "
+				+ "maxValue.operatorKind as maxOperatorKind, "
+				+ "kiValue.operatorKind as kiOperatorKind, "
+				+ "ligandConcValue.operatorKind as ligandConcOperatorKind, "
+				+ "kdValue.operatorKind as kdValueOperatorKind, "
+				+ "fittedMinValue.numericValue as fittedMin, "
+				+ "fittedMaxValue.numericValue as fittedMax, "
+				+ "fittedKiValue.numericValue as fittedKi, "
+				+ "fittedMinValue.uncertainty as fittedMinUncertainty, "
+				+ "fittedMaxValue.uncertainty as fittedMaxUncertainty, "
+				+ "fittedKiValue.uncertainty as fittedKiUncertainty, "
+				+ "fittedMinValue.uncertaintyType as fittedMinUncertaintyType, "
+				+ "fittedMaxValue.uncertaintyType as fittedMaxUncertaintyType, "
+				+ "fittedKiValue.uncertaintyType as fittedKiUncertaintyType, "
+				+ "sseValue.numericValue as sse, "
+				+ "sstValue.numericValue as sst, "
+				+ "rSquaredValue.numericValue as rsquared, "
+				+ "curveErrorsClobValue.clobValue as curveErrorsClob, "
+				+ "reportedValuesClobValue.clobValue as reportedValuesClob, "
+				+ "parameterStdErrorsClobValue.clobValue as parameterStdErrorsClob, "
+				+ "fitSettingsValue.clobValue as fitSettings, "
+				+ "fitSummaryClobValue.clobValue as fitSummaryClob, "
+				+ "userFlagStatusValue.codeValue as userFlagStatus, "
+				+ "algorithmFlagStatusValue.codeValue as algorithmFlagStatus "
+				+ " ) "
+				+ "FROM AnalysisGroup ag "
+				+ "JOIN ag.lsStates as ags "
 				+ "LEFT JOIN ags.lsValues as curveIdValue WITH curveIdValue.lsKind = 'curve id' "
 				+ "LEFT JOIN ags.lsValues as batchCodeValue WITH batchCodeValue.lsKind = 'batch code' "
 				+ "LEFT JOIN ags.lsValues as categoryValue WITH categoryValue.lsKind = 'category' "
@@ -365,113 +367,128 @@ public static Collection<KiCurveFitDTO> getFitData(Collection<String> curveIds){
 				+ "LEFT JOIN ags.lsValues as fitSummaryClobValue WITH fitSummaryClobValue.lsKind = 'fitSummaryClob' "
 				+ "LEFT JOIN ags.lsValues as userFlagStatusValue WITH userFlagStatusValue.lsKind = 'user flag status' "
 				+ "LEFT JOIN ags.lsValues as algorithmFlagStatusValue WITH algorithmFlagStatusValue.lsKind = 'algorithm flag status' "
-        		+ "WHERE ag.ignored = false " 
-        		+ "AND ags.ignored = false "
-        		+ "AND curveIdValue.ignored = false "
-        		+ "AND (";
-        Map<String, Collection<String>> sqlCurveIdMap = new HashMap<String, Collection<String>>();
-    	List<String> allCurveIds = new ArrayList<String>();
-    	allCurveIds.addAll(curveIds);
-    	int startIndex = 0;
-    	while (startIndex < curveIds.size()){
-    		int endIndex;
-    		if (startIndex+999 < curveIds.size()) endIndex = startIndex+999;
-    		else endIndex = curveIds.size();
-    		List<String> nextCurveIds = allCurveIds.subList(startIndex, endIndex);
-    		String groupName = "curveIds"+startIndex;
-    		String sqlClause = " curveIdValue.stringValue IN (:"+groupName+")";
-    		sqlCurveIdMap.put(sqlClause, nextCurveIds);
-    		startIndex=endIndex;
-    	}
-    	int numClause = 1;
-    	for (String sqlClause : sqlCurveIdMap.keySet()){
-    		if (numClause == 1){
-    			queryString = queryString + sqlClause;
-    		}else{
-    			queryString = queryString + " OR " + sqlClause;
-    		}
-    		numClause++;
-    	}
-    	queryString = queryString + " )";
+				+ "WHERE ag.ignored = false "
+				+ "AND ags.ignored = false "
+				+ "AND curveIdValue.ignored = false "
+				+ "AND (";
+		Map<String, Collection<String>> sqlCurveIdMap = new HashMap<String, Collection<String>>();
+		List<String> allCurveIds = new ArrayList<String>();
+		allCurveIds.addAll(curveIds);
+		int startIndex = 0;
+		while (startIndex < curveIds.size()) {
+			int endIndex;
+			if (startIndex + 999 < curveIds.size())
+				endIndex = startIndex + 999;
+			else
+				endIndex = curveIds.size();
+			List<String> nextCurveIds = allCurveIds.subList(startIndex, endIndex);
+			String groupName = "curveIds" + startIndex;
+			String sqlClause = " curveIdValue.stringValue IN (:" + groupName + ")";
+			sqlCurveIdMap.put(sqlClause, nextCurveIds);
+			startIndex = endIndex;
+		}
+		int numClause = 1;
+		for (String sqlClause : sqlCurveIdMap.keySet()) {
+			if (numClause == 1) {
+				queryString = queryString + sqlClause;
+			} else {
+				queryString = queryString + " OR " + sqlClause;
+			}
+			numClause++;
+		}
+		queryString = queryString + " )";
 		TypedQuery<Map> q = em.createQuery(queryString, Map.class);
-        for (String sqlClause : sqlCurveIdMap.keySet()){
-        	String groupName = sqlClause.split(":")[1].replace(")","");
-        	q.setParameter(groupName, sqlCurveIdMap.get(sqlClause));
-        }
-        logger.debug("Querying with string: \n"+queryString);
-        List<Map> queryResults = q.getResultList();
-        logger.debug(queryResults.size()+" results found");
-        List<KiCurveFitDTO> curveFitDTOList = new ArrayList<KiCurveFitDTO>();
+		for (String sqlClause : sqlCurveIdMap.keySet()) {
+			String groupName = sqlClause.split(":")[1].replace(")", "");
+			q.setParameter(groupName, sqlCurveIdMap.get(sqlClause));
+		}
+		logger.debug("Querying with string: \n" + queryString);
+		List<Map> queryResults = q.getResultList();
+		logger.debug(queryResults.size() + " results found");
+		List<KiCurveFitDTO> curveFitDTOList = new ArrayList<KiCurveFitDTO>();
 		for (Map result : queryResults) {
 			KiCurveFitDTO curveFitDTO = new KiCurveFitDTO(result);
 			curveFitDTOList.add(curveFitDTO);
 		}
 		return curveFitDTOList;
-		
+
 	}
-	
+
 	public static String getCsvList(Collection<KiCurveFitDTO> curveFitDTOs, String format) {
-		//format is ALWAYS tsv or csv (not case sensitive)
+		// format is ALWAYS tsv or csv (not case sensitive)
 		StringWriter outFile = new StringWriter();
-        ICsvBeanWriter beanWriter = null;
-        try {
-            if (format.equalsIgnoreCase("csv")) beanWriter = new CsvBeanWriter(outFile, CsvPreference.STANDARD_PREFERENCE);
-            else beanWriter = new CsvBeanWriter(outFile, CsvPreference.TAB_PREFERENCE);
-            final String[] header = KiCurveFitDTO.getColumns();
-            final CellProcessor[] processors = KiCurveFitDTO.getProcessors();
-            beanWriter.writeHeader(header);
-            for (final KiCurveFitDTO curveFitDTO : curveFitDTOs) {
-                beanWriter.write(curveFitDTO, header, processors);
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            if (beanWriter != null) {
-                try {
-                    beanWriter.close();
-                    outFile.flush();
-                    outFile.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return outFile.toString();
-	}
-
-	public static void updateFitData( Collection<KiCurveFitDTO> curveFitDTOs) {
+		ICsvBeanWriter beanWriter = null;
+		try {
+			if (format.equalsIgnoreCase("csv"))
+				beanWriter = new CsvBeanWriter(outFile, CsvPreference.STANDARD_PREFERENCE);
+			else
+				beanWriter = new CsvBeanWriter(outFile, CsvPreference.TAB_PREFERENCE);
+			final String[] header = KiCurveFitDTO.getColumns();
+			final CellProcessor[] processors = KiCurveFitDTO.getProcessors();
+			beanWriter.writeHeader(header);
+			for (final KiCurveFitDTO curveFitDTO : curveFitDTOs) {
+				beanWriter.write(curveFitDTO, header, processors);
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
+		} finally {
+			if (beanWriter != null) {
+				try {
+					beanWriter.close();
+					outFile.flush();
+					outFile.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+		return outFile.toString();
+	}
+
+	public static void updateFitData(Collection<KiCurveFitDTO> curveFitDTOs) {
 		for (KiCurveFitDTO curveFitDTO : curveFitDTOs) {
-			if (curveFitDTO.getAnalysisGroupCode() == null) logger.error("FIELD MISSING: analysisGroupCode");
-			if (curveFitDTO.getRecordedBy() == null) logger.error("FIELD MISSING: recordedBy");
-			if (curveFitDTO.getLsTransaction() == null) logger.error("FIELD MISSING: lsTransaction");
-			AnalysisGroup analysisGroup = AnalysisGroup.findAnalysisGroupsByCodeNameEquals(curveFitDTO.getAnalysisGroupCode()).getSingleResult();
+			if (curveFitDTO.getAnalysisGroupCode() == null)
+				logger.error("FIELD MISSING: analysisGroupCode");
+			if (curveFitDTO.getRecordedBy() == null)
+				logger.error("FIELD MISSING: recordedBy");
+			if (curveFitDTO.getLsTransaction() == null)
+				logger.error("FIELD MISSING: lsTransaction");
+			AnalysisGroup analysisGroup = AnalysisGroup
+					.findAnalysisGroupsByCodeNameEquals(curveFitDTO.getAnalysisGroupCode()).getSingleResult();
 			try {
-				AnalysisGroupState oldState = AnalysisGroupState.findAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(analysisGroup, "data", "dose response", true).getSingleResult();
+				AnalysisGroupState oldState = AnalysisGroupState
+						.findAnalysisGroupStatesByAnalysisGroupAndLsTypeEqualsAndLsKindEqualsAndIgnoredNot(
+								analysisGroup, "data", "dose response", true)
+						.getSingleResult();
 				oldState.setIgnored(true);
 				oldState.merge();
-//				oldState.flush();
-			} catch(NoResultException e) {
-				logger.debug("Old state of typekind data/dose response not found for AG Code " + curveFitDTO.getAnalysisGroupCode() + " , creating new one");
+				// oldState.flush();
+			} catch (NoResultException e) {
+				logger.debug("Old state of typekind data/dose response not found for AG Code "
+						+ curveFitDTO.getAnalysisGroupCode() + " , creating new one");
 			}
-			AnalysisGroupState newState = createCurveFitState(analysisGroup.getId(), "data", "dose response", curveFitDTO.getRecordedBy(), curveFitDTO.getLsTransaction());
+			AnalysisGroupState newState = createCurveFitState(analysisGroup.getId(), "data", "dose response",
+					curveFitDTO.getRecordedBy(), curveFitDTO.getLsTransaction());
 			saveFitData(newState, curveFitDTO);
 		}
 	}
-	
+
 	@Transactional
 	private static void saveFitData(AnalysisGroupState state, KiCurveFitDTO curveFitDTO) {
 		Collection<AnalysisGroupValue> newValues = new HashSet<AnalysisGroupValue>();
-		//non-optional fields
+		// non-optional fields
 		String recordedBy = curveFitDTO.getRecordedBy();
 		String batchCode = curveFitDTO.getBatchCode();
 		Long lsTransaction = curveFitDTO.getLsTransaction();
-		AnalysisGroupValue batchCodeValue = createCurveFitValue(state, "codeValue", "batch code", curveFitDTO.getBatchCode(), recordedBy, lsTransaction);
+		AnalysisGroupValue batchCodeValue = createCurveFitValue(state, "codeValue", "batch code",
+				curveFitDTO.getBatchCode(), recordedBy, lsTransaction);
 		batchCodeValue.setPublicData(true);
 		newValues.add(batchCodeValue);
-		AnalysisGroupValue curveIdValue = createCurveFitValue(state, "stringValue", "curve id", curveFitDTO.getCurveId(), recordedBy, lsTransaction);
+		AnalysisGroupValue curveIdValue = createCurveFitValue(state, "stringValue", "curve id",
+				curveFitDTO.getCurveId(), recordedBy, lsTransaction);
 		curveIdValue.setPublicData(true);
 		newValues.add(curveIdValue);
-		//all the rest of the fields (may be null)
+		// all the rest of the fields (may be null)
 		String category = curveFitDTO.getCategory();
 		String renderingHint = curveFitDTO.getRenderingHint();
 		String min = curveFitDTO.getMin();
@@ -492,23 +509,27 @@ private static void saveFitData(AnalysisGroupState state, KiCurveFitDTO curveFit
 		String fitSummaryClob = curveFitDTO.getFitSummaryClob();
 		String userFlagStatus = curveFitDTO.getUserFlagStatus();
 		String algorithmFlagStatus = curveFitDTO.getAlgorithmFlagStatus();
-		
-		//only create AnalysisGroupValues if they would not be empty/null
 
-		if (!(category==null)){
-			AnalysisGroupValue categoryValue = createCurveFitValue(state, "stringValue", "category", category, recordedBy, lsTransaction);
+		// only create AnalysisGroupValues if they would not be empty/null
+
+		if (!(category == null)) {
+			AnalysisGroupValue categoryValue = createCurveFitValue(state, "stringValue", "category", category,
+					recordedBy, lsTransaction);
 			categoryValue.setCodeValue(batchCode);
 			newValues.add(categoryValue);
 		}
-		if (!(renderingHint==null)){
-			AnalysisGroupValue renderingHintValue = createCurveFitValue(state, "stringValue", "Rendering Hint", renderingHint, recordedBy, lsTransaction);
+		if (!(renderingHint == null)) {
+			AnalysisGroupValue renderingHintValue = createCurveFitValue(state, "stringValue", "Rendering Hint",
+					renderingHint, recordedBy, lsTransaction);
 			renderingHintValue.setCodeValue(batchCode);
 			newValues.add(renderingHintValue);
 		}
-		//Min, Max, and Ki are special cases. They must be filled in with something for Seurat,
-		//so we fill them in as stringValues if their value is not numeric
-		if (!(min==null) && SimpleUtil.isDecimalNumeric(min)) {
-			AnalysisGroupValue minValue = createCurveFitValue(state, "numericValue", "Min", new BigDecimal(min), recordedBy, lsTransaction);
+		// Min, Max, and Ki are special cases. They must be filled in with something for
+		// Seurat,
+		// so we fill them in as stringValues if their value is not numeric
+		if (!(min == null) && SimpleUtil.isDecimalNumeric(min)) {
+			AnalysisGroupValue minValue = createCurveFitValue(state, "numericValue", "Min", new BigDecimal(min),
+					recordedBy, lsTransaction);
 			minValue.setUnitKind(curveFitDTO.getMinUnits());
 			minValue.setUncertainty(curveFitDTO.getMinUncertainty());
 			minValue.setUncertaintyType(curveFitDTO.getMinUncertaintyType());
@@ -516,13 +537,15 @@ private static void saveFitData(AnalysisGroupState state, KiCurveFitDTO curveFit
 			minValue.setPublicData(true);
 			newValues.add(minValue);
 		} else {
-			AnalysisGroupValue minValue = createCurveFitValue(state, "stringValue", "Min", min, recordedBy, lsTransaction);
+			AnalysisGroupValue minValue = createCurveFitValue(state, "stringValue", "Min", min, recordedBy,
+					lsTransaction);
 			minValue.setCodeValue(batchCode);
 			minValue.setPublicData(true);
 			newValues.add(minValue);
 		}
-		if (!(max==null) && SimpleUtil.isDecimalNumeric(max)) {
-			AnalysisGroupValue maxValue = createCurveFitValue(state, "numericValue", "Max", new BigDecimal(max), recordedBy, lsTransaction);
+		if (!(max == null) && SimpleUtil.isDecimalNumeric(max)) {
+			AnalysisGroupValue maxValue = createCurveFitValue(state, "numericValue", "Max", new BigDecimal(max),
+					recordedBy, lsTransaction);
 			maxValue.setUnitKind(curveFitDTO.getMaxUnits());
 			maxValue.setUncertainty(curveFitDTO.getMaxUncertainty());
 			maxValue.setUncertaintyType(curveFitDTO.getMaxUncertaintyType());
@@ -530,12 +553,14 @@ private static void saveFitData(AnalysisGroupState state, KiCurveFitDTO curveFit
 			maxValue.setPublicData(true);
 			newValues.add(maxValue);
 		} else {
-			AnalysisGroupValue maxValue = createCurveFitValue(state, "stringValue", "Max", max, recordedBy, lsTransaction);
+			AnalysisGroupValue maxValue = createCurveFitValue(state, "stringValue", "Max", max, recordedBy,
+					lsTransaction);
 			maxValue.setPublicData(true);
 			newValues.add(maxValue);
 		}
-		if (!(ki==null) && SimpleUtil.isDecimalNumeric(ki)) {
-			AnalysisGroupValue kiValue = createCurveFitValue(state, "numericValue", "Ki", new BigDecimal(ki), recordedBy, lsTransaction);
+		if (!(ki == null) && SimpleUtil.isDecimalNumeric(ki)) {
+			AnalysisGroupValue kiValue = createCurveFitValue(state, "numericValue", "Ki", new BigDecimal(ki),
+					recordedBy, lsTransaction);
 			kiValue.setUnitKind(curveFitDTO.getKiUnits());
 			kiValue.setUncertainty(curveFitDTO.getKiUncertainty());
 			kiValue.setUncertaintyType(curveFitDTO.getKiUncertaintyType());
@@ -548,138 +573,160 @@ private static void saveFitData(AnalysisGroupState state, KiCurveFitDTO curveFit
 			kiValue.setPublicData(true);
 			newValues.add(kiValue);
 		}
-		//Remaining non-special numericValues
-		if (!(ligandConc==null)){
-			AnalysisGroupValue ligandConcValue = createCurveFitValue(state, "numericValue", "Ligand Conc", ligandConc, recordedBy, lsTransaction);
+		// Remaining non-special numericValues
+		if (!(ligandConc == null)) {
+			AnalysisGroupValue ligandConcValue = createCurveFitValue(state, "numericValue", "Ligand Conc", ligandConc,
+					recordedBy, lsTransaction);
 			ligandConcValue.setCodeValue(batchCode);
 			ligandConcValue.setUncertainty(curveFitDTO.getLigandConcUncertainty());
 			ligandConcValue.setUncertaintyType(curveFitDTO.getLigandConcUncertaintyType());
 			newValues.add(ligandConcValue);
 		}
-		if (!(kd==null)){
-			AnalysisGroupValue kdValue = createCurveFitValue(state, "numericValue", "Kd", kd, recordedBy, lsTransaction);
+		if (!(kd == null)) {
+			AnalysisGroupValue kdValue = createCurveFitValue(state, "numericValue", "Kd", kd, recordedBy,
+					lsTransaction);
 			kdValue.setCodeValue(batchCode);
 			kdValue.setUncertainty(curveFitDTO.getKdUncertainty());
 			kdValue.setUncertaintyType(curveFitDTO.getKdUncertaintyType());
 			newValues.add(kdValue);
 		}
-		if (!(fittedMin==null)){
-			AnalysisGroupValue fittedMinValue = createCurveFitValue(state, "numericValue", "Fitted Min", fittedMin, recordedBy, lsTransaction);
+		if (!(fittedMin == null)) {
+			AnalysisGroupValue fittedMinValue = createCurveFitValue(state, "numericValue", "Fitted Min", fittedMin,
+					recordedBy, lsTransaction);
 			fittedMinValue.setCodeValue(batchCode);
 			fittedMinValue.setUncertainty(curveFitDTO.getFittedMinUncertainty());
 			fittedMinValue.setUncertaintyType(curveFitDTO.getFittedMinUncertaintyType());
 			newValues.add(fittedMinValue);
 		}
-		if (!(fittedMax==null)){
-			AnalysisGroupValue fittedMaxValue = createCurveFitValue(state, "numericValue", "Fitted Max", fittedMax, recordedBy, lsTransaction);
+		if (!(fittedMax == null)) {
+			AnalysisGroupValue fittedMaxValue = createCurveFitValue(state, "numericValue", "Fitted Max", fittedMax,
+					recordedBy, lsTransaction);
 			fittedMaxValue.setCodeValue(batchCode);
 			fittedMaxValue.setUncertainty(curveFitDTO.getFittedMaxUncertainty());
 			fittedMaxValue.setUncertaintyType(curveFitDTO.getFittedMaxUncertaintyType());
 			newValues.add(fittedMaxValue);
 		}
-		if (!(fittedKi==null)){
-			AnalysisGroupValue fittedKiValue = createCurveFitValue(state, "numericValue", "Fitted Ki", fittedKi, recordedBy, lsTransaction);
+		if (!(fittedKi == null)) {
+			AnalysisGroupValue fittedKiValue = createCurveFitValue(state, "numericValue", "Fitted Ki", fittedKi,
+					recordedBy, lsTransaction);
 			fittedKiValue.setCodeValue(batchCode);
 			fittedKiValue.setUncertainty(curveFitDTO.getFittedKiUncertainty());
 			fittedKiValue.setUncertaintyType(curveFitDTO.getFittedKiUncertaintyType());
 			newValues.add(fittedKiValue);
 		}
-		if (!(sse==null)){
-			AnalysisGroupValue sseValue = createCurveFitValue(state, "numericValue", "SSE", sse, recordedBy, lsTransaction);
+		if (!(sse == null)) {
+			AnalysisGroupValue sseValue = createCurveFitValue(state, "numericValue", "SSE", sse, recordedBy,
+					lsTransaction);
 			sseValue.setCodeValue(batchCode);
 			newValues.add(sseValue);
 		}
-		if (!(sst==null)){
-			AnalysisGroupValue sstValue = createCurveFitValue(state, "numericValue", "SST", sst, recordedBy, lsTransaction);
+		if (!(sst == null)) {
+			AnalysisGroupValue sstValue = createCurveFitValue(state, "numericValue", "SST", sst, recordedBy,
+					lsTransaction);
 			sstValue.setCodeValue(batchCode);
 			newValues.add(sstValue);
 		}
-		if (!(rSquared==null)){
-			AnalysisGroupValue rSquaredValue = createCurveFitValue(state, "numericValue", "rSquared", rSquared, recordedBy, lsTransaction);
+		if (!(rSquared == null)) {
+			AnalysisGroupValue rSquaredValue = createCurveFitValue(state, "numericValue", "rSquared", rSquared,
+					recordedBy, lsTransaction);
 			rSquaredValue.setCodeValue(batchCode);
 			newValues.add(rSquaredValue);
 		}
-		//clob values
-		if (!(curveErrorsClob==null)){
-			AnalysisGroupValue curveErrorsClobValue = createCurveFitValue(state, "clobValue", "curveErrorsClob", curveErrorsClob, recordedBy, lsTransaction);
+		// clob values
+		if (!(curveErrorsClob == null)) {
+			AnalysisGroupValue curveErrorsClobValue = createCurveFitValue(state, "clobValue", "curveErrorsClob",
+					curveErrorsClob, recordedBy, lsTransaction);
 			curveErrorsClobValue.setCodeValue(batchCode);
 			newValues.add(curveErrorsClobValue);
 		}
-		if (!(reportedValuesClob==null)){
-			AnalysisGroupValue reportedValuesClobValue = createCurveFitValue(state, "clobValue", "reportedValuesClob", reportedValuesClob, recordedBy, lsTransaction);
+		if (!(reportedValuesClob == null)) {
+			AnalysisGroupValue reportedValuesClobValue = createCurveFitValue(state, "clobValue", "reportedValuesClob",
+					reportedValuesClob, recordedBy, lsTransaction);
 			reportedValuesClobValue.setCodeValue(batchCode);
 			newValues.add(reportedValuesClobValue);
 		}
-		if (!(parameterStdErrorsClob==null)){
-			AnalysisGroupValue parameterStdErrorsClobValue = createCurveFitValue(state, "clobValue", "parameterStdErrorsClob", parameterStdErrorsClob, recordedBy, lsTransaction);
+		if (!(parameterStdErrorsClob == null)) {
+			AnalysisGroupValue parameterStdErrorsClobValue = createCurveFitValue(state, "clobValue",
+					"parameterStdErrorsClob", parameterStdErrorsClob, recordedBy, lsTransaction);
 			parameterStdErrorsClobValue.setCodeValue(batchCode);
 			newValues.add(parameterStdErrorsClobValue);
 		}
-		if (!(fitSettings==null)){
-			AnalysisGroupValue fitSettingsValue = createCurveFitValue(state, "clobValue", "fitSettings", fitSettings, recordedBy, lsTransaction);
+		if (!(fitSettings == null)) {
+			AnalysisGroupValue fitSettingsValue = createCurveFitValue(state, "clobValue", "fitSettings", fitSettings,
+					recordedBy, lsTransaction);
 			fitSettingsValue.setCodeValue(batchCode);
 			newValues.add(fitSettingsValue);
 		}
-		if (!(fitSummaryClob==null)){
-			AnalysisGroupValue fitSummaryClobValue = createCurveFitValue(state, "clobValue", "fitSummaryClob", fitSummaryClob, recordedBy, lsTransaction);
+		if (!(fitSummaryClob == null)) {
+			AnalysisGroupValue fitSummaryClobValue = createCurveFitValue(state, "clobValue", "fitSummaryClob",
+					fitSummaryClob, recordedBy, lsTransaction);
 			fitSummaryClobValue.setCodeValue(batchCode);
 			newValues.add(fitSummaryClobValue);
 		}
-		//flags
-		if (!(userFlagStatus==null)){
-			AnalysisGroupValue userFlagStatusValue = createCurveFitValue(state, "codeValue", "user flag status", userFlagStatus, recordedBy, lsTransaction);
+		// flags
+		if (!(userFlagStatus == null)) {
+			AnalysisGroupValue userFlagStatusValue = createCurveFitValue(state, "codeValue", "user flag status",
+					userFlagStatus, recordedBy, lsTransaction);
 			userFlagStatusValue.setCodeType("user flags");
 			userFlagStatusValue.setCodeKind("flag status");
 			userFlagStatusValue.setCodeOrigin("ACAS DDICT");
 			newValues.add(userFlagStatusValue);
 		}
-		if (!(algorithmFlagStatus==null)){
-			AnalysisGroupValue algorithmFlagStatusValue = createCurveFitValue(state, "codeValue", "algorithm flag status", algorithmFlagStatus, recordedBy, lsTransaction);
+		if (!(algorithmFlagStatus == null)) {
+			AnalysisGroupValue algorithmFlagStatusValue = createCurveFitValue(state, "codeValue",
+					"algorithm flag status", algorithmFlagStatus, recordedBy, lsTransaction);
 			algorithmFlagStatusValue.setCodeType("algorithm flags");
 			algorithmFlagStatusValue.setCodeKind("flag status");
 			algorithmFlagStatusValue.setCodeOrigin("ACAS DDICT");
 			newValues.add(algorithmFlagStatusValue);
 		}
-		
-		//persist and flush all the new values
-		for (AnalysisGroupValue value: newValues){
+
+		// persist and flush all the new values
+		for (AnalysisGroupValue value : newValues) {
 			value.persist();
-//			value.flush();
-		}		
+			// value.flush();
+		}
 	}
-	
+
 	@Transactional
-	private static AnalysisGroupValue createCurveFitValue(AnalysisGroupState lsState, String lsType, String lsKind, String value, String recordedBy, Long lsTransaction) {
+	private static AnalysisGroupValue createCurveFitValue(AnalysisGroupState lsState, String lsType, String lsKind,
+			String value, String recordedBy, Long lsTransaction) {
 		AnalysisGroupValue analysisGroupValue = new AnalysisGroupValue();
 		analysisGroupValue.setLsState(lsState);
 		analysisGroupValue.setLsType(lsType);
 		analysisGroupValue.setLsKind(lsKind);
-		if (lsType.equals("stringValue")) analysisGroupValue.setStringValue(value);
-		if (lsType.equals("clobValue")) analysisGroupValue.setClobValue(value);
-		if (lsType.equals("codeValue")) analysisGroupValue.setCodeValue(value);
+		if (lsType.equals("stringValue"))
+			analysisGroupValue.setStringValue(value);
+		if (lsType.equals("clobValue"))
+			analysisGroupValue.setClobValue(value);
+		if (lsType.equals("codeValue"))
+			analysisGroupValue.setCodeValue(value);
 		analysisGroupValue.setRecordedBy(recordedBy);
 		analysisGroupValue.setLsTransaction(lsTransaction);
 		logger.debug("Creating value kind: " + analysisGroupValue.toJson());
 		analysisGroupValue.persist();
 		return analysisGroupValue;
 	}
-	
+
 	@Transactional
-	private static AnalysisGroupValue createCurveFitValue(AnalysisGroupState lsState, String lsType, String lsKind, BigDecimal value, String recordedBy, Long lsTransaction) {
+	private static AnalysisGroupValue createCurveFitValue(AnalysisGroupState lsState, String lsType, String lsKind,
+			BigDecimal value, String recordedBy, Long lsTransaction) {
 		AnalysisGroupValue analysisGroupValue = new AnalysisGroupValue();
 		analysisGroupValue.setLsState(lsState);
 		analysisGroupValue.setLsType(lsType);
 		analysisGroupValue.setLsKind(lsKind);
-		if (lsType.equals("numericValue")) analysisGroupValue.setNumericValue(value);
+		if (lsType.equals("numericValue"))
+			analysisGroupValue.setNumericValue(value);
 		analysisGroupValue.setRecordedBy(recordedBy);
 		analysisGroupValue.setLsTransaction(lsTransaction);
 		logger.debug("Creating value kind: " + analysisGroupValue.toJson());
 		analysisGroupValue.persist();
 		return analysisGroupValue;
 	}
-	
+
 	@Transactional
-	private static AnalysisGroupState createCurveFitState(Long analysisGroupId, String stateType, String stateKind, String recordedBy, Long lsTransaction) {
+	private static AnalysisGroupState createCurveFitState(Long analysisGroupId, String stateType, String stateKind,
+			String recordedBy, Long lsTransaction) {
 		AnalysisGroupState analysisGroupState = new AnalysisGroupState();
 		AnalysisGroup analysisGroup = AnalysisGroup.findAnalysisGroup(analysisGroupId);
 		analysisGroupState.setAnalysisGroup(analysisGroup);
@@ -690,70 +737,75 @@ private static AnalysisGroupState createCurveFitState(Long analysisGroupId, Stri
 		analysisGroupState.persist();
 		return analysisGroupState;
 	}
-	
+
 	@Transactional
-	private static AnalysisGroupValue findCurveIdValue(String curveId){
-		//		AnalysisGroupValue curveIdValue = AnalysisGroupValue.findAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot("stringValue", "curve id", curveFitDTO.getCurveId(), true).getSingleResult();
-        if (curveId == null || curveId.length() == 0) throw new IllegalArgumentException("The curveId argument is required");
-        curveId = curveId.replace('*', '%');
-        if (curveId.charAt(0) != '%') {
-            curveId = "%" + curveId;
-        }
-        if (curveId.charAt(curveId.length() - 1) != '%') {
-            curveId = curveId + "%";
-        }
-        EntityManager em = AnalysisGroupValue.entityManager();
-        TypedQuery<AnalysisGroupValue> q = em.createQuery("SELECT o FROM AnalysisGroupValue AS o JOIN o.lsState AS state JOIN state.analysisGroup AS ag WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)  AND o.ignored IS NOT :ignored AND state.ignored IS NOT :ignored AND ag.ignored IS NOT :ignored AND state.lsType = :stateType AND state.lsKind = :stateKind", AnalysisGroupValue.class);
-        q.setParameter("lsType", "stringValue");
-        q.setParameter("lsKind", "curve id");
-        q.setParameter("stateType", "data");
-        q.setParameter("stateKind", "dose response");
-        q.setParameter("stringValue", curveId);
-        q.setParameter("ignored", true);
-        try{
-        	return q.getSingleResult();
-        }catch(Exception e){
-        	logger.error("ERROR: More than one non-ignored curve id found");
-        	logger.error("Specific error: " + e.getMessage());
-        	logger.debug("Found: ");
-        	List<AnalysisGroupValue> results = q.getResultList();
-        	for (AnalysisGroupValue result: results){
-        		logger.debug(result.toJson());
-        	}
-        	return new AnalysisGroupValue();
-        }
-	}
-	
+	private static AnalysisGroupValue findCurveIdValue(String curveId) {
+		// AnalysisGroupValue curveIdValue =
+		// AnalysisGroupValue.findAnalysisGroupValuesByLsTypeEqualsAndLsKindEqualsAndStringValueLikeAndIgnoredNot("stringValue",
+		// "curve id", curveFitDTO.getCurveId(), true).getSingleResult();
+		if (curveId == null || curveId.length() == 0)
+			throw new IllegalArgumentException("The curveId argument is required");
+		curveId = curveId.replace('*', '%');
+		if (curveId.charAt(0) != '%') {
+			curveId = "%" + curveId;
+		}
+		if (curveId.charAt(curveId.length() - 1) != '%') {
+			curveId = curveId + "%";
+		}
+		EntityManager em = AnalysisGroupValue.entityManager();
+		TypedQuery<AnalysisGroupValue> q = em.createQuery(
+				"SELECT o FROM AnalysisGroupValue AS o JOIN o.lsState AS state JOIN state.analysisGroup AS ag WHERE o.lsType = :lsType  AND o.lsKind = :lsKind  AND LOWER(o.stringValue) LIKE LOWER(:stringValue)  AND o.ignored IS NOT :ignored AND state.ignored IS NOT :ignored AND ag.ignored IS NOT :ignored AND state.lsType = :stateType AND state.lsKind = :stateKind",
+				AnalysisGroupValue.class);
+		q.setParameter("lsType", "stringValue");
+		q.setParameter("lsKind", "curve id");
+		q.setParameter("stateType", "data");
+		q.setParameter("stateKind", "dose response");
+		q.setParameter("stringValue", curveId);
+		q.setParameter("ignored", true);
+		try {
+			return q.getSingleResult();
+		} catch (Exception e) {
+			logger.error("ERROR: More than one non-ignored curve id found");
+			logger.error("Specific error: " + e.getMessage());
+			logger.debug("Found: ");
+			List<AnalysisGroupValue> results = q.getResultList();
+			for (AnalysisGroupValue result : results) {
+				logger.debug(result.toJson());
+			}
+			return new AnalysisGroupValue();
+		}
+	}
+
 	@Transactional
-	public static Collection<String> findAllCurveIdsByExperiment(String experimentIdOrCodeName){
+	public static Collection<String> findAllCurveIdsByExperiment(String experimentIdOrCodeName) {
 		Experiment experiment = null;
-		if(SimpleUtil.isNumeric(experimentIdOrCodeName)) {
+		if (SimpleUtil.isNumeric(experimentIdOrCodeName)) {
 			experiment = Experiment.findExperiment(Long.valueOf(experimentIdOrCodeName));
-		} else {		
+		} else {
 			experiment = Experiment.findExperimentsByCodeNameEquals(experimentIdOrCodeName).getSingleResult();
 		}
-        EntityManager em = AnalysisGroupValue.entityManager();
-        TypedQuery<String> q = em.createQuery("SELECT agv.stringValue FROM AnalysisGroupValue AS agv "
-        		+ "JOIN agv.lsState AS state "
-        		+ "JOIN state.analysisGroup AS ag  "
-        		+ "JOIN ag.experiments AS exp "
-        		+ "WHERE exp = :experiment "
-        		+ "AND agv.lsType = :lsType  "
-        		+ "AND agv.lsKind = :lsKind  "
-        		+ "AND agv.ignored IS NOT :ignored "
-        		+ "AND state.ignored IS NOT :ignored "
-        		+ "AND ag.ignored IS NOT :ignored "
-        		+ "AND state.lsType = :stateType "
-        		+ "AND state.lsKind = :stateKind", String.class);
-        q.setParameter("lsType", "stringValue");
-        q.setParameter("lsKind", "curve id");
-        q.setParameter("stateType", "data");
-        q.setParameter("stateKind", "dose response");
-        q.setParameter("experiment", experiment);
-        q.setParameter("ignored", true);
-        return q.getResultList();
-	}
-	
+		EntityManager em = AnalysisGroupValue.entityManager();
+		TypedQuery<String> q = em.createQuery("SELECT agv.stringValue FROM AnalysisGroupValue AS agv "
+				+ "JOIN agv.lsState AS state "
+				+ "JOIN state.analysisGroup AS ag  "
+				+ "JOIN ag.experiments AS exp "
+				+ "WHERE exp = :experiment "
+				+ "AND agv.lsType = :lsType  "
+				+ "AND agv.lsKind = :lsKind  "
+				+ "AND agv.ignored IS NOT :ignored "
+				+ "AND state.ignored IS NOT :ignored "
+				+ "AND ag.ignored IS NOT :ignored "
+				+ "AND state.lsType = :stateType "
+				+ "AND state.lsKind = :stateKind", String.class);
+		q.setParameter("lsType", "stringValue");
+		q.setParameter("lsKind", "curve id");
+		q.setParameter("stateType", "data");
+		q.setParameter("stateKind", "dose response");
+		q.setParameter("experiment", experiment);
+		q.setParameter("ignored", true);
+		return q.getResultList();
+	}
+
 	private static Collection<KiCurveFitDTO> makeCurveFitDTOsFromCurveIdList(Collection<String> curveIdList) {
 		Collection<KiCurveFitDTO> curveFitDTOs = new HashSet<KiCurveFitDTO>();
 		for (String curveId : curveIdList) {
@@ -761,455 +813,454 @@ private static Collection<KiCurveFitDTO> makeCurveFitDTOsFromCurveIdList(Collect
 		}
 		return curveFitDTOs;
 	}
-	
 
 	public String getCurveId() {
-        return this.curveId;
-    }
+		return this.curveId;
+	}
 
 	public void setCurveId(String curveId) {
-        this.curveId = curveId;
-    }
+		this.curveId = curveId;
+	}
 
 	public String getAnalysisGroupCode() {
-        return this.analysisGroupCode;
-    }
+		return this.analysisGroupCode;
+	}
 
 	public void setAnalysisGroupCode(String analysisGroupCode) {
-        this.analysisGroupCode = analysisGroupCode;
-    }
+		this.analysisGroupCode = analysisGroupCode;
+	}
 
 	public String getRecordedBy() {
-        return this.recordedBy;
-    }
+		return this.recordedBy;
+	}
 
 	public void setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
+		this.recordedBy = recordedBy;
+	}
 
 	public Date getRecordedDate() {
-        return this.recordedDate;
-    }
+		return this.recordedDate;
+	}
 
 	public void setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
+		this.recordedDate = recordedDate;
+	}
 
 	public Long getLsTransaction() {
-        return this.lsTransaction;
-    }
+		return this.lsTransaction;
+	}
 
 	public void setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
+		this.lsTransaction = lsTransaction;
+	}
 
 	public String getBatchCode() {
-        return this.batchCode;
-    }
+		return this.batchCode;
+	}
 
 	public void setBatchCode(String batchCode) {
-        this.batchCode = batchCode;
-    }
+		this.batchCode = batchCode;
+	}
 
 	public String getCategory() {
-        return this.category;
-    }
+		return this.category;
+	}
 
 	public void setCategory(String category) {
-        this.category = category;
-    }
+		this.category = category;
+	}
 
 	public String getRenderingHint() {
-        return this.renderingHint;
-    }
+		return this.renderingHint;
+	}
 
 	public void setRenderingHint(String renderingHint) {
-        this.renderingHint = renderingHint;
-    }
+		this.renderingHint = renderingHint;
+	}
 
 	public String getMin() {
-        return this.min;
-    }
+		return this.min;
+	}
 
 	public void setMin(String min) {
-        this.min = min;
-    }
+		this.min = min;
+	}
 
 	public String getMax() {
-        return this.max;
-    }
+		return this.max;
+	}
 
 	public void setMax(String max) {
-        this.max = max;
-    }
+		this.max = max;
+	}
 
 	public String getMinUnits() {
-        return this.minUnits;
-    }
+		return this.minUnits;
+	}
 
 	public void setMinUnits(String minUnits) {
-        this.minUnits = minUnits;
-    }
+		this.minUnits = minUnits;
+	}
 
 	public String getMaxUnits() {
-        return this.maxUnits;
-    }
+		return this.maxUnits;
+	}
 
 	public void setMaxUnits(String maxUnits) {
-        this.maxUnits = maxUnits;
-    }
+		this.maxUnits = maxUnits;
+	}
 
 	public String getKi() {
-        return this.ki;
-    }
+		return this.ki;
+	}
 
 	public void setKi(String ki) {
-        this.ki = ki;
-    }
+		this.ki = ki;
+	}
 
 	public String getKiUnits() {
-        return this.kiUnits;
-    }
+		return this.kiUnits;
+	}
 
 	public void setKiUnits(String kiUnits) {
-        this.kiUnits = kiUnits;
-    }
+		this.kiUnits = kiUnits;
+	}
 
 	public BigDecimal getLigandConc() {
-        return this.ligandConc;
-    }
+		return this.ligandConc;
+	}
 
 	public void setLigandConc(BigDecimal ligandConc) {
-        this.ligandConc = ligandConc;
-    }
+		this.ligandConc = ligandConc;
+	}
 
 	public String getLigandConcUnits() {
-        return this.ligandConcUnits;
-    }
+		return this.ligandConcUnits;
+	}
 
 	public void setLigandConcUnits(String ligandConcUnits) {
-        this.ligandConcUnits = ligandConcUnits;
-    }
+		this.ligandConcUnits = ligandConcUnits;
+	}
 
 	public BigDecimal getKd() {
-        return this.kd;
-    }
+		return this.kd;
+	}
 
 	public void setKd(BigDecimal kd) {
-        this.kd = kd;
-    }
+		this.kd = kd;
+	}
 
 	public String getKdUnits() {
-        return this.kdUnits;
-    }
+		return this.kdUnits;
+	}
 
 	public void setKdUnits(String kdUnits) {
-        this.kdUnits = kdUnits;
-    }
+		this.kdUnits = kdUnits;
+	}
 
 	public BigDecimal getMinUncertainty() {
-        return this.minUncertainty;
-    }
+		return this.minUncertainty;
+	}
 
 	public void setMinUncertainty(BigDecimal minUncertainty) {
-        this.minUncertainty = minUncertainty;
-    }
+		this.minUncertainty = minUncertainty;
+	}
 
 	public BigDecimal getMaxUncertainty() {
-        return this.maxUncertainty;
-    }
+		return this.maxUncertainty;
+	}
 
 	public void setMaxUncertainty(BigDecimal maxUncertainty) {
-        this.maxUncertainty = maxUncertainty;
-    }
+		this.maxUncertainty = maxUncertainty;
+	}
 
 	public BigDecimal getKiUncertainty() {
-        return this.kiUncertainty;
-    }
+		return this.kiUncertainty;
+	}
 
 	public void setKiUncertainty(BigDecimal kiUncertainty) {
-        this.kiUncertainty = kiUncertainty;
-    }
+		this.kiUncertainty = kiUncertainty;
+	}
 
 	public BigDecimal getLigandConcUncertainty() {
-        return this.ligandConcUncertainty;
-    }
+		return this.ligandConcUncertainty;
+	}
 
 	public void setLigandConcUncertainty(BigDecimal ligandConcUncertainty) {
-        this.ligandConcUncertainty = ligandConcUncertainty;
-    }
+		this.ligandConcUncertainty = ligandConcUncertainty;
+	}
 
 	public BigDecimal getKdUncertainty() {
-        return this.kdUncertainty;
-    }
+		return this.kdUncertainty;
+	}
 
 	public void setKdUncertainty(BigDecimal kdUncertainty) {
-        this.kdUncertainty = kdUncertainty;
-    }
+		this.kdUncertainty = kdUncertainty;
+	}
 
 	public String getMinUncertaintyType() {
-        return this.minUncertaintyType;
-    }
+		return this.minUncertaintyType;
+	}
 
 	public void setMinUncertaintyType(String minUncertaintyType) {
-        this.minUncertaintyType = minUncertaintyType;
-    }
+		this.minUncertaintyType = minUncertaintyType;
+	}
 
 	public String getMaxUncertaintyType() {
-        return this.maxUncertaintyType;
-    }
+		return this.maxUncertaintyType;
+	}
 
 	public void setMaxUncertaintyType(String maxUncertaintyType) {
-        this.maxUncertaintyType = maxUncertaintyType;
-    }
+		this.maxUncertaintyType = maxUncertaintyType;
+	}
 
 	public String getKiUncertaintyType() {
-        return this.kiUncertaintyType;
-    }
+		return this.kiUncertaintyType;
+	}
 
 	public void setKiUncertaintyType(String kiUncertaintyType) {
-        this.kiUncertaintyType = kiUncertaintyType;
-    }
+		this.kiUncertaintyType = kiUncertaintyType;
+	}
 
 	public String getLigandConcUncertaintyType() {
-        return this.ligandConcUncertaintyType;
-    }
+		return this.ligandConcUncertaintyType;
+	}
 
 	public void setLigandConcUncertaintyType(String ligandConcUncertaintyType) {
-        this.ligandConcUncertaintyType = ligandConcUncertaintyType;
-    }
+		this.ligandConcUncertaintyType = ligandConcUncertaintyType;
+	}
 
 	public String getKdUncertaintyType() {
-        return this.kdUncertaintyType;
-    }
+		return this.kdUncertaintyType;
+	}
 
 	public void setKdUncertaintyType(String kdUncertaintyType) {
-        this.kdUncertaintyType = kdUncertaintyType;
-    }
+		this.kdUncertaintyType = kdUncertaintyType;
+	}
 
 	public String getMinOperatorKind() {
-        return this.minOperatorKind;
-    }
+		return this.minOperatorKind;
+	}
 
 	public void setMinOperatorKind(String minOperatorKind) {
-        this.minOperatorKind = minOperatorKind;
-    }
+		this.minOperatorKind = minOperatorKind;
+	}
 
 	public String getMaxOperatorKind() {
-        return this.maxOperatorKind;
-    }
+		return this.maxOperatorKind;
+	}
 
 	public void setMaxOperatorKind(String maxOperatorKind) {
-        this.maxOperatorKind = maxOperatorKind;
-    }
+		this.maxOperatorKind = maxOperatorKind;
+	}
 
 	public String getKiOperatorKind() {
-        return this.kiOperatorKind;
-    }
+		return this.kiOperatorKind;
+	}
 
 	public void setKiOperatorKind(String kiOperatorKind) {
-        this.kiOperatorKind = kiOperatorKind;
-    }
+		this.kiOperatorKind = kiOperatorKind;
+	}
 
 	public String getLigandConcOperatorKind() {
-        return this.ligandConcOperatorKind;
-    }
+		return this.ligandConcOperatorKind;
+	}
 
 	public void setLigandConcOperatorKind(String ligandConcOperatorKind) {
-        this.ligandConcOperatorKind = ligandConcOperatorKind;
-    }
+		this.ligandConcOperatorKind = ligandConcOperatorKind;
+	}
 
 	public String getKdOperatorKind() {
-        return this.kdOperatorKind;
-    }
+		return this.kdOperatorKind;
+	}
 
 	public void setKdOperatorKind(String kdOperatorKind) {
-        this.kdOperatorKind = kdOperatorKind;
-    }
+		this.kdOperatorKind = kdOperatorKind;
+	}
 
 	public BigDecimal getFittedMin() {
-        return this.fittedMin;
-    }
+		return this.fittedMin;
+	}
 
 	public void setFittedMin(BigDecimal fittedMin) {
-        this.fittedMin = fittedMin;
-    }
+		this.fittedMin = fittedMin;
+	}
 
 	public BigDecimal getFittedMax() {
-        return this.fittedMax;
-    }
+		return this.fittedMax;
+	}
 
 	public void setFittedMax(BigDecimal fittedMax) {
-        this.fittedMax = fittedMax;
-    }
+		this.fittedMax = fittedMax;
+	}
 
 	public BigDecimal getFittedKi() {
-        return this.fittedKi;
-    }
+		return this.fittedKi;
+	}
 
 	public void setFittedKi(BigDecimal fittedKi) {
-        this.fittedKi = fittedKi;
-    }
+		this.fittedKi = fittedKi;
+	}
 
 	public BigDecimal getFittedMinUncertainty() {
-        return this.fittedMinUncertainty;
-    }
+		return this.fittedMinUncertainty;
+	}
 
 	public void setFittedMinUncertainty(BigDecimal fittedMinUncertainty) {
-        this.fittedMinUncertainty = fittedMinUncertainty;
-    }
+		this.fittedMinUncertainty = fittedMinUncertainty;
+	}
 
 	public BigDecimal getFittedMaxUncertainty() {
-        return this.fittedMaxUncertainty;
-    }
+		return this.fittedMaxUncertainty;
+	}
 
 	public void setFittedMaxUncertainty(BigDecimal fittedMaxUncertainty) {
-        this.fittedMaxUncertainty = fittedMaxUncertainty;
-    }
+		this.fittedMaxUncertainty = fittedMaxUncertainty;
+	}
 
 	public BigDecimal getFittedKiUncertainty() {
-        return this.fittedKiUncertainty;
-    }
+		return this.fittedKiUncertainty;
+	}
 
 	public void setFittedKiUncertainty(BigDecimal fittedKiUncertainty) {
-        this.fittedKiUncertainty = fittedKiUncertainty;
-    }
+		this.fittedKiUncertainty = fittedKiUncertainty;
+	}
 
 	public String getFittedMinUncertaintyType() {
-        return this.fittedMinUncertaintyType;
-    }
+		return this.fittedMinUncertaintyType;
+	}
 
 	public void setFittedMinUncertaintyType(String fittedMinUncertaintyType) {
-        this.fittedMinUncertaintyType = fittedMinUncertaintyType;
-    }
+		this.fittedMinUncertaintyType = fittedMinUncertaintyType;
+	}
 
 	public String getFittedMaxUncertaintyType() {
-        return this.fittedMaxUncertaintyType;
-    }
+		return this.fittedMaxUncertaintyType;
+	}
 
 	public void setFittedMaxUncertaintyType(String fittedMaxUncertaintyType) {
-        this.fittedMaxUncertaintyType = fittedMaxUncertaintyType;
-    }
+		this.fittedMaxUncertaintyType = fittedMaxUncertaintyType;
+	}
 
 	public String getFittedKiUncertaintyType() {
-        return this.fittedKiUncertaintyType;
-    }
+		return this.fittedKiUncertaintyType;
+	}
 
 	public void setFittedKiUncertaintyType(String fittedKiUncertaintyType) {
-        this.fittedKiUncertaintyType = fittedKiUncertaintyType;
-    }
+		this.fittedKiUncertaintyType = fittedKiUncertaintyType;
+	}
 
 	public BigDecimal getSse() {
-        return this.sse;
-    }
+		return this.sse;
+	}
 
 	public void setSse(BigDecimal sse) {
-        this.sse = sse;
-    }
+		this.sse = sse;
+	}
 
 	public BigDecimal getSst() {
-        return this.sst;
-    }
+		return this.sst;
+	}
 
 	public void setSst(BigDecimal sst) {
-        this.sst = sst;
-    }
+		this.sst = sst;
+	}
 
 	public BigDecimal getRsquared() {
-        return this.rsquared;
-    }
+		return this.rsquared;
+	}
 
 	public void setRsquared(BigDecimal rsquared) {
-        this.rsquared = rsquared;
-    }
+		this.rsquared = rsquared;
+	}
 
 	public String getCurveErrorsClob() {
-        return this.curveErrorsClob;
-    }
+		return this.curveErrorsClob;
+	}
 
 	public void setCurveErrorsClob(String curveErrorsClob) {
-        this.curveErrorsClob = curveErrorsClob;
-    }
+		this.curveErrorsClob = curveErrorsClob;
+	}
 
 	public String getReportedValuesClob() {
-        return this.reportedValuesClob;
-    }
+		return this.reportedValuesClob;
+	}
 
 	public void setReportedValuesClob(String reportedValuesClob) {
-        this.reportedValuesClob = reportedValuesClob;
-    }
+		this.reportedValuesClob = reportedValuesClob;
+	}
 
 	public String getParameterStdErrorsClob() {
-        return this.parameterStdErrorsClob;
-    }
+		return this.parameterStdErrorsClob;
+	}
 
 	public void setParameterStdErrorsClob(String parameterStdErrorsClob) {
-        this.parameterStdErrorsClob = parameterStdErrorsClob;
-    }
+		this.parameterStdErrorsClob = parameterStdErrorsClob;
+	}
 
 	public String getFitSettings() {
-        return this.fitSettings;
-    }
+		return this.fitSettings;
+	}
 
 	public void setFitSettings(String fitSettings) {
-        this.fitSettings = fitSettings;
-    }
+		this.fitSettings = fitSettings;
+	}
 
 	public String getFitSummaryClob() {
-        return this.fitSummaryClob;
-    }
+		return this.fitSummaryClob;
+	}
 
 	public void setFitSummaryClob(String fitSummaryClob) {
-        this.fitSummaryClob = fitSummaryClob;
-    }
+		this.fitSummaryClob = fitSummaryClob;
+	}
 
 	public String getUserFlagStatus() {
-        return this.userFlagStatus;
-    }
+		return this.userFlagStatus;
+	}
 
 	public void setUserFlagStatus(String userFlagStatus) {
-        this.userFlagStatus = userFlagStatus;
-    }
+		this.userFlagStatus = userFlagStatus;
+	}
 
 	public String getAlgorithmFlagStatus() {
-        return this.algorithmFlagStatus;
-    }
+		return this.algorithmFlagStatus;
+	}
 
 	public void setAlgorithmFlagStatus(String algorithmFlagStatus) {
-        this.algorithmFlagStatus = algorithmFlagStatus;
-    }
+		this.algorithmFlagStatus = algorithmFlagStatus;
+	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 
 	public String toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(this);
+	}
 
 	public String toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(this);
+	}
 
 	public static KiCurveFitDTO fromJsonToKiCurveFitDTO(String json) {
-        return new JSONDeserializer<KiCurveFitDTO>()
-        .use(null, KiCurveFitDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<KiCurveFitDTO>()
+				.use(null, KiCurveFitDTO.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<KiCurveFitDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<KiCurveFitDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<KiCurveFitDTO> fromJsonArrayToKiCurveFitDTO(String json) {
-        return new JSONDeserializer<List<KiCurveFitDTO>>()
-        .use("values", KiCurveFitDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<KiCurveFitDTO>>()
+				.use("values", KiCurveFitDTO.class).deserialize(json);
+	}
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/LabelPrefixDTO.java b/src/main/java/com/labsynch/labseer/dto/LabelPrefixDTO.java
index 9ad565d86..8744c3501 100644
--- a/src/main/java/com/labsynch/labseer/dto/LabelPrefixDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LabelPrefixDTO.java
@@ -9,125 +9,123 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class LabelPrefixDTO {
 
-	private Long id;
-	
-	private String code;
-	
-	private String name;
-	
-	private Boolean ignore;
-	
-	private String labelTypeAndKind;
-	
-	private String thingTypeAndKind;
-	
-	private String labelPrefix;
-	
-	private Long numberOfLabels;
-	
-	
-	public String toSafeJson() {
-		return new JSONSerializer().exclude("*.class", "id", "code", "name", "ignore").serialize(this);
-	}
-
-	public String toJson() {
+    private Long id;
+
+    private String code;
+
+    private String name;
+
+    private Boolean ignore;
+
+    private String labelTypeAndKind;
+
+    private String thingTypeAndKind;
+
+    private String labelPrefix;
+
+    private Long numberOfLabels;
+
+    public String toSafeJson() {
+        return new JSONSerializer().exclude("*.class", "id", "code", "name", "ignore").serialize(this);
+    }
+
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static LabelPrefixDTO fromJsonToLabelPrefixDTO(String json) {
+    public static LabelPrefixDTO fromJsonToLabelPrefixDTO(String json) {
         return new JSONDeserializer<LabelPrefixDTO>()
-        .use(null, LabelPrefixDTO.class).deserialize(json);
+                .use(null, LabelPrefixDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<LabelPrefixDTO> collection) {
+    public static String toJsonArray(Collection<LabelPrefixDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<LabelPrefixDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<LabelPrefixDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<LabelPrefixDTO> fromJsonArrayToLabelPrefixDTO(String json) {
+    public static Collection<LabelPrefixDTO> fromJsonArrayToLabelPrefixDTO(String json) {
         return new JSONDeserializer<List<LabelPrefixDTO>>()
-        .use("values", LabelPrefixDTO.class).deserialize(json);
+                .use("values", LabelPrefixDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public String getCode() {
+    public String getCode() {
         return this.code;
     }
 
-	public void setCode(String code) {
+    public void setCode(String code) {
         this.code = code;
     }
 
-	public String getName() {
+    public String getName() {
         return this.name;
     }
 
-	public void setName(String name) {
+    public void setName(String name) {
         this.name = name;
     }
 
-	public Boolean getIgnore() {
+    public Boolean getIgnore() {
         return this.ignore;
     }
 
-	public void setIgnore(Boolean ignore) {
+    public void setIgnore(Boolean ignore) {
         this.ignore = ignore;
     }
 
-	public String getLabelTypeAndKind() {
+    public String getLabelTypeAndKind() {
         return this.labelTypeAndKind;
     }
 
-	public void setLabelTypeAndKind(String labelTypeAndKind) {
+    public void setLabelTypeAndKind(String labelTypeAndKind) {
         this.labelTypeAndKind = labelTypeAndKind;
     }
 
-	public String getThingTypeAndKind() {
+    public String getThingTypeAndKind() {
         return this.thingTypeAndKind;
     }
 
-	public void setThingTypeAndKind(String thingTypeAndKind) {
+    public void setThingTypeAndKind(String thingTypeAndKind) {
         this.thingTypeAndKind = thingTypeAndKind;
     }
 
-	public String getLabelPrefix() {
+    public String getLabelPrefix() {
         return this.labelPrefix;
     }
 
-	public void setLabelPrefix(String labelPrefix) {
+    public void setLabelPrefix(String labelPrefix) {
         this.labelPrefix = labelPrefix;
     }
 
-	public Long getNumberOfLabels() {
+    public Long getNumberOfLabels() {
         return this.numberOfLabels;
     }
 
-	public void setNumberOfLabels(Long numberOfLabels) {
+    public void setNumberOfLabels(Long numberOfLabels) {
         this.numberOfLabels = numberOfLabels;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/LabelQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/LabelQueryDTO.java
index 35385dcb1..81278005d 100644
--- a/src/main/java/com/labsynch/labseer/dto/LabelQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LabelQueryDTO.java
@@ -9,81 +9,80 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class LabelQueryDTO {
 
-	String labelText;
-	String labelType;
-	String labelKind;
-	String operator;
-	
-	public LabelQueryDTO(){
-		
-	}
+    String labelText;
+    String labelType;
+    String labelKind;
+    String operator;
+
+    public LabelQueryDTO() {
+
+    }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static LabelQueryDTO fromJsonToLabelQueryDTO(String json) {
+    public static LabelQueryDTO fromJsonToLabelQueryDTO(String json) {
         return new JSONDeserializer<LabelQueryDTO>()
-        .use(null, LabelQueryDTO.class).deserialize(json);
+                .use(null, LabelQueryDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<LabelQueryDTO> collection) {
+    public static String toJsonArray(Collection<LabelQueryDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<LabelQueryDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<LabelQueryDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<LabelQueryDTO> fromJsonArrayToLabelQueryDTO(String json) {
+    public static Collection<LabelQueryDTO> fromJsonArrayToLabelQueryDTO(String json) {
         return new JSONDeserializer<List<LabelQueryDTO>>()
-        .use("values", LabelQueryDTO.class).deserialize(json);
+                .use("values", LabelQueryDTO.class).deserialize(json);
     }
 
-	public String getLabelText() {
+    public String getLabelText() {
         return this.labelText;
     }
 
-	public void setLabelText(String labelText) {
+    public void setLabelText(String labelText) {
         this.labelText = labelText;
     }
 
-	public String getLabelType() {
+    public String getLabelType() {
         return this.labelType;
     }
 
-	public void setLabelType(String labelType) {
+    public void setLabelType(String labelType) {
         this.labelType = labelType;
     }
 
-	public String getLabelKind() {
+    public String getLabelKind() {
         return this.labelKind;
     }
 
-	public void setLabelKind(String labelKind) {
+    public void setLabelKind(String labelKind) {
         this.labelKind = labelKind;
     }
 
-	public String getOperator() {
+    public String getOperator() {
         return this.operator;
     }
 
-	public void setOperator(String operator) {
+    public void setOperator(String operator) {
         this.operator = operator;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/LabelSequenceDTO.java b/src/main/java/com/labsynch/labseer/dto/LabelSequenceDTO.java
index f8f877218..43f8fe569 100755
--- a/src/main/java/com/labsynch/labseer/dto/LabelSequenceDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LabelSequenceDTO.java
@@ -7,9 +7,8 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-
 public class LabelSequenceDTO {
-	
+
     private Long numberOfLabels;
 
     private String thingTypeAndKind;
@@ -26,102 +25,101 @@ public class LabelSequenceDTO {
 
     private Long startingNumber;
 
-
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static LabelSequenceDTO fromJsonToLabelSequenceDTO(String json) {
+    public static LabelSequenceDTO fromJsonToLabelSequenceDTO(String json) {
         return new JSONDeserializer<LabelSequenceDTO>()
-        .use(null, LabelSequenceDTO.class).deserialize(json);
+                .use(null, LabelSequenceDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<LabelSequenceDTO> collection) {
+    public static String toJsonArray(Collection<LabelSequenceDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<LabelSequenceDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<LabelSequenceDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<LabelSequenceDTO> fromJsonArrayToLabelSequenceDTO(String json) {
+    public static Collection<LabelSequenceDTO> fromJsonArrayToLabelSequenceDTO(String json) {
         return new JSONDeserializer<List<LabelSequenceDTO>>()
-        .use("values", LabelSequenceDTO.class).deserialize(json);
+                .use("values", LabelSequenceDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public Long getNumberOfLabels() {
+    public Long getNumberOfLabels() {
         return this.numberOfLabels;
     }
 
-	public void setNumberOfLabels(Long numberOfLabels) {
+    public void setNumberOfLabels(Long numberOfLabels) {
         this.numberOfLabels = numberOfLabels;
     }
 
-	public String getThingTypeAndKind() {
+    public String getThingTypeAndKind() {
         return this.thingTypeAndKind;
     }
 
-	public void setThingTypeAndKind(String thingTypeAndKind) {
+    public void setThingTypeAndKind(String thingTypeAndKind) {
         this.thingTypeAndKind = thingTypeAndKind;
     }
 
-	public String getLabelTypeAndKind() {
+    public String getLabelTypeAndKind() {
         return this.labelTypeAndKind;
     }
 
-	public void setLabelTypeAndKind(String labelTypeAndKind) {
+    public void setLabelTypeAndKind(String labelTypeAndKind) {
         this.labelTypeAndKind = labelTypeAndKind;
     }
 
-	public String getLabelPrefix() {
+    public String getLabelPrefix() {
         return this.labelPrefix;
     }
 
-	public void setLabelPrefix(String labelPrefix) {
+    public void setLabelPrefix(String labelPrefix) {
         this.labelPrefix = labelPrefix;
     }
 
-	public String getLabelSeparator() {
+    public String getLabelSeparator() {
         return this.labelSeparator;
     }
 
-	public void setLabelSeparator(String labelSeparator) {
+    public void setLabelSeparator(String labelSeparator) {
         this.labelSeparator = labelSeparator;
     }
 
-	public boolean isGroupDigits() {
+    public boolean isGroupDigits() {
         return this.groupDigits;
     }
 
-	public void setGroupDigits(boolean groupDigits) {
+    public void setGroupDigits(boolean groupDigits) {
         this.groupDigits = groupDigits;
     }
 
-	public Integer getDigits() {
+    public Integer getDigits() {
         return this.digits;
     }
 
-	public void setDigits(Integer digits) {
+    public void setDigits(Integer digits) {
         this.digits = digits;
     }
 
-	public Long getStartingNumber() {
+    public Long getStartingNumber() {
         return this.startingNumber;
     }
 
-	public void setStartingNumber(Long startingNumber) {
+    public void setStartingNumber(Long startingNumber) {
         this.startingNumber = startingNumber;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/LicenseDTO.java b/src/main/java/com/labsynch/labseer/dto/LicenseDTO.java
index 401a83a1b..a38651f64 100644
--- a/src/main/java/com/labsynch/labseer/dto/LicenseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LicenseDTO.java
@@ -7,119 +7,112 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-
 public class LicenseDTO {
 
-	public LicenseDTO() {
-	}
+    public LicenseDTO() {
+    }
+
+    private String licensee;
 
+    private String validDateString;
 
-	private String licensee;
+    private boolean valid;
 
-	private String validDateString;
-	
-	private boolean valid;
-	
-	private String edition;
+    private String edition;
 
-	private String features;
-	
-	private Integer numberOfUsers;
-	
-	private Integer numberOfDaysLeft;
+    private String features;
 
-	
+    private Integer numberOfUsers;
 
+    private Integer numberOfDaysLeft;
 
-	public String getLicensee() {
+    public String getLicensee() {
         return this.licensee;
     }
 
-	public void setLicensee(String licensee) {
+    public void setLicensee(String licensee) {
         this.licensee = licensee;
     }
 
-	public String getValidDateString() {
+    public String getValidDateString() {
         return this.validDateString;
     }
 
-	public void setValidDateString(String validDateString) {
+    public void setValidDateString(String validDateString) {
         this.validDateString = validDateString;
     }
 
-	public boolean isValid() {
+    public boolean isValid() {
         return this.valid;
     }
 
-	public void setValid(boolean valid) {
+    public void setValid(boolean valid) {
         this.valid = valid;
     }
 
-	public String getEdition() {
+    public String getEdition() {
         return this.edition;
     }
 
-	public void setEdition(String edition) {
+    public void setEdition(String edition) {
         this.edition = edition;
     }
 
-	public String getFeatures() {
+    public String getFeatures() {
         return this.features;
     }
 
-	public void setFeatures(String features) {
+    public void setFeatures(String features) {
         this.features = features;
     }
 
-	public Integer getNumberOfUsers() {
+    public Integer getNumberOfUsers() {
         return this.numberOfUsers;
     }
 
-	public void setNumberOfUsers(Integer numberOfUsers) {
+    public void setNumberOfUsers(Integer numberOfUsers) {
         this.numberOfUsers = numberOfUsers;
     }
 
-	public Integer getNumberOfDaysLeft() {
+    public Integer getNumberOfDaysLeft() {
         return this.numberOfDaysLeft;
     }
 
-	public void setNumberOfDaysLeft(Integer numberOfDaysLeft) {
+    public void setNumberOfDaysLeft(Integer numberOfDaysLeft) {
         this.numberOfDaysLeft = numberOfDaysLeft;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static LicenseDTO fromJsonToLicenseDTO(String json) {
+    public static LicenseDTO fromJsonToLicenseDTO(String json) {
         return new JSONDeserializer<LicenseDTO>()
-        .use(null, LicenseDTO.class).deserialize(json);
+                .use(null, LicenseDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<LicenseDTO> collection) {
+    public static String toJsonArray(Collection<LicenseDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<LicenseDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<LicenseDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<LicenseDTO> fromJsonArrayToLicenseDTO(String json) {
+    public static Collection<LicenseDTO> fromJsonArrayToLicenseDTO(String json) {
         return new JSONDeserializer<List<LicenseDTO>>()
-        .use("values", LicenseDTO.class).deserialize(json);
+                .use("values", LicenseDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/LotAliasDTO.java b/src/main/java/com/labsynch/labseer/dto/LotAliasDTO.java
index 69a6e9cc1..3220096e3 100644
--- a/src/main/java/com/labsynch/labseer/dto/LotAliasDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LotAliasDTO.java
@@ -14,130 +14,129 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class LotAliasDTO {
 
     private String lotCorpName;
-    
+
     private String lsType;
-    
+
     private String lsKind;
-    
+
     private String aliasName;
-    
+
     private boolean preferred;
-    
-    public LotAliasDTO(){
-    	
-    }
-    
-    public LotAliasDTO(LotAlias lotAlias){
-    	this.lotCorpName = lotAlias.getLot().getCorpName();
-    	this.lsType = lotAlias.getLsType();
-    	this.lsKind = lotAlias.getLsKind();
-    	this.aliasName = lotAlias.getAliasName();
-    	this.preferred = lotAlias.isPreferred();
-    }
-    
-    public boolean getPreferred(){
-    	return this.preferred;
-    }
-    
+
+    public LotAliasDTO() {
+
+    }
+
+    public LotAliasDTO(LotAlias lotAlias) {
+        this.lotCorpName = lotAlias.getLot().getCorpName();
+        this.lsType = lotAlias.getLsType();
+        this.lsKind = lotAlias.getLsKind();
+        this.aliasName = lotAlias.getAliasName();
+        this.preferred = lotAlias.isPreferred();
+    }
+
+    public boolean getPreferred() {
+        return this.preferred;
+    }
+
     public static LotAliasDTO getLotByAlias(LotAliasDTO lotAliasDTO) {
-		LotAlias lotAlias;
-		try {
-			lotAlias = LotAlias.findLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(lotAliasDTO.getAliasName(), lotAliasDTO.getLsType(), lotAliasDTO.getLsKind()).getSingleResult();
-		} catch (NoResultException e){
-			lotAlias = null;
-		}
-		return new LotAliasDTO(lotAlias);
-	}
-
-	public static Collection<LotAliasDTO> getLotsByAlias(Collection<LotAliasDTO> lotAliasDTOs) {
-		Collection<LotAliasDTO> results = new HashSet<LotAliasDTO>();
-		Collection<LotAlias> lotAliases = null;
-		for (LotAliasDTO lotAliasDTO : lotAliasDTOs){
-			lotAliases = LotAlias.findLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(lotAliasDTO.getAliasName(), lotAliasDTO.getLsType(), lotAliasDTO.getLsKind()).getResultList();
-			for (LotAlias alias : lotAliases){
-				results.add(new LotAliasDTO(alias));
-			}
-		}
-		return results;
-	}
-    
-   
-
-	public String toString() {
+        LotAlias lotAlias;
+        try {
+            lotAlias = LotAlias.findLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(
+                    lotAliasDTO.getAliasName(), lotAliasDTO.getLsType(), lotAliasDTO.getLsKind()).getSingleResult();
+        } catch (NoResultException e) {
+            lotAlias = null;
+        }
+        return new LotAliasDTO(lotAlias);
+    }
+
+    public static Collection<LotAliasDTO> getLotsByAlias(Collection<LotAliasDTO> lotAliasDTOs) {
+        Collection<LotAliasDTO> results = new HashSet<LotAliasDTO>();
+        Collection<LotAlias> lotAliases = null;
+        for (LotAliasDTO lotAliasDTO : lotAliasDTOs) {
+            lotAliases = LotAlias.findLotAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(
+                    lotAliasDTO.getAliasName(), lotAliasDTO.getLsType(), lotAliasDTO.getLsKind()).getResultList();
+            for (LotAlias alias : lotAliases) {
+                results.add(new LotAliasDTO(alias));
+            }
+        }
+        return results;
+    }
+
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static LotAliasDTO fromJsonToLotAliasDTO(String json) {
+    public static LotAliasDTO fromJsonToLotAliasDTO(String json) {
         return new JSONDeserializer<LotAliasDTO>()
-        .use(null, LotAliasDTO.class).deserialize(json);
+                .use(null, LotAliasDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<LotAliasDTO> collection) {
+    public static String toJsonArray(Collection<LotAliasDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<LotAliasDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<LotAliasDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<LotAliasDTO> fromJsonArrayToLoes(String json) {
+    public static Collection<LotAliasDTO> fromJsonArrayToLoes(String json) {
         return new JSONDeserializer<List<LotAliasDTO>>()
-        .use("values", LotAliasDTO.class).deserialize(json);
+                .use("values", LotAliasDTO.class).deserialize(json);
     }
 
-	public String getLotCorpName() {
+    public String getLotCorpName() {
         return this.lotCorpName;
     }
 
-	public void setLotCorpName(String lotCorpName) {
+    public void setLotCorpName(String lotCorpName) {
         this.lotCorpName = lotCorpName;
     }
 
-	public String getLsType() {
+    public String getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(String lsType) {
+    public void setLsType(String lsType) {
         this.lsType = lsType;
     }
 
-	public String getLsKind() {
+    public String getLsKind() {
         return this.lsKind;
     }
 
-	public void setLsKind(String lsKind) {
+    public void setLsKind(String lsKind) {
         this.lsKind = lsKind;
     }
 
-	public String getAliasName() {
+    public String getAliasName() {
         return this.aliasName;
     }
 
-	public void setAliasName(String aliasName) {
+    public void setAliasName(String aliasName) {
         this.aliasName = aliasName;
     }
 
-	public boolean isPreferred() {
+    public boolean isPreferred() {
         return this.preferred;
     }
 
-	public void setPreferred(boolean preferred) {
+    public void setPreferred(boolean preferred) {
         this.preferred = preferred;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/LotDTO.java b/src/main/java/com/labsynch/labseer/dto/LotDTO.java
index db6f0c59f..ba42bede2 100755
--- a/src/main/java/com/labsynch/labseer/dto/LotDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LotDTO.java
@@ -19,7 +19,6 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class LotDTO {
 	private Long id;
 	private Double absorbance;
@@ -91,44 +90,57 @@ public class LotDTO {
 	private String parentCompoundTypeCode;
 	private String parentComment;
 	private Boolean parentIsMixture;
-//	private Set<LotAliasDTO> lotAliasSet = new HashSet<LotAliasDTO>();
-	
-	public LotDTO(Lot lot){
-		if (lot.getId() != null) this.id = lot.getId();
+	// private Set<LotAliasDTO> lotAliasSet = new HashSet<LotAliasDTO>();
+
+	public LotDTO(Lot lot) {
+		if (lot.getId() != null)
+			this.id = lot.getId();
 		this.absorbance = lot.getAbsorbance();
 		this.amount = lot.getAmount();
-		if (lot.getAmountUnits() != null) this.amountUnitsCode = lot.getAmountUnits().getCode();
+		if (lot.getAmountUnits() != null)
+			this.amountUnitsCode = lot.getAmountUnits().getCode();
 		this.barcode = lot.getBarcode();
 		this.boilingPoint = lot.getBoilingPoint();
 		this.buid = lot.getBuid();
-		if (lot.getBulkLoadFile() != null) this.bulkLoadFile = lot.getBulkLoadFile().getFileName();
-		if (lot.getChemist() != null) this.chemist = lot.getChemist();
+		if (lot.getBulkLoadFile() != null)
+			this.bulkLoadFile = lot.getBulkLoadFile().getFileName();
+		if (lot.getChemist() != null)
+			this.chemist = lot.getChemist();
 		this.color = lot.getColor();
 		this.comments = lot.getComments();
-		if (lot.getCorpName() != null) this.lotCorpName = lot.getCorpName();
+		if (lot.getCorpName() != null)
+			this.lotCorpName = lot.getCorpName();
 		this.isVirtual = lot.getIsVirtual();
 		this.lambda = lot.getLambda();
 		this.lotMolWeight = lot.getLotMolWeight();
 		this.lotNumber = lot.getLotNumber();
 		this.meltingPoint = lot.getMeltingPoint();
-		if (lot.getModifiedBy() != null) this.modifiedBy = lot.getModifiedBy();
+		if (lot.getModifiedBy() != null)
+			this.modifiedBy = lot.getModifiedBy();
 		this.modifiedDate = lot.getModifiedDate();
 		this.observedMassOne = lot.getObservedMassOne();
 		this.observedMassTwo = lot.getObservedMassTwo();
 		this.notebookPage = lot.getNotebookPage();
 		this.percentEE = lot.getPercentEE();
-		if (lot.getPhysicalState() != null) this.physicalStateCode = lot.getPhysicalState().getCode();
-		if (lot.getProject() != null) this.project = lot.getProject();
+		if (lot.getPhysicalState() != null)
+			this.physicalStateCode = lot.getPhysicalState().getCode();
+		if (lot.getProject() != null)
+			this.project = lot.getProject();
 		this.purity = lot.getPurity();
-		if (lot.getPurityMeasuredBy() != null) this.purityMeasuredByCode = lot.getPurityMeasuredBy().getCode();
-		if (lot.getPurityOperator() != null) this.purityOperatorCode = lot.getPurityOperator().getCode();
+		if (lot.getPurityMeasuredBy() != null)
+			this.purityMeasuredByCode = lot.getPurityMeasuredBy().getCode();
+		if (lot.getPurityOperator() != null)
+			this.purityOperatorCode = lot.getPurityOperator().getCode();
 		this.registrationDate = lot.getRegistrationDate();
 		this.retain = lot.getRetain();
 		this.retainLocation = lot.getRetainLocation();
-		if (lot.getRetainUnits() != null) this.retainUnitsCode = lot.getRetainUnits().getCode();
-		if (lot.getRegisteredBy() != null) this.lotRegisteredBy = lot.getRegisteredBy();
+		if (lot.getRetainUnits() != null)
+			this.retainUnitsCode = lot.getRetainUnits().getCode();
+		if (lot.getRegisteredBy() != null)
+			this.lotRegisteredBy = lot.getRegisteredBy();
 		this.solutionAmount = lot.getSolutionAmount();
-		if (lot.getSolutionAmountUnits() != null) this.solutionAmountUnitsCode = lot.getSolutionAmountUnits().getCode();
+		if (lot.getSolutionAmountUnits() != null)
+			this.solutionAmountUnitsCode = lot.getSolutionAmountUnits().getCode();
 		this.stockLocation = lot.getStockLocation();
 		this.stockSolvent = lot.getStockSolvent();
 		this.supplier = lot.getSupplier();
@@ -136,14 +148,18 @@ public LotDTO(Lot lot){
 		this.supplierLot = lot.getSupplierLot();
 		this.synthesisDate = lot.getSynthesisDate();
 		this.tareWeight = lot.getTareWeight();
-		if (lot.getTareWeightUnits() != null) this.tareWeightUnitsCode = lot.getTareWeightUnits().getCode();
+		if (lot.getTareWeightUnits() != null)
+			this.tareWeightUnitsCode = lot.getTareWeightUnits().getCode();
 		this.totalAmountStored = lot.getTotalAmountStored();
-		if (lot.getTotalAmountStoredUnits() != null) this.totalAmountStoredUnitsCode = lot.getTotalAmountStoredUnits().getCode();
-		if (lot.getVendor() != null) this.vendorCode = lot.getVendor().getCode();
-		if (!lot.getLotAliases().isEmpty()){
+		if (lot.getTotalAmountStoredUnits() != null)
+			this.totalAmountStoredUnitsCode = lot.getTotalAmountStoredUnits().getCode();
+		if (lot.getVendor() != null)
+			this.vendorCode = lot.getVendor().getCode();
+		if (!lot.getLotAliases().isEmpty()) {
 			String lotAliases = "";
-			for (LotAlias lotAlias : lot.getLotAliases()){
-				if (lotAliases.length() > 0) lotAliases += ";";
+			for (LotAlias lotAlias : lot.getLotAliases()) {
+				if (lotAliases.length() > 0)
+					lotAliases += ";";
 				lotAliases += lotAlias.getAliasName();
 			}
 			this.lotAliases = lotAliases;
@@ -151,14 +167,18 @@ public LotDTO(Lot lot){
 		SaltForm saltForm = lot.getSaltForm();
 		this.saltFormCorpName = saltForm.getCorpName();
 		this.casNumber = saltForm.getCasNumber();
-		if (!saltForm.getIsoSalts().isEmpty()){
+		if (!saltForm.getIsoSalts().isEmpty()) {
 			String isoSaltAbbrevs = "";
 			String isoSaltEquivalents = "";
-			for (IsoSalt isoSalt : saltForm.getIsoSalts()){
-				if (isoSaltAbbrevs.length() > 0) isoSaltAbbrevs+=";";
-				if (isoSaltEquivalents.length() > 0) isoSaltAbbrevs+=";";
-				if (isoSalt.getType().equalsIgnoreCase("salt")) isoSaltAbbrevs += isoSalt.getSalt().getAbbrev();
-				else if (isoSalt.getType().equalsIgnoreCase("isotope")) isoSaltAbbrevs += isoSalt.getIsotope().getAbbrev();
+			for (IsoSalt isoSalt : saltForm.getIsoSalts()) {
+				if (isoSaltAbbrevs.length() > 0)
+					isoSaltAbbrevs += ";";
+				if (isoSaltEquivalents.length() > 0)
+					isoSaltAbbrevs += ";";
+				if (isoSalt.getType().equalsIgnoreCase("salt"))
+					isoSaltAbbrevs += isoSalt.getSalt().getAbbrev();
+				else if (isoSalt.getType().equalsIgnoreCase("isotope"))
+					isoSaltAbbrevs += isoSalt.getIsotope().getAbbrev();
 				isoSaltEquivalents += isoSalt.getEquivalents().toString();
 			}
 			this.saltAbbrevs = isoSaltAbbrevs;
@@ -168,32 +188,38 @@ public LotDTO(Lot lot){
 		this.parentCorpName = parent.getCorpName();
 		this.parentNumber = parent.getParentNumber();
 		this.parentCommonName = parent.getCommonName();
-		if (parent.getStereoCategory() != null) this.parentStereoCategory = parent.getStereoCategory().getCode();
+		if (parent.getStereoCategory() != null)
+			this.parentStereoCategory = parent.getStereoCategory().getCode();
 		this.parentStereoComment = parent.getStereoComment();
 		this.parentStructure = parent.getMolStructure();
 		this.parentMolWeight = parent.getMolWeight();
 		this.parentExactMass = parent.getExactMass();
-		try{
+		try {
 			this.parentMolFormula = MoleculeUtil.getMolFormula(parent.getMolStructure());
-		}catch (CmpdRegMolFormatException e) {
-			//leave mol formula blank
+		} catch (CmpdRegMolFormatException e) {
+			// leave mol formula blank
 		}
 		this.parentRegistrationDate = parent.getRegistrationDate();
-		if (parent.getRegisteredBy() != null) this.parentRegisteredBy = parent.getRegisteredBy();
+		if (parent.getRegisteredBy() != null)
+			this.parentRegisteredBy = parent.getRegisteredBy();
 		this.parentModifiedDate = parent.getModifiedDate();
-		if (parent.getModifiedBy() != null) this.parentModifiedBy = parent.getModifiedBy();
-		if (!parent.getParentAliases().isEmpty()){
+		if (parent.getModifiedBy() != null)
+			this.parentModifiedBy = parent.getModifiedBy();
+		if (!parent.getParentAliases().isEmpty()) {
 			String parentAliases = "";
-			for (ParentAlias parentAlias : parent.getParentAliases()){
-				if (parentAliases.length() > 0) parentAliases += ";";
+			for (ParentAlias parentAlias : parent.getParentAliases()) {
+				if (parentAliases.length() > 0)
+					parentAliases += ";";
 				parentAliases += parentAlias.getAliasName();
 			}
 			this.parentAliases = parentAliases;
 		}
-		if (parent.getParentAnnotation() != null) this.parentAnnotationCode = parent.getParentAnnotation().getCode();
-		if (parent.getCompoundType() != null) this.parentCompoundTypeCode = parent.getCompoundType().getCode();
+		if (parent.getParentAnnotation() != null)
+			this.parentAnnotationCode = parent.getParentAnnotation().getCode();
+		if (parent.getCompoundType() != null)
+			this.parentCompoundTypeCode = parent.getCompoundType().getCode();
 		this.parentComment = parent.getComment();
-		
+
 	}
 
 	public LotDTO() {
@@ -201,596 +227,596 @@ public LotDTO() {
 	}
 
 	public Long getId() {
-        return this.id;
-    }
+		return this.id;
+	}
 
 	public void setId(Long id) {
-        this.id = id;
-    }
+		this.id = id;
+	}
 
 	public Double getAbsorbance() {
-        return this.absorbance;
-    }
+		return this.absorbance;
+	}
 
 	public void setAbsorbance(Double absorbance) {
-        this.absorbance = absorbance;
-    }
+		this.absorbance = absorbance;
+	}
 
 	public Double getAmount() {
-        return this.amount;
-    }
+		return this.amount;
+	}
 
 	public void setAmount(Double amount) {
-        this.amount = amount;
-    }
+		this.amount = amount;
+	}
 
 	public String getAmountUnitsCode() {
-        return this.amountUnitsCode;
-    }
+		return this.amountUnitsCode;
+	}
 
 	public void setAmountUnitsCode(String amountUnitsCode) {
-        this.amountUnitsCode = amountUnitsCode;
-    }
+		this.amountUnitsCode = amountUnitsCode;
+	}
 
 	public String getBarcode() {
-        return this.barcode;
-    }
+		return this.barcode;
+	}
 
 	public void setBarcode(String barcode) {
-        this.barcode = barcode;
-    }
+		this.barcode = barcode;
+	}
 
 	public Double getBoilingPoint() {
-        return this.boilingPoint;
-    }
+		return this.boilingPoint;
+	}
 
 	public void setBoilingPoint(Double boilingPoint) {
-        this.boilingPoint = boilingPoint;
-    }
+		this.boilingPoint = boilingPoint;
+	}
 
 	public Long getBuid() {
-        return this.buid;
-    }
+		return this.buid;
+	}
 
 	public void setBuid(Long buid) {
-        this.buid = buid;
-    }
+		this.buid = buid;
+	}
 
 	public String getBulkLoadFile() {
-        return this.bulkLoadFile;
-    }
+		return this.bulkLoadFile;
+	}
 
 	public void setBulkLoadFile(String bulkLoadFile) {
-        this.bulkLoadFile = bulkLoadFile;
-    }
+		this.bulkLoadFile = bulkLoadFile;
+	}
 
 	public String getChemist() {
-        return this.chemist;
-    }
+		return this.chemist;
+	}
 
 	public void setChemist(String chemist) {
-        this.chemist = chemist;
-    }
+		this.chemist = chemist;
+	}
 
 	public String getColor() {
-        return this.color;
-    }
+		return this.color;
+	}
 
 	public void setColor(String color) {
-        this.color = color;
-    }
+		this.color = color;
+	}
 
 	public String getComments() {
-        return this.comments;
-    }
+		return this.comments;
+	}
 
 	public void setComments(String comments) {
-        this.comments = comments;
-    }
+		this.comments = comments;
+	}
 
 	public String getLotCorpName() {
-        return this.lotCorpName;
-    }
+		return this.lotCorpName;
+	}
 
 	public void setLotCorpName(String lotCorpName) {
-        this.lotCorpName = lotCorpName;
-    }
+		this.lotCorpName = lotCorpName;
+	}
 
 	public Boolean getIsVirtual() {
-        return this.isVirtual;
-    }
+		return this.isVirtual;
+	}
 
 	public void setIsVirtual(Boolean isVirtual) {
-        this.isVirtual = isVirtual;
-    }
+		this.isVirtual = isVirtual;
+	}
 
 	public Double getLambda() {
-        return this.lambda;
-    }
+		return this.lambda;
+	}
 
 	public void setLambda(Double lambda) {
-        this.lambda = lambda;
-    }
+		this.lambda = lambda;
+	}
 
 	public String getLotAliases() {
-        return this.lotAliases;
-    }
+		return this.lotAliases;
+	}
 
 	public void setLotAliases(String lotAliases) {
-        this.lotAliases = lotAliases;
-    }
+		this.lotAliases = lotAliases;
+	}
 
 	public Double getLotMolWeight() {
-        return this.lotMolWeight;
-    }
+		return this.lotMolWeight;
+	}
 
 	public void setLotMolWeight(Double lotMolWeight) {
-        this.lotMolWeight = lotMolWeight;
-    }
+		this.lotMolWeight = lotMolWeight;
+	}
 
 	public Integer getLotNumber() {
-        return this.lotNumber;
-    }
+		return this.lotNumber;
+	}
 
 	public void setLotNumber(Integer lotNumber) {
-        this.lotNumber = lotNumber;
-    }
+		this.lotNumber = lotNumber;
+	}
 
 	public Double getMeltingPoint() {
-        return this.meltingPoint;
-    }
+		return this.meltingPoint;
+	}
 
 	public void setMeltingPoint(Double meltingPoint) {
-        this.meltingPoint = meltingPoint;
-    }
+		this.meltingPoint = meltingPoint;
+	}
 
 	public String getModifiedBy() {
-        return this.modifiedBy;
-    }
+		return this.modifiedBy;
+	}
 
 	public void setModifiedBy(String modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
+		this.modifiedBy = modifiedBy;
+	}
 
 	public Date getModifiedDate() {
-        return this.modifiedDate;
-    }
+		return this.modifiedDate;
+	}
 
 	public void setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
+		this.modifiedDate = modifiedDate;
+	}
 
 	public String getNotebookPage() {
-        return this.notebookPage;
-    }
+		return this.notebookPage;
+	}
 
 	public void setNotebookPage(String notebookPage) {
-        this.notebookPage = notebookPage;
-    }
+		this.notebookPage = notebookPage;
+	}
 
 	public Double getObservedMassOne() {
-        return this.observedMassOne;
-    }
+		return this.observedMassOne;
+	}
 
 	public void setObservedMassOne(Double observedMassOne) {
-        this.observedMassOne = observedMassOne;
-    }
+		this.observedMassOne = observedMassOne;
+	}
 
 	public Double getObservedMassTwo() {
-        return this.observedMassTwo;
-    }
+		return this.observedMassTwo;
+	}
 
 	public void setObservedMassTwo(Double observedMassTwo) {
-        this.observedMassTwo = observedMassTwo;
-    }
+		this.observedMassTwo = observedMassTwo;
+	}
 
 	public Double getPercentEE() {
-        return this.percentEE;
-    }
+		return this.percentEE;
+	}
 
 	public void setPercentEE(Double percentEE) {
-        this.percentEE = percentEE;
-    }
+		this.percentEE = percentEE;
+	}
 
 	public String getPhysicalStateCode() {
-        return this.physicalStateCode;
-    }
+		return this.physicalStateCode;
+	}
 
 	public void setPhysicalStateCode(String physicalStateCode) {
-        this.physicalStateCode = physicalStateCode;
-    }
+		this.physicalStateCode = physicalStateCode;
+	}
 
 	public String getProject() {
-        return this.project;
-    }
+		return this.project;
+	}
 
 	public void setProject(String project) {
-        this.project = project;
-    }
+		this.project = project;
+	}
 
 	public Double getPurity() {
-        return this.purity;
-    }
+		return this.purity;
+	}
 
 	public void setPurity(Double purity) {
-        this.purity = purity;
-    }
+		this.purity = purity;
+	}
 
 	public String getPurityMeasuredByCode() {
-        return this.purityMeasuredByCode;
-    }
+		return this.purityMeasuredByCode;
+	}
 
 	public void setPurityMeasuredByCode(String purityMeasuredByCode) {
-        this.purityMeasuredByCode = purityMeasuredByCode;
-    }
+		this.purityMeasuredByCode = purityMeasuredByCode;
+	}
 
 	public String getPurityOperatorCode() {
-        return this.purityOperatorCode;
-    }
+		return this.purityOperatorCode;
+	}
 
 	public void setPurityOperatorCode(String purityOperatorCode) {
-        this.purityOperatorCode = purityOperatorCode;
-    }
+		this.purityOperatorCode = purityOperatorCode;
+	}
 
 	public Date getRegistrationDate() {
-        return this.registrationDate;
-    }
+		return this.registrationDate;
+	}
 
 	public void setRegistrationDate(Date registrationDate) {
-        this.registrationDate = registrationDate;
-    }
+		this.registrationDate = registrationDate;
+	}
 
 	public Double getRetain() {
-        return this.retain;
-    }
+		return this.retain;
+	}
 
 	public void setRetain(Double retain) {
-        this.retain = retain;
-    }
+		this.retain = retain;
+	}
 
 	public String getRetainLocation() {
-        return this.retainLocation;
-    }
+		return this.retainLocation;
+	}
 
 	public void setRetainLocation(String retainLocation) {
-        this.retainLocation = retainLocation;
-    }
+		this.retainLocation = retainLocation;
+	}
 
 	public String getRetainUnitsCode() {
-        return this.retainUnitsCode;
-    }
+		return this.retainUnitsCode;
+	}
 
 	public void setRetainUnitsCode(String retainUnitsCode) {
-        this.retainUnitsCode = retainUnitsCode;
-    }
+		this.retainUnitsCode = retainUnitsCode;
+	}
 
 	public String getLotRegisteredBy() {
-        return this.lotRegisteredBy;
-    }
+		return this.lotRegisteredBy;
+	}
 
 	public void setLotRegisteredBy(String lotRegisteredBy) {
-        this.lotRegisteredBy = lotRegisteredBy;
-    }
+		this.lotRegisteredBy = lotRegisteredBy;
+	}
 
 	public Double getSolutionAmount() {
-        return this.solutionAmount;
-    }
+		return this.solutionAmount;
+	}
 
 	public void setSolutionAmount(Double solutionAmount) {
-        this.solutionAmount = solutionAmount;
-    }
+		this.solutionAmount = solutionAmount;
+	}
 
 	public String getSolutionAmountUnitsCode() {
-        return this.solutionAmountUnitsCode;
-    }
+		return this.solutionAmountUnitsCode;
+	}
 
 	public void setSolutionAmountUnitsCode(String solutionAmountUnitsCode) {
-        this.solutionAmountUnitsCode = solutionAmountUnitsCode;
-    }
+		this.solutionAmountUnitsCode = solutionAmountUnitsCode;
+	}
 
 	public String getStockLocation() {
-        return this.stockLocation;
-    }
+		return this.stockLocation;
+	}
 
 	public void setStockLocation(String stockLocation) {
-        this.stockLocation = stockLocation;
-    }
+		this.stockLocation = stockLocation;
+	}
 
 	public String getStockSolvent() {
-        return this.stockSolvent;
-    }
+		return this.stockSolvent;
+	}
 
 	public void setStockSolvent(String stockSolvent) {
-        this.stockSolvent = stockSolvent;
-    }
+		this.stockSolvent = stockSolvent;
+	}
 
 	public String getSupplier() {
-        return this.supplier;
-    }
+		return this.supplier;
+	}
 
 	public void setSupplier(String supplier) {
-        this.supplier = supplier;
-    }
+		this.supplier = supplier;
+	}
 
 	public String getSupplierID() {
-        return this.supplierID;
-    }
+		return this.supplierID;
+	}
 
 	public void setSupplierID(String supplierID) {
-        this.supplierID = supplierID;
-    }
+		this.supplierID = supplierID;
+	}
 
 	public String getSupplierLot() {
-        return this.supplierLot;
-    }
+		return this.supplierLot;
+	}
 
 	public void setSupplierLot(String supplierLot) {
-        this.supplierLot = supplierLot;
-    }
+		this.supplierLot = supplierLot;
+	}
 
 	public Date getSynthesisDate() {
-        return this.synthesisDate;
-    }
+		return this.synthesisDate;
+	}
 
 	public void setSynthesisDate(Date synthesisDate) {
-        this.synthesisDate = synthesisDate;
-    }
+		this.synthesisDate = synthesisDate;
+	}
 
 	public Double getTareWeight() {
-        return this.tareWeight;
-    }
+		return this.tareWeight;
+	}
 
 	public void setTareWeight(Double tareWeight) {
-        this.tareWeight = tareWeight;
-    }
+		this.tareWeight = tareWeight;
+	}
 
 	public String getTareWeightUnitsCode() {
-        return this.tareWeightUnitsCode;
-    }
+		return this.tareWeightUnitsCode;
+	}
 
 	public void setTareWeightUnitsCode(String tareWeightUnitsCode) {
-        this.tareWeightUnitsCode = tareWeightUnitsCode;
-    }
+		this.tareWeightUnitsCode = tareWeightUnitsCode;
+	}
 
 	public Double getTotalAmountStored() {
-        return this.totalAmountStored;
-    }
+		return this.totalAmountStored;
+	}
 
 	public void setTotalAmountStored(Double totalAmountStored) {
-        this.totalAmountStored = totalAmountStored;
-    }
+		this.totalAmountStored = totalAmountStored;
+	}
 
 	public String getTotalAmountStoredUnitsCode() {
-        return this.totalAmountStoredUnitsCode;
-    }
+		return this.totalAmountStoredUnitsCode;
+	}
 
 	public void setTotalAmountStoredUnitsCode(String totalAmountStoredUnitsCode) {
-        this.totalAmountStoredUnitsCode = totalAmountStoredUnitsCode;
-    }
+		this.totalAmountStoredUnitsCode = totalAmountStoredUnitsCode;
+	}
 
 	public String getVendorCode() {
-        return this.vendorCode;
-    }
+		return this.vendorCode;
+	}
 
 	public void setVendorCode(String vendorCode) {
-        this.vendorCode = vendorCode;
-    }
+		this.vendorCode = vendorCode;
+	}
 
 	public String getVendorId() {
-        return this.vendorId;
-    }
+		return this.vendorId;
+	}
 
 	public void setVendorId(String vendorId) {
-        this.vendorId = vendorId;
-    }
+		this.vendorId = vendorId;
+	}
 
 	public String getSaltFormCorpName() {
-        return this.saltFormCorpName;
-    }
+		return this.saltFormCorpName;
+	}
 
 	public void setSaltFormCorpName(String saltFormCorpName) {
-        this.saltFormCorpName = saltFormCorpName;
-    }
+		this.saltFormCorpName = saltFormCorpName;
+	}
 
 	public String getCasNumber() {
-        return this.casNumber;
-    }
+		return this.casNumber;
+	}
 
 	public void setCasNumber(String casNumber) {
-        this.casNumber = casNumber;
-    }
+		this.casNumber = casNumber;
+	}
 
 	public String getSaltAbbrevs() {
-        return this.saltAbbrevs;
-    }
+		return this.saltAbbrevs;
+	}
 
 	public void setSaltAbbrevs(String saltAbbrevs) {
-        this.saltAbbrevs = saltAbbrevs;
-    }
+		this.saltAbbrevs = saltAbbrevs;
+	}
 
 	public String getSaltEquivalents() {
-        return this.saltEquivalents;
-    }
+		return this.saltEquivalents;
+	}
 
 	public void setSaltEquivalents(String saltEquivalents) {
-        this.saltEquivalents = saltEquivalents;
-    }
+		this.saltEquivalents = saltEquivalents;
+	}
 
 	public String getParentCorpName() {
-        return this.parentCorpName;
-    }
+		return this.parentCorpName;
+	}
 
 	public void setParentCorpName(String parentCorpName) {
-        this.parentCorpName = parentCorpName;
-    }
+		this.parentCorpName = parentCorpName;
+	}
 
 	public long getParentNumber() {
-        return this.parentNumber;
-    }
+		return this.parentNumber;
+	}
 
 	public void setParentNumber(long parentNumber) {
-        this.parentNumber = parentNumber;
-    }
+		this.parentNumber = parentNumber;
+	}
 
 	public String getParentCommonName() {
-        return this.parentCommonName;
-    }
+		return this.parentCommonName;
+	}
 
 	public void setParentCommonName(String parentCommonName) {
-        this.parentCommonName = parentCommonName;
-    }
+		this.parentCommonName = parentCommonName;
+	}
 
 	public String getParentStereoCategory() {
-        return this.parentStereoCategory;
-    }
+		return this.parentStereoCategory;
+	}
 
 	public void setParentStereoCategory(String parentStereoCategory) {
-        this.parentStereoCategory = parentStereoCategory;
-    }
+		this.parentStereoCategory = parentStereoCategory;
+	}
 
 	public String getParentStereoComment() {
-        return this.parentStereoComment;
-    }
+		return this.parentStereoComment;
+	}
 
 	public void setParentStereoComment(String parentStereoComment) {
-        this.parentStereoComment = parentStereoComment;
-    }
+		this.parentStereoComment = parentStereoComment;
+	}
 
 	public String getParentStructure() {
-        return this.parentStructure;
-    }
+		return this.parentStructure;
+	}
 
 	public void setParentStructure(String parentStructure) {
-        this.parentStructure = parentStructure;
-    }
+		this.parentStructure = parentStructure;
+	}
 
 	public Double getParentMolWeight() {
-        return this.parentMolWeight;
-    }
+		return this.parentMolWeight;
+	}
 
 	public void setParentMolWeight(Double parentMolWeight) {
-        this.parentMolWeight = parentMolWeight;
-    }
+		this.parentMolWeight = parentMolWeight;
+	}
 
 	public Double getParentExactMass() {
-        return this.parentExactMass;
-    }
+		return this.parentExactMass;
+	}
 
 	public void setParentExactMass(Double parentExactMass) {
-        this.parentExactMass = parentExactMass;
-    }
+		this.parentExactMass = parentExactMass;
+	}
 
 	public String getParentMolFormula() {
-        return this.parentMolFormula;
-    }
+		return this.parentMolFormula;
+	}
 
 	public void setParentMolFormula(String parentMolFormula) {
-        this.parentMolFormula = parentMolFormula;
-    }
+		this.parentMolFormula = parentMolFormula;
+	}
 
 	public Date getParentRegistrationDate() {
-        return this.parentRegistrationDate;
-    }
+		return this.parentRegistrationDate;
+	}
 
 	public void setParentRegistrationDate(Date parentRegistrationDate) {
-        this.parentRegistrationDate = parentRegistrationDate;
-    }
+		this.parentRegistrationDate = parentRegistrationDate;
+	}
 
 	public String getParentRegisteredBy() {
-        return this.parentRegisteredBy;
-    }
+		return this.parentRegisteredBy;
+	}
 
 	public void setParentRegisteredBy(String parentRegisteredBy) {
-        this.parentRegisteredBy = parentRegisteredBy;
-    }
+		this.parentRegisteredBy = parentRegisteredBy;
+	}
 
 	public Date getParentModifiedDate() {
-        return this.parentModifiedDate;
-    }
+		return this.parentModifiedDate;
+	}
 
 	public void setParentModifiedDate(Date parentModifiedDate) {
-        this.parentModifiedDate = parentModifiedDate;
-    }
+		this.parentModifiedDate = parentModifiedDate;
+	}
 
 	public String getParentModifiedBy() {
-        return this.parentModifiedBy;
-    }
+		return this.parentModifiedBy;
+	}
 
 	public void setParentModifiedBy(String parentModifiedBy) {
-        this.parentModifiedBy = parentModifiedBy;
-    }
+		this.parentModifiedBy = parentModifiedBy;
+	}
 
 	public String getParentAliases() {
-        return this.parentAliases;
-    }
+		return this.parentAliases;
+	}
 
 	public void setParentAliases(String parentAliases) {
-        this.parentAliases = parentAliases;
-    }
+		this.parentAliases = parentAliases;
+	}
 
 	public String getParentAnnotationCode() {
-        return this.parentAnnotationCode;
-    }
+		return this.parentAnnotationCode;
+	}
 
 	public void setParentAnnotationCode(String parentAnnotationCode) {
-        this.parentAnnotationCode = parentAnnotationCode;
-    }
+		this.parentAnnotationCode = parentAnnotationCode;
+	}
 
 	public String getParentCompoundTypeCode() {
-        return this.parentCompoundTypeCode;
-    }
+		return this.parentCompoundTypeCode;
+	}
 
 	public void setParentCompoundTypeCode(String parentCompoundTypeCode) {
-        this.parentCompoundTypeCode = parentCompoundTypeCode;
-    }
+		this.parentCompoundTypeCode = parentCompoundTypeCode;
+	}
 
 	public String getParentComment() {
-        return this.parentComment;
-    }
+		return this.parentComment;
+	}
 
 	public void setParentComment(String parentComment) {
-        this.parentComment = parentComment;
-    }
+		this.parentComment = parentComment;
+	}
 
 	public Boolean getParentIsMixture() {
-        return this.parentIsMixture;
-    }
+		return this.parentIsMixture;
+	}
 
 	public void setParentIsMixture(Boolean parentIsMixture) {
-        this.parentIsMixture = parentIsMixture;
-    }
+		this.parentIsMixture = parentIsMixture;
+	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 
 	public String toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(this);
+	}
 
 	public String toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(this);
+	}
 
 	public static LotDTO fromJsonToLotDTO(String json) {
-        return new JSONDeserializer<LotDTO>()
-        .use(null, LotDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<LotDTO>()
+				.use(null, LotDTO.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<LotDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<LotDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<LotDTO> fromJsonArrayToLoes(String json) {
-        return new JSONDeserializer<List<LotDTO>>()
-        .use("values", LotDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<LotDTO>>()
+				.use("values", LotDTO.class).deserialize(json);
+	}
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/LotsByProjectDTO.java b/src/main/java/com/labsynch/labseer/dto/LotsByProjectDTO.java
index 0ad12fc96..5f0ff79a6 100755
--- a/src/main/java/com/labsynch/labseer/dto/LotsByProjectDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LotsByProjectDTO.java
@@ -6,111 +6,109 @@
 import java.util.Date;
 import java.util.List;
 
-
 public class LotsByProjectDTO {
-	private Long id;
-	private String lotCorpName;
-	private Integer lotNumber;
-	private Date registrationDate;
-	private String parentCorpName;
-	private String project;
-	
-	public LotsByProjectDTO(
-		long id,
-		String lotCorpName,
-		int lotNumber,
-		Date registrationDate,
-		String parentCorpName,
-		String project
-			) {
-		
-				this.id = id;
-				this.lotCorpName = lotCorpName;
-				this.lotNumber = lotNumber;
-				this.registrationDate = registrationDate;
-				this.parentCorpName = parentCorpName;
-				this.project = project;
-	}
-
-	public LotsByProjectDTO() {
-		// Empty constructor
-	}
-
-	public Long getId() {
+    private Long id;
+    private String lotCorpName;
+    private Integer lotNumber;
+    private Date registrationDate;
+    private String parentCorpName;
+    private String project;
+
+    public LotsByProjectDTO(
+            long id,
+            String lotCorpName,
+            int lotNumber,
+            Date registrationDate,
+            String parentCorpName,
+            String project) {
+
+        this.id = id;
+        this.lotCorpName = lotCorpName;
+        this.lotNumber = lotNumber;
+        this.registrationDate = registrationDate;
+        this.parentCorpName = parentCorpName;
+        this.project = project;
+    }
+
+    public LotsByProjectDTO() {
+        // Empty constructor
+    }
+
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public String getLotCorpName() {
+    public String getLotCorpName() {
         return this.lotCorpName;
     }
 
-	public void setLotCorpName(String lotCorpName) {
+    public void setLotCorpName(String lotCorpName) {
         this.lotCorpName = lotCorpName;
     }
 
-	public Integer getLotNumber() {
+    public Integer getLotNumber() {
         return this.lotNumber;
     }
 
-	public void setLotNumber(Integer lotNumber) {
+    public void setLotNumber(Integer lotNumber) {
         this.lotNumber = lotNumber;
     }
 
-	public Date getRegistrationDate() {
+    public Date getRegistrationDate() {
         return this.registrationDate;
     }
 
-	public void setRegistrationDate(Date registrationDate) {
+    public void setRegistrationDate(Date registrationDate) {
         this.registrationDate = registrationDate;
     }
 
-	public String getParentCorpName() {
+    public String getParentCorpName() {
         return this.parentCorpName;
     }
 
-	public void setParentCorpName(String parentCorpName) {
+    public void setParentCorpName(String parentCorpName) {
         this.parentCorpName = parentCorpName;
     }
 
-	public String getProject() {
+    public String getProject() {
         return this.project;
     }
 
-	public void setProject(String project) {
+    public void setProject(String project) {
         this.project = project;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static LotsByProjectDTO fromJsonToLotsByProjectDTO(String json) {
+    public static LotsByProjectDTO fromJsonToLotsByProjectDTO(String json) {
         return new JSONDeserializer<LotsByProjectDTO>()
-        .use(null, LotsByProjectDTO.class).deserialize(json);
+                .use(null, LotsByProjectDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<LotsByProjectDTO> collection) {
+    public static String toJsonArray(Collection<LotsByProjectDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<LotsByProjectDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<LotsByProjectDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<LotsByProjectDTO> fromJsonArrayToLotsByProes(String json) {
+    public static Collection<LotsByProjectDTO> fromJsonArrayToLotsByProes(String json) {
         return new JSONDeserializer<List<LotsByProjectDTO>>()
-        .use("values", LotsByProjectDTO.class).deserialize(json);
+                .use("values", LotsByProjectDTO.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingBrowserQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/LsThingBrowserQueryDTO.java
index 73070a970..3ad8b3a43 100644
--- a/src/main/java/com/labsynch/labseer/dto/LsThingBrowserQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LsThingBrowserQueryDTO.java
@@ -9,63 +9,59 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class LsThingBrowserQueryDTO {
-	
-	private String queryString;
-	
-	private LsThingQueryDTO queryDTO;
 
+    private String queryString;
+
+    private LsThingQueryDTO queryDTO;
 
-	public String getQueryString() {
+    public String getQueryString() {
         return this.queryString;
     }
 
-	public void setQueryString(String queryString) {
+    public void setQueryString(String queryString) {
         this.queryString = queryString;
     }
 
-	public LsThingQueryDTO getQueryDTO() {
+    public LsThingQueryDTO getQueryDTO() {
         return this.queryDTO;
     }
 
-	public void setQueryDTO(LsThingQueryDTO queryDTO) {
+    public void setQueryDTO(LsThingQueryDTO queryDTO) {
         this.queryDTO = queryDTO;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static LsThingBrowserQueryDTO fromJsonToLsThingBrowserQueryDTO(String json) {
+    public static LsThingBrowserQueryDTO fromJsonToLsThingBrowserQueryDTO(String json) {
         return new JSONDeserializer<LsThingBrowserQueryDTO>()
-        .use(null, LsThingBrowserQueryDTO.class).deserialize(json);
+                .use(null, LsThingBrowserQueryDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<LsThingBrowserQueryDTO> collection) {
+    public static String toJsonArray(Collection<LsThingBrowserQueryDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<LsThingBrowserQueryDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<LsThingBrowserQueryDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<LsThingBrowserQueryDTO> fromJsonArrayToLsThingBroes(String json) {
+    public static Collection<LsThingBrowserQueryDTO> fromJsonArrayToLsThingBroes(String json) {
         return new JSONDeserializer<List<LsThingBrowserQueryDTO>>()
-        .use("values", LsThingBrowserQueryDTO.class).deserialize(json);
+                .use("values", LsThingBrowserQueryDTO.class).deserialize(json);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingQueryCodeTableResultDTO.java b/src/main/java/com/labsynch/labseer/dto/LsThingQueryCodeTableResultDTO.java
index 95a622a4c..4ec0e482e 100644
--- a/src/main/java/com/labsynch/labseer/dto/LsThingQueryCodeTableResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LsThingQueryCodeTableResultDTO.java
@@ -6,17 +6,17 @@ public class LsThingQueryCodeTableResultDTO {
 
 	public void setMaxResults(Integer maxResults) {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 	public void setNumberOfResults(Integer numberOfResults) {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 	public void setResults(Collection<CodeTableDTO> convertToCodeTables) {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 	public String toJson() {
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/LsThingQueryDTO.java
index cb22f40d8..e58b5bdf0 100644
--- a/src/main/java/com/labsynch/labseer/dto/LsThingQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LsThingQueryDTO.java
@@ -10,179 +10,179 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class LsThingQueryDTO {
 
-	Boolean combineTermsWithAnd = false;
-
-	Date recordedDateGreaterThan;
-	
-	Date recordedDateLessThan;
-	
-	String recordedBy;
-	
-	Integer maxResults;
-	
-	String lsType;
-	
-	String lsKind;
-	
-	Collection<ItxQueryDTO> firstInteractions;
-	
-	Collection<ItxQueryDTO> secondInteractions;
-	
-	Collection<ValueQueryDTO> values;
-	
-	Collection<LabelQueryDTO> labels;
-	
-	CodeNameQueryDTO codeName;
-	
-	public LsThingQueryDTO(){
-		
-	}
-	
-	public LsThingQueryDTO(LsThingQueryDTO queryDTO){
-		if(queryDTO.getCombineTermsWithAnd() != null) this.combineTermsWithAnd = queryDTO.getCombineTermsWithAnd();
-		this.recordedDateGreaterThan = queryDTO.getRecordedDateGreaterThan();
-		this.recordedDateLessThan = queryDTO.getRecordedDateLessThan();
-		this.lsType = queryDTO.getLsType();
-		this.lsKind = queryDTO.getLsKind();
-		this.recordedBy = queryDTO.getRecordedBy();
-		this.maxResults = queryDTO.getMaxResults();
-		this.firstInteractions = queryDTO.getFirstInteractions();
-		this.secondInteractions = queryDTO.getSecondInteractions();
-		this.values = queryDTO.getValues();
-		this.labels = queryDTO.getLabels();
-		this.codeName = queryDTO.getCodeName();
-	}
-
-	public String toJson() {
+    Boolean combineTermsWithAnd = false;
+
+    Date recordedDateGreaterThan;
+
+    Date recordedDateLessThan;
+
+    String recordedBy;
+
+    Integer maxResults;
+
+    String lsType;
+
+    String lsKind;
+
+    Collection<ItxQueryDTO> firstInteractions;
+
+    Collection<ItxQueryDTO> secondInteractions;
+
+    Collection<ValueQueryDTO> values;
+
+    Collection<LabelQueryDTO> labels;
+
+    CodeNameQueryDTO codeName;
+
+    public LsThingQueryDTO() {
+
+    }
+
+    public LsThingQueryDTO(LsThingQueryDTO queryDTO) {
+        if (queryDTO.getCombineTermsWithAnd() != null)
+            this.combineTermsWithAnd = queryDTO.getCombineTermsWithAnd();
+        this.recordedDateGreaterThan = queryDTO.getRecordedDateGreaterThan();
+        this.recordedDateLessThan = queryDTO.getRecordedDateLessThan();
+        this.lsType = queryDTO.getLsType();
+        this.lsKind = queryDTO.getLsKind();
+        this.recordedBy = queryDTO.getRecordedBy();
+        this.maxResults = queryDTO.getMaxResults();
+        this.firstInteractions = queryDTO.getFirstInteractions();
+        this.secondInteractions = queryDTO.getSecondInteractions();
+        this.values = queryDTO.getValues();
+        this.labels = queryDTO.getLabels();
+        this.codeName = queryDTO.getCodeName();
+    }
+
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static LsThingQueryDTO fromJsonToLsThingQueryDTO(String json) {
+    public static LsThingQueryDTO fromJsonToLsThingQueryDTO(String json) {
         return new JSONDeserializer<LsThingQueryDTO>()
-        .use(null, LsThingQueryDTO.class).deserialize(json);
+                .use(null, LsThingQueryDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<LsThingQueryDTO> collection) {
+    public static String toJsonArray(Collection<LsThingQueryDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<LsThingQueryDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<LsThingQueryDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<LsThingQueryDTO> fromJsonArrayToLsThingQueryDTO(String json) {
+    public static Collection<LsThingQueryDTO> fromJsonArrayToLsThingQueryDTO(String json) {
         return new JSONDeserializer<List<LsThingQueryDTO>>()
-        .use("values", LsThingQueryDTO.class).deserialize(json);
+                .use("values", LsThingQueryDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public Boolean getCombineTermsWithAnd() {
+    public Boolean getCombineTermsWithAnd() {
         return this.combineTermsWithAnd;
     }
 
-	public void setCombineTermsWithAnd(Boolean combineTermsWithAnd) {
+    public void setCombineTermsWithAnd(Boolean combineTermsWithAnd) {
         this.combineTermsWithAnd = combineTermsWithAnd;
     }
 
-	public Date getRecordedDateGreaterThan() {
+    public Date getRecordedDateGreaterThan() {
         return this.recordedDateGreaterThan;
     }
 
-	public void setRecordedDateGreaterThan(Date recordedDateGreaterThan) {
+    public void setRecordedDateGreaterThan(Date recordedDateGreaterThan) {
         this.recordedDateGreaterThan = recordedDateGreaterThan;
     }
 
-	public Date getRecordedDateLessThan() {
+    public Date getRecordedDateLessThan() {
         return this.recordedDateLessThan;
     }
 
-	public void setRecordedDateLessThan(Date recordedDateLessThan) {
+    public void setRecordedDateLessThan(Date recordedDateLessThan) {
         this.recordedDateLessThan = recordedDateLessThan;
     }
 
-	public String getRecordedBy() {
+    public String getRecordedBy() {
         return this.recordedBy;
     }
 
-	public void setRecordedBy(String recordedBy) {
+    public void setRecordedBy(String recordedBy) {
         this.recordedBy = recordedBy;
     }
 
-	public Integer getMaxResults() {
+    public Integer getMaxResults() {
         return this.maxResults;
     }
 
-	public void setMaxResults(Integer maxResults) {
+    public void setMaxResults(Integer maxResults) {
         this.maxResults = maxResults;
     }
 
-	public String getLsType() {
+    public String getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(String lsType) {
+    public void setLsType(String lsType) {
         this.lsType = lsType;
     }
 
-	public String getLsKind() {
+    public String getLsKind() {
         return this.lsKind;
     }
 
-	public void setLsKind(String lsKind) {
+    public void setLsKind(String lsKind) {
         this.lsKind = lsKind;
     }
 
-	public Collection<ItxQueryDTO> getFirstInteractions() {
+    public Collection<ItxQueryDTO> getFirstInteractions() {
         return this.firstInteractions;
     }
 
-	public void setFirstInteractions(Collection<ItxQueryDTO> firstInteractions) {
+    public void setFirstInteractions(Collection<ItxQueryDTO> firstInteractions) {
         this.firstInteractions = firstInteractions;
     }
 
-	public Collection<ItxQueryDTO> getSecondInteractions() {
+    public Collection<ItxQueryDTO> getSecondInteractions() {
         return this.secondInteractions;
     }
 
-	public void setSecondInteractions(Collection<ItxQueryDTO> secondInteractions) {
+    public void setSecondInteractions(Collection<ItxQueryDTO> secondInteractions) {
         this.secondInteractions = secondInteractions;
     }
 
-	public Collection<ValueQueryDTO> getValues() {
+    public Collection<ValueQueryDTO> getValues() {
         return this.values;
     }
 
-	public void setValues(Collection<ValueQueryDTO> values) {
+    public void setValues(Collection<ValueQueryDTO> values) {
         this.values = values;
     }
 
-	public Collection<LabelQueryDTO> getLabels() {
+    public Collection<LabelQueryDTO> getLabels() {
         return this.labels;
     }
 
-	public void setLabels(Collection<LabelQueryDTO> labels) {
+    public void setLabels(Collection<LabelQueryDTO> labels) {
         this.labels = labels;
     }
 
-	public CodeNameQueryDTO getCodeName() {
+    public CodeNameQueryDTO getCodeName() {
         return this.codeName;
     }
 
-	public void setCodeName(CodeNameQueryDTO codeName) {
+    public void setCodeName(CodeNameQueryDTO codeName) {
         this.codeName = codeName;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingQueryResultDTO.java b/src/main/java/com/labsynch/labseer/dto/LsThingQueryResultDTO.java
index 122545fc5..2f3d92ce3 100644
--- a/src/main/java/com/labsynch/labseer/dto/LsThingQueryResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LsThingQueryResultDTO.java
@@ -13,90 +13,103 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class LsThingQueryResultDTO {
 
-	Integer maxResults;
-	
-	Integer numberOfResults;
-	
-	Collection<LsThing> results;
-	
-	public LsThingQueryResultDTO(){
-		
-	}
-	
-	@Transactional
+    Integer maxResults;
+
+    Integer numberOfResults;
+
+    Collection<LsThing> results;
+
+    public LsThingQueryResultDTO() {
+
+    }
+
+    @Transactional
     public String toJson() {
-        return new JSONSerializer().exclude("*.class").include("results.lsTags", "results.lsLabels", "results.lsStates.lsValues").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().exclude("*.class")
+                .include("results.lsTags", "results.lsLabels", "results.lsStates.lsValues")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
-	
-	 @Transactional
+
+    @Transactional
     public String toJsonWithNestedStubs() {
-        return new JSONSerializer().exclude("*.class").include("results.lsTags", "results.lsLabels", "results.lsStates.lsValues", "results.firstLsThings.firstLsThing.lsLabels","results.secondLsThings.secondLsThing.lsLabels").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().exclude("*.class")
+                .include("results.lsTags", "results.lsLabels", "results.lsStates.lsValues",
+                        "results.firstLsThings.firstLsThing.lsLabels", "results.secondLsThings.secondLsThing.lsLabels")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
-    
+
     @Transactional
     public String toJsonWithNestedFull() {
-        return new JSONSerializer().exclude("*.class").include("results.lsTags", "results.lsLabels", "results.lsStates.lsValues", "results.firstLsThings.firstLsThing.lsStates.lsValues","results.firstLsThings.firstLsThing.lsLabels", "results.secondLsThings.secondLsThing.lsStates.lsValues","results.secondLsThings.secondLsThing.lsLabels","results.firstLsThings.lsStates.lsValues","results.firstLsThings.lsLabels","results.secondLsThings.lsStates.lsValues","results.secondLsThings.lsLabels").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().exclude("*.class").include("results.lsTags", "results.lsLabels",
+                "results.lsStates.lsValues", "results.firstLsThings.firstLsThing.lsStates.lsValues",
+                "results.firstLsThings.firstLsThing.lsLabels", "results.secondLsThings.secondLsThing.lsStates.lsValues",
+                "results.secondLsThings.secondLsThing.lsLabels", "results.firstLsThings.lsStates.lsValues",
+                "results.firstLsThings.lsLabels", "results.secondLsThings.lsStates.lsValues",
+                "results.secondLsThings.lsLabels").transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public String toPrettyJson() {
-        return new JSONSerializer().exclude("*.class", "results.lsStates.lsValues.lsState", "results.lsStates.lsThing", "results.lsLabels.lsThing").include("results.lsTags", "results.lsLabels", "results.lsStates.lsValues").prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "results.lsStates.lsValues.lsState", "results.lsStates.lsThing",
+                        "results.lsLabels.lsThing")
+                .include("results.lsTags", "results.lsLabels", "results.lsStates.lsValues").prettyPrint(true)
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public String toJsonStub() {
-        return new JSONSerializer().exclude("*.class", "results.lsStates").include("results.lsTags", "results.lsLabels").prettyPrint(false).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().exclude("*.class", "results.lsStates").include("results.lsTags", "results.lsLabels")
+                .prettyPrint(false).transform(new ExcludeNulls(), void.class).serialize(this);
     }
-	
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static LsThingQueryResultDTO fromJsonToLsThingQueryResultDTO(String json) {
+    public static LsThingQueryResultDTO fromJsonToLsThingQueryResultDTO(String json) {
         return new JSONDeserializer<LsThingQueryResultDTO>()
-        .use(null, LsThingQueryResultDTO.class).deserialize(json);
+                .use(null, LsThingQueryResultDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<LsThingQueryResultDTO> collection) {
+    public static String toJsonArray(Collection<LsThingQueryResultDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<LsThingQueryResultDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<LsThingQueryResultDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<LsThingQueryResultDTO> fromJsonArrayToLsThingQueryResultDTO(String json) {
+    public static Collection<LsThingQueryResultDTO> fromJsonArrayToLsThingQueryResultDTO(String json) {
         return new JSONDeserializer<List<LsThingQueryResultDTO>>()
-        .use("values", LsThingQueryResultDTO.class).deserialize(json);
+                .use("values", LsThingQueryResultDTO.class).deserialize(json);
     }
 
-	public Integer getMaxResults() {
+    public Integer getMaxResults() {
         return this.maxResults;
     }
 
-	public void setMaxResults(Integer maxResults) {
+    public void setMaxResults(Integer maxResults) {
         this.maxResults = maxResults;
     }
 
-	public Integer getNumberOfResults() {
+    public Integer getNumberOfResults() {
         return this.numberOfResults;
     }
 
-	public void setNumberOfResults(Integer numberOfResults) {
+    public void setNumberOfResults(Integer numberOfResults) {
         this.numberOfResults = numberOfResults;
     }
 
-	public Collection<LsThing> getResults() {
+    public Collection<LsThing> getResults() {
         return this.results;
     }
 
-	public void setResults(Collection<LsThing> results) {
+    public void setResults(Collection<LsThing> results) {
         this.results = results;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingStatePathDTO.java b/src/main/java/com/labsynch/labseer/dto/LsThingStatePathDTO.java
index 2de59c9c3..2c11503f9 100644
--- a/src/main/java/com/labsynch/labseer/dto/LsThingStatePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LsThingStatePathDTO.java
@@ -12,73 +12,72 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class LsThingStatePathDTO {
 
-	public LsThingStatePathDTO() {
-	}
+    public LsThingStatePathDTO() {
+    }
+
+    private String idOrCodeName;
+
+    private String stateType;
 
-	private String idOrCodeName;
+    private String stateKind;
 
-	private String stateType;
-	
-	private String stateKind;
-	
-	private Collection<LsThingState> states;
-	
-	public String toJson() {
-        return new JSONSerializer().include("states.lsValues").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+    private Collection<LsThingState> states;
+
+    public String toJson() {
+        return new JSONSerializer().include("states.lsValues").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
-	
-	public static String toJsonArray(Collection<LsThingStatePathDTO> collection) {
-        return new JSONSerializer().include("states.lsValues").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
+
+    public static String toJsonArray(Collection<LsThingStatePathDTO> collection) {
+        return new JSONSerializer().include("states.lsValues").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
-	public String getIdOrCodeName() {
+    public String getIdOrCodeName() {
         return this.idOrCodeName;
     }
 
-	public void setIdOrCodeName(String idOrCodeName) {
+    public void setIdOrCodeName(String idOrCodeName) {
         this.idOrCodeName = idOrCodeName;
     }
 
-	public String getStateType() {
+    public String getStateType() {
         return this.stateType;
     }
 
-	public void setStateType(String stateType) {
+    public void setStateType(String stateType) {
         this.stateType = stateType;
     }
 
-	public String getStateKind() {
+    public String getStateKind() {
         return this.stateKind;
     }
 
-	public void setStateKind(String stateKind) {
+    public void setStateKind(String stateKind) {
         this.stateKind = stateKind;
     }
 
-	public Collection<LsThingState> getStates() {
+    public Collection<LsThingState> getStates() {
         return this.states;
     }
 
-	public void setStates(Collection<LsThingState> states) {
+    public void setStates(Collection<LsThingState> states) {
         this.states = states;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static LsThingStatePathDTO fromJsonToLsThingStatePathDTO(String json) {
+    public static LsThingStatePathDTO fromJsonToLsThingStatePathDTO(String json) {
         return new JSONDeserializer<LsThingStatePathDTO>()
-        .use(null, LsThingStatePathDTO.class).deserialize(json);
+                .use(null, LsThingStatePathDTO.class).deserialize(json);
     }
 
-	public static Collection<LsThingStatePathDTO> fromJsonArrayToLsThingStatePathDTO(String json) {
+    public static Collection<LsThingStatePathDTO> fromJsonArrayToLsThingStatePathDTO(String json) {
         return new JSONDeserializer<List<LsThingStatePathDTO>>()
-        .use("values", LsThingStatePathDTO.class).deserialize(json);
+                .use("values", LsThingStatePathDTO.class).deserialize(json);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingValidationDTO.java b/src/main/java/com/labsynch/labseer/dto/LsThingValidationDTO.java
index 761754bcc..f009f5109 100644
--- a/src/main/java/com/labsynch/labseer/dto/LsThingValidationDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LsThingValidationDTO.java
@@ -12,108 +12,103 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
-
 public class LsThingValidationDTO {
-	
+
     public LsThingValidationDTO() {
 
     }
 
-    
-	private LsThing lsThing;
-	
-	private boolean uniqueName;
-	
-	private boolean uniqueInteractions;
-	
-	private boolean orderMatters;
-	
-	private boolean forwardAndReverseAreSame;
-	
-	private Set<ValueRuleDTO> valueRules;
+    private LsThing lsThing;
+
+    private boolean uniqueName;
+
+    private boolean uniqueInteractions;
 
-	public String toString() {
+    private boolean orderMatters;
+
+    private boolean forwardAndReverseAreSame;
+
+    private Set<ValueRuleDTO> valueRules;
+
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static LsThingValidationDTO fromJsonToLsThingValidationDTO(String json) {
+    public static LsThingValidationDTO fromJsonToLsThingValidationDTO(String json) {
         return new JSONDeserializer<LsThingValidationDTO>()
-        .use(null, LsThingValidationDTO.class).deserialize(json);
+                .use(null, LsThingValidationDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<LsThingValidationDTO> collection) {
+    public static String toJsonArray(Collection<LsThingValidationDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<LsThingValidationDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<LsThingValidationDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<LsThingValidationDTO> fromJsonArrayToLsThingValidatioes(String json) {
+    public static Collection<LsThingValidationDTO> fromJsonArrayToLsThingValidatioes(String json) {
         return new JSONDeserializer<List<LsThingValidationDTO>>()
-        .use("values", LsThingValidationDTO.class).deserialize(json);
+                .use("values", LsThingValidationDTO.class).deserialize(json);
     }
 
-	public LsThing getLsThing() {
+    public LsThing getLsThing() {
         return this.lsThing;
     }
 
-	public void setLsThing(LsThing lsThing) {
+    public void setLsThing(LsThing lsThing) {
         this.lsThing = lsThing;
     }
 
-	public boolean isUniqueName() {
+    public boolean isUniqueName() {
         return this.uniqueName;
     }
 
-	public void setUniqueName(boolean uniqueName) {
+    public void setUniqueName(boolean uniqueName) {
         this.uniqueName = uniqueName;
     }
 
-	public boolean isUniqueInteractions() {
+    public boolean isUniqueInteractions() {
         return this.uniqueInteractions;
     }
 
-	public void setUniqueInteractions(boolean uniqueInteractions) {
+    public void setUniqueInteractions(boolean uniqueInteractions) {
         this.uniqueInteractions = uniqueInteractions;
     }
 
-	public boolean isOrderMatters() {
+    public boolean isOrderMatters() {
         return this.orderMatters;
     }
 
-	public void setOrderMatters(boolean orderMatters) {
+    public void setOrderMatters(boolean orderMatters) {
         this.orderMatters = orderMatters;
     }
 
-	public boolean isForwardAndReverseAreSame() {
+    public boolean isForwardAndReverseAreSame() {
         return this.forwardAndReverseAreSame;
     }
 
-	public void setForwardAndReverseAreSame(boolean forwardAndReverseAreSame) {
+    public void setForwardAndReverseAreSame(boolean forwardAndReverseAreSame) {
         this.forwardAndReverseAreSame = forwardAndReverseAreSame;
     }
 
-	public Set<ValueRuleDTO> getValueRules() {
+    public Set<ValueRuleDTO> getValueRules() {
         return this.valueRules;
     }
 
-	public void setValueRules(Set<ValueRuleDTO> valueRules) {
+    public void setValueRules(Set<ValueRuleDTO> valueRules) {
         this.valueRules = valueRules;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/LsThingValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/LsThingValuePathDTO.java
index 93a4c4f68..5e775beaa 100644
--- a/src/main/java/com/labsynch/labseer/dto/LsThingValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LsThingValuePathDTO.java
@@ -12,93 +12,92 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class LsThingValuePathDTO {
 
-	public LsThingValuePathDTO() {
-	}
+    public LsThingValuePathDTO() {
+    }
+
+    private String idOrCodeName;
+
+    private String stateType;
+
+    private String stateKind;
 
-	private String idOrCodeName;
+    private String valueType;
 
-	private String stateType;
-	
-	private String stateKind;
-	
-	private String valueType;
-	
-	private String valueKind;
-	
-	private Collection<LsThingValue> values;
-	
-	public String toJson() {
-        return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+    private String valueKind;
+
+    private Collection<LsThingValue> values;
+
+    public String toJson() {
+        return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
-	
-	public static String toJsonArray(Collection<LsThingValuePathDTO> collection) {
-        return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
+
+    public static String toJsonArray(Collection<LsThingValuePathDTO> collection) {
+        return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
 
-	public String getIdOrCodeName() {
+    public String getIdOrCodeName() {
         return this.idOrCodeName;
     }
 
-	public void setIdOrCodeName(String idOrCodeName) {
+    public void setIdOrCodeName(String idOrCodeName) {
         this.idOrCodeName = idOrCodeName;
     }
 
-	public String getStateType() {
+    public String getStateType() {
         return this.stateType;
     }
 
-	public void setStateType(String stateType) {
+    public void setStateType(String stateType) {
         this.stateType = stateType;
     }
 
-	public String getStateKind() {
+    public String getStateKind() {
         return this.stateKind;
     }
 
-	public void setStateKind(String stateKind) {
+    public void setStateKind(String stateKind) {
         this.stateKind = stateKind;
     }
 
-	public String getValueType() {
+    public String getValueType() {
         return this.valueType;
     }
 
-	public void setValueType(String valueType) {
+    public void setValueType(String valueType) {
         this.valueType = valueType;
     }
 
-	public String getValueKind() {
+    public String getValueKind() {
         return this.valueKind;
     }
 
-	public void setValueKind(String valueKind) {
+    public void setValueKind(String valueKind) {
         this.valueKind = valueKind;
     }
 
-	public Collection<LsThingValue> getValues() {
+    public Collection<LsThingValue> getValues() {
         return this.values;
     }
 
-	public void setValues(Collection<LsThingValue> values) {
+    public void setValues(Collection<LsThingValue> values) {
         this.values = values;
     }
 
-	public static LsThingValuePathDTO fromJsonToLsThingValuePathDTO(String json) {
+    public static LsThingValuePathDTO fromJsonToLsThingValuePathDTO(String json) {
         return new JSONDeserializer<LsThingValuePathDTO>()
-        .use(null, LsThingValuePathDTO.class).deserialize(json);
+                .use(null, LsThingValuePathDTO.class).deserialize(json);
     }
 
-	public static Collection<LsThingValuePathDTO> fromJsonArrayToLsThingValuePathDTO(String json) {
+    public static Collection<LsThingValuePathDTO> fromJsonArrayToLsThingValuePathDTO(String json) {
         return new JSONDeserializer<List<LsThingValuePathDTO>>()
-        .use("values", LsThingValuePathDTO.class).deserialize(json);
+                .use("values", LsThingValuePathDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/LsTransactionQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/LsTransactionQueryDTO.java
index 1ed489190..f506ed913 100644
--- a/src/main/java/com/labsynch/labseer/dto/LsTransactionQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/LsTransactionQueryDTO.java
@@ -11,111 +11,109 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class LsTransactionQueryDTO {
-	
-	Date recordedDateGreaterThan;
-	
-	Date recordedDateLessThan;
-	
-	String recordedBy;
-	
-	String status;
-	
-	String type;
-		
-	Integer maxResults;
-	
-	Integer numberOfResults;
-	
-	Collection<LsTransaction> results;
-	
-	public String toJson() {
-        return new JSONSerializer().exclude("*.class").include("results").transform(new ExcludeNulls(), void.class).serialize(this);
-    }
-	
-	public static String toJsonArray(Collection<LsTransactionQueryDTO> collection) {
-        return new JSONSerializer().exclude("*.class").include("results").transform(new ExcludeNulls(), void.class).serialize(collection);
-    }
-
-
-	public static LsTransactionQueryDTO fromJsonToLsTransactionQueryDTO(String json) {
+
+    Date recordedDateGreaterThan;
+
+    Date recordedDateLessThan;
+
+    String recordedBy;
+
+    String status;
+
+    String type;
+
+    Integer maxResults;
+
+    Integer numberOfResults;
+
+    Collection<LsTransaction> results;
+
+    public String toJson() {
+        return new JSONSerializer().exclude("*.class").include("results").transform(new ExcludeNulls(), void.class)
+                .serialize(this);
+    }
+
+    public static String toJsonArray(Collection<LsTransactionQueryDTO> collection) {
+        return new JSONSerializer().exclude("*.class").include("results").transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
+    }
+
+    public static LsTransactionQueryDTO fromJsonToLsTransactionQueryDTO(String json) {
         return new JSONDeserializer<LsTransactionQueryDTO>()
-        .use(null, LsTransactionQueryDTO.class).deserialize(json);
+                .use(null, LsTransactionQueryDTO.class).deserialize(json);
     }
 
-	public static Collection<LsTransactionQueryDTO> fromJsonArrayToLsTransactioes(String json) {
+    public static Collection<LsTransactionQueryDTO> fromJsonArrayToLsTransactioes(String json) {
         return new JSONDeserializer<List<LsTransactionQueryDTO>>()
-        .use("values", LsTransactionQueryDTO.class).deserialize(json);
+                .use("values", LsTransactionQueryDTO.class).deserialize(json);
     }
 
-	public Date getRecordedDateGreaterThan() {
+    public Date getRecordedDateGreaterThan() {
         return this.recordedDateGreaterThan;
     }
 
-	public void setRecordedDateGreaterThan(Date recordedDateGreaterThan) {
+    public void setRecordedDateGreaterThan(Date recordedDateGreaterThan) {
         this.recordedDateGreaterThan = recordedDateGreaterThan;
     }
 
-	public Date getRecordedDateLessThan() {
+    public Date getRecordedDateLessThan() {
         return this.recordedDateLessThan;
     }
 
-	public void setRecordedDateLessThan(Date recordedDateLessThan) {
+    public void setRecordedDateLessThan(Date recordedDateLessThan) {
         this.recordedDateLessThan = recordedDateLessThan;
     }
 
-	public String getRecordedBy() {
+    public String getRecordedBy() {
         return this.recordedBy;
     }
 
-	public void setRecordedBy(String recordedBy) {
+    public void setRecordedBy(String recordedBy) {
         this.recordedBy = recordedBy;
     }
 
-	public String getStatus() {
+    public String getStatus() {
         return this.status;
     }
 
-	public void setStatus(String status) {
+    public void setStatus(String status) {
         this.status = status;
     }
 
-	public String getType() {
+    public String getType() {
         return this.type;
     }
 
-	public void setType(String type) {
+    public void setType(String type) {
         this.type = type;
     }
 
-	public Integer getMaxResults() {
+    public Integer getMaxResults() {
         return this.maxResults;
     }
 
-	public void setMaxResults(Integer maxResults) {
+    public void setMaxResults(Integer maxResults) {
         this.maxResults = maxResults;
     }
 
-	public Integer getNumberOfResults() {
+    public Integer getNumberOfResults() {
         return this.numberOfResults;
     }
 
-	public void setNumberOfResults(Integer numberOfResults) {
+    public void setNumberOfResults(Integer numberOfResults) {
         this.numberOfResults = numberOfResults;
     }
 
-	public Collection<LsTransaction> getResults() {
+    public Collection<LsTransaction> getResults() {
         return this.results;
     }
 
-	public void setResults(Collection<LsTransaction> results) {
+    public void setResults(Collection<LsTransaction> results) {
         this.results = results;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/Metalot.java b/src/main/java/com/labsynch/labseer/dto/Metalot.java
index 349f6e992..e9760a00c 100755
--- a/src/main/java/com/labsynch/labseer/dto/Metalot.java
+++ b/src/main/java/com/labsynch/labseer/dto/Metalot.java
@@ -18,79 +18,77 @@
 import flexjson.JSONSerializer;
 import flexjson.transformer.DateTransformer;
 
-
-
 public class Metalot {
-	
-	private boolean skipParentDupeCheck = false;
 
-	private Lot lot;
-	
-	private Set<IsoSalt> isosalts = new HashSet<IsoSalt>();
+    private boolean skipParentDupeCheck = false;
+
+    private Lot lot;
 
-	private Set<FileList> fileList = new HashSet<FileList>();
+    private Set<IsoSalt> isosalts = new HashSet<IsoSalt>();
 
-	
+    private Set<FileList> fileList = new HashSet<FileList>();
 
-	public String toJson() {
-        String json = new JSONSerializer().include("isosalts", "fileList", "lot", "lot.lotAliases", "lot.saltForm.parent.parentAliases").exclude("*.class", "isosalts.saltForm", "fileList.lot")
-        		.transform( new DateTransformer( "MM/dd/yyyy"), Date.class)
-        		.serialize(this);
+    public String toJson() {
+        String json = new JSONSerializer()
+                .include("isosalts", "fileList", "lot", "lot.lotAliases", "lot.saltForm.parent.parentAliases")
+                .exclude("*.class", "isosalts.saltForm", "fileList.lot")
+                .transform(new DateTransformer("MM/dd/yyyy"), Date.class)
+                .serialize(this);
         System.out.println("fromMetaLotToJson");
         System.out.println(json);
         return json;
-	}
-
+    }
 
-	public static Metalot fromJsonToMetalot(String json) {
+    public static Metalot fromJsonToMetalot(String json) {
         System.out.println("fromJsonToMetalot");
         System.out.println(json);
         return new JSONDeserializer<Metalot>().use(null, Metalot.class)
-        		.use( Date.class, new DateTransformer( "MM/dd/yyyy"))
-        		.deserialize(json);
+                .use(Date.class, new DateTransformer("MM/dd/yyyy"))
+                .deserialize(json);
     }
 
-	public static String toJsonArray(Collection<Metalot> collection) {
+    public static String toJsonArray(Collection<Metalot> collection) {
         return new JSONSerializer().exclude("*.class").serialize(collection);
     }
 
-	public static Collection<Metalot> fromJsonArrayToMetalots(String json) {
-        return new JSONDeserializer<List<Metalot>>().use(null, ArrayList.class).use("values", Metalot.class).deserialize(json);
+    public static Collection<Metalot> fromJsonArrayToMetalots(String json) {
+        return new JSONDeserializer<List<Metalot>>().use(null, ArrayList.class).use("values", Metalot.class)
+                .deserialize(json);
     }
 
-	public boolean isSkipParentDupeCheck() {
+    public boolean isSkipParentDupeCheck() {
         return this.skipParentDupeCheck;
     }
 
-	public void setSkipParentDupeCheck(boolean skipParentDupeCheck) {
+    public void setSkipParentDupeCheck(boolean skipParentDupeCheck) {
         this.skipParentDupeCheck = skipParentDupeCheck;
     }
 
-	public Lot getLot() {
+    public Lot getLot() {
         return this.lot;
     }
 
-	public void setLot(Lot lot) {
+    public void setLot(Lot lot) {
         this.lot = lot;
     }
 
-	public Set<IsoSalt> getIsosalts() {
+    public Set<IsoSalt> getIsosalts() {
         return this.isosalts;
     }
 
-	public void setIsosalts(Set<IsoSalt> isosalts) {
+    public void setIsosalts(Set<IsoSalt> isosalts) {
         this.isosalts = isosalts;
     }
 
-	public Set<FileList> getFileList() {
+    public Set<FileList> getFileList() {
         return this.fileList;
     }
 
-	public void setFileList(Set<FileList> fileList) {
+    public void setFileList(Set<FileList> fileList) {
         this.fileList = fileList;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/MetalotReturn.java b/src/main/java/com/labsynch/labseer/dto/MetalotReturn.java
index a204f89ea..4c7f59498 100755
--- a/src/main/java/com/labsynch/labseer/dto/MetalotReturn.java
+++ b/src/main/java/com/labsynch/labseer/dto/MetalotReturn.java
@@ -16,60 +16,61 @@
 import flexjson.JSONSerializer;
 import flexjson.transformer.DateTransformer;
 
-
 public class MetalotReturn {
-	
-	Metalot metalot;
-	ArrayList<ErrorMessage> errors;
-	
-	@Transactional
-	public String toJson() {
-        String json = new JSONSerializer().include("errors","metalot.isosalts", "metalot.fileLists", "metalot.lot", "metalot.lot.lotAliases", "metalot.lot.saltForm.parent.parentAliases").exclude("*.class", "metalot.isosalts.saltForm", "metalot.fileList.lot")
-        		.transform( new DateTransformer( "MM/dd/yyyy"), Date.class)
-        		.serialize(this);
-//        System.out.println("fromMetaLotToJson");
-//        System.out.println(json);
-        return json;
-	}
 
+    Metalot metalot;
+    ArrayList<ErrorMessage> errors;
+
+    @Transactional
+    public String toJson() {
+        String json = new JSONSerializer()
+                .include("errors", "metalot.isosalts", "metalot.fileLists", "metalot.lot", "metalot.lot.lotAliases",
+                        "metalot.lot.saltForm.parent.parentAliases")
+                .exclude("*.class", "metalot.isosalts.saltForm", "metalot.fileList.lot")
+                .transform(new DateTransformer("MM/dd/yyyy"), Date.class)
+                .serialize(this);
+        // System.out.println("fromMetaLotToJson");
+        // System.out.println(json);
+        return json;
+    }
 
-	public Metalot getMetalot() {
+    public Metalot getMetalot() {
         return this.metalot;
     }
 
-	public void setMetalot(Metalot metalot) {
+    public void setMetalot(Metalot metalot) {
         this.metalot = metalot;
     }
 
-	public ArrayList<ErrorMessage> getErrors() {
+    public ArrayList<ErrorMessage> getErrors() {
         return this.errors;
     }
 
-	public void setErrors(ArrayList<ErrorMessage> errors) {
+    public void setErrors(ArrayList<ErrorMessage> errors) {
         this.errors = errors;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static MetalotReturn fromJsonToMetalotReturn(String json) {
+    public static MetalotReturn fromJsonToMetalotReturn(String json) {
         return new JSONDeserializer<MetalotReturn>()
-        .use(null, MetalotReturn.class).deserialize(json);
+                .use(null, MetalotReturn.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<MetalotReturn> collection) {
+    public static String toJsonArray(Collection<MetalotReturn> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<MetalotReturn> collection, String[] fields) {
+    public static String toJsonArray(Collection<MetalotReturn> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<MetalotReturn> fromJsonArrayToMetalotReturns(String json) {
+    public static Collection<MetalotReturn> fromJsonArrayToMetalotReturns(String json) {
         return new JSONDeserializer<List<MetalotReturn>>()
-        .use("values", MetalotReturn.class).deserialize(json);
+                .use("values", MetalotReturn.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/MetalotReturnDTO.java b/src/main/java/com/labsynch/labseer/dto/MetalotReturnDTO.java
index c6be67fa2..04c7a0046 100755
--- a/src/main/java/com/labsynch/labseer/dto/MetalotReturnDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MetalotReturnDTO.java
@@ -7,71 +7,69 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+public class MetalotReturnDTO {
 
-public class MetalotReturnDTO{
+    private long id;
 
-	private long id;
-	
-	private String corpName;
-	
-	private long buid;
+    private String corpName;
 
+    private long buid;
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public long getId() {
+    public long getId() {
         return this.id;
     }
 
-	public void setId(long id) {
+    public void setId(long id) {
         this.id = id;
     }
 
-	public String getCorpName() {
+    public String getCorpName() {
         return this.corpName;
     }
 
-	public void setCorpName(String corpName) {
+    public void setCorpName(String corpName) {
         this.corpName = corpName;
     }
 
-	public long getBuid() {
+    public long getBuid() {
         return this.buid;
     }
 
-	public void setBuid(long buid) {
+    public void setBuid(long buid) {
         this.buid = buid;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static MetalotReturnDTO fromJsonToMetalotReturnDTO(String json) {
+    public static MetalotReturnDTO fromJsonToMetalotReturnDTO(String json) {
         return new JSONDeserializer<MetalotReturnDTO>()
-        .use(null, MetalotReturnDTO.class).deserialize(json);
+                .use(null, MetalotReturnDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<MetalotReturnDTO> collection) {
+    public static String toJsonArray(Collection<MetalotReturnDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<MetalotReturnDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<MetalotReturnDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<MetalotReturnDTO> fromJsonArrayToMetaloes(String json) {
+    public static Collection<MetalotReturnDTO> fromJsonArrayToMetaloes(String json) {
         return new JSONDeserializer<List<MetalotReturnDTO>>()
-        .use("values", MetalotReturnDTO.class).deserialize(json);
+                .use("values", MetalotReturnDTO.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/MethodOptionDTO.java b/src/main/java/com/labsynch/labseer/dto/MethodOptionDTO.java
index 3db01496c..8600a364b 100644
--- a/src/main/java/com/labsynch/labseer/dto/MethodOptionDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MethodOptionDTO.java
@@ -9,51 +9,49 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class MethodOptionDTO {
-		
-	private String method;
-	
 
-	public String toString() {
+    private String method;
+
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static MethodOptionDTO fromJsonToMethodOptionDTO(String json) {
+    public static MethodOptionDTO fromJsonToMethodOptionDTO(String json) {
         return new JSONDeserializer<MethodOptionDTO>()
-        .use(null, MethodOptionDTO.class).deserialize(json);
+                .use(null, MethodOptionDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<MethodOptionDTO> collection) {
+    public static String toJsonArray(Collection<MethodOptionDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<MethodOptionDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<MethodOptionDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<MethodOptionDTO> fromJsonArrayToMethodOptioes(String json) {
+    public static Collection<MethodOptionDTO> fromJsonArrayToMethodOptioes(String json) {
         return new JSONDeserializer<List<MethodOptionDTO>>()
-        .use("values", MethodOptionDTO.class).deserialize(json);
+                .use("values", MethodOptionDTO.class).deserialize(json);
     }
 
-	public String getMethod() {
+    public String getMethod() {
         return this.method;
     }
 
-	public void setMethod(String method) {
+    public void setMethod(String method) {
         this.method = method;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/MolCleanInputDTO.java b/src/main/java/com/labsynch/labseer/dto/MolCleanInputDTO.java
index 647c42cdf..880e0c9e9 100644
--- a/src/main/java/com/labsynch/labseer/dto/MolCleanInputDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MolCleanInputDTO.java
@@ -7,61 +7,59 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-
 public class MolCleanInputDTO {
-	
-	private String structure;
-		
-	private CleanMolOptionsDTO parameters;
 
+    private String structure;
+
+    private CleanMolOptionsDTO parameters;
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static MolCleanInputDTO fromJsonToMolCleanInputDTO(String json) {
+    public static MolCleanInputDTO fromJsonToMolCleanInputDTO(String json) {
         return new JSONDeserializer<MolCleanInputDTO>()
-        .use(null, MolCleanInputDTO.class).deserialize(json);
+                .use(null, MolCleanInputDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<MolCleanInputDTO> collection) {
+    public static String toJsonArray(Collection<MolCleanInputDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<MolCleanInputDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<MolCleanInputDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<MolCleanInputDTO> fromJsonArrayToMoes(String json) {
+    public static Collection<MolCleanInputDTO> fromJsonArrayToMoes(String json) {
         return new JSONDeserializer<List<MolCleanInputDTO>>()
-        .use("values", MolCleanInputDTO.class).deserialize(json);
+                .use("values", MolCleanInputDTO.class).deserialize(json);
     }
 
-	public String getStructure() {
+    public String getStructure() {
         return this.structure;
     }
 
-	public void setStructure(String structure) {
+    public void setStructure(String structure) {
         this.structure = structure;
     }
 
-	public CleanMolOptionsDTO getParameters() {
+    public CleanMolOptionsDTO getParameters() {
         return this.parameters;
     }
 
-	public void setParameters(CleanMolOptionsDTO parameters) {
+    public void setParameters(CleanMolOptionsDTO parameters) {
         this.parameters = parameters;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/MolConvertInputDTO.java b/src/main/java/com/labsynch/labseer/dto/MolConvertInputDTO.java
index a10be798b..c3def2f91 100644
--- a/src/main/java/com/labsynch/labseer/dto/MolConvertInputDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MolConvertInputDTO.java
@@ -9,71 +9,69 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class MolConvertInputDTO {
-	
-	private String structure;
-	
-	private String inputFormat;
-	
-	private String parameters;
 
+    private String structure;
+
+    private String inputFormat;
+
+    private String parameters;
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getStructure() {
+    public String getStructure() {
         return this.structure;
     }
 
-	public void setStructure(String structure) {
+    public void setStructure(String structure) {
         this.structure = structure;
     }
 
-	public String getInputFormat() {
+    public String getInputFormat() {
         return this.inputFormat;
     }
 
-	public void setInputFormat(String inputFormat) {
+    public void setInputFormat(String inputFormat) {
         this.inputFormat = inputFormat;
     }
 
-	public String getParameters() {
+    public String getParameters() {
         return this.parameters;
     }
 
-	public void setParameters(String parameters) {
+    public void setParameters(String parameters) {
         this.parameters = parameters;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static MolConvertInputDTO fromJsonToMolConvertInputDTO(String json) {
+    public static MolConvertInputDTO fromJsonToMolConvertInputDTO(String json) {
         return new JSONDeserializer<MolConvertInputDTO>()
-        .use(null, MolConvertInputDTO.class).deserialize(json);
+                .use(null, MolConvertInputDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<MolConvertInputDTO> collection) {
+    public static String toJsonArray(Collection<MolConvertInputDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<MolConvertInputDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<MolConvertInputDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<MolConvertInputDTO> fromJsonArrayToMolCoes(String json) {
+    public static Collection<MolConvertInputDTO> fromJsonArrayToMolCoes(String json) {
         return new JSONDeserializer<List<MolConvertInputDTO>>()
-        .use("values", MolConvertInputDTO.class).deserialize(json);
+                .use("values", MolConvertInputDTO.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/MolConvertOutputDTO.java b/src/main/java/com/labsynch/labseer/dto/MolConvertOutputDTO.java
index 286b5d1e7..c4ee33f89 100644
--- a/src/main/java/com/labsynch/labseer/dto/MolConvertOutputDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MolConvertOutputDTO.java
@@ -9,71 +9,69 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class MolConvertOutputDTO {
-	
-	private String structure;
-	
-	private String format;
-	
-	private String contentUrl;
 
+    private String structure;
+
+    private String format;
+
+    private String contentUrl;
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static MolConvertOutputDTO fromJsonToMolConvertOutputDTO(String json) {
+    public static MolConvertOutputDTO fromJsonToMolConvertOutputDTO(String json) {
         return new JSONDeserializer<MolConvertOutputDTO>()
-        .use(null, MolConvertOutputDTO.class).deserialize(json);
+                .use(null, MolConvertOutputDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<MolConvertOutputDTO> collection) {
+    public static String toJsonArray(Collection<MolConvertOutputDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<MolConvertOutputDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<MolConvertOutputDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<MolConvertOutputDTO> fromJsonArrayToMolCoes(String json) {
+    public static Collection<MolConvertOutputDTO> fromJsonArrayToMolCoes(String json) {
         return new JSONDeserializer<List<MolConvertOutputDTO>>()
-        .use("values", MolConvertOutputDTO.class).deserialize(json);
+                .use("values", MolConvertOutputDTO.class).deserialize(json);
     }
 
-	public String getStructure() {
+    public String getStructure() {
         return this.structure;
     }
 
-	public void setStructure(String structure) {
+    public void setStructure(String structure) {
         this.structure = structure;
     }
 
-	public String getFormat() {
+    public String getFormat() {
         return this.format;
     }
 
-	public void setFormat(String format) {
+    public void setFormat(String format) {
         this.format = format;
     }
 
-	public String getContentUrl() {
+    public String getContentUrl() {
         return this.contentUrl;
     }
 
-	public void setContentUrl(String contentUrl) {
+    public void setContentUrl(String contentUrl) {
         this.contentUrl = contentUrl;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/MolInputDTO.java b/src/main/java/com/labsynch/labseer/dto/MolInputDTO.java
index fe23a3cce..8322b2408 100644
--- a/src/main/java/com/labsynch/labseer/dto/MolInputDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MolInputDTO.java
@@ -9,51 +9,49 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class MolInputDTO {
-	
-	private String structure;
-	
 
-	public String getStructure() {
+    private String structure;
+
+    public String getStructure() {
         return this.structure;
     }
 
-	public void setStructure(String structure) {
+    public void setStructure(String structure) {
         this.structure = structure;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static MolInputDTO fromJsonToMolInputDTO(String json) {
+    public static MolInputDTO fromJsonToMolInputDTO(String json) {
         return new JSONDeserializer<MolInputDTO>()
-        .use(null, MolInputDTO.class).deserialize(json);
+                .use(null, MolInputDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<MolInputDTO> collection) {
+    public static String toJsonArray(Collection<MolInputDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<MolInputDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<MolInputDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<MolInputDTO> fromJsonArrayToMoes(String json) {
+    public static Collection<MolInputDTO> fromJsonArrayToMoes(String json) {
         return new JSONDeserializer<List<MolInputDTO>>()
-        .use("values", MolInputDTO.class).deserialize(json);
+                .use("values", MolInputDTO.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/MolPropertiesDTO.java b/src/main/java/com/labsynch/labseer/dto/MolPropertiesDTO.java
index c03b03fe4..6cdfc97c5 100644
--- a/src/main/java/com/labsynch/labseer/dto/MolPropertiesDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MolPropertiesDTO.java
@@ -7,83 +7,79 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-
 public class MolPropertiesDTO {
-	
-	private String molStructure;
-	
-	private Double molWeight;
-	
-	private String molFormula;
 
-	private String smiles;
+    private String molStructure;
+
+    private Double molWeight;
+
+    private String molFormula;
 
+    private String smiles;
 
-	public String getMolStructure() {
+    public String getMolStructure() {
         return this.molStructure;
     }
 
-	public void setMolStructure(String molStructure) {
+    public void setMolStructure(String molStructure) {
         this.molStructure = molStructure;
     }
 
-	public Double getMolWeight() {
+    public Double getMolWeight() {
         return this.molWeight;
     }
 
-	public void setMolWeight(Double molWeight) {
+    public void setMolWeight(Double molWeight) {
         this.molWeight = molWeight;
     }
 
-	public String getMolFormula() {
+    public String getMolFormula() {
         return this.molFormula;
     }
 
-	public void setMolFormula(String molFormula) {
+    public void setMolFormula(String molFormula) {
         this.molFormula = molFormula;
     }
 
-	public String getSmiles() {
+    public String getSmiles() {
         return this.smiles;
     }
 
-	public void setSmiles(String smiles) {
+    public void setSmiles(String smiles) {
         this.smiles = smiles;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static MolPropertiesDTO fromJsonToMolPropertiesDTO(String json) {
+    public static MolPropertiesDTO fromJsonToMolPropertiesDTO(String json) {
         return new JSONDeserializer<MolPropertiesDTO>()
-        .use(null, MolPropertiesDTO.class).deserialize(json);
+                .use(null, MolPropertiesDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<MolPropertiesDTO> collection) {
+    public static String toJsonArray(Collection<MolPropertiesDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<MolPropertiesDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<MolPropertiesDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<MolPropertiesDTO> fromJsonArrayToMolProes(String json) {
+    public static Collection<MolPropertiesDTO> fromJsonArrayToMolProes(String json) {
         return new JSONDeserializer<List<MolPropertiesDTO>>()
-        .use("values", MolPropertiesDTO.class).deserialize(json);
+                .use("values", MolPropertiesDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchRequest.java b/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchRequest.java
index 3ee51b236..059ea29a0 100644
--- a/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchRequest.java
+++ b/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchRequest.java
@@ -9,114 +9,114 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class MultiContainerSubjectSearchRequest {
-	
-	Integer maxResults;
-
-	String protocolLabelLike;
-	
-	String experimentLabelLike;
-	
-	Collection<String> containerCodes;
-	
-	String subjectType;
-	
-	String subjectKind;
-
-	Collection<ValueQueryDTO> values;
-	
-	public MultiContainerSubjectSearchRequest(){
-		
-	}
-
-	public Integer getMaxResults() {
+
+    Integer maxResults;
+
+    String protocolLabelLike;
+
+    String experimentLabelLike;
+
+    Collection<String> containerCodes;
+
+    String subjectType;
+
+    String subjectKind;
+
+    Collection<ValueQueryDTO> values;
+
+    public MultiContainerSubjectSearchRequest() {
+
+    }
+
+    public Integer getMaxResults() {
         return this.maxResults;
     }
 
-	public void setMaxResults(Integer maxResults) {
+    public void setMaxResults(Integer maxResults) {
         this.maxResults = maxResults;
     }
 
-	public String getProtocolLabelLike() {
+    public String getProtocolLabelLike() {
         return this.protocolLabelLike;
     }
 
-	public void setProtocolLabelLike(String protocolLabelLike) {
+    public void setProtocolLabelLike(String protocolLabelLike) {
         this.protocolLabelLike = protocolLabelLike;
     }
 
-	public String getExperimentLabelLike() {
+    public String getExperimentLabelLike() {
         return this.experimentLabelLike;
     }
 
-	public void setExperimentLabelLike(String experimentLabelLike) {
+    public void setExperimentLabelLike(String experimentLabelLike) {
         this.experimentLabelLike = experimentLabelLike;
     }
 
-	public Collection<String> getContainerCodes() {
+    public Collection<String> getContainerCodes() {
         return this.containerCodes;
     }
 
-	public void setContainerCodes(Collection<String> containerCodes) {
+    public void setContainerCodes(Collection<String> containerCodes) {
         this.containerCodes = containerCodes;
     }
 
-	public String getSubjectType() {
+    public String getSubjectType() {
         return this.subjectType;
     }
 
-	public void setSubjectType(String subjectType) {
+    public void setSubjectType(String subjectType) {
         this.subjectType = subjectType;
     }
 
-	public String getSubjectKind() {
+    public String getSubjectKind() {
         return this.subjectKind;
     }
 
-	public void setSubjectKind(String subjectKind) {
+    public void setSubjectKind(String subjectKind) {
         this.subjectKind = subjectKind;
     }
 
-	public Collection<ValueQueryDTO> getValues() {
+    public Collection<ValueQueryDTO> getValues() {
         return this.values;
     }
 
-	public void setValues(Collection<ValueQueryDTO> values) {
+    public void setValues(Collection<ValueQueryDTO> values) {
         this.values = values;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static MultiContainerSubjectSearchRequest fromJsonToMultiContainerSubjectSearchRequest(String json) {
+    public static MultiContainerSubjectSearchRequest fromJsonToMultiContainerSubjectSearchRequest(String json) {
         return new JSONDeserializer<MultiContainerSubjectSearchRequest>()
-        .use(null, MultiContainerSubjectSearchRequest.class).deserialize(json);
+                .use(null, MultiContainerSubjectSearchRequest.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<MultiContainerSubjectSearchRequest> collection) {
+    public static String toJsonArray(Collection<MultiContainerSubjectSearchRequest> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<MultiContainerSubjectSearchRequest> collection, String[] fields) {
+    public static String toJsonArray(Collection<MultiContainerSubjectSearchRequest> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<MultiContainerSubjectSearchRequest> fromJsonArrayToMultiContainerSubjectSearchRequests(String json) {
+    public static Collection<MultiContainerSubjectSearchRequest> fromJsonArrayToMultiContainerSubjectSearchRequests(
+            String json) {
         return new JSONDeserializer<List<MultiContainerSubjectSearchRequest>>()
-        .use("values", MultiContainerSubjectSearchRequest.class).deserialize(json);
+                .use("values", MultiContainerSubjectSearchRequest.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchResultDTO.java b/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchResultDTO.java
index e73d3901e..4f1cb4e36 100644
--- a/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/MultiContainerSubjectSearchResultDTO.java
@@ -12,90 +12,110 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class MultiContainerSubjectSearchResultDTO {
 
-	Integer maxResults;
-	
-	Integer numberOfResults;
-	
-	Collection<ContainerSubjectsDTO> results;
-	
-	public MultiContainerSubjectSearchResultDTO(){
-		
-	}
-	
-	@Transactional
+    Integer maxResults;
+
+    Integer numberOfResults;
+
+    Collection<ContainerSubjectsDTO> results;
+
+    public MultiContainerSubjectSearchResultDTO() {
+
+    }
+
+    @Transactional
     public String toJson() {
-        return new JSONSerializer().exclude("*.class").include("results", "results.subjects.lsTags", "results.subjects.lsLabels", "results.subjects.lsStates.lsValues").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().exclude("*.class").include("results", "results.subjects.lsTags",
+                "results.subjects.lsLabels", "results.subjects.lsStates.lsValues")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
-	
-	 @Transactional
+
+    @Transactional
     public String toJsonWithNestedStubs() {
-        return new JSONSerializer().exclude("*.class").include("results", "results.subjects.lsTags", "results.subjects.lsLabels", "results.subjects.lsStates.lsValues", "results.subjects.firstSubjects.firstSubject.lsLabels","results.subjects.secondSubjects.secondSubject.lsLabels").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().exclude("*.class")
+                .include("results", "results.subjects.lsTags", "results.subjects.lsLabels",
+                        "results.subjects.lsStates.lsValues", "results.subjects.firstSubjects.firstSubject.lsLabels",
+                        "results.subjects.secondSubjects.secondSubject.lsLabels")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
-    
+
     @Transactional
     public String toJsonWithNestedFull() {
-        return new JSONSerializer().exclude("*.class").include("results", "results.subjects.lsTags", "results.subjects.lsLabels", "results.subjects.lsStates.lsValues", "results.subjects.firstSubjects.firstSubject.lsStates.lsValues","results.subjects.firstSubjects.firstSubject.lsLabels", "results.subjects.secondSubjects.secondSubject.lsStates.lsValues","results.subjects.secondSubjects.secondSubject.lsLabels","results.subjects.firstSubjects.lsStates.lsValues","results.subjects.firstSubjects.lsLabels","results.subjects.secondSubjects.lsStates.lsValues","results.subjects.secondSubjects.lsLabels").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().exclude("*.class")
+                .include("results", "results.subjects.lsTags", "results.subjects.lsLabels",
+                        "results.subjects.lsStates.lsValues",
+                        "results.subjects.firstSubjects.firstSubject.lsStates.lsValues",
+                        "results.subjects.firstSubjects.firstSubject.lsLabels",
+                        "results.subjects.secondSubjects.secondSubject.lsStates.lsValues",
+                        "results.subjects.secondSubjects.secondSubject.lsLabels",
+                        "results.subjects.firstSubjects.lsStates.lsValues", "results.subjects.firstSubjects.lsLabels",
+                        "results.subjects.secondSubjects.lsStates.lsValues", "results.subjects.secondSubjects.lsLabels")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public String toPrettyJson() {
-        return new JSONSerializer().exclude("*.class", "results.subjects.lsStates.lsValues.lsState", "results.subjects.lsStates.subject", "results.subjects.lsLabels.subject").include("results", "results.subjects.lsTags", "results.subjects.lsLabels", "results.subjects.lsStates.lsValues").prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "results.subjects.lsStates.lsValues.lsState", "results.subjects.lsStates.subject",
+                        "results.subjects.lsLabels.subject")
+                .include("results", "results.subjects.lsTags", "results.subjects.lsLabels",
+                        "results.subjects.lsStates.lsValues")
+                .prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public String toJsonStub() {
-        return new JSONSerializer().exclude("*.class", "results.subjects.lsStates").include("results", "results.subjects.lsTags", "results.subjects.lsLabels").prettyPrint(false).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().exclude("*.class", "results.subjects.lsStates")
+                .include("results", "results.subjects.lsTags", "results.subjects.lsLabels").prettyPrint(false)
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
-	
 
-	public static MultiContainerSubjectSearchResultDTO fromJsonToMultiContainerSubjectSearchResultDTO(String json) {
+    public static MultiContainerSubjectSearchResultDTO fromJsonToMultiContainerSubjectSearchResultDTO(String json) {
         return new JSONDeserializer<MultiContainerSubjectSearchResultDTO>()
-        .use(null, MultiContainerSubjectSearchResultDTO.class).deserialize(json);
+                .use(null, MultiContainerSubjectSearchResultDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<MultiContainerSubjectSearchResultDTO> collection) {
+    public static String toJsonArray(Collection<MultiContainerSubjectSearchResultDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<MultiContainerSubjectSearchResultDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<MultiContainerSubjectSearchResultDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<MultiContainerSubjectSearchResultDTO> fromJsonArrayToMultiCoes(String json) {
+    public static Collection<MultiContainerSubjectSearchResultDTO> fromJsonArrayToMultiCoes(String json) {
         return new JSONDeserializer<List<MultiContainerSubjectSearchResultDTO>>()
-        .use("values", MultiContainerSubjectSearchResultDTO.class).deserialize(json);
+                .use("values", MultiContainerSubjectSearchResultDTO.class).deserialize(json);
     }
 
-	public Integer getMaxResults() {
+    public Integer getMaxResults() {
         return this.maxResults;
     }
 
-	public void setMaxResults(Integer maxResults) {
+    public void setMaxResults(Integer maxResults) {
         this.maxResults = maxResults;
     }
 
-	public Integer getNumberOfResults() {
+    public Integer getNumberOfResults() {
         return this.numberOfResults;
     }
 
-	public void setNumberOfResults(Integer numberOfResults) {
+    public void setNumberOfResults(Integer numberOfResults) {
         this.numberOfResults = numberOfResults;
     }
 
-	public Collection<ContainerSubjectsDTO> getResults() {
+    public Collection<ContainerSubjectsDTO> getResults() {
         return this.results;
     }
 
-	public void setResults(Collection<ContainerSubjectsDTO> results) {
+    public void setResults(Collection<ContainerSubjectsDTO> results) {
         this.results = results;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO.java b/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO.java
index dd0825eeb..c93e230ba 100644
--- a/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ParentAliasDTO.java
@@ -14,7 +14,6 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ParentAliasDTO {
 
 	private String parentCorpName;
@@ -26,20 +25,20 @@ public class ParentAliasDTO {
 	private String aliasName;
 
 	private boolean preferred;
-	
+
 	private Integer sortId;
-	
-	private Long id; 
-	
+
+	private Long id;
+
 	private Boolean ignored;
-	
+
 	private Integer version;
 
-	public ParentAliasDTO(){
+	public ParentAliasDTO() {
 
 	}
 
-	public ParentAliasDTO(ParentAlias parentAlias){
+	public ParentAliasDTO(ParentAlias parentAlias) {
 		this.parentCorpName = parentAlias.getParent().getCorpName();
 		this.lsType = parentAlias.getLsType();
 		this.lsKind = parentAlias.getLsKind();
@@ -51,15 +50,18 @@ public ParentAliasDTO(ParentAlias parentAlias){
 		this.version = parentAlias.getVersion();
 	}
 
-	public boolean getPreferred(){
+	public boolean getPreferred() {
 		return this.preferred;
 	}
 
 	public static ParentAliasDTO getParentByAlias(ParentAliasDTO parentAliasDTO) {
 		ParentAlias parentAlias;
 		try {
-			parentAlias = ParentAlias.findParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(parentAliasDTO.getAliasName(), parentAliasDTO.getLsType(), parentAliasDTO.getLsKind()).getSingleResult();
-		} catch (NoResultException e){
+			parentAlias = ParentAlias
+					.findParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(parentAliasDTO.getAliasName(),
+							parentAliasDTO.getLsType(), parentAliasDTO.getLsKind())
+					.getSingleResult();
+		} catch (NoResultException e) {
 			parentAlias = null;
 		}
 		return new ParentAliasDTO(parentAlias);
@@ -68,119 +70,121 @@ public static ParentAliasDTO getParentByAlias(ParentAliasDTO parentAliasDTO) {
 	public static Collection<ParentAliasDTO> getParentsByAlias(Collection<ParentAliasDTO> parentAliasDTOs) {
 		Collection<ParentAliasDTO> results = new HashSet<ParentAliasDTO>();
 		Collection<ParentAlias> parentAliases = null;
-		for (ParentAliasDTO parentAliasDTO : parentAliasDTOs){
-			parentAliases = ParentAlias.findParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(parentAliasDTO.getAliasName(), parentAliasDTO.getLsType(), parentAliasDTO.getLsKind()).getResultList();
-			for (ParentAlias alias : parentAliases){
+		for (ParentAliasDTO parentAliasDTO : parentAliasDTOs) {
+			parentAliases = ParentAlias
+					.findParentAliasesByAliasNameEqualsAndLsTypeEqualsAndLsKindEquals(parentAliasDTO.getAliasName(),
+							parentAliasDTO.getLsType(), parentAliasDTO.getLsKind())
+					.getResultList();
+			for (ParentAlias alias : parentAliases) {
 				results.add(new ParentAliasDTO(alias));
 			}
 		}
 		return results;
 	}
 
-
 	public String toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(this);
+	}
 
 	public String toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(this);
+	}
 
 	public static ParentAliasDTO fromJsonToParentAliasDTO(String json) {
-        return new JSONDeserializer<ParentAliasDTO>()
-        .use(null, ParentAliasDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<ParentAliasDTO>()
+				.use(null, ParentAliasDTO.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<ParentAliasDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<ParentAliasDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<ParentAliasDTO> fromJsonArrayToParentAliasDTO(String json) {
-        return new JSONDeserializer<List<ParentAliasDTO>>()
-        .use("values", ParentAliasDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<ParentAliasDTO>>()
+				.use("values", ParentAliasDTO.class).deserialize(json);
+	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 
 	public String getParentCorpName() {
-        return this.parentCorpName;
-    }
+		return this.parentCorpName;
+	}
 
 	public void setParentCorpName(String parentCorpName) {
-        this.parentCorpName = parentCorpName;
-    }
+		this.parentCorpName = parentCorpName;
+	}
 
 	public String getLsType() {
-        return this.lsType;
-    }
+		return this.lsType;
+	}
 
 	public void setLsType(String lsType) {
-        this.lsType = lsType;
-    }
+		this.lsType = lsType;
+	}
 
 	public String getLsKind() {
-        return this.lsKind;
-    }
+		return this.lsKind;
+	}
 
 	public void setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
+		this.lsKind = lsKind;
+	}
 
 	public String getAliasName() {
-        return this.aliasName;
-    }
+		return this.aliasName;
+	}
 
 	public void setAliasName(String aliasName) {
-        this.aliasName = aliasName;
-    }
+		this.aliasName = aliasName;
+	}
 
 	public boolean isPreferred() {
-        return this.preferred;
-    }
+		return this.preferred;
+	}
 
 	public void setPreferred(boolean preferred) {
-        this.preferred = preferred;
-    }
+		this.preferred = preferred;
+	}
 
 	public Integer getSortId() {
-        return this.sortId;
-    }
+		return this.sortId;
+	}
 
 	public void setSortId(Integer sortId) {
-        this.sortId = sortId;
-    }
+		this.sortId = sortId;
+	}
 
 	public Long getId() {
-        return this.id;
-    }
+		return this.id;
+	}
 
 	public void setId(Long id) {
-        this.id = id;
-    }
+		this.id = id;
+	}
 
 	public Boolean getIgnored() {
-        return this.ignored;
-    }
+		return this.ignored;
+	}
 
 	public void setIgnored(Boolean ignored) {
-        this.ignored = ignored;
-    }
+		this.ignored = ignored;
+	}
 
 	public Integer getVersion() {
-        return this.version;
-    }
+		return this.version;
+	}
 
 	public void setVersion(Integer version) {
-        this.version = version;
-    }
+		this.version = version;
+	}
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentDTO.java b/src/main/java/com/labsynch/labseer/dto/ParentDTO.java
index 6e0f925d9..1620c1456 100755
--- a/src/main/java/com/labsynch/labseer/dto/ParentDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ParentDTO.java
@@ -22,246 +22,244 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+public class ParentDTO {
 
-public class ParentDTO{
+    private Long id;
 
-	private Long id;
-	
-	private String corpName;
+    private String corpName;
 
-	private String chemist;
+    private String chemist;
 
-	private String commonName;
+    private String commonName;
 
-	private StereoCategory stereoCategory;
+    private StereoCategory stereoCategory;
 
-	private String stereoComment;
+    private String stereoComment;
 
-	private String molStructure;
-		
-	private Double exactMass;
+    private String molStructure;
 
-	private String molFormula;
+    private Double exactMass;
 
-	private int CdId;
+    private String molFormula;
+
+    private int CdId;
 
     private Double molWeight;
 
-	private Boolean ignore;
-	
+    private Boolean ignore;
+
     private ParentAnnotation parentAnnotation;
-    
+
     private CompoundType compoundType;
-    
+
     private String comment;
-    
+
     private Boolean isMixture;
 
-	private Set<SaltFormDTO> saltForms = new HashSet<SaltFormDTO>();
-	
-	private Set<ParentAliasDTO> parentAliases = new HashSet<ParentAliasDTO>();
-
-	public void setParent(Parent parent) {
-		
-		this.setChemist(parent.getChemist());
-		this.setCommonName(parent.getCommonName());
-		this.setCorpName(parent.getCorpName());
-		this.setIgnore(parent.getIgnore());
-		this.setCompoundType(parent.getCompoundType());
-		this.setParentAnnotation(parent.getParentAnnotation());
-		this.setComment(parent.getComment());
-		this.setIsMixture(parent.getIsMixture());
-		//this may be commented out in when we display by id
-		this.setMolStructure(parent.getMolStructure());
-		try{
-			this.setMolFormula(MoleculeUtil.getMolFormula(parent.getMolStructure()));
-		}catch (CmpdRegMolFormatException e) {
-			//leave mol formula blank
-		}
-		this.setCdId(parent.getCdId());
-		this.setMolWeight(parent.getMolWeight());
-		this.setExactMass(parent.getExactMass());
-		this.setStereoCategory(parent.getStereoCategory());
-		this.setStereoComment(parent.getStereoComment());
-		this.setId(parent.getId());
-	}
-
-
-	public String toString() {
+    private Set<SaltFormDTO> saltForms = new HashSet<SaltFormDTO>();
+
+    private Set<ParentAliasDTO> parentAliases = new HashSet<ParentAliasDTO>();
+
+    public void setParent(Parent parent) {
+
+        this.setChemist(parent.getChemist());
+        this.setCommonName(parent.getCommonName());
+        this.setCorpName(parent.getCorpName());
+        this.setIgnore(parent.getIgnore());
+        this.setCompoundType(parent.getCompoundType());
+        this.setParentAnnotation(parent.getParentAnnotation());
+        this.setComment(parent.getComment());
+        this.setIsMixture(parent.getIsMixture());
+        // this may be commented out in when we display by id
+        this.setMolStructure(parent.getMolStructure());
+        try {
+            this.setMolFormula(MoleculeUtil.getMolFormula(parent.getMolStructure()));
+        } catch (CmpdRegMolFormatException e) {
+            // leave mol formula blank
+        }
+        this.setCdId(parent.getCdId());
+        this.setMolWeight(parent.getMolWeight());
+        this.setExactMass(parent.getExactMass());
+        this.setStereoCategory(parent.getStereoCategory());
+        this.setStereoComment(parent.getStereoComment());
+        this.setId(parent.getId());
+    }
+
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ParentDTO fromJsonToParentDTO(String json) {
+    public static ParentDTO fromJsonToParentDTO(String json) {
         return new JSONDeserializer<ParentDTO>()
-        .use(null, ParentDTO.class).deserialize(json);
+                .use(null, ParentDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ParentDTO> collection) {
+    public static String toJsonArray(Collection<ParentDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ParentDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<ParentDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ParentDTO> fromJsonArrayToParentDTO(String json) {
+    public static Collection<ParentDTO> fromJsonArrayToParentDTO(String json) {
         return new JSONDeserializer<List<ParentDTO>>()
-        .use("values", ParentDTO.class).deserialize(json);
+                .use("values", ParentDTO.class).deserialize(json);
     }
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public String getCorpName() {
+    public String getCorpName() {
         return this.corpName;
     }
 
-	public void setCorpName(String corpName) {
+    public void setCorpName(String corpName) {
         this.corpName = corpName;
     }
 
-	public String getChemist() {
+    public String getChemist() {
         return this.chemist;
     }
 
-	public void setChemist(String chemist) {
+    public void setChemist(String chemist) {
         this.chemist = chemist;
     }
 
-	public String getCommonName() {
+    public String getCommonName() {
         return this.commonName;
     }
 
-	public void setCommonName(String commonName) {
+    public void setCommonName(String commonName) {
         this.commonName = commonName;
     }
 
-	public StereoCategory getStereoCategory() {
+    public StereoCategory getStereoCategory() {
         return this.stereoCategory;
     }
 
-	public void setStereoCategory(StereoCategory stereoCategory) {
+    public void setStereoCategory(StereoCategory stereoCategory) {
         this.stereoCategory = stereoCategory;
     }
 
-	public String getStereoComment() {
+    public String getStereoComment() {
         return this.stereoComment;
     }
 
-	public void setStereoComment(String stereoComment) {
+    public void setStereoComment(String stereoComment) {
         this.stereoComment = stereoComment;
     }
 
-	public String getMolStructure() {
+    public String getMolStructure() {
         return this.molStructure;
     }
 
-	public void setMolStructure(String molStructure) {
+    public void setMolStructure(String molStructure) {
         this.molStructure = molStructure;
     }
 
-	public Double getExactMass() {
+    public Double getExactMass() {
         return this.exactMass;
     }
 
-	public void setExactMass(Double exactMass) {
+    public void setExactMass(Double exactMass) {
         this.exactMass = exactMass;
     }
 
-	public String getMolFormula() {
+    public String getMolFormula() {
         return this.molFormula;
     }
 
-	public void setMolFormula(String molFormula) {
+    public void setMolFormula(String molFormula) {
         this.molFormula = molFormula;
     }
 
-	public int getCdId() {
+    public int getCdId() {
         return this.CdId;
     }
 
-	public void setCdId(int CdId) {
+    public void setCdId(int CdId) {
         this.CdId = CdId;
     }
 
-	public Double getMolWeight() {
+    public Double getMolWeight() {
         return this.molWeight;
     }
 
-	public void setMolWeight(Double molWeight) {
+    public void setMolWeight(Double molWeight) {
         this.molWeight = molWeight;
     }
 
-	public Boolean getIgnore() {
+    public Boolean getIgnore() {
         return this.ignore;
     }
 
-	public void setIgnore(Boolean ignore) {
+    public void setIgnore(Boolean ignore) {
         this.ignore = ignore;
     }
 
-	public ParentAnnotation getParentAnnotation() {
+    public ParentAnnotation getParentAnnotation() {
         return this.parentAnnotation;
     }
 
-	public void setParentAnnotation(ParentAnnotation parentAnnotation) {
+    public void setParentAnnotation(ParentAnnotation parentAnnotation) {
         this.parentAnnotation = parentAnnotation;
     }
 
-	public CompoundType getCompoundType() {
+    public CompoundType getCompoundType() {
         return this.compoundType;
     }
 
-	public void setCompoundType(CompoundType compoundType) {
+    public void setCompoundType(CompoundType compoundType) {
         this.compoundType = compoundType;
     }
 
-	public String getComment() {
+    public String getComment() {
         return this.comment;
     }
 
-	public void setComment(String comment) {
+    public void setComment(String comment) {
         this.comment = comment;
     }
 
-	public Boolean getIsMixture() {
+    public Boolean getIsMixture() {
         return this.isMixture;
     }
 
-	public void setIsMixture(Boolean isMixture) {
+    public void setIsMixture(Boolean isMixture) {
         this.isMixture = isMixture;
     }
 
-	public Set<SaltFormDTO> getSaltForms() {
+    public Set<SaltFormDTO> getSaltForms() {
         return this.saltForms;
     }
 
-	public void setSaltForms(Set<SaltFormDTO> saltForms) {
+    public void setSaltForms(Set<SaltFormDTO> saltForms) {
         this.saltForms = saltForms;
     }
 
-	public Set<ParentAliasDTO> getParentAliases() {
+    public Set<ParentAliasDTO> getParentAliases() {
         return this.parentAliases;
     }
 
-	public void setParentAliases(Set<ParentAliasDTO> parentAliases) {
+    public void setParentAliases(Set<ParentAliasDTO> parentAliases) {
         this.parentAliases = parentAliases;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentEditDTO.java b/src/main/java/com/labsynch/labseer/dto/ParentEditDTO.java
index f756afe27..27731c556 100644
--- a/src/main/java/com/labsynch/labseer/dto/ParentEditDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ParentEditDTO.java
@@ -13,278 +13,276 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+public class ParentEditDTO {
 
-public class ParentEditDTO{
+    private Long id;
 
-	private Long id;
+    private String corpName;
 
-	private String corpName;
+    private String chemistCode;
 
-	private String chemistCode;
+    private String modifiedBy;
 
-	private String modifiedBy;
+    private String commonName;
 
-	private String commonName;
+    private String stereoCategoryCode;
 
-	private String stereoCategoryCode;
+    private String stereoComment;
 
-	private String stereoComment;
+    private String molStructure;
 
-	private String molStructure;
-	
-	private Double exactMass;
+    private Double exactMass;
 
-	private String molFormula;
+    private String molFormula;
 
-	private int CdId;
+    private int CdId;
 
-	private Double molWeight;
+    private Double molWeight;
 
-	private Boolean ignore;
+    private Boolean ignore;
 
-	private String parentAnnotationCode;
+    private String parentAnnotationCode;
 
-	private String compoundTypeCode;
+    private String compoundTypeCode;
 
-	private String comment;
+    private String comment;
 
-	private Boolean isMixture;
+    private Boolean isMixture;
 
-	private String commonNameAliases;
+    private String commonNameAliases;
 
-	private String liveDesignAliases;
+    private String liveDesignAliases;
 
-	private String defaultAliases;
+    private String defaultAliases;
 
-//	private Set<SaltFormDTO> saltForms = new HashSet<SaltFormDTO>();
-	
-	private Set<ParentAliasDTO> parentAliases = new HashSet<ParentAliasDTO>();
+    // private Set<SaltFormDTO> saltForms = new HashSet<SaltFormDTO>();
 
-	public void setParent() {
+    private Set<ParentAliasDTO> parentAliases = new HashSet<ParentAliasDTO>();
 
-	}
-	
-	public void setParent(Parent parent) {
-		
-		this.setChemistCode(parent.getChemist());
-		this.setCommonName(parent.getCommonName());
-		this.setCorpName(parent.getCorpName());
-		this.setIgnore(parent.getIgnore());
-		this.setCompoundTypeCode(parent.getCompoundType().getCode());
-//		this.setParentAnnotation(parent.getParentAnnotation());
-		this.setComment(parent.getComment());
-		this.setIsMixture(parent.getIsMixture());
-//		//this may be commented out in when we display by id
-//		this.setMolStructure(parent.getMolStructure());
-//		this.setMolFormula(parent.getMolFormula());
-//		this.setCdId(parent.getCdId());
-//		this.setMolWeight(parent.getMolWeight());
-//		this.setExactMass(parent.getExactMass());
-//		this.setStereoCategory(parent.getStereoCategory());
-//		this.setStereoComment(parent.getStereoComment());
-//		this.setId(parent.getId());
-	}
+    public void setParent() {
 
+    }
+
+    public void setParent(Parent parent) {
+
+        this.setChemistCode(parent.getChemist());
+        this.setCommonName(parent.getCommonName());
+        this.setCorpName(parent.getCorpName());
+        this.setIgnore(parent.getIgnore());
+        this.setCompoundTypeCode(parent.getCompoundType().getCode());
+        // this.setParentAnnotation(parent.getParentAnnotation());
+        this.setComment(parent.getComment());
+        this.setIsMixture(parent.getIsMixture());
+        // //this may be commented out in when we display by id
+        // this.setMolStructure(parent.getMolStructure());
+        // this.setMolFormula(parent.getMolFormula());
+        // this.setCdId(parent.getCdId());
+        // this.setMolWeight(parent.getMolWeight());
+        // this.setExactMass(parent.getExactMass());
+        // this.setStereoCategory(parent.getStereoCategory());
+        // this.setStereoComment(parent.getStereoComment());
+        // this.setId(parent.getId());
+    }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public String getCorpName() {
+    public String getCorpName() {
         return this.corpName;
     }
 
-	public void setCorpName(String corpName) {
+    public void setCorpName(String corpName) {
         this.corpName = corpName;
     }
 
-	public String getChemistCode() {
+    public String getChemistCode() {
         return this.chemistCode;
     }
 
-	public void setChemistCode(String chemistCode) {
+    public void setChemistCode(String chemistCode) {
         this.chemistCode = chemistCode;
     }
 
-	public String getModifiedBy() {
+    public String getModifiedBy() {
         return this.modifiedBy;
     }
 
-	public void setModifiedBy(String modifiedBy) {
+    public void setModifiedBy(String modifiedBy) {
         this.modifiedBy = modifiedBy;
     }
 
-	public String getCommonName() {
+    public String getCommonName() {
         return this.commonName;
     }
 
-	public void setCommonName(String commonName) {
+    public void setCommonName(String commonName) {
         this.commonName = commonName;
     }
 
-	public String getStereoCategoryCode() {
+    public String getStereoCategoryCode() {
         return this.stereoCategoryCode;
     }
 
-	public void setStereoCategoryCode(String stereoCategoryCode) {
+    public void setStereoCategoryCode(String stereoCategoryCode) {
         this.stereoCategoryCode = stereoCategoryCode;
     }
 
-	public String getStereoComment() {
+    public String getStereoComment() {
         return this.stereoComment;
     }
 
-	public void setStereoComment(String stereoComment) {
+    public void setStereoComment(String stereoComment) {
         this.stereoComment = stereoComment;
     }
 
-	public String getMolStructure() {
+    public String getMolStructure() {
         return this.molStructure;
     }
 
-	public void setMolStructure(String molStructure) {
+    public void setMolStructure(String molStructure) {
         this.molStructure = molStructure;
     }
 
-	public Double getExactMass() {
+    public Double getExactMass() {
         return this.exactMass;
     }
 
-	public void setExactMass(Double exactMass) {
+    public void setExactMass(Double exactMass) {
         this.exactMass = exactMass;
     }
 
-	public String getMolFormula() {
+    public String getMolFormula() {
         return this.molFormula;
     }
 
-	public void setMolFormula(String molFormula) {
+    public void setMolFormula(String molFormula) {
         this.molFormula = molFormula;
     }
 
-	public int getCdId() {
+    public int getCdId() {
         return this.CdId;
     }
 
-	public void setCdId(int CdId) {
+    public void setCdId(int CdId) {
         this.CdId = CdId;
     }
 
-	public Double getMolWeight() {
+    public Double getMolWeight() {
         return this.molWeight;
     }
 
-	public void setMolWeight(Double molWeight) {
+    public void setMolWeight(Double molWeight) {
         this.molWeight = molWeight;
     }
 
-	public Boolean getIgnore() {
+    public Boolean getIgnore() {
         return this.ignore;
     }
 
-	public void setIgnore(Boolean ignore) {
+    public void setIgnore(Boolean ignore) {
         this.ignore = ignore;
     }
 
-	public String getParentAnnotationCode() {
+    public String getParentAnnotationCode() {
         return this.parentAnnotationCode;
     }
 
-	public void setParentAnnotationCode(String parentAnnotationCode) {
+    public void setParentAnnotationCode(String parentAnnotationCode) {
         this.parentAnnotationCode = parentAnnotationCode;
     }
 
-	public String getCompoundTypeCode() {
+    public String getCompoundTypeCode() {
         return this.compoundTypeCode;
     }
 
-	public void setCompoundTypeCode(String compoundTypeCode) {
+    public void setCompoundTypeCode(String compoundTypeCode) {
         this.compoundTypeCode = compoundTypeCode;
     }
 
-	public String getComment() {
+    public String getComment() {
         return this.comment;
     }
 
-	public void setComment(String comment) {
+    public void setComment(String comment) {
         this.comment = comment;
     }
 
-	public Boolean getIsMixture() {
+    public Boolean getIsMixture() {
         return this.isMixture;
     }
 
-	public void setIsMixture(Boolean isMixture) {
+    public void setIsMixture(Boolean isMixture) {
         this.isMixture = isMixture;
     }
 
-	public String getCommonNameAliases() {
+    public String getCommonNameAliases() {
         return this.commonNameAliases;
     }
 
-	public void setCommonNameAliases(String commonNameAliases) {
+    public void setCommonNameAliases(String commonNameAliases) {
         this.commonNameAliases = commonNameAliases;
     }
 
-	public String getLiveDesignAliases() {
+    public String getLiveDesignAliases() {
         return this.liveDesignAliases;
     }
 
-	public void setLiveDesignAliases(String liveDesignAliases) {
+    public void setLiveDesignAliases(String liveDesignAliases) {
         this.liveDesignAliases = liveDesignAliases;
     }
 
-	public String getDefaultAliases() {
+    public String getDefaultAliases() {
         return this.defaultAliases;
     }
 
-	public void setDefaultAliases(String defaultAliases) {
+    public void setDefaultAliases(String defaultAliases) {
         this.defaultAliases = defaultAliases;
     }
 
-	public Set<ParentAliasDTO> getParentAliases() {
+    public Set<ParentAliasDTO> getParentAliases() {
         return this.parentAliases;
     }
 
-	public void setParentAliases(Set<ParentAliasDTO> parentAliases) {
+    public void setParentAliases(Set<ParentAliasDTO> parentAliases) {
         this.parentAliases = parentAliases;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ParentEditDTO fromJsonToParentEditDTO(String json) {
+    public static ParentEditDTO fromJsonToParentEditDTO(String json) {
         return new JSONDeserializer<ParentEditDTO>()
-        .use(null, ParentEditDTO.class).deserialize(json);
+                .use(null, ParentEditDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ParentEditDTO> collection) {
+    public static String toJsonArray(Collection<ParentEditDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ParentEditDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<ParentEditDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ParentEditDTO> fromJsonArrayToParentEditDTO(String json) {
+    public static Collection<ParentEditDTO> fromJsonArrayToParentEditDTO(String json) {
         return new JSONDeserializer<List<ParentEditDTO>>()
-        .use("values", ParentEditDTO.class).deserialize(json);
+                .use("values", ParentEditDTO.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentLotCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/ParentLotCodeDTO.java
index a04d13295..11184a933 100644
--- a/src/main/java/com/labsynch/labseer/dto/ParentLotCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ParentLotCodeDTO.java
@@ -7,67 +7,65 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ParentLotCodeDTO {
-	
-	private String requestName;
-	
-	private String referenceCode;
-	
-	private Collection<String> lotCodes;
-	
-	public ParentLotCodeDTO(){
-		
-	}
-	
-	public String toJson() {
-        return new JSONSerializer()
-        .include("lotCodes")
-        .exclude("*.class").serialize(this);
+
+    private String requestName;
+
+    private String referenceCode;
+
+    private Collection<String> lotCodes;
+
+    public ParentLotCodeDTO() {
+
     }
-	
-	public static String toJsonArray(Collection<ParentLotCodeDTO> collection) {
+
+    public String toJson() {
         return new JSONSerializer()
-        .include("lotCodes")
-        .exclude("*.class").serialize(collection);
+                .include("lotCodes")
+                .exclude("*.class").serialize(this);
     }
 
+    public static String toJsonArray(Collection<ParentLotCodeDTO> collection) {
+        return new JSONSerializer()
+                .include("lotCodes")
+                .exclude("*.class").serialize(collection);
+    }
 
-	public static ParentLotCodeDTO fromJsonToParentLotCodeDTO(String json) {
+    public static ParentLotCodeDTO fromJsonToParentLotCodeDTO(String json) {
         return new JSONDeserializer<ParentLotCodeDTO>()
-        .use(null, ParentLotCodeDTO.class).deserialize(json);
+                .use(null, ParentLotCodeDTO.class).deserialize(json);
     }
 
-	public static Collection<ParentLotCodeDTO> fromJsonArrayToParentLotCoes(String json) {
+    public static Collection<ParentLotCodeDTO> fromJsonArrayToParentLotCoes(String json) {
         return new JSONDeserializer<List<ParentLotCodeDTO>>()
-        .use("values", ParentLotCodeDTO.class).deserialize(json);
+                .use("values", ParentLotCodeDTO.class).deserialize(json);
     }
 
-	public String getRequestName() {
+    public String getRequestName() {
         return this.requestName;
     }
 
-	public void setRequestName(String requestName) {
+    public void setRequestName(String requestName) {
         this.requestName = requestName;
     }
 
-	public String getReferenceCode() {
+    public String getReferenceCode() {
         return this.referenceCode;
     }
 
-	public void setReferenceCode(String referenceCode) {
+    public void setReferenceCode(String referenceCode) {
         this.referenceCode = referenceCode;
     }
 
-	public Collection<String> getLotCodes() {
+    public Collection<String> getLotCodes() {
         return this.lotCodes;
     }
 
-	public void setLotCodes(Collection<String> lotCodes) {
+    public void setLotCodes(Collection<String> lotCodes) {
         this.lotCodes = lotCodes;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ParentValidationDTO.java b/src/main/java/com/labsynch/labseer/dto/ParentValidationDTO.java
index 2f631ba81..47b2ef185 100644
--- a/src/main/java/com/labsynch/labseer/dto/ParentValidationDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ParentValidationDTO.java
@@ -14,83 +14,81 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ParentValidationDTO {
-	
-	private static final Logger logger = LoggerFactory.getLogger(ParentValidationDTO.class);
-
-	private Collection<CodeTableDTO> affectedLots;
-	
-	private boolean parentUnique;
-	
-	private Collection<ParentDTO> dupeParents;
-	
-	private Collection<ErrorMessage> errors; 
-		
-	public ParentValidationDTO() {
-		this.errors = new ArrayList<ErrorMessage>();
-	}
-    
+
+    private static final Logger logger = LoggerFactory.getLogger(ParentValidationDTO.class);
+
+    private Collection<CodeTableDTO> affectedLots;
+
+    private boolean parentUnique;
+
+    private Collection<ParentDTO> dupeParents;
+
+    private Collection<ErrorMessage> errors;
+
+    public ParentValidationDTO() {
+        this.errors = new ArrayList<ErrorMessage>();
+    }
+
     public String toJson() {
         return new JSONSerializer()
-        .include("affectedLots", "dupeParents","errors")
-        .exclude("*.class").serialize(this);
+                .include("affectedLots", "dupeParents", "errors")
+                .exclude("*.class").serialize(this);
     }
-    
 
-	public Collection<CodeTableDTO> getAffectedLots() {
+    public Collection<CodeTableDTO> getAffectedLots() {
         return this.affectedLots;
     }
 
-	public void setAffectedLots(Collection<CodeTableDTO> affectedLots) {
+    public void setAffectedLots(Collection<CodeTableDTO> affectedLots) {
         this.affectedLots = affectedLots;
     }
 
-	public boolean isParentUnique() {
+    public boolean isParentUnique() {
         return this.parentUnique;
     }
 
-	public void setParentUnique(boolean parentUnique) {
+    public void setParentUnique(boolean parentUnique) {
         this.parentUnique = parentUnique;
     }
 
-	public Collection<ParentDTO> getDupeParents() {
+    public Collection<ParentDTO> getDupeParents() {
         return this.dupeParents;
     }
 
-	public void setDupeParents(Collection<ParentDTO> dupeParents) {
+    public void setDupeParents(Collection<ParentDTO> dupeParents) {
         this.dupeParents = dupeParents;
     }
 
-	public Collection<ErrorMessage> getErrors() {
+    public Collection<ErrorMessage> getErrors() {
         return this.errors;
     }
 
-	public void setErrors(Collection<ErrorMessage> errors) {
+    public void setErrors(Collection<ErrorMessage> errors) {
         this.errors = errors;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static ParentValidationDTO fromJsonToParentValidationDTO(String json) {
+    public static ParentValidationDTO fromJsonToParentValidationDTO(String json) {
         return new JSONDeserializer<ParentValidationDTO>()
-        .use(null, ParentValidationDTO.class).deserialize(json);
+                .use(null, ParentValidationDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ParentValidationDTO> collection) {
+    public static String toJsonArray(Collection<ParentValidationDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ParentValidationDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<ParentValidationDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ParentValidationDTO> fromJsonArrayToParentValidatioes(String json) {
+    public static Collection<ParentValidationDTO> fromJsonArrayToParentValidatioes(String json) {
         return new JSONDeserializer<List<ParentValidationDTO>>()
-        .use("values", ParentValidationDTO.class).deserialize(json);
+                .use("values", ParentValidationDTO.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/PlateStubDTO.java b/src/main/java/com/labsynch/labseer/dto/PlateStubDTO.java
index 7894ed307..55c5b8201 100644
--- a/src/main/java/com/labsynch/labseer/dto/PlateStubDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PlateStubDTO.java
@@ -7,85 +7,80 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class PlateStubDTO {
-	
-	private String barcode;
-	private String codeName;
-	private String plateType;
-	
-	private Collection<WellStubDTO> wells;
-	
-	public PlateStubDTO(){
-	}
-	
-	public PlateStubDTO(String barcode, String codeName, String plateType){
-		this.barcode = barcode;
-		this.codeName = codeName;
-		this.plateType = plateType;
-	}
-	
-	public String toJson() {
-        return new JSONSerializer().include("wells").exclude("*.class").serialize(this);
+
+    private String barcode;
+    private String codeName;
+    private String plateType;
+
+    private Collection<WellStubDTO> wells;
+
+    public PlateStubDTO() {
+    }
+
+    public PlateStubDTO(String barcode, String codeName, String plateType) {
+        this.barcode = barcode;
+        this.codeName = codeName;
+        this.plateType = plateType;
     }
-	
 
+    public String toJson() {
+        return new JSONSerializer().include("wells").exclude("*.class").serialize(this);
+    }
 
-	public static PlateStubDTO fromJsonToPlateStubDTO(String json) {
+    public static PlateStubDTO fromJsonToPlateStubDTO(String json) {
         return new JSONDeserializer<PlateStubDTO>()
-        .use(null, PlateStubDTO.class).deserialize(json);
+                .use(null, PlateStubDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<PlateStubDTO> collection) {
+    public static String toJsonArray(Collection<PlateStubDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<PlateStubDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<PlateStubDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<PlateStubDTO> fromJsonArrayToPlateStubDTO(String json) {
+    public static Collection<PlateStubDTO> fromJsonArrayToPlateStubDTO(String json) {
         return new JSONDeserializer<List<PlateStubDTO>>()
-        .use("values", PlateStubDTO.class).deserialize(json);
+                .use("values", PlateStubDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getBarcode() {
+    public String getBarcode() {
         return this.barcode;
     }
 
-	public void setBarcode(String barcode) {
+    public void setBarcode(String barcode) {
         this.barcode = barcode;
     }
 
-	public String getCodeName() {
+    public String getCodeName() {
         return this.codeName;
     }
 
-	public void setCodeName(String codeName) {
+    public void setCodeName(String codeName) {
         this.codeName = codeName;
     }
 
-	public String getPlateType() {
+    public String getPlateType() {
         return this.plateType;
     }
 
-	public void setPlateType(String plateType) {
+    public void setPlateType(String plateType) {
         this.plateType = plateType;
     }
 
-	public Collection<WellStubDTO> getWells() {
+    public Collection<WellStubDTO> getWells() {
         return this.wells;
     }
 
-	public void setWells(Collection<WellStubDTO> wells) {
+    public void setWells(Collection<WellStubDTO> wells) {
         this.wells = wells;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/PlateWellDTO.java b/src/main/java/com/labsynch/labseer/dto/PlateWellDTO.java
index 4f5d8b726..ce429e906 100644
--- a/src/main/java/com/labsynch/labseer/dto/PlateWellDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PlateWellDTO.java
@@ -9,93 +9,88 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class PlateWellDTO {
-	
-	private String plateBarcode;
-	private String plateCodeName;
-	
-	private String wellCodeName;
-	
-	private String wellLabel;
-	
-	public PlateWellDTO(){
-	}
-	
-	public PlateWellDTO(String plateBarcode, String plateCodeName, String wellCodeName, String wellLabel){
-		this.plateBarcode = plateBarcode;
-		this.plateCodeName = plateCodeName;
-		this.wellCodeName = wellCodeName;
-		this.wellLabel = wellLabel;
-	}
-	
-
-
-	public String getPlateBarcode() {
+
+    private String plateBarcode;
+    private String plateCodeName;
+
+    private String wellCodeName;
+
+    private String wellLabel;
+
+    public PlateWellDTO() {
+    }
+
+    public PlateWellDTO(String plateBarcode, String plateCodeName, String wellCodeName, String wellLabel) {
+        this.plateBarcode = plateBarcode;
+        this.plateCodeName = plateCodeName;
+        this.wellCodeName = wellCodeName;
+        this.wellLabel = wellLabel;
+    }
+
+    public String getPlateBarcode() {
         return this.plateBarcode;
     }
 
-	public void setPlateBarcode(String plateBarcode) {
+    public void setPlateBarcode(String plateBarcode) {
         this.plateBarcode = plateBarcode;
     }
 
-	public String getPlateCodeName() {
+    public String getPlateCodeName() {
         return this.plateCodeName;
     }
 
-	public void setPlateCodeName(String plateCodeName) {
+    public void setPlateCodeName(String plateCodeName) {
         this.plateCodeName = plateCodeName;
     }
 
-	public String getWellCodeName() {
+    public String getWellCodeName() {
         return this.wellCodeName;
     }
 
-	public void setWellCodeName(String wellCodeName) {
+    public void setWellCodeName(String wellCodeName) {
         this.wellCodeName = wellCodeName;
     }
 
-	public String getWellLabel() {
+    public String getWellLabel() {
         return this.wellLabel;
     }
 
-	public void setWellLabel(String wellLabel) {
+    public void setWellLabel(String wellLabel) {
         this.wellLabel = wellLabel;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static PlateWellDTO fromJsonToPlateWellDTO(String json) {
+    public static PlateWellDTO fromJsonToPlateWellDTO(String json) {
         return new JSONDeserializer<PlateWellDTO>()
-        .use(null, PlateWellDTO.class).deserialize(json);
+                .use(null, PlateWellDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<PlateWellDTO> collection) {
+    public static String toJsonArray(Collection<PlateWellDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<PlateWellDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<PlateWellDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<PlateWellDTO> fromJsonArrayToPlateWellDTO(String json) {
+    public static Collection<PlateWellDTO> fromJsonArrayToPlateWellDTO(String json) {
         return new JSONDeserializer<List<PlateWellDTO>>()
-        .use("values", PlateWellDTO.class).deserialize(json);
+                .use("values", PlateWellDTO.class).deserialize(json);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO.java b/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO.java
index 6bb184e0e..6ec0d0a0b 100755
--- a/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PreferredNameDTO.java
@@ -1,6 +1,5 @@
 package com.labsynch.labseer.dto;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -16,18 +15,16 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class PreferredNameDTO {
-	
-	public PreferredNameDTO() {		
+
+	public PreferredNameDTO() {
 	}
-	
+
 	public PreferredNameDTO(
 			String requestName,
 			String preferredName,
-			String referenceName
-			) {
-		
+			String referenceName) {
+
 		this.requestName = requestName;
 		this.preferredName = preferredName;
 		this.referenceName = referenceName;
@@ -38,94 +35,91 @@ public PreferredNameDTO(
 	private String preferredName;
 
 	private String referenceName;
-		
+
 	@Transactional
-    public static Collection<PreferredNameDTO> getPreferredNames(Collection<PreferredNameDTO> preferredNameDTOs){
-    	for (PreferredNameDTO preferredNameDTO : preferredNameDTOs){
-    		String preferredName;
-    		try {
-    			preferredName = Lot.findLotsByCorpNameEquals(preferredNameDTO.getRequestName()).getSingleResult().getCorpName();
-    		} catch (NoResultException e){
-    			preferredName = "";
-    		}
-    		preferredNameDTO.setPreferredName(preferredName);
-    	}
-    	return preferredNameDTOs;
-    }
+	public static Collection<PreferredNameDTO> getPreferredNames(Collection<PreferredNameDTO> preferredNameDTOs) {
+		for (PreferredNameDTO preferredNameDTO : preferredNameDTOs) {
+			String preferredName;
+			try {
+				preferredName = Lot.findLotsByCorpNameEquals(preferredNameDTO.getRequestName()).getSingleResult()
+						.getCorpName();
+			} catch (NoResultException e) {
+				preferredName = "";
+			}
+			preferredNameDTO.setPreferredName(preferredName);
+		}
+		return preferredNameDTOs;
+	}
 
 	public static Collection<PreferredNameDTO> getParentPreferredNames(Collection<PreferredNameDTO> preferredNameDTOs) {
-		for (PreferredNameDTO preferredNameDTO : preferredNameDTOs){
-    		String preferredName;
-    		try {
-    			preferredName = Parent.findParentsByCorpNameEquals(preferredNameDTO.getRequestName()).getSingleResult().getCorpName();
-    		} catch (NoResultException e){
-    			preferredName = "";
-    		}
-    		preferredNameDTO.setPreferredName(preferredName);
-    	}
-    	return preferredNameDTOs;
-	}
-  
+		for (PreferredNameDTO preferredNameDTO : preferredNameDTOs) {
+			String preferredName;
+			try {
+				preferredName = Parent.findParentsByCorpNameEquals(preferredNameDTO.getRequestName()).getSingleResult()
+						.getCorpName();
+			} catch (NoResultException e) {
+				preferredName = "";
+			}
+			preferredNameDTO.setPreferredName(preferredName);
+		}
+		return preferredNameDTOs;
+	}
 
 	public String toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(this);
+	}
 
 	public String toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(this);
+	}
 
 	public static PreferredNameDTO fromJsonToPreferredNameDTO(String json) {
-        return new JSONDeserializer<PreferredNameDTO>()
-        .use(null, PreferredNameDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<PreferredNameDTO>()
+				.use(null, PreferredNameDTO.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<PreferredNameDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<PreferredNameDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<PreferredNameDTO> fromJsonArrayToPreferredNameDTO(String json) {
-        return new JSONDeserializer<List<PreferredNameDTO>>()
-        .use("values", PreferredNameDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<PreferredNameDTO>>()
+				.use("values", PreferredNameDTO.class).deserialize(json);
+	}
 
 	public String getRequestName() {
-        return this.requestName;
-    }
+		return this.requestName;
+	}
 
 	public void setRequestName(String requestName) {
-        this.requestName = requestName;
-    }
+		this.requestName = requestName;
+	}
 
 	public String getPreferredName() {
-        return this.preferredName;
-    }
+		return this.preferredName;
+	}
 
 	public void setPreferredName(String preferredName) {
-        this.preferredName = preferredName;
-    }
+		this.preferredName = preferredName;
+	}
 
 	public String getReferenceName() {
-        return this.referenceName;
-    }
+		return this.referenceName;
+	}
 
 	public void setReferenceName(String referenceName) {
-        this.referenceName = referenceName;
-    }
+		this.referenceName = referenceName;
+	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 }
-
-
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/PreferredNameRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/PreferredNameRequestDTO.java
index 6a870ee50..285bb7eb6 100755
--- a/src/main/java/com/labsynch/labseer/dto/PreferredNameRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PreferredNameRequestDTO.java
@@ -9,69 +9,67 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class PreferredNameRequestDTO {
 
-	private boolean error;
-	
-	private Collection<ErrorMessageDTO> errorMessages;
+    private boolean error;
+
+    private Collection<ErrorMessageDTO> errorMessages;
 
-	private Collection<PreferredNameDTO> requests;
-	
+    private Collection<PreferredNameDTO> requests;
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer().exclude("*.class").include("errorMessages", "requests").serialize(this);
     }
 
-	public static PreferredNameRequestDTO fromJsonToPreferredNameResultsDTO(String json) {
-        return new JSONDeserializer<PreferredNameRequestDTO>().use(null, PreferredNameRequestDTO.class).deserialize(json);
+    public static PreferredNameRequestDTO fromJsonToPreferredNameResultsDTO(String json) {
+        return new JSONDeserializer<PreferredNameRequestDTO>().use(null, PreferredNameRequestDTO.class)
+                .deserialize(json);
     }
 
-	public static String toJsonArray(Collection<PreferredNameRequestDTO> collection) {
+    public static String toJsonArray(Collection<PreferredNameRequestDTO> collection) {
         return new JSONSerializer().exclude("*.class").include("errorMessages", "requests").serialize(collection);
     }
 
-	public static Collection<PreferredNameRequestDTO> fromJsonArrayToPreferredNameResultsDTO(String json) {
-        return new JSONDeserializer<List<PreferredNameRequestDTO>>().use(null, ArrayList.class).use("values", PreferredNameRequestDTO.class).deserialize(json);
+    public static Collection<PreferredNameRequestDTO> fromJsonArrayToPreferredNameResultsDTO(String json) {
+        return new JSONDeserializer<List<PreferredNameRequestDTO>>().use(null, ArrayList.class)
+                .use("values", PreferredNameRequestDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static PreferredNameRequestDTO fromJsonToPreferredNameRequestDTO(String json) {
+    public static PreferredNameRequestDTO fromJsonToPreferredNameRequestDTO(String json) {
         return new JSONDeserializer<PreferredNameRequestDTO>()
-        .use(null, PreferredNameRequestDTO.class).deserialize(json);
+                .use(null, PreferredNameRequestDTO.class).deserialize(json);
     }
 
-	public static Collection<PreferredNameRequestDTO> fromJsonArrayToPreferredNameRequestDTO(String json) {
+    public static Collection<PreferredNameRequestDTO> fromJsonArrayToPreferredNameRequestDTO(String json) {
         return new JSONDeserializer<List<PreferredNameRequestDTO>>()
-        .use("values", PreferredNameRequestDTO.class).deserialize(json);
+                .use("values", PreferredNameRequestDTO.class).deserialize(json);
     }
 
-	public boolean isError() {
+    public boolean isError() {
         return this.error;
     }
 
-	public void setError(boolean error) {
+    public void setError(boolean error) {
         this.error = error;
     }
 
-	public Collection<ErrorMessageDTO> getErrorMessages() {
+    public Collection<ErrorMessageDTO> getErrorMessages() {
         return this.errorMessages;
     }
 
-	public void setErrorMessages(Collection<ErrorMessageDTO> errorMessages) {
+    public void setErrorMessages(Collection<ErrorMessageDTO> errorMessages) {
         this.errorMessages = errorMessages;
     }
 
-	public Collection<PreferredNameDTO> getRequests() {
+    public Collection<PreferredNameDTO> getRequests() {
         return this.requests;
     }
 
-	public void setRequests(Collection<PreferredNameDTO> requests) {
+    public void setRequests(Collection<PreferredNameDTO> requests) {
         this.requests = requests;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/PreferredNameResultsDTO.java b/src/main/java/com/labsynch/labseer/dto/PreferredNameResultsDTO.java
index 2ddb021c2..d8c2ca712 100755
--- a/src/main/java/com/labsynch/labseer/dto/PreferredNameResultsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PreferredNameResultsDTO.java
@@ -10,59 +10,57 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class PreferredNameResultsDTO {
 
-	private boolean error;
-	
-	private Collection<ErrorMessageDTO> errorMessages;
+    private boolean error;
+
+    private Collection<ErrorMessageDTO> errorMessages;
 
-	private Collection<PreferredNameDTO> results;
-	
+    private Collection<PreferredNameDTO> results;
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer().exclude("*.class").include("errorMessages", "results").serialize(this);
     }
 
-	public static PreferredNameResultsDTO fromJsonToPreferredNameResultsDTO(String json) {
-        return new JSONDeserializer<PreferredNameResultsDTO>().use(null, PreferredNameResultsDTO.class).deserialize(json);
+    public static PreferredNameResultsDTO fromJsonToPreferredNameResultsDTO(String json) {
+        return new JSONDeserializer<PreferredNameResultsDTO>().use(null, PreferredNameResultsDTO.class)
+                .deserialize(json);
     }
 
-	public static String toJsonArray(Collection<PreferredNameResultsDTO> collection) {
+    public static String toJsonArray(Collection<PreferredNameResultsDTO> collection) {
         return new JSONSerializer().exclude("*.class").include("errorMessages", "results").serialize(collection);
     }
 
-	public static Collection<PreferredNameResultsDTO> fromJsonArrayToPreferredNameResultsDTO(String json) {
-        return new JSONDeserializer<List<PreferredNameResultsDTO>>().use(null, ArrayList.class).use("values", PreferredNameResultsDTO.class).deserialize(json);
+    public static Collection<PreferredNameResultsDTO> fromJsonArrayToPreferredNameResultsDTO(String json) {
+        return new JSONDeserializer<List<PreferredNameResultsDTO>>().use(null, ArrayList.class)
+                .use("values", PreferredNameResultsDTO.class).deserialize(json);
     }
 
-	public boolean isError() {
+    public boolean isError() {
         return this.error;
     }
 
-	public void setError(boolean error) {
+    public void setError(boolean error) {
         this.error = error;
     }
 
-	public Collection<ErrorMessageDTO> getErrorMessages() {
+    public Collection<ErrorMessageDTO> getErrorMessages() {
         return this.errorMessages;
     }
 
-	public void setErrorMessages(Collection<ErrorMessageDTO> errorMessages) {
+    public void setErrorMessages(Collection<ErrorMessageDTO> errorMessages) {
         this.errorMessages = errorMessages;
     }
 
-	public Collection<PreferredNameDTO> getResults() {
+    public Collection<PreferredNameDTO> getResults() {
         return this.results;
     }
 
-	public void setResults(Collection<PreferredNameDTO> results) {
+    public void setResults(Collection<PreferredNameDTO> results) {
         this.results = results;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/PreferredNameWithErrorDTO.java b/src/main/java/com/labsynch/labseer/dto/PreferredNameWithErrorDTO.java
index 2198b74ff..70d6b0a4d 100755
--- a/src/main/java/com/labsynch/labseer/dto/PreferredNameWithErrorDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PreferredNameWithErrorDTO.java
@@ -7,84 +7,79 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-
 public class PreferredNameWithErrorDTO {
 
-	private String requestName;
+    private String requestName;
+
+    private String preferredName;
 
-	private String preferredName;
+    private String referenceName;
 
-	private String referenceName;
-	
-	private ErrorMessageDTO errorMesageDTO;
-	
-	
+    private ErrorMessageDTO errorMesageDTO;
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static PreferredNameWithErrorDTO fromJsonToPreferredNameWithErrorDTO(String json) {
+    public static PreferredNameWithErrorDTO fromJsonToPreferredNameWithErrorDTO(String json) {
         return new JSONDeserializer<PreferredNameWithErrorDTO>()
-        .use(null, PreferredNameWithErrorDTO.class).deserialize(json);
+                .use(null, PreferredNameWithErrorDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<PreferredNameWithErrorDTO> collection) {
+    public static String toJsonArray(Collection<PreferredNameWithErrorDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<PreferredNameWithErrorDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<PreferredNameWithErrorDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<PreferredNameWithErrorDTO> fromJsonArrayToPreferredNameWithErroes(String json) {
+    public static Collection<PreferredNameWithErrorDTO> fromJsonArrayToPreferredNameWithErroes(String json) {
         return new JSONDeserializer<List<PreferredNameWithErrorDTO>>()
-        .use("values", PreferredNameWithErrorDTO.class).deserialize(json);
+                .use("values", PreferredNameWithErrorDTO.class).deserialize(json);
     }
 
-	public String getRequestName() {
+    public String getRequestName() {
         return this.requestName;
     }
 
-	public void setRequestName(String requestName) {
+    public void setRequestName(String requestName) {
         this.requestName = requestName;
     }
 
-	public String getPreferredName() {
+    public String getPreferredName() {
         return this.preferredName;
     }
 
-	public void setPreferredName(String preferredName) {
+    public void setPreferredName(String preferredName) {
         this.preferredName = preferredName;
     }
 
-	public String getReferenceName() {
+    public String getReferenceName() {
         return this.referenceName;
     }
 
-	public void setReferenceName(String referenceName) {
+    public void setReferenceName(String referenceName) {
         this.referenceName = referenceName;
     }
 
-	public ErrorMessageDTO getErrorMesageDTO() {
+    public ErrorMessageDTO getErrorMesageDTO() {
         return this.errorMesageDTO;
     }
 
-	public void setErrorMesageDTO(ErrorMessageDTO errorMesageDTO) {
+    public void setErrorMesageDTO(ErrorMessageDTO errorMesageDTO) {
         this.errorMesageDTO = errorMesageDTO;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/ProtocolDTO.java b/src/main/java/com/labsynch/labseer/dto/ProtocolDTO.java
index 0222055e6..35273ada2 100755
--- a/src/main/java/com/labsynch/labseer/dto/ProtocolDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ProtocolDTO.java
@@ -38,62 +38,63 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.transaction.annotation.Transactional;
-public class ProtocolDTO{
+
+public class ProtocolDTO {
 
     private static final Logger logger = LoggerFactory.getLogger(ProtocolDTO.class);
 
     public ProtocolDTO(Protocol protocol) {
-    	this.setShortDescription(protocol.getShortDescription());
-    	this.setId(protocol.getId());
-    	this.setVersion(protocol.getVersion());
-    	this.setRecordedBy(protocol.getRecordedBy());
-		this.setRecordedDate(protocol.getRecordedDate());
-		this.setLsTransaction(protocol.getLsTransaction());
-		this.setModifiedBy(protocol.getModifiedBy());
-		this.setModifiedDate(protocol.getModifiedDate());
-		this.setIgnored(protocol.isIgnored());
-		this.setDeleted(protocol.isDeleted());
-		this.setCodeName(protocol.getCodeName());
-		this.setLsKind(protocol.getLsKind());
-		this.setExperiments(protocol.getExperiments());
-		this.setLsStates(protocol.getLsStates());
-		this.setLsLabels(protocol.getLsLabels());
-		this.setLsTags(protocol.getLsTags());
-		this.setFirstProtocols(protocol.getFirstProtocols());
-		this.setSecondProtocols(protocol.getSecondProtocols());
-		this.setExperimentCount(countExperiments(protocol));
+        this.setShortDescription(protocol.getShortDescription());
+        this.setId(protocol.getId());
+        this.setVersion(protocol.getVersion());
+        this.setRecordedBy(protocol.getRecordedBy());
+        this.setRecordedDate(protocol.getRecordedDate());
+        this.setLsTransaction(protocol.getLsTransaction());
+        this.setModifiedBy(protocol.getModifiedBy());
+        this.setModifiedDate(protocol.getModifiedDate());
+        this.setIgnored(protocol.isIgnored());
+        this.setDeleted(protocol.isDeleted());
+        this.setCodeName(protocol.getCodeName());
+        this.setLsKind(protocol.getLsKind());
+        this.setExperiments(protocol.getExperiments());
+        this.setLsStates(protocol.getLsStates());
+        this.setLsLabels(protocol.getLsLabels());
+        this.setLsTags(protocol.getLsTags());
+        this.setFirstProtocols(protocol.getFirstProtocols());
+        this.setSecondProtocols(protocol.getSecondProtocols());
+        this.setExperimentCount(countExperiments(protocol));
     }
 
     private String shortDescription;
-    
-	private Long id;
-	
-	private Integer version;
-    
-	private String lsType;
 
-	private String lsKind;
-	
-	private String codeName;
+    private Long id;
+
+    private Integer version;
+
+    private String lsType;
+
+    private String lsKind;
+
+    private String codeName;
+
+    private String recordedBy;
 
-	private String recordedBy;
+    private Date recordedDate;
 
-	private Date recordedDate;
+    private String modifiedBy;
 
-	private String modifiedBy;
+    private Date modifiedDate;
 
-	private Date modifiedDate;
+    private boolean ignored;
 
-	private boolean ignored;
-	
-	private boolean deleted;
+    private boolean deleted;
+
+    private Long lsTransaction;
+
+    private Integer experimentCount;
+
+    private Set<ThingPage> thingPage = new HashSet<ThingPage>();
 
-	private Long lsTransaction;
-	
-	private Integer experimentCount;
-    
-	private Set<ThingPage> thingPage = new HashSet<ThingPage>();
-	
     private Set<ProtocolState> lsStates = new HashSet<ProtocolState>();
 
     private Set<Experiment> experiments = new HashSet<Experiment>();
@@ -105,244 +106,269 @@ public ProtocolDTO(Protocol protocol) {
     private Set<ItxProtocolProtocol> firstProtocols = new HashSet<ItxProtocolProtocol>();
 
     private Set<ItxProtocolProtocol> secondProtocols = new HashSet<ItxProtocolProtocol>();
-    
-    public static Collection<ProtocolDTO> convertCollectionToProtocolDTO (Collection<Protocol> protocols) {
-    	Collection<ProtocolDTO> protocolDTOs = new HashSet<ProtocolDTO>();
-    	for (Protocol protocol: protocols) {
-    		ProtocolDTO protocolDTO = new ProtocolDTO(protocol);
-    		protocolDTOs.add(protocolDTO);
-    	}
-    	return protocolDTOs;
+
+    public static Collection<ProtocolDTO> convertCollectionToProtocolDTO(Collection<Protocol> protocols) {
+        Collection<ProtocolDTO> protocolDTOs = new HashSet<ProtocolDTO>();
+        for (Protocol protocol : protocols) {
+            ProtocolDTO protocolDTO = new ProtocolDTO(protocol);
+            protocolDTOs.add(protocolDTO);
+        }
+        return protocolDTOs;
     }
 
     @Transactional
     public String toJsonStub() {
-        return new JSONSerializer().exclude("*.class", "lsStates.lsValues.lsState", "lsStates.protocol").include("lsTags", "lsLabels", "lsStates.lsValues").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().exclude("*.class", "lsStates.lsValues.lsState", "lsStates.protocol")
+                .include("lsTags", "lsLabels", "lsStates.lsValues").transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
 
     @Transactional
     public String toPrettyJsonStub() {
-        return new JSONSerializer().exclude("*.class", "lsStates.lsValues.lsState", "lsStates.protocol").include("lsTags", "lsLabels", "lsStates.lsValues").prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().exclude("*.class", "lsStates.lsValues.lsState", "lsStates.protocol")
+                .include("lsTags", "lsLabels", "lsStates.lsValues").prettyPrint(true)
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public String toJson() {
-        return new JSONSerializer().exclude("*.class", "lsStates.lsValues.lsState", "lsStates.protocol", "experiments.protocol").include("lsTags", "lsLabels", "lsStates.lsValues", "experiments.lsLabels", "experiments.lsStates.lsValues").prettyPrint(false).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.protocol", "experiments.protocol")
+                .include("lsTags", "lsLabels", "lsStates.lsValues", "experiments.lsLabels",
+                        "experiments.lsStates.lsValues")
+                .prettyPrint(false).transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public String toPrettyJson() {
-        return new JSONSerializer().exclude("*.class", "lsStates.lsValues.lsState", "lsStates.protocol", "experiments.protocol").include("lsTags", "lsLabels", "lsStates.lsValues", "experiments.lsLabels", "experiments.lsStates.lsValues").prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.protocol", "experiments.protocol")
+                .include("lsTags", "lsLabels", "lsStates.lsValues", "experiments.lsLabels",
+                        "experiments.lsStates.lsValues")
+                .prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public static String toPrettyJsonArray(Collection<ProtocolDTO> collection) {
-        return new JSONSerializer().exclude("*.class", "lsStates.lsValues.lsState", "lsStates.protocol", "experiments.protocol").include("lsTags", "lsLabels", "lsStates.lsValues", "experiments.lsLabels", "experiments.lsStates.lsValues").prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer()
+                .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.protocol", "experiments.protocol")
+                .include("lsTags", "lsLabels", "lsStates.lsValues", "experiments.lsLabels",
+                        "experiments.lsStates.lsValues")
+                .prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
     @Transactional
     public static String toPrettyJsonArrayStub(Collection<ProtocolDTO> collection) {
-        return new JSONSerializer().exclude("*.class", "lsStates.lsValues.lsState", "lsStates.protocol").include("lsTags", "lsLabels", "lsStates.lsValues").prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer().exclude("*.class", "lsStates.lsValues.lsState", "lsStates.protocol")
+                .include("lsTags", "lsLabels", "lsStates.lsValues").prettyPrint(true)
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
     @Transactional
     public static String toJsonArray(Collection<ProtocolDTO> collection) {
-        return new JSONSerializer().exclude("*.class").include("lsTags", "lsLabels", "lsStates.lsValues").transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer().exclude("*.class").include("lsTags", "lsLabels", "lsStates.lsValues")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
     @Transactional
     public static String toJsonArrayStub(Collection<ProtocolDTO> collection) {
-        return new JSONSerializer().exclude("*.class", "lsStates.lsValues.lsState", "lsStates.protocol", "experiments.protocol", "lsLabels.protocol").include("lsTags", "lsLabels", "lsStates.lsValues").transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer()
+                .exclude("*.class", "lsStates.lsValues.lsState", "lsStates.protocol", "experiments.protocol",
+                        "lsLabels.protocol")
+                .include("lsTags", "lsLabels", "lsStates.lsValues").transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
-    
+
     private int countExperiments(Protocol protocol) {
-    	Collection<Experiment> experiments = protocol.getExperiments();
-    	int count = 0;
-    	for (Experiment experiment : experiments) {
-    		if (!experiment.isIgnored()) count++;
-    	}
-    	return count;
+        Collection<Experiment> experiments = protocol.getExperiments();
+        int count = 0;
+        for (Experiment experiment : experiments) {
+            if (!experiment.isIgnored())
+                count++;
+        }
+        return count;
     }
 
-	public String getShortDescription() {
+    public String getShortDescription() {
         return this.shortDescription;
     }
 
-	public void setShortDescription(String shortDescription) {
+    public void setShortDescription(String shortDescription) {
         this.shortDescription = shortDescription;
     }
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String getLsType() {
+    public String getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(String lsType) {
+    public void setLsType(String lsType) {
         this.lsType = lsType;
     }
 
-	public String getLsKind() {
+    public String getLsKind() {
         return this.lsKind;
     }
 
-	public void setLsKind(String lsKind) {
+    public void setLsKind(String lsKind) {
         this.lsKind = lsKind;
     }
 
-	public String getCodeName() {
+    public String getCodeName() {
         return this.codeName;
     }
 
-	public void setCodeName(String codeName) {
+    public void setCodeName(String codeName) {
         this.codeName = codeName;
     }
 
-	public String getRecordedBy() {
+    public String getRecordedBy() {
         return this.recordedBy;
     }
 
-	public void setRecordedBy(String recordedBy) {
+    public void setRecordedBy(String recordedBy) {
         this.recordedBy = recordedBy;
     }
 
-	public Date getRecordedDate() {
+    public Date getRecordedDate() {
         return this.recordedDate;
     }
 
-	public void setRecordedDate(Date recordedDate) {
+    public void setRecordedDate(Date recordedDate) {
         this.recordedDate = recordedDate;
     }
 
-	public String getModifiedBy() {
+    public String getModifiedBy() {
         return this.modifiedBy;
     }
 
-	public void setModifiedBy(String modifiedBy) {
+    public void setModifiedBy(String modifiedBy) {
         this.modifiedBy = modifiedBy;
     }
 
-	public Date getModifiedDate() {
+    public Date getModifiedDate() {
         return this.modifiedDate;
     }
 
-	public void setModifiedDate(Date modifiedDate) {
+    public void setModifiedDate(Date modifiedDate) {
         this.modifiedDate = modifiedDate;
     }
 
-	public boolean isIgnored() {
+    public boolean isIgnored() {
         return this.ignored;
     }
 
-	public void setIgnored(boolean ignored) {
+    public void setIgnored(boolean ignored) {
         this.ignored = ignored;
     }
 
-	public boolean isDeleted() {
+    public boolean isDeleted() {
         return this.deleted;
     }
 
-	public void setDeleted(boolean deleted) {
+    public void setDeleted(boolean deleted) {
         this.deleted = deleted;
     }
 
-	public Long getLsTransaction() {
+    public Long getLsTransaction() {
         return this.lsTransaction;
     }
 
-	public void setLsTransaction(Long lsTransaction) {
+    public void setLsTransaction(Long lsTransaction) {
         this.lsTransaction = lsTransaction;
     }
 
-	public Integer getExperimentCount() {
+    public Integer getExperimentCount() {
         return this.experimentCount;
     }
 
-	public void setExperimentCount(Integer experimentCount) {
+    public void setExperimentCount(Integer experimentCount) {
         this.experimentCount = experimentCount;
     }
 
-	public Set<ThingPage> getThingPage() {
+    public Set<ThingPage> getThingPage() {
         return this.thingPage;
     }
 
-	public void setThingPage(Set<ThingPage> thingPage) {
+    public void setThingPage(Set<ThingPage> thingPage) {
         this.thingPage = thingPage;
     }
 
-	public Set<ProtocolState> getLsStates() {
+    public Set<ProtocolState> getLsStates() {
         return this.lsStates;
     }
 
-	public void setLsStates(Set<ProtocolState> lsStates) {
+    public void setLsStates(Set<ProtocolState> lsStates) {
         this.lsStates = lsStates;
     }
 
-	public Set<Experiment> getExperiments() {
+    public Set<Experiment> getExperiments() {
         return this.experiments;
     }
 
-	public void setExperiments(Set<Experiment> experiments) {
+    public void setExperiments(Set<Experiment> experiments) {
         this.experiments = experiments;
     }
 
-	public Set<ProtocolLabel> getLsLabels() {
+    public Set<ProtocolLabel> getLsLabels() {
         return this.lsLabels;
     }
 
-	public void setLsLabels(Set<ProtocolLabel> lsLabels) {
+    public void setLsLabels(Set<ProtocolLabel> lsLabels) {
         this.lsLabels = lsLabels;
     }
 
-	public Set<LsTag> getLsTags() {
+    public Set<LsTag> getLsTags() {
         return this.lsTags;
     }
 
-	public void setLsTags(Set<LsTag> lsTags) {
+    public void setLsTags(Set<LsTag> lsTags) {
         this.lsTags = lsTags;
     }
 
-	public Set<ItxProtocolProtocol> getFirstProtocols() {
+    public Set<ItxProtocolProtocol> getFirstProtocols() {
         return this.firstProtocols;
     }
 
-	public void setFirstProtocols(Set<ItxProtocolProtocol> firstProtocols) {
+    public void setFirstProtocols(Set<ItxProtocolProtocol> firstProtocols) {
         this.firstProtocols = firstProtocols;
     }
 
-	public Set<ItxProtocolProtocol> getSecondProtocols() {
+    public Set<ItxProtocolProtocol> getSecondProtocols() {
         return this.secondProtocols;
     }
 
-	public void setSecondProtocols(Set<ItxProtocolProtocol> secondProtocols) {
+    public void setSecondProtocols(Set<ItxProtocolProtocol> secondProtocols) {
         this.secondProtocols = secondProtocols;
     }
 
-	public String toString() {
-        return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).setExcludeFieldNames("lsTags", "lsStates", "experiments", "lsLabels").toString();
+    public String toString() {
+        return new ReflectionToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+                .setExcludeFieldNames("lsTags", "lsStates", "experiments", "lsLabels").toString();
     }
 
-	public static ProtocolDTO fromJsonToProtocolDTO(String json) {
+    public static ProtocolDTO fromJsonToProtocolDTO(String json) {
         return new JSONDeserializer<ProtocolDTO>()
-        .use(null, ProtocolDTO.class).deserialize(json);
+                .use(null, ProtocolDTO.class).deserialize(json);
     }
 
-	public static Collection<ProtocolDTO> fromJsonArrayToProtocoes(String json) {
+    public static Collection<ProtocolDTO> fromJsonArrayToProtocoes(String json) {
         return new JSONDeserializer<List<ProtocolDTO>>()
-        .use("values", ProtocolDTO.class).deserialize(json);
+                .use("values", ProtocolDTO.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ProtocolErrorMessageDTO.java b/src/main/java/com/labsynch/labseer/dto/ProtocolErrorMessageDTO.java
index 54bae5fd6..11552bc78 100644
--- a/src/main/java/com/labsynch/labseer/dto/ProtocolErrorMessageDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ProtocolErrorMessageDTO.java
@@ -11,89 +11,95 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ProtocolErrorMessageDTO {
 
-	String protocolCodeName;
-	
-	String level;
-	
-	String message;
-	
-	Protocol protocol;
-		
-	@Transactional
+    String protocolCodeName;
+
+    String level;
+
+    String message;
+
+    Protocol protocol;
+
+    @Transactional
     public String toJson() {
-        return new JSONSerializer().exclude("*.class").include("protocol.lsTags", "protocol.lsLabels", "protocol.lsStates.lsValues").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().exclude("*.class")
+                .include("protocol.lsTags", "protocol.lsLabels", "protocol.lsStates.lsValues")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public String toJsonStub() {
-        return new JSONSerializer().exclude("*.class", "protocol.lsStates").include("protocol.lsTags", "protocol.lsLabels").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().exclude("*.class", "protocol.lsStates")
+                .include("protocol.lsTags", "protocol.lsLabels").transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
 
     @Transactional
     public static String toJsonArray(Collection<ProtocolErrorMessageDTO> collection) {
-        return new JSONSerializer().exclude("*.class").include("protocol.lsTags", "protocol.lsLabels", "protocol.lsStates.lsValues").transform(new ExcludeNulls(), void.class).serialize(collection);
+        return new JSONSerializer().exclude("*.class")
+                .include("protocol.lsTags", "protocol.lsLabels", "protocol.lsStates.lsValues")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
     @Transactional
     public static String toJsonArrayStub(Collection<ProtocolErrorMessageDTO> collection) {
-        return new JSONSerializer().exclude("*.class", "protocol.lsStates").include("protocol.lsTags", "protocol.lsLabels").transform(new ExcludeNulls(), void.class).serialize(collection);
-    }
-    
-	public ProtocolErrorMessageDTO(){
-	}
-	
-	public ProtocolErrorMessageDTO(String protocolCodeName, Protocol protocol){
-		this.protocolCodeName = protocolCodeName;
-		this.protocol = protocol;
-	}
-	
-
-	public String getProtocolCodeName() {
+        return new JSONSerializer().exclude("*.class", "protocol.lsStates")
+                .include("protocol.lsTags", "protocol.lsLabels").transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
+    }
+
+    public ProtocolErrorMessageDTO() {
+    }
+
+    public ProtocolErrorMessageDTO(String protocolCodeName, Protocol protocol) {
+        this.protocolCodeName = protocolCodeName;
+        this.protocol = protocol;
+    }
+
+    public String getProtocolCodeName() {
         return this.protocolCodeName;
     }
 
-	public void setProtocolCodeName(String protocolCodeName) {
+    public void setProtocolCodeName(String protocolCodeName) {
         this.protocolCodeName = protocolCodeName;
     }
 
-	public String getLevel() {
+    public String getLevel() {
         return this.level;
     }
 
-	public void setLevel(String level) {
+    public void setLevel(String level) {
         this.level = level;
     }
 
-	public String getMessage() {
+    public String getMessage() {
         return this.message;
     }
 
-	public void setMessage(String message) {
+    public void setMessage(String message) {
         this.message = message;
     }
 
-	public Protocol getProtocol() {
+    public Protocol getProtocol() {
         return this.protocol;
     }
 
-	public void setProtocol(Protocol protocol) {
+    public void setProtocol(Protocol protocol) {
         this.protocol = protocol;
     }
 
-	public static ProtocolErrorMessageDTO fromJsonToProtocolErrorMessageDTO(String json) {
+    public static ProtocolErrorMessageDTO fromJsonToProtocolErrorMessageDTO(String json) {
         return new JSONDeserializer<ProtocolErrorMessageDTO>()
-        .use(null, ProtocolErrorMessageDTO.class).deserialize(json);
+                .use(null, ProtocolErrorMessageDTO.class).deserialize(json);
     }
 
-	public static Collection<ProtocolErrorMessageDTO> fromJsonArrayToProtocolErroes(String json) {
+    public static Collection<ProtocolErrorMessageDTO> fromJsonArrayToProtocolErroes(String json) {
         return new JSONDeserializer<List<ProtocolErrorMessageDTO>>()
-        .use("values", ProtocolErrorMessageDTO.class).deserialize(json);
+                .use("values", ProtocolErrorMessageDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/dto/ProtocolStatePathDTO.java b/src/main/java/com/labsynch/labseer/dto/ProtocolStatePathDTO.java
index 850aec313..ec1128547 100644
--- a/src/main/java/com/labsynch/labseer/dto/ProtocolStatePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ProtocolStatePathDTO.java
@@ -10,73 +10,72 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ProtocolStatePathDTO {
 
-	public ProtocolStatePathDTO() {
-	}
+    public ProtocolStatePathDTO() {
+    }
+
+    private String idOrCodeName;
+
+    private String stateType;
 
-	private String idOrCodeName;
+    private String stateKind;
 
-	private String stateType;
-	
-	private String stateKind;
-	
-	private Collection<ProtocolState> states;
-	
-	public String toJson() {
-        return new JSONSerializer().include("states.lsValues").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+    private Collection<ProtocolState> states;
+
+    public String toJson() {
+        return new JSONSerializer().include("states.lsValues").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
-	
-	public static String toJsonArray(Collection<ProtocolStatePathDTO> collection) {
-        return new JSONSerializer().include("states.lsValues").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
+
+    public static String toJsonArray(Collection<ProtocolStatePathDTO> collection) {
+        return new JSONSerializer().include("states.lsValues").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static ProtocolStatePathDTO fromJsonToProtocolStatePathDTO(String json) {
+    public static ProtocolStatePathDTO fromJsonToProtocolStatePathDTO(String json) {
         return new JSONDeserializer<ProtocolStatePathDTO>()
-        .use(null, ProtocolStatePathDTO.class).deserialize(json);
+                .use(null, ProtocolStatePathDTO.class).deserialize(json);
     }
 
-	public static Collection<ProtocolStatePathDTO> fromJsonArrayToProtocoes(String json) {
+    public static Collection<ProtocolStatePathDTO> fromJsonArrayToProtocoes(String json) {
         return new JSONDeserializer<List<ProtocolStatePathDTO>>()
-        .use("values", ProtocolStatePathDTO.class).deserialize(json);
+                .use("values", ProtocolStatePathDTO.class).deserialize(json);
     }
 
-	public String getIdOrCodeName() {
+    public String getIdOrCodeName() {
         return this.idOrCodeName;
     }
 
-	public void setIdOrCodeName(String idOrCodeName) {
+    public void setIdOrCodeName(String idOrCodeName) {
         this.idOrCodeName = idOrCodeName;
     }
 
-	public String getStateType() {
+    public String getStateType() {
         return this.stateType;
     }
 
-	public void setStateType(String stateType) {
+    public void setStateType(String stateType) {
         this.stateType = stateType;
     }
 
-	public String getStateKind() {
+    public String getStateKind() {
         return this.stateKind;
     }
 
-	public void setStateKind(String stateKind) {
+    public void setStateKind(String stateKind) {
         this.stateKind = stateKind;
     }
 
-	public Collection<ProtocolState> getStates() {
+    public Collection<ProtocolState> getStates() {
         return this.states;
     }
 
-	public void setStates(Collection<ProtocolState> states) {
+    public void setStates(Collection<ProtocolState> states) {
         this.states = states;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/ProtocolValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/ProtocolValuePathDTO.java
index ca5a59d28..7a3c9275d 100644
--- a/src/main/java/com/labsynch/labseer/dto/ProtocolValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ProtocolValuePathDTO.java
@@ -12,93 +12,92 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ProtocolValuePathDTO {
 
-	public ProtocolValuePathDTO() {
-	}
+    public ProtocolValuePathDTO() {
+    }
+
+    private String idOrCodeName;
+
+    private String stateType;
+
+    private String stateKind;
 
-	private String idOrCodeName;
+    private String valueType;
 
-	private String stateType;
-	
-	private String stateKind;
-	
-	private String valueType;
-	
-	private String valueKind;
-	
-	private Collection<ProtocolValue> values;
-	
-	public String toJson() {
-        return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+    private String valueKind;
+
+    private Collection<ProtocolValue> values;
+
+    public String toJson() {
+        return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
-	
-	public static String toJsonArray(Collection<ProtocolValuePathDTO> collection) {
-        return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
+
+    public static String toJsonArray(Collection<ProtocolValuePathDTO> collection) {
+        return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static ProtocolValuePathDTO fromJsonToProtocolValuePathDTO(String json) {
+    public static ProtocolValuePathDTO fromJsonToProtocolValuePathDTO(String json) {
         return new JSONDeserializer<ProtocolValuePathDTO>()
-        .use(null, ProtocolValuePathDTO.class).deserialize(json);
+                .use(null, ProtocolValuePathDTO.class).deserialize(json);
     }
 
-	public static Collection<ProtocolValuePathDTO> fromJsonArrayToProtocoes(String json) {
+    public static Collection<ProtocolValuePathDTO> fromJsonArrayToProtocoes(String json) {
         return new JSONDeserializer<List<ProtocolValuePathDTO>>()
-        .use("values", ProtocolValuePathDTO.class).deserialize(json);
+                .use("values", ProtocolValuePathDTO.class).deserialize(json);
     }
 
-	public String getIdOrCodeName() {
+    public String getIdOrCodeName() {
         return this.idOrCodeName;
     }
 
-	public void setIdOrCodeName(String idOrCodeName) {
+    public void setIdOrCodeName(String idOrCodeName) {
         this.idOrCodeName = idOrCodeName;
     }
 
-	public String getStateType() {
+    public String getStateType() {
         return this.stateType;
     }
 
-	public void setStateType(String stateType) {
+    public void setStateType(String stateType) {
         this.stateType = stateType;
     }
 
-	public String getStateKind() {
+    public String getStateKind() {
         return this.stateKind;
     }
 
-	public void setStateKind(String stateKind) {
+    public void setStateKind(String stateKind) {
         this.stateKind = stateKind;
     }
 
-	public String getValueType() {
+    public String getValueType() {
         return this.valueType;
     }
 
-	public void setValueType(String valueType) {
+    public void setValueType(String valueType) {
         this.valueType = valueType;
     }
 
-	public String getValueKind() {
+    public String getValueKind() {
         return this.valueKind;
     }
 
-	public void setValueKind(String valueKind) {
+    public void setValueKind(String valueKind) {
         this.valueKind = valueKind;
     }
 
-	public Collection<ProtocolValue> getValues() {
+    public Collection<ProtocolValue> getValues() {
         return this.values;
     }
 
-	public void setValues(Collection<ProtocolValue> values) {
+    public void setValues(Collection<ProtocolValue> values) {
         this.values = values;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/PurgeFileDependencyCheckResponseDTO.java b/src/main/java/com/labsynch/labseer/dto/PurgeFileDependencyCheckResponseDTO.java
index 0a8ca11df..12f43b4f6 100644
--- a/src/main/java/com/labsynch/labseer/dto/PurgeFileDependencyCheckResponseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PurgeFileDependencyCheckResponseDTO.java
@@ -11,65 +11,64 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class PurgeFileDependencyCheckResponseDTO {
 
     private String summary;
-    
+
     private boolean canPurge;
-    
-    public PurgeFileDependencyCheckResponseDTO(){
-    	
+
+    public PurgeFileDependencyCheckResponseDTO() {
+
     }
-    
-    public PurgeFileDependencyCheckResponseDTO(String summary, boolean canPurge){
-    	this.summary = summary;
-    	this.canPurge = canPurge;
+
+    public PurgeFileDependencyCheckResponseDTO(String summary, boolean canPurge) {
+        this.summary = summary;
+        this.canPurge = canPurge;
     }
-    
+
     public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+                .exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
     }
-    
 
-	public static PurgeFileDependencyCheckResponseDTO fromJsonToPurgeFileDependencyCheckResponseDTO(String json) {
+    public static PurgeFileDependencyCheckResponseDTO fromJsonToPurgeFileDependencyCheckResponseDTO(String json) {
         return new JSONDeserializer<PurgeFileDependencyCheckResponseDTO>()
-        .use(null, PurgeFileDependencyCheckResponseDTO.class).deserialize(json);
+                .use(null, PurgeFileDependencyCheckResponseDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<PurgeFileDependencyCheckResponseDTO> collection) {
+    public static String toJsonArray(Collection<PurgeFileDependencyCheckResponseDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<PurgeFileDependencyCheckResponseDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<PurgeFileDependencyCheckResponseDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<PurgeFileDependencyCheckResponseDTO> fromJsonArrayToPurgeFileDependencyCheckRespoes(String json) {
+    public static Collection<PurgeFileDependencyCheckResponseDTO> fromJsonArrayToPurgeFileDependencyCheckRespoes(
+            String json) {
         return new JSONDeserializer<List<PurgeFileDependencyCheckResponseDTO>>()
-        .use("values", PurgeFileDependencyCheckResponseDTO.class).deserialize(json);
+                .use("values", PurgeFileDependencyCheckResponseDTO.class).deserialize(json);
     }
 
-	public String getSummary() {
+    public String getSummary() {
         return this.summary;
     }
 
-	public void setSummary(String summary) {
+    public void setSummary(String summary) {
         this.summary = summary;
     }
 
-	public boolean isCanPurge() {
+    public boolean isCanPurge() {
         return this.canPurge;
     }
 
-	public void setCanPurge(boolean canPurge) {
+    public void setCanPurge(boolean canPurge) {
         this.canPurge = canPurge;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/PurgeFileResponseDTO.java b/src/main/java/com/labsynch/labseer/dto/PurgeFileResponseDTO.java
index 94ca9be1b..9f3cbaf95 100644
--- a/src/main/java/com/labsynch/labseer/dto/PurgeFileResponseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/PurgeFileResponseDTO.java
@@ -11,76 +11,74 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class PurgeFileResponseDTO {
 
     private String summary;
-    
+
     private boolean success;
-    
+
     private String fileName;
-    
-    public PurgeFileResponseDTO(){
-    	
+
+    public PurgeFileResponseDTO() {
+
     }
-    
-    public PurgeFileResponseDTO(String summary, boolean success, String fileName){
-    	this.summary = summary;
-    	this.success = success;
-    	this.fileName = fileName;
+
+    public PurgeFileResponseDTO(String summary, boolean success, String fileName) {
+        this.summary = summary;
+        this.success = success;
+        this.fileName = fileName;
     }
-    
+
     public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+                .exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
     }
-    
 
-	public String getSummary() {
+    public String getSummary() {
         return this.summary;
     }
 
-	public void setSummary(String summary) {
+    public void setSummary(String summary) {
         this.summary = summary;
     }
 
-	public boolean isSuccess() {
+    public boolean isSuccess() {
         return this.success;
     }
 
-	public void setSuccess(boolean success) {
+    public void setSuccess(boolean success) {
         this.success = success;
     }
 
-	public String getFileName() {
+    public String getFileName() {
         return this.fileName;
     }
 
-	public void setFileName(String fileName) {
+    public void setFileName(String fileName) {
         this.fileName = fileName;
     }
 
-	public static PurgeFileResponseDTO fromJsonToPurgeFileResponseDTO(String json) {
+    public static PurgeFileResponseDTO fromJsonToPurgeFileResponseDTO(String json) {
         return new JSONDeserializer<PurgeFileResponseDTO>()
-        .use(null, PurgeFileResponseDTO.class).deserialize(json);
+                .use(null, PurgeFileResponseDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<PurgeFileResponseDTO> collection) {
+    public static String toJsonArray(Collection<PurgeFileResponseDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<PurgeFileResponseDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<PurgeFileResponseDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<PurgeFileResponseDTO> fromJsonArrayToPurgeFileRespoes(String json) {
+    public static Collection<PurgeFileResponseDTO> fromJsonArrayToPurgeFileRespoes(String json) {
         return new JSONDeserializer<List<PurgeFileResponseDTO>>()
-        .use("values", PurgeFileResponseDTO.class).deserialize(json);
+                .use("values", PurgeFileResponseDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/RawCurveDataDTO.java b/src/main/java/com/labsynch/labseer/dto/RawCurveDataDTO.java
index 1f3447cb2..f99c8d06f 100644
--- a/src/main/java/com/labsynch/labseer/dto/RawCurveDataDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/RawCurveDataDTO.java
@@ -25,19 +25,18 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class RawCurveDataDTO {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(RawCurveDataDTO.class);
 
-	public RawCurveDataDTO(){
-		//empty constructor
+	public RawCurveDataDTO() {
+		// empty constructor
 	}
-	
+
 	public RawCurveDataDTO(String curveId) {
 		this.curveId = curveId;
 	}
-	
+
 	public RawCurveDataDTO(String curveId, Map dataMap) {
 		this.curveId = curveId;
 		this.recordedBy = (String) dataMap.get("recordedBy");
@@ -48,7 +47,7 @@ public RawCurveDataDTO(String curveId, Map dataMap) {
 		this.responseUnits = (String) dataMap.get("responseUnits");
 		try {
 			this.dose = (BigDecimal) dataMap.get("dose");
-		}catch(ClassCastException e){
+		} catch (ClassCastException e) {
 			this.dose = BigDecimal.valueOf((Double) dataMap.get("dose"));
 		}
 		this.doseUnits = (String) dataMap.get("doseUnits");
@@ -65,7 +64,7 @@ public RawCurveDataDTO(String curveId, Map dataMap) {
 		this.userFlagCause = (String) dataMap.get("userFlagCause");
 		this.userFlagComment = (String) dataMap.get("userFlagComment");
 	}
-	
+
 	public RawCurveDataDTO(Map dataMap) {
 		this.curveId = (String) dataMap.get("curveId");
 		this.recordedBy = (String) dataMap.get("recordedBy");
@@ -76,7 +75,7 @@ public RawCurveDataDTO(Map dataMap) {
 		this.responseUnits = (String) dataMap.get("responseUnits");
 		try {
 			this.dose = (BigDecimal) dataMap.get("dose");
-		}catch(ClassCastException e){
+		} catch (ClassCastException e) {
 			this.dose = BigDecimal.valueOf((Double) dataMap.get("dose"));
 		}
 		this.doseUnits = (String) dataMap.get("doseUnits");
@@ -93,18 +92,18 @@ public RawCurveDataDTO(Map dataMap) {
 		this.userFlagCause = (String) dataMap.get("userFlagCause");
 		this.userFlagComment = (String) dataMap.get("userFlagComment");
 	}
-	
 
-
-	private String curveId; //location: provided
+	private String curveId; // location: provided
 	private String recordedBy;
 	private Long lsTransaction;
-	private Long responseSubjectValueId; // location: subject value, SS: data_results, SV: numericValue_Response, id attribute
+	private Long responseSubjectValueId; // location: subject value, SS: data_results, SV: numericValue_Response, id
+											// attribute
 	private BigDecimal response; // location: same as responseSubjectValueId, but in numericValue field
 	private String responseKind;
-	private String responseUnits; //location same as response, but in unitKind field
-	private BigDecimal dose; // location: subject value, SS: data_test compound treatment, SV: numericValue_Dose
-	private String doseUnits; //location, same as above, but in unitKind field
+	private String responseUnits; // location same as response, but in unitKind field
+	private BigDecimal dose; // location: subject value, SS: data_test compound treatment, SV:
+								// numericValue_Dose
+	private String doseUnits; // location, same as above, but in unitKind field
 	private String algorithmFlagStatus;
 	private String algorithmFlagObservation;
 	private String algorithmFlagCause;
@@ -117,11 +116,8 @@ public RawCurveDataDTO(Map dataMap) {
 	private String userFlagObservation;
 	private String userFlagCause;
 	private String userFlagComment;
-	
-	
-
 
-	public static String[] getColumns(){
+	public static String[] getColumns() {
 		String[] headerColumns = new String[] {
 				"curveId",
 				"recordedBy",
@@ -144,14 +140,14 @@ public static String[] getColumns(){
 				"userFlagObservation",
 				"userFlagCause",
 				"userFlagComment"
-				};
+		};
 
 		return headerColumns;
 
 	}
 
 	public static CellProcessor[] getProcessors() {
-		final CellProcessor[] processors = new CellProcessor[] { 
+		final CellProcessor[] processors = new CellProcessor[] {
 				new Optional(),
 				new Optional(),
 				new Optional(),
@@ -177,218 +173,220 @@ public static CellProcessor[] getProcessors() {
 
 		return processors;
 	}
-	
-	public static List<RawCurveDataDTO> getRawCurveData(Collection<String> curveIds, String responseName){
+
+	public static List<RawCurveDataDTO> getRawCurveData(Collection<String> curveIds, String responseName) {
 		EntityManager em = SubjectValue.entityManager();
 		String queryString = "SELECT NEW MAP( rsv.id as responseSubjectValueId, "
 				+ "rsv.recordedBy as recordedBy, "
 				+ "rsv.lsTransaction as lsTransaction, "
-        		+ "rsv.numericValue as response, "
-        		+ "rsv.unitKind as responseUnits, "
-        		+ "rsv.lsKind as responseKind, "
-        		+ "bcsv.concentration as dose, "
-        		+ "bcsv.concUnit as doseUnits, "
-        		+ "afsv.codeValue as algorithmFlagStatus, "
-        		+ "afov.codeValue as algorithmFlagObservation, "
-        		+ "afcv.codeValue as algorithmFlagCause, "
-        		+ "afcomv.stringValue as algorithmFlagComment, "
-        		+ "pfsv.codeValue as preprocessFlagStatus, "
-        		+ "pfov.codeValue as preprocessFlagObservation, "
-        		+ "pfcv.codeValue as preprocessFlagCause, "
-        		+ "afs.lsKind as algorithmFlagLsKind, "
-        		+ "pfs.lsKind as preprocessFlagLsKind, "
-        		+ "ufs.lsKind as userFlagLsKind, "
-        		+ "pfcomv.stringValue as preprocessFlagComment, "
-        		+ "ufsv.codeValue as userFlagStatus, "
-        		+ "ufov.codeValue as userFlagObservation, "
-        		+ "ufcv.codeValue as userFlagCause, "
-        		+ "ufcomv.stringValue as userFlagComment,"
-        		+ "agv.stringValue as curveId "
-        		+ " ) " 
-        		+ "FROM AnalysisGroupValue agv "
-        		+ "JOIN agv.lsState as ags "
-        		+ "JOIN ags.analysisGroup as ag "
-        		+ "JOIN ags.analysisGroup.treatmentGroups as treat "
-        		+ "JOIN treat.subjects as subj "
-        		+ "JOIN subj.lsStates as rss "
-        		+ "JOIN rss.lsValues as rsv "
-        		+ "JOIN rss.lsValues as bcsv "
-        		+ "LEFT JOIN subj.lsStates as afs WITH afs.lsKind = 'auto flag' AND afs.ignored = false "
-        		+ "LEFT JOIN afs.lsValues as afsv WITH afsv.lsKind = 'flag status' "
-        		+ "LEFT JOIN afs.lsValues as afov WITH afov.lsKind = 'flag observation' "
-        		+ "LEFT JOIN afs.lsValues as afcv WITH afcv.lsKind = 'flag cause' "
-        		+ "LEFT JOIN afs.lsValues as afcomv WITH afcomv.lsKind = 'comment' "
-        		+ "LEFT JOIN subj.lsStates as pfs WITH pfs.lsKind = 'preprocess flag' AND pfs.ignored = false "
-        		+ "LEFT JOIN pfs.lsValues as pfsv WITH pfsv.lsKind = 'flag status' "
-        		+ "LEFT JOIN pfs.lsValues as pfov WITH pfov.lsKind = 'flag observation' "
-        		+ "LEFT JOIN pfs.lsValues as pfcv WITH pfcv.lsKind = 'flag cause' "
-        		+ "LEFT JOIN pfs.lsValues as pfcomv WITH pfcomv.lsKind = 'comment' "
-        		+ "LEFT JOIN subj.lsStates as ufs WITH ufs.lsKind = 'user flag' AND ufs.ignored = false "
-        		+ "LEFT JOIN ufs.lsValues as ufsv WITH ufsv.lsKind = 'flag status' "
-        		+ "LEFT JOIN ufs.lsValues as ufov WITH ufov.lsKind = 'flag observation' "
-        		+ "LEFT JOIN ufs.lsValues as ufcv WITH ufcv.lsKind = 'flag cause' "
-        		+ "LEFT JOIN ufs.lsValues as ufcomv WITH ufcomv.lsKind = 'comment' "
-        		+ "WHERE rss.lsType = 'data' "
-        		+ "AND rss.lsKind = 'results' "
-        		+ "AND rsv.lsType = 'numericValue' "
-        		+ "AND rsv.lsKind = :responseKind "
-        		+ "AND bcsv.lsType = 'codeValue' "
-        		+ "AND bcsv.lsKind = 'batch code' "
-        		+ "AND ags.ignored = false "
-        		+ "AND agv.lsType = 'stringValue' "
-        		+ "AND agv.lsKind = 'curve id' "
-        		+ "AND agv.ignored = false "
-        		+ "AND ag.ignored = false "
-        		+ "AND treat.ignored = false "
-        		+ "AND subj.ignored = false "
-        		+ "AND (";
-        Map<String, Collection<String>> sqlCurveIdMap = new HashMap<String, Collection<String>>();
-    	List<String> allCurveIds = new ArrayList<String>();
-    	allCurveIds.addAll(curveIds);
-    	int startIndex = 0;
-    	while (startIndex < curveIds.size()){
-    		int endIndex;
-    		if (startIndex+999 < curveIds.size()) endIndex = startIndex+999;
-    		else endIndex = curveIds.size();
-    		List<String> nextCurveIds = allCurveIds.subList(startIndex, endIndex);
-    		String groupName = "curveIds"+startIndex;
-    		String sqlClause = " agv.stringValue IN (:"+groupName+")";
-    		sqlCurveIdMap.put(sqlClause, nextCurveIds);
-    		startIndex=endIndex;
-    	}
-    	int numClause = 1;
-    	for (String sqlClause : sqlCurveIdMap.keySet()){
-    		if (numClause == 1){
-    			queryString = queryString + sqlClause;
-    		}else{
-    			queryString = queryString + " OR " + sqlClause;
-    		}
-    		numClause++;
-    	}
-    	queryString = queryString + " )";
+				+ "rsv.numericValue as response, "
+				+ "rsv.unitKind as responseUnits, "
+				+ "rsv.lsKind as responseKind, "
+				+ "bcsv.concentration as dose, "
+				+ "bcsv.concUnit as doseUnits, "
+				+ "afsv.codeValue as algorithmFlagStatus, "
+				+ "afov.codeValue as algorithmFlagObservation, "
+				+ "afcv.codeValue as algorithmFlagCause, "
+				+ "afcomv.stringValue as algorithmFlagComment, "
+				+ "pfsv.codeValue as preprocessFlagStatus, "
+				+ "pfov.codeValue as preprocessFlagObservation, "
+				+ "pfcv.codeValue as preprocessFlagCause, "
+				+ "afs.lsKind as algorithmFlagLsKind, "
+				+ "pfs.lsKind as preprocessFlagLsKind, "
+				+ "ufs.lsKind as userFlagLsKind, "
+				+ "pfcomv.stringValue as preprocessFlagComment, "
+				+ "ufsv.codeValue as userFlagStatus, "
+				+ "ufov.codeValue as userFlagObservation, "
+				+ "ufcv.codeValue as userFlagCause, "
+				+ "ufcomv.stringValue as userFlagComment,"
+				+ "agv.stringValue as curveId "
+				+ " ) "
+				+ "FROM AnalysisGroupValue agv "
+				+ "JOIN agv.lsState as ags "
+				+ "JOIN ags.analysisGroup as ag "
+				+ "JOIN ags.analysisGroup.treatmentGroups as treat "
+				+ "JOIN treat.subjects as subj "
+				+ "JOIN subj.lsStates as rss "
+				+ "JOIN rss.lsValues as rsv "
+				+ "JOIN rss.lsValues as bcsv "
+				+ "LEFT JOIN subj.lsStates as afs WITH afs.lsKind = 'auto flag' AND afs.ignored = false "
+				+ "LEFT JOIN afs.lsValues as afsv WITH afsv.lsKind = 'flag status' "
+				+ "LEFT JOIN afs.lsValues as afov WITH afov.lsKind = 'flag observation' "
+				+ "LEFT JOIN afs.lsValues as afcv WITH afcv.lsKind = 'flag cause' "
+				+ "LEFT JOIN afs.lsValues as afcomv WITH afcomv.lsKind = 'comment' "
+				+ "LEFT JOIN subj.lsStates as pfs WITH pfs.lsKind = 'preprocess flag' AND pfs.ignored = false "
+				+ "LEFT JOIN pfs.lsValues as pfsv WITH pfsv.lsKind = 'flag status' "
+				+ "LEFT JOIN pfs.lsValues as pfov WITH pfov.lsKind = 'flag observation' "
+				+ "LEFT JOIN pfs.lsValues as pfcv WITH pfcv.lsKind = 'flag cause' "
+				+ "LEFT JOIN pfs.lsValues as pfcomv WITH pfcomv.lsKind = 'comment' "
+				+ "LEFT JOIN subj.lsStates as ufs WITH ufs.lsKind = 'user flag' AND ufs.ignored = false "
+				+ "LEFT JOIN ufs.lsValues as ufsv WITH ufsv.lsKind = 'flag status' "
+				+ "LEFT JOIN ufs.lsValues as ufov WITH ufov.lsKind = 'flag observation' "
+				+ "LEFT JOIN ufs.lsValues as ufcv WITH ufcv.lsKind = 'flag cause' "
+				+ "LEFT JOIN ufs.lsValues as ufcomv WITH ufcomv.lsKind = 'comment' "
+				+ "WHERE rss.lsType = 'data' "
+				+ "AND rss.lsKind = 'results' "
+				+ "AND rsv.lsType = 'numericValue' "
+				+ "AND rsv.lsKind = :responseKind "
+				+ "AND bcsv.lsType = 'codeValue' "
+				+ "AND bcsv.lsKind = 'batch code' "
+				+ "AND ags.ignored = false "
+				+ "AND agv.lsType = 'stringValue' "
+				+ "AND agv.lsKind = 'curve id' "
+				+ "AND agv.ignored = false "
+				+ "AND ag.ignored = false "
+				+ "AND treat.ignored = false "
+				+ "AND subj.ignored = false "
+				+ "AND (";
+		Map<String, Collection<String>> sqlCurveIdMap = new HashMap<String, Collection<String>>();
+		List<String> allCurveIds = new ArrayList<String>();
+		allCurveIds.addAll(curveIds);
+		int startIndex = 0;
+		while (startIndex < curveIds.size()) {
+			int endIndex;
+			if (startIndex + 999 < curveIds.size())
+				endIndex = startIndex + 999;
+			else
+				endIndex = curveIds.size();
+			List<String> nextCurveIds = allCurveIds.subList(startIndex, endIndex);
+			String groupName = "curveIds" + startIndex;
+			String sqlClause = " agv.stringValue IN (:" + groupName + ")";
+			sqlCurveIdMap.put(sqlClause, nextCurveIds);
+			startIndex = endIndex;
+		}
+		int numClause = 1;
+		for (String sqlClause : sqlCurveIdMap.keySet()) {
+			if (numClause == 1) {
+				queryString = queryString + sqlClause;
+			} else {
+				queryString = queryString + " OR " + sqlClause;
+			}
+			numClause++;
+		}
+		queryString = queryString + " )";
 		TypedQuery<Map> q = em.createQuery(queryString, Map.class);
-        for (String sqlClause : sqlCurveIdMap.keySet()){
-        	String groupName = sqlClause.split(":")[1].replace(")","");
-        	q.setParameter(groupName, sqlCurveIdMap.get(sqlClause));
-        }
-        logger.debug("Querying with string: \n"+queryString);
-        if (responseName != null && responseName.length()>0){
-            q.setParameter("responseKind", responseName);
-        }
-        else{
-        	q.setParameter("responseKind", "efficacy");
-        }
-        List<Map> queryResults = q.getResultList();
-        List<RawCurveDataDTO> rawCurveDataList = new ArrayList<RawCurveDataDTO>();
+		for (String sqlClause : sqlCurveIdMap.keySet()) {
+			String groupName = sqlClause.split(":")[1].replace(")", "");
+			q.setParameter(groupName, sqlCurveIdMap.get(sqlClause));
+		}
+		logger.debug("Querying with string: \n" + queryString);
+		if (responseName != null && responseName.length() > 0) {
+			q.setParameter("responseKind", responseName);
+		} else {
+			q.setParameter("responseKind", "efficacy");
+		}
+		List<Map> queryResults = q.getResultList();
+		List<RawCurveDataDTO> rawCurveDataList = new ArrayList<RawCurveDataDTO>();
 		for (Map result : queryResults) {
 			RawCurveDataDTO rawCurveDataDTO = new RawCurveDataDTO(result);
 			rawCurveDataList.add(rawCurveDataDTO);
 		}
 		return rawCurveDataList;
 	}
-	
-	public static List<RawCurveDataDTO> getRawCurveDataAgonist(Collection<String> curveIds, String responseName){
+
+	public static List<RawCurveDataDTO> getRawCurveDataAgonist(Collection<String> curveIds, String responseName) {
 		EntityManager em = SubjectValue.entityManager();
 		String queryString = "SELECT NEW MAP( rsv.id as responseSubjectValueId, "
 				+ "rsv.recordedBy as recordedBy, "
 				+ "rsv.lsTransaction as lsTransaction, "
-        		+ "rsv.numericValue as response, "
-        		+ "rsv.unitKind as responseUnits, "
-        		+ "rsv.lsKind as responseKind, "
-        		+ "bcsv.concentration as dose, "
-        		+ "bcsv.concUnit as doseUnits, "
-        		+ "afsv.codeValue as algorithmFlagStatus, "
-        		+ "afov.codeValue as algorithmFlagObservation, "
-        		+ "afcv.codeValue as algorithmFlagCause, "
-        		+ "afcomv.stringValue as algorithmFlagComment, "
-        		+ "pfsv.codeValue as preprocessFlagStatus, "
-        		+ "pfov.codeValue as preprocessFlagObservation, "
-        		+ "pfcv.codeValue as preprocessFlagCause, "
-        		+ "afs.lsKind as algorithmFlagLsKind, "
-        		+ "pfs.lsKind as preprocessFlagLsKind, "
-        		+ "ufs.lsKind as userFlagLsKind, "
-        		+ "pfcomv.stringValue as preprocessFlagComment, "
-        		+ "ufsv.codeValue as userFlagStatus, "
-        		+ "ufov.codeValue as userFlagObservation, "
-        		+ "ufcv.codeValue as userFlagCause, "
-        		+ "ufcomv.stringValue as userFlagComment,"
-        		+ "agv.stringValue as curveId "
-        		+ " ) " 
-        		+ "FROM AnalysisGroupValue agv "
-        		+ "JOIN agv.lsState as ags "
-        		+ "JOIN ags.analysisGroup as ag "
-        		+ "JOIN ags.analysisGroup.treatmentGroups as treat "
-        		+ "JOIN treat.subjects as subj "
-        		+ "JOIN subj.lsStates as rss "
-        		+ "JOIN rss.lsValues as rsv "
-        		+ "JOIN rss.lsValues as bcsv "
-        		+ "LEFT JOIN subj.lsStates as afs WITH afs.lsKind = 'auto flag' AND afs.ignored = false "
-        		+ "LEFT JOIN afs.lsValues as afsv WITH afsv.lsKind = 'flag status' "
-        		+ "LEFT JOIN afs.lsValues as afov WITH afov.lsKind = 'flag observation' "
-        		+ "LEFT JOIN afs.lsValues as afcv WITH afcv.lsKind = 'flag cause' "
-        		+ "LEFT JOIN afs.lsValues as afcomv WITH afcomv.lsKind = 'comment' "
-        		+ "LEFT JOIN subj.lsStates as pfs WITH pfs.lsKind = 'preprocess flag' AND pfs.ignored = false "
-        		+ "LEFT JOIN pfs.lsValues as pfsv WITH pfsv.lsKind = 'flag status' "
-        		+ "LEFT JOIN pfs.lsValues as pfov WITH pfov.lsKind = 'flag observation' "
-        		+ "LEFT JOIN pfs.lsValues as pfcv WITH pfcv.lsKind = 'flag cause' "
-        		+ "LEFT JOIN pfs.lsValues as pfcomv WITH pfcomv.lsKind = 'comment' "
-        		+ "LEFT JOIN subj.lsStates as ufs WITH ufs.lsKind = 'user flag' AND ufs.ignored = false "
-        		+ "LEFT JOIN ufs.lsValues as ufsv WITH ufsv.lsKind = 'flag status' "
-        		+ "LEFT JOIN ufs.lsValues as ufov WITH ufov.lsKind = 'flag observation' "
-        		+ "LEFT JOIN ufs.lsValues as ufcv WITH ufcv.lsKind = 'flag cause' "
-        		+ "LEFT JOIN ufs.lsValues as ufcomv WITH ufcomv.lsKind = 'comment' "
-        		+ "WHERE rss.lsType = 'data' "
-        		+ "AND rss.lsKind = 'results' "
-        		+ "AND rsv.lsType = 'numericValue' "
-        		+ "AND rsv.lsKind = :responseKind "
-        		+ "AND bcsv.lsType = 'codeValue' "
-        		+ "AND bcsv.lsKind = 'agonist batch code' "
-        		+ "AND ags.ignored = false "
-        		+ "AND agv.lsType = 'stringValue' "
-        		+ "AND agv.lsKind = 'curve id' "
-        		+ "AND agv.ignored = false "
-        		+ "AND ag.ignored = false "
-        		+ "AND treat.ignored = false "
-        		+ "AND subj.ignored = false "
-        		+ "AND (";
-        Map<String, Collection<String>> sqlCurveIdMap = new HashMap<String, Collection<String>>();
-    	List<String> allCurveIds = new ArrayList<String>();
-    	allCurveIds.addAll(curveIds);
-    	int startIndex = 0;
-    	while (startIndex < curveIds.size()){
-    		int endIndex;
-    		if (startIndex+999 < curveIds.size()) endIndex = startIndex+999;
-    		else endIndex = curveIds.size();
-    		List<String> nextCurveIds = allCurveIds.subList(startIndex, endIndex);
-    		String groupName = "curveIds"+startIndex;
-    		String sqlClause = " agv.stringValue IN (:"+groupName+")";
-    		sqlCurveIdMap.put(sqlClause, nextCurveIds);
-    		startIndex=endIndex;
-    	}
-    	int numClause = 1;
-    	for (String sqlClause : sqlCurveIdMap.keySet()){
-    		if (numClause == 1){
-    			queryString = queryString + sqlClause;
-    		}else{
-    			queryString = queryString + " OR " + sqlClause;
-    		}
-    		numClause++;
-    	}
-    	queryString = queryString + " )";
+				+ "rsv.numericValue as response, "
+				+ "rsv.unitKind as responseUnits, "
+				+ "rsv.lsKind as responseKind, "
+				+ "bcsv.concentration as dose, "
+				+ "bcsv.concUnit as doseUnits, "
+				+ "afsv.codeValue as algorithmFlagStatus, "
+				+ "afov.codeValue as algorithmFlagObservation, "
+				+ "afcv.codeValue as algorithmFlagCause, "
+				+ "afcomv.stringValue as algorithmFlagComment, "
+				+ "pfsv.codeValue as preprocessFlagStatus, "
+				+ "pfov.codeValue as preprocessFlagObservation, "
+				+ "pfcv.codeValue as preprocessFlagCause, "
+				+ "afs.lsKind as algorithmFlagLsKind, "
+				+ "pfs.lsKind as preprocessFlagLsKind, "
+				+ "ufs.lsKind as userFlagLsKind, "
+				+ "pfcomv.stringValue as preprocessFlagComment, "
+				+ "ufsv.codeValue as userFlagStatus, "
+				+ "ufov.codeValue as userFlagObservation, "
+				+ "ufcv.codeValue as userFlagCause, "
+				+ "ufcomv.stringValue as userFlagComment,"
+				+ "agv.stringValue as curveId "
+				+ " ) "
+				+ "FROM AnalysisGroupValue agv "
+				+ "JOIN agv.lsState as ags "
+				+ "JOIN ags.analysisGroup as ag "
+				+ "JOIN ags.analysisGroup.treatmentGroups as treat "
+				+ "JOIN treat.subjects as subj "
+				+ "JOIN subj.lsStates as rss "
+				+ "JOIN rss.lsValues as rsv "
+				+ "JOIN rss.lsValues as bcsv "
+				+ "LEFT JOIN subj.lsStates as afs WITH afs.lsKind = 'auto flag' AND afs.ignored = false "
+				+ "LEFT JOIN afs.lsValues as afsv WITH afsv.lsKind = 'flag status' "
+				+ "LEFT JOIN afs.lsValues as afov WITH afov.lsKind = 'flag observation' "
+				+ "LEFT JOIN afs.lsValues as afcv WITH afcv.lsKind = 'flag cause' "
+				+ "LEFT JOIN afs.lsValues as afcomv WITH afcomv.lsKind = 'comment' "
+				+ "LEFT JOIN subj.lsStates as pfs WITH pfs.lsKind = 'preprocess flag' AND pfs.ignored = false "
+				+ "LEFT JOIN pfs.lsValues as pfsv WITH pfsv.lsKind = 'flag status' "
+				+ "LEFT JOIN pfs.lsValues as pfov WITH pfov.lsKind = 'flag observation' "
+				+ "LEFT JOIN pfs.lsValues as pfcv WITH pfcv.lsKind = 'flag cause' "
+				+ "LEFT JOIN pfs.lsValues as pfcomv WITH pfcomv.lsKind = 'comment' "
+				+ "LEFT JOIN subj.lsStates as ufs WITH ufs.lsKind = 'user flag' AND ufs.ignored = false "
+				+ "LEFT JOIN ufs.lsValues as ufsv WITH ufsv.lsKind = 'flag status' "
+				+ "LEFT JOIN ufs.lsValues as ufov WITH ufov.lsKind = 'flag observation' "
+				+ "LEFT JOIN ufs.lsValues as ufcv WITH ufcv.lsKind = 'flag cause' "
+				+ "LEFT JOIN ufs.lsValues as ufcomv WITH ufcomv.lsKind = 'comment' "
+				+ "WHERE rss.lsType = 'data' "
+				+ "AND rss.lsKind = 'results' "
+				+ "AND rsv.lsType = 'numericValue' "
+				+ "AND rsv.lsKind = :responseKind "
+				+ "AND bcsv.lsType = 'codeValue' "
+				+ "AND bcsv.lsKind = 'agonist batch code' "
+				+ "AND ags.ignored = false "
+				+ "AND agv.lsType = 'stringValue' "
+				+ "AND agv.lsKind = 'curve id' "
+				+ "AND agv.ignored = false "
+				+ "AND ag.ignored = false "
+				+ "AND treat.ignored = false "
+				+ "AND subj.ignored = false "
+				+ "AND (";
+		Map<String, Collection<String>> sqlCurveIdMap = new HashMap<String, Collection<String>>();
+		List<String> allCurveIds = new ArrayList<String>();
+		allCurveIds.addAll(curveIds);
+		int startIndex = 0;
+		while (startIndex < curveIds.size()) {
+			int endIndex;
+			if (startIndex + 999 < curveIds.size())
+				endIndex = startIndex + 999;
+			else
+				endIndex = curveIds.size();
+			List<String> nextCurveIds = allCurveIds.subList(startIndex, endIndex);
+			String groupName = "curveIds" + startIndex;
+			String sqlClause = " agv.stringValue IN (:" + groupName + ")";
+			sqlCurveIdMap.put(sqlClause, nextCurveIds);
+			startIndex = endIndex;
+		}
+		int numClause = 1;
+		for (String sqlClause : sqlCurveIdMap.keySet()) {
+			if (numClause == 1) {
+				queryString = queryString + sqlClause;
+			} else {
+				queryString = queryString + " OR " + sqlClause;
+			}
+			numClause++;
+		}
+		queryString = queryString + " )";
 		TypedQuery<Map> q = em.createQuery(queryString, Map.class);
-        for (String sqlClause : sqlCurveIdMap.keySet()){
-        	String groupName = sqlClause.split(":")[1].replace(")","");
-        	q.setParameter(groupName, sqlCurveIdMap.get(sqlClause));
-        }
-        logger.debug("Querying with string: \n"+queryString);
-        if (responseName != null && responseName.length()>0){
-            q.setParameter("responseKind", responseName);
-        }
-        else{
-        	q.setParameter("responseKind", "normalized activity");
-        }
-        List<Map> queryResults = q.getResultList();
-        List<RawCurveDataDTO> rawCurveDataList = new ArrayList<RawCurveDataDTO>();
+		for (String sqlClause : sqlCurveIdMap.keySet()) {
+			String groupName = sqlClause.split(":")[1].replace(")", "");
+			q.setParameter(groupName, sqlCurveIdMap.get(sqlClause));
+		}
+		logger.debug("Querying with string: \n" + queryString);
+		if (responseName != null && responseName.length() > 0) {
+			q.setParameter("responseKind", responseName);
+		} else {
+			q.setParameter("responseKind", "normalized activity");
+		}
+		List<Map> queryResults = q.getResultList();
+		List<RawCurveDataDTO> rawCurveDataList = new ArrayList<RawCurveDataDTO>();
 		for (Map result : queryResults) {
 			RawCurveDataDTO rawCurveDataDTO = new RawCurveDataDTO(result);
 			rawCurveDataList.add(rawCurveDataDTO);
@@ -396,37 +394,39 @@ public static List<RawCurveDataDTO> getRawCurveDataAgonist(Collection<String> cu
 		return rawCurveDataList;
 	}
 
-	
 	public static String getCsvList(Collection<RawCurveDataDTO> rawCurveDataDTOs, String format) {
-		//format is ALWAYS tsv or csv (not case sensitive)
+		// format is ALWAYS tsv or csv (not case sensitive)
 		StringWriter outFile = new StringWriter();
-        ICsvBeanWriter beanWriter = null;
-        try {
-            if (format.equalsIgnoreCase("csv")) beanWriter = new CsvBeanWriter(outFile, CsvPreference.STANDARD_PREFERENCE);
-            else beanWriter = new CsvBeanWriter(outFile, CsvPreference.TAB_PREFERENCE);
-            final String[] header = RawCurveDataDTO.getColumns();
-            final CellProcessor[] processors = RawCurveDataDTO.getProcessors();
-            beanWriter.writeHeader(header);
-            for (final RawCurveDataDTO rawCurveDataDTO : rawCurveDataDTOs) {
-                beanWriter.write(rawCurveDataDTO, header, processors);
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            if (beanWriter != null) {
-                try {
-                    beanWriter.close();
-                    outFile.flush();
-                    outFile.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return outFile.toString();
-	}
-	
-	public static Collection<RawCurveDataDTO> getRawCurveDataByExperiment(String experimentIdOrCodeName, String responseName){
+		ICsvBeanWriter beanWriter = null;
+		try {
+			if (format.equalsIgnoreCase("csv"))
+				beanWriter = new CsvBeanWriter(outFile, CsvPreference.STANDARD_PREFERENCE);
+			else
+				beanWriter = new CsvBeanWriter(outFile, CsvPreference.TAB_PREFERENCE);
+			final String[] header = RawCurveDataDTO.getColumns();
+			final CellProcessor[] processors = RawCurveDataDTO.getProcessors();
+			beanWriter.writeHeader(header);
+			for (final RawCurveDataDTO rawCurveDataDTO : rawCurveDataDTOs) {
+				beanWriter.write(rawCurveDataDTO, header, processors);
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
+		} finally {
+			if (beanWriter != null) {
+				try {
+					beanWriter.close();
+					outFile.flush();
+					outFile.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+		return outFile.toString();
+	}
+
+	public static Collection<RawCurveDataDTO> getRawCurveDataByExperiment(String experimentIdOrCodeName,
+			String responseName) {
 		long startTime = System.currentTimeMillis();
 		Collection<String> curveIds = CurveFitDTO.findAllCurveIdsByExperiment(experimentIdOrCodeName);
 		long endTime = System.currentTimeMillis();
@@ -439,8 +439,9 @@ public static Collection<RawCurveDataDTO> getRawCurveDataByExperiment(String exp
 		logger.debug("time to fill in raw curve data = " + totalTime2 + " miliseconds.");
 		return rawCurveDataDTOs;
 	}
-	
-	public static Collection<RawCurveDataDTO> getRawAgonistCurveDataByExperiment(String experimentIdOrCodeName, String responseName){
+
+	public static Collection<RawCurveDataDTO> getRawAgonistCurveDataByExperiment(String experimentIdOrCodeName,
+			String responseName) {
 		long startTime = System.currentTimeMillis();
 		Collection<String> curveIds = CurveFitDTO.findAllCurveIdsByExperiment(experimentIdOrCodeName);
 		long endTime = System.currentTimeMillis();
@@ -454,206 +455,205 @@ public static Collection<RawCurveDataDTO> getRawAgonistCurveDataByExperiment(Str
 		return rawCurveDataDTOs;
 	}
 
-
 	public String toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(this);
+	}
 
 	public String toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(this);
+	}
 
 	public static RawCurveDataDTO fromJsonToRawCurveDataDTO(String json) {
-        return new JSONDeserializer<RawCurveDataDTO>()
-        .use(null, RawCurveDataDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<RawCurveDataDTO>()
+				.use(null, RawCurveDataDTO.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<RawCurveDataDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<RawCurveDataDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<RawCurveDataDTO> fromJsonArrayToRawCurveDataDTO(String json) {
-        return new JSONDeserializer<List<RawCurveDataDTO>>()
-        .use("values", RawCurveDataDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<RawCurveDataDTO>>()
+				.use("values", RawCurveDataDTO.class).deserialize(json);
+	}
 
 	public String getCurveId() {
-        return this.curveId;
-    }
+		return this.curveId;
+	}
 
 	public void setCurveId(String curveId) {
-        this.curveId = curveId;
-    }
+		this.curveId = curveId;
+	}
 
 	public String getRecordedBy() {
-        return this.recordedBy;
-    }
+		return this.recordedBy;
+	}
 
 	public void setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
+		this.recordedBy = recordedBy;
+	}
 
 	public Long getLsTransaction() {
-        return this.lsTransaction;
-    }
+		return this.lsTransaction;
+	}
 
 	public void setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
+		this.lsTransaction = lsTransaction;
+	}
 
 	public Long getResponseSubjectValueId() {
-        return this.responseSubjectValueId;
-    }
+		return this.responseSubjectValueId;
+	}
 
 	public void setResponseSubjectValueId(Long responseSubjectValueId) {
-        this.responseSubjectValueId = responseSubjectValueId;
-    }
+		this.responseSubjectValueId = responseSubjectValueId;
+	}
 
 	public BigDecimal getResponse() {
-        return this.response;
-    }
+		return this.response;
+	}
 
 	public void setResponse(BigDecimal response) {
-        this.response = response;
-    }
+		this.response = response;
+	}
 
 	public String getResponseKind() {
-        return this.responseKind;
-    }
+		return this.responseKind;
+	}
 
 	public void setResponseKind(String responseKind) {
-        this.responseKind = responseKind;
-    }
+		this.responseKind = responseKind;
+	}
 
 	public String getResponseUnits() {
-        return this.responseUnits;
-    }
+		return this.responseUnits;
+	}
 
 	public void setResponseUnits(String responseUnits) {
-        this.responseUnits = responseUnits;
-    }
+		this.responseUnits = responseUnits;
+	}
 
 	public BigDecimal getDose() {
-        return this.dose;
-    }
+		return this.dose;
+	}
 
 	public void setDose(BigDecimal dose) {
-        this.dose = dose;
-    }
+		this.dose = dose;
+	}
 
 	public String getDoseUnits() {
-        return this.doseUnits;
-    }
+		return this.doseUnits;
+	}
 
 	public void setDoseUnits(String doseUnits) {
-        this.doseUnits = doseUnits;
-    }
+		this.doseUnits = doseUnits;
+	}
 
 	public String getAlgorithmFlagStatus() {
-        return this.algorithmFlagStatus;
-    }
+		return this.algorithmFlagStatus;
+	}
 
 	public void setAlgorithmFlagStatus(String algorithmFlagStatus) {
-        this.algorithmFlagStatus = algorithmFlagStatus;
-    }
+		this.algorithmFlagStatus = algorithmFlagStatus;
+	}
 
 	public String getAlgorithmFlagObservation() {
-        return this.algorithmFlagObservation;
-    }
+		return this.algorithmFlagObservation;
+	}
 
 	public void setAlgorithmFlagObservation(String algorithmFlagObservation) {
-        this.algorithmFlagObservation = algorithmFlagObservation;
-    }
+		this.algorithmFlagObservation = algorithmFlagObservation;
+	}
 
 	public String getAlgorithmFlagCause() {
-        return this.algorithmFlagCause;
-    }
+		return this.algorithmFlagCause;
+	}
 
 	public void setAlgorithmFlagCause(String algorithmFlagCause) {
-        this.algorithmFlagCause = algorithmFlagCause;
-    }
+		this.algorithmFlagCause = algorithmFlagCause;
+	}
 
 	public String getAlgorithmFlagComment() {
-        return this.algorithmFlagComment;
-    }
+		return this.algorithmFlagComment;
+	}
 
 	public void setAlgorithmFlagComment(String algorithmFlagComment) {
-        this.algorithmFlagComment = algorithmFlagComment;
-    }
+		this.algorithmFlagComment = algorithmFlagComment;
+	}
 
 	public String getPreprocessFlagStatus() {
-        return this.preprocessFlagStatus;
-    }
+		return this.preprocessFlagStatus;
+	}
 
 	public void setPreprocessFlagStatus(String preprocessFlagStatus) {
-        this.preprocessFlagStatus = preprocessFlagStatus;
-    }
+		this.preprocessFlagStatus = preprocessFlagStatus;
+	}
 
 	public String getPreprocessFlagObservation() {
-        return this.preprocessFlagObservation;
-    }
+		return this.preprocessFlagObservation;
+	}
 
 	public void setPreprocessFlagObservation(String preprocessFlagObservation) {
-        this.preprocessFlagObservation = preprocessFlagObservation;
-    }
+		this.preprocessFlagObservation = preprocessFlagObservation;
+	}
 
 	public String getPreprocessFlagCause() {
-        return this.preprocessFlagCause;
-    }
+		return this.preprocessFlagCause;
+	}
 
 	public void setPreprocessFlagCause(String preprocessFlagCause) {
-        this.preprocessFlagCause = preprocessFlagCause;
-    }
+		this.preprocessFlagCause = preprocessFlagCause;
+	}
 
 	public String getPreprocessFlagComment() {
-        return this.preprocessFlagComment;
-    }
+		return this.preprocessFlagComment;
+	}
 
 	public void setPreprocessFlagComment(String preprocessFlagComment) {
-        this.preprocessFlagComment = preprocessFlagComment;
-    }
+		this.preprocessFlagComment = preprocessFlagComment;
+	}
 
 	public String getUserFlagStatus() {
-        return this.userFlagStatus;
-    }
+		return this.userFlagStatus;
+	}
 
 	public void setUserFlagStatus(String userFlagStatus) {
-        this.userFlagStatus = userFlagStatus;
-    }
+		this.userFlagStatus = userFlagStatus;
+	}
 
 	public String getUserFlagObservation() {
-        return this.userFlagObservation;
-    }
+		return this.userFlagObservation;
+	}
 
 	public void setUserFlagObservation(String userFlagObservation) {
-        this.userFlagObservation = userFlagObservation;
-    }
+		this.userFlagObservation = userFlagObservation;
+	}
 
 	public String getUserFlagCause() {
-        return this.userFlagCause;
-    }
+		return this.userFlagCause;
+	}
 
 	public void setUserFlagCause(String userFlagCause) {
-        this.userFlagCause = userFlagCause;
-    }
+		this.userFlagCause = userFlagCause;
+	}
 
 	public String getUserFlagComment() {
-        return this.userFlagComment;
-    }
+		return this.userFlagComment;
+	}
 
 	public void setUserFlagComment(String userFlagComment) {
-        this.userFlagComment = userFlagComment;
-    }
+		this.userFlagComment = userFlagComment;
+	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/dto/RegSearchDTO.java b/src/main/java/com/labsynch/labseer/dto/RegSearchDTO.java
index cb8497ccb..7de521cf9 100755
--- a/src/main/java/com/labsynch/labseer/dto/RegSearchDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/RegSearchDTO.java
@@ -11,87 +11,90 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class RegSearchDTO {
 
     private String asDrawnStructure;
-    
+
     private String asDrawnImage;
-    
+
     private double asDrawnMolWeight;
-    
+
     private double asDrawnExactMass;
-    
+
     private String asDrawnMolFormula;
 
     private Set<ParentDTO> parents = new HashSet<ParentDTO>();
 
-	public String toJson() {
-        return new JSONSerializer().include("parents.saltForms.isosalts", "parents.parentAliases").exclude("*.class", "parents.parent", "parents.saltForms.isosalts.saltForm").serialize(this);
-//  "parents.saltForms.saltForm.parent"
-	}
-	
-	public static RegSearchDTO fromJsonToRegSearchDTO(String json) {
+    public String toJson() {
+        return new JSONSerializer().include("parents.saltForms.isosalts", "parents.parentAliases")
+                .exclude("*.class", "parents.parent", "parents.saltForms.isosalts.saltForm").serialize(this);
+        // "parents.saltForms.saltForm.parent"
+    }
+
+    public static RegSearchDTO fromJsonToRegSearchDTO(String json) {
         return new JSONDeserializer<RegSearchDTO>().use(null, RegSearchDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<RegSearchDTO> collection) {
-        return new JSONSerializer().include("parents.parentAliases").exclude("*.class", "parents.saltForms.saltForm.parent", "parents.saltForms.isosalts.saltForm").serialize(collection);
+    public static String toJsonArray(Collection<RegSearchDTO> collection) {
+        return new JSONSerializer().include("parents.parentAliases")
+                .exclude("*.class", "parents.saltForms.saltForm.parent", "parents.saltForms.isosalts.saltForm")
+                .serialize(collection);
     }
 
-	public static Collection<RegSearchDTO> fromJsonArrayToRegSearchDTO(String json) {
-        return new JSONDeserializer<List<RegSearchDTO>>().use(null, ArrayList.class).use("values", RegSearchDTO.class).deserialize(json);
+    public static Collection<RegSearchDTO> fromJsonArrayToRegSearchDTO(String json) {
+        return new JSONDeserializer<List<RegSearchDTO>>().use(null, ArrayList.class).use("values", RegSearchDTO.class)
+                .deserialize(json);
     }
 
-	public String getAsDrawnStructure() {
+    public String getAsDrawnStructure() {
         return this.asDrawnStructure;
     }
 
-	public void setAsDrawnStructure(String asDrawnStructure) {
+    public void setAsDrawnStructure(String asDrawnStructure) {
         this.asDrawnStructure = asDrawnStructure;
     }
 
-	public String getAsDrawnImage() {
+    public String getAsDrawnImage() {
         return this.asDrawnImage;
     }
 
-	public void setAsDrawnImage(String asDrawnImage) {
+    public void setAsDrawnImage(String asDrawnImage) {
         this.asDrawnImage = asDrawnImage;
     }
 
-	public double getAsDrawnMolWeight() {
+    public double getAsDrawnMolWeight() {
         return this.asDrawnMolWeight;
     }
 
-	public void setAsDrawnMolWeight(double asDrawnMolWeight) {
+    public void setAsDrawnMolWeight(double asDrawnMolWeight) {
         this.asDrawnMolWeight = asDrawnMolWeight;
     }
 
-	public double getAsDrawnExactMass() {
+    public double getAsDrawnExactMass() {
         return this.asDrawnExactMass;
     }
 
-	public void setAsDrawnExactMass(double asDrawnExactMass) {
+    public void setAsDrawnExactMass(double asDrawnExactMass) {
         this.asDrawnExactMass = asDrawnExactMass;
     }
 
-	public String getAsDrawnMolFormula() {
+    public String getAsDrawnMolFormula() {
         return this.asDrawnMolFormula;
     }
 
-	public void setAsDrawnMolFormula(String asDrawnMolFormula) {
+    public void setAsDrawnMolFormula(String asDrawnMolFormula) {
         this.asDrawnMolFormula = asDrawnMolFormula;
     }
 
-	public Set<ParentDTO> getParents() {
+    public Set<ParentDTO> getParents() {
         return this.parents;
     }
 
-	public void setParents(Set<ParentDTO> parents) {
+    public void setParents(Set<ParentDTO> parents) {
         this.parents = parents;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/RegSearchParamsDTO.java b/src/main/java/com/labsynch/labseer/dto/RegSearchParamsDTO.java
index 3b6527a41..7865d129a 100755
--- a/src/main/java/com/labsynch/labseer/dto/RegSearchParamsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/RegSearchParamsDTO.java
@@ -9,92 +9,89 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class RegSearchParamsDTO {
 
     private String corpName;
 
     private String molStructure;
-    
-	private String parentCorpName;
-	
-	private String saltFormCorpName;
-	
-	private String lotCorpName;
-    
 
+    private String parentCorpName;
+
+    private String saltFormCorpName;
+
+    private String lotCorpName;
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getCorpName() {
+    public String getCorpName() {
         return this.corpName;
     }
 
-	public void setCorpName(String corpName) {
+    public void setCorpName(String corpName) {
         this.corpName = corpName;
     }
 
-	public String getMolStructure() {
+    public String getMolStructure() {
         return this.molStructure;
     }
 
-	public void setMolStructure(String molStructure) {
+    public void setMolStructure(String molStructure) {
         this.molStructure = molStructure;
     }
 
-	public String getParentCorpName() {
+    public String getParentCorpName() {
         return this.parentCorpName;
     }
 
-	public void setParentCorpName(String parentCorpName) {
+    public void setParentCorpName(String parentCorpName) {
         this.parentCorpName = parentCorpName;
     }
 
-	public String getSaltFormCorpName() {
+    public String getSaltFormCorpName() {
         return this.saltFormCorpName;
     }
 
-	public void setSaltFormCorpName(String saltFormCorpName) {
+    public void setSaltFormCorpName(String saltFormCorpName) {
         this.saltFormCorpName = saltFormCorpName;
     }
 
-	public String getLotCorpName() {
+    public String getLotCorpName() {
         return this.lotCorpName;
     }
 
-	public void setLotCorpName(String lotCorpName) {
+    public void setLotCorpName(String lotCorpName) {
         this.lotCorpName = lotCorpName;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static RegSearchParamsDTO fromJsonToRegSearchParamsDTO(String json) {
+    public static RegSearchParamsDTO fromJsonToRegSearchParamsDTO(String json) {
         return new JSONDeserializer<RegSearchParamsDTO>()
-        .use(null, RegSearchParamsDTO.class).deserialize(json);
+                .use(null, RegSearchParamsDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<RegSearchParamsDTO> collection) {
+    public static String toJsonArray(Collection<RegSearchParamsDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<RegSearchParamsDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<RegSearchParamsDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<RegSearchParamsDTO> fromJsonArrayToRegSearchParamsDTO(String json) {
+    public static Collection<RegSearchParamsDTO> fromJsonArrayToRegSearchParamsDTO(String json) {
         return new JSONDeserializer<List<RegSearchParamsDTO>>()
-        .use("values", RegSearchParamsDTO.class).deserialize(json);
+                .use("values", RegSearchParamsDTO.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/RenderMolRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/RenderMolRequestDTO.java
index 0d8458936..3db4d8ebb 100644
--- a/src/main/java/com/labsynch/labseer/dto/RenderMolRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/RenderMolRequestDTO.java
@@ -9,93 +9,89 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class RenderMolRequestDTO {
-	
-	private String codeName;
-	
-	private String molStructure;
-	
-	private Integer height;
-	
-	private Integer width;
-	
-	private String format;
-
-
-	public String toString() {
+
+    private String codeName;
+
+    private String molStructure;
+
+    private Integer height;
+
+    private Integer width;
+
+    private String format;
+
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static RenderMolRequestDTO fromJsonToRenderMolRequestDTO(String json) {
+    public static RenderMolRequestDTO fromJsonToRenderMolRequestDTO(String json) {
         return new JSONDeserializer<RenderMolRequestDTO>()
-        .use(null, RenderMolRequestDTO.class).deserialize(json);
+                .use(null, RenderMolRequestDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<RenderMolRequestDTO> collection) {
+    public static String toJsonArray(Collection<RenderMolRequestDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<RenderMolRequestDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<RenderMolRequestDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<RenderMolRequestDTO> fromJsonArrayToRenderMoes(String json) {
+    public static Collection<RenderMolRequestDTO> fromJsonArrayToRenderMoes(String json) {
         return new JSONDeserializer<List<RenderMolRequestDTO>>()
-        .use("values", RenderMolRequestDTO.class).deserialize(json);
+                .use("values", RenderMolRequestDTO.class).deserialize(json);
     }
 
-	public String getCodeName() {
+    public String getCodeName() {
         return this.codeName;
     }
 
-	public void setCodeName(String codeName) {
+    public void setCodeName(String codeName) {
         this.codeName = codeName;
     }
 
-	public String getMolStructure() {
+    public String getMolStructure() {
         return this.molStructure;
     }
 
-	public void setMolStructure(String molStructure) {
+    public void setMolStructure(String molStructure) {
         this.molStructure = molStructure;
     }
 
-	public Integer getHeight() {
+    public Integer getHeight() {
         return this.height;
     }
 
-	public void setHeight(Integer height) {
+    public void setHeight(Integer height) {
         this.height = height;
     }
 
-	public Integer getWidth() {
+    public Integer getWidth() {
         return this.width;
     }
 
-	public void setWidth(Integer width) {
+    public void setWidth(Integer width) {
         this.width = width;
     }
 
-	public String getFormat() {
+    public String getFormat() {
         return this.format;
     }
 
-	public void setFormat(String format) {
+    public void setFormat(String format) {
         this.format = format;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/ReparentLotDTO.java b/src/main/java/com/labsynch/labseer/dto/ReparentLotDTO.java
index 8948c3773..b19b0dec9 100644
--- a/src/main/java/com/labsynch/labseer/dto/ReparentLotDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ReparentLotDTO.java
@@ -9,71 +9,69 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ReparentLotDTO {
-	
-	private String parentCorpName;
-	
-	private String lotCorpName;
 
-	private String modifiedBy;
-	
+    private String parentCorpName;
+
+    private String lotCorpName;
+
+    private String modifiedBy;
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getParentCorpName() {
+    public String getParentCorpName() {
         return this.parentCorpName;
     }
 
-	public void setParentCorpName(String parentCorpName) {
+    public void setParentCorpName(String parentCorpName) {
         this.parentCorpName = parentCorpName;
     }
 
-	public String getLotCorpName() {
+    public String getLotCorpName() {
         return this.lotCorpName;
     }
 
-	public void setLotCorpName(String lotCorpName) {
+    public void setLotCorpName(String lotCorpName) {
         this.lotCorpName = lotCorpName;
     }
 
-	public String getModifiedBy() {
+    public String getModifiedBy() {
         return this.modifiedBy;
     }
 
-	public void setModifiedBy(String modifiedBy) {
+    public void setModifiedBy(String modifiedBy) {
         this.modifiedBy = modifiedBy;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ReparentLotDTO fromJsonToReparentLotDTO(String json) {
+    public static ReparentLotDTO fromJsonToReparentLotDTO(String json) {
         return new JSONDeserializer<ReparentLotDTO>()
-        .use(null, ReparentLotDTO.class).deserialize(json);
+                .use(null, ReparentLotDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ReparentLotDTO> collection) {
+    public static String toJsonArray(Collection<ReparentLotDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ReparentLotDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<ReparentLotDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ReparentLotDTO> fromJsonArrayToReparentLoes(String json) {
+    public static Collection<ReparentLotDTO> fromJsonArrayToReparentLoes(String json) {
         return new JSONDeserializer<List<ReparentLotDTO>>()
-        .use("values", ReparentLotDTO.class).deserialize(json);
+                .use("values", ReparentLotDTO.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/RequestNameDTO.java b/src/main/java/com/labsynch/labseer/dto/RequestNameDTO.java
index 85be89689..38ba8e1d2 100755
--- a/src/main/java/com/labsynch/labseer/dto/RequestNameDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/RequestNameDTO.java
@@ -9,53 +9,49 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class RequestNameDTO {
 
-	private String requestName;
-	
+    private String requestName;
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getRequestName() {
+    public String getRequestName() {
         return this.requestName;
     }
 
-	public void setRequestName(String requestName) {
+    public void setRequestName(String requestName) {
         this.requestName = requestName;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static RequestNameDTO fromJsonToRequestNameDTO(String json) {
+    public static RequestNameDTO fromJsonToRequestNameDTO(String json) {
         return new JSONDeserializer<RequestNameDTO>()
-        .use(null, RequestNameDTO.class).deserialize(json);
+                .use(null, RequestNameDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<RequestNameDTO> collection) {
+    public static String toJsonArray(Collection<RequestNameDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<RequestNameDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<RequestNameDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<RequestNameDTO> fromJsonArrayToRequestNameDTO(String json) {
+    public static Collection<RequestNameDTO> fromJsonArrayToRequestNameDTO(String json) {
         return new JSONDeserializer<List<RequestNameDTO>>()
-        .use("values", RequestNameDTO.class).deserialize(json);
+                .use("values", RequestNameDTO.class).deserialize(json);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/SELColOrderDTO.java b/src/main/java/com/labsynch/labseer/dto/SELColOrderDTO.java
index c1662e938..a79b69aef 100644
--- a/src/main/java/com/labsynch/labseer/dto/SELColOrderDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SELColOrderDTO.java
@@ -9,124 +9,118 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class SELColOrderDTO implements Comparable {
-	
-	private Long stateId;
-
-	private String columnName;
-	
-	private Integer columnOrder;
-	
-	private boolean columnDisplay;
-	
-	private String lsType;
-	
-	private String lsKind;
-
-	private boolean publicData;
-	
-
-
-	public SELColOrderDTO() {
-	}
-	
-	@Override
-	public int compareTo(Object compareObject) {
-		Integer compareColOrder = ((SELColOrderDTO) compareObject).columnOrder;
-		return this.columnOrder - compareColOrder;
-	}
-	
-
-	public String toString() {
+
+    private Long stateId;
+
+    private String columnName;
+
+    private Integer columnOrder;
+
+    private boolean columnDisplay;
+
+    private String lsType;
+
+    private String lsKind;
+
+    private boolean publicData;
+
+    public SELColOrderDTO() {
+    }
+
+    @Override
+    public int compareTo(Object compareObject) {
+        Integer compareColOrder = ((SELColOrderDTO) compareObject).columnOrder;
+        return this.columnOrder - compareColOrder;
+    }
+
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static SELColOrderDTO fromJsonToSELColOrderDTO(String json) {
+    public static SELColOrderDTO fromJsonToSELColOrderDTO(String json) {
         return new JSONDeserializer<SELColOrderDTO>()
-        .use(null, SELColOrderDTO.class).deserialize(json);
+                .use(null, SELColOrderDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<SELColOrderDTO> collection) {
+    public static String toJsonArray(Collection<SELColOrderDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<SELColOrderDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<SELColOrderDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<SELColOrderDTO> fromJsonArrayToSELCoes(String json) {
+    public static Collection<SELColOrderDTO> fromJsonArrayToSELCoes(String json) {
         return new JSONDeserializer<List<SELColOrderDTO>>()
-        .use("values", SELColOrderDTO.class).deserialize(json);
+                .use("values", SELColOrderDTO.class).deserialize(json);
     }
 
-	public Long getStateId() {
+    public Long getStateId() {
         return this.stateId;
     }
 
-	public void setStateId(Long stateId) {
+    public void setStateId(Long stateId) {
         this.stateId = stateId;
     }
 
-	public String getColumnName() {
+    public String getColumnName() {
         return this.columnName;
     }
 
-	public void setColumnName(String columnName) {
+    public void setColumnName(String columnName) {
         this.columnName = columnName;
     }
 
-	public Integer getColumnOrder() {
+    public Integer getColumnOrder() {
         return this.columnOrder;
     }
 
-	public void setColumnOrder(Integer columnOrder) {
+    public void setColumnOrder(Integer columnOrder) {
         this.columnOrder = columnOrder;
     }
 
-	public boolean isColumnDisplay() {
+    public boolean isColumnDisplay() {
         return this.columnDisplay;
     }
 
-	public void setColumnDisplay(boolean columnDisplay) {
+    public void setColumnDisplay(boolean columnDisplay) {
         this.columnDisplay = columnDisplay;
     }
 
-	public String getLsType() {
+    public String getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(String lsType) {
+    public void setLsType(String lsType) {
         this.lsType = lsType;
     }
 
-	public String getLsKind() {
+    public String getLsKind() {
         return this.lsKind;
     }
 
-	public void setLsKind(String lsKind) {
+    public void setLsKind(String lsKind) {
         this.lsKind = lsKind;
     }
 
-	public boolean isPublicData() {
+    public boolean isPublicData() {
         return this.publicData;
     }
 
-	public void setPublicData(boolean publicData) {
+    public void setPublicData(boolean publicData) {
         this.publicData = publicData;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/SaltFormAliasDTO.java b/src/main/java/com/labsynch/labseer/dto/SaltFormAliasDTO.java
index 7b26e3b7f..52e84c655 100644
--- a/src/main/java/com/labsynch/labseer/dto/SaltFormAliasDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SaltFormAliasDTO.java
@@ -10,108 +10,105 @@
 import java.util.Collection;
 import java.util.List;
 
-
 public class SaltFormAliasDTO {
 
     private String saltFormCorpName;
-    
+
     private String lsType;
-    
+
     private String lsKind;
-    
+
     private String aliasName;
-    
+
     private boolean preferred;
-    
-    public SaltFormAliasDTO(){
-    	
-    }
-    
-    public SaltFormAliasDTO(SaltFormAlias saltFormAlias){
-    	this.saltFormCorpName = saltFormAlias.getSaltForm().getCorpName();
-    	this.lsType = saltFormAlias.getLsType();
-    	this.lsKind = saltFormAlias.getLsKind();
-    	this.aliasName = saltFormAlias.getAliasName();
-    	this.preferred = saltFormAlias.isPreferred();
-    }
-    
-    public boolean getPreferred(){
-    	return this.preferred;
-    }
-    
-   
-
-	public String toString() {
+
+    public SaltFormAliasDTO() {
+
+    }
+
+    public SaltFormAliasDTO(SaltFormAlias saltFormAlias) {
+        this.saltFormCorpName = saltFormAlias.getSaltForm().getCorpName();
+        this.lsType = saltFormAlias.getLsType();
+        this.lsKind = saltFormAlias.getLsKind();
+        this.aliasName = saltFormAlias.getAliasName();
+        this.preferred = saltFormAlias.isPreferred();
+    }
+
+    public boolean getPreferred() {
+        return this.preferred;
+    }
+
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getSaltFormCorpName() {
+    public String getSaltFormCorpName() {
         return this.saltFormCorpName;
     }
 
-	public void setSaltFormCorpName(String saltFormCorpName) {
+    public void setSaltFormCorpName(String saltFormCorpName) {
         this.saltFormCorpName = saltFormCorpName;
     }
 
-	public String getLsType() {
+    public String getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(String lsType) {
+    public void setLsType(String lsType) {
         this.lsType = lsType;
     }
 
-	public String getLsKind() {
+    public String getLsKind() {
         return this.lsKind;
     }
 
-	public void setLsKind(String lsKind) {
+    public void setLsKind(String lsKind) {
         this.lsKind = lsKind;
     }
 
-	public String getAliasName() {
+    public String getAliasName() {
         return this.aliasName;
     }
 
-	public void setAliasName(String aliasName) {
+    public void setAliasName(String aliasName) {
         this.aliasName = aliasName;
     }
 
-	public boolean isPreferred() {
+    public boolean isPreferred() {
         return this.preferred;
     }
 
-	public void setPreferred(boolean preferred) {
+    public void setPreferred(boolean preferred) {
         this.preferred = preferred;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static SaltFormAliasDTO fromJsonToSaltFormAliasDTO(String json) {
+    public static SaltFormAliasDTO fromJsonToSaltFormAliasDTO(String json) {
         return new JSONDeserializer<SaltFormAliasDTO>()
-        .use(null, SaltFormAliasDTO.class).deserialize(json);
+                .use(null, SaltFormAliasDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<SaltFormAliasDTO> collection) {
+    public static String toJsonArray(Collection<SaltFormAliasDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<SaltFormAliasDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<SaltFormAliasDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<SaltFormAliasDTO> fromJsonArrayToSaltFoes(String json) {
+    public static Collection<SaltFormAliasDTO> fromJsonArrayToSaltFoes(String json) {
         return new JSONDeserializer<List<SaltFormAliasDTO>>()
-        .use("values", SaltFormAliasDTO.class).deserialize(json);
+                .use("values", SaltFormAliasDTO.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/SaltFormDTO.java b/src/main/java/com/labsynch/labseer/dto/SaltFormDTO.java
index aed36d2e5..f51300ea9 100755
--- a/src/main/java/com/labsynch/labseer/dto/SaltFormDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SaltFormDTO.java
@@ -16,145 +16,143 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
+public class SaltFormDTO {
 
-public class SaltFormDTO{
+    private long id;
 
+    @Lob
+    // @Size(max = 10485760)
+    private String molStructure;
 
-	private long id;
-	
-	@Lob
-	//@Size(max = 10485760)
-	private String molStructure;
+    @Size(max = 255)
+    private String corpName;
 
-	@Size(max = 255)
-	private String corpName;
+    @Size(max = 255)
+    private String casNumber;
 
-	@Size(max = 255)
-	private String casNumber;
+    private String chemist;
 
-	private String chemist;
+    private int CdId;
 
-	private int CdId;
+    private Boolean ignore;
 
-	private Boolean ignore;	
+    private Set<IsoSalt> isosalts = new HashSet<IsoSalt>();
 
-	private Set<IsoSalt> isosalts = new HashSet<IsoSalt>();
+    private Set<Lot> lots = new HashSet<Lot>();
 
-	private Set<Lot> lots = new HashSet<Lot>();
-	
     public void setSaltForm(SaltForm saltForm) {
-    	this.setMolStructure(saltForm.getMolStructure());
-    	this.setCorpName(saltForm.getCorpName());
-    	this.setCasNumber(saltForm.getCasNumber());
-    	this.setChemist(saltForm.getChemist());
-    	this.setCdId(saltForm.getCdId());
-    	this.setIgnore(saltForm.getIgnore());
-    	this.setId(saltForm.getId());
-    }
-
-	public long getId() {
-		return id;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	public String getMolStructure() {
-		return molStructure;
-	}
-
-	public void setMolStructure(String molStructure) {
-		this.molStructure = molStructure;
-	}
-
-	public String getCorpName() {
-		return corpName;
-	}
-
-	public void setCorpName(String corpName) {
-		this.corpName = corpName;
-	}
-    
+        this.setMolStructure(saltForm.getMolStructure());
+        this.setCorpName(saltForm.getCorpName());
+        this.setCasNumber(saltForm.getCasNumber());
+        this.setChemist(saltForm.getChemist());
+        this.setCdId(saltForm.getCdId());
+        this.setIgnore(saltForm.getIgnore());
+        this.setId(saltForm.getId());
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getMolStructure() {
+        return molStructure;
+    }
+
+    public void setMolStructure(String molStructure) {
+        this.molStructure = molStructure;
+    }
+
+    public String getCorpName() {
+        return corpName;
+    }
+
+    public void setCorpName(String corpName) {
+        this.corpName = corpName;
+    }
+
     public String getCasNumber() {
         return this.casNumber;
     }
-    
+
     public void setCasNumber(String casNumber) {
         this.casNumber = casNumber;
     }
-    
+
     public String getChemist() {
         return this.chemist;
     }
-    
+
     public int getCdId() {
         return this.CdId;
     }
-    
+
     public void setCdId(int CdId) {
         this.CdId = CdId;
     }
-    
+
     public Boolean getIgnore() {
         return this.ignore;
     }
-    
+
     public void setIgnore(Boolean ignore) {
         this.ignore = ignore;
     }
-    
+
     public Set<IsoSalt> getIsosalts() {
         return this.isosalts;
     }
-    
+
     public void setIsosalts(Set<IsoSalt> isosalts) {
         this.isosalts = isosalts;
     }
-    
+
     public Set<Lot> getLots() {
         return this.lots;
     }
-    
+
     public void setLots(Set<Lot> lots) {
         this.lots = lots;
     }
 
-	public void setChemist(String chemist) {
+    public void setChemist(String chemist) {
         this.chemist = chemist;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static SaltFormDTO fromJsonToSaltFormDTO(String json) {
+    public static SaltFormDTO fromJsonToSaltFormDTO(String json) {
         return new JSONDeserializer<SaltFormDTO>()
-        .use(null, SaltFormDTO.class).deserialize(json);
+                .use(null, SaltFormDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<SaltFormDTO> collection) {
+    public static String toJsonArray(Collection<SaltFormDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<SaltFormDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<SaltFormDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<SaltFormDTO> fromJsonArrayToSaltFoes(String json) {
+    public static Collection<SaltFormDTO> fromJsonArrayToSaltFoes(String json) {
         return new JSONDeserializer<List<SaltFormDTO>>()
-        .use("values", SaltFormDTO.class).deserialize(json);
+                .use("values", SaltFormDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchCdIdReturnDTO.java b/src/main/java/com/labsynch/labseer/dto/SearchCdIdReturnDTO.java
index 2a18a31ec..2fc27b3c2 100644
--- a/src/main/java/com/labsynch/labseer/dto/SearchCdIdReturnDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SearchCdIdReturnDTO.java
@@ -9,81 +9,79 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
-public class SearchCdIdReturnDTO{
+public class SearchCdIdReturnDTO {
 
     private String corpName;
-    
-	private int CdId;
-    
-	private String stereoCategoryName;
 
-	private String stereoComment;
+    private int CdId;
+
+    private String stereoCategoryName;
 
+    private String stereoComment;
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getCorpName() {
+    public String getCorpName() {
         return this.corpName;
     }
 
-	public void setCorpName(String corpName) {
+    public void setCorpName(String corpName) {
         this.corpName = corpName;
     }
 
-	public int getCdId() {
+    public int getCdId() {
         return this.CdId;
     }
 
-	public void setCdId(int CdId) {
+    public void setCdId(int CdId) {
         this.CdId = CdId;
     }
 
-	public String getStereoCategoryName() {
+    public String getStereoCategoryName() {
         return this.stereoCategoryName;
     }
 
-	public void setStereoCategoryName(String stereoCategoryName) {
+    public void setStereoCategoryName(String stereoCategoryName) {
         this.stereoCategoryName = stereoCategoryName;
     }
 
-	public String getStereoComment() {
+    public String getStereoComment() {
         return this.stereoComment;
     }
 
-	public void setStereoComment(String stereoComment) {
+    public void setStereoComment(String stereoComment) {
         this.stereoComment = stereoComment;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static SearchCdIdReturnDTO fromJsonToSearchCdIdReturnDTO(String json) {
+    public static SearchCdIdReturnDTO fromJsonToSearchCdIdReturnDTO(String json) {
         return new JSONDeserializer<SearchCdIdReturnDTO>()
-        .use(null, SearchCdIdReturnDTO.class).deserialize(json);
+                .use(null, SearchCdIdReturnDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<SearchCdIdReturnDTO> collection) {
+    public static String toJsonArray(Collection<SearchCdIdReturnDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<SearchCdIdReturnDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<SearchCdIdReturnDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<SearchCdIdReturnDTO> fromJsonArrayToSearchCdIdReturnDTO(String json) {
+    public static Collection<SearchCdIdReturnDTO> fromJsonArrayToSearchCdIdReturnDTO(String json) {
         return new JSONDeserializer<List<SearchCdIdReturnDTO>>()
-        .use("values", SearchCdIdReturnDTO.class).deserialize(json);
+                .use("values", SearchCdIdReturnDTO.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchCompoundReturnDTO.java b/src/main/java/com/labsynch/labseer/dto/SearchCompoundReturnDTO.java
index 8649782c4..d5790998f 100755
--- a/src/main/java/com/labsynch/labseer/dto/SearchCompoundReturnDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SearchCompoundReturnDTO.java
@@ -12,105 +12,104 @@
 import flexjson.JSONSerializer;
 import flexjson.transformer.DateTransformer;
 
-
-public class SearchCompoundReturnDTO{
+public class SearchCompoundReturnDTO {
 
     private String corpName;
-    
+
     private String corpNameType;
-    
-    private List<ParentAliasDTO> parentAliases;
 
-	private String stereoCategoryName;
+    private List<ParentAliasDTO> parentAliases;
 
-	private String stereoComment;
+    private String stereoCategoryName;
 
-	private List<SearchLotDTO> lotIDs = new ArrayList<SearchLotDTO>();
+    private String stereoComment;
 
-	private String molStructure;
+    private List<SearchLotDTO> lotIDs = new ArrayList<SearchLotDTO>();
 
+    private String molStructure;
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer().exclude("*.class")
-        		.transform( new DateTransformer( "MM/dd/yyyy"), Date.class)
-        		.serialize(this);
+                .transform(new DateTransformer("MM/dd/yyyy"), Date.class)
+                .serialize(this);
     }
 
-	public static SearchCompoundReturnDTO fromJsonToSearchCompoundReturnDTO(String json) {
+    public static SearchCompoundReturnDTO fromJsonToSearchCompoundReturnDTO(String json) {
         return new JSONDeserializer<SearchCompoundReturnDTO>().use(null, SearchCompoundReturnDTO.class)
-        		.use( Date.class, new DateTransformer( "MM/dd/yyyy"))
-        		.deserialize(json);
+                .use(Date.class, new DateTransformer("MM/dd/yyyy"))
+                .deserialize(json);
     }
 
-	public static String toJsonArray(Collection<SearchCompoundReturnDTO> collection) {
+    public static String toJsonArray(Collection<SearchCompoundReturnDTO> collection) {
         return new JSONSerializer().exclude("*.class").include("lotIDs", "parentAliases")
-        		.transform( new DateTransformer( "MM/dd/yyyy"), Date.class)
-        		.serialize(collection);
+                .transform(new DateTransformer("MM/dd/yyyy"), Date.class)
+                .serialize(collection);
     }
 
-	public static Collection<SearchCompoundReturnDTO> fromJsonArrayToSearchCompoes(String json) {
-        return new JSONDeserializer<List<SearchCompoundReturnDTO>>().use(null, ArrayList.class).use("values", SearchCompoundReturnDTO.class)
-        		.use( Date.class, new DateTransformer( "MM/dd/yyyy"))
-        		.deserialize(json);
+    public static Collection<SearchCompoundReturnDTO> fromJsonArrayToSearchCompoes(String json) {
+        return new JSONDeserializer<List<SearchCompoundReturnDTO>>().use(null, ArrayList.class)
+                .use("values", SearchCompoundReturnDTO.class)
+                .use(Date.class, new DateTransformer("MM/dd/yyyy"))
+                .deserialize(json);
     }
 
-	public String getCorpName() {
+    public String getCorpName() {
         return this.corpName;
     }
 
-	public void setCorpName(String corpName) {
+    public void setCorpName(String corpName) {
         this.corpName = corpName;
     }
 
-	public String getCorpNameType() {
+    public String getCorpNameType() {
         return this.corpNameType;
     }
 
-	public void setCorpNameType(String corpNameType) {
+    public void setCorpNameType(String corpNameType) {
         this.corpNameType = corpNameType;
     }
 
-	public List<ParentAliasDTO> getParentAliases() {
+    public List<ParentAliasDTO> getParentAliases() {
         return this.parentAliases;
     }
 
-	public void setParentAliases(List<ParentAliasDTO> parentAliases) {
+    public void setParentAliases(List<ParentAliasDTO> parentAliases) {
         this.parentAliases = parentAliases;
     }
 
-	public String getStereoCategoryName() {
+    public String getStereoCategoryName() {
         return this.stereoCategoryName;
     }
 
-	public void setStereoCategoryName(String stereoCategoryName) {
+    public void setStereoCategoryName(String stereoCategoryName) {
         this.stereoCategoryName = stereoCategoryName;
     }
 
-	public String getStereoComment() {
+    public String getStereoComment() {
         return this.stereoComment;
     }
 
-	public void setStereoComment(String stereoComment) {
+    public void setStereoComment(String stereoComment) {
         this.stereoComment = stereoComment;
     }
 
-	public List<SearchLotDTO> getLotIDs() {
+    public List<SearchLotDTO> getLotIDs() {
         return this.lotIDs;
     }
 
-	public void setLotIDs(List<SearchLotDTO> lotIDs) {
+    public void setLotIDs(List<SearchLotDTO> lotIDs) {
         this.lotIDs = lotIDs;
     }
 
-	public String getMolStructure() {
+    public String getMolStructure() {
         return this.molStructure;
     }
 
-	public void setMolStructure(String molStructure) {
+    public void setMolStructure(String molStructure) {
         this.molStructure = molStructure;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchFormDTO.java b/src/main/java/com/labsynch/labseer/dto/SearchFormDTO.java
index 8f07e55c7..6c3303b50 100755
--- a/src/main/java/com/labsynch/labseer/dto/SearchFormDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SearchFormDTO.java
@@ -7,280 +7,277 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 import flexjson.transformer.DateTransformer;
 
+public class SearchFormDTO {
+
+    private String corpNameList;
+
+    private List<String> projects;
+
+    private List<String> formattedCorpNameList;
+
+    private String corpNameFrom;
+
+    private String corpNameTo;
+
+    private String aliasContSelect;
+
+    private String alias;
+
+    private String dateFrom;
+
+    private String dateTo;
+
+    private Date minSynthDate;
+
+    private Date maxSynthDate;
+
+    private String searchType;
+
+    private Float percentSimilarity;
+
+    private String chemist;
+
+    private String molStructure;
+
+    private Long buidNumber;
+
+    private Long minParentNumber;
+
+    private Long maxParentNumber;
+
+    private String parentCorpName;
+
+    private String saltFormCorpName;
+
+    private String lotCorpName;
+
+    private boolean valuesSet;
+
+    private String loggedInUser;
+
+    private Integer maxResults;
 
-public class SearchFormDTO{
-
-	private String corpNameList;
-	
-	private List<String> projects;
-
-	private List<String> formattedCorpNameList;
-
-	private String corpNameFrom;
-
-	private String corpNameTo;
-	
-	private String aliasContSelect;
-	
-	private String alias;
-	
-	private String dateFrom;
-    
-	private String dateTo;
-
-	private Date minSynthDate;
-    
-	private Date maxSynthDate;
-	
-	private String searchType;
-
-	private Float percentSimilarity;
-
-	private String chemist;
-	
-	private String molStructure;
-	
-	private Long buidNumber;
-
-	private Long minParentNumber;
-	
-	private Long maxParentNumber;
-	
-	private String parentCorpName;
-	
-	private String saltFormCorpName;
-	
-	private String lotCorpName;
-	
-	private boolean valuesSet;
-	
-	private String loggedInUser;
-	
-	private Integer maxResults;
-  
-
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer().exclude("*.class")
-        		.transform( new DateTransformer( "MM/dd/yyyy"), Date.class)
-        		.serialize(this);
+                .transform(new DateTransformer("MM/dd/yyyy"), Date.class)
+                .serialize(this);
     }
 
-	public static SearchFormDTO fromJsonToSearchFormDTO(String json) {
+    public static SearchFormDTO fromJsonToSearchFormDTO(String json) {
         return new JSONDeserializer<SearchFormDTO>().use(null, SearchFormDTO.class)
-        		.use( Date.class, new DateTransformer( "MM/dd/yyyy"))
-        		.deserialize(json);
+                .use(Date.class, new DateTransformer("MM/dd/yyyy"))
+                .deserialize(json);
     }
 
-	public static String toJsonArray(Collection<SearchFormDTO> collection) {
+    public static String toJsonArray(Collection<SearchFormDTO> collection) {
         return new JSONSerializer().exclude("*.class")
-        		.transform( new DateTransformer( "MM/dd/yyyy"), Date.class)
-        		.serialize(collection);
+                .transform(new DateTransformer("MM/dd/yyyy"), Date.class)
+                .serialize(collection);
     }
 
-	public static Collection<SearchFormDTO> fromJsonArrayToSearchFoes(String json) {
+    public static Collection<SearchFormDTO> fromJsonArrayToSearchFoes(String json) {
         return new JSONDeserializer<List<SearchFormDTO>>().use(null, ArrayList.class).use("values", SearchFormDTO.class)
-        		.use( Date.class, new DateTransformer( "MM/dd/yyyy"))
-        		.deserialize(json);
+                .use(Date.class, new DateTransformer("MM/dd/yyyy"))
+                .deserialize(json);
     }
 
-	public String getCorpNameList() {
+    public String getCorpNameList() {
         return this.corpNameList;
     }
 
-	public void setCorpNameList(String corpNameList) {
+    public void setCorpNameList(String corpNameList) {
         this.corpNameList = corpNameList;
     }
 
-	public List<String> getProjects() {
+    public List<String> getProjects() {
         return this.projects;
     }
 
-	public void setProjects(List<String> projects) {
+    public void setProjects(List<String> projects) {
         this.projects = projects;
     }
 
-	public List<String> getFormattedCorpNameList() {
+    public List<String> getFormattedCorpNameList() {
         return this.formattedCorpNameList;
     }
 
-	public void setFormattedCorpNameList(List<String> formattedCorpNameList) {
+    public void setFormattedCorpNameList(List<String> formattedCorpNameList) {
         this.formattedCorpNameList = formattedCorpNameList;
     }
 
-	public String getCorpNameFrom() {
+    public String getCorpNameFrom() {
         return this.corpNameFrom;
     }
 
-	public void setCorpNameFrom(String corpNameFrom) {
+    public void setCorpNameFrom(String corpNameFrom) {
         this.corpNameFrom = corpNameFrom;
     }
 
-	public String getCorpNameTo() {
+    public String getCorpNameTo() {
         return this.corpNameTo;
     }
 
-	public void setCorpNameTo(String corpNameTo) {
+    public void setCorpNameTo(String corpNameTo) {
         this.corpNameTo = corpNameTo;
     }
 
-	public String getAliasContSelect() {
+    public String getAliasContSelect() {
         return this.aliasContSelect;
     }
 
-	public void setAliasContSelect(String aliasContSelect) {
+    public void setAliasContSelect(String aliasContSelect) {
         this.aliasContSelect = aliasContSelect;
     }
 
-	public String getAlias() {
+    public String getAlias() {
         return this.alias;
     }
 
-	public void setAlias(String alias) {
+    public void setAlias(String alias) {
         this.alias = alias;
     }
 
-	public String getDateFrom() {
+    public String getDateFrom() {
         return this.dateFrom;
     }
 
-	public void setDateFrom(String dateFrom) {
+    public void setDateFrom(String dateFrom) {
         this.dateFrom = dateFrom;
     }
 
-	public String getDateTo() {
+    public String getDateTo() {
         return this.dateTo;
     }
 
-	public void setDateTo(String dateTo) {
+    public void setDateTo(String dateTo) {
         this.dateTo = dateTo;
     }
 
-	public Date getMinSynthDate() {
+    public Date getMinSynthDate() {
         return this.minSynthDate;
     }
 
-	public void setMinSynthDate(Date minSynthDate) {
+    public void setMinSynthDate(Date minSynthDate) {
         this.minSynthDate = minSynthDate;
     }
 
-	public Date getMaxSynthDate() {
+    public Date getMaxSynthDate() {
         return this.maxSynthDate;
     }
 
-	public void setMaxSynthDate(Date maxSynthDate) {
+    public void setMaxSynthDate(Date maxSynthDate) {
         this.maxSynthDate = maxSynthDate;
     }
 
-	public String getSearchType() {
+    public String getSearchType() {
         return this.searchType;
     }
 
-	public void setSearchType(String searchType) {
+    public void setSearchType(String searchType) {
         this.searchType = searchType;
     }
 
-	public Float getPercentSimilarity() {
+    public Float getPercentSimilarity() {
         return this.percentSimilarity;
     }
 
-	public void setPercentSimilarity(Float percentSimilarity) {
+    public void setPercentSimilarity(Float percentSimilarity) {
         this.percentSimilarity = percentSimilarity;
     }
 
-	public String getChemist() {
+    public String getChemist() {
         return this.chemist;
     }
 
-	public void setChemist(String chemist) {
+    public void setChemist(String chemist) {
         this.chemist = chemist;
     }
 
-	public String getMolStructure() {
+    public String getMolStructure() {
         return this.molStructure;
     }
 
-	public void setMolStructure(String molStructure) {
+    public void setMolStructure(String molStructure) {
         this.molStructure = molStructure;
     }
 
-	public Long getBuidNumber() {
+    public Long getBuidNumber() {
         return this.buidNumber;
     }
 
-	public void setBuidNumber(Long buidNumber) {
+    public void setBuidNumber(Long buidNumber) {
         this.buidNumber = buidNumber;
     }
 
-	public Long getMinParentNumber() {
+    public Long getMinParentNumber() {
         return this.minParentNumber;
     }
 
-	public void setMinParentNumber(Long minParentNumber) {
+    public void setMinParentNumber(Long minParentNumber) {
         this.minParentNumber = minParentNumber;
     }
 
-	public Long getMaxParentNumber() {
+    public Long getMaxParentNumber() {
         return this.maxParentNumber;
     }
 
-	public void setMaxParentNumber(Long maxParentNumber) {
+    public void setMaxParentNumber(Long maxParentNumber) {
         this.maxParentNumber = maxParentNumber;
     }
 
-	public String getParentCorpName() {
+    public String getParentCorpName() {
         return this.parentCorpName;
     }
 
-	public void setParentCorpName(String parentCorpName) {
+    public void setParentCorpName(String parentCorpName) {
         this.parentCorpName = parentCorpName;
     }
 
-	public String getSaltFormCorpName() {
+    public String getSaltFormCorpName() {
         return this.saltFormCorpName;
     }
 
-	public void setSaltFormCorpName(String saltFormCorpName) {
+    public void setSaltFormCorpName(String saltFormCorpName) {
         this.saltFormCorpName = saltFormCorpName;
     }
 
-	public String getLotCorpName() {
+    public String getLotCorpName() {
         return this.lotCorpName;
     }
 
-	public void setLotCorpName(String lotCorpName) {
+    public void setLotCorpName(String lotCorpName) {
         this.lotCorpName = lotCorpName;
     }
 
-	public boolean isValuesSet() {
+    public boolean isValuesSet() {
         return this.valuesSet;
     }
 
-	public void setValuesSet(boolean valuesSet) {
+    public void setValuesSet(boolean valuesSet) {
         this.valuesSet = valuesSet;
     }
 
-	public String getLoggedInUser() {
+    public String getLoggedInUser() {
         return this.loggedInUser;
     }
 
-	public void setLoggedInUser(String loggedInUser) {
+    public void setLoggedInUser(String loggedInUser) {
         this.loggedInUser = loggedInUser;
     }
 
-	public Integer getMaxResults() {
+    public Integer getMaxResults() {
         return this.maxResults;
     }
 
-	public void setMaxResults(Integer maxResults) {
+    public void setMaxResults(Integer maxResults) {
         this.maxResults = maxResults;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchFormReturnDTO.java b/src/main/java/com/labsynch/labseer/dto/SearchFormReturnDTO.java
index 52ab33201..6bdf8593b 100755
--- a/src/main/java/com/labsynch/labseer/dto/SearchFormReturnDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SearchFormReturnDTO.java
@@ -13,56 +13,56 @@
 import flexjson.JSONSerializer;
 import flexjson.transformer.DateTransformer;
 
+public class SearchFormReturnDTO {
 
-public class SearchFormReturnDTO{
-			 
 	private Collection<SearchCompoundReturnDTO> foundCompounds = new HashSet<SearchCompoundReturnDTO>();
-	
-	private boolean lotsWithheld;
 
+	private boolean lotsWithheld;
 
 	public String toJson() {
-        return new JSONSerializer().exclude("*.class").include("foundCompounds","foundCompounds.lotIDs","foundCompounds.parentAliases")
-        		.transform( new DateTransformer( "MM/dd/yyyy"), Date.class)
-        		.serialize(this);
-    }
+		return new JSONSerializer().exclude("*.class")
+				.include("foundCompounds", "foundCompounds.lotIDs", "foundCompounds.parentAliases")
+				.transform(new DateTransformer("MM/dd/yyyy"), Date.class)
+				.serialize(this);
+	}
 
 	public static SearchFormReturnDTO fromJsonToSearchFormReturnDTO(String json) {
-        return new JSONDeserializer<SearchFormReturnDTO>().use(null, SearchFormReturnDTO.class)
-        		.use( Date.class, new DateTransformer( "MM/dd/yyyy"))
-        		.deserialize(json);
-    }
+		return new JSONDeserializer<SearchFormReturnDTO>().use(null, SearchFormReturnDTO.class)
+				.use(Date.class, new DateTransformer("MM/dd/yyyy"))
+				.deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<SearchFormReturnDTO> collection) {
-        return new JSONSerializer().exclude("*.class").include("foundCompounds","foundCompounds.lotIDs","foundCompounds.parentAliases")
-        		.transform( new DateTransformer( "MM/dd/yyyy"), Date.class)
-        		.serialize(collection);
-    }
+		return new JSONSerializer().exclude("*.class")
+				.include("foundCompounds", "foundCompounds.lotIDs", "foundCompounds.parentAliases")
+				.transform(new DateTransformer("MM/dd/yyyy"), Date.class)
+				.serialize(collection);
+	}
 
 	public static Collection<SearchFormReturnDTO> fromJsonArrayToSearchFoes(String json) {
-        return new JSONDeserializer<List<SearchFormReturnDTO>>().use(null, ArrayList.class).use("values", SearchFormReturnDTO.class)
-        		.use( Date.class, new DateTransformer( "MM/dd/yyyy"))
-        		.deserialize(json);
-    }
-
+		return new JSONDeserializer<List<SearchFormReturnDTO>>().use(null, ArrayList.class)
+				.use("values", SearchFormReturnDTO.class)
+				.use(Date.class, new DateTransformer("MM/dd/yyyy"))
+				.deserialize(json);
+	}
 
 	public Collection<SearchCompoundReturnDTO> getFoundCompounds() {
-        return this.foundCompounds;
-    }
+		return this.foundCompounds;
+	}
 
 	public void setFoundCompounds(Collection<SearchCompoundReturnDTO> foundCompounds) {
-        this.foundCompounds = foundCompounds;
-    }
+		this.foundCompounds = foundCompounds;
+	}
 
 	public boolean isLotsWithheld() {
-        return this.lotsWithheld;
-    }
+		return this.lotsWithheld;
+	}
 
 	public void setLotsWithheld(boolean lotsWithheld) {
-        this.lotsWithheld = lotsWithheld;
-    }
+		this.lotsWithheld = lotsWithheld;
+	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchLotDTO.java b/src/main/java/com/labsynch/labseer/dto/SearchLotDTO.java
index 9d9987ecf..96cd31f7f 100755
--- a/src/main/java/com/labsynch/labseer/dto/SearchLotDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SearchLotDTO.java
@@ -11,95 +11,93 @@
 import flexjson.JSONSerializer;
 import flexjson.transformer.DateTransformer;
 
-
 public class SearchLotDTO {
 
     private String corpName;
 
     private int lotNumber;
-    
+
     private long buid;
 
     private List<LotAliasDTO> lotAliases;
-    
+
     private Date registrationDate;
 
     private Date synthesisDate;
 
-    
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer().exclude("*.class")
-        		.transform( new DateTransformer( "MM/dd/yyyy"), Date.class)
-        		.serialize(this);
+                .transform(new DateTransformer("MM/dd/yyyy"), Date.class)
+                .serialize(this);
     }
 
-	public static SearchLotDTO fromJsonToSearchLotDTO(String json) {
+    public static SearchLotDTO fromJsonToSearchLotDTO(String json) {
         return new JSONDeserializer<SearchLotDTO>().use(null, SearchLotDTO.class)
-        		.use( Date.class, new DateTransformer( "MM/dd/yyyy"))
-        		.deserialize(json);
+                .use(Date.class, new DateTransformer("MM/dd/yyyy"))
+                .deserialize(json);
     }
 
-	public static String toJsonArray(Collection<SearchLotDTO> collection) {
+    public static String toJsonArray(Collection<SearchLotDTO> collection) {
         return new JSONSerializer().exclude("*.class")
-        		.transform( new DateTransformer( "MM/dd/yyyy"), Date.class)
-        		.serialize(collection);
+                .transform(new DateTransformer("MM/dd/yyyy"), Date.class)
+                .serialize(collection);
     }
 
-	public static Collection<SearchLotDTO> fromJsonArrayToSearchLoes(String json) {
+    public static Collection<SearchLotDTO> fromJsonArrayToSearchLoes(String json) {
         return new JSONDeserializer<List<SearchLotDTO>>().use(null, ArrayList.class).use("values", SearchLotDTO.class)
-        		.use( Date.class, new DateTransformer( "MM/dd/yyyy"))
-        		.deserialize(json);
+                .use(Date.class, new DateTransformer("MM/dd/yyyy"))
+                .deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getCorpName() {
+    public String getCorpName() {
         return this.corpName;
     }
 
-	public void setCorpName(String corpName) {
+    public void setCorpName(String corpName) {
         this.corpName = corpName;
     }
 
-	public int getLotNumber() {
+    public int getLotNumber() {
         return this.lotNumber;
     }
 
-	public void setLotNumber(int lotNumber) {
+    public void setLotNumber(int lotNumber) {
         this.lotNumber = lotNumber;
     }
 
-	public long getBuid() {
+    public long getBuid() {
         return this.buid;
     }
 
-	public void setBuid(long buid) {
+    public void setBuid(long buid) {
         this.buid = buid;
     }
 
-	public List<LotAliasDTO> getLotAliases() {
+    public List<LotAliasDTO> getLotAliases() {
         return this.lotAliases;
     }
 
-	public void setLotAliases(List<LotAliasDTO> lotAliases) {
+    public void setLotAliases(List<LotAliasDTO> lotAliases) {
         this.lotAliases = lotAliases;
     }
 
-	public Date getRegistrationDate() {
+    public Date getRegistrationDate() {
         return this.registrationDate;
     }
 
-	public void setRegistrationDate(Date registrationDate) {
+    public void setRegistrationDate(Date registrationDate) {
         this.registrationDate = registrationDate;
     }
 
-	public Date getSynthesisDate() {
+    public Date getSynthesisDate() {
         return this.synthesisDate;
     }
 
-	public void setSynthesisDate(Date synthesisDate) {
+    public void setSynthesisDate(Date synthesisDate) {
         this.synthesisDate = synthesisDate;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/SearchResultExportRequestDTO.java b/src/main/java/com/labsynch/labseer/dto/SearchResultExportRequestDTO.java
index a796ad249..4ad66dc29 100644
--- a/src/main/java/com/labsynch/labseer/dto/SearchResultExportRequestDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SearchResultExportRequestDTO.java
@@ -9,64 +9,63 @@
 import java.util.Collection;
 import java.util.List;
 
-
 public class SearchResultExportRequestDTO {
 
     private String filePath;
-    
+
     private SearchFormReturnDTO searchFormResultsDTO;
-    
-    public SearchResultExportRequestDTO(){
-    	
+
+    public SearchResultExportRequestDTO() {
+
     }
-    
-    public SearchResultExportRequestDTO(String filePath, SearchFormReturnDTO searchFormResultsDTO){
-    	this.filePath = filePath;
-    	this.searchFormResultsDTO = searchFormResultsDTO;
+
+    public SearchResultExportRequestDTO(String filePath, SearchFormReturnDTO searchFormResultsDTO) {
+        this.filePath = filePath;
+        this.searchFormResultsDTO = searchFormResultsDTO;
     }
-    
+
     public String toJson() {
-        return new JSONSerializer().include("searchFormResultsDTO.foundCompounds.lotIDs").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().include("searchFormResultsDTO.foundCompounds.lotIDs").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
-    
 
-	public String getFilePath() {
+    public String getFilePath() {
         return this.filePath;
     }
 
-	public void setFilePath(String filePath) {
+    public void setFilePath(String filePath) {
         this.filePath = filePath;
     }
 
-	public SearchFormReturnDTO getSearchFormResultsDTO() {
+    public SearchFormReturnDTO getSearchFormResultsDTO() {
         return this.searchFormResultsDTO;
     }
 
-	public void setSearchFormResultsDTO(SearchFormReturnDTO searchFormResultsDTO) {
+    public void setSearchFormResultsDTO(SearchFormReturnDTO searchFormResultsDTO) {
         this.searchFormResultsDTO = searchFormResultsDTO;
     }
 
-	public static SearchResultExportRequestDTO fromJsonToSearchResultExportRequestDTO(String json) {
+    public static SearchResultExportRequestDTO fromJsonToSearchResultExportRequestDTO(String json) {
         return new JSONDeserializer<SearchResultExportRequestDTO>()
-        .use(null, SearchResultExportRequestDTO.class).deserialize(json);
+                .use(null, SearchResultExportRequestDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<SearchResultExportRequestDTO> collection) {
+    public static String toJsonArray(Collection<SearchResultExportRequestDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<SearchResultExportRequestDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<SearchResultExportRequestDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<SearchResultExportRequestDTO> fromJsonArrayToSearchResultExpoes(String json) {
+    public static Collection<SearchResultExportRequestDTO> fromJsonArrayToSearchResultExpoes(String json) {
         return new JSONDeserializer<List<SearchResultExportRequestDTO>>()
-        .use("values", SearchResultExportRequestDTO.class).deserialize(json);
+                .use("values", SearchResultExportRequestDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/SetTubeLocationDTO.java b/src/main/java/com/labsynch/labseer/dto/SetTubeLocationDTO.java
index 4769ee86b..bd0570273 100644
--- a/src/main/java/com/labsynch/labseer/dto/SetTubeLocationDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SetTubeLocationDTO.java
@@ -1,6 +1,5 @@
 package com.labsynch.labseer.dto;
 
-
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
@@ -11,91 +10,89 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class SetTubeLocationDTO {
 
-	private String barcode;
-	
-	private String locationBreadCrumb;
-		
-	private String user;
-		
-	private Date date;
-	
-	private String rootLabel;
-	
-
-	public String toString() {
+    private String barcode;
+
+    private String locationBreadCrumb;
+
+    private String user;
+
+    private Date date;
+
+    private String rootLabel;
+
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getBarcode() {
+    public String getBarcode() {
         return this.barcode;
     }
 
-	public void setBarcode(String barcode) {
+    public void setBarcode(String barcode) {
         this.barcode = barcode;
     }
 
-	public String getLocationBreadCrumb() {
+    public String getLocationBreadCrumb() {
         return this.locationBreadCrumb;
     }
 
-	public void setLocationBreadCrumb(String locationBreadCrumb) {
+    public void setLocationBreadCrumb(String locationBreadCrumb) {
         this.locationBreadCrumb = locationBreadCrumb;
     }
 
-	public String getUser() {
+    public String getUser() {
         return this.user;
     }
 
-	public void setUser(String user) {
+    public void setUser(String user) {
         this.user = user;
     }
 
-	public Date getDate() {
+    public Date getDate() {
         return this.date;
     }
 
-	public void setDate(Date date) {
+    public void setDate(Date date) {
         this.date = date;
     }
 
-	public String getRootLabel() {
+    public String getRootLabel() {
         return this.rootLabel;
     }
 
-	public void setRootLabel(String rootLabel) {
+    public void setRootLabel(String rootLabel) {
         this.rootLabel = rootLabel;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static SetTubeLocationDTO fromJsonToSetTubeLocationDTO(String json) {
+    public static SetTubeLocationDTO fromJsonToSetTubeLocationDTO(String json) {
         return new JSONDeserializer<SetTubeLocationDTO>()
-        .use(null, SetTubeLocationDTO.class).deserialize(json);
+                .use(null, SetTubeLocationDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<SetTubeLocationDTO> collection) {
+    public static String toJsonArray(Collection<SetTubeLocationDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<SetTubeLocationDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<SetTubeLocationDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<SetTubeLocationDTO> fromJsonArrayToSetTubeLocatioes(String json) {
+    public static Collection<SetTubeLocationDTO> fromJsonArrayToSetTubeLocatioes(String json) {
         return new JSONDeserializer<List<SetTubeLocationDTO>>()
-        .use("values", SetTubeLocationDTO.class).deserialize(json);
+                .use("values", SetTubeLocationDTO.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/SimpleBulkLoadPropertyDTO.java b/src/main/java/com/labsynch/labseer/dto/SimpleBulkLoadPropertyDTO.java
index 28fc99eaa..62e320555 100644
--- a/src/main/java/com/labsynch/labseer/dto/SimpleBulkLoadPropertyDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SimpleBulkLoadPropertyDTO.java
@@ -9,141 +9,168 @@
 import java.util.Collection;
 import java.util.List;
 
-
 public class SimpleBulkLoadPropertyDTO {
 
-    private String name;
-    
-    private String dataType;
-    
-    private Boolean required;
-    
+	private String name;
+
+	private String dataType;
+
+	private Boolean required;
+
 	private Integer displayOrder;
-	
-    private Boolean ignored;
-    
-    public SimpleBulkLoadPropertyDTO(){
-    	
-    }
-    
-    public SimpleBulkLoadPropertyDTO(String name){
-    	this.name = name;
-    }
-    
-    public String toJson() {
-        return new JSONSerializer().exclude("*.class", "class").include("name","dataType","required","displayOrder","ignored").transform(new ExcludeNulls(), void.class).serialize(this);
-    }
-    
-    @Override
-    public int hashCode(){
-    	int nameHashCode = 0;
-    	int dataTypeHashCode = 0;
-    	int requiredHashCode = 0;
-    	int displayOrderHashCode = 0;
-    	int ignoredHashCode = 0;
-    	if (name != null) nameHashCode+=name.hashCode();
-    	if (dataType != null) dataTypeHashCode+=dataType.hashCode();
-    	if (required != null) requiredHashCode+=required.hashCode();
-    	if (displayOrder != null) displayOrderHashCode+=displayOrder.hashCode();
-    	if (ignored != null) ignoredHashCode+=ignored.hashCode();
-    	return nameHashCode + dataTypeHashCode + requiredHashCode + displayOrderHashCode + ignoredHashCode;
-    }
-    
-    @Override
-    public boolean equals(Object that){
-    	if (that.getClass() != SimpleBulkLoadPropertyDTO.class) return false;
-    	else{
-    		SimpleBulkLoadPropertyDTO thatDTO = (SimpleBulkLoadPropertyDTO) that;
-    		boolean nameEqual = false;
-    		if (this.name == null && thatDTO.name == null) nameEqual = true;
-    		else if (this.name == null && thatDTO.name != null) nameEqual = false;
-    		else if (this.name != null && thatDTO.name == null) nameEqual = false;
-    		else if (this.name != null && thatDTO.name != null) nameEqual = this.name.equals(thatDTO.name);
-    		boolean dataTypeEqual = false;
-    		if (this.dataType == null && thatDTO.dataType == null) dataTypeEqual = true;
-    		else if (this.dataType == null && thatDTO.dataType != null) dataTypeEqual = false;
-    		else if (this.dataType != null && thatDTO.dataType == null) dataTypeEqual = false;
-    		else if (this.dataType != null && thatDTO.dataType != null) dataTypeEqual = this.dataType.equals(thatDTO.dataType);
-    		boolean requiredEqual = false;
-    		if (this.required == null && thatDTO.required == null) requiredEqual = true;
-    		else if (this.required == null && thatDTO.required != null) requiredEqual = false;
-    		else if (this.required != null && thatDTO.required == null) requiredEqual = false;
-    		else if (this.required != null && thatDTO.required != null) requiredEqual = this.required.equals(thatDTO.required);
-    		boolean displayOrderEqual = false;
-    		if (this.displayOrder == null && thatDTO.displayOrder == null) displayOrderEqual = true;
-    		else if (this.displayOrder == null && thatDTO.displayOrder != null) displayOrderEqual = false;
-    		else if (this.displayOrder != null && thatDTO.displayOrder == null) displayOrderEqual = false;
-    		else if (this.displayOrder != null && thatDTO.displayOrder != null) displayOrderEqual = this.displayOrder.equals(thatDTO.displayOrder);
-    		boolean ignoredEqual = false;
-    		if (this.ignored == null && thatDTO.ignored == null) ignoredEqual = true;
-    		else if (this.ignored == null && thatDTO.ignored != null) ignoredEqual = false;
-    		else if (this.ignored != null && thatDTO.ignored == null) ignoredEqual = false;
-    		else if (this.ignored != null && thatDTO.ignored != null) ignoredEqual = this.ignored.equals(thatDTO.ignored);
-    		return (nameEqual & dataTypeEqual & requiredEqual & displayOrderEqual & ignoredEqual);
-    	}
-    }
+
+	private Boolean ignored;
+
+	public SimpleBulkLoadPropertyDTO() {
+
+	}
+
+	public SimpleBulkLoadPropertyDTO(String name) {
+		this.name = name;
+	}
+
+	public String toJson() {
+		return new JSONSerializer().exclude("*.class", "class")
+				.include("name", "dataType", "required", "displayOrder", "ignored")
+				.transform(new ExcludeNulls(), void.class).serialize(this);
+	}
+
+	@Override
+	public int hashCode() {
+		int nameHashCode = 0;
+		int dataTypeHashCode = 0;
+		int requiredHashCode = 0;
+		int displayOrderHashCode = 0;
+		int ignoredHashCode = 0;
+		if (name != null)
+			nameHashCode += name.hashCode();
+		if (dataType != null)
+			dataTypeHashCode += dataType.hashCode();
+		if (required != null)
+			requiredHashCode += required.hashCode();
+		if (displayOrder != null)
+			displayOrderHashCode += displayOrder.hashCode();
+		if (ignored != null)
+			ignoredHashCode += ignored.hashCode();
+		return nameHashCode + dataTypeHashCode + requiredHashCode + displayOrderHashCode + ignoredHashCode;
+	}
+
+	@Override
+	public boolean equals(Object that) {
+		if (that.getClass() != SimpleBulkLoadPropertyDTO.class)
+			return false;
+		else {
+			SimpleBulkLoadPropertyDTO thatDTO = (SimpleBulkLoadPropertyDTO) that;
+			boolean nameEqual = false;
+			if (this.name == null && thatDTO.name == null)
+				nameEqual = true;
+			else if (this.name == null && thatDTO.name != null)
+				nameEqual = false;
+			else if (this.name != null && thatDTO.name == null)
+				nameEqual = false;
+			else if (this.name != null && thatDTO.name != null)
+				nameEqual = this.name.equals(thatDTO.name);
+			boolean dataTypeEqual = false;
+			if (this.dataType == null && thatDTO.dataType == null)
+				dataTypeEqual = true;
+			else if (this.dataType == null && thatDTO.dataType != null)
+				dataTypeEqual = false;
+			else if (this.dataType != null && thatDTO.dataType == null)
+				dataTypeEqual = false;
+			else if (this.dataType != null && thatDTO.dataType != null)
+				dataTypeEqual = this.dataType.equals(thatDTO.dataType);
+			boolean requiredEqual = false;
+			if (this.required == null && thatDTO.required == null)
+				requiredEqual = true;
+			else if (this.required == null && thatDTO.required != null)
+				requiredEqual = false;
+			else if (this.required != null && thatDTO.required == null)
+				requiredEqual = false;
+			else if (this.required != null && thatDTO.required != null)
+				requiredEqual = this.required.equals(thatDTO.required);
+			boolean displayOrderEqual = false;
+			if (this.displayOrder == null && thatDTO.displayOrder == null)
+				displayOrderEqual = true;
+			else if (this.displayOrder == null && thatDTO.displayOrder != null)
+				displayOrderEqual = false;
+			else if (this.displayOrder != null && thatDTO.displayOrder == null)
+				displayOrderEqual = false;
+			else if (this.displayOrder != null && thatDTO.displayOrder != null)
+				displayOrderEqual = this.displayOrder.equals(thatDTO.displayOrder);
+			boolean ignoredEqual = false;
+			if (this.ignored == null && thatDTO.ignored == null)
+				ignoredEqual = true;
+			else if (this.ignored == null && thatDTO.ignored != null)
+				ignoredEqual = false;
+			else if (this.ignored != null && thatDTO.ignored == null)
+				ignoredEqual = false;
+			else if (this.ignored != null && thatDTO.ignored != null)
+				ignoredEqual = this.ignored.equals(thatDTO.ignored);
+			return (nameEqual & dataTypeEqual & requiredEqual & displayOrderEqual & ignoredEqual);
+		}
+	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 
 	public String getName() {
-        return this.name;
-    }
+		return this.name;
+	}
 
 	public void setName(String name) {
-        this.name = name;
-    }
+		this.name = name;
+	}
 
 	public String getDataType() {
-        return this.dataType;
-    }
+		return this.dataType;
+	}
 
 	public void setDataType(String dataType) {
-        this.dataType = dataType;
-    }
+		this.dataType = dataType;
+	}
 
 	public Boolean getRequired() {
-        return this.required;
-    }
+		return this.required;
+	}
 
 	public void setRequired(Boolean required) {
-        this.required = required;
-    }
+		this.required = required;
+	}
 
 	public Integer getDisplayOrder() {
-        return this.displayOrder;
-    }
+		return this.displayOrder;
+	}
 
 	public void setDisplayOrder(Integer displayOrder) {
-        this.displayOrder = displayOrder;
-    }
+		this.displayOrder = displayOrder;
+	}
 
 	public Boolean getIgnored() {
-        return this.ignored;
-    }
+		return this.ignored;
+	}
 
 	public void setIgnored(Boolean ignored) {
-        this.ignored = ignored;
-    }
+		this.ignored = ignored;
+	}
 
 	public static SimpleBulkLoadPropertyDTO fromJsonToSimpleBulkLoadPropertyDTO(String json) {
-        return new JSONDeserializer<SimpleBulkLoadPropertyDTO>()
-        .use(null, SimpleBulkLoadPropertyDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<SimpleBulkLoadPropertyDTO>()
+				.use(null, SimpleBulkLoadPropertyDTO.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<SimpleBulkLoadPropertyDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<SimpleBulkLoadPropertyDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<SimpleBulkLoadPropertyDTO> fromJsonArrayToSimpleBulkLoadProes(String json) {
-        return new JSONDeserializer<List<SimpleBulkLoadPropertyDTO>>()
-        .use("values", SimpleBulkLoadPropertyDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<SimpleBulkLoadPropertyDTO>>()
+				.use("values", SimpleBulkLoadPropertyDTO.class).deserialize(json);
+	}
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/StandardizationDryRunSearchDTO.java b/src/main/java/com/labsynch/labseer/dto/StandardizationDryRunSearchDTO.java
index 321a93b55..28c37d6dd 100755
--- a/src/main/java/com/labsynch/labseer/dto/StandardizationDryRunSearchDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StandardizationDryRunSearchDTO.java
@@ -9,9 +9,6 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-
-
-
 public class StandardizationDryRunSearchDTO {
 
     public static class NumericWithOperator {
@@ -21,6 +18,7 @@ public static class NumericWithOperator {
         public NumericWithOperator() {
 
         }
+
         public NumericWithOperator(Double value, String operator) {
             this.value = value;
             this.operator = operator;
@@ -43,7 +41,7 @@ public void setOperator(String operator) {
         }
 
     }
-    
+
     private NumericWithOperator oldMolWeight;
 
     private NumericWithOperator newMolWeight;
@@ -72,150 +70,149 @@ public void setOperator(String operator) {
 
     private RegistrationStatus[] registrationStatuses;
 
-
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static StandardizationDryRunSearchDTO fromJsonToStandardizationDryRunSearchDTO(String json) {
+    public static StandardizationDryRunSearchDTO fromJsonToStandardizationDryRunSearchDTO(String json) {
         return new JSONDeserializer<StandardizationDryRunSearchDTO>()
-        .use(null, StandardizationDryRunSearchDTO.class).deserialize(json);
+                .use(null, StandardizationDryRunSearchDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<StandardizationDryRunSearchDTO> collection) {
+    public static String toJsonArray(Collection<StandardizationDryRunSearchDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<StandardizationDryRunSearchDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<StandardizationDryRunSearchDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<StandardizationDryRunSearchDTO> fromJsonArrayToStandardizatioes(String json) {
+    public static Collection<StandardizationDryRunSearchDTO> fromJsonArrayToStandardizatioes(String json) {
         return new JSONDeserializer<List<StandardizationDryRunSearchDTO>>()
-        .use("values", StandardizationDryRunSearchDTO.class).deserialize(json);
+                .use("values", StandardizationDryRunSearchDTO.class).deserialize(json);
     }
 
-	public NumericWithOperator getOldMolWeight() {
+    public NumericWithOperator getOldMolWeight() {
         return this.oldMolWeight;
     }
 
-	public void setOldMolWeight(NumericWithOperator oldMolWeight) {
+    public void setOldMolWeight(NumericWithOperator oldMolWeight) {
         this.oldMolWeight = oldMolWeight;
     }
 
-	public NumericWithOperator getNewMolWeight() {
+    public NumericWithOperator getNewMolWeight() {
         return this.newMolWeight;
     }
 
-	public void setNewMolWeight(NumericWithOperator newMolWeight) {
+    public void setNewMolWeight(NumericWithOperator newMolWeight) {
         this.newMolWeight = newMolWeight;
     }
 
-	public NumericWithOperator getDeltaMolWeight() {
+    public NumericWithOperator getDeltaMolWeight() {
         return this.deltaMolWeight;
     }
 
-	public void setDeltaMolWeight(NumericWithOperator deltaMolWeight) {
+    public void setDeltaMolWeight(NumericWithOperator deltaMolWeight) {
         this.deltaMolWeight = deltaMolWeight;
     }
 
-	public String[] getCorpNames() {
+    public String[] getCorpNames() {
         return this.corpNames;
     }
 
-	public void setCorpNames(String[] corpNames) {
+    public void setCorpNames(String[] corpNames) {
         this.corpNames = corpNames;
     }
 
-	public Boolean getIncludeCorpNames() {
+    public Boolean getIncludeCorpNames() {
         return this.includeCorpNames;
     }
 
-	public void setIncludeCorpNames(Boolean includeCorpNames) {
+    public void setIncludeCorpNames(Boolean includeCorpNames) {
         this.includeCorpNames = includeCorpNames;
     }
 
-	public Boolean getHasNewDuplicates() {
+    public Boolean getHasNewDuplicates() {
         return this.hasNewDuplicates;
     }
 
-	public void setHasNewDuplicates(Boolean hasNewDuplicates) {
+    public void setHasNewDuplicates(Boolean hasNewDuplicates) {
         this.hasNewDuplicates = hasNewDuplicates;
     }
 
-	public Boolean getHasExistingDuplicates() {
+    public Boolean getHasExistingDuplicates() {
         return this.hasExistingDuplicates;
     }
 
-	public void setHasExistingDuplicates(Boolean hasExistingDuplicates) {
+    public void setHasExistingDuplicates(Boolean hasExistingDuplicates) {
         this.hasExistingDuplicates = hasExistingDuplicates;
     }
 
-	public Boolean getAsDrawnDisplayChange() {
+    public Boolean getAsDrawnDisplayChange() {
         return this.asDrawnDisplayChange;
     }
 
-	public void setAsDrawnDisplayChange(Boolean asDrawnDisplayChange) {
+    public void setAsDrawnDisplayChange(Boolean asDrawnDisplayChange) {
         this.asDrawnDisplayChange = asDrawnDisplayChange;
     }
 
-	public Boolean getChangedStructure() {
+    public Boolean getChangedStructure() {
         return this.changedStructure;
     }
 
-	public void setChangedStructure(Boolean changedStructure) {
+    public void setChangedStructure(Boolean changedStructure) {
         this.changedStructure = changedStructure;
     }
 
-	public Boolean getDisplayChange() {
+    public Boolean getDisplayChange() {
         return this.displayChange;
     }
 
-	public void setDisplayChange(Boolean displayChange) {
+    public void setDisplayChange(Boolean displayChange) {
         this.displayChange = displayChange;
     }
 
-	public String getFilePath() {
+    public String getFilePath() {
         return this.filePath;
     }
 
-	public void setFilePath(String filePath) {
+    public void setFilePath(String filePath) {
         this.filePath = filePath;
     }
 
-	public Integer getMaxResults() {
+    public Integer getMaxResults() {
         return this.maxResults;
     }
 
-	public void setMaxResults(Integer maxResults) {
+    public void setMaxResults(Integer maxResults) {
         this.maxResults = maxResults;
     }
 
-	public StandardizationStatus[] getStandardizationStatuses() {
+    public StandardizationStatus[] getStandardizationStatuses() {
         return this.standardizationStatuses;
     }
 
-	public void setStandardizationStatuses(StandardizationStatus[] standardizationStatuses) {
+    public void setStandardizationStatuses(StandardizationStatus[] standardizationStatuses) {
         this.standardizationStatuses = standardizationStatuses;
     }
 
-	public RegistrationStatus[] getRegistrationStatuses() {
+    public RegistrationStatus[] getRegistrationStatuses() {
         return this.registrationStatuses;
     }
 
-	public void setRegistrationStatuses(RegistrationStatus[] registrationStatuses) {
+    public void setRegistrationStatuses(RegistrationStatus[] registrationStatuses) {
         this.registrationStatuses = registrationStatuses;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/StateValueCsvDTO.java b/src/main/java/com/labsynch/labseer/dto/StateValueCsvDTO.java
index e2908bd4c..96da1aec0 100644
--- a/src/main/java/com/labsynch/labseer/dto/StateValueCsvDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StateValueCsvDTO.java
@@ -18,16 +18,14 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class StateValueCsvDTO {
 
 	private static final Logger logger = LoggerFactory.getLogger(StateValueCsvDTO.class);
 
-	public StateValueCsvDTO(){
-		//empty constructor
+	public StateValueCsvDTO() {
+		// empty constructor
 	}
 
-
 	public StateValueCsvDTO(ExperimentValue entityValue) {
 		this.setStateId(entityValue.getLsState().getId());
 		this.setId(entityValue.getId());
@@ -62,11 +60,10 @@ public StateValueCsvDTO(ExperimentValue entityValue) {
 		this.setRecordedBy(entityValue.getRecordedBy());
 		this.setModifiedDate(entityValue.getModifiedDate());
 		this.setModifiedBy(entityValue.getModifiedBy());
-		this.setPublicData(entityValue.isPublicData());	
-		}
-
+		this.setPublicData(entityValue.isPublicData());
+	}
 
-	private Long stateId;	
+	private Long stateId;
 
 	private Long id;
 	private String lsType;
@@ -79,7 +76,7 @@ public StateValueCsvDTO(ExperimentValue entityValue) {
 	private String fileValue;
 	private String urlValue;
 	private Date dateValue;
-	
+
 	private String clobValue;
 	private String operatorType;
 	private String operatorKind;
@@ -100,18 +97,18 @@ public StateValueCsvDTO(ExperimentValue entityValue) {
 	private String modifiedBy;
 	private boolean publicData;
 
-//29 fields
-	
-    public boolean getIgnored() {
-        return this.ignored;
-    }
+	// 29 fields
+
+	public boolean getIgnored() {
+		return this.ignored;
+	}
+
+	public boolean getPublicData() {
+		return this.publicData;
+	}
 
-    public boolean getPublicData() {
-        return this.publicData;
-    }
-	
 	public void setLsTransaction(String lsTransaction) {
-		if (lsTransaction.equalsIgnoreCase("NULL")){
+		if (lsTransaction.equalsIgnoreCase("NULL")) {
 			this.lsTransaction = null;
 		} else {
 			this.lsTransaction = Long.valueOf(lsTransaction);
@@ -123,15 +120,15 @@ public void setStateId(String stateId) {
 	}
 
 	public void setPublicData(String publicData) {
-		if (publicData.equalsIgnoreCase("FALSE")){
+		if (publicData.equalsIgnoreCase("FALSE")) {
 			this.publicData = false;
 		} else {
 			this.publicData = true;
 		}
 	}
-	
+
 	public void setIgnored(String ignored) {
-		if (ignored.equalsIgnoreCase("FALSE")){
+		if (ignored.equalsIgnoreCase("FALSE")) {
 			this.ignored = false;
 		} else {
 			this.ignored = true;
@@ -139,26 +136,26 @@ public void setIgnored(String ignored) {
 	}
 
 	public void setDateValue(String dateValue) throws ParseException {
-		if (dateValue.equalsIgnoreCase("NULL")){
+		if (dateValue.equalsIgnoreCase("NULL")) {
 			this.dateValue = null;
 		} else {
 			try {
 				DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
 				this.dateValue = df.parse(dateValue);
-			} catch(Exception e) {
+			} catch (Exception e) {
 				try {
 					this.dateValue = new Date(Long.parseLong(dateValue));
-				} catch(Exception e2) {
+				} catch (Exception e2) {
 					DateFormat df = new SimpleDateFormat("MM/dd/yyyy");
 					this.dateValue = df.parse(dateValue);
 				}
-				
+
 			}
 		}
 	}
 
 	public void setNumericValue(String numericValue) {
-		if (numericValue.equalsIgnoreCase("NULL")){
+		if (numericValue.equalsIgnoreCase("NULL")) {
 			this.numericValue = null;
 		} else {
 			this.numericValue = new BigDecimal(numericValue);
@@ -166,23 +163,23 @@ public void setNumericValue(String numericValue) {
 	}
 
 	public void setUncertainty(String uncertainty) {
-		if (uncertainty.equalsIgnoreCase("NULL")){
+		if (uncertainty.equalsIgnoreCase("NULL")) {
 			this.uncertainty = null;
 		} else {
 			this.uncertainty = new BigDecimal(uncertainty);
 		}
 	}
-	
+
 	public void setId(String id) {
-		if (id.equalsIgnoreCase("NULL")){
+		if (id.equalsIgnoreCase("NULL")) {
 			this.id = null;
 		} else {
 			this.id = Long.valueOf(id);
 		}
 	}
-	
+
 	public void setSigFigs(String sigFigs) {
-		if (sigFigs.equalsIgnoreCase("NULL")){
+		if (sigFigs.equalsIgnoreCase("NULL")) {
 			this.sigFigs = null;
 		} else {
 			this.sigFigs = Integer.valueOf(sigFigs);
@@ -190,15 +187,14 @@ public void setSigFigs(String sigFigs) {
 	}
 
 	public void setNumberOfReplicates(String numberOfReplicates) {
-		if (numberOfReplicates.equalsIgnoreCase("NULL")){
+		if (numberOfReplicates.equalsIgnoreCase("NULL")) {
 			this.numberOfReplicates = null;
 		} else {
 			this.numberOfReplicates = Integer.valueOf(numberOfReplicates);
 		}
 	}
-	
-	
-	public static String[] getColumns(){
+
+	public static String[] getColumns() {
 		String[] headerColumns = new String[] {
 				"stateId",
 
@@ -238,7 +234,7 @@ public static String[] getColumns(){
 	}
 
 	public static CellProcessor[] getProcessors() {
-		final CellProcessor[] processors = new CellProcessor[] { 
+		final CellProcessor[] processors = new CellProcessor[] {
 				new Optional(),
 				new Optional(),
 				new Optional(),
@@ -277,281 +273,277 @@ public static CellProcessor[] getProcessors() {
 		return processors;
 	}
 
-
-
 	public Long getStateId() {
-        return this.stateId;
-    }
+		return this.stateId;
+	}
 
 	public void setStateId(Long stateId) {
-        this.stateId = stateId;
-    }
+		this.stateId = stateId;
+	}
 
 	public Long getId() {
-        return this.id;
-    }
+		return this.id;
+	}
 
 	public void setId(Long id) {
-        this.id = id;
-    }
+		this.id = id;
+	}
 
 	public String getLsType() {
-        return this.lsType;
-    }
+		return this.lsType;
+	}
 
 	public void setLsType(String lsType) {
-        this.lsType = lsType;
-    }
+		this.lsType = lsType;
+	}
 
 	public String getLsKind() {
-        return this.lsKind;
-    }
+		return this.lsKind;
+	}
 
 	public void setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
+		this.lsKind = lsKind;
+	}
 
 	public String getCodeOrigin() {
-        return this.codeOrigin;
-    }
+		return this.codeOrigin;
+	}
 
 	public void setCodeOrigin(String codeOrigin) {
-        this.codeOrigin = codeOrigin;
-    }
+		this.codeOrigin = codeOrigin;
+	}
 
 	public String getCodeType() {
-        return this.codeType;
-    }
+		return this.codeType;
+	}
 
 	public void setCodeType(String codeType) {
-        this.codeType = codeType;
-    }
+		this.codeType = codeType;
+	}
 
 	public String getCodeKind() {
-        return this.codeKind;
-    }
+		return this.codeKind;
+	}
 
 	public void setCodeKind(String codeKind) {
-        this.codeKind = codeKind;
-    }
+		this.codeKind = codeKind;
+	}
 
 	public String getCodeValue() {
-        return this.codeValue;
-    }
+		return this.codeValue;
+	}
 
 	public void setCodeValue(String codeValue) {
-        this.codeValue = codeValue;
-    }
+		this.codeValue = codeValue;
+	}
 
 	public String getStringValue() {
-        return this.stringValue;
-    }
+		return this.stringValue;
+	}
 
 	public void setStringValue(String stringValue) {
-        this.stringValue = stringValue;
-    }
+		this.stringValue = stringValue;
+	}
 
 	public String getFileValue() {
-        return this.fileValue;
-    }
+		return this.fileValue;
+	}
 
 	public void setFileValue(String fileValue) {
-        this.fileValue = fileValue;
-    }
+		this.fileValue = fileValue;
+	}
 
 	public String getUrlValue() {
-        return this.urlValue;
-    }
+		return this.urlValue;
+	}
 
 	public void setUrlValue(String urlValue) {
-        this.urlValue = urlValue;
-    }
+		this.urlValue = urlValue;
+	}
 
 	public Date getDateValue() {
-        return this.dateValue;
-    }
+		return this.dateValue;
+	}
 
 	public void setDateValue(Date dateValue) {
-        this.dateValue = dateValue;
-    }
+		this.dateValue = dateValue;
+	}
 
 	public String getClobValue() {
-        return this.clobValue;
-    }
+		return this.clobValue;
+	}
 
 	public void setClobValue(String clobValue) {
-        this.clobValue = clobValue;
-    }
+		this.clobValue = clobValue;
+	}
 
 	public String getOperatorType() {
-        return this.operatorType;
-    }
+		return this.operatorType;
+	}
 
 	public void setOperatorType(String operatorType) {
-        this.operatorType = operatorType;
-    }
+		this.operatorType = operatorType;
+	}
 
 	public String getOperatorKind() {
-        return this.operatorKind;
-    }
+		return this.operatorKind;
+	}
 
 	public void setOperatorKind(String operatorKind) {
-        this.operatorKind = operatorKind;
-    }
+		this.operatorKind = operatorKind;
+	}
 
 	public BigDecimal getNumericValue() {
-        return this.numericValue;
-    }
+		return this.numericValue;
+	}
 
 	public void setNumericValue(BigDecimal numericValue) {
-        this.numericValue = numericValue;
-    }
+		this.numericValue = numericValue;
+	}
 
 	public Integer getSigFigs() {
-        return this.sigFigs;
-    }
+		return this.sigFigs;
+	}
 
 	public void setSigFigs(Integer sigFigs) {
-        this.sigFigs = sigFigs;
-    }
+		this.sigFigs = sigFigs;
+	}
 
 	public BigDecimal getUncertainty() {
-        return this.uncertainty;
-    }
+		return this.uncertainty;
+	}
 
 	public void setUncertainty(BigDecimal uncertainty) {
-        this.uncertainty = uncertainty;
-    }
+		this.uncertainty = uncertainty;
+	}
 
 	public Integer getNumberOfReplicates() {
-        return this.numberOfReplicates;
-    }
+		return this.numberOfReplicates;
+	}
 
 	public void setNumberOfReplicates(Integer numberOfReplicates) {
-        this.numberOfReplicates = numberOfReplicates;
-    }
+		this.numberOfReplicates = numberOfReplicates;
+	}
 
 	public String getUncertaintyType() {
-        return this.uncertaintyType;
-    }
+		return this.uncertaintyType;
+	}
 
 	public void setUncertaintyType(String uncertaintyType) {
-        this.uncertaintyType = uncertaintyType;
-    }
+		this.uncertaintyType = uncertaintyType;
+	}
 
 	public String getUnitType() {
-        return this.unitType;
-    }
+		return this.unitType;
+	}
 
 	public void setUnitType(String unitType) {
-        this.unitType = unitType;
-    }
+		this.unitType = unitType;
+	}
 
 	public String getUnitKind() {
-        return this.unitKind;
-    }
+		return this.unitKind;
+	}
 
 	public void setUnitKind(String unitKind) {
-        this.unitKind = unitKind;
-    }
+		this.unitKind = unitKind;
+	}
 
 	public String getComments() {
-        return this.comments;
-    }
+		return this.comments;
+	}
 
 	public void setComments(String comments) {
-        this.comments = comments;
-    }
+		this.comments = comments;
+	}
 
 	public boolean isIgnored() {
-        return this.ignored;
-    }
+		return this.ignored;
+	}
 
 	public void setIgnored(boolean ignored) {
-        this.ignored = ignored;
-    }
+		this.ignored = ignored;
+	}
 
 	public Long getLsTransaction() {
-        return this.lsTransaction;
-    }
+		return this.lsTransaction;
+	}
 
 	public void setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
+		this.lsTransaction = lsTransaction;
+	}
 
 	public Date getRecordedDate() {
-        return this.recordedDate;
-    }
+		return this.recordedDate;
+	}
 
 	public void setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
+		this.recordedDate = recordedDate;
+	}
 
 	public String getRecordedBy() {
-        return this.recordedBy;
-    }
+		return this.recordedBy;
+	}
 
 	public void setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
+		this.recordedBy = recordedBy;
+	}
 
 	public Date getModifiedDate() {
-        return this.modifiedDate;
-    }
+		return this.modifiedDate;
+	}
 
 	public void setModifiedDate(Date modifiedDate) {
-        this.modifiedDate = modifiedDate;
-    }
+		this.modifiedDate = modifiedDate;
+	}
 
 	public String getModifiedBy() {
-        return this.modifiedBy;
-    }
+		return this.modifiedBy;
+	}
 
 	public void setModifiedBy(String modifiedBy) {
-        this.modifiedBy = modifiedBy;
-    }
+		this.modifiedBy = modifiedBy;
+	}
 
 	public boolean isPublicData() {
-        return this.publicData;
-    }
+		return this.publicData;
+	}
 
 	public void setPublicData(boolean publicData) {
-        this.publicData = publicData;
-    }
+		this.publicData = publicData;
+	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 
 	public String toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(this);
+	}
 
 	public String toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(this);
+	}
 
 	public static StateValueCsvDTO fromJsonToStateValueCsvDTO(String json) {
-        return new JSONDeserializer<StateValueCsvDTO>()
-        .use(null, StateValueCsvDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<StateValueCsvDTO>()
+				.use(null, StateValueCsvDTO.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<StateValueCsvDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<StateValueCsvDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<StateValueCsvDTO> fromJsonArrayToStateValueCsvDTO(String json) {
-        return new JSONDeserializer<List<StateValueCsvDTO>>()
-        .use("values", StateValueCsvDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<StateValueCsvDTO>>()
+				.use("values", StateValueCsvDTO.class).deserialize(json);
+	}
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/StateValueDTO.java b/src/main/java/com/labsynch/labseer/dto/StateValueDTO.java
index 9a3365f22..1405c6a41 100644
--- a/src/main/java/com/labsynch/labseer/dto/StateValueDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StateValueDTO.java
@@ -9,61 +9,59 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class StateValueDTO {
-	
-	Long id;
-	
-	String lsValue;
 
+    Long id;
+
+    String lsValue;
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static StateValueDTO fromJsonToStateValueDTO(String json) {
+    public static StateValueDTO fromJsonToStateValueDTO(String json) {
         return new JSONDeserializer<StateValueDTO>()
-        .use(null, StateValueDTO.class).deserialize(json);
+                .use(null, StateValueDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<StateValueDTO> collection) {
+    public static String toJsonArray(Collection<StateValueDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<StateValueDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<StateValueDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<StateValueDTO> fromJsonArrayToStateValueDTO(String json) {
+    public static Collection<StateValueDTO> fromJsonArrayToStateValueDTO(String json) {
         return new JSONDeserializer<List<StateValueDTO>>()
-        .use("values", StateValueDTO.class).deserialize(json);
+                .use("values", StateValueDTO.class).deserialize(json);
     }
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public String getLsValue() {
+    public String getLsValue() {
         return this.lsValue;
     }
 
-	public void setLsValue(String lsValue) {
+    public void setLsValue(String lsValue) {
         this.lsValue = lsValue;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesDTO.java b/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesDTO.java
index 0b5e47de9..9239f02ee 100644
--- a/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesDTO.java
@@ -18,237 +18,242 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class StoichiometryPropertiesDTO {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(StoichiometryPropertiesDTO.class);
 
 	String codeName;
-	
+
 	String corpName;
-	
+
 	String lsType;
-	
+
 	String lsKind;
-	
+
 	String preferredName;
-	
+
 	BigDecimal molWeight;
-	
+
 	BigDecimal density;
-	
+
 	BigDecimal concentration;
-	
+
 	String concUnit;
-	
+
 	String phase;
-	
+
 	BigDecimal amountMade;
-	
+
 	String amountMadeUnits;
-	
+
 	public String toJson() {
-        return new JSONSerializer().exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
-    }
-	
+		return new JSONSerializer().exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+	}
+
 	public static String toJsonArray(Collection<StoichiometryPropertiesDTO> collection) {
-        return new JSONSerializer().exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
-    }
-	
-	public StoichiometryPropertiesDTO(){
+		return new JSONSerializer().exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
+	}
+
+	public StoichiometryPropertiesDTO() {
 	}
-	
-	public StoichiometryPropertiesDTO(LsThing thing){
+
+	public StoichiometryPropertiesDTO(LsThing thing) {
 		LsThing parent = null;
-		try{
-			parent = ItxLsThingLsThing.findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndFirstLsThingEquals("instantiates", "batch_parent", thing).getSingleResult().getSecondLsThing();
-		}catch (Exception e){
+		try {
+			parent = ItxLsThingLsThing
+					.findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndFirstLsThingEquals("instantiates",
+							"batch_parent", thing)
+					.getSingleResult().getSecondLsThing();
+		} catch (Exception e) {
 			logger.debug("Could not find parent for provided lsThing. Continuing with batch properties");
 		}
-		//For all properties, try batch first, then try parent if property was not found on batch
+		// For all properties, try batch first, then try parent if property was not
+		// found on batch
 		this.codeName = thing.getCodeName();
-		if (thing.pickBestCorpName() != null){
+		if (thing.pickBestCorpName() != null) {
 			this.corpName = thing.pickBestCorpName().getLabelText();
-		}else if (parent != null && parent.pickBestCorpName() != null){
+		} else if (parent != null && parent.pickBestCorpName() != null) {
 			this.corpName = parent.pickBestCorpName().getLabelText();
 		}
 		this.lsType = thing.getLsType();
 		this.lsKind = thing.getLsKind();
-		if (thing.pickBestName() != null){
+		if (thing.pickBestName() != null) {
 			this.preferredName = thing.pickBestName().getLabelText();
-		}else if (parent != null && parent.pickBestName() != null){
+		} else if (parent != null && parent.pickBestName() != null) {
 			this.preferredName = parent.pickBestName().getLabelText();
 		}
-		List<LsThingValue> molWeightValues = SimpleUtil.pluckValueByValueTypeKind(thing, "numericValue", "molecular weight");
+		List<LsThingValue> molWeightValues = SimpleUtil.pluckValueByValueTypeKind(thing, "numericValue",
+				"molecular weight");
 
-		if (molWeightValues.size() > 0){
+		if (molWeightValues.size() > 0) {
 			this.molWeight = molWeightValues.get(0).getNumericValue();
-		} else{
+		} else {
 			molWeightValues = SimpleUtil.pluckValueByValueTypeKind(thing, "numericValue", "measured molecular weight");
-			if (molWeightValues.size() > 0){
+			if (molWeightValues.size() > 0) {
 				this.molWeight = molWeightValues.get(0).getNumericValue();
-			}else if (parent != null){
+			} else if (parent != null) {
 				molWeightValues = SimpleUtil.pluckValueByValueTypeKind(parent, "numericValue", "molecular weight");
-				List<LsThingValue> duplexMolWeightValues = SimpleUtil.pluckValueByValueTypeKind(parent, "numericValue", "duplex molecular weight");
-				if (molWeightValues.size() == 0 && duplexMolWeightValues.size() > 0){
+				List<LsThingValue> duplexMolWeightValues = SimpleUtil.pluckValueByValueTypeKind(parent, "numericValue",
+						"duplex molecular weight");
+				if (molWeightValues.size() == 0 && duplexMolWeightValues.size() > 0) {
 					this.molWeight = duplexMolWeightValues.get(0).getNumericValue();
-				} else if (molWeightValues.size() > 0){
+				} else if (molWeightValues.size() > 0) {
 					this.molWeight = molWeightValues.get(0).getNumericValue();
-				}else{
-					molWeightValues = SimpleUtil.pluckValueByValueTypeKind(parent, "numericValue", "measured molecular weight");
-					if (molWeightValues.size() > 0){
+				} else {
+					molWeightValues = SimpleUtil.pluckValueByValueTypeKind(parent, "numericValue",
+							"measured molecular weight");
+					if (molWeightValues.size() > 0) {
 						this.molWeight = molWeightValues.get(0).getNumericValue();
 					}
 				}
 			}
 		}
-		
-		List<LsThingValue> amountMadeValues = SimpleUtil.pluckValueByValueTypeKind(thing, "numericValue", "amount made");
-		if (amountMadeValues.size() > 0){
+
+		List<LsThingValue> amountMadeValues = SimpleUtil.pluckValueByValueTypeKind(thing, "numericValue",
+				"amount made");
+		if (amountMadeValues.size() > 0) {
 			this.amountMade = amountMadeValues.get(0).getNumericValue();
 			this.amountMadeUnits = amountMadeValues.get(0).getUnitKind();
 		}
-		
-		
+
 		List<LsThingValue> densityValues = SimpleUtil.pluckValueByValueTypeKind(thing, "numericValue", "density");
-		if (densityValues.size() > 0){
+		if (densityValues.size() > 0) {
 			this.density = densityValues.get(0).getNumericValue();
-		}else if (parent != null){
+		} else if (parent != null) {
 			densityValues = SimpleUtil.pluckValueByValueTypeKind(parent, "numericValue", "density");
-			if (densityValues.size() > 0){
+			if (densityValues.size() > 0) {
 				this.density = densityValues.get(0).getNumericValue();
 			}
 		}
 		List<LsThingValue> concValues = SimpleUtil.pluckValueByValueTypeKind(thing, "numericValue", "concentration");
-		if (concValues.size() > 0){
-			 this.concentration = concValues.get(0).getNumericValue();
-			 this.concUnit = concValues.get(0).getUnitKind();
-		}else if (parent != null){
+		if (concValues.size() > 0) {
+			this.concentration = concValues.get(0).getNumericValue();
+			this.concUnit = concValues.get(0).getUnitKind();
+		} else if (parent != null) {
 			concValues = SimpleUtil.pluckValueByValueTypeKind(parent, "numericValue", "concentration");
-			if (concValues.size() > 0){
-				 this.concentration = concValues.get(0).getNumericValue();
-				 this.concUnit = concValues.get(0).getUnitKind();
+			if (concValues.size() > 0) {
+				this.concentration = concValues.get(0).getNumericValue();
+				this.concUnit = concValues.get(0).getUnitKind();
 			}
 		}
 		List<LsThingValue> phaseValues = SimpleUtil.pluckValueByValueTypeKind(thing, "codeValue", "phase");
-		if (phaseValues.size() > 0){
+		if (phaseValues.size() > 0) {
 			this.phase = phaseValues.get(0).getCodeValue();
-		}else if (parent != null){
+		} else if (parent != null) {
 			phaseValues = SimpleUtil.pluckValueByValueTypeKind(thing, "codeValue", "phase");
-			if (phaseValues.size() > 0){
+			if (phaseValues.size() > 0) {
 				this.phase = phaseValues.get(0).getCodeValue();
 			}
 		}
 	}
-	
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 
 	public static StoichiometryPropertiesDTO fromJsonToStoichiometryPropertiesDTO(String json) {
-        return new JSONDeserializer<StoichiometryPropertiesDTO>()
-        .use(null, StoichiometryPropertiesDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<StoichiometryPropertiesDTO>()
+				.use(null, StoichiometryPropertiesDTO.class).deserialize(json);
+	}
 
 	public static Collection<StoichiometryPropertiesDTO> fromJsonArrayToStoichiometryProes(String json) {
-        return new JSONDeserializer<List<StoichiometryPropertiesDTO>>()
-        .use("values", StoichiometryPropertiesDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<StoichiometryPropertiesDTO>>()
+				.use("values", StoichiometryPropertiesDTO.class).deserialize(json);
+	}
 
 	public String getCodeName() {
-        return this.codeName;
-    }
+		return this.codeName;
+	}
 
 	public void setCodeName(String codeName) {
-        this.codeName = codeName;
-    }
+		this.codeName = codeName;
+	}
 
 	public String getCorpName() {
-        return this.corpName;
-    }
+		return this.corpName;
+	}
 
 	public void setCorpName(String corpName) {
-        this.corpName = corpName;
-    }
+		this.corpName = corpName;
+	}
 
 	public String getLsType() {
-        return this.lsType;
-    }
+		return this.lsType;
+	}
 
 	public void setLsType(String lsType) {
-        this.lsType = lsType;
-    }
+		this.lsType = lsType;
+	}
 
 	public String getLsKind() {
-        return this.lsKind;
-    }
+		return this.lsKind;
+	}
 
 	public void setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
+		this.lsKind = lsKind;
+	}
 
 	public String getPreferredName() {
-        return this.preferredName;
-    }
+		return this.preferredName;
+	}
 
 	public void setPreferredName(String preferredName) {
-        this.preferredName = preferredName;
-    }
+		this.preferredName = preferredName;
+	}
 
 	public BigDecimal getMolWeight() {
-        return this.molWeight;
-    }
+		return this.molWeight;
+	}
 
 	public void setMolWeight(BigDecimal molWeight) {
-        this.molWeight = molWeight;
-    }
+		this.molWeight = molWeight;
+	}
 
 	public BigDecimal getDensity() {
-        return this.density;
-    }
+		return this.density;
+	}
 
 	public void setDensity(BigDecimal density) {
-        this.density = density;
-    }
+		this.density = density;
+	}
 
 	public BigDecimal getConcentration() {
-        return this.concentration;
-    }
+		return this.concentration;
+	}
 
 	public void setConcentration(BigDecimal concentration) {
-        this.concentration = concentration;
-    }
+		this.concentration = concentration;
+	}
 
 	public String getConcUnit() {
-        return this.concUnit;
-    }
+		return this.concUnit;
+	}
 
 	public void setConcUnit(String concUnit) {
-        this.concUnit = concUnit;
-    }
+		this.concUnit = concUnit;
+	}
 
 	public String getPhase() {
-        return this.phase;
-    }
+		return this.phase;
+	}
 
 	public void setPhase(String phase) {
-        this.phase = phase;
-    }
+		this.phase = phase;
+	}
 
 	public BigDecimal getAmountMade() {
-        return this.amountMade;
-    }
+		return this.amountMade;
+	}
 
 	public void setAmountMade(BigDecimal amountMade) {
-        this.amountMade = amountMade;
-    }
+		this.amountMade = amountMade;
+	}
 
 	public String getAmountMadeUnits() {
-        return this.amountMadeUnits;
-    }
+		return this.amountMadeUnits;
+	}
 
 	public void setAmountMadeUnits(String amountMadeUnits) {
-        this.amountMadeUnits = amountMadeUnits;
-    }
+		this.amountMadeUnits = amountMadeUnits;
+	}
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesResultsDTO.java b/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesResultsDTO.java
index 1b8236b47..607f41feb 100644
--- a/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesResultsDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StoichiometryPropertiesResultsDTO.java
@@ -12,72 +12,72 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class StoichiometryPropertiesResultsDTO {
 
-	boolean hasError;
-	
-	boolean hasWarning;
-	
-	Collection<ErrorMessageDTO> errorMessages = new ArrayList<ErrorMessageDTO>();
-	
-	Collection<StoichiometryPropertiesDTO> results = new ArrayList<StoichiometryPropertiesDTO>();
-	
-	public String toJson() {
-        return new JSONSerializer().include("errorMessages","results").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+    boolean hasError;
+
+    boolean hasWarning;
+
+    Collection<ErrorMessageDTO> errorMessages = new ArrayList<ErrorMessageDTO>();
+
+    Collection<StoichiometryPropertiesDTO> results = new ArrayList<StoichiometryPropertiesDTO>();
+
+    public String toJson() {
+        return new JSONSerializer().include("errorMessages", "results").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
+    }
+
+    public static String toJsonArray(Collection<StoichiometryPropertiesResultsDTO> collection) {
+        return new JSONSerializer().include("errorMessages", "results").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
-	
-	public static String toJsonArray(Collection<StoichiometryPropertiesResultsDTO> collection) {
-        return new JSONSerializer().include("errorMessages","results").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
+
+    public StoichiometryPropertiesResultsDTO() {
     }
-	
-	public StoichiometryPropertiesResultsDTO(){
-	}
-	
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public boolean isHasError() {
+    public boolean isHasError() {
         return this.hasError;
     }
 
-	public void setHasError(boolean hasError) {
+    public void setHasError(boolean hasError) {
         this.hasError = hasError;
     }
 
-	public boolean isHasWarning() {
+    public boolean isHasWarning() {
         return this.hasWarning;
     }
 
-	public void setHasWarning(boolean hasWarning) {
+    public void setHasWarning(boolean hasWarning) {
         this.hasWarning = hasWarning;
     }
 
-	public Collection<ErrorMessageDTO> getErrorMessages() {
+    public Collection<ErrorMessageDTO> getErrorMessages() {
         return this.errorMessages;
     }
 
-	public void setErrorMessages(Collection<ErrorMessageDTO> errorMessages) {
+    public void setErrorMessages(Collection<ErrorMessageDTO> errorMessages) {
         this.errorMessages = errorMessages;
     }
 
-	public Collection<StoichiometryPropertiesDTO> getResults() {
+    public Collection<StoichiometryPropertiesDTO> getResults() {
         return this.results;
     }
 
-	public void setResults(Collection<StoichiometryPropertiesDTO> results) {
+    public void setResults(Collection<StoichiometryPropertiesDTO> results) {
         this.results = results;
     }
 
-	public static StoichiometryPropertiesResultsDTO fromJsonToStoichiometryPropertiesResultsDTO(String json) {
+    public static StoichiometryPropertiesResultsDTO fromJsonToStoichiometryPropertiesResultsDTO(String json) {
         return new JSONDeserializer<StoichiometryPropertiesResultsDTO>()
-        .use(null, StoichiometryPropertiesResultsDTO.class).deserialize(json);
+                .use(null, StoichiometryPropertiesResultsDTO.class).deserialize(json);
     }
 
-	public static Collection<StoichiometryPropertiesResultsDTO> fromJsonArrayToStoichiometryProes(String json) {
+    public static Collection<StoichiometryPropertiesResultsDTO> fromJsonArrayToStoichiometryProes(String json) {
         return new JSONDeserializer<List<StoichiometryPropertiesResultsDTO>>()
-        .use("values", StoichiometryPropertiesResultsDTO.class).deserialize(json);
+                .use("values", StoichiometryPropertiesResultsDTO.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/StringCollectionDTO.java b/src/main/java/com/labsynch/labseer/dto/StringCollectionDTO.java
index 881f3b806..6a6e28c16 100755
--- a/src/main/java/com/labsynch/labseer/dto/StringCollectionDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StringCollectionDTO.java
@@ -7,63 +7,59 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-
 public class StringCollectionDTO {
-	
-	private String name;
-	
-	private String code;
 
+    private String name;
+
+    private String code;
 
-	public String getName() {
+    public String getName() {
         return this.name;
     }
 
-	public void setName(String name) {
+    public void setName(String name) {
         this.name = name;
     }
 
-	public String getCode() {
+    public String getCode() {
         return this.code;
     }
 
-	public void setCode(String code) {
+    public void setCode(String code) {
         this.code = code;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static StringCollectionDTO fromJsonToStringCollectionDTO(String json) {
+    public static StringCollectionDTO fromJsonToStringCollectionDTO(String json) {
         return new JSONDeserializer<StringCollectionDTO>()
-        .use(null, StringCollectionDTO.class).deserialize(json);
+                .use(null, StringCollectionDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<StringCollectionDTO> collection) {
+    public static String toJsonArray(Collection<StringCollectionDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<StringCollectionDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<StringCollectionDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<StringCollectionDTO> fromJsonArrayToStringCollectioes(String json) {
+    public static Collection<StringCollectionDTO> fromJsonArrayToStringCollectioes(String json) {
         return new JSONDeserializer<List<StringCollectionDTO>>()
-        .use("values", StringCollectionDTO.class).deserialize(json);
+                .use("values", StringCollectionDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/StrippedSaltDTO.java b/src/main/java/com/labsynch/labseer/dto/StrippedSaltDTO.java
index cdd44a72b..aca34fd60 100644
--- a/src/main/java/com/labsynch/labseer/dto/StrippedSaltDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StrippedSaltDTO.java
@@ -12,57 +12,55 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class StrippedSaltDTO {
-		
-	private Map<Salt, Integer> saltCounts;
-	
-	private Set< ? extends CmpdRegMolecule> unidentifiedFragments;
-	
-	public StrippedSaltDTO(){
-		
-	}
-	
-	public String toJson() {
-        return new JSONSerializer()
-        .include("lotCodes")
-        .exclude("*.class").serialize(this);
+
+    private Map<Salt, Integer> saltCounts;
+
+    private Set<? extends CmpdRegMolecule> unidentifiedFragments;
+
+    public StrippedSaltDTO() {
+
     }
-	
-	public static String toJsonArray(Collection<StrippedSaltDTO> collection) {
+
+    public String toJson() {
         return new JSONSerializer()
-        .include("lotCodes")
-        .exclude("*.class").serialize(collection);
+                .include("lotCodes")
+                .exclude("*.class").serialize(this);
     }
 
+    public static String toJsonArray(Collection<StrippedSaltDTO> collection) {
+        return new JSONSerializer()
+                .include("lotCodes")
+                .exclude("*.class").serialize(collection);
+    }
 
-	public Map<Salt, Integer> getSaltCounts() {
+    public Map<Salt, Integer> getSaltCounts() {
         return this.saltCounts;
     }
 
-	public void setSaltCounts(Map<Salt, Integer> saltCounts) {
+    public void setSaltCounts(Map<Salt, Integer> saltCounts) {
         this.saltCounts = saltCounts;
     }
 
-	public Set<? extends CmpdRegMolecule> getUnidentifiedFragments() {
+    public Set<? extends CmpdRegMolecule> getUnidentifiedFragments() {
         return this.unidentifiedFragments;
     }
 
-	public void setUnidentifiedFragments(Set<? extends CmpdRegMolecule> unidentifiedFragments) {
+    public void setUnidentifiedFragments(Set<? extends CmpdRegMolecule> unidentifiedFragments) {
         this.unidentifiedFragments = unidentifiedFragments;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static StrippedSaltDTO fromJsonToStrippedSaltDTO(String json) {
+    public static StrippedSaltDTO fromJsonToStrippedSaltDTO(String json) {
         return new JSONDeserializer<StrippedSaltDTO>()
-        .use(null, StrippedSaltDTO.class).deserialize(json);
+                .use(null, StrippedSaltDTO.class).deserialize(json);
     }
 
-	public static Collection<StrippedSaltDTO> fromJsonArrayToStrippedSaltDTO(String json) {
+    public static Collection<StrippedSaltDTO> fromJsonArrayToStrippedSaltDTO(String json) {
         return new JSONDeserializer<List<StrippedSaltDTO>>()
-        .use("values", StrippedSaltDTO.class).deserialize(json);
+                .use("values", StrippedSaltDTO.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/StructureAndThingSearchDTO.java b/src/main/java/com/labsynch/labseer/dto/StructureAndThingSearchDTO.java
index 28ed71f4a..0f76b427d 100644
--- a/src/main/java/com/labsynch/labseer/dto/StructureAndThingSearchDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StructureAndThingSearchDTO.java
@@ -8,86 +8,87 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-
 public class StructureAndThingSearchDTO {
-	
-	private String queryMol;
-	private String searchType;
-	private Integer maxResults;
-	private Float similarity;
-	private LsThingQueryDTO lsThingQueryDTO;
-	
-	public StructureAndThingSearchDTO(){
-	}
-	
-	public StructureAndThingSearchDTO(LsThingQueryDTO lsThingQueryDTO, String queryMol, String searchType, Integer maxResults, Float similarity){
-		this.lsThingQueryDTO = lsThingQueryDTO;
-		this.queryMol = queryMol;
-		this.searchType = searchType;
-		this.maxResults = maxResults;
-		this.similarity = similarity;
-	}
 
+    private String queryMol;
+    private String searchType;
+    private Integer maxResults;
+    private Float similarity;
+    private LsThingQueryDTO lsThingQueryDTO;
+
+    public StructureAndThingSearchDTO() {
+    }
+
+    public StructureAndThingSearchDTO(LsThingQueryDTO lsThingQueryDTO, String queryMol, String searchType,
+            Integer maxResults, Float similarity) {
+        this.lsThingQueryDTO = lsThingQueryDTO;
+        this.queryMol = queryMol;
+        this.searchType = searchType;
+        this.maxResults = maxResults;
+        this.similarity = similarity;
+    }
 
-	public String toJson() {
-        return new JSONSerializer().exclude("*.class").include("lsThingQueryDTO.labels","lsThingQueryDTO.values").serialize(this);
+    public String toJson() {
+        return new JSONSerializer().exclude("*.class").include("lsThingQueryDTO.labels", "lsThingQueryDTO.values")
+                .serialize(this);
     }
 
-	public static StructureAndThingSearchDTO fromJsonToStructureAndThingSearchDTO(String json) {
-        return new JSONDeserializer<StructureAndThingSearchDTO>().use(null, StructureAndThingSearchDTO.class).deserialize(json);
+    public static StructureAndThingSearchDTO fromJsonToStructureAndThingSearchDTO(String json) {
+        return new JSONDeserializer<StructureAndThingSearchDTO>().use(null, StructureAndThingSearchDTO.class)
+                .deserialize(json);
     }
 
-	public static String toJsonArray(Collection<StructureAndThingSearchDTO> collection) {
-        return new JSONSerializer().exclude("*.class").include("lsThingQueryDTO.labels","lsThingQueryDTO.values").serialize(collection);
+    public static String toJsonArray(Collection<StructureAndThingSearchDTO> collection) {
+        return new JSONSerializer().exclude("*.class").include("lsThingQueryDTO.labels", "lsThingQueryDTO.values")
+                .serialize(collection);
     }
 
-	public static Collection<StructureAndThingSearchDTO> fromJsonArrayToStructureAndThingSearchDTO(String json) {
-        return new JSONDeserializer<List<StructureAndThingSearchDTO>>().use(null, ArrayList.class).use("values", StructureAndThingSearchDTO.class).deserialize(json);
+    public static Collection<StructureAndThingSearchDTO> fromJsonArrayToStructureAndThingSearchDTO(String json) {
+        return new JSONDeserializer<List<StructureAndThingSearchDTO>>().use(null, ArrayList.class)
+                .use("values", StructureAndThingSearchDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getQueryMol() {
+    public String getQueryMol() {
         return this.queryMol;
     }
 
-	public void setQueryMol(String queryMol) {
+    public void setQueryMol(String queryMol) {
         this.queryMol = queryMol;
     }
 
-	public String getSearchType() {
+    public String getSearchType() {
         return this.searchType;
     }
 
-	public void setSearchType(String searchType) {
+    public void setSearchType(String searchType) {
         this.searchType = searchType;
     }
 
-	public Integer getMaxResults() {
+    public Integer getMaxResults() {
         return this.maxResults;
     }
 
-	public void setMaxResults(Integer maxResults) {
+    public void setMaxResults(Integer maxResults) {
         this.maxResults = maxResults;
     }
 
-	public Float getSimilarity() {
+    public Float getSimilarity() {
         return this.similarity;
     }
 
-	public void setSimilarity(Float similarity) {
+    public void setSimilarity(Float similarity) {
         this.similarity = similarity;
     }
 
-	public LsThingQueryDTO getLsThingQueryDTO() {
+    public LsThingQueryDTO getLsThingQueryDTO() {
         return this.lsThingQueryDTO;
     }
 
-	public void setLsThingQueryDTO(LsThingQueryDTO lsThingQueryDTO) {
+    public void setLsThingQueryDTO(LsThingQueryDTO lsThingQueryDTO) {
         this.lsThingQueryDTO = lsThingQueryDTO;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/StructureSearchDTO.java b/src/main/java/com/labsynch/labseer/dto/StructureSearchDTO.java
index a2f27b217..64dae5811 100644
--- a/src/main/java/com/labsynch/labseer/dto/StructureSearchDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/StructureSearchDTO.java
@@ -9,110 +9,107 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class StructureSearchDTO {
-	
-	private String queryMol;
-	private String lsType;
-	private String lsKind;
-	private String searchType;
-	private Integer maxResults;
-	private Float similarity;
-	
-	public StructureSearchDTO(){
-	}
-	
-	public StructureSearchDTO(String queryMol, String lsType, String lsKind, String searchType, Integer maxResults, Float similarity){
-		this.queryMol = queryMol;
-		this.lsType = lsType;
-		this.lsKind = lsKind;
-		this.searchType = searchType;
-		this.maxResults = maxResults;
-		this.similarity = similarity;
-	}
-
-
-	public String getQueryMol() {
+
+    private String queryMol;
+    private String lsType;
+    private String lsKind;
+    private String searchType;
+    private Integer maxResults;
+    private Float similarity;
+
+    public StructureSearchDTO() {
+    }
+
+    public StructureSearchDTO(String queryMol, String lsType, String lsKind, String searchType, Integer maxResults,
+            Float similarity) {
+        this.queryMol = queryMol;
+        this.lsType = lsType;
+        this.lsKind = lsKind;
+        this.searchType = searchType;
+        this.maxResults = maxResults;
+        this.similarity = similarity;
+    }
+
+    public String getQueryMol() {
         return this.queryMol;
     }
 
-	public void setQueryMol(String queryMol) {
+    public void setQueryMol(String queryMol) {
         this.queryMol = queryMol;
     }
 
-	public String getLsType() {
+    public String getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(String lsType) {
+    public void setLsType(String lsType) {
         this.lsType = lsType;
     }
 
-	public String getLsKind() {
+    public String getLsKind() {
         return this.lsKind;
     }
 
-	public void setLsKind(String lsKind) {
+    public void setLsKind(String lsKind) {
         this.lsKind = lsKind;
     }
 
-	public String getSearchType() {
+    public String getSearchType() {
         return this.searchType;
     }
 
-	public void setSearchType(String searchType) {
+    public void setSearchType(String searchType) {
         this.searchType = searchType;
     }
 
-	public Integer getMaxResults() {
+    public Integer getMaxResults() {
         return this.maxResults;
     }
 
-	public void setMaxResults(Integer maxResults) {
+    public void setMaxResults(Integer maxResults) {
         this.maxResults = maxResults;
     }
 
-	public Float getSimilarity() {
+    public Float getSimilarity() {
         return this.similarity;
     }
 
-	public void setSimilarity(Float similarity) {
+    public void setSimilarity(Float similarity) {
         this.similarity = similarity;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static StructureSearchDTO fromJsonToStructureSearchDTO(String json) {
+    public static StructureSearchDTO fromJsonToStructureSearchDTO(String json) {
         return new JSONDeserializer<StructureSearchDTO>()
-        .use(null, StructureSearchDTO.class).deserialize(json);
+                .use(null, StructureSearchDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<StructureSearchDTO> collection) {
+    public static String toJsonArray(Collection<StructureSearchDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<StructureSearchDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<StructureSearchDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<StructureSearchDTO> fromJsonArrayToStructureSearchDTO(String json) {
+    public static Collection<StructureSearchDTO> fromJsonArrayToStructureSearchDTO(String json) {
         return new JSONDeserializer<List<StructureSearchDTO>>()
-        .use("values", StructureSearchDTO.class).deserialize(json);
+                .use("values", StructureSearchDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectCodeDTO.java
index 0a603e885..918977d81 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectCodeDTO.java
@@ -11,54 +11,51 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class SubjectCodeDTO {
-	
-	private String subjectCode;
-	private Collection<TreatmentGroupCodeDTO> treatmentGroupCodes;
-	
-	public SubjectCodeDTO(){
-	}
-	
-	public String toJson() {
-        return new JSONSerializer().include("treatmentGroupCodes.analysisGroupCodes.experimentCodes").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
-	}
-
-	public static String toJsonArray(Collection<SubjectCodeDTO> collection) {
-		return new JSONSerializer().include("treatmentGroupCodes.analysisGroupCodes.experimentCodes").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
-	}
-	
-
-
-	public static SubjectCodeDTO fromJsonToSubjectCodeDTO(String json) {
+
+    private String subjectCode;
+    private Collection<TreatmentGroupCodeDTO> treatmentGroupCodes;
+
+    public SubjectCodeDTO() {
+    }
+
+    public String toJson() {
+        return new JSONSerializer().include("treatmentGroupCodes.analysisGroupCodes.experimentCodes").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
+    }
+
+    public static String toJsonArray(Collection<SubjectCodeDTO> collection) {
+        return new JSONSerializer().include("treatmentGroupCodes.analysisGroupCodes.experimentCodes").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
+    }
+
+    public static SubjectCodeDTO fromJsonToSubjectCodeDTO(String json) {
         return new JSONDeserializer<SubjectCodeDTO>()
-        .use(null, SubjectCodeDTO.class).deserialize(json);
+                .use(null, SubjectCodeDTO.class).deserialize(json);
     }
 
-	public static Collection<SubjectCodeDTO> fromJsonArrayToSubjectCoes(String json) {
+    public static Collection<SubjectCodeDTO> fromJsonArrayToSubjectCoes(String json) {
         return new JSONDeserializer<List<SubjectCodeDTO>>()
-        .use("values", SubjectCodeDTO.class).deserialize(json);
+                .use("values", SubjectCodeDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getSubjectCode() {
+    public String getSubjectCode() {
         return this.subjectCode;
     }
 
-	public void setSubjectCode(String subjectCode) {
+    public void setSubjectCode(String subjectCode) {
         this.subjectCode = subjectCode;
     }
 
-	public Collection<TreatmentGroupCodeDTO> getTreatmentGroupCodes() {
+    public Collection<TreatmentGroupCodeDTO> getTreatmentGroupCodes() {
         return this.treatmentGroupCodes;
     }
 
-	public void setTreatmentGroupCodes(Collection<TreatmentGroupCodeDTO> treatmentGroupCodes) {
+    public void setTreatmentGroupCodes(Collection<TreatmentGroupCodeDTO> treatmentGroupCodes) {
         this.treatmentGroupCodes = treatmentGroupCodes;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectCodeNameDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectCodeNameDTO.java
index 96c20b20f..f8fe65d64 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectCodeNameDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectCodeNameDTO.java
@@ -10,59 +10,56 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class SubjectCodeNameDTO {
-	
+
 	private String requestCodeName;
 	private Subject subject;
-	
-	public SubjectCodeNameDTO(){
+
+	public SubjectCodeNameDTO() {
 	}
-	
-	public SubjectCodeNameDTO(String requestCodeName, Subject subject){
+
+	public SubjectCodeNameDTO(String requestCodeName, Subject subject) {
 		this.requestCodeName = requestCodeName;
 		this.subject = subject;
 	}
-	
+
 	public String toJson() {
-	        return new JSONSerializer().include("subject.lsStates.lsValues","subject.lsLabels").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+		return new JSONSerializer().include("subject.lsStates.lsValues", "subject.lsLabels").exclude("*.class")
+				.transform(new ExcludeNulls(), void.class).serialize(this);
 	}
-	
-	public static String toJsonArray(Collection<SubjectCodeNameDTO> collection) {
-        return new JSONSerializer().include("subject.lsStates.lsValues","subject.lsLabels").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
-    }
-	
 
+	public static String toJsonArray(Collection<SubjectCodeNameDTO> collection) {
+		return new JSONSerializer().include("subject.lsStates.lsValues", "subject.lsLabels").exclude("*.class")
+				.transform(new ExcludeNulls(), void.class).serialize(collection);
+	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 
 	public static SubjectCodeNameDTO fromJsonToSubjectCodeNameDTO(String json) {
-        return new JSONDeserializer<SubjectCodeNameDTO>()
-        .use(null, SubjectCodeNameDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<SubjectCodeNameDTO>()
+				.use(null, SubjectCodeNameDTO.class).deserialize(json);
+	}
 
 	public static Collection<SubjectCodeNameDTO> fromJsonArrayToSubjectCoes(String json) {
-        return new JSONDeserializer<List<SubjectCodeNameDTO>>()
-        .use("values", SubjectCodeNameDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<SubjectCodeNameDTO>>()
+				.use("values", SubjectCodeNameDTO.class).deserialize(json);
+	}
 
 	public String getRequestCodeName() {
-        return this.requestCodeName;
-    }
+		return this.requestCodeName;
+	}
 
 	public void setRequestCodeName(String requestCodeName) {
-        this.requestCodeName = requestCodeName;
-    }
+		this.requestCodeName = requestCodeName;
+	}
 
 	public Subject getSubject() {
-        return this.subject;
-    }
+		return this.subject;
+	}
 
 	public void setSubject(Subject subject) {
-        this.subject = subject;
-    }
+		this.subject = subject;
+	}
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectCodeStateDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectCodeStateDTO.java
index c0ec9e888..97fc15c86 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectCodeStateDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectCodeStateDTO.java
@@ -9,70 +9,66 @@
 import java.util.Collection;
 import java.util.List;
 
-
 public class SubjectCodeStateDTO {
-	
-	private String subjectCode;
-	private SubjectState subjectState;
-	
-	public SubjectCodeStateDTO(){
-	}
-	
-	public SubjectCodeStateDTO(String subjectCode, SubjectState subjectState){
-		this.subjectCode = subjectCode;
-		this.subjectState = subjectState;
-	}
-
-
-	public String toString() {
+
+    private String subjectCode;
+    private SubjectState subjectState;
+
+    public SubjectCodeStateDTO() {
+    }
+
+    public SubjectCodeStateDTO(String subjectCode, SubjectState subjectState) {
+        this.subjectCode = subjectCode;
+        this.subjectState = subjectState;
+    }
+
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getSubjectCode() {
+    public String getSubjectCode() {
         return this.subjectCode;
     }
 
-	public void setSubjectCode(String subjectCode) {
+    public void setSubjectCode(String subjectCode) {
         this.subjectCode = subjectCode;
     }
 
-	public SubjectState getSubjectState() {
+    public SubjectState getSubjectState() {
         return this.subjectState;
     }
 
-	public void setSubjectState(SubjectState subjectState) {
+    public void setSubjectState(SubjectState subjectState) {
         this.subjectState = subjectState;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static SubjectCodeStateDTO fromJsonToSubjectCodeStateDTO(String json) {
+    public static SubjectCodeStateDTO fromJsonToSubjectCodeStateDTO(String json) {
         return new JSONDeserializer<SubjectCodeStateDTO>()
-        .use(null, SubjectCodeStateDTO.class).deserialize(json);
+                .use(null, SubjectCodeStateDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<SubjectCodeStateDTO> collection) {
+    public static String toJsonArray(Collection<SubjectCodeStateDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<SubjectCodeStateDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<SubjectCodeStateDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<SubjectCodeStateDTO> fromJsonArrayToSubjectCoes(String json) {
+    public static Collection<SubjectCodeStateDTO> fromJsonArrayToSubjectCoes(String json) {
         return new JSONDeserializer<List<SubjectCodeStateDTO>>()
-        .use("values", SubjectCodeStateDTO.class).deserialize(json);
+                .use("values", SubjectCodeStateDTO.class).deserialize(json);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectCsvDataDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectCsvDataDTO.java
index 0eb107782..7c7be9032 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectCsvDataDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectCsvDataDTO.java
@@ -7,63 +7,59 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-
 public class SubjectCsvDataDTO {
-	
-	private List<Long> treatmentGroupIds;
 
-	private String subjectCsvFilePath;
-	
+    private List<Long> treatmentGroupIds;
+
+    private String subjectCsvFilePath;
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static SubjectCsvDataDTO fromJsonToSubjectCsvDataDTO(String json) {
+    public static SubjectCsvDataDTO fromJsonToSubjectCsvDataDTO(String json) {
         return new JSONDeserializer<SubjectCsvDataDTO>()
-        .use(null, SubjectCsvDataDTO.class).deserialize(json);
+                .use(null, SubjectCsvDataDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<SubjectCsvDataDTO> collection) {
+    public static String toJsonArray(Collection<SubjectCsvDataDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<SubjectCsvDataDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<SubjectCsvDataDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<SubjectCsvDataDTO> fromJsonArrayToSubjectCsvDataDTO(String json) {
+    public static Collection<SubjectCsvDataDTO> fromJsonArrayToSubjectCsvDataDTO(String json) {
         return new JSONDeserializer<List<SubjectCsvDataDTO>>()
-        .use("values", SubjectCsvDataDTO.class).deserialize(json);
+                .use("values", SubjectCsvDataDTO.class).deserialize(json);
     }
 
-	public List<Long> getTreatmentGroupIds() {
+    public List<Long> getTreatmentGroupIds() {
         return this.treatmentGroupIds;
     }
 
-	public void setTreatmentGroupIds(List<Long> treatmentGroupIds) {
+    public void setTreatmentGroupIds(List<Long> treatmentGroupIds) {
         this.treatmentGroupIds = treatmentGroupIds;
     }
 
-	public String getSubjectCsvFilePath() {
+    public String getSubjectCsvFilePath() {
         return this.subjectCsvFilePath;
     }
 
-	public void setSubjectCsvFilePath(String subjectCsvFilePath) {
+    public void setSubjectCsvFilePath(String subjectCsvFilePath) {
         this.subjectCsvFilePath = subjectCsvFilePath;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectDTO.java
index e7c2746d0..f5d9586a1 100755
--- a/src/main/java/com/labsynch/labseer/dto/SubjectDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectDTO.java
@@ -18,207 +18,200 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class SubjectDTO {
-	
+
     public SubjectDTO(Subject subject) {
-    	this.setId(subject.getId());
-    	this.setVersion(subject.getVersion());
-    	this.setRecordedBy(subject.getRecordedBy());
-		this.setRecordedDate(subject.getRecordedDate());
-		this.setLsTransaction(subject.getLsTransaction());
-		this.setModifiedBy(subject.getModifiedBy());
-		this.setModifiedDate(subject.getModifiedDate());
-		this.setIgnored(subject.isIgnored());
-		this.setCodeName(subject.getCodeName());
-		this.setLsKind(subject.getLsKind());
-		Set<TreatmentGroupMiniDTO> treatmentGroups = new HashSet<TreatmentGroupMiniDTO>();
-		for (TreatmentGroup treatmentGroup : subject.getTreatmentGroups()){
-			treatmentGroups.add(new TreatmentGroupMiniDTO(treatmentGroup));
-		}
-		this.setTreatmentGroups(treatmentGroups);
+        this.setId(subject.getId());
+        this.setVersion(subject.getVersion());
+        this.setRecordedBy(subject.getRecordedBy());
+        this.setRecordedDate(subject.getRecordedDate());
+        this.setLsTransaction(subject.getLsTransaction());
+        this.setModifiedBy(subject.getModifiedBy());
+        this.setModifiedDate(subject.getModifiedDate());
+        this.setIgnored(subject.isIgnored());
+        this.setCodeName(subject.getCodeName());
+        this.setLsKind(subject.getLsKind());
+        Set<TreatmentGroupMiniDTO> treatmentGroups = new HashSet<TreatmentGroupMiniDTO>();
+        for (TreatmentGroup treatmentGroup : subject.getTreatmentGroups()) {
+            treatmentGroups.add(new TreatmentGroupMiniDTO(treatmentGroup));
+        }
+        this.setTreatmentGroups(treatmentGroups);
     }
 
-    
-	private Long id;
-	
-	private Integer version;
-    
-	private String lsType;
+    private Long id;
+
+    private Integer version;
+
+    private String lsType;
+
+    private String lsKind;
 
-	private String lsKind;
-	
-	private String codeName;
+    private String codeName;
 
-	private String recordedBy;
+    private String recordedBy;
 
-	private Date recordedDate;
+    private Date recordedDate;
 
-	private String modifiedBy;
+    private String modifiedBy;
 
-	private Date modifiedDate;
+    private Date modifiedDate;
 
-	private boolean ignored;
+    private boolean ignored;
 
-	private Long lsTransaction;
+    private Long lsTransaction;
 
-	
     private Set<TreatmentGroupMiniDTO> treatmentGroups = new HashSet<TreatmentGroupMiniDTO>();
 
     private Set<SubjectLabelDTO> lsLabels = new HashSet<SubjectLabelDTO>();
 
     private Set<SubjectStateDTO> lsStates = new HashSet<SubjectStateDTO>();
-    
-	private Set<ThingPage> thingPage = new HashSet<ThingPage>();
 
+    private Set<ThingPage> thingPage = new HashSet<ThingPage>();
 
-
-
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .include("lsLabels", "lsStates.lsValues")
-        .exclude("*.class", "lsStates.subject", "lsStates.lsValues.lsState", "treatmentGroup.analysisGroup")
-        .serialize(this);
+                .include("lsLabels", "lsStates.lsValues")
+                .exclude("*.class", "lsStates.subject", "lsStates.lsValues.lsState", "treatmentGroup.analysisGroup")
+                .serialize(this);
     }
 
-	public static SubjectDTO fromJsonToSubjectDTO(String json) {
+    public static SubjectDTO fromJsonToSubjectDTO(String json) {
         return new JSONDeserializer<SubjectDTO>().use(null, SubjectDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<SubjectDTO> collection) {
+    public static String toJsonArray(Collection<SubjectDTO> collection) {
         return new JSONSerializer()
-        .include("lsLabels", "lsStates.lsValues")
-        .exclude("*.class", "lsStates.subject", "lsStates.lsValues.lsState", "treatmentGroup.analysisGroup")
-        .serialize(collection);
+                .include("lsLabels", "lsStates.lsValues")
+                .exclude("*.class", "lsStates.subject", "lsStates.lsValues.lsState", "treatmentGroup.analysisGroup")
+                .serialize(collection);
     }
 
-	public static Collection<SubjectDTO> fromJsonArrayToSubjectDTO(String json) {
-        return new JSONDeserializer<List<SubjectDTO>>().use(null, ArrayList.class).use("values", SubjectDTO.class).deserialize(json);
+    public static Collection<SubjectDTO> fromJsonArrayToSubjectDTO(String json) {
+        return new JSONDeserializer<List<SubjectDTO>>().use(null, ArrayList.class).use("values", SubjectDTO.class)
+                .deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String getLsType() {
+    public String getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(String lsType) {
+    public void setLsType(String lsType) {
         this.lsType = lsType;
     }
 
-	public String getLsKind() {
+    public String getLsKind() {
         return this.lsKind;
     }
 
-	public void setLsKind(String lsKind) {
+    public void setLsKind(String lsKind) {
         this.lsKind = lsKind;
     }
 
-	public String getCodeName() {
+    public String getCodeName() {
         return this.codeName;
     }
 
-	public void setCodeName(String codeName) {
+    public void setCodeName(String codeName) {
         this.codeName = codeName;
     }
 
-	public String getRecordedBy() {
+    public String getRecordedBy() {
         return this.recordedBy;
     }
 
-	public void setRecordedBy(String recordedBy) {
+    public void setRecordedBy(String recordedBy) {
         this.recordedBy = recordedBy;
     }
 
-	public Date getRecordedDate() {
+    public Date getRecordedDate() {
         return this.recordedDate;
     }
 
-	public void setRecordedDate(Date recordedDate) {
+    public void setRecordedDate(Date recordedDate) {
         this.recordedDate = recordedDate;
     }
 
-	public String getModifiedBy() {
+    public String getModifiedBy() {
         return this.modifiedBy;
     }
 
-	public void setModifiedBy(String modifiedBy) {
+    public void setModifiedBy(String modifiedBy) {
         this.modifiedBy = modifiedBy;
     }
 
-	public Date getModifiedDate() {
+    public Date getModifiedDate() {
         return this.modifiedDate;
     }
 
-	public void setModifiedDate(Date modifiedDate) {
+    public void setModifiedDate(Date modifiedDate) {
         this.modifiedDate = modifiedDate;
     }
 
-	public boolean isIgnored() {
+    public boolean isIgnored() {
         return this.ignored;
     }
 
-	public void setIgnored(boolean ignored) {
+    public void setIgnored(boolean ignored) {
         this.ignored = ignored;
     }
 
-	public Long getLsTransaction() {
+    public Long getLsTransaction() {
         return this.lsTransaction;
     }
 
-	public void setLsTransaction(Long lsTransaction) {
+    public void setLsTransaction(Long lsTransaction) {
         this.lsTransaction = lsTransaction;
     }
 
-	public Set<TreatmentGroupMiniDTO> getTreatmentGroups() {
+    public Set<TreatmentGroupMiniDTO> getTreatmentGroups() {
         return this.treatmentGroups;
     }
 
-	public void setTreatmentGroups(Set<TreatmentGroupMiniDTO> treatmentGroups) {
+    public void setTreatmentGroups(Set<TreatmentGroupMiniDTO> treatmentGroups) {
         this.treatmentGroups = treatmentGroups;
     }
 
-	public Set<SubjectLabelDTO> getLsLabels() {
+    public Set<SubjectLabelDTO> getLsLabels() {
         return this.lsLabels;
     }
 
-	public void setLsLabels(Set<SubjectLabelDTO> lsLabels) {
+    public void setLsLabels(Set<SubjectLabelDTO> lsLabels) {
         this.lsLabels = lsLabels;
     }
 
-	public Set<SubjectStateDTO> getLsStates() {
+    public Set<SubjectStateDTO> getLsStates() {
         return this.lsStates;
     }
 
-	public void setLsStates(Set<SubjectStateDTO> lsStates) {
+    public void setLsStates(Set<SubjectStateDTO> lsStates) {
         this.lsStates = lsStates;
     }
 
-	public Set<ThingPage> getThingPage() {
+    public Set<ThingPage> getThingPage() {
         return this.thingPage;
     }
 
-	public void setThingPage(Set<ThingPage> thingPage) {
+    public void setThingPage(Set<ThingPage> thingPage) {
         this.thingPage = thingPage;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectLabelDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectLabelDTO.java
index 04ca971ab..dfb77d69a 100755
--- a/src/main/java/com/labsynch/labseer/dto/SubjectLabelDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectLabelDTO.java
@@ -12,211 +12,206 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class SubjectLabelDTO {
-	
+
     public SubjectLabelDTO(SubjectLabel subjectLabel) {
-      this.setId(subjectLabel.getId());
-      this.setSubject(new SubjectMiniDTO(subjectLabel.getSubject()));
-      this.setLsType(subjectLabel.getLsType());
-      this.setLsKind(subjectLabel.getLsKind());
-      this.setLsTypeAndKind(subjectLabel.getLsTypeAndKind());
-      this.setLabelText(subjectLabel.getLabelText());
-      this.setPreferred(subjectLabel.isPreferred());
-      this.setLsTransaction_Id(subjectLabel.getLsTransaction());
-      this.setRecordedBy(subjectLabel.getRecordedBy());
-      this.setRecordedDate(subjectLabel.getRecordedDate());
-      this.setPhysicallyLabled(subjectLabel.isPhysicallyLabled());
+        this.setId(subjectLabel.getId());
+        this.setSubject(new SubjectMiniDTO(subjectLabel.getSubject()));
+        this.setLsType(subjectLabel.getLsType());
+        this.setLsKind(subjectLabel.getLsKind());
+        this.setLsTypeAndKind(subjectLabel.getLsTypeAndKind());
+        this.setLabelText(subjectLabel.getLabelText());
+        this.setPreferred(subjectLabel.isPreferred());
+        this.setLsTransaction_Id(subjectLabel.getLsTransaction());
+        this.setRecordedBy(subjectLabel.getRecordedBy());
+        this.setRecordedDate(subjectLabel.getRecordedDate());
+        this.setPhysicallyLabled(subjectLabel.isPhysicallyLabled());
     }
 
-	private Long id;
-    
-	private SubjectMiniDTO subject;
-
-	private String labelText;
+    private Long id;
 
-	private String recordedBy;
+    private SubjectMiniDTO subject;
 
-	private Date recordedDate;
+    private String labelText;
 
-	private Date modifiedDate;
+    private String recordedBy;
 
-	private boolean physicallyLabled;
+    private Date recordedDate;
 
-	private String imageFile;
+    private Date modifiedDate;
 
-	private String lsType;
+    private boolean physicallyLabled;
 
-	private String lsKind;
+    private String imageFile;
 
-	private String lsTypeAndKind;
+    private String lsType;
 
-	private boolean preferred;
+    private String lsKind;
 
-	private boolean ignored;
+    private String lsTypeAndKind;
 
-	private Long lsTransaction_Id;
+    private boolean preferred;
 
+    private boolean ignored;
 
+    private Long lsTransaction_Id;
 
-
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static SubjectLabelDTO fromJsonToSubjectLabelDTO(String json) {
+    public static SubjectLabelDTO fromJsonToSubjectLabelDTO(String json) {
         return new JSONDeserializer<SubjectLabelDTO>()
-        .use(null, SubjectLabelDTO.class).deserialize(json);
+                .use(null, SubjectLabelDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<SubjectLabelDTO> collection) {
+    public static String toJsonArray(Collection<SubjectLabelDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<SubjectLabelDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<SubjectLabelDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<SubjectLabelDTO> fromJsonArrayToSubjectLabelDTO(String json) {
+    public static Collection<SubjectLabelDTO> fromJsonArrayToSubjectLabelDTO(String json) {
         return new JSONDeserializer<List<SubjectLabelDTO>>()
-        .use("values", SubjectLabelDTO.class).deserialize(json);
+                .use("values", SubjectLabelDTO.class).deserialize(json);
     }
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public SubjectMiniDTO getSubject() {
+    public SubjectMiniDTO getSubject() {
         return this.subject;
     }
 
-	public void setSubject(SubjectMiniDTO subject) {
+    public void setSubject(SubjectMiniDTO subject) {
         this.subject = subject;
     }
 
-	public String getLabelText() {
+    public String getLabelText() {
         return this.labelText;
     }
 
-	public void setLabelText(String labelText) {
+    public void setLabelText(String labelText) {
         this.labelText = labelText;
     }
 
-	public String getRecordedBy() {
+    public String getRecordedBy() {
         return this.recordedBy;
     }
 
-	public void setRecordedBy(String recordedBy) {
+    public void setRecordedBy(String recordedBy) {
         this.recordedBy = recordedBy;
     }
 
-	public Date getRecordedDate() {
+    public Date getRecordedDate() {
         return this.recordedDate;
     }
 
-	public void setRecordedDate(Date recordedDate) {
+    public void setRecordedDate(Date recordedDate) {
         this.recordedDate = recordedDate;
     }
 
-	public Date getModifiedDate() {
+    public Date getModifiedDate() {
         return this.modifiedDate;
     }
 
-	public void setModifiedDate(Date modifiedDate) {
+    public void setModifiedDate(Date modifiedDate) {
         this.modifiedDate = modifiedDate;
     }
 
-	public boolean isPhysicallyLabled() {
+    public boolean isPhysicallyLabled() {
         return this.physicallyLabled;
     }
 
-	public void setPhysicallyLabled(boolean physicallyLabled) {
+    public void setPhysicallyLabled(boolean physicallyLabled) {
         this.physicallyLabled = physicallyLabled;
     }
 
-	public String getImageFile() {
+    public String getImageFile() {
         return this.imageFile;
     }
 
-	public void setImageFile(String imageFile) {
+    public void setImageFile(String imageFile) {
         this.imageFile = imageFile;
     }
 
-	public String getLsType() {
+    public String getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(String lsType) {
+    public void setLsType(String lsType) {
         this.lsType = lsType;
     }
 
-	public String getLsKind() {
+    public String getLsKind() {
         return this.lsKind;
     }
 
-	public void setLsKind(String lsKind) {
+    public void setLsKind(String lsKind) {
         this.lsKind = lsKind;
     }
 
-	public String getLsTypeAndKind() {
+    public String getLsTypeAndKind() {
         return this.lsTypeAndKind;
     }
 
-	public void setLsTypeAndKind(String lsTypeAndKind) {
+    public void setLsTypeAndKind(String lsTypeAndKind) {
         this.lsTypeAndKind = lsTypeAndKind;
     }
 
-	public boolean isPreferred() {
+    public boolean isPreferred() {
         return this.preferred;
     }
 
-	public void setPreferred(boolean preferred) {
+    public void setPreferred(boolean preferred) {
         this.preferred = preferred;
     }
 
-	public boolean isIgnored() {
+    public boolean isIgnored() {
         return this.ignored;
     }
 
-	public void setIgnored(boolean ignored) {
+    public void setIgnored(boolean ignored) {
         this.ignored = ignored;
     }
 
-	public Long getLsTransaction_Id() {
+    public Long getLsTransaction_Id() {
         return this.lsTransaction_Id;
     }
 
-	public void setLsTransaction_Id(Long lsTransaction_Id) {
+    public void setLsTransaction_Id(Long lsTransaction_Id) {
         this.lsTransaction_Id = lsTransaction_Id;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
 
-
-//public SubjectLabel(com.labsynch.labseer.domain.SubjectLabel subjectLabel) {
-//    super.setLabelType(subjectLabel.getLabelType());
-//    super.setLabelKind(subjectLabel.getLabelKind());
-//    super.setLabelTypeAndKind(subjectLabel.getLabelType() + "_" + subjectLabel.getLabelKind());
-//    super.setLabelText(subjectLabel.getLabelText());
-//    super.setPreferred(subjectLabel.isPreferred());
-//    super.setLsTransaction(subjectLabel.getLsTransaction());
-//    super.setRecordedBy(subjectLabel.getRecordedBy());
-//    super.setRecordedDate(subjectLabel.getRecordedDate());
-//    super.setPhysicallyLabled(subjectLabel.isPhysicallyLabled());
-//}
-
+// public SubjectLabel(com.labsynch.labseer.domain.SubjectLabel subjectLabel) {
+// super.setLabelType(subjectLabel.getLabelType());
+// super.setLabelKind(subjectLabel.getLabelKind());
+// super.setLabelTypeAndKind(subjectLabel.getLabelType() + "_" +
+// subjectLabel.getLabelKind());
+// super.setLabelText(subjectLabel.getLabelText());
+// super.setPreferred(subjectLabel.isPreferred());
+// super.setLsTransaction(subjectLabel.getLsTransaction());
+// super.setRecordedBy(subjectLabel.getRecordedBy());
+// super.setRecordedDate(subjectLabel.getRecordedDate());
+// super.setPhysicallyLabled(subjectLabel.isPhysicallyLabled());
+// }
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectMiniDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectMiniDTO.java
index ceb7ecc2f..47fb8f3ba 100755
--- a/src/main/java/com/labsynch/labseer/dto/SubjectMiniDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectMiniDTO.java
@@ -11,81 +11,75 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class SubjectMiniDTO {
-	
+
     public SubjectMiniDTO(Subject subject) {
-    	this.setId(subject.getId());
-    	this.setVersion(subject.getVersion());
-    	subject.getCodeName();
+        this.setId(subject.getId());
+        this.setVersion(subject.getVersion());
+        subject.getCodeName();
     }
 
-	private Long id;
-    
-	private Integer version;
-	
-	private String codeName;
-
+    private Long id;
 
+    private Integer version;
 
+    private String codeName;
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String getCodeName() {
+    public String getCodeName() {
         return this.codeName;
     }
 
-	public void setCodeName(String codeName) {
+    public void setCodeName(String codeName) {
         this.codeName = codeName;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static SubjectMiniDTO fromJsonToSubjectMiniDTO(String json) {
+    public static SubjectMiniDTO fromJsonToSubjectMiniDTO(String json) {
         return new JSONDeserializer<SubjectMiniDTO>()
-        .use(null, SubjectMiniDTO.class).deserialize(json);
+                .use(null, SubjectMiniDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<SubjectMiniDTO> collection) {
+    public static String toJsonArray(Collection<SubjectMiniDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<SubjectMiniDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<SubjectMiniDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<SubjectMiniDTO> fromJsonArrayToSubjectMiniDTO(String json) {
+    public static Collection<SubjectMiniDTO> fromJsonArrayToSubjectMiniDTO(String json) {
         return new JSONDeserializer<List<SubjectMiniDTO>>()
-        .use("values", SubjectMiniDTO.class).deserialize(json);
+                .use("values", SubjectMiniDTO.class).deserialize(json);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectSearchRequest.java b/src/main/java/com/labsynch/labseer/dto/SubjectSearchRequest.java
index 2713d55af..11cc8e9f0 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectSearchRequest.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectSearchRequest.java
@@ -9,114 +9,113 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class SubjectSearchRequest {
-	
-	Integer maxResults;
-
-	String protocolLabelLike;
-	
-	String experimentLabelLike;
-	
-	String containerCode;
-	
-	String subjectType;
-	
-	String subjectKind;
-
-	Collection<ValueQueryDTO> values;
-	
-	public SubjectSearchRequest(){
-		
-	}
-
-	public String toString() {
+
+    Integer maxResults;
+
+    String protocolLabelLike;
+
+    String experimentLabelLike;
+
+    String containerCode;
+
+    String subjectType;
+
+    String subjectKind;
+
+    Collection<ValueQueryDTO> values;
+
+    public SubjectSearchRequest() {
+
+    }
+
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static SubjectSearchRequest fromJsonToSubjectSearchRequest(String json) {
+    public static SubjectSearchRequest fromJsonToSubjectSearchRequest(String json) {
         return new JSONDeserializer<SubjectSearchRequest>()
-        .use(null, SubjectSearchRequest.class).deserialize(json);
+                .use(null, SubjectSearchRequest.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<SubjectSearchRequest> collection) {
+    public static String toJsonArray(Collection<SubjectSearchRequest> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<SubjectSearchRequest> collection, String[] fields) {
+    public static String toJsonArray(Collection<SubjectSearchRequest> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<SubjectSearchRequest> fromJsonArrayToSubjectSearchRequests(String json) {
+    public static Collection<SubjectSearchRequest> fromJsonArrayToSubjectSearchRequests(String json) {
         return new JSONDeserializer<List<SubjectSearchRequest>>()
-        .use("values", SubjectSearchRequest.class).deserialize(json);
+                .use("values", SubjectSearchRequest.class).deserialize(json);
     }
 
-	public Integer getMaxResults() {
+    public Integer getMaxResults() {
         return this.maxResults;
     }
 
-	public void setMaxResults(Integer maxResults) {
+    public void setMaxResults(Integer maxResults) {
         this.maxResults = maxResults;
     }
 
-	public String getProtocolLabelLike() {
+    public String getProtocolLabelLike() {
         return this.protocolLabelLike;
     }
 
-	public void setProtocolLabelLike(String protocolLabelLike) {
+    public void setProtocolLabelLike(String protocolLabelLike) {
         this.protocolLabelLike = protocolLabelLike;
     }
 
-	public String getExperimentLabelLike() {
+    public String getExperimentLabelLike() {
         return this.experimentLabelLike;
     }
 
-	public void setExperimentLabelLike(String experimentLabelLike) {
+    public void setExperimentLabelLike(String experimentLabelLike) {
         this.experimentLabelLike = experimentLabelLike;
     }
 
-	public String getContainerCode() {
+    public String getContainerCode() {
         return this.containerCode;
     }
 
-	public void setContainerCode(String containerCode) {
+    public void setContainerCode(String containerCode) {
         this.containerCode = containerCode;
     }
 
-	public String getSubjectType() {
+    public String getSubjectType() {
         return this.subjectType;
     }
 
-	public void setSubjectType(String subjectType) {
+    public void setSubjectType(String subjectType) {
         this.subjectType = subjectType;
     }
 
-	public String getSubjectKind() {
+    public String getSubjectKind() {
         return this.subjectKind;
     }
 
-	public void setSubjectKind(String subjectKind) {
+    public void setSubjectKind(String subjectKind) {
         this.subjectKind = subjectKind;
     }
 
-	public Collection<ValueQueryDTO> getValues() {
+    public Collection<ValueQueryDTO> getValues() {
         return this.values;
     }
 
-	public void setValues(Collection<ValueQueryDTO> values) {
+    public void setValues(Collection<ValueQueryDTO> values) {
         this.values = values;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectSearchResultDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectSearchResultDTO.java
index 81cc15bdb..98c5820bc 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectSearchResultDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectSearchResultDTO.java
@@ -13,90 +13,103 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class SubjectSearchResultDTO {
 
-	Integer maxResults;
-	
-	Integer numberOfResults;
-	
-	Collection<Subject> results;
-	
-	public SubjectSearchResultDTO(){
-		
-	}
-	
-	@Transactional
+    Integer maxResults;
+
+    Integer numberOfResults;
+
+    Collection<Subject> results;
+
+    public SubjectSearchResultDTO() {
+
+    }
+
+    @Transactional
     public String toJson() {
-        return new JSONSerializer().exclude("*.class").include("results.lsTags", "results.lsLabels", "results.lsStates.lsValues").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().exclude("*.class")
+                .include("results.lsTags", "results.lsLabels", "results.lsStates.lsValues")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
-	
-	 @Transactional
+
+    @Transactional
     public String toJsonWithNestedStubs() {
-        return new JSONSerializer().exclude("*.class").include("results.lsTags", "results.lsLabels", "results.lsStates.lsValues", "results.firstSubjects.firstSubject.lsLabels","results.secondSubjects.secondSubject.lsLabels").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().exclude("*.class")
+                .include("results.lsTags", "results.lsLabels", "results.lsStates.lsValues",
+                        "results.firstSubjects.firstSubject.lsLabels", "results.secondSubjects.secondSubject.lsLabels")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
-    
+
     @Transactional
     public String toJsonWithNestedFull() {
-        return new JSONSerializer().exclude("*.class").include("results.lsTags", "results.lsLabels", "results.lsStates.lsValues", "results.firstSubjects.firstSubject.lsStates.lsValues","results.firstSubjects.firstSubject.lsLabels", "results.secondSubjects.secondSubject.lsStates.lsValues","results.secondSubjects.secondSubject.lsLabels","results.firstSubjects.lsStates.lsValues","results.firstSubjects.lsLabels","results.secondSubjects.lsStates.lsValues","results.secondSubjects.lsLabels").transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().exclude("*.class").include("results.lsTags", "results.lsLabels",
+                "results.lsStates.lsValues", "results.firstSubjects.firstSubject.lsStates.lsValues",
+                "results.firstSubjects.firstSubject.lsLabels", "results.secondSubjects.secondSubject.lsStates.lsValues",
+                "results.secondSubjects.secondSubject.lsLabels", "results.firstSubjects.lsStates.lsValues",
+                "results.firstSubjects.lsLabels", "results.secondSubjects.lsStates.lsValues",
+                "results.secondSubjects.lsLabels").transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public String toPrettyJson() {
-        return new JSONSerializer().exclude("*.class", "results.lsStates.lsValues.lsState", "results.lsStates.subject", "results.lsLabels.subject").include("results.lsTags", "results.lsLabels", "results.lsStates.lsValues").prettyPrint(true).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer()
+                .exclude("*.class", "results.lsStates.lsValues.lsState", "results.lsStates.subject",
+                        "results.lsLabels.subject")
+                .include("results.lsTags", "results.lsLabels", "results.lsStates.lsValues").prettyPrint(true)
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
     @Transactional
     public String toJsonStub() {
-        return new JSONSerializer().exclude("*.class", "results.lsStates").include("results.lsTags", "results.lsLabels").prettyPrint(false).transform(new ExcludeNulls(), void.class).serialize(this);
+        return new JSONSerializer().exclude("*.class", "results.lsStates").include("results.lsTags", "results.lsLabels")
+                .prettyPrint(false).transform(new ExcludeNulls(), void.class).serialize(this);
     }
-	
 
-	public Integer getMaxResults() {
+    public Integer getMaxResults() {
         return this.maxResults;
     }
 
-	public void setMaxResults(Integer maxResults) {
+    public void setMaxResults(Integer maxResults) {
         this.maxResults = maxResults;
     }
 
-	public Integer getNumberOfResults() {
+    public Integer getNumberOfResults() {
         return this.numberOfResults;
     }
 
-	public void setNumberOfResults(Integer numberOfResults) {
+    public void setNumberOfResults(Integer numberOfResults) {
         this.numberOfResults = numberOfResults;
     }
 
-	public Collection<Subject> getResults() {
+    public Collection<Subject> getResults() {
         return this.results;
     }
 
-	public void setResults(Collection<Subject> results) {
+    public void setResults(Collection<Subject> results) {
         this.results = results;
     }
 
-	public static SubjectSearchResultDTO fromJsonToSubjectSearchResultDTO(String json) {
+    public static SubjectSearchResultDTO fromJsonToSubjectSearchResultDTO(String json) {
         return new JSONDeserializer<SubjectSearchResultDTO>()
-        .use(null, SubjectSearchResultDTO.class).deserialize(json);
+                .use(null, SubjectSearchResultDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<SubjectSearchResultDTO> collection) {
+    public static String toJsonArray(Collection<SubjectSearchResultDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<SubjectSearchResultDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<SubjectSearchResultDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<SubjectSearchResultDTO> fromJsonArrayToSubjectSearchResultDTO(String json) {
+    public static Collection<SubjectSearchResultDTO> fromJsonArrayToSubjectSearchResultDTO(String json) {
         return new JSONDeserializer<List<SubjectSearchResultDTO>>()
-        .use("values", SubjectSearchResultDTO.class).deserialize(json);
+                .use("values", SubjectSearchResultDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectStateDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectStateDTO.java
index fdb0e2056..efebd23e8 100755
--- a/src/main/java/com/labsynch/labseer/dto/SubjectStateDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectStateDTO.java
@@ -13,188 +13,184 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class SubjectStateDTO {
-	
+
     public SubjectStateDTO(SubjectState subjectState) {
-    	this.setId(subjectState.getId());
-		this.setRecordedBy(subjectState.getRecordedBy());
-		this.setRecordedDate(subjectState.getRecordedDate());
-		this.setLsTransaction_Id(subjectState.getLsTransaction());
-		this.setModifiedBy(subjectState.getModifiedBy());
-		this.setModifiedDate(subjectState.getModifiedDate());
-		this.setIgnored(subjectState.isIgnored());
-		this.setLsKind(subjectState.getLsKind());	
-		this.setLsType(subjectState.getLsType());	
-		this.setLsTypeAndKind(subjectState.getLsTypeAndKind());
-		this.setComments(subjectState.getComments());
-		this.setSubject(new SubjectMiniDTO(subjectState.getSubject()));
+        this.setId(subjectState.getId());
+        this.setRecordedBy(subjectState.getRecordedBy());
+        this.setRecordedDate(subjectState.getRecordedDate());
+        this.setLsTransaction_Id(subjectState.getLsTransaction());
+        this.setModifiedBy(subjectState.getModifiedBy());
+        this.setModifiedDate(subjectState.getModifiedDate());
+        this.setIgnored(subjectState.isIgnored());
+        this.setLsKind(subjectState.getLsKind());
+        this.setLsType(subjectState.getLsType());
+        this.setLsTypeAndKind(subjectState.getLsTypeAndKind());
+        this.setComments(subjectState.getComments());
+        this.setSubject(new SubjectMiniDTO(subjectState.getSubject()));
     }
 
-	private Long id;
-    
-	private SubjectMiniDTO subject;
-	
-	private String recordedBy;
+    private Long id;
 
-	private Date recordedDate;
+    private SubjectMiniDTO subject;
 
-	private String modifiedBy;
+    private String recordedBy;
 
-	private Date modifiedDate;
+    private Date recordedDate;
 
-	private String lsType;
+    private String modifiedBy;
 
-	private String lsKind;
+    private Date modifiedDate;
 
-	private String lsTypeAndKind;
+    private String lsType;
 
-	private String comments;
+    private String lsKind;
 
-	private boolean ignored;
+    private String lsTypeAndKind;
 
-	private Long lsTransaction_Id;
+    private String comments;
 
-    private Set<SubjectValue> subjectValues = new HashSet<SubjectValue>();
+    private boolean ignored;
 
+    private Long lsTransaction_Id;
 
+    private Set<SubjectValue> subjectValues = new HashSet<SubjectValue>();
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static SubjectStateDTO fromJsonToSubjectStateDTO(String json) {
+    public static SubjectStateDTO fromJsonToSubjectStateDTO(String json) {
         return new JSONDeserializer<SubjectStateDTO>()
-        .use(null, SubjectStateDTO.class).deserialize(json);
+                .use(null, SubjectStateDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<SubjectStateDTO> collection) {
+    public static String toJsonArray(Collection<SubjectStateDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<SubjectStateDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<SubjectStateDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<SubjectStateDTO> fromJsonArrayToSubjectStateDTO(String json) {
+    public static Collection<SubjectStateDTO> fromJsonArrayToSubjectStateDTO(String json) {
         return new JSONDeserializer<List<SubjectStateDTO>>()
-        .use("values", SubjectStateDTO.class).deserialize(json);
+                .use("values", SubjectStateDTO.class).deserialize(json);
     }
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public SubjectMiniDTO getSubject() {
+    public SubjectMiniDTO getSubject() {
         return this.subject;
     }
 
-	public void setSubject(SubjectMiniDTO subject) {
+    public void setSubject(SubjectMiniDTO subject) {
         this.subject = subject;
     }
 
-	public String getRecordedBy() {
+    public String getRecordedBy() {
         return this.recordedBy;
     }
 
-	public void setRecordedBy(String recordedBy) {
+    public void setRecordedBy(String recordedBy) {
         this.recordedBy = recordedBy;
     }
 
-	public Date getRecordedDate() {
+    public Date getRecordedDate() {
         return this.recordedDate;
     }
 
-	public void setRecordedDate(Date recordedDate) {
+    public void setRecordedDate(Date recordedDate) {
         this.recordedDate = recordedDate;
     }
 
-	public String getModifiedBy() {
+    public String getModifiedBy() {
         return this.modifiedBy;
     }
 
-	public void setModifiedBy(String modifiedBy) {
+    public void setModifiedBy(String modifiedBy) {
         this.modifiedBy = modifiedBy;
     }
 
-	public Date getModifiedDate() {
+    public Date getModifiedDate() {
         return this.modifiedDate;
     }
 
-	public void setModifiedDate(Date modifiedDate) {
+    public void setModifiedDate(Date modifiedDate) {
         this.modifiedDate = modifiedDate;
     }
 
-	public String getLsType() {
+    public String getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(String lsType) {
+    public void setLsType(String lsType) {
         this.lsType = lsType;
     }
 
-	public String getLsKind() {
+    public String getLsKind() {
         return this.lsKind;
     }
 
-	public void setLsKind(String lsKind) {
+    public void setLsKind(String lsKind) {
         this.lsKind = lsKind;
     }
 
-	public String getLsTypeAndKind() {
+    public String getLsTypeAndKind() {
         return this.lsTypeAndKind;
     }
 
-	public void setLsTypeAndKind(String lsTypeAndKind) {
+    public void setLsTypeAndKind(String lsTypeAndKind) {
         this.lsTypeAndKind = lsTypeAndKind;
     }
 
-	public String getComments() {
+    public String getComments() {
         return this.comments;
     }
 
-	public void setComments(String comments) {
+    public void setComments(String comments) {
         this.comments = comments;
     }
 
-	public boolean isIgnored() {
+    public boolean isIgnored() {
         return this.ignored;
     }
 
-	public void setIgnored(boolean ignored) {
+    public void setIgnored(boolean ignored) {
         this.ignored = ignored;
     }
 
-	public Long getLsTransaction_Id() {
+    public Long getLsTransaction_Id() {
         return this.lsTransaction_Id;
     }
 
-	public void setLsTransaction_Id(Long lsTransaction_Id) {
+    public void setLsTransaction_Id(Long lsTransaction_Id) {
         this.lsTransaction_Id = lsTransaction_Id;
     }
 
-	public Set<SubjectValue> getSubjectValues() {
+    public Set<SubjectValue> getSubjectValues() {
         return this.subjectValues;
     }
 
-	public void setSubjectValues(Set<SubjectValue> subjectValues) {
+    public void setSubjectValues(Set<SubjectValue> subjectValues) {
         this.subjectValues = subjectValues;
     }
 }
-
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectStateMiniDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectStateMiniDTO.java
index 3103db460..510754461 100755
--- a/src/main/java/com/labsynch/labseer/dto/SubjectStateMiniDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectStateMiniDTO.java
@@ -11,56 +11,53 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class SubjectStateMiniDTO {
-	
+
     public SubjectStateMiniDTO(SubjectState subjectState) {
-    	this.setId(subjectState.getId());
+        this.setId(subjectState.getId());
     }
 
-	private Long id;
+    private Long id;
 
-
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static SubjectStateMiniDTO fromJsonToSubjectStateMiniDTO(String json) {
+    public static SubjectStateMiniDTO fromJsonToSubjectStateMiniDTO(String json) {
         return new JSONDeserializer<SubjectStateMiniDTO>()
-        .use(null, SubjectStateMiniDTO.class).deserialize(json);
+                .use(null, SubjectStateMiniDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<SubjectStateMiniDTO> collection) {
+    public static String toJsonArray(Collection<SubjectStateMiniDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<SubjectStateMiniDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<SubjectStateMiniDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<SubjectStateMiniDTO> fromJsonArrayToSubjectStateMiniDTO(String json) {
+    public static Collection<SubjectStateMiniDTO> fromJsonArrayToSubjectStateMiniDTO(String json) {
         return new JSONDeserializer<List<SubjectStateMiniDTO>>()
-        .use("values", SubjectStateMiniDTO.class).deserialize(json);
+                .use("values", SubjectStateMiniDTO.class).deserialize(json);
     }
 }
-
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectStatePathDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectStatePathDTO.java
index 3f6778e63..8d432005a 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectStatePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectStatePathDTO.java
@@ -10,73 +10,72 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class SubjectStatePathDTO {
 
-	public SubjectStatePathDTO() {
-	}
+    public SubjectStatePathDTO() {
+    }
+
+    private String idOrCodeName;
+
+    private String stateType;
 
-	private String idOrCodeName;
+    private String stateKind;
 
-	private String stateType;
-	
-	private String stateKind;
-	
-	private Collection<SubjectState> states;
-	
-	public String toJson() {
-        return new JSONSerializer().include("states.lsValues").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+    private Collection<SubjectState> states;
+
+    public String toJson() {
+        return new JSONSerializer().include("states.lsValues").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
-	
-	public static String toJsonArray(Collection<SubjectStatePathDTO> collection) {
-        return new JSONSerializer().include("states.lsValues").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
+
+    public static String toJsonArray(Collection<SubjectStatePathDTO> collection) {
+        return new JSONSerializer().include("states.lsValues").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public static SubjectStatePathDTO fromJsonToSubjectStatePathDTO(String json) {
+    public static SubjectStatePathDTO fromJsonToSubjectStatePathDTO(String json) {
         return new JSONDeserializer<SubjectStatePathDTO>()
-        .use(null, SubjectStatePathDTO.class).deserialize(json);
+                .use(null, SubjectStatePathDTO.class).deserialize(json);
     }
 
-	public static Collection<SubjectStatePathDTO> fromJsonArrayToSubjectStatePathDTO(String json) {
+    public static Collection<SubjectStatePathDTO> fromJsonArrayToSubjectStatePathDTO(String json) {
         return new JSONDeserializer<List<SubjectStatePathDTO>>()
-        .use("values", SubjectStatePathDTO.class).deserialize(json);
+                .use("values", SubjectStatePathDTO.class).deserialize(json);
     }
 
-	public String getIdOrCodeName() {
+    public String getIdOrCodeName() {
         return this.idOrCodeName;
     }
 
-	public void setIdOrCodeName(String idOrCodeName) {
+    public void setIdOrCodeName(String idOrCodeName) {
         this.idOrCodeName = idOrCodeName;
     }
 
-	public String getStateType() {
+    public String getStateType() {
         return this.stateType;
     }
 
-	public void setStateType(String stateType) {
+    public void setStateType(String stateType) {
         this.stateType = stateType;
     }
 
-	public String getStateKind() {
+    public String getStateKind() {
         return this.stateKind;
     }
 
-	public void setStateKind(String stateKind) {
+    public void setStateKind(String stateKind) {
         this.stateKind = stateKind;
     }
 
-	public Collection<SubjectState> getStates() {
+    public Collection<SubjectState> getStates() {
         return this.states;
     }
 
-	public void setStates(Collection<SubjectState> states) {
+    public void setStates(Collection<SubjectState> states) {
         this.states = states;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectStateValueDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectStateValueDTO.java
index 7b15bc72f..abb5ad616 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectStateValueDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectStateValueDTO.java
@@ -7,58 +7,57 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-
 public class SubjectStateValueDTO {
-	long subjectId;
-	String subjectValue;
+    long subjectId;
+    String subjectValue;
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static SubjectStateValueDTO fromJsonToSubjectStateValueDTO(String json) {
+    public static SubjectStateValueDTO fromJsonToSubjectStateValueDTO(String json) {
         return new JSONDeserializer<SubjectStateValueDTO>()
-        .use(null, SubjectStateValueDTO.class).deserialize(json);
+                .use(null, SubjectStateValueDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<SubjectStateValueDTO> collection) {
+    public static String toJsonArray(Collection<SubjectStateValueDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<SubjectStateValueDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<SubjectStateValueDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<SubjectStateValueDTO> fromJsonArrayToSubjectStateValueDTO(String json) {
+    public static Collection<SubjectStateValueDTO> fromJsonArrayToSubjectStateValueDTO(String json) {
         return new JSONDeserializer<List<SubjectStateValueDTO>>()
-        .use("values", SubjectStateValueDTO.class).deserialize(json);
+                .use("values", SubjectStateValueDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public long getSubjectId() {
+    public long getSubjectId() {
         return this.subjectId;
     }
 
-	public void setSubjectId(long subjectId) {
+    public void setSubjectId(long subjectId) {
         this.subjectId = subjectId;
     }
 
-	public String getSubjectValue() {
+    public String getSubjectValue() {
         return this.subjectValue;
     }
 
-	public void setSubjectValue(String subjectValue) {
+    public void setSubjectValue(String subjectValue) {
         this.subjectValue = subjectValue;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectValueDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectValueDTO.java
index 0fd2e901e..6c2e675e0 100755
--- a/src/main/java/com/labsynch/labseer/dto/SubjectValueDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectValueDTO.java
@@ -14,457 +14,452 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class SubjectValueDTO {
-	
-	
+
     public SubjectValueDTO(SubjectValue subjectValue) {
-    	this.setSubjectId(subjectValue.getSubjectId());
-    	
-    	this.setLsState(subjectValue.getLsState());
-    	
-    	this.setId(subjectValue.getId());
-    	this.setLsType(subjectValue.getLsType());
-    	this.setLsKind(subjectValue.getLsKind());
-    	this.setLsTypeAndKind(subjectValue.getLsTypeAndKind());
-    	
-		this.setStringValue(subjectValue.getStringValue());
-		this.setCodeValue(subjectValue.getCodeValue());
-		this.setFileValue(subjectValue.getFileValue());
-		this.setUrlValue(subjectValue.getUrlValue());
-		this.setDateValue(subjectValue.getDateValue());
-		this.setClobValue(subjectValue.getClobValue());
-		this.setBlobValue(subjectValue.getBlobValue());
-		this.setNumericValue(subjectValue.getNumericValue());
-		
-		this.setSigFigs(subjectValue.getSigFigs());
-		this.setUncertainty(subjectValue.getUncertainty());
-		this.setNumberOfReplicates(subjectValue.getNumberOfReplicates());
-		this.setUncertaintyType(subjectValue.getUncertaintyType());
-		
-		this.setComments(subjectValue.getComments());
-		this.setIgnored(subjectValue.isIgnored());
-		this.setModifiedDate(subjectValue.getModifiedDate());
-		this.setRecordedDate(subjectValue.getRecordedDate());
-		this.setPublicData(subjectValue.isPublicData());
-
-		this.setCodeOrigin(subjectValue.getCodeOrigin());
-		this.setCodeType(subjectValue.getCodeType());
-		this.setCodeKind(subjectValue.getCodeKind());
-		this.setOperatorType(subjectValue.getOperatorType());
-		this.setOperatorKind(subjectValue.getOperatorKind());
-		this.setUnitType(subjectValue.getUnitType());
-		this.setUnitKind(subjectValue.getUnitKind());
-
-		this.setLsTransaction(subjectValue.getLsTransaction());
-    	this.setRecordedBy(subjectValue.getRecordedBy());
-		this.setModifiedBy(subjectValue.getModifiedBy());
-		this.setStateId(subjectValue.getStateId());	
-		this.setStateKind(subjectValue.getStateKind());	
-		this.setStateType(subjectValue.getStateType());
-    }
-    
+        this.setSubjectId(subjectValue.getSubjectId());
+
+        this.setLsState(subjectValue.getLsState());
+
+        this.setId(subjectValue.getId());
+        this.setLsType(subjectValue.getLsType());
+        this.setLsKind(subjectValue.getLsKind());
+        this.setLsTypeAndKind(subjectValue.getLsTypeAndKind());
+
+        this.setStringValue(subjectValue.getStringValue());
+        this.setCodeValue(subjectValue.getCodeValue());
+        this.setFileValue(subjectValue.getFileValue());
+        this.setUrlValue(subjectValue.getUrlValue());
+        this.setDateValue(subjectValue.getDateValue());
+        this.setClobValue(subjectValue.getClobValue());
+        this.setBlobValue(subjectValue.getBlobValue());
+        this.setNumericValue(subjectValue.getNumericValue());
+
+        this.setSigFigs(subjectValue.getSigFigs());
+        this.setUncertainty(subjectValue.getUncertainty());
+        this.setNumberOfReplicates(subjectValue.getNumberOfReplicates());
+        this.setUncertaintyType(subjectValue.getUncertaintyType());
+
+        this.setComments(subjectValue.getComments());
+        this.setIgnored(subjectValue.isIgnored());
+        this.setModifiedDate(subjectValue.getModifiedDate());
+        this.setRecordedDate(subjectValue.getRecordedDate());
+        this.setPublicData(subjectValue.isPublicData());
+
+        this.setCodeOrigin(subjectValue.getCodeOrigin());
+        this.setCodeType(subjectValue.getCodeType());
+        this.setCodeKind(subjectValue.getCodeKind());
+        this.setOperatorType(subjectValue.getOperatorType());
+        this.setOperatorKind(subjectValue.getOperatorKind());
+        this.setUnitType(subjectValue.getUnitType());
+        this.setUnitKind(subjectValue.getUnitKind());
+
+        this.setLsTransaction(subjectValue.getLsTransaction());
+        this.setRecordedBy(subjectValue.getRecordedBy());
+        this.setModifiedBy(subjectValue.getModifiedBy());
+        this.setStateId(subjectValue.getStateId());
+        this.setStateKind(subjectValue.getStateKind());
+        this.setStateType(subjectValue.getStateType());
+    }
+
     private Long treatmentGroupId;
     private Long subjectId;
-	
+
     private SubjectState lsState;
-	
-	private Long id;
+
+    private Long id;
     private String lsType;
-	private String lsKind;
-	private String lsTypeAndKind;
-	
-	private String stringValue;
-	private String codeValue;
-	private String fileValue;
-	private String urlValue;
-	private Date dateValue;
-	private String clobValue;
+    private String lsKind;
+    private String lsTypeAndKind;
+
+    private String stringValue;
+    private String codeValue;
+    private String fileValue;
+    private String urlValue;
+    private Date dateValue;
+    private String clobValue;
     private byte[] blobValue;
     private BigDecimal numericValue;
-    
-	private Integer sigFigs;
-	private BigDecimal uncertainty;
-	private Integer numberOfReplicates;
-	private String uncertaintyType;
-	
-	private String comments;
-	private boolean ignored;
-	private Date recordedDate;
-	private Date modifiedDate;
-	private boolean publicData;
-	
-	private String codeOrigin;
-	private String codeType;
-	private String codeKind;
+
+    private Integer sigFigs;
+    private BigDecimal uncertainty;
+    private Integer numberOfReplicates;
+    private String uncertaintyType;
+
+    private String comments;
+    private boolean ignored;
+    private Date recordedDate;
+    private Date modifiedDate;
+    private boolean publicData;
+
+    private String codeOrigin;
+    private String codeType;
+    private String codeKind;
     private String operatorType;
-	private String operatorKind;
+    private String operatorKind;
     private String unitType;
-	private String unitKind;
-	private Long lsTransaction;
-	private String recordedBy;
-	private String modifiedBy;
+    private String unitKind;
+    private Long lsTransaction;
+    private String recordedBy;
+    private String modifiedBy;
     private Long stateId;
-	private String stateType;
-	private String stateKind;
-	
-	private BigDecimal concentration;
-	private String concUnit;
-	
-	public boolean getIgnored() {
-		return this.isIgnored();
-	}
-	
-	public boolean getPublicData() {
-		return this.isPublicData();
-	}
-
-
-
-	public Long getTreatmentGroupId() {
+    private String stateType;
+    private String stateKind;
+
+    private BigDecimal concentration;
+    private String concUnit;
+
+    public boolean getIgnored() {
+        return this.isIgnored();
+    }
+
+    public boolean getPublicData() {
+        return this.isPublicData();
+    }
+
+    public Long getTreatmentGroupId() {
         return this.treatmentGroupId;
     }
 
-	public void setTreatmentGroupId(Long treatmentGroupId) {
+    public void setTreatmentGroupId(Long treatmentGroupId) {
         this.treatmentGroupId = treatmentGroupId;
     }
 
-	public Long getSubjectId() {
+    public Long getSubjectId() {
         return this.subjectId;
     }
 
-	public void setSubjectId(Long subjectId) {
+    public void setSubjectId(Long subjectId) {
         this.subjectId = subjectId;
     }
 
-	public SubjectState getLsState() {
+    public SubjectState getLsState() {
         return this.lsState;
     }
 
-	public void setLsState(SubjectState lsState) {
+    public void setLsState(SubjectState lsState) {
         this.lsState = lsState;
     }
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public String getLsType() {
+    public String getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(String lsType) {
+    public void setLsType(String lsType) {
         this.lsType = lsType;
     }
 
-	public String getLsKind() {
+    public String getLsKind() {
         return this.lsKind;
     }
 
-	public void setLsKind(String lsKind) {
+    public void setLsKind(String lsKind) {
         this.lsKind = lsKind;
     }
 
-	public String getLsTypeAndKind() {
+    public String getLsTypeAndKind() {
         return this.lsTypeAndKind;
     }
 
-	public void setLsTypeAndKind(String lsTypeAndKind) {
+    public void setLsTypeAndKind(String lsTypeAndKind) {
         this.lsTypeAndKind = lsTypeAndKind;
     }
 
-	public String getStringValue() {
+    public String getStringValue() {
         return this.stringValue;
     }
 
-	public void setStringValue(String stringValue) {
+    public void setStringValue(String stringValue) {
         this.stringValue = stringValue;
     }
 
-	public String getCodeValue() {
+    public String getCodeValue() {
         return this.codeValue;
     }
 
-	public void setCodeValue(String codeValue) {
+    public void setCodeValue(String codeValue) {
         this.codeValue = codeValue;
     }
 
-	public String getFileValue() {
+    public String getFileValue() {
         return this.fileValue;
     }
 
-	public void setFileValue(String fileValue) {
+    public void setFileValue(String fileValue) {
         this.fileValue = fileValue;
     }
 
-	public String getUrlValue() {
+    public String getUrlValue() {
         return this.urlValue;
     }
 
-	public void setUrlValue(String urlValue) {
+    public void setUrlValue(String urlValue) {
         this.urlValue = urlValue;
     }
 
-	public Date getDateValue() {
+    public Date getDateValue() {
         return this.dateValue;
     }
 
-	public void setDateValue(Date dateValue) {
+    public void setDateValue(Date dateValue) {
         this.dateValue = dateValue;
     }
 
-	public String getClobValue() {
+    public String getClobValue() {
         return this.clobValue;
     }
 
-	public void setClobValue(String clobValue) {
+    public void setClobValue(String clobValue) {
         this.clobValue = clobValue;
     }
 
-	public byte[] getBlobValue() {
+    public byte[] getBlobValue() {
         return this.blobValue;
     }
 
-	public void setBlobValue(byte[] blobValue) {
+    public void setBlobValue(byte[] blobValue) {
         this.blobValue = blobValue;
     }
 
-	public BigDecimal getNumericValue() {
+    public BigDecimal getNumericValue() {
         return this.numericValue;
     }
 
-	public void setNumericValue(BigDecimal numericValue) {
+    public void setNumericValue(BigDecimal numericValue) {
         this.numericValue = numericValue;
     }
 
-	public Integer getSigFigs() {
+    public Integer getSigFigs() {
         return this.sigFigs;
     }
 
-	public void setSigFigs(Integer sigFigs) {
+    public void setSigFigs(Integer sigFigs) {
         this.sigFigs = sigFigs;
     }
 
-	public BigDecimal getUncertainty() {
+    public BigDecimal getUncertainty() {
         return this.uncertainty;
     }
 
-	public void setUncertainty(BigDecimal uncertainty) {
+    public void setUncertainty(BigDecimal uncertainty) {
         this.uncertainty = uncertainty;
     }
 
-	public Integer getNumberOfReplicates() {
+    public Integer getNumberOfReplicates() {
         return this.numberOfReplicates;
     }
 
-	public void setNumberOfReplicates(Integer numberOfReplicates) {
+    public void setNumberOfReplicates(Integer numberOfReplicates) {
         this.numberOfReplicates = numberOfReplicates;
     }
 
-	public String getUncertaintyType() {
+    public String getUncertaintyType() {
         return this.uncertaintyType;
     }
 
-	public void setUncertaintyType(String uncertaintyType) {
+    public void setUncertaintyType(String uncertaintyType) {
         this.uncertaintyType = uncertaintyType;
     }
 
-	public String getComments() {
+    public String getComments() {
         return this.comments;
     }
 
-	public void setComments(String comments) {
+    public void setComments(String comments) {
         this.comments = comments;
     }
 
-	public boolean isIgnored() {
+    public boolean isIgnored() {
         return this.ignored;
     }
 
-	public void setIgnored(boolean ignored) {
+    public void setIgnored(boolean ignored) {
         this.ignored = ignored;
     }
 
-	public Date getRecordedDate() {
+    public Date getRecordedDate() {
         return this.recordedDate;
     }
 
-	public void setRecordedDate(Date recordedDate) {
+    public void setRecordedDate(Date recordedDate) {
         this.recordedDate = recordedDate;
     }
 
-	public Date getModifiedDate() {
+    public Date getModifiedDate() {
         return this.modifiedDate;
     }
 
-	public void setModifiedDate(Date modifiedDate) {
+    public void setModifiedDate(Date modifiedDate) {
         this.modifiedDate = modifiedDate;
     }
 
-	public boolean isPublicData() {
+    public boolean isPublicData() {
         return this.publicData;
     }
 
-	public void setPublicData(boolean publicData) {
+    public void setPublicData(boolean publicData) {
         this.publicData = publicData;
     }
 
-	public String getCodeOrigin() {
+    public String getCodeOrigin() {
         return this.codeOrigin;
     }
 
-	public void setCodeOrigin(String codeOrigin) {
+    public void setCodeOrigin(String codeOrigin) {
         this.codeOrigin = codeOrigin;
     }
 
-	public String getCodeType() {
+    public String getCodeType() {
         return this.codeType;
     }
 
-	public void setCodeType(String codeType) {
+    public void setCodeType(String codeType) {
         this.codeType = codeType;
     }
 
-	public String getCodeKind() {
+    public String getCodeKind() {
         return this.codeKind;
     }
 
-	public void setCodeKind(String codeKind) {
+    public void setCodeKind(String codeKind) {
         this.codeKind = codeKind;
     }
 
-	public String getOperatorType() {
+    public String getOperatorType() {
         return this.operatorType;
     }
 
-	public void setOperatorType(String operatorType) {
+    public void setOperatorType(String operatorType) {
         this.operatorType = operatorType;
     }
 
-	public String getOperatorKind() {
+    public String getOperatorKind() {
         return this.operatorKind;
     }
 
-	public void setOperatorKind(String operatorKind) {
+    public void setOperatorKind(String operatorKind) {
         this.operatorKind = operatorKind;
     }
 
-	public String getUnitType() {
+    public String getUnitType() {
         return this.unitType;
     }
 
-	public void setUnitType(String unitType) {
+    public void setUnitType(String unitType) {
         this.unitType = unitType;
     }
 
-	public String getUnitKind() {
+    public String getUnitKind() {
         return this.unitKind;
     }
 
-	public void setUnitKind(String unitKind) {
+    public void setUnitKind(String unitKind) {
         this.unitKind = unitKind;
     }
 
-	public Long getLsTransaction() {
+    public Long getLsTransaction() {
         return this.lsTransaction;
     }
 
-	public void setLsTransaction(Long lsTransaction) {
+    public void setLsTransaction(Long lsTransaction) {
         this.lsTransaction = lsTransaction;
     }
 
-	public String getRecordedBy() {
+    public String getRecordedBy() {
         return this.recordedBy;
     }
 
-	public void setRecordedBy(String recordedBy) {
+    public void setRecordedBy(String recordedBy) {
         this.recordedBy = recordedBy;
     }
 
-	public String getModifiedBy() {
+    public String getModifiedBy() {
         return this.modifiedBy;
     }
 
-	public void setModifiedBy(String modifiedBy) {
+    public void setModifiedBy(String modifiedBy) {
         this.modifiedBy = modifiedBy;
     }
 
-	public Long getStateId() {
+    public Long getStateId() {
         return this.stateId;
     }
 
-	public void setStateId(Long stateId) {
+    public void setStateId(Long stateId) {
         this.stateId = stateId;
     }
 
-	public String getStateType() {
+    public String getStateType() {
         return this.stateType;
     }
 
-	public void setStateType(String stateType) {
+    public void setStateType(String stateType) {
         this.stateType = stateType;
     }
 
-	public String getStateKind() {
+    public String getStateKind() {
         return this.stateKind;
     }
 
-	public void setStateKind(String stateKind) {
+    public void setStateKind(String stateKind) {
         this.stateKind = stateKind;
     }
 
-	public BigDecimal getConcentration() {
+    public BigDecimal getConcentration() {
         return this.concentration;
     }
 
-	public void setConcentration(BigDecimal concentration) {
+    public void setConcentration(BigDecimal concentration) {
         this.concentration = concentration;
     }
 
-	public String getConcUnit() {
+    public String getConcUnit() {
         return this.concUnit;
     }
 
-	public void setConcUnit(String concUnit) {
+    public void setConcUnit(String concUnit) {
         this.concUnit = concUnit;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static SubjectValueDTO fromJsonToSubjectValueDTO(String json) {
+    public static SubjectValueDTO fromJsonToSubjectValueDTO(String json) {
         return new JSONDeserializer<SubjectValueDTO>()
-        .use(null, SubjectValueDTO.class).deserialize(json);
+                .use(null, SubjectValueDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<SubjectValueDTO> collection) {
+    public static String toJsonArray(Collection<SubjectValueDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<SubjectValueDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<SubjectValueDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<SubjectValueDTO> fromJsonArrayToSubjectValueDTO(String json) {
+    public static Collection<SubjectValueDTO> fromJsonArrayToSubjectValueDTO(String json) {
         return new JSONDeserializer<List<SubjectValueDTO>>()
-        .use("values", SubjectValueDTO.class).deserialize(json);
+                .use("values", SubjectValueDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
-
diff --git a/src/main/java/com/labsynch/labseer/dto/SubjectValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/SubjectValuePathDTO.java
index 3cb78a8de..33b0e420d 100644
--- a/src/main/java/com/labsynch/labseer/dto/SubjectValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/SubjectValuePathDTO.java
@@ -10,93 +10,92 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class SubjectValuePathDTO {
 
-	public SubjectValuePathDTO() {
-	}
+    public SubjectValuePathDTO() {
+    }
+
+    private String idOrCodeName;
+
+    private String stateType;
+
+    private String stateKind;
 
-	private String idOrCodeName;
+    private String valueType;
 
-	private String stateType;
-	
-	private String stateKind;
-	
-	private String valueType;
-	
-	private String valueKind;
-	
-	private Collection<SubjectValue> values;
-	
-	public String toJson() {
-        return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+    private String valueKind;
+
+    private Collection<SubjectValue> values;
+
+    public String toJson() {
+        return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
-	
-	public static String toJsonArray(Collection<SubjectValuePathDTO> collection) {
-        return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
+
+    public static String toJsonArray(Collection<SubjectValuePathDTO> collection) {
+        return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
 
-	public static SubjectValuePathDTO fromJsonToSubjectValuePathDTO(String json) {
+    public static SubjectValuePathDTO fromJsonToSubjectValuePathDTO(String json) {
         return new JSONDeserializer<SubjectValuePathDTO>()
-        .use(null, SubjectValuePathDTO.class).deserialize(json);
+                .use(null, SubjectValuePathDTO.class).deserialize(json);
     }
 
-	public static Collection<SubjectValuePathDTO> fromJsonArrayToSubjectValuePathDTO(String json) {
+    public static Collection<SubjectValuePathDTO> fromJsonArrayToSubjectValuePathDTO(String json) {
         return new JSONDeserializer<List<SubjectValuePathDTO>>()
-        .use("values", SubjectValuePathDTO.class).deserialize(json);
+                .use("values", SubjectValuePathDTO.class).deserialize(json);
     }
 
-	public String getIdOrCodeName() {
+    public String getIdOrCodeName() {
         return this.idOrCodeName;
     }
 
-	public void setIdOrCodeName(String idOrCodeName) {
+    public void setIdOrCodeName(String idOrCodeName) {
         this.idOrCodeName = idOrCodeName;
     }
 
-	public String getStateType() {
+    public String getStateType() {
         return this.stateType;
     }
 
-	public void setStateType(String stateType) {
+    public void setStateType(String stateType) {
         this.stateType = stateType;
     }
 
-	public String getStateKind() {
+    public String getStateKind() {
         return this.stateKind;
     }
 
-	public void setStateKind(String stateKind) {
+    public void setStateKind(String stateKind) {
         this.stateKind = stateKind;
     }
 
-	public String getValueType() {
+    public String getValueType() {
         return this.valueType;
     }
 
-	public void setValueType(String valueType) {
+    public void setValueType(String valueType) {
         this.valueType = valueType;
     }
 
-	public String getValueKind() {
+    public String getValueKind() {
         return this.valueKind;
     }
 
-	public void setValueKind(String valueKind) {
+    public void setValueKind(String valueKind) {
         this.valueKind = valueKind;
     }
 
-	public Collection<SubjectValue> getValues() {
+    public Collection<SubjectValue> getValues() {
         return this.values;
     }
 
-	public void setValues(Collection<SubjectValue> values) {
+    public void setValues(Collection<SubjectValue> values) {
         this.values = values;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/TempThingDTO.java b/src/main/java/com/labsynch/labseer/dto/TempThingDTO.java
index fb5c90ea7..c3f1705e7 100644
--- a/src/main/java/com/labsynch/labseer/dto/TempThingDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TempThingDTO.java
@@ -11,96 +11,92 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class TempThingDTO {
 
-	private static final Logger logger = LoggerFactory.getLogger(TempThingDTO.class);
-
-	public TempThingDTO(){
-		//empty constructor
-	}
+    private static final Logger logger = LoggerFactory.getLogger(TempThingDTO.class);
 
-	private Long parentId;
-	private String parentCodeName;
+    public TempThingDTO() {
+        // empty constructor
+    }
 
-	private Long id;	
-	private String codeName;
-	private String tempId;
+    private Long parentId;
+    private String parentCodeName;
 
+    private Long id;
+    private String codeName;
+    private String tempId;
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static TempThingDTO fromJsonToTempThingDTO(String json) {
+    public static TempThingDTO fromJsonToTempThingDTO(String json) {
         return new JSONDeserializer<TempThingDTO>()
-        .use(null, TempThingDTO.class).deserialize(json);
+                .use(null, TempThingDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<TempThingDTO> collection) {
+    public static String toJsonArray(Collection<TempThingDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<TempThingDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<TempThingDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<TempThingDTO> fromJsonArrayToTempThingDTO(String json) {
+    public static Collection<TempThingDTO> fromJsonArrayToTempThingDTO(String json) {
         return new JSONDeserializer<List<TempThingDTO>>()
-        .use("values", TempThingDTO.class).deserialize(json);
+                .use("values", TempThingDTO.class).deserialize(json);
     }
 
-	public Long getParentId() {
+    public Long getParentId() {
         return this.parentId;
     }
 
-	public void setParentId(Long parentId) {
+    public void setParentId(Long parentId) {
         this.parentId = parentId;
     }
 
-	public String getParentCodeName() {
+    public String getParentCodeName() {
         return this.parentCodeName;
     }
 
-	public void setParentCodeName(String parentCodeName) {
+    public void setParentCodeName(String parentCodeName) {
         this.parentCodeName = parentCodeName;
     }
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public String getCodeName() {
+    public String getCodeName() {
         return this.codeName;
     }
 
-	public void setCodeName(String codeName) {
+    public void setCodeName(String codeName) {
         this.codeName = codeName;
     }
 
-	public String getTempId() {
+    public String getTempId() {
         return this.tempId;
     }
 
-	public void setTempId(String tempId) {
+    public void setTempId(String tempId) {
         this.tempId = tempId;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/TgDataDTO.java b/src/main/java/com/labsynch/labseer/dto/TgDataDTO.java
index 370a3f3e9..67ff98d6c 100644
--- a/src/main/java/com/labsynch/labseer/dto/TgDataDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TgDataDTO.java
@@ -25,9 +25,8 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class TgDataDTO {
-	
+
 	private String curveId;
 	private String recordedBy;
 	private Long lsTransaction;
@@ -41,15 +40,15 @@ public class TgDataDTO {
 	private String uncertaintyType;
 	private BigDecimal uncertainty;
 	private Boolean publicData;
-	
-	public TgDataDTO(){
-		//empty constructor
+
+	public TgDataDTO() {
+		// empty constructor
 	}
-	
-	public TgDataDTO(String curveId){
+
+	public TgDataDTO(String curveId) {
 		this.curveId = curveId;
 	}
-	
+
 	public TgDataDTO(String curveId, String recordedBy, Long lsTransaction, TreatmentGroupValue result) {
 		this.curveId = curveId;
 		this.recordedBy = recordedBy;
@@ -64,10 +63,10 @@ public TgDataDTO(String curveId, String recordedBy, Long lsTransaction, Treatmen
 		this.uncertaintyType = result.getUncertaintyType();
 		this.uncertainty = result.getUncertainty();
 		this.publicData = result.isPublicData();
-		
+
 	}
 
-	public static String[] getColumns(){
+	public static String[] getColumns() {
 		String[] headerColumns = new String[] {
 				"curveId",
 				"recordedBy",
@@ -82,14 +81,14 @@ public static String[] getColumns(){
 				"uncertaintyType",
 				"uncertainty",
 				"publicData"
-				};
+		};
 
 		return headerColumns;
 
 	}
 
 	public static CellProcessor[] getProcessors() {
-		final CellProcessor[] processors = new CellProcessor[] { 
+		final CellProcessor[] processors = new CellProcessor[] {
 				new Optional(),
 				new Optional(),
 				new Optional(),
@@ -107,7 +106,7 @@ public static CellProcessor[] getProcessors() {
 
 		return processors;
 	}
-	
+
 	public static Collection<TgDataDTO> getTgData(
 			Collection<TgDataDTO> tgDataDTOs) {
 		List<TgDataDTO> resultList = new ArrayList<TgDataDTO>();
@@ -117,71 +116,74 @@ public static Collection<TgDataDTO> getTgData(
 		return resultList;
 	}
 
-	public static List<TgDataDTO> getTgData(TgDataDTO emptyTgDataDTO){
+	public static List<TgDataDTO> getTgData(TgDataDTO emptyTgDataDTO) {
 		String curveId = emptyTgDataDTO.getCurveId();
 		EntityManager em = SubjectValue.entityManager();
-        TypedQuery<TreatmentGroupValue> q = em.createQuery("SELECT tgv "
-        		+ "FROM AnalysisGroupValue agv "
-        		+ "JOIN agv.lsState as ags "
-        		+ "JOIN ags.analysisGroup as ag "
-        		+ "JOIN ag.treatmentGroups as treat "
-        		+ "JOIN treat.lsStates as tgs "
-        		+ "JOIN tgs.lsValues as tgv "
-        		+ "WHERE tgs.lsType = 'data' "
-        		+ "AND tgs.lsKind = 'results' "
-        		+ "AND tgv.lsType = 'numericValue' "
-        		+ "AND ags.ignored = false "
-        		+ "AND agv.lsType = 'stringValue' "
-        		+ "AND agv.lsKind = 'curve id' "
-        		+ "AND agv.ignored = false "
-        		+ "AND ag.ignored IS NOT :ignored "
-        		+ "AND treat.ignored IS NOT :ignored "
-        		+ "AND agv.stringValue = :curveId", TreatmentGroupValue.class);
-        q.setParameter("curveId", curveId);
-        List<TreatmentGroupValue> queryResults = q.getResultList();
-        List<TgDataDTO> tgDataList = new ArrayList<TgDataDTO>();
-        for (TreatmentGroupValue result : queryResults) {
+		TypedQuery<TreatmentGroupValue> q = em.createQuery("SELECT tgv "
+				+ "FROM AnalysisGroupValue agv "
+				+ "JOIN agv.lsState as ags "
+				+ "JOIN ags.analysisGroup as ag "
+				+ "JOIN ag.treatmentGroups as treat "
+				+ "JOIN treat.lsStates as tgs "
+				+ "JOIN tgs.lsValues as tgv "
+				+ "WHERE tgs.lsType = 'data' "
+				+ "AND tgs.lsKind = 'results' "
+				+ "AND tgv.lsType = 'numericValue' "
+				+ "AND ags.ignored = false "
+				+ "AND agv.lsType = 'stringValue' "
+				+ "AND agv.lsKind = 'curve id' "
+				+ "AND agv.ignored = false "
+				+ "AND ag.ignored IS NOT :ignored "
+				+ "AND treat.ignored IS NOT :ignored "
+				+ "AND agv.stringValue = :curveId", TreatmentGroupValue.class);
+		q.setParameter("curveId", curveId);
+		List<TreatmentGroupValue> queryResults = q.getResultList();
+		List<TgDataDTO> tgDataList = new ArrayList<TgDataDTO>();
+		for (TreatmentGroupValue result : queryResults) {
 			TgDataDTO tgDataDTO = new TgDataDTO(curveId, result.getRecordedBy(), result.getLsTransaction(), result);
 			tgDataList.add(tgDataDTO);
 		}
 		return tgDataList;
 	}
-	
+
 	public static String getCsvList(Collection<TgDataDTO> tgDataDTOs, String format) {
-		//format is ALWAYS tsv or csv (not case sensitive)
+		// format is ALWAYS tsv or csv (not case sensitive)
 		StringWriter outFile = new StringWriter();
-        ICsvBeanWriter beanWriter = null;
-        try {
-            if (format.equalsIgnoreCase("csv")) beanWriter = new CsvBeanWriter(outFile, CsvPreference.STANDARD_PREFERENCE);
-            else beanWriter = new CsvBeanWriter(outFile, CsvPreference.TAB_PREFERENCE);
-            final String[] header = TgDataDTO.getColumns();
-            final CellProcessor[] processors = TgDataDTO.getProcessors();
-            beanWriter.writeHeader(header);
-            for (final TgDataDTO tgDataDTO : tgDataDTOs) {
-                beanWriter.write(tgDataDTO, header, processors);
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            if (beanWriter != null) {
-                try {
-                    beanWriter.close();
-                    outFile.flush();
-                    outFile.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return outFile.toString();
-	}
-
-	public static Collection<TgDataDTO> getTgDataByExperiment(String experimentIdOrCodeName){
-		Collection<TgDataDTO> tgDataDTOs = makeTgDataDTOsFromCurveIdList(CurveFitDTO.findAllCurveIdsByExperiment(experimentIdOrCodeName));
+		ICsvBeanWriter beanWriter = null;
+		try {
+			if (format.equalsIgnoreCase("csv"))
+				beanWriter = new CsvBeanWriter(outFile, CsvPreference.STANDARD_PREFERENCE);
+			else
+				beanWriter = new CsvBeanWriter(outFile, CsvPreference.TAB_PREFERENCE);
+			final String[] header = TgDataDTO.getColumns();
+			final CellProcessor[] processors = TgDataDTO.getProcessors();
+			beanWriter.writeHeader(header);
+			for (final TgDataDTO tgDataDTO : tgDataDTOs) {
+				beanWriter.write(tgDataDTO, header, processors);
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
+		} finally {
+			if (beanWriter != null) {
+				try {
+					beanWriter.close();
+					outFile.flush();
+					outFile.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+		return outFile.toString();
+	}
+
+	public static Collection<TgDataDTO> getTgDataByExperiment(String experimentIdOrCodeName) {
+		Collection<TgDataDTO> tgDataDTOs = makeTgDataDTOsFromCurveIdList(
+				CurveFitDTO.findAllCurveIdsByExperiment(experimentIdOrCodeName));
 		tgDataDTOs = getTgData(tgDataDTOs);
 		return tgDataDTOs;
 	}
-	
+
 	private static Collection<TgDataDTO> makeTgDataDTOsFromCurveIdList(Collection<String> curveIdList) {
 		Collection<TgDataDTO> tgDataDTOs = new HashSet<TgDataDTO>();
 		for (String curveId : curveIdList) {
@@ -193,143 +195,142 @@ private static Collection<TgDataDTO> makeTgDataDTOsFromCurveIdList(Collection<St
 	public static Collection<TgDataDTO> getTgData(List<String> curveIds) {
 		return getTgData(makeTgDataDTOsFromCurveIdList(curveIds));
 	}
-	
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 
 	public String toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(this);
+	}
 
 	public String toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(this);
+	}
 
 	public static TgDataDTO fromJsonToTgDataDTO(String json) {
-        return new JSONDeserializer<TgDataDTO>()
-        .use(null, TgDataDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<TgDataDTO>()
+				.use(null, TgDataDTO.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<TgDataDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<TgDataDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<TgDataDTO> fromJsonArrayToTgDataDTO(String json) {
-        return new JSONDeserializer<List<TgDataDTO>>()
-        .use("values", TgDataDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<TgDataDTO>>()
+				.use("values", TgDataDTO.class).deserialize(json);
+	}
 
 	public String getCurveId() {
-        return this.curveId;
-    }
+		return this.curveId;
+	}
 
 	public void setCurveId(String curveId) {
-        this.curveId = curveId;
-    }
+		this.curveId = curveId;
+	}
 
 	public String getRecordedBy() {
-        return this.recordedBy;
-    }
+		return this.recordedBy;
+	}
 
 	public void setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
+		this.recordedBy = recordedBy;
+	}
 
 	public Long getLsTransaction() {
-        return this.lsTransaction;
-    }
+		return this.lsTransaction;
+	}
 
 	public void setLsTransaction(Long lsTransaction) {
-        this.lsTransaction = lsTransaction;
-    }
+		this.lsTransaction = lsTransaction;
+	}
 
 	public Long getTgvId() {
-        return this.tgvId;
-    }
+		return this.tgvId;
+	}
 
 	public void setTgvId(Long tgvId) {
-        this.tgvId = tgvId;
-    }
+		this.tgvId = tgvId;
+	}
 
 	public String getLsType() {
-        return this.lsType;
-    }
+		return this.lsType;
+	}
 
 	public void setLsType(String lsType) {
-        this.lsType = lsType;
-    }
+		this.lsType = lsType;
+	}
 
 	public String getLsKind() {
-        return this.lsKind;
-    }
+		return this.lsKind;
+	}
 
 	public void setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
+		this.lsKind = lsKind;
+	}
 
 	public Integer getNumberOfReplicates() {
-        return this.numberOfReplicates;
-    }
+		return this.numberOfReplicates;
+	}
 
 	public void setNumberOfReplicates(Integer numberOfReplicates) {
-        this.numberOfReplicates = numberOfReplicates;
-    }
+		this.numberOfReplicates = numberOfReplicates;
+	}
 
 	public BigDecimal getNumericValue() {
-        return this.numericValue;
-    }
+		return this.numericValue;
+	}
 
 	public void setNumericValue(BigDecimal numericValue) {
-        this.numericValue = numericValue;
-    }
+		this.numericValue = numericValue;
+	}
 
 	public String getUnitType() {
-        return this.unitType;
-    }
+		return this.unitType;
+	}
 
 	public void setUnitType(String unitType) {
-        this.unitType = unitType;
-    }
+		this.unitType = unitType;
+	}
 
 	public String getUnitKind() {
-        return this.unitKind;
-    }
+		return this.unitKind;
+	}
 
 	public void setUnitKind(String unitKind) {
-        this.unitKind = unitKind;
-    }
+		this.unitKind = unitKind;
+	}
 
 	public String getUncertaintyType() {
-        return this.uncertaintyType;
-    }
+		return this.uncertaintyType;
+	}
 
 	public void setUncertaintyType(String uncertaintyType) {
-        this.uncertaintyType = uncertaintyType;
-    }
+		this.uncertaintyType = uncertaintyType;
+	}
 
 	public BigDecimal getUncertainty() {
-        return this.uncertainty;
-    }
+		return this.uncertainty;
+	}
 
 	public void setUncertainty(BigDecimal uncertainty) {
-        this.uncertainty = uncertainty;
-    }
+		this.uncertainty = uncertainty;
+	}
 
 	public Boolean getPublicData() {
-        return this.publicData;
-    }
+		return this.publicData;
+	}
 
 	public void setPublicData(Boolean publicData) {
-        this.publicData = publicData;
-    }
+		this.publicData = publicData;
+	}
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupCodeDTO.java b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupCodeDTO.java
index 603f87a24..349d82f30 100644
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupCodeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupCodeDTO.java
@@ -9,65 +9,61 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class TreatmentGroupCodeDTO {
-	
-	private String treatmentGroupCode;
-	private Collection<AnalysisGroupCodeDTO> analysisGroupCodes;
-	
-	public TreatmentGroupCodeDTO(){
-	}
 
+    private String treatmentGroupCode;
+    private Collection<AnalysisGroupCodeDTO> analysisGroupCodes;
+
+    public TreatmentGroupCodeDTO() {
+    }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static TreatmentGroupCodeDTO fromJsonToTreatmentGroupCodeDTO(String json) {
+    public static TreatmentGroupCodeDTO fromJsonToTreatmentGroupCodeDTO(String json) {
         return new JSONDeserializer<TreatmentGroupCodeDTO>()
-        .use(null, TreatmentGroupCodeDTO.class).deserialize(json);
+                .use(null, TreatmentGroupCodeDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<TreatmentGroupCodeDTO> collection) {
+    public static String toJsonArray(Collection<TreatmentGroupCodeDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<TreatmentGroupCodeDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<TreatmentGroupCodeDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<TreatmentGroupCodeDTO> fromJsonArrayToTreatmentGroupCoes(String json) {
+    public static Collection<TreatmentGroupCodeDTO> fromJsonArrayToTreatmentGroupCoes(String json) {
         return new JSONDeserializer<List<TreatmentGroupCodeDTO>>()
-        .use("values", TreatmentGroupCodeDTO.class).deserialize(json);
+                .use("values", TreatmentGroupCodeDTO.class).deserialize(json);
     }
 
-	public String getTreatmentGroupCode() {
+    public String getTreatmentGroupCode() {
         return this.treatmentGroupCode;
     }
 
-	public void setTreatmentGroupCode(String treatmentGroupCode) {
+    public void setTreatmentGroupCode(String treatmentGroupCode) {
         this.treatmentGroupCode = treatmentGroupCode;
     }
 
-	public Collection<AnalysisGroupCodeDTO> getAnalysisGroupCodes() {
+    public Collection<AnalysisGroupCodeDTO> getAnalysisGroupCodes() {
         return this.analysisGroupCodes;
     }
 
-	public void setAnalysisGroupCodes(Collection<AnalysisGroupCodeDTO> analysisGroupCodes) {
+    public void setAnalysisGroupCodes(Collection<AnalysisGroupCodeDTO> analysisGroupCodes) {
         this.analysisGroupCodes = analysisGroupCodes;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupMiniDTO.java b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupMiniDTO.java
index b80a19861..bdceaf1b4 100755
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupMiniDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupMiniDTO.java
@@ -11,80 +11,75 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class TreatmentGroupMiniDTO {
-	
+
     public TreatmentGroupMiniDTO(TreatmentGroup treatmentGroup) {
-    	this.setId(treatmentGroup.getId());
-    	this.setVersion(treatmentGroup.getVersion());
-    	this.setCodeName(treatmentGroup.getCodeName());
+        this.setId(treatmentGroup.getId());
+        this.setVersion(treatmentGroup.getVersion());
+        this.setCodeName(treatmentGroup.getCodeName());
     }
 
-	private Long id;
-    
-	private Integer version;
-	
-	private String codeName;
+    private Long id;
 
+    private Integer version;
 
+    private String codeName;
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 
-	public String getCodeName() {
+    public String getCodeName() {
         return this.codeName;
     }
 
-	public void setCodeName(String codeName) {
+    public void setCodeName(String codeName) {
         this.codeName = codeName;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static TreatmentGroupMiniDTO fromJsonToTreatmentGroupMiniDTO(String json) {
+    public static TreatmentGroupMiniDTO fromJsonToTreatmentGroupMiniDTO(String json) {
         return new JSONDeserializer<TreatmentGroupMiniDTO>()
-        .use(null, TreatmentGroupMiniDTO.class).deserialize(json);
+                .use(null, TreatmentGroupMiniDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<TreatmentGroupMiniDTO> collection) {
+    public static String toJsonArray(Collection<TreatmentGroupMiniDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<TreatmentGroupMiniDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<TreatmentGroupMiniDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<TreatmentGroupMiniDTO> fromJsonArrayToTreatmentGroes(String json) {
+    public static Collection<TreatmentGroupMiniDTO> fromJsonArrayToTreatmentGroes(String json) {
         return new JSONDeserializer<List<TreatmentGroupMiniDTO>>()
-        .use("values", TreatmentGroupMiniDTO.class).deserialize(json);
+                .use("values", TreatmentGroupMiniDTO.class).deserialize(json);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupStatePathDTO.java b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupStatePathDTO.java
index 04656f4e4..ba01c8381 100644
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupStatePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupStatePathDTO.java
@@ -12,73 +12,72 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class TreatmentGroupStatePathDTO {
 
-	public TreatmentGroupStatePathDTO() {
-	}
+    public TreatmentGroupStatePathDTO() {
+    }
+
+    private String idOrCodeName;
+
+    private String stateType;
 
-	private String idOrCodeName;
+    private String stateKind;
 
-	private String stateType;
-	
-	private String stateKind;
-	
-	private Collection<TreatmentGroupState> states;
-	
-	public String toJson() {
-        return new JSONSerializer().include("states.lsValues").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+    private Collection<TreatmentGroupState> states;
+
+    public String toJson() {
+        return new JSONSerializer().include("states.lsValues").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
-	
-	public static String toJsonArray(Collection<TreatmentGroupStatePathDTO> collection) {
-        return new JSONSerializer().include("states.lsValues").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
+
+    public static String toJsonArray(Collection<TreatmentGroupStatePathDTO> collection) {
+        return new JSONSerializer().include("states.lsValues").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(collection);
     }
 
-	public String getIdOrCodeName() {
+    public String getIdOrCodeName() {
         return this.idOrCodeName;
     }
 
-	public void setIdOrCodeName(String idOrCodeName) {
+    public void setIdOrCodeName(String idOrCodeName) {
         this.idOrCodeName = idOrCodeName;
     }
 
-	public String getStateType() {
+    public String getStateType() {
         return this.stateType;
     }
 
-	public void setStateType(String stateType) {
+    public void setStateType(String stateType) {
         this.stateType = stateType;
     }
 
-	public String getStateKind() {
+    public String getStateKind() {
         return this.stateKind;
     }
 
-	public void setStateKind(String stateKind) {
+    public void setStateKind(String stateKind) {
         this.stateKind = stateKind;
     }
 
-	public Collection<TreatmentGroupState> getStates() {
+    public Collection<TreatmentGroupState> getStates() {
         return this.states;
     }
 
-	public void setStates(Collection<TreatmentGroupState> states) {
+    public void setStates(Collection<TreatmentGroupState> states) {
         this.states = states;
     }
 
-	public static TreatmentGroupStatePathDTO fromJsonToTreatmentGroupStatePathDTO(String json) {
+    public static TreatmentGroupStatePathDTO fromJsonToTreatmentGroupStatePathDTO(String json) {
         return new JSONDeserializer<TreatmentGroupStatePathDTO>()
-        .use(null, TreatmentGroupStatePathDTO.class).deserialize(json);
+                .use(null, TreatmentGroupStatePathDTO.class).deserialize(json);
     }
 
-	public static Collection<TreatmentGroupStatePathDTO> fromJsonArrayToTreatmentGroes(String json) {
+    public static Collection<TreatmentGroupStatePathDTO> fromJsonArrayToTreatmentGroes(String json) {
         return new JSONDeserializer<List<TreatmentGroupStatePathDTO>>()
-        .use("values", TreatmentGroupStatePathDTO.class).deserialize(json);
+                .use("values", TreatmentGroupStatePathDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValueDTO.java b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValueDTO.java
index f37306686..0257bc897 100644
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValueDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValueDTO.java
@@ -14,456 +14,452 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class TreatmentGroupValueDTO {
-	
-	
+
     public TreatmentGroupValueDTO(TreatmentGroupValue TreatmentGroupValue) {
-    	this.setTreatmentGroupId(TreatmentGroupValue.getTreatmentGroupId());
-    	
-    	this.setLsState(TreatmentGroupValue.getLsState());
-    	
-    	this.setId(TreatmentGroupValue.getId());
-    	this.setLsType(TreatmentGroupValue.getLsType());
-    	this.setLsKind(TreatmentGroupValue.getLsKind());
-    	this.setLsTypeAndKind(TreatmentGroupValue.getLsTypeAndKind());
-    	
-		this.setStringValue(TreatmentGroupValue.getStringValue());
-		this.setCodeValue(TreatmentGroupValue.getCodeValue());
-		this.setFileValue(TreatmentGroupValue.getFileValue());
-		this.setUrlValue(TreatmentGroupValue.getUrlValue());
-		this.setDateValue(TreatmentGroupValue.getDateValue());
-		this.setClobValue(TreatmentGroupValue.getClobValue());
-		this.setBlobValue(TreatmentGroupValue.getBlobValue());
-		this.setNumericValue(TreatmentGroupValue.getNumericValue());
-		
-		this.setSigFigs(TreatmentGroupValue.getSigFigs());
-		this.setUncertainty(TreatmentGroupValue.getUncertainty());
-		this.setNumberOfReplicates(TreatmentGroupValue.getNumberOfReplicates());
-		this.setUncertaintyType(TreatmentGroupValue.getUncertaintyType());
-		
-		this.setComments(TreatmentGroupValue.getComments());
-		this.setIgnored(TreatmentGroupValue.isIgnored());
-		this.setModifiedDate(TreatmentGroupValue.getModifiedDate());
-		this.setRecordedDate(TreatmentGroupValue.getRecordedDate());
-		this.setPublicData(TreatmentGroupValue.isPublicData());
-
-		this.setCodeOrigin(TreatmentGroupValue.getCodeOrigin());
-		this.setCodeType(TreatmentGroupValue.getCodeType());
-		this.setCodeKind(TreatmentGroupValue.getCodeKind());
-		this.setOperatorType(TreatmentGroupValue.getOperatorType());
-		this.setOperatorKind(TreatmentGroupValue.getOperatorKind());
-		this.setUnitType(TreatmentGroupValue.getUnitType());
-		this.setUnitKind(TreatmentGroupValue.getUnitKind());
-
-		this.setLsTransaction(TreatmentGroupValue.getLsTransaction());
-    	this.setRecordedBy(TreatmentGroupValue.getRecordedBy());
-		this.setModifiedBy(TreatmentGroupValue.getModifiedBy());
-		this.setStateId(TreatmentGroupValue.getStateId());	
-		this.setStateKind(TreatmentGroupValue.getStateKind());	
-		this.setStateType(TreatmentGroupValue.getStateType());
-    }
-    
+        this.setTreatmentGroupId(TreatmentGroupValue.getTreatmentGroupId());
+
+        this.setLsState(TreatmentGroupValue.getLsState());
+
+        this.setId(TreatmentGroupValue.getId());
+        this.setLsType(TreatmentGroupValue.getLsType());
+        this.setLsKind(TreatmentGroupValue.getLsKind());
+        this.setLsTypeAndKind(TreatmentGroupValue.getLsTypeAndKind());
+
+        this.setStringValue(TreatmentGroupValue.getStringValue());
+        this.setCodeValue(TreatmentGroupValue.getCodeValue());
+        this.setFileValue(TreatmentGroupValue.getFileValue());
+        this.setUrlValue(TreatmentGroupValue.getUrlValue());
+        this.setDateValue(TreatmentGroupValue.getDateValue());
+        this.setClobValue(TreatmentGroupValue.getClobValue());
+        this.setBlobValue(TreatmentGroupValue.getBlobValue());
+        this.setNumericValue(TreatmentGroupValue.getNumericValue());
+
+        this.setSigFigs(TreatmentGroupValue.getSigFigs());
+        this.setUncertainty(TreatmentGroupValue.getUncertainty());
+        this.setNumberOfReplicates(TreatmentGroupValue.getNumberOfReplicates());
+        this.setUncertaintyType(TreatmentGroupValue.getUncertaintyType());
+
+        this.setComments(TreatmentGroupValue.getComments());
+        this.setIgnored(TreatmentGroupValue.isIgnored());
+        this.setModifiedDate(TreatmentGroupValue.getModifiedDate());
+        this.setRecordedDate(TreatmentGroupValue.getRecordedDate());
+        this.setPublicData(TreatmentGroupValue.isPublicData());
+
+        this.setCodeOrigin(TreatmentGroupValue.getCodeOrigin());
+        this.setCodeType(TreatmentGroupValue.getCodeType());
+        this.setCodeKind(TreatmentGroupValue.getCodeKind());
+        this.setOperatorType(TreatmentGroupValue.getOperatorType());
+        this.setOperatorKind(TreatmentGroupValue.getOperatorKind());
+        this.setUnitType(TreatmentGroupValue.getUnitType());
+        this.setUnitKind(TreatmentGroupValue.getUnitKind());
+
+        this.setLsTransaction(TreatmentGroupValue.getLsTransaction());
+        this.setRecordedBy(TreatmentGroupValue.getRecordedBy());
+        this.setModifiedBy(TreatmentGroupValue.getModifiedBy());
+        this.setStateId(TreatmentGroupValue.getStateId());
+        this.setStateKind(TreatmentGroupValue.getStateKind());
+        this.setStateType(TreatmentGroupValue.getStateType());
+    }
+
     private Long analysisGroupId;
     private Long treatmentGroupId;
-	
+
     private TreatmentGroupState lsState;
-	
-	private Long id;
+
+    private Long id;
     private String lsType;
-	private String lsKind;
-	private String lsTypeAndKind;
-	
-	private String stringValue;
-	private String codeValue;
-	private String fileValue;
-	private String urlValue;
-	private Date dateValue;
-	private String clobValue;
+    private String lsKind;
+    private String lsTypeAndKind;
+
+    private String stringValue;
+    private String codeValue;
+    private String fileValue;
+    private String urlValue;
+    private Date dateValue;
+    private String clobValue;
     private byte[] blobValue;
     private BigDecimal numericValue;
-    
-	private Integer sigFigs;
-	private BigDecimal uncertainty;
-	private Integer numberOfReplicates;
-	private String uncertaintyType;
-	
-	private String comments;
-	private boolean ignored;
-	private Date recordedDate;
-	private Date modifiedDate;
-	private boolean publicData;
-	
-	private String codeOrigin;
-	private String codeType;
-	private String codeKind;
+
+    private Integer sigFigs;
+    private BigDecimal uncertainty;
+    private Integer numberOfReplicates;
+    private String uncertaintyType;
+
+    private String comments;
+    private boolean ignored;
+    private Date recordedDate;
+    private Date modifiedDate;
+    private boolean publicData;
+
+    private String codeOrigin;
+    private String codeType;
+    private String codeKind;
     private String operatorType;
-	private String operatorKind;
+    private String operatorKind;
     private String unitType;
-	private String unitKind;
-	private Long lsTransaction;
-	private String recordedBy;
-	private String modifiedBy;
+    private String unitKind;
+    private Long lsTransaction;
+    private String recordedBy;
+    private String modifiedBy;
     private Long stateId;
-	private String stateType;
-	private String stateKind;
-	
-	private BigDecimal concentration;
-	private String concUnit;
-	
-	public boolean getIgnored() {
-		return this.isIgnored();
-	}
-	
-	public boolean getPublicData() {
-		return this.isPublicData();
-	}
-
-
-	public Long getAnalysisGroupId() {
+    private String stateType;
+    private String stateKind;
+
+    private BigDecimal concentration;
+    private String concUnit;
+
+    public boolean getIgnored() {
+        return this.isIgnored();
+    }
+
+    public boolean getPublicData() {
+        return this.isPublicData();
+    }
+
+    public Long getAnalysisGroupId() {
         return this.analysisGroupId;
     }
 
-	public void setAnalysisGroupId(Long analysisGroupId) {
+    public void setAnalysisGroupId(Long analysisGroupId) {
         this.analysisGroupId = analysisGroupId;
     }
 
-	public Long getTreatmentGroupId() {
+    public Long getTreatmentGroupId() {
         return this.treatmentGroupId;
     }
 
-	public void setTreatmentGroupId(Long treatmentGroupId) {
+    public void setTreatmentGroupId(Long treatmentGroupId) {
         this.treatmentGroupId = treatmentGroupId;
     }
 
-	public TreatmentGroupState getLsState() {
+    public TreatmentGroupState getLsState() {
         return this.lsState;
     }
 
-	public void setLsState(TreatmentGroupState lsState) {
+    public void setLsState(TreatmentGroupState lsState) {
         this.lsState = lsState;
     }
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public String getLsType() {
+    public String getLsType() {
         return this.lsType;
     }
 
-	public void setLsType(String lsType) {
+    public void setLsType(String lsType) {
         this.lsType = lsType;
     }
 
-	public String getLsKind() {
+    public String getLsKind() {
         return this.lsKind;
     }
 
-	public void setLsKind(String lsKind) {
+    public void setLsKind(String lsKind) {
         this.lsKind = lsKind;
     }
 
-	public String getLsTypeAndKind() {
+    public String getLsTypeAndKind() {
         return this.lsTypeAndKind;
     }
 
-	public void setLsTypeAndKind(String lsTypeAndKind) {
+    public void setLsTypeAndKind(String lsTypeAndKind) {
         this.lsTypeAndKind = lsTypeAndKind;
     }
 
-	public String getStringValue() {
+    public String getStringValue() {
         return this.stringValue;
     }
 
-	public void setStringValue(String stringValue) {
+    public void setStringValue(String stringValue) {
         this.stringValue = stringValue;
     }
 
-	public String getCodeValue() {
+    public String getCodeValue() {
         return this.codeValue;
     }
 
-	public void setCodeValue(String codeValue) {
+    public void setCodeValue(String codeValue) {
         this.codeValue = codeValue;
     }
 
-	public String getFileValue() {
+    public String getFileValue() {
         return this.fileValue;
     }
 
-	public void setFileValue(String fileValue) {
+    public void setFileValue(String fileValue) {
         this.fileValue = fileValue;
     }
 
-	public String getUrlValue() {
+    public String getUrlValue() {
         return this.urlValue;
     }
 
-	public void setUrlValue(String urlValue) {
+    public void setUrlValue(String urlValue) {
         this.urlValue = urlValue;
     }
 
-	public Date getDateValue() {
+    public Date getDateValue() {
         return this.dateValue;
     }
 
-	public void setDateValue(Date dateValue) {
+    public void setDateValue(Date dateValue) {
         this.dateValue = dateValue;
     }
 
-	public String getClobValue() {
+    public String getClobValue() {
         return this.clobValue;
     }
 
-	public void setClobValue(String clobValue) {
+    public void setClobValue(String clobValue) {
         this.clobValue = clobValue;
     }
 
-	public byte[] getBlobValue() {
+    public byte[] getBlobValue() {
         return this.blobValue;
     }
 
-	public void setBlobValue(byte[] blobValue) {
+    public void setBlobValue(byte[] blobValue) {
         this.blobValue = blobValue;
     }
 
-	public BigDecimal getNumericValue() {
+    public BigDecimal getNumericValue() {
         return this.numericValue;
     }
 
-	public void setNumericValue(BigDecimal numericValue) {
+    public void setNumericValue(BigDecimal numericValue) {
         this.numericValue = numericValue;
     }
 
-	public Integer getSigFigs() {
+    public Integer getSigFigs() {
         return this.sigFigs;
     }
 
-	public void setSigFigs(Integer sigFigs) {
+    public void setSigFigs(Integer sigFigs) {
         this.sigFigs = sigFigs;
     }
 
-	public BigDecimal getUncertainty() {
+    public BigDecimal getUncertainty() {
         return this.uncertainty;
     }
 
-	public void setUncertainty(BigDecimal uncertainty) {
+    public void setUncertainty(BigDecimal uncertainty) {
         this.uncertainty = uncertainty;
     }
 
-	public Integer getNumberOfReplicates() {
+    public Integer getNumberOfReplicates() {
         return this.numberOfReplicates;
     }
 
-	public void setNumberOfReplicates(Integer numberOfReplicates) {
+    public void setNumberOfReplicates(Integer numberOfReplicates) {
         this.numberOfReplicates = numberOfReplicates;
     }
 
-	public String getUncertaintyType() {
+    public String getUncertaintyType() {
         return this.uncertaintyType;
     }
 
-	public void setUncertaintyType(String uncertaintyType) {
+    public void setUncertaintyType(String uncertaintyType) {
         this.uncertaintyType = uncertaintyType;
     }
 
-	public String getComments() {
+    public String getComments() {
         return this.comments;
     }
 
-	public void setComments(String comments) {
+    public void setComments(String comments) {
         this.comments = comments;
     }
 
-	public boolean isIgnored() {
+    public boolean isIgnored() {
         return this.ignored;
     }
 
-	public void setIgnored(boolean ignored) {
+    public void setIgnored(boolean ignored) {
         this.ignored = ignored;
     }
 
-	public Date getRecordedDate() {
+    public Date getRecordedDate() {
         return this.recordedDate;
     }
 
-	public void setRecordedDate(Date recordedDate) {
+    public void setRecordedDate(Date recordedDate) {
         this.recordedDate = recordedDate;
     }
 
-	public Date getModifiedDate() {
+    public Date getModifiedDate() {
         return this.modifiedDate;
     }
 
-	public void setModifiedDate(Date modifiedDate) {
+    public void setModifiedDate(Date modifiedDate) {
         this.modifiedDate = modifiedDate;
     }
 
-	public boolean isPublicData() {
+    public boolean isPublicData() {
         return this.publicData;
     }
 
-	public void setPublicData(boolean publicData) {
+    public void setPublicData(boolean publicData) {
         this.publicData = publicData;
     }
 
-	public String getCodeOrigin() {
+    public String getCodeOrigin() {
         return this.codeOrigin;
     }
 
-	public void setCodeOrigin(String codeOrigin) {
+    public void setCodeOrigin(String codeOrigin) {
         this.codeOrigin = codeOrigin;
     }
 
-	public String getCodeType() {
+    public String getCodeType() {
         return this.codeType;
     }
 
-	public void setCodeType(String codeType) {
+    public void setCodeType(String codeType) {
         this.codeType = codeType;
     }
 
-	public String getCodeKind() {
+    public String getCodeKind() {
         return this.codeKind;
     }
 
-	public void setCodeKind(String codeKind) {
+    public void setCodeKind(String codeKind) {
         this.codeKind = codeKind;
     }
 
-	public String getOperatorType() {
+    public String getOperatorType() {
         return this.operatorType;
     }
 
-	public void setOperatorType(String operatorType) {
+    public void setOperatorType(String operatorType) {
         this.operatorType = operatorType;
     }
 
-	public String getOperatorKind() {
+    public String getOperatorKind() {
         return this.operatorKind;
     }
 
-	public void setOperatorKind(String operatorKind) {
+    public void setOperatorKind(String operatorKind) {
         this.operatorKind = operatorKind;
     }
 
-	public String getUnitType() {
+    public String getUnitType() {
         return this.unitType;
     }
 
-	public void setUnitType(String unitType) {
+    public void setUnitType(String unitType) {
         this.unitType = unitType;
     }
 
-	public String getUnitKind() {
+    public String getUnitKind() {
         return this.unitKind;
     }
 
-	public void setUnitKind(String unitKind) {
+    public void setUnitKind(String unitKind) {
         this.unitKind = unitKind;
     }
 
-	public Long getLsTransaction() {
+    public Long getLsTransaction() {
         return this.lsTransaction;
     }
 
-	public void setLsTransaction(Long lsTransaction) {
+    public void setLsTransaction(Long lsTransaction) {
         this.lsTransaction = lsTransaction;
     }
 
-	public String getRecordedBy() {
+    public String getRecordedBy() {
         return this.recordedBy;
     }
 
-	public void setRecordedBy(String recordedBy) {
+    public void setRecordedBy(String recordedBy) {
         this.recordedBy = recordedBy;
     }
 
-	public String getModifiedBy() {
+    public String getModifiedBy() {
         return this.modifiedBy;
     }
 
-	public void setModifiedBy(String modifiedBy) {
+    public void setModifiedBy(String modifiedBy) {
         this.modifiedBy = modifiedBy;
     }
 
-	public Long getStateId() {
+    public Long getStateId() {
         return this.stateId;
     }
 
-	public void setStateId(Long stateId) {
+    public void setStateId(Long stateId) {
         this.stateId = stateId;
     }
 
-	public String getStateType() {
+    public String getStateType() {
         return this.stateType;
     }
 
-	public void setStateType(String stateType) {
+    public void setStateType(String stateType) {
         this.stateType = stateType;
     }
 
-	public String getStateKind() {
+    public String getStateKind() {
         return this.stateKind;
     }
 
-	public void setStateKind(String stateKind) {
+    public void setStateKind(String stateKind) {
         this.stateKind = stateKind;
     }
 
-	public BigDecimal getConcentration() {
+    public BigDecimal getConcentration() {
         return this.concentration;
     }
 
-	public void setConcentration(BigDecimal concentration) {
+    public void setConcentration(BigDecimal concentration) {
         this.concentration = concentration;
     }
 
-	public String getConcUnit() {
+    public String getConcUnit() {
         return this.concUnit;
     }
 
-	public void setConcUnit(String concUnit) {
+    public void setConcUnit(String concUnit) {
         this.concUnit = concUnit;
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static TreatmentGroupValueDTO fromJsonToTreatmentGroupValueDTO(String json) {
+    public static TreatmentGroupValueDTO fromJsonToTreatmentGroupValueDTO(String json) {
         return new JSONDeserializer<TreatmentGroupValueDTO>()
-        .use(null, TreatmentGroupValueDTO.class).deserialize(json);
+                .use(null, TreatmentGroupValueDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<TreatmentGroupValueDTO> collection) {
+    public static String toJsonArray(Collection<TreatmentGroupValueDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<TreatmentGroupValueDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<TreatmentGroupValueDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<TreatmentGroupValueDTO> fromJsonArrayToTreatmentGroes(String json) {
+    public static Collection<TreatmentGroupValueDTO> fromJsonArrayToTreatmentGroes(String json) {
         return new JSONDeserializer<List<TreatmentGroupValueDTO>>()
-        .use("values", TreatmentGroupValueDTO.class).deserialize(json);
+                .use("values", TreatmentGroupValueDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
-
diff --git a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValuePathDTO.java
index 3fe0dccf0..757a544e1 100644
--- a/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TreatmentGroupValuePathDTO.java
@@ -12,93 +12,92 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class TreatmentGroupValuePathDTO {
 
-	public TreatmentGroupValuePathDTO() {
-	}
+    public TreatmentGroupValuePathDTO() {
+    }
+
+    private String idOrCodeName;
+
+    private String stateType;
+
+    private String stateKind;
 
-	private String idOrCodeName;
+    private String valueType;
 
-	private String stateType;
-	
-	private String stateKind;
-	
-	private String valueType;
-	
-	private String valueKind;
-	
-	private Collection<TreatmentGroupValue> values;
-	
-	public String toJson() {
-        return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+    private String valueKind;
+
+    private Collection<TreatmentGroupValue> values;
+
+    public String toJson() {
+        return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class)
+                .serialize(this);
     }
-	
-	public static String toJsonArray(Collection<TreatmentGroupValuePathDTO> collection) {
-        return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(collection);
+
+    public static String toJsonArray(Collection<TreatmentGroupValuePathDTO> collection) {
+        return new JSONSerializer().include("values").exclude("*.class").transform(new ExcludeNulls(), void.class)
+                .serialize(collection);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getIdOrCodeName() {
+    public String getIdOrCodeName() {
         return this.idOrCodeName;
     }
 
-	public void setIdOrCodeName(String idOrCodeName) {
+    public void setIdOrCodeName(String idOrCodeName) {
         this.idOrCodeName = idOrCodeName;
     }
 
-	public String getStateType() {
+    public String getStateType() {
         return this.stateType;
     }
 
-	public void setStateType(String stateType) {
+    public void setStateType(String stateType) {
         this.stateType = stateType;
     }
 
-	public String getStateKind() {
+    public String getStateKind() {
         return this.stateKind;
     }
 
-	public void setStateKind(String stateKind) {
+    public void setStateKind(String stateKind) {
         this.stateKind = stateKind;
     }
 
-	public String getValueType() {
+    public String getValueType() {
         return this.valueType;
     }
 
-	public void setValueType(String valueType) {
+    public void setValueType(String valueType) {
         this.valueType = valueType;
     }
 
-	public String getValueKind() {
+    public String getValueKind() {
         return this.valueKind;
     }
 
-	public void setValueKind(String valueKind) {
+    public void setValueKind(String valueKind) {
         this.valueKind = valueKind;
     }
 
-	public Collection<TreatmentGroupValue> getValues() {
+    public Collection<TreatmentGroupValue> getValues() {
         return this.values;
     }
 
-	public void setValues(Collection<TreatmentGroupValue> values) {
+    public void setValues(Collection<TreatmentGroupValue> values) {
         this.values = values;
     }
 
-	public static TreatmentGroupValuePathDTO fromJsonToTreatmentGroupValuePathDTO(String json) {
+    public static TreatmentGroupValuePathDTO fromJsonToTreatmentGroupValuePathDTO(String json) {
         return new JSONDeserializer<TreatmentGroupValuePathDTO>()
-        .use(null, TreatmentGroupValuePathDTO.class).deserialize(json);
+                .use(null, TreatmentGroupValuePathDTO.class).deserialize(json);
     }
 
-	public static Collection<TreatmentGroupValuePathDTO> fromJsonArrayToTreatmentGroes(String json) {
+    public static Collection<TreatmentGroupValuePathDTO> fromJsonArrayToTreatmentGroes(String json) {
         return new JSONDeserializer<List<TreatmentGroupValuePathDTO>>()
-        .use("values", TreatmentGroupValuePathDTO.class).deserialize(json);
+                .use("values", TreatmentGroupValuePathDTO.class).deserialize(json);
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/TsvLoaderResponseDTO.java b/src/main/java/com/labsynch/labseer/dto/TsvLoaderResponseDTO.java
index aa4d67838..8c9ae58fe 100644
--- a/src/main/java/com/labsynch/labseer/dto/TsvLoaderResponseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TsvLoaderResponseDTO.java
@@ -11,67 +11,65 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class TsvLoaderResponseDTO {
 
-	private static final Logger logger = LoggerFactory.getLogger(TsvLoaderResponseDTO.class);
-
-	public TsvLoaderResponseDTO(){
-		//empty constructor
-	}
+    private static final Logger logger = LoggerFactory.getLogger(TsvLoaderResponseDTO.class);
 
-	private Collection<TempThingDTO> analysisGroups;
-	
-	private Collection<TempThingDTO> treatmentGroups;
-	
-	private Collection<TempThingDTO> subjects;
-	
-	public String toJson() {
-        return new JSONSerializer().include("analysisGroups","treatmentGroups","subjects").exclude("*.class").serialize(this);
+    public TsvLoaderResponseDTO() {
+        // empty constructor
     }
-	
-	public static String toJsonArray(Collection<TsvLoaderResponseDTO> collection) {
-        return new JSONSerializer().include("analysisGroups","treatmentGroups","subjects").exclude("*.class").serialize(collection);
+
+    private Collection<TempThingDTO> analysisGroups;
+
+    private Collection<TempThingDTO> treatmentGroups;
+
+    private Collection<TempThingDTO> subjects;
+
+    public String toJson() {
+        return new JSONSerializer().include("analysisGroups", "treatmentGroups", "subjects").exclude("*.class")
+                .serialize(this);
     }
 
+    public static String toJsonArray(Collection<TsvLoaderResponseDTO> collection) {
+        return new JSONSerializer().include("analysisGroups", "treatmentGroups", "subjects").exclude("*.class")
+                .serialize(collection);
+    }
 
-	public static TsvLoaderResponseDTO fromJsonToTsvLoaderResponseDTO(String json) {
+    public static TsvLoaderResponseDTO fromJsonToTsvLoaderResponseDTO(String json) {
         return new JSONDeserializer<TsvLoaderResponseDTO>()
-        .use(null, TsvLoaderResponseDTO.class).deserialize(json);
+                .use(null, TsvLoaderResponseDTO.class).deserialize(json);
     }
 
-	public static Collection<TsvLoaderResponseDTO> fromJsonArrayToTsvLoaderRespoes(String json) {
+    public static Collection<TsvLoaderResponseDTO> fromJsonArrayToTsvLoaderRespoes(String json) {
         return new JSONDeserializer<List<TsvLoaderResponseDTO>>()
-        .use("values", TsvLoaderResponseDTO.class).deserialize(json);
+                .use("values", TsvLoaderResponseDTO.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public Collection<TempThingDTO> getAnalysisGroups() {
+    public Collection<TempThingDTO> getAnalysisGroups() {
         return this.analysisGroups;
     }
 
-	public void setAnalysisGroups(Collection<TempThingDTO> analysisGroups) {
+    public void setAnalysisGroups(Collection<TempThingDTO> analysisGroups) {
         this.analysisGroups = analysisGroups;
     }
 
-	public Collection<TempThingDTO> getTreatmentGroups() {
+    public Collection<TempThingDTO> getTreatmentGroups() {
         return this.treatmentGroups;
     }
 
-	public void setTreatmentGroups(Collection<TempThingDTO> treatmentGroups) {
+    public void setTreatmentGroups(Collection<TempThingDTO> treatmentGroups) {
         this.treatmentGroups = treatmentGroups;
     }
 
-	public Collection<TempThingDTO> getSubjects() {
+    public Collection<TempThingDTO> getSubjects() {
         return this.subjects;
     }
 
-	public void setSubjects(Collection<TempThingDTO> subjects) {
+    public void setSubjects(Collection<TempThingDTO> subjects) {
         this.subjects = subjects;
     }
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/TypeDTO.java b/src/main/java/com/labsynch/labseer/dto/TypeDTO.java
index abded1338..1b71bc054 100644
--- a/src/main/java/com/labsynch/labseer/dto/TypeDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TypeDTO.java
@@ -27,32 +27,29 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class TypeDTO {
-	
+
 	private String typeName;
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(TypeDTO.class);
 
 	public TypeDTO(
-			String typeName){
-		
+			String typeName) {
+
 		this.typeName = typeName;
 	}
 
-
 	public TypeDTO() {
 	}
 
-
 	public static Collection<ProtocolType> getOrCreateProtocolTypes(
 			List<TypeDTO> types) {
 		HashSet<ProtocolType> protocolTypes = new HashSet<ProtocolType>();
-		for (TypeDTO type : types){
+		for (TypeDTO type : types) {
 			ProtocolType protocolType;
-			try{
+			try {
 				protocolType = ProtocolType.findProtocolTypesByTypeNameEquals(type.typeName).getSingleResult();
-			} catch(NoResultException e){
+			} catch (NoResultException e) {
 				protocolType = new ProtocolType();
 				protocolType.setTypeName(type.typeName);
 				protocolType.persist();
@@ -61,15 +58,15 @@ public static Collection<ProtocolType> getOrCreateProtocolTypes(
 		}
 		return protocolTypes;
 	}
-	
+
 	public static Collection<ExperimentType> getOrCreateExperimentTypes(
 			List<TypeDTO> types) {
 		HashSet<ExperimentType> experimentTypes = new HashSet<ExperimentType>();
-		for (TypeDTO type : types){
+		for (TypeDTO type : types) {
 			ExperimentType experimentType;
-			try{
+			try {
 				experimentType = ExperimentType.findExperimentTypesByTypeNameEquals(type.typeName).getSingleResult();
-			} catch(NoResultException e){
+			} catch (NoResultException e) {
 				experimentType = new ExperimentType();
 				experimentType.setTypeName(type.typeName);
 				experimentType.persist();
@@ -78,15 +75,16 @@ public static Collection<ExperimentType> getOrCreateExperimentTypes(
 		}
 		return experimentTypes;
 	}
-	
+
 	public static Collection<InteractionType> getOrCreateInteractionTypes(
 			List<InteractionType> types) {
 		HashSet<InteractionType> interactionTypes = new HashSet<InteractionType>();
-		for (InteractionType type : types){
+		for (InteractionType type : types) {
 			InteractionType interactionType;
-			try{
-				interactionType = InteractionType.findInteractionTypesByTypeNameEquals(type.getTypeName()).getSingleResult();
-			} catch(NoResultException e){
+			try {
+				interactionType = InteractionType.findInteractionTypesByTypeNameEquals(type.getTypeName())
+						.getSingleResult();
+			} catch (NoResultException e) {
 				interactionType = new InteractionType();
 				interactionType.setTypeName(type.getTypeName());
 				interactionType.setTypeVerb(type.getTypeVerb());
@@ -96,15 +94,15 @@ public static Collection<InteractionType> getOrCreateInteractionTypes(
 		}
 		return interactionTypes;
 	}
-	
+
 	public static Collection<ContainerType> getOrCreateContainerTypes(
 			List<TypeDTO> types) {
 		HashSet<ContainerType> containerTypes = new HashSet<ContainerType>();
-		for (TypeDTO type : types){
+		for (TypeDTO type : types) {
 			ContainerType containerType;
-			try{
+			try {
 				containerType = ContainerType.findContainerTypesByTypeNameEquals(type.typeName).getSingleResult();
-			} catch(NoResultException e){
+			} catch (NoResultException e) {
 				containerType = new ContainerType();
 				containerType.setTypeName(type.typeName);
 				containerType.persist();
@@ -113,15 +111,15 @@ public static Collection<ContainerType> getOrCreateContainerTypes(
 		}
 		return containerTypes;
 	}
-	
+
 	public static Collection<StateType> getOrCreateStateTypes(
 			List<TypeDTO> types) {
 		HashSet<StateType> stateTypes = new HashSet<StateType>();
-		for (TypeDTO type : types){
+		for (TypeDTO type : types) {
 			StateType stateType;
-			try{
+			try {
 				stateType = StateType.findStateTypesByTypeNameEquals(type.typeName).getSingleResult();
-			} catch(NoResultException e){
+			} catch (NoResultException e) {
 				stateType = new StateType();
 				stateType.setTypeName(type.typeName);
 				stateType.persist();
@@ -130,15 +128,15 @@ public static Collection<StateType> getOrCreateStateTypes(
 		}
 		return stateTypes;
 	}
-	
+
 	public static Collection<ValueType> getOrCreateValueTypes(
 			List<TypeDTO> types) {
 		HashSet<ValueType> valueTypes = new HashSet<ValueType>();
-		for (TypeDTO type : types){
+		for (TypeDTO type : types) {
 			ValueType valueType;
-			try{
+			try {
 				valueType = ValueType.findValueTypesByTypeNameEquals(type.typeName).getSingleResult();
-			} catch(NoResultException e){
+			} catch (NoResultException e) {
 				valueType = new ValueType();
 				valueType.setTypeName(type.typeName);
 				valueType.persist();
@@ -148,15 +146,15 @@ public static Collection<ValueType> getOrCreateValueTypes(
 		}
 		return valueTypes;
 	}
-	
+
 	public static Collection<LabelType> getOrCreateLabelTypes(
 			List<TypeDTO> types) {
 		HashSet<LabelType> labelTypes = new HashSet<LabelType>();
-		for (TypeDTO type : types){
+		for (TypeDTO type : types) {
 			LabelType labelType;
-			try{
+			try {
 				labelType = LabelType.findLabelTypesByTypeNameEquals(type.typeName).getSingleResult();
-			} catch(NoResultException e){
+			} catch (NoResultException e) {
 				labelType = new LabelType();
 				labelType.setTypeName(type.typeName);
 				labelType.persist();
@@ -165,15 +163,15 @@ public static Collection<LabelType> getOrCreateLabelTypes(
 		}
 		return labelTypes;
 	}
-	
+
 	public static Collection<ThingType> getOrCreateThingTypes(
 			List<TypeDTO> types) {
 		HashSet<ThingType> thingTypes = new HashSet<ThingType>();
-		for (TypeDTO type : types){
+		for (TypeDTO type : types) {
 			ThingType thingType;
-			try{
+			try {
 				thingType = ThingType.findThingTypesByTypeNameEquals(type.typeName).getSingleResult();
-			} catch(NoResultException e){
+			} catch (NoResultException e) {
 				thingType = new ThingType();
 				thingType.setTypeName(type.typeName);
 				thingType.persist();
@@ -182,15 +180,15 @@ public static Collection<ThingType> getOrCreateThingTypes(
 		}
 		return thingTypes;
 	}
-	
+
 	public static Collection<OperatorType> getOrCreateOperatorTypes(
 			List<TypeDTO> types) {
 		HashSet<OperatorType> operatorTypes = new HashSet<OperatorType>();
-		for (TypeDTO type : types){
+		for (TypeDTO type : types) {
 			OperatorType operatorType;
-			try{
+			try {
 				operatorType = OperatorType.findOperatorTypesByTypeNameEquals(type.typeName).getSingleResult();
-			} catch(NoResultException e){
+			} catch (NoResultException e) {
 				operatorType = new OperatorType();
 				operatorType.setTypeName(type.typeName);
 				operatorType.persist();
@@ -199,15 +197,15 @@ public static Collection<OperatorType> getOrCreateOperatorTypes(
 		}
 		return operatorTypes;
 	}
-	
+
 	public static Collection<UnitType> getOrCreateUnitTypes(
 			List<TypeDTO> types) {
 		HashSet<UnitType> unitTypes = new HashSet<UnitType>();
-		for (TypeDTO type : types){
+		for (TypeDTO type : types) {
 			UnitType unitType;
-			try{
+			try {
 				unitType = UnitType.findUnitTypesByTypeNameEquals(type.typeName).getSingleResult();
-			} catch(NoResultException e){
+			} catch (NoResultException e) {
 				unitType = new UnitType();
 				unitType.setTypeName(type.typeName);
 				unitType.persist();
@@ -216,15 +214,15 @@ public static Collection<UnitType> getOrCreateUnitTypes(
 		}
 		return unitTypes;
 	}
-	
+
 	public static Collection<DDictType> getOrCreateDDictTypes(
 			List<TypeDTO> types) {
 		HashSet<DDictType> dDictTypes = new HashSet<DDictType>();
-		for (TypeDTO type : types){
+		for (TypeDTO type : types) {
 			DDictType dDictType;
-			try{
+			try {
 				dDictType = DDictType.findDDictTypesByNameEquals(type.typeName).getSingleResult();
-			} catch(NoResultException e){
+			} catch (NoResultException e) {
 				dDictType = new DDictType();
 				dDictType.setName(type.typeName);
 				dDictType.persist();
@@ -233,15 +231,15 @@ public static Collection<DDictType> getOrCreateDDictTypes(
 		}
 		return dDictTypes;
 	}
-	
+
 	public static Collection<RoleType> getOrCreateRoleTypes(
 			List<TypeDTO> types) {
 		HashSet<RoleType> roleTypes = new HashSet<RoleType>();
-		for (TypeDTO type : types){
+		for (TypeDTO type : types) {
 			RoleType roleType;
-			try{
+			try {
 				roleType = RoleType.findRoleTypesByTypeNameEquals(type.typeName).getSingleResult();
-			} catch(NoResultException e){
+			} catch (NoResultException e) {
 				roleType = new RoleType();
 				roleType.setTypeName(type.typeName);
 				roleType.persist();
@@ -252,46 +250,44 @@ public static Collection<RoleType> getOrCreateRoleTypes(
 	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 
 	public String getTypeName() {
-        return this.typeName;
-    }
+		return this.typeName;
+	}
 
 	public void setTypeName(String typeName) {
-        this.typeName = typeName;
-    }
+		this.typeName = typeName;
+	}
 
 	public String toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(this);
+	}
 
 	public String toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(this);
+	}
 
 	public static TypeDTO fromJsonToTypeDTO(String json) {
-        return new JSONDeserializer<TypeDTO>()
-        .use(null, TypeDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<TypeDTO>()
+				.use(null, TypeDTO.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<TypeDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<TypeDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<TypeDTO> fromJsonArrayToTypeDTO(String json) {
-        return new JSONDeserializer<List<TypeDTO>>()
-        .use("values", TypeDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<TypeDTO>>()
+				.use("values", TypeDTO.class).deserialize(json);
+	}
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/TypeKindDTO.java b/src/main/java/com/labsynch/labseer/dto/TypeKindDTO.java
index a4b06063c..08099828f 100644
--- a/src/main/java/com/labsynch/labseer/dto/TypeKindDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/TypeKindDTO.java
@@ -39,42 +39,42 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class TypeKindDTO {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(TypeKindDTO.class);
-	
+
 	private String typeName;
-	
+
 	private String kindName;
-	
+
 	public TypeKindDTO(
-			String typeName, 
-			String kindName){
-		
+			String typeName,
+			String kindName) {
+
 		this.typeName = typeName;
 		this.kindName = kindName;
 	}
 
-
 	public TypeKindDTO() {
 	}
-	
+
 	public static Collection<ProtocolKind> getOrCreateProtocolKinds(
 			List<TypeKindDTO> typeKinds) {
 		HashSet<ProtocolKind> protocolKinds = new HashSet<ProtocolKind>();
-		for (TypeKindDTO typeKind : typeKinds){
+		for (TypeKindDTO typeKind : typeKinds) {
 			ProtocolType protocolType;
-			try{
+			try {
 				protocolType = ProtocolType.findProtocolTypesByTypeNameEquals(typeKind.typeName).getSingleResult();
-			} catch (Exception e){
+			} catch (Exception e) {
 				logger.error("ProtocolType " + typeKind.typeName + " has not been created.");
 				return null;
 			}
 			ProtocolKind protocolKind;
-			try{
-				protocolKind = ProtocolKind.findProtocolKindsByLsTypeEqualsAndKindNameEquals(protocolType, typeKind.kindName).getSingleResult();
-			} catch(NoResultException e){
+			try {
+				protocolKind = ProtocolKind
+						.findProtocolKindsByLsTypeEqualsAndKindNameEquals(protocolType, typeKind.kindName)
+						.getSingleResult();
+			} catch (NoResultException e) {
 				protocolKind = new ProtocolKind();
 				protocolKind.setLsType(protocolType);
 				protocolKind.setKindName(typeKind.kindName);
@@ -84,22 +84,25 @@ public static Collection<ProtocolKind> getOrCreateProtocolKinds(
 		}
 		return protocolKinds;
 	}
-	
+
 	public static Collection<ExperimentKind> getOrCreateExperimentKinds(
 			List<TypeKindDTO> typeKinds) {
 		HashSet<ExperimentKind> experimentKinds = new HashSet<ExperimentKind>();
-		for (TypeKindDTO typeKind : typeKinds){
+		for (TypeKindDTO typeKind : typeKinds) {
 			ExperimentType experimentType;
-			try{
-				experimentType = ExperimentType.findExperimentTypesByTypeNameEquals(typeKind.typeName).getSingleResult();
-			} catch (Exception e){
+			try {
+				experimentType = ExperimentType.findExperimentTypesByTypeNameEquals(typeKind.typeName)
+						.getSingleResult();
+			} catch (Exception e) {
 				logger.error("ExperimentType " + typeKind.typeName + " has not been created.");
 				return null;
 			}
 			ExperimentKind experimentKind;
-			try{
-				experimentKind = ExperimentKind.findExperimentKindsByLsTypeEqualsAndKindNameEquals(experimentType, typeKind.kindName).getSingleResult();
-			} catch(NoResultException e){
+			try {
+				experimentKind = ExperimentKind
+						.findExperimentKindsByLsTypeEqualsAndKindNameEquals(experimentType, typeKind.kindName)
+						.getSingleResult();
+			} catch (NoResultException e) {
 				experimentKind = new ExperimentKind();
 				experimentKind.setLsType(experimentType);
 				experimentKind.setKindName(typeKind.kindName);
@@ -109,22 +112,25 @@ public static Collection<ExperimentKind> getOrCreateExperimentKinds(
 		}
 		return experimentKinds;
 	}
-	
+
 	public static Collection<InteractionKind> getOrCreateInteractionKinds(
 			List<TypeKindDTO> typeKinds) {
 		HashSet<InteractionKind> interactionKinds = new HashSet<InteractionKind>();
-		for (TypeKindDTO typeKind : typeKinds){
+		for (TypeKindDTO typeKind : typeKinds) {
 			InteractionType interactionType;
-			try{
-				interactionType = InteractionType.findInteractionTypesByTypeNameEquals(typeKind.typeName).getSingleResult();
-			} catch (Exception e){
+			try {
+				interactionType = InteractionType.findInteractionTypesByTypeNameEquals(typeKind.typeName)
+						.getSingleResult();
+			} catch (Exception e) {
 				logger.error("InteractionType " + typeKind.typeName + " has not been created.");
 				return null;
 			}
 			InteractionKind interactionKind;
-			try{
-				interactionKind = InteractionKind.findInteractionKindsByKindNameEqualsAndLsType(typeKind.kindName, interactionType).getSingleResult();
-			} catch(NoResultException e){
+			try {
+				interactionKind = InteractionKind
+						.findInteractionKindsByKindNameEqualsAndLsType(typeKind.kindName, interactionType)
+						.getSingleResult();
+			} catch (NoResultException e) {
 				interactionKind = new InteractionKind();
 				interactionKind.setLsType(interactionType);
 				interactionKind.setKindName(typeKind.kindName);
@@ -134,22 +140,24 @@ public static Collection<InteractionKind> getOrCreateInteractionKinds(
 		}
 		return interactionKinds;
 	}
-	
+
 	public static Collection<ContainerKind> getOrCreateContainerKinds(
 			List<TypeKindDTO> typeKinds) {
 		HashSet<ContainerKind> containerKinds = new HashSet<ContainerKind>();
-		for (TypeKindDTO typeKind : typeKinds){
+		for (TypeKindDTO typeKind : typeKinds) {
 			ContainerType containerType;
-			try{
+			try {
 				containerType = ContainerType.findContainerTypesByTypeNameEquals(typeKind.typeName).getSingleResult();
-			} catch (Exception e){
+			} catch (Exception e) {
 				logger.error("ContainerType " + typeKind.typeName + " has not been created.");
 				return null;
 			}
 			ContainerKind containerKind;
-			try{
-				containerKind = ContainerKind.findContainerKindsByKindNameEqualsAndLsType(typeKind.kindName, containerType).getSingleResult();
-			} catch(NoResultException e){
+			try {
+				containerKind = ContainerKind
+						.findContainerKindsByKindNameEqualsAndLsType(typeKind.kindName, containerType)
+						.getSingleResult();
+			} catch (NoResultException e) {
 				containerKind = new ContainerKind();
 				containerKind.setLsType(containerType);
 				containerKind.setKindName(typeKind.kindName);
@@ -159,22 +167,23 @@ public static Collection<ContainerKind> getOrCreateContainerKinds(
 		}
 		return containerKinds;
 	}
-	
+
 	public static Collection<StateKind> getOrCreateStateKinds(
 			List<TypeKindDTO> typeKinds) {
 		HashSet<StateKind> stateKinds = new HashSet<StateKind>();
-		for (TypeKindDTO typeKind : typeKinds){
+		for (TypeKindDTO typeKind : typeKinds) {
 			StateType stateType;
-			try{
+			try {
 				stateType = StateType.findStateTypesByTypeNameEquals(typeKind.typeName).getSingleResult();
-			} catch (Exception e){
+			} catch (Exception e) {
 				logger.error("StateType " + typeKind.typeName + " has not been created.");
 				return null;
 			}
 			StateKind stateKind;
-			try{
-				stateKind = StateKind.findStateKindsByKindNameEqualsAndLsType(typeKind.kindName, stateType).getSingleResult();
-			} catch(NoResultException e){
+			try {
+				stateKind = StateKind.findStateKindsByKindNameEqualsAndLsType(typeKind.kindName, stateType)
+						.getSingleResult();
+			} catch (NoResultException e) {
 				stateKind = new StateKind();
 				stateKind.setLsType(stateType);
 				stateKind.setKindName(typeKind.kindName);
@@ -184,22 +193,23 @@ public static Collection<StateKind> getOrCreateStateKinds(
 		}
 		return stateKinds;
 	}
-	
+
 	public static Collection<ValueKind> getOrCreateValueKinds(
 			List<TypeKindDTO> typeKinds) {
 		HashSet<ValueKind> valueKinds = new HashSet<ValueKind>();
-		for (TypeKindDTO typeKind : typeKinds){
+		for (TypeKindDTO typeKind : typeKinds) {
 			ValueType valueType;
-			try{
+			try {
 				valueType = ValueType.findValueTypesByTypeNameEquals(typeKind.typeName).getSingleResult();
-			} catch (Exception e){
+			} catch (Exception e) {
 				logger.error("ValueType " + typeKind.typeName + " has not been created.");
 				return null;
 			}
 			ValueKind valueKind;
-			try{
-				valueKind = ValueKind.findValueKindsByKindNameEqualsAndLsType(typeKind.kindName, valueType).getSingleResult();
-			} catch(NoResultException e){
+			try {
+				valueKind = ValueKind.findValueKindsByKindNameEqualsAndLsType(typeKind.kindName, valueType)
+						.getSingleResult();
+			} catch (NoResultException e) {
 				valueKind = new ValueKind();
 				valueKind.setLsType(valueType);
 				valueKind.setKindName(typeKind.kindName);
@@ -209,22 +219,23 @@ public static Collection<ValueKind> getOrCreateValueKinds(
 		}
 		return valueKinds;
 	}
-	
+
 	public static Collection<LabelKind> getOrCreateLabelKinds(
 			List<TypeKindDTO> typeKinds) {
 		HashSet<LabelKind> labelKinds = new HashSet<LabelKind>();
-		for (TypeKindDTO typeKind : typeKinds){
+		for (TypeKindDTO typeKind : typeKinds) {
 			LabelType labelType;
-			try{
+			try {
 				labelType = LabelType.findLabelTypesByTypeNameEquals(typeKind.typeName).getSingleResult();
-			} catch (Exception e){
+			} catch (Exception e) {
 				logger.error("LabelType " + typeKind.typeName + " has not been created.");
 				return null;
 			}
 			LabelKind labelKind;
-			try{
-				labelKind = LabelKind.findLabelKindsByKindNameEqualsAndLsType(typeKind.kindName, labelType).getSingleResult();
-			} catch(NoResultException e){
+			try {
+				labelKind = LabelKind.findLabelKindsByKindNameEqualsAndLsType(typeKind.kindName, labelType)
+						.getSingleResult();
+			} catch (NoResultException e) {
 				labelKind = new LabelKind();
 				labelKind.setLsType(labelType);
 				labelKind.setKindName(typeKind.kindName);
@@ -234,22 +245,23 @@ public static Collection<LabelKind> getOrCreateLabelKinds(
 		}
 		return labelKinds;
 	}
-	
+
 	public static Collection<ThingKind> getOrCreateThingKinds(
 			List<TypeKindDTO> typeKinds) {
 		HashSet<ThingKind> thingKinds = new HashSet<ThingKind>();
-		for (TypeKindDTO typeKind : typeKinds){
+		for (TypeKindDTO typeKind : typeKinds) {
 			ThingType thingType;
-			try{
+			try {
 				thingType = ThingType.findThingTypesByTypeNameEquals(typeKind.typeName).getSingleResult();
-			} catch (Exception e){
+			} catch (Exception e) {
 				logger.error("ThingType " + typeKind.typeName + " has not been created.");
 				return null;
 			}
 			ThingKind thingKind;
-			try{
-				thingKind = ThingKind.findThingKindsByKindNameEqualsAndLsType(typeKind.kindName, thingType).getSingleResult();
-			} catch(NoResultException e){
+			try {
+				thingKind = ThingKind.findThingKindsByKindNameEqualsAndLsType(typeKind.kindName, thingType)
+						.getSingleResult();
+			} catch (NoResultException e) {
 				thingKind = new ThingKind();
 				thingKind.setLsType(thingType);
 				thingKind.setKindName(typeKind.kindName);
@@ -259,22 +271,23 @@ public static Collection<ThingKind> getOrCreateThingKinds(
 		}
 		return thingKinds;
 	}
-	
+
 	public static Collection<OperatorKind> getOrCreateOperatorKinds(
 			List<TypeKindDTO> typeKinds) {
 		HashSet<OperatorKind> operatorKinds = new HashSet<OperatorKind>();
-		for (TypeKindDTO typeKind : typeKinds){
+		for (TypeKindDTO typeKind : typeKinds) {
 			OperatorType operatorType;
-			try{
+			try {
 				operatorType = OperatorType.findOperatorTypesByTypeNameEquals(typeKind.typeName).getSingleResult();
-			} catch (Exception e){
+			} catch (Exception e) {
 				logger.error("OperatorType " + typeKind.typeName + " has not been created.");
 				return null;
 			}
 			OperatorKind operatorKind;
-			try{
-				operatorKind = OperatorKind.findOperatorKindsByKindNameEqualsAndLsType(typeKind.kindName, operatorType).getSingleResult();
-			} catch(NoResultException e){
+			try {
+				operatorKind = OperatorKind.findOperatorKindsByKindNameEqualsAndLsType(typeKind.kindName, operatorType)
+						.getSingleResult();
+			} catch (NoResultException e) {
 				operatorKind = new OperatorKind();
 				operatorKind.setLsType(operatorType);
 				operatorKind.setKindName(typeKind.kindName);
@@ -284,22 +297,23 @@ public static Collection<OperatorKind> getOrCreateOperatorKinds(
 		}
 		return operatorKinds;
 	}
-	
+
 	public static Collection<UnitKind> getOrCreateUnitKinds(
 			List<TypeKindDTO> typeKinds) {
 		HashSet<UnitKind> unitKinds = new HashSet<UnitKind>();
-		for (TypeKindDTO typeKind : typeKinds){
+		for (TypeKindDTO typeKind : typeKinds) {
 			UnitType unitType;
-			try{
+			try {
 				unitType = UnitType.findUnitTypesByTypeNameEquals(typeKind.typeName).getSingleResult();
-			} catch (Exception e){
+			} catch (Exception e) {
 				logger.error("UnitType " + typeKind.typeName + " has not been created.");
 				return null;
 			}
 			UnitKind unitKind;
-			try{
-				unitKind = UnitKind.findUnitKindsByKindNameEqualsAndLsType(typeKind.kindName, unitType).getSingleResult();
-			} catch(NoResultException e){
+			try {
+				unitKind = UnitKind.findUnitKindsByKindNameEqualsAndLsType(typeKind.kindName, unitType)
+						.getSingleResult();
+			} catch (NoResultException e) {
 				unitKind = new UnitKind();
 				unitKind.setLsType(unitType);
 				unitKind.setKindName(typeKind.kindName);
@@ -309,22 +323,23 @@ public static Collection<UnitKind> getOrCreateUnitKinds(
 		}
 		return unitKinds;
 	}
-	
+
 	public static Collection<DDictKind> getOrCreateDDictKinds(
 			List<TypeKindDTO> typeKinds) {
 		HashSet<DDictKind> dDictKinds = new HashSet<DDictKind>();
-		for (TypeKindDTO typeKind : typeKinds){
+		for (TypeKindDTO typeKind : typeKinds) {
 			DDictType dDictType;
-			try{
+			try {
 				dDictType = DDictType.findDDictTypesByNameEquals(typeKind.typeName).getSingleResult();
-			} catch (Exception e){
+			} catch (Exception e) {
 				logger.error("DDictType " + typeKind.typeName + " has not been created.");
 				return null;
 			}
 			DDictKind dDictKind;
-			try{
-				dDictKind = DDictKind.findDDictKindsByLsTypeEqualsAndNameEquals(dDictType.getName(), typeKind.kindName).getSingleResult();
-			} catch(NoResultException e){
+			try {
+				dDictKind = DDictKind.findDDictKindsByLsTypeEqualsAndNameEquals(dDictType.getName(), typeKind.kindName)
+						.getSingleResult();
+			} catch (NoResultException e) {
 				dDictKind = new DDictKind();
 				dDictKind.setLsType(dDictType.getName());
 				dDictKind.setName(typeKind.kindName);
@@ -334,22 +349,23 @@ public static Collection<DDictKind> getOrCreateDDictKinds(
 		}
 		return dDictKinds;
 	}
-	
+
 	public static Collection<RoleKind> getOrCreateRoleKinds(
 			List<TypeKindDTO> typeKinds) {
 		HashSet<RoleKind> roleKinds = new HashSet<RoleKind>();
-		for (TypeKindDTO typeKind : typeKinds){
+		for (TypeKindDTO typeKind : typeKinds) {
 			RoleType roleType;
-			try{
+			try {
 				roleType = RoleType.findRoleTypesByTypeNameEquals(typeKind.typeName).getSingleResult();
-			} catch (Exception e){
+			} catch (Exception e) {
 				logger.error("RoleType " + typeKind.typeName + " has not been created.");
 				return null;
 			}
 			RoleKind roleKind;
-			try{
-				roleKind = RoleKind.findRoleKindsByKindNameEqualsAndLsType(typeKind.kindName, roleType).getSingleResult();
-			} catch(NoResultException e){
+			try {
+				roleKind = RoleKind.findRoleKindsByKindNameEqualsAndLsType(typeKind.kindName, roleType)
+						.getSingleResult();
+			} catch (NoResultException e) {
 				roleKind = new RoleKind();
 				roleKind.setLsType(roleType);
 				roleKind.setKindName(typeKind.kindName);
@@ -359,61 +375,54 @@ public static Collection<RoleKind> getOrCreateRoleKinds(
 		}
 		return roleKinds;
 	}
-	
-	
-	
-	
-	
 
 	public String toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(this);
+	}
 
 	public String toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(this);
+	}
 
 	public static TypeKindDTO fromJsonToTypeKindDTO(String json) {
-        return new JSONDeserializer<TypeKindDTO>()
-        .use(null, TypeKindDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<TypeKindDTO>()
+				.use(null, TypeKindDTO.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<TypeKindDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<TypeKindDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<TypeKindDTO> fromJsonArrayToTypeKindDTO(String json) {
-        return new JSONDeserializer<List<TypeKindDTO>>()
-        .use("values", TypeKindDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<TypeKindDTO>>()
+				.use("values", TypeKindDTO.class).deserialize(json);
+	}
 
 	public String getTypeName() {
-        return this.typeName;
-    }
+		return this.typeName;
+	}
 
 	public void setTypeName(String typeName) {
-        this.typeName = typeName;
-    }
+		this.typeName = typeName;
+	}
 
 	public String getKindName() {
-        return this.kindName;
-    }
+		return this.kindName;
+	}
 
 	public void setKindName(String kindName) {
-        this.kindName = kindName;
-    }
+		this.kindName = kindName;
+	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/ValidationResponseDTO.java b/src/main/java/com/labsynch/labseer/dto/ValidationResponseDTO.java
index 53747bd3a..09f951d46 100644
--- a/src/main/java/com/labsynch/labseer/dto/ValidationResponseDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ValidationResponseDTO.java
@@ -11,90 +11,90 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ValidationResponseDTO {
-		
+
     private String level;
     private int record;
     private String categoryCode;
     private String categoryDescription;
     private String message;
-    
-    public ValidationResponseDTO(String level, int record, String categoryCode, String categoryDescription, String message){
-    	this.level = level;
-    	this.record = record;
-    	this.categoryCode = categoryCode;
-    	this.categoryDescription = categoryDescription;
-    	this.message = message;
+
+    public ValidationResponseDTO(String level, int record, String categoryCode, String categoryDescription,
+            String message) {
+        this.level = level;
+        this.record = record;
+        this.categoryCode = categoryCode;
+        this.categoryDescription = categoryDescription;
+        this.message = message;
     }
 
     public String toJson() {
         return new JSONSerializer()
-        .include("level", "record", "categoryCode", "categoryDescription", "message").exclude("*.class").transform(new ExcludeNulls(), void.class).serialize(this);
+                .include("level", "record", "categoryCode", "categoryDescription", "message").exclude("*.class")
+                .transform(new ExcludeNulls(), void.class).serialize(this);
     }
 
-
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getLevel() {
+    public String getLevel() {
         return this.level;
     }
 
-	public void setLevel(String level) {
+    public void setLevel(String level) {
         this.level = level;
     }
 
-	public int getRecord() {
+    public int getRecord() {
         return this.record;
     }
 
-	public void setRecord(int record) {
+    public void setRecord(int record) {
         this.record = record;
     }
 
-	public String getCategoryCode() {
+    public String getCategoryCode() {
         return this.categoryCode;
     }
 
-	public void setCategoryCode(String categoryCode) {
+    public void setCategoryCode(String categoryCode) {
         this.categoryCode = categoryCode;
     }
 
-	public String getCategoryDescription() {
+    public String getCategoryDescription() {
         return this.categoryDescription;
     }
 
-	public void setCategoryDescription(String categoryDescription) {
+    public void setCategoryDescription(String categoryDescription) {
         this.categoryDescription = categoryDescription;
     }
 
-	public String getMessage() {
+    public String getMessage() {
         return this.message;
     }
 
-	public void setMessage(String message) {
+    public void setMessage(String message) {
         this.message = message;
     }
 
-	public static ValidationResponseDTO fromJsonToValidationResponseDTO(String json) {
+    public static ValidationResponseDTO fromJsonToValidationResponseDTO(String json) {
         return new JSONDeserializer<ValidationResponseDTO>()
-        .use(null, ValidationResponseDTO.class).deserialize(json);
+                .use(null, ValidationResponseDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ValidationResponseDTO> collection) {
+    public static String toJsonArray(Collection<ValidationResponseDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ValidationResponseDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<ValidationResponseDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ValidationResponseDTO> fromJsonArrayToValidationRespoes(String json) {
+    public static Collection<ValidationResponseDTO> fromJsonArrayToValidationRespoes(String json) {
         return new JSONDeserializer<List<ValidationResponseDTO>>()
-        .use("values", ValidationResponseDTO.class).deserialize(json);
+                .use("values", ValidationResponseDTO.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ValuePathDTO.java b/src/main/java/com/labsynch/labseer/dto/ValuePathDTO.java
index c1c60739e..eea816586 100644
--- a/src/main/java/com/labsynch/labseer/dto/ValuePathDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ValuePathDTO.java
@@ -18,193 +18,191 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
-
 public class ValuePathDTO {
-	
-    public ValuePathDTO() {
-
-    }
-
-    
-    private String entity;
-    private String entityType;
-    private String entityKind;
-    private String stateType;
-    private String stateKind;
-    private String valueType;
-    private String valueKind;
-    
-    public String extractStringValue(LsThing lsThing){
-    	if (entity.equalsIgnoreCase("LsThing")
-    			&& entityType.equals(lsThing.getLsType())
-    			&& entityKind.equals(lsThing.getLsKind())){
-    		Set<LsThingState> lsStates = lsThing.getLsStates();
-    		for (LsThingState lsState : lsStates){
-    			if (stateType.equals(lsState.getLsType()) && stateKind.equals(lsState.getLsKind())){
-    				Set<LsThingValue> lsValues = lsState.getLsValues();
-    				for (LsThingValue lsValue : lsValues){
-    					if (valueType.equals(lsValue.getLsType()) && valueKind.equals(lsValue.getLsKind())){
-    						if (valueType.equals("stringValue")) return lsValue.getStringValue();
-    						if (valueType.equals("codeValue")) return lsValue.getCodeValue();
-    					}
-    				}
-    			}
-    		}
-    	}
-    	return null;
-    }
-    
-    public BigDecimal extractNumericValue(LsThing lsThing){
-    	if (entity.equalsIgnoreCase("LsThing")
-    			&& entityType.equals(lsThing.getLsType())
-    			&& entityKind.equals(lsThing.getLsKind())){
-    		Set<LsThingState> lsStates = lsThing.getLsStates();
-    		for (LsThingState lsState : lsStates){
-    			if (stateType.equals(lsState.getLsType()) && stateKind.equals(lsState.getLsKind())){
-    				Set<LsThingValue> lsValues = lsState.getLsValues();
-    				for (LsThingValue lsValue : lsValues){
-    					if (valueType.equals(lsValue.getLsType()) && valueKind.equals(lsValue.getLsKind())){
-    						if (valueType.equals("numericValue")) return lsValue.getNumericValue();
-    					}
-    				}
-    			}
-    		}
-    	}
-    	return null;
-    }
-    
-    public String extractStringValue(ItxLsThingLsThing ItxLsThingLsThing){
-    	if (entity.equalsIgnoreCase("ItxLsThingLsThing")
-    			&& entityType.equals(ItxLsThingLsThing.getLsType())
-    			&& entityKind.equals(ItxLsThingLsThing.getLsKind())){
-    		Set<ItxLsThingLsThingState> lsStates = ItxLsThingLsThing.getLsStates();
-    		for (ItxLsThingLsThingState lsState : lsStates){
-    			if (stateType.equals(lsState.getLsType()) && stateKind.equals(lsState.getLsKind())){
-    				Set<ItxLsThingLsThingValue> lsValues = lsState.getLsValues();
-    				for (ItxLsThingLsThingValue lsValue : lsValues){
-    					if (valueType.equals(lsValue.getLsType()) && valueKind.equals(lsValue.getLsKind())){
-    						if (valueType.equals("stringValue")) return lsValue.getStringValue();
-    						if (valueType.equals("codeValue")) return lsValue.getCodeValue();
-    					}
-    				}
-    			}
-    		}
-    	}
-    	return null;
-    }
-    
-    public BigDecimal extractNumericValue(ItxLsThingLsThing ItxLsThingLsThing){
-    	if (entity.equalsIgnoreCase("ItxLsThingLsThing")
-    			&& entityType.equals(ItxLsThingLsThing.getLsType())
-    			&& entityKind.equals(ItxLsThingLsThing.getLsKind())){
-    		Set<ItxLsThingLsThingState> lsStates = ItxLsThingLsThing.getLsStates();
-    		for (ItxLsThingLsThingState lsState : lsStates){
-    			if (stateType.equals(lsState.getLsType()) && stateKind.equals(lsState.getLsKind())){
-    				Set<ItxLsThingLsThingValue> lsValues = lsState.getLsValues();
-    				for (ItxLsThingLsThingValue lsValue : lsValues){
-    					if (valueType.equals(lsValue.getLsType()) && valueKind.equals(lsValue.getLsKind())){
-    						if (valueType.equals("numericValue")) return lsValue.getNumericValue();
-    					}
-    				}
-    			}
-    		}
-    	}
-    	return null;
-    }
-    
-    
-	
+
+	public ValuePathDTO() {
+
+	}
+
+	private String entity;
+	private String entityType;
+	private String entityKind;
+	private String stateType;
+	private String stateKind;
+	private String valueType;
+	private String valueKind;
+
+	public String extractStringValue(LsThing lsThing) {
+		if (entity.equalsIgnoreCase("LsThing")
+				&& entityType.equals(lsThing.getLsType())
+				&& entityKind.equals(lsThing.getLsKind())) {
+			Set<LsThingState> lsStates = lsThing.getLsStates();
+			for (LsThingState lsState : lsStates) {
+				if (stateType.equals(lsState.getLsType()) && stateKind.equals(lsState.getLsKind())) {
+					Set<LsThingValue> lsValues = lsState.getLsValues();
+					for (LsThingValue lsValue : lsValues) {
+						if (valueType.equals(lsValue.getLsType()) && valueKind.equals(lsValue.getLsKind())) {
+							if (valueType.equals("stringValue"))
+								return lsValue.getStringValue();
+							if (valueType.equals("codeValue"))
+								return lsValue.getCodeValue();
+						}
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	public BigDecimal extractNumericValue(LsThing lsThing) {
+		if (entity.equalsIgnoreCase("LsThing")
+				&& entityType.equals(lsThing.getLsType())
+				&& entityKind.equals(lsThing.getLsKind())) {
+			Set<LsThingState> lsStates = lsThing.getLsStates();
+			for (LsThingState lsState : lsStates) {
+				if (stateType.equals(lsState.getLsType()) && stateKind.equals(lsState.getLsKind())) {
+					Set<LsThingValue> lsValues = lsState.getLsValues();
+					for (LsThingValue lsValue : lsValues) {
+						if (valueType.equals(lsValue.getLsType()) && valueKind.equals(lsValue.getLsKind())) {
+							if (valueType.equals("numericValue"))
+								return lsValue.getNumericValue();
+						}
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	public String extractStringValue(ItxLsThingLsThing ItxLsThingLsThing) {
+		if (entity.equalsIgnoreCase("ItxLsThingLsThing")
+				&& entityType.equals(ItxLsThingLsThing.getLsType())
+				&& entityKind.equals(ItxLsThingLsThing.getLsKind())) {
+			Set<ItxLsThingLsThingState> lsStates = ItxLsThingLsThing.getLsStates();
+			for (ItxLsThingLsThingState lsState : lsStates) {
+				if (stateType.equals(lsState.getLsType()) && stateKind.equals(lsState.getLsKind())) {
+					Set<ItxLsThingLsThingValue> lsValues = lsState.getLsValues();
+					for (ItxLsThingLsThingValue lsValue : lsValues) {
+						if (valueType.equals(lsValue.getLsType()) && valueKind.equals(lsValue.getLsKind())) {
+							if (valueType.equals("stringValue"))
+								return lsValue.getStringValue();
+							if (valueType.equals("codeValue"))
+								return lsValue.getCodeValue();
+						}
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	public BigDecimal extractNumericValue(ItxLsThingLsThing ItxLsThingLsThing) {
+		if (entity.equalsIgnoreCase("ItxLsThingLsThing")
+				&& entityType.equals(ItxLsThingLsThing.getLsType())
+				&& entityKind.equals(ItxLsThingLsThing.getLsKind())) {
+			Set<ItxLsThingLsThingState> lsStates = ItxLsThingLsThing.getLsStates();
+			for (ItxLsThingLsThingState lsState : lsStates) {
+				if (stateType.equals(lsState.getLsType()) && stateKind.equals(lsState.getLsKind())) {
+					Set<ItxLsThingLsThingValue> lsValues = lsState.getLsValues();
+					for (ItxLsThingLsThingValue lsValue : lsValues) {
+						if (valueType.equals(lsValue.getLsType()) && valueKind.equals(lsValue.getLsKind())) {
+							if (valueType.equals("numericValue"))
+								return lsValue.getNumericValue();
+						}
+					}
+				}
+			}
+		}
+		return null;
+	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 
 	public String toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(this);
+	}
 
 	public String toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(this);
+	}
 
 	public static ValuePathDTO fromJsonToValuePathDTO(String json) {
-        return new JSONDeserializer<ValuePathDTO>()
-        .use(null, ValuePathDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<ValuePathDTO>()
+				.use(null, ValuePathDTO.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<ValuePathDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<ValuePathDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<ValuePathDTO> fromJsonArrayToValuePathDTO(String json) {
-        return new JSONDeserializer<List<ValuePathDTO>>()
-        .use("values", ValuePathDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<ValuePathDTO>>()
+				.use("values", ValuePathDTO.class).deserialize(json);
+	}
 
 	public String getEntity() {
-        return this.entity;
-    }
+		return this.entity;
+	}
 
 	public void setEntity(String entity) {
-        this.entity = entity;
-    }
+		this.entity = entity;
+	}
 
 	public String getEntityType() {
-        return this.entityType;
-    }
+		return this.entityType;
+	}
 
 	public void setEntityType(String entityType) {
-        this.entityType = entityType;
-    }
+		this.entityType = entityType;
+	}
 
 	public String getEntityKind() {
-        return this.entityKind;
-    }
+		return this.entityKind;
+	}
 
 	public void setEntityKind(String entityKind) {
-        this.entityKind = entityKind;
-    }
+		this.entityKind = entityKind;
+	}
 
 	public String getStateType() {
-        return this.stateType;
-    }
+		return this.stateType;
+	}
 
 	public void setStateType(String stateType) {
-        this.stateType = stateType;
-    }
+		this.stateType = stateType;
+	}
 
 	public String getStateKind() {
-        return this.stateKind;
-    }
+		return this.stateKind;
+	}
 
 	public void setStateKind(String stateKind) {
-        this.stateKind = stateKind;
-    }
+		this.stateKind = stateKind;
+	}
 
 	public String getValueType() {
-        return this.valueType;
-    }
+		return this.valueType;
+	}
 
 	public void setValueType(String valueType) {
-        this.valueType = valueType;
-    }
+		this.valueType = valueType;
+	}
 
 	public String getValueKind() {
-        return this.valueKind;
-    }
+		return this.valueKind;
+	}
 
 	public void setValueKind(String valueKind) {
-        this.valueKind = valueKind;
-    }
+		this.valueKind = valueKind;
+	}
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/ValueQueryDTO.java b/src/main/java/com/labsynch/labseer/dto/ValueQueryDTO.java
index b1e818f43..ea3252b4c 100644
--- a/src/main/java/com/labsynch/labseer/dto/ValueQueryDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ValueQueryDTO.java
@@ -9,99 +9,98 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ValueQueryDTO {
 
-	String stateType;
-	String stateKind;
-	String valueType;
-	String valueKind;
-	String value;
-	String operator;
-	
-	public ValueQueryDTO(){
-		
-	}
-
-	public String getStateType() {
+    String stateType;
+    String stateKind;
+    String valueType;
+    String valueKind;
+    String value;
+    String operator;
+
+    public ValueQueryDTO() {
+
+    }
+
+    public String getStateType() {
         return this.stateType;
     }
 
-	public void setStateType(String stateType) {
+    public void setStateType(String stateType) {
         this.stateType = stateType;
     }
 
-	public String getStateKind() {
+    public String getStateKind() {
         return this.stateKind;
     }
 
-	public void setStateKind(String stateKind) {
+    public void setStateKind(String stateKind) {
         this.stateKind = stateKind;
     }
 
-	public String getValueType() {
+    public String getValueType() {
         return this.valueType;
     }
 
-	public void setValueType(String valueType) {
+    public void setValueType(String valueType) {
         this.valueType = valueType;
     }
 
-	public String getValueKind() {
+    public String getValueKind() {
         return this.valueKind;
     }
 
-	public void setValueKind(String valueKind) {
+    public void setValueKind(String valueKind) {
         this.valueKind = valueKind;
     }
 
-	public String getValue() {
+    public String getValue() {
         return this.value;
     }
 
-	public void setValue(String value) {
+    public void setValue(String value) {
         this.value = value;
     }
 
-	public String getOperator() {
+    public String getOperator() {
         return this.operator;
     }
 
-	public void setOperator(String operator) {
+    public void setOperator(String operator) {
         this.operator = operator;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ValueQueryDTO fromJsonToValueQueryDTO(String json) {
+    public static ValueQueryDTO fromJsonToValueQueryDTO(String json) {
         return new JSONDeserializer<ValueQueryDTO>()
-        .use(null, ValueQueryDTO.class).deserialize(json);
+                .use(null, ValueQueryDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ValueQueryDTO> collection) {
+    public static String toJsonArray(Collection<ValueQueryDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ValueQueryDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<ValueQueryDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ValueQueryDTO> fromJsonArrayToValueQueryDTO(String json) {
+    public static Collection<ValueQueryDTO> fromJsonArrayToValueQueryDTO(String json) {
         return new JSONDeserializer<List<ValueQueryDTO>>()
-        .use("values", ValueQueryDTO.class).deserialize(json);
+                .use("values", ValueQueryDTO.class).deserialize(json);
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/dto/ValueRuleDTO.java b/src/main/java/com/labsynch/labseer/dto/ValueRuleDTO.java
index 19212c4ac..192434a63 100644
--- a/src/main/java/com/labsynch/labseer/dto/ValueRuleDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ValueRuleDTO.java
@@ -14,122 +14,123 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
-
 public class ValueRuleDTO {
-	
-    public ValueRuleDTO() {
 
-    }
+	public ValueRuleDTO() {
+
+	}
 
 	private static final Logger logger = LoggerFactory.getLogger(ValueRuleDTO.class);
-    
+
 	private String comparisonMethod;
-//	"string exact match" or "numeric exact match";
-	
+	// "string exact match" or "numeric exact match";
+
 	private BigDecimal comparisonRange;
-	
+
 	private ValuePathDTO value;
-	
-	public boolean matchItxLsThingLsThings(ItxLsThingLsThing itxOne, ItxLsThingLsThing itxTwo){
-		if (this.comparisonMethod.equalsIgnoreCase("string exact match")){
+
+	public boolean matchItxLsThingLsThings(ItxLsThingLsThing itxOne, ItxLsThingLsThing itxTwo) {
+		if (this.comparisonMethod.equalsIgnoreCase("string exact match")) {
 			String firstValue = value.extractStringValue(itxOne);
 			String secondValue = value.extractStringValue(itxTwo);
-			if (firstValue != null && secondValue != null && firstValue.equals(secondValue)) return true;
+			if (firstValue != null && secondValue != null && firstValue.equals(secondValue))
+				return true;
 		}
-		if (this.comparisonMethod.equalsIgnoreCase("numeric exact match")){
+		if (this.comparisonMethod.equalsIgnoreCase("numeric exact match")) {
 			BigDecimal firstValue = value.extractNumericValue(itxOne);
 			BigDecimal secondValue = value.extractNumericValue(itxTwo);
-			if (firstValue != null && secondValue != null && firstValue.compareTo(secondValue) == 0) return true;
+			if (firstValue != null && secondValue != null && firstValue.compareTo(secondValue) == 0)
+				return true;
 		}
 		return false;
 	}
-	
-	public boolean matchLsThings(LsThing thingOne, LsThing thingTwo){
-		if (this.comparisonMethod.equalsIgnoreCase("string exact match")){
+
+	public boolean matchLsThings(LsThing thingOne, LsThing thingTwo) {
+		if (this.comparisonMethod.equalsIgnoreCase("string exact match")) {
 			String firstValue = value.extractStringValue(thingOne);
 			String secondValue = value.extractStringValue(thingTwo);
-			if (firstValue != null && secondValue != null && firstValue.equals(secondValue)) return true;
+			if (firstValue != null && secondValue != null && firstValue.equals(secondValue))
+				return true;
 		}
-		if (this.comparisonMethod.equalsIgnoreCase("numeric exact match")){
+		if (this.comparisonMethod.equalsIgnoreCase("numeric exact match")) {
 			BigDecimal firstValue = value.extractNumericValue(thingOne);
 			BigDecimal secondValue = value.extractNumericValue(thingTwo);
-			logger.debug("Comparing "+firstValue.toString() + " to "+secondValue.toString());
-			if (firstValue != null && secondValue != null && firstValue.compareTo(secondValue) == 0) return true;
+			logger.debug("Comparing " + firstValue.toString() + " to " + secondValue.toString());
+			if (firstValue != null && secondValue != null && firstValue.compareTo(secondValue) == 0)
+				return true;
 		}
 		return false;
 	}
-	
-	public boolean checkRuleApplies(ItxLsThingLsThing itx){
-		if (this.comparisonMethod.equalsIgnoreCase("string exact match")){
+
+	public boolean checkRuleApplies(ItxLsThingLsThing itx) {
+		if (this.comparisonMethod.equalsIgnoreCase("string exact match")) {
 			String stringValue = value.extractStringValue(itx);
-			if (stringValue != null) return true;
+			if (stringValue != null)
+				return true;
 		}
-		if (this.comparisonMethod.equalsIgnoreCase("numeric exact match")){
+		if (this.comparisonMethod.equalsIgnoreCase("numeric exact match")) {
 			BigDecimal numericValue = value.extractNumericValue(itx);
-			if (numericValue != null) return true;
+			if (numericValue != null)
+				return true;
 		}
 		return false;
 	}
-	
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 
 	public String toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(this);
+	}
 
 	public String toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(this);
+	}
 
 	public static ValueRuleDTO fromJsonToValueRuleDTO(String json) {
-        return new JSONDeserializer<ValueRuleDTO>()
-        .use(null, ValueRuleDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<ValueRuleDTO>()
+				.use(null, ValueRuleDTO.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<ValueRuleDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<ValueRuleDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<ValueRuleDTO> fromJsonArrayToValueRuleDTO(String json) {
-        return new JSONDeserializer<List<ValueRuleDTO>>()
-        .use("values", ValueRuleDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<ValueRuleDTO>>()
+				.use("values", ValueRuleDTO.class).deserialize(json);
+	}
 
 	public String getComparisonMethod() {
-        return this.comparisonMethod;
-    }
+		return this.comparisonMethod;
+	}
 
 	public void setComparisonMethod(String comparisonMethod) {
-        this.comparisonMethod = comparisonMethod;
-    }
+		this.comparisonMethod = comparisonMethod;
+	}
 
 	public BigDecimal getComparisonRange() {
-        return this.comparisonRange;
-    }
+		return this.comparisonRange;
+	}
 
 	public void setComparisonRange(BigDecimal comparisonRange) {
-        this.comparisonRange = comparisonRange;
-    }
+		this.comparisonRange = comparisonRange;
+	}
 
 	public ValuePathDTO getValue() {
-        return this.value;
-    }
+		return this.value;
+	}
 
 	public void setValue(ValuePathDTO value) {
-        this.value = value;
-    }
+		this.value = value;
+	}
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/ValueTypeKindDTO.java b/src/main/java/com/labsynch/labseer/dto/ValueTypeKindDTO.java
index 740109cb5..8dd5ba8bc 100755
--- a/src/main/java/com/labsynch/labseer/dto/ValueTypeKindDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/ValueTypeKindDTO.java
@@ -12,112 +12,108 @@
 import java.util.Collection;
 import java.util.List;
 
-
 public class ValueTypeKindDTO {
-	
+
 	private String lsType;
-	
+
 	private String lsKind;
-	
+
 	private int displayOrder;
-	
+
 	private ValueKind valueKind;
 
 	public ValueTypeKindDTO(
-			String lsType, 
-			String lsKind){
-		
+			String lsType,
+			String lsKind) {
+
 		this.lsType = lsType;
 		this.lsKind = lsKind;
 	}
 
-
 	public ValueTypeKindDTO() {
 	}
-	
+
 	@Transactional
-	public void findValueKind(){
+	public void findValueKind() {
 		ValueType valueType;
-    	try{
-    		valueType = ValueType.findValueTypesByTypeNameEquals(this.lsType).getSingleResult();
-    	} catch(NoResultException e){
-    		this.valueKind = null;
-    		valueType = null;
-    	}
-    	ValueKind valueKind;
-    	try{
-    		valueKind = ValueKind.findValueKindsByKindNameEqualsAndLsType(this.lsKind, valueType).getSingleResult();
-    		this.valueKind = valueKind;
-    	} catch(NoResultException e){
-    		this.valueKind = null;
-    	}
+		try {
+			valueType = ValueType.findValueTypesByTypeNameEquals(this.lsType).getSingleResult();
+		} catch (NoResultException e) {
+			this.valueKind = null;
+			valueType = null;
+		}
+		ValueKind valueKind;
+		try {
+			valueKind = ValueKind.findValueKindsByKindNameEqualsAndLsType(this.lsKind, valueType).getSingleResult();
+			this.valueKind = valueKind;
+		} catch (NoResultException e) {
+			this.valueKind = null;
+		}
 	}
 
 	public String toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(this);
+	}
 
 	public String toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(this);
+	}
 
 	public static ValueTypeKindDTO fromJsonToValueTypeKindDTO(String json) {
-        return new JSONDeserializer<ValueTypeKindDTO>()
-        .use(null, ValueTypeKindDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<ValueTypeKindDTO>()
+				.use(null, ValueTypeKindDTO.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<ValueTypeKindDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<ValueTypeKindDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<ValueTypeKindDTO> fromJsonArrayToValueTypeKindDTO(String json) {
-        return new JSONDeserializer<List<ValueTypeKindDTO>>()
-        .use("values", ValueTypeKindDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<ValueTypeKindDTO>>()
+				.use("values", ValueTypeKindDTO.class).deserialize(json);
+	}
 
 	public String getLsType() {
-        return this.lsType;
-    }
+		return this.lsType;
+	}
 
 	public void setLsType(String lsType) {
-        this.lsType = lsType;
-    }
+		this.lsType = lsType;
+	}
 
 	public String getLsKind() {
-        return this.lsKind;
-    }
+		return this.lsKind;
+	}
 
 	public void setLsKind(String lsKind) {
-        this.lsKind = lsKind;
-    }
+		this.lsKind = lsKind;
+	}
 
 	public int getDisplayOrder() {
-        return this.displayOrder;
-    }
+		return this.displayOrder;
+	}
 
 	public void setDisplayOrder(int displayOrder) {
-        this.displayOrder = displayOrder;
-    }
+		this.displayOrder = displayOrder;
+	}
 
 	public ValueKind getValueKind() {
-        return this.valueKind;
-    }
+		return this.valueKind;
+	}
 
 	public void setValueKind(ValueKind valueKind) {
-        this.valueKind = valueKind;
-    }
+		this.valueKind = valueKind;
+	}
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/WellContentDTO.java b/src/main/java/com/labsynch/labseer/dto/WellContentDTO.java
index b2681cfff..e52e2a167 100644
--- a/src/main/java/com/labsynch/labseer/dto/WellContentDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/WellContentDTO.java
@@ -12,9 +12,8 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-
 public class WellContentDTO {
-	
+
 	private String containerCodeName;
 	private BigDecimal amount;
 	private String amountUnits;
@@ -25,32 +24,31 @@ public class WellContentDTO {
 	private String physicalState;
 	private String level;
 	private String message;
-	
+
 	private String wellName;
 	private Integer rowIndex;
 	private Integer columnIndex;
 	private String recordedBy;
 	private Date recordedDate;
 	private Date lastModifiedDate;
-	
-	public WellContentDTO(){
+
+	public WellContentDTO() {
 	}
-	
+
 	public WellContentDTO(String containerCodeName,
 			String wellName,
 			Integer rowIndex,
 			Integer columnIndex,
 			String recordedBy,
-			Date recordedDate
-			){
-		this.containerCodeName = containerCodeName; 
+			Date recordedDate) {
+		this.containerCodeName = containerCodeName;
 		this.wellName = wellName;
 		this.rowIndex = rowIndex;
 		this.columnIndex = columnIndex;
 		this.recordedBy = recordedBy;
 		this.recordedDate = recordedDate;
 	}
-	
+
 	public WellContentDTO(String containerCodeName,
 			String wellName,
 			Integer rowIndex,
@@ -64,8 +62,8 @@ public WellContentDTO(String containerCodeName,
 			Double batchConcentration,
 			String batchConcUnits,
 			String solventCode,
-			String physicalState){
-		this.containerCodeName = containerCodeName; 
+			String physicalState) {
+		this.containerCodeName = containerCodeName;
 		this.wellName = wellName;
 		this.rowIndex = rowIndex;
 		this.columnIndex = columnIndex;
@@ -80,172 +78,166 @@ public WellContentDTO(String containerCodeName,
 		this.solventCode = solventCode;
 		this.physicalState = physicalState;
 	}
-	
-	
-	
-
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 
 	public String toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(this);
+	}
 
 	public String toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(this);
+	}
 
 	public static WellContentDTO fromJsonToWellContentDTO(String json) {
-        return new JSONDeserializer<WellContentDTO>()
-        .use(null, WellContentDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<WellContentDTO>()
+				.use(null, WellContentDTO.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<WellContentDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<WellContentDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<WellContentDTO> fromJsonArrayToWellCoes(String json) {
-        return new JSONDeserializer<List<WellContentDTO>>()
-        .use("values", WellContentDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<WellContentDTO>>()
+				.use("values", WellContentDTO.class).deserialize(json);
+	}
 
 	public String getContainerCodeName() {
-        return this.containerCodeName;
-    }
+		return this.containerCodeName;
+	}
 
 	public void setContainerCodeName(String containerCodeName) {
-        this.containerCodeName = containerCodeName;
-    }
+		this.containerCodeName = containerCodeName;
+	}
 
 	public BigDecimal getAmount() {
-        return this.amount;
-    }
+		return this.amount;
+	}
 
 	public void setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
+		this.amount = amount;
+	}
 
 	public String getAmountUnits() {
-        return this.amountUnits;
-    }
+		return this.amountUnits;
+	}
 
 	public void setAmountUnits(String amountUnits) {
-        this.amountUnits = amountUnits;
-    }
+		this.amountUnits = amountUnits;
+	}
 
 	public String getBatchCode() {
-        return this.batchCode;
-    }
+		return this.batchCode;
+	}
 
 	public void setBatchCode(String batchCode) {
-        this.batchCode = batchCode;
-    }
+		this.batchCode = batchCode;
+	}
 
 	public Double getBatchConcentration() {
-        return this.batchConcentration;
-    }
+		return this.batchConcentration;
+	}
 
 	public void setBatchConcentration(Double batchConcentration) {
-        this.batchConcentration = batchConcentration;
-    }
+		this.batchConcentration = batchConcentration;
+	}
 
 	public String getBatchConcUnits() {
-        return this.batchConcUnits;
-    }
+		return this.batchConcUnits;
+	}
 
 	public void setBatchConcUnits(String batchConcUnits) {
-        this.batchConcUnits = batchConcUnits;
-    }
+		this.batchConcUnits = batchConcUnits;
+	}
 
 	public String getSolventCode() {
-        return this.solventCode;
-    }
+		return this.solventCode;
+	}
 
 	public void setSolventCode(String solventCode) {
-        this.solventCode = solventCode;
-    }
+		this.solventCode = solventCode;
+	}
 
 	public String getPhysicalState() {
-        return this.physicalState;
-    }
+		return this.physicalState;
+	}
 
 	public void setPhysicalState(String physicalState) {
-        this.physicalState = physicalState;
-    }
+		this.physicalState = physicalState;
+	}
 
 	public String getLevel() {
-        return this.level;
-    }
+		return this.level;
+	}
 
 	public void setLevel(String level) {
-        this.level = level;
-    }
+		this.level = level;
+	}
 
 	public String getMessage() {
-        return this.message;
-    }
+		return this.message;
+	}
 
 	public void setMessage(String message) {
-        this.message = message;
-    }
+		this.message = message;
+	}
 
 	public String getWellName() {
-        return this.wellName;
-    }
+		return this.wellName;
+	}
 
 	public void setWellName(String wellName) {
-        this.wellName = wellName;
-    }
+		this.wellName = wellName;
+	}
 
 	public Integer getRowIndex() {
-        return this.rowIndex;
-    }
+		return this.rowIndex;
+	}
 
 	public void setRowIndex(Integer rowIndex) {
-        this.rowIndex = rowIndex;
-    }
+		this.rowIndex = rowIndex;
+	}
 
 	public Integer getColumnIndex() {
-        return this.columnIndex;
-    }
+		return this.columnIndex;
+	}
 
 	public void setColumnIndex(Integer columnIndex) {
-        this.columnIndex = columnIndex;
-    }
+		this.columnIndex = columnIndex;
+	}
 
 	public String getRecordedBy() {
-        return this.recordedBy;
-    }
+		return this.recordedBy;
+	}
 
 	public void setRecordedBy(String recordedBy) {
-        this.recordedBy = recordedBy;
-    }
+		this.recordedBy = recordedBy;
+	}
 
 	public Date getRecordedDate() {
-        return this.recordedDate;
-    }
+		return this.recordedDate;
+	}
 
 	public void setRecordedDate(Date recordedDate) {
-        this.recordedDate = recordedDate;
-    }
+		this.recordedDate = recordedDate;
+	}
 
 	public Date getLastModifiedDate() {
-        return this.lastModifiedDate;
-    }
+		return this.lastModifiedDate;
+	}
 
 	public void setLastModifiedDate(Date lastModifiedDate) {
-        this.lastModifiedDate = lastModifiedDate;
-    }
+		this.lastModifiedDate = lastModifiedDate;
+	}
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/WellStubDTO.java b/src/main/java/com/labsynch/labseer/dto/WellStubDTO.java
index a93dcad62..45c5c3608 100644
--- a/src/main/java/com/labsynch/labseer/dto/WellStubDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/WellStubDTO.java
@@ -14,20 +14,19 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class WellStubDTO {
-	
+
 	private String wellName;
 	private String codeName;
-	
+
 	private Integer rowIndex;
-	
+
 	private Integer columnIndex;
-	
-	public WellStubDTO(){
+
+	public WellStubDTO() {
 	}
-	
-	public WellStubDTO(String wellName, String codeName, Integer rowIndex, Integer columnIndex){
+
+	public WellStubDTO(String wellName, String codeName, Integer rowIndex, Integer columnIndex) {
 		this.wellName = wellName;
 		this.codeName = codeName;
 		this.rowIndex = rowIndex;
@@ -37,94 +36,92 @@ public WellStubDTO(String wellName, String codeName, Integer rowIndex, Integer c
 	public static Collection<WellStubDTO> convertToWellStubDTOs(
 			Collection<Container> wells) {
 		Collection<WellStubDTO> wellStubs = new ArrayList<WellStubDTO>();
-		for (Container well : wells){
+		for (Container well : wells) {
 			String wellName = ContainerLabel.pickBestLabel(well.getLsLabels()).getLabelText();
-			WellStubDTO wellStub = new WellStubDTO(wellName, well.getCodeName(), well.getRowIndex(), well.getColumnIndex());
+			WellStubDTO wellStub = new WellStubDTO(wellName, well.getCodeName(), well.getRowIndex(),
+					well.getColumnIndex());
 			wellStubs.add(wellStub);
 		}
 		return wellStubs;
 	}
-	
+
 	public static Collection<WellStubDTO> convertToWellStubDTOs(
 			List<Container> wells, List<ContainerLabel> wellNames) {
 		Collection<WellStubDTO> wellStubs = new ArrayList<WellStubDTO>();
 		int i = 0;
-		for (Container well : wells){
+		for (Container well : wells) {
 			String wellName = wellNames.get(i).getLabelText();
-			WellStubDTO wellStub = new WellStubDTO(wellName, well.getCodeName(), well.getRowIndex(), well.getColumnIndex());
+			WellStubDTO wellStub = new WellStubDTO(wellName, well.getCodeName(), well.getRowIndex(),
+					well.getColumnIndex());
 			wellStubs.add(wellStub);
 			i++;
 		}
 		return wellStubs;
 	}
-	
-
 
 	public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
+		return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+	}
 
 	public String getWellName() {
-        return this.wellName;
-    }
+		return this.wellName;
+	}
 
 	public void setWellName(String wellName) {
-        this.wellName = wellName;
-    }
+		this.wellName = wellName;
+	}
 
 	public String getCodeName() {
-        return this.codeName;
-    }
+		return this.codeName;
+	}
 
 	public void setCodeName(String codeName) {
-        this.codeName = codeName;
-    }
+		this.codeName = codeName;
+	}
 
 	public Integer getRowIndex() {
-        return this.rowIndex;
-    }
+		return this.rowIndex;
+	}
 
 	public void setRowIndex(Integer rowIndex) {
-        this.rowIndex = rowIndex;
-    }
+		this.rowIndex = rowIndex;
+	}
 
 	public Integer getColumnIndex() {
-        return this.columnIndex;
-    }
+		return this.columnIndex;
+	}
 
 	public void setColumnIndex(Integer columnIndex) {
-        this.columnIndex = columnIndex;
-    }
+		this.columnIndex = columnIndex;
+	}
 
 	public String toJson() {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(this);
+	}
 
 	public String toJson(String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(this);
+	}
 
 	public static WellStubDTO fromJsonToWellStubDTO(String json) {
-        return new JSONDeserializer<WellStubDTO>()
-        .use(null, WellStubDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<WellStubDTO>()
+				.use(null, WellStubDTO.class).deserialize(json);
+	}
 
 	public static String toJsonArray(Collection<WellStubDTO> collection) {
-        return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.exclude("*.class").serialize(collection);
+	}
 
 	public static String toJsonArray(Collection<WellStubDTO> collection, String[] fields) {
-        return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
-    }
+		return new JSONSerializer()
+				.include(fields).exclude("*.class").serialize(collection);
+	}
 
 	public static Collection<WellStubDTO> fromJsonArrayToWellStubDTO(String json) {
-        return new JSONDeserializer<List<WellStubDTO>>()
-        .use("values", WellStubDTO.class).deserialize(json);
-    }
+		return new JSONDeserializer<List<WellStubDTO>>()
+				.use("values", WellStubDTO.class).deserialize(json);
+	}
 }
-
-
diff --git a/src/main/java/com/labsynch/labseer/dto/configuration/StandardizerSettingsConfigDTO.java b/src/main/java/com/labsynch/labseer/dto/configuration/StandardizerSettingsConfigDTO.java
index be792c843..1d3b08c90 100644
--- a/src/main/java/com/labsynch/labseer/dto/configuration/StandardizerSettingsConfigDTO.java
+++ b/src/main/java/com/labsynch/labseer/dto/configuration/StandardizerSettingsConfigDTO.java
@@ -11,7 +11,6 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class StandardizerSettingsConfigDTO {
 
     private Boolean shouldStandardize;
@@ -21,88 +20,89 @@ public class StandardizerSettingsConfigDTO {
     private String settings;
 
     public int hashCode() {
-	    // you pick a hard-coded, randomly chosen, non-zero, odd number
-	    // ideally different for each class
-		HashCodeBuilder hashCodeBuilder = new HashCodeBuilder(17, 37).
-	            append(shouldStandardize).
-	            append(type);
-		hashCodeBuilder.append(settings);
-
-	    return hashCodeBuilder.toHashCode();
-    }
-
-	public boolean equals(Object obj) {
-	   if (obj == null) { return false; }
-	   if (obj == this) { return true; }
-	   if (obj.getClass() != getClass()) {
-	     return false;
-	   }
-	   StandardizerSettingsConfigDTO rhs = (StandardizerSettingsConfigDTO) obj;
-	   EqualsBuilder equalsBuilder = new EqualsBuilder()
-	             .appendSuper(super.equals(obj))
-	             .append(shouldStandardize, rhs.shouldStandardize)
-	             .append(type, rhs.type);
-		equalsBuilder.append(settings, rhs.settings);
+        // you pick a hard-coded, randomly chosen, non-zero, odd number
+        // ideally different for each class
+        HashCodeBuilder hashCodeBuilder = new HashCodeBuilder(17, 37).append(shouldStandardize).append(type);
+        hashCodeBuilder.append(settings);
 
-		return equalsBuilder.isEquals();
-	}
+        return hashCodeBuilder.toHashCode();
+    }
 
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (obj == this) {
+            return true;
+        }
+        if (obj.getClass() != getClass()) {
+            return false;
+        }
+        StandardizerSettingsConfigDTO rhs = (StandardizerSettingsConfigDTO) obj;
+        EqualsBuilder equalsBuilder = new EqualsBuilder()
+                .appendSuper(super.equals(obj))
+                .append(shouldStandardize, rhs.shouldStandardize)
+                .append(type, rhs.type);
+        equalsBuilder.append(settings, rhs.settings);
+
+        return equalsBuilder.isEquals();
+    }
 
-	public Boolean getShouldStandardize() {
+    public Boolean getShouldStandardize() {
         return this.shouldStandardize;
     }
 
-	public void setShouldStandardize(Boolean shouldStandardize) {
+    public void setShouldStandardize(Boolean shouldStandardize) {
         this.shouldStandardize = shouldStandardize;
     }
 
-	public String getType() {
+    public String getType() {
         return this.type;
     }
 
-	public void setType(String type) {
+    public void setType(String type) {
         this.type = type;
     }
 
-	public String getSettings() {
+    public String getSettings() {
         return this.settings;
     }
 
-	public void setSettings(String settings) {
+    public void setSettings(String settings) {
         this.settings = settings;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static StandardizerSettingsConfigDTO fromJsonToStandardizerSettingsConfigDTO(String json) {
+    public static StandardizerSettingsConfigDTO fromJsonToStandardizerSettingsConfigDTO(String json) {
         return new JSONDeserializer<StandardizerSettingsConfigDTO>()
-        .use(null, StandardizerSettingsConfigDTO.class).deserialize(json);
+                .use(null, StandardizerSettingsConfigDTO.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<StandardizerSettingsConfigDTO> collection) {
+    public static String toJsonArray(Collection<StandardizerSettingsConfigDTO> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<StandardizerSettingsConfigDTO> collection, String[] fields) {
+    public static String toJsonArray(Collection<StandardizerSettingsConfigDTO> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<StandardizerSettingsConfigDTO> fromJsonArrayToStandardizerSettingsCoes(String json) {
+    public static Collection<StandardizerSettingsConfigDTO> fromJsonArrayToStandardizerSettingsCoes(String json) {
         return new JSONDeserializer<List<StandardizerSettingsConfigDTO>>()
-        .use("values", StandardizerSettingsConfigDTO.class).deserialize(json);
+                .use("values", StandardizerSettingsConfigDTO.class).deserialize(json);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/exceptions/CmpdRegMolFormatException.java b/src/main/java/com/labsynch/labseer/exceptions/CmpdRegMolFormatException.java
index ac7dfaa9a..3af3d8289 100644
--- a/src/main/java/com/labsynch/labseer/exceptions/CmpdRegMolFormatException.java
+++ b/src/main/java/com/labsynch/labseer/exceptions/CmpdRegMolFormatException.java
@@ -10,7 +10,7 @@ public CmpdRegMolFormatException(Exception e) {
 	public CmpdRegMolFormatException() {
 		// TODO Auto-generated constructor stub
 	}
-	
+
 	public CmpdRegMolFormatException(String message) {
 		super(message);
 	}
diff --git a/src/main/java/com/labsynch/labseer/exceptions/DupeLotException.java b/src/main/java/com/labsynch/labseer/exceptions/DupeLotException.java
index ae4e5ea09..e6677038f 100644
--- a/src/main/java/com/labsynch/labseer/exceptions/DupeLotException.java
+++ b/src/main/java/com/labsynch/labseer/exceptions/DupeLotException.java
@@ -1,35 +1,35 @@
 package com.labsynch.labseer.exceptions;
 
 public class DupeLotException extends Exception {
-	
+
     public DupeLotException() {
-	// TODO Auto-generated constructor stub
+        // TODO Auto-generated constructor stub
     }
- 
+
     public DupeLotException(String message) {
-	super(message);
-	// TODO Auto-generated constructor stub
+        super(message);
+        // TODO Auto-generated constructor stub
     }
- 
+
     public DupeLotException(Throwable cause) {
-	super(cause);
-	// TODO Auto-generated constructor stub
+        super(cause);
+        // TODO Auto-generated constructor stub
     }
- 
+
     public DupeLotException(String message, Throwable cause) {
-	super(message, cause);
-	// TODO Auto-generated constructor stub
+        super(message, cause);
+        // TODO Auto-generated constructor stub
     }
-    
+
     private String lotCorpName;
-    
+
     public DupeLotException(String message, String lotCorpName) {
-    	super(message);
-    	this.lotCorpName=lotCorpName;
-        }
-    
-    public String getLotCorpName(){
-    	return this.lotCorpName;
+        super(message);
+        this.lotCorpName = lotCorpName;
+    }
+
+    public String getLotCorpName() {
+        return this.lotCorpName;
     }
 
 }
diff --git a/src/main/java/com/labsynch/labseer/exceptions/DupeParentException.java b/src/main/java/com/labsynch/labseer/exceptions/DupeParentException.java
index 491b5e756..d0b8e33b4 100755
--- a/src/main/java/com/labsynch/labseer/exceptions/DupeParentException.java
+++ b/src/main/java/com/labsynch/labseer/exceptions/DupeParentException.java
@@ -3,49 +3,49 @@
 import java.util.List;
 
 public class DupeParentException extends Exception {
-	
+
 	String dbCorpName;
-	
+
 	String sdfCorpName;
-	
+
 	List<String> aliasCorpNames;
-	
-    public DupeParentException() {
-	// TODO Auto-generated constructor stub
-    }
- 
-    public DupeParentException(String message) {
-	super(message);
-	// TODO Auto-generated constructor stub
-    }
- 
-    public DupeParentException(Throwable cause) {
-	super(cause);
-	// TODO Auto-generated constructor stub
-    }
- 
-    public DupeParentException(String message, Throwable cause) {
-	super(message, cause);
-	// TODO Auto-generated constructor stub
-    }
-    
-    public DupeParentException(String message, String dbCorpName, String sdfCorpName, List<String> aliasCorpNames) {
-    	super(message);
-    	this.dbCorpName = dbCorpName;
-    	this.sdfCorpName = sdfCorpName;
-    	this.aliasCorpNames = aliasCorpNames;
-        }
-    
-    public String getDbCorpName(){
-    	return this.dbCorpName;
-    }
-    
-    public String getSdfCorpName(){
-    	return this.sdfCorpName;
-    }
-    
-    public List<String> getAliasCorpNames(){
-    	return this.aliasCorpNames;
-    }
+
+	public DupeParentException() {
+		// TODO Auto-generated constructor stub
+	}
+
+	public DupeParentException(String message) {
+		super(message);
+		// TODO Auto-generated constructor stub
+	}
+
+	public DupeParentException(Throwable cause) {
+		super(cause);
+		// TODO Auto-generated constructor stub
+	}
+
+	public DupeParentException(String message, Throwable cause) {
+		super(message, cause);
+		// TODO Auto-generated constructor stub
+	}
+
+	public DupeParentException(String message, String dbCorpName, String sdfCorpName, List<String> aliasCorpNames) {
+		super(message);
+		this.dbCorpName = dbCorpName;
+		this.sdfCorpName = sdfCorpName;
+		this.aliasCorpNames = aliasCorpNames;
+	}
+
+	public String getDbCorpName() {
+		return this.dbCorpName;
+	}
+
+	public String getSdfCorpName() {
+		return this.sdfCorpName;
+	}
+
+	public List<String> getAliasCorpNames() {
+		return this.aliasCorpNames;
+	}
 
 }
diff --git a/src/main/java/com/labsynch/labseer/exceptions/DupeSaltFormCorpNameException.java b/src/main/java/com/labsynch/labseer/exceptions/DupeSaltFormCorpNameException.java
index 1be5826e4..1e04f7557 100755
--- a/src/main/java/com/labsynch/labseer/exceptions/DupeSaltFormCorpNameException.java
+++ b/src/main/java/com/labsynch/labseer/exceptions/DupeSaltFormCorpNameException.java
@@ -1,24 +1,24 @@
 package com.labsynch.labseer.exceptions;
 
 public class DupeSaltFormCorpNameException extends Exception {
-	
+
     public DupeSaltFormCorpNameException() {
-	// TODO Auto-generated constructor stub
+        // TODO Auto-generated constructor stub
     }
- 
+
     public DupeSaltFormCorpNameException(String message) {
-	super(message);
-	// TODO Auto-generated constructor stub
+        super(message);
+        // TODO Auto-generated constructor stub
     }
- 
+
     public DupeSaltFormCorpNameException(Throwable cause) {
-	super(cause);
-	// TODO Auto-generated constructor stub
+        super(cause);
+        // TODO Auto-generated constructor stub
     }
- 
+
     public DupeSaltFormCorpNameException(String message, Throwable cause) {
-	super(message, cause);
-	// TODO Auto-generated constructor stub
+        super(message, cause);
+        // TODO Auto-generated constructor stub
     }
 
 }
diff --git a/src/main/java/com/labsynch/labseer/exceptions/DupeSaltFormStructureException.java b/src/main/java/com/labsynch/labseer/exceptions/DupeSaltFormStructureException.java
index b7f4c44bb..d0b539343 100755
--- a/src/main/java/com/labsynch/labseer/exceptions/DupeSaltFormStructureException.java
+++ b/src/main/java/com/labsynch/labseer/exceptions/DupeSaltFormStructureException.java
@@ -1,24 +1,24 @@
 package com.labsynch.labseer.exceptions;
 
 public class DupeSaltFormStructureException extends Exception {
-	
+
     public DupeSaltFormStructureException() {
-	// TODO Auto-generated constructor stub
+        // TODO Auto-generated constructor stub
     }
- 
+
     public DupeSaltFormStructureException(String message) {
-	super(message);
-	// TODO Auto-generated constructor stub
+        super(message);
+        // TODO Auto-generated constructor stub
     }
- 
+
     public DupeSaltFormStructureException(Throwable cause) {
-	super(cause);
-	// TODO Auto-generated constructor stub
+        super(cause);
+        // TODO Auto-generated constructor stub
     }
- 
+
     public DupeSaltFormStructureException(String message, Throwable cause) {
-	super(message, cause);
-	// TODO Auto-generated constructor stub
+        super(message, cause);
+        // TODO Auto-generated constructor stub
     }
 
 }
diff --git a/src/main/java/com/labsynch/labseer/exceptions/ErrorMessage.java b/src/main/java/com/labsynch/labseer/exceptions/ErrorMessage.java
index 866926950..5ff88f6cf 100755
--- a/src/main/java/com/labsynch/labseer/exceptions/ErrorMessage.java
+++ b/src/main/java/com/labsynch/labseer/exceptions/ErrorMessage.java
@@ -11,63 +11,61 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ErrorMessage {
 
     @Size(max = 50)
     private String errorLevel;
-    
+
     @Size(max = 255)
     private String message;
-    
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ErrorMessage fromJsonToErrorMessage(String json) {
+    public static ErrorMessage fromJsonToErrorMessage(String json) {
         return new JSONDeserializer<ErrorMessage>()
-        .use(null, ErrorMessage.class).deserialize(json);
+                .use(null, ErrorMessage.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ErrorMessage> collection) {
+    public static String toJsonArray(Collection<ErrorMessage> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ErrorMessage> collection, String[] fields) {
+    public static String toJsonArray(Collection<ErrorMessage> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ErrorMessage> fromJsonArrayToErrorMessages(String json) {
+    public static Collection<ErrorMessage> fromJsonArrayToErrorMessages(String json) {
         return new JSONDeserializer<List<ErrorMessage>>()
-        .use("values", ErrorMessage.class).deserialize(json);
+                .use("values", ErrorMessage.class).deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String getErrorLevel() {
+    public String getErrorLevel() {
         return this.errorLevel;
     }
 
-	public void setErrorLevel(String errorLevel) {
+    public void setErrorLevel(String errorLevel) {
         this.errorLevel = errorLevel;
     }
 
-	public String getMessage() {
+    public String getMessage() {
         return this.message;
     }
 
-	public void setMessage(String message) {
+    public void setMessage(String message) {
         this.message = message;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/exceptions/JsonParseException.java b/src/main/java/com/labsynch/labseer/exceptions/JsonParseException.java
index 763001f16..d8bc5c59e 100755
--- a/src/main/java/com/labsynch/labseer/exceptions/JsonParseException.java
+++ b/src/main/java/com/labsynch/labseer/exceptions/JsonParseException.java
@@ -1,24 +1,24 @@
 package com.labsynch.labseer.exceptions;
 
 public class JsonParseException extends Exception {
-	
+
     public JsonParseException() {
-	// TODO Auto-generated constructor stub
+        // TODO Auto-generated constructor stub
     }
- 
+
     public JsonParseException(String message) {
-	super(message);
-	// TODO Auto-generated constructor stub
+        super(message);
+        // TODO Auto-generated constructor stub
     }
- 
+
     public JsonParseException(Throwable cause) {
-	super(cause);
-	// TODO Auto-generated constructor stub
+        super(cause);
+        // TODO Auto-generated constructor stub
     }
- 
+
     public JsonParseException(String message, Throwable cause) {
-	super(message, cause);
-	// TODO Auto-generated constructor stub
+        super(message, cause);
+        // TODO Auto-generated constructor stub
     }
 
 }
diff --git a/src/main/java/com/labsynch/labseer/exceptions/LotNotFoundException.java b/src/main/java/com/labsynch/labseer/exceptions/LotNotFoundException.java
index 3a091f711..190d5f017 100644
--- a/src/main/java/com/labsynch/labseer/exceptions/LotNotFoundException.java
+++ b/src/main/java/com/labsynch/labseer/exceptions/LotNotFoundException.java
@@ -1,24 +1,24 @@
 package com.labsynch.labseer.exceptions;
 
 public class LotNotFoundException extends Exception {
-	
+
     public LotNotFoundException() {
-	// TODO Auto-generated constructor stub
+        // TODO Auto-generated constructor stub
     }
- 
+
     public LotNotFoundException(String message) {
-	super(message);
-	// TODO Auto-generated constructor stub
+        super(message);
+        // TODO Auto-generated constructor stub
     }
- 
+
     public LotNotFoundException(Throwable cause) {
-	super(cause);
-	// TODO Auto-generated constructor stub
+        super(cause);
+        // TODO Auto-generated constructor stub
     }
- 
+
     public LotNotFoundException(String message, Throwable cause) {
-	super(message, cause);
-	// TODO Auto-generated constructor stub
+        super(message, cause);
+        // TODO Auto-generated constructor stub
     }
 
 }
diff --git a/src/main/java/com/labsynch/labseer/exceptions/LsThingValidationErrorMessage.java b/src/main/java/com/labsynch/labseer/exceptions/LsThingValidationErrorMessage.java
index 407a49fae..53fca40ee 100644
--- a/src/main/java/com/labsynch/labseer/exceptions/LsThingValidationErrorMessage.java
+++ b/src/main/java/com/labsynch/labseer/exceptions/LsThingValidationErrorMessage.java
@@ -11,99 +11,97 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class LsThingValidationErrorMessage {
 
     @Size(max = 50)
     private String errorLevel;
-    
+
     @Size(max = 255)
     private String message;
-    
+
     @Size(max = 50)
     private String matchingThingCodeName;
-    
+
     @Size(max = 50)
-	private String matchingThingCorpName;
-    
-    public LsThingValidationErrorMessage(UniqueInteractionsException e){
-    	this.setErrorLevel("error");
+    private String matchingThingCorpName;
+
+    public LsThingValidationErrorMessage(UniqueInteractionsException e) {
+        this.setErrorLevel("error");
         this.setMessage(e.getMessage());
         this.setMatchingThingCodeName(e.getMatchingThingCodeName());
         this.setMatchingThingCorpName(e.getMatchingThingCorpName());
     }
-    
-    public LsThingValidationErrorMessage(UniqueNameException e){
-    	this.setErrorLevel("error");
+
+    public LsThingValidationErrorMessage(UniqueNameException e) {
+        this.setErrorLevel("error");
         this.setMessage(e.getMessage());
         this.setMatchingThingCodeName(e.getMatchingThingCodeName());
         this.setMatchingThingCorpName(e.getMatchingThingCorpName());
     }
-    
 
-	public String getErrorLevel() {
+    public String getErrorLevel() {
         return this.errorLevel;
     }
 
-	public void setErrorLevel(String errorLevel) {
+    public void setErrorLevel(String errorLevel) {
         this.errorLevel = errorLevel;
     }
 
-	public String getMessage() {
+    public String getMessage() {
         return this.message;
     }
 
-	public void setMessage(String message) {
+    public void setMessage(String message) {
         this.message = message;
     }
 
-	public String getMatchingThingCodeName() {
+    public String getMatchingThingCodeName() {
         return this.matchingThingCodeName;
     }
 
-	public void setMatchingThingCodeName(String matchingThingCodeName) {
+    public void setMatchingThingCodeName(String matchingThingCodeName) {
         this.matchingThingCodeName = matchingThingCodeName;
     }
 
-	public String getMatchingThingCorpName() {
+    public String getMatchingThingCorpName() {
         return this.matchingThingCorpName;
     }
 
-	public void setMatchingThingCorpName(String matchingThingCorpName) {
+    public void setMatchingThingCorpName(String matchingThingCorpName) {
         this.matchingThingCorpName = matchingThingCorpName;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static LsThingValidationErrorMessage fromJsonToLsThingValidationErrorMessage(String json) {
+    public static LsThingValidationErrorMessage fromJsonToLsThingValidationErrorMessage(String json) {
         return new JSONDeserializer<LsThingValidationErrorMessage>()
-        .use(null, LsThingValidationErrorMessage.class).deserialize(json);
+                .use(null, LsThingValidationErrorMessage.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<LsThingValidationErrorMessage> collection) {
+    public static String toJsonArray(Collection<LsThingValidationErrorMessage> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<LsThingValidationErrorMessage> collection, String[] fields) {
+    public static String toJsonArray(Collection<LsThingValidationErrorMessage> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<LsThingValidationErrorMessage> fromJsonArrayToLsThingValidationErrorMessages(String json) {
+    public static Collection<LsThingValidationErrorMessage> fromJsonArrayToLsThingValidationErrorMessages(String json) {
         return new JSONDeserializer<List<LsThingValidationErrorMessage>>()
-        .use("values", LsThingValidationErrorMessage.class).deserialize(json);
+                .use("values", LsThingValidationErrorMessage.class).deserialize(json);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/exceptions/MissingPropertyException.java b/src/main/java/com/labsynch/labseer/exceptions/MissingPropertyException.java
index ae480b4e1..c8a95ef6f 100644
--- a/src/main/java/com/labsynch/labseer/exceptions/MissingPropertyException.java
+++ b/src/main/java/com/labsynch/labseer/exceptions/MissingPropertyException.java
@@ -1,24 +1,24 @@
 package com.labsynch.labseer.exceptions;
 
 public class MissingPropertyException extends Exception {
-	
+
 	public MissingPropertyException() {
 		// TODO Auto-generated constructor stub
-	    }
-	 
-	    public MissingPropertyException(String message) {
+	}
+
+	public MissingPropertyException(String message) {
 		super(message);
 		// TODO Auto-generated constructor stub
-	    }
-	 
-	    public MissingPropertyException(Throwable cause) {
+	}
+
+	public MissingPropertyException(Throwable cause) {
 		super(cause);
 		// TODO Auto-generated constructor stub
-	    }
-	 
-	    public MissingPropertyException(String message, Throwable cause) {
+	}
+
+	public MissingPropertyException(String message, Throwable cause) {
 		super(message, cause);
 		// TODO Auto-generated constructor stub
-	    }
+	}
 
 }
diff --git a/src/main/java/com/labsynch/labseer/exceptions/NotFoundException.java b/src/main/java/com/labsynch/labseer/exceptions/NotFoundException.java
index 11b250dfc..fa925c347 100644
--- a/src/main/java/com/labsynch/labseer/exceptions/NotFoundException.java
+++ b/src/main/java/com/labsynch/labseer/exceptions/NotFoundException.java
@@ -2,21 +2,20 @@
 
 @SuppressWarnings("serial")
 public class NotFoundException extends Exception {
-	
-	public NotFoundException() {
+
+    public NotFoundException() {
     }
- 
+
     public NotFoundException(String message) {
-	super(message);
+        super(message);
     }
- 
+
     public NotFoundException(Throwable cause) {
-	super(cause);
+        super(cause);
     }
- 
+
     public NotFoundException(String message, Throwable cause) {
-	super(message, cause);
+        super(message, cause);
     }
 
-
 }
diff --git a/src/main/java/com/labsynch/labseer/exceptions/ParentNotFoundException.java b/src/main/java/com/labsynch/labseer/exceptions/ParentNotFoundException.java
index c04419784..832a0233d 100644
--- a/src/main/java/com/labsynch/labseer/exceptions/ParentNotFoundException.java
+++ b/src/main/java/com/labsynch/labseer/exceptions/ParentNotFoundException.java
@@ -1,24 +1,24 @@
 package com.labsynch.labseer.exceptions;
 
 public class ParentNotFoundException extends Exception {
-	
+
     public ParentNotFoundException() {
-	// TODO Auto-generated constructor stub
+        // TODO Auto-generated constructor stub
     }
- 
+
     public ParentNotFoundException(String message) {
-	super(message);
-	// TODO Auto-generated constructor stub
+        super(message);
+        // TODO Auto-generated constructor stub
     }
- 
+
     public ParentNotFoundException(Throwable cause) {
-	super(cause);
-	// TODO Auto-generated constructor stub
+        super(cause);
+        // TODO Auto-generated constructor stub
     }
- 
+
     public ParentNotFoundException(String message, Throwable cause) {
-	super(message, cause);
-	// TODO Auto-generated constructor stub
+        super(message, cause);
+        // TODO Auto-generated constructor stub
     }
 
 }
diff --git a/src/main/java/com/labsynch/labseer/exceptions/SaltFormMolFormatException.java b/src/main/java/com/labsynch/labseer/exceptions/SaltFormMolFormatException.java
index 5f25046ff..3f067ed6f 100755
--- a/src/main/java/com/labsynch/labseer/exceptions/SaltFormMolFormatException.java
+++ b/src/main/java/com/labsynch/labseer/exceptions/SaltFormMolFormatException.java
@@ -1,24 +1,24 @@
 package com.labsynch.labseer.exceptions;
 
 public class SaltFormMolFormatException extends Exception {
-	
+
     public SaltFormMolFormatException() {
-	// TODO Auto-generated constructor stub
+        // TODO Auto-generated constructor stub
     }
- 
+
     public SaltFormMolFormatException(String message) {
-	super(message);
-	// TODO Auto-generated constructor stub
+        super(message);
+        // TODO Auto-generated constructor stub
     }
- 
+
     public SaltFormMolFormatException(Throwable cause) {
-	super(cause);
-	// TODO Auto-generated constructor stub
+        super(cause);
+        // TODO Auto-generated constructor stub
     }
- 
+
     public SaltFormMolFormatException(String message, Throwable cause) {
-	super(message, cause);
-	// TODO Auto-generated constructor stub
+        super(message, cause);
+        // TODO Auto-generated constructor stub
     }
 
 }
diff --git a/src/main/java/com/labsynch/labseer/exceptions/SaltFormNotFoundException.java b/src/main/java/com/labsynch/labseer/exceptions/SaltFormNotFoundException.java
index cce8a60bc..1fbc8bd64 100644
--- a/src/main/java/com/labsynch/labseer/exceptions/SaltFormNotFoundException.java
+++ b/src/main/java/com/labsynch/labseer/exceptions/SaltFormNotFoundException.java
@@ -1,24 +1,24 @@
 package com.labsynch.labseer.exceptions;
 
 public class SaltFormNotFoundException extends Exception {
-	
+
     public SaltFormNotFoundException() {
-	// TODO Auto-generated constructor stub
+        // TODO Auto-generated constructor stub
     }
- 
+
     public SaltFormNotFoundException(String message) {
-	super(message);
-	// TODO Auto-generated constructor stub
+        super(message);
+        // TODO Auto-generated constructor stub
     }
- 
+
     public SaltFormNotFoundException(Throwable cause) {
-	super(cause);
-	// TODO Auto-generated constructor stub
+        super(cause);
+        // TODO Auto-generated constructor stub
     }
- 
+
     public SaltFormNotFoundException(String message, Throwable cause) {
-	super(message, cause);
-	// TODO Auto-generated constructor stub
+        super(message, cause);
+        // TODO Auto-generated constructor stub
     }
 
 }
diff --git a/src/main/java/com/labsynch/labseer/exceptions/SaltedCompoundException.java b/src/main/java/com/labsynch/labseer/exceptions/SaltedCompoundException.java
index e6e6987f1..cb9e960f9 100755
--- a/src/main/java/com/labsynch/labseer/exceptions/SaltedCompoundException.java
+++ b/src/main/java/com/labsynch/labseer/exceptions/SaltedCompoundException.java
@@ -1,24 +1,24 @@
 package com.labsynch.labseer.exceptions;
 
 public class SaltedCompoundException extends Exception {
-	
+
     public SaltedCompoundException() {
-	// TODO Auto-generated constructor stub
+        // TODO Auto-generated constructor stub
     }
- 
+
     public SaltedCompoundException(String message) {
-	super(message);
-	// TODO Auto-generated constructor stub
+        super(message);
+        // TODO Auto-generated constructor stub
     }
- 
+
     public SaltedCompoundException(Throwable cause) {
-	super(cause);
-	// TODO Auto-generated constructor stub
+        super(cause);
+        // TODO Auto-generated constructor stub
     }
- 
+
     public SaltedCompoundException(String message, Throwable cause) {
-	super(message, cause);
-	// TODO Auto-generated constructor stub
+        super(message, cause);
+        // TODO Auto-generated constructor stub
     }
 
 }
diff --git a/src/main/java/com/labsynch/labseer/exceptions/StandardizerException.java b/src/main/java/com/labsynch/labseer/exceptions/StandardizerException.java
index 2c499edf2..2a19c7544 100644
--- a/src/main/java/com/labsynch/labseer/exceptions/StandardizerException.java
+++ b/src/main/java/com/labsynch/labseer/exceptions/StandardizerException.java
@@ -2,24 +2,23 @@
 
 public class StandardizerException extends Exception {
 
-
     public StandardizerException() {
-	// TODO Auto-generated constructor stub
+        // TODO Auto-generated constructor stub
     }
 
     public StandardizerException(String message) {
-	super(message);
-	// TODO Auto-generated constructor stub
+        super(message);
+        // TODO Auto-generated constructor stub
     }
 
     public StandardizerException(Throwable cause) {
-	super(cause);
-	// TODO Auto-generated constructor stub
+        super(cause);
+        // TODO Auto-generated constructor stub
     }
 
     public StandardizerException(String message, Throwable cause) {
-	super(message, cause);
-	// TODO Auto-generated constructor stub
+        super(message, cause);
+        // TODO Auto-generated constructor stub
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/exceptions/StructureSaveException.java b/src/main/java/com/labsynch/labseer/exceptions/StructureSaveException.java
index 964d44151..522b5a807 100644
--- a/src/main/java/com/labsynch/labseer/exceptions/StructureSaveException.java
+++ b/src/main/java/com/labsynch/labseer/exceptions/StructureSaveException.java
@@ -10,7 +10,7 @@ public StructureSaveException(Exception e) {
 	public StructureSaveException() {
 		// TODO Auto-generated constructor stub
 	}
-	
+
 	public StructureSaveException(String message) {
 		super(message);
 	}
diff --git a/src/main/java/com/labsynch/labseer/exceptions/TooManyResultsException.java b/src/main/java/com/labsynch/labseer/exceptions/TooManyResultsException.java
index 5ce18c2f5..43c88f600 100644
--- a/src/main/java/com/labsynch/labseer/exceptions/TooManyResultsException.java
+++ b/src/main/java/com/labsynch/labseer/exceptions/TooManyResultsException.java
@@ -2,21 +2,20 @@
 
 @SuppressWarnings("serial")
 public class TooManyResultsException extends Exception {
-	
-	public TooManyResultsException() {
+
+    public TooManyResultsException() {
     }
- 
+
     public TooManyResultsException(String message) {
-	super(message);
+        super(message);
     }
- 
+
     public TooManyResultsException(Throwable cause) {
-	super(cause);
+        super(cause);
     }
- 
+
     public TooManyResultsException(String message, Throwable cause) {
-	super(message, cause);
+        super(message, cause);
     }
 
-
 }
diff --git a/src/main/java/com/labsynch/labseer/exceptions/UniqueInteractionsException.java b/src/main/java/com/labsynch/labseer/exceptions/UniqueInteractionsException.java
index e5d66f815..08345cabf 100644
--- a/src/main/java/com/labsynch/labseer/exceptions/UniqueInteractionsException.java
+++ b/src/main/java/com/labsynch/labseer/exceptions/UniqueInteractionsException.java
@@ -2,38 +2,38 @@
 
 @SuppressWarnings("serial")
 public class UniqueInteractionsException extends Exception {
-	
-	private String matchingThingCodeName;
-	
-	private String matchingThingCorpName;
-	
-	public UniqueInteractionsException() {
+
+    private String matchingThingCodeName;
+
+    private String matchingThingCorpName;
+
+    public UniqueInteractionsException() {
     }
- 
+
     public UniqueInteractionsException(String message) {
-	super(message);
+        super(message);
     }
-    
+
     public UniqueInteractionsException(String message, String matchingThingCodeName, String matchingThingCorpName) {
-    	super(message);
-    	this.matchingThingCodeName = matchingThingCodeName;
-    	this.matchingThingCorpName = matchingThingCorpName;
-        }
- 
+        super(message);
+        this.matchingThingCodeName = matchingThingCodeName;
+        this.matchingThingCorpName = matchingThingCorpName;
+    }
+
     public UniqueInteractionsException(Throwable cause) {
-	super(cause);
+        super(cause);
     }
- 
+
     public UniqueInteractionsException(String message, Throwable cause) {
-	super(message, cause);
+        super(message, cause);
     }
 
-    public String getMatchingThingCodeName(){
-    	return this.matchingThingCodeName;
+    public String getMatchingThingCodeName() {
+        return this.matchingThingCodeName;
     }
-    
-    public String getMatchingThingCorpName(){
-    	return this.matchingThingCorpName;
+
+    public String getMatchingThingCorpName() {
+        return this.matchingThingCorpName;
     }
 
 }
diff --git a/src/main/java/com/labsynch/labseer/exceptions/UniqueNameException.java b/src/main/java/com/labsynch/labseer/exceptions/UniqueNameException.java
index 93b884f96..0af4debb8 100755
--- a/src/main/java/com/labsynch/labseer/exceptions/UniqueNameException.java
+++ b/src/main/java/com/labsynch/labseer/exceptions/UniqueNameException.java
@@ -2,39 +2,38 @@
 
 @SuppressWarnings("serial")
 public class UniqueNameException extends Exception {
-	
-	private String matchingThingCodeName;
-	
-	private String matchingThingCorpName;
-	
-	public UniqueNameException() {
+
+    private String matchingThingCodeName;
+
+    private String matchingThingCorpName;
+
+    public UniqueNameException() {
     }
- 
+
     public UniqueNameException(String message) {
-	super(message);
+        super(message);
     }
-    
+
     public UniqueNameException(String message, String matchingThingCodeName, String matchingThingCorpName) {
-    	super(message);
-    	this.matchingThingCodeName = matchingThingCodeName;
-    	this.matchingThingCorpName = matchingThingCorpName;
-        }
- 
+        super(message);
+        this.matchingThingCodeName = matchingThingCodeName;
+        this.matchingThingCorpName = matchingThingCorpName;
+    }
+
     public UniqueNameException(Throwable cause) {
-	super(cause);
+        super(cause);
     }
- 
+
     public UniqueNameException(String message, Throwable cause) {
-	super(message, cause);
-    }
-    
-    public String getMatchingThingCodeName(){
-    	return this.matchingThingCodeName;
+        super(message, cause);
     }
-    
-    public String getMatchingThingCorpName(){
-    	return this.matchingThingCorpName;
+
+    public String getMatchingThingCodeName() {
+        return this.matchingThingCodeName;
     }
 
+    public String getMatchingThingCorpName() {
+        return this.matchingThingCorpName;
+    }
 
 }
diff --git a/src/main/java/com/labsynch/labseer/exceptions/UniqueNotebookException.java b/src/main/java/com/labsynch/labseer/exceptions/UniqueNotebookException.java
index 6441b0351..ace21e125 100755
--- a/src/main/java/com/labsynch/labseer/exceptions/UniqueNotebookException.java
+++ b/src/main/java/com/labsynch/labseer/exceptions/UniqueNotebookException.java
@@ -2,24 +2,23 @@
 
 public class UniqueNotebookException extends Exception {
 
-	
     public UniqueNotebookException() {
-	// TODO Auto-generated constructor stub
+        // TODO Auto-generated constructor stub
     }
- 
+
     public UniqueNotebookException(String message) {
-	super(message);
-	// TODO Auto-generated constructor stub
+        super(message);
+        // TODO Auto-generated constructor stub
     }
- 
+
     public UniqueNotebookException(Throwable cause) {
-	super(cause);
-	// TODO Auto-generated constructor stub
+        super(cause);
+        // TODO Auto-generated constructor stub
     }
- 
+
     public UniqueNotebookException(String message, Throwable cause) {
-	super(message, cause);
-	// TODO Auto-generated constructor stub
+        super(message, cause);
+        // TODO Auto-generated constructor stub
     }
 
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ACASAuthenticationProvider.java b/src/main/java/com/labsynch/labseer/service/ACASAuthenticationProvider.java
index 641d6b170..603a769bd 100755
--- a/src/main/java/com/labsynch/labseer/service/ACASAuthenticationProvider.java
+++ b/src/main/java/com/labsynch/labseer/service/ACASAuthenticationProvider.java
@@ -39,15 +39,13 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
-
-
 /**
  * 
  */
 @SuppressWarnings("deprecation")
 @Service("acasAuthenticationProvider")
 public class ACASAuthenticationProvider extends
-AbstractUserDetailsAuthenticationProvider {
+		AbstractUserDetailsAuthenticationProvider {
 
 	private static final Logger logger = LoggerFactory.getLogger(ACASAuthenticationProvider.class);
 
@@ -55,7 +53,6 @@ public class ACASAuthenticationProvider extends
 
 	private String adminPassword;
 
-
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
 
@@ -70,7 +67,6 @@ public void setAdminPassword(String adminPassword) {
 		this.adminPassword = adminPassword;
 	}
 
-
 	/*
 	 * (non-Javadoc)
 	 * 
@@ -85,7 +81,7 @@ public void setAdminPassword(String adminPassword) {
 	@Transactional
 	protected void additionalAuthenticationChecks(UserDetails arg0,
 			UsernamePasswordAuthenticationToken arg1)
-					throws AuthenticationException {
+			throws AuthenticationException {
 		return;
 
 	}
@@ -103,22 +99,20 @@ protected void additionalAuthenticationChecks(UserDetails arg0,
 	@Transactional
 	protected UserDetails retrieveUser(String username,
 			UsernamePasswordAuthenticationToken authentication)
-					throws AuthenticationException {
-		logger.debug( "Inside retrieveUser");
+			throws AuthenticationException {
+		logger.debug("Inside retrieveUser");
 		logger.debug("here is the current auth strategy: " + propertiesUtilService.getAuthStrategy());
 		logger.debug("here is the current username: " + username);
 
-
-
 		String password = (String) authentication.getCredentials();
-		if (! StringUtils.hasText(password)) {
+		if (!StringUtils.hasText(password)) {
 			throw new BadCredentialsException("Please enter password");
 		}
 
 		messageDigestPasswordEncoder.setEncodeHashAsBase64(true);
 		String encryptedPassword = null;
 		try {
-			if (propertiesUtilService.getAuthStrategy().equalsIgnoreCase("properties")){
+			if (propertiesUtilService.getAuthStrategy().equalsIgnoreCase("properties")) {
 				encryptedPassword = getBase64ShaHash(password);
 			} else {
 				encryptedPassword = getBase64ShaHash(password);
@@ -129,22 +123,22 @@ protected UserDetails retrieveUser(String username,
 		} catch (UnsupportedEncodingException e1) {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
-		} 
+		}
 
 		UserDetails user = null;
 		String expectedPassword = null;
 		Boolean enabled = true;
 		List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
-		
-		if (adminUser == null){
+
+		if (adminUser == null) {
 			logger.info("the default adminUser is null");
 		}
-		
+
 		if (adminUser != null && adminUser.equals(username)) {
 			// pseudo-user admin (ie not configured via Person)
-			expectedPassword = adminPassword; 
+			expectedPassword = adminPassword;
 			// authenticate admin
-			if (! encryptedPassword.equals(expectedPassword)) {
+			if (!encryptedPassword.equals(expectedPassword)) {
 				throw new BadCredentialsException("Invalid password");
 			}
 			// authorize admin
@@ -154,13 +148,13 @@ protected UserDetails retrieveUser(String username,
 
 			try {
 
-				if (propertiesUtilService.getAuthStrategy().equalsIgnoreCase("properties")){
+				if (propertiesUtilService.getAuthStrategy().equalsIgnoreCase("properties")) {
 					expectedPassword = getPropertiesPassword(username);
 
-				}	else {
+				} else {
 
-					TypedQuery<Author> query= Author.findAuthorsByUserName(username);
-					if (query.getResultList().size() == 0){
+					TypedQuery<Author> query = Author.findAuthorsByUserName(username);
+					if (query.getResultList().size() == 0) {
 						query = Author.findAuthorsByEmailAddress(username);
 					}
 
@@ -168,9 +162,9 @@ protected UserDetails retrieveUser(String username,
 
 					expectedPassword = targetUser.getPassword();
 
-					TypedQuery<AuthorRole> roleQuery=AuthorRole.findAuthorRolesByUserEntry(targetUser);
+					TypedQuery<AuthorRole> roleQuery = AuthorRole.findAuthorRolesByUserEntry(targetUser);
 					List<AuthorRole> userRoles = roleQuery.getResultList();
-					for(AuthorRole userRole:userRoles){
+					for (AuthorRole userRole : userRoles) {
 						authorities.add(new SimpleGrantedAuthority(userRole.getRoleEntry().getRoleName()));
 					}
 					enabled = targetUser.getEnabled();
@@ -181,11 +175,11 @@ protected UserDetails retrieveUser(String username,
 				}
 				// authenticate the person
 
-				if (! StringUtils.hasText(expectedPassword)) {
-					throw new BadCredentialsException("No password for " + username + 
+				if (!StringUtils.hasText(expectedPassword)) {
+					throw new BadCredentialsException("No password for " + username +
 							" set in database, contact administrator");
 				}
-				if (! encryptedPassword.equals(expectedPassword)) {
+				if (!encryptedPassword.equals(expectedPassword)) {
 					throw new BadCredentialsException("Invalid Password");
 				}
 
@@ -206,19 +200,19 @@ protected UserDetails retrieveUser(String username,
 				e.printStackTrace();
 			}
 		}
-		
+
 		return new org.springframework.security.core.userdetails.User(
 				username,
 				password,
-				enabled, // enabled 
+				enabled, // enabled
 				true, // account not expired
-				true, // credentials not expired 
+				true, // credentials not expired
 				true, // account not locked
-				authorities
-				);
+				authorities);
 	}
 
-	public static String getBase64ShaHash(final String str) throws NoSuchAlgorithmException, UnsupportedEncodingException {
+	public static String getBase64ShaHash(final String str)
+			throws NoSuchAlgorithmException, UnsupportedEncodingException {
 		final MessageDigest md = MessageDigest.getInstance("SHA");
 		md.update(str.getBytes("UTF-8"));
 		final byte[] bites = md.digest();
@@ -226,10 +220,11 @@ public static String getBase64ShaHash(final String str) throws NoSuchAlgorithmEx
 		final Base64 base64 = new Base64();
 		final String encoded = base64.encodeAsString(bites);
 		logger.debug("new encoded password: " + encoded);
-		return encoded; 
+		return encoded;
 	}
 
-	public static String getBase64Sha256Hash(final String str) throws NoSuchAlgorithmException, UnsupportedEncodingException {
+	public static String getBase64Sha256Hash(final String str)
+			throws NoSuchAlgorithmException, UnsupportedEncodingException {
 		final MessageDigest md = MessageDigest.getInstance("SHA-256");
 		md.update(str.getBytes("UTF-8"));
 		final byte[] bites = md.digest();
@@ -237,7 +232,7 @@ public static String getBase64Sha256Hash(final String str) throws NoSuchAlgorith
 		final Base64 base64 = new Base64();
 		final String encoded = base64.encodeAsString(bites);
 		logger.debug("new encoded password: " + encoded);
-		return encoded; 
+		return encoded;
 	}
 
 	public String getPropertiesPassword(String userName) throws IOException, NoSuchAlgorithmException {
@@ -245,21 +240,21 @@ public String getPropertiesPassword(String userName) throws IOException, NoSuchA
 		String password = null;
 
 		Properties properties = new Properties();
-		FileInputStream propertyStream = new FileInputStream(propertiesUtilService.getSecurityProperties()); 
+		FileInputStream propertyStream = new FileInputStream(propertiesUtilService.getSecurityProperties());
 		properties.load(propertyStream);
 		propertyStream.close();
 
 		String encryptedPassword = null;
 		String passwordString = properties.getProperty(userName);
-		if (passwordString != null && passwordString.length() > 0){
+		if (passwordString != null && passwordString.length() > 0) {
 			List<String> passwordList = new ArrayList<String>();
 			String[] parsedEntry = passwordString.split("\\{SHA\\}|,");
-			for (String word : parsedEntry){
+			for (String word : parsedEntry) {
 				logger.debug("parsed word: " + word);
 				passwordList.add(word);
 			}
 
-			if (passwordString.contains("{SHA}")){
+			if (passwordString.contains("{SHA}")) {
 				logger.debug("the entry starts with {SHA}");
 				logger.debug("here is the encrypted password: " + passwordList.get(1));
 				encryptedPassword = passwordList.get(1);
@@ -274,5 +269,5 @@ public String getPropertiesPassword(String userName) throws IOException, NoSuchA
 
 		return encryptedPassword;
 	}
-	
+
 }
diff --git a/src/main/java/com/labsynch/labseer/service/AnalysisGroupServiceImpl.java b/src/main/java/com/labsynch/labseer/service/AnalysisGroupServiceImpl.java
index 4e399d9d7..cb1ce664e 100755
--- a/src/main/java/com/labsynch/labseer/service/AnalysisGroupServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/AnalysisGroupServiceImpl.java
@@ -1,6 +1,5 @@
 package com.labsynch.labseer.service;
 
-
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -56,12 +55,13 @@ public class AnalysisGroupServiceImpl implements AnalysisGroupService {
 
 	@Override
 	@Transactional
-	public TsvLoaderResponseDTO saveLsAnalysisGroupFromCsv(String analysisGroupFilePath, String treatmentGroupFilePath, String subjectFilePath) throws IOException{
+	public TsvLoaderResponseDTO saveLsAnalysisGroupFromCsv(String analysisGroupFilePath, String treatmentGroupFilePath,
+			String subjectFilePath) throws IOException {
 		TsvLoaderResponseDTO results = new TsvLoaderResponseDTO();
 		HashMap<String, TempThingDTO> output2 = null;
 		try {
 			long time1 = new Date().getTime();
-			HashMap<String, TempThingDTO> output = createAnalysisGroupsFromCSV(analysisGroupFilePath );
+			HashMap<String, TempThingDTO> output = createAnalysisGroupsFromCSV(analysisGroupFilePath);
 			results.setAnalysisGroups(output.values());
 			long time2 = new Date().getTime();
 			if (treatmentGroupFilePath != null && !treatmentGroupFilePath.equalsIgnoreCase("")) {
@@ -69,7 +69,7 @@ public TsvLoaderResponseDTO saveLsAnalysisGroupFromCsv(String analysisGroupFileP
 				results.setTreatmentGroups(output2.values());
 			}
 			long time3 = new Date().getTime();
-			if (output2 != null && subjectFilePath != null && !subjectFilePath.equalsIgnoreCase("")){
+			if (output2 != null && subjectFilePath != null && !subjectFilePath.equalsIgnoreCase("")) {
 				HashMap<String, TempThingDTO> output3 = subjectService.createSubjectsFromCSV(subjectFilePath, output2);
 				results.setSubjects(output3.values());
 			}
@@ -93,420 +93,451 @@ public TsvLoaderResponseDTO saveLsAnalysisGroupFromCsv(String analysisGroupFileP
 
 	@Transactional
 	@Override
-	public AnalysisGroup saveLsAnalysisGroup(AnalysisGroup analysisGroup) throws NotFoundException{
+	public AnalysisGroup saveLsAnalysisGroup(AnalysisGroup analysisGroup) throws NotFoundException {
 
-		//		logger.debug("incoming meta analysisGroup: " + analysisGroup.toJson());
+		// logger.debug("incoming meta analysisGroup: " + analysisGroup.toJson());
 		Date recordedDate = new Date();
 
 		AnalysisGroup newAnalysisGroup = null;
-		if (analysisGroup.getId() == null){
+		if (analysisGroup.getId() == null) {
 			newAnalysisGroup = new AnalysisGroup(analysisGroup);
-			if (newAnalysisGroup.getCodeName() == null) { newAnalysisGroup.setCodeName(autoLabelService.getAnalysisGroupCodeName());}
-			if (newAnalysisGroup.getRecordedDate() == null) { newAnalysisGroup.setRecordedDate(recordedDate);}
-			if (newAnalysisGroup.getRecordedBy() == null) { 
-				for (Experiment experiment : analysisGroup.getExperiments()){
-					newAnalysisGroup.setRecordedBy(experiment.getRecordedBy()); 
+			if (newAnalysisGroup.getCodeName() == null) {
+				newAnalysisGroup.setCodeName(autoLabelService.getAnalysisGroupCodeName());
+			}
+			if (newAnalysisGroup.getRecordedDate() == null) {
+				newAnalysisGroup.setRecordedDate(recordedDate);
+			}
+			if (newAnalysisGroup.getRecordedBy() == null) {
+				for (Experiment experiment : analysisGroup.getExperiments()) {
+					newAnalysisGroup.setRecordedBy(experiment.getRecordedBy());
 				}
 			}
 			newAnalysisGroup.persist();
 			this.saveLabels(analysisGroup, newAnalysisGroup, recordedDate);
 			this.saveStates(analysisGroup, newAnalysisGroup, recordedDate);
-			treatmentGroupService.saveLsTreatmentGroups( newAnalysisGroup,  analysisGroup.getTreatmentGroups(), recordedDate);
+			treatmentGroupService.saveLsTreatmentGroups(newAnalysisGroup, analysisGroup.getTreatmentGroups(),
+					recordedDate);
 
 		} else {
-//			logger.debug("Attempting to update an existing AG: " + analysisGroup.getId());
+			// logger.debug("Attempting to update an existing AG: " +
+			// analysisGroup.getId());
 			newAnalysisGroup = AnalysisGroup.update(analysisGroup);
-			if (newAnalysisGroup != null){
+			if (newAnalysisGroup != null) {
 				try {
-					newAnalysisGroup.merge();					
-				}  catch (Exception e){
+					newAnalysisGroup.merge();
+				} catch (Exception e) {
 					logger.error("--------------------- !!!!!!!!!!!!! hit the first lock " + e.toString());
 					try {
 						TimeUnit.SECONDS.sleep(5);
 						newAnalysisGroup = AnalysisGroup.update(analysisGroup);
 						newAnalysisGroup.merge();
-					} catch (Exception e2){
+					} catch (Exception e2) {
 						logger.error("--------------------- !!!!!!!!!!!!! hit the second lock " + e.toString());
 						try {
 							TimeUnit.SECONDS.sleep(8);
 							newAnalysisGroup = AnalysisGroup.update(analysisGroup);
 							newAnalysisGroup.merge();
-						} catch (Exception e3){
+						} catch (Exception e3) {
 							throw new RuntimeException(e2);
 						}
 					}
 				}
 			} else {
-					logger.info("analysis group not found");
-					throw new NotFoundException("AnalysisGroup not found: " + analysisGroup.getId());
-				}			
+				logger.info("analysis group not found");
+				throw new NotFoundException("AnalysisGroup not found: " + analysisGroup.getId());
 			}
+		}
 
-			return newAnalysisGroup;
+		return newAnalysisGroup;
 
-		}
+	}
 
-		private void saveStates(AnalysisGroup analysisGroup, AnalysisGroup newAnalysisGroup, Date recordedDate) {
-			if (analysisGroup.getLsStates() != null){
-				int i = 0;
-				for(AnalysisGroupState analysisGroupState : analysisGroup.getLsStates()){
-					AnalysisGroupState newAnalysisGroupState = new AnalysisGroupState(analysisGroupState);
-					newAnalysisGroupState.setAnalysisGroup(newAnalysisGroup);
-					if (newAnalysisGroupState.getRecordedDate() == null) {newAnalysisGroupState.setRecordedDate(recordedDate);}		
-					if (newAnalysisGroupState.getRecordedBy() == null) { newAnalysisGroupState.setRecordedBy(newAnalysisGroupState.getAnalysisGroup().getRecordedBy()); }
-					logger.debug("here is the ag state: " + newAnalysisGroupState.toJson());
-					newAnalysisGroupState.persist();
-					logger.debug("persisted the newAnalysisGroupState: " + newAnalysisGroupState.toJson());
-					if (analysisGroupState.getLsValues() != null){
-						for(AnalysisGroupValue analysisGroupValue : analysisGroupState.getLsValues()){
-							if (analysisGroupValue.getRecordedDate() == null) {analysisGroupValue.setRecordedDate(recordedDate);}
-							analysisGroupValue.setLsState(newAnalysisGroupState);
-							analysisGroupValue.persist();
-							logger.debug("persisted the analysisGroupValue: " + analysisGroupValue.toJson());
-						}				
-					}
-					if ( i % propertiesUtilService.getBatchSize() == 0 ) { //50, same as the JDBC batch size
-						newAnalysisGroupState.flush();
-						newAnalysisGroupState.clear();
+	private void saveStates(AnalysisGroup analysisGroup, AnalysisGroup newAnalysisGroup, Date recordedDate) {
+		if (analysisGroup.getLsStates() != null) {
+			int i = 0;
+			for (AnalysisGroupState analysisGroupState : analysisGroup.getLsStates()) {
+				AnalysisGroupState newAnalysisGroupState = new AnalysisGroupState(analysisGroupState);
+				newAnalysisGroupState.setAnalysisGroup(newAnalysisGroup);
+				if (newAnalysisGroupState.getRecordedDate() == null) {
+					newAnalysisGroupState.setRecordedDate(recordedDate);
+				}
+				if (newAnalysisGroupState.getRecordedBy() == null) {
+					newAnalysisGroupState.setRecordedBy(newAnalysisGroupState.getAnalysisGroup().getRecordedBy());
+				}
+				logger.debug("here is the ag state: " + newAnalysisGroupState.toJson());
+				newAnalysisGroupState.persist();
+				logger.debug("persisted the newAnalysisGroupState: " + newAnalysisGroupState.toJson());
+				if (analysisGroupState.getLsValues() != null) {
+					for (AnalysisGroupValue analysisGroupValue : analysisGroupState.getLsValues()) {
+						if (analysisGroupValue.getRecordedDate() == null) {
+							analysisGroupValue.setRecordedDate(recordedDate);
+						}
+						analysisGroupValue.setLsState(newAnalysisGroupState);
+						analysisGroupValue.persist();
+						logger.debug("persisted the analysisGroupValue: " + analysisGroupValue.toJson());
 					}
-					i++;
-				}		
-			}		
+				}
+				if (i % propertiesUtilService.getBatchSize() == 0) { // 50, same as the JDBC batch size
+					newAnalysisGroupState.flush();
+					newAnalysisGroupState.clear();
+				}
+				i++;
+			}
 		}
+	}
 
-		private void saveLabels(AnalysisGroup analysisGroup, AnalysisGroup newAnalysisGroup, Date recordedDate) {
-			if (analysisGroup.getLsLabels() != null) {
-				int i = 0;
-				for(AnalysisGroupLabel analysisGroupLabel : analysisGroup.getLsLabels()){
-					AnalysisGroupLabel newAnalysisGroupLabel = new AnalysisGroupLabel(analysisGroupLabel);
-					newAnalysisGroupLabel.setAnalysisGroup(newAnalysisGroup);
-					newAnalysisGroupLabel.persist();
-					if ( i % propertiesUtilService.getBatchSize() == 0 ) { // same as the JDBC batch size
-						newAnalysisGroupLabel.flush();
-						newAnalysisGroupLabel.clear();
-					}
-					i++;
-				}			
-			} 		
+	private void saveLabels(AnalysisGroup analysisGroup, AnalysisGroup newAnalysisGroup, Date recordedDate) {
+		if (analysisGroup.getLsLabels() != null) {
+			int i = 0;
+			for (AnalysisGroupLabel analysisGroupLabel : analysisGroup.getLsLabels()) {
+				AnalysisGroupLabel newAnalysisGroupLabel = new AnalysisGroupLabel(analysisGroupLabel);
+				newAnalysisGroupLabel.setAnalysisGroup(newAnalysisGroup);
+				newAnalysisGroupLabel.persist();
+				if (i % propertiesUtilService.getBatchSize() == 0) { // same as the JDBC batch size
+					newAnalysisGroupLabel.flush();
+					newAnalysisGroupLabel.clear();
+				}
+				i++;
+			}
 		}
+	}
 
+	@Override
+	@Transactional
+	public AnalysisGroup updateLsAnalysisGroup(AnalysisGroup analysisGroup) {
 
-		@Override
-		@Transactional
-		public AnalysisGroup updateLsAnalysisGroup(AnalysisGroup analysisGroup){
-
-//		logger.debug("incoming meta analysisGroup to update: " + analysisGroup.toJson());
+		// logger.debug("incoming meta analysisGroup to update: " +
+		// analysisGroup.toJson());
 		AnalysisGroup updatedAnalysisGroup = AnalysisGroup.update(analysisGroup);
 
 		if (analysisGroup.getLsLabels() != null) {
-			for(AnalysisGroupLabel analysisGroupLabel : analysisGroup.getLsLabels()){
-				if (analysisGroupLabel.getId() == null){
+			for (AnalysisGroupLabel analysisGroupLabel : analysisGroup.getLsLabels()) {
+				if (analysisGroupLabel.getId() == null) {
 					AnalysisGroupLabel newAnalysisGroupLabel = new AnalysisGroupLabel(analysisGroupLabel);
 					newAnalysisGroupLabel.setAnalysisGroup(updatedAnalysisGroup);
 					newAnalysisGroupLabel.persist();
 				} else {
 					AnalysisGroupLabel updatedAnalysisGroupLabel = AnalysisGroupLabel.update(analysisGroupLabel);
 				}
-			}			
-		} 
-		
-		
-		if (analysisGroup.getLsStates() != null){
-			for(AnalysisGroupState analysisGroupState : analysisGroup.getLsStates()){
+			}
+		}
+
+		if (analysisGroup.getLsStates() != null) {
+			for (AnalysisGroupState analysisGroupState : analysisGroup.getLsStates()) {
 				AnalysisGroupState updatedAnalysisGroupState;
-				if (analysisGroupState.getId() == null){
+				if (analysisGroupState.getId() == null) {
 					AnalysisGroupState newAnalysisGroupState = new AnalysisGroupState(analysisGroupState);
 					newAnalysisGroupState.setAnalysisGroup(updatedAnalysisGroup);
-					if (newAnalysisGroupState.getRecordedDate() == null) {newAnalysisGroupState.setRecordedDate(new Date());}		
-					if (newAnalysisGroupState.getRecordedBy() == null) { newAnalysisGroupState.setRecordedBy(updatedAnalysisGroup.getRecordedBy()); }
+					if (newAnalysisGroupState.getRecordedDate() == null) {
+						newAnalysisGroupState.setRecordedDate(new Date());
+					}
+					if (newAnalysisGroupState.getRecordedBy() == null) {
+						newAnalysisGroupState.setRecordedBy(updatedAnalysisGroup.getRecordedBy());
+					}
 					newAnalysisGroupState.persist();
 					updatedAnalysisGroupState = newAnalysisGroupState;
-//					logger.debug("persisted the newAnalysisGroupState: " + newAnalysisGroupState.toJson());					
+					// logger.debug("persisted the newAnalysisGroupState: " +
+					// newAnalysisGroupState.toJson());
 				} else {
 					updatedAnalysisGroupState = AnalysisGroupState.update(analysisGroupState);
 				}
-				if (analysisGroupState.getLsValues() != null){
-					for(AnalysisGroupValue analysisGroupValue : analysisGroupState.getLsValues()){
-						if (analysisGroupValue.getId() == null){
-							if (analysisGroupValue.getRecordedDate() == null) {analysisGroupValue.setRecordedDate(new Date());}
+				if (analysisGroupState.getLsValues() != null) {
+					for (AnalysisGroupValue analysisGroupValue : analysisGroupState.getLsValues()) {
+						if (analysisGroupValue.getId() == null) {
+							if (analysisGroupValue.getRecordedDate() == null) {
+								analysisGroupValue.setRecordedDate(new Date());
+							}
 							analysisGroupValue.setLsState(updatedAnalysisGroupState);
 							analysisGroupValue.persist();
-//							logger.debug("persisted the analysisGroupValue: " + analysisGroupValue.toJson());							
+							// logger.debug("persisted the analysisGroupValue: " +
+							// analysisGroupValue.toJson());
 						} else {
 							analysisGroupValue.setLsState(updatedAnalysisGroupState);
-							AnalysisGroupValue updatedAnalysisGroupValue = AnalysisGroupValue.update(analysisGroupValue);
+							AnalysisGroupValue updatedAnalysisGroupValue = AnalysisGroupValue
+									.update(analysisGroupValue);
 						}
-						}				
 					}
-				}		
-			}
-
-			if (analysisGroup.getTreatmentGroups() != null){
-				logger.debug("number of treatmentGroups " + analysisGroup.getTreatmentGroups().size());
-				for(TreatmentGroup treatmentGroup : analysisGroup.getTreatmentGroups()){
-					treatmentGroupService.updateTreatmentGroup(treatmentGroup);
 				}
-
 			}
-
-			return AnalysisGroup.findAnalysisGroup(updatedAnalysisGroup.getId());
 		}
 
-		@Transactional
-		public HashMap<String, TempThingDTO> createLsAnalysisGroupsFromCSV(String analysisGroupCSV, String treatmentGroupCSV, String subjectCSV) throws IOException{
+		if (analysisGroup.getTreatmentGroups() != null) {
+			logger.debug("number of treatmentGroups " + analysisGroup.getTreatmentGroups().size());
+			for (TreatmentGroup treatmentGroup : analysisGroup.getTreatmentGroups()) {
+				treatmentGroupService.updateTreatmentGroup(treatmentGroup);
+			}
 
-			HashMap<String, TempThingDTO> analysisGroupMap = createAnalysisGroupsFromCSV(analysisGroupCSV);
+		}
 
-			if (treatmentGroupCSV != null){
+		return AnalysisGroup.findAnalysisGroup(updatedAnalysisGroup.getId());
+	}
 
-				HashMap<String, TempThingDTO> treatmentGroupMap = treatmentGroupService.createLsTreatmentGroupsFromCSV(analysisGroupMap, treatmentGroupCSV, subjectCSV);
+	@Transactional
+	public HashMap<String, TempThingDTO> createLsAnalysisGroupsFromCSV(String analysisGroupCSV,
+			String treatmentGroupCSV, String subjectCSV) throws IOException {
 
-			}
+		HashMap<String, TempThingDTO> analysisGroupMap = createAnalysisGroupsFromCSV(analysisGroupCSV);
 
-			return analysisGroupMap;
+		if (treatmentGroupCSV != null) {
 
+			HashMap<String, TempThingDTO> treatmentGroupMap = treatmentGroupService
+					.createLsTreatmentGroupsFromCSV(analysisGroupMap, treatmentGroupCSV, subjectCSV);
 
 		}
 
-		@Override
-		@Transactional
-		public HashMap<String, TempThingDTO> createAnalysisGroupsFromCSV(String absoluteFilePath) throws IOException{
-
-			int batchSize = propertiesUtilService.getBatchSize();
-			ICsvBeanReader beanReader = null;
-			HashMap<String, TempThingDTO> analysisGroupMap = new HashMap<String, TempThingDTO>();
-			HashMap<String, TempThingDTO> analysisStateMap = new HashMap<String, TempThingDTO>();
-			HashMap<String, TempThingDTO> analysisValueMap = new HashMap<String, TempThingDTO>();
-
-			try {
-				logger.info("read csv delimited file");
-				//InputStream is = CreateAnalysisGroupsFromCSVFileTests.class.getClassLoader().getResourceAsStream(inputFileName);
-				InputStream is = new FileInputStream(absoluteFilePath);  
-				InputStreamReader isr = new InputStreamReader(is, "UTF-8");  
-				BufferedReader br = new BufferedReader(isr);
-
-				beanReader = new CsvBeanReader(br, CsvPreference.TAB_PREFERENCE);
-				String[] headerText = beanReader.getHeader(true);
-
-				List<String> headerList = new ArrayList<String>();
-				int position = 0;
-				for (String head : headerText){
-					logger.info("header column: " + position + "  " + head);
-					headerList.add(head);
-					position++;
-				}
-
-				logger.info("size of header list  " + headerList.size());
-				String[] header = new String[headerList.size()];
-				headerList.toArray(header);
-
-				for (String head : header){
-					logger.debug("header column array : " + position + "  " + head);
-					position++;
-				}
+		return analysisGroupMap;
 
-				final CellProcessor[] processors = FlatThingCsvDTO.getProcessors();
+	}
 
-				FlatThingCsvDTO analysisGroupDTO;
-				AnalysisGroup analysisGroup;
-				AnalysisGroupState analysisGroupState;
-				AnalysisGroupValue analysisGroupValue;
+	@Override
+	@Transactional
+	public HashMap<String, TempThingDTO> createAnalysisGroupsFromCSV(String absoluteFilePath) throws IOException {
 
-				// note: we want to allow creation of anlysisGroups with no states or values
-				// thus the code must create the analysisGroups first. (modification to input file ??) 
-				// try leaning on stateType and stateKind or valueType and valueKind
-				// if both null -- then do not create an entry
+		int batchSize = propertiesUtilService.getBatchSize();
+		ICsvBeanReader beanReader = null;
+		HashMap<String, TempThingDTO> analysisGroupMap = new HashMap<String, TempThingDTO>();
+		HashMap<String, TempThingDTO> analysisStateMap = new HashMap<String, TempThingDTO>();
+		HashMap<String, TempThingDTO> analysisValueMap = new HashMap<String, TempThingDTO>();
 
-				long rowIndex = 1;
-				Set<Experiment> experiments = new HashSet<Experiment>();
-				while( (analysisGroupDTO = beanReader.read(FlatThingCsvDTO.class, header, processors)) != null ) {
-					logger.debug(String.format("lineNo=%s, rowNo=%s, bulkData=%s", beanReader.getLineNumber(), beanReader.getRowNumber(), analysisGroupDTO));
+		try {
+			logger.info("read csv delimited file");
+			// InputStream is =
+			// CreateAnalysisGroupsFromCSVFileTests.class.getClassLoader().getResourceAsStream(inputFileName);
+			InputStream is = new FileInputStream(absoluteFilePath);
+			InputStreamReader isr = new InputStreamReader(is, "UTF-8");
+			BufferedReader br = new BufferedReader(isr);
+
+			beanReader = new CsvBeanReader(br, CsvPreference.TAB_PREFERENCE);
+			String[] headerText = beanReader.getHeader(true);
+
+			List<String> headerList = new ArrayList<String>();
+			int position = 0;
+			for (String head : headerText) {
+				logger.info("header column: " + position + "  " + head);
+				headerList.add(head);
+				position++;
+			}
 
-					if (analysisGroupDTO.getLsType() == null) analysisGroupDTO.setLsType("default");
-					if (analysisGroupDTO.getLsKind() == null) analysisGroupDTO.setLsKind("default");
-					if (analysisGroupDTO.getTempId() == null) analysisGroupDTO.setTempId(analysisGroupDTO.getId().toString());
+			logger.info("size of header list  " + headerList.size());
+			String[] header = new String[headerList.size()];
+			headerList.toArray(header);
 
-					analysisGroup = getOrCreateAnalysisGroup(analysisGroupDTO, analysisGroupMap);
-					if (analysisGroup != null){
-						if (analysisGroup.getId() == null){
-							analysisGroup.persist();
-						} else {
-							analysisGroup.merge();
-						}
+			for (String head : header) {
+				logger.debug("header column array : " + position + "  " + head);
+				position++;
+			}
 
+			final CellProcessor[] processors = FlatThingCsvDTO.getProcessors();
+
+			FlatThingCsvDTO analysisGroupDTO;
+			AnalysisGroup analysisGroup;
+			AnalysisGroupState analysisGroupState;
+			AnalysisGroupValue analysisGroupValue;
+
+			// note: we want to allow creation of anlysisGroups with no states or values
+			// thus the code must create the analysisGroups first. (modification to input
+			// file ??)
+			// try leaning on stateType and stateKind or valueType and valueKind
+			// if both null -- then do not create an entry
+
+			long rowIndex = 1;
+			Set<Experiment> experiments = new HashSet<Experiment>();
+			while ((analysisGroupDTO = beanReader.read(FlatThingCsvDTO.class, header, processors)) != null) {
+				logger.debug(String.format("lineNo=%s, rowNo=%s, bulkData=%s", beanReader.getLineNumber(),
+						beanReader.getRowNumber(), analysisGroupDTO));
+
+				if (analysisGroupDTO.getLsType() == null)
+					analysisGroupDTO.setLsType("default");
+				if (analysisGroupDTO.getLsKind() == null)
+					analysisGroupDTO.setLsKind("default");
+				if (analysisGroupDTO.getTempId() == null)
+					analysisGroupDTO.setTempId(analysisGroupDTO.getId().toString());
+
+				analysisGroup = getOrCreateAnalysisGroup(analysisGroupDTO, analysisGroupMap);
+				if (analysisGroup != null) {
+					if (analysisGroup.getId() == null) {
+						analysisGroup.persist();
+					} else {
+						analysisGroup.merge();
+					}
 
-						logger.debug("saved the new analysis group: " + analysisGroup.getId() + " " + analysisGroup.getCodeName());
-						logger.debug("saved the new analysis group: " + analysisGroup.toJson());
+					logger.debug("saved the new analysis group: " + analysisGroup.getId() + " "
+							+ analysisGroup.getCodeName());
+					logger.debug("saved the new analysis group: " + analysisGroup.toJson());
+
+					//// if ( rowIndex % batchSize == 0 ) {
+					//// analysisGroup.flush();
+					//// analysisGroup.clear();
+					//// }
+					// Experiment experiment =
+					//// Experiment.findExperiment(analysisGroupDTO.getParentId());
+					// experiment.getAnalysisGroups().add(analysisGroup);
+					// experiments.add(experiment);
+					analysisGroupMap = saveTempAnalysisGroup(analysisGroup, analysisGroupDTO, analysisGroupMap);
+				}
 
-						////				    if ( rowIndex % batchSize == 0 ) {
-						////				    	analysisGroup.flush();
-						////				    	analysisGroup.clear();
-						////				    }
-						//					Experiment experiment = Experiment.findExperiment(analysisGroupDTO.getParentId());
-						//					experiment.getAnalysisGroups().add(analysisGroup);
-						//					experiments.add(experiment);
-						analysisGroupMap = saveTempAnalysisGroup(analysisGroup, analysisGroupDTO, analysisGroupMap);
+				if (analysisGroupDTO.getStateType() != null && analysisGroupDTO.getStateKind() != null) {
+					if (analysisGroupDTO.getTempStateId() == null)
+						analysisGroupDTO.setTempStateId(analysisGroupDTO.getStateId().toString());
+					analysisGroupState = getOrCreateAnalysisState(analysisGroupDTO, analysisStateMap, analysisGroupMap);
+					if (analysisGroupState != null) {
+						analysisGroupState.persist();
+						logger.debug("saved the new analysis group state: " + analysisGroupState.getId());
+						logger.debug("saved the new analysis group state: " + analysisGroupState.toJson());
+
+						// if ( rowIndex % batchSize == 0 ) {
+						// analysisGroupState.flush();
+						// analysisGroupState.clear();
+						// }
+						analysisStateMap = saveTempAnalysisState(analysisGroupState, analysisGroupDTO,
+								analysisStateMap);
 					}
 
-					if (analysisGroupDTO.getStateType() != null && analysisGroupDTO.getStateKind() != null){
-						if (analysisGroupDTO.getTempStateId() == null) analysisGroupDTO.setTempStateId(analysisGroupDTO.getStateId().toString());
-						analysisGroupState = getOrCreateAnalysisState(analysisGroupDTO, analysisStateMap, analysisGroupMap);
-						if (analysisGroupState != null){
-							analysisGroupState.persist();
-							logger.debug("saved the new analysis group state: " + analysisGroupState.getId());
-							logger.debug("saved the new analysis group state: " + analysisGroupState.toJson());
-
-							//					    if ( rowIndex % batchSize == 0 ) {
-							//					    	analysisGroupState.flush();
-							//					    	analysisGroupState.clear();
-							//					    }
-							analysisStateMap = saveTempAnalysisState(analysisGroupState, analysisGroupDTO, analysisStateMap);
-						}
-
-						if (analysisGroupDTO.getValueType() != null && analysisGroupDTO.getValueKind() != null){
-							if (analysisGroupDTO.getTempValueId() == null) analysisGroupDTO.setTempValueId(Long.toString(rowIndex));
-							analysisGroupValue = getOrCreateAnalysisValue(analysisGroupDTO, analysisValueMap, analysisStateMap);
-							if (analysisGroupValue != null){
-								analysisGroupValue.persist();
-								logger.debug("saved the analysisGroupValue: " + analysisGroupValue.toJson());
-								if ( rowIndex % batchSize == 0 ) {
-									analysisGroupValue.flush();
-									analysisGroupValue.clear();
-								}
-								analysisValueMap = saveTempAnalysisValue(analysisGroupValue, analysisGroupDTO, analysisValueMap);
+					if (analysisGroupDTO.getValueType() != null && analysisGroupDTO.getValueKind() != null) {
+						if (analysisGroupDTO.getTempValueId() == null)
+							analysisGroupDTO.setTempValueId(Long.toString(rowIndex));
+						analysisGroupValue = getOrCreateAnalysisValue(analysisGroupDTO, analysisValueMap,
+								analysisStateMap);
+						if (analysisGroupValue != null) {
+							analysisGroupValue.persist();
+							logger.debug("saved the analysisGroupValue: " + analysisGroupValue.toJson());
+							if (rowIndex % batchSize == 0) {
+								analysisGroupValue.flush();
+								analysisGroupValue.clear();
 							}
+							analysisValueMap = saveTempAnalysisValue(analysisGroupValue, analysisGroupDTO,
+									analysisValueMap);
 						}
-					} else {
-						logger.debug("---------- not saving a new analysis group state: " + analysisGroupDTO.getStateType());
 					}
-
-					rowIndex++;
+				} else {
+					logger.debug(
+							"---------- not saving a new analysis group state: " + analysisGroupDTO.getStateType());
 				}
-				//			Long beforeMerge = new Date().getTime();
-				//			logger.info("Number of experiments to merge: "+ experiments.size());
-				//			for (Experiment experiment: experiments) {
-				//				experiment.merge();	
-				//			}
-				//			Long afterMerge = new Date().getTime();
-				//			Long mergeDuration = afterMerge - beforeMerge;
-				//			logger.info("Merging experiments took: "+ mergeDuration + " ms");
-
-
-			} catch (IOException e) {
-				e.printStackTrace();
-			} finally {
-				beanReader.close();
+
+				rowIndex++;
 			}
+			// Long beforeMerge = new Date().getTime();
+			// logger.info("Number of experiments to merge: "+ experiments.size());
+			// for (Experiment experiment: experiments) {
+			// experiment.merge();
+			// }
+			// Long afterMerge = new Date().getTime();
+			// Long mergeDuration = afterMerge - beforeMerge;
+			// logger.info("Merging experiments took: "+ mergeDuration + " ms");
 
-			return analysisGroupMap;
+		} catch (IOException e) {
+			e.printStackTrace();
+		} finally {
+			beanReader.close();
 		}
 
-		private HashMap<String, TempThingDTO> saveTempAnalysisValue(
-				AnalysisGroupValue analysisGroupValue,
-				FlatThingCsvDTO analysisGroupDTO,
-				HashMap<String, TempThingDTO> analysisValueMap) {
-
-			TempThingDTO tempThingDTO = new TempThingDTO();
-			tempThingDTO.setId(analysisGroupValue.getId());
-			tempThingDTO.setTempId(analysisGroupDTO.getTempValueId());
-			analysisValueMap.put(analysisGroupDTO.getTempValueId(), tempThingDTO);
-			return analysisValueMap;
-		}
+		return analysisGroupMap;
+	}
 
-		private HashMap<String, TempThingDTO> saveTempAnalysisState(
-				AnalysisGroupState analysisGroupState,
-				FlatThingCsvDTO analysisGroupDTO,
-				HashMap<String, TempThingDTO> analysisStateMap) {
+	private HashMap<String, TempThingDTO> saveTempAnalysisValue(
+			AnalysisGroupValue analysisGroupValue,
+			FlatThingCsvDTO analysisGroupDTO,
+			HashMap<String, TempThingDTO> analysisValueMap) {
 
-			TempThingDTO tempThingDTO = new TempThingDTO();
-			tempThingDTO.setId(analysisGroupState.getId());
-			tempThingDTO.setTempId(analysisGroupDTO.getTempStateId());
-			analysisStateMap.put(analysisGroupDTO.getTempStateId(), tempThingDTO);
+		TempThingDTO tempThingDTO = new TempThingDTO();
+		tempThingDTO.setId(analysisGroupValue.getId());
+		tempThingDTO.setTempId(analysisGroupDTO.getTempValueId());
+		analysisValueMap.put(analysisGroupDTO.getTempValueId(), tempThingDTO);
+		return analysisValueMap;
+	}
 
-			return analysisStateMap;
-		}
+	private HashMap<String, TempThingDTO> saveTempAnalysisState(
+			AnalysisGroupState analysisGroupState,
+			FlatThingCsvDTO analysisGroupDTO,
+			HashMap<String, TempThingDTO> analysisStateMap) {
 
-		private HashMap<String, TempThingDTO> saveTempAnalysisGroup(
-				AnalysisGroup analysisGroup,
-				FlatThingCsvDTO analysisGroupDTO, 
-				HashMap<String, TempThingDTO> analysisGroupMap) {
-
-			TempThingDTO tempThingDTO = new TempThingDTO();
-			tempThingDTO.setId(analysisGroup.getId());
-			tempThingDTO.setCodeName(analysisGroup.getCodeName());
-			tempThingDTO.setTempId(analysisGroupDTO.getTempId().toString());
-			analysisGroupMap.put(analysisGroupDTO.getTempId(), tempThingDTO);
-			return analysisGroupMap;
-		}
+		TempThingDTO tempThingDTO = new TempThingDTO();
+		tempThingDTO.setId(analysisGroupState.getId());
+		tempThingDTO.setTempId(analysisGroupDTO.getTempStateId());
+		analysisStateMap.put(analysisGroupDTO.getTempStateId(), tempThingDTO);
 
-		private AnalysisGroupValue getOrCreateAnalysisValue(
-				FlatThingCsvDTO analysisGroupDTO,
-				HashMap<String, TempThingDTO> analysisValueMap, HashMap<String, TempThingDTO> analysisStateMap) {
+		return analysisStateMap;
+	}
 
-			logger.debug("searching for analysisGroupDTO.id ---- " + analysisGroupDTO.getId());
-			AnalysisGroupValue analysisGroupValue = null;
-			if (!analysisValueMap.containsKey(analysisGroupDTO.getTempValueId())){
-				analysisGroupValue = new AnalysisGroupValue(analysisGroupDTO);
-				AnalysisGroupState ags = AnalysisGroupState.findAnalysisGroupState(analysisStateMap.get(analysisGroupDTO.getTempStateId()).getId());
-				analysisGroupValue.setLsState(ags);
-			} else {
-				logger.debug("skipping the saved analysisGroupValue --------- " + analysisGroupDTO.getStateId());
-			}
+	private HashMap<String, TempThingDTO> saveTempAnalysisGroup(
+			AnalysisGroup analysisGroup,
+			FlatThingCsvDTO analysisGroupDTO,
+			HashMap<String, TempThingDTO> analysisGroupMap) {
+
+		TempThingDTO tempThingDTO = new TempThingDTO();
+		tempThingDTO.setId(analysisGroup.getId());
+		tempThingDTO.setCodeName(analysisGroup.getCodeName());
+		tempThingDTO.setTempId(analysisGroupDTO.getTempId().toString());
+		analysisGroupMap.put(analysisGroupDTO.getTempId(), tempThingDTO);
+		return analysisGroupMap;
+	}
 
-			return analysisGroupValue;
+	private AnalysisGroupValue getOrCreateAnalysisValue(
+			FlatThingCsvDTO analysisGroupDTO,
+			HashMap<String, TempThingDTO> analysisValueMap, HashMap<String, TempThingDTO> analysisStateMap) {
+
+		logger.debug("searching for analysisGroupDTO.id ---- " + analysisGroupDTO.getId());
+		AnalysisGroupValue analysisGroupValue = null;
+		if (!analysisValueMap.containsKey(analysisGroupDTO.getTempValueId())) {
+			analysisGroupValue = new AnalysisGroupValue(analysisGroupDTO);
+			AnalysisGroupState ags = AnalysisGroupState
+					.findAnalysisGroupState(analysisStateMap.get(analysisGroupDTO.getTempStateId()).getId());
+			analysisGroupValue.setLsState(ags);
+		} else {
+			logger.debug("skipping the saved analysisGroupValue --------- " + analysisGroupDTO.getStateId());
 		}
 
-		private AnalysisGroupState getOrCreateAnalysisState(
-				FlatThingCsvDTO analysisGroupDTO,
-				HashMap<String, TempThingDTO> analysisStateMap, HashMap<String, TempThingDTO> analysisGroupMap) {
+		return analysisGroupValue;
+	}
 
-			AnalysisGroupState analysisGroupState = null;
-			if (!analysisStateMap.containsKey(analysisGroupDTO.getTempStateId())){
-				if (analysisGroupDTO.getStateId() == null){
-					analysisGroupState = new AnalysisGroupState(analysisGroupDTO);
-					analysisGroupState.setAnalysisGroup(AnalysisGroup.findAnalysisGroup(analysisGroupMap.get(analysisGroupDTO.getTempId()).getId()));				
-				} else {
-					analysisGroupState = AnalysisGroupState.findAnalysisGroupState(analysisGroupDTO.getStateId());
-				}
+	private AnalysisGroupState getOrCreateAnalysisState(
+			FlatThingCsvDTO analysisGroupDTO,
+			HashMap<String, TempThingDTO> analysisStateMap, HashMap<String, TempThingDTO> analysisGroupMap) {
+
+		AnalysisGroupState analysisGroupState = null;
+		if (!analysisStateMap.containsKey(analysisGroupDTO.getTempStateId())) {
+			if (analysisGroupDTO.getStateId() == null) {
+				analysisGroupState = new AnalysisGroupState(analysisGroupDTO);
+				analysisGroupState.setAnalysisGroup(
+						AnalysisGroup.findAnalysisGroup(analysisGroupMap.get(analysisGroupDTO.getTempId()).getId()));
 			} else {
-				logger.debug("skipping the saved analysisGroupState --------- " + analysisGroupDTO.getStateId());
+				analysisGroupState = AnalysisGroupState.findAnalysisGroupState(analysisGroupDTO.getStateId());
 			}
-
-			return analysisGroupState;
+		} else {
+			logger.debug("skipping the saved analysisGroupState --------- " + analysisGroupDTO.getStateId());
 		}
 
+		return analysisGroupState;
+	}
 
-		private AnalysisGroup getOrCreateAnalysisGroup(
-				FlatThingCsvDTO analysisGroupDTO, 
-				HashMap<String, TempThingDTO> analysisGroupMap) {
+	private AnalysisGroup getOrCreateAnalysisGroup(
+			FlatThingCsvDTO analysisGroupDTO,
+			HashMap<String, TempThingDTO> analysisGroupMap) {
 
-			AnalysisGroup analysisGroup = null;
-			if (!analysisGroupMap.containsKey(analysisGroupDTO.getTempId())){
-				if (analysisGroupDTO.getId() == null){
-					analysisGroup = new AnalysisGroup(analysisGroupDTO);
-					if (analysisGroup.getCodeName() == null){
-						analysisGroup.setCodeName(autoLabelService.getAnalysisGroupCodeName());
-					}
-					//analysisGroup = saveLsAnalysisGroup(analysisGroup);
-				} else {
-					analysisGroup = AnalysisGroup.findAnalysisGroup(analysisGroupDTO.getId());
-				}
-				Set<Experiment> experimentSet = new HashSet<Experiment>();
-				experimentSet.add(Experiment.findExperiment(analysisGroupDTO.getParentId()));
-
-				if (analysisGroup.getExperiments() == null){
-					analysisGroup.setExperiments(experimentSet);
-				} else {
-					analysisGroup.getExperiments().addAll(experimentSet);
+		AnalysisGroup analysisGroup = null;
+		if (!analysisGroupMap.containsKey(analysisGroupDTO.getTempId())) {
+			if (analysisGroupDTO.getId() == null) {
+				analysisGroup = new AnalysisGroup(analysisGroupDTO);
+				if (analysisGroup.getCodeName() == null) {
+					analysisGroup.setCodeName(autoLabelService.getAnalysisGroupCodeName());
 				}
+				// analysisGroup = saveLsAnalysisGroup(analysisGroup);
 			} else {
-				logger.debug("skipping the previously saved analysisGroup --------- " + analysisGroupDTO.getCodeName());
+				analysisGroup = AnalysisGroup.findAnalysisGroup(analysisGroupDTO.getId());
 			}
+			Set<Experiment> experimentSet = new HashSet<Experiment>();
+			experimentSet.add(Experiment.findExperiment(analysisGroupDTO.getParentId()));
 
-
-
-			return analysisGroup;
+			if (analysisGroup.getExperiments() == null) {
+				analysisGroup.setExperiments(experimentSet);
+			} else {
+				analysisGroup.getExperiments().addAll(experimentSet);
+			}
+		} else {
+			logger.debug("skipping the previously saved analysisGroup --------- " + analysisGroupDTO.getCodeName());
 		}
 
-
+		return analysisGroup;
 	}
+
+}
diff --git a/src/main/java/com/labsynch/labseer/service/AnalysisGroupStateService.java b/src/main/java/com/labsynch/labseer/service/AnalysisGroupStateService.java
index f0250aef3..b7e575277 100755
--- a/src/main/java/com/labsynch/labseer/service/AnalysisGroupStateService.java
+++ b/src/main/java/com/labsynch/labseer/service/AnalysisGroupStateService.java
@@ -16,7 +16,7 @@ public interface AnalysisGroupStateService {
 
 	AnalysisGroupState createAnalysisGroupStateByAnalysisGroupIdAndStateTypeKind(
 			Long analysisGroupId, String stateType, String stateKind);
-	
+
 	AnalysisGroupState createAnalysisGroupStateByAnalysisGroupIdAndStateTypeKindAndRecordedBy(
 			Long analysisGroupId, String stateType, String stateKind, String recordedBy);
 
@@ -41,6 +41,4 @@ AnalysisGroupState getAnalysisGroupState(String idOrCodeName,
 	Collection<AnalysisGroupStatePathDTO> getAnalysisGroupStates(
 			Collection<GenericStatePathRequest> genericRequests);
 
-	
-	
 }
diff --git a/src/main/java/com/labsynch/labseer/service/AnalysisGroupStateServiceImpl.java b/src/main/java/com/labsynch/labseer/service/AnalysisGroupStateServiceImpl.java
index f33dc19d5..84da06cd5 100755
--- a/src/main/java/com/labsynch/labseer/service/AnalysisGroupStateServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/AnalysisGroupStateServiceImpl.java
@@ -25,40 +25,47 @@
 public class AnalysisGroupStateServiceImpl implements AnalysisGroupStateService {
 
 	private static final Logger logger = LoggerFactory.getLogger(AnalysisGroupStateServiceImpl.class);
-	
+
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
 
 	@Override
-	public List<AnalysisGroupState> getAnalysisGroupStatesByAnalysisGroupIdAndStateTypeKind(Long analysisGroupId, String stateType, 
-			String stateKind) {	
-		
-		List<AnalysisGroupState> analysisGroupStates = AnalysisGroupState.findAnalysisGroupStatesByAnalysisGroupIDAndStateTypeKind(analysisGroupId, stateType, stateKind).getResultList();
+	public List<AnalysisGroupState> getAnalysisGroupStatesByAnalysisGroupIdAndStateTypeKind(Long analysisGroupId,
+			String stateType,
+			String stateKind) {
+
+		List<AnalysisGroupState> analysisGroupStates = AnalysisGroupState
+				.findAnalysisGroupStatesByAnalysisGroupIDAndStateTypeKind(analysisGroupId, stateType, stateKind)
+				.getResultList();
 
 		return analysisGroupStates;
 	}
-	
+
 	@Override
-	public Collection<AnalysisGroupState> ignoreAllAnalysisGroupStates(Collection<AnalysisGroupState> analysisGroupStates) {
-		//mark AnalysisGroupStates and values as ignore 
+	public Collection<AnalysisGroupState> ignoreAllAnalysisGroupStates(
+			Collection<AnalysisGroupState> analysisGroupStates) {
+		// mark AnalysisGroupStates and values as ignore
 		Collection<AnalysisGroupState> analysisGroupStateSet = new HashSet<AnalysisGroupState>();
-		for (AnalysisGroupState queryAnalysisGroupState : analysisGroupStates){
-			AnalysisGroupState analysisGroupState = AnalysisGroupState.findAnalysisGroupState(queryAnalysisGroupState.getId());			
-				for(AnalysisGroupValue analysisGroupValue : AnalysisGroupValue.findAnalysisGroupValuesByLsState(analysisGroupState).getResultList()){
-					analysisGroupValue.setIgnored(true);
-					analysisGroupValue.merge();
-				}
-				analysisGroupState.setIgnored(true);
-				analysisGroupState.merge();
-				analysisGroupStateSet.add(AnalysisGroupState.findAnalysisGroupState(analysisGroupState.getId()));
+		for (AnalysisGroupState queryAnalysisGroupState : analysisGroupStates) {
+			AnalysisGroupState analysisGroupState = AnalysisGroupState
+					.findAnalysisGroupState(queryAnalysisGroupState.getId());
+			for (AnalysisGroupValue analysisGroupValue : AnalysisGroupValue
+					.findAnalysisGroupValuesByLsState(analysisGroupState).getResultList()) {
+				analysisGroupValue.setIgnored(true);
+				analysisGroupValue.merge();
+			}
+			analysisGroupState.setIgnored(true);
+			analysisGroupState.merge();
+			analysisGroupStateSet.add(AnalysisGroupState.findAnalysisGroupState(analysisGroupState.getId()));
 		}
 
-		return(analysisGroupStateSet);
+		return (analysisGroupStateSet);
 
 	}
-	
+
 	@Override
-	public AnalysisGroupState createAnalysisGroupStateByAnalysisGroupIdAndStateTypeKind(Long analysisGroupId, String stateType, String stateKind) {
+	public AnalysisGroupState createAnalysisGroupStateByAnalysisGroupIdAndStateTypeKind(Long analysisGroupId,
+			String stateType, String stateKind) {
 		AnalysisGroupState analysisGroupState = new AnalysisGroupState();
 		AnalysisGroup analysisGroup = AnalysisGroup.findAnalysisGroup(analysisGroupId);
 		analysisGroupState.setAnalysisGroup(analysisGroup);
@@ -68,9 +75,10 @@ public AnalysisGroupState createAnalysisGroupStateByAnalysisGroupIdAndStateTypeK
 		analysisGroupState.persist();
 		return analysisGroupState;
 	}
-	
+
 	@Override
-	public AnalysisGroupState createAnalysisGroupStateByAnalysisGroupIdAndStateTypeKindAndRecordedBy(Long analysisGroupId, String stateType, String stateKind, String recordedBy) {
+	public AnalysisGroupState createAnalysisGroupStateByAnalysisGroupIdAndStateTypeKindAndRecordedBy(
+			Long analysisGroupId, String stateType, String stateKind, String recordedBy) {
 		AnalysisGroupState analysisGroupState = new AnalysisGroupState();
 		AnalysisGroup analysisGroup = AnalysisGroup.findAnalysisGroup(analysisGroupId);
 		analysisGroupState.setAnalysisGroup(analysisGroup);
@@ -84,10 +92,11 @@ public AnalysisGroupState createAnalysisGroupStateByAnalysisGroupIdAndStateTypeK
 	@Override
 	public AnalysisGroupState saveAnalysisGroupState(
 			AnalysisGroupState analysisGroupState) {
-		analysisGroupState.setAnalysisGroup(AnalysisGroup.findAnalysisGroup(analysisGroupState.getAnalysisGroup().getId()));		
+		analysisGroupState
+				.setAnalysisGroup(AnalysisGroup.findAnalysisGroup(analysisGroupState.getAnalysisGroup().getId()));
 		analysisGroupState.persist();
 		Set<AnalysisGroupValue> savedValues = new HashSet<AnalysisGroupValue>();
-		for (AnalysisGroupValue analysisGroupValue : analysisGroupState.getLsValues()){
+		for (AnalysisGroupValue analysisGroupValue : analysisGroupState.getLsValues()) {
 			analysisGroupValue.setLsState(analysisGroupState);
 			analysisGroupValue.persist();
 			savedValues.add(analysisGroupValue);
@@ -100,7 +109,7 @@ public AnalysisGroupState saveAnalysisGroupState(
 	@Override
 	public Collection<AnalysisGroupState> saveAnalysisGroupStates(
 			Collection<AnalysisGroupState> analysisGroupStates) {
-		for (AnalysisGroupState analysisGroupState: analysisGroupStates) {
+		for (AnalysisGroupState analysisGroupState : analysisGroupStates) {
 			analysisGroupState = saveAnalysisGroupState(analysisGroupState);
 		}
 		return analysisGroupStates;
@@ -109,7 +118,8 @@ public Collection<AnalysisGroupState> saveAnalysisGroupStates(
 	@Override
 	public AnalysisGroupState updateAnalysisGroupState(
 			AnalysisGroupState analysisGroupState) {
-		analysisGroupState.setVersion(AnalysisGroupState.findAnalysisGroupState(analysisGroupState.getId()).getVersion());
+		analysisGroupState
+				.setVersion(AnalysisGroupState.findAnalysisGroupState(analysisGroupState.getId()).getVersion());
 		analysisGroupState.merge();
 		return analysisGroupState;
 	}
@@ -117,21 +127,21 @@ public AnalysisGroupState updateAnalysisGroupState(
 	@Override
 	public Collection<AnalysisGroupState> updateAnalysisGroupStates(
 			Collection<AnalysisGroupState> analysisGroupStates) {
-		for (AnalysisGroupState analysisGroupState : analysisGroupStates){
+		for (AnalysisGroupState analysisGroupState : analysisGroupStates) {
 			analysisGroupState = updateAnalysisGroupState(analysisGroupState);
 		}
 		return null;
 	}
-	
+
 	@Override
 	public AnalysisGroupState getAnalysisGroupState(String idOrCodeName,
 			String stateType, String stateKind) {
 		AnalysisGroupState state = null;
-		try{
+		try {
 			Collection<AnalysisGroupState> states = getAnalysisGroupStates(idOrCodeName, stateType, stateKind);
 			state = states.iterator().next();
-		}catch (Exception e){
-			logger.error("Caught error "+e.toString()+" trying to find a state.",e);
+		} catch (Exception e) {
+			logger.error("Caught error " + e.toString() + " trying to find a state.", e);
 			state = null;
 		}
 		return state;
@@ -141,25 +151,29 @@ public AnalysisGroupState getAnalysisGroupState(String idOrCodeName,
 	public Collection<AnalysisGroupStatePathDTO> getAnalysisGroupStates(
 			Collection<GenericStatePathRequest> genericRequests) {
 		Collection<AnalysisGroupStatePathDTO> results = new ArrayList<AnalysisGroupStatePathDTO>();
-		for (GenericStatePathRequest request : genericRequests){
+		for (GenericStatePathRequest request : genericRequests) {
 			AnalysisGroupStatePathDTO result = new AnalysisGroupStatePathDTO();
 			result.setIdOrCodeName(request.getIdOrCodeName());
 			result.setStateType(request.getStateType());
 			result.setStateKind(request.getStateKind());
-			result.setStates(getAnalysisGroupStates(request.getIdOrCodeName(), request.getStateType(), request.getStateKind()));
+			result.setStates(
+					getAnalysisGroupStates(request.getIdOrCodeName(), request.getStateType(), request.getStateKind()));
 			results.add(result);
 		}
 		return results;
 	}
-	
-	private Collection<AnalysisGroupState> getAnalysisGroupStates(String idOrCodeName, String stateType, String stateKind){
-		if (SimpleUtil.isNumeric(idOrCodeName)){
+
+	private Collection<AnalysisGroupState> getAnalysisGroupStates(String idOrCodeName, String stateType,
+			String stateKind) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			Long id = Long.valueOf(idOrCodeName);
-			return AnalysisGroupState.findAnalysisGroupStatesByAnalysisGroupIDAndStateTypeKind(id, stateType, stateKind).getResultList();
-		}else{
-			return AnalysisGroupState.findAnalysisGroupStatesByAnalysisGroupCodeNameAndStateTypeKind(idOrCodeName, stateType, stateKind).getResultList();
+			return AnalysisGroupState.findAnalysisGroupStatesByAnalysisGroupIDAndStateTypeKind(id, stateType, stateKind)
+					.getResultList();
+		} else {
+			return AnalysisGroupState
+					.findAnalysisGroupStatesByAnalysisGroupCodeNameAndStateTypeKind(idOrCodeName, stateType, stateKind)
+					.getResultList();
 		}
 	}
 
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/AnalysisGroupValueService.java b/src/main/java/com/labsynch/labseer/service/AnalysisGroupValueService.java
index cf54b27a3..e5d4aed20 100644
--- a/src/main/java/com/labsynch/labseer/service/AnalysisGroupValueService.java
+++ b/src/main/java/com/labsynch/labseer/service/AnalysisGroupValueService.java
@@ -13,17 +13,21 @@
 @Service
 public interface AnalysisGroupValueService {
 
-	public List<AnalysisGroupValue> getAnalysisGroupValuesByExperimentIdAndStateTypeKind(Long experimentId, String stateType, 
+	public List<AnalysisGroupValue> getAnalysisGroupValuesByExperimentIdAndStateTypeKind(Long experimentId,
+			String stateType,
 			String stateKind);
-	
-	public List<AnalysisGroupValue> getAnalysisGroupValuesByExperimentIdAndStateTypeKindAndValueTypeKind(Long experimentId, String stateType,
+
+	public List<AnalysisGroupValue> getAnalysisGroupValuesByExperimentIdAndStateTypeKindAndValueTypeKind(
+			Long experimentId, String stateType,
 			String stateKind, String valueType, String valueKind);
 
 	public String getCsvList(List<AnalysisGroupValue> analysisGroupValues);
-	
-	public List<AnalysisGroupValue> getAnalysisGroupValuesByAnalysisGroupIdAndStateTypeKind(Long analysisGroupId, String stateType, String stateKind);
-	
-	public List<AnalysisGroupValue> getAnalysisGroupValuesByAnalysisGroupIdAndStateTypeKindAndValueTypeKind(Long analysisGroupId, String stateType, 
+
+	public List<AnalysisGroupValue> getAnalysisGroupValuesByAnalysisGroupIdAndStateTypeKind(Long analysisGroupId,
+			String stateType, String stateKind);
+
+	public List<AnalysisGroupValue> getAnalysisGroupValuesByAnalysisGroupIdAndStateTypeKindAndValueTypeKind(
+			Long analysisGroupId, String stateType,
 			String stateKind, String valueType, String valueKind);
 
 	public AnalysisGroupValue updateAnalysisGroupValue(String idOrCodeName,
@@ -39,7 +43,6 @@ public AnalysisGroupValue saveAnalysisGroupValue(
 	public Collection<AnalysisGroupValue> saveAnalysisGroupValues(
 			Collection<AnalysisGroupValue> analysisGroupValues);
 
-
 	public Collection<AnalysisGroupValue> updateAnalysisGroupValues(
 			Collection<AnalysisGroupValue> analysisGroupValues);
 
@@ -54,5 +57,4 @@ public AnalysisGroupValue getAnalysisGroupValue(String idOrCodeName,
 	public Collection<AnalysisGroupValuePathDTO> getAnalysisGroupValues(
 			Collection<GenericValuePathRequest> genericRequests);
 
-	
 }
diff --git a/src/main/java/com/labsynch/labseer/service/AnalysisGroupValueServiceImpl.java b/src/main/java/com/labsynch/labseer/service/AnalysisGroupValueServiceImpl.java
index 74c6ac710..6d33378ba 100644
--- a/src/main/java/com/labsynch/labseer/service/AnalysisGroupValueServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/AnalysisGroupValueServiceImpl.java
@@ -26,36 +26,42 @@
 import org.supercsv.io.ICsvBeanWriter;
 import org.supercsv.prefs.CsvPreference;
 
-
 @Service
 @Transactional
 public class AnalysisGroupValueServiceImpl implements AnalysisGroupValueService {
-	
+
 	@Autowired
 	private AnalysisGroupStateService analysisGroupStateService;
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(AnalysisGroupValueServiceImpl.class);
 
 	@Override
 	public List<AnalysisGroupValue> getAnalysisGroupValuesByExperimentIdAndStateTypeKind(
 			Long experimentId, String stateType, String stateKind) {
-		
-		List<AnalysisGroupValue> analysisGroupValues = AnalysisGroupValue.findAnalysisGroupValuesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getResultList();
+
+		List<AnalysisGroupValue> analysisGroupValues = AnalysisGroupValue
+				.findAnalysisGroupValuesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getResultList();
 
 		return analysisGroupValues;
 	}
-	
-	public List<AnalysisGroupValue> getAnalysisGroupValuesByExperimentIdAndStateTypeKindAndValueTypeKind(Long experimentId, String stateType,
+
+	public List<AnalysisGroupValue> getAnalysisGroupValuesByExperimentIdAndStateTypeKindAndValueTypeKind(
+			Long experimentId, String stateType,
 			String stateKind, String valueType, String valueKind) {
-		
-		List<AnalysisGroupValue> analysisGroupValues = AnalysisGroupValue.findAnalysisGroupValuesByExptIDAndStateTypeKindAndValueTypeKind(experimentId, stateType,
-				stateKind, valueType, valueKind).getResultList();
-		
+
+		List<AnalysisGroupValue> analysisGroupValues = AnalysisGroupValue
+				.findAnalysisGroupValuesByExptIDAndStateTypeKindAndValueTypeKind(experimentId, stateType,
+						stateKind, valueType, valueKind)
+				.getResultList();
+
 		return analysisGroupValues;
 	}
-	
-	public List<AnalysisGroupValue> getAnalysisGroupValuesByAnalysisGroupIdAndStateTypeKind(Long analysisGroupId, String stateType, String stateKind) {
-		List<AnalysisGroupValue> analysisGroupValues = AnalysisGroupValue.findAnalysisGroupValuesByAnalysisGroupIDAndStateTypeKind(analysisGroupId, stateType, stateKind).getResultList();
+
+	public List<AnalysisGroupValue> getAnalysisGroupValuesByAnalysisGroupIdAndStateTypeKind(Long analysisGroupId,
+			String stateType, String stateKind) {
+		List<AnalysisGroupValue> analysisGroupValues = AnalysisGroupValue
+				.findAnalysisGroupValuesByAnalysisGroupIDAndStateTypeKind(analysisGroupId, stateType, stateKind)
+				.getResultList();
 
 		return analysisGroupValues;
 	}
@@ -93,92 +99,103 @@ public String getCsvList(List<AnalysisGroupValue> analysisGroupValues) {
 	public List<AnalysisGroupValue> getAnalysisGroupValuesByAnalysisGroupIdAndStateTypeKindAndValueTypeKind(
 			Long analysisGroupId, String stateType, String stateKind,
 			String valueType, String valueKind) {
-		
-		List<AnalysisGroupValue> analysisGroupValues = AnalysisGroupValue.findAnalysisGroupValuesByAnalysisGroupIDAndStateTypeKindAndValueTypeKind(analysisGroupId, stateType,
-				stateKind, valueType, valueKind).getResultList();
-		
+
+		List<AnalysisGroupValue> analysisGroupValues = AnalysisGroupValue
+				.findAnalysisGroupValuesByAnalysisGroupIDAndStateTypeKindAndValueTypeKind(analysisGroupId, stateType,
+						stateKind, valueType, valueKind)
+				.getResultList();
+
 		return analysisGroupValues;
 	}
-	
+
 	@Override
 	@Transactional
 	public AnalysisGroupValue saveAnalysisGroupValue(AnalysisGroupValue analysisGroupValue) {
 		if (analysisGroupValue.getLsState().getId() == null) {
 			AnalysisGroupState analysisGroupState = new AnalysisGroupState(analysisGroupValue.getLsState());
-			analysisGroupState.setAnalysisGroup(AnalysisGroup.findAnalysisGroup(analysisGroupValue.getLsState().getAnalysisGroup().getId()));
+			analysisGroupState.setAnalysisGroup(
+					AnalysisGroup.findAnalysisGroup(analysisGroupValue.getLsState().getAnalysisGroup().getId()));
 			analysisGroupState.persist();
-			analysisGroupValue.setLsState(analysisGroupState); 
+			analysisGroupValue.setLsState(analysisGroupState);
 		} else {
-			analysisGroupValue.setLsState(AnalysisGroupState.findAnalysisGroupState(analysisGroupValue.getLsState().getId()));
-		}		
+			analysisGroupValue
+					.setLsState(AnalysisGroupState.findAnalysisGroupState(analysisGroupValue.getLsState().getId()));
+		}
 		analysisGroupValue.persist();
 		return analysisGroupValue;
 	}
-	
+
 	@Override
 	@Transactional
 	public Collection<AnalysisGroupValue> saveAnalysisGroupValues(Collection<AnalysisGroupValue> analysisGroupValues) {
-		for (AnalysisGroupValue analysisGroupValue: analysisGroupValues) {
+		for (AnalysisGroupValue analysisGroupValue : analysisGroupValues) {
 			analysisGroupValue = saveAnalysisGroupValue(analysisGroupValue);
 		}
 		return analysisGroupValues;
 	}
-	
+
 	@Override
 	public AnalysisGroupValue updateAnalysisGroupValue(AnalysisGroupValue analysisGroupValue) {
 		if (analysisGroupValue.getLsState().getId() == null) {
 			AnalysisGroupState analysisGroupState = new AnalysisGroupState(analysisGroupValue.getLsState());
-			analysisGroupState.setAnalysisGroup(AnalysisGroup.findAnalysisGroup(analysisGroupValue.getLsState().getAnalysisGroup().getId()));
+			analysisGroupState.setAnalysisGroup(
+					AnalysisGroup.findAnalysisGroup(analysisGroupValue.getLsState().getAnalysisGroup().getId()));
 			analysisGroupState.persist();
-			analysisGroupValue.setLsState(analysisGroupState); 
+			analysisGroupValue.setLsState(analysisGroupState);
 		} else {
-			analysisGroupValue.setLsState(AnalysisGroupState.findAnalysisGroupState(analysisGroupValue.getLsState().getId()));
+			analysisGroupValue
+					.setLsState(AnalysisGroupState.findAnalysisGroupState(analysisGroupValue.getLsState().getId()));
 		}
-//		analysisGroupValue.setVersion(AnalysisGroupValue.findAnalysisGroupValue(analysisGroupValue.getId()).getVersion());
+		// analysisGroupValue.setVersion(AnalysisGroupValue.findAnalysisGroupValue(analysisGroupValue.getId()).getVersion());
 		analysisGroupValue.merge();
 		return analysisGroupValue;
 	}
-	
+
 	@Override
-	public AnalysisGroupValue updateAnalysisGroupValue(String idOrCodeName, String stateType, String stateKind, String valueType, String valueKind, String value) {
-		//fetch the entity
+	public AnalysisGroupValue updateAnalysisGroupValue(String idOrCodeName, String stateType, String stateKind,
+			String valueType, String valueKind, String value) {
+		// fetch the entity
 		AnalysisGroup analysisGroup;
-		if(SimpleUtil.isNumeric(idOrCodeName)) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			analysisGroup = AnalysisGroup.findAnalysisGroup(Long.valueOf(idOrCodeName));
-		} else {		
+		} else {
 			try {
 				analysisGroup = AnalysisGroup.findAnalysisGroupsByCodeNameEquals(idOrCodeName).getSingleResult();
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				analysisGroup = null;
 			}
 		}
-		//fetch the state, and if it doesn't exist, create it
+		// fetch the state, and if it doesn't exist, create it
 		List<AnalysisGroupState> analysisGroupStates;
-		if(analysisGroup != null) {
+		if (analysisGroup != null) {
 			Long analysisGroupId = analysisGroup.getId();
-			analysisGroupStates = analysisGroupStateService.getAnalysisGroupStatesByAnalysisGroupIdAndStateTypeKind(analysisGroupId, stateType, stateKind);
+			analysisGroupStates = analysisGroupStateService
+					.getAnalysisGroupStatesByAnalysisGroupIdAndStateTypeKind(analysisGroupId, stateType, stateKind);
 			if (analysisGroupStates.isEmpty()) {
-				//create the state
-				analysisGroupStates.add(analysisGroupStateService.createAnalysisGroupStateByAnalysisGroupIdAndStateTypeKind(analysisGroupId, stateType, stateKind));
+				// create the state
+				analysisGroupStates
+						.add(analysisGroupStateService.createAnalysisGroupStateByAnalysisGroupIdAndStateTypeKind(
+								analysisGroupId, stateType, stateKind));
 				logger.debug("Created the analysisGroup state: " + analysisGroupStates.get(0).toJson());
 			}
 		}
-		//fetch the value, ignore it if it exists, then create a new one
+		// fetch the value, ignore it if it exists, then create a new one
 		List<AnalysisGroupValue> analysisGroupValues;
 		AnalysisGroupValue analysisGroupValue = null;
-		if(analysisGroup != null) {
+		if (analysisGroup != null) {
 			Long analysisGroupId = analysisGroup.getId();
-			analysisGroupValues = getAnalysisGroupValuesByAnalysisGroupIdAndStateTypeKindAndValueTypeKind(analysisGroupId, stateType, stateKind, valueType, valueKind);
-			if (analysisGroupValues.size() > 1){
+			analysisGroupValues = getAnalysisGroupValuesByAnalysisGroupIdAndStateTypeKindAndValueTypeKind(
+					analysisGroupId, stateType, stateKind, valueType, valueKind);
+			if (analysisGroupValues.size() > 1) {
 				logger.error("Error: multiple analysisGroup statuses found");
-			}
-			else if (analysisGroupValues.size() == 1){
+			} else if (analysisGroupValues.size() == 1) {
 				analysisGroupValue = analysisGroupValues.get(0);
 				analysisGroupValue.setIgnored(true);
 				analysisGroupValue.merge();
 				logger.debug("Ignored the analysisGroup value: " + analysisGroupValue.toJson());
 			}
-			analysisGroupValue = createAnalysisGroupValueByAnalysisGroupIdAndStateTypeKindAndValueTypeKind(analysisGroupId, stateType, stateKind, valueType, valueKind, value);
+			analysisGroupValue = createAnalysisGroupValueByAnalysisGroupIdAndStateTypeKindAndValueTypeKind(
+					analysisGroupId, stateType, stateKind, valueType, valueKind, value);
 			logger.debug("Created the analysisGroup value: " + analysisGroupValue.toJson());
 		}
 		return analysisGroupValue;
@@ -189,33 +206,42 @@ private AnalysisGroupValue createAnalysisGroupValueByAnalysisGroupIdAndStateType
 			Long analysisGroupId, String stateType, String stateKind,
 			String valueType, String valueKind, String value) {
 		AnalysisGroupValue analysisGroupValue = new AnalysisGroupValue();
-		AnalysisGroupState analysisGroupState = AnalysisGroupState.findAnalysisGroupStatesByAnalysisGroupIDAndStateTypeKind(analysisGroupId, stateType, stateKind).getSingleResult();
+		AnalysisGroupState analysisGroupState = AnalysisGroupState
+				.findAnalysisGroupStatesByAnalysisGroupIDAndStateTypeKind(analysisGroupId, stateType, stateKind)
+				.getSingleResult();
 		analysisGroupValue.setLsState(analysisGroupState);
 		analysisGroupValue.setLsType(valueType);
 		analysisGroupValue.setLsKind(valueKind);
-		if (valueType.equals("stringValue")) analysisGroupValue.setStringValue(value);
-		if (valueType.equals("fileValue")) analysisGroupValue.setFileValue(value);
-		if (valueType.equals("clobValue")) analysisGroupValue.setClobValue(value);
-		if (valueType.equals("blobValue")) analysisGroupValue.setBlobValue(value.getBytes(Charset.forName("UTF-8")));
-		if (valueType.equals("numericValue")) analysisGroupValue.setNumericValue(new BigDecimal(value));
-		if (valueType.equals("dateValue")) analysisGroupValue.setDateValue(new Date(Long.parseLong(value)));
-		if (valueType.equals("codeValue")) analysisGroupValue.setCodeValue(value);
-		if (valueType.equals("urlValue")) analysisGroupValue.setUrlValue(value);
+		if (valueType.equals("stringValue"))
+			analysisGroupValue.setStringValue(value);
+		if (valueType.equals("fileValue"))
+			analysisGroupValue.setFileValue(value);
+		if (valueType.equals("clobValue"))
+			analysisGroupValue.setClobValue(value);
+		if (valueType.equals("blobValue"))
+			analysisGroupValue.setBlobValue(value.getBytes(Charset.forName("UTF-8")));
+		if (valueType.equals("numericValue"))
+			analysisGroupValue.setNumericValue(new BigDecimal(value));
+		if (valueType.equals("dateValue"))
+			analysisGroupValue.setDateValue(new Date(Long.parseLong(value)));
+		if (valueType.equals("codeValue"))
+			analysisGroupValue.setCodeValue(value);
+		if (valueType.equals("urlValue"))
+			analysisGroupValue.setUrlValue(value);
 		analysisGroupValue.setRecordedBy("default");
 		analysisGroupValue.persist();
 		return analysisGroupValue;
 	}
 
-
 	@Override
 	public Collection<AnalysisGroupValue> updateAnalysisGroupValues(
 			Collection<AnalysisGroupValue> analysisGroupValues) {
-		for (AnalysisGroupValue analysisGroupValue: analysisGroupValues) {
+		for (AnalysisGroupValue analysisGroupValue : analysisGroupValues) {
 			analysisGroupValue = updateAnalysisGroupValue(analysisGroupValue);
 		}
 		return analysisGroupValues;
 	}
-	
+
 	@Override
 	public AnalysisGroupValue createAnalysisGroupValueFromLsStateAndTypeAndKindAndValue(
 			AnalysisGroupState analysisGroupState, String lsType, String lsKind, String value, String recordedBy) {
@@ -223,14 +249,22 @@ public AnalysisGroupValue createAnalysisGroupValueFromLsStateAndTypeAndKindAndVa
 		analysisGroupValue.setLsState(analysisGroupState);
 		analysisGroupValue.setLsType(lsType);
 		analysisGroupValue.setLsKind(lsKind);
-		if (lsType.equals("stringValue")) analysisGroupValue.setStringValue(value);
-		if (lsType.equals("fileValue")) analysisGroupValue.setFileValue(value);
-		if (lsType.equals("clobValue")) analysisGroupValue.setClobValue(value);
-		if (lsType.equals("blobValue")) analysisGroupValue.setBlobValue(value.getBytes(Charset.forName("UTF-8")));
-		if (lsType.equals("numericValue")) analysisGroupValue.setNumericValue(new BigDecimal(value));
-		if (lsType.equals("dateValue")) analysisGroupValue.setDateValue(new Date(Long.parseLong(value)));
-		if (lsType.equals("codeValue")) analysisGroupValue.setCodeValue(value);
-		if (lsType.equals("urlValue")) analysisGroupValue.setUrlValue(value);
+		if (lsType.equals("stringValue"))
+			analysisGroupValue.setStringValue(value);
+		if (lsType.equals("fileValue"))
+			analysisGroupValue.setFileValue(value);
+		if (lsType.equals("clobValue"))
+			analysisGroupValue.setClobValue(value);
+		if (lsType.equals("blobValue"))
+			analysisGroupValue.setBlobValue(value.getBytes(Charset.forName("UTF-8")));
+		if (lsType.equals("numericValue"))
+			analysisGroupValue.setNumericValue(new BigDecimal(value));
+		if (lsType.equals("dateValue"))
+			analysisGroupValue.setDateValue(new Date(Long.parseLong(value)));
+		if (lsType.equals("codeValue"))
+			analysisGroupValue.setCodeValue(value);
+		if (lsType.equals("urlValue"))
+			analysisGroupValue.setUrlValue(value);
 		analysisGroupValue.setRecordedBy(recordedBy);
 		analysisGroupValue.persist();
 		return analysisGroupValue;
@@ -240,11 +274,12 @@ public AnalysisGroupValue createAnalysisGroupValueFromLsStateAndTypeAndKindAndVa
 	public AnalysisGroupValue getAnalysisGroupValue(String idOrCodeName,
 			String stateType, String stateKind, String valueType, String valueKind) {
 		AnalysisGroupValue value = null;
-		try{
-			Collection<AnalysisGroupValue> values = getAnalysisGroupValues(idOrCodeName, stateType, stateKind, valueType, valueKind);
+		try {
+			Collection<AnalysisGroupValue> values = getAnalysisGroupValues(idOrCodeName, stateType, stateKind,
+					valueType, valueKind);
 			value = values.iterator().next();
-		}catch (Exception e){
-			logger.error("Caught error "+e.toString()+" trying to find a state.",e);
+		} catch (Exception e) {
+			logger.error("Caught error " + e.toString() + " trying to find a state.", e);
 			value = null;
 		}
 		return value;
@@ -254,23 +289,27 @@ public AnalysisGroupValue getAnalysisGroupValue(String idOrCodeName,
 	public Collection<AnalysisGroupValuePathDTO> getAnalysisGroupValues(
 			Collection<GenericValuePathRequest> genericRequests) {
 		Collection<AnalysisGroupValuePathDTO> results = new ArrayList<AnalysisGroupValuePathDTO>();
-		for (GenericValuePathRequest request : genericRequests){
+		for (GenericValuePathRequest request : genericRequests) {
 			AnalysisGroupValuePathDTO result = new AnalysisGroupValuePathDTO();
 			result.setIdOrCodeName(request.getIdOrCodeName());
 			result.setValueType(request.getValueType());
 			result.setValueKind(request.getValueKind());
-			result.setValues(getAnalysisGroupValues(request.getIdOrCodeName(), request.getStateType(), request.getStateKind(), request.getValueType(), request.getValueKind()));
+			result.setValues(getAnalysisGroupValues(request.getIdOrCodeName(), request.getStateType(),
+					request.getStateKind(), request.getValueType(), request.getValueKind()));
 			results.add(result);
 		}
 		return results;
 	}
-	
-	private Collection<AnalysisGroupValue> getAnalysisGroupValues(String idOrCodeName, String stateType, String stateKind, String valueType, String valueKind){
-		if (SimpleUtil.isNumeric(idOrCodeName)){
+
+	private Collection<AnalysisGroupValue> getAnalysisGroupValues(String idOrCodeName, String stateType,
+			String stateKind, String valueType, String valueKind) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			Long id = Long.valueOf(idOrCodeName);
-			return AnalysisGroupValue.findAnalysisGroupValuesByAnalysisGroupIDAndStateTypeKindAndValueTypeKind(id, stateType, stateKind, valueType, valueKind).getResultList();
-		}else{
-			return AnalysisGroupValue.findAnalysisGroupValuesByAnalysisGroupCodeNameAndStateTypeKindAndValueTypeKind(idOrCodeName, stateType, stateKind, valueType, valueKind).getResultList();
+			return AnalysisGroupValue.findAnalysisGroupValuesByAnalysisGroupIDAndStateTypeKindAndValueTypeKind(id,
+					stateType, stateKind, valueType, valueKind).getResultList();
+		} else {
+			return AnalysisGroupValue.findAnalysisGroupValuesByAnalysisGroupCodeNameAndStateTypeKindAndValueTypeKind(
+					idOrCodeName, stateType, stateKind, valueType, valueKind).getResultList();
 		}
 	}
 }
diff --git a/src/main/java/com/labsynch/labseer/service/AuthorRoleService.java b/src/main/java/com/labsynch/labseer/service/AuthorRoleService.java
index cd77dd5fb..c4fbea06d 100644
--- a/src/main/java/com/labsynch/labseer/service/AuthorRoleService.java
+++ b/src/main/java/com/labsynch/labseer/service/AuthorRoleService.java
@@ -16,6 +16,4 @@ public interface AuthorRoleService {
 
 	void deleteAuthorRoleDTOs(Collection<AuthorRoleDTO> authorRoleDTOs);
 
-	
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/AuthorRoleServiceImpl.java b/src/main/java/com/labsynch/labseer/service/AuthorRoleServiceImpl.java
index 9f4364e3d..1757b90e7 100644
--- a/src/main/java/com/labsynch/labseer/service/AuthorRoleServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/AuthorRoleServiceImpl.java
@@ -24,7 +24,6 @@ public class AuthorRoleServiceImpl implements AuthorRoleService {
 	private AutoLabelService autoLabelService;
 
 	private static final Logger logger = LoggerFactory.getLogger(AuthorRoleServiceImpl.class);
-	
 
 	@Override
 	@Transactional
@@ -32,12 +31,12 @@ public Author syncRoles(Author author, Collection<String> grantedRoles) {
 		Collection<AuthorRole> cachedRoles = author.getAuthorRoles();
 		logger.debug(AuthorRole.toJsonArray(cachedRoles));
 		HashSet<String> cachedRoleNames = new HashSet<String>();
-		for (AuthorRole cachedRole : cachedRoles){
-			if (cachedRole.getRoleEntry().getLsType().equalsIgnoreCase("LDAP")){
+		for (AuthorRole cachedRole : cachedRoles) {
+			if (cachedRole.getRoleEntry().getLsType().equalsIgnoreCase("LDAP")) {
 				cachedRoleNames.add(cachedRole.getRoleEntry().getRoleName());
 			}
 		}
-		//diff the two sets - cached and new/granted
+		// diff the two sets - cached and new/granted
 		HashSet<String> roleNamesToDelete = new HashSet<String>();
 		roleNamesToDelete.addAll(cachedRoleNames);
 		roleNamesToDelete.removeAll(grantedRoles);
@@ -47,12 +46,12 @@ public Author syncRoles(Author author, Collection<String> grantedRoles) {
 		Set<AuthorRole> newAuthorRoles = new HashSet<AuthorRole>();
 		logger.debug(roleNamesToDelete.toString());
 		logger.debug(roleNamesToAdd.toString());
-		//add new roles, autocreating LsRole if necessary
-		for (String roleName : roleNamesToAdd){
+		// add new roles, autocreating LsRole if necessary
+		for (String roleName : roleNamesToAdd) {
 			LsRole role;
-			try{
-				role = LsRole.findLsRolesByLsTypeEqualsAndRoleNameEquals("LDAP",roleName).getSingleResult();
-			}catch (NoResultException e){
+			try {
+				role = LsRole.findLsRolesByLsTypeEqualsAndRoleNameEquals("LDAP", roleName).getSingleResult();
+			} catch (NoResultException e) {
 				role = new LsRole();
 				role.setRoleName(roleName);
 				role.setLsType("LDAP");
@@ -66,29 +65,30 @@ public Author syncRoles(Author author, Collection<String> grantedRoles) {
 			authorRole.persist();
 			newAuthorRoles.add(authorRole);
 		}
-		//delete the roles that no longer apply
+		// delete the roles that no longer apply
 		Set<AuthorRole> removedAuthorRoles = new HashSet<AuthorRole>();
-		for (String roleName : roleNamesToDelete){
+		for (String roleName : roleNamesToDelete) {
 			LsRole role = LsRole.findLsRolesByLsTypeEqualsAndRoleNameEquals("LDAP", roleName).getSingleResult();
 			AuthorRole authorRole = AuthorRole.findAuthorRolesByRoleEntryAndUserEntry(role, author).getSingleResult();
 			author.getAuthorRoles().remove(authorRole);
 			authorRole.remove();
 			removedAuthorRoles.add(authorRole);
 		}
-//		author.getAuthorRoles().removeAll(removedAuthorRoles);
+		// author.getAuthorRoles().removeAll(removedAuthorRoles);
 		author.getAuthorRoles().addAll(newAuthorRoles);
 		author.merge();
 		return author;
 	}
 
-
 	@Override
 	public void saveAuthorRoleDTOs(Collection<AuthorRoleDTO> authorRoleDTOs) {
-		for (AuthorRoleDTO authorRoleDTO : authorRoleDTOs){
+		for (AuthorRoleDTO authorRoleDTO : authorRoleDTOs) {
 			Author author = Author.findAuthorsByUserName(authorRoleDTO.getUserName()).getSingleResult();
-			LsRole role = LsRole.findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals(authorRoleDTO.getRoleType(), authorRoleDTO.getRoleKind(), authorRoleDTO.getRoleName()).getSingleResult();
-			Collection<AuthorRole> foundAuthorRoles = AuthorRole.findAuthorRolesByRoleEntryAndUserEntry(role, author).getResultList();
-			if (foundAuthorRoles.isEmpty()){
+			LsRole role = LsRole.findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals(authorRoleDTO.getRoleType(),
+					authorRoleDTO.getRoleKind(), authorRoleDTO.getRoleName()).getSingleResult();
+			Collection<AuthorRole> foundAuthorRoles = AuthorRole.findAuthorRolesByRoleEntryAndUserEntry(role, author)
+					.getResultList();
+			if (foundAuthorRoles.isEmpty()) {
 				AuthorRole authorRole = new AuthorRole();
 				authorRole.setUserEntry(author);
 				authorRole.setRoleEntry(role);
@@ -97,18 +97,18 @@ public void saveAuthorRoleDTOs(Collection<AuthorRoleDTO> authorRoleDTOs) {
 		}
 	}
 
-
 	@Override
 	public void deleteAuthorRoleDTOs(Collection<AuthorRoleDTO> authorRoleDTOs) {
-		for (AuthorRoleDTO authorRoleDTO : authorRoleDTOs){
+		for (AuthorRoleDTO authorRoleDTO : authorRoleDTOs) {
 			Author author = Author.findAuthorsByUserName(authorRoleDTO.getUserName()).getSingleResult();
-			LsRole role = LsRole.findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals(authorRoleDTO.getRoleType(), authorRoleDTO.getRoleKind(), authorRoleDTO.getRoleName()).getSingleResult();
-			Collection<AuthorRole> foundAuthorRoles = AuthorRole.findAuthorRolesByRoleEntryAndUserEntry(role, author).getResultList();
-			for (AuthorRole foundAuthorRole : foundAuthorRoles){
+			LsRole role = LsRole.findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals(authorRoleDTO.getRoleType(),
+					authorRoleDTO.getRoleKind(), authorRoleDTO.getRoleName()).getSingleResult();
+			Collection<AuthorRole> foundAuthorRoles = AuthorRole.findAuthorRolesByRoleEntryAndUserEntry(role, author)
+					.getResultList();
+			for (AuthorRole foundAuthorRole : foundAuthorRoles) {
 				foundAuthorRole.remove();
 			}
 		}
 	}
 
-	
 }
diff --git a/src/main/java/com/labsynch/labseer/service/AuthorService.java b/src/main/java/com/labsynch/labseer/service/AuthorService.java
index 3ad960162..7d40efe22 100644
--- a/src/main/java/com/labsynch/labseer/service/AuthorService.java
+++ b/src/main/java/com/labsynch/labseer/service/AuthorService.java
@@ -48,7 +48,8 @@ Collection<Long> searchAuthorIdsByQueryDTO(AuthorQueryDTO query)
 
 	Author signupAuthor(Author author);
 
-	void changePassword(Author author, String currentPassword, String newPassword, String newPasswordAgain) throws Exception;
+	void changePassword(Author author, String currentPassword, String newPassword, String newPasswordAgain)
+			throws Exception;
 
 	void resetPassword(String emailAddress);
 
diff --git a/src/main/java/com/labsynch/labseer/service/AuthorServiceImpl.java b/src/main/java/com/labsynch/labseer/service/AuthorServiceImpl.java
index e6dbb3e24..e2a1c18b8 100644
--- a/src/main/java/com/labsynch/labseer/service/AuthorServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/AuthorServiceImpl.java
@@ -62,13 +62,12 @@ public class AuthorServiceImpl implements AuthorService {
 
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
-	
+
 	@Autowired
 	private transient MailSender mailSender;
 
 	private static final Logger logger = LoggerFactory.getLogger(AuthorServiceImpl.class);
 
-
 	@Override
 	public CodeTableDTO getAuthorCodeTable(Author author) {
 		CodeTableDTO codeTable = new CodeTableDTO();
@@ -79,7 +78,6 @@ public CodeTableDTO getAuthorCodeTable(Author author) {
 		return codeTable;
 	}
 
-
 	@Override
 	public List<CodeTableDTO> convertToCodeTables(List<Author> authors) {
 		List<CodeTableDTO> codeTableList = new ArrayList<CodeTableDTO>();
@@ -87,28 +85,28 @@ public List<CodeTableDTO> convertToCodeTables(List<Author> authors) {
 			CodeTableDTO codeTable = getAuthorCodeTable(author);
 			codeTableList.add(codeTable);
 		}
-		return codeTableList;	
+		return codeTableList;
 	}
 
 	@Override
-	public Collection<Author> findAuthorsByAuthorRoleName(String authorRoleName){
+	public Collection<Author> findAuthorsByAuthorRoleName(String authorRoleName) {
 		List<LsRole> roleEntries = LsRole.findLsRolesByRoleNameEquals(authorRoleName).getResultList();
 		Collection<Author> authors = new HashSet<Author>();
-		for (LsRole roleEntry : roleEntries){
+		for (LsRole roleEntry : roleEntries) {
 			Collection<AuthorRole> authorRoles = AuthorRole.findAuthorRolesByRoleEntry(roleEntry).getResultList();
-			for (AuthorRole authorRole : authorRoles){
+			for (AuthorRole authorRole : authorRoles) {
 				authors.add(authorRole.getUserEntry());
-			}	
+			}
 		}
 		return authors;
 	}
 
 	@Override
-	public Collection<LsThing> getUserProjects(String userName	){
+	public Collection<LsThing> getUserProjects(String userName) {
 		Collection<LsThing> projectThings = new HashSet<LsThing>();
 		List<Author> authors = Author.findAuthorsByUserName(userName).getResultList();
 		Author author = null;
-		if (authors.size() == 0){
+		if (authors.size() == 0) {
 			logger.error("No author found by name: " + userName);
 		} else if (authors.size() > 1) {
 			logger.error("Found multiple authors by name: " + userName);
@@ -116,24 +114,25 @@ public Collection<LsThing> getUserProjects(String userName	){
 		} else {
 			author = authors.get(0);
 		}
-		if (author != null){
-			Collection<LsThing> allProjects = LsThing.findLsThingsByLsTypeEqualsAndLsKindEquals("project", "project").getResultList();
-			if (propertiesUtilService.getEnableProjectRoles()){
+		if (author != null) {
+			Collection<LsThing> allProjects = LsThing.findLsThingsByLsTypeEqualsAndLsKindEquals("project", "project")
+					.getResultList();
+			if (propertiesUtilService.getEnableProjectRoles()) {
 				Collection<LsThing> filteredProjects = new ArrayList<LsThing>();
 				boolean isAdmin = false;
 				Set<AuthorRole> roles = author.getAuthorRoles();
 				Set<String> allowedProjectCodes = new HashSet<String>();
-				for (AuthorRole role : roles){
+				for (AuthorRole role : roles) {
 					LsRole entry = role.getRoleEntry();
-					if (entry.getLsType()!= null && entry.getLsType().equalsIgnoreCase("Project")){
+					if (entry.getLsType() != null && entry.getLsType().equalsIgnoreCase("Project")) {
 						allowedProjectCodes.add(entry.getLsKind());
-					}else if (entry.getRoleName().equals(propertiesUtilService.getAcasAdminRole())){
+					} else if (entry.getRoleName().equals(propertiesUtilService.getAcasAdminRole())) {
 						isAdmin = true;
 					}
 				}
 				if (isAdmin) {
 					filteredProjects.addAll(allProjects);
-				}else {
+				} else {
 					for (LsThing project : allProjects) {
 						boolean isRestricted = false;
 						for (LsThingState state : project.getLsStates()) {
@@ -142,21 +141,23 @@ public Collection<LsThing> getUserProjects(String userName	){
 									if (!value.isIgnored()) {
 										if (value.getLsKind().equals("is restricted")) {
 											Boolean projRestricted = Boolean.valueOf(value.getCodeValue());
-											if (projRestricted != null) isRestricted = projRestricted;
+											if (projRestricted != null)
+												isRestricted = projRestricted;
 										}
 									}
 								}
 							}
 						}
 						if (isRestricted) {
-							if (allowedProjectCodes.contains(project.getCodeName())) filteredProjects.add(project);
-						}else {
+							if (allowedProjectCodes.contains(project.getCodeName()))
+								filteredProjects.add(project);
+						} else {
 							filteredProjects.add(project);
 						}
 					}
 				}
 				projectThings.addAll(filteredProjects);
-			}else{
+			} else {
 				projectThings.addAll(allProjects);
 			}
 		}
@@ -166,32 +167,36 @@ public Collection<LsThing> getUserProjects(String userName	){
 	}
 
 	@Override
-	public AuthGroupsAndProjectsDTO getAuthGroupsAndProjects(){
+	public AuthGroupsAndProjectsDTO getAuthGroupsAndProjects() {
 		AuthGroupsAndProjectsDTO agp = new AuthGroupsAndProjectsDTO();
 		Collection<AuthProjectGroupsDTO> authProjectsGroups = new ArrayList<AuthProjectGroupsDTO>();
-		Collection<AuthGroupsDTO> authGroups = new HashSet<AuthGroupsDTO>() ;
+		Collection<AuthGroupsDTO> authGroups = new HashSet<AuthGroupsDTO>();
 		List<LsRole> allRoles = LsRole.findAllLsRoles();
 		AuthGroupsDTO ag;
 		Collection<String> members;
 
-		for (LsRole lsRole : allRoles){
+		for (LsRole lsRole : allRoles) {
 			ag = new AuthGroupsDTO();
 			members = new HashSet<String>();
-			ag.setName(new StringBuilder().append(lsRole.getLsType()).append("_").append(lsRole.getLsKind()).append("_").append(lsRole.getRoleName()).toString());
+			ag.setName(new StringBuilder().append(lsRole.getLsType()).append("_").append(lsRole.getLsKind()).append("_")
+					.append(lsRole.getRoleName()).toString());
 			Set<AuthorRole> authorRoles = lsRole.getAuthorRoles();
-			for (AuthorRole authorRole : authorRoles){
+			for (AuthorRole authorRole : authorRoles) {
 				members.add(authorRole.getUserEntry().getUserName());
 			}
 			ag.setMembers(members);
 			logger.info(ag.toJson());
-			authGroups.add(ag);			
+			authGroups.add(ag);
 		}
 
-		//Collection<LsThing> 
-//		Collection<LsThing> projectCollection = LsThing.findLsThingsByLsTypeEqualsAndLsKindEquals("project", "project").getResultList();
-		List<LsThing> projectList = LsThing.findLsThingsByLsTypeEqualsAndLsKindEquals("project", "project").getResultList();
-		
-		Collection<LsThing> projectCollection = new ArrayList<LsThing>(projectList);		
+		// Collection<LsThing>
+		// Collection<LsThing> projectCollection =
+		// LsThing.findLsThingsByLsTypeEqualsAndLsKindEquals("project",
+		// "project").getResultList();
+		List<LsThing> projectList = LsThing.findLsThingsByLsTypeEqualsAndLsKindEquals("project", "project")
+				.getResultList();
+
+		Collection<LsThing> projectCollection = new ArrayList<LsThing>(projectList);
 		AuthProjectGroupsDTO authProjectGroup;
 		Collection<String> groups;
 		List<LsRole> projectRoles;
@@ -201,48 +206,58 @@ public AuthGroupsAndProjectsDTO getAuthGroupsAndProjects(){
 		boolean active = true;
 		boolean isRestricted = true;
 
-		for (LsThing project : projectCollection){
-			if (!project.isIgnored()){
-				projectRoles = LsRole.findLsRolesByLsTypeEqualsAndLsKindEquals("Project", project.getCodeName()).getResultList();
+		for (LsThing project : projectCollection) {
+			if (!project.isIgnored()) {
+				projectRoles = LsRole.findLsRolesByLsTypeEqualsAndLsKindEquals("Project", project.getCodeName())
+						.getResultList();
 				groups = new HashSet<String>();
-				for (LsRole projectRole : projectRoles){
-					groups.add(new StringBuilder().append(projectRole.getLsType()).append("_").append(projectRole.getLsKind()).append("_").append(projectRole.getRoleName()).toString());
+				for (LsRole projectRole : projectRoles) {
+					groups.add(new StringBuilder().append(projectRole.getLsType()).append("_")
+							.append(projectRole.getLsKind()).append("_").append(projectRole.getRoleName()).toString());
 				}
-				if (propertiesUtilService.getAcasAdminRole() !=null && propertiesUtilService.getAcasAdminRole().length()> 0){
-					List<LsRole> acasAdminRoles = LsRole.findLsRolesByRoleNameEquals(propertiesUtilService.getAcasAdminRole()).getResultList();
-					for (LsRole acasAdminRole : acasAdminRoles){
-						groups.add(new StringBuilder().append(acasAdminRole.getLsType()).append("_").append(acasAdminRole.getLsKind()).append("_").append(acasAdminRole.getRoleName()).toString());
+				if (propertiesUtilService.getAcasAdminRole() != null
+						&& propertiesUtilService.getAcasAdminRole().length() > 0) {
+					List<LsRole> acasAdminRoles = LsRole
+							.findLsRolesByRoleNameEquals(propertiesUtilService.getAcasAdminRole()).getResultList();
+					for (LsRole acasAdminRole : acasAdminRoles) {
+						groups.add(new StringBuilder().append(acasAdminRole.getLsType()).append("_")
+								.append(acasAdminRole.getLsKind()).append("_").append(acasAdminRole.getRoleName())
+								.toString());
 					}
 				}
 
 				projectLabels = project.getLsLabels();
-				for (LsThingLabel projectLabel : projectLabels){
-					if (!projectLabel.isIgnored()){
-						if (projectLabel.getLsType().equalsIgnoreCase("name")){
-							if (projectLabel.getLsKind().equalsIgnoreCase("Project Name")){
+				for (LsThingLabel projectLabel : projectLabels) {
+					if (!projectLabel.isIgnored()) {
+						if (projectLabel.getLsType().equalsIgnoreCase("name")) {
+							if (projectLabel.getLsKind().equalsIgnoreCase("Project Name")) {
 								projectName = projectLabel.getLabelText();
-							} else if (projectLabel.getLsKind().equalsIgnoreCase("Project Alias")){
+							} else if (projectLabel.getLsKind().equalsIgnoreCase("Project Alias")) {
 								projectAlias = projectLabel.getLabelText();
-							}						
+							}
 						}
 					}
 				}
-				for (LsThingState projectState : project.getLsStates()){
-					for (LsThingValue projectValue : projectState.getLsValues()){
-						if (!projectValue.isIgnored()){
-							if (projectValue.getLsKind().equalsIgnoreCase("project status")){
-								if (projectValue.getCodeValue().equalsIgnoreCase("Active")) active = true;
-								else if (projectValue.getCodeValue().equalsIgnoreCase("Inactive")) active = false;
-							}else if (projectValue.getLsKind().equalsIgnoreCase("is restricted")){
-								if (projectValue.getCodeValue().equalsIgnoreCase("true")) isRestricted = true;
-								else if (projectValue.getCodeValue().equalsIgnoreCase("false")) isRestricted = false;
+				for (LsThingState projectState : project.getLsStates()) {
+					for (LsThingValue projectValue : projectState.getLsValues()) {
+						if (!projectValue.isIgnored()) {
+							if (projectValue.getLsKind().equalsIgnoreCase("project status")) {
+								if (projectValue.getCodeValue().equalsIgnoreCase("Active"))
+									active = true;
+								else if (projectValue.getCodeValue().equalsIgnoreCase("Inactive"))
+									active = false;
+							} else if (projectValue.getLsKind().equalsIgnoreCase("is restricted")) {
+								if (projectValue.getCodeValue().equalsIgnoreCase("true"))
+									isRestricted = true;
+								else if (projectValue.getCodeValue().equalsIgnoreCase("false"))
+									isRestricted = false;
 							}
 						}
 					}
 				}
 
 				authProjectGroup = new AuthProjectGroupsDTO();
-				authProjectGroup.setId(project.getId());				
+				authProjectGroup.setId(project.getId());
 				authProjectGroup.setCode(project.getCodeName());
 				authProjectGroup.setName(projectName);
 				authProjectGroup.setAlias(projectAlias);
@@ -266,7 +281,7 @@ public CodeTableDTO getProjectCodeTable(LsThing project) {
 		CodeTableDTO codeTable = new CodeTableDTO();
 		logger.debug("current project: " + project.getCodeName());
 		Set<LsThingLabel> projectLabels = project.getLsLabels();
-		for (LsThingLabel projectLabel : projectLabels){
+		for (LsThingLabel projectLabel : projectLabels) {
 			logger.debug(projectLabel.getLabelText());
 		}
 		codeTable.setName(LsThingLabel.pickBestLabel(project.getLsLabels()).getLabelText());
@@ -275,7 +290,6 @@ public CodeTableDTO getProjectCodeTable(LsThing project) {
 		return codeTable;
 	}
 
-
 	@Override
 	public List<CodeTableDTO> convertProjectsToCodeTables(Collection<LsThing> projects) {
 		List<CodeTableDTO> codeTableList = new ArrayList<CodeTableDTO>();
@@ -283,34 +297,36 @@ public List<CodeTableDTO> convertProjectsToCodeTables(Collection<LsThing> projec
 			CodeTableDTO codeTable = getProjectCodeTable(project);
 			codeTableList.add(codeTable);
 		}
-		return codeTableList;	
+		return codeTableList;
 	}
 
-
 	@Override
 	public Collection<Author> findAuthorsByRoleTypeAndRoleKindAndRoleName(
 			String roleType, String roleKind, String roleName) {
-		List<LsRole> roleEntries = LsRole.findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals(roleType, roleKind, roleName).getResultList();
+		List<LsRole> roleEntries = LsRole
+				.findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals(roleType, roleKind, roleName)
+				.getResultList();
 		Collection<Author> authors = new HashSet<Author>();
-		for (LsRole roleEntry : roleEntries){
+		for (LsRole roleEntry : roleEntries) {
 			Collection<AuthorRole> authorRoles = AuthorRole.findAuthorRolesByRoleEntry(roleEntry).getResultList();
-			for (AuthorRole authorRole : authorRoles){
+			for (AuthorRole authorRole : authorRoles) {
 				authors.add(authorRole.getUserEntry());
-			}	
+			}
 		}
 		return authors;
 	}
-	
+
 	@Override
 	@Transactional
 	public Author signupAuthor(Author author) {
 		Random random = new Random(System.currentTimeMillis());
 		String activationKey = "activationKey:" + random.nextInt();
-		if (logger.isDebugEnabled()) logger.debug("activation key is :" + activationKey);
+		if (logger.isDebugEnabled())
+			logger.debug("activation key is :" + activationKey);
 		author.setActivationKey(activationKey);
 		author.setEnabled(false);
 		author.setLocked(false);
-		
+
 		String randomPassword = generateRandomPassword();
 		author.setPassword(randomPassword);
 		String encryptedPassword = null;
@@ -322,24 +338,29 @@ public Author signupAuthor(Author author) {
 		} catch (UnsupportedEncodingException e1) {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
-		} 
+		}
 		author.setPassword(encryptedPassword);
-		
-		author = saveAuthor(author);		
-		
+
+		author = saveAuthor(author);
+
 		SimpleMailMessage mail = new SimpleMailMessage();
 		mail.setTo(author.getEmailAddress());
 		mail.setSubject("User Activation");
-		if(propertiesUtilService.getEmailFromAddress() != null && !propertiesUtilService.getEmailFromAddress().equals("") ) mail.setFrom(propertiesUtilService.getEmailFromAddress());
-		
-		mail.setText("Hi "+ author.getFirstName() + ",\nPlease click on the following link to activate your ACAS account: " + propertiesUtilService.getClientPath()+"/activateUser?emailAddress="+author.getEmailAddress()+"&activate="+activationKey +""
-				+ "\n Your username is: "+author.getUserName()
-				+ "\n Your temporary password is: "+randomPassword );
-		
-		try{
+		if (propertiesUtilService.getEmailFromAddress() != null
+				&& !propertiesUtilService.getEmailFromAddress().equals(""))
+			mail.setFrom(propertiesUtilService.getEmailFromAddress());
+
+		mail.setText(
+				"Hi " + author.getFirstName() + ",\nPlease click on the following link to activate your ACAS account: "
+						+ propertiesUtilService.getClientPath() + "/activateUser?emailAddress="
+						+ author.getEmailAddress() + "&activate=" + activationKey + ""
+						+ "\n Your username is: " + author.getUserName()
+						+ "\n Your temporary password is: " + randomPassword);
+
+		try {
 			mailSender.send(mail);
-		}catch (Exception e){
-			logger.error("Caught exception trying to send email. ",e);
+		} catch (Exception e) {
+			logger.error("Caught exception trying to send email. ", e);
 		}
 
 		return author;
@@ -348,50 +369,61 @@ public Author signupAuthor(Author author) {
 	@Override
 	@Transactional
 	public Author saveAuthor(Author author) {
-		if (logger.isDebugEnabled()) logger.debug("incoming meta author: " + author.toJson() + "\n");
+		if (logger.isDebugEnabled())
+			logger.debug("incoming meta author: " + author.toJson() + "\n");
 		Author newAuthor = new Author(author);
-		if (newAuthor.getCodeName() == null){
+		if (newAuthor.getCodeName() == null) {
 			newAuthor.setCodeName(autoLabelService.getAuthorCodeName());
 		}
-		if (newAuthor.getLsType() == null) newAuthor.setLsType("default");
-		if (newAuthor.getLsKind() == null) newAuthor.setLsKind("default");
-		if (newAuthor.getLsTypeAndKind() == null) newAuthor.setLsTypeAndKind(newAuthor.getLsType()+"_"+newAuthor.getLsKind());
+		if (newAuthor.getLsType() == null)
+			newAuthor.setLsType("default");
+		if (newAuthor.getLsKind() == null)
+			newAuthor.setLsKind("default");
+		if (newAuthor.getLsTypeAndKind() == null)
+			newAuthor.setLsTypeAndKind(newAuthor.getLsType() + "_" + newAuthor.getLsKind());
 		newAuthor.persist();
-		if (author.getLsLabels() != null){
+		if (author.getLsLabels() != null) {
 			Set<AuthorLabel> lsLabels = new HashSet<AuthorLabel>();
-			for(AuthorLabel authorLabel : author.getLsLabels()){
+			for (AuthorLabel authorLabel : author.getLsLabels()) {
 				AuthorLabel newAuthorLabel = new AuthorLabel(authorLabel);
 				newAuthorLabel.setAuthor(newAuthor);
-				if (logger.isDebugEnabled()) logger.debug("here is the newAuthorLabel before save: " + newAuthorLabel.toJson());
+				if (logger.isDebugEnabled())
+					logger.debug("here is the newAuthorLabel before save: " + newAuthorLabel.toJson());
 				newAuthorLabel.persist();
 				lsLabels.add(newAuthorLabel);
 			}
 			newAuthor.setLsLabels(lsLabels);
 		} else {
-			if (logger.isDebugEnabled()) logger.debug("No author labels to save");	
+			if (logger.isDebugEnabled())
+				logger.debug("No author labels to save");
 		}
 
-		if (author.getLsStates() != null){
+		if (author.getLsStates() != null) {
 			Set<AuthorState> lsStates = new HashSet<AuthorState>();
-			for(AuthorState lsState : author.getLsStates()){
+			for (AuthorState lsState : author.getLsStates()) {
 				AuthorState newLsState = new AuthorState(lsState);
 				newLsState.setAuthor(newAuthor);
-				if (logger.isDebugEnabled()) logger.debug("here is the newLsState before save: " + newLsState.toJson());
+				if (logger.isDebugEnabled())
+					logger.debug("here is the newLsState before save: " + newLsState.toJson());
 				newLsState.persist();
-				if (logger.isDebugEnabled()) logger.debug("persisted the newLsState: " + newLsState.toJson());
-				if (lsState.getLsValues() != null){
+				if (logger.isDebugEnabled())
+					logger.debug("persisted the newLsState: " + newLsState.toJson());
+				if (lsState.getLsValues() != null) {
 					Set<AuthorValue> lsValues = new HashSet<AuthorValue>();
-					for(AuthorValue authorValue : lsState.getLsValues()){
-						if (logger.isDebugEnabled()) logger.debug("authorValue: " + authorValue.toJson());
+					for (AuthorValue authorValue : lsState.getLsValues()) {
+						if (logger.isDebugEnabled())
+							logger.debug("authorValue: " + authorValue.toJson());
 						AuthorValue newAuthorValue = AuthorValue.create(authorValue);
 						newAuthorValue.setLsState(newLsState);
 						newAuthorValue.persist();
 						lsValues.add(newAuthorValue);
-						if (logger.isDebugEnabled()) logger.debug("persisted the authorValue: " + newAuthorValue.toJson());
+						if (logger.isDebugEnabled())
+							logger.debug("persisted the authorValue: " + newAuthorValue.toJson());
 					}
 					newLsState.setLsValues(lsValues);
 				} else {
-					if (logger.isDebugEnabled()) logger.debug("No author values to save");
+					if (logger.isDebugEnabled())
+						logger.debug("No author values to save");
 				}
 				lsStates.add(newLsState);
 			}
@@ -401,14 +433,13 @@ public Author saveAuthor(Author author) {
 		return Author.findAuthor(newAuthor.getId());
 	}
 
-
 	@Override
 	public Author updateAuthor(Author author) {
 		logger.info("incoming meta author: " + author.toJson() + "\n");
 		Author updatedAuthor = Author.update(author);
-		if (author.getLsLabels() != null){
-			for(AuthorLabel authorLabel : author.getLsLabels()){
-				if (authorLabel.getId() == null){
+		if (author.getLsLabels() != null) {
+			for (AuthorLabel authorLabel : author.getLsLabels()) {
+				if (authorLabel.getId() == null) {
 					AuthorLabel newAuthorLabel = new AuthorLabel(authorLabel);
 					newAuthorLabel.setAuthor(updatedAuthor);
 					newAuthorLabel.persist();
@@ -417,50 +448,56 @@ public Author updateAuthor(Author author) {
 					AuthorLabel updatedLabel = AuthorLabel.update(authorLabel);
 					updatedAuthor.getLsLabels().add(updatedLabel);
 				}
-			}	
+			}
 		} else {
-			logger.info("No author labels to update");	
+			logger.info("No author labels to update");
 		}
 		updateLsStates(author, updatedAuthor);
 		return Author.findAuthor(updatedAuthor.getId());
 	}
 
-	public void updateLsStates(Author jsonAuthor, Author updatedAuthor){
-		if(jsonAuthor.getLsStates() != null){
-			for(AuthorState lsThingState : jsonAuthor.getLsStates()){
+	public void updateLsStates(Author jsonAuthor, Author updatedAuthor) {
+		if (jsonAuthor.getLsStates() != null) {
+			for (AuthorState lsThingState : jsonAuthor.getLsStates()) {
 				AuthorState updatedAuthorState;
-				if (lsThingState.getId() == null){
+				if (lsThingState.getId() == null) {
 					updatedAuthorState = new AuthorState(lsThingState);
 					updatedAuthorState.setAuthor(updatedAuthor);
 					updatedAuthorState.persist();
 					updatedAuthor.getLsStates().add(updatedAuthorState);
-					if (logger.isDebugEnabled()) logger.debug("persisted new lsThing state " + updatedAuthorState.getId());
+					if (logger.isDebugEnabled())
+						logger.debug("persisted new lsThing state " + updatedAuthorState.getId());
 
 				} else {
 					updatedAuthorState = AuthorState.update(lsThingState);
 					updatedAuthor.getLsStates().add(updatedAuthorState);
 
-					if (logger.isDebugEnabled()) logger.debug("updated lsThing state " + updatedAuthorState.getId());
+					if (logger.isDebugEnabled())
+						logger.debug("updated lsThing state " + updatedAuthorState.getId());
 
 				}
-				if (lsThingState.getLsValues() != null){
-					for(AuthorValue lsThingValue : lsThingState.getLsValues()){
-						if (lsThingValue.getLsState() == null) lsThingValue.setLsState(updatedAuthorState);
+				if (lsThingState.getLsValues() != null) {
+					for (AuthorValue lsThingValue : lsThingState.getLsValues()) {
+						if (lsThingValue.getLsState() == null)
+							lsThingValue.setLsState(updatedAuthorState);
 						AuthorValue updatedAuthorValue;
-						if (lsThingValue.getId() == null){
+						if (lsThingValue.getId() == null) {
 							updatedAuthorValue = AuthorValue.create(lsThingValue);
 							updatedAuthorValue.setLsState(AuthorState.findAuthorState(updatedAuthorState.getId()));
 							updatedAuthorValue.persist();
 							updatedAuthorState.getLsValues().add(updatedAuthorValue);
 						} else {
 							updatedAuthorValue = AuthorValue.update(lsThingValue);
-							if (logger.isDebugEnabled()) logger.debug("updated lsThing value " + updatedAuthorValue.getId());
+							if (logger.isDebugEnabled())
+								logger.debug("updated lsThing value " + updatedAuthorValue.getId());
 						}
-						if (logger.isDebugEnabled()) logger.debug("checking lsThingValue " + updatedAuthorValue.toJson());
+						if (logger.isDebugEnabled())
+							logger.debug("checking lsThingValue " + updatedAuthorValue.toJson());
 
-					}	
+					}
 				} else {
-					if (logger.isDebugEnabled()) logger.debug("No lsThing values to update");
+					if (logger.isDebugEnabled())
+						logger.debug("No lsThing values to update");
 				}
 			}
 		}
@@ -469,150 +506,160 @@ public void updateLsStates(Author jsonAuthor, Author updatedAuthor){
 	@Override
 	public Author getOrCreateAuthor(Author author) {
 		String userName = author.getUserName();
-		try{
+		try {
 			Author foundAuthor = Author.findAuthorsByUserName(userName).getSingleResult();
 			return foundAuthor;
-		}catch(NoResultException e){
-			logger.debug("Author "+userName+" not found. Creating new author");
+		} catch (NoResultException e) {
+			logger.debug("Author " + userName + " not found. Creating new author");
 			return saveAuthor(author);
 		}
 	}
-	
+
 	@Override
-	public Collection<Author> getAuthorsByIds(Collection<Long> authorIds){
+	public Collection<Author> getAuthorsByIds(Collection<Long> authorIds) {
 		Collection<Author> authors = new ArrayList<Author>();
-		for (Long id : authorIds){
+		for (Long id : authorIds) {
 			authors.add(Author.findAuthor(id));
 		}
 		return authors;
 	}
-	
+
 	@Override
-	public Collection<Long> searchAuthorIdsByQueryDTO(AuthorQueryDTO query) throws Exception{
-		List<Long> authorIdList = new ArrayList<Long>();	
+	public Collection<Long> searchAuthorIdsByQueryDTO(AuthorQueryDTO query) throws Exception {
+		List<Long> authorIdList = new ArrayList<Long>();
 		EntityManager em = Author.entityManager();
 		CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
 		CriteriaQuery<Long> criteria = criteriaBuilder.createQuery(Long.class);
 		Root<Author> thing = criteria.from(Author.class);
 		List<Predicate> predicateList = buildPredicatesForQueryDTO(criteriaBuilder, criteria, thing, query);
-		if (query.getLsType() != null){
+		if (query.getLsType() != null) {
 			Predicate thingType = criteriaBuilder.equal(thing.<String>get("lsType"), query.getLsType());
 			predicateList.add(thingType);
 		}
-		if (query.getLsKind() != null){
+		if (query.getLsKind() != null) {
 			Predicate thingKind = criteriaBuilder.equal(thing.<String>get("lsKind"), query.getLsKind());
 			predicateList.add(thingKind);
 		}
 		Predicate[] predicates = new Predicate[0];
-		//gather all predicates
+		// gather all predicates
 		predicates = predicateList.toArray(predicates);
 		criteria.where(criteriaBuilder.and(predicates));
 		TypedQuery<Long> q = em.createQuery(criteria);
 		logger.debug(q.unwrap(org.hibernate.Query.class).getQueryString());
 		authorIdList = q.getResultList();
-		logger.debug("Found "+authorIdList.size()+" results.");
+		logger.debug("Found " + authorIdList.size() + " results.");
 		return authorIdList;
 	}
-	
-	private List<Predicate> buildPredicatesForQueryDTO(CriteriaBuilder criteriaBuilder, CriteriaQuery<Long> criteria, Root<Author> thing, AuthorQueryDTO query) throws Exception{
-		
+
+	private List<Predicate> buildPredicatesForQueryDTO(CriteriaBuilder criteriaBuilder, CriteriaQuery<Long> criteria,
+			Root<Author> thing, AuthorQueryDTO query) throws Exception {
+
 		criteria.select(thing.<Long>get("id"));
 		criteria.distinct(true);
 		List<Predicate> predicateList = new ArrayList<Predicate>();
-		//root author properties
-		
-		//recordedDates
-		if (query.getRecordedDateGreaterThan() != null && query.getRecordedDateLessThan() != null){
-			try{
-				Predicate createdDateBetween = criteriaBuilder.between(thing.<Date>get("recordedDate"), query.getRecordedDateGreaterThan(), query.getRecordedDateLessThan());
+		// root author properties
+
+		// recordedDates
+		if (query.getRecordedDateGreaterThan() != null && query.getRecordedDateLessThan() != null) {
+			try {
+				Predicate createdDateBetween = criteriaBuilder.between(thing.<Date>get("recordedDate"),
+						query.getRecordedDateGreaterThan(), query.getRecordedDateLessThan());
 				predicateList.add(createdDateBetween);
-			}catch (Exception e){
-				logger.error("Caught exception trying to parse "+query.getRecordedDateGreaterThan()+" or "+query.getRecordedDateLessThan()+" as a date.",e);
-				throw new Exception("Caught exception trying to parse "+query.getRecordedDateGreaterThan()+" or "+query.getRecordedDateLessThan()+" as a date.",e);
+			} catch (Exception e) {
+				logger.error("Caught exception trying to parse " + query.getRecordedDateGreaterThan() + " or "
+						+ query.getRecordedDateLessThan() + " as a date.", e);
+				throw new Exception("Caught exception trying to parse " + query.getRecordedDateGreaterThan() + " or "
+						+ query.getRecordedDateLessThan() + " as a date.", e);
 			}
-		}
-		else if (query.getRecordedDateGreaterThan() != null){
-			try{
-				Predicate createdDateFrom = criteriaBuilder.greaterThanOrEqualTo(thing.<Date>get("recordedDate"), query.getRecordedDateGreaterThan());
+		} else if (query.getRecordedDateGreaterThan() != null) {
+			try {
+				Predicate createdDateFrom = criteriaBuilder.greaterThanOrEqualTo(thing.<Date>get("recordedDate"),
+						query.getRecordedDateGreaterThan());
 				predicateList.add(createdDateFrom);
-			}catch (Exception e){
-				logger.error("Caught exception trying to parse "+query.getRecordedDateGreaterThan()+" as a date.",e);
-				throw new Exception("Caught exception trying to parse "+query.getRecordedDateGreaterThan()+" as a date.",e);
+			} catch (Exception e) {
+				logger.error("Caught exception trying to parse " + query.getRecordedDateGreaterThan() + " as a date.",
+						e);
+				throw new Exception(
+						"Caught exception trying to parse " + query.getRecordedDateGreaterThan() + " as a date.", e);
 			}
-		}
-		else if (query.getRecordedDateLessThan() != null){
-			try{
-				Predicate createdDateTo = criteriaBuilder.lessThanOrEqualTo(thing.<Date>get("recordedDate"), query.getRecordedDateLessThan());
+		} else if (query.getRecordedDateLessThan() != null) {
+			try {
+				Predicate createdDateTo = criteriaBuilder.lessThanOrEqualTo(thing.<Date>get("recordedDate"),
+						query.getRecordedDateLessThan());
 				predicateList.add(createdDateTo);
-			}catch (Exception e){
-				logger.error("Caught exception trying to parse "+query.getRecordedDateLessThan()+" as a date.",e);
-				throw new Exception("Caught exception trying to parse "+query.getRecordedDateLessThan()+" as a date.",e);
+			} catch (Exception e) {
+				logger.error("Caught exception trying to parse " + query.getRecordedDateLessThan() + " as a date.", e);
+				throw new Exception(
+						"Caught exception trying to parse " + query.getRecordedDateLessThan() + " as a date.", e);
 			}
 		}
-		if (query.getRecordedBy() != null){
-			Predicate recordedBy = criteriaBuilder.like(thing.<String>get("recordedBy"), '%'+query.getRecordedBy()+'%');
+		if (query.getRecordedBy() != null) {
+			Predicate recordedBy = criteriaBuilder.like(thing.<String>get("recordedBy"),
+					'%' + query.getRecordedBy() + '%');
 			predicateList.add(recordedBy);
 		}
-		if (query.getFirstName() != null){
-			Predicate firstName = criteriaBuilder.like(thing.<String>get("firstName"), '%'+query.getFirstName()+'%');
+		if (query.getFirstName() != null) {
+			Predicate firstName = criteriaBuilder.like(thing.<String>get("firstName"),
+					'%' + query.getFirstName() + '%');
 			predicateList.add(firstName);
 		}
-		if (query.getLastName() != null){
-			Predicate lastName = criteriaBuilder.like(thing.<String>get("lastName"), '%'+query.getLastName()+'%');
+		if (query.getLastName() != null) {
+			Predicate lastName = criteriaBuilder.like(thing.<String>get("lastName"), '%' + query.getLastName() + '%');
 			predicateList.add(lastName);
 		}
-		if (query.getUserName() != null){
-			Predicate userName = criteriaBuilder.like(thing.<String>get("userName"), '%'+query.getUserName()+'%');
+		if (query.getUserName() != null) {
+			Predicate userName = criteriaBuilder.like(thing.<String>get("userName"), '%' + query.getUserName() + '%');
 			predicateList.add(userName);
 		}
-		
-		//values
-		if (query.getValues() != null){
-			for (ValueQueryDTO valueQuery : query.getValues()){
+
+		// values
+		if (query.getValues() != null) {
+			for (ValueQueryDTO valueQuery : query.getValues()) {
 				List<Predicate> valuePredicatesList = new ArrayList<Predicate>();
 				Join<Author, AuthorState> state = thing.join("lsStates");
 				Join<AuthorState, AuthorValue> value = state.join("lsValues");
-				
+
 				Predicate stateNotIgn = criteriaBuilder.isFalse(state.<Boolean>get("ignored"));
 				Predicate valueNotIgn = criteriaBuilder.isFalse(value.<Boolean>get("ignored"));
 				valuePredicatesList.add(stateNotIgn);
 				valuePredicatesList.add(valueNotIgn);
-				
-				if (valueQuery.getStateType() != null){
-					Predicate stateType = criteriaBuilder.equal(state.<String>get("lsType"),valueQuery.getStateType());
+
+				if (valueQuery.getStateType() != null) {
+					Predicate stateType = criteriaBuilder.equal(state.<String>get("lsType"), valueQuery.getStateType());
 					valuePredicatesList.add(stateType);
 				}
-				if (valueQuery.getStateKind() != null){
-					Predicate stateKind = criteriaBuilder.equal(state.<String>get("lsKind"),valueQuery.getStateKind());
+				if (valueQuery.getStateKind() != null) {
+					Predicate stateKind = criteriaBuilder.equal(state.<String>get("lsKind"), valueQuery.getStateKind());
 					valuePredicatesList.add(stateKind);
 				}
-				if (valueQuery.getValueType() != null){
-					Predicate valueType = criteriaBuilder.equal(value.<String>get("lsType"),valueQuery.getValueType());
+				if (valueQuery.getValueType() != null) {
+					Predicate valueType = criteriaBuilder.equal(value.<String>get("lsType"), valueQuery.getValueType());
 					valuePredicatesList.add(valueType);
 				}
-				if (valueQuery.getValueKind() != null){
-					Predicate valueKind = criteriaBuilder.equal(value.<String>get("lsKind"),valueQuery.getValueKind());
+				if (valueQuery.getValueKind() != null) {
+					Predicate valueKind = criteriaBuilder.equal(value.<String>get("lsKind"), valueQuery.getValueKind());
 					valuePredicatesList.add(valueKind);
 				}
-				if (valueQuery.getValue() != null){
-					if (valueQuery.getValueType() == null){
+				if (valueQuery.getValue() != null) {
+					if (valueQuery.getValueType() == null) {
 						logger.error("valueType must be specified if value is specified!");
 						throw new Exception("valueType must be specified if value is specified!");
-					}else if (valueQuery.getValueType().equalsIgnoreCase("dateValue")){
+					} else if (valueQuery.getValueType().equalsIgnoreCase("dateValue")) {
 						String postgresTimeUnit = "day";
-						Expression<Date> dateTruncExpr = criteriaBuilder.function("date_trunc", Date.class, criteriaBuilder.literal(postgresTimeUnit), value.<Date>get("dateValue"));
+						Expression<Date> dateTruncExpr = criteriaBuilder.function("date_trunc", Date.class,
+								criteriaBuilder.literal(postgresTimeUnit), value.<Date>get("dateValue"));
 						Calendar cal = Calendar.getInstance(); // locale-specific
 						boolean parsedTime = false;
-						if (SimpleUtil.isNumeric(valueQuery.getValue())){
+						if (SimpleUtil.isNumeric(valueQuery.getValue())) {
 							cal.setTimeInMillis(Long.valueOf(valueQuery.getValue()));
 							parsedTime = true;
-						}else{
-							try{
+						} else {
+							try {
 								SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH);
 								cal.setTime(sdf.parse(valueQuery.getValue()));
 								parsedTime = true;
-							}catch (Exception e){
-								logger.warn("Failed to parse date in Author generic query for value",e);
+							} catch (Exception e) {
+								logger.warn("Failed to parse date in Author generic query for value", e);
 							}
 						}
 						cal.set(Calendar.HOUR_OF_DAY, 0);
@@ -622,38 +669,42 @@ else if (query.getRecordedDateLessThan() != null){
 						long time = cal.getTimeInMillis();
 						Date queryDate = new Date(time);
 						Predicate valueLike = criteriaBuilder.equal(dateTruncExpr, queryDate);
-						if (parsedTime) valuePredicatesList.add(valueLike);
-					}else{
-						//only works with string value types: stringValue, codeValue, fileValue, clobValue
-						Predicate valueLike = criteriaBuilder.like(value.<String>get(valueQuery.getValueType()), '%' + valueQuery.getValue() + '%');
+						if (parsedTime)
+							valuePredicatesList.add(valueLike);
+					} else {
+						// only works with string value types: stringValue, codeValue, fileValue,
+						// clobValue
+						Predicate valueLike = criteriaBuilder.like(value.<String>get(valueQuery.getValueType()),
+								'%' + valueQuery.getValue() + '%');
 						valuePredicatesList.add(valueLike);
 					}
 				}
-				//gather predicates with AND
+				// gather predicates with AND
 				Predicate[] valuePredicates = new Predicate[0];
 				valuePredicates = valuePredicatesList.toArray(valuePredicates);
 				predicateList.add(criteriaBuilder.and(valuePredicates));
 			}
 		}
-		
-		//labels
-		if (query.getLabels() != null){
-			for (LabelQueryDTO queryLabel : query.getLabels()){
+
+		// labels
+		if (query.getLabels() != null) {
+			for (LabelQueryDTO queryLabel : query.getLabels()) {
 				Join<Author, AuthorLabel> label = thing.join("lsLabels");
 				List<Predicate> labelPredicatesList = new ArrayList<Predicate>();
-				if (queryLabel.getLabelType() != null){
+				if (queryLabel.getLabelType() != null) {
 					Predicate labelType = criteriaBuilder.equal(label.<String>get("lsType"), queryLabel.getLabelType());
 					labelPredicatesList.add(labelType);
 				}
-				if (queryLabel.getLabelKind() != null){
+				if (queryLabel.getLabelKind() != null) {
 					Predicate labelKind = criteriaBuilder.equal(label.<String>get("lsKind"), queryLabel.getLabelKind());
 					labelPredicatesList.add(labelKind);
 				}
-				if (queryLabel.getLabelText() != null){
-					Predicate labelText = criteriaBuilder.like(label.<String>get("labelText"), '%'+queryLabel.getLabelText()+'%');
+				if (queryLabel.getLabelText() != null) {
+					Predicate labelText = criteriaBuilder.like(label.<String>get("labelText"),
+							'%' + queryLabel.getLabelText() + '%');
 					labelPredicatesList.add(labelText);
 				}
-				//gather labels
+				// gather labels
 				Predicate[] labelPredicates = new Predicate[0];
 				labelPredicates = labelPredicatesList.toArray(labelPredicates);
 				predicateList.add(criteriaBuilder.and(labelPredicates));
@@ -662,60 +713,61 @@ else if (query.getRecordedDateLessThan() != null){
 		return predicateList;
 	}
 
-
 	@Override
 	public Collection<Long> searchAuthorIdsByBrowserQueryDTO(
-			AuthorBrowserQueryDTO query) throws Exception{
-		List<Long> authorIdList = new ArrayList<Long>();	
+			AuthorBrowserQueryDTO query) throws Exception {
+		List<Long> authorIdList = new ArrayList<Long>();
 		EntityManager em = Author.entityManager();
 		CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
 		CriteriaQuery<Long> criteria = criteriaBuilder.createQuery(Long.class);
 		Root<Author> thing = criteria.from(Author.class);
 		List<Predicate> metaPredicateList = new ArrayList<Predicate>();
-		//split query string into terms
+		// split query string into terms
 		String queryString = query.getQueryString().replaceAll("\\*", "%");
 		List<String> splitQuery = SimpleUtil.splitSearchString(queryString);
 		logger.debug("Number of search terms: " + splitQuery.size());
-		//for each search term, construct a queryDTO with that term filled in every search position of the passed in queryDTO
-		for (String searchTerm : splitQuery){
+		// for each search term, construct a queryDTO with that term filled in every
+		// search position of the passed in queryDTO
+		for (String searchTerm : splitQuery) {
 			AuthorQueryDTO queryDTO = new AuthorQueryDTO(query.getQueryDTO());
-			if (queryDTO.getValues() != null){
-				for (ValueQueryDTO value : queryDTO.getValues()){
+			if (queryDTO.getValues() != null) {
+				for (ValueQueryDTO value : queryDTO.getValues()) {
 					value.setValue(searchTerm);
 				}
 			}
-			if (queryDTO.getLabels() != null){
-				for (LabelQueryDTO label : queryDTO.getLabels()){
+			if (queryDTO.getLabels() != null) {
+				for (LabelQueryDTO label : queryDTO.getLabels()) {
 					label.setLabelText(searchTerm);
 				}
 			}
 			queryDTO.setFirstName(searchTerm);
 			queryDTO.setLastName(searchTerm);
 			queryDTO.setUserName(searchTerm);
-			//get a list of predicates for that queryDTO, OR them all together, then add to the meta list
+			// get a list of predicates for that queryDTO, OR them all together, then add to
+			// the meta list
 			List<Predicate> predicateList = buildPredicatesForQueryDTO(criteriaBuilder, criteria, thing, queryDTO);
 			Predicate[] predicates = new Predicate[0];
 			predicates = predicateList.toArray(predicates);
 			Predicate searchTermPredicate = criteriaBuilder.or(predicates);
 			metaPredicateList.add(searchTermPredicate);
 		}
-		//add in thingType and thingKind as required at top level
-		if (query.getQueryDTO().getLsType() != null){
+		// add in thingType and thingKind as required at top level
+		if (query.getQueryDTO().getLsType() != null) {
 			Predicate thingType = criteriaBuilder.equal(thing.<String>get("lsType"), query.getQueryDTO().getLsType());
 			metaPredicateList.add(thingType);
 		}
-		if (query.getQueryDTO().getLsKind() != null){
+		if (query.getQueryDTO().getLsKind() != null) {
 			Predicate thingKind = criteriaBuilder.equal(thing.<String>get("lsKind"), query.getQueryDTO().getLsKind());
 			metaPredicateList.add(thingKind);
 		}
-		//gather the predicates for each search term, and AND them all together
+		// gather the predicates for each search term, and AND them all together
 		Predicate[] metaPredicates = new Predicate[0];
 		metaPredicates = metaPredicateList.toArray(metaPredicates);
 		criteria.where(criteriaBuilder.and(metaPredicates));
 		TypedQuery<Long> q = em.createQuery(criteria);
 		logger.debug(q.unwrap(org.hibernate.Query.class).getQueryString());
 		authorIdList = q.getResultList();
-		logger.debug("Found "+authorIdList.size()+" results.");
+		logger.debug("Found " + authorIdList.size() + " results.");
 		return authorIdList;
 	}
 
@@ -724,23 +776,24 @@ public Collection<Long> searchAuthorIdsByBrowserQueryDTO(
 	private String generateRandomPassword() {
 		return RandomStringUtils.randomAlphanumeric(temporaryPasswordLength);
 	}
-	
+
 	@Override
-	public void changePassword(Author author, String currentPassword, String newPassword, String newPasswordAgain) throws Exception {
+	public void changePassword(Author author, String currentPassword, String newPassword, String newPasswordAgain)
+			throws Exception {
 		String storedPassword = author.getPassword();
-			
-			String encryptedPassword = null;
-			try {
-				encryptedPassword = DatabaseAuthenticationProvider.getBase64ShaHash(currentPassword);
-			} catch (NoSuchAlgorithmException e1) {
-				// TODO Auto-generated catch block
-				e1.printStackTrace();
-			} catch (UnsupportedEncodingException e1) {
-				// TODO Auto-generated catch block
-				e1.printStackTrace();
-			} catch (Exception e){
-				logger.error("exception checking user password for change password",e);
-			}			
+
+		String encryptedPassword = null;
+		try {
+			encryptedPassword = DatabaseAuthenticationProvider.getBase64ShaHash(currentPassword);
+		} catch (NoSuchAlgorithmException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		} catch (UnsupportedEncodingException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		} catch (Exception e) {
+			logger.error("exception checking user password for change password", e);
+		}
 		if (!storedPassword.equals(encryptedPassword)) {
 			throw new Exception("Current password is incorrect.");
 		}
@@ -756,17 +809,17 @@ public void changePassword(Author author, String currentPassword, String newPass
 		} catch (UnsupportedEncodingException e1) {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
-		} catch (Exception e){
-			logger.error("exception checking user password for change password",e);
+		} catch (Exception e) {
+			logger.error("exception checking user password for change password", e);
 		}
 		if (encryptedPassword.equals(encryptedNewPassword)) {
 			throw new Exception("New password cannot be the same as old password.");
 		}
-		//validation complete -> change the password
+		// validation complete -> change the password
 		author.setPassword(encryptedNewPassword);
 		author.merge();
 	}
-	
+
 	@Override
 	public void resetPassword(String emailAddress) {
 		Author foundAuthor = Author.findAuthorsByEmailAddress(emailAddress).getSingleResult();
@@ -780,18 +833,22 @@ public void resetPassword(String emailAddress) {
 		} catch (UnsupportedEncodingException e1) {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
-		} 
+		}
 		foundAuthor.setPassword(encryptedPassword);
-		
+
 		foundAuthor.merge();
 		SimpleMailMessage mail = new SimpleMailMessage();
 		mail.setTo(emailAddress);
-		if(propertiesUtilService.getEmailFromAddress() != null && !propertiesUtilService.getEmailFromAddress().equals("") ) mail.setFrom(propertiesUtilService.getEmailFromAddress());
+		if (propertiesUtilService.getEmailFromAddress() != null
+				&& !propertiesUtilService.getEmailFromAddress().equals(""))
+			mail.setFrom(propertiesUtilService.getEmailFromAddress());
 
 		mail.setSubject("ACAS Password Recovery");
-		mail.setText("Hi "+foundAuthor.getFirstName()+",\n"
-				+ "You recently requested for your password to be reset. Your temporary password is "+newPassword+"\n"
-				+ "Please login to ACAS here and change your password. "+ propertiesUtilService.getClientPath()+"/passwordChange");
+		mail.setText("Hi " + foundAuthor.getFirstName() + ",\n"
+				+ "You recently requested for your password to be reset. Your temporary password is " + newPassword
+				+ "\n"
+				+ "Please login to ACAS here and change your password. " + propertiesUtilService.getClientPath()
+				+ "/passwordChange");
 		mailSender.send(mail);
 	}
 
diff --git a/src/main/java/com/labsynch/labseer/service/AutoLabelService.java b/src/main/java/com/labsynch/labseer/service/AutoLabelService.java
index cbffe0fdc..01ac269de 100755
--- a/src/main/java/com/labsynch/labseer/service/AutoLabelService.java
+++ b/src/main/java/com/labsynch/labseer/service/AutoLabelService.java
@@ -12,12 +12,12 @@
 @Service
 public interface AutoLabelService {
 
-
 	List<AutoLabelDTO> getAutoLabels(String json) throws NonUniqueResultException;
-	
+
 	List<AutoLabelDTO> getAutoLabels(LabelSequenceDTO lsDTO) throws NonUniqueResultException;
 
-	List<AutoLabelDTO> getAutoLabels(String thingTypeAndKind, String labelTypeAndKind, Long numberOfLabels) throws NonUniqueResultException;
+	List<AutoLabelDTO> getAutoLabels(String thingTypeAndKind, String labelTypeAndKind, Long numberOfLabels)
+			throws NonUniqueResultException;
 
 	String getSubjectCodeName();
 
@@ -45,7 +45,4 @@ AutoLabelDTO getLastLabel(String thingTypeAndKind, String labelTypeAndKind)
 
 	String getLsThingCodeName(String lsTypeAndKind, String labelTypeAndKind);
 
-	
-	
-	
 }
diff --git a/src/main/java/com/labsynch/labseer/service/AutoLabelServiceImpl.java b/src/main/java/com/labsynch/labseer/service/AutoLabelServiceImpl.java
index 0d333a312..e1fe566f3 100755
--- a/src/main/java/com/labsynch/labseer/service/AutoLabelServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/AutoLabelServiceImpl.java
@@ -41,93 +41,112 @@ public List<AutoLabelDTO> getAutoLabels(String json) {
 
 		return getAutoLabels(lsDTO.getThingTypeAndKind(), lsDTO.getLabelTypeAndKind(), lsDTO.getNumberOfLabels());
 	}
-	
+
 	@Override
 	public List<AutoLabelDTO> getAutoLabels(LabelSequenceDTO lsDTO) {
 
 		logger.debug("incoming label seq: " + lsDTO.toJson());
 		if (lsDTO.getLabelPrefix() != null) {
-			return getAutoLabels(lsDTO.getThingTypeAndKind(), lsDTO.getLabelTypeAndKind(), lsDTO.getLabelPrefix(), lsDTO.getNumberOfLabels());
+			return getAutoLabels(lsDTO.getThingTypeAndKind(), lsDTO.getLabelTypeAndKind(), lsDTO.getLabelPrefix(),
+					lsDTO.getNumberOfLabels());
 		}
 
 		return getAutoLabels(lsDTO.getThingTypeAndKind(), lsDTO.getLabelTypeAndKind(), lsDTO.getNumberOfLabels());
 	}
-	
-	public List<AutoLabelDTO> getAutoLabels(String thingTypeAndKind, String labelTypeAndKind, String labelPrefix, Long numberOfLabels) throws NonUniqueResultException {
-		List<LabelSequence> labelSequences = LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals(thingTypeAndKind, labelTypeAndKind, labelPrefix).getResultList();
+
+	public List<AutoLabelDTO> getAutoLabels(String thingTypeAndKind, String labelTypeAndKind, String labelPrefix,
+			Long numberOfLabels) throws NonUniqueResultException {
+		List<LabelSequence> labelSequences = LabelSequence
+				.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEqualsAndLabelPrefixEquals(
+						thingTypeAndKind, labelTypeAndKind, labelPrefix)
+				.getResultList();
 		LabelSequence labelSequence;
-		if(labelSequences.size() == 0) {
-			logger.info("Label sequence does not exist! Create new Sequence if possible." + thingTypeAndKind + "  " + labelTypeAndKind);
+		if (labelSequences.size() == 0) {
+			logger.info("Label sequence does not exist! Create new Sequence if possible." + thingTypeAndKind + "  "
+					+ labelTypeAndKind);
 			labelSequence = createLabelSequence(thingTypeAndKind, labelTypeAndKind);
-			if (labelSequence == null){
+			if (labelSequence == null) {
 				throw new NoResultException();
 			}
 		} else if (labelSequences.size() > 1) {
 			logger.error("found duplicate sequences!!!");
 			throw new NonUniqueResultException();
 		} else {
-			labelSequence = LabelSequence.findLabelSequence(labelSequences.get(0).getId());           	
+			labelSequence = LabelSequence.findLabelSequence(labelSequences.get(0).getId());
 		}
 		return getAutoLabels(labelSequence, numberOfLabels);
 	}
 
 	@Override
-	public List<AutoLabelDTO> getAutoLabels(String thingTypeAndKind, String labelTypeAndKind, Long numberOfLabels) throws NonUniqueResultException {
+	public List<AutoLabelDTO> getAutoLabels(String thingTypeAndKind, String labelTypeAndKind, Long numberOfLabels)
+			throws NonUniqueResultException {
 
-		List<LabelSequence> labelSequences = LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(thingTypeAndKind, labelTypeAndKind).getResultList();
+		List<LabelSequence> labelSequences = LabelSequence
+				.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(thingTypeAndKind, labelTypeAndKind)
+				.getResultList();
 		LabelSequence labelSequence;
-		if(labelSequences.size() == 0) {
-			logger.info("Label sequence does not exist! Create new Sequence if possible." + thingTypeAndKind + "  " + labelTypeAndKind);
+		if (labelSequences.size() == 0) {
+			logger.info("Label sequence does not exist! Create new Sequence if possible." + thingTypeAndKind + "  "
+					+ labelTypeAndKind);
 			labelSequence = createLabelSequence(thingTypeAndKind, labelTypeAndKind);
-			if (labelSequence == null){
+			if (labelSequence == null) {
 				throw new NoResultException();
 			}
 		} else if (labelSequences.size() > 1) {
 			logger.error("found duplicate sequences!!!");
 			throw new NonUniqueResultException();
 		} else {
-			labelSequence = LabelSequence.findLabelSequence(labelSequences.get(0).getId());           	
+			labelSequence = LabelSequence.findLabelSequence(labelSequences.get(0).getId());
 		}
 		return getAutoLabels(labelSequence, numberOfLabels);
 	}
-	
-	private List<AutoLabelDTO> getAutoLabels(LabelSequence labelSequence, Long numberOfLabels){
+
+	private List<AutoLabelDTO> getAutoLabels(LabelSequence labelSequence, Long numberOfLabels) {
 		List<AutoLabelDTO> autoLabels = new ArrayList<AutoLabelDTO>();
 
-		if (labelSequence.getThingTypeAndKind().equalsIgnoreCase("document_subject") && labelSequence.getLabelTypeAndKind().equalsIgnoreCase("id_codeName")){
-			autoLabels = generateSubjectLabels(labelSequence, numberOfLabels);			
+		if (labelSequence.getThingTypeAndKind().equalsIgnoreCase("document_subject")
+				&& labelSequence.getLabelTypeAndKind().equalsIgnoreCase("id_codeName")) {
+			autoLabels = generateSubjectLabels(labelSequence, numberOfLabels);
 
-		} else if (labelSequence.getThingTypeAndKind().equalsIgnoreCase("document_treatment group") && labelSequence.getLabelTypeAndKind().equalsIgnoreCase("id_codeName")){
+		} else if (labelSequence.getThingTypeAndKind().equalsIgnoreCase("document_treatment group")
+				&& labelSequence.getLabelTypeAndKind().equalsIgnoreCase("id_codeName")) {
 			autoLabels = generateTreatmentGroupLabels(labelSequence, numberOfLabels);
 
-		} else if (labelSequence.getThingTypeAndKind().equalsIgnoreCase("document_analysis group") && labelSequence.getLabelTypeAndKind().equalsIgnoreCase("id_codeName")){
+		} else if (labelSequence.getThingTypeAndKind().equalsIgnoreCase("document_analysis group")
+				&& labelSequence.getLabelTypeAndKind().equalsIgnoreCase("id_codeName")) {
 			autoLabels = generateAnalysisGroupLabels(labelSequence, numberOfLabels);
-			
-		} else if (labelSequence.getThingTypeAndKind().equalsIgnoreCase("document_experiment") && labelSequence.getLabelTypeAndKind().equalsIgnoreCase("id_codeName")){
+
+		} else if (labelSequence.getThingTypeAndKind().equalsIgnoreCase("document_experiment")
+				&& labelSequence.getLabelTypeAndKind().equalsIgnoreCase("id_codeName")) {
 			autoLabels = generateExperimentLabels(labelSequence, numberOfLabels);
-			
-		} else if (labelSequence.getThingTypeAndKind().equalsIgnoreCase("document_protocol") && labelSequence.getLabelTypeAndKind().equalsIgnoreCase("id_codeName")){
+
+		} else if (labelSequence.getThingTypeAndKind().equalsIgnoreCase("document_protocol")
+				&& labelSequence.getLabelTypeAndKind().equalsIgnoreCase("id_codeName")) {
 			autoLabels = generateProtocolLabels(labelSequence, numberOfLabels);
 
-		} else if (labelSequence.getThingTypeAndKind().equalsIgnoreCase("material_container") && labelSequence.getLabelTypeAndKind().equalsIgnoreCase("id_codeName")){
+		} else if (labelSequence.getThingTypeAndKind().equalsIgnoreCase("material_container")
+				&& labelSequence.getLabelTypeAndKind().equalsIgnoreCase("id_codeName")) {
 			autoLabels = generateContainerLabels(labelSequence, numberOfLabels);
-			
-		} else if (labelSequence.getThingTypeAndKind().equalsIgnoreCase("interaction_containerContainer") && labelSequence.getLabelTypeAndKind().equalsIgnoreCase("id_codeName")){
+
+		} else if (labelSequence.getThingTypeAndKind().equalsIgnoreCase("interaction_containerContainer")
+				&& labelSequence.getLabelTypeAndKind().equalsIgnoreCase("id_codeName")) {
 			autoLabels = generateItxCntrCntrLabels(labelSequence, numberOfLabels);
 
-		} else if (labelSequence.getThingTypeAndKind().equalsIgnoreCase("interaction_subjectContainer") && labelSequence.getLabelTypeAndKind().equalsIgnoreCase("id_codeName")){
+		} else if (labelSequence.getThingTypeAndKind().equalsIgnoreCase("interaction_subjectContainer")
+				&& labelSequence.getLabelTypeAndKind().equalsIgnoreCase("id_codeName")) {
 			autoLabels = generateItxSubjCntrLabels(labelSequence, numberOfLabels);
 
-		} else if (labelSequence.getThingTypeAndKind().equalsIgnoreCase("interaction_protocolProtocol") && labelSequence.getLabelTypeAndKind().equalsIgnoreCase("id_codeName")){
+		} else if (labelSequence.getThingTypeAndKind().equalsIgnoreCase("interaction_protocolProtocol")
+				&& labelSequence.getLabelTypeAndKind().equalsIgnoreCase("id_codeName")) {
 			autoLabels = generateItxProtProtLabels(labelSequence, numberOfLabels);
-			
-		} else if (labelSequence.getThingTypeAndKind().equalsIgnoreCase("interaction_experimentExperiment") && labelSequence.getLabelTypeAndKind().equalsIgnoreCase("id_codeName")){
+
+		} else if (labelSequence.getThingTypeAndKind().equalsIgnoreCase("interaction_experimentExperiment")
+				&& labelSequence.getLabelTypeAndKind().equalsIgnoreCase("id_codeName")) {
 			autoLabels = generateItxExptExptLabels(labelSequence, numberOfLabels);
-				
-		} else {		
+
+		} else {
 			autoLabels = generateAutoLabels(labelSequence, numberOfLabels);
 		}
-		
 
 		return autoLabels;
 	}
@@ -139,14 +158,14 @@ private List<AutoLabelDTO> generateItxExptExptLabels(LabelSequence labelSequence
 			LsSeqItxExperimentExperiment lsSeqObject = new LsSeqItxExperimentExperiment();
 			lsSeqObject.persist();
 			Long labelNumber = lsSeqObject.getId();
-			String label = generateLabel(labelSequence, labelNumber); 
+			String label = generateLabel(labelSequence, labelNumber);
 			logger.debug("new label: " + label);
 			AutoLabelDTO autoLabel = new AutoLabelDTO();
 			autoLabel.setAutoLabel(label);
 			autoLabels.add(autoLabel);
 			counter++;
 		}
-		
+
 		return autoLabels;
 	}
 
@@ -157,14 +176,14 @@ private List<AutoLabelDTO> generateItxProtProtLabels(LabelSequence labelSequence
 			LsSeqItxProtocolProtocol lsSeqObject = new LsSeqItxProtocolProtocol();
 			lsSeqObject.persist();
 			Long labelNumber = lsSeqObject.getId();
-			String label = generateLabel(labelSequence, labelNumber); 
+			String label = generateLabel(labelSequence, labelNumber);
 			logger.debug("new label: " + label);
 			AutoLabelDTO autoLabel = new AutoLabelDTO();
 			autoLabel.setAutoLabel(label);
 			autoLabels.add(autoLabel);
 			counter++;
 		}
-		
+
 		return autoLabels;
 	}
 
@@ -175,14 +194,14 @@ private List<AutoLabelDTO> generateItxSubjCntrLabels(LabelSequence labelSequence
 			LsSeqItxSubjCntr lsSeqItxSubjCntr = new LsSeqItxSubjCntr();
 			lsSeqItxSubjCntr.persist();
 			Long labelNumber = lsSeqItxSubjCntr.getId();
-			String label = generateLabel(labelSequence, labelNumber); 
+			String label = generateLabel(labelSequence, labelNumber);
 			logger.debug("new label: " + label);
 			AutoLabelDTO autoLabel = new AutoLabelDTO();
 			autoLabel.setAutoLabel(label);
 			autoLabels.add(autoLabel);
 			counter++;
 		}
-		
+
 		return autoLabels;
 	}
 
@@ -193,14 +212,14 @@ private List<AutoLabelDTO> generateItxCntrCntrLabels(LabelSequence labelSequence
 			LsSeqItxCntrCntr lsSeqObject = new LsSeqItxCntrCntr();
 			lsSeqObject.persist();
 			Long labelNumber = lsSeqObject.getId();
-			String label = generateLabel(labelSequence, labelNumber); 
+			String label = generateLabel(labelSequence, labelNumber);
 			logger.debug("new label: " + label);
 			AutoLabelDTO autoLabel = new AutoLabelDTO();
 			autoLabel.setAutoLabel(label);
 			autoLabels.add(autoLabel);
 			counter++;
 		}
-		
+
 		return autoLabels;
 	}
 
@@ -211,58 +230,58 @@ private List<AutoLabelDTO> generateContainerLabels(LabelSequence labelSequence,
 			LsSeqContainer lsSeqObject = new LsSeqContainer();
 			lsSeqObject.persist();
 			Long labelNumber = lsSeqObject.getId();
-			String label = generateLabel(labelSequence, labelNumber); 
+			String label = generateLabel(labelSequence, labelNumber);
 			logger.debug("new label: " + label);
 			AutoLabelDTO autoLabel = new AutoLabelDTO();
 			autoLabel.setAutoLabel(label);
 			autoLabels.add(autoLabel);
 			counter++;
 		}
-		
+
 		return autoLabels;
 	}
 
 	private String generateLabel(LabelSequence labelSequence, Long labelNumber) {
-		
+
 		String formatLabelNumber = "%";
 		formatLabelNumber = formatLabelNumber.concat("0").concat(labelSequence.getDigits().toString()).concat("d");
 		logger.debug("format corpNumber: " + formatLabelNumber);
-		String label = labelSequence.getLabelPrefix().concat(labelSequence.getLabelSeparator()).concat(String.format(formatLabelNumber, labelNumber));
+		String label = labelSequence.getLabelPrefix().concat(labelSequence.getLabelSeparator())
+				.concat(String.format(formatLabelNumber, labelNumber));
 
 		return label;
-		
+
 	}
-	
+
 	private List<AutoLabelDTO> generateProtocolLabels(LabelSequence labelSequence, Long numberOfLabels) {
-		
+
 		List<AutoLabelDTO> autoLabels = new ArrayList<AutoLabelDTO>();
 		int counter = 0;
 		while (counter < numberOfLabels) {
 			LsSeqProtocol lsSeqObject = new LsSeqProtocol();
 			lsSeqObject.persist();
 			Long labelNumber = lsSeqObject.getId();
-			String label = generateLabel(labelSequence, labelNumber); 
+			String label = generateLabel(labelSequence, labelNumber);
 			logger.debug("new label: " + label);
 			AutoLabelDTO autoLabel = new AutoLabelDTO();
 			autoLabel.setAutoLabel(label);
 			autoLabels.add(autoLabel);
 			counter++;
 		}
-		
+
 		return autoLabels;
-		
+
 	}
 
-	
 	private List<AutoLabelDTO> generateExperimentLabels(LabelSequence labelSequence, Long numberOfLabels) {
-		
+
 		List<AutoLabelDTO> autoLabels = new ArrayList<AutoLabelDTO>();
 		int counter = 0;
 		while (counter < numberOfLabels) {
 			LsSeqExpt lsSeqObject = new LsSeqExpt();
 			lsSeqObject.persist();
 			Long labelNumber = lsSeqObject.getId();
-			String label = generateLabel(labelSequence, labelNumber); 
+			String label = generateLabel(labelSequence, labelNumber);
 			logger.debug("new label: " + label);
 			AutoLabelDTO autoLabel = new AutoLabelDTO();
 			autoLabel.setAutoLabel(label);
@@ -270,19 +289,18 @@ private List<AutoLabelDTO> generateExperimentLabels(LabelSequence labelSequence,
 			counter++;
 		}
 		return autoLabels;
-		
-	}
 
+	}
 
 	private List<AutoLabelDTO> generateAnalysisGroupLabels(LabelSequence labelSequence, Long numberOfLabels) {
-		
+
 		List<AutoLabelDTO> autoLabels = new ArrayList<AutoLabelDTO>();
 		int counter = 0;
 		while (counter < numberOfLabels) {
 			LsSeqAnlGrp lsSeqObject = new LsSeqAnlGrp();
 			lsSeqObject.persist();
 			Long labelNumber = lsSeqObject.getId();
-			String label = generateLabel(labelSequence, labelNumber); 
+			String label = generateLabel(labelSequence, labelNumber);
 			logger.debug("new label: " + label);
 			AutoLabelDTO autoLabel = new AutoLabelDTO();
 			autoLabel.setAutoLabel(label);
@@ -290,19 +308,18 @@ private List<AutoLabelDTO> generateAnalysisGroupLabels(LabelSequence labelSequen
 			counter++;
 		}
 		return autoLabels;
-		
+
 	}
 
-	
 	private List<AutoLabelDTO> generateTreatmentGroupLabels(LabelSequence labelSequence, Long numberOfLabels) {
-		
+
 		List<AutoLabelDTO> autoLabels = new ArrayList<AutoLabelDTO>();
 		int counter = 0;
 		while (counter < numberOfLabels) {
 			LsSeqTrtGrp lsSeqObject = new LsSeqTrtGrp();
 			lsSeqObject.persist();
 			Long labelNumber = lsSeqObject.getId();
-			String label = generateLabel(labelSequence, labelNumber); 
+			String label = generateLabel(labelSequence, labelNumber);
 			logger.debug("new label: " + label);
 			AutoLabelDTO autoLabel = new AutoLabelDTO();
 			autoLabel.setAutoLabel(label);
@@ -310,18 +327,18 @@ private List<AutoLabelDTO> generateTreatmentGroupLabels(LabelSequence labelSeque
 			counter++;
 		}
 		return autoLabels;
-		
+
 	}
-	
+
 	private List<AutoLabelDTO> generateSubjectLabels(LabelSequence labelSequence, Long numberOfLabels) {
-		
+
 		List<AutoLabelDTO> autoLabels = new ArrayList<AutoLabelDTO>();
 		int counter = 0;
 		while (counter < numberOfLabels) {
 			LsSeqSubject lsSeqSubject = new LsSeqSubject();
 			lsSeqSubject.persist();
 			Long labelNumber = lsSeqSubject.getId();
-			String label = generateLabel(labelSequence, labelNumber); 
+			String label = generateLabel(labelSequence, labelNumber);
 			logger.debug("new label: " + label);
 			AutoLabelDTO autoLabel = new AutoLabelDTO();
 			autoLabel.setAutoLabel(label);
@@ -329,7 +346,7 @@ private List<AutoLabelDTO> generateSubjectLabels(LabelSequence labelSequence, Lo
 			counter++;
 		}
 		return autoLabels;
-		
+
 	}
 
 	private List<AutoLabelDTO> generateAutoLabels(LabelSequence labelSequence, Long numberOfLabels) {
@@ -337,20 +354,18 @@ private List<AutoLabelDTO> generateAutoLabels(LabelSequence labelSequence, Long
 	}
 
 	private LabelSequence createLabelSequence(String thingTypeAndKind, String labelTypeAndKind) {
-		
-		if (thingTypeAndKind.equals("document_datadictionary") && labelTypeAndKind.equals("id_codeName")){
-			
+
+		if (thingTypeAndKind.equals("document_datadictionary") && labelTypeAndKind.equals("id_codeName")) {
+
 			return createDataDictionarySequence();
-			
+
 		} else {
-			
+
 			return null;
 		}
-		
 
 	}
 
-	
 	private LabelSequence createDataDictionarySequence() {
 		LabelSequence labelSequence = new LabelSequence();
 		labelSequence.setThingTypeAndKind("document_datadictionary");
@@ -373,28 +388,28 @@ public String getDataDictionaryCodeName() {
 		String thingTypeAndKind = "document_datadictionary";
 		String labelTypeAndKind = "id_codeName";
 		Long numberOfLabels = 1L;
-		List<AutoLabelDTO> labels = getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels );
-		return labels.get(0).getAutoLabel();		
+		List<AutoLabelDTO> labels = getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels);
+		return labels.get(0).getAutoLabel();
 	}
-	
+
 	@Transactional
 	@Override
 	public String getProtocolCodeName() {
 		String thingTypeAndKind = "document_protocol";
 		String labelTypeAndKind = "id_codeName";
 		Long numberOfLabels = 1L;
-		List<AutoLabelDTO> labels = getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels );
-		return labels.get(0).getAutoLabel();		
+		List<AutoLabelDTO> labels = getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels);
+		return labels.get(0).getAutoLabel();
 	}
-	
+
 	@Transactional
 	@Override
 	public String getExperimentCodeName() {
 		String thingTypeAndKind = "document_experiment";
 		String labelTypeAndKind = "id_codeName";
 		Long numberOfLabels = 1L;
-		List<AutoLabelDTO> labels = getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels );
-		return labels.get(0).getAutoLabel();		
+		List<AutoLabelDTO> labels = getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels);
+		return labels.get(0).getAutoLabel();
 	}
 
 	@Transactional
@@ -403,8 +418,8 @@ public String getAnalysisGroupCodeName() {
 		String thingTypeAndKind = "document_analysis group";
 		String labelTypeAndKind = "id_codeName";
 		Long numberOfLabels = 1L;
-		List<AutoLabelDTO> labels = getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels );
-		return labels.get(0).getAutoLabel();		
+		List<AutoLabelDTO> labels = getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels);
+		return labels.get(0).getAutoLabel();
 	}
 
 	@Transactional
@@ -413,8 +428,8 @@ public String getTreatmentGroupCodeName() {
 		String thingTypeAndKind = "document_treatment group";
 		String labelTypeAndKind = "id_codeName";
 		Long numberOfLabels = 1L;
-		List<AutoLabelDTO> labels = getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels );
-		return labels.get(0).getAutoLabel();		
+		List<AutoLabelDTO> labels = getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels);
+		return labels.get(0).getAutoLabel();
 	}
 
 	@Transactional
@@ -423,35 +438,38 @@ public String getSubjectCodeName() {
 		String thingTypeAndKind = "document_subject";
 		String labelTypeAndKind = "id_codeName";
 		Long numberOfLabels = 1L;
-		List<AutoLabelDTO> labels = getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels );
-		return labels.get(0).getAutoLabel();		
+		List<AutoLabelDTO> labels = getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels);
+		return labels.get(0).getAutoLabel();
 	}
 
 	@Override
 	public String getLsThingCodeName(String lsTypeAndKind) {
 		String labelTypeAndKind = "id_codeName";
 		Long numberOfLabels = 1L;
-		List<AutoLabelDTO> labels = getAutoLabels(lsTypeAndKind, labelTypeAndKind, numberOfLabels );
+		List<AutoLabelDTO> labels = getAutoLabels(lsTypeAndKind, labelTypeAndKind, numberOfLabels);
 		return labels.get(0).getAutoLabel();
 	}
-	
+
 	@Override
 	public AutoLabelDTO getLastLabel(String thingTypeAndKind, String labelTypeAndKind) throws NonUniqueResultException {
-		List<LabelSequence> labelSequences = LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(thingTypeAndKind, labelTypeAndKind).getResultList();
+		List<LabelSequence> labelSequences = LabelSequence
+				.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(thingTypeAndKind, labelTypeAndKind)
+				.getResultList();
 		LabelSequence labelSequence;
-		if(labelSequences.size() == 0) {
-			logger.info("Label sequence does not exist! Create new Sequence if possible." + thingTypeAndKind + "  " + labelTypeAndKind);
+		if (labelSequences.size() == 0) {
+			logger.info("Label sequence does not exist! Create new Sequence if possible." + thingTypeAndKind + "  "
+					+ labelTypeAndKind);
 			labelSequence = createLabelSequence(thingTypeAndKind, labelTypeAndKind);
-			if (labelSequence == null){
+			if (labelSequence == null) {
 				throw new NoResultException();
 			}
 		} else if (labelSequences.size() > 1) {
 			logger.error("found duplicate sequences!!!");
 			throw new NonUniqueResultException();
 		} else {
-			labelSequence = LabelSequence.findLabelSequence(labelSequences.get(0).getId());           	
+			labelSequence = LabelSequence.findLabelSequence(labelSequences.get(0).getId());
 		}
-		
+
 		List<AutoLabelDTO> autoLabels = new ArrayList<AutoLabelDTO>();
 
 		long currentLastNumber = labelSequence.fetchCurrentValue();
@@ -459,34 +477,39 @@ public AutoLabelDTO getLastLabel(String thingTypeAndKind, String labelTypeAndKin
 		String formatLabelNumber = "%";
 		formatLabelNumber = formatLabelNumber.concat("0").concat(labelSequence.getDigits().toString()).concat("d");
 		logger.debug("format corpNumber: " + formatLabelNumber);
-		String label = labelSequence.getLabelPrefix().concat(labelSequence.getLabelSeparator()).concat(String.format(formatLabelNumber, currentLastNumber));
+		String label = labelSequence.getLabelPrefix().concat(labelSequence.getLabelSeparator())
+				.concat(String.format(formatLabelNumber, currentLastNumber));
 		logger.debug("last label: " + label);
 		AutoLabelDTO autoLabel = new AutoLabelDTO();
 		autoLabel.setAutoLabel(label);
-		
-		return autoLabel;		
+
+		return autoLabel;
 	}
-	
+
 	@Override
-	public void decrementLabelSequence(String thingTypeAndKind, String labelTypeAndKind) throws NonUniqueResultException {
-		List<LabelSequence> labelSequences = LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(thingTypeAndKind, labelTypeAndKind).getResultList();
+	public void decrementLabelSequence(String thingTypeAndKind, String labelTypeAndKind)
+			throws NonUniqueResultException {
+		List<LabelSequence> labelSequences = LabelSequence
+				.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(thingTypeAndKind, labelTypeAndKind)
+				.getResultList();
 		LabelSequence labelSequence;
-		if(labelSequences.size() == 0) {
-			logger.info("Label sequence does not exist! Create new Sequence if possible." + thingTypeAndKind + "  " + labelTypeAndKind);
+		if (labelSequences.size() == 0) {
+			logger.info("Label sequence does not exist! Create new Sequence if possible." + thingTypeAndKind + "  "
+					+ labelTypeAndKind);
 			labelSequence = createLabelSequence(thingTypeAndKind, labelTypeAndKind);
-			if (labelSequence == null){
+			if (labelSequence == null) {
 				throw new NoResultException();
 			}
 		} else if (labelSequences.size() > 1) {
 			logger.error("found duplicate sequences!!!");
 			throw new NonUniqueResultException();
 		} else {
-			labelSequence = LabelSequence.findLabelSequence(labelSequences.get(0).getId());           	
+			labelSequence = LabelSequence.findLabelSequence(labelSequences.get(0).getId());
 		}
-		
+
 		List<AutoLabelDTO> autoLabels = new ArrayList<AutoLabelDTO>();
 		EntityManager em = LabelSequence.entityManager();
-		
+
 	}
 
 	@Override
@@ -494,7 +517,7 @@ public String getContainerCodeName() {
 		String thingTypeAndKind = "material_container";
 		String labelTypeAndKind = "id_codeName";
 		Long numberOfLabels = 1L;
-		List<AutoLabelDTO> labels = getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels );
+		List<AutoLabelDTO> labels = getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels);
 		return labels.get(0).getAutoLabel();
 	}
 
@@ -503,14 +526,14 @@ public String getAuthorCodeName() {
 		String thingTypeAndKind = "author_author";
 		String labelTypeAndKind = "id_codeName";
 		Long numberOfLabels = 1L;
-		List<AutoLabelDTO> labels = getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels );
+		List<AutoLabelDTO> labels = getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels);
 		return labels.get(0).getAutoLabel();
 	}
 
 	@Override
 	public String getLsThingCodeName(String lsTypeAndKind, String labelTypeAndKind) {
 		Long numberOfLabels = 1L;
-		List<AutoLabelDTO> labels = getAutoLabels(lsTypeAndKind, labelTypeAndKind, numberOfLabels );
+		List<AutoLabelDTO> labels = getAutoLabels(lsTypeAndKind, labelTypeAndKind, numberOfLabels);
 		return labels.get(0).getAutoLabel();
 	}
 }
diff --git a/src/main/java/com/labsynch/labseer/service/BulkLoadService.java b/src/main/java/com/labsynch/labseer/service/BulkLoadService.java
index fbdeb6ea9..57d893341 100644
--- a/src/main/java/com/labsynch/labseer/service/BulkLoadService.java
+++ b/src/main/java/com/labsynch/labseer/service/BulkLoadService.java
@@ -18,7 +18,6 @@
 @Service
 public interface BulkLoadService {
 
-
 	public BulkLoadPropertiesDTO readSDFPropertiesFromFile(BulkLoadSDFPropertyRequestDTO requestDTO);
 
 	BulkLoadTemplate saveBulkLoadTemplate(BulkLoadTemplate templateToSave);
@@ -31,5 +30,4 @@ public interface BulkLoadService {
 
 	public PurgeFileResponseDTO purgeFile(BulkLoadFile bulkLoadFile) throws MalformedURLException, IOException;
 
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/BulkLoadServiceImpl.java b/src/main/java/com/labsynch/labseer/service/BulkLoadServiceImpl.java
index 765841573..1fab1db1e 100644
--- a/src/main/java/com/labsynch/labseer/service/BulkLoadServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/BulkLoadServiceImpl.java
@@ -96,27 +96,27 @@ public class BulkLoadServiceImpl implements BulkLoadService {
 
 	@Autowired
 	private LotService lotService;
-	
+
 	@Autowired
 	public MetalotService metalotService;
-	
+
 	@Autowired
 	public CmpdRegMoleculeFactory moleculeFactory;
-	
+
 	@Autowired
 	public CmpdRegSDFReaderFactory sdfReaderFactory;
-	
+
 	@Autowired
 	public CmpdRegSDFWriterFactory sdfWriterFactory;
 
 	@Override
 	public BulkLoadPropertiesDTO readSDFPropertiesFromFile(BulkLoadSDFPropertyRequestDTO requestDTO) {
-		//get file reading parameters from request
+		// get file reading parameters from request
 		String inputFileName = requestDTO.getFileName();
-		int numRowsToRead = requestDTO.getNumRecords();			
-		//create the resultDTO to be filled in
+		int numRowsToRead = requestDTO.getNumRecords();
+		// create the resultDTO to be filled in
 		BulkLoadPropertiesDTO resultDTO = new BulkLoadPropertiesDTO(propertiesUtilService.getDbProperties());
-		//fill in any provided mappings
+		// fill in any provided mappings
 		resultDTO.setBulkLoadProperties(requestDTO.getMappings());
 		HashSet<SimpleBulkLoadPropertyDTO> foundProperties = new HashSet<SimpleBulkLoadPropertyDTO>();
 		HashSet<ErrorMessage> errors = new HashSet<ErrorMessage>();
@@ -124,10 +124,10 @@ public BulkLoadPropertiesDTO readSDFPropertiesFromFile(BulkLoadSDFPropertyReques
 		try {
 			CmpdRegSDFReader molReader = sdfReaderFactory.getCmpdRegSDFReader(inputFileName);
 			CmpdRegMolecule mol = null;
-			while ((numRowsToRead == -1 || numRecordsRead < numRowsToRead) && (mol = molReader.readNextMol()) != null){
+			while ((numRowsToRead == -1 || numRecordsRead < numRowsToRead) && (mol = molReader.readNextMol()) != null) {
 				String[] propertyKeys = mol.getPropertyKeys();
-				if (propertyKeys.length != 0){
-					for (String key : propertyKeys){
+				if (propertyKeys.length != 0) {
+					for (String key : propertyKeys) {
 						SimpleBulkLoadPropertyDTO propDTO = new SimpleBulkLoadPropertyDTO(key);
 						propDTO.setDataType(mol.getPropertyType(key));
 						foundProperties.add(propDTO);
@@ -136,21 +136,26 @@ public BulkLoadPropertiesDTO readSDFPropertiesFromFile(BulkLoadSDFPropertyReques
 				numRecordsRead++;
 				logger.info("Num records read " + numRecordsRead);
 			}
-		} catch (Exception e){
-			logger.error("Caught exception trying to read SDF properties (num records read was "+numRecordsRead+1,") ",e);
-			errors.add(new ErrorMessage("error", "Error when reading record number "+numRecordsRead+1+ ": "+e.getMessage()));
+		} catch (Exception e) {
+			logger.error("Caught exception trying to read SDF properties (num records read was " + numRecordsRead + 1,
+					") ", e);
+			errors.add(new ErrorMessage("error",
+					"Error when reading record number " + numRecordsRead + 1 + ": " + e.getMessage()));
 			resultDTO.setErrors(errors);
 			return resultDTO;
 		}
-		if (logger.isDebugEnabled()) if (logger.isDebugEnabled()) logger.debug("found: "+SimpleBulkLoadPropertyDTO.toJsonArray(foundProperties));
-		//Assembly meta DTO:
+		if (logger.isDebugEnabled())
+			if (logger.isDebugEnabled())
+				logger.debug("found: " + SimpleBulkLoadPropertyDTO.toJsonArray(foundProperties));
+		// Assembly meta DTO:
 		resultDTO.setSdfProperties(foundProperties);
 		resultDTO.setErrors(errors);
 		resultDTO.setNumRecordsRead(numRecordsRead);
-		//		if (resultDTO.getTemplateName() != null) resultDTO.applyTemplateMappings(requestDTO.getTemplateName());
+		// if (resultDTO.getTemplateName() != null)
+		// resultDTO.applyTemplateMappings(requestDTO.getTemplateName());
 		resultDTO.autoAssignMappings();
 		resultDTO.cleanMappings();
-		if (requestDTO.getTemplateName() != null && requestDTO.getTemplateName().length() > 0){
+		if (requestDTO.getTemplateName() != null && requestDTO.getTemplateName().length() > 0) {
 			resultDTO.checkAgainstTemplate(requestDTO.getTemplateName());
 		}
 		return resultDTO;
@@ -159,35 +164,42 @@ public BulkLoadPropertiesDTO readSDFPropertiesFromFile(BulkLoadSDFPropertyReques
 	@Override
 	public BulkLoadTemplate saveBulkLoadTemplate(
 			BulkLoadTemplate templateToSave) {
-		try{
-			BulkLoadTemplate oldTemplate = BulkLoadTemplate.findBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals(templateToSave.getTemplateName(), templateToSave.getRecordedBy()).getSingleResult();
-			if (logger.isDebugEnabled()) logger.debug("Found existing template. Trying to update.");
+		try {
+			BulkLoadTemplate oldTemplate = BulkLoadTemplate
+					.findBulkLoadTemplatesByTemplateNameEqualsAndRecordedByEquals(templateToSave.getTemplateName(),
+							templateToSave.getRecordedBy())
+					.getSingleResult();
+			if (logger.isDebugEnabled())
+				logger.debug("Found existing template. Trying to update.");
 			oldTemplate.update(templateToSave);
-			if (logger.isDebugEnabled()) if (logger.isDebugEnabled()) logger.debug("Updated template to: "+oldTemplate.toJson());
+			if (logger.isDebugEnabled())
+				if (logger.isDebugEnabled())
+					logger.debug("Updated template to: " + oldTemplate.toJson());
 			return oldTemplate;
-		} catch (NoResultException e){
-			if (logger.isDebugEnabled()) logger.debug("Saving new template");
+		} catch (NoResultException e) {
+			if (logger.isDebugEnabled())
+				logger.debug("Saving new template");
 			templateToSave.persist();
 			return templateToSave;
 		}
 	}
 
 	@Override
-//	@Transactional
-	public BulkLoadSDFValidationPropertiesResponseDTO validationProperties(BulkLoadRegisterSDFRequestDTO requestDTO){
-		//get properties out the request
+	// @Transactional
+	public BulkLoadSDFValidationPropertiesResponseDTO validationProperties(BulkLoadRegisterSDFRequestDTO requestDTO) {
+		// get properties out the request
 		String inputFileName = requestDTO.getFilePath();
 		Long startTime = new Date().getTime();
 		Long currentTime = new Date().getTime();
 		String chemist = requestDTO.getUserName();
 		Collection<BulkLoadPropertyMappingDTO> mappings = requestDTO.getMappings();
 
-		
 		try {
-			//create our record of the BulkLoadFile that will be updated with the number of molecules later
+			// create our record of the BulkLoadFile that will be updated with the number of
+			// molecules later
 			logger.info("inputFileName: " + inputFileName);
 			String[] splitString;
-			if(File.separator.equalsIgnoreCase("\\")){
+			if (File.separator.equalsIgnoreCase("\\")) {
 				logger.info("file sep is \\");
 				inputFileName = inputFileName.replace("\\", "\\\\");
 				logger.info("modified inputFileName: " + inputFileName);
@@ -195,7 +207,7 @@ public BulkLoadSDFValidationPropertiesResponseDTO validationProperties(BulkLoadR
 			} else {
 				splitString = inputFileName.split(File.separator);
 			}
-			String shortFileName = splitString[splitString.length - 1];			
+			String shortFileName = splitString[splitString.length - 1];
 			logger.info("shortFileName: " + shortFileName);
 
 			int fileSizeInBytes = (int) (new File(inputFileName)).length();
@@ -206,7 +218,7 @@ public BulkLoadSDFValidationPropertiesResponseDTO validationProperties(BulkLoadR
 			CmpdRegMolecule mol = null;
 			int numRecordsRead = 0;
 
-			while ((mol = molReader.readNextMol()) != null){
+			while ((mol = molReader.readNextMol()) != null) {
 				numRecordsRead++;
 				String lotChemist = getStringValueFromMappings(mol, "Lot Chemist", mappings);
 				if (!chemists.contains(lotChemist)) {
@@ -218,22 +230,24 @@ public BulkLoadSDFValidationPropertiesResponseDTO validationProperties(BulkLoadR
 				}
 
 				currentTime = new Date().getTime();
-				if (currentTime > startTime){
+				if (currentTime > startTime) {
 					logger.info("SPEED REPORT:");
-					logger.info("Time Elapsed:"+ (currentTime - startTime));
-					logger.info("Rows Handled:"+ numRecordsRead);
-					logger.info("Average speed (rows/min):"+ (numRecordsRead/((currentTime - startTime) / 60.0 / 1000.0)));
+					logger.info("Time Elapsed:" + (currentTime - startTime));
+					logger.info("Rows Handled:" + numRecordsRead);
+					logger.info("Average speed (rows/min):"
+							+ (numRecordsRead / ((currentTime - startTime) / 60.0 / 1000.0)));
 				}
 			}
 			return new BulkLoadSDFValidationPropertiesResponseDTO(chemists, projects);
-		} catch (Exception e){
-			logger.error("Caught an error in the big loop",e);
+		} catch (Exception e) {
+			logger.error("Caught an error in the big loop", e);
 			return new BulkLoadSDFValidationPropertiesResponseDTO(null, null);
 		}
 	}
 
 	@Transactional
-	public int saveDryRunCompound(CmpdRegMolecule mol, Parent parent, int numRecordsRead, DryRunCompound dryRunCompound) throws CmpdRegMolFormatException{
+	public int saveDryRunCompound(CmpdRegMolecule mol, Parent parent, int numRecordsRead, DryRunCompound dryRunCompound)
+			throws CmpdRegMolFormatException {
 		int cdId = chemStructureService.saveStructure(mol.getMolStructure(), StructureType.DRY_RUN, false);
 		dryRunCompound = new DryRunCompound();
 		dryRunCompound.setCdId(cdId);
@@ -245,23 +259,23 @@ public int saveDryRunCompound(CmpdRegMolecule mol, Parent parent, int numRecords
 		dryRunCompound.persist();
 		return cdId;
 	}
-	
+
 	@Override
-//	@Transactional
-	public BulkLoadRegisterSDFResponseDTO registerSdf(BulkLoadRegisterSDFRequestDTO registerRequestDTO){
-		//get properties out the request
+	// @Transactional
+	public BulkLoadRegisterSDFResponseDTO registerSdf(BulkLoadRegisterSDFRequestDTO registerRequestDTO) {
+		// get properties out the request
 		String inputFileName = registerRequestDTO.getFilePath();
 		Long startTime = new Date().getTime();
 		Long currentTime = new Date().getTime();
 		String chemist = registerRequestDTO.getUserName();
 		Collection<ValidationResponseDTO> results = new ArrayList();
 		Boolean validate = registerRequestDTO.getValidate();
-		if(validate == null) {
+		if (validate == null) {
 			validate = false;
 		}
 		DryRunCompound dryRunCompound = new DryRunCompound();
 
-		if(validate) {
+		if (validate) {
 			boolean dropTable = chemStructureService.truncateStructureTable(StructureType.DRY_RUN);
 			dryRunCompound.truncateTable();
 		}
@@ -269,16 +283,17 @@ public BulkLoadRegisterSDFResponseDTO registerSdf(BulkLoadRegisterSDFRequestDTO
 		Session session = Parent.entityManager().unwrap(Session.class);
 
 		Collection<BulkLoadPropertyMappingDTO> mappings = registerRequestDTO.getMappings();
-		//instantiate input and output streams
+		// instantiate input and output streams
 		FileOutputStream errorCSVOutStream;
 		FileOutputStream registeredCSVOutStream;
 		FileOutputStream reportOutStream;
 		// main try/catch block
 		try {
-			//create our record of the BulkLoadFile that will be updated with the number of molecules later
+			// create our record of the BulkLoadFile that will be updated with the number of
+			// molecules later
 			logger.info("inputFileName: " + inputFileName);
 			String[] splitString;
-			if(File.separator.equalsIgnoreCase("\\")){
+			if (File.separator.equalsIgnoreCase("\\")) {
 				logger.info("file sep is \\");
 				inputFileName = inputFileName.replace("\\", "\\\\");
 				logger.info("modified inputFileName: " + inputFileName);
@@ -286,33 +301,37 @@ public BulkLoadRegisterSDFResponseDTO registerSdf(BulkLoadRegisterSDFRequestDTO
 			} else {
 				splitString = inputFileName.split(File.separator);
 			}
-			String shortFileName = splitString[splitString.length - 1];			
+			String shortFileName = splitString[splitString.length - 1];
 			logger.info("shortFileName: " + shortFileName);
 
 			int fileSizeInBytes = (int) (new File(inputFileName)).length();
-			BulkLoadFile bulkLoadFile = new BulkLoadFile(shortFileName, 0, fileSizeInBytes, BulkLoadPropertyMappingDTO.toJsonArray(mappings), chemist, new Date());
-			if (registerRequestDTO.getFileDate() != null) bulkLoadFile.setFileDate(registerRequestDTO.getFileDate());
-			else bulkLoadFile.setFileDate(new Date());
-			if(!validate) {
+			BulkLoadFile bulkLoadFile = new BulkLoadFile(shortFileName, 0, fileSizeInBytes,
+					BulkLoadPropertyMappingDTO.toJsonArray(mappings), chemist, new Date());
+			if (registerRequestDTO.getFileDate() != null)
+				bulkLoadFile.setFileDate(registerRequestDTO.getFileDate());
+			else
+				bulkLoadFile.setFileDate(new Date());
+			if (!validate) {
 				bulkLoadFile.persist();
 			}
 
-
-			//construct the error and report file names and output streams
+			// construct the error and report file names and output streams
 			Calendar cal = Calendar.getInstance();
 			cal.setTime(new Date());
-			String ymd = String.format("%04d", cal.get(Calendar.YEAR))+"-"+String.format("%02d", cal.get(Calendar.MONTH)+1)+"-"+String.format("%02d", cal.get(Calendar.DATE));
-			String rootOutFileName = inputFileName+"_"+ymd+"_";
+			String ymd = String.format("%04d", cal.get(Calendar.YEAR)) + "-"
+					+ String.format("%02d", cal.get(Calendar.MONTH) + 1) + "-"
+					+ String.format("%02d", cal.get(Calendar.DATE));
+			String rootOutFileName = inputFileName + "_" + ymd + "_";
 
-			String errorSDFName = rootOutFileName+"errors.sdf";
-			String errorCSVName = rootOutFileName+"errors.csv";
+			String errorSDFName = rootOutFileName + "errors.sdf";
+			String errorCSVName = rootOutFileName + "errors.csv";
 			String registeredSuffix = "registered";
-			if(validate) {
+			if (validate) {
 				registeredSuffix = "validated";
 			}
 			String registeredSDFName = rootOutFileName + registeredSuffix + ".sdf";
 			String registeredCSVName = rootOutFileName + registeredSuffix + ".csv";
-			String reportName = rootOutFileName+"report.log";
+			String reportName = rootOutFileName + "report.log";
 
 			Collection<String> reportFiles = new HashSet<String>();
 			reportFiles.add(errorSDFName);
@@ -323,13 +342,13 @@ public BulkLoadRegisterSDFResponseDTO registerSdf(BulkLoadRegisterSDFRequestDTO
 
 			CmpdRegSDFReader molReader = sdfReaderFactory.getCmpdRegSDFReader(inputFileName);
 
-//			errorSDFOutStream = new FileOutputStream (errorSDFName, false);
-			errorCSVOutStream = new FileOutputStream (errorCSVName, false);
-//			registeredSDFOutStream = new FileOutputStream (registeredSDFName, false);
-			registeredCSVOutStream = new FileOutputStream (registeredCSVName, false);
-			reportOutStream = new FileOutputStream (reportName, false);
+			// errorSDFOutStream = new FileOutputStream (errorSDFName, false);
+			errorCSVOutStream = new FileOutputStream(errorCSVName, false);
+			// registeredSDFOutStream = new FileOutputStream (registeredSDFName, false);
+			registeredCSVOutStream = new FileOutputStream(registeredCSVName, false);
+			reportOutStream = new FileOutputStream(reportName, false);
 
-			//write headers for csv's
+			// write headers for csv's
 			String errorCSVHeaders = "Record Number,"
 					+ "Corp Name in File,"
 					+ "Corp Name in DB,"
@@ -354,75 +373,83 @@ public BulkLoadRegisterSDFResponseDTO registerSdf(BulkLoadRegisterSDFRequestDTO
 			int numRecordsRead = 0;
 			int numNewParentsLoaded = 0;
 			int numNewLotsOldParentsLoaded = 0;
-			while ((mol = molReader.readNextMol()) != null){
+			while ((mol = molReader.readNextMol()) != null) {
 				numRecordsRead++;
 				boolean isNewParent = true;
-				//We are building up a Metalot, which will have a nested Lot, SaltForm, and Parent
+				// We are building up a Metalot, which will have a nested Lot, SaltForm, and
+				// Parent
 				Parent parent;
 				SaltForm saltForm;
 				Lot lot;
-				//attempt to strip salts
+				// attempt to strip salts
 				try {
 					mol = processForSaltStripping(mol, mappings, results, numRecordsRead);
-				}catch (CmpdRegMolFormatException e) {
-					String emptyMolfile = "\n" + 
-							"  Ketcher 09111712282D 1   1.00000     0.00000     0\n" + 
-							"\n" + 
-							"  0  0  0     0  0            999 V2000\n" + 
-							"M  END\n" + 
+				} catch (CmpdRegMolFormatException e) {
+					String emptyMolfile = "\n" +
+							"  Ketcher 09111712282D 1   1.00000     0.00000     0\n" +
+							"\n" +
+							"  0  0  0     0  0            999 V2000\n" +
+							"M  END\n" +
 							"";
 					CmpdRegMolecule emptyMol = mol.replaceStructure(emptyMolfile);
 					logError(e, numRecordsRead, emptyMol, mappings, errorMolExporter, results, errorCSVOutStream);
 					continue;
 				}
-				try{
-					parent = createParent(mol, mappings, chemist, registerRequestDTO.getLabelPrefix(), results, numRecordsRead);
-				}catch (Exception e){
+				try {
+					parent = createParent(mol, mappings, chemist, registerRequestDTO.getLabelPrefix(), results,
+							numRecordsRead);
+				} catch (Exception e) {
 					logError(e, numRecordsRead, mol, mappings, errorMolExporter, results, errorCSVOutStream);
 					continue;
 				}
-				try{
+				try {
 					parent = validateParent(parent, mappings, numRecordsRead, results);
-				}catch (TransactionSystemException rollbackException) {
+				} catch (TransactionSystemException rollbackException) {
 					logger.error("Rollback exception", rollbackException.getApplicationException());
-					Exception causeException = new Exception(rollbackException.getApplicationException().getMessage(), rollbackException.getApplicationException());
-					logError(causeException, numRecordsRead, mol, mappings, errorMolExporter, results, errorCSVOutStream);
+					Exception causeException = new Exception(rollbackException.getApplicationException().getMessage(),
+							rollbackException.getApplicationException());
+					logError(causeException, numRecordsRead, mol, mappings, errorMolExporter, results,
+							errorCSVOutStream);
 					continue;
-				}catch (Exception e){
+				} catch (Exception e) {
 					logError(e, numRecordsRead, mol, mappings, errorMolExporter, results, errorCSVOutStream);
 					continue;
 				}
-				if (parent.getId() != null) isNewParent = false;
-				try{
+				if (parent.getId() != null)
+					isNewParent = false;
+				try {
 					saltForm = createSaltForm(mol, mappings, results, numRecordsRead);
-				}catch (Exception e){
+				} catch (Exception e) {
 					logError(e, numRecordsRead, mol, mappings, errorMolExporter, results, errorCSVOutStream);
 					continue;
 				}
 				saltForm.setParent(parent);
-				try{
+				try {
 					saltForm = validateSaltForm(saltForm, mappings);
-				}catch (Exception e){
+				} catch (Exception e) {
 					logError(e, numRecordsRead, mol, mappings, errorMolExporter, results, errorCSVOutStream);
 					continue;
 				}
 
-				try{
+				try {
 					lot = createLot(mol, numRecordsRead, mappings, results, bulkLoadFile.getFileDate(), chemist);
-				}catch (Exception e){
+				} catch (Exception e) {
 					logError(e, numRecordsRead, mol, mappings, errorMolExporter, results, errorCSVOutStream);
 					continue;
 				}
 				lot.setSaltForm(saltForm);
 				lot.setParent(parent);
 
-				if (lot.getId() == null ) lot.setBulkLoadFile(bulkLoadFile);
-				if (saltForm.getId() == null) saltForm.setBulkLoadFile(bulkLoadFile);
-				if (parent.getId() == null) parent.setBulkLoadFile(bulkLoadFile);
+				if (lot.getId() == null)
+					lot.setBulkLoadFile(bulkLoadFile);
+				if (saltForm.getId() == null)
+					saltForm.setBulkLoadFile(bulkLoadFile);
+				if (parent.getId() == null)
+					parent.setBulkLoadFile(bulkLoadFile);
 
-				try{
+				try {
 					lot = validateLot(lot, mappings, results);
-				}catch (Exception e){
+				} catch (Exception e) {
 					logError(e, numRecordsRead, mol, mappings, errorMolExporter, results, errorCSVOutStream);
 					continue;
 				}
@@ -431,63 +458,74 @@ public BulkLoadRegisterSDFResponseDTO registerSdf(BulkLoadRegisterSDFRequestDTO
 				metalot.setLot(lot);
 				metalot.setIsosalts(lot.getSaltForm().getIsoSalts());
 				metalot.setSkipParentDupeCheck(true);
-				MetalotReturn metalotReturn = null;              
+				MetalotReturn metalotReturn = null;
 
-				if(validate) {
-					try{
+				if (validate) {
+					try {
 						parent = validateParentAgainstDryRunCompound(parent, numRecordsRead, results);
 						saveDryRunCompound(mol, parent, numRecordsRead, dryRunCompound);
 
-					}catch (TransactionSystemException rollbackException) {
+					} catch (TransactionSystemException rollbackException) {
 						logger.error("Rollback exception", rollbackException.getApplicationException());
-						Exception causeException = new Exception(rollbackException.getApplicationException().getMessage(), rollbackException.getApplicationException());
-						logError(causeException, numRecordsRead, mol, mappings, errorMolExporter, results, errorCSVOutStream);
+						Exception causeException = new Exception(
+								rollbackException.getApplicationException().getMessage(),
+								rollbackException.getApplicationException());
+						logError(causeException, numRecordsRead, mol, mappings, errorMolExporter, results,
+								errorCSVOutStream);
 						continue;
-					}catch (Exception e){
+					} catch (Exception e) {
 						logError(e, numRecordsRead, mol, mappings, errorMolExporter, results, errorCSVOutStream);
 						continue;
 					}
 
 				}
-				if(!validate) {
-					try{
+				if (!validate) {
+					try {
 						metalotReturn = metalotService.save(metalot);
-						if (!metalotReturn.getErrors().isEmpty()){
-							for (ErrorMessage errorMessage : metalotReturn.getErrors()){
+						if (!metalotReturn.getErrors().isEmpty()) {
+							for (ErrorMessage errorMessage : metalotReturn.getErrors()) {
 								Exception e = new Exception(errorMessage.getMessage());
-								logError(e, numRecordsRead, mol, mappings, errorMolExporter, results, errorCSVOutStream);
+								logError(e, numRecordsRead, mol, mappings, errorMolExporter, results,
+										errorCSVOutStream);
 							}
 							continue;
 						}
-					}catch (Exception e){
+					} catch (Exception e) {
 						logError(e, numRecordsRead, mol, mappings, errorMolExporter, results, errorCSVOutStream);
 						continue;
 					}
 				}
-				
-				//Successful registration/validation: update summary and write registered/validated record
-				if (isNewParent) numNewParentsLoaded++;
-				else numNewLotsOldParentsLoaded++;
-				writeRegisteredMol(numRecordsRead, mol, metalotReturn, mappings, registeredMolExporter, registeredCSVOutStream, isNewParent, results);
-				if (numRecordsRead % 100 == 0){
+
+				// Successful registration/validation: update summary and write
+				// registered/validated record
+				if (isNewParent)
+					numNewParentsLoaded++;
+				else
+					numNewLotsOldParentsLoaded++;
+				writeRegisteredMol(numRecordsRead, mol, metalotReturn, mappings, registeredMolExporter,
+						registeredCSVOutStream, isNewParent, results);
+				if (numRecordsRead % 100 == 0) {
 					logger.info("flushing bulk loader session");
 					session.flush();
 					session.clear();
 				}
 				currentTime = new Date().getTime();
-				if (currentTime > startTime){
+				if (currentTime > startTime) {
 					logger.info("SPEED REPORT:");
-					logger.info("Time Elapsed:"+ (currentTime - startTime));
-					logger.info("Rows Handled:"+ numRecordsRead);
-					logger.info("Average speed (rows/min):"+ (numRecordsRead/((currentTime - startTime) / 60.0 / 1000.0)));
+					logger.info("Time Elapsed:" + (currentTime - startTime));
+					logger.info("Rows Handled:" + numRecordsRead);
+					logger.info("Average speed (rows/min):"
+							+ (numRecordsRead / ((currentTime - startTime) / 60.0 / 1000.0)));
 				}
 			}
-			//generate summary html, which also writes the report file
-			String summaryHtml = generateSummaryHtml(numRecordsRead, numNewParentsLoaded, numNewLotsOldParentsLoaded, results, errorSDFName, reportOutStream);
-			if (logger.isDebugEnabled()) logger.debug(summaryHtml);
+			// generate summary html, which also writes the report file
+			String summaryHtml = generateSummaryHtml(numRecordsRead, numNewParentsLoaded, numNewLotsOldParentsLoaded,
+					results, errorSDFName, reportOutStream);
+			if (logger.isDebugEnabled())
+				logger.debug(summaryHtml);
 
-			//truncate the validation table
-			if(validate) {
+			// truncate the validation table
+			if (validate) {
 				dryRunCompound.truncateTable();
 			}
 
@@ -498,15 +536,15 @@ public BulkLoadRegisterSDFResponseDTO registerSdf(BulkLoadRegisterSDFRequestDTO
 			registeredMolExporter.close();
 			errorMolExporter.close();
 
-			//if there were no errors, delete the error files, since they are empty
+			// if there were no errors, delete the error files, since they are empty
 			Boolean errorFree = true;
-			for(ValidationResponseDTO valResp : results) {
-				if(valResp.getLevel() == "error") {
+			for (ValidationResponseDTO valResp : results) {
+				if (valResp.getLevel() == "error") {
 					errorFree = false;
 					break;
 				}
 			}
-			if (errorFree){
+			if (errorFree) {
 				File errorCSVFile = new File(errorCSVName);
 				File errorSDFFile = new File(errorSDFName);
 				errorCSVFile.delete();
@@ -515,70 +553,87 @@ public BulkLoadRegisterSDFResponseDTO registerSdf(BulkLoadRegisterSDFRequestDTO
 				reportFiles.remove(errorCSVName);
 			}
 
-			//update the BulkLoadFile with how many records were read.
+			// update the BulkLoadFile with how many records were read.
 			bulkLoadFile.setNumberOfMols(numRecordsRead);
-			if(!validate) {
+			if (!validate) {
 				bulkLoadFile.merge();
 			}
-			if(validate) {
-				logger.info("Finished validating bulk load file: "+bulkLoadFile.toJson());
+			if (validate) {
+				logger.info("Finished validating bulk load file: " + bulkLoadFile.toJson());
 			} else {
-				logger.info("Finished bulk loading file: "+bulkLoadFile.toJson());
+				logger.info("Finished bulk loading file: " + bulkLoadFile.toJson());
 			}
 			return new BulkLoadRegisterSDFResponseDTO(summaryHtml, results, reportFiles);
-		} catch (Exception e){
-			logger.error("Caught an error in the big loop",e);
+		} catch (Exception e) {
+			logger.error("Caught an error in the big loop", e);
 			results.add(new ValidationResponseDTO("error", -1, "Unassigned", e.getMessage(), e.getMessage()));
 			return new BulkLoadRegisterSDFResponseDTO(e.getMessage(), results, null);
 		}
 	}
 
-	public void writeRegisteredMol(int numRecordsRead, CmpdRegMolecule mol, MetalotReturn metalotReturn, Collection<BulkLoadPropertyMappingDTO> mappings, CmpdRegSDFWriter registeredMolExporter, FileOutputStream registeredCSVOutStream, Boolean isNewParent, Collection<ValidationResponseDTO> validationResponse) throws IOException, CmpdRegMolFormatException {
+	public void writeRegisteredMol(int numRecordsRead, CmpdRegMolecule mol, MetalotReturn metalotReturn,
+			Collection<BulkLoadPropertyMappingDTO> mappings, CmpdRegSDFWriter registeredMolExporter,
+			FileOutputStream registeredCSVOutStream, Boolean isNewParent,
+			Collection<ValidationResponseDTO> validationResponse) throws IOException, CmpdRegMolFormatException {
 		String sdfCorpName = getStringValueFromMappings(mol, "Parent Corp Name", mappings);
 		String dbCorpName = "";
 		String registeredParentCorpName = "";
 		String allParentAliases = "";
 		String allLotAliases = "";
 
-		BulkLoadPropertyMappingDTO mapping = BulkLoadPropertyMappingDTO.findMappingByDbPropertyEquals(mappings, "Lot Corp Name");
-		if(metalotReturn != null) {
+		BulkLoadPropertyMappingDTO mapping = BulkLoadPropertyMappingDTO.findMappingByDbPropertyEquals(mappings,
+				"Lot Corp Name");
+		if (metalotReturn != null) {
 			dbCorpName = metalotReturn.getMetalot().getLot().getCorpName();
 
 			registeredParentCorpName = metalotReturn.getMetalot().getLot().getSaltForm().getParent().getCorpName();
-			Collection<ParentAlias> parentAliases = metalotReturn.getMetalot().getLot().getSaltForm().getParent().getParentAliases();
+			Collection<ParentAlias> parentAliases = metalotReturn.getMetalot().getLot().getSaltForm().getParent()
+					.getParentAliases();
 			Collection<LotAlias> lotAliases = metalotReturn.getMetalot().getLot().getLotAliases();
 			List<String> parentAliasList = new ArrayList<String>();
-			if (!parentAliases.isEmpty()){
-				for (ParentAlias parentAlias : parentAliases){
+			if (!parentAliases.isEmpty()) {
+				for (ParentAlias parentAlias : parentAliases) {
 					parentAliasList.add(parentAlias.getAliasName());
 				}
 			}
 			List<String> lotAliasList = new ArrayList<String>();
-			if (!lotAliases.isEmpty()){
-				for (LotAlias lotAlias : lotAliases){
+			if (!lotAliases.isEmpty()) {
+				for (LotAlias lotAlias : lotAliases) {
 					lotAliasList.add(lotAlias.getAliasName());
 				}
 			}
 			mol.setProperty("Registered Parent Corp Name", registeredParentCorpName);
 			mol.setProperty("Registered Lot Corp Name", dbCorpName);
-			mol.setProperty("Registered Lot Project", ((metalotReturn.getMetalot().getLot().getProject() == null) ? "" : metalotReturn.getMetalot().getLot().getProject()));
-			mol.setProperty("Registered Lot Barcode", ((metalotReturn.getMetalot().getLot().getBarcode() == null) ? "" : metalotReturn.getMetalot().getLot().getBarcode()));
-			mol.setProperty("Registered Lot Amount", ((metalotReturn.getMetalot().getLot().getAmount() == null) ? "" : metalotReturn.getMetalot().getLot().getAmount().toString()));
-			mol.setProperty("Registered Lot Amount Units", ((metalotReturn.getMetalot().getLot().getAmountUnits() == null) ? "" : metalotReturn.getMetalot().getLot().getAmountUnits().getCode()));
-			mol.setProperty("Registered Lot Supplier", ((metalotReturn.getMetalot().getLot().getSupplier() == null) ? "" : metalotReturn.getMetalot().getLot().getSupplier()));
-			mol.setProperty("Registered Lot Supplier ID",((metalotReturn.getMetalot().getLot().getSupplierID() == null) ? "" : metalotReturn.getMetalot().getLot().getSupplierID()));
-			mol.setProperty("Registered Lot Vendor ID", ((metalotReturn.getMetalot().getLot().getVendorId() == null) ? "" : metalotReturn.getMetalot().getLot().getVendorId()));
-			if (!parentAliasList.isEmpty()){
-				for (String alias : parentAliasList){
-					if (allParentAliases.length() == 0) allParentAliases += alias;
-					else allParentAliases += "; "+alias;
+			mol.setProperty("Registered Lot Project", ((metalotReturn.getMetalot().getLot().getProject() == null) ? ""
+					: metalotReturn.getMetalot().getLot().getProject()));
+			mol.setProperty("Registered Lot Barcode", ((metalotReturn.getMetalot().getLot().getBarcode() == null) ? ""
+					: metalotReturn.getMetalot().getLot().getBarcode()));
+			mol.setProperty("Registered Lot Amount", ((metalotReturn.getMetalot().getLot().getAmount() == null) ? ""
+					: metalotReturn.getMetalot().getLot().getAmount().toString()));
+			mol.setProperty("Registered Lot Amount Units",
+					((metalotReturn.getMetalot().getLot().getAmountUnits() == null) ? ""
+							: metalotReturn.getMetalot().getLot().getAmountUnits().getCode()));
+			mol.setProperty("Registered Lot Supplier", ((metalotReturn.getMetalot().getLot().getSupplier() == null) ? ""
+					: metalotReturn.getMetalot().getLot().getSupplier()));
+			mol.setProperty("Registered Lot Supplier ID",
+					((metalotReturn.getMetalot().getLot().getSupplierID() == null) ? ""
+							: metalotReturn.getMetalot().getLot().getSupplierID()));
+			mol.setProperty("Registered Lot Vendor ID",
+					((metalotReturn.getMetalot().getLot().getVendorId() == null) ? ""
+							: metalotReturn.getMetalot().getLot().getVendorId()));
+			if (!parentAliasList.isEmpty()) {
+				for (String alias : parentAliasList) {
+					if (allParentAliases.length() == 0)
+						allParentAliases += alias;
+					else
+						allParentAliases += "; " + alias;
 				}
 				mol.setProperty("Registered Parent Aliases", allParentAliases);
 			}
 		}
 		ArrayList<String> warningMessagesArray = new ArrayList<>();
-		for(ValidationResponseDTO valResp : validationResponse) {
-			if(valResp.getRecord() == numRecordsRead && valResp.getLevel() == "warning") {
+		for (ValidationResponseDTO valResp : validationResponse) {
+			if (valResp.getRecord() == numRecordsRead && valResp.getLevel() == "warning") {
 				warningMessagesArray.add(valResp.getMessage());
 			}
 		}
@@ -586,53 +641,68 @@ public void writeRegisteredMol(int numRecordsRead, CmpdRegMolecule mol, MetalotR
 		mol.setProperty("Warnings", warningMessages);
 
 		String registrationLevel;
-		if (isNewParent) registrationLevel = "New parent with new lot";
-		else registrationLevel = "New lot of existing parent";
+		if (isNewParent)
+			registrationLevel = "New parent with new lot";
+		else
+			registrationLevel = "New lot of existing parent";
 		mol.setProperty("Registration Level", registrationLevel);
 		registeredMolExporter.writeMol(mol);
-		String csvRow = numRecordsRead+",\""+sdfCorpName+"\",\""+dbCorpName+"\",\""+registeredParentCorpName+"\",\""+allParentAliases+"\",\""+allLotAliases+"\",\""+registrationLevel+"\",\""+warningMessages+"\"\n";
+		String csvRow = numRecordsRead + ",\"" + sdfCorpName + "\",\"" + dbCorpName + "\",\"" + registeredParentCorpName
+				+ "\",\"" + allParentAliases + "\",\"" + allLotAliases + "\",\"" + registrationLevel + "\",\""
+				+ warningMessages + "\"\n";
 		registeredCSVOutStream.write(csvRow.getBytes());
 	}
 
-	public void logError(Exception e, int numRecordsRead, CmpdRegMolecule mol, Collection<BulkLoadPropertyMappingDTO> mappings, CmpdRegSDFWriter errorMolExporter, Collection<ValidationResponseDTO> validationResponse, FileOutputStream errorCSVOutStream) throws IOException, CmpdRegMolFormatException {
-		logger.error("Caught exception on molecule number "+numRecordsRead, e);
+	public void logError(Exception e, int numRecordsRead, CmpdRegMolecule mol,
+			Collection<BulkLoadPropertyMappingDTO> mappings, CmpdRegSDFWriter errorMolExporter,
+			Collection<ValidationResponseDTO> validationResponse, FileOutputStream errorCSVOutStream)
+			throws IOException, CmpdRegMolFormatException {
+		logger.error("Caught exception on molecule number " + numRecordsRead, e);
 
 		String errorMessage = e.getMessage();
 
-		//assuming sdf and db corpNames are Lot Corp Name
+		// assuming sdf and db corpNames are Lot Corp Name
 		String sdfCorpName = getStringValueFromMappings(mol, "Parent Corp Name", mappings);
 		String dbCorpName = "";
 		String aliasCorpNames = "";
 		String categoryCode = "Unassigned";
-		BulkLoadPropertyMappingDTO mapping = BulkLoadPropertyMappingDTO.findMappingByDbPropertyEquals(mappings, "Lot Corp Name");
-		if (e.getClass() == DupeLotException.class){
+		BulkLoadPropertyMappingDTO mapping = BulkLoadPropertyMappingDTO.findMappingByDbPropertyEquals(mappings,
+				"Lot Corp Name");
+		if (e.getClass() == DupeLotException.class) {
 			DupeLotException dupeLotError = (DupeLotException) e;
 			categoryCode = "DupeLot";
 			dbCorpName = dupeLotError.getLotCorpName();
-			if (dbCorpName != null && dbCorpName.length() > 0) mol.setProperty("Lot Corp Name in DB", dbCorpName);
-		}else if (e.getClass() == DupeParentException.class){
+			if (dbCorpName != null && dbCorpName.length() > 0)
+				mol.setProperty("Lot Corp Name in DB", dbCorpName);
+		} else if (e.getClass() == DupeParentException.class) {
 			DupeParentException dupeParentError = (DupeParentException) e;
 			categoryCode = "DupeParent";
 			dbCorpName = dupeParentError.getDbCorpName();
 			sdfCorpName = dupeParentError.getSdfCorpName();
-			if (dupeParentError.getAliasCorpNames() != null && !dupeParentError.getAliasCorpNames().isEmpty()){
-				for (String aliasCorpName : dupeParentError.getAliasCorpNames()){
-					if (aliasCorpName.length() == 0) aliasCorpNames += aliasCorpName;
-					else  aliasCorpNames += "; "+aliasCorpName;
+			if (dupeParentError.getAliasCorpNames() != null && !dupeParentError.getAliasCorpNames().isEmpty()) {
+				for (String aliasCorpName : dupeParentError.getAliasCorpNames()) {
+					if (aliasCorpName.length() == 0)
+						aliasCorpNames += aliasCorpName;
+					else
+						aliasCorpNames += "; " + aliasCorpName;
 				}
 			}
-			if (dbCorpName != null && dbCorpName.length() > 0) mol.setProperty("Parent Corp Name in DB", dbCorpName);
-			if (sdfCorpName != null && sdfCorpName.length() > 0) mol.setProperty("Parent Corp Name in SDF", sdfCorpName);
-			if (aliasCorpNames != null && aliasCorpNames.length() > 0) mol.setProperty("Alias Corp Names in SDF", aliasCorpNames);
-			
-			}
-		
-		validationResponse.add(new ValidationResponseDTO("error", numRecordsRead, categoryCode, errorMessage, errorMessage));
+			if (dbCorpName != null && dbCorpName.length() > 0)
+				mol.setProperty("Parent Corp Name in DB", dbCorpName);
+			if (sdfCorpName != null && sdfCorpName.length() > 0)
+				mol.setProperty("Parent Corp Name in SDF", sdfCorpName);
+			if (aliasCorpNames != null && aliasCorpNames.length() > 0)
+				mol.setProperty("Alias Corp Names in SDF", aliasCorpNames);
+
+		}
+
+		validationResponse
+				.add(new ValidationResponseDTO("error", numRecordsRead, categoryCode, errorMessage, errorMessage));
 		mol.setProperty("Error", errorMessage);
 
 		ArrayList<String> warningMessagesArray = new ArrayList<>();
-		for(ValidationResponseDTO valResp : validationResponse) {
-			if(valResp.getRecord() == numRecordsRead && valResp.getLevel() == "warning") {
+		for (ValidationResponseDTO valResp : validationResponse) {
+			if (valResp.getRecord() == numRecordsRead && valResp.getLevel() == "warning") {
 				warningMessagesArray.add(valResp.getMessage());
 			}
 		}
@@ -640,256 +710,387 @@ public void logError(Exception e, int numRecordsRead, CmpdRegMolecule mol, Colle
 		mol.setProperty("Warnings", errorMessage);
 
 		errorMolExporter.writeMol(mol);
-		String csvRow = numRecordsRead+",\""+sdfCorpName+"\",\""+dbCorpName+"\",\""+aliasCorpNames+"\",\""+errorMessage+"\",\""+warningMessages+"\"\n";
+		String csvRow = numRecordsRead + ",\"" + sdfCorpName + "\",\"" + dbCorpName + "\",\"" + aliasCorpNames + "\",\""
+				+ errorMessage + "\",\"" + warningMessages + "\"\n";
 		errorCSVOutStream.write(csvRow.getBytes());
 	}
 
-	public void logWarning(String categoryCode, String categoryDescription, String warningMessage, int numRecordsRead, Collection<ValidationResponseDTO> validationResponse) {
-		logger.error("Caught warning on molecule number "+numRecordsRead, warningMessage);
-		validationResponse.add(new ValidationResponseDTO("warning", numRecordsRead, categoryCode, categoryDescription, warningMessage));
+	public void logWarning(String categoryCode, String categoryDescription, String warningMessage, int numRecordsRead,
+			Collection<ValidationResponseDTO> validationResponse) {
+		logger.error("Caught warning on molecule number " + numRecordsRead, warningMessage);
+		validationResponse.add(new ValidationResponseDTO("warning", numRecordsRead, categoryCode, categoryDescription,
+				warningMessage));
 		String warning = categoryCode + ": " + categoryDescription;
 	}
 
-	public Parent validateParent(Parent parent, Collection<BulkLoadPropertyMappingDTO> mappings, int numRecordsRead, Collection<ValidationResponseDTO> validationResponse) throws MissingPropertyException, DupeParentException, SaltedCompoundException, Exception{
-		//Search for the parent structure + stereo category
-		if (parent.getStereoCategory() == null) throw new MissingPropertyException("Parent Stereo Category must be provided");
+	public Parent validateParent(Parent parent, Collection<BulkLoadPropertyMappingDTO> mappings, int numRecordsRead,
+			Collection<ValidationResponseDTO> validationResponse)
+			throws MissingPropertyException, DupeParentException, SaltedCompoundException, Exception {
+		// Search for the parent structure + stereo category
+		if (parent.getStereoCategory() == null)
+			throw new MissingPropertyException("Parent Stereo Category must be provided");
 		HashSet<String> requiredDbProperties = new HashSet<String>();
-		for (BulkLoadPropertyMappingDTO mapping : mappings){
-			if (mapping.isRequired()) requiredDbProperties.add(mapping.getDbProperty());
+		for (BulkLoadPropertyMappingDTO mapping : mappings) {
+			if (mapping.isRequired())
+				requiredDbProperties.add(mapping.getDbProperty());
 		}
-		//check parent corp name for whitespace
-		if (parent.getCorpName() != null && parent.getCorpName().length() > 0){
+		// check parent corp name for whitespace
+		if (parent.getCorpName() != null && parent.getCorpName().length() > 0) {
 			parent.setCorpName(parent.getCorpName().trim());
-			if (parent.getCorpName().contains(" ") | parent.getCorpName().contains("\t") | parent.getCorpName().contains("\n")){
-				throw new Exception("Parent Corp Name: "+parent.getCorpName()+" contains internal whitespace.");
+			if (parent.getCorpName().contains(" ") | parent.getCorpName().contains("\t")
+					| parent.getCorpName().contains("\n")) {
+				throw new Exception("Parent Corp Name: " + parent.getCorpName() + " contains internal whitespace.");
 			}
 		}
-		//check if parent stereo category is "See Comments" but no stereo comment is provided
-		if (parent.getStereoCategory().getCode().equalsIgnoreCase("see_comments") && (parent.getStereoComment() == null || parent.getStereoComment().length()==0)){
+		// check if parent stereo category is "See Comments" but no stereo comment is
+		// provided
+		if (parent.getStereoCategory().getCode().equalsIgnoreCase("see_comments")
+				&& (parent.getStereoComment() == null || parent.getStereoComment().length() == 0)) {
 			logger.error("Stereo category is See Comments, but no stereo comment provided");
 			throw new MissingPropertyException("Stereo category is See Comments, but no stereo comment provided");
 		}
 		int[] dupeParentList = {};
-		if(propertiesUtilService.getRegisterNoStructureCompoundsAsUniqueParents() && chemStructureService.isEmpty(parent.getMolStructure()) ) {
-			//if true then we are no checking this one for hits
-			logger.warn("mol is empty and registerNoStructureCompoundsAsUniqueParents so not checking for dupe parents by structure but other dupe checking will be done");
+		if (propertiesUtilService.getRegisterNoStructureCompoundsAsUniqueParents()
+				&& chemStructureService.isEmpty(parent.getMolStructure())) {
+			// if true then we are no checking this one for hits
+			logger.warn(
+					"mol is empty and registerNoStructureCompoundsAsUniqueParents so not checking for dupe parents by structure but other dupe checking will be done");
 		} else {
 			dupeParentList = chemStructureService.checkDupeMol(parent.getMolStructure(), StructureType.PARENT);
 		}
-		if (dupeParentList.length > 0){
-			searchResultLoop:
-			for (int foundParentCdId : dupeParentList){
+		if (dupeParentList.length > 0) {
+			searchResultLoop: for (int foundParentCdId : dupeParentList) {
 				List<Parent> foundParents = Parent.findParentsByCdId(foundParentCdId).getResultList();
-				
+
 				DupeParentException dupeException = null;
 				String categoryDescription;
-				for (Parent foundParent : foundParents){
-					//same structure
-					boolean sameStereoCategory = (parent.getStereoCategory().getCode().equalsIgnoreCase(foundParent.getStereoCategory().getCode()));
-					boolean sameStereoComment = (((parent.getStereoComment() == null || parent.getStereoComment().length() < 1) && (foundParent.getStereoComment() == null || foundParent.getStereoComment().length() < 1))
-							|| (parent.getStereoComment() != null && foundParent.getStereoComment() != null && parent.getStereoComment().equalsIgnoreCase(foundParent.getStereoComment())));
-					boolean sameCorpName = (parent.getCorpName() != null && parent.getCorpName().equals(foundParent.getCorpName()));
+				for (Parent foundParent : foundParents) {
+					// same structure
+					boolean sameStereoCategory = (parent.getStereoCategory().getCode()
+							.equalsIgnoreCase(foundParent.getStereoCategory().getCode()));
+					boolean sameStereoComment = (((parent.getStereoComment() == null
+							|| parent.getStereoComment().length() < 1)
+							&& (foundParent.getStereoComment() == null || foundParent.getStereoComment().length() < 1))
+							|| (parent.getStereoComment() != null && foundParent.getStereoComment() != null
+									&& parent.getStereoComment().equalsIgnoreCase(foundParent.getStereoComment())));
+					boolean sameCorpName = (parent.getCorpName() != null
+							&& parent.getCorpName().equals(foundParent.getCorpName()));
 					boolean noCorpName = (parent.getCorpName() == null);
-					boolean sameCorpPrefixOrNoPrefix = (parent.getLabelPrefix() == null || foundParent.getCorpName().contains(parent.getLabelPrefix().getLabelPrefix()));
-					if (sameStereoCategory & sameStereoComment & (sameCorpName | (noCorpName & sameCorpPrefixOrNoPrefix))){
-						//parents match
+					boolean sameCorpPrefixOrNoPrefix = (parent.getLabelPrefix() == null
+							|| foundParent.getCorpName().contains(parent.getLabelPrefix().getLabelPrefix()));
+					if (sameStereoCategory & sameStereoComment
+							& (sameCorpName | (noCorpName & sameCorpPrefixOrNoPrefix))) {
+						// parents match
 						parent = foundParent;
 						break searchResultLoop;
-					}else if (sameStereoCategory & sameStereoComment & !sameCorpName & !noCorpName){
-						//corp name conflict
-						logger.error("Mismatched corp names for same parent structure, stereo category and stereo comment! sdf corp name: "+parent.getCorpName()+" db corp name: "+foundParent.getCorpName());
-						if(dupeException == null) dupeException = new DupeParentException("Mismatched corp names for same parent structure, stereo category and stereo comment!", foundParent.getCorpName(), parent.getCorpName(), new ArrayList<String>());
-					}else if (sameStereoCategory & sameStereoComment & noCorpName & !sameCorpPrefixOrNoPrefix) {
-						//corp prefix conflict
-						logger.error("Mismatched corp prefix for same parent structure, stereo category, and stereo comment! sdf corp prefix: "+parent.getLabelPrefix().getLabelPrefix()+" db corp name: "+foundParent.getCorpName());
-						if(dupeException == null) dupeException = new DupeParentException("Mismatched corp prefix for same parent structure, stereo category, and stereo comment!", foundParent.getCorpName(), parent.getLabelPrefix().getLabelPrefix(), new ArrayList<String>());
-					}else if (sameStereoCategory & !sameStereoComment & sameCorpName & !noCorpName){
-						//stereo comment conflict for same corpName
-						logger.error("Mismatched stereo comments for same parent structure, stereo category and corp name! Corp name: "+parent.getCorpName()+" sdf stereo category: "+parent.getStereoCategory().getCode()+" sdf stereo comment: "+parent.getStereoComment()+" db stereo category: "+foundParent.getStereoCategory().getCode()+" db stereo comment: "+foundParent.getStereoComment());
-						if(dupeException == null) dupeException = new DupeParentException("Mismatched stereo comments for same parent structure, stereo category and corp name!", foundParent.getCorpName(), parent.getCorpName(), new ArrayList<String>());
-					}else if (sameStereoCategory & !sameStereoComment & (!sameCorpName | noCorpName)){
-						//same stereo category, but different stereo comment => new parent
+					} else if (sameStereoCategory & sameStereoComment & !sameCorpName & !noCorpName) {
+						// corp name conflict
+						logger.error(
+								"Mismatched corp names for same parent structure, stereo category and stereo comment! sdf corp name: "
+										+ parent.getCorpName() + " db corp name: " + foundParent.getCorpName());
+						if (dupeException == null)
+							dupeException = new DupeParentException(
+									"Mismatched corp names for same parent structure, stereo category and stereo comment!",
+									foundParent.getCorpName(), parent.getCorpName(), new ArrayList<String>());
+					} else if (sameStereoCategory & sameStereoComment & noCorpName & !sameCorpPrefixOrNoPrefix) {
+						// corp prefix conflict
+						logger.error(
+								"Mismatched corp prefix for same parent structure, stereo category, and stereo comment! sdf corp prefix: "
+										+ parent.getLabelPrefix().getLabelPrefix() + " db corp name: "
+										+ foundParent.getCorpName());
+						if (dupeException == null)
+							dupeException = new DupeParentException(
+									"Mismatched corp prefix for same parent structure, stereo category, and stereo comment!",
+									foundParent.getCorpName(), parent.getLabelPrefix().getLabelPrefix(),
+									new ArrayList<String>());
+					} else if (sameStereoCategory & !sameStereoComment & sameCorpName & !noCorpName) {
+						// stereo comment conflict for same corpName
+						logger.error(
+								"Mismatched stereo comments for same parent structure, stereo category and corp name! Corp name: "
+										+ parent.getCorpName() + " sdf stereo category: "
+										+ parent.getStereoCategory().getCode() + " sdf stereo comment: "
+										+ parent.getStereoComment() + " db stereo category: "
+										+ foundParent.getStereoCategory().getCode() + " db stereo comment: "
+										+ foundParent.getStereoComment());
+						if (dupeException == null)
+							dupeException = new DupeParentException(
+									"Mismatched stereo comments for same parent structure, stereo category and corp name!",
+									foundParent.getCorpName(), parent.getCorpName(), new ArrayList<String>());
+					} else if (sameStereoCategory & !sameStereoComment & (!sameCorpName | noCorpName)) {
+						// same stereo category, but different stereo comment => new parent
 						categoryDescription = "Matching structure found with same stereo category but different stereo comment and different corp name";
-						logWarning("MatchingStructureSameStereoDifferentComment",categoryDescription, categoryDescription + ": " + foundParent.getCorpName(), numRecordsRead, validationResponse);
+						logWarning("MatchingStructureSameStereoDifferentComment", categoryDescription,
+								categoryDescription + ": " + foundParent.getCorpName(), numRecordsRead,
+								validationResponse);
 						continue;
-					}else if (!sameStereoCategory & sameCorpName & !noCorpName){
-						logger.error("Mismatched stereo categories for same parent structure and corp name! Corp name: "+parent.getCorpName()+" sdf stereo category: "+parent.getStereoCategory().getCode()+" db stereo category: "+foundParent.getStereoCategory().getCode());
-						if(dupeException == null) dupeException = new DupeParentException("Mismatched stereo categories for same parent structure and corp name!", foundParent.getCorpName(), parent.getCorpName(), new ArrayList<String>());
-					}else if (!sameStereoCategory & (!sameCorpName | noCorpName)){
-						//Different stereo category, different corpName => new parent
+					} else if (!sameStereoCategory & sameCorpName & !noCorpName) {
+						logger.error("Mismatched stereo categories for same parent structure and corp name! Corp name: "
+								+ parent.getCorpName() + " sdf stereo category: " + parent.getStereoCategory().getCode()
+								+ " db stereo category: " + foundParent.getStereoCategory().getCode());
+						if (dupeException == null)
+							dupeException = new DupeParentException(
+									"Mismatched stereo categories for same parent structure and corp name!",
+									foundParent.getCorpName(), parent.getCorpName(), new ArrayList<String>());
+					} else if (!sameStereoCategory & (!sameCorpName | noCorpName)) {
+						// Different stereo category, different corpName => new parent
 						categoryDescription = "Matching structure found with different stereo category and different db corp name";
-						logWarning("MatchingStructureDifferentStereoCategory",categoryDescription, categoryDescription + ": " + foundParent.getCorpName(), numRecordsRead, validationResponse);
+						logWarning("MatchingStructureDifferentStereoCategory", categoryDescription,
+								categoryDescription + ": " + foundParent.getCorpName(), numRecordsRead,
+								validationResponse);
 						continue;
 					}
 				}
-				if(dupeException != null) {
+				if (dupeException != null) {
 					throw dupeException;
 				}
 			}
 		}
-		//check for multiple fragments, and if isMixture or not
-		if (chemStructureService.checkForSalt(parent.getMolStructure())){
-			//multiple fragments
-			if (parent.getIsMixture() != null){
-				if (!parent.getIsMixture()){
+		// check for multiple fragments, and if isMixture or not
+		if (chemStructureService.checkForSalt(parent.getMolStructure())) {
+			// multiple fragments
+			if (parent.getIsMixture() != null) {
+				if (!parent.getIsMixture()) {
 					logger.error("Multiple fragments detected. Please fix or mark \"Parent Is Mixture\" as true");
-					throw new SaltedCompoundException("Multiple fragments detected. Please fix or mark \"Parent Is Mixture\" as true");
-				}else{
-					//do nothing - structure is appropriately marked as a mixture
+					throw new SaltedCompoundException(
+							"Multiple fragments detected. Please fix or mark \"Parent Is Mixture\" as true");
+				} else {
+					// do nothing - structure is appropriately marked as a mixture
 				}
-			}else{
+			} else {
 				logger.error("Multiple fragments detected. Please fix or mark \"Parent Is Mixture\" as true");
-				throw new SaltedCompoundException("Multiple fragments detected. Please fix or mark \"Parent Is Mixture\" as true");
+				throw new SaltedCompoundException(
+						"Multiple fragments detected. Please fix or mark \"Parent Is Mixture\" as true");
 			}
 		}
-		//If parent has not already been identified, see if the corpName is provided and exists
-		if (parent.getId() == null && parent.getCorpName() != null && parent.getCorpName().length() > 0){
+		// If parent has not already been identified, see if the corpName is provided
+		// and exists
+		if (parent.getId() == null && parent.getCorpName() != null && parent.getCorpName().length() > 0) {
 			Parent foundParent = null;
-			try{
+			try {
 				foundParent = Parent.findParentsByCorpNameEquals(parent.getCorpName()).getSingleResult();
-				boolean structuresMatch = chemStructureService.standardizedMolCompare(parent.getMolStructure(), foundParent.getMolStructure());
-				
-				if (!structuresMatch){
-					logger.error("Parent corp name already exists for a different parent structure: "+foundParent.getCorpName());
-					throw new DupeParentException("Parent corp name already exists for a different parent structure: "+foundParent.getCorpName());
-				}
-				else{
+				boolean structuresMatch = chemStructureService.standardizedMolCompare(parent.getMolStructure(),
+						foundParent.getMolStructure());
+
+				if (!structuresMatch) {
+					logger.error("Parent corp name already exists for a different parent structure: "
+							+ foundParent.getCorpName());
+					throw new DupeParentException("Parent corp name already exists for a different parent structure: "
+							+ foundParent.getCorpName());
+				} else {
 					parent = foundParent;
 				}
-			}catch (NoResultException empty){
-				logger.warn("Parent corp name entered that doesn't already exist (sdf corp name: '"+parent.getCorpName()+"'), this compound will be registered with a new parent corp name: ");
+			} catch (NoResultException empty) {
+				logger.warn("Parent corp name entered that doesn't already exist (sdf corp name: '"
+						+ parent.getCorpName() + "'), this compound will be registered with a new parent corp name: ");
 				foundParent = null;
-			}catch (DupeParentException dupe){
+			} catch (DupeParentException dupe) {
 				throw dupe;
-			}catch (Exception e){
-				logger.error("Caught exception comparing parent structures for parent corp name: "+parent.getCorpName(),e);
+			} catch (Exception e) {
+				logger.error(
+						"Caught exception comparing parent structures for parent corp name: " + parent.getCorpName(),
+						e);
 				foundParent = null;
 			}
-			if (foundParent != null && foundParent != parent) throw new DupeParentException("Duplicate corp names for different parent structure and stereo category! sdf corp name: "+parent.getCorpName()+" db corp name: "+foundParent.getCorpName());
+			if (foundParent != null && foundParent != parent)
+				throw new DupeParentException(
+						"Duplicate corp names for different parent structure and stereo category! sdf corp name: "
+								+ parent.getCorpName() + " db corp name: " + foundParent.getCorpName());
 		}
 
 		return parent;
 	}
 
+	public Parent validateParentAgainstDryRunCompound(Parent parent, int numRecordsRead,
+			Collection<ValidationResponseDTO> validationResponse)
+			throws MissingPropertyException, DupeParentException, SaltedCompoundException, Exception {
+		int[] dupeDryRunCompoundsList = chemStructureService.checkDupeMol(parent.getMolStructure(),
+				StructureType.DRY_RUN);
+		if (dupeDryRunCompoundsList.length > 0) {
+			searchResultLoop: for (int foundParentCdId : dupeDryRunCompoundsList) {
+				List<DryRunCompound> foundDryRunCompounds = DryRunCompound.findDryRunCompoundsByCdId(foundParentCdId)
+						.getResultList();
 
-	public Parent validateParentAgainstDryRunCompound(Parent parent, int numRecordsRead, Collection<ValidationResponseDTO> validationResponse) throws MissingPropertyException, DupeParentException, SaltedCompoundException, Exception{
-		int[] dupeDryRunCompoundsList = chemStructureService.checkDupeMol(parent.getMolStructure(), StructureType.DRY_RUN);
-		if (dupeDryRunCompoundsList.length > 0){
-			searchResultLoop:
-			for (int foundParentCdId : dupeDryRunCompoundsList){
-				List<DryRunCompound> foundDryRunCompounds = DryRunCompound.findDryRunCompoundsByCdId(foundParentCdId).getResultList();
-				
 				DupeParentException dupeException = null;
 				String categoryDescription;
-				for (DryRunCompound foundDryRunCompound : foundDryRunCompounds){
-					//same structure
-					boolean sameStereoCategory = (parent.getStereoCategory().getCode().equalsIgnoreCase(foundDryRunCompound.getStereoCategory()));
-					boolean sameStereoComment = (((parent.getStereoComment() == null || parent.getStereoComment().length() < 1) && (foundDryRunCompound.getStereoComment() == null || foundDryRunCompound.getStereoComment().length() < 1))
-							|| (parent.getStereoComment() != null && foundDryRunCompound.getStereoComment() != null && parent.getStereoComment().equalsIgnoreCase(foundDryRunCompound.getStereoComment())));
-					boolean sameCorpName = (parent.getCorpName() != null && foundDryRunCompound.getCorpName() != null && parent.getCorpName().equals(foundDryRunCompound.getCorpName()));
+				for (DryRunCompound foundDryRunCompound : foundDryRunCompounds) {
+					// same structure
+					boolean sameStereoCategory = (parent.getStereoCategory().getCode()
+							.equalsIgnoreCase(foundDryRunCompound.getStereoCategory()));
+					boolean sameStereoComment = (((parent.getStereoComment() == null
+							|| parent.getStereoComment().length() < 1)
+							&& (foundDryRunCompound.getStereoComment() == null
+									|| foundDryRunCompound.getStereoComment().length() < 1))
+							|| (parent.getStereoComment() != null && foundDryRunCompound.getStereoComment() != null
+									&& parent.getStereoComment()
+											.equalsIgnoreCase(foundDryRunCompound.getStereoComment())));
+					boolean sameCorpName = (parent.getCorpName() != null && foundDryRunCompound.getCorpName() != null
+							&& parent.getCorpName().equals(foundDryRunCompound.getCorpName()));
 					boolean noCorpName = (parent.getCorpName() == null);
 					boolean noCorpNameDryRunCompound = (foundDryRunCompound.getCorpName() == null);
-					// Its possible that the first compound in the validate table has no corporate ID specified and because we aren't currently predicting what the corp name will be that it receives as part of label
-					// sequences, we need to guard against the null corporate ID.  In the case that a found dry run compound has a null corp name and the new corp name has a corporte ID specified, this is NOT considered
-					// the same prefix.  If both compounds are null corp names then we DO consider them to have the same corp prefix.  If the found dry run compound has a specified corp name and the parent does not, then
-					// we need to check the found dry run compound for the matching specified prefix to make sure they will get the same corp name id on the non dry run.
-					boolean sameCorpPrefixOrNoPrefix = (parent.getLabelPrefix() == null || (noCorpName && noCorpNameDryRunCompound) || (!noCorpNameDryRunCompound && foundDryRunCompound.getCorpName().contains(parent.getLabelPrefix().getLabelPrefix())));
-					if (sameStereoCategory & sameStereoComment & (sameCorpName | (noCorpName & (noCorpNameDryRunCompound | sameCorpPrefixOrNoPrefix)))){
-						//parents match
+					// Its possible that the first compound in the validate table has no corporate
+					// ID specified and because we aren't currently predicting what the corp name
+					// will be that it receives as part of label
+					// sequences, we need to guard against the null corporate ID. In the case that a
+					// found dry run compound has a null corp name and the new corp name has a
+					// corporte ID specified, this is NOT considered
+					// the same prefix. If both compounds are null corp names then we DO consider
+					// them to have the same corp prefix. If the found dry run compound has a
+					// specified corp name and the parent does not, then
+					// we need to check the found dry run compound for the matching specified prefix
+					// to make sure they will get the same corp name id on the non dry run.
+					boolean sameCorpPrefixOrNoPrefix = (parent.getLabelPrefix() == null
+							|| (noCorpName && noCorpNameDryRunCompound)
+							|| (!noCorpNameDryRunCompound && foundDryRunCompound.getCorpName()
+									.contains(parent.getLabelPrefix().getLabelPrefix())));
+					if (sameStereoCategory & sameStereoComment
+							& (sameCorpName | (noCorpName & (noCorpNameDryRunCompound | sameCorpPrefixOrNoPrefix)))) {
+						// parents match
 						break searchResultLoop;
-					}else if (sameStereoCategory & sameStereoComment & !sameCorpName & !noCorpName){
-						//corp name conflict
-						logger.error("Within file, mismatched corp names for same parent structure, stereo category and stereo comment! sdf corp name: '"+parent.getCorpName()+"' earlier sdf record corp name: '"+foundDryRunCompound.getCorpName() + "'");
-						if(dupeException == null) dupeException = new DupeParentException("Within file, mismatched corp names for same parent structure, stereo category and stereo comment!", foundDryRunCompound.getCorpName(), parent.getCorpName(), new ArrayList<String>());
-					}else if (sameStereoCategory & sameStereoComment & noCorpName & !sameCorpPrefixOrNoPrefix) {
-						//corp prefix conflict
-						logger.error("Within file, mismatched corp prefix for same parent structure, stereo category, and stereo comment! sdf corp prefix: '"+parent.getLabelPrefix().getLabelPrefix()+"' earlier sdf record corp name: '"+foundDryRunCompound.getCorpName() + "'");
-						if(dupeException == null) dupeException =  new DupeParentException("Within file, mismatched corp prefix for same parent structure, stereo category, and stereo comment!", foundDryRunCompound.getCorpName(), parent.getLabelPrefix().getLabelPrefix(), new ArrayList<String>());
-					}else if (sameStereoCategory & !sameStereoComment & sameCorpName & !noCorpName){
-						//stereo comment conflict for same corpName
-						logger.error("Within file, mismatched stereo comments for same parent structure, stereo category and corp name! Corp name: "+parent.getCorpName()+" sdf stereo category: '"+parent.getStereoCategory().getCode()+"' sdf stereo comment: '"+parent.getStereoComment()+"' earlier sdf record stereo category: '"+foundDryRunCompound.getStereoCategory()+"' earlier sdf record stereo comment: '"+foundDryRunCompound.getStereoComment() + "'");
-						if(dupeException == null) dupeException =  new DupeParentException("Within file, mismatched stereo comments for same parent structure, stereo category and corp name!", foundDryRunCompound.getCorpName(), parent.getCorpName(), new ArrayList<String>());
-					}else if (sameStereoCategory & !sameStereoComment & (!sameCorpName | noCorpName)){
-						//same stereo category, but different stereo comment => new parent
+					} else if (sameStereoCategory & sameStereoComment & !sameCorpName & !noCorpName) {
+						// corp name conflict
+						logger.error(
+								"Within file, mismatched corp names for same parent structure, stereo category and stereo comment! sdf corp name: '"
+										+ parent.getCorpName() + "' earlier sdf record corp name: '"
+										+ foundDryRunCompound.getCorpName() + "'");
+						if (dupeException == null)
+							dupeException = new DupeParentException(
+									"Within file, mismatched corp names for same parent structure, stereo category and stereo comment!",
+									foundDryRunCompound.getCorpName(), parent.getCorpName(), new ArrayList<String>());
+					} else if (sameStereoCategory & sameStereoComment & noCorpName & !sameCorpPrefixOrNoPrefix) {
+						// corp prefix conflict
+						logger.error(
+								"Within file, mismatched corp prefix for same parent structure, stereo category, and stereo comment! sdf corp prefix: '"
+										+ parent.getLabelPrefix().getLabelPrefix() + "' earlier sdf record corp name: '"
+										+ foundDryRunCompound.getCorpName() + "'");
+						if (dupeException == null)
+							dupeException = new DupeParentException(
+									"Within file, mismatched corp prefix for same parent structure, stereo category, and stereo comment!",
+									foundDryRunCompound.getCorpName(), parent.getLabelPrefix().getLabelPrefix(),
+									new ArrayList<String>());
+					} else if (sameStereoCategory & !sameStereoComment & sameCorpName & !noCorpName) {
+						// stereo comment conflict for same corpName
+						logger.error(
+								"Within file, mismatched stereo comments for same parent structure, stereo category and corp name! Corp name: "
+										+ parent.getCorpName() + " sdf stereo category: '"
+										+ parent.getStereoCategory().getCode() + "' sdf stereo comment: '"
+										+ parent.getStereoComment() + "' earlier sdf record stereo category: '"
+										+ foundDryRunCompound.getStereoCategory()
+										+ "' earlier sdf record stereo comment: '"
+										+ foundDryRunCompound.getStereoComment() + "'");
+						if (dupeException == null)
+							dupeException = new DupeParentException(
+									"Within file, mismatched stereo comments for same parent structure, stereo category and corp name!",
+									foundDryRunCompound.getCorpName(), parent.getCorpName(), new ArrayList<String>());
+					} else if (sameStereoCategory & !sameStereoComment & (!sameCorpName | noCorpName)) {
+						// same stereo category, but different stereo comment => new parent
 						categoryDescription = "Within file, matching structure found with same stereo category but different stereo comment and different corp name";
-						logWarning("WithinFileMatchingStructureSameStereoDifferentComment", categoryDescription, categoryDescription + ": " + foundDryRunCompound.getCorpName()+ "(record number "+foundParentCdId+")", numRecordsRead, validationResponse);
+						logWarning("WithinFileMatchingStructureSameStereoDifferentComment", categoryDescription,
+								categoryDescription + ": " + foundDryRunCompound.getCorpName() + "(record number "
+										+ foundParentCdId + ")",
+								numRecordsRead, validationResponse);
 						continue;
-					}else if (!sameStereoCategory & sameCorpName & !noCorpName){
-						logger.error("Within file, mismatched stereo categories for same parent structure and corp name! Corp name: '"+parent.getCorpName()+"' sdf stereo category: '"+parent.getStereoCategory().getCode()+"' earlier sdf record stereo category: '"+foundDryRunCompound.getStereoCategory()+ "'");
-						if(dupeException == null) dupeException = new DupeParentException("Within file, mismatched stereo categories for same parent structure and corp name!", foundDryRunCompound.getCorpName(), parent.getCorpName(), new ArrayList<String>());
-					}else if (!sameStereoCategory & (!sameCorpName | noCorpName)){
-						//Different stereo category, different corpName => new parent
+					} else if (!sameStereoCategory & sameCorpName & !noCorpName) {
+						logger.error(
+								"Within file, mismatched stereo categories for same parent structure and corp name! Corp name: '"
+										+ parent.getCorpName() + "' sdf stereo category: '"
+										+ parent.getStereoCategory().getCode()
+										+ "' earlier sdf record stereo category: '"
+										+ foundDryRunCompound.getStereoCategory() + "'");
+						if (dupeException == null)
+							dupeException = new DupeParentException(
+									"Within file, mismatched stereo categories for same parent structure and corp name!",
+									foundDryRunCompound.getCorpName(), parent.getCorpName(), new ArrayList<String>());
+					} else if (!sameStereoCategory & (!sameCorpName | noCorpName)) {
+						// Different stereo category, different corpName => new parent
 						categoryDescription = "Within file, matching structure found with different stereo category and different corp name";
-						logWarning("WithinFileMatchingStructureDifferentStereoCategory", categoryDescription, categoryDescription + ": " + foundDryRunCompound.getCorpName()+ "(record number "+foundParentCdId+")", numRecordsRead, validationResponse);
+						logWarning("WithinFileMatchingStructureDifferentStereoCategory", categoryDescription,
+								categoryDescription + ": " + foundDryRunCompound.getCorpName() + "(record number "
+										+ foundParentCdId + ")",
+								numRecordsRead, validationResponse);
 						continue;
 					}
 				}
-				if(dupeException != null) {
+				if (dupeException != null) {
 					throw dupeException;
 				}
 			}
 		} else {
-			//At this point we know the structured doesn't already exist in the file so check to see if Corp name already exists
-			//  if the corp name does exist, that is an error because it's a different structure
-			if(parent.getCorpName() != null && !parent.getCorpName().equals("")) {
-				List<DryRunCompound> dryRunCmpds = DryRunCompound.findDryRunCompoundsByCorpNameEquals(parent.getCorpName()).getResultList();
-				if(dryRunCmpds.size() > 0) {
-					logger.error("Within file, parent corp name already exists for a different parent structure: "+dryRunCmpds.get(0).getCorpName());
-					throw new DupeParentException("Within file, parent corp name "+ dryRunCmpds.get(0).getCorpName() + " already exists for a different parent structure record number "+dryRunCmpds.get(0).getRecordNumber());
+			// At this point we know the structured doesn't already exist in the file so
+			// check to see if Corp name already exists
+			// if the corp name does exist, that is an error because it's a different
+			// structure
+			if (parent.getCorpName() != null && !parent.getCorpName().equals("")) {
+				List<DryRunCompound> dryRunCmpds = DryRunCompound
+						.findDryRunCompoundsByCorpNameEquals(parent.getCorpName()).getResultList();
+				if (dryRunCmpds.size() > 0) {
+					logger.error("Within file, parent corp name already exists for a different parent structure: "
+							+ dryRunCmpds.get(0).getCorpName());
+					throw new DupeParentException("Within file, parent corp name " + dryRunCmpds.get(0).getCorpName()
+							+ " already exists for a different parent structure record number "
+							+ dryRunCmpds.get(0).getRecordNumber());
 				}
 			}
 		}
 		return parent;
 	}
 
-	public SaltForm validateSaltForm(SaltForm saltForm, Collection<BulkLoadPropertyMappingDTO> mappings) throws CmpdRegMolFormatException {
-		//only try to check for existing saltForm if server is in saltBeforeLot mode
-		if (propertiesUtilService.getSaltBeforeLot()){
-			//structure search
-			if (saltForm.getMolStructure() != null){
-				int[] dupeSaltFormList = chemStructureService.checkDupeMol(saltForm.getMolStructure(), StructureType.SALT_FORM);
-				if (dupeSaltFormList.length > 0){
-					for (int foundSaltFormCdId : dupeSaltFormList){
-						//verify the found salt form has the same parent. If so, it's a match! If not, probably belongs to a parent with another stereo category
+	public SaltForm validateSaltForm(SaltForm saltForm, Collection<BulkLoadPropertyMappingDTO> mappings)
+			throws CmpdRegMolFormatException {
+		// only try to check for existing saltForm if server is in saltBeforeLot mode
+		if (propertiesUtilService.getSaltBeforeLot()) {
+			// structure search
+			if (saltForm.getMolStructure() != null) {
+				int[] dupeSaltFormList = chemStructureService.checkDupeMol(saltForm.getMolStructure(),
+						StructureType.SALT_FORM);
+				if (dupeSaltFormList.length > 0) {
+					for (int foundSaltFormCdId : dupeSaltFormList) {
+						// verify the found salt form has the same parent. If so, it's a match! If not,
+						// probably belongs to a parent with another stereo category
 						SaltForm foundSaltForm = SaltForm.findSaltFormsByCdId(foundSaltFormCdId).getSingleResult();
-						if (foundSaltForm.getParent().getId() == saltForm.getParent().getId()){
-							if (logger.isDebugEnabled()) logger.debug("Found matching existing salt form with same parent.");
+						if (foundSaltForm.getParent().getId() == saltForm.getParent().getId()) {
+							if (logger.isDebugEnabled())
+								logger.debug("Found matching existing salt form with same parent.");
 							saltForm = foundSaltForm;
 							return saltForm;
 						}
 					}
 				}
-			}else if (saltForm.getParent().getId() != null){
-				//parent already exists, so check if this saltForm may already exist
-				Collection<SaltForm> existingSaltForms = SaltForm.findSaltFormsByParent(saltForm.getParent()).getResultList();
-				for (SaltForm existingSaltForm : existingSaltForms){
-					if (existingSaltForm.getIsoSalts().size() == saltForm.getIsoSalts().size()){
-						if (saltForm.getIsoSalts().size() == 0){
+			} else if (saltForm.getParent().getId() != null) {
+				// parent already exists, so check if this saltForm may already exist
+				Collection<SaltForm> existingSaltForms = SaltForm.findSaltFormsByParent(saltForm.getParent())
+						.getResultList();
+				for (SaltForm existingSaltForm : existingSaltForms) {
+					if (existingSaltForm.getIsoSalts().size() == saltForm.getIsoSalts().size()) {
+						if (saltForm.getIsoSalts().size() == 0) {
 							saltForm = existingSaltForm;
 							return saltForm;
-						}else{
-							//make a map of salt or isotope abbrev and equivalents for the new saltForm to use for determining uniqueness
+						} else {
+							// make a map of salt or isotope abbrev and equivalents for the new saltForm to
+							// use for determining uniqueness
 							Map<String, Double> isoSaltMap = new HashMap<String, Double>();
-							for (IsoSalt isoSalt : saltForm.getIsoSalts()){
-								if (isoSalt.getSalt() != null) isoSaltMap.put(isoSalt.getSalt().getAbbrev(), isoSalt.getEquivalents());
-								else isoSaltMap.put(isoSalt.getIsotope().getAbbrev(), isoSalt.getEquivalents());
+							for (IsoSalt isoSalt : saltForm.getIsoSalts()) {
+								if (isoSalt.getSalt() != null)
+									isoSaltMap.put(isoSalt.getSalt().getAbbrev(), isoSalt.getEquivalents());
+								else
+									isoSaltMap.put(isoSalt.getIsotope().getAbbrev(), isoSalt.getEquivalents());
 							}
 							boolean sameSaltForm = true;
-							for (IsoSalt isoSalt : existingSaltForm.getIsoSalts()){
-								if (isoSalt.getSalt() != null){
-									if (!isoSaltMap.containsKey(isoSalt.getSalt().getAbbrev())){
+							for (IsoSalt isoSalt : existingSaltForm.getIsoSalts()) {
+								if (isoSalt.getSalt() != null) {
+									if (!isoSaltMap.containsKey(isoSalt.getSalt().getAbbrev())) {
 										sameSaltForm = false;
 										break;
-									}else if ( Math.abs(isoSaltMap.get(isoSalt.getSalt().getAbbrev()) - isoSalt.getEquivalents()) < 1e-4 ){
-										//same abbrev, and equivalents are equal
+									} else if (Math.abs(isoSaltMap.get(isoSalt.getSalt().getAbbrev())
+											- isoSalt.getEquivalents()) < 1e-4) {
+										// same abbrev, and equivalents are equal
 										continue;
-									}else{
-										//same abbrev, but different equivalents
+									} else {
+										// same abbrev, but different equivalents
 										sameSaltForm = false;
 									}
 								}
 							}
-							if (sameSaltForm){
+							if (sameSaltForm) {
 								saltForm = existingSaltForm;
 								return saltForm;
 							}
@@ -901,98 +1102,122 @@ public SaltForm validateSaltForm(SaltForm saltForm, Collection<BulkLoadPropertyM
 		return saltForm;
 	}
 
-	public Lot validateLot(Lot lot, Collection<BulkLoadPropertyMappingDTO> mappings, Collection<ValidationResponseDTO> results) throws MissingPropertyException, DupeLotException {
-		//check for required fields
+	public Lot validateLot(Lot lot, Collection<BulkLoadPropertyMappingDTO> mappings,
+			Collection<ValidationResponseDTO> results) throws MissingPropertyException, DupeLotException {
+		// check for required fields
 		HashSet<String> requiredDbProperties = new HashSet<String>();
-		for (BulkLoadPropertyMappingDTO mapping : mappings){
-			if (mapping.isRequired()) requiredDbProperties.add(mapping.getDbProperty());
+		for (BulkLoadPropertyMappingDTO mapping : mappings) {
+			if (mapping.isRequired())
+				requiredDbProperties.add(mapping.getDbProperty());
 		}
 		HashSet<String> missingProperties = new HashSet<String>();
-		if (lot.getLotNumber() == -1 && requiredDbProperties.contains("Lot Number")) missingProperties.add("Lot Number");
-		if (lot.getSynthesisDate() == null && requiredDbProperties.contains("Lot Synthesis Date")) missingProperties.add("Lot Synthesis Date");
-		if (lot.getNotebookPage() == null && requiredDbProperties.contains("Lot Notebook Page")) missingProperties.add("Lot Notebook Page");
-		if (lot.getChemist() == null && requiredDbProperties.contains("Lot Chemist")) missingProperties.add("Lot Chemist");
-		if (lot.getPurityMeasuredBy() == null && requiredDbProperties.contains("Lot Purity Measured By"))  missingProperties.add("Lot Purity Measured By");
+		if (lot.getLotNumber() == -1 && requiredDbProperties.contains("Lot Number"))
+			missingProperties.add("Lot Number");
+		if (lot.getSynthesisDate() == null && requiredDbProperties.contains("Lot Synthesis Date"))
+			missingProperties.add("Lot Synthesis Date");
+		if (lot.getNotebookPage() == null && requiredDbProperties.contains("Lot Notebook Page"))
+			missingProperties.add("Lot Notebook Page");
+		if (lot.getChemist() == null && requiredDbProperties.contains("Lot Chemist"))
+			missingProperties.add("Lot Chemist");
+		if (lot.getPurityMeasuredBy() == null && requiredDbProperties.contains("Lot Purity Measured By"))
+			missingProperties.add("Lot Purity Measured By");
 
 		// If lot inventory is one then we do extra validation to make sure
 		// that lot barcode, amount and amount untis are filled in if the user
 		// is trying to add lot inventory
 		if (propertiesUtilService.getCompoundInventory()) {
-			if ((lot.getAmount() != null || lot.getAmountUnits() != null) && lot.getBarcode() == null) missingProperties.add("Lot Barcode");
-			if ((lot.getBarcode() != null || lot.getAmountUnits() != null) && lot.getAmount() == null) missingProperties.add("Lot Amount");
-			if ((lot.getBarcode() != null || lot.getAmount() != null) && lot.getAmountUnits() == null) missingProperties.add("Lot Amount Units");
+			if ((lot.getAmount() != null || lot.getAmountUnits() != null) && lot.getBarcode() == null)
+				missingProperties.add("Lot Barcode");
+			if ((lot.getBarcode() != null || lot.getAmountUnits() != null) && lot.getAmount() == null)
+				missingProperties.add("Lot Amount");
+			if ((lot.getBarcode() != null || lot.getAmount() != null) && lot.getAmountUnits() == null)
+				missingProperties.add("Lot Amount Units");
 		}
-		
-		if (!missingProperties.isEmpty()){
+
+		if (!missingProperties.isEmpty()) {
 			String errorMessage = "";
-			for (String missingProperty : missingProperties){
+			for (String missingProperty : missingProperties) {
 				errorMessage += missingProperty + ", ";
 			}
-			errorMessage = errorMessage.substring(0, errorMessage.length()-2) + " must be provided";
+			errorMessage = errorMessage.substring(0, errorMessage.length() - 2) + " must be provided";
 			throw new MissingPropertyException(errorMessage);
 		}
-		
-		if (lot.getLotNumber() == 0){
+
+		if (lot.getLotNumber() == 0) {
 			lot.setIsVirtual(true);
-		}else if (lot.getLotNumber() == -1 && lot.getIsVirtual() != null && lot.getIsVirtual() == true){
+		} else if (lot.getLotNumber() == -1 && lot.getIsVirtual() != null && lot.getIsVirtual() == true) {
 			lot.setLotNumber(0);
-		}else if (lot.getIsVirtual() != null && lot.getIsVirtual() == true){
-			throw new MissingPropertyException("Cannot register a virtual lot with lot number "+lot.getLotNumber() +". Try again with lot number = 0 for a virtual lot, or remove the isVirtual property if a non-virtual lot is desired.");
-		}else if (lot.getLotNumber() == -1){
+		} else if (lot.getIsVirtual() != null && lot.getIsVirtual() == true) {
+			throw new MissingPropertyException("Cannot register a virtual lot with lot number " + lot.getLotNumber()
+					+ ". Try again with lot number = 0 for a virtual lot, or remove the isVirtual property if a non-virtual lot is desired.");
+		} else if (lot.getLotNumber() == -1) {
 			lot.setLotNumber(lotService.generateLotNumber(lot));
 		}
-		if (propertiesUtilService.getUseProjectRoles()){
-			//check project is assigned and is in allowed list
-			if (lot.getProject() == null){
+		if (propertiesUtilService.getUseProjectRoles()) {
+			// check project is assigned and is in allowed list
+			if (lot.getProject() == null) {
 				throw new MissingPropertyException("Project not specified. Please specify a valid project.");
 			}
 		}
-		if (lot.getParent().getId() != null){
-			//Then check for duplicate lot (lot number should not match)
+		if (lot.getParent().getId() != null) {
+			// Then check for duplicate lot (lot number should not match)
 			Collection<Lot> previousLots = Lot.findLotsByParent(lot.getParent()).getResultList();
-			if (previousLots.size() > 0){
-				for (Lot previousLot : previousLots){
-					if (previousLot.getLotNumber() == lot.getLotNumber()){
+			if (previousLots.size() > 0) {
+				for (Lot previousLot : previousLots) {
+					if (previousLot.getLotNumber() == lot.getLotNumber()) {
 						logger.error("Cannot register duplicate of lot: " + previousLot.getCorpName());
-						//check if this duplicate lot came from the same/current BulkLoadFile, or whether it was pre-existing
-						if (previousLot.getBulkLoadFile() != null && previousLot.getBulkLoadFile().getId() == lot.getBulkLoadFile().getId()){
-							throw new DupeLotException("Duplicate lot cannot be registered due to duplicate in same bulk load file.", previousLot.getCorpName());
-						}else{
-							throw new DupeLotException("Duplicate lot cannot be registered due to previously existing lot in database.", previousLot.getCorpName());
+						// check if this duplicate lot came from the same/current BulkLoadFile, or
+						// whether it was pre-existing
+						if (previousLot.getBulkLoadFile() != null
+								&& previousLot.getBulkLoadFile().getId() == lot.getBulkLoadFile().getId()) {
+							throw new DupeLotException(
+									"Duplicate lot cannot be registered due to duplicate in same bulk load file.",
+									previousLot.getCorpName());
+						} else {
+							throw new DupeLotException(
+									"Duplicate lot cannot be registered due to previously existing lot in database.",
+									previousLot.getCorpName());
 						}
 					}
 				}
 			}
 		}
-		//Check if the lot corp name already exists in the database
-		if(lot.getCorpName() != null) {
-			try{
+		// Check if the lot corp name already exists in the database
+		if (lot.getCorpName() != null) {
+			try {
 				Lot previousLot = Lot.findLotsByCorpNameEquals(lot.getCorpName()).getSingleResult();
 				logger.error("Cannot register duplicate of lot: " + previousLot.getCorpName());
-				//check if this duplicate lot came from the same/current BulkLoadFile, or whether it was pre-existing
-				if (previousLot.getBulkLoadFile() != null && previousLot.getBulkLoadFile().getId() == lot.getBulkLoadFile().getId()){
-					throw new DupeLotException("Duplicate lot cannot be registered due to duplicate in same bulk load file.", previousLot.getCorpName());
-				}else{
-					throw new DupeLotException("Duplicate lot cannot be registered due to previously existing lot in database.", previousLot.getCorpName());
-				}
-			} catch(NoResultException e){
+				// check if this duplicate lot came from the same/current BulkLoadFile, or
+				// whether it was pre-existing
+				if (previousLot.getBulkLoadFile() != null
+						&& previousLot.getBulkLoadFile().getId() == lot.getBulkLoadFile().getId()) {
+					throw new DupeLotException(
+							"Duplicate lot cannot be registered due to duplicate in same bulk load file.",
+							previousLot.getCorpName());
+				} else {
+					throw new DupeLotException(
+							"Duplicate lot cannot be registered due to previously existing lot in database.",
+							previousLot.getCorpName());
+				}
+			} catch (NoResultException e) {
 				logger.debug("Not a duplicate lot corp name");
-			}	
+			}
 		}
-		
+
 		return lot;
 	}
 
-
-	public Lot createLot(CmpdRegMolecule mol, int recordNumber, Collection<BulkLoadPropertyMappingDTO> mappings, Collection<ValidationResponseDTO> results, Date registrationDate, String chemist) throws Exception{
-		//Here we try to fetch all of the possible Lot database properties from the sdf, according to the mappings
+	public Lot createLot(CmpdRegMolecule mol, int recordNumber, Collection<BulkLoadPropertyMappingDTO> mappings,
+			Collection<ValidationResponseDTO> results, Date registrationDate, String chemist) throws Exception {
+		// Here we try to fetch all of the possible Lot database properties from the
+		// sdf, according to the mappings
 		Lot lot = new Lot();
-		//set a couple properties that do not come in from mappings
+		// set a couple properties that do not come in from mappings
 		lot.setAsDrawnStruct(mol.getMolStructure());
 		lot.setRegistrationDate(registrationDate);
 		lot.setRegisteredBy(chemist);
 
-		//regular fields that do not require lookups or conversions
+		// regular fields that do not require lookups or conversions
 		lot.setSynthesisDate(getDateValueFromMappings(mol, "Lot Synthesis Date", mappings, results, recordNumber));
 		lot.setNotebookPage(getStringValueFromMappings(mol, "Lot Notebook Page", mappings, results, recordNumber));
 		lot.setCorpName(getStringValueFromMappings(mol, "Lot Corp Name", mappings, results, recordNumber));
@@ -1001,7 +1226,7 @@ public Lot createLot(CmpdRegMolecule mol, int recordNumber, Collection<BulkLoadP
 		lot.setSupplier(getStringValueFromMappings(mol, "Lot Supplier", mappings, results, recordNumber));
 		lot.setSupplierID(getStringValueFromMappings(mol, "Lot Supplier ID", mappings, results, recordNumber));
 		lot.setVendorId(getStringValueFromMappings(mol, "Lot Vendor ID", mappings, results, recordNumber));
-		lot.setComments(getStringValueFromMappings(mol, "Lot Comments", mappings, results, recordNumber));		
+		lot.setComments(getStringValueFromMappings(mol, "Lot Comments", mappings, results, recordNumber));
 		lot.setSupplierLot(getStringValueFromMappings(mol, "Lot Supplier Lot", mappings, results, recordNumber));
 		lot.setMeltingPoint(getNumericValueFromMappings(mol, "Lot Melting Point", mappings, results, recordNumber));
 		lot.setBoilingPoint(getNumericValueFromMappings(mol, "Lot Boiling Point", mappings, results, recordNumber));
@@ -1015,197 +1240,218 @@ public Lot createLot(CmpdRegMolecule mol, int recordNumber, Collection<BulkLoadP
 		lot.setStockSolvent(getStringValueFromMappings(mol, "Lot Stock Solvent", mappings, results, recordNumber));
 		lot.setStockLocation(getStringValueFromMappings(mol, "Lot Stock Location", mappings, results, recordNumber));
 		lot.setRetainLocation(getStringValueFromMappings(mol, "Lot Retain Location", mappings, results, recordNumber));
-		lot.setObservedMassOne(getNumericValueFromMappings(mol, "Lot Observed Mass #1", mappings, results, recordNumber));
-		lot.setObservedMassTwo(getNumericValueFromMappings(mol, "Lot Observed Mass #2", mappings, results, recordNumber));
+		lot.setObservedMassOne(
+				getNumericValueFromMappings(mol, "Lot Observed Mass #1", mappings, results, recordNumber));
+		lot.setObservedMassTwo(
+				getNumericValueFromMappings(mol, "Lot Observed Mass #2", mappings, results, recordNumber));
 		lot.setTareWeight(getNumericValueFromMappings(mol, "Lot Tare Weight", mappings, results, recordNumber));
-		lot.setTotalAmountStored(getNumericValueFromMappings(mol, "Lot Total Amount Stored", mappings, results, recordNumber));
+		lot.setTotalAmountStored(
+				getNumericValueFromMappings(mol, "Lot Total Amount Stored", mappings, results, recordNumber));
 		lot.setChemist(getStringValueFromMappings(mol, "Lot Chemist", mappings, results, recordNumber));
 
-		//special field for Lot Inventory - not saved in Lot table
-		lot.setStorageLocation(getStringValueFromMappings(mol, "Lot Storage Location", mappings, results, recordNumber));
+		// special field for Lot Inventory - not saved in Lot table
+		lot.setStorageLocation(
+				getStringValueFromMappings(mol, "Lot Storage Location", mappings, results, recordNumber));
 
-		//conversions
-		lot.setIsVirtual(Boolean.valueOf(getStringValueFromMappings(mol, "Lot Is Virtual", mappings, results, recordNumber)));
+		// conversions
+		lot.setIsVirtual(
+				Boolean.valueOf(getStringValueFromMappings(mol, "Lot Is Virtual", mappings, results, recordNumber)));
 		Double lotNumber = getNumericValueFromMappings(mol, "Lot Number", mappings, results, recordNumber);
-		if (lotNumber != null) lot.setLotNumber(lotNumber.intValue());
-		else lot.setLotNumber(-1);
-
+		if (lotNumber != null)
+			lot.setLotNumber(lotNumber.intValue());
+		else
+			lot.setLotNumber(-1);
 
-		//lookups
+		// lookups
 		String lookUpString = null;
 		String lookUpProperty = null;
 		Collection<String> lookUpStringList = null;
 
 		lookUpProperty = "Lot Alias";
 		lookUpStringList = getStringValuesFromMappings(mol, lookUpProperty, mappings, results, recordNumber);
-		if (lookUpStringList != null && !lookUpStringList.isEmpty()){
+		if (lookUpStringList != null && !lookUpStringList.isEmpty()) {
 			String aliasType = "default";
 			String aliasKind = "default";
-			for (String lookUpStringEntry : lookUpStringList){
+			for (String lookUpStringEntry : lookUpStringList) {
 				lot = addLotAlias(lot, aliasType, aliasKind, lookUpProperty, lookUpStringEntry);
 				logger.info("------------- adding alias set to the lot -------------------");
-				String[] fields = {"lotAliases"};
-				if (logger.isDebugEnabled()) if (logger.isDebugEnabled()) logger.debug(lot.toJson(fields));
+				String[] fields = { "lotAliases" };
+				if (logger.isDebugEnabled())
+					if (logger.isDebugEnabled())
+						logger.debug(lot.toJson(fields));
 			}
 		}
-		
-		try{
+
+		try {
 			lookUpProperty = "Project";
 			lookUpString = getStringValueFromMappings(mol, lookUpProperty, mappings, results, recordNumber);
 			logger.info("Project lookup: " + lookUpString);
 			lot.setProject(lookUpString);
 			lookUpProperty = "Lot Purity Measured By";
 			lookUpString = getStringValueFromMappings(mol, lookUpProperty, mappings, results, recordNumber);
-			if (lookUpString != null && lookUpString.length() > 0){
-				try{
-					lot.setPurityMeasuredBy(PurityMeasuredBy.findPurityMeasuredBysByNameEquals(lookUpString).getSingleResult());
-				}catch (Exception e){
-					lot.setPurityMeasuredBy(PurityMeasuredBy.findPurityMeasuredBysByCodeEquals(lookUpString).getSingleResult());
+			if (lookUpString != null && lookUpString.length() > 0) {
+				try {
+					lot.setPurityMeasuredBy(
+							PurityMeasuredBy.findPurityMeasuredBysByNameEquals(lookUpString).getSingleResult());
+				} catch (Exception e) {
+					lot.setPurityMeasuredBy(
+							PurityMeasuredBy.findPurityMeasuredBysByCodeEquals(lookUpString).getSingleResult());
 				}
 			}
 			lookUpProperty = "Lot Physical State";
 			lookUpString = getStringValueFromMappings(mol, lookUpProperty, mappings, results, recordNumber);
-			if (lookUpString != null && lookUpString.length() > 0){
-				try{
+			if (lookUpString != null && lookUpString.length() > 0) {
+				try {
 					lot.setPhysicalState(PhysicalState.findPhysicalStatesByNameEquals(lookUpString).getSingleResult());
-				}catch (Exception e){
+				} catch (Exception e) {
 					lot.setPhysicalState(PhysicalState.findPhysicalStatesByCodeEquals(lookUpString).getSingleResult());
 				}
 			}
 			lookUpProperty = "Lot Vendor";
 			lookUpString = getStringValueFromMappings(mol, lookUpProperty, mappings, results, recordNumber);
-			if (lookUpString != null && lookUpString.length() > 0){
-				try{
+			if (lookUpString != null && lookUpString.length() > 0) {
+				try {
 					lot.setVendor(Vendor.findVendorsByNameEquals(lookUpString).getSingleResult());
-				}catch (Exception e){
+				} catch (Exception e) {
 					lot.setVendor(Vendor.findVendorsByCodeEquals(lookUpString).getSingleResult());
 				}
 			}
 			lookUpProperty = "Lot Purity Operator";
 			lookUpString = getStringValueFromMappings(mol, lookUpProperty, mappings, results, recordNumber);
-			if (lookUpString != null && lookUpString.length() > 0){
-				try{
+			if (lookUpString != null && lookUpString.length() > 0) {
+				try {
 					lot.setPurityOperator(Operator.findOperatorsByNameEquals(lookUpString).getSingleResult());
-				}catch (Exception e){
+				} catch (Exception e) {
 					lot.setPurityOperator(Operator.findOperatorsByCodeEquals(lookUpString).getSingleResult());
 				}
 			}
 			lookUpProperty = "Lot Amount Units";
 			lookUpString = getStringValueFromMappings(mol, lookUpProperty, mappings, results, recordNumber);
-			if (lookUpString != null && lookUpString.length() > 0){
-				try{
+			if (lookUpString != null && lookUpString.length() > 0) {
+				try {
 					lot.setAmountUnits(Unit.findUnitsByNameEquals(lookUpString).getSingleResult());
-				}catch (Exception e){
+				} catch (Exception e) {
 					lot.setAmountUnits(Unit.findUnitsByCodeEquals(lookUpString).getSingleResult());
 				}
 			}
 			lookUpProperty = "Lot Retain Units";
 			lookUpString = getStringValueFromMappings(mol, lookUpProperty, mappings, results, recordNumber);
-			if (lookUpString != null && lookUpString.length() > 0){
-				try{
+			if (lookUpString != null && lookUpString.length() > 0) {
+				try {
 					lot.setRetainUnits(Unit.findUnitsByNameEquals(lookUpString).getSingleResult());
-				}catch (Exception e){
+				} catch (Exception e) {
 					lot.setRetainUnits(Unit.findUnitsByCodeEquals(lookUpString).getSingleResult());
 				}
 			}
 			lookUpProperty = "Lot Solution Amount Units";
 			lookUpString = getStringValueFromMappings(mol, lookUpProperty, mappings, results, recordNumber);
-			if (lookUpString != null && lookUpString.length() > 0){
-				try{
-					lot.setSolutionAmountUnits(SolutionUnit.findSolutionUnitsByNameEquals(lookUpString).getSingleResult());
-				}catch (Exception e){
-					lot.setSolutionAmountUnits(SolutionUnit.findSolutionUnitsByCodeEquals(lookUpString).getSingleResult());
+			if (lookUpString != null && lookUpString.length() > 0) {
+				try {
+					lot.setSolutionAmountUnits(
+							SolutionUnit.findSolutionUnitsByNameEquals(lookUpString).getSingleResult());
+				} catch (Exception e) {
+					lot.setSolutionAmountUnits(
+							SolutionUnit.findSolutionUnitsByCodeEquals(lookUpString).getSingleResult());
 				}
 			}
 			lookUpProperty = "Lot Tare Weight Units";
 			lookUpString = getStringValueFromMappings(mol, lookUpProperty, mappings, results, recordNumber);
-			if (lookUpString != null && lookUpString.length() > 0){
-				try{
+			if (lookUpString != null && lookUpString.length() > 0) {
+				try {
 					lot.setTareWeightUnits(Unit.findUnitsByNameEquals(lookUpString).getSingleResult());
-				}catch (Exception e){
+				} catch (Exception e) {
 					lot.setTareWeightUnits(Unit.findUnitsByCodeEquals(lookUpString).getSingleResult());
 				}
 			}
 			lookUpProperty = "Lot Total Amount Stored Units";
 			lookUpString = getStringValueFromMappings(mol, lookUpProperty, mappings, results, recordNumber);
-			if (lookUpString != null && lookUpString.length() > 0){
-				try{
+			if (lookUpString != null && lookUpString.length() > 0) {
+				try {
 					lot.setTotalAmountStoredUnits(Unit.findUnitsByNameEquals(lookUpString).getSingleResult());
-				}catch (Exception e){
+				} catch (Exception e) {
 					lot.setTotalAmountStoredUnits(Unit.findUnitsByCodeEquals(lookUpString).getSingleResult());
 				}
 			}
-		}catch (Exception e){
-			logger.error("Caught error looking up lot property "+lookUpProperty+" with name "+lookUpString,e);
-			throw new Exception("An error has occurred looking up lot property "+lookUpProperty+" with name "+lookUpString);
+		} catch (Exception e) {
+			logger.error("Caught error looking up lot property " + lookUpProperty + " with name " + lookUpString, e);
+			throw new Exception(
+					"An error has occurred looking up lot property " + lookUpProperty + " with name " + lookUpString);
 		}
 
 		return lot;
 	}
 
-
-	public SaltForm createSaltForm(CmpdRegMolecule mol, Collection<BulkLoadPropertyMappingDTO> mappings, Collection<ValidationResponseDTO> results, int recordNumber) throws Exception{
-		//Here we try to fetch all of the possible Lot database properties from the sdf, according to the mappings
+	public SaltForm createSaltForm(CmpdRegMolecule mol, Collection<BulkLoadPropertyMappingDTO> mappings,
+			Collection<ValidationResponseDTO> results, int recordNumber) throws Exception {
+		// Here we try to fetch all of the possible Lot database properties from the
+		// sdf, according to the mappings
 		SaltForm saltForm = new SaltForm();
-		//		saltForm.setMolStructure(mol.getMolStructure());
+		// saltForm.setMolStructure(mol.getMolStructure());
 		saltForm.setRegistrationDate(new Date());
 
-		//regular fields that do not require lookups or conversions
+		// regular fields that do not require lookups or conversions
 		saltForm.setCasNumber(getStringValueFromMappings(mol, "CAS Number", mappings, results, recordNumber));
 
-		//lookups
+		// lookups
 		String lookUpString = null;
 		String lookUpProperty = null;
-		try{
+		try {
 			saltForm.setChemist(getStringValueFromMappings(mol, "Lot Chemist", mappings, results, recordNumber));
 			lookUpProperty = "Lot Salt Abbrev";
 			lookUpString = getStringValueFromMappings(mol, lookUpProperty, mappings, results, recordNumber);
-			if (lookUpString != null && lookUpString.length() > 0){
-				//found a salt. Need to split by semicolon, look up salt by abbrev, and check for a matching equivalents #
-				logger.info("Found one or more salts: "+lookUpString);
+			if (lookUpString != null && lookUpString.length() > 0) {
+				// found a salt. Need to split by semicolon, look up salt by abbrev, and check
+				// for a matching equivalents #
+				logger.info("Found one or more salts: " + lookUpString);
 				String[] saltCodes = lookUpString.split(";");
 				List<String> trimmedSaltCodes = new ArrayList<String>();
-				for (String saltCode : saltCodes){
+				for (String saltCode : saltCodes) {
 					String trimmedSaltCode = saltCode.trim();
-					if (trimmedSaltCode != null && trimmedSaltCode.length() > 0) trimmedSaltCodes.add(trimmedSaltCode);
+					if (trimmedSaltCode != null && trimmedSaltCode.length() > 0)
+						trimmedSaltCodes.add(trimmedSaltCode);
 				}
 				int numberOfSalts = trimmedSaltCodes.size();
 				List<Salt> salts = new ArrayList<Salt>();
-				for (String saltCode : trimmedSaltCodes){
-					try{
+				for (String saltCode : trimmedSaltCodes) {
+					try {
 						Salt salt = Salt.findSaltsByAbbrevEquals(saltCode).getSingleResult();
 						salts.add(salt);
-					}catch (Exception e){
-						logger.error("Caught error looking up salt with abbrev: "+saltCode,e);
-						throw new Exception("Caught error looking up salt with abbrev: "+saltCode);
+					} catch (Exception e) {
+						logger.error("Caught error looking up salt with abbrev: " + saltCode, e);
+						throw new Exception("Caught error looking up salt with abbrev: " + saltCode);
 					}
 				}
-				//if we reached this point, we have found all the referenced salts by abbrev. We must check for equivalents.
+				// if we reached this point, we have found all the referenced salts by abbrev.
+				// We must check for equivalents.
 				lookUpProperty = "Lot Salt Equivalents";
 				lookUpString = getStringValueFromMappings(mol, lookUpProperty, mappings, results, recordNumber);
-				if (lookUpString==null){
+				if (lookUpString == null) {
 					logger.error("Caught error creating salt: Lot Salt Equivalents must be supplied.");
 					throw new Exception("Caught error creating salt: Lot Salt Equivalents must be supplied.");
 				}
 				String[] equivalentsStrings = lookUpString.split(";");
 				List<String> trimmedEquivalentsStrings = new ArrayList<String>();
-				for (String equivalentsString : equivalentsStrings){
+				for (String equivalentsString : equivalentsStrings) {
 					String trimmedEquivalentsString = equivalentsString.trim();
-					if (trimmedEquivalentsString != null && trimmedEquivalentsString.length() > 0) trimmedEquivalentsStrings.add(trimmedEquivalentsString);
+					if (trimmedEquivalentsString != null && trimmedEquivalentsString.length() > 0)
+						trimmedEquivalentsStrings.add(trimmedEquivalentsString);
 				}
 				List<Double> equivalentsList = new ArrayList<Double>();
-				for (String equivalentsString : trimmedEquivalentsStrings){
+				for (String equivalentsString : trimmedEquivalentsStrings) {
 					equivalentsList.add(Double.valueOf(equivalentsString));
 				}
-				//check to make sure we have the same number of salts and equivalents.
-				if (equivalentsList.size()!=salts.size()){
-					logger.error("Caught error creating salts: Number of salts ("+salts.size()+") is not equal to number of equivalents provided ("+equivalentsList.size()+")");
-					throw new Exception("Caught error creating salts: Number of salts ("+salts.size()+") is not equal to number of equivalents provided ("+equivalentsList.size()+")");
-				}else{
-					//Salts found and matched to number of equivalents. We create IsoSalts and add them to our SaltForm
+				// check to make sure we have the same number of salts and equivalents.
+				if (equivalentsList.size() != salts.size()) {
+					logger.error("Caught error creating salts: Number of salts (" + salts.size()
+							+ ") is not equal to number of equivalents provided (" + equivalentsList.size() + ")");
+					throw new Exception("Caught error creating salts: Number of salts (" + salts.size()
+							+ ") is not equal to number of equivalents provided (" + equivalentsList.size() + ")");
+				} else {
+					// Salts found and matched to number of equivalents. We create IsoSalts and add
+					// them to our SaltForm
 					Set<IsoSalt> isoSalts = new HashSet<IsoSalt>();
 					int i = 0;
-					while (i< numberOfSalts){
+					while (i < numberOfSalts) {
 						Salt salt = salts.get(i);
 						Double equivalents = equivalentsList.get(i);
 						IsoSalt isoSalt = new IsoSalt();
@@ -1219,131 +1465,148 @@ public SaltForm createSaltForm(CmpdRegMolecule mol, Collection<BulkLoadPropertyM
 					saltForm.setIsoSalts(isoSalts);
 				}
 			}
-		}catch (Exception e){
-			logger.error("Caught error looking up salt form property "+lookUpProperty+" with code "+lookUpString,e);
-			throw new Exception("An error has occurred looking up salt form property "+lookUpProperty+" with code "+lookUpString);
+		} catch (Exception e) {
+			logger.error("Caught error looking up salt form property " + lookUpProperty + " with code " + lookUpString,
+					e);
+			throw new Exception("An error has occurred looking up salt form property " + lookUpProperty + " with code "
+					+ lookUpString);
 		}
 
 		return saltForm;
 	}
 
-
 	@Transactional
-	public Parent createParent(CmpdRegMolecule mol, Collection<BulkLoadPropertyMappingDTO> mappings, String chemist, LabelPrefixDTO labelPrefix, Collection<ValidationResponseDTO> results, int recordNumber) throws Exception{
-		//Here we try to fetch all of the possible Lot database properties from the sdf, according to the mappings
+	public Parent createParent(CmpdRegMolecule mol, Collection<BulkLoadPropertyMappingDTO> mappings, String chemist,
+			LabelPrefixDTO labelPrefix, Collection<ValidationResponseDTO> results, int recordNumber) throws Exception {
+		// Here we try to fetch all of the possible Lot database properties from the
+		// sdf, according to the mappings
 		Parent parent = new Parent();
 		parent.setMolStructure(mol.getMolStructure());
 		parent.setRegistrationDate(new Date());
 		parent.setRegisteredBy(chemist);
 
-		//regular fields that do not require lookups or conversions
+		// regular fields that do not require lookups or conversions
 		parent.setCorpName(getStringValueFromMappings(mol, "Parent Corp Name", mappings, results, recordNumber));
-		//Not adding warning for coercing this next property because the warning is covered in alias mappings
+		// Not adding warning for coercing this next property because the warning is
+		// covered in alias mappings
 		parent.setCommonName(getStringValueFromMappings(mol, "Parent Common Name", mappings));
-		parent.setStereoComment(getStringValueFromMappings(mol, "Parent Stereo Comment", mappings, results, recordNumber));
+		parent.setStereoComment(
+				getStringValueFromMappings(mol, "Parent Stereo Comment", mappings, results, recordNumber));
 		parent.setComment(getStringValueFromMappings(mol, "Parent Comment", mappings, results, recordNumber));
-		//Not adding warning for coercing this next property because the warning is covered in create lot
+		// Not adding warning for coercing this next property because the warning is
+		// covered in create lot
 		parent.setChemist(getStringValueFromMappings(mol, "Lot Chemist", mappings));
 
-		//conversion
-		//Not adding warning for coercing this next property because the warning is covered salt stripping function
-		parent.setIsMixture(Boolean.valueOf(getStringValueFromMappings(mol, "Parent Is Mixture", mappings, results, recordNumber)));
+		// conversion
+		// Not adding warning for coercing this next property because the warning is
+		// covered salt stripping function
+		parent.setIsMixture(
+				Boolean.valueOf(getStringValueFromMappings(mol, "Parent Is Mixture", mappings, results, recordNumber)));
 
 		String lookUpString = null;
 		String lookUpProperty = null;
 		Collection<String> lookUpStringList = null;
 		Collection<String> invalidValues = null;
 
-		//add parent aliases
+		// add parent aliases
 		lookUpProperty = "Parent LiveDesign Corp Name";
 		lookUpStringList = getStringValuesFromMappings(mol, lookUpProperty, mappings, results, recordNumber);
 
-		if (lookUpStringList != null && !lookUpStringList.isEmpty()){
+		if (lookUpStringList != null && !lookUpStringList.isEmpty()) {
 			String aliasType = "External ID";
 			String aliasKind = "LiveDesign Corp Name";
-			for (String lookUpStringEntry : lookUpStringList){
+			for (String lookUpStringEntry : lookUpStringList) {
 				parent = addParentAlias(parent, aliasType, aliasKind, lookUpProperty, lookUpStringEntry);
 				logger.info("------------- adding alias set to the parent -------------------");
-				String[] fields = {"parentAliases"};
-				if (logger.isDebugEnabled()) logger.debug(parent.toJson(fields));
+				String[] fields = { "parentAliases" };
+				if (logger.isDebugEnabled())
+					logger.debug(parent.toJson(fields));
 			}
 		}
 
 		lookUpProperty = "Parent Common Name";
 		lookUpStringList = getStringValuesFromMappings(mol, lookUpProperty, mappings, results, recordNumber);
-		if (lookUpStringList != null && !lookUpStringList.isEmpty()){
+		if (lookUpStringList != null && !lookUpStringList.isEmpty()) {
 			String aliasType = "other name";
 			String aliasKind = "Common Name";
-			for (String lookUpStringEntry : lookUpStringList){
+			for (String lookUpStringEntry : lookUpStringList) {
 				parent = addParentAlias(parent, aliasType, aliasKind, lookUpProperty, lookUpStringEntry);
 				logger.info("------------- adding alias set to the parent -------------------");
-				String[] fields = {"parentAliases"};
-				if (logger.isDebugEnabled()) logger.debug(parent.toJson(fields));
+				String[] fields = { "parentAliases" };
+				if (logger.isDebugEnabled())
+					logger.debug(parent.toJson(fields));
 			}
 		}
-		
+
 		lookUpProperty = "Parent Alias";
 		lookUpStringList = getStringValuesFromMappings(mol, lookUpProperty, mappings, results, recordNumber);
-		if (lookUpStringList != null && !lookUpStringList.isEmpty()){
+		if (lookUpStringList != null && !lookUpStringList.isEmpty()) {
 			String aliasType = "default";
 			String aliasKind = "default";
-			for (String lookUpStringEntry : lookUpStringList){
+			for (String lookUpStringEntry : lookUpStringList) {
 				parent = addParentAlias(parent, aliasType, aliasKind, lookUpProperty, lookUpStringEntry);
 				logger.info("------------- adding alias set to the parent -------------------");
-				String[] fields = {"parentAliases"};
-				if (logger.isDebugEnabled()) logger.debug(parent.toJson(fields));
+				String[] fields = { "parentAliases" };
+				if (logger.isDebugEnabled())
+					logger.debug(parent.toJson(fields));
 			}
 		}
 
-
-		//lookups
-		try{
-			//Currently this section of invalid values passed in will only work for string values
-			for (BulkLoadPropertyMappingDTO mapping : mappings){
-				if(mapping.getInvalidValues() != null) {
+		// lookups
+		try {
+			// Currently this section of invalid values passed in will only work for string
+			// values
+			for (BulkLoadPropertyMappingDTO mapping : mappings) {
+				if (mapping.getInvalidValues() != null) {
 					lookUpProperty = mapping.getDbProperty();
 					lookUpString = getStringValueFromMappings(mol, lookUpProperty, mappings, results, recordNumber);
 					invalidValues = mapping.getInvalidValues();
-					if(invalidValues.contains(lookUpString)) {
-						logger.error("Found invalid "+lookUpProperty+" with code "+lookUpString+" in list of invalid values passed to service");
+					if (invalidValues.contains(lookUpString)) {
+						logger.error("Found invalid " + lookUpProperty + " with code " + lookUpString
+								+ " in list of invalid values passed to service");
 						throw new Exception("Invalid property");
 					}
 				}
 			}
 			lookUpProperty = "Parent Stereo Category";
 			lookUpString = getStringValueFromMappings(mol, lookUpProperty, mappings, results, recordNumber);
-			if (lookUpString != null && lookUpString.length() > 0) parent.setStereoCategory(StereoCategory.findStereoCategorysByCodeEquals(lookUpString).getSingleResult());
+			if (lookUpString != null && lookUpString.length() > 0)
+				parent.setStereoCategory(
+						StereoCategory.findStereoCategorysByCodeEquals(lookUpString).getSingleResult());
 			lookUpProperty = "Parent Annotation";
 			lookUpString = getStringValueFromMappings(mol, lookUpProperty, mappings, results, recordNumber);
-			if (lookUpString != null && lookUpString.length() > 0) parent.setParentAnnotation(ParentAnnotation.findParentAnnotationsByCodeEquals(lookUpString).getSingleResult());
+			if (lookUpString != null && lookUpString.length() > 0)
+				parent.setParentAnnotation(
+						ParentAnnotation.findParentAnnotationsByCodeEquals(lookUpString).getSingleResult());
 			lookUpProperty = "Parent Compound Type";
 			lookUpString = getStringValueFromMappings(mol, lookUpProperty, mappings, results, recordNumber);
-			if (lookUpString != null && lookUpString.length() > 0) parent.setCompoundType(CompoundType.findCompoundTypesByCodeEquals(lookUpString).getSingleResult());
-		}catch (Exception e){
-			logger.error("Caught error looking up parent property "+lookUpProperty+" with code "+lookUpString,e);
-			throw new Exception("An error has occurred looking up parent property "+lookUpProperty+" with code "+lookUpString);
+			if (lookUpString != null && lookUpString.length() > 0)
+				parent.setCompoundType(CompoundType.findCompoundTypesByCodeEquals(lookUpString).getSingleResult());
+		} catch (Exception e) {
+			logger.error("Caught error looking up parent property " + lookUpProperty + " with code " + lookUpString, e);
+			throw new Exception("An error has occurred looking up parent property " + lookUpProperty + " with code "
+					+ lookUpString);
 		}
-		
-		//Set labelPrefix DTO if it is passed in
-		if (labelPrefix != null) parent.setLabelPrefix(labelPrefix);
+
+		// Set labelPrefix DTO if it is passed in
+		if (labelPrefix != null)
+			parent.setLabelPrefix(labelPrefix);
 
 		return parent;
 	}
 
-
 	public Parent addParentAlias(Parent parent, String lsType, String lsKind,
 			String lookUpProperty, String lookUpString) {
 
-
-		if (lookUpString != null){
-			//found LiveDesign Corp Name
+		if (lookUpString != null) {
+			// found LiveDesign Corp Name
 			logger.info("Found one or more parent alias: " + lookUpProperty + "  " + lookUpString);
 			String[] aliases = lookUpString.split(";");
-			if (parent.getParentAliases() == null){
+			if (parent.getParentAliases() == null) {
 				logger.info("---------- the parent Alias set is null ----------------");
 				parent.setParentAliases(new HashSet<ParentAlias>());
 			}
-			for (String alias : aliases){
+			for (String alias : aliases) {
 				ParentAlias parentAlias = new ParentAlias();
 				parentAlias.setLsType(lsType);
 				parentAlias.setLsKind(lsKind);
@@ -1353,24 +1616,24 @@ public Parent addParentAlias(Parent parent, String lsType, String lsKind,
 			}
 		}
 
-		String[] fields = {"parentAliases"};
-		if (logger.isDebugEnabled()) logger.debug("about to return the parent: " + parent.toJson(fields));
+		String[] fields = { "parentAliases" };
+		if (logger.isDebugEnabled())
+			logger.debug("about to return the parent: " + parent.toJson(fields));
 		return parent;
 	}
-	
+
 	public Lot addLotAlias(Lot lot, String lsType, String lsKind,
 			String lookUpProperty, String lookUpString) {
 
-
-		if (lookUpString != null){
-			//found LiveDesign Corp Name
+		if (lookUpString != null) {
+			// found LiveDesign Corp Name
 			logger.info("Found one or more lot alias: " + lookUpProperty + "  " + lookUpString);
 			String[] aliases = lookUpString.split(";");
-			if (lot.getLotAliases() == null){
+			if (lot.getLotAliases() == null) {
 				logger.info("---------- the lot Alias set is null ----------------");
 				lot.setLotAliases(new HashSet<LotAlias>());
 			}
-			for (String alias : aliases){
+			for (String alias : aliases) {
 				LotAlias lotAlias = new LotAlias();
 				lotAlias.setLsType(lsType);
 				lotAlias.setLsKind(lsKind);
@@ -1380,214 +1643,282 @@ public Lot addLotAlias(Lot lot, String lsType, String lsKind,
 			}
 		}
 
-		String[] fields = {"lotAliases"};
-		if (logger.isDebugEnabled()) logger.debug("about to return the lot: " + lot.toJson(fields));
+		String[] fields = { "lotAliases" };
+		if (logger.isDebugEnabled())
+			logger.debug("about to return the lot: " + lot.toJson(fields));
 		return lot;
 	}
 
-	public String getStringValueFromMappings(CmpdRegMolecule mol, String dbProperty, Collection<BulkLoadPropertyMappingDTO> mappings){
+	public String getStringValueFromMappings(CmpdRegMolecule mol, String dbProperty,
+			Collection<BulkLoadPropertyMappingDTO> mappings) {
 		Collection<ValidationResponseDTO> results = new ArrayList();
 		String value = getStringValueFromMappings(mol, dbProperty, mappings, results, -1);
-		return(value);
+		return (value);
 	}
-	public String getStringValueFromMappings(CmpdRegMolecule mol, String dbProperty, Collection<BulkLoadPropertyMappingDTO> mappings, Collection<ValidationResponseDTO> results, int recordNumber){
-		BulkLoadPropertyMappingDTO mapping = BulkLoadPropertyMappingDTO.findMappingByDbPropertyEquals(mappings, dbProperty);
-		if (mapping == null) return null;
+
+	public String getStringValueFromMappings(CmpdRegMolecule mol, String dbProperty,
+			Collection<BulkLoadPropertyMappingDTO> mappings, Collection<ValidationResponseDTO> results,
+			int recordNumber) {
+		BulkLoadPropertyMappingDTO mapping = BulkLoadPropertyMappingDTO.findMappingByDbPropertyEquals(mappings,
+				dbProperty);
+		if (mapping == null)
+			return null;
 		String sdfProperty = mapping.getSdfProperty();
 		String value = null;
-		if (sdfProperty != null && sdfProperty.length() > 0) value = mol.getProperty(sdfProperty);
+		if (sdfProperty != null && sdfProperty.length() > 0)
+			value = mol.getProperty(sdfProperty);
 		String regexMatch = "(\\x00|\\^M|\\^\\@)$";
-		if (value != null) value = value.replaceAll(regexMatch, "");
-		if (value == null) value = mapping.getDefaultVal();
+		if (value != null)
+			value = value.replaceAll(regexMatch, "");
+		if (value == null)
+			value = mapping.getDefaultVal();
 		Boolean coerced = false;
 		if (value != null) {
 			String trimmedString = value.trim();
-			if(!trimmedString.equals(value)) {
+			if (!trimmedString.equals(value)) {
 				value = trimmedString;
 				coerced = true;
 			}
 		}
-		if(recordNumber != -1 && coerced) logWarning("TrimmedStringValue","Trimmed string value for property " + sdfProperty, sdfProperty + " '"+ mol.getProperty(sdfProperty) + "' trimmed to '" + value + "'", recordNumber, results);
-		if (value != null) if (logger.isDebugEnabled()) logger.debug("requested property: " + sdfProperty + "  value: " + value);
+		if (recordNumber != -1 && coerced)
+			logWarning("TrimmedStringValue", "Trimmed string value for property " + sdfProperty,
+					sdfProperty + " '" + mol.getProperty(sdfProperty) + "' trimmed to '" + value + "'", recordNumber,
+					results);
+		if (value != null)
+			if (logger.isDebugEnabled())
+				logger.debug("requested property: " + sdfProperty + "  value: " + value);
 		return value;
 	}
-	
-	public Collection<String> getStringValuesFromMappings(CmpdRegMolecule mol, String dbProperty, Collection<BulkLoadPropertyMappingDTO> mappings, Collection<ValidationResponseDTO> results, int recordNumber){
-		Collection<BulkLoadPropertyMappingDTO> foundMappings = BulkLoadPropertyMappingDTO.findMappingsByDbPropertyEquals(mappings, dbProperty);
-		if (foundMappings == null || foundMappings.isEmpty()) return null;
+
+	public Collection<String> getStringValuesFromMappings(CmpdRegMolecule mol, String dbProperty,
+			Collection<BulkLoadPropertyMappingDTO> mappings, Collection<ValidationResponseDTO> results,
+			int recordNumber) {
+		Collection<BulkLoadPropertyMappingDTO> foundMappings = BulkLoadPropertyMappingDTO
+				.findMappingsByDbPropertyEquals(mappings, dbProperty);
+		if (foundMappings == null || foundMappings.isEmpty())
+			return null;
 		String regexMatch = "(\\x00|\\^M|\\^\\@)$";
 		Collection<String> stringValues = new ArrayList<String>();
-		for (BulkLoadPropertyMappingDTO mapping : foundMappings){
+		for (BulkLoadPropertyMappingDTO mapping : foundMappings) {
 			String sdfProperty = mapping.getSdfProperty();
 			String value = null;
-			if (sdfProperty != null && sdfProperty.length() > 0) value = mol.getProperty(sdfProperty);
-			if (value != null) value = value.replaceAll(regexMatch, "");
-			if (value == null) value = mapping.getDefaultVal();
+			if (sdfProperty != null && sdfProperty.length() > 0)
+				value = mol.getProperty(sdfProperty);
+			if (value != null)
+				value = value.replaceAll(regexMatch, "");
+			if (value == null)
+				value = mapping.getDefaultVal();
 
 			// TRIM white space and log if the value was changed
 			Boolean coerced = false;
 			if (value != null) {
 				String trimmedString = value.trim();
-				if(!trimmedString.equals(value)) {
+				if (!trimmedString.equals(value)) {
 					value = trimmedString;
 					coerced = true;
 				}
 			}
-			if(recordNumber != -1 && coerced) logWarning("TrimmedStringValue","Trimmed string value for property " + sdfProperty, sdfProperty + " '"+ mol.getProperty(sdfProperty) + "' trimmed to '" + value + "'", recordNumber, results);	
+			if (recordNumber != -1 && coerced)
+				logWarning("TrimmedStringValue", "Trimmed string value for property " + sdfProperty,
+						sdfProperty + " '" + mol.getProperty(sdfProperty) + "' trimmed to '" + value + "'",
+						recordNumber, results);
 			stringValues.add(value);
 		}
 		return stringValues;
 	}
 
-
-	public Double getNumericValueFromMappings(CmpdRegMolecule mol, String dbProperty, Collection<BulkLoadPropertyMappingDTO> mappings, Collection<ValidationResponseDTO> results, int recordNumber){
-		BulkLoadPropertyMappingDTO mapping = BulkLoadPropertyMappingDTO.findMappingByDbPropertyEquals(mappings, dbProperty);
-		if (mapping == null) return null;
+	public Double getNumericValueFromMappings(CmpdRegMolecule mol, String dbProperty,
+			Collection<BulkLoadPropertyMappingDTO> mappings, Collection<ValidationResponseDTO> results,
+			int recordNumber) {
+		BulkLoadPropertyMappingDTO mapping = BulkLoadPropertyMappingDTO.findMappingByDbPropertyEquals(mappings,
+				dbProperty);
+		if (mapping == null)
+			return null;
 		String sdfProperty = mapping.getSdfProperty();
 		String stringVal = null;
-		if (sdfProperty != null && sdfProperty.length() > 0) stringVal = mol.getProperty(sdfProperty);
+		if (sdfProperty != null && sdfProperty.length() > 0)
+			stringVal = mol.getProperty(sdfProperty);
 		String regexMatch1 = "(\\x00|\\^M|\\^\\@)$";
 		String regexMatch2 = "[^0-9.]+";
 		Boolean coerced = false;
 		if (stringVal != null) {
 			Matcher matches1 = Pattern.compile(regexMatch1).matcher(stringVal);
-			if(matches1.find()) {
+			if (matches1.find()) {
 				stringVal = matches1.replaceAll("");
-				coerced = true;	
+				coerced = true;
 			}
 			Matcher matches2 = Pattern.compile(regexMatch2).matcher(stringVal);
-			if(matches2.find()) {
+			if (matches2.find()) {
 				stringVal = matches2.replaceAll("");
-				coerced = true;	
+				coerced = true;
 			}
 		}
-		if (stringVal != null && stringVal.length() < 1) stringVal = null;
+		if (stringVal != null && stringVal.length() < 1)
+			stringVal = null;
 		Double value;
-		if (stringVal == null && mapping.getDefaultVal() != null && mapping.getDefaultVal().length() > 0) value = new Double(mapping.getDefaultVal());
-		else if (stringVal ==null) value = null;
-		else value = new Double(stringVal);
-		if(coerced) logWarning("CoercedNumericValue","Coerced numeric value for property " + sdfProperty, sdfProperty + " '"+ mol.getProperty(sdfProperty) + "' coerced to '" + value + "'", recordNumber, results);
-		if (value != null) if (logger.isDebugEnabled()) logger.debug("requested property: " + sdfProperty + "  value: " + value);
+		if (stringVal == null && mapping.getDefaultVal() != null && mapping.getDefaultVal().length() > 0)
+			value = new Double(mapping.getDefaultVal());
+		else if (stringVal == null)
+			value = null;
+		else
+			value = new Double(stringVal);
+		if (coerced)
+			logWarning("CoercedNumericValue", "Coerced numeric value for property " + sdfProperty,
+					sdfProperty + " '" + mol.getProperty(sdfProperty) + "' coerced to '" + value + "'", recordNumber,
+					results);
+		if (value != null)
+			if (logger.isDebugEnabled())
+				logger.debug("requested property: " + sdfProperty + "  value: " + value);
 		return value;
 	}
 
-	public Date getDateValueFromMappings(CmpdRegMolecule mol, String dbProperty, Collection<BulkLoadPropertyMappingDTO> mappings, Collection<ValidationResponseDTO> results, int recordNumber) throws Exception{
-		BulkLoadPropertyMappingDTO mapping = BulkLoadPropertyMappingDTO.findMappingByDbPropertyEquals(mappings, dbProperty);
-		if (mapping == null) return null;
+	public Date getDateValueFromMappings(CmpdRegMolecule mol, String dbProperty,
+			Collection<BulkLoadPropertyMappingDTO> mappings, Collection<ValidationResponseDTO> results,
+			int recordNumber) throws Exception {
+		BulkLoadPropertyMappingDTO mapping = BulkLoadPropertyMappingDTO.findMappingByDbPropertyEquals(mappings,
+				dbProperty);
+		if (mapping == null)
+			return null;
 		String sdfProperty = mapping.getSdfProperty();
 		String stringVal = null;
-		if (sdfProperty != null && sdfProperty.length() > 0) stringVal = mol.getProperty(sdfProperty);
+		if (sdfProperty != null && sdfProperty.length() > 0)
+			stringVal = mol.getProperty(sdfProperty);
 		String regexMatch = "(\\x00|\\^M|\\^\\@)$";
-		if (stringVal != null) stringVal = stringVal.replaceAll(regexMatch, "");
+		if (stringVal != null)
+			stringVal = stringVal.replaceAll(regexMatch, "");
 		Date value;
 		DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
 		DateFormat df2 = new SimpleDateFormat("MM-dd-yyyy");
 		DateFormat df3 = new SimpleDateFormat("yyyy/MM/dd");
-		if (stringVal == null){
-			//no value in sdf, trying default value
+		if (stringVal == null) {
+			// no value in sdf, trying default value
 			String defaultVal = mapping.getDefaultVal();
-			if (defaultVal != null){
-				try{
+			if (defaultVal != null) {
+				try {
 					value = df.parse(mapping.getDefaultVal());
-					if(!df.format(value).equals(mapping.getDefaultVal())) {
-						logWarning("CoercedDateValue", "Coerced date value for property " + sdfProperty, sdfProperty + " '"+ mapping.getDefaultVal() + " coerced to " + df.format(value) + "'", recordNumber, results);
+					if (!df.format(value).equals(mapping.getDefaultVal())) {
+						logWarning("CoercedDateValue", "Coerced date value for property " + sdfProperty,
+								sdfProperty + " '" + mapping.getDefaultVal() + " coerced to " + df.format(value) + "'",
+								recordNumber, results);
 					}
-				} catch (ParseException e){
-					try{
+				} catch (ParseException e) {
+					try {
 						value = df2.parse(mapping.getDefaultVal());
-						if(!df2.format(value).equals(mapping.getDefaultVal())) {
-							logWarning("CoercedDateValue","Coerced date value for property " + sdfProperty, sdfProperty + " '"+ mapping.getDefaultVal() + "' coerced to " + df2.format(value) + "'", recordNumber, results);
+						if (!df2.format(value).equals(mapping.getDefaultVal())) {
+							logWarning("CoercedDateValue", "Coerced date value for property " + sdfProperty, sdfProperty
+									+ " '" + mapping.getDefaultVal() + "' coerced to " + df2.format(value) + "'",
+									recordNumber, results);
 						}
-					}catch (ParseException e2){
-						try{
+					} catch (ParseException e2) {
+						try {
 							value = df3.parse(mapping.getDefaultVal());
-							if(!df3.format(value).equals(mapping.getDefaultVal())) {
-								logWarning("CoercedDateValue", "Coerced date value for property " + sdfProperty, sdfProperty + " '"+ mapping.getDefaultVal() + "' coerced to " + df3.format(value) + "'", recordNumber, results);
+							if (!df3.format(value).equals(mapping.getDefaultVal())) {
+								logWarning("CoercedDateValue", "Coerced date value for property " + sdfProperty,
+										sdfProperty + " '" + mapping.getDefaultVal() + "' coerced to "
+												+ df3.format(value) + "'",
+										recordNumber, results);
 							}
-						}catch (ParseException e3){
-							logger.error("Could not parse date:"+mapping.getDefaultVal());
-							throw new Exception("Could not parse the date:" + mapping.getDefaultVal() + ". Accepted date formats are YYYY-MM-DD or MM-DD-YYYY");
+						} catch (ParseException e3) {
+							logger.error("Could not parse date:" + mapping.getDefaultVal());
+							throw new Exception("Could not parse the date:" + mapping.getDefaultVal()
+									+ ". Accepted date formats are YYYY-MM-DD or MM-DD-YYYY");
 						}
 					}
 				}
-			} else{
+			} else {
 				value = null;
 			}
-		}
-		else{
-			//there is a value in sdf, try to parse it
-			try{
+		} else {
+			// there is a value in sdf, try to parse it
+			try {
 				value = df.parse(stringVal);
-				if(!df.format(value).equals(stringVal)) {
-					logWarning("CoercedDateValue", "Coerced date value for property " + sdfProperty, sdfProperty + " '"+ stringVal + "' coerced to '" + df.format(value) + "'", recordNumber, results);
+				if (!df.format(value).equals(stringVal)) {
+					logWarning("CoercedDateValue", "Coerced date value for property " + sdfProperty,
+							sdfProperty + " '" + stringVal + "' coerced to '" + df.format(value) + "'", recordNumber,
+							results);
 				}
-			} catch (ParseException e){
-				try{
+			} catch (ParseException e) {
+				try {
 					value = df2.parse(stringVal);
-					if(!df2.format(value).equals(stringVal)) {
-						logWarning("CoercedDateValue", "Coerced date value for property " + sdfProperty, sdfProperty + " '"+ stringVal + "' coerced to '" + df2.format(value) + "'", recordNumber, results);
+					if (!df2.format(value).equals(stringVal)) {
+						logWarning("CoercedDateValue", "Coerced date value for property " + sdfProperty,
+								sdfProperty + " '" + stringVal + "' coerced to '" + df2.format(value) + "'",
+								recordNumber, results);
 					}
-				} catch (ParseException e2){
-					try{
+				} catch (ParseException e2) {
+					try {
 						value = df3.parse(stringVal);
-						if(!df3.format(value).equals(stringVal)) {
-							logWarning("CoercedDateValue", "Coerced date value for property " + sdfProperty, sdfProperty + " '"+ stringVal + "' coerced to '" + df3.format(value) + "'", recordNumber, results);
+						if (!df3.format(value).equals(stringVal)) {
+							logWarning("CoercedDateValue", "Coerced date value for property " + sdfProperty,
+									sdfProperty + " '" + stringVal + "' coerced to '" + df3.format(value) + "'",
+									recordNumber, results);
 						}
-					} catch (ParseException e3){
-						logger.error("Could not parse date:"+stringVal);
-						throw new Exception("Could not parse the date:" + stringVal + ". Accepted date formats are YYYY-MM-DD or MM-DD-YYYY");
+					} catch (ParseException e3) {
+						logger.error("Could not parse date:" + stringVal);
+						throw new Exception("Could not parse the date:" + stringVal
+								+ ". Accepted date formats are YYYY-MM-DD or MM-DD-YYYY");
 					}
 				}
 			}
 
 		}
-		if (logger.isDebugEnabled()) logger.debug("requested property: " + sdfProperty + "  value: " + value);
+		if (logger.isDebugEnabled())
+			logger.debug("requested property: " + sdfProperty + "  value: " + value);
 		return value;
 	}
 
 	public String generateSummaryHtml(int numRecordsRead,
-			int numNewParentsLoaded, int numNewLotsOldParentsLoaded, Collection<ValidationResponseDTO> validationResponse, String errorSDFName, FileOutputStream reportOutStream) throws IOException {
+			int numNewParentsLoaded, int numNewLotsOldParentsLoaded,
+			Collection<ValidationResponseDTO> validationResponse, String errorSDFName, FileOutputStream reportOutStream)
+			throws IOException {
 		int numErrorRecords = 0;
 		int numWarningRecords = 0;
 		Map<String, Integer> errorMap = new HashMap<String, Integer>();
-		for(ValidationResponseDTO valResp : validationResponse) {
-			if(valResp.getLevel() == "error") {
-				if (!errorMap.containsKey(valResp.getCategoryDescription())) errorMap.put(valResp.getCategoryDescription(), 1);
-				else errorMap.put(valResp.getCategoryDescription(), errorMap.get(valResp.getCategoryDescription())+1);
+		for (ValidationResponseDTO valResp : validationResponse) {
+			if (valResp.getLevel() == "error") {
+				if (!errorMap.containsKey(valResp.getCategoryDescription()))
+					errorMap.put(valResp.getCategoryDescription(), 1);
+				else
+					errorMap.put(valResp.getCategoryDescription(), errorMap.get(valResp.getCategoryDescription()) + 1);
 			}
 		}
-		for (Integer count : errorMap.values()) numErrorRecords += count;
+		for (Integer count : errorMap.values())
+			numErrorRecords += count;
 
 		Map<String, Integer> warningMap = new HashMap<String, Integer>();
-		for(ValidationResponseDTO valResp : validationResponse) {
-			if(valResp.getLevel() == "warning") {
-				if (!warningMap.containsKey(valResp.getCategoryDescription())) warningMap.put(valResp.getCategoryDescription(), 1);
-				else warningMap.put(valResp.getCategoryDescription(), warningMap.get(valResp.getCategoryDescription())+1);
+		for (ValidationResponseDTO valResp : validationResponse) {
+			if (valResp.getLevel() == "warning") {
+				if (!warningMap.containsKey(valResp.getCategoryDescription()))
+					warningMap.put(valResp.getCategoryDescription(), 1);
+				else
+					warningMap.put(valResp.getCategoryDescription(),
+							warningMap.get(valResp.getCategoryDescription()) + 1);
 			}
 		}
-		for (Integer count : warningMap.values()) numWarningRecords += count;
-		
+		for (Integer count : warningMap.values())
+			numWarningRecords += count;
+
 		String summary = "<div><ul>";
-		summary+="<li>Number of entries processed: "+numRecordsRead+"</li>";
-		summary+="<li>Number of entries with error: "+numErrorRecords+"</li>";
-		summary+="<li>Number of warnings: "+numWarningRecords+"</li>";
-		summary+="<li>New compounds: "+numNewParentsLoaded+"</li>";
-		summary+="<li>New lots of existing compounds: "+numNewLotsOldParentsLoaded+"</li>";
-		summary+="<li>New lots of new compounds in the file: "+numNewLotsOldParentsLoaded+"</li>";
-		summary+="</div>";
-		if (!errorMap.isEmpty()){
-			summary+="<div><h5>Errors</h5><ul>";
-			for (String error: errorMap.keySet()){
-				summary += "<li>"+errorMap.get(error)+" entries had: "+error+"</li>";
-			}
-			summary+="</ul></div>";
+		summary += "<li>Number of entries processed: " + numRecordsRead + "</li>";
+		summary += "<li>Number of entries with error: " + numErrorRecords + "</li>";
+		summary += "<li>Number of warnings: " + numWarningRecords + "</li>";
+		summary += "<li>New compounds: " + numNewParentsLoaded + "</li>";
+		summary += "<li>New lots of existing compounds: " + numNewLotsOldParentsLoaded + "</li>";
+		summary += "<li>New lots of new compounds in the file: " + numNewLotsOldParentsLoaded + "</li>";
+		summary += "</div>";
+		if (!errorMap.isEmpty()) {
+			summary += "<div><h5>Errors</h5><ul>";
+			for (String error : errorMap.keySet()) {
+				summary += "<li>" + errorMap.get(error) + " entries had: " + error + "</li>";
+			}
+			summary += "</ul></div>";
 		}
-		if (!warningMap.isEmpty()){
-			summary+="<div><h5>Warnings</h5><ul>";
-			for (String warning: warningMap.keySet()){
-				summary += "<li>"+warningMap.get(warning)+" entries had: "+warning+"</li>";
+		if (!warningMap.isEmpty()) {
+			summary += "<div><h5>Warnings</h5><ul>";
+			for (String warning : warningMap.keySet()) {
+				summary += "<li>" + warningMap.get(warning) + " entries had: " + warning + "</li>";
 			}
-			summary+="</ul></div>";
+			summary += "</ul></div>";
 		}
 		reportOutStream.write(summary.getBytes());
 		return summary;
@@ -1598,38 +1929,38 @@ public PurgeFileDependencyCheckResponseDTO checkPurgeFileDependencies(BulkLoadFi
 		Map<String, HashSet<String>> acasDependencies = new HashMap<String, HashSet<String>>();
 		Map<String, HashSet<String>> cmpdRegDependencies = new HashMap<String, HashSet<String>>();
 		HashSet<String> dependentSingleRegLots = new HashSet<String>();
-		//we make a map with a CorpName as each key, and a list of dependent CorpNames as each value
+		// we make a map with a CorpName as each key, and a list of dependent CorpNames
+		// as each value
 		int numberOfParents = 0;
 		int numberOfSaltForms = 0;
 		int numberOfLots = 0;
 		Collection<Parent> parents = Parent.findParentsByBulkLoadFileEquals(bulkLoadFile).getResultList();
 		numberOfParents = parents.size();
 		String manuallyRegistered = "Manually Registered";
-		for (Parent parent: parents){
+		for (Parent parent : parents) {
 			acasDependencies.put(parent.getCorpName(), new HashSet<String>());
-			if (parent.getSaltForms() != null){
-				for (SaltForm saltForm : parent.getSaltForms()){
+			if (parent.getSaltForms() != null) {
+				for (SaltForm saltForm : parent.getSaltForms()) {
 					acasDependencies.put(saltForm.getCorpName(), new HashSet<String>());
-					if (saltForm.getBulkLoadFile() != null &&saltForm.getBulkLoadFile() != bulkLoadFile){
-						if (cmpdRegDependencies.containsKey(parent.getCorpName())){
+					if (saltForm.getBulkLoadFile() != null && saltForm.getBulkLoadFile() != bulkLoadFile) {
+						if (cmpdRegDependencies.containsKey(parent.getCorpName())) {
 							cmpdRegDependencies.get(parent.getCorpName()).add(saltForm.getBulkLoadFile().getFileName());
-						}
-						else{
+						} else {
 							HashSet<String> dependentFiles = new HashSet<String>();
 							dependentFiles.add(saltForm.getBulkLoadFile().getFileName());
 							cmpdRegDependencies.put(parent.getCorpName(), dependentFiles);
 						}
 					}
-					if (saltForm.getLots() != null){
-						for (Lot lot : saltForm.getLots()){
+					if (saltForm.getLots() != null) {
+						for (Lot lot : saltForm.getLots()) {
 							acasDependencies.put(lot.getCorpName(), new HashSet<String>());
-							if (lot.getBulkLoadFile() == null){
+							if (lot.getBulkLoadFile() == null) {
 								dependentSingleRegLots.add(lot.getCorpName());
-							}else if (lot.getBulkLoadFile() != bulkLoadFile){
-								if (cmpdRegDependencies.containsKey(parent.getCorpName())){
-									cmpdRegDependencies.get(parent.getCorpName()).add(lot.getBulkLoadFile().getFileName());
-								}
-								else{
+							} else if (lot.getBulkLoadFile() != bulkLoadFile) {
+								if (cmpdRegDependencies.containsKey(parent.getCorpName())) {
+									cmpdRegDependencies.get(parent.getCorpName())
+											.add(lot.getBulkLoadFile().getFileName());
+								} else {
 									HashSet<String> dependentFiles = new HashSet<String>();
 									dependentFiles.add(lot.getBulkLoadFile().getFileName());
 									cmpdRegDependencies.put(parent.getCorpName(), dependentFiles);
@@ -1641,21 +1972,20 @@ public PurgeFileDependencyCheckResponseDTO checkPurgeFileDependencies(BulkLoadFi
 			}
 		}
 		parents.clear();
-		
+
 		Collection<SaltForm> saltForms = SaltForm.findSaltFormsByBulkLoadFileEquals(bulkLoadFile).getResultList();
 		numberOfSaltForms = saltForms.size();
-		for (SaltForm saltForm : saltForms){
+		for (SaltForm saltForm : saltForms) {
 			acasDependencies.put(saltForm.getCorpName(), new HashSet<String>());
-			if (saltForm.getLots() != null){
-				for (Lot lot : saltForm.getLots()){
+			if (saltForm.getLots() != null) {
+				for (Lot lot : saltForm.getLots()) {
 					acasDependencies.put(lot.getCorpName(), new HashSet<String>());
-					if (lot.getBulkLoadFile() == null){
+					if (lot.getBulkLoadFile() == null) {
 						dependentSingleRegLots.add(lot.getCorpName());
-					}else if (lot.getBulkLoadFile() != bulkLoadFile){
-						if (cmpdRegDependencies.containsKey(saltForm.getCorpName())){
+					} else if (lot.getBulkLoadFile() != bulkLoadFile) {
+						if (cmpdRegDependencies.containsKey(saltForm.getCorpName())) {
 							cmpdRegDependencies.get(saltForm.getCorpName()).add(lot.getBulkLoadFile().getFileName());
-						}
-						else{
+						} else {
 							HashSet<String> dependentFiles = new HashSet<String>();
 							dependentFiles.add(lot.getBulkLoadFile().getFileName());
 							cmpdRegDependencies.put(saltForm.getCorpName(), dependentFiles);
@@ -1667,26 +1997,27 @@ public PurgeFileDependencyCheckResponseDTO checkPurgeFileDependencies(BulkLoadFi
 		saltForms.clear();
 
 		Collection<Lot> lots = Lot.findLotsByBulkLoadFileEquals(bulkLoadFile).getResultList();
-		for (Lot lot : lots){
+		for (Lot lot : lots) {
 			acasDependencies.put(lot.getCorpName(), new HashSet<String>());
 		}
 		numberOfLots = lots.size();
 		lots.clear();
-		if (logger.isDebugEnabled()) logger.debug(cmpdRegDependencies.toString());
-		//Check for all the vials in ACAS that reference lots being purged
+		if (logger.isDebugEnabled())
+			logger.debug(cmpdRegDependencies.toString());
+		// Check for all the vials in ACAS that reference lots being purged
 		Integer numberOfDependentContainers = null;
 		Collection<ContainerBatchCodeDTO> dependentContainers = null;
-		if (!acasDependencies.isEmpty()){
-			try{
+		if (!acasDependencies.isEmpty()) {
+			try {
 				dependentContainers = checkDependentACASContainers(acasDependencies.keySet());
 				numberOfDependentContainers = dependentContainers.size();
-			} catch (Exception e){
-				logger.error("Caught exception checking for ACAS dependencies.",e);
+			} catch (Exception e) {
+				logger.error("Caught exception checking for ACAS dependencies.", e);
 			}
 		}
-		//Then check for data dependencies in ACAS.
-		if (!acasDependencies.isEmpty()){
-			//check dependencies differently if config to check by barcode is enabled
+		// Then check for data dependencies in ACAS.
+		if (!acasDependencies.isEmpty()) {
+			// check dependencies differently if config to check by barcode is enabled
 			if (propertiesUtilService.getCheckACASDependenciesByContainerCode()) {
 				try {
 					Map<String, HashSet<String>> acasContainerDependencies = new HashMap<String, HashSet<String>>();
@@ -1696,65 +2027,72 @@ public PurgeFileDependencyCheckResponseDTO checkPurgeFileDependencies(BulkLoadFi
 					acasContainerDependencies = checkACASDependencies(acasContainerDependencies);
 					for (ContainerBatchCodeDTO containerBatchDTO : dependentContainers) {
 						HashSet<String> currentDependencies = acasDependencies.get(containerBatchDTO.getBatchCode());
-						currentDependencies.addAll(acasContainerDependencies.get(containerBatchDTO.getContainerCodeName()));
+						currentDependencies
+								.addAll(acasContainerDependencies.get(containerBatchDTO.getContainerCodeName()));
 						acasDependencies.put(containerBatchDTO.getBatchCode(), currentDependencies);
 					}
-				} catch (Exception e){
-					logger.error("Caught exception checking for ACAS dependencies by barcode.",e);
+				} catch (Exception e) {
+					logger.error("Caught exception checking for ACAS dependencies by barcode.", e);
 				}
-			}else {
-				try{
+			} else {
+				try {
 					acasDependencies = checkACASDependencies(acasDependencies);
-				} catch (Exception e){
-					logger.error("Caught exception checking for ACAS dependencies.",e);
+				} catch (Exception e) {
+					logger.error("Caught exception checking for ACAS dependencies.", e);
 				}
 			}
 		}
-		if (logger.isDebugEnabled()) logger.debug(acasDependencies.toString());
-		
+		if (logger.isDebugEnabled())
+			logger.debug(acasDependencies.toString());
+
 		HashSet<String> dependentFiles = new HashSet<String>();
-		for (HashSet<String> dependentSet : cmpdRegDependencies.values()){
-			for (String dependent : dependentSet){
+		for (HashSet<String> dependentSet : cmpdRegDependencies.values()) {
+			for (String dependent : dependentSet) {
 				dependentFiles.add(dependent);
 			}
 		}
 		HashSet<String> dependentExperiments = new HashSet<String>();
-		for (HashSet<String> dependentSet : acasDependencies.values()){
-			for (String dependent : dependentSet){
+		for (HashSet<String> dependentSet : acasDependencies.values()) {
+			for (String dependent : dependentSet) {
 				dependentExperiments.add(dependent);
 			}
 		}
-		
-		if (!dependentFiles.isEmpty() || !dependentExperiments.isEmpty() || !dependentSingleRegLots.isEmpty()){
-			String summary = generateErrorCheckHtml(numberOfParents, numberOfSaltForms, numberOfLots, dependentFiles, dependentExperiments, dependentSingleRegLots, numberOfDependentContainers);
+
+		if (!dependentFiles.isEmpty() || !dependentExperiments.isEmpty() || !dependentSingleRegLots.isEmpty()) {
+			String summary = generateErrorCheckHtml(numberOfParents, numberOfSaltForms, numberOfLots, dependentFiles,
+					dependentExperiments, dependentSingleRegLots, numberOfDependentContainers);
 			return new PurgeFileDependencyCheckResponseDTO(summary, false);
-		}
-		else{
-			String summary = generateSuccessfulCheckHtml(numberOfParents, numberOfSaltForms, numberOfLots, numberOfDependentContainers);
+		} else {
+			String summary = generateSuccessfulCheckHtml(numberOfParents, numberOfSaltForms, numberOfLots,
+					numberOfDependentContainers);
 			return new PurgeFileDependencyCheckResponseDTO(summary, true);
 		}
 	}
 
-	private Collection<ContainerBatchCodeDTO> checkDependentACASContainers(Set<String> batchCodes) throws MalformedURLException, IOException {
-		String url = propertiesUtilService.getAcasURL()+"containers/getContainerDTOsByBatchCodes";
+	private Collection<ContainerBatchCodeDTO> checkDependentACASContainers(Set<String> batchCodes)
+			throws MalformedURLException, IOException {
+		String url = propertiesUtilService.getAcasURL() + "containers/getContainerDTOsByBatchCodes";
 		String json = (new JSONSerializer()).serialize(batchCodes);
 		String responseJson = SimpleUtil.postRequestToExternalServer(url, json, logger);
-		Collection<ContainerBatchCodeDTO> responseDTOs = ContainerBatchCodeDTO.fromJsonArrayToContainerBatchCoes(responseJson);
+		Collection<ContainerBatchCodeDTO> responseDTOs = ContainerBatchCodeDTO
+				.fromJsonArrayToContainerBatchCoes(responseJson);
 		return responseDTOs;
-		
+
 	}
 
 	public String generateSuccessfulCheckHtml(int numberOfParents,
 			int numberOfSaltForms, int numberOfLots, Integer numberOfDependentContainers) {
 		String summary = "<div>Are you sure you want to purge this file?</div>";
-		summary+="<div style=\"margin-top:15px;\">";
-		summary+="<div>"+numberOfParents+" parent compounds will be deleted."+"</div>";
-		summary+="<div>"+numberOfLots+" compound lots will be deleted."+"</div>";
-		if (numberOfDependentContainers != null && numberOfDependentContainers > 0) summary+="<div>"+numberOfDependentContainers+" containers referencing these lots will be deleted."+"</div>";
-		//		summary+="<div style=\"margin-top:15px;margin-bottom:10px;\">";
-		//		summary+=""+numErrorRecords+" errors have been written to: "+errorSDFName+"";
-		//		summary+="</div>";
-		summary+="</div>";
+		summary += "<div style=\"margin-top:15px;\">";
+		summary += "<div>" + numberOfParents + " parent compounds will be deleted." + "</div>";
+		summary += "<div>" + numberOfLots + " compound lots will be deleted." + "</div>";
+		if (numberOfDependentContainers != null && numberOfDependentContainers > 0)
+			summary += "<div>" + numberOfDependentContainers + " containers referencing these lots will be deleted."
+					+ "</div>";
+		// summary+="<div style=\"margin-top:15px;margin-bottom:10px;\">";
+		// summary+=""+numErrorRecords+" errors have been written to: "+errorSDFName+"";
+		// summary+="</div>";
+		summary += "</div>";
 
 		return summary;
 	}
@@ -1762,48 +2100,50 @@ public String generateSuccessfulCheckHtml(int numberOfParents,
 	public String generateErrorCheckHtml(int numberOfParents,
 			int numberOfSaltForms, int numberOfLots,
 			HashSet<String> dependentFiles,
-			HashSet<String> dependentExperiments, HashSet<String> dependentSingleRegLots, Integer numberOfDependentContainers) {
+			HashSet<String> dependentExperiments, HashSet<String> dependentSingleRegLots,
+			Integer numberOfDependentContainers) {
 		String summary = "<div>File cannot be purged.</div>";
-		summary+="<div style=\"margin-top:15px;\">";
-		summary+="<div>"+numberOfParents+" parent compounds were referenced."+"</div>";
-		summary+="<div>"+numberOfLots+" compound lots were referenced."+"</div>";
-		if (numberOfDependentContainers != null && numberOfDependentContainers > 0) summary+="<div>"+numberOfDependentContainers+" containers reference these lots."+"</div>";
-		
+		summary += "<div style=\"margin-top:15px;\">";
+		summary += "<div>" + numberOfParents + " parent compounds were referenced." + "</div>";
+		summary += "<div>" + numberOfLots + " compound lots were referenced." + "</div>";
+		if (numberOfDependentContainers != null && numberOfDependentContainers > 0)
+			summary += "<div>" + numberOfDependentContainers + " containers reference these lots." + "</div>";
+
 		boolean hasCmpdRegDependencies = !dependentFiles.isEmpty();
 		boolean hasAcasDependencies = !dependentExperiments.isEmpty();
 		boolean hasSingleRegDependencies = !dependentSingleRegLots.isEmpty();
-		if (hasCmpdRegDependencies || hasAcasDependencies || hasSingleRegDependencies){
-			summary+="<br>";
-			summary+= "<div>If you still want to purge this file, the following must first be purged or deleted:</div>";
-			summary+="<br>";
-			if (hasCmpdRegDependencies){
-				summary+= "<div>Bulk loaded files:</div>";
-				summary+="<div style=\"margin-left:15px;\">";
-				for (String dependent: dependentFiles){
-						summary+= "<div>"+dependent+"</div>";
-				}
-				summary+="</div>";
-				summary+="<br>";
-			}
-			if (hasAcasDependencies){
-				summary+= "<div>ACAS experiments:</div>";
-				summary+="<div style=\"margin-left:15px;\">";
-				for (String dependent: dependentExperiments){
-						summary+= "<div>"+dependent+"</div>";
-				}
-				summary+="</div>";
-				summary+="<br>";
-			}
-			if (hasSingleRegDependencies){
-				summary+= "<div>Manually registered lots:</div>";
-				summary+="<div style=\"margin-left:15px;\">";
-				for (String dependent: dependentSingleRegLots){
-						summary+= "<div>"+dependent+"</div>";
-				}
-				summary+="</div>";
-				summary+="<br>";
-			}
-		summary+="</div>";
+		if (hasCmpdRegDependencies || hasAcasDependencies || hasSingleRegDependencies) {
+			summary += "<br>";
+			summary += "<div>If you still want to purge this file, the following must first be purged or deleted:</div>";
+			summary += "<br>";
+			if (hasCmpdRegDependencies) {
+				summary += "<div>Bulk loaded files:</div>";
+				summary += "<div style=\"margin-left:15px;\">";
+				for (String dependent : dependentFiles) {
+					summary += "<div>" + dependent + "</div>";
+				}
+				summary += "</div>";
+				summary += "<br>";
+			}
+			if (hasAcasDependencies) {
+				summary += "<div>ACAS experiments:</div>";
+				summary += "<div style=\"margin-left:15px;\">";
+				for (String dependent : dependentExperiments) {
+					summary += "<div>" + dependent + "</div>";
+				}
+				summary += "</div>";
+				summary += "<br>";
+			}
+			if (hasSingleRegDependencies) {
+				summary += "<div>Manually registered lots:</div>";
+				summary += "<div style=\"margin-left:15px;\">";
+				for (String dependent : dependentSingleRegLots) {
+					summary += "<div>" + dependent + "</div>";
+				}
+				summary += "</div>";
+				summary += "<br>";
+			}
+			summary += "</div>";
 		}
 
 		return summary;
@@ -1811,21 +2151,24 @@ public String generateErrorCheckHtml(int numberOfParents,
 
 	public Map<String, HashSet<String>> checkACASDependencies(
 			Map<String, HashSet<String>> acasDependencies) throws MalformedURLException, IOException {
-		//here we make an external request to the ACAS Roo server to check for dependent experimental data
-		String url = propertiesUtilService.getAcasURL()+"compounds/checkBatchDependencies";
+		// here we make an external request to the ACAS Roo server to check for
+		// dependent experimental data
+		String url = propertiesUtilService.getAcasURL() + "compounds/checkBatchDependencies";
 		BatchCodeDependencyDTO request = new BatchCodeDependencyDTO(acasDependencies.keySet());
 		String json = request.toJson();
 		String responseJson = SimpleUtil.postRequestToExternalServer(url, json, logger);
 		BatchCodeDependencyDTO responseDTO = BatchCodeDependencyDTO.fromJsonToBatchCodeDependencyDTO(responseJson);
-		if (logger.isDebugEnabled()) if (logger.isDebugEnabled()) logger.debug(responseDTO.toJson());
-		if (responseDTO.getLinkedDataExists()){
+		if (logger.isDebugEnabled())
+			if (logger.isDebugEnabled())
+				logger.debug(responseDTO.toJson());
+		if (responseDTO.getLinkedDataExists()) {
 			logger.info("Found experimental data in ACAS for some compounds.");
-			for (CodeTableDTO experimentCodeTable : responseDTO.getLinkedExperiments()){
-				String experimentCodeAndName = experimentCodeTable.getCode()+ " ( "+experimentCodeTable.getName()+" )";
-				if (acasDependencies.containsKey(experimentCodeTable.getComments())){
+			for (CodeTableDTO experimentCodeTable : responseDTO.getLinkedExperiments()) {
+				String experimentCodeAndName = experimentCodeTable.getCode() + " ( " + experimentCodeTable.getName()
+						+ " )";
+				if (acasDependencies.containsKey(experimentCodeTable.getComments())) {
 					acasDependencies.get(experimentCodeTable.getComments()).add(experimentCodeAndName);
-				}
-				else{
+				} else {
 					HashSet<String> codes = new HashSet<String>();
 					codes.add(experimentCodeAndName);
 					acasDependencies.put(experimentCodeTable.getComments(), codes);
@@ -1837,7 +2180,7 @@ public Map<String, HashSet<String>> checkACASDependencies(
 
 	@Override
 	@Transactional
-	public PurgeFileResponseDTO purgeFile(BulkLoadFile bulkLoadFile) throws MalformedURLException, IOException{
+	public PurgeFileResponseDTO purgeFile(BulkLoadFile bulkLoadFile) throws MalformedURLException, IOException {
 		int numLots = 0;
 		int numSaltForms = 0;
 		int numParents = 0;
@@ -1848,7 +2191,7 @@ public PurgeFileResponseDTO purgeFile(BulkLoadFile bulkLoadFile) throws Malforme
 		for (Lot lot : lots) {
 			lotCorpNames.add(lot.getCorpName());
 		}
-		if(!lotCorpNames.isEmpty()) {
+		if (!lotCorpNames.isEmpty()) {
 			Collection<ContainerBatchCodeDTO> containerBatchCodeDTOs = checkDependentACASContainers(lotCorpNames);
 			numContainers = containerBatchCodeDTOs.size();
 			Collection<String> containerCodeNames = new ArrayList<String>();
@@ -1856,24 +2199,24 @@ public PurgeFileResponseDTO purgeFile(BulkLoadFile bulkLoadFile) throws Malforme
 				containerCodeNames.add(dto.getContainerCodeName());
 			}
 			if (!containerCodeNames.isEmpty()) {
-				String url = propertiesUtilService.getAcasURL()+"containers/deleteArrayByCodeNames";
+				String url = propertiesUtilService.getAcasURL() + "containers/deleteArrayByCodeNames";
 				String json = (new JSONSerializer()).serialize(containerCodeNames);
 				SimpleUtil.postRequestToExternalServer(url, json, logger);
 			}
 		}
-		
+
 		numLots = lots.size();
-		for (Lot lot : lots){
+		for (Lot lot : lots) {
 			Collection<FileList> fileLists = lot.getFileLists();
 			fileLists.addAll(FileList.findFileListsByLot(lot).getResultList());
-			if (fileLists != null){
-				for (FileList fileList : fileLists){
+			if (fileLists != null) {
+				for (FileList fileList : fileLists) {
 					fileList.remove();
 				}
 			}
-			Set<LotAlias>  lotAliases = lot.getLotAliases();
-			if (lotAliases != null){
-				for (LotAlias lotAlias : lotAliases){
+			Set<LotAlias> lotAliases = lot.getLotAliases();
+			if (lotAliases != null) {
+				for (LotAlias lotAlias : lotAliases) {
 					lotAlias.remove();
 				}
 			}
@@ -1881,13 +2224,13 @@ public PurgeFileResponseDTO purgeFile(BulkLoadFile bulkLoadFile) throws Malforme
 		}
 		Collection<SaltForm> saltForms = SaltForm.findSaltFormsByBulkLoadFileEquals(bulkLoadFile).getResultList();
 		numSaltForms = saltForms.size();
-		for (SaltForm saltForm : saltForms){
+		for (SaltForm saltForm : saltForms) {
 			Collection<IsoSalt> isoSalts = saltForm.getIsoSalts();
 			isoSalts.addAll(IsoSalt.findIsoSaltsBySaltForm(saltForm).getResultList());
-			if (isoSalts != null){
-				for (IsoSalt isoSalt : isoSalts){
+			if (isoSalts != null) {
+				for (IsoSalt isoSalt : isoSalts) {
 					isoSalt.remove();
-//					isoSalt.flush();
+					// isoSalt.flush();
 				}
 			}
 			chemStructureService.deleteStructure(StructureType.SALT_FORM, saltForm.getCdId());
@@ -1895,9 +2238,9 @@ public PurgeFileResponseDTO purgeFile(BulkLoadFile bulkLoadFile) throws Malforme
 		}
 		Collection<Parent> parents = Parent.findParentsByBulkLoadFileEquals(bulkLoadFile).getResultList();
 		numParents = parents.size();
-		for (Parent parent : parents){
+		for (Parent parent : parents) {
 			chemStructureService.deleteStructure(StructureType.PARENT, parent.getCdId());
-			for (ParentAlias alias : parent.getParentAliases()){
+			for (ParentAlias alias : parent.getParentAliases()) {
 				alias.remove();
 			}
 			parent.remove();
@@ -1910,83 +2253,96 @@ public PurgeFileResponseDTO purgeFile(BulkLoadFile bulkLoadFile) throws Malforme
 
 	public String generateSuccessfulPurgeHtml(String fileName, int numberOfParents,
 			int numberOfSaltForms, int numberOfLots, int numContainers) {
-		String summary = "<div>Successfully purged file: "+fileName+"</div>";
-		summary+="<div style=\"margin-top:15px;\">";
-		summary+="<div>"+numberOfParents+" parent compounds were deleted."+"</div>";
-		summary+="<div>"+numberOfLots+" compound lots were deleted."+"</div>";
-		summary+="<div>"+numContainers+" containers were deleted."+"</div>";
-		//		summary+="<div style=\"margin-top:15px;margin-bottom:10px;\">";
-		//		summary+=""+numErrorRecords+" errors have been written to: "+errorSDFName+"";
-		//		summary+="</div>";
-		summary+="</div>";
+		String summary = "<div>Successfully purged file: " + fileName + "</div>";
+		summary += "<div style=\"margin-top:15px;\">";
+		summary += "<div>" + numberOfParents + " parent compounds were deleted." + "</div>";
+		summary += "<div>" + numberOfLots + " compound lots were deleted." + "</div>";
+		summary += "<div>" + numContainers + " containers were deleted." + "</div>";
+		// summary+="<div style=\"margin-top:15px;margin-bottom:10px;\">";
+		// summary+=""+numErrorRecords+" errors have been written to: "+errorSDFName+"";
+		// summary+="</div>";
+		summary += "</div>";
 
 		return summary;
 	}
-	
-	public CmpdRegMolecule processForSaltStripping(CmpdRegMolecule inputMol, Collection<BulkLoadPropertyMappingDTO> mappings, Collection<ValidationResponseDTO> results, int recordNumber) throws CmpdRegMolFormatException{
+
+	public CmpdRegMolecule processForSaltStripping(CmpdRegMolecule inputMol,
+			Collection<BulkLoadPropertyMappingDTO> mappings, Collection<ValidationResponseDTO> results,
+			int recordNumber) throws CmpdRegMolFormatException {
 		boolean multipleFragments = chemStructureService.checkForSalt(inputMol.getMolStructure());
-		boolean markedAsMixture = Boolean.valueOf(getStringValueFromMappings(inputMol, "Parent Is Mixture", mappings, results, recordNumber));
-		if (multipleFragments && !markedAsMixture){
-			//attempt salt stripping
+		boolean markedAsMixture = Boolean
+				.valueOf(getStringValueFromMappings(inputMol, "Parent Is Mixture", mappings, results, recordNumber));
+		if (multipleFragments && !markedAsMixture) {
+			// attempt salt stripping
 			StrippedSaltDTO strippedSaltDTO = chemStructureService.stripSalts(inputMol);
-			if (!strippedSaltDTO.getSaltCounts().isEmpty() && strippedSaltDTO.getUnidentifiedFragments().size() == 1){
-				logger.debug("Successful salt stripping! "+strippedSaltDTO.getSaltCounts().size()+" distinct salts found. No unidentified fragments.");
-				inputMol = inputMol.replaceStructure(strippedSaltDTO.getUnidentifiedFragments().iterator().next().getMolStructure());
+			if (!strippedSaltDTO.getSaltCounts().isEmpty() && strippedSaltDTO.getUnidentifiedFragments().size() == 1) {
+				logger.debug("Successful salt stripping! " + strippedSaltDTO.getSaltCounts().size()
+						+ " distinct salts found. No unidentified fragments.");
+				inputMol = inputMol.replaceStructure(
+						strippedSaltDTO.getUnidentifiedFragments().iterator().next().getMolStructure());
 				logger.debug("Cleaned parent structure (only fragment not identified as salt)");
 				logger.debug(inputMol.getMolStructure());
 				String saltAbbrevString = "";
 				String saltEquivString = "";
-				String saltAbbrevMapping = getStringValueFromMappings(inputMol, "Lot Salt Abbrev", mappings, results, recordNumber);
-				if (saltAbbrevMapping != null){
+				String saltAbbrevMapping = getStringValueFromMappings(inputMol, "Lot Salt Abbrev", mappings, results,
+						recordNumber);
+				if (saltAbbrevMapping != null) {
 					saltAbbrevString += saltAbbrevMapping;
 					saltAbbrevString += ";";
 				}
-				String saltEquivMapping = getStringValueFromMappings(inputMol, "Lot Salt Equivalents", mappings, results, recordNumber);
-				if (saltEquivMapping != null){
+				String saltEquivMapping = getStringValueFromMappings(inputMol, "Lot Salt Equivalents", mappings,
+						results, recordNumber);
+				if (saltEquivMapping != null) {
 					saltEquivString += saltEquivMapping;
 					saltEquivString += ";";
 				}
-				for (Salt salt : strippedSaltDTO.getSaltCounts().keySet()){
-					if (saltAbbrevString.length()>0) saltAbbrevString += ";";
+				for (Salt salt : strippedSaltDTO.getSaltCounts().keySet()) {
+					if (saltAbbrevString.length() > 0)
+						saltAbbrevString += ";";
 					saltAbbrevString += salt.getAbbrev();
-					if (saltEquivString.length()>0) saltEquivString += ";";
+					if (saltEquivString.length() > 0)
+						saltEquivString += ";";
 					saltEquivString += strippedSaltDTO.getSaltCounts().get(salt);
 				}
 				String dbProperty = "Lot Salt Abbrev";
 				String sdfProperty = dbProperty;
-				if (BulkLoadPropertyMappingDTO.findMappingByDbPropertyEquals(mappings, dbProperty) == null){
-					//no mapping found - add a new one with dbProperty = sdfProperty
-					BulkLoadPropertyMappingDTO newMapping = new BulkLoadPropertyMappingDTO(dbProperty, sdfProperty, false, null, null, false);
+				if (BulkLoadPropertyMappingDTO.findMappingByDbPropertyEquals(mappings, dbProperty) == null) {
+					// no mapping found - add a new one with dbProperty = sdfProperty
+					BulkLoadPropertyMappingDTO newMapping = new BulkLoadPropertyMappingDTO(dbProperty, sdfProperty,
+							false, null, null, false);
 					mappings.add(newMapping);
-				}else{
-					sdfProperty = BulkLoadPropertyMappingDTO.findMappingByDbPropertyEquals(mappings, dbProperty).getSdfProperty();					
+				} else {
+					sdfProperty = BulkLoadPropertyMappingDTO.findMappingByDbPropertyEquals(mappings, dbProperty)
+							.getSdfProperty();
 				}
 				inputMol.setProperty(dbProperty, saltAbbrevString);
-				
+
 				dbProperty = "Lot Salt Equivalents";
 				sdfProperty = dbProperty;
-				if (BulkLoadPropertyMappingDTO.findMappingByDbPropertyEquals(mappings, dbProperty) == null){
-					//no mapping found - add a new one with dbProperty = sdfProperty
-					BulkLoadPropertyMappingDTO newMapping = new BulkLoadPropertyMappingDTO(dbProperty, sdfProperty, false, null, null, false);
+				if (BulkLoadPropertyMappingDTO.findMappingByDbPropertyEquals(mappings, dbProperty) == null) {
+					// no mapping found - add a new one with dbProperty = sdfProperty
+					BulkLoadPropertyMappingDTO newMapping = new BulkLoadPropertyMappingDTO(dbProperty, sdfProperty,
+							false, null, null, false);
 					mappings.add(newMapping);
-				}else{
-					sdfProperty = BulkLoadPropertyMappingDTO.findMappingByDbPropertyEquals(mappings, dbProperty).getSdfProperty();					
+				} else {
+					sdfProperty = BulkLoadPropertyMappingDTO.findMappingByDbPropertyEquals(mappings, dbProperty)
+							.getSdfProperty();
 				}
 				inputMol.setProperty(dbProperty, saltEquivString);
 				return inputMol;
-			}else if (!strippedSaltDTO.getUnidentifiedFragments().isEmpty()){
-				logger.warn("Attempted salt stripping failed - could not identify "+strippedSaltDTO.getUnidentifiedFragments().size()+ " fragments.");
-				for (CmpdRegMolecule unidentifiedFragment : strippedSaltDTO.getUnidentifiedFragments()){
+			} else if (!strippedSaltDTO.getUnidentifiedFragments().isEmpty()) {
+				logger.warn("Attempted salt stripping failed - could not identify "
+						+ strippedSaltDTO.getUnidentifiedFragments().size() + " fragments.");
+				for (CmpdRegMolecule unidentifiedFragment : strippedSaltDTO.getUnidentifiedFragments()) {
 					logger.warn(unidentifiedFragment.getMolStructure());
 				}
 				return inputMol;
-			}else{
+			} else {
 				return inputMol;
 			}
-		}else{
+		} else {
 			return inputMol;
 		}
 	}
 
 }
-
diff --git a/src/main/java/com/labsynch/labseer/service/ChemStructureService.java b/src/main/java/com/labsynch/labseer/service/ChemStructureService.java
index 267f37c55..bd2a8d098 100755
--- a/src/main/java/com/labsynch/labseer/service/ChemStructureService.java
+++ b/src/main/java/com/labsynch/labseer/service/ChemStructureService.java
@@ -18,16 +18,20 @@
 @Service
 public interface ChemStructureService {
 
+	public CmpdRegMolecule[] searchMols(String molfile, StructureType structureType, int[] cdHitList,
+			SearchType searchType, Float simlarityPercent) throws CmpdRegMolFormatException;
 
-	public CmpdRegMolecule[] searchMols(String molfile, StructureType structureType, int[] cdHitList, SearchType searchType, Float simlarityPercent) throws CmpdRegMolFormatException;
+	public CmpdRegMolecule[] searchMols(String molfile, StructureType structureType, int[] inputCdIdHitList,
+			SearchType searchType, Float simlarityPercent, int maxResults) throws CmpdRegMolFormatException;
 
-	public CmpdRegMolecule[] searchMols(String molfile, StructureType structureType, int[] inputCdIdHitList, SearchType searchType, Float simlarityPercent, int maxResults) throws CmpdRegMolFormatException;
+	public int[] searchMolStructures(String molfile, StructureType structureType, SearchType searchType)
+			throws CmpdRegMolFormatException;
 
-	public int[] searchMolStructures(String molfile, StructureType structureType, SearchType searchType) throws CmpdRegMolFormatException;
+	public int[] searchMolStructures(String molfile, StructureType structureType, SearchType searchType,
+			Float simlarityPercent) throws CmpdRegMolFormatException;
 
-	public int[] searchMolStructures(String molfile, StructureType structureType, SearchType searchType, Float simlarityPercent) throws CmpdRegMolFormatException;
-
-	public int[] searchMolStructures(String molfile, StructureType structureType, SearchType searchType, Float simlarityPercent, int maxResults) throws CmpdRegMolFormatException;
+	public int[] searchMolStructures(String molfile, StructureType structureType, SearchType searchType,
+			Float simlarityPercent, int maxResults) throws CmpdRegMolFormatException;
 
 	public int saveStructure(String molfile, StructureType structureType);
 
@@ -61,19 +65,24 @@ public interface ChemStructureService {
 
 	boolean deleteStructure(StructureType structureType, int cdId);
 
-	MolConvertOutputDTO toFormat(String structure, String inputFormat, String outputFormat) throws IOException, CmpdRegMolFormatException;
+	MolConvertOutputDTO toFormat(String structure, String inputFormat, String outputFormat)
+			throws IOException, CmpdRegMolFormatException;
 
-	MolConvertOutputDTO cleanStructure(String structure, int dim, String opts) throws IOException, CmpdRegMolFormatException;
+	MolConvertOutputDTO cleanStructure(String structure, int dim, String opts)
+			throws IOException, CmpdRegMolFormatException;
 
-	String hydrogenizeMol(String structure, String inputFormat, String method) throws IOException, CmpdRegMolFormatException;
+	String hydrogenizeMol(String structure, String inputFormat, String method)
+			throws IOException, CmpdRegMolFormatException;
 
 	String getCipStereo(String structure) throws IOException, CmpdRegMolFormatException;
 
 	StrippedSaltDTO stripSalts(CmpdRegMolecule inputStructure) throws CmpdRegMolFormatException;
 
-	public String standardizeStructure(String molfile) throws CmpdRegMolFormatException, StandardizerException, IOException;
+	public String standardizeStructure(String molfile)
+			throws CmpdRegMolFormatException, StandardizerException, IOException;
 
-	public HashMap<String, CmpdRegMolecule> standardizeStructures(HashMap<String, String> structures) throws CmpdRegMolFormatException, StandardizerException;
+	public HashMap<String, CmpdRegMolecule> standardizeStructures(HashMap<String, String> structures)
+			throws CmpdRegMolFormatException, StandardizerException;
 
 	public boolean compareStructures(String preMolStruct, String postMolStruct, SearchType searchType);
 
@@ -87,50 +96,56 @@ public enum SearchType {
 		DUPLICATE, DUPLICATE_TAUTOMER, DUPLICATE_NO_TAUTOMER, STEREO_IGNORE, FULL_TAUTOMER,
 		SUBSTRUCTURE, SIMILARITY, FULL, EXACT, DEFAULT;
 
-		//IGNORES case on purpose
+		// IGNORES case on purpose
 		public static Optional<SearchType> getIfPresent(String str) {
 			return Arrays.stream(SearchType.values())
-						 .filter(type -> str.trim().equalsIgnoreCase(type.name()))
-						 .findFirst();
+					.filter(type -> str.trim().equalsIgnoreCase(type.name()))
+					.findFirst();
 		}
 	}
 
 	public enum StructureType {
-		PARENT("PARENT"), SALT("SALT"), SALT_FORM("SALT_FORM"), DRY_RUN("DRY_RUN_COMPOUND"), COMPOUND("COMPOUND"), STANDARDIZATION_DRY_RUN("STANDARDIZATION_DRY_RUN_COMPOUND");
+		PARENT("PARENT"), SALT("SALT"), SALT_FORM("SALT_FORM"), DRY_RUN("DRY_RUN_COMPOUND"), COMPOUND("COMPOUND"),
+		STANDARDIZATION_DRY_RUN("STANDARDIZATION_DRY_RUN_COMPOUND");
 
 		// Note the entity table like "PARENT", "SALT_FORM"...etc.
-		// are where the actual entity is stored.  This can differ from
-		// what the implementation often call the "structure table".  The Structure
+		// are where the actual entity is stored. This can differ from
+		// what the implementation often call the "structure table". The Structure
 		// table may or may not exist as part of the chemical entities implementation.
-		// e.g. Indigo stores structures directly in the parent table indexed by the bingo 
-		// cartridge.  Jchem uses a table called "parent_structure".
+		// e.g. Indigo stores structures directly in the parent table indexed by the
+		// bingo
+		// cartridge. Jchem uses a table called "parent_structure".
 		public final String entityTable;
+
 		private StructureType(String entityTable) {
-        	this.entityTable = entityTable;
+			this.entityTable = entityTable;
 		}
 
-		//IGNORES case on purpose
+		// IGNORES case on purpose
 		public static Optional<StructureType> getIfPresent(String str) {
 			return Arrays.stream(StructureType.values())
-							.filter(type -> str.trim().equalsIgnoreCase(type.name()))
-							.findFirst();
+					.filter(type -> str.trim().equalsIgnoreCase(type.name()))
+					.findFirst();
 		}
 	}
 
 	default boolean isIdenticalDisplay(String molStructure, String molStructure2) {
-		//strip the first 2 lines of each mol and do a string equals
-		String mol1 = molStructure.substring(StringUtils.ordinalIndexOf(molStructure, "\n", 2)+1);
-		String mol2 = molStructure2.substring(StringUtils.ordinalIndexOf(molStructure2, "\n", 2)+1);
-		return(mol1.equals(mol2));
+		// strip the first 2 lines of each mol and do a string equals
+		String mol1 = molStructure.substring(StringUtils.ordinalIndexOf(molStructure, "\n", 2) + 1);
+		String mol2 = molStructure2.substring(StringUtils.ordinalIndexOf(molStructure2, "\n", 2) + 1);
+		return (mol1.equals(mol2));
 	}
 
 	public int saveStructure(CmpdRegMolecule cmpdregMolecule, StructureType structureType, boolean checkForDupes);
 
-	public HashMap<String, Integer> saveStructures(HashMap<String, CmpdRegMolecule> structures, StructureType structureType, Boolean checkForDupes);
-	
-	public HashMap<String, CmpdRegMolecule> getCmpdRegMolecules(HashMap<String, Integer> keyIdToStructureId, StructureType structureType) throws CmpdRegMolFormatException;
+	public HashMap<String, Integer> saveStructures(HashMap<String, CmpdRegMolecule> structures,
+			StructureType structureType, Boolean checkForDupes);
+
+	public HashMap<String, CmpdRegMolecule> getCmpdRegMolecules(HashMap<String, Integer> keyIdToStructureId,
+			StructureType structureType) throws CmpdRegMolFormatException;
 
-	public int[] searchMolStructures(CmpdRegMolecule cmpdRegMolecule, StructureType structureType, SearchType searchType, Float simlarityPercent, int maxResults) throws CmpdRegMolFormatException;
+	public int[] searchMolStructures(CmpdRegMolecule cmpdRegMolecule, StructureType structureType,
+			SearchType searchType, Float simlarityPercent, int maxResults) throws CmpdRegMolFormatException;
 
 	public void fillMissingStructures() throws CmpdRegMolFormatException;
 
diff --git a/src/main/java/com/labsynch/labseer/service/ContainerService.java b/src/main/java/com/labsynch/labseer/service/ContainerService.java
index 7ff7643b4..2d89ac5d1 100755
--- a/src/main/java/com/labsynch/labseer/service/ContainerService.java
+++ b/src/main/java/com/labsynch/labseer/service/ContainerService.java
@@ -39,7 +39,7 @@
 public interface ContainerService {
 
 	Container saveLsContainer(Container container);
-	
+
 	Collection<Container> saveLsContainers(Collection<Container> containers);
 
 	Container updateContainer(Container fromJsonToContainer);
@@ -63,7 +63,8 @@ Collection<PlateWellDTO> getWellCodesByPlateBarcodes(
 			List<String> plateBarcodes);
 
 	Collection<CodeLabelDTO> getContainerCodesByLabels(
-			List<String> labelTexts, String containerType, String containerKind, String labelType, String labelKind, Boolean like, Boolean likeRight);
+			List<String> labelTexts, String containerType, String containerKind, String labelType, String labelKind,
+			Boolean like, Boolean likeRight);
 
 	ContainerDependencyCheckDTO checkDependencies(Container container);
 
@@ -84,11 +85,11 @@ Collection<ContainerErrorMessageDTO> updateAmountInWell(
 			Collection<ContainerRequestDTO> wellsToUpdate);
 
 	PlateStubDTO createPlate(CreatePlateRequestDTO plateRequest, String containerKind) throws Exception;
-	
+
 	PlateStubDTO createTube(CreatePlateRequestDTO plateRequest) throws Exception;
-	
+
 	Collection<PlateStubDTO> createTubes(Collection<CreatePlateRequestDTO> plateRequests) throws Exception;
-	
+
 	PlateStubDTO createPlate(CreatePlateRequestDTO plateRequest) throws Exception;
 
 	Collection<PlateStubDTO> createPlates(Collection<CreatePlateRequestDTO> plateRequests) throws Exception;
@@ -160,7 +161,8 @@ Collection<Long> searchContainerIdsByQueryDTO(ContainerQueryDTO query)
 	List<ContainerLocationTreeDTO> getLocationTreeByRootLabel(String rootLabel, Boolean withContainers)
 			throws SQLException;
 
-	List<ContainerLocationTreeDTO> getLocationCodeByLabelBreadcrumbByRecursiveQuery(String rootLabel, List<String> breadcrumbList) throws SQLException;
+	List<ContainerLocationTreeDTO> getLocationCodeByLabelBreadcrumbByRecursiveQuery(String rootLabel,
+			List<String> breadcrumbList) throws SQLException;
 
 	Container getOrCreateTrash(String recordedBy) throws Exception;
 
@@ -174,5 +176,5 @@ List<ContainerLocationTreeDTO> getLocationTreeByRootCodeName(String rootCodeName
 
 	List<ContainerCodeNameStateDTO> saveContainerCodeNameStateDTOArray(
 			List<ContainerCodeNameStateDTO> stateDTOs) throws SQLException;
-	
+
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ContainerServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ContainerServiceImpl.java
index eee7d4302..befcc127a 100755
--- a/src/main/java/com/labsynch/labseer/service/ContainerServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ContainerServiceImpl.java
@@ -177,12 +177,14 @@ private Container saveContainer(String json) {
 	private Container saveContainer(Container container) {
 		Container newContainer = new Container(container);
 		newContainer.persist();
-		if (logger.isDebugEnabled()) logger.debug("container: " + container.toJson());
+		if (logger.isDebugEnabled())
+			logger.debug("container: " + container.toJson());
 		if (container.getLsLabels() != null) {
 			for (ContainerLabel containerLabel : container.getLsLabels()) {
 				ContainerLabel newContainerLabel = new ContainerLabel(containerLabel);
 				newContainerLabel.setContainer(newContainer);
-				if (logger.isDebugEnabled()) logger.debug("here is the newcontainerLabel before save: " + newContainerLabel.toJson());
+				if (logger.isDebugEnabled())
+					logger.debug("here is the newcontainerLabel before save: " + newContainerLabel.toJson());
 				newContainerLabel.persist();
 			}
 		} else {
@@ -193,25 +195,29 @@ private Container saveContainer(Container container) {
 			for (ContainerState LsState : container.getLsStates()) {
 				ContainerState newLsState = new ContainerState(LsState);
 				newLsState.setContainer(newContainer);
-				if (logger.isDebugEnabled()) logger.debug("here is the newLsState before save: " + newLsState.toJson());
+				if (logger.isDebugEnabled())
+					logger.debug("here is the newLsState before save: " + newLsState.toJson());
 				newLsState.persist();
-				if (logger.isDebugEnabled()) logger.debug("persisted the newLsState: " + newLsState.toJson());
+				if (logger.isDebugEnabled())
+					logger.debug("persisted the newLsState: " + newLsState.toJson());
 				if (LsState.getLsValues() != null) {
 					for (ContainerValue containerValue : LsState.getLsValues()) {
-						if (logger.isDebugEnabled()) logger.debug("containerValue: " + containerValue.toJson());
+						if (logger.isDebugEnabled())
+							logger.debug("containerValue: " + containerValue.toJson());
 						containerValue.setLsState(newLsState);
 						containerValue.persist();
-						if (logger.isDebugEnabled()) logger.debug("persisted the containerValue: " + containerValue.toJson());
+						if (logger.isDebugEnabled())
+							logger.debug("persisted the containerValue: " + containerValue.toJson());
 					}
 				} else {
-					if (logger.isDebugEnabled()) logger.debug("No container values to save");
+					if (logger.isDebugEnabled())
+						logger.debug("No container values to save");
 				}
 			}
 		}
 		return newContainer;
 	}
 
-
 	@Override
 	public Collection<Container> saveLsContainers(String json) {
 		Collection<Container> savedContainers = new ArrayList<Container>();
@@ -236,7 +242,7 @@ public Collection<Container> saveLsContainers(String json) {
 
 	@Override
 	public Container saveLsContainer(Container container) {
-		if (logger.isDebugEnabled()){
+		if (logger.isDebugEnabled()) {
 			logger.debug("incoming meta container: " + container.toJson() + "\n");
 		}
 		Container newContainer = new Container(container);
@@ -310,7 +316,7 @@ public Container saveLsContainer(Container container) {
 					}
 					if (itxContainerContainer.getFirstContainer().getId() == null) {
 						if (logger.isDebugEnabled()) {
-							logger.debug("saving new nested Container" 
+							logger.debug("saving new nested Container"
 									+ itxContainerContainer.getFirstContainer().toJson());
 						}
 						Container nestedContainer = saveLsContainer(itxContainerContainer.getFirstContainer());
@@ -464,23 +470,23 @@ public Collection<Container> saveLsContainers(Collection<Container> containers)
 	@Transactional
 	@Override
 	public List<ContainerCodeNameStateDTO> saveContainerCodeNameStateDTOArray(
-			List<ContainerCodeNameStateDTO> stateDTOs) throws SQLException{
+			List<ContainerCodeNameStateDTO> stateDTOs) throws SQLException {
 		List<ContainerCodeNameStateDTO> savedDTOs = new ArrayList<ContainerCodeNameStateDTO>();
-		//collect all the states to be saved into a List
+		// collect all the states to be saved into a List
 		List<ContainerState> statesToSave = new ArrayList<ContainerState>();
 		for (ContainerCodeNameStateDTO stateDTO : stateDTOs) {
 			statesToSave.add(stateDTO.getLsState());
 		}
-		//save all the states at once
+		// save all the states at once
 		List<Long> savedStateIds = insertContainerStates(statesToSave);
-		//fill in the saved state ids
+		// fill in the saved state ids
 		int i = 0;
 		for (ContainerState state : statesToSave) {
 			state.setId(savedStateIds.get(i));
 			state.setVersion(0);
 			i++;
 		}
-		//collect all the values to be saved into a List
+		// collect all the values to be saved into a List
 		List<ContainerValue> valuesToSave = new ArrayList<ContainerValue>();
 		for (ContainerState savedState : statesToSave) {
 			for (ContainerValue valueToSave : savedState.getLsValues()) {
@@ -488,16 +494,16 @@ public List<ContainerCodeNameStateDTO> saveContainerCodeNameStateDTOArray(
 				valuesToSave.add(valueToSave);
 			}
 		}
-		//save all the values at once
+		// save all the values at once
 		List<Long> savedValueIds = insertContainerValues(valuesToSave);
-		//fill in the saved value ids
+		// fill in the saved value ids
 		int j = 0;
 		for (ContainerValue value : valuesToSave) {
 			value.setId(savedValueIds.get(j));
 			value.setVersion(0);
 			j++;
 		}
-		//re-associate the values with the correct states
+		// re-associate the values with the correct states
 		Map<Long, Set<ContainerValue>> stateIdToValuesMap = new HashMap<Long, Set<ContainerValue>>();
 		for (ContainerValue savedValue : valuesToSave) {
 			Long stateId = savedValue.getLsState().getId();
@@ -505,7 +511,7 @@ public List<ContainerCodeNameStateDTO> saveContainerCodeNameStateDTOArray(
 				Set<ContainerValue> values = stateIdToValuesMap.get(stateId);
 				values.add(savedValue);
 				stateIdToValuesMap.put(stateId, values);
-			}else {
+			} else {
 				Set<ContainerValue> values = new HashSet<ContainerValue>();
 				values.add(savedValue);
 				stateIdToValuesMap.put(stateId, values);
@@ -514,10 +520,11 @@ public List<ContainerCodeNameStateDTO> saveContainerCodeNameStateDTOArray(
 		for (ContainerState savedState : statesToSave) {
 			Set<ContainerValue> savedValues = stateIdToValuesMap.get(savedState.getId());
 			savedState.setLsValues(savedValues);
-			ContainerCodeNameStateDTO savedDTO = new ContainerCodeNameStateDTO(savedState.getContainer().getCodeName(), savedState);
+			ContainerCodeNameStateDTO savedDTO = new ContainerCodeNameStateDTO(savedState.getContainer().getCodeName(),
+					savedState);
 			savedDTOs.add(savedDTO);
 		}
-		
+
 		return savedDTOs;
 	}
 
@@ -707,7 +714,7 @@ public void updateLsStates(Container jsonContainer, Container updatedContainer)
 						if (lsThingValue.getId() == null) {
 							updatedContainerValue = ContainerValue.create(lsThingValue);
 							updatedContainerValue
-							.setLsState(ContainerState.findContainerState(updatedContainerState.getId()));
+									.setLsState(ContainerState.findContainerState(updatedContainerState.getId()));
 							updatedContainerValue.persist();
 							updatedContainerState.getLsValues().add(updatedContainerValue);
 						} else {
@@ -1040,7 +1047,7 @@ public Collection<WellContentDTO> getWellContent(List<String> wellCodes) {
 			}
 			requestWellCodeNames.removeAll(foundWellCodeNames);
 			logger.debug(emptyWellResults.size() + " found with no content, " + requestWellCodeNames.size()
-			+ " not found at all");
+					+ " not found at all");
 			for (String notFoundCodeName : requestWellCodeNames) {
 				WellContentDTO notFoundDTO = new WellContentDTO();
 				notFoundDTO.setContainerCodeName(notFoundCodeName);
@@ -2079,7 +2086,7 @@ private Map<String, Long[]> getWellAndStatusContentStateIdsByCodeNames(List<Stri
 			}
 			requestCodeNames.removeAll(foundCodeNames);
 			logger.debug(emptyWellResults.size() + " found with no content, " + requestCodeNames.size()
-			+ " not found at all");
+					+ " not found at all");
 		}
 		if (!requestCodeNames.isEmpty()) {
 			for (String notFoundCodeName : requestCodeNames) {
@@ -2615,7 +2622,7 @@ public void setValues(PreparedStatement ps, int i) throws SQLException {
 				ps.setString(4, value.getCodeKind());
 				ps.setString(5, value.getCodeOrigin());
 				ps.setString(6, value.getCodeType());
-				ps.setString(7, value.getCodeType()+"_"+value.getCodeKind());
+				ps.setString(7, value.getCodeType() + "_" + value.getCodeKind());
 				ps.setString(8, value.getCodeValue());
 				ps.setString(9, value.getComments());
 				ps.setString(10, value.getConcUnit());
@@ -2633,7 +2640,7 @@ public void setValues(PreparedStatement ps, int i) throws SQLException {
 				ps.setString(16, value.getLsKind());
 				ps.setLong(17, value.getLsTransaction());
 				ps.setString(18, value.getLsType());
-				ps.setString(19, value.getLsType()+"_"+value.getLsKind());
+				ps.setString(19, value.getLsType() + "_" + value.getLsKind());
 				ps.setString(20, value.getModifiedBy());
 				if (value.getModifiedDate() != null)
 					ps.setTimestamp(21, new java.sql.Timestamp(value.getModifiedDate().getTime()));
@@ -2646,7 +2653,7 @@ public void setValues(PreparedStatement ps, int i) throws SQLException {
 				ps.setBigDecimal(23, value.getNumericValue());
 				ps.setString(24, value.getOperatorKind());
 				ps.setString(25, value.getOperatorType());
-				ps.setString(26, value.getOperatorType()+"_"+value.getOperatorKind());
+				ps.setString(26, value.getOperatorType() + "_" + value.getOperatorKind());
 				ps.setBoolean(27, value.getPublicData());
 				ps.setString(28, value.getRecordedBy());
 				if (value.getRecordedDate() != null)
@@ -3516,13 +3523,15 @@ public List<ContainerLocationTreeDTO> getLocationCodeByLabelBreadcrumbByRecursiv
 	}
 
 	@Override
-	public List<ContainerLocationTreeDTO> getLocationTreeByRootCodeName(String rootCodeName, Boolean withContainers) throws SQLException {
+	public List<ContainerLocationTreeDTO> getLocationTreeByRootCodeName(String rootCodeName, Boolean withContainers)
+			throws SQLException {
 		return getLocationTreeDTO(null, rootCodeName, null, withContainers);
 	}
 
 	@Override
 	@Transactional
-	public List<ContainerLocationTreeDTO> getLocationTreeDTO(String rootLabel, String rootCodeName, List<String> breadcrumbList, Boolean withContainers) throws SQLException {
+	public List<ContainerLocationTreeDTO> getLocationTreeDTO(String rootLabel, String rootCodeName,
+			List<String> breadcrumbList, Boolean withContainers) throws SQLException {
 		boolean withRootLabel = (rootLabel != null && rootLabel.length() > 0);
 		boolean withRootCodeName = (rootCodeName != null && rootCodeName.length() > 0);
 		boolean withBreadcrumbList = (breadcrumbList != null && breadcrumbList.size() > 0);
@@ -3556,7 +3565,7 @@ public List<ContainerLocationTreeDTO> getLocationTreeDTO(String rootLabel, Strin
 					+ "    FROM \n"
 					+ "        (SELECT \n"
 					+ "        c.code_name, \n"
-					+ "        cl.label_text, \n" 
+					+ "        cl.label_text, \n"
 					+ "        c.ls_type ,\n"
 					+ "        c.ls_kind  \n"
 					+ "    FROM \n"
@@ -3592,8 +3601,8 @@ public List<ContainerLocationTreeDTO> getLocationTreeDTO(String rootLabel, Strin
 					+ "        t1.label_text_bread_crumb \n"
 					+ "         || '>' \n"
 					+ "         || interactions.label_text AS label_text_bread_crumb, \n"
-					+ "        interactions.ls_type, \n" 
-					+"         interactions.ls_kind "
+					+ "        interactions.ls_type, \n"
+					+ "         interactions.ls_kind "
 					+ "    FROM \n"
 					+ "        (SELECT c1.code_name AS code_name, \n"
 					+ "        cl1.label_text AS label_text, \n"
@@ -3658,7 +3667,7 @@ public List<ContainerLocationTreeDTO> getLocationTreeDTO(String rootLabel, Strin
 					+ "    ls_kind \n"
 					+ "FROM \n"
 					+ "    t1 ";
-			if (withBreadcrumbList){
+			if (withBreadcrumbList) {
 				queryString += "WHERE label_text_bread_crumb IN :breadcrumbList \n";
 			}
 			queryString += ";";
@@ -3702,7 +3711,7 @@ public List<ContainerLocationTreeDTO> getLocationTreeDTO(String rootLabel, Strin
 			queryString += "),anchors AS ( \n"
 					+ "    SELECT \n"
 					+ "        c.code_name, \n"
-					+ "        cl.label_text, \n"  
+					+ "        cl.label_text, \n"
 					+ "          c.ls_type, \n"
 					+ "          c.ls_kind \n"
 					+ "    FROM \n"
@@ -3714,8 +3723,7 @@ public List<ContainerLocationTreeDTO> getLocationTreeDTO(String rootLabel, Strin
 					+ "        AND \n"
 					+ "            cl.deleted = 0 \n"
 					+ "    WHERE \n"
-					+ "            c.deleted = 0 \n"
-					;
+					+ "            c.deleted = 0 \n";
 			if (withRootLabel) {
 				queryString += "        AND \n"
 						+ "            cl.label_text LIKE :rootLabel ";
@@ -3797,7 +3805,7 @@ public List<ContainerLocationTreeDTO> getLocationTreeDTO(String rootLabel, Strin
 					+ "    cycle \n"
 					+ "FROM \n"
 					+ "    t1 ";
-			if (withBreadcrumbList){
+			if (withBreadcrumbList) {
 				queryString += "WHERE label_text_bread_crumb IN :breadcrumbList \n";
 			}
 		}
@@ -3816,6 +3824,4 @@ public List<ContainerLocationTreeDTO> getLocationTreeDTO(String rootLabel, Strin
 		return results;
 	}
 
-
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ContainerStateService.java b/src/main/java/com/labsynch/labseer/service/ContainerStateService.java
index 5f1fcaa9e..46b932e3c 100755
--- a/src/main/java/com/labsynch/labseer/service/ContainerStateService.java
+++ b/src/main/java/com/labsynch/labseer/service/ContainerStateService.java
@@ -48,6 +48,4 @@ Collection<ContainerState> getContainerStatesByContainerValue(
 			ContainerValueRequestDTO requestDTO, Boolean like, Boolean rightLike)
 			throws Exception;
 
-	
-	
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ContainerStateServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ContainerStateServiceImpl.java
index 02b7b6d51..5ae77fcbf 100755
--- a/src/main/java/com/labsynch/labseer/service/ContainerStateServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ContainerStateServiceImpl.java
@@ -49,17 +49,18 @@ public class ContainerStateServiceImpl implements ContainerStateService {
 
 	@Override
 	public Collection<ContainerState> ignoreAllContainerStates(Collection<ContainerState> containerStates) {
-		//mark ContainerStates and values as ignore 
+		// mark ContainerStates and values as ignore
 		int i = 0;
 		int j = 0;
 		int batchSize = propertiesUtilService.getBatchSize();
 		Collection<ContainerState> contianerStateSet = new HashSet<ContainerState>();
-		for (ContainerState queryContainerState : containerStates){
-			ContainerState containerState = ContainerState.findContainerState(queryContainerState.getId());			
-			for(ContainerValue containerValue : ContainerValue.findContainerValuesByLsState(containerState).getResultList()){
+		for (ContainerState queryContainerState : containerStates) {
+			ContainerState containerState = ContainerState.findContainerState(queryContainerState.getId());
+			for (ContainerValue containerValue : ContainerValue.findContainerValuesByLsState(containerState)
+					.getResultList()) {
 				containerValue.setIgnored(true);
 				containerValue.merge();
-				if ( i % batchSize == 0 ) { // same as the JDBC batch size
+				if (i % batchSize == 0) { // same as the JDBC batch size
 					containerValue.flush();
 					containerValue.clear();
 				}
@@ -67,7 +68,7 @@ public Collection<ContainerState> ignoreAllContainerStates(Collection<ContainerS
 			}
 			containerState.setIgnored(true);
 			containerState.merge();
-			if ( j % batchSize == 0 ) { // same as the JDBC batch size
+			if (j % batchSize == 0) { // same as the JDBC batch size
 				containerState.flush();
 				containerState.clear();
 			}
@@ -75,7 +76,7 @@ public Collection<ContainerState> ignoreAllContainerStates(Collection<ContainerS
 			contianerStateSet.add(ContainerState.findContainerState(containerState.getId()));
 		}
 
-		return(contianerStateSet);
+		return (contianerStateSet);
 
 	}
 
@@ -93,27 +94,30 @@ public LsTransaction ignoreByContainer(String json, String lsKind) throws Except
 			BufferedReader br = new BufferedReader(sr);
 			UpdateLog uplog;
 			boolean ignored = true;
-			for (Container container : Container.fromJsonArrayToContainers(br)){
-					List<ContainerState> containerStates = ContainerState.findContainerStatesByContainerAndLsKindEqualsAndIgnoredNot(Container.findContainer(container.getId()), lsKind, ignored).getResultList();
-					logger.debug("number of containerStates found: " + containerStates.size());
-					for (ContainerState containerState : containerStates) {
-						uplog = new UpdateLog();
-						uplog.setThing(containerState.getId());
-						uplog.setLsTransaction(lst.getId());
-						uplog.setUpdateAction("ignore");
-						uplog.setComments("mark states to ignore");
-						uplog.setRecordedDate(new Date());
-						uplog.persist();
-						if ( i % batchSize == 0 ) { // same as the JDBC batch size
-							uplog.flush();
-							uplog.clear();
-						}
-						i++;
-					}						
+			for (Container container : Container.fromJsonArrayToContainers(br)) {
+				List<ContainerState> containerStates = ContainerState
+						.findContainerStatesByContainerAndLsKindEqualsAndIgnoredNot(
+								Container.findContainer(container.getId()), lsKind, ignored)
+						.getResultList();
+				logger.debug("number of containerStates found: " + containerStates.size());
+				for (ContainerState containerState : containerStates) {
+					uplog = new UpdateLog();
+					uplog.setThing(containerState.getId());
+					uplog.setLsTransaction(lst.getId());
+					uplog.setUpdateAction("ignore");
+					uplog.setComments("mark states to ignore");
+					uplog.setRecordedDate(new Date());
+					uplog.persist();
+					if (i % batchSize == 0) { // same as the JDBC batch size
+						uplog.flush();
+						uplog.clear();
+					}
+					i++;
+				}
 			}
 			int results = ContainerState.ignoreStates(lst.getId());
 			logger.debug("number of states marked to ignore: " + results);
-		} catch (Exception e){
+		} catch (Exception e) {
 			logger.error("ERROR: " + e);
 			throw new Exception(e.toString());
 		}
@@ -124,36 +128,42 @@ public LsTransaction ignoreByContainer(String json, String lsKind) throws Except
 	@Override
 	public ContainerState updateContainerState(ContainerState containerState) {
 		ContainerState updatedContainerState;
-		if (containerState.getId() == null){
+		if (containerState.getId() == null) {
 			updatedContainerState = new ContainerState(containerState);
 			updatedContainerState.setContainer(Container.findContainer(containerState.getContainer().getId()));
 			updatedContainerState.persist();
-			if (logger.isDebugEnabled()) logger.debug("persisted new container state " + updatedContainerState.getId());
+			if (logger.isDebugEnabled())
+				logger.debug("persisted new container state " + updatedContainerState.getId());
 
 		} else {
 			updatedContainerState = ContainerState.update(containerState);
 
-			if (logger.isDebugEnabled()) logger.debug("updated container state " + updatedContainerState.getId());
+			if (logger.isDebugEnabled())
+				logger.debug("updated container state " + updatedContainerState.getId());
 
 		}
-		if (containerState.getLsValues() != null){
-			for(ContainerValue lsThingValue : containerState.getLsValues()){
-				if (lsThingValue.getLsState() == null) lsThingValue.setLsState(updatedContainerState);
+		if (containerState.getLsValues() != null) {
+			for (ContainerValue lsThingValue : containerState.getLsValues()) {
+				if (lsThingValue.getLsState() == null)
+					lsThingValue.setLsState(updatedContainerState);
 				ContainerValue updatedContainerValue;
-				if (lsThingValue.getId() == null){
+				if (lsThingValue.getId() == null) {
 					updatedContainerValue = ContainerValue.create(lsThingValue);
 					updatedContainerValue.setLsState(ContainerState.findContainerState(updatedContainerState.getId()));
 					updatedContainerValue.persist();
 					updatedContainerState.getLsValues().add(updatedContainerValue);
 				} else {
 					updatedContainerValue = ContainerValue.update(lsThingValue);
-					if (logger.isDebugEnabled()) logger.debug("updated container value " + updatedContainerValue.getId());
+					if (logger.isDebugEnabled())
+						logger.debug("updated container value " + updatedContainerValue.getId());
 				}
-				if (logger.isDebugEnabled()) logger.debug("checking container " + updatedContainerValue.toJson());
+				if (logger.isDebugEnabled())
+					logger.debug("checking container " + updatedContainerValue.toJson());
 
-			}	
+			}
 		} else {
-			if (logger.isDebugEnabled()) logger.debug("No container values to update");
+			if (logger.isDebugEnabled())
+				logger.debug("No container values to update");
 		}
 		updatedContainerState.flush();
 		return ContainerState.findContainerState(updatedContainerState.getId());
@@ -164,7 +174,7 @@ public ContainerState updateContainerState(ContainerState containerState) {
 	public Collection<ContainerState> updateContainerStates(
 			Collection<ContainerState> containerStates) {
 		Collection<ContainerState> updatedStates = new ArrayList<ContainerState>();
-		for (ContainerState containerState : containerStates){
+		for (ContainerState containerState : containerStates) {
 			ContainerState updatedContainerState = updateContainerState(containerState);
 			updatedStates.add(updatedContainerState);
 		}
@@ -174,25 +184,31 @@ public Collection<ContainerState> updateContainerStates(
 	@Transactional
 	@Override
 	public ContainerState saveContainerState(ContainerState lsState) {
-		if (logger.isDebugEnabled()) logger.debug("incoming meta container: " + lsState.toJson() + "\n");
+		if (logger.isDebugEnabled())
+			logger.debug("incoming meta container: " + lsState.toJson() + "\n");
 		ContainerState newLsState = new ContainerState(lsState);
 		newLsState.setContainer(Container.findContainer(lsState.getContainer().getId()));
-		if (logger.isDebugEnabled()) logger.debug("here is the newLsState before save: " + newLsState.toJson());
+		if (logger.isDebugEnabled())
+			logger.debug("here is the newLsState before save: " + newLsState.toJson());
 		newLsState.persist();
-		if (logger.isDebugEnabled()) logger.debug("persisted the newLsState: " + newLsState.toJson());
-		if (lsState.getLsValues() != null){
+		if (logger.isDebugEnabled())
+			logger.debug("persisted the newLsState: " + newLsState.toJson());
+		if (lsState.getLsValues() != null) {
 			Set<ContainerValue> lsValues = new HashSet<ContainerValue>();
-			for(ContainerValue containerValue : lsState.getLsValues()){
-				if (logger.isDebugEnabled()) logger.debug("containerValue: " + containerValue.toJson());
+			for (ContainerValue containerValue : lsState.getLsValues()) {
+				if (logger.isDebugEnabled())
+					logger.debug("containerValue: " + containerValue.toJson());
 				ContainerValue newContainerValue = ContainerValue.create(containerValue);
 				newContainerValue.setLsState(newLsState);
 				newContainerValue.persist();
 				lsValues.add(newContainerValue);
-				if (logger.isDebugEnabled()) logger.debug("persisted the containerValue: " + newContainerValue.toJson());
+				if (logger.isDebugEnabled())
+					logger.debug("persisted the containerValue: " + newContainerValue.toJson());
 			}
 			newLsState.setLsValues(lsValues);
 		} else {
-			if (logger.isDebugEnabled()) logger.debug("No container values to save");
+			if (logger.isDebugEnabled())
+				logger.debug("No container values to save");
 		}
 		newLsState.flush();
 		return ContainerState.findContainerState(newLsState.getId());
@@ -203,22 +219,22 @@ public ContainerState saveContainerState(ContainerState lsState) {
 	public Collection<ContainerState> saveContainerStates(
 			Collection<ContainerState> containerStates) {
 		Collection<ContainerState> savedContainerStates = new ArrayList<ContainerState>();
-		for (ContainerState containerState: containerStates) {
+		for (ContainerState containerState : containerStates) {
 			ContainerState savedContainerState = saveContainerState(containerState);
 			savedContainerStates.add(savedContainerState);
 		}
 		return savedContainerStates;
 	}
-	
+
 	@Override
 	public ContainerState getContainerState(String idOrCodeName,
 			String stateType, String stateKind) {
 		ContainerState state = null;
-		try{
+		try {
 			Collection<ContainerState> states = getContainerStates(idOrCodeName, stateType, stateKind);
 			state = states.iterator().next();
-		}catch (Exception e){
-			logger.error("Caught error "+e.toString()+" trying to find a state.",e);
+		} catch (Exception e) {
+			logger.error("Caught error " + e.toString() + " trying to find a state.", e);
 			state = null;
 		}
 		return state;
@@ -228,37 +244,43 @@ public ContainerState getContainerState(String idOrCodeName,
 	public Collection<ContainerStatePathDTO> getContainerStates(
 			Collection<GenericStatePathRequest> genericRequests) {
 		Collection<ContainerStatePathDTO> results = new ArrayList<ContainerStatePathDTO>();
-		for (GenericStatePathRequest request : genericRequests){
+		for (GenericStatePathRequest request : genericRequests) {
 			ContainerStatePathDTO result = new ContainerStatePathDTO();
 			result.setIdOrCodeName(request.getIdOrCodeName());
 			result.setStateType(request.getStateType());
 			result.setStateKind(request.getStateKind());
-			result.setStates(getContainerStates(request.getIdOrCodeName(), request.getStateType(), request.getStateKind()));
+			result.setStates(
+					getContainerStates(request.getIdOrCodeName(), request.getStateType(), request.getStateKind()));
 			results.add(result);
 		}
 		return results;
 	}
-	
-	private Collection<ContainerState> getContainerStates(String idOrCodeName, String stateType, String stateKind){
-		if (SimpleUtil.isNumeric(idOrCodeName)){
+
+	private Collection<ContainerState> getContainerStates(String idOrCodeName, String stateType, String stateKind) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			Long id = Long.valueOf(idOrCodeName);
-			return ContainerState.findContainerStatesByContainerIDAndStateTypeKind(id, stateType, stateKind).getResultList();
-		}else{
-			return ContainerState.findContainerStatesByContainerCodeNameAndStateTypeKind(idOrCodeName, stateType, stateKind).getResultList();
+			return ContainerState.findContainerStatesByContainerIDAndStateTypeKind(id, stateType, stateKind)
+					.getResultList();
+		} else {
+			return ContainerState
+					.findContainerStatesByContainerCodeNameAndStateTypeKind(idOrCodeName, stateType, stateKind)
+					.getResultList();
 		}
 	}
-	
+
 	@Override
-	public List<ContainerState> getContainerStatesByContainerIdAndStateTypeKind(Long containerId, String stateType, 
-			String stateKind) {	
-		
-		List<ContainerState> containerStates = ContainerState.findContainerStatesByContainerIDAndStateTypeKind(containerId, stateType, stateKind).getResultList();
+	public List<ContainerState> getContainerStatesByContainerIdAndStateTypeKind(Long containerId, String stateType,
+			String stateKind) {
+
+		List<ContainerState> containerStates = ContainerState
+				.findContainerStatesByContainerIDAndStateTypeKind(containerId, stateType, stateKind).getResultList();
 
 		return containerStates;
 	}
-	
+
 	@Override
-	public ContainerState createContainerStateByContainerIdAndStateTypeKind(Long containerId, String stateType, String stateKind) {
+	public ContainerState createContainerStateByContainerIdAndStateTypeKind(Long containerId, String stateType,
+			String stateKind) {
 		ContainerState containerState = new ContainerState();
 		Container container = Container.findContainer(containerId);
 		containerState.setContainer(container);
@@ -268,9 +290,10 @@ public ContainerState createContainerStateByContainerIdAndStateTypeKind(Long con
 		containerState.persist();
 		return containerState;
 	}
-	
+
 	@Override
-	public ContainerState createContainerStateByContainerIdAndStateTypeKindAndRecordedBy(Long containerId, String stateType, String stateKind, String recordedBy) {
+	public ContainerState createContainerStateByContainerIdAndStateTypeKindAndRecordedBy(Long containerId,
+			String stateType, String stateKind, String recordedBy) {
 		ContainerState containerState = new ContainerState();
 		Container container = Container.findContainer(containerId);
 		containerState.setContainer(container);
@@ -284,107 +307,116 @@ public ContainerState createContainerStateByContainerIdAndStateTypeKindAndRecord
 	@Override
 	public Collection<ContainerState> getContainerStatesByContainerValue(
 			ContainerValueRequestDTO requestDTO, Boolean like, Boolean rightLike) throws Exception {
-		if (requestDTO.getContainerType() == null) throw new Exception("Container type must be specified");
-		if (requestDTO.getContainerKind() == null) throw new Exception("Container kind must be specified");
-		if (requestDTO.getStateType() == null) throw new Exception("State type must be specified");
-		if (requestDTO.getStateKind() == null) throw new Exception("State kind must be specified");
-		if (requestDTO.getValueType() == null) throw new Exception("Value type must be specified");
-		if (requestDTO.getValueKind() == null) throw new Exception("Value kind must be specified");
-		if (requestDTO.getValue() == null) throw new Exception("Value must be specified");
-		
-		if (like != null && like){
+		if (requestDTO.getContainerType() == null)
+			throw new Exception("Container type must be specified");
+		if (requestDTO.getContainerKind() == null)
+			throw new Exception("Container kind must be specified");
+		if (requestDTO.getStateType() == null)
+			throw new Exception("State type must be specified");
+		if (requestDTO.getStateKind() == null)
+			throw new Exception("State kind must be specified");
+		if (requestDTO.getValueType() == null)
+			throw new Exception("Value type must be specified");
+		if (requestDTO.getValueKind() == null)
+			throw new Exception("Value kind must be specified");
+		if (requestDTO.getValue() == null)
+			throw new Exception("Value must be specified");
+
+		if (like != null && like) {
 			String fullQuery = "SELECT DISTINCT containerState FROM ContainerState containerState "
 					+ "JOIN FETCH containerState.container container "
 					+ "JOIN FETCH containerState.lsValues containerValue "
 					+ "LEFT JOIN FETCH container.lsLabels containerLabel "
 					+ "LEFT JOIN FETCH containerState.lsValues otherContainerValues "
-					+ "WHERE container.lsType = " + "'"+requestDTO.getContainerType()+"'"+" "
-					+ "AND container.lsKind = " + "'"+requestDTO.getContainerKind()+"'"+" "
+					+ "WHERE container.lsType = " + "'" + requestDTO.getContainerType() + "'" + " "
+					+ "AND container.lsKind = " + "'" + requestDTO.getContainerKind() + "'" + " "
 					+ "AND container.ignored <> true "
-					+ "AND containerState.lsType = " + "'"+requestDTO.getStateType()+"'"+" "
-					+ "AND containerState.lsKind = " + "'"+requestDTO.getStateKind()+"'"+" "
+					+ "AND containerState.lsType = " + "'" + requestDTO.getStateType() + "'" + " "
+					+ "AND containerState.lsKind = " + "'" + requestDTO.getStateKind() + "'" + " "
 					+ "AND containerState.ignored <> true "
-					+ "AND containerValue.lsType = " + "'"+requestDTO.getValueType()+"'"+" "
-					+ "AND containerValue.lsKind = " + "'"+requestDTO.getValueKind()+"'"+" "
+					+ "AND containerValue.lsType = " + "'" + requestDTO.getValueType() + "'" + " "
+					+ "AND containerValue.lsKind = " + "'" + requestDTO.getValueKind() + "'" + " "
 					+ "AND containerValue.ignored <> true "
 					+ "AND otherContainerValues.id != containerValue.id ";
-			if (requestDTO.getValueType().equals("stringValue")){
-				if (like != null && like){
-					if (rightLike != null && rightLike){
-						fullQuery += "AND containerValue.stringValue LIKE " + "'"+requestDTO.getValue()+"%'";
-					}else{
-						fullQuery += "AND containerValue.stringValue LIKE " + "'%"+requestDTO.getValue()+"%'";
+			if (requestDTO.getValueType().equals("stringValue")) {
+				if (like != null && like) {
+					if (rightLike != null && rightLike) {
+						fullQuery += "AND containerValue.stringValue LIKE " + "'" + requestDTO.getValue() + "%'";
+					} else {
+						fullQuery += "AND containerValue.stringValue LIKE " + "'%" + requestDTO.getValue() + "%'";
 					}
-				}else{
-					fullQuery += "AND containerValue.stringValue = " + "'"+requestDTO.getValue()+"'";
+				} else {
+					fullQuery += "AND containerValue.stringValue = " + "'" + requestDTO.getValue() + "'";
 				}
-			}else if (requestDTO.getValueType().equals("codeValue")){
-				if (like != null && like){
-					if (rightLike != null && rightLike){
-						fullQuery += "AND containerValue.codeValue LIKE " + "'"+requestDTO.getValue()+"%'";
-					}else{
-						fullQuery += "AND containerValue.codeValue LIKE " + "'%"+requestDTO.getValue()+"%'";
+			} else if (requestDTO.getValueType().equals("codeValue")) {
+				if (like != null && like) {
+					if (rightLike != null && rightLike) {
+						fullQuery += "AND containerValue.codeValue LIKE " + "'" + requestDTO.getValue() + "%'";
+					} else {
+						fullQuery += "AND containerValue.codeValue LIKE " + "'%" + requestDTO.getValue() + "%'";
 					}
-				}else{
-					fullQuery += "AND containerValue.codeValue = " + "'"+requestDTO.getValue()+"'";
+				} else {
+					fullQuery += "AND containerValue.codeValue = " + "'" + requestDTO.getValue() + "'";
 				}
 			}
-			if (logger.isDebugEnabled()) logger.debug(fullQuery);
+			if (logger.isDebugEnabled())
+				logger.debug(fullQuery);
 			EntityManager em = Container.entityManager();
 			TypedQuery<ContainerState> q = em.createQuery(fullQuery, ContainerState.class);
-			
+
 			return q.getResultList();
-		}else{
+		} else {
 			EntityManager em = ContainerState.entityManager();
 			CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
 			CriteriaQuery<ContainerState> criteria = criteriaBuilder.createQuery(ContainerState.class);
 			Root<ContainerState> state = criteria.from(ContainerState.class);
 			List<Predicate> predicateList = new ArrayList<Predicate>();
 			criteria.distinct(true);
-			
+
 			Join<ContainerState, Container> container = state.join("container");
 			Join<ContainerState, ContainerValue> value = state.join("lsValues");
-			
+
 			Predicate stateNotIgn = criteriaBuilder.isFalse(state.<Boolean>get("ignored"));
 			Predicate valueNotIgn = criteriaBuilder.isFalse(value.<Boolean>get("ignored"));
 			predicateList.add(stateNotIgn);
 			predicateList.add(valueNotIgn);
-			
-			if (requestDTO.getStateType() != null){
-				Predicate stateType = criteriaBuilder.equal(state.<String>get("lsType"),requestDTO.getStateType());
+
+			if (requestDTO.getStateType() != null) {
+				Predicate stateType = criteriaBuilder.equal(state.<String>get("lsType"), requestDTO.getStateType());
 				predicateList.add(stateType);
 			}
-			if (requestDTO.getStateKind() != null){
-				Predicate stateKind = criteriaBuilder.equal(state.<String>get("lsKind"),requestDTO.getStateKind());
+			if (requestDTO.getStateKind() != null) {
+				Predicate stateKind = criteriaBuilder.equal(state.<String>get("lsKind"), requestDTO.getStateKind());
 				predicateList.add(stateKind);
 			}
-			if (requestDTO.getValueType() != null){
-				Predicate valueType = criteriaBuilder.equal(value.<String>get("lsType"),requestDTO.getValueType());
+			if (requestDTO.getValueType() != null) {
+				Predicate valueType = criteriaBuilder.equal(value.<String>get("lsType"), requestDTO.getValueType());
 				predicateList.add(valueType);
 			}
-			if (requestDTO.getValueKind() != null){
-				Predicate valueKind = criteriaBuilder.equal(value.<String>get("lsKind"),requestDTO.getValueKind());
+			if (requestDTO.getValueKind() != null) {
+				Predicate valueKind = criteriaBuilder.equal(value.<String>get("lsKind"), requestDTO.getValueKind());
 				predicateList.add(valueKind);
 			}
-			if (requestDTO.getValue() != null){
-				if (requestDTO.getValueType() == null){
+			if (requestDTO.getValue() != null) {
+				if (requestDTO.getValueType() == null) {
 					logger.error("valueType must be specified if value is specified!");
 					throw new Exception("valueType must be specified if value is specified!");
-				}else if (requestDTO.getValueType().equalsIgnoreCase("dateValue")){
+				} else if (requestDTO.getValueType().equalsIgnoreCase("dateValue")) {
 					String postgresTimeUnit = "day";
-					Expression<Date> dateTruncExpr = criteriaBuilder.function("date_trunc", Date.class, criteriaBuilder.literal(postgresTimeUnit), value.<Date>get("dateValue"));
+					Expression<Date> dateTruncExpr = criteriaBuilder.function("date_trunc", Date.class,
+							criteriaBuilder.literal(postgresTimeUnit), value.<Date>get("dateValue"));
 					Calendar cal = Calendar.getInstance(); // locale-specific
 					boolean parsedTime = false;
-					if (SimpleUtil.isNumeric(requestDTO.getValue())){
+					if (SimpleUtil.isNumeric(requestDTO.getValue())) {
 						cal.setTimeInMillis(Long.valueOf(requestDTO.getValue()));
 						parsedTime = true;
-					}else{
-						try{
+					} else {
+						try {
 							SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH);
 							cal.setTime(sdf.parse(requestDTO.getValue()));
 							parsedTime = true;
-						}catch (Exception e){
-							logger.warn("Failed to parse date in LsThing generic query for value",e);
+						} catch (Exception e) {
+							logger.warn("Failed to parse date in LsThing generic query for value", e);
 						}
 					}
 					cal.set(Calendar.HOUR_OF_DAY, 0);
@@ -394,25 +426,30 @@ public Collection<ContainerState> getContainerStatesByContainerValue(
 					long time = cal.getTimeInMillis();
 					Date queryDate = new Date(time);
 					Predicate valueLike = criteriaBuilder.equal(dateTruncExpr, queryDate);
-					if (parsedTime) predicateList.add(valueLike);
-				}else{
-					//only works with string value types: stringValue, codeValue, fileValue, clobValue
-					//because of big if/else we know we are in "equals" mode
-					Predicate valueEquals = criteriaBuilder.equal(value.<String>get(requestDTO.getValueType()), requestDTO.getValue());
+					if (parsedTime)
+						predicateList.add(valueLike);
+				} else {
+					// only works with string value types: stringValue, codeValue, fileValue,
+					// clobValue
+					// because of big if/else we know we are in "equals" mode
+					Predicate valueEquals = criteriaBuilder.equal(value.<String>get(requestDTO.getValueType()),
+							requestDTO.getValue());
 					predicateList.add(valueEquals);
 				}
 			}
-			
-			if (requestDTO.getContainerType() != null){
-				Predicate thingType = criteriaBuilder.equal(container.<String>get("lsType"), requestDTO.getContainerType());
+
+			if (requestDTO.getContainerType() != null) {
+				Predicate thingType = criteriaBuilder.equal(container.<String>get("lsType"),
+						requestDTO.getContainerType());
 				predicateList.add(thingType);
 			}
-			if (requestDTO.getContainerKind() != null){
-				Predicate thingKind = criteriaBuilder.equal(container.<String>get("lsKind"), requestDTO.getContainerKind());
+			if (requestDTO.getContainerKind() != null) {
+				Predicate thingKind = criteriaBuilder.equal(container.<String>get("lsKind"),
+						requestDTO.getContainerKind());
 				predicateList.add(thingKind);
 			}
-			
-			//gather predicates with AND
+
+			// gather predicates with AND
 			Predicate[] predicates = new Predicate[0];
 			predicates = predicateList.toArray(predicates);
 			criteria.where(criteriaBuilder.and(predicates));
@@ -422,6 +459,4 @@ public Collection<ContainerState> getContainerStatesByContainerValue(
 		}
 	}
 
-
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ContainerValueServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ContainerValueServiceImpl.java
index df4589123..bb3697a8d 100644
--- a/src/main/java/com/labsynch/labseer/service/ContainerValueServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ContainerValueServiceImpl.java
@@ -29,7 +29,7 @@ public class ContainerValueServiceImpl implements ContainerValueService {
 
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
-	
+
 	@Autowired
 	private ContainerStateService containerStateService;
 
@@ -43,7 +43,7 @@ public ContainerValue updateContainerValue(ContainerValue containerValue) {
 	@Override
 	public Collection<ContainerValue> updateContainerValues(
 			Collection<ContainerValue> containerValues) {
-		for (ContainerValue containerValue : containerValues){
+		for (ContainerValue containerValue : containerValues) {
 			containerValue = updateContainerValue(containerValue);
 		}
 		return null;
@@ -51,7 +51,7 @@ public Collection<ContainerValue> updateContainerValues(
 
 	@Override
 	public ContainerValue saveContainerValue(ContainerValue containerValue) {
-		containerValue.setLsState(ContainerState.findContainerState(containerValue.getLsState().getId()));		
+		containerValue.setLsState(ContainerState.findContainerState(containerValue.getLsState().getId()));
 		containerValue.persist();
 		return containerValue;
 	}
@@ -60,22 +60,23 @@ public ContainerValue saveContainerValue(ContainerValue containerValue) {
 	public Collection<ContainerValue> saveContainerValues(
 			Collection<ContainerValue> containerValues) {
 		Collection<ContainerValue> savedContainerValues = new ArrayList<ContainerValue>();
-		for (ContainerValue containerValue: containerValues) {
+		for (ContainerValue containerValue : containerValues) {
 			ContainerValue savedContainerValue = saveContainerValue(containerValue);
 			savedContainerValues.add(savedContainerValue);
 		}
 		return savedContainerValues;
 	}
-	
+
 	@Override
 	public ContainerValue getContainerValue(String idOrCodeName,
 			String stateType, String stateKind, String valueType, String valueKind) {
 		ContainerValue value = null;
-		try{
-			Collection<ContainerValue> values = getContainerValues(idOrCodeName, stateType, stateKind, valueType, valueKind);
+		try {
+			Collection<ContainerValue> values = getContainerValues(idOrCodeName, stateType, stateKind, valueType,
+					valueKind);
 			value = values.iterator().next();
-		}catch (Exception e){
-			logger.error("Caught error "+e.toString()+" trying to find a state.",e);
+		} catch (Exception e) {
+			logger.error("Caught error " + e.toString() + " trying to find a state.", e);
 			value = null;
 		}
 		return value;
@@ -85,81 +86,96 @@ public ContainerValue getContainerValue(String idOrCodeName,
 	public Collection<ContainerValuePathDTO> getContainerValues(
 			Collection<GenericValuePathRequest> genericRequests) {
 		Collection<ContainerValuePathDTO> results = new ArrayList<ContainerValuePathDTO>();
-		for (GenericValuePathRequest request : genericRequests){
+		for (GenericValuePathRequest request : genericRequests) {
 			ContainerValuePathDTO result = new ContainerValuePathDTO();
 			result.setIdOrCodeName(request.getIdOrCodeName());
 			result.setValueType(request.getValueType());
 			result.setValueKind(request.getValueKind());
-			result.setValues(getContainerValues(request.getIdOrCodeName(), request.getStateType(), request.getStateKind(), request.getValueType(), request.getValueKind()));
+			result.setValues(getContainerValues(request.getIdOrCodeName(), request.getStateType(),
+					request.getStateKind(), request.getValueType(), request.getValueKind()));
 			results.add(result);
 		}
 		return results;
 	}
-	
-	private Collection<ContainerValue> getContainerValues(String idOrCodeName, String stateType, String stateKind, String valueType, String valueKind){
-		if (SimpleUtil.isNumeric(idOrCodeName)){
+
+	private Collection<ContainerValue> getContainerValues(String idOrCodeName, String stateType, String stateKind,
+			String valueType, String valueKind) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			Long id = Long.valueOf(idOrCodeName);
-			return ContainerValue.findContainerValuesByContainerIDAndStateTypeKindAndValueTypeKind(id, stateType, stateKind, valueType, valueKind).getResultList();
-		}else{
-			return ContainerValue.findContainerValuesByContainerCodeNameAndStateTypeKindAndValueTypeKind(idOrCodeName, stateType, stateKind, valueType, valueKind).getResultList();
+			return ContainerValue.findContainerValuesByContainerIDAndStateTypeKindAndValueTypeKind(id, stateType,
+					stateKind, valueType, valueKind).getResultList();
+		} else {
+			return ContainerValue.findContainerValuesByContainerCodeNameAndStateTypeKindAndValueTypeKind(idOrCodeName,
+					stateType, stateKind, valueType, valueKind).getResultList();
 		}
 	}
-	
+
 	@Override
-	public ContainerValue updateContainerValue(String idOrCodeName, String stateType, String stateKind, String valueType, String valueKind, String value) {
-		//fetch the entity
+	public ContainerValue updateContainerValue(String idOrCodeName, String stateType, String stateKind,
+			String valueType, String valueKind, String value) {
+		// fetch the entity
 		Container container;
-		if(SimpleUtil.isNumeric(idOrCodeName)) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			container = Container.findContainer(Long.valueOf(idOrCodeName));
-		} else {		
+		} else {
 			try {
 				container = Container.findContainerByCodeNameEquals(idOrCodeName);
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				container = null;
 			}
 		}
-		//fetch the state, and if it doesn't exist, create it
+		// fetch the state, and if it doesn't exist, create it
 		List<ContainerState> containerStates;
-		if(container != null) {
+		if (container != null) {
 			Long containerId = container.getId();
-			containerStates = containerStateService.getContainerStatesByContainerIdAndStateTypeKind(containerId, stateType, stateKind);
+			containerStates = containerStateService.getContainerStatesByContainerIdAndStateTypeKind(containerId,
+					stateType, stateKind);
 			if (containerStates.isEmpty()) {
-				//create the state
-				containerStates.add(containerStateService.createContainerStateByContainerIdAndStateTypeKind(containerId, stateType, stateKind));
+				// create the state
+				containerStates.add(containerStateService.createContainerStateByContainerIdAndStateTypeKind(containerId,
+						stateType, stateKind));
 				logger.debug("Created the container state: " + containerStates.get(0).toJson());
 			}
 		}
-		//fetch the value, update it if it exists, and if it doesn't exist, create it
+		// fetch the value, update it if it exists, and if it doesn't exist, create it
 		List<ContainerValue> containerValues;
 		ContainerValue containerValue = null;
-		if(container != null) {
+		if (container != null) {
 			Long containerId = container.getId();
-			containerValues = getContainerValuesByContainerIdAndStateTypeKindAndValueTypeKind(containerId, stateType, stateKind, valueType, valueKind);
-			if (containerValues.size() > 1){
+			containerValues = getContainerValuesByContainerIdAndStateTypeKindAndValueTypeKind(containerId, stateType,
+					stateKind, valueType, valueKind);
+			if (containerValues.size() > 1) {
 				logger.error("Error: multiple container statuses found");
-			}
-			else if (containerValues.size() == 1){
+			} else if (containerValues.size() == 1) {
 				containerValue = containerValues.get(0);
-				if (valueType.equals("stringValue")) containerValue.setStringValue(value);
-				if (valueType.equals("fileValue")) containerValue.setFileValue(value);
-				if (valueType.equals("clobValue")) containerValue.setClobValue(value);
-				if (valueType.equals("blobValue")) containerValue.setBlobValue(value.getBytes(Charset.forName("UTF-8")));
-				if (valueType.equals("numericValue")) containerValue.setNumericValue(new BigDecimal(value));
-				if (valueType.equals("dateValue")) containerValue.setDateValue(new Date(Long.parseLong(value)));
-				if (valueType.equals("codeValue")) containerValue.setCodeValue(value);
-				if (valueType.equals("urlValue")) containerValue.setUrlValue(value);
+				if (valueType.equals("stringValue"))
+					containerValue.setStringValue(value);
+				if (valueType.equals("fileValue"))
+					containerValue.setFileValue(value);
+				if (valueType.equals("clobValue"))
+					containerValue.setClobValue(value);
+				if (valueType.equals("blobValue"))
+					containerValue.setBlobValue(value.getBytes(Charset.forName("UTF-8")));
+				if (valueType.equals("numericValue"))
+					containerValue.setNumericValue(new BigDecimal(value));
+				if (valueType.equals("dateValue"))
+					containerValue.setDateValue(new Date(Long.parseLong(value)));
+				if (valueType.equals("codeValue"))
+					containerValue.setCodeValue(value);
+				if (valueType.equals("urlValue"))
+					containerValue.setUrlValue(value);
 				containerValue.merge();
 				logger.debug("Updated the container value: " + containerValue.toJson());
-			}
-			else if (containerValues.isEmpty()) {
-				containerValue = createContainerValueByContainerIdAndStateTypeKindAndValueTypeKind(containerId, stateType, stateKind, valueType, valueKind, value);
+			} else if (containerValues.isEmpty()) {
+				containerValue = createContainerValueByContainerIdAndStateTypeKindAndValueTypeKind(containerId,
+						stateType, stateKind, valueType, valueKind, value);
 				logger.debug("Created the container value: " + containerValue.toJson());
 			}
 		}
 		return containerValue;
 
 	}
-	
+
 	@Override
 	public ContainerValue createContainerValueFromLsStateAndTypeAndKindAndValue(
 			ContainerState containerState, String lsType, String lsKind, String value, String recordedBy) {
@@ -167,50 +183,68 @@ public ContainerValue createContainerValueFromLsStateAndTypeAndKindAndValue(
 		containerValue.setLsState(containerState);
 		containerValue.setLsType(lsType);
 		containerValue.setLsKind(lsKind);
-		if (lsType.equals("stringValue")) containerValue.setStringValue(value);
-		if (lsType.equals("fileValue")) containerValue.setFileValue(value);
-		if (lsType.equals("clobValue")) containerValue.setClobValue(value);
-		if (lsType.equals("blobValue")) containerValue.setBlobValue(value.getBytes(Charset.forName("UTF-8")));
-		if (lsType.equals("numericValue")) containerValue.setNumericValue(new BigDecimal(value));
-		if (lsType.equals("dateValue")) containerValue.setDateValue(new Date(Long.parseLong(value)));
-		if (lsType.equals("codeValue")) containerValue.setCodeValue(value);
-		if (lsType.equals("urlValue")) containerValue.setUrlValue(value);
+		if (lsType.equals("stringValue"))
+			containerValue.setStringValue(value);
+		if (lsType.equals("fileValue"))
+			containerValue.setFileValue(value);
+		if (lsType.equals("clobValue"))
+			containerValue.setClobValue(value);
+		if (lsType.equals("blobValue"))
+			containerValue.setBlobValue(value.getBytes(Charset.forName("UTF-8")));
+		if (lsType.equals("numericValue"))
+			containerValue.setNumericValue(new BigDecimal(value));
+		if (lsType.equals("dateValue"))
+			containerValue.setDateValue(new Date(Long.parseLong(value)));
+		if (lsType.equals("codeValue"))
+			containerValue.setCodeValue(value);
+		if (lsType.equals("urlValue"))
+			containerValue.setUrlValue(value);
 		containerValue.setRecordedBy(recordedBy);
 		containerValue.persist();
 		return containerValue;
 	}
-	
+
 	@Override
 	public List<ContainerValue> getContainerValuesByContainerIdAndStateTypeKindAndValueTypeKind(
 			Long containerId, String stateType, String stateKind,
 			String valueType, String valueKind) {
-		
-		List<ContainerValue> containerValues = ContainerValue.findContainerValuesByContainerIDAndStateTypeKindAndValueTypeKind(containerId, stateType,
-				stateKind, valueType, valueKind).getResultList();
-		
+
+		List<ContainerValue> containerValues = ContainerValue
+				.findContainerValuesByContainerIDAndStateTypeKindAndValueTypeKind(containerId, stateType,
+						stateKind, valueType, valueKind)
+				.getResultList();
+
 		return containerValues;
 	}
-	
+
 	private ContainerValue createContainerValueByContainerIdAndStateTypeKindAndValueTypeKind(
 			Long containerId, String stateType, String stateKind,
 			String valueType, String valueKind, String value) {
 		ContainerValue containerValue = new ContainerValue();
-		ContainerState containerState = ContainerState.findContainerStatesByContainerIDAndStateTypeKind(containerId, stateType, stateKind).getSingleResult();
+		ContainerState containerState = ContainerState
+				.findContainerStatesByContainerIDAndStateTypeKind(containerId, stateType, stateKind).getSingleResult();
 		containerValue.setLsState(containerState);
 		containerValue.setLsType(valueType);
 		containerValue.setLsKind(valueKind);
-		if (valueType.equals("stringValue")) containerValue.setStringValue(value);
-		if (valueType.equals("fileValue")) containerValue.setFileValue(value);
-		if (valueType.equals("clobValue")) containerValue.setClobValue(value);
-		if (valueType.equals("blobValue")) containerValue.setBlobValue(value.getBytes(Charset.forName("UTF-8")));
-		if (valueType.equals("numericValue")) containerValue.setNumericValue(new BigDecimal(value));
-		if (valueType.equals("dateValue")) containerValue.setDateValue(new Date(Long.parseLong(value)));
-		if (valueType.equals("codeValue")) containerValue.setCodeValue(value);
-		if (valueType.equals("urlValue")) containerValue.setUrlValue(value);
+		if (valueType.equals("stringValue"))
+			containerValue.setStringValue(value);
+		if (valueType.equals("fileValue"))
+			containerValue.setFileValue(value);
+		if (valueType.equals("clobValue"))
+			containerValue.setClobValue(value);
+		if (valueType.equals("blobValue"))
+			containerValue.setBlobValue(value.getBytes(Charset.forName("UTF-8")));
+		if (valueType.equals("numericValue"))
+			containerValue.setNumericValue(new BigDecimal(value));
+		if (valueType.equals("dateValue"))
+			containerValue.setDateValue(new Date(Long.parseLong(value)));
+		if (valueType.equals("codeValue"))
+			containerValue.setCodeValue(value);
+		if (valueType.equals("urlValue"))
+			containerValue.setUrlValue(value);
 		containerValue.setRecordedBy("default");
 		containerValue.persist();
 		return containerValue;
 	}
 
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/CorpNameService.java b/src/main/java/com/labsynch/labseer/service/CorpNameService.java
index 10d5dc41c..b1ef132d4 100755
--- a/src/main/java/com/labsynch/labseer/service/CorpNameService.java
+++ b/src/main/java/com/labsynch/labseer/service/CorpNameService.java
@@ -8,7 +8,6 @@
 
 public interface CorpNameService {
 
-
 	public String getPreferredNameFromBuid(String aliasList);
 
 	public String getLotNumberFromBuid(String aliasList);
@@ -18,7 +17,7 @@ public interface CorpNameService {
 	public String convertCorpNameNumber(String corpName);
 
 	public String generateSaltFormCorpName(String parentCorpName, Set<IsoSalt> isoSalts);
-	
+
 	public String convertCorpNamePrefix(String corpName);
 
 	public String removeCorpNamePrefix(String corpName);
@@ -48,5 +47,5 @@ public interface CorpNameService {
 	public String generateCorpLicensePlate();
 
 	public CorpNameDTO generateParentNameFromSequence();
-	
+
 }
diff --git a/src/main/java/com/labsynch/labseer/service/CorpNameServiceImpl.java b/src/main/java/com/labsynch/labseer/service/CorpNameServiceImpl.java
index abc8df600..30faf984e 100755
--- a/src/main/java/com/labsynch/labseer/service/CorpNameServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/CorpNameServiceImpl.java
@@ -38,96 +38,95 @@ public class CorpNameServiceImpl implements CorpNameService {
 	public String getPreferredNameFromBuid(String aliasList) {
 		Long buidNumber = 0L;
 		String[] aliases = aliasList.split(",");
-		List<String> preferredIds = new ArrayList<String>(aliases.length);  
-		for (String alias:aliases){
+		List<String> preferredIds = new ArrayList<String>(aliases.length);
+		for (String alias : aliases) {
 			alias = alias.trim();
 			logger.debug("current alias: " + alias);
 			String preferredId = null;
-			if (alias.equalsIgnoreCase("")){
+			if (alias.equalsIgnoreCase("")) {
 				logger.debug("blank entry");
 				preferredId = "";
 			} else {
 				buidNumber = convertToBuidNumber(alias);
 				logger.debug("query buid number: " + buidNumber);
 				List<Lot> lots = Lot.findLotsByBuidNumber(buidNumber).getResultList();
-				if (lots.size() == 1){
+				if (lots.size() == 1) {
 					logger.debug(lots.get(0).getCorpName());
 					logger.debug(Long.toString(lots.get(0).getLotNumber()));
 
-
 					preferredId = lots.get(0).getCorpName();
 				} else if (lots.size() > 1) {
-					logger.error("multiple lots with the same BUID" );
-					preferredId = "";					
-				}else {
-					logger.debug("the lot is null" );
+					logger.error("multiple lots with the same BUID");
+					preferredId = "";
+				} else {
+					logger.debug("the lot is null");
 					preferredId = "";
-				}				
+				}
 			}
 			preferredIds.add(preferredId);
 		}
 		String outputString = null;
 		boolean firstPass = true;
 		int counter = 0;
-		for (String id : preferredIds){
+		for (String id : preferredIds) {
 			counter++;
 			logger.debug("prerredId: " + id);
-			if (firstPass){
+			if (firstPass) {
 				outputString = id;
 				firstPass = false;
 			} else {
 				outputString = outputString.concat(id);
 			}
-			if (counter < preferredIds.size()){
+			if (counter < preferredIds.size()) {
 				outputString = outputString.concat(",");
 			}
 		}
 		return outputString;
 	}
-	
+
 	@Override
 	@Transactional
 	public String getLotNumberFromBuid(String aliasList) {
 		Long buidNumber = 0L;
 		String[] aliases = aliasList.split(",");
-		List<String> preferredIds = new ArrayList<String>(aliases.length);  
-		for (String alias:aliases){
+		List<String> preferredIds = new ArrayList<String>(aliases.length);
+		for (String alias : aliases) {
 			alias = alias.trim();
 			logger.debug("current alias: " + alias);
 			String preferredId = null;
-			if (alias.equalsIgnoreCase("")){
+			if (alias.equalsIgnoreCase("")) {
 				logger.debug("blank entry");
 				preferredId = "";
 			} else {
 				buidNumber = convertToBuidNumber(alias);
 				logger.debug("query buid number: " + buidNumber);
 				List<Lot> lots = Lot.findLotsByBuidNumber(buidNumber).getResultList();
-				if (lots.size() == 1){
+				if (lots.size() == 1) {
 					logger.debug(Long.toString(lots.get(0).getLotNumber()));
 					preferredId = Long.toString(lots.get(0).getLotNumber());
 				} else if (lots.size() > 1) {
-					logger.error("multiple lots with the same BUID" );
-					preferredId = "";					
-				}else {
-					logger.debug("the lot is null" );
+					logger.error("multiple lots with the same BUID");
 					preferredId = "";
-				}				
+				} else {
+					logger.debug("the lot is null");
+					preferredId = "";
+				}
 			}
 			preferredIds.add(preferredId);
 		}
 		String outputString = null;
 		boolean firstPass = true;
 		int counter = 0;
-		for (String id : preferredIds){
+		for (String id : preferredIds) {
 			counter++;
 			logger.debug("prerredId: " + id);
-			if (firstPass){
+			if (firstPass) {
 				outputString = id;
 				firstPass = false;
 			} else {
 				outputString = outputString.concat(id);
 			}
-			if (counter < preferredIds.size()){
+			if (counter < preferredIds.size()) {
 				outputString = outputString.concat(",");
 			}
 		}
@@ -144,7 +143,9 @@ public String convertCorpNameNumber(String corpName) {
 	@Override
 	public String convertCorpNamePrefix(String corpName) {
 		corpName = corpName.trim();
-		Pattern corpNamePattern = Pattern.compile("^" + propertiesUtilService.getCorpPrefix() + propertiesUtilService.getCorpSeparator(), Pattern.CASE_INSENSITIVE);
+		Pattern corpNamePattern = Pattern.compile(
+				"^" + propertiesUtilService.getCorpPrefix() + propertiesUtilService.getCorpSeparator(),
+				Pattern.CASE_INSENSITIVE);
 		Matcher matcher = corpNamePattern.matcher(corpName);
 		return (matcher.replaceFirst(propertiesUtilService.getCorpPrefix() + propertiesUtilService.getCorpSeparator()));
 	}
@@ -152,7 +153,8 @@ public String convertCorpNamePrefix(String corpName) {
 	@Override
 	public String removeCorpNamePrefix(String corpName) {
 		corpName = corpName.trim().toUpperCase();
-		Pattern corpNamePattern = Pattern.compile("^" + propertiesUtilService.getCorpPrefix() + ".*?" + "([0-9]{1,9}$)", Pattern.CASE_INSENSITIVE);
+		Pattern corpNamePattern = Pattern.compile("^" + propertiesUtilService.getCorpPrefix() + ".*?" + "([0-9]{1,9}$)",
+				Pattern.CASE_INSENSITIVE);
 		Matcher matcher = corpNamePattern.matcher(corpName);
 		return (matcher.replaceFirst("$1"));
 	}
@@ -170,21 +172,24 @@ public Long convertToParentNumber(String corpName) {
 
 	@Override
 	/**
-	 * Takes a string and returns the numeric value of the longest numeric substring, or 0 if the string has no numerals
+	 * Takes a string and returns the numeric value of the longest numeric
+	 * substring, or 0 if the string has no numerals
+	 * 
 	 * @param corpName The corporate ID string
 	 * @return the Long value of the corp number parsed
 	 */
-	public Long parseParentNumber(String corpName){
-		//Returns the numeric value of the largest numeric substring of the input string, or 0 if one cannot be parsed
+	public Long parseParentNumber(String corpName) {
+		// Returns the numeric value of the largest numeric substring of the input
+		// string, or 0 if one cannot be parsed
 		String longestSub = "";
-		for (String sub : corpName.split("[^0-9]")){
-			if (sub.length() > longestSub.length()){
+		for (String sub : corpName.split("[^0-9]")) {
+			if (sub.length() > longestSub.length()) {
 				longestSub = sub;
 			}
 		}
-		if (longestSub.length() > 0){
+		if (longestSub.length() > 0) {
 			return Long.parseLong(longestSub);
-		}else {
+		} else {
 			return 0L;
 		}
 	}
@@ -200,7 +205,9 @@ public boolean checkCorpNumber(String corpName) {
 	@Override
 	public boolean checkParentCorpName(String corpName) {
 		corpName = corpName.trim();
-		Pattern pattern = Pattern.compile("^" + propertiesUtilService.getCorpPrefix() + propertiesUtilService.getCorpSeparator() + "[0-9]{1,9}$", Pattern.CASE_INSENSITIVE);
+		Pattern pattern = Pattern.compile(
+				"^" + propertiesUtilService.getCorpPrefix() + propertiesUtilService.getCorpSeparator() + "[0-9]{1,9}$",
+				Pattern.CASE_INSENSITIVE);
 		Matcher matcher = pattern.matcher(corpName);
 		return matcher.find();
 	}
@@ -208,8 +215,10 @@ public boolean checkParentCorpName(String corpName) {
 	@Override
 	public boolean checkSaltFormCorpName(String corpName) {
 		corpName = corpName.trim();
-		Pattern pattern = Pattern.compile("^" + propertiesUtilService.getCorpPrefix() + propertiesUtilService.getCorpSeparator() + "[0-9]{4,9}" + 
-				propertiesUtilService.getCorpSeparator() + "\\w+$", Pattern.CASE_INSENSITIVE);
+		Pattern pattern = Pattern.compile(
+				"^" + propertiesUtilService.getCorpPrefix() + propertiesUtilService.getCorpSeparator() + "[0-9]{4,9}" +
+						propertiesUtilService.getCorpSeparator() + "\\w+$",
+				Pattern.CASE_INSENSITIVE);
 		Matcher matcher = pattern.matcher(corpName);
 		return matcher.find();
 	}
@@ -218,19 +227,22 @@ public boolean checkSaltFormCorpName(String corpName) {
 	public boolean checkLotCorpName(String corpName) {
 		corpName = corpName.trim();
 		Pattern pattern = null;
-		if (propertiesUtilService.getSaltBeforeLot()){
-			pattern = Pattern.compile("^" + propertiesUtilService.getCorpPrefix() + propertiesUtilService.getCorpSeparator() + "[0-9]{4,9}" + 
-					propertiesUtilService.getCorpSeparator() + "\\w+" + propertiesUtilService.getCorpSeparator() + 
+		if (propertiesUtilService.getSaltBeforeLot()) {
+			pattern = Pattern.compile("^" + propertiesUtilService.getCorpPrefix()
+					+ propertiesUtilService.getCorpSeparator() + "[0-9]{4,9}" +
+					propertiesUtilService.getCorpSeparator() + "\\w+" + propertiesUtilService.getCorpSeparator() +
 					"[0-9]{2}$", Pattern.CASE_INSENSITIVE);
 		} else {
-			if (propertiesUtilService.getAppendSaltCodeToLotName()){
-				pattern = Pattern.compile("^" + propertiesUtilService.getCorpPrefix() + propertiesUtilService.getCorpSeparator() + "[0-9]{1,9}" + 
-						propertiesUtilService.getBatchSeparator() + 
-						"[0-9]{1,3}" + ".*?$", Pattern.CASE_INSENSITIVE);			
+			if (propertiesUtilService.getAppendSaltCodeToLotName()) {
+				pattern = Pattern.compile("^" + propertiesUtilService.getCorpPrefix()
+						+ propertiesUtilService.getCorpSeparator() + "[0-9]{1,9}" +
+						propertiesUtilService.getBatchSeparator() +
+						"[0-9]{1,3}" + ".*?$", Pattern.CASE_INSENSITIVE);
 			} else {
-				pattern = Pattern.compile("^" + propertiesUtilService.getCorpPrefix() + propertiesUtilService.getCorpSeparator() + "[0-9]{1,9}" + 
-						propertiesUtilService.getBatchSeparator() + 
-						"[0-9]{1,3}$", Pattern.CASE_INSENSITIVE);							
+				pattern = Pattern.compile("^" + propertiesUtilService.getCorpPrefix()
+						+ propertiesUtilService.getCorpSeparator() + "[0-9]{1,9}" +
+						propertiesUtilService.getBatchSeparator() +
+						"[0-9]{1,3}$", Pattern.CASE_INSENSITIVE);
 			}
 		}
 
@@ -238,7 +250,7 @@ public boolean checkLotCorpName(String corpName) {
 		return matcher.find();
 	}
 
-	@SuppressWarnings({"unchecked" })
+	@SuppressWarnings({ "unchecked" })
 	@Override
 	public List<Object> generateCustomParentSequence() {
 		String sqlQuery;
@@ -246,22 +258,23 @@ public List<Object> generateCustomParentSequence() {
 		// need to know database dialect
 		EntityManager em = CorpName.entityManager();
 		String databaseType = null;
-			Float databaseVersion = 0.0f;
-			try{
-				org.hibernate.engine.spi.SessionImplementor sessionImp = 
-					     (org.hibernate.engine.spi.SessionImplementor) em.getDelegate();
-				DatabaseMetaData metadata = sessionImp.connection().getMetaData();
-				databaseType = metadata.getDatabaseProductName();
-				databaseVersion = Float.parseFloat(metadata.getDatabaseMajorVersion()+"."+metadata.getDatabaseMinorVersion());
-			}catch (SQLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+		Float databaseVersion = 0.0f;
+		try {
+			org.hibernate.engine.spi.SessionImplementor sessionImp = (org.hibernate.engine.spi.SessionImplementor) em
+					.getDelegate();
+			DatabaseMetaData metadata = sessionImp.connection().getMetaData();
+			databaseType = metadata.getDatabaseProductName();
+			databaseVersion = Float
+					.parseFloat(metadata.getDatabaseMajorVersion() + "." + metadata.getDatabaseMinorVersion());
+		} catch (SQLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
 		}
-		if (databaseType == null || databaseType.equalsIgnoreCase("PostgreSQL")){
+		if (databaseType == null || databaseType.equalsIgnoreCase("PostgreSQL")) {
 			sqlQuery = "SELECT nextval('custom_parent_pkseq') as custom_parent_id";
 		} else if (databaseType.equalsIgnoreCase("oracle")) {
 			sqlQuery = "SELECT custom_parent_pkseq FROM dual";
-		} else if (databaseType.equalsIgnoreCase("sqlserver")){
+		} else if (databaseType.equalsIgnoreCase("sqlserver")) {
 			sqlQuery = "SELECT NEXT VALUE FOR custom_parent_pkseq as custom_parent_id";
 		} else {
 			sqlQuery = "SELECT nextval('custom_parent_pkseq') as custom_parent_id";
@@ -285,7 +298,7 @@ public Long parseCorpNumber(String corpName) {
 		long corpNumber;
 		try {
 			corpNumber = Long.parseLong(corpName);
-		} catch (Exception e){
+		} catch (Exception e) {
 			logger.debug("caught an exception parsing the corp number. set to default 0");
 			corpNumber = 0L;
 		}
@@ -310,21 +323,23 @@ public String generateLicensePlate(int inputNumber) {
 		if (inputNumber >= 1062600) {
 			// changed algorithm to skip '000'
 			inputNumber = inputNumber - 1063;
-			num= inputNumber % 999 + 1;
-			inputNumber=(int)(inputNumber/999);
+			num = inputNumber % 999 + 1;
+			inputNumber = (int) (inputNumber / 999);
 
 		} else {
-			num=inputNumber%1000;
-			inputNumber=(int)(inputNumber/1000);
-      
-		};
-
-		String let="";
-		
-		for (int i=0; i<3; i++) {
-			let = let+(char) (inputNumber%26 + 65);
-			inputNumber = (int)(inputNumber/26);
-		};
+			num = inputNumber % 1000;
+			inputNumber = (int) (inputNumber / 1000);
+
+		}
+		;
+
+		String let = "";
+
+		for (int i = 0; i < 3; i++) {
+			let = let + (char) (inputNumber % 26 + 65);
+			inputNumber = (int) (inputNumber / 26);
+		}
+		;
 		let = new StringBuilder(let).reverse().toString();
 		return String.format("%s%03d", let, num);
 	}
@@ -342,7 +357,8 @@ public CorpNameDTO generateParentNameFromSequence() {
 		int corpDigits = propertiesUtilService.getNumberCorpDigits();
 		String formatCorpDigits = "%0" + corpDigits + "d";
 		Integer corpNumber = Integer.parseInt(String.valueOf(seqList.get(0)));
-		String corpName = propertiesUtilService.getCorpPrefix().concat(propertiesUtilService.getCorpSeparator()).concat(String.format(formatCorpDigits, corpNumber));	    		
+		String corpName = propertiesUtilService.getCorpPrefix().concat(propertiesUtilService.getCorpSeparator())
+				.concat(String.format(formatCorpDigits, corpNumber));
 		CorpNameDTO corpNameDTO = new CorpNameDTO();
 		corpNameDTO.setCorpName(corpName);
 		corpNameDTO.setCorpNumber(corpNumber);
@@ -350,50 +366,53 @@ public CorpNameDTO generateParentNameFromSequence() {
 	}
 
 	@Override
-	public String formatCorpName(Long corpId){
+	public String formatCorpName(Long corpId) {
 
 		String corpName = null;
 
-		//		if (corpParentFormat.equalsIgnoreCase("license_plate_format")){
-
+		// if (corpParentFormat.equalsIgnoreCase("license_plate_format")){
 
-		if (propertiesUtilService.getFancyCorpNumberFormat()){
-			if (corpId < 10000){
-				corpName = propertiesUtilService.getCorpPrefix().concat(propertiesUtilService.getCorpSeparator()).concat(String.format("%04d", corpId));	    		
+		if (propertiesUtilService.getFancyCorpNumberFormat()) {
+			if (corpId < 10000) {
+				corpName = propertiesUtilService.getCorpPrefix().concat(propertiesUtilService.getCorpSeparator())
+						.concat(String.format("%04d", corpId));
 			} else if (corpId < 100000) {
-				corpName = propertiesUtilService.getCorpPrefix().concat(propertiesUtilService.getCorpSeparator()).concat(String.format("%05d", corpId));	    		
+				corpName = propertiesUtilService.getCorpPrefix().concat(propertiesUtilService.getCorpSeparator())
+						.concat(String.format("%05d", corpId));
 			} else if (corpId < 1000000) {
-				corpName = propertiesUtilService.getCorpPrefix().concat(propertiesUtilService.getCorpSeparator()).concat(String.format("%06d", corpId));	    		
+				corpName = propertiesUtilService.getCorpPrefix().concat(propertiesUtilService.getCorpSeparator())
+						.concat(String.format("%06d", corpId));
 			} else if (corpId < 10000000) {
-				corpName = propertiesUtilService.getCorpPrefix().concat(propertiesUtilService.getCorpSeparator()).concat(String.format("%07d", corpId));	    		
-			}			
+				corpName = propertiesUtilService.getCorpPrefix().concat(propertiesUtilService.getCorpSeparator())
+						.concat(String.format("%07d", corpId));
+			}
 		} else {
 			String formatCorpNumber = "%0" + propertiesUtilService.getNumberCorpDigits() + "d";
 			logger.debug("format corpNumber: " + formatCorpNumber);
-			corpName = propertiesUtilService.getCorpPrefix().concat(propertiesUtilService.getCorpSeparator()).concat(String.format(formatCorpNumber, corpId));	    		
+			corpName = propertiesUtilService.getCorpPrefix().concat(propertiesUtilService.getCorpSeparator())
+					.concat(String.format(formatCorpNumber, corpId));
 		}
 
 		return corpName;
 	}
 
 	@Override
-	public String generateSaltFormCorpName(String parentCorpName, Set<IsoSalt> isoSalts){
-
+	public String generateSaltFormCorpName(String parentCorpName, Set<IsoSalt> isoSalts) {
 
 		logger.debug("number of isoSalts found: " + isoSalts.size());
 		List<IsoSalt> isotopes = new ArrayList<IsoSalt>();
 		List<IsoSalt> salts = new ArrayList<IsoSalt>();
-		for (IsoSalt isoSalt : isoSalts){
-			if(isoSalt.getType().equalsIgnoreCase("isotope")){
+		for (IsoSalt isoSalt : isoSalts) {
+			if (isoSalt.getType().equalsIgnoreCase("isotope")) {
 				isotopes.add(isoSalt);
-			} else if(isoSalt.getType().equalsIgnoreCase("salt")){
+			} else if (isoSalt.getType().equalsIgnoreCase("salt")) {
 				salts.add(isoSalt);
 			}
 		}
 		logger.debug("number of isotopes found: " + isotopes.size());
 		ArrayList<String> isotopeAbbrevs = new ArrayList<String>();
-		if (isotopes.size() > 0){
-			for (IsoSalt iso : isotopes){
+		if (isotopes.size() > 0) {
+			for (IsoSalt iso : isotopes) {
 				Isotope isotope = Isotope.findIsotope(iso.getIsotope().getId());
 				String abbrev = isotope.getAbbrev();
 				isotopeAbbrevs.add(abbrev);
@@ -402,31 +421,31 @@ public String generateSaltFormCorpName(String parentCorpName, Set<IsoSalt> isoSa
 		}
 		logger.debug("number of salts found: " + salts.size());
 		ArrayList<String> saltAbbrevs = new ArrayList<String>();
-		if (salts.size() > 0){
-			for (IsoSalt isoSalt : salts){
+		if (salts.size() > 0) {
+			for (IsoSalt isoSalt : salts) {
 				Salt salt = Salt.findSalt(isoSalt.getSalt().getId());
 				String abbrev = salt.getAbbrev();
 				saltAbbrevs.add(abbrev);
-			}	    	
+			}
 			Collections.sort(saltAbbrevs);
-		}		
+		}
 		String saltFormName = "";
-		for (String abbrev : isotopeAbbrevs){
+		for (String abbrev : isotopeAbbrevs) {
 			saltFormName = saltFormName.concat(abbrev);
 		}
-		for (String abbrev : saltAbbrevs){
+		for (String abbrev : saltAbbrevs) {
 			saltFormName = saltFormName.concat(abbrev);
 		}
 
 		logger.debug("saltBeforeLot is: " + propertiesUtilService.getSaltBeforeLot());
 		String corpName = null;
-		if (saltFormName.length() == 0){
+		if (saltFormName.length() == 0) {
 			saltFormName = "0";
-			if (!propertiesUtilService.getSaltBeforeLot()){
+			if (!propertiesUtilService.getSaltBeforeLot()) {
 
 				corpName = parentCorpName;
 				return corpName;
-			} 
+			}
 		}
 
 		corpName = parentCorpName.concat(propertiesUtilService.getCorpSeparator()).concat(saltFormName);
@@ -434,4 +453,3 @@ public String generateSaltFormCorpName(String parentCorpName, Set<IsoSalt> isoSa
 
 	}
 }
-
diff --git a/src/main/java/com/labsynch/labseer/service/CronJobService.java b/src/main/java/com/labsynch/labseer/service/CronJobService.java
index 7470625bb..5370eac0b 100644
--- a/src/main/java/com/labsynch/labseer/service/CronJobService.java
+++ b/src/main/java/com/labsynch/labseer/service/CronJobService.java
@@ -11,7 +11,4 @@ public interface CronJobService {
 
 	CronJob updateCronJob(CronJob cronJob);
 
-
-
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/CronJobServiceImpl.java b/src/main/java/com/labsynch/labseer/service/CronJobServiceImpl.java
index c45e82e06..39478b6b8 100644
--- a/src/main/java/com/labsynch/labseer/service/CronJobServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/CronJobServiceImpl.java
@@ -20,21 +20,21 @@ public class CronJobServiceImpl implements CronJobService {
 
 	private static final Logger logger = LoggerFactory.getLogger(CronJobServiceImpl.class);
 
-
 	@Override
 	public CronJob saveCronJob(CronJob cronJob) {
 		logger.debug("here is the incoming cron job: " + cronJob.toJson());
-		
-		if (cronJob.getCodeName() == null){
+
+		if (cronJob.getCodeName() == null) {
 			String thingTypeAndKind = "document_cronJob";
 			String labelTypeAndKind = "id_codeName";
 			Long numberOfLabels = 1L;
-			List<AutoLabelDTO> labels = autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels );
+			List<AutoLabelDTO> labels = autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind,
+					numberOfLabels);
 			cronJob.setCodeName(labels.get(0).getAutoLabel());
 		}
-		
+
 		cronJob.persist();
-		
+
 		return cronJob;
 	}
 
@@ -42,7 +42,7 @@ public CronJob saveCronJob(CronJob cronJob) {
 	public CronJob updateCronJob(CronJob cronJob) {
 		logger.debug("Here is the incoming cron job: " + cronJob.toJson());
 		CronJob updatedCronJob = CronJob.update(cronJob);
-        logger.debug("Updated cron job: "+updatedCronJob.toJson());
+		logger.debug("Updated cron job: " + updatedCronJob.toJson());
 		return updatedCronJob;
 	}
 
diff --git a/src/main/java/com/labsynch/labseer/service/DataDictionaryService.java b/src/main/java/com/labsynch/labseer/service/DataDictionaryService.java
index d14bb99c3..18fe3b84a 100644
--- a/src/main/java/com/labsynch/labseer/service/DataDictionaryService.java
+++ b/src/main/java/com/labsynch/labseer/service/DataDictionaryService.java
@@ -10,12 +10,11 @@
 
 @Service
 public interface DataDictionaryService {
-	
-	
+
 	public DDictValue saveDataDictionaryValue(DDictValue dDict, Boolean createTypeAndKind);
 
 	public List<CodeTableDTO> getDataDictionaryCodeTableListByTypeKind(String lsType, String lsKind);
-	
+
 	public List<CodeTableDTO> getDataDictionaryCodeTableListByType(String lsType);
 
 	public String getCsvList(List<DDictValue> dDictResults);
@@ -40,7 +39,4 @@ List<CodeTableDTO> getOrCreateCodeTableArray(List<CodeTableDTO> codeTables,
 	CodeTableDTO getOrCreateCodeTable(CodeTableDTO codeTable,
 			Boolean createTypeKind);
 
-
-
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/DataDictionaryServiceImpl.java b/src/main/java/com/labsynch/labseer/service/DataDictionaryServiceImpl.java
index f3e4c3098..b86ce59c0 100644
--- a/src/main/java/com/labsynch/labseer/service/DataDictionaryServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/DataDictionaryServiceImpl.java
@@ -32,46 +32,46 @@ public class DataDictionaryServiceImpl implements DataDictionaryService {
 
 	private static final Logger logger = LoggerFactory.getLogger(DataDictionaryServiceImpl.class);
 
-
 	@Override
 	public DDictValue saveDataDictionaryValue(DDictValue dDict, Boolean createTypeAndKind) {
 		logger.debug("here is the incoming ddict value: " + dDict.toJson());
-		List<DDictValue> dDictVals = DDictValue.findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals(dDict.getLsType(), dDict.getLsKind(), dDict.getShortName()).getResultList();
-		DDictValue dDictVal ;
+		List<DDictValue> dDictVals = DDictValue.findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals(
+				dDict.getLsType(), dDict.getLsKind(), dDict.getShortName()).getResultList();
+		DDictValue dDictVal;
 		logger.debug("found the dDictVals size = " + dDictVals.size());
 		logger.debug("boolean flag = " + createTypeAndKind);
-		if (dDictVals.size() == 0){
-			if (createTypeAndKind){
+		if (dDictVals.size() == 0) {
+			if (createTypeAndKind) {
 				logger.info("attempting to create type and kind");
 				getOrCreateDDictType(dDict.getLsType());
 				getOrCreateDDictKind(dDict.getLsType(), dDict.getLsKind());
 			}
 			dDictVal = new DDictValue(dDict);
 			dDictVal.setCodeName(autoLabelService.getDataDictionaryCodeName());
-			dDictVal.persist();						
-
-//			if (DDictValue.validate(dDict)){
-//				dDictVal.persist();						
-//			} else {
-//				logger.error("ERROR: invalid dDictVal." + dDictVal.toJson());
-//				dDictVal = null;
-//			}
-		} else if (dDictVals.size() == 1){
-			dDictVal = dDictVals.get(0); 
+			dDictVal.persist();
+
+			// if (DDictValue.validate(dDict)){
+			// dDictVal.persist();
+			// } else {
+			// logger.error("ERROR: invalid dDictVal." + dDictVal.toJson());
+			// dDictVal = null;
+			// }
+		} else if (dDictVals.size() == 1) {
+			dDictVal = dDictVals.get(0);
 		} else {
 			dDictVal = null;
 			logger.error("ERROR: found multiple DDictValue entries: " + DDictValue.toJsonArray(dDictVals));
 		}
-		
+
 		return dDictVal;
 	}
-	
 
 	private void getOrCreateDDictKind(String lsType, String lsKind) {
-		List<DDictKind> dDictKinds = DDictKind.findDDictKindsByLsTypeEqualsAndNameEquals(lsType, lsKind).getResultList();
+		List<DDictKind> dDictKinds = DDictKind.findDDictKindsByLsTypeEqualsAndNameEquals(lsType, lsKind)
+				.getResultList();
 		int dDictKindsSize = dDictKinds.size();
 		logger.debug("the dDictKindsSize is  " + dDictKindsSize);
-		if (dDictKindsSize == 0){
+		if (dDictKindsSize == 0) {
 			DDictKind dDictKind = new DDictKind();
 			dDictKind.setLsType(lsType);
 			dDictKind.setName(lsKind);
@@ -80,35 +80,32 @@ private void getOrCreateDDictKind(String lsType, String lsKind) {
 		}
 	}
 
-
 	private void getOrCreateDDictType(String lsType) {
 		List<DDictType> dDictTypes = DDictType.findDDictTypesByNameEquals(lsType).getResultList();
 		int dDictTypesSize = dDictTypes.size();
 		logger.debug("the dDictTypesSize is  " + dDictTypesSize);
 
-		if (dDictTypesSize == 0){
+		if (dDictTypesSize == 0) {
 			DDictType newDDictType = new DDictType();
 			newDDictType.setName(lsType);
 			newDDictType.persist();
 			logger.info("INFO: created a new DDictType: " + newDDictType.toJson());
 		}
 	}
-	
+
 	@Override
 	public List<DDictValue> saveDataDictionaryValues(Collection<DDictValue> dDictValues, Boolean createTypeAndKind) {
 		List<DDictValue> newDDictValues = new ArrayList<DDictValue>();
-		for (DDictValue dDictVal : dDictValues){
+		for (DDictValue dDictVal : dDictValues) {
 			DDictValue newDDictVal = saveDataDictionaryValue(dDictVal, createTypeAndKind);
-			if (newDDictVal != null){
+			if (newDDictVal != null) {
 				newDDictValues.add(newDDictVal);
 			}
 		}
-		
+
 		return newDDictValues;
 	}
 
-
-
 	@Override
 	public List<CodeTableDTO> getDataDictionaryCodeTableListByTypeKind(String lsType, String lsKind) {
 		List<CodeTableDTO> codeTableList = new ArrayList<CodeTableDTO>();
@@ -132,7 +129,6 @@ public List<CodeTableDTO> getDataDictionaryCodeTableListByType(String lsType) {
 		}
 		return codeTableList;
 	}
-	
 
 	@Override
 	public CodeTableDTO getDataDictionaryCodeTable(DDictValue dDictValue) {
@@ -140,7 +136,6 @@ public CodeTableDTO getDataDictionaryCodeTable(DDictValue dDictValue) {
 		return codeTable;
 	}
 
-
 	@Override
 	public String getCsvList(List<DDictValue> dDictValues) {
 		StringWriter outFile = new StringWriter();
@@ -170,7 +165,6 @@ public String getCsvList(List<DDictValue> dDictValues) {
 		return outFile.toString();
 	}
 
-
 	@Override
 	public List<CodeTableDTO> convertToCodeTables(List<DDictValue> dDictResults) {
 		List<CodeTableDTO> codeTableList = new ArrayList<CodeTableDTO>();
@@ -178,26 +172,27 @@ public List<CodeTableDTO> convertToCodeTables(List<DDictValue> dDictResults) {
 			CodeTableDTO codeTable = new CodeTableDTO(val);
 			codeTableList.add(codeTable);
 		}
-		return codeTableList;	
+		return codeTableList;
 	}
 
 	@Override
-	public CodeTableDTO getOrCreateCodeTable(CodeTableDTO codeTable, Boolean createTypeKind){
+	public CodeTableDTO getOrCreateCodeTable(CodeTableDTO codeTable, Boolean createTypeKind) {
 		CodeTableDTO newCodeTable = null;
-		try{
-			DDictValue dDictValue = DDictValue.findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals(codeTable.getCodeType(), codeTable.getCodeKind(), codeTable.getCode()).getSingleResult();
+		try {
+			DDictValue dDictValue = DDictValue.findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals(
+					codeTable.getCodeType(), codeTable.getCodeKind(), codeTable.getCode()).getSingleResult();
 			newCodeTable = new CodeTableDTO(dDictValue);
 			logger.debug("Found the codeTable: " + newCodeTable.toJson());
-		}catch (NoResultException e){
+		} catch (NoResultException e) {
 			newCodeTable = saveCodeTableValue(codeTable, createTypeKind);
 		}
 		return newCodeTable;
 	}
-	
+
 	@Override
-	public List<CodeTableDTO> getOrCreateCodeTableArray(List<CodeTableDTO> codeTables, Boolean createTypeKind){
+	public List<CodeTableDTO> getOrCreateCodeTableArray(List<CodeTableDTO> codeTables, Boolean createTypeKind) {
 		List<CodeTableDTO> newCodeTables = new ArrayList<CodeTableDTO>();
-		for (CodeTableDTO codeTable : codeTables){
+		for (CodeTableDTO codeTable : codeTables) {
 			CodeTableDTO newCodeTable = getOrCreateCodeTable(codeTable, createTypeKind);
 			newCodeTables.add(newCodeTable);
 		}
@@ -206,10 +201,11 @@ public List<CodeTableDTO> getOrCreateCodeTableArray(List<CodeTableDTO> codeTable
 
 	@Override
 	public CodeTableDTO saveCodeTableValue(CodeTableDTO codeTableValue, Boolean createTypeAndKind) {
-		List<DDictValue> dDictVals = DDictValue.findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals(codeTableValue.getCodeType(), codeTableValue.getCodeKind(), codeTableValue.getCode()).getResultList();
+		List<DDictValue> dDictVals = DDictValue.findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals(
+				codeTableValue.getCodeType(), codeTableValue.getCodeKind(), codeTableValue.getCode()).getResultList();
 		logger.info("attempting to save codeTable = " + codeTableValue.toJson());
-		DDictValue dDictVal ;
-		if (dDictVals.size() == 0){
+		DDictValue dDictVal;
+		if (dDictVals.size() == 0) {
 			dDictVal = new DDictValue(codeTableValue);
 			dDictVal = saveDataDictionaryValue(dDictVal, createTypeAndKind);
 			logger.info("saved the codeTable: " + dDictVal.toJson());
@@ -217,56 +213,52 @@ public CodeTableDTO saveCodeTableValue(CodeTableDTO codeTableValue, Boolean crea
 			dDictVal = null;
 			logger.error("ERROR: found exisiting DDictValue entries: " + DDictValue.toJsonArray(dDictVals));
 		}
-		
+
 		if (dDictVal == null) {
 			return null;
 		} else {
 			return new CodeTableDTO(dDictVal);
 		}
 	}
-	
+
 	@Override
 	public List<CodeTableDTO> saveCodeTableValueArray(List<CodeTableDTO> codeTableDTOs, Boolean createTypeAndKind) {
 		List<CodeTableDTO> codeTables = new ArrayList<CodeTableDTO>();
-		for (CodeTableDTO codeTableDTO : codeTableDTOs){
+		for (CodeTableDTO codeTableDTO : codeTableDTOs) {
 			CodeTableDTO codeTable = saveCodeTableValue(codeTableDTO, createTypeAndKind);
-			if (codeTable != null){
+			if (codeTable != null) {
 				codeTables.add(codeTable);
 			}
 		}
-		
+
 		return codeTables;
 	}
 
-	
-
 	@Override
-	public CodeTableDTO updateCodeTableValue(CodeTableDTO codeTableValue) {	
+	public CodeTableDTO updateCodeTableValue(CodeTableDTO codeTableValue) {
 		DDictValue oldDDictValue = DDictValue.findDDictValue(codeTableValue.getId());
-		if (oldDDictValue == null){
+		if (oldDDictValue == null) {
 			return null;
-		} else  {
+		} else {
 			oldDDictValue.setShortName(codeTableValue.getCode());
 			oldDDictValue.setLabelText(codeTableValue.getName());
 			oldDDictValue.setIgnored(codeTableValue.isIgnored());
 			oldDDictValue.merge();
-			return new CodeTableDTO(oldDDictValue);			
-		} 
+			return new CodeTableDTO(oldDDictValue);
+		}
 	}
 
-
 	@Override
 	public List<CodeTableDTO> updateCodeTableValueArray(List<CodeTableDTO> codeTableDTOs) {
 		List<CodeTableDTO> codeTables = new ArrayList<CodeTableDTO>();
-		for (CodeTableDTO codeTableDTO : codeTableDTOs){
+		for (CodeTableDTO codeTableDTO : codeTableDTOs) {
 			CodeTableDTO codeTable = updateCodeTableValue(codeTableDTO);
-			if (codeTable != null){
+			if (codeTable != null) {
 				codeTables.add(codeTable);
 			}
 		}
-		
+
 		return codeTables;
 	}
 
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/DatabaseAuthenticationProvider.java b/src/main/java/com/labsynch/labseer/service/DatabaseAuthenticationProvider.java
index b5a0672f1..c12aaff46 100755
--- a/src/main/java/com/labsynch/labseer/service/DatabaseAuthenticationProvider.java
+++ b/src/main/java/com/labsynch/labseer/service/DatabaseAuthenticationProvider.java
@@ -35,20 +35,18 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
-
-
 /**
  * 
  */
 @SuppressWarnings("deprecation")
 @Service("databaseAuthenticationProvider")
 public class DatabaseAuthenticationProvider extends AbstractUserDetailsAuthenticationProvider {
-	
-    private static final Logger logger = LoggerFactory.getLogger(DatabaseAuthenticationProvider.class);
+
+	private static final Logger logger = LoggerFactory.getLogger(DatabaseAuthenticationProvider.class);
 
 	private String adminUser;
 	private String adminPassword;
-	
+
 	@Autowired
 	private MessageDigestPasswordEncoder messageDigestPasswordEncoder;
 
@@ -56,7 +54,6 @@ public void setAdminUser(String adminUser) {
 		this.adminUser = adminUser;
 	}
 
-	
 	public void setAdminPassword(String adminPassword) {
 		this.adminPassword = adminPassword;
 	}
@@ -92,16 +89,17 @@ protected void additionalAuthenticationChecks(UserDetails arg0,
 	@Override
 	@Transactional
 	protected UserDetails retrieveUser(String username,
-		      UsernamePasswordAuthenticationToken authentication)
+			UsernamePasswordAuthenticationToken authentication)
 			throws AuthenticationException {
-		logger.debug( "Inside retrieveUser");
+		logger.debug("Inside retrieveUser");
 		String password = (String) authentication.getCredentials();
-	    if (! StringUtils.hasText(password)) {
-	      throw new BadCredentialsException("Please enter password");
-	    }
-	    messageDigestPasswordEncoder.setEncodeHashAsBase64(true);
-//	    String encryptedPassword = messageDigestPasswordEncoder.encodePassword(password, null); 
-	    String encryptedPassword = null;
+		if (!StringUtils.hasText(password)) {
+			throw new BadCredentialsException("Please enter password");
+		}
+		messageDigestPasswordEncoder.setEncodeHashAsBase64(true);
+		// String encryptedPassword =
+		// messageDigestPasswordEncoder.encodePassword(password, null);
+		String encryptedPassword = null;
 		try {
 			encryptedPassword = getBase64ShaHash(password);
 		} catch (NoSuchAlgorithmException e1) {
@@ -110,87 +108,87 @@ protected UserDetails retrieveUser(String username,
 		} catch (UnsupportedEncodingException e1) {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
-		} 
-
-	    UserDetails user = null;
-	    String expectedPassword = null;
-	    List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
-	    if (adminUser.equals(username)) {
-	      // pseudo-user admin (ie not configured via Person)
-	      expectedPassword = adminPassword; 
-	      // authenticate admin
-	      if (! encryptedPassword.equals(expectedPassword)) {
-	        throw new BadCredentialsException("Invalid password");
-	      }
-	      // authorize admin
-	      authorities.add(new SimpleGrantedAuthority("ROLE_ADMIN"));
-	    } else {
-	      try {
-	    	TypedQuery<Author> query= Author.findAuthorsByUserName(username);
-	    	if (query.getResultList().size() == 0){
-	    		query = Author.findAuthorsByEmailAddress(username);
-	    	}
-	    	
-	        Author targetUser = (Author) query.getSingleResult();
-	        // authenticate the person
-	        expectedPassword = targetUser.getPassword();
-	        if (! StringUtils.hasText(expectedPassword)) {
-	          throw new BadCredentialsException("No password for " + username + 
-	            " set in database, contact administrator");
-	        }
-	        if (! encryptedPassword.equals(expectedPassword)) {
-	          throw new BadCredentialsException("Invalid Password");
-	        }
-	        
-	        // activate the account on the first login
-	        // may decide to use this field to deactivate the account
-	        // in that case -- throw an error if the account is not enabled
-	        // must set the enabled flag through the admin interace.
-	        
-	        if (!targetUser.getLocked() && !targetUser.getEnabled()){
-	        	targetUser.setEnabled(true);
-	        	targetUser.setActivationDate(new Date());
-	        	targetUser.merge();
-	        }
-	        
-	        if (targetUser.getLocked()){
-		          throw new BadCredentialsException("The user account: " + username + 
-		  	            " is locked, please contact administrator");
-	        }
-	        
-	        TypedQuery<AuthorRole> roleQuery=AuthorRole.findAuthorRolesByUserEntry(targetUser);
-	        List<AuthorRole> userRoles = roleQuery.getResultList();
-	        for(AuthorRole userRole:userRoles){
-	        	authorities.add(new SimpleGrantedAuthority(userRole.getRoleEntry().getRoleName()));
-	        }
-	      } catch (NoResultException e) {
-		        throw new BadCredentialsException("Invalid user");
-	      } catch (EntityNotFoundException e) {
-	        throw new BadCredentialsException("Invalid user");
-	      } catch (NonUniqueResultException e) {
-	        throw new BadCredentialsException(
-	          "Non-unique user, contact administrator");
-	      }
-	    }
-	    return new org.springframework.security.core.userdetails.User(
-	      username,
-	      password,
-	      true, // enabled 
-	      true, // account not expired
-	      true, // credentials not expired 
-	      true, // account not locked
-	      authorities
-	    );
+		}
+
+		UserDetails user = null;
+		String expectedPassword = null;
+		List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
+		if (adminUser.equals(username)) {
+			// pseudo-user admin (ie not configured via Person)
+			expectedPassword = adminPassword;
+			// authenticate admin
+			if (!encryptedPassword.equals(expectedPassword)) {
+				throw new BadCredentialsException("Invalid password");
+			}
+			// authorize admin
+			authorities.add(new SimpleGrantedAuthority("ROLE_ADMIN"));
+		} else {
+			try {
+				TypedQuery<Author> query = Author.findAuthorsByUserName(username);
+				if (query.getResultList().size() == 0) {
+					query = Author.findAuthorsByEmailAddress(username);
+				}
+
+				Author targetUser = (Author) query.getSingleResult();
+				// authenticate the person
+				expectedPassword = targetUser.getPassword();
+				if (!StringUtils.hasText(expectedPassword)) {
+					throw new BadCredentialsException("No password for " + username +
+							" set in database, contact administrator");
+				}
+				if (!encryptedPassword.equals(expectedPassword)) {
+					throw new BadCredentialsException("Invalid Password");
+				}
+
+				// activate the account on the first login
+				// may decide to use this field to deactivate the account
+				// in that case -- throw an error if the account is not enabled
+				// must set the enabled flag through the admin interace.
+
+				if (!targetUser.getLocked() && !targetUser.getEnabled()) {
+					targetUser.setEnabled(true);
+					targetUser.setActivationDate(new Date());
+					targetUser.merge();
+				}
+
+				if (targetUser.getLocked()) {
+					throw new BadCredentialsException("The user account: " + username +
+							" is locked, please contact administrator");
+				}
+
+				TypedQuery<AuthorRole> roleQuery = AuthorRole.findAuthorRolesByUserEntry(targetUser);
+				List<AuthorRole> userRoles = roleQuery.getResultList();
+				for (AuthorRole userRole : userRoles) {
+					authorities.add(new SimpleGrantedAuthority(userRole.getRoleEntry().getRoleName()));
+				}
+			} catch (NoResultException e) {
+				throw new BadCredentialsException("Invalid user");
+			} catch (EntityNotFoundException e) {
+				throw new BadCredentialsException("Invalid user");
+			} catch (NonUniqueResultException e) {
+				throw new BadCredentialsException(
+						"Non-unique user, contact administrator");
+			}
+		}
+		return new org.springframework.security.core.userdetails.User(
+				username,
+				password,
+				true, // enabled
+				true, // account not expired
+				true, // credentials not expired
+				true, // account not locked
+				authorities);
+	}
+
+	public static String getBase64ShaHash(final String str)
+			throws NoSuchAlgorithmException, UnsupportedEncodingException {
+		final MessageDigest md = MessageDigest.getInstance("SHA");
+		md.update(str.getBytes("UTF-8"));
+		final byte[] bites = md.digest();
+
+		final Base64 base64 = new Base64();
+		final String encoded = base64.encodeAsString(bites);
+		logger.debug("new encoded password: " + encoded);
+		return encoded;
 	}
-	
-	public static String getBase64ShaHash(final String str) throws NoSuchAlgorithmException, UnsupportedEncodingException {
-        final MessageDigest md = MessageDigest.getInstance("SHA");
-        md.update(str.getBytes("UTF-8"));
-        final byte[] bites = md.digest();
-
-        final Base64 base64 = new Base64();
-        final String encoded = base64.encodeAsString(bites);
-        logger.debug("new encoded password: " + encoded);
-        return encoded; 
-    }
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ErrorList.java b/src/main/java/com/labsynch/labseer/service/ErrorList.java
index 1ea2baf21..a6c6647ba 100755
--- a/src/main/java/com/labsynch/labseer/service/ErrorList.java
+++ b/src/main/java/com/labsynch/labseer/service/ErrorList.java
@@ -10,38 +10,36 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ErrorList {
 
     private ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
 
-
-
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer().include("errors").exclude("*.class").serialize(this);
     }
 
-	public static ErrorList fromJsonToErrorList(String json) {
+    public static ErrorList fromJsonToErrorList(String json) {
         return new JSONDeserializer<ErrorList>().use(null, ErrorList.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ErrorList> collection) {
+    public static String toJsonArray(Collection<ErrorList> collection) {
         return new JSONSerializer().exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ErrorList> fromJsonArrayToErrorLists(String json) {
-        return new JSONDeserializer<List<ErrorList>>().use(null, ArrayList.class).use("values", ErrorList.class).deserialize(json);
+    public static Collection<ErrorList> fromJsonArrayToErrorLists(String json) {
+        return new JSONDeserializer<List<ErrorList>>().use(null, ArrayList.class).use("values", ErrorList.class)
+                .deserialize(json);
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public ArrayList<ErrorMessage> getErrors() {
+    public ArrayList<ErrorMessage> getErrors() {
         return this.errors;
     }
 
-	public void setErrors(ArrayList<ErrorMessage> errors) {
+    public void setErrors(ArrayList<ErrorMessage> errors) {
         this.errors = errors;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ErrorMessage.java b/src/main/java/com/labsynch/labseer/service/ErrorMessage.java
index 897c6bdda..cc17db121 100755
--- a/src/main/java/com/labsynch/labseer/service/ErrorMessage.java
+++ b/src/main/java/com/labsynch/labseer/service/ErrorMessage.java
@@ -11,71 +11,69 @@
 import flexjson.JSONDeserializer;
 import flexjson.JSONSerializer;
 
-
 public class ErrorMessage {
 
     @Size(max = 50)
     private String level;
-    
+
     @Size(max = 255)
     private String message;
-    
-    public ErrorMessage(String level, String message){
-    	this.level = level;
-    	this.message = message;
+
+    public ErrorMessage(String level, String message) {
+        this.level = level;
+        this.message = message;
     }
 
-	public ErrorMessage() {
-	}
-    
+    public ErrorMessage() {
+    }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	public String toJson() {
+    public String toJson() {
         return new JSONSerializer()
-        .exclude("*.class").serialize(this);
+                .exclude("*.class").serialize(this);
     }
 
-	public String toJson(String[] fields) {
+    public String toJson(String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(this);
+                .include(fields).exclude("*.class").serialize(this);
     }
 
-	public static ErrorMessage fromJsonToErrorMessage(String json) {
+    public static ErrorMessage fromJsonToErrorMessage(String json) {
         return new JSONDeserializer<ErrorMessage>()
-        .use(null, ErrorMessage.class).deserialize(json);
+                .use(null, ErrorMessage.class).deserialize(json);
     }
 
-	public static String toJsonArray(Collection<ErrorMessage> collection) {
+    public static String toJsonArray(Collection<ErrorMessage> collection) {
         return new JSONSerializer()
-        .exclude("*.class").serialize(collection);
+                .exclude("*.class").serialize(collection);
     }
 
-	public static String toJsonArray(Collection<ErrorMessage> collection, String[] fields) {
+    public static String toJsonArray(Collection<ErrorMessage> collection, String[] fields) {
         return new JSONSerializer()
-        .include(fields).exclude("*.class").serialize(collection);
+                .include(fields).exclude("*.class").serialize(collection);
     }
 
-	public static Collection<ErrorMessage> fromJsonArrayToErrorMessages(String json) {
+    public static Collection<ErrorMessage> fromJsonArrayToErrorMessages(String json) {
         return new JSONDeserializer<List<ErrorMessage>>()
-        .use("values", ErrorMessage.class).deserialize(json);
+                .use("values", ErrorMessage.class).deserialize(json);
     }
 
-	public String getLevel() {
+    public String getLevel() {
         return this.level;
     }
 
-	public void setLevel(String level) {
+    public void setLevel(String level) {
         this.level = level;
     }
 
-	public String getMessage() {
+    public String getMessage() {
         return this.message;
     }
 
-	public void setMessage(String message) {
+    public void setMessage(String message) {
         this.message = message;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ExperimentService.java b/src/main/java/com/labsynch/labseer/service/ExperimentService.java
index 7b7e9ea87..0181941c1 100755
--- a/src/main/java/com/labsynch/labseer/service/ExperimentService.java
+++ b/src/main/java/com/labsynch/labseer/service/ExperimentService.java
@@ -36,26 +36,29 @@ public interface ExperimentService {
 
 	Collection<JSTreeNodeDTO> getExperimentNodes(Collection<String> codeValues);
 
-	public List<AnalysisGroupValueDTO> getFilteredAGData(ExperimentSearchRequestDTO searchRequest, Boolean onlyPublicData);
+	public List<AnalysisGroupValueDTO> getFilteredAGData(ExperimentSearchRequestDTO searchRequest,
+			Boolean onlyPublicData);
 
 	public Collection<ExperimentFilterDTO> getExperimentFilters(Collection<String> experimentCodes);
 
 	public boolean isSoftDeleted(Experiment experiment);
-	
+
 	public Collection<JSTreeNodeDTO> getExperimentNodesByProtocolTree(
 			Collection<String> codeValues);
 
 	public Collection<Experiment> findExperimentsByMetadataJson(String json);
-	
+
 	public Collection<Experiment> findExperimentsByMetadataJson(
 			List<StringCollectionDTO> metaDataList);
-	
-	public Collection<Experiment> findExperimentsByGenericMetaDataSearch(String query, String userName) throws TooManyResultsException;
 
-	public Collection<Experiment> findExperimentsByGenericMetaDataSearch(String query, List<String> projects) throws TooManyResultsException;
+	public Collection<Experiment> findExperimentsByGenericMetaDataSearch(String query, String userName)
+			throws TooManyResultsException;
+
+	public Collection<Experiment> findExperimentsByGenericMetaDataSearch(String query, List<String> projects)
+			throws TooManyResultsException;
+
+	public Collection<Experiment> findExperimentsByGenericMetaDataSearch(String query) throws TooManyResultsException;
 
-	public Collection<Experiment> findExperimentsByGenericMetaDataSearch(String query)  throws TooManyResultsException;
-	
 	public Collection<Experiment> findExperimentsByMetadata(String queryString, String searchBy);
 
 	public Set<Experiment> findExperimentsByRequestMetadata(
@@ -80,10 +83,10 @@ List<CodeTableDTO> convertExperimentsToCodeTables(
 	public PreferredNameResultsDTO getCodeNameFromName(String experimentType,
 			String experimentKind, String labelType, String labelKind,
 			PreferredNameRequestDTO requestDTO);
+
 	public List<ExperimentDataDTO> getExperimentData(String batchCode, boolean showOnlyPublicData);
-	
+
 	public Collection<String> getExperimentCodesByDateValueComparison(
 			DateValueComparisonRequest requestDTO) throws Exception;
 
-	
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ExperimentServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ExperimentServiceImpl.java
index dd764433a..09281a343 100755
--- a/src/main/java/com/labsynch/labseer/service/ExperimentServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ExperimentServiceImpl.java
@@ -61,7 +61,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-
 @Service
 @Transactional
 public class ExperimentServiceImpl implements ExperimentService {
@@ -80,87 +79,96 @@ public class ExperimentServiceImpl implements ExperimentService {
 
 	@Autowired
 	private ExperimentValueService experimentValueService;
-	
+
 	@Autowired
 	private AuthorService authorService;
 
 	private static final Logger logger = LoggerFactory.getLogger(ExperimentServiceImpl.class);
 
-
 	@Override
-	public void deleteLsExperiment(Experiment experiment){
-		if (logger.isDebugEnabled())  logger.debug("incoming meta experiment: " + experiment.toJson());
+	public void deleteLsExperiment(Experiment experiment) {
+		if (logger.isDebugEnabled())
+			logger.debug("incoming meta experiment: " + experiment.toJson());
 
 	}
 
-
 	@Override
 	@Transactional
-	public Experiment updateExperiment(Experiment jsonExperiment) throws UniqueNameException{
-		//		logger.debug("incoming meta experiment: " + jsonExperiment.toPrettyJson());
-		if (logger.isDebugEnabled())  logger.debug("recorded by: " + jsonExperiment.getRecordedBy());
+	public Experiment updateExperiment(Experiment jsonExperiment) throws UniqueNameException {
+		// logger.debug("incoming meta experiment: " + jsonExperiment.toPrettyJson());
+		if (logger.isDebugEnabled())
+			logger.debug("recorded by: " + jsonExperiment.getRecordedBy());
 
 		boolean checkExperimentName = propertiesUtilService.getUniqueExperimentName();
-		if (checkExperimentName){
+		if (checkExperimentName) {
 			boolean experimentExists = false;
 			Set<ExperimentLabel> exptLabels = jsonExperiment.getLsLabels();
-			for (ExperimentLabel label : exptLabels){
+			for (ExperimentLabel label : exptLabels) {
 				String labelText = label.getLabelText();
-				if (logger.isDebugEnabled())  logger.debug("Searching for labelText: "+labelText);
-				List<ExperimentLabel> experimentLabels = ExperimentLabel.findExperimentLabelsByName(labelText).getResultList();	
-				if (logger.isDebugEnabled())  logger.debug("Found "+ experimentLabels.size() +" labels");
-				for (ExperimentLabel el : experimentLabels){
+				if (logger.isDebugEnabled())
+					logger.debug("Searching for labelText: " + labelText);
+				List<ExperimentLabel> experimentLabels = ExperimentLabel.findExperimentLabelsByName(labelText)
+						.getResultList();
+				if (logger.isDebugEnabled())
+					logger.debug("Found " + experimentLabels.size() + " labels");
+				for (ExperimentLabel el : experimentLabels) {
 					Experiment exp = el.getExperiment();
-					if (logger.isDebugEnabled())  logger.debug("Found same label on experiment: "+ exp.getId().toString() +" while experiment to update is: "+ jsonExperiment.getId().toString());
-					//if the experiment is not hard deleted or soft deleted, there is a name conflict
-					if (!exp.isIgnored() && !el.isIgnored() && exp.getId().compareTo(jsonExperiment.getId())!=0){
+					if (logger.isDebugEnabled())
+						logger.debug("Found same label on experiment: " + exp.getId().toString()
+								+ " while experiment to update is: " + jsonExperiment.getId().toString());
+					// if the experiment is not hard deleted or soft deleted, there is a name
+					// conflict
+					if (!exp.isIgnored() && !el.isIgnored() && exp.getId().compareTo(jsonExperiment.getId()) != 0) {
 						experimentExists = true;
 					}
 				}
 			}
 
-			if (experimentExists){
-				throw new UniqueNameException("Experiment with the same name exists");							
+			if (experimentExists) {
+				throw new UniqueNameException("Experiment with the same name exists");
 			}
 		}
-		
-		
+
 		Experiment updatedExperiment = Experiment.update(jsonExperiment);
-		
+
 		if (jsonExperiment.getLsLabels() != null) {
-			for(ExperimentLabel experimentLabel : jsonExperiment.getLsLabels()){
-				if (logger.isDebugEnabled())  logger.debug("Label in hand: " + experimentLabel.getLabelText());			
-				if (experimentLabel.getId() == null){
+			for (ExperimentLabel experimentLabel : jsonExperiment.getLsLabels()) {
+				if (logger.isDebugEnabled())
+					logger.debug("Label in hand: " + experimentLabel.getLabelText());
+				if (experimentLabel.getId() == null) {
 					ExperimentLabel newExperimentLabel = new ExperimentLabel(experimentLabel);
 					newExperimentLabel.setExperiment(updatedExperiment);
 					newExperimentLabel.persist();
 					updatedExperiment.getLsLabels().add(newExperimentLabel);
 				} else {
 					ExperimentLabel updatedLabel = ExperimentLabel.update(experimentLabel);
-					if (logger.isDebugEnabled())  logger.debug("updated experiment label " + updatedLabel.getId());
+					if (logger.isDebugEnabled())
+						logger.debug("updated experiment label " + updatedLabel.getId());
 				}
-			}			
+			}
 		} else {
-			if (logger.isDebugEnabled())  logger.debug("No experiment labels to update");
+			if (logger.isDebugEnabled())
+				logger.debug("No experiment labels to update");
 		}
 
-		if(jsonExperiment.getLsStates() != null){
-			for(ExperimentState experimentState : jsonExperiment.getLsStates()){
+		if (jsonExperiment.getLsStates() != null) {
+			for (ExperimentState experimentState : jsonExperiment.getLsStates()) {
 				ExperimentState updatedExperimentState;
-				if (experimentState.getId() == null){
+				if (experimentState.getId() == null) {
 					updatedExperimentState = new ExperimentState(experimentState);
 					updatedExperimentState.setExperiment(updatedExperiment);
 					updatedExperimentState.persist();
 					updatedExperiment.getLsStates().add(updatedExperimentState);
 				} else {
 					updatedExperimentState = ExperimentState.update(experimentState);
-					if (logger.isDebugEnabled())  logger.debug("updated experiment state " + experimentState.getId());
+					if (logger.isDebugEnabled())
+						logger.debug("updated experiment state " + experimentState.getId());
 
 				}
-				if (experimentState.getLsValues() != null){
-					for(ExperimentValue experimentValue : experimentState.getLsValues()){
+				if (experimentState.getLsValues() != null) {
+					for (ExperimentValue experimentValue : experimentState.getLsValues()) {
 						ExperimentValue updatedExperimentValue;
-						if (experimentValue.getId() == null){
+						if (experimentValue.getId() == null) {
 							updatedExperimentValue = ExperimentValue.create(experimentValue);
 							updatedExperimentValue.setLsState(updatedExperimentState);
 							updatedExperimentValue.persist();
@@ -168,26 +176,29 @@ public Experiment updateExperiment(Experiment jsonExperiment) throws UniqueNameE
 						} else {
 							experimentValue.setLsState(updatedExperimentState);
 							updatedExperimentValue = ExperimentValue.update(experimentValue);
-							if (logger.isDebugEnabled())  logger.debug("updated experiment value " + updatedExperimentValue.getId());
+							if (logger.isDebugEnabled())
+								logger.debug("updated experiment value " + updatedExperimentValue.getId());
 						}
-					}	
+					}
 				} else {
-					if (logger.isDebugEnabled())  logger.debug("No experiment values to update");
+					if (logger.isDebugEnabled())
+						logger.debug("No experiment values to update");
 				}
 			}
 		}
 
-		//		if (logger.isDebugEnabled())  logger.debug("updatedExperiment: " + updatedExperiment.toPrettyJson());
+		// if (logger.isDebugEnabled()) logger.debug("updatedExperiment: " +
+		// updatedExperiment.toPrettyJson());
 		return updatedExperiment;
 
 	}
-	
+
 	@Override
 	@Transactional
 	public Collection<Experiment> saveLsExperiments(
-			Collection<Experiment> experiments) throws UniqueNameException, NotFoundException{
+			Collection<Experiment> experiments) throws UniqueNameException, NotFoundException {
 		Collection<Experiment> savedExperiments = new ArrayList<Experiment>();
-		for (Experiment experiment : experiments){
+		for (Experiment experiment : experiments) {
 			Experiment savedExperiment = saveLsExperiment(experiment);
 			savedExperiments.add(savedExperiment);
 		}
@@ -196,43 +207,46 @@ public Collection<Experiment> saveLsExperiments(
 
 	@Override
 	@Transactional
-	public Experiment saveLsExperiment(Experiment experiment) throws UniqueNameException, NotFoundException{
-		if (logger.isDebugEnabled())  logger.debug("incoming meta experiment: " + experiment.toJson());
+	public Experiment saveLsExperiment(Experiment experiment) throws UniqueNameException, NotFoundException {
+		if (logger.isDebugEnabled())
+			logger.debug("incoming meta experiment: " + experiment.toJson());
 
-		//check if experiment with the same name exists
+		// check if experiment with the same name exists
 		boolean checkExperimentName = propertiesUtilService.getUniqueExperimentName();
-		if (checkExperimentName){
+		if (checkExperimentName) {
 			boolean experimentExists = false;
 			Set<ExperimentLabel> exptLabels = experiment.getLsLabels();
-			for (ExperimentLabel label : exptLabels){
+			for (ExperimentLabel label : exptLabels) {
 				String labelText = label.getLabelText();
-				List<ExperimentLabel> experimentLabels = ExperimentLabel.findExperimentLabelsByName(labelText).getResultList();	
-				for (ExperimentLabel el : experimentLabels){
+				List<ExperimentLabel> experimentLabels = ExperimentLabel.findExperimentLabelsByName(labelText)
+						.getResultList();
+				for (ExperimentLabel el : experimentLabels) {
 					Experiment exp = el.getExperiment();
-					//if the experiment is not hard deleted or soft deleted, there is a name conflict
-					if (!exp.isIgnored() && !el.isIgnored()){
+					// if the experiment is not hard deleted or soft deleted, there is a name
+					// conflict
+					if (!exp.isIgnored() && !el.isIgnored()) {
 						experimentExists = true;
 					}
 				}
 			}
 
-			if (experimentExists){
-				throw new UniqueNameException("Experiment with the same name exists");							
+			if (experimentExists) {
+				throw new UniqueNameException("Experiment with the same name exists");
 			}
 		}
 
 		Experiment newExperiment = new Experiment(experiment);
 
 		newExperiment.setProtocol(Protocol.findProtocol(experiment.getProtocol().getId()));
-		if (newExperiment.getCodeName() == null){
+		if (newExperiment.getCodeName() == null) {
 			newExperiment.setCodeName(autoLabelService.getExperimentCodeName());
 		}
 		newExperiment.persist();
-//		newExperiment.flush();
+		// newExperiment.flush();
 
 		if (experiment.getLsLabels() != null) {
 			Set<ExperimentLabel> lsLabels = new HashSet<ExperimentLabel>();
-			for(ExperimentLabel experimentLabel : experiment.getLsLabels()){
+			for (ExperimentLabel experimentLabel : experiment.getLsLabels()) {
 				ExperimentLabel newExperimentLabel = new ExperimentLabel(experimentLabel);
 				newExperimentLabel.setExperiment(newExperiment);
 				newExperimentLabel.persist();
@@ -240,113 +254,122 @@ public Experiment saveLsExperiment(Experiment experiment) throws UniqueNameExcep
 			}
 			newExperiment.setLsLabels(lsLabels);
 		} else {
-			if (logger.isDebugEnabled())  logger.debug("No experiment labels to save");
+			if (logger.isDebugEnabled())
+				logger.debug("No experiment labels to save");
 		}
 
-		if(experiment.getLsStates() != null){
+		if (experiment.getLsStates() != null) {
 			Set<ExperimentState> lsStates = new HashSet<ExperimentState>();
-			for(ExperimentState experimentState : experiment.getLsStates()){
+			for (ExperimentState experimentState : experiment.getLsStates()) {
 				ExperimentState newExperimentState = new ExperimentState(experimentState);
 				newExperimentState.setExperiment(newExperiment);
 				newExperimentState.persist();
-				if (experimentState.getLsValues() != null){
+				if (experimentState.getLsValues() != null) {
 					Set<ExperimentValue> lsValues = new HashSet<ExperimentValue>();
-					for(ExperimentValue experimentValue : experimentState.getLsValues()){
+					for (ExperimentValue experimentValue : experimentState.getLsValues()) {
 						experimentValue.setLsState(newExperimentState);
 						experimentValue.persist();
 						lsValues.add(experimentValue);
-					}	
+					}
 					newExperimentState.setLsValues(lsValues);
 				} else {
-					if (logger.isDebugEnabled())  logger.debug("No experiment values to save");
+					if (logger.isDebugEnabled())
+						logger.debug("No experiment values to save");
 				}
 				lsStates.add(newExperimentState);
 			}
 			newExperiment.setLsStates(lsStates);
 		}
-		
-//		if(experiment.getAnalysisGroups() != null){
-//			Set<AnalysisGroup> inputAnalysisGroups = new HashSet<AnalysisGroup>();
-//			for(AnalysisGroup analysisGroup : experiment.getAnalysisGroups()){
-//				inputAnalysisGroups.add(analysisGroup);
-//			}
-//
-//			for(AnalysisGroup analysisGroup : inputAnalysisGroups){
-//				analysisGroup.getExperiments().add(newExperiment);
-//				analysisGroupService.saveLsAnalysisGroup(analysisGroup);
-//			}
-				//			Set<AnalysisGroup> analysisGroups = new HashSet<AnalysisGroup>();
-//			for(AnalysisGroup analysisGroup : inputAnalysisGroups){
-//				analysisGroup.getExperiments().add(newExperiment);
-//				AnalysisGroup newAnalysisGroup = null;
-//				try {
-//					newAnalysisGroup = analysisGroupService.saveLsAnalysisGroup(analysisGroup);
-//					
-//				} catch (Exception e){
-//					logger.error("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
-//					logger.error("Hit an error with Analysis Group: " + analysisGroup.getId());
-//					logger.error("Problem AG: " + AnalysisGroup.findAnalysisGroup(analysisGroup.getId()).getId());
-//					logger.error(e.toString());
-//					
-//					try {
-//						TimeUnit.SECONDS.sleep(5);
-//						newAnalysisGroup = analysisGroupService.saveLsAnalysisGroup(analysisGroup);
-//
-//					}  catch (Exception e2){
-//						
-//						logger.error("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
-//						logger.error("Hit an error with Analysis Group: " + analysisGroup.getId());
-//						logger.error("Problem AG: " + AnalysisGroup.findAnalysisGroup(analysisGroup.getId()).getId());
-//						logger.error(e2.toString());
-//						
-//						try {
-//							TimeUnit.SECONDS.sleep(10);
-//							newAnalysisGroup = analysisGroupService.saveLsAnalysisGroup(analysisGroup);
-//
-//						}  catch (Exception e3){
-//							
-//							logger.error("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
-//							logger.error("Hit an error with Analysis Group: " + analysisGroup.getId());
-//							logger.error("Problem AG: " + AnalysisGroup.findAnalysisGroup(analysisGroup.getId()).getId());
-//							logger.error(e3.toString());
-//						}
-//					}
-//				}
-//				if (newAnalysisGroup != null){
-//					analysisGroups.add(newAnalysisGroup);
-////					if (logger.isDebugEnabled())  logger.debug("persisted the newAnalysisGroup: " + newAnalysisGroup.toJson());
-//				} else{		
-//					if (logger.isDebugEnabled())  logger.debug("the analysis group is NULL");
-//					throw new NotFoundException("AnalysisGroup not found: " + analysisGroup.getId());
-//				}
-//			}
-//			newExperiment.setAnalysisGroups(analysisGroups);
-//		}
+
+		// if(experiment.getAnalysisGroups() != null){
+		// Set<AnalysisGroup> inputAnalysisGroups = new HashSet<AnalysisGroup>();
+		// for(AnalysisGroup analysisGroup : experiment.getAnalysisGroups()){
+		// inputAnalysisGroups.add(analysisGroup);
+		// }
+		//
+		// for(AnalysisGroup analysisGroup : inputAnalysisGroups){
+		// analysisGroup.getExperiments().add(newExperiment);
+		// analysisGroupService.saveLsAnalysisGroup(analysisGroup);
+		// }
+		// Set<AnalysisGroup> analysisGroups = new HashSet<AnalysisGroup>();
+		// for(AnalysisGroup analysisGroup : inputAnalysisGroups){
+		// analysisGroup.getExperiments().add(newExperiment);
+		// AnalysisGroup newAnalysisGroup = null;
+		// try {
+		// newAnalysisGroup = analysisGroupService.saveLsAnalysisGroup(analysisGroup);
+		//
+		// } catch (Exception e){
+		// logger.error("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+		// logger.error("Hit an error with Analysis Group: " + analysisGroup.getId());
+		// logger.error("Problem AG: " +
+		// AnalysisGroup.findAnalysisGroup(analysisGroup.getId()).getId());
+		// logger.error(e.toString());
+		//
+		// try {
+		// TimeUnit.SECONDS.sleep(5);
+		// newAnalysisGroup = analysisGroupService.saveLsAnalysisGroup(analysisGroup);
+		//
+		// } catch (Exception e2){
+		//
+		// logger.error("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+		// logger.error("Hit an error with Analysis Group: " + analysisGroup.getId());
+		// logger.error("Problem AG: " +
+		// AnalysisGroup.findAnalysisGroup(analysisGroup.getId()).getId());
+		// logger.error(e2.toString());
+		//
+		// try {
+		// TimeUnit.SECONDS.sleep(10);
+		// newAnalysisGroup = analysisGroupService.saveLsAnalysisGroup(analysisGroup);
+		//
+		// } catch (Exception e3){
+		//
+		// logger.error("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+		// logger.error("Hit an error with Analysis Group: " + analysisGroup.getId());
+		// logger.error("Problem AG: " +
+		// AnalysisGroup.findAnalysisGroup(analysisGroup.getId()).getId());
+		// logger.error(e3.toString());
+		// }
+		// }
+		// }
+		// if (newAnalysisGroup != null){
+		// analysisGroups.add(newAnalysisGroup);
+		//// if (logger.isDebugEnabled()) logger.debug("persisted the newAnalysisGroup:
+		// " + newAnalysisGroup.toJson());
+		// } else{
+		// if (logger.isDebugEnabled()) logger.debug("the analysis group is NULL");
+		// throw new NotFoundException("AnalysisGroup not found: " +
+		// analysisGroup.getId());
+		// }
+		// }
+		// newExperiment.setAnalysisGroups(analysisGroups);
+		// }
 
 		return newExperiment;
 	}
 
-
 	@Override
-	public Experiment getFullExperiment(Experiment queryExperiment){
+	public Experiment getFullExperiment(Experiment queryExperiment) {
 		Experiment experiment = Experiment.findExperiment(queryExperiment.getId());
 		Set<ExperimentLabel> lsLabels = new HashSet<ExperimentLabel>();
-		for (ExperimentLabel experimentLabel : ExperimentLabel.findExperimentLabelsByExperimentAndIgnoredNot(experiment, true).getResultList()){
+		for (ExperimentLabel experimentLabel : ExperimentLabel
+				.findExperimentLabelsByExperimentAndIgnoredNot(experiment, true).getResultList()) {
 			lsLabels.add(experimentLabel);
 		}
 		experiment.setLsLabels(lsLabels);
 		Set<ExperimentState> lsStates = new HashSet<ExperimentState>();
-		for (ExperimentState experimentState : ExperimentState.findExperimentStatesByExperiment(experiment).getResultList()){
-			for (ExperimentValue experimentValue : ExperimentValue.findExperimentValuesByLsState(experimentState).getResultList()){
+		for (ExperimentState experimentState : ExperimentState.findExperimentStatesByExperiment(experiment)
+				.getResultList()) {
+			for (ExperimentValue experimentValue : ExperimentValue.findExperimentValuesByLsState(experimentState)
+					.getResultList()) {
 
 			}
 			lsStates.add(experimentState);
-		}	
+		}
 		experiment.setLsStates(lsStates);
 		Set<AnalysisGroup> analysisGroups = new HashSet<AnalysisGroup>();
 		Set<Experiment> experiments = new HashSet<Experiment>();
 		experiments.add(experiment);
-		for (AnalysisGroup analysisGroup : AnalysisGroup.findAnalysisGroupsByExperiments(experiments).getResultList()){
+		for (AnalysisGroup analysisGroup : AnalysisGroup.findAnalysisGroupsByExperiments(experiments).getResultList()) {
 			analysisGroups.add(analysisGroup);
 		}
 		experiment.setAnalysisGroups(analysisGroups);
@@ -355,19 +378,22 @@ public Experiment getFullExperiment(Experiment queryExperiment){
 	}
 
 	@Override
-	public Collection<ExperimentFilterDTO> getExperimentFilters(Collection<String> experimentCodes){
+	public Collection<ExperimentFilterDTO> getExperimentFilters(Collection<String> experimentCodes) {
 		Collection<ExperimentFilterDTO> eftSet = new HashSet<ExperimentFilterDTO>();
-		for (String experimentCode : experimentCodes){
-			if (logger.isDebugEnabled())  logger.debug("searching for : " + experimentCode);
-			List<Experiment> experiments = Experiment.findExperimentsByCodeNameEquals(experimentCode, false).getResultList();
+		for (String experimentCode : experimentCodes) {
+			if (logger.isDebugEnabled())
+				logger.debug("searching for : " + experimentCode);
+			List<Experiment> experiments = Experiment.findExperimentsByCodeNameEquals(experimentCode, false)
+					.getResultList();
 			Experiment experiment = null;
-			if (experiments.size() == 1){
+			if (experiments.size() == 1) {
 				experiment = experiments.get(0);
 				ExperimentFilterDTO eft = new ExperimentFilterDTO();
 				eft.setExperimentId(experiment.getId());
 				eft.setExperimentCode(experimentCode);
-				List<ExperimentLabel> experimentNames = ExperimentLabel.findExperimentPreferredName(experiment.getId()).getResultList();
-				if (experimentNames.size() == 1){
+				List<ExperimentLabel> experimentNames = ExperimentLabel.findExperimentPreferredName(experiment.getId())
+						.getResultList();
+				if (experimentNames.size() == 1) {
 					eft.setExperimentName(experimentNames.get(0).getLabelText());
 				} else if (experimentNames.size() > 1) {
 					logger.error("found mulitiple preferred names");
@@ -377,29 +403,31 @@ public Collection<ExperimentFilterDTO> getExperimentFilters(Collection<String> e
 
 				String stateType = "metadata";
 				String stateKind = "data column order";
-				List<ExperimentValue> experimentValues = ExperimentValue.findExperimentValuesByExptIDAndStateTypeKind(eft.getExperimentId(), stateType, stateKind).getResultList();
+				List<ExperimentValue> experimentValues = ExperimentValue
+						.findExperimentValuesByExptIDAndStateTypeKind(eft.getExperimentId(), stateType, stateKind)
+						.getResultList();
 				Collection<ValueTypeKindDTO> valueTypes = null;
 
-				if (experimentValues.size() > 0){
+				if (experimentValues.size() > 0) {
 					HashMap<ExperimentState, SELColOrderDTO> valueStateMap = new HashMap<ExperimentState, SELColOrderDTO>();
 					SELColOrderDTO selColOrderDTO;
-					for (ExperimentValue ev : experimentValues){				
-						if (valueStateMap.get(ev.getLsState()) != null){
+					for (ExperimentValue ev : experimentValues) {
+						if (valueStateMap.get(ev.getLsState()) != null) {
 							selColOrderDTO = valueStateMap.get(ev.getLsState());
 						} else {
 							selColOrderDTO = new SELColOrderDTO();
 						}
 
-						if (ev.getLsKind().equalsIgnoreCase("column name")){
+						if (ev.getLsKind().equalsIgnoreCase("column name")) {
 							selColOrderDTO.setColumnName(ev.getStringValue());
 							selColOrderDTO.setLsKind(ev.getStringValue());
-						} else if (ev.getLsKind().equalsIgnoreCase("column type")){
+						} else if (ev.getLsKind().equalsIgnoreCase("column type")) {
 							selColOrderDTO.setLsType(ev.getStringValue());
-						} else if (ev.getLsKind().equalsIgnoreCase("column order")){
-							selColOrderDTO.setColumnOrder( Double.valueOf(ev.getNumericValue().toString()).intValue());
-						} else if (ev.getLsKind().equalsIgnoreCase("hide column")){
+						} else if (ev.getLsKind().equalsIgnoreCase("column order")) {
+							selColOrderDTO.setColumnOrder(Double.valueOf(ev.getNumericValue().toString()).intValue());
+						} else if (ev.getLsKind().equalsIgnoreCase("hide column")) {
 							boolean displayColumn = true;
-							if (ev.getStringValue().equalsIgnoreCase("true")){
+							if (ev.getStringValue().equalsIgnoreCase("true")) {
 								displayColumn = false;
 							}
 							selColOrderDTO.setPublicData(displayColumn);
@@ -407,40 +435,41 @@ public Collection<ExperimentFilterDTO> getExperimentFilters(Collection<String> e
 						}
 						valueStateMap.put(ev.getLsState(), selColOrderDTO);
 					}
-					
+
 					List<SELColOrderDTO> valueStateList = new ArrayList<SELColOrderDTO>();
 					Set<ExperimentState> vsKeys = valueStateMap.keySet();
-					for (ExperimentState vsKey : vsKeys){
+					for (ExperimentState vsKey : vsKeys) {
 						SELColOrderDTO query = valueStateMap.get(vsKey);
-						if (query.isPublicData()){
+						if (query.isPublicData()) {
 							valueStateList.add(query);
 						}
 					}
 
 					Collections.sort(valueStateList);
 					valueTypes = new ArrayList<ValueTypeKindDTO>();
-					for (SELColOrderDTO selColDTO : valueStateList){
+					for (SELColOrderDTO selColDTO : valueStateList) {
 						ValueTypeKindDTO vtkDTO = new ValueTypeKindDTO();
 						vtkDTO.setLsKind(selColDTO.getLsKind());
 						vtkDTO.setLsType(selColDTO.getLsType());
 						vtkDTO.setDisplayOrder(selColDTO.getColumnOrder());
 						valueTypes.add(vtkDTO);
-					}				
+					}
 				} else {
 					valueTypes = AnalysisGroupValue.findAnalysisGroupValueTypeKindDTO(experimentCode).getResultList();
 
 				}
-				
 
 				eft.setValueKinds(valueTypes);
 				eftSet.add(eft);
 			} else {
-				logger.error("ERROR. Did not find a single experiment for : " + experimentCode + "  found: " + experiments.size());
+				logger.error("ERROR. Did not find a single experiment for : " + experimentCode + "  found: "
+						+ experiments.size());
 			}
 
 		}
 
-		if (logger.isDebugEnabled())  logger.debug(ExperimentFilterDTO.toPrettyJsonArray(eftSet));
+		if (logger.isDebugEnabled())
+			logger.debug(ExperimentFilterDTO.toPrettyJsonArray(eftSet));
 
 		return eftSet;
 
@@ -448,32 +477,34 @@ public Collection<ExperimentFilterDTO> getExperimentFilters(Collection<String> e
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Collection<JSTreeNodeDTO> getExperimentNodesMod(Collection<String> codeValues){
+	public Collection<JSTreeNodeDTO> getExperimentNodesMod(Collection<String> codeValues) {
 		List<Experiment> experiments;
-		if (codeValues == null || codeValues.size() == 0){
+		if (codeValues == null || codeValues.size() == 0) {
 			experiments = Experiment.findAllExperiments();
 		} else {
 			experiments = Experiment.findExperimentsByBatchCodes(codeValues).getResultList();
 		}
 
-		if (logger.isDebugEnabled())  logger.debug("number of experiments found: " + experiments.size());
+		if (logger.isDebugEnabled())
+			logger.debug("number of experiments found: " + experiments.size());
 
 		Set<Protocol> protocols = new LinkedHashSet<Protocol>();
 		Set<JSTreeNodeDTO> nodes = new LinkedHashSet<JSTreeNodeDTO>();
-		for (Experiment exp : experiments){
+		for (Experiment exp : experiments) {
 			protocols.add(Protocol.findProtocol(exp.getProtocol().getId()));
 
 			String experimentLabel;
-			List<ExperimentLabel> experimentNames = ExperimentLabel.findExperimentPreferredName(exp.getId()).getResultList();
-			if (experimentNames.size() < 1){
+			List<ExperimentLabel> experimentNames = ExperimentLabel.findExperimentPreferredName(exp.getId())
+					.getResultList();
+			if (experimentNames.size() < 1) {
 				String errorMessage = "expected a single preferred experiment name. Found " + experimentNames.size();
 				logger.error(errorMessage);
-				//throw new RuntimeException(errorMessage);
+				// throw new RuntimeException(errorMessage);
 				experimentLabel = "NO PREFERRED EXPERIMENT NAME";
-			} else if (experimentNames.size() > 1){
+			} else if (experimentNames.size() > 1) {
 				String errorMessage = "expected a single preferred experiment name. Found " + experimentNames.size();
 				logger.error(errorMessage);
-				//				throw new RuntimeException(errorMessage);
+				// throw new RuntimeException(errorMessage);
 				experimentLabel = "MULTIPLE PREFERRED EXPERIMENT NAME";
 			} else {
 				experimentLabel = experimentNames.get(0).getLabelText();
@@ -489,15 +520,15 @@ public Collection<JSTreeNodeDTO> getExperimentNodesMod(Collection<String> codeVa
 
 			StringBuilder allTagText = new StringBuilder();
 			boolean firstTag = true;
-			for (LsTag tag : exp.getLsTags()){
-				if (firstTag){
+			for (LsTag tag : exp.getLsTags()) {
+				if (firstTag) {
 					allTagText.append("Keywords: ").append(tag.getTagText());
 					firstTag = false;
 				} else {
 					allTagText.append("; ").append(tag.getTagText());
 				}
 			}
-			if (exp.getLsTags().size() > 0){
+			if (exp.getLsTags().size() > 0) {
 				JSTreeNodeDTO tagNode = new JSTreeNodeDTO();
 				tagNode.setId("tags_" + exp.getCodeName());
 				tagNode.setParent(exp.getCodeName());
@@ -505,11 +536,11 @@ public Collection<JSTreeNodeDTO> getExperimentNodesMod(Collection<String> codeVa
 				nodes.add(tagNode);
 			}
 
-			//			JSTreeNodeDTO descriptionNode = new JSTreeNodeDTO();
-			//			descriptionNode.setId("desc_" + exp.getCodeName());
-			//			descriptionNode.setParent(exp.getCodeName());
-			//			descriptionNode.setText(exp.getShortDescription());
-			//			nodes.add(descriptionNode);
+			// JSTreeNodeDTO descriptionNode = new JSTreeNodeDTO();
+			// descriptionNode.setId("desc_" + exp.getCodeName());
+			// descriptionNode.setParent(exp.getCodeName());
+			// descriptionNode.setText(exp.getShortDescription());
+			// nodes.add(descriptionNode);
 		}
 
 		JSTreeNodeDTO rootNode = new JSTreeNodeDTO();
@@ -519,20 +550,21 @@ public Collection<JSTreeNodeDTO> getExperimentNodesMod(Collection<String> codeVa
 		rootNode.setDescription("Root Node for All Protocols");
 		nodes.add(rootNode);
 
-		if (logger.isDebugEnabled())  logger.debug("number of protocols found: " + protocols.size());
-		for (Protocol prot : protocols){
+		if (logger.isDebugEnabled())
+			logger.debug("number of protocols found: " + protocols.size());
+		for (Protocol prot : protocols) {
 
 			String protocolLabel;
 			List<ProtocolLabel> protocolNames = ProtocolLabel.findProtocolPreferredName(prot.getId()).getResultList();
-			if (protocolNames.size() < 1){
+			if (protocolNames.size() < 1) {
 				String errorMessage = "expected a single preferred protocol name. Found " + protocolNames.size();
 				logger.error(errorMessage);
-				//throw new RuntimeException(errorMessage);
+				// throw new RuntimeException(errorMessage);
 				protocolLabel = "NO PREFERRED EXPERIMENT NAME";
-			} else if (protocolNames.size() > 1){
+			} else if (protocolNames.size() > 1) {
 				String errorMessage = "expected a single preferred protocol name. Found " + protocolNames.size();
 				logger.error(errorMessage);
-				//				throw new RuntimeException(errorMessage);
+				// throw new RuntimeException(errorMessage);
 				protocolLabel = "MULTIPLE PREFERRED PROTOCOL NAME";
 			} else {
 				protocolLabel = protocolNames.get(0).getLabelText();
@@ -555,41 +587,44 @@ public Collection<JSTreeNodeDTO> getExperimentNodesMod(Collection<String> codeVa
 			nodes.add(protocolKindNode);
 		}
 
-		if (logger.isDebugEnabled())  logger.debug("number of nodes made: " + nodes.size());
-		if (logger.isDebugEnabled())  logger.debug(JSTreeNodeDTO.toPrettyJsonArray(nodes));
+		if (logger.isDebugEnabled())
+			logger.debug("number of nodes made: " + nodes.size());
+		if (logger.isDebugEnabled())
+			logger.debug(JSTreeNodeDTO.toPrettyJsonArray(nodes));
 
 		return nodes;
 	}
 
-
 	@SuppressWarnings("unchecked")
 	@Override
-	public Collection<JSTreeNodeDTO> getExperimentNodes(Collection<String> codeValues){
+	public Collection<JSTreeNodeDTO> getExperimentNodes(Collection<String> codeValues) {
 		List<Experiment> experiments;
-		if (codeValues == null || codeValues.size() == 0){
+		if (codeValues == null || codeValues.size() == 0) {
 			experiments = Experiment.findAllExperiments(false);
 		} else {
 			experiments = Experiment.findExperimentsByBatchCodes(codeValues).getResultList();
 		}
 
-		if (logger.isDebugEnabled()) logger.debug("number of experiments found: " + experiments.size());
+		if (logger.isDebugEnabled())
+			logger.debug("number of experiments found: " + experiments.size());
 
 		Set<Protocol> protocols = new LinkedHashSet<Protocol>();
 		Set<JSTreeNodeDTO> nodes = new LinkedHashSet<JSTreeNodeDTO>();
-		for (Experiment exp : experiments){
+		for (Experiment exp : experiments) {
 			protocols.add(Protocol.findProtocol(exp.getProtocol().getId()));
 
 			String experimentLabel;
-			List<ExperimentLabel> experimentNames = ExperimentLabel.findExperimentPreferredName(exp.getId()).getResultList();
-			if (experimentNames.size() < 1){
+			List<ExperimentLabel> experimentNames = ExperimentLabel.findExperimentPreferredName(exp.getId())
+					.getResultList();
+			if (experimentNames.size() < 1) {
 				String errorMessage = "expected a single preferred experiment name. Found " + experimentNames.size();
 				logger.error(errorMessage);
-				//throw new RuntimeException(errorMessage);
+				// throw new RuntimeException(errorMessage);
 				experimentLabel = "NO PREFERRED EXPERIMENT NAME";
-			} else if (experimentNames.size() > 1){
+			} else if (experimentNames.size() > 1) {
 				String errorMessage = "expected a single preferred experiment name. Found " + experimentNames.size();
 				logger.error(errorMessage);
-				//				throw new RuntimeException(errorMessage);
+				// throw new RuntimeException(errorMessage);
 				experimentLabel = "MULTIPLE PREFERRED EXPERIMENT NAME";
 			} else {
 				experimentLabel = experimentNames.get(0).getLabelText();
@@ -605,15 +640,15 @@ public Collection<JSTreeNodeDTO> getExperimentNodes(Collection<String> codeValue
 
 			StringBuilder allTagText = new StringBuilder();
 			boolean firstTag = true;
-			for (LsTag tag : exp.getLsTags()){
-				if (firstTag){
+			for (LsTag tag : exp.getLsTags()) {
+				if (firstTag) {
 					allTagText.append("Keywords: ").append(tag.getTagText());
 					firstTag = false;
 				} else {
 					allTagText.append("; ").append(tag.getTagText());
 				}
 			}
-			if (exp.getLsTags().size() > 0){
+			if (exp.getLsTags().size() > 0) {
 				JSTreeNodeDTO tagNode = new JSTreeNodeDTO();
 				tagNode.setId("tags_" + exp.getCodeName());
 				tagNode.setParent(exp.getCodeName());
@@ -621,64 +656,67 @@ public Collection<JSTreeNodeDTO> getExperimentNodes(Collection<String> codeValue
 				nodes.add(tagNode);
 			}
 
-			//			JSTreeNodeDTO descriptionNode = new JSTreeNodeDTO();
-			//			descriptionNode.setId("desc_" + exp.getCodeName());
-			//			descriptionNode.setParent(exp.getCodeName());
-			//			descriptionNode.setText(exp.getShortDescription());
-			//			nodes.add(descriptionNode);
+			// JSTreeNodeDTO descriptionNode = new JSTreeNodeDTO();
+			// descriptionNode.setId("desc_" + exp.getCodeName());
+			// descriptionNode.setParent(exp.getCodeName());
+			// descriptionNode.setText(exp.getShortDescription());
+			// nodes.add(descriptionNode);
 		}
 
-		//		JSTreeNodeDTO rootNode = new JSTreeNodeDTO();
-		//		rootNode.setId("Root Node");
-		//		rootNode.setParent("#");
-		//		rootNode.setText("All Protocols");
-		//		rootNode.setDescription("Root Node for All Protocols");
-		//		nodes.add(rootNode);
+		// JSTreeNodeDTO rootNode = new JSTreeNodeDTO();
+		// rootNode.setId("Root Node");
+		// rootNode.setParent("#");
+		// rootNode.setText("All Protocols");
+		// rootNode.setDescription("Root Node for All Protocols");
+		// nodes.add(rootNode);
 		//
-		//		JSTreeNodeDTO defaultNode = new JSTreeNodeDTO();
-		//		defaultNode.setId("Default Node");
-		//		defaultNode.setParent("Root Node");
-		//		defaultNode.setText("All Protocols Folder");
-		//		defaultNode.setDescription("Root Node for All Protocol Folders");
-		//		nodes.add(defaultNode);
+		// JSTreeNodeDTO defaultNode = new JSTreeNodeDTO();
+		// defaultNode.setId("Default Node");
+		// defaultNode.setParent("Root Node");
+		// defaultNode.setText("All Protocols Folder");
+		// defaultNode.setDescription("Root Node for All Protocol Folders");
+		// nodes.add(defaultNode);
 
-		if (logger.isDebugEnabled()) logger.debug("number of protocols found: " + protocols.size());
-		for (Protocol prot : protocols){
+		if (logger.isDebugEnabled())
+			logger.debug("number of protocols found: " + protocols.size());
+		for (Protocol prot : protocols) {
 
 			String protocolLabel;
 			List<ProtocolLabel> protocolNames = ProtocolLabel.findProtocolPreferredName(prot.getId()).getResultList();
-			if (protocolNames.size() < 1){
+			if (protocolNames.size() < 1) {
 				String errorMessage = "expected a single preferred protocol name. Found " + protocolNames.size();
 				logger.error(errorMessage);
-				//throw new RuntimeException(errorMessage);
+				// throw new RuntimeException(errorMessage);
 				protocolLabel = "NO PREFERRED EXPERIMENT NAME";
-			} else if (protocolNames.size() > 1){
+			} else if (protocolNames.size() > 1) {
 				String errorMessage = "expected a single preferred protocol name. Found " + protocolNames.size();
 				logger.error(errorMessage);
-				//				throw new RuntimeException(errorMessage);
+				// throw new RuntimeException(errorMessage);
 				protocolLabel = "MULTIPLE PREFERRED PROTOCOL NAME";
 			} else {
 				protocolLabel = protocolNames.get(0).getLabelText();
 			}
 
+			// JSTreeNodeDTO protocolKindNode = new JSTreeNodeDTO();
+			// protocolKindNode.setId(prot.getLsKind());
+			// protocolKindNode.setParent("Root Node");
+			// protocolKindNode.setText(prot.getLsKind());
+			// protocolKindNode.setDescription("Protocol Kind");
+			// nodes.add(protocolKindNode);
+			//
 
-			//			JSTreeNodeDTO protocolKindNode = new JSTreeNodeDTO();
-			//			protocolKindNode.setId(prot.getLsKind());
-			//			protocolKindNode.setParent("Root Node");
-			//			protocolKindNode.setText(prot.getLsKind());
-			//			protocolKindNode.setDescription("Protocol Kind");
-			//			nodes.add(protocolKindNode);
-			//			
-
-			List<ProtocolValue> protocolValues = ProtocolValue.findProtocolValuesByProtocolIDAndStateTypeKindAndValueTypeKind(prot.getId(), "metadata", "protocol metadata", "stringValue", "assay tree rule").getResultList();
+			List<ProtocolValue> protocolValues = ProtocolValue
+					.findProtocolValuesByProtocolIDAndStateTypeKindAndValueTypeKind(prot.getId(), "metadata",
+							"protocol metadata", "stringValue", "assay tree rule")
+					.getResultList();
 			String assayFolderRule = "";
 
-
-			for (ProtocolValue value : protocolValues){
-				if (logger.isDebugEnabled()) logger.debug(value.toJson());
-				if (value.getStringValue() == null){
+			for (ProtocolValue value : protocolValues) {
+				if (logger.isDebugEnabled())
+					logger.debug(value.toJson());
+				if (value.getStringValue() == null) {
 					logger.error("the assay folder rule is null");
-				} else if (!value.getStringValue().equalsIgnoreCase("")){
+				} else if (!value.getStringValue().equalsIgnoreCase("")) {
 					assayFolderRule = value.getStringValue();
 				}
 				logger.info(value.toJson());
@@ -691,25 +729,26 @@ public Collection<JSTreeNodeDTO> getExperimentNodes(Collection<String> codeValue
 			node.setText(new StringBuilder().append(protocolLabel).toString());
 
 			boolean firstFolder = true;
-			String[] assayFolderRules= assayFolderRule.split("/");
-			if (assayFolderRules.length > 1){
-				for (int i = 1; i < assayFolderRules.length; i++){
+			String[] assayFolderRules = assayFolderRule.split("/");
+			if (assayFolderRules.length > 1) {
+				for (int i = 1; i < assayFolderRules.length; i++) {
 					String assayFolder = getAssayFolderPath(assayFolderRules, i);
-					if (logger.isDebugEnabled()) logger.debug("assay folder: " + i + " " + assayFolder);	
+					if (logger.isDebugEnabled())
+						logger.debug("assay folder: " + i + " " + assayFolder);
 					JSTreeNodeDTO assayFolderNode = new JSTreeNodeDTO();
-					if (firstFolder){
+					if (firstFolder) {
 						assayFolderNode.setId(assayFolder);
 						assayFolderNode.setText(assayFolderRules[i]);
 						assayFolderNode.setDescription(assayFolderRules[i]);
 						assayFolderNode.setParent("#");
 						firstFolder = false;
-						node.setParent(getAssayFolderPath(assayFolderRules, assayFolderRules.length-1));
+						node.setParent(getAssayFolderPath(assayFolderRules, assayFolderRules.length - 1));
 					} else {
 						assayFolderNode.setId(assayFolder);
 						assayFolderNode.setText(assayFolderRules[i]);
 						assayFolderNode.setDescription(assayFolderRules[i]);
-						//						assayFolderNode.setParent(assayFolderRules[i-1]);
-						assayFolderNode.setParent(getAssayFolderPath(assayFolderRules, i-1));
+						// assayFolderNode.setParent(assayFolderRules[i-1]);
+						assayFolderNode.setParent(getAssayFolderPath(assayFolderRules, i - 1));
 
 					}
 					nodes.add(assayFolderNode);
@@ -721,8 +760,10 @@ public Collection<JSTreeNodeDTO> getExperimentNodes(Collection<String> codeValue
 			nodes.add(node);
 		}
 
-		if (logger.isDebugEnabled()) logger.debug("number of nodes made: " + nodes.size());
-		if (logger.isDebugEnabled()) logger.debug(JSTreeNodeDTO.toPrettyJsonArray(nodes));
+		if (logger.isDebugEnabled())
+			logger.debug("number of nodes made: " + nodes.size());
+		if (logger.isDebugEnabled())
+			logger.debug(JSTreeNodeDTO.toPrettyJsonArray(nodes));
 
 		return nodes;
 	}
@@ -731,46 +772,49 @@ private String getAssayFolderPath(String[] assayFolderRules, int numberOfRules)
 		StringBuilder sb = new StringBuilder();
 
 		int count = numberOfRules;
-		if (logger.isDebugEnabled()) logger.debug("the counter is : " + count);
-		for (int i = 0; i < count; i++){
+		if (logger.isDebugEnabled())
+			logger.debug("the counter is : " + count);
+		for (int i = 0; i < count; i++) {
 			sb.append("_");
-			sb.append(assayFolderRules[i+1]);
-			if (logger.isDebugEnabled()) logger.debug("building the assay folder: " + i + "  " + assayFolderRules[i+1]);
+			sb.append(assayFolderRules[i + 1]);
+			if (logger.isDebugEnabled())
+				logger.debug("building the assay folder: " + i + "  " + assayFolderRules[i + 1]);
 		}
 
 		return sb.toString();
 
 	}
 
-
 	@SuppressWarnings("unchecked")
 	@Override
-	public Collection<JSTreeNodeDTO> getExperimentNodesByProtocolTree(Collection<String> codeValues){
+	public Collection<JSTreeNodeDTO> getExperimentNodesByProtocolTree(Collection<String> codeValues) {
 		List<Experiment> experiments;
-		if (codeValues == null || codeValues.size() == 0){
+		if (codeValues == null || codeValues.size() == 0) {
 			experiments = Experiment.findAllExperiments();
 		} else {
 			experiments = Experiment.findExperimentsByBatchCodes(codeValues).getResultList();
 		}
 
-		if (logger.isDebugEnabled()) logger.debug("number of experiments found: " + experiments.size());
+		if (logger.isDebugEnabled())
+			logger.debug("number of experiments found: " + experiments.size());
 
 		Set<Protocol> protocols = new LinkedHashSet<Protocol>();
 		Set<JSTreeNodeDTO> nodes = new LinkedHashSet<JSTreeNodeDTO>();
-		for (Experiment exp : experiments){
+		for (Experiment exp : experiments) {
 			protocols.add(Protocol.findProtocol(exp.getProtocol().getId()));
 
 			String experimentLabel;
-			List<ExperimentLabel> experimentNames = ExperimentLabel.findExperimentPreferredName(exp.getId()).getResultList();
-			if (experimentNames.size() < 1){
+			List<ExperimentLabel> experimentNames = ExperimentLabel.findExperimentPreferredName(exp.getId())
+					.getResultList();
+			if (experimentNames.size() < 1) {
 				String errorMessage = "expected a single preferred experiment name. Found " + experimentNames.size();
 				logger.error(errorMessage);
-				//throw new RuntimeException(errorMessage);
+				// throw new RuntimeException(errorMessage);
 				experimentLabel = "NO PREFERRED EXPERIMENT NAME";
-			} else if (experimentNames.size() > 1){
+			} else if (experimentNames.size() > 1) {
 				String errorMessage = "expected a single preferred experiment name. Found " + experimentNames.size();
 				logger.error(errorMessage);
-				//				throw new RuntimeException(errorMessage);
+				// throw new RuntimeException(errorMessage);
 				experimentLabel = "MULTIPLE PREFERRED EXPERIMENT NAME";
 			} else {
 				experimentLabel = experimentNames.get(0).getLabelText();
@@ -786,15 +830,15 @@ public Collection<JSTreeNodeDTO> getExperimentNodesByProtocolTree(Collection<Str
 
 			StringBuilder allTagText = new StringBuilder();
 			boolean firstTag = true;
-			for (LsTag tag : exp.getLsTags()){
-				if (firstTag){
+			for (LsTag tag : exp.getLsTags()) {
+				if (firstTag) {
 					allTagText.append("Keywords: ").append(tag.getTagText());
 					firstTag = false;
 				} else {
 					allTagText.append("; ").append(tag.getTagText());
 				}
 			}
-			if (exp.getLsTags().size() > 0){
+			if (exp.getLsTags().size() > 0) {
 				JSTreeNodeDTO tagNode = new JSTreeNodeDTO();
 				tagNode.setId("tags_" + exp.getCodeName());
 				tagNode.setParent(exp.getCodeName());
@@ -811,39 +855,41 @@ public Collection<JSTreeNodeDTO> getExperimentNodesByProtocolTree(Collection<Str
 		rootNode.setDescription("Root Node for All Protocols");
 		nodes.add(rootNode);
 
-		if (logger.isDebugEnabled())  logger.debug("number of protocols found: " + protocols.size());
-		for (Protocol prot : protocols){
+		if (logger.isDebugEnabled())
+			logger.debug("number of protocols found: " + protocols.size());
+		for (Protocol prot : protocols) {
 
 			String protocolLabel;
 			List<ProtocolLabel> protocolNames = ProtocolLabel.findProtocolPreferredName(prot.getId()).getResultList();
-			if (protocolNames.size() < 1){
+			if (protocolNames.size() < 1) {
 				String errorMessage = "expected a single preferred protocol name. Found " + protocolNames.size();
 				logger.error(errorMessage);
-				//throw new RuntimeException(errorMessage);
+				// throw new RuntimeException(errorMessage);
 				protocolLabel = "NO PREFERRED EXPERIMENT NAME";
-			} else if (protocolNames.size() > 1){
+			} else if (protocolNames.size() > 1) {
 				String errorMessage = "expected a single preferred protocol name. Found " + protocolNames.size();
 				logger.error(errorMessage);
-				//				throw new RuntimeException(errorMessage);
+				// throw new RuntimeException(errorMessage);
 				protocolLabel = "MULTIPLE PREFERRED PROTOCOL NAME";
 			} else {
 				protocolLabel = protocolNames.get(0).getLabelText();
 			}
 
-			if (ItxProtocolProtocol.findItxProtocolProtocolsBySecondProtocol(prot).getResultList().size() > 0){
+			if (ItxProtocolProtocol.findItxProtocolProtocolsBySecondProtocol(prot).getResultList().size() > 0) {
 				List<String> protocolNodeList = new ArrayList<String>();
 				List<String> nodeNameList = lookupProtocolTree(prot, protocolNodeList);
 				int nodeIndex = 0;
-				for (String nodeName : nodeNameList){
-					if (logger.isDebugEnabled())  logger.debug("here is the nodeName: " + nodeName + "  index:" + nodeIndex );
-					nodeIndex++; //incrementing to the next
+				for (String nodeName : nodeNameList) {
+					if (logger.isDebugEnabled())
+						logger.debug("here is the nodeName: " + nodeName + "  index:" + nodeIndex);
+					nodeIndex++; // incrementing to the next
 
 					JSTreeNodeDTO protocolNode = new JSTreeNodeDTO();
 					protocolNode.setId(nodeName);
 					protocolNode.setDescription(prot.getShortDescription());
 					protocolNode.setLsTags(prot.getLsTags());
 					protocolNode.setText(new StringBuilder().append(protocolLabel).toString());
-					if (nodeIndex < nodeNameList.size()){
+					if (nodeIndex < nodeNameList.size()) {
 						protocolNode.setParent(nodeNameList.get(nodeIndex));
 					} else {
 						protocolNode.setParent("Root Node");
@@ -852,7 +898,8 @@ public Collection<JSTreeNodeDTO> getExperimentNodesByProtocolTree(Collection<Str
 					nodes.add(protocolNode);
 				}
 			} else {
-				if (logger.isDebugEnabled())  logger.debug("this protocol is not attached by a protocol tree. set to default node");
+				if (logger.isDebugEnabled())
+					logger.debug("this protocol is not attached by a protocol tree. set to default node");
 				JSTreeNodeDTO protocolNode = new JSTreeNodeDTO();
 				protocolNode.setId(prot.getCodeName());
 				protocolNode.setDescription(prot.getShortDescription());
@@ -863,39 +910,39 @@ public Collection<JSTreeNodeDTO> getExperimentNodesByProtocolTree(Collection<Str
 
 			}
 
-
-			//			JSTreeNodeDTO node = new JSTreeNodeDTO();
-			//			node.setId(prot.getCodeName());
-			//			node.setDescription(prot.getShortDescription());
-			//			node.setParent(prot.getLsKind());
-			//			node.setLsTags(prot.getLsTags());
-			//			node.setText(new StringBuilder().append(protocolLabel).toString());
+			// JSTreeNodeDTO node = new JSTreeNodeDTO();
+			// node.setId(prot.getCodeName());
+			// node.setDescription(prot.getShortDescription());
+			// node.setParent(prot.getLsKind());
+			// node.setLsTags(prot.getLsTags());
+			// node.setText(new StringBuilder().append(protocolLabel).toString());
 
 			//
-			//			JSTreeNodeDTO protocolKindNode = new JSTreeNodeDTO();
-			//			protocolKindNode.setId(prot.getLsKind());
-			//			protocolKindNode.setParent("Root Node");
-			//			protocolKindNode.setText(prot.getLsKind());
-			//			protocolKindNode.setDescription("Protocol Kind");
-			//			nodes.add(protocolKindNode);
+			// JSTreeNodeDTO protocolKindNode = new JSTreeNodeDTO();
+			// protocolKindNode.setId(prot.getLsKind());
+			// protocolKindNode.setParent("Root Node");
+			// protocolKindNode.setText(prot.getLsKind());
+			// protocolKindNode.setDescription("Protocol Kind");
+			// nodes.add(protocolKindNode);
 		}
 
-		if (logger.isDebugEnabled())  logger.debug("number of nodes made: " + nodes.size());
-		if (logger.isDebugEnabled())  logger.debug(JSTreeNodeDTO.toPrettyJsonArray(nodes));
+		if (logger.isDebugEnabled())
+			logger.debug("number of nodes made: " + nodes.size());
+		if (logger.isDebugEnabled())
+			logger.debug(JSTreeNodeDTO.toPrettyJsonArray(nodes));
 
 		return nodes;
 	}
 
-
-
-	//a recursive function to walk up the protocol tree
+	// a recursive function to walk up the protocol tree
 	private List<String> lookupProtocolTree(Protocol protocol, List<String> protocolNodeList) {
-		List<ItxProtocolProtocol> ipps = ItxProtocolProtocol.findItxProtocolProtocolsBySecondProtocol(protocol).getResultList();
-		if (ipps.size() > 1){
+		List<ItxProtocolProtocol> ipps = ItxProtocolProtocol.findItxProtocolProtocolsBySecondProtocol(protocol)
+				.getResultList();
+		if (ipps.size() > 1) {
 			logger.error("ERROR: there is more than a single protocol interacation. " + ipps.size());
 		}
-		for (ItxProtocolProtocol ipp : ipps){
-			if (ipp.getFirstProtocol().getLsType().equalsIgnoreCase("protocolTree")){
+		for (ItxProtocolProtocol ipp : ipps) {
+			if (ipp.getFirstProtocol().getLsType().equalsIgnoreCase("protocolTree")) {
 				protocolNodeList.add(ipp.getFirstProtocol().getLsKind());
 				lookupProtocolTree(ipp.getFirstProtocol(), protocolNodeList);
 			}
@@ -905,16 +952,18 @@ private List<String> lookupProtocolTree(Protocol protocol, List<String> protocol
 
 	@SuppressWarnings({ "unchecked", "null" })
 	@Override
-	public List<AnalysisGroupValueDTO> getFilteredAGData(ExperimentSearchRequestDTO searchRequest, Boolean onlyPublicData){
-		//DataViewer route to get analysis group data (results) based on filter parameters
+	public List<AnalysisGroupValueDTO> getFilteredAGData(ExperimentSearchRequestDTO searchRequest,
+			Boolean onlyPublicData) {
+		// DataViewer route to get analysis group data (results) based on filter
+		// parameters
 		searchRequest.getBatchCodeList().removeAll(Collections.singleton(null));
 		searchRequest.getExperimentCodeList().removeAll(Collections.singleton(null));
 
-
 		Set<String> uniqueBatchCodes = new HashSet<String>();
-		if (searchRequest.getBatchCodeList() != null && searchRequest.getBatchCodeList().size() > 0 ){
+		if (searchRequest.getBatchCodeList() != null && searchRequest.getBatchCodeList().size() > 0) {
 			uniqueBatchCodes.addAll(searchRequest.getBatchCodeList());
-			if (logger.isDebugEnabled())  logger.debug("size of uniqueBatchCodes: " + uniqueBatchCodes.size());
+			if (logger.isDebugEnabled())
+				logger.debug("size of uniqueBatchCodes: " + uniqueBatchCodes.size());
 		}
 
 		List<String> batchCodes = null;
@@ -922,76 +971,104 @@ public List<AnalysisGroupValueDTO> getFilteredAGData(ExperimentSearchRequestDTO
 
 		boolean filteredGeneData = false;
 
-		if (searchRequest.getBooleanFilter() != null && searchRequest.getBooleanFilter().equalsIgnoreCase("ADVANCED")){
-			//DO SQL substitutions for now. Try to do something more elegant later
-			collectionOfCodes = AnalysisGroupValue.findBatchCodeBySearchFilter(searchRequest.getAdvancedFilterSQL()).getResultList();
-			if (uniqueBatchCodes.size() > 0){
-				collectionOfCodes = CollectionUtils.intersection(collectionOfCodes, uniqueBatchCodes);				
+		if (searchRequest.getBooleanFilter() != null && searchRequest.getBooleanFilter().equalsIgnoreCase("ADVANCED")) {
+			// DO SQL substitutions for now. Try to do something more elegant later
+			collectionOfCodes = AnalysisGroupValue.findBatchCodeBySearchFilter(searchRequest.getAdvancedFilterSQL())
+					.getResultList();
+			if (uniqueBatchCodes.size() > 0) {
+				collectionOfCodes = CollectionUtils.intersection(collectionOfCodes, uniqueBatchCodes);
 			}
 			collectionOfCodes.removeAll(Collections.singleton(null));
 			filteredGeneData = true;
-		} else if (searchRequest.getBooleanFilter() != null && searchRequest.getSearchFilters() != null && searchRequest.getSearchFilters().size() > 0){
+		} else if (searchRequest.getBooleanFilter() != null && searchRequest.getSearchFilters() != null
+				&& searchRequest.getSearchFilters().size() > 0) {
 			filteredGeneData = true;
-			boolean firstPass = true;		
-			for (ExperimentFilterSearchDTO singleSearchFilter : searchRequest.getSearchFilters()){
-				if (firstPass){
-					collectionOfCodes = AnalysisGroupValue.findBatchCodeBySearchFilter(searchRequest.getBatchCodeList(), searchRequest.getExperimentCodeList(), singleSearchFilter, onlyPublicData).getResultList();
-					if (logger.isDebugEnabled())  logger.debug("size of firstBatchCodes: " + collectionOfCodes.size());
+			boolean firstPass = true;
+			for (ExperimentFilterSearchDTO singleSearchFilter : searchRequest.getSearchFilters()) {
+				if (firstPass) {
+					collectionOfCodes = AnalysisGroupValue
+							.findBatchCodeBySearchFilter(searchRequest.getBatchCodeList(),
+									searchRequest.getExperimentCodeList(), singleSearchFilter, onlyPublicData)
+							.getResultList();
+					if (logger.isDebugEnabled())
+						logger.debug("size of firstBatchCodes: " + collectionOfCodes.size());
 					firstPass = false;
 				} else {
-					batchCodes = AnalysisGroupValue.findBatchCodeBySearchFilter(searchRequest.getBatchCodeList(), searchRequest.getExperimentCodeList(), singleSearchFilter, onlyPublicData).getResultList();
-					if (logger.isDebugEnabled())  logger.debug("size of firstBatchCodes: " + collectionOfCodes.size());
-					if (logger.isDebugEnabled())  logger.debug("size of secondBatchCodes: " + batchCodes.size());
-					if (searchRequest.getBooleanFilter().equalsIgnoreCase("AND")){
+					batchCodes = AnalysisGroupValue
+							.findBatchCodeBySearchFilter(searchRequest.getBatchCodeList(),
+									searchRequest.getExperimentCodeList(), singleSearchFilter, onlyPublicData)
+							.getResultList();
+					if (logger.isDebugEnabled())
+						logger.debug("size of firstBatchCodes: " + collectionOfCodes.size());
+					if (logger.isDebugEnabled())
+						logger.debug("size of secondBatchCodes: " + batchCodes.size());
+					if (searchRequest.getBooleanFilter().equalsIgnoreCase("AND")) {
 						collectionOfCodes = CollectionUtils.intersection(collectionOfCodes, batchCodes);
 					} else {
 						collectionOfCodes = CollectionUtils.union(collectionOfCodes, batchCodes);
 					}
-					if (logger.isDebugEnabled())  logger.debug("size of intersectCodes: " + collectionOfCodes.size());
+					if (logger.isDebugEnabled())
+						logger.debug("size of intersectCodes: " + collectionOfCodes.size());
 				}
 			}
 		} else if (uniqueBatchCodes.size() > 0) {
-          	collectionOfCodes = uniqueBatchCodes;
-        }else {
 			collectionOfCodes = uniqueBatchCodes;
-			logger.debug("Searching for Compound Batch Codes using experiment codes: "+searchRequest.getExperimentCodeList());
+		} else {
+			collectionOfCodes = uniqueBatchCodes;
+			logger.debug("Searching for Compound Batch Codes using experiment codes: "
+					+ searchRequest.getExperimentCodeList());
 			collectionOfCodes.addAll(findCompoundBatchCodes(searchRequest.getExperimentCodeList()));
-			logger.debug("Found: "+collectionOfCodes.toString());
+			logger.debug("Found: " + collectionOfCodes.toString());
 		}
 		logger.debug("collected these batch codes:" + collectionOfCodes.toString());
 		Set<String> finalUniqueBatchCodes = new HashSet<String>();
 
-		if (collectionOfCodes != null){
-			if (logger.isDebugEnabled())  logger.debug("size of all intersectCodes: " + collectionOfCodes.size());
+		if (collectionOfCodes != null) {
+			if (logger.isDebugEnabled())
+				logger.debug("size of all intersectCodes: " + collectionOfCodes.size());
 			finalUniqueBatchCodes.addAll(collectionOfCodes);
-			if (logger.isDebugEnabled())  logger.debug("number of unique batchCodes found: " + finalUniqueBatchCodes.size());
+			if (logger.isDebugEnabled())
+				logger.debug("number of unique batchCodes found: " + finalUniqueBatchCodes.size());
 		}
 
 		finalUniqueBatchCodes.removeAll(Collections.singleton(null));
 
-
-
 		List<AnalysisGroupValueDTO> agValues = null;
-		if (finalUniqueBatchCodes.size() > 0){
-			if (logger.isDebugEnabled())  logger.debug("looking by expriment codes and batch codes");
-			if (onlyPublicData) agValues = AnalysisGroupValue.findAnalysisGroupValueDTO(finalUniqueBatchCodes, searchRequest.getExperimentCodeList(), onlyPublicData);
-			else agValues = AnalysisGroupValue.findAnalysisGroupValueDTO(finalUniqueBatchCodes, searchRequest.getExperimentCodeList()).getResultList();
-			if (logger.isDebugEnabled())  logger.debug("number of agValues found: " + agValues.size());
+		if (finalUniqueBatchCodes.size() > 0) {
+			if (logger.isDebugEnabled())
+				logger.debug("looking by expriment codes and batch codes");
+			if (onlyPublicData)
+				agValues = AnalysisGroupValue.findAnalysisGroupValueDTO(finalUniqueBatchCodes,
+						searchRequest.getExperimentCodeList(), onlyPublicData);
+			else
+				agValues = AnalysisGroupValue
+						.findAnalysisGroupValueDTO(finalUniqueBatchCodes, searchRequest.getExperimentCodeList())
+						.getResultList();
+			if (logger.isDebugEnabled())
+				logger.debug("number of agValues found: " + agValues.size());
 		} else if (!filteredGeneData && finalUniqueBatchCodes.size() == 0) {
-			if (logger.isDebugEnabled())  logger.debug("looking by expriment codes only");
-			if (onlyPublicData) agValues = AnalysisGroupValue.findAnalysisGroupValueDTOByExperiments(searchRequest.getExperimentCodeList(), onlyPublicData).getResultList();
-			else agValues = AnalysisGroupValue.findAnalysisGroupValueDTOByExperiments(searchRequest.getExperimentCodeList()).getResultList();
-			if (logger.isDebugEnabled())  logger.debug("number of agValues found: " + agValues.size());
-		} else if (filteredGeneData && finalUniqueBatchCodes.size() == 0){
-			if (logger.isDebugEnabled())  logger.debug("no results found with the search filters");
+			if (logger.isDebugEnabled())
+				logger.debug("looking by expriment codes only");
+			if (onlyPublicData)
+				agValues = AnalysisGroupValue
+						.findAnalysisGroupValueDTOByExperiments(searchRequest.getExperimentCodeList(), onlyPublicData)
+						.getResultList();
+			else
+				agValues = AnalysisGroupValue
+						.findAnalysisGroupValueDTOByExperiments(searchRequest.getExperimentCodeList()).getResultList();
+			if (logger.isDebugEnabled())
+				logger.debug("number of agValues found: " + agValues.size());
+		} else if (filteredGeneData && finalUniqueBatchCodes.size() == 0) {
+			if (logger.isDebugEnabled())
+				logger.debug("no results found with the search filters");
 			agValues = new ArrayList<AnalysisGroupValueDTO>();
 		}
 
 		return agValues;
 
 	}
-	
-	private Collection<String> findCompoundBatchCodes(Collection<String> experimentCodes){
+
+	private Collection<String> findCompoundBatchCodes(Collection<String> experimentCodes) {
 		EntityManager em = AnalysisGroupValue.entityManager();
 		String sql = "SELECT agv.codeValue FROM AnalysisGroupValue agv "
 				+ "JOIN agv.lsState as ags "
@@ -1003,95 +1080,102 @@ private Collection<String> findCompoundBatchCodes(Collection<String> experimentC
 		TypedQuery<String> q = em.createQuery(sql, String.class);
 		q.setParameter("experimentCodes", experimentCodes);
 		Collection<String> results = q.getResultList();
-		logger.debug("results are"+results.toString());
+		logger.debug("results are" + results.toString());
 		return results;
 	}
-	
+
 	@Override
-	public Collection<Experiment> findExperimentsByGenericMetaDataSearch(String queryString, String userName) throws TooManyResultsException {
+	public Collection<Experiment> findExperimentsByGenericMetaDataSearch(String queryString, String userName)
+			throws TooManyResultsException {
 		Collection<Experiment> rawResults = findExperimentsByGenericMetaDataSearch(queryString);
-		if (propertiesUtilService.getRestrictExperiments()){
+		if (propertiesUtilService.getRestrictExperiments()) {
 			Collection<LsThing> projects = authorService.getUserProjects(userName);
 			List<String> allowedProjectCodeNames = new ArrayList<String>();
 			allowedProjectCodeNames.add("unassigned");
-			for (LsThing project : projects){
+			for (LsThing project : projects) {
 				allowedProjectCodeNames.add(project.getCodeName());
 			}
 			Collection<Experiment> results = new HashSet<Experiment>();
-			for (Experiment rawResult : rawResults){
+			for (Experiment rawResult : rawResults) {
 				String experimentProject = null;
-				for (ExperimentState state : rawResult.getLsStates()){
-					for (ExperimentValue value : state.getLsValues()){
-						if (value.getLsKind().equals("project")){
+				for (ExperimentState state : rawResult.getLsStates()) {
+					for (ExperimentValue value : state.getLsValues()) {
+						if (value.getLsKind().equals("project")) {
 							experimentProject = value.getCodeValue();
 							break;
 						}
 					}
 				}
-				if (allowedProjectCodeNames.contains(experimentProject)){
+				if (allowedProjectCodeNames.contains(experimentProject)) {
 					results.add(rawResult);
 				}
 			}
 			return results;
-		}else{
+		} else {
 			return rawResults;
 		}
-		
+
 	}
 
 	@Override
-	public Collection<Experiment> findExperimentsByGenericMetaDataSearch(String queryString, List<String> projects) throws TooManyResultsException {
+	public Collection<Experiment> findExperimentsByGenericMetaDataSearch(String queryString, List<String> projects)
+			throws TooManyResultsException {
 		Collection<Experiment> rawResults = findExperimentsByGenericMetaDataSearch(queryString);
-		if (propertiesUtilService.getRestrictExperiments()){
+		if (propertiesUtilService.getRestrictExperiments()) {
 			projects.add("unassigned");
 			Collection<Experiment> results = new HashSet<Experiment>();
-			for (Experiment rawResult : rawResults){
+			for (Experiment rawResult : rawResults) {
 				String experimentProject = null;
-				for (ExperimentState state : rawResult.getLsStates()){
-					if(!state.isIgnored() && !state.isDeleted()) {
+				for (ExperimentState state : rawResult.getLsStates()) {
+					if (!state.isIgnored() && !state.isDeleted()) {
 						for (ExperimentValue value : state.getLsValues()) {
-							if (value.getLsKind().equals("project") && !value.getDeleted() && !value.getIgnored()){
+							if (value.getLsKind().equals("project") && !value.getDeleted() && !value.getIgnored()) {
 								experimentProject = value.getCodeValue();
 								break;
 							}
 						}
 					}
 				}
-				if (projects.contains(experimentProject)){
+				if (projects.contains(experimentProject)) {
 					results.add(rawResult);
 				}
 			}
 			return results;
-		}else{
+		} else {
 			return rawResults;
 		}
 	}
 
-	public Collection<Experiment> findExperimentsByGenericMetaDataSearch(String queryString) throws TooManyResultsException {
-		//make our HashSets: experimentIdList will be filled/cleared/refilled for each term
-		//experimentList is the final search result
+	public Collection<Experiment> findExperimentsByGenericMetaDataSearch(String queryString)
+			throws TooManyResultsException {
+		// make our HashSets: experimentIdList will be filled/cleared/refilled for each
+		// term
+		// experimentList is the final search result
 		HashSet<Long> experimentIdList = new HashSet<Long>();
 		HashSet<Long> experimentAllIdList = new HashSet<Long>();
 		Collection<Experiment> experimentList = new HashSet<Experiment>();
-		//Split the query up on spaces
+		// Split the query up on spaces
 		List<String> splitQuery = SimpleUtil.splitSearchString(queryString);
-		if (logger.isDebugEnabled())  logger.debug("Number of search terms: " + splitQuery.size());
-		//Protection from searching * in a database with too many experiments:
-		if (splitQuery.contains("*")){
+		if (logger.isDebugEnabled())
+			logger.debug("Number of search terms: " + splitQuery.size());
+		// Protection from searching * in a database with too many experiments:
+		if (splitQuery.contains("*")) {
 			logger.warn("Query for '*' detected. Determining if number of results is too many.");
 			int experimentCount = (int) Experiment.countExperiments();
-			if (logger.isDebugEnabled())  logger.debug("Found "+experimentCount +" experiments.");
-			if (experimentCount > 1000){
-				throw new TooManyResultsException("Too many experiments will be returned with the query: "+"*");
+			if (logger.isDebugEnabled())
+				logger.debug("Found " + experimentCount + " experiments.");
+			if (experimentCount > 1000) {
+				throw new TooManyResultsException("Too many experiments will be returned with the query: " + "*");
 			}
 		}
-		//Make the Map of terms and HashSets of experiment id's then fill. We will run intersect logic later.
+		// Make the Map of terms and HashSets of experiment id's then fill. We will run
+		// intersect logic later.
 		Map<String, HashSet<Long>> resultsByTerm = new HashMap<String, HashSet<Long>>();
 		for (String term : splitQuery) {
 			experimentIdList.addAll(findExperimentIdsByMetadata(term, "CODENAME"));
 			experimentIdList.addAll(findExperimentIdsByMetadata(term, "NAME"));
 			experimentIdList.addAll(findExperimentIdsByMetadata(term, "SCIENTIST"));
-//			experimentIdList.addAll(findExperimentIdsByMetadata(term, "RECORDEDBY"));
+			// experimentIdList.addAll(findExperimentIdsByMetadata(term, "RECORDEDBY"));
 			experimentIdList.addAll(findExperimentIdsByMetadata(term, "KIND"));
 			experimentIdList.addAll(findExperimentIdsByMetadata(term, "STATUS"));
 			experimentIdList.addAll(findExperimentIdsByMetadata(term, "ANALYSIS STATUS"));
@@ -1114,17 +1198,20 @@ public Collection<Experiment> findExperimentsByGenericMetaDataSearch(String quer
 			experimentAllIdList.addAll(experimentIdList);
 			experimentIdList.clear();
 		}
-		//Here is the intersect logic
-		for (String term: splitQuery) {
+		// Here is the intersect logic
+		for (String term : splitQuery) {
 			experimentAllIdList.retainAll(resultsByTerm.get(term));
 		}
-		for (Long id: experimentAllIdList) experimentList.add(Experiment.findExperiment(id));
+		for (Long id : experimentAllIdList)
+			experimentList.add(Experiment.findExperiment(id));
 
-		//This method uses finders that will find everything, whether or not it is ignored or deleted
+		// This method uses finders that will find everything, whether or not it is
+		// ignored or deleted
 		Collection<Experiment> result = new HashSet<Experiment>();
-		for (Experiment experiment: experimentList) {
-			//For Experiment Browser, we want to see soft deleted (ignored=true, deleted=false), but not hard deleted (ignored=deleted=true)
-			if (experiment.isDeleted()){
+		for (Experiment experiment : experimentList) {
+			// For Experiment Browser, we want to see soft deleted (ignored=true,
+			// deleted=false), but not hard deleted (ignored=deleted=true)
+			if (experiment.isDeleted()) {
 				logger.debug("removing a deleted experiment from the results");
 			} else {
 				result.add(experiment);
@@ -1137,8 +1224,8 @@ private Collection<Long> findExperimentIdsByMetadata(String queryString, String
 		Collection<Long> experimentIdList = new HashSet<Long>();
 		if (searchBy == "CODENAME") {
 			List<Experiment> experiments = Experiment.findExperimentsByCodeNameLike(queryString).getResultList();
-			if (!experiments.isEmpty()){
-				for (Experiment experiment:experiments) {
+			if (!experiments.isEmpty()) {
+				for (Experiment experiment : experiments) {
 					experimentIdList.add(experiment.getId());
 				}
 			}
@@ -1146,8 +1233,8 @@ private Collection<Long> findExperimentIdsByMetadata(String queryString, String
 		}
 		if (searchBy == "TYPE") {
 			List<Experiment> experiments = Experiment.findExperimentsByLsTypeLike(queryString).getResultList();
-			if (!experiments.isEmpty()){
-				for (Experiment experiment:experiments) {
+			if (!experiments.isEmpty()) {
+				for (Experiment experiment : experiments) {
 					experimentIdList.add(experiment.getId());
 				}
 			}
@@ -1155,17 +1242,18 @@ private Collection<Long> findExperimentIdsByMetadata(String queryString, String
 		}
 		if (searchBy == "KIND") {
 			List<Experiment> experiments = Experiment.findExperimentsByLsKindLike(queryString).getResultList();
-			if (!experiments.isEmpty()){
-				for (Experiment experiment:experiments) {
+			if (!experiments.isEmpty()) {
+				for (Experiment experiment : experiments) {
 					experimentIdList.add(experiment.getId());
 				}
 			}
 			experiments.clear();
 		}
 		if (searchBy == "NAME") {
-			List<ExperimentLabel> experimentLabels = ExperimentLabel.findExperimentLabelsByLabelTextLike(queryString).getResultList();
+			List<ExperimentLabel> experimentLabels = ExperimentLabel.findExperimentLabelsByLabelTextLike(queryString)
+					.getResultList();
 			if (!experimentLabels.isEmpty()) {
-				for (ExperimentLabel experimentLabel: experimentLabels) {
+				for (ExperimentLabel experimentLabel : experimentLabels) {
 					experimentIdList.add(experimentLabel.getExperiment().getId());
 				}
 			}
@@ -1173,8 +1261,9 @@ private Collection<Long> findExperimentIdsByMetadata(String queryString, String
 		}
 
 		if (searchBy == "SCIENTIST") {
-			Collection<ExperimentValue> experimentValues = ExperimentValue.findExperimentValuesByLsKindEqualsAndCodeValueLike("scientist", queryString).getResultList();
-			if (!experimentValues.isEmpty()){
+			Collection<ExperimentValue> experimentValues = ExperimentValue
+					.findExperimentValuesByLsKindEqualsAndCodeValueLike("scientist", queryString).getResultList();
+			if (!experimentValues.isEmpty()) {
 				for (ExperimentValue experimentValue : experimentValues) {
 					experimentIdList.add(experimentValue.getLsState().getExperiment().getId());
 				}
@@ -1183,27 +1272,32 @@ private Collection<Long> findExperimentIdsByMetadata(String queryString, String
 		}
 		if (searchBy == "RECORDEDBY") {
 			List<Experiment> experiments = Experiment.findExperimentsByRecordedByLike(queryString).getResultList();
-			if (!experiments.isEmpty()){
-				for (Experiment experiment:experiments) {
+			if (!experiments.isEmpty()) {
+				for (Experiment experiment : experiments) {
 					experimentIdList.add(experiment.getId());
 				}
 			}
 			experiments.clear();
 		}
 		if (searchBy == "STATUS") {
-			Collection<ExperimentValue> experimentValues = ExperimentValue.findExperimentValuesByLsKindEqualsAndCodeValueLike("experiment status", queryString).getResultList();
-			if (!experimentValues.isEmpty()){
+			Collection<ExperimentValue> experimentValues = ExperimentValue
+					.findExperimentValuesByLsKindEqualsAndCodeValueLike("experiment status", queryString)
+					.getResultList();
+			if (!experimentValues.isEmpty()) {
 				for (ExperimentValue experimentValue : experimentValues) {
-					if (!experimentValue.isIgnored()) experimentIdList.add(experimentValue.getLsState().getExperiment().getId());
+					if (!experimentValue.isIgnored())
+						experimentIdList.add(experimentValue.getLsState().getExperiment().getId());
 				}
 			}
 			experimentValues.clear();
 		}
 		if (searchBy == "ANALYSIS STATUS") {
-			Collection<ExperimentValue> experimentValues = ExperimentValue.findExperimentValuesByLsKindEqualsAndCodeValueLike("analysis status", queryString).getResultList();
-			if (!experimentValues.isEmpty()){
+			Collection<ExperimentValue> experimentValues = ExperimentValue
+					.findExperimentValuesByLsKindEqualsAndCodeValueLike("analysis status", queryString).getResultList();
+			if (!experimentValues.isEmpty()) {
 				for (ExperimentValue experimentValue : experimentValues) {
-					if (!experimentValue.isIgnored()) experimentIdList.add(experimentValue.getLsState().getExperiment().getId());
+					if (!experimentValue.isIgnored())
+						experimentIdList.add(experimentValue.getLsState().getExperiment().getId());
 				}
 			}
 			experimentValues.clear();
@@ -1212,12 +1306,12 @@ private Collection<Long> findExperimentIdsByMetadata(String queryString, String
 			Collection<Long> protocolIds = protocolService.findProtocolIdsByMetadata(queryString, "KIND");
 			Set<Experiment> experiments = new HashSet<Experiment>();
 			if (!protocolIds.isEmpty()) {
-				for (Long id: protocolIds) {
+				for (Long id : protocolIds) {
 					experiments.addAll(Experiment.findExperimentsByProtocol(Protocol.findProtocol(id)).getResultList());
 				}
 			}
-			if (!experiments.isEmpty()){
-				for (Experiment experiment: experiments) {
+			if (!experiments.isEmpty()) {
+				for (Experiment experiment : experiments) {
 					experimentIdList.add(experiment.getId());
 				}
 			}
@@ -1227,12 +1321,12 @@ private Collection<Long> findExperimentIdsByMetadata(String queryString, String
 			Collection<Long> protocolIds = protocolService.findProtocolIdsByMetadata(queryString, "NAME");
 			Set<Experiment> experiments = new HashSet<Experiment>();
 			if (!protocolIds.isEmpty()) {
-				for (Long id: protocolIds) {
+				for (Long id : protocolIds) {
 					experiments.addAll(Experiment.findExperimentsByProtocol(Protocol.findProtocol(id)).getResultList());
 				}
 			}
-			if (!experiments.isEmpty()){
-				for (Experiment experiment: experiments) {
+			if (!experiments.isEmpty()) {
+				for (Experiment experiment : experiments) {
 					experimentIdList.add(experiment.getId());
 				}
 			}
@@ -1242,12 +1336,12 @@ private Collection<Long> findExperimentIdsByMetadata(String queryString, String
 			Collection<Long> protocolIds = protocolService.findProtocolIdsByMetadata(queryString, "TYPE");
 			Set<Experiment> experiments = new HashSet<Experiment>();
 			if (!protocolIds.isEmpty()) {
-				for (Long id: protocolIds) {
+				for (Long id : protocolIds) {
 					experiments.addAll(Experiment.findExperimentsByProtocol(Protocol.findProtocol(id)).getResultList());
 				}
 			}
-			if (!experiments.isEmpty()){
-				for (Experiment experiment: experiments) {
+			if (!experiments.isEmpty()) {
+				for (Experiment experiment : experiments) {
 					experimentIdList.add(experiment.getId());
 				}
 			}
@@ -1257,12 +1351,12 @@ private Collection<Long> findExperimentIdsByMetadata(String queryString, String
 			Collection<Long> protocolIds = protocolService.findProtocolIdsByMetadata(queryString, "CODENAME");
 			Set<Experiment> experiments = new HashSet<Experiment>();
 			if (!protocolIds.isEmpty()) {
-				for (Long id: protocolIds) {
+				for (Long id : protocolIds) {
 					experiments.addAll(Experiment.findExperimentsByProtocol(Protocol.findProtocol(id)).getResultList());
 				}
 			}
-			if (!experiments.isEmpty()){
-				for (Experiment experiment: experiments) {
+			if (!experiments.isEmpty()) {
+				for (Experiment experiment : experiments) {
 					experimentIdList.add(experiment.getId());
 				}
 			}
@@ -1274,13 +1368,16 @@ private Collection<Long> findExperimentIdsByMetadata(String queryString, String
 			DateFormat df2 = new SimpleDateFormat("MM-dd-yyyy", Locale.ENGLISH);
 			try {
 				Date date = df.parse(queryString);
-				experimentValues = ExperimentValue.findExperimentValuesByLsKindEqualsAndDateValueLike("completion date", date).getResultList();
+				experimentValues = ExperimentValue
+						.findExperimentValuesByLsKindEqualsAndDateValueLike("completion date", date).getResultList();
 			} catch (Exception e) {
 				try {
 					Date date = df2.parse(queryString);
-					experimentValues = ExperimentValue.findExperimentValuesByLsKindEqualsAndDateValueLike("completion date", date).getResultList();
+					experimentValues = ExperimentValue
+							.findExperimentValuesByLsKindEqualsAndDateValueLike("completion date", date)
+							.getResultList();
 				} catch (Exception e2) {
-					//do nothing
+					// do nothing
 				}
 			}
 			if (!experimentValues.isEmpty()) {
@@ -1291,7 +1388,8 @@ private Collection<Long> findExperimentIdsByMetadata(String queryString, String
 			experimentValues.clear();
 		}
 		if (searchBy == "NOTEBOOK") {
-			Collection<ExperimentValue> experimentValues = ExperimentValue.findExperimentValuesByLsKindEqualsAndStringValueLike("notebook", queryString).getResultList();
+			Collection<ExperimentValue> experimentValues = ExperimentValue
+					.findExperimentValuesByLsKindEqualsAndStringValueLike("notebook", queryString).getResultList();
 			if (!experimentValues.isEmpty()) {
 				for (ExperimentValue experimentValue : experimentValues) {
 					experimentIdList.add(experimentValue.getLsState().getExperiment().getId());
@@ -1302,10 +1400,10 @@ private Collection<Long> findExperimentIdsByMetadata(String queryString, String
 		if (searchBy == "KEYWORD") {
 			Collection<LsTag> tags = LsTag.findLsTagsByTagTextLike(queryString).getResultList();
 			if (!tags.isEmpty()) {
-				for (LsTag tag: tags) {
+				for (LsTag tag : tags) {
 					Collection<Experiment> experiments = tag.getExperiments();
 					if (!experiments.isEmpty()) {
-						for (Experiment experiment:experiments) {
+						for (Experiment experiment : experiments) {
 							experimentIdList.add(experiment.getId());
 						}
 					}
@@ -1314,12 +1412,17 @@ private Collection<Long> findExperimentIdsByMetadata(String queryString, String
 			}
 			tags.clear();
 		}
-		if (searchBy == "ASSAY ACTIVITY" || searchBy == "MOLECULAR TARGET" || searchBy == "ASSAY TYPE" || searchBy == "ASSAY TECHNOLOGY" || searchBy == "CELL LINE" || searchBy == "TARGET ORIGIN" || searchBy == "ASSAY STAGE") {
+		if (searchBy == "ASSAY ACTIVITY" || searchBy == "MOLECULAR TARGET" || searchBy == "ASSAY TYPE"
+				|| searchBy == "ASSAY TECHNOLOGY" || searchBy == "CELL LINE" || searchBy == "TARGET ORIGIN"
+				|| searchBy == "ASSAY STAGE") {
 			Collection<DDictValue> ddictValues = DDictValue.findDDictValuesByLabelTextLike(queryString).getResultList();
 			if (!ddictValues.isEmpty()) {
 				for (DDictValue ddictvalue : ddictValues) {
 					if (ddictvalue.getShortName() != null) {
-						Collection<ExperimentValue> experimentValues = ExperimentValue.findExperimentValuesByLsKindEqualsAndCodeValueLike(searchBy.toLowerCase(), ddictvalue.getShortName()).getResultList();
+						Collection<ExperimentValue> experimentValues = ExperimentValue
+								.findExperimentValuesByLsKindEqualsAndCodeValueLike(searchBy.toLowerCase(),
+										ddictvalue.getShortName())
+								.getResultList();
 						if (!experimentValues.isEmpty()) {
 							for (ExperimentValue experimentValue : experimentValues) {
 								experimentIdList.add(experimentValue.getLsState().getExperiment().getId());
@@ -1334,14 +1437,13 @@ private Collection<Long> findExperimentIdsByMetadata(String queryString, String
 		return experimentIdList;
 	}
 
-
 	@Override
 	public Collection<Experiment> findExperimentsByMetadataJson(String json) {
 		Collection<Experiment> experimentList = new HashSet<Experiment>();
 		Collection<StringCollectionDTO> metaDataList = StringCollectionDTO.fromJsonArrayToStringCollectioes(json);
-		for (StringCollectionDTO metaData : metaDataList){
+		for (StringCollectionDTO metaData : metaDataList) {
 			Collection<Experiment> experiments = findExperimentByMetadata(metaData.getName());
-			if (experiments.size() > 0){
+			if (experiments.size() > 0) {
 				experimentList.addAll(experiments);
 			}
 		}
@@ -1352,28 +1454,28 @@ public Collection<Experiment> findExperimentsByMetadataJson(String json) {
 	@Override
 	public Collection<Experiment> findExperimentsByMetadataJson(List<StringCollectionDTO> metaDataList) {
 		Collection<Experiment> experimentList = new HashSet<Experiment>();
-		for (StringCollectionDTO metaData : metaDataList){
+		for (StringCollectionDTO metaData : metaDataList) {
 			Collection<Experiment> experiments = findExperimentByMetadata(metaData.getName());
-			if (experiments.size() > 0){
+			if (experiments.size() > 0) {
 				experimentList.addAll(experiments);
 			}
 		}
 
 		return experimentList;
 	}
-	
+
 	private Collection<Experiment> findExperimentByMetadata(String queryString) {
 		Collection<Experiment> experimentList = new HashSet<Experiment>();
 
-		//find by experiment codeName
+		// find by experiment codeName
 		List<Experiment> experiments = Experiment.findExperimentsByCodeNameEquals(queryString).getResultList();
-		if (!experiments.isEmpty()){
+		if (!experiments.isEmpty()) {
 			experimentList.addAll(experiments);
 		}
 
-		//find by experiment name
+		// find by experiment name
 		Collection<Experiment> experimentsByName = Experiment.findExperimentByName(queryString);
-		if (!experimentsByName.isEmpty()){
+		if (!experimentsByName.isEmpty()) {
 			experimentList.addAll(experimentsByName);
 		}
 
@@ -1384,14 +1486,13 @@ public Collection<Experiment> findExperimentsByMetadata(String queryString, Stri
 		Collection<Experiment> experimentList = new HashSet<Experiment>();
 		Collection<Long> experimentIdList = findExperimentIdsByMetadata(queryString, searchBy);
 		if (!experimentIdList.isEmpty()) {
-			for (Long id: experimentIdList) {
+			for (Long id : experimentIdList) {
 				experimentList.add(Experiment.findExperiment(id));
 			}
 		}
 		return experimentList;
 	}
 
-
 	@Override
 	@Transactional
 	public Set<Experiment> findExperimentsByRequestMetadata(
@@ -1412,14 +1513,23 @@ public Set<Experiment> findExperimentsByRequestMetadata(
 		Set<Experiment> resultByType = new HashSet<Experiment>();
 		Set<Experiment> resultByName = new HashSet<Experiment>();
 		Set<Experiment> resultByCodeName = new HashSet<Experiment>();
-		if (requestParams.containsKey("protocolKind"))resultByProtocolKind.addAll(findExperimentsByMetadata(requestParams.get("protocolKind"), "PROTOCOL KIND"));
-		if (requestParams.containsKey("protocolType")) resultByProtocolType.addAll(findExperimentsByMetadata(requestParams.get("protocolType"), "PROTOCOL TYPE"));
-		if (requestParams.containsKey("protocolName")) resultByProtocolName.addAll(findExperimentsByMetadata(requestParams.get("protocolName"), "PROTOCOL NAME"));
-		if (requestParams.containsKey("protocolCodeName")) resultByProtocolCodeName.addAll(findExperimentsByMetadata(requestParams.get("protocolCodeName"), "PROTOCOL CODENAME"));
-		if (requestParams.containsKey("kind"))resultByKind.addAll(findExperimentsByMetadata(requestParams.get("kind"), "KIND"));
-		if (requestParams.containsKey("type")) resultByType.addAll(findExperimentsByMetadata(requestParams.get("type"), "TYPE"));
-		if (requestParams.containsKey("name")) resultByName.addAll(findExperimentsByMetadata(requestParams.get("name"), "NAME"));
-		if (requestParams.containsKey("codeName")) resultByCodeName.addAll(findExperimentsByMetadata(requestParams.get("codeName"), "CODENAME"));
+		if (requestParams.containsKey("protocolKind"))
+			resultByProtocolKind.addAll(findExperimentsByMetadata(requestParams.get("protocolKind"), "PROTOCOL KIND"));
+		if (requestParams.containsKey("protocolType"))
+			resultByProtocolType.addAll(findExperimentsByMetadata(requestParams.get("protocolType"), "PROTOCOL TYPE"));
+		if (requestParams.containsKey("protocolName"))
+			resultByProtocolName.addAll(findExperimentsByMetadata(requestParams.get("protocolName"), "PROTOCOL NAME"));
+		if (requestParams.containsKey("protocolCodeName"))
+			resultByProtocolCodeName
+					.addAll(findExperimentsByMetadata(requestParams.get("protocolCodeName"), "PROTOCOL CODENAME"));
+		if (requestParams.containsKey("kind"))
+			resultByKind.addAll(findExperimentsByMetadata(requestParams.get("kind"), "KIND"));
+		if (requestParams.containsKey("type"))
+			resultByType.addAll(findExperimentsByMetadata(requestParams.get("type"), "TYPE"));
+		if (requestParams.containsKey("name"))
+			resultByName.addAll(findExperimentsByMetadata(requestParams.get("name"), "NAME"));
+		if (requestParams.containsKey("codeName"))
+			resultByCodeName.addAll(findExperimentsByMetadata(requestParams.get("codeName"), "CODENAME"));
 
 		result.addAll(resultByProtocolKind);
 		result.addAll(resultByProtocolType);
@@ -1430,79 +1540,91 @@ public Set<Experiment> findExperimentsByRequestMetadata(
 		result.addAll(resultByName);
 		result.addAll(resultByCodeName);
 
-		if (requestParams.containsKey("protocolKind")) result.retainAll(resultByProtocolKind);
-		if (requestParams.containsKey("protocolType")) result.retainAll(resultByProtocolType);
-		if (requestParams.containsKey("protocolName")) result.retainAll(resultByProtocolName);
-		if (requestParams.containsKey("protocolCodeName")) result.retainAll(resultByProtocolCodeName);
-		if (requestParams.containsKey("kind")) result.retainAll(resultByKind);
-		if (requestParams.containsKey("type")) result.retainAll(resultByType);
-		if (requestParams.containsKey("name")) result.retainAll(resultByName);
-		if (requestParams.containsKey("codeName")) result.retainAll(resultByCodeName);
-
+		if (requestParams.containsKey("protocolKind"))
+			result.retainAll(resultByProtocolKind);
+		if (requestParams.containsKey("protocolType"))
+			result.retainAll(resultByProtocolType);
+		if (requestParams.containsKey("protocolName"))
+			result.retainAll(resultByProtocolName);
+		if (requestParams.containsKey("protocolCodeName"))
+			result.retainAll(resultByProtocolCodeName);
+		if (requestParams.containsKey("kind"))
+			result.retainAll(resultByKind);
+		if (requestParams.containsKey("type"))
+			result.retainAll(resultByType);
+		if (requestParams.containsKey("name"))
+			result.retainAll(resultByName);
+		if (requestParams.containsKey("codeName"))
+			result.retainAll(resultByCodeName);
 
 		return result;
 	}
 
-
 	@Override
 	public boolean isSoftDeleted(Experiment experiment) {
 		boolean isSoftDeleted = false;
-		if (experiment.isIgnored() && !experiment.isDeleted()) isSoftDeleted = true;
+		if (experiment.isIgnored() && !experiment.isDeleted())
+			isSoftDeleted = true;
 		return isSoftDeleted;
-		//		Long experimentId = experiment.getId();
-		//		List<ExperimentValue> experimentValues = experimentValueService.getExperimentValuesByExperimentIdAndStateTypeKindAndValueTypeKind(experimentId, "metadata", "experiment metadata", "stringValue", "status");
-		//		boolean isSoftDeleted = false;
-		//		for (ExperimentValue experimentValue : experimentValues) {
-		//			if (experimentValue.getStringValue() != null && experimentValue.getStringValue().equals("Deleted")) isSoftDeleted = true;
-		//		}
-		//		return isSoftDeleted;
+		// Long experimentId = experiment.getId();
+		// List<ExperimentValue> experimentValues =
+		// experimentValueService.getExperimentValuesByExperimentIdAndStateTypeKindAndValueTypeKind(experimentId,
+		// "metadata", "experiment metadata", "stringValue", "status");
+		// boolean isSoftDeleted = false;
+		// for (ExperimentValue experimentValue : experimentValues) {
+		// if (experimentValue.getStringValue() != null &&
+		// experimentValue.getStringValue().equals("Deleted")) isSoftDeleted = true;
+		// }
+		// return isSoftDeleted;
 	}
 
-
 	@Override
 	public boolean deleteAnalysisGroupsByExperiment(Experiment experiment) {
-//		boolean successfullyDeleted = true;
-//		try {
-//			for (AnalysisGroup analysisGroup : experiment.getAnalysisGroups()){
-//				analysisGroup.logicalDelete();
-//				analysisGroup.merge();
-//			}
-//		} catch (Exception e) {
-//			successfullyDeleted = false;
-//			logger.error("Error in deleting analysis groups by experiment: " + e.toString());
-//		}
-//		return successfullyDeleted;
-		
-		
+		// boolean successfullyDeleted = true;
+		// try {
+		// for (AnalysisGroup analysisGroup : experiment.getAnalysisGroups()){
+		// analysisGroup.logicalDelete();
+		// analysisGroup.merge();
+		// }
+		// } catch (Exception e) {
+		// successfullyDeleted = false;
+		// logger.error("Error in deleting analysis groups by experiment: " +
+		// e.toString());
+		// }
+		// return successfullyDeleted;
+
 		EntityManager em = Experiment.entityManager();
-        String sqlQuery = "UPDATE AnalysisGroup AS ag SET ag.ignored = true, ag.deleted = true "
-        				+ "WHERE ag.id IN ( SELECT ag2.id FROM AnalysisGroup AS ag2 JOIN ag2.experiments e "
-        				+ "WHERE e.id = :experimentId ) ";
-        Query q = em.createQuery(sqlQuery);
-        q.setParameter("experimentId", experiment.getId());
-        try{
-        	int numRows = q.executeUpdate();
-            if (logger.isDebugEnabled()) logger.debug(numRows + " AnalysisGroups logically deleted.");
-        }catch (Exception e){
-        	logger.error("Caught error deleting AnalysisGroups under experiment: " + experiment.getCodeName()+ " "+e.toString());
-        	return false;
-        }
-        return true;
+		String sqlQuery = "UPDATE AnalysisGroup AS ag SET ag.ignored = true, ag.deleted = true "
+				+ "WHERE ag.id IN ( SELECT ag2.id FROM AnalysisGroup AS ag2 JOIN ag2.experiments e "
+				+ "WHERE e.id = :experimentId ) ";
+		Query q = em.createQuery(sqlQuery);
+		q.setParameter("experimentId", experiment.getId());
+		try {
+			int numRows = q.executeUpdate();
+			if (logger.isDebugEnabled())
+				logger.debug(numRows + " AnalysisGroups logically deleted.");
+		} catch (Exception e) {
+			logger.error("Caught error deleting AnalysisGroups under experiment: " + experiment.getCodeName() + " "
+					+ e.toString());
+			return false;
+		}
+		return true;
 	}
 
 	@Override
 	public List<ExperimentDataDTO> getExperimentData(String batchCode, boolean showOnlyPublicData) {
 		List<ExperimentDataDTO> exptDataSet = new ArrayList<ExperimentDataDTO>();
-		List<AnalysisGroupValueDTO> values = AnalysisGroupValue.findAnalysisGroupValueDTO(batchCode, showOnlyPublicData).getResultList();
+		List<AnalysisGroupValueDTO> values = AnalysisGroupValue.findAnalysisGroupValueDTO(batchCode, showOnlyPublicData)
+				.getResultList();
 
 		Set<Long> protocolIds = new HashSet<Long>();
 		Set<Long> experimentIds = new HashSet<Long>();
-		for (AnalysisGroupValueDTO value : values){
+		for (AnalysisGroupValueDTO value : values) {
 			protocolIds.add(value.getProtocolId());
 			experimentIds.add(value.getExperimentId());
 		}
-		
-		for (Long experimentId : experimentIds){
+
+		for (Long experimentId : experimentIds) {
 			ExperimentDataDTO exptData = new ExperimentDataDTO();
 			Experiment testExperiment = Experiment.findExperiment(experimentId);
 			exptData.setExperimentId(experimentId);
@@ -1511,26 +1633,34 @@ public List<ExperimentDataDTO> getExperimentData(String batchCode, boolean showO
 			exptData.setExperimentShortDescription(testExperiment.getShortDescription());
 			exptData.setLsTags(testExperiment.getLsTags());
 			Protocol protocol = Protocol.findProtocol(testExperiment.getProtocol().getId());
-			List<ProtocolLabel> protocolLabels = ProtocolLabel.findProtocolPreferredName(protocol.getId()).getResultList();
-			if (protocolLabels.size() > 1) logger.error("found multiple protocol preferred names for " + protocol.getCodeName());
-			for (ProtocolLabel protocolLabel : protocolLabels){
+			List<ProtocolLabel> protocolLabels = ProtocolLabel.findProtocolPreferredName(protocol.getId())
+					.getResultList();
+			if (protocolLabels.size() > 1)
+				logger.error("found multiple protocol preferred names for " + protocol.getCodeName());
+			for (ProtocolLabel protocolLabel : protocolLabels) {
 				exptData.setProtocolName(protocolLabel.getLabelText());
 			}
 			exptData.setProtocolCodeName(protocol.getCodeName());
 			exptData.setProtocolId(protocol.getId());
 			exptData.setProtocolShortDescription(protocol.getShortDescription());
-			List<ProtocolValue> assayTreeRules = ProtocolValue.findProtocolValuesByProtocolIDAndStateTypeKindAndValueTypeKind(protocol.getId(), "metadata", "protocol metadata", "stringValue", "assay tree rule").getResultList();
-			if (assayTreeRules.size() > 1) logger.warn("found multiple assay tree rules for " + protocol.getCodeName());
-			//if (assayTreeRules.size() == 0) logger.error("no assay tree rules for " + protocol.getCodeName());
-
-			for (ProtocolValue assayTreeRule : assayTreeRules){
-				if (assayTreeRules.size() > 1) logger.warn(assayTreeRule.toJson());
-				if (assayTreeRule.getStringValue() != null){
+			List<ProtocolValue> assayTreeRules = ProtocolValue
+					.findProtocolValuesByProtocolIDAndStateTypeKindAndValueTypeKind(protocol.getId(), "metadata",
+							"protocol metadata", "stringValue", "assay tree rule")
+					.getResultList();
+			if (assayTreeRules.size() > 1)
+				logger.warn("found multiple assay tree rules for " + protocol.getCodeName());
+			// if (assayTreeRules.size() == 0) logger.error("no assay tree rules for " +
+			// protocol.getCodeName());
+
+			for (ProtocolValue assayTreeRule : assayTreeRules) {
+				if (assayTreeRules.size() > 1)
+					logger.warn(assayTreeRule.toJson());
+				if (assayTreeRule.getStringValue() != null) {
 					exptData.setAssayFolderRule(assayTreeRule.getStringValue());
 				}
 			}
-			for (AnalysisGroupValueDTO value : values){
-				if (value.getExperimentId().longValue() == experimentId){
+			for (AnalysisGroupValueDTO value : values) {
+				if (value.getExperimentId().longValue() == experimentId) {
 					exptData.getAnalysisGroupValues().add(value);
 				}
 			}
@@ -1538,15 +1668,17 @@ public List<ExperimentDataDTO> getExperimentData(String batchCode, boolean showO
 			exptDataSet.add(exptData);
 		}
 		logger.debug("@@@@@@@@@@@@@@@@ printing the experiment metadata @@@@@@@@@@@@@");
-		if (logger.isDebugEnabled()) logger.debug(ExperimentDataDTO.toJsonArray(exptDataSet));
-		
+		if (logger.isDebugEnabled())
+			logger.debug(ExperimentDataDTO.toJsonArray(exptDataSet));
+
 		return exptDataSet;
 
 	}
 
 	@Override
 	public Collection<ExperimentErrorMessageDTO> findExperimentsByCodeNames(List<String> codeNames) {
-		if (codeNames.isEmpty()) return new ArrayList<ExperimentErrorMessageDTO>();
+		if (codeNames.isEmpty())
+			return new ArrayList<ExperimentErrorMessageDTO>();
 		EntityManager em = Experiment.entityManager();
 		String queryString = "SELECT new com.labsynch.labseer.dto.ExperimentErrorMessageDTO( "
 				+ "experiment.codeName, "
@@ -1555,19 +1687,19 @@ public Collection<ExperimentErrorMessageDTO> findExperimentsByCodeNames(List<Str
 		queryString += "where ( experiment.ignored <> true ) and ( ";
 		Collection<Query> queries = SimpleUtil.splitHqlInClause(em, queryString, "experiment.codeName", codeNames);
 		Collection<ExperimentErrorMessageDTO> results = new HashSet<ExperimentErrorMessageDTO>();
-		for (Query q : queries){
+		for (Query q : queries) {
 			results.addAll(q.getResultList());
 		}
-		//diff request with results to find codeNames that could not be found
+		// diff request with results to find codeNames that could not be found
 		HashSet<String> requestCodeNames = new HashSet<String>();
 		requestCodeNames.addAll(codeNames);
 		HashSet<String> foundCodeNames = new HashSet<String>();
-		for (ExperimentErrorMessageDTO result : results){
+		for (ExperimentErrorMessageDTO result : results) {
 			foundCodeNames.add(result.getExperimentCodeName());
 		}
 		requestCodeNames.removeAll(foundCodeNames);
-		if (!requestCodeNames.isEmpty()){
-			for (String notFoundCodeName : requestCodeNames){
+		if (!requestCodeNames.isEmpty()) {
+			for (String notFoundCodeName : requestCodeNames) {
 				ExperimentErrorMessageDTO notFoundDTO = new ExperimentErrorMessageDTO();
 				notFoundDTO.setExperimentCodeName(notFoundCodeName);
 				notFoundDTO.setLevel("error");
@@ -1575,38 +1707,38 @@ public Collection<ExperimentErrorMessageDTO> findExperimentsByCodeNames(List<Str
 				results.add(notFoundDTO);
 			}
 		}
-		
+
 		return results;
 	}
 
-
 	@Override
 	public List<CodeTableDTO> getExperimentsAsCodeTables(String lsType,
 			String lsKind) {
 		Collection<Experiment> experiments;
-		if ((lsType != null && lsType.length()>0) && (lsKind != null && lsKind.length()>0)){
+		if ((lsType != null && lsType.length() > 0) && (lsKind != null && lsKind.length() > 0)) {
 			experiments = Experiment.findExperimentsByLsTypeEqualsAndLsKindEquals(lsType, lsKind).getResultList();
-		}else if (lsType != null && lsType.length()>0){
+		} else if (lsType != null && lsType.length() > 0) {
 			experiments = Experiment.findExperimentsByLsTypeEquals(lsType).getResultList();
-		}else if (lsKind != null && lsKind.length()>0){
+		} else if (lsKind != null && lsKind.length() > 0) {
 			experiments = Experiment.findExperimentsByLsKindEquals(lsKind).getResultList();
-		}else{
+		} else {
 			experiments = Experiment.findAllExperiments();
 		}
 		List<CodeTableDTO> codetables = convertExperimentsToCodeTables(experiments);
 		codetables = CodeTableDTO.sortCodeTables(codetables);
 		return codetables;
 	}
-	
+
 	@Override
-	public List<CodeTableDTO> convertExperimentsToCodeTables(Collection<Experiment> experiments){
+	public List<CodeTableDTO> convertExperimentsToCodeTables(Collection<Experiment> experiments) {
 		List<CodeTableDTO> codetables = new ArrayList<CodeTableDTO>();
-		for (Experiment experiment : experiments){
+		for (Experiment experiment : experiments) {
 			CodeTableDTO codetable = new CodeTableDTO(experiment);
 			codetables.add(codetable);
 		}
 		return codetables;
 	}
+
 	@Override
 	public PreferredNameResultsDTO getCodeNameFromName(String experimentType,
 			String experimentKind, String labelType, String labelKind,
@@ -1617,37 +1749,42 @@ public PreferredNameResultsDTO getCodeNameFromName(String experimentType,
 		PreferredNameResultsDTO responseOutput = new PreferredNameResultsDTO();
 		Collection<ErrorMessageDTO> errors = new HashSet<ErrorMessageDTO>();
 
-		for (PreferredNameDTO request : requests){
+		for (PreferredNameDTO request : requests) {
 			request.setPreferredName("");
 			request.setReferenceName("");
 			List<Experiment> experiments = new ArrayList<Experiment>();
-			if (labelType==null || labelKind==null || labelType.length()==0 || labelKind.length()==0){
-				experiments = Experiment.findExperimentByLabelText(experimentType, experimentKind, request.getRequestName()).getResultList();
+			if (labelType == null || labelKind == null || labelType.length() == 0 || labelKind.length() == 0) {
+				experiments = Experiment
+						.findExperimentByLabelText(experimentType, experimentKind, request.getRequestName())
+						.getResultList();
 
-			}else{
-				experiments = Experiment.findExperimentByLabelText(experimentType, experimentKind, labelType, labelKind, request.getRequestName()).getResultList();
+			} else {
+				experiments = Experiment.findExperimentByLabelText(experimentType, experimentKind, labelType, labelKind,
+						request.getRequestName()).getResultList();
 			}
-			if (experiments.size() == 1){
+			if (experiments.size() == 1) {
 				request.setPreferredName(pickBestLabel(experiments.get(0)));
 				request.setReferenceName(experiments.get(0).getCodeName());
-			} else if (experiments.size() > 1){
+			} else if (experiments.size() > 1) {
 				responseOutput.setError(true);
 				ErrorMessageDTO error = new ErrorMessageDTO();
 				error.setLevel("MULTIPLE RESULTS");
-				error.setMessage("FOUND MULTIPLE EXPERIMENTS WITH THE SAME NAME: " + request.getRequestName() );	
+				error.setMessage("FOUND MULTIPLE EXPERIMENTS WITH THE SAME NAME: " + request.getRequestName());
 				logger.error("FOUND MULTIPLE EXPERIMENTS WITH THE SAME NAME: " + request.getRequestName());
 				errors.add(error);
 			} else {
-				try{
-					Experiment codeNameMatch = Experiment.findExperimentsByCodeNameEquals(request.getRequestName()).getSingleResult();
-					if (codeNameMatch.getLsKind().equals(experimentKind) && codeNameMatch.getLsType().equals(experimentType)){
+				try {
+					Experiment codeNameMatch = Experiment.findExperimentsByCodeNameEquals(request.getRequestName())
+							.getSingleResult();
+					if (codeNameMatch.getLsKind().equals(experimentKind)
+							&& codeNameMatch.getLsType().equals(experimentType)) {
 						logger.info("Made it to the codeMatch");
 						request.setPreferredName(pickBestLabel(codeNameMatch));
-	 					request.setReferenceName(codeNameMatch.getCodeName());
-					}else{
+						request.setReferenceName(codeNameMatch.getCodeName());
+					} else {
 						logger.info("Did not find an EXPERIMENT WITH THE REQUESTED NAME: " + request.getRequestName());
 					}
-				}catch (NoResultException e){
+				} catch (NoResultException e) {
 					logger.info("Did not find an EXPERIMENT WITH THE REQUESTED NAME: " + request.getRequestName());
 				}
 			}
@@ -1657,21 +1794,27 @@ public PreferredNameResultsDTO getCodeNameFromName(String experimentType,
 
 		return responseOutput;
 	}
-	
+
 	private String pickBestLabel(Experiment experiment) {
 		Collection<ExperimentLabel> labels = experiment.getLsLabels();
-		if (labels.isEmpty()) return null;
+		if (labels.isEmpty())
+			return null;
 		return ExperimentLabel.pickBestLabel(labels).getLabelText();
 	}
-	
+
 	@Override
 	public Collection<String> getExperimentCodesByDateValueComparison(
 			DateValueComparisonRequest requestDTO) throws Exception {
-		if (requestDTO.getStateType() == null || requestDTO.getStateType().length() == 0) throw new Exception("Must provide stateType");
-		if (requestDTO.getStateKind() == null || requestDTO.getStateKind().length() == 0) throw new Exception("Must provide stateKind");
-		if (requestDTO.getValueKind() == null || requestDTO.getValueKind().length() == 0) throw new Exception("Must provide valueKind");
-		if (requestDTO.getSecondsDelta() == null) throw new Exception("Must provide secondsDelta");
-		if (requestDTO.getNewerThanModified() == null) requestDTO.setNewerThanModified(false);
+		if (requestDTO.getStateType() == null || requestDTO.getStateType().length() == 0)
+			throw new Exception("Must provide stateType");
+		if (requestDTO.getStateKind() == null || requestDTO.getStateKind().length() == 0)
+			throw new Exception("Must provide stateKind");
+		if (requestDTO.getValueKind() == null || requestDTO.getValueKind().length() == 0)
+			throw new Exception("Must provide valueKind");
+		if (requestDTO.getSecondsDelta() == null)
+			throw new Exception("Must provide secondsDelta");
+		if (requestDTO.getNewerThanModified() == null)
+			requestDTO.setNewerThanModified(false);
 		EntityManager em = Experiment.entityManager();
 		String query = "SELECT new Map( experiment.codeName AS codeName, experiment.modifiedDate AS modifiedDate, experiment.recordedDate as recordedDate, value.dateValue AS dateValue )"
 				+ "FROM Experiment AS experiment "
@@ -1683,38 +1826,44 @@ public Collection<String> getExperimentCodesByDateValueComparison(
 				+ "WITH value.ignored = false "
 				+ "AND value.lsType = :valueType "
 				+ "AND value.lsKind = :valueKind "
-				+ "WHERE experiment.ignored = false "
-				;
-		if (requestDTO.getLsType() != null && requestDTO.getLsType().length()>0) query += "AND experiment.lsType = :experimentType ";
-		if (requestDTO.getLsKind() != null && requestDTO.getLsKind().length()>0) query += "AND experiment.lsKind = :experimentKind ";
-		
+				+ "WHERE experiment.ignored = false ";
+		if (requestDTO.getLsType() != null && requestDTO.getLsType().length() > 0)
+			query += "AND experiment.lsType = :experimentType ";
+		if (requestDTO.getLsKind() != null && requestDTO.getLsKind().length() > 0)
+			query += "AND experiment.lsKind = :experimentKind ";
+
 		TypedQuery<Map> q = em.createQuery(query, Map.class);
 		q.setParameter("stateType", requestDTO.getStateType());
 		q.setParameter("stateKind", requestDTO.getStateKind());
 		q.setParameter("valueType", "dateValue");
 		q.setParameter("valueKind", requestDTO.getValueKind());
-		if (requestDTO.getLsType() != null && requestDTO.getLsType().length()>0) q.setParameter("experimentType", requestDTO.getLsType());
-		if (requestDTO.getLsKind() != null && requestDTO.getLsKind().length()>0) q.setParameter("experimentKind", requestDTO.getLsKind());
-		
+		if (requestDTO.getLsType() != null && requestDTO.getLsType().length() > 0)
+			q.setParameter("experimentType", requestDTO.getLsType());
+		if (requestDTO.getLsKind() != null && requestDTO.getLsKind().length() > 0)
+			q.setParameter("experimentKind", requestDTO.getLsKind());
+
 		Collection<Map> resultMaps = q.getResultList();
 		Collection<String> experimentCodes = new HashSet<String>();
-		for (Map resultMap : resultMaps){
-			if (resultMap.get("dateValue") == null) experimentCodes.add((String) resultMap.get("codeName"));
-			else{
+		for (Map resultMap : resultMaps) {
+			if (resultMap.get("dateValue") == null)
+				experimentCodes.add((String) resultMap.get("codeName"));
+			else {
 				Date dateValue = (Date) resultMap.get("dateValue");
 				Date modifiedDate;
-				if (resultMap.get("modifiedDate") == null){
+				if (resultMap.get("modifiedDate") == null) {
 					modifiedDate = (Date) resultMap.get("recordedDate");
-				}else{
+				} else {
 					modifiedDate = (Date) resultMap.get("modifiedDate");
 				}
 				Integer secondsDelta = requestDTO.getSecondsDelta();
-				logger.debug("dateValue: "+dateValue.getTime());
-				logger.debug("modifiedDate: "+modifiedDate.getTime());
-				if (requestDTO.getNewerThanModified()){
-					if (dateValue.getTime() - secondsDelta*1000 >  modifiedDate.getTime()) experimentCodes.add((String) resultMap.get("codeName"));
-				}else{
-					if (dateValue.getTime() + secondsDelta*1000 <  modifiedDate.getTime()) experimentCodes.add((String) resultMap.get("codeName"));
+				logger.debug("dateValue: " + dateValue.getTime());
+				logger.debug("modifiedDate: " + modifiedDate.getTime());
+				if (requestDTO.getNewerThanModified()) {
+					if (dateValue.getTime() - secondsDelta * 1000 > modifiedDate.getTime())
+						experimentCodes.add((String) resultMap.get("codeName"));
+				} else {
+					if (dateValue.getTime() + secondsDelta * 1000 < modifiedDate.getTime())
+						experimentCodes.add((String) resultMap.get("codeName"));
 				}
 			}
 		}
diff --git a/src/main/java/com/labsynch/labseer/service/ExperimentStateService.java b/src/main/java/com/labsynch/labseer/service/ExperimentStateService.java
index 0a59f42b4..539138151 100644
--- a/src/main/java/com/labsynch/labseer/service/ExperimentStateService.java
+++ b/src/main/java/com/labsynch/labseer/service/ExperimentStateService.java
@@ -11,8 +11,8 @@
 
 @Service
 public interface ExperimentStateService {
-	
-	public List<ExperimentState> getExperimentStatesByExperimentIdAndStateTypeKind(Long experimentId, String stateType, 
+
+	public List<ExperimentState> getExperimentStatesByExperimentIdAndStateTypeKind(Long experimentId, String stateType,
 			String stateKind);
 
 	public String getCsvList(List<ExperimentState> experimentStates);
@@ -35,5 +35,5 @@ public ExperimentState getExperimentState(String idOrCodeName,
 
 	public Collection<ExperimentStatePathDTO> getExperimentStates(
 			Collection<GenericStatePathRequest> genericRequests);
-	
+
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ExperimentStateServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ExperimentStateServiceImpl.java
index a362111fa..c7b9690c7 100644
--- a/src/main/java/com/labsynch/labseer/service/ExperimentStateServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ExperimentStateServiceImpl.java
@@ -18,18 +18,18 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-
 @Service
 @Transactional
 public class ExperimentStateServiceImpl implements ExperimentStateService {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(ExperimentStateServiceImpl.class);
 
 	@Override
-	public List<ExperimentState> getExperimentStatesByExperimentIdAndStateTypeKind(Long experimentId, String stateType, 
-			String stateKind) {	
-		
-		List<ExperimentState> experimentStates = ExperimentState.findExperimentStatesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getResultList();
+	public List<ExperimentState> getExperimentStatesByExperimentIdAndStateTypeKind(Long experimentId, String stateType,
+			String stateKind) {
+
+		List<ExperimentState> experimentStates = ExperimentState
+				.findExperimentStatesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getResultList();
 
 		return experimentStates;
 	}
@@ -39,9 +39,10 @@ public String getCsvList(List<ExperimentState> experimentStates) {
 		// TODO Auto-generated method stub
 		return "NEED TO IMPLEMENT";
 	}
-	
+
 	@Override
-	public ExperimentState createExperimentStateByExperimentIdAndStateTypeKind(Long experimentId, String stateType, String stateKind) {
+	public ExperimentState createExperimentStateByExperimentIdAndStateTypeKind(Long experimentId, String stateType,
+			String stateKind) {
 		ExperimentState experimentState = new ExperimentState();
 		Experiment experiment = Experiment.findExperiment(experimentId);
 		experimentState.setExperiment(experiment);
@@ -51,14 +52,14 @@ public ExperimentState createExperimentStateByExperimentIdAndStateTypeKind(Long
 		experimentState.persist();
 		return experimentState;
 	}
-	
+
 	@Override
 	public ExperimentState saveExperimentState(ExperimentState experimentState) {
 		ExperimentState newExperimentState = new ExperimentState(experimentState);
-		newExperimentState.setExperiment(Experiment.findExperiment(experimentState.getExperiment().getId()));		
+		newExperimentState.setExperiment(Experiment.findExperiment(experimentState.getExperiment().getId()));
 		newExperimentState.persist();
 		Set<ExperimentValue> savedValues = new HashSet<ExperimentValue>();
-		for (ExperimentValue experimentValue : experimentState.getLsValues()){
+		for (ExperimentValue experimentValue : experimentState.getLsValues()) {
 			experimentValue.setLsState(newExperimentState);
 			experimentValue.persist();
 			savedValues.add(experimentValue);
@@ -71,12 +72,12 @@ public ExperimentState saveExperimentState(ExperimentState experimentState) {
 	@Override
 	public Collection<ExperimentState> saveExperimentStates(
 			Collection<ExperimentState> experimentStates) {
-		for (ExperimentState experimentState: experimentStates) {
+		for (ExperimentState experimentState : experimentStates) {
 			experimentState = saveExperimentState(experimentState);
 		}
 		return experimentStates;
 	}
-	
+
 	@Override
 	public ExperimentState updateExperimentState(
 			ExperimentState experimentState) {
@@ -88,21 +89,21 @@ public ExperimentState updateExperimentState(
 	@Override
 	public Collection<ExperimentState> updateExperimentStates(
 			Collection<ExperimentState> experimentStates) {
-		for (ExperimentState experimentState : experimentStates){
+		for (ExperimentState experimentState : experimentStates) {
 			experimentState = updateExperimentState(experimentState);
 		}
 		return null;
 	}
-	
+
 	@Override
 	public ExperimentState getExperimentState(String idOrCodeName,
 			String stateType, String stateKind) {
 		ExperimentState state = null;
-		try{
+		try {
 			Collection<ExperimentState> states = getExperimentStates(idOrCodeName, stateType, stateKind);
 			state = states.iterator().next();
-		}catch (Exception e){
-			logger.error("Caught error "+e.toString()+" trying to find a state.",e);
+		} catch (Exception e) {
+			logger.error("Caught error " + e.toString() + " trying to find a state.", e);
 			state = null;
 		}
 		return state;
@@ -112,23 +113,27 @@ public ExperimentState getExperimentState(String idOrCodeName,
 	public Collection<ExperimentStatePathDTO> getExperimentStates(
 			Collection<GenericStatePathRequest> genericRequests) {
 		Collection<ExperimentStatePathDTO> results = new ArrayList<ExperimentStatePathDTO>();
-		for (GenericStatePathRequest request : genericRequests){
+		for (GenericStatePathRequest request : genericRequests) {
 			ExperimentStatePathDTO result = new ExperimentStatePathDTO();
 			result.setIdOrCodeName(request.getIdOrCodeName());
 			result.setStateType(request.getStateType());
 			result.setStateKind(request.getStateKind());
-			result.setStates(getExperimentStates(request.getIdOrCodeName(), request.getStateType(), request.getStateKind()));
+			result.setStates(
+					getExperimentStates(request.getIdOrCodeName(), request.getStateType(), request.getStateKind()));
 			results.add(result);
 		}
 		return results;
 	}
-	
-	private Collection<ExperimentState> getExperimentStates(String idOrCodeName, String stateType, String stateKind){
-		if (SimpleUtil.isNumeric(idOrCodeName)){
+
+	private Collection<ExperimentState> getExperimentStates(String idOrCodeName, String stateType, String stateKind) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			Long id = Long.valueOf(idOrCodeName);
-			return ExperimentState.findExperimentStatesByExptIDAndStateTypeKind(id, stateType, stateKind).getResultList();
-		}else{
-			return ExperimentState.findExperimentStatesByExperimentCodeNameAndStateTypeKind(idOrCodeName, stateType, stateKind).getResultList();
+			return ExperimentState.findExperimentStatesByExptIDAndStateTypeKind(id, stateType, stateKind)
+					.getResultList();
+		} else {
+			return ExperimentState
+					.findExperimentStatesByExperimentCodeNameAndStateTypeKind(idOrCodeName, stateType, stateKind)
+					.getResultList();
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/service/ExperimentValueService.java b/src/main/java/com/labsynch/labseer/service/ExperimentValueService.java
index 7f689b177..68e005d0b 100644
--- a/src/main/java/com/labsynch/labseer/service/ExperimentValueService.java
+++ b/src/main/java/com/labsynch/labseer/service/ExperimentValueService.java
@@ -17,14 +17,14 @@ public interface ExperimentValueService {
 	public ExperimentValue saveExperimentValue(ExperimentValue experimentValue);
 
 	public ExperimentValue updateExperimentValue(ExperimentValue experimentValue);
-	
+
 	public List<ExperimentValue> getExperimentValuesByExperimentId(Long id);
 
 	public List<ExperimentValue> getExperimentValuesByExperimentIdAndStateTypeKindAndValueTypeKind(
 			Long experimentId, String stateType, String stateKind,
 			String valueType, String valueKind);
-	
-	public List<ExperimentValue> getExperimentValuesByExperimentIdAndStateTypeKind(Long experimentId, String stateType, 
+
+	public List<ExperimentValue> getExperimentValuesByExperimentIdAndStateTypeKind(Long experimentId, String stateType,
 			String stateKind);
 
 	public String getCsvList(List<ExperimentValue> experimentValues);
@@ -50,5 +50,5 @@ public ExperimentValue getExperimentValue(String idOrCodeName,
 
 	public Collection<ExperimentValuePathDTO> getExperimentValues(
 			Collection<GenericValuePathRequest> genericRequests);
-	
+
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ExperimentValueServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ExperimentValueServiceImpl.java
index 0ace308e1..a668ba7ea 100644
--- a/src/main/java/com/labsynch/labseer/service/ExperimentValueServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ExperimentValueServiceImpl.java
@@ -34,28 +34,29 @@
 import org.supercsv.io.ICsvBeanWriter;
 import org.supercsv.prefs.CsvPreference;
 
-
 @Service
 @Transactional
 public class ExperimentValueServiceImpl implements ExperimentValueService {
-	
+
 	@Autowired
 	private ExperimentStateService experimentStateService;
-	
+
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
 
 	private static final Logger logger = LoggerFactory.getLogger(ExperimentValueServiceImpl.class);
 
-	//Query hibernate object and grab existing table references - add them to json hydrated object
+	// Query hibernate object and grab existing table references - add them to json
+	// hydrated object
 	@Override
 	@Transactional
-	public ExperimentValue updateExperimentValue(ExperimentValue experimentValue){
+	public ExperimentValue updateExperimentValue(ExperimentValue experimentValue) {
 		if (experimentValue.getLsState().getId() == null) {
 			ExperimentState experimentState = new ExperimentState(experimentValue.getLsState());
-			experimentState.setExperiment(Experiment.findExperiment(experimentValue.getLsState().getExperiment().getId()));
+			experimentState
+					.setExperiment(Experiment.findExperiment(experimentValue.getLsState().getExperiment().getId()));
 			experimentState.persist();
-			experimentValue.setLsState(experimentState); 
+			experimentValue.setLsState(experimentState);
 		} else {
 			experimentValue.setLsState(ExperimentState.findExperimentState(experimentValue.getLsState().getId()));
 		}
@@ -64,39 +65,40 @@ public ExperimentValue updateExperimentValue(ExperimentValue experimentValue){
 		return experimentValue;
 	}
 
-	//get experiment state from db and add as parent to object before save
+	// get experiment state from db and add as parent to object before save
 	@Override
 	@Transactional
 	public ExperimentValue saveExperimentValue(ExperimentValue experimentValue) {
 		if (experimentValue.getLsState().getId() == null) {
 			ExperimentState experimentState = new ExperimentState(experimentValue.getLsState());
-			experimentState.setExperiment(Experiment.findExperiment(experimentValue.getLsState().getExperiment().getId()));
+			experimentState
+					.setExperiment(Experiment.findExperiment(experimentValue.getLsState().getExperiment().getId()));
 			experimentState.persist();
-			experimentValue.setLsState(experimentState); 
+			experimentValue.setLsState(experimentState);
 		} else {
 			experimentValue.setLsState(ExperimentState.findExperimentState(experimentValue.getLsState().getId()));
-		}		
+		}
 		experimentValue.persist();
 		return experimentValue;
 	}
-	
+
 	@Override
 	@Transactional
 	public Collection<ExperimentValue> saveExperimentValues(Collection<ExperimentValue> experimentValues) {
-		for (ExperimentValue experimentValue: experimentValues) {
+		for (ExperimentValue experimentValue : experimentValues) {
 			experimentValue = saveExperimentValue(experimentValue);
 		}
 		return experimentValues;
 	}
 
 	@Override
-	public List<ExperimentValue> getExperimentValuesByExperimentId(Long id){	
+	public List<ExperimentValue> getExperimentValuesByExperimentId(Long id) {
 		List<ExperimentValue> experimentValues = new ArrayList<ExperimentValue>();
 		Experiment experiment = Experiment.findExperiment(id);
-		if(experiment.getLsStates() != null) {
+		if (experiment.getLsStates() != null) {
 			for (ExperimentState experimentState : experiment.getLsStates()) {
-				if(experimentState.getLsValues() != null) {
-					for(ExperimentValue experimentValue : experimentState.getLsValues()) {
+				if (experimentState.getLsValues() != null) {
+					for (ExperimentValue experimentValue : experimentState.getLsValues()) {
 						experimentValues.add(experimentValue);
 					}
 				}
@@ -106,19 +108,24 @@ public List<ExperimentValue> getExperimentValuesByExperimentId(Long id){
 	}
 
 	@Override
-	public List<ExperimentValue> getExperimentValuesByExperimentIdAndStateTypeKindAndValueTypeKind(Long experimentId, String stateType, 
-			String stateKind, String valueType, String valueKind){	
-		
-		List<ExperimentValue> experimentValues = ExperimentValue.findExperimentValuesByExptIDAndStateTypeKindAndValueTypeKind(experimentId, stateType, stateKind, valueType, valueKind).getResultList();
+	public List<ExperimentValue> getExperimentValuesByExperimentIdAndStateTypeKindAndValueTypeKind(Long experimentId,
+			String stateType,
+			String stateKind, String valueType, String valueKind) {
+
+		List<ExperimentValue> experimentValues = ExperimentValue
+				.findExperimentValuesByExptIDAndStateTypeKindAndValueTypeKind(experimentId, stateType, stateKind,
+						valueType, valueKind)
+				.getResultList();
 
 		return experimentValues;
 	}
-	
+
 	@Override
-	public List<ExperimentValue> getExperimentValuesByExperimentIdAndStateTypeKind(Long experimentId, String stateType, 
-			String stateKind) {	
-		
-		List<ExperimentValue> experimentValues = ExperimentValue.findExperimentValuesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getResultList();
+	public List<ExperimentValue> getExperimentValuesByExperimentIdAndStateTypeKind(Long experimentId, String stateType,
+			String stateKind) {
+
+		List<ExperimentValue> experimentValues = ExperimentValue
+				.findExperimentValuesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getResultList();
 
 		return experimentValues;
 	}
@@ -150,145 +157,159 @@ public String getCsvList(List<ExperimentValue> experimentValues) {
 			}
 		}
 
-		return outFile.toString();		
-		
+		return outFile.toString();
+
 	}
 
 	@Override
 	public List<StateValueDTO> getKeyValueList(List<ExperimentValue> experimentValues) {
 		List<StateValueDTO> stateValues = new ArrayList<StateValueDTO>();
-		for (ExperimentValue experimentValue : experimentValues){
+		for (ExperimentValue experimentValue : experimentValues) {
 			StateValueDTO stateValue = new StateValueDTO();
 			stateValue.setId(experimentValue.getId());
-			if (experimentValue.getLsType().equalsIgnoreCase("numericValue")){
+			if (experimentValue.getLsType().equalsIgnoreCase("numericValue")) {
 				stateValue.setLsValue(experimentValue.getNumericValue().toString());
-			} else if (experimentValue.getLsType().equalsIgnoreCase("stringValue")){
+			} else if (experimentValue.getLsType().equalsIgnoreCase("stringValue")) {
 				stateValue.setLsValue(experimentValue.getStringValue());
-			} else if (experimentValue.getLsType().equalsIgnoreCase("codeValue")){
+			} else if (experimentValue.getLsType().equalsIgnoreCase("codeValue")) {
 				stateValue.setLsValue(experimentValue.getCodeValue());
 			}
 			stateValues.add(stateValue);
 		}
-		
+
 		return stateValues;
-		
+
 	}
-	
+
 	@Override
 	public List<CodeTableDTO> convertToCodeTables(List<ExperimentValue> experimentValues) {
 		List<CodeTableDTO> codeTableList = new ArrayList<CodeTableDTO>();
 		for (ExperimentValue val : experimentValues) {
-			//TODO: add in codeValue as well
-			if (val.getLsType().equalsIgnoreCase("stringValue") || (val.getLsType().equalsIgnoreCase("numericValue"))){
+			// TODO: add in codeValue as well
+			if (val.getLsType().equalsIgnoreCase("stringValue") || (val.getLsType().equalsIgnoreCase("numericValue"))) {
 				CodeTableDTO codeTable = new CodeTableDTO();
-				if ((val.getLsType().equalsIgnoreCase("numericValue"))){
+				if ((val.getLsType().equalsIgnoreCase("numericValue"))) {
 					codeTable.setName(val.getNumericValue().toString());
 				} else {
 					codeTable.setName(val.getStringValue());
 				}
 				codeTable.setCode(val.getId().toString());
-				//codeTable.setCodeName(val.getId().toString());
+				// codeTable.setCodeName(val.getId().toString());
 				codeTable.setIgnored(val.isIgnored());
-				codeTableList.add(codeTable);			
+				codeTableList.add(codeTable);
 			}
 		}
-		return codeTableList;	
+		return codeTableList;
 	}
-	
+
 	@Override
-	public ExperimentValue updateExperimentValue(String idOrCodeName, String stateType, String stateKind, String valueType, String valueKind, String value) {
-		//fetch the entity
+	public ExperimentValue updateExperimentValue(String idOrCodeName, String stateType, String stateKind,
+			String valueType, String valueKind, String value) {
+		// fetch the entity
 		Experiment experiment;
-		if(SimpleUtil.isNumeric(idOrCodeName)) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			experiment = Experiment.findExperiment(Long.valueOf(idOrCodeName));
-		} else {		
+		} else {
 			try {
 				experiment = Experiment.findExperimentsByCodeNameEquals(idOrCodeName).getSingleResult();
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				experiment = null;
 			}
 		}
-		//Verify state and value kinds exist. If not, create them.
+		// Verify state and value kinds exist. If not, create them.
 		if (propertiesUtilService.getAutoCreateKinds()) {
 			StateType stateLsType = StateType.findStateTypesByTypeNameEquals(stateType).getSingleResult();
 			StateKind.getOrCreate(stateLsType, stateKind);
-			
+
 			ValueType valueLsType = ValueType.findValueTypesByTypeNameEquals(valueType).getSingleResult();
 			ValueKind.getOrCreate(valueLsType, valueKind);
 		}
-		
-		//fetch the state, and if it doesn't exist, create it
+
+		// fetch the state, and if it doesn't exist, create it
 		List<ExperimentState> experimentStates;
-		if(experiment != null) {
+		if (experiment != null) {
 			Long experimentId = experiment.getId();
-			experimentStates = experimentStateService.getExperimentStatesByExperimentIdAndStateTypeKind(experimentId, stateType, stateKind);
+			experimentStates = experimentStateService.getExperimentStatesByExperimentIdAndStateTypeKind(experimentId,
+					stateType, stateKind);
 			if (experimentStates.isEmpty()) {
-				//create the state
-				experimentStates.add(experimentStateService.createExperimentStateByExperimentIdAndStateTypeKind(experimentId, stateType, stateKind));
+				// create the state
+				experimentStates.add(experimentStateService
+						.createExperimentStateByExperimentIdAndStateTypeKind(experimentId, stateType, stateKind));
 				logger.debug("Created the experiment state: " + experimentStates.get(0).toJson());
 			}
 		}
-		//fetch the value, update it if it exists, and if it doesn't exist, create it
+		// fetch the value, update it if it exists, and if it doesn't exist, create it
 		List<ExperimentValue> experimentValues;
 		ExperimentValue experimentValue = null;
-		if(experiment != null) {
+		if (experiment != null) {
 			Long experimentId = experiment.getId();
-			experimentValues = getExperimentValuesByExperimentIdAndStateTypeKindAndValueTypeKind(experimentId, stateType, stateKind, valueType, valueKind);
-			if (experimentValues.size() > 1){
+			experimentValues = getExperimentValuesByExperimentIdAndStateTypeKindAndValueTypeKind(experimentId,
+					stateType, stateKind, valueType, valueKind);
+			if (experimentValues.size() > 1) {
 				logger.error("Error: multiple experiment values of same type and kind found for the same experiment");
-			}
-			else if (experimentValues.size() == 1){
+			} else if (experimentValues.size() == 1) {
 				experimentValue = experimentValues.get(0);
 				experimentValue.setIgnored(true);
 				experimentValue.merge();
 				logger.debug("Ignored the experiment value: " + experimentValue.toJson());
 			}
-			experimentValue = createExperimentValueByExperimentIdAndStateTypeKindAndValueTypeKind(experimentId, stateType, stateKind, valueType, valueKind, value);
+			experimentValue = createExperimentValueByExperimentIdAndStateTypeKindAndValueTypeKind(experimentId,
+					stateType, stateKind, valueType, valueKind, value);
 			logger.debug("Created the experiment value: " + experimentValue.toJson());
 		}
 		return experimentValue;
 	}
-	
+
 	private ExperimentValue createExperimentValueByExperimentIdAndStateTypeKindAndValueTypeKind(
 			Long experimentId, String stateType, String stateKind,
 			String valueType, String valueKind, String value) {
 		ExperimentValue experimentValue = new ExperimentValue();
-		ExperimentState experimentState = ExperimentState.findExperimentStatesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getSingleResult();
+		ExperimentState experimentState = ExperimentState
+				.findExperimentStatesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getSingleResult();
 		experimentValue.setLsState(experimentState);
 		experimentValue.setLsType(valueType);
 		experimentValue.setLsKind(valueKind);
-		if (valueType.equals("stringValue")) experimentValue.setStringValue(value);
-		if (valueType.equals("fileValue")) experimentValue.setFileValue(value);
-		if (valueType.equals("clobValue")) experimentValue.setClobValue(value);
-		if (valueType.equals("blobValue")) experimentValue.setBlobValue(value.getBytes(Charset.forName("UTF-8")));
-		if (valueType.equals("numericValue")) experimentValue.setNumericValue(new BigDecimal(value));
-		if (valueType.equals("dateValue")) experimentValue.setDateValue(new Date(Long.parseLong(value)));
-		if (valueType.equals("codeValue")) experimentValue.setCodeValue(value);
-		if (valueType.equals("urlValue")) experimentValue.setUrlValue(value);
+		if (valueType.equals("stringValue"))
+			experimentValue.setStringValue(value);
+		if (valueType.equals("fileValue"))
+			experimentValue.setFileValue(value);
+		if (valueType.equals("clobValue"))
+			experimentValue.setClobValue(value);
+		if (valueType.equals("blobValue"))
+			experimentValue.setBlobValue(value.getBytes(Charset.forName("UTF-8")));
+		if (valueType.equals("numericValue"))
+			experimentValue.setNumericValue(new BigDecimal(value));
+		if (valueType.equals("dateValue"))
+			experimentValue.setDateValue(new Date(Long.parseLong(value)));
+		if (valueType.equals("codeValue"))
+			experimentValue.setCodeValue(value);
+		if (valueType.equals("urlValue"))
+			experimentValue.setUrlValue(value);
 		experimentValue.setRecordedBy("default");
-		//TODO: figure out who to record as RecordedBy
+		// TODO: figure out who to record as RecordedBy
 		experimentValue.persist();
 		return experimentValue;
 	}
-	
+
 	@Override
 	public Collection<ExperimentValue> updateExperimentValues(
 			Collection<ExperimentValue> experimentValues) {
-		for (ExperimentValue experimentValue: experimentValues) {
+		for (ExperimentValue experimentValue : experimentValues) {
 			experimentValue = updateExperimentValue(experimentValue);
 		}
 		return experimentValues;
 	}
-	
+
 	@Override
 	public ExperimentValue getExperimentValue(String idOrCodeName,
 			String stateType, String stateKind, String valueType, String valueKind) {
 		ExperimentValue value = null;
-		try{
-			Collection<ExperimentValue> values = getExperimentValues(idOrCodeName, stateType, stateKind, valueType, valueKind);
+		try {
+			Collection<ExperimentValue> values = getExperimentValues(idOrCodeName, stateType, stateKind, valueType,
+					valueKind);
 			value = values.iterator().next();
-		}catch (Exception e){
-			logger.error("Caught error "+e.toString()+" trying to find a state.",e);
+		} catch (Exception e) {
+			logger.error("Caught error " + e.toString() + " trying to find a state.", e);
 			value = null;
 		}
 		return value;
@@ -298,23 +319,27 @@ public ExperimentValue getExperimentValue(String idOrCodeName,
 	public Collection<ExperimentValuePathDTO> getExperimentValues(
 			Collection<GenericValuePathRequest> genericRequests) {
 		Collection<ExperimentValuePathDTO> results = new ArrayList<ExperimentValuePathDTO>();
-		for (GenericValuePathRequest request : genericRequests){
+		for (GenericValuePathRequest request : genericRequests) {
 			ExperimentValuePathDTO result = new ExperimentValuePathDTO();
 			result.setIdOrCodeName(request.getIdOrCodeName());
 			result.setValueType(request.getValueType());
 			result.setValueKind(request.getValueKind());
-			result.setValues(getExperimentValues(request.getIdOrCodeName(), request.getStateType(), request.getStateKind(), request.getValueType(), request.getValueKind()));
+			result.setValues(getExperimentValues(request.getIdOrCodeName(), request.getStateType(),
+					request.getStateKind(), request.getValueType(), request.getValueKind()));
 			results.add(result);
 		}
 		return results;
 	}
-	
-	private Collection<ExperimentValue> getExperimentValues(String idOrCodeName, String stateType, String stateKind, String valueType, String valueKind){
-		if (SimpleUtil.isNumeric(idOrCodeName)){
+
+	private Collection<ExperimentValue> getExperimentValues(String idOrCodeName, String stateType, String stateKind,
+			String valueType, String valueKind) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			Long id = Long.valueOf(idOrCodeName);
-			return ExperimentValue.findExperimentValuesByExptIDAndStateTypeKindAndValueTypeKind(id, stateType, stateKind, valueType, valueKind).getResultList();
-		}else{
-			return ExperimentValue.findExperimentValuesByExperimentCodeNameAndStateTypeKindAndValueTypeKind(idOrCodeName, stateType, stateKind, valueType, valueKind).getResultList();
+			return ExperimentValue.findExperimentValuesByExptIDAndStateTypeKindAndValueTypeKind(id, stateType,
+					stateKind, valueType, valueKind).getResultList();
+		} else {
+			return ExperimentValue.findExperimentValuesByExperimentCodeNameAndStateTypeKindAndValueTypeKind(
+					idOrCodeName, stateType, stateKind, valueType, valueKind).getResultList();
 		}
 	}
 
diff --git a/src/main/java/com/labsynch/labseer/service/ExportService.java b/src/main/java/com/labsynch/labseer/service/ExportService.java
index 77bff5c1a..decbe0cf9 100644
--- a/src/main/java/com/labsynch/labseer/service/ExportService.java
+++ b/src/main/java/com/labsynch/labseer/service/ExportService.java
@@ -6,13 +6,11 @@
 import com.labsynch.labseer.dto.ExportResultDTO;
 import com.labsynch.labseer.dto.SearchResultExportRequestDTO;
 
-
 public interface ExportService {
 
-	ExportResultDTO exportSearchResults(SearchResultExportRequestDTO searchResultExportRequestDTO) throws FileNotFoundException;
+	ExportResultDTO exportSearchResults(SearchResultExportRequestDTO searchResultExportRequestDTO)
+			throws FileNotFoundException;
 
 	ExportResultDTO exportLots(String filePath, Collection<String> lotCorpNames) throws FileNotFoundException;
 
-
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ExportServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ExportServiceImpl.java
index 655a781b9..a197f846a 100644
--- a/src/main/java/com/labsynch/labseer/service/ExportServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ExportServiceImpl.java
@@ -33,10 +33,10 @@
 public class ExportServiceImpl implements ExportService {
 
 	Logger logger = LoggerFactory.getLogger(ExportServiceImpl.class);
-	
+
 	@Autowired
 	CmpdRegSDFWriterFactory cmpdRegSDFWriterFactory;
-	
+
 	@Autowired
 	CmpdRegMoleculeFactory cmpdRegMoleculeFactory;
 
@@ -44,137 +44,204 @@ public class ExportServiceImpl implements ExportService {
 	public ExportResultDTO exportSearchResults(
 			SearchResultExportRequestDTO searchResultExportRequestDTO) throws FileNotFoundException {
 		Collection<String> lotCorpNames = new HashSet<String>();
-		for( SearchCompoundReturnDTO compound: searchResultExportRequestDTO.getSearchFormResultsDTO().getFoundCompounds()){
-			for (SearchLotDTO lot : compound.getLotIDs()){
+		for (SearchCompoundReturnDTO compound : searchResultExportRequestDTO.getSearchFormResultsDTO()
+				.getFoundCompounds()) {
+			for (SearchLotDTO lot : compound.getLotIDs()) {
 				lotCorpNames.add(lot.getCorpName());
 			}
 		}
 		ExportResultDTO exportResult = exportLots(searchResultExportRequestDTO.getFilePath(), lotCorpNames);
 		return exportResult;
 	}
-	
+
 	@Override
-	public ExportResultDTO exportLots(String filePath, Collection<String> lotCorpNames) throws FileNotFoundException{
+	public ExportResultDTO exportLots(String filePath, Collection<String> lotCorpNames) throws FileNotFoundException {
 		ExportResultDTO result = new ExportResultDTO();
 		result.setReportFilePath(filePath);
 		Collection<Lot> foundLots = getLotsByCorpNames(lotCorpNames);
 		Collection<LotDTO> lotDTOs = new HashSet<LotDTO>();
-		for (Lot foundLot : foundLots){
+		for (Lot foundLot : foundLots) {
 			LotDTO lotDTO = new LotDTO(foundLot);
 			lotDTOs.add(lotDTO);
 		}
-		logger.debug("Attempting to export "+lotDTOs.size()+" lots");
-//		FileOutputStream exportSDFOutStream = new FileOutputStream(filePath, false);
+		logger.debug("Attempting to export " + lotDTOs.size() + " lots");
+		// FileOutputStream exportSDFOutStream = new FileOutputStream(filePath, false);
 		int lotsLoaded;
-		try{
+		try {
 			lotsLoaded = writeLotsToSDF(filePath, lotDTOs);
-			String summary = "Successfully exported "+ lotsLoaded+" lots.";
+			String summary = "Successfully exported " + lotsLoaded + " lots.";
 			result.setSummary(summary);
 			return result;
-		}catch (Exception e){
-			logger.error("Caught exception trying to write export sdf",e);
+		} catch (Exception e) {
+			logger.error("Caught exception trying to write export sdf", e);
 			result.setLevel("error");
 			result.setMessage(e.getMessage());
 			return result;
 		}
 	}
-	
-	private Collection<Lot> getLotsByCorpNames(Collection<String> lotCorpNames){
+
+	private Collection<Lot> getLotsByCorpNames(Collection<String> lotCorpNames) {
 		EntityManager em = Lot.entityManager();
-    	List<String> batchCodes = new ArrayList<String>();
-    	batchCodes.addAll(lotCorpNames);
-    	String queryString = "Select lot "
-    			+ "FROM Lot lot "
-    			+ "WHERE ";
-    	Collection<Query> queries = SimpleUtil.splitHqlInClause(em, queryString, "lot.corpName", batchCodes);
-    	Collection<Lot> results = new ArrayList<Lot>();
-		logger.debug("Querying for "+batchCodes.size()+" lot corpnames");
-		for (Query q : queries){
-			if (logger.isDebugEnabled()) logger.debug(q.unwrap(org.hibernate.Query.class).getQueryString());
+		List<String> batchCodes = new ArrayList<String>();
+		batchCodes.addAll(lotCorpNames);
+		String queryString = "Select lot "
+				+ "FROM Lot lot "
+				+ "WHERE ";
+		Collection<Query> queries = SimpleUtil.splitHqlInClause(em, queryString, "lot.corpName", batchCodes);
+		Collection<Lot> results = new ArrayList<Lot>();
+		logger.debug("Querying for " + batchCodes.size() + " lot corpnames");
+		for (Query q : queries) {
+			if (logger.isDebugEnabled())
+				logger.debug(q.unwrap(org.hibernate.Query.class).getQueryString());
 			results.addAll(q.getResultList());
 		}
 		return results;
 	}
-	
-	private int writeLotsToSDF(String exportSDFFileName, Collection<LotDTO> lotDTOs) throws IllegalArgumentException, IOException, CmpdRegMolFormatException{
+
+	private int writeLotsToSDF(String exportSDFFileName, Collection<LotDTO> lotDTOs)
+			throws IllegalArgumentException, IOException, CmpdRegMolFormatException {
 		CmpdRegSDFWriter exporter = cmpdRegSDFWriterFactory.getCmpdRegSDFWriter(exportSDFFileName);
-		for (LotDTO lotDTO : lotDTOs){
+		for (LotDTO lotDTO : lotDTOs) {
 			CmpdRegMolecule mol = cmpdRegMoleculeFactory.getCmpdRegMolecule(lotDTO.getParentStructure());
 			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-			if (lotDTO.getAbsorbance() != null) mol.setProperty("Absorbance", lotDTO.getAbsorbance().toString());
-			if (lotDTO.getAmount() != null) mol.setProperty("Amount", lotDTO.getAmount().toString());
-			if (lotDTO.getAmountUnitsCode() != null) mol.setProperty("Amount Units Code", lotDTO.getAmountUnitsCode());
-			if (lotDTO.getBarcode() != null) mol.setProperty("Barcode", lotDTO.getBarcode());
-			if (lotDTO.getBoilingPoint() != null) mol.setProperty("Boiling Point", lotDTO.getBoilingPoint().toString());
-			if (lotDTO.getBuid() != null) mol.setProperty("Buid", lotDTO.getBuid().toString());
-			if (lotDTO.getBulkLoadFile() != null) mol.setProperty("Bulk Load File", lotDTO.getBulkLoadFile());
-			if (lotDTO.getChemist() != null) mol.setProperty("Chemist", lotDTO.getChemist());
-			if (lotDTO.getColor() != null) mol.setProperty("Color", lotDTO.getColor());
-			if (lotDTO.getComments() != null) mol.setProperty("Comments", lotDTO.getComments());
-			if (lotDTO.getLotAliases() != null) mol.setProperty("Lot Aliases", lotDTO.getLotAliases());
-			if (lotDTO.getLotCorpName() != null) mol.setProperty("Lot Corp Name", lotDTO.getLotCorpName());
-			if (lotDTO.getIsVirtual() != null) mol.setProperty("Is Virtual", lotDTO.getIsVirtual().toString());
-			if (lotDTO.getLambda() != null) mol.setProperty("Lambda", lotDTO.getLambda().toString());
-			if (lotDTO.getLotMolWeight() != null) mol.setProperty("Lot Mol Weight", lotDTO.getLotMolWeight().toString());
+			if (lotDTO.getAbsorbance() != null)
+				mol.setProperty("Absorbance", lotDTO.getAbsorbance().toString());
+			if (lotDTO.getAmount() != null)
+				mol.setProperty("Amount", lotDTO.getAmount().toString());
+			if (lotDTO.getAmountUnitsCode() != null)
+				mol.setProperty("Amount Units Code", lotDTO.getAmountUnitsCode());
+			if (lotDTO.getBarcode() != null)
+				mol.setProperty("Barcode", lotDTO.getBarcode());
+			if (lotDTO.getBoilingPoint() != null)
+				mol.setProperty("Boiling Point", lotDTO.getBoilingPoint().toString());
+			if (lotDTO.getBuid() != null)
+				mol.setProperty("Buid", lotDTO.getBuid().toString());
+			if (lotDTO.getBulkLoadFile() != null)
+				mol.setProperty("Bulk Load File", lotDTO.getBulkLoadFile());
+			if (lotDTO.getChemist() != null)
+				mol.setProperty("Chemist", lotDTO.getChemist());
+			if (lotDTO.getColor() != null)
+				mol.setProperty("Color", lotDTO.getColor());
+			if (lotDTO.getComments() != null)
+				mol.setProperty("Comments", lotDTO.getComments());
+			if (lotDTO.getLotAliases() != null)
+				mol.setProperty("Lot Aliases", lotDTO.getLotAliases());
+			if (lotDTO.getLotCorpName() != null)
+				mol.setProperty("Lot Corp Name", lotDTO.getLotCorpName());
+			if (lotDTO.getIsVirtual() != null)
+				mol.setProperty("Is Virtual", lotDTO.getIsVirtual().toString());
+			if (lotDTO.getLambda() != null)
+				mol.setProperty("Lambda", lotDTO.getLambda().toString());
+			if (lotDTO.getLotMolWeight() != null)
+				mol.setProperty("Lot Mol Weight", lotDTO.getLotMolWeight().toString());
 			mol.setProperty("Lot Number", Integer.toString(lotDTO.getLotNumber()));
-			if (lotDTO.getMeltingPoint() != null) mol.setProperty("Melting Point", lotDTO.getMeltingPoint().toString());
-			if (lotDTO.getModifiedBy() != null) mol.setProperty("Modified By", lotDTO.getModifiedBy());
-			if (lotDTO.getModifiedDate() != null) mol.setProperty("Modified Date", dateFormat.format(lotDTO.getModifiedDate()));
-			if (lotDTO.getNotebookPage() != null) mol.setProperty("Notebook Page", lotDTO.getNotebookPage());
-			if (lotDTO.getObservedMassOne() != null) mol.setProperty("Observed Mass #1", lotDTO.getObservedMassOne().toString());
-			if (lotDTO.getObservedMassTwo() != null) mol.setProperty("Observed Mass #2", lotDTO.getObservedMassTwo().toString());
-			if (lotDTO.getPercentEE() != null) mol.setProperty("Percent EE", lotDTO.getPercentEE().toString());
-			if (lotDTO.getPhysicalStateCode() != null) mol.setProperty("Physical State Code", lotDTO.getPhysicalStateCode());
-			if (lotDTO.getProject() != null) mol.setProperty("Project", lotDTO.getProject());
-			if (lotDTO.getPurity() != null) mol.setProperty("Purity", lotDTO.getPurity().toString());
-			if (lotDTO.getPurityMeasuredByCode() != null) mol.setProperty("Purity Measured By Code", lotDTO.getPurityMeasuredByCode());
-			if (lotDTO.getPurityOperatorCode() != null) mol.setProperty("Purity Operator Code", lotDTO.getPurityOperatorCode());
-			if (lotDTO.getRegistrationDate() != null) mol.setProperty("Registration Date", dateFormat.format(lotDTO.getRegistrationDate()));
-			if (lotDTO.getRetain() != null) mol.setProperty("Retain", lotDTO.getRetain().toString());
-			if (lotDTO.getRetainLocation() != null) mol.setProperty("Retain Location", lotDTO.getRetainLocation());
-			if (lotDTO.getRetainUnitsCode() != null) mol.setProperty("Retain Units Code", lotDTO.getRetainUnitsCode());
-			if (lotDTO.getLotRegisteredBy() != null) mol.setProperty("Lot Registered By", lotDTO.getLotRegisteredBy());
-			if (lotDTO.getSolutionAmount() != null) mol.setProperty("Solution Amount", lotDTO.getSolutionAmount().toString());
-			if (lotDTO.getSolutionAmountUnitsCode() != null) mol.setProperty("Solution Amount Units Code", lotDTO.getSolutionAmountUnitsCode());
-			if (lotDTO.getStockLocation() != null) mol.setProperty("Stock Location", lotDTO.getStockLocation());
-			if (lotDTO.getStockSolvent() != null) mol.setProperty("Stock Solvent", lotDTO.getStockSolvent());
-			if (lotDTO.getSupplier() != null) mol.setProperty("Supplier", lotDTO.getSupplier());
-			if (lotDTO.getSupplierID() != null) mol.setProperty("Supplier ID", lotDTO.getSupplierID());
-			if (lotDTO.getVendorId() != null) mol.setProperty("Vendor ID", lotDTO.getVendorId());
-			if (lotDTO.getSupplierLot() != null) mol.setProperty("Supplier Lot", lotDTO.getSupplierLot());
-			if (lotDTO.getSynthesisDate() != null) mol.setProperty("Synthesis Date", dateFormat.format(lotDTO.getSynthesisDate()));
-			if (lotDTO.getTareWeight() != null) mol.setProperty("Tare Weight", lotDTO.getTareWeight().toString());
-			if (lotDTO.getTareWeightUnitsCode() != null) mol.setProperty("Tare Weight Units Code", lotDTO.getTareWeightUnitsCode());
-			if (lotDTO.getTotalAmountStored() != null) mol.setProperty("Total Amount Stored", lotDTO.getTotalAmountStored().toString());
-			if (lotDTO.getTotalAmountStoredUnitsCode() != null) mol.setProperty("Total Amount Stored Units Code", lotDTO.getTotalAmountStoredUnitsCode());
-			if (lotDTO.getVendorCode() != null) mol.setProperty("Vendor Code", lotDTO.getVendorCode());
-			if (lotDTO.getSaltFormCorpName() != null) mol.setProperty("Salt Form Corp Name", lotDTO.getSaltFormCorpName());
-			if (lotDTO.getCasNumber() != null) mol.setProperty("CAS Number", lotDTO.getCasNumber());
-			if (lotDTO.getSaltAbbrevs() != null) mol.setProperty("Salt Abbrevs", lotDTO.getSaltAbbrevs());
-			if (lotDTO.getSaltEquivalents() != null) mol.setProperty("Salt Equivalents", lotDTO.getSaltEquivalents());
-			if (lotDTO.getParentCorpName() != null) mol.setProperty("Parent Corp Name", lotDTO.getParentCorpName());
+			if (lotDTO.getMeltingPoint() != null)
+				mol.setProperty("Melting Point", lotDTO.getMeltingPoint().toString());
+			if (lotDTO.getModifiedBy() != null)
+				mol.setProperty("Modified By", lotDTO.getModifiedBy());
+			if (lotDTO.getModifiedDate() != null)
+				mol.setProperty("Modified Date", dateFormat.format(lotDTO.getModifiedDate()));
+			if (lotDTO.getNotebookPage() != null)
+				mol.setProperty("Notebook Page", lotDTO.getNotebookPage());
+			if (lotDTO.getObservedMassOne() != null)
+				mol.setProperty("Observed Mass #1", lotDTO.getObservedMassOne().toString());
+			if (lotDTO.getObservedMassTwo() != null)
+				mol.setProperty("Observed Mass #2", lotDTO.getObservedMassTwo().toString());
+			if (lotDTO.getPercentEE() != null)
+				mol.setProperty("Percent EE", lotDTO.getPercentEE().toString());
+			if (lotDTO.getPhysicalStateCode() != null)
+				mol.setProperty("Physical State Code", lotDTO.getPhysicalStateCode());
+			if (lotDTO.getProject() != null)
+				mol.setProperty("Project", lotDTO.getProject());
+			if (lotDTO.getPurity() != null)
+				mol.setProperty("Purity", lotDTO.getPurity().toString());
+			if (lotDTO.getPurityMeasuredByCode() != null)
+				mol.setProperty("Purity Measured By Code", lotDTO.getPurityMeasuredByCode());
+			if (lotDTO.getPurityOperatorCode() != null)
+				mol.setProperty("Purity Operator Code", lotDTO.getPurityOperatorCode());
+			if (lotDTO.getRegistrationDate() != null)
+				mol.setProperty("Registration Date", dateFormat.format(lotDTO.getRegistrationDate()));
+			if (lotDTO.getRetain() != null)
+				mol.setProperty("Retain", lotDTO.getRetain().toString());
+			if (lotDTO.getRetainLocation() != null)
+				mol.setProperty("Retain Location", lotDTO.getRetainLocation());
+			if (lotDTO.getRetainUnitsCode() != null)
+				mol.setProperty("Retain Units Code", lotDTO.getRetainUnitsCode());
+			if (lotDTO.getLotRegisteredBy() != null)
+				mol.setProperty("Lot Registered By", lotDTO.getLotRegisteredBy());
+			if (lotDTO.getSolutionAmount() != null)
+				mol.setProperty("Solution Amount", lotDTO.getSolutionAmount().toString());
+			if (lotDTO.getSolutionAmountUnitsCode() != null)
+				mol.setProperty("Solution Amount Units Code", lotDTO.getSolutionAmountUnitsCode());
+			if (lotDTO.getStockLocation() != null)
+				mol.setProperty("Stock Location", lotDTO.getStockLocation());
+			if (lotDTO.getStockSolvent() != null)
+				mol.setProperty("Stock Solvent", lotDTO.getStockSolvent());
+			if (lotDTO.getSupplier() != null)
+				mol.setProperty("Supplier", lotDTO.getSupplier());
+			if (lotDTO.getSupplierID() != null)
+				mol.setProperty("Supplier ID", lotDTO.getSupplierID());
+			if (lotDTO.getVendorId() != null)
+				mol.setProperty("Vendor ID", lotDTO.getVendorId());
+			if (lotDTO.getSupplierLot() != null)
+				mol.setProperty("Supplier Lot", lotDTO.getSupplierLot());
+			if (lotDTO.getSynthesisDate() != null)
+				mol.setProperty("Synthesis Date", dateFormat.format(lotDTO.getSynthesisDate()));
+			if (lotDTO.getTareWeight() != null)
+				mol.setProperty("Tare Weight", lotDTO.getTareWeight().toString());
+			if (lotDTO.getTareWeightUnitsCode() != null)
+				mol.setProperty("Tare Weight Units Code", lotDTO.getTareWeightUnitsCode());
+			if (lotDTO.getTotalAmountStored() != null)
+				mol.setProperty("Total Amount Stored", lotDTO.getTotalAmountStored().toString());
+			if (lotDTO.getTotalAmountStoredUnitsCode() != null)
+				mol.setProperty("Total Amount Stored Units Code", lotDTO.getTotalAmountStoredUnitsCode());
+			if (lotDTO.getVendorCode() != null)
+				mol.setProperty("Vendor Code", lotDTO.getVendorCode());
+			if (lotDTO.getSaltFormCorpName() != null)
+				mol.setProperty("Salt Form Corp Name", lotDTO.getSaltFormCorpName());
+			if (lotDTO.getCasNumber() != null)
+				mol.setProperty("CAS Number", lotDTO.getCasNumber());
+			if (lotDTO.getSaltAbbrevs() != null)
+				mol.setProperty("Salt Abbrevs", lotDTO.getSaltAbbrevs());
+			if (lotDTO.getSaltEquivalents() != null)
+				mol.setProperty("Salt Equivalents", lotDTO.getSaltEquivalents());
+			if (lotDTO.getParentCorpName() != null)
+				mol.setProperty("Parent Corp Name", lotDTO.getParentCorpName());
 			mol.setProperty("Parent Number", Long.toString(lotDTO.getParentNumber()));
-			if (lotDTO.getParentCommonName() != null) mol.setProperty("Parent Common Name", lotDTO.getParentCommonName());
-			if (lotDTO.getParentStereoCategory() != null) mol.setProperty("Parent Stereo Category", lotDTO.getParentStereoCategory());
-			if (lotDTO.getParentStereoComment() != null) mol.setProperty("Parent Stereo Comment", lotDTO.getParentStereoComment());
-			if (lotDTO.getParentMolWeight() != null) mol.setProperty("Parent Mol Weight", lotDTO.getParentMolWeight().toString());
-			if (lotDTO.getParentExactMass() != null) mol.setProperty("Parent Exact Mass", lotDTO.getParentExactMass().toString());
-			if (lotDTO.getParentMolFormula() != null) mol.setProperty("Parent Mol Formula", lotDTO.getParentMolFormula());
-			if (lotDTO.getParentRegistrationDate() != null) mol.setProperty("Parent Registration Date", dateFormat.format(lotDTO.getParentRegistrationDate()));
-			if (lotDTO.getParentRegisteredBy() != null) mol.setProperty("Parent Registered By", lotDTO.getParentRegisteredBy());
-			if (lotDTO.getParentModifiedDate() != null) mol.setProperty("Parent Modified Date", dateFormat.format(lotDTO.getParentModifiedDate()));
-			if (lotDTO.getParentModifiedBy() != null) mol.setProperty("Parent Modified By", lotDTO.getParentModifiedBy());
-			if (lotDTO.getParentAliases() != null) mol.setProperty("Parent Aliases", lotDTO.getParentAliases());
-			if (lotDTO.getParentAnnotationCode() != null) mol.setProperty("Parent Annotation Code", lotDTO.getParentAnnotationCode());
-			if (lotDTO.getParentCompoundTypeCode() != null) mol.setProperty("Parent Compound Type Code", lotDTO.getParentCompoundTypeCode());
-			if (lotDTO.getParentComment() != null) mol.setProperty("Parent Comment", lotDTO.getParentComment());
-			if (lotDTO.getParentIsMixture() != null) mol.setProperty("Parent Is Mixture", lotDTO.getParentIsMixture().toString());
+			if (lotDTO.getParentCommonName() != null)
+				mol.setProperty("Parent Common Name", lotDTO.getParentCommonName());
+			if (lotDTO.getParentStereoCategory() != null)
+				mol.setProperty("Parent Stereo Category", lotDTO.getParentStereoCategory());
+			if (lotDTO.getParentStereoComment() != null)
+				mol.setProperty("Parent Stereo Comment", lotDTO.getParentStereoComment());
+			if (lotDTO.getParentMolWeight() != null)
+				mol.setProperty("Parent Mol Weight", lotDTO.getParentMolWeight().toString());
+			if (lotDTO.getParentExactMass() != null)
+				mol.setProperty("Parent Exact Mass", lotDTO.getParentExactMass().toString());
+			if (lotDTO.getParentMolFormula() != null)
+				mol.setProperty("Parent Mol Formula", lotDTO.getParentMolFormula());
+			if (lotDTO.getParentRegistrationDate() != null)
+				mol.setProperty("Parent Registration Date", dateFormat.format(lotDTO.getParentRegistrationDate()));
+			if (lotDTO.getParentRegisteredBy() != null)
+				mol.setProperty("Parent Registered By", lotDTO.getParentRegisteredBy());
+			if (lotDTO.getParentModifiedDate() != null)
+				mol.setProperty("Parent Modified Date", dateFormat.format(lotDTO.getParentModifiedDate()));
+			if (lotDTO.getParentModifiedBy() != null)
+				mol.setProperty("Parent Modified By", lotDTO.getParentModifiedBy());
+			if (lotDTO.getParentAliases() != null)
+				mol.setProperty("Parent Aliases", lotDTO.getParentAliases());
+			if (lotDTO.getParentAnnotationCode() != null)
+				mol.setProperty("Parent Annotation Code", lotDTO.getParentAnnotationCode());
+			if (lotDTO.getParentCompoundTypeCode() != null)
+				mol.setProperty("Parent Compound Type Code", lotDTO.getParentCompoundTypeCode());
+			if (lotDTO.getParentComment() != null)
+				mol.setProperty("Parent Comment", lotDTO.getParentComment());
+			if (lotDTO.getParentIsMixture() != null)
+				mol.setProperty("Parent Is Mixture", lotDTO.getParentIsMixture().toString());
 			exporter.writeMol(mol);
 		}
 		exporter.close();
 		return lotDTOs.size();
 	}
 
-	
 }
-
diff --git a/src/main/java/com/labsynch/labseer/service/GeneThingService.java b/src/main/java/com/labsynch/labseer/service/GeneThingService.java
index 81e1b866b..ed854c401 100755
--- a/src/main/java/com/labsynch/labseer/service/GeneThingService.java
+++ b/src/main/java/com/labsynch/labseer/service/GeneThingService.java
@@ -37,7 +37,7 @@ LsThing saveOrthologEntity(String versionName, String testFileName, String ortho
 
 	Collection<GeneOrthologDTO> saveOrthologInteractions(Collection<GeneOrthologDTO> geneOrthologs);
 
-//	void fixDiscontinuedEntrezGeneIDs(String geneHistoryFile, String taxonomyId) throws IOException;
-
+	// void fixDiscontinuedEntrezGeneIDs(String geneHistoryFile, String taxonomyId)
+	// throws IOException;
 
 }
diff --git a/src/main/java/com/labsynch/labseer/service/GeneThingServiceImpl.java b/src/main/java/com/labsynch/labseer/service/GeneThingServiceImpl.java
index f3a9b9b02..5e33fa49d 100755
--- a/src/main/java/com/labsynch/labseer/service/GeneThingServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/GeneThingServiceImpl.java
@@ -64,14 +64,13 @@ public class GeneThingServiceImpl implements GeneThingService {
 	@Autowired
 	public AutoLabelService autoLabelService;
 
-
 	@Override
-	public void RegisterDiscontinuedGenesFromCSV(String inputFile) throws IOException{
+	public void RegisterDiscontinuedGenesFromCSV(String inputFile) throws IOException {
 
 	}
 
 	@Override
-	public void RegisterGeneThingsFromCSV(String inputFile) throws IOException{
+	public void RegisterGeneThingsFromCSV(String inputFile) throws IOException {
 
 		logger.debug("read tab delimited file");
 		BufferedReader br = new BufferedReader(new FileReader(inputFile));
@@ -85,16 +84,14 @@ public void RegisterGeneThingsFromCSV(String inputFile) throws IOException{
 			beanReader = new CsvBeanReader(br, CsvPreference.TAB_PREFERENCE);
 			String[] headerText = beanReader.getHeader(true);
 
-			//set up gene type and kinds (check if already exists)
+			// set up gene type and kinds (check if already exists)
 			setGeneDefaults();
 
-
 			String geneTypeString = "gene";
 			String geneKindString = "entrez gene";
 			String thingTypeAndKind = "gene_entrez gene";
 			String labelTypeAndKind = "name_gene code name";
 
-
 			// map header text to standard bean names
 
 			HashMap<String, String> geneBeanMap = new HashMap<String, String>();
@@ -116,45 +113,46 @@ public void RegisterGeneThingsFromCSV(String inputFile) throws IOException{
 
 			List<String> headerList = new ArrayList<String>();
 			int position = 0;
-			for (String head : headerText){
+			for (String head : headerText) {
 				logger.debug("header column: " + position + "  " + head);
-				if (geneBeanMap.get(head) != null){
-					headerList.add(geneBeanMap.get(head));   				
+				if (geneBeanMap.get(head) != null) {
+					headerList.add(geneBeanMap.get(head));
 				}
 				position++;
 			}
 
-
 			logger.debug("size of header list  " + headerList.size());
 			String[] header = new String[headerList.size()];
 			headerList.toArray(header);
 
-			for (String head : header){
+			for (String head : header) {
 				logger.warn("header column array : " + position + "  " + head);
 				position++;
 			}
 
-
 			final CellProcessor[] processors = getProcessors();
 
 			EntrezDbGeneDTO geneDTO;
 
 			int numberOfLines = SimpleUtil.countLines(inputFile);
-			Long numberOfLabels = new Long(numberOfLines-1);
+			Long numberOfLabels = new Long(numberOfLines - 1);
 
-			List<AutoLabelDTO> thingCodes = autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels);
+			List<AutoLabelDTO> thingCodes = autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind,
+					numberOfLabels);
 
 			int i = 0;
 			int batchSize = 25;
 			LsThing geneThing = null;
-			while( (geneDTO = beanReader.read(EntrezDbGeneDTO.class, header, processors)) != null ) {
-				System.out.println(String.format("lineNo=%s, rowNo=%s, bulkData=%s", beanReader.getLineNumber(), beanReader.getRowNumber(), geneDTO));
+			while ((geneDTO = beanReader.read(EntrezDbGeneDTO.class, header, processors)) != null) {
+				System.out.println(String.format("lineNo=%s, rowNo=%s, bulkData=%s", beanReader.getLineNumber(),
+						beanReader.getRowNumber(), geneDTO));
 				logger.debug("current gene: " + geneDTO.getGeneId());
 
 				// check if gene currently exists
-				Long geneIdCount = LsThingLabel.countOfLsThingByName(geneTypeString, geneKindString, "name", "Entrez Gene ID", geneDTO.getGeneId());
+				Long geneIdCount = LsThingLabel.countOfLsThingByName(geneTypeString, geneKindString, "name",
+						"Entrez Gene ID", geneDTO.getGeneId());
 
-				if (geneIdCount == 0L){
+				if (geneIdCount == 0L) {
 
 					geneThing = new LsThing();
 					geneThing.setCodeName(thingCodes.get(i).getAutoLabel());
@@ -165,12 +163,18 @@ public void RegisterGeneThingsFromCSV(String inputFile) throws IOException{
 					geneThing.persist();
 
 					String entrezSeparator = "\\|";
-					saveGeneLabel(lsTransaction, geneThing, "name", "Entrez Gene ID", true, geneDTO.getGeneId(), entrezSeparator);
-					saveGeneLabel(lsTransaction, geneThing, "name", "gene symbol", false, geneDTO.getSymbol(), entrezSeparator);
-					saveGeneLabel(lsTransaction, geneThing, "name", "gene synonym", false, geneDTO.getSynonyms(), entrezSeparator);
-					saveGeneLabel(lsTransaction, geneThing, "name", "authoritative gene name", false, geneDTO.getFullNameFromAuthority(), entrezSeparator);
-					saveGeneLabel(lsTransaction, geneThing, "name", "authoritative gene symbol", false, geneDTO.getSymbolFromAuthority(), entrezSeparator);
-					saveGeneLabel(lsTransaction, geneThing, "name", "other designations", false, geneDTO.getOtherDesignations(), entrezSeparator);
+					saveGeneLabel(lsTransaction, geneThing, "name", "Entrez Gene ID", true, geneDTO.getGeneId(),
+							entrezSeparator);
+					saveGeneLabel(lsTransaction, geneThing, "name", "gene symbol", false, geneDTO.getSymbol(),
+							entrezSeparator);
+					saveGeneLabel(lsTransaction, geneThing, "name", "gene synonym", false, geneDTO.getSynonyms(),
+							entrezSeparator);
+					saveGeneLabel(lsTransaction, geneThing, "name", "authoritative gene name", false,
+							geneDTO.getFullNameFromAuthority(), entrezSeparator);
+					saveGeneLabel(lsTransaction, geneThing, "name", "authoritative gene symbol", false,
+							geneDTO.getSymbolFromAuthority(), entrezSeparator);
+					saveGeneLabel(lsTransaction, geneThing, "name", "other designations", false,
+							geneDTO.getOtherDesignations(), entrezSeparator);
 
 					LsThingState geneState = new LsThingState();
 					geneState.setLsThing(geneThing);
@@ -180,17 +184,26 @@ public void RegisterGeneThingsFromCSV(String inputFile) throws IOException{
 					geneState.setRecordedBy("acas admin");
 					geneState.persist();
 
-					saveGeneDescriptor(lsTransaction, geneState, "stringValue", "tax id", geneDTO.getTaxId(), entrezSeparator);
-					saveGeneDescriptor(lsTransaction, geneState, "stringValue", "locus tag", geneDTO.getLocusTag(), entrezSeparator);
-					saveGeneDescriptor(lsTransaction, geneState, "stringValue", "dbXrefs", geneDTO.getDbXrefs(), entrezSeparator);
-					saveGeneDescriptor(lsTransaction, geneState, "stringValue", "chromosome", geneDTO.getChromosome(), entrezSeparator);
-					saveGeneDescriptor(lsTransaction, geneState, "stringValue", "map location", geneDTO.getMapLocation(), entrezSeparator);
-					saveGeneDescriptor(lsTransaction, geneState, "stringValue", "description", geneDTO.getDescription(), entrezSeparator);
-					saveGeneDescriptor(lsTransaction, geneState, "stringValue", "type of gene", geneDTO.getTypeOfGene(), entrezSeparator);
-					saveGeneDescriptor(lsTransaction, geneState, "stringValue", "nomenclature status", geneDTO.getNomenclatureStatus(), entrezSeparator);
-					saveGeneDescriptor(lsTransaction, geneState, "dateValue", "modification date", geneDTO.getModificationDate());
-
-					if ( i % batchSize == 0 ) { // same as the JDBC batch size
+					saveGeneDescriptor(lsTransaction, geneState, "stringValue", "tax id", geneDTO.getTaxId(),
+							entrezSeparator);
+					saveGeneDescriptor(lsTransaction, geneState, "stringValue", "locus tag", geneDTO.getLocusTag(),
+							entrezSeparator);
+					saveGeneDescriptor(lsTransaction, geneState, "stringValue", "dbXrefs", geneDTO.getDbXrefs(),
+							entrezSeparator);
+					saveGeneDescriptor(lsTransaction, geneState, "stringValue", "chromosome", geneDTO.getChromosome(),
+							entrezSeparator);
+					saveGeneDescriptor(lsTransaction, geneState, "stringValue", "map location",
+							geneDTO.getMapLocation(), entrezSeparator);
+					saveGeneDescriptor(lsTransaction, geneState, "stringValue", "description", geneDTO.getDescription(),
+							entrezSeparator);
+					saveGeneDescriptor(lsTransaction, geneState, "stringValue", "type of gene", geneDTO.getTypeOfGene(),
+							entrezSeparator);
+					saveGeneDescriptor(lsTransaction, geneState, "stringValue", "nomenclature status",
+							geneDTO.getNomenclatureStatus(), entrezSeparator);
+					saveGeneDescriptor(lsTransaction, geneState, "dateValue", "modification date",
+							geneDTO.getModificationDate());
+
+					if (i % batchSize == 0) { // same as the JDBC batch size
 						geneThing.flush();
 						geneThing.clear();
 					}
@@ -200,20 +213,19 @@ public void RegisterGeneThingsFromCSV(String inputFile) throws IOException{
 					logger.warn("current gene id exists in the database: " + geneDTO.getGeneId());
 				}
 
-
-
 			}
-		}
-		finally {
-			if( beanReader != null ) {
+		} finally {
+			if (beanReader != null) {
 				beanReader.close();
 			}
-			if (br != null)br.close();
+			if (br != null)
+				br.close();
 		}
 
 	}
 
-	public LsThingValue saveGeneDescriptor(LsTransaction lsTransaction, LsThingState geneState, String lsType, String lsKind, Date dateValue) {
+	public LsThingValue saveGeneDescriptor(LsTransaction lsTransaction, LsThingState geneState, String lsType,
+			String lsKind, Date dateValue) {
 		LsThingValue lsValue = new LsThingValue();
 		lsValue.setLsState(geneState);
 		lsValue.setLsType(lsType);
@@ -227,12 +239,13 @@ public LsThingValue saveGeneDescriptor(LsTransaction lsTransaction, LsThingState
 
 	}
 
-	public List<LsThingValue> saveGeneDescriptor(LsTransaction lsTransaction, LsThingState geneState, String lsType, String lsKind, String dataValues, String entrezSeparator) {
+	public List<LsThingValue> saveGeneDescriptor(LsTransaction lsTransaction, LsThingState geneState, String lsType,
+			String lsKind, String dataValues, String entrezSeparator) {
 		List<LsThingValue> lsValues = new ArrayList<LsThingValue>();
-		if (dataValues != null){
+		if (dataValues != null) {
 			String[] valueList = dataValues.split(entrezSeparator);
-			for (String value : valueList){
-				if (value.equalsIgnoreCase("-")){
+			for (String value : valueList) {
+				if (value.equalsIgnoreCase("-")) {
 					logger.debug("skipping gene descriptor: " + value);
 				} else {
 					LsThingValue lsValue = new LsThingValue();
@@ -246,34 +259,36 @@ public List<LsThingValue> saveGeneDescriptor(LsTransaction lsTransaction, LsThin
 					lsValues.add(lsValue);
 					logger.debug("saving gene descriptor: " + value);
 				}
-			}					
+			}
 		}
 		return lsValues;
 	}
 
-	public List<LsThingLabel> saveGeneLabel(LsTransaction lsTransaction, LsThing geneThing, String labelType, String labelKind, boolean preferred, String labels, String entrezSeparator) {
+	public List<LsThingLabel> saveGeneLabel(LsTransaction lsTransaction, LsThing geneThing, String labelType,
+			String labelKind, boolean preferred, String labels, String entrezSeparator) {
 
 		List<LsThingLabel> geneLabels = LsThingLabel.findLsThingLabelsByLsThing(geneThing).getResultList();
 		Map<String, LsThingLabel> existingLabels = new HashMap<String, LsThingLabel>();
-		String geneLabelKey ;
-		for (LsThingLabel geneLabel : geneLabels){
+		String geneLabelKey;
+		for (LsThingLabel geneLabel : geneLabels) {
 			geneLabelKey = new StringBuilder().append(geneLabel.getLsType()).append("_")
 					.append(geneLabel.getLsKind()).append("_").append(geneLabel.getLabelText()).toString();
-			existingLabels.put(geneLabelKey, geneLabel);			
+			existingLabels.put(geneLabelKey, geneLabel);
 		}
 		List<LsThingLabel> newLabels = new ArrayList<LsThingLabel>();
 		if (labels != null) {
 			String[] labelList = labels.split(entrezSeparator);
-			for (String label : labelList){
-				if (label.equalsIgnoreCase("-")){
+			for (String label : labelList) {
+				if (label.equalsIgnoreCase("-")) {
 					logger.debug("skipping gene label: " + label);
 				} else {
 
 					geneLabelKey = new StringBuilder().append(labelType).append("_")
 							.append(labelKind).append("_").append(label).toString();
 
-					//				if (LsThingLabel.countOfLsThingLabelsByLabel(geneThing, labelType, labelKind, label) == 0) {
-					if (!existingLabels.containsKey(geneLabelKey )) {
+					// if (LsThingLabel.countOfLsThingLabelsByLabel(geneThing, labelType, labelKind,
+					// label) == 0) {
+					if (!existingLabels.containsKey(geneLabelKey)) {
 						LsThingLabel lsLabel = new LsThingLabel();
 						lsLabel.setLsThing(geneThing);
 						lsLabel.setLsType(labelType);
@@ -288,7 +303,7 @@ public List<LsThingLabel> saveGeneLabel(LsTransaction lsTransaction, LsThing gen
 					} else {
 						logger.debug("-------------- the label already exists -- not creating new entry" + label);
 						LsThingLabel existingLabel = existingLabels.get(geneLabelKey);
-						if (existingLabel.isIgnored()){
+						if (existingLabel.isIgnored()) {
 							existingLabel.setIgnored(false);
 							existingLabel.setDeleted(false);
 							existingLabel.setModifiedDate(new Date());
@@ -297,29 +312,30 @@ public List<LsThingLabel> saveGeneLabel(LsTransaction lsTransaction, LsThing gen
 					}
 				}
 			}
-		}		
+		}
 		return newLabels;
 	}
 
 	public CellProcessor[] getProcessors() {
 
-		//    	"dd/MM/yyyy" (parses a date formatted as "25/12/2011")
-		//    	"dd-MMM-yy" (parses a date formatted as "25-Dec-11")
-		//    	"yyyy.MM.dd.HH.mm.ss" (parses a date formatted as "2011.12.25.08.36.33"
-		//    	"E, dd MMM yyyy HH:mm:ss Z" (parses a date formatted as "Tue, 25 Dec 2011 08:36:33 -0500")
-
-		final CellProcessor[] processors = new CellProcessor[] { 
-				new Optional(),  // 
-				new Optional(),  // 
-				new Optional(),  // 
-				new Optional(),  // 
-				new Optional(),  // 
-				new Optional(),  // 
-				new Optional(),  // 
-				new Optional(),  // 
-				new Optional(), // 
-				new Optional(), // 
-				new Optional(), // 
+		// "dd/MM/yyyy" (parses a date formatted as "25/12/2011")
+		// "dd-MMM-yy" (parses a date formatted as "25-Dec-11")
+		// "yyyy.MM.dd.HH.mm.ss" (parses a date formatted as "2011.12.25.08.36.33"
+		// "E, dd MMM yyyy HH:mm:ss Z" (parses a date formatted as "Tue, 25 Dec 2011
+		// 08:36:33 -0500")
+
+		final CellProcessor[] processors = new CellProcessor[] {
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
 				new Optional(), //
 				new Optional(), //
 				new Optional(), //
@@ -332,7 +348,7 @@ public CellProcessor[] getProcessors() {
 	@Override
 	public void setGeneDefaults() {
 
-		//set up gene type and kinds (check if already exists)
+		// set up gene type and kinds (check if already exists)
 		String geneTypeString = "gene";
 		String geneKindString = "entrez gene";
 		ThingType geneType = ThingType.getOrCreate(geneTypeString);
@@ -349,8 +365,10 @@ public void setGeneDefaults() {
 
 		String thingTypeAndKind = "gene_entrez gene";
 		String labelTypeAndKind = "name_gene code name";
-		List<LabelSequence> labelSeqs = LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(thingTypeAndKind, labelTypeAndKind).getResultList();
-		if (labelSeqs.size() == 0){
+		List<LabelSequence> labelSeqs = LabelSequence
+				.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(thingTypeAndKind, labelTypeAndKind)
+				.getResultList();
+		if (labelSeqs.size() == 0) {
 			LabelSequence newLabelSeq = new LabelSequence();
 			newLabelSeq.setDigits(6);
 			newLabelSeq.setLabelPrefix("GENE");
@@ -359,7 +377,7 @@ public void setGeneDefaults() {
 			newLabelSeq.setLabelTypeAndKind(labelTypeAndKind);
 			newLabelSeq.setThingTypeAndKind(thingTypeAndKind);
 			newLabelSeq.persist();
-		} 
+		}
 
 		StateType stateType = StateType.getOrCreate("metadata");
 		StateKind.getOrCreate(stateType, "gene metadata");
@@ -385,19 +403,21 @@ public void setGeneDefaults() {
 
 	public LsThing registerNewGene(EntrezDbGeneDTO geneDTO, LsTransaction lsTransaction) {
 
-		//EntrezDiscontinuedGeneDTO entrezDiscontinuedGeneDTO, 
+		// EntrezDiscontinuedGeneDTO entrezDiscontinuedGeneDTO,
 		// check if gene currently exists
 		String geneTypeString = "gene";
 		String geneKindString = "entrez gene";
 		String thingTypeAndKind = "gene_entrez gene";
 		String labelTypeAndKind = "name_gene code name";
 
-		Long geneIdCount = LsThingLabel.countOfLsThingByName(geneTypeString, geneKindString, "name", "Entrez Gene ID", geneDTO.getGeneId());
+		Long geneIdCount = LsThingLabel.countOfLsThingByName(geneTypeString, geneKindString, "name", "Entrez Gene ID",
+				geneDTO.getGeneId());
 		LsThing geneThing = null;
 
-		if (geneIdCount == 0L){
+		if (geneIdCount == 0L) {
 			geneThing = new LsThing();
-			geneThing.setCodeName(autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind, 1L).get(0).getAutoLabel());
+			geneThing.setCodeName(
+					autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind, 1L).get(0).getAutoLabel());
 			geneThing.setLsType(geneTypeString);
 			geneThing.setLsKind(geneKindString);
 			geneThing.setLsTransaction(lsTransaction.getId());
@@ -405,12 +425,17 @@ public LsThing registerNewGene(EntrezDbGeneDTO geneDTO, LsTransaction lsTransact
 			geneThing.persist();
 
 			String entrezSeparator = "\\|";
-			saveGeneLabel(lsTransaction, geneThing, "name", "Entrez Gene ID", true, geneDTO.getGeneId(), entrezSeparator);
+			saveGeneLabel(lsTransaction, geneThing, "name", "Entrez Gene ID", true, geneDTO.getGeneId(),
+					entrezSeparator);
 			saveGeneLabel(lsTransaction, geneThing, "name", "gene symbol", false, geneDTO.getSymbol(), entrezSeparator);
-			saveGeneLabel(lsTransaction, geneThing, "name", "gene synonym", false, geneDTO.getSynonyms(), entrezSeparator);
-			saveGeneLabel(lsTransaction, geneThing, "name", "authoritative gene name", false, geneDTO.getFullNameFromAuthority(), entrezSeparator);
-			saveGeneLabel(lsTransaction, geneThing, "name", "authoritative gene symbol", false, geneDTO.getSymbolFromAuthority(), entrezSeparator);
-			saveGeneLabel(lsTransaction, geneThing, "name", "other designations", false, geneDTO.getOtherDesignations(), entrezSeparator);
+			saveGeneLabel(lsTransaction, geneThing, "name", "gene synonym", false, geneDTO.getSynonyms(),
+					entrezSeparator);
+			saveGeneLabel(lsTransaction, geneThing, "name", "authoritative gene name", false,
+					geneDTO.getFullNameFromAuthority(), entrezSeparator);
+			saveGeneLabel(lsTransaction, geneThing, "name", "authoritative gene symbol", false,
+					geneDTO.getSymbolFromAuthority(), entrezSeparator);
+			saveGeneLabel(lsTransaction, geneThing, "name", "other designations", false, geneDTO.getOtherDesignations(),
+					entrezSeparator);
 
 			LsThingState geneState = new LsThingState();
 			geneState.setLsThing(geneThing);
@@ -421,24 +446,31 @@ public LsThing registerNewGene(EntrezDbGeneDTO geneDTO, LsTransaction lsTransact
 			geneState.persist();
 
 			saveGeneDescriptor(lsTransaction, geneState, "stringValue", "tax id", geneDTO.getTaxId(), entrezSeparator);
-			saveGeneDescriptor(lsTransaction, geneState, "stringValue", "locus tag", geneDTO.getLocusTag(), entrezSeparator);
-			saveGeneDescriptor(lsTransaction, geneState, "stringValue", "dbXrefs", geneDTO.getDbXrefs(), entrezSeparator);
-			saveGeneDescriptor(lsTransaction, geneState, "stringValue", "chromosome", geneDTO.getChromosome(), entrezSeparator);
-			saveGeneDescriptor(lsTransaction, geneState, "stringValue", "map location", geneDTO.getMapLocation(), entrezSeparator);
-			saveGeneDescriptor(lsTransaction, geneState, "stringValue", "description", geneDTO.getDescription(), entrezSeparator);
-			saveGeneDescriptor(lsTransaction, geneState, "stringValue", "type of gene", geneDTO.getTypeOfGene(), entrezSeparator);
-			saveGeneDescriptor(lsTransaction, geneState, "stringValue", "nomenclature status", geneDTO.getNomenclatureStatus(), entrezSeparator);
-			saveGeneDescriptor(lsTransaction, geneState, "dateValue", "modification date", geneDTO.getModificationDate());
+			saveGeneDescriptor(lsTransaction, geneState, "stringValue", "locus tag", geneDTO.getLocusTag(),
+					entrezSeparator);
+			saveGeneDescriptor(lsTransaction, geneState, "stringValue", "dbXrefs", geneDTO.getDbXrefs(),
+					entrezSeparator);
+			saveGeneDescriptor(lsTransaction, geneState, "stringValue", "chromosome", geneDTO.getChromosome(),
+					entrezSeparator);
+			saveGeneDescriptor(lsTransaction, geneState, "stringValue", "map location", geneDTO.getMapLocation(),
+					entrezSeparator);
+			saveGeneDescriptor(lsTransaction, geneState, "stringValue", "description", geneDTO.getDescription(),
+					entrezSeparator);
+			saveGeneDescriptor(lsTransaction, geneState, "stringValue", "type of gene", geneDTO.getTypeOfGene(),
+					entrezSeparator);
+			saveGeneDescriptor(lsTransaction, geneState, "stringValue", "nomenclature status",
+					geneDTO.getNomenclatureStatus(), entrezSeparator);
+			saveGeneDescriptor(lsTransaction, geneState, "dateValue", "modification date",
+					geneDTO.getModificationDate());
 
 		} else {
 			logger.debug("gene already exists: " + geneDTO.toJson());
-			//add old gene ID as another label
-			//saveGeneLabel(lsTransaction, geneThing, "name", "Entrez Gene ID", true, geneDTO.getGeneId());
-
+			// add old gene ID as another label
+			// saveGeneLabel(lsTransaction, geneThing, "name", "Entrez Gene ID", true,
+			// geneDTO.getGeneId());
 
 		}
 
-
 		return geneThing;
 
 	}
@@ -466,7 +498,8 @@ public String getGeneCodeName() {
 		String thingTypeAndKind = "gene_entrez gene";
 		String labelTypeAndKind = "name_gene code name";
 		Long numberOfLabels = 1L;
-		List<AutoLabelDTO> thingCodes = autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels);		
+		List<AutoLabelDTO> thingCodes = autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind,
+				numberOfLabels);
 
 		return thingCodes.get(0).getAutoLabel();
 
@@ -482,7 +515,8 @@ public LsTransaction createLsTransaction(String txComment) {
 
 	@Override
 	@Transactional
-	public void updateEntrezGenes(String entrezGenesFile, String geneHistoryFile, String taxonomyId) throws IOException{
+	public void updateEntrezGenes(String entrezGenesFile, String geneHistoryFile, String taxonomyId)
+			throws IOException {
 
 		String txComment = "update entrez genes";
 		LsTransaction lsTransaction = createLsTransaction(txComment);
@@ -490,42 +524,38 @@ public void updateEntrezGenes(String entrezGenesFile, String geneHistoryFile, St
 
 	}
 
-
 	public void updateEntrezGenes(String entrezGenesFile,
 			String geneHistoryFile, String taxonomyId,
 			LsTransaction lsTransaction) throws IOException {
 
-		updateEntrezGeneEntities( entrezGenesFile, taxonomyId, lsTransaction );
+		updateEntrezGeneEntities(entrezGenesFile, taxonomyId, lsTransaction);
 		logger.info("############# Completed updating Entrez genes ###################");
 
 		GeneHistoryDTO processedHistory = processGeneHistory(geneHistoryFile, taxonomyId);
 		logger.info("############# Completed processing gene history file ###################");
 
-
 		processDiscontinuedGenes(processedHistory.getDiscontinuedGenes(), lsTransaction);
 		logger.info("############# Completed adding discounted genes ###################");
 
-
 		processUpdatedGenes(processedHistory.getUpdatedGenes(), lsTransaction);
 		logger.info("############# Completed updating genes ###################");
 
-		//updateGeneHistoryEntities( geneHistoryFile, taxonomyId, lsTransaction );
+		// updateGeneHistoryEntities( geneHistoryFile, taxonomyId, lsTransaction );
 
 	}
 
-
 	private void processUpdatedGenes(List<EntrezDiscontinuedGeneDTO> updatedGenes, LsTransaction lsTransaction) {
 		int i = 0;
 		int batchSize = 50;
 		LsThing geneThing = null;
 		logger.info("Processing updated genes");
-		for (EntrezDiscontinuedGeneDTO geneDTO : updatedGenes){
+		for (EntrezDiscontinuedGeneDTO geneDTO : updatedGenes) {
 			geneThing = updateMergedGene(geneDTO, lsTransaction);
 
-			if ( i % batchSize == 0 ) { // same as the JDBC batch size
-				if (geneThing != null){
+			if (i % batchSize == 0) { // same as the JDBC batch size
+				if (geneThing != null) {
 					geneThing.flush();
-					geneThing.clear();						
+					geneThing.clear();
 				}
 			}
 			i++;
@@ -541,23 +571,23 @@ private void processDiscontinuedGenes(
 		int batchSize = 50;
 		LsThing geneThing = null;
 		logger.info("Processing discontinued genes");
-		for (EntrezDiscontinuedGeneDTO geneDTO : discontinuedGenes){
+		for (EntrezDiscontinuedGeneDTO geneDTO : discontinuedGenes) {
 			geneThing = registerDiscontinuedGeneNew(geneDTO, lsTransaction);
 
-			if ( i % batchSize == 0 ) { // same as the JDBC batch size
-				if (geneThing != null){
+			if (i % batchSize == 0) { // same as the JDBC batch size
+				if (geneThing != null) {
 					geneThing.flush();
-					geneThing.clear();						
+					geneThing.clear();
 				}
 			}
 			i++;
 			logger.info("-----------------------------------------------current discontinued gene count: " + i);
 		}
 
-
 	}
 
-	private void updateGeneHistoryEntities(String geneHistoryFile, String taxonomyId, LsTransaction lsTransaction) throws IOException {
+	private void updateGeneHistoryEntities(String geneHistoryFile, String taxonomyId, LsTransaction lsTransaction)
+			throws IOException {
 
 		BufferedReader br = new BufferedReader(new FileReader(geneHistoryFile));
 		ICsvBeanReader beanReader = null;
@@ -575,10 +605,10 @@ private void updateGeneHistoryEntities(String geneHistoryFile, String taxonomyId
 			String[] headerText = beanReader.getHeader(true);
 			List<String> headerList = new ArrayList<String>();
 			int position = 0;
-			for (String head : headerText){
+			for (String head : headerText) {
 				logger.debug("header column: " + position + "  " + head);
-				if (geneBeanMap.get(head) != null){
-					headerList.add(geneBeanMap.get(head));   				
+				if (geneBeanMap.get(head) != null) {
+					headerList.add(geneBeanMap.get(head));
 				}
 				position++;
 			}
@@ -587,16 +617,17 @@ private void updateGeneHistoryEntities(String geneHistoryFile, String taxonomyId
 			String[] header = new String[headerList.size()];
 			headerList.toArray(header);
 
-			for (String head : header){
+			for (String head : header) {
 				logger.warn("header column array : " + position + "  " + head);
 				position++;
 			}
 
-			while( (geneDTO = beanReader.read(EntrezDiscontinuedGeneDTO.class, header, processors)) != null ) {
-				logger.debug(String.format("lineNo=%s, rowNo=%s, bulkData=%s", beanReader.getLineNumber(), beanReader.getRowNumber(), geneDTO));
+			while ((geneDTO = beanReader.read(EntrezDiscontinuedGeneDTO.class, header, processors)) != null) {
+				logger.debug(String.format("lineNo=%s, rowNo=%s, bulkData=%s", beanReader.getLineNumber(),
+						beanReader.getRowNumber(), geneDTO));
 				logger.info("current gene: " + geneDTO.getGeneId());
-				if (geneDTO.getTaxId().equalsIgnoreCase(taxonomyId)){
-					if (geneDTO.getGeneId().equalsIgnoreCase("-")){
+				if (geneDTO.getTaxId().equalsIgnoreCase(taxonomyId)) {
+					if (geneDTO.getGeneId().equalsIgnoreCase("-")) {
 
 						registerDiscontinuedGeneNew(geneDTO, lsTransaction);
 
@@ -606,102 +637,113 @@ private void updateGeneHistoryEntities(String geneHistoryFile, String taxonomyId
 				}
 
 			}
-		}		
-		finally {
-			if( beanReader != null ) {
+		} finally {
+			if (beanReader != null) {
 				beanReader.close();
 			}
-		}		
+		}
 
 	}
 
-
 	private LsThing updateMergedGene(EntrezDiscontinuedGeneDTO geneDTO, LsTransaction lsTransaction) {
 
-		List<LsThing> oldGenes = LsThing.findAllLsThingByLabelTypeAndKindAndLabelText("gene", "entrez gene", "name", "Entrez Gene ID", geneDTO.getDiscontinuedGeneId()).getResultList();
-		List<LsThing> activeGenes = LsThing.findAllLsThingByPreferredLabelText("gene", "entrez gene", "name", "Entrez Gene ID", geneDTO.getGeneId()).getResultList();
-		//		List<LsThing> activeGenes = LsThing.findAllLsThingByPreferredLabelText("gene", "entrez gene", "name", "Entrez Gene ID", geneDTO.getGeneId()).getResultList();
+		List<LsThing> oldGenes = LsThing.findAllLsThingByLabelTypeAndKindAndLabelText("gene", "entrez gene", "name",
+				"Entrez Gene ID", geneDTO.getDiscontinuedGeneId()).getResultList();
+		List<LsThing> activeGenes = LsThing.findAllLsThingByPreferredLabelText("gene", "entrez gene", "name",
+				"Entrez Gene ID", geneDTO.getGeneId()).getResultList();
+		// List<LsThing> activeGenes =
+		// LsThing.findAllLsThingByPreferredLabelText("gene", "entrez gene", "name",
+		// "Entrez Gene ID", geneDTO.getGeneId()).getResultList();
 
 		logger.debug("Number of oldGenes: " + oldGenes.size() + "  number of activeGenes: " + activeGenes.size());
 
-
 		LsThing geneThing;
 		LsThing oldGene;
 
-		if (oldGenes.size() == 0 && activeGenes.size() == 0){
-			//check by any label
-			List<LsThing> allGenes = LsThing.findAllLsThingByLabelTypeAndKindAndLabelText("gene", "entrez gene", "name", "Entrez Gene ID", geneDTO.getGeneId()).getResultList();
-			if (allGenes.size() > 0){
-				logger.info("Found a gene entity by non-preferred id  -- could be a previously merged gene.  Number of genes found: " + allGenes.size());
-				for (LsThing foundGene : allGenes){
+		if (oldGenes.size() == 0 && activeGenes.size() == 0) {
+			// check by any label
+			List<LsThing> allGenes = LsThing.findAllLsThingByLabelTypeAndKindAndLabelText("gene", "entrez gene", "name",
+					"Entrez Gene ID", geneDTO.getGeneId()).getResultList();
+			if (allGenes.size() > 0) {
+				logger.info(
+						"Found a gene entity by non-preferred id  -- could be a previously merged gene.  Number of genes found: "
+								+ allGenes.size());
+				for (LsThing foundGene : allGenes) {
 					logger.info(foundGene.toPrettyJsonStub());
 				}
-				if (allGenes.size() == 1){
-					//if just a single gene -- set it as the active gene?
+				if (allGenes.size() == 1) {
+					// if just a single gene -- set it as the active gene?
 					activeGenes.add(allGenes.get(0));
 					logger.info("active gene found" + allGenes.get(0).toPrettyJsonStub());
 				}
 			} else {
-				if (logger.isDebugEnabled()) logger.debug("registering new gene: " + geneDTO.getGeneId());
+				if (logger.isDebugEnabled())
+					logger.debug("registering new gene: " + geneDTO.getGeneId());
 				EntrezDbGeneDTO newGeneDTO = new EntrezDbGeneDTO();
 				newGeneDTO.setGeneId(geneDTO.getGeneId());
 				geneThing = registerNewGene(newGeneDTO, lsTransaction);
-				activeGenes = LsThing.findAllLsThingByPreferredLabelText("gene", "entrez gene", "name", "Entrez Gene ID", geneDTO.getGeneId()).getResultList();
-				oldGenes = LsThing.findAllLsThingByLabelTypeAndKindAndLabelText("gene", "entrez gene", "name", "Entrez Gene ID", geneDTO.getDiscontinuedGeneId()).getResultList();
+				activeGenes = LsThing.findAllLsThingByPreferredLabelText("gene", "entrez gene", "name",
+						"Entrez Gene ID", geneDTO.getGeneId()).getResultList();
+				oldGenes = LsThing.findAllLsThingByLabelTypeAndKindAndLabelText("gene", "entrez gene", "name",
+						"Entrez Gene ID", geneDTO.getDiscontinuedGeneId()).getResultList();
 			}
 
-		} 
+		}
 
 		if (activeGenes.size() == 1 && oldGenes.size() > 1) {
 			List<LsThing> removeGeneList = new ArrayList<LsThing>();
-			for (LsThing query : oldGenes){
-				if (query.getId().longValue() == activeGenes.get(0).getId().longValue()){
+			for (LsThing query : oldGenes) {
+				if (query.getId().longValue() == activeGenes.get(0).getId().longValue()) {
 					removeGeneList.add(query);
 				}
 			}
-			for (LsThing query : removeGeneList){
+			for (LsThing query : removeGeneList) {
 				oldGenes.remove(query);
-			}			
-			logger.debug("old genes size is now: " + oldGenes.size()); 
+			}
+			logger.debug("old genes size is now: " + oldGenes.size());
 		}
 
-		if (oldGenes.size() == 0 && activeGenes.size() == 1){
-			// add discontinued Gene ID to the active Gene -- unless it already has the gene ID
+		if (oldGenes.size() == 0 && activeGenes.size() == 1) {
+			// add discontinued Gene ID to the active Gene -- unless it already has the gene
+			// ID
 			geneThing = activeGenes.get(0);
 
-			//check if old gene ID exists, if not create it
-			Long countOfGeneID = LsThingLabel.countOfLsThingLabelsByLabel(geneThing, "name", "Entrez Gene ID", geneDTO.getDiscontinuedGeneId());
-			if (countOfGeneID == 0){
-				geneThing.getLsLabels().add(saveGeneLabel(lsTransaction, geneThing, "name", "Entrez Gene ID", false, geneDTO.getDiscontinuedGeneId()));
+			// check if old gene ID exists, if not create it
+			Long countOfGeneID = LsThingLabel.countOfLsThingLabelsByLabel(geneThing, "name", "Entrez Gene ID",
+					geneDTO.getDiscontinuedGeneId());
+			if (countOfGeneID == 0) {
+				geneThing.getLsLabels().add(saveGeneLabel(lsTransaction, geneThing, "name", "Entrez Gene ID", false,
+						geneDTO.getDiscontinuedGeneId()));
 			}
 
-			Long countOfGeneSymbol = LsThingLabel.countOfLsThingLabelsByLabel(geneThing, "name", "gene symbol", geneDTO.getDiscontinuedSymbol());
-			if (countOfGeneSymbol == 0){
-				geneThing.getLsLabels().add(saveGeneLabel(lsTransaction, geneThing, "name", "gene symbol", false, geneDTO.getDiscontinuedSymbol()));
+			Long countOfGeneSymbol = LsThingLabel.countOfLsThingLabelsByLabel(geneThing, "name", "gene symbol",
+					geneDTO.getDiscontinuedSymbol());
+			if (countOfGeneSymbol == 0) {
+				geneThing.getLsLabels().add(saveGeneLabel(lsTransaction, geneThing, "name", "gene symbol", false,
+						geneDTO.getDiscontinuedSymbol()));
 			}
 
-
-
 		} else if (oldGenes.size() == 1 && activeGenes.size() == 1) {
 			oldGene = oldGenes.get(0);
 			geneThing = activeGenes.get(0);
-			//are the genes the same?
+			// are the genes the same?
 			boolean sameGene = false;
-			if (oldGene.getId().longValue() == geneThing.getId().longValue()){
+			if (oldGene.getId().longValue() == geneThing.getId().longValue()) {
 				logger.debug("@@@@@@  Mapping back to the same gene   @@@@@@     " + geneThing.getCodeName());
 				sameGene = true;
 			}
-			if (sameGene){
-				//Do nothing -- fine
+			if (sameGene) {
+				// Do nothing -- fine
 			} else {
-				// ignore the old gene and add labels  --- 				
+				// ignore the old gene and add labels ---
 				oldGene = discontinueGene(oldGene, geneDTO, lsTransaction);
 
 				// ignore non Gene ID lables
 				Collection<LsThingLabel> geneLabels = oldGene.getLsLabels();
-				for (LsThingLabel geneLabel : geneLabels){
-					if (!geneLabel.getLsType().equalsIgnoreCase("name") && !geneLabel.getLsKind().equalsIgnoreCase("Entrez Gene ID")){
-						if (!geneLabel.isIgnored()){
+				for (LsThingLabel geneLabel : geneLabels) {
+					if (!geneLabel.getLsType().equalsIgnoreCase("name")
+							&& !geneLabel.getLsKind().equalsIgnoreCase("Entrez Gene ID")) {
+						if (!geneLabel.isIgnored()) {
 							geneLabel.setIgnored(true);
 							geneLabel.setModifiedDate(new Date());
 							geneLabel.merge();
@@ -709,38 +751,46 @@ private LsThing updateMergedGene(EntrezDiscontinuedGeneDTO geneDTO, LsTransactio
 					}
 				}
 
-				//add reference labels
-				List<LsThingLabel> oldGeneIdLabels = LsThingLabel.findLsThingLabelsByLsThingAndLsTypeAndLsKindAndLabelText(oldGene, "name", "Entrez Gene ID", geneDTO.getGeneId()).getResultList();
-				if (oldGeneIdLabels.size() == 0){
-					oldGene.getLsLabels().add(saveGeneLabel(lsTransaction, oldGene, "name", "Entrez Gene ID", false, geneDTO.getGeneId()));
+				// add reference labels
+				List<LsThingLabel> oldGeneIdLabels = LsThingLabel
+						.findLsThingLabelsByLsThingAndLsTypeAndLsKindAndLabelText(oldGene, "name", "Entrez Gene ID",
+								geneDTO.getGeneId())
+						.getResultList();
+				if (oldGeneIdLabels.size() == 0) {
+					oldGene.getLsLabels().add(saveGeneLabel(lsTransaction, oldGene, "name", "Entrez Gene ID", false,
+							geneDTO.getGeneId()));
 				}
 
-				List<LsThingLabel> newGeneIdLabels = LsThingLabel.findLsThingLabelsByLsThingAndLsTypeAndLsKindAndLabelText(geneThing, "name", "Entrez Gene ID", geneDTO.getDiscontinuedGeneId()).getResultList();
-				if (newGeneIdLabels.size() == 0){
-					geneThing.getLsLabels().add(saveGeneLabel(lsTransaction, geneThing, "name", "Entrez Gene ID", false, geneDTO.getDiscontinuedGeneId()));
+				List<LsThingLabel> newGeneIdLabels = LsThingLabel
+						.findLsThingLabelsByLsThingAndLsTypeAndLsKindAndLabelText(geneThing, "name", "Entrez Gene ID",
+								geneDTO.getDiscontinuedGeneId())
+						.getResultList();
+				if (newGeneIdLabels.size() == 0) {
+					geneThing.getLsLabels().add(saveGeneLabel(lsTransaction, geneThing, "name", "Entrez Gene ID", false,
+							geneDTO.getDiscontinuedGeneId()));
 				}
 
 			}
 
-
 		} else if (activeGenes.size() == 0 && oldGenes.size() == 1) {
 			// activeGene should = to 1 old and the other is the original
-			List<LsThing> geneThingsAll = LsThing.findAllLsThingByLabelTypeAndKindAndLabelText("gene", "entrez gene", "name", "Entrez Gene ID", geneDTO.getGeneId()).getResultList();
+			List<LsThing> geneThingsAll = LsThing.findAllLsThingByLabelTypeAndKindAndLabelText("gene", "entrez gene",
+					"name", "Entrez Gene ID", geneDTO.getGeneId()).getResultList();
 			geneThing = geneThingsAll.get(0);
 			boolean matchActive = false;
 			boolean otherIgnored = false;
-			for (LsThing oldGeneQuery : oldGenes){
-				if (oldGeneQuery.getId().longValue() == geneThing.getId().longValue()){
+			for (LsThing oldGeneQuery : oldGenes) {
+				if (oldGeneQuery.getId().longValue() == geneThing.getId().longValue()) {
 					matchActive = true;
-				}  else {
-					if (oldGeneQuery.isIgnored()){
+				} else {
+					if (oldGeneQuery.isIgnored()) {
 						logger.debug("the gene is ignored: " + oldGeneQuery.getCodeName());
 						otherIgnored = true;
 					}
 				}
 			}
 
-			if (!matchActive && !otherIgnored){
+			if (!matchActive && !otherIgnored) {
 				logger.error(geneDTO.toJson());
 				logger.error("Hit an error case!!!  Error case with old and new genes");
 
@@ -752,11 +802,11 @@ private LsThing updateMergedGene(EntrezDiscontinuedGeneDTO geneDTO, LsTransactio
 			logger.error("Number of oldGenes: " + oldGenes.size() + "  number of activeGenes: " + activeGenes.size());
 			logger.error(geneDTO.toJson());
 			logger.error("Hit an error case!!!");
-			for (LsThing query : activeGenes){
+			for (LsThing query : activeGenes) {
 				logger.error("Active Gene");
 				logger.error(query.toPrettyJsonStub());
 			}
-			for (LsThing query : oldGenes){
+			for (LsThing query : oldGenes) {
 				logger.error("Old Gene");
 				logger.error(query.toPrettyJsonStub());
 			}
@@ -769,15 +819,15 @@ private LsThing updateMergedGene(EntrezDiscontinuedGeneDTO geneDTO, LsTransactio
 
 	}
 
-
 	private LsThing registerDiscontinuedGeneNew(EntrezDiscontinuedGeneDTO geneDTO, LsTransaction lsTransaction) {
 
 		LsThing geneThing = null;
 
-		List<LsThing> genes = LsThing.findAllLsThingByLabelTypeAndKindAndLabelText("gene", "entrez gene", "name", "Entrez Gene ID", geneDTO.getDiscontinuedGeneId()).getResultList();
+		List<LsThing> genes = LsThing.findAllLsThingByLabelTypeAndKindAndLabelText("gene", "entrez gene", "name",
+				"Entrez Gene ID", geneDTO.getDiscontinuedGeneId()).getResultList();
 
-		if (genes.size() == 0){
-			//create new discontinued gene
+		if (genes.size() == 0) {
+			// create new discontinued gene
 			logger.debug("create discontinued gene: " + geneDTO.getDiscontinuedGeneId());
 			String geneTypeString = "gene";
 			String geneKindString = "entrez gene";
@@ -809,8 +859,10 @@ private LsThing registerDiscontinuedGeneNew(EntrezDiscontinuedGeneDTO geneDTO, L
 			geneThing.persist();
 
 			String entrezSeparator = "\\|";
-			geneThing.getLsLabels().addAll(saveGeneLabel(lsTransaction, geneThing, "name", "Entrez Gene ID", true, geneDTO.getDiscontinuedGeneId(), entrezSeparator));
-			geneThing.getLsLabels().addAll(saveGeneLabel(lsTransaction, geneThing, "name", "gene symbol", false, geneDTO.getDiscontinuedSymbol(), entrezSeparator));
+			geneThing.getLsLabels().addAll(saveGeneLabel(lsTransaction, geneThing, "name", "Entrez Gene ID", true,
+					geneDTO.getDiscontinuedGeneId(), entrezSeparator));
+			geneThing.getLsLabels().addAll(saveGeneLabel(lsTransaction, geneThing, "name", "gene symbol", false,
+					geneDTO.getDiscontinuedSymbol(), entrezSeparator));
 
 			LsThingState geneState = new LsThingState();
 			geneState.setLsThing(geneThing);
@@ -820,23 +872,29 @@ private LsThing registerDiscontinuedGeneNew(EntrezDiscontinuedGeneDTO geneDTO, L
 			geneState.setRecordedBy("acas admin");
 			geneState.persist();
 
-			geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue", "tax id", geneDTO.getTaxId(), entrezSeparator));
-			geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue", "discontinued gene", "true", entrezSeparator));
-			geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue", "discontinued gene id", geneDTO.getDiscontinuedGeneId(), entrezSeparator));
-			geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue", "discontinued gene symbol", geneDTO.getDiscontinuedSymbol(), entrezSeparator));
-			geneState.getLsValues().add(saveGeneDescriptor(lsTransaction, geneState, "dateValue", "discontinued date", geneDTO.getDiscontinuedDate()));
+			geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue", "tax id",
+					geneDTO.getTaxId(), entrezSeparator));
+			geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue",
+					"discontinued gene", "true", entrezSeparator));
+			geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue",
+					"discontinued gene id", geneDTO.getDiscontinuedGeneId(), entrezSeparator));
+			geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue",
+					"discontinued gene symbol", geneDTO.getDiscontinuedSymbol(), entrezSeparator));
+			geneState.getLsValues().add(saveGeneDescriptor(lsTransaction, geneState, "dateValue", "discontinued date",
+					geneDTO.getDiscontinuedDate()));
 
-		} else if (genes.size() == 1){
-			//update existing gene
+		} else if (genes.size() == 1) {
+			// update existing gene
 
 			geneThing = genes.get(0);
 
 			// is this an active gene or a merged gene?
 			// don't want to add discontinued meta data to an active gene?
-			List<LsThingLabel> geneLabels = LsThingLabel.findLsThingPreferredName(geneThing.getId(), "name", "Entrez Gene ID").getResultList();
+			List<LsThingLabel> geneLabels = LsThingLabel
+					.findLsThingPreferredName(geneThing.getId(), "name", "Entrez Gene ID").getResultList();
 			boolean geneMatch = false;
-			for (LsThingLabel geneLabel : geneLabels){
-				if (geneLabel.getLabelText().equalsIgnoreCase(geneDTO.getDiscontinuedGeneId())){
+			for (LsThingLabel geneLabel : geneLabels) {
+				if (geneLabel.getLabelText().equalsIgnoreCase(geneDTO.getDiscontinuedGeneId())) {
 					geneMatch = true;
 				}
 			}
@@ -848,9 +906,9 @@ private LsThing registerDiscontinuedGeneNew(EntrezDiscontinuedGeneDTO geneDTO, L
 				throw new RuntimeException("Match to reference gene ");
 			}
 
-		} else if (genes.size() > 1){
+		} else if (genes.size() > 1) {
 			logger.error("ERROR: Found multiple genes");
-			for (LsThing gene : genes){
+			for (LsThing gene : genes) {
 				logger.error(gene.toJsonStub());
 			}
 
@@ -864,8 +922,8 @@ private LsThing registerDiscontinuedGeneNew(EntrezDiscontinuedGeneDTO geneDTO, L
 
 	}
 
-
-	public void updateEntrezGeneEntities(String entrezGenesFile, String taxonomyId, LsTransaction lsTransaction) throws IOException {
+	public void updateEntrezGeneEntities(String entrezGenesFile, String taxonomyId, LsTransaction lsTransaction)
+			throws IOException {
 
 		setGeneDefaults();
 		logger.debug("read tab delimited file");
@@ -900,10 +958,10 @@ public void updateEntrezGeneEntities(String entrezGenesFile, String taxonomyId,
 
 			List<String> headerList = new ArrayList<String>();
 			int position = 0;
-			for (String head : headerText){
+			for (String head : headerText) {
 				logger.debug("header column: " + position + "  " + head);
-				if (geneBeanMap.get(head) != null){
-					headerList.add(geneBeanMap.get(head));   				
+				if (geneBeanMap.get(head) != null) {
+					headerList.add(geneBeanMap.get(head));
 				}
 				position++;
 			}
@@ -911,7 +969,7 @@ public void updateEntrezGeneEntities(String entrezGenesFile, String taxonomyId,
 			logger.debug("size of header list  " + headerList.size());
 			String[] header = new String[headerList.size()];
 			headerList.toArray(header);
-			for (String head : header){
+			for (String head : header) {
 				logger.debug("header column array : " + position + "  " + head);
 				position++;
 			}
@@ -922,44 +980,48 @@ public void updateEntrezGeneEntities(String entrezGenesFile, String taxonomyId,
 			int i = 0;
 			int batchSize = 25;
 			LsThing geneThing = null;
-			while( (geneDTO = beanReader.read(EntrezDbGeneDTO.class, header, processors)) != null ) {
-				logger.debug(String.format("lineNo=%s, rowNo=%s, bulkData=%s", beanReader.getLineNumber(), beanReader.getRowNumber(), geneDTO));
+			while ((geneDTO = beanReader.read(EntrezDbGeneDTO.class, header, processors)) != null) {
+				logger.debug(String.format("lineNo=%s, rowNo=%s, bulkData=%s", beanReader.getLineNumber(),
+						beanReader.getRowNumber(), geneDTO));
 				logger.debug("------------------------------- Here is the geneDTO ---------------------");
 				logger.debug(geneDTO.toJson());
 				logger.info("current gene: " + geneDTO.getGeneId());
 
 				// check if gene currently exists
-				Long geneIdCount = LsThingLabel.countOfAllLsThingByPreferredName(geneTypeString, geneKindString, "name", "Entrez Gene ID", geneDTO.getGeneId());
-				logger.debug("Process Entrez Genes ------------------- geneId count "  + geneIdCount);
+				Long geneIdCount = LsThingLabel.countOfAllLsThingByPreferredName(geneTypeString, geneKindString, "name",
+						"Entrez Gene ID", geneDTO.getGeneId());
+				logger.debug("Process Entrez Genes ------------------- geneId count " + geneIdCount);
 
-
-				// may need to see if the gene ID exists on another gene -- not as a preferred name  Is that possible?
-				if (geneIdCount == 0L ) {
+				// may need to see if the gene ID exists on another gene -- not as a preferred
+				// name Is that possible?
+				if (geneIdCount == 0L) {
 					// brand new gene to register
-					if (logger.isDebugEnabled()) logger.debug("registering new gene: " + geneDTO.getGeneId());
+					if (logger.isDebugEnabled())
+						logger.debug("registering new gene: " + geneDTO.getGeneId());
 					geneThing = registerNewGene(geneDTO, lsTransaction);
 
 				} else if (geneIdCount == 1L) {
-					if (logger.isDebugEnabled()) logger.debug("gene already registered: " + geneDTO.getGeneId());
+					if (logger.isDebugEnabled())
+						logger.debug("gene already registered: " + geneDTO.getGeneId());
 					geneThing = updateExistingGene(geneDTO, lsTransaction);
 				}
 
-				if ( i % batchSize == 0 ) { // same as the JDBC batch size
-					if (geneThing != null){
+				if (i % batchSize == 0) { // same as the JDBC batch size
+					if (geneThing != null) {
 						geneThing.flush();
-						geneThing.clear();						
+						geneThing.clear();
 					}
 				}
 				i++;
 				logger.debug("-----------------------------------------------current entrez gene update count: " + i);
 
 			}
-		}
-		finally {
-			if( beanReader != null ) {
+		} finally {
+			if (beanReader != null) {
 				beanReader.close();
 			}
-			if (br != null)br.close();
+			if (br != null)
+				br.close();
 		}
 
 	}
@@ -970,23 +1032,26 @@ private LsThing updateExistingGene(EntrezDbGeneDTO geneDTO, LsTransaction lsTran
 		String geneKindString = "entrez gene";
 
 		logger.debug("searching for new genes by: " + geneDTO.getGeneId());
-		List<LsThing> genes = LsThing.findAllLsThingByPreferredLabelText(geneTypeString, geneKindString, "name", "Entrez Gene ID",  geneDTO.getGeneId()).getResultList();
+		List<LsThing> genes = LsThing.findAllLsThingByPreferredLabelText(geneTypeString, geneKindString, "name",
+				"Entrez Gene ID", geneDTO.getGeneId()).getResultList();
 		logger.debug("------------ the gene ID count is: " + genes.size() + "  for new gene " + geneDTO.getGeneId());
 
-		LsThing geneThing = null ;
-		if (genes.size() == 0){
+		LsThing geneThing = null;
+		if (genes.size() == 0) {
 			logger.error("Gene not found");
-		} else if (genes.size() > 1){
+		} else if (genes.size() > 1) {
 			logger.error("multiple genes found with the same gene ID");
 		} else {
 			geneThing = genes.get(0);
-			//check the modification date
+			// check the modification date
 			boolean isNewDate = false;
-			List<LsThingValue> dateValues = LsThingValue.findLsThingValuesByLsThingIDAndStateTypeKindAndValueTypeKind(geneThing.getId(), "metadata", "gene metadata", "dateValue", "modification date").getResultList();
+			List<LsThingValue> dateValues = LsThingValue.findLsThingValuesByLsThingIDAndStateTypeKindAndValueTypeKind(
+					geneThing.getId(), "metadata", "gene metadata", "dateValue", "modification date").getResultList();
 			logger.debug("number of mod dates found: " + dateValues.size());
-			if (dateValues.size() > 1) logger.error("Found more than 1 mod date: " + dateValues.size());
-			for (LsThingValue dateValue : dateValues){
-				if (geneDTO.getModificationDate().after(dateValue.getDateValue())){
+			if (dateValues.size() > 1)
+				logger.error("Found more than 1 mod date: " + dateValues.size());
+			for (LsThingValue dateValue : dateValues) {
+				if (geneDTO.getModificationDate().after(dateValue.getDateValue())) {
 					isNewDate = true;
 					logger.debug("It is a recent update");
 				} else {
@@ -995,7 +1060,7 @@ private LsThing updateExistingGene(EntrezDbGeneDTO geneDTO, LsTransaction lsTran
 			}
 
 			// only update the gene if it is a new update (in Entrez Gene file = geneDTO)
-			if (isNewDate){
+			if (isNewDate) {
 				logger.debug("Updating the gene metadata");
 				geneThing = updateGeneMetaData(geneThing, geneDTO, lsTransaction);
 
@@ -1007,75 +1072,86 @@ private LsThing updateExistingGene(EntrezDbGeneDTO geneDTO, LsTransaction lsTran
 		return geneThing;
 	}
 
-
-
-
-	//	public LsThing updateGene(EntrezDbGeneDTO geneDTO, EntrezDiscontinuedGeneDTO entrezDiscontinuedGeneDTO, LsTransaction lsTransaction) {
-	//		String geneTypeString = "gene";
-	//		String geneKindString = "entrez gene";
-	//		List<LsThing> genes = LsThing.findLsThingByAllLabelText(geneTypeString, geneKindString, "name", "Entrez Gene ID", entrezDiscontinuedGeneDTO.getDiscontinuedGeneId()).getResultList();
-	//		List<LsThing> activeGenes = LsThing.findLsThingByPreferredLabelText(geneTypeString, geneKindString, "name", "Entrez Gene ID", geneDTO.getGeneId()).getResultList();
-	//
-	//		LsThing geneThing = null ;
-	//
-	//		logger.debug("Searching for discontinued gene: " + entrezDiscontinuedGeneDTO.getDiscontinuedGeneId());
-	//		logger.debug("updateGene:  number of discontinued genes found: " + genes.size());
-	//		logger.debug("Searching for active gene: " + geneDTO.getGeneId());
-	//		logger.debug("updateGene:  number of active genes found: " + activeGenes.size());
-	//
-	//
-	//		if (genes.size() == 0){
-	//			logger.error("Gene not found");
-	//			throw new RuntimeException("Gene not found");
-	//		} else if (genes.size() > 1){
-	//			logger.error("multiple genes found with the same gene ID");
-	//			throw new RuntimeException("multiple genes found with the same gene ID");			
-	//		} else {
-	//			geneThing = genes.get(0);
-	//			geneThing = updateGeneID(geneThing, geneDTO, entrezDiscontinuedGeneDTO, lsTransaction);
-	//			geneThing = updateGeneMetaData(geneThing, geneDTO, lsTransaction);
-	//		}
-	//
-	//		return geneThing;
-	//	}
+	// public LsThing updateGene(EntrezDbGeneDTO geneDTO, EntrezDiscontinuedGeneDTO
+	// entrezDiscontinuedGeneDTO, LsTransaction lsTransaction) {
+	// String geneTypeString = "gene";
+	// String geneKindString = "entrez gene";
+	// List<LsThing> genes = LsThing.findLsThingByAllLabelText(geneTypeString,
+	// geneKindString, "name", "Entrez Gene ID",
+	// entrezDiscontinuedGeneDTO.getDiscontinuedGeneId()).getResultList();
+	// List<LsThing> activeGenes =
+	// LsThing.findLsThingByPreferredLabelText(geneTypeString, geneKindString,
+	// "name", "Entrez Gene ID", geneDTO.getGeneId()).getResultList();
+	//
+	// LsThing geneThing = null ;
+	//
+	// logger.debug("Searching for discontinued gene: " +
+	// entrezDiscontinuedGeneDTO.getDiscontinuedGeneId());
+	// logger.debug("updateGene: number of discontinued genes found: " +
+	// genes.size());
+	// logger.debug("Searching for active gene: " + geneDTO.getGeneId());
+	// logger.debug("updateGene: number of active genes found: " +
+	// activeGenes.size());
+	//
+	//
+	// if (genes.size() == 0){
+	// logger.error("Gene not found");
+	// throw new RuntimeException("Gene not found");
+	// } else if (genes.size() > 1){
+	// logger.error("multiple genes found with the same gene ID");
+	// throw new RuntimeException("multiple genes found with the same gene ID");
+	// } else {
+	// geneThing = genes.get(0);
+	// geneThing = updateGeneID(geneThing, geneDTO, entrezDiscontinuedGeneDTO,
+	// lsTransaction);
+	// geneThing = updateGeneMetaData(geneThing, geneDTO, lsTransaction);
+	// }
+	//
+	// return geneThing;
+	// }
 
 	public LsThing updateGeneMetaData(LsThing geneThing, EntrezDbGeneDTO geneDTO, LsTransaction lsTransaction) {
 
 		// ignore old states
-		for (LsThingState state : geneThing.getLsStates()){
-			if (state.getLsType().equalsIgnoreCase("metadata") && state.getLsKind().equalsIgnoreCase("gene metadata")){
+		for (LsThingState state : geneThing.getLsStates()) {
+			if (state.getLsType().equalsIgnoreCase("metadata") && state.getLsKind().equalsIgnoreCase("gene metadata")) {
 				state.setIgnored(true);
 				state.setModifiedBy("acas admin");
 				state.setModifiedDate(new Date());
-				state.merge();				
+				state.merge();
 			}
 		}
 
-
 		Set<LsThingLabel> allGeneLabels = geneThing.getLsLabels();
-		String geneLabelKey ;
+		String geneLabelKey;
 		Map<String, LsThingLabel> existingLabels = new HashMap<String, LsThingLabel>();
-		for (LsThingLabel geneLabel : allGeneLabels){
+		for (LsThingLabel geneLabel : allGeneLabels) {
 			geneLabelKey = new StringBuilder().append(geneLabel.getLsType()).append("_")
 					.append(geneLabel.getLsKind()).append("_").append(geneLabel.getLabelText()).toString();
-			existingLabels.put(geneLabelKey, geneLabel);			
-		}		
+			existingLabels.put(geneLabelKey, geneLabel);
+		}
 
 		logger.debug("number of labels: " + existingLabels.size());
 
 		String entrezSeparator = "\\|";
-		existingLabels = saveGeneLabel(existingLabels, lsTransaction, geneThing, "name", "gene symbol", false, geneDTO.getSymbol(), entrezSeparator);
-		existingLabels = saveGeneLabel(existingLabels, lsTransaction, geneThing, "name", "gene synonym", false, geneDTO.getSynonyms(), entrezSeparator);
-		existingLabels = saveGeneLabel(existingLabels, lsTransaction, geneThing, "name", "authoritative gene name", false, geneDTO.getFullNameFromAuthority(), entrezSeparator);
-		existingLabels = saveGeneLabel(existingLabels, lsTransaction, geneThing, "name", "authoritative gene symbol", false, geneDTO.getSymbolFromAuthority(), entrezSeparator);
-		existingLabels = saveGeneLabel(existingLabels, lsTransaction, geneThing, "name", "other designations", false, geneDTO.getOtherDesignations(), entrezSeparator);
+		existingLabels = saveGeneLabel(existingLabels, lsTransaction, geneThing, "name", "gene symbol", false,
+				geneDTO.getSymbol(), entrezSeparator);
+		existingLabels = saveGeneLabel(existingLabels, lsTransaction, geneThing, "name", "gene synonym", false,
+				geneDTO.getSynonyms(), entrezSeparator);
+		existingLabels = saveGeneLabel(existingLabels, lsTransaction, geneThing, "name", "authoritative gene name",
+				false, geneDTO.getFullNameFromAuthority(), entrezSeparator);
+		existingLabels = saveGeneLabel(existingLabels, lsTransaction, geneThing, "name", "authoritative gene symbol",
+				false, geneDTO.getSymbolFromAuthority(), entrezSeparator);
+		existingLabels = saveGeneLabel(existingLabels, lsTransaction, geneThing, "name", "other designations", false,
+				geneDTO.getOtherDesignations(), entrezSeparator);
 
 		// ignore all other existing genes
 		LsThingLabel geneLabel;
 		Set<String> labelKeys = existingLabels.keySet();
-		for (String labelKey : labelKeys){
+		for (String labelKey : labelKeys) {
 			geneLabel = existingLabels.get(labelKey);
-			if (geneLabel.getLsType().equalsIgnoreCase("name") && geneLabel.getLsKind().equalsIgnoreCase("Entrez Gene ID")){
+			if (geneLabel.getLsType().equalsIgnoreCase("name")
+					&& geneLabel.getLsKind().equalsIgnoreCase("Entrez Gene ID")) {
 				// keep the Entrez Gene ID labels
 			} else {
 				// ignore the rest
@@ -1090,31 +1166,42 @@ public LsThing updateGeneMetaData(LsThing geneThing, EntrezDbGeneDTO geneDTO, Ls
 		geneThing.setLsLabels(geneThing.getLsLabels());
 
 		// mark all old labels as ignored and deleted
-		// harder to parse changing labels between updates, i.e. authorized symbols and etc
-		//		for (LsThingLabel geneLabel : geneThing.getLsLabels()){
-		//			if (geneLabel.getLsType().equalsIgnoreCase("name") 
-		//					&& geneLabel.getLsKind().equalsIgnoreCase("Entrez Gene ID") 
-		//					&& geneLabel.getLabelText().equalsIgnoreCase(geneDTO.getGeneId())){
+		// harder to parse changing labels between updates, i.e. authorized symbols and
+		// etc
+		// for (LsThingLabel geneLabel : geneThing.getLsLabels()){
+		// if (geneLabel.getLsType().equalsIgnoreCase("name")
+		// && geneLabel.getLsKind().equalsIgnoreCase("Entrez Gene ID")
+		// && geneLabel.getLabelText().equalsIgnoreCase(geneDTO.getGeneId())){
 		//
-		//				logger.debug("Leaving Entrez Gene ID label: " + geneLabel.toJson());
-		//			} else {
+		// logger.debug("Leaving Entrez Gene ID label: " + geneLabel.toJson());
+		// } else {
 		//
-		//				logger.debug("@@@@@@@@@@@@@@  IGNORING GENE LABELS @@@@@@@@@@@@@    GeneThing: " + geneThing.getCodeName() + "  " + geneLabel.getLabelText() );
-		//				// ignore all of the existing labels except Entrez Gene ID
-		//				geneLabel.setIgnored(true);
-		//				geneLabel.setDeleted(true);
-		//				geneLabel.setModifiedDate(new Date());
-		//				geneLabel.merge();
+		// logger.debug("@@@@@@@@@@@@@@ IGNORING GENE LABELS @@@@@@@@@@@@@ GeneThing: "
+		// + geneThing.getCodeName() + " " + geneLabel.getLabelText() );
+		// // ignore all of the existing labels except Entrez Gene ID
+		// geneLabel.setIgnored(true);
+		// geneLabel.setDeleted(true);
+		// geneLabel.setModifiedDate(new Date());
+		// geneLabel.merge();
 		//
-		//			}
-		//		}
+		// }
+		// }
 		//
-		//		//		geneThing.getLsLabels().addAll(saveGeneLabel(lsTransaction, geneThing, "name", "Entrez Gene ID", true, geneDTO.getGeneId(), entrezSeparator));
-		//		geneThing.getLsLabels().addAll(saveGeneLabel(lsTransaction, geneThing, "name", "gene symbol", false, geneDTO.getSymbol(), entrezSeparator));
-		//		geneThing.getLsLabels().addAll(saveGeneLabel(lsTransaction, geneThing, "name", "gene synonym", false, geneDTO.getSynonyms(), entrezSeparator));
-		//		geneThing.getLsLabels().addAll(saveGeneLabel(lsTransaction, geneThing, "name", "authoritative gene name", false, geneDTO.getFullNameFromAuthority(), entrezSeparator));
-		//		geneThing.getLsLabels().addAll(saveGeneLabel(lsTransaction, geneThing, "name", "authoritative gene symbol", false, geneDTO.getSymbolFromAuthority(), entrezSeparator));
-		//		geneThing.getLsLabels().addAll(saveGeneLabel(lsTransaction, geneThing, "name", "other designations", false, geneDTO.getOtherDesignations(), entrezSeparator));
+		// // geneThing.getLsLabels().addAll(saveGeneLabel(lsTransaction, geneThing,
+		// "name", "Entrez Gene ID", true, geneDTO.getGeneId(), entrezSeparator));
+		// geneThing.getLsLabels().addAll(saveGeneLabel(lsTransaction, geneThing,
+		// "name", "gene symbol", false, geneDTO.getSymbol(), entrezSeparator));
+		// geneThing.getLsLabels().addAll(saveGeneLabel(lsTransaction, geneThing,
+		// "name", "gene synonym", false, geneDTO.getSynonyms(), entrezSeparator));
+		// geneThing.getLsLabels().addAll(saveGeneLabel(lsTransaction, geneThing,
+		// "name", "authoritative gene name", false, geneDTO.getFullNameFromAuthority(),
+		// entrezSeparator));
+		// geneThing.getLsLabels().addAll(saveGeneLabel(lsTransaction, geneThing,
+		// "name", "authoritative gene symbol", false, geneDTO.getSymbolFromAuthority(),
+		// entrezSeparator));
+		// geneThing.getLsLabels().addAll(saveGeneLabel(lsTransaction, geneThing,
+		// "name", "other designations", false, geneDTO.getOtherDesignations(),
+		// entrezSeparator));
 
 		LsThingState geneState = new LsThingState();
 		geneState.setLsThing(geneThing);
@@ -1125,37 +1212,45 @@ public LsThing updateGeneMetaData(LsThing geneThing, EntrezDbGeneDTO geneDTO, Ls
 		geneState.setRecordedDate(new Date());
 		geneState.persist();
 
-		geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue", "tax id", geneDTO.getTaxId(), entrezSeparator));
-		geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue", "locus tag", geneDTO.getLocusTag(), entrezSeparator));
-		geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue", "dbXrefs", geneDTO.getDbXrefs(), entrezSeparator));
-		geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue", "chromosome", geneDTO.getChromosome(), entrezSeparator));
-		geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue", "map location", geneDTO.getMapLocation(), entrezSeparator));
-		geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue", "description", geneDTO.getDescription(), entrezSeparator));
-		geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue", "type of gene", geneDTO.getTypeOfGene(), entrezSeparator));
-		geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue", "nomenclature status", geneDTO.getNomenclatureStatus(), entrezSeparator));
-		geneState.getLsValues().add(saveGeneDescriptor(lsTransaction, geneState, "dateValue", "modification date", geneDTO.getModificationDate()));
+		geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue", "tax id",
+				geneDTO.getTaxId(), entrezSeparator));
+		geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue", "locus tag",
+				geneDTO.getLocusTag(), entrezSeparator));
+		geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue", "dbXrefs",
+				geneDTO.getDbXrefs(), entrezSeparator));
+		geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue", "chromosome",
+				geneDTO.getChromosome(), entrezSeparator));
+		geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue", "map location",
+				geneDTO.getMapLocation(), entrezSeparator));
+		geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue", "description",
+				geneDTO.getDescription(), entrezSeparator));
+		geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue", "type of gene",
+				geneDTO.getTypeOfGene(), entrezSeparator));
+		geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue",
+				"nomenclature status", geneDTO.getNomenclatureStatus(), entrezSeparator));
+		geneState.getLsValues().add(saveGeneDescriptor(lsTransaction, geneState, "dateValue", "modification date",
+				geneDTO.getModificationDate()));
 		geneThing.getLsStates().add(geneState);
 
 		return geneThing;
 
 	}
 
-
 	private Map<String, LsThingLabel> saveGeneLabel(Map<String, LsThingLabel> existingLabels,
 			LsTransaction lsTransaction, LsThing geneThing, String labelType,
 			String labelKind, boolean preferred, String labels, String entrezSeparator) {
 
-		String geneLabelKey ;
+		String geneLabelKey;
 		String[] labelList = labels.split(entrezSeparator);
-		for (String label : labelList){
-			if (label.equalsIgnoreCase("-")){
+		for (String label : labelList) {
+			if (label.equalsIgnoreCase("-")) {
 				logger.debug("skipping gene label: " + label);
 			} else {
 
 				geneLabelKey = new StringBuilder().append(labelType).append("_")
 						.append(labelKind).append("_").append(label).toString();
 
-				if (!existingLabels.containsKey(geneLabelKey )) {
+				if (!existingLabels.containsKey(geneLabelKey)) {
 					LsThingLabel lsLabel = new LsThingLabel();
 					lsLabel.setLsThing(geneThing);
 					lsLabel.setLsType(labelType);
@@ -1171,29 +1266,30 @@ private Map<String, LsThingLabel> saveGeneLabel(Map<String, LsThingLabel> existi
 					existingLabels.remove(geneLabelKey);
 				}
 			}
-		}		
+		}
 		return existingLabels;
 
 	}
 
-	public LsThing discontinueGene(LsThing inactiveGene, EntrezDiscontinuedGeneDTO discontinuedGeneDTO, LsTransaction lsTransaction) {
+	public LsThing discontinueGene(LsThing inactiveGene, EntrezDiscontinuedGeneDTO discontinuedGeneDTO,
+			LsTransaction lsTransaction) {
 		inactiveGene = addDiscontinueMetadata(inactiveGene, discontinuedGeneDTO, lsTransaction);
 
-		//ignore all non Gene ID labels
+		// ignore all non Gene ID labels
 		Set<LsThingLabel> geneLabels = inactiveGene.getLsLabels();
-		for (LsThingLabel geneLabel : geneLabels){
-			if (geneLabel.getLsType().equalsIgnoreCase("name") && geneLabel.getLsKind().equalsIgnoreCase("Entrez Gene ID")){
+		for (LsThingLabel geneLabel : geneLabels) {
+			if (geneLabel.getLsType().equalsIgnoreCase("name")
+					&& geneLabel.getLsKind().equalsIgnoreCase("Entrez Gene ID")) {
 				// do nothing -- keep the Entrez Gene ID labels
 			} else {
 				geneLabel.setIgnored(true);
 				geneLabel.setModifiedDate(new Date());
 				geneLabel.merge();
-			}			
+			}
 		}
 
-
 		logger.debug("@@@@@@@@@@@@ Gene to be ingored @@@@@@@@@@@@@@@@@@     " + inactiveGene.getCodeName());
-		if (!inactiveGene.isIgnored()){
+		if (!inactiveGene.isIgnored()) {
 			inactiveGene.setIgnored(true);
 			inactiveGene.setModifiedBy("acas admin");
 			inactiveGene.setModifiedDate(new Date());
@@ -1204,20 +1300,24 @@ public LsThing discontinueGene(LsThing inactiveGene, EntrezDiscontinuedGeneDTO d
 
 	}
 
-	public LsThing addDiscontinueMetadata(LsThing geneThing, EntrezDiscontinuedGeneDTO entrezDiscontinuedGeneDTO, LsTransaction lsTransaction) {
+	public LsThing addDiscontinueMetadata(LsThing geneThing, EntrezDiscontinuedGeneDTO entrezDiscontinuedGeneDTO,
+			LsTransaction lsTransaction) {
 
-		List<LsThingValue> thingValues = LsThingValue.findLsThingValuesByLsThingIDAndStateTypeKindAndValueTypeKind(geneThing.getId(), "metadata", "gene discontinued metadata", "stringValue", "discontinued gene").getResultList();
+		List<LsThingValue> thingValues = LsThingValue
+				.findLsThingValuesByLsThingIDAndStateTypeKindAndValueTypeKind(geneThing.getId(), "metadata",
+						"gene discontinued metadata", "stringValue", "discontinued gene")
+				.getResultList();
 
 		boolean discontinued = false;
-		for (LsThingValue thingValue : thingValues){
-			if (!thingValue.isIgnored() && thingValue.getStringValue().equalsIgnoreCase("true")){
+		for (LsThingValue thingValue : thingValues) {
+			if (!thingValue.isIgnored() && thingValue.getStringValue().equalsIgnoreCase("true")) {
 				discontinued = true;
 			}
 		}
 
 		logger.debug("Query discontinue Gene ID: " + entrezDiscontinuedGeneDTO.getDiscontinuedGeneId());
 
-		if (!discontinued){
+		if (!discontinued) {
 			// save discontinued metadata
 			LsThingState geneState = new LsThingState();
 			geneState.setLsThing(geneThing);
@@ -1231,17 +1331,20 @@ public LsThing addDiscontinueMetadata(LsThing geneThing, EntrezDiscontinuedGeneD
 			logger.debug("discontinue Gene ID: " + entrezDiscontinuedGeneDTO.getDiscontinuedGeneId());
 
 			String entrezSeparator = "\\|";
-			geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue", "discontinued gene", "true", entrezSeparator));
-			geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue", "discontinued gene id", entrezDiscontinuedGeneDTO.getDiscontinuedGeneId(), entrezSeparator));
-			geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue", "discontinued gene symbol", entrezDiscontinuedGeneDTO.getDiscontinuedSymbol(), entrezSeparator));
-			geneState.getLsValues().add(saveGeneDescriptor(lsTransaction, geneState, "dateValue", "discontinued date", entrezDiscontinuedGeneDTO.getDiscontinuedDate()));
+			geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue",
+					"discontinued gene", "true", entrezSeparator));
+			geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue",
+					"discontinued gene id", entrezDiscontinuedGeneDTO.getDiscontinuedGeneId(), entrezSeparator));
+			geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue",
+					"discontinued gene symbol", entrezDiscontinuedGeneDTO.getDiscontinuedSymbol(), entrezSeparator));
+			geneState.getLsValues().add(saveGeneDescriptor(lsTransaction, geneState, "dateValue", "discontinued date",
+					entrezDiscontinuedGeneDTO.getDiscontinuedDate()));
 			geneThing.getLsStates().add(geneState);
 		}
 
 		return geneThing;
 	}
 
-
 	public GeneHistoryDTO processGeneHistory(String geneHistoryFileName, String taxonomyId) throws IOException {
 
 		BufferedReader br = new BufferedReader(new FileReader(geneHistoryFileName));
@@ -1255,48 +1358,49 @@ public GeneHistoryDTO processGeneHistory(String geneHistoryFileName, String taxo
 		geneBeanMap.put("Discontinued_Symbol", "discontinuedSymbol");
 		geneBeanMap.put("Discontinue_Date", "discontinuedDate");
 
-
-		//		MultiValueMap updatedGenes = new MultiValueMap();
-		//		MultiValueMap discontinuedGenes = new MultiValueMap();
+		// MultiValueMap updatedGenes = new MultiValueMap();
+		// MultiValueMap discontinuedGenes = new MultiValueMap();
 
 		List<EntrezDiscontinuedGeneDTO> discontinuedGenes = new ArrayList<EntrezDiscontinuedGeneDTO>();
 		List<EntrezDiscontinuedGeneDTO> updatedGenes = new ArrayList<EntrezDiscontinuedGeneDTO>();
 
-		//HashMap<String, EntrezDiscontinuedGeneDTO> updatedGenes = new HashMap<String, EntrezDiscontinuedGeneDTO>();
-		//HashMap<String, EntrezDiscontinuedGeneDTO> discontinuedGenes = new HashMap<String, EntrezDiscontinuedGeneDTO>();
+		// HashMap<String, EntrezDiscontinuedGeneDTO> updatedGenes = new HashMap<String,
+		// EntrezDiscontinuedGeneDTO>();
+		// HashMap<String, EntrezDiscontinuedGeneDTO> discontinuedGenes = new
+		// HashMap<String, EntrezDiscontinuedGeneDTO>();
 
 		try {
 			beanReader = new CsvBeanReader(br, CsvPreference.TAB_PREFERENCE);
 			String[] headerText = beanReader.getHeader(true);
 			List<String> headerList = new ArrayList<String>();
 			int position = 0;
-			for (String head : headerText){
+			for (String head : headerText) {
 				logger.debug("header column: " + position + "  " + head);
-				if (geneBeanMap.get(head) != null){
-					headerList.add(geneBeanMap.get(head));   				
+				if (geneBeanMap.get(head) != null) {
+					headerList.add(geneBeanMap.get(head));
 				}
 				position++;
 			}
 
-
 			logger.debug("size of header list  " + headerList.size());
 			String[] header = new String[headerList.size()];
 			headerList.toArray(header);
 
-			for (String head : header){
+			for (String head : header) {
 				logger.warn("header column array : " + position + "  " + head);
 				position++;
 			}
 
-			while( (geneDTO = beanReader.read(EntrezDiscontinuedGeneDTO.class, header, processors)) != null ) {
-				System.out.println(String.format("lineNo=%s, rowNo=%s, bulkData=%s", beanReader.getLineNumber(), beanReader.getRowNumber(), geneDTO));
+			while ((geneDTO = beanReader.read(EntrezDiscontinuedGeneDTO.class, header, processors)) != null) {
+				System.out.println(String.format("lineNo=%s, rowNo=%s, bulkData=%s", beanReader.getLineNumber(),
+						beanReader.getRowNumber(), geneDTO));
 				logger.debug("current gene: " + geneDTO.getGeneId());
-				if (geneDTO.getTaxId().equalsIgnoreCase(taxonomyId)){
-					if (geneDTO.getGeneId().equalsIgnoreCase("-")){
-						//						discontinuedGenes.put(geneDTO.getDiscontinuedGeneId(), geneDTO);	
+				if (geneDTO.getTaxId().equalsIgnoreCase(taxonomyId)) {
+					if (geneDTO.getGeneId().equalsIgnoreCase("-")) {
+						// discontinuedGenes.put(geneDTO.getDiscontinuedGeneId(), geneDTO);
 						discontinuedGenes.add(geneDTO);
 					} else {
-						//updatedGenes.put(geneDTO.getGeneId(), geneDTO);
+						// updatedGenes.put(geneDTO.getGeneId(), geneDTO);
 						updatedGenes.add(geneDTO);
 						// note: using a multi value map to allow multiple instances
 
@@ -1305,25 +1409,25 @@ public GeneHistoryDTO processGeneHistory(String geneHistoryFileName, String taxo
 
 			}
 
-			//			@SuppressWarnings("unchecked")
-			//			Set<String> updatedGeneKeys = updatedGenes.keySet();
-			//			Collection<String> uniqueGenes = new HashSet<String>();
-			//			for (String queryGeneId : updatedGeneKeys){
-			//				List<EntrezDiscontinuedGeneDTO> updatedGeneList = (List<EntrezDiscontinuedGeneDTO>) updatedGenes.get(queryGeneId);
-			//				for (EntrezDiscontinuedGeneDTO updateGene : updatedGeneList){
-			//					uniqueGenes.add(updateGene.getDiscontinuedGeneId());
-			//				}
-			//			}
+			// @SuppressWarnings("unchecked")
+			// Set<String> updatedGeneKeys = updatedGenes.keySet();
+			// Collection<String> uniqueGenes = new HashSet<String>();
+			// for (String queryGeneId : updatedGeneKeys){
+			// List<EntrezDiscontinuedGeneDTO> updatedGeneList =
+			// (List<EntrezDiscontinuedGeneDTO>) updatedGenes.get(queryGeneId);
+			// for (EntrezDiscontinuedGeneDTO updateGene : updatedGeneList){
+			// uniqueGenes.add(updateGene.getDiscontinuedGeneId());
+			// }
+			// }
 
 			logger.debug("size of the discontinuedGenes hash is : " + discontinuedGenes.size());
 			logger.debug("size of the updatedGenes hash is : " + updatedGenes.size());
 
-		}		
-		finally {
-			if( beanReader != null ) {
+		} finally {
+			if (beanReader != null) {
 				beanReader.close();
 			}
-		}		
+		}
 
 		Collections.sort(discontinuedGenes, new Comparator<EntrezDiscontinuedGeneDTO>() {
 			public int compare(EntrezDiscontinuedGeneDTO m1, EntrezDiscontinuedGeneDTO m2) {
@@ -1348,1230 +1452,1427 @@ public int compare(EntrezDiscontinuedGeneDTO m1, EntrezDiscontinuedGeneDTO m2) {
 	public class GeneHistoryDTO {
 		private List<EntrezDiscontinuedGeneDTO> discontinuedGenes;
 		private List<EntrezDiscontinuedGeneDTO> updatedGenes;
+
 		public List<EntrezDiscontinuedGeneDTO> getDiscontinuedGenes() {
 			return discontinuedGenes;
 		}
+
 		public void setDiscontinuedGenes(List<EntrezDiscontinuedGeneDTO> discontinuedGenes) {
 			this.discontinuedGenes = discontinuedGenes;
 		}
+
 		public List<EntrezDiscontinuedGeneDTO> getUpdatedGenes() {
 			return updatedGenes;
 		}
+
 		public void setUpdatedGenes(List<EntrezDiscontinuedGeneDTO> updatedGenes) {
 			this.updatedGenes = updatedGenes;
 		}
 	}
 
+	// public void addDiscontinuedGeneIDs(GeneHistoryDTO historyResults,
+	// String taxonomyId, LsTransaction lsTransaction) {
+	// //check if gene exists --
+	// // check if discontinued gene ID label exists -- if not -- create it
+	// LsThing geneThing = null;
+	//
+	// MultiValueMap updatedGenes = historyResults.getUpdatedGenes();
+	// Set<String> geneIdKeys = updatedGenes.keySet();
+	// int batchSize = 50;
+	// int i = 0;
+	// for (String geneIdKey : geneIdKeys){
+	// for (EntrezDiscontinuedGeneDTO singleGene : (List<EntrezDiscontinuedGeneDTO>)
+	// updatedGenes.get(geneIdKey)){
+	// geneThing = updateGeneLabels(singleGene, lsTransaction);
+	//
+	// if ( i % batchSize == 0 ) { // same as the JDBC batch size
+	// if (geneThing != null){
+	// geneThing.flush();
+	// geneThing.clear();
+	// }
+	// }
+	// i++;
+	// }
+	// }
+	//
+	// }
+	//
+	// private LsThing updateGeneLabels(EntrezDiscontinuedGeneDTO singleGene,
+	// LsTransaction lsTransaction) {
+	//
+	// List<LsThing> discontinuedGenes = LsThing.findLsThingByLabelText("gene",
+	// "entrez gene", "name", "Entrez Gene ID",
+	// singleGene.getDiscontinuedGeneId()).getResultList();
+	// List<LsThing> genes = LsThing.findLsThingByLabelText("gene", "entrez gene",
+	// "name", "Entrez Gene ID", singleGene.getGeneId()).getResultList();
+	//
+	// int discontinuedGenesCount = discontinuedGenes.size();
+	// int geneCount = genes.size();
+	//
+	// logger.debug("------------ the gene ID count is: " + discontinuedGenes.size()
+	// + " for discontinued gene " + singleGene.getDiscontinuedGeneId());
+	// logger.debug("------------ the gene ID count is: " + genes.size() + " for new
+	// gene " + singleGene.getGeneId());
+	//
+	// LsThing geneThing = null ;
+	// if (discontinuedGenesCount == 0 && geneCount == 0){
+	// logger.debug("gene is not registered yet");
+	// } else if (discontinuedGenesCount == 0 && geneCount == 1 ){
+	// logger.debug("@@@@@@ ------ add discontinued geneID to the geneThing");
+	// geneThing = genes.get(0);
+	//
+	// //check if old gene ID exists, if not create it
+	// Long countOfGeneID = LsThingLabel.countOfLsThingLabelsByLabel(geneThing,
+	// "name", "Entrez Gene ID", singleGene.getDiscontinuedGeneId());
+	// Long countOfGeneSymbol = LsThingLabel.countOfLsThingLabelsByLabel(geneThing,
+	// "name", "gene symbol", singleGene.getDiscontinuedSymbol());
+	// if (countOfGeneID == 0){
+	// geneThing.getLsLabels().add(saveGeneLabel(lsTransaction, geneThing, "name",
+	// "Entrez Gene ID", false, singleGene.getDiscontinuedGeneId()));
+	// }
+	// if (countOfGeneSymbol == 0){
+	// geneThing.getLsLabels().add(saveGeneLabel(lsTransaction, geneThing, "name",
+	// "gene symbol", false, singleGene.getDiscontinuedSymbol()));
+	// }
+	//
+	// // add discontinued meta to the old gene
+	//
+	// }
+	//
+	// return geneThing;
+	// }
+
+	// @SuppressWarnings("unchecked")
+	// public void processEntrezGenes(String entrezGenes, GeneHistoryDTO
+	// historyResults,
+	// String taxonomyId, LsTransaction lsTransaction) throws IOException {
+	//
+	// setGeneDefaults();
+	//
+	// logger.debug("read tab delimited file");
+	// BufferedReader br = new BufferedReader(new FileReader(entrezGenes));
+	//
+	// ICsvBeanReader beanReader = null;
+	// try {
+	//
+	// beanReader = new CsvBeanReader(br, CsvPreference.TAB_PREFERENCE);
+	// String[] headerText = beanReader.getHeader(true);
+	//
+	// String geneTypeString = "gene";
+	// String geneKindString = "entrez gene";
+	//
+	// // map header text to standard bean names
+	//
+	// HashMap<String, String> geneBeanMap = new HashMap<String, String>();
+	// geneBeanMap.put("tax_id", "taxId");
+	// geneBeanMap.put("GeneID", "geneId");
+	// geneBeanMap.put("Symbol", "symbol");
+	// geneBeanMap.put("LocusTag", "locusTag");
+	// geneBeanMap.put("Synonyms", "synonyms");
+	// geneBeanMap.put("dbXrefs", "dbXrefs");
+	// geneBeanMap.put("chromosome", "chromosome");
+	// geneBeanMap.put("map_location", "mapLocation");
+	// geneBeanMap.put("description", "description");
+	// geneBeanMap.put("type_of_gene", "typeOfGene");
+	// geneBeanMap.put("Symbol_from_nomenclature_authority", "symbolFromAuthority");
+	// geneBeanMap.put("Full_name_from_nomenclature_authority",
+	// "fullNameFromAuthority");
+	// geneBeanMap.put("Nomenclature_status", "nomenclatureStatus");
+	// geneBeanMap.put("Other_designations", "otherDesignations");
+	// geneBeanMap.put("Modification_date", "modificationDate");
+	//
+	// List<String> headerList = new ArrayList<String>();
+	// int position = 0;
+	// for (String head : headerText){
+	// logger.debug("header column: " + position + " " + head);
+	// if (geneBeanMap.get(head) != null){
+	// headerList.add(geneBeanMap.get(head));
+	// }
+	// position++;
+	// }
+	//
+	//
+	// logger.debug("size of header list " + headerList.size());
+	// String[] header = new String[headerList.size()];
+	// headerList.toArray(header);
+	//
+	// for (String head : header){
+	// logger.warn("header column array : " + position + " " + head);
+	// position++;
+	// }
+	//
+	//
+	// final CellProcessor[] processors = getProcessors();
+	//
+	// EntrezDbGeneDTO geneDTO;
+	//
+	// // int numberOfLines = SimpleUtil.countLines(entrezGenes);
+	// // Long numberOfLabels = new Long(numberOfLines-1);
+	// //
+	// // List<AutoLabelDTO> thingCodes =
+	// autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind,
+	// numberOfLabels);
+	//
+	// int i = 0;
+	// int batchSize = 25;
+	// LsThing geneThing = null;
+	// while( (geneDTO = beanReader.read(EntrezDbGeneDTO.class, header, processors))
+	// != null ) {
+	// System.out.println(String.format("lineNo=%s, rowNo=%s, bulkData=%s",
+	// beanReader.getLineNumber(), beanReader.getRowNumber(), geneDTO));
+	// logger.info("------------------------------- Here is the geneDTO
+	// ---------------------");
+	// logger.info(geneDTO.toJson());
+	// logger.debug("current gene: " + geneDTO.getGeneId());
+	//
+	// // check if gene currently exists
+	// Long geneIdCount =
+	// LsThingLabel.countOfAllLsThingByPreferredName(geneTypeString, geneKindString,
+	// "name", "Entrez Gene ID", geneDTO.getGeneId());
+	// // Long oldGeneIdCount = LsThingLabel.countOfLsThingByName(geneTypeString,
+	// geneKindString, "name", "Entrez Gene ID",
+	// historyResults.getUpdatedGenes().get(geneDTO.getGeneId()).getDiscontinuedGeneId());
+	//
+	// logger.debug("Process Entrez Genes ------------------- geneId count " +
+	// geneIdCount);
+	//
+	//
+	// // check if discontinued gene
+	// boolean discontinuedGene = false;
+	// if (historyResults.getDiscontinuedGenes().containsKey(geneDTO.getGeneId())) {
+	// logger.debug("discontinued gene");
+	// discontinuedGene = true;
+	// }
+	//
+	// // check if updated gene
+	// boolean updatedGene = false;
+	// if (historyResults.getUpdatedGenes().containsKey(geneDTO.getGeneId())) {
+	// logger.debug("updated gene");
+	// updatedGene = true;
+	// }
+	//
+	// // temp for debugging only
+	// //updatedGene = true;
+	//
+	//
+	// // use cases -- flipping through entrez gene list
+	// // 1. gene ID not registered and in list of discontinued genes --> register
+	// discontinued gene
+	// // 2. gene ID not registered and in list of updated genes --> update gene
+	// entry;
+	// // set old gene ID to not preferred,
+	// // add new gene ID as the preferred;
+	// // ignore old gene metadata,
+	// // add new gene metadata
+	// // 3. index through discontinued genes -- register all genes not already
+	// registered
+	//
+	// // for (){
+	// //
+	// // }
+	//
+	// if (discontinuedGene && geneIdCount == 0L){
+	// //create new entry for discontinued gene
+	// for (EntrezDiscontinuedGeneDTO singleGene : (List<EntrezDiscontinuedGeneDTO>)
+	// historyResults.getDiscontinuedGenes().get(geneDTO.getGeneId())){
+	// geneThing = registerDiscontinuedGene(singleGene, lsTransaction);
+	// }
+	//
+	// } else if (updatedGene ){
+	// // updating existing gene info with new gene label and meta (merging genes if
+	// new gene does not exist)
+	// // else keep 2 gene entities
+	//
+	// for (EntrezDiscontinuedGeneDTO singleGene : (List<EntrezDiscontinuedGeneDTO>)
+	// historyResults.getUpdatedGenes().get(geneDTO.getGeneId())){
+	// geneThing = registerUpdatedGene(geneDTO, singleGene,
+	// (List<EntrezDiscontinuedGeneDTO>)
+	// historyResults.getUpdatedGenes().get(geneDTO.getGeneId()), lsTransaction);
+	// if (logger.isDebugEnabled()) logger.debug("updated the gene entry: " +
+	// LsThing.findLsThing(geneThing.getId()).toPrettyJson());
+	// }
+	//
+	// } else if (geneIdCount == 0L ) {
+	// // brand new gene to register
+	// if (logger.isDebugEnabled()) logger.debug("registering new gene: " +
+	// geneDTO.getGeneId());
+	// geneThing = registerNewGene(geneDTO, lsTransaction);
+	//
+	// } else {
+	// if (logger.isDebugEnabled()) logger.debug("gene already registered: " +
+	// geneDTO.getGeneId());
+	// }
+	//
+	// if ( i % batchSize == 0 ) { // same as the JDBC batch size
+	// if (geneThing != null){
+	// geneThing.flush();
+	// geneThing.clear();
+	// }
+	// }
+	// i++;
+	// logger.debug("-----------------------------------------------current entrez
+	// gene update count: " + i);
+	//
+	// }
+	// }
+	// finally {
+	// if( beanReader != null ) {
+	// beanReader.close();
+	// }
+	// if (br != null)br.close();
+	// }
+	//
+	// }
+
+	// public LsThing registerUpdatedGene(EntrezDbGeneDTO geneDTO,
+	// EntrezDiscontinuedGeneDTO singleDiscontinuedGene,
+	// List<EntrezDiscontinuedGeneDTO> discontinuedGeneList, LsTransaction
+	// lsTransaction) {
+	// // geneID not registered but the gene is on the update list
+	// // check if registered under different geneID
+	// // if so -- then update
+	// // else -- register new
+	//
+	// // two copies of the gene exist
+	// // one copy is discontinued
+	// // the other copy is now the preferred gene
+	// // mark the old one as discontinued (it will keep the old gene id)
+	// // the other gene will keep the new gene id and just update the gene metadata
+	//
+	// // error above
+	// // keep both gene entities as active entities
+	// // old gene thing will keep the old gene id
+	// // new gene thing will not reference the old gene id
+	// // hmmm... what if a user searches for a gene by symbol?
+	// // the user will find the new gene but not find the old gene
+	// // how do we know to link the two genes?
+	//
+	// // use case -- user wants to see all the data for gene id 11797; 11797 maps
+	// back to discontinued gene 77616 and 102757
+	// // gene A has a gene ID label for 11797 and 10257
+	// // gene B has a gene ID label for 77616
+	// // AG data for both geneA and geneB.
+	// // option 1: rename the batch code for geneB to geneA. (actual change of
+	// data)
+	// // option 2: leave the AG data alone. If user queries for data for 11797 --
+	// we must also return data for 77616
+	// // so gene A should have a label for the discontinued gene id:
+	// name_discontinued Entrez Gene ID? or just another Entrez Gene ID not
+	// preferred
+	// // in some cases -- there may or may not be another gene thing with a
+	// matching preferred Entrez Gene ID
+	// // let's work with option 2 for now. So genes will also have a label of
+	// discontinued gene id -- mark more info in comments?
+	//
+	// String geneTypeString = "gene";
+	// String geneKindString = "entrez gene";
+	// // Long geneIdCount = LsThingLabel.countOfLsThingByName(geneTypeString,
+	// geneKindString, "name", "Entrez Gene ID",
+	// entrezDiscontinuedGeneDTO.getDiscontinuedGeneId());
+	// // Long newGeneIdCount = LsThingLabel.countOfLsThingByName(geneTypeString,
+	// geneKindString, "name", "Entrez Gene ID", geneDTO.getGeneId());
+	//
+	// // things = LsThing.findLsThingByLabelKindAndLabelText(geneTypeString,
+	// geneKindString, labelKind, labelText);
+	//
+	// logger.debug("searching for new genes by: " + geneDTO.getGeneId());
+	// List<LsThing> newGenes =
+	// LsThing.findAllLsThingByPreferredLabelText(geneTypeString, geneKindString,
+	// "name", "Entrez Gene ID", geneDTO.getGeneId()).getResultList();
+	//
+	// logger.debug("searching for discontinued genes by: " +
+	// singleDiscontinuedGene.getDiscontinuedGeneId());
+	// List<LsThing> discontinuedGenes = LsThing.findLsThingByLabelText("gene",
+	// "entrez gene", "name", "Entrez Gene ID",
+	// singleDiscontinuedGene.getDiscontinuedGeneId()).getResultList();
+	//
+	//
+	// int geneIdCount = discontinuedGenes.size();
+	// int newGeneIdCount = newGenes.size();
+	//
+	// logger.debug("------------ the gene ID count is: " + discontinuedGenes.size()
+	// + " for discontinued gene " +
+	// singleDiscontinuedGene.getDiscontinuedGeneId());
+	// logger.debug("------------ the gene ID count is: " + newGenes.size() + " for
+	// new gene " + geneDTO.getGeneId());
+	//
+	// //are the genes the same?
+	// boolean sameGene = false;
+	// if (discontinuedGenes.size() == 1 && newGenes.size() == 1){
+	// if (discontinuedGenes.get(0).getId().longValue() ==
+	// newGenes.get(0).getId().longValue()){
+	// logger.debug("@@@@@@ Mapping back to the same gene @@@@@@ " +
+	// discontinuedGenes.get(0).getCodeName());
+	// sameGene = true;
+	// }
+	// }
+	//
+	// LsThing geneThing = null ;
+	// if (geneIdCount == 0 && newGeneIdCount == 0){
+	// logger.debug("gene is not registered yet");
+	// // geneThing = registerNewGene(geneDTO, singleDiscontinuedGene,
+	// lsTransaction);
+	// geneThing = registerNewGene(geneDTO, lsTransaction);
+	//
+	// } else if (geneIdCount == 1 && newGeneIdCount == 1 && sameGene){
+	// logger.debug("------ both gene IDs are currently registered with the same
+	// geneThing");
+	// // add discontinued meta to the old gene
+	//
+	//
+	// //TODO add the discontinued meta data to teh old gene (not the active gene)
+	// //LsThing oldGene = discontinueGene(singleDiscontinuedGene, lsTransaction);
+	// //if (logger.isDebugEnabled()) logger.debug("added discontinued gene meta to
+	// the old gene: " + oldGene.toPrettyJson());
+	//
+	// // update the gene with the new info
+	// List<LsThing> genes = LsThing.findLsThingByPreferredLabelText(geneTypeString,
+	// geneKindString, "name", "Entrez Gene ID",
+	// geneDTO.getGeneId()).getResultList();
+	// if (genes.size() == 0){
+	// logger.error("Gene not found");
+	// } else if (genes.size() > 1){
+	// logger.error("multiple genes found with the same gene ID");
+	//
+	// } else {
+	// geneThing = genes.get(0);
+	// // geneThing = updateGeneID(geneThing, geneDTO, entrezDiscontinuedGeneDTO,
+	// lsTransaction);
+	//
+	// //check the modification date
+	// boolean isNewDate = false;
+	// List<LsThingValue> dateValues =
+	// LsThingValue.findLsThingValuesByLsThingIDAndStateTypeKindAndValueTypeKind(geneThing.getId(),
+	// "metadata", "gene metadata", "dateValue", "modification
+	// date").getResultList();
+	// logger.debug("number of mod dates found: " + dateValues.size());
+	// if (dateValues.size() > 1) logger.error("Found more than 1 mod date: " +
+	// dateValues.size());
+	// for (LsThingValue dateValue : dateValues){
+	// if (geneDTO.getModificationDate().after(dateValue.getDateValue())){
+	// isNewDate = true;
+	// logger.debug("It is a recent update");
+	// } else {
+	// logger.debug("It is a not a recent update");
+	// }
+	// }
+	//
+	// // only update the gene if it is a new update (in Entrez Gene file = geneDTO)
+	// if (isNewDate){
+	// logger.debug("Updating the gene metadata");
+	// geneThing = updateGeneMetaData(geneThing, geneDTO, lsTransaction);
+	//
+	// } else {
+	// logger.debug("@@@@@@ NOT A NEW DATE @@@@@@@@");
+	// }
+	//
+	// //always check entries in the history file
+	// for (EntrezDiscontinuedGeneDTO discontinuedGene : discontinuedGeneList){
+	// logger.debug("adding old gene ID " + discontinuedGene.getDiscontinuedGeneId()
+	// + " to the gene: " + geneThing.getCodeName());
+	// geneThing = addOldGeneID(geneThing, discontinuedGene, lsTransaction);
+	//
+	// //add reference gene to the old Gene as well
+	// logger.debug("adding reference gene ID " + geneDTO.getGeneId() + " to the
+	// following old gene: " + discontinuedGene.getDiscontinuedGeneId());
+	// addReferenceGeneIdToDiscontinuedGene(geneDTO, discontinuedGene,
+	// lsTransaction);
+	// }
+	//
+	//
+	// }
+	//
+	// } else if (geneIdCount == 0 && newGeneIdCount == 1){
+	// logger.debug("------ just the new gene is currently registered");
+	// // add the old entrez gene id to the registered gene
+	// // add discontinued meta to the old gene
+	//
+	// // update the new gene with the new info
+	// List<LsThing> genes = LsThing.findLsThingByLabelText(geneTypeString,
+	// geneKindString, "name", "Entrez Gene ID",
+	// geneDTO.getGeneId()).getResultList();
+	// if (genes.size() == 0){
+	// logger.error("Gene not found");
+	// } else if (genes.size() > 1){
+	// logger.error("multiple genes found with the same gene ID");
+	//
+	// } else {
+	// geneThing = genes.get(0);
+	// geneThing = addOldGeneID(geneThing, geneDTO, singleDiscontinuedGene,
+	// lsTransaction);
+	// }
+	// } else {
+	// logger.debug("-------- gene is registered via old id geneIdCount: " +
+	// geneIdCount + " newGeneIdCount: " + newGeneIdCount);
+	//
+	// // if (logger.isDebugEnabled()) logger.debug("old gene: " +
+	// LsThing.findLsThingByLabelText(geneTypeString, geneKindString, "name",
+	// "Entrez Gene ID",
+	// entrezDiscontinuedGeneDTO.getDiscontinuedGeneId()).getResultList().get(0).toPrettyJson());
+	//
+	//
+	// List<LsThing> genes = LsThing.findLsThingByPreferredLabelText(geneTypeString,
+	// geneKindString, "name", "Entrez Gene ID",
+	// geneDTO.getGeneId()).getResultList();
+	// if (genes.size() == 0){
+	// logger.error("Gene not found");
+	// } else if (genes.size() > 1){
+	// logger.error("multiple genes found with the same gene ID");
+	// List<Long> thingIds = new ArrayList();
+	// for (LsThing lsThing : genes){
+	// thingIds.add(lsThing.getId());
+	// logger.error("Found this gene ID: " + lsThing.toJson());
+	//
+	// }
+	// Collections.sort(thingIds);
+	// boolean first = true;
+	// for (Long geneId : thingIds){
+	// if (first){
+	// first = false;
+	// geneThing = LsThing.findLsThing(geneId);
+	// } else {
+	// logger.debug("ignored this gene thing ID " + geneId);
+	// LsThing queryGene = LsThing.findLsThing(geneId);
+	// queryGene.setIgnored(true);
+	// queryGene.merge();
+	// }
+	// }
+	//
+	// } else {
+	// geneThing = genes.get(0);
+	// logger.debug("working with gene thing: " + geneThing.getCodeName() + " linked
+	// to Gene ID: " + geneDTO.getGeneId());
+	// }
+	//
+	//
+	// //check the modification date
+	// boolean isNewDate = false;
+	// logger.debug("working with gene thing: " + geneThing.getCodeName() + " linked
+	// to Gene ID: " + geneDTO.getGeneId());
+	//
+	// List<LsThingValue> dateValues =
+	// LsThingValue.findLsThingValuesByLsThingIDAndStateTypeKindAndValueTypeKind(geneThing.getId(),
+	// "metadata", "gene metadata", "dateValue", "modification
+	// date").getResultList();
+	// logger.debug("number of mod dates found: " + dateValues.size());
+	// if (dateValues.size() > 1) logger.error("Found more than 1 mod date: " +
+	// dateValues.size());
+	// for (LsThingValue dateValue : dateValues){
+	// if (geneDTO.getModificationDate().after(dateValue.getDateValue())){
+	// isNewDate = true;
+	// logger.debug("It is a recent update");
+	// } else {
+	// logger.debug("It is a not a recent update");
+	// }
+	// }
+	//
+	//
+	// if (isNewDate){
+	//
+	// logger.debug("Updating the gene metadata");
+	// geneThing = updateGeneMetaData(geneThing, geneDTO, lsTransaction);
+	// // next add old gene IDs to the gene
+	// //geneThing = addOldGeneID(geneThing, geneDTO, singleDiscontinuedGene,
+	// lsTransaction);
+	//
+	// // geneThing = updateGene(geneDTO, entrezDiscontinuedGeneDTO, lsTransaction);
+	// // saveGeneLabel(lsTransaction, geneThing, "name", "Entrez Gene ID", true,
+	// geneDTO.getGeneId(), entrezSeparator)
+	// }
+	//
+	// //for loop
+	// for (EntrezDiscontinuedGeneDTO discontinuedGene : discontinuedGeneList){
+	// logger.debug("adding old gene ID " + discontinuedGene.getDiscontinuedGeneId()
+	// + " to the gene: " + geneThing.getCodeName());
+	// geneThing = addOldGeneID(geneThing, discontinuedGene, lsTransaction);
+	//
+	// //add reference gene to the old Gene as well
+	// logger.debug("adding reference gene ID " + geneDTO.getGeneId() + " to the
+	// following old gene: " + discontinuedGene.getDiscontinuedGeneId());
+	// addReferenceGeneIdToDiscontinuedGene(geneDTO, discontinuedGene,
+	// lsTransaction);
+	// }
+	//
+	//
+	// }
+	//
+	//
+	//
+	// return geneThing;
+	// }
+	//
+
+	// private void addReferenceGeneIdToDiscontinuedGene(EntrezDbGeneDTO geneDTO,
+	// EntrezDiscontinuedGeneDTO discontinuedGene, LsTransaction lsTransaction) {
+	// List<LsThing> inactiveGenes =
+	// LsThing.findAllLsThingByPreferredLabelText("gene", "entrez gene", "name",
+	// "Entrez Gene ID", discontinuedGene.getDiscontinuedGeneId()).getResultList();
+	// logger.debug("@@@@@@@@@ number of inactive genes found: " +
+	// inactiveGenes.size() + " for gene " +
+	// discontinuedGene.getDiscontinuedGeneId());
+	// for (LsThing inactiveGene : inactiveGenes){
+	//
+	// boolean activeGene = false;
+	// List<LsThingLabel> lsThingLabels =
+	// LsThingLabel.findLsThingPreferredName(inactiveGene.getId(), "name", "Entrez
+	// Gene ID").getResultList();
+	// for (LsThingLabel lsThingLabel : lsThingLabels){
+	// if (lsThingLabel.getLabelText().equalsIgnoreCase(geneDTO.getGeneId())){
+	// activeGene = true;
+	// }
+	// }
+	//
+	// if (!activeGene){
+	// logger.debug("current inactive gene: " + inactiveGene.getCodeName());
+	// if (!inactiveGene.isIgnored()){
+	// discontinueGene(inactiveGene, discontinuedGene, lsTransaction);
+	// }
+	// List<LsThingLabel> geneIdLabels =
+	// LsThingLabel.findLsThingLabelsByLsThingAndLsTypeAndLsKindAndLabelText(inactiveGene,
+	// "name", "Entrez Gene ID", geneDTO.getGeneId()).getResultList();
+	// if (geneIdLabels.size() == 0){
+	// saveGeneLabel(lsTransaction, inactiveGene, "name", "Entrez Gene ID", false,
+	// geneDTO.getGeneId());
+	// // inactiveGene.getLsLabels().add(saveGeneLabel(lsTransaction, inactiveGene,
+	// "name", "Entrez Gene ID", false, geneDTO.getGeneId()));
+	// }
+	// }
+	// }
+	// }
+
+	// private LsThing addOldGeneID(LsThing geneThing, EntrezDiscontinuedGeneDTO
+	// discontinuedGene, LsTransaction lsTransaction) {
+	// List<LsThingLabel> geneIdLabels =
+	// LsThingLabel.findLsThingLabelsByLsThingAndLsTypeAndLsKindAndLabelText(geneThing,
+	// "name", "Entrez Gene ID",
+	// discontinuedGene.getDiscontinuedGeneId()).getResultList();
+	// if (geneIdLabels.size() == 0){
+	// geneThing.getLsLabels().add(saveGeneLabel(lsTransaction, geneThing, "name",
+	// "Entrez Gene ID", false, discontinuedGene.getDiscontinuedGeneId()));
+	// }
+	//
+	// // else if (geneIdLabels.size() == 1){
+	// // LsThingLabel lsThingLabel = geneIdLabels.get(0);
+	// // if (!lsThingLabel.isPreferred()){
+	// // lsThingLabel.setPreferred(false);
+	// // lsThingLabel.setModifiedDate(new Date());
+	// // lsThingLabel.merge();
+	// // }
+	// // } else {
+	// // logger.error("Found multiple gene ID labels");
+	// // }
+	//
+	// return geneThing;
+	// }
+
+	// public LsThing addOldGeneID(LsThing geneThing, EntrezDbGeneDTO geneDTO,
+	// EntrezDiscontinuedGeneDTO entrezDiscontinuedGeneDTO, LsTransaction
+	// lsTransaction) {
+	// if (entrezDiscontinuedGeneDTO.getDiscontinuedGeneId() != null)
+	// geneThing.getLsLabels().add(saveGeneLabel(lsTransaction, geneThing, "name",
+	// "Entrez Gene ID", false, entrezDiscontinuedGeneDTO.getDiscontinuedGeneId()));
+	// if (entrezDiscontinuedGeneDTO.getDiscontinuedSymbol() != null)
+	// geneThing.getLsLabels().add(saveGeneLabel(lsTransaction, geneThing, "name",
+	// "gene symbol", false, entrezDiscontinuedGeneDTO.getDiscontinuedSymbol()));
+	// return geneThing;
+	// }
+	//
+
+	//
+	//
+	// public LsThing ignoreNonGeneIDLabels(LsTransaction lsTransaction, LsThing
+	// geneThing) {
+	// Set<LsThingLabel> lsLabels = new HashSet<LsThingLabel>();
+	// for (LsThingLabel geneLabel : geneThing.getLsLabels()){
+	// if (geneLabel.getLsType().equalsIgnoreCase("name") &&
+	// geneLabel.getLsKind().equalsIgnoreCase("Entrez Gene ID")){
+	// // do nothing to the Entrez Gene IDs
+	// } else {
+	// // ignore all of the other existing labels
+	// geneLabel.setIgnored(true);
+	// //lsLabels.add(geneLabel);
+	// }
+	// }
+	//
+	// //geneThing.setLsLabels(lsLabels);
+	// return geneThing;
+	// }
+	//
+	// public LsThing updateGeneID(LsThing geneThing, EntrezDbGeneDTO geneDTO,
+	// EntrezDiscontinuedGeneDTO entrezDiscontinuedGeneDTO, LsTransaction
+	// lsTransaction) {
+	//
+	// logger.debug("attempting to update the gene GeneID");
+	// logger.debug(geneThing.toJson());
+	//
+	// // mark old geneId as not preferred
+	// // create new label
+	// for (LsThingLabel geneLabel : geneThing.getLsLabels()){
+	// if (geneLabel.getLsType().equalsIgnoreCase("name") &&
+	// geneLabel.getLsKind().equalsIgnoreCase("Entrez Gene ID")
+	// &&
+	// geneLabel.getLabelText().equalsIgnoreCase(entrezDiscontinuedGeneDTO.getDiscontinuedGeneId())
+	// && geneLabel.isPreferred()){
+	// geneLabel.setPreferred(false);
+	// }
+	// }
+	//
+	// LsThingLabel newGeneLabel = saveGeneLabel(lsTransaction, geneThing, "name",
+	// "Entrez Gene ID", true, entrezDiscontinuedGeneDTO.getGeneId());
+	// geneThing.getLsLabels().add(newGeneLabel);
+	//
+	// // save discontinued metadata
+	// LsThingState geneState = new LsThingState();
+	// geneState.setLsThing(geneThing);
+	// geneState.setLsType("metadata");
+	// geneState.setLsKind("gene discontinued metadata");
+	// geneState.setLsTransaction(lsTransaction.getId());
+	// geneState.setRecordedBy("acas admin");
+	// geneState.persist();
+	//
+	// String entrezSeparator = "\\|";
+	// geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState,
+	// "stringValue", "discontinued gene id",
+	// entrezDiscontinuedGeneDTO.getDiscontinuedGeneId(), entrezSeparator));
+	// geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState,
+	// "stringValue", "discontinued gene symbol",
+	// entrezDiscontinuedGeneDTO.getDiscontinuedSymbol(), entrezSeparator));
+	// geneState.getLsValues().add(saveGeneDescriptor(lsTransaction, geneState,
+	// "dateValue", "discontinued date",
+	// entrezDiscontinuedGeneDTO.getDiscontinuedDate()));
+	// geneThing.getLsStates().add(geneState);
+	//
+	// return geneThing;
+	//
+	//
+	// }
+	//
+	// public LsThing registerDiscontinuedGene(EntrezDiscontinuedGeneDTO geneDTO,
+	// LsTransaction lsTransaction) {
+	// logger.debug("create discontinued gene: " + geneDTO.getDiscontinuedGeneId());
+	// String geneTypeString = "gene";
+	// String geneKindString = "entrez gene";
+	// ThingType geneType = ThingType.getOrCreate(geneTypeString);
+	// ThingKind.getOrCreate(geneType, geneKindString);
+	//
+	// LabelType labelType = LabelType.getOrCreate("name");
+	// LabelKind.getOrCreate(labelType, "gene code name");
+	// LabelKind.getOrCreate(labelType, "Entrez Gene ID");
+	// LabelKind.getOrCreate(labelType, "gene symbol");
+	//
+	// StateType stateType = StateType.getOrCreate("metadata");
+	// StateKind.getOrCreate(stateType, "gene metadata");
+	//
+	// ValueType valueType = ValueType.getOrCreate("stringValue");
+	// ValueKind.getOrCreate(valueType, "discontinued gene id");
+	// ValueKind.getOrCreate(valueType, "discontinued gene symbol");
+	// ValueKind.getOrCreate(valueType, "discontinued date");
+	// ValueKind.getOrCreate(valueType, "discontinued gene");
+	// ValueType valueTypeDate = ValueType.getOrCreate("dateValue");
+	// ValueKind.getOrCreate(valueTypeDate, "modification date");
+	//
+	//
+	// LsThing geneThing = new LsThing();
+	// geneThing.setCodeName(getGeneCodeName());
+	// geneThing.setLsType(geneTypeString);
+	// geneThing.setLsKind(geneKindString);
+	// geneThing.setLsTransaction(lsTransaction.getId());
+	// geneThing.setRecordedBy("acas admin");
+	// geneThing.persist();
+	//
+	// String entrezSeparator = "\\|";
+	// saveGeneLabel(lsTransaction, geneThing, "name", "Entrez Gene ID", true,
+	// geneDTO.getDiscontinuedGeneId(), entrezSeparator);
+	// saveGeneLabel(lsTransaction, geneThing, "name", "gene symbol", false,
+	// geneDTO.getDiscontinuedSymbol(), entrezSeparator);
+	//
+	// LsThingState geneState = new LsThingState();
+	// geneState.setLsThing(geneThing);
+	// geneState.setLsType("metadata");
+	// geneState.setLsKind("gene metadata");
+	// geneState.setLsTransaction(lsTransaction.getId());
+	// geneState.setRecordedBy("acas admin");
+	// geneState.persist();
+	//
+	// saveGeneDescriptor(lsTransaction, geneState, "stringValue", "tax id",
+	// geneDTO.getTaxId(), entrezSeparator);
+	// saveGeneDescriptor(lsTransaction, geneState, "stringValue", "discontinued
+	// gene", "true", entrezSeparator);
+	// saveGeneDescriptor(lsTransaction, geneState, "stringValue", "discontinued
+	// gene id", geneDTO.getDiscontinuedGeneId(), entrezSeparator);
+	// saveGeneDescriptor(lsTransaction, geneState, "stringValue", "discontinued
+	// gene symbol", geneDTO.getDiscontinuedSymbol(), entrezSeparator);
+	// saveGeneDescriptor(lsTransaction, geneState, "dateValue", "discontinued
+	// date", geneDTO.getDiscontinuedDate());
+	//
+	// return geneThing;
+	// }
+	//
+	//
+	// @SuppressWarnings("unchecked")
+	// public void processDiscontinuedGenes(MultiValueMap discontinuedGenes,
+	// String taxonomyId, LsTransaction lsTransaction) {
+	//
+	// logger.info("########### PROCESSING DISCONTINUED GENES ##############");
+	// logger.info("number of discontinued genes: " + discontinuedGenes.size());
+	//
+	// // EntrezDiscontinuedGeneDTO discontinuedGene;
+	// String geneTypeString = "gene";
+	// String geneKindString = "entrez gene";
+	// LsThing geneThing = null;
+	// int geneCount = 0;
+	// int batchSize = 25;
+	// Set<String> keys = discontinuedGenes.keySet();
+	// for (String key : keys){
+	//
+	// logger.debug("the key is: " + key);
+	// List<EntrezDiscontinuedGeneDTO> discontinuedGeneSet =
+	// (List<EntrezDiscontinuedGeneDTO>) discontinuedGenes.get(key);
+	// for (EntrezDiscontinuedGeneDTO discontinuedGene : discontinuedGeneSet) {
+	// List<LsThing> inactiveGenes =
+	// LsThing.findAllLsThingByPreferredLabelText("gene", "entrez gene", "name",
+	// "Entrez Gene ID", discontinuedGene.getDiscontinuedGeneId()).getResultList();
+	// logger.debug("@@@@@@@@@ number of inactive genes found: " +
+	// inactiveGenes.size() + " for gene " +
+	// discontinuedGene.getDiscontinuedGeneId());
+	// if (inactiveGenes.size() == 0){
+	// geneThing = createDiscontinuedGene(discontinuedGene, lsTransaction);
+	//
+	// } else if (inactiveGenes.size() == 1){
+	// LsThing inactiveGene = inactiveGenes.get(0);
+	// logger.debug("current inactive gene: " + inactiveGene.getCodeName());
+	// // geneThing = discontinueGene(discontinuedGene, lsTransaction);
+	// geneThing = discontinueGene(inactiveGene, discontinuedGene, lsTransaction);
+	//
+	// } else {
+	// throw new RuntimeException("Found multiple genes -- expected 0 or 1");
+	// }
+	//
+	// geneCount++;
+	// if ( geneCount % batchSize == 0 ) { // same as the JDBC batch size
+	// logger.info("-----------------------------------------------current
+	// discontinued gene update count: " + geneCount);
+	// if (geneThing != null){
+	// geneThing.flush();
+	// geneThing.clear();
+	// }
+	// }
+	// }
+	//
+	//
+	// }
+	//
+	// }
+	//
+	// public LsThing createDiscontinuedGene(EntrezDiscontinuedGeneDTO geneDTO,
+	// LsTransaction lsTransaction) {
+	// logger.debug("create discontinued gene: " + geneDTO.getDiscontinuedGeneId());
+	// String geneTypeString = "gene";
+	// String geneKindString = "entrez gene";
+	// // ThingType geneType = ThingType.getOrCreate(geneTypeString);
+	// // ThingKind.getOrCreate(geneType, geneKindString);
+	// //
+	// // LabelType labelType = LabelType.getOrCreate("name");
+	// // LabelKind.getOrCreate(labelType, "gene code name");
+	// // LabelKind.getOrCreate(labelType, "Entrez Gene ID");
+	// // LabelKind.getOrCreate(labelType, "gene symbol");
+	// //
+	// // StateType stateType = StateType.getOrCreate("metadata");
+	// // StateKind.getOrCreate(stateType, "gene metadata");
+	// //
+	// // ValueType valueType = ValueType.getOrCreate("stringValue");
+	// // ValueKind.getOrCreate(valueType, "discontinued gene id");
+	// // ValueKind.getOrCreate(valueType, "discontinued gene symbol");
+	// // ValueKind.getOrCreate(valueType, "discontinued date");
+	// // ValueKind.getOrCreate(valueType, "discontinued gene");
+	// // ValueType valueTypeDate = ValueType.getOrCreate("dateValue");
+	// // ValueKind.getOrCreate(valueTypeDate, "modification date");
+	//
+	//
+	// LsThing geneThing = new LsThing();
+	// geneThing.setCodeName(getGeneCodeName());
+	// geneThing.setLsType(geneTypeString);
+	// geneThing.setLsKind(geneKindString);
+	// geneThing.setLsTransaction(lsTransaction.getId());
+	// geneThing.setRecordedBy("acas admin");
+	// geneThing.persist();
+	//
+	// String entrezSeparator = "\\|";
+	// saveGeneLabel(lsTransaction, geneThing, "name", "Entrez Gene ID", true,
+	// geneDTO.getDiscontinuedGeneId(), entrezSeparator);
+	// saveGeneLabel(lsTransaction, geneThing, "name", "gene symbol", false,
+	// geneDTO.getDiscontinuedSymbol(), entrezSeparator);
+	//
+	// LsThingState geneState = new LsThingState();
+	// geneState.setLsThing(geneThing);
+	// geneState.setLsType("metadata");
+	// geneState.setLsKind("gene metadata");
+	// geneState.setLsTransaction(lsTransaction.getId());
+	// geneState.setRecordedBy("acas admin");
+	// geneState.persist();
+	//
+	// saveGeneDescriptor(lsTransaction, geneState, "stringValue", "tax id",
+	// geneDTO.getTaxId(), entrezSeparator);
+	// saveGeneDescriptor(lsTransaction, geneState, "stringValue", "discontinued
+	// gene", "true", entrezSeparator);
+	// saveGeneDescriptor(lsTransaction, geneState, "stringValue", "discontinued
+	// gene id", geneDTO.getDiscontinuedGeneId(), entrezSeparator);
+	// saveGeneDescriptor(lsTransaction, geneState, "stringValue", "discontinued
+	// gene symbol", geneDTO.getDiscontinuedSymbol(), entrezSeparator);
+	// saveGeneDescriptor(lsTransaction, geneState, "dateValue", "discontinued
+	// date", geneDTO.getDiscontinuedDate());
+	//
+	// return geneThing;
+	//
+	// }
+
+	// public class GeneHistoryDTO {
+	// private MultiValueMap discontinuedGenes;
+	// private MultiValueMap updatedGenes;
+	// public MultiValueMap getDiscontinuedGenes() {
+	// return discontinuedGenes;
+	// }
+	// public void setDiscontinuedGenes(MultiValueMap discontinuedGenes) {
+	// this.discontinuedGenes = discontinuedGenes;
+	// }
+	// public MultiValueMap getUpdatedGenes() {
+	// return updatedGenes;
+	// }
+	// public void setUpdatedGenes(MultiValueMap updatedGenes) {
+	// this.updatedGenes = updatedGenes;
+	// }
+	// }
 
+	public static CellProcessor[] getDiscontinuedGenesProcessors() {
 
-	//	public void addDiscontinuedGeneIDs(GeneHistoryDTO historyResults,
-	//			String taxonomyId, LsTransaction lsTransaction) {
-	//		//check if gene exists -- 
-	//		// check if discontinued gene ID label exists -- if not -- create it
-	//		LsThing geneThing = null;
-	//
-	//		MultiValueMap updatedGenes = historyResults.getUpdatedGenes();
-	//		Set<String> geneIdKeys = updatedGenes.keySet();
-	//		int batchSize = 50;
-	//		int i = 0;
-	//		for (String geneIdKey : geneIdKeys){
-	//			for (EntrezDiscontinuedGeneDTO singleGene : (List<EntrezDiscontinuedGeneDTO>) updatedGenes.get(geneIdKey)){
-	//				geneThing = updateGeneLabels(singleGene, lsTransaction);
-	//
-	//				if ( i % batchSize == 0 ) { // same as the JDBC batch size
-	//					if (geneThing != null){
-	//						geneThing.flush();
-	//						geneThing.clear();						
-	//					}
-	//				}
-	//				i++;
-	//			}
-	//		}
-	//
-	//	}
-	//
-	//	private LsThing updateGeneLabels(EntrezDiscontinuedGeneDTO singleGene, LsTransaction lsTransaction) {
-	//
-	//		List<LsThing> discontinuedGenes = LsThing.findLsThingByLabelText("gene", "entrez gene", "name", "Entrez Gene ID", singleGene.getDiscontinuedGeneId()).getResultList();
-	//		List<LsThing> genes = LsThing.findLsThingByLabelText("gene", "entrez gene", "name", "Entrez Gene ID", singleGene.getGeneId()).getResultList();
-	//
-	//		int discontinuedGenesCount = discontinuedGenes.size();
-	//		int geneCount = genes.size();
-	//
-	//		logger.debug("------------ the gene ID count is: " + discontinuedGenes.size() + "  for discontinued gene " + singleGene.getDiscontinuedGeneId());
-	//		logger.debug("------------ the gene ID count is: " + genes.size() + "  for new gene " + singleGene.getGeneId());
-	//
-	//		LsThing geneThing = null ;
-	//		if (discontinuedGenesCount == 0 && geneCount == 0){
-	//			logger.debug("gene is not registered yet");
-	//		} else if (discontinuedGenesCount == 0 && geneCount == 1 ){
-	//			logger.debug("@@@@@@ ------ add discontinued geneID to the geneThing");		
-	//			geneThing = genes.get(0);
-	//
-	//			//check if old gene ID exists, if not create it
-	//			Long countOfGeneID = LsThingLabel.countOfLsThingLabelsByLabel(geneThing, "name", "Entrez Gene ID", singleGene.getDiscontinuedGeneId());
-	//			Long countOfGeneSymbol = LsThingLabel.countOfLsThingLabelsByLabel(geneThing, "name", "gene symbol", singleGene.getDiscontinuedSymbol());
-	//			if (countOfGeneID == 0){
-	//				geneThing.getLsLabels().add(saveGeneLabel(lsTransaction, geneThing, "name", "Entrez Gene ID", false, singleGene.getDiscontinuedGeneId()));
-	//			}
-	//			if (countOfGeneSymbol == 0){
-	//				geneThing.getLsLabels().add(saveGeneLabel(lsTransaction, geneThing, "name", "gene symbol", false, singleGene.getDiscontinuedSymbol()));
-	//			}
-	//
-	//			// add discontinued meta to the old gene
-	//
-	//		}
-	//
-	//		return geneThing;
-	//	}
-
-	//	@SuppressWarnings("unchecked")
-	//	public void processEntrezGenes(String entrezGenes, GeneHistoryDTO historyResults, 
-	//			String taxonomyId, LsTransaction lsTransaction) throws IOException {
-	//
-	//		setGeneDefaults();
-	//
-	//		logger.debug("read tab delimited file");
-	//		BufferedReader br = new BufferedReader(new FileReader(entrezGenes));
-	//
-	//		ICsvBeanReader beanReader = null;
-	//		try {
-	//
-	//			beanReader = new CsvBeanReader(br, CsvPreference.TAB_PREFERENCE);
-	//			String[] headerText = beanReader.getHeader(true);
-	//
-	//			String geneTypeString = "gene";
-	//			String geneKindString = "entrez gene";
-	//
-	//			// map header text to standard bean names
-	//
-	//			HashMap<String, String> geneBeanMap = new HashMap<String, String>();
-	//			geneBeanMap.put("tax_id", "taxId");
-	//			geneBeanMap.put("GeneID", "geneId");
-	//			geneBeanMap.put("Symbol", "symbol");
-	//			geneBeanMap.put("LocusTag", "locusTag");
-	//			geneBeanMap.put("Synonyms", "synonyms");
-	//			geneBeanMap.put("dbXrefs", "dbXrefs");
-	//			geneBeanMap.put("chromosome", "chromosome");
-	//			geneBeanMap.put("map_location", "mapLocation");
-	//			geneBeanMap.put("description", "description");
-	//			geneBeanMap.put("type_of_gene", "typeOfGene");
-	//			geneBeanMap.put("Symbol_from_nomenclature_authority", "symbolFromAuthority");
-	//			geneBeanMap.put("Full_name_from_nomenclature_authority", "fullNameFromAuthority");
-	//			geneBeanMap.put("Nomenclature_status", "nomenclatureStatus");
-	//			geneBeanMap.put("Other_designations", "otherDesignations");
-	//			geneBeanMap.put("Modification_date", "modificationDate");
-	//
-	//			List<String> headerList = new ArrayList<String>();
-	//			int position = 0;
-	//			for (String head : headerText){
-	//				logger.debug("header column: " + position + "  " + head);
-	//				if (geneBeanMap.get(head) != null){
-	//					headerList.add(geneBeanMap.get(head));   				
-	//				}
-	//				position++;
-	//			}
-	//
-	//
-	//			logger.debug("size of header list  " + headerList.size());
-	//			String[] header = new String[headerList.size()];
-	//			headerList.toArray(header);
-	//
-	//			for (String head : header){
-	//				logger.warn("header column array : " + position + "  " + head);
-	//				position++;
-	//			}
-	//
-	//
-	//			final CellProcessor[] processors = getProcessors();
-	//
-	//			EntrezDbGeneDTO geneDTO;
-	//
-	//			//			int numberOfLines = SimpleUtil.countLines(entrezGenes);
-	//			//			Long numberOfLabels = new Long(numberOfLines-1);
-	//			//			
-	//			//			List<AutoLabelDTO> thingCodes = autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels);
-	//
-	//			int i = 0;
-	//			int batchSize = 25;
-	//			LsThing geneThing = null;
-	//			while( (geneDTO = beanReader.read(EntrezDbGeneDTO.class, header, processors)) != null ) {
-	//				System.out.println(String.format("lineNo=%s, rowNo=%s, bulkData=%s", beanReader.getLineNumber(), beanReader.getRowNumber(), geneDTO));
-	//				logger.info("------------------------------- Here is the geneDTO ---------------------");
-	//				logger.info(geneDTO.toJson());
-	//				logger.debug("current gene: " + geneDTO.getGeneId());
-	//
-	//				// check if gene currently exists
-	//				Long geneIdCount = LsThingLabel.countOfAllLsThingByPreferredName(geneTypeString, geneKindString, "name", "Entrez Gene ID", geneDTO.getGeneId());
-	//				//				Long oldGeneIdCount = LsThingLabel.countOfLsThingByName(geneTypeString, geneKindString, "name", "Entrez Gene ID", historyResults.getUpdatedGenes().get(geneDTO.getGeneId()).getDiscontinuedGeneId());
-	//
-	//				logger.debug("Process Entrez Genes ------------------- geneId count "  + geneIdCount);
-	//
-	//
-	//				// check if discontinued gene
-	//				boolean discontinuedGene = false;
-	//				if (historyResults.getDiscontinuedGenes().containsKey(geneDTO.getGeneId())) {
-	//					logger.debug("discontinued gene");
-	//					discontinuedGene = true;
-	//				}
-	//
-	//				// check if updated gene
-	//				boolean updatedGene = false;
-	//				if (historyResults.getUpdatedGenes().containsKey(geneDTO.getGeneId())) {
-	//					logger.debug("updated gene");
-	//					updatedGene = true;
-	//				}
-	//
-	//				// temp for debugging only
-	//				//updatedGene = true;
-	//
-	//
-	//				// use cases -- flipping through entrez gene list
-	//				// 1. gene ID not registered and in list of discontinued genes --> register discontinued gene
-	//				// 2. gene ID not registered and in list of updated genes --> update gene entry; 
-	//				//       set old gene ID to not preferred, 
-	//				//       add new gene ID as the preferred; 
-	//				//       ignore old gene metadata, 
-	//				//       add new gene metadata
-	//				// 3. index through discontinued genes -- register all genes not already registered 
-	//
-	//				//				for (){
-	//				//					
-	//				//				}
-	//
-	//				if (discontinuedGene && geneIdCount == 0L){
-	//					//create new entry for discontinued gene
-	//					for (EntrezDiscontinuedGeneDTO singleGene : (List<EntrezDiscontinuedGeneDTO>) historyResults.getDiscontinuedGenes().get(geneDTO.getGeneId())){
-	//						geneThing = registerDiscontinuedGene(singleGene, lsTransaction);						
-	//					}
-	//
-	//				} else if (updatedGene ){
-	//					// updating existing gene info with new gene label and meta (merging genes if new gene does not exist)
-	//					// else keep 2 gene entities
-	//
-	//					for (EntrezDiscontinuedGeneDTO singleGene : (List<EntrezDiscontinuedGeneDTO>) historyResults.getUpdatedGenes().get(geneDTO.getGeneId())){
-	//						geneThing = registerUpdatedGene(geneDTO, singleGene, (List<EntrezDiscontinuedGeneDTO>) historyResults.getUpdatedGenes().get(geneDTO.getGeneId()), lsTransaction);					
-	//						if (logger.isDebugEnabled()) logger.debug("updated the gene entry: " + LsThing.findLsThing(geneThing.getId()).toPrettyJson());
-	//					}
-	//
-	//				} else if (geneIdCount == 0L ) {
-	//					// brand new gene to register
-	//					if (logger.isDebugEnabled()) logger.debug("registering new gene: " + geneDTO.getGeneId());
-	//					geneThing = registerNewGene(geneDTO, lsTransaction);
-	//
-	//				} else {
-	//					if (logger.isDebugEnabled()) logger.debug("gene already registered: " + geneDTO.getGeneId());
-	//				}
-	//
-	//				if ( i % batchSize == 0 ) { // same as the JDBC batch size
-	//					if (geneThing != null){
-	//						geneThing.flush();
-	//						geneThing.clear();						
-	//					}
-	//				}
-	//				i++;
-	//				logger.debug("-----------------------------------------------current entrez gene update count: " + i);
-	//
-	//			}
-	//		}
-	//		finally {
-	//			if( beanReader != null ) {
-	//				beanReader.close();
-	//			}
-	//			if (br != null)br.close();
-	//		}
-	//
-	//	}
-
-
-	//	public LsThing registerUpdatedGene(EntrezDbGeneDTO geneDTO, EntrezDiscontinuedGeneDTO singleDiscontinuedGene,  List<EntrezDiscontinuedGeneDTO> discontinuedGeneList, LsTransaction lsTransaction) {
-	//		// geneID not registered but the gene is on the update list
-	//		// check if registered under different geneID
-	//		// if so -- then update
-	//		// else  -- register new
-	//
-	//		// two copies of the gene exist
-	//		// one copy is discontinued
-	//		// the other copy is now the preferred gene
-	//		// mark the old one as discontinued (it will keep the old gene id)
-	//		// the other gene will keep the new gene id and just update the gene metadata
-	//
-	//		// error above
-	//		// keep both gene entities as active entities
-	//		// old gene thing will keep the old gene id
-	//		// new gene thing will not reference the old gene id
-	//		// hmmm... what if a user searches for a gene by symbol?
-	//		// the user will find the new gene but not find the old gene
-	//		// how do we know to link the two genes? 
-	//
-	//		// use case -- user wants to see all the data for gene id 11797; 11797 maps back to discontinued gene 77616 and 102757
-	//		// gene A has a gene ID label for 11797 and 10257
-	//		// gene B has a gene ID label for 77616
-	//		// AG data for both geneA and geneB.
-	//		// option 1: rename the batch code for geneB to geneA. (actual change of data)
-	//		// option 2: leave the AG data alone. If user queries for data for 11797 -- we must also return data for 77616
-	//		// so gene A should have a label for the discontinued gene id: name_discontinued Entrez Gene ID? or just another Entrez Gene ID not preferred
-	//		// in some cases -- there may or may not be another gene thing with a matching preferred Entrez Gene ID 
-	//		// let's work with option 2 for now. So genes will also have a label of discontinued gene id -- mark more info in comments?
-	//
-	//		String geneTypeString = "gene";
-	//		String geneKindString = "entrez gene";
-	//		//		Long geneIdCount = LsThingLabel.countOfLsThingByName(geneTypeString, geneKindString, "name", "Entrez Gene ID", entrezDiscontinuedGeneDTO.getDiscontinuedGeneId());
-	//		//		Long newGeneIdCount = LsThingLabel.countOfLsThingByName(geneTypeString, geneKindString, "name", "Entrez Gene ID", geneDTO.getGeneId());
-	//
-	//		//		things = LsThing.findLsThingByLabelKindAndLabelText(geneTypeString, geneKindString, labelKind, labelText);
-	//
-	//		logger.debug("searching for new genes by: " + geneDTO.getGeneId());
-	//		List<LsThing> newGenes = LsThing.findAllLsThingByPreferredLabelText(geneTypeString, geneKindString, "name", "Entrez Gene ID",  geneDTO.getGeneId()).getResultList();
-	//
-	//		logger.debug("searching for discontinued genes by: " + singleDiscontinuedGene.getDiscontinuedGeneId());
-	//		List<LsThing> discontinuedGenes = LsThing.findLsThingByLabelText("gene", "entrez gene", "name", "Entrez Gene ID", singleDiscontinuedGene.getDiscontinuedGeneId()).getResultList();
-	//
-	//
-	//		int geneIdCount = discontinuedGenes.size();
-	//		int newGeneIdCount = newGenes.size();
-	//
-	//		logger.debug("------------ the gene ID count is: " + discontinuedGenes.size() + "  for discontinued gene " + singleDiscontinuedGene.getDiscontinuedGeneId());
-	//		logger.debug("------------ the gene ID count is: " + newGenes.size() + "  for new gene " + geneDTO.getGeneId());
-	//
-	//		//are the genes the same?
-	//		boolean sameGene = false;
-	//		if (discontinuedGenes.size() == 1 && newGenes.size() == 1){
-	//			if (discontinuedGenes.get(0).getId().longValue() == newGenes.get(0).getId().longValue()){
-	//				logger.debug("@@@@@@  Mapping back to the same gene   @@@@@@     " + discontinuedGenes.get(0).getCodeName());
-	//				sameGene = true;
-	//			}
-	//		}
-	//
-	//		LsThing geneThing = null ;
-	//		if (geneIdCount == 0 && newGeneIdCount == 0){
-	//			logger.debug("gene is not registered yet");
-	//			//			geneThing = registerNewGene(geneDTO, singleDiscontinuedGene, lsTransaction);
-	//			geneThing = registerNewGene(geneDTO, lsTransaction);
-	//
-	//		} else if (geneIdCount == 1 && newGeneIdCount == 1 && sameGene){
-	//			logger.debug("------ both gene IDs are currently registered with the same geneThing");
-	//			// add discontinued meta to the old gene
-	//
-	//
-	//			//TODO add the discontinued meta data to teh old gene (not the active gene)
-	//			//LsThing oldGene = discontinueGene(singleDiscontinuedGene, lsTransaction);
-	//			//if (logger.isDebugEnabled()) logger.debug("added discontinued gene meta to the old gene: " + oldGene.toPrettyJson());
-	//
-	//			// update the gene with the new info
-	//			List<LsThing> genes = LsThing.findLsThingByPreferredLabelText(geneTypeString, geneKindString, "name", "Entrez Gene ID", geneDTO.getGeneId()).getResultList();
-	//			if (genes.size() == 0){
-	//				logger.error("Gene not found");
-	//			} else if (genes.size() > 1){
-	//				logger.error("multiple genes found with the same gene ID");
-	//
-	//			} else {
-	//				geneThing = genes.get(0);
-	//				//				geneThing = updateGeneID(geneThing, geneDTO, entrezDiscontinuedGeneDTO, lsTransaction);
-	//
-	//				//check the modification date
-	//				boolean isNewDate = false;
-	//				List<LsThingValue> dateValues = LsThingValue.findLsThingValuesByLsThingIDAndStateTypeKindAndValueTypeKind(geneThing.getId(), "metadata", "gene metadata", "dateValue", "modification date").getResultList();
-	//				logger.debug("number of mod dates found: " + dateValues.size());
-	//				if (dateValues.size() > 1) logger.error("Found more than 1 mod date: " + dateValues.size());
-	//				for (LsThingValue dateValue : dateValues){
-	//					if (geneDTO.getModificationDate().after(dateValue.getDateValue())){
-	//						isNewDate = true;
-	//						logger.debug("It is a recent update");
-	//					} else {
-	//						logger.debug("It is a not a recent update");
-	//					}
-	//				}
-	//
-	//				// only update the gene if it is a new update (in Entrez Gene file = geneDTO)
-	//				if (isNewDate){
-	//					logger.debug("Updating the gene metadata");
-	//					geneThing = updateGeneMetaData(geneThing, geneDTO, lsTransaction);
-	//
-	//				} else {
-	//					logger.debug("@@@@@@ NOT A NEW DATE @@@@@@@@");
-	//				}
-	//
-	//				//always check entries in the history file
-	//				for (EntrezDiscontinuedGeneDTO discontinuedGene : discontinuedGeneList){
-	//					logger.debug("adding old gene ID " + discontinuedGene.getDiscontinuedGeneId() + " to the gene: " + geneThing.getCodeName());
-	//					geneThing = addOldGeneID(geneThing, discontinuedGene, lsTransaction);
-	//
-	//					//add reference gene to the old Gene as well
-	//					logger.debug("adding reference gene ID " + geneDTO.getGeneId() + "   to the following old gene: " + discontinuedGene.getDiscontinuedGeneId());
-	//					addReferenceGeneIdToDiscontinuedGene(geneDTO, discontinuedGene, lsTransaction);
-	//				}
-	//
-	//
-	//			}
-	//
-	//		} else if (geneIdCount == 0 && newGeneIdCount == 1){
-	//			logger.debug("------ just the new gene is currently registered");
-	//			// add the old entrez gene id to the registered gene
-	//			// add discontinued meta to the old gene
-	//
-	//			// update the new gene with the new info
-	//			List<LsThing> genes = LsThing.findLsThingByLabelText(geneTypeString, geneKindString, "name", "Entrez Gene ID", geneDTO.getGeneId()).getResultList();
-	//			if (genes.size() == 0){
-	//				logger.error("Gene not found");
-	//			} else if (genes.size() > 1){
-	//				logger.error("multiple genes found with the same gene ID");
-	//
-	//			} else {
-	//				geneThing = genes.get(0);
-	//				geneThing = addOldGeneID(geneThing, geneDTO, singleDiscontinuedGene, lsTransaction);
-	//			}			
-	//		} else {
-	//			logger.debug("-------- gene is registered via old id   geneIdCount: " + geneIdCount + "  newGeneIdCount: " + newGeneIdCount);
-	//
-	//			//			if (logger.isDebugEnabled()) logger.debug("old gene: " + LsThing.findLsThingByLabelText(geneTypeString, geneKindString, "name", "Entrez Gene ID", entrezDiscontinuedGeneDTO.getDiscontinuedGeneId()).getResultList().get(0).toPrettyJson());
-	//
-	//
-	//			List<LsThing> genes = LsThing.findLsThingByPreferredLabelText(geneTypeString, geneKindString, "name", "Entrez Gene ID", geneDTO.getGeneId()).getResultList();
-	//			if (genes.size() == 0){
-	//				logger.error("Gene not found");
-	//			} else if (genes.size() > 1){
-	//				logger.error("multiple genes found with the same gene ID");
-	//				List<Long> thingIds = new ArrayList();
-	//				for (LsThing lsThing : genes){
-	//					thingIds.add(lsThing.getId());
-	//					logger.error("Found this gene ID: " + lsThing.toJson());
-	//
-	//				}
-	//				Collections.sort(thingIds);
-	//				boolean first = true;
-	//				for (Long geneId : thingIds){
-	//					if (first){
-	//						first = false;
-	//						geneThing = LsThing.findLsThing(geneId);
-	//					} else {
-	//						logger.debug("ignored this gene thing ID " + geneId);
-	//						LsThing queryGene = LsThing.findLsThing(geneId);
-	//						queryGene.setIgnored(true);
-	//						queryGene.merge();
-	//					}
-	//				}
-	//
-	//			} else {
-	//				geneThing = genes.get(0);
-	//				logger.debug("working with gene thing: " + geneThing.getCodeName() + "   linked to Gene ID: " + geneDTO.getGeneId());
-	//			}	
-	//
-	//
-	//			//check the modification date
-	//			boolean isNewDate = false;
-	//			logger.debug("working with gene thing: " + geneThing.getCodeName() + "   linked to Gene ID: " + geneDTO.getGeneId());
-	//
-	//			List<LsThingValue> dateValues = LsThingValue.findLsThingValuesByLsThingIDAndStateTypeKindAndValueTypeKind(geneThing.getId(), "metadata", "gene metadata", "dateValue", "modification date").getResultList();
-	//			logger.debug("number of mod dates found: " + dateValues.size());
-	//			if (dateValues.size() > 1) logger.error("Found more than 1 mod date: " + dateValues.size());
-	//			for (LsThingValue dateValue : dateValues){
-	//				if (geneDTO.getModificationDate().after(dateValue.getDateValue())){
-	//					isNewDate = true;
-	//					logger.debug("It is a recent update");
-	//				} else {
-	//					logger.debug("It is a not a recent update");
-	//				}
-	//			}
-	//
-	//
-	//			if (isNewDate){
-	//
-	//				logger.debug("Updating the gene metadata");
-	//				geneThing = updateGeneMetaData(geneThing, geneDTO, lsTransaction);
-	//				// next add old gene IDs to the gene
-	//				//geneThing = addOldGeneID(geneThing, geneDTO, singleDiscontinuedGene, lsTransaction);
-	//
-	//				//				geneThing = updateGene(geneDTO, entrezDiscontinuedGeneDTO, lsTransaction);
-	//				//				saveGeneLabel(lsTransaction, geneThing, "name", "Entrez Gene ID", true, geneDTO.getGeneId(), entrezSeparator)
-	//			}	
-	//
-	//			//for loop
-	//			for (EntrezDiscontinuedGeneDTO discontinuedGene : discontinuedGeneList){
-	//				logger.debug("adding old gene ID " + discontinuedGene.getDiscontinuedGeneId() + " to the gene: " + geneThing.getCodeName());
-	//				geneThing = addOldGeneID(geneThing, discontinuedGene, lsTransaction);
-	//
-	//				//add reference gene to the old Gene as well
-	//				logger.debug("adding reference gene ID " + geneDTO.getGeneId() + "   to the following old gene: " + discontinuedGene.getDiscontinuedGeneId());
-	//				addReferenceGeneIdToDiscontinuedGene(geneDTO, discontinuedGene, lsTransaction);
-	//			}
-	//
-	//
-	//		}
-	//
-	//
-	//
-	//		return geneThing;
-	//	}
-	//
-
-
-
-
-	//	private void addReferenceGeneIdToDiscontinuedGene(EntrezDbGeneDTO geneDTO, EntrezDiscontinuedGeneDTO discontinuedGene, LsTransaction lsTransaction) {
-	//		List<LsThing> inactiveGenes = LsThing.findAllLsThingByPreferredLabelText("gene", "entrez gene", "name", "Entrez Gene ID", discontinuedGene.getDiscontinuedGeneId()).getResultList();
-	//		logger.debug("@@@@@@@@@ number of inactive genes found: " + inactiveGenes.size() + "  for gene " + discontinuedGene.getDiscontinuedGeneId());
-	//		for (LsThing inactiveGene : inactiveGenes){
-	//
-	//			boolean activeGene = false;
-	//			List<LsThingLabel> lsThingLabels = LsThingLabel.findLsThingPreferredName(inactiveGene.getId(), "name", "Entrez Gene ID").getResultList();
-	//			for (LsThingLabel lsThingLabel : lsThingLabels){
-	//				if (lsThingLabel.getLabelText().equalsIgnoreCase(geneDTO.getGeneId())){
-	//					activeGene = true;
-	//				}
-	//			}
-	//
-	//			if (!activeGene){
-	//				logger.debug("current inactive gene: " + inactiveGene.getCodeName());
-	//				if (!inactiveGene.isIgnored()){
-	//					discontinueGene(inactiveGene, discontinuedGene, lsTransaction);
-	//				}
-	//				List<LsThingLabel> geneIdLabels = LsThingLabel.findLsThingLabelsByLsThingAndLsTypeAndLsKindAndLabelText(inactiveGene, "name", "Entrez Gene ID", geneDTO.getGeneId()).getResultList();
-	//				if (geneIdLabels.size() == 0){
-	//					saveGeneLabel(lsTransaction, inactiveGene, "name", "Entrez Gene ID", false, geneDTO.getGeneId());
-	//					//					inactiveGene.getLsLabels().add(saveGeneLabel(lsTransaction, inactiveGene, "name", "Entrez Gene ID", false, geneDTO.getGeneId()));
-	//				}
-	//			}
-	//		}
-	//	}
-
-	//	private LsThing addOldGeneID(LsThing geneThing, EntrezDiscontinuedGeneDTO discontinuedGene, LsTransaction lsTransaction) {
-	//		List<LsThingLabel> geneIdLabels = LsThingLabel.findLsThingLabelsByLsThingAndLsTypeAndLsKindAndLabelText(geneThing, "name", "Entrez Gene ID", discontinuedGene.getDiscontinuedGeneId()).getResultList();
-	//		if (geneIdLabels.size() == 0){
-	//			geneThing.getLsLabels().add(saveGeneLabel(lsTransaction, geneThing, "name", "Entrez Gene ID", false, discontinuedGene.getDiscontinuedGeneId()));
-	//		} 
-	//
-	//		//		else if (geneIdLabels.size() == 1){
-	//		//			LsThingLabel lsThingLabel = geneIdLabels.get(0);
-	//		//			if (!lsThingLabel.isPreferred()){
-	//		//				lsThingLabel.setPreferred(false);
-	//		//				lsThingLabel.setModifiedDate(new Date());
-	//		//				lsThingLabel.merge();				
-	//		//			}
-	//		//		} else {
-	//		//			logger.error("Found multiple gene ID labels");
-	//		//		}
-	//
-	//		return geneThing;
-	//	}
-
-	//	public LsThing addOldGeneID(LsThing geneThing, EntrezDbGeneDTO geneDTO, EntrezDiscontinuedGeneDTO entrezDiscontinuedGeneDTO, LsTransaction lsTransaction) {
-	//		if (entrezDiscontinuedGeneDTO.getDiscontinuedGeneId() != null)  geneThing.getLsLabels().add(saveGeneLabel(lsTransaction, geneThing, "name", "Entrez Gene ID", false, entrezDiscontinuedGeneDTO.getDiscontinuedGeneId()));
-	//		if (entrezDiscontinuedGeneDTO.getDiscontinuedSymbol() != null)  geneThing.getLsLabels().add(saveGeneLabel(lsTransaction, geneThing, "name", "gene symbol", false, entrezDiscontinuedGeneDTO.getDiscontinuedSymbol()));
-	//		return geneThing;
-	//	}
-	//
-
-
-	//
-	//
-	//	public LsThing ignoreNonGeneIDLabels(LsTransaction lsTransaction, LsThing geneThing) {
-	//		Set<LsThingLabel> lsLabels = new HashSet<LsThingLabel>();
-	//		for (LsThingLabel geneLabel : geneThing.getLsLabels()){
-	//			if (geneLabel.getLsType().equalsIgnoreCase("name") && geneLabel.getLsKind().equalsIgnoreCase("Entrez Gene ID")){
-	//				// do nothing to the Entrez Gene IDs
-	//			} else {
-	//				// ignore all of the other existing labels
-	//				geneLabel.setIgnored(true);
-	//				//lsLabels.add(geneLabel);
-	//			}
-	//		}
-	//
-	//		//geneThing.setLsLabels(lsLabels);
-	//		return geneThing;
-	//	}
-	//
-	//	public LsThing updateGeneID(LsThing geneThing, EntrezDbGeneDTO geneDTO, EntrezDiscontinuedGeneDTO entrezDiscontinuedGeneDTO, LsTransaction lsTransaction) {
-	//
-	//		logger.debug("attempting to update the gene GeneID");
-	//		logger.debug(geneThing.toJson());
-	//
-	//		// mark old geneId as not preferred
-	//		// create new label
-	//		for (LsThingLabel geneLabel : geneThing.getLsLabels()){
-	//			if (geneLabel.getLsType().equalsIgnoreCase("name") && geneLabel.getLsKind().equalsIgnoreCase("Entrez Gene ID") 
-	//					&& geneLabel.getLabelText().equalsIgnoreCase(entrezDiscontinuedGeneDTO.getDiscontinuedGeneId()) && geneLabel.isPreferred()){
-	//				geneLabel.setPreferred(false);
-	//			}
-	//		}
-	//
-	//		LsThingLabel newGeneLabel = saveGeneLabel(lsTransaction, geneThing, "name", "Entrez Gene ID", true, entrezDiscontinuedGeneDTO.getGeneId());
-	//		geneThing.getLsLabels().add(newGeneLabel);
-	//
-	//		// save discontinued metadata
-	//		LsThingState geneState = new LsThingState();
-	//		geneState.setLsThing(geneThing);
-	//		geneState.setLsType("metadata");
-	//		geneState.setLsKind("gene discontinued metadata");
-	//		geneState.setLsTransaction(lsTransaction.getId());
-	//		geneState.setRecordedBy("acas admin");
-	//		geneState.persist();
-	//
-	//		String entrezSeparator = "\\|";
-	//		geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue", "discontinued gene id", entrezDiscontinuedGeneDTO.getDiscontinuedGeneId(), entrezSeparator));
-	//		geneState.getLsValues().addAll(saveGeneDescriptor(lsTransaction, geneState, "stringValue", "discontinued gene symbol", entrezDiscontinuedGeneDTO.getDiscontinuedSymbol(), entrezSeparator));
-	//		geneState.getLsValues().add(saveGeneDescriptor(lsTransaction, geneState, "dateValue", "discontinued date", entrezDiscontinuedGeneDTO.getDiscontinuedDate()));
-	//		geneThing.getLsStates().add(geneState);
-	//
-	//		return geneThing;
-	//
-	//
-	//	}
-	//
-	//	public LsThing registerDiscontinuedGene(EntrezDiscontinuedGeneDTO geneDTO, LsTransaction lsTransaction) {
-	//		logger.debug("create discontinued gene: " + geneDTO.getDiscontinuedGeneId());
-	//		String geneTypeString = "gene";
-	//		String geneKindString = "entrez gene";
-	//		ThingType geneType = ThingType.getOrCreate(geneTypeString);
-	//		ThingKind.getOrCreate(geneType, geneKindString);
-	//
-	//		LabelType labelType = LabelType.getOrCreate("name");
-	//		LabelKind.getOrCreate(labelType, "gene code name");
-	//		LabelKind.getOrCreate(labelType, "Entrez Gene ID");
-	//		LabelKind.getOrCreate(labelType, "gene symbol");
-	//
-	//		StateType stateType = StateType.getOrCreate("metadata");
-	//		StateKind.getOrCreate(stateType, "gene metadata");
-	//
-	//		ValueType valueType = ValueType.getOrCreate("stringValue");
-	//		ValueKind.getOrCreate(valueType, "discontinued gene id");
-	//		ValueKind.getOrCreate(valueType, "discontinued gene symbol");
-	//		ValueKind.getOrCreate(valueType, "discontinued date");
-	//		ValueKind.getOrCreate(valueType, "discontinued gene");
-	//		ValueType valueTypeDate = ValueType.getOrCreate("dateValue");
-	//		ValueKind.getOrCreate(valueTypeDate, "modification date");
-	//
-	//
-	//		LsThing geneThing = new LsThing();
-	//		geneThing.setCodeName(getGeneCodeName());
-	//		geneThing.setLsType(geneTypeString);
-	//		geneThing.setLsKind(geneKindString);
-	//		geneThing.setLsTransaction(lsTransaction.getId());
-	//		geneThing.setRecordedBy("acas admin");
-	//		geneThing.persist();
-	//
-	//		String entrezSeparator = "\\|";
-	//		saveGeneLabel(lsTransaction, geneThing, "name", "Entrez Gene ID", true, geneDTO.getDiscontinuedGeneId(), entrezSeparator);
-	//		saveGeneLabel(lsTransaction, geneThing, "name", "gene symbol", false, geneDTO.getDiscontinuedSymbol(), entrezSeparator);
-	//
-	//		LsThingState geneState = new LsThingState();
-	//		geneState.setLsThing(geneThing);
-	//		geneState.setLsType("metadata");
-	//		geneState.setLsKind("gene metadata");
-	//		geneState.setLsTransaction(lsTransaction.getId());
-	//		geneState.setRecordedBy("acas admin");
-	//		geneState.persist();
-	//
-	//		saveGeneDescriptor(lsTransaction, geneState, "stringValue", "tax id", geneDTO.getTaxId(), entrezSeparator);
-	//		saveGeneDescriptor(lsTransaction, geneState, "stringValue", "discontinued gene", "true", entrezSeparator);
-	//		saveGeneDescriptor(lsTransaction, geneState, "stringValue", "discontinued gene id", geneDTO.getDiscontinuedGeneId(), entrezSeparator);
-	//		saveGeneDescriptor(lsTransaction, geneState, "stringValue", "discontinued gene symbol", geneDTO.getDiscontinuedSymbol(), entrezSeparator);
-	//		saveGeneDescriptor(lsTransaction, geneState, "dateValue", "discontinued date", geneDTO.getDiscontinuedDate());
-	//
-	//		return geneThing;
-	//	}
-	//
-	//
-	//	@SuppressWarnings("unchecked")
-	//	public void processDiscontinuedGenes(MultiValueMap discontinuedGenes,
-	//			String taxonomyId, LsTransaction lsTransaction) {
-	//
-	//		logger.info("########### PROCESSING DISCONTINUED GENES ##############");
-	//		logger.info("number of discontinued genes:  " + discontinuedGenes.size());
-	//
-	//		//		EntrezDiscontinuedGeneDTO discontinuedGene;
-	//		String geneTypeString = "gene";
-	//		String geneKindString = "entrez gene";
-	//		LsThing geneThing = null;
-	//		int geneCount = 0;
-	//		int batchSize = 25;
-	//		Set<String> keys = discontinuedGenes.keySet();
-	//		for (String key : keys){
-	//
-	//			logger.debug("the key is: " + key);
-	//			List<EntrezDiscontinuedGeneDTO> discontinuedGeneSet = (List<EntrezDiscontinuedGeneDTO>) discontinuedGenes.get(key);
-	//			for (EntrezDiscontinuedGeneDTO discontinuedGene : discontinuedGeneSet) {
-	//				List<LsThing> inactiveGenes = LsThing.findAllLsThingByPreferredLabelText("gene", "entrez gene", "name", "Entrez Gene ID", discontinuedGene.getDiscontinuedGeneId()).getResultList();
-	//				logger.debug("@@@@@@@@@ number of inactive genes found: " + inactiveGenes.size() + "  for gene " + discontinuedGene.getDiscontinuedGeneId());
-	//				if (inactiveGenes.size() == 0){
-	//					geneThing = createDiscontinuedGene(discontinuedGene, lsTransaction);
-	//
-	//				} else if (inactiveGenes.size() == 1){
-	//					LsThing inactiveGene = inactiveGenes.get(0);
-	//					logger.debug("current inactive gene: " + inactiveGene.getCodeName());
-	//					//					geneThing = discontinueGene(discontinuedGene, lsTransaction);
-	//					geneThing = discontinueGene(inactiveGene, discontinuedGene, lsTransaction);
-	//
-	//				} else {
-	//					throw new RuntimeException("Found multiple genes -- expected 0 or 1");
-	//				}
-	//
-	//				geneCount++;
-	//				if ( geneCount % batchSize == 0 ) { // same as the JDBC batch size
-	//					logger.info("-----------------------------------------------current discontinued gene update count: " + geneCount);
-	//					if (geneThing != null){
-	//						geneThing.flush();
-	//						geneThing.clear();						
-	//					}
-	//				}
-	//			}
-	//
-	//
-	//		}
-	//
-	//	}
-	//
-	//	public LsThing createDiscontinuedGene(EntrezDiscontinuedGeneDTO geneDTO, LsTransaction lsTransaction) {
-	//		logger.debug("create discontinued gene: " + geneDTO.getDiscontinuedGeneId());
-	//		String geneTypeString = "gene";
-	//		String geneKindString = "entrez gene";
-	//		//		ThingType geneType = ThingType.getOrCreate(geneTypeString);
-	//		//		ThingKind.getOrCreate(geneType, geneKindString);
-	//		//
-	//		//		LabelType labelType = LabelType.getOrCreate("name");
-	//		//		LabelKind.getOrCreate(labelType, "gene code name");
-	//		//		LabelKind.getOrCreate(labelType, "Entrez Gene ID");
-	//		//		LabelKind.getOrCreate(labelType, "gene symbol");
-	//		//
-	//		//		StateType stateType = StateType.getOrCreate("metadata");
-	//		//		StateKind.getOrCreate(stateType, "gene metadata");
-	//		//
-	//		//		ValueType valueType = ValueType.getOrCreate("stringValue");
-	//		//		ValueKind.getOrCreate(valueType, "discontinued gene id");
-	//		//		ValueKind.getOrCreate(valueType, "discontinued gene symbol");
-	//		//		ValueKind.getOrCreate(valueType, "discontinued date");
-	//		//		ValueKind.getOrCreate(valueType, "discontinued gene");
-	//		//		ValueType valueTypeDate = ValueType.getOrCreate("dateValue");
-	//		//		ValueKind.getOrCreate(valueTypeDate, "modification date");
-	//
-	//
-	//		LsThing geneThing = new LsThing();
-	//		geneThing.setCodeName(getGeneCodeName());
-	//		geneThing.setLsType(geneTypeString);
-	//		geneThing.setLsKind(geneKindString);
-	//		geneThing.setLsTransaction(lsTransaction.getId());
-	//		geneThing.setRecordedBy("acas admin");
-	//		geneThing.persist();
-	//
-	//		String entrezSeparator = "\\|";
-	//		saveGeneLabel(lsTransaction, geneThing, "name", "Entrez Gene ID", true, geneDTO.getDiscontinuedGeneId(), entrezSeparator);
-	//		saveGeneLabel(lsTransaction, geneThing, "name", "gene symbol", false, geneDTO.getDiscontinuedSymbol(), entrezSeparator);
-	//
-	//		LsThingState geneState = new LsThingState();
-	//		geneState.setLsThing(geneThing);
-	//		geneState.setLsType("metadata");
-	//		geneState.setLsKind("gene metadata");
-	//		geneState.setLsTransaction(lsTransaction.getId());
-	//		geneState.setRecordedBy("acas admin");
-	//		geneState.persist();
-	//
-	//		saveGeneDescriptor(lsTransaction, geneState, "stringValue", "tax id", geneDTO.getTaxId(), entrezSeparator);
-	//		saveGeneDescriptor(lsTransaction, geneState, "stringValue", "discontinued gene", "true", entrezSeparator);
-	//		saveGeneDescriptor(lsTransaction, geneState, "stringValue", "discontinued gene id", geneDTO.getDiscontinuedGeneId(), entrezSeparator);
-	//		saveGeneDescriptor(lsTransaction, geneState, "stringValue", "discontinued gene symbol", geneDTO.getDiscontinuedSymbol(), entrezSeparator);
-	//		saveGeneDescriptor(lsTransaction, geneState, "dateValue", "discontinued date", geneDTO.getDiscontinuedDate());
-	//
-	//		return geneThing;
-	//
-	//	}
-
-
-	//	public class GeneHistoryDTO {
-	//		private MultiValueMap discontinuedGenes;
-	//		private MultiValueMap updatedGenes;
-	//		public MultiValueMap getDiscontinuedGenes() {
-	//			return discontinuedGenes;
-	//		}
-	//		public void setDiscontinuedGenes(MultiValueMap discontinuedGenes) {
-	//			this.discontinuedGenes = discontinuedGenes;
-	//		}
-	//		public MultiValueMap getUpdatedGenes() {
-	//			return updatedGenes;
-	//		}
-	//		public void setUpdatedGenes(MultiValueMap updatedGenes) {
-	//			this.updatedGenes = updatedGenes;
-	//		}
-	//	}
+		// "dd/MM/yyyy" (parses a date formatted as "25/12/2011")
+		// "dd-MMM-yy" (parses a date formatted as "25-Dec-11")
+		// "yyyy.MM.dd.HH.mm.ss" (parses a date formatted as "2011.12.25.08.36.33"
+		// "E, dd MMM yyyy HH:mm:ss Z" (parses a date formatted as "Tue, 25 Dec 2011
+		// 08:36:33 -0500")
 
-	public static CellProcessor[] getDiscontinuedGenesProcessors() {
+		// tax_id GeneID Discontinued_GeneID Discontinued_Symbol Discontinue_Date
+		// 9606 - 4 A12M1 20050508
+		// 9606 - 5 A12M2 20050510
+		// 9606 - 6 A12M3 20050510
 
-		//    	"dd/MM/yyyy" (parses a date formatted as "25/12/2011")
-		//    	"dd-MMM-yy" (parses a date formatted as "25-Dec-11")
-		//    	"yyyy.MM.dd.HH.mm.ss" (parses a date formatted as "2011.12.25.08.36.33"
-		//    	"E, dd MMM yyyy HH:mm:ss Z" (parses a date formatted as "Tue, 25 Dec 2011 08:36:33 -0500")
-
-		//		tax_id	GeneID	Discontinued_GeneID	Discontinued_Symbol	Discontinue_Date
-		//		9606	-	4	A12M1	20050508
-		//		9606	-	5	A12M2	20050510
-		//		9606	-	6	A12M3	20050510
-
-		final CellProcessor[] processors = new CellProcessor[] { 
-				new Optional(),  // 
-				new Optional(),  // 
-				new Optional(),  // 
-				new Optional(),  // 
+		final CellProcessor[] processors = new CellProcessor[] {
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
 				new Optional(new ParseDate("yyyyMMdd")), // dateTime
 		};
 
 		return processors;
 	}
 
-	//	@SuppressWarnings("unchecked")
-	//	@Override
-	//	public void fixDiscontinuedEntrezGeneIDs(String geneHistoryFile, String taxonomyId) throws IOException {
-	//
-	//		//get historyResults
-	//		//look up discontinued genes
-	//		// if multiple gene things are labeled with the same Gene ID
-	//		// mark the gene with the lowest transaction ID as the original owner
-	//		// set the old gene as preferred and non-ignored
-	//		// mark the other labels as ignored (we will only refer to this gene entity by the old Gene ID
-	//		// keep the discontinued gene id that was assigned to the new gene. (allows us to tie the genes together -- need to make changes in the preferred ID service)
-	//
-	//		// may want to remove all old labels and start fresh
-	//
-	//		LsTransaction lsTransaction = new LsTransaction();
-	//		lsTransaction.setRecordedDate(new Date());
-	//		lsTransaction.setComments("fixing gene ids");
-	//		lsTransaction.persist();
-	//
-	//		GeneHistoryDTO historyResults = processGeneHistory(geneHistoryFile, taxonomyId);
-	//		Set<String> updatedGeneKeys = historyResults.getUpdatedGenes().keySet();
-	//
-	//		Collection<String> allGeneIds = new HashSet<String>();
-	//		Collection<String> discontinuedGeneIds = new HashSet<String>();
-	//		Collection<String> activeGeneIds = new HashSet<String>();
-	//
-	//		for (String geneId : updatedGeneKeys){
-	//			List<EntrezDiscontinuedGeneDTO> updatedGeneList = (List<EntrezDiscontinuedGeneDTO>) historyResults.getUpdatedGenes().get(geneId);
-	//			for (EntrezDiscontinuedGeneDTO singleGene : updatedGeneList){
-	//				discontinuedGeneIds.add(singleGene.getDiscontinuedGeneId());
-	//				allGeneIds.add(singleGene.getDiscontinuedGeneId());
-	//				allGeneIds.add(singleGene.getGeneId());
-	//				activeGeneIds.add(singleGene.getGeneId());
-	//			}
-	//		}
-	//
-	//
-	//		for (String geneId : allGeneIds){
-	//			logger.info("gene ID: " + geneId);
-	//
-	//			List<LsThing> genes = LsThing.findLsThingByAllLabelText("gene", "entrez gene", "name", "Entrez Gene ID", geneId).getResultList();
-	//			Map<Long, LsThing> genesMap = new HashMap<Long, LsThing>();
-	//			logger.info("number of gene things found: " + genes.size());
-	//
-	//			if (genes.size() == 1) {
-	//				setPreferredName(genes.get(0).getId(), geneId, lsTransaction);
-	//				deleteDuplicateLabels(genes.get(0).getId());
-	//			}
-	//
-	//			if (genes.size() > 2) throw new RuntimeException("found multiple gene things >2: " + genes.size());
-	//
-	//			if (genes.size() > 1){
-	//				for (LsThing gene : genes){
-	//					genesMap.put(gene.getId(), gene);
-	//				}
-	//				//					List<LsThingLabel> preferredGeneNames = LsThingLabel.findLsThingAllPreferredName(gene.getId(), "name", "Entrez Gene ID").getResultList();
-	//				//					LsThingLabel preferredGeneName;
-	//				//					if (preferredGeneNames.size() == 1){
-	//				//						preferredGeneName = preferredGeneNames.get(0);
-	//				//						if (preferredGeneName.isIgnored()){
-	//				//							preferredGeneName.setIgnored(false);
-	//				//							preferredGeneName.merge();
-	//				//						}
-	//				//						if (discontinuedGeneIds.contains(preferredGeneName.getLabelText())){
-	//				//							if (!gene.isIgnored()){
-	//				//								logger.info(" @@@@@@@@@@@@@@@@@@@@@ ----- ignoring the gene: " + gene.getId());
-	//				//								gene.setIgnored(true);
-	//				//								gene.merge();							
-	//				//							}
-	//				//						}
-	//				//					} else if (preferredGeneNames.size() > 1) {
-	//				//						logger.error("found many preferredGeneNames: " + preferredGeneNames.size());
-	//				//					} else {
-	//				//						logger.info("Preferred gene name not found: " + gene.getId());
-	//				//					}
-	//				//				}
-	//
-	//				List<LsThingLabel> labels = new ArrayList<LsThingLabel>();
-	//				long lowestTransactionId = 0;
-	//				long lowestGeneThingId = 0;
-	//				long highestGeneThingId = 0;
-	//
-	//				LsThingLabel targetLabel = null;
-	//				for (LsThing queryGene : genes){
-	//					logger.debug("query Gene is: " + queryGene.getCodeName());
-	//					labels.addAll(LsThingLabel.findLsThingLabelsByLsThing(queryGene).getResultList());
-	//				}
-	//				boolean firstPass = true;
-	//				for (LsThingLabel label : labels){
-	//					if (label.getLsType().equalsIgnoreCase("name") 
-	//							&& label.getLsKind().equalsIgnoreCase("Entrez Gene ID")){
-	//						//							&& label.getLabelText().equalsIgnoreCase(geneId)) {
-	//
-	//						logger.debug("&&&&&&&&&&&&&  entrez gene label: "  + label.toJson());
-	//
-	//						if (firstPass){
-	//							lowestTransactionId = label.getLsTransaction();
-	//							lowestGeneThingId = label.getLsThing().getId();
-	//							targetLabel = label;
-	//							firstPass = false;
-	//						} else {
-	//							if (label.getLsTransaction() < lowestTransactionId){
-	//								lowestTransactionId = label.getLsTransaction();
-	//								if (label.getLsThing().getId() < lowestGeneThingId){
-	//									lowestGeneThingId = label.getLsThing().getId();
-	//									targetLabel = label;									
-	//								}
-	//							}
-	//						}
-	//					}
-	//				}
-	//				logger.info("the best label is: " + targetLabel.toJson());
-	//				logger.info("the lowestTransactionId: " + lowestTransactionId);
-	//				logger.info("the lowestGeneThingId: " + lowestGeneThingId);
-	//				genesMap.remove(lowestGeneThingId);
-	//
-	//				setPreferredName(lowestGeneThingId, geneId, lsTransaction);
-	//
-	//				//				Set<Long> geneIdKeys = genesMap.keySet();
-	//				//				for (Long geneIdKey : geneIdKeys){
-	//				//					logger.debug("the geneIdKey is : " + geneIdKey);
-	//				//					highestGeneThingId = geneIdKey.longValue();
-	//				//				}
-	//
-	//
-	//				for (Long otherGeneThingId : genesMap.keySet()){
-	//					logger.info("the other gene thing id is: " + otherGeneThingId);
-	//					highestGeneThingId = otherGeneThingId;					
-	//				}
-	//
-	//				curateOldGene(geneId, targetLabel, lowestGeneThingId, highestGeneThingId, activeGeneIds, lsTransaction);
-	//
-	//				if (discontinuedGeneIds.contains(geneId)){
-	//					logger.info("---------- removing discontinued gene labels for gene id: " + geneId);
-	//					removeOtherLabelsAndSetPreferredGeneId(targetLabel);
-	//					if (logger.isDebugEnabled()){
-	//						displayGeneLabels(targetLabel.getLsThing().getId());
-	//					}
-	//				} else {
-	//					deleteDuplicateLabels(lowestGeneThingId);
-	//					deleteDuplicateLabels(highestGeneThingId);
-	//					logger.info("----------- removing old gene labels for gene id: " + geneId);
-	//					removeOldGeneId(lowestGeneThingId, geneId);
-	//					if (logger.isDebugEnabled()){
-	//						logger.debug("----------- displaying lowest gene thing id: " + lowestGeneThingId + "    -----------------------");
-	//						displayGeneLabels(lowestGeneThingId);
-	//						logger.debug("----------- displaying highest gene thing id: " + highestGeneThingId + "    -----------------------");
-	//						displayGeneLabels(highestGeneThingId);
-	//					}
-	//				}
-	//
-	//				for (LsThing gene : genes){
-	//					List<LsThingLabel>preferredGeneNames = LsThingLabel.findLsThingPreferredName(gene.getId(), "name", "Entrez Gene ID").getResultList();
-	//					if (preferredGeneNames.size() == 1){
-	//						LsThingLabel preferredGeneName = preferredGeneNames.get(0);
-	//						if (discontinuedGeneIds.contains(preferredGeneName.getLabelText())){
-	//							if (!gene.isIgnored()){
-	//								logger.info(" @@@@@@@@@@@@@@@@@@@@@ ----- ignoring the gene: " + gene.getId());
-	//								gene.setIgnored(true);
-	//								gene.merge();							
-	//							}
-	//						} else if (activeGeneIds.contains(preferredGeneName.getLabelText())){
-	//							if (gene.isIgnored()){
-	//								logger.info(" @@@@@@@@@@@@@@@@@@@@@ ----- UN-ignoring the gene: " + gene.getId());
-	//								gene.setIgnored(false);
-	//								gene.merge();	
-	//							}
-	//						}
-	//					} else if (preferredGeneNames.size() > 1){
-	//						logger.error("!!!!!!!! ERROR: Found multiple preferred names");
-	//						for (LsThingLabel preferred : preferredGeneNames){
-	//							logger.error(preferred.toJson());
-	//						}
-	//					}
-	//
-	//				}				
-	//			}
-	//		}
-	//	}
-
-	//	@SuppressWarnings("unchecked")
-	//	private void curateOldGene(String geneId, LsThingLabel targetLabel, long lowestGeneThingId, long highestGeneThingId, Collection<String> activeGeneIds, LsTransaction lsTransaction) {
-	//
-	//		LsThing newGene = LsThing.findLsThing(lowestGeneThingId);
-	//		String newPreferredId = targetLabel.getLabelText();
-	//		List<LsThingLabel> newGeneLabels = LsThingLabel.findLsThingLabelsByLsThingAndLsTypeAndLsKind(newGene, "name", "Entrez Gene ID").getResultList();
-	//		Collection<String> newGeneEntrezIDs = new HashSet<String>();
-	//		for (LsThingLabel newGeneLabel : newGeneLabels){
-	//			newGeneEntrezIDs.add(newGeneLabel.getLabelText());
-	//		}
-	//
-	//		LsThing oldGene = LsThing.findLsThing(highestGeneThingId);
-	//		deleteDuplicateLabels(oldGene.getId());
-	//
-	//		List<LsThingLabel> oldGeneLabels = LsThingLabel.findLsThingLabelsByLsThingAndLsTypeAndLsKind(oldGene, "name", "Entrez Gene ID").getResultList();
-	//		String oldPreferredId = oldGeneLabels.get(0).getLabelText();
-	//		logger.info("The original id is: " + oldPreferredId);
-	//
-	//		//ignore old gene thing
-	//		if (!activeGeneIds.contains(oldPreferredId)){
-	//			logger.info("@@@@@@@@@@@@  IGNORED GENE THING @@@@@@@@@@   " + highestGeneThingId);
-	//			oldGene.setIgnored(true);
-	//			oldGene.merge();
-	//		}
-	//
-	//
-	//
-	//		//transfer the gene IDs to the other gene
-	//
-	//		for (LsThingLabel oldGeneLabel : oldGeneLabels){
-	//			logger.debug(oldGeneLabel.toJson());
-	//			if (oldGeneLabel.getLabelText().equalsIgnoreCase(oldPreferredId)){
-	//				logger.debug("old Gene preferred ID is: " + oldGeneLabel.getLabelText());
-	//				if (!newGeneEntrezIDs.contains(oldGeneLabel.getLabelText())){
-	//					logger.debug("----------- Adding gene label to new Gene: " + oldGeneLabel.getLabelText());
-	//					LsThingLabel newLabel = new LsThingLabel();
-	//					newLabel.setLsType("name");
-	//					newLabel.setLsKind("Entrez Gene ID");
-	//					newLabel.setLabelText(oldGeneLabel.getLabelText());
-	//					newLabel.setLsThing(newGene);
-	//					newLabel.setPreferred(false);
-	//					newLabel.setImageFile("Discontinued Entrez Gene ID");
-	//					newLabel.setRecordedBy("acas admin");
-	//					newLabel.setRecordedDate(new Date());
-	//					newLabel.setLsTransaction(lsTransaction.getId());
-	//					newLabel.persist();
-	//				}
-	//			} else if (oldGeneLabel.getLabelText().equalsIgnoreCase(newPreferredId)){
-	//				if (oldGeneLabel.isPreferred()){
-	//					oldGeneLabel.setPreferred(false);
-	//					oldGeneLabel.setIgnored(false);
-	//					oldGeneLabel.merge();
-	//				}
-	//			} else {
-	//				if (!newGeneEntrezIDs.contains(oldGeneLabel.getLabelText())){
-	//					logger.debug("----------- Adding gene label to new Gene: " + oldGeneLabel.getLabelText());
-	//					LsThingLabel newLabel = new LsThingLabel();
-	//					newLabel.setLsType("name");
-	//					newLabel.setLsKind("Entrez Gene ID");
-	//					newLabel.setLabelText(oldGeneLabel.getLabelText());
-	//					newLabel.setLsThing(newGene);
-	//					newLabel.setPreferred(false);
-	//					newLabel.setImageFile("Discontinued Entrez Gene ID");
-	//					newLabel.setRecordedBy("acas admin");
-	//					newLabel.setRecordedDate(new Date());
-	//					newLabel.setLsTransaction(lsTransaction.getId());
-	//					newLabel.persist();
-	//
-	//					oldGeneLabel.setIgnored(true);
-	//					oldGeneLabel.setDeleted(true);
-	//					oldGeneLabel.setPreferred(false);
-	//					oldGeneLabel.setImageFile("To be deleted - Entrez Gene ID");
-	//					oldGeneLabel.merge();
-	//				}
-	//			}
-	//
-	//		}
-	//
-	//	}
-
-
-	//	private void setPreferredName(long lowestGeneThingId, String geneId, LsTransaction lsTransaction) {
-	//		logger.debug("Setting the preferred entrez gene ID for gene thing id: " + lowestGeneThingId);
-	//		@SuppressWarnings("unchecked")
-	//		List<LsThingLabel> thingLabels = LsThingLabel.findLsThingLabelsByLsThingAndLsTypeAndLsKindAndLabelText(LsThing.findLsThing(lowestGeneThingId), "name", "Entrez Gene ID", geneId).getResultList();
-	//		LsThingLabel geneThingLabel = null;
-	//		if (thingLabels.size() == 0){
-	//			geneThingLabel = new LsThingLabel();
-	//			geneThingLabel.setLsType("name");
-	//			geneThingLabel.setLsKind("Entrez Gene ID");
-	//			geneThingLabel.setLabelText(geneId);
-	//			geneThingLabel.setLsThing(LsThing.findLsThing(lowestGeneThingId));
-	//			geneThingLabel.setRecordedBy("acas admin");
-	//			geneThingLabel.setRecordedDate(new Date());
-	//			geneThingLabel.setLsTransaction(lsTransaction.getId());
-	//			geneThingLabel.persist();			
-	//		} else if (thingLabels.size() == 1) {
-	//			geneThingLabel = thingLabels.get(0);
-	//			if (geneThingLabel.isIgnored() || !geneThingLabel.isPreferred()){
-	//				geneThingLabel.setIgnored(false);
-	//				geneThingLabel.setPreferred(true);
-	//				geneThingLabel.merge();
-	//			}
-	//		} else {
-	//			logger.debug("number of entrez gene ids to sort through: " + thingLabels.size());
-	//			List<LsThingLabel> otherThingLabels = LsThingLabel.findLsThingLabelsByLsThingAndLsTypeAndLsKind(LsThing.findLsThing(lowestGeneThingId), "name", "Entrez Gene ID").getResultList();
-	//
-	//			boolean firstPass = true;
-	//			for (LsThingLabel thingLabel : otherThingLabels){
-	//				if (firstPass && thingLabel.getLabelText().equalsIgnoreCase(geneId)){
-	//					if (thingLabel.isIgnored() || !thingLabel.isPreferred()){
-	//						if (!thingLabel.isDeleted()){
-	//							thingLabel.setIgnored(false);
-	//							thingLabel.setPreferred(true);
-	//							thingLabel.merge();							
-	//						}
-	//					}
-	//					firstPass = false;
-	//				} else {
-	//					if (thingLabel.getLabelText().equalsIgnoreCase(geneId)){
-	//						logger.debug("@@@@@@@ REMOVING Preferred GENE ID @@@@@@@  " + thingLabel.toJson() );
-	//						//thingLabel.remove();	
-	//						thingLabel.setIgnored(true);
-	//						thingLabel.setDeleted(true);
-	//						thingLabel.merge();
-	//					} else {
-	//						if (!thingLabel.isDeleted()){
-	//							thingLabel.setIgnored(false);
-	//							thingLabel.setPreferred(false);
-	//							thingLabel.merge();
-	//						}
-	//					}
-	//				}
-	//			}
-	//		}		
-	//	}
-
-	//	private void deleteDuplicateLabels(long geneThingId) {
-	//		Collection<LsThingLabel> labels = LsThingLabel.findLsThingLabelsByLsThing(LsThing.findLsThing(geneThingId)).getResultList();
-	//		Map<String, LsThingLabel> labelMap = new HashMap<String, LsThingLabel>();
-	//		String labelKey;
-	//		for (LsThingLabel label : labels){
-	//			labelKey = new StringBuilder().append(label.getLsType()).append("_").append(label.getLsKind()).append("_").append(label.getLabelText()).toString();
-	//			if (labelMap.containsKey(labelKey)){
-	//				if (label.getId() < labelMap.get(labelKey).getId()){
-	//					logger.debug("deleting duplicate label: "  + labelKey);
-	//					labelMap.get(labelKey).setIgnored(true);
-	//					labelMap.get(labelKey).setDeleted(true);
-	//					labelMap.get(labelKey).merge();
-	//					labelMap.put(labelKey, label);
-	//				} else {
-	//					logger.debug("deleting duplicate label: "  + label.toJson());
-	//					label.setIgnored(true);
-	//					label.setDeleted(true);
-	//					label.merge();
-	//				}
-	//			} else {
-	//				labelMap.put(labelKey, label);
-	//			}
-	//		}
-	//
-	//		LsThingLabel queryLabel;
-	//		for (String labelMapKey : labelMap.keySet()){
-	//			queryLabel = labelMap.get(labelMapKey);
-	//			if (queryLabel.isIgnored()){
-	//				queryLabel.setIgnored(false);
-	//				queryLabel.merge();
-	//			}		
-	//		}
-	//	}
-
-
-
-	//	private void removeOldGeneId(long geneThingId, String geneId) {
-	//
-	//		//		String oldGeneId = null;
-	//		//		Collection<LsThingLabel> oldGeneLabels = LsThingLabel.findLsThingLabelsByLsThing(LsThing.findLsThing(highestGeneThingId)).getResultList();
-	//		//		for (LsThingLabel label : oldGeneLabels){
-	//		//			if (label.getLsType().equalsIgnoreCase("name")
-	//		//					&& label.getLsKind().equalsIgnoreCase("Entrez Gene ID")) {
-	//		//				if (label.getLabelText().equalsIgnoreCase(geneId)){
-	//		//					label.setPreferred(false);
-	//		//					label.setIgnored(false);
-	//		//					label.merge();
-	//		//					logger.debug("### ignoring the gene label: " + label.toJson());
-	//		//
-	//		//				} else {
-	//		//					logger.info("%%%%%%%  old gene label  %%%%%%%%%%%%%%%%");
-	//		//					logger.info(label.toJson());
-	//		//					oldGeneId = label.getLabelText();					
-	//		//				}
-	//		//
-	//		//			}
-	//		//		}
-	//
-	//		Collection<LsThingLabel> newGeneLabels = LsThingLabel.findLsThingLabelsByLsThing(LsThing.findLsThing(geneThingId)).getResultList();
-	//		for (LsThingLabel label : newGeneLabels){
-	//			if (label.getLsType().equalsIgnoreCase("name")
-	//					&& label.getLsKind().equalsIgnoreCase("Entrez Gene ID")){
-	//				if (label.getLabelText().equalsIgnoreCase(geneId)){
-	//					label.setPreferred(true);
-	//					label.setIgnored(false);
-	//					label.merge();
-	//				} else {
-	//					label.setPreferred(false);
-	//					label.setIgnored(false);
-	//					label.setImageFile("Discontinued Entrez Gene ID");
-	//					label.merge();
-	//				}
-	//			}
-	//
-	//			//					&& label.getLabelText().equalsIgnoreCase(geneId)) {
-	//			//				label.setPreferred(true);
-	//			//				label.setIgnored(false);
-	//			//				label.merge();
-	//			//			} else if (label.getLsType().equalsIgnoreCase("name")
-	//			//					&& label.getLsKind().equalsIgnoreCase("Entrez Gene ID")
-	//			//					&& label.getLabelText().equalsIgnoreCase(oldGeneId)) {
-	//			//				label.setPreferred(false);
-	//			//				label.setIgnored(false);
-	//			//				label.setImageFile("Discontinued Entrez Gene ID");
-	//			//				label.merge();
-	//			//			} 
-	//		}
-	//	}
-	//
-	//	private void removeOtherLabelsAndSetPreferredGeneId(LsThingLabel targetLabel) {
-	//		logger.debug("#########  target label: " + targetLabel.toJson());
-	//		LsThing gene = LsThing.findLsThing(targetLabel.getLsThing().getId());
-	//		Collection<LsThingLabel> labels = LsThingLabel.findLsThingLabelsByLsThing(gene).getResultList();
-	//		for (LsThingLabel label : labels){
-	//			logger.debug("current label ID: " + label.getId() + "    label: " + label.getLabelText());
-	//			if (label.getId().longValue() == targetLabel.getId().longValue()) {
-	//				logger.debug("####### found mathching target label  " + targetLabel.getId());
-	//				label.setPreferred(true);
-	//				label.setIgnored(false);
-	//				label.merge();
-	//			} else if (label.getLsType().equalsIgnoreCase("name") && label.getLsKind().equalsIgnoreCase("Entrez Gene ID") 
-	//					&& !label.getLabelText().equalsIgnoreCase(targetLabel.getLabelText().toString())) {
-	//				logger.debug("### found another entrez gene id: " + label.toJson());
-	//				label.setPreferred(false);
-	//				label.setIgnored(false);
-	//				label.setImageFile("other Entrez Gene ID");
-	//				label.merge();
-	//				logger.debug("### updated entrez gene id: " + label.toJson());
-	//
-	//			} else {
-	//				logger.debug("### ignoring the gene label: " + label.toJson());
-	//				label.setPreferred(false);
-	//				label.setIgnored(true);		
-	//				label.merge();
-	//			}
-	//		}
-	//
-	//	}
-
-	//	public LsThing registerUpdatedGene(EntrezDbGeneDTO geneDTO,
-	//			EntrezDiscontinuedGeneDTO entrezDiscontinuedGeneDTO,
-	//			LsTransaction lsTransaction) {
-	//		// TODO Auto-generated method stub
-	//		logger.info("SHOULD NOT HIT THIS ################################################################################## !!!!!!!!!!!!!!!!");
-	//		return null;
-	//	}
-	//
-	//	public LsThing registerUpdatedGene(EntrezDbGeneDTO geneDTO,
-	//			EntrezDiscontinuedGeneDTO entrezDiscontinuedGeneDTO,
-	//			MultiValueMap discontinuedGenesList, LsTransaction lsTransaction) {
-	//		// TODO Auto-generated method stub
-	//		logger.info("SHOULD NOT HIT THIS ################################################################################## !!!!!!!!!!!!!!!!");
-	//		return null;
-	//	}
+	// @SuppressWarnings("unchecked")
+	// @Override
+	// public void fixDiscontinuedEntrezGeneIDs(String geneHistoryFile, String
+	// taxonomyId) throws IOException {
+	//
+	// //get historyResults
+	// //look up discontinued genes
+	// // if multiple gene things are labeled with the same Gene ID
+	// // mark the gene with the lowest transaction ID as the original owner
+	// // set the old gene as preferred and non-ignored
+	// // mark the other labels as ignored (we will only refer to this gene entity
+	// by the old Gene ID
+	// // keep the discontinued gene id that was assigned to the new gene. (allows
+	// us to tie the genes together -- need to make changes in the preferred ID
+	// service)
+	//
+	// // may want to remove all old labels and start fresh
+	//
+	// LsTransaction lsTransaction = new LsTransaction();
+	// lsTransaction.setRecordedDate(new Date());
+	// lsTransaction.setComments("fixing gene ids");
+	// lsTransaction.persist();
+	//
+	// GeneHistoryDTO historyResults = processGeneHistory(geneHistoryFile,
+	// taxonomyId);
+	// Set<String> updatedGeneKeys = historyResults.getUpdatedGenes().keySet();
+	//
+	// Collection<String> allGeneIds = new HashSet<String>();
+	// Collection<String> discontinuedGeneIds = new HashSet<String>();
+	// Collection<String> activeGeneIds = new HashSet<String>();
+	//
+	// for (String geneId : updatedGeneKeys){
+	// List<EntrezDiscontinuedGeneDTO> updatedGeneList =
+	// (List<EntrezDiscontinuedGeneDTO>)
+	// historyResults.getUpdatedGenes().get(geneId);
+	// for (EntrezDiscontinuedGeneDTO singleGene : updatedGeneList){
+	// discontinuedGeneIds.add(singleGene.getDiscontinuedGeneId());
+	// allGeneIds.add(singleGene.getDiscontinuedGeneId());
+	// allGeneIds.add(singleGene.getGeneId());
+	// activeGeneIds.add(singleGene.getGeneId());
+	// }
+	// }
+	//
+	//
+	// for (String geneId : allGeneIds){
+	// logger.info("gene ID: " + geneId);
+	//
+	// List<LsThing> genes = LsThing.findLsThingByAllLabelText("gene", "entrez
+	// gene", "name", "Entrez Gene ID", geneId).getResultList();
+	// Map<Long, LsThing> genesMap = new HashMap<Long, LsThing>();
+	// logger.info("number of gene things found: " + genes.size());
+	//
+	// if (genes.size() == 1) {
+	// setPreferredName(genes.get(0).getId(), geneId, lsTransaction);
+	// deleteDuplicateLabels(genes.get(0).getId());
+	// }
+	//
+	// if (genes.size() > 2) throw new RuntimeException("found multiple gene things
+	// >2: " + genes.size());
+	//
+	// if (genes.size() > 1){
+	// for (LsThing gene : genes){
+	// genesMap.put(gene.getId(), gene);
+	// }
+	// // List<LsThingLabel> preferredGeneNames =
+	// LsThingLabel.findLsThingAllPreferredName(gene.getId(), "name", "Entrez Gene
+	// ID").getResultList();
+	// // LsThingLabel preferredGeneName;
+	// // if (preferredGeneNames.size() == 1){
+	// // preferredGeneName = preferredGeneNames.get(0);
+	// // if (preferredGeneName.isIgnored()){
+	// // preferredGeneName.setIgnored(false);
+	// // preferredGeneName.merge();
+	// // }
+	// // if (discontinuedGeneIds.contains(preferredGeneName.getLabelText())){
+	// // if (!gene.isIgnored()){
+	// // logger.info(" @@@@@@@@@@@@@@@@@@@@@ ----- ignoring the gene: " +
+	// gene.getId());
+	// // gene.setIgnored(true);
+	// // gene.merge();
+	// // }
+	// // }
+	// // } else if (preferredGeneNames.size() > 1) {
+	// // logger.error("found many preferredGeneNames: " +
+	// preferredGeneNames.size());
+	// // } else {
+	// // logger.info("Preferred gene name not found: " + gene.getId());
+	// // }
+	// // }
+	//
+	// List<LsThingLabel> labels = new ArrayList<LsThingLabel>();
+	// long lowestTransactionId = 0;
+	// long lowestGeneThingId = 0;
+	// long highestGeneThingId = 0;
+	//
+	// LsThingLabel targetLabel = null;
+	// for (LsThing queryGene : genes){
+	// logger.debug("query Gene is: " + queryGene.getCodeName());
+	// labels.addAll(LsThingLabel.findLsThingLabelsByLsThing(queryGene).getResultList());
+	// }
+	// boolean firstPass = true;
+	// for (LsThingLabel label : labels){
+	// if (label.getLsType().equalsIgnoreCase("name")
+	// && label.getLsKind().equalsIgnoreCase("Entrez Gene ID")){
+	// // && label.getLabelText().equalsIgnoreCase(geneId)) {
+	//
+	// logger.debug("&&&&&&&&&&&&& entrez gene label: " + label.toJson());
+	//
+	// if (firstPass){
+	// lowestTransactionId = label.getLsTransaction();
+	// lowestGeneThingId = label.getLsThing().getId();
+	// targetLabel = label;
+	// firstPass = false;
+	// } else {
+	// if (label.getLsTransaction() < lowestTransactionId){
+	// lowestTransactionId = label.getLsTransaction();
+	// if (label.getLsThing().getId() < lowestGeneThingId){
+	// lowestGeneThingId = label.getLsThing().getId();
+	// targetLabel = label;
+	// }
+	// }
+	// }
+	// }
+	// }
+	// logger.info("the best label is: " + targetLabel.toJson());
+	// logger.info("the lowestTransactionId: " + lowestTransactionId);
+	// logger.info("the lowestGeneThingId: " + lowestGeneThingId);
+	// genesMap.remove(lowestGeneThingId);
+	//
+	// setPreferredName(lowestGeneThingId, geneId, lsTransaction);
+	//
+	// // Set<Long> geneIdKeys = genesMap.keySet();
+	// // for (Long geneIdKey : geneIdKeys){
+	// // logger.debug("the geneIdKey is : " + geneIdKey);
+	// // highestGeneThingId = geneIdKey.longValue();
+	// // }
+	//
+	//
+	// for (Long otherGeneThingId : genesMap.keySet()){
+	// logger.info("the other gene thing id is: " + otherGeneThingId);
+	// highestGeneThingId = otherGeneThingId;
+	// }
+	//
+	// curateOldGene(geneId, targetLabel, lowestGeneThingId, highestGeneThingId,
+	// activeGeneIds, lsTransaction);
+	//
+	// if (discontinuedGeneIds.contains(geneId)){
+	// logger.info("---------- removing discontinued gene labels for gene id: " +
+	// geneId);
+	// removeOtherLabelsAndSetPreferredGeneId(targetLabel);
+	// if (logger.isDebugEnabled()){
+	// displayGeneLabels(targetLabel.getLsThing().getId());
+	// }
+	// } else {
+	// deleteDuplicateLabels(lowestGeneThingId);
+	// deleteDuplicateLabels(highestGeneThingId);
+	// logger.info("----------- removing old gene labels for gene id: " + geneId);
+	// removeOldGeneId(lowestGeneThingId, geneId);
+	// if (logger.isDebugEnabled()){
+	// logger.debug("----------- displaying lowest gene thing id: " +
+	// lowestGeneThingId + " -----------------------");
+	// displayGeneLabels(lowestGeneThingId);
+	// logger.debug("----------- displaying highest gene thing id: " +
+	// highestGeneThingId + " -----------------------");
+	// displayGeneLabels(highestGeneThingId);
+	// }
+	// }
+	//
+	// for (LsThing gene : genes){
+	// List<LsThingLabel>preferredGeneNames =
+	// LsThingLabel.findLsThingPreferredName(gene.getId(), "name", "Entrez Gene
+	// ID").getResultList();
+	// if (preferredGeneNames.size() == 1){
+	// LsThingLabel preferredGeneName = preferredGeneNames.get(0);
+	// if (discontinuedGeneIds.contains(preferredGeneName.getLabelText())){
+	// if (!gene.isIgnored()){
+	// logger.info(" @@@@@@@@@@@@@@@@@@@@@ ----- ignoring the gene: " +
+	// gene.getId());
+	// gene.setIgnored(true);
+	// gene.merge();
+	// }
+	// } else if (activeGeneIds.contains(preferredGeneName.getLabelText())){
+	// if (gene.isIgnored()){
+	// logger.info(" @@@@@@@@@@@@@@@@@@@@@ ----- UN-ignoring the gene: " +
+	// gene.getId());
+	// gene.setIgnored(false);
+	// gene.merge();
+	// }
+	// }
+	// } else if (preferredGeneNames.size() > 1){
+	// logger.error("!!!!!!!! ERROR: Found multiple preferred names");
+	// for (LsThingLabel preferred : preferredGeneNames){
+	// logger.error(preferred.toJson());
+	// }
+	// }
+	//
+	// }
+	// }
+	// }
+	// }
+
+	// @SuppressWarnings("unchecked")
+	// private void curateOldGene(String geneId, LsThingLabel targetLabel, long
+	// lowestGeneThingId, long highestGeneThingId, Collection<String> activeGeneIds,
+	// LsTransaction lsTransaction) {
+	//
+	// LsThing newGene = LsThing.findLsThing(lowestGeneThingId);
+	// String newPreferredId = targetLabel.getLabelText();
+	// List<LsThingLabel> newGeneLabels =
+	// LsThingLabel.findLsThingLabelsByLsThingAndLsTypeAndLsKind(newGene, "name",
+	// "Entrez Gene ID").getResultList();
+	// Collection<String> newGeneEntrezIDs = new HashSet<String>();
+	// for (LsThingLabel newGeneLabel : newGeneLabels){
+	// newGeneEntrezIDs.add(newGeneLabel.getLabelText());
+	// }
+	//
+	// LsThing oldGene = LsThing.findLsThing(highestGeneThingId);
+	// deleteDuplicateLabels(oldGene.getId());
+	//
+	// List<LsThingLabel> oldGeneLabels =
+	// LsThingLabel.findLsThingLabelsByLsThingAndLsTypeAndLsKind(oldGene, "name",
+	// "Entrez Gene ID").getResultList();
+	// String oldPreferredId = oldGeneLabels.get(0).getLabelText();
+	// logger.info("The original id is: " + oldPreferredId);
+	//
+	// //ignore old gene thing
+	// if (!activeGeneIds.contains(oldPreferredId)){
+	// logger.info("@@@@@@@@@@@@ IGNORED GENE THING @@@@@@@@@@ " +
+	// highestGeneThingId);
+	// oldGene.setIgnored(true);
+	// oldGene.merge();
+	// }
+	//
+	//
+	//
+	// //transfer the gene IDs to the other gene
+	//
+	// for (LsThingLabel oldGeneLabel : oldGeneLabels){
+	// logger.debug(oldGeneLabel.toJson());
+	// if (oldGeneLabel.getLabelText().equalsIgnoreCase(oldPreferredId)){
+	// logger.debug("old Gene preferred ID is: " + oldGeneLabel.getLabelText());
+	// if (!newGeneEntrezIDs.contains(oldGeneLabel.getLabelText())){
+	// logger.debug("----------- Adding gene label to new Gene: " +
+	// oldGeneLabel.getLabelText());
+	// LsThingLabel newLabel = new LsThingLabel();
+	// newLabel.setLsType("name");
+	// newLabel.setLsKind("Entrez Gene ID");
+	// newLabel.setLabelText(oldGeneLabel.getLabelText());
+	// newLabel.setLsThing(newGene);
+	// newLabel.setPreferred(false);
+	// newLabel.setImageFile("Discontinued Entrez Gene ID");
+	// newLabel.setRecordedBy("acas admin");
+	// newLabel.setRecordedDate(new Date());
+	// newLabel.setLsTransaction(lsTransaction.getId());
+	// newLabel.persist();
+	// }
+	// } else if (oldGeneLabel.getLabelText().equalsIgnoreCase(newPreferredId)){
+	// if (oldGeneLabel.isPreferred()){
+	// oldGeneLabel.setPreferred(false);
+	// oldGeneLabel.setIgnored(false);
+	// oldGeneLabel.merge();
+	// }
+	// } else {
+	// if (!newGeneEntrezIDs.contains(oldGeneLabel.getLabelText())){
+	// logger.debug("----------- Adding gene label to new Gene: " +
+	// oldGeneLabel.getLabelText());
+	// LsThingLabel newLabel = new LsThingLabel();
+	// newLabel.setLsType("name");
+	// newLabel.setLsKind("Entrez Gene ID");
+	// newLabel.setLabelText(oldGeneLabel.getLabelText());
+	// newLabel.setLsThing(newGene);
+	// newLabel.setPreferred(false);
+	// newLabel.setImageFile("Discontinued Entrez Gene ID");
+	// newLabel.setRecordedBy("acas admin");
+	// newLabel.setRecordedDate(new Date());
+	// newLabel.setLsTransaction(lsTransaction.getId());
+	// newLabel.persist();
+	//
+	// oldGeneLabel.setIgnored(true);
+	// oldGeneLabel.setDeleted(true);
+	// oldGeneLabel.setPreferred(false);
+	// oldGeneLabel.setImageFile("To be deleted - Entrez Gene ID");
+	// oldGeneLabel.merge();
+	// }
+	// }
+	//
+	// }
+	//
+	// }
+
+	// private void setPreferredName(long lowestGeneThingId, String geneId,
+	// LsTransaction lsTransaction) {
+	// logger.debug("Setting the preferred entrez gene ID for gene thing id: " +
+	// lowestGeneThingId);
+	// @SuppressWarnings("unchecked")
+	// List<LsThingLabel> thingLabels =
+	// LsThingLabel.findLsThingLabelsByLsThingAndLsTypeAndLsKindAndLabelText(LsThing.findLsThing(lowestGeneThingId),
+	// "name", "Entrez Gene ID", geneId).getResultList();
+	// LsThingLabel geneThingLabel = null;
+	// if (thingLabels.size() == 0){
+	// geneThingLabel = new LsThingLabel();
+	// geneThingLabel.setLsType("name");
+	// geneThingLabel.setLsKind("Entrez Gene ID");
+	// geneThingLabel.setLabelText(geneId);
+	// geneThingLabel.setLsThing(LsThing.findLsThing(lowestGeneThingId));
+	// geneThingLabel.setRecordedBy("acas admin");
+	// geneThingLabel.setRecordedDate(new Date());
+	// geneThingLabel.setLsTransaction(lsTransaction.getId());
+	// geneThingLabel.persist();
+	// } else if (thingLabels.size() == 1) {
+	// geneThingLabel = thingLabels.get(0);
+	// if (geneThingLabel.isIgnored() || !geneThingLabel.isPreferred()){
+	// geneThingLabel.setIgnored(false);
+	// geneThingLabel.setPreferred(true);
+	// geneThingLabel.merge();
+	// }
+	// } else {
+	// logger.debug("number of entrez gene ids to sort through: " +
+	// thingLabels.size());
+	// List<LsThingLabel> otherThingLabels =
+	// LsThingLabel.findLsThingLabelsByLsThingAndLsTypeAndLsKind(LsThing.findLsThing(lowestGeneThingId),
+	// "name", "Entrez Gene ID").getResultList();
+	//
+	// boolean firstPass = true;
+	// for (LsThingLabel thingLabel : otherThingLabels){
+	// if (firstPass && thingLabel.getLabelText().equalsIgnoreCase(geneId)){
+	// if (thingLabel.isIgnored() || !thingLabel.isPreferred()){
+	// if (!thingLabel.isDeleted()){
+	// thingLabel.setIgnored(false);
+	// thingLabel.setPreferred(true);
+	// thingLabel.merge();
+	// }
+	// }
+	// firstPass = false;
+	// } else {
+	// if (thingLabel.getLabelText().equalsIgnoreCase(geneId)){
+	// logger.debug("@@@@@@@ REMOVING Preferred GENE ID @@@@@@@ " +
+	// thingLabel.toJson() );
+	// //thingLabel.remove();
+	// thingLabel.setIgnored(true);
+	// thingLabel.setDeleted(true);
+	// thingLabel.merge();
+	// } else {
+	// if (!thingLabel.isDeleted()){
+	// thingLabel.setIgnored(false);
+	// thingLabel.setPreferred(false);
+	// thingLabel.merge();
+	// }
+	// }
+	// }
+	// }
+	// }
+	// }
+
+	// private void deleteDuplicateLabels(long geneThingId) {
+	// Collection<LsThingLabel> labels =
+	// LsThingLabel.findLsThingLabelsByLsThing(LsThing.findLsThing(geneThingId)).getResultList();
+	// Map<String, LsThingLabel> labelMap = new HashMap<String, LsThingLabel>();
+	// String labelKey;
+	// for (LsThingLabel label : labels){
+	// labelKey = new
+	// StringBuilder().append(label.getLsType()).append("_").append(label.getLsKind()).append("_").append(label.getLabelText()).toString();
+	// if (labelMap.containsKey(labelKey)){
+	// if (label.getId() < labelMap.get(labelKey).getId()){
+	// logger.debug("deleting duplicate label: " + labelKey);
+	// labelMap.get(labelKey).setIgnored(true);
+	// labelMap.get(labelKey).setDeleted(true);
+	// labelMap.get(labelKey).merge();
+	// labelMap.put(labelKey, label);
+	// } else {
+	// logger.debug("deleting duplicate label: " + label.toJson());
+	// label.setIgnored(true);
+	// label.setDeleted(true);
+	// label.merge();
+	// }
+	// } else {
+	// labelMap.put(labelKey, label);
+	// }
+	// }
+	//
+	// LsThingLabel queryLabel;
+	// for (String labelMapKey : labelMap.keySet()){
+	// queryLabel = labelMap.get(labelMapKey);
+	// if (queryLabel.isIgnored()){
+	// queryLabel.setIgnored(false);
+	// queryLabel.merge();
+	// }
+	// }
+	// }
+
+	// private void removeOldGeneId(long geneThingId, String geneId) {
+	//
+	// // String oldGeneId = null;
+	// // Collection<LsThingLabel> oldGeneLabels =
+	// LsThingLabel.findLsThingLabelsByLsThing(LsThing.findLsThing(highestGeneThingId)).getResultList();
+	// // for (LsThingLabel label : oldGeneLabels){
+	// // if (label.getLsType().equalsIgnoreCase("name")
+	// // && label.getLsKind().equalsIgnoreCase("Entrez Gene ID")) {
+	// // if (label.getLabelText().equalsIgnoreCase(geneId)){
+	// // label.setPreferred(false);
+	// // label.setIgnored(false);
+	// // label.merge();
+	// // logger.debug("### ignoring the gene label: " + label.toJson());
+	// //
+	// // } else {
+	// // logger.info("%%%%%%% old gene label %%%%%%%%%%%%%%%%");
+	// // logger.info(label.toJson());
+	// // oldGeneId = label.getLabelText();
+	// // }
+	// //
+	// // }
+	// // }
+	//
+	// Collection<LsThingLabel> newGeneLabels =
+	// LsThingLabel.findLsThingLabelsByLsThing(LsThing.findLsThing(geneThingId)).getResultList();
+	// for (LsThingLabel label : newGeneLabels){
+	// if (label.getLsType().equalsIgnoreCase("name")
+	// && label.getLsKind().equalsIgnoreCase("Entrez Gene ID")){
+	// if (label.getLabelText().equalsIgnoreCase(geneId)){
+	// label.setPreferred(true);
+	// label.setIgnored(false);
+	// label.merge();
+	// } else {
+	// label.setPreferred(false);
+	// label.setIgnored(false);
+	// label.setImageFile("Discontinued Entrez Gene ID");
+	// label.merge();
+	// }
+	// }
+	//
+	// // && label.getLabelText().equalsIgnoreCase(geneId)) {
+	// // label.setPreferred(true);
+	// // label.setIgnored(false);
+	// // label.merge();
+	// // } else if (label.getLsType().equalsIgnoreCase("name")
+	// // && label.getLsKind().equalsIgnoreCase("Entrez Gene ID")
+	// // && label.getLabelText().equalsIgnoreCase(oldGeneId)) {
+	// // label.setPreferred(false);
+	// // label.setIgnored(false);
+	// // label.setImageFile("Discontinued Entrez Gene ID");
+	// // label.merge();
+	// // }
+	// }
+	// }
+	//
+	// private void removeOtherLabelsAndSetPreferredGeneId(LsThingLabel targetLabel)
+	// {
+	// logger.debug("######### target label: " + targetLabel.toJson());
+	// LsThing gene = LsThing.findLsThing(targetLabel.getLsThing().getId());
+	// Collection<LsThingLabel> labels =
+	// LsThingLabel.findLsThingLabelsByLsThing(gene).getResultList();
+	// for (LsThingLabel label : labels){
+	// logger.debug("current label ID: " + label.getId() + " label: " +
+	// label.getLabelText());
+	// if (label.getId().longValue() == targetLabel.getId().longValue()) {
+	// logger.debug("####### found mathching target label " + targetLabel.getId());
+	// label.setPreferred(true);
+	// label.setIgnored(false);
+	// label.merge();
+	// } else if (label.getLsType().equalsIgnoreCase("name") &&
+	// label.getLsKind().equalsIgnoreCase("Entrez Gene ID")
+	// &&
+	// !label.getLabelText().equalsIgnoreCase(targetLabel.getLabelText().toString()))
+	// {
+	// logger.debug("### found another entrez gene id: " + label.toJson());
+	// label.setPreferred(false);
+	// label.setIgnored(false);
+	// label.setImageFile("other Entrez Gene ID");
+	// label.merge();
+	// logger.debug("### updated entrez gene id: " + label.toJson());
+	//
+	// } else {
+	// logger.debug("### ignoring the gene label: " + label.toJson());
+	// label.setPreferred(false);
+	// label.setIgnored(true);
+	// label.merge();
+	// }
+	// }
+	//
+	// }
+
+	// public LsThing registerUpdatedGene(EntrezDbGeneDTO geneDTO,
+	// EntrezDiscontinuedGeneDTO entrezDiscontinuedGeneDTO,
+	// LsTransaction lsTransaction) {
+	// // TODO Auto-generated method stub
+	// logger.info("SHOULD NOT HIT THIS
+	// ##################################################################################
+	// !!!!!!!!!!!!!!!!");
+	// return null;
+	// }
+	//
+	// public LsThing registerUpdatedGene(EntrezDbGeneDTO geneDTO,
+	// EntrezDiscontinuedGeneDTO entrezDiscontinuedGeneDTO,
+	// MultiValueMap discontinuedGenesList, LsTransaction lsTransaction) {
+	// // TODO Auto-generated method stub
+	// logger.info("SHOULD NOT HIT THIS
+	// ##################################################################################
+	// !!!!!!!!!!!!!!!!");
+	// return null;
+	// }
 
 	private void displayGeneLabels(long geneThingId) {
-		Collection<LsThingLabel> labels = LsThingLabel.findLsThingLabelsByLsThing(LsThing.findLsThing(geneThingId)).getResultList();
+		Collection<LsThingLabel> labels = LsThingLabel.findLsThingLabelsByLsThing(LsThing.findLsThing(geneThingId))
+				.getResultList();
 		logger.info("##################################################   " + geneThingId);
-		for (LsThingLabel label : labels){
+		for (LsThingLabel label : labels) {
 			logger.info(label.toJson());
 		}
 		logger.info("##################################################");
@@ -2583,7 +2884,8 @@ private void displayGeneLabels(long geneThingId) {
 
 	@Override
 	@Transactional
-	public LsThing saveOrthologEntity(String versionName, String testFileName, String orthologType, Long curationLevel, String description, String curator, String recordedBy) {
+	public LsThing saveOrthologEntity(String versionName, String testFileName, String orthologType, Long curationLevel,
+			String description, String curator, String recordedBy) {
 
 		setGeneOrthologDefaults();
 
@@ -2592,7 +2894,8 @@ public LsThing saveOrthologEntity(String versionName, String testFileName, Strin
 		lsTransaction.setRecordedDate(new Date());
 		lsTransaction.persist();
 
-		if (recordedBy.isEmpty() || recordedBy.equalsIgnoreCase("")) recordedBy = "acas-admin";
+		if (recordedBy.isEmpty() || recordedBy.equalsIgnoreCase(""))
+			recordedBy = "acas-admin";
 
 		LsThing orthologThing = new LsThing();
 		orthologThing.setLsType("ortholog");
@@ -2674,28 +2977,31 @@ public LsThing saveOrthologEntity(String versionName, String testFileName, Strin
 		thingState.setLsValues(thingValues);
 		Set<LsThingState> thingStates = new HashSet<LsThingState>();
 		thingStates.add(thingState);
-		orthologThing.setLsStates(thingStates);;
+		orthologThing.setLsStates(thingStates);
+		;
 
 		return orthologThing;
 
 	}
 
 	@Override
-	public void registerGeneOrthologsFromCSV(String inputFile, String ortCodeName, String recordedBy, Long lsTransactionId) throws IOException{
+	public void registerGeneOrthologsFromCSV(String inputFile, String ortCodeName, String recordedBy,
+			Long lsTransactionId) throws IOException {
 
 		setGeneOrthologDefaults();
 
-		if (recordedBy.isEmpty() || recordedBy.equalsIgnoreCase("")) recordedBy = "acas-admin";
+		if (recordedBy.isEmpty() || recordedBy.equalsIgnoreCase(""))
+			recordedBy = "acas-admin";
 
 		BufferedReader br = new BufferedReader(new FileReader(inputFile));
-		logger.info("read tab delimited file " + inputFile );
+		logger.info("read tab delimited file " + inputFile);
 
 		// map header text to standard bean names
 		HashMap<String, String> geneOrthologBeanMap = new HashMap<String, String>();
 		geneOrthologBeanMap.put("RowId", "rowIndex");
 		geneOrthologBeanMap.put("InputGeneId", "geneId");
 		geneOrthologBeanMap.put("InputSymbol", "symbol");
-		geneOrthologBeanMap.put("InputTaxId", "taxId");  // from Species
+		geneOrthologBeanMap.put("InputTaxId", "taxId"); // from Species
 		geneOrthologBeanMap.put("InputGeneType", "typeOfGene");
 		geneOrthologBeanMap.put("MappedGeneId", "mappedGeneId");
 		geneOrthologBeanMap.put("MappedSymbol", "mappedSymbol");
@@ -2716,20 +3022,19 @@ public void registerGeneOrthologsFromCSV(String inputFile, String ortCodeName, S
 
 		List<String> headerList = new ArrayList<String>();
 		int position = 0;
-		for (String header : headers){
+		for (String header : headers) {
 			logger.info("header column: " + position + "  " + header);
-			if (geneOrthologBeanMap.get(header) != null){
-				headerList.add(geneOrthologBeanMap.get(header));   				
+			if (geneOrthologBeanMap.get(header) != null) {
+				headerList.add(geneOrthologBeanMap.get(header));
 			}
 			position++;
 		}
 
-
 		logger.debug("size of header list  " + headerList.size());
 		String[] headerArray = new String[headerList.size()];
 		headerList.toArray(headerArray);
 
-		for (String headerInd : headerArray){
+		for (String headerInd : headerArray) {
 			logger.warn("header column array : " + position + "  " + headerInd);
 			position++;
 		}
@@ -2739,12 +3044,12 @@ public void registerGeneOrthologsFromCSV(String inputFile, String ortCodeName, S
 		GeneOrthologDTO geneOrthologDTO;
 
 		int numberOfLines = SimpleUtil.countLines(inputFile);
-		Long numberOfLabels = new Long(numberOfLines-1);
+		Long numberOfLabels = new Long(numberOfLines - 1);
 
 		logger.info("number of lines found: " + numberOfLines);
 
 		LsTransaction lsTransaction;
-		if (lsTransactionId == null){			
+		if (lsTransactionId == null) {
 			lsTransaction = new LsTransaction();
 			lsTransaction.setComments("saving gene ortholog info");
 			lsTransaction.setRecordedDate(new Date());
@@ -2757,14 +3062,17 @@ public void registerGeneOrthologsFromCSV(String inputFile, String ortCodeName, S
 		int i = 0;
 		int batchSize = 25;
 		LsThing geneThing = null;
-		while( (geneOrthologDTO = beanReader.read(GeneOrthologDTO.class, headerArray, processors)) != null ) {
-			//System.out.println(String.format("lineNo=%s, rowNo=%sd() + "  mapped Gene " + geneOrthologDTO.getMappedGeneId, bulkData=%s", beanReader.getLineNumber(), beanReader.getRowNumber(), geneOrthologDTO));
+		while ((geneOrthologDTO = beanReader.read(GeneOrthologDTO.class, headerArray, processors)) != null) {
+			// System.out.println(String.format("lineNo=%s, rowNo=%sd() + " mapped Gene " +
+			// geneOrthologDTO.getMappedGeneId, bulkData=%s", beanReader.getLineNumber(),
+			// beanReader.getRowNumber(), geneOrthologDTO));
 			logger.info("current gene: " + geneOrthologDTO.getGeneId());
 
 			LsThing targetGene = null;
 			try {
-				targetGene = LsThing.findLsThingByLabelText("gene", "entrez gene", "name", "Entrez Gene ID", geneOrthologDTO.getGeneId()).getSingleResult();
-				logger.info("target gene: " + targetGene.getCodeName());				
+				targetGene = LsThing.findLsThingByLabelText("gene", "entrez gene", "name", "Entrez Gene ID",
+						geneOrthologDTO.getGeneId()).getSingleResult();
+				logger.info("target gene: " + targetGene.getCodeName());
 			} catch (NoResultException e) {
 				logger.error("ERROR - did not find a gene with ID: " + geneOrthologDTO.getGeneId());
 				throw new RuntimeException();
@@ -2772,8 +3080,9 @@ public void registerGeneOrthologsFromCSV(String inputFile, String ortCodeName, S
 
 			LsThing orthologGene = null;
 			try {
-				orthologGene = LsThing.findLsThingByLabelText("gene", "entrez gene", "name", "Entrez Gene ID", geneOrthologDTO.getMappedGeneId()).getSingleResult();
-				logger.info("mapped ortholog gene: " + orthologGene.getCodeName());			
+				orthologGene = LsThing.findLsThingByLabelText("gene", "entrez gene", "name", "Entrez Gene ID",
+						geneOrthologDTO.getMappedGeneId()).getSingleResult();
+				logger.info("mapped ortholog gene: " + orthologGene.getCodeName());
 			} catch (NoResultException e) {
 				logger.error("ERROR - did not find a gene with ID: " + geneOrthologDTO.getMappedGeneId());
 				throw new RuntimeException();
@@ -2785,7 +3094,8 @@ public void registerGeneOrthologsFromCSV(String inputFile, String ortCodeName, S
 			itxOrtholog.setLsType("ortholog of");
 			itxOrtholog.setLsKind("entrez gene_entrez gene");
 			itxOrtholog.setRecordedBy(recordedBy);
-			//			itxOrtholog.setCodeName(autoLabelService.getLsThingCodeName("ortholog of_entrez gene_entrez gene"));
+			// itxOrtholog.setCodeName(autoLabelService.getLsThingCodeName("ortholog
+			// of_entrez gene_entrez gene"));
 			itxOrtholog.setCodeName(autoLabelService.getLsThingCodeName("interaction_ortholog"));
 			itxOrtholog.setLsTransaction(lsTransactionId);
 			itxOrtholog.persist();
@@ -2793,31 +3103,41 @@ public void registerGeneOrthologsFromCSV(String inputFile, String ortCodeName, S
 			ItxLsThingLsThingState itxOrthologState = new ItxLsThingLsThingState();
 			itxOrthologState.setLsType("metadata");
 			itxOrthologState.setLsKind("ortholog");
-			itxOrthologState.setItxLsThingLsThing(itxOrtholog);		
+			itxOrthologState.setItxLsThingLsThing(itxOrtholog);
 			itxOrthologState.setRecordedBy(recordedBy);
 			itxOrthologState.setLsTransaction(lsTransactionId);
 			itxOrthologState.persist();
 
 			ItxLsThingLsThingValue savedValue;
 
-			savedValue = saveItxStateCodeValue(lsTransaction, recordedBy, itxOrthologState, ortCodeName, "ortholog", "entrez gene", "ACAS LsThing", "codeValue", "ortholog");
-
-			savedValue = saveItxStateValue(lsTransaction, recordedBy, itxOrthologState, "numericValue", "MappedScore", geneOrthologDTO.getMappedScore());
-			savedValue = saveItxStateValue(lsTransaction, recordedBy, itxOrthologState, "numericValue", "MappedPerc", geneOrthologDTO.getMappedPerc());
-			savedValue = saveItxStateValue(lsTransaction, recordedBy, itxOrthologState, "numericValue", "MappedHitLen", geneOrthologDTO.getMappedHitLen());
-			savedValue = saveItxStateValue(lsTransaction, recordedBy, itxOrthologState, "numericValue", "MappedPercRatio", geneOrthologDTO.getMappedPercRatio());
-
-			//			savedValue = saveItxStateValue(lsTransaction, recordedBy, itxOrthologState, "stringValue", "InputGeneId", geneOrthologDTO.getGeneId());
-			//			savedValue = saveItxStateValue(lsTransaction, recordedBy, itxOrthologState, "stringValue", "InputSymbol", geneOrthologDTO.getSymbol());
-			//			savedValue = saveItxStateValue(lsTransaction, recordedBy, itxOrthologState, "stringValue", "InputTaxId", geneOrthologDTO.getTaxId());
-			//			savedValue = saveItxStateValue(lsTransaction, recordedBy, itxOrthologState, "stringValue", "MappedGeneId", geneOrthologDTO.getMappedGeneId());
-			//			savedValue = saveItxStateValue(lsTransaction, recordedBy, itxOrthologState, "stringValue", "MappedSymbol", geneOrthologDTO.getMappedSymbol());
-			//			savedValue = saveItxStateValue(lsTransaction, recordedBy, itxOrthologState, "stringValue", "MappedTaxId", geneOrthologDTO.getMappedTaxId());
-
-			//			itxOrtholog.getLsStates().add(itxOrthologState);
-
-
-			if ( i % batchSize == 0 ) { // same as the JDBC batch size
+			savedValue = saveItxStateCodeValue(lsTransaction, recordedBy, itxOrthologState, ortCodeName, "ortholog",
+					"entrez gene", "ACAS LsThing", "codeValue", "ortholog");
+
+			savedValue = saveItxStateValue(lsTransaction, recordedBy, itxOrthologState, "numericValue", "MappedScore",
+					geneOrthologDTO.getMappedScore());
+			savedValue = saveItxStateValue(lsTransaction, recordedBy, itxOrthologState, "numericValue", "MappedPerc",
+					geneOrthologDTO.getMappedPerc());
+			savedValue = saveItxStateValue(lsTransaction, recordedBy, itxOrthologState, "numericValue", "MappedHitLen",
+					geneOrthologDTO.getMappedHitLen());
+			savedValue = saveItxStateValue(lsTransaction, recordedBy, itxOrthologState, "numericValue",
+					"MappedPercRatio", geneOrthologDTO.getMappedPercRatio());
+
+			// savedValue = saveItxStateValue(lsTransaction, recordedBy, itxOrthologState,
+			// "stringValue", "InputGeneId", geneOrthologDTO.getGeneId());
+			// savedValue = saveItxStateValue(lsTransaction, recordedBy, itxOrthologState,
+			// "stringValue", "InputSymbol", geneOrthologDTO.getSymbol());
+			// savedValue = saveItxStateValue(lsTransaction, recordedBy, itxOrthologState,
+			// "stringValue", "InputTaxId", geneOrthologDTO.getTaxId());
+			// savedValue = saveItxStateValue(lsTransaction, recordedBy, itxOrthologState,
+			// "stringValue", "MappedGeneId", geneOrthologDTO.getMappedGeneId());
+			// savedValue = saveItxStateValue(lsTransaction, recordedBy, itxOrthologState,
+			// "stringValue", "MappedSymbol", geneOrthologDTO.getMappedSymbol());
+			// savedValue = saveItxStateValue(lsTransaction, recordedBy, itxOrthologState,
+			// "stringValue", "MappedTaxId", geneOrthologDTO.getMappedTaxId());
+
+			// itxOrtholog.getLsStates().add(itxOrthologState);
+
+			if (i % batchSize == 0) { // same as the JDBC batch size
 				savedValue.flush();
 				savedValue.clear();
 				itxOrtholog.flush();
@@ -2828,10 +3148,9 @@ public void registerGeneOrthologsFromCSV(String inputFile, String ortCodeName, S
 
 	}
 
-
-
 	private ItxLsThingLsThingValue saveItxStateCodeValue(LsTransaction lsTransaction, String recordedBy,
-			ItxLsThingLsThingState itxOrthologState, String codeValue, String codeType, String codeKind, String codeOrigin,
+			ItxLsThingLsThingState itxOrthologState, String codeValue, String codeType, String codeKind,
+			String codeOrigin,
 			String lsType, String lsKind) {
 
 		ItxLsThingLsThingValue savedValue = new ItxLsThingLsThingValue();
@@ -2843,13 +3162,14 @@ private ItxLsThingLsThingValue saveItxStateCodeValue(LsTransaction lsTransaction
 		savedValue.setCodeValue(codeValue);
 		savedValue.setCodeType(codeType);
 		savedValue.setCodeKind(codeKind);
-		savedValue.setCodeOrigin(codeOrigin);		
+		savedValue.setCodeOrigin(codeOrigin);
 		savedValue.persist();
 
 		return savedValue;
 	}
 
-	public ItxLsThingLsThingValue saveItxStateValue(LsTransaction lsTransaction, String recordedBy, ItxLsThingLsThingState itxOrthologState, String stateType, String stateKind, Integer numericValue) {
+	public ItxLsThingLsThingValue saveItxStateValue(LsTransaction lsTransaction, String recordedBy,
+			ItxLsThingLsThingState itxOrthologState, String stateType, String stateKind, Integer numericValue) {
 		ItxLsThingLsThingValue savedValue = new ItxLsThingLsThingValue();
 		savedValue.setLsType(stateType);
 		savedValue.setLsKind(stateKind);
@@ -2862,7 +3182,8 @@ public ItxLsThingLsThingValue saveItxStateValue(LsTransaction lsTransaction, Str
 		return savedValue;
 	}
 
-	public ItxLsThingLsThingValue saveItxStateValue(LsTransaction lsTransaction, String recordedBy, ItxLsThingLsThingState itxOrthologState, String stateType, String stateKind, Double numericValue) {
+	public ItxLsThingLsThingValue saveItxStateValue(LsTransaction lsTransaction, String recordedBy,
+			ItxLsThingLsThingState itxOrthologState, String stateType, String stateKind, Double numericValue) {
 		ItxLsThingLsThingValue savedValue = new ItxLsThingLsThingValue();
 		savedValue.setLsType(stateType);
 		savedValue.setLsKind(stateKind);
@@ -2875,7 +3196,8 @@ public ItxLsThingLsThingValue saveItxStateValue(LsTransaction lsTransaction, Str
 		return savedValue;
 	}
 
-	public ItxLsThingLsThingValue saveItxStateValue(LsTransaction lsTransaction, String recordedBy, ItxLsThingLsThingState itxOrthologState, String stateType,String stateKind, String stringValue) {
+	public ItxLsThingLsThingValue saveItxStateValue(LsTransaction lsTransaction, String recordedBy,
+			ItxLsThingLsThingState itxOrthologState, String stateType, String stateKind, String stringValue) {
 		ItxLsThingLsThingValue savedValue = new ItxLsThingLsThingValue();
 		savedValue.setLsType(stateType);
 		savedValue.setLsKind(stateKind);
@@ -2888,16 +3210,17 @@ public ItxLsThingLsThingValue saveItxStateValue(LsTransaction lsTransaction, Str
 		return savedValue;
 	}
 
-
 	public void setGeneOrthologDefaults() {
 
-		//		itxOrtholog.setCodeName(autoLabelService.getLsThingCodeName("ortholog of_entrez gene_entrez gene"));
-
+		// itxOrtholog.setCodeName(autoLabelService.getLsThingCodeName("ortholog
+		// of_entrez gene_entrez gene"));
 
 		String thingTypeAndKind = "ortholog_entrez gene";
 		String labelTypeAndKind = "id_codeName";
-		List<LabelSequence> labelSeqs = LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(thingTypeAndKind, labelTypeAndKind).getResultList();
-		if (labelSeqs.size() == 0){
+		List<LabelSequence> labelSeqs = LabelSequence
+				.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(thingTypeAndKind, labelTypeAndKind)
+				.getResultList();
+		if (labelSeqs.size() == 0) {
 			LabelSequence newLabelSeq = new LabelSequence();
 			newLabelSeq.setDigits(6);
 			newLabelSeq.setLabelPrefix("ORT");
@@ -2906,15 +3229,17 @@ public void setGeneOrthologDefaults() {
 			newLabelSeq.setLabelTypeAndKind(labelTypeAndKind);
 			newLabelSeq.setThingTypeAndKind(thingTypeAndKind);
 			newLabelSeq.persist();
-		} 
+		}
 
 		InteractionType.getOrCreate("first ortholog of second", "ortholog of");
 		InteractionKind.getOrCreate("ortholog of", "entrez gene_entrez gene");
 
 		thingTypeAndKind = "interaction_ortholog";
 		labelTypeAndKind = "id_codeName";
-		List<LabelSequence> ortxLabelSeqs = LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(thingTypeAndKind, labelTypeAndKind).getResultList();
-		if (ortxLabelSeqs.size() == 0){
+		List<LabelSequence> ortxLabelSeqs = LabelSequence
+				.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(thingTypeAndKind, labelTypeAndKind)
+				.getResultList();
+		if (ortxLabelSeqs.size() == 0) {
 			LabelSequence newLabelSeq = new LabelSequence();
 			newLabelSeq.setDigits(6);
 			newLabelSeq.setLabelPrefix("ORTX");
@@ -2923,7 +3248,7 @@ public void setGeneOrthologDefaults() {
 			newLabelSeq.setLabelTypeAndKind(labelTypeAndKind);
 			newLabelSeq.setThingTypeAndKind(thingTypeAndKind);
 			newLabelSeq.persist();
-		} 
+		}
 
 		StateType stateType = StateType.getOrCreate("metadata");
 		StateKind.getOrCreate(stateType, "ortholog");
@@ -2944,24 +3269,23 @@ public void setGeneOrthologDefaults() {
 
 	}
 
-
 	public CellProcessor[] getOrthologProcessors() {
-		//16
-		final CellProcessor[] processors = new CellProcessor[] { 
-				new Optional(new ParseInt()),  // rowId
-
-				new Optional(),  // geneId
-				new Optional(),  // symbol
-				new Optional(),  // taxId
-				new Optional(),  // typeOfGene
-
-				new Optional(),  // mappedGeneId
-				new Optional(),  // mappedSymbol
-				new Optional(),  // mappedTaxId
+		// 16
+		final CellProcessor[] processors = new CellProcessor[] {
+				new Optional(new ParseInt()), // rowId
+
+				new Optional(), // geneId
+				new Optional(), // symbol
+				new Optional(), // taxId
+				new Optional(), // typeOfGene
+
+				new Optional(), // mappedGeneId
+				new Optional(), // mappedSymbol
+				new Optional(), // mappedTaxId
 				new Optional(), // mappedTypeOfGene
 
-				new Optional(new ParseInt()), // 
-				new Optional(new ParseInt()), // 
+				new Optional(new ParseInt()), //
+				new Optional(new ParseInt()), //
 				new Optional(new ParseInt()), //
 				new Optional(new ParseDouble()), //
 				new Optional(new ParseInt()), //
@@ -2974,24 +3298,27 @@ public CellProcessor[] getOrthologProcessors() {
 
 	@Transactional
 	@Override
-	public List<GeneOrthologDTO> getOrthologsFromGeneID(String queryGeneID) throws IOException{
+	public List<GeneOrthologDTO> getOrthologsFromGeneID(String queryGeneID) throws IOException {
 
-		List<LsThing> queryGenes = LsThing.findLsThingByLabelText("gene", "entrez gene", "name", "Entrez Gene ID", queryGeneID).getResultList();
+		List<LsThing> queryGenes = LsThing
+				.findLsThingByLabelText("gene", "entrez gene", "name", "Entrez Gene ID", queryGeneID).getResultList();
 		LsThing queryGene = queryGenes.get(0);
 		logger.info("number of query genes found: " + queryGenes.size());
-		//logger.info("query gene: " + queryGene.toJson());
+		// logger.info("query gene: " + queryGene.toJson());
 		String lsType = "ortholog of";
 		String lsKind = "entrez gene_entrez gene";
-		List<ItxLsThingLsThing> itxOrthologs = ItxLsThingLsThing.findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndFirstLsThingEquals(lsType, lsKind, queryGene).getResultList();
+		List<ItxLsThingLsThing> itxOrthologs = ItxLsThingLsThing
+				.findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndFirstLsThingEquals(lsType, lsKind, queryGene)
+				.getResultList();
 
 		List<GeneOrthologDTO> geneOrthologs = new ArrayList<GeneOrthologDTO>();
 		GeneOrthologDTO geneOrtholog;
 		LsThingLabel geneSymbol;
 
-		for (ItxLsThingLsThing itxOrtholog : itxOrthologs){
-			//logger.info("ortholog itx: " + itxOrtholog.toJson());
+		for (ItxLsThingLsThing itxOrtholog : itxOrthologs) {
+			// logger.info("ortholog itx: " + itxOrtholog.toJson());
 
-			if (checkValidOrtholog(itxOrtholog)){
+			if (checkValidOrtholog(itxOrtholog)) {
 				geneOrtholog = new GeneOrthologDTO();
 				geneOrtholog.setId(itxOrtholog.getId());
 				geneOrtholog.setRecordedBy(itxOrtholog.getRecordedBy());
@@ -3001,16 +3328,16 @@ public List<GeneOrthologDTO> getOrthologsFromGeneID(String queryGeneID) throws I
 				geneOrtholog.setSpecies(findSpeciesName(geneOrtholog.getTaxId()));
 				geneOrtholog.setOrthCode(findOrthologEntityCode(itxOrtholog));
 
-				if (geneOrtholog.getOrthCode() != null){
+				if (geneOrtholog.getOrthCode() != null) {
 					geneOrtholog = setOrthologInfo(geneOrtholog);
 				} else {
 					geneOrtholog.setCurator(findOrthologCurator(itxOrtholog));
 					geneOrtholog.setCurationLevel(findCurationLevel(itxOrtholog));
-					geneOrtholog.setVersionName(findVersionName(geneOrtholog));					
+					geneOrtholog.setVersionName(findVersionName(geneOrtholog));
 				}
 
 				LsThing mappedOrthologGene = itxOrtholog.getSecondLsThing();
-			//	logger.info("Mapped ortholog gene: " + mappedOrthologGene.toJson());
+				// logger.info("Mapped ortholog gene: " + mappedOrthologGene.toJson());
 				geneOrtholog.setMappedGeneId(findGeneID(mappedOrthologGene));
 				geneOrtholog.setMappedSymbol(findGeneSymbol(mappedOrthologGene));
 				geneOrtholog.setMappedTaxId(findTaxonomyID(mappedOrthologGene));
@@ -3021,101 +3348,111 @@ public List<GeneOrthologDTO> getOrthologsFromGeneID(String queryGeneID) throws I
 				geneOrtholog.setMappedHitLen(findItxStateValueInteger(itxOrtholog, "MappedHitLen"));
 				geneOrtholog.setMappedPercRatio(findItxStateValueDouble(itxOrtholog, "MappedPercRatio"));
 
-//				geneOrthologBeanMap.put("InputGeneType", "typeOfGene");
-//				geneOrthologBeanMap.put("MappedTypeOfGene", "mappedTypeOfGene");
-//				ValueKind.getOrCreate(valueType, "MappedScore");
-//				ValueKind.getOrCreate(valueType, "MappedPerc");
-//				ValueKind.getOrCreate(valueType, "MappedHitLen");
-//				ValueKind.getOrCreate(valueType, "MappedPercRatio");
-//				ValueKind.getOrCreate(valueType, "InputGeneId");
-//				ValueKind.getOrCreate(valueType, "InputSymbol");
-//				ValueKind.getOrCreate(valueType, "InputTaxId");
-//				ValueKind.getOrCreate(valueType, "MappedGeneId");
-//				ValueKind.getOrCreate(valueType, "MappedSymbol");
-//				ValueKind.getOrCreate(valueType, "MappedTaxId");
-				
-				geneOrthologs.add(geneOrtholog);				
+				// geneOrthologBeanMap.put("InputGeneType", "typeOfGene");
+				// geneOrthologBeanMap.put("MappedTypeOfGene", "mappedTypeOfGene");
+				// ValueKind.getOrCreate(valueType, "MappedScore");
+				// ValueKind.getOrCreate(valueType, "MappedPerc");
+				// ValueKind.getOrCreate(valueType, "MappedHitLen");
+				// ValueKind.getOrCreate(valueType, "MappedPercRatio");
+				// ValueKind.getOrCreate(valueType, "InputGeneId");
+				// ValueKind.getOrCreate(valueType, "InputSymbol");
+				// ValueKind.getOrCreate(valueType, "InputTaxId");
+				// ValueKind.getOrCreate(valueType, "MappedGeneId");
+				// ValueKind.getOrCreate(valueType, "MappedSymbol");
+				// ValueKind.getOrCreate(valueType, "MappedTaxId");
+
+				geneOrthologs.add(geneOrtholog);
 			}
 		}
 
-	//	logger.info(GeneOrthologDTO.toJsonArray(geneOrthologs));
+		// logger.info(GeneOrthologDTO.toJsonArray(geneOrthologs));
 		return geneOrthologs;
 
 	}
 
-
 	private String findItxStateValueString(ItxLsThingLsThing itxOrtholog, String valueKind) {
 		String itxStateValue = null;
 		String stateType = "metadata";
 		String stateKind = "ortholog";
 		String valueType = "stringValue";
-		List<ItxLsThingLsThingValue> itxStateValues = ItxLsThingLsThingValue.findItxLsValueByItxThingAndStateTypeStateKindAndValueTypeKind(itxOrtholog.getId(), stateType, stateKind, valueType, valueKind).getResultList();
-		if (itxStateValues.size() == 1){
+		List<ItxLsThingLsThingValue> itxStateValues = ItxLsThingLsThingValue
+				.findItxLsValueByItxThingAndStateTypeStateKindAndValueTypeKind(itxOrtholog.getId(), stateType,
+						stateKind, valueType, valueKind)
+				.getResultList();
+		if (itxStateValues.size() == 1) {
 			itxStateValue = itxStateValues.get(0).getStringValue();
-		} else if (itxStateValues.size() > 1){
-			logger.error("FOUND multiple " + valueKind );
+		} else if (itxStateValues.size() > 1) {
+			logger.error("FOUND multiple " + valueKind);
 		}
 		return itxStateValue;
-		}
+	}
 
 	private Integer findItxStateValueInteger(ItxLsThingLsThing itxOrtholog, String valueKind) {
 		Integer itxStateValue = null;
 		String stateType = "metadata";
 		String stateKind = "ortholog";
 		String valueType = "numericValue";
-		List<ItxLsThingLsThingValue> itxStateValues = ItxLsThingLsThingValue.findItxLsValueByItxThingAndStateTypeStateKindAndValueTypeKind(itxOrtholog.getId(), stateType, stateKind, valueType, valueKind).getResultList();
+		List<ItxLsThingLsThingValue> itxStateValues = ItxLsThingLsThingValue
+				.findItxLsValueByItxThingAndStateTypeStateKindAndValueTypeKind(itxOrtholog.getId(), stateType,
+						stateKind, valueType, valueKind)
+				.getResultList();
 
-		if (itxStateValues.size() == 1){
+		if (itxStateValues.size() == 1) {
 			itxStateValue = new Integer(itxStateValues.get(0).getNumericValue().toString()).intValue();
-		} else if (itxStateValues.size() > 1){
-			logger.error("FOUND multiple " + valueKind );
-	}
+		} else if (itxStateValues.size() > 1) {
+			logger.error("FOUND multiple " + valueKind);
+		}
 		return itxStateValue;
 	}
-	
 
 	private Double findItxStateValueDouble(ItxLsThingLsThing itxOrtholog, String valueKind) {
 		Double itxStateValue = null;
 		String stateType = "metadata";
 		String stateKind = "ortholog";
 		String valueType = "numericValue";
-		List<ItxLsThingLsThingValue> itxStateValues = ItxLsThingLsThingValue.findItxLsValueByItxThingAndStateTypeStateKindAndValueTypeKind(itxOrtholog.getId(), stateType, stateKind, valueType, valueKind).getResultList();
+		List<ItxLsThingLsThingValue> itxStateValues = ItxLsThingLsThingValue
+				.findItxLsValueByItxThingAndStateTypeStateKindAndValueTypeKind(itxOrtholog.getId(), stateType,
+						stateKind, valueType, valueKind)
+				.getResultList();
 
-		if (itxStateValues.size() == 1){
+		if (itxStateValues.size() == 1) {
 			itxStateValue = new Double(itxStateValues.get(0).getNumericValue().toString());
-		} else if (itxStateValues.size() > 1){
-			logger.error("FOUND multiple " + valueKind );
+		} else if (itxStateValues.size() > 1) {
+			logger.error("FOUND multiple " + valueKind);
 		}
 		return itxStateValue;
 	}
 
-
 	private GeneOrthologDTO setOrthologInfo(GeneOrthologDTO geneOrtholog) {
 		LsThing orthologThing = LsThing.findLsThingsByCodeNameEquals(geneOrtholog.getOrthCode()).getSingleResult();
-	//	logger.info("@@@@@@@@@@@@ ----- " + orthologThing.toJson());
+		// logger.info("@@@@@@@@@@@@ ----- " + orthologThing.toJson());
 
-		List<LsThingLabel> orthologNames = LsThingLabel.findLsThingLabelsByLsThingAndLsTypeAndLsKindNotIgnored(orthologThing, "name", "ortholog name", true).getResultList();
-		if (orthologNames.size() == 1){
+		List<LsThingLabel> orthologNames = LsThingLabel
+				.findLsThingLabelsByLsThingAndLsTypeAndLsKindNotIgnored(orthologThing, "name", "ortholog name", true)
+				.getResultList();
+		if (orthologNames.size() == 1) {
 			geneOrtholog.setVersionName(orthologNames.get(0).getLabelText());
-		} else if (orthologNames.size() > 1){
+		} else if (orthologNames.size() > 1) {
 			logger.error("FOUND multiple Ortholog name values");
 		} else {
 			logger.error("ERROR: Did not find Ortholog name");
 		}
 
-		List<LsThingValue> curationLevels = LsThingValue.findLsThingValuesByLsThingIDAndStateTypeKindAndValueTypeKind(orthologThing.getId(), "metadata", "ortholog", "numericValue", "curation level").getResultList();
+		List<LsThingValue> curationLevels = LsThingValue.findLsThingValuesByLsThingIDAndStateTypeKindAndValueTypeKind(
+				orthologThing.getId(), "metadata", "ortholog", "numericValue", "curation level").getResultList();
 
-		if (curationLevels.size() == 1){
+		if (curationLevels.size() == 1) {
 			Integer curationLevel = new Double(curationLevels.get(0).getNumericValue().toString()).intValue();
 			geneOrtholog.setCurationLevel(curationLevel);
-		} else if (curationLevels.size() > 1){
+		} else if (curationLevels.size() > 1) {
 			logger.error("FOUND multiple curation levels");
 		}
 
-		List<LsThingValue> curators = LsThingValue.findLsThingValuesByLsThingIDAndStateTypeKindAndValueTypeKind(orthologThing.getId(), "metadata", "ortholog", "stringValue", "curator").getResultList();
-		if (curators.size() == 1){
+		List<LsThingValue> curators = LsThingValue.findLsThingValuesByLsThingIDAndStateTypeKindAndValueTypeKind(
+				orthologThing.getId(), "metadata", "ortholog", "stringValue", "curator").getResultList();
+		if (curators.size() == 1) {
 			geneOrtholog.setCurator(curators.get(0).getStringValue());
-		} else if (curators.size() > 1){
+		} else if (curators.size() > 1) {
 			logger.error("FOUND multiple curators");
 		}
 
@@ -3129,16 +3466,19 @@ private boolean checkValidOrtholog(ItxLsThingLsThing itxOrtholog) {
 		String stateKind = "ortholog";
 		String valueType = "codeValue";
 		String valueKind = "ortholog";
-		List<ItxLsThingLsThingValue> orthCodes = ItxLsThingLsThingValue.findItxLsValueByItxThingAndStateTypeStateKindAndValueTypeKind(itxOrtholog.getId(), stateType, stateKind, valueType, valueKind).getResultList();
+		List<ItxLsThingLsThingValue> orthCodes = ItxLsThingLsThingValue
+				.findItxLsValueByItxThingAndStateTypeStateKindAndValueTypeKind(itxOrtholog.getId(), stateType,
+						stateKind, valueType, valueKind)
+				.getResultList();
 
-		if (orthCodes.size() == 1){
+		if (orthCodes.size() == 1) {
 			orthologCode = orthCodes.get(0).getCodeValue();
 			LsThing orthThing = LsThing.findLsThingsByCodeNameEquals(orthologCode).getSingleResult();
-			if (orthThing.isIgnored()){
+			if (orthThing.isIgnored()) {
 				validOrtholog = false;
 			}
 
-		} else if (orthCodes.size() > 1){
+		} else if (orthCodes.size() > 1) {
 			logger.error("FOUND multiple orth codes");
 			validOrtholog = false;
 		}
@@ -3148,16 +3488,18 @@ private boolean checkValidOrtholog(ItxLsThingLsThing itxOrtholog) {
 
 	private String findVersionName(GeneOrthologDTO geneOrtholog) {
 		String orthologName = null;
-		if (geneOrtholog.getOrthCode() != null){
+		if (geneOrtholog.getOrthCode() != null) {
 			LsThing orthThing = LsThing.findLsThingsByCodeNameEquals(geneOrtholog.getOrthCode()).getSingleResult();
-			List<LsThingLabel> orthologNames = LsThingLabel.findLsThingLabelsByLsThingAndLsTypeAndLsKindNotIgnored(orthThing, "name", "ortholog name", true).getResultList();
-			if (orthologNames.size() == 1){
+			List<LsThingLabel> orthologNames = LsThingLabel
+					.findLsThingLabelsByLsThingAndLsTypeAndLsKindNotIgnored(orthThing, "name", "ortholog name", true)
+					.getResultList();
+			if (orthologNames.size() == 1) {
 				orthologName = orthologNames.get(0).getLabelText();
-			} else if (orthologNames.size() > 1){
+			} else if (orthologNames.size() > 1) {
 				logger.error("FOUND multiple Ortholog name values");
 			} else {
 				logger.error("ERROR: Did not find Ortholog name");
-			}			
+			}
 		}
 
 		return orthologName;
@@ -3165,32 +3507,33 @@ private String findVersionName(GeneOrthologDTO geneOrtholog) {
 
 	private String findSpeciesName(String mappedTaxId) {
 		String species = null;
-		if (mappedTaxId.equalsIgnoreCase("9606")){
+		if (mappedTaxId.equalsIgnoreCase("9606")) {
 			species = "Homo sapiens";
-		} else if (mappedTaxId.equalsIgnoreCase("7227")){
+		} else if (mappedTaxId.equalsIgnoreCase("7227")) {
 			species = "Drosophila melanogaster";
-		} else if (mappedTaxId.equalsIgnoreCase("10090")){
+		} else if (mappedTaxId.equalsIgnoreCase("10090")) {
 			species = "Mus musculus";
-		} else if (mappedTaxId.equalsIgnoreCase("10116")){
+		} else if (mappedTaxId.equalsIgnoreCase("10116")) {
 			species = "Rattus norvegicus";
 		}
 
 		return species;
 	}
 
-
-
 	private Integer findCurationLevel(ItxLsThingLsThing itxOrtholog) {
 		Integer curationLevel = null;
 		String stateType = "metadata";
 		String stateKind = "ortholog";
 		String valueType = "numericValue";
 		String valueKind = "curation level";
-		List<ItxLsThingLsThingValue> curationLevels = ItxLsThingLsThingValue.findItxLsValueByItxThingAndStateTypeStateKindAndValueTypeKind(itxOrtholog.getId(), stateType, stateKind, valueType, valueKind).getResultList();
+		List<ItxLsThingLsThingValue> curationLevels = ItxLsThingLsThingValue
+				.findItxLsValueByItxThingAndStateTypeStateKindAndValueTypeKind(itxOrtholog.getId(), stateType,
+						stateKind, valueType, valueKind)
+				.getResultList();
 
-		if (curationLevels.size() == 1){
+		if (curationLevels.size() == 1) {
 			curationLevel = new Double(curationLevels.get(0).getNumericValue().toString()).intValue();
-		} else if (curationLevels.size() > 1){
+		} else if (curationLevels.size() > 1) {
 			logger.error("FOUND multiple curation levels");
 		}
 		return curationLevel;
@@ -3199,16 +3542,18 @@ private Integer findCurationLevel(ItxLsThingLsThing itxOrtholog) {
 	private String findOrthologCurator(ItxLsThingLsThing itxOrtholog) {
 		String curator = null;
 
-
 		String stateType = "metadata";
 		String stateKind = "ortholog";
 		String valueType = "stringValue";
 		String valueKind = "curator";
-		List<ItxLsThingLsThingValue> curators = ItxLsThingLsThingValue.findItxLsValueByItxThingAndStateTypeStateKindAndValueTypeKind(itxOrtholog.getId(), stateType, stateKind, valueType, valueKind).getResultList();
+		List<ItxLsThingLsThingValue> curators = ItxLsThingLsThingValue
+				.findItxLsValueByItxThingAndStateTypeStateKindAndValueTypeKind(itxOrtholog.getId(), stateType,
+						stateKind, valueType, valueKind)
+				.getResultList();
 
-		if (curators.size() == 1){
+		if (curators.size() == 1) {
 			curator = curators.get(0).getStringValue();
-		} else if (curators.size() > 1){
+		} else if (curators.size() > 1) {
 			logger.error("FOUND multiple curators");
 		}
 
@@ -3216,11 +3561,13 @@ private String findOrthologCurator(ItxLsThingLsThing itxOrtholog) {
 	}
 
 	private String findGeneID(LsThing mappedOrthologGene) {
-		String geneID = null;		
-		List<LsThingLabel> geneIDs = LsThingLabel.findLsThingPreferredName(mappedOrthologGene.getId(), "name", "Entrez Gene ID", true, true).getResultList();
-		if (geneIDs.size() == 1){
+		String geneID = null;
+		List<LsThingLabel> geneIDs = LsThingLabel
+				.findLsThingPreferredName(mappedOrthologGene.getId(), "name", "Entrez Gene ID", true, true)
+				.getResultList();
+		if (geneIDs.size() == 1) {
 			geneID = geneIDs.get(0).getLabelText();
-		} else if (geneIDs.size() > 1){
+		} else if (geneIDs.size() > 1) {
 			logger.error("FOUND multiple Gene ID values");
 		} else {
 			logger.error("ERROR: Did not find an Entrez Gene ID");
@@ -3234,11 +3581,14 @@ private String findOrthologEntityCode(ItxLsThingLsThing itxOrtholog) {
 		String stateKind = "ortholog";
 		String valueType = "codeValue";
 		String valueKind = "ortholog";
-		List<ItxLsThingLsThingValue> orthCodes = ItxLsThingLsThingValue.findItxLsValueByItxThingAndStateTypeStateKindAndValueTypeKind(itxOrtholog.getId(), stateType, stateKind, valueType, valueKind).getResultList();
+		List<ItxLsThingLsThingValue> orthCodes = ItxLsThingLsThingValue
+				.findItxLsValueByItxThingAndStateTypeStateKindAndValueTypeKind(itxOrtholog.getId(), stateType,
+						stateKind, valueType, valueKind)
+				.getResultList();
 
-		if (orthCodes.size() == 1){
+		if (orthCodes.size() == 1) {
 			orthologCode = orthCodes.get(0).getCodeValue();
-		} else if (orthCodes.size() > 1){
+		} else if (orthCodes.size() > 1) {
 			logger.error("FOUND multiple orth codes");
 		}
 
@@ -3247,10 +3597,11 @@ private String findOrthologEntityCode(ItxLsThingLsThing itxOrtholog) {
 
 	private String findTaxonomyID(LsThing queryGene) {
 		String taxonomyId = null;
-		List<LsThingValue> taxIdValues = LsThingValue.findLsThingValuesByLsThingIDAndStateTypeKindAndValueTypeKind(queryGene.getId(), "metadata", "gene metadata", "stringValue", "tax id").getResultList();
-		if (taxIdValues.size() == 1){
+		List<LsThingValue> taxIdValues = LsThingValue.findLsThingValuesByLsThingIDAndStateTypeKindAndValueTypeKind(
+				queryGene.getId(), "metadata", "gene metadata", "stringValue", "tax id").getResultList();
+		if (taxIdValues.size() == 1) {
 			taxonomyId = taxIdValues.get(0).getStringValue();
-		} else if (taxIdValues.size() > 1){
+		} else if (taxIdValues.size() > 1) {
 			logger.error("FOUND multiple tax Id values");
 		} else {
 			logger.error("ERROR: Did not find a tax id");
@@ -3260,10 +3611,11 @@ private String findTaxonomyID(LsThing queryGene) {
 
 	private String findGeneSymbol(LsThing queryGene) {
 		String geneSymbol = null;
-		List<LsThingLabel> geneSymbols = LsThingLabel.findLsThingLabelsByLsThingAndLsTypeAndLsKindNotIgnored(queryGene, "name", "authoritative gene symbol", true).getResultList();
-		if (geneSymbols.size() == 1){
+		List<LsThingLabel> geneSymbols = LsThingLabel.findLsThingLabelsByLsThingAndLsTypeAndLsKindNotIgnored(queryGene,
+				"name", "authoritative gene symbol", true).getResultList();
+		if (geneSymbols.size() == 1) {
 			geneSymbol = geneSymbols.get(0).getLabelText();
-		} else if (geneSymbols.size() > 1){
+		} else if (geneSymbols.size() > 1) {
 			logger.error("FOUND multiple Gene Symbol values");
 		} else {
 			logger.error("ERROR: Did not find authoritative gene symbol");
@@ -3275,37 +3627,42 @@ private String findGeneSymbol(LsThing queryGene) {
 	public Collection<GeneOrthologDTO> saveOrthologInteractions(Collection<GeneOrthologDTO> geneOrthologs) {
 
 		Collection<GeneOrthologDTO> savedOrthologs = new ArrayList<GeneOrthologDTO>();
-		for (GeneOrthologDTO geneOrtholog : geneOrthologs){
+		for (GeneOrthologDTO geneOrtholog : geneOrthologs) {
 			geneOrtholog = saveOrthologInteraction(geneOrtholog);
 			savedOrthologs.add(geneOrtholog);
 		}
-		
+
 		return savedOrthologs;
 
 	}
-	
+
 	@Override
 	public GeneOrthologDTO saveOrthologInteraction(GeneOrthologDTO geneOrtholog) {
 
-		if (geneOrtholog.getId() == null){
-			//this is a new entry
-			List<LsThing> queryGenes = LsThing.findLsThingByLabelText("gene", "entrez gene", "name", "Entrez Gene ID", geneOrtholog.getGeneId()).getResultList();
+		if (geneOrtholog.getId() == null) {
+			// this is a new entry
+			List<LsThing> queryGenes = LsThing
+					.findLsThingByLabelText("gene", "entrez gene", "name", "Entrez Gene ID", geneOrtholog.getGeneId())
+					.getResultList();
 			LsThing queryGene = null;
-			if (queryGenes.size() == 1){
+			if (queryGenes.size() == 1) {
 				queryGene = queryGenes.get(0);
-			} else if (queryGenes.size() > 1){
+			} else if (queryGenes.size() > 1) {
 				logger.error("multiple genes found");
-			} if (queryGenes.size() < 1){
+			}
+			if (queryGenes.size() < 1) {
 				logger.error("no gene found");
 			}
 
-			List<LsThing> orthologGenes = LsThing.findLsThingByLabelText("gene", "entrez gene", "name", "Entrez Gene ID", geneOrtholog.getMappedGeneId()).getResultList();
+			List<LsThing> orthologGenes = LsThing.findLsThingByLabelText("gene", "entrez gene", "name",
+					"Entrez Gene ID", geneOrtholog.getMappedGeneId()).getResultList();
 			LsThing orthologGene = null;
-			if (orthologGenes.size() == 1){
+			if (orthologGenes.size() == 1) {
 				orthologGene = orthologGenes.get(0);
-			} else if (orthologGenes.size() > 1){
+			} else if (orthologGenes.size() > 1) {
 				logger.error("multiple ortholog genes found");
-			} if (orthologGenes.size() < 1){
+			}
+			if (orthologGenes.size() < 1) {
 				logger.error("no ortholog gene found");
 			}
 
@@ -3328,22 +3685,25 @@ public GeneOrthologDTO saveOrthologInteraction(GeneOrthologDTO geneOrtholog) {
 			ItxLsThingLsThingState itxOrthologState = new ItxLsThingLsThingState();
 			itxOrthologState.setLsType("metadata");
 			itxOrthologState.setLsKind("ortholog");
-			itxOrthologState.setItxLsThingLsThing(itxOrtholog);		
+			itxOrthologState.setItxLsThingLsThing(itxOrtholog);
 			itxOrthologState.setRecordedBy(geneOrtholog.getRecordedBy());
 			itxOrthologState.setLsTransaction(lsTransaction.getId());
 			itxOrthologState.persist();
 
 			ItxLsThingLsThingValue savedValue;
-			savedValue = saveItxStateValue(lsTransaction, geneOrtholog.getRecordedBy(), itxOrthologState, "numericValue", "curation level", geneOrtholog.getCurationLevel());
-			savedValue = saveItxStateValue(lsTransaction, geneOrtholog.getRecordedBy(), itxOrthologState, "stringValue", "curator", geneOrtholog.getCurator());
-			if (geneOrtholog.getVersionName() != null){
-				savedValue = saveItxStateValue(lsTransaction, geneOrtholog.getRecordedBy(), itxOrthologState, "stringValue", "version name", geneOrtholog.getVersionName());
+			savedValue = saveItxStateValue(lsTransaction, geneOrtholog.getRecordedBy(), itxOrthologState,
+					"numericValue", "curation level", geneOrtholog.getCurationLevel());
+			savedValue = saveItxStateValue(lsTransaction, geneOrtholog.getRecordedBy(), itxOrthologState, "stringValue",
+					"curator", geneOrtholog.getCurator());
+			if (geneOrtholog.getVersionName() != null) {
+				savedValue = saveItxStateValue(lsTransaction, geneOrtholog.getRecordedBy(), itxOrthologState,
+						"stringValue", "version name", geneOrtholog.getVersionName());
 			}
 
 			geneOrtholog.setId(itxOrtholog.getId());
 
 		} else {
-			//update existing entry
+			// update existing entry
 
 		}
 
diff --git a/src/main/java/com/labsynch/labseer/service/IsoSaltService.java b/src/main/java/com/labsynch/labseer/service/IsoSaltService.java
index 14891815a..84e84dc91 100644
--- a/src/main/java/com/labsynch/labseer/service/IsoSaltService.java
+++ b/src/main/java/com/labsynch/labseer/service/IsoSaltService.java
@@ -2,7 +2,6 @@
 
 import com.labsynch.labseer.domain.IsoSalt;
 
-
 public interface IsoSaltService {
 
 	public double calculateSaltWeight(IsoSalt isoSalt);
diff --git a/src/main/java/com/labsynch/labseer/service/IsoSaltServiceImpl.java b/src/main/java/com/labsynch/labseer/service/IsoSaltServiceImpl.java
index 71e952e90..312fa0340 100644
--- a/src/main/java/com/labsynch/labseer/service/IsoSaltServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/IsoSaltServiceImpl.java
@@ -8,7 +8,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-
 @Service
 public class IsoSaltServiceImpl implements IsoSaltService {
 
@@ -16,35 +15,33 @@ public class IsoSaltServiceImpl implements IsoSaltService {
 	private PropertiesUtilService propertiesUtilService;
 
 	private static final Logger logger = LoggerFactory.getLogger(LotServiceImpl.class);
-	
+
 	@Override
-	public double calculateSaltWeight(IsoSalt isoSalt){
+	public double calculateSaltWeight(IsoSalt isoSalt) {
 		double saltWeight = 0;
 		logger.debug("isoSalt type: " + isoSalt.getType());
-		if (isoSalt.getType().equalsIgnoreCase("isotope")){
+		if (isoSalt.getType().equalsIgnoreCase("isotope")) {
 			logger.debug("isoSalt type: " + isoSalt.getType());
 
-			saltWeight = isoSalt.getIsotope().getMassChange(); 
-			logger.debug("intial saltWeight: " + saltWeight);	
+			saltWeight = isoSalt.getIsotope().getMassChange();
+			logger.debug("intial saltWeight: " + saltWeight);
 			logger.debug("equivalents: " + isoSalt.getEquivalents());
 			saltWeight = saltWeight * isoSalt.getEquivalents();
-			logger.debug("final saltWeight: " + saltWeight);	
-		} 
-		else if (isoSalt.getType().equalsIgnoreCase("salt")){
+			logger.debug("final saltWeight: " + saltWeight);
+		} else if (isoSalt.getType().equalsIgnoreCase("salt")) {
 			saltWeight = isoSalt.getSalt().getMolWeight();
-			logger.debug("intial saltWeight: " + saltWeight);	
+			logger.debug("intial saltWeight: " + saltWeight);
 			logger.debug("equivalents: " + isoSalt.getEquivalents());
-			//correction for charged salts
+			// correction for charged salts
 			saltWeight = saltWeight * isoSalt.getEquivalents();
-			if (propertiesUtilService.getUseExactMass()){
-				saltWeight = saltWeight - (1.007825)*(isoSalt.getSalt().getCharge() * isoSalt.getEquivalents());
-			}else{
-				saltWeight = saltWeight - (1.00794)*(isoSalt.getSalt().getCharge() * isoSalt.getEquivalents());
+			if (propertiesUtilService.getUseExactMass()) {
+				saltWeight = saltWeight - (1.007825) * (isoSalt.getSalt().getCharge() * isoSalt.getEquivalents());
+			} else {
+				saltWeight = saltWeight - (1.00794) * (isoSalt.getSalt().getCharge() * isoSalt.getEquivalents());
 			}
-			logger.debug("final saltWeight: " + saltWeight);	
+			logger.debug("final saltWeight: " + saltWeight);
 		}
 		return saltWeight;
 	}
-    
 
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ItxContainerContainerService.java b/src/main/java/com/labsynch/labseer/service/ItxContainerContainerService.java
index 0d0d04656..839fc3bcb 100755
--- a/src/main/java/com/labsynch/labseer/service/ItxContainerContainerService.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxContainerContainerService.java
@@ -12,12 +12,10 @@ public interface ItxContainerContainerService {
 	ItxContainerContainer saveLsItxContainer(ItxContainerContainer itxContainer);
 
 	Collection<ItxContainerContainer> saveLsItxContainers(String json);
-	
+
 	Collection<ItxContainerContainer> saveLsItxContainers(Collection<ItxContainerContainer> itxContainerContainers);
 
 	ItxContainerContainer updateItxContainerContainer(
 			ItxContainerContainer jsonItxContainerContainer);
-	
-	
-	
+
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ItxContainerContainerServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ItxContainerContainerServiceImpl.java
index 7b7a87130..bfcdc9db6 100755
--- a/src/main/java/com/labsynch/labseer/service/ItxContainerContainerServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxContainerContainerServiceImpl.java
@@ -24,83 +24,84 @@ public class ItxContainerContainerServiceImpl implements ItxContainerContainerSe
 
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
-	
+
 	@Override
 	@Transactional
-	public ItxContainerContainer saveLsItxContainer(ItxContainerContainer itxContainer){
-		if (logger.isDebugEnabled()) logger.debug("incoming meta itxContainerContainer: " + itxContainer.toJson() + "\n");
+	public ItxContainerContainer saveLsItxContainer(ItxContainerContainer itxContainer) {
+		if (logger.isDebugEnabled())
+			logger.debug("incoming meta itxContainerContainer: " + itxContainer.toJson() + "\n");
 		int i = 0;
 		int j = 0;
 		int batchSize = propertiesUtilService.getBatchSize();
 		ItxContainerContainer newItxContainer = new ItxContainerContainer(itxContainer);
 		newItxContainer.persist();
 
-		if (itxContainer.getLsStates() != null){
-			for(ItxContainerContainerState itxState : itxContainer.getLsStates()){
+		if (itxContainer.getLsStates() != null) {
+			for (ItxContainerContainerState itxState : itxContainer.getLsStates()) {
 				ItxContainerContainerState newItxState = new ItxContainerContainerState(itxState);
 				newItxState.setItxContainerContainer(newItxContainer);
 				newItxState.persist();
-			    if ( j % batchSize == 0 ) { // same as the JDBC batch size
-			    	newItxState.flush();
-			    	newItxState.clear();
-			    }
-			    j++;
-				if (itxState.getLsValues() != null){
-					for(ItxContainerContainerValue itxValue : itxState.getLsValues()){
+				if (j % batchSize == 0) { // same as the JDBC batch size
+					newItxState.flush();
+					newItxState.clear();
+				}
+				j++;
+				if (itxState.getLsValues() != null) {
+					for (ItxContainerContainerValue itxValue : itxState.getLsValues()) {
 						itxValue.setLsState(newItxState);
 						itxValue.persist();
-					    if ( i % batchSize == 0 ) { // same as the JDBC batch size
-					    	itxValue.flush();
-					    	itxValue.clear();
-					    }
-					    i++;
-					}				
-				} 
+						if (i % batchSize == 0) { // same as the JDBC batch size
+							itxValue.flush();
+							itxValue.clear();
+						}
+						i++;
+					}
+				}
 			}
 		}
-		
+
 		return newItxContainer;
 	}
 
 	@Override
 	@Transactional
-	public Collection<ItxContainerContainer> saveLsItxContainers(String json){
+	public Collection<ItxContainerContainer> saveLsItxContainers(String json) {
 		int i = 0;
 		int j = 0;
 		int batchSize = propertiesUtilService.getBatchSize();
-        Collection<ItxContainerContainer> savedItxContainerContainers = new ArrayList<ItxContainerContainer>();
+		Collection<ItxContainerContainer> savedItxContainerContainers = new ArrayList<ItxContainerContainer>();
 
-        StringReader sr = new StringReader(json);
+		StringReader sr = new StringReader(json);
 		BufferedReader br = new BufferedReader(sr);
-        for (ItxContainerContainer itxContainer : ItxContainerContainer.fromJsonArrayToItxContainerContainers(br)) {
-    		ItxContainerContainer newItxContainer = new ItxContainerContainer(itxContainer);
-    		newItxContainer.persist();
-    		savedItxContainerContainers.add(newItxContainer);
-    		if (itxContainer.getLsStates() != null){
-    			for(ItxContainerContainerState itxState : itxContainer.getLsStates()){
-    				ItxContainerContainerState newItxState = new ItxContainerContainerState(itxState);
-    				newItxState.setItxContainerContainer(newItxContainer);
-    				newItxState.persist();
-    			    if ( j % batchSize == 0 ) { // same as the JDBC batch size
-    			    	newItxState.flush();
-    			    	newItxState.clear();
-    			    }
-    			    j++;
-    				if (itxState.getLsValues() != null){
-    					for(ItxContainerContainerValue itxValue : itxState.getLsValues()){
-    						itxValue.setLsState(newItxState);
-    						itxValue.persist();
-    					    if ( i % batchSize == 0 ) {
-    					    	itxValue.flush();
-    					    	itxValue.clear();
-    					    }
-    					    i++;
-    					}				
-    				} 
-    			}
-    		}
-        }
-		
+		for (ItxContainerContainer itxContainer : ItxContainerContainer.fromJsonArrayToItxContainerContainers(br)) {
+			ItxContainerContainer newItxContainer = new ItxContainerContainer(itxContainer);
+			newItxContainer.persist();
+			savedItxContainerContainers.add(newItxContainer);
+			if (itxContainer.getLsStates() != null) {
+				for (ItxContainerContainerState itxState : itxContainer.getLsStates()) {
+					ItxContainerContainerState newItxState = new ItxContainerContainerState(itxState);
+					newItxState.setItxContainerContainer(newItxContainer);
+					newItxState.persist();
+					if (j % batchSize == 0) { // same as the JDBC batch size
+						newItxState.flush();
+						newItxState.clear();
+					}
+					j++;
+					if (itxState.getLsValues() != null) {
+						for (ItxContainerContainerValue itxValue : itxState.getLsValues()) {
+							itxValue.setLsState(newItxState);
+							itxValue.persist();
+							if (i % batchSize == 0) {
+								itxValue.flush();
+								itxValue.clear();
+							}
+							i++;
+						}
+					}
+				}
+			}
+		}
+
 		return savedItxContainerContainers;
 	}
 
@@ -108,60 +109,66 @@ public Collection<ItxContainerContainer> saveLsItxContainers(String json){
 	public Collection<ItxContainerContainer> saveLsItxContainers(
 			Collection<ItxContainerContainer> itxContainerContainers) {
 		Collection<ItxContainerContainer> savedItxContainerContainers = new ArrayList<ItxContainerContainer>();
-		for (ItxContainerContainer itxContainerContainer : itxContainerContainers){
+		for (ItxContainerContainer itxContainerContainer : itxContainerContainers) {
 			savedItxContainerContainers.add(saveLsItxContainer(itxContainerContainer));
 		}
 		return savedItxContainerContainers;
 	}
-	
+
 	@Override
 	@Transactional
-	public ItxContainerContainer updateItxContainerContainer(ItxContainerContainer jsonItxContainerContainer){
-		
-		ItxContainerContainer updatedItxContainerContainer = ItxContainerContainer.updateNoStates(jsonItxContainerContainer);
+	public ItxContainerContainer updateItxContainerContainer(ItxContainerContainer jsonItxContainerContainer) {
+
+		ItxContainerContainer updatedItxContainerContainer = ItxContainerContainer
+				.updateNoStates(jsonItxContainerContainer);
 		updatedItxContainerContainer.merge();
 		logger.debug("here is the updated itx: " + updatedItxContainerContainer.toJson());
 		logger.debug("----------------- here is the itx id " + updatedItxContainerContainer.getId() + "   -----------");
-		
-		if(jsonItxContainerContainer.getLsStates() != null){
-			for(ItxContainerContainerState itxContainerContainerState : jsonItxContainerContainer.getLsStates()){
+
+		if (jsonItxContainerContainer.getLsStates() != null) {
+			for (ItxContainerContainerState itxContainerContainerState : jsonItxContainerContainer.getLsStates()) {
 				logger.debug("-------- current itxContainerContainerState ID: " + itxContainerContainerState.getId());
 				ItxContainerContainerState updatedItxContainerContainerState;
-				if (itxContainerContainerState.getId() == null){
+				if (itxContainerContainerState.getId() == null) {
 					updatedItxContainerContainerState = new ItxContainerContainerState(itxContainerContainerState);
-					updatedItxContainerContainerState.setItxContainerContainer(ItxContainerContainer.findItxContainerContainer(updatedItxContainerContainer.getId()));
+					updatedItxContainerContainerState.setItxContainerContainer(
+							ItxContainerContainer.findItxContainerContainer(updatedItxContainerContainer.getId()));
 					updatedItxContainerContainerState.persist();
 					updatedItxContainerContainer.getLsStates().add(updatedItxContainerContainerState);
 				} else {
 
-					if (itxContainerContainerState.getItxContainerContainer() == null) itxContainerContainerState.setItxContainerContainer(updatedItxContainerContainer);
-					updatedItxContainerContainerState = ItxContainerContainerState.update(itxContainerContainerState);			
+					if (itxContainerContainerState.getItxContainerContainer() == null)
+						itxContainerContainerState.setItxContainerContainer(updatedItxContainerContainer);
+					updatedItxContainerContainerState = ItxContainerContainerState.update(itxContainerContainerState);
 					updatedItxContainerContainer.getLsStates().add(updatedItxContainerContainerState);
 					logger.debug("updated itxContainerContainer state " + updatedItxContainerContainerState.getId());
 
 				}
-				if (itxContainerContainerState.getLsValues() != null){
-					for(ItxContainerContainerValue itxContainerContainerValue : itxContainerContainerState.getLsValues()){
+				if (itxContainerContainerState.getLsValues() != null) {
+					for (ItxContainerContainerValue itxContainerContainerValue : itxContainerContainerState
+							.getLsValues()) {
 						ItxContainerContainerValue updatedItxContainerContainerValue;
-						if (itxContainerContainerValue.getId() == null){
-							updatedItxContainerContainerValue = ItxContainerContainerValue.create(itxContainerContainerValue);
+						if (itxContainerContainerValue.getId() == null) {
+							updatedItxContainerContainerValue = ItxContainerContainerValue
+									.create(itxContainerContainerValue);
 							updatedItxContainerContainerValue.setLsState(updatedItxContainerContainerState);
 							updatedItxContainerContainerValue.persist();
 							updatedItxContainerContainerState.getLsValues().add(updatedItxContainerContainerValue);
 
 						} else {
-							//itxContainerContainerValue.setLsState(updatedItxContainerContainerState);
+							// itxContainerContainerValue.setLsState(updatedItxContainerContainerState);
 							itxContainerContainerValue.setLsState(updatedItxContainerContainerState);
-							updatedItxContainerContainerValue = ItxContainerContainerValue.update(itxContainerContainerValue);
+							updatedItxContainerContainerValue = ItxContainerContainerValue
+									.update(itxContainerContainerValue);
 							updatedItxContainerContainerState.getLsValues().add(updatedItxContainerContainerValue);
 						}
-					}	
+					}
 				} else {
 					logger.debug("No itxContainerContainer values to update");
 				}
 			}
 		}
-		
+
 		return updatedItxContainerContainer;
 	}
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ItxContainerContainerStateServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ItxContainerContainerStateServiceImpl.java
index eb8629dfb..a22973bcf 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxContainerContainerStateServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxContainerContainerStateServiceImpl.java
@@ -22,8 +22,10 @@ public class ItxContainerContainerStateServiceImpl implements ItxContainerContai
 	private PropertiesUtilService propertiesUtilService;
 
 	@Override
-	public ItxContainerContainerState updateItxContainerContainerState(ItxContainerContainerState itxContainerContainerState) {
-		itxContainerContainerState.setVersion(ItxContainerContainerState.findItxContainerContainerState(itxContainerContainerState.getId()).getVersion());
+	public ItxContainerContainerState updateItxContainerContainerState(
+			ItxContainerContainerState itxContainerContainerState) {
+		itxContainerContainerState.setVersion(ItxContainerContainerState
+				.findItxContainerContainerState(itxContainerContainerState.getId()).getVersion());
 		itxContainerContainerState.merge();
 		return itxContainerContainerState;
 	}
@@ -31,15 +33,17 @@ public ItxContainerContainerState updateItxContainerContainerState(ItxContainerC
 	@Override
 	public Collection<ItxContainerContainerState> updateItxContainerContainerStates(
 			Collection<ItxContainerContainerState> itxContainerContainerStates) {
-		for (ItxContainerContainerState itxContainerContainerState : itxContainerContainerStates){
+		for (ItxContainerContainerState itxContainerContainerState : itxContainerContainerStates) {
 			itxContainerContainerState = updateItxContainerContainerState(itxContainerContainerState);
 		}
 		return null;
 	}
 
 	@Override
-	public ItxContainerContainerState saveItxContainerContainerState(ItxContainerContainerState itxContainerContainerState) {
-		itxContainerContainerState.setItxContainerContainer(ItxContainerContainer.findItxContainerContainer(itxContainerContainerState.getItxContainerContainer().getId()));		
+	public ItxContainerContainerState saveItxContainerContainerState(
+			ItxContainerContainerState itxContainerContainerState) {
+		itxContainerContainerState.setItxContainerContainer(ItxContainerContainer
+				.findItxContainerContainer(itxContainerContainerState.getItxContainerContainer().getId()));
 		itxContainerContainerState.persist();
 		return itxContainerContainerState;
 	}
@@ -47,12 +51,10 @@ public ItxContainerContainerState saveItxContainerContainerState(ItxContainerCon
 	@Override
 	public Collection<ItxContainerContainerState> saveItxContainerContainerStates(
 			Collection<ItxContainerContainerState> itxContainerContainerStates) {
-		for (ItxContainerContainerState itxContainerContainerState: itxContainerContainerStates) {
+		for (ItxContainerContainerState itxContainerContainerState : itxContainerContainerStates) {
 			itxContainerContainerState = saveItxContainerContainerState(itxContainerContainerState);
 		}
 		return itxContainerContainerStates;
 	}
 
-
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ItxContainerContainerValueServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ItxContainerContainerValueServiceImpl.java
index ed55f8f16..70ab09b97 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxContainerContainerValueServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxContainerContainerValueServiceImpl.java
@@ -22,8 +22,10 @@ public class ItxContainerContainerValueServiceImpl implements ItxContainerContai
 	private PropertiesUtilService propertiesUtilService;
 
 	@Override
-	public ItxContainerContainerValue updateItxContainerContainerValue(ItxContainerContainerValue itxContainerContainerValue) {
-		itxContainerContainerValue.setVersion(ItxContainerContainerValue.findItxContainerContainerValue(itxContainerContainerValue.getId()).getVersion());
+	public ItxContainerContainerValue updateItxContainerContainerValue(
+			ItxContainerContainerValue itxContainerContainerValue) {
+		itxContainerContainerValue.setVersion(ItxContainerContainerValue
+				.findItxContainerContainerValue(itxContainerContainerValue.getId()).getVersion());
 		itxContainerContainerValue.merge();
 		return itxContainerContainerValue;
 	}
@@ -31,15 +33,17 @@ public ItxContainerContainerValue updateItxContainerContainerValue(ItxContainerC
 	@Override
 	public Collection<ItxContainerContainerValue> updateItxContainerContainerValues(
 			Collection<ItxContainerContainerValue> itxContainerContainerValues) {
-		for (ItxContainerContainerValue itxContainerContainerValue : itxContainerContainerValues){
+		for (ItxContainerContainerValue itxContainerContainerValue : itxContainerContainerValues) {
 			itxContainerContainerValue = updateItxContainerContainerValue(itxContainerContainerValue);
 		}
 		return null;
 	}
 
 	@Override
-	public ItxContainerContainerValue saveItxContainerContainerValue(ItxContainerContainerValue itxContainerContainerValue) {
-		itxContainerContainerValue.setLsState(ItxContainerContainerState.findItxContainerContainerState(itxContainerContainerValue.getLsState().getId()));		
+	public ItxContainerContainerValue saveItxContainerContainerValue(
+			ItxContainerContainerValue itxContainerContainerValue) {
+		itxContainerContainerValue.setLsState(ItxContainerContainerState
+				.findItxContainerContainerState(itxContainerContainerValue.getLsState().getId()));
 		itxContainerContainerValue.persist();
 		return itxContainerContainerValue;
 	}
@@ -47,12 +51,10 @@ public ItxContainerContainerValue saveItxContainerContainerValue(ItxContainerCon
 	@Override
 	public Collection<ItxContainerContainerValue> saveItxContainerContainerValues(
 			Collection<ItxContainerContainerValue> itxContainerContainerValues) {
-		for (ItxContainerContainerValue itxContainerContainerValue: itxContainerContainerValues) {
+		for (ItxContainerContainerValue itxContainerContainerValue : itxContainerContainerValues) {
 			itxContainerContainerValue = saveItxContainerContainerValue(itxContainerContainerValue);
 		}
 		return itxContainerContainerValues;
 	}
 
-
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentService.java b/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentService.java
index 777ea1303..1042abab1 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentService.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentService.java
@@ -12,12 +12,11 @@ public interface ItxExperimentExperimentService {
 	ItxExperimentExperiment saveLsItxExperiment(ItxExperimentExperiment itxExperiment) throws Exception;
 
 	Collection<ItxExperimentExperiment> saveLsItxExperiments(String json);
-	
-	Collection<ItxExperimentExperiment> saveLsItxExperiments(Collection<ItxExperimentExperiment> itxExperimentExperiments) throws Exception;
+
+	Collection<ItxExperimentExperiment> saveLsItxExperiments(
+			Collection<ItxExperimentExperiment> itxExperimentExperiments) throws Exception;
 
 	ItxExperimentExperiment updateItxExperimentExperiment(
 			ItxExperimentExperiment jsonItxExperimentExperiment);
-	
-	
-	
+
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentServiceImpl.java
index 49fe1e9e9..5bb6fd7d9 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentServiceImpl.java
@@ -25,15 +25,15 @@ public class ItxExperimentExperimentServiceImpl implements ItxExperimentExperime
 
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
-	
+
 	@Override
 	@Transactional
-	public ItxExperimentExperiment saveLsItxExperiment(ItxExperimentExperiment itxExperiment) throws Exception{
+	public ItxExperimentExperiment saveLsItxExperiment(ItxExperimentExperiment itxExperiment) throws Exception {
 		logger.debug("incoming meta itxExperimentExperiment: " + itxExperiment.toJson() + "\n");
-		try{
+		try {
 			itxExperiment.setFirstExperiment(Experiment.findExperiment(itxExperiment.getFirstExperiment().getId()));
 			itxExperiment.setSecondExperiment(Experiment.findExperiment(itxExperiment.getSecondExperiment().getId()));
-		}catch (Exception e){
+		} catch (Exception e) {
 			throw new Exception("One or both of the provided experiment do not exist");
 		}
 		int i = 0;
@@ -42,72 +42,73 @@ public ItxExperimentExperiment saveLsItxExperiment(ItxExperimentExperiment itxEx
 		ItxExperimentExperiment newItxExperiment = new ItxExperimentExperiment(itxExperiment);
 		newItxExperiment.persist();
 
-		if (itxExperiment.getLsStates() != null){
-			for(ItxExperimentExperimentState itxState : itxExperiment.getLsStates()){
+		if (itxExperiment.getLsStates() != null) {
+			for (ItxExperimentExperimentState itxState : itxExperiment.getLsStates()) {
 				ItxExperimentExperimentState newItxState = new ItxExperimentExperimentState(itxState);
 				newItxState.setItxExperimentExperiment(newItxExperiment);
 				newItxState.persist();
-			    if ( j % batchSize == 0 ) { // same as the JDBC batch size
-			    	newItxState.flush();
-			    	newItxState.clear();
-			    }
-			    j++;
-				if (itxState.getLsValues() != null){
-					for(ItxExperimentExperimentValue itxValue : itxState.getLsValues()){
+				if (j % batchSize == 0) { // same as the JDBC batch size
+					newItxState.flush();
+					newItxState.clear();
+				}
+				j++;
+				if (itxState.getLsValues() != null) {
+					for (ItxExperimentExperimentValue itxValue : itxState.getLsValues()) {
 						itxValue.setLsState(newItxState);
 						itxValue.persist();
-					    if ( i % batchSize == 0 ) { // same as the JDBC batch size
-					    	itxValue.flush();
-					    	itxValue.clear();
-					    }
-					    i++;
-					}				
-				} 
+						if (i % batchSize == 0) { // same as the JDBC batch size
+							itxValue.flush();
+							itxValue.clear();
+						}
+						i++;
+					}
+				}
 			}
 		}
-		
+
 		return newItxExperiment;
 	}
 
 	@Override
 	@Transactional
-	public Collection<ItxExperimentExperiment> saveLsItxExperiments(String json){
+	public Collection<ItxExperimentExperiment> saveLsItxExperiments(String json) {
 		int i = 0;
 		int j = 0;
 		int batchSize = propertiesUtilService.getBatchSize();
-        Collection<ItxExperimentExperiment> savedItxExperimentExperiments = new ArrayList<ItxExperimentExperiment>();
+		Collection<ItxExperimentExperiment> savedItxExperimentExperiments = new ArrayList<ItxExperimentExperiment>();
 
-        StringReader sr = new StringReader(json);
+		StringReader sr = new StringReader(json);
 		BufferedReader br = new BufferedReader(sr);
-        for (ItxExperimentExperiment itxExperiment : ItxExperimentExperiment.fromJsonArrayToItxExperimentExperiments(br)) {
-    		ItxExperimentExperiment newItxExperiment = new ItxExperimentExperiment(itxExperiment);
-    		newItxExperiment.persist();
-    		savedItxExperimentExperiments.add(newItxExperiment);
-    		if (itxExperiment.getLsStates() != null){
-    			for(ItxExperimentExperimentState itxState : itxExperiment.getLsStates()){
-    				ItxExperimentExperimentState newItxState = new ItxExperimentExperimentState(itxState);
-    				newItxState.setItxExperimentExperiment(newItxExperiment);
-    				newItxState.persist();
-    			    if ( j % batchSize == 0 ) { // same as the JDBC batch size
-    			    	newItxState.flush();
-    			    	newItxState.clear();
-    			    }
-    			    j++;
-    				if (itxState.getLsValues() != null){
-    					for(ItxExperimentExperimentValue itxValue : itxState.getLsValues()){
-    						itxValue.setLsState(newItxState);
-    						itxValue.persist();
-    					    if ( i % batchSize == 0 ) {
-    					    	itxValue.flush();
-    					    	itxValue.clear();
-    					    }
-    					    i++;
-    					}				
-    				} 
-    			}
-    		}
-        }
-		
+		for (ItxExperimentExperiment itxExperiment : ItxExperimentExperiment
+				.fromJsonArrayToItxExperimentExperiments(br)) {
+			ItxExperimentExperiment newItxExperiment = new ItxExperimentExperiment(itxExperiment);
+			newItxExperiment.persist();
+			savedItxExperimentExperiments.add(newItxExperiment);
+			if (itxExperiment.getLsStates() != null) {
+				for (ItxExperimentExperimentState itxState : itxExperiment.getLsStates()) {
+					ItxExperimentExperimentState newItxState = new ItxExperimentExperimentState(itxState);
+					newItxState.setItxExperimentExperiment(newItxExperiment);
+					newItxState.persist();
+					if (j % batchSize == 0) { // same as the JDBC batch size
+						newItxState.flush();
+						newItxState.clear();
+					}
+					j++;
+					if (itxState.getLsValues() != null) {
+						for (ItxExperimentExperimentValue itxValue : itxState.getLsValues()) {
+							itxValue.setLsState(newItxState);
+							itxValue.persist();
+							if (i % batchSize == 0) {
+								itxValue.flush();
+								itxValue.clear();
+							}
+							i++;
+						}
+					}
+				}
+			}
+		}
+
 		return savedItxExperimentExperiments;
 	}
 
@@ -115,60 +116,72 @@ public Collection<ItxExperimentExperiment> saveLsItxExperiments(String json){
 	public Collection<ItxExperimentExperiment> saveLsItxExperiments(
 			Collection<ItxExperimentExperiment> itxExperimentExperiments) throws Exception {
 		Collection<ItxExperimentExperiment> savedItxExperimentExperiments = new ArrayList<ItxExperimentExperiment>();
-		for (ItxExperimentExperiment itxExperimentExperiment : itxExperimentExperiments){
+		for (ItxExperimentExperiment itxExperimentExperiment : itxExperimentExperiments) {
 			savedItxExperimentExperiments.add(saveLsItxExperiment(itxExperimentExperiment));
 		}
 		return savedItxExperimentExperiments;
 	}
-	
+
 	@Override
 	@Transactional
-	public ItxExperimentExperiment updateItxExperimentExperiment(ItxExperimentExperiment jsonItxExperimentExperiment){
-		
-		ItxExperimentExperiment updatedItxExperimentExperiment = ItxExperimentExperiment.updateNoStates(jsonItxExperimentExperiment);
+	public ItxExperimentExperiment updateItxExperimentExperiment(ItxExperimentExperiment jsonItxExperimentExperiment) {
+
+		ItxExperimentExperiment updatedItxExperimentExperiment = ItxExperimentExperiment
+				.updateNoStates(jsonItxExperimentExperiment);
 		updatedItxExperimentExperiment.merge();
 		logger.debug("here is the updated itx: " + updatedItxExperimentExperiment.toJson());
-		logger.debug("----------------- here is the itx id " + updatedItxExperimentExperiment.getId() + "   -----------");
-		
-		if(jsonItxExperimentExperiment.getLsStates() != null){
-			for(ItxExperimentExperimentState itxExperimentExperimentState : jsonItxExperimentExperiment.getLsStates()){
-				logger.debug("-------- current itxExperimentExperimentState ID: " + itxExperimentExperimentState.getId());
+		logger.debug(
+				"----------------- here is the itx id " + updatedItxExperimentExperiment.getId() + "   -----------");
+
+		if (jsonItxExperimentExperiment.getLsStates() != null) {
+			for (ItxExperimentExperimentState itxExperimentExperimentState : jsonItxExperimentExperiment
+					.getLsStates()) {
+				logger.debug(
+						"-------- current itxExperimentExperimentState ID: " + itxExperimentExperimentState.getId());
 				ItxExperimentExperimentState updatedItxExperimentExperimentState;
-				if (itxExperimentExperimentState.getId() == null){
-					updatedItxExperimentExperimentState = new ItxExperimentExperimentState(itxExperimentExperimentState);
-					updatedItxExperimentExperimentState.setItxExperimentExperiment(ItxExperimentExperiment.findItxExperimentExperiment(updatedItxExperimentExperiment.getId()));
+				if (itxExperimentExperimentState.getId() == null) {
+					updatedItxExperimentExperimentState = new ItxExperimentExperimentState(
+							itxExperimentExperimentState);
+					updatedItxExperimentExperimentState.setItxExperimentExperiment(ItxExperimentExperiment
+							.findItxExperimentExperiment(updatedItxExperimentExperiment.getId()));
 					updatedItxExperimentExperimentState.persist();
 					updatedItxExperimentExperiment.getLsStates().add(updatedItxExperimentExperimentState);
 				} else {
 
-					if (itxExperimentExperimentState.getItxExperimentExperiment() == null) itxExperimentExperimentState.setItxExperimentExperiment(updatedItxExperimentExperiment);
-					updatedItxExperimentExperimentState = ItxExperimentExperimentState.update(itxExperimentExperimentState);			
+					if (itxExperimentExperimentState.getItxExperimentExperiment() == null)
+						itxExperimentExperimentState.setItxExperimentExperiment(updatedItxExperimentExperiment);
+					updatedItxExperimentExperimentState = ItxExperimentExperimentState
+							.update(itxExperimentExperimentState);
 					updatedItxExperimentExperiment.getLsStates().add(updatedItxExperimentExperimentState);
-					logger.debug("updated itxExperimentExperiment state " + updatedItxExperimentExperimentState.getId());
+					logger.debug(
+							"updated itxExperimentExperiment state " + updatedItxExperimentExperimentState.getId());
 
 				}
-				if (itxExperimentExperimentState.getLsValues() != null){
-					for(ItxExperimentExperimentValue itxExperimentExperimentValue : itxExperimentExperimentState.getLsValues()){
+				if (itxExperimentExperimentState.getLsValues() != null) {
+					for (ItxExperimentExperimentValue itxExperimentExperimentValue : itxExperimentExperimentState
+							.getLsValues()) {
 						ItxExperimentExperimentValue updatedItxExperimentExperimentValue;
-						if (itxExperimentExperimentValue.getId() == null){
-							updatedItxExperimentExperimentValue = ItxExperimentExperimentValue.create(itxExperimentExperimentValue);
+						if (itxExperimentExperimentValue.getId() == null) {
+							updatedItxExperimentExperimentValue = ItxExperimentExperimentValue
+									.create(itxExperimentExperimentValue);
 							updatedItxExperimentExperimentValue.setLsState(updatedItxExperimentExperimentState);
 							updatedItxExperimentExperimentValue.persist();
 							updatedItxExperimentExperimentState.getLsValues().add(updatedItxExperimentExperimentValue);
 
 						} else {
-							//itxExperimentExperimentValue.setLsState(updatedItxExperimentExperimentState);
+							// itxExperimentExperimentValue.setLsState(updatedItxExperimentExperimentState);
 							itxExperimentExperimentValue.setLsState(updatedItxExperimentExperimentState);
-							updatedItxExperimentExperimentValue = ItxExperimentExperimentValue.update(itxExperimentExperimentValue);
+							updatedItxExperimentExperimentValue = ItxExperimentExperimentValue
+									.update(itxExperimentExperimentValue);
 							updatedItxExperimentExperimentState.getLsValues().add(updatedItxExperimentExperimentValue);
 						}
-					}	
+					}
 				} else {
 					logger.debug("No itxExperimentExperiment values to update");
 				}
 			}
 		}
-		
+
 		return updatedItxExperimentExperiment;
 	}
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentStateService.java b/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentStateService.java
index aed62ab02..516403b9d 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentStateService.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentStateService.java
@@ -9,12 +9,14 @@
 @Service
 public interface ItxExperimentExperimentStateService {
 
-	ItxExperimentExperimentState updateItxExperimentExperimentState(ItxExperimentExperimentState itxExperimentExperimentState);
+	ItxExperimentExperimentState updateItxExperimentExperimentState(
+			ItxExperimentExperimentState itxExperimentExperimentState);
 
 	Collection<ItxExperimentExperimentState> updateItxExperimentExperimentStates(
 			Collection<ItxExperimentExperimentState> itxExperimentExperimentStates);
 
-	ItxExperimentExperimentState saveItxExperimentExperimentState(ItxExperimentExperimentState itxExperimentExperimentState);
+	ItxExperimentExperimentState saveItxExperimentExperimentState(
+			ItxExperimentExperimentState itxExperimentExperimentState);
 
 	Collection<ItxExperimentExperimentState> saveItxExperimentExperimentStates(
 			Collection<ItxExperimentExperimentState> itxExperimentExperimentStates);
diff --git a/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentStateServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentStateServiceImpl.java
index 226132229..e2f47ddb5 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentStateServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentStateServiceImpl.java
@@ -22,8 +22,10 @@ public class ItxExperimentExperimentStateServiceImpl implements ItxExperimentExp
 	private PropertiesUtilService propertiesUtilService;
 
 	@Override
-	public ItxExperimentExperimentState updateItxExperimentExperimentState(ItxExperimentExperimentState itxExperimentExperimentState) {
-		itxExperimentExperimentState.setVersion(ItxExperimentExperimentState.findItxExperimentExperimentState(itxExperimentExperimentState.getId()).getVersion());
+	public ItxExperimentExperimentState updateItxExperimentExperimentState(
+			ItxExperimentExperimentState itxExperimentExperimentState) {
+		itxExperimentExperimentState.setVersion(ItxExperimentExperimentState
+				.findItxExperimentExperimentState(itxExperimentExperimentState.getId()).getVersion());
 		itxExperimentExperimentState.merge();
 		return itxExperimentExperimentState;
 	}
@@ -31,15 +33,17 @@ public ItxExperimentExperimentState updateItxExperimentExperimentState(ItxExperi
 	@Override
 	public Collection<ItxExperimentExperimentState> updateItxExperimentExperimentStates(
 			Collection<ItxExperimentExperimentState> itxExperimentExperimentStates) {
-		for (ItxExperimentExperimentState itxExperimentExperimentState : itxExperimentExperimentStates){
+		for (ItxExperimentExperimentState itxExperimentExperimentState : itxExperimentExperimentStates) {
 			itxExperimentExperimentState = updateItxExperimentExperimentState(itxExperimentExperimentState);
 		}
 		return null;
 	}
 
 	@Override
-	public ItxExperimentExperimentState saveItxExperimentExperimentState(ItxExperimentExperimentState itxExperimentExperimentState) {
-		itxExperimentExperimentState.setItxExperimentExperiment(ItxExperimentExperiment.findItxExperimentExperiment(itxExperimentExperimentState.getItxExperimentExperiment().getId()));		
+	public ItxExperimentExperimentState saveItxExperimentExperimentState(
+			ItxExperimentExperimentState itxExperimentExperimentState) {
+		itxExperimentExperimentState.setItxExperimentExperiment(ItxExperimentExperiment
+				.findItxExperimentExperiment(itxExperimentExperimentState.getItxExperimentExperiment().getId()));
 		itxExperimentExperimentState.persist();
 		return itxExperimentExperimentState;
 	}
@@ -47,12 +51,10 @@ public ItxExperimentExperimentState saveItxExperimentExperimentState(ItxExperime
 	@Override
 	public Collection<ItxExperimentExperimentState> saveItxExperimentExperimentStates(
 			Collection<ItxExperimentExperimentState> itxExperimentExperimentStates) {
-		for (ItxExperimentExperimentState itxExperimentExperimentState: itxExperimentExperimentStates) {
+		for (ItxExperimentExperimentState itxExperimentExperimentState : itxExperimentExperimentStates) {
 			itxExperimentExperimentState = saveItxExperimentExperimentState(itxExperimentExperimentState);
 		}
 		return itxExperimentExperimentStates;
 	}
 
-
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentValueService.java b/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentValueService.java
index bffc3381d..569ad4396 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentValueService.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentValueService.java
@@ -9,12 +9,14 @@
 @Service
 public interface ItxExperimentExperimentValueService {
 
-	ItxExperimentExperimentValue updateItxExperimentExperimentValue(ItxExperimentExperimentValue itxExperimentExperimentValue);
+	ItxExperimentExperimentValue updateItxExperimentExperimentValue(
+			ItxExperimentExperimentValue itxExperimentExperimentValue);
 
 	Collection<ItxExperimentExperimentValue> updateItxExperimentExperimentValues(
 			Collection<ItxExperimentExperimentValue> itxExperimentExperimentValues);
 
-	ItxExperimentExperimentValue saveItxExperimentExperimentValue(ItxExperimentExperimentValue itxExperimentExperimentValue);
+	ItxExperimentExperimentValue saveItxExperimentExperimentValue(
+			ItxExperimentExperimentValue itxExperimentExperimentValue);
 
 	Collection<ItxExperimentExperimentValue> saveItxExperimentExperimentValues(
 			Collection<ItxExperimentExperimentValue> itxExperimentExperimentValues);
diff --git a/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentValueServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentValueServiceImpl.java
index 3ed1b9486..88b7022ef 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentValueServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxExperimentExperimentValueServiceImpl.java
@@ -22,8 +22,10 @@ public class ItxExperimentExperimentValueServiceImpl implements ItxExperimentExp
 	private PropertiesUtilService propertiesUtilService;
 
 	@Override
-	public ItxExperimentExperimentValue updateItxExperimentExperimentValue(ItxExperimentExperimentValue itxExperimentExperimentValue) {
-		itxExperimentExperimentValue.setVersion(ItxExperimentExperimentValue.findItxExperimentExperimentValue(itxExperimentExperimentValue.getId()).getVersion());
+	public ItxExperimentExperimentValue updateItxExperimentExperimentValue(
+			ItxExperimentExperimentValue itxExperimentExperimentValue) {
+		itxExperimentExperimentValue.setVersion(ItxExperimentExperimentValue
+				.findItxExperimentExperimentValue(itxExperimentExperimentValue.getId()).getVersion());
 		itxExperimentExperimentValue.merge();
 		return itxExperimentExperimentValue;
 	}
@@ -31,15 +33,17 @@ public ItxExperimentExperimentValue updateItxExperimentExperimentValue(ItxExperi
 	@Override
 	public Collection<ItxExperimentExperimentValue> updateItxExperimentExperimentValues(
 			Collection<ItxExperimentExperimentValue> itxExperimentExperimentValues) {
-		for (ItxExperimentExperimentValue itxExperimentExperimentValue : itxExperimentExperimentValues){
+		for (ItxExperimentExperimentValue itxExperimentExperimentValue : itxExperimentExperimentValues) {
 			itxExperimentExperimentValue = updateItxExperimentExperimentValue(itxExperimentExperimentValue);
 		}
 		return null;
 	}
 
 	@Override
-	public ItxExperimentExperimentValue saveItxExperimentExperimentValue(ItxExperimentExperimentValue itxExperimentExperimentValue) {
-		itxExperimentExperimentValue.setLsState(ItxExperimentExperimentState.findItxExperimentExperimentState(itxExperimentExperimentValue.getLsState().getId()));		
+	public ItxExperimentExperimentValue saveItxExperimentExperimentValue(
+			ItxExperimentExperimentValue itxExperimentExperimentValue) {
+		itxExperimentExperimentValue.setLsState(ItxExperimentExperimentState
+				.findItxExperimentExperimentState(itxExperimentExperimentValue.getLsState().getId()));
 		itxExperimentExperimentValue.persist();
 		return itxExperimentExperimentValue;
 	}
@@ -47,12 +51,10 @@ public ItxExperimentExperimentValue saveItxExperimentExperimentValue(ItxExperime
 	@Override
 	public Collection<ItxExperimentExperimentValue> saveItxExperimentExperimentValues(
 			Collection<ItxExperimentExperimentValue> itxExperimentExperimentValues) {
-		for (ItxExperimentExperimentValue itxExperimentExperimentValue: itxExperimentExperimentValues) {
+		for (ItxExperimentExperimentValue itxExperimentExperimentValue : itxExperimentExperimentValues) {
 			itxExperimentExperimentValue = saveItxExperimentExperimentValue(itxExperimentExperimentValue);
 		}
 		return itxExperimentExperimentValues;
 	}
 
-
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ItxLsThingLsThingService.java b/src/main/java/com/labsynch/labseer/service/ItxLsThingLsThingService.java
index 99d4ce7b6..a2a78fe11 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxLsThingLsThingService.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxLsThingLsThingService.java
@@ -16,6 +16,4 @@ public interface ItxLsThingLsThingService {
 
 	Collection<CodeTableDTO> convertToCodeTables(Collection<ItxLsThingLsThing> itxLsThingLsThings);
 
-	
-	
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ItxLsThingLsThingServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ItxLsThingLsThingServiceImpl.java
index 709ad6486..c3c046bca 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxLsThingLsThingServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxLsThingLsThingServiceImpl.java
@@ -24,35 +24,36 @@ public class ItxLsThingLsThingServiceImpl implements ItxLsThingLsThingService {
 
 	@Autowired
 	private AutoLabelService autoLabelService;
-	
+
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
-	
-	
+
 	@Override
-	public ItxLsThingLsThing saveItxLsThingLsThing(ItxLsThingLsThing itxLsThingLsThing){
+	public ItxLsThingLsThing saveItxLsThingLsThing(ItxLsThingLsThing itxLsThingLsThing) {
 		ItxLsThingLsThing newItxLsThingLsThing = new ItxLsThingLsThing(itxLsThingLsThing);
 		newItxLsThingLsThing.persist();
 
-		if(itxLsThingLsThing.getLsStates() != null){
+		if (itxLsThingLsThing.getLsStates() != null) {
 			Set<ItxLsThingLsThingState> lsStates = new HashSet<ItxLsThingLsThingState>();
-			for(ItxLsThingLsThingState itxLsThingLsThingState : itxLsThingLsThing.getLsStates()){
+			for (ItxLsThingLsThingState itxLsThingLsThingState : itxLsThingLsThing.getLsStates()) {
 				ItxLsThingLsThingState newItxLsThingLsThingState = new ItxLsThingLsThingState(itxLsThingLsThingState);
 				newItxLsThingLsThingState.setItxLsThingLsThing(newItxLsThingLsThing);
-				logger.debug("here is the newItxLsThingLsThingState before save: " + newItxLsThingLsThingState.toJson());
+				logger.debug(
+						"here is the newItxLsThingLsThingState before save: " + newItxLsThingLsThingState.toJson());
 				newItxLsThingLsThingState.persist();
 				logger.debug("persisted the newItxLsThingLsThingState: " + newItxLsThingLsThingState.toJson());
-				
-				if (itxLsThingLsThingState.getLsValues() != null){
+
+				if (itxLsThingLsThingState.getLsValues() != null) {
 					Set<ItxLsThingLsThingValue> lsValues = new HashSet<ItxLsThingLsThingValue>();
-					for(ItxLsThingLsThingValue itxLsThingLsThingValue : itxLsThingLsThingState.getLsValues()){
+					for (ItxLsThingLsThingValue itxLsThingLsThingValue : itxLsThingLsThingState.getLsValues()) {
 						logger.debug("itxLsThingLsThingValue: " + itxLsThingLsThingValue.toJson());
-						ItxLsThingLsThingValue newItxLsThingLsThingValue = new ItxLsThingLsThingValue(itxLsThingLsThingValue);
+						ItxLsThingLsThingValue newItxLsThingLsThingValue = new ItxLsThingLsThingValue(
+								itxLsThingLsThingValue);
 						newItxLsThingLsThingValue.setLsState(newItxLsThingLsThingState);
 						newItxLsThingLsThingValue.persist();
 						lsValues.add(newItxLsThingLsThingValue);
 						logger.debug("persisted the itxLsThingLsThingValue: " + newItxLsThingLsThingValue.toJson());
-					}	
+					}
 					newItxLsThingLsThingState.setLsValues(lsValues);
 				} else {
 					logger.debug("No itxLsThingLsThing values to save");
@@ -63,99 +64,110 @@ public ItxLsThingLsThing saveItxLsThingLsThing(ItxLsThingLsThing itxLsThingLsThi
 		}
 		return newItxLsThingLsThing;
 	}
-	
-//	public void updateItxLsStates(ItxLsThingLsThing jsonItxLsThingLsThing, ItxLsThingLsThing updatedItxLsThingLsThing){
-//		if(jsonItxLsThingLsThing.getLsStates() != null){
-//			for(ItxLsThingLsThingState itxLsThingLsThingState : jsonItxLsThingLsThing.getLsStates()){
-//				ItxLsThingLsThingState updatedItxLsThingLsThingState;
-//				if (itxLsThingLsThingState.getId() == null){
-//					updatedItxLsThingLsThingState = new ItxLsThingLsThingState(itxLsThingLsThingState);
-//					updatedItxLsThingLsThingState.setItxLsThingLsThing(updatedItxLsThingLsThing);
-//					updatedItxLsThingLsThingState.persist();
-//					updatedItxLsThingLsThing.getLsStates().add(updatedItxLsThingLsThingState);
-//				} else {
-//					updatedItxLsThingLsThingState = ItxLsThingLsThingState.updateNoMerge(itxLsThingLsThingState);
-//					updatedItxLsThingLsThingState.setItxLsThingLsThing(updatedItxLsThingLsThing);
-//					logger.debug("updated itxLsThingLsThing state " + updatedItxLsThingLsThingState.getId());
-//
-//				}
-//				if (itxLsThingLsThingState.getLsValues() != null){
-//					for(ItxLsThingLsThingValue itxLsThingLsThingValue : itxLsThingLsThingState.getLsValues()){
-//						ItxLsThingLsThingValue updatedItxLsThingLsThingValue;
-//						if (itxLsThingLsThingValue.getId() == null){
-//							updatedItxLsThingLsThingValue = ItxLsThingLsThingValue.create(itxLsThingLsThingValue);
-//							updatedItxLsThingLsThingValue.setLsState(ItxLsThingLsThingState.findItxLsThingLsThingState(updatedItxLsThingLsThingState.getId()));
-//							updatedItxLsThingLsThingValue.persist();
-//							updatedItxLsThingLsThingState.getLsValues().add(updatedItxLsThingLsThingValue);
-//						} else {
-//							itxLsThingLsThingValue.setLsState(updatedItxLsThingLsThingState);
-//							updatedItxLsThingLsThingValue = ItxLsThingLsThingValue.update(itxLsThingLsThingValue);
-//							updatedItxLsThingLsThingState.getLsValues().add(updatedItxLsThingLsThingValue);
-//							logger.debug("updated itxLsThingLsThing value " + updatedItxLsThingLsThingValue.getId());
-//						}
-//					}	
-//				} else {
-//					logger.debug("No itxLsThingLsThing values to update");
-//				}
-//			}
-//		}
-//	}
-	
+
+	// public void updateItxLsStates(ItxLsThingLsThing jsonItxLsThingLsThing,
+	// ItxLsThingLsThing updatedItxLsThingLsThing){
+	// if(jsonItxLsThingLsThing.getLsStates() != null){
+	// for(ItxLsThingLsThingState itxLsThingLsThingState :
+	// jsonItxLsThingLsThing.getLsStates()){
+	// ItxLsThingLsThingState updatedItxLsThingLsThingState;
+	// if (itxLsThingLsThingState.getId() == null){
+	// updatedItxLsThingLsThingState = new
+	// ItxLsThingLsThingState(itxLsThingLsThingState);
+	// updatedItxLsThingLsThingState.setItxLsThingLsThing(updatedItxLsThingLsThing);
+	// updatedItxLsThingLsThingState.persist();
+	// updatedItxLsThingLsThing.getLsStates().add(updatedItxLsThingLsThingState);
+	// } else {
+	// updatedItxLsThingLsThingState =
+	// ItxLsThingLsThingState.updateNoMerge(itxLsThingLsThingState);
+	// updatedItxLsThingLsThingState.setItxLsThingLsThing(updatedItxLsThingLsThing);
+	// logger.debug("updated itxLsThingLsThing state " +
+	// updatedItxLsThingLsThingState.getId());
+	//
+	// }
+	// if (itxLsThingLsThingState.getLsValues() != null){
+	// for(ItxLsThingLsThingValue itxLsThingLsThingValue :
+	// itxLsThingLsThingState.getLsValues()){
+	// ItxLsThingLsThingValue updatedItxLsThingLsThingValue;
+	// if (itxLsThingLsThingValue.getId() == null){
+	// updatedItxLsThingLsThingValue =
+	// ItxLsThingLsThingValue.create(itxLsThingLsThingValue);
+	// updatedItxLsThingLsThingValue.setLsState(ItxLsThingLsThingState.findItxLsThingLsThingState(updatedItxLsThingLsThingState.getId()));
+	// updatedItxLsThingLsThingValue.persist();
+	// updatedItxLsThingLsThingState.getLsValues().add(updatedItxLsThingLsThingValue);
+	// } else {
+	// itxLsThingLsThingValue.setLsState(updatedItxLsThingLsThingState);
+	// updatedItxLsThingLsThingValue =
+	// ItxLsThingLsThingValue.update(itxLsThingLsThingValue);
+	// updatedItxLsThingLsThingState.getLsValues().add(updatedItxLsThingLsThingValue);
+	// logger.debug("updated itxLsThingLsThing value " +
+	// updatedItxLsThingLsThingValue.getId());
+	// }
+	// }
+	// } else {
+	// logger.debug("No itxLsThingLsThing values to update");
+	// }
+	// }
+	// }
+	// }
+
 	@Override
 	@Transactional
-	public ItxLsThingLsThing updateItxLsThingLsThing(ItxLsThingLsThing jsonItxLsThingLsThing){
-		
+	public ItxLsThingLsThing updateItxLsThingLsThing(ItxLsThingLsThing jsonItxLsThingLsThing) {
+
 		ItxLsThingLsThing updatedItxLsThingLsThing = ItxLsThingLsThing.updateNoStates(jsonItxLsThingLsThing);
 		updatedItxLsThingLsThing.merge();
 		logger.debug("here is the updated itx: " + updatedItxLsThingLsThing.toJson());
 		logger.debug("----------------- here is the itx id " + updatedItxLsThingLsThing.getId() + "   -----------");
-		
-		if(jsonItxLsThingLsThing.getLsStates() != null){
-			for(ItxLsThingLsThingState itxLsThingLsThingState : jsonItxLsThingLsThing.getLsStates()){
+
+		if (jsonItxLsThingLsThing.getLsStates() != null) {
+			for (ItxLsThingLsThingState itxLsThingLsThingState : jsonItxLsThingLsThing.getLsStates()) {
 				logger.debug("-------- current itxLsThingLsThingState ID: " + itxLsThingLsThingState.getId());
 				ItxLsThingLsThingState updatedItxLsThingLsThingState;
-				if (itxLsThingLsThingState.getId() == null){
+				if (itxLsThingLsThingState.getId() == null) {
 					updatedItxLsThingLsThingState = new ItxLsThingLsThingState(itxLsThingLsThingState);
-					updatedItxLsThingLsThingState.setItxLsThingLsThing(ItxLsThingLsThing.findItxLsThingLsThing(updatedItxLsThingLsThing.getId()));
+					updatedItxLsThingLsThingState.setItxLsThingLsThing(
+							ItxLsThingLsThing.findItxLsThingLsThing(updatedItxLsThingLsThing.getId()));
 					updatedItxLsThingLsThingState.persist();
 					updatedItxLsThingLsThing.getLsStates().add(updatedItxLsThingLsThingState);
 				} else {
 
-					if (itxLsThingLsThingState.getItxLsThingLsThing() == null) itxLsThingLsThingState.setItxLsThingLsThing(updatedItxLsThingLsThing);
-					updatedItxLsThingLsThingState = ItxLsThingLsThingState.update(itxLsThingLsThingState);			
+					if (itxLsThingLsThingState.getItxLsThingLsThing() == null)
+						itxLsThingLsThingState.setItxLsThingLsThing(updatedItxLsThingLsThing);
+					updatedItxLsThingLsThingState = ItxLsThingLsThingState.update(itxLsThingLsThingState);
 					updatedItxLsThingLsThing.getLsStates().add(updatedItxLsThingLsThingState);
 					logger.debug("updated itxLsThingLsThing state " + updatedItxLsThingLsThingState.getId());
 
 				}
-				if (itxLsThingLsThingState.getLsValues() != null){
-					for(ItxLsThingLsThingValue itxLsThingLsThingValue : itxLsThingLsThingState.getLsValues()){
+				if (itxLsThingLsThingState.getLsValues() != null) {
+					for (ItxLsThingLsThingValue itxLsThingLsThingValue : itxLsThingLsThingState.getLsValues()) {
 						ItxLsThingLsThingValue updatedItxLsThingLsThingValue;
-						if (itxLsThingLsThingValue.getId() == null){
+						if (itxLsThingLsThingValue.getId() == null) {
 							updatedItxLsThingLsThingValue = ItxLsThingLsThingValue.create(itxLsThingLsThingValue);
 							updatedItxLsThingLsThingValue.setLsState(updatedItxLsThingLsThingState);
 							updatedItxLsThingLsThingValue.persist();
 							updatedItxLsThingLsThingState.getLsValues().add(updatedItxLsThingLsThingValue);
 
 						} else {
-							//itxLsThingLsThingValue.setLsState(updatedItxLsThingLsThingState);
+							// itxLsThingLsThingValue.setLsState(updatedItxLsThingLsThingState);
 							itxLsThingLsThingValue.setLsState(updatedItxLsThingLsThingState);
 							updatedItxLsThingLsThingValue = ItxLsThingLsThingValue.update(itxLsThingLsThingValue);
 							updatedItxLsThingLsThingState.getLsValues().add(updatedItxLsThingLsThingValue);
 						}
-					}	
+					}
 				} else {
 					logger.debug("No itxLsThingLsThing values to update");
 				}
 			}
 		}
-		
+
 		return updatedItxLsThingLsThing;
 	}
 
 	@Override
 	public Collection<CodeTableDTO> convertToCodeTables(Collection<ItxLsThingLsThing> itxLsThingLsThings) {
 		Collection<CodeTableDTO> codeTables = new ArrayList<CodeTableDTO>();
-		for (ItxLsThingLsThing itx : itxLsThingLsThings){
+		for (ItxLsThingLsThing itx : itxLsThingLsThings) {
 			CodeTableDTO codeTable = new CodeTableDTO();
 			codeTable.setId(itx.getId());
 			codeTable.setCode(itx.getCodeName());
@@ -163,28 +175,31 @@ public Collection<CodeTableDTO> convertToCodeTables(Collection<ItxLsThingLsThing
 			codeTable.setIgnored(itx.isIgnored());
 			codeTables.add(codeTable);
 		}
-		
+
 		return codeTables;
 	}
 
-//	@Override
-//	@Transactional
-//	public ItxLsThingLsThing updateItxLsThingLsThing(ItxLsThingLsThing jsonItxLsThingLsThing) {
-//		ItxLsThingLsThing updatedItxLsThingLsThing;
-//		jsonItxLsThingLsThing.setFirstLsThing(LsThing.findLsThing(jsonItxLsThingLsThing.getFirstLsThing().getId()));
-//		jsonItxLsThingLsThing.setSecondLsThing(LsThing.findLsThing(jsonItxLsThingLsThing.getSecondLsThing().getId()));
-//		if (jsonItxLsThingLsThing.getId() == null){
-//			//need to save a new itx
-//			logger.debug("saving new itxLsThingLsThing: " + jsonItxLsThingLsThing.toJson());
-//			updatedItxLsThingLsThing = saveItxLsThingLsThing(jsonItxLsThingLsThing);
-//		}else {
-//			//old itx needs to be updated
-//			updatedItxLsThingLsThing = ItxLsThingLsThing.update(jsonItxLsThingLsThing);
-//		}
-////		ItxLsThingLsThingState
-//		ItxLsThingLsThing returnObject = ItxLsThingLsThing.findItxLsThingLsThing(updatedItxLsThingLsThing.getId());
-////		Set<ItxLsThingLsThingState> lsStates = ItxLsThingLsThingState.f
-////		returnObject.setLsStates(lsStates);
-//		return returnObject;
-//	}
+	// @Override
+	// @Transactional
+	// public ItxLsThingLsThing updateItxLsThingLsThing(ItxLsThingLsThing
+	// jsonItxLsThingLsThing) {
+	// ItxLsThingLsThing updatedItxLsThingLsThing;
+	// jsonItxLsThingLsThing.setFirstLsThing(LsThing.findLsThing(jsonItxLsThingLsThing.getFirstLsThing().getId()));
+	// jsonItxLsThingLsThing.setSecondLsThing(LsThing.findLsThing(jsonItxLsThingLsThing.getSecondLsThing().getId()));
+	// if (jsonItxLsThingLsThing.getId() == null){
+	// //need to save a new itx
+	// logger.debug("saving new itxLsThingLsThing: " +
+	// jsonItxLsThingLsThing.toJson());
+	// updatedItxLsThingLsThing = saveItxLsThingLsThing(jsonItxLsThingLsThing);
+	// }else {
+	// //old itx needs to be updated
+	// updatedItxLsThingLsThing = ItxLsThingLsThing.update(jsonItxLsThingLsThing);
+	// }
+	//// ItxLsThingLsThingState
+	// ItxLsThingLsThing returnObject =
+	// ItxLsThingLsThing.findItxLsThingLsThing(updatedItxLsThingLsThing.getId());
+	//// Set<ItxLsThingLsThingState> lsStates = ItxLsThingLsThingState.f
+	//// returnObject.setLsStates(lsStates);
+	// return returnObject;
+	// }
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolService.java b/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolService.java
index eb125fe7a..181d38375 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolService.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolService.java
@@ -12,15 +12,14 @@ public interface ItxProtocolProtocolService {
 	ItxProtocolProtocol saveLsItxProtocol(ItxProtocolProtocol itxProtocol) throws Exception;
 
 	Collection<ItxProtocolProtocol> saveLsItxProtocols(String json);
-	
-	Collection<ItxProtocolProtocol> saveLsItxProtocols(Collection<ItxProtocolProtocol> itxProtocolProtocols) throws Exception;
+
+	Collection<ItxProtocolProtocol> saveLsItxProtocols(Collection<ItxProtocolProtocol> itxProtocolProtocols)
+			throws Exception;
 
 	ItxProtocolProtocol updateItxProtocolProtocol(
 			ItxProtocolProtocol jsonItxProtocolProtocol);
 
 	Collection<ItxProtocolProtocol> findItxProtocolProtocolsByFirstProtocol(
 			Long firstProtocolId) throws Exception;
-	
-	
-	
+
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolServiceImpl.java
index f5a8ed47b..da375edfe 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolServiceImpl.java
@@ -25,15 +25,15 @@ public class ItxProtocolProtocolServiceImpl implements ItxProtocolProtocolServic
 
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
-	
+
 	@Override
 	@Transactional
-	public ItxProtocolProtocol saveLsItxProtocol(ItxProtocolProtocol itxProtocol) throws Exception{
+	public ItxProtocolProtocol saveLsItxProtocol(ItxProtocolProtocol itxProtocol) throws Exception {
 		logger.debug("incoming meta itxProtocolProtocol: " + itxProtocol.toJson() + "\n");
-		try{
+		try {
 			itxProtocol.setFirstProtocol(Protocol.findProtocol(itxProtocol.getFirstProtocol().getId()));
 			itxProtocol.setSecondProtocol(Protocol.findProtocol(itxProtocol.getSecondProtocol().getId()));
-		}catch (Exception e){
+		} catch (Exception e) {
 			throw new Exception("One or both of the provided protocol do not exist");
 		}
 		int i = 0;
@@ -42,72 +42,72 @@ public ItxProtocolProtocol saveLsItxProtocol(ItxProtocolProtocol itxProtocol) th
 		ItxProtocolProtocol newItxProtocol = new ItxProtocolProtocol(itxProtocol);
 		newItxProtocol.persist();
 
-		if (itxProtocol.getLsStates() != null){
-			for(ItxProtocolProtocolState itxState : itxProtocol.getLsStates()){
+		if (itxProtocol.getLsStates() != null) {
+			for (ItxProtocolProtocolState itxState : itxProtocol.getLsStates()) {
 				ItxProtocolProtocolState newItxState = new ItxProtocolProtocolState(itxState);
 				newItxState.setItxProtocolProtocol(newItxProtocol);
 				newItxState.persist();
-			    if ( j % batchSize == 0 ) { // same as the JDBC batch size
-			    	newItxState.flush();
-			    	newItxState.clear();
-			    }
-			    j++;
-				if (itxState.getLsValues() != null){
-					for(ItxProtocolProtocolValue itxValue : itxState.getLsValues()){
+				if (j % batchSize == 0) { // same as the JDBC batch size
+					newItxState.flush();
+					newItxState.clear();
+				}
+				j++;
+				if (itxState.getLsValues() != null) {
+					for (ItxProtocolProtocolValue itxValue : itxState.getLsValues()) {
 						itxValue.setLsState(newItxState);
 						itxValue.persist();
-					    if ( i % batchSize == 0 ) { // same as the JDBC batch size
-					    	itxValue.flush();
-					    	itxValue.clear();
-					    }
-					    i++;
-					}				
-				} 
+						if (i % batchSize == 0) { // same as the JDBC batch size
+							itxValue.flush();
+							itxValue.clear();
+						}
+						i++;
+					}
+				}
 			}
 		}
-		
+
 		return newItxProtocol;
 	}
 
 	@Override
 	@Transactional
-	public Collection<ItxProtocolProtocol> saveLsItxProtocols(String json){
+	public Collection<ItxProtocolProtocol> saveLsItxProtocols(String json) {
 		int i = 0;
 		int j = 0;
 		int batchSize = propertiesUtilService.getBatchSize();
-        Collection<ItxProtocolProtocol> savedItxProtocolProtocols = new ArrayList<ItxProtocolProtocol>();
+		Collection<ItxProtocolProtocol> savedItxProtocolProtocols = new ArrayList<ItxProtocolProtocol>();
 
-        StringReader sr = new StringReader(json);
+		StringReader sr = new StringReader(json);
 		BufferedReader br = new BufferedReader(sr);
-        for (ItxProtocolProtocol itxProtocol : ItxProtocolProtocol.fromJsonArrayToItxProtocolProtocols(br)) {
-    		ItxProtocolProtocol newItxProtocol = new ItxProtocolProtocol(itxProtocol);
-    		newItxProtocol.persist();
-    		savedItxProtocolProtocols.add(newItxProtocol);
-    		if (itxProtocol.getLsStates() != null){
-    			for(ItxProtocolProtocolState itxState : itxProtocol.getLsStates()){
-    				ItxProtocolProtocolState newItxState = new ItxProtocolProtocolState(itxState);
-    				newItxState.setItxProtocolProtocol(newItxProtocol);
-    				newItxState.persist();
-    			    if ( j % batchSize == 0 ) { // same as the JDBC batch size
-    			    	newItxState.flush();
-    			    	newItxState.clear();
-    			    }
-    			    j++;
-    				if (itxState.getLsValues() != null){
-    					for(ItxProtocolProtocolValue itxValue : itxState.getLsValues()){
-    						itxValue.setLsState(newItxState);
-    						itxValue.persist();
-    					    if ( i % batchSize == 0 ) {
-    					    	itxValue.flush();
-    					    	itxValue.clear();
-    					    }
-    					    i++;
-    					}				
-    				} 
-    			}
-    		}
-        }
-		
+		for (ItxProtocolProtocol itxProtocol : ItxProtocolProtocol.fromJsonArrayToItxProtocolProtocols(br)) {
+			ItxProtocolProtocol newItxProtocol = new ItxProtocolProtocol(itxProtocol);
+			newItxProtocol.persist();
+			savedItxProtocolProtocols.add(newItxProtocol);
+			if (itxProtocol.getLsStates() != null) {
+				for (ItxProtocolProtocolState itxState : itxProtocol.getLsStates()) {
+					ItxProtocolProtocolState newItxState = new ItxProtocolProtocolState(itxState);
+					newItxState.setItxProtocolProtocol(newItxProtocol);
+					newItxState.persist();
+					if (j % batchSize == 0) { // same as the JDBC batch size
+						newItxState.flush();
+						newItxState.clear();
+					}
+					j++;
+					if (itxState.getLsValues() != null) {
+						for (ItxProtocolProtocolValue itxValue : itxState.getLsValues()) {
+							itxValue.setLsState(newItxState);
+							itxValue.persist();
+							if (i % batchSize == 0) {
+								itxValue.flush();
+								itxValue.clear();
+							}
+							i++;
+						}
+					}
+				}
+			}
+		}
+
 		return savedItxProtocolProtocols;
 	}
 
@@ -115,60 +115,62 @@ public Collection<ItxProtocolProtocol> saveLsItxProtocols(String json){
 	public Collection<ItxProtocolProtocol> saveLsItxProtocols(
 			Collection<ItxProtocolProtocol> itxProtocolProtocols) throws Exception {
 		Collection<ItxProtocolProtocol> savedItxProtocolProtocols = new ArrayList<ItxProtocolProtocol>();
-		for (ItxProtocolProtocol itxProtocolProtocol : itxProtocolProtocols){
+		for (ItxProtocolProtocol itxProtocolProtocol : itxProtocolProtocols) {
 			savedItxProtocolProtocols.add(saveLsItxProtocol(itxProtocolProtocol));
 		}
 		return savedItxProtocolProtocols;
 	}
-	
+
 	@Override
 	@Transactional
-	public ItxProtocolProtocol updateItxProtocolProtocol(ItxProtocolProtocol jsonItxProtocolProtocol){
-		
+	public ItxProtocolProtocol updateItxProtocolProtocol(ItxProtocolProtocol jsonItxProtocolProtocol) {
+
 		ItxProtocolProtocol updatedItxProtocolProtocol = ItxProtocolProtocol.updateNoStates(jsonItxProtocolProtocol);
 		updatedItxProtocolProtocol.merge();
 		logger.debug("here is the updated itx: " + updatedItxProtocolProtocol.toJson());
 		logger.debug("----------------- here is the itx id " + updatedItxProtocolProtocol.getId() + "   -----------");
-		
-		if(jsonItxProtocolProtocol.getLsStates() != null){
-			for(ItxProtocolProtocolState itxProtocolProtocolState : jsonItxProtocolProtocol.getLsStates()){
+
+		if (jsonItxProtocolProtocol.getLsStates() != null) {
+			for (ItxProtocolProtocolState itxProtocolProtocolState : jsonItxProtocolProtocol.getLsStates()) {
 				logger.debug("-------- current itxProtocolProtocolState ID: " + itxProtocolProtocolState.getId());
 				ItxProtocolProtocolState updatedItxProtocolProtocolState;
-				if (itxProtocolProtocolState.getId() == null){
+				if (itxProtocolProtocolState.getId() == null) {
 					updatedItxProtocolProtocolState = new ItxProtocolProtocolState(itxProtocolProtocolState);
-					updatedItxProtocolProtocolState.setItxProtocolProtocol(ItxProtocolProtocol.findItxProtocolProtocol(updatedItxProtocolProtocol.getId()));
+					updatedItxProtocolProtocolState.setItxProtocolProtocol(
+							ItxProtocolProtocol.findItxProtocolProtocol(updatedItxProtocolProtocol.getId()));
 					updatedItxProtocolProtocolState.persist();
 					updatedItxProtocolProtocol.getLsStates().add(updatedItxProtocolProtocolState);
 				} else {
 
-					if (itxProtocolProtocolState.getItxProtocolProtocol() == null) itxProtocolProtocolState.setItxProtocolProtocol(updatedItxProtocolProtocol);
-					updatedItxProtocolProtocolState = ItxProtocolProtocolState.update(itxProtocolProtocolState);			
+					if (itxProtocolProtocolState.getItxProtocolProtocol() == null)
+						itxProtocolProtocolState.setItxProtocolProtocol(updatedItxProtocolProtocol);
+					updatedItxProtocolProtocolState = ItxProtocolProtocolState.update(itxProtocolProtocolState);
 					updatedItxProtocolProtocol.getLsStates().add(updatedItxProtocolProtocolState);
 					logger.debug("updated itxProtocolProtocol state " + updatedItxProtocolProtocolState.getId());
 
 				}
-				if (itxProtocolProtocolState.getLsValues() != null){
-					for(ItxProtocolProtocolValue itxProtocolProtocolValue : itxProtocolProtocolState.getLsValues()){
+				if (itxProtocolProtocolState.getLsValues() != null) {
+					for (ItxProtocolProtocolValue itxProtocolProtocolValue : itxProtocolProtocolState.getLsValues()) {
 						ItxProtocolProtocolValue updatedItxProtocolProtocolValue;
-						if (itxProtocolProtocolValue.getId() == null){
+						if (itxProtocolProtocolValue.getId() == null) {
 							updatedItxProtocolProtocolValue = ItxProtocolProtocolValue.create(itxProtocolProtocolValue);
 							updatedItxProtocolProtocolValue.setLsState(updatedItxProtocolProtocolState);
 							updatedItxProtocolProtocolValue.persist();
 							updatedItxProtocolProtocolState.getLsValues().add(updatedItxProtocolProtocolValue);
 
 						} else {
-							//itxProtocolProtocolValue.setLsState(updatedItxProtocolProtocolState);
+							// itxProtocolProtocolValue.setLsState(updatedItxProtocolProtocolState);
 							itxProtocolProtocolValue.setLsState(updatedItxProtocolProtocolState);
 							updatedItxProtocolProtocolValue = ItxProtocolProtocolValue.update(itxProtocolProtocolValue);
 							updatedItxProtocolProtocolState.getLsValues().add(updatedItxProtocolProtocolValue);
 						}
-					}	
+					}
 				} else {
 					logger.debug("No itxProtocolProtocol values to update");
 				}
 			}
 		}
-		
+
 		return updatedItxProtocolProtocol;
 	}
 
@@ -177,17 +179,19 @@ public ItxProtocolProtocol updateItxProtocolProtocol(ItxProtocolProtocol jsonItx
 	public Collection<ItxProtocolProtocol> findItxProtocolProtocolsByFirstProtocol(
 			Long firstProtocolId) throws Exception {
 		Protocol firstProtocol;
-    	try{
-    		firstProtocol = Protocol.findProtocol(firstProtocolId);
-    	} catch(Exception e){
-    		logger.error("Error in findItxProtocolProtocolsByFirstProtocol: firstProtocol "+ firstProtocolId.toString()+" not found");
-    		throw new Exception("First Protocol "+firstProtocolId+" not found");
-    	}
-        Collection<ItxProtocolProtocol> itxProtocolProtocols = ItxProtocolProtocol.findItxProtocolProtocolsByFirstProtocol(firstProtocol).getResultList();
-        for (ItxProtocolProtocol itx : itxProtocolProtocols){
-        	logger.debug(itx.getCodeName() + " " + itx.getId().toString());
-        	logger.debug(itx.toJson());
-        }
-        return itxProtocolProtocols;
+		try {
+			firstProtocol = Protocol.findProtocol(firstProtocolId);
+		} catch (Exception e) {
+			logger.error("Error in findItxProtocolProtocolsByFirstProtocol: firstProtocol " + firstProtocolId.toString()
+					+ " not found");
+			throw new Exception("First Protocol " + firstProtocolId + " not found");
+		}
+		Collection<ItxProtocolProtocol> itxProtocolProtocols = ItxProtocolProtocol
+				.findItxProtocolProtocolsByFirstProtocol(firstProtocol).getResultList();
+		for (ItxProtocolProtocol itx : itxProtocolProtocols) {
+			logger.debug(itx.getCodeName() + " " + itx.getId().toString());
+			logger.debug(itx.toJson());
+		}
+		return itxProtocolProtocols;
 	}
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolStateServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolStateServiceImpl.java
index 592c88481..d8ef01c72 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolStateServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolStateServiceImpl.java
@@ -23,7 +23,8 @@ public class ItxProtocolProtocolStateServiceImpl implements ItxProtocolProtocolS
 
 	@Override
 	public ItxProtocolProtocolState updateItxProtocolProtocolState(ItxProtocolProtocolState itxProtocolProtocolState) {
-		itxProtocolProtocolState.setVersion(ItxProtocolProtocolState.findItxProtocolProtocolState(itxProtocolProtocolState.getId()).getVersion());
+		itxProtocolProtocolState.setVersion(
+				ItxProtocolProtocolState.findItxProtocolProtocolState(itxProtocolProtocolState.getId()).getVersion());
 		itxProtocolProtocolState.merge();
 		return itxProtocolProtocolState;
 	}
@@ -31,7 +32,7 @@ public ItxProtocolProtocolState updateItxProtocolProtocolState(ItxProtocolProtoc
 	@Override
 	public Collection<ItxProtocolProtocolState> updateItxProtocolProtocolStates(
 			Collection<ItxProtocolProtocolState> itxProtocolProtocolStates) {
-		for (ItxProtocolProtocolState itxProtocolProtocolState : itxProtocolProtocolStates){
+		for (ItxProtocolProtocolState itxProtocolProtocolState : itxProtocolProtocolStates) {
 			itxProtocolProtocolState = updateItxProtocolProtocolState(itxProtocolProtocolState);
 		}
 		return null;
@@ -39,7 +40,8 @@ public Collection<ItxProtocolProtocolState> updateItxProtocolProtocolStates(
 
 	@Override
 	public ItxProtocolProtocolState saveItxProtocolProtocolState(ItxProtocolProtocolState itxProtocolProtocolState) {
-		itxProtocolProtocolState.setItxProtocolProtocol(ItxProtocolProtocol.findItxProtocolProtocol(itxProtocolProtocolState.getItxProtocolProtocol().getId()));		
+		itxProtocolProtocolState.setItxProtocolProtocol(
+				ItxProtocolProtocol.findItxProtocolProtocol(itxProtocolProtocolState.getItxProtocolProtocol().getId()));
 		itxProtocolProtocolState.persist();
 		return itxProtocolProtocolState;
 	}
@@ -47,12 +49,10 @@ public ItxProtocolProtocolState saveItxProtocolProtocolState(ItxProtocolProtocol
 	@Override
 	public Collection<ItxProtocolProtocolState> saveItxProtocolProtocolStates(
 			Collection<ItxProtocolProtocolState> itxProtocolProtocolStates) {
-		for (ItxProtocolProtocolState itxProtocolProtocolState: itxProtocolProtocolStates) {
+		for (ItxProtocolProtocolState itxProtocolProtocolState : itxProtocolProtocolStates) {
 			itxProtocolProtocolState = saveItxProtocolProtocolState(itxProtocolProtocolState);
 		}
 		return itxProtocolProtocolStates;
 	}
 
-
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolValueServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolValueServiceImpl.java
index e305a1d38..18ada8ecf 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolValueServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxProtocolProtocolValueServiceImpl.java
@@ -25,7 +25,8 @@ public class ItxProtocolProtocolValueServiceImpl implements ItxProtocolProtocolV
 
 	@Override
 	public ItxProtocolProtocolValue updateItxProtocolProtocolValue(ItxProtocolProtocolValue itxProtocolProtocolValue) {
-		itxProtocolProtocolValue.setVersion(ItxProtocolProtocolValue.findItxProtocolProtocolValue(itxProtocolProtocolValue.getId()).getVersion());
+		itxProtocolProtocolValue.setVersion(
+				ItxProtocolProtocolValue.findItxProtocolProtocolValue(itxProtocolProtocolValue.getId()).getVersion());
 		itxProtocolProtocolValue.merge();
 		return itxProtocolProtocolValue;
 	}
@@ -33,7 +34,7 @@ public ItxProtocolProtocolValue updateItxProtocolProtocolValue(ItxProtocolProtoc
 	@Override
 	public Collection<ItxProtocolProtocolValue> updateItxProtocolProtocolValues(
 			Collection<ItxProtocolProtocolValue> itxProtocolProtocolValues) {
-		for (ItxProtocolProtocolValue itxProtocolProtocolValue : itxProtocolProtocolValues){
+		for (ItxProtocolProtocolValue itxProtocolProtocolValue : itxProtocolProtocolValues) {
 			itxProtocolProtocolValue = updateItxProtocolProtocolValue(itxProtocolProtocolValue);
 		}
 		return null;
@@ -41,7 +42,8 @@ public Collection<ItxProtocolProtocolValue> updateItxProtocolProtocolValues(
 
 	@Override
 	public ItxProtocolProtocolValue saveItxProtocolProtocolValue(ItxProtocolProtocolValue itxProtocolProtocolValue) {
-		itxProtocolProtocolValue.setLsState(ItxProtocolProtocolState.findItxProtocolProtocolState(itxProtocolProtocolValue.getLsState().getId()));		
+		itxProtocolProtocolValue.setLsState(
+				ItxProtocolProtocolState.findItxProtocolProtocolState(itxProtocolProtocolValue.getLsState().getId()));
 		itxProtocolProtocolValue.persist();
 		return itxProtocolProtocolValue;
 	}
@@ -49,12 +51,10 @@ public ItxProtocolProtocolValue saveItxProtocolProtocolValue(ItxProtocolProtocol
 	@Override
 	public Collection<ItxProtocolProtocolValue> saveItxProtocolProtocolValues(
 			Collection<ItxProtocolProtocolValue> itxProtocolProtocolValues) {
-		for (ItxProtocolProtocolValue itxProtocolProtocolValue: itxProtocolProtocolValues) {
+		for (ItxProtocolProtocolValue itxProtocolProtocolValue : itxProtocolProtocolValues) {
 			itxProtocolProtocolValue = saveItxProtocolProtocolValue(itxProtocolProtocolValue);
 		}
 		return itxProtocolProtocolValues;
 	}
 
-
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerService.java b/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerService.java
index 9b4036feb..22c0bed6a 100755
--- a/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerService.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerService.java
@@ -13,7 +13,5 @@ public interface ItxSubjectContainerService {
 
 	ItxSubjectContainer updateItxSubjectContainer(
 			ItxSubjectContainer jsonItxSubjectContainer);
-	
-	
-	
+
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerServiceImpl.java
index f83c488bd..51e91deeb 100755
--- a/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerServiceImpl.java
@@ -18,13 +18,13 @@
 public class ItxSubjectContainerServiceImpl implements ItxSubjectContainerService {
 
 	private static final Logger logger = LoggerFactory.getLogger(ItxSubjectContainerServiceImpl.class);
-	
+
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
 
 	@Transactional
 	@Override
-	public ItxSubjectContainer saveLsItxSubjectContainer(ItxSubjectContainer itxSubjectContainer){
+	public ItxSubjectContainer saveLsItxSubjectContainer(ItxSubjectContainer itxSubjectContainer) {
 		int i = 0;
 		int j = 0;
 		int batchSize = propertiesUtilService.getBatchSize();
@@ -34,81 +34,83 @@ public ItxSubjectContainer saveLsItxSubjectContainer(ItxSubjectContainer itxSubj
 		newItxSubjContainer.setSubject(Subject.findSubject(newItxSubjContainer.getSubject().getId()));
 		newItxSubjContainer.persist();
 
-		if (itxSubjectContainer.getLsStates() != null){
-			for(ItxSubjectContainerState itxState : itxSubjectContainer.getLsStates()){
+		if (itxSubjectContainer.getLsStates() != null) {
+			for (ItxSubjectContainerState itxState : itxSubjectContainer.getLsStates()) {
 				ItxSubjectContainerState newItxState = new ItxSubjectContainerState(itxState);
 				newItxState.setItxSubjectContainer(newItxSubjContainer);
 				newItxState.persist();
-			    if ( j % batchSize == 0 ) { // same as the JDBC batch size
-			    	newItxState.flush();
-			    	newItxState.clear();
-			    }
-			    j++;
-				if (itxState.getLsValues() != null){
-					for(ItxSubjectContainerValue itxValue : itxState.getLsValues()){
+				if (j % batchSize == 0) { // same as the JDBC batch size
+					newItxState.flush();
+					newItxState.clear();
+				}
+				j++;
+				if (itxState.getLsValues() != null) {
+					for (ItxSubjectContainerValue itxValue : itxState.getLsValues()) {
 						itxValue.setLsState(newItxState);
 						itxValue.persist();
-					    if ( i % batchSize == 0 ) { // same as the JDBC batch size
-					    	itxValue.flush();
-					    	itxValue.clear();
-					    }
-					    i++;
-					}				
-				} 
+						if (i % batchSize == 0) { // same as the JDBC batch size
+							itxValue.flush();
+							itxValue.clear();
+						}
+						i++;
+					}
+				}
 			}
 		}
-		
+
 		return ItxSubjectContainer.findItxSubjectContainer(newItxSubjContainer.getId());
 	}
-	
+
 	@Override
 	@Transactional
-	public ItxSubjectContainer updateItxSubjectContainer(ItxSubjectContainer jsonItxSubjectContainer){
-		
+	public ItxSubjectContainer updateItxSubjectContainer(ItxSubjectContainer jsonItxSubjectContainer) {
+
 		ItxSubjectContainer updatedItxSubjectContainer = ItxSubjectContainer.updateNoStates(jsonItxSubjectContainer);
 		updatedItxSubjectContainer.merge();
 		logger.debug("here is the updated itx: " + updatedItxSubjectContainer.toJson());
 		logger.debug("----------------- here is the itx id " + updatedItxSubjectContainer.getId() + "   -----------");
-		
-		if(jsonItxSubjectContainer.getLsStates() != null){
-			for(ItxSubjectContainerState itxSubjectContainerState : jsonItxSubjectContainer.getLsStates()){
+
+		if (jsonItxSubjectContainer.getLsStates() != null) {
+			for (ItxSubjectContainerState itxSubjectContainerState : jsonItxSubjectContainer.getLsStates()) {
 				logger.debug("-------- current itxSubjectContainerState ID: " + itxSubjectContainerState.getId());
 				ItxSubjectContainerState updatedItxSubjectContainerState;
-				if (itxSubjectContainerState.getId() == null){
+				if (itxSubjectContainerState.getId() == null) {
 					updatedItxSubjectContainerState = new ItxSubjectContainerState(itxSubjectContainerState);
-					updatedItxSubjectContainerState.setItxSubjectContainer(ItxSubjectContainer.findItxSubjectContainer(updatedItxSubjectContainer.getId()));
+					updatedItxSubjectContainerState.setItxSubjectContainer(
+							ItxSubjectContainer.findItxSubjectContainer(updatedItxSubjectContainer.getId()));
 					updatedItxSubjectContainerState.persist();
 					updatedItxSubjectContainer.getLsStates().add(updatedItxSubjectContainerState);
 				} else {
 
-					if (itxSubjectContainerState.getItxSubjectContainer() == null) itxSubjectContainerState.setItxSubjectContainer(updatedItxSubjectContainer);
-					updatedItxSubjectContainerState = ItxSubjectContainerState.update(itxSubjectContainerState);			
+					if (itxSubjectContainerState.getItxSubjectContainer() == null)
+						itxSubjectContainerState.setItxSubjectContainer(updatedItxSubjectContainer);
+					updatedItxSubjectContainerState = ItxSubjectContainerState.update(itxSubjectContainerState);
 					updatedItxSubjectContainer.getLsStates().add(updatedItxSubjectContainerState);
 					logger.debug("updated itxSubjectContainer state " + updatedItxSubjectContainerState.getId());
 
 				}
-				if (itxSubjectContainerState.getLsValues() != null){
-					for(ItxSubjectContainerValue itxSubjectContainerValue : itxSubjectContainerState.getLsValues()){
+				if (itxSubjectContainerState.getLsValues() != null) {
+					for (ItxSubjectContainerValue itxSubjectContainerValue : itxSubjectContainerState.getLsValues()) {
 						ItxSubjectContainerValue updatedItxSubjectContainerValue;
-						if (itxSubjectContainerValue.getId() == null){
+						if (itxSubjectContainerValue.getId() == null) {
 							updatedItxSubjectContainerValue = ItxSubjectContainerValue.create(itxSubjectContainerValue);
 							updatedItxSubjectContainerValue.setLsState(updatedItxSubjectContainerState);
 							updatedItxSubjectContainerValue.persist();
 							updatedItxSubjectContainerState.getLsValues().add(updatedItxSubjectContainerValue);
 
 						} else {
-							//itxSubjectContainerValue.setLsState(updatedItxSubjectContainerState);
+							// itxSubjectContainerValue.setLsState(updatedItxSubjectContainerState);
 							itxSubjectContainerValue.setLsState(updatedItxSubjectContainerState);
 							updatedItxSubjectContainerValue = ItxSubjectContainerValue.update(itxSubjectContainerValue);
 							updatedItxSubjectContainerState.getLsValues().add(updatedItxSubjectContainerValue);
 						}
-					}	
+					}
 				} else {
 					logger.debug("No itxSubjectContainer values to update");
 				}
 			}
 		}
-		
+
 		return updatedItxSubjectContainer;
 	}
 
diff --git a/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerStateServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerStateServiceImpl.java
index a62e806ec..f6ec32a5f 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerStateServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerStateServiceImpl.java
@@ -23,7 +23,8 @@ public class ItxSubjectContainerStateServiceImpl implements ItxSubjectContainerS
 
 	@Override
 	public ItxSubjectContainerState updateItxSubjectContainerState(ItxSubjectContainerState itxSubjectContainerState) {
-		itxSubjectContainerState.setVersion(ItxSubjectContainerState.findItxSubjectContainerState(itxSubjectContainerState.getId()).getVersion());
+		itxSubjectContainerState.setVersion(
+				ItxSubjectContainerState.findItxSubjectContainerState(itxSubjectContainerState.getId()).getVersion());
 		itxSubjectContainerState.merge();
 		return itxSubjectContainerState;
 	}
@@ -31,7 +32,7 @@ public ItxSubjectContainerState updateItxSubjectContainerState(ItxSubjectContain
 	@Override
 	public Collection<ItxSubjectContainerState> updateItxSubjectContainerStates(
 			Collection<ItxSubjectContainerState> itxSubjectContainerStates) {
-		for (ItxSubjectContainerState itxSubjectContainerState : itxSubjectContainerStates){
+		for (ItxSubjectContainerState itxSubjectContainerState : itxSubjectContainerStates) {
 			itxSubjectContainerState = updateItxSubjectContainerState(itxSubjectContainerState);
 		}
 		return null;
@@ -39,7 +40,8 @@ public Collection<ItxSubjectContainerState> updateItxSubjectContainerStates(
 
 	@Override
 	public ItxSubjectContainerState saveItxSubjectContainerState(ItxSubjectContainerState itxSubjectContainerState) {
-		itxSubjectContainerState.setItxSubjectContainer(ItxSubjectContainer.findItxSubjectContainer(itxSubjectContainerState.getItxSubjectContainer().getId()));		
+		itxSubjectContainerState.setItxSubjectContainer(
+				ItxSubjectContainer.findItxSubjectContainer(itxSubjectContainerState.getItxSubjectContainer().getId()));
 		itxSubjectContainerState.persist();
 		return itxSubjectContainerState;
 	}
@@ -47,12 +49,10 @@ public ItxSubjectContainerState saveItxSubjectContainerState(ItxSubjectContainer
 	@Override
 	public Collection<ItxSubjectContainerState> saveItxSubjectContainerStates(
 			Collection<ItxSubjectContainerState> itxSubjectContainerStates) {
-		for (ItxSubjectContainerState itxSubjectContainerState: itxSubjectContainerStates) {
+		for (ItxSubjectContainerState itxSubjectContainerState : itxSubjectContainerStates) {
 			itxSubjectContainerState = saveItxSubjectContainerState(itxSubjectContainerState);
 		}
 		return itxSubjectContainerStates;
 	}
 
-
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerValueServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerValueServiceImpl.java
index 269ae8ff5..ecd8cd34a 100644
--- a/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerValueServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ItxSubjectContainerValueServiceImpl.java
@@ -23,7 +23,8 @@ public class ItxSubjectContainerValueServiceImpl implements ItxSubjectContainerV
 
 	@Override
 	public ItxSubjectContainerValue updateItxSubjectContainerValue(ItxSubjectContainerValue itxSubjectContainerValue) {
-		itxSubjectContainerValue.setVersion(ItxSubjectContainerValue.findItxSubjectContainerValue(itxSubjectContainerValue.getId()).getVersion());
+		itxSubjectContainerValue.setVersion(
+				ItxSubjectContainerValue.findItxSubjectContainerValue(itxSubjectContainerValue.getId()).getVersion());
 		itxSubjectContainerValue.merge();
 		return itxSubjectContainerValue;
 	}
@@ -31,7 +32,7 @@ public ItxSubjectContainerValue updateItxSubjectContainerValue(ItxSubjectContain
 	@Override
 	public Collection<ItxSubjectContainerValue> updateItxSubjectContainerValues(
 			Collection<ItxSubjectContainerValue> itxSubjectContainerValues) {
-		for (ItxSubjectContainerValue itxSubjectContainerValue : itxSubjectContainerValues){
+		for (ItxSubjectContainerValue itxSubjectContainerValue : itxSubjectContainerValues) {
 			itxSubjectContainerValue = updateItxSubjectContainerValue(itxSubjectContainerValue);
 		}
 		return null;
@@ -39,7 +40,8 @@ public Collection<ItxSubjectContainerValue> updateItxSubjectContainerValues(
 
 	@Override
 	public ItxSubjectContainerValue saveItxSubjectContainerValue(ItxSubjectContainerValue itxSubjectContainerValue) {
-		itxSubjectContainerValue.setLsState(ItxSubjectContainerState.findItxSubjectContainerState(itxSubjectContainerValue.getLsState().getId()));		
+		itxSubjectContainerValue.setLsState(
+				ItxSubjectContainerState.findItxSubjectContainerState(itxSubjectContainerValue.getLsState().getId()));
 		itxSubjectContainerValue.persist();
 		return itxSubjectContainerValue;
 	}
@@ -47,12 +49,10 @@ public ItxSubjectContainerValue saveItxSubjectContainerValue(ItxSubjectContainer
 	@Override
 	public Collection<ItxSubjectContainerValue> saveItxSubjectContainerValues(
 			Collection<ItxSubjectContainerValue> itxSubjectContainerValues) {
-		for (ItxSubjectContainerValue itxSubjectContainerValue: itxSubjectContainerValues) {
+		for (ItxSubjectContainerValue itxSubjectContainerValue : itxSubjectContainerValues) {
 			itxSubjectContainerValue = saveItxSubjectContainerValue(itxSubjectContainerValue);
 		}
 		return itxSubjectContainerValues;
 	}
 
-
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/LabelSequenceServiceImpl.java b/src/main/java/com/labsynch/labseer/service/LabelSequenceServiceImpl.java
index 2a010aba5..d977fdcae 100644
--- a/src/main/java/com/labsynch/labseer/service/LabelSequenceServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/LabelSequenceServiceImpl.java
@@ -1,6 +1,5 @@
 package com.labsynch.labseer.service;
 
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
@@ -18,7 +17,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-
 @Service
 @Transactional
 public class LabelSequenceServiceImpl implements LabelSequenceService {
@@ -29,16 +27,20 @@ public class LabelSequenceServiceImpl implements LabelSequenceService {
 	public Collection<LabelSequence> saveLabelSequenceArray(
 			Collection<LabelSequence> labelSequences) {
 		Collection<LabelSequence> savedLabelSequences = new HashSet<LabelSequence>();
-		for(LabelSequence labelSequence : labelSequences){
+		for (LabelSequence labelSequence : labelSequences) {
 			LabelSequence savedLabelSequence;
-			try{
-				savedLabelSequence = LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(labelSequence.getThingTypeAndKind(), labelSequence.getLabelTypeAndKind()).getSingleResult();
-			}catch(NoResultException e){
+			try {
+				savedLabelSequence = LabelSequence
+						.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(
+								labelSequence.getThingTypeAndKind(), labelSequence.getLabelTypeAndKind())
+						.getSingleResult();
+			} catch (NoResultException e) {
 				savedLabelSequence = labelSequence;
 				savedLabelSequence.save();
 			}
-			if (!savedLabelSequence.getLabelPrefix().equals(labelSequence.getLabelPrefix())){
-				logger.info("Changing LabelSequence labelPrefix from: " + savedLabelSequence.getLabelPrefix() + " to: "+ labelSequence.getLabelPrefix());
+			if (!savedLabelSequence.getLabelPrefix().equals(labelSequence.getLabelPrefix())) {
+				logger.info("Changing LabelSequence labelPrefix from: " + savedLabelSequence.getLabelPrefix() + " to: "
+						+ labelSequence.getLabelPrefix());
 				savedLabelSequence.setLabelPrefix(labelSequence.getLabelPrefix());
 				savedLabelSequence.merge();
 			}
@@ -53,12 +55,15 @@ public List<LabelSequence> getAuthorizedLabelSequences(Collection<AuthorRole> au
 		List<LabelSequence> allLabelSequences;
 		List<LabelSequence> authorizedLabelSequences = new ArrayList<LabelSequence>();
 		if (thingTypeAndKind != null && labelTypeAndKind != null) {
-			allLabelSequences = LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(thingTypeAndKind, labelTypeAndKind).getResultList();
-		}else if (thingTypeAndKind != null) {
-			allLabelSequences = LabelSequence.findLabelSequencesByThingTypeAndKindEquals(thingTypeAndKind).getResultList();
-		}else if (labelTypeAndKind != null) {
-			allLabelSequences = LabelSequence.findLabelSequencesByLabelTypeAndKindEquals(labelTypeAndKind).getResultList();
-		}else {
+			allLabelSequences = LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(
+					thingTypeAndKind, labelTypeAndKind).getResultList();
+		} else if (thingTypeAndKind != null) {
+			allLabelSequences = LabelSequence.findLabelSequencesByThingTypeAndKindEquals(thingTypeAndKind)
+					.getResultList();
+		} else if (labelTypeAndKind != null) {
+			allLabelSequences = LabelSequence.findLabelSequencesByLabelTypeAndKindEquals(labelTypeAndKind)
+					.getResultList();
+		} else {
 			allLabelSequences = LabelSequence.findAllLabelSequences();
 		}
 		List<LsRole> authorLsRoles = new ArrayList<LsRole>();
@@ -72,31 +77,33 @@ public List<LabelSequence> getAuthorizedLabelSequences(Collection<AuthorRole> au
 				for (LabelSequenceRole labelSeqRole : labelSequence.getLabelSequenceRoles()) {
 					labelSeqRoles.add(labelSeqRole.getRoleEntry());
 				}
-				if (anyRolesMatch(authorLsRoles, labelSeqRoles)){
+				if (anyRolesMatch(authorLsRoles, labelSeqRoles)) {
 					authorizedLabelSequences.add(labelSequence);
 				}
-			}else {
+			} else {
 				authorizedLabelSequences.add(labelSequence);
 			}
 		}
-		
+
 		return authorizedLabelSequences;
 	}
-	
+
 	public static boolean containsLsRole(Collection<LsRole> list, LsRole queryRole) {
 		for (LsRole role : list) {
-			if (role != null && queryRole != null && role.getLsType().equals(queryRole.getLsType()) && role.getLsKind().equals(queryRole.getLsKind()) && role.getRoleName().equals(queryRole.getRoleName())) return true;
+			if (role != null && queryRole != null && role.getLsType().equals(queryRole.getLsType())
+					&& role.getLsKind().equals(queryRole.getLsKind())
+					&& role.getRoleName().equals(queryRole.getRoleName()))
+				return true;
 		}
 		return false;
 	}
-	
+
 	public static boolean anyRolesMatch(Collection<LsRole> roleList, Collection<LsRole> queryRoleList) {
 		for (LsRole role : queryRoleList) {
-			if (containsLsRole(roleList, role)) return true;
+			if (containsLsRole(roleList, role))
+				return true;
 		}
 		return false;
 	}
 
-	
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/LicenseService.java b/src/main/java/com/labsynch/labseer/service/LicenseService.java
index d2e864f7b..017ea2e30 100644
--- a/src/main/java/com/labsynch/labseer/service/LicenseService.java
+++ b/src/main/java/com/labsynch/labseer/service/LicenseService.java
@@ -13,6 +13,4 @@ public interface LicenseService {
 
 	LicenseDTO getLicenseInfo() throws IOException, PGPException, URISyntaxException;
 
-
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/LicenseServiceImpl.java b/src/main/java/com/labsynch/labseer/service/LicenseServiceImpl.java
index 3dc279a33..48651b85b 100644
--- a/src/main/java/com/labsynch/labseer/service/LicenseServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/LicenseServiceImpl.java
@@ -26,86 +26,82 @@
 @Transactional
 public class LicenseServiceImpl implements LicenseService {
 
-
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
 
-	
 	private static final Logger logger = LoggerFactory.getLogger(LicenseServiceImpl.class);
-	
-	public void checkValidLicense() throws IOException, PGPException{
+
+	public void checkValidLicense() throws IOException, PGPException {
 		String licenseFileName = propertiesUtilService.getAcaslicenseFile();
 	}
-	
+
 	@Override
-	public LicenseDTO getLicenseInfo() throws IOException, PGPException, URISyntaxException{
-		
+	public LicenseDTO getLicenseInfo() throws IOException, PGPException, URISyntaxException {
+
 		String licenseFileName = propertiesUtilService.getAcaslicenseFile();
 		logger.info("licenseFileName is " + licenseFileName);
-	    License lic = new License();
-	    
-	    byte [] keyDigest = getKeyDigest();
-
-	    URI keyFilePath = LicenseServiceImpl.class.getClassLoader().getResource("acas_public_key.gpg").toURI();
-	    logger.info("------------------------here is the filepath: " + keyFilePath.getPath());
-	    
-	    File publicKeyFile = new File(keyFilePath.getPath());
-	    
-	    lic.loadKeyRing(publicKeyFile, null);
-	    lic.setLicenseEncodedFromFile(licenseFileName);
-	    String edition = lic.getFeature("edition");
-	    logger.info("The acas edition is: " + edition);
-	    logger.info("The acas features are: " + lic.getFeature("features"));
-
-	    DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
-	    String validDateString = lic.getFeature("valid-until");
-	    logger.info("validDateString until " + validDateString);
-	    Date validDate = null;
-	    try {
+		License lic = new License();
+
+		byte[] keyDigest = getKeyDigest();
+
+		URI keyFilePath = LicenseServiceImpl.class.getClassLoader().getResource("acas_public_key.gpg").toURI();
+		logger.info("------------------------here is the filepath: " + keyFilePath.getPath());
+
+		File publicKeyFile = new File(keyFilePath.getPath());
+
+		lic.loadKeyRing(publicKeyFile, null);
+		lic.setLicenseEncodedFromFile(licenseFileName);
+		String edition = lic.getFeature("edition");
+		logger.info("The acas edition is: " + edition);
+		logger.info("The acas features are: " + lic.getFeature("features"));
+
+		DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+		String validDateString = lic.getFeature("valid-until");
+		logger.info("validDateString until " + validDateString);
+		Date validDate = null;
+		try {
 			validDate = df.parse(validDateString);
 		} catch (ParseException e) {
 			logger.error("ERROR: Unable to parse the date: " + validDateString);
 			e.printStackTrace();
 		}
-	    logger.info("validate date: " + validDate);
-	    
-	    Date todayDate = new Date();
-	    
-	    boolean isValidDate = todayDate.before(validDate);
-	    logger.info("is the date valid: " + isValidDate);
-	    Days daysLeft = Days.daysBetween(LocalDate.fromDateFields(todayDate), LocalDate.fromDateFields(validDate));
-	    
-	    logger.info("Days left to expiration: " + daysLeft);	    	    
-	    logger.info("Days left to expiration: " + daysLeft.getDays());
-	    
-	    LicenseDTO licenseInfo = new LicenseDTO();
-	    licenseInfo.setNumberOfDaysLeft(daysLeft.getDays());
-	    licenseInfo.setValidDateString(validDateString);
-	    licenseInfo.setEdition(edition);
-	    licenseInfo.setValid(isValidDate);
-	    licenseInfo.setFeatures(lic.getFeature("features"));
-	    licenseInfo.setLicensee(lic.getFeature("licensee"));
-	    licenseInfo.setNumberOfUsers(Integer.valueOf(lic.getFeature("numberOfUsers")));
-
-	    	    	    
-	    return licenseInfo;
-		
+		logger.info("validate date: " + validDate);
+
+		Date todayDate = new Date();
+
+		boolean isValidDate = todayDate.before(validDate);
+		logger.info("is the date valid: " + isValidDate);
+		Days daysLeft = Days.daysBetween(LocalDate.fromDateFields(todayDate), LocalDate.fromDateFields(validDate));
+
+		logger.info("Days left to expiration: " + daysLeft);
+		logger.info("Days left to expiration: " + daysLeft.getDays());
+
+		LicenseDTO licenseInfo = new LicenseDTO();
+		licenseInfo.setNumberOfDaysLeft(daysLeft.getDays());
+		licenseInfo.setValidDateString(validDateString);
+		licenseInfo.setEdition(edition);
+		licenseInfo.setValid(isValidDate);
+		licenseInfo.setFeatures(lic.getFeature("features"));
+		licenseInfo.setLicensee(lic.getFeature("licensee"));
+		licenseInfo.setNumberOfUsers(Integer.valueOf(lic.getFeature("numberOfUsers")));
+
+		return licenseInfo;
+
 	}
 
 	private byte[] getKeyDigest() {
-	    byte [] digest = new byte[] {
-	    		(byte)0xE5, 
-	    		(byte)0x4B, (byte)0x39, (byte)0x1B, (byte)0x59, (byte)0x82, (byte)0xF7, (byte)0x9C, (byte)0x9C, 
-	    		(byte)0xCC, (byte)0x9C, (byte)0x8D, (byte)0x90, (byte)0x1F, (byte)0x0B, (byte)0xFE, (byte)0x01, 
-	    		(byte)0xD9, (byte)0x66, (byte)0x05, (byte)0xF2, (byte)0x8A, (byte)0x75, (byte)0xDA, (byte)0xFE, 
-	    		(byte)0x0D, (byte)0x29, (byte)0x66, (byte)0x31, (byte)0xE9, (byte)0x73, (byte)0x5F, (byte)0x72, 
-	    		(byte)0x18, (byte)0x7C, (byte)0xAB, (byte)0x1A, (byte)0x92, (byte)0xF3, (byte)0xE1, (byte)0xD4, 
-	    		(byte)0x92, (byte)0xC1, (byte)0xC5, (byte)0x47, (byte)0x81, (byte)0x86, (byte)0xC0, (byte)0xF5, 
-	    		(byte)0x19, (byte)0x8D, (byte)0x5A, (byte)0x29, (byte)0x7D, (byte)0x4F, (byte)0x50, (byte)0xE5, 
-	    		(byte)0x3C, (byte)0x33, (byte)0x21, (byte)0xE5, (byte)0x69, (byte)0x2B, (byte)0x6E, 
-	    		};
-	    return digest;
+		byte[] digest = new byte[] {
+				(byte) 0xE5,
+				(byte) 0x4B, (byte) 0x39, (byte) 0x1B, (byte) 0x59, (byte) 0x82, (byte) 0xF7, (byte) 0x9C, (byte) 0x9C,
+				(byte) 0xCC, (byte) 0x9C, (byte) 0x8D, (byte) 0x90, (byte) 0x1F, (byte) 0x0B, (byte) 0xFE, (byte) 0x01,
+				(byte) 0xD9, (byte) 0x66, (byte) 0x05, (byte) 0xF2, (byte) 0x8A, (byte) 0x75, (byte) 0xDA, (byte) 0xFE,
+				(byte) 0x0D, (byte) 0x29, (byte) 0x66, (byte) 0x31, (byte) 0xE9, (byte) 0x73, (byte) 0x5F, (byte) 0x72,
+				(byte) 0x18, (byte) 0x7C, (byte) 0xAB, (byte) 0x1A, (byte) 0x92, (byte) 0xF3, (byte) 0xE1, (byte) 0xD4,
+				(byte) 0x92, (byte) 0xC1, (byte) 0xC5, (byte) 0x47, (byte) 0x81, (byte) 0x86, (byte) 0xC0, (byte) 0xF5,
+				(byte) 0x19, (byte) 0x8D, (byte) 0x5A, (byte) 0x29, (byte) 0x7D, (byte) 0x4F, (byte) 0x50, (byte) 0xE5,
+				(byte) 0x3C, (byte) 0x33, (byte) 0x21, (byte) 0xE5, (byte) 0x69, (byte) 0x2B, (byte) 0x6E,
+		};
+		return digest;
 	}
 
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/LoadPreDefCorpNameService.java b/src/main/java/com/labsynch/labseer/service/LoadPreDefCorpNameService.java
index 3338cab9a..54c810309 100644
--- a/src/main/java/com/labsynch/labseer/service/LoadPreDefCorpNameService.java
+++ b/src/main/java/com/labsynch/labseer/service/LoadPreDefCorpNameService.java
@@ -5,9 +5,6 @@
 @Service
 public interface LoadPreDefCorpNameService {
 
-
 	public boolean loadDefaultPreDefCorpNames();
 
-
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/LoadPreDefCorpNameServiceImpl.java b/src/main/java/com/labsynch/labseer/service/LoadPreDefCorpNameServiceImpl.java
index 0e2b9c279..4ab201e03 100644
--- a/src/main/java/com/labsynch/labseer/service/LoadPreDefCorpNameServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/LoadPreDefCorpNameServiceImpl.java
@@ -12,21 +12,22 @@
 public class LoadPreDefCorpNameServiceImpl implements LoadPreDefCorpNameService {
 
 	Logger logger = LoggerFactory.getLogger(LoadPreDefCorpNameServiceImpl.class);
-	
+
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
 
 	@Override
 	public boolean loadDefaultPreDefCorpNames() {
 		long numberOfCorpNamesToGenerate = 50000;
-		long corpNumber = propertiesUtilService.getStartingCorpNumber(); //starting number
+		long corpNumber = propertiesUtilService.getStartingCorpNumber(); // starting number
 		int corpDigits = propertiesUtilService.getNumberCorpDigits();
 		String formatCorpDigits = "%0" + corpDigits + "d";
-		try{
-			while ( corpNumber < numberOfCorpNamesToGenerate ){
+		try {
+			while (corpNumber < numberOfCorpNamesToGenerate) {
 				corpNumber++;
 				String corpName = null;
-				corpName = propertiesUtilService.getCorpPrefix().concat(propertiesUtilService.getCorpSeparator()).concat(String.format(formatCorpDigits, corpNumber));	    		
+				corpName = propertiesUtilService.getCorpPrefix().concat(propertiesUtilService.getCorpSeparator())
+						.concat(String.format(formatCorpDigits, corpNumber));
 				boolean used = false;
 				boolean skip = false;
 				PreDef_CorpName preDefCorpName = new PreDef_CorpName();
@@ -38,10 +39,9 @@ public boolean loadDefaultPreDefCorpNames() {
 				logger.debug(corpName);
 			}
 			return true;
-		} catch(Exception e){
+		} catch (Exception e) {
 			return false;
 		}
 	}
 
 }
-
diff --git a/src/main/java/com/labsynch/labseer/service/LotAliasService.java b/src/main/java/com/labsynch/labseer/service/LotAliasService.java
index 4e4f25f90..ada3ec11e 100644
--- a/src/main/java/com/labsynch/labseer/service/LotAliasService.java
+++ b/src/main/java/com/labsynch/labseer/service/LotAliasService.java
@@ -5,10 +5,8 @@
 import com.labsynch.labseer.domain.Lot;
 import com.labsynch.labseer.domain.LotAlias;
 
-
 public interface LotAliasService {
 
-
 	public Lot updateLotAliases(Lot lot);
 
 	public Lot updateLotAliases(Lot lot,
diff --git a/src/main/java/com/labsynch/labseer/service/LotAliasServiceImpl.java b/src/main/java/com/labsynch/labseer/service/LotAliasServiceImpl.java
index 02112cdca..11f012766 100644
--- a/src/main/java/com/labsynch/labseer/service/LotAliasServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/LotAliasServiceImpl.java
@@ -25,12 +25,14 @@ public Lot updateLotAliases(Lot lot) {
 		Set<LotAlias> aliasesToBeSaved = lot.getLotAliases();
 		logger.debug(LotAlias.toJsonArray(aliasesToBeSaved));
 		Set<LotAlias> savedAliases = new HashSet<LotAlias>();
-		if (aliasesToBeSaved != null && !aliasesToBeSaved.isEmpty()){
-			for (LotAlias aliasToBeSaved : aliasesToBeSaved){
+		if (aliasesToBeSaved != null && !aliasesToBeSaved.isEmpty()) {
+			for (LotAlias aliasToBeSaved : aliasesToBeSaved) {
 				logger.debug(aliasToBeSaved.toJson());
 				aliasToBeSaved.setLot(lot);
-				if (aliasToBeSaved.getId() == null) aliasToBeSaved.persist();
-				else aliasToBeSaved.merge();
+				if (aliasToBeSaved.getId() == null)
+					aliasToBeSaved.persist();
+				else
+					aliasToBeSaved.merge();
 				savedAliases.add(aliasToBeSaved);
 				logger.debug(aliasToBeSaved.toJson());
 				logger.debug(LotAlias.toJsonArray(savedAliases));
@@ -45,11 +47,13 @@ public Lot updateLotAliases(Lot lot,
 			Set<LotAlias> lotAliases) {
 		Set<LotAlias> aliasesToBeSaved = lotAliases;
 		Set<LotAlias> savedAliases = new HashSet<LotAlias>();
-		if (aliasesToBeSaved != null && !aliasesToBeSaved.isEmpty()){
-			for (LotAlias aliasToBeSaved : aliasesToBeSaved){
+		if (aliasesToBeSaved != null && !aliasesToBeSaved.isEmpty()) {
+			for (LotAlias aliasToBeSaved : aliasesToBeSaved) {
 				aliasToBeSaved.setLot(lot);
-				if (aliasToBeSaved.getId() == null) aliasToBeSaved.persist();
-				else aliasToBeSaved.merge();
+				if (aliasToBeSaved.getId() == null)
+					aliasToBeSaved.persist();
+				else
+					aliasToBeSaved.merge();
 				savedAliases.add(aliasToBeSaved);
 			}
 		}
@@ -57,7 +61,7 @@ public Lot updateLotAliases(Lot lot,
 		return lot;
 	}
 
-	//update default lot aliases
+	// update default lot aliases
 	@Override
 	public Lot updateLotDefaultAlias(Lot lot, String aliasList) {
 		String lsType = "default";
@@ -65,22 +69,23 @@ public Lot updateLotDefaultAlias(Lot lot, String aliasList) {
 		lot = updateLotAliasByTypeAndKind(lot, lsType, lsKind, aliasList);
 		return lot;
 	}
-	
+
 	@Override
 	public Lot updateLotAliasByTypeAndKind(Lot lot, String lsType, String lsKind, String aliasList) {
-		if (aliasList != null){
-			List<LotAlias> existingAliases = LotAlias.findLotAliasesByLotAndLsTypeEqualsAndLsKindEquals(lot, lsType, lsKind).getResultList();
+		if (aliasList != null) {
+			List<LotAlias> existingAliases = LotAlias
+					.findLotAliasesByLotAndLsTypeEqualsAndLsKindEquals(lot, lsType, lsKind).getResultList();
 			Map<String, LotAlias> existingAliasMap = new HashMap<String, LotAlias>();
-			for (LotAlias existingAlias : existingAliases){
+			for (LotAlias existingAlias : existingAliases) {
 				existingAliasMap.put(existingAlias.getAliasName(), existingAlias);
 			}
 
 			Map<String, LotAlias> newAliasMap = new HashMap<String, LotAlias>();
 			Set<LotAlias> lotAliasSet = new HashSet<LotAlias>();
-			
+
 			String[] aliases = aliasList.split(";");
-			for (String alias : aliases){
-				if (!existingAliasMap.containsKey(alias)){
+			for (String alias : aliases) {
+				if (!existingAliasMap.containsKey(alias)) {
 					LotAlias lotAlias = new LotAlias();
 					lotAlias.setLsType(lsType);
 					lotAlias.setLsKind(lsKind);
@@ -95,9 +100,9 @@ public Lot updateLotAliasByTypeAndKind(Lot lot, String lsType, String lsKind, St
 				}
 			}
 
-			for (String aliasKey : existingAliasMap.keySet()){
-				if (!newAliasMap.containsKey(aliasKey)){
-					//not present -- so marked to ignore
+			for (String aliasKey : existingAliasMap.keySet()) {
+				if (!newAliasMap.containsKey(aliasKey)) {
+					// not present -- so marked to ignore
 					LotAlias queryAlias = existingAliasMap.get(aliasKey);
 					logger.info("current query alias: " + queryAlias);
 					queryAlias.setIgnored(true);
@@ -111,4 +116,3 @@ public Lot updateLotAliasByTypeAndKind(Lot lot, String lsType, String lsKind, St
 		return lot;
 	}
 }
-
diff --git a/src/main/java/com/labsynch/labseer/service/LotService.java b/src/main/java/com/labsynch/labseer/service/LotService.java
index aa54855a7..3b09e5cf1 100644
--- a/src/main/java/com/labsynch/labseer/service/LotService.java
+++ b/src/main/java/com/labsynch/labseer/service/LotService.java
@@ -7,7 +7,6 @@
 import com.labsynch.labseer.dto.LotDTO;
 import com.labsynch.labseer.dto.LotsByProjectDTO;
 
-
 public interface LotService {
 
 	public Lot updateLotWeight(Lot lot);
diff --git a/src/main/java/com/labsynch/labseer/service/LotServiceImpl.java b/src/main/java/com/labsynch/labseer/service/LotServiceImpl.java
index b069d400a..c49651697 100644
--- a/src/main/java/com/labsynch/labseer/service/LotServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/LotServiceImpl.java
@@ -27,7 +27,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-
 @Service
 public class LotServiceImpl implements LotService {
 
@@ -47,8 +46,7 @@ public class LotServiceImpl implements LotService {
 	private PropertiesUtilService propertiesUtilService;
 
 	private static final Logger logger = LoggerFactory.getLogger(LotServiceImpl.class);
-	
-	
+
 	// updates saltForm weight and lot weight
 	@Override
 	public Lot updateLotWeight(Lot lot) {
@@ -56,31 +54,33 @@ public Lot updateLotWeight(Lot lot) {
 		lot.setLotMolWeight(Lot.calculateLotMolWeight(lot));
 		lot.setModifiedDate(new Date());
 		lot.merge();
-		logger.debug("updated lot weight for "+lot.getCorpName()+" to: "+lot.getLotMolWeight());
+		logger.debug("updated lot weight for " + lot.getCorpName() + " to: " + lot.getLotMolWeight());
 		return Lot.findLot(lot.getId());
 	}
 
-
 	@Override
 	@Transactional
 	public Lot reparentLot(String lotCorpName, String parentCorpName, String modifiedByUser) {
 
 		// incoming lot
 		// name of new adoptive parent
-		// logic to deal with lot numbering  -- just increment existing lot number of adoptive parent
-		// note -- need to refactor to deal with more complicated parent/SaltForm/lot setups versus simpler parent/lot
+		// logic to deal with lot numbering -- just increment existing lot number of
+		// adoptive parent
+		// note -- need to refactor to deal with more complicated parent/SaltForm/lot
+		// setups versus simpler parent/lot
 
 		Parent adoptiveParent = Parent.findParentsByCorpNameEquals(parentCorpName).getSingleResult();
-		//renumber lot -- just increment to next number
-		Integer newLotNumber = Lot.getMaxParentLotNumber(adoptiveParent)+1;
+		// renumber lot -- just increment to next number
+		Integer newLotNumber = Lot.getMaxParentLotNumber(adoptiveParent) + 1;
 		logger.debug("next lot number for adoptive parent: " + newLotNumber);
-		
+
 		Lot queryLot = Lot.findLotsByCorpNameEquals(lotCorpName).getSingleResult();
 
-		//associate saltForm to new adoptive parent
+		// associate saltForm to new adoptive parent
 		SaltForm saltForm = queryLot.getSaltForm();
 		saltForm.setParent(adoptiveParent);
-		saltForm.setCorpName(corpNameService.generateSaltFormCorpName(adoptiveParent.getCorpName(), saltForm.getIsoSalts()));
+		saltForm.setCorpName(
+				corpNameService.generateSaltFormCorpName(adoptiveParent.getCorpName(), saltForm.getIsoSalts()));
 		saltForm.merge();
 
 		// recalculate salt form weight
@@ -89,14 +89,14 @@ public Lot reparentLot(String lotCorpName, String parentCorpName, String modifie
 		logger.debug("new lot number before merge: " + newLotNumber);
 		queryLot.setLotNumber(newLotNumber);
 		logger.debug("new lot number: " + queryLot.getLotNumber());
-		
-		//rename lot corp name if not cas style
-		if (!propertiesUtilService.getCorpBatchFormat().equalsIgnoreCase("cas_style_format")){
+
+		// rename lot corp name if not cas style
+		if (!propertiesUtilService.getCorpBatchFormat().equalsIgnoreCase("cas_style_format")) {
 			queryLot.setCorpName(this.generateCorpName(queryLot));
-			//TODO: may want to save the old name as an alias
+			// TODO: may want to save the old name as an alias
 			// also need to deal with data that may be registered to the old corp name
 		}
-		logger.info("new lot corp name: " + queryLot.getCorpName());		
+		logger.info("new lot corp name: " + queryLot.getCorpName());
 		// recalculate lot weight
 		queryLot.setLotMolWeight(Lot.calculateLotMolWeight(queryLot));
 		queryLot.setModifiedBy(modifiedByUser);
@@ -110,7 +110,7 @@ public Lot reparentLot(String lotCorpName, String parentCorpName, String modifie
 	public String updateLotMetaArray(String jsonArray) {
 		Collection<LotDTO> lotDTOCollection = LotDTO.fromJsonArrayToLoes(jsonArray);
 		int lotCounter = 0;
-		for (LotDTO lotDTO : lotDTOCollection){
+		for (LotDTO lotDTO : lotDTOCollection) {
 			updateLotMeta(lotDTO);
 			lotCounter++;
 		}
@@ -122,80 +122,119 @@ public String updateLotMetaArray(String jsonArray) {
 	public Lot updateLotMeta(LotDTO lotDTO) {
 
 		// Fields not to edit
-		//	    private String asDrawnStruct;
-		//	    private int lotAsDrawnCdId;
-		//	    private long buid;
-		//	    private Parent parent;
-		//	    private BulkLoadFile bulkLoadFile;
-		//	    private Set<FileList> fileLists = new HashSet<FileList>();
-		//	    private Double lotMolWeight;
-		//	    private SaltForm saltForm;
+		// private String asDrawnStruct;
+		// private int lotAsDrawnCdId;
+		// private long buid;
+		// private Parent parent;
+		// private BulkLoadFile bulkLoadFile;
+		// private Set<FileList> fileLists = new HashSet<FileList>();
+		// private Double lotMolWeight;
+		// private SaltForm saltForm;
 
 		Lot lot = null;
-		if (lotDTO.getId() != null){
+		if (lotDTO.getId() != null) {
 			lot = Lot.findLot(lotDTO.getId());
 		} else {
 			List<Lot> lots = Lot.findLotsByCorpNameEquals(lotDTO.getLotCorpName()).getResultList();
-			if (lots.size() == 0){
+			if (lots.size() == 0) {
 				String errorMessage = "ERROR: Did not find requested query lot: " + lotDTO.getLotCorpName();
 				logger.error(errorMessage);
 				throw new RuntimeException("ERROR");
-			} else if (lots.size() > 1){
-				String errorMessage = "ERROR: found multiple lots for: " + lotDTO.getLotCorpName();		
-				logger.error(errorMessage);			 
+			} else if (lots.size() > 1) {
+				String errorMessage = "ERROR: found multiple lots for: " + lotDTO.getLotCorpName();
+				logger.error(errorMessage);
 			} else {
 				lot = lots.get(0);
 			}
 		}
 
-		try{
-
-			if (lotDTO.getLotNumber() != null) lot.setLotNumber(lotDTO.getLotNumber());
-
-			if (lotDTO.getColor() != null) lot.setColor(lotDTO.getColor());
-			if (lotDTO.getBarcode() != null) lot.setBarcode(lotDTO.getBarcode());
-			if (lotDTO.getComments() != null) lot.setComments(lotDTO.getComments());
-			if (lotDTO.getNotebookPage() != null) lot.setNotebookPage(lotDTO.getNotebookPage());
-			if (lotDTO.getAmount() != null) lot.setAmount(lotDTO.getAmount());
-			if (lotDTO.getSolutionAmount() != null) lot.setSolutionAmount(lotDTO.getSolutionAmount());
-
-			if (lotDTO.getSupplier() != null) lot.setSupplier(lotDTO.getSupplier());
-			if (lotDTO.getSupplierID() != null) lot.setSupplierID(lotDTO.getSupplierID());
-			if (lotDTO.getPurity() != null) lot.setPurity(lotDTO.getPurity());
-			if (lotDTO.getPercentEE() != null) lot.setPercentEE(lotDTO.getPercentEE());
-			if (lotDTO.getIsVirtual() != null) lot.setIsVirtual(lotDTO.getIsVirtual());
-			if (lotDTO.getRetain() != null) lot.setRetain(lotDTO.getRetain());
-			if (lotDTO.getRetainLocation() != null) lot.setRetainLocation(lotDTO.getRetainLocation());
-
-			if (lotDTO.getMeltingPoint() != null) lot.setMeltingPoint(lotDTO.getMeltingPoint());
-			if (lotDTO.getBoilingPoint() != null) lot.setBoilingPoint(lotDTO.getBoilingPoint());
-			if (lotDTO.getSupplierLot() != null) lot.setSupplierLot(lotDTO.getSupplierLot());
-			if (lotDTO.getLambda() != null) lot.setLambda(lotDTO.getLambda());
-			if (lotDTO.getAbsorbance() != null) lot.setAbsorbance(lotDTO.getAbsorbance());
-			if (lotDTO.getStockSolvent() != null) lot.setStockSolvent(lotDTO.getStockSolvent());
-			if (lotDTO.getStockLocation() != null) lot.setStockLocation(lotDTO.getStockLocation());
-
-			if (lotDTO.getSynthesisDate() != null) lot.setSynthesisDate(lotDTO.getSynthesisDate());
-			if (lotDTO.getRegistrationDate() != null) lot.setRegistrationDate(lotDTO.getRegistrationDate());
-
-			if (lotDTO.getProject() != null && lotDTO.getProject().length() > 0) lot.setProject(lotDTO.getProject());
-			if (lotDTO.getChemist() != null && lotDTO.getChemist().length() > 0) lot.setChemist(Author.findAuthorsByUserName(lotDTO.getChemist()).getSingleResult().getUserName());
-			if (lotDTO.getLotRegisteredBy() != null && lotDTO.getLotRegisteredBy().length() > 0) lot.setRegisteredBy(Author.findAuthorsByUserName(lotDTO.getLotRegisteredBy()).getSingleResult().getUserName());
-			if (lotDTO.getPurityMeasuredByCode() != null && lotDTO.getPurityMeasuredByCode().length() > 0) lot.setPurityMeasuredBy(PurityMeasuredBy.findPurityMeasuredBysByNameEquals(lotDTO.getPurityMeasuredByCode()).getSingleResult());
-			if (lotDTO.getPhysicalStateCode() != null && lotDTO.getPhysicalStateCode().length() > 0) lot.setPhysicalState(PhysicalState.findPhysicalStatesByNameEquals(lotDTO.getPhysicalStateCode()).getSingleResult());
-			if (lotDTO.getVendorCode() != null && lotDTO.getVendorCode().length() > 0)  lot.setVendor(Vendor.findVendorsByCodeEquals(lotDTO.getVendorCode()).getSingleResult());
-			if (lotDTO.getPurityOperatorCode() != null && lotDTO.getPurityOperatorCode().length() > 0) lot.setPurityOperator(Operator.findOperatorsByCodeEquals(lotDTO.getPurityOperatorCode()).getSingleResult());
-			if (lotDTO.getAmountUnitsCode() != null && lotDTO.getAmountUnitsCode().length() > 0) lot.setAmountUnits(Unit.findUnitsByCodeEquals(lotDTO.getAmountUnitsCode()).getSingleResult());
-			if (lotDTO.getRetainUnitsCode() != null && lotDTO.getRetainUnitsCode().length() > 0) lot.setRetainUnits(Unit.findUnitsByCodeEquals(lotDTO.getRetainUnitsCode()).getSingleResult());
-			if (lotDTO.getSolutionAmountUnitsCode() != null && lotDTO.getSolutionAmountUnitsCode().length() > 0) lot.setSolutionAmountUnits(SolutionUnit.findSolutionUnitsByCodeEquals(lotDTO.getSolutionAmountUnitsCode()).getSingleResult());
-			if (lotDTO.getModifiedBy() != null && lotDTO.getModifiedBy().length() > 0) lot.setModifiedBy(lotDTO.getModifiedBy());
-
-			if (lotDTO.getLotAliases() != null && lotDTO.getLotAliases().length() > 0){
+		try {
+
+			if (lotDTO.getLotNumber() != null)
+				lot.setLotNumber(lotDTO.getLotNumber());
+
+			if (lotDTO.getColor() != null)
+				lot.setColor(lotDTO.getColor());
+			if (lotDTO.getBarcode() != null)
+				lot.setBarcode(lotDTO.getBarcode());
+			if (lotDTO.getComments() != null)
+				lot.setComments(lotDTO.getComments());
+			if (lotDTO.getNotebookPage() != null)
+				lot.setNotebookPage(lotDTO.getNotebookPage());
+			if (lotDTO.getAmount() != null)
+				lot.setAmount(lotDTO.getAmount());
+			if (lotDTO.getSolutionAmount() != null)
+				lot.setSolutionAmount(lotDTO.getSolutionAmount());
+
+			if (lotDTO.getSupplier() != null)
+				lot.setSupplier(lotDTO.getSupplier());
+			if (lotDTO.getSupplierID() != null)
+				lot.setSupplierID(lotDTO.getSupplierID());
+			if (lotDTO.getPurity() != null)
+				lot.setPurity(lotDTO.getPurity());
+			if (lotDTO.getPercentEE() != null)
+				lot.setPercentEE(lotDTO.getPercentEE());
+			if (lotDTO.getIsVirtual() != null)
+				lot.setIsVirtual(lotDTO.getIsVirtual());
+			if (lotDTO.getRetain() != null)
+				lot.setRetain(lotDTO.getRetain());
+			if (lotDTO.getRetainLocation() != null)
+				lot.setRetainLocation(lotDTO.getRetainLocation());
+
+			if (lotDTO.getMeltingPoint() != null)
+				lot.setMeltingPoint(lotDTO.getMeltingPoint());
+			if (lotDTO.getBoilingPoint() != null)
+				lot.setBoilingPoint(lotDTO.getBoilingPoint());
+			if (lotDTO.getSupplierLot() != null)
+				lot.setSupplierLot(lotDTO.getSupplierLot());
+			if (lotDTO.getLambda() != null)
+				lot.setLambda(lotDTO.getLambda());
+			if (lotDTO.getAbsorbance() != null)
+				lot.setAbsorbance(lotDTO.getAbsorbance());
+			if (lotDTO.getStockSolvent() != null)
+				lot.setStockSolvent(lotDTO.getStockSolvent());
+			if (lotDTO.getStockLocation() != null)
+				lot.setStockLocation(lotDTO.getStockLocation());
+
+			if (lotDTO.getSynthesisDate() != null)
+				lot.setSynthesisDate(lotDTO.getSynthesisDate());
+			if (lotDTO.getRegistrationDate() != null)
+				lot.setRegistrationDate(lotDTO.getRegistrationDate());
+
+			if (lotDTO.getProject() != null && lotDTO.getProject().length() > 0)
+				lot.setProject(lotDTO.getProject());
+			if (lotDTO.getChemist() != null && lotDTO.getChemist().length() > 0)
+				lot.setChemist(Author.findAuthorsByUserName(lotDTO.getChemist()).getSingleResult().getUserName());
+			if (lotDTO.getLotRegisteredBy() != null && lotDTO.getLotRegisteredBy().length() > 0)
+				lot.setRegisteredBy(
+						Author.findAuthorsByUserName(lotDTO.getLotRegisteredBy()).getSingleResult().getUserName());
+			if (lotDTO.getPurityMeasuredByCode() != null && lotDTO.getPurityMeasuredByCode().length() > 0)
+				lot.setPurityMeasuredBy(PurityMeasuredBy
+						.findPurityMeasuredBysByNameEquals(lotDTO.getPurityMeasuredByCode()).getSingleResult());
+			if (lotDTO.getPhysicalStateCode() != null && lotDTO.getPhysicalStateCode().length() > 0)
+				lot.setPhysicalState(
+						PhysicalState.findPhysicalStatesByNameEquals(lotDTO.getPhysicalStateCode()).getSingleResult());
+			if (lotDTO.getVendorCode() != null && lotDTO.getVendorCode().length() > 0)
+				lot.setVendor(Vendor.findVendorsByCodeEquals(lotDTO.getVendorCode()).getSingleResult());
+			if (lotDTO.getPurityOperatorCode() != null && lotDTO.getPurityOperatorCode().length() > 0)
+				lot.setPurityOperator(
+						Operator.findOperatorsByCodeEquals(lotDTO.getPurityOperatorCode()).getSingleResult());
+			if (lotDTO.getAmountUnitsCode() != null && lotDTO.getAmountUnitsCode().length() > 0)
+				lot.setAmountUnits(Unit.findUnitsByCodeEquals(lotDTO.getAmountUnitsCode()).getSingleResult());
+			if (lotDTO.getRetainUnitsCode() != null && lotDTO.getRetainUnitsCode().length() > 0)
+				lot.setRetainUnits(Unit.findUnitsByCodeEquals(lotDTO.getRetainUnitsCode()).getSingleResult());
+			if (lotDTO.getSolutionAmountUnitsCode() != null && lotDTO.getSolutionAmountUnitsCode().length() > 0)
+				lot.setSolutionAmountUnits(SolutionUnit
+						.findSolutionUnitsByCodeEquals(lotDTO.getSolutionAmountUnitsCode()).getSingleResult());
+			if (lotDTO.getModifiedBy() != null && lotDTO.getModifiedBy().length() > 0)
+				lot.setModifiedBy(lotDTO.getModifiedBy());
+
+			if (lotDTO.getLotAliases() != null && lotDTO.getLotAliases().length() > 0) {
 				lot = lotAliasService.updateLotDefaultAlias(lot, lotDTO.getLotAliases());
 			}
 
-		}catch (Exception e){
-			logger.error("Caught error udating up lot property "+e);
+		} catch (Exception e) {
+			logger.error("Caught error udating up lot property " + e);
 			throw new RuntimeException("An error has occurred updating lot property ");
 		}
 
@@ -208,86 +247,90 @@ public Lot updateLotMeta(LotDTO lotDTO) {
 	@Override
 	public Collection<LotsByProjectDTO> getLotsByProjectsList(List<String> projects) {
 		Collection<LotsByProjectDTO> lots = Lot.findLotsByProjectsList(projects).getResultList();
-		return(lots);
+		return (lots);
 	}
 
-	//NEW
+	// NEW
 	@Override
 	public String generateSaltFormLotName(Lot lot) {
-        String corpName = lot.getSaltForm().getCorpName();
-        logger.debug("Salt corpName = " + corpName);
-        int lotNumber = this.generateSaltFormLotNumber(lot);
-        lot.setLotNumber(lotNumber);
-        
-        String batchFormat = "%0"+ propertiesUtilService.getFormatBatchDigits()  + "d";
-        corpName = corpName.concat(propertiesUtilService.getBatchSeparator()).concat(String.format(batchFormat, lotNumber));
-        logger.debug("corpName: " + corpName);
-        return corpName;
-    }
-
-    @Override
-    public String appendSaltCode(String corpName, Lot lot) {
-    	List<IsoSalt> isoSalts = IsoSalt.findIsoSaltsBySaltForm(lot.getSaltForm()).getResultList();
-    	logger.debug("number of isoSalts: " + isoSalts.size());
-    	if (isoSalts.size() == 0){
-        	corpName = corpName.concat(propertiesUtilService.getNoSaltCode());        		
-    	} else {
-    		for (IsoSalt isoSalt:isoSalts){
-    			if (isoSalt.getType().equalsIgnoreCase("salt")){
-                   	corpName = corpName.concat(isoSalt.getSalt().getAbbrev());        		        				
-    			} else if (isoSalt.getType().equalsIgnoreCase("isotope")){
-                   	corpName = corpName.concat(isoSalt.getIsotope().getAbbrev());        		
-    			}                           			
-    		}
-    	}
+		String corpName = lot.getSaltForm().getCorpName();
+		logger.debug("Salt corpName = " + corpName);
+		int lotNumber = this.generateSaltFormLotNumber(lot);
+		lot.setLotNumber(lotNumber);
+
+		String batchFormat = "%0" + propertiesUtilService.getFormatBatchDigits() + "d";
+		corpName = corpName.concat(propertiesUtilService.getBatchSeparator())
+				.concat(String.format(batchFormat, lotNumber));
+		logger.debug("corpName: " + corpName);
+		return corpName;
+	}
+
+	@Override
+	public String appendSaltCode(String corpName, Lot lot) {
+		List<IsoSalt> isoSalts = IsoSalt.findIsoSaltsBySaltForm(lot.getSaltForm()).getResultList();
+		logger.debug("number of isoSalts: " + isoSalts.size());
+		if (isoSalts.size() == 0) {
+			corpName = corpName.concat(propertiesUtilService.getNoSaltCode());
+		} else {
+			for (IsoSalt isoSalt : isoSalts) {
+				if (isoSalt.getType().equalsIgnoreCase("salt")) {
+					corpName = corpName.concat(isoSalt.getSalt().getAbbrev());
+				} else if (isoSalt.getType().equalsIgnoreCase("isotope")) {
+					corpName = corpName.concat(isoSalt.getIsotope().getAbbrev());
+				}
+			}
+		}
 		return corpName;
 	}
 
 	@Override
-    public String generateParentLotName(Lot lot) {
-        logger.debug("generating the new lot corp name");
-        String corpName = lot.getSaltForm().getParent().getCorpName();
-        logger.debug("Parent corpName = " + corpName);
-        int lotNumber = this.generateParentLotNumber(lot);
-        lot.setLotNumber(lotNumber);
-        
-        if (propertiesUtilService.getFormatBatchDigits() == 0){
-        	logger.error("formatBatchDigits is set to " + propertiesUtilService.getFormatBatchDigits() );
-        }
-        String batchFormat = "%0"+ propertiesUtilService.getFormatBatchDigits()  + "d";
-        logger.debug("batch format is " + batchFormat);
-        if (propertiesUtilService.getCorpBatchFormat().equalsIgnoreCase("corp_saltcode_batch")){
-        	corpName = corpName.concat(propertiesUtilService.getSaltSeparator());
-        	corpName = appendSaltCode(corpName, lot);
-            corpName = corpName.concat(propertiesUtilService.getBatchSeparator()).concat(String.format(batchFormat, lotNumber));
-        } else if (propertiesUtilService.getCorpBatchFormat().equalsIgnoreCase("corp_batch_saltcode")) {
-            corpName = corpName.concat(propertiesUtilService.getBatchSeparator()).concat(String.format(batchFormat, lotNumber));
-            if (propertiesUtilService.getAppendSaltCodeToLotName()){
-            	corpName = corpName.concat(propertiesUtilService.getSaltSeparator());
-            	corpName = appendSaltCode(corpName, lot);
-            }        	
-        } else {
-            corpName = corpName.concat(propertiesUtilService.getBatchSeparator()).concat(String.format(batchFormat, lotNumber));
-        }
-        
-        logger.debug("corpName: " + corpName);
-        return corpName;
-    }
+	public String generateParentLotName(Lot lot) {
+		logger.debug("generating the new lot corp name");
+		String corpName = lot.getSaltForm().getParent().getCorpName();
+		logger.debug("Parent corpName = " + corpName);
+		int lotNumber = this.generateParentLotNumber(lot);
+		lot.setLotNumber(lotNumber);
+
+		if (propertiesUtilService.getFormatBatchDigits() == 0) {
+			logger.error("formatBatchDigits is set to " + propertiesUtilService.getFormatBatchDigits());
+		}
+		String batchFormat = "%0" + propertiesUtilService.getFormatBatchDigits() + "d";
+		logger.debug("batch format is " + batchFormat);
+		if (propertiesUtilService.getCorpBatchFormat().equalsIgnoreCase("corp_saltcode_batch")) {
+			corpName = corpName.concat(propertiesUtilService.getSaltSeparator());
+			corpName = appendSaltCode(corpName, lot);
+			corpName = corpName.concat(propertiesUtilService.getBatchSeparator())
+					.concat(String.format(batchFormat, lotNumber));
+		} else if (propertiesUtilService.getCorpBatchFormat().equalsIgnoreCase("corp_batch_saltcode")) {
+			corpName = corpName.concat(propertiesUtilService.getBatchSeparator())
+					.concat(String.format(batchFormat, lotNumber));
+			if (propertiesUtilService.getAppendSaltCodeToLotName()) {
+				corpName = corpName.concat(propertiesUtilService.getSaltSeparator());
+				corpName = appendSaltCode(corpName, lot);
+			}
+		} else {
+			corpName = corpName.concat(propertiesUtilService.getBatchSeparator())
+					.concat(String.format(batchFormat, lotNumber));
+		}
+
+		logger.debug("corpName: " + corpName);
+		return corpName;
+	}
 
 	@Override
 	public String generateCasStyleLotName(Lot lot) {
-    	List seqList = lot.generateCustomLotSequence();
+		List seqList = lot.generateCustomLotSequence();
 		String inputSequence = seqList.get(0).toString();
 		int casCheckDigit = generateCasCheckDigit(inputSequence);
-		String fullName =String.format("%09d", Long.parseLong(inputSequence));
+		String fullName = String.format("%09d", Long.parseLong(inputSequence));
 		logger.info(fullName);
 		StringBuilder sb = new StringBuilder();
 		sb = sb.append(propertiesUtilService.getCorpPrefix()).append(propertiesUtilService.getCorpSeparator());
-		
+
 		String regexPattern = "(\\d{3})(\\d{3})(\\d{3})";
 		Pattern p = Pattern.compile(regexPattern);
 		Matcher m = p.matcher(fullName);
-		if (m.find()){
+		if (m.find()) {
 			sb.append(m.group(1)).append(propertiesUtilService.getCorpSeparator());
 			sb.append(m.group(2)).append(propertiesUtilService.getCorpSeparator());
 			sb.append(m.group(3)).append(propertiesUtilService.getCorpSeparator());
@@ -296,102 +339,101 @@ public String generateCasStyleLotName(Lot lot) {
 		String lotName = sb.toString();
 		logger.info(lotName);
 
-		//set lot number
+		// set lot number
 		int lotNumber = this.generateParentLotNumber(lot);
-        lot.setLotNumber(lotNumber);
-		
-    	return lotName;
-    }
-
-	@Override 
-    public int generateSaltFormLotNumber(Lot lot){
-    	Integer lotNumber = 0;
-        if (lot.getIsVirtual()) {
-            lotNumber = 0;
-        } else {
-        	if (lot.getLotNumber() != null && lot.getLotNumber() > 0){
-        		lotNumber = lot.getLotNumber();
-        	}else{
-        		 int lotCount = 0;
-                 if (Lot.getMaxSaltFormLotNumber(lot.getSaltForm()) == null) {
-                     logger.error("this is a null pointer exception. Set lotCount = 0");
-                 } else {
-                     lotCount = Lot.getMaxSaltFormLotNumber(lot.getSaltForm());
-                 }
-                 logger.debug("Lot Count = " + lotCount);
-                 lotNumber = lotCount + 1;
-        	}
-        }
-        logger.debug("Lot Number = " + lotNumber);
-        return lotNumber;
-    }
+		lot.setLotNumber(lotNumber);
+
+		return lotName;
+	}
+
+	@Override
+	public int generateSaltFormLotNumber(Lot lot) {
+		Integer lotNumber = 0;
+		if (lot.getIsVirtual()) {
+			lotNumber = 0;
+		} else {
+			if (lot.getLotNumber() != null && lot.getLotNumber() > 0) {
+				lotNumber = lot.getLotNumber();
+			} else {
+				int lotCount = 0;
+				if (Lot.getMaxSaltFormLotNumber(lot.getSaltForm()) == null) {
+					logger.error("this is a null pointer exception. Set lotCount = 0");
+				} else {
+					lotCount = Lot.getMaxSaltFormLotNumber(lot.getSaltForm());
+				}
+				logger.debug("Lot Count = " + lotCount);
+				lotNumber = lotCount + 1;
+			}
+		}
+		logger.debug("Lot Number = " + lotNumber);
+		return lotNumber;
+	}
 
 	@Override
-	public int generateCasCheckDigit(String inputCasLabel){
+	public int generateCasCheckDigit(String inputCasLabel) {
 		int checkDigit = 0;
 		logger.info("" + inputCasLabel.length());
 		int sum = 0;
-		for (int index=0; index < inputCasLabel.length(); index++){
+		for (int index = 0; index < inputCasLabel.length(); index++) {
 			logger.info("current index: " + index);
-			sum += (inputCasLabel.length() - index ) * Integer.parseInt(inputCasLabel.substring(index, index+1));
+			sum += (inputCasLabel.length() - index) * Integer.parseInt(inputCasLabel.substring(index, index + 1));
 			logger.info("sum: " + sum);
 		}
 		checkDigit = sum % 10;
 		return checkDigit;
 	}
-   
+
 	@Override
-    public String generateCorpName(Lot lot) {
-        logger.info("corp batch format is: " + propertiesUtilService.getCorpBatchFormat());
-
-        String corpName = null;
-        if (propertiesUtilService.getCorpBatchFormat().equalsIgnoreCase("cas_style_format")){
-        	corpName = generateCasStyleLotName(lot);
-        } else if (propertiesUtilService.getSaltBeforeLot()) {
-            corpName = generateSaltFormLotName(lot);
-        } else {
-            corpName = generateParentLotName(lot);
-        }
-        return corpName;
-    }
-    
+	public String generateCorpName(Lot lot) {
+		logger.info("corp batch format is: " + propertiesUtilService.getCorpBatchFormat());
+
+		String corpName = null;
+		if (propertiesUtilService.getCorpBatchFormat().equalsIgnoreCase("cas_style_format")) {
+			corpName = generateCasStyleLotName(lot);
+		} else if (propertiesUtilService.getSaltBeforeLot()) {
+			corpName = generateSaltFormLotName(lot);
+		} else {
+			corpName = generateParentLotName(lot);
+		}
+		return corpName;
+	}
+
 	@Override
-    public int generateLotNumber(Lot lot) {
-
-        int lotNumber = 0;
-        if (propertiesUtilService.getSaltBeforeLot()) {
-        	lotNumber = generateSaltFormLotNumber(lot);
-        } else {
-        	lotNumber = generateParentLotNumber(lot);
-        }
-        return lotNumber;
-    }
-    
+	public int generateLotNumber(Lot lot) {
+
+		int lotNumber = 0;
+		if (propertiesUtilService.getSaltBeforeLot()) {
+			lotNumber = generateSaltFormLotNumber(lot);
+		} else {
+			lotNumber = generateParentLotNumber(lot);
+		}
+		return lotNumber;
+	}
+
 	@Override
-    public int generateParentLotNumber(Lot lot){
-    	//set lot number
+	public int generateParentLotNumber(Lot lot) {
+		// set lot number
 		Integer lotNumber = lot.getLotNumber();
-        if (lot.getIsVirtual()) {
-            lotNumber = 0;
-        } else {
-        	if (lot.getLotNumber() != null && lot.getLotNumber() > 0){
-        		lotNumber = lot.getLotNumber();
-        	}else{
-        		int lotCount = 0;
-        		if (lot.getParent().getId() == null){
-        			logger.debug("Setting lotCount of new parent = 0");
-        		}else if (Lot.getMaxParentLotNumber(lot.getParent()) == null) {
-                    logger.debug("this is a null pointer exception. Set lotCount = 0");
-                } else {
-                    lotCount = Lot.getMaxParentLotNumber(lot.getParent());
-                }
-                logger.debug("Lot Count = " + lotCount);
-                lotNumber = lotCount + 1;
-        	}
-        }
-        logger.debug("Lot Number = " + lotNumber);
-        return lotNumber;
-    }
-    
+		if (lot.getIsVirtual()) {
+			lotNumber = 0;
+		} else {
+			if (lot.getLotNumber() != null && lot.getLotNumber() > 0) {
+				lotNumber = lot.getLotNumber();
+			} else {
+				int lotCount = 0;
+				if (lot.getParent().getId() == null) {
+					logger.debug("Setting lotCount of new parent = 0");
+				} else if (Lot.getMaxParentLotNumber(lot.getParent()) == null) {
+					logger.debug("this is a null pointer exception. Set lotCount = 0");
+				} else {
+					lotCount = Lot.getMaxParentLotNumber(lot.getParent());
+				}
+				logger.debug("Lot Count = " + lotCount);
+				lotNumber = lotCount + 1;
+			}
+		}
+		logger.debug("Lot Number = " + lotNumber);
+		return lotNumber;
+	}
 
 }
diff --git a/src/main/java/com/labsynch/labseer/service/LsThingService.java b/src/main/java/com/labsynch/labseer/service/LsThingService.java
index 17ff78286..f688b4482 100755
--- a/src/main/java/com/labsynch/labseer/service/LsThingService.java
+++ b/src/main/java/com/labsynch/labseer/service/LsThingService.java
@@ -27,7 +27,7 @@
 
 @Service
 public interface LsThingService {
-	
+
 	PreferredNameResultsDTO getCodeNameFromName(String thingType,
 			String thingKind, String labelType, String labelKind, PreferredNameRequestDTO requestDTO);
 
@@ -35,7 +35,7 @@ PreferredNameResultsDTO getCodeNameFromName(String thingType,
 
 	PreferredNameResultsDTO getPreferredNameFromName(String thingType,
 			String thingKind, String labelType, String labelKind, String json);
-	
+
 	PreferredNameResultsDTO getPreferredNameFromName(String json);
 
 	String getProjectCodes();
@@ -67,8 +67,7 @@ Collection<LsThing> findLsThingsByGenericMetaDataSearch(String searchQuery,
 
 	Collection<LsThing> findLsThingsByGenericMetaDataSearch(String searchQuery,
 			String lsType,
-			String lsKind
-	);
+			String lsKind);
 
 	Collection<CodeTableDTO> getCodeTableLsThings(String lsType, String lsKind, boolean includeIgnored);
 
@@ -85,7 +84,7 @@ Collection<LsThing> searchForDocumentThings(
 	ArrayList<LsThingValidationErrorMessage> validateLsThing(LsThingValidationDTO validationDTO);
 
 	Collection<LsThing> sortLsThingsByCodeName(Collection<LsThing> lsThings);
-	
+
 	Collection<LsThing> sortBatches(Collection<LsThing> batches);
 
 	DependencyCheckDTO checkBatchDependencies(LsThing batch);
@@ -111,7 +110,7 @@ Collection<LsThing> structureSearch(String queryMol, SearchType searchType,
 			Integer maxResults, Float similarity);
 
 	DependencyCheckDTO checkDependencies(LsThing lsThing);
-	
+
 	Collection<Long> searchLsThingIdsByQueryDTO(LsThingQueryDTO query) throws Exception;
 
 	Collection<LsThing> getLsThingsByIds(Collection<Long> lsThingIds);
@@ -122,14 +121,14 @@ Collection<LsThing> structureSearch(String queryMol, SearchType searchType,
 
 	Collection<Long> searchLsThingIdsByBrowserQueryDTO(LsThingBrowserQueryDTO query) throws Exception;
 
-	Collection<Long> searchLsThingIdsByQueryDTOandStructure(LsThingQueryDTO query, String queryMol, SearchType searchType,
+	Collection<Long> searchLsThingIdsByQueryDTOandStructure(LsThingQueryDTO query, String queryMol,
+			SearchType searchType,
 			Integer maxResults, Float similarity) throws Exception;
 
 	Collection<LsThing> structureSearch(String queryMol, String lsType, String lsKind, SearchType searchType,
 			Integer maxResults, Float similarity);
-	
+
 	Collection<String> getLsThingCodesByDateValueComparison(
 			DateValueComparisonRequest requestDTO) throws Exception;
-	
-	
+
 }
diff --git a/src/main/java/com/labsynch/labseer/service/LsThingServiceImpl.java b/src/main/java/com/labsynch/labseer/service/LsThingServiceImpl.java
index fe794e0dd..3d649dca5 100755
--- a/src/main/java/com/labsynch/labseer/service/LsThingServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/LsThingServiceImpl.java
@@ -83,18 +83,18 @@ public class LsThingServiceImpl implements LsThingService {
 
 	@Autowired
 	private AutoLabelService autoLabelService;
-	
+
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
-	
+
 	@Autowired
 	private AuthorService authorService;
-	
+
 	@Autowired
 	private StructureService structureService;
 
 	@Override
-	public String getProjectCodes(){
+	public String getProjectCodes() {
 
 		String thingType = "project";
 		String thingKind = "project";
@@ -102,15 +102,16 @@ public String getProjectCodes(){
 		Collection<CodeTableDTO> codes = new HashSet<CodeTableDTO>();
 
 		List<LsThing> projects = LsThing.findLsThing(thingType, thingKind).getResultList();
-		for (LsThing project : projects){
+		for (LsThing project : projects) {
 			CodeTableDTO code = new CodeTableDTO();
 			code.setCode(project.getCodeName());
 			code.setIgnored(project.isIgnored());
-			List<LsThingLabel> preferredNames = LsThingLabel.findLsThingPreferredName(project.getId(), "name", "project name").getResultList();
-			if (preferredNames.size() != 1){
-				//ERROR
+			List<LsThingLabel> preferredNames = LsThingLabel
+					.findLsThingPreferredName(project.getId(), "name", "project name").getResultList();
+			if (preferredNames.size() != 1) {
+				// ERROR
 			} else {
-				code.setName(preferredNames.get(0).getLabelText());				
+				code.setName(preferredNames.get(0).getLabelText());
 			}
 			codes.add(code);
 		}
@@ -118,23 +119,23 @@ public String getProjectCodes(){
 		return CodeTableDTO.toJsonArray(codes);
 	}
 
-
 	@Override
-	public PreferredNameResultsDTO getGeneCodeNameFromName(String json){
+	public PreferredNameResultsDTO getGeneCodeNameFromName(String json) {
 
 		String thingType = "gene";
 		String thingKind = "entrez gene";
 		String labelType = "name";
 		String labelKind = "Entrez Gene ID";
 
-		PreferredNameResultsDTO responseOutput = getPreferredNameFromName(thingType, thingKind, labelType, labelKind, json);
-		
+		PreferredNameResultsDTO responseOutput = getPreferredNameFromName(thingType, thingKind, labelType, labelKind,
+				json);
+
 		return responseOutput;
 	}
 
-	
 	@Override
-	public PreferredNameResultsDTO getCodeNameFromName(String thingType, String thingKind, String labelType, String labelKind, PreferredNameRequestDTO requestDTO){
+	public PreferredNameResultsDTO getCodeNameFromName(String thingType, String thingKind, String labelType,
+			String labelKind, PreferredNameRequestDTO requestDTO) {
 
 		logger.info("number of requests: " + requestDTO.getRequests().size());
 		Collection<PreferredNameDTO> requests = requestDTO.getRequests();
@@ -155,11 +156,11 @@ public PreferredNameResultsDTO getCodeNameFromName(String thingType, String thin
 		Predicate thingNotIgnored = cb.not(lsThingRoot.<Boolean>get("ignored"));
 		predicateList.add(thingNotIgnored);
 		// Thing Type and Kind
-		if (thingType != null && thingType.length() > 0){
+		if (thingType != null && thingType.length() > 0) {
 			Predicate predicate = cb.equal(lsThingRoot.<String>get("lsType"), thingType);
 			predicateList.add(predicate);
 		}
-		if (thingKind != null && thingKind.length() > 0){
+		if (thingKind != null && thingKind.length() > 0) {
 			Predicate predicate = cb.equal(lsThingRoot.<String>get("lsKind"), thingKind);
 			predicateList.add(predicate);
 		}
@@ -171,11 +172,11 @@ public PreferredNameResultsDTO getCodeNameFromName(String thingType, String thin
 
 		Predicate labelNotIgnored = cb.not(lsThingLabel.<Boolean>get("ignored"));
 		labelPredicatesList.add(labelNotIgnored);
-		if (labelType != null && labelType.length() > 0){
+		if (labelType != null && labelType.length() > 0) {
 			Predicate labelTypePredicate = cb.equal(lsThingLabel.<String>get("lsType"), labelType);
 			labelPredicatesList.add(labelTypePredicate);
 		}
-		if (labelKind != null && labelKind.length() > 0){
+		if (labelKind != null && labelKind.length() > 0) {
 			Predicate labelKindPredicate = cb.equal(lsThingLabel.<String>get("lsKind"), labelKind);
 			labelPredicatesList.add(labelKindPredicate);
 		}
@@ -184,7 +185,7 @@ public PreferredNameResultsDTO getCodeNameFromName(String thingType, String thin
 
 		// Put all the requestNames into a list
 		List<String> requestNameList = new ArrayList<String>();
-		for (PreferredNameDTO request : requests){
+		for (PreferredNameDTO request : requests) {
 			requestNameList.add(request.getRequestName());
 		}
 		// Match on either labelText or codeName
@@ -201,17 +202,19 @@ public PreferredNameResultsDTO getCodeNameFromName(String thingType, String thin
 		TypedQuery<LsThing> q = em.createQuery(criteria);
 		logger.debug(q.unwrap(org.hibernate.Query.class).getQueryString());
 		List<LsThing> foundLsThings = q.getResultList();
-		// Construct a PreferredNameDTO for each possible requestName for each found LsThing, both by label and by codeName
-		// The goal is to be able to line up with what was sent in, whether it was by label or by codeName
+		// Construct a PreferredNameDTO for each possible requestName for each found
+		// LsThing, both by label and by codeName
+		// The goal is to be able to line up with what was sent in, whether it was by
+		// label or by codeName
 		List<PreferredNameDTO> labelResultsDTOs = new ArrayList<PreferredNameDTO>();
 		List<PreferredNameDTO> codeResultsDTOs = new ArrayList<PreferredNameDTO>();
-		for (LsThing lsThing : foundLsThings){
+		for (LsThing lsThing : foundLsThings) {
 			String bestLabel = pickBestLabel(lsThing);
 			String codeName = lsThing.getCodeName();
-			for (LsThingLabel label : lsThing.getLsLabels()){
+			for (LsThingLabel label : lsThing.getLsLabels()) {
 				boolean typeMatches = labelType == null || label.getLsType().equals(labelType);
 				boolean kindMatches = labelKind == null || label.getLsKind().equals(labelKind);
-				if (typeMatches && kindMatches){
+				if (typeMatches && kindMatches) {
 					PreferredNameDTO resByLabel = new PreferredNameDTO(label.getLabelText(), bestLabel, codeName);
 					labelResultsDTOs.add(resByLabel);
 				}
@@ -219,57 +222,56 @@ public PreferredNameResultsDTO getCodeNameFromName(String thingType, String thin
 			PreferredNameDTO resByCodeName = new PreferredNameDTO(codeName, bestLabel, codeName);
 			codeResultsDTOs.add(resByCodeName);
 		}
-		
 
 		// Work up query results into output
-		for (PreferredNameDTO request : requests){
+		for (PreferredNameDTO request : requests) {
 			request.setPreferredName("");
 			request.setReferenceName("");
 			Collection<PreferredNameDTO> matches = new ArrayList<PreferredNameDTO>();
-			for (PreferredNameDTO res : labelResultsDTOs){
-				if (res.getRequestName().equals(request.getRequestName())){
+			for (PreferredNameDTO res : labelResultsDTOs) {
+				if (res.getRequestName().equals(request.getRequestName())) {
 					matches.add(res);
 				}
 			}
 			// Unique list of matches by reference name
 			HashMap<String, PreferredNameDTO> labelMatchesMap = new HashMap<String, PreferredNameDTO>();
-			for (PreferredNameDTO match : matches){
+			for (PreferredNameDTO match : matches) {
 				labelMatchesMap.put(match.getReferenceName(), match);
 			}
 			matches = labelMatchesMap.values();
-			if (matches.size() == 1){
+			if (matches.size() == 1) {
 				PreferredNameDTO match = matches.iterator().next();
 				request.setPreferredName(match.getPreferredName());
 				request.setReferenceName(match.getReferenceName());
-			} else if (matches.size() > 1){
+			} else if (matches.size() > 1) {
 				responseOutput.setError(true);
 				ErrorMessageDTO error = new ErrorMessageDTO();
 				error.setLevel("error");
-				error.setMessage("FOUND MULTIPLE LSTHINGS WITH THE SAME NAME: " + request.getRequestName() );	
+				error.setMessage("FOUND MULTIPLE LSTHINGS WITH THE SAME NAME: " + request.getRequestName());
 				logger.error("FOUND MULTIPLE LSTHINGS WITH THE SAME NAME: " + request.getRequestName());
 				errors.add(error);
 			} else {
 				matches = new ArrayList<PreferredNameDTO>();
-				for (PreferredNameDTO res : codeResultsDTOs){
-					if (res.getRequestName().equals(request.getRequestName())){
+				for (PreferredNameDTO res : codeResultsDTOs) {
+					if (res.getRequestName().equals(request.getRequestName())) {
 						matches.add(res);
 					}
 				}
 				// Unique list of matches by reference name
 				HashMap<String, PreferredNameDTO> codeMatchesMap = new HashMap<String, PreferredNameDTO>();
-				for (PreferredNameDTO match : matches){
+				for (PreferredNameDTO match : matches) {
 					codeMatchesMap.put(match.getReferenceName(), match);
 				}
 				matches = codeMatchesMap.values();
-				if (matches.size() == 1){
+				if (matches.size() == 1) {
 					PreferredNameDTO match = matches.iterator().next();
 					request.setPreferredName(match.getPreferredName());
 					request.setReferenceName(match.getReferenceName());
-				} else if (matches.size() > 1){
+				} else if (matches.size() > 1) {
 					responseOutput.setError(true);
 					ErrorMessageDTO error = new ErrorMessageDTO();
 					error.setLevel("error");
-					error.setMessage("FOUND MULTIPLE LSTHINGS WITH THE SAME NAME: " + request.getRequestName() );	
+					error.setMessage("FOUND MULTIPLE LSTHINGS WITH THE SAME NAME: " + request.getRequestName());
 					logger.error("FOUND MULTIPLE LSTHINGS WITH THE SAME NAME: " + request.getRequestName());
 					errors.add(error);
 				} else {
@@ -277,20 +279,20 @@ public PreferredNameResultsDTO getCodeNameFromName(String thingType, String thin
 				}
 			}
 		}
-		
+
 		responseOutput.setResults(requests);
 		responseOutput.setErrorMessages(errors);
 
 		return responseOutput;
 	}
 
-
 	@Override
-	public PreferredNameResultsDTO getPreferredNameFromName(String thingType, String thingKind, String labelType, String labelKind, String json){
+	public PreferredNameResultsDTO getPreferredNameFromName(String thingType, String thingKind, String labelType,
+			String labelKind, String json) {
 
 		logger.info("in getPreferredNameFromName with input json");
 
-		PreferredNameRequestDTO requestDTO = PreferredNameRequestDTO.fromJsonToPreferredNameRequestDTO(json);	
+		PreferredNameRequestDTO requestDTO = PreferredNameRequestDTO.fromJsonToPreferredNameRequestDTO(json);
 
 		logger.info("number of requests: " + requestDTO.getRequests().size());
 
@@ -300,64 +302,69 @@ public PreferredNameResultsDTO getPreferredNameFromName(String thingType, String
 		Collection<ErrorMessageDTO> errors = new HashSet<ErrorMessageDTO>();
 
 		List<String> requestNameList = new ArrayList<String>();
-		for (PreferredNameDTO request : requests){
+		for (PreferredNameDTO request : requests) {
 			requestNameList.add(request.getRequestName());
 		}
 
-		List<PreferredNameDTO> lsThingLabelsList = new ArrayList<PreferredNameDTO>();	
+		List<PreferredNameDTO> lsThingLabelsList = new ArrayList<PreferredNameDTO>();
 		int batchSize = 999;
 		int i = 1;
 		List<String> requestNamesSubset = new ArrayList<String>();
 		List<PreferredNameDTO> lsThingLabelsFound;
-		for (String requestName : requestNameList){
-//			requestNamesSubset.add(requestName);
-//			List<PreferredNameDTO> lsThingLabels = LsThingLabel.findLsThingPreferredName(thingType, thingKind, labelType, labelKind, requestNamesSubset).getResultList();
-//			lsThingLabelsList.addAll(lsThingLabels);
-//			requestNamesSubset.clear();
+		for (String requestName : requestNameList) {
+			// requestNamesSubset.add(requestName);
+			// List<PreferredNameDTO> lsThingLabels =
+			// LsThingLabel.findLsThingPreferredName(thingType, thingKind, labelType,
+			// labelKind, requestNamesSubset).getResultList();
+			// lsThingLabelsList.addAll(lsThingLabels);
+			// requestNamesSubset.clear();
 
 			requestNamesSubset.add(requestName);
-			if (i % batchSize  == 0 ) { 
-				lsThingLabelsFound = LsThingLabel.findLsThingPreferredName(thingType, thingKind, labelType, labelKind, requestNamesSubset).getResultList();
+			if (i % batchSize == 0) {
+				lsThingLabelsFound = LsThingLabel
+						.findLsThingPreferredName(thingType, thingKind, labelType, labelKind, requestNamesSubset)
+						.getResultList();
 				lsThingLabelsList.addAll(lsThingLabelsFound);
 				requestNamesSubset.clear();
 				logger.debug("searching batch of names " + i);
 			}
-			i++;			
-			
+			i++;
+
 		}
-		
-		if (requestNamesSubset.size() > 0){
-			lsThingLabelsFound = LsThingLabel.findLsThingPreferredName(thingType, thingKind, labelType, labelKind, requestNamesSubset).getResultList();
+
+		if (requestNamesSubset.size() > 0) {
+			lsThingLabelsFound = LsThingLabel
+					.findLsThingPreferredName(thingType, thingKind, labelType, labelKind, requestNamesSubset)
+					.getResultList();
 			lsThingLabelsList.addAll(lsThingLabelsFound);
 			logger.debug("searching last batch of names " + requestNamesSubset.size());
 
 		}
 
-		
 		logger.info("number of thing labels found: " + lsThingLabelsList.size());
-		for (PreferredNameDTO preferredName : lsThingLabelsList){
+		for (PreferredNameDTO preferredName : lsThingLabelsList) {
 			logger.info(preferredName.toJson());
 		}
-		
+
 		MultiValueMap mvm = new MultiValueMap();
-		for (PreferredNameDTO pn : lsThingLabelsList){
+		for (PreferredNameDTO pn : lsThingLabelsList) {
 			mvm.put(pn.getRequestName(), pn);
 		}
 
-		for (PreferredNameDTO request : requests){
+		for (PreferredNameDTO request : requests) {
 			request.setPreferredName("");
 			request.setReferenceName("");
 			@SuppressWarnings("unchecked")
 			List<PreferredNameDTO> lsThingLabels = (List<PreferredNameDTO>) mvm.get(request.getRequestName());
 
-			if (lsThingLabels != null && lsThingLabels.size() == 1){
+			if (lsThingLabels != null && lsThingLabels.size() == 1) {
 				request.setPreferredName(lsThingLabels.get(0).getPreferredName());
 				request.setReferenceName(lsThingLabels.get(0).getReferenceName());
-			} else if (lsThingLabels != null && lsThingLabels.size() > 1){
+			} else if (lsThingLabels != null && lsThingLabels.size() > 1) {
 				responseOutput.setError(true);
 				ErrorMessageDTO error = new ErrorMessageDTO();
 				error.setLevel("MULTIPLE RESULTS");
-				error.setMessage("FOUND MULTIPLE LS_THINGS WITH THE SAME NAME: " + request.getRequestName() );	
+				error.setMessage("FOUND MULTIPLE LS_THINGS WITH THE SAME NAME: " + request.getRequestName());
 				logger.error("FOUND MULTIPLE LSTHINGS WITH THE SAME NAME: " + request.getRequestName());
 				errors.add(error);
 			} else {
@@ -365,20 +372,19 @@ public PreferredNameResultsDTO getPreferredNameFromName(String thingType, String
 			}
 		}
 
-
 		responseOutput.setResults(requests);
 		responseOutput.setErrorMessages(errors);
 
 		logger.info(responseOutput.toJson());
-		
+
 		return responseOutput;
 	}
-	
-	public PreferredNameResultsDTO getPreferredNameFromName(String json){
+
+	public PreferredNameResultsDTO getPreferredNameFromName(String json) {
 
 		logger.info("in getPreferredNameFromName");
 
-		PreferredNameRequestDTO requestDTO = PreferredNameRequestDTO.fromJsonToPreferredNameRequestDTO(json);	
+		PreferredNameRequestDTO requestDTO = PreferredNameRequestDTO.fromJsonToPreferredNameRequestDTO(json);
 
 		logger.info("number of requests: " + requestDTO.getRequests().size());
 
@@ -388,37 +394,36 @@ public PreferredNameResultsDTO getPreferredNameFromName(String json){
 		Collection<ErrorMessageDTO> errors = new HashSet<ErrorMessageDTO>();
 
 		Set<String> requestNameList = new HashSet<String>();
-		for (PreferredNameDTO request : requests){
+		for (PreferredNameDTO request : requests) {
 			requestNameList.add(request.getRequestName());
 		}
-		
-		
 
-		List<PreferredNameDTO> lsThingLabelsList =LsThingLabel.findLsThingPreferredName(requestNameList).getResultList();
-		
-	
-		
+		List<PreferredNameDTO> lsThingLabelsList = LsThingLabel.findLsThingPreferredName(requestNameList)
+				.getResultList();
+
 		logger.info("number of thing labels found: " + lsThingLabelsList.size());
 		MultiValueMap mvm = new MultiValueMap();
-		for (PreferredNameDTO pn : lsThingLabelsList){
+		for (PreferredNameDTO pn : lsThingLabelsList) {
 			mvm.put(pn.getRequestName(), pn);
 		}
 
-		for (PreferredNameDTO request : requests){
+		for (PreferredNameDTO request : requests) {
 			request.setPreferredName("");
 			request.setReferenceName("");
-			//List<LsThingLabel> lsThingLabels = LsThingLabel.findLsThingPreferredName(thingType, thingKind, labelType, labelKind, request.getRequestName()).getResultList();
+			// List<LsThingLabel> lsThingLabels =
+			// LsThingLabel.findLsThingPreferredName(thingType, thingKind, labelType,
+			// labelKind, request.getRequestName()).getResultList();
 			@SuppressWarnings("unchecked")
 			List<PreferredNameDTO> lsThingLabels = (List<PreferredNameDTO>) mvm.get(request.getRequestName());
 
-			if (lsThingLabels != null && lsThingLabels.size() == 1){
+			if (lsThingLabels != null && lsThingLabels.size() == 1) {
 				request.setPreferredName(lsThingLabels.get(0).getPreferredName());
 				request.setReferenceName(lsThingLabels.get(0).getReferenceName());
-			} else if (lsThingLabels != null && lsThingLabels.size() > 1){
+			} else if (lsThingLabels != null && lsThingLabels.size() > 1) {
 				responseOutput.setError(true);
 				ErrorMessageDTO error = new ErrorMessageDTO();
 				error.setLevel("error");
-				error.setMessage("FOUND MULTIPLE LS_THINGS WITH THE SAME NAME: " + request.getRequestName() );	
+				error.setMessage("FOUND MULTIPLE LS_THINGS WITH THE SAME NAME: " + request.getRequestName());
 				logger.error("FOUND MULTIPLE LSTHINGS WITH THE SAME NAME: " + request.getRequestName());
 				errors.add(error);
 			} else {
@@ -426,18 +431,17 @@ public PreferredNameResultsDTO getPreferredNameFromName(String json){
 			}
 		}
 
-
 		responseOutput.setResults(requests);
 		responseOutput.setErrorMessages(errors);
 
 		logger.info(responseOutput.toJson());
-		
+
 		return responseOutput;
 	}
-	
-	 
+
 	@Override
-	public PreferredNameResultsDTO getPreferredNameFromName(String thingType, String thingKind, String labelType, String labelKind, PreferredNameRequestDTO requestDTO){
+	public PreferredNameResultsDTO getPreferredNameFromName(String thingType, String thingKind, String labelType,
+			String labelKind, PreferredNameRequestDTO requestDTO) {
 
 		logger.info("in getPreferredNameFromName with PreferredNameRequestDTO");
 
@@ -448,76 +452,79 @@ public PreferredNameResultsDTO getPreferredNameFromName(String thingType, String
 		Collection<ErrorMessageDTO> errors = new HashSet<ErrorMessageDTO>();
 
 		List<String> requestNameList = new ArrayList<String>();
-		for (PreferredNameDTO request : requests){
+		for (PreferredNameDTO request : requests) {
 			requestNameList.add(request.getRequestName());
 		}
 
-		List<PreferredNameDTO> lsThingLabelsList = new ArrayList<PreferredNameDTO>();	
+		List<PreferredNameDTO> lsThingLabelsList = new ArrayList<PreferredNameDTO>();
 		int batchSize = 999;
 		int i = 1;
 		List<String> requestNamesSubset = new ArrayList<String>();
-		for (String requestName : requestNameList){
+		for (String requestName : requestNameList) {
 			requestNamesSubset.add(requestName);
-			if (i % batchSize  == 0 ) { 
-				List<PreferredNameDTO> lsThingLabels = LsThingLabel.findLsThingPreferredName(thingType, thingKind, labelType, labelKind, requestNamesSubset).getResultList();
+			if (i % batchSize == 0) {
+				List<PreferredNameDTO> lsThingLabels = LsThingLabel
+						.findLsThingPreferredName(thingType, thingKind, labelType, labelKind, requestNamesSubset)
+						.getResultList();
 				lsThingLabelsList.addAll(lsThingLabels);
 				requestNamesSubset.clear();
 				logger.debug("searching batch of names " + i);
 
 			}
-			i++;			
-			
+			i++;
+
 		}
-		
-		if (requestNamesSubset.size() > 0){
-			List<PreferredNameDTO> lsThingLabels = LsThingLabel.findLsThingPreferredName(thingType, thingKind, labelType, labelKind, requestNamesSubset).getResultList();
+
+		if (requestNamesSubset.size() > 0) {
+			List<PreferredNameDTO> lsThingLabels = LsThingLabel
+					.findLsThingPreferredName(thingType, thingKind, labelType, labelKind, requestNamesSubset)
+					.getResultList();
 			lsThingLabelsList.addAll(lsThingLabels);
 			logger.debug("searching last batch of names " + requestNamesSubset.size());
 
-		}				
+		}
 		logger.info("number of thing labels found: " + lsThingLabelsList.size());
-		
+
 		MultiValueMap mvm = new MultiValueMap();
-		for (PreferredNameDTO pn : lsThingLabelsList){
+		for (PreferredNameDTO pn : lsThingLabelsList) {
 			mvm.put(pn.getRequestName(), pn);
 		}
 
-		for (PreferredNameDTO request : requests){
+		for (PreferredNameDTO request : requests) {
 			request.setPreferredName("");
 			request.setReferenceName("");
 			@SuppressWarnings("unchecked")
 			List<PreferredNameDTO> lsThingLabels = (List<PreferredNameDTO>) mvm.get(request.getRequestName());
 
-			if (lsThingLabels != null && lsThingLabels.size() == 1){
+			if (lsThingLabels != null && lsThingLabels.size() == 1) {
 				request.setPreferredName(lsThingLabels.get(0).getPreferredName());
 				request.setReferenceName(lsThingLabels.get(0).getReferenceName());
-			} else if (lsThingLabels != null && lsThingLabels.size() > 1){
+			} else if (lsThingLabels != null && lsThingLabels.size() > 1) {
 				responseOutput.setError(true);
 				ErrorMessageDTO error = new ErrorMessageDTO();
 				error.setLevel("MULTIPLE RESULTS");
-				error.setMessage("FOUND MULTIPLE LS_THINGS WITH THE SAME NAME: " + request.getRequestName() );	
+				error.setMessage("FOUND MULTIPLE LS_THINGS WITH THE SAME NAME: " + request.getRequestName());
 				logger.error("FOUND MULTIPLE LSTHINGS WITH THE SAME NAME: " + request.getRequestName());
 				errors.add(error);
-				
-				for (PreferredNameDTO lsThingLabel : lsThingLabels){
+
+				for (PreferredNameDTO lsThingLabel : lsThingLabels) {
 					logger.debug(lsThingLabel.toJson());
 				}
-				
+
 			} else {
 				logger.info("Did not find a LS_THING WITH THE REQUESTED NAME: " + request.getRequestName());
 			}
 		}
 
-
 		responseOutput.setResults(requests);
 		responseOutput.setErrorMessages(errors);
 
 		logger.info(responseOutput.toJson());
-		
+
 		return responseOutput;
 	}
-	
-	public PreferredNameResultsDTO getPreferredNameFromName(PreferredNameRequestDTO requestDTO){
+
+	public PreferredNameResultsDTO getPreferredNameFromName(PreferredNameRequestDTO requestDTO) {
 
 		logger.info("in getPreferredNameFromName -- right route");
 
@@ -529,62 +536,66 @@ public PreferredNameResultsDTO getPreferredNameFromName(PreferredNameRequestDTO
 		Collection<ErrorMessageDTO> errors = new HashSet<ErrorMessageDTO>();
 
 		Set<String> requestNameList = new HashSet<String>();
-		for (PreferredNameDTO request : requests){
+		for (PreferredNameDTO request : requests) {
 			requestNameList.add(request.getRequestName());
 		}
 
 		logger.info("about to run hybernate query");
-		List<PreferredNameDTO> lsThingLabelsList = LsThingLabel.findLsThingPreferredName(requestNameList).getResultList();
+		List<PreferredNameDTO> lsThingLabelsList = LsThingLabel.findLsThingPreferredName(requestNameList)
+				.getResultList();
 		logger.info("returned from hybernate query");
-		
+
 		logger.info("number of thing labels found: " + lsThingLabelsList.size());
 		MultiValueMap mvm = new MultiValueMap();
-		for (PreferredNameDTO pn : lsThingLabelsList){
+		for (PreferredNameDTO pn : lsThingLabelsList) {
 			mvm.put(pn.getRequestName(), pn);
 		}
 
-		for (PreferredNameDTO request : requests){
+		for (PreferredNameDTO request : requests) {
 			request.setPreferredName("");
 			request.setReferenceName("");
-			//List<LsThingLabel> lsThingLabels = LsThingLabel.findLsThingPreferredName(thingType, thingKind, labelType, labelKind, request.getRequestName()).getResultList();
+			// List<LsThingLabel> lsThingLabels =
+			// LsThingLabel.findLsThingPreferredName(thingType, thingKind, labelType,
+			// labelKind, request.getRequestName()).getResultList();
 			@SuppressWarnings("unchecked")
 			List<PreferredNameDTO> lsThingLabels = (List<PreferredNameDTO>) mvm.get(request.getRequestName());
 
-			if (lsThingLabels != null && lsThingLabels.size() == 1){
+			if (lsThingLabels != null && lsThingLabels.size() == 1) {
 				request.setPreferredName(lsThingLabels.get(0).getPreferredName());
 				request.setReferenceName(lsThingLabels.get(0).getReferenceName());
-			} else if (lsThingLabels != null && lsThingLabels.size() > 1){
-//				responseOutput.setError(true);
-//				ErrorMessageDTO error = new ErrorMessageDTO();
-//				error.setErrorCode("MULTIPLE RESULTS");
-//				error.setErrorMessage("FOUND MULTIPLE LS_THINGS WITH THE SAME NAME: " + request.getRequestName() );	
-				logger.info("FOUND MULTIPLE LSTHINGS WITH THE SAME NAME, RETURNING ONLY THE FIRST: " + request.getRequestName());
-//				errors.add(error);
+			} else if (lsThingLabels != null && lsThingLabels.size() > 1) {
+				// responseOutput.setError(true);
+				// ErrorMessageDTO error = new ErrorMessageDTO();
+				// error.setErrorCode("MULTIPLE RESULTS");
+				// error.setErrorMessage("FOUND MULTIPLE LS_THINGS WITH THE SAME NAME: " +
+				// request.getRequestName() );
+				logger.info("FOUND MULTIPLE LSTHINGS WITH THE SAME NAME, RETURNING ONLY THE FIRST: "
+						+ request.getRequestName());
+				// errors.add(error);
 				request.setPreferredName(lsThingLabels.get(0).getPreferredName());
 				request.setReferenceName(lsThingLabels.get(0).getReferenceName());
-				
+
 			} else {
 				logger.info("Did not find a LS_THING WITH THE REQUESTED NAME: " + request.getRequestName());
 			}
 		}
 
-
 		responseOutput.setResults(requests);
 		responseOutput.setErrorMessages(errors);
 
 		logger.info(responseOutput.toJson());
-		
+
 		return responseOutput;
 	}
-	
+
 	@Override
 	@Transactional
-	public LsThing updateLsThing(LsThing jsonLsThing) throws StaleObjectStateException{
+	public LsThing updateLsThing(LsThing jsonLsThing) throws StaleObjectStateException {
 		LsThing updatedLsThing = LsThing.update(jsonLsThing);
 		if (jsonLsThing.getLsLabels() != null) {
-			for(LsThingLabel lsThingLabel : jsonLsThing.getLsLabels()){
-				logger.debug("Label in hand: " + lsThingLabel.getLabelText());			
-				if (lsThingLabel.getId() == null){
+			for (LsThingLabel lsThingLabel : jsonLsThing.getLsLabels()) {
+				logger.debug("Label in hand: " + lsThingLabel.getLabelText());
+				if (lsThingLabel.getId() == null) {
 					LsThingLabel newLsThingLabel = new LsThingLabel(lsThingLabel);
 					newLsThingLabel.setLsThing(updatedLsThing);
 					newLsThingLabel.persist();
@@ -594,32 +605,37 @@ public LsThing updateLsThing(LsThing jsonLsThing) throws StaleObjectStateExcepti
 					updatedLsThing.getLsLabels().add(updatedLabel);
 					logger.debug("updated lsThing label " + updatedLabel.getId());
 				}
-			}			
+			}
 		} else {
 			logger.debug("No lsThing labels to update");
 		}
 		updateLsStates(jsonLsThing, updatedLsThing);
-		
-		//updated itx and nested LsThings
-		// assume that the client may not send all of the nested data but wants all of the nested data back 
-		
+
+		// updated itx and nested LsThings
+		// assume that the client may not send all of the nested data but wants all of
+		// the nested data back
+
 		Set<ItxLsThingLsThing> firstLsThings = new HashSet<ItxLsThingLsThing>();
 		firstLsThings.addAll(updatedLsThing.getFirstLsThings());
 		logger.debug("found number of first interactions: " + firstLsThings.size());
-		
-		if(jsonLsThing.getFirstLsThings() != null && jsonLsThing.getFirstLsThings().size() > 0){
-			//there are itx's
-			for (ItxLsThingLsThing itxLsThingLsThing : jsonLsThing.getFirstLsThings()){
+
+		if (jsonLsThing.getFirstLsThings() != null && jsonLsThing.getFirstLsThings().size() > 0) {
+			// there are itx's
+			for (ItxLsThingLsThing itxLsThingLsThing : jsonLsThing.getFirstLsThings()) {
 				ItxLsThingLsThing updatedItxLsThingLsThing;
 				logger.debug("updating itxLsThingLsThing");
-				if (itxLsThingLsThing.getId() == null){
-					//need to save a new itx
-					if (logger.isDebugEnabled()) logger.debug("saving new itxLsThingLsThing: " + itxLsThingLsThing.toJson());
-
-					// We don't generally save an ignored interaction with an updated ls thing nested
-					// because of an issue with sending in two interactions with the same nested ls thing and updating them in this
-					// route, we will only update nested ls things from non-ignored interactions here.
-					if(itxLsThingLsThing.isIgnored()) {
+				if (itxLsThingLsThing.getId() == null) {
+					// need to save a new itx
+					if (logger.isDebugEnabled())
+						logger.debug("saving new itxLsThingLsThing: " + itxLsThingLsThing.toJson());
+
+					// We don't generally save an ignored interaction with an updated ls thing
+					// nested
+					// because of an issue with sending in two interactions with the same nested ls
+					// thing and updating them in this
+					// route, we will only update nested ls things from non-ignored interactions
+					// here.
+					if (itxLsThingLsThing.isIgnored()) {
 						logger.debug("not updating nested ls thing because interaction is ignored");
 					} else {
 						updateNestedFirstLsThing(itxLsThingLsThing);
@@ -627,14 +643,18 @@ public LsThing updateLsThing(LsThing jsonLsThing) throws StaleObjectStateExcepti
 					itxLsThingLsThing.setSecondLsThing(updatedLsThing);
 					updatedItxLsThingLsThing = saveItxLsThingLsThing(itxLsThingLsThing);
 					firstLsThings.add(updatedItxLsThingLsThing);
-				}else {
-					//old itx needs to be updated
-					if (logger.isDebugEnabled()) logger.debug("update existing itxLsThingLsThing: " + itxLsThingLsThing.toJson());
-
-					// We don't generally save an ignored interaction with an updated ls thing nested
-					// because of an issue with sending in two interactions with the same nested ls thing and updating them in this
-					// route, we will only update nested ls things from non-ignored interactions here.
-					if(itxLsThingLsThing.isIgnored()) {
+				} else {
+					// old itx needs to be updated
+					if (logger.isDebugEnabled())
+						logger.debug("update existing itxLsThingLsThing: " + itxLsThingLsThing.toJson());
+
+					// We don't generally save an ignored interaction with an updated ls thing
+					// nested
+					// because of an issue with sending in two interactions with the same nested ls
+					// thing and updating them in this
+					// route, we will only update nested ls things from non-ignored interactions
+					// here.
+					if (itxLsThingLsThing.isIgnored()) {
 						logger.debug("not updating nested ls thing because interaction is ignored");
 					} else {
 						updateNestedFirstLsThing(itxLsThingLsThing);
@@ -647,26 +667,30 @@ public LsThing updateLsThing(LsThing jsonLsThing) throws StaleObjectStateExcepti
 			}
 			updatedLsThing.setFirstLsThings(firstLsThings);
 		}
-		
+
 		Set<ItxLsThingLsThing> secondLsThings = new HashSet<ItxLsThingLsThing>();
 		secondLsThings.addAll(updatedLsThing.getSecondLsThings());
-//		secondLsThings.addAll(ItxLsThingLsThing.findItxLsThingLsThingsBySecondLsThing(updatedLsThing).getResultList());
-		if (logger.isDebugEnabled()) logger.debug("found number of second interactions: " + secondLsThings.size());
+		// secondLsThings.addAll(ItxLsThingLsThing.findItxLsThingLsThingsBySecondLsThing(updatedLsThing).getResultList());
+		if (logger.isDebugEnabled())
+			logger.debug("found number of second interactions: " + secondLsThings.size());
 
-		
-		if(jsonLsThing.getSecondLsThings() != null && jsonLsThing.getSecondLsThings().size() > 0){
-			//there are itx's
-			for (ItxLsThingLsThing itxLsThingLsThing : jsonLsThing.getSecondLsThings()){
+		if (jsonLsThing.getSecondLsThings() != null && jsonLsThing.getSecondLsThings().size() > 0) {
+			// there are itx's
+			for (ItxLsThingLsThing itxLsThingLsThing : jsonLsThing.getSecondLsThings()) {
 				logger.debug("updating itxLsThingLsThing");
 				ItxLsThingLsThing updatedItxLsThingLsThing;
-				if (itxLsThingLsThing.getId() == null){
-					//need to save a new itx
-					if (logger.isDebugEnabled()) logger.debug("saving new itxLsThingLsThing: " + itxLsThingLsThing.toJson());
-
-					// We don't generally save an ignored interaction with an updated ls thing nested
-					// because of an issue with sending in two interactions with the same nested ls thing and updating them in this
-					// route, we will only update nested ls things from non-ignored interactions here.
-					if(itxLsThingLsThing.isIgnored()) {
+				if (itxLsThingLsThing.getId() == null) {
+					// need to save a new itx
+					if (logger.isDebugEnabled())
+						logger.debug("saving new itxLsThingLsThing: " + itxLsThingLsThing.toJson());
+
+					// We don't generally save an ignored interaction with an updated ls thing
+					// nested
+					// because of an issue with sending in two interactions with the same nested ls
+					// thing and updating them in this
+					// route, we will only update nested ls things from non-ignored interactions
+					// here.
+					if (itxLsThingLsThing.isIgnored()) {
 						logger.debug("not updating nested ls thing because interaction is ignored");
 					} else {
 						updateNestedSecondLsThing(itxLsThingLsThing);
@@ -674,14 +698,18 @@ public LsThing updateLsThing(LsThing jsonLsThing) throws StaleObjectStateExcepti
 					itxLsThingLsThing.setFirstLsThing(updatedLsThing);
 					updatedItxLsThingLsThing = saveItxLsThingLsThing(itxLsThingLsThing);
 					secondLsThings.add(updatedItxLsThingLsThing);
-				}else {
-					//old itx needs to be updated
-					if (logger.isDebugEnabled()) logger.debug("update existing itxLsThingLsThing: " + itxLsThingLsThing.toJson());
-
-					// We don't generally save an ignored interaction with an updated ls thing nested
-					// because of an issue with sending in two interactions with the same nested ls thing and updating them in this
-					// route, we will only update nested ls things from non-ignored interactions here.
-					if(itxLsThingLsThing.isIgnored()) {
+				} else {
+					// old itx needs to be updated
+					if (logger.isDebugEnabled())
+						logger.debug("update existing itxLsThingLsThing: " + itxLsThingLsThing.toJson());
+
+					// We don't generally save an ignored interaction with an updated ls thing
+					// nested
+					// because of an issue with sending in two interactions with the same nested ls
+					// thing and updating them in this
+					// route, we will only update nested ls things from non-ignored interactions
+					// here.
+					if (itxLsThingLsThing.isIgnored()) {
 						logger.debug("not updating nested ls thing because interaction is ignored");
 					} else {
 						updateNestedSecondLsThing(itxLsThingLsThing);
@@ -694,107 +722,112 @@ public LsThing updateLsThing(LsThing jsonLsThing) throws StaleObjectStateExcepti
 			}
 			updatedLsThing.setSecondLsThings(secondLsThings);
 		}
-		
+
 		return updatedLsThing;
 
 	}
 
 	private LsThing updateNestedFirstLsThing(ItxLsThingLsThing itxLsThingLsThing) {
 		LsThing updatedNestedLsThing = null;
-		if (itxLsThingLsThing.getFirstLsThing().getId() == null){
-			//need to save a new nested lsthing
-			if (logger.isDebugEnabled()) logger.debug("saving new nested LsThing" + itxLsThingLsThing.getFirstLsThing().toJson());
-			try{
+		if (itxLsThingLsThing.getFirstLsThing().getId() == null) {
+			// need to save a new nested lsthing
+			if (logger.isDebugEnabled())
+				logger.debug("saving new nested LsThing" + itxLsThingLsThing.getFirstLsThing().toJson());
+			try {
 				updatedNestedLsThing = saveLsThing(itxLsThingLsThing.getFirstLsThing());
 				itxLsThingLsThing.setFirstLsThing(updatedNestedLsThing);
-			} catch (UniqueNameException e){
+			} catch (UniqueNameException e) {
 				logger.error("Caught UniqueNameException trying to update nested LsThing");
 			}
-		}
-		else{
-			//just need to update the old nested lsThing inside the new itx
+		} else {
+			// just need to update the old nested lsThing inside the new itx
 			updatedNestedLsThing = LsThing.update(itxLsThingLsThing.getFirstLsThing());
 			updateLsStates(itxLsThingLsThing.getFirstLsThing(), updatedNestedLsThing);
 			itxLsThingLsThing.setFirstLsThing(updatedNestedLsThing);
 		}
-		
+
 		return updatedNestedLsThing;
 	}
-	
+
 	private LsThing updateNestedSecondLsThing(ItxLsThingLsThing itxLsThingLsThing) {
 		LsThing updatedNestedLsThing = null;
-		if (itxLsThingLsThing.getSecondLsThing().getId() == null){
-			//need to save a new nested lsthing
-			if (logger.isDebugEnabled()) logger.debug("saving new nested LsThing" + itxLsThingLsThing.getSecondLsThing().toJson());
-			try{
+		if (itxLsThingLsThing.getSecondLsThing().getId() == null) {
+			// need to save a new nested lsthing
+			if (logger.isDebugEnabled())
+				logger.debug("saving new nested LsThing" + itxLsThingLsThing.getSecondLsThing().toJson());
+			try {
 				updatedNestedLsThing = saveLsThing(itxLsThingLsThing.getSecondLsThing());
 				itxLsThingLsThing.setSecondLsThing(updatedNestedLsThing);
-			} catch (UniqueNameException e){
+			} catch (UniqueNameException e) {
 				logger.error("Caught UniqueNameException trying to update nested LsThing");
 			}
-		}
-		else{
-			//just need to update the old nested lsThing inside the new itx
+		} else {
+			// just need to update the old nested lsThing inside the new itx
 			updatedNestedLsThing = LsThing.update(itxLsThingLsThing.getSecondLsThing());
 			updateLsStates(itxLsThingLsThing.getSecondLsThing(), updatedNestedLsThing);
 			itxLsThingLsThing.setSecondLsThing(updatedNestedLsThing);
 		}
-		
+
 		return updatedNestedLsThing;
 
 	}
 
-
 	@Override
 	@Transactional
-	public LsThing saveLsThing(LsThing lsThing) throws UniqueNameException{
+	public LsThing saveLsThing(LsThing lsThing) throws UniqueNameException {
 		boolean checkLsThingName = propertiesUtilService.getUniqueLsThingName();
 		return saveLsThing(lsThing, checkLsThingName);
 	}
-	
+
 	@Override
 	@Transactional
-	public LsThing saveLsThing(LsThing lsThing, boolean checkLsThingName) throws UniqueNameException{
-		if (logger.isDebugEnabled()) logger.debug("incoming meta lsThing: " + lsThing.toJson());
+	public LsThing saveLsThing(LsThing lsThing, boolean checkLsThingName) throws UniqueNameException {
+		if (logger.isDebugEnabled())
+			logger.debug("incoming meta lsThing: " + lsThing.toJson());
 
-		//check if lsThing with the same name exists
-		if (checkLsThingName){
+		// check if lsThing with the same name exists
+		if (checkLsThingName) {
 			boolean lsThingExists = false;
 			Set<LsThingLabel> lsThingLabels = lsThing.getLsLabels();
-			for (LsThingLabel label : lsThingLabels){
+			for (LsThingLabel label : lsThingLabels) {
 				String labelText = label.getLabelText();
-				List<LsThingLabel> foundLsThingLabels = LsThingLabel.findLsThingLabelsByLabelTextEqualsAndIgnoredNot(labelText, true).getResultList();	
-				for (LsThingLabel foundLabel : foundLsThingLabels){
+				List<LsThingLabel> foundLsThingLabels = LsThingLabel
+						.findLsThingLabelsByLabelTextEqualsAndIgnoredNot(labelText, true).getResultList();
+				for (LsThingLabel foundLabel : foundLsThingLabels) {
 					LsThing foundLsThing = foundLabel.getLsThing();
-					//if the lsThing is not hard deleted or soft deleted, there is a name conflict
-					if (!foundLsThing.isIgnored()){
+					// if the lsThing is not hard deleted or soft deleted, there is a name conflict
+					if (!foundLsThing.isIgnored()) {
 						lsThingExists = true;
 					}
 				}
 			}
 
-			if (lsThingExists){
-				throw new UniqueNameException("LsThing with the same name exists");							
+			if (lsThingExists) {
+				throw new UniqueNameException("LsThing with the same name exists");
 			}
 		}
 
 		LsThing newLsThing = new LsThing(lsThing);
-		if (newLsThing.getCodeName() == null){
-			if (newLsThing.getLsTypeAndKind() == null) newLsThing.setLsTypeAndKind(newLsThing.getLsType()+"_"+newLsThing.getLsKind());
+		if (newLsThing.getCodeName() == null) {
+			if (newLsThing.getLsTypeAndKind() == null)
+				newLsThing.setLsTypeAndKind(newLsThing.getLsType() + "_" + newLsThing.getLsKind());
 			newLsThing.setCodeName(autoLabelService.getLsThingCodeName(newLsThing.getLsTypeAndKind()));
 		}
 		newLsThing.persist();
 		logger.debug("persisted the newLsThing: " + newLsThing.toJson());
 
-
 		if (lsThing.getLsLabels() != null && lsThing.getLsLabels().size() > 0) {
 			Set<LsThingLabel> lsLabels = new HashSet<LsThingLabel>();
-			for(LsThingLabel lsThingLabel : lsThing.getLsLabels()){
+			for (LsThingLabel lsThingLabel : lsThing.getLsLabels()) {
 				LsThingLabel newLsThingLabel = new LsThingLabel(lsThingLabel);
-				// If the label text is not set and their is a label sequence which matches this label lsTypeAndKind and thing lsTypeAndKind
+				// If the label text is not set and their is a label sequence which matches this
+				// label lsTypeAndKind and thing lsTypeAndKind
 				// then get the next label sequence text and assign it to the label.
-				if(newLsThingLabel.getLabelText() == null || newLsThingLabel.getLabelText().equals("")) {
-					List<LabelSequence> labelSequences = LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(newLsThing.getLsTypeAndKind(), newLsThingLabel.getLsTypeAndKind()).getResultList();
+				if (newLsThingLabel.getLabelText() == null || newLsThingLabel.getLabelText().equals("")) {
+					List<LabelSequence> labelSequences = LabelSequence
+							.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(
+									newLsThing.getLsTypeAndKind(), newLsThingLabel.getLsTypeAndKind())
+							.getResultList();
 					if (labelSequences.size() == 1) {
 						LabelSequence labelSequence = LabelSequence.findLabelSequence(labelSequences.get(0).getId());
 						AutoLabelDTO autoLabel = labelSequence.generateNextLabel();
@@ -813,31 +846,31 @@ public LsThing saveLsThing(LsThing lsThing, boolean checkLsThingName) throws Uni
 		} else {
 			logger.debug("No lsThing labels to save");
 		}
-		
+
 		boolean doNotRun = true;
 
-		if(lsThing.getLsStates() != null && lsThing.getLsStates().size() > 0 ){
+		if (lsThing.getLsStates() != null && lsThing.getLsStates().size() > 0) {
 			Set<LsThingState> lsStates = new HashSet<LsThingState>();
-			for(LsThingState lsThingState : lsThing.getLsStates()){
+			for (LsThingState lsThingState : lsThing.getLsStates()) {
 				LsThingState newLsThingState = new LsThingState(lsThingState);
 				newLsThingState.setLsThing(newLsThing);
 				logger.debug("here is the newLsThingState before save: " + newLsThingState.toJson());
 				newLsThingState.persist();
-				
+
 				logger.debug("@@@@@@@@@@@ lsThing will be updated by the touch.");
 				logger.debug(LsThing.findLsThing(newLsThing.getId()).toJson());
-				
+
 				logger.debug("persisted the newLsThingState: " + newLsThingState.toJson());
-				if (lsThingState.getLsValues() != null && lsThingState.getLsValues().size() > 0){
+				if (lsThingState.getLsValues() != null && lsThingState.getLsValues().size() > 0) {
 					Set<LsThingValue> lsValues = new HashSet<LsThingValue>();
-					for(LsThingValue lsThingValue : lsThingState.getLsValues()){
+					for (LsThingValue lsThingValue : lsThingState.getLsValues()) {
 						logger.debug("lsThingValue: " + lsThingValue.toJson());
 						LsThingValue newLsThingValue = new LsThingValue(lsThingValue);
 						newLsThingValue.setLsState(newLsThingState);
 						newLsThingValue.persist();
 						lsValues.add(newLsThingValue);
 						logger.debug("persisted the lsThingValue: " + newLsThingValue.toJson());
-					}	
+					}
 					newLsThingState.setLsValues(lsValues);
 				} else {
 					logger.debug("No lsThing values to save");
@@ -847,13 +880,13 @@ public LsThing saveLsThing(LsThing lsThing, boolean checkLsThingName) throws Uni
 			newLsThing.setLsStates(lsStates);
 		}
 		// && lsThing.getFirstLsThings().size() > 0
-		if(lsThing.getFirstLsThings() != null && lsThing.getFirstLsThings().size() > 0){
+		if (lsThing.getFirstLsThings() != null && lsThing.getFirstLsThings().size() > 0) {
 			logger.debug("@@@@@@@@@  -- trying to save first thing interaction");
 			Set<ItxLsThingLsThing> firstLsThings = new HashSet<ItxLsThingLsThing>();
-			for (ItxLsThingLsThing itxLsThingLsThing : lsThing.getFirstLsThings()){
-				if (itxLsThingLsThing.getId() == null){
+			for (ItxLsThingLsThing itxLsThingLsThing : lsThing.getFirstLsThings()) {
+				if (itxLsThingLsThing.getId() == null) {
 					logger.debug("saving new itxLsThingLsThing: " + itxLsThingLsThing.toJson());
-					if (itxLsThingLsThing.getFirstLsThing().getId() == null){
+					if (itxLsThingLsThing.getFirstLsThing().getId() == null) {
 						logger.debug("saving new nested LsThing" + itxLsThingLsThing.getFirstLsThing().toJson());
 						LsThing nestedLsThing = saveLsThing(itxLsThingLsThing.getFirstLsThing());
 						itxLsThingLsThing.setFirstLsThing(nestedLsThing);
@@ -861,21 +894,21 @@ public LsThing saveLsThing(LsThing lsThing, boolean checkLsThingName) throws Uni
 					itxLsThingLsThing.setSecondLsThing(newLsThing);
 					ItxLsThingLsThing newItxLsThingLsThing = saveItxLsThingLsThing(itxLsThingLsThing);
 					firstLsThings.add(newItxLsThingLsThing);
-				}else {
+				} else {
 					firstLsThings.add(itxLsThingLsThing);
 				}
 			}
 			newLsThing.setFirstLsThings(firstLsThings);
 		}
 
-		//&& lsThing.getSecondLsThings().size() > 0
-		if(lsThing.getSecondLsThings() != null && lsThing.getSecondLsThings().size() > 0 ){
+		// && lsThing.getSecondLsThings().size() > 0
+		if (lsThing.getSecondLsThings() != null && lsThing.getSecondLsThings().size() > 0) {
 			logger.debug("@@@@@@@@@  -- trying to save second thing interaction");
 			Set<ItxLsThingLsThing> secondLsThings = new HashSet<ItxLsThingLsThing>();
-			for (ItxLsThingLsThing itxLsThingLsThing : lsThing.getSecondLsThings()){
-				if (itxLsThingLsThing.getId() == null){
+			for (ItxLsThingLsThing itxLsThingLsThing : lsThing.getSecondLsThings()) {
+				if (itxLsThingLsThing.getId() == null) {
 					logger.debug("saving new itxLsThingLsThing: " + itxLsThingLsThing.toJson());
-					if (itxLsThingLsThing.getSecondLsThing().getId() == null){
+					if (itxLsThingLsThing.getSecondLsThing().getId() == null) {
 						logger.debug("saving new nested LsThing: " + itxLsThingLsThing.getSecondLsThing().toJson());
 						LsThing nestedLsThing = saveLsThing(itxLsThingLsThing.getSecondLsThing());
 						itxLsThingLsThing.setSecondLsThing(nestedLsThing);
@@ -883,53 +916,56 @@ public LsThing saveLsThing(LsThing lsThing, boolean checkLsThingName) throws Uni
 					itxLsThingLsThing.setFirstLsThing(newLsThing);
 					ItxLsThingLsThing newItxLsThingLsThing = saveItxLsThingLsThing(itxLsThingLsThing);
 					secondLsThings.add(newItxLsThingLsThing);
-				}else {
+				} else {
 					secondLsThings.add(itxLsThingLsThing);
 				}
 			}
 			newLsThing.setSecondLsThings(secondLsThings);
 		}
 		return newLsThing;
-		//return LsThing.findLsThing(newLsThing.getId());
+		// return LsThing.findLsThing(newLsThing.getId());
 	}
-	
+
 	@Override
 	@Transactional
-	public LsThing saveLsThing(LsThing lsThing, boolean isParent, boolean isBatch, Long parentId) throws UniqueNameException{
-		//only check that the name is unique upon save if it's a parent and a component
+	public LsThing saveLsThing(LsThing lsThing, boolean isParent, boolean isBatch, Long parentId)
+			throws UniqueNameException {
+		// only check that the name is unique upon save if it's a parent and a component
 		boolean checkUniqueLsThingName = propertiesUtilService.getUniqueLsThingName();
 		LsThing savedLsThing = saveLsThing(lsThing, checkUniqueLsThingName);
-		//after saving the lsThing, save the necessary interactions
-		if (isBatch){
+		// after saving the lsThing, save the necessary interactions
+		if (isBatch) {
 			LsThing parent = LsThing.findLsThing(parentId);
-			saveItxLsThingLsThing("instantiates", "batch_parent", savedLsThing, parent, lsThing.getRecordedBy(), lsThing.getRecordedDate());
+			saveItxLsThingLsThing("instantiates", "batch_parent", savedLsThing, parent, lsThing.getRecordedBy(),
+					lsThing.getRecordedDate());
 			incrementBatchNumber(parent);
 		}
 		return savedLsThing;
 	}
-	
-	
-	private ItxLsThingLsThing saveItxLsThingLsThing(ItxLsThingLsThing itxLsThingLsThing){
+
+	private ItxLsThingLsThing saveItxLsThingLsThing(ItxLsThingLsThing itxLsThingLsThing) {
 		ItxLsThingLsThing newItxLsThingLsThing = new ItxLsThingLsThing(itxLsThingLsThing);
 		newItxLsThingLsThing.persist();
-		if(itxLsThingLsThing.getLsStates() != null){
+		if (itxLsThingLsThing.getLsStates() != null) {
 			Set<ItxLsThingLsThingState> lsStates = new HashSet<ItxLsThingLsThingState>();
-			for(ItxLsThingLsThingState itxLsThingLsThingState : itxLsThingLsThing.getLsStates()){
+			for (ItxLsThingLsThingState itxLsThingLsThingState : itxLsThingLsThing.getLsStates()) {
 				ItxLsThingLsThingState newItxLsThingLsThingState = new ItxLsThingLsThingState(itxLsThingLsThingState);
 				newItxLsThingLsThingState.setItxLsThingLsThing(newItxLsThingLsThing);
-				logger.debug("here is the newItxLsThingLsThingState before save: " + newItxLsThingLsThingState.toJson());
+				logger.debug(
+						"here is the newItxLsThingLsThingState before save: " + newItxLsThingLsThingState.toJson());
 				newItxLsThingLsThingState.persist();
 				logger.debug("persisted the newItxLsThingLsThingState: " + newItxLsThingLsThingState.toJson());
-				if (itxLsThingLsThingState.getLsValues() != null){
+				if (itxLsThingLsThingState.getLsValues() != null) {
 					Set<ItxLsThingLsThingValue> lsValues = new HashSet<ItxLsThingLsThingValue>();
-					for(ItxLsThingLsThingValue itxLsThingLsThingValue : itxLsThingLsThingState.getLsValues()){
+					for (ItxLsThingLsThingValue itxLsThingLsThingValue : itxLsThingLsThingState.getLsValues()) {
 						logger.debug("itxLsThingLsThingValue: " + itxLsThingLsThingValue.toJson());
-						ItxLsThingLsThingValue newItxLsThingLsThingValue = new ItxLsThingLsThingValue(itxLsThingLsThingValue);
+						ItxLsThingLsThingValue newItxLsThingLsThingValue = new ItxLsThingLsThingValue(
+								itxLsThingLsThingValue);
 						newItxLsThingLsThingValue.setLsState(newItxLsThingLsThingState);
 						newItxLsThingLsThingValue.persist();
 						lsValues.add(newItxLsThingLsThingValue);
 						logger.debug("persisted the itxLsThingLsThingValue: " + newItxLsThingLsThingValue.toJson());
-					}	
+					}
 					newItxLsThingLsThingState.setLsValues(lsValues);
 				} else {
 					logger.debug("No itxLsThingLsThing values to save");
@@ -940,7 +976,7 @@ private ItxLsThingLsThing saveItxLsThingLsThing(ItxLsThingLsThing itxLsThingLsTh
 		}
 		return newItxLsThingLsThing;
 	}
-	
+
 	private void saveItxLsThingLsThing(String lsType, String lsKind,
 			LsThing firstLsThing, LsThing secondLsThing, int order, String recordedBy,
 			Date recordedDate) {
@@ -969,9 +1005,8 @@ private void saveItxLsThingLsThing(String lsType, String lsKind,
 		itxLsThingLsThing.persist();
 		itxLsThingLsThingState.persist();
 		itxLsThingLsThingValue.persist();
-		
-	}
 
+	}
 
 	private void saveItxLsThingLsThing(String lsType, String lsKind,
 			LsThing firstLsThing, LsThing secondLsThing, String recordedBy, Date recordedDate) {
@@ -985,43 +1020,54 @@ private void saveItxLsThingLsThing(String lsType, String lsKind,
 		itxLsThingLsThing.persist();
 	}
 
-
-//	@Override
-//	public String generateBatchCodeName(LsThing parent){
-//		String parentCodeName = parent.getCodeName();
-//		int batchNumber = getNextBatchNumber(parent);
-//		String batchCodeName = parentCodeName.concat("-"+ String.valueOf(batchNumber));
-//		return batchCodeName;
-//	}
-
+	// @Override
+	// public String generateBatchCodeName(LsThing parent){
+	// String parentCodeName = parent.getCodeName();
+	// int batchNumber = getNextBatchNumber(parent);
+	// String batchCodeName = parentCodeName.concat("-"+
+	// String.valueOf(batchNumber));
+	// return batchCodeName;
+	// }
 
 	@Override
 	public int getBatchNumber(LsThing parent) {
-		LsThingValue batchNumberValue = LsThingValue.findLsThingValuesByLsThingIDAndStateTypeKindAndValueTypeKind(parent.getId(), "metadata", parent.getLsKind() + " " + parent.getLsType(), "numericValue", "batch number").getSingleResult();
+		LsThingValue batchNumberValue = LsThingValue
+				.findLsThingValuesByLsThingIDAndStateTypeKindAndValueTypeKind(parent.getId(), "metadata",
+						parent.getLsKind() + " " + parent.getLsType(), "numericValue", "batch number")
+				.getSingleResult();
 		int batchNumber = batchNumberValue.getNumericValue().intValue();
 		return batchNumber;
 	}
-	
-//	private int getNextBatchNumber(LsThing parent) {
-//		LsThingValue batchNumberValue = LsThingValue.findLsThingValuesByLsThingIDAndStateTypeKindAndValueTypeKind(parent.getId(), "metadata", parent.getLsKind() + " " + parent.getLsType(), "numericValue", "batch number").getSingleResult();
-//		int batchNumber = batchNumberValue.getNumericValue().intValue();
-//		batchNumber += 1;
-//		batchNumberValue.setNumericValue(new BigDecimal(batchNumber));
-//		batchNumberValue.merge();
-//		return batchNumber;
-//	}
-	
+
+	// private int getNextBatchNumber(LsThing parent) {
+	// LsThingValue batchNumberValue =
+	// LsThingValue.findLsThingValuesByLsThingIDAndStateTypeKindAndValueTypeKind(parent.getId(),
+	// "metadata", parent.getLsKind() + " " + parent.getLsType(), "numericValue",
+	// "batch number").getSingleResult();
+	// int batchNumber = batchNumberValue.getNumericValue().intValue();
+	// batchNumber += 1;
+	// batchNumberValue.setNumericValue(new BigDecimal(batchNumber));
+	// batchNumberValue.merge();
+	// return batchNumber;
+	// }
+
 	private int decrementBatchNumber(LsThing parent) {
-		LsThingValue batchNumberValue = LsThingValue.findLsThingValuesByLsThingIDAndStateTypeKindAndValueTypeKind(parent.getId(), "metadata", parent.getLsKind() + " " + parent.getLsType(), "numericValue", "batch number").getSingleResult();
+		LsThingValue batchNumberValue = LsThingValue
+				.findLsThingValuesByLsThingIDAndStateTypeKindAndValueTypeKind(parent.getId(), "metadata",
+						parent.getLsKind() + " " + parent.getLsType(), "numericValue", "batch number")
+				.getSingleResult();
 		int batchNumber = batchNumberValue.getNumericValue().intValue();
 		batchNumber -= 1;
 		batchNumberValue.setNumericValue(new BigDecimal(batchNumber));
 		batchNumberValue.merge();
 		return batchNumber;
 	}
-	
+
 	private int incrementBatchNumber(LsThing parent) {
-		LsThingValue batchNumberValue = LsThingValue.findLsThingValuesByLsThingIDAndStateTypeKindAndValueTypeKind(parent.getId(), "metadata", parent.getLsKind() + " " + parent.getLsType(), "numericValue", "batch number").getSingleResult();
+		LsThingValue batchNumberValue = LsThingValue
+				.findLsThingValuesByLsThingIDAndStateTypeKindAndValueTypeKind(parent.getId(), "metadata",
+						parent.getLsKind() + " " + parent.getLsType(), "numericValue", "batch number")
+				.getSingleResult();
 		int batchNumber = batchNumberValue.getNumericValue().intValue();
 		batchNumber += 1;
 		batchNumberValue.setNumericValue(new BigDecimal(batchNumber));
@@ -1029,35 +1075,39 @@ private int incrementBatchNumber(LsThing parent) {
 		return batchNumber;
 	}
 
-
 	@Override
 	public Collection<LsThing> findBatchesByParentEquals(LsThing parent) {
 		Collection<LsThing> batches;
-		try{
-			batches = LsThing.findFirstLsThingsByItxTypeKindEqualsAndSecondLsThingEquals("instantiates", "batch_parent", parent).getResultList();
-		} catch (NoResultException e){
+		try {
+			batches = LsThing
+					.findFirstLsThingsByItxTypeKindEqualsAndSecondLsThingEquals("instantiates", "batch_parent", parent)
+					.getResultList();
+		} catch (NoResultException e) {
 			batches = null;
 		}
 		return batches;
 	}
-	
+
 	@Override
 	public Collection<LsThing> findCompositesByComponentEquals(LsThing component) {
 		Collection<LsThing> batches;
-		try{
-			batches = LsThing.findFirstLsThingsByItxTypeEqualsAndSecondLsThingEquals("incorporates", component).getResultList();
-		} catch (NoResultException e){
+		try {
+			batches = LsThing.findFirstLsThingsByItxTypeEqualsAndSecondLsThingEquals("incorporates", component)
+					.getResultList();
+		} catch (NoResultException e) {
 			batches = null;
 		}
 		return batches;
 	}
-	
+
 	@Override
 	public LsThing findParentByBatchEquals(LsThing batch) {
 		LsThing parent;
-		try{
-			parent = LsThing.findSecondLsThingsByItxTypeKindEqualsAndFirstLsThingEquals("instantiates", "batch_parent", batch).getSingleResult();
-		} catch (NoResultException e){
+		try {
+			parent = LsThing
+					.findSecondLsThingsByItxTypeKindEqualsAndFirstLsThingEquals("instantiates", "batch_parent", batch)
+					.getSingleResult();
+		} catch (NoResultException e) {
 			parent = null;
 		}
 		return parent;
@@ -1081,12 +1131,12 @@ public Collection<LsThing> findLsThingProjectsByGenericMetaDataSearch(
 		Collection<LsThing> rawResults = findLsThingsByGenericMetaDataSearch(searchQuery, "project");
 		Collection<LsThing> projects = authorService.getUserProjects(userName);
 		List<String> allowedProjectCodeNames = new ArrayList<String>();
-		for (LsThing project : projects){
+		for (LsThing project : projects) {
 			allowedProjectCodeNames.add(project.getCodeName());
 		}
 		Collection<LsThing> results = new HashSet<LsThing>();
-		for (LsThing rawResult : rawResults){
-			if (allowedProjectCodeNames.contains(rawResult.getCodeName())){
+		for (LsThing rawResult : rawResults) {
+			if (allowedProjectCodeNames.contains(rawResult.getCodeName())) {
 				results.add(rawResult);
 			}
 		}
@@ -1095,7 +1145,7 @@ public Collection<LsThing> findLsThingProjectsByGenericMetaDataSearch(
 
 	@Override
 	public Collection<LsThing> findLsThingsByGenericMetaDataSearch(
-			String queryString, String lsType, String lsKind){
+			String queryString, String lsType, String lsKind) {
 		List<Long> lsThingIdList = new ArrayList<Long>();
 		queryString = queryString.replaceAll("\\*", "%");
 		List<String> splitQuery = SimpleUtil.splitSearchString(queryString);
@@ -1104,69 +1154,83 @@ public Collection<LsThing> findLsThingsByGenericMetaDataSearch(
 		CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
 		CriteriaQuery<Long> criteria = criteriaBuilder.createQuery(Long.class);
 		Root<LsThing> lsThingRoot = criteria.from(LsThing.class);
-//		Join<LsThing, ItxLsThingLsThing> lsThingFirstItx = lsThingRoot.join("firstLsThings", JoinType.LEFT);
-//		Join<ItxLsThingLsThing, LsThing> lsThingFirstLsThing = lsThingRoot.join("firstLsThings", JoinType.LEFT).join("firstLsThing", JoinType.LEFT);
+		// Join<LsThing, ItxLsThingLsThing> lsThingFirstItx =
+		// lsThingRoot.join("firstLsThings", JoinType.LEFT);
+		// Join<ItxLsThingLsThing, LsThing> lsThingFirstLsThing =
+		// lsThingRoot.join("firstLsThings", JoinType.LEFT).join("firstLsThing",
+		// JoinType.LEFT);
 		Join<LsThing, ItxLsThingLsThing> lsThingSecondItx = lsThingRoot.join("secondLsThings", JoinType.LEFT);
-		Join<ItxLsThingLsThing, LsThing> lsThingSecondLsThing = lsThingRoot.join("secondLsThings", JoinType.LEFT).join("secondLsThing", JoinType.LEFT);
-		Join<LsThing, LsThingLabel> lsThingSecondLsThingLabel = lsThingRoot.join("secondLsThings", JoinType.LEFT).join("secondLsThing", JoinType.LEFT).join("lsLabels", JoinType.LEFT);
+		Join<ItxLsThingLsThing, LsThing> lsThingSecondLsThing = lsThingRoot.join("secondLsThings", JoinType.LEFT)
+				.join("secondLsThing", JoinType.LEFT);
+		Join<LsThing, LsThingLabel> lsThingSecondLsThingLabel = lsThingRoot.join("secondLsThings", JoinType.LEFT)
+				.join("secondLsThing", JoinType.LEFT).join("lsLabels", JoinType.LEFT);
 		Join<LsThing, LsThingLabel> lsThingLabel = lsThingRoot.join("lsLabels", JoinType.LEFT);
 		Join<LsThing, LsThingState> lsThingState = lsThingRoot.join("lsStates", JoinType.LEFT);
-		Join<LsThingState, LsThingValue> lsThingValue = lsThingRoot.join("lsStates", JoinType.LEFT).join("lsValues", JoinType.LEFT);
-		
+		Join<LsThingState, LsThingValue> lsThingValue = lsThingRoot.join("lsStates", JoinType.LEFT).join("lsValues",
+				JoinType.LEFT);
+
 		criteria.select(lsThingRoot.<Long>get("id"));
 		criteria.distinct(true);
 		Predicate[] predicates = new Predicate[0];
 		List<Predicate> predicateList = new ArrayList<Predicate>();
-		if (lsType != null && lsType.length() > 0){
+		if (lsType != null && lsType.length() > 0) {
 			Predicate predicate = criteriaBuilder.equal(lsThingRoot.<String>get("lsType"), lsType);
 			predicateList.add(predicate);
 		}
-		if (lsKind != null && lsKind.length() > 0){
+		if (lsKind != null && lsKind.length() > 0) {
 			Predicate predicate = criteriaBuilder.equal(lsThingRoot.<String>get("lsKind"), lsKind);
 			predicateList.add(predicate);
 		}
-		for (String term : splitQuery){
+		for (String term : splitQuery) {
 			Predicate[] predicatesByTerm = new Predicate[0];
 			List<Predicate> predicateListByTerm = new ArrayList<Predicate>();
-			
-			//Reusable predicates
+
+			// Reusable predicates
 			Predicate lsThingValueNotIgnored = criteriaBuilder.not(lsThingValue.<Boolean>get("ignored"));
 			Predicate lsThingStateNotIgnored = criteriaBuilder.not(lsThingState.<Boolean>get("ignored"));
-			
-			//CodeName
+
+			// CodeName
 			Predicate codeNamePredicate = criteriaBuilder.like(lsThingRoot.<String>get("codeName"), term);
 			predicateListByTerm.add(codeNamePredicate);
-			
-			//parent name
-			Predicate parentNameItxTypePredicate = criteriaBuilder.equal(lsThingSecondItx.<String>get("lsType"), "instantiates");
-			Predicate parentNameItxKindPredicate = criteriaBuilder.equal(lsThingSecondItx.<String>get("lsKind"), "batch_parent");
-			Predicate parentNameLabelPredicate = criteriaBuilder.like(criteriaBuilder.lower(lsThingSecondLsThingLabel.<String>get("labelText")), "%"+term.toLowerCase()+"%");
+
+			// parent name
+			Predicate parentNameItxTypePredicate = criteriaBuilder.equal(lsThingSecondItx.<String>get("lsType"),
+					"instantiates");
+			Predicate parentNameItxKindPredicate = criteriaBuilder.equal(lsThingSecondItx.<String>get("lsKind"),
+					"batch_parent");
+			Predicate parentNameLabelPredicate = criteriaBuilder.like(
+					criteriaBuilder.lower(lsThingSecondLsThingLabel.<String>get("labelText")),
+					"%" + term.toLowerCase() + "%");
 			Predicate lsThingSecondItxNotIgnored = criteriaBuilder.not(lsThingSecondItx.<Boolean>get("ignored"));
-			Predicate lsThingSecondLsThingNotIgnored = criteriaBuilder.not(lsThingSecondLsThing.<Boolean>get("ignored"));
-			Predicate lsThingSecondLsThingLabelNotIgnored = criteriaBuilder.not(lsThingSecondLsThingLabel.<Boolean>get("ignored"));
-			Predicate parentNamePredicate = criteriaBuilder.and(parentNameItxTypePredicate, 
-					lsThingSecondItxNotIgnored, 
+			Predicate lsThingSecondLsThingNotIgnored = criteriaBuilder
+					.not(lsThingSecondLsThing.<Boolean>get("ignored"));
+			Predicate lsThingSecondLsThingLabelNotIgnored = criteriaBuilder
+					.not(lsThingSecondLsThingLabel.<Boolean>get("ignored"));
+			Predicate parentNamePredicate = criteriaBuilder.and(parentNameItxTypePredicate,
+					lsThingSecondItxNotIgnored,
 					parentNameItxKindPredicate,
 					lsThingSecondLsThingNotIgnored,
 					parentNameLabelPredicate,
 					lsThingSecondLsThingLabelNotIgnored);
 			predicateListByTerm.add(parentNamePredicate);
-			
-			//recordedby
+
+			// recordedby
 			Predicate recordedByPredicate = criteriaBuilder.like(lsThingRoot.<String>get("recordedBy"), term);
 			predicateListByTerm.add(recordedByPredicate);
-			
-			//scientist
+
+			// scientist
 			Predicate scientistPredicate1 = criteriaBuilder.like(lsThingValue.<String>get("codeValue"), term);
 			Predicate scientistPredicate2 = criteriaBuilder.equal(lsThingValue.<String>get("lsKind"), "scientist");
-			Predicate scientistPredicate = criteriaBuilder.and(scientistPredicate1, scientistPredicate2, lsThingValueNotIgnored, lsThingStateNotIgnored);
+			Predicate scientistPredicate = criteriaBuilder.and(scientistPredicate1, scientistPredicate2,
+					lsThingValueNotIgnored, lsThingStateNotIgnored);
 			predicateListByTerm.add(scientistPredicate);
-			
-			//lskind
-			Predicate lsKindPredicate = criteriaBuilder.like(criteriaBuilder.lower(lsThingRoot.<String>get("lsKind")), "%"+term.toLowerCase()+"%");
+
+			// lskind
+			Predicate lsKindPredicate = criteriaBuilder.like(criteriaBuilder.lower(lsThingRoot.<String>get("lsKind")),
+					"%" + term.toLowerCase() + "%");
 			predicateListByTerm.add(lsKindPredicate);
-			
-			//date
+
+			// date
 			DateFormat df = new SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH);
 			DateFormat df2 = new SimpleDateFormat("MM-dd-yyyy", Locale.ENGLISH);
 			try {
@@ -1176,13 +1240,15 @@ public Collection<LsThing> findLsThingsByGenericMetaDataSearch(
 				beforeDate.setMinutes(0);
 				beforeDate.setSeconds(0);
 				Date afterDate = new Date(date.getTime());
-				afterDate.setDate(afterDate.getDate()+1);
+				afterDate.setDate(afterDate.getDate() + 1);
 				afterDate.setHours(0);
 				afterDate.setMinutes(0);
 				afterDate.setSeconds(0);
-				Predicate datePredicate1 = criteriaBuilder.between(lsThingValue.<Date>get("dateValue"), beforeDate, afterDate);
+				Predicate datePredicate1 = criteriaBuilder.between(lsThingValue.<Date>get("dateValue"), beforeDate,
+						afterDate);
 				Predicate datePredicate2 = criteriaBuilder.equal(lsThingValue.<String>get("lsKind"), "completion date");
-				Predicate datePredicate = criteriaBuilder.and(datePredicate1, datePredicate2, lsThingValueNotIgnored, lsThingStateNotIgnored);
+				Predicate datePredicate = criteriaBuilder.and(datePredicate1, datePredicate2, lsThingValueNotIgnored,
+						lsThingStateNotIgnored);
 				predicateListByTerm.add(datePredicate);
 			} catch (Exception e) {
 				try {
@@ -1192,62 +1258,70 @@ public Collection<LsThing> findLsThingsByGenericMetaDataSearch(
 					beforeDate.setMinutes(0);
 					beforeDate.setSeconds(0);
 					Date afterDate = new Date(date.getTime());
-					afterDate.setDate(afterDate.getDate()+1);
+					afterDate.setDate(afterDate.getDate() + 1);
 					afterDate.setHours(0);
 					afterDate.setMinutes(0);
 					afterDate.setSeconds(0);
-					Predicate datePredicate1 = criteriaBuilder.between(lsThingValue.<Date>get("dateValue"), beforeDate, afterDate);
-					Predicate datePredicate2 = criteriaBuilder.equal(lsThingValue.<String>get("lsKind"), "completion date");
-					Predicate datePredicate = criteriaBuilder.and(datePredicate1, datePredicate2, lsThingValueNotIgnored, lsThingStateNotIgnored);
+					Predicate datePredicate1 = criteriaBuilder.between(lsThingValue.<Date>get("dateValue"), beforeDate,
+							afterDate);
+					Predicate datePredicate2 = criteriaBuilder.equal(lsThingValue.<String>get("lsKind"),
+							"completion date");
+					Predicate datePredicate = criteriaBuilder.and(datePredicate1, datePredicate2,
+							lsThingValueNotIgnored, lsThingStateNotIgnored);
 					predicateListByTerm.add(datePredicate);
 				} catch (Exception e2) {
-					//do nothing
+					// do nothing
 				}
 			}
-			
-			//notebook
+
+			// notebook
 			Predicate notebookPredicate1 = criteriaBuilder.like(lsThingValue.<String>get("stringValue"), term);
 			Predicate notebookPredicate2 = criteriaBuilder.equal(lsThingValue.<String>get("lsKind"), "notebook");
-			Predicate notebookPredicate = criteriaBuilder.and(notebookPredicate1, notebookPredicate2, lsThingValueNotIgnored, lsThingStateNotIgnored);
+			Predicate notebookPredicate = criteriaBuilder.and(notebookPredicate1, notebookPredicate2,
+					lsThingValueNotIgnored, lsThingStateNotIgnored);
 			predicateListByTerm.add(notebookPredicate);
-			
-			//study code
+
+			// study code
 			Predicate studyCodePredicate1 = criteriaBuilder.like(lsThingValue.<String>get("stringValue"), term);
 			Predicate studyCodePredicate2 = criteriaBuilder.equal(lsThingValue.<String>get("lsKind"), "study code");
-			Predicate studyCodePredicate = criteriaBuilder.and(studyCodePredicate1, studyCodePredicate2, lsThingValueNotIgnored, lsThingStateNotIgnored);
+			Predicate studyCodePredicate = criteriaBuilder.and(studyCodePredicate1, studyCodePredicate2,
+					lsThingValueNotIgnored, lsThingStateNotIgnored);
 			predicateListByTerm.add(studyCodePredicate);
-			
-			//name
-			Predicate nameLabelPredicate = criteriaBuilder.like(criteriaBuilder.lower(lsThingLabel.<String>get("labelText")), "%"+term.toLowerCase()+"%");
+
+			// name
+			Predicate nameLabelPredicate = criteriaBuilder
+					.like(criteriaBuilder.lower(lsThingLabel.<String>get("labelText")), "%" + term.toLowerCase() + "%");
 			Predicate lsThingLabelTypeName = criteriaBuilder.equal(lsThingLabel.<String>get("lsType"), "name");
 			Predicate lsThingLabelNotIgnored = criteriaBuilder.not(lsThingLabel.<Boolean>get("ignored"));
-			Predicate namePredicate = criteriaBuilder.and(nameLabelPredicate, lsThingLabelTypeName, lsThingLabelNotIgnored);
+			Predicate namePredicate = criteriaBuilder.and(nameLabelPredicate, lsThingLabelTypeName,
+					lsThingLabelNotIgnored);
 			predicateListByTerm.add(namePredicate);
-			
-			//join all the predicatesByTerm with OR
+
+			// join all the predicatesByTerm with OR
 			predicatesByTerm = predicateListByTerm.toArray(predicatesByTerm);
 			predicateList.add(criteriaBuilder.or(predicatesByTerm));
 		}
-		//make sure lsThing is not ignored. All of the other layers of not ignored are in predicates above
-		Predicate lsThingNotIgnored = criteriaBuilder.not(lsThingRoot.<Boolean>get("ignored"));		
+		// make sure lsThing is not ignored. All of the other layers of not ignored are
+		// in predicates above
+		Predicate lsThingNotIgnored = criteriaBuilder.not(lsThingRoot.<Boolean>get("ignored"));
 		predicateList.add(lsThingNotIgnored);
 
-		
 		predicates = predicateList.toArray(predicates);
 		criteria.where(criteriaBuilder.and(predicates));
 		TypedQuery<Long> q = em.createQuery(criteria);
 		logger.debug(q.unwrap(org.hibernate.Query.class).getQueryString());
 		lsThingIdList = q.getResultList();
-		logger.debug("Found "+lsThingIdList.size()+" results.");
+		logger.debug("Found " + lsThingIdList.size() + " results.");
 		Collection<LsThing> result = new HashSet<LsThing>();
-		for (Long lsThingId: lsThingIdList) {
+		for (Long lsThingId : lsThingIdList) {
 			LsThing lsThing = LsThing.findLsThing(lsThingId);
-			//For LsThing Browser, we want to see soft deleted (ignored=true, deleted=false), but not hard deleted (ignored=deleted=true)
-			if (lsThing.isDeleted()){
+			// For LsThing Browser, we want to see soft deleted (ignored=true,
+			// deleted=false), but not hard deleted (ignored=deleted=true)
+			if (lsThing.isDeleted()) {
 				logger.debug("removing a deleted lsThing from the results");
 			} else {
-				//Inject parent preferred label to all batch lsThings
-				if (lsThing.getLsType().equals("batch")){
+				// Inject parent preferred label to all batch lsThings
+				if (lsThing.getLsType().equals("batch")) {
 					LsThingLabel bestParentLabel = findParentByBatchEquals(lsThing).pickBestName();
 					lsThing.getLsLabels().add(bestParentLabel);
 				}
@@ -1257,18 +1331,17 @@ public Collection<LsThing> findLsThingsByGenericMetaDataSearch(
 		return result;
 	}
 
-
 	@Override
 	public Collection<CodeTableDTO> getCodeTableLsThings(String lsType,
 			String lsKind, boolean includeIgnored) {
 		Collection<LsThing> lsThings = findLsThingsByLsTypeAndLsKindAndIncludeIgnored(lsType, lsKind, includeIgnored);
 		return convertToCodeTables(lsThings);
 	}
-	
+
 	@Override
-	public Collection<CodeTableDTO> convertToCodeTables(Collection<LsThing> lsThings){
+	public Collection<CodeTableDTO> convertToCodeTables(Collection<LsThing> lsThings) {
 		Collection<CodeTableDTO> codeTables = new ArrayList<CodeTableDTO>();
-		for (LsThing lsThing : lsThings){
+		for (LsThing lsThing : lsThings) {
 			CodeTableDTO codeTable = new CodeTableDTO();
 			codeTable.setId(lsThing.getId());
 			codeTable.setCode(lsThing.getCodeName());
@@ -1276,14 +1349,14 @@ public Collection<CodeTableDTO> convertToCodeTables(Collection<LsThing> lsThings
 			codeTable.setIgnored(lsThing.isIgnored());
 			codeTables.add(codeTable);
 		}
-		
+
 		return codeTables;
 	}
-	
+
 	@Override
-	public Collection<CodeTableDTO> convertToCodeTables(Collection<LsThing> lsThings, String labelType){
+	public Collection<CodeTableDTO> convertToCodeTables(Collection<LsThing> lsThings, String labelType) {
 		Collection<CodeTableDTO> codeTables = new ArrayList<CodeTableDTO>();
-		for (LsThing lsThing : lsThings){
+		for (LsThing lsThing : lsThings) {
 			CodeTableDTO codeTable = new CodeTableDTO();
 			codeTable.setId(lsThing.getId());
 			codeTable.setCode(lsThing.getCodeName());
@@ -1291,50 +1364,53 @@ public Collection<CodeTableDTO> convertToCodeTables(Collection<LsThing> lsThings
 			codeTable.setIgnored(lsThing.isIgnored());
 			codeTables.add(codeTable);
 		}
-		
+
 		return codeTables;
 	}
-	
+
 	private String pickBestLabel(LsThing lsThing) {
 		Collection<LsThingLabel> labels = lsThing.getLsLabels();
-		if (labels.isEmpty()) return null;
+		if (labels.isEmpty())
+			return null;
 		return LsThingLabel.pickBestLabel(labels).getLabelText();
 	}
-	
+
 	private String pickBestLabel(LsThing lsThing, String labelType) {
 		Collection<LsThingLabel> labels = lsThing.getLsLabels();
-		if (labels.isEmpty()) return null;
+		if (labels.isEmpty())
+			return null;
 		Collection<LsThingLabel> filteredLabels = new ArrayList<LsThingLabel>();
-		for (LsThingLabel label : labels){
-			if (label.getLsType().equals(labelType)){
+		for (LsThingLabel label : labels) {
+			if (label.getLsType().equals(labelType)) {
 				filteredLabels.add(label);
 			}
 		}
 		return LsThingLabel.pickBestLabel(filteredLabels).getLabelText();
 	}
 
-
 	@Override
-	public Collection<LsThing> findLsThingsByLsTypeAndLsKindAndIncludeIgnored(String lsType, String lsKind, boolean includeIgnored){
+	public Collection<LsThing> findLsThingsByLsTypeAndLsKindAndIncludeIgnored(String lsType, String lsKind,
+			boolean includeIgnored) {
 		Collection<LsThing> searchResults = new HashSet<LsThing>();
-		if (includeIgnored){
-			try{
-				searchResults = LsThing.findLsThingsByLsTypeAndKindEquals(lsType+"_"+lsKind).getResultList();
-			} catch (NoResultException e){}
-		}
-		else {
-			try{
+		if (includeIgnored) {
+			try {
+				searchResults = LsThing.findLsThingsByLsTypeAndKindEquals(lsType + "_" + lsKind).getResultList();
+			} catch (NoResultException e) {
+			}
+		} else {
+			try {
 				searchResults = LsThing.findLsThing(lsType, lsKind).getResultList();
-			} catch (NoResultException e){}
+			} catch (NoResultException e) {
+			}
 		}
 		return searchResults;
 	}
-	
-	public void updateLsStates(LsThing jsonLsThing, LsThing updatedLsThing){
-		if(jsonLsThing.getLsStates() != null){
-			for(LsThingState lsThingState : jsonLsThing.getLsStates()){
+
+	public void updateLsStates(LsThing jsonLsThing, LsThing updatedLsThing) {
+		if (jsonLsThing.getLsStates() != null) {
+			for (LsThingState lsThingState : jsonLsThing.getLsStates()) {
 				LsThingState updatedLsThingState;
-				if (lsThingState.getId() == null){
+				if (lsThingState.getId() == null) {
 					updatedLsThingState = new LsThingState(lsThingState);
 					updatedLsThingState.setLsThing(updatedLsThing);
 					updatedLsThingState.persist();
@@ -1348,11 +1424,12 @@ public void updateLsStates(LsThing jsonLsThing, LsThing updatedLsThing){
 					logger.debug("updated lsThing state " + updatedLsThingState.getId());
 
 				}
-				if (lsThingState.getLsValues() != null){
-					for(LsThingValue lsThingValue : lsThingState.getLsValues()){
-						if (lsThingValue.getLsState() == null) lsThingValue.setLsState(updatedLsThingState);
+				if (lsThingState.getLsValues() != null) {
+					for (LsThingValue lsThingValue : lsThingState.getLsValues()) {
+						if (lsThingValue.getLsState() == null)
+							lsThingValue.setLsState(updatedLsThingState);
 						LsThingValue updatedLsThingValue = null;
-						if (lsThingValue.getId() == null){
+						if (lsThingValue.getId() == null) {
 							updatedLsThingValue = new LsThingValue(lsThingValue);
 							updatedLsThingValue.setLsState(LsThingState.findLsThingState(updatedLsThingState.getId()));
 							updatedLsThingValue.persist();
@@ -1361,19 +1438,20 @@ public void updateLsStates(LsThing jsonLsThing, LsThing updatedLsThing){
 							updatedLsThingValue = LsThingValue.update(lsThingValue);
 							logger.debug("updated lsThing value " + updatedLsThingValue.getId());
 						}
-					}	
+					}
 				} else {
 					logger.debug("No lsThing values to update");
 				}
 			}
 		}
 	}
-	
-	private void updateItxLsStates(ItxLsThingLsThing jsonItxLsThingLsThing, ItxLsThingLsThing updatedItxLsThingLsThing){
-		if(jsonItxLsThingLsThing.getLsStates() != null){
-			for(ItxLsThingLsThingState itxLsThingLsThingState : jsonItxLsThingLsThing.getLsStates()){
+
+	private void updateItxLsStates(ItxLsThingLsThing jsonItxLsThingLsThing,
+			ItxLsThingLsThing updatedItxLsThingLsThing) {
+		if (jsonItxLsThingLsThing.getLsStates() != null) {
+			for (ItxLsThingLsThingState itxLsThingLsThingState : jsonItxLsThingLsThing.getLsStates()) {
 				ItxLsThingLsThingState updatedItxLsThingLsThingState;
-				if (itxLsThingLsThingState.getId() == null){
+				if (itxLsThingLsThingState.getId() == null) {
 					updatedItxLsThingLsThingState = new ItxLsThingLsThingState(itxLsThingLsThingState);
 					updatedItxLsThingLsThingState.setItxLsThingLsThing(updatedItxLsThingLsThing);
 					updatedItxLsThingLsThingState.persist();
@@ -1386,12 +1464,13 @@ private void updateItxLsStates(ItxLsThingLsThing jsonItxLsThingLsThing, ItxLsThi
 					logger.debug("updated itxLsThingLsThing state " + updatedItxLsThingLsThingState.getId());
 
 				}
-				if (itxLsThingLsThingState.getLsValues() != null){
-					for(ItxLsThingLsThingValue itxLsThingLsThingValue : itxLsThingLsThingState.getLsValues()){
+				if (itxLsThingLsThingState.getLsValues() != null) {
+					for (ItxLsThingLsThingValue itxLsThingLsThingValue : itxLsThingLsThingState.getLsValues()) {
 						ItxLsThingLsThingValue updatedItxLsThingLsThingValue;
-						if (itxLsThingLsThingValue.getId() == null){
+						if (itxLsThingLsThingValue.getId() == null) {
 							updatedItxLsThingLsThingValue = ItxLsThingLsThingValue.create(itxLsThingLsThingValue);
-							updatedItxLsThingLsThingValue.setLsState(ItxLsThingLsThingState.findItxLsThingLsThingState(updatedItxLsThingLsThingState.getId()));
+							updatedItxLsThingLsThingValue.setLsState(ItxLsThingLsThingState
+									.findItxLsThingLsThingState(updatedItxLsThingLsThingState.getId()));
 							updatedItxLsThingLsThingValue.persist();
 							updatedItxLsThingLsThingState.getLsValues().add(updatedItxLsThingLsThingValue);
 						} else {
@@ -1401,17 +1480,17 @@ private void updateItxLsStates(ItxLsThingLsThing jsonItxLsThingLsThing, ItxLsThi
 							updatedItxLsThingLsThingState.getLsValues().add(updatedItxLsThingLsThingValue);
 							logger.debug("updated itxLsThingLsThing value " + updatedItxLsThingLsThingValue.getId());
 						}
-					}	
+					}
 				} else {
 					logger.debug("No itxLsThingLsThing values to update");
 				}
 			}
 		}
 	}
-	
+
 	@Override
 	@Transactional
-	public Collection<LsThing> searchForDocumentThings(Map<String, String> searchParamsMap){
+	public Collection<LsThing> searchForDocumentThings(Map<String, String> searchParamsMap) {
 		List<Long> lsThingIdList = new ArrayList<Long>();
 		EntityManager em = LsThing.entityManager();
 		CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
@@ -1419,65 +1498,79 @@ public Collection<LsThing> searchForDocumentThings(Map<String, String> searchPar
 		Root<LsThing> document = criteria.from(LsThing.class);
 		Join<LsThing, LsThingState> documentState = document.join("lsStates", JoinType.LEFT);
 		Join<LsThing, LsThingLabel> documentLabel = document.join("lsLabels", JoinType.LEFT);
-		
+
 		criteria.select(document.<Long>get("id"));
 		criteria.distinct(true);
 		Predicate[] predicates = new Predicate[0];
 		List<Predicate> predicateList = new ArrayList<Predicate>();
-		
-		//always present predicates
+
+		// always present predicates
 		Predicate documentType = criteriaBuilder.equal(document.<String>get("lsType"), "legalDocument");
 		Predicate documentNotIgnored = criteriaBuilder.not(document.<Boolean>get("ignored"));
 		Predicate documentTypePredicate = criteriaBuilder.and(documentType, documentNotIgnored);
 		predicateList.add(documentTypePredicate);
-		//Reusable predicates
+		// Reusable predicates
 		Predicate documentStateNotIgnored = criteriaBuilder.not(documentState.<Boolean>get("ignored"));
-//		Predicate lsThingValueNotIgnored = criteriaBuilder.not(lsThingValue.<Boolean>get("ignored"));
-//		Predicate lsThingStateNotIgnored = criteriaBuilder.not(lsThingState.<Boolean>get("ignored"));
-		
-		//documentCode : LsThing CodeName LIKE
-		if (searchParamsMap.keySet().contains("documentCode")){
-			Predicate documentCode = criteriaBuilder.like(document.<String>get("codeName"), "%"+searchParamsMap.get("documentCode")+"%");
+		// Predicate lsThingValueNotIgnored =
+		// criteriaBuilder.not(lsThingValue.<Boolean>get("ignored"));
+		// Predicate lsThingStateNotIgnored =
+		// criteriaBuilder.not(lsThingState.<Boolean>get("ignored"));
+
+		// documentCode : LsThing CodeName LIKE
+		if (searchParamsMap.keySet().contains("documentCode")) {
+			Predicate documentCode = criteriaBuilder.like(document.<String>get("codeName"),
+					"%" + searchParamsMap.get("documentCode") + "%");
 			predicateList.add(documentCode);
 		}
-		//documentType : LsThing LsKind EQUALS
-		if (searchParamsMap.keySet().contains("documentType")){
-			Predicate documentKind = criteriaBuilder.equal(document.<String>get("lsKind"), searchParamsMap.get("documentType"));
+		// documentType : LsThing LsKind EQUALS
+		if (searchParamsMap.keySet().contains("documentType")) {
+			Predicate documentKind = criteriaBuilder.equal(document.<String>get("lsKind"),
+					searchParamsMap.get("documentType"));
 			predicateList.add(documentKind);
 		}
-		//titleContains : LsThingLabel LabelText LIKE
-		if (searchParamsMap.keySet().contains("titleContains")){
-			Predicate titleContains = criteriaBuilder.like(documentLabel.<String>get("labelText"), "%"+searchParamsMap.get("titleContains")+"%");
+		// titleContains : LsThingLabel LabelText LIKE
+		if (searchParamsMap.keySet().contains("titleContains")) {
+			Predicate titleContains = criteriaBuilder.like(documentLabel.<String>get("labelText"),
+					"%" + searchParamsMap.get("titleContains") + "%");
 			Predicate documentLabelNotIgnored = criteriaBuilder.not(documentLabel.<Boolean>get("ignored"));
 			Predicate titleContainsPredicate = criteriaBuilder.and(titleContains, documentLabelNotIgnored);
 			predicateList.add(titleContainsPredicate);
 		}
-		//company : SecondLsThingsItx type/kind EQUALS "incorporates"/"documentCompany", SecondLsThings.SecondLsThing codeName EQUALS
-		if (searchParamsMap.keySet().contains("company")){
+		// company : SecondLsThingsItx type/kind EQUALS
+		// "incorporates"/"documentCompany", SecondLsThings.SecondLsThing codeName
+		// EQUALS
+		if (searchParamsMap.keySet().contains("company")) {
 			Join<LsThing, ItxLsThingLsThing> companyItx = document.join("secondLsThings", JoinType.LEFT);
 			Join<ItxLsThingLsThing, LsThing> company = companyItx.join("secondLsThing", JoinType.LEFT);
 			Predicate companyItxType = criteriaBuilder.equal(companyItx.<String>get("lsType"), "incorporates");
 			Predicate companyItxKind = criteriaBuilder.equal(companyItx.<String>get("lsKind"), "documentCompany");
-			Predicate companyCode = criteriaBuilder.equal(company.<String>get("codeName"), searchParamsMap.get("company"));
+			Predicate companyCode = criteriaBuilder.equal(company.<String>get("codeName"),
+					searchParamsMap.get("company"));
 			Predicate companyItxNotIgnored = criteriaBuilder.not(companyItx.<Boolean>get("ignored"));
 			Predicate companyNotIgnored = criteriaBuilder.not(company.<Boolean>get("ignored"));
-			Predicate companyPredicate = criteriaBuilder.and(companyItxType, companyItxKind, companyCode, companyItxNotIgnored, companyNotIgnored);
+			Predicate companyPredicate = criteriaBuilder.and(companyItxType, companyItxKind, companyCode,
+					companyItxNotIgnored, companyNotIgnored);
 			predicateList.add(companyPredicate);
 		}
-		//project : SecondLsThingsItx type/kind EQUALS "incorporates"/"documentProject", SecondLsThings.SecondLsThing codeName EQUALS
-		if (searchParamsMap.keySet().contains("project")){
+		// project : SecondLsThingsItx type/kind EQUALS
+		// "incorporates"/"documentProject", SecondLsThings.SecondLsThing codeName
+		// EQUALS
+		if (searchParamsMap.keySet().contains("project")) {
 			Join<LsThing, ItxLsThingLsThing> projectItx = document.join("secondLsThings", JoinType.LEFT);
 			Join<ItxLsThingLsThing, LsThing> project = projectItx.join("secondLsThing", JoinType.LEFT);
 			Predicate projectItxType = criteriaBuilder.equal(projectItx.<String>get("lsType"), "incorporates");
 			Predicate projectItxKind = criteriaBuilder.equal(projectItx.<String>get("lsKind"), "documentProject");
-			Predicate projectCode = criteriaBuilder.equal(project.<String>get("codeName"), searchParamsMap.get("project"));
+			Predicate projectCode = criteriaBuilder.equal(project.<String>get("codeName"),
+					searchParamsMap.get("project"));
 			Predicate projectItxNotIgnored = criteriaBuilder.not(projectItx.<Boolean>get("ignored"));
 			Predicate projectNotIgnored = criteriaBuilder.not(project.<Boolean>get("ignored"));
-			Predicate projectPredicate = criteriaBuilder.and(projectItxType, projectItxKind, projectCode, projectItxNotIgnored, projectNotIgnored);
+			Predicate projectPredicate = criteriaBuilder.and(projectItxType, projectItxKind, projectCode,
+					projectItxNotIgnored, projectNotIgnored);
 			predicateList.add(projectPredicate);
 		}
-		//owner : SecondLsThingsItx type/kind EQUALS "incorporates"/"documentOwner", SecondLsThings.SecondLsThing codeName EQUALS
-		if (searchParamsMap.keySet().contains("owner")){
+		// owner : SecondLsThingsItx type/kind EQUALS "incorporates"/"documentOwner",
+		// SecondLsThings.SecondLsThing codeName EQUALS
+		if (searchParamsMap.keySet().contains("owner")) {
 			Join<LsThing, ItxLsThingLsThing> ownerItx = document.join("secondLsThings", JoinType.LEFT);
 			Join<ItxLsThingLsThing, LsThing> owner = ownerItx.join("secondLsThing", JoinType.LEFT);
 			Predicate ownerItxType = criteriaBuilder.equal(ownerItx.<String>get("lsType"), "incorporates");
@@ -1485,101 +1578,135 @@ public Collection<LsThing> searchForDocumentThings(Map<String, String> searchPar
 			Predicate ownerCode = criteriaBuilder.equal(owner.<String>get("codeName"), searchParamsMap.get("owner"));
 			Predicate ownerItxNotIgnored = criteriaBuilder.not(ownerItx.<Boolean>get("ignored"));
 			Predicate ownerNotIgnored = criteriaBuilder.not(owner.<Boolean>get("ignored"));
-			Predicate ownerPredicate = criteriaBuilder.and(ownerItxType, ownerItxKind, ownerCode, ownerItxNotIgnored, ownerNotIgnored);
+			Predicate ownerPredicate = criteriaBuilder.and(ownerItxType, ownerItxKind, ownerCode, ownerItxNotIgnored,
+					ownerNotIgnored);
 			predicateList.add(ownerPredicate);
 		}
-		//amountBetween
-		if (searchParamsMap.keySet().contains("amountTo") && searchParamsMap.keySet().contains("amountFrom")){
-			try{
+		// amountBetween
+		if (searchParamsMap.keySet().contains("amountTo") && searchParamsMap.keySet().contains("amountFrom")) {
+			try {
 				Join<LsThingState, LsThingValue> amountValue = documentState.join("lsValues", JoinType.LEFT);
 				Predicate amountType = criteriaBuilder.equal(amountValue.<String>get("lsType"), "numericValue");
 				Predicate amountKind = criteriaBuilder.equal(amountValue.<String>get("lsKind"), "amount");
-				Predicate amountBetween = criteriaBuilder.between(amountValue.<BigDecimal>get("numericValue"), new BigDecimal(searchParamsMap.get("amountFrom")), new BigDecimal(searchParamsMap.get("amountTo")));
+				Predicate amountBetween = criteriaBuilder.between(amountValue.<BigDecimal>get("numericValue"),
+						new BigDecimal(searchParamsMap.get("amountFrom")),
+						new BigDecimal(searchParamsMap.get("amountTo")));
 				Predicate amountValueNotIgnored = criteriaBuilder.not(amountValue.<Boolean>get("ignored"));
-				Predicate amountBetweenPredicate = criteriaBuilder.and(amountType, amountKind, amountBetween, documentStateNotIgnored, amountValueNotIgnored);
+				Predicate amountBetweenPredicate = criteriaBuilder.and(amountType, amountKind, amountBetween,
+						documentStateNotIgnored, amountValueNotIgnored);
 				predicateList.add(amountBetweenPredicate);
-			}catch (Exception e){
-				logger.error("Caught exception trying to parse "+searchParamsMap.get("amountFrom")+" or "+searchParamsMap.get("amountTo")+" as a number.",e);
-				//TODO:throw Exception, catch exception at higher levels. Ask about desired behavior on this error.
+			} catch (Exception e) {
+				logger.error("Caught exception trying to parse " + searchParamsMap.get("amountFrom") + " or "
+						+ searchParamsMap.get("amountTo") + " as a number.", e);
+				// TODO:throw Exception, catch exception at higher levels. Ask about desired
+				// behavior on this error.
 			}
 		}
-		//amountFrom : LsThingState.LsThingValue type/kind EQUALS "numericValue"/"amount", numericValue >=
-		else if (searchParamsMap.keySet().contains("amountFrom")){
-			try{
+		// amountFrom : LsThingState.LsThingValue type/kind EQUALS
+		// "numericValue"/"amount", numericValue >=
+		else if (searchParamsMap.keySet().contains("amountFrom")) {
+			try {
 				Join<LsThingState, LsThingValue> amountValue = documentState.join("lsValues", JoinType.LEFT);
 				Predicate amountType = criteriaBuilder.equal(amountValue.<String>get("lsType"), "numericValue");
 				Predicate amountKind = criteriaBuilder.equal(amountValue.<String>get("lsKind"), "amount");
-				Predicate amountFrom = criteriaBuilder.greaterThanOrEqualTo(amountValue.<BigDecimal>get("numericValue"), new BigDecimal(searchParamsMap.get("amountFrom")));
+				Predicate amountFrom = criteriaBuilder.greaterThanOrEqualTo(amountValue.<BigDecimal>get("numericValue"),
+						new BigDecimal(searchParamsMap.get("amountFrom")));
 				Predicate amountValueNotIgnored = criteriaBuilder.not(amountValue.<Boolean>get("ignored"));
-				Predicate amountFromPredicate = criteriaBuilder.and(amountType, amountKind, amountFrom, documentStateNotIgnored, amountValueNotIgnored);
+				Predicate amountFromPredicate = criteriaBuilder.and(amountType, amountKind, amountFrom,
+						documentStateNotIgnored, amountValueNotIgnored);
 				predicateList.add(amountFromPredicate);
-			}catch (Exception e){
-				logger.error("Caught exception trying to parse "+searchParamsMap.get("amountFrom")+" as a number.",e);
-				//TODO:throw Exception, catch exception at higher levels. Ask about desired behavior on this error.
+			} catch (Exception e) {
+				logger.error("Caught exception trying to parse " + searchParamsMap.get("amountFrom") + " as a number.",
+						e);
+				// TODO:throw Exception, catch exception at higher levels. Ask about desired
+				// behavior on this error.
 			}
 		}
-		//amountTo : LsThingState.LsThingValue type/kind EQUALS "numericValue"/"amount", numericValue <=
-		else if (searchParamsMap.keySet().contains("amountTo")){
-			try{
+		// amountTo : LsThingState.LsThingValue type/kind EQUALS
+		// "numericValue"/"amount", numericValue <=
+		else if (searchParamsMap.keySet().contains("amountTo")) {
+			try {
 				Join<LsThingState, LsThingValue> amountValue = documentState.join("lsValues", JoinType.LEFT);
 				Predicate amountType = criteriaBuilder.equal(amountValue.<String>get("lsType"), "numericValue");
 				Predicate amountKind = criteriaBuilder.equal(amountValue.<String>get("lsKind"), "amount");
-				Predicate amountTo = criteriaBuilder.lessThanOrEqualTo(amountValue.<BigDecimal>get("numericValue"), new BigDecimal(searchParamsMap.get("amountTo")));
+				Predicate amountTo = criteriaBuilder.lessThanOrEqualTo(amountValue.<BigDecimal>get("numericValue"),
+						new BigDecimal(searchParamsMap.get("amountTo")));
 				Predicate amountValueNotIgnored = criteriaBuilder.not(amountValue.<Boolean>get("ignored"));
-				Predicate amountToPredicate = criteriaBuilder.and(amountType, amountKind, amountTo, documentStateNotIgnored, amountValueNotIgnored);
+				Predicate amountToPredicate = criteriaBuilder.and(amountType, amountKind, amountTo,
+						documentStateNotIgnored, amountValueNotIgnored);
 				predicateList.add(amountToPredicate);
-			}catch (Exception e){
-				logger.error("Caught exception trying to parse "+searchParamsMap.get("amountTo")+" as a number.",e);
-				//TODO:throw Exception, catch exception at higher levels. Ask about desired behavior on this error.
+			} catch (Exception e) {
+				logger.error("Caught exception trying to parse " + searchParamsMap.get("amountTo") + " as a number.",
+						e);
+				// TODO:throw Exception, catch exception at higher levels. Ask about desired
+				// behavior on this error.
 			}
 		}
-		//createdDateBetween
-		if (searchParamsMap.keySet().contains("createdDateTo") && searchParamsMap.keySet().contains("createdDateFrom")){
-			try{
-				Predicate createdDateBetween = criteriaBuilder.between(document.<Date>get("recordedDate"), new Date(new Long(searchParamsMap.get("createdDateFrom"))), new Date(new Long(searchParamsMap.get("createdDateTo"))));
+		// createdDateBetween
+		if (searchParamsMap.keySet().contains("createdDateTo")
+				&& searchParamsMap.keySet().contains("createdDateFrom")) {
+			try {
+				Predicate createdDateBetween = criteriaBuilder.between(document.<Date>get("recordedDate"),
+						new Date(new Long(searchParamsMap.get("createdDateFrom"))),
+						new Date(new Long(searchParamsMap.get("createdDateTo"))));
 				predicateList.add(createdDateBetween);
-			}catch (Exception e){
-				logger.error("Caught exception trying to parse "+searchParamsMap.get("createdDateFrom")+" or "+searchParamsMap.get("createdDateTo")+" as a date.",e);
-				//TODO:throw Exception, catch exception at higher levels. Ask about desired behavior on this error.
+			} catch (Exception e) {
+				logger.error("Caught exception trying to parse " + searchParamsMap.get("createdDateFrom") + " or "
+						+ searchParamsMap.get("createdDateTo") + " as a date.", e);
+				// TODO:throw Exception, catch exception at higher levels. Ask about desired
+				// behavior on this error.
 			}
 		}
-		//createdDateFrom : LsThing recordedDate >= (date in Long)
-		else if (searchParamsMap.keySet().contains("createdDateFrom")){
-			try{
-				Predicate createdDateFrom = criteriaBuilder.greaterThanOrEqualTo(document.<Date>get("recordedDate"), new Date(new Long(searchParamsMap.get("createdDateFrom"))));
+		// createdDateFrom : LsThing recordedDate >= (date in Long)
+		else if (searchParamsMap.keySet().contains("createdDateFrom")) {
+			try {
+				Predicate createdDateFrom = criteriaBuilder.greaterThanOrEqualTo(document.<Date>get("recordedDate"),
+						new Date(new Long(searchParamsMap.get("createdDateFrom"))));
 				predicateList.add(createdDateFrom);
-			}catch (Exception e){
-				logger.error("Caught exception trying to parse "+searchParamsMap.get("createdDateFrom")+" as a date.",e);
-				//TODO:throw Exception, catch exception at higher levels. Ask about desired behavior on this error.
+			} catch (Exception e) {
+				logger.error(
+						"Caught exception trying to parse " + searchParamsMap.get("createdDateFrom") + " as a date.",
+						e);
+				// TODO:throw Exception, catch exception at higher levels. Ask about desired
+				// behavior on this error.
 			}
 		}
-		//createdDateTo : LsThing recordedDate <= (date in Long)
-		else if (searchParamsMap.keySet().contains("createdDateTo")){
-			try{
-				Predicate createdDateTo = criteriaBuilder.greaterThanOrEqualTo(document.<Date>get("recordedDate"), new Date(new Long(searchParamsMap.get("createdDateTo"))));
+		// createdDateTo : LsThing recordedDate <= (date in Long)
+		else if (searchParamsMap.keySet().contains("createdDateTo")) {
+			try {
+				Predicate createdDateTo = criteriaBuilder.greaterThanOrEqualTo(document.<Date>get("recordedDate"),
+						new Date(new Long(searchParamsMap.get("createdDateTo"))));
 				predicateList.add(createdDateTo);
-			}catch (Exception e){
-				logger.error("Caught exception trying to parse "+searchParamsMap.get("createdDateTo")+" as a date.",e);
-				//TODO:throw Exception, catch exception at higher levels. Ask about desired behavior on this error.
+			} catch (Exception e) {
+				logger.error("Caught exception trying to parse " + searchParamsMap.get("createdDateTo") + " as a date.",
+						e);
+				// TODO:throw Exception, catch exception at higher levels. Ask about desired
+				// behavior on this error.
 			}
-		}		
-		//active : LsThingState.LsThingValue type/kind EQUALS "stringValue"/"active", stringValue LIKE
-		if (searchParamsMap.keySet().contains("active")){
+		}
+		// active : LsThingState.LsThingValue type/kind EQUALS "stringValue"/"active",
+		// stringValue LIKE
+		if (searchParamsMap.keySet().contains("active")) {
 			Join<LsThingState, LsThingValue> activeValue = documentState.join("lsValues", JoinType.LEFT);
 			Predicate activeType = criteriaBuilder.equal(activeValue.<String>get("lsType"), "stringValue");
 			Predicate activeKind = criteriaBuilder.equal(activeValue.<String>get("lsKind"), "active");
-			Predicate active = criteriaBuilder.like(activeValue.<String>get("stringValue"), "%"+searchParamsMap.get("active")+"%");
+			Predicate active = criteriaBuilder.like(activeValue.<String>get("stringValue"),
+					"%" + searchParamsMap.get("active") + "%");
 			Predicate activeValueNotIgnored = criteriaBuilder.not(activeValue.<Boolean>get("ignored"));
-			Predicate activePredicate = criteriaBuilder.and(activeType, activeKind, active, documentStateNotIgnored, activeValueNotIgnored);
+			Predicate activePredicate = criteriaBuilder.and(activeType, activeKind, active, documentStateNotIgnored,
+					activeValueNotIgnored);
 			predicateList.add(activePredicate);
 		}
-		//collect all term predicates together
-		if (searchParamsMap.keySet().contains("termType") || searchParamsMap.keySet().contains("daysBeforeTerm") || searchParamsMap.keySet().contains("termDateTo") || searchParamsMap.keySet().contains("termDateFrom")){
+		// collect all term predicates together
+		if (searchParamsMap.keySet().contains("termType") || searchParamsMap.keySet().contains("daysBeforeTerm")
+				|| searchParamsMap.keySet().contains("termDateTo")
+				|| searchParamsMap.keySet().contains("termDateFrom")) {
 			List<Predicate> termPredicateList = new ArrayList<Predicate>();
 			Join<LsThing, ItxLsThingLsThing> termItx = document.join("secondLsThings", JoinType.LEFT);
 			Join<ItxLsThingLsThing, LsThing> term = termItx.join("secondLsThing", JoinType.LEFT);
 			Join<LsThing, LsThingState> termState = term.join("lsStates", JoinType.LEFT);
-			//SecondLsThingsItx type/kind EQUALS "incorporates"/"documentTerm", secondLsThing => Term
+			// SecondLsThingsItx type/kind EQUALS "incorporates"/"documentTerm",
+			// secondLsThing => Term
 			Predicate termItxType = criteriaBuilder.equal(termItx.<String>get("lsType"), "incorporates");
 			Predicate termItxKind = criteriaBuilder.equal(termItx.<String>get("lsKind"), "documentTerm");
 			Predicate termItxNotIgnored = criteriaBuilder.not(termItx.<Boolean>get("ignored"));
@@ -1590,129 +1717,169 @@ else if (searchParamsMap.keySet().contains("createdDateTo")){
 			termPredicateList.add(termItxNotIgnored);
 			termPredicateList.add(termLsKind);
 			termPredicateList.add(termNotIgnored);
-			//termType : TermValue type/kind = "codeValue, "termType", codeValue EQUALS
-			if (searchParamsMap.keySet().contains("termType")){
+			// termType : TermValue type/kind = "codeValue, "termType", codeValue EQUALS
+			if (searchParamsMap.keySet().contains("termType")) {
 				Join<LsThingState, LsThingValue> termTypeValue = termState.join("lsValues", JoinType.LEFT);
 				Predicate termTypeType = criteriaBuilder.equal(termTypeValue.<String>get("lsType"), "codeValue");
 				Predicate termTypeKind = criteriaBuilder.equal(termTypeValue.<String>get("lsKind"), "termType");
-				Predicate termType = criteriaBuilder.equal(termTypeValue.<String>get("codeValue"), searchParamsMap.get("termType"));
+				Predicate termType = criteriaBuilder.equal(termTypeValue.<String>get("codeValue"),
+						searchParamsMap.get("termType"));
 				Predicate termTypeNotIgnored = criteriaBuilder.not(termTypeValue.<Boolean>get("ignored"));
-				Predicate termTypePredicate = criteriaBuilder.and(termTypeType, termTypeKind, termType, termTypeNotIgnored);
+				Predicate termTypePredicate = criteriaBuilder.and(termTypeType, termTypeKind, termType,
+						termTypeNotIgnored);
 				termPredicateList.add(termTypePredicate);
 			}
-			//daysBeforeTerm : TermValue type/kind = "numericValue"/"daysBefore", numericValue =
-			if (searchParamsMap.keySet().contains("daysBeforeTerm")){
-				try{
+			// daysBeforeTerm : TermValue type/kind = "numericValue"/"daysBefore",
+			// numericValue =
+			if (searchParamsMap.keySet().contains("daysBeforeTerm")) {
+				try {
 					Join<LsThingState, LsThingValue> daysBeforeTermValue = termState.join("lsValues", JoinType.LEFT);
-					Predicate daysBeforeTermType = criteriaBuilder.equal(daysBeforeTermValue.<String>get("lsType"), "numericValue");
-					Predicate daysBeforeTermKind = criteriaBuilder.equal(daysBeforeTermValue.<String>get("lsKind"), "daysBefore");
-					Predicate daysBeforeTerm = criteriaBuilder.equal(daysBeforeTermValue.<BigDecimal>get("numericValue"), new BigDecimal(searchParamsMap.get("daysBeforeTerm")));
-					Predicate daysBeforeTermNotIgnored = criteriaBuilder.not(daysBeforeTermValue.<Boolean>get("ignored"));
-					Predicate daysBeforeTermPredicate = criteriaBuilder.and(daysBeforeTermType, daysBeforeTermKind, daysBeforeTerm, daysBeforeTermNotIgnored);
+					Predicate daysBeforeTermType = criteriaBuilder.equal(daysBeforeTermValue.<String>get("lsType"),
+							"numericValue");
+					Predicate daysBeforeTermKind = criteriaBuilder.equal(daysBeforeTermValue.<String>get("lsKind"),
+							"daysBefore");
+					Predicate daysBeforeTerm = criteriaBuilder.equal(
+							daysBeforeTermValue.<BigDecimal>get("numericValue"),
+							new BigDecimal(searchParamsMap.get("daysBeforeTerm")));
+					Predicate daysBeforeTermNotIgnored = criteriaBuilder
+							.not(daysBeforeTermValue.<Boolean>get("ignored"));
+					Predicate daysBeforeTermPredicate = criteriaBuilder.and(daysBeforeTermType, daysBeforeTermKind,
+							daysBeforeTerm, daysBeforeTermNotIgnored);
 					termPredicateList.add(daysBeforeTermPredicate);
-				}catch (Exception e){
-					logger.error("Caught exception trying to parse "+searchParamsMap.get("daysBeforeTerm")+" as a number.",e);
-					//TODO:throw Exception, catch exception at higher levels. Ask about desired behavior on this error.
+				} catch (Exception e) {
+					logger.error("Caught exception trying to parse " + searchParamsMap.get("daysBeforeTerm")
+							+ " as a number.", e);
+					// TODO:throw Exception, catch exception at higher levels. Ask about desired
+					// behavior on this error.
 				}
 			}
-			//termDateBetween
-			if (searchParamsMap.keySet().contains("termDateTo") && searchParamsMap.keySet().contains("termDateFrom")){
-				try{
+			// termDateBetween
+			if (searchParamsMap.keySet().contains("termDateTo") && searchParamsMap.keySet().contains("termDateFrom")) {
+				try {
 					Join<LsThingState, LsThingValue> termDateValue = termState.join("lsValues", JoinType.LEFT);
 					Predicate termDateType = criteriaBuilder.equal(termDateValue.<String>get("lsType"), "dateValue");
 					Predicate termDateKind = criteriaBuilder.equal(termDateValue.<String>get("lsKind"), "date");
-					Predicate termDateBetween = criteriaBuilder.between(termDateValue.<Date>get("dateValue"), new Date(new Long(searchParamsMap.get("termDateFrom"))), new Date(new Long(searchParamsMap.get("termDateTo"))));
+					Predicate termDateBetween = criteriaBuilder.between(termDateValue.<Date>get("dateValue"),
+							new Date(new Long(searchParamsMap.get("termDateFrom"))),
+							new Date(new Long(searchParamsMap.get("termDateTo"))));
 					Predicate termDateNotIgnored = criteriaBuilder.not(termDateValue.<Boolean>get("ignored"));
-					Predicate termDatePredicate = criteriaBuilder.and(termDateType, termDateKind, termDateBetween, termDateNotIgnored);
+					Predicate termDatePredicate = criteriaBuilder.and(termDateType, termDateKind, termDateBetween,
+							termDateNotIgnored);
 					termPredicateList.add(termDatePredicate);
-				}catch (Exception e){
-					logger.error("Caught exception trying to parse "+searchParamsMap.get("termDateFrom")+" or "+searchParamsMap.get("termDateTo")+" as a date.",e);
-					//TODO:throw Exception, catch exception at higher levels. Ask about desired behavior on this error.
+				} catch (Exception e) {
+					logger.error("Caught exception trying to parse " + searchParamsMap.get("termDateFrom") + " or "
+							+ searchParamsMap.get("termDateTo") + " as a date.", e);
+					// TODO:throw Exception, catch exception at higher levels. Ask about desired
+					// behavior on this error.
 				}
 			}
-			//termDateFrom : TermValue type/kind = "dateValue"/"date", dateValue >
-			else if (searchParamsMap.keySet().contains("termDateFrom")){
-				try{
+			// termDateFrom : TermValue type/kind = "dateValue"/"date", dateValue >
+			else if (searchParamsMap.keySet().contains("termDateFrom")) {
+				try {
 					Join<LsThingState, LsThingValue> termDateValue = termState.join("lsValues", JoinType.LEFT);
 					Predicate termDateType = criteriaBuilder.equal(termDateValue.<String>get("lsType"), "dateValue");
 					Predicate termDateKind = criteriaBuilder.equal(termDateValue.<String>get("lsKind"), "date");
-					Predicate termDateFrom = criteriaBuilder.greaterThanOrEqualTo(termDateValue.<Date>get("dateValue"), new Date(new Long(searchParamsMap.get("termDateFrom"))));
+					Predicate termDateFrom = criteriaBuilder.greaterThanOrEqualTo(termDateValue.<Date>get("dateValue"),
+							new Date(new Long(searchParamsMap.get("termDateFrom"))));
 					Predicate termDateNotIgnored = criteriaBuilder.not(termDateValue.<Boolean>get("ignored"));
-					Predicate termDatePredicate = criteriaBuilder.and(termDateType, termDateKind, termDateFrom, termDateNotIgnored);
+					Predicate termDatePredicate = criteriaBuilder.and(termDateType, termDateKind, termDateFrom,
+							termDateNotIgnored);
 					termPredicateList.add(termDatePredicate);
-				}catch (Exception e){
-					logger.error("Caught exception trying to parse "+searchParamsMap.get("termDateFrom")+" as a date.",e);
-					//TODO:throw Exception, catch exception at higher levels. Ask about desired behavior on this error.
+				} catch (Exception e) {
+					logger.error(
+							"Caught exception trying to parse " + searchParamsMap.get("termDateFrom") + " as a date.",
+							e);
+					// TODO:throw Exception, catch exception at higher levels. Ask about desired
+					// behavior on this error.
 				}
-				
+
 			}
-			//termDateTo : TermValue type/kind = "dateValue"/"date", dateValue <
-			else if (searchParamsMap.keySet().contains("termDateTo")){
-				try{
+			// termDateTo : TermValue type/kind = "dateValue"/"date", dateValue <
+			else if (searchParamsMap.keySet().contains("termDateTo")) {
+				try {
 					Join<LsThingState, LsThingValue> termDateValue = termState.join("lsValues", JoinType.LEFT);
 					Predicate termDateType = criteriaBuilder.equal(termDateValue.<String>get("lsType"), "dateValue");
 					Predicate termDateKind = criteriaBuilder.equal(termDateValue.<String>get("lsKind"), "date");
-					Predicate termDateTo = criteriaBuilder.lessThanOrEqualTo(termDateValue.<Date>get("dateValue"), new Date(new Long(searchParamsMap.get("termDateTo"))));
+					Predicate termDateTo = criteriaBuilder.lessThanOrEqualTo(termDateValue.<Date>get("dateValue"),
+							new Date(new Long(searchParamsMap.get("termDateTo"))));
 					Predicate termDateNotIgnored = criteriaBuilder.not(termDateValue.<Boolean>get("ignored"));
-					Predicate termDatePredicate = criteriaBuilder.and(termDateType, termDateKind, termDateTo, termDateNotIgnored);
+					Predicate termDatePredicate = criteriaBuilder.and(termDateType, termDateKind, termDateTo,
+							termDateNotIgnored);
 					termPredicateList.add(termDatePredicate);
-				}catch (Exception e){
-					logger.error("Caught exception trying to parse "+searchParamsMap.get("termDateFrom")+" as a date.",e);
-					//TODO:throw Exception, catch exception at higher levels. Ask about desired behavior on this error.
+				} catch (Exception e) {
+					logger.error(
+							"Caught exception trying to parse " + searchParamsMap.get("termDateFrom") + " as a date.",
+							e);
+					// TODO:throw Exception, catch exception at higher levels. Ask about desired
+					// behavior on this error.
 				}
 			}
 			Predicate[] termPredicates = new Predicate[0];
 			termPredicates = termPredicateList.toArray(termPredicates);
 			predicateList.add(criteriaBuilder.and(termPredicates));
 		}
-		//nonSolicit : LsThingValue type/kind = "stringValue"/"nonSolicit", stringValue EQUALS
-		if (searchParamsMap.keySet().contains("nonSolicit")){
+		// nonSolicit : LsThingValue type/kind = "stringValue"/"nonSolicit", stringValue
+		// EQUALS
+		if (searchParamsMap.keySet().contains("nonSolicit")) {
 			Join<LsThingState, LsThingValue> nonSolicitValue = documentState.join("lsValues", JoinType.LEFT);
 			Predicate nonSolicitType = criteriaBuilder.equal(nonSolicitValue.<String>get("lsType"), "stringValue");
 			Predicate nonSolicitKind = criteriaBuilder.equal(nonSolicitValue.<String>get("lsKind"), "nonSolicit");
-			Predicate nonSolicit = criteriaBuilder.like(nonSolicitValue.<String>get("stringValue"), searchParamsMap.get("nonSolicit"));
+			Predicate nonSolicit = criteriaBuilder.like(nonSolicitValue.<String>get("stringValue"),
+					searchParamsMap.get("nonSolicit"));
 			Predicate nonSolicitNotIgnored = criteriaBuilder.not(nonSolicitValue.<Boolean>get("ignored"));
-			Predicate nonSolicitPredicate = criteriaBuilder.and(nonSolicitType, nonSolicitKind, nonSolicit, nonSolicitNotIgnored);
+			Predicate nonSolicitPredicate = criteriaBuilder.and(nonSolicitType, nonSolicitKind, nonSolicit,
+					nonSolicitNotIgnored);
 			predicateList.add(nonSolicitPredicate);
 		}
-		//nonTransfer : LsThingValue type/kind = "stringValue"/"nonTransfer", stringValue EQUALS
-		if (searchParamsMap.keySet().contains("nonTransfer")){
+		// nonTransfer : LsThingValue type/kind = "stringValue"/"nonTransfer",
+		// stringValue EQUALS
+		if (searchParamsMap.keySet().contains("nonTransfer")) {
 			Join<LsThingState, LsThingValue> nonTransferValue = documentState.join("lsValues", JoinType.LEFT);
 			Predicate nonTransferType = criteriaBuilder.equal(nonTransferValue.<String>get("lsType"), "stringValue");
 			Predicate nonTransferKind = criteriaBuilder.equal(nonTransferValue.<String>get("lsKind"), "nonTransfer");
-			Predicate nonTransfer = criteriaBuilder.like(nonTransferValue.<String>get("stringValue"), searchParamsMap.get("nonTransfer"));
+			Predicate nonTransfer = criteriaBuilder.like(nonTransferValue.<String>get("stringValue"),
+					searchParamsMap.get("nonTransfer"));
 			Predicate nonTransferNotIgnored = criteriaBuilder.not(nonTransferValue.<Boolean>get("ignored"));
-			Predicate nonTransferPredicate = criteriaBuilder.and(nonTransferType, nonTransferKind, nonTransfer, nonTransferNotIgnored);
+			Predicate nonTransferPredicate = criteriaBuilder.and(nonTransferType, nonTransferKind, nonTransfer,
+					nonTransferNotIgnored);
 			predicateList.add(nonTransferPredicate);
 		}
-		//restrictedMaterialContains : LsThingValue type/kind = "stringValue"/"restrictedMaterialName", equals ignore case
-		if (searchParamsMap.keySet().contains("restrictedMaterialContains")){
+		// restrictedMaterialContains : LsThingValue type/kind =
+		// "stringValue"/"restrictedMaterialName", equals ignore case
+		if (searchParamsMap.keySet().contains("restrictedMaterialContains")) {
 			Join<LsThingState, LsThingValue> restrictedMaterialValue = documentState.join("lsValues", JoinType.LEFT);
-			Predicate restrictedMaterialType = criteriaBuilder.equal(restrictedMaterialValue.<String>get("lsType"), "stringValue");
-			Predicate restrictedMaterialKind = criteriaBuilder.equal(restrictedMaterialValue.<String>get("lsKind"), "restrictedMaterialName");
-			Predicate restrictedMaterialContains = criteriaBuilder.like(criteriaBuilder.upper(restrictedMaterialValue.<String>get("stringValue")), "%"+searchParamsMap.get("restrictedMaterialContains").toUpperCase()+"%");
-			Predicate restrictedMaterialNotIgnored = criteriaBuilder.not(restrictedMaterialValue.<Boolean>get("ignored"));
-			Predicate restrictedMaterialPredicate = criteriaBuilder.and(restrictedMaterialType, restrictedMaterialKind, restrictedMaterialContains, restrictedMaterialNotIgnored);
+			Predicate restrictedMaterialType = criteriaBuilder.equal(restrictedMaterialValue.<String>get("lsType"),
+					"stringValue");
+			Predicate restrictedMaterialKind = criteriaBuilder.equal(restrictedMaterialValue.<String>get("lsKind"),
+					"restrictedMaterialName");
+			Predicate restrictedMaterialContains = criteriaBuilder.like(
+					criteriaBuilder.upper(restrictedMaterialValue.<String>get("stringValue")),
+					"%" + searchParamsMap.get("restrictedMaterialContains").toUpperCase() + "%");
+			Predicate restrictedMaterialNotIgnored = criteriaBuilder
+					.not(restrictedMaterialValue.<Boolean>get("ignored"));
+			Predicate restrictedMaterialPredicate = criteriaBuilder.and(restrictedMaterialType, restrictedMaterialKind,
+					restrictedMaterialContains, restrictedMaterialNotIgnored);
 			predicateList.add(restrictedMaterialPredicate);
 		}
 
-		
 		predicates = predicateList.toArray(predicates);
 		criteria.where(criteriaBuilder.and(predicates));
 		TypedQuery<Long> q = em.createQuery(criteria);
 		logger.debug(q.unwrap(org.hibernate.Query.class).getQueryString());
 		lsThingIdList = q.getResultList();
-		logger.debug("Found "+lsThingIdList.size()+" results.");
+		logger.debug("Found " + lsThingIdList.size() + " results.");
 		Collection<LsThing> result = new HashSet<LsThing>();
-		for (Long lsThingId: lsThingIdList) {
+		for (Long lsThingId : lsThingIdList) {
 			LsThing lsThing = LsThing.findLsThing(lsThingId);
-			//For LsThing Browser, we want to see soft deleted (ignored=true, deleted=false), but not hard deleted (ignored=deleted=true)
-			if (lsThing.isDeleted()){
+			// For LsThing Browser, we want to see soft deleted (ignored=true,
+			// deleted=false), but not hard deleted (ignored=deleted=true)
+			if (lsThing.isDeleted()) {
 				logger.debug("removing a deleted lsThing from the results");
 			} else {
-				//Inject parent preferred label to all batch lsThings
-				if (lsThing.getLsType().equals("batch")){
-					LsThingLabel bestParentLabel = LsThingLabel.pickBestLabel(findParentByBatchEquals(lsThing).getLsLabels());
+				// Inject parent preferred label to all batch lsThings
+				if (lsThing.getLsType().equals("batch")) {
+					LsThingLabel bestParentLabel = LsThingLabel
+							.pickBestLabel(findParentByBatchEquals(lsThing).getLsLabels());
 					lsThing.getLsLabels().add(bestParentLabel);
 				}
 				result.add(lsThing);
@@ -1721,224 +1888,279 @@ else if (searchParamsMap.keySet().contains("termDateTo")){
 		return result;
 	}
 
-
 	@Override
 	public ArrayList<LsThingValidationErrorMessage> validateLsThing(LsThingValidationDTO validationDTO) {
 		ArrayList<LsThingValidationErrorMessage> errors = new ArrayList<LsThingValidationErrorMessage>();
-		if (validationDTO.isUniqueName()){
-			try{
+		if (validationDTO.isUniqueName()) {
+			try {
 				checkLsThingUniqueName(validationDTO.getLsThing());
-			} catch (UniqueNameException e){
-				logger.error("Caught UniqueNameException validating LsThing: " + e.getMessage().toString() + " whole message  " + e.toString());
+			} catch (UniqueNameException e) {
+				logger.error("Caught UniqueNameException validating LsThing: " + e.getMessage().toString()
+						+ " whole message  " + e.toString());
 				LsThingValidationErrorMessage error = new LsThingValidationErrorMessage(e);
-	            errors.add(error);
+				errors.add(error);
 			}
 		}
-		if (validationDTO.isUniqueInteractions()){
-			try{
+		if (validationDTO.isUniqueInteractions()) {
+			try {
 				checkLsThingUniqueInteractions(validationDTO);
-			} catch (UniqueInteractionsException e){
-				logger.error("Caught UniqueInteractionsException validating LsThing: " + e.getMessage().toString() + " whole message  " + e.toString());
+			} catch (UniqueInteractionsException e) {
+				logger.error("Caught UniqueInteractionsException validating LsThing: " + e.getMessage().toString()
+						+ " whole message  " + e.toString());
 				LsThingValidationErrorMessage error = new LsThingValidationErrorMessage(e);
-	            errors.add(error);
+				errors.add(error);
 			}
 		}
-		
+
 		return errors;
 	}
 
-
 	private boolean checkLsThingUniqueValueByRules(LsThingValidationDTO validationDTO) {
-		if (validationDTO.getValueRules() == null || validationDTO.getValueRules().isEmpty()) return false;
-		else{
-			for (ValueRuleDTO valueRule : validationDTO.getValueRules()){
-				if (valueRule.getValue().getEntity().equalsIgnoreCase("LsThing")){
+		if (validationDTO.getValueRules() == null || validationDTO.getValueRules().isEmpty())
+			return false;
+		else {
+			for (ValueRuleDTO valueRule : validationDTO.getValueRules()) {
+				if (valueRule.getValue().getEntity().equalsIgnoreCase("LsThing")) {
 					ValuePathDTO valuePath = valueRule.getValue();
-					Collection<LsThingValue> foundValues = LsThingValue.findLsThingValuesByTypeKindFullPath(valuePath.getEntityType(), valuePath.getEntityKind(), valuePath.getStateType(), valuePath.getStateKind(), valuePath.getValueType(), valuePath.getValueKind()).getResultList();
-					for (LsThingValue foundValue : foundValues){
+					Collection<LsThingValue> foundValues = LsThingValue
+							.findLsThingValuesByTypeKindFullPath(valuePath.getEntityType(), valuePath.getEntityKind(),
+									valuePath.getStateType(), valuePath.getStateKind(), valuePath.getValueType(),
+									valuePath.getValueKind())
+							.getResultList();
+					for (LsThingValue foundValue : foundValues) {
 						LsThing foundThing = foundValue.getLsState().getLsThing();
-						if (valueRule.matchLsThings(validationDTO.getLsThing(), foundThing)) return true;
+						if (valueRule.matchLsThings(validationDTO.getLsThing(), foundThing))
+							return true;
 					}
 				}
 			}
 		}
 		return false;
-		
-	}
 
+	}
 
 	private void checkLsThingUniqueInteractions(LsThingValidationDTO validationDTO) throws UniqueInteractionsException {
 		LsThing lsThing = validationDTO.getLsThing();
 		boolean checkOrderMatters = validationDTO.isOrderMatters();
 		boolean checkForwardAndReverseAreSame = validationDTO.isForwardAndReverseAreSame();
 		Set<ItxLsThingLsThing> secondItxLsThings = lsThing.getSecondLsThings();
-		logger.debug("IN checkLsThingUniqueInteractions: "+validationDTO.toJson());
-		if (!checkOrderMatters){
-			//order doesn't matter. We're just checking for a unique set of "incorporates" interactions
+		logger.debug("IN checkLsThingUniqueInteractions: " + validationDTO.toJson());
+		if (!checkOrderMatters) {
+			// order doesn't matter. We're just checking for a unique set of "incorporates"
+			// interactions
 			HashSet<LsThing> foundLsThings = null;
-			for (ItxLsThingLsThing secondItxLsThing : secondItxLsThings){
-				logger.debug("checking interaction:"+secondItxLsThing.toJson());
+			for (ItxLsThingLsThing secondItxLsThing : secondItxLsThings) {
+				logger.debug("checking interaction:" + secondItxLsThing.toJson());
 				LsThing secondLsThing = secondItxLsThing.getSecondLsThing();
 				String lsType = "incorporates";
 				String lsKind = secondItxLsThing.getLsKind();
-				//first find the set of interactions that look like the one we're searching on
-				Collection<ItxLsThingLsThing> foundItxLsThingLsThings = ItxLsThingLsThing.findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndSecondLsThingEquals(lsType, lsKind, secondLsThing).getResultList();
-				Collection<LsThing> foundFirstLsThings = findFirstLsThings(validationDTO, secondItxLsThing, foundItxLsThingLsThings);
-				if (foundLsThings == null){
-					//on the second one, instantiate the HashSet, then add all the foundFirstLsThings.
+				// first find the set of interactions that look like the one we're searching on
+				Collection<ItxLsThingLsThing> foundItxLsThingLsThings = ItxLsThingLsThing
+						.findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndSecondLsThingEquals(lsType, lsKind,
+								secondLsThing)
+						.getResultList();
+				Collection<LsThing> foundFirstLsThings = findFirstLsThings(validationDTO, secondItxLsThing,
+						foundItxLsThingLsThings);
+				if (foundLsThings == null) {
+					// on the second one, instantiate the HashSet, then add all the
+					// foundFirstLsThings.
 					foundLsThings = new HashSet<LsThing>();
 					foundLsThings.addAll(foundFirstLsThings);
-				} else{
-					//otherwise, filter the existing list to be the intersection of the results of the most recent query with the previous results
+				} else {
+					// otherwise, filter the existing list to be the intersection of the results of
+					// the most recent query with the previous results
 					foundLsThings.retainAll(foundFirstLsThings);
 				}
-				logger.debug("Currently have " + foundLsThings.size() +" potential LsThing matches: "+LsThing.toJsonArray(foundLsThings));
+				logger.debug("Currently have " + foundLsThings.size() + " potential LsThing matches: "
+						+ LsThing.toJsonArray(foundLsThings));
 			}
-			//We check if the set of "incorporates" interactions of our query is just a subset of those of the potential matches, and remove matches that are supersets
+			// We check if the set of "incorporates" interactions of our query is just a
+			// subset of those of the potential matches, and remove matches that are
+			// supersets
 			foundLsThings = removeSuperSets(lsThing, foundLsThings);
-			if (foundLsThings != null && !foundLsThings.isEmpty()){
-				//if anything remains, it was found for every interaction so it may be a duplicate
-				//then we check for LsThing value rules
-				if (!checkLsThingUniqueValueByRules(validationDTO)){
+			if (foundLsThings != null && !foundLsThings.isEmpty()) {
+				// if anything remains, it was found for every interaction so it may be a
+				// duplicate
+				// then we check for LsThing value rules
+				if (!checkLsThingUniqueValueByRules(validationDTO)) {
 					logger.debug("Found matches:");
 					String codeNames = "";
 					String corpNames = "";
-					for (LsThing foundLsThing : foundLsThings){
+					for (LsThing foundLsThing : foundLsThings) {
 						logger.debug(foundLsThing.getCodeName());
-						if (corpNames.length() == 0) corpNames += foundLsThing.pickBestCorpName().getLabelText();
-						else corpNames += ", "+foundLsThing.pickBestCorpName().getLabelText();
-						if (codeNames.length() == 0) codeNames += foundLsThing.getCodeName();
-						else codeNames += ", "+foundLsThing.getCodeName();
-						}
-					throw new UniqueInteractionsException("Found existing LsThing with identical set of interactions with same order.", codeNames, corpNames);
+						if (corpNames.length() == 0)
+							corpNames += foundLsThing.pickBestCorpName().getLabelText();
+						else
+							corpNames += ", " + foundLsThing.pickBestCorpName().getLabelText();
+						if (codeNames.length() == 0)
+							codeNames += foundLsThing.getCodeName();
+						else
+							codeNames += ", " + foundLsThing.getCodeName();
 					}
+					throw new UniqueInteractionsException(
+							"Found existing LsThing with identical set of interactions with same order.", codeNames,
+							corpNames);
 				}
-		} else{
-			//order matters. for each interaction, we will grab the order, then search using it.
+			}
+		} else {
+			// order matters. for each interaction, we will grab the order, then search
+			// using it.
 			HashSet<LsThing> foundLsThings = null;
 			logger.debug("Order Matters. Checking interactions forwards.");
-			for (ItxLsThingLsThing secondItxLsThing : secondItxLsThings){
-				logger.debug("checking interaction:"+secondItxLsThing.toJson());
+			for (ItxLsThingLsThing secondItxLsThing : secondItxLsThings) {
+				logger.debug("checking interaction:" + secondItxLsThing.toJson());
 				LsThing secondLsThing = secondItxLsThing.getSecondLsThing();
 				String lsType = "incorporates";
 				String lsKind = secondItxLsThing.getLsKind();
 				int order = secondItxLsThing.grabItxOrder();
-				//first find the set of interactions that look like the one we're searching on, including by order
-				Collection<ItxLsThingLsThing> foundItxLsThingLsThings = ItxLsThingLsThing.findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndSecondLsThingEqualsAndOrderEquals(lsType, lsKind, secondLsThing, order).getResultList();
-				Collection<LsThing> foundFirstLsThings = findFirstLsThings(validationDTO, secondItxLsThing, foundItxLsThingLsThings);
-				if (foundLsThings == null){
+				// first find the set of interactions that look like the one we're searching on,
+				// including by order
+				Collection<ItxLsThingLsThing> foundItxLsThingLsThings = ItxLsThingLsThing
+						.findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndSecondLsThingEqualsAndOrderEquals(lsType,
+								lsKind, secondLsThing, order)
+						.getResultList();
+				Collection<LsThing> foundFirstLsThings = findFirstLsThings(validationDTO, secondItxLsThing,
+						foundItxLsThingLsThings);
+				if (foundLsThings == null) {
 					foundLsThings = new HashSet<LsThing>();
 					foundLsThings.addAll(foundFirstLsThings);
-				} else{
+				} else {
 					foundLsThings.retainAll(foundFirstLsThings);
 				}
 			}
-			//We check if the set of "incorporates" interactions of our query is just a subset of those of the potential matches, and remove matches that are supersets
+			// We check if the set of "incorporates" interactions of our query is just a
+			// subset of those of the potential matches, and remove matches that are
+			// supersets
 			foundLsThings = removeSuperSets(lsThing, foundLsThings);
-			if (foundLsThings != null && !foundLsThings.isEmpty()){
-				//if anything remains, it was found for every interaction so it may be a duplicate
-				//then we check for LsThing value rules
-				if (!checkLsThingUniqueValueByRules(validationDTO)){
+			if (foundLsThings != null && !foundLsThings.isEmpty()) {
+				// if anything remains, it was found for every interaction so it may be a
+				// duplicate
+				// then we check for LsThing value rules
+				if (!checkLsThingUniqueValueByRules(validationDTO)) {
 					logger.debug("Found matches:");
 					String corpNames = "";
 					String codeNames = "";
-					for (LsThing foundLsThing : foundLsThings){
+					for (LsThing foundLsThing : foundLsThings) {
 						logger.debug(foundLsThing.getCodeName());
-						if (corpNames.length() == 0) corpNames += foundLsThing.pickBestCorpName().getLabelText();
-						else corpNames += ", "+foundLsThing.pickBestCorpName().getLabelText();
-						if (codeNames.length() == 0) codeNames += foundLsThing.getCodeName();
-						else codeNames += ", "+foundLsThing.getCodeName();
-						}
-					throw new UniqueInteractionsException("Found existing LsThing with identical set of interactions with same order.", codeNames, corpNames);
+						if (corpNames.length() == 0)
+							corpNames += foundLsThing.pickBestCorpName().getLabelText();
+						else
+							corpNames += ", " + foundLsThing.pickBestCorpName().getLabelText();
+						if (codeNames.length() == 0)
+							codeNames += foundLsThing.getCodeName();
+						else
+							codeNames += ", " + foundLsThing.getCodeName();
+					}
+					throw new UniqueInteractionsException(
+							"Found existing LsThing with identical set of interactions with same order.", codeNames,
+							corpNames);
 				}
 			}
-			if (checkForwardAndReverseAreSame){
-				//if we need to check backwards as well, by this point we have already passed "forwards validation"
-				//we need to get the total number of "incorporates" interactions
+			if (checkForwardAndReverseAreSame) {
+				// if we need to check backwards as well, by this point we have already passed
+				// "forwards validation"
+				// we need to get the total number of "incorporates" interactions
 				logger.debug("Forward and Reverse are the same. Checking interactions backwards.");
 				foundLsThings = null;
 				ArrayList<ItxLsThingLsThing> orderedIncorporatesInteractions = new ArrayList<ItxLsThingLsThing>();
-				for (ItxLsThingLsThing secondItxLsThing : secondItxLsThings){
-					if (secondItxLsThing.getLsType().equals("incorporates")){
+				for (ItxLsThingLsThing secondItxLsThing : secondItxLsThings) {
+					if (secondItxLsThing.getLsType().equals("incorporates")) {
 						orderedIncorporatesInteractions.add(secondItxLsThing);
 					}
 				}
-				//then we sort
+				// then we sort
 				Collections.sort(orderedIncorporatesInteractions, new ItxLsThingLsThingComparator());
-				//then do the same search as above, but with new "order" parameters:
+				// then do the same search as above, but with new "order" parameters:
 				int order = orderedIncorporatesInteractions.size();
-				for (ItxLsThingLsThing secondItxLsThing : orderedIncorporatesInteractions){
-					logger.debug("checking interaction:"+secondItxLsThing.toJson());
+				for (ItxLsThingLsThing secondItxLsThing : orderedIncorporatesInteractions) {
+					logger.debug("checking interaction:" + secondItxLsThing.toJson());
 					LsThing secondLsThing = secondItxLsThing.getSecondLsThing();
 					String lsType = "incorporates";
 					String lsKind = secondItxLsThing.getLsKind();
-					Collection<ItxLsThingLsThing> foundItxLsThingLsThings = ItxLsThingLsThing.findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndSecondLsThingEqualsAndOrderEquals(lsType, lsKind, secondLsThing, order).getResultList();
-					Collection<LsThing> foundFirstLsThings = findFirstLsThings(validationDTO, secondItxLsThing, foundItxLsThingLsThings);
-					logger.debug("Found these " + foundFirstLsThings.size() + " lsThing matches for current itx: "+LsThing.toJsonArray(foundFirstLsThings));
-					if (foundLsThings == null){
+					Collection<ItxLsThingLsThing> foundItxLsThingLsThings = ItxLsThingLsThing
+							.findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndSecondLsThingEqualsAndOrderEquals(
+									lsType, lsKind, secondLsThing, order)
+							.getResultList();
+					Collection<LsThing> foundFirstLsThings = findFirstLsThings(validationDTO, secondItxLsThing,
+							foundItxLsThingLsThings);
+					logger.debug("Found these " + foundFirstLsThings.size() + " lsThing matches for current itx: "
+							+ LsThing.toJsonArray(foundFirstLsThings));
+					if (foundLsThings == null) {
 						foundLsThings = new HashSet<LsThing>();
 						foundLsThings.addAll(foundFirstLsThings);
-					} else{
+					} else {
 						foundLsThings.retainAll(foundFirstLsThings);
 					}
 					order--;
 				}
-				//We check if the set of "incorporates" interactions of our query is just a subset of those of the potential matches, and remove matches that are supersets
+				// We check if the set of "incorporates" interactions of our query is just a
+				// subset of those of the potential matches, and remove matches that are
+				// supersets
 				foundLsThings = removeSuperSets(lsThing, foundLsThings);
-				if (foundLsThings != null && !foundLsThings.isEmpty()){
-					//if anything remains, it was found for every interaction so it may be a duplicate
-					//then we check for LsThing value rules
-					if (!checkLsThingUniqueValueByRules(validationDTO)){
+				if (foundLsThings != null && !foundLsThings.isEmpty()) {
+					// if anything remains, it was found for every interaction so it may be a
+					// duplicate
+					// then we check for LsThing value rules
+					if (!checkLsThingUniqueValueByRules(validationDTO)) {
 						logger.debug("Found matches:");
 						String corpNames = "";
 						String codeNames = "";
-						for (LsThing foundLsThing : foundLsThings){
+						for (LsThing foundLsThing : foundLsThings) {
 							logger.debug(foundLsThing.getCodeName());
-							if (corpNames.length() == 0) corpNames += foundLsThing.pickBestCorpName().getLabelText();
-							else corpNames += ", "+foundLsThing.pickBestCorpName().getLabelText();
-							if (codeNames.length() == 0) codeNames += foundLsThing.getCodeName();
-							else codeNames += ", "+foundLsThing.getCodeName();
-							}
-						throw new UniqueInteractionsException("Found existing LsThing with identical set of interactions with reversed order.", codeNames, corpNames);
+							if (corpNames.length() == 0)
+								corpNames += foundLsThing.pickBestCorpName().getLabelText();
+							else
+								corpNames += ", " + foundLsThing.pickBestCorpName().getLabelText();
+							if (codeNames.length() == 0)
+								codeNames += foundLsThing.getCodeName();
+							else
+								codeNames += ", " + foundLsThing.getCodeName();
 						}
+						throw new UniqueInteractionsException(
+								"Found existing LsThing with identical set of interactions with reversed order.",
+								codeNames, corpNames);
 					}
+				}
 			}
 		}
 	}
 
-
-	private void checkLsThingUniqueName(LsThing lsThing) throws UniqueNameException{
+	private void checkLsThingUniqueName(LsThing lsThing) throws UniqueNameException {
 		String lsKind = lsThing.getLsKind();
 		Set<LsThingLabel> lsThingLabels = lsThing.getLsLabels();
-		for (LsThingLabel lsThingLabel : lsThingLabels){
-			if (!lsThingLabel.isIgnored()){
+		for (LsThingLabel lsThingLabel : lsThingLabels) {
+			if (!lsThingLabel.isIgnored()) {
 				String labelText = lsThingLabel.getLabelText();
 				Collection<LsThing> foundLsThings = new HashSet<LsThing>();
-				try{
+				try {
 					foundLsThings = LsThing.findLsThingByLabelTextAndLsKind(labelText, lsKind).getResultList();
-				} catch (NoResultException e){
-					//found nothing
-				}
-				if (!foundLsThings.isEmpty()){
-					for (LsThing foundLsThing: foundLsThings){
-						if (lsThing.getId() == null || lsThing.getId().compareTo(foundLsThing.getId()) != 0){
-							//we found an lsThing that is not the same as the one being validated that has the same label
+				} catch (NoResultException e) {
+					// found nothing
+				}
+				if (!foundLsThings.isEmpty()) {
+					for (LsThing foundLsThing : foundLsThings) {
+						if (lsThing.getId() == null || lsThing.getId().compareTo(foundLsThing.getId()) != 0) {
+							// we found an lsThing that is not the same as the one being validated that has
+							// the same label
 							String bestLabel = "";
 							LsThingLabel bestCorpName = foundLsThing.pickBestCorpName();
-							if (bestCorpName != null) bestLabel = bestCorpName.getLabelText();
-							else{
+							if (bestCorpName != null)
+								bestLabel = bestCorpName.getLabelText();
+							else {
 								LsThingLabel bestName = foundLsThing.pickBestName();
-								if (bestName != null) bestLabel = bestName.getLabelText();
+								if (bestName != null)
+									bestLabel = bestName.getLabelText();
 							}
-							throw new UniqueNameException("LsThing with lsKind "+lsKind+" and with the name "+labelText+" already exists! ", foundLsThing.getCodeName(), bestLabel);
+							throw new UniqueNameException("LsThing with lsKind " + lsKind + " and with the name "
+									+ labelText + " already exists! ", foundLsThing.getCodeName(), bestLabel);
 						}
 					}
 				}
-			}	
+			}
 		}
-		
+
 	}
-	
+
 	@Override
 	public Collection<LsThing> sortLsThingsByCodeName(Collection<LsThing> lsThings) {
 		List<LsThing> listLsThings = new ArrayList<LsThing>(lsThings);
@@ -1946,241 +2168,262 @@ public Collection<LsThing> sortLsThingsByCodeName(Collection<LsThing> lsThings)
 		return listLsThings;
 	}
 
-
 	@Override
 	public Collection<LsThing> sortBatches(Collection<LsThing> lsThings) {
 		List<LsThing> listLsThings = new ArrayList<LsThing>(lsThings);
 		Collections.sort(listLsThings, new LsThingComparatorByBatchNumber());
 		return listLsThings;
 	}
-	
-	private static Collection<LsThing> findFirstLsThings(LsThingValidationDTO validationDTO, ItxLsThingLsThing secondItxLsThing, Collection<ItxLsThingLsThing> foundItxLsThingLsThings){
-//		logger.debug("found interactions:"+ItxLsThingLsThing.toJsonArray(foundItxLsThingLsThings));
-		//then if we have value criteria to compare, compare them and pare down the list of matching interactions
+
+	private static Collection<LsThing> findFirstLsThings(LsThingValidationDTO validationDTO,
+			ItxLsThingLsThing secondItxLsThing, Collection<ItxLsThingLsThing> foundItxLsThingLsThings) {
+		// logger.debug("found
+		// interactions:"+ItxLsThingLsThing.toJsonArray(foundItxLsThingLsThings));
+		// then if we have value criteria to compare, compare them and pare down the
+		// list of matching interactions
 		Collection<ItxLsThingLsThing> matchingItxLsThingLsThings = new HashSet<ItxLsThingLsThing>();
-		//first we check if any of our value rules apply to the current Itx. If not, we skip ahead to "No value criteria"
+		// first we check if any of our value rules apply to the current Itx. If not, we
+		// skip ahead to "No value criteria"
 		boolean anyValueRulesApply = false;
-		if (validationDTO.getValueRules() != null && !validationDTO.getValueRules().isEmpty()){
-			for (ValueRuleDTO valueRule : validationDTO.getValueRules()){
-				if (valueRule.checkRuleApplies(secondItxLsThing)) anyValueRulesApply = true;
+		if (validationDTO.getValueRules() != null && !validationDTO.getValueRules().isEmpty()) {
+			for (ValueRuleDTO valueRule : validationDTO.getValueRules()) {
+				if (valueRule.checkRuleApplies(secondItxLsThing))
+					anyValueRulesApply = true;
 			}
 		}
-		if (anyValueRulesApply){
-			for (ValueRuleDTO valueRule : validationDTO.getValueRules()){
-//				logger.debug("Checking value rule:"+valueRule.toJson());
-				for (ItxLsThingLsThing foundItxLsThingLsThing : foundItxLsThingLsThings){
+		if (anyValueRulesApply) {
+			for (ValueRuleDTO valueRule : validationDTO.getValueRules()) {
+				// logger.debug("Checking value rule:"+valueRule.toJson());
+				for (ItxLsThingLsThing foundItxLsThingLsThing : foundItxLsThingLsThings) {
 					boolean isAMatch = valueRule.matchItxLsThingLsThings(secondItxLsThing, foundItxLsThingLsThing);
-					if (isAMatch) matchingItxLsThingLsThings.add(foundItxLsThingLsThing);
-					if (isAMatch) logger.debug("Found a match for value rule:"+valueRule.toJson());
+					if (isAMatch)
+						matchingItxLsThingLsThings.add(foundItxLsThingLsThing);
+					if (isAMatch)
+						logger.debug("Found a match for value rule:" + valueRule.toJson());
 				}
-				
+
 			}
-		}else{
+		} else {
 			logger.debug("No value criteria");
-			//if there are no value criteria to compare, then all the interactions are matching
+			// if there are no value criteria to compare, then all the interactions are
+			// matching
 			matchingItxLsThingLsThings.addAll(foundItxLsThingLsThings);
 		}
 		Collection<LsThing> foundFirstLsThings = new HashSet<LsThing>();
-		for (ItxLsThingLsThing matchingItx : matchingItxLsThingLsThings){
+		for (ItxLsThingLsThing matchingItx : matchingItxLsThingLsThings) {
 			if (!matchingItx.getFirstLsThing().isIgnored()
 					&& matchingItx.getFirstLsThing().getLsType().equals(validationDTO.getLsThing().getLsType())
-					&& matchingItx.getFirstLsThing().getLsKind().equals(validationDTO.getLsThing().getLsKind())){
+					&& matchingItx.getFirstLsThing().getLsKind().equals(validationDTO.getLsThing().getLsKind())) {
 				foundFirstLsThings.add(matchingItx.getFirstLsThing());
 			}
 		}
-		logger.debug("Found these " + foundFirstLsThings.size() + " lsThing matches for current itx: "+LsThing.toJsonArray(foundFirstLsThings));
+		logger.debug("Found these " + foundFirstLsThings.size() + " lsThing matches for current itx: "
+				+ LsThing.toJsonArray(foundFirstLsThings));
 		return foundFirstLsThings;
 	}
-	
-	private static HashSet<LsThing> removeSuperSets(LsThing lsThing, Collection<LsThing> foundLsThings){
+
+	private static HashSet<LsThing> removeSuperSets(LsThing lsThing, Collection<LsThing> foundLsThings) {
 		HashSet<LsThing> filteredFoundLsThings = new HashSet<LsThing>();
 		HashSet<Long> lsThingReferencedComponentIds = new HashSet<Long>();
-		for (ItxLsThingLsThing itx : lsThing.getSecondLsThings()){
-			if (itx.getLsType().equals("incorporates") && itx.getLsKind().equals("assembly_component")){
+		for (ItxLsThingLsThing itx : lsThing.getSecondLsThings()) {
+			if (itx.getLsType().equals("incorporates") && itx.getLsKind().equals("assembly_component")) {
 				lsThingReferencedComponentIds.add(itx.getSecondLsThing().getId());
 			}
 		}
-		//we compare the list of referenced components of the query lsThing and the foundLsThings
-		//and filter out foundLsThings that don't have the same list as the query
-		for (LsThing foundLsThing : foundLsThings){
+		// we compare the list of referenced components of the query lsThing and the
+		// foundLsThings
+		// and filter out foundLsThings that don't have the same list as the query
+		for (LsThing foundLsThing : foundLsThings) {
 			HashSet<Long> foundLsThingReferencedComponentIds = new HashSet<Long>();
-			for (ItxLsThingLsThing itx : foundLsThing.getSecondLsThings()){
-				if (itx.getLsType().equals("incorporates") && itx.getLsKind().equals("assembly_component")){
+			for (ItxLsThingLsThing itx : foundLsThing.getSecondLsThings()) {
+				if (itx.getLsType().equals("incorporates") && itx.getLsKind().equals("assembly_component")) {
 					foundLsThingReferencedComponentIds.add(itx.getSecondLsThing().getId());
 				}
 			}
-			for (Long id : lsThingReferencedComponentIds){
+			for (Long id : lsThingReferencedComponentIds) {
 				foundLsThingReferencedComponentIds.remove(id);
 			}
-			//if the query lsThing and this foundLsThing are truly a match, then there will be no ids left.
-			if (foundLsThingReferencedComponentIds.isEmpty()) filteredFoundLsThings.add(foundLsThing);
+			// if the query lsThing and this foundLsThing are truly a match, then there will
+			// be no ids left.
+			if (foundLsThingReferencedComponentIds.isEmpty())
+				filteredFoundLsThings.add(foundLsThing);
 		}
 		return filteredFoundLsThings;
 	}
-	
+
 	@Override
-	public DependencyCheckDTO checkDependencies(LsThing lsThing){
+	public DependencyCheckDTO checkDependencies(LsThing lsThing) {
 		DependencyCheckDTO result = new DependencyCheckDTO();
 		result.getQueryCodeNames().add(lsThing.getCodeName());
 		result.checkForDependentData();
 		return result;
 	}
-	
+
 	@Override
-	public DependencyCheckDTO checkBatchDependencies(LsThing batch){
+	public DependencyCheckDTO checkBatchDependencies(LsThing batch) {
 		DependencyCheckDTO result = new DependencyCheckDTO();
 		result.getQueryCodeNames().add(batch.getCodeName());
 		Collection<LsThing> assemblies = findCompositesByComponentEquals(batch);
-		if (assemblies != null && !assemblies.isEmpty()){
-			for (LsThing assembly : assemblies){
+		if (assemblies != null && !assemblies.isEmpty()) {
+			for (LsThing assembly : assemblies) {
 				LsThingLabel corpNameLabel = assembly.pickBestCorpName();
-				if (corpNameLabel != null) result.getDependentCorpNames().add(corpNameLabel.getLabelText());
+				if (corpNameLabel != null)
+					result.getDependentCorpNames().add(corpNameLabel.getLabelText());
 			}
 		}
-		if (!result.getDependentCorpNames().isEmpty()) result.setLinkedDataExists(true);
+		if (!result.getDependentCorpNames().isEmpty())
+			result.setLinkedDataExists(true);
 		result.checkForDependentData();
 		return result;
 	}
-	
+
 	@Override
-	public DependencyCheckDTO checkParentDependencies(LsThing parent){
+	public DependencyCheckDTO checkParentDependencies(LsThing parent) {
 		DependencyCheckDTO result = new DependencyCheckDTO();
 		result.getQueryCodeNames().add(parent.getCodeName());
 		Collection<LsThing> assemblies = findCompositesByComponentEquals(parent);
-		if (assemblies != null && !assemblies.isEmpty()){
-			for (LsThing assembly : assemblies){
+		if (assemblies != null && !assemblies.isEmpty()) {
+			for (LsThing assembly : assemblies) {
 				LsThingLabel corpNameLabel = assembly.pickBestCorpName();
-				if (corpNameLabel != null) result.getDependentCorpNames().add(corpNameLabel.getLabelText());
+				if (corpNameLabel != null)
+					result.getDependentCorpNames().add(corpNameLabel.getLabelText());
 			}
 		}
 		Collection<LsThing> batches = findBatchesByParentEquals(parent);
-		if (batches != null && !batches.isEmpty()){
-			for (LsThing batch : batches){
+		if (batches != null && !batches.isEmpty()) {
+			for (LsThing batch : batches) {
 				result.getQueryCodeNames().add(batch.getCodeName());
 			}
 		}
-		if (!result.getDependentCorpNames().isEmpty()) result.setLinkedDataExists(true);
+		if (!result.getDependentCorpNames().isEmpty())
+			result.setLinkedDataExists(true);
 		result.checkForDependentData();
 		return result;
 	}
-	
-	private void logicalDeleteLsThingAndInteractions(LsThing lsThing){
+
+	private void logicalDeleteLsThingAndInteractions(LsThing lsThing) {
 		lsThing.logicalDelete();
 		lsThing.merge();
-		if (lsThing.getFirstLsThings() != null && !lsThing.getFirstLsThings().isEmpty()){
-			for (ItxLsThingLsThing itx : lsThing.getFirstLsThings()){
+		if (lsThing.getFirstLsThings() != null && !lsThing.getFirstLsThings().isEmpty()) {
+			for (ItxLsThingLsThing itx : lsThing.getFirstLsThings()) {
 				itx.logicalDelete();
 				itx.merge();
 			}
 		}
-		if (lsThing.getSecondLsThings() != null && !lsThing.getSecondLsThings().isEmpty()){
-			for (ItxLsThingLsThing itx : lsThing.getSecondLsThings()){
+		if (lsThing.getSecondLsThings() != null && !lsThing.getSecondLsThings().isEmpty()) {
+			for (ItxLsThingLsThing itx : lsThing.getSecondLsThings()) {
 				itx.logicalDelete();
 				itx.merge();
 			}
 		}
 	}
 
-
 	@Override
 	public boolean deleteBatch(LsThing batch) {
 		LsThing parent = findParentByBatchEquals(batch);
 		int lastBatchNumber = getBatchNumber(parent);
 		boolean isLastBatch = false;
-		if (batch.pickBestCorpName().getLabelText().equals(parent.pickBestCorpName().getLabelText()+"-"+lastBatchNumber)) isLastBatch = true;
+		if (batch.pickBestCorpName().getLabelText()
+				.equals(parent.pickBestCorpName().getLabelText() + "-" + lastBatchNumber))
+			isLastBatch = true;
 		logicalDeleteLsThingAndInteractions(batch);
-		if (isLastBatch){
+		if (isLastBatch) {
 			decrementBatchNumber(parent);
 		}
 		return true;
 	}
 
-
 	@Override
 	public boolean deleteParent(LsThing parent) {
-		String lastParentCorpName = autoLabelService.getLastLabel(parent.getLsTypeAndKind(), "corpName_ACAS LsThing").getAutoLabel();
+		String lastParentCorpName = autoLabelService.getLastLabel(parent.getLsTypeAndKind(), "corpName_ACAS LsThing")
+				.getAutoLabel();
 		boolean isLastParent = false;
-		if (parent.pickBestCorpName().getLabelText().equals(lastParentCorpName)) isLastParent = true;
+		if (parent.pickBestCorpName().getLabelText().equals(lastParentCorpName))
+			isLastParent = true;
 		Collection<LsThing> batches = findBatchesByParentEquals(parent);
-		if (batches != null && !batches.isEmpty()){
-			for (LsThing batch : batches){
+		if (batches != null && !batches.isEmpty()) {
+			for (LsThing batch : batches) {
 				logicalDeleteLsThingAndInteractions(batch);
 			}
 		}
 		logicalDeleteLsThingAndInteractions(parent);
-		if (isLastParent){
+		if (isLastParent) {
 			autoLabelService.decrementLabelSequence(parent.getLsTypeAndKind(), "corpName_ACAS LsThing");
 		}
 		return true;
 	}
 
-
 	@Override
 	public byte[] renderStructureByLsThingCodeName(String codeName,
 			Integer height, Integer width, String format) throws IOException,
 			CDKException, NotFoundException {
 		LsThing lsThing = LsThing.findLsThingsByCodeNameEquals(codeName).getSingleResult();
-		List<LsThingValue> pluckedValues = SimpleUtil.pluckValueByStateTypeKindAndValueTypeKind(lsThing, "properties", "parent properties", "codeValue","structure");
-		if (pluckedValues.size() == 0){
-			logger.debug("No structure found for LsThing: "+codeName);
-			throw new NotFoundException("No structure found for LsThing: "+codeName);
-		}
-		else{
-			if (pluckedValues.size() > 1) logger.warn("Multiple structures found for LsThing "+codeName+". Using the first.");
-			return structureService.renderStructureByCodeName(pluckedValues.get(0).getCodeValue(), height, width, format);
+		List<LsThingValue> pluckedValues = SimpleUtil.pluckValueByStateTypeKindAndValueTypeKind(lsThing, "properties",
+				"parent properties", "codeValue", "structure");
+		if (pluckedValues.size() == 0) {
+			logger.debug("No structure found for LsThing: " + codeName);
+			throw new NotFoundException("No structure found for LsThing: " + codeName);
+		} else {
+			if (pluckedValues.size() > 1)
+				logger.warn("Multiple structures found for LsThing " + codeName + ". Using the first.");
+			return structureService.renderStructureByCodeName(pluckedValues.get(0).getCodeValue(), height, width,
+					format);
 		}
 	}
 
-
 	@Override
 	public StoichiometryPropertiesResultsDTO getStoichiometryProperties(
 			Collection<CodeTypeKindDTO> requests) {
 		StoichiometryPropertiesResultsDTO resultDTO = new StoichiometryPropertiesResultsDTO();
 		List<String> codeNames = new ArrayList<String>();
-		for (CodeTypeKindDTO request : requests){
+		for (CodeTypeKindDTO request : requests) {
 			codeNames.add(request.getCodeName());
 		}
 		Collection<LsThing> foundLsThings = LsThing.findLsThingsByCodeNamesIn(codeNames);
 		HashMap<String, LsThing> lsThingsByCodeName = new HashMap<String, LsThing>();
-		for (LsThing lsThing : foundLsThings){
+		for (LsThing lsThing : foundLsThings) {
 			lsThingsByCodeName.put(lsThing.getCodeName(), lsThing);
 		}
-		for (CodeTypeKindDTO request : requests){
-			if (lsThingsByCodeName.containsKey(request.getCodeName())){
-				try{
-					StoichiometryPropertiesDTO result = new StoichiometryPropertiesDTO(lsThingsByCodeName.get(request.getCodeName()));
+		for (CodeTypeKindDTO request : requests) {
+			if (lsThingsByCodeName.containsKey(request.getCodeName())) {
+				try {
+					StoichiometryPropertiesDTO result = new StoichiometryPropertiesDTO(
+							lsThingsByCodeName.get(request.getCodeName()));
 					resultDTO.getResults().add(result);
-				}catch(Exception e){
+				} catch (Exception e) {
 					resultDTO.setHasError(true);
-					logger.error("Error getting stoichiometry properties for "+request.getCodeName(),e);
-					ErrorMessageDTO error = new ErrorMessageDTO("error", "error"+ e.getMessage() + "encountered getting properties for "+request.getCodeName());
+					logger.error("Error getting stoichiometry properties for " + request.getCodeName(), e);
+					ErrorMessageDTO error = new ErrorMessageDTO("error",
+							"error" + e.getMessage() + "encountered getting properties for " + request.getCodeName());
 					resultDTO.getErrorMessages().add(error);
 				}
-			}else{
+			} else {
 				resultDTO.setHasError(true);
-				ErrorMessageDTO error = new ErrorMessageDTO("error", "lsThing could not be found for codeName "+request.getCodeName());
+				ErrorMessageDTO error = new ErrorMessageDTO("error",
+						"lsThing could not be found for codeName " + request.getCodeName());
 				resultDTO.getErrorMessages().add(error);
 			}
 		}
 		return resultDTO;
 	}
 
-	
 	@Override
-	public Collection<LsThing> structureSearch(String queryMol, String lsType, String lsKind, SearchType searchType, Integer maxResults, Float similarity){
+	public Collection<LsThing> structureSearch(String queryMol, String lsType, String lsKind, SearchType searchType,
+			Integer maxResults, Float similarity) {
 		Collection<LsThing> lsThings = new HashSet<LsThing>();
-		Collection<ChemStructure> structures = structureService.searchStructuresByTypeKind(queryMol, lsType, lsKind, searchType, maxResults, similarity);
-		if (structures != null && !structures.isEmpty()){
+		Collection<ChemStructure> structures = structureService.searchStructuresByTypeKind(queryMol, lsType, lsKind,
+				searchType, maxResults, similarity);
+		if (structures != null && !structures.isEmpty()) {
 			List<String> structureCodes = new ArrayList<String>();
-			for (ChemStructure structure : structures){
+			for (ChemStructure structure : structures) {
 				structureCodes.add(structure.getCodeName());
 			}
 			lsThings = findLsThingsByStructureCodes(structureCodes);
 		}
 		return lsThings;
 	}
-	
-	private Collection<LsThing> findLsThingsByStructureCodes(List<String> structureCodes){
+
+	private Collection<LsThing> findLsThingsByStructureCodes(List<String> structureCodes) {
 		String queryString = "SELECT thing FROM LsThing thing JOIN thing.lsStates state JOIN state.lsValues value "
 				+ "WHERE value.lsType = :lsType AND value.lsKind = :lsKind AND thing.ignored IS NOT true AND state.ignored IS NOT true AND value.ignored IS NOT true"
 				+ " AND ";
@@ -2191,9 +2434,8 @@ private Collection<LsThing> findLsThingsByStructureCodes(List<String> structureC
 		return q.getResultList();
 	}
 
-	
-	private Collection<Long> findLsThingIdsByStructureCodes(List<String> structureCodes){
-		//TODO - refactor code to deal with > 1000 entries in Oracle case
+	private Collection<Long> findLsThingIdsByStructureCodes(List<String> structureCodes) {
+		// TODO - refactor code to deal with > 1000 entries in Oracle case
 		String queryString = "SELECT thing.id FROM ls_thing thing "
 				+ "JOIN ls_thing_state state ON state.lsthing_id = thing.id "
 				+ "JOIN ls_thing_value value on value.lsthing_state_id = state.id "
@@ -2202,60 +2444,61 @@ private Collection<Long> findLsThingIdsByStructureCodes(List<String> structureCo
 				+ "AND value.code_value in (:structureCodes)";
 		EntityManager em = LsThing.entityManager();
 		Query q = em.createNativeQuery(queryString);
-		//Query q = SimpleUtil.addHqlInClauseNativeQuery(em, queryString, "value.code_value", structureCodes);
+		// Query q = SimpleUtil.addHqlInClauseNativeQuery(em, queryString,
+		// "value.code_value", structureCodes);
 		q.setParameter("lsType", "codeValue");
 		q.setParameter("lsKind", "structure");
 		q.setParameter("structureCodes", structureCodes);
-		if (logger.isDebugEnabled()){
+		if (logger.isDebugEnabled()) {
 			logger.info("number of structure codes: " + structureCodes.size());
 			String fullQuery = q.unwrap(org.hibernate.Query.class).getQueryString();
 			logger.info(fullQuery);
 		}
 		return q.getResultList();
 	}
-	
-	
+
 	@Override
-	public Collection<LsThing> getLsThingsByIds(Collection<Long> lsThingIds){
+	public Collection<LsThing> getLsThingsByIds(Collection<Long> lsThingIds) {
 		Collection<LsThing> lsThings = new ArrayList<LsThing>();
-		for (Long id : lsThingIds){
+		for (Long id : lsThingIds) {
 			lsThings.add(LsThing.findLsThing(id));
 		}
 		return lsThings;
 	}
-	
+
 	@Override
-	public Collection<Long> searchLsThingIdsByQueryDTO(LsThingQueryDTO query) throws Exception{
-		List<Long> lsThingIdList = new ArrayList<Long>();	
+	public Collection<Long> searchLsThingIdsByQueryDTO(LsThingQueryDTO query) throws Exception {
+		List<Long> lsThingIdList = new ArrayList<Long>();
 		EntityManager em = LsThing.entityManager();
 		CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
 		CriteriaQuery<Long> criteria = criteriaBuilder.createQuery(Long.class);
 		Root<LsThing> thing = criteria.from(LsThing.class);
 		List<Predicate> predicateList = buildPredicatesForQueryDTO(criteriaBuilder, criteria, thing, query);
-		if (query.getLsType() != null){
+		if (query.getLsType() != null) {
 			Predicate thingType = criteriaBuilder.equal(thing.<String>get("lsType"), query.getLsType());
 			predicateList.add(thingType);
 		}
-		if (query.getLsKind() != null){
+		if (query.getLsKind() != null) {
 			Predicate thingKind = criteriaBuilder.equal(thing.<String>get("lsKind"), query.getLsKind());
 			predicateList.add(thingKind);
 		}
 		Predicate[] predicates = new Predicate[0];
-		//gather all predicates
+		// gather all predicates
 		predicates = predicateList.toArray(predicates);
 		criteria.where(criteriaBuilder.and(predicates));
 		TypedQuery<Long> q = em.createQuery(criteria);
 		logger.debug(q.unwrap(org.hibernate.Query.class).getQueryString());
 		lsThingIdList = q.getResultList();
-		logger.debug("Found "+lsThingIdList.size()+" results.");
+		logger.debug("Found " + lsThingIdList.size() + " results.");
 		return lsThingIdList;
 	}
-		
+
 	@Override
-	public Collection<Long> searchLsThingIdsByQueryDTOandStructure(LsThingQueryDTO query, String queryMol, SearchType searchType, Integer maxResults, Float similarity) throws Exception{
+	public Collection<Long> searchLsThingIdsByQueryDTOandStructure(LsThingQueryDTO query, String queryMol,
+			SearchType searchType, Integer maxResults, Float similarity) throws Exception {
 		Collection<Long> thingIdList = searchLsThingIdsByQueryDTO(query);
 		logger.debug(" thing ids:");
-		for (Long id : thingIdList){
+		for (Long id : thingIdList) {
 			logger.debug(" thing id: " + id);
 		}
 
@@ -2263,129 +2506,146 @@ public Collection<Long> searchLsThingIdsByQueryDTOandStructure(LsThingQueryDTO q
 		logger.debug("incoming query mol: " + queryMol);
 		logger.debug("length of query mol: " + queryMol.length());
 
-		if (queryMol == null || queryMol.equals("") || queryMol.isEmpty() || queryMol.length() < 165){
+		if (queryMol == null || queryMol.equals("") || queryMol.isEmpty() || queryMol.length() < 165) {
 			logger.debug("number of meta things found: " + thingIdList.size());
 		} else {
 			structureCodes = structureService.searchStructuresCodes(queryMol, searchType, maxResults, similarity);
 			logger.debug("number of structureCodes found: " + structureCodes.size());
-			
-			
-			for (String structureCode : structureCodes){
+
+			for (String structureCode : structureCodes) {
 				logger.debug("found code: " + structureCode);
 			}
-			
+
 			List<String> structureCodeList = new ArrayList<String>();
 			structureCodeList.addAll(structureCodes);
 			Collection<LsThing> structThings = null;
 			Collection<Long> structureThingIdList = new ArrayList<Long>();
-			if (structureCodeList.size() > 0){
+			if (structureCodeList.size() > 0) {
 				structThings = findLsThingsByStructureCodes(structureCodeList);
-				for (LsThing lsThing : structThings){
+				for (LsThing lsThing : structThings) {
 					structureThingIdList.add(lsThing.getId());
 					logger.debug("struct thing id: " + lsThing.getId());
 				}
 			}
-			
-			//findLsThingIdsByStructureCodes(structureCodeList);
+
+			// findLsThingIdsByStructureCodes(structureCodeList);
 			logger.debug("number of structureThingIdList found: " + structureThingIdList.size());
 
 			logger.debug("structure thing ids:");
-			for (Long sid : structureThingIdList){
+			for (Long sid : structureThingIdList) {
 				logger.debug("structure thing id: " + sid);
 			}
 
-
 			thingIdList.retainAll(structureThingIdList);
 		}
-		
+
 		logger.debug("number of filtered things found: " + thingIdList.size());
 
 		return thingIdList;
 	}
 
-	
-	public Collection<LsThing> lsThingSearchByMetaAndStructure(LsThingQueryDTO query, String queryMol, SearchType searchType, Integer maxResults, Float similarity) throws Exception{
+	public Collection<LsThing> lsThingSearchByMetaAndStructure(LsThingQueryDTO query, String queryMol,
+			SearchType searchType, Integer maxResults, Float similarity) throws Exception {
 		Collection<LsThing> lsThings = new HashSet<LsThing>();
-		Collection<Long> lsThingIds = searchLsThingIdsByQueryDTOandStructure(query, queryMol, searchType, maxResults, similarity);
-		for (Long id : lsThingIds){
+		Collection<Long> lsThingIds = searchLsThingIdsByQueryDTOandStructure(query, queryMol, searchType, maxResults,
+				similarity);
+		for (Long id : lsThingIds) {
 			lsThings.add(LsThing.findLsThing(id));
 		}
 		return lsThings;
 	}
 
+	private List<Predicate> buildPredicatesForQueryDTO(CriteriaBuilder criteriaBuilder, CriteriaQuery<Long> criteria,
+			Root<LsThing> thing, LsThingQueryDTO query) throws Exception {
 
-	
-	private List<Predicate> buildPredicatesForQueryDTO(CriteriaBuilder criteriaBuilder, CriteriaQuery<Long> criteria, Root<LsThing> thing, LsThingQueryDTO query) throws Exception{
-		
 		criteria.select(thing.<Long>get("id"));
 		criteria.distinct(true);
 		List<Predicate> predicateList = new ArrayList<Predicate>();
 
-		//recordedDates
-		if (query.getRecordedDateGreaterThan() != null && query.getRecordedDateLessThan() != null){
-			try{
-				Predicate createdDateBetween = criteriaBuilder.between(thing.<Date>get("recordedDate"), query.getRecordedDateGreaterThan(), query.getRecordedDateLessThan());
+		// recordedDates
+		if (query.getRecordedDateGreaterThan() != null && query.getRecordedDateLessThan() != null) {
+			try {
+				Predicate createdDateBetween = criteriaBuilder.between(thing.<Date>get("recordedDate"),
+						query.getRecordedDateGreaterThan(), query.getRecordedDateLessThan());
 				predicateList.add(createdDateBetween);
-			}catch (Exception e){
-				logger.error("Caught exception trying to parse "+query.getRecordedDateGreaterThan()+" or "+query.getRecordedDateLessThan()+" as a date.",e);
-				throw new Exception("Caught exception trying to parse "+query.getRecordedDateGreaterThan()+" or "+query.getRecordedDateLessThan()+" as a date.",e);
+			} catch (Exception e) {
+				logger.error("Caught exception trying to parse " + query.getRecordedDateGreaterThan() + " or "
+						+ query.getRecordedDateLessThan() + " as a date.", e);
+				throw new Exception("Caught exception trying to parse " + query.getRecordedDateGreaterThan() + " or "
+						+ query.getRecordedDateLessThan() + " as a date.", e);
 			}
-		}
-		else if (query.getRecordedDateGreaterThan() != null){
-			try{
-				Predicate createdDateFrom = criteriaBuilder.greaterThanOrEqualTo(thing.<Date>get("recordedDate"), query.getRecordedDateGreaterThan());
+		} else if (query.getRecordedDateGreaterThan() != null) {
+			try {
+				Predicate createdDateFrom = criteriaBuilder.greaterThanOrEqualTo(thing.<Date>get("recordedDate"),
+						query.getRecordedDateGreaterThan());
 				predicateList.add(createdDateFrom);
-			}catch (Exception e){
-				logger.error("Caught exception trying to parse "+query.getRecordedDateGreaterThan()+" as a date.",e);
-				throw new Exception("Caught exception trying to parse "+query.getRecordedDateGreaterThan()+" as a date.",e);
+			} catch (Exception e) {
+				logger.error("Caught exception trying to parse " + query.getRecordedDateGreaterThan() + " as a date.",
+						e);
+				throw new Exception(
+						"Caught exception trying to parse " + query.getRecordedDateGreaterThan() + " as a date.", e);
 			}
-		}
-		else if (query.getRecordedDateLessThan() != null){
-			try{
-				Predicate createdDateTo = criteriaBuilder.lessThanOrEqualTo(thing.<Date>get("recordedDate"), query.getRecordedDateLessThan());
+		} else if (query.getRecordedDateLessThan() != null) {
+			try {
+				Predicate createdDateTo = criteriaBuilder.lessThanOrEqualTo(thing.<Date>get("recordedDate"),
+						query.getRecordedDateLessThan());
 				predicateList.add(createdDateTo);
-			}catch (Exception e){
-				logger.error("Caught exception trying to parse "+query.getRecordedDateLessThan()+" as a date.",e);
-				throw new Exception("Caught exception trying to parse "+query.getRecordedDateLessThan()+" as a date.",e);
+			} catch (Exception e) {
+				logger.error("Caught exception trying to parse " + query.getRecordedDateLessThan() + " as a date.", e);
+				throw new Exception(
+						"Caught exception trying to parse " + query.getRecordedDateLessThan() + " as a date.", e);
 			}
 		}
-		if (query.getRecordedBy() != null){
-			Predicate recordedBy = criteriaBuilder.like(thing.<String>get("recordedBy"), '%'+query.getRecordedBy()+'%');
+		if (query.getRecordedBy() != null) {
+			Predicate recordedBy = criteriaBuilder.like(thing.<String>get("recordedBy"),
+					'%' + query.getRecordedBy() + '%');
 			predicateList.add(recordedBy);
 		}
-		
-		if (query.getCodeName() != null && query.getCodeName().getCodeName() != null){
-			if (query.getCodeName().getOperator() != null){
-				if (query.getCodeName().getOperator().equals("=")){
-					predicateList.add(criteriaBuilder.equal(thing.<String>get("codeName"), query.getCodeName().getCodeName()));
-				} else if ( query.getCodeName().getOperator().equalsIgnoreCase("equals")){
-					predicateList.add(criteriaBuilder.equal(thing.<String>get("codeName"), query.getCodeName().getCodeName()));
-				}else if (query.getCodeName().getOperator().equals("!=")){
-					predicateList.add(criteriaBuilder.notEqual(thing.<String>get("codeName"), query.getCodeName().getCodeName()));
-				}else if(query.getCodeName().getOperator().equals("~")){
-					predicateList.add(criteriaBuilder.like(criteriaBuilder.lower(thing.<String>get("codeName")), '%' +  query.getCodeName().getCodeName().toLowerCase() + '%'));
-				}else if(query.getCodeName().getOperator().equalsIgnoreCase("like")){
-					predicateList.add(criteriaBuilder.like(criteriaBuilder.lower(thing.<String>get("codeName")), '%' +  query.getCodeName().getCodeName().toLowerCase() + '%'));
-				}else if(query.getCodeName().getOperator().equals("!~")){
-					predicateList.add(criteriaBuilder.notLike(criteriaBuilder.lower(thing.<String>get("codeName")), '%' +  query.getCodeName().getCodeName().toLowerCase() + '%'));
-				}else if(query.getCodeName().getOperator().equals(">")){
-					predicateList.add(criteriaBuilder.greaterThan(thing.<String>get("codeName"),  query.getCodeName().getCodeName()));
-				}else if(query.getCodeName().getOperator().equals(">=")){
-					predicateList.add(criteriaBuilder.greaterThanOrEqualTo(thing.<String>get("codeName"),  query.getCodeName().getCodeName()));
-				}else if(query.getCodeName().getOperator().equals("<")){
-					predicateList.add(criteriaBuilder.lessThan(thing.<String>get("codeName"),  query.getCodeName().getCodeName()));
-				}else if(query.getCodeName().getOperator().equals("<=")){
-					predicateList.add(criteriaBuilder.lessThanOrEqualTo(thing.<String>get("codeName"),  query.getCodeName().getCodeName()));
-				}else{
-					predicateList.add(criteriaBuilder.like(criteriaBuilder.lower(thing.<String>get("codeName")), '%' +  query.getCodeName().getCodeName().toLowerCase() + '%'));
+
+		if (query.getCodeName() != null && query.getCodeName().getCodeName() != null) {
+			if (query.getCodeName().getOperator() != null) {
+				if (query.getCodeName().getOperator().equals("=")) {
+					predicateList.add(
+							criteriaBuilder.equal(thing.<String>get("codeName"), query.getCodeName().getCodeName()));
+				} else if (query.getCodeName().getOperator().equalsIgnoreCase("equals")) {
+					predicateList.add(
+							criteriaBuilder.equal(thing.<String>get("codeName"), query.getCodeName().getCodeName()));
+				} else if (query.getCodeName().getOperator().equals("!=")) {
+					predicateList.add(
+							criteriaBuilder.notEqual(thing.<String>get("codeName"), query.getCodeName().getCodeName()));
+				} else if (query.getCodeName().getOperator().equals("~")) {
+					predicateList.add(criteriaBuilder.like(criteriaBuilder.lower(thing.<String>get("codeName")),
+							'%' + query.getCodeName().getCodeName().toLowerCase() + '%'));
+				} else if (query.getCodeName().getOperator().equalsIgnoreCase("like")) {
+					predicateList.add(criteriaBuilder.like(criteriaBuilder.lower(thing.<String>get("codeName")),
+							'%' + query.getCodeName().getCodeName().toLowerCase() + '%'));
+				} else if (query.getCodeName().getOperator().equals("!~")) {
+					predicateList.add(criteriaBuilder.notLike(criteriaBuilder.lower(thing.<String>get("codeName")),
+							'%' + query.getCodeName().getCodeName().toLowerCase() + '%'));
+				} else if (query.getCodeName().getOperator().equals(">")) {
+					predicateList.add(criteriaBuilder.greaterThan(thing.<String>get("codeName"),
+							query.getCodeName().getCodeName()));
+				} else if (query.getCodeName().getOperator().equals(">=")) {
+					predicateList.add(criteriaBuilder.greaterThanOrEqualTo(thing.<String>get("codeName"),
+							query.getCodeName().getCodeName()));
+				} else if (query.getCodeName().getOperator().equals("<")) {
+					predicateList.add(
+							criteriaBuilder.lessThan(thing.<String>get("codeName"), query.getCodeName().getCodeName()));
+				} else if (query.getCodeName().getOperator().equals("<=")) {
+					predicateList.add(criteriaBuilder.lessThanOrEqualTo(thing.<String>get("codeName"),
+							query.getCodeName().getCodeName()));
+				} else {
+					predicateList.add(criteriaBuilder.like(criteriaBuilder.lower(thing.<String>get("codeName")),
+							'%' + query.getCodeName().getCodeName().toLowerCase() + '%'));
 				}
 			} else {
-				predicateList.add(criteriaBuilder.like(criteriaBuilder.lower(thing.<String>get("codeName")), '%' +  query.getCodeName().getCodeName().toLowerCase() + '%'));
+				predicateList.add(criteriaBuilder.like(criteriaBuilder.lower(thing.<String>get("codeName")),
+						'%' + query.getCodeName().getCodeName().toLowerCase() + '%'));
 			}
 		}
-		//interactions
-		if (query.getFirstInteractions() != null){
-			for (ItxQueryDTO interaction : query.getFirstInteractions()){
+		// interactions
+		if (query.getFirstInteractions() != null) {
+			for (ItxQueryDTO interaction : query.getFirstInteractions()) {
 				Join<LsThing, ItxLsThingLsThing> firstItx = thing.join("firstLsThings");
 				Join<ItxLsThingLsThing, LsThing> firstThing = firstItx.join("firstLsThing");
 				List<Predicate> firstItxPredicates = new ArrayList<Predicate>();
@@ -2393,136 +2653,169 @@ else if (query.getRecordedDateLessThan() != null){
 				Predicate firstThingNotIgn = criteriaBuilder.isFalse(firstThing.<Boolean>get("ignored"));
 				firstItxPredicates.add(firstItxNotIgn);
 				firstItxPredicates.add(firstThingNotIgn);
-				if (interaction.getInteractionType() != null){
-					Predicate firstItxType = criteriaBuilder.equal(firstItx.<String>get("lsType"), interaction.getInteractionType());
+				if (interaction.getInteractionType() != null) {
+					Predicate firstItxType = criteriaBuilder.equal(firstItx.<String>get("lsType"),
+							interaction.getInteractionType());
 					firstItxPredicates.add(firstItxType);
 				}
-				if (interaction.getInteractionKind() != null){
-					Predicate firstItxKind = criteriaBuilder.equal(firstItx.<String>get("lsKind"), interaction.getInteractionKind());
+				if (interaction.getInteractionKind() != null) {
+					Predicate firstItxKind = criteriaBuilder.equal(firstItx.<String>get("lsKind"),
+							interaction.getInteractionKind());
 					firstItxPredicates.add(firstItxKind);
 				}
-				if (interaction.getThingType() != null){
-					Predicate firstThingType = criteriaBuilder.equal(firstThing.<String>get("lsType"), interaction.getThingType());
+				if (interaction.getThingType() != null) {
+					Predicate firstThingType = criteriaBuilder.equal(firstThing.<String>get("lsType"),
+							interaction.getThingType());
 					firstItxPredicates.add(firstThingType);
 				}
-				if (interaction.getThingKind() != null){
-					Predicate firstThingKind = criteriaBuilder.equal(firstThing.<String>get("lsKind"), interaction.getThingKind());
+				if (interaction.getThingKind() != null) {
+					Predicate firstThingKind = criteriaBuilder.equal(firstThing.<String>get("lsKind"),
+							interaction.getThingKind());
 					firstItxPredicates.add(firstThingKind);
 				}
-				if (interaction.getThingCodeName() != null){
-					Predicate predicate = criteriaBuilder.equal(firstThing.<String>get("codeName"), interaction.getThingCodeName());
+				if (interaction.getThingCodeName() != null) {
+					Predicate predicate = criteriaBuilder.equal(firstThing.<String>get("codeName"),
+							interaction.getThingCodeName());
 					firstItxPredicates.add(predicate);
 				}
-				if(interaction.getThingLabelType() != null || interaction.getThingLabelKind() != null || interaction.getThingLabelText() != null) {
+				if (interaction.getThingLabelType() != null || interaction.getThingLabelKind() != null
+						|| interaction.getThingLabelText() != null) {
 					Join<LsThing, LsThingLabel> firstThingLabel = firstThing.join("lsLabels", JoinType.LEFT);
 					Predicate firstThingLabelNotIgn = criteriaBuilder.isFalse(firstThingLabel.<Boolean>get("ignored"));
 					firstItxPredicates.add(firstThingLabelNotIgn);
 
-					if (interaction.getThingLabelType() != null){
-						Predicate firstThingLabelType = criteriaBuilder.equal(firstThingLabel.<String>get("lsType"), interaction.getThingLabelType());
+					if (interaction.getThingLabelType() != null) {
+						Predicate firstThingLabelType = criteriaBuilder.equal(firstThingLabel.<String>get("lsType"),
+								interaction.getThingLabelType());
 						firstItxPredicates.add(firstThingLabelType);
 					}
-					if (interaction.getThingLabelKind() != null){
-						Predicate firstThingLabelKind = criteriaBuilder.equal(firstThingLabel.<String>get("lsKind"), interaction.getThingLabelKind());
+					if (interaction.getThingLabelKind() != null) {
+						Predicate firstThingLabelKind = criteriaBuilder.equal(firstThingLabel.<String>get("lsKind"),
+								interaction.getThingLabelKind());
 						firstItxPredicates.add(firstThingLabelKind);
 					}
-					if (interaction.getThingLabelText() != null){
-						if (interaction.getOperator() != null){
-							if (interaction.getOperator().equals("=")){
-								Predicate firstThingLabelEquals = criteriaBuilder.equal(firstThingLabel.<String>get("labelText"), interaction.getThingLabelText());
+					if (interaction.getThingLabelText() != null) {
+						if (interaction.getOperator() != null) {
+							if (interaction.getOperator().equals("=")) {
+								Predicate firstThingLabelEquals = criteriaBuilder.equal(
+										firstThingLabel.<String>get("labelText"), interaction.getThingLabelText());
 								firstItxPredicates.add(firstThingLabelEquals);
-							}else if (interaction.getOperator().equals("!=")){
-								Predicate firstThingLabelNotEquals = criteriaBuilder.notEqual(firstThingLabel.<String>get("labelText"), interaction.getThingLabelText());
+							} else if (interaction.getOperator().equals("!=")) {
+								Predicate firstThingLabelNotEquals = criteriaBuilder.notEqual(
+										firstThingLabel.<String>get("labelText"), interaction.getThingLabelText());
 								firstItxPredicates.add(firstThingLabelNotEquals);
-							}else if(interaction.getOperator().equals("~")){
-								Predicate firstThingLabelLike = criteriaBuilder.like(criteriaBuilder.lower(firstThingLabel.<String>get("labelText")), '%' + interaction.getThingLabelText().toLowerCase() + '%');
+							} else if (interaction.getOperator().equals("~")) {
+								Predicate firstThingLabelLike = criteriaBuilder.like(
+										criteriaBuilder.lower(firstThingLabel.<String>get("labelText")),
+										'%' + interaction.getThingLabelText().toLowerCase() + '%');
 								firstItxPredicates.add(firstThingLabelLike);
-							}else if(interaction.getOperator().equalsIgnoreCase("like")){
-								Predicate firstThingLabelLike = criteriaBuilder.like(criteriaBuilder.lower(firstThingLabel.<String>get("labelText")), '%' + interaction.getThingLabelText().toLowerCase() + '%');
+							} else if (interaction.getOperator().equalsIgnoreCase("like")) {
+								Predicate firstThingLabelLike = criteriaBuilder.like(
+										criteriaBuilder.lower(firstThingLabel.<String>get("labelText")),
+										'%' + interaction.getThingLabelText().toLowerCase() + '%');
 								firstItxPredicates.add(firstThingLabelLike);
-							}else if(interaction.getOperator().equals("!~")){
-								Predicate firstThingLabelNotLike = criteriaBuilder.notLike(criteriaBuilder.lower(firstThingLabel.<String>get("labelText")), '%' + interaction.getThingLabelText().toLowerCase() + '%');
+							} else if (interaction.getOperator().equals("!~")) {
+								Predicate firstThingLabelNotLike = criteriaBuilder.notLike(
+										criteriaBuilder.lower(firstThingLabel.<String>get("labelText")),
+										'%' + interaction.getThingLabelText().toLowerCase() + '%');
 								firstItxPredicates.add(firstThingLabelNotLike);
-							}else if(interaction.getOperator().equals(">")){
-								Predicate firstThingLabelGreaterThan = criteriaBuilder.greaterThan(firstThingLabel.<String>get("labelText"), interaction.getThingLabelText());
+							} else if (interaction.getOperator().equals(">")) {
+								Predicate firstThingLabelGreaterThan = criteriaBuilder.greaterThan(
+										firstThingLabel.<String>get("labelText"), interaction.getThingLabelText());
 								firstItxPredicates.add(firstThingLabelGreaterThan);
-							}else if(interaction.getOperator().equals(">=")){
-								Predicate firstThingLabelGreaterThan = criteriaBuilder.greaterThanOrEqualTo(firstThingLabel.<String>get("labelText"), interaction.getThingLabelText());
+							} else if (interaction.getOperator().equals(">=")) {
+								Predicate firstThingLabelGreaterThan = criteriaBuilder.greaterThanOrEqualTo(
+										firstThingLabel.<String>get("labelText"), interaction.getThingLabelText());
 								firstItxPredicates.add(firstThingLabelGreaterThan);
-							}else if(interaction.getOperator().equals("<")){
-								Predicate firstThingLabelLessThan = criteriaBuilder.lessThan(firstThingLabel.<String>get("labelText"), interaction.getThingLabelText());
+							} else if (interaction.getOperator().equals("<")) {
+								Predicate firstThingLabelLessThan = criteriaBuilder.lessThan(
+										firstThingLabel.<String>get("labelText"), interaction.getThingLabelText());
 								firstItxPredicates.add(firstThingLabelLessThan);
-							}else if(interaction.getOperator().equals("<=")){
-								Predicate firstThingLabelLessThan = criteriaBuilder.lessThanOrEqualTo(firstThingLabel.<String>get("labelText"), interaction.getThingLabelText());
+							} else if (interaction.getOperator().equals("<=")) {
+								Predicate firstThingLabelLessThan = criteriaBuilder.lessThanOrEqualTo(
+										firstThingLabel.<String>get("labelText"), interaction.getThingLabelText());
 								firstItxPredicates.add(firstThingLabelLessThan);
-							}else{
-								Predicate firstThingLabelLike = criteriaBuilder.like(criteriaBuilder.lower(firstThingLabel.<String>get("labelText")), '%' + interaction.getThingLabelText().toLowerCase() + '%');
+							} else {
+								Predicate firstThingLabelLike = criteriaBuilder.like(
+										criteriaBuilder.lower(firstThingLabel.<String>get("labelText")),
+										'%' + interaction.getThingLabelText().toLowerCase() + '%');
 								firstItxPredicates.add(firstThingLabelLike);
 							}
-						}else{
-							Predicate firstThingLabelLike = criteriaBuilder.like(criteriaBuilder.lower(firstThingLabel.<String>get("labelText")), '%' + interaction.getThingLabelText().toLowerCase() + '%');
+						} else {
+							Predicate firstThingLabelLike = criteriaBuilder.like(
+									criteriaBuilder.lower(firstThingLabel.<String>get("labelText")),
+									'%' + interaction.getThingLabelText().toLowerCase() + '%');
 							firstItxPredicates.add(firstThingLabelLike);
 						}
 					}
 				}
 				// Search for itxs values
-				if (interaction.getThingValues() != null){
-					for (ValueQueryDTO valueQuery : interaction.getThingValues()){
+				if (interaction.getThingValues() != null) {
+					for (ValueQueryDTO valueQuery : interaction.getThingValues()) {
 						List<Predicate> valuePredicatesList = new ArrayList<Predicate>();
 						Join<LsThing, LsThingState> state = firstThing.join("lsStates");
 						Join<LsThingState, LsThingValue> value = state.join("lsValues");
-						
+
 						Predicate stateNotIgn = criteriaBuilder.isFalse(state.<Boolean>get("ignored"));
 						Predicate valueNotIgn = criteriaBuilder.isFalse(value.<Boolean>get("ignored"));
 						valuePredicatesList.add(stateNotIgn);
 						valuePredicatesList.add(valueNotIgn);
-						
-						if (valueQuery.getStateType() != null){
-							Predicate stateType = criteriaBuilder.equal(state.<String>get("lsType"),valueQuery.getStateType());
+
+						if (valueQuery.getStateType() != null) {
+							Predicate stateType = criteriaBuilder.equal(state.<String>get("lsType"),
+									valueQuery.getStateType());
 							valuePredicatesList.add(stateType);
 						}
-						if (valueQuery.getStateKind() != null){
-							Predicate stateKind = criteriaBuilder.equal(state.<String>get("lsKind"),valueQuery.getStateKind());
+						if (valueQuery.getStateKind() != null) {
+							Predicate stateKind = criteriaBuilder.equal(state.<String>get("lsKind"),
+									valueQuery.getStateKind());
 							valuePredicatesList.add(stateKind);
 						}
-						if (valueQuery.getValueType() != null){
-							Predicate valueType = criteriaBuilder.equal(value.<String>get("lsType"),valueQuery.getValueType());
+						if (valueQuery.getValueType() != null) {
+							Predicate valueType = criteriaBuilder.equal(value.<String>get("lsType"),
+									valueQuery.getValueType());
 							valuePredicatesList.add(valueType);
 						}
-						if (valueQuery.getValueKind() != null){
-							Predicate valueKind = criteriaBuilder.equal(value.<String>get("lsKind"),valueQuery.getValueKind());
+						if (valueQuery.getValueKind() != null) {
+							Predicate valueKind = criteriaBuilder.equal(value.<String>get("lsKind"),
+									valueQuery.getValueKind());
 							valuePredicatesList.add(valueKind);
 						}
-						if (valueQuery.getValue() != null){
-							if (valueQuery.getValueType() == null){
+						if (valueQuery.getValue() != null) {
+							if (valueQuery.getValueType() == null) {
 								logger.error("valueType must be specified if value is specified!");
 								throw new Exception("valueType must be specified if value is specified!");
-							}else if (valueQuery.getValueType().equalsIgnoreCase("dateValue")){
+							} else if (valueQuery.getValueType().equalsIgnoreCase("dateValue")) {
 								Calendar cal = Calendar.getInstance(); // locale-specific
 								boolean parsedTime = false;
-								if (SimpleUtil.isNumeric(valueQuery.getValue())){
+								if (SimpleUtil.isNumeric(valueQuery.getValue())) {
 									cal.setTimeInMillis(Long.valueOf(valueQuery.getValue()));
 									parsedTime = true;
-								}else{
-									try{
+								} else {
+									try {
 										SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH);
 										cal.setTime(sdf.parse(valueQuery.getValue()));
 										parsedTime = true;
-									}catch (Exception e){
-										logger.warn("Failed to parse date in LsThing generic query for value",e);
+									} catch (Exception e) {
+										logger.warn("Failed to parse date in LsThing generic query for value", e);
 									}
 								}
-								if (parsedTime){
-									if (valueQuery.getOperator() != null && valueQuery.getOperator().equals(">")){
-										Predicate valueGreaterThan = criteriaBuilder.greaterThan(value.<Date>get("dateValue"), new Date(cal.getTimeInMillis()));
+								if (parsedTime) {
+									if (valueQuery.getOperator() != null && valueQuery.getOperator().equals(">")) {
+										Predicate valueGreaterThan = criteriaBuilder.greaterThan(
+												value.<Date>get("dateValue"), new Date(cal.getTimeInMillis()));
 										valuePredicatesList.add(valueGreaterThan);
-									}else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("<")){
-										Predicate valueLessThan = criteriaBuilder.lessThan(value.<Date>get("dateValue"), new Date(cal.getTimeInMillis()));
+									} else if (valueQuery.getOperator() != null
+											&& valueQuery.getOperator().equals("<")) {
+										Predicate valueLessThan = criteriaBuilder.lessThan(value.<Date>get("dateValue"),
+												new Date(cal.getTimeInMillis()));
 										valuePredicatesList.add(valueLessThan);
-									}else{
+									} else {
 										String postgresTimeUnit = "day";
-										Expression<Date> dateTruncExpr = criteriaBuilder.function("date_trunc", Date.class, criteriaBuilder.literal(postgresTimeUnit), value.<Date>get("dateValue"));
-										
+										Expression<Date> dateTruncExpr = criteriaBuilder.function("date_trunc",
+												Date.class, criteriaBuilder.literal(postgresTimeUnit),
+												value.<Date>get("dateValue"));
+
 										cal.set(Calendar.HOUR_OF_DAY, 0);
 										cal.set(Calendar.MINUTE, 0);
 										cal.set(Calendar.SECOND, 0);
@@ -2533,77 +2826,98 @@ else if (query.getRecordedDateLessThan() != null){
 										valuePredicatesList.add(valueLike);
 									}
 								}
-							}else if (valueQuery.getValueType().equalsIgnoreCase("numericValue")){
-								try{
+							} else if (valueQuery.getValueType().equalsIgnoreCase("numericValue")) {
+								try {
 									BigDecimal numberValue = new BigDecimal(valueQuery.getValue());
-									if (valueQuery.getOperator() != null && valueQuery.getOperator().equals(">")){
-										Predicate valueGreaterThan = criteriaBuilder.greaterThan(value.<BigDecimal>get("numericValue"), numberValue);
+									if (valueQuery.getOperator() != null && valueQuery.getOperator().equals(">")) {
+										Predicate valueGreaterThan = criteriaBuilder
+												.greaterThan(value.<BigDecimal>get("numericValue"), numberValue);
 										valuePredicatesList.add(valueGreaterThan);
-									}else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("<=")){
-										Predicate valueGreaterThan = criteriaBuilder.greaterThanOrEqualTo(value.<BigDecimal>get("numericValue"), numberValue);
+									} else if (valueQuery.getOperator() != null
+											&& valueQuery.getOperator().equals("<=")) {
+										Predicate valueGreaterThan = criteriaBuilder.greaterThanOrEqualTo(
+												value.<BigDecimal>get("numericValue"), numberValue);
 										valuePredicatesList.add(valueGreaterThan);
-									}else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("<")){
-										Predicate valueLessThan = criteriaBuilder.lessThan(value.<BigDecimal>get("numericValue"), numberValue);
+									} else if (valueQuery.getOperator() != null
+											&& valueQuery.getOperator().equals("<")) {
+										Predicate valueLessThan = criteriaBuilder
+												.lessThan(value.<BigDecimal>get("numericValue"), numberValue);
 										valuePredicatesList.add(valueLessThan);
-									}else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("<=")){
-										Predicate valueLessThan = criteriaBuilder.lessThanOrEqualTo(value.<BigDecimal>get("numericValue"), numberValue);
+									} else if (valueQuery.getOperator() != null
+											&& valueQuery.getOperator().equals("<=")) {
+										Predicate valueLessThan = criteriaBuilder
+												.lessThanOrEqualTo(value.<BigDecimal>get("numericValue"), numberValue);
 										valuePredicatesList.add(valueLessThan);
-									}else{
-										Predicate valueEquals = criteriaBuilder.equal(value.<BigDecimal>get("numericValue"), numberValue);
+									} else {
+										Predicate valueEquals = criteriaBuilder
+												.equal(value.<BigDecimal>get("numericValue"), numberValue);
 										valuePredicatesList.add(valueEquals);
 									}
-								} catch (NumberFormatException e){
-									logger.warn("Failed to parse number in LsThing generic query for value",e);
+								} catch (NumberFormatException e) {
+									logger.warn("Failed to parse number in LsThing generic query for value", e);
 									valuePredicatesList.add(criteriaBuilder.disjunction());
-		
+
+								}
+							} else {
+								// string value types: stringValue, codeValue, fileValue, clobValue
+								if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("=")) {
+									Predicate valueEquals = criteriaBuilder
+											.equal(value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
+									valuePredicatesList.add(valueEquals);
+								} else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("!=")) {
+									Predicate valueNotEquals = criteriaBuilder.notEqual(
+											value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
+									valuePredicatesList.add(valueNotEquals);
+								} else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("~")) {
+									Predicate valueLike = criteriaBuilder.like(
+											criteriaBuilder.lower(value.<String>get(valueQuery.getValueType())),
+											'%' + valueQuery.getValue().toLowerCase() + '%');
+									valuePredicatesList.add(valueLike);
+								} else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("!~")) {
+									Predicate valueNotLike = criteriaBuilder.notLike(
+											criteriaBuilder.lower(value.<String>get(valueQuery.getValueType())),
+											'%' + valueQuery.getValue().toLowerCase() + '%');
+									valuePredicatesList.add(valueNotLike);
+								} else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals(">")) {
+									Predicate valueGreaterThan = criteriaBuilder.greaterThan(
+											value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
+									valuePredicatesList.add(valueGreaterThan);
+								} else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals(">=")) {
+									Predicate valueGreaterThan = criteriaBuilder.greaterThanOrEqualTo(
+											value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
+									valuePredicatesList.add(valueGreaterThan);
+								} else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("<")) {
+									Predicate valueLessThan = criteriaBuilder.lessThan(
+											value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
+									valuePredicatesList.add(valueLessThan);
+								} else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("<=")) {
+									Predicate valueLessThan = criteriaBuilder.lessThanOrEqualTo(
+											value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
+									valuePredicatesList.add(valueLessThan);
+								} else {
+									Predicate valueLike = criteriaBuilder.like(
+											value.<String>get(valueQuery.getValueType()),
+											'%' + valueQuery.getValue() + '%');
+									valuePredicatesList.add(valueLike);
 								}
-						}else{
-							//string value types: stringValue, codeValue, fileValue, clobValue
-							if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("=")){
-								Predicate valueEquals = criteriaBuilder.equal(value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
-								valuePredicatesList.add(valueEquals);
-							}else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("!=")){
-								Predicate valueNotEquals = criteriaBuilder.notEqual(value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
-								valuePredicatesList.add(valueNotEquals);
-							}else if(valueQuery.getOperator() != null && valueQuery.getOperator().equals("~")){
-								Predicate valueLike = criteriaBuilder.like(criteriaBuilder.lower(value.<String>get(valueQuery.getValueType())), '%' + valueQuery.getValue().toLowerCase() + '%');
-								valuePredicatesList.add(valueLike);
-							}else if(valueQuery.getOperator() != null && valueQuery.getOperator().equals("!~")){
-								Predicate valueNotLike = criteriaBuilder.notLike(criteriaBuilder.lower(value.<String>get(valueQuery.getValueType())),  '%' + valueQuery.getValue().toLowerCase() + '%');
-								valuePredicatesList.add(valueNotLike);
-							}else if(valueQuery.getOperator() != null && valueQuery.getOperator().equals(">")){
-								Predicate valueGreaterThan = criteriaBuilder.greaterThan(value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
-								valuePredicatesList.add(valueGreaterThan);
-							}else if(valueQuery.getOperator() != null && valueQuery.getOperator().equals(">=")){
-								Predicate valueGreaterThan = criteriaBuilder.greaterThanOrEqualTo(value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
-								valuePredicatesList.add(valueGreaterThan);
-							}else if(valueQuery.getOperator() != null && valueQuery.getOperator().equals("<")){
-								Predicate valueLessThan = criteriaBuilder.lessThan(value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
-								valuePredicatesList.add(valueLessThan);
-							}else if(valueQuery.getOperator() != null && valueQuery.getOperator().equals("<=")){
-								Predicate valueLessThan = criteriaBuilder.lessThanOrEqualTo(value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
-								valuePredicatesList.add(valueLessThan);
-							}else{
-								Predicate valueLike = criteriaBuilder.like(value.<String>get(valueQuery.getValueType()), '%' + valueQuery.getValue() + '%');
-								valuePredicatesList.add(valueLike);
 							}
 						}
-						}
-						//gather predicates with AND
+						// gather predicates with AND
 						Predicate[] valuePredicates = new Predicate[0];
 						valuePredicates = valuePredicatesList.toArray(valuePredicates);
 						firstItxPredicates.add(criteriaBuilder.and(valuePredicates));
 					}
 				}
-				//gather interactions, AND between each within group, then OR on the two, then add to outer predicates
+				// gather interactions, AND between each within group, then OR on the two, then
+				// add to outer predicates
 				Predicate[] firstPredicates = new Predicate[0];
 				firstPredicates = firstItxPredicates.toArray(firstPredicates);
 				Predicate firstItxAndPredicates = criteriaBuilder.and(firstPredicates);
 				predicateList.add(firstItxAndPredicates);
 			}
 		}
-		if (query.getSecondInteractions() != null){
-			for (ItxQueryDTO interaction : query.getSecondInteractions()){
+		if (query.getSecondInteractions() != null) {
+			for (ItxQueryDTO interaction : query.getSecondInteractions()) {
 				Join<LsThing, ItxLsThingLsThing> secondItx = thing.join("secondLsThings");
 				Join<ItxLsThingLsThing, LsThing> secondThing = secondItx.join("secondLsThing");
 				List<Predicate> secondItxPredicates = new ArrayList<Predicate>();
@@ -2611,136 +2925,170 @@ else if (query.getRecordedDateLessThan() != null){
 				Predicate secondThingNotIgn = criteriaBuilder.isFalse(secondThing.<Boolean>get("ignored"));
 				secondItxPredicates.add(secondItxNotIgn);
 				secondItxPredicates.add(secondThingNotIgn);
-				if (interaction.getInteractionType() != null){
-					Predicate secondItxType = criteriaBuilder.equal(secondItx.<String>get("lsType"), interaction.getInteractionType());
+				if (interaction.getInteractionType() != null) {
+					Predicate secondItxType = criteriaBuilder.equal(secondItx.<String>get("lsType"),
+							interaction.getInteractionType());
 					secondItxPredicates.add(secondItxType);
 				}
-				if (interaction.getInteractionKind() != null){
-					Predicate secondItxKind = criteriaBuilder.equal(secondItx.<String>get("lsKind"), interaction.getInteractionKind());
+				if (interaction.getInteractionKind() != null) {
+					Predicate secondItxKind = criteriaBuilder.equal(secondItx.<String>get("lsKind"),
+							interaction.getInteractionKind());
 					secondItxPredicates.add(secondItxKind);
 				}
-				if (interaction.getThingType() != null){
-					Predicate secondThingType = criteriaBuilder.equal(secondThing.<String>get("lsType"), interaction.getThingType());
+				if (interaction.getThingType() != null) {
+					Predicate secondThingType = criteriaBuilder.equal(secondThing.<String>get("lsType"),
+							interaction.getThingType());
 					secondItxPredicates.add(secondThingType);
 				}
-				if (interaction.getThingKind() != null){
-					Predicate secondThingKind = criteriaBuilder.equal(secondThing.<String>get("lsKind"), interaction.getThingKind());
+				if (interaction.getThingKind() != null) {
+					Predicate secondThingKind = criteriaBuilder.equal(secondThing.<String>get("lsKind"),
+							interaction.getThingKind());
 					secondItxPredicates.add(secondThingKind);
 				}
-				if (interaction.getThingCodeName() != null){
-					Predicate predicate = criteriaBuilder.equal(secondThing.<String>get("codeName"), interaction.getThingCodeName());
+				if (interaction.getThingCodeName() != null) {
+					Predicate predicate = criteriaBuilder.equal(secondThing.<String>get("codeName"),
+							interaction.getThingCodeName());
 					secondItxPredicates.add(predicate);
 				}
-				if(interaction.getThingLabelType() != null || interaction.getThingLabelKind() != null || interaction.getThingLabelText() != null) {
+				if (interaction.getThingLabelType() != null || interaction.getThingLabelKind() != null
+						|| interaction.getThingLabelText() != null) {
 					Join<LsThing, LsThingLabel> secondThingLabel = secondThing.join("lsLabels", JoinType.LEFT);
-					Predicate secondThingLabelNotIgn = criteriaBuilder.isFalse(secondThingLabel.<Boolean>get("ignored"));
+					Predicate secondThingLabelNotIgn = criteriaBuilder
+							.isFalse(secondThingLabel.<Boolean>get("ignored"));
 					secondItxPredicates.add(secondThingLabelNotIgn);
 
-					if (interaction.getThingLabelType() != null){
-						Predicate secondThingLabelType = criteriaBuilder.equal(secondThingLabel.<String>get("lsType"), interaction.getThingLabelType());
+					if (interaction.getThingLabelType() != null) {
+						Predicate secondThingLabelType = criteriaBuilder.equal(secondThingLabel.<String>get("lsType"),
+								interaction.getThingLabelType());
 						secondItxPredicates.add(secondThingLabelType);
 					}
-					if (interaction.getThingLabelKind() != null){
-						Predicate secondThingLabelKind = criteriaBuilder.equal(secondThingLabel.<String>get("lsKind"), interaction.getThingLabelKind());
+					if (interaction.getThingLabelKind() != null) {
+						Predicate secondThingLabelKind = criteriaBuilder.equal(secondThingLabel.<String>get("lsKind"),
+								interaction.getThingLabelKind());
 						secondItxPredicates.add(secondThingLabelKind);
 					}
-					if (interaction.getThingLabelText() != null){
-						if (interaction.getOperator() != null){
-							if (interaction.getOperator().equals("=")){
-								Predicate secondThingLabelEquals = criteriaBuilder.equal(secondThingLabel.<String>get("labelText"), interaction.getThingLabelText());
+					if (interaction.getThingLabelText() != null) {
+						if (interaction.getOperator() != null) {
+							if (interaction.getOperator().equals("=")) {
+								Predicate secondThingLabelEquals = criteriaBuilder.equal(
+										secondThingLabel.<String>get("labelText"), interaction.getThingLabelText());
 								secondItxPredicates.add(secondThingLabelEquals);
-							}else if (interaction.getOperator().equals("!=")){
-								Predicate secondThingLabelNotEquals = criteriaBuilder.notEqual(secondThingLabel.<String>get("labelText"), interaction.getThingLabelText());
+							} else if (interaction.getOperator().equals("!=")) {
+								Predicate secondThingLabelNotEquals = criteriaBuilder.notEqual(
+										secondThingLabel.<String>get("labelText"), interaction.getThingLabelText());
 								secondItxPredicates.add(secondThingLabelNotEquals);
-							}else if(interaction.getOperator().equals("~")){
-								Predicate secondThingLabelLike = criteriaBuilder.like(criteriaBuilder.lower(secondThingLabel.<String>get("labelText")), '%' + interaction.getThingLabelText().toLowerCase() + '%');
+							} else if (interaction.getOperator().equals("~")) {
+								Predicate secondThingLabelLike = criteriaBuilder.like(
+										criteriaBuilder.lower(secondThingLabel.<String>get("labelText")),
+										'%' + interaction.getThingLabelText().toLowerCase() + '%');
 								secondItxPredicates.add(secondThingLabelLike);
-							}else if(interaction.getOperator().equalsIgnoreCase("like")){
-								Predicate secondThingLabelLike = criteriaBuilder.like(criteriaBuilder.lower(secondThingLabel.<String>get("labelText")), '%' + interaction.getThingLabelText().toLowerCase() + '%');
+							} else if (interaction.getOperator().equalsIgnoreCase("like")) {
+								Predicate secondThingLabelLike = criteriaBuilder.like(
+										criteriaBuilder.lower(secondThingLabel.<String>get("labelText")),
+										'%' + interaction.getThingLabelText().toLowerCase() + '%');
 								secondItxPredicates.add(secondThingLabelLike);
-							}else if(interaction.getOperator().equals("!~")){
-								Predicate secondThingLabelNotLike = criteriaBuilder.notLike(criteriaBuilder.lower(secondThingLabel.<String>get("labelText")), '%' + interaction.getThingLabelText().toLowerCase() + '%');
+							} else if (interaction.getOperator().equals("!~")) {
+								Predicate secondThingLabelNotLike = criteriaBuilder.notLike(
+										criteriaBuilder.lower(secondThingLabel.<String>get("labelText")),
+										'%' + interaction.getThingLabelText().toLowerCase() + '%');
 								secondItxPredicates.add(secondThingLabelNotLike);
-							}else if(interaction.getOperator().equals(">")){
-								Predicate secondThingLabelGreaterThan = criteriaBuilder.greaterThan(secondThingLabel.<String>get("labelText"), interaction.getThingLabelText());
+							} else if (interaction.getOperator().equals(">")) {
+								Predicate secondThingLabelGreaterThan = criteriaBuilder.greaterThan(
+										secondThingLabel.<String>get("labelText"), interaction.getThingLabelText());
 								secondItxPredicates.add(secondThingLabelGreaterThan);
-							}else if(interaction.getOperator().equals(">=")){
-								Predicate secondThingLabelGreaterThan = criteriaBuilder.greaterThanOrEqualTo(secondThingLabel.<String>get("labelText"), interaction.getThingLabelText());
+							} else if (interaction.getOperator().equals(">=")) {
+								Predicate secondThingLabelGreaterThan = criteriaBuilder.greaterThanOrEqualTo(
+										secondThingLabel.<String>get("labelText"), interaction.getThingLabelText());
 								secondItxPredicates.add(secondThingLabelGreaterThan);
-							}else if(interaction.getOperator().equals("<")){
-								Predicate secondThingLabelLessThan = criteriaBuilder.lessThan(secondThingLabel.<String>get("labelText"), interaction.getThingLabelText());
+							} else if (interaction.getOperator().equals("<")) {
+								Predicate secondThingLabelLessThan = criteriaBuilder.lessThan(
+										secondThingLabel.<String>get("labelText"), interaction.getThingLabelText());
 								secondItxPredicates.add(secondThingLabelLessThan);
-							}else if(interaction.getOperator().equals("<=")){
-								Predicate secondThingLabelLessThan = criteriaBuilder.lessThanOrEqualTo(secondThingLabel.<String>get("labelText"), interaction.getThingLabelText());
+							} else if (interaction.getOperator().equals("<=")) {
+								Predicate secondThingLabelLessThan = criteriaBuilder.lessThanOrEqualTo(
+										secondThingLabel.<String>get("labelText"), interaction.getThingLabelText());
 								secondItxPredicates.add(secondThingLabelLessThan);
-							}else{
-								Predicate secondThingLabelLike = criteriaBuilder.like(criteriaBuilder.lower(secondThingLabel.<String>get("labelText")), '%' + interaction.getThingLabelText().toLowerCase() + '%');
+							} else {
+								Predicate secondThingLabelLike = criteriaBuilder.like(
+										criteriaBuilder.lower(secondThingLabel.<String>get("labelText")),
+										'%' + interaction.getThingLabelText().toLowerCase() + '%');
 								secondItxPredicates.add(secondThingLabelLike);
 							}
-						}else{
-							Predicate secondThingLabelLike = criteriaBuilder.like(criteriaBuilder.lower(secondThingLabel.<String>get("labelText")), '%' + interaction.getThingLabelText().toLowerCase() + '%');
+						} else {
+							Predicate secondThingLabelLike = criteriaBuilder.like(
+									criteriaBuilder.lower(secondThingLabel.<String>get("labelText")),
+									'%' + interaction.getThingLabelText().toLowerCase() + '%');
 							secondItxPredicates.add(secondThingLabelLike);
 						}
 					}
 				}
 				// Search for itxs values
-				if (interaction.getThingValues() != null){
-					for (ValueQueryDTO valueQuery : interaction.getThingValues()){
+				if (interaction.getThingValues() != null) {
+					for (ValueQueryDTO valueQuery : interaction.getThingValues()) {
 						List<Predicate> valuePredicatesList = new ArrayList<Predicate>();
 						Join<LsThing, LsThingState> state = secondThing.join("lsStates");
 						Join<LsThingState, LsThingValue> value = state.join("lsValues");
-						
+
 						Predicate stateNotIgn = criteriaBuilder.isFalse(state.<Boolean>get("ignored"));
 						Predicate valueNotIgn = criteriaBuilder.isFalse(value.<Boolean>get("ignored"));
 						valuePredicatesList.add(stateNotIgn);
 						valuePredicatesList.add(valueNotIgn);
-						
-						if (valueQuery.getStateType() != null){
-							Predicate stateType = criteriaBuilder.equal(state.<String>get("lsType"),valueQuery.getStateType());
+
+						if (valueQuery.getStateType() != null) {
+							Predicate stateType = criteriaBuilder.equal(state.<String>get("lsType"),
+									valueQuery.getStateType());
 							valuePredicatesList.add(stateType);
 						}
-						if (valueQuery.getStateKind() != null){
-							Predicate stateKind = criteriaBuilder.equal(state.<String>get("lsKind"),valueQuery.getStateKind());
+						if (valueQuery.getStateKind() != null) {
+							Predicate stateKind = criteriaBuilder.equal(state.<String>get("lsKind"),
+									valueQuery.getStateKind());
 							valuePredicatesList.add(stateKind);
 						}
-						if (valueQuery.getValueType() != null){
-							Predicate valueType = criteriaBuilder.equal(value.<String>get("lsType"),valueQuery.getValueType());
+						if (valueQuery.getValueType() != null) {
+							Predicate valueType = criteriaBuilder.equal(value.<String>get("lsType"),
+									valueQuery.getValueType());
 							valuePredicatesList.add(valueType);
 						}
-						if (valueQuery.getValueKind() != null){
-							Predicate valueKind = criteriaBuilder.equal(value.<String>get("lsKind"),valueQuery.getValueKind());
+						if (valueQuery.getValueKind() != null) {
+							Predicate valueKind = criteriaBuilder.equal(value.<String>get("lsKind"),
+									valueQuery.getValueKind());
 							valuePredicatesList.add(valueKind);
 						}
-						if (valueQuery.getValue() != null){
-							if (valueQuery.getValueType() == null){
+						if (valueQuery.getValue() != null) {
+							if (valueQuery.getValueType() == null) {
 								logger.error("valueType must be specified if value is specified!");
 								throw new Exception("valueType must be specified if value is specified!");
-							}else if (valueQuery.getValueType().equalsIgnoreCase("dateValue")){
+							} else if (valueQuery.getValueType().equalsIgnoreCase("dateValue")) {
 								Calendar cal = Calendar.getInstance(); // locale-specific
 								boolean parsedTime = false;
-								if (SimpleUtil.isNumeric(valueQuery.getValue())){
+								if (SimpleUtil.isNumeric(valueQuery.getValue())) {
 									cal.setTimeInMillis(Long.valueOf(valueQuery.getValue()));
 									parsedTime = true;
-								}else{
-									try{
+								} else {
+									try {
 										SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH);
 										cal.setTime(sdf.parse(valueQuery.getValue()));
 										parsedTime = true;
-									}catch (Exception e){
-										logger.warn("Failed to parse date in LsThing generic query for value",e);
+									} catch (Exception e) {
+										logger.warn("Failed to parse date in LsThing generic query for value", e);
 									}
 								}
-								if (parsedTime){
-									if (valueQuery.getOperator() != null && valueQuery.getOperator().equals(">")){
-										Predicate valueGreaterThan = criteriaBuilder.greaterThan(value.<Date>get("dateValue"), new Date(cal.getTimeInMillis()));
+								if (parsedTime) {
+									if (valueQuery.getOperator() != null && valueQuery.getOperator().equals(">")) {
+										Predicate valueGreaterThan = criteriaBuilder.greaterThan(
+												value.<Date>get("dateValue"), new Date(cal.getTimeInMillis()));
 										valuePredicatesList.add(valueGreaterThan);
-									}else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("<")){
-										Predicate valueLessThan = criteriaBuilder.lessThan(value.<Date>get("dateValue"), new Date(cal.getTimeInMillis()));
+									} else if (valueQuery.getOperator() != null
+											&& valueQuery.getOperator().equals("<")) {
+										Predicate valueLessThan = criteriaBuilder.lessThan(value.<Date>get("dateValue"),
+												new Date(cal.getTimeInMillis()));
 										valuePredicatesList.add(valueLessThan);
-									}else{
+									} else {
 										String postgresTimeUnit = "day";
-										Expression<Date> dateTruncExpr = criteriaBuilder.function("date_trunc", Date.class, criteriaBuilder.literal(postgresTimeUnit), value.<Date>get("dateValue"));
-										
+										Expression<Date> dateTruncExpr = criteriaBuilder.function("date_trunc",
+												Date.class, criteriaBuilder.literal(postgresTimeUnit),
+												value.<Date>get("dateValue"));
+
 										cal.set(Calendar.HOUR_OF_DAY, 0);
 										cal.set(Calendar.MINUTE, 0);
 										cal.set(Calendar.SECOND, 0);
@@ -2751,134 +3099,158 @@ else if (query.getRecordedDateLessThan() != null){
 										valuePredicatesList.add(valueLike);
 									}
 								}
-							}else if (valueQuery.getValueType().equalsIgnoreCase("numericValue")){
-								try{
+							} else if (valueQuery.getValueType().equalsIgnoreCase("numericValue")) {
+								try {
 									BigDecimal numberValue = new BigDecimal(valueQuery.getValue());
-									if (valueQuery.getOperator() != null && valueQuery.getOperator().equals(">")){
-										Predicate valueGreaterThan = criteriaBuilder.greaterThan(value.<BigDecimal>get("numericValue"), numberValue);
+									if (valueQuery.getOperator() != null && valueQuery.getOperator().equals(">")) {
+										Predicate valueGreaterThan = criteriaBuilder
+												.greaterThan(value.<BigDecimal>get("numericValue"), numberValue);
 										valuePredicatesList.add(valueGreaterThan);
-									}else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("<=")){
-										Predicate valueGreaterThan = criteriaBuilder.greaterThanOrEqualTo(value.<BigDecimal>get("numericValue"), numberValue);
+									} else if (valueQuery.getOperator() != null
+											&& valueQuery.getOperator().equals("<=")) {
+										Predicate valueGreaterThan = criteriaBuilder.greaterThanOrEqualTo(
+												value.<BigDecimal>get("numericValue"), numberValue);
 										valuePredicatesList.add(valueGreaterThan);
-									}else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("<")){
-										Predicate valueLessThan = criteriaBuilder.lessThan(value.<BigDecimal>get("numericValue"), numberValue);
+									} else if (valueQuery.getOperator() != null
+											&& valueQuery.getOperator().equals("<")) {
+										Predicate valueLessThan = criteriaBuilder
+												.lessThan(value.<BigDecimal>get("numericValue"), numberValue);
 										valuePredicatesList.add(valueLessThan);
-									}else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("<=")){
-										Predicate valueLessThan = criteriaBuilder.lessThanOrEqualTo(value.<BigDecimal>get("numericValue"), numberValue);
+									} else if (valueQuery.getOperator() != null
+											&& valueQuery.getOperator().equals("<=")) {
+										Predicate valueLessThan = criteriaBuilder
+												.lessThanOrEqualTo(value.<BigDecimal>get("numericValue"), numberValue);
 										valuePredicatesList.add(valueLessThan);
-									}else{
-										Predicate valueEquals = criteriaBuilder.equal(value.<BigDecimal>get("numericValue"), numberValue);
+									} else {
+										Predicate valueEquals = criteriaBuilder
+												.equal(value.<BigDecimal>get("numericValue"), numberValue);
 										valuePredicatesList.add(valueEquals);
 									}
-								} catch (NumberFormatException e){
-									logger.warn("Failed to parse number in LsThing generic query for value",e);
+								} catch (NumberFormatException e) {
+									logger.warn("Failed to parse number in LsThing generic query for value", e);
 									valuePredicatesList.add(criteriaBuilder.disjunction());
-		
+
+								}
+							} else {
+								// string value types: stringValue, codeValue, fileValue, clobValue
+								if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("=")) {
+									Predicate valueEquals = criteriaBuilder
+											.equal(value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
+									valuePredicatesList.add(valueEquals);
+								} else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("!=")) {
+									Predicate valueNotEquals = criteriaBuilder.notEqual(
+											value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
+									valuePredicatesList.add(valueNotEquals);
+								} else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("~")) {
+									Predicate valueLike = criteriaBuilder.like(
+											criteriaBuilder.lower(value.<String>get(valueQuery.getValueType())),
+											'%' + valueQuery.getValue().toLowerCase() + '%');
+									valuePredicatesList.add(valueLike);
+								} else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("!~")) {
+									Predicate valueNotLike = criteriaBuilder.notLike(
+											criteriaBuilder.lower(value.<String>get(valueQuery.getValueType())),
+											'%' + valueQuery.getValue().toLowerCase() + '%');
+									valuePredicatesList.add(valueNotLike);
+								} else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals(">")) {
+									Predicate valueGreaterThan = criteriaBuilder.greaterThan(
+											value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
+									valuePredicatesList.add(valueGreaterThan);
+								} else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals(">=")) {
+									Predicate valueGreaterThan = criteriaBuilder.greaterThanOrEqualTo(
+											value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
+									valuePredicatesList.add(valueGreaterThan);
+								} else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("<")) {
+									Predicate valueLessThan = criteriaBuilder.lessThan(
+											value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
+									valuePredicatesList.add(valueLessThan);
+								} else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("<=")) {
+									Predicate valueLessThan = criteriaBuilder.lessThanOrEqualTo(
+											value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
+									valuePredicatesList.add(valueLessThan);
+								} else {
+									Predicate valueLike = criteriaBuilder.like(
+											value.<String>get(valueQuery.getValueType()),
+											'%' + valueQuery.getValue() + '%');
+									valuePredicatesList.add(valueLike);
 								}
-						}else{
-							//string value types: stringValue, codeValue, fileValue, clobValue
-							if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("=")){
-								Predicate valueEquals = criteriaBuilder.equal(value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
-								valuePredicatesList.add(valueEquals);
-							}else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("!=")){
-								Predicate valueNotEquals = criteriaBuilder.notEqual(value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
-								valuePredicatesList.add(valueNotEquals);
-							}else if(valueQuery.getOperator() != null && valueQuery.getOperator().equals("~")){
-								Predicate valueLike = criteriaBuilder.like(criteriaBuilder.lower(value.<String>get(valueQuery.getValueType())), '%' + valueQuery.getValue().toLowerCase() + '%');
-								valuePredicatesList.add(valueLike);
-							}else if(valueQuery.getOperator() != null && valueQuery.getOperator().equals("!~")){
-								Predicate valueNotLike = criteriaBuilder.notLike(criteriaBuilder.lower(value.<String>get(valueQuery.getValueType())),  '%' + valueQuery.getValue().toLowerCase() + '%');
-								valuePredicatesList.add(valueNotLike);
-							}else if(valueQuery.getOperator() != null && valueQuery.getOperator().equals(">")){
-								Predicate valueGreaterThan = criteriaBuilder.greaterThan(value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
-								valuePredicatesList.add(valueGreaterThan);
-							}else if(valueQuery.getOperator() != null && valueQuery.getOperator().equals(">=")){
-								Predicate valueGreaterThan = criteriaBuilder.greaterThanOrEqualTo(value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
-								valuePredicatesList.add(valueGreaterThan);
-							}else if(valueQuery.getOperator() != null && valueQuery.getOperator().equals("<")){
-								Predicate valueLessThan = criteriaBuilder.lessThan(value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
-								valuePredicatesList.add(valueLessThan);
-							}else if(valueQuery.getOperator() != null && valueQuery.getOperator().equals("<=")){
-								Predicate valueLessThan = criteriaBuilder.lessThanOrEqualTo(value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
-								valuePredicatesList.add(valueLessThan);
-							}else{
-								Predicate valueLike = criteriaBuilder.like(value.<String>get(valueQuery.getValueType()), '%' + valueQuery.getValue() + '%');
-								valuePredicatesList.add(valueLike);
 							}
 						}
-						}
-						//gather predicates with AND
+						// gather predicates with AND
 						Predicate[] valuePredicates = new Predicate[0];
 						valuePredicates = valuePredicatesList.toArray(valuePredicates);
 						secondItxPredicates.add(criteriaBuilder.and(valuePredicates));
 					}
 				}
-				//gather interactions, AND between each within group, then OR on the two, then add to outer predicates
+				// gather interactions, AND between each within group, then OR on the two, then
+				// add to outer predicates
 				Predicate[] secondPredicates = new Predicate[0];
 				secondPredicates = secondItxPredicates.toArray(secondPredicates);
 				Predicate secondItxAndPredicates = criteriaBuilder.and(secondPredicates);
 				predicateList.add(secondItxAndPredicates);
 			}
 		}
-		
-		//values
-		if (query.getValues() != null){
-			for (ValueQueryDTO valueQuery : query.getValues()){
+
+		// values
+		if (query.getValues() != null) {
+			for (ValueQueryDTO valueQuery : query.getValues()) {
 				List<Predicate> valuePredicatesList = new ArrayList<Predicate>();
 				Join<LsThing, LsThingState> state = thing.join("lsStates");
 				Join<LsThingState, LsThingValue> value = state.join("lsValues");
-				
+
 				Predicate stateNotIgn = criteriaBuilder.isFalse(state.<Boolean>get("ignored"));
 				Predicate valueNotIgn = criteriaBuilder.isFalse(value.<Boolean>get("ignored"));
 				valuePredicatesList.add(stateNotIgn);
 				valuePredicatesList.add(valueNotIgn);
-				
-				if (valueQuery.getStateType() != null){
-					Predicate stateType = criteriaBuilder.equal(state.<String>get("lsType"),valueQuery.getStateType());
+
+				if (valueQuery.getStateType() != null) {
+					Predicate stateType = criteriaBuilder.equal(state.<String>get("lsType"), valueQuery.getStateType());
 					valuePredicatesList.add(stateType);
 				}
-				if (valueQuery.getStateKind() != null){
-					Predicate stateKind = criteriaBuilder.equal(state.<String>get("lsKind"),valueQuery.getStateKind());
+				if (valueQuery.getStateKind() != null) {
+					Predicate stateKind = criteriaBuilder.equal(state.<String>get("lsKind"), valueQuery.getStateKind());
 					valuePredicatesList.add(stateKind);
 				}
-				if (valueQuery.getValueType() != null){
-					Predicate valueType = criteriaBuilder.equal(value.<String>get("lsType"),valueQuery.getValueType());
+				if (valueQuery.getValueType() != null) {
+					Predicate valueType = criteriaBuilder.equal(value.<String>get("lsType"), valueQuery.getValueType());
 					valuePredicatesList.add(valueType);
 				}
-				if (valueQuery.getValueKind() != null){
-					Predicate valueKind = criteriaBuilder.equal(value.<String>get("lsKind"),valueQuery.getValueKind());
+				if (valueQuery.getValueKind() != null) {
+					Predicate valueKind = criteriaBuilder.equal(value.<String>get("lsKind"), valueQuery.getValueKind());
 					valuePredicatesList.add(valueKind);
 				}
-				if (valueQuery.getValue() != null){
-					if (valueQuery.getValueType() == null){
+				if (valueQuery.getValue() != null) {
+					if (valueQuery.getValueType() == null) {
 						logger.error("valueType must be specified if value is specified!");
 						throw new Exception("valueType must be specified if value is specified!");
-					}else if (valueQuery.getValueType().equalsIgnoreCase("dateValue")){
+					} else if (valueQuery.getValueType().equalsIgnoreCase("dateValue")) {
 						Calendar cal = Calendar.getInstance(); // locale-specific
 						boolean parsedTime = false;
-						if (SimpleUtil.isNumeric(valueQuery.getValue())){
+						if (SimpleUtil.isNumeric(valueQuery.getValue())) {
 							cal.setTimeInMillis(Long.valueOf(valueQuery.getValue()));
 							parsedTime = true;
-						}else{
-							try{
+						} else {
+							try {
 								SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH);
 								cal.setTime(sdf.parse(valueQuery.getValue()));
 								parsedTime = true;
-							}catch (Exception e){
-								logger.warn("Failed to parse date in LsThing generic query for value",e);
+							} catch (Exception e) {
+								logger.warn("Failed to parse date in LsThing generic query for value", e);
 							}
 						}
-						if (parsedTime){
-							if (valueQuery.getOperator() != null && valueQuery.getOperator().equals(">")){
-								Predicate valueGreaterThan = criteriaBuilder.greaterThan(value.<Date>get("dateValue"), new Date(cal.getTimeInMillis()));
+						if (parsedTime) {
+							if (valueQuery.getOperator() != null && valueQuery.getOperator().equals(">")) {
+								Predicate valueGreaterThan = criteriaBuilder.greaterThan(value.<Date>get("dateValue"),
+										new Date(cal.getTimeInMillis()));
 								valuePredicatesList.add(valueGreaterThan);
-							}else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("<")){
-								Predicate valueLessThan = criteriaBuilder.lessThan(value.<Date>get("dateValue"), new Date(cal.getTimeInMillis()));
+							} else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("<")) {
+								Predicate valueLessThan = criteriaBuilder.lessThan(value.<Date>get("dateValue"),
+										new Date(cal.getTimeInMillis()));
 								valuePredicatesList.add(valueLessThan);
-							}else{
+							} else {
 								String postgresTimeUnit = "day";
-								Expression<Date> dateTruncExpr = criteriaBuilder.function("date_trunc", Date.class, criteriaBuilder.literal(postgresTimeUnit), value.<Date>get("dateValue"));
-								
+								Expression<Date> dateTruncExpr = criteriaBuilder.function("date_trunc", Date.class,
+										criteriaBuilder.literal(postgresTimeUnit), value.<Date>get("dateValue"));
+
 								cal.set(Calendar.HOUR_OF_DAY, 0);
 								cal.set(Calendar.MINUTE, 0);
 								cal.set(Calendar.SECOND, 0);
@@ -2889,123 +3261,155 @@ else if (query.getRecordedDateLessThan() != null){
 								valuePredicatesList.add(valueLike);
 							}
 						}
-					}else if (valueQuery.getValueType().equalsIgnoreCase("numericValue")){
-						try{
+					} else if (valueQuery.getValueType().equalsIgnoreCase("numericValue")) {
+						try {
 							BigDecimal numberValue = new BigDecimal(valueQuery.getValue());
-							if (valueQuery.getOperator() != null && valueQuery.getOperator().equals(">")){
-								Predicate valueGreaterThan = criteriaBuilder.greaterThan(value.<BigDecimal>get("numericValue"), numberValue);
+							if (valueQuery.getOperator() != null && valueQuery.getOperator().equals(">")) {
+								Predicate valueGreaterThan = criteriaBuilder
+										.greaterThan(value.<BigDecimal>get("numericValue"), numberValue);
 								valuePredicatesList.add(valueGreaterThan);
-							}else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("<=")){
-								Predicate valueGreaterThan = criteriaBuilder.greaterThanOrEqualTo(value.<BigDecimal>get("numericValue"), numberValue);
+							} else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("<=")) {
+								Predicate valueGreaterThan = criteriaBuilder
+										.greaterThanOrEqualTo(value.<BigDecimal>get("numericValue"), numberValue);
 								valuePredicatesList.add(valueGreaterThan);
-							}else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("<")){
-								Predicate valueLessThan = criteriaBuilder.lessThan(value.<BigDecimal>get("numericValue"), numberValue);
+							} else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("<")) {
+								Predicate valueLessThan = criteriaBuilder
+										.lessThan(value.<BigDecimal>get("numericValue"), numberValue);
 								valuePredicatesList.add(valueLessThan);
-							}else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("<=")){
-								Predicate valueLessThan = criteriaBuilder.lessThanOrEqualTo(value.<BigDecimal>get("numericValue"), numberValue);
+							} else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("<=")) {
+								Predicate valueLessThan = criteriaBuilder
+										.lessThanOrEqualTo(value.<BigDecimal>get("numericValue"), numberValue);
 								valuePredicatesList.add(valueLessThan);
-							}else{
-								Predicate valueEquals = criteriaBuilder.equal(value.<BigDecimal>get("numericValue"), numberValue);
+							} else {
+								Predicate valueEquals = criteriaBuilder.equal(value.<BigDecimal>get("numericValue"),
+										numberValue);
 								valuePredicatesList.add(valueEquals);
 							}
-						} catch (NumberFormatException e){
-							logger.warn("Failed to parse number in LsThing generic query for value",e);
+						} catch (NumberFormatException e) {
+							logger.warn("Failed to parse number in LsThing generic query for value", e);
 							valuePredicatesList.add(criteriaBuilder.disjunction());
 
 						}
-				}else{
-					//string value types: stringValue, codeValue, fileValue, clobValue
-					if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("=")){
-						Predicate valueEquals = criteriaBuilder.equal(value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
-						valuePredicatesList.add(valueEquals);
-					}else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("!=")){
-						Predicate valueNotEquals = criteriaBuilder.notEqual(value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
-						valuePredicatesList.add(valueNotEquals);
-					}else if(valueQuery.getOperator() != null && valueQuery.getOperator().equals("~")){
-						Predicate valueLike = criteriaBuilder.like(criteriaBuilder.lower(value.<String>get(valueQuery.getValueType())), '%' + valueQuery.getValue().toLowerCase() + '%');
-						valuePredicatesList.add(valueLike);
-					}else if(valueQuery.getOperator() != null && valueQuery.getOperator().equals("!~")){
-						Predicate valueNotLike = criteriaBuilder.notLike(criteriaBuilder.lower(value.<String>get(valueQuery.getValueType())),  '%' + valueQuery.getValue().toLowerCase() + '%');
-						valuePredicatesList.add(valueNotLike);
-					}else if(valueQuery.getOperator() != null && valueQuery.getOperator().equals(">")){
-						Predicate valueGreaterThan = criteriaBuilder.greaterThan(value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
-						valuePredicatesList.add(valueGreaterThan);
-					}else if(valueQuery.getOperator() != null && valueQuery.getOperator().equals(">=")){
-						Predicate valueGreaterThan = criteriaBuilder.greaterThanOrEqualTo(value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
-						valuePredicatesList.add(valueGreaterThan);
-					}else if(valueQuery.getOperator() != null && valueQuery.getOperator().equals("<")){
-						Predicate valueLessThan = criteriaBuilder.lessThan(value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
-						valuePredicatesList.add(valueLessThan);
-					}else if(valueQuery.getOperator() != null && valueQuery.getOperator().equals("<=")){
-						Predicate valueLessThan = criteriaBuilder.lessThanOrEqualTo(value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
-						valuePredicatesList.add(valueLessThan);
-					}else{
-						Predicate valueLike = criteriaBuilder.like(value.<String>get(valueQuery.getValueType()), '%' + valueQuery.getValue() + '%');
-						valuePredicatesList.add(valueLike);
+					} else {
+						// string value types: stringValue, codeValue, fileValue, clobValue
+						if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("=")) {
+							Predicate valueEquals = criteriaBuilder.equal(value.<String>get(valueQuery.getValueType()),
+									valueQuery.getValue());
+							valuePredicatesList.add(valueEquals);
+						} else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("!=")) {
+							Predicate valueNotEquals = criteriaBuilder
+									.notEqual(value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
+							valuePredicatesList.add(valueNotEquals);
+						} else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("~")) {
+							Predicate valueLike = criteriaBuilder.like(
+									criteriaBuilder.lower(value.<String>get(valueQuery.getValueType())),
+									'%' + valueQuery.getValue().toLowerCase() + '%');
+							valuePredicatesList.add(valueLike);
+						} else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("!~")) {
+							Predicate valueNotLike = criteriaBuilder.notLike(
+									criteriaBuilder.lower(value.<String>get(valueQuery.getValueType())),
+									'%' + valueQuery.getValue().toLowerCase() + '%');
+							valuePredicatesList.add(valueNotLike);
+						} else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals(">")) {
+							Predicate valueGreaterThan = criteriaBuilder
+									.greaterThan(value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
+							valuePredicatesList.add(valueGreaterThan);
+						} else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals(">=")) {
+							Predicate valueGreaterThan = criteriaBuilder.greaterThanOrEqualTo(
+									value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
+							valuePredicatesList.add(valueGreaterThan);
+						} else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("<")) {
+							Predicate valueLessThan = criteriaBuilder
+									.lessThan(value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
+							valuePredicatesList.add(valueLessThan);
+						} else if (valueQuery.getOperator() != null && valueQuery.getOperator().equals("<=")) {
+							Predicate valueLessThan = criteriaBuilder.lessThanOrEqualTo(
+									value.<String>get(valueQuery.getValueType()), valueQuery.getValue());
+							valuePredicatesList.add(valueLessThan);
+						} else {
+							Predicate valueLike = criteriaBuilder.like(value.<String>get(valueQuery.getValueType()),
+									'%' + valueQuery.getValue() + '%');
+							valuePredicatesList.add(valueLike);
+						}
 					}
 				}
-				}
-				//gather predicates with AND
+				// gather predicates with AND
 				Predicate[] valuePredicates = new Predicate[0];
 				valuePredicates = valuePredicatesList.toArray(valuePredicates);
 				predicateList.add(criteriaBuilder.and(valuePredicates));
 			}
 		}
-		//labels
-		if (query.getLabels() != null){
-			for (LabelQueryDTO queryLabel : query.getLabels()){
+		// labels
+		if (query.getLabels() != null) {
+			for (LabelQueryDTO queryLabel : query.getLabels()) {
 				Join<LsThing, LsThingLabel> label = thing.join("lsLabels");
 				List<Predicate> labelPredicatesList = new ArrayList<Predicate>();
-				if (queryLabel.getLabelType() != null){
+				if (queryLabel.getLabelType() != null) {
 					Predicate labelType = criteriaBuilder.equal(label.<String>get("lsType"), queryLabel.getLabelType());
 					labelPredicatesList.add(labelType);
 				}
-				if (queryLabel.getLabelKind() != null){
+				if (queryLabel.getLabelKind() != null) {
 					Predicate labelKind = criteriaBuilder.equal(label.<String>get("lsKind"), queryLabel.getLabelKind());
 					labelPredicatesList.add(labelKind);
 				}
-				if (queryLabel.getLabelText() != null){
-					if (queryLabel.getOperator() != null){
-						if ( queryLabel.getOperator().equals("=")){
-							Predicate labelEquals = criteriaBuilder.equal(label.<String>get("labelText"), queryLabel.getLabelText());
+				if (queryLabel.getLabelText() != null) {
+					if (queryLabel.getOperator() != null) {
+						if (queryLabel.getOperator().equals("=")) {
+							Predicate labelEquals = criteriaBuilder.equal(label.<String>get("labelText"),
+									queryLabel.getLabelText());
 							labelPredicatesList.add(labelEquals);
-						} else if ( queryLabel.getOperator().equalsIgnoreCase("equals")){
-							Predicate labelEquals = criteriaBuilder.equal(label.<String>get("labelText"), queryLabel.getLabelText());
+						} else if (queryLabel.getOperator().equalsIgnoreCase("equals")) {
+							Predicate labelEquals = criteriaBuilder.equal(label.<String>get("labelText"),
+									queryLabel.getLabelText());
 							labelPredicatesList.add(labelEquals);
-						}else if (queryLabel.getOperator().equals("!=")){
-							Predicate labelNotEquals = criteriaBuilder.notEqual(label.<String>get("labelText"), queryLabel.getLabelText());
+						} else if (queryLabel.getOperator().equals("!=")) {
+							Predicate labelNotEquals = criteriaBuilder.notEqual(label.<String>get("labelText"),
+									queryLabel.getLabelText());
 							labelPredicatesList.add(labelNotEquals);
-						}else if(queryLabel.getOperator().equals("~")){
-							Predicate labelLike = criteriaBuilder.like(criteriaBuilder.lower(label.<String>get("labelText")), '%' + queryLabel.getLabelText().toLowerCase() + '%');
+						} else if (queryLabel.getOperator().equals("~")) {
+							Predicate labelLike = criteriaBuilder.like(
+									criteriaBuilder.lower(label.<String>get("labelText")),
+									'%' + queryLabel.getLabelText().toLowerCase() + '%');
 							labelPredicatesList.add(labelLike);
-						}else if(queryLabel.getOperator().equalsIgnoreCase("like")){
-							Predicate labelLike = criteriaBuilder.like(criteriaBuilder.lower(label.<String>get("labelText")), '%' + queryLabel.getLabelText().toLowerCase() + '%');
+						} else if (queryLabel.getOperator().equalsIgnoreCase("like")) {
+							Predicate labelLike = criteriaBuilder.like(
+									criteriaBuilder.lower(label.<String>get("labelText")),
+									'%' + queryLabel.getLabelText().toLowerCase() + '%');
 							labelPredicatesList.add(labelLike);
-						}else if(queryLabel.getOperator().equals("!~")){
-							Predicate labelNotLike = criteriaBuilder.notLike(criteriaBuilder.lower(label.<String>get("labelText")), '%' + queryLabel.getLabelText().toLowerCase() + '%');
+						} else if (queryLabel.getOperator().equals("!~")) {
+							Predicate labelNotLike = criteriaBuilder.notLike(
+									criteriaBuilder.lower(label.<String>get("labelText")),
+									'%' + queryLabel.getLabelText().toLowerCase() + '%');
 							labelPredicatesList.add(labelNotLike);
-						}else if(queryLabel.getOperator().equals(">")){
-							Predicate labelGreaterThan = criteriaBuilder.greaterThan(label.<String>get("labelText"), queryLabel.getLabelText());
+						} else if (queryLabel.getOperator().equals(">")) {
+							Predicate labelGreaterThan = criteriaBuilder.greaterThan(label.<String>get("labelText"),
+									queryLabel.getLabelText());
 							labelPredicatesList.add(labelGreaterThan);
-						}else if(queryLabel.getOperator().equals(">=")){
-							Predicate labelGreaterThan = criteriaBuilder.greaterThanOrEqualTo(label.<String>get("labelText"), queryLabel.getLabelText());
+						} else if (queryLabel.getOperator().equals(">=")) {
+							Predicate labelGreaterThan = criteriaBuilder
+									.greaterThanOrEqualTo(label.<String>get("labelText"), queryLabel.getLabelText());
 							labelPredicatesList.add(labelGreaterThan);
-						}else if(queryLabel.getOperator().equals("<")){
-							Predicate labelLessThan = criteriaBuilder.lessThan(label.<String>get("labelText"), queryLabel.getLabelText());
+						} else if (queryLabel.getOperator().equals("<")) {
+							Predicate labelLessThan = criteriaBuilder.lessThan(label.<String>get("labelText"),
+									queryLabel.getLabelText());
 							labelPredicatesList.add(labelLessThan);
-						}else if(queryLabel.getOperator().equals("<=")){
-							Predicate labelLessThan = criteriaBuilder.lessThanOrEqualTo(label.<String>get("labelText"), queryLabel.getLabelText());
+						} else if (queryLabel.getOperator().equals("<=")) {
+							Predicate labelLessThan = criteriaBuilder.lessThanOrEqualTo(label.<String>get("labelText"),
+									queryLabel.getLabelText());
 							labelPredicatesList.add(labelLessThan);
-						}else{
-							Predicate labelLike = criteriaBuilder.like(criteriaBuilder.lower(label.<String>get("labelText")), '%' + queryLabel.getLabelText().toLowerCase() + '%');
+						} else {
+							Predicate labelLike = criteriaBuilder.like(
+									criteriaBuilder.lower(label.<String>get("labelText")),
+									'%' + queryLabel.getLabelText().toLowerCase() + '%');
 							labelPredicatesList.add(labelLike);
 						}
-					}else{
-						Predicate labelLike = criteriaBuilder.like(label.<String>get("labelText"), '%' + queryLabel.getLabelText() + '%');
+					} else {
+						Predicate labelLike = criteriaBuilder.like(label.<String>get("labelText"),
+								'%' + queryLabel.getLabelText() + '%');
 						labelPredicatesList.add(labelLike);
 					}
 				}
-				//gather labels
+				// gather labels
 				Predicate[] labelPredicates = new Predicate[0];
 				labelPredicates = labelPredicatesList.toArray(labelPredicates);
 				predicateList.add(criteriaBuilder.and(labelPredicates));
@@ -3014,172 +3418,177 @@ else if (query.getRecordedDateLessThan() != null){
 		return predicateList;
 	}
 
-
-
 	@Override
 	public Collection<Long> searchLsThingIdsByBrowserQueryDTO(
-			LsThingBrowserQueryDTO query) throws Exception{
-		List<Long> lsThingIdList = new ArrayList<Long>();	
+			LsThingBrowserQueryDTO query) throws Exception {
+		List<Long> lsThingIdList = new ArrayList<Long>();
 		EntityManager em = LsThing.entityManager();
 		CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
 		CriteriaQuery<Long> criteria = criteriaBuilder.createQuery(Long.class);
 		Root<LsThing> thing = criteria.from(LsThing.class);
 		List<Predicate> metaPredicateList = new ArrayList<Predicate>();
-		//root lsThing properties
+		// root lsThing properties
 		metaPredicateList.add(criteriaBuilder.isFalse(thing.<Boolean>get("ignored")));
 
-		//split query string into terms
+		// split query string into terms
 		String queryString = query.getQueryString();
-		if(queryString != null) {
+		if (queryString != null) {
 			queryString = query.getQueryString().replaceAll("\\*", "%");
 			List<String> splitQuery = SimpleUtil.splitSearchString(queryString);
 			logger.debug("Number of search terms: " + splitQuery.size());
-			//for each search term, construct a queryDTO with that term filled in every search position of the passed in queryDTO
-			for (String searchTerm : splitQuery){
+			// for each search term, construct a queryDTO with that term filled in every
+			// search position of the passed in queryDTO
+			for (String searchTerm : splitQuery) {
 				LsThingQueryDTO queryDTO = new LsThingQueryDTO(query.getQueryDTO());
-				if (queryDTO.getFirstInteractions() != null){
-					for (ItxQueryDTO itx : queryDTO.getFirstInteractions()){
+				if (queryDTO.getFirstInteractions() != null) {
+					for (ItxQueryDTO itx : queryDTO.getFirstInteractions()) {
 						itx.setThingLabelText(searchTerm);
 					}
 				}
-				if (queryDTO.getSecondInteractions() != null){
-					for (ItxQueryDTO itx : queryDTO.getSecondInteractions()){
+				if (queryDTO.getSecondInteractions() != null) {
+					for (ItxQueryDTO itx : queryDTO.getSecondInteractions()) {
 						itx.setThingLabelText(searchTerm);
 					}
 				}
-				if (queryDTO.getValues() != null){
-					for (ValueQueryDTO value : queryDTO.getValues()){
+				if (queryDTO.getValues() != null) {
+					for (ValueQueryDTO value : queryDTO.getValues()) {
 						value.setValue(searchTerm);
 					}
 				}
-				if (queryDTO.getLabels() != null){
-					for (LabelQueryDTO label : queryDTO.getLabels()){
+				if (queryDTO.getLabels() != null) {
+					for (LabelQueryDTO label : queryDTO.getLabels()) {
 						label.setLabelText(searchTerm);
 					}
 				}
-				if(queryDTO.getCodeName() != null) {
+				if (queryDTO.getCodeName() != null) {
 					queryDTO.getCodeName().setCodeName(searchTerm);
 				}
-					
-				//get a list of predicates for that queryDTO, OR them all together, then add to the meta list
+
+				// get a list of predicates for that queryDTO, OR them all together, then add to
+				// the meta list
 				List<Predicate> predicateList = buildPredicatesForQueryDTO(criteriaBuilder, criteria, thing, queryDTO);
 				Predicate[] predicates = new Predicate[0];
 				predicates = predicateList.toArray(predicates);
 				Predicate searchTermPredicate;
-				if(queryDTO.getCombineTermsWithAnd()) {
-					//join all the predicatesByTerm with AND
+				if (queryDTO.getCombineTermsWithAnd()) {
+					// join all the predicatesByTerm with AND
 					searchTermPredicate = criteriaBuilder.and(predicates);
 				} else {
-					//join all the predicatesByTerm with OR
+					// join all the predicatesByTerm with OR
 					searchTermPredicate = criteriaBuilder.or(predicates);
 				}
 				metaPredicateList.add(searchTermPredicate);
 			}
 		} else {
-			//If a value, label or code name is already set in the search (without a search term)
-			//Then searching using the passed in value into the dto
+			// If a value, label or code name is already set in the search (without a search
+			// term)
+			// Then searching using the passed in value into the dto
 			LsThingQueryDTO queryDTO = new LsThingQueryDTO(query.getQueryDTO());
 			Boolean hasCriteria = false;
-			if (queryDTO.getFirstInteractions() != null){
+			if (queryDTO.getFirstInteractions() != null) {
 				List<ItxQueryDTO> firstInteractions = new ArrayList<ItxQueryDTO>();
-				for (ItxQueryDTO itx : queryDTO.getFirstInteractions()){
-					if(itx.getThingLabelText() != null | itx.getThingCodeName() != null | (itx.getThingValues() != null && itx.getThingValues().size() > 0)) {
+				for (ItxQueryDTO itx : queryDTO.getFirstInteractions()) {
+					if (itx.getThingLabelText() != null | itx.getThingCodeName() != null
+							| (itx.getThingValues() != null && itx.getThingValues().size() > 0)) {
 						firstInteractions.add(itx);
 						hasCriteria = true;
 					}
 				}
 				queryDTO.setFirstInteractions(firstInteractions);
 			}
-			if (queryDTO.getSecondInteractions() != null){
+			if (queryDTO.getSecondInteractions() != null) {
 				List<ItxQueryDTO> secondInteractions = new ArrayList<ItxQueryDTO>();
-				for (ItxQueryDTO itx : queryDTO.getSecondInteractions()){
-					if(itx.getThingLabelText() != null | itx.getThingCodeName() != null | (itx.getThingValues() != null && itx.getThingValues().size() > 0)) {
+				for (ItxQueryDTO itx : queryDTO.getSecondInteractions()) {
+					if (itx.getThingLabelText() != null | itx.getThingCodeName() != null
+							| (itx.getThingValues() != null && itx.getThingValues().size() > 0)) {
 						secondInteractions.add(itx);
 						hasCriteria = true;
 					}
 				}
 				queryDTO.setSecondInteractions(secondInteractions);
 			}
-			if (queryDTO.getValues() != null){
+			if (queryDTO.getValues() != null) {
 				List<ValueQueryDTO> values = new ArrayList<ValueQueryDTO>();
-				for (ValueQueryDTO value : queryDTO.getValues()){
-					if(value.getValue() != null) {
+				for (ValueQueryDTO value : queryDTO.getValues()) {
+					if (value.getValue() != null) {
 						values.add(value);
 						hasCriteria = true;
 					}
 				}
 				queryDTO.setValues(values);
 			}
-			if (queryDTO.getLabels() != null){
+			if (queryDTO.getLabels() != null) {
 				List<LabelQueryDTO> labels = new ArrayList<LabelQueryDTO>();
-				for (LabelQueryDTO label : queryDTO.getLabels()){
-					if(label.getLabelText() != null) {
+				for (LabelQueryDTO label : queryDTO.getLabels()) {
+					if (label.getLabelText() != null) {
 						labels.add(label);
 						hasCriteria = true;
 					}
 				}
 				queryDTO.setLabels(labels);
 			}
-			if(queryDTO.getCodeName() != null && queryDTO.getCodeName().getCodeName() != null) {
+			if (queryDTO.getCodeName() != null && queryDTO.getCodeName().getCodeName() != null) {
 				hasCriteria = true;
 			}
-			if(hasCriteria) {
-			//get a list of predicates for that queryDTO, OR them all together, then add to the meta list
+			if (hasCriteria) {
+				// get a list of predicates for that queryDTO, OR them all together, then add to
+				// the meta list
 				List<Predicate> predicateList = buildPredicatesForQueryDTO(criteriaBuilder, criteria, thing, queryDTO);
 				Predicate[] predicates = new Predicate[0];
 				predicates = predicateList.toArray(predicates);
 				Predicate searchTermPredicate;
 
-				if(queryDTO.getCombineTermsWithAnd()) {
-					//join all the predicatesByTerm with AND
+				if (queryDTO.getCombineTermsWithAnd()) {
+					// join all the predicatesByTerm with AND
 					searchTermPredicate = criteriaBuilder.and(predicates);
 				} else {
-					//join all the predicatesByTerm with OR
+					// join all the predicatesByTerm with OR
 					searchTermPredicate = criteriaBuilder.or(predicates);
 				}
 				metaPredicateList.add(searchTermPredicate);
 			}
 		}
 
-
-
-
-		//add in thingType and thingKind as required at top level
-		if (query.getQueryDTO().getLsType() != null){
+		// add in thingType and thingKind as required at top level
+		if (query.getQueryDTO().getLsType() != null) {
 			Predicate thingType = criteriaBuilder.equal(thing.<String>get("lsType"), query.getQueryDTO().getLsType());
 			metaPredicateList.add(thingType);
 		}
-		if (query.getQueryDTO().getLsKind() != null){
+		if (query.getQueryDTO().getLsKind() != null) {
 			Predicate thingKind = criteriaBuilder.equal(thing.<String>get("lsKind"), query.getQueryDTO().getLsKind());
 			metaPredicateList.add(thingKind);
 		}
-		//gather the predicates for each search term, and AND them all together
+		// gather the predicates for each search term, and AND them all together
 		Predicate[] metaPredicates = new Predicate[0];
 		metaPredicates = metaPredicateList.toArray(metaPredicates);
 		criteria.where(criteriaBuilder.and(metaPredicates));
 		TypedQuery<Long> q = em.createQuery(criteria);
 		logger.debug(q.unwrap(org.hibernate.Query.class).getQueryString());
 		lsThingIdList = q.getResultList();
-		logger.debug("Found "+lsThingIdList.size()+" results.");
+		logger.debug("Found " + lsThingIdList.size() + " results.");
 		return lsThingIdList;
 	}
 
-
 	@Override
 	public Collection<LsThing> structureSearch(String queryMol, SearchType searchType, Integer maxResults,
 			Float similarity) {
 		// TODO Auto-generated method stub
 		return null;
 	}
-	
+
 	@Override
 	public Collection<String> getLsThingCodesByDateValueComparison(
 			DateValueComparisonRequest requestDTO) throws Exception {
-		if (requestDTO.getStateType() == null || requestDTO.getStateType().length() == 0) throw new Exception("Must provide stateType");
-		if (requestDTO.getStateKind() == null || requestDTO.getStateKind().length() == 0) throw new Exception("Must provide stateKind");
-		if (requestDTO.getValueKind() == null || requestDTO.getValueKind().length() == 0) throw new Exception("Must provide valueKind");
-		if (requestDTO.getSecondsDelta() == null) throw new Exception("Must provide secondsDelta");
-		if (requestDTO.getNewerThanModified() == null) requestDTO.setNewerThanModified(false);
+		if (requestDTO.getStateType() == null || requestDTO.getStateType().length() == 0)
+			throw new Exception("Must provide stateType");
+		if (requestDTO.getStateKind() == null || requestDTO.getStateKind().length() == 0)
+			throw new Exception("Must provide stateKind");
+		if (requestDTO.getValueKind() == null || requestDTO.getValueKind().length() == 0)
+			throw new Exception("Must provide valueKind");
+		if (requestDTO.getSecondsDelta() == null)
+			throw new Exception("Must provide secondsDelta");
+		if (requestDTO.getNewerThanModified() == null)
+			requestDTO.setNewerThanModified(false);
 		EntityManager em = LsThing.entityManager();
 		String query = "SELECT new Map( lsThing.codeName AS codeName, lsThing.modifiedDate AS modifiedDate, lsThing.recordedDate as recordedDate, value.dateValue AS dateValue )"
 				+ "FROM LsThing AS lsThing "
@@ -3191,43 +3600,48 @@ public Collection<String> getLsThingCodesByDateValueComparison(
 				+ "WITH value.ignored = false "
 				+ "AND value.lsType = :valueType "
 				+ "AND value.lsKind = :valueKind "
-				+ "WHERE lsThing.ignored = false "
-				;
-		if (requestDTO.getLsType() != null && requestDTO.getLsType().length()>0) query += "AND lsThing.lsType = :lsThingType ";
-		if (requestDTO.getLsKind() != null && requestDTO.getLsKind().length()>0) query += "AND lsThing.lsKind = :lsThingKind ";
-		
+				+ "WHERE lsThing.ignored = false ";
+		if (requestDTO.getLsType() != null && requestDTO.getLsType().length() > 0)
+			query += "AND lsThing.lsType = :lsThingType ";
+		if (requestDTO.getLsKind() != null && requestDTO.getLsKind().length() > 0)
+			query += "AND lsThing.lsKind = :lsThingKind ";
+
 		TypedQuery<Map> q = em.createQuery(query, Map.class);
 		q.setParameter("stateType", requestDTO.getStateType());
 		q.setParameter("stateKind", requestDTO.getStateKind());
 		q.setParameter("valueType", "dateValue");
 		q.setParameter("valueKind", requestDTO.getValueKind());
-		if (requestDTO.getLsType() != null && requestDTO.getLsType().length()>0) q.setParameter("lsThingType", requestDTO.getLsType());
-		if (requestDTO.getLsKind() != null && requestDTO.getLsKind().length()>0) q.setParameter("lsThingKind", requestDTO.getLsKind());
-		
+		if (requestDTO.getLsType() != null && requestDTO.getLsType().length() > 0)
+			q.setParameter("lsThingType", requestDTO.getLsType());
+		if (requestDTO.getLsKind() != null && requestDTO.getLsKind().length() > 0)
+			q.setParameter("lsThingKind", requestDTO.getLsKind());
+
 		Collection<Map> resultMaps = q.getResultList();
 		Collection<String> lsThingCodes = new HashSet<String>();
-		for (Map resultMap : resultMaps){
-			if (resultMap.get("dateValue") == null) lsThingCodes.add((String) resultMap.get("codeName"));
-			else{
+		for (Map resultMap : resultMaps) {
+			if (resultMap.get("dateValue") == null)
+				lsThingCodes.add((String) resultMap.get("codeName"));
+			else {
 				Date dateValue = (Date) resultMap.get("dateValue");
 				Date modifiedDate;
-				if (resultMap.get("modifiedDate") == null){
+				if (resultMap.get("modifiedDate") == null) {
 					modifiedDate = (Date) resultMap.get("recordedDate");
-				}else{
+				} else {
 					modifiedDate = (Date) resultMap.get("modifiedDate");
 				}
 				Integer secondsDelta = requestDTO.getSecondsDelta();
-				logger.debug("dateValue: "+dateValue.getTime());
-				logger.debug("modifiedDate: "+modifiedDate.getTime());
-				if (requestDTO.getNewerThanModified()){
-					if (dateValue.getTime() - secondsDelta*1000 >  modifiedDate.getTime()) lsThingCodes.add((String) resultMap.get("codeName"));
-				}else{
-					if (dateValue.getTime() + secondsDelta*1000 <  modifiedDate.getTime()) lsThingCodes.add((String) resultMap.get("codeName"));
+				logger.debug("dateValue: " + dateValue.getTime());
+				logger.debug("modifiedDate: " + modifiedDate.getTime());
+				if (requestDTO.getNewerThanModified()) {
+					if (dateValue.getTime() - secondsDelta * 1000 > modifiedDate.getTime())
+						lsThingCodes.add((String) resultMap.get("codeName"));
+				} else {
+					if (dateValue.getTime() + secondsDelta * 1000 < modifiedDate.getTime())
+						lsThingCodes.add((String) resultMap.get("codeName"));
 				}
 			}
 		}
 		return lsThingCodes;
 	}
-	
-	
+
 }
diff --git a/src/main/java/com/labsynch/labseer/service/LsThingStateServiceImpl.java b/src/main/java/com/labsynch/labseer/service/LsThingStateServiceImpl.java
index a77f3693e..d50334e15 100644
--- a/src/main/java/com/labsynch/labseer/service/LsThingStateServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/LsThingStateServiceImpl.java
@@ -25,36 +25,37 @@
 public class LsThingStateServiceImpl implements LsThingStateService {
 
 	private static final Logger logger = LoggerFactory.getLogger(LsThingStateServiceImpl.class);
-	
+
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
 
 	@Override
 	public Collection<LsThingState> ignoreAllLsThingStates(Collection<LsThingState> lsThingStates) {
-		//mark lsThingStates and values as ignore 
+		// mark lsThingStates and values as ignore
 		Collection<LsThingState> lsThingStateSet = new HashSet<LsThingState>();
-		for (LsThingState queryLsThingState : lsThingStates){
-			LsThingState lsThingState = LsThingState.findLsThingState(queryLsThingState.getId());			
-				for(LsThingValue lsThingValue : LsThingValue.findLsThingValuesByLsState(lsThingState).getResultList()){
-					lsThingValue.setIgnored(true);
-					lsThingValue.merge();
-				}
-				lsThingState.setIgnored(true);
-				lsThingState.merge();
-				lsThingStateSet.add(LsThingState.findLsThingState(lsThingState.getId()));
+		for (LsThingState queryLsThingState : lsThingStates) {
+			LsThingState lsThingState = LsThingState.findLsThingState(queryLsThingState.getId());
+			for (LsThingValue lsThingValue : LsThingValue.findLsThingValuesByLsState(lsThingState).getResultList()) {
+				lsThingValue.setIgnored(true);
+				lsThingValue.merge();
+			}
+			lsThingState.setIgnored(true);
+			lsThingState.merge();
+			lsThingStateSet.add(LsThingState.findLsThingState(lsThingState.getId()));
 		}
 
-		return(lsThingStateSet);
+		return (lsThingStateSet);
 
 	}
 
 	@Override
 	public List<LsThingState> getLsThingStatesByLsThingIdAndStateTypeKind(
 			Long lsThingId, String stateType, String stateKind) {
-		
-			List<LsThingState> lsThingStates = LsThingState.findLsThingStatesByLsThingIDAndStateTypeKind(lsThingId, stateType, stateKind).getResultList();
 
-			return lsThingStates;
+		List<LsThingState> lsThingStates = LsThingState
+				.findLsThingStatesByLsThingIDAndStateTypeKind(lsThingId, stateType, stateKind).getResultList();
+
+		return lsThingStates;
 	}
 
 	@Override
@@ -73,10 +74,10 @@ public LsThingState createLsThingStateByLsThingIdAndStateTypeKind(
 	@Override
 	public LsThingState saveLsThingState(
 			LsThingState lsThingState) {
-		lsThingState.setLsThing(LsThing.findLsThing(lsThingState.getLsThing().getId()));		
+		lsThingState.setLsThing(LsThing.findLsThing(lsThingState.getLsThing().getId()));
 		lsThingState.persist();
 		Set<LsThingValue> savedValues = new HashSet<LsThingValue>();
-		for (LsThingValue lsThingValue : lsThingState.getLsValues()){
+		for (LsThingValue lsThingValue : lsThingState.getLsValues()) {
 			lsThingValue.setLsState(lsThingState);
 			lsThingValue.persist();
 			savedValues.add(lsThingValue);
@@ -89,12 +90,12 @@ public LsThingState saveLsThingState(
 	@Override
 	public Collection<LsThingState> saveLsThingStates(
 			Collection<LsThingState> lsThingStates) {
-		for (LsThingState lsThingState: lsThingStates) {
+		for (LsThingState lsThingState : lsThingStates) {
 			lsThingState = saveLsThingState(lsThingState);
 		}
 		return lsThingStates;
 	}
-	
+
 	@Override
 	public LsThingState updateLsThingState(
 			LsThingState lsThingState) {
@@ -106,21 +107,21 @@ public LsThingState updateLsThingState(
 	@Override
 	public Collection<LsThingState> updateLsThingStates(
 			Collection<LsThingState> lsThingStates) {
-		for (LsThingState lsThingState : lsThingStates){
+		for (LsThingState lsThingState : lsThingStates) {
 			lsThingState = updateLsThingState(lsThingState);
 		}
 		return null;
 	}
-	
+
 	@Override
 	public LsThingState getLsThingState(String idOrCodeName,
 			String stateType, String stateKind) {
 		LsThingState state = null;
-		try{
+		try {
 			Collection<LsThingState> states = getLsThingStates(idOrCodeName, stateType, stateKind);
 			state = states.iterator().next();
-		}catch (Exception e){
-			logger.error("Caught error "+e.toString()+" trying to find a state.",e);
+		} catch (Exception e) {
+			logger.error("Caught error " + e.toString() + " trying to find a state.", e);
 			state = null;
 		}
 		return state;
@@ -130,23 +131,25 @@ public LsThingState getLsThingState(String idOrCodeName,
 	public Collection<LsThingStatePathDTO> getLsThingStates(
 			Collection<GenericStatePathRequest> genericRequests) {
 		Collection<LsThingStatePathDTO> results = new ArrayList<LsThingStatePathDTO>();
-		for (GenericStatePathRequest request : genericRequests){
+		for (GenericStatePathRequest request : genericRequests) {
 			LsThingStatePathDTO result = new LsThingStatePathDTO();
 			result.setIdOrCodeName(request.getIdOrCodeName());
 			result.setStateType(request.getStateType());
 			result.setStateKind(request.getStateKind());
-			result.setStates(getLsThingStates(request.getIdOrCodeName(), request.getStateType(), request.getStateKind()));
+			result.setStates(
+					getLsThingStates(request.getIdOrCodeName(), request.getStateType(), request.getStateKind()));
 			results.add(result);
 		}
 		return results;
 	}
-	
-	private Collection<LsThingState> getLsThingStates(String idOrCodeName, String stateType, String stateKind){
-		if (SimpleUtil.isNumeric(idOrCodeName)){
+
+	private Collection<LsThingState> getLsThingStates(String idOrCodeName, String stateType, String stateKind) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			Long id = Long.valueOf(idOrCodeName);
 			return LsThingState.findLsThingStatesByLsThingIDAndStateTypeKind(id, stateType, stateKind).getResultList();
-		}else{
-			return LsThingState.findLsThingStatesByLsThingCodeNameAndStateTypeKind(idOrCodeName, stateType, stateKind).getResultList();
+		} else {
+			return LsThingState.findLsThingStatesByLsThingCodeNameAndStateTypeKind(idOrCodeName, stateType, stateKind)
+					.getResultList();
 		}
 	}
 }
diff --git a/src/main/java/com/labsynch/labseer/service/LsThingValueService.java b/src/main/java/com/labsynch/labseer/service/LsThingValueService.java
index ca4c52fda..76b597844 100644
--- a/src/main/java/com/labsynch/labseer/service/LsThingValueService.java
+++ b/src/main/java/com/labsynch/labseer/service/LsThingValueService.java
@@ -34,5 +34,4 @@ LsThingValue getLsThingValue(String idOrCodeName, String stateType,
 	Collection<LsThingValuePathDTO> getLsThingValues(
 			Collection<GenericValuePathRequest> genericRequests);
 
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/LsThingValueServiceImpl.java b/src/main/java/com/labsynch/labseer/service/LsThingValueServiceImpl.java
index af7ad601d..5be70be48 100644
--- a/src/main/java/com/labsynch/labseer/service/LsThingValueServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/LsThingValueServiceImpl.java
@@ -20,26 +20,25 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-
 @Service
 @Transactional
 public class LsThingValueServiceImpl implements LsThingValueService {
 
 	@Autowired
 	private LsThingStateService lsThingStateService;
-	
-	private static final Logger logger = LoggerFactory.getLogger(LsThingValueServiceImpl.class);
 
+	private static final Logger logger = LoggerFactory.getLogger(LsThingValueServiceImpl.class);
 
-	//Query hibernate object and grab existing table references - add them to json hydrated object
+	// Query hibernate object and grab existing table references - add them to json
+	// hydrated object
 	@Override
 	@Transactional
-	public LsThingValue updateLsThingValue(LsThingValue lsThingValue){
+	public LsThingValue updateLsThingValue(LsThingValue lsThingValue) {
 		if (lsThingValue.getLsState().getId() == null) {
 			LsThingState lsThingState = new LsThingState(lsThingValue.getLsState());
 			lsThingState.setLsThing(LsThing.findLsThing(lsThingValue.getLsState().getLsThing().getId()));
 			lsThingState.persist();
-			lsThingValue.setLsState(lsThingState); 
+			lsThingValue.setLsState(lsThingState);
 		} else {
 			lsThingValue.setLsState(LsThingState.findLsThingState(lsThingValue.getLsState().getId()));
 		}
@@ -55,31 +54,31 @@ public LsThingValue saveLsThingValue(LsThingValue lsThingValue) {
 			LsThingState lsThingState = new LsThingState(lsThingValue.getLsState());
 			lsThingState.setLsThing(LsThing.findLsThing(lsThingValue.getLsState().getLsThing().getId()));
 			lsThingState.persist();
-			lsThingValue.setLsState(lsThingState); 
+			lsThingValue.setLsState(lsThingState);
 		} else {
 			lsThingValue.setLsState(LsThingState.findLsThingState(lsThingValue.getLsState().getId()));
-		}		
+		}
 		lsThingValue.persist();
 		return lsThingValue;
 	}
-	
+
 	@Override
 	@Transactional
 	public Collection<LsThingValue> saveLsThingValues(Collection<LsThingValue> lsThingValues) {
-		for (LsThingValue lsThingValue: lsThingValues) {
+		for (LsThingValue lsThingValue : lsThingValues) {
 			lsThingValue = saveLsThingValue(lsThingValue);
 		}
 		return lsThingValues;
 	}
 
 	@Override
-	public List<LsThingValue> getLsThingValuesByLsThingId(Long id){	
+	public List<LsThingValue> getLsThingValuesByLsThingId(Long id) {
 		List<LsThingValue> lsThingValues = new ArrayList<LsThingValue>();
 		LsThing lsThing = LsThing.findLsThing(id);
-		if(lsThing.getLsStates() != null) {
+		if (lsThing.getLsStates() != null) {
 			for (LsThingState lsThingState : lsThing.getLsStates()) {
-				if(lsThingState.getLsValues() != null) {
-					for(LsThingValue lsThingValue : lsThingState.getLsValues()) {
+				if (lsThingState.getLsValues() != null) {
+					for (LsThingValue lsThingValue : lsThingState.getLsValues()) {
 						lsThingValues.add(lsThingValue);
 					}
 				}
@@ -92,53 +91,59 @@ public List<LsThingValue> getLsThingValuesByLsThingId(Long id){
 	public List<LsThingValue> getLsThingValuesByLsThingIdAndStateTypeKindAndValueTypeKind(
 			Long lsThingId, String stateType, String stateKind,
 			String valueType, String valueKind) {
-		
-		List<LsThingValue> lsThingValues = LsThingValue.findLsThingValuesByLsThingIDAndStateTypeKindAndValueTypeKind(lsThingId, stateType,
-				stateKind, valueType, valueKind).getResultList();
-		
+
+		List<LsThingValue> lsThingValues = LsThingValue
+				.findLsThingValuesByLsThingIDAndStateTypeKindAndValueTypeKind(lsThingId, stateType,
+						stateKind, valueType, valueKind)
+				.getResultList();
+
 		return lsThingValues;
 	}
-	
+
 	@Override
-	public LsThingValue updateLsThingValue(String idOrCodeName, String stateType, String stateKind, String valueType, String valueKind, String value) {
-		//fetch the entity
+	public LsThingValue updateLsThingValue(String idOrCodeName, String stateType, String stateKind, String valueType,
+			String valueKind, String value) {
+		// fetch the entity
 		LsThing lsThing;
-		if(SimpleUtil.isNumeric(idOrCodeName)) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			lsThing = LsThing.findLsThing(Long.valueOf(idOrCodeName));
-		} else {		
+		} else {
 			try {
 				lsThing = LsThing.findLsThingsByCodeNameEquals(idOrCodeName).getSingleResult();
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				lsThing = null;
 			}
 		}
-		//fetch the state, and if it doesn't exist, create it
+		// fetch the state, and if it doesn't exist, create it
 		List<LsThingState> lsThingStates;
-		if(lsThing != null) {
+		if (lsThing != null) {
 			Long lsThingId = lsThing.getId();
-			lsThingStates = lsThingStateService.getLsThingStatesByLsThingIdAndStateTypeKind(lsThingId, stateType, stateKind);
+			lsThingStates = lsThingStateService.getLsThingStatesByLsThingIdAndStateTypeKind(lsThingId, stateType,
+					stateKind);
 			if (lsThingStates.isEmpty()) {
-				//create the state
-				lsThingStates.add(lsThingStateService.createLsThingStateByLsThingIdAndStateTypeKind(lsThingId, stateType, stateKind));
+				// create the state
+				lsThingStates.add(lsThingStateService.createLsThingStateByLsThingIdAndStateTypeKind(lsThingId,
+						stateType, stateKind));
 				logger.debug("Created the lsThing state: " + lsThingStates.get(0).toJson());
 			}
 		}
-		//fetch the value, update it if it exists, and if it doesn't exist, create it
+		// fetch the value, update it if it exists, and if it doesn't exist, create it
 		List<LsThingValue> lsThingValues;
 		LsThingValue lsThingValue = null;
-		if(lsThing != null) {
+		if (lsThing != null) {
 			Long lsThingId = lsThing.getId();
-			lsThingValues = getLsThingValuesByLsThingIdAndStateTypeKindAndValueTypeKind(lsThingId, stateType, stateKind, valueType, valueKind);
-			if (lsThingValues.size() > 1){
+			lsThingValues = getLsThingValuesByLsThingIdAndStateTypeKindAndValueTypeKind(lsThingId, stateType, stateKind,
+					valueType, valueKind);
+			if (lsThingValues.size() > 1) {
 				logger.error("Error: multiple lsThing statuses found");
-			}
-			else if (lsThingValues.size() == 1){
+			} else if (lsThingValues.size() == 1) {
 				lsThingValue = lsThingValues.get(0);
 				lsThingValue.setIgnored(true);
 				lsThingValue.merge();
 				logger.debug("Ignored the lsThing value: " + lsThingValue.toJson());
 			}
-			lsThingValue = createLsThingValueByLsThingIdAndStateTypeKindAndValueTypeKind(lsThingId, stateType, stateKind, valueType, valueKind, value);
+			lsThingValue = createLsThingValueByLsThingIdAndStateTypeKindAndValueTypeKind(lsThingId, stateType,
+					stateKind, valueType, valueKind, value);
 			logger.debug("Created the lsThing value: " + lsThingValue.toJson());
 		}
 		return lsThingValue;
@@ -149,41 +154,51 @@ private LsThingValue createLsThingValueByLsThingIdAndStateTypeKindAndValueTypeKi
 			Long lsThingId, String stateType, String stateKind,
 			String valueType, String valueKind, String value) {
 		LsThingValue lsThingValue = new LsThingValue();
-		LsThingState lsThingState = LsThingState.findLsThingStatesByLsThingIDAndStateTypeKind(lsThingId, stateType, stateKind).getSingleResult();
+		LsThingState lsThingState = LsThingState
+				.findLsThingStatesByLsThingIDAndStateTypeKind(lsThingId, stateType, stateKind).getSingleResult();
 		lsThingValue.setLsState(lsThingState);
 		lsThingValue.setLsType(valueType);
 		lsThingValue.setLsKind(valueKind);
-		if (valueType.equals("stringValue")) lsThingValue.setStringValue(value);
-		if (valueType.equals("fileValue")) lsThingValue.setFileValue(value);
-		if (valueType.equals("clobValue")) lsThingValue.setClobValue(value);
-		if (valueType.equals("blobValue")) lsThingValue.setBlobValue(value.getBytes(Charset.forName("UTF-8")));
-		if (valueType.equals("numericValue")) lsThingValue.setNumericValue(new BigDecimal(value));
-		if (valueType.equals("dateValue")) lsThingValue.setDateValue(new Date(Long.parseLong(value)));
-		if (valueType.equals("codeValue")) lsThingValue.setCodeValue(value);
-		if (valueType.equals("urlValue")) lsThingValue.setUrlValue(value);
+		if (valueType.equals("stringValue"))
+			lsThingValue.setStringValue(value);
+		if (valueType.equals("fileValue"))
+			lsThingValue.setFileValue(value);
+		if (valueType.equals("clobValue"))
+			lsThingValue.setClobValue(value);
+		if (valueType.equals("blobValue"))
+			lsThingValue.setBlobValue(value.getBytes(Charset.forName("UTF-8")));
+		if (valueType.equals("numericValue"))
+			lsThingValue.setNumericValue(new BigDecimal(value));
+		if (valueType.equals("dateValue"))
+			lsThingValue.setDateValue(new Date(Long.parseLong(value)));
+		if (valueType.equals("codeValue"))
+			lsThingValue.setCodeValue(value);
+		if (valueType.equals("urlValue"))
+			lsThingValue.setUrlValue(value);
 		lsThingValue.setRecordedBy("default");
 		lsThingValue.persist();
 		return lsThingValue;
 	}
-	
+
 	@Override
 	public Collection<LsThingValue> updateLsThingValues(
 			Collection<LsThingValue> lsThingValues) {
-		for (LsThingValue lsThingValue: lsThingValues) {
+		for (LsThingValue lsThingValue : lsThingValues) {
 			lsThingValue = updateLsThingValue(lsThingValue);
 		}
 		return lsThingValues;
 	}
-	
+
 	@Override
 	public LsThingValue getLsThingValue(String idOrCodeName,
 			String stateType, String stateKind, String valueType, String valueKind) {
 		LsThingValue value = null;
-		try{
-			Collection<LsThingValue> values = getLsThingValues(idOrCodeName, stateType, stateKind, valueType, valueKind);
+		try {
+			Collection<LsThingValue> values = getLsThingValues(idOrCodeName, stateType, stateKind, valueType,
+					valueKind);
 			value = values.iterator().next();
-		}catch (Exception e){
-			logger.error("Caught error "+e.toString()+" trying to find a state.",e);
+		} catch (Exception e) {
+			logger.error("Caught error " + e.toString() + " trying to find a state.", e);
 			value = null;
 		}
 		return value;
@@ -193,23 +208,27 @@ public LsThingValue getLsThingValue(String idOrCodeName,
 	public Collection<LsThingValuePathDTO> getLsThingValues(
 			Collection<GenericValuePathRequest> genericRequests) {
 		Collection<LsThingValuePathDTO> results = new ArrayList<LsThingValuePathDTO>();
-		for (GenericValuePathRequest request : genericRequests){
+		for (GenericValuePathRequest request : genericRequests) {
 			LsThingValuePathDTO result = new LsThingValuePathDTO();
 			result.setIdOrCodeName(request.getIdOrCodeName());
 			result.setValueType(request.getValueType());
 			result.setValueKind(request.getValueKind());
-			result.setValues(getLsThingValues(request.getIdOrCodeName(), request.getStateType(), request.getStateKind(), request.getValueType(), request.getValueKind()));
+			result.setValues(getLsThingValues(request.getIdOrCodeName(), request.getStateType(), request.getStateKind(),
+					request.getValueType(), request.getValueKind()));
 			results.add(result);
 		}
 		return results;
 	}
-	
-	private Collection<LsThingValue> getLsThingValues(String idOrCodeName, String stateType, String stateKind, String valueType, String valueKind){
-		if (SimpleUtil.isNumeric(idOrCodeName)){
+
+	private Collection<LsThingValue> getLsThingValues(String idOrCodeName, String stateType, String stateKind,
+			String valueType, String valueKind) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			Long id = Long.valueOf(idOrCodeName);
-			return LsThingValue.findLsThingValuesByLsThingIDAndStateTypeKindAndValueTypeKind(id, stateType, stateKind, valueType, valueKind).getResultList();
-		}else{
-			return LsThingValue.findLsThingValuesByLsThingCodeNameAndStateTypeKindAndValueTypeKind(idOrCodeName, stateType, stateKind, valueType, valueKind).getResultList();
+			return LsThingValue.findLsThingValuesByLsThingIDAndStateTypeKindAndValueTypeKind(id, stateType, stateKind,
+					valueType, valueKind).getResultList();
+		} else {
+			return LsThingValue.findLsThingValuesByLsThingCodeNameAndStateTypeKindAndValueTypeKind(idOrCodeName,
+					stateType, stateKind, valueType, valueKind).getResultList();
 		}
 	}
 }
diff --git a/src/main/java/com/labsynch/labseer/service/LsTransactionService.java b/src/main/java/com/labsynch/labseer/service/LsTransactionService.java
index a639d0f1a..4a9e22f26 100644
--- a/src/main/java/com/labsynch/labseer/service/LsTransactionService.java
+++ b/src/main/java/com/labsynch/labseer/service/LsTransactionService.java
@@ -9,5 +9,4 @@ public interface LsTransactionService {
 
 	LsTransactionQueryDTO searchLsTransactions(LsTransactionQueryDTO query) throws Exception;
 
-	
 }
diff --git a/src/main/java/com/labsynch/labseer/service/LsTransactionServiceImpl.java b/src/main/java/com/labsynch/labseer/service/LsTransactionServiceImpl.java
index c351d5262..0db90d411 100644
--- a/src/main/java/com/labsynch/labseer/service/LsTransactionServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/LsTransactionServiceImpl.java
@@ -34,63 +34,72 @@ public LsTransactionQueryDTO searchLsTransactions(
 		CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
 		CriteriaQuery<Long> criteria = criteriaBuilder.createQuery(Long.class);
 		Root<LsTransaction> transaction = criteria.from(LsTransaction.class);
-		
+
 		criteria.select(transaction.<Long>get("id"));
 		criteria.distinct(true);
 		Predicate[] predicates = new Predicate[0];
 		List<Predicate> predicateList = new ArrayList<Predicate>();
-		if (query.getRecordedDateGreaterThan() != null && query.getRecordedDateLessThan() != null){
-			try{
-				Predicate createdDateBetween = criteriaBuilder.between(transaction.<Date>get("recordedDate"), query.getRecordedDateGreaterThan(), query.getRecordedDateLessThan());
+		if (query.getRecordedDateGreaterThan() != null && query.getRecordedDateLessThan() != null) {
+			try {
+				Predicate createdDateBetween = criteriaBuilder.between(transaction.<Date>get("recordedDate"),
+						query.getRecordedDateGreaterThan(), query.getRecordedDateLessThan());
 				predicateList.add(createdDateBetween);
-			}catch (Exception e){
-				logger.error("Caught exception trying to parse "+query.getRecordedDateGreaterThan()+" or "+query.getRecordedDateLessThan()+" as a date.",e);
-				throw new Exception("Caught exception trying to parse "+query.getRecordedDateGreaterThan()+" or "+query.getRecordedDateLessThan()+" as a date.",e);
+			} catch (Exception e) {
+				logger.error("Caught exception trying to parse " + query.getRecordedDateGreaterThan() + " or "
+						+ query.getRecordedDateLessThan() + " as a date.", e);
+				throw new Exception("Caught exception trying to parse " + query.getRecordedDateGreaterThan() + " or "
+						+ query.getRecordedDateLessThan() + " as a date.", e);
 			}
-		}
-		else if (query.getRecordedDateGreaterThan() != null){
-			try{
-				Predicate createdDateFrom = criteriaBuilder.greaterThanOrEqualTo(transaction.<Date>get("recordedDate"), query.getRecordedDateGreaterThan());
+		} else if (query.getRecordedDateGreaterThan() != null) {
+			try {
+				Predicate createdDateFrom = criteriaBuilder.greaterThanOrEqualTo(transaction.<Date>get("recordedDate"),
+						query.getRecordedDateGreaterThan());
 				predicateList.add(createdDateFrom);
-			}catch (Exception e){
-				logger.error("Caught exception trying to parse "+query.getRecordedDateGreaterThan()+" as a date.",e);
-				throw new Exception("Caught exception trying to parse "+query.getRecordedDateGreaterThan()+" as a date.",e);
+			} catch (Exception e) {
+				logger.error("Caught exception trying to parse " + query.getRecordedDateGreaterThan() + " as a date.",
+						e);
+				throw new Exception(
+						"Caught exception trying to parse " + query.getRecordedDateGreaterThan() + " as a date.", e);
 			}
-		}
-		else if (query.getRecordedDateLessThan() != null){
-			try{
-				Predicate createdDateTo = criteriaBuilder.lessThanOrEqualTo(transaction.<Date>get("recordedDate"), query.getRecordedDateLessThan());
+		} else if (query.getRecordedDateLessThan() != null) {
+			try {
+				Predicate createdDateTo = criteriaBuilder.lessThanOrEqualTo(transaction.<Date>get("recordedDate"),
+						query.getRecordedDateLessThan());
 				predicateList.add(createdDateTo);
-			}catch (Exception e){
-				logger.error("Caught exception trying to parse "+query.getRecordedDateLessThan()+" as a date.",e);
-				throw new Exception("Caught exception trying to parse "+query.getRecordedDateLessThan()+" as a date.",e);
+			} catch (Exception e) {
+				logger.error("Caught exception trying to parse " + query.getRecordedDateLessThan() + " as a date.", e);
+				throw new Exception(
+						"Caught exception trying to parse " + query.getRecordedDateLessThan() + " as a date.", e);
 			}
 		}
-		if (query.getRecordedBy() != null){
-			Predicate recordedBy = criteriaBuilder.like(transaction.<String>get("recordedBy"), '%'+query.getRecordedBy()+'%');
+		if (query.getRecordedBy() != null) {
+			Predicate recordedBy = criteriaBuilder.like(transaction.<String>get("recordedBy"),
+					'%' + query.getRecordedBy() + '%');
 			predicateList.add(recordedBy);
 		}
-		if (query.getType() != null){
-			Predicate type = criteriaBuilder.equal(transaction.<LsTransactionType>get("type"), LsTransactionType.valueOf(query.getType()));
+		if (query.getType() != null) {
+			Predicate type = criteriaBuilder.equal(transaction.<LsTransactionType>get("type"),
+					LsTransactionType.valueOf(query.getType()));
 			predicateList.add(type);
 		}
-		if (query.getStatus() != null){
-			Predicate type = criteriaBuilder.equal(transaction.<LsTransactionStatus>get("status"), LsTransactionStatus.valueOf(query.getStatus()));
+		if (query.getStatus() != null) {
+			Predicate type = criteriaBuilder.equal(transaction.<LsTransactionStatus>get("status"),
+					LsTransactionStatus.valueOf(query.getStatus()));
 			predicateList.add(type);
 		}
-		
+
 		predicates = predicateList.toArray(predicates);
 		criteria.where(criteriaBuilder.and(predicates));
 		TypedQuery<Long> q = em.createQuery(criteria);
 		logger.debug(q.unwrap(org.hibernate.Query.class).getQueryString());
 		idList = q.getResultList();
-		logger.debug("Found "+idList.size()+" results.");
+		logger.debug("Found " + idList.size() + " results.");
 		query.setNumberOfResults(idList.size());
-		if (query.getMaxResults() != null && query.getNumberOfResults() > query.getMaxResults()){
+		if (query.getMaxResults() != null && query.getNumberOfResults() > query.getMaxResults()) {
 			return query;
-		}else{
+		} else {
 			Collection<LsTransaction> results = new ArrayList<LsTransaction>();
-			for (Long id : idList){
+			for (Long id : idList) {
 				LsTransaction result = LsTransaction.findLsTransaction(id);
 				results.add(result);
 			}
@@ -99,6 +108,4 @@ else if (query.getRecordedDateLessThan() != null){
 		}
 	}
 
-
-	
 }
diff --git a/src/main/java/com/labsynch/labseer/service/MetalotService.java b/src/main/java/com/labsynch/labseer/service/MetalotService.java
index 73b0e02fe..52c2acbfe 100755
--- a/src/main/java/com/labsynch/labseer/service/MetalotService.java
+++ b/src/main/java/com/labsynch/labseer/service/MetalotService.java
@@ -3,10 +3,8 @@
 import com.labsynch.labseer.dto.Metalot;
 import com.labsynch.labseer.dto.MetalotReturn;
 
-
 public interface MetalotService {
 
 	public MetalotReturn save(Metalot metaLot);
 
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/MetalotServiceImpl.java b/src/main/java/com/labsynch/labseer/service/MetalotServiceImpl.java
index 0bb296792..6b1af65bf 100755
--- a/src/main/java/com/labsynch/labseer/service/MetalotServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/MetalotServiceImpl.java
@@ -56,7 +56,6 @@
 import com.labsynch.labseer.utils.PropertiesUtilService;
 import com.labsynch.labseer.utils.SimpleUtil;
 
-
 @Service
 public class MetalotServiceImpl implements MetalotService {
 
@@ -68,7 +67,7 @@ public class MetalotServiceImpl implements MetalotService {
 
 	@Autowired
 	private CorpNameService corpNameService;
-    
+
 	@Autowired
 	private ParentStructureServiceImpl parentStructureServiceImpl;
 
@@ -84,15 +83,14 @@ public class MetalotServiceImpl implements MetalotService {
 	@Autowired
 	private LotAliasService lotAliasService;
 
-
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
 
 	private static final Logger logger = LoggerFactory.getLogger(MetalotServiceImpl.class);
 
-	//	@Transactional
+	// @Transactional
 	@Override
-	public MetalotReturn save(Metalot metaLot){
+	public MetalotReturn save(Metalot metaLot) {
 
 		MetalotReturn mr = new MetalotReturn();
 		ArrayList<ErrorMessage> errors = new ArrayList<ErrorMessage>();
@@ -103,23 +101,23 @@ public MetalotReturn save(Metalot metaLot){
 			ErrorMessage parentError = new ErrorMessage();
 			parentError.setLevel("error");
 			parentError.setMessage("Bad molformat. Please fix the molfile: ");
-			errors.add(parentError);			
+			errors.add(parentError);
 		} catch (UniqueNotebookException e) {
 			ErrorMessage lotError = new ErrorMessage();
 			lotError.setLevel("error");
 			lotError.setMessage("lot notebook is not unique");
-			errors.add(lotError);			
+			errors.add(lotError);
 		} catch (DupeParentException e) {
 			ErrorMessage parentError = new ErrorMessage();
 			parentError.setLevel("error");
 			parentError.setMessage("Parent with matching structure and stereo category exists.");
 			errors.add(parentError);
-		}  catch (SaltedCompoundException e) {
+		} catch (SaltedCompoundException e) {
 			ErrorMessage parentError = new ErrorMessage();
 			parentError.setLevel("error");
 			parentError.setMessage("Parent appears to be salted.");
 			errors.add(parentError);
-		}  catch (JsonParseException e) {
+		} catch (JsonParseException e) {
 			ErrorMessage parentError = new ErrorMessage();
 			parentError.setLevel("error");
 			parentError.setMessage("Unable to parse the parent JSON structure.");
@@ -128,7 +126,7 @@ public MetalotReturn save(Metalot metaLot){
 			ErrorMessage saltFormError = new ErrorMessage();
 			saltFormError.setLevel("warning");
 			saltFormError.setMessage("Duplicate saltForm found by corpName. Please select existing saltForm.");
-			errors.add(saltFormError);	
+			errors.add(saltFormError);
 		} catch (SaltFormMolFormatException e) {
 			ErrorMessage saltFormError = new ErrorMessage();
 			saltFormError.setLevel("error");
@@ -138,7 +136,8 @@ public MetalotReturn save(Metalot metaLot){
 		} catch (NoResultException e) {
 			ErrorMessage error = new ErrorMessage();
 			error.setLevel("error");
-			error.setMessage("Could not find a definition container to create vials with. Please see your system administrator.");
+			error.setMessage(
+					"Could not find a definition container to create vials with. Please see your system administrator.");
 			logger.error(error.getMessage());
 			errors.add(error);
 		} catch (NonUniqueResultException e) {
@@ -153,11 +152,11 @@ public MetalotReturn save(Metalot metaLot){
 			standardizerError.setMessage("Standardizer Error: " + e.getMessage());
 			logger.error(standardizerError.getMessage());
 			errors.add(standardizerError);
-		}catch (Exception e) {
+		} catch (Exception e) {
 			ErrorMessage genericError = new ErrorMessage();
 			genericError.setLevel("error");
 			genericError.setMessage("Internal error encountered. Please contact your administrator.");
-			logger.error("Uncaught error in metalot save.",e);
+			logger.error("Uncaught error in metalot save.", e);
 			errors.add(genericError);
 		}
 
@@ -167,109 +166,123 @@ public MetalotReturn save(Metalot metaLot){
 	}
 
 	@Transactional
-	public MetalotReturn processAndSave(Metalot metaLot, MetalotReturn mr, ArrayList<ErrorMessage> errors) 
-			throws UniqueNotebookException, DupeParentException, JsonParseException, 
-			DupeSaltFormCorpNameException, DupeSaltFormStructureException, SaltFormMolFormatException, 
+	public MetalotReturn processAndSave(Metalot metaLot, MetalotReturn mr, ArrayList<ErrorMessage> errors)
+			throws UniqueNotebookException, DupeParentException, JsonParseException,
+			DupeSaltFormCorpNameException, DupeSaltFormStructureException, SaltFormMolFormatException,
 			SaltedCompoundException, IOException, CmpdRegMolFormatException, StandardizerException {
 
 		logger.info("attempting to save the metaLot. ");
 
-		//		Metalot metaLot = null;		
+		// Metalot metaLot = null;
 		boolean dupeParent = false;
 		boolean metalotError = false;
 
-		//		try {
-		//			metaLot = Metalot.fromJsonToMetalot(metaLotJson);				
-		//		} catch (Exception e){
-		//			logger.error("Unable to parse metaLot JSON. " + e);
-		//			throw new JsonParseException("Unable to parse metaLot JSON");
-		//		}
-		//		
+		// try {
+		// metaLot = Metalot.fromJsonToMetalot(metaLotJson);
+		// } catch (Exception e){
+		// logger.error("Unable to parse metaLot JSON. " + e);
+		// throw new JsonParseException("Unable to parse metaLot JSON");
+		// }
+		//
 		Lot lot = metaLot.getLot();
-		if (logger.isDebugEnabled()) logger.debug("attempting to save the lot. " + lot.toJson());
+		if (logger.isDebugEnabled())
+			logger.debug("attempting to save the lot. " + lot.toJson());
 		logger.debug("is it a virtual lot: " + lot.getIsVirtual());
 
-
-
-		if (lot.getId() == null ){
-			if (propertiesUtilService.getUniqueNotebook() && lot.getNotebookPage() != null){
+		if (lot.getId() == null) {
+			if (propertiesUtilService.getUniqueNotebook() && lot.getNotebookPage() != null) {
 				boolean duplicateNotebook = false;
 				try {
 					duplicateNotebook = checkUniqueNotebook(lot);
-				} catch (IllegalArgumentException e){
+				} catch (IllegalArgumentException e) {
 					throw new UniqueNotebookException("notebook page is required");
 				}
-				logger.info("unique Notebook. " + lot.getNotebookPage() + "  "+ duplicateNotebook);
-				if (!duplicateNotebook){
+				logger.info("unique Notebook. " + lot.getNotebookPage() + "  " + duplicateNotebook);
+				if (!duplicateNotebook) {
 					metalotError = true;
 					throw new UniqueNotebookException("lot notebook is not unique");
 				}
 			}
 		}
 
-
 		Parent parent = metaLot.getLot().getSaltForm().getParent();
 		if (parent == null) {
 			parent = metaLot.getLot().getParent();
 		}
-		if (logger.isDebugEnabled()) logger.debug("parent: " + parent.toJson());
-
+		if (logger.isDebugEnabled())
+			logger.debug("parent: " + parent.toJson());
 
 		Set<ParentAlias> parentAliases = parent.getParentAliases();
 		int numberOfParentAliases = parentAliases.size();
 		logger.info("number of parent aliases: " + numberOfParentAliases);
 
 		String dupeParentNames = "";
-		if (parent.getId() == null){
+		if (parent.getId() == null) {
 			logger.debug("this is a new parent");
 			String molStructure;
-			if (propertiesUtilService.getUseExternalStandardizerConfig()){
+			if (propertiesUtilService.getUseExternalStandardizerConfig()) {
 				molStructure = chemService.standardizeStructure(parent.getMolStructure());
 				parent.setMolStructure(molStructure);
 			}
-			int dupeParentCount = 0;			
-			if (!metaLot.isSkipParentDupeCheck()){
+			int dupeParentCount = 0;
+			if (!metaLot.isSkipParentDupeCheck()) {
 				int[] dupeParentList = {};
-				if(propertiesUtilService.getRegisterNoStructureCompoundsAsUniqueParents() && chemService.getMolWeight(parent.getMolStructure()) == 0.0) {
-					//if true then we are no checking this one for hits
-					logger.warn("mol weight is 0 and registerNoStructureCompoundsAsUniqueParents so not checking for dupe parents by structure but other dupe checking will be done");
+				if (propertiesUtilService.getRegisterNoStructureCompoundsAsUniqueParents()
+						&& chemService.getMolWeight(parent.getMolStructure()) == 0.0) {
+					// if true then we are no checking this one for hits
+					logger.warn(
+							"mol weight is 0 and registerNoStructureCompoundsAsUniqueParents so not checking for dupe parents by structure but other dupe checking will be done");
 				} else {
 					dupeParentList = chemService.checkDupeMol(parent.getMolStructure(), StructureType.PARENT);
 				}
-				if(dupeParentList.length > 0 && !metaLot.isSkipParentDupeCheck()){
-					for (int parentCdId : dupeParentList){
+				if (dupeParentList.length > 0 && !metaLot.isSkipParentDupeCheck()) {
+					for (int parentCdId : dupeParentList) {
 						List<Parent> queryParents = Parent.findParentsByCdId(parentCdId).getResultList();
-						for (Parent queryParent : queryParents){
-							if (parent.getStereoCategory() != null && queryParent.getStereoCategory() != null){
-								if (parent.getStereoCategory().getCode().equalsIgnoreCase(queryParent.getStereoCategory().getCode())){
-									//parent structure and stereo category matches
-									//determine if Stereo Comment is different
-									boolean parentHasStereoComment = (parent.getStereoComment() != null && parent.getStereoComment().length() > 0);
-									boolean queryParentHasStereoComment = (queryParent.getStereoComment() != null && queryParent.getStereoComment().length() > 0);
-									if (!parentHasStereoComment & !queryParentHasStereoComment){
-										//both stereo comments are null => dupes
+						for (Parent queryParent : queryParents) {
+							if (parent.getStereoCategory() != null && queryParent.getStereoCategory() != null) {
+								if (parent.getStereoCategory().getCode()
+										.equalsIgnoreCase(queryParent.getStereoCategory().getCode())) {
+									// parent structure and stereo category matches
+									// determine if Stereo Comment is different
+									boolean parentHasStereoComment = (parent.getStereoComment() != null
+											&& parent.getStereoComment().length() > 0);
+									boolean queryParentHasStereoComment = (queryParent.getStereoComment() != null
+											&& queryParent.getStereoComment().length() > 0);
+									if (!parentHasStereoComment & !queryParentHasStereoComment) {
+										// both stereo comments are null => dupes
 										dupeParentCount++;
 										dupeParent = true;
 										logger.error("dupe parent is: " + queryParent.getCorpName());
-										if (queryParent.getCorpName() != null) dupeParentNames = dupeParentNames.concat(queryParent.getCorpName()).concat(" ");
-										if (queryParent.getCommonName() != null) dupeParentNames = dupeParentNames.concat(queryParent.getCommonName().concat(" "));
-									}else if (!parentHasStereoComment || !queryParentHasStereoComment){
-										//stereo comments are different - one is null and the other isn't - parents are not dupes
-									}else if (parent.getStereoComment().equalsIgnoreCase(queryParent.getStereoComment())){
-										//both stereo comments non-null
+										if (queryParent.getCorpName() != null)
+											dupeParentNames = dupeParentNames.concat(queryParent.getCorpName())
+													.concat(" ");
+										if (queryParent.getCommonName() != null)
+											dupeParentNames = dupeParentNames
+													.concat(queryParent.getCommonName().concat(" "));
+									} else if (!parentHasStereoComment || !queryParentHasStereoComment) {
+										// stereo comments are different - one is null and the other isn't - parents are
+										// not dupes
+									} else if (parent.getStereoComment()
+											.equalsIgnoreCase(queryParent.getStereoComment())) {
+										// both stereo comments non-null
 										dupeParentCount++;
 										dupeParent = true;
 										logger.error("dupe parent is: " + queryParent.getCorpName());
-										if (queryParent.getCorpName() != null) dupeParentNames = dupeParentNames.concat(queryParent.getCorpName()).concat(" ");
-										if (queryParent.getCommonName() != null) dupeParentNames = dupeParentNames.concat(queryParent.getCommonName().concat(" "));
-									}else{
-										//stereo category is same but comments are unique, so parents are not dupes
+										if (queryParent.getCorpName() != null)
+											dupeParentNames = dupeParentNames.concat(queryParent.getCorpName())
+													.concat(" ");
+										if (queryParent.getCommonName() != null)
+											dupeParentNames = dupeParentNames
+													.concat(queryParent.getCommonName().concat(" "));
+									} else {
+										// stereo category is same but comments are unique, so parents are not dupes
 									}
 								}
-								//else stereo category is different
+								// else stereo category is different
 							} else {
 								logger.error("the stereo category code is null -- parent: " + parent.getCorpName());
-								logger.error("the stereo category code is null -- queryParent: " + queryParent.getCorpName());
+								logger.error("the stereo category code is null -- queryParent: "
+										+ queryParent.getCorpName());
 								// assume it is a dupe. (an error case). The stereo category should not be null
 								dupeParentCount++;
 								dupeParent = true;
@@ -277,43 +290,44 @@ public MetalotReturn processAndSave(Metalot metaLot, MetalotReturn mr, ArrayList
 
 						}
 
-					}				
-				}				
+					}
+				}
 			}
 
 			int cdId = 0;
 			logger.debug("dupe parent count: " + dupeParentCount + "  " + dupeParent);
 
-			if (dupeParent){
-				//just stop and return an error
+			if (dupeParent) {
+				// just stop and return an error
 				ErrorMessage dupeParentError = new ErrorMessage();
 				dupeParentError.setLevel("error");
-				dupeParentError.setMessage("Duplicate parent found. Please register a new lot for " + dupeParentNames );
+				dupeParentError.setMessage("Duplicate parent found. Please register a new lot for " + dupeParentNames);
 				logger.error(dupeParentError.getMessage());
 				errors.add(dupeParentError);
 				metalotError = true;
 				throw new DupeParentException("Duplicate parent structure");
 
-			}	else if (chemService.checkForSalt(parent.getMolStructure())){
-				//multiple fragments
-				if (parent.getIsMixture() != null){
-					if (!parent.getIsMixture()){
+			} else if (chemService.checkForSalt(parent.getMolStructure())) {
+				// multiple fragments
+				if (parent.getIsMixture() != null) {
+					if (!parent.getIsMixture()) {
 						ErrorMessage multifragmentError = new ErrorMessage();
 						multifragmentError.setLevel("error");
-						multifragmentError.setMessage("Multiple fragments found. Please register the neutral base parent " );
+						multifragmentError
+								.setMessage("Multiple fragments found. Please register the neutral base parent ");
 						logger.error(multifragmentError.getMessage());
 						errors.add(multifragmentError);
 						metalotError = true;
 						logger.error("found a compound with multiple fragments -- mark as an error.");
 						logger.error("Salted molfile: " + parent.getMolStructure());
 						throw new SaltedCompoundException("Salted parent structure");
-					}else{
-						//continue to save - structure is appropriately marked as a mixture
+					} else {
+						// continue to save - structure is appropriately marked as a mixture
 					}
-				}else{
+				} else {
 					ErrorMessage multifragmentError = new ErrorMessage();
 					multifragmentError.setLevel("error");
-					multifragmentError.setMessage("Multiple fragments found. Please register the neutral base parent " );
+					multifragmentError.setMessage("Multiple fragments found. Please register the neutral base parent ");
 					logger.error(multifragmentError.getMessage());
 					errors.add(multifragmentError);
 					metalotError = true;
@@ -325,155 +339,163 @@ public MetalotReturn processAndSave(Metalot metaLot, MetalotReturn mr, ArrayList
 			if (!dupeParent) {
 				boolean checkForDupe = false;
 				cdId = chemService.saveStructure(parent.getMolStructure(), StructureType.PARENT, checkForDupe);
-				if (cdId == -1){
+				if (cdId == -1) {
 					logger.error("Bad molformat. Please fix the molfile: " + parent.getMolStructure());
 					throw new CmpdRegMolFormatException();
 				} else {
 					parent.setCdId(cdId);
-					if (parent.getCorpName() == null || parent.getCorpName().isEmpty() || parent.getCorpName().trim().equalsIgnoreCase("")){
+					if (parent.getCorpName() == null || parent.getCorpName().isEmpty()
+							|| parent.getCorpName().trim().equalsIgnoreCase("")) {
 						generateAndSetCorpName(parent);
-					} 
-					if (parent.getRegistrationDate() == null){
-						parent.setRegistrationDate(new Date());				
+					}
+					if (parent.getRegistrationDate() == null) {
+						parent.setRegistrationDate(new Date());
 					}
 					DecimalFormat dExactMass = new DecimalFormat("#.######");
-					parent.setExactMass(Double.valueOf(dExactMass.format(chemService.getExactMass(parent.getMolStructure()))));
-					DecimalFormat dMolWeight = new DecimalFormat("#.###"); 
-					parent.setMolWeight(Double.valueOf(dMolWeight.format(chemService.getMolWeight(parent.getMolStructure()))));
+					parent.setExactMass(
+							Double.valueOf(dExactMass.format(chemService.getExactMass(parent.getMolStructure()))));
+					DecimalFormat dMolWeight = new DecimalFormat("#.###");
+					parent.setMolWeight(
+							Double.valueOf(dMolWeight.format(chemService.getMolWeight(parent.getMolStructure()))));
 
 					parent.setMolFormula(chemService.getMolFormula(parent.getMolStructure()));
-					//add unique constraint to parent corp name as well (parent and lot)
+					// add unique constraint to parent corp name as well (parent and lot)
 					boolean corpNameAlreadyExists = checkCorpNameAlreadyExists(parent.getCorpName());
 					while (corpNameAlreadyExists) {
 						generateAndSetCorpName(parent);
 						corpNameAlreadyExists = checkCorpNameAlreadyExists(parent.getCorpName());
 					}
-					//try to set the parentNumber if it is not set already
-					if (parent.getParentNumber() < 1){
+					// try to set the parentNumber if it is not set already
+					if (parent.getParentNumber() < 1) {
 						parent.setParentNumber(corpNameService.parseParentNumber(parent.getCorpName()));
 					}
-					logger.debug("Saving new parent with corp name "+parent.getCorpName()+" and parent number "+parent.getParentNumber());
+					logger.debug("Saving new parent with corp name " + parent.getCorpName() + " and parent number "
+							+ parent.getParentNumber());
 					parent.persist();
-				} 
+				}
 			}
 
 		} else {
 			logger.debug("this is an old parent");
-			parent = Parent.findParent(parent.getId()); //get the full parent object
-			//				parent.merge();
+			parent = Parent.findParent(parent.getId()); // get the full parent object
+			// parent.merge();
 		}
 
-		if (!dupeParent){
+		if (!dupeParent) {
 
 			logger.info("not a dupe parent");
 
-			//save parent aliases
+			// save parent aliases
 			logger.info("--------- Number of parentAliases to save: " + parentAliases.size());
 			parent = parentAliasService.updateParentAliases(parent, parentAliases);
-			if (logger.isDebugEnabled()) logger.debug("Parent aliases after save: "+ ParentAlias.toJsonArray(parent.getParentAliases()));
+			if (logger.isDebugEnabled())
+				logger.debug("Parent aliases after save: " + ParentAlias.toJsonArray(parent.getParentAliases()));
 
 			double totalSaltWeight = 0d;
 
-			//save saltForm
+			// save saltForm
 			SaltForm saltForm = metaLot.getLot().getSaltForm();
 			ErrorMessage saltFormError = new ErrorMessage();
 			boolean newSaltForm = false;
-			if (saltForm.getId() == null){
+			if (saltForm.getId() == null) {
 				newSaltForm = true;
 				int cdId = 0;
 				System.out.println("this is a new saltForm");
 
-				String saltFormCorpName = corpNameService.generateSaltFormCorpName(parent.getCorpName(), metaLot.getIsosalts());
+				String saltFormCorpName = corpNameService.generateSaltFormCorpName(parent.getCorpName(),
+						metaLot.getIsosalts());
 				saltForm.setCorpName(saltFormCorpName);
 				logger.debug("saltForm corpName:= " + saltForm.getCorpName());
 				long saltFormCount = SaltForm.countSaltFormsByCorpNameEquals(saltFormCorpName);
 				logger.debug("number of saltForms found by corpName: " + saltFormCount);
-				if (saltFormCount > 0){
-					if(propertiesUtilService.getSaltBeforeLot()){
+				if (saltFormCount > 0) {
+					if (propertiesUtilService.getSaltBeforeLot()) {
 						saltFormError.setLevel("warning");
-						saltFormError.setMessage("Duplicate saltForm found by corpName. Please select existing saltForm.");
-						errors.add(saltFormError);	
+						saltFormError
+								.setMessage("Duplicate saltForm found by corpName. Please select existing saltForm.");
+						errors.add(saltFormError);
 						metalotError = true;
 						logger.error(saltFormError.getMessage());
 						throw new DupeSaltFormCorpNameException("Duplicate saltForm found by corpName.");
 					}
 				} else {
-					if (saltForm.getMolStructure() == null || saltForm.getMolStructure().trim().equalsIgnoreCase("")){
+					if (saltForm.getMolStructure() == null || saltForm.getMolStructure().trim().equalsIgnoreCase("")) {
 						logger.debug("no salt form structure");
 
 					} else {
 						cdId = chemService.saveStructure(saltForm.getMolStructure(), StructureType.SALT_FORM, true);
-						if (cdId == -1){
+						if (cdId == -1) {
 							saltFormError.setLevel("error");
-							saltFormError.setMessage("Bad molformat. Please fix the molfile: " + saltForm.getMolStructure());
+							saltFormError
+									.setMessage("Bad molformat. Please fix the molfile: " + saltForm.getMolStructure());
 							logger.error(saltFormError.getMessage());
 							errors.add(saltFormError);
 							throw new SaltFormMolFormatException();
-						} else if (cdId == 0){
+						} else if (cdId == 0) {
 							saltFormError.setLevel("warning");
 							saltFormError.setMessage("Duplicate saltForm found. Please select existing saltForm.");
 							logger.error(saltFormError.getMessage());
 							errors.add(saltFormError);
 							metalotError = true;
-						}        						
-					}					
+						}
+					}
 				}
 
-				if (saltForm.getRegistrationDate() == null){
-					saltForm.setRegistrationDate(new Date());				
+				if (saltForm.getRegistrationDate() == null) {
+					saltForm.setRegistrationDate(new Date());
 				}
-				if (!metalotError){
+				if (!metalotError) {
 					saltForm.setCdId(cdId);
 					saltForm.setParent(parent);
-					if (logger.isDebugEnabled()) logger.debug("persisted the new saltForm: " + saltForm.toJson());
+					if (logger.isDebugEnabled())
+						logger.debug("persisted the new saltForm: " + saltForm.toJson());
 					saltForm.persist();
-					//				saltForm.flush();					
+					// saltForm.flush();
 				}
 
 			} else {
 				logger.debug("this is an old saltForm");
-				//				saltForm.merge();
-			}  
-
+				// saltForm.merge();
+			}
 
 			Set<IsoSalt> isoSalts = metaLot.getIsosalts();
-			if (!newSaltForm && !metalotError) { 
-				//			} else if (isoSalts.size() > 0 && newSaltForm && !metalotError){
+			if (!newSaltForm && !metalotError) {
+				// } else if (isoSalts.size() > 0 && newSaltForm && !metalotError){
 				logger.debug("Checking if SaltForm needs to be updated");
 				saltForm = saltFormService.updateSaltForm(parent, saltForm, isoSalts, lot, totalSaltWeight, errors);
 				lot.setSaltForm(saltForm);
 				totalSaltWeight = saltFormService.calculateSaltWeight(saltForm);
 				logger.debug("calculate saltWeight: " + totalSaltWeight);
-			} else if (newSaltForm && !metalotError){
+			} else if (newSaltForm && !metalotError) {
 				logger.debug("saving new set of isoSalts. Number of salts: " + isoSalts.size());
-				for (IsoSalt isoSalt : isoSalts ){
+				for (IsoSalt isoSalt : isoSalts) {
 					isoSalt.setSaltForm(saltForm);
 					isoSalt.persist();
 					double saltWeight = isoSaltService.calculateSaltWeight(isoSalt);
 					totalSaltWeight = totalSaltWeight + saltWeight;
-					logger.debug("current totalSaltWeigth: " + totalSaltWeight);	
+					logger.debug("current totalSaltWeigth: " + totalSaltWeight);
 				}
 				saltForm.setSaltWeight(totalSaltWeight);
 				saltForm.merge();
 			}
 
-			if (lot.getId() == null ){
+			if (lot.getId() == null) {
 
 				logger.info("do we have an error: " + metalotError);
 
-				if (!metalotError){
+				if (!metalotError) {
 					Set<LotAlias> lotAliases = lot.getLotAliases();
 					int numberOfLotAliases = lotAliases.size();
 					logger.info("number of lot aliases: " + numberOfLotAliases);
 
 					logger.debug("this is a new lot");
 					lot.setSaltForm(saltForm);
-					//lot.setParent(parent);
-					if(lot.getCorpName() == null || lot.getCorpName().trim().equalsIgnoreCase("")){
+					// lot.setParent(parent);
+					if (lot.getCorpName() == null || lot.getCorpName().trim().equalsIgnoreCase("")) {
 						lot.setCorpName(lotService.generateCorpName(lot));
 					}
-					if (lot.getRegistrationDate() == null){
-						lot.setRegistrationDate(new Date());				
+					if (lot.getRegistrationDate() == null) {
+						lot.setRegistrationDate(new Date());
 					}
 
 					Double parentWeight = parent.getMolWeight();
@@ -481,35 +503,35 @@ public MetalotReturn processAndSave(Metalot metaLot, MetalotReturn mr, ArrayList
 					logger.debug("Here is the parent totalSaltWeigth " + totalSaltWeight);
 
 					Double lotWeight = parent.getMolWeight() + totalSaltWeight;
-					logger.debug("lotWeight: " + lotWeight);	
+					logger.debug("lotWeight: " + lotWeight);
 
 					lot.setLotMolWeight(lotWeight);
 					logger.info("Here are the lot comments: " + lot.getComments());
 
-					if(lot.getBuid() == null) {
+					if (lot.getBuid() == null) {
 						lot.setBuid(0L);
 					}
 					try {
 						lot.persist();
 						logger.debug("lot buid = " + lot.getBuid());
-						if (!lot.getIsVirtual()){
-							if (lot.getBuid() == 0){
+						if (!lot.getIsVirtual()) {
+							if (lot.getBuid() == 0) {
 								lot.setBuid(lot.getId());
 								lot.merge();
-							}						
+							}
 						}
 
 						lot.flush();
-					} catch (Exception e){
+					} catch (Exception e) {
 						logger.error("Caught an exception saving the lot: " + e);
-						//get a new corp name and try saving again
-						lot.setCorpName(lotService.generateCorpName(lot));	
+						// get a new corp name and try saving again
+						lot.setCorpName(lotService.generateCorpName(lot));
 						lot.persist();
-						if (!lot.getIsVirtual()){
-							if (lot.getBuid() == 0){
+						if (!lot.getIsVirtual()) {
+							if (lot.getBuid() == 0) {
 								lot.setBuid(lot.getId());
 								lot.merge();
-							}						
+							}
 						}
 						lot.flush();
 					}
@@ -517,31 +539,31 @@ public MetalotReturn processAndSave(Metalot metaLot, MetalotReturn mr, ArrayList
 					logger.debug("just persisted the lot");
 					logger.debug("lot weight: " + lot.getLotMolWeight());
 					logger.debug("lot synthesis date: " + lot.getSynthesisDate());
-					logger.debug("lot registered date: " + lot.getRegistrationDate());					
+					logger.debug("lot registered date: " + lot.getRegistrationDate());
 					Set<FileList> fileLists = metaLot.getFileList();
-					if (fileLists.size() > 0){
+					if (fileLists.size() > 0) {
 						Lot fileLot = Lot.findLot(lot.getId());
 						System.out.println("save new set of fileLists");
-						for (FileList fileList : fileLists){
+						for (FileList fileList : fileLists) {
 							fileList.setLot(fileLot);
 							fileList.persist();
 						}
 					} else {
-						logger.debug("no fileLists to save");        	
+						logger.debug("no fileLists to save");
 					}
 
 					logger.info("--------- Number of lotAliases to save: " + lotAliases.size());
 					lot = lotAliasService.updateLotAliases(lot, lotAliases);
-					if (logger.isDebugEnabled()) logger.debug("Lot aliases after save: "+ LotAlias.toJsonArray(lot.getLotAliases()));
-					
+					if (logger.isDebugEnabled())
+						logger.debug("Lot aliases after save: " + LotAlias.toJsonArray(lot.getLotAliases()));
+
 					if (propertiesUtilService.getCompoundInventory()) {
 						boolean hasBarcode = (lot.getBarcode() != null && lot.getBarcode().length() > 0);
-						if (hasBarcode || !propertiesUtilService.getDisableTubeCreationIfNoBarcode() ) {
+						if (hasBarcode || !propertiesUtilService.getDisableTubeCreationIfNoBarcode()) {
 							createNewTube(lot);
 						}
 					}
 
-
 					lot.clear();
 				}
 
@@ -552,7 +574,7 @@ public MetalotReturn processAndSave(Metalot metaLot, MetalotReturn mr, ArrayList
 				int numberOfLotAliases = lotAliases.size();
 				logger.info("number of lot aliases: " + numberOfLotAliases);
 
-				if (!metaLot.isSkipParentDupeCheck()){
+				if (!metaLot.isSkipParentDupeCheck()) {
 					Lot oldLot = Lot.findLot(lot.getId());
 					oldLot.setComments(lot.getComments());
 					oldLot.setColor(lot.getColor());
@@ -595,8 +617,8 @@ public MetalotReturn processAndSave(Metalot metaLot, MetalotReturn mr, ArrayList
 					oldLot.setProject(lot.getProject());
 					//
 					oldLot.setSolutionAmount(lot.getSolutionAmount());
-					if (lot.getSolutionAmountUnits() != null && lot.getSolutionAmountUnits().getId() != null){
-						oldLot.setSolutionAmountUnits(lot.getSolutionAmountUnits());						
+					if (lot.getSolutionAmountUnits() != null && lot.getSolutionAmountUnits().getId() != null) {
+						oldLot.setSolutionAmountUnits(lot.getSolutionAmountUnits());
 					} else {
 						logger.warn("WARN: solutionAmountUnits not defined! ");
 						lot.setSolutionAmountUnits(null);
@@ -604,28 +626,31 @@ public MetalotReturn processAndSave(Metalot metaLot, MetalotReturn mr, ArrayList
 
 					logger.info("--------- Number of lotAliases to save: " + lotAliases.size());
 					oldLot = lotAliasService.updateLotAliases(oldLot, lotAliases);
-					if (logger.isDebugEnabled()) logger.debug("Lot aliases after save: "+ LotAlias.toJsonArray(lot.getLotAliases()));
+					if (logger.isDebugEnabled())
+						logger.debug("Lot aliases after save: " + LotAlias.toJsonArray(lot.getLotAliases()));
 
 					oldLot.setVendor(lot.getVendor());
 					oldLot.persist();
 					oldLot.flush();
 
-					//update cas-number
+					// update cas-number
 					SaltForm oldSaltForm = SaltForm.findSaltForm(lot.getSaltForm().getId());
-					if (logger.isDebugEnabled()) logger.debug("found the saltForm: " + oldSaltForm.toJson());
-					if (lot.getSaltForm().getCasNumber() != null){
+					if (logger.isDebugEnabled())
+						logger.debug("found the saltForm: " + oldSaltForm.toJson());
+					if (lot.getSaltForm().getCasNumber() != null) {
 						oldSaltForm.setCasNumber(lot.getSaltForm().getCasNumber());
 						oldSaltForm.merge();
 						logger.debug("the CAS number is updated.");
 					}
-					if (lot.getSaltForm().getMolStructure() != null){
+					if (lot.getSaltForm().getMolStructure() != null) {
 						oldSaltForm.setMolStructure(lot.getSaltForm().getMolStructure());
 						oldSaltForm.merge();
 						logger.debug("the SaltForm structure is updated.");
 					}
 
 					logger.debug("the lot is updated ");
-					if (logger.isDebugEnabled()) logger.debug(Lot.findLot(oldLot.getId()).toJson());
+					if (logger.isDebugEnabled())
+						logger.debug(Lot.findLot(oldLot.getId()).toJson());
 
 				} else {
 					logger.error("found an old lot while saving the bulk load compounds");
@@ -640,30 +665,30 @@ public MetalotReturn processAndSave(Metalot metaLot, MetalotReturn mr, ArrayList
 				Set<FileList> fileLists = metaLot.getFileList();
 				logger.debug("save new set of fileLists");
 				List<Long> fileIds = new ArrayList<Long>();
-				if (fileLists.size() > 0){
+				if (fileLists.size() > 0) {
 					Lot fileLot = Lot.findLot(lot.getId());
-					for (FileList fileList : fileLists){
-						if (fileList.getId() == null){
+					for (FileList fileList : fileLists) {
+						if (fileList.getId() == null) {
 							fileList.setLot(fileLot);
-							fileList.persist();						
-						} 
+							fileList.persist();
+						}
 						fileIds.add(fileList.getId());
 					}
-				} 
+				}
 
 				logger.debug("file list is updated.");
 
-				List<FileList> dbFileLists = FileList.findFileListsByLot(lot).getResultList();				
-				for (FileList dbFileList : dbFileLists){
-					if(!fileIds.contains(dbFileList.getId())){
+				List<FileList> dbFileLists = FileList.findFileListsByLot(lot).getResultList();
+				for (FileList dbFileList : dbFileLists) {
+					if (!fileIds.contains(dbFileList.getId())) {
 						Long oldId = dbFileList.getId();
 						logger.debug("removing old fileList: " + oldId);
 						FileList oldFileList = FileList.findFileList(oldId);
-						if (oldFileList != null){
+						if (oldFileList != null) {
 							try {
 								oldFileList.remove();
 								logger.debug("removed old fileList: " + oldId);
-							} catch (Exception e){
+							} catch (Exception e) {
 								logger.error("unable to remove the file. Error = " + e);
 							}
 
@@ -695,25 +720,29 @@ public MetalotReturn processAndSave(Metalot metaLot, MetalotReturn mr, ArrayList
 	}
 
 	@Transactional
-	private void createNewTube(Lot lot) throws MalformedURLException, IOException, NoResultException, NonUniqueResultException {
+	private void createNewTube(Lot lot)
+			throws MalformedURLException, IOException, NoResultException, NonUniqueResultException {
 		String baseurl = propertiesUtilService.getAcasURL();
 		String url = baseurl + "containers?";
 		Map<String, String> queryParams = new HashMap<String, String>();
-		queryParams.put("lsType","definition container");
-		queryParams.put("lsKind","tube");
-		queryParams.put("format","codetable");
+		queryParams.put("lsType", "definition container");
+		queryParams.put("lsKind", "tube");
+		queryParams.put("format", "codetable");
 		String definitionContainerCodeTable = SimpleUtil.getFromExternalServer(url, queryParams, logger);
-		Collection<CodeTableDTO> definitionContainerResults = CodeTableDTO.fromJsonArrayToCoes(definitionContainerCodeTable);
-		if (definitionContainerResults.size() == 0){
+		Collection<CodeTableDTO> definitionContainerResults = CodeTableDTO
+				.fromJsonArrayToCoes(definitionContainerCodeTable);
+		if (definitionContainerResults.size() == 0) {
 			logger.error("Could not find definition container for tube");
 			throw new NoResultException("Could not find definition container for tube");
 		}
-		CodeTableDTO definitionContainer = CodeTableDTO.fromJsonArrayToCoes(definitionContainerCodeTable).iterator().next();
+		CodeTableDTO definitionContainer = CodeTableDTO.fromJsonArrayToCoes(definitionContainerCodeTable).iterator()
+				.next();
 		String wellName = "A001";
 		Date recordedDate = new Date();
 		CreatePlateRequestDTO tubeRequest = new CreatePlateRequestDTO();
 		tubeRequest.setBarcode(lot.getBarcode());
-		if (tubeRequest.getBarcode() == null || tubeRequest.getBarcode().length() < 1) tubeRequest.setBarcode(lot.getCorpName());
+		if (tubeRequest.getBarcode() == null || tubeRequest.getBarcode().length() < 1)
+			tubeRequest.setBarcode(lot.getCorpName());
 		tubeRequest.setCreatedDate(recordedDate);
 		tubeRequest.setCreatedUser(lot.getRegisteredBy());
 		tubeRequest.setDefinition(definitionContainer.getCode());
@@ -721,30 +750,32 @@ private void createNewTube(Lot lot) throws MalformedURLException, IOException, N
 		Collection<WellContentDTO> wells = new ArrayList<WellContentDTO>();
 		WellContentDTO well = new WellContentDTO();
 		well.setWellName(wellName);
-		if (lot.getAmount() != null) well.setAmount(new BigDecimal(lot.getAmount()));
-		if (lot.getAmountUnits() != null) well.setAmountUnits(lot.getAmountUnits().getCode());
+		if (lot.getAmount() != null)
+			well.setAmount(new BigDecimal(lot.getAmount()));
+		if (lot.getAmountUnits() != null)
+			well.setAmountUnits(lot.getAmountUnits().getCode());
 		well.setPhysicalState("solid");
 		well.setBatchCode(lot.getCorpName());
 		well.setRecordedBy(lot.getRegisteredBy());
 		well.setRecordedDate(recordedDate);
 		wells.add(well);
 		tubeRequest.setWells(wells);
-				
+
 		url = baseurl + "containers/createTube";
 		try {
 			String createTubeResponse = SimpleUtil.postRequestToExternalServer(url, tubeRequest.toJson(), logger);
 			logger.debug("Created tube: ");
 			logger.debug(createTubeResponse);
-		}catch (IOException e) {
+		} catch (IOException e) {
 			if (e.getMessage().contains("400")) {
-				logger.error("Barcode "+tubeRequest.getBarcode()+" already exists!");
-				throw new NonUniqueResultException("Barcode "+tubeRequest.getBarcode()+" already exists!");
-			}else {
+				logger.error("Barcode " + tubeRequest.getBarcode() + " already exists!");
+				throw new NonUniqueResultException("Barcode " + tubeRequest.getBarcode() + " already exists!");
+			} else {
 				throw e;
 			}
 		}
-		
-		if(lot.getStorageLocation() != null && lot.getStorageLocation().length() > 0) {
+
+		if (lot.getStorageLocation() != null && lot.getStorageLocation().length() > 0) {
 			SetTubeLocationDTO moveDTO = new SetTubeLocationDTO();
 			moveDTO.setBarcode(tubeRequest.getBarcode());
 			moveDTO.setLocationBreadCrumb(lot.getStorageLocation());
@@ -754,17 +785,18 @@ private void createNewTube(Lot lot) throws MalformedURLException, IOException, N
 				String rootLabel = lot.getStorageLocation().split(">")[0];
 				moveDTO.setRootLabel(rootLabel);
 			} catch (Exception e) {
-				//do nothing
+				// do nothing
 			}
 			Collection<SetTubeLocationDTO> moveDTOs = new ArrayList<SetTubeLocationDTO>();
 			moveDTOs.add(moveDTO);
 			url = propertiesUtilService.getAcasAppURL() + "setLocationByBreadCrumb";
 			try {
-				String setLocationResponse = SimpleUtil.postRequestToExternalServer(url, SetTubeLocationDTO.toJsonArray(moveDTOs), logger);
+				String setLocationResponse = SimpleUtil.postRequestToExternalServer(url,
+						SetTubeLocationDTO.toJsonArray(moveDTOs), logger);
 				logger.debug("Successfully set location: ");
 				logger.debug(setLocationResponse);
-			}catch (IOException e) {
-				logger.error("Hit error trying to set location of new tube",e);
+			} catch (IOException e) {
+				logger.error("Hit error trying to set location of new tube", e);
 				logger.error(e.getMessage());
 				throw e;
 			}
@@ -774,7 +806,7 @@ private void createNewTube(Lot lot) throws MalformedURLException, IOException, N
 	private boolean checkUniqueNotebook(Lot lot) {
 		List<Lot> lots = Lot.findLotsByNotebookPageEquals(lot.getNotebookPage()).getResultList();
 		logger.debug("number of lots found by notebook entry" + lots.size());
-		if (lots.size() > 0){
+		if (lots.size() > 0) {
 			return false;
 		} else {
 			return true;
@@ -787,10 +819,10 @@ public static String nullBlankRegDate(String metaLotJson) {
 		return (matcher.replaceFirst("\"synthesisDate\":null"));
 	}
 
-	public Metalot saveParentAliases(Metalot metalot){
+	public Metalot saveParentAliases(Metalot metalot) {
 		Parent parent = metalot.getLot().getParent();
-		for (ParentAlias parentAlias : parent.getParentAliases()){
-			if (parentAlias.getId() == null){
+		for (ParentAlias parentAlias : parent.getParentAliases()) {
+			if (parentAlias.getId() == null) {
 				parentAlias.setParent(parent);
 				parentAlias.persist();
 			}
@@ -799,10 +831,10 @@ public Metalot saveParentAliases(Metalot metalot){
 
 	}
 
-	public Metalot saveLotAliases(Metalot metalot){
+	public Metalot saveLotAliases(Metalot metalot) {
 		Lot lot = metalot.getLot();
-		for (LotAlias lotAlias : lot.getLotAliases()){
-			if (lotAlias.getId() == null){
+		for (LotAlias lotAlias : lot.getLotAliases()) {
+			if (lotAlias.getId() == null) {
 				lotAlias.setLot(lot);
 				lotAlias.persist();
 			}
@@ -810,22 +842,22 @@ public Metalot saveLotAliases(Metalot metalot){
 		return metalot;
 
 	}
-	
+
 	private void generateAndSetCorpName(Parent parent) throws MalformedURLException, IOException {
-		if (propertiesUtilService.getCorpParentFormat().equalsIgnoreCase("license_plate_format")){
+		if (propertiesUtilService.getCorpParentFormat().equalsIgnoreCase("license_plate_format")) {
 			parent.setCorpName(corpNameService.generateCorpLicensePlate());
-			//TODO: set parent number if required
-		} else if (propertiesUtilService.getCorpParentFormat().equalsIgnoreCase("pre_defined_format")){
+			// TODO: set parent number if required
+		} else if (propertiesUtilService.getCorpParentFormat().equalsIgnoreCase("pre_defined_format")) {
 			PreDef_CorpName preDef_CorpName = PreDef_CorpName.findNextCorpName();
 			parent.setCorpName(preDef_CorpName.getCorpName());
 			preDef_CorpName.setUsed(true);
 			preDef_CorpName.persist();
-			parent.setParentNumber(preDef_CorpName.getCorpNumber());							
+			parent.setParentNumber(preDef_CorpName.getCorpNumber());
 		} else if (propertiesUtilService.getCorpParentFormat().equalsIgnoreCase("ACASLabelSequence")) {
 			LabelPrefixDTO labelPrefixDTO = parent.getLabelPrefix();
 			labelPrefixDTO.setNumberOfLabels(1L);
 			labelPrefixDTO.setLabelPrefix(labelPrefixDTO.getName());
-			String url = propertiesUtilService.getAcasURL()+"labelsequences/getLabels";
+			String url = propertiesUtilService.getAcasURL() + "labelsequences/getLabels";
 			String jsonContent = labelPrefixDTO.toSafeJson();
 			String responseJson = SimpleUtil.postRequestToExternalServer(url, jsonContent, logger);
 			AutoLabelDTO autoLabel = AutoLabelDTO.fromJsonArrayToAutoes(responseJson).iterator().next();
@@ -837,14 +869,13 @@ private void generateAndSetCorpName(Parent parent) throws MalformedURLException,
 			parent.setParentNumber(corpName.getCorpNumber());
 		}
 	}
-	
+
 	private boolean checkCorpNameAlreadyExists(String corpName) {
-		if (Parent.countFindParentsByCorpNameEquals(corpName) > 0L){
+		if (Parent.countFindParentsByCorpNameEquals(corpName) > 0L) {
 			return true;
-		}else {
+		} else {
 			return false;
 		}
 	}
 
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ParentAliasService.java b/src/main/java/com/labsynch/labseer/service/ParentAliasService.java
index 2060872ab..98b482bf0 100644
--- a/src/main/java/com/labsynch/labseer/service/ParentAliasService.java
+++ b/src/main/java/com/labsynch/labseer/service/ParentAliasService.java
@@ -5,10 +5,8 @@
 import com.labsynch.labseer.domain.Parent;
 import com.labsynch.labseer.domain.ParentAlias;
 
-
 public interface ParentAliasService {
 
-
 	public Parent updateParentAliases(Parent parent);
 
 	public Parent updateParentAliases(Parent parent,
diff --git a/src/main/java/com/labsynch/labseer/service/ParentAliasServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ParentAliasServiceImpl.java
index 38e683e1b..4bc3a787e 100644
--- a/src/main/java/com/labsynch/labseer/service/ParentAliasServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ParentAliasServiceImpl.java
@@ -25,12 +25,14 @@ public Parent updateParentAliases(Parent parent) {
 		Set<ParentAlias> aliasesToBeSaved = parent.getParentAliases();
 		logger.debug(ParentAlias.toJsonArray(aliasesToBeSaved));
 		Set<ParentAlias> savedAliases = new HashSet<ParentAlias>();
-		if (aliasesToBeSaved != null && !aliasesToBeSaved.isEmpty()){
-			for (ParentAlias aliasToBeSaved : aliasesToBeSaved){
+		if (aliasesToBeSaved != null && !aliasesToBeSaved.isEmpty()) {
+			for (ParentAlias aliasToBeSaved : aliasesToBeSaved) {
 				logger.debug(aliasToBeSaved.toJson());
 				aliasToBeSaved.setParent(parent);
-				if (aliasToBeSaved.getId() == null) aliasToBeSaved.persist();
-				else aliasToBeSaved.merge();
+				if (aliasToBeSaved.getId() == null)
+					aliasToBeSaved.persist();
+				else
+					aliasToBeSaved.merge();
 				savedAliases.add(aliasToBeSaved);
 				logger.debug(aliasToBeSaved.toJson());
 				logger.debug(ParentAlias.toJsonArray(savedAliases));
@@ -45,11 +47,13 @@ public Parent updateParentAliases(Parent parent,
 			Set<ParentAlias> parentAliases) {
 		Set<ParentAlias> aliasesToBeSaved = parentAliases;
 		Set<ParentAlias> savedAliases = new HashSet<ParentAlias>();
-		if (aliasesToBeSaved != null && !aliasesToBeSaved.isEmpty()){
-			for (ParentAlias aliasToBeSaved : aliasesToBeSaved){
+		if (aliasesToBeSaved != null && !aliasesToBeSaved.isEmpty()) {
+			for (ParentAlias aliasToBeSaved : aliasesToBeSaved) {
 				aliasToBeSaved.setParent(parent);
-				if (aliasToBeSaved.getId() == null) aliasToBeSaved.persist();
-				else aliasToBeSaved = aliasToBeSaved.merge();
+				if (aliasToBeSaved.getId() == null)
+					aliasToBeSaved.persist();
+				else
+					aliasToBeSaved = aliasToBeSaved.merge();
 				savedAliases.add(aliasToBeSaved);
 			}
 		}
@@ -57,8 +61,7 @@ public Parent updateParentAliases(Parent parent,
 		return parent;
 	}
 
-		
-	//update liveDesign corp name aliases
+	// update liveDesign corp name aliases
 	@Override
 	public Parent updateParentLiveDesignAlias(Parent parent, String aliasList) {
 		String lsType = "external id";
@@ -67,8 +70,7 @@ public Parent updateParentLiveDesignAlias(Parent parent, String aliasList) {
 		return parent;
 	}
 
-	
-	//update common name aliases
+	// update common name aliases
 	@Override
 	public Parent updateParentCommonNameAlias(Parent parent, String aliasList) {
 		String lsType = "other name";
@@ -76,8 +78,8 @@ public Parent updateParentCommonNameAlias(Parent parent, String aliasList) {
 		parent = updateParentAliasByTypeAndKind(parent, lsType, lsKind, aliasList);
 		return parent;
 	}
-	
-	//update default parent aliases
+
+	// update default parent aliases
 	@Override
 	public Parent updateParentDefaultAlias(Parent parent, String aliasList) {
 		String lsType = "default";
@@ -85,23 +87,24 @@ public Parent updateParentDefaultAlias(Parent parent, String aliasList) {
 		parent = updateParentAliasByTypeAndKind(parent, lsType, lsKind, aliasList);
 		return parent;
 	}
-	
+
 	@Override
 	public Parent updateParentAliasByTypeAndKind(Parent parent, String lsType, String lsKind, String aliasList) {
-		if (aliasList != null){
-			List<ParentAlias> existingAliases = ParentAlias.findParentAliasesByParentAndLsTypeEqualsAndLsKindEquals(parent, lsType, lsKind).getResultList();
+		if (aliasList != null) {
+			List<ParentAlias> existingAliases = ParentAlias
+					.findParentAliasesByParentAndLsTypeEqualsAndLsKindEquals(parent, lsType, lsKind).getResultList();
 			Map<String, ParentAlias> existingAliasMap = new HashMap<String, ParentAlias>();
-			for (ParentAlias existingAlias : existingAliases){
+			for (ParentAlias existingAlias : existingAliases) {
 				existingAliasMap.put(existingAlias.getAliasName(), existingAlias);
 			}
 
 			Map<String, ParentAlias> newAliasMap = new HashMap<String, ParentAlias>();
 			Set<ParentAlias> parentAliasSet = new HashSet<ParentAlias>();
-			
+
 			logger.info("####### Incoming alias list: " + aliasList);
 			String[] aliases = aliasList.split(";");
-			for (String alias : aliases){
-				if (!existingAliasMap.containsKey(alias)){
+			for (String alias : aliases) {
+				if (!existingAliasMap.containsKey(alias)) {
 					ParentAlias parentAlias = new ParentAlias();
 					parentAlias.setLsType(lsType);
 					parentAlias.setLsKind(lsKind);
@@ -116,9 +119,9 @@ public Parent updateParentAliasByTypeAndKind(Parent parent, String lsType, Strin
 				}
 			}
 
-			for (String aliasKey : existingAliasMap.keySet()){
-				if (!newAliasMap.containsKey(aliasKey)){
-					//not present -- so marked to ignore
+			for (String aliasKey : existingAliasMap.keySet()) {
+				if (!newAliasMap.containsKey(aliasKey)) {
+					// not present -- so marked to ignore
 					ParentAlias queryAlias = existingAliasMap.get(aliasKey);
 					logger.info("current query alias: " + queryAlias);
 					queryAlias.setIgnored(true);
@@ -126,15 +129,14 @@ public Parent updateParentAliasByTypeAndKind(Parent parent, String lsType, Strin
 				}
 			}
 
-			for (ParentAlias pa : parentAliasSet){
+			for (ParentAlias pa : parentAliasSet) {
 				logger.info(pa.toJson());
 			}
-			
+
 			parent.setParentAliases(parentAliasSet);
 		}
 
 		return parent;
 	}
-	
-}
 
+}
diff --git a/src/main/java/com/labsynch/labseer/service/ParentLotService.java b/src/main/java/com/labsynch/labseer/service/ParentLotService.java
index 1fb4d31d2..da8ee65d1 100644
--- a/src/main/java/com/labsynch/labseer/service/ParentLotService.java
+++ b/src/main/java/com/labsynch/labseer/service/ParentLotService.java
@@ -6,10 +6,8 @@
 import com.labsynch.labseer.dto.CodeTableDTO;
 import com.labsynch.labseer.dto.ParentLotCodeDTO;
 
-
 public interface ParentLotService {
 
-
 	public Collection<CodeTableDTO> getCodeTableLotsByParentCorpName(String parentCorpName);
 
 	public Collection<ParentLotCodeDTO> getLotCodesByParentAlias(Collection<ParentLotCodeDTO> requestDTOs);
diff --git a/src/main/java/com/labsynch/labseer/service/ParentLotServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ParentLotServiceImpl.java
index fa1e112d4..8216d7bc2 100644
--- a/src/main/java/com/labsynch/labseer/service/ParentLotServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ParentLotServiceImpl.java
@@ -24,14 +24,14 @@ public class ParentLotServiceImpl implements ParentLotService {
 
 	@Override
 	@Transactional
-	public Collection<CodeTableDTO> getCodeTableLotsByParentCorpName(String parentCorpName) throws NoResultException{
+	public Collection<CodeTableDTO> getCodeTableLotsByParentCorpName(String parentCorpName) throws NoResultException {
 		Parent parent = Parent.findParentsByCorpNameEquals(parentCorpName).getSingleResult();
 		Collection<Lot> lots = new HashSet<Lot>();
-		for (SaltForm saltForm : parent.getSaltForms()){
+		for (SaltForm saltForm : parent.getSaltForms()) {
 			lots.addAll(saltForm.getLots());
 		}
 		Collection<CodeTableDTO> codeTableLots = new HashSet<CodeTableDTO>();
-		for (Lot lot : lots){
+		for (Lot lot : lots) {
 			CodeTableDTO codeTable = new CodeTableDTO();
 			codeTable.setCode(lot.getCorpName());
 			codeTable.setName(lot.getCorpName());
@@ -40,49 +40,50 @@ public Collection<CodeTableDTO> getCodeTableLotsByParentCorpName(String parentCo
 		}
 		return codeTableLots;
 	}
-	
+
 	@Override
 	@Transactional
-	public Collection<Lot> getLotsByParentCorpName(String parentCorpName) throws NoResultException{
+	public Collection<Lot> getLotsByParentCorpName(String parentCorpName) throws NoResultException {
 		Parent parent = Parent.findParentsByCorpNameEquals(parentCorpName).getSingleResult();
 		Collection<Lot> lots = new HashSet<Lot>();
-		for (SaltForm saltForm : parent.getSaltForms()){
+		for (SaltForm saltForm : parent.getSaltForms()) {
 			lots.addAll(saltForm.getLots());
 		}
 		return lots;
 	}
 
-
 	@Override
 	@Transactional
 	public Collection<ParentLotCodeDTO> getLotCodesByParentAlias(
 			Collection<ParentLotCodeDTO> requestDTOs) {
 		Collection<ParentLotCodeDTO> responseDTOs = new HashSet<ParentLotCodeDTO>();
-		for (ParentLotCodeDTO requestDTO : requestDTOs){
+		for (ParentLotCodeDTO requestDTO : requestDTOs) {
 			Collection<Parent> foundParents = new HashSet<Parent>();
-			try{
-				Collection<ParentAlias> foundAliases = ParentAlias.findParentAliasesByAliasNameEquals(requestDTO.getRequestName()).getResultList();
-				for (ParentAlias foundAlias : foundAliases){
-					if (foundAlias.getParent() != null) foundParents.add(foundAlias.getParent());
+			try {
+				Collection<ParentAlias> foundAliases = ParentAlias
+						.findParentAliasesByAliasNameEquals(requestDTO.getRequestName()).getResultList();
+				for (ParentAlias foundAlias : foundAliases) {
+					if (foundAlias.getParent() != null)
+						foundParents.add(foundAlias.getParent());
 				}
 				foundParents.addAll(Parent.findParentsByCorpNameEquals(requestDTO.getRequestName()).getResultList());
-			}catch(Exception e){
-				//do nothing
+			} catch (Exception e) {
+				// do nothing
 			}
-			if (!foundParents.isEmpty()){
-				for (Parent foundParent : foundParents){
+			if (!foundParents.isEmpty()) {
+				for (Parent foundParent : foundParents) {
 					ParentLotCodeDTO responseDTO = new ParentLotCodeDTO();
 					responseDTO.setRequestName(requestDTO.getRequestName());
 					responseDTO.setReferenceCode(foundParent.getCorpName());
 					responseDTO.setLotCodes(new HashSet<String>());
-					for (SaltForm saltForm : foundParent.getSaltForms()){
-						for (Lot lot : saltForm.getLots()){
+					for (SaltForm saltForm : foundParent.getSaltForms()) {
+						for (Lot lot : saltForm.getLots()) {
 							responseDTO.getLotCodes().add(lot.getCorpName());
 						}
 					}
 					responseDTOs.add(responseDTO);
 				}
-			}else{
+			} else {
 				ParentLotCodeDTO responseDTO = new ParentLotCodeDTO();
 				responseDTO.setRequestName(requestDTO.getRequestName());
 				responseDTOs.add(responseDTO);
@@ -91,22 +92,16 @@ public Collection<ParentLotCodeDTO> getLotCodesByParentAlias(
 		return responseDTOs;
 	}
 
-	
 	@Transactional
 	public void updateLot() {
-		
-		
+
 		// What does the service do?
 		// input: json lot object -- metalot object?
-//		All fields except compound structure and salts should be editable.
-//		If property is not passed in, property will remain the same.
-//		Check for parent uniqueness in consideration of edits, throw error if changes to parent will conflict with existing parent.
-		
-		
+		// All fields except compound structure and salts should be editable.
+		// If property is not passed in, property will remain the same.
+		// Check for parent uniqueness in consideration of edits, throw error if changes
+		// to parent will conflict with existing parent.
 
 	}
-	
-		
-	
-}
 
+}
diff --git a/src/main/java/com/labsynch/labseer/service/ParentService.java b/src/main/java/com/labsynch/labseer/service/ParentService.java
index 8f7ab9ff1..b772e040d 100644
--- a/src/main/java/com/labsynch/labseer/service/ParentService.java
+++ b/src/main/java/com/labsynch/labseer/service/ParentService.java
@@ -9,12 +9,11 @@
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
 import com.labsynch.labseer.exceptions.StandardizerException;
 
-
-
 public interface ParentService {
 
-	ParentValidationDTO validateUniqueParent(Parent queryParent) throws CmpdRegMolFormatException, StandardizerException;
-	
+	ParentValidationDTO validateUniqueParent(Parent queryParent)
+			throws CmpdRegMolFormatException, StandardizerException;
+
 	Collection<CodeTableDTO> updateParent(Parent parent);
 
 	Parent updateParentMeta(ParentEditDTO parentDTO);
diff --git a/src/main/java/com/labsynch/labseer/service/ParentServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ParentServiceImpl.java
index bbcde231e..de4752ddb 100644
--- a/src/main/java/com/labsynch/labseer/service/ParentServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ParentServiceImpl.java
@@ -31,8 +31,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-
-
 @Service
 public class ParentServiceImpl implements ParentService {
 
@@ -52,10 +50,10 @@ public class ParentServiceImpl implements ParentService {
 
 	@Autowired
 	public ParentAliasService parentAliasService;
-	
+
 	@Autowired
 	public CmpdRegSDFWriterFactory cmpdRegSDFWriterFactory;
-	
+
 	@Autowired
 	public CmpdRegMoleculeFactory cmpdRegMoleculeFactory;
 
@@ -64,80 +62,93 @@ public class ParentServiceImpl implements ParentService {
 	public ParentValidationDTO validateUniqueParent(Parent queryParent) throws CmpdRegMolFormatException {
 		ParentValidationDTO validationDTO = new ParentValidationDTO();
 
-		if (queryParent.getCorpName() == null) validationDTO.getErrors().add(new ErrorMessage("error","Must provide corpName for parent to be validated"));
-		if (queryParent.getStereoCategory() == null) validationDTO.getErrors().add(new ErrorMessage("error","Must provide stereo category for parent to be validated"));
-		if (queryParent.getStereoCategory().getCode().equalsIgnoreCase("see_comments") && (queryParent.getStereoComment() == null || queryParent.getStereoComment().length()==0)){
-			validationDTO.getErrors().add(new ErrorMessage("error","Stereo category is See Comments, but no stereo comment provided"));
+		if (queryParent.getCorpName() == null)
+			validationDTO.getErrors()
+					.add(new ErrorMessage("error", "Must provide corpName for parent to be validated"));
+		if (queryParent.getStereoCategory() == null)
+			validationDTO.getErrors()
+					.add(new ErrorMessage("error", "Must provide stereo category for parent to be validated"));
+		if (queryParent.getStereoCategory().getCode().equalsIgnoreCase("see_comments")
+				&& (queryParent.getStereoComment() == null || queryParent.getStereoComment().length() == 0)) {
+			validationDTO.getErrors()
+					.add(new ErrorMessage("error", "Stereo category is See Comments, but no stereo comment provided"));
 		}
-		if (chemStructureService.checkForSalt(queryParent.getMolStructure())){
-			if (queryParent.getIsMixture() != null){
-				if (!queryParent.getIsMixture()){
-					validationDTO.getErrors().add(new ErrorMessage("error","Multiple fragments found. Please register the neutral base parent or mark as a Mixture"));
+		if (chemStructureService.checkForSalt(queryParent.getMolStructure())) {
+			if (queryParent.getIsMixture() != null) {
+				if (!queryParent.getIsMixture()) {
+					validationDTO.getErrors().add(new ErrorMessage("error",
+							"Multiple fragments found. Please register the neutral base parent or mark as a Mixture"));
 				}
-			}else{
-				validationDTO.getErrors().add(new ErrorMessage("error","Multiple fragments found. Please register the neutral base parent or mark as a Mixture"));
+			} else {
+				validationDTO.getErrors().add(new ErrorMessage("error",
+						"Multiple fragments found. Please register the neutral base parent or mark as a Mixture"));
 			}
 		}
-		if (!validationDTO.getErrors().isEmpty()){
-			for (ErrorMessage error : validationDTO.getErrors()){
+		if (!validationDTO.getErrors().isEmpty()) {
+			for (ErrorMessage error : validationDTO.getErrors()) {
 				logger.error(error.getMessage());
 			}
 			return validationDTO;
 		}
 		Collection<ParentDTO> dupeParents = new HashSet<ParentDTO>();
 		int[] dupeParentList = {};
-		if (propertiesUtilService.getRegisterNoStructureCompoundsAsUniqueParents() && chemStructureService.isEmpty(queryParent.getMolStructure()) ) {
-			logger.warn("mol is empty and registerNoStructureCompoundsAsUniqueParents so not checking for dupe parents by structure but other dupe checking will be done");
-		} {
+		if (propertiesUtilService.getRegisterNoStructureCompoundsAsUniqueParents()
+				&& chemStructureService.isEmpty(queryParent.getMolStructure())) {
+			logger.warn(
+					"mol is empty and registerNoStructureCompoundsAsUniqueParents so not checking for dupe parents by structure but other dupe checking will be done");
+		}
+		{
 			dupeParentList = chemStructureService.checkDupeMol(queryParent.getMolStructure(), StructureType.PARENT);
 		}
-		if (dupeParentList.length > 0){
-			searchResultLoop:
-				for (int foundParentCdId : dupeParentList){
-					List<Parent> foundParents = Parent.findParentsByCdId(foundParentCdId).getResultList();
-					for (Parent foundParent : foundParents){
-						//same structure hits
-						if (queryParent.getCorpName().equals(foundParent.getCorpName())){
-							//corpName match => this is the parent we're searching on. ignore this match.
-							continue;
-						}else{
-							//same structure, different corpName => check stereo category
-							if(queryParent.getStereoCategory().getCode().equalsIgnoreCase(foundParent.getStereoCategory().getCode())){
-								//same structure and stereo category => check stereo comment
-								if (queryParent.getStereoComment() == null && foundParent.getStereoComment() == null){
-									//both null - stereo comments match => this is a dupe
-									ParentDTO foundDupeParentDTO = new ParentDTO();
-									foundDupeParentDTO.setCorpName(foundParent.getCorpName());
-									foundDupeParentDTO.setStereoCategory(foundParent.getStereoCategory());
-									foundDupeParentDTO.setStereoComment(foundParent.getStereoComment());
-									dupeParents.add(foundDupeParentDTO);
-								}else if (queryParent.getStereoComment() == null || foundParent.getStereoComment() == null){
-									//one null, the other is not => not a dupe
-									continue;
-								}else if (queryParent.getStereoComment().equalsIgnoreCase(foundParent.getStereoComment())){
-									//same stereo comment => this is a dupe
-									ParentDTO foundDupeParentDTO = new ParentDTO();
-									foundDupeParentDTO.setCorpName(foundParent.getCorpName());
-									foundDupeParentDTO.setStereoCategory(foundParent.getStereoCategory());
-									foundDupeParentDTO.setStereoComment(foundParent.getStereoComment());
-									dupeParents.add(foundDupeParentDTO);
-								}else{
-									//different stereo comment => not a dupe
-									continue;
-								}
-							}else{
-								//different stereo category => not a dupe
+		if (dupeParentList.length > 0) {
+			searchResultLoop: for (int foundParentCdId : dupeParentList) {
+				List<Parent> foundParents = Parent.findParentsByCdId(foundParentCdId).getResultList();
+				for (Parent foundParent : foundParents) {
+					// same structure hits
+					if (queryParent.getCorpName().equals(foundParent.getCorpName())) {
+						// corpName match => this is the parent we're searching on. ignore this match.
+						continue;
+					} else {
+						// same structure, different corpName => check stereo category
+						if (queryParent.getStereoCategory().getCode()
+								.equalsIgnoreCase(foundParent.getStereoCategory().getCode())) {
+							// same structure and stereo category => check stereo comment
+							if (queryParent.getStereoComment() == null && foundParent.getStereoComment() == null) {
+								// both null - stereo comments match => this is a dupe
+								ParentDTO foundDupeParentDTO = new ParentDTO();
+								foundDupeParentDTO.setCorpName(foundParent.getCorpName());
+								foundDupeParentDTO.setStereoCategory(foundParent.getStereoCategory());
+								foundDupeParentDTO.setStereoComment(foundParent.getStereoComment());
+								dupeParents.add(foundDupeParentDTO);
+							} else if (queryParent.getStereoComment() == null
+									|| foundParent.getStereoComment() == null) {
+								// one null, the other is not => not a dupe
+								continue;
+							} else if (queryParent.getStereoComment()
+									.equalsIgnoreCase(foundParent.getStereoComment())) {
+								// same stereo comment => this is a dupe
+								ParentDTO foundDupeParentDTO = new ParentDTO();
+								foundDupeParentDTO.setCorpName(foundParent.getCorpName());
+								foundDupeParentDTO.setStereoCategory(foundParent.getStereoCategory());
+								foundDupeParentDTO.setStereoComment(foundParent.getStereoComment());
+								dupeParents.add(foundDupeParentDTO);
+							} else {
+								// different stereo comment => not a dupe
 								continue;
 							}
+						} else {
+							// different stereo category => not a dupe
+							continue;
 						}
 					}
 				}
+			}
 		}
-		if (!dupeParents.isEmpty()){
+		if (!dupeParents.isEmpty()) {
 			validationDTO.setParentUnique(false);
 			validationDTO.setDupeParents(dupeParents);
 			return validationDTO;
-		}else{
+		} else {
 			validationDTO.setParentUnique(true);
 			validationDTO.setAffectedLots(parentLotService.getCodeTableLotsByParentCorpName(queryParent.getCorpName()));
 			return validationDTO;
@@ -145,65 +156,68 @@ public ParentValidationDTO validateUniqueParent(Parent queryParent) throws CmpdR
 	}
 
 	@Override
-	public Collection<CodeTableDTO> updateParent(Parent parent){
+	public Collection<CodeTableDTO> updateParent(Parent parent) {
 		Set<ParentAlias> parentAliases = parent.getParentAliases();
 		parent = parentStructureService.update(parent);
-		//save parent aliases
+		// save parent aliases
 		logger.info("--------- Number of parentAliases to save: " + parentAliases.size());
 		parent = parentAliasService.updateParentAliases(parent, parentAliases);
-		if (logger.isDebugEnabled()) logger.debug("Parent aliases after save: "+ ParentAlias.toJsonArray(parent.getParentAliases()));
+		if (logger.isDebugEnabled())
+			logger.debug("Parent aliases after save: " + ParentAlias.toJsonArray(parent.getParentAliases()));
 		Collection<CodeTableDTO> affectedLots = parentLotService.getCodeTableLotsByParentCorpName(parent.getCorpName());
 		return affectedLots;
 	}
-	
+
 	@Override
-	public String updateParentMetaArray(String jsonInput){
+	public String updateParentMetaArray(String jsonInput) {
 		int parentCounter = 0;
 		Collection<ParentEditDTO> parentDTOs = ParentEditDTO.fromJsonArrayToParentEditDTO(jsonInput);
-		for (ParentEditDTO parentDTO : parentDTOs){
+		for (ParentEditDTO parentDTO : parentDTOs) {
 			updateParentMeta(parentDTO);
 			parentCounter++;
 		}
 		String returnMessage = "Number of parents updated: " + parentCounter;
 
-		return  returnMessage;
+		return returnMessage;
 	}
-		
-	
+
 	@Override
-	public Parent updateParentMeta(ParentEditDTO parentDTO){
+	public Parent updateParentMeta(ParentEditDTO parentDTO) {
 
 		// NON-EDITABLE fields via this service
-		//		private Set<SaltFormDTO> saltForms = new HashSet<SaltFormDTO>();
-		//		private String molStructure;
-		//		private Double exactMass;
-		//		private String molFormula;
-		//		private int CdId;
-		//	    private Double molWeight;
-		
+		// private Set<SaltFormDTO> saltForms = new HashSet<SaltFormDTO>();
+		// private String molStructure;
+		// private Double exactMass;
+		// private String molFormula;
+		// private int CdId;
+		// private Double molWeight;
+
 		Parent parent = null;
-		if (parentDTO.getId() != null){
+		if (parentDTO.getId() != null) {
 			parent = Parent.findParent(parentDTO.getId());
 		} else {
 			List<Parent> parents = Parent.findParentsByCorpNameEquals(parentDTO.getCorpName()).getResultList();
-			if (parents.size() == 0){
+			if (parents.size() == 0) {
 				String errorMessage = "ERROR: Did not find requested query parent: " + parentDTO.getCorpName();
 				logger.error(errorMessage);
 				throw new RuntimeException(errorMessage);
-			} else if (parents.size() > 1){
-				String errorMessage = "ERROR: found multiple parents for: " + parentDTO.getCorpName();		
-				logger.error(errorMessage);		
+			} else if (parents.size() > 1) {
+				String errorMessage = "ERROR: found multiple parents for: " + parentDTO.getCorpName();
+				logger.error(errorMessage);
 				throw new RuntimeException(errorMessage);
 			} else {
 				parent = parents.get(0);
 			}
 		}
 
-		if (parentDTO.getComment() != null) parent.setComment(parentDTO.getComment());
-		if (parentDTO.getStereoCategoryCode() != null && parentDTO.getStereoCategoryCode().length() > 0){
-			parent.setStereoCategory(StereoCategory.findStereoCategorysByCodeEquals(parentDTO.getStereoCategoryCode()).getSingleResult());
+		if (parentDTO.getComment() != null)
+			parent.setComment(parentDTO.getComment());
+		if (parentDTO.getStereoCategoryCode() != null && parentDTO.getStereoCategoryCode().length() > 0) {
+			parent.setStereoCategory(StereoCategory.findStereoCategorysByCodeEquals(parentDTO.getStereoCategoryCode())
+					.getSingleResult());
 		}
-		if (parentDTO.getStereoComment() != null) parent.setStereoComment(parentDTO.getStereoComment());
+		if (parentDTO.getStereoComment() != null)
+			parent.setStereoComment(parentDTO.getStereoComment());
 
 		ParentValidationDTO parentValidationDTO = null;
 		try {
@@ -213,82 +227,84 @@ public Parent updateParentMeta(ParentEditDTO parentDTO){
 			e.printStackTrace();
 		}
 
-		if (!parentValidationDTO.isParentUnique()){
+		if (!parentValidationDTO.isParentUnique()) {
 			String errorMessage = "ERROR: Changing stereocategory and/or comments will create a duplicate parent";
-			logger.error(errorMessage );
+			logger.error(errorMessage);
 			throw new RuntimeException(errorMessage);
-		} 
-		
-		
-		if (parentDTO.getChemistCode() != null && parentDTO.getChemistCode().length() > 0){
+		}
+
+		if (parentDTO.getChemistCode() != null && parentDTO.getChemistCode().length() > 0) {
 			parent.setChemist(Author.findAuthorsByUserName(parentDTO.getChemistCode()).getSingleResult().getUserName());
 		}
-		if (parentDTO.getCommonName() != null && parentDTO.getCommonName().length() > 0) parent.setCommonName(parentDTO.getCommonName());
-		if (parentDTO.getIgnore() != null) parent.setIgnore(parentDTO.getIgnore());
-		if (parentDTO.getIsMixture() != null) parent.setIsMixture(parentDTO.getIsMixture());
-		if (parentDTO.getCompoundTypeCode() != null && parentDTO.getCompoundTypeCode().length() > 0){
-			parent.setCompoundType(CompoundType.findCompoundTypesByCodeEquals(parentDTO.getCompoundTypeCode()).getSingleResult());
+		if (parentDTO.getCommonName() != null && parentDTO.getCommonName().length() > 0)
+			parent.setCommonName(parentDTO.getCommonName());
+		if (parentDTO.getIgnore() != null)
+			parent.setIgnore(parentDTO.getIgnore());
+		if (parentDTO.getIsMixture() != null)
+			parent.setIsMixture(parentDTO.getIsMixture());
+		if (parentDTO.getCompoundTypeCode() != null && parentDTO.getCompoundTypeCode().length() > 0) {
+			parent.setCompoundType(
+					CompoundType.findCompoundTypesByCodeEquals(parentDTO.getCompoundTypeCode()).getSingleResult());
 		}
-		if (parentDTO.getParentAnnotationCode() != null && parentDTO.getParentAnnotationCode().length() > 0){
-			parent.setParentAnnotation(ParentAnnotation.findParentAnnotationsByCodeEquals(parentDTO.getParentAnnotationCode()).getSingleResult());
+		if (parentDTO.getParentAnnotationCode() != null && parentDTO.getParentAnnotationCode().length() > 0) {
+			parent.setParentAnnotation(ParentAnnotation
+					.findParentAnnotationsByCodeEquals(parentDTO.getParentAnnotationCode()).getSingleResult());
 		}
-		
-		if (parentDTO.getLiveDesignAliases() != null && parentDTO.getLiveDesignAliases().length() > 0){
+
+		if (parentDTO.getLiveDesignAliases() != null && parentDTO.getLiveDesignAliases().length() > 0) {
 			parent = parentAliasService.updateParentLiveDesignAlias(parent, parentDTO.getLiveDesignAliases());
 		}
 
-		if (parentDTO.getCommonNameAliases() != null && parentDTO.getCommonNameAliases().length() > 0){
+		if (parentDTO.getCommonNameAliases() != null && parentDTO.getCommonNameAliases().length() > 0) {
 			parent = parentAliasService.updateParentCommonNameAlias(parent, parentDTO.getCommonNameAliases());
 		}
-		
-		if (parentDTO.getDefaultAliases() != null && parentDTO.getDefaultAliases().length() > 0){
+
+		if (parentDTO.getDefaultAliases() != null && parentDTO.getDefaultAliases().length() > 0) {
 			parent = parentAliasService.updateParentDefaultAlias(parent, parentDTO.getDefaultAliases());
 		}
 
-		
-		if (parentDTO.getParentAliases() != null && !parentDTO.getParentAliases().isEmpty()){
+		if (parentDTO.getParentAliases() != null && !parentDTO.getParentAliases().isEmpty()) {
 			parent = updateParentAliasSet(parent, parentDTO);
 		}
-		
 
-		if (parentValidationDTO.isParentUnique()){
+		if (parentValidationDTO.isParentUnique()) {
 			parent.setModifiedDate(new Date());
-			if (parentDTO.getModifiedBy() != null && parentDTO.getModifiedBy().length() > 0) parent.setModifiedBy(parentDTO.getModifiedBy());
+			if (parentDTO.getModifiedBy() != null && parentDTO.getModifiedBy().length() > 0)
+				parent.setModifiedBy(parentDTO.getModifiedBy());
 			parent.merge();
 		}
 
 		return parent;
 	}
 
-
 	private Parent updateParentAliasSet(Parent parent, ParentEditDTO parentDTO) {
 		Set<ParentAliasDTO> parentDTOAliases = parentDTO.getParentAliases();
 		Map<String, ParentAliasDTO> parentDTOAliasMAP = new HashMap<String, ParentAliasDTO>();
-		for (ParentAliasDTO parentDTOAlias : parentDTOAliases){
+		for (ParentAliasDTO parentDTOAlias : parentDTOAliases) {
 			parentDTOAliasMAP.put(parentDTOAlias.getAliasName(), parentDTOAlias);
 		}
-		
+
 		List<ParentAlias> parentAliases = ParentAlias.findParentAliasesByParent(parent).getResultList();
 		Map<String, ParentAlias> parentAliasMAP = new HashMap<String, ParentAlias>();
-		for (ParentAlias parentAlias : parentAliases){
+		for (ParentAlias parentAlias : parentAliases) {
 			parentAliasMAP.put(parentAlias.getAliasName(), parentAlias);
 		}
-		
-		if (parentAliases != null && !parentAliases.isEmpty()){
-			for (ParentAlias parentAlias : parentAliases){
-				if (!parentDTOAliasMAP.containsKey(parentAlias.getAliasName())){
+
+		if (parentAliases != null && !parentAliases.isEmpty()) {
+			for (ParentAlias parentAlias : parentAliases) {
+				if (!parentDTOAliasMAP.containsKey(parentAlias.getAliasName())) {
 					parentAlias.setIgnored(true);
-					parentAlias.merge();						
+					parentAlias.merge();
 				}
 			}
 		}
 
 		Set<ParentAlias> newParentAliases = new HashSet<ParentAlias>();
-		for (ParentAliasDTO parentAliasDTO : parentDTO.getParentAliases()){
-			if (parentAliasMAP.containsKey(parentAliasDTO.getAliasName())){
-				
+		for (ParentAliasDTO parentAliasDTO : parentDTO.getParentAliases()) {
+			if (parentAliasMAP.containsKey(parentAliasDTO.getAliasName())) {
+
 			} else {
-				
+
 			}
 			ParentAlias newParentAlias = new ParentAlias();
 			newParentAlias.setAliasName(parentAliasDTO.getAliasName());
@@ -298,11 +314,10 @@ private Parent updateParentAliasSet(Parent parent, ParentEditDTO parentDTO) {
 			newParentAlias.persist();
 			newParentAliases.add(newParentAlias);
 		}
-		
+
 		parent.setParentAliases(newParentAliases);
-		
+
 		return parent;
 	}
 
 }
-
diff --git a/src/main/java/com/labsynch/labseer/service/ParentStructureService.java b/src/main/java/com/labsynch/labseer/service/ParentStructureService.java
index 053f336ff..e4d9a8c89 100755
--- a/src/main/java/com/labsynch/labseer/service/ParentStructureService.java
+++ b/src/main/java/com/labsynch/labseer/service/ParentStructureService.java
@@ -2,10 +2,8 @@
 
 import com.labsynch.labseer.domain.Parent;
 
-
 public interface ParentStructureService {
 
 	public Parent update(Parent parent);
 
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ParentStructureServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ParentStructureServiceImpl.java
index 1b986457f..c4c3a6eae 100755
--- a/src/main/java/com/labsynch/labseer/service/ParentStructureServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ParentStructureServiceImpl.java
@@ -15,7 +15,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-
 @Service
 @Transactional
 public class ParentStructureServiceImpl implements ParentStructureService {
@@ -25,36 +24,36 @@ public class ParentStructureServiceImpl implements ParentStructureService {
 
 	@Autowired
 	private LotService lotService;
-	
-	Logger logger = LoggerFactory.getLogger(ParentStructureServiceImpl.class);
 
+	Logger logger = LoggerFactory.getLogger(ParentStructureServiceImpl.class);
 
 	// allows user to update the parent structure
 	// update the parent.molstructure
 	// update the parent_structure entity
 	// update the parent.molweight
-	// update the lot.molweight (debated retrieving it dynamically but downstream users may 
-	//                           just want the lot molWeight info from the table)
+	// update the lot.molweight (debated retrieving it dynamically but downstream
+	// users may
+	// just want the lot molWeight info from the table)
 	// update the lot.asDrawnStruct
-	
+
 	@Override
-	public Parent update(Parent parent){
+	public Parent update(Parent parent) {
 
 		try {
 			parent = processAndUpdate(parent);
 		} catch (CmpdRegMolFormatException e) {
 			// TODO Auto-generated catch block
 			logger.error("Bad molformat exception");
-		} 
+		}
 
 		return parent;
 
 	}
 
 	private Parent processAndUpdate(Parent inputParent) throws CmpdRegMolFormatException {
-		
+
 		Parent parent = Parent.update(inputParent);
-		
+
 		CmpdRegMolecule mol = chemService.toMolecule(inputParent.getMolStructure());
 		parent.setMolStructure(mol.getMolStructure());
 		parent.setMolFormula(chemService.getMolFormula(inputParent.getMolStructure()));
@@ -65,24 +64,23 @@ private Parent processAndUpdate(Parent inputParent) throws CmpdRegMolFormatExcep
 		parent.setModifiedBy(inputParent.getModifiedBy());
 		parent.setExactMass(chemService.getExactMass(inputParent.getMolStructure()));
 		parent.setMolWeight(chemService.getMolWeight(inputParent.getMolStructure()));
-		
+
 		logger.debug("Parent weight: " + parent.getMolWeight());
-		
+
 		parent.merge();
 		List<Lot> lots = Lot.findLotsByParent(parent).getResultList();
 		logger.debug("number of lots found: " + lots.size());
 		Lot updatedLot;
-		for (Lot lot : lots){
+		for (Lot lot : lots) {
 			updatedLot = lotService.updateLotWeight(lot);
 			updatedLot.setAsDrawnStruct(parent.getMolStructure());
 			updatedLot.setModifiedDate(new Date());
 			updatedLot.setModifiedBy(inputParent.getModifiedBy());
 			updatedLot.merge();
-		}		
+		}
 
 		return parent;
 
 	}
 
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/PostSuccessfulAuthenticationHandler.java b/src/main/java/com/labsynch/labseer/service/PostSuccessfulAuthenticationHandler.java
index e81508605..faacd94fb 100755
--- a/src/main/java/com/labsynch/labseer/service/PostSuccessfulAuthenticationHandler.java
+++ b/src/main/java/com/labsynch/labseer/service/PostSuccessfulAuthenticationHandler.java
@@ -22,53 +22,54 @@
 import org.springframework.security.web.savedrequest.SavedRequest;
 import org.springframework.util.StringUtils;
 
-public class PostSuccessfulAuthenticationHandler extends  SimpleUrlAuthenticationSuccessHandler {
-
-	static Logger logger = LoggerFactory.getLogger(PostSuccessfulAuthenticationHandler.class);
-
-	private RequestCache requestCache = new HttpSessionRequestCache();
-
-	@Autowired
-	private SecurityUtils securityUtils;
-	
-	public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response,
-			Authentication authentication) throws ServletException, IOException {
-		/*
-		 *  Add post authentication logic in the trackUseLogin method of userService;
-		 */
-		logger.info("principal info: " + authentication.getPrincipal());
-		super.onAuthenticationSuccess(request, response, authentication);
-		
-		securityUtils.updateAuthorInfo(authentication);
-		
-		SecurityContext context = SecurityContextHolder.getContext();
-		logger.info("context is " + context);
-		Authentication auth = context.getAuthentication();
-		logger.info("authentication: " + auth);
-
-		Collection<? extends GrantedAuthority> auths = SecurityContextHolder.getContext().getAuthentication().getAuthorities();
-		for (GrantedAuthority ga : auths){
-			logger.info("granted auth: " + ga);
-		}
-
-		
-	}
-	
-	protected String getRedirectUrl(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		
+public class PostSuccessfulAuthenticationHandler extends SimpleUrlAuthenticationSuccessHandler {
+
+    static Logger logger = LoggerFactory.getLogger(PostSuccessfulAuthenticationHandler.class);
+
+    private RequestCache requestCache = new HttpSessionRequestCache();
+
+    @Autowired
+    private SecurityUtils securityUtils;
+
+    public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response,
+            Authentication authentication) throws ServletException, IOException {
+        /*
+         * Add post authentication logic in the trackUseLogin method of userService;
+         */
+        logger.info("principal info: " + authentication.getPrincipal());
+        super.onAuthenticationSuccess(request, response, authentication);
+
+        securityUtils.updateAuthorInfo(authentication);
+
+        SecurityContext context = SecurityContextHolder.getContext();
+        logger.info("context is " + context);
+        Authentication auth = context.getAuthentication();
+        logger.info("authentication: " + auth);
+
+        Collection<? extends GrantedAuthority> auths = SecurityContextHolder.getContext().getAuthentication()
+                .getAuthorities();
+        for (GrantedAuthority ga : auths) {
+            logger.info("granted auth: " + ga);
+        }
+
+    }
+
+    protected String getRedirectUrl(HttpServletRequest request, HttpServletResponse response) throws Exception {
+
         SavedRequest savedRequest = requestCache.getRequest(request, response);
 
         logger.info("authentication was successful. ");
-        
+
         if (savedRequest == null) {
             clearAuthenticationAttributes(request);
             logger.info("null savedRequest. ");
 
             return request.getContextPath() + "/";
         }
-        
+
         final String targetUrlParameter = getTargetUrlParameter();
-        if (isAlwaysUseDefaultTargetUrl() || (targetUrlParameter != null && StringUtils.hasText(request.getParameter(targetUrlParameter)))) {
+        if (isAlwaysUseDefaultTargetUrl()
+                || (targetUrlParameter != null && StringUtils.hasText(request.getParameter(targetUrlParameter)))) {
             requestCache.removeRequest(request, response);
             clearAuthenticationAttributes(request);
             return request.getContextPath() + "/";
@@ -80,18 +81,18 @@ protected String getRedirectUrl(HttpServletRequest request, HttpServletResponse
         // final String targetUrl = savedRequest.getRedirectUrl();
         // logger.debug("Redirecting to DefaultSavedRequest Url: " + targetUrl);
         // getRedirectStrategy().sendRedirect(request, response, targetUrl);
-        
-	    /* return a sane default in case data isn't there */
-	    return request.getContextPath() + "/";
-	}
-	
-	public String onAuthenticationSuccessOld(HttpServletRequest request, HttpServletResponse response,
-			Authentication authentication) throws ServletException, IOException, Exception {
-		
+
+        /* return a sane default in case data isn't there */
+        return request.getContextPath() + "/";
+    }
+
+    public String onAuthenticationSuccessOld(HttpServletRequest request, HttpServletResponse response,
+            Authentication authentication) throws ServletException, IOException, Exception {
+
         SavedRequest savedRequest = requestCache.getRequest(request, response);
 
         logger.info("authentication was successful. ");
-        
+
         if (savedRequest == null) {
             clearAuthenticationAttributes(request);
             logger.info("null savedRequest. ");
@@ -99,7 +100,8 @@ public String onAuthenticationSuccessOld(HttpServletRequest request, HttpServlet
             return request.getContextPath() + "/";
         }
         final String targetUrlParameter = getTargetUrlParameter();
-        if (isAlwaysUseDefaultTargetUrl() || (targetUrlParameter != null && StringUtils.hasText(request.getParameter(targetUrlParameter)))) {
+        if (isAlwaysUseDefaultTargetUrl()
+                || (targetUrlParameter != null && StringUtils.hasText(request.getParameter(targetUrlParameter)))) {
             requestCache.removeRequest(request, response);
             clearAuthenticationAttributes(request);
             return request.getContextPath() + "/";
@@ -111,17 +113,14 @@ public String onAuthenticationSuccessOld(HttpServletRequest request, HttpServlet
         // final String targetUrl = savedRequest.getRedirectUrl();
         // logger.debug("Redirecting to DefaultSavedRequest Url: " + targetUrl);
         // getRedirectStrategy().sendRedirect(request, response, targetUrl);
-        
-	    /* return a sane default in case data isn't there */
-	    return request.getContextPath() + "/";
-	}
 
+        /* return a sane default in case data isn't there */
+        return request.getContextPath() + "/";
+    }
 
-	public void setRequestCache(RequestCache requestCache) throws Exception {
-		this.requestCache = requestCache;
-
-	}
+    public void setRequestCache(RequestCache requestCache) throws Exception {
+        this.requestCache = requestCache;
 
+    }
 
 }
-
diff --git a/src/main/java/com/labsynch/labseer/service/ProtocolService.java b/src/main/java/com/labsynch/labseer/service/ProtocolService.java
index 80509b8ae..7d6c7ed48 100755
--- a/src/main/java/com/labsynch/labseer/service/ProtocolService.java
+++ b/src/main/java/com/labsynch/labseer/service/ProtocolService.java
@@ -21,10 +21,10 @@ public interface ProtocolService {
 
 	Protocol updateProtocol(Protocol protocol) throws UniqueNameException;
 
-//	Collection<Protocol> findProtocolsByMetadataJson(String json);
+	// Collection<Protocol> findProtocolsByMetadataJson(String json);
 
 	Collection<Protocol> findProtocolsByGenericMetaDataSearch(String query);
-	
+
 	Collection<Long> findProtocolIdsByMetadata(String queryString, String searchBy);
 
 	Set<Protocol> findProtocolsByRequestMetadata(
@@ -34,12 +34,12 @@ Collection<Protocol> findProtocolsByGenericMetaDataSearch(
 			String queryString, String userName);
 
 	Collection<Protocol> findProtocolsByGenericMetaDataSearch(
-		String queryString, List<String> projects);
-		
+			String queryString, List<String> projects);
+
 	Collection<ProtocolErrorMessageDTO> findProtocolsByCodeNames(
 			List<String> codeNames);
-	
+
 	Collection<String> getProtocolCodesByDateValueComparison(
 			DateValueComparisonRequest requestDTO) throws Exception;
-	
+
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ProtocolServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ProtocolServiceImpl.java
index 552ee944e..a9028f005 100755
--- a/src/main/java/com/labsynch/labseer/service/ProtocolServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ProtocolServiceImpl.java
@@ -42,94 +42,101 @@ public class ProtocolServiceImpl implements ProtocolService {
 
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
-	
+
 	@Autowired
 	private AutoLabelService autoLabelService;
 
 	@Autowired
 	private AuthorService authorService;
 
-	//    @PostConstruct
-	//    public void init(){
-	//    	logger.info("calling the appSetting 201 init method upon startup");
-	//    	ApplicationSetting appSet = new ApplicationSetting();
-	//    	appSet.setPropName("testing201");
-	//    	appSet.setPropValue("testingValue201");
-	//    	appSet.persist();
-	//    }
+	// @PostConstruct
+	// public void init(){
+	// logger.info("calling the appSetting 201 init method upon startup");
+	// ApplicationSetting appSet = new ApplicationSetting();
+	// appSet.setPropName("testing201");
+	// appSet.setPropValue("testingValue201");
+	// appSet.persist();
+	// }
 
 	@Override
-	public Protocol saveLsProtocol(Protocol protocol) throws UniqueNameException{
-		if (logger.isDebugEnabled())  logger.debug("incoming meta protocol: " + protocol.toJson() + "\n");
-		
-		//check if protocol with the same name exists
-				boolean checkProtocolName = propertiesUtilService.getUniqueProtocolName();
-				if (checkProtocolName){
-					boolean protocolExists = false;
-					Set<ProtocolLabel> protLabels = protocol.getLsLabels();
-					for (ProtocolLabel label : protLabels){
-						String labelText = label.getLabelText();
-						if (logger.isDebugEnabled())  logger.debug("Searching for labelText: "+labelText);
-						List<ProtocolLabel> protocolLabels = ProtocolLabel.findProtocolLabelsByName(labelText).getResultList();	
-						if (logger.isDebugEnabled())  logger.debug("Found "+ protocolLabels.size() +" labels");
-						for (ProtocolLabel pl : protocolLabels){
-							Protocol pro = pl.getProtocol();
-							//if the protocol is not hard deleted or soft deleted, there is a name conflict
-							if (!pro.isIgnored() && !pl.isIgnored()){
-								protocolExists = true;
-							}
-						}
-					}
+	public Protocol saveLsProtocol(Protocol protocol) throws UniqueNameException {
+		if (logger.isDebugEnabled())
+			logger.debug("incoming meta protocol: " + protocol.toJson() + "\n");
 
-					if (protocolExists){
-						throw new UniqueNameException("Protocol with the same name exists");							
+		// check if protocol with the same name exists
+		boolean checkProtocolName = propertiesUtilService.getUniqueProtocolName();
+		if (checkProtocolName) {
+			boolean protocolExists = false;
+			Set<ProtocolLabel> protLabels = protocol.getLsLabels();
+			for (ProtocolLabel label : protLabels) {
+				String labelText = label.getLabelText();
+				if (logger.isDebugEnabled())
+					logger.debug("Searching for labelText: " + labelText);
+				List<ProtocolLabel> protocolLabels = ProtocolLabel.findProtocolLabelsByName(labelText).getResultList();
+				if (logger.isDebugEnabled())
+					logger.debug("Found " + protocolLabels.size() + " labels");
+				for (ProtocolLabel pl : protocolLabels) {
+					Protocol pro = pl.getProtocol();
+					// if the protocol is not hard deleted or soft deleted, there is a name conflict
+					if (!pro.isIgnored() && !pl.isIgnored()) {
+						protocolExists = true;
 					}
 				}
-		
+			}
+
+			if (protocolExists) {
+				throw new UniqueNameException("Protocol with the same name exists");
+			}
+		}
+
 		Protocol newProtocol = new Protocol(protocol);
-		if (newProtocol.getCodeName() == null){
-			
+		if (newProtocol.getCodeName() == null) {
+
 			String thingTypeAndKind = "document_protocol";
 			String labelTypeAndKind = "id_codeName";
 			Long numberOfLabels = 1L;
-			List<AutoLabelDTO> labels = autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels );
+			List<AutoLabelDTO> labels = autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind,
+					numberOfLabels);
 			newProtocol.setCodeName(labels.get(0).getAutoLabel());
 		}
-		
-		
+
 		newProtocol.persist();
-		if (logger.isDebugEnabled())  logger.debug("persisted the newProtocol: " + newProtocol.toJson() + "\n");
-		if (protocol.getLsLabels() != null){
+		if (logger.isDebugEnabled())
+			logger.debug("persisted the newProtocol: " + newProtocol.toJson() + "\n");
+		if (protocol.getLsLabels() != null) {
 			Set<ProtocolLabel> lsLabels = new HashSet<ProtocolLabel>();
-			for(ProtocolLabel protocolLabel : protocol.getLsLabels()){
+			for (ProtocolLabel protocolLabel : protocol.getLsLabels()) {
 				ProtocolLabel newProtocolLabel = new ProtocolLabel(protocolLabel);
 				newProtocolLabel.setProtocol(newProtocol);
 				logger.info("here is the newProtocolLabel before save: " + newProtocolLabel.toJson());
-				newProtocolLabel.persist();	
+				newProtocolLabel.persist();
 				lsLabels.add(newProtocolLabel);
-			}	
+			}
 			newProtocol.setLsLabels(lsLabels);
 		} else {
-			if (logger.isDebugEnabled())  logger.debug("No protocol labels to save");	
+			if (logger.isDebugEnabled())
+				logger.debug("No protocol labels to save");
 		}
 
-		if (protocol.getLsStates() != null){
+		if (protocol.getLsStates() != null) {
 			Set<ProtocolState> lsStates = new HashSet<ProtocolState>();
-			for(ProtocolState protocolState : protocol.getLsStates()){
+			for (ProtocolState protocolState : protocol.getLsStates()) {
 				ProtocolState newProtocolState = new ProtocolState(protocolState);
 				newProtocolState.setProtocol(newProtocol);
 				newProtocolState.persist();
-				if (protocolState.getLsValues() != null){
+				if (protocolState.getLsValues() != null) {
 					Set<ProtocolValue> lsValues = new HashSet<ProtocolValue>();
-					for(ProtocolValue protocolValue : protocolState.getLsValues()){
+					for (ProtocolValue protocolValue : protocolState.getLsValues()) {
 						protocolValue.setLsState(newProtocolState);
 						protocolValue.persist();
 						lsValues.add(protocolValue);
-						if (logger.isDebugEnabled())  logger.debug("persisted the protocolValue: " + protocolValue.toJson());
-					}				
+						if (logger.isDebugEnabled())
+							logger.debug("persisted the protocolValue: " + protocolValue.toJson());
+					}
 					newProtocolState.setLsValues(lsValues);
 				} else {
-					if (logger.isDebugEnabled())  logger.debug("No protocol values to save");
+					if (logger.isDebugEnabled())
+						logger.debug("No protocol values to save");
 				}
 				lsStates.add(newProtocolState);
 			}
@@ -140,43 +147,49 @@ public Protocol saveLsProtocol(Protocol protocol) throws UniqueNameException{
 	}
 
 	@Override
-	public Protocol updateProtocol(Protocol protocol) throws UniqueNameException{
-		if (logger.isDebugEnabled())  logger.debug("UPDATE PROTOCOL --- incoming meta protocol: " + protocol.toJson() + "\n");
-		
+	public Protocol updateProtocol(Protocol protocol) throws UniqueNameException {
+		if (logger.isDebugEnabled())
+			logger.debug("UPDATE PROTOCOL --- incoming meta protocol: " + protocol.toJson() + "\n");
+
 		boolean checkProtocolName = propertiesUtilService.getUniqueProtocolName();
-		if (logger.isDebugEnabled())  logger.debug("checkProtocolName = "+checkProtocolName);
-		if (checkProtocolName){
+		if (logger.isDebugEnabled())
+			logger.debug("checkProtocolName = " + checkProtocolName);
+		if (checkProtocolName) {
 			boolean protocolExists = false;
 			Set<ProtocolLabel> protLabels = protocol.getLsLabels();
-			for (ProtocolLabel label : protLabels){
+			for (ProtocolLabel label : protLabels) {
 				String labelText = label.getLabelText();
-				if (logger.isDebugEnabled())  logger.debug("Searching for labelText: "+labelText);
-				List<ProtocolLabel> protocolLabels = ProtocolLabel.findProtocolLabelsByName(labelText).getResultList();	
-				if (logger.isDebugEnabled())  logger.debug("Found "+ protocolLabels.size() +" labels");
-				for (ProtocolLabel pl : protocolLabels){
+				if (logger.isDebugEnabled())
+					logger.debug("Searching for labelText: " + labelText);
+				List<ProtocolLabel> protocolLabels = ProtocolLabel.findProtocolLabelsByName(labelText).getResultList();
+				if (logger.isDebugEnabled())
+					logger.debug("Found " + protocolLabels.size() + " labels");
+				for (ProtocolLabel pl : protocolLabels) {
 					Protocol pro = pl.getProtocol();
-					//if the protocol is not hard deleted or soft deleted, there is a name conflict
-					if (!pro.isIgnored() && !pl.isIgnored() && !label.isIgnored() && pro.getId().compareTo(protocol.getId())!=0){
+					// if the protocol is not hard deleted or soft deleted, there is a name conflict
+					if (!pro.isIgnored() && !pl.isIgnored() && !label.isIgnored()
+							&& pro.getId().compareTo(protocol.getId()) != 0) {
 						protocolExists = true;
 					}
 				}
 			}
 
-			if (protocolExists){
-				throw new UniqueNameException("Protocol with the same name exists");							
+			if (protocolExists) {
+				throw new UniqueNameException("Protocol with the same name exists");
 			}
 		}
-		
+
 		Protocol updatedProtocol = Protocol.update(protocol);
-		if (protocol.getLsLabels() != null){
+		if (protocol.getLsLabels() != null) {
 			Set<ProtocolLabel> updatedProtocolLabels = new HashSet<ProtocolLabel>();
-			for(ProtocolLabel protocolLabel : protocol.getLsLabels()){
-				if (logger.isDebugEnabled())  logger.debug(protocolLabel.toJson());
-				if (protocolLabel.getId() == null){
+			for (ProtocolLabel protocolLabel : protocol.getLsLabels()) {
+				if (logger.isDebugEnabled())
+					logger.debug(protocolLabel.toJson());
+				if (protocolLabel.getId() == null) {
 					ProtocolLabel newProtocolLabel = new ProtocolLabel(protocolLabel);
 					newProtocolLabel.setProtocol(updatedProtocol);
-					newProtocolLabel.persist();	
-//					updatedProtocol.getLsLabels().add(newProtocolLabel);
+					newProtocolLabel.persist();
+					// updatedProtocol.getLsLabels().add(newProtocolLabel);
 					updatedProtocolLabels.add(newProtocolLabel);
 				} else {
 					ProtocolLabel updatedProtocolLabel = ProtocolLabel.update(protocolLabel);
@@ -185,30 +198,31 @@ public Protocol updateProtocol(Protocol protocol) throws UniqueNameException{
 			}
 			updatedProtocol.setLsLabels(updatedProtocolLabels);
 		} else {
-			if (logger.isDebugEnabled())  logger.debug("No protocol labels to save");	
+			if (logger.isDebugEnabled())
+				logger.debug("No protocol labels to save");
 		}
-		
-		
-		if (protocol.getLsStates() != null){
+
+		if (protocol.getLsStates() != null) {
 			Set<ProtocolState> updatedProtocolStates = new HashSet<ProtocolState>();
-			for(ProtocolState protocolState : protocol.getLsStates()){
+			for (ProtocolState protocolState : protocol.getLsStates()) {
 				ProtocolState updatedProtocolState;
-				if (protocolState.getId() == null){
+				if (protocolState.getId() == null) {
 					updatedProtocolState = new ProtocolState(protocolState);
 					updatedProtocolState.setProtocol(updatedProtocol);
-					updatedProtocolState.persist();		
-//					protocolState.setId(newProtocolState.getId());
-//					updatedProtocol.getLsStates().add(newProtocolState);
+					updatedProtocolState.persist();
+					// protocolState.setId(newProtocolState.getId());
+					// updatedProtocol.getLsStates().add(newProtocolState);
 				} else {
 					updatedProtocolState = ProtocolState.update(protocolState);
-					if (logger.isDebugEnabled())  logger.debug("updatedProtocolState: " + updatedProtocolState.toJson());
+					if (logger.isDebugEnabled())
+						logger.debug("updatedProtocolState: " + updatedProtocolState.toJson());
 				}
-				
-				if (protocolState.getLsValues() != null){
+
+				if (protocolState.getLsValues() != null) {
 					Set<ProtocolValue> updatedProtocolValues = new HashSet<ProtocolValue>();
-					for(ProtocolValue protocolValue : protocolState.getLsValues()){
+					for (ProtocolValue protocolValue : protocolState.getLsValues()) {
 						ProtocolValue updatedProtocolValue;
-						if (protocolValue.getId() == null){
+						if (protocolValue.getId() == null) {
 							updatedProtocolValue = new ProtocolValue(protocolValue);
 							updatedProtocolValue.setLsState(updatedProtocolState);
 							updatedProtocolValue.persist();
@@ -217,14 +231,16 @@ public Protocol updateProtocol(Protocol protocol) throws UniqueNameException{
 							protocolValue.setLsState(updatedProtocolState);
 							updatedProtocolValue = ProtocolValue.update(protocolValue);
 							updatedProtocolValues.add(updatedProtocolValue);
-							if (logger.isDebugEnabled())  logger.debug("updatedProtocolValue: " + updatedProtocolValue.toJson());
+							if (logger.isDebugEnabled())
+								logger.debug("updatedProtocolValue: " + updatedProtocolValue.toJson());
 						}
 					}
 					updatedProtocolState.setLsValues(updatedProtocolValues);
 				} else {
-					if (logger.isDebugEnabled())  logger.debug("No protocol values to save");
+					if (logger.isDebugEnabled())
+						logger.debug("No protocol values to save");
 				}
-			updatedProtocolStates.add(updatedProtocolState);
+				updatedProtocolStates.add(updatedProtocolState);
 			}
 			updatedProtocol.setLsStates(updatedProtocolStates);
 		}
@@ -233,75 +249,76 @@ public Protocol updateProtocol(Protocol protocol) throws UniqueNameException{
 	}
 
 	@Override
-	public Protocol getFullProtocol(Protocol queryProtocol){
+	public Protocol getFullProtocol(Protocol queryProtocol) {
 		Protocol protocol = Protocol.findProtocol(queryProtocol.getId());
 		Set<ProtocolLabel> lsLabels = new HashSet<ProtocolLabel>();
-		for (ProtocolLabel protocolLabel : ProtocolLabel.findProtocolLabelsByProtocol(protocol).getResultList()){
+		for (ProtocolLabel protocolLabel : ProtocolLabel.findProtocolLabelsByProtocol(protocol).getResultList()) {
 			lsLabels.add(protocolLabel);
 		}
 		protocol.setLsLabels(lsLabels);
 		Set<ProtocolState> lsStates = new HashSet<ProtocolState>();
-		for (ProtocolState protocolState : ProtocolState.findProtocolStatesByProtocol(protocol).getResultList()){
+		for (ProtocolState protocolState : ProtocolState.findProtocolStatesByProtocol(protocol).getResultList()) {
 			lsStates.add(protocolState);
-		}	
+		}
 		protocol.setLsStates(lsStates);
 
 		return protocol;
 	}
 
-//	@Override
-//	public Collection<Protocol> findProtocolsByMetadataJson(String json) {
-//		Collection<Protocol> protocolList = new HashSet<Protocol>();
-//		Collection<StringCollectionDTO> metaDataList = StringCollectionDTO.fromJsonArrayToStringCollectioes(json);
-//		for (StringCollectionDTO metaData : metaDataList){
-//			
-//			//finding by name
-//			Collection<Protocol> protocols = findProtocolByMetadata(metaData.getName(), "NAME");
-//			if (protocols.size() > 0){
-//				protocolList.addAll(protocols);
-//			}
-//			
-//			//finding by code
-//			protocols = findProtocolByMetadata(metaData.getCode(), "CODENAME");
-//			if (protocols.size() > 0){
-//				protocolList.addAll(protocols);
-//			}
-//		}
-//		
-//		return protocolList;
-//	}
-	
+	// @Override
+	// public Collection<Protocol> findProtocolsByMetadataJson(String json) {
+	// Collection<Protocol> protocolList = new HashSet<Protocol>();
+	// Collection<StringCollectionDTO> metaDataList =
+	// StringCollectionDTO.fromJsonArrayToStringCollectioes(json);
+	// for (StringCollectionDTO metaData : metaDataList){
+	//
+	// //finding by name
+	// Collection<Protocol> protocols = findProtocolByMetadata(metaData.getName(),
+	// "NAME");
+	// if (protocols.size() > 0){
+	// protocolList.addAll(protocols);
+	// }
+	//
+	// //finding by code
+	// protocols = findProtocolByMetadata(metaData.getCode(), "CODENAME");
+	// if (protocols.size() > 0){
+	// protocolList.addAll(protocols);
+	// }
+	// }
+	//
+	// return protocolList;
+	// }
+
 	@Override
 	public Collection<Protocol> findProtocolsByGenericMetaDataSearch(String queryString, String userName) {
 		Collection<Protocol> rawResults = findProtocolsByGenericMetaDataSearch(queryString);
-		if (propertiesUtilService.getRestrictExperiments()){
+		if (propertiesUtilService.getRestrictExperiments()) {
 			Collection<LsThing> projects = authorService.getUserProjects(userName);
 			List<String> allowedProjectCodeNames = new ArrayList<String>();
 			allowedProjectCodeNames.add("unassigned");
-			for (LsThing project : projects){
+			for (LsThing project : projects) {
 				allowedProjectCodeNames.add(project.getCodeName());
 			}
 			Collection<Protocol> results = new HashSet<Protocol>();
-			for (Protocol rawResult : rawResults){
+			for (Protocol rawResult : rawResults) {
 				String protocolProject = null;
-				for (ProtocolState state : rawResult.getLsStates()){
-					for (ProtocolValue value : state.getLsValues()){
-						if (value.getLsKind().equals("project")){
+				for (ProtocolState state : rawResult.getLsStates()) {
+					for (ProtocolValue value : state.getLsValues()) {
+						if (value.getLsKind().equals("project")) {
 							protocolProject = value.getCodeValue();
 							break;
 						}
 					}
 				}
-				if (protocolProject == null){
-					//no project associated with protocol, pass it through
+				if (protocolProject == null) {
+					// no project associated with protocol, pass it through
 					results.add(rawResult);
-				}
-				else if (allowedProjectCodeNames.contains(protocolProject)){
+				} else if (allowedProjectCodeNames.contains(protocolProject)) {
 					results.add(rawResult);
 				}
 			}
 			return results;
-		}else{
+		} else {
 			return rawResults;
 		}
 	}
@@ -309,51 +326,53 @@ else if (allowedProjectCodeNames.contains(protocolProject)){
 	@Override
 	public Collection<Protocol> findProtocolsByGenericMetaDataSearch(String queryString, List<String> projects) {
 		Collection<Protocol> rawResults = findProtocolsByGenericMetaDataSearch(queryString);
-		if (propertiesUtilService.getRestrictExperiments()){
+		if (propertiesUtilService.getRestrictExperiments()) {
 			projects.add("unassigned");
 			Collection<Protocol> results = new HashSet<Protocol>();
-			for (Protocol rawResult : rawResults){
+			for (Protocol rawResult : rawResults) {
 				String protocolProject = null;
-				for (ProtocolState state : rawResult.getLsStates()){
-					if(!state.isIgnored() && !state.isDeleted()) {
-						for (ProtocolValue value : state.getLsValues()){
-							if (value.getLsKind().equals("project") && !value.getDeleted() && !value.getIgnored()){
+				for (ProtocolState state : rawResult.getLsStates()) {
+					if (!state.isIgnored() && !state.isDeleted()) {
+						for (ProtocolValue value : state.getLsValues()) {
+							if (value.getLsKind().equals("project") && !value.getDeleted() && !value.getIgnored()) {
 								protocolProject = value.getCodeValue();
 								break;
 							}
 						}
 					}
 				}
-				if (protocolProject == null){
-					//no project associated with protocol, pass it through
+				if (protocolProject == null) {
+					// no project associated with protocol, pass it through
 					results.add(rawResult);
-				}
-				else if (projects.contains(protocolProject)){
+				} else if (projects.contains(protocolProject)) {
 					results.add(rawResult);
 				}
 			}
 			return results;
-		}else{
+		} else {
 			return rawResults;
 		}
 	}
-	
+
 	public Collection<Protocol> findProtocolsByGenericMetaDataSearch(String queryString) {
-		//make our HashSets: protocolIdList will be filled/cleared/refilled for each term
-		//protocolList is the final search result
+		// make our HashSets: protocolIdList will be filled/cleared/refilled for each
+		// term
+		// protocolList is the final search result
 		HashSet<Long> protocolIdList = new HashSet<Long>();
 		HashSet<Long> protocolAllIdList = new HashSet<Long>();
 		Collection<Protocol> protocolList = new HashSet<Protocol>();
-		//Split the query up on spaces
+		// Split the query up on spaces
 		List<String> splitQuery = SimpleUtil.splitSearchString(queryString);
-		if (logger.isDebugEnabled())  logger.debug("Number of search terms: " + splitQuery.size());
-		//Make the Map of terms and HashSets of protocol id's then fill. We will run intersect logic later.
+		if (logger.isDebugEnabled())
+			logger.debug("Number of search terms: " + splitQuery.size());
+		// Make the Map of terms and HashSets of protocol id's then fill. We will run
+		// intersect logic later.
 		Map<String, HashSet<Long>> resultsByTerm = new HashMap<String, HashSet<Long>>();
 		for (String term : splitQuery) {
 			protocolIdList.addAll(findProtocolIdsByMetadata(term, "CODENAME"));
 			protocolIdList.addAll(findProtocolIdsByMetadata(term, "NAME"));
 			protocolIdList.addAll(findProtocolIdsByMetadata(term, "SCIENTIST"));
-//			protocolIdList.addAll(findProtocolIdsByMetadata(term, "RECORDEDBY"));
+			// protocolIdList.addAll(findProtocolIdsByMetadata(term, "RECORDEDBY"));
 			protocolIdList.addAll(findProtocolIdsByMetadata(term, "TYPE"));
 			protocolIdList.addAll(findProtocolIdsByMetadata(term, "KIND"));
 			protocolIdList.addAll(findProtocolIdsByMetadata(term, "STATUS"));
@@ -367,22 +386,26 @@ public Collection<Protocol> findProtocolsByGenericMetaDataSearch(String queryStr
 			protocolIdList.addAll(findProtocolIdsByMetadata(term, "CELL LINE"));
 			protocolIdList.addAll(findProtocolIdsByMetadata(term, "TARGET ORIGIN"));
 			protocolIdList.addAll(findProtocolIdsByMetadata(term, "ASSAY STAGE"));
-			
+
 			resultsByTerm.put(term, new HashSet<Long>(protocolIdList));
 			protocolAllIdList.addAll(protocolIdList);
 			protocolIdList.clear();
 		}
-		//Here is the intersect logic
-		for (String term: splitQuery) {
+		// Here is the intersect logic
+		for (String term : splitQuery) {
 			protocolAllIdList.retainAll(resultsByTerm.get(term));
 		}
-		for (Long id: protocolAllIdList) protocolList.add(Protocol.findProtocol(id));
-        //This method uses finders that will find everything, whether or not it is ignored or deleted
+		for (Long id : protocolAllIdList)
+			protocolList.add(Protocol.findProtocol(id));
+		// This method uses finders that will find everything, whether or not it is
+		// ignored or deleted
 		Collection<Protocol> result = new HashSet<Protocol>();
-		for (Protocol protocol: protocolList) {
-			//For Protocol Browser, we want to see soft deleted (ignored=true, deleted=false), but not hard deleted (ignored=deleted=true)
-			if (protocol.isDeleted()){
-				if (logger.isDebugEnabled())  logger.debug("removing a deleted protocol from the results");
+		for (Protocol protocol : protocolList) {
+			// For Protocol Browser, we want to see soft deleted (ignored=true,
+			// deleted=false), but not hard deleted (ignored=deleted=true)
+			if (protocol.isDeleted()) {
+				if (logger.isDebugEnabled())
+					logger.debug("removing a deleted protocol from the results");
 			} else {
 				result.add(protocol);
 			}
@@ -394,25 +417,27 @@ public Collection<Long> findProtocolIdsByMetadata(String queryString, String sea
 		Collection<Long> protocolIdList = new HashSet<Long>();
 		if (searchBy == "CODENAME") {
 			List<Protocol> protocols = Protocol.findProtocolsByCodeNameLike(queryString).getResultList();
-			if (!protocols.isEmpty()){
-				for (Protocol protocol:protocols) {
+			if (!protocols.isEmpty()) {
+				for (Protocol protocol : protocols) {
 					protocolIdList.add(protocol.getId());
 				}
 			}
 			protocols.clear();
 		}
 		if (searchBy == "NAME") {
-			List<ProtocolLabel> protocolLabels = ProtocolLabel.findProtocolLabelsByLabelTextLike(queryString).getResultList();
+			List<ProtocolLabel> protocolLabels = ProtocolLabel.findProtocolLabelsByLabelTextLike(queryString)
+					.getResultList();
 			if (!protocolLabels.isEmpty()) {
-				for (ProtocolLabel protocolLabel: protocolLabels) {
+				for (ProtocolLabel protocolLabel : protocolLabels) {
 					protocolIdList.add(protocolLabel.getProtocol().getId());
 				}
 			}
 			protocolLabels.clear();
 		}
 		if (searchBy == "SCIENTIST") {
-			Collection<ProtocolValue> protocolValues = ProtocolValue.findProtocolValuesByLsKindEqualsAndCodeValueLike("scientist", queryString).getResultList();
-			if (!protocolValues.isEmpty()){
+			Collection<ProtocolValue> protocolValues = ProtocolValue
+					.findProtocolValuesByLsKindEqualsAndCodeValueLike("scientist", queryString).getResultList();
+			if (!protocolValues.isEmpty()) {
 				for (ProtocolValue protocolValue : protocolValues) {
 					protocolIdList.add(protocolValue.getLsState().getProtocol().getId());
 				}
@@ -421,8 +446,8 @@ public Collection<Long> findProtocolIdsByMetadata(String queryString, String sea
 		}
 		if (searchBy == "RECORDEDBY") {
 			List<Protocol> protocols = Protocol.findProtocolsByRecordedByLike(queryString).getResultList();
-			if (!protocols.isEmpty()){
-				for (Protocol protocol: protocols) {
+			if (!protocols.isEmpty()) {
+				for (Protocol protocol : protocols) {
 					protocolIdList.add(protocol.getId());
 				}
 			}
@@ -430,8 +455,8 @@ public Collection<Long> findProtocolIdsByMetadata(String queryString, String sea
 		}
 		if (searchBy == "TYPE") {
 			List<Protocol> protocols = Protocol.findProtocolsByLsTypeLike(queryString).getResultList();
-			if (!protocols.isEmpty()){
-				for (Protocol protocol: protocols) {
+			if (!protocols.isEmpty()) {
+				for (Protocol protocol : protocols) {
 					protocolIdList.add(protocol.getId());
 				}
 			}
@@ -439,18 +464,20 @@ public Collection<Long> findProtocolIdsByMetadata(String queryString, String sea
 		}
 		if (searchBy == "KIND") {
 			List<Protocol> protocols = Protocol.findProtocolsByLsKindLike(queryString).getResultList();
-			if (!protocols.isEmpty()){
-				for (Protocol protocol: protocols) {
+			if (!protocols.isEmpty()) {
+				for (Protocol protocol : protocols) {
 					protocolIdList.add(protocol.getId());
 				}
 			}
 			protocols.clear();
 		}
 		if (searchBy == "STATUS") {
-			Collection<ProtocolValue> protocolValues = ProtocolValue.findProtocolValuesByLsKindEqualsAndCodeValueLike("protocol status", queryString).getResultList();
-			if (!protocolValues.isEmpty()){
+			Collection<ProtocolValue> protocolValues = ProtocolValue
+					.findProtocolValuesByLsKindEqualsAndCodeValueLike("protocol status", queryString).getResultList();
+			if (!protocolValues.isEmpty()) {
 				for (ProtocolValue protocolValue : protocolValues) {
-					if (!protocolValue.isIgnored()) protocolIdList.add(protocolValue.getLsState().getProtocol().getId());
+					if (!protocolValue.isIgnored())
+						protocolIdList.add(protocolValue.getLsState().getProtocol().getId());
 				}
 			}
 			protocolValues.clear();
@@ -461,15 +488,19 @@ public Collection<Long> findProtocolIdsByMetadata(String queryString, String sea
 			DateFormat df2 = new SimpleDateFormat("MM-dd-yyyy", Locale.ENGLISH);
 			try {
 				Date date = df.parse(queryString);
-				if (logger.isDebugEnabled())  logger.debug("Successfully parsed date: "+queryString);
-				protocolValues = ProtocolValue.findProtocolValuesByLsKindEqualsAndDateValueLike("creation date", date).getResultList();
+				if (logger.isDebugEnabled())
+					logger.debug("Successfully parsed date: " + queryString);
+				protocolValues = ProtocolValue.findProtocolValuesByLsKindEqualsAndDateValueLike("creation date", date)
+						.getResultList();
 			} catch (Exception e) {
 				try {
 					Date date = df2.parse(queryString);
-					if (logger.isDebugEnabled())  logger.debug("Successfully parsed date: "+queryString);
-					protocolValues = ProtocolValue.findProtocolValuesByLsKindEqualsAndDateValueLike("creation date", date).getResultList();
+					if (logger.isDebugEnabled())
+						logger.debug("Successfully parsed date: " + queryString);
+					protocolValues = ProtocolValue
+							.findProtocolValuesByLsKindEqualsAndDateValueLike("creation date", date).getResultList();
 				} catch (Exception e2) {
-					//do nothing
+					// do nothing
 				}
 			}
 			if (!protocolValues.isEmpty()) {
@@ -480,7 +511,8 @@ public Collection<Long> findProtocolIdsByMetadata(String queryString, String sea
 			protocolValues.clear();
 		}
 		if (searchBy == "NOTEBOOK") {
-			Collection<ProtocolValue> protocolValues = ProtocolValue.findProtocolValuesByLsKindEqualsAndStringValueLike("notebook", queryString).getResultList();
+			Collection<ProtocolValue> protocolValues = ProtocolValue
+					.findProtocolValuesByLsKindEqualsAndStringValueLike("notebook", queryString).getResultList();
 			if (!protocolValues.isEmpty()) {
 				for (ProtocolValue protocolValue : protocolValues) {
 					protocolIdList.add(protocolValue.getLsState().getProtocol().getId());
@@ -491,10 +523,10 @@ public Collection<Long> findProtocolIdsByMetadata(String queryString, String sea
 		if (searchBy == "KEYWORD") {
 			Collection<LsTag> tags = LsTag.findLsTagsByTagTextLike(queryString).getResultList();
 			if (!tags.isEmpty()) {
-				for (LsTag tag: tags) {
+				for (LsTag tag : tags) {
 					Collection<Protocol> protocols = tag.getProtocols();
 					if (!protocols.isEmpty()) {
-						for (Protocol protocol:protocols) {
+						for (Protocol protocol : protocols) {
 							protocolIdList.add(protocol.getId());
 						}
 					}
@@ -503,8 +535,10 @@ public Collection<Long> findProtocolIdsByMetadata(String queryString, String sea
 			}
 			tags.clear();
 		}
-		if (searchBy == "MOLECULAR TARGET"){
-			Collection<ProtocolValue> protocolValues = ProtocolValue.findProtocolValuesByLsKindEqualsAndCodeValueLike(searchBy.toLowerCase(), queryString).getResultList();
+		if (searchBy == "MOLECULAR TARGET") {
+			Collection<ProtocolValue> protocolValues = ProtocolValue
+					.findProtocolValuesByLsKindEqualsAndCodeValueLike(searchBy.toLowerCase(), queryString)
+					.getResultList();
 			if (!protocolValues.isEmpty()) {
 				for (ProtocolValue protocolValue : protocolValues) {
 					protocolIdList.add(protocolValue.getLsState().getProtocol().getId());
@@ -512,12 +546,16 @@ public Collection<Long> findProtocolIdsByMetadata(String queryString, String sea
 			}
 			protocolValues.clear();
 		}
-		if (searchBy == "ASSAY ACTIVITY" || searchBy == "ASSAY TYPE" || searchBy == "ASSAY TECHNOLOGY" || searchBy == "CELL LINE" || searchBy == "TARGET ORIGIN" || searchBy == "ASSAY STAGE") {
+		if (searchBy == "ASSAY ACTIVITY" || searchBy == "ASSAY TYPE" || searchBy == "ASSAY TECHNOLOGY"
+				|| searchBy == "CELL LINE" || searchBy == "TARGET ORIGIN" || searchBy == "ASSAY STAGE") {
 			Collection<DDictValue> ddictValues = DDictValue.findDDictValuesByLabelTextLike(queryString).getResultList();
 			if (!ddictValues.isEmpty()) {
 				for (DDictValue ddictvalue : ddictValues) {
 					if (ddictvalue.getShortName() != null) {
-						Collection<ProtocolValue> protocolValues = ProtocolValue.findProtocolValuesByLsKindEqualsAndCodeValueLike(searchBy.toLowerCase(), ddictvalue.getShortName()).getResultList();
+						Collection<ProtocolValue> protocolValues = ProtocolValue
+								.findProtocolValuesByLsKindEqualsAndCodeValueLike(searchBy.toLowerCase(),
+										ddictvalue.getShortName())
+								.getResultList();
 						if (!protocolValues.isEmpty()) {
 							for (ProtocolValue protocolValue : protocolValues) {
 								protocolIdList.add(protocolValue.getLsState().getProtocol().getId());
@@ -528,59 +566,67 @@ public Collection<Long> findProtocolIdsByMetadata(String queryString, String sea
 				}
 			}
 		}
-		
+
 		return protocolIdList;
 	}
-	
+
 	public Collection<Protocol> findProtocolsByMetadata(String queryString, String searchBy) {
 		Collection<Protocol> protocolList = new HashSet<Protocol>();
 		Collection<Long> protocolIdList = findProtocolIdsByMetadata(queryString, searchBy);
 		if (!protocolIdList.isEmpty()) {
-			for (Long id: protocolIdList) {
+			for (Long id : protocolIdList) {
 				protocolList.add(Protocol.findProtocol(id));
 			}
 		}
 		return protocolList;
 	}
-	
+
 	@Override
 	public Set<Protocol> findProtocolsByRequestMetadata(
 			Map<String, String> requestParams) {
-		
-        Set<Protocol> result = new HashSet<Protocol>();
-        
-        if (requestParams.isEmpty()) {
-        	result.addAll(Protocol.findAllProtocols());
-        	return result;
-        }
-        
-        Set<Protocol> resultByKind = new HashSet<Protocol>();
-        Set<Protocol> resultByType = new HashSet<Protocol>();
-        Set<Protocol> resultByName = new HashSet<Protocol>();
-        Set<Protocol> resultByCodeName = new HashSet<Protocol>();
-        
-        if (requestParams.containsKey("kind"))resultByKind.addAll(findProtocolsByMetadata(requestParams.get("kind"), "KIND"));
-        if (requestParams.containsKey("type")) resultByType.addAll(findProtocolsByMetadata(requestParams.get("type"), "TYPE"));
-        if (requestParams.containsKey("name")) resultByName.addAll(findProtocolsByMetadata(requestParams.get("name"), "NAME"));
-        if (requestParams.containsKey("codeName")) resultByCodeName.addAll(findProtocolsByMetadata(requestParams.get("codeName"), "CODENAME"));
-
-        result.addAll(resultByKind);
-        result.addAll(resultByType);
-        result.addAll(resultByName);
-        result.addAll(resultByCodeName);
-        
-
-        if (requestParams.containsKey("kind")) result.retainAll(resultByKind);
-        if (requestParams.containsKey("type")) result.retainAll(resultByType);
-        if (requestParams.containsKey("name")) result.retainAll(resultByName);
-        if (requestParams.containsKey("codeName")) result.retainAll(resultByCodeName);
-        
-        return result;
+
+		Set<Protocol> result = new HashSet<Protocol>();
+
+		if (requestParams.isEmpty()) {
+			result.addAll(Protocol.findAllProtocols());
+			return result;
+		}
+
+		Set<Protocol> resultByKind = new HashSet<Protocol>();
+		Set<Protocol> resultByType = new HashSet<Protocol>();
+		Set<Protocol> resultByName = new HashSet<Protocol>();
+		Set<Protocol> resultByCodeName = new HashSet<Protocol>();
+
+		if (requestParams.containsKey("kind"))
+			resultByKind.addAll(findProtocolsByMetadata(requestParams.get("kind"), "KIND"));
+		if (requestParams.containsKey("type"))
+			resultByType.addAll(findProtocolsByMetadata(requestParams.get("type"), "TYPE"));
+		if (requestParams.containsKey("name"))
+			resultByName.addAll(findProtocolsByMetadata(requestParams.get("name"), "NAME"));
+		if (requestParams.containsKey("codeName"))
+			resultByCodeName.addAll(findProtocolsByMetadata(requestParams.get("codeName"), "CODENAME"));
+
+		result.addAll(resultByKind);
+		result.addAll(resultByType);
+		result.addAll(resultByName);
+		result.addAll(resultByCodeName);
+
+		if (requestParams.containsKey("kind"))
+			result.retainAll(resultByKind);
+		if (requestParams.containsKey("type"))
+			result.retainAll(resultByType);
+		if (requestParams.containsKey("name"))
+			result.retainAll(resultByName);
+		if (requestParams.containsKey("codeName"))
+			result.retainAll(resultByCodeName);
+
+		return result;
 	}
-	
+
 	@Override
 	public Collection<ProtocolErrorMessageDTO> findProtocolsByCodeNames(List<String> codeNames) {
-		if (codeNames.isEmpty()) return new ArrayList<ProtocolErrorMessageDTO>();
+		if (codeNames.isEmpty())
+			return new ArrayList<ProtocolErrorMessageDTO>();
 		EntityManager em = Protocol.entityManager();
 		String queryString = "SELECT new com.labsynch.labseer.dto.ProtocolErrorMessageDTO( "
 				+ "protocol.codeName, "
@@ -589,19 +635,19 @@ public Collection<ProtocolErrorMessageDTO> findProtocolsByCodeNames(List<String>
 		queryString += "where ( protocol.ignored <> true ) and ( ";
 		Collection<Query> queries = SimpleUtil.splitHqlInClause(em, queryString, "protocol.codeName", codeNames);
 		Collection<ProtocolErrorMessageDTO> results = new HashSet<ProtocolErrorMessageDTO>();
-		for (Query q : queries){
+		for (Query q : queries) {
 			results.addAll(q.getResultList());
 		}
-		//diff request with results to find codeNames that could not be found
+		// diff request with results to find codeNames that could not be found
 		HashSet<String> requestCodeNames = new HashSet<String>();
 		requestCodeNames.addAll(codeNames);
 		HashSet<String> foundCodeNames = new HashSet<String>();
-		for (ProtocolErrorMessageDTO result : results){
+		for (ProtocolErrorMessageDTO result : results) {
 			foundCodeNames.add(result.getProtocolCodeName());
 		}
 		requestCodeNames.removeAll(foundCodeNames);
-		if (!requestCodeNames.isEmpty()){
-			for (String notFoundCodeName : requestCodeNames){
+		if (!requestCodeNames.isEmpty()) {
+			for (String notFoundCodeName : requestCodeNames) {
 				ProtocolErrorMessageDTO notFoundDTO = new ProtocolErrorMessageDTO();
 				notFoundDTO.setProtocolCodeName(notFoundCodeName);
 				notFoundDTO.setLevel("error");
@@ -609,18 +655,23 @@ public Collection<ProtocolErrorMessageDTO> findProtocolsByCodeNames(List<String>
 				results.add(notFoundDTO);
 			}
 		}
-		
+
 		return results;
 	}
-	
+
 	@Override
 	public Collection<String> getProtocolCodesByDateValueComparison(
 			DateValueComparisonRequest requestDTO) throws Exception {
-		if (requestDTO.getStateType() == null || requestDTO.getStateType().length() == 0) throw new Exception("Must provide stateType");
-		if (requestDTO.getStateKind() == null || requestDTO.getStateKind().length() == 0) throw new Exception("Must provide stateKind");
-		if (requestDTO.getValueKind() == null || requestDTO.getValueKind().length() == 0) throw new Exception("Must provide valueKind");
-		if (requestDTO.getSecondsDelta() == null) throw new Exception("Must provide secondsDelta");
-		if (requestDTO.getNewerThanModified() == null) requestDTO.setNewerThanModified(false);
+		if (requestDTO.getStateType() == null || requestDTO.getStateType().length() == 0)
+			throw new Exception("Must provide stateType");
+		if (requestDTO.getStateKind() == null || requestDTO.getStateKind().length() == 0)
+			throw new Exception("Must provide stateKind");
+		if (requestDTO.getValueKind() == null || requestDTO.getValueKind().length() == 0)
+			throw new Exception("Must provide valueKind");
+		if (requestDTO.getSecondsDelta() == null)
+			throw new Exception("Must provide secondsDelta");
+		if (requestDTO.getNewerThanModified() == null)
+			requestDTO.setNewerThanModified(false);
 		EntityManager em = Protocol.entityManager();
 		String query = "SELECT new Map( protocol.codeName AS codeName, protocol.modifiedDate AS modifiedDate, protocol.recordedDate as recordedDate, value.dateValue AS dateValue )"
 				+ "FROM Protocol AS protocol "
@@ -632,38 +683,44 @@ public Collection<String> getProtocolCodesByDateValueComparison(
 				+ "WITH value.ignored = false "
 				+ "AND value.lsType = :valueType "
 				+ "AND value.lsKind = :valueKind "
-				+ "WHERE protocol.ignored = false "
-				;
-		if (requestDTO.getLsType() != null && requestDTO.getLsType().length()>0) query += "AND protocol.lsType = :protocolType ";
-		if (requestDTO.getLsKind() != null && requestDTO.getLsKind().length()>0) query += "AND protocol.lsKind = :protocolKind ";
-		
+				+ "WHERE protocol.ignored = false ";
+		if (requestDTO.getLsType() != null && requestDTO.getLsType().length() > 0)
+			query += "AND protocol.lsType = :protocolType ";
+		if (requestDTO.getLsKind() != null && requestDTO.getLsKind().length() > 0)
+			query += "AND protocol.lsKind = :protocolKind ";
+
 		TypedQuery<Map> q = em.createQuery(query, Map.class);
 		q.setParameter("stateType", requestDTO.getStateType());
 		q.setParameter("stateKind", requestDTO.getStateKind());
 		q.setParameter("valueType", "dateValue");
 		q.setParameter("valueKind", requestDTO.getValueKind());
-		if (requestDTO.getLsType() != null && requestDTO.getLsType().length()>0) q.setParameter("protocolType", requestDTO.getLsType());
-		if (requestDTO.getLsKind() != null && requestDTO.getLsKind().length()>0) q.setParameter("protocolKind", requestDTO.getLsKind());
-		
+		if (requestDTO.getLsType() != null && requestDTO.getLsType().length() > 0)
+			q.setParameter("protocolType", requestDTO.getLsType());
+		if (requestDTO.getLsKind() != null && requestDTO.getLsKind().length() > 0)
+			q.setParameter("protocolKind", requestDTO.getLsKind());
+
 		Collection<Map> resultMaps = q.getResultList();
 		Collection<String> protocolCodes = new HashSet<String>();
-		for (Map resultMap : resultMaps){
-			if (resultMap.get("dateValue") == null) protocolCodes.add((String) resultMap.get("codeName"));
-			else{
+		for (Map resultMap : resultMaps) {
+			if (resultMap.get("dateValue") == null)
+				protocolCodes.add((String) resultMap.get("codeName"));
+			else {
 				Date dateValue = (Date) resultMap.get("dateValue");
 				Date modifiedDate;
-				if (resultMap.get("modifiedDate") == null){
+				if (resultMap.get("modifiedDate") == null) {
 					modifiedDate = (Date) resultMap.get("recordedDate");
-				}else{
+				} else {
 					modifiedDate = (Date) resultMap.get("modifiedDate");
 				}
 				Integer secondsDelta = requestDTO.getSecondsDelta();
-				logger.debug("dateValue: "+dateValue.getTime());
-				logger.debug("modifiedDate: "+modifiedDate.getTime());
-				if (requestDTO.getNewerThanModified()){
-					if (dateValue.getTime() - secondsDelta*1000 >  modifiedDate.getTime()) protocolCodes.add((String) resultMap.get("codeName"));
-				}else{
-					if (dateValue.getTime() + secondsDelta*1000 <  modifiedDate.getTime()) protocolCodes.add((String) resultMap.get("codeName"));
+				logger.debug("dateValue: " + dateValue.getTime());
+				logger.debug("modifiedDate: " + modifiedDate.getTime());
+				if (requestDTO.getNewerThanModified()) {
+					if (dateValue.getTime() - secondsDelta * 1000 > modifiedDate.getTime())
+						protocolCodes.add((String) resultMap.get("codeName"));
+				} else {
+					if (dateValue.getTime() + secondsDelta * 1000 < modifiedDate.getTime())
+						protocolCodes.add((String) resultMap.get("codeName"));
 				}
 			}
 		}
diff --git a/src/main/java/com/labsynch/labseer/service/ProtocolStateServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ProtocolStateServiceImpl.java
index f48af22a2..603289836 100644
--- a/src/main/java/com/labsynch/labseer/service/ProtocolStateServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ProtocolStateServiceImpl.java
@@ -25,36 +25,38 @@
 public class ProtocolStateServiceImpl implements ProtocolStateService {
 
 	private static final Logger logger = LoggerFactory.getLogger(ProtocolStateServiceImpl.class);
-	
+
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
 
 	@Override
 	public Collection<ProtocolState> ignoreAllProtocolStates(Collection<ProtocolState> protocolStates) {
-		//mark protocolStates and values as ignore 
+		// mark protocolStates and values as ignore
 		Collection<ProtocolState> protocolStateSet = new HashSet<ProtocolState>();
-		for (ProtocolState queryProtocolState : protocolStates){
-			ProtocolState protocolState = ProtocolState.findProtocolState(queryProtocolState.getId());			
-				for(ProtocolValue protocolValue : ProtocolValue.findProtocolValuesByLsState(protocolState).getResultList()){
-					protocolValue.setIgnored(true);
-					protocolValue.merge();
-				}
-				protocolState.setIgnored(true);
-				protocolState.merge();
-				protocolStateSet.add(ProtocolState.findProtocolState(protocolState.getId()));
+		for (ProtocolState queryProtocolState : protocolStates) {
+			ProtocolState protocolState = ProtocolState.findProtocolState(queryProtocolState.getId());
+			for (ProtocolValue protocolValue : ProtocolValue.findProtocolValuesByLsState(protocolState)
+					.getResultList()) {
+				protocolValue.setIgnored(true);
+				protocolValue.merge();
+			}
+			protocolState.setIgnored(true);
+			protocolState.merge();
+			protocolStateSet.add(ProtocolState.findProtocolState(protocolState.getId()));
 		}
 
-		return(protocolStateSet);
+		return (protocolStateSet);
 
 	}
 
 	@Override
 	public List<ProtocolState> getProtocolStatesByProtocolIdAndStateTypeKind(
 			Long protocolId, String stateType, String stateKind) {
-		
-			List<ProtocolState> protocolStates = ProtocolState.findProtocolStatesByProtocolIDAndStateTypeKind(protocolId, stateType, stateKind).getResultList();
 
-			return protocolStates;
+		List<ProtocolState> protocolStates = ProtocolState
+				.findProtocolStatesByProtocolIDAndStateTypeKind(protocolId, stateType, stateKind).getResultList();
+
+		return protocolStates;
 	}
 
 	@Override
@@ -73,10 +75,10 @@ public ProtocolState createProtocolStateByProtocolIdAndStateTypeKind(
 	@Override
 	public ProtocolState saveProtocolState(
 			ProtocolState protocolState) {
-		protocolState.setProtocol(Protocol.findProtocol(protocolState.getProtocol().getId()));		
+		protocolState.setProtocol(Protocol.findProtocol(protocolState.getProtocol().getId()));
 		protocolState.persist();
 		Set<ProtocolValue> savedValues = new HashSet<ProtocolValue>();
-		for (ProtocolValue protocolValue : protocolState.getLsValues()){
+		for (ProtocolValue protocolValue : protocolState.getLsValues()) {
 			protocolValue.setLsState(protocolState);
 			protocolValue.persist();
 			savedValues.add(protocolValue);
@@ -89,12 +91,12 @@ public ProtocolState saveProtocolState(
 	@Override
 	public Collection<ProtocolState> saveProtocolStates(
 			Collection<ProtocolState> protocolStates) {
-		for (ProtocolState protocolState: protocolStates) {
+		for (ProtocolState protocolState : protocolStates) {
 			protocolState = saveProtocolState(protocolState);
 		}
 		return protocolStates;
 	}
-	
+
 	@Override
 	public ProtocolState updateProtocolState(
 			ProtocolState protocolState) {
@@ -106,21 +108,21 @@ public ProtocolState updateProtocolState(
 	@Override
 	public Collection<ProtocolState> updateProtocolStates(
 			Collection<ProtocolState> protocolStates) {
-		for (ProtocolState protocolState : protocolStates){
+		for (ProtocolState protocolState : protocolStates) {
 			protocolState = updateProtocolState(protocolState);
 		}
 		return null;
 	}
-	
+
 	@Override
 	public ProtocolState getProtocolState(String idOrCodeName,
 			String stateType, String stateKind) {
 		ProtocolState state = null;
-		try{
+		try {
 			Collection<ProtocolState> states = getProtocolStates(idOrCodeName, stateType, stateKind);
 			state = states.iterator().next();
-		}catch (Exception e){
-			logger.error("Caught error "+e.toString()+" trying to find a state.",e);
+		} catch (Exception e) {
+			logger.error("Caught error " + e.toString() + " trying to find a state.", e);
 			state = null;
 		}
 		return state;
@@ -130,23 +132,27 @@ public ProtocolState getProtocolState(String idOrCodeName,
 	public Collection<ProtocolStatePathDTO> getProtocolStates(
 			Collection<GenericStatePathRequest> genericRequests) {
 		Collection<ProtocolStatePathDTO> results = new ArrayList<ProtocolStatePathDTO>();
-		for (GenericStatePathRequest request : genericRequests){
+		for (GenericStatePathRequest request : genericRequests) {
 			ProtocolStatePathDTO result = new ProtocolStatePathDTO();
 			result.setIdOrCodeName(request.getIdOrCodeName());
 			result.setStateType(request.getStateType());
 			result.setStateKind(request.getStateKind());
-			result.setStates(getProtocolStates(request.getIdOrCodeName(), request.getStateType(), request.getStateKind()));
+			result.setStates(
+					getProtocolStates(request.getIdOrCodeName(), request.getStateType(), request.getStateKind()));
 			results.add(result);
 		}
 		return results;
 	}
-	
-	private Collection<ProtocolState> getProtocolStates(String idOrCodeName, String stateType, String stateKind){
-		if (SimpleUtil.isNumeric(idOrCodeName)){
+
+	private Collection<ProtocolState> getProtocolStates(String idOrCodeName, String stateType, String stateKind) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			Long id = Long.valueOf(idOrCodeName);
-			return ProtocolState.findProtocolStatesByProtocolIDAndStateTypeKind(id, stateType, stateKind).getResultList();
-		}else{
-			return ProtocolState.findProtocolStatesByProtocolCodeNameAndStateTypeKind(idOrCodeName, stateType, stateKind).getResultList();
+			return ProtocolState.findProtocolStatesByProtocolIDAndStateTypeKind(id, stateType, stateKind)
+					.getResultList();
+		} else {
+			return ProtocolState
+					.findProtocolStatesByProtocolCodeNameAndStateTypeKind(idOrCodeName, stateType, stateKind)
+					.getResultList();
 		}
 	}
 
diff --git a/src/main/java/com/labsynch/labseer/service/ProtocolValueService.java b/src/main/java/com/labsynch/labseer/service/ProtocolValueService.java
index d6df9af95..bd0bc288b 100644
--- a/src/main/java/com/labsynch/labseer/service/ProtocolValueService.java
+++ b/src/main/java/com/labsynch/labseer/service/ProtocolValueService.java
@@ -34,5 +34,4 @@ ProtocolValue getProtocolValue(String idOrCodeName, String stateType,
 	Collection<ProtocolValuePathDTO> getProtocolValues(
 			Collection<GenericValuePathRequest> genericRequests);
 
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/ProtocolValueServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ProtocolValueServiceImpl.java
index decb085e9..16be8e755 100644
--- a/src/main/java/com/labsynch/labseer/service/ProtocolValueServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ProtocolValueServiceImpl.java
@@ -20,26 +20,25 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-
 @Service
 @Transactional
 public class ProtocolValueServiceImpl implements ProtocolValueService {
 
 	@Autowired
 	private ProtocolStateService protocolStateService;
-	
-	private static final Logger logger = LoggerFactory.getLogger(ProtocolValueServiceImpl.class);
 
+	private static final Logger logger = LoggerFactory.getLogger(ProtocolValueServiceImpl.class);
 
-	//Query hibernate object and grab existing table references - add them to json hydrated object
+	// Query hibernate object and grab existing table references - add them to json
+	// hydrated object
 	@Override
 	@Transactional
-	public ProtocolValue updateProtocolValue(ProtocolValue protocolValue){
+	public ProtocolValue updateProtocolValue(ProtocolValue protocolValue) {
 		if (protocolValue.getLsState().getId() == null) {
 			ProtocolState protocolState = new ProtocolState(protocolValue.getLsState());
 			protocolState.setProtocol(Protocol.findProtocol(protocolValue.getLsState().getProtocol().getId()));
 			protocolState.persist();
-			protocolValue.setLsState(protocolState); 
+			protocolValue.setLsState(protocolState);
 		} else {
 			protocolValue.setLsState(ProtocolState.findProtocolState(protocolValue.getLsState().getId()));
 		}
@@ -55,31 +54,31 @@ public ProtocolValue saveProtocolValue(ProtocolValue protocolValue) {
 			ProtocolState protocolState = new ProtocolState(protocolValue.getLsState());
 			protocolState.setProtocol(Protocol.findProtocol(protocolValue.getLsState().getProtocol().getId()));
 			protocolState.persist();
-			protocolValue.setLsState(protocolState); 
+			protocolValue.setLsState(protocolState);
 		} else {
 			protocolValue.setLsState(ProtocolState.findProtocolState(protocolValue.getLsState().getId()));
-		}		
+		}
 		protocolValue.persist();
 		return protocolValue;
 	}
-	
+
 	@Override
 	@Transactional
 	public Collection<ProtocolValue> saveProtocolValues(Collection<ProtocolValue> protocolValues) {
-		for (ProtocolValue protocolValue: protocolValues) {
+		for (ProtocolValue protocolValue : protocolValues) {
 			protocolValue = saveProtocolValue(protocolValue);
 		}
 		return protocolValues;
 	}
 
 	@Override
-	public List<ProtocolValue> getProtocolValuesByProtocolId(Long id){	
+	public List<ProtocolValue> getProtocolValuesByProtocolId(Long id) {
 		List<ProtocolValue> protocolValues = new ArrayList<ProtocolValue>();
 		Protocol protocol = Protocol.findProtocol(id);
-		if(protocol.getLsStates() != null) {
+		if (protocol.getLsStates() != null) {
 			for (ProtocolState protocolState : protocol.getLsStates()) {
-				if(protocolState.getLsValues() != null) {
-					for(ProtocolValue protocolValue : protocolState.getLsValues()) {
+				if (protocolState.getLsValues() != null) {
+					for (ProtocolValue protocolValue : protocolState.getLsValues()) {
 						protocolValues.add(protocolValue);
 					}
 				}
@@ -92,53 +91,59 @@ public List<ProtocolValue> getProtocolValuesByProtocolId(Long id){
 	public List<ProtocolValue> getProtocolValuesByProtocolIdAndStateTypeKindAndValueTypeKind(
 			Long protocolId, String stateType, String stateKind,
 			String valueType, String valueKind) {
-		
-		List<ProtocolValue> protocolValues = ProtocolValue.findProtocolValuesByProtocolIDAndStateTypeKindAndValueTypeKind(protocolId, stateType,
-				stateKind, valueType, valueKind).getResultList();
-		
+
+		List<ProtocolValue> protocolValues = ProtocolValue
+				.findProtocolValuesByProtocolIDAndStateTypeKindAndValueTypeKind(protocolId, stateType,
+						stateKind, valueType, valueKind)
+				.getResultList();
+
 		return protocolValues;
 	}
-	
+
 	@Override
-	public ProtocolValue updateProtocolValue(String idOrCodeName, String stateType, String stateKind, String valueType, String valueKind, String value) {
-		//fetch the entity
+	public ProtocolValue updateProtocolValue(String idOrCodeName, String stateType, String stateKind, String valueType,
+			String valueKind, String value) {
+		// fetch the entity
 		Protocol protocol;
-		if(SimpleUtil.isNumeric(idOrCodeName)) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			protocol = Protocol.findProtocol(Long.valueOf(idOrCodeName));
-		} else {		
+		} else {
 			try {
 				protocol = Protocol.findProtocolsByCodeNameEquals(idOrCodeName).getSingleResult();
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				protocol = null;
 			}
 		}
-		//fetch the state, and if it doesn't exist, create it
+		// fetch the state, and if it doesn't exist, create it
 		List<ProtocolState> protocolStates;
-		if(protocol != null) {
+		if (protocol != null) {
 			Long protocolId = protocol.getId();
-			protocolStates = protocolStateService.getProtocolStatesByProtocolIdAndStateTypeKind(protocolId, stateType, stateKind);
+			protocolStates = protocolStateService.getProtocolStatesByProtocolIdAndStateTypeKind(protocolId, stateType,
+					stateKind);
 			if (protocolStates.isEmpty()) {
-				//create the state
-				protocolStates.add(protocolStateService.createProtocolStateByProtocolIdAndStateTypeKind(protocolId, stateType, stateKind));
+				// create the state
+				protocolStates.add(protocolStateService.createProtocolStateByProtocolIdAndStateTypeKind(protocolId,
+						stateType, stateKind));
 				logger.debug("Created the protocol state: " + protocolStates.get(0).toJson());
 			}
 		}
-		//fetch the value, update it if it exists, and if it doesn't exist, create it
+		// fetch the value, update it if it exists, and if it doesn't exist, create it
 		List<ProtocolValue> protocolValues;
 		ProtocolValue protocolValue = null;
-		if(protocol != null) {
+		if (protocol != null) {
 			Long protocolId = protocol.getId();
-			protocolValues = getProtocolValuesByProtocolIdAndStateTypeKindAndValueTypeKind(protocolId, stateType, stateKind, valueType, valueKind);
-			if (protocolValues.size() > 1){
+			protocolValues = getProtocolValuesByProtocolIdAndStateTypeKindAndValueTypeKind(protocolId, stateType,
+					stateKind, valueType, valueKind);
+			if (protocolValues.size() > 1) {
 				logger.error("Error: multiple protocol statuses found");
-			}
-			else if (protocolValues.size() == 1){
+			} else if (protocolValues.size() == 1) {
 				protocolValue = protocolValues.get(0);
 				protocolValue.setIgnored(true);
 				protocolValue.merge();
 				logger.debug("Ignored the protocol value: " + protocolValue.toJson());
 			}
-			protocolValue = createProtocolValueByProtocolIdAndStateTypeKindAndValueTypeKind(protocolId, stateType, stateKind, valueType, valueKind, value);
+			protocolValue = createProtocolValueByProtocolIdAndStateTypeKindAndValueTypeKind(protocolId, stateType,
+					stateKind, valueType, valueKind, value);
 			logger.debug("Created the protocol value: " + protocolValue.toJson());
 		}
 		return protocolValue;
@@ -149,41 +154,51 @@ private ProtocolValue createProtocolValueByProtocolIdAndStateTypeKindAndValueTyp
 			Long protocolId, String stateType, String stateKind,
 			String valueType, String valueKind, String value) {
 		ProtocolValue protocolValue = new ProtocolValue();
-		ProtocolState protocolState = ProtocolState.findProtocolStatesByProtocolIDAndStateTypeKind(protocolId, stateType, stateKind).getSingleResult();
+		ProtocolState protocolState = ProtocolState
+				.findProtocolStatesByProtocolIDAndStateTypeKind(protocolId, stateType, stateKind).getSingleResult();
 		protocolValue.setLsState(protocolState);
 		protocolValue.setLsType(valueType);
 		protocolValue.setLsKind(valueKind);
-		if (valueType.equals("stringValue")) protocolValue.setStringValue(value);
-		if (valueType.equals("fileValue")) protocolValue.setFileValue(value);
-		if (valueType.equals("clobValue")) protocolValue.setClobValue(value);
-		if (valueType.equals("blobValue")) protocolValue.setBlobValue(value.getBytes(Charset.forName("UTF-8")));
-		if (valueType.equals("numericValue")) protocolValue.setNumericValue(new BigDecimal(value));
-		if (valueType.equals("dateValue")) protocolValue.setDateValue(new Date(Long.parseLong(value)));
-		if (valueType.equals("codeValue")) protocolValue.setCodeValue(value);
-		if (valueType.equals("urlValue")) protocolValue.setUrlValue(value);
+		if (valueType.equals("stringValue"))
+			protocolValue.setStringValue(value);
+		if (valueType.equals("fileValue"))
+			protocolValue.setFileValue(value);
+		if (valueType.equals("clobValue"))
+			protocolValue.setClobValue(value);
+		if (valueType.equals("blobValue"))
+			protocolValue.setBlobValue(value.getBytes(Charset.forName("UTF-8")));
+		if (valueType.equals("numericValue"))
+			protocolValue.setNumericValue(new BigDecimal(value));
+		if (valueType.equals("dateValue"))
+			protocolValue.setDateValue(new Date(Long.parseLong(value)));
+		if (valueType.equals("codeValue"))
+			protocolValue.setCodeValue(value);
+		if (valueType.equals("urlValue"))
+			protocolValue.setUrlValue(value);
 		protocolValue.setRecordedBy("default");
 		protocolValue.persist();
 		return protocolValue;
 	}
-	
+
 	@Override
 	public Collection<ProtocolValue> updateProtocolValues(
 			Collection<ProtocolValue> protocolValues) {
-		for (ProtocolValue protocolValue: protocolValues) {
+		for (ProtocolValue protocolValue : protocolValues) {
 			protocolValue = updateProtocolValue(protocolValue);
 		}
 		return protocolValues;
 	}
-	
+
 	@Override
 	public ProtocolValue getProtocolValue(String idOrCodeName,
 			String stateType, String stateKind, String valueType, String valueKind) {
 		ProtocolValue value = null;
-		try{
-			Collection<ProtocolValue> values = getProtocolValues(idOrCodeName, stateType, stateKind, valueType, valueKind);
+		try {
+			Collection<ProtocolValue> values = getProtocolValues(idOrCodeName, stateType, stateKind, valueType,
+					valueKind);
 			value = values.iterator().next();
-		}catch (Exception e){
-			logger.error("Caught error "+e.toString()+" trying to find a state.",e);
+		} catch (Exception e) {
+			logger.error("Caught error " + e.toString() + " trying to find a state.", e);
 			value = null;
 		}
 		return value;
@@ -193,23 +208,27 @@ public ProtocolValue getProtocolValue(String idOrCodeName,
 	public Collection<ProtocolValuePathDTO> getProtocolValues(
 			Collection<GenericValuePathRequest> genericRequests) {
 		Collection<ProtocolValuePathDTO> results = new ArrayList<ProtocolValuePathDTO>();
-		for (GenericValuePathRequest request : genericRequests){
+		for (GenericValuePathRequest request : genericRequests) {
 			ProtocolValuePathDTO result = new ProtocolValuePathDTO();
 			result.setIdOrCodeName(request.getIdOrCodeName());
 			result.setValueType(request.getValueType());
 			result.setValueKind(request.getValueKind());
-			result.setValues(getProtocolValues(request.getIdOrCodeName(), request.getStateType(), request.getStateKind(), request.getValueType(), request.getValueKind()));
+			result.setValues(getProtocolValues(request.getIdOrCodeName(), request.getStateType(),
+					request.getStateKind(), request.getValueType(), request.getValueKind()));
 			results.add(result);
 		}
 		return results;
 	}
-	
-	private Collection<ProtocolValue> getProtocolValues(String idOrCodeName, String stateType, String stateKind, String valueType, String valueKind){
-		if (SimpleUtil.isNumeric(idOrCodeName)){
+
+	private Collection<ProtocolValue> getProtocolValues(String idOrCodeName, String stateType, String stateKind,
+			String valueType, String valueKind) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			Long id = Long.valueOf(idOrCodeName);
-			return ProtocolValue.findProtocolValuesByProtocolIDAndStateTypeKindAndValueTypeKind(id, stateType, stateKind, valueType, valueKind).getResultList();
-		}else{
-			return ProtocolValue.findProtocolValuesByProtocolCodeNameAndStateTypeKindAndValueTypeKind(idOrCodeName, stateType, stateKind, valueType, valueKind).getResultList();
+			return ProtocolValue.findProtocolValuesByProtocolIDAndStateTypeKindAndValueTypeKind(id, stateType,
+					stateKind, valueType, valueKind).getResultList();
+		} else {
+			return ProtocolValue.findProtocolValuesByProtocolCodeNameAndStateTypeKindAndValueTypeKind(idOrCodeName,
+					stateType, stateKind, valueType, valueKind).getResultList();
 		}
 	}
 }
diff --git a/src/main/java/com/labsynch/labseer/service/RegSearchServiceImpl.java b/src/main/java/com/labsynch/labseer/service/RegSearchServiceImpl.java
index ac6d65a54..1e184a7ee 100755
--- a/src/main/java/com/labsynch/labseer/service/RegSearchServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/RegSearchServiceImpl.java
@@ -34,10 +34,10 @@
 public class RegSearchServiceImpl implements RegSearchService {
 
 	Logger logger = LoggerFactory.getLogger(RegSearchServiceImpl.class);
-	
+
 	@Autowired
 	private ChemStructureService chemStructureService;
-	
+
 	@Autowired
 	CmpdRegMoleculeFactory cmpdRegMoleculeFactory;
 
@@ -55,36 +55,37 @@ public RegSearchDTO getParentsbyParams(String searchParamsString) throws IOExcep
 		String molStructure = searchParams.getMolStructure();
 		logger.debug("search corpName: " + corpName);
 		logger.debug("search molStructure: " + molStructure);
-		logger.debug("using the /regsearches/parent controller service implementation" );
+		logger.debug("using the /regsearches/parent controller service implementation");
 
 		RegSearchDTO regSearchDTO = new RegSearchDTO();
 		List<Parent> parents = new ArrayList<Parent>();
-		if (corpName.equalsIgnoreCase("null") || corpName.equalsIgnoreCase("")){
-			//corpName not supplied -- so search by structure   
+		if (corpName.equalsIgnoreCase("null") || corpName.equalsIgnoreCase("")) {
+			// corpName not supplied -- so search by structure
 			System.out.println("search with structure: " + molStructure);
-			
+
 			CmpdRegMolecule mol = cmpdRegMoleculeFactory.getCmpdRegMolecule(molStructure);
 
 			String format = "png";
 			String wSize = "600";
 			String hSize = "300";
 
-			regSearchDTO.setAsDrawnImage(convertToBase64(mol, format, hSize, wSize ));
+			regSearchDTO.setAsDrawnImage(convertToBase64(mol, format, hSize, wSize));
 			regSearchDTO.setAsDrawnStructure(mol.getMolStructure());
 			regSearchDTO.setAsDrawnMolFormula(mol.getFormula());
 			regSearchDTO.setAsDrawnExactMass(mol.getExactMass());
-			if(propertiesUtilService.getUseExactMass()){
+			if (propertiesUtilService.getUseExactMass()) {
 				regSearchDTO.setAsDrawnMolWeight(mol.getExactMass());
 
-			}else{
+			} else {
 				regSearchDTO.setAsDrawnMolWeight(mol.getMass());
 
 			}
-			int[] parentHits = chemStructureService.searchMolStructures(MoleculeUtil.exportMolAsText(mol, "mol"), StructureType.PARENT, SearchType.FULL_TAUTOMER);
+			int[] parentHits = chemStructureService.searchMolStructures(MoleculeUtil.exportMolAsText(mol, "mol"),
+					StructureType.PARENT, SearchType.FULL_TAUTOMER);
 			logger.debug("number of parents found: " + parentHits.length);
 
-			if (parentHits.length > 0){
-				for (int hit : parentHits){
+			if (parentHits.length > 0) {
+				for (int hit : parentHits) {
 					List<Parent> hitList = Parent.findParentsByCdId(hit).getResultList();
 					parents.addAll(hitList);
 				}
@@ -98,26 +99,26 @@ public RegSearchDTO getParentsbyParams(String searchParamsString) throws IOExcep
 
 			boolean saltBeforeLot = propertiesUtilService.getSaltBeforeLot();
 
-			List<Parent> parentList;			
-			if (corpNameService.checkParentCorpName(corpName)){
+			List<Parent> parentList;
+			if (corpNameService.checkParentCorpName(corpName)) {
 				logger.debug("corpName looks like a parent corpName: " + corpName);
 
 				parentList = Parent.findParentsByCorpNameEquals(corpName).getResultList();
 				regSearchDTO = this.populateFromParents(regSearchDTO, parentList);
 
-			} else if (corpNameService.checkCorpNumber(corpName)){
+			} else if (corpNameService.checkCorpNumber(corpName)) {
 				logger.debug("corpName looks like a corp number: " + corpName);
 
 				corpName = corpNameService.convertCorpNameNumber(corpName);
 				parentList = Parent.findParentsByCorpNameEquals(corpName).getResultList();
 				regSearchDTO = this.populateFromParents(regSearchDTO, parentList);
 
-			}else if (corpNameService.checkSaltFormCorpName(corpName) && saltBeforeLot){
+			} else if (corpNameService.checkSaltFormCorpName(corpName) && saltBeforeLot) {
 				logger.debug("corpName looks like a saltForm: " + corpName);
 				SaltForm saltForm = SaltForm.findSaltFormsByCorpNameEquals(corpName).getSingleResult();
 				regSearchDTO = this.populateFromSaltForm(regSearchDTO, saltForm);
 
-			} else if (corpNameService.checkLotCorpName(corpName)){
+			} else if (corpNameService.checkLotCorpName(corpName)) {
 				logger.debug("corpName looks like a lot: " + corpName);
 				List<Lot> lots = Lot.findLotsByCorpNameEquals(corpName.trim()).getResultList();
 				logger.debug("number of lots found: " + lots.size());
@@ -128,47 +129,43 @@ public RegSearchDTO getParentsbyParams(String searchParamsString) throws IOExcep
 			} else {
 				logger.debug("corpName looks like other parent corpName: " + corpName);
 				parentList = Parent.findParentsByCorpNameEquals(corpName).getResultList();
-				regSearchDTO = this.populateFromParents(regSearchDTO, parentList);					
+				regSearchDTO = this.populateFromParents(regSearchDTO, parentList);
 			}
 
 			logger.debug("Converted corpName = " + corpName);
 
 		}
 
-
 		return regSearchDTO;
 	}
 
-
 	private boolean isNumber(String corpName) {
 		try {
 			Integer.parseInt(corpName.trim());
 			return true;
-		} catch (NumberFormatException nfe){
+		} catch (NumberFormatException nfe) {
 			return false;
 		}
 	}
 
-
-	private String convertToBase64(CmpdRegMolecule mol, String imageFormat, String hSize, String wSize) throws IOException {
+	private String convertToBase64(CmpdRegMolecule mol, String imageFormat, String hSize, String wSize)
+			throws IOException {
 		byte[] imageData = mol.toBinary(mol, imageFormat, hSize, wSize);
 		byte[] encodedBytes = Base64.encodeBase64(imageData);
 		return new String(encodedBytes);
 	}
 
-
 	private String convertToBase64(byte[] image_data) {
 		byte[] encodedBytes = Base64.encodeBase64(image_data);
 		return new String(encodedBytes);
-	}		
-
+	}
 
 	private RegSearchDTO populateFromSaltForm(RegSearchDTO regSearchDTO, SaltForm saltForm) {
 		Parent parent = saltForm.getParent();
 		ParentDTO parentDTO = new ParentDTO();
 		parentDTO.setParent(parent);
 		Set<ParentAlias> parentAliases = parent.getParentAliases();
-		for (ParentAlias parentAlias : parentAliases){
+		for (ParentAlias parentAlias : parentAliases) {
 			ParentAliasDTO parentAliasDTO = new ParentAliasDTO(parentAlias);
 			parentDTO.getParentAliases().add(parentAliasDTO);
 		}
@@ -177,19 +174,18 @@ private RegSearchDTO populateFromSaltForm(RegSearchDTO regSearchDTO, SaltForm sa
 		saltFormDTO.setSaltForm(saltForm);
 		saltFormDTO.getIsosalts().addAll(isosalts);
 		parentDTO.getSaltForms().add(saltFormDTO);
-		regSearchDTO.getParents().add(parentDTO);		
+		regSearchDTO.getParents().add(parentDTO);
 		return regSearchDTO;
 	}
 
-
 	private RegSearchDTO populateFromParents(RegSearchDTO regSearchDTO, List<Parent> parentList) {
 		logger.debug("number of parents found: " + parentList.size());
-		for (Parent parent : parentList){
+		for (Parent parent : parentList) {
 			System.out.println("name of parents found: " + parent.getCorpName());
 			ParentDTO parentDTO = new ParentDTO();
 			parentDTO.setParent(parent);
 			List<SaltForm> saltForms = SaltForm.findSaltFormsByParent(parent).getResultList();
-			for (SaltForm saltForm: saltForms){
+			for (SaltForm saltForm : saltForms) {
 				List<IsoSalt> isosalts = IsoSalt.findIsoSaltsBySaltForm(saltForm).getResultList();
 				SaltFormDTO saltFormDTO = new SaltFormDTO();
 				saltFormDTO.setSaltForm(saltForm);
@@ -197,14 +193,14 @@ private RegSearchDTO populateFromParents(RegSearchDTO regSearchDTO, List<Parent>
 				parentDTO.getSaltForms().add(saltFormDTO);
 			}
 			Set<ParentAlias> parentAliases = parent.getParentAliases();
-			for (ParentAlias parentAlias : parentAliases){
+			for (ParentAlias parentAlias : parentAliases) {
 				ParentAliasDTO parentAliasDTO = new ParentAliasDTO(parentAlias);
 				parentDTO.getParentAliases().add(parentAliasDTO);
 			}
 			regSearchDTO.getParents().add(parentDTO);
-		}  
+		}
 
 		return regSearchDTO;
-	}	
+	}
 
 }
diff --git a/src/main/java/com/labsynch/labseer/service/SaltFormService.java b/src/main/java/com/labsynch/labseer/service/SaltFormService.java
index 4918b7702..0f9f6a718 100644
--- a/src/main/java/com/labsynch/labseer/service/SaltFormService.java
+++ b/src/main/java/com/labsynch/labseer/service/SaltFormService.java
@@ -10,12 +10,13 @@
 import com.labsynch.labseer.exceptions.DupeSaltFormStructureException;
 import com.labsynch.labseer.exceptions.SaltFormMolFormatException;
 
-
 public interface SaltFormService {
 
 	public void updateSaltWeight(SaltForm saltForm);
-	
-	public SaltForm updateSaltForm(Parent parent, SaltForm saltForm, Set<IsoSalt> isoSalts, Lot lot, double totalSaltWeight, ArrayList<ErrorMessage> errors) throws SaltFormMolFormatException, DupeSaltFormStructureException;
+
+	public SaltForm updateSaltForm(Parent parent, SaltForm saltForm, Set<IsoSalt> isoSalts, Lot lot,
+			double totalSaltWeight, ArrayList<ErrorMessage> errors)
+			throws SaltFormMolFormatException, DupeSaltFormStructureException;
 
 	public double calculateSaltWeight(SaltForm saltForm);
 }
diff --git a/src/main/java/com/labsynch/labseer/service/SaltFormServiceImpl.java b/src/main/java/com/labsynch/labseer/service/SaltFormServiceImpl.java
index f3e6d1e59..6e94fd8b4 100644
--- a/src/main/java/com/labsynch/labseer/service/SaltFormServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/SaltFormServiceImpl.java
@@ -20,7 +20,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-
 @Service
 public class SaltFormServiceImpl implements SaltFormService {
 
@@ -35,7 +34,7 @@ public class SaltFormServiceImpl implements SaltFormService {
 
 	@Autowired
 	private IsoSaltService isoSaltService;
-	
+
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
 
@@ -45,77 +44,86 @@ public void updateSaltWeight(SaltForm saltForm) {
 		double totalSaltWeight = 0d;
 
 		Set<IsoSalt> isoSalts = saltForm.getIsoSalts();
-		for (IsoSalt isoSalt : isoSalts ){
+		for (IsoSalt isoSalt : isoSalts) {
 			double saltWeight = 0;
 			logger.debug("isoSalt type: " + isoSalt.getType());
-			if (isoSalt.getType().equalsIgnoreCase("isotope")){
+			if (isoSalt.getType().equalsIgnoreCase("isotope")) {
 				logger.debug("isoSalt type: " + isoSalt.getType());
 
-				saltWeight = isoSalt.getIsotope().getMassChange(); 
-				logger.debug("intial saltWeight: " + saltWeight);	
+				saltWeight = isoSalt.getIsotope().getMassChange();
+				logger.debug("intial saltWeight: " + saltWeight);
 				logger.debug("equivalents: " + isoSalt.getEquivalents());
 				saltWeight = saltWeight * isoSalt.getEquivalents();
-				logger.debug("final saltWeight: " + saltWeight);	
-			} 
-			else if (isoSalt.getType().equalsIgnoreCase("salt")){
+				logger.debug("final saltWeight: " + saltWeight);
+			} else if (isoSalt.getType().equalsIgnoreCase("salt")) {
 				saltWeight = isoSalt.getSalt().getMolWeight();
-				logger.debug("intial saltWeight: " + saltWeight);	
+				logger.debug("intial saltWeight: " + saltWeight);
 				logger.debug("equivalents: " + isoSalt.getEquivalents());
-				//correction for charged salts
+				// correction for charged salts
 				saltWeight = saltWeight * isoSalt.getEquivalents();
-				saltWeight = saltWeight - (1.00794)*(isoSalt.getSalt().getCharge() * isoSalt.getEquivalents());
-				logger.debug("final saltWeight: " + saltWeight);	
+				saltWeight = saltWeight - (1.00794) * (isoSalt.getSalt().getCharge() * isoSalt.getEquivalents());
+				logger.debug("final saltWeight: " + saltWeight);
 			}
 			totalSaltWeight = totalSaltWeight + saltWeight;
-			logger.debug("current totalSaltWeigth: " + totalSaltWeight);	
+			logger.debug("current totalSaltWeigth: " + totalSaltWeight);
 		}
 		saltForm.setSaltWeight(totalSaltWeight);
 		saltForm.merge();
-		
+
 	}
-	
-	public SaltForm updateSaltForm(Parent parent, SaltForm saltForm, Set<IsoSalt> isoSalts, Lot lot, double totalSaltWeight, ArrayList<ErrorMessage> errors) throws SaltFormMolFormatException, DupeSaltFormStructureException{
+
+	public SaltForm updateSaltForm(Parent parent, SaltForm saltForm, Set<IsoSalt> isoSalts, Lot lot,
+			double totalSaltWeight, ArrayList<ErrorMessage> errors)
+			throws SaltFormMolFormatException, DupeSaltFormStructureException {
 		boolean changedSaltForm = false;
 		Set<Long> currentIsoSaltIds = new HashSet<Long>();
 		HashSet<IsoSalt> addedIsoSalts = new HashSet<IsoSalt>();
 		HashSet<IsoSalt> changedIsoSalts = new HashSet<IsoSalt>();
 		HashSet<IsoSalt> deletedIsoSalts = new HashSet<IsoSalt>();
-		for (IsoSalt isoSalt : isoSalts){
-			if(isoSalt.getId() == null){
+		for (IsoSalt isoSalt : isoSalts) {
+			if (isoSalt.getId() == null) {
 				changedSaltForm = true;
 				logger.debug("New isoSalt");
 				addedIsoSalts.add(isoSalt);
 
-			}else{
+			} else {
 				IsoSalt oldIsoSalt = IsoSalt.findIsoSalt(isoSalt.getId());
 				currentIsoSaltIds.add(oldIsoSalt.getId());
-				boolean isotopeSame = (oldIsoSalt.getIsotope() == null && isoSalt.getIsotope() == null) || (oldIsoSalt.getIsotope() != null && isoSalt.getIsotope() != null && oldIsoSalt.getIsotope().getAbbrev().equals(isoSalt.getIsotope().getAbbrev()));
-				boolean saltSame = (oldIsoSalt.getSalt() == null && isoSalt.getSalt() == null) || (oldIsoSalt.getSalt() != null && isoSalt.getSalt() != null && oldIsoSalt.getSalt().getAbbrev().equals(isoSalt.getSalt().getAbbrev()));
-				boolean equivalentsSame = (oldIsoSalt.getEquivalents() == null && isoSalt.getEquivalents() == null) || (oldIsoSalt.getEquivalents() != null && isoSalt.getEquivalents() != null && (Math.abs(oldIsoSalt.getEquivalents() - isoSalt.getEquivalents()) < 1e-9));
-				boolean typeSame = (oldIsoSalt.getType() == null && isoSalt.getType() == null) || (oldIsoSalt.getType() != null && isoSalt.getType() != null && oldIsoSalt.getType().equals(isoSalt.getType()));
+				boolean isotopeSame = (oldIsoSalt.getIsotope() == null && isoSalt.getIsotope() == null)
+						|| (oldIsoSalt.getIsotope() != null && isoSalt.getIsotope() != null
+								&& oldIsoSalt.getIsotope().getAbbrev().equals(isoSalt.getIsotope().getAbbrev()));
+				boolean saltSame = (oldIsoSalt.getSalt() == null && isoSalt.getSalt() == null)
+						|| (oldIsoSalt.getSalt() != null && isoSalt.getSalt() != null
+								&& oldIsoSalt.getSalt().getAbbrev().equals(isoSalt.getSalt().getAbbrev()));
+				boolean equivalentsSame = (oldIsoSalt.getEquivalents() == null && isoSalt.getEquivalents() == null)
+						|| (oldIsoSalt.getEquivalents() != null && isoSalt.getEquivalents() != null
+								&& (Math.abs(oldIsoSalt.getEquivalents() - isoSalt.getEquivalents()) < 1e-9));
+				boolean typeSame = (oldIsoSalt.getType() == null && isoSalt.getType() == null)
+						|| (oldIsoSalt.getType() != null && isoSalt.getType() != null
+								&& oldIsoSalt.getType().equals(isoSalt.getType()));
 
-				if (!isotopeSame || !saltSame || !equivalentsSame || !typeSame){
+				if (!isotopeSame || !saltSame || !equivalentsSame || !typeSame) {
 					changedSaltForm = true;
-//					logger.debug("Updating isoSalt");
+					// logger.debug("Updating isoSalt");
 				}
 				isoSalt.setVersion(oldIsoSalt.getVersion());
 				changedIsoSalts.add(isoSalt);
 			}
 		}
-		for (IsoSalt isoSalt : SaltForm.findSaltForm(saltForm.getId()).getIsoSalts()){
-			if (!currentIsoSaltIds.contains(isoSalt.getId())){
-				changedSaltForm=true;
+		for (IsoSalt isoSalt : SaltForm.findSaltForm(saltForm.getId()).getIsoSalts()) {
+			if (!currentIsoSaltIds.contains(isoSalt.getId())) {
+				changedSaltForm = true;
 				deletedIsoSalts.add(isoSalt);
 			}
 		}
-		if (changedSaltForm){
-			if (propertiesUtilService.getSaltBeforeLot()){
+		if (changedSaltForm) {
+			if (propertiesUtilService.getSaltBeforeLot()) {
 				// isSaltBeforeLot == true; Parent > SaltForm > Lot mode
-				//search for existing saltForms matching changed saltForm by set of isoSalts
+				// search for existing saltForms matching changed saltForm by set of isoSalts
 				boolean isNewSaltForm = true;
 				List<SaltForm> oldSaltForms = SaltForm.findSaltFormsByParent(parent).getResultList();
-				for (SaltForm oldSaltForm : oldSaltForms){
-					if (checkIsoSaltSetsSame(isoSalts, oldSaltForm.getIsoSalts())){
+				for (SaltForm oldSaltForm : oldSaltForms) {
+					if (checkIsoSaltSetsSame(isoSalts, oldSaltForm.getIsoSalts())) {
 						isNewSaltForm = false;
 						SaltForm previousSaltForm = SaltForm.findSaltForm(saltForm.getId());
 						previousSaltForm.getLots().remove(lot);
@@ -126,13 +134,14 @@ public SaltForm updateSaltForm(Parent parent, SaltForm saltForm, Set<IsoSalt> is
 						String oldCorpName = lot.getCorpName();
 						lot.setCorpName(lotService.generateCorpName(lot));
 						String newCorpName = lot.getCorpName();
-						errors.add(new ErrorMessage("info", "Changing saltForm has renamed this lot from "+oldCorpName+" to "+newCorpName));
+						errors.add(new ErrorMessage("info",
+								"Changing saltForm has renamed this lot from " + oldCorpName + " to " + newCorpName));
 						saltForm.getLots().add(lot);
 						saltForm.merge();
 						break;
-					}					
+					}
 				}
-				if (isNewSaltForm){
+				if (isNewSaltForm) {
 					SaltForm newSaltForm = new SaltForm();
 					String saltFormCorpName = corpNameService.generateSaltFormCorpName(parent.getCorpName(), isoSalts);
 					newSaltForm.setParent(parent);
@@ -141,26 +150,28 @@ public SaltForm updateSaltForm(Parent parent, SaltForm saltForm, Set<IsoSalt> is
 					newSaltForm.setRegistrationDate(new Date());
 					newSaltForm.setCorpName(saltFormCorpName);
 					int cdId = 0;
-					if (saltForm.getMolStructure() == null || saltForm.getMolStructure().trim().equalsIgnoreCase("")){
+					if (saltForm.getMolStructure() == null || saltForm.getMolStructure().trim().equalsIgnoreCase("")) {
 						logger.debug("no salt form structure");
 
 					} else {
 						cdId = chemService.saveStructure(saltForm.getMolStructure(), StructureType.SALT_FORM, true);
-						if (cdId == -1){
+						if (cdId == -1) {
 							ErrorMessage saltFormError = new ErrorMessage();
 							saltFormError.setLevel("error");
-							saltFormError.setMessage("Bad molformat. Please fix the molfile: " + saltForm.getMolStructure());
+							saltFormError
+									.setMessage("Bad molformat. Please fix the molfile: " + saltForm.getMolStructure());
 							logger.error(saltFormError.getMessage());
 							errors.add(saltFormError);
 							throw new SaltFormMolFormatException();
-						} else if (cdId == 0){
+						} else if (cdId == 0) {
 							ErrorMessage saltFormError = new ErrorMessage();
 							saltFormError.setLevel("warning");
 							saltFormError.setMessage("Duplicate saltForm found. Please select existing saltForm.");
 							logger.error(saltFormError.getMessage());
 							errors.add(saltFormError);
-							throw new DupeSaltFormStructureException("Duplicate saltForm found. Please select existing saltForm.");
-						}        						
+							throw new DupeSaltFormStructureException(
+									"Duplicate saltForm found. Please select existing saltForm.");
+						}
 					}
 					newSaltForm.setCdId(cdId);
 					newSaltForm.persist();
@@ -169,7 +180,7 @@ public SaltForm updateSaltForm(Parent parent, SaltForm saltForm, Set<IsoSalt> is
 					lot.setCorpName(lotService.generateCorpName(lot));
 					lot.merge();
 					Set<IsoSalt> newIsoSalts = new HashSet<IsoSalt>();
-					for (IsoSalt isoSalt : isoSalts ){
+					for (IsoSalt isoSalt : isoSalts) {
 						IsoSalt newIsoSalt = new IsoSalt();
 						newIsoSalt.setSaltForm(saltForm);
 						newIsoSalt.setType(isoSalt.getType());
@@ -180,32 +191,32 @@ public SaltForm updateSaltForm(Parent parent, SaltForm saltForm, Set<IsoSalt> is
 						newIsoSalts.add(newIsoSalt);
 						double saltWeight = isoSaltService.calculateSaltWeight(newIsoSalt);
 						totalSaltWeight = totalSaltWeight + saltWeight;
-						logger.debug("current totalSaltWeigth: " + totalSaltWeight);	
+						logger.debug("current totalSaltWeigth: " + totalSaltWeight);
 					}
 					saltForm.setIsoSalts(newIsoSalts);
 					saltForm.setSaltWeight(totalSaltWeight);
 					saltForm.merge();
-				}else{
+				} else {
 					lot.setSaltForm(saltForm);
 					lot.setCorpName(lotService.generateCorpName(lot));
-//					lot.merge();
+					// lot.merge();
 				}
-			}else{
+			} else {
 				// isSaltBeforeLot == false; Parent > Lot mode
 				// just update the saltForm in place
 				logger.warn("SaltForm changed - updating saltForm and dependent lots");
 				double newTotalSaltWeight = 0;
-				for (IsoSalt isoSalt: isoSalts){
+				for (IsoSalt isoSalt : isoSalts) {
 					newTotalSaltWeight += isoSaltService.calculateSaltWeight(isoSalt);
 				}
-				for (IsoSalt isoSalt : addedIsoSalts){
+				for (IsoSalt isoSalt : addedIsoSalts) {
 					SaltForm oldSaltForm = SaltForm.findSaltForm(saltForm.getId());
 					isoSalt.setSaltForm(oldSaltForm);
 					isoSalt.persist();
 					isoSalt.flush();
 				}
-				for (IsoSalt isoSalt : deletedIsoSalts){
-					logger.debug("deleting isoSalt "+ isoSalt.getId().toString());
+				for (IsoSalt isoSalt : deletedIsoSalts) {
+					logger.debug("deleting isoSalt " + isoSalt.getId().toString());
 					IsoSalt oldIsoSalt = IsoSalt.findIsoSalt(isoSalt.getId());
 					isoSalt.setVersion(oldIsoSalt.getVersion());
 					isoSalt.remove();
@@ -214,7 +225,7 @@ public SaltForm updateSaltForm(Parent parent, SaltForm saltForm, Set<IsoSalt> is
 				oldSaltForm.setSaltWeight(newTotalSaltWeight);
 				String saltFormCorpName = corpNameService.generateSaltFormCorpName(parent.getCorpName(), isoSalts);
 				oldSaltForm.setCorpName(saltFormCorpName);
-				for (IsoSalt isoSalt : isoSalts){
+				for (IsoSalt isoSalt : isoSalts) {
 					isoSalt.setSaltForm(oldSaltForm);
 				}
 				oldSaltForm.setIsoSalts(isoSalts);
@@ -227,18 +238,20 @@ public SaltForm updateSaltForm(Parent parent, SaltForm saltForm, Set<IsoSalt> is
 				String oldLotCorpName = oldLot.getCorpName();
 				lot.setLotMolWeight(Lot.calculateLotMolWeight(oldLot));
 				String newLotCorpName = oldLot.getCorpName();
-				if (!propertiesUtilService.getCorpBatchFormat().equalsIgnoreCase("cas_style_format")){
-					// if NOT cas_style lot corpName; generate a new lot corp name based on lot numbering
+				if (!propertiesUtilService.getCorpBatchFormat().equalsIgnoreCase("cas_style_format")) {
+					// if NOT cas_style lot corpName; generate a new lot corp name based on lot
+					// numbering
 					lot.setCorpName(lotService.generateCorpName(lot));
 					newLotCorpName = lot.getCorpName();
 				}
 				lot.merge();
-				if (!oldLotCorpName.equals(newLotCorpName)) changedLotCorpNameMessages.add(oldLotCorpName +" to "+newLotCorpName);
-				if (!changedLotCorpNameMessages.isEmpty()){
+				if (!oldLotCorpName.equals(newLotCorpName))
+					changedLotCorpNameMessages.add(oldLotCorpName + " to " + newLotCorpName);
+				if (!changedLotCorpNameMessages.isEmpty()) {
 					ErrorMessage affectedLotsError = new ErrorMessage();
 					affectedLotsError.setLevel("info");
 					String affectedLotsMessage = "Editing saltForm has changed the corp name from ";
-					for (String changedLotCorpNameMessage : changedLotCorpNameMessages){
+					for (String changedLotCorpNameMessage : changedLotCorpNameMessages) {
 						affectedLotsMessage += changedLotCorpNameMessage;
 					}
 					affectedLotsError.setMessage(affectedLotsMessage);
@@ -246,50 +259,55 @@ public SaltForm updateSaltForm(Parent parent, SaltForm saltForm, Set<IsoSalt> is
 				}
 				saltForm = oldSaltForm;
 			}
-		}else{
+		} else {
 			saltForm.setVersion(SaltForm.findSaltForm(saltForm.getId()).getVersion());
 			saltForm.setIsoSalts(isoSalts);
 		}
 		return saltForm;
 	}
-	
-	public static boolean checkIsoSaltsSame(IsoSalt isoSalt, IsoSalt oldIsoSalt){
-		boolean isotopeSame = (oldIsoSalt.getIsotope() == null && isoSalt.getIsotope() == null) || (oldIsoSalt.getIsotope() != null && isoSalt.getIsotope() != null && oldIsoSalt.getIsotope().getAbbrev().equals(isoSalt.getIsotope().getAbbrev()));
-		boolean saltSame = (oldIsoSalt.getSalt() == null && isoSalt.getSalt() == null) || (oldIsoSalt.getSalt() != null && isoSalt.getSalt() != null && oldIsoSalt.getSalt().getAbbrev().equals(isoSalt.getSalt().getAbbrev()));
-		boolean equivalentsSame = (oldIsoSalt.getEquivalents() == null && isoSalt.getEquivalents() == null) || (oldIsoSalt.getEquivalents() != null && isoSalt.getEquivalents() != null && (Math.abs(oldIsoSalt.getEquivalents() - isoSalt.getEquivalents()) < 1e-9));
-		boolean typeSame = (oldIsoSalt.getType() == null && isoSalt.getType() == null) || (oldIsoSalt.getType() != null && isoSalt.getType() != null && oldIsoSalt.getType().equals(isoSalt.getType()));
-		if (!isotopeSame || !saltSame || !equivalentsSame || !typeSame){
+
+	public static boolean checkIsoSaltsSame(IsoSalt isoSalt, IsoSalt oldIsoSalt) {
+		boolean isotopeSame = (oldIsoSalt.getIsotope() == null && isoSalt.getIsotope() == null)
+				|| (oldIsoSalt.getIsotope() != null && isoSalt.getIsotope() != null
+						&& oldIsoSalt.getIsotope().getAbbrev().equals(isoSalt.getIsotope().getAbbrev()));
+		boolean saltSame = (oldIsoSalt.getSalt() == null && isoSalt.getSalt() == null) || (oldIsoSalt.getSalt() != null
+				&& isoSalt.getSalt() != null && oldIsoSalt.getSalt().getAbbrev().equals(isoSalt.getSalt().getAbbrev()));
+		boolean equivalentsSame = (oldIsoSalt.getEquivalents() == null && isoSalt.getEquivalents() == null)
+				|| (oldIsoSalt.getEquivalents() != null && isoSalt.getEquivalents() != null
+						&& (Math.abs(oldIsoSalt.getEquivalents() - isoSalt.getEquivalents()) < 1e-9));
+		boolean typeSame = (oldIsoSalt.getType() == null && isoSalt.getType() == null) || (oldIsoSalt.getType() != null
+				&& isoSalt.getType() != null && oldIsoSalt.getType().equals(isoSalt.getType()));
+		if (!isotopeSame || !saltSame || !equivalentsSame || !typeSame) {
 			return false;
-		}else{
+		} else {
 			return true;
 		}
 	}
-	
-	public static boolean checkIsoSaltSetsSame(Set<IsoSalt> isoSalts, Set<IsoSalt> oldIsoSalts){
-		if (isoSalts.size() != oldIsoSalts.size()) return false;
-		else{
-			isoSaltsLoop:
-				for (IsoSalt isoSalt : isoSalts){
-					for (IsoSalt oldIsoSalt : oldIsoSalts){
-						if (checkIsoSaltsSame(isoSalt, oldIsoSalt)) continue isoSaltsLoop;
-					}
-					return false;
+
+	public static boolean checkIsoSaltSetsSame(Set<IsoSalt> isoSalts, Set<IsoSalt> oldIsoSalts) {
+		if (isoSalts.size() != oldIsoSalts.size())
+			return false;
+		else {
+			isoSaltsLoop: for (IsoSalt isoSalt : isoSalts) {
+				for (IsoSalt oldIsoSalt : oldIsoSalts) {
+					if (checkIsoSaltsSame(isoSalt, oldIsoSalt))
+						continue isoSaltsLoop;
 				}
+				return false;
+			}
 			return true;
 		}
 	}
 
 	@Override
-	public double calculateSaltWeight(SaltForm saltForm){
+	public double calculateSaltWeight(SaltForm saltForm) {
 		double totalSaltWeight = 0;
-		for (IsoSalt isoSalt : saltForm.getIsoSalts() ){
+		for (IsoSalt isoSalt : saltForm.getIsoSalts()) {
 			double saltWeight = isoSaltService.calculateSaltWeight(isoSalt);
 			totalSaltWeight = totalSaltWeight + saltWeight;
-			logger.debug("current totalSaltWeigth: " + totalSaltWeight);	
+			logger.debug("current totalSaltWeigth: " + totalSaltWeight);
 		}
 		return totalSaltWeight;
 	}
 
-
 }
-
diff --git a/src/main/java/com/labsynch/labseer/service/SaltLoader.java b/src/main/java/com/labsynch/labseer/service/SaltLoader.java
index ab10601ca..9b1a04d9d 100755
--- a/src/main/java/com/labsynch/labseer/service/SaltLoader.java
+++ b/src/main/java/com/labsynch/labseer/service/SaltLoader.java
@@ -26,9 +26,9 @@
 @Configurable
 
 public class SaltLoader {
-	
+
     private String name;
-	
+
     private String description;
 
     private long numberOfSalts;
@@ -36,36 +36,39 @@ public class SaltLoader {
     private long size;
 
     private Boolean uploaded;
-    
-    @Transient 
-    private MultipartFile file; // added 
 
-    private String fileName; // added 
-	
+    @Transient
+    private MultipartFile file; // added
+
+    private String fileName; // added
+
     @Temporal(TemporalType.TIMESTAMP)
     @DateTimeFormat(style = "S-")
     private Date loadedDate;
 
-	@PersistenceContext
+    @PersistenceContext
     transient EntityManager entityManager;
 
-	public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "description", "numberOfSalts", "size", "uploaded", "file", "fileName", "loadedDate");
+    public static final List<String> fieldNames4OrderClauseFilter = java.util.Arrays.asList("name", "description",
+            "numberOfSalts", "size", "uploaded", "file", "fileName", "loadedDate");
 
-	public static final EntityManager entityManager() {
+    public static final EntityManager entityManager() {
         EntityManager em = new SaltLoader().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        if (em == null)
+            throw new IllegalStateException(
+                    "Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
         return em;
     }
 
-	public static long countSaltLoaders() {
+    public static long countSaltLoaders() {
         return entityManager().createQuery("SELECT COUNT(o) FROM SaltLoader o", Long.class).getSingleResult();
     }
 
-	public static List<SaltLoader> findAllSaltLoaders() {
+    public static List<SaltLoader> findAllSaltLoaders() {
         return entityManager().createQuery("SELECT o FROM SaltLoader o", SaltLoader.class).getResultList();
     }
 
-	public static List<SaltLoader> findAllSaltLoaders(String sortFieldName, String sortOrder) {
+    public static List<SaltLoader> findAllSaltLoaders(String sortFieldName, String sortOrder) {
         String jpaQuery = "SELECT o FROM SaltLoader o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -76,16 +79,19 @@ public static List<SaltLoader> findAllSaltLoaders(String sortFieldName, String s
         return entityManager().createQuery(jpaQuery, SaltLoader.class).getResultList();
     }
 
-	public static SaltLoader findSaltLoader(Long id) {
-        if (id == null) return null;
+    public static SaltLoader findSaltLoader(Long id) {
+        if (id == null)
+            return null;
         return entityManager().find(SaltLoader.class, id);
     }
 
-	public static List<SaltLoader> findSaltLoaderEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM SaltLoader o", SaltLoader.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    public static List<SaltLoader> findSaltLoaderEntries(int firstResult, int maxResults) {
+        return entityManager().createQuery("SELECT o FROM SaltLoader o", SaltLoader.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	public static List<SaltLoader> findSaltLoaderEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {
+    public static List<SaltLoader> findSaltLoaderEntries(int firstResult, int maxResults, String sortFieldName,
+            String sortOrder) {
         String jpaQuery = "SELECT o FROM SaltLoader o";
         if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {
             jpaQuery = jpaQuery + " ORDER BY " + sortFieldName;
@@ -93,18 +99,21 @@ public static List<SaltLoader> findSaltLoaderEntries(int firstResult, int maxRes
                 jpaQuery = jpaQuery + " " + sortOrder;
             }
         }
-        return entityManager().createQuery(jpaQuery, SaltLoader.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+        return entityManager().createQuery(jpaQuery, SaltLoader.class).setFirstResult(firstResult)
+                .setMaxResults(maxResults).getResultList();
     }
 
-	@Transactional
+    @Transactional
     public void persist() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.persist(this);
     }
 
-	@Transactional
+    @Transactional
     public void remove() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         if (this.entityManager.contains(this)) {
             this.entityManager.remove(this);
         } else {
@@ -113,116 +122,119 @@ public void remove() {
         }
     }
 
-	@Transactional
+    @Transactional
     public void flush() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.flush();
     }
 
-	@Transactional
+    @Transactional
     public void clear() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         this.entityManager.clear();
     }
 
-	@Transactional
+    @Transactional
     public SaltLoader merge() {
-        if (this.entityManager == null) this.entityManager = entityManager();
+        if (this.entityManager == null)
+            this.entityManager = entityManager();
         SaltLoader merged = this.entityManager.merge(this);
         this.entityManager.flush();
         return merged;
     }
 
-	public String getName() {
+    public String getName() {
         return this.name;
     }
 
-	public void setName(String name) {
+    public void setName(String name) {
         this.name = name;
     }
 
-	public String getDescription() {
+    public String getDescription() {
         return this.description;
     }
 
-	public void setDescription(String description) {
+    public void setDescription(String description) {
         this.description = description;
     }
 
-	public long getNumberOfSalts() {
+    public long getNumberOfSalts() {
         return this.numberOfSalts;
     }
 
-	public void setNumberOfSalts(long numberOfSalts) {
+    public void setNumberOfSalts(long numberOfSalts) {
         this.numberOfSalts = numberOfSalts;
     }
 
-	public long getSize() {
+    public long getSize() {
         return this.size;
     }
 
-	public void setSize(long size) {
+    public void setSize(long size) {
         this.size = size;
     }
 
-	public Boolean getUploaded() {
+    public Boolean getUploaded() {
         return this.uploaded;
     }
 
-	public void setUploaded(Boolean uploaded) {
+    public void setUploaded(Boolean uploaded) {
         this.uploaded = uploaded;
     }
 
-	public MultipartFile getFile() {
+    public MultipartFile getFile() {
         return this.file;
     }
 
-	public void setFile(MultipartFile file) {
+    public void setFile(MultipartFile file) {
         this.file = file;
     }
 
-	public String getFileName() {
+    public String getFileName() {
         return this.fileName;
     }
 
-	public void setFileName(String fileName) {
+    public void setFileName(String fileName) {
         this.fileName = fileName;
     }
 
-	public Date getLoadedDate() {
+    public Date getLoadedDate() {
         return this.loadedDate;
     }
 
-	public void setLoadedDate(Date loadedDate) {
+    public void setLoadedDate(Date loadedDate) {
         this.loadedDate = loadedDate;
     }
 
-	public String toString() {
+    public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-	@Id
+    @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
     private Long id;
 
-	@Version
+    @Version
     @Column(name = "version")
     private Integer version;
 
-	public Long getId() {
+    public Long getId() {
         return this.id;
     }
 
-	public void setId(Long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-	public Integer getVersion() {
+    public Integer getVersion() {
         return this.version;
     }
 
-	public void setVersion(Integer version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 }
diff --git a/src/main/java/com/labsynch/labseer/service/SaltServiceImpl.java b/src/main/java/com/labsynch/labseer/service/SaltServiceImpl.java
index 3fbe9a81d..ebdb3b167 100644
--- a/src/main/java/com/labsynch/labseer/service/SaltServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/SaltServiceImpl.java
@@ -26,18 +26,18 @@ public class SaltServiceImpl implements SaltService {
 
 	@Autowired
 	private ChemStructureService saltStructServ;
-	
+
 	@Autowired
 	CmpdRegMoleculeFactory cmpdRegMoleculeFactory;
-	
+
 	@Autowired
 	CmpdRegSDFReaderFactory cmpdRegSDFReaderFactory;
 
 	@Transactional
 	@Override
 	public int loadSalts(String saltSD_fileName) {
-		//simple utility to load salts
-		//fileName = "src/test/resources/Initial_Salts.sdf";
+		// simple utility to load salts
+		// fileName = "src/test/resources/Initial_Salts.sdf";
 		int savedSaltCount = 0;
 		try {
 			// Open an input stream
@@ -45,13 +45,14 @@ public int loadSalts(String saltSD_fileName) {
 			CmpdRegMolecule mol = null;
 			Long saltCount = 0L;
 			while ((mol = mi.readNextMol()) != null) {
-				// save salt if no existing salt with the same Abbrev -- could do match by other properties
+				// save salt if no existing salt with the same Abbrev -- could do match by other
+				// properties
 				saltCount = Salt.countFindSaltsByAbbrevLike(MoleculeUtil.getMolProperty(mol, "code"));
-				if (saltCount < 1){
-					saveSalt(mol);		
-					savedSaltCount++;			
+				if (saltCount < 1) {
+					saveSalt(mol);
+					savedSaltCount++;
 				}
-			}	
+			}
 			mi.close();
 		} catch (FileNotFoundException e) {
 			// TODO Auto-generated catch block
@@ -63,7 +64,7 @@ public int loadSalts(String saltSD_fileName) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		
+
 		return savedSaltCount;
 	}
 
@@ -81,22 +82,21 @@ private void saveSalt(CmpdRegMolecule mol) throws IOException, CmpdRegMolFormatE
 		logger.debug("salt name: " + salt.getName());
 		logger.debug("salt structure: " + salt.getMolStructure());
 
-		int[] queryHits = saltStructServ.searchMolStructures(salt.getMolStructure(), StructureType.SALT, SearchType.DUPLICATE_NO_TAUTOMER);
+		int[] queryHits = saltStructServ.searchMolStructures(salt.getMolStructure(), StructureType.SALT,
+				SearchType.DUPLICATE_NO_TAUTOMER);
 		Integer cdId = 0;
-		if (queryHits.length > 0){
+		if (queryHits.length > 0) {
 			cdId = 0;
 		} else {
-			cdId = saltStructServ.saveStructure(salt.getMolStructure(), StructureType.SALT);			
+			cdId = saltStructServ.saveStructure(salt.getMolStructure(), StructureType.SALT);
 		}
 		salt.setCdId(cdId);
 
-
-		if (salt.getCdId() > 0 && salt.getCdId() != -1){
+		if (salt.getCdId() > 0 && salt.getCdId() != -1) {
 			salt.persist();
 		} else {
 			logger.error("Could not save the salt: " + salt.getAbbrev());
-		}		
+		}
 	}
 
 }
-
diff --git a/src/main/java/com/labsynch/labseer/service/SaltStructureService.java b/src/main/java/com/labsynch/labseer/service/SaltStructureService.java
index b4122cb9a..82157833c 100755
--- a/src/main/java/com/labsynch/labseer/service/SaltStructureService.java
+++ b/src/main/java/com/labsynch/labseer/service/SaltStructureService.java
@@ -6,8 +6,6 @@
 import com.labsynch.labseer.exceptions.CmpdRegMolFormatException;
 import com.labsynch.labseer.exceptions.StructureSaveException;
 
-
-
 public interface SaltStructureService {
 
 	public Salt saveStructure(Salt salt) throws CmpdRegMolFormatException;
diff --git a/src/main/java/com/labsynch/labseer/service/SaltStructureServiceImpl.java b/src/main/java/com/labsynch/labseer/service/SaltStructureServiceImpl.java
index 56aa19f24..542d0f513 100755
--- a/src/main/java/com/labsynch/labseer/service/SaltStructureServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/SaltStructureServiceImpl.java
@@ -24,21 +24,19 @@ public class SaltStructureServiceImpl implements SaltStructureService {
 
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
-	
-	Logger logger = LoggerFactory.getLogger(SaltStructureService.class);
-
 
+	Logger logger = LoggerFactory.getLogger(SaltStructureService.class);
 
 	@Override
-	public Salt saveStructure(Salt salt) throws CmpdRegMolFormatException {		
+	public Salt saveStructure(Salt salt) throws CmpdRegMolFormatException {
 
 		CmpdRegMolecule mol = chemStructureService.toMolecule(salt.getMolStructure());
 		salt.setOriginalStructure(salt.getMolStructure());
 		salt.setMolStructure(mol.getMolStructure());
 		salt.setFormula(mol.getFormula());
-		if (propertiesUtilService.getUseExactMass()){
+		if (propertiesUtilService.getUseExactMass()) {
 			salt.setMolWeight(mol.getExactMass());
-		}else{
+		} else {
 			salt.setMolWeight(mol.getMass());
 		}
 		salt.setCharge(mol.getTotalCharge());
@@ -48,25 +46,23 @@ public Salt saveStructure(Salt salt) throws CmpdRegMolFormatException {
 		logger.debug("salt structure: " + salt.getMolStructure());
 
 		// check if existing salt with the same name and code
-		
+
 		List<Salt> salts = Salt.findSaltsByAbbrevEqualsAndNameEquals(salt.getAbbrev(), salt.getName()).getResultList();
-		if (salts.size() > 0){
+		if (salts.size() > 0) {
 			logger.error("found another salt with the same name and abbrev");
 			salt.setCdId(0);
 			int[] dupeMols = chemStructureService.checkDupeMol(salt.getMolStructure(), StructureType.SALT);
 			logger.debug("number of matching salt structures: " + dupeMols.length);
 		} else {
 			boolean checkForDupes = true;
-			int cdId = chemStructureService.saveStructure(salt.getMolStructure(), StructureType.SALT, checkForDupes);			
-			salt.setCdId(cdId);			
+			int cdId = chemStructureService.saveStructure(salt.getMolStructure(), StructureType.SALT, checkForDupes);
+			salt.setCdId(cdId);
 		}
 
 		return salt;
 
 	}
 
-
-
 	@Override
 	public Salt update(Salt salt) throws CmpdRegMolFormatException {
 		CmpdRegMolecule mol = chemStructureService.toMolecule(salt.getMolStructure());
@@ -82,16 +78,14 @@ public Salt update(Salt salt) throws CmpdRegMolFormatException {
 
 		boolean updated = chemStructureService.updateStructure(mol, StructureType.SALT, salt.getCdId());
 		salt.merge();
-		
-		if (updated){
+
+		if (updated) {
 			return Salt.findSalt(salt.getId());
 		} else {
 			return null;
 		}
 	}
 
-
-
 	@Override
 	@Transactional
 	public List<Salt> saveMissingStructures() throws StructureSaveException {
@@ -99,16 +93,17 @@ public List<Salt> saveMissingStructures() throws StructureSaveException {
 		List<Salt> missingSaltsStructures = new ArrayList<Salt>();
 		for (Salt salt : allSalts) {
 			Boolean checkForDupes = true;
-			Integer cdId = chemStructureService.saveStructure(salt.getMolStructure(), StructureType.SALT, checkForDupes);
+			Integer cdId = chemStructureService.saveStructure(salt.getMolStructure(), StructureType.SALT,
+					checkForDupes);
 			// Chem structure service api currently returns 0 if duplicate found
 			// and -1 if there is an error saving the structure
-			if (cdId != 0 && cdId != -1){
+			if (cdId != 0 && cdId != -1) {
 				salt.setCdId(cdId);
 				salt.merge();
 				missingSaltsStructures.add(salt);
 				logger.info("saved missing salt structure: " + salt.getAbbrev());
 			} else {
-				if(cdId == -1){
+				if (cdId == -1) {
 					String message = "error saving salt structure: " + salt.getAbbrev();
 					logger.error(message);
 					throw new StructureSaveException(message);
diff --git a/src/main/java/com/labsynch/labseer/service/SearchFormService.java b/src/main/java/com/labsynch/labseer/service/SearchFormService.java
index a1f3e4bfe..648644ac2 100755
--- a/src/main/java/com/labsynch/labseer/service/SearchFormService.java
+++ b/src/main/java/com/labsynch/labseer/service/SearchFormService.java
@@ -10,15 +10,12 @@
 
 public interface SearchFormService {
 
-
-	public SearchFormReturnDTO  findQuerySaltForms(SearchFormDTO searchParams) throws CmpdRegMolFormatException;
-
+	public SearchFormReturnDTO findQuerySaltForms(SearchFormDTO searchParams) throws CmpdRegMolFormatException;
 
 	public String findParentIds(String molStructure,
 			int maxResults, Float similarity, SearchType searchType,
 			String outputFormat) throws IOException, CmpdRegMolFormatException;
 
-
 	public List<Integer> findParentIds(String molStructure,
 			Integer maxResults, Float similarity, SearchType searchType,
 			List<String> projects) throws IOException, CmpdRegMolFormatException;
diff --git a/src/main/java/com/labsynch/labseer/service/SearchFormServiceImpl.java b/src/main/java/com/labsynch/labseer/service/SearchFormServiceImpl.java
index 596ad3f67..3ba7aa3f6 100755
--- a/src/main/java/com/labsynch/labseer/service/SearchFormServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/SearchFormServiceImpl.java
@@ -53,35 +53,35 @@ public class SearchFormServiceImpl implements SearchFormService {
 
 	@Autowired
 	private ChemStructureService structureService;
-	
+
 	@Override
 	@Transactional
 	public String findParentIds(String molStructure,
 			int maxResults, Float similarity, SearchType searchType,
 			String outputFormat) throws IOException, CmpdRegMolFormatException {
 
-		//options for outputFormat -- corpname, cdid, corpname-cdid, sdf ; default is cdid
+		// options for outputFormat -- corpname, cdid, corpname-cdid, sdf ; default is
+		// cdid
 
 		logger.info("incoming searchType is: " + searchType);
 
-		
-		int[] parentStructureHits = structureService.searchMolStructures(molStructure, StructureType.PARENT, searchType, similarity, maxResults);
-
+		int[] parentStructureHits = structureService.searchMolStructures(molStructure, StructureType.PARENT, searchType,
+				similarity, maxResults);
 
 		logger.debug("Number of parentStructureHits = " + parentStructureHits.length);
-		
+
 		Collection<SearchCdIdReturnDTO> resultList = new ArrayList<SearchCdIdReturnDTO>();
 		SearchCdIdReturnDTO result;
-		for (int hit : parentStructureHits){
+		for (int hit : parentStructureHits) {
 			result = new SearchCdIdReturnDTO();
 			result.setCdId(hit);
 
 			logger.debug("query cdId is " + hit);
 			List<Parent> parents = Parent.findParentsByCdId(hit).getResultList();
 			logger.debug("number of parents found: " + parents.size());
-			if (parents.size() > 0){
-				for (Parent parent : parents){
-					if (parent.getIgnore() == null || !parent.getIgnore()){
+			if (parents.size() > 0) {
+				for (Parent parent : parents) {
+					if (parent.getIgnore() == null || !parent.getIgnore()) {
 						result.setCorpName(parent.getCorpName());
 						resultList.add(result);
 					}
@@ -93,15 +93,14 @@ public String findParentIds(String molStructure,
 
 		try {
 
-
-			//write header
+			// write header
 			String headerLine;
 
-			if (outputFormat.equalsIgnoreCase("corpname")){
+			if (outputFormat.equalsIgnoreCase("corpname")) {
 				headerLine = "Corporate_Name\n";
-			} else if (outputFormat.equalsIgnoreCase("corpname-cdid")){
+			} else if (outputFormat.equalsIgnoreCase("corpname-cdid")) {
 				headerLine = "Corporate_Name,cd_id\n";
-			} else {  
+			} else {
 				headerLine = "cd_id\n";
 			}
 
@@ -109,17 +108,17 @@ public String findParentIds(String molStructure,
 
 			logger.info("number of search results found: " + resultList.size());
 
-			for (SearchCdIdReturnDTO searchResult : resultList){
+			for (SearchCdIdReturnDTO searchResult : resultList) {
 				logger.info(searchResult.toJson());
-				if (outputFormat.equalsIgnoreCase("corpname")){
+				if (outputFormat.equalsIgnoreCase("corpname")) {
 					outputWriter.append(searchResult.getCorpName());
 					outputWriter.append("\n");
-				} else if (outputFormat.equalsIgnoreCase("corpname-cdid")){
+				} else if (outputFormat.equalsIgnoreCase("corpname-cdid")) {
 					outputWriter.append(searchResult.getCorpName());
 					outputWriter.append(",");
 					outputWriter.append(Integer.toString(searchResult.getCdId()));
 					outputWriter.append("\n");
-				} else {  
+				} else {
 					outputWriter.append(Integer.toString(searchResult.getCdId()));
 					outputWriter.append("\n");
 				}
@@ -131,12 +130,9 @@ public String findParentIds(String molStructure,
 
 		}
 
-
 		return outputWriter.toString();
 	}
 
-
-
 	@Override
 	@Transactional
 	public SearchFormReturnDTO findQuerySaltForms(SearchFormDTO searchParams) throws CmpdRegMolFormatException {
@@ -144,7 +140,7 @@ public SearchFormReturnDTO findQuerySaltForms(SearchFormDTO searchParams) throws
 		logger.debug("incoming search params: " + searchParams);
 
 		DateFormat df = new SimpleDateFormat("MM/dd/yyyy");
-		if (!searchParams.getDateFrom().equals("")){
+		if (!searchParams.getDateFrom().equals("")) {
 			try {
 				searchParams.setMinSynthDate(df.parse(searchParams.getDateFrom()));
 				logger.debug("Min Synth Date = " + searchParams.getMinSynthDate());
@@ -154,7 +150,7 @@ public SearchFormReturnDTO findQuerySaltForms(SearchFormDTO searchParams) throws
 				e.printStackTrace();
 			}
 		}
-		if (!searchParams.getDateTo().equals("")){
+		if (!searchParams.getDateTo().equals("")) {
 			try {
 				searchParams.setMaxSynthDate(df.parse(searchParams.getDateTo()));
 				searchParams.setValuesSet(true);
@@ -165,35 +161,33 @@ public SearchFormReturnDTO findQuerySaltForms(SearchFormDTO searchParams) throws
 		}
 
 		SearchType matchedSearchType = SearchType.getIfPresent(searchParams.getSearchType()).orElse(SearchType.DEFAULT);
-		if (matchedSearchType == SearchType.SIMILARITY){
+		if (matchedSearchType == SearchType.SIMILARITY) {
 			float similarity = searchParams.getPercentSimilarity();
-			logger.debug("original similarity = " + similarity);			
+			logger.debug("original similarity = " + similarity);
 
-			if (similarity < 10){
+			if (similarity < 10) {
 				similarity = 10;
 			}
 
 			similarity = 100.0f - similarity;
-			logger.debug("dissimilarity = " + similarity);			
+			logger.debug("dissimilarity = " + similarity);
 			similarity = similarity * 0.01f;
 			logger.debug("dissimilarity = " + similarity);
 			searchParams.setPercentSimilarity(similarity);
 		}
 
-
 		List<SaltForm> saltForms = new ArrayList<SaltForm>();
 		List<SearchCompoundReturnDTO> foundCompounds = null;
-		HashMap<String, SaltForm> saltFormMols = new HashMap<String, SaltForm>(); 
-		HashMap<String, SaltForm> parentMols = new HashMap<String, SaltForm>(); 
+		HashMap<String, SaltForm> saltFormMols = new HashMap<String, SaltForm>();
+		HashMap<String, SaltForm> parentMols = new HashMap<String, SaltForm>();
 
 		logger.debug("here is the self built query string: " + this.buildMetaQuery(searchParams, StructureType.PARENT));
 
-
 		if (!searchParams.getCorpNameList().equals("")) {
 			logger.info("got a corp name list search!");
 			String[] inputListArray = searchParams.getCorpNameList().split("[\\s,;\\n\\r]+");
 			List<String> formattedCorpNameList = new ArrayList<String>();
-			for (String corpName : inputListArray){
+			for (String corpName : inputListArray) {
 				logger.info(corpNameService.formatCorpName(corpNameService.parseParentNumber(corpName)));
 				formattedCorpNameList.add(corpName);
 				formattedCorpNameList.add(corpNameService.formatCorpName(corpNameService.parseParentNumber(corpName)));
@@ -202,22 +196,26 @@ public SearchFormReturnDTO findQuerySaltForms(SearchFormDTO searchParams) throws
 			searchParams.setFormattedCorpNameList(formattedCorpNameList);
 			logger.info(formattedCorpNameList.toString());
 		}
-		//    Check if corpNameFrom and corpNameTo are both set  -- will search for a range of parents if both set
-		//    Check if single corpName is submitted. Convert corpName to either parent, saltForm, or Lot name
+		// Check if corpNameFrom and corpNameTo are both set -- will search for a range
+		// of parents if both set
+		// Check if single corpName is submitted. Convert corpName to either parent,
+		// saltForm, or Lot name
 
-		if (!searchParams.getCorpNameFrom().equals("") && !searchParams.getCorpNameTo().equals("")){
+		if (!searchParams.getCorpNameFrom().equals("") && !searchParams.getCorpNameTo().equals("")) {
 			searchParams.setValuesSet(true);
 			logger.debug("parentFrom: check corpName " + searchParams.getCorpNameFrom());
 			logger.debug("parentTo: check corpName " + searchParams.getCorpNameTo());
 
 			Long minParent = 0L;
-			if (corpNameService.checkCorpNumber(searchParams.getCorpNameFrom())){
+			if (corpNameService.checkCorpNumber(searchParams.getCorpNameFrom())) {
 				logger.debug("this look like a number: " + searchParams.getCorpNameFrom());
-				minParent = corpNameService.parseCorpNumber(searchParams.getCorpNameFrom());	
+				minParent = corpNameService.parseCorpNumber(searchParams.getCorpNameFrom());
 				searchParams.setMinParentNumber(minParent);
-			} if (corpNameService.checkBuidNumber(searchParams.getCorpNameFrom())){
-				logger.debug("Oops: trying to search for a range of BUID numbers. Not supported. " + searchParams.getCorpNameFrom());
-				//force the search on the bad corp name to prevent a cartesian search
+			}
+			if (corpNameService.checkBuidNumber(searchParams.getCorpNameFrom())) {
+				logger.debug("Oops: trying to search for a range of BUID numbers. Not supported. "
+						+ searchParams.getCorpNameFrom());
+				// force the search on the bad corp name to prevent a cartesian search
 				searchParams.setParentCorpName(searchParams.getCorpNameFrom());
 			} else {
 				String corpName = searchParams.getCorpNameFrom();
@@ -228,56 +226,58 @@ public SearchFormReturnDTO findQuerySaltForms(SearchFormDTO searchParams) throws
 
 			Long maxParent = 0L;
 			String corpNameTo = searchParams.getCorpNameTo();
-			//			searchParams.setCorpNameTo(""); //null the corpNameTo value ---> only implement parent number range
+			// searchParams.setCorpNameTo(""); //null the corpNameTo value ---> only
+			// implement parent number range
 
-			if (minParent != 0){
+			if (minParent != 0) {
 				searchParams.setMaxParentNumber(minParent);
-				if (corpNameService.checkCorpNumber(corpNameTo)){
+				if (corpNameService.checkCorpNumber(corpNameTo)) {
 					logger.debug("corpNameTo looks like a number. " + searchParams.getCorpNameTo());
 					maxParent = corpNameService.parseCorpNumber(corpNameTo);
-					logger.debug("parentTo: " + maxParent);	
+					logger.debug("parentTo: " + maxParent);
 					searchParams.setMaxParentNumber(maxParent);
 				} else {
 					String corpName = searchParams.getCorpNameTo();
 					logger.debug("query corpNameTo: " + searchParams.getCorpNameTo());
 					maxParent = corpNameService.convertToParentNumber(corpName);
 					searchParams.setMaxParentNumber(maxParent);
-					logger.debug("parentTo: " + searchParams.getMaxParentNumber());	
+					logger.debug("parentTo: " + searchParams.getMaxParentNumber());
 
 				}
 
 			}
 			logger.debug("parentTo: " + maxParent);
 
-		} else if (!searchParams.getCorpNameFrom().equals("") && searchParams.getCorpNameTo().equals("")){
+		} else if (!searchParams.getCorpNameFrom().equals("") && searchParams.getCorpNameTo().equals("")) {
 			logger.debug("searching with From corpname: " + searchParams.getCorpNameFrom());
 			searchParams.setValuesSet(true);
 			String corpName = searchParams.getCorpNameFrom();
 			Long minParent = 0L;
-			if (corpNameService.checkCorpNumber(searchParams.getCorpNameFrom())){
+			if (corpNameService.checkCorpNumber(searchParams.getCorpNameFrom())) {
 				logger.debug("this look like a number: " + searchParams.getCorpNameFrom());
-				minParent = corpNameService.parseCorpNumber(searchParams.getCorpNameFrom());	
+				minParent = corpNameService.parseCorpNumber(searchParams.getCorpNameFrom());
 				searchParams.setMinParentNumber(minParent);
 				searchParams.setMaxParentNumber(minParent);
-			} else if (corpNameService.checkBuidNumber(corpName)){
+			} else if (corpNameService.checkBuidNumber(corpName)) {
 				Long buidNumber = corpNameService.convertToBuidNumber(corpName);
 				searchParams.setBuidNumber(buidNumber);
 				logger.debug("Converted BUID Number = " + corpName);
 			} else {
-				if (searchParams.getCorpNameFrom().matches("^.*?"+ propertiesUtilService.getCorpSeparator()+"([0-9]{1,9})"+propertiesUtilService.getBatchSeparator()+".*?$")){
+				if (searchParams.getCorpNameFrom().matches("^.*?" + propertiesUtilService.getCorpSeparator()
+						+ "([0-9]{1,9})" + propertiesUtilService.getBatchSeparator() + ".*?$")) {
 					searchParams.setLotCorpName(searchParams.getCorpNameFrom());
-				}
-				else if (searchParams.getCorpNameFrom().startsWith(propertiesUtilService.getCorpPrefix()) || isNumber(searchParams.getCorpNameFrom())){
+				} else if (searchParams.getCorpNameFrom().startsWith(propertiesUtilService.getCorpPrefix())
+						|| isNumber(searchParams.getCorpNameFrom())) {
 					Long corpNumber = corpNameService.convertToParentNumber(corpName);
 					corpName = corpNameService.convertCorpNameNumber(corpNumber.toString());
-					searchParams.setParentCorpName(corpName);				
-					logger.debug("Converted corpName = " + corpName);					
+					searchParams.setParentCorpName(corpName);
+					logger.debug("Converted corpName = " + corpName);
 				} else {
 					searchParams.setParentCorpName(searchParams.getCorpNameFrom().toUpperCase().trim());
 				}
 			}
 
-		} else if (searchParams.getCorpNameFrom().equals("") && !searchParams.getCorpNameTo().equals("")){
+		} else if (searchParams.getCorpNameFrom().equals("") && !searchParams.getCorpNameTo().equals("")) {
 			searchParams.setValuesSet(true);
 			String corpName = searchParams.getCorpNameTo();
 			Long corpNumber = corpNameService.convertToParentNumber(corpName);
@@ -286,45 +286,45 @@ else if (searchParams.getCorpNameFrom().startsWith(propertiesUtilService.getCorp
 			logger.debug("Converted corpName = " + corpName);
 		}
 
-		if (!searchParams.getAlias().trim().equalsIgnoreCase("")){
+		if (!searchParams.getAlias().trim().equalsIgnoreCase("")) {
 			searchParams.setValuesSet(true);
 		}
 
-		if (searchParams.getChemist() != null && !searchParams.getChemist().equals("anyone")){
+		if (searchParams.getChemist() != null && !searchParams.getChemist().equals("anyone")) {
 			searchParams.setValuesSet(true);
 		}
 
 		// 2. All other meta params will flow into the searches
 		// if no search structure, we will only search with the meta data
 
-		if (searchParams.getMolStructure() == null || searchParams.getMolStructure().equals("")){
+		if (searchParams.getMolStructure() == null || searchParams.getMolStructure().equals("")) {
 			foundCompounds = new ArrayList<SearchCompoundReturnDTO>();
-			//search by meta only
+			// search by meta only
 			List<SaltForm> saltFormsFound = SaltForm.findSaltFormsByMeta(searchParams).getResultList();
-			for (SaltForm saltForm : saltFormsFound){
-				if(!saltForms.contains(saltForm)){
+			for (SaltForm saltForm : saltFormsFound) {
+				if (!saltForms.contains(saltForm)) {
 					saltForms.add(saltForm);
 				}
 			}
 			//
-			logger.debug("Number of saltForms found:  " + saltFormsFound.size());			
-			logger.debug("Number of unique saltForms found:  " + saltForms.size());			
+			logger.debug("Number of saltForms found:  " + saltFormsFound.size());
+			logger.debug("Number of unique saltForms found:  " + saltForms.size());
 
 			logger.debug("search params: ---- " + searchParams.toJson());
 
-			for (SaltForm saltForm : saltForms){
+			for (SaltForm saltForm : saltForms) {
 				SearchCompoundReturnDTO searchCompound = new SearchCompoundReturnDTO();
-				if (saltForm.getCdId() == 0){
-					if(propertiesUtilService.getSaltBeforeLot()){
+				if (saltForm.getCdId() == 0) {
+					if (propertiesUtilService.getSaltBeforeLot()) {
 						searchCompound.setCorpName(saltForm.getCorpName());
 						searchCompound.setCorpNameType("SaltForm");
-					}else{
+					} else {
 						searchCompound.setCorpName(saltForm.getParent().getCorpName());
 						searchCompound.setCorpNameType("Parent");
 					}
 					List<ParentAliasDTO> parentAliases = new ArrayList<ParentAliasDTO>();
-					for (ParentAlias parentAlias: saltForm.getParent().getParentAliases()){
-						if (!parentAlias.isIgnored()){
+					for (ParentAlias parentAlias : saltForm.getParent().getParentAliases()) {
+						if (!parentAlias.isIgnored()) {
 							ParentAliasDTO parentAliasDTO = new ParentAliasDTO(parentAlias);
 							parentAliases.add(parentAliasDTO);
 						}
@@ -337,17 +337,18 @@ else if (searchParams.getCorpNameFrom().startsWith(propertiesUtilService.getCorp
 					searchCompound.setMolStructure(saltForm.getMolStructure());
 				}
 				logger.debug("current query saltForm: " + saltForm.toJson());
-				//				logger.debug("current query searchParams: " + searchParams.toJson());
+				// logger.debug("current query searchParams: " + searchParams.toJson());
 
 				List<Lot> lotsFound = Lot.findLotsBySaltFormAndMeta(saltForm, searchParams).getResultList();
 				List<Lot> lots = new ArrayList<Lot>();
-				for (Lot lot : lotsFound){
-					if (!lots.contains(lot)) lots.add(lot);
+				for (Lot lot : lotsFound) {
+					if (!lots.contains(lot))
+						lots.add(lot);
 				}
 				logger.debug("current saltForm: " + saltForm.getCorpName() + "  " + saltForm.getId());
 				logger.debug("number of lots found: " + lotsFound.size());
 				logger.debug("number of unique lots found: " + lots.size());
-				for (Lot lot : lots){
+				for (Lot lot : lots) {
 					logger.debug("found lot: " + lot.toJson());
 					SearchLotDTO searchLot = new SearchLotDTO();
 					searchLot.setCorpName(lot.getCorpName());
@@ -355,61 +356,64 @@ else if (searchParams.getCorpNameFrom().startsWith(propertiesUtilService.getCorp
 					searchLot.setRegistrationDate(lot.getRegistrationDate());
 					searchLot.setSynthesisDate(lot.getSynthesisDate());
 					searchCompound.getLotIDs().add(searchLot);
-				}	
-				if (saltForm.getParent().getStereoCategory() != null){
-					if (saltForm.getParent().getStereoCategory().getName() != null){
-						searchCompound.setStereoCategoryName(saltForm.getParent().getStereoCategory().getName());													
+				}
+				if (saltForm.getParent().getStereoCategory() != null) {
+					if (saltForm.getParent().getStereoCategory().getName() != null) {
+						searchCompound.setStereoCategoryName(saltForm.getParent().getStereoCategory().getName());
 					}
 				}
-				if (saltForm.getParent().getStereoComment() != null){
-					searchCompound.setStereoComment(saltForm.getParent().getStereoComment());						
+				if (saltForm.getParent().getStereoComment() != null) {
+					searchCompound.setStereoComment(saltForm.getParent().getStereoComment());
 				}
-				foundCompounds.add(searchCompound);	
+				foundCompounds.add(searchCompound);
 			}
 
 			logger.debug("found Compounds from MetaSearch: " + foundCompounds.size());
-			//			logger.debug("found Compounds: " + SearchCompoundReturnDTO.toJsonArray(foundCompounds));
+			// logger.debug("found Compounds: " +
+			// SearchCompoundReturnDTO.toJsonArray(foundCompounds));
 
 		} else {
-			//do the structure search --> saltForm followed by parent structures
-			//get saltFormCdIds to search on
-			//get parentCdIds to search on
-			//the mol search will return the mols in search order
-			//loop through the set of found parent mols first (larger set)
-			//then loop through the results of the saltForm structure search
+			// do the structure search --> saltForm followed by parent structures
+			// get saltFormCdIds to search on
+			// get parentCdIds to search on
+			// the mol search will return the mols in search order
+			// loop through the set of found parent mols first (larger set)
+			// then loop through the results of the saltForm structure search
 			foundCompounds = new ArrayList<SearchCompoundReturnDTO>();
 			int[] filterCdIds = null;
 
-
 			List<Integer> saltFormCdIds = SaltForm.findSaltFormCdIdsByMeta(searchParams);
-			if (saltFormCdIds != null && saltFormCdIds.size() > 0){
-				filterCdIds = ArrayUtils.toPrimitive(saltFormCdIds.toArray(new Integer[saltFormCdIds.size()]));				
+			if (saltFormCdIds != null && saltFormCdIds.size() > 0) {
+				filterCdIds = ArrayUtils.toPrimitive(saltFormCdIds.toArray(new Integer[saltFormCdIds.size()]));
 				logger.debug("list of filter saltForm cdIds found: " + saltFormCdIds.toString());
 			} else if (searchParams.isValuesSet() && saltFormCdIds.size() == 0) {
 				saltFormCdIds.add(0);
-				filterCdIds = ArrayUtils.toPrimitive(saltFormCdIds.toArray(new Integer[saltFormCdIds.size()]));				
+				filterCdIds = ArrayUtils.toPrimitive(saltFormCdIds.toArray(new Integer[saltFormCdIds.size()]));
 			} else {
 				filterCdIds = null;
 			}
 			logger.debug(StructureType.SALT_FORM + "   search type:= " + searchParams.getSearchType());
-//			logger.debug("Query Structure Smiles: " + structureService.toSmiles(searchParams.getMolStructure()));
+			// logger.debug("Query Structure Smiles: " +
+			// structureService.toSmiles(searchParams.getMolStructure()));
 
 			CmpdRegMolecule[] saltFormStructureHits;
-			if (searchParams.getMaxResults() != null){
-				saltFormStructureHits = structureService.searchMols( searchParams.getMolStructure(), StructureType.SALT_FORM, filterCdIds, 
+			if (searchParams.getMaxResults() != null) {
+				saltFormStructureHits = structureService.searchMols(searchParams.getMolStructure(),
+						StructureType.SALT_FORM, filterCdIds,
 						matchedSearchType, searchParams.getPercentSimilarity(), searchParams.getMaxResults());
-			}else{
-				saltFormStructureHits = structureService.searchMols( searchParams.getMolStructure(), StructureType.SALT_FORM, filterCdIds, 
-					matchedSearchType, searchParams.getPercentSimilarity());
+			} else {
+				saltFormStructureHits = structureService.searchMols(searchParams.getMolStructure(),
+						StructureType.SALT_FORM, filterCdIds,
+						matchedSearchType, searchParams.getPercentSimilarity());
 			}
 
 			logger.debug("found: " + saltFormStructureHits.length + " saltForm structure hits");
 
-			for (CmpdRegMolecule hitMol : saltFormStructureHits){
+			for (CmpdRegMolecule hitMol : saltFormStructureHits) {
 				logger.debug("did we find a saltForm hit: " + hitMol.toString());
 				int hitCdId = Integer.parseInt(hitMol.getProperty("cd_id").trim());
 				SaltForm saltForm = SaltForm.findSaltFormsByCdId(hitCdId).getSingleResult();
-				//				saltForm.setMolStructure(hitMol.toFormat("mrv"));
+				// saltForm.setMolStructure(hitMol.toFormat("mrv"));
 				saltForm.setMolStructure(hitMol.getSmiles());
 				saltFormMols.put(saltForm.getCorpName(), saltForm);
 				saltForms.add(saltForm);
@@ -417,12 +421,14 @@ else if (searchParams.getCorpNameFrom().startsWith(propertiesUtilService.getCorp
 
 			List<Integer> parentCdIds = Parent.findParentCdIdsByMeta(searchParams);
 
-			if (parentCdIds != null && parentCdIds.size() > 0){
-				filterCdIds = ArrayUtils.toPrimitive(parentCdIds.toArray(new Integer[parentCdIds.size()]));;				
+			if (parentCdIds != null && parentCdIds.size() > 0) {
+				filterCdIds = ArrayUtils.toPrimitive(parentCdIds.toArray(new Integer[parentCdIds.size()]));
+				;
 				logger.debug("list of parent filter cdIds found: " + parentCdIds.toString());
 			} else if (searchParams.isValuesSet() && parentCdIds.size() == 0) {
 				parentCdIds.add(0);
-				filterCdIds = ArrayUtils.toPrimitive(parentCdIds.toArray(new Integer[parentCdIds.size()]));;				
+				filterCdIds = ArrayUtils.toPrimitive(parentCdIds.toArray(new Integer[parentCdIds.size()]));
+				;
 			} else {
 				logger.debug("no filter cdIds found");
 				filterCdIds = null;
@@ -431,11 +437,13 @@ else if (searchParams.getCorpNameFrom().startsWith(propertiesUtilService.getCorp
 			logger.debug(StructureType.PARENT + "   search type:= " + searchParams.getSearchType());
 
 			CmpdRegMolecule[] parentStructureHits;
-			if (searchParams.getMaxResults() != null){
-				parentStructureHits = structureService.searchMols( searchParams.getMolStructure(), StructureType.PARENT, filterCdIds, 
+			if (searchParams.getMaxResults() != null) {
+				parentStructureHits = structureService.searchMols(searchParams.getMolStructure(), StructureType.PARENT,
+						filterCdIds,
 						matchedSearchType, searchParams.getPercentSimilarity(), searchParams.getMaxResults());
-			}else{
-				parentStructureHits = structureService.searchMols( searchParams.getMolStructure(), StructureType.PARENT, filterCdIds, 
+			} else {
+				parentStructureHits = structureService.searchMols(searchParams.getMolStructure(), StructureType.PARENT,
+						filterCdIds,
 						matchedSearchType, searchParams.getPercentSimilarity());
 			}
 
@@ -443,7 +451,7 @@ else if (searchParams.getCorpNameFrom().startsWith(propertiesUtilService.getCorp
 
 				logger.debug("found: " + parentStructureHits.length + " parent structure hits");
 
-				for (CmpdRegMolecule hitMol : parentStructureHits){
+				for (CmpdRegMolecule hitMol : parentStructureHits) {
 					int hitCdId = Integer.parseInt(hitMol.getProperty("cd_id").trim());
 					logger.debug("query parent hitCdId  " + hitCdId);
 					List<Parent> parents = Parent.findParentsByCdId(hitCdId).getResultList();
@@ -453,9 +461,9 @@ else if (searchParams.getCorpNameFrom().startsWith(propertiesUtilService.getCorp
 					logger.debug("search Parms are: " + searchParams.toJson());
 					List<Long> saltFormIds = SaltForm.findSaltFormIDsByParentAndMeta(parent, searchParams);
 					logger.debug("number of saltForms found: " + saltFormIds.size());
-					//				logger.debug("saltForm IDs found: " + saltFormIds.toString());
+					// logger.debug("saltForm IDs found: " + saltFormIds.toString());
 
-					for (Long saltFormId : saltFormIds){
+					for (Long saltFormId : saltFormIds) {
 						SaltForm saltForm = SaltForm.findSaltForm(saltFormId);
 						logger.debug("found: " + saltForm.getCorpName());
 						logger.debug("found: " + saltForm.getParent().getCorpName());
@@ -465,33 +473,34 @@ else if (searchParams.getCorpNameFrom().startsWith(propertiesUtilService.getCorp
 
 						parentMols.put(saltForm.getCorpName(), saltForm);
 						SearchCompoundReturnDTO searchCompound = new SearchCompoundReturnDTO();
-//						searchCompound.setCorpName(saltForm.getParent().getCorpName());
+						// searchCompound.setCorpName(saltForm.getParent().getCorpName());
 						List<ParentAliasDTO> parentAliases = new ArrayList<ParentAliasDTO>();
-						for (ParentAlias parentAlias: saltForm.getParent().getParentAliases()){
-							if (!parentAlias.isIgnored()){
+						for (ParentAlias parentAlias : saltForm.getParent().getParentAliases()) {
+							if (!parentAlias.isIgnored()) {
 								ParentAliasDTO parentAliasDTO = new ParentAliasDTO(parentAlias);
 								parentAliases.add(parentAliasDTO);
 							}
 						}
 						searchCompound.setParentAliases(parentAliases);
-						if (saltForm.getParent().getStereoCategory() != null){
-							if (saltForm.getParent().getStereoCategory().getCode() != null){
-								searchCompound.setStereoCategoryName(saltForm.getParent().getStereoCategory().getName());													
+						if (saltForm.getParent().getStereoCategory() != null) {
+							if (saltForm.getParent().getStereoCategory().getCode() != null) {
+								searchCompound
+										.setStereoCategoryName(saltForm.getParent().getStereoCategory().getName());
 							}
 						}
-						if (saltForm.getParent().getStereoComment() != null){
-							searchCompound.setStereoComment(saltForm.getParent().getStereoComment());						
+						if (saltForm.getParent().getStereoComment() != null) {
+							searchCompound.setStereoComment(saltForm.getParent().getStereoComment());
 						}
-						if(saltFormMols.containsKey(saltForm.getCorpName())){
+						if (saltFormMols.containsKey(saltForm.getCorpName())) {
 							searchCompound.setCorpName(saltForm.getCorpName());
 							searchCompound.setCorpNameType("SaltForm");
 							searchCompound.setMolStructure(saltFormMols.get(saltForm.getCorpName()).getMolStructure());
 						} else {
 							// searchCompound.setMolStructure(hitMol.toFormat("mrv"));
-							if(propertiesUtilService.getSaltBeforeLot()){
+							if (propertiesUtilService.getSaltBeforeLot()) {
 								searchCompound.setCorpName(saltForm.getCorpName());
 								searchCompound.setCorpNameType("SaltForm");
-							}else{
+							} else {
 								searchCompound.setCorpName(saltForm.getParent().getCorpName());
 								searchCompound.setCorpNameType("Parent");
 							}
@@ -499,14 +508,15 @@ else if (searchParams.getCorpNameFrom().startsWith(propertiesUtilService.getCorp
 						}
 						List<Lot> lotsFound = Lot.findLotsBySaltFormAndMeta(saltForm, searchParams).getResultList();
 						List<Lot> lots = new ArrayList<Lot>();
-						for (Lot lot : lotsFound){
-							if (!lots.contains(lot)) lots.add(lot);
+						for (Lot lot : lotsFound) {
+							if (!lots.contains(lot))
+								lots.add(lot);
 						}
 						logger.debug("current saltForm: " + saltForm.getCorpName() + "  " + saltForm.getId());
 						logger.debug("number of lots found: " + lotsFound.size());
 						logger.debug("number of unique lots found: " + lots.size());
-						for (Lot lot : lots){
-							//						logger.debug("current lot:" + lot.getCorpName());
+						for (Lot lot : lots) {
+							// logger.debug("current lot:" + lot.getCorpName());
 							SearchLotDTO searchLot = new SearchLotDTO();
 							searchLot.setCorpName(lot.getCorpName());
 							searchLot.setLotNumber(lot.getLotNumber());
@@ -514,115 +524,120 @@ else if (searchParams.getCorpNameFrom().startsWith(propertiesUtilService.getCorp
 							searchLot.setRegistrationDate(lot.getRegistrationDate());
 							searchLot.setSynthesisDate(lot.getSynthesisDate());
 							List<LotAliasDTO> lotAliases = new ArrayList<LotAliasDTO>();
-							for (LotAlias lotAlias: lot.getLotAliases()){
-								if (!lotAlias.isIgnored()){
+							for (LotAlias lotAlias : lot.getLotAliases()) {
+								if (!lotAlias.isIgnored()) {
 									LotAliasDTO lotAliasDTO = new LotAliasDTO(lotAlias);
 									lotAliases.add(lotAliasDTO);
 								}
 							}
 							searchLot.setLotAliases(lotAliases);
 							searchCompound.getLotIDs().add(searchLot);
-						}				
-						foundCompounds.add(searchCompound);									
-					}				
+						}
+						foundCompounds.add(searchCompound);
+					}
 				}
 			}
 
-			//now add in any hits from the saltForm query that were not picked up in the parent query
-			if (saltFormCdIds != null){
-				logger.debug("number of saltFormCdIds found: " + saltFormCdIds.size());				
+			// now add in any hits from the saltForm query that were not picked up in the
+			// parent query
+			if (saltFormCdIds != null) {
+				logger.debug("number of saltFormCdIds found: " + saltFormCdIds.size());
 			}
 
 			logger.debug("number of saltForm structures found: " + saltFormMols.size());
 
-			for (SaltForm saltForm : saltForms){
-				if (!parentMols.containsKey(saltForm.getCorpName())){
-					//					logger.debug("----NEW SALTFORM ADDING TO LIST:" + saltForm.getCorpName());
-					//					logger.debug("current saltForm " + saltForm.toJson());
+			for (SaltForm saltForm : saltForms) {
+				if (!parentMols.containsKey(saltForm.getCorpName())) {
+					// logger.debug("----NEW SALTFORM ADDING TO LIST:" + saltForm.getCorpName());
+					// logger.debug("current saltForm " + saltForm.toJson());
 					SearchCompoundReturnDTO searchCompound = new SearchCompoundReturnDTO();
 					searchCompound.setCorpName(saltForm.getCorpName());
 					searchCompound.setCorpNameType("SaltForm");
-					//					logger.debug("current saltForm corpName " + searchCompound.getCorpName());
+					// logger.debug("current saltForm corpName " + searchCompound.getCorpName());
 
-					if (saltForm.getParent().getStereoCategory() != null){
-						if (saltForm.getParent().getStereoCategory().getName() != null){
-							searchCompound.setStereoCategoryName(saltForm.getParent().getStereoCategory().getName());													
+					if (saltForm.getParent().getStereoCategory() != null) {
+						if (saltForm.getParent().getStereoCategory().getName() != null) {
+							searchCompound.setStereoCategoryName(saltForm.getParent().getStereoCategory().getName());
 						}
 					}
-					if (saltForm.getParent().getStereoComment() != null){
-						searchCompound.setStereoComment(saltForm.getParent().getStereoComment());						
+					if (saltForm.getParent().getStereoComment() != null) {
+						searchCompound.setStereoComment(saltForm.getParent().getStereoComment());
 					}
 
-					//					SaltForm blah = saltFormMols.get(saltForm.getCorpName());
-					//					logger.debug("number of mol count " +  saltFormMols.size());
-					//					logger.debug("current query mol structrue: " + blah.getMolStructure());
+					// SaltForm blah = saltFormMols.get(saltForm.getCorpName());
+					// logger.debug("number of mol count " + saltFormMols.size());
+					// logger.debug("current query mol structrue: " + blah.getMolStructure());
 
 					searchCompound.setMolStructure(saltFormMols.get(saltForm.getCorpName()).getMolStructure());
-					//					logger.debug("current query structrue: " + searchCompound.getMolStructure());
+					// logger.debug("current query structrue: " + searchCompound.getMolStructure());
 					List<Lot> lotsFound = Lot.findLotsBySaltFormAndMeta(saltForm, searchParams).getResultList();
 					List<Lot> lots = new ArrayList<Lot>();
-					for (Lot lot : lotsFound){
-						if (!lots.contains(lot)) lots.add(lot);
+					for (Lot lot : lotsFound) {
+						if (!lots.contains(lot))
+							lots.add(lot);
 					}
 					logger.debug("current saltForm: " + saltForm.getCorpName() + "  " + saltForm.getId());
 					logger.debug("number of lots found: " + lotsFound.size());
 					logger.debug("number of unique lots found: " + lots.size());
-					for (Lot lot : lots){
-						//						logger.debug("current lot: " + lot.toJson());
+					for (Lot lot : lots) {
+						// logger.debug("current lot: " + lot.toJson());
 						SearchLotDTO searchLot = new SearchLotDTO();
 						searchLot.setCorpName(lot.getCorpName());
 						searchLot.setLotNumber(lot.getLotNumber());
 						searchLot.setRegistrationDate(lot.getRegistrationDate());
 						searchLot.setSynthesisDate(lot.getSynthesisDate());
 						searchCompound.getLotIDs().add(searchLot);
-					}				
-					foundCompounds.add(searchCompound);									
+					}
+					foundCompounds.add(searchCompound);
 				}
 
 			}
 
 			logger.debug("found Compounds from structure search: " + foundCompounds.size());
 
-			//			logger.debug("found Compounds: " + SearchCompoundReturnDTO.toJsonArray(foundCompounds));
-
+			// logger.debug("found Compounds: " +
+			// SearchCompoundReturnDTO.toJsonArray(foundCompounds));
 
 		}
-		
-		//Construct wrapper object and filter out results by project
+
+		// Construct wrapper object and filter out results by project
 		SearchFormReturnDTO results = new SearchFormReturnDTO();
 		results.setFoundCompounds(foundCompounds);
-		if(propertiesUtilService.getProjectRestrictions()) results = filterSearchResultsByProject(results, searchParams.getProjects());
-		
+		if (propertiesUtilService.getProjectRestrictions())
+			results = filterSearchResultsByProject(results, searchParams.getProjects());
+
 		return results;
 
 	}
-	
-	private SearchFormReturnDTO filterSearchResultsByProject(SearchFormReturnDTO searchResults, List<String> projects){
-		if (!searchResults.getFoundCompounds().isEmpty()){
+
+	private SearchFormReturnDTO filterSearchResultsByProject(SearchFormReturnDTO searchResults, List<String> projects) {
+		if (!searchResults.getFoundCompounds().isEmpty()) {
 			Collection<SearchCompoundReturnDTO> filteredFoundCompounds = new HashSet<SearchCompoundReturnDTO>();
-			for (SearchCompoundReturnDTO foundCompound : searchResults.getFoundCompounds()){
+			for (SearchCompoundReturnDTO foundCompound : searchResults.getFoundCompounds()) {
 				List<SearchLotDTO> filteredFoundLots = new ArrayList<SearchLotDTO>();
-				for (SearchLotDTO foundLot : foundCompound.getLotIDs()){
-					String lotProject = Lot.findLotsByCorpNameEquals(foundLot.getCorpName()).getSingleResult().getProject();
-					if(projects.contains(lotProject)) filteredFoundLots.add(foundLot);
+				for (SearchLotDTO foundLot : foundCompound.getLotIDs()) {
+					String lotProject = Lot.findLotsByCorpNameEquals(foundLot.getCorpName()).getSingleResult()
+							.getProject();
+					if (projects.contains(lotProject))
+						filteredFoundLots.add(foundLot);
 				}
-				if (!filteredFoundLots.isEmpty()){
+				if (!filteredFoundLots.isEmpty()) {
 					foundCompound.setLotIDs(filteredFoundLots);
 					filteredFoundCompounds.add(foundCompound);
 				}
 			}
-			if (filteredFoundCompounds.isEmpty()) searchResults.setLotsWithheld(true);
+			if (filteredFoundCompounds.isEmpty())
+				searchResults.setLotsWithheld(true);
 			searchResults.setFoundCompounds(filteredFoundCompounds);
 		}
 		return searchResults;
 	}
 
-
 	private boolean isNumber(String corpNameFrom) {
 		try {
 			Integer.parseInt(corpNameFrom.trim());
 			return true;
-		} catch (NumberFormatException nfe){
+		} catch (NumberFormatException nfe) {
 			return false;
 		}
 	}
@@ -630,23 +645,23 @@ private boolean isNumber(String corpNameFrom) {
 	private String buildMetaQuery(SearchFormDTO searchParams, StructureType structureType) {
 
 		SimpleDateFormat simpleDate = new SimpleDateFormat("yyyy-MM-dd");
-		boolean isFirst = true; 
+		boolean isFirst = true;
 
-		StringBuilder query = new StringBuilder("SELECT cd_id from " + structureType.entityTable );
+		StringBuilder query = new StringBuilder("SELECT cd_id from " + structureType.entityTable);
 
-		if(searchParams.getMinSynthDate() != null){
-			if(isFirst){
+		if (searchParams.getMinSynthDate() != null) {
+			if (isFirst) {
 				query.append(" where sythesis_date >= '" + searchParams.getDateFrom() + "'");
-			}else{
+			} else {
 				query.append(" and sythesis_date >= '" + searchParams.getDateFrom() + "'");
 			}
 			isFirst = false;
 		}
 
-		if(searchParams.getMaxSynthDate() !=null){
-			if(isFirst){
+		if (searchParams.getMaxSynthDate() != null) {
+			if (isFirst) {
 				query.append(" where date <= '" + searchParams.getDateTo() + "'");
-			}else{
+			} else {
 				query.append(" and date <= '" + searchParams.getDateTo() + "'");
 			}
 			isFirst = false;
@@ -657,25 +672,26 @@ private String buildMetaQuery(SearchFormDTO searchParams, StructureType structur
 		return query.toString();
 	}
 
-
 	@Override
 	public List<Integer> findParentIds(String molStructure, Integer maxResults, Float similarity, SearchType searchType,
 			List<String> projects) throws IOException, CmpdRegMolFormatException {
 
-		// We don't want to limit the max results when searching for structures so set the number really high becuse
-		// none of the searchMolStructures implementations allow an unlimited option for max results.
+		// We don't want to limit the max results when searching for structures so set
+		// the number really high becuse
+		// none of the searchMolStructures implementations allow an unlimited option for
+		// max results.
 
-		int[] parentStructureHits = structureService.searchMolStructures(molStructure,  StructureType.PARENT, searchType, similarity, 999999999);
-		List<Integer> cdIdslist = Arrays.stream( parentStructureHits ).boxed().collect( Collectors.toList() );
+		int[] parentStructureHits = structureService.searchMolStructures(molStructure, StructureType.PARENT, searchType,
+				similarity, 999999999);
+		List<Integer> cdIdslist = Arrays.stream(parentStructureHits).boxed().collect(Collectors.toList());
 		TypedQuery<Integer> parentQuery = Parent.findParentIdsByCdIdInAndProjectIn(cdIdslist, projects);
 
 		// We limit max results when searching for parents
-		if(maxResults != null && maxResults > -1) {
+		if (maxResults != null && maxResults > -1) {
 			parentQuery.setMaxResults(maxResults);
 		}
 
 		return parentQuery.getResultList();
 	}
 
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/SetupService.java b/src/main/java/com/labsynch/labseer/service/SetupService.java
index 998034ecf..fe4eb5b79 100755
--- a/src/main/java/com/labsynch/labseer/service/SetupService.java
+++ b/src/main/java/com/labsynch/labseer/service/SetupService.java
@@ -8,5 +8,4 @@ public interface SetupService {
 
 	void loadCorpNames() throws FileNotFoundException;
 
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/SetupServiceImpl.java b/src/main/java/com/labsynch/labseer/service/SetupServiceImpl.java
index 85e1f242a..cacd42d0d 100755
--- a/src/main/java/com/labsynch/labseer/service/SetupServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/SetupServiceImpl.java
@@ -13,12 +13,11 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-
 @Service
 public class SetupServiceImpl implements SetupService {
-	
+
 	Logger logger = LoggerFactory.getLogger(SetupServiceImpl.class);
-	
+
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
 
@@ -33,33 +32,34 @@ public void loadCorpNames(String corpFileName) throws FileNotFoundException {
 
 		boolean usePredefinedList = propertiesUtilService.getUsePredefinedList();
 		long numberOfCorpNamesToGenerate = 50000;
-		
-		if (usePredefinedList && PreDef_CorpName.countPreDef_CorpNames() < 1L){
+
+		if (usePredefinedList && PreDef_CorpName.countPreDef_CorpNames() < 1L) {
 			logger.debug("load up preDefined corpNames ");
-			
-//			String fileName = "src/test/resources/predef_corpname.csv";
-		    File inputFile = new File(corpFileName); 
+
+			// String fileName = "src/test/resources/predef_corpname.csv";
+			File inputFile = new File(corpFileName);
 			Scanner scanner = new Scanner(new FileReader(inputFile));
-			
-			//skip the header line
+
+			// skip the header line
 			String header = scanner.nextLine();
 			logger.debug("header line: " + header);
-			
+
 			int lineCount = 0;
-			while ( scanner.hasNextLine() && lineCount < 500 ){
-				processLine( scanner.nextLine() );
+			while (scanner.hasNextLine() && lineCount < 500) {
+				processLine(scanner.nextLine());
 				lineCount++;
 			}
 
-			scanner.close();			
+			scanner.close();
 		} else {
-			long corpNumber = propertiesUtilService.getStartingCorpNumber(); //starting number
+			long corpNumber = propertiesUtilService.getStartingCorpNumber(); // starting number
 			int corpDigits = propertiesUtilService.getNumberCorpDigits();
 			String formatCorpDigits = "%0" + corpDigits + "d";
-			while ( corpNumber < numberOfCorpNamesToGenerate ){
+			while (corpNumber < numberOfCorpNamesToGenerate) {
 				corpNumber++;
 				String corpName = null;
-				corpName = propertiesUtilService.getCorpPrefix().concat(propertiesUtilService.getCorpSeparator()).concat(String.format(formatCorpDigits, corpNumber));	    		
+				corpName = propertiesUtilService.getCorpPrefix().concat(propertiesUtilService.getCorpSeparator())
+						.concat(String.format(formatCorpDigits, corpNumber));
 				boolean used = false;
 				boolean skip = false;
 				PreDef_CorpName preDefCorpName = new PreDef_CorpName();
@@ -74,14 +74,13 @@ public void loadCorpNames(String corpFileName) throws FileNotFoundException {
 
 	}
 
-	
-	protected void processLine(String aLine){
-		//use a second Scanner to parse the content of each line 
+	protected void processLine(String aLine) {
+		// use a second Scanner to parse the content of each line
 		Scanner scanner = new Scanner(aLine);
 		scanner.useDelimiter(",");
-		if ( scanner.hasNext() ){
-			
-			//"id","corpname","used","skip"
+		if (scanner.hasNext()) {
+
+			// "id","corpname","used","skip"
 			String id = scanner.next();
 			String corpName = scanner.next().replaceAll("\"", "");
 			long corpNumber = corpNameService.convertToParentNumber(corpName);
@@ -89,42 +88,34 @@ protected void processLine(String aLine){
 			String skipString = scanner.next();
 			boolean used;
 			boolean skip;
-			
-			if (usedString.equalsIgnoreCase("1")){
+
+			if (usedString.equalsIgnoreCase("1")) {
 				used = true;
 			} else {
 				used = false;
 			}
-			
-			if (skipString.equalsIgnoreCase("1")){
+
+			if (skipString.equalsIgnoreCase("1")) {
 				skip = true;
 			} else {
 				skip = false;
 			}
-			
-			
+
 			PreDef_CorpName preDefCorpName = new PreDef_CorpName();
 			preDefCorpName.setCorpName(corpName);
 			preDefCorpName.setCorpNumber(corpNumber);
 			preDefCorpName.setUsed(used);
 			preDefCorpName.setSkip(skip);
 			preDefCorpName.persist();
-		}
-		else {
+		} else {
 			logger.error("Empty or invalid line. Unable to process.");
 		}
 	}
 
-
 	@Override
 	public void loadCorpNames() throws FileNotFoundException {
 		String noFile = null;
 		loadCorpNames(noFile);
 	}
 
-
-	
-	
-
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/StandardizationService.java b/src/main/java/com/labsynch/labseer/service/StandardizationService.java
index 601b5f26e..b093e719e 100644
--- a/src/main/java/com/labsynch/labseer/service/StandardizationService.java
+++ b/src/main/java/com/labsynch/labseer/service/StandardizationService.java
@@ -19,15 +19,18 @@ public interface StandardizationService {
 
 	String getStandardizationDryRunReportFiles(String sdfFileName) throws IOException, CmpdRegMolFormatException;
 
-	String getStandardizationDryRunReportFiles(StandardizationDryRunSearchDTO searchCriteria) throws IOException, CmpdRegMolFormatException;
+	String getStandardizationDryRunReportFiles(StandardizationDryRunSearchDTO searchCriteria)
+			throws IOException, CmpdRegMolFormatException;
 
 	String getStandardizationDryRunReport() throws IOException, CmpdRegMolFormatException, StandardizerException;
 
 	String getDryRunStats() throws StandardizerException;
 
-	String executeStandardization(String username, String reason) throws IOException, CmpdRegMolFormatException, StandardizerException;
+	String executeStandardization(String username, String reason)
+			throws IOException, CmpdRegMolFormatException, StandardizerException;
 
-	int restandardizeParentStructures(List<Long> parentIds) throws CmpdRegMolFormatException, IOException, StandardizerException;
+	int restandardizeParentStructures(List<Long> parentIds)
+			throws CmpdRegMolFormatException, IOException, StandardizerException;
 
 	String standardizeSingleMol(String mol) throws CmpdRegMolFormatException, StandardizerException, IOException;
 
diff --git a/src/main/java/com/labsynch/labseer/service/StandardizationServiceImpl.java b/src/main/java/com/labsynch/labseer/service/StandardizationServiceImpl.java
index 299006c95..dc663d7c8 100644
--- a/src/main/java/com/labsynch/labseer/service/StandardizationServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/StandardizationServiceImpl.java
@@ -57,7 +57,7 @@ public class StandardizationServiceImpl implements StandardizationService, Appli
 
 	@Autowired
 	private SaltStructureService saltStructureService;
-	
+
 	@Autowired
 	public ParentLotService parentLotService;
 
@@ -85,7 +85,8 @@ public void onApplicationEvent(ContextRefreshedEvent event) {
 		ApplicationContext context = event.getApplicationContext();
 		logger.info("Application context: " + context.getDisplayName());
 		if (context.getDisplayName().equals("Root WebApplicationContext")) {
-			// this is the root context so wait for the web application context to be initialized
+			// this is the root context so wait for the web application context to be
+			// initialized
 			return;
 		}
 
@@ -105,12 +106,13 @@ public void onApplicationEvent(ContextRefreshedEvent event) {
 			// Cancel all running standardization histories as failed
 			List<StandardizationHistory> histories = StandardizationHistory.findAllStandardizationHistorys();
 			for (StandardizationHistory history : histories) {
-				if(history.getStandardizationStatus() != null && history.getStandardizationStatus().equals("running")){
+				if (history.getStandardizationStatus() != null
+						&& history.getStandardizationStatus().equals("running")) {
 					logger.info("Failing running standardization for run id " + history.getId());
 					history.setStandardizationStatus("failed");
 					history.merge();
 				}
-				if(history.getDryRunStatus() != null && history.getDryRunStatus().equals("running")){
+				if (history.getDryRunStatus() != null && history.getDryRunStatus().equals("running")) {
 					logger.info("Failing running standardization dry run for run id " + history.getId());
 					history.setDryRunStatus("failed");
 					history.merge();
@@ -190,7 +192,8 @@ public void onApplicationEvent(ContextRefreshedEvent event) {
 
 	@Transactional
 	private HashMap<String, Integer> saveDryRunStructures(HashMap<String, CmpdRegMolecule> structures) {
-		HashMap<String, Integer> saveResults = chemStructureService.saveStructures(structures, StructureType.STANDARDIZATION_DRY_RUN, false);
+		HashMap<String, Integer> saveResults = chemStructureService.saveStructures(structures,
+				StructureType.STANDARDIZATION_DRY_RUN, false);
 		return saveResults;
 	}
 
@@ -234,13 +237,13 @@ public int populateStandardizationDryRunTable()
 			HashMap<String, String> parentIdsToStructures = new HashMap<String, String>();
 			HashMap<String, String> parentIdsToAsDrawnStructs = new HashMap<String, String>();
 			HashMap<Long, Parent> parents = new HashMap<Long, Parent>();
-			for(Long parentId : pIdGroup) {
+			for (Long parentId : pIdGroup) {
 				parent = Parent.findParent(parentId);
 				parents.put(parentId, parent);
 
 				// Get the as drawn structure
 				String asDrawnStruct = Lot.getOriginallyDrawnAsStructure(parent);
-				if(asDrawnStruct == null) {
+				if (asDrawnStruct == null) {
 					logger.warn("Parent " + parentId + " has no as drawn structure");
 					parentIdsToStructures.put(parentId.toString(parentId), parent.getMolStructure());
 				} else {
@@ -254,7 +257,8 @@ public int populateStandardizationDryRunTable()
 			logger.info("Starting standardization of " + parentIdsToStructures.size() + " compounds");
 			// Start timer
 			long standardizationStart = new Date().getTime();
-			HashMap<String, CmpdRegMolecule> standardizationResults = chemStructureService.standardizeStructures(parentIdsToStructures);
+			HashMap<String, CmpdRegMolecule> standardizationResults = chemStructureService
+					.standardizeStructures(parentIdsToStructures);
 			long standardizationEnd = new Date().getTime();
 			// Convert the ms time to seconds
 			long standardizationTime = (standardizationEnd - standardizationStart) / 1000;
@@ -263,8 +267,10 @@ public int populateStandardizationDryRunTable()
 			logger.info("Starting saving of " + pIdGroup.size() + " dry run structures");
 			long structureSaveStart = new Date().getTime();
 
-			// Save the standardized dry run structures and return the hashmap of String (parent id) and Integer (cd id).  We use the cdIds below
-			// when saving the dry run compounds to the database which links the structures and compounds together.
+			// Save the standardized dry run structures and return the hashmap of String
+			// (parent id) and Integer (cd id). We use the cdIds below
+			// when saving the dry run compounds to the database which links the structures
+			// and compounds together.
 			HashMap<String, Integer> parentIdToStructureId = saveDryRunStructures(standardizationResults);
 			long structureSaveEnd = new Date().getTime();
 			// Convert the ms time to seconds
@@ -273,7 +279,7 @@ public int populateStandardizationDryRunTable()
 
 			logger.info("Starting saving of " + pIdGroup.size() + " standardization dry run compounds");
 			long dryRunCompoundSaveStart = new Date().getTime();
-			for(Long parentId : pIdGroup) {
+			for (Long parentId : pIdGroup) {
 				parent = parents.get(parentId);
 				stndznCompound = new StandardizationDryRunCompound();
 				stndznCompound.setRunNumber(runNumber);
@@ -291,26 +297,25 @@ public int populateStandardizationDryRunTable()
 				stndznCompound.setStandardizationComment(cmpdRegMolecule.getStandardizationComment());
 				stndznCompound.setRegistrationStatus(cmpdRegMolecule.getRegistrationStatus());
 				stndznCompound.setRegistrationComment(cmpdRegMolecule.getRegistrationComment());
-				
 
 				Double newMolWeight = cmpdRegMolecule.getMass();
-				if(newMolWeight  != null) {
-					DecimalFormat dMolWeight = new DecimalFormat("#.###"); 
+				if (newMolWeight != null) {
+					DecimalFormat dMolWeight = new DecimalFormat("#.###");
 					stndznCompound.setNewMolWeight(Double.valueOf(dMolWeight.format(newMolWeight)));
 				} else {
 					stndznCompound.setNewMolWeight(null);
 				}
 
-				if(newMolWeight == null || stndznCompound.getOldMolWeight() == null) {
+				if (newMolWeight == null || stndznCompound.getOldMolWeight() == null) {
 					stndznCompound.setDeltaMolWeight(null);
 				} else {
-					DecimalFormat deltaMolFormat = new DecimalFormat("#.###"); 
-					Double deltaMolWeight = stndznCompound.getOldMolWeight()-stndznCompound.getNewMolWeight();
+					DecimalFormat deltaMolFormat = new DecimalFormat("#.###");
+					Double deltaMolWeight = stndznCompound.getOldMolWeight() - stndznCompound.getNewMolWeight();
 					stndznCompound.setDeltaMolWeight(Double.valueOf(deltaMolFormat.format(deltaMolWeight)));
 				}
 
 				boolean displayTheSame = chemStructureService.isIdenticalDisplay(parent.getMolStructure(),
-					stndznCompound.getMolStructure());
+						stndznCompound.getMolStructure());
 
 				if (!displayTheSame) {
 					stndznCompound.setDisplayChange(true);
@@ -319,7 +324,7 @@ public int populateStandardizationDryRunTable()
 				}
 				String asDrawnStruct = parentIdsToAsDrawnStructs.get(parentId.toString(parentId));
 				boolean asDrawnDisplaySame = chemStructureService.isIdenticalDisplay(asDrawnStruct,
-					stndznCompound.getMolStructure());
+						stndznCompound.getMolStructure());
 
 				if (!asDrawnDisplaySame) {
 					stndznCompound.setAsDrawnDisplayChange(true);
@@ -343,21 +348,22 @@ public int populateStandardizationDryRunTable()
 			// Convert the ms time to seconds
 			long dryRunCompoundSaveTime = (dryRunCompoundSaveEnd - dryRunCompoundSaveStart) / 1000;
 			logger.info("Saving took " + dryRunCompoundSaveTime + " seconds");
-			
+
 			// End loop through parent id group
 			logger.debug("flushing loader session");
 			session.flush();
 			session.clear();
-			
+
 			// Compute your percentage.
 			percent = (float) Math.floor(p * 100f / totalCount);
 			if (percent != previousPercent) {
 				currentTime = new Date().getTime();
 				// Output if different from the last time.
 				logger.info("populating standardization dry run table " + percent + "% complete (" + p + " of "
-					+ totalCount + ") average speed (rows/min):"+ (p/((currentTime - startTime) / 60.0 / 1000.0)));
+						+ totalCount + ") average speed (rows/min):"
+						+ (p / ((currentTime - startTime) / 60.0 / 1000.0)));
 				currentTime = new Date().getTime();
-				logger.debug("Time Elapsed:"+ (currentTime - startTime));
+				logger.debug("Time Elapsed:" + (currentTime - startTime));
 			}
 			// Update the percentage.
 			previousPercent = percent;
@@ -412,8 +418,9 @@ public int dupeCheckStandardizationStructures() throws CmpdRegMolFormatException
 				boolean firstOldDuplicateHit = true;
 				dryRunCompound = StandardizationDryRunCompound.findStandardizationDryRunCompound(dryRunId);
 
-				if(dryRunCompound.getRegistrationStatus() == RegistrationStatus.ERROR) {
-					logger.info("skipping dupe check for compound with registration status " + dryRunCompound.getRegistrationStatus() + ": " + dryRunCompound.getCorpName());
+				if (dryRunCompound.getRegistrationStatus() == RegistrationStatus.ERROR) {
+					logger.info("skipping dupe check for compound with registration status "
+							+ dryRunCompound.getRegistrationStatus() + ": " + dryRunCompound.getCorpName());
 				} else {
 					logger.debug("query compound: " + dryRunCompound.getCorpName());
 
@@ -422,11 +429,14 @@ public int dupeCheckStandardizationStructures() throws CmpdRegMolFormatException
 					// Arbitrary key to call service and fetch cmpdreg molecule
 					String tmpStructureKey = "TmpStructureKey01";
 					chemStructureHashMap.put(tmpStructureKey, dryRunCompound.getCdId());
-					HashMap<String, CmpdRegMolecule> cmpdRegMolecules = chemStructureService.getCmpdRegMolecules(chemStructureHashMap,
+					HashMap<String, CmpdRegMolecule> cmpdRegMolecules = chemStructureService.getCmpdRegMolecules(
+							chemStructureHashMap,
 							StructureType.STANDARDIZATION_DRY_RUN);
 
-					// Pass -1F for simlarityPercent (non nullable int required in function signature not used in DUPLICATE_TAUTOMER searches)
-					// Pass -1 for maxResults (non nullable int required in function signature we don't want to limit the hit counts here)
+					// Pass -1F for simlarityPercent (non nullable int required in function
+					// signature not used in DUPLICATE_TAUTOMER searches)
+					// Pass -1 for maxResults (non nullable int required in function signature we
+					// don't want to limit the hit counts here)
 					hits = chemStructureService.searchMolStructures(cmpdRegMolecules.get(tmpStructureKey),
 							StructureType.STANDARDIZATION_DRY_RUN, SearchType.DUPLICATE_TAUTOMER, -1F, -1);
 					newDupeCount = hits.length;
@@ -495,12 +505,11 @@ public int dupeCheckStandardizationStructures() throws CmpdRegMolFormatException
 						dryRunCompound.setExistingDuplicates(oldDuplicateCorpNames);
 					}
 
-
 					dryRunCompound.merge();
 					newDuplicateCorpNames = "";
 					oldDuplicateCorpNames = "";
 				}
-				if (p % 100 == 0){
+				if (p % 100 == 0) {
 					logger.debug("flushing loader session");
 					session.flush();
 					session.clear();
@@ -512,8 +521,9 @@ public int dupeCheckStandardizationStructures() throws CmpdRegMolFormatException
 					currentTime = new Date().getTime();
 					// Output if different from the last time.
 					logger.info("checking for standardization duplicates " + percent + "% complete (" + p + "/"
-							+ totalCount + ") average speed (rows/min):"+ (p/((currentTime - startTime) / 60.0 / 1000.0)));
-					logger.debug("Time Elapsed:"+ (currentTime - startTime));
+							+ totalCount + ") average speed (rows/min):"
+							+ (p / ((currentTime - startTime) / 60.0 / 1000.0)));
+					logger.debug("Time Elapsed:" + (currentTime - startTime));
 				}
 				// Update the percentage.
 				previousPercent = percent;
@@ -533,24 +543,26 @@ public String standardizeSingleMol(String mol)
 		return (result);
 	}
 
-
 	@Override
-	public String getStandardizationDryRunReportFiles(String sdfFileName) throws IOException, CmpdRegMolFormatException {
+	public String getStandardizationDryRunReportFiles(String sdfFileName)
+			throws IOException, CmpdRegMolFormatException {
 		List<StandardizationDryRunCompound> stndznCompounds = StandardizationDryRunCompound.findStandardizationChanges()
-			.getResultList();
+				.getResultList();
 
 		return (writeStandardizationCompoundsToSDF(stndznCompounds, sdfFileName));
 	}
 
 	@Override
-	public String getStandardizationDryRunReportFiles(StandardizationDryRunSearchDTO searchCriteria) throws IOException, CmpdRegMolFormatException {
-		List<StandardizationDryRunCompound> stndznCompounds = StandardizationDryRunCompound.searchStandardiationDryRun(searchCriteria)
-			.getResultList();
+	public String getStandardizationDryRunReportFiles(StandardizationDryRunSearchDTO searchCriteria)
+			throws IOException, CmpdRegMolFormatException {
+		List<StandardizationDryRunCompound> stndznCompounds = StandardizationDryRunCompound
+				.searchStandardiationDryRun(searchCriteria)
+				.getResultList();
 		return (writeStandardizationCompoundsToSDF(stndznCompounds, searchCriteria.getFilePath()));
 	}
 
-	public String writeStandardizationCompoundsToSDF(List<StandardizationDryRunCompound> stndznCompounds, String sdfFileName) throws IOException, CmpdRegMolFormatException {
-
+	public String writeStandardizationCompoundsToSDF(List<StandardizationDryRunCompound> stndznCompounds,
+			String sdfFileName) throws IOException, CmpdRegMolFormatException {
 
 		// Create/recreate file
 		File sdfFile = new File(sdfFileName);
@@ -563,10 +575,11 @@ public String writeStandardizationCompoundsToSDF(List<StandardizationDryRunCompo
 
 		// Fetch all compounds as cmpdreg molecules
 		HashMap<String, Integer> standardizationDryRunHashCompoundHashmap = new HashMap<String, Integer>();
-		for(StandardizationDryRunCompound stndznCompound : stndznCompounds){
+		for (StandardizationDryRunCompound stndznCompound : stndznCompounds) {
 			standardizationDryRunHashCompoundHashmap.put(stndznCompound.getCorpName(), stndznCompound.getCdId());
 		}
-		HashMap<String, CmpdRegMolecule> cmpdRegMolecules = chemStructureService.getCmpdRegMolecules(standardizationDryRunHashCompoundHashmap, StructureType.STANDARDIZATION_DRY_RUN);
+		HashMap<String, CmpdRegMolecule> cmpdRegMolecules = chemStructureService
+				.getCmpdRegMolecules(standardizationDryRunHashCompoundHashmap, StructureType.STANDARDIZATION_DRY_RUN);
 
 		// Loop stndznCompounds and write cmpdreg molecule to the sdf file
 		for (StandardizationDryRunCompound stndznCompound : stndznCompounds) {
@@ -583,8 +596,9 @@ public String writeStandardizationCompoundsToSDF(List<StandardizationDryRunCompo
 				cmpdRegMolecule.setProperty("Existing Duplicates", stndznCompound.getExistingDuplicates());
 				cmpdRegMolecule.setProperty("Delta Mol. Weight", String.valueOf(stndznCompound.getDeltaMolWeight()));
 				cmpdRegMolecule.setProperty("New Mol. Weight", String.valueOf(stndznCompound.getNewMolWeight()));
-				cmpdRegMolecule.setProperty("Old Mol. Weight",  String.valueOf(stndznCompound.getOldMolWeight()));
-				cmpdRegMolecule.setProperty("As Drawn Display Change", String.valueOf(stndznCompound.isAsDrawnDisplayChange()));
+				cmpdRegMolecule.setProperty("Old Mol. Weight", String.valueOf(stndznCompound.getOldMolWeight()));
+				cmpdRegMolecule.setProperty("As Drawn Display Change",
+						String.valueOf(stndznCompound.isAsDrawnDisplayChange()));
 				cmpdRegMolecule.setProperty("Stereo Category", stndznCompound.getStereoCategory());
 				cmpdRegMolecule.setProperty("Stereo Comment", stndznCompound.getStereoComment());
 				sdfWriter.writeMol(cmpdRegMolecule);
@@ -601,7 +615,7 @@ public String getStandardizationDryRunReport()
 			throws StandardizerException, CmpdRegMolFormatException, IOException {
 		List<StandardizationDryRunCompound> stndznCompounds = StandardizationDryRunCompound.findStandardizationChanges()
 				.getResultList();
-		
+
 		String json = "[]";
 		if (stndznCompounds.size() > 0) {
 			json = StandardizationDryRunCompound.toJsonArray(stndznCompounds);
@@ -652,9 +666,8 @@ public int restandardizeParentStructures(List<Long> parentIds)
 		Session session = Parent.entityManager().unwrap(Session.class);
 		Long startTime = new Date().getTime();
 		Long currentTime = new Date().getTime();
-		
-		List<List<Long>> parentIdGroups = SimpleUtil.splitArrayIntoGroups(parentIds, batchSize);
 
+		List<List<Long>> parentIdGroups = SimpleUtil.splitArrayIntoGroups(parentIds, batchSize);
 
 		// Do a bulk standardization
 		for (List<Long> pIdGroup : parentIdGroups) {
@@ -663,13 +676,13 @@ public int restandardizeParentStructures(List<Long> parentIds)
 			// Create standardization hashmap
 			HashMap<String, String> parentIdsToStructures = new HashMap<String, String>();
 			HashMap<Long, Parent> parents = new HashMap<Long, Parent>();
-			for(Long parentId : pIdGroup) {
+			for (Long parentId : pIdGroup) {
 				parent = Parent.findParent(parentId);
 				parents.put(parentId, parent);
 
 				// Get the as drawn structure
 				String asDrawnStruct = Lot.getOriginallyDrawnAsStructure(parent);
-				if(asDrawnStruct == null) {
+				if (asDrawnStruct == null) {
 					logger.warn("Parent " + parentId + " has no as drawn structure");
 					parentIdsToStructures.put(parentId.toString(parentId), parent.getMolStructure());
 				} else {
@@ -682,7 +695,8 @@ public int restandardizeParentStructures(List<Long> parentIds)
 			logger.info("Starting standardization of " + parentIdsToStructures.size() + " compounds");
 			// Start timer
 			long standardizationStart = new Date().getTime();
-			HashMap<String, CmpdRegMolecule> standardizationResults = chemStructureService.standardizeStructures(parentIdsToStructures);
+			HashMap<String, CmpdRegMolecule> standardizationResults = chemStructureService
+					.standardizeStructures(parentIdsToStructures);
 			long standardizationEnd = new Date().getTime();
 			// Convert the ms time to seconds
 			long standardizationTime = (standardizationEnd - standardizationStart) / 1000;
@@ -690,7 +704,7 @@ public int restandardizeParentStructures(List<Long> parentIds)
 
 			logger.info("Starting save of " + pIdGroup.size() + " parents");
 			long savingStart = new Date().getTime();
-			for(Long parentId : pIdGroup) {
+			for (Long parentId : pIdGroup) {
 
 				parent = parents.get(parentId);
 
@@ -701,9 +715,10 @@ public int restandardizeParentStructures(List<Long> parentIds)
 				// Now we update the parent structure
 				Boolean success = updateStructure(cmpdRegMolecule, parent.getCdId());
 
-				// In the case where we are switching chemistry engines the structure might not exist,
-				// so we need to check for that	and if it does not exist we need to create it
-				if(!success){
+				// In the case where we are switching chemistry engines the structure might not
+				// exist,
+				// so we need to check for that and if it does not exist we need to create it
+				if (!success) {
 					logger.warn("Could not update structure for parent: " + parentId + "  " + parent.getCorpName());
 					logger.info("Assuming the structure did not exist in the first place and saving a new one");
 					int newCdId = chemStructureService.saveStructure(cmpdRegMolecule, StructureType.PARENT, false);
@@ -715,30 +730,29 @@ public int restandardizeParentStructures(List<Long> parentIds)
 				parent.setMolStructure(standardizedMol);
 
 				// Update other properties
-				if(cmpdRegMolecule.getExactMass() != null) {
+				if (cmpdRegMolecule.getExactMass() != null) {
 					DecimalFormat dExactMass = new DecimalFormat("#.######");
 					parent.setExactMass(Double.valueOf(dExactMass.format(cmpdRegMolecule.getExactMass())));
 				} else {
 					parent.setExactMass(null);
 				}
 
-				if(cmpdRegMolecule.getMass() != null) {
-					DecimalFormat dMolWeight = new DecimalFormat("#.###"); 
+				if (cmpdRegMolecule.getMass() != null) {
+					DecimalFormat dMolWeight = new DecimalFormat("#.###");
 					parent.setMolWeight(Double.valueOf(dMolWeight.format(cmpdRegMolecule.getMass())));
 				} else {
 					parent.setMolWeight(null);
 				}
 
-
 				parent.setMolFormula(cmpdRegMolecule.getFormula());
 
 				parent.merge();
 
-
 				p++;
 
 			}
-			// Update lot information, this is much faster than looping through the salt_forms and lots using hibernate
+			// Update lot information, this is much faster than looping through the
+			// salt_forms and lots using hibernate
 			int countLotsUpdated = restandardizeLots(pIdGroup);
 			logger.info("Updated " + countLotsUpdated + " lots");
 
@@ -750,16 +764,17 @@ public int restandardizeParentStructures(List<Long> parentIds)
 			logger.debug("flushing loader session");
 			session.flush();
 			session.clear();
-			
+
 			// Compute your percentage.
 			percent = (float) Math.floor(p * 100f / totalCount);
 			if (percent != previousPercent) {
 				currentTime = new Date().getTime();
 				// Output if different from the last time.
 				logger.info("parent structure restandardization " + percent + "% complete (" + p + " of "
-				+ totalCount + ") average speed (rows/min):"+ (p/((currentTime - startTime) / 60.0 / 1000.0)));
+						+ totalCount + ") average speed (rows/min):"
+						+ (p / ((currentTime - startTime) / 60.0 / 1000.0)));
 				currentTime = new Date().getTime();
-				logger.debug("Time Elapsed:"+ (currentTime - startTime));
+				logger.debug("Time Elapsed:" + (currentTime - startTime));
 			}
 			// Update the percentage.
 			previousPercent = percent;
@@ -858,7 +873,7 @@ public List<StandardizationHistory> getStandardizationHistory() {
 	}
 
 	@Transactional
-	private StandardizationHistory setCurrentStandardizationDryRunStatus(String status)  throws StandardizerException{
+	private StandardizationHistory setCurrentStandardizationDryRunStatus(String status) throws StandardizerException {
 		StandardizationHistory stndznHistory = getMostRecentStandardizationHistory();
 		StandardizerSettingsConfigDTO standardizationSettings = chemStructureService.getStandardizerSettings();
 		if (stndznHistory == null
@@ -892,7 +907,8 @@ public void executeDryRun() throws CmpdRegMolFormatException, IOException, Stand
 
 		stndznHistory.setDryRunComplete(new Date());
 		stndznHistory.setDryRunStatus("complete");
-		stndznHistory.setDryRunStandardizationChangesCount(StandardizationDryRunCompound.getStandardizationChangesCount());
+		stndznHistory
+				.setDryRunStandardizationChangesCount(StandardizationDryRunCompound.getStandardizationChangesCount());
 		stndznHistory.merge();
 	}
 
diff --git a/src/main/java/com/labsynch/labseer/service/StructureImageServiceImpl.java b/src/main/java/com/labsynch/labseer/service/StructureImageServiceImpl.java
index 57b48b4a1..69202f3e3 100755
--- a/src/main/java/com/labsynch/labseer/service/StructureImageServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/StructureImageServiceImpl.java
@@ -16,7 +16,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-
 @Service
 public class StructureImageServiceImpl implements StructureImageService {
 
@@ -28,17 +27,16 @@ public class StructureImageServiceImpl implements StructureImageService {
 	@Autowired
 	CmpdRegSDFWriterFactory cmpdRegSDFWriterFactory;
 
-
 	@Override
 	public byte[] convertMolToImage(String molStructure, Integer hSize, Integer wSize, String format) {
 
-		if (format == null){
+		if (format == null) {
 			format = "png";
 		}
-		if (hSize == null){
+		if (hSize == null) {
 			hSize = 200;
 		}
-		if (wSize == null){
+		if (wSize == null) {
 			wSize = 200;
 		}
 
@@ -59,12 +57,11 @@ public byte[] convertMolToImage(String molStructure, Integer hSize, Integer wSiz
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
-		} //just defaults
+		} // just defaults
 
 		return d4;
 	}
 
-
 	@Override
 	public byte[] displayImage(String molStructure) {
 
@@ -84,19 +81,20 @@ public byte[] displayImage(String molStructure) {
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
-		} //just defaults
+		} // just defaults
 
 		return d4;
 	}
 
 	@Override
-	public String convertMolfilesToSDFile(String molfileJsonArray){
+	public String convertMolfilesToSDFile(String molfileJsonArray) {
 
-		Collection<SearchCompoundReturnDTO> compounds = SearchCompoundReturnDTO.fromJsonArrayToSearchCompoes(molfileJsonArray);
+		Collection<SearchCompoundReturnDTO> compounds = SearchCompoundReturnDTO
+				.fromJsonArrayToSearchCompoes(molfileJsonArray);
 		CmpdRegSDFWriter molExporter = null;
 		try {
 			molExporter = cmpdRegSDFWriterFactory.getCmpdRegSDFBufferWriter();
-		}catch (IllegalArgumentException e1) {
+		} catch (IllegalArgumentException e1) {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
 		} catch (IOException e) {
@@ -104,8 +102,7 @@ public String convertMolfilesToSDFile(String molfileJsonArray){
 			e.printStackTrace();
 		}
 
-
-		for (SearchCompoundReturnDTO compound : compounds){
+		for (SearchCompoundReturnDTO compound : compounds) {
 			logger.debug("compound: " + compound.getCorpName());
 			try {
 				CmpdRegMolecule mol = cmpdRegMoleculeFactory.getCmpdRegMolecule(compound.getMolStructure());
@@ -136,7 +133,4 @@ public String convertMolfilesToSDFile(String molfileJsonArray){
 
 	}
 
-
-
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/StructureService.java b/src/main/java/com/labsynch/labseer/service/StructureService.java
index 6487abdd4..d89868cc1 100644
--- a/src/main/java/com/labsynch/labseer/service/StructureService.java
+++ b/src/main/java/com/labsynch/labseer/service/StructureService.java
@@ -14,7 +14,8 @@
 @Service
 public interface StructureService {
 
-	byte[] renderMolStructure(String molStructure, Integer hSize, Integer wSize, String format) throws IOException, CDKException;
+	byte[] renderMolStructure(String molStructure, Integer hSize, Integer wSize, String format)
+			throws IOException, CDKException;
 
 	MolPropertiesDTO calculateMoleculeProperties(String molStructure) throws IOException, CDKException;
 
@@ -28,9 +29,11 @@ byte[] renderStructureByCodeName(String codeName, Integer height,
 	Collection<ChemStructure> searchStructures(String queryMol, SearchType searchType,
 			Integer maxResults, Float similarity);
 
-	Collection<String> searchStructuresCodes(String queryMol, SearchType searchType, Integer maxResults, Float similarity);
+	Collection<String> searchStructuresCodes(String queryMol, SearchType searchType, Integer maxResults,
+			Float similarity);
 
-	Collection<ChemStructure> searchStructuresByTypeKind(String queryMol, String lsType, String lsKind, SearchType searchType,
+	Collection<ChemStructure> searchStructuresByTypeKind(String queryMol, String lsType, String lsKind,
+			SearchType searchType,
 			Integer maxResults, Float similarity);
 
 	String renderMolStructureBase64(String molStructure, Integer hSize, Integer wSize, String format)
diff --git a/src/main/java/com/labsynch/labseer/service/StructureServiceImpl.java b/src/main/java/com/labsynch/labseer/service/StructureServiceImpl.java
index 39f02f396..4ede1c3f6 100644
--- a/src/main/java/com/labsynch/labseer/service/StructureServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/StructureServiceImpl.java
@@ -1,6 +1,5 @@
 package com.labsynch.labseer.service;
 
-
 import java.awt.Image;
 import java.awt.image.RenderedImage;
 import java.io.ByteArrayOutputStream;
@@ -49,15 +48,19 @@ public class StructureServiceImpl implements StructureService {
 
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
-	
+
 	@Autowired
 	private AutoLabelService autoLabelService;
 
 	@Override
-	public byte[] renderMolStructure(String molStructure, Integer hSize, Integer wSize, String format) throws IOException, CDKException{
-		if (molStructure == null || molStructure.equalsIgnoreCase("")) throw new IllegalArgumentException("The molStructure argument is required");
-		if (format == null || format.equalsIgnoreCase("") || !(format.equalsIgnoreCase("jpg") || format.equalsIgnoreCase("png"))) throw new IllegalArgumentException("The accepted formats are jpg or png");
-		
+	public byte[] renderMolStructure(String molStructure, Integer hSize, Integer wSize, String format)
+			throws IOException, CDKException {
+		if (molStructure == null || molStructure.equalsIgnoreCase(""))
+			throw new IllegalArgumentException("The molStructure argument is required");
+		if (format == null || format.equalsIgnoreCase("")
+				|| !(format.equalsIgnoreCase("jpg") || format.equalsIgnoreCase("png")))
+			throw new IllegalArgumentException("The accepted formats are jpg or png");
+
 		int WIDTH = hSize;
 		int HEIGHT = wSize;
 		IAtomContainer molecule = readMolStructure(molStructure);
@@ -65,39 +68,40 @@ public byte[] renderMolStructure(String molStructure, Integer hSize, Integer wSi
 		Depiction depiction = sdg.depict(molecule);
 		Image image = depiction.toImg();
 
-		ByteArrayOutputStream baos=new ByteArrayOutputStream();
-		ImageIO.write((RenderedImage) image, format, baos );
+		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+		ImageIO.write((RenderedImage) image, format, baos);
 		byte[] imageInByte = baos.toByteArray();
 
 		return imageInByte;
 	}
-	
+
 	@Override
-	public String renderMolStructureBase64(String molStructure, Integer hSize, Integer wSize, String format) throws IOException, CDKException{
-		if (molStructure == null || molStructure.equalsIgnoreCase("")) throw new IllegalArgumentException("The molStructure argument is required");
-//		if (format == null || format.equalsIgnoreCase("") || !(format.equalsIgnoreCase("jpg") || format.equalsIgnoreCase("png"))) throw new IllegalArgumentException("The accepted formats are jpg or png");
-		
+	public String renderMolStructureBase64(String molStructure, Integer hSize, Integer wSize, String format)
+			throws IOException, CDKException {
+		if (molStructure == null || molStructure.equalsIgnoreCase(""))
+			throw new IllegalArgumentException("The molStructure argument is required");
+		// if (format == null || format.equalsIgnoreCase("") ||
+		// !(format.equalsIgnoreCase("jpg") || format.equalsIgnoreCase("png"))) throw
+		// new IllegalArgumentException("The accepted formats are jpg or png");
+
 		int WIDTH = hSize;
 		int HEIGHT = wSize;
 		IAtomContainer molecule = readMolStructure(molStructure);
 		DepictionGenerator sdg = new DepictionGenerator().withSize(WIDTH, HEIGHT).withFillToFit();
 		Depiction depiction = sdg.depict(molecule);
 		Image image = depiction.toImg();
-		
+
 		ByteArrayOutputStream os = new ByteArrayOutputStream();
 		String result = null;
-		  try
-		  {
-			  OutputStream b64 = new Base64OutputStream(os);
-			  ImageIO.write((RenderedImage) image, "png", b64);
-			  result = os.toString("UTF-8");
-			  b64.close();
-			  os.close();
-		  }
-		  catch (final IOException ioe)
-		  {
-		    throw new RuntimeException(ioe);
-		  }
+		try {
+			OutputStream b64 = new Base64OutputStream(os);
+			ImageIO.write((RenderedImage) image, "png", b64);
+			result = os.toString("UTF-8");
+			b64.close();
+			os.close();
+		} catch (final IOException ioe) {
+			throw new RuntimeException(ioe);
+		}
 
 		return result;
 	}
@@ -105,27 +109,30 @@ public String renderMolStructureBase64(String molStructure, Integer hSize, Integ
 	@Override
 	public MolPropertiesDTO calculateMoleculeProperties(String molStructure)
 			throws IOException, CDKException {
-		if (molStructure == null || molStructure.equalsIgnoreCase("")) throw new IllegalArgumentException("The molStructure argument is required");
+		if (molStructure == null || molStructure.equalsIgnoreCase(""))
+			throw new IllegalArgumentException("The molStructure argument is required");
 		IAtomContainer molecule = readMolStructure(molStructure);
-		
+
 		MolPropertiesDTO result = new MolPropertiesDTO();
 		result.setMolStructure(molStructure);
 		result.setMolWeight(AtomContainerManipulator.getNaturalExactMass(molecule));
-		result.setMolFormula(MolecularFormulaManipulator.getString(MolecularFormulaManipulator.getMolecularFormula(molecule)));
-        result.setSmiles(SmilesGenerator.unique().create(molecule));
+		result.setMolFormula(
+				MolecularFormulaManipulator.getString(MolecularFormulaManipulator.getMolecularFormula(molecule)));
+		result.setSmiles(SmilesGenerator.unique().create(molecule));
 		return result;
 	}
 
 	@Override
-	public ChemStructure saveStructure(ChemStructure structure) throws IOException, CDKException{
+	public ChemStructure saveStructure(ChemStructure structure) throws IOException, CDKException {
 		logger.debug(structure.toJson());
 		ChemStructure newStructure = new ChemStructure(structure);
 		logger.debug(newStructure.toJson());
-		if (structure.getCodeName() == null){
+		if (structure.getCodeName() == null) {
 			String thingTypeAndKind = "structure_chemical";
 			String labelTypeAndKind = "id_codeName";
 			Long numberOfLabels = 1L;
-			List<AutoLabelDTO> labels = autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels );
+			List<AutoLabelDTO> labels = autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind,
+					numberOfLabels);
 			newStructure.setCodeName(labels.get(0).getAutoLabel());
 		}
 		newStructure.persist();
@@ -137,43 +144,43 @@ public ChemStructure updateStructure(ChemStructure structure) {
 		ChemStructure updatedStructure = ChemStructure.update(structure);
 		return updatedStructure;
 	}
-	
-	private IAtomContainer readMolStructure(String molStructure) throws IOException, CDKException{
-		MDLV2000Reader mdlReader = new MDLV2000Reader(new StringReader (molStructure));
+
+	private IAtomContainer readMolStructure(String molStructure) throws IOException, CDKException {
+		MDLV2000Reader mdlReader = new MDLV2000Reader(new StringReader(molStructure));
 		IAtomContainer molecule = SilentChemObjectBuilder.getInstance().newInstance(IAtomContainer.class);
 		molecule = mdlReader.read(molecule);
 		mdlReader.close();
 		return molecule;
 	}
-	
+
 	@Override
-	public String convertSmilesToMol(String smiles) throws Exception{
-		SmilesParser smilesParser  = new SmilesParser(SilentChemObjectBuilder.getInstance());
-	    IAtomContainer molecule   = smilesParser.parseSmiles(smiles);
-	    StructureDiagramGenerator sdg = new StructureDiagramGenerator();
-	    sdg.setMolecule(molecule);
-	    sdg.generateCoordinates();
-	    IAtomContainer cleanedMolecule = sdg.getMolecule();
-	    StringWriter sw = new StringWriter();
-	    MDLV2000Writer molWriter = new MDLV2000Writer(sw);
-	    molWriter.writeMolecule(cleanedMolecule);
-	    String molStructure = sw.getBuffer().toString();
-	    molWriter.close();
+	public String convertSmilesToMol(String smiles) throws Exception {
+		SmilesParser smilesParser = new SmilesParser(SilentChemObjectBuilder.getInstance());
+		IAtomContainer molecule = smilesParser.parseSmiles(smiles);
+		StructureDiagramGenerator sdg = new StructureDiagramGenerator();
+		sdg.setMolecule(molecule);
+		sdg.generateCoordinates();
+		IAtomContainer cleanedMolecule = sdg.getMolecule();
+		StringWriter sw = new StringWriter();
+		MDLV2000Writer molWriter = new MDLV2000Writer(sw);
+		molWriter.writeMolecule(cleanedMolecule);
+		String molStructure = sw.getBuffer().toString();
+		molWriter.close();
 		return molStructure;
 	}
-	
+
 	@Override
-	public String cleanMolStructure(String molStructure) throws Exception{
-	    IAtomContainer molecule = readMolStructure(molStructure);
-	    StructureDiagramGenerator sdg = new StructureDiagramGenerator();
-	    sdg.setMolecule(molecule);
-	    sdg.generateCoordinates();
-	    IAtomContainer cleanedMolecule = sdg.getMolecule();
-	    StringWriter sw = new StringWriter();
-	    MDLV2000Writer molWriter = new MDLV2000Writer(sw);
-	    molWriter.writeMolecule(cleanedMolecule);
-	    String cleanedMolStructure = sw.getBuffer().toString();
-	    molWriter.close();
+	public String cleanMolStructure(String molStructure) throws Exception {
+		IAtomContainer molecule = readMolStructure(molStructure);
+		StructureDiagramGenerator sdg = new StructureDiagramGenerator();
+		sdg.setMolecule(molecule);
+		sdg.generateCoordinates();
+		IAtomContainer cleanedMolecule = sdg.getMolecule();
+		StringWriter sw = new StringWriter();
+		MDLV2000Writer molWriter = new MDLV2000Writer(sw);
+		molWriter.writeMolecule(cleanedMolecule);
+		String cleanedMolStructure = sw.getBuffer().toString();
+		molWriter.close();
 		return cleanedMolStructure;
 	}
 
@@ -185,26 +192,29 @@ public byte[] renderStructureByCodeName(String codeName, Integer height,
 	}
 
 	@Override
-	public Collection<ChemStructure> searchStructuresByTypeKind(String queryMol, String lsType, String lsKind, SearchType searchType, Integer maxResults, Float similarity){
+	public Collection<ChemStructure> searchStructuresByTypeKind(String queryMol, String lsType, String lsKind,
+			SearchType searchType, Integer maxResults, Float similarity) {
 		String chemistryPackage = propertiesUtilService.getChemistryPackage();
-		if (chemistryPackage == null) chemistryPackage = "rdkit";
+		if (chemistryPackage == null)
+			chemistryPackage = "rdkit";
 		Collection<ChemStructure> searchResults = new HashSet<ChemStructure>();
-		if (chemistryPackage.equalsIgnoreCase("rdkit")){
-			if (searchType == SearchType.SUBSTRUCTURE){
+		if (chemistryPackage.equalsIgnoreCase("rdkit")) {
+			if (searchType == SearchType.SUBSTRUCTURE) {
 				searchResults = rdkitSubstructureSearch(queryMol, maxResults);
-			}else if (searchType == SearchType.SIMILARITY){
+			} else if (searchType == SearchType.SIMILARITY) {
 				searchResults = rdkitSimilaritySearch(queryMol, similarity, maxResults);
-			}else if (searchType == SearchType.EXACT){
+			} else if (searchType == SearchType.EXACT) {
 				searchResults = rdkitExactSearch(queryMol, lsType, lsKind, maxResults);
 			}
-		}else{
-			logger.error("Configured chemistry package not set up!! "+chemistryPackage);
+		} else {
+			logger.error("Configured chemistry package not set up!! " + chemistryPackage);
 		}
 		return searchResults;
 	}
-	
-	private Collection<ChemStructure> rdkitExactSearch(String queryMol, String lsType, String lsKind, Integer maxResults) {
-		if (lsType == null && lsKind == null){
+
+	private Collection<ChemStructure> rdkitExactSearch(String queryMol, String lsType, String lsKind,
+			Integer maxResults) {
+		if (lsType == null && lsKind == null) {
 			return (rdkitExactSearchNoTypeKind(queryMol, maxResults));
 		} else {
 			String queryString = "SELECT s.* FROM chem_structure s WHERE rdkmol @= mol_from_ctab( CAST( :queryMol AS cstring)) AND ls_type = :lsType AND ls_kind = :lsKind";
@@ -213,48 +223,54 @@ private Collection<ChemStructure> rdkitExactSearch(String queryMol, String lsTyp
 			q.setParameter("queryMol", queryMol);
 			q.setParameter("lsType", lsType);
 			q.setParameter("lsKind", lsKind);
-			if (maxResults != null) q.setMaxResults(maxResults);
+			if (maxResults != null)
+				q.setMaxResults(maxResults);
 			return q.getResultList();
 		}
 	}
-	
+
 	private Collection<ChemStructure> rdkitExactSearchNoTypeKind(String queryMol, Integer maxResults) {
 		String queryString = "SELECT s.* FROM chem_structure s WHERE rdkmol @= mol_from_ctab( CAST( :queryMol AS cstring))";
 		EntityManager em = ChemStructure.entityManager();
 		Query q = em.createNativeQuery(queryString, ChemStructure.class);
 		q.setParameter("queryMol", queryMol);
-		if (maxResults != null) q.setMaxResults(maxResults);
+		if (maxResults != null)
+			q.setMaxResults(maxResults);
 		return q.getResultList();
 	}
 
 	@Override
-	public Collection<ChemStructure> searchStructures(String queryMol, SearchType searchType, Integer maxResults, Float similarity){
+	public Collection<ChemStructure> searchStructures(String queryMol, SearchType searchType, Integer maxResults,
+			Float similarity) {
 		String chemistryPackage = propertiesUtilService.getChemistryPackage();
-		if (chemistryPackage == null) chemistryPackage = "rdkit";
+		if (chemistryPackage == null)
+			chemistryPackage = "rdkit";
 		Collection<ChemStructure> searchResults = new HashSet<ChemStructure>();
-		if (chemistryPackage.equalsIgnoreCase("rdkit")){
-			if (searchType == SearchType.SUBSTRUCTURE){
+		if (chemistryPackage.equalsIgnoreCase("rdkit")) {
+			if (searchType == SearchType.SUBSTRUCTURE) {
 				searchResults = rdkitSubstructureSearch(queryMol, maxResults);
-			}else if (searchType == SearchType.SIMILARITY){
+			} else if (searchType == SearchType.SIMILARITY) {
 				searchResults = rdkitSimilaritySearch(queryMol, similarity, maxResults);
-			}else if (searchType == SearchType.EXACT){
+			} else if (searchType == SearchType.EXACT) {
 				searchResults = rdkitExactSearch(queryMol, maxResults);
 			}
-		}else{
-			logger.error("Configured chemistry package not set up!! "+chemistryPackage);
+		} else {
+			logger.error("Configured chemistry package not set up!! " + chemistryPackage);
 		}
 		return searchResults;
 	}
-	
+
 	@Override
-	public Collection<String> searchStructuresCodes(String queryMol, SearchType searchType, Integer maxResults, Float similarity){
+	public Collection<String> searchStructuresCodes(String queryMol, SearchType searchType, Integer maxResults,
+			Float similarity) {
 		String chemistryPackage = propertiesUtilService.getChemistryPackage();
-		if (chemistryPackage == null) chemistryPackage = "rdkit";
+		if (chemistryPackage == null)
+			chemistryPackage = "rdkit";
 		Collection<String> searchResults = new HashSet<String>();
-		if (chemistryPackage.equalsIgnoreCase("rdkit")){
+		if (chemistryPackage.equalsIgnoreCase("rdkit")) {
 			searchResults = rdkitSubstructureSearchCodes(queryMol, maxResults);
-		}else{
-			logger.error("Configured chemistry package not set up!! "+chemistryPackage);
+		} else {
+			logger.error("Configured chemistry package not set up!! " + chemistryPackage);
 		}
 		return searchResults;
 	}
@@ -265,23 +281,25 @@ private Collection<ChemStructure> rdkitExactSearch(String queryMol,
 		EntityManager em = ChemStructure.entityManager();
 		Query q = em.createNativeQuery(queryString, ChemStructure.class);
 		q.setParameter("queryMol", queryMol);
-		if (maxResults != null) q.setMaxResults(maxResults);
+		if (maxResults != null)
+			q.setMaxResults(maxResults);
 		return q.getResultList();
 	}
 
 	private Collection<ChemStructure> rdkitSimilaritySearch(String queryMol,
 			Float similarity, Integer maxResults) {
 		EntityManager em = ChemStructure.entityManager();
-		if (similarity != null){
-			String similarityQueryString = "set rdkit.tanimoto_threshold = "+similarity.toString();
+		if (similarity != null) {
+			String similarityQueryString = "set rdkit.tanimoto_threshold = " + similarity.toString();
 			Query similarityQuery = em.createNativeQuery(similarityQueryString);
 			similarityQuery.executeUpdate();
-			logger.debug("set tanimoto threshold to "+similarity.toString());
+			logger.debug("set tanimoto threshold to " + similarity.toString());
 		}
 		String queryString = "SELECT s.* FROM chem_structure s JOIN get_mfp2_neighbors_mol(mol_from_ctab( CAST( :queryMol AS cstring))) similarity ON s.id = similarity.id";
 		Query q = em.createNativeQuery(queryString, ChemStructure.class);
 		q.setParameter("queryMol", queryMol);
-		if (maxResults != null) q.setMaxResults(maxResults);
+		if (maxResults != null)
+			q.setMaxResults(maxResults);
 		return q.getResultList();
 	}
 
@@ -292,7 +310,8 @@ private Collection<ChemStructure> rdkitSubstructureSearch(String queryMol,
 		EntityManager em = ChemStructure.entityManager();
 		Query q = em.createNativeQuery(queryString, ChemStructure.class);
 		q.setParameter("queryMol", queryMol);
-		if (maxResults != null) q.setMaxResults(maxResults);
+		if (maxResults != null)
+			q.setMaxResults(maxResults);
 		return q.getResultList();
 	}
 
@@ -301,18 +320,20 @@ private Collection<String> rdkitSubstructureSearchCodes(String queryMol, Integer
 		EntityManager em = ChemStructure.entityManager();
 		Query q = em.createNativeQuery(queryString);
 		q.setParameter("queryMol", queryMol);
-		if (maxResults != null) q.setMaxResults(maxResults);
+		if (maxResults != null)
+			q.setMaxResults(maxResults);
 		return q.getResultList();
 	}
-	
+
 	private Collection<ChemStructure> substructureSearchInLsThingList(String queryMol, List<Long> thingIdList,
 			Integer maxResults) {
 		String queryString = "SELECT s.* FROM chem_structure s WHERE rdkmol @> qmol_from_ctab( CAST( :queryMol AS cstring))";
 		EntityManager em = ChemStructure.entityManager();
 		Query q = em.createNativeQuery(queryString, ChemStructure.class);
 		q.setParameter("queryMol", queryMol);
-		if (maxResults != null) q.setMaxResults(maxResults);
+		if (maxResults != null)
+			q.setMaxResults(maxResults);
 		return q.getResultList();
 	}
-	
-	}
+
+}
diff --git a/src/main/java/com/labsynch/labseer/service/SubjectService.java b/src/main/java/com/labsynch/labseer/service/SubjectService.java
index c7ef13619..ad4d6815f 100755
--- a/src/main/java/com/labsynch/labseer/service/SubjectService.java
+++ b/src/main/java/com/labsynch/labseer/service/SubjectService.java
@@ -25,32 +25,48 @@
 public interface SubjectService {
 
 	SubjectDTO getSubject(Subject subject);
-	Set <SubjectDTO> getSubjects(Set<Subject> subjects);
+
+	Set<SubjectDTO> getSubjects(Set<Subject> subjects);
+
 	Set<SubjectDTO> getSubjectsWithStateTypeAndKind(Collection<Subject> subjects,
 			String stateTypeKind);
+
 	Set<Subject> ignoreAllSubjectStates(Set<Subject> subjects);
+
 	Subject updateSubject(Subject subject);
+
 	void saveSubjects(TreatmentGroup treatmentGroup, Set<Subject> subjects, Date recordedDate);
+
 	Subject saveSubject(Set<TreatmentGroup> treatmentGroups, Subject subject, Date recordedDate);
+
 	Subject saveSubject(Subject subject);
-	
-	HashMap<String, TempThingDTO> createSubjectsFromCSV(String subjectFilePath, HashMap<String, TempThingDTO> treatmentGroupMap) throws IOException;
+
+	HashMap<String, TempThingDTO> createSubjectsFromCSV(String subjectFilePath,
+			HashMap<String, TempThingDTO> treatmentGroupMap) throws IOException;
+
 	Collection<SubjectCodeNameDTO> getSubjectsByCodeNames(List<String> codeNames);
+
 	HashMap<String, TempThingDTO> createOnlySubjectsFromCSV(String subjectFilePath,
 			List<Long> treatmentGroupIds) throws Exception;
+
 	Collection<ContainerSubjectsDTO> getSubjectsByContainerAndInteraction(
 			Collection<ContainerSubjectsDTO> requests);
+
 	Collection<Long> searchSubjectIdsByQueryDTO(SubjectSearchRequest query) throws Exception;
+
 	Collection<Subject> getSubjectsByIds(Collection<Long> subjectIds);
+
 	boolean setSubjectValuesByPath(Subject subject, ValueQueryDTO pathDTO, String modifiedBy, Long lsTransaction);
+
 	Collection<SubjectCodeDTO> getExperimentCodes(
 			Collection<SubjectCodeDTO> subjectCodeDTOs);
+
 	Map<String, List<Long>> searchSubjectIdsByMultiContainerQueryDTO(
 			MultiContainerSubjectSearchRequest query) throws Exception;
+
 	Collection<ContainerSubjectsDTO> getContainerSubjectsByIds(
 			Map<String, List<Long>> containerCodeSubjectIds);
+
 	void deleteSubjectLeaveStub(Subject subject, Long lsTransaction);
 
-	
-	
 }
diff --git a/src/main/java/com/labsynch/labseer/service/SubjectServiceImpl.java b/src/main/java/com/labsynch/labseer/service/SubjectServiceImpl.java
index 013dae498..f8e8b8ad3 100755
--- a/src/main/java/com/labsynch/labseer/service/SubjectServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/SubjectServiceImpl.java
@@ -80,19 +80,20 @@ public class SubjectServiceImpl implements SubjectService {
 
 	@Override
 	public Set<Subject> ignoreAllSubjectStates(Set<Subject> subjects) {
-		//mark subject and all states and values as ignore 
+		// mark subject and all states and values as ignore
 		int batchSize = propertiesUtilService.getBatchSize();
 		int i = 0;
 		int j = 0;
 		Set<Subject> subjectSet = new HashSet<Subject>();
-		for (Subject subject : subjects){
-			Subject subj = Subject.findSubject(subject.getId());			
-			for (SubjectState subjectState : SubjectState.findSubjectStatesBySubject(subj).getResultList()){
+		for (Subject subject : subjects) {
+			Subject subj = Subject.findSubject(subject.getId());
+			for (SubjectState subjectState : SubjectState.findSubjectStatesBySubject(subj).getResultList()) {
 				subjectState.setIgnored(true);
-				for(SubjectValue subjectValue : SubjectValue.findSubjectValuesByLsState(subjectState).getResultList()){
+				for (SubjectValue subjectValue : SubjectValue.findSubjectValuesByLsState(subjectState)
+						.getResultList()) {
 					subjectValue.setIgnored(true);
 					subjectValue.merge();
-					if ( i % batchSize == 0 ) { 
+					if (i % batchSize == 0) {
 						subjectValue.flush();
 						subjectValue.clear();
 					}
@@ -100,7 +101,7 @@ public Set<Subject> ignoreAllSubjectStates(Set<Subject> subjects) {
 				}
 				subjectState.setIgnored(true);
 				subjectState.merge();
-				if ( j % batchSize == 0 ) { 
+				if (j % batchSize == 0) {
 					subjectState.flush();
 					subjectState.clear();
 				}
@@ -109,17 +110,17 @@ public Set<Subject> ignoreAllSubjectStates(Set<Subject> subjects) {
 			subjectSet.add(Subject.findSubject(subject.getId()));
 		}
 
-		return(subjectSet);
+		return (subjectSet);
 
 	}
 
 	@Override
 	public SubjectDTO getSubject(Subject subject) {
-		Subject subj = Subject.findSubject(subject.getId());			
+		Subject subj = Subject.findSubject(subject.getId());
 		SubjectDTO subjectDTO = new SubjectDTO(subj);
 		List<SubjectLabel> subjectLabels = SubjectLabel.findSubjectLabelsBySubject(subj).getResultList();
 		Set<SubjectLabelDTO> subjectLabelDTOs = new HashSet<SubjectLabelDTO>();
-		for (SubjectLabel subjectLabel : subjectLabels){
+		for (SubjectLabel subjectLabel : subjectLabels) {
 			SubjectLabelDTO subjectLabelDTO = new SubjectLabelDTO(subjectLabel);
 			subjectLabelDTOs.add(subjectLabelDTO);
 		}
@@ -127,9 +128,10 @@ public SubjectDTO getSubject(Subject subject) {
 
 		List<SubjectState> subjectStates = SubjectState.findSubjectStatesBySubject(subj).getResultList();
 		Set<SubjectStateDTO> subjectStateDTOs = new HashSet<SubjectStateDTO>();
-		for (SubjectState ss:subjectStates ){
+		for (SubjectState ss : subjectStates) {
 			SubjectStateDTO ssDTO = new SubjectStateDTO(ss);
-			Set<SubjectValue> subjectValues = new HashSet<SubjectValue>(SubjectValue.findSubjectValuesByLsState(ss).getResultList());
+			Set<SubjectValue> subjectValues = new HashSet<SubjectValue>(
+					SubjectValue.findSubjectValuesByLsState(ss).getResultList());
 			ssDTO.setSubjectValues(subjectValues);
 			subjectStateDTOs.add(ssDTO);
 		}
@@ -142,12 +144,12 @@ public SubjectDTO getSubject(Subject subject) {
 	public Set<SubjectDTO> getSubjects(Set<Subject> subjects) {
 		Set<SubjectDTO> subjectListDTO = new HashSet<SubjectDTO>();
 
-		for (Subject subject : subjects){
-			Subject subj = Subject.findSubject(subject.getId());			
+		for (Subject subject : subjects) {
+			Subject subj = Subject.findSubject(subject.getId());
 			SubjectDTO subjectDTO = new SubjectDTO(subj);
 			List<SubjectLabel> subjectLabels = SubjectLabel.findSubjectLabelsBySubject(subj).getResultList();
 			Set<SubjectLabelDTO> subjectLabelDTOs = new HashSet<SubjectLabelDTO>();
-			for (SubjectLabel subjectLabel : subjectLabels){
+			for (SubjectLabel subjectLabel : subjectLabels) {
 				SubjectLabelDTO subjectLabelDTO = new SubjectLabelDTO(subjectLabel);
 				subjectLabelDTOs.add(subjectLabelDTO);
 			}
@@ -155,66 +157,70 @@ public Set<SubjectDTO> getSubjects(Set<Subject> subjects) {
 
 			List<SubjectState> subjectStates = SubjectState.findSubjectStatesBySubject(subj).getResultList();
 			Set<SubjectStateDTO> subjectStateDTOs = new HashSet<SubjectStateDTO>();
-			for (SubjectState ss:subjectStates ){
+			for (SubjectState ss : subjectStates) {
 				SubjectStateDTO ssDTO = new SubjectStateDTO(ss);
-				Set<SubjectValue> subjectValues = new HashSet<SubjectValue>(SubjectValue.findSubjectValuesByLsState(ss).getResultList());				
+				Set<SubjectValue> subjectValues = new HashSet<SubjectValue>(
+						SubjectValue.findSubjectValuesByLsState(ss).getResultList());
 				ssDTO.setSubjectValues(subjectValues);
 				subjectStateDTOs.add(ssDTO);
 			}
 			subjectDTO.setLsStates(subjectStateDTOs);
-			subjectListDTO.add(subjectDTO);			
+			subjectListDTO.add(subjectDTO);
 		}
 
-		return(subjectListDTO);
+		return (subjectListDTO);
 
 	}
 
 	@Override
 	public Set<SubjectDTO> getSubjectsWithStateTypeAndKind(Collection<Subject> subjects, String stateTypeAndKind) {
 		Set<SubjectDTO> subjectListDTO = new HashSet<SubjectDTO>();
-		for (Subject subject : subjects){
+		for (Subject subject : subjects) {
 			// logger.info("query subject id is: " + subject.getId());
 			Subject subj = Subject.findSubject(subject.getId());
-			if (subj != null){
+			if (subj != null) {
 				SubjectDTO subjectDTO = new SubjectDTO(subj);
 				List<SubjectLabel> subjectLabels = SubjectLabel.findSubjectLabelsBySubject(subj).getResultList();
 				Set<SubjectLabelDTO> subjectLabelDTOs = new HashSet<SubjectLabelDTO>();
-				for (SubjectLabel subjectLabel : subjectLabels){
+				for (SubjectLabel subjectLabel : subjectLabels) {
 					SubjectLabelDTO subjectLabelDTO = new SubjectLabelDTO(subjectLabel);
 					subjectLabelDTOs.add(subjectLabelDTO);
 				}
 				subjectDTO.setLsLabels(subjectLabelDTOs);
 
-				List<SubjectState> subjectStates = SubjectState.findSubjectStatesBySubjectAndLsTypeAndKindEqualsAndIgnoredNot(subj, stateTypeAndKind).getResultList();
+				List<SubjectState> subjectStates = SubjectState
+						.findSubjectStatesBySubjectAndLsTypeAndKindEqualsAndIgnoredNot(subj, stateTypeAndKind)
+						.getResultList();
 				Set<SubjectStateDTO> subjectStateDTOs = new HashSet<SubjectStateDTO>();
-				for (SubjectState ss:subjectStates ){
+				for (SubjectState ss : subjectStates) {
 					SubjectStateDTO ssDTO = new SubjectStateDTO(ss);
-					Set<SubjectValue> subjectValues = new HashSet<SubjectValue>(SubjectValue.findSubjectValuesByLsState(ss).getResultList());
+					Set<SubjectValue> subjectValues = new HashSet<SubjectValue>(
+							SubjectValue.findSubjectValuesByLsState(ss).getResultList());
 					ssDTO.setSubjectValues(subjectValues);
 					subjectStateDTOs.add(ssDTO);
 				}
 				subjectDTO.setLsStates(subjectStateDTOs);
-				subjectListDTO.add(subjectDTO);			
+				subjectListDTO.add(subjectDTO);
 
 			} else {
-				// logger.error("subject is null!!");				
+				// logger.error("subject is null!!");
 			}
 		}
 
-		return(subjectListDTO);
+		return (subjectListDTO);
 
 	}
 
 	@Override
 	@Transactional
-	public void saveSubjects(TreatmentGroup treatmentGroup, Set<Subject> subjects, Date recordedDate){
+	public void saveSubjects(TreatmentGroup treatmentGroup, Set<Subject> subjects, Date recordedDate) {
 		Set<TreatmentGroup> treatmentGroups = new HashSet<TreatmentGroup>();
 		treatmentGroups.add(treatmentGroup);
 		int j = 0;
 		if (subjects != null && !subjects.isEmpty()) {
 			logger.debug("number of incoming subjects: " + subjects.size());
 			Set<Long> subjectIds = new HashSet<Long>();
-			for (Subject subject : subjects){
+			for (Subject subject : subjects) {
 				subjectIds.add(subject.getId());
 			}
 			for (Long subjectId : subjectIds) {
@@ -234,41 +240,41 @@ public void saveSubjects(TreatmentGroup treatmentGroup, Set<Subject> subjects, D
 
 	@Override
 	@Transactional
-	public Subject saveSubject(Subject subject){
+	public Subject saveSubject(Subject subject) {
 		// logger.debug("incoming meta subject: " + subject.toJson());
 		Date recordedDate = new Date();
 
 		return saveSubject(subject.getTreatmentGroups(), subject, recordedDate);
 	}
 
-
 	@Override
-	public Subject saveSubject(Set<TreatmentGroup> treatmentGroups, Subject subject, Date recordedDate){
+	public Subject saveSubject(Set<TreatmentGroup> treatmentGroups, Subject subject, Date recordedDate) {
 		// logger.debug("incoming meta subject: " + subject.toJson());
 		Subject newSubject = null;
 
-		if (subject.getId() == null){
+		if (subject.getId() == null) {
 			newSubject = new Subject(subject);
-			if (newSubject.getCodeName() == null){
+			if (newSubject.getCodeName() == null) {
 				newSubject.setCodeName(autoLabelService.getSubjectCodeName());
 			}
-			if (newSubject.getRecordedDate() == null){
+			if (newSubject.getRecordedDate() == null) {
 				newSubject.setRecordedDate(recordedDate);
 			}
 
-			for (TreatmentGroup treatmentGroup : treatmentGroups){
+			for (TreatmentGroup treatmentGroup : treatmentGroups) {
 				newSubject.getTreatmentGroups().add(TreatmentGroup.findTreatmentGroup(treatmentGroup.getId()));
 			}
 
-			saveLabels(subject, newSubject, recordedDate );
-			saveStates(subject, newSubject, recordedDate );
+			saveLabels(subject, newSubject, recordedDate);
+			saveStates(subject, newSubject, recordedDate);
 			newSubject.persist();
 
 		} else {
 			logger.debug("this is an existing subject -----------");
 			newSubject = Subject.findSubject(subject.getId());
-			for (TreatmentGroup treatmentGroup : treatmentGroups){
-				// logger.debug("incoming treatment group: ------------ " + treatmentGroup.toJson());
+			for (TreatmentGroup treatmentGroup : treatmentGroups) {
+				// logger.debug("incoming treatment group: ------------ " +
+				// treatmentGroup.toJson());
 				newSubject.getTreatmentGroups().add(TreatmentGroup.findTreatmentGroup(treatmentGroup.getId()));
 			}
 
@@ -278,18 +284,17 @@ public Subject saveSubject(Set<TreatmentGroup> treatmentGroups, Subject subject,
 		return Subject.findSubject(newSubject.getId());
 	}
 
-
 	private void saveStates(Subject subject, Subject newSubject, Date recordedDate) {
-		if (subject.getLsStates() != null){
+		if (subject.getLsStates() != null) {
 			Set<SubjectState> newSubjectStates = new HashSet<SubjectState>();
-			for(SubjectState subjectState : subject.getLsStates()){
+			for (SubjectState subjectState : subject.getLsStates()) {
 				SubjectState newSubjectState = new SubjectState(subjectState);
 				newSubjectState.setSubject(newSubject);
 				newSubjectStates.add(newSubjectState);
-//				newSubjectState.persist();
-				if (subjectState.getLsValues() != null){
+				// newSubjectState.persist();
+				if (subjectState.getLsValues() != null) {
 					Set<SubjectValue> newSubjectValues = new HashSet<SubjectValue>();
-					for (SubjectValue subjectValue : subjectState.getLsValues()){
+					for (SubjectValue subjectValue : subjectState.getLsValues()) {
 						subjectValue.setLsState(newSubjectState);
 						newSubjectValues.add(subjectValue);
 					}
@@ -297,98 +302,105 @@ private void saveStates(Subject subject, Subject newSubject, Date recordedDate)
 				}
 			}
 			newSubject.setLsStates(newSubjectStates);
-		}		
+		}
 	}
 
 	private void saveLabels(Subject subject, Subject newSubject, Date recordedDate) {
 		if (subject.getLsLabels() != null) {
-			for(SubjectLabel subjectLabel : subject.getLsLabels()){
+			for (SubjectLabel subjectLabel : subject.getLsLabels()) {
 				SubjectLabel newSubjectLabel = new SubjectLabel(subjectLabel);
 				newSubjectLabel.setSubject(newSubject);
 				newSubjectLabel.setRecordedDate(recordedDate);
 				newSubjectLabel.setRecordedBy(newSubject.getRecordedBy());
-				newSubjectLabel.persist();	
-			}		
-		}		
+				newSubjectLabel.persist();
+			}
+		}
 	}
 
 	@Override
 	@Transactional
-	public Subject updateSubject(Subject subject){
+	public Subject updateSubject(Subject subject) {
 
 		// logger.debug("incoming meta subject to update: " + subject.toJson());
 		Subject updatedSubject = Subject.update(subject);
 
 		if (subject.getLsLabels() != null) {
-			for(SubjectLabel subjectLabel : subject.getLsLabels()){
-				if (subjectLabel.getId() == null){
+			for (SubjectLabel subjectLabel : subject.getLsLabels()) {
+				if (subjectLabel.getId() == null) {
 					SubjectLabel newSubjectLabel = new SubjectLabel(subjectLabel);
 					newSubjectLabel.setSubject(Subject.findSubject(subject.getId()));
-					newSubjectLabel.persist();						
+					newSubjectLabel.persist();
 				} else {
 					SubjectLabel updatedLabel = SubjectLabel.update(subjectLabel);
 					updatedSubject.getLsLabels().add(updatedLabel);
 				}
-			}		
+			}
 		}
 		updateLsStates(subject, updatedSubject);
 
 		return Subject.findSubject(subject.getId());
 	}
-	
-	public void updateLsStates(Subject jsonSubject, Subject updatedSubject){
-		if(jsonSubject.getLsStates() != null){
-			for(SubjectState subjectState : jsonSubject.getLsStates()){
+
+	public void updateLsStates(Subject jsonSubject, Subject updatedSubject) {
+		if (jsonSubject.getLsStates() != null) {
+			for (SubjectState subjectState : jsonSubject.getLsStates()) {
 				SubjectState updatedSubjectState;
-				if (subjectState.getId() == null){
+				if (subjectState.getId() == null) {
 					updatedSubjectState = new SubjectState(subjectState);
 					updatedSubjectState.setSubject(updatedSubject);
 					updatedSubjectState.persist();
 					updatedSubject.getLsStates().add(updatedSubjectState);
-					if (logger.isDebugEnabled()) logger.debug("persisted new subject state " + updatedSubjectState.getId());
+					if (logger.isDebugEnabled())
+						logger.debug("persisted new subject state " + updatedSubjectState.getId());
 
 				} else {
 					updatedSubjectState = SubjectState.update(subjectState);
 					updatedSubject.getLsStates().add(updatedSubjectState);
 
-					if (logger.isDebugEnabled()) logger.debug("updated subject state " + updatedSubjectState.getId());
+					if (logger.isDebugEnabled())
+						logger.debug("updated subject state " + updatedSubjectState.getId());
 
 				}
-				if (subjectState.getLsValues() != null){
-					for(SubjectValue subjectValue : subjectState.getLsValues()){
-						if (subjectValue.getLsState() == null) subjectValue.setLsState(updatedSubjectState);
+				if (subjectState.getLsValues() != null) {
+					for (SubjectValue subjectValue : subjectState.getLsValues()) {
+						if (subjectValue.getLsState() == null)
+							subjectValue.setLsState(updatedSubjectState);
 						SubjectValue updatedSubjectValue;
-						if (subjectValue.getId() == null){
+						if (subjectValue.getId() == null) {
 							updatedSubjectValue = SubjectValue.create(subjectValue);
 							updatedSubjectValue.setLsState(SubjectState.findSubjectState(updatedSubjectState.getId()));
 							updatedSubjectValue.persist();
 							updatedSubjectState.getLsValues().add(updatedSubjectValue);
 						} else {
 							updatedSubjectValue = SubjectValue.update(subjectValue);
-							if (logger.isDebugEnabled()) logger.debug("updated subject value " + updatedSubjectValue.getId());
+							if (logger.isDebugEnabled())
+								logger.debug("updated subject value " + updatedSubjectValue.getId());
 						}
-						if (logger.isDebugEnabled()) logger.debug("checking subjectValue " + updatedSubjectValue.toJson());
+						if (logger.isDebugEnabled())
+							logger.debug("checking subjectValue " + updatedSubjectValue.toJson());
 
-					}	
+					}
 				} else {
-					if (logger.isDebugEnabled()) logger.debug("No subject values to update");
+					if (logger.isDebugEnabled())
+						logger.debug("No subject values to update");
 				}
 			}
 		}
 	}
-	
+
 	@Override
-	public HashMap<String, TempThingDTO> createOnlySubjectsFromCSV(String subjectFilePath, List<Long> treatmentGroupIds) throws Exception{
+	public HashMap<String, TempThingDTO> createOnlySubjectsFromCSV(String subjectFilePath, List<Long> treatmentGroupIds)
+			throws Exception {
 		HashMap<String, TempThingDTO> treatmentGroupMap = new HashMap<String, TempThingDTO>();
-		for (Long treatmentGroupId : treatmentGroupIds){
+		for (Long treatmentGroupId : treatmentGroupIds) {
 			TempThingDTO treatmentGroupThing = new TempThingDTO();
 			treatmentGroupThing.setId(treatmentGroupId);
 			treatmentGroupMap.put(treatmentGroupId.toString(), treatmentGroupThing);
 		}
-		try{
+		try {
 			HashMap<String, TempThingDTO> resultMap = createSubjectsFromCSV(subjectFilePath, treatmentGroupMap);
 			return resultMap;
-		}catch (Exception e){
+		} catch (Exception e) {
 			logger.error("Caught exception loading subjects from tsv", e);
 			throw e;
 		}
@@ -407,8 +419,8 @@ public HashMap<String, TempThingDTO> createSubjectsFromCSV(
 
 		try {
 			// logger.info("read csv delimited file");
-			InputStream is = new FileInputStream(subjectFilePath);  
-			InputStreamReader isr = new InputStreamReader(is);  
+			InputStream is = new FileInputStream(subjectFilePath);
+			InputStreamReader isr = new InputStreamReader(is);
 			BufferedReader br = new BufferedReader(isr);
 
 			beanReader = new CsvBeanReader(br, CsvPreference.TAB_PREFERENCE);
@@ -416,18 +428,18 @@ public HashMap<String, TempThingDTO> createSubjectsFromCSV(
 
 			List<String> headerList = new ArrayList<String>();
 			int position = 0;
-			for (String head : headerText){
-				// logger.info("header column: " + position + "  " + head);
+			for (String head : headerText) {
+				// logger.info("header column: " + position + " " + head);
 				headerList.add(head);
 				position++;
 			}
 
-			// logger.info("size of header list  " + headerList.size());
+			// logger.info("size of header list " + headerList.size());
 			String[] header = new String[headerList.size()];
 			headerList.toArray(header);
 
-			for (String head : header){
-				// logger.debug("header column array : " + position + "  " + head);
+			for (String head : header) {
+				// logger.debug("header column array : " + position + " " + head);
 				position++;
 			}
 
@@ -440,47 +452,57 @@ public HashMap<String, TempThingDTO> createSubjectsFromCSV(
 
 			long rowIndex = 1;
 			Set<TreatmentGroup> treatmentGroups = new HashSet<TreatmentGroup>();
-			while( (subjectDTO = beanReader.read(FlatThingCsvDTO.class, header, processors)) != null ) {
-				// logger.debug("-------------working on rowIndex: " + rowIndex + "--------------------");
-				// logger.debug(String.format("lineNo=%s, rowNo=%s, bulkData=%s", beanReader.getLineNumber(), beanReader.getRowNumber(), subjectDTO));
-
-				if (subjectDTO.getLsType() == null) subjectDTO.setLsType("default");
-				if (subjectDTO.getLsKind() == null) subjectDTO.setLsKind("default");
-				if (subjectDTO.getTempId() == null) subjectDTO.setTempId(subjectDTO.getId().toString());
+			while ((subjectDTO = beanReader.read(FlatThingCsvDTO.class, header, processors)) != null) {
+				// logger.debug("-------------working on rowIndex: " + rowIndex +
+				// "--------------------");
+				// logger.debug(String.format("lineNo=%s, rowNo=%s, bulkData=%s",
+				// beanReader.getLineNumber(), beanReader.getRowNumber(), subjectDTO));
+
+				if (subjectDTO.getLsType() == null)
+					subjectDTO.setLsType("default");
+				if (subjectDTO.getLsKind() == null)
+					subjectDTO.setLsKind("default");
+				if (subjectDTO.getTempId() == null)
+					subjectDTO.setTempId(subjectDTO.getId().toString());
 
 				subject = getOrCreateSubject(subjectDTO, subjectMap, treatmentGroupMap);
-				if (subject != null){
-					if (subject.getId() == null){
+				if (subject != null) {
+					if (subject.getId() == null) {
 						subject.persist();
 					} else {
 						subject.merge();
 					}
-//					TreatmentGroup treatmentGroup = TreatmentGroup.findTreatmentGroup(treatmentGroupMap.get(subjectDTO.getTempParentId()).getId());
-//					treatmentGroup.getSubjects().add(subject);
-//					treatmentGroups.add(treatmentGroup);
-					// logger.debug("saved the new subject: ID: " + subject.getId() + " codeName" + subject.getCodeName());
+					// TreatmentGroup treatmentGroup =
+					// TreatmentGroup.findTreatmentGroup(treatmentGroupMap.get(subjectDTO.getTempParentId()).getId());
+					// treatmentGroup.getSubjects().add(subject);
+					// treatmentGroups.add(treatmentGroup);
+					// logger.debug("saved the new subject: ID: " + subject.getId() + " codeName" +
+					// subject.getCodeName());
 					// logger.debug("saved the new subject: " + subject.toJson());
 					subjectMap = saveTempSubject(subject, subjectDTO, subjectMap);
 				}
 
-				if (subjectDTO.getStateType() != null && subjectDTO.getStateKind() != null){
-					if (subjectDTO.getTempStateId() == null) subjectDTO.setTempStateId(subjectDTO.getStateId().toString());
-					// logger.debug("subjectDTO.getTempStateId() is " + subjectDTO.getTempStateId());
+				if (subjectDTO.getStateType() != null && subjectDTO.getStateKind() != null) {
+					if (subjectDTO.getTempStateId() == null)
+						subjectDTO.setTempStateId(subjectDTO.getStateId().toString());
+					// logger.debug("subjectDTO.getTempStateId() is " +
+					// subjectDTO.getTempStateId());
 					subjectState = getOrCreateSubjectState(subjectDTO, subjectStateMap, subjectMap);
-					if (subjectState != null){
+					if (subjectState != null) {
 						subjectState.persist();
 						// logger.debug("saved the new subject state: " + subjectState.getId());
 						// logger.debug("saved the new subject state: " + subjectState.toJson());
 						subjectStateMap = saveTempSubjectState(subjectState, subjectDTO, subjectStateMap);
 					}
 
-					if (subjectDTO.getValueType() != null && subjectDTO.getValueKind() != null){
-						if (subjectDTO.getTempValueId() == null) subjectDTO.setTempValueId(Long.toString(rowIndex));
+					if (subjectDTO.getValueType() != null && subjectDTO.getValueKind() != null) {
+						if (subjectDTO.getTempValueId() == null)
+							subjectDTO.setTempValueId(Long.toString(rowIndex));
 						subjectValue = getOrCreateSubjectValue(subjectDTO, subjectValueMap, subjectStateMap);
-						if (subjectValue != null){
+						if (subjectValue != null) {
 							subjectValue.persist();
 							// logger.debug("saved the subject Value: " + subjectValue.toJson());
-							if ( rowIndex % batchSize == 0 ) {
+							if (rowIndex % batchSize == 0) {
 								subjectValue.flush();
 								subjectValue.clear();
 							}
@@ -488,25 +510,27 @@ public HashMap<String, TempThingDTO> createSubjectsFromCSV(
 						}
 					}
 				} else {
-					// logger.debug("---------- not saving a new subject state: " + subjectDTO.getStateType());
+					// logger.debug("---------- not saving a new subject state: " +
+					// subjectDTO.getStateType());
 				}
 
 				rowIndex++;
 			}
-//			Long beforeMerge = new Date().getTime();
-//			// logger.info("Number of TreatmentGroups to merge: "+ treatmentGroups.size());
-//			for (TreatmentGroup treatmentGroup: treatmentGroups) {
-//				// logger.debug("merging treatment group:" + treatmentGroup.getCodeName());
-////				try {
-////					// logger.debug(treatmentGroup.toJson());
-////				} catch (Exception e) {
-////					// logger.debug("Found exception: " + e);
-////				}
-//				treatmentGroup.merge();	
-//			}
-//			Long afterMerge = new Date().getTime();
-//			Long mergeDuration = afterMerge - beforeMerge;
-//			// logger.info("Merging TreatmentGroups took: "+ mergeDuration + " ms");
+			// Long beforeMerge = new Date().getTime();
+			// // logger.info("Number of TreatmentGroups to merge: "+
+			// treatmentGroups.size());
+			// for (TreatmentGroup treatmentGroup: treatmentGroups) {
+			// // logger.debug("merging treatment group:" + treatmentGroup.getCodeName());
+			//// try {
+			//// // logger.debug(treatmentGroup.toJson());
+			//// } catch (Exception e) {
+			//// // logger.debug("Found exception: " + e);
+			//// }
+			// treatmentGroup.merge();
+			// }
+			// Long afterMerge = new Date().getTime();
+			// Long mergeDuration = afterMerge - beforeMerge;
+			// // logger.info("Merging TreatmentGroups took: "+ mergeDuration + " ms");
 
 		} catch (IOException e) {
 			e.printStackTrace();
@@ -527,7 +551,7 @@ private HashMap<String, TempThingDTO> saveTempSubjectValue(
 		tempThingDTO.setTempId(subjectDTO.getTempValueId());
 		subjectValueMap.put(subjectDTO.getTempValueId(), tempThingDTO);
 
-		return subjectValueMap;	
+		return subjectValueMap;
 	}
 
 	private SubjectValue getOrCreateSubjectValue(
@@ -536,16 +560,18 @@ private SubjectValue getOrCreateSubjectValue(
 			HashMap<String, TempThingDTO> subjectStateMap) {
 
 		SubjectValue subjectValue = null;
-		if (!subjectValueMap.containsKey(subjectDTO.getTempValueId())){
-			if (subjectDTO.getValueId() == null){
+		if (!subjectValueMap.containsKey(subjectDTO.getTempValueId())) {
+			if (subjectDTO.getValueId() == null) {
 				subjectValue = new SubjectValue(subjectDTO);
 				// logger.debug("query state: " + subjectDTO.getTempStateId());
-				subjectValue.setLsState(SubjectState.findSubjectState(subjectStateMap.get(subjectDTO.getTempStateId()).getId()));				
+				subjectValue.setLsState(
+						SubjectState.findSubjectState(subjectStateMap.get(subjectDTO.getTempStateId()).getId()));
 			} else {
 				subjectValue = SubjectValue.findSubjectValue(subjectDTO.getValueId());
 			}
 		} else {
-			// logger.debug("skipping the saved subjectValue --------- " + subjectDTO.getValueId());
+			// logger.debug("skipping the saved subjectValue --------- " +
+			// subjectDTO.getValueId());
 		}
 
 		return subjectValue;
@@ -562,7 +588,7 @@ private HashMap<String, TempThingDTO> saveTempSubjectState(
 		// logger.debug("saving the temp state: " + tempThingDTO.getTempId());
 		subjectStateMap.put(subjectDTO.getTempStateId(), tempThingDTO);
 
-		return subjectStateMap;		
+		return subjectStateMap;
 	}
 
 	private SubjectState getOrCreateSubjectState(
@@ -571,16 +597,17 @@ private SubjectState getOrCreateSubjectState(
 			HashMap<String, TempThingDTO> subjectMap) {
 
 		SubjectState subjectState = null;
-		if (!subjectStateMap.containsKey(subjectDTO.getTempStateId())){
-			if (subjectDTO.getStateId() == null){
+		if (!subjectStateMap.containsKey(subjectDTO.getTempStateId())) {
+			if (subjectDTO.getStateId() == null) {
 				subjectState = new SubjectState(subjectDTO);
 				// logger.debug("subjectDTO TempId: " + subjectDTO.getTempId());
-				subjectState.setSubject(Subject.findSubject(subjectMap.get(subjectDTO.getTempId()).getId()));	
+				subjectState.setSubject(Subject.findSubject(subjectMap.get(subjectDTO.getTempId()).getId()));
 			} else {
 				subjectState = SubjectState.findSubjectState(subjectDTO.getStateId());
 			}
 		} else {
-			// logger.debug("skipping the saved subjectState --------- " + subjectDTO.getStateId());
+			// logger.debug("skipping the saved subjectState --------- " +
+			// subjectDTO.getStateId());
 		}
 
 		return subjectState;
@@ -606,11 +633,11 @@ private Subject getOrCreateSubject(
 			HashMap<String, TempThingDTO> treatmentGroupMap) {
 
 		Subject subject = null;
-		if (!subjectMap.containsKey(subjectDTO.getTempId())){
-			if (subjectDTO.getId() == null){
-				if (subjectDTO.getTempParentId() != null && !subjectDTO.getTempParentId().equalsIgnoreCase("null")){
+		if (!subjectMap.containsKey(subjectDTO.getTempId())) {
+			if (subjectDTO.getId() == null) {
+				if (subjectDTO.getTempParentId() != null && !subjectDTO.getTempParentId().equalsIgnoreCase("null")) {
 					subject = new Subject(subjectDTO);
-					if (subject.getCodeName() == null){
+					if (subject.getCodeName() == null) {
 						// logger.debug("incoming subject codeName: " + subjectDTO.getCodeName());
 						String newCodeName = autoLabelService.getSubjectCodeName();
 						// logger.debug("------------------ new codeName: " + newCodeName);
@@ -623,14 +650,16 @@ private Subject getOrCreateSubject(
 				subject = Subject.findSubject(subjectDTO.getId());
 			}
 			Set<TreatmentGroup> treatmentGroups = new HashSet<TreatmentGroup>();
-			treatmentGroups.add(TreatmentGroup.findTreatmentGroup(treatmentGroupMap.get(subjectDTO.getTempParentId()).getId()));
-			if (subject.getTreatmentGroups() == null){
+			treatmentGroups.add(
+					TreatmentGroup.findTreatmentGroup(treatmentGroupMap.get(subjectDTO.getTempParentId()).getId()));
+			if (subject.getTreatmentGroups() == null) {
 				subject.setTreatmentGroups(treatmentGroups);
 			} else {
 				subject.getTreatmentGroups().addAll(treatmentGroups);
-			}			
+			}
 		} else {
-			// logger.debug("skipping the previously saved subject --------- " + subjectDTO.getCodeName());
+			// logger.debug("skipping the previously saved subject --------- " +
+			// subjectDTO.getCodeName());
 		}
 		return subject;
 	}
@@ -638,7 +667,8 @@ private Subject getOrCreateSubject(
 	@Override
 	public Collection<SubjectCodeNameDTO> getSubjectsByCodeNames(
 			List<String> codeNames) {
-		if (codeNames.isEmpty()) return new ArrayList<SubjectCodeNameDTO>();
+		if (codeNames.isEmpty())
+			return new ArrayList<SubjectCodeNameDTO>();
 		EntityManager em = Subject.entityManager();
 		String queryString = "SELECT new com.labsynch.labseer.dto.SubjectCodeNameDTO( "
 				+ "subject.codeName, "
@@ -646,24 +676,25 @@ public Collection<SubjectCodeNameDTO> getSubjectsByCodeNames(
 				+ " FROM Subject subject ";
 		queryString += "where ( subject.ignored <> true ) and ( ";
 		Query q = SimpleUtil.addHqlInClause(em, queryString, "subject.codeName", codeNames);
-		
-//			if (logger.isDebugEnabled()) logger.debug(q.unwrap(org.hibernate.Query.class).getQueryString());
+
+		// if (logger.isDebugEnabled())
+		// logger.debug(q.unwrap(org.hibernate.Query.class).getQueryString());
 		@SuppressWarnings("unchecked")
 		Collection<SubjectCodeNameDTO> results = q.getResultList();
-		//diff request with results to find codeNames that could not be found
+		// diff request with results to find codeNames that could not be found
 		HashSet<String> requestCodeNames = new HashSet<String>();
 		requestCodeNames.addAll(codeNames);
 		HashSet<String> foundCodeNames = new HashSet<String>();
-		for (SubjectCodeNameDTO result : results){
+		for (SubjectCodeNameDTO result : results) {
 			foundCodeNames.add(result.getRequestCodeName());
 		}
 		requestCodeNames.removeAll(foundCodeNames);
-		if (!requestCodeNames.isEmpty()){
-			for (String requestCodeName : requestCodeNames){
+		if (!requestCodeNames.isEmpty()) {
+			for (String requestCodeName : requestCodeNames) {
 				SubjectCodeNameDTO emptyResult = new SubjectCodeNameDTO();
 				emptyResult.setRequestCodeName(requestCodeName);
 				results.add(emptyResult);
-			}		
+			}
 		}
 		return results;
 	}
@@ -671,61 +702,72 @@ public Collection<SubjectCodeNameDTO> getSubjectsByCodeNames(
 	@Transactional
 	@Override
 	public void deleteSubjectLeaveStub(Subject subject, Long lsTransaction) {
-		for (ItxSubjectContainer itx : subject.getContainers()){
+		for (ItxSubjectContainer itx : subject.getContainers()) {
 			itx.logicalDelete();
-			if (lsTransaction != null) itx.setLsTransaction(lsTransaction);
+			if (lsTransaction != null)
+				itx.setLsTransaction(lsTransaction);
 			itx.merge();
 		}
 		EntityManager em = Subject.entityManager();
 		int deletedValueCount = 0;
-		for (SubjectState state : subject.getLsStates()){
+		for (SubjectState state : subject.getLsStates()) {
 			Query valueQuery = em.createQuery("DELETE FROM SubjectValue o WHERE o.lsState = :state ");
 			valueQuery.setParameter("state", state);
 			deletedValueCount += valueQuery.executeUpdate();
 		}
-		logger.info("Deleted "+deletedValueCount+ " subject values.");
+		logger.info("Deleted " + deletedValueCount + " subject values.");
 		Query query = em.createQuery("DELETE FROM SubjectState o WHERE o.subject = :subject ");
 		query.setParameter("subject", subject);
 		int deletedCount = query.executeUpdate();
-		logger.info("Deleted "+deletedCount+ " subject states.");
+		logger.info("Deleted " + deletedCount + " subject states.");
 		subject.logicalDelete();
-		if (lsTransaction != null) subject.setLsTransaction(lsTransaction);
+		if (lsTransaction != null)
+			subject.setLsTransaction(lsTransaction);
 		subject.merge();
 		subject.flush();
 	}
-	
+
 	@Override
-	public Collection<ContainerSubjectsDTO> getSubjectsByContainerAndInteraction(Collection<ContainerSubjectsDTO> requests){
-		for (ContainerSubjectsDTO request : requests){
+	public Collection<ContainerSubjectsDTO> getSubjectsByContainerAndInteraction(
+			Collection<ContainerSubjectsDTO> requests) {
+		for (ContainerSubjectsDTO request : requests) {
 			EntityManager em = Subject.entityManager();
-			if (SimpleUtil.isNumeric(request.getContainerIdOrCodeName())){
+			if (SimpleUtil.isNumeric(request.getContainerIdOrCodeName())) {
 				Long id = Long.valueOf(request.getContainerIdOrCodeName());
 				String queryString = "SELECT subject FROM Subject subject "
 						+ "JOIN subject.containers itx "
 						+ "JOIN itx.container container "
 						+ "WHERE subject.ignored <> true AND itx.ignored <> true AND container.ignored <> true ";
-				if (request.getInteractionType() != null) queryString+= "AND itx.lsType = :itxType ";
-				if (request.getInteractionKind() != null) queryString+= "AND itx.lsKind = :itxKind ";
+				if (request.getInteractionType() != null)
+					queryString += "AND itx.lsType = :itxType ";
+				if (request.getInteractionKind() != null)
+					queryString += "AND itx.lsKind = :itxKind ";
 				queryString += "AND container.id = :id ";
 				TypedQuery<Subject> q = em.createQuery(queryString, Subject.class);
 				q.setParameter("id", id);
-				if (request.getInteractionType() != null) q.setParameter("itxType", request.getInteractionType());
-				if (request.getInteractionKind() != null) q.setParameter("itxKind", request.getInteractionKind());
+				if (request.getInteractionType() != null)
+					q.setParameter("itxType", request.getInteractionType());
+				if (request.getInteractionKind() != null)
+					q.setParameter("itxKind", request.getInteractionKind());
 				Collection<Subject> subjects = q.getResultList();
 				request.setSubjects(subjects);
-			}else{
+			} else {
 				String codeName = request.getContainerIdOrCodeName();
 				String queryString = "SELECT subject FROM Subject subject "
 						+ "JOIN subject.containers itx "
 						+ "JOIN itx.container container "
 						+ "WHERE subject.ignored <> true AND itx.ignored <> true AND container.ignored <> true ";
-				if (request.getInteractionType() != null) queryString+= "AND itx.lsType = :itxType ";
-				if (request.getInteractionKind() != null) queryString+= "AND itx.lsKind = :itxKind ";
+				if (request.getInteractionType() != null)
+					queryString += "AND itx.lsType = :itxType ";
+				if (request.getInteractionKind() != null)
+					queryString += "AND itx.lsKind = :itxKind ";
 				queryString += "AND container.codeName = :codeName ";
 				TypedQuery<Subject> q = em.createQuery(queryString, Subject.class);
 				q.setParameter("codeName", codeName);
-				if (request.getInteractionType() != null) q.setParameter("itxType", request.getInteractionType());
-				if (request.getInteractionKind() != null) q.setParameter("itxKind", request.getInteractionKind());
+				if (request.getInteractionType() != null)
+					q.setParameter("itxType", request.getInteractionType());
+				if (request.getInteractionKind() != null)
+					q.setParameter("itxKind", request.getInteractionKind());
 				Collection<Subject> subjects = q.getResultList();
 				request.setSubjects(subjects);
 			}
@@ -741,28 +783,28 @@ public Collection<Long> searchSubjectIdsByQueryDTO(
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery<Long> criteria = cb.createQuery(Long.class);
 		Root<Subject> subject = criteria.from(Subject.class);
-		
+
 		criteria.select(subject.<Long>get("id"));
 		criteria.distinct(true);
 		Predicate[] predicates = new Predicate[0];
 		List<Predicate> predicateList = new ArrayList<Predicate>();
-		
-		//subject not ignored
+
+		// subject not ignored
 		Predicate subjNotIgn = cb.not(subject.<Boolean>get("ignored"));
 		predicateList.add(subjNotIgn);
-		
-		//subjectType
-		if (query.getSubjectType() != null){
+
+		// subjectType
+		if (query.getSubjectType() != null) {
 			Predicate subjectType = cb.equal(subject.<String>get("lsType"), query.getSubjectType());
 			predicateList.add(subjectType);
 		}
-		//subjectKind
-		if (query.getSubjectKind() != null){
+		// subjectKind
+		if (query.getSubjectKind() != null) {
 			Predicate subjectKind = cb.equal(subject.<String>get("lsKind"), query.getSubjectKind());
 			predicateList.add(subjectKind);
 		}
-		//protocol label and experiment label
-		if (query.getProtocolLabelLike() != null || query.getExperimentLabelLike() != null){
+		// protocol label and experiment label
+		if (query.getProtocolLabelLike() != null || query.getExperimentLabelLike() != null) {
 			Join<Subject, TreatmentGroup> tg = subject.join("treatmentGroups");
 			Join<TreatmentGroup, AnalysisGroup> ag = tg.join("analysisGroups");
 			Join<AnalysisGroup, Experiment> experiment = ag.join("experiments");
@@ -772,27 +814,29 @@ public Collection<Long> searchSubjectIdsByQueryDTO(
 			predicateList.add(tgNotIgn);
 			predicateList.add(agNotIgn);
 			predicateList.add(exptNotIgn);
-			
-			if (query.getExperimentLabelLike() != null){
+
+			if (query.getExperimentLabelLike() != null) {
 				Join<Experiment, ExperimentLabel> experimentLabel = experiment.join("lsLabels");
 				Predicate exptLabelNotIgn = cb.not(experimentLabel.<Boolean>get("ignored"));
 				predicateList.add(exptLabelNotIgn);
-				Predicate experimentLabelLike = cb.like(experimentLabel.<String>get("labelText"), '%'+query.getExperimentLabelLike()+'%');
+				Predicate experimentLabelLike = cb.like(experimentLabel.<String>get("labelText"),
+						'%' + query.getExperimentLabelLike() + '%');
 				predicateList.add(experimentLabelLike);
 			}
-			if (query.getProtocolLabelLike() != null){
+			if (query.getProtocolLabelLike() != null) {
 				Join<Experiment, Protocol> protocol = experiment.join("protocol");
 				Join<Protocol, ProtocolLabel> protocolLabel = protocol.join("lsLabels");
 				Predicate protNotIgn = cb.not(protocol.<Boolean>get("ignored"));
 				Predicate protLabelNotIgn = cb.not(protocolLabel.<Boolean>get("ignored"));
 				predicateList.add(protNotIgn);
 				predicateList.add(protLabelNotIgn);
-				Predicate protocolLabelLike = cb.like(protocolLabel.<String>get("labelText"), '%'+query.getProtocolLabelLike()+'%');
+				Predicate protocolLabelLike = cb.like(protocolLabel.<String>get("labelText"),
+						'%' + query.getProtocolLabelLike() + '%');
 				predicateList.add(protocolLabelLike);
 			}
 		}
-		//container code
-		if (query.getContainerCode() != null){
+		// container code
+		if (query.getContainerCode() != null) {
 			Join<Subject, ItxSubjectContainer> itx = subject.join("containers");
 			Join<ItxSubjectContainer, Container> container = itx.join("container");
 			Predicate itxNotIgn = cb.not(itx.<Boolean>get("ignored"));
@@ -802,39 +846,39 @@ public Collection<Long> searchSubjectIdsByQueryDTO(
 			predicateList.add(containerNotIgn);
 			predicateList.add(containerCode);
 		}
-		//values
-		if (query.getValues() != null){
-			for (ValueQueryDTO valueQuery : query.getValues()){
+		// values
+		if (query.getValues() != null) {
+			for (ValueQueryDTO valueQuery : query.getValues()) {
 				List<Predicate> valuePredicatesList = new ArrayList<Predicate>();
 				Join<Subject, SubjectState> state = subject.join("lsStates");
 				Join<SubjectState, SubjectValue> value = state.join("lsValues");
-				
+
 				Predicate stateNotIgn = cb.isFalse(state.<Boolean>get("ignored"));
 				Predicate valueNotIgn = cb.isFalse(value.<Boolean>get("ignored"));
 				valuePredicatesList.add(stateNotIgn);
 				valuePredicatesList.add(valueNotIgn);
-				
-				if (valueQuery.getStateType() != null){
-					Predicate stateType = cb.equal(state.<String>get("lsType"),valueQuery.getStateType());
+
+				if (valueQuery.getStateType() != null) {
+					Predicate stateType = cb.equal(state.<String>get("lsType"), valueQuery.getStateType());
 					valuePredicatesList.add(stateType);
 				}
-				if (valueQuery.getStateKind() != null){
-					Predicate stateKind = cb.equal(state.<String>get("lsKind"),valueQuery.getStateKind());
+				if (valueQuery.getStateKind() != null) {
+					Predicate stateKind = cb.equal(state.<String>get("lsKind"), valueQuery.getStateKind());
 					valuePredicatesList.add(stateKind);
 				}
-				if (valueQuery.getValueType() != null){
-					Predicate valueType = cb.equal(value.<String>get("lsType"),valueQuery.getValueType());
+				if (valueQuery.getValueType() != null) {
+					Predicate valueType = cb.equal(value.<String>get("lsType"), valueQuery.getValueType());
 					valuePredicatesList.add(valueType);
 				}
-				if (valueQuery.getValueKind() != null){
-					Predicate valueKind = cb.equal(value.<String>get("lsKind"),valueQuery.getValueKind());
+				if (valueQuery.getValueKind() != null) {
+					Predicate valueKind = cb.equal(value.<String>get("lsKind"), valueQuery.getValueKind());
 					valuePredicatesList.add(valueKind);
 				}
-				if (valueQuery.getValue() != null){
-					if (valueQuery.getValueType() == null){
+				if (valueQuery.getValue() != null) {
+					if (valueQuery.getValueType() == null) {
 						logger.error("valueType must be specified if value is specified!");
 						throw new Exception("valueType must be specified if value is specified!");
-					}else if(valueQuery.getValueType().equals("dateValue")){
+					} else if (valueQuery.getValueType().equals("dateValue")) {
 						Calendar cal0 = Calendar.getInstance(); // locale-specific
 						cal0.setTimeInMillis(Long.valueOf(valueQuery.getValue()));
 						cal0.set(Calendar.HOUR_OF_DAY, 0);
@@ -853,13 +897,15 @@ public Collection<Long> searchSubjectIdsByQueryDTO(
 						Date queryDate24 = new Date(time24);
 						Predicate valueEqual = cb.between(value.<Date>get("dateValue"), queryDate0, queryDate24);
 						valuePredicatesList.add(valueEqual);
-					}else{
-//						only works with string value types: stringValue, codeValue, fileValue, clobValue
-						Predicate valueLike = cb.like(value.<String>get(valueQuery.getValueType()), '%' + valueQuery.getValue() + '%');
+					} else {
+						// only works with string value types: stringValue, codeValue, fileValue,
+						// clobValue
+						Predicate valueLike = cb.like(value.<String>get(valueQuery.getValueType()),
+								'%' + valueQuery.getValue() + '%');
 						valuePredicatesList.add(valueLike);
 					}
 				}
-//				gather predicates with AND
+				// gather predicates with AND
 				Predicate[] valuePredicates = new Predicate[0];
 				valuePredicates = valuePredicatesList.toArray(valuePredicates);
 				predicateList.add(cb.and(valuePredicates));
@@ -870,14 +916,14 @@ public Collection<Long> searchSubjectIdsByQueryDTO(
 		TypedQuery<Long> q = em.createQuery(criteria);
 		logger.debug(q.unwrap(org.hibernate.Query.class).getQueryString());
 		idList = q.getResultList();
-		logger.debug("Found "+idList.size()+" results.");
+		logger.debug("Found " + idList.size() + " results.");
 		return idList;
 	}
 
 	@Override
 	public Collection<Subject> getSubjectsByIds(Collection<Long> ids) {
 		Collection<Subject> results = new ArrayList<Subject>();
-		for (Long id : ids){
+		for (Long id : ids) {
 			results.add(Subject.findSubject(id));
 		}
 		return results;
@@ -885,7 +931,8 @@ public Collection<Subject> getSubjectsByIds(Collection<Long> ids) {
 
 	@Transactional
 	@Override
-	public boolean setSubjectValuesByPath(Subject subject, ValueQueryDTO pathDTO, String modifiedBy, Long lsTransaction) {
+	public boolean setSubjectValuesByPath(Subject subject, ValueQueryDTO pathDTO, String modifiedBy,
+			Long lsTransaction) {
 		EntityManager em = Subject.entityManager();
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery<Long> criteria = cb.createQuery(Long.class);
@@ -893,39 +940,38 @@ public boolean setSubjectValuesByPath(Subject subject, ValueQueryDTO pathDTO, St
 		Join<SubjectValue, SubjectState> subjectState = subjectValue.join("lsState");
 		criteria.select(subjectValue.<Long>get("id"));
 		criteria.distinct(true);
-		
+
 		Predicate[] predicates = new Predicate[0];
 		List<Predicate> predicateList = new ArrayList<Predicate>();
 		Predicate subjectEqual = cb.equal(subjectState.<Subject>get("subject"), subject);
 		predicateList.add(subjectEqual);
-		if (pathDTO.getStateType() != null){
+		if (pathDTO.getStateType() != null) {
 			Predicate stateType = cb.equal(subjectState.<String>get("lsType"), pathDTO.getStateType());
 			predicateList.add(stateType);
 		}
-		if (pathDTO.getStateKind() != null){
+		if (pathDTO.getStateKind() != null) {
 			Predicate stateKind = cb.equal(subjectState.<String>get("lsKind"), pathDTO.getStateKind());
 			predicateList.add(stateKind);
 		}
-		if (pathDTO.getValueType() != null){
+		if (pathDTO.getValueType() != null) {
 			Predicate valueType = cb.equal(subjectValue.<String>get("lsType"), pathDTO.getValueType());
 			predicateList.add(valueType);
 		}
-		if (pathDTO.getValueKind() != null){
+		if (pathDTO.getValueKind() != null) {
 			Predicate valueKind = cb.equal(subjectValue.<String>get("lsKind"), pathDTO.getValueKind());
 			predicateList.add(valueKind);
 		}
 		Predicate notIgnored = cb.not(subjectValue.<Boolean>get("ignored"));
 		predicateList.add(notIgnored);
-		
-		
+
 		predicates = predicateList.toArray(predicates);
 		criteria.where(cb.and(predicates));
 		TypedQuery<Long> q = em.createQuery(criteria);
 		logger.debug(q.unwrap(org.hibernate.Query.class).getQueryString());
 		Collection<Long> subjectValueIds = q.getResultList();
-		logger.debug("Found "+subjectValueIds.size()+" subject values.");
+		logger.debug("Found " + subjectValueIds.size() + " subject values.");
 		int valuesUpdated = 0;
-		if (subjectValueIds != null){
+		if (subjectValueIds != null) {
 			for (Long id : subjectValueIds) {
 				SubjectValue oldValue = SubjectValue.findSubjectValue(id);
 				SubjectValue newValue = new SubjectValue(oldValue);
@@ -940,46 +986,54 @@ public boolean setSubjectValuesByPath(Subject subject, ValueQueryDTO pathDTO, St
 				newValue.setRecordedDate(new Date());
 				newValue.setModifiedBy(null);
 				newValue.setModifiedDate(null);
-				if (pathDTO.getValueType().equals("blobValue")) newValue.setBlobValue(pathDTO.getValue().getBytes());
-				if (pathDTO.getValueType().equals("clobValue")) newValue.setClobValue(pathDTO.getValue());
-				if (pathDTO.getValueType().equals("codeValue")) newValue.setCodeValue(pathDTO.getValue());
-				if (pathDTO.getValueType().equals("dateValue")){
+				if (pathDTO.getValueType().equals("blobValue"))
+					newValue.setBlobValue(pathDTO.getValue().getBytes());
+				if (pathDTO.getValueType().equals("clobValue"))
+					newValue.setClobValue(pathDTO.getValue());
+				if (pathDTO.getValueType().equals("codeValue"))
+					newValue.setCodeValue(pathDTO.getValue());
+				if (pathDTO.getValueType().equals("dateValue")) {
 					Date date = new Date();
 					date.setTime(Long.valueOf(pathDTO.getValue()));
 					newValue.setDateValue(date);
 				}
-				if (pathDTO.getValueType().equals("fileValue")) newValue.setFileValue(pathDTO.getValue());
-				if (pathDTO.getValueType().equals("numericValue")) newValue.setNumericValue(new BigDecimal(pathDTO.getValue()));
-				if (pathDTO.getValueType().equals("stringValue")) newValue.setStringValue(pathDTO.getValue());
-				if (pathDTO.getValueType().equals("urlValue")) newValue.setUrlValue(pathDTO.getValue());
-				
+				if (pathDTO.getValueType().equals("fileValue"))
+					newValue.setFileValue(pathDTO.getValue());
+				if (pathDTO.getValueType().equals("numericValue"))
+					newValue.setNumericValue(new BigDecimal(pathDTO.getValue()));
+				if (pathDTO.getValueType().equals("stringValue"))
+					newValue.setStringValue(pathDTO.getValue());
+				if (pathDTO.getValueType().equals("urlValue"))
+					newValue.setUrlValue(pathDTO.getValue());
+
 				oldValue.merge();
 				newValue.persist();
 				valuesUpdated++;
 			}
-			
-			logger.debug("Updated "+valuesUpdated+" subject values (via ignore and create new).");
-			if (subjectValueIds.size() == valuesUpdated) return true;
+
+			logger.debug("Updated " + valuesUpdated + " subject values (via ignore and create new).");
+			if (subjectValueIds.size() == valuesUpdated)
+				return true;
 		}
-		
+
 		return false;
 	}
 
 	@Override
 	public Collection<SubjectCodeDTO> getExperimentCodes(
 			Collection<SubjectCodeDTO> subjectCodeDTOs) {
-		for (SubjectCodeDTO subjectDTO : subjectCodeDTOs){
+		for (SubjectCodeDTO subjectDTO : subjectCodeDTOs) {
 			Subject subject = Subject.findSubjectByCodeNameEquals(subjectDTO.getSubjectCode());
 			Collection<TreatmentGroupCodeDTO> tgDTOs = new ArrayList<TreatmentGroupCodeDTO>();
-			for (TreatmentGroup tg : subject.getTreatmentGroups()){
+			for (TreatmentGroup tg : subject.getTreatmentGroups()) {
 				TreatmentGroupCodeDTO tgDTO = new TreatmentGroupCodeDTO();
 				tgDTO.setTreatmentGroupCode(tg.getCodeName());
 				Collection<AnalysisGroupCodeDTO> agDTOs = new ArrayList<AnalysisGroupCodeDTO>();
-				for (AnalysisGroup ag : tg.getAnalysisGroups()){
+				for (AnalysisGroup ag : tg.getAnalysisGroups()) {
 					AnalysisGroupCodeDTO agDTO = new AnalysisGroupCodeDTO();
 					agDTO.setAnalysisGroupCode(ag.getCodeName());
 					Collection<ExperimentCodeDTO> exptDTOs = new ArrayList<ExperimentCodeDTO>();
-					for (Experiment expt : ag.getExperiments()){
+					for (Experiment expt : ag.getExperiments()) {
 						ExperimentCodeDTO exptDTO = new ExperimentCodeDTO();
 						exptDTO.setExperimentCode(expt.getCodeName());
 						exptDTO.setProtocolCode(expt.getProtocol().getCodeName());
@@ -1003,28 +1057,28 @@ public Map<String, List<Long>> searchSubjectIdsByMultiContainerQueryDTO(
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery<Tuple> criteria = cb.createQuery(Tuple.class);
 		Root<Subject> subject = criteria.from(Subject.class);
-		
+
 		criteria.multiselect(subject.<Long>get("id"));
 		criteria.distinct(true);
 		Predicate[] predicates = new Predicate[0];
 		List<Predicate> predicateList = new ArrayList<Predicate>();
-		
-		//subject not ignored
+
+		// subject not ignored
 		Predicate subjNotIgn = cb.not(subject.<Boolean>get("ignored"));
 		predicateList.add(subjNotIgn);
-		
-		//subjectType
-		if (query.getSubjectType() != null){
+
+		// subjectType
+		if (query.getSubjectType() != null) {
 			Predicate subjectType = cb.equal(subject.<String>get("lsType"), query.getSubjectType());
 			predicateList.add(subjectType);
 		}
-		//subjectKind
-		if (query.getSubjectKind() != null){
+		// subjectKind
+		if (query.getSubjectKind() != null) {
 			Predicate subjectKind = cb.equal(subject.<String>get("lsKind"), query.getSubjectKind());
 			predicateList.add(subjectKind);
 		}
-		//protocol label and experiment label
-		if (query.getProtocolLabelLike() != null || query.getExperimentLabelLike() != null){
+		// protocol label and experiment label
+		if (query.getProtocolLabelLike() != null || query.getExperimentLabelLike() != null) {
 			Join<Subject, TreatmentGroup> tg = subject.join("treatmentGroups");
 			Join<TreatmentGroup, AnalysisGroup> ag = tg.join("analysisGroups");
 			Join<AnalysisGroup, Experiment> experiment = ag.join("experiments");
@@ -1034,27 +1088,29 @@ public Map<String, List<Long>> searchSubjectIdsByMultiContainerQueryDTO(
 			predicateList.add(tgNotIgn);
 			predicateList.add(agNotIgn);
 			predicateList.add(exptNotIgn);
-			
-			if (query.getExperimentLabelLike() != null){
+
+			if (query.getExperimentLabelLike() != null) {
 				Join<Experiment, ExperimentLabel> experimentLabel = experiment.join("lsLabels");
 				Predicate exptLabelNotIgn = cb.not(experimentLabel.<Boolean>get("ignored"));
 				predicateList.add(exptLabelNotIgn);
-				Predicate experimentLabelLike = cb.like(experimentLabel.<String>get("labelText"), '%'+query.getExperimentLabelLike()+'%');
+				Predicate experimentLabelLike = cb.like(experimentLabel.<String>get("labelText"),
+						'%' + query.getExperimentLabelLike() + '%');
 				predicateList.add(experimentLabelLike);
 			}
-			if (query.getProtocolLabelLike() != null){
+			if (query.getProtocolLabelLike() != null) {
 				Join<Experiment, Protocol> protocol = experiment.join("protocol");
 				Join<Protocol, ProtocolLabel> protocolLabel = protocol.join("lsLabels");
 				Predicate protNotIgn = cb.not(protocol.<Boolean>get("ignored"));
 				Predicate protLabelNotIgn = cb.not(protocolLabel.<Boolean>get("ignored"));
 				predicateList.add(protNotIgn);
 				predicateList.add(protLabelNotIgn);
-				Predicate protocolLabelLike = cb.like(protocolLabel.<String>get("labelText"), '%'+query.getProtocolLabelLike()+'%');
+				Predicate protocolLabelLike = cb.like(protocolLabel.<String>get("labelText"),
+						'%' + query.getProtocolLabelLike() + '%');
 				predicateList.add(protocolLabelLike);
 			}
 		}
-		//container code
-		if (query.getContainerCodes() != null && query.getContainerCodes().size() > 0){
+		// container code
+		if (query.getContainerCodes() != null && query.getContainerCodes().size() > 0) {
 			Join<Subject, ItxSubjectContainer> itx = subject.join("containers");
 			Join<ItxSubjectContainer, Container> container = itx.join("container");
 			Predicate itxNotIgn = cb.not(itx.<Boolean>get("ignored"));
@@ -1066,39 +1122,39 @@ public Map<String, List<Long>> searchSubjectIdsByMultiContainerQueryDTO(
 			predicateList.add(containerCode);
 			criteria.multiselect(container.<String>get("codeName"), subject.<Long>get("id"));
 		}
-		//values
-		if (query.getValues() != null){
-			for (ValueQueryDTO valueQuery : query.getValues()){
+		// values
+		if (query.getValues() != null) {
+			for (ValueQueryDTO valueQuery : query.getValues()) {
 				List<Predicate> valuePredicatesList = new ArrayList<Predicate>();
 				Join<Subject, SubjectState> state = subject.join("lsStates");
 				Join<SubjectState, SubjectValue> value = state.join("lsValues");
-				
+
 				Predicate stateNotIgn = cb.isFalse(state.<Boolean>get("ignored"));
 				Predicate valueNotIgn = cb.isFalse(value.<Boolean>get("ignored"));
 				valuePredicatesList.add(stateNotIgn);
 				valuePredicatesList.add(valueNotIgn);
-				
-				if (valueQuery.getStateType() != null){
-					Predicate stateType = cb.equal(state.<String>get("lsType"),valueQuery.getStateType());
+
+				if (valueQuery.getStateType() != null) {
+					Predicate stateType = cb.equal(state.<String>get("lsType"), valueQuery.getStateType());
 					valuePredicatesList.add(stateType);
 				}
-				if (valueQuery.getStateKind() != null){
-					Predicate stateKind = cb.equal(state.<String>get("lsKind"),valueQuery.getStateKind());
+				if (valueQuery.getStateKind() != null) {
+					Predicate stateKind = cb.equal(state.<String>get("lsKind"), valueQuery.getStateKind());
 					valuePredicatesList.add(stateKind);
 				}
-				if (valueQuery.getValueType() != null){
-					Predicate valueType = cb.equal(value.<String>get("lsType"),valueQuery.getValueType());
+				if (valueQuery.getValueType() != null) {
+					Predicate valueType = cb.equal(value.<String>get("lsType"), valueQuery.getValueType());
 					valuePredicatesList.add(valueType);
 				}
-				if (valueQuery.getValueKind() != null){
-					Predicate valueKind = cb.equal(value.<String>get("lsKind"),valueQuery.getValueKind());
+				if (valueQuery.getValueKind() != null) {
+					Predicate valueKind = cb.equal(value.<String>get("lsKind"), valueQuery.getValueKind());
 					valuePredicatesList.add(valueKind);
 				}
-				if (valueQuery.getValue() != null){
-					if (valueQuery.getValueType() == null){
+				if (valueQuery.getValue() != null) {
+					if (valueQuery.getValueType() == null) {
 						logger.error("valueType must be specified if value is specified!");
 						throw new Exception("valueType must be specified if value is specified!");
-					}else if(valueQuery.getValueType().equals("dateValue")){
+					} else if (valueQuery.getValueType().equals("dateValue")) {
 						Calendar cal0 = Calendar.getInstance(); // locale-specific
 						cal0.setTimeInMillis(Long.valueOf(valueQuery.getValue()));
 						cal0.set(Calendar.HOUR_OF_DAY, 0);
@@ -1117,13 +1173,15 @@ public Map<String, List<Long>> searchSubjectIdsByMultiContainerQueryDTO(
 						Date queryDate24 = new Date(time24);
 						Predicate valueEqual = cb.between(value.<Date>get("dateValue"), queryDate0, queryDate24);
 						valuePredicatesList.add(valueEqual);
-					}else{
-//						only works with string value types: stringValue, codeValue, fileValue, clobValue
-						Predicate valueLike = cb.like(value.<String>get(valueQuery.getValueType()), '%' + valueQuery.getValue() + '%');
+					} else {
+						// only works with string value types: stringValue, codeValue, fileValue,
+						// clobValue
+						Predicate valueLike = cb.like(value.<String>get(valueQuery.getValueType()),
+								'%' + valueQuery.getValue() + '%');
 						valuePredicatesList.add(valueLike);
 					}
 				}
-//				gather predicates with AND
+				// gather predicates with AND
 				Predicate[] valuePredicates = new Predicate[0];
 				valuePredicates = valuePredicatesList.toArray(valuePredicates);
 				predicateList.add(cb.and(valuePredicates));
@@ -1135,18 +1193,18 @@ public Map<String, List<Long>> searchSubjectIdsByMultiContainerQueryDTO(
 		logger.debug(q.unwrap(org.hibernate.Query.class).getQueryString());
 		Collection<Tuple> rawResults = q.getResultList();
 		Map<String, List<Long>> results = new HashMap<String, List<Long>>();
-		for (Tuple result : rawResults){
+		for (Tuple result : rawResults) {
 			String containerCode = (String) result.get(0);
 			Long subjectId = (Long) result.get(1);
-			if (results.containsKey(containerCode)){
+			if (results.containsKey(containerCode)) {
 				results.get(containerCode).add(subjectId);
-			}else{
+			} else {
 				ArrayList<Long> subjectIds = new ArrayList<Long>();
 				subjectIds.add(subjectId);
 				results.put(containerCode, subjectIds);
 			}
 		}
-		logger.debug("Found results for "+results.keySet().size()+" containers.");
+		logger.debug("Found results for " + results.keySet().size() + " containers.");
 		return results;
 	}
 
@@ -1154,11 +1212,11 @@ public Map<String, List<Long>> searchSubjectIdsByMultiContainerQueryDTO(
 	public Collection<ContainerSubjectsDTO> getContainerSubjectsByIds(
 			Map<String, List<Long>> containerCodeSubjectIds) {
 		Collection<ContainerSubjectsDTO> results = new ArrayList<ContainerSubjectsDTO>();
-		for (String containerCode : containerCodeSubjectIds.keySet()){
+		for (String containerCode : containerCodeSubjectIds.keySet()) {
 			ContainerSubjectsDTO result = new ContainerSubjectsDTO();
 			result.setContainerIdOrCodeName(containerCode);
 			Collection<Subject> subjects = new ArrayList<Subject>();
-			for (Long subjectId : containerCodeSubjectIds.get(containerCode)){
+			for (Long subjectId : containerCodeSubjectIds.get(containerCode)) {
 				Subject subject = Subject.findSubject(subjectId);
 				subjects.add(subject);
 			}
@@ -1168,7 +1226,4 @@ public Collection<ContainerSubjectsDTO> getContainerSubjectsByIds(
 		return results;
 	}
 
-	
-	
-
 }
diff --git a/src/main/java/com/labsynch/labseer/service/SubjectStateService.java b/src/main/java/com/labsynch/labseer/service/SubjectStateService.java
index d642d040a..44a5268f7 100755
--- a/src/main/java/com/labsynch/labseer/service/SubjectStateService.java
+++ b/src/main/java/com/labsynch/labseer/service/SubjectStateService.java
@@ -36,6 +36,4 @@ SubjectState getSubjectState(String idOrCodeName, String stateType,
 	Collection<SubjectStatePathDTO> getSubjectStates(
 			Collection<GenericStatePathRequest> genericRequests);
 
-	
-	
 }
diff --git a/src/main/java/com/labsynch/labseer/service/SubjectStateServiceImpl.java b/src/main/java/com/labsynch/labseer/service/SubjectStateServiceImpl.java
index 0b6cc17cd..237161877 100755
--- a/src/main/java/com/labsynch/labseer/service/SubjectStateServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/SubjectStateServiceImpl.java
@@ -31,36 +31,37 @@
 public class SubjectStateServiceImpl implements SubjectStateService {
 
 	private static final Logger logger = LoggerFactory.getLogger(SubjectStateServiceImpl.class);
-	
+
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
 
 	@Override
 	public Collection<SubjectState> ignoreAllSubjectStates(Collection<SubjectState> subjectStates) {
-		//mark subjectStates and values as ignore 
+		// mark subjectStates and values as ignore
 		Collection<SubjectState> subjectStateSet = new HashSet<SubjectState>();
-		for (SubjectState querySubjectState : subjectStates){
-			SubjectState subjectState = SubjectState.findSubjectState(querySubjectState.getId());			
-				for(SubjectValue subjectValue : SubjectValue.findSubjectValuesByLsState(subjectState).getResultList()){
-					subjectValue.setIgnored(true);
-					subjectValue.merge();
-				}
-				subjectState.setIgnored(true);
-				subjectState.merge();
-				subjectStateSet.add(SubjectState.findSubjectState(subjectState.getId()));
+		for (SubjectState querySubjectState : subjectStates) {
+			SubjectState subjectState = SubjectState.findSubjectState(querySubjectState.getId());
+			for (SubjectValue subjectValue : SubjectValue.findSubjectValuesByLsState(subjectState).getResultList()) {
+				subjectValue.setIgnored(true);
+				subjectValue.merge();
+			}
+			subjectState.setIgnored(true);
+			subjectState.merge();
+			subjectStateSet.add(SubjectState.findSubjectState(subjectState.getId()));
 		}
 
-		return(subjectStateSet);
+		return (subjectStateSet);
 
 	}
 
 	@Override
 	public List<SubjectState> getSubjectStatesBySubjectIdAndStateTypeKind(
 			Long subjectId, String stateType, String stateKind) {
-		
-			List<SubjectState> subjectStates = SubjectState.findSubjectStatesBySubjectIDAndStateTypeKind(subjectId, stateType, stateKind).getResultList();
 
-			return subjectStates;
+		List<SubjectState> subjectStates = SubjectState
+				.findSubjectStatesBySubjectIDAndStateTypeKind(subjectId, stateType, stateKind).getResultList();
+
+		return subjectStates;
 	}
 
 	@Override
@@ -79,10 +80,10 @@ public SubjectState createSubjectStateBySubjectIdAndStateTypeKind(
 	@Override
 	public SubjectState saveSubjectState(
 			SubjectState subjectState) {
-		subjectState.setSubject(Subject.findSubject(subjectState.getSubject().getId()));		
+		subjectState.setSubject(Subject.findSubject(subjectState.getSubject().getId()));
 		subjectState.persist();
 		Set<SubjectValue> savedValues = new HashSet<SubjectValue>();
-		for (SubjectValue subjectValue : subjectState.getLsValues()){
+		for (SubjectValue subjectValue : subjectState.getLsValues()) {
 			subjectValue.setLsState(subjectState);
 			subjectValue.persist();
 			savedValues.add(subjectValue);
@@ -95,23 +96,23 @@ public SubjectState saveSubjectState(
 	@Override
 	public Collection<SubjectState> saveSubjectStates(
 			Collection<SubjectState> subjectStates) {
-		for (SubjectState subjectState: subjectStates) {
+		for (SubjectState subjectState : subjectStates) {
 			subjectState = saveSubjectState(subjectState);
 		}
 		return subjectStates;
 	}
-	
+
 	@Override
 	public SubjectState updateSubjectState(
 			SubjectState subjectState) {
 		subjectState.setVersion(SubjectState.findSubjectState(subjectState.getId()).getVersion());
 		Set<SubjectValue> updatedSubjectValues = new HashSet<SubjectValue>();
-		for (SubjectValue subjectValue : subjectState.getLsValues()){
-			if (subjectValue.getId() == null){
+		for (SubjectValue subjectValue : subjectState.getLsValues()) {
+			if (subjectValue.getId() == null) {
 				subjectValue.setLsState(subjectState);
 				subjectValue.persist();
 				updatedSubjectValues.add(subjectValue);
-			}else{
+			} else {
 				SubjectValue updatedSubjectValue = subjectValue.merge();
 				updatedSubjectValues.add(updatedSubjectValue);
 			}
@@ -124,21 +125,21 @@ public SubjectState updateSubjectState(
 	@Override
 	public Collection<SubjectState> updateSubjectStates(
 			Collection<SubjectState> subjectStates) {
-		for (SubjectState subjectState : subjectStates){
+		for (SubjectState subjectState : subjectStates) {
 			subjectState = updateSubjectState(subjectState);
 		}
 		return null;
 	}
-	
+
 	@Override
 	public SubjectState getSubjectState(String idOrCodeName,
 			String stateType, String stateKind) {
 		SubjectState state = null;
-		try{
+		try {
 			Collection<SubjectState> states = getSubjectStates(idOrCodeName, stateType, stateKind);
 			state = states.iterator().next();
-		}catch (Exception e){
-			logger.error("Caught error "+e.toString()+" trying to find a state.",e);
+		} catch (Exception e) {
+			logger.error("Caught error " + e.toString() + " trying to find a state.", e);
 			state = null;
 		}
 		return state;
@@ -148,27 +149,28 @@ public SubjectState getSubjectState(String idOrCodeName,
 	public Collection<SubjectStatePathDTO> getSubjectStates(
 			Collection<GenericStatePathRequest> genericRequests) {
 		Collection<SubjectStatePathDTO> results = new ArrayList<SubjectStatePathDTO>();
-		Map<String,Map<String, Set<String>>> stateTypeKindSubjectCodeMap = new HashMap<String, Map<String, Set<String>>>();
-		for (GenericStatePathRequest request : genericRequests){
-			//sort incoming requests by state type and kind to group them
-			if (stateTypeKindSubjectCodeMap.containsKey(request.getStateType())){
-				//entry for state type exists. Check if state kind already seen
-				Map<String, Set<String>> stateKindSubjectCodeMap = stateTypeKindSubjectCodeMap.get(request.getStateType());
-				if (stateKindSubjectCodeMap.containsKey(request.getStateKind())){
-					//state type and kind seen before. add codeName to the list
+		Map<String, Map<String, Set<String>>> stateTypeKindSubjectCodeMap = new HashMap<String, Map<String, Set<String>>>();
+		for (GenericStatePathRequest request : genericRequests) {
+			// sort incoming requests by state type and kind to group them
+			if (stateTypeKindSubjectCodeMap.containsKey(request.getStateType())) {
+				// entry for state type exists. Check if state kind already seen
+				Map<String, Set<String>> stateKindSubjectCodeMap = stateTypeKindSubjectCodeMap
+						.get(request.getStateType());
+				if (stateKindSubjectCodeMap.containsKey(request.getStateKind())) {
+					// state type and kind seen before. add codeName to the list
 					Set<String> subjectCodes = stateKindSubjectCodeMap.get(request.getStateKind());
 					subjectCodes.add(request.getIdOrCodeName());
 					stateKindSubjectCodeMap.put(request.getStateKind(), subjectCodes);
-				}else{
-					//state kind not seen yet
+				} else {
+					// state kind not seen yet
 					Set<String> subjectCodes = new HashSet<String>();
 					subjectCodes.add(request.getIdOrCodeName());
 					stateKindSubjectCodeMap.put(request.getStateKind(), subjectCodes);
 					stateTypeKindSubjectCodeMap.put(request.getStateType(), stateKindSubjectCodeMap);
 				}
 				stateTypeKindSubjectCodeMap.put(request.getStateType(), stateKindSubjectCodeMap);
-			}else{
-				//no entry for state type or kind. create a new one
+			} else {
+				// no entry for state type or kind. create a new one
 				Map<String, Set<String>> stateKindSubjectCodeMap = new HashMap<String, Set<String>>();
 				Set<String> subjectCodes = new HashSet<String>();
 				subjectCodes.add(request.getIdOrCodeName());
@@ -176,23 +178,24 @@ public Collection<SubjectStatePathDTO> getSubjectStates(
 				stateTypeKindSubjectCodeMap.put(request.getStateType(), stateKindSubjectCodeMap);
 			}
 		}
-		for (String stateType : stateTypeKindSubjectCodeMap.keySet()){
-			for (String stateKind : stateTypeKindSubjectCodeMap.get(stateType).keySet()){
+		for (String stateType : stateTypeKindSubjectCodeMap.keySet()) {
+			for (String stateKind : stateTypeKindSubjectCodeMap.get(stateType).keySet()) {
 				Collection<String> subjectCodes = stateTypeKindSubjectCodeMap.get(stateType).get(stateKind);
-				Collection<SubjectCodeStateDTO> codeStateDTOs = getSubjectCodesAndStatesByStateTypeKindAndSubjectCodes(subjectCodes, stateType, stateKind);
+				Collection<SubjectCodeStateDTO> codeStateDTOs = getSubjectCodesAndStatesByStateTypeKindAndSubjectCodes(
+						subjectCodes, stateType, stateKind);
 				Map<String, Collection<SubjectState>> codeStatesMap = new HashMap<String, Collection<SubjectState>>();
-				for (SubjectCodeStateDTO codeStateDTO : codeStateDTOs){
-					if (codeStatesMap.containsKey(codeStateDTO.getSubjectCode())){
+				for (SubjectCodeStateDTO codeStateDTO : codeStateDTOs) {
+					if (codeStatesMap.containsKey(codeStateDTO.getSubjectCode())) {
 						Collection<SubjectState> states = codeStatesMap.get(codeStateDTO.getSubjectCode());
 						states.add(codeStateDTO.getSubjectState());
 						codeStatesMap.put(codeStateDTO.getSubjectCode(), states);
-					}else{
+					} else {
 						Collection<SubjectState> states = new ArrayList<SubjectState>();
 						states.add(codeStateDTO.getSubjectState());
 						codeStatesMap.put(codeStateDTO.getSubjectCode(), states);
 					}
 				}
-				for (String subjectCode : codeStatesMap.keySet()){
+				for (String subjectCode : codeStatesMap.keySet()) {
 					SubjectStatePathDTO result = new SubjectStatePathDTO();
 					result.setIdOrCodeName(subjectCode);
 					result.setStateType(stateType);
@@ -204,33 +207,38 @@ public Collection<SubjectStatePathDTO> getSubjectStates(
 		}
 		return results;
 	}
-	
-	private Collection<SubjectState> getSubjectStates(String idOrCodeName, String stateType, String stateKind){
-		if (SimpleUtil.isNumeric(idOrCodeName)){
+
+	private Collection<SubjectState> getSubjectStates(String idOrCodeName, String stateType, String stateKind) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			Long id = Long.valueOf(idOrCodeName);
 			return SubjectState.findSubjectStatesBySubjectIDAndStateTypeKind(id, stateType, stateKind).getResultList();
-		}else{
-			return SubjectState.findSubjectStatesBySubjectCodeNameAndStateTypeKind(idOrCodeName, stateType, stateKind).getResultList();
+		} else {
+			return SubjectState.findSubjectStatesBySubjectCodeNameAndStateTypeKind(idOrCodeName, stateType, stateKind)
+					.getResultList();
 		}
 	}
-	
-	private Collection<SubjectCodeStateDTO> getSubjectCodesAndStatesByStateTypeKindAndSubjectCodes(Collection<String> subjectCodes, String stateType, String stateKind){
-		if (stateType == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateType argument is required");
-		if (stateKind == null || stateKind.length() == 0) throw new IllegalArgumentException("The stateKind argument is required");
+
+	private Collection<SubjectCodeStateDTO> getSubjectCodesAndStatesByStateTypeKindAndSubjectCodes(
+			Collection<String> subjectCodes, String stateType, String stateKind) {
+		if (stateType == null || stateKind.length() == 0)
+			throw new IllegalArgumentException("The stateType argument is required");
+		if (stateKind == null || stateKind.length() == 0)
+			throw new IllegalArgumentException("The stateKind argument is required");
 		List<String> codeNameList = new ArrayList<String>();
 		codeNameList.addAll(subjectCodes);
 		EntityManager em = SubjectState.entityManager();
-		String hsqlQuery = "SELECT new com.labsynch.labseer.dto.SubjectCodeStateDTO( s.codeName, ss ) FROM SubjectState AS ss " +
-		"JOIN ss.subject AS s " +
-		"WHERE ss.lsType = :stateType AND ss.lsKind = :stateKind AND ss.ignored IS NOT :ignored AND ";
+		String hsqlQuery = "SELECT new com.labsynch.labseer.dto.SubjectCodeStateDTO( s.codeName, ss ) FROM SubjectState AS ss "
+				+
+				"JOIN ss.subject AS s " +
+				"WHERE ss.lsType = :stateType AND ss.lsKind = :stateKind AND ss.ignored IS NOT :ignored AND ";
 		Query q = SimpleUtil.addHqlInClause(em, hsqlQuery, "s.codeName", codeNameList);
 		q.setParameter("stateType", stateType);
 		q.setParameter("stateKind", stateKind);
 		q.setParameter("ignored", true);
-		logger.debug("Querying for state type: "+stateType+" and state kind: "+stateKind);
+		logger.debug("Querying for state type: " + stateType + " and state kind: " + stateKind);
 		logger.debug(q.unwrap(org.hibernate.Query.class).getQueryString());
 		Collection<SubjectCodeStateDTO> results = q.getResultList();
-		logger.debug("Fetched "+results.size()+" states");
+		logger.debug("Fetched " + results.size() + " states");
 		return results;
 	}
 
diff --git a/src/main/java/com/labsynch/labseer/service/SubjectValueService.java b/src/main/java/com/labsynch/labseer/service/SubjectValueService.java
index c734bf9b0..d5443d2fd 100644
--- a/src/main/java/com/labsynch/labseer/service/SubjectValueService.java
+++ b/src/main/java/com/labsynch/labseer/service/SubjectValueService.java
@@ -17,17 +17,20 @@ public interface SubjectValueService {
 	public void deleteSubjectValue(SubjectValue subjectValue);
 
 	public SubjectValue updateSubjectValue(SubjectValue subjectValue);
-	
+
 	public List<SubjectValue> getSubjectValuesBySubjectId(Long id);
-	
-	public List<SubjectValue> getSubjectValuesByExperimentIdAndStateTypeKind(Long experimentId, String stateType, String stateKind);
-	
-	public List<SubjectValue> getSubjectValuesByExperimentIdAndStateTypeKindAndValueTypeKind(Long experimentId, String stateType,
+
+	public List<SubjectValue> getSubjectValuesByExperimentIdAndStateTypeKind(Long experimentId, String stateType,
+			String stateKind);
+
+	public List<SubjectValue> getSubjectValuesByExperimentIdAndStateTypeKindAndValueTypeKind(Long experimentId,
+			String stateType,
 			String stateKind, String valueType, String valueKind);
-	
+
 	public String getCsvList(List<SubjectValue> subjectValues);
-	
-	public List<SubjectValue> getSubjectValuesByAnalysisGroupIdAndStateTypeKind(Long analysisGroupId, String stateType, String stateKind);
+
+	public List<SubjectValue> getSubjectValuesByAnalysisGroupIdAndStateTypeKind(Long analysisGroupId, String stateType,
+			String stateKind);
 
 	public SubjectValue updateSubjectValue(String idOrCodeName,
 			String stateType, String stateKind, String valueType,
@@ -48,5 +51,5 @@ public SubjectValue getSubjectValue(String idOrCodeName, String stateType,
 
 	public Collection<SubjectValuePathDTO> getSubjectValues(
 			Collection<GenericValuePathRequest> genericRequests);
-	
+
 }
diff --git a/src/main/java/com/labsynch/labseer/service/SubjectValueServiceImpl.java b/src/main/java/com/labsynch/labseer/service/SubjectValueServiceImpl.java
index b42b6131b..8160534b7 100644
--- a/src/main/java/com/labsynch/labseer/service/SubjectValueServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/SubjectValueServiceImpl.java
@@ -27,31 +27,31 @@
 import org.supercsv.io.ICsvBeanWriter;
 import org.supercsv.prefs.CsvPreference;
 
-
 @Service
 @Transactional
 public class SubjectValueServiceImpl implements SubjectValueService {
 
 	@Autowired
 	private SubjectStateService subjectStateService;
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(SubjectValueServiceImpl.class);
 
 	@Override
-	public void deleteSubjectValue(SubjectValue subjectValue){
+	public void deleteSubjectValue(SubjectValue subjectValue) {
 		logger.debug("incoming meta subject: " + subjectValue.toJson());
 
 	}
 
-	//Query hibernate object and grab existing table references - add them to json hydrated object
+	// Query hibernate object and grab existing table references - add them to json
+	// hydrated object
 	@Override
 	@Transactional
-	public SubjectValue updateSubjectValue(SubjectValue subjectValue){
+	public SubjectValue updateSubjectValue(SubjectValue subjectValue) {
 		if (subjectValue.getLsState().getId() == null) {
 			SubjectState subjectState = new SubjectState(subjectValue.getLsState());
 			subjectState.setSubject(Subject.findSubject(subjectValue.getLsState().getSubject().getId()));
 			subjectState.persist();
-			subjectValue.setLsState(subjectState); 
+			subjectValue.setLsState(subjectState);
 		} else {
 			subjectValue.setLsState(SubjectState.findSubjectState(subjectValue.getLsState().getId()));
 		}
@@ -67,31 +67,31 @@ public SubjectValue saveSubjectValue(SubjectValue subjectValue) {
 			SubjectState subjectState = new SubjectState(subjectValue.getLsState());
 			subjectState.setSubject(Subject.findSubject(subjectValue.getLsState().getSubject().getId()));
 			subjectState.persist();
-			subjectValue.setLsState(subjectState); 
+			subjectValue.setLsState(subjectState);
 		} else {
 			subjectValue.setLsState(SubjectState.findSubjectState(subjectValue.getLsState().getId()));
-		}		
+		}
 		subjectValue.persist();
 		return subjectValue;
 	}
-	
+
 	@Override
 	@Transactional
 	public Collection<SubjectValue> saveSubjectValues(Collection<SubjectValue> subjectValues) {
-		for (SubjectValue subjectValue: subjectValues) {
+		for (SubjectValue subjectValue : subjectValues) {
 			subjectValue = saveSubjectValue(subjectValue);
 		}
 		return subjectValues;
 	}
 
 	@Override
-	public List<SubjectValue> getSubjectValuesBySubjectId(Long id){	
+	public List<SubjectValue> getSubjectValuesBySubjectId(Long id) {
 		List<SubjectValue> subjectValues = new ArrayList<SubjectValue>();
 		Subject subject = Subject.findSubject(id);
-		if(subject.getLsStates() != null) {
+		if (subject.getLsStates() != null) {
 			for (SubjectState subjectState : subject.getLsStates()) {
-				if(subjectState.getLsValues() != null) {
-					for(SubjectValue subjectValue : subjectState.getLsValues()) {
+				if (subjectState.getLsValues() != null) {
+					for (SubjectValue subjectValue : subjectState.getLsValues()) {
 						subjectValues.add(subjectValue);
 					}
 				}
@@ -103,8 +103,9 @@ public List<SubjectValue> getSubjectValuesBySubjectId(Long id){
 	@Override
 	public List<SubjectValue> getSubjectValuesByExperimentIdAndStateTypeKind(
 			Long experimentId, String stateType, String stateKind) {
-		
-		List<SubjectValue> subjectValues = SubjectValue.findSubjectValuesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getResultList();
+
+		List<SubjectValue> subjectValues = SubjectValue
+				.findSubjectValuesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getResultList();
 
 		return subjectValues;
 	}
@@ -113,10 +114,12 @@ public List<SubjectValue> getSubjectValuesByExperimentIdAndStateTypeKind(
 	public List<SubjectValue> getSubjectValuesByExperimentIdAndStateTypeKindAndValueTypeKind(
 			Long experimentId, String stateType, String stateKind,
 			String valueType, String valueKind) {
-		
-		List<SubjectValue> subjectValues = SubjectValue.findSubjectValuesByExptIDAndStateTypeKindAndValueTypeKind(experimentId, stateType,
-				stateKind, valueType, valueKind).getResultList();
-		
+
+		List<SubjectValue> subjectValues = SubjectValue
+				.findSubjectValuesByExptIDAndStateTypeKindAndValueTypeKind(experimentId, stateType,
+						stateKind, valueType, valueKind)
+				.getResultList();
+
 		return subjectValues;
 	}
 
@@ -155,8 +158,10 @@ public String getCsvList(List<SubjectValue> subjectValues) {
 	@Override
 	public List<SubjectValue> getSubjectValuesByAnalysisGroupIdAndStateTypeKind(
 			Long analysisGroupId, String stateType, String stateKind) {
-		
-		List<SubjectValue> subjectValues = SubjectValue.findSubjectValuesByAnalysisGroupIDAndStateTypeKind(analysisGroupId, stateType, stateKind).getResultList();
+
+		List<SubjectValue> subjectValues = SubjectValue
+				.findSubjectValuesByAnalysisGroupIDAndStateTypeKind(analysisGroupId, stateType, stateKind)
+				.getResultList();
 
 		return subjectValues;
 	}
@@ -165,53 +170,59 @@ public List<SubjectValue> getSubjectValuesByAnalysisGroupIdAndStateTypeKind(
 	public List<SubjectValue> getSubjectValuesBySubjectIdAndStateTypeKindAndValueTypeKind(
 			Long subjectId, String stateType, String stateKind,
 			String valueType, String valueKind) {
-		
-		List<SubjectValue> subjectValues = SubjectValue.findSubjectValuesBySubjectIDAndStateTypeKindAndValueTypeKind(subjectId, stateType,
-				stateKind, valueType, valueKind).getResultList();
-		
+
+		List<SubjectValue> subjectValues = SubjectValue
+				.findSubjectValuesBySubjectIDAndStateTypeKindAndValueTypeKind(subjectId, stateType,
+						stateKind, valueType, valueKind)
+				.getResultList();
+
 		return subjectValues;
 	}
-	
+
 	@Override
-	public SubjectValue updateSubjectValue(String idOrCodeName, String stateType, String stateKind, String valueType, String valueKind, String value) {
-		//fetch the entity
+	public SubjectValue updateSubjectValue(String idOrCodeName, String stateType, String stateKind, String valueType,
+			String valueKind, String value) {
+		// fetch the entity
 		Subject subject;
-		if(SimpleUtil.isNumeric(idOrCodeName)) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			subject = Subject.findSubject(Long.valueOf(idOrCodeName));
-		} else {		
+		} else {
 			try {
 				subject = Subject.findSubjectsByCodeNameEquals(idOrCodeName).getSingleResult();
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				subject = null;
 			}
 		}
-		//fetch the state, and if it doesn't exist, create it
+		// fetch the state, and if it doesn't exist, create it
 		List<SubjectState> subjectStates;
-		if(subject != null) {
+		if (subject != null) {
 			Long subjectId = subject.getId();
-			subjectStates = subjectStateService.getSubjectStatesBySubjectIdAndStateTypeKind(subjectId, stateType, stateKind);
+			subjectStates = subjectStateService.getSubjectStatesBySubjectIdAndStateTypeKind(subjectId, stateType,
+					stateKind);
 			if (subjectStates.isEmpty()) {
-				//create the state
-				subjectStates.add(subjectStateService.createSubjectStateBySubjectIdAndStateTypeKind(subjectId, stateType, stateKind));
+				// create the state
+				subjectStates.add(subjectStateService.createSubjectStateBySubjectIdAndStateTypeKind(subjectId,
+						stateType, stateKind));
 				logger.debug("Created the subject state: " + subjectStates.get(0).toJson());
 			}
 		}
-		//fetch the value, update it if it exists, and if it doesn't exist, create it
+		// fetch the value, update it if it exists, and if it doesn't exist, create it
 		List<SubjectValue> subjectValues;
 		SubjectValue subjectValue = null;
-		if(subject != null) {
+		if (subject != null) {
 			Long subjectId = subject.getId();
-			subjectValues = getSubjectValuesBySubjectIdAndStateTypeKindAndValueTypeKind(subjectId, stateType, stateKind, valueType, valueKind);
-			if (subjectValues.size() > 1){
+			subjectValues = getSubjectValuesBySubjectIdAndStateTypeKindAndValueTypeKind(subjectId, stateType, stateKind,
+					valueType, valueKind);
+			if (subjectValues.size() > 1) {
 				logger.error("Error: multiple subject statuses found");
-			}
-			else if (subjectValues.size() == 1){
+			} else if (subjectValues.size() == 1) {
 				subjectValue = subjectValues.get(0);
 				subjectValue.setIgnored(true);
 				subjectValue.merge();
 				logger.debug("Ignored the subject value: " + subjectValue.toJson());
 			}
-			subjectValue = createSubjectValueBySubjectIdAndStateTypeKindAndValueTypeKind(subjectId, stateType, stateKind, valueType, valueKind, value);
+			subjectValue = createSubjectValueBySubjectIdAndStateTypeKindAndValueTypeKind(subjectId, stateType,
+					stateKind, valueType, valueKind, value);
 			logger.debug("Created the subject value: " + subjectValue.toJson());
 		}
 		return subjectValue;
@@ -222,41 +233,51 @@ private SubjectValue createSubjectValueBySubjectIdAndStateTypeKindAndValueTypeKi
 			Long subjectId, String stateType, String stateKind,
 			String valueType, String valueKind, String value) {
 		SubjectValue subjectValue = new SubjectValue();
-		SubjectState subjectState = SubjectState.findSubjectStatesBySubjectIDAndStateTypeKind(subjectId, stateType, stateKind).getSingleResult();
+		SubjectState subjectState = SubjectState
+				.findSubjectStatesBySubjectIDAndStateTypeKind(subjectId, stateType, stateKind).getSingleResult();
 		subjectValue.setLsState(subjectState);
 		subjectValue.setLsType(valueType);
 		subjectValue.setLsKind(valueKind);
-		if (valueType.equals("stringValue")) subjectValue.setStringValue(value);
-		if (valueType.equals("fileValue")) subjectValue.setFileValue(value);
-		if (valueType.equals("clobValue")) subjectValue.setClobValue(value);
-		if (valueType.equals("blobValue")) subjectValue.setBlobValue(value.getBytes(Charset.forName("UTF-8")));
-		if (valueType.equals("numericValue")) subjectValue.setNumericValue(new BigDecimal(value));
-		if (valueType.equals("dateValue")) subjectValue.setDateValue(new Date(Long.parseLong(value)));
-		if (valueType.equals("codeValue")) subjectValue.setCodeValue(value);
-		if (valueType.equals("urlValue")) subjectValue.setUrlValue(value);
+		if (valueType.equals("stringValue"))
+			subjectValue.setStringValue(value);
+		if (valueType.equals("fileValue"))
+			subjectValue.setFileValue(value);
+		if (valueType.equals("clobValue"))
+			subjectValue.setClobValue(value);
+		if (valueType.equals("blobValue"))
+			subjectValue.setBlobValue(value.getBytes(Charset.forName("UTF-8")));
+		if (valueType.equals("numericValue"))
+			subjectValue.setNumericValue(new BigDecimal(value));
+		if (valueType.equals("dateValue"))
+			subjectValue.setDateValue(new Date(Long.parseLong(value)));
+		if (valueType.equals("codeValue"))
+			subjectValue.setCodeValue(value);
+		if (valueType.equals("urlValue"))
+			subjectValue.setUrlValue(value);
 		subjectValue.setRecordedBy("default");
 		subjectValue.persist();
 		return subjectValue;
 	}
-	
+
 	@Override
 	public Collection<SubjectValue> updateSubjectValues(
 			Collection<SubjectValue> subjectValues) {
-		for (SubjectValue subjectValue: subjectValues) {
+		for (SubjectValue subjectValue : subjectValues) {
 			subjectValue = updateSubjectValue(subjectValue);
 		}
 		return subjectValues;
 	}
-	
+
 	@Override
 	public SubjectValue getSubjectValue(String idOrCodeName,
 			String stateType, String stateKind, String valueType, String valueKind) {
 		SubjectValue value = null;
-		try{
-			Collection<SubjectValue> values = getSubjectValues(idOrCodeName, stateType, stateKind, valueType, valueKind);
+		try {
+			Collection<SubjectValue> values = getSubjectValues(idOrCodeName, stateType, stateKind, valueType,
+					valueKind);
 			value = values.iterator().next();
-		}catch (Exception e){
-			logger.error("Caught error "+e.toString()+" trying to find a state.",e);
+		} catch (Exception e) {
+			logger.error("Caught error " + e.toString() + " trying to find a state.", e);
 			value = null;
 		}
 		return value;
@@ -266,23 +287,27 @@ public SubjectValue getSubjectValue(String idOrCodeName,
 	public Collection<SubjectValuePathDTO> getSubjectValues(
 			Collection<GenericValuePathRequest> genericRequests) {
 		Collection<SubjectValuePathDTO> results = new ArrayList<SubjectValuePathDTO>();
-		for (GenericValuePathRequest request : genericRequests){
+		for (GenericValuePathRequest request : genericRequests) {
 			SubjectValuePathDTO result = new SubjectValuePathDTO();
 			result.setIdOrCodeName(request.getIdOrCodeName());
 			result.setValueType(request.getValueType());
 			result.setValueKind(request.getValueKind());
-			result.setValues(getSubjectValues(request.getIdOrCodeName(), request.getStateType(), request.getStateKind(), request.getValueType(), request.getValueKind()));
+			result.setValues(getSubjectValues(request.getIdOrCodeName(), request.getStateType(), request.getStateKind(),
+					request.getValueType(), request.getValueKind()));
 			results.add(result);
 		}
 		return results;
 	}
-	
-	private Collection<SubjectValue> getSubjectValues(String idOrCodeName, String stateType, String stateKind, String valueType, String valueKind){
-		if (SimpleUtil.isNumeric(idOrCodeName)){
+
+	private Collection<SubjectValue> getSubjectValues(String idOrCodeName, String stateType, String stateKind,
+			String valueType, String valueKind) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			Long id = Long.valueOf(idOrCodeName);
-			return SubjectValue.findSubjectValuesBySubjectIDAndStateTypeKindAndValueTypeKind(id, stateType, stateKind, valueType, valueKind).getResultList();
-		}else{
-			return SubjectValue.findSubjectValuesBySubjectCodeNameAndStateTypeKindAndValueTypeKind(idOrCodeName, stateType, stateKind, valueType, valueKind).getResultList();
+			return SubjectValue.findSubjectValuesBySubjectIDAndStateTypeKindAndValueTypeKind(id, stateType, stateKind,
+					valueType, valueKind).getResultList();
+		} else {
+			return SubjectValue.findSubjectValuesBySubjectCodeNameAndStateTypeKindAndValueTypeKind(idOrCodeName,
+					stateType, stateKind, valueType, valueKind).getResultList();
 		}
 	}
 }
diff --git a/src/main/java/com/labsynch/labseer/service/TreatmentGroupService.java b/src/main/java/com/labsynch/labseer/service/TreatmentGroupService.java
index ca15b2146..76cb4ba6d 100755
--- a/src/main/java/com/labsynch/labseer/service/TreatmentGroupService.java
+++ b/src/main/java/com/labsynch/labseer/service/TreatmentGroupService.java
@@ -20,8 +20,8 @@ public interface TreatmentGroupService {
 
 	TreatmentGroup saveLsTreatmentGroup(TreatmentGroup treatmentGroup);
 
-	TreatmentGroup saveLsTreatmentGroup(Set<AnalysisGroup> analysisGroups, TreatmentGroup treatmentGroup, Date recordedDate);
-
+	TreatmentGroup saveLsTreatmentGroup(Set<AnalysisGroup> analysisGroups, TreatmentGroup treatmentGroup,
+			Date recordedDate);
 
 	HashMap<String, TempThingDTO> createLsTreatmentGroupsFromCSV(
 			HashMap<String, TempThingDTO> analysisGroupMap,
@@ -29,5 +29,5 @@ HashMap<String, TempThingDTO> createLsTreatmentGroupsFromCSV(
 
 	HashMap<String, TempThingDTO> createTreatmentGroupsFromCSV(
 			String treatmentGroupFilePath, HashMap<String, TempThingDTO> output) throws IOException;
-	
+
 }
diff --git a/src/main/java/com/labsynch/labseer/service/TreatmentGroupServiceImpl.java b/src/main/java/com/labsynch/labseer/service/TreatmentGroupServiceImpl.java
index 6012ae248..467bebdcd 100755
--- a/src/main/java/com/labsynch/labseer/service/TreatmentGroupServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/TreatmentGroupServiceImpl.java
@@ -1,6 +1,5 @@
 package com.labsynch.labseer.service;
 
-
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -53,67 +52,71 @@ public void saveLsTreatmentGroups(AnalysisGroup newAnalysisGroup, Set<TreatmentG
 			Date recordedDate) {
 		Set<AnalysisGroup> analysisGroups = new HashSet<AnalysisGroup>();
 		analysisGroups.add(newAnalysisGroup);
-		if (treatmentGroups != null){
+		if (treatmentGroups != null) {
 			int j = 0;
-			for (TreatmentGroup treatmentGroup : treatmentGroups){
+			for (TreatmentGroup treatmentGroup : treatmentGroups) {
 				TreatmentGroup newTreatmentGroup = saveLsTreatmentGroup(analysisGroups, treatmentGroup, recordedDate);
-				if ( j % propertiesUtilService.getBatchSize() == 0 ) { 
+				if (j % propertiesUtilService.getBatchSize() == 0) {
 					newTreatmentGroup.flush();
 					newTreatmentGroup.clear();
 				}
 				j++;
 			}
-		}		
+		}
 	}
 
 	@Override
-	public TreatmentGroup saveLsTreatmentGroup(TreatmentGroup treatmentGroup){
+	public TreatmentGroup saveLsTreatmentGroup(TreatmentGroup treatmentGroup) {
 
 		// logger.debug("incoming meta treatmentGroup: " + treatmentGroup.toJson());
-		Date recordedDate = new Date();		
+		Date recordedDate = new Date();
 		return saveLsTreatmentGroup(treatmentGroup.getAnalysisGroups(), treatmentGroup, recordedDate);
 
 	}
 
 	@Override
 	@Transactional
-	public TreatmentGroup saveLsTreatmentGroup(Set<AnalysisGroup> analysisGroups, TreatmentGroup treatmentGroup, Date recordedDate){
+	public TreatmentGroup saveLsTreatmentGroup(Set<AnalysisGroup> analysisGroups, TreatmentGroup treatmentGroup,
+			Date recordedDate) {
 
 		//// logger.debug("incoming meta treatmentGroup: " + treatmentGroup.toJson());
 		TreatmentGroup newTreatmentGroup = null;
 
-		if (treatmentGroup.getId() == null){
+		if (treatmentGroup.getId() == null) {
 			newTreatmentGroup = new TreatmentGroup(treatmentGroup);
-			if (newTreatmentGroup.getCodeName() == null){
+			if (newTreatmentGroup.getCodeName() == null) {
 				newTreatmentGroup.setCodeName(autoLabelService.getTreatmentGroupCodeName());
 			}
-			if (newTreatmentGroup.getRecordedDate() == null){
+			if (newTreatmentGroup.getRecordedDate() == null) {
 				newTreatmentGroup.setRecordedDate(recordedDate);
 			}
 
-			for (AnalysisGroup analysisGroup : analysisGroups){
-				newTreatmentGroup.getAnalysisGroups().add(AnalysisGroup.findAnalysisGroup(analysisGroup.getId()));				
+			for (AnalysisGroup analysisGroup : analysisGroups) {
+				newTreatmentGroup.getAnalysisGroups().add(AnalysisGroup.findAnalysisGroup(analysisGroup.getId()));
 			}
 			newTreatmentGroup.persist();
-			// logger.debug("persisted the new treatmentGroup: " + newTreatmentGroup.toJson());
+			// logger.debug("persisted the new treatmentGroup: " +
+			// newTreatmentGroup.toJson());
 
 			saveLabels(treatmentGroup, newTreatmentGroup, recordedDate);
 			saveStates(treatmentGroup, newTreatmentGroup, recordedDate);
 
-			// logger.debug("look at subjects: ------------------ " + Subject.toJsonArray(treatmentGroup.getSubjects()));
+			// logger.debug("look at subjects: ------------------ " +
+			// Subject.toJsonArray(treatmentGroup.getSubjects()));
 			saveSubjects(newTreatmentGroup, treatmentGroup.getSubjects(), recordedDate);
 
-
 		} else {
 			newTreatmentGroup = TreatmentGroup.findTreatmentGroup(treatmentGroup.getId());
-			for (AnalysisGroup analysisGroup : analysisGroups){
-				newTreatmentGroup.getAnalysisGroups().add(AnalysisGroup.findAnalysisGroup(analysisGroup.getId()));				
+			for (AnalysisGroup analysisGroup : analysisGroups) {
+				newTreatmentGroup.getAnalysisGroups().add(AnalysisGroup.findAnalysisGroup(analysisGroup.getId()));
 			}
 			newTreatmentGroup.merge();
-			// logger.debug("updated the treatmentGroup: -------------- " + newTreatmentGroup.toJson());
-			if (treatmentGroup.getSubjects() != null){
-				// logger.debug("look at subjects: ------------------ " + Subject.toJsonArray(newTreatmentGroup.getSubjects()));
-				saveSubjects(newTreatmentGroup, newTreatmentGroup.getSubjects(), recordedDate);				
+			// logger.debug("updated the treatmentGroup: -------------- " +
+			// newTreatmentGroup.toJson());
+			if (treatmentGroup.getSubjects() != null) {
+				// logger.debug("look at subjects: ------------------ " +
+				// Subject.toJsonArray(newTreatmentGroup.getSubjects()));
+				saveSubjects(newTreatmentGroup, newTreatmentGroup.getSubjects(), recordedDate);
 			}
 		}
 
@@ -122,52 +125,57 @@ public TreatmentGroup saveLsTreatmentGroup(Set<AnalysisGroup> analysisGroups, Tr
 
 	private void saveSubjects(TreatmentGroup treatmentGroup,
 			Set<Subject> subjects, Date recordedDate) {
-		if (treatmentGroup.getSubjects().size() > 0){
+		if (treatmentGroup.getSubjects().size() > 0) {
 			subjectService.saveSubjects(treatmentGroup, subjects, recordedDate);
-		}		
+		}
 	}
 
 	private void saveStates(TreatmentGroup treatmentGroup,
 			TreatmentGroup newTreatmentGroup, Date recordedDate) {
-		if (treatmentGroup.getLsStates() != null){
-			for(TreatmentGroupState treatmentGroupState : treatmentGroup.getLsStates()){
+		if (treatmentGroup.getLsStates() != null) {
+			for (TreatmentGroupState treatmentGroupState : treatmentGroup.getLsStates()) {
 				TreatmentGroupState newTreatmentGroupState = new TreatmentGroupState(treatmentGroupState);
 				newTreatmentGroupState.setTreatmentGroup(newTreatmentGroup);
 				newTreatmentGroupState.persist();
-				if (treatmentGroupState.getLsValues() != null){
-					for(TreatmentGroupValue treatmentGroupValue : treatmentGroupState.getLsValues()){
+				if (treatmentGroupState.getLsValues() != null) {
+					for (TreatmentGroupValue treatmentGroupValue : treatmentGroupState.getLsValues()) {
 						treatmentGroupValue.setLsState(newTreatmentGroupState);
-						if (treatmentGroupValue.getRecordedDate() == null) {treatmentGroupValue.setRecordedDate(recordedDate);}
+						if (treatmentGroupValue.getRecordedDate() == null) {
+							treatmentGroupValue.setRecordedDate(recordedDate);
+						}
 						treatmentGroupValue.persist();
-					}										
+					}
 				}
-			}					
-		}		
+			}
+		}
 	}
 
 	private void saveLabels(TreatmentGroup treatmentGroup,
 			TreatmentGroup newTreatmentGroup, Date recordedDate) {
 		if (treatmentGroup.getLsLabels() != null) {
-			for(TreatmentGroupLabel treatmentGroupLabel : treatmentGroup.getLsLabels()){
+			for (TreatmentGroupLabel treatmentGroupLabel : treatmentGroup.getLsLabels()) {
 				TreatmentGroupLabel newTreatmentGroupLabel = new TreatmentGroupLabel(treatmentGroupLabel);
 				newTreatmentGroupLabel.setTreatmentGroup(newTreatmentGroup);
-				if (newTreatmentGroupLabel.getRecordedDate() == null) {newTreatmentGroupLabel.setRecordedDate(recordedDate);}
-				newTreatmentGroupLabel.persist();	
-			}		
-		}		
+				if (newTreatmentGroupLabel.getRecordedDate() == null) {
+					newTreatmentGroupLabel.setRecordedDate(recordedDate);
+				}
+				newTreatmentGroupLabel.persist();
+			}
+		}
 	}
 
 	@Override
 	@Transactional
-	public TreatmentGroup updateTreatmentGroup(TreatmentGroup treatmentGroup){
+	public TreatmentGroup updateTreatmentGroup(TreatmentGroup treatmentGroup) {
 
-		// logger.info("incoming meta treatmentGroup to update: " + treatmentGroup.toJson());
+		// logger.info("incoming meta treatmentGroup to update: " +
+		// treatmentGroup.toJson());
 
 		TreatmentGroup updatedTreatmentGroup = TreatmentGroup.update(treatmentGroup);
 
 		if (treatmentGroup.getLsLabels() != null) {
-			for(TreatmentGroupLabel treatmentGroupLabel : treatmentGroup.getLsLabels()){
-				if (treatmentGroupLabel.getId() == null){
+			for (TreatmentGroupLabel treatmentGroupLabel : treatmentGroup.getLsLabels()) {
+				if (treatmentGroupLabel.getId() == null) {
 					TreatmentGroupLabel newTreatmentGroupLabel = new TreatmentGroupLabel(treatmentGroupLabel);
 					newTreatmentGroupLabel.setTreatmentGroup(updatedTreatmentGroup);
 					newTreatmentGroupLabel.persist();
@@ -175,45 +183,54 @@ public TreatmentGroup updateTreatmentGroup(TreatmentGroup treatmentGroup){
 				} else {
 					treatmentGroupLabel = TreatmentGroupLabel.update(treatmentGroupLabel);
 				}
-			}			
-		} 
+			}
+		}
 
-		if (treatmentGroup.getLsStates() != null){
-			for(TreatmentGroupState treatmentGroupState : treatmentGroup.getLsStates()){
-				if (treatmentGroupState.getId() == null){
+		if (treatmentGroup.getLsStates() != null) {
+			for (TreatmentGroupState treatmentGroupState : treatmentGroup.getLsStates()) {
+				if (treatmentGroupState.getId() == null) {
 					TreatmentGroupState newTreatmentGroupState = new TreatmentGroupState(treatmentGroupState);
 					newTreatmentGroupState.setTreatmentGroup(updatedTreatmentGroup);
-					if (newTreatmentGroupState.getRecordedDate() == null) {newTreatmentGroupState.setRecordedDate(new Date());}		
-					if (newTreatmentGroupState.getRecordedBy() == null) { newTreatmentGroupState.setRecordedBy(updatedTreatmentGroup.getRecordedBy()); }
+					if (newTreatmentGroupState.getRecordedDate() == null) {
+						newTreatmentGroupState.setRecordedDate(new Date());
+					}
+					if (newTreatmentGroupState.getRecordedBy() == null) {
+						newTreatmentGroupState.setRecordedBy(updatedTreatmentGroup.getRecordedBy());
+					}
 					newTreatmentGroupState.persist();
 					treatmentGroupState.setId(newTreatmentGroupState.getId());
 				} else {
 					TreatmentGroupState updatedTreatmentGroupState = TreatmentGroupState.update(treatmentGroupState);
 					// logger.debug(updatedTreatmentGroupState.toJson());
 				}
-				if (treatmentGroupState.getLsValues() != null){
-					for(TreatmentGroupValue treatmentGroupValue : treatmentGroupState.getLsValues()){
-						if (treatmentGroupValue.getId() == null){
-							if (treatmentGroupValue.getRecordedDate() == null) {treatmentGroupValue.setRecordedDate(new Date());}
-							treatmentGroupValue.setLsState(TreatmentGroupState.findTreatmentGroupState(treatmentGroupState.getId()));
+				if (treatmentGroupState.getLsValues() != null) {
+					for (TreatmentGroupValue treatmentGroupValue : treatmentGroupState.getLsValues()) {
+						if (treatmentGroupValue.getId() == null) {
+							if (treatmentGroupValue.getRecordedDate() == null) {
+								treatmentGroupValue.setRecordedDate(new Date());
+							}
+							treatmentGroupValue.setLsState(
+									TreatmentGroupState.findTreatmentGroupState(treatmentGroupState.getId()));
 							treatmentGroupValue.persist();
 						} else {
-							treatmentGroupValue.setLsState(TreatmentGroupState.findTreatmentGroupState(treatmentGroupState.getId()));
-							TreatmentGroupValue updatedTreatmentGroupValue = TreatmentGroupValue.update(treatmentGroupValue);
+							treatmentGroupValue.setLsState(
+									TreatmentGroupState.findTreatmentGroupState(treatmentGroupState.getId()));
+							TreatmentGroupValue updatedTreatmentGroupValue = TreatmentGroupValue
+									.update(treatmentGroupValue);
 							// logger.debug(updatedTreatmentGroupValue.toJson());
 						}
 
-					}				
+					}
 				}
 			}
 		}
 
-		if (treatmentGroup.getSubjects() != null){
-			for(Subject subject : treatmentGroup.getSubjects()){
-				if (subject.getId() == null){
+		if (treatmentGroup.getSubjects() != null) {
+			for (Subject subject : treatmentGroup.getSubjects()) {
+				if (subject.getId() == null) {
 					Subject newSubject = new Subject(subject);
 					newSubject.getTreatmentGroups().add(treatmentGroup);
-					newSubject.persist();							
+					newSubject.persist();
 				} else {
 					subject = Subject.update(subject);
 				}
@@ -229,11 +246,13 @@ public HashMap<String, TempThingDTO> createLsTreatmentGroupsFromCSV(
 			HashMap<String, TempThingDTO> analysisGroupMap,
 			String treatmentGroupCSV, String subjectCSV) throws IOException {
 
-		HashMap<String, TempThingDTO> treatmentGroupMap = createTreatmentGroupsFromCSV(treatmentGroupCSV, analysisGroupMap);
+		HashMap<String, TempThingDTO> treatmentGroupMap = createTreatmentGroupsFromCSV(treatmentGroupCSV,
+				analysisGroupMap);
 
-		if (subjectCSV != null){
+		if (subjectCSV != null) {
 
-			HashMap<String, TempThingDTO> subjectGroupMap = subjectService.createSubjectsFromCSV(subjectCSV, treatmentGroupMap);
+			HashMap<String, TempThingDTO> subjectGroupMap = subjectService.createSubjectsFromCSV(subjectCSV,
+					treatmentGroupMap);
 
 		}
 
@@ -241,14 +260,14 @@ public HashMap<String, TempThingDTO> createLsTreatmentGroupsFromCSV(
 
 	}
 
-//	private HashMap<String, TempThingDTO> createTreatmentGroupsFromCSV(
-//			HashMap<String, TempThingDTO> analysisGroupMap,
-//			String treatmentGroupCSV) {
-//
-//
-//		// TODO Auto-generated method stub
-//		return null;
-//	}
+	// private HashMap<String, TempThingDTO> createTreatmentGroupsFromCSV(
+	// HashMap<String, TempThingDTO> analysisGroupMap,
+	// String treatmentGroupCSV) {
+	//
+	//
+	// // TODO Auto-generated method stub
+	// return null;
+	// }
 
 	@Override
 	@Transactional
@@ -264,8 +283,8 @@ public HashMap<String, TempThingDTO> createTreatmentGroupsFromCSV(
 
 		try {
 			// logger.info("read csv delimited file");
-			InputStream is = new FileInputStream(treatmentGroupFilePath);  
-			InputStreamReader isr = new InputStreamReader(is);  
+			InputStream is = new FileInputStream(treatmentGroupFilePath);
+			InputStreamReader isr = new InputStreamReader(is);
 			BufferedReader br = new BufferedReader(isr);
 
 			beanReader = new CsvBeanReader(br, CsvPreference.TAB_PREFERENCE);
@@ -273,18 +292,18 @@ public HashMap<String, TempThingDTO> createTreatmentGroupsFromCSV(
 
 			List<String> headerList = new ArrayList<String>();
 			int position = 0;
-			for (String head : headerText){
-				// logger.info("header column: " + position + "  " + head);
+			for (String head : headerText) {
+				// logger.info("header column: " + position + " " + head);
 				headerList.add(head);
 				position++;
 			}
 
-			// logger.info("size of header list  " + headerList.size());
+			// logger.info("size of header list " + headerList.size());
 			String[] header = new String[headerList.size()];
 			headerList.toArray(header);
 
-			for (String head : header){
-				// logger.debug("header column array : " + position + "  " + head);
+			for (String head : header) {
+				// logger.debug("header column array : " + position + " " + head);
 				position++;
 			}
 
@@ -297,66 +316,83 @@ public HashMap<String, TempThingDTO> createTreatmentGroupsFromCSV(
 
 			long rowIndex = 1;
 			Set<AnalysisGroup> analysisGroups = new HashSet<AnalysisGroup>();
-			while( (treatmentGroupDTO = beanReader.read(FlatThingCsvDTO.class, header, processors)) != null ) {
-				// logger.debug(String.format("lineNo=%s, rowNo=%s, bulkData=%s", beanReader.getLineNumber(), beanReader.getRowNumber(), treatmentGroupDTO));
+			while ((treatmentGroupDTO = beanReader.read(FlatThingCsvDTO.class, header, processors)) != null) {
+				// logger.debug(String.format("lineNo=%s, rowNo=%s, bulkData=%s",
+				// beanReader.getLineNumber(), beanReader.getRowNumber(), treatmentGroupDTO));
 
-				if (treatmentGroupDTO.getLsType() == null) treatmentGroupDTO.setLsType("default");
-				if (treatmentGroupDTO.getLsKind() == null) treatmentGroupDTO.setLsKind("default");
-				if (treatmentGroupDTO.getTempId() == null) treatmentGroupDTO.setTempId(treatmentGroupDTO.getId().toString());
+				if (treatmentGroupDTO.getLsType() == null)
+					treatmentGroupDTO.setLsType("default");
+				if (treatmentGroupDTO.getLsKind() == null)
+					treatmentGroupDTO.setLsKind("default");
+				if (treatmentGroupDTO.getTempId() == null)
+					treatmentGroupDTO.setTempId(treatmentGroupDTO.getId().toString());
 
 				treatmentGroup = getOrCreateTreatmentGroup(treatmentGroupDTO, treatmentGroupMap, analysisGroupMap);
-				if (treatmentGroup != null){
-					if (treatmentGroup.getId() == null){
+				if (treatmentGroup != null) {
+					if (treatmentGroup.getId() == null) {
 						treatmentGroup.persist();
 					} else {
 						treatmentGroup.merge();
 					}
-//					AnalysisGroup analysisGroup = AnalysisGroup.findAnalysisGroup(analysisGroupMap.get(treatmentGroupDTO.getTempParentId()).getId());
-//					analysisGroup.getTreatmentGroups().add(treatmentGroup);
-//					analysisGroups.add(analysisGroup);
-					// logger.debug("saved the new treatment Group: ID: " + treatmentGroup.getId() + " codeName" + treatmentGroup.getCodeName());
+					// AnalysisGroup analysisGroup =
+					// AnalysisGroup.findAnalysisGroup(analysisGroupMap.get(treatmentGroupDTO.getTempParentId()).getId());
+					// analysisGroup.getTreatmentGroups().add(treatmentGroup);
+					// analysisGroups.add(analysisGroup);
+					// logger.debug("saved the new treatment Group: ID: " + treatmentGroup.getId() +
+					// " codeName" + treatmentGroup.getCodeName());
 					// logger.debug("saved the new treatment group: " + treatmentGroup.toJson());
 					treatmentGroupMap = saveTempTreatmentGroup(treatmentGroup, treatmentGroupDTO, treatmentGroupMap);
 				}
 
-				if (treatmentGroupDTO.getStateType() != null && treatmentGroupDTO.getStateKind() != null){
-					if (treatmentGroupDTO.getTempStateId() == null) treatmentGroupDTO.setTempStateId(treatmentGroupDTO.getStateId().toString());
-					// logger.debug("treatmentGroupDTO.getTempStateId() is " + treatmentGroupDTO.getTempStateId());
-					treatmentGroupState = getOrCreateTreatmentState(treatmentGroupDTO, treatmentStateMap, treatmentGroupMap);
-					if (treatmentGroupState != null){
+				if (treatmentGroupDTO.getStateType() != null && treatmentGroupDTO.getStateKind() != null) {
+					if (treatmentGroupDTO.getTempStateId() == null)
+						treatmentGroupDTO.setTempStateId(treatmentGroupDTO.getStateId().toString());
+					// logger.debug("treatmentGroupDTO.getTempStateId() is " +
+					// treatmentGroupDTO.getTempStateId());
+					treatmentGroupState = getOrCreateTreatmentState(treatmentGroupDTO, treatmentStateMap,
+							treatmentGroupMap);
+					if (treatmentGroupState != null) {
 						treatmentGroupState.persist();
-						// logger.debug("saved the new treatment group state: " + treatmentGroupState.getId());
-						// logger.debug("saved the new treatment group state: " + treatmentGroupState.toJson());
-						treatmentStateMap = saveTempTreatmentState(treatmentGroupState, treatmentGroupDTO, treatmentStateMap);
+						// logger.debug("saved the new treatment group state: " +
+						// treatmentGroupState.getId());
+						// logger.debug("saved the new treatment group state: " +
+						// treatmentGroupState.toJson());
+						treatmentStateMap = saveTempTreatmentState(treatmentGroupState, treatmentGroupDTO,
+								treatmentStateMap);
 					}
 
-					if (treatmentGroupDTO.getValueType() != null && treatmentGroupDTO.getValueKind() != null){
-						if (treatmentGroupDTO.getTempValueId() == null) treatmentGroupDTO.setTempValueId(Long.toString(rowIndex));
-						treatmentGroupValue = getOrCreateTreatmentValue(treatmentGroupDTO, treatmentValueMap, treatmentStateMap);
-						if (treatmentGroupValue != null){
+					if (treatmentGroupDTO.getValueType() != null && treatmentGroupDTO.getValueKind() != null) {
+						if (treatmentGroupDTO.getTempValueId() == null)
+							treatmentGroupDTO.setTempValueId(Long.toString(rowIndex));
+						treatmentGroupValue = getOrCreateTreatmentValue(treatmentGroupDTO, treatmentValueMap,
+								treatmentStateMap);
+						if (treatmentGroupValue != null) {
 							treatmentGroupValue.persist();
-							// logger.debug("saved the treatment Group Value: " + treatmentGroupValue.toJson());
-							if ( rowIndex % batchSize == 0 ) {
+							// logger.debug("saved the treatment Group Value: " +
+							// treatmentGroupValue.toJson());
+							if (rowIndex % batchSize == 0) {
 								treatmentGroupValue.flush();
 								treatmentGroupValue.clear();
 							}
-							treatmentValueMap = saveTempTreatmentValue(treatmentGroupValue, treatmentGroupDTO, treatmentValueMap);
+							treatmentValueMap = saveTempTreatmentValue(treatmentGroupValue, treatmentGroupDTO,
+									treatmentValueMap);
 						}
 					}
 				} else {
-					// logger.debug("---------- not saving a new treatment group state: " + treatmentGroupDTO.getStateType());
+					// logger.debug("---------- not saving a new treatment group state: " +
+					// treatmentGroupDTO.getStateType());
 				}
 
 				rowIndex++;
 			}
-//			Long beforeMerge = new Date().getTime();
-//			// logger.info("Number of AnalysisGroups to merge: "+ analysisGroups.size());
-//			for (AnalysisGroup analysisGroup: analysisGroups) {
-//				analysisGroup.merge();	
-//			}
-//			Long afterMerge = new Date().getTime();
-//			Long mergeDuration = afterMerge - beforeMerge;
-//			// logger.info("Merging AnalysisGroups took: "+ mergeDuration + " ms");
+			// Long beforeMerge = new Date().getTime();
+			// // logger.info("Number of AnalysisGroups to merge: "+ analysisGroups.size());
+			// for (AnalysisGroup analysisGroup: analysisGroups) {
+			// analysisGroup.merge();
+			// }
+			// Long afterMerge = new Date().getTime();
+			// Long mergeDuration = afterMerge - beforeMerge;
+			// // logger.info("Merging AnalysisGroups took: "+ mergeDuration + " ms");
 
 		} catch (IOException e) {
 			e.printStackTrace();
@@ -377,7 +413,7 @@ private HashMap<String, TempThingDTO> saveTempTreatmentValue(
 		tempThingDTO.setTempId(treatmentGroupDTO.getTempValueId());
 		treatmentValueMap.put(treatmentGroupDTO.getTempValueId(), tempThingDTO);
 
-		return treatmentValueMap;	
+		return treatmentValueMap;
 	}
 
 	private TreatmentGroupValue getOrCreateTreatmentValue(
@@ -386,20 +422,22 @@ private TreatmentGroupValue getOrCreateTreatmentValue(
 			HashMap<String, TempThingDTO> treatmentStateMap) {
 
 		TreatmentGroupValue treatmentGroupValue = null;
-		if (!treatmentValueMap.containsKey(treatmentGroupDTO.getTempValueId())){
-			if (treatmentGroupDTO.getValueId() == null){
+		if (!treatmentValueMap.containsKey(treatmentGroupDTO.getTempValueId())) {
+			if (treatmentGroupDTO.getValueId() == null) {
 				treatmentGroupValue = new TreatmentGroupValue(treatmentGroupDTO);
 				// logger.debug("query state: " + treatmentGroupDTO.getTempStateId());
 				Set<String> treatmentStateKeys = treatmentStateMap.keySet();
-				for (String key : treatmentStateKeys){
+				for (String key : treatmentStateKeys) {
 					// logger.debug("treatmentStateKey: " + key);
 				}
-				treatmentGroupValue.setLsState(TreatmentGroupState.findTreatmentGroupState(treatmentStateMap.get(treatmentGroupDTO.getTempStateId()).getId()));				
+				treatmentGroupValue.setLsState(TreatmentGroupState
+						.findTreatmentGroupState(treatmentStateMap.get(treatmentGroupDTO.getTempStateId()).getId()));
 			} else {
 				treatmentGroupValue = TreatmentGroupValue.findTreatmentGroupValue(treatmentGroupDTO.getValueId());
 			}
 		} else {
-			// logger.debug("skipping the saved treatmentGroupValue --------- " + treatmentGroupDTO.getValueId());
+			// logger.debug("skipping the saved treatmentGroupValue --------- " +
+			// treatmentGroupDTO.getValueId());
 		}
 
 		return treatmentGroupValue;
@@ -416,7 +454,7 @@ private HashMap<String, TempThingDTO> saveTempTreatmentState(
 		// logger.debug("saving the temp state: " + tempThingDTO.getTempId());
 		treatmentStateMap.put(treatmentGroupDTO.getTempStateId(), tempThingDTO);
 
-		return treatmentStateMap;		
+		return treatmentStateMap;
 	}
 
 	private TreatmentGroupState getOrCreateTreatmentState(
@@ -425,15 +463,17 @@ private TreatmentGroupState getOrCreateTreatmentState(
 			HashMap<String, TempThingDTO> treatmentGroupMap) {
 
 		TreatmentGroupState treatmentGroupState = null;
-		if (!treatmentStateMap.containsKey(treatmentGroupDTO.getTempStateId())){
-			if (treatmentGroupDTO.getStateId() == null){
+		if (!treatmentStateMap.containsKey(treatmentGroupDTO.getTempStateId())) {
+			if (treatmentGroupDTO.getStateId() == null) {
 				treatmentGroupState = new TreatmentGroupState(treatmentGroupDTO);
-				treatmentGroupState.setTreatmentGroup(TreatmentGroup.findTreatmentGroup(treatmentGroupMap.get(treatmentGroupDTO.getTempId()).getId()));				
+				treatmentGroupState.setTreatmentGroup(TreatmentGroup
+						.findTreatmentGroup(treatmentGroupMap.get(treatmentGroupDTO.getTempId()).getId()));
 			} else {
 				treatmentGroupState = TreatmentGroupState.findTreatmentGroupState(treatmentGroupDTO.getStateId());
 			}
 		} else {
-			// logger.debug("skipping the saved treatmentGroupState --------- " + treatmentGroupDTO.getStateId());
+			// logger.debug("skipping the saved treatmentGroupState --------- " +
+			// treatmentGroupDTO.getStateId());
 		}
 
 		return treatmentGroupState;
@@ -459,32 +499,36 @@ private TreatmentGroup getOrCreateTreatmentGroup(
 			HashMap<String, TempThingDTO> analysisGroupMap) {
 
 		TreatmentGroup treatmentGroup = null;
-		if (!treatmentGroupMap.containsKey(treatmentGroupDTO.getTempId())){
-			if (treatmentGroupDTO.getId() == null){
-				if (treatmentGroupDTO.getTempParentId() != null && !treatmentGroupDTO.getTempParentId().equalsIgnoreCase("null")){
+		if (!treatmentGroupMap.containsKey(treatmentGroupDTO.getTempId())) {
+			if (treatmentGroupDTO.getId() == null) {
+				if (treatmentGroupDTO.getTempParentId() != null
+						&& !treatmentGroupDTO.getTempParentId().equalsIgnoreCase("null")) {
 					treatmentGroup = new TreatmentGroup(treatmentGroupDTO);
-					if (treatmentGroup.getCodeName() == null){
+					if (treatmentGroup.getCodeName() == null) {
 						String newCodeName = autoLabelService.getTreatmentGroupCodeName();
 						// logger.debug("------------------ new codeName: " + newCodeName);
 						treatmentGroup.setCodeName(newCodeName);
 					}
 				} else {
-					// logger.debug("the temp parent ID is null" + treatmentGroupDTO.getTempParentId());
+					// logger.debug("the temp parent ID is null" +
+					// treatmentGroupDTO.getTempParentId());
 				}
 			} else {
 				treatmentGroup = TreatmentGroup.findTreatmentGroup(treatmentGroupDTO.getId());
 			}
 			Set<AnalysisGroup> analysisGroups = new HashSet<AnalysisGroup>();
-			AnalysisGroup foundAnalysisGroup = AnalysisGroup.findAnalysisGroup(analysisGroupMap.get(treatmentGroupDTO.getTempParentId()).getId());
+			AnalysisGroup foundAnalysisGroup = AnalysisGroup
+					.findAnalysisGroup(analysisGroupMap.get(treatmentGroupDTO.getTempParentId()).getId());
 			analysisGroups.add(foundAnalysisGroup);
-			if (treatmentGroup.getAnalysisGroups() == null){
+			if (treatmentGroup.getAnalysisGroups() == null) {
 				treatmentGroup.setAnalysisGroups(analysisGroups);
 			} else {
 				treatmentGroup.getAnalysisGroups().addAll(analysisGroups);
 			}
 
 		} else {
-			// logger.debug("skipping the previously saved treatmentGroup --------- " + treatmentGroupDTO.getCodeName());
+			// logger.debug("skipping the previously saved treatmentGroup --------- " +
+			// treatmentGroupDTO.getCodeName());
 		}
 		return treatmentGroup;
 	}
diff --git a/src/main/java/com/labsynch/labseer/service/TreatmentGroupStateService.java b/src/main/java/com/labsynch/labseer/service/TreatmentGroupStateService.java
index 0c064dab0..0aeaa3a42 100644
--- a/src/main/java/com/labsynch/labseer/service/TreatmentGroupStateService.java
+++ b/src/main/java/com/labsynch/labseer/service/TreatmentGroupStateService.java
@@ -38,6 +38,4 @@ TreatmentGroupState getTreatmentGroupState(String idOrCodeName,
 	Collection<TreatmentGroupStatePathDTO> getTreatmentGroupStates(
 			Collection<GenericStatePathRequest> genericRequests);
 
-	
-	
 }
diff --git a/src/main/java/com/labsynch/labseer/service/TreatmentGroupStateServiceImpl.java b/src/main/java/com/labsynch/labseer/service/TreatmentGroupStateServiceImpl.java
index 7a4839cee..26866f3da 100644
--- a/src/main/java/com/labsynch/labseer/service/TreatmentGroupStateServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/TreatmentGroupStateServiceImpl.java
@@ -25,41 +25,47 @@
 public class TreatmentGroupStateServiceImpl implements TreatmentGroupStateService {
 
 	private static final Logger logger = LoggerFactory.getLogger(TreatmentGroupStateServiceImpl.class);
-	
+
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
 
 	@Override
 	public List<TreatmentGroupState> getTreatmentGroupStatesByTreatmentGroupIdAndStateTypeKind(
 			Long treatmentGroupId, String stateType, String stateKind) {
-		
-			List<TreatmentGroupState> treatmentGroupStates = TreatmentGroupState.findTreatmentGroupStatesByTreatmentGroupIDAndStateTypeKind(treatmentGroupId, stateType, stateKind).getResultList();
 
-			return treatmentGroupStates;
-		
+		List<TreatmentGroupState> treatmentGroupStates = TreatmentGroupState
+				.findTreatmentGroupStatesByTreatmentGroupIDAndStateTypeKind(treatmentGroupId, stateType, stateKind)
+				.getResultList();
+
+		return treatmentGroupStates;
+
 	}
-	
+
 	@Override
-	public Collection<TreatmentGroupState> ignoreAllTreatmentGroupStates(Collection<TreatmentGroupState> treatmentGroupStates) {
-		//mark treatmentGroupStates and values as ignore 
+	public Collection<TreatmentGroupState> ignoreAllTreatmentGroupStates(
+			Collection<TreatmentGroupState> treatmentGroupStates) {
+		// mark treatmentGroupStates and values as ignore
 		Collection<TreatmentGroupState> treatmentGroupStateSet = new HashSet<TreatmentGroupState>();
-		for (TreatmentGroupState queryTreatmentGroupState : treatmentGroupStates){
-			TreatmentGroupState treatmentGroupState = TreatmentGroupState.findTreatmentGroupState(queryTreatmentGroupState.getId());			
-				for(TreatmentGroupValue treatmentGroupValue : TreatmentGroupValue.findTreatmentGroupValuesByLsState(treatmentGroupState).getResultList()){
-					treatmentGroupValue.setIgnored(true);
-					treatmentGroupValue.merge();
-				}
-				treatmentGroupState.setIgnored(true);
-				treatmentGroupState.merge();
-				treatmentGroupStateSet.add(TreatmentGroupState.findTreatmentGroupState(treatmentGroupState.getId()));
+		for (TreatmentGroupState queryTreatmentGroupState : treatmentGroupStates) {
+			TreatmentGroupState treatmentGroupState = TreatmentGroupState
+					.findTreatmentGroupState(queryTreatmentGroupState.getId());
+			for (TreatmentGroupValue treatmentGroupValue : TreatmentGroupValue
+					.findTreatmentGroupValuesByLsState(treatmentGroupState).getResultList()) {
+				treatmentGroupValue.setIgnored(true);
+				treatmentGroupValue.merge();
+			}
+			treatmentGroupState.setIgnored(true);
+			treatmentGroupState.merge();
+			treatmentGroupStateSet.add(TreatmentGroupState.findTreatmentGroupState(treatmentGroupState.getId()));
 		}
 
-		return(treatmentGroupStateSet);
+		return (treatmentGroupStateSet);
 
 	}
 
 	@Override
-	public TreatmentGroupState createTreatmentGroupStateByTreatmentGroupIdAndStateTypeKind(Long treatmentGroupId, String stateType, String stateKind) {
+	public TreatmentGroupState createTreatmentGroupStateByTreatmentGroupIdAndStateTypeKind(Long treatmentGroupId,
+			String stateType, String stateKind) {
 		TreatmentGroupState treatmentGroupState = new TreatmentGroupState();
 		TreatmentGroup treatmentGroup = TreatmentGroup.findTreatmentGroup(treatmentGroupId);
 		treatmentGroupState.setTreatmentGroup(treatmentGroup);
@@ -73,10 +79,11 @@ public TreatmentGroupState createTreatmentGroupStateByTreatmentGroupIdAndStateTy
 	@Override
 	public TreatmentGroupState saveTreatmentGroupState(
 			TreatmentGroupState treatmentGroupState) {
-		treatmentGroupState.setTreatmentGroup(TreatmentGroup.findTreatmentGroup(treatmentGroupState.getTreatmentGroup().getId()));		
+		treatmentGroupState
+				.setTreatmentGroup(TreatmentGroup.findTreatmentGroup(treatmentGroupState.getTreatmentGroup().getId()));
 		treatmentGroupState.persist();
 		Set<TreatmentGroupValue> savedValues = new HashSet<TreatmentGroupValue>();
-		for (TreatmentGroupValue treatmentGroupValue : treatmentGroupState.getLsValues()){
+		for (TreatmentGroupValue treatmentGroupValue : treatmentGroupState.getLsValues()) {
 			treatmentGroupValue.setLsState(treatmentGroupState);
 			treatmentGroupValue.persist();
 			savedValues.add(treatmentGroupValue);
@@ -89,16 +96,17 @@ public TreatmentGroupState saveTreatmentGroupState(
 	@Override
 	public Collection<TreatmentGroupState> saveTreatmentGroupStates(
 			Collection<TreatmentGroupState> treatmentGroupStates) {
-		for (TreatmentGroupState treatmentGroupState: treatmentGroupStates) {
+		for (TreatmentGroupState treatmentGroupState : treatmentGroupStates) {
 			treatmentGroupState = saveTreatmentGroupState(treatmentGroupState);
 		}
 		return treatmentGroupStates;
 	}
-	
+
 	@Override
 	public TreatmentGroupState updateTreatmentGroupState(
 			TreatmentGroupState treatmentGroupState) {
-		treatmentGroupState.setVersion(TreatmentGroupState.findTreatmentGroupState(treatmentGroupState.getId()).getVersion());
+		treatmentGroupState
+				.setVersion(TreatmentGroupState.findTreatmentGroupState(treatmentGroupState.getId()).getVersion());
 		treatmentGroupState.merge();
 		return treatmentGroupState;
 	}
@@ -106,21 +114,21 @@ public TreatmentGroupState updateTreatmentGroupState(
 	@Override
 	public Collection<TreatmentGroupState> updateTreatmentGroupStates(
 			Collection<TreatmentGroupState> treatmentGroupStates) {
-		for (TreatmentGroupState treatmentGroupState : treatmentGroupStates){
+		for (TreatmentGroupState treatmentGroupState : treatmentGroupStates) {
 			treatmentGroupState = updateTreatmentGroupState(treatmentGroupState);
 		}
 		return null;
 	}
-	
+
 	@Override
 	public TreatmentGroupState getTreatmentGroupState(String idOrCodeName,
 			String stateType, String stateKind) {
 		TreatmentGroupState state = null;
-		try{
+		try {
 			Collection<TreatmentGroupState> states = getTreatmentGroupStates(idOrCodeName, stateType, stateKind);
 			state = states.iterator().next();
-		}catch (Exception e){
-			logger.error("Caught error "+e.toString()+" trying to find a state.",e);
+		} catch (Exception e) {
+			logger.error("Caught error " + e.toString() + " trying to find a state.", e);
 			state = null;
 		}
 		return state;
@@ -130,23 +138,28 @@ public TreatmentGroupState getTreatmentGroupState(String idOrCodeName,
 	public Collection<TreatmentGroupStatePathDTO> getTreatmentGroupStates(
 			Collection<GenericStatePathRequest> genericRequests) {
 		Collection<TreatmentGroupStatePathDTO> results = new ArrayList<TreatmentGroupStatePathDTO>();
-		for (GenericStatePathRequest request : genericRequests){
+		for (GenericStatePathRequest request : genericRequests) {
 			TreatmentGroupStatePathDTO result = new TreatmentGroupStatePathDTO();
 			result.setIdOrCodeName(request.getIdOrCodeName());
 			result.setStateType(request.getStateType());
 			result.setStateKind(request.getStateKind());
-			result.setStates(getTreatmentGroupStates(request.getIdOrCodeName(), request.getStateType(), request.getStateKind()));
+			result.setStates(
+					getTreatmentGroupStates(request.getIdOrCodeName(), request.getStateType(), request.getStateKind()));
 			results.add(result);
 		}
 		return results;
 	}
-	
-	private Collection<TreatmentGroupState> getTreatmentGroupStates(String idOrCodeName, String stateType, String stateKind){
-		if (SimpleUtil.isNumeric(idOrCodeName)){
+
+	private Collection<TreatmentGroupState> getTreatmentGroupStates(String idOrCodeName, String stateType,
+			String stateKind) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			Long id = Long.valueOf(idOrCodeName);
-			return TreatmentGroupState.findTreatmentGroupStatesByTreatmentGroupIDAndStateTypeKind(id, stateType, stateKind).getResultList();
-		}else{
-			return TreatmentGroupState.findTreatmentGroupStatesByTreatmentGroupCodeNameAndStateTypeKind(idOrCodeName, stateType, stateKind).getResultList();
+			return TreatmentGroupState
+					.findTreatmentGroupStatesByTreatmentGroupIDAndStateTypeKind(id, stateType, stateKind)
+					.getResultList();
+		} else {
+			return TreatmentGroupState.findTreatmentGroupStatesByTreatmentGroupCodeNameAndStateTypeKind(idOrCodeName,
+					stateType, stateKind).getResultList();
 		}
 	}
 
diff --git a/src/main/java/com/labsynch/labseer/service/TreatmentGroupValueService.java b/src/main/java/com/labsynch/labseer/service/TreatmentGroupValueService.java
index a5cb85d97..157651f15 100644
--- a/src/main/java/com/labsynch/labseer/service/TreatmentGroupValueService.java
+++ b/src/main/java/com/labsynch/labseer/service/TreatmentGroupValueService.java
@@ -12,15 +12,18 @@
 @Service
 public interface TreatmentGroupValueService {
 
-	public List<TreatmentGroupValue> getTreatmentGroupValuesByExperimentIdAndStateTypeKind(Long experimentId, String stateType, 
+	public List<TreatmentGroupValue> getTreatmentGroupValuesByExperimentIdAndStateTypeKind(Long experimentId,
+			String stateType,
 			String stateKind);
-	
-	public List<TreatmentGroupValue> getTreatmentGroupValuesByExperimentIdAndStateTypeKindAndValueTypeKind(Long experimentId, String stateType,
+
+	public List<TreatmentGroupValue> getTreatmentGroupValuesByExperimentIdAndStateTypeKindAndValueTypeKind(
+			Long experimentId, String stateType,
 			String stateKind, String valueType, String valueKind);
 
 	public String getCsvList(List<TreatmentGroupValue> treatmentGroupValues);
-	
-	public List<TreatmentGroupValue> getTreatmentGroupValuesByAnalysisGroupIdAndStateTypeKind(Long analysisGroupId, String stateType, String stateKind);
+
+	public List<TreatmentGroupValue> getTreatmentGroupValuesByAnalysisGroupIdAndStateTypeKind(Long analysisGroupId,
+			String stateType, String stateKind);
 
 	public TreatmentGroupValue updateTreatmentGroupValue(String idOrCodeName,
 			String stateType, String stateKind, String valueType,
@@ -44,5 +47,5 @@ public TreatmentGroupValue getTreatmentGroupValue(String idOrCodeName,
 
 	public Collection<TreatmentGroupValuePathDTO> getTreatmentGroupValues(
 			Collection<GenericValuePathRequest> genericRequests);
-	
+
 }
diff --git a/src/main/java/com/labsynch/labseer/service/TreatmentGroupValueServiceImpl.java b/src/main/java/com/labsynch/labseer/service/TreatmentGroupValueServiceImpl.java
index 47336d65b..be0551d90 100644
--- a/src/main/java/com/labsynch/labseer/service/TreatmentGroupValueServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/TreatmentGroupValueServiceImpl.java
@@ -27,31 +27,34 @@
 import org.supercsv.io.ICsvBeanWriter;
 import org.supercsv.prefs.CsvPreference;
 
-
 @Service
 @Transactional
 public class TreatmentGroupValueServiceImpl implements TreatmentGroupValueService {
 
 	private static final Logger logger = LoggerFactory.getLogger(TreatmentGroupStateServiceImpl.class);
-	
+
 	@Autowired
 	private TreatmentGroupStateService treatmentGroupStateService;
-	
+
 	@Override
 	public List<TreatmentGroupValue> getTreatmentGroupValuesByExperimentIdAndStateTypeKind(
 			Long experimentId, String stateType, String stateKind) {
-		
-		List<TreatmentGroupValue> treatmentGroupValues = TreatmentGroupValue.findTreatmentGroupValuesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getResultList();
+
+		List<TreatmentGroupValue> treatmentGroupValues = TreatmentGroupValue
+				.findTreatmentGroupValuesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getResultList();
 
 		return treatmentGroupValues;
 	}
-	
-	public List<TreatmentGroupValue> getTreatmentGroupValuesByExperimentIdAndStateTypeKindAndValueTypeKind(Long experimentId, String stateType,
+
+	public List<TreatmentGroupValue> getTreatmentGroupValuesByExperimentIdAndStateTypeKindAndValueTypeKind(
+			Long experimentId, String stateType,
 			String stateKind, String valueType, String valueKind) {
-		
-		List<TreatmentGroupValue> treatmentGroupValues = TreatmentGroupValue.findTreatmentGroupValuesByExptIDAndStateTypeKindAndValueTypeKind(experimentId, stateType,
-				stateKind, valueType, valueKind).getResultList();
-		
+
+		List<TreatmentGroupValue> treatmentGroupValues = TreatmentGroupValue
+				.findTreatmentGroupValuesByExptIDAndStateTypeKindAndValueTypeKind(experimentId, stateType,
+						stateKind, valueType, valueKind)
+				.getResultList();
+
 		return treatmentGroupValues;
 	}
 
@@ -65,7 +68,8 @@ public String getCsvList(List<TreatmentGroupValue> treatmentGroupValues) {
 			final CellProcessor[] processors = TreatmentGroupValue.getProcessors();
 			beanWriter.writeHeader(header);
 			for (final TreatmentGroupValue treatmentGroupValue : treatmentGroupValues) {
-				Collection<TreatmentGroupValueDTO> treatmentGroupValueDTOs = treatmentGroupValue.makeDTOsByAnalysisGroupIds();
+				Collection<TreatmentGroupValueDTO> treatmentGroupValueDTOs = treatmentGroupValue
+						.makeDTOsByAnalysisGroupIds();
 				for (TreatmentGroupValueDTO treatmentGroupValueDTO : treatmentGroupValueDTOs) {
 					beanWriter.write(treatmentGroupValueDTO, header, processors);
 				}
@@ -86,42 +90,48 @@ public String getCsvList(List<TreatmentGroupValue> treatmentGroupValues) {
 
 		return outFile.toString();
 	}
-	
+
 	@Override
 	@Transactional
 	public TreatmentGroupValue saveTreatmentGroupValue(TreatmentGroupValue treatmentGroupValue) {
 		if (treatmentGroupValue.getLsState().getId() == null) {
 			TreatmentGroupState treatmentGroupState = new TreatmentGroupState(treatmentGroupValue.getLsState());
-			treatmentGroupState.setTreatmentGroup(TreatmentGroup.findTreatmentGroup(treatmentGroupValue.getLsState().getTreatmentGroup().getId()));
+			treatmentGroupState.setTreatmentGroup(
+					TreatmentGroup.findTreatmentGroup(treatmentGroupValue.getLsState().getTreatmentGroup().getId()));
 			treatmentGroupState.persist();
-			treatmentGroupValue.setLsState(treatmentGroupState); 
+			treatmentGroupValue.setLsState(treatmentGroupState);
 		} else {
-			treatmentGroupValue.setLsState(TreatmentGroupState.findTreatmentGroupState(treatmentGroupValue.getLsState().getId()));
-		}		
+			treatmentGroupValue
+					.setLsState(TreatmentGroupState.findTreatmentGroupState(treatmentGroupValue.getLsState().getId()));
+		}
 		treatmentGroupValue.persist();
 		return treatmentGroupValue;
 	}
-	
+
 	@Override
 	@Transactional
-	public Collection<TreatmentGroupValue> saveTreatmentGroupValues(Collection<TreatmentGroupValue> treatmentGroupValues) {
-		for (TreatmentGroupValue treatmentGroupValue: treatmentGroupValues) {
+	public Collection<TreatmentGroupValue> saveTreatmentGroupValues(
+			Collection<TreatmentGroupValue> treatmentGroupValues) {
+		for (TreatmentGroupValue treatmentGroupValue : treatmentGroupValues) {
 			treatmentGroupValue = saveTreatmentGroupValue(treatmentGroupValue);
 		}
 		return treatmentGroupValues;
 	}
-	
+
 	@Override
 	public TreatmentGroupValue updateTreatmentGroupValue(TreatmentGroupValue treatmentGroupValue) {
 		if (treatmentGroupValue.getLsState().getId() == null) {
 			TreatmentGroupState treatmentGroupState = new TreatmentGroupState(treatmentGroupValue.getLsState());
-			treatmentGroupState.setTreatmentGroup(TreatmentGroup.findTreatmentGroup(treatmentGroupValue.getLsState().getTreatmentGroup().getId()));
+			treatmentGroupState.setTreatmentGroup(
+					TreatmentGroup.findTreatmentGroup(treatmentGroupValue.getLsState().getTreatmentGroup().getId()));
 			treatmentGroupState.persist();
-			treatmentGroupValue.setLsState(treatmentGroupState); 
+			treatmentGroupValue.setLsState(treatmentGroupState);
 		} else {
-			treatmentGroupValue.setLsState(TreatmentGroupState.findTreatmentGroupState(treatmentGroupValue.getLsState().getId()));
+			treatmentGroupValue
+					.setLsState(TreatmentGroupState.findTreatmentGroupState(treatmentGroupValue.getLsState().getId()));
 		}
-		treatmentGroupValue.setVersion(TreatmentGroupValue.findTreatmentGroupValue(treatmentGroupValue.getId()).getVersion());
+		treatmentGroupValue
+				.setVersion(TreatmentGroupValue.findTreatmentGroupValue(treatmentGroupValue.getId()).getVersion());
 		treatmentGroupValue.merge();
 		return treatmentGroupValue;
 	}
@@ -129,8 +139,10 @@ public TreatmentGroupValue updateTreatmentGroupValue(TreatmentGroupValue treatme
 	@Override
 	public List<TreatmentGroupValue> getTreatmentGroupValuesByAnalysisGroupIdAndStateTypeKind(
 			Long analysisGroupId, String stateType, String stateKind) {
-		
-		List<TreatmentGroupValue> treatmentGroupValues = TreatmentGroupValue.findTreatmentGroupValuesByAnalysisGroupIDAndStateTypeKind(analysisGroupId, stateType, stateKind).getResultList();
+
+		List<TreatmentGroupValue> treatmentGroupValues = TreatmentGroupValue
+				.findTreatmentGroupValuesByAnalysisGroupIDAndStateTypeKind(analysisGroupId, stateType, stateKind)
+				.getResultList();
 
 		return treatmentGroupValues;
 	}
@@ -139,44 +151,48 @@ public List<TreatmentGroupValue> getTreatmentGroupValuesByAnalysisGroupIdAndStat
 	public TreatmentGroupValue updateTreatmentGroupValue(String idOrCodeName,
 			String stateType, String stateKind, String valueType,
 			String valueKind, String value) {
-		//fetch the entity
+		// fetch the entity
 		TreatmentGroup treatmentGroup;
-		if(SimpleUtil.isNumeric(idOrCodeName)) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			treatmentGroup = TreatmentGroup.findTreatmentGroup(Long.valueOf(idOrCodeName));
-		} else {		
+		} else {
 			try {
 				treatmentGroup = TreatmentGroup.findTreatmentGroupsByCodeNameEquals(idOrCodeName).getSingleResult();
-			} catch(Exception ex) {
+			} catch (Exception ex) {
 				treatmentGroup = null;
 			}
 		}
-		//fetch the state, and if it doesn't exist, create it
+		// fetch the state, and if it doesn't exist, create it
 		List<TreatmentGroupState> treatmentGroupStates;
-		if(treatmentGroup != null) {
+		if (treatmentGroup != null) {
 			Long treatmentGroupId = treatmentGroup.getId();
-			treatmentGroupStates = treatmentGroupStateService.getTreatmentGroupStatesByTreatmentGroupIdAndStateTypeKind(treatmentGroupId, stateType, stateKind);
+			treatmentGroupStates = treatmentGroupStateService
+					.getTreatmentGroupStatesByTreatmentGroupIdAndStateTypeKind(treatmentGroupId, stateType, stateKind);
 			if (treatmentGroupStates.isEmpty()) {
-				//create the state
-				treatmentGroupStates.add(treatmentGroupStateService.createTreatmentGroupStateByTreatmentGroupIdAndStateTypeKind(treatmentGroupId, stateType, stateKind));
+				// create the state
+				treatmentGroupStates
+						.add(treatmentGroupStateService.createTreatmentGroupStateByTreatmentGroupIdAndStateTypeKind(
+								treatmentGroupId, stateType, stateKind));
 				logger.debug("Created the treatmentGroup state: " + treatmentGroupStates.get(0).toJson());
 			}
 		}
-		//fetch the value, update it if it exists, and if it doesn't exist, create it
+		// fetch the value, update it if it exists, and if it doesn't exist, create it
 		List<TreatmentGroupValue> treatmentGroupValues;
 		TreatmentGroupValue treatmentGroupValue = null;
-		if(treatmentGroup != null) {
+		if (treatmentGroup != null) {
 			Long treatmentGroupId = treatmentGroup.getId();
-			treatmentGroupValues = getTreatmentGroupValuesByTreatmentGroupIdAndStateTypeKindAndValueTypeKind(treatmentGroupId, stateType, stateKind, valueType, valueKind);
-			if (treatmentGroupValues.size() > 1){
+			treatmentGroupValues = getTreatmentGroupValuesByTreatmentGroupIdAndStateTypeKindAndValueTypeKind(
+					treatmentGroupId, stateType, stateKind, valueType, valueKind);
+			if (treatmentGroupValues.size() > 1) {
 				logger.error("Error: multiple treatmentGroup statuses found");
-			}
-			else if (treatmentGroupValues.size() == 1){
+			} else if (treatmentGroupValues.size() == 1) {
 				treatmentGroupValue = treatmentGroupValues.get(0);
 				treatmentGroupValue.setIgnored(true);
 				treatmentGroupValue.merge();
 				logger.debug("Ignored the treatmentGroup value: " + treatmentGroupValue.toJson());
 			}
-			treatmentGroupValue = createTreatmentGroupValueByTreatmentGroupIdAndStateTypeKindAndValueTypeKind(treatmentGroupId, stateType, stateKind, valueType, valueKind, value);
+			treatmentGroupValue = createTreatmentGroupValueByTreatmentGroupIdAndStateTypeKindAndValueTypeKind(
+					treatmentGroupId, stateType, stateKind, valueType, valueKind, value);
 			logger.debug("Created the treatmentGroup value: " + treatmentGroupValue.toJson());
 		}
 		return treatmentGroupValue;
@@ -186,18 +202,28 @@ private TreatmentGroupValue createTreatmentGroupValueByTreatmentGroupIdAndStateT
 			Long treatmentGroupId, String stateType, String stateKind,
 			String valueType, String valueKind, String value) {
 		TreatmentGroupValue treatmentGroupValue = new TreatmentGroupValue();
-		TreatmentGroupState treatmentGroupState = TreatmentGroupState.findTreatmentGroupStatesByTreatmentGroupIDAndStateTypeKind(treatmentGroupId, stateType, stateKind).getSingleResult();
+		TreatmentGroupState treatmentGroupState = TreatmentGroupState
+				.findTreatmentGroupStatesByTreatmentGroupIDAndStateTypeKind(treatmentGroupId, stateType, stateKind)
+				.getSingleResult();
 		treatmentGroupValue.setLsState(treatmentGroupState);
 		treatmentGroupValue.setLsType(valueType);
 		treatmentGroupValue.setLsKind(valueKind);
-		if (valueType.equals("stringValue")) treatmentGroupValue.setStringValue(value);
-		if (valueType.equals("fileValue")) treatmentGroupValue.setFileValue(value);
-		if (valueType.equals("clobValue")) treatmentGroupValue.setClobValue(value);
-		if (valueType.equals("blobValue")) treatmentGroupValue.setBlobValue(value.getBytes(Charset.forName("UTF-8")));
-		if (valueType.equals("numericValue")) treatmentGroupValue.setNumericValue(new BigDecimal(value));
-		if (valueType.equals("dateValue")) treatmentGroupValue.setDateValue(new Date(Long.parseLong(value)));
-		if (valueType.equals("codeValue")) treatmentGroupValue.setCodeValue(value);
-		if (valueType.equals("urlValue")) treatmentGroupValue.setUrlValue(value);
+		if (valueType.equals("stringValue"))
+			treatmentGroupValue.setStringValue(value);
+		if (valueType.equals("fileValue"))
+			treatmentGroupValue.setFileValue(value);
+		if (valueType.equals("clobValue"))
+			treatmentGroupValue.setClobValue(value);
+		if (valueType.equals("blobValue"))
+			treatmentGroupValue.setBlobValue(value.getBytes(Charset.forName("UTF-8")));
+		if (valueType.equals("numericValue"))
+			treatmentGroupValue.setNumericValue(new BigDecimal(value));
+		if (valueType.equals("dateValue"))
+			treatmentGroupValue.setDateValue(new Date(Long.parseLong(value)));
+		if (valueType.equals("codeValue"))
+			treatmentGroupValue.setCodeValue(value);
+		if (valueType.equals("urlValue"))
+			treatmentGroupValue.setUrlValue(value);
 		treatmentGroupValue.setRecordedBy("default");
 		treatmentGroupValue.persist();
 		return treatmentGroupValue;
@@ -206,16 +232,18 @@ private TreatmentGroupValue createTreatmentGroupValueByTreatmentGroupIdAndStateT
 	private List<TreatmentGroupValue> getTreatmentGroupValuesByTreatmentGroupIdAndStateTypeKindAndValueTypeKind(
 			Long treatmentGroupId, String stateType, String stateKind,
 			String valueType, String valueKind) {
-		List<TreatmentGroupValue> treatmentGroupValues = TreatmentGroupValue.findTreatmentGroupValuesByTreatmentGroupIDAndStateTypeKindAndValueTypeKind(treatmentGroupId, stateType,
-				stateKind, valueType, valueKind).getResultList();
-		
+		List<TreatmentGroupValue> treatmentGroupValues = TreatmentGroupValue
+				.findTreatmentGroupValuesByTreatmentGroupIDAndStateTypeKindAndValueTypeKind(treatmentGroupId, stateType,
+						stateKind, valueType, valueKind)
+				.getResultList();
+
 		return treatmentGroupValues;
 	}
-	
+
 	@Override
 	public Collection<TreatmentGroupValue> updateTreatmentGroupValues(
 			Collection<TreatmentGroupValue> treatmentGroupValues) {
-		for (TreatmentGroupValue treatmentGroupValue: treatmentGroupValues) {
+		for (TreatmentGroupValue treatmentGroupValue : treatmentGroupValues) {
 			treatmentGroupValue = updateTreatmentGroupValue(treatmentGroupValue);
 		}
 		return treatmentGroupValues;
@@ -225,11 +253,12 @@ public Collection<TreatmentGroupValue> updateTreatmentGroupValues(
 	public TreatmentGroupValue getTreatmentGroupValue(String idOrCodeName,
 			String stateType, String stateKind, String valueType, String valueKind) {
 		TreatmentGroupValue value = null;
-		try{
-			Collection<TreatmentGroupValue> values = getTreatmentGroupValues(idOrCodeName, stateType, stateKind, valueType, valueKind);
+		try {
+			Collection<TreatmentGroupValue> values = getTreatmentGroupValues(idOrCodeName, stateType, stateKind,
+					valueType, valueKind);
 			value = values.iterator().next();
-		}catch (Exception e){
-			logger.error("Caught error "+e.toString()+" trying to find a state.",e);
+		} catch (Exception e) {
+			logger.error("Caught error " + e.toString() + " trying to find a state.", e);
 			value = null;
 		}
 		return value;
@@ -239,23 +268,27 @@ public TreatmentGroupValue getTreatmentGroupValue(String idOrCodeName,
 	public Collection<TreatmentGroupValuePathDTO> getTreatmentGroupValues(
 			Collection<GenericValuePathRequest> genericRequests) {
 		Collection<TreatmentGroupValuePathDTO> results = new ArrayList<TreatmentGroupValuePathDTO>();
-		for (GenericValuePathRequest request : genericRequests){
+		for (GenericValuePathRequest request : genericRequests) {
 			TreatmentGroupValuePathDTO result = new TreatmentGroupValuePathDTO();
 			result.setIdOrCodeName(request.getIdOrCodeName());
 			result.setValueType(request.getValueType());
 			result.setValueKind(request.getValueKind());
-			result.setValues(getTreatmentGroupValues(request.getIdOrCodeName(), request.getStateType(), request.getStateKind(), request.getValueType(), request.getValueKind()));
+			result.setValues(getTreatmentGroupValues(request.getIdOrCodeName(), request.getStateType(),
+					request.getStateKind(), request.getValueType(), request.getValueKind()));
 			results.add(result);
 		}
 		return results;
 	}
-	
-	private Collection<TreatmentGroupValue> getTreatmentGroupValues(String idOrCodeName, String stateType, String stateKind, String valueType, String valueKind){
-		if (SimpleUtil.isNumeric(idOrCodeName)){
+
+	private Collection<TreatmentGroupValue> getTreatmentGroupValues(String idOrCodeName, String stateType,
+			String stateKind, String valueType, String valueKind) {
+		if (SimpleUtil.isNumeric(idOrCodeName)) {
 			Long id = Long.valueOf(idOrCodeName);
-			return TreatmentGroupValue.findTreatmentGroupValuesByTreatmentGroupIDAndStateTypeKindAndValueTypeKind(id, stateType, stateKind, valueType, valueKind).getResultList();
-		}else{
-			return TreatmentGroupValue.findTreatmentGroupValuesByTreatmentGroupCodeNameAndStateTypeKindAndValueTypeKind(idOrCodeName, stateType, stateKind, valueType, valueKind).getResultList();
+			return TreatmentGroupValue.findTreatmentGroupValuesByTreatmentGroupIDAndStateTypeKindAndValueTypeKind(id,
+					stateType, stateKind, valueType, valueKind).getResultList();
+		} else {
+			return TreatmentGroupValue.findTreatmentGroupValuesByTreatmentGroupCodeNameAndStateTypeKindAndValueTypeKind(
+					idOrCodeName, stateType, stateKind, valueType, valueKind).getResultList();
 		}
 	}
 
diff --git a/src/main/java/com/labsynch/labseer/utils/ACASHttpFirewall.java b/src/main/java/com/labsynch/labseer/utils/ACASHttpFirewall.java
index e421d0c65..fd0d46ad1 100644
--- a/src/main/java/com/labsynch/labseer/utils/ACASHttpFirewall.java
+++ b/src/main/java/com/labsynch/labseer/utils/ACASHttpFirewall.java
@@ -1,11 +1,10 @@
 package com.labsynch.labseer.utils;
 
-
 import org.springframework.security.web.firewall.DefaultHttpFirewall;
 
 public class ACASHttpFirewall extends DefaultHttpFirewall {
     ACASHttpFirewall() {
         this.setAllowUrlEncodedSlash(true);
     }
-    
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/utils/BitSetUserType.java b/src/main/java/com/labsynch/labseer/utils/BitSetUserType.java
index c6e6f1c9a..11427750d 100644
--- a/src/main/java/com/labsynch/labseer/utils/BitSetUserType.java
+++ b/src/main/java/com/labsynch/labseer/utils/BitSetUserType.java
@@ -21,17 +21,19 @@ public BitSetUserType() {
 
     @Override
     public int[] sqlTypes() {
-        return new int[]{Types.OTHER};
+        return new int[] { Types.OTHER };
     }
 
     @Override
-    public BitSet get(ResultSet rs, String[] names, SharedSessionContractImplementor session, Object owner) throws SQLException {
+    public BitSet get(ResultSet rs, String[] names, SharedSessionContractImplementor session, Object owner)
+            throws SQLException {
         String stringBits = rs.getString(names[0]);
         return (stringBits != null) ? SimpleUtil.stringToBitSet(stringBits) : null;
     }
 
     @Override
-    public void set(PreparedStatement st, BitSet value, int index, SharedSessionContractImplementor session) throws SQLException {
+    public void set(PreparedStatement st, BitSet value, int index, SharedSessionContractImplementor session)
+            throws SQLException {
         if (value == null) {
             st.setNull(index, Types.OTHER);
         } else {
diff --git a/src/main/java/com/labsynch/labseer/utils/ByteArrayTransformer.java b/src/main/java/com/labsynch/labseer/utils/ByteArrayTransformer.java
index 22a1d395e..b7a68a42e 100755
--- a/src/main/java/com/labsynch/labseer/utils/ByteArrayTransformer.java
+++ b/src/main/java/com/labsynch/labseer/utils/ByteArrayTransformer.java
@@ -8,22 +8,22 @@ public class ByteArrayTransformer extends AbstractTransformer {
 
   @Override
   public Boolean isInline() {
-      return true;
+    return true;
   }
 
   @Override
   public void transform(Object object) {
     getContext().writeName("blobValue");
-    if(object instanceof byte[]) {
+    if (object instanceof byte[]) {
       getContext().writeOpenArray();
       int length = Array.getLength(object);
       for (int i = 0; i < length; ++i) {
-          byte myByte = (byte) Array.get(object, i);
-          int unsignedByte = myByte & 0xFF;
-          getContext().write(String.valueOf(unsignedByte));
-          if(i < length) {
-            getContext().writeComma();
-          }
+        byte myByte = (byte) Array.get(object, i);
+        int unsignedByte = myByte & 0xFF;
+        getContext().write(String.valueOf(unsignedByte));
+        if (i < length) {
+          getContext().writeComma();
+        }
       }
       getContext().writeCloseArray();
     } else {
diff --git a/src/main/java/com/labsynch/labseer/utils/CustomBigDecimalFactory.java b/src/main/java/com/labsynch/labseer/utils/CustomBigDecimalFactory.java
index 8e05a300c..9db2e5b72 100755
--- a/src/main/java/com/labsynch/labseer/utils/CustomBigDecimalFactory.java
+++ b/src/main/java/com/labsynch/labseer/utils/CustomBigDecimalFactory.java
@@ -7,8 +7,9 @@
 import flexjson.ObjectFactory;
 
 public class CustomBigDecimalFactory implements ObjectFactory {
-	public Object instantiate(ObjectBinder context, Object value, Type targetType, @SuppressWarnings("rawtypes") Class targetClass) {
-		return new BigDecimal( value.toString() );
+	public Object instantiate(ObjectBinder context, Object value, Type targetType,
+			@SuppressWarnings("rawtypes") Class targetClass) {
+		return new BigDecimal(value.toString());
 
 	}
 }
diff --git a/src/main/java/com/labsynch/labseer/utils/DeleteAllParents.java b/src/main/java/com/labsynch/labseer/utils/DeleteAllParents.java
index 7fa1d38e4..2c53567bd 100755
--- a/src/main/java/com/labsynch/labseer/utils/DeleteAllParents.java
+++ b/src/main/java/com/labsynch/labseer/utils/DeleteAllParents.java
@@ -11,11 +11,11 @@
 @Transactional
 public class DeleteAllParents {
 	static Logger logger = LoggerFactory.getLogger(DeleteAllParents.class);
-	
+
 	@Transactional
-	public static void deleteAllParents(){
+	public static void deleteAllParents() {
 		List<Parent> parents = Parent.findAllParents();
-		for (Parent parent:parents){
+		for (Parent parent : parents) {
 			parent.remove();
 		}
 	}
diff --git a/src/main/java/com/labsynch/labseer/utils/ExcludeNulls.java b/src/main/java/com/labsynch/labseer/utils/ExcludeNulls.java
index b9aa62c1f..6ee102cf2 100755
--- a/src/main/java/com/labsynch/labseer/utils/ExcludeNulls.java
+++ b/src/main/java/com/labsynch/labseer/utils/ExcludeNulls.java
@@ -2,17 +2,16 @@
 
 import flexjson.transformer.AbstractTransformer;
 
-
 public class ExcludeNulls extends AbstractTransformer {
 
   @Override
   public Boolean isInline() {
-      return true;
+    return true;
   }
 
   @Override
   public void transform(Object object) {
-      // Do nothing, null objects are not serialized.
-      return;
+    // Do nothing, null objects are not serialized.
+    return;
   }
 }
diff --git a/src/main/java/com/labsynch/labseer/utils/InitialSetup.java b/src/main/java/com/labsynch/labseer/utils/InitialSetup.java
index 98f0bbd72..a61906a99 100755
--- a/src/main/java/com/labsynch/labseer/utils/InitialSetup.java
+++ b/src/main/java/com/labsynch/labseer/utils/InitialSetup.java
@@ -21,10 +21,10 @@
 import org.slf4j.LoggerFactory;
 
 public class InitialSetup {
-		
+
 	private static final Logger logger = LoggerFactory.getLogger(InitialSetup.class);
 
-	public static void setupFixtures() throws IOException{
+	public static void setupFixtures() throws IOException {
 		setupProtocolTypes();
 		setupProtocolKinds();
 		setupExperimentTypes();
@@ -37,7 +37,7 @@ public static void setupFixtures() throws IOException{
 
 		setupContainerTypes();
 		setupContainerKinds();
-		
+
 		setupStateTypes();
 		setupStateKinds();
 
@@ -50,118 +50,122 @@ public static void setupFixtures() throws IOException{
 
 	private static void setupStateKinds() {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 	private static void setupContainerTypes() {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 	private static void setupContainerKinds() {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 	private static void setupInteractionKinds() {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 	private static void setupExperimentTypes() throws IOException {
-		//experimentTypes
-		if (ExperimentType.countExperimentTypes() < 1){
+		// experimentTypes
+		if (ExperimentType.countExperimentTypes() < 1) {
 			String propertyName = "experimentTypes";
 			logger.info("Setting up new " + propertyName);
 			String json = SetupPropertiesUtils.getProperties(propertyName);
 			Collection<ExperimentType> experimentTypes = ExperimentType.fromJsonArrayToExperimentTypes(json);
-			for (ExperimentType experimentType : experimentTypes){
-				if (ExperimentType.findExperimentTypesByTypeNameEquals(experimentType.getTypeName()).getMaxResults() == 0){
-					experimentType.persist();					
+			for (ExperimentType experimentType : experimentTypes) {
+				if (ExperimentType.findExperimentTypesByTypeNameEquals(experimentType.getTypeName())
+						.getMaxResults() == 0) {
+					experimentType.persist();
 				}
-			}			
-		}			
+			}
+		}
 	}
 
 	private static void setupExperimentKinds() throws IOException {
-		if (ExperimentKind.countExperimentKinds() < 1){
+		if (ExperimentKind.countExperimentKinds() < 1) {
 			String propertyName = "experimentKinds";
 			logger.info("Setting up new " + propertyName);
 			String json = SetupPropertiesUtils.getProperties(propertyName);
 			Collection<ExperimentKind> experimentKinds = ExperimentKind.fromJsonArrayToExperimentKinds(json);
-			for (ExperimentKind experimentKind : experimentKinds){
-				List<ExperimentType> dbLsTypes = ExperimentType.findExperimentTypesByTypeNameEquals(experimentKind.getLsType().getTypeName()).getResultList();
-				if (dbLsTypes.size() == 1){
+			for (ExperimentKind experimentKind : experimentKinds) {
+				List<ExperimentType> dbLsTypes = ExperimentType
+						.findExperimentTypesByTypeNameEquals(experimentKind.getLsType().getTypeName()).getResultList();
+				if (dbLsTypes.size() == 1) {
 					experimentKind.setLsType(dbLsTypes.get(0));
 					experimentKind.persist();
 					logger.info(experimentKind.toJson());
 				} else {
 					logger.error(propertyName + "  did not get expected results: " + dbLsTypes.size());
 				}
-			}			
-		}	
+			}
+		}
 	}
 
 	private static void setupProtocolTypes() throws IOException {
-		//protocolTypes
-		if (ProtocolType.countProtocolTypes() < 1){
+		// protocolTypes
+		if (ProtocolType.countProtocolTypes() < 1) {
 			String propertyName = "protocolTypes";
 			logger.info("Setting up new " + propertyName);
 			String json = SetupPropertiesUtils.getProperties(propertyName);
 			Collection<ProtocolType> protocolTypes = ProtocolType.fromJsonArrayToProtocolTypes(json);
-			for (ProtocolType protocolType : protocolTypes){
+			for (ProtocolType protocolType : protocolTypes) {
 				protocolType.persist();
-			}			
-		}		
+			}
+		}
 	}
-	
+
 	private static void setupProtocolKinds() throws IOException {
-		//protocolKinds
-		if (ProtocolKind.countProtocolKinds() < 1){
+		// protocolKinds
+		if (ProtocolKind.countProtocolKinds() < 1) {
 			String propertyName = "protocolKinds";
 			logger.info("Setting up new " + propertyName);
 			String json = SetupPropertiesUtils.getProperties(propertyName);
 			Collection<ProtocolKind> protocolKinds = ProtocolKind.fromJsonArrayToProtocolKinds(json);
-			for (ProtocolKind protocolKind : protocolKinds){
-				List<ProtocolType> dbLsTypes = ProtocolType.findProtocolTypesByTypeNameEquals(protocolKind.getLsType().getTypeName()).getResultList();
-				if (dbLsTypes.size() == 1){
+			for (ProtocolKind protocolKind : protocolKinds) {
+				List<ProtocolType> dbLsTypes = ProtocolType
+						.findProtocolTypesByTypeNameEquals(protocolKind.getLsType().getTypeName()).getResultList();
+				if (dbLsTypes.size() == 1) {
 					protocolKind.setLsType(dbLsTypes.get(0));
 					protocolKind.persist();
 				} else {
 					logger.error("did not get expected results: " + dbLsTypes.size());
 				}
 				logger.info(protocolKind.toJson());
-			}			
-		}		
+			}
+		}
 	}
 
-	private static void setupThingTypes() throws IOException{
-		//thingTypes
-		if (ThingType.countThingTypes() < 1){
+	private static void setupThingTypes() throws IOException {
+		// thingTypes
+		if (ThingType.countThingTypes() < 1) {
 			String propertyName = "thingTypes";
 			logger.info("Setting up new " + propertyName);
 			String json = SetupPropertiesUtils.getProperties(propertyName);
 
 			Collection<ThingType> thingTypes = ThingType.fromJsonArrayToThingTypes(json);
-			for (ThingType thingType : thingTypes){
+			for (ThingType thingType : thingTypes) {
 				thingType.persist();
 				logger.info(thingType.toJson());
 			}
-			
+
 		}
-		
+
 	}
 
-	private static void setupThingKinds() throws IOException{
-		//thingKinds
-		if (ThingKind.countThingKinds() < 1){
+	private static void setupThingKinds() throws IOException {
+		// thingKinds
+		if (ThingKind.countThingKinds() < 1) {
 			String propertyName = "thingKinds";
 			logger.info("Setting up new " + propertyName);
 			String json = SetupPropertiesUtils.getProperties(propertyName);
 			Collection<ThingKind> thingKinds = ThingKind.fromJsonArrayToThingKinds(json);
-			for (ThingKind thingKind : thingKinds){
-				List<ThingType> dbLsTypes = ThingType.findThingTypesByTypeNameEquals(thingKind.getLsType().getTypeName()).getResultList();
-				if (dbLsTypes.size() == 1){
+			for (ThingKind thingKind : thingKinds) {
+				List<ThingType> dbLsTypes = ThingType
+						.findThingTypesByTypeNameEquals(thingKind.getLsType().getTypeName()).getResultList();
+				if (dbLsTypes.size() == 1) {
 					thingKind.setLsType(dbLsTypes.get(0));
 					thingKind.persist();
 				} else {
@@ -169,119 +173,120 @@ private static void setupThingKinds() throws IOException{
 				}
 				logger.info(thingKind.toJson());
 			}
-			
+
 		}
-		
+
 	}
 
-	private static void setupLabelTypes() throws IOException{
-		//labelTypes
-		if (LabelType.countLabelTypes() < 1){
+	private static void setupLabelTypes() throws IOException {
+		// labelTypes
+		if (LabelType.countLabelTypes() < 1) {
 			String propertyName = "labelTypes";
 			logger.info("Setting up new " + propertyName);
 			String json = SetupPropertiesUtils.getProperties(propertyName);
 
 			Collection<LabelType> labelTypes = LabelType.fromJsonArrayToLabelTypes(json);
-			for (LabelType labelType : labelTypes){
+			for (LabelType labelType : labelTypes) {
 				labelType.persist();
 				logger.info(labelType.toJson());
 			}
-			
+
 		}
-		
+
 	}
-	
-	private static void setupLabelKinds() throws IOException{
-		//labelKinds
-		if (LabelKind.countLabelKinds() < 1){
+
+	private static void setupLabelKinds() throws IOException {
+		// labelKinds
+		if (LabelKind.countLabelKinds() < 1) {
 			String propertyName = "labelKinds";
 			logger.info("Setting up new " + propertyName);
 			String json = SetupPropertiesUtils.getProperties(propertyName);
 			Collection<LabelKind> labelKinds = LabelKind.fromJsonArrayToLabelKinds(json);
-			for (LabelKind labelKind : labelKinds){
-				List<LabelType> dbLsTypes = LabelType.findLabelTypesByTypeNameEquals(labelKind.getLsType().getTypeName()).getResultList();
-				if (dbLsTypes.size() == 1){
+			for (LabelKind labelKind : labelKinds) {
+				List<LabelType> dbLsTypes = LabelType
+						.findLabelTypesByTypeNameEquals(labelKind.getLsType().getTypeName()).getResultList();
+				if (dbLsTypes.size() == 1) {
 					labelKind.setLsType(dbLsTypes.get(0));
 					labelKind.persist();
 					logger.info(labelKind.toJson());
 				} else {
 					logger.error("did not get expected results: " + dbLsTypes.size());
 				}
-				
+
 			}
-			
+
 		}
-		
+
 	}
 
-	private static void setupInteractionTypes() throws IOException{
-		//interactionTypes
-		if (InteractionType.countInteractionTypes() < 1){
+	private static void setupInteractionTypes() throws IOException {
+		// interactionTypes
+		if (InteractionType.countInteractionTypes() < 1) {
 			String propertyName = "interactionTypes";
 			logger.info("Setting up new " + propertyName);
 			String json = SetupPropertiesUtils.getProperties(propertyName);
 			Collection<InteractionType> interactionTypes = InteractionType.fromJsonArrayToInteractionTypes(json);
-			for (InteractionType interactionType : interactionTypes){
+			for (InteractionType interactionType : interactionTypes) {
 				interactionType.persist();
 				logger.info(interactionType.toJson());
 			}
-			
+
 		}
-		
+
 	}
-	
-	private static void setupStateTypes() throws IOException{
-		//StateTypes
-		if (StateType.countStateTypes() < 1){
+
+	private static void setupStateTypes() throws IOException {
+		// StateTypes
+		if (StateType.countStateTypes() < 1) {
 			String propertyName = "stateTypes";
 			logger.info("Setting up new " + propertyName);
 
 			String json = SetupPropertiesUtils.getProperties(propertyName);
 
 			Collection<StateType> stateTypes = StateType.fromJsonArrayToStateTypes(json);
-			for (StateType stateType : stateTypes){
+			for (StateType stateType : stateTypes) {
 				stateType.persist();
 				logger.info(stateType.toJson());
 			}
-			
+
 		}
-		
+
 	}
-	
-	private static void setupValueTypes() throws IOException{
-		//valueTypes
-		if (ValueType.countValueTypes() < 1){
+
+	private static void setupValueTypes() throws IOException {
+		// valueTypes
+		if (ValueType.countValueTypes() < 1) {
 			String propertyName = "valueTypes";
 			logger.info("Setting up new " + propertyName);
 
 			String json = SetupPropertiesUtils.getProperties(propertyName);
 
 			Collection<ValueType> valueTypes = ValueType.fromJsonArrayToValueTypes(json);
-			for (ValueType valueType : valueTypes){
+			for (ValueType valueType : valueTypes) {
 				valueType.persist();
 				logger.info(valueType.toJson());
 			}
-			
+
 		}
-		
+
 	}
-	
-	private static void setupLabelSequences() throws IOException{
-		//labelSequences
-		if (LabelSequence.countLabelSequences() < 1){
+
+	private static void setupLabelSequences() throws IOException {
+		// labelSequences
+		if (LabelSequence.countLabelSequences() < 1) {
 			String propertyName = "labelSequences";
 			logger.info("Setting up new " + propertyName);
 
 			String json = SetupPropertiesUtils.getProperties(propertyName);
 
 			Collection<LabelSequence> labelSequences = LabelSequence.fromJsonArrayToLabelSequences(json);
-			for (LabelSequence labelSequence : labelSequences){
+			for (LabelSequence labelSequence : labelSequences) {
 				logger.info(labelSequence.toJson());
 				labelSequence.persist();
 			}
-			
+
 		}
-		
+
 	}
-	
+
 }
diff --git a/src/main/java/com/labsynch/labseer/utils/ItxLsThingLsThingComparator.java b/src/main/java/com/labsynch/labseer/utils/ItxLsThingLsThingComparator.java
index 17541a459..f2888ff66 100644
--- a/src/main/java/com/labsynch/labseer/utils/ItxLsThingLsThingComparator.java
+++ b/src/main/java/com/labsynch/labseer/utils/ItxLsThingLsThingComparator.java
@@ -5,9 +5,9 @@
 import com.labsynch.labseer.domain.ItxLsThingLsThing;
 
 public class ItxLsThingLsThingComparator implements Comparator<ItxLsThingLsThing> {
-	
+
 	@Override
-	public int compare(ItxLsThingLsThing o1, ItxLsThingLsThing o2){
+	public int compare(ItxLsThingLsThing o1, ItxLsThingLsThing o2) {
 		int o1Order = o1.grabItxOrder();
 		int o2Order = o2.grabItxOrder();
 		return o1Order - o2Order;
diff --git a/src/main/java/com/labsynch/labseer/utils/LoadCompoundsUtil.java b/src/main/java/com/labsynch/labseer/utils/LoadCompoundsUtil.java
index 116f50262..760fad95a 100755
--- a/src/main/java/com/labsynch/labseer/utils/LoadCompoundsUtil.java
+++ b/src/main/java/com/labsynch/labseer/utils/LoadCompoundsUtil.java
@@ -54,16 +54,16 @@ public class LoadCompoundsUtil {
 
 	@Autowired
 	private CmpdRegSDFReaderFactory sdfReaderFactory;
-	
+
 	@Autowired
 	private CmpdRegSDFWriterFactory sdfWriterFactory;
 
-	@Autowired	
+	@Autowired
 	private PropertiesUtilService propertiesUtilService;
 
-    @Transactional
-	public void loadCompounds(String inputFileName, String outputFileName){
-		//simple utility to load compounds
+	@Transactional
+	public void loadCompounds(String inputFileName, String outputFileName) {
+		// simple utility to load compounds
 
 		try {
 			CmpdRegSDFReader mi = sdfReaderFactory.getCmpdRegSDFReader(inputFileName);
@@ -83,40 +83,41 @@ public void loadCompounds(String inputFileName, String outputFileName){
 					goodMolToProcess = false;
 				}
 
-
 				Metalot metaLot = new Metalot();
-//				mol.clearExtraLabels();
+				// mol.clearExtraLabels();
 
 				Date lotSynthesisDate = null;
 				DateFormat df = new SimpleDateFormat("MM/dd/yyyy");
-				if (MoleculeUtil.validateMolProperty(mol, "Date")){
+				if (MoleculeUtil.validateMolProperty(mol, "Date")) {
 					try {
 						lotSynthesisDate = df.parse(MoleculeUtil.getMolProperty(mol, "Date"));
 						Date bottomDate = df.parse("01/01/1920");
 						Date topDate = df.parse("12/31/2020");
-						if (lotSynthesisDate.before(bottomDate) || lotSynthesisDate.after(topDate)){
+						if (lotSynthesisDate.before(bottomDate) || lotSynthesisDate.after(topDate)) {
 							logger.error("Bad date: = " + MoleculeUtil.getMolProperty(mol, "Date"));
 							mol.setProperty("error", "Bad date field.  " + MoleculeUtil.getMolProperty(mol, "Date"));
 							goodMolToProcess = false;
 						}
-						
-					} catch (ParseException e){
-						logger.error("error parsing the date. Date field = " + MoleculeUtil.getMolProperty(mol, "Date"));
-						mol.setProperty("error", "unable to parse date field.  " + MoleculeUtil.getMolProperty(mol, "Date"));
+
+					} catch (ParseException e) {
+						logger.error(
+								"error parsing the date. Date field = " + MoleculeUtil.getMolProperty(mol, "Date"));
+						mol.setProperty("error",
+								"unable to parse date field.  " + MoleculeUtil.getMolProperty(mol, "Date"));
 						goodMolToProcess = false;
 					}
 				}
 
-				//look for author. Create a new one if absent.
+				// look for author. Create a new one if absent.
 				Author chemist = null;
-				if (MoleculeUtil.validateMolProperty(mol, "Registered By")){
+				if (MoleculeUtil.validateMolProperty(mol, "Registered By")) {
 					String chemistCodeName = MoleculeUtil.getMolProperty(mol, "Registered By");
 					logger.debug("query chemist = " + chemistCodeName);
-					try{
+					try {
 						chemist = Author.findAuthorsByUserName(chemistCodeName).getSingleResult();
-					} catch (NoResultException e){
-						if (chemistCodeName.trim().equalsIgnoreCase("")){
-							//default set Russell as the chemist
+					} catch (NoResultException e) {
+						if (chemistCodeName.trim().equalsIgnoreCase("")) {
+							// default set Russell as the chemist
 							chemistCodeName = "rkey";
 							chemist = Author.findAuthorsByUserName(chemistCodeName).getSingleResult();
 						} else {
@@ -124,21 +125,21 @@ public void loadCompounds(String inputFileName, String outputFileName){
 							chemist = new Author();
 							chemist.setUserName(chemistCodeName);
 							chemist.setFirstName(chemistCodeName);
-							chemist.persist();							
+							chemist.persist();
 						}
 					}
 					logger.debug("chemist is: " + chemist.toJson());
 				} else {
-					//default set Russell as the chemist
+					// default set Russell as the chemist
 					String chemistCodeName = "rkey";
 					chemist = Author.findAuthorsByUserName(chemistCodeName).getSingleResult();
 				}
 
 				String parentCorpName = corpNameService.formatCorpName(cmpdCorpId);
 				Parent parent = null;
-				try{
+				try {
 					parent = Parent.findParentsByCorpNameEquals(parentCorpName).getSingleResult();
-				} catch (NoResultException e){
+				} catch (NoResultException e) {
 					logger.debug("create the new parent");
 					parent = new Parent();
 					parent.setMolStructure(MoleculeUtil.exportMolAsText(mol, "mol"));
@@ -148,16 +149,18 @@ public void loadCompounds(String inputFileName, String outputFileName){
 					parent.setRegistrationDate(lotSynthesisDate);
 
 					StereoCategory stereoCategory = null;
-					if (MoleculeUtil.validateMolProperty(mol, "StereoCategory")){
+					if (MoleculeUtil.validateMolProperty(mol, "StereoCategory")) {
 						String stereoCategoryCode = MoleculeUtil.getMolProperty(mol, "StereoCategory");
-						try{
-							stereoCategory = StereoCategory.findStereoCategorysByCodeEquals(stereoCategoryCode).getSingleResult();			    		
-						} catch (NoResultException e2){
+						try {
+							stereoCategory = StereoCategory.findStereoCategorysByCodeEquals(stereoCategoryCode)
+									.getSingleResult();
+						} catch (NoResultException e2) {
 							logger.error("Did not find the stereoCategory code" + stereoCategoryCode);
-							stereoCategory = StereoCategory.findStereoCategorysByCodeEquals("unknown").getSingleResult();			    		
+							stereoCategory = StereoCategory.findStereoCategorysByCodeEquals("unknown")
+									.getSingleResult();
 						}
 					} else {
-						stereoCategory = StereoCategory.findStereoCategorysByCodeEquals("unknown").getSingleResult();			    		
+						stereoCategory = StereoCategory.findStereoCategorysByCodeEquals("unknown").getSingleResult();
 					}
 					logger.debug("stereoCategoryCode: " + stereoCategory.getCode());
 					parent.setStereoCategory(stereoCategory);
@@ -166,7 +169,7 @@ public void loadCompounds(String inputFileName, String outputFileName){
 
 				Set<IsoSalt> isoSalts = new HashSet<IsoSalt>();
 				boolean saltIsotopeError = false;
-				
+
 				double saltCount = 0d;
 				try {
 					saltCount = Double.parseDouble(MoleculeUtil.getMolProperty(mol, "Count"));
@@ -174,47 +177,49 @@ public void loadCompounds(String inputFileName, String outputFileName){
 					saltCount = 0d;
 					logger.error("unable to parse the saltCount field. " + MoleculeUtil.getMolProperty(mol, "Count"));
 					mol.setProperty("error", "unable to parse saltCount field. Not a number or missing. ");
-					//goodMolToProcess = false;
+					// goodMolToProcess = false;
 					me.writeMol(mol);
 				}
-				
-				//search for isotope --- not laid out easily	
+
+				// search for isotope --- not laid out easily
 				Isotope isotope = null;
-				if (MoleculeUtil.validateMolProperty(mol, "Salt")){
+				if (MoleculeUtil.validateMolProperty(mol, "Salt")) {
 					String isotopeAbbrev = MoleculeUtil.getMolProperty(mol, "Salt");
-					try{
+					try {
 						isotope = Isotope.findIsotopesByAbbrevEquals(isotopeAbbrev).getSingleResult();
 						logger.debug("found an isotope: " + isotopeAbbrev);
-						//now cheat to use the code below
+						// now cheat to use the code below
 						saltCount = 1;
 						mol.setProperty("RemovedSalts", isotopeAbbrev);
-					} catch (NoResultException e){
-						logger.debug("Did not find the isotope code " + isotopeAbbrev );
+					} catch (NoResultException e) {
+						logger.debug("Did not find the isotope code " + isotopeAbbrev);
 					}
-				}	
-				if (saltCount > 0){
+				}
+				if (saltCount > 0) {
 					IsoSalt isoSalt = new IsoSalt();
 					Salt salt = null;
-					if (MoleculeUtil.validateMolProperty(mol, "RemovedSalts")){
+					if (MoleculeUtil.validateMolProperty(mol, "RemovedSalts")) {
 						String saltAbbrev = MoleculeUtil.getMolProperty(mol, "RemovedSalts");
-						if (!saltAbbrev.equalsIgnoreCase("")){
+						if (!saltAbbrev.equalsIgnoreCase("")) {
 							logger.debug("Query Salt = " + saltAbbrev);
-							try{
+							try {
 								salt = Salt.findSaltsByAbbrevEquals(saltAbbrev).getSingleResult();
 								logger.debug("found a salt: " + salt.toJson());
 								isoSalt.setType("salt");
 								isoSalt.setSalt(salt);
 								isoSalt.setEquivalents(saltCount);
-							} catch (NoResultException e2){
-								logger.debug("Did not find the salt code " + saltAbbrev + "  Check if it is an isotope.");
-								//							    	check that it is not an isotope
+							} catch (NoResultException e2) {
+								logger.debug(
+										"Did not find the salt code " + saltAbbrev + "  Check if it is an isotope.");
+								// check that it is not an isotope
 								try {
 									isotope = Isotope.findIsotopesByAbbrevEquals(saltAbbrev).getSingleResult();
 									isoSalt.setType("isotope");
 									isoSalt.setIsotope(isotope);
 									isoSalt.setEquivalents(saltCount);
-								}  catch (NoResultException e3){
-									logger.error("Not an isotope either!!. Did not find the isotope code " + saltAbbrev);
+								} catch (NoResultException e3) {
+									logger.error(
+											"Not an isotope either!!. Did not find the isotope code " + saltAbbrev);
 									saltIsotopeError = true;
 									goodMolToProcess = false;
 									mol.setProperty("error", "unknown salt: compound with new salt or isotope ");
@@ -222,16 +227,16 @@ public void loadCompounds(String inputFileName, String outputFileName){
 							}
 						}
 
-						if (!saltIsotopeError){
-							isoSalts.add(isoSalt);				    		
-						}	
+						if (!saltIsotopeError) {
+							isoSalts.add(isoSalt);
+						}
 					}
 				}
 				String saltFormCorpName = corpNameService.generateSaltFormCorpName(parent.getCorpName(), isoSalts);
 				SaltForm saltForm = null;
-				try{
-					saltForm = SaltForm.findSaltFormsByCorpNameEquals(saltFormCorpName).getSingleResult();	    		
-				} catch (NoResultException e){
+				try {
+					saltForm = SaltForm.findSaltFormsByCorpNameEquals(saltFormCorpName).getSingleResult();
+				} catch (NoResultException e) {
 					logger.debug("new salForm: " + saltFormCorpName);
 					saltForm = new SaltForm();
 					saltForm.setParent(parent);
@@ -240,76 +245,73 @@ public void loadCompounds(String inputFileName, String outputFileName){
 					saltForm.setCorpName(saltFormCorpName);
 					saltForm.setRegistrationDate(lotSynthesisDate);
 				}
-				for (IsoSalt isoSalt : isoSalts){
+				for (IsoSalt isoSalt : isoSalts) {
 					isoSalt.setSaltForm(saltForm);
 					logger.debug("isoSalt: " + isoSalt.toJson());
 				}
 
-
 				int lotNumber = 0;
-				if (MoleculeUtil.validateMolProperty(mol, "Lot")){
+				if (MoleculeUtil.validateMolProperty(mol, "Lot")) {
 					try {
-						lotNumber = Integer.valueOf(MoleculeUtil.getMolProperty(mol, "Lot"));						
-					} catch (Exception e){
+						lotNumber = Integer.valueOf(MoleculeUtil.getMolProperty(mol, "Lot"));
+					} catch (Exception e) {
 						logger.error("unable to convert the lot number. " + MoleculeUtil.getMolProperty(mol, "Lot"));
 						mol.setProperty("error", "bad lot number: compound without a lot number ");
 						goodMolToProcess = false;
 					}
 				}
-				String lotCorpName = saltForm.getCorpName().concat(propertiesUtilService.getCorpSeparator()).concat(String.format("%02d", lotNumber));
-
+				String lotCorpName = saltForm.getCorpName().concat(propertiesUtilService.getCorpSeparator())
+						.concat(String.format("%02d", lotNumber));
 
 				Lot lot = null;
 
-				try{
-					lot = Lot.findLotsByCorpNameEquals(lotCorpName).getSingleResult();	    		
-				} catch (NoResultException e){
+				try {
+					lot = Lot.findLotsByCorpNameEquals(lotCorpName).getSingleResult();
+				} catch (NoResultException e) {
 					logger.debug("new lot created: " + lotCorpName);
 					lot = new Lot();
 					lot.setCorpName(lotCorpName);
 					lot.setLotNumber(lotNumber);
-				} catch (IncorrectResultSizeDataAccessException e2){
+				} catch (IncorrectResultSizeDataAccessException e2) {
 					logger.error("found multiple lot " + lotCorpName);
 					List<Lot> lots = Lot.findLotsByCorpNameEquals(lotCorpName).getResultList();
-					if (lots.size() > 1){
+					if (lots.size() > 1) {
 						goodMolToProcess = false;
-						mol.setProperty("error", "dupelot: found multiple lots with the same name: " + lots.size() );
+						mol.setProperty("error", "dupelot: found multiple lots with the same name: " + lots.size());
 						lot = lots.get(0);
 					}
 				}
 
-
-				if (MoleculeUtil.validateMolProperty(mol, "Date")){
-					lot.setSynthesisDate(lotSynthesisDate);	
+				if (MoleculeUtil.validateMolProperty(mol, "Date")) {
+					lot.setSynthesisDate(lotSynthesisDate);
 					lot.setRegistrationDate(lotSynthesisDate);
 				}
 				lot.setAsDrawnStruct(MoleculeUtil.exportMolAsText(mol, "mol"));
 				lot.setChemist(chemist.getUserName());
 				lot.setSaltForm(saltForm);
 
-
-				if (MoleculeUtil.validateMolProperty(mol, "Notebook")){
+				if (MoleculeUtil.validateMolProperty(mol, "Notebook")) {
 					lot.setNotebookPage(MoleculeUtil.getMolProperty(mol, "Notebook"));
 				}
 
 				String lotComments = "";
-				if (MoleculeUtil.validateMolProperty(mol, "Reviewed By")){
+				if (MoleculeUtil.validateMolProperty(mol, "Reviewed By")) {
 					String reviewNote = MoleculeUtil.getMolProperty(mol, "Reviewed By");
 					lotComments = lotComments.concat("Reviewed by: " + reviewNote);
 
 				}
 
-				if (MoleculeUtil.validateMolProperty(mol, "Synonyms_notes")){
+				if (MoleculeUtil.validateMolProperty(mol, "Synonyms_notes")) {
 					String synonymNote = MoleculeUtil.getMolProperty(mol, "Synonyms_notes");
 					lotComments = lotComments.concat(" Note: " + synonymNote);
 				}
-				lot.setComments(lotComments);	
+				lot.setComments(lotComments);
 
-				//check for existing lot. Will simply update if already registered?
+				// check for existing lot. Will simply update if already registered?
 
 				logger.debug("New lot corpname: " + lotCorpName);
 				lot.setCorpName(lotCorpName);
-				if (lot.getLotNumber() == 0){
+				if (lot.getLotNumber() == 0) {
 					lot.setIsVirtual(true);
 				} else {
 					lot.setIsVirtual(false);
@@ -320,25 +322,24 @@ public void loadCompounds(String inputFileName, String outputFileName){
 				metaLot.setSkipParentDupeCheck(true);
 				logger.debug(metaLot.toJson());
 
-				if (goodMolToProcess){
+				if (goodMolToProcess) {
 					MetalotReturn results = metalotServ.save(metaLot);
 					logger.debug("lot saved: " + results.toJson());
-					if(results.getErrors().size() > 0){
-						logger.error("Error while saving the metaLot." );
+					if (results.getErrors().size() > 0) {
+						logger.error("Error while saving the metaLot.");
 						ArrayList<ErrorMessage> errors = results.getErrors();
 						String errorMessage = "";
-						for (ErrorMessage error : errors){
+						for (ErrorMessage error : errors) {
 							errorMessage = errorMessage.concat(". ").concat(error.getMessage());
 						}
 						mol.setProperty("metalot-error", errorMessage);
 						me.writeMol(mol);
 					}
 				} else {
-					logger.error("Unable to process the bad mol. " );
+					logger.error("Unable to process the bad mol. ");
 					me.writeMol(mol);
 				}
 
-
 			}
 			mi.close();
 			me.close();
diff --git a/src/main/java/com/labsynch/labseer/utils/LoadFullCompoundsUtil.java b/src/main/java/com/labsynch/labseer/utils/LoadFullCompoundsUtil.java
index ba4975da6..a51a02428 100644
--- a/src/main/java/com/labsynch/labseer/utils/LoadFullCompoundsUtil.java
+++ b/src/main/java/com/labsynch/labseer/utils/LoadFullCompoundsUtil.java
@@ -42,21 +42,21 @@ public class LoadFullCompoundsUtil {
 
 	@Autowired
 	private ChemStructureService chemService;
-	
+
 	@Autowired
 	private CmpdRegSDFReaderFactory sdfReaderFactory;
-	
+
 	@Autowired
 	private CmpdRegSDFWriterFactory sdfWriterFactory;
 
-	public void loadCompounds(String inputFileName, String outputFileName, HashMap<String, String> propertiesMap){
-		//simple utility to load compounds
-		
+	public void loadCompounds(String inputFileName, String outputFileName, HashMap<String, String> propertiesMap) {
+		// simple utility to load compounds
+
 		// I want to set up a hash map of properties
 		// ALIAS --> parent.commonName (string 1000)
 		// VENDORCATNO --> lot.supplierID (String 255)
 		// PROJECT --> lot.project (Project --> findByCode)
-		
+
 		// vendor --> lot.supplier (String 255)
 		// chemist --> lot.chemist (Author --> findByUserName)
 
@@ -65,13 +65,13 @@ public void loadCompounds(String inputFileName, String outputFileName, HashMap<S
 			CmpdRegMolecule mol = null;
 
 			int molCounter = 0;
-			//			 && molCounter < 5
+			// && molCounter < 5
 			while ((mol = mi.readNextMol()) != null) {
 				mol.dearomatize();
 				logger.debug("current molCounter: " + molCounter);
 				molCounter++;
-				if (molCounter > 0){
-					loadCompoundsMol(mol, outputFileName, propertiesMap);					
+				if (molCounter > 0) {
+					loadCompoundsMol(mol, outputFileName, propertiesMap);
 				}
 
 			}
@@ -91,31 +91,32 @@ public void loadCompounds(String inputFileName, String outputFileName, HashMap<S
 	}
 
 	@Transactional
-	private void loadCompoundsMol(CmpdRegMolecule mol, String outputFileName, HashMap<String, String> propertiesMap) throws IllegalArgumentException, IOException, CmpdRegMolFormatException {
-		//simple utility to load compound mol
+	private void loadCompoundsMol(CmpdRegMolecule mol, String outputFileName, HashMap<String, String> propertiesMap)
+			throws IllegalArgumentException, IOException, CmpdRegMolFormatException {
+		// simple utility to load compound mol
 		CmpdRegSDFWriter me = sdfWriterFactory.getCmpdRegSDFWriter(outputFileName);
 
 		boolean goodMolToProcess = true;
-//		mol.clearExtraLabels();
+		// mol.clearExtraLabels();
 
-		//look for cmpd scientist. Create a new one if absent.
+		// look for cmpd scientist. Create a new one if absent.
 		String chemistCodeName = null;
 		Author cmpdChemist = null;
-		if (MoleculeUtil.validateMolProperty(mol, propertiesMap.get("compound_chemist"))){
+		if (MoleculeUtil.validateMolProperty(mol, propertiesMap.get("compound_chemist"))) {
 			chemistCodeName = MoleculeUtil.getMolProperty(mol, propertiesMap.get("compound_chemist")).toLowerCase();
 			logger.debug("query chemist = " + chemistCodeName);
 			logger.debug("chemist is: " + cmpdChemist.toJson());
 		} else if (propertiesMap.get("compound_chemist_code") != null) {
-			//get chemist codename from the map
+			// get chemist codename from the map
 			chemistCodeName = propertiesMap.get("compound_chemist_code");
 		} else {
-			chemistCodeName = "cchemist"; //defaul value
+			chemistCodeName = "cchemist"; // defaul value
 		}
-		try{
+		try {
 			cmpdChemist = Author.findAuthorsByUserName(chemistCodeName).getSingleResult();
-		} catch (NoResultException e){
-			if (chemistCodeName.trim().equalsIgnoreCase("")){
-				//default set cchemist as the chemist
+		} catch (NoResultException e) {
+			if (chemistCodeName.trim().equalsIgnoreCase("")) {
+				// default set cchemist as the chemist
 				chemistCodeName = "cchemist";
 				cmpdChemist = Author.findAuthorsByUserName(chemistCodeName).getSingleResult();
 			} else {
@@ -123,103 +124,102 @@ private void loadCompoundsMol(CmpdRegMolecule mol, String outputFileName, HashMa
 				cmpdChemist = new Author();
 				cmpdChemist.setUserName(chemistCodeName);
 				cmpdChemist.setFirstName(chemistCodeName);
-				cmpdChemist.persist();							
+				cmpdChemist.persist();
 			}
 		}
-		
+
 		Author lotChemist = cmpdChemist;
 
-		
-    	Metalot metaLot = new Metalot();
-    	Lot lot = new Lot();
-    	SaltForm saltForm = new SaltForm();
-    	Parent parent = new Parent();		
-    	
-    	lot.setAsDrawnStruct(mol.getMolStructure());
-
-//    	mol.clearExtraLabels();
-    	parent.setMolStructure(mol.getMolStructure());
-    	parent.setChemist(cmpdChemist.getUserName());
-    	
-		if (MoleculeUtil.validateMolProperty(mol,  propertiesMap.get("compound_alias"))){
-			String cmpdAlias = MoleculeUtil.getMolProperty(mol,  propertiesMap.get("compound_alias"));
+		Metalot metaLot = new Metalot();
+		Lot lot = new Lot();
+		SaltForm saltForm = new SaltForm();
+		Parent parent = new Parent();
+
+		lot.setAsDrawnStruct(mol.getMolStructure());
+
+		// mol.clearExtraLabels();
+		parent.setMolStructure(mol.getMolStructure());
+		parent.setChemist(cmpdChemist.getUserName());
+
+		if (MoleculeUtil.validateMolProperty(mol, propertiesMap.get("compound_alias"))) {
+			String cmpdAlias = MoleculeUtil.getMolProperty(mol, propertiesMap.get("compound_alias"));
 			parent.setCommonName(cmpdAlias);
 		}
-    	
-		String stereoCategoryCode =  null;
-		if (propertiesMap.get("stereo_category") == null){
-			stereoCategoryCode =  "unknown";
+
+		String stereoCategoryCode = null;
+		if (propertiesMap.get("stereo_category") == null) {
+			stereoCategoryCode = "unknown";
 		} else {
-			stereoCategoryCode =  propertiesMap.get("stereo_category");
+			stereoCategoryCode = propertiesMap.get("stereo_category");
 		}
 		try {
-			StereoCategory stereoCategory = StereoCategory.findStereoCategorysByCodeEquals(stereoCategoryCode).getSingleResult();
+			StereoCategory stereoCategory = StereoCategory.findStereoCategorysByCodeEquals(stereoCategoryCode)
+					.getSingleResult();
 			logger.info("found the following stereo category  " + stereoCategory.toJson());
 			parent.setStereoCategory(stereoCategory);
-		} catch (NoResultException e){
+		} catch (NoResultException e) {
 			logger.error("Did not find the query stereoCategoryCode: " + stereoCategoryCode);
 		}
-		
-    	saltForm.setParent(parent);
-    	saltForm.setChemist(cmpdChemist.getUserName());
-    	saltForm.setMolStructure("");
-
-    	lot.setSynthesisDate(new Date());
-    	lot.setChemist(lotChemist.getUserName());
-    	lot.setSaltForm(saltForm);
-    	lot.setLotMolWeight(mol.getMass());
-    	lot.setIsVirtual(false);
-		
-    	String supplierCode;
-		if (MoleculeUtil.validateMolProperty(mol, propertiesMap.get("supplier"))){
-			supplierCode = MoleculeUtil.getMolProperty(mol,  propertiesMap.get("supplier"));
+
+		saltForm.setParent(parent);
+		saltForm.setChemist(cmpdChemist.getUserName());
+		saltForm.setMolStructure("");
+
+		lot.setSynthesisDate(new Date());
+		lot.setChemist(lotChemist.getUserName());
+		lot.setSaltForm(saltForm);
+		lot.setLotMolWeight(mol.getMass());
+		lot.setIsVirtual(false);
+
+		String supplierCode;
+		if (MoleculeUtil.validateMolProperty(mol, propertiesMap.get("supplier"))) {
+			supplierCode = MoleculeUtil.getMolProperty(mol, propertiesMap.get("supplier"));
 		} else {
-			supplierCode =  propertiesMap.get("supplier");
+			supplierCode = propertiesMap.get("supplier");
 		}
-		if (supplierCode != null){
+		if (supplierCode != null) {
 			try {
 				Vendor vendor = Vendor.findVendorsByCodeEquals(supplierCode).getSingleResult();
 				lot.setVendor(vendor);
-			} catch (NoResultException e){
+			} catch (NoResultException e) {
 				logger.error("Did not find the query supplierCode: " + supplierCode);
-			}			
+			}
 		}
 
-		
-		if (MoleculeUtil.validateMolProperty(mol, propertiesMap.get("notebook"))){
-			String notebook = MoleculeUtil.getMolProperty(mol,  propertiesMap.get("notebook"));
+		if (MoleculeUtil.validateMolProperty(mol, propertiesMap.get("notebook"))) {
+			String notebook = MoleculeUtil.getMolProperty(mol, propertiesMap.get("notebook"));
 			lot.setNotebookPage(notebook);
-		}    	
-		
-		if (MoleculeUtil.validateMolProperty(mol, propertiesMap.get("supplier_id"))){
-			String supplierId = MoleculeUtil.getMolProperty(mol,  propertiesMap.get("supplier_id"));
+		}
+
+		if (MoleculeUtil.validateMolProperty(mol, propertiesMap.get("supplier_id"))) {
+			String supplierId = MoleculeUtil.getMolProperty(mol, propertiesMap.get("supplier_id"));
 			lot.setSupplierID(supplierId);
 		}
-    	
-    	metaLot.setLot(lot);
-    	
-		if (goodMolToProcess){
+
+		metaLot.setLot(lot);
+
+		if (goodMolToProcess) {
 			logger.debug("attempting to save the good mol");
 			MetalotReturn results = metalotServ.save(metaLot);
 			logger.debug("lot saved: " + results.toJson());
-			if(results.getErrors().size() > 0){
-				logger.error("Error while saving the metaLot." );
+			if (results.getErrors().size() > 0) {
+				logger.error("Error while saving the metaLot.");
 				ArrayList<ErrorMessage> errors = results.getErrors();
 				String errorMessage = "";
 				boolean firstError = true;
-				for (ErrorMessage error : errors){
-					if (firstError){
+				for (ErrorMessage error : errors) {
+					if (firstError) {
 						errorMessage = error.getMessage();
 						firstError = false;
 					} else {
-						errorMessage = errorMessage.concat(". ").concat(error.getMessage());						
+						errorMessage = errorMessage.concat(". ").concat(error.getMessage());
 					}
 				}
 				mol.setProperty("metalot-error", errorMessage);
 				me.writeMol(mol);
 			}
 		} else {
-			logger.error("Unable to process the bad mol. " );
+			logger.error("Unable to process the bad mol. ");
 			me.writeMol(mol);
 		}
 
diff --git a/src/main/java/com/labsynch/labseer/utils/LsThingComparatorByBatchNumber.java b/src/main/java/com/labsynch/labseer/utils/LsThingComparatorByBatchNumber.java
index c5cf8eaa7..0d0dba9f2 100644
--- a/src/main/java/com/labsynch/labseer/utils/LsThingComparatorByBatchNumber.java
+++ b/src/main/java/com/labsynch/labseer/utils/LsThingComparatorByBatchNumber.java
@@ -5,15 +5,15 @@
 import com.labsynch.labseer.domain.LsThing;
 
 public class LsThingComparatorByBatchNumber implements Comparator<LsThing> {
-	
+
 	@Override
-	public int compare(LsThing o1, LsThing o2){
+	public int compare(LsThing o1, LsThing o2) {
 		String o1CorpName = o1.pickBestCorpName().getLabelText();
 		String[] splitO1CorpName = o1CorpName.split("\\D+");
-		int o1BatchNumber = Integer.parseInt(splitO1CorpName[splitO1CorpName.length-1]);
+		int o1BatchNumber = Integer.parseInt(splitO1CorpName[splitO1CorpName.length - 1]);
 		String o2CorpName = o2.pickBestCorpName().getLabelText();
 		String[] splitO2CorpName = o2CorpName.split("\\D+");
-		int o2BatchNumber = Integer.parseInt(splitO2CorpName[splitO2CorpName.length-1]);
+		int o2BatchNumber = Integer.parseInt(splitO2CorpName[splitO2CorpName.length - 1]);
 		return o1BatchNumber - o2BatchNumber;
 	}
 
diff --git a/src/main/java/com/labsynch/labseer/utils/LsThingComparatorByCodeName.java b/src/main/java/com/labsynch/labseer/utils/LsThingComparatorByCodeName.java
index 7e2ee4a5f..f92e4ba15 100644
--- a/src/main/java/com/labsynch/labseer/utils/LsThingComparatorByCodeName.java
+++ b/src/main/java/com/labsynch/labseer/utils/LsThingComparatorByCodeName.java
@@ -5,9 +5,9 @@
 import com.labsynch.labseer.domain.LsThing;
 
 public class LsThingComparatorByCodeName implements Comparator<LsThing> {
-	
+
 	@Override
-	public int compare(LsThing o1, LsThing o2){
+	public int compare(LsThing o1, LsThing o2) {
 		String o1CodeName = o1.getCodeName();
 		String o2CodeName = o2.getCodeName();
 		return o1CodeName.compareTo(o2CodeName);
diff --git a/src/main/java/com/labsynch/labseer/utils/MigrateDB.java b/src/main/java/com/labsynch/labseer/utils/MigrateDB.java
index 54d308740..5bbba5c09 100644
--- a/src/main/java/com/labsynch/labseer/utils/MigrateDB.java
+++ b/src/main/java/com/labsynch/labseer/utils/MigrateDB.java
@@ -1,17 +1,15 @@
 package com.labsynch.labseer.utils;
+
 //import org.flywaydb.core.Flyway;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class MigrateDB {
 
-	
 	static Logger logger = LoggerFactory.getLogger(MigrateDB.class);
-	
+
 	public static void main(String[] args) {
-		
 
 	}
 
 }
-
diff --git a/src/main/java/com/labsynch/labseer/utils/MimeTypeUtil.java b/src/main/java/com/labsynch/labseer/utils/MimeTypeUtil.java
index 4212a5a83..64eb43034 100755
--- a/src/main/java/com/labsynch/labseer/utils/MimeTypeUtil.java
+++ b/src/main/java/com/labsynch/labseer/utils/MimeTypeUtil.java
@@ -13,33 +13,33 @@ public class MimeTypeUtil {
 
 	static Logger logger = LoggerFactory.getLogger(MimeTypeUtil.class);
 
-	private static final String MIME_PROP_FILE="mimeType.properties";  
+	private static final String MIME_PROP_FILE = "mimeType.properties";
 	private static InputStream mimeTypeStream;
-		
+
 	public static String getContentTypeFromExtension(String originalFilename) {
 		logger.debug("trying to determine the file extension: ");
 
-			String contentType = null;
-			String fileExtension = getFileExtension(originalFilename);
-			logger.debug("here is the file extension: " + fileExtension);
-			try {
-				mimeTypeStream = ApiFileSaveController.class.getClassLoader().getResourceAsStream(MIME_PROP_FILE);
-				Properties mimeTypeProps = new Properties();
-				mimeTypeProps.load(mimeTypeStream);
-				contentType = mimeTypeProps.getProperty(fileExtension);
-				logger.debug("here is the file contentType: " + contentType);
-
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				logger.error("unable to open the property file");
-				e.printStackTrace();
-			}		
-			return contentType;
+		String contentType = null;
+		String fileExtension = getFileExtension(originalFilename);
+		logger.debug("here is the file extension: " + fileExtension);
+		try {
+			mimeTypeStream = ApiFileSaveController.class.getClassLoader().getResourceAsStream(MIME_PROP_FILE);
+			Properties mimeTypeProps = new Properties();
+			mimeTypeProps.load(mimeTypeStream);
+			contentType = mimeTypeProps.getProperty(fileExtension);
+			logger.debug("here is the file contentType: " + contentType);
+
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			logger.error("unable to open the property file");
+			e.printStackTrace();
 		}
+		return contentType;
+	}
 
 	public static String getFileExtension(String originalFilename) {
-		  int mid= originalFilename.lastIndexOf(".");
-		  String ext=originalFilename.substring(mid+1,originalFilename.length());
-		  return ext;
+		int mid = originalFilename.lastIndexOf(".");
+		String ext = originalFilename.substring(mid + 1, originalFilename.length());
+		return ext;
 	}
 }
diff --git a/src/main/java/com/labsynch/labseer/utils/MoleculeUtil.java b/src/main/java/com/labsynch/labseer/utils/MoleculeUtil.java
index d87bb12e0..641dcf741 100755
--- a/src/main/java/com/labsynch/labseer/utils/MoleculeUtil.java
+++ b/src/main/java/com/labsynch/labseer/utils/MoleculeUtil.java
@@ -15,70 +15,71 @@
 public class MoleculeUtil {
 
 	static Logger logger = LoggerFactory.getLogger(MoleculeUtil.class);
-	
+
 	private static CmpdRegMoleculeFactory cmpdRegMoleculeFactory;
-	
+
 	@Autowired
 	public MoleculeUtil(CmpdRegMoleculeFactory cmpdRegMoleculeFactory) {
 		MoleculeUtil.cmpdRegMoleculeFactory = cmpdRegMoleculeFactory;
 	}
 
-	public static boolean validateMolProperty(CmpdRegMolecule mol, String propName){
-				
+	public static boolean validateMolProperty(CmpdRegMolecule mol, String propName) {
+
 		// note: new method introduced in 5.7 - deprecates the method below
 		// (MPropHandler.convertToString(mol.properties(), "date_submitted")
 		boolean validProperty = false;
 		String molProperty = null;
 
-		if (propName != null && mol.getProperty(propName) != null){
+		if (propName != null && mol.getProperty(propName) != null) {
 			molProperty = mol.getProperty(propName).trim();
-			if (!molProperty.equalsIgnoreCase("")){
+			if (!molProperty.equalsIgnoreCase("")) {
 				validProperty = true;
 			}
-		} 
-		
+		}
+
 		return validProperty;
 	}
-	
-	public static String getMolProperty(CmpdRegMolecule mol, String propName){
+
+	public static String getMolProperty(CmpdRegMolecule mol, String propName) {
 		// note: new method introduced in 5.7 - deprecates the method below
 		// (MPropHandler.convertToString(mol.properties(), "date_submitted")
-//		MPropHandler.convertToString(mol.properties(), propName.trim());			
-		
+		// MPropHandler.convertToString(mol.properties(), propName.trim());
+
 		String molProperty = null;
-		if (mol.getProperty(propName) != null){
+		if (mol.getProperty(propName) != null) {
 			molProperty = mol.getProperty(propName).trim();
 		} else {
 			logger.error("the requested property is null: " + propName);
 		}
-		
+
 		return molProperty;
 	}
 
-	public static CmpdRegMolecule setMolProperty(CmpdRegMolecule mol, String key, String value){
+	public static CmpdRegMolecule setMolProperty(CmpdRegMolecule mol, String key, String value) {
 		mol.setProperty(key, value);
 		return mol;
 	}
-	
 
-	public static byte[] exportMolAsBin(CmpdRegMolecule mol, String imageFormat, String hSize, String wSize) throws IOException{
+	public static byte[] exportMolAsBin(CmpdRegMolecule mol, String imageFormat, String hSize, String wSize)
+			throws IOException {
 		return mol.toBinary(mol, imageFormat, hSize, wSize);
 	}
 
-	public static String exportMolAsText(CmpdRegMolecule mol, String exportFormat) throws IOException, CmpdRegMolFormatException{
-		if (exportFormat.equalsIgnoreCase("smiles")){
+	public static String exportMolAsText(CmpdRegMolecule mol, String exportFormat)
+			throws IOException, CmpdRegMolFormatException {
+		if (exportFormat.equalsIgnoreCase("smiles")) {
 			return mol.getSmiles();
-		}else if (exportFormat.equalsIgnoreCase("mrv")) {
+		} else if (exportFormat.equalsIgnoreCase("mrv")) {
 			return mol.getMrvStructure();
-		}else {
+		} else {
 			return mol.getMolStructure();
 		}
 
 	}
-	
+
 	public static String getMolFormula(String molStructure) throws CmpdRegMolFormatException {
 		CmpdRegMolecule mol = cmpdRegMoleculeFactory.getCmpdRegMolecule(molStructure);
 		return mol.getFormula();
 	}
-	
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/utils/PhysicalNamingStrategyImpl.java b/src/main/java/com/labsynch/labseer/utils/PhysicalNamingStrategyImpl.java
index d2fafdb79..b6ef55ad0 100644
--- a/src/main/java/com/labsynch/labseer/utils/PhysicalNamingStrategyImpl.java
+++ b/src/main/java/com/labsynch/labseer/utils/PhysicalNamingStrategyImpl.java
@@ -5,21 +5,24 @@
 import org.hibernate.boot.model.naming.Identifier;
 import org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl;
 import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
+
 public class PhysicalNamingStrategyImpl extends PhysicalNamingStrategyStandardImpl {
     @Override
     public Identifier toPhysicalTableName(Identifier name, JdbcEnvironment context) {
         return new Identifier(addUnderscores(name.getText()), name.isQuoted());
     }
+
     @Override
     public Identifier toPhysicalColumnName(Identifier name, JdbcEnvironment context) {
         return new Identifier(addUnderscores(name.getText()), name.isQuoted());
     }
+
     protected static String addUnderscores(String name) {
         final StringBuilder buf = new StringBuilder(name.replace('.', '_'));
         for (int i = 1; i < buf.length() - 1; i++) {
             if (Character.isLowerCase(buf.charAt(i - 1)) &&
-                Character.isUpperCase(buf.charAt(i)) &&
-                Character.isLowerCase(buf.charAt(i + 1))) {
+                    Character.isUpperCase(buf.charAt(i)) &&
+                    Character.isLowerCase(buf.charAt(i + 1))) {
                 buf.insert(i++, '_');
             }
         }
diff --git a/src/main/java/com/labsynch/labseer/utils/PostSuccessfulAuthenticationHandler.java b/src/main/java/com/labsynch/labseer/utils/PostSuccessfulAuthenticationHandler.java
index 68d769bd6..f0ff6dbb5 100755
--- a/src/main/java/com/labsynch/labseer/utils/PostSuccessfulAuthenticationHandler.java
+++ b/src/main/java/com/labsynch/labseer/utils/PostSuccessfulAuthenticationHandler.java
@@ -15,14 +15,14 @@
 import org.springframework.security.web.savedrequest.HttpSessionRequestCache;
 import org.springframework.security.web.savedrequest.SavedRequest;
 
-public class PostSuccessfulAuthenticationHandler extends  SavedRequestAwareAuthenticationSuccessHandler {
+public class PostSuccessfulAuthenticationHandler extends SavedRequestAwareAuthenticationSuccessHandler {
 
 	static Logger logger = LoggerFactory.getLogger(PostSuccessfulAuthenticationHandler.class);
 
 	public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response,
 			Authentication authentication) throws ServletException, IOException {
 		/*
-		 *  Add post authentication logic in the trackUseLogin method of userService;
+		 * Add post authentication logic in the trackUseLogin method of userService;
 		 */
 		logger.debug("principal info: " + authentication.getPrincipal());
 		Object principal = authentication.getPrincipal();
@@ -40,20 +40,20 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
 		SecurityUtil.updateUserInfo(authentication.getName());
 		super.onAuthenticationSuccess(request, response, authentication);
 	}
-	
+
 	protected String getRedirectUrl(HttpServletRequest request) {
-	    HttpSession session = request.getSession(false);
-	    if(session != null) {
-	    	
-	        SavedRequest savedRequest = new HttpSessionRequestCache().getRequest(request, null);
-	        //(SavedRequest) session.getAttribute(HttpSessionRequestCache.SAVED_REQUEST);
-	        if(savedRequest != null) {
-	            return savedRequest.getRedirectUrl();
-	        }
-	    }
-
-	    /* return a sane default in case data isn't there */
-	    return request.getContextPath() + "/";
+		HttpSession session = request.getSession(false);
+		if (session != null) {
+
+			SavedRequest savedRequest = new HttpSessionRequestCache().getRequest(request, null);
+			// (SavedRequest) session.getAttribute(HttpSessionRequestCache.SAVED_REQUEST);
+			if (savedRequest != null) {
+				return savedRequest.getRedirectUrl();
+			}
+		}
+
+		/* return a sane default in case data isn't there */
+		return request.getContextPath() + "/";
 	}
-	
+
 }
diff --git a/src/main/java/com/labsynch/labseer/utils/PropertiesFileService.java b/src/main/java/com/labsynch/labseer/utils/PropertiesFileService.java
index 1575423db..0ceedcefe 100755
--- a/src/main/java/com/labsynch/labseer/utils/PropertiesFileService.java
+++ b/src/main/java/com/labsynch/labseer/utils/PropertiesFileService.java
@@ -9,7 +9,4 @@ public interface PropertiesFileService {
 
 	String getUsernameProperty(String propertFilePath, String userName);
 
-
-
-	
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/utils/PropertiesFileServiceImpl.java b/src/main/java/com/labsynch/labseer/utils/PropertiesFileServiceImpl.java
index f85134cff..2137dc89b 100755
--- a/src/main/java/com/labsynch/labseer/utils/PropertiesFileServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/utils/PropertiesFileServiceImpl.java
@@ -10,58 +10,57 @@
 import org.springframework.stereotype.Service;
 
 @Service
-public class PropertiesFileServiceImpl implements PropertiesFileService{
-	
-    private static final Logger logger = LoggerFactory.getLogger(PropertiesFileServiceImpl.class);
+public class PropertiesFileServiceImpl implements PropertiesFileService {
 
+	private static final Logger logger = LoggerFactory.getLogger(PropertiesFileServiceImpl.class);
 
 	@Override
 	public String getProperty(String propertFilePath, String propertyName) {
-	
+
 		Properties properties = new Properties();
 		FileInputStream propertyStream;
 		try {
 			propertyStream = new FileInputStream(propertFilePath);
 			properties.load(propertyStream);
 			propertyStream.close();
-			
+
 		} catch (FileNotFoundException e) {
 			logger.error("ERROR: file not found");
 		} catch (IOException e) {
 			logger.error("ERROR: IO exception");
 
-		} 
+		}
 
 		String property = properties.getProperty(propertyName);
-		
+
 		return property;
 
 	}
-	
+
 	@Override
 	public String getUsernameProperty(String propertFilePath, String userName) {
-	
+
 		Properties properties = new Properties();
 		FileInputStream propertyStream;
 		try {
 			propertyStream = new FileInputStream(propertFilePath);
 			properties.load(propertyStream);
 			propertyStream.close();
-			
+
 		} catch (FileNotFoundException e) {
 			logger.error("ERROR: file not found");
 		} catch (IOException e) {
 			logger.error("ERROR: IO exception");
-		} 
+		}
 
 		String property = properties.getProperty(userName);
-		
-		if (property != null && property.length() > 0){
+
+		if (property != null && property.length() > 0) {
 			return userName;
 		} else {
 			return null;
 		}
-		
+
 	}
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/utils/PropertiesUtilService.java b/src/main/java/com/labsynch/labseer/utils/PropertiesUtilService.java
index 694817422..fa062a125 100755
--- a/src/main/java/com/labsynch/labseer/utils/PropertiesUtilService.java
+++ b/src/main/java/com/labsynch/labseer/utils/PropertiesUtilService.java
@@ -31,11 +31,11 @@ public interface PropertiesUtilService {
 	String getClientFullPath();
 
 	boolean getUniqueLsThingName();
-	
+
 	boolean getEnableSwagger();
 
 	String getAcaslicenseFile();
-	
+
 	boolean getSyncLdapAuthRoles();
 
 	String getAcasAdminRole();
@@ -61,71 +61,71 @@ public interface PropertiesUtilService {
 	String getAcasURL();
 
 	String getAcasAppURL();
-	
+
 	Boolean getLotCalledBatch();
-	
+
 	Boolean getUseExactMass();
-	
+
 	String getCorpPrefix();
-	
+
 	String getCorpSeparator();
-	
+
 	String getSaltSeparator();
-	
+
 	String getBatchSeparator();
-	
+
 	Integer getNumberCorpDigits();
-	
+
 	Integer getFormatBatchDigits();
-	
+
 	Integer getStartingCorpNumber();
-	
+
 	Boolean getFancyCorpNumberFormat();
-	
+
 	String getCorpParentFormat();
-	
+
 	String getCorpBatchFormat();
-	
+
 	Boolean getAppendSaltCodeToLotName();
 
 	Boolean getSaltBeforeLot();
-	
+
 	String getNoSaltCode();
-	
+
 	Boolean getUsePredefinedList();
-	
+
 	Boolean getUniqueNotebook();
-	
+
 	String getNotebookSavePath();
-	
+
 	SearchType getExactMatchDef();
-	
+
 	Integer getMaxSearchTime();
-	
+
 	Integer getMaxSearchResults();
-	
+
 	Boolean getProjectRestrictions();
-	
+
 	Boolean getCompoundInventory();
-	
+
 	Boolean getDisableTubeCreationIfNoBarcode();
-	
+
 	Boolean getCheckACASDependenciesByContainerCode();
-	
+
 	Boolean getUseExternalStandardizerConfig();
-	
+
 	String getStandardizerConfigFilePath();
-	
+
 	Boolean getOrderSelectLists();
-	
+
 	Boolean getRegisterNoStructureCompoundsAsUniqueParents();
-	
+
 	Boolean getUseProjectRoles();
-	
+
 	Collection<SimpleBulkLoadPropertyDTO> getDbProperties();
 
 	String getPreprocessorSettings();
-	
+
 	Integer getStandardizationBatchSize();
 
 	Integer getExternalStructureProcessingBatchSize();
diff --git a/src/main/java/com/labsynch/labseer/utils/PropertiesUtilServiceImpl.java b/src/main/java/com/labsynch/labseer/utils/PropertiesUtilServiceImpl.java
index ef4a6b7ad..cac29a0bb 100755
--- a/src/main/java/com/labsynch/labseer/utils/PropertiesUtilServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/utils/PropertiesUtilServiceImpl.java
@@ -7,485 +7,551 @@
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+
 @Service
-public class PropertiesUtilServiceImpl implements PropertiesUtilService{
-	
+public class PropertiesUtilServiceImpl implements PropertiesUtilService {
+
 	String clientPath;
 
 	@Value("${client.path}")
 	public void setClientPath(String clientPath) {
-	    this.clientPath = clientPath;
+		this.clientPath = clientPath;
 	}
 
 	@Override
 	public String getClientPath() {
-	    return this.clientPath;
+		return this.clientPath;
 	}
-	
+
 	String hostPath;
 
 	@Value("${client.service.persistence.fullpath}")
 	public void setHostPath(String hostPath) {
-	    this.hostPath = hostPath;
+		this.hostPath = hostPath;
 	}
 
 	@Override
 	public String getHostPath() {
-	    return this.hostPath;
+		return this.hostPath;
 	}
-	
+
 	int containerInventorySearchMaxResult;
-	
+
 	@Value("${client.containerInventory.search.maxResult}")
 	public void setContainerInventorySearchMaxResult(int containerInventorySearchMaxResult) {
-	    this.containerInventorySearchMaxResult = containerInventorySearchMaxResult;
+		this.containerInventorySearchMaxResult = containerInventorySearchMaxResult;
 	}
 
 	@Override
 	public int getContainerInventorySearchMaxResult() {
-	    return this.containerInventorySearchMaxResult;
+		return this.containerInventorySearchMaxResult;
 	}
 
 	String authStrategy;
 
 	@Value("${server.security.authstrategy}")
 	public void setAuthStrategy(String authStrategy) {
-	    this.authStrategy = authStrategy;
+		this.authStrategy = authStrategy;
 	}
 
 	@Override
 	public String getAuthStrategy() {
-	    return this.authStrategy;
+		return this.authStrategy;
 	}
-	
+
 	String securityProperties;
 
 	@Value("${server.security.properties.path}")
 	public void setSecurityProperties(String securityProperties) {
-	    this.securityProperties = securityProperties;
+		this.securityProperties = securityProperties;
 	}
 
 	@Override
 	public String getSecurityProperties() {
-	    return this.securityProperties;
+		return this.securityProperties;
 	}
-	
+
 	String batchSize;
 
 	@Value("${server.acas.batchSize}")
 	public void setBatchSize(String batchSize) {
-	    this.batchSize = batchSize;
+		this.batchSize = batchSize;
 	}
 
 	@Override
 	public Integer getBatchSize() {
-	    return Integer.parseInt(this.batchSize);
+		return Integer.parseInt(this.batchSize);
 	}
 
 	String fetchSize;
 
 	@Value("${server.acas.fetchSize}")
 	public void setFetchSize(String fetchSize) {
-	    this.fetchSize = fetchSize;
+		this.fetchSize = fetchSize;
 	}
 
 	@Override
 	public Integer getFetchSize() {
-	    return Integer.parseInt(this.fetchSize);
+		return Integer.parseInt(this.fetchSize);
 	}
-	
+
 	String uniqueExperimentName;
 
 	@Value("${server.uniqueExperimentName}")
 	public void setUniqueExperimentName(String uniqueExperimentName) {
-	    this.uniqueExperimentName = uniqueExperimentName;
+		this.uniqueExperimentName = uniqueExperimentName;
 	}
-	
+
 	@Override
 	public Boolean getUniqueExperimentName() {
-	    return Boolean.parseBoolean(this.uniqueExperimentName);
+		return Boolean.parseBoolean(this.uniqueExperimentName);
 	}
-	
+
 	Boolean uniqueProtocolName;
 
 	@Value("${server.uniqueProtocolName}")
 	public void setUniqueProtocolName(Boolean uniqueProtocolName) {
-	    this.uniqueProtocolName = Boolean.parseBoolean(this.uniqueExperimentName);
+		this.uniqueProtocolName = Boolean.parseBoolean(this.uniqueExperimentName);
 	}
-	
+
 	@Override
 	public Boolean getUniqueProtocolName() {
-	    return this.uniqueProtocolName;
+		return this.uniqueProtocolName;
 	}
-	
+
 	String autoCreateKinds;
 
 	@Value("${server.autoCreateKinds}")
 	public void setAutoCreateKinds(String autoCreateKinds) {
-	    this.autoCreateKinds = autoCreateKinds;
+		this.autoCreateKinds = autoCreateKinds;
 	}
-	
+
 	@Override
 	public Boolean getAutoCreateKinds() {
-	    return Boolean.parseBoolean(this.autoCreateKinds);
+		return Boolean.parseBoolean(this.autoCreateKinds);
 	}
-	
+
 	String clientFullPath;
 
 	@Value("${client.fullpath}")
 	public void setClientFullPath(String clientFullPath) {
-	    this.clientFullPath = clientFullPath;
+		this.clientFullPath = clientFullPath;
 	}
-	
+
 	@Override
 	public String getClientFullPath() {
-	    return this.clientFullPath;
+		return this.clientFullPath;
 	}
 
 	String uniqueLsThingName;
-	
+
 	@Value("${server.uniqueLsThingName}")
 	public void setUniqueLsThingName(String uniqueLsThingName) {
-	    this.uniqueLsThingName = uniqueLsThingName;
+		this.uniqueLsThingName = uniqueLsThingName;
 	}
-	
+
 	@Override
 	public boolean getUniqueLsThingName() {
 		return Boolean.parseBoolean(this.uniqueLsThingName);
 	}
-	
+
 	String enableSwagger;
-	
+
 	@Value("${server.enableSwagger}")
 	public void setEnableSwagger(String enableSwagger) {
-	    this.enableSwagger = enableSwagger;
+		this.enableSwagger = enableSwagger;
 	}
-	
+
 	@Override
 	public boolean getEnableSwagger() {
 		return Boolean.parseBoolean(this.enableSwagger);
 	}
-	
+
 	String acasLicenseFile;
 
 	@Value("${server.acas.license}")
 	public void setAcaslicenseFile(String acasLicenseFile) {
-	    this.acasLicenseFile = acasLicenseFile;
+		this.acasLicenseFile = acasLicenseFile;
 	}
 
 	@Override
 	public String getAcaslicenseFile() {
-	    return this.acasLicenseFile;
+		return this.acasLicenseFile;
 	}
-	
+
 	String syncLdapAuthRoles;
-	
+
 	@Value("${server.security.syncLdapAuthRoles}")
 	public void setSyncLdapAuthRoles(String syncLdapAuthRoles) {
-	    this.syncLdapAuthRoles = syncLdapAuthRoles;
+		this.syncLdapAuthRoles = syncLdapAuthRoles;
 	}
-	
+
 	@Override
 	public boolean getSyncLdapAuthRoles() {
 		return Boolean.parseBoolean(this.syncLdapAuthRoles);
 	}
-	
+
 	String restrictExperiments;
-	
+
 	@Value("${server.service.projects.restrictExperiments}")
 	public void setRestrictExperiments(String restrictExperiments) {
-	    this.restrictExperiments = restrictExperiments;
+		this.restrictExperiments = restrictExperiments;
 	}
-	
+
 	@Override
 	public boolean getRestrictExperiments() {
 		return Boolean.parseBoolean(this.restrictExperiments);
 	}
-	
+
 	String acasUserRole;
-	
+
 	@Value("${client.roles.acas.userRole}")
 	public void setAcasUserRole(String acasUserRole) {
 		this.acasUserRole = acasUserRole;
 	}
-	
+
 	@Override
 	public String getAcasUserRole() {
-	    return this.acasUserRole;
+		return this.acasUserRole;
 	}
-	
+
 	String acasAdminRole;
-	
+
 	@Value("${client.roles.acas.adminRole}")
 	public void setAcasAdminRole(String acasAdminRole) {
 		this.acasAdminRole = acasAdminRole;
 	}
-	
+
 	@Override
 	public String getAcasAdminRole() {
-	    return this.acasAdminRole;
+		return this.acasAdminRole;
 	}
-	
+
 	String enableProjectRoles;
-	
+
 	@Value("${server.project.roles.enable}")
 	public void setEnableProjectRoles(String enableProjectRoles) {
-	    this.enableProjectRoles = enableProjectRoles;
+		this.enableProjectRoles = enableProjectRoles;
 	}
-	
+
 	@Override
 	public boolean getEnableProjectRoles() {
 		return Boolean.parseBoolean(this.enableProjectRoles);
 	}
 
-	//server.chemistry.package
+	// server.chemistry.package
 	String chemistryPackage;
-	
+
 	@Value("${server.chemistry.package}")
 	public void setChemistryPackage(String chemistryPackage) {
 		this.chemistryPackage = chemistryPackage;
 	}
-	
+
 	@Override
 	public String getChemistryPackage() {
-	    return this.chemistryPackage;
+		return this.chemistryPackage;
 	}
-	
+
 	String rootLocationLabel;
 
 	@Value("${client.compoundInventory.rootLocationLabel}")
 	public void setRootLocationLabel(String rootLocationLabel) {
 		this.rootLocationLabel = rootLocationLabel;
-		if (this.rootLocationLabel.startsWith("${")) this.rootLocationLabel = null;
+		if (this.rootLocationLabel.startsWith("${"))
+			this.rootLocationLabel = null;
 	}
-	
+
 	@Override
 	public String getRootLocationLabel() {
-	    return this.rootLocationLabel;
+		return this.rootLocationLabel;
 	}
-	
+
 	String trashLocationLabel;
 
 	@Value("${client.compoundInventory.trashLocationLabel}")
 	public void setTrashLocationLabel(String trashLocationLabel) {
 		this.trashLocationLabel = trashLocationLabel;
-		if (this.trashLocationLabel.startsWith("${")) this.trashLocationLabel = null;
+		if (this.trashLocationLabel.startsWith("${"))
+			this.trashLocationLabel = null;
 	}
-	
+
 	@Override
 	public String getTrashLocationLabel() {
-	    return this.trashLocationLabel;
+		return this.trashLocationLabel;
 	}
+
 	String benchesLocationLabel;
 
 	@Value("${client.compoundInventory.benchesLocationLabel}")
 	public void setBenchesLocationLabel(String benchesLocationLabel) {
 		this.benchesLocationLabel = benchesLocationLabel;
-		if (this.benchesLocationLabel.startsWith("${")) this.benchesLocationLabel = null;
+		if (this.benchesLocationLabel.startsWith("${"))
+			this.benchesLocationLabel = null;
 	}
-	
+
 	@Override
 	public String getBenchesLocationLabel() {
-	    return this.benchesLocationLabel;
+		return this.benchesLocationLabel;
 	}
 
 	String emailFromAddress;
+
 	@Value("${server.support.smtp.from}")
 	public void setEmailFromAddress(String emailFromAddress) {
 		this.emailFromAddress = emailFromAddress;
-		if (this.emailFromAddress.startsWith("${")) this.emailFromAddress = null;
+		if (this.emailFromAddress.startsWith("${"))
+			this.emailFromAddress = null;
 	}
-	
+
 	@Override
 	public String getEmailFromAddress() {
-	    return this.emailFromAddress;
+		return this.emailFromAddress;
 	}
 
-
-	//CMPD REG PROPERTIES
+	// CMPD REG PROPERTIES
 	String acasURL;
-	
+
 	@Value("${client.cmpdreg.serverConnection.acasURL}")
 	public void setAcasURL(String acasURL) {
 		this.acasURL = acasURL;
-		if (this.acasURL.startsWith("${")) {acasURL = null;} else {this.acasURL = acasURL;};
+		if (this.acasURL.startsWith("${")) {
+			acasURL = null;
+		} else {
+			this.acasURL = acasURL;
+		}
+		;
 	}
-	
+
 	@Override
 	public String getAcasURL() {
 		return this.acasURL;
 	}
-	
+
 	String acasAppURL;
 
 	@Value("${client.cmpdreg.serverConnection.acasAppURL}")
 	public void setAcasAppURL(String acasAppURL) {
 		this.acasAppURL = acasAppURL;
-		if (this.acasAppURL.startsWith("${")) {acasAppURL = null;} else {this.acasAppURL = acasAppURL;};
+		if (this.acasAppURL.startsWith("${")) {
+			acasAppURL = null;
+		} else {
+			this.acasAppURL = acasAppURL;
+		}
+		;
 	}
-	
+
 	@Override
 	public String getAcasAppURL() {
 		return this.acasAppURL;
 	}
-	
+
 	Boolean lotCalledBatch;
 
 	@Value("${client.cmpdreg.metaLot.lotCalledBatch}")
 	public void setLotCalledBatch(String lotCalledBatch) {
-		if (lotCalledBatch.startsWith("${")) {lotCalledBatch = null;} else {this.lotCalledBatch = Boolean.parseBoolean(lotCalledBatch);};
+		if (lotCalledBatch.startsWith("${")) {
+			lotCalledBatch = null;
+		} else {
+			this.lotCalledBatch = Boolean.parseBoolean(lotCalledBatch);
+		}
+		;
 	}
-	
+
 	@Override
 	public Boolean getLotCalledBatch() {
 		return this.lotCalledBatch;
 	}
-	
+
 	Boolean useExactMass;
 
 	@Value("${client.cmpdreg.metaLot.useExactMass}")
 	public void setUseExactMass(String useExactMass) {
-		if (useExactMass.startsWith("${")) {useExactMass = null;} else {this.useExactMass = Boolean.parseBoolean(useExactMass);};
+		if (useExactMass.startsWith("${")) {
+			useExactMass = null;
+		} else {
+			this.useExactMass = Boolean.parseBoolean(useExactMass);
+		}
+		;
 	}
-	
+
 	@Override
 	public Boolean getUseExactMass() {
 		return this.useExactMass;
 	}
-	
+
 	String corpPrefix;
 
 	@Value("${client.cmpdreg.serverSettings.corpPrefix}")
 	public void setCorpPrefix(String corpPrefix) {
 		this.corpPrefix = corpPrefix;
-		if (this.corpPrefix.startsWith("${")) {corpPrefix = null;} else {this.corpPrefix = corpPrefix;};
+		if (this.corpPrefix.startsWith("${")) {
+			corpPrefix = null;
+		} else {
+			this.corpPrefix = corpPrefix;
+		}
+		;
 	}
-	
+
 	@Override
 	public String getCorpPrefix() {
 		return this.corpPrefix;
 	}
-	
+
 	String corpSeparator;
 
 	@Value("${client.cmpdreg.serverSettings.corpSeparator}")
 	public void setCorpSeparator(String corpSeparator) {
 		this.corpSeparator = corpSeparator;
-		if (this.corpSeparator.startsWith("${")) {corpSeparator = null;} else {this.corpSeparator = corpSeparator;};
+		if (this.corpSeparator.startsWith("${")) {
+			corpSeparator = null;
+		} else {
+			this.corpSeparator = corpSeparator;
+		}
+		;
 	}
-	
+
 	@Override
 	public String getCorpSeparator() {
 		return this.corpSeparator;
 	}
-	
+
 	String saltSeparator;
 
 	@Value("${client.cmpdreg.serverSettings.saltSeparator}")
 	public void setSaltSeparator(String saltSeparator) {
 		this.saltSeparator = saltSeparator;
-		if (this.saltSeparator.startsWith("${")) {saltSeparator = null;} else {this.saltSeparator = saltSeparator;};
+		if (this.saltSeparator.startsWith("${")) {
+			saltSeparator = null;
+		} else {
+			this.saltSeparator = saltSeparator;
+		}
+		;
 	}
-	
+
 	@Override
 	public String getSaltSeparator() {
 		return this.saltSeparator;
 	}
-	
+
 	String batchSeparator;
 
 	@Value("${client.cmpdreg.serverSettings.batchSeparator}")
 	public void setBatchSeparator(String batchSeparator) {
 		this.batchSeparator = batchSeparator;
-		if (this.batchSeparator.startsWith("${")) {batchSeparator = null;} else {this.batchSeparator = batchSeparator;};
+		if (this.batchSeparator.startsWith("${")) {
+			batchSeparator = null;
+		} else {
+			this.batchSeparator = batchSeparator;
+		}
+		;
 	}
-	
+
 	@Override
 	public String getBatchSeparator() {
 		return this.batchSeparator;
 	}
-	
+
 	int numberCorpDigits;
 
 	@Value("${client.cmpdreg.serverSettings.numberCorpDigits}")
 	public void setNumberCorpDigits(int numberCorpDigits) {
 		this.numberCorpDigits = numberCorpDigits;
 	}
-	
+
 	@Override
 	public Integer getNumberCorpDigits() {
 		return this.numberCorpDigits;
 	}
-	
+
 	Integer formatBatchDigits;
 
 	@Value("${client.cmpdreg.serverSettings.formatBatchDigits}")
 	public void setFormatBatchDigits(Integer formatBatchDigits) {
 		this.formatBatchDigits = formatBatchDigits;
 	}
-	
+
 	@Override
 	public Integer getFormatBatchDigits() {
 		return this.formatBatchDigits;
 	}
-	
+
 	Integer startingCorpNumber;
 
 	@Value("${client.cmpdreg.serverSettings.startingCorpNumber}")
 	public void setStartingCorpNumber(Integer startingCorpNumber) {
 		this.startingCorpNumber = startingCorpNumber;
 	}
-	
+
 	@Override
 	public Integer getStartingCorpNumber() {
 		return this.startingCorpNumber;
 	}
-	
+
 	Boolean fancyCorpNumberFormat;
 
 	@Value("${client.cmpdreg.serverSettings.fancyCorpNumberFormat}")
 	public void setFancyCorpNumberFormat(String fancyCorpNumberFormat) {
-		if (fancyCorpNumberFormat.startsWith("${")) {fancyCorpNumberFormat = null;} else {this.fancyCorpNumberFormat = Boolean.parseBoolean(fancyCorpNumberFormat);};
+		if (fancyCorpNumberFormat.startsWith("${")) {
+			fancyCorpNumberFormat = null;
+		} else {
+			this.fancyCorpNumberFormat = Boolean.parseBoolean(fancyCorpNumberFormat);
+		}
+		;
 	}
-	
+
 	@Override
 	public Boolean getFancyCorpNumberFormat() {
 		return this.fancyCorpNumberFormat;
 	}
-	
+
 	String corpParentFormat;
 
 	@Value("${client.cmpdreg.serverSettings.corpParentFormat}")
 	public void setCorpParentFormat(String corpParentFormat) {
 		this.corpParentFormat = corpParentFormat;
-		if (this.corpParentFormat.startsWith("${")) {corpParentFormat = null;} else {this.corpParentFormat = corpParentFormat;};
+		if (this.corpParentFormat.startsWith("${")) {
+			corpParentFormat = null;
+		} else {
+			this.corpParentFormat = corpParentFormat;
+		}
+		;
 	}
-	
+
 	@Override
 	public String getCorpParentFormat() {
 		return this.corpParentFormat;
 	}
-	
+
 	String corpBatchFormat;
 
 	@Value("${client.cmpdreg.serverSettings.corpBatchFormat}")
 	public void setCorpBatchFormat(String corpBatchFormat) {
 		this.corpBatchFormat = corpBatchFormat;
-		if (this.corpBatchFormat.startsWith("${")) {corpBatchFormat = null;} else {this.corpBatchFormat = corpBatchFormat;};
+		if (this.corpBatchFormat.startsWith("${")) {
+			corpBatchFormat = null;
+		} else {
+			this.corpBatchFormat = corpBatchFormat;
+		}
+		;
 	}
-	
+
 	@Override
 	public String getCorpBatchFormat() {
 		return this.corpBatchFormat;
 	}
-	
+
 	Boolean appendSaltCodeToLotName;
 
 	@Value("${client.cmpdreg.serverSettings.appendSaltCodeToLotName}")
 	public void setAppendSaltCodeToLotName(String appendSaltCodeToLotName) {
-		if (appendSaltCodeToLotName.startsWith("${")) {appendSaltCodeToLotName = null;} else {this.appendSaltCodeToLotName = Boolean.parseBoolean(appendSaltCodeToLotName);};
+		if (appendSaltCodeToLotName.startsWith("${")) {
+			appendSaltCodeToLotName = null;
+		} else {
+			this.appendSaltCodeToLotName = Boolean.parseBoolean(appendSaltCodeToLotName);
+		}
+		;
 	}
-	
+
 	@Override
 	public Boolean getAppendSaltCodeToLotName() {
 		return this.appendSaltCodeToLotName;
@@ -495,216 +561,287 @@ public Boolean getAppendSaltCodeToLotName() {
 
 	@Value("${client.cmpdreg.metaLot.saltBeforeLot}")
 	public void setSaltBeforeLot(String saltBeforeLot) {
-		if (saltBeforeLot.startsWith("${")) {saltBeforeLot = null;} else {this.saltBeforeLot = Boolean.parseBoolean(saltBeforeLot);};
+		if (saltBeforeLot.startsWith("${")) {
+			saltBeforeLot = null;
+		} else {
+			this.saltBeforeLot = Boolean.parseBoolean(saltBeforeLot);
+		}
+		;
 	}
-	
+
 	@Override
 	public Boolean getSaltBeforeLot() {
 		return this.saltBeforeLot;
 	}
-	
+
 	String noSaltCode;
 
 	@Value("${client.cmpdreg.serverSettings.noSaltCode}")
 	public void setNoSaltCode(String noSaltCode) {
 		this.noSaltCode = noSaltCode;
-		if (this.noSaltCode.startsWith("${")) {noSaltCode = null;} else {this.noSaltCode = noSaltCode;};
+		if (this.noSaltCode.startsWith("${")) {
+			noSaltCode = null;
+		} else {
+			this.noSaltCode = noSaltCode;
+		}
+		;
 	}
-	
+
 	@Override
 	public String getNoSaltCode() {
 		return this.noSaltCode;
 	}
-	
+
 	Boolean usePredefinedList;
 
 	@Value("${client.cmpdreg.serverSettings.usePredefinedList}")
 	public void setUsePredefinedList(String usePredefinedList) {
-		if (usePredefinedList.startsWith("${")) {usePredefinedList = null;} else {this.usePredefinedList = Boolean.parseBoolean(usePredefinedList);};
+		if (usePredefinedList.startsWith("${")) {
+			usePredefinedList = null;
+		} else {
+			this.usePredefinedList = Boolean.parseBoolean(usePredefinedList);
+		}
+		;
 	}
-	
+
 	@Override
 	public Boolean getUsePredefinedList() {
 		return this.usePredefinedList;
 	}
-	
+
 	Boolean uniqueNotebook;
 
 	@Value("${client.cmpdreg.serverSettings.uniqueNotebook}")
 	public void setUniqueNotebook(String uniqueNotebook) {
-		if (uniqueNotebook.startsWith("${")) {uniqueNotebook = null;} else {this.uniqueNotebook = Boolean.parseBoolean(uniqueNotebook);};
+		if (uniqueNotebook.startsWith("${")) {
+			uniqueNotebook = null;
+		} else {
+			this.uniqueNotebook = Boolean.parseBoolean(uniqueNotebook);
+		}
+		;
 	}
-	
+
 	@Override
 	public Boolean getUniqueNotebook() {
 		return this.uniqueNotebook;
 	}
-	
+
 	String notebookSavePath;
 
 	@Value("${client.cmpdreg.serverSettings.notebookSavePath}")
 	public void setNotebookSavePath(String notebookSavePath) {
 		this.notebookSavePath = notebookSavePath;
-		if (this.notebookSavePath.startsWith("${")) {notebookSavePath = null;} else {this.notebookSavePath = notebookSavePath;};
+		if (this.notebookSavePath.startsWith("${")) {
+			notebookSavePath = null;
+		} else {
+			this.notebookSavePath = notebookSavePath;
+		}
+		;
 	}
-	
+
 	@Override
 	public String getNotebookSavePath() {
 		return this.notebookSavePath;
 	}
-	
+
 	SearchType exactMatchDef;
 
 	@Value("${client.cmpdreg.serverSettings.exactMatchDef}")
 	public void setExactMatchDef(String exactMatchDef) {
 		this.exactMatchDef = SearchType.getIfPresent(exactMatchDef).orElse(SearchType.DUPLICATE_TAUTOMER);
 	}
-	
+
 	@Override
 	public SearchType getExactMatchDef() {
 		return this.exactMatchDef;
 	}
-	
+
 	Integer maxSearchTime;
 
 	@Value("${client.cmpdreg.serverSettings.maxSearchTime}")
 	public void setMaxSearchTime(Integer maxSearchTime) {
 		this.maxSearchTime = maxSearchTime;
 	}
-	
+
 	@Override
 	public Integer getMaxSearchTime() {
 		return this.maxSearchTime;
 	}
-	
+
 	Integer maxSearchResults;
 
 	@Value("${client.cmpdreg.serverSettings.maxSearchResults}")
 	public void setMaxSearchResults(Integer maxSearchResults) {
 		this.maxSearchResults = maxSearchResults;
 	}
-	
+
 	@Override
 	public Integer getMaxSearchResults() {
 		return this.maxSearchResults;
 	}
-	
+
 	Boolean projectRestrictions;
 
 	@Value("${client.cmpdreg.serverSettings.projectRestrictions}")
 	public void setProjectRestrictions(String projectRestrictions) {
-		if (projectRestrictions.startsWith("${")) {projectRestrictions = null;} else {this.projectRestrictions = Boolean.parseBoolean(projectRestrictions);};
+		if (projectRestrictions.startsWith("${")) {
+			projectRestrictions = null;
+		} else {
+			this.projectRestrictions = Boolean.parseBoolean(projectRestrictions);
+		}
+		;
 	}
-	
+
 	@Override
 	public Boolean getProjectRestrictions() {
 		return this.projectRestrictions;
 	}
-	
+
 	Boolean compoundInventory;
 
 	@Value("${client.cmpdreg.serverSettings.compoundInventory}")
 	public void setCompoundInventory(String compoundInventory) {
-		if (compoundInventory.startsWith("${")) {compoundInventory = null;} else {this.compoundInventory = Boolean.parseBoolean(compoundInventory);};
+		if (compoundInventory.startsWith("${")) {
+			compoundInventory = null;
+		} else {
+			this.compoundInventory = Boolean.parseBoolean(compoundInventory);
+		}
+		;
 	}
-	
+
 	@Override
 	public Boolean getCompoundInventory() {
 		return this.compoundInventory;
 	}
-	
+
 	Boolean disableTubeCreationIfNoBarcode;
 
 	@Value("${client.cmpdreg.serverSettings.disableTubeCreationIfNoBarcode}")
 	public void setDisableTubeCreationIfNoBarcode(String disableTubeCreationIfNoBarcode) {
-		if (disableTubeCreationIfNoBarcode.startsWith("${")) {disableTubeCreationIfNoBarcode = null;} else {this.disableTubeCreationIfNoBarcode = Boolean.parseBoolean(disableTubeCreationIfNoBarcode);};
+		if (disableTubeCreationIfNoBarcode.startsWith("${")) {
+			disableTubeCreationIfNoBarcode = null;
+		} else {
+			this.disableTubeCreationIfNoBarcode = Boolean.parseBoolean(disableTubeCreationIfNoBarcode);
+		}
+		;
 	}
-	
+
 	@Override
 	public Boolean getDisableTubeCreationIfNoBarcode() {
 		return this.disableTubeCreationIfNoBarcode;
 	}
-	
+
 	Boolean checkACASDependenciesByContainerCode;
 
 	@Value("${client.cmpdreg.serverSettings.checkACASDependenciesByContainerCode}")
 	public void setCheckACASDependenciesByContainerCode(String checkACASDependenciesByContainerCode) {
-		if (checkACASDependenciesByContainerCode.startsWith("${")) {checkACASDependenciesByContainerCode = null;} else {this.checkACASDependenciesByContainerCode = Boolean.parseBoolean(checkACASDependenciesByContainerCode);};
+		if (checkACASDependenciesByContainerCode.startsWith("${")) {
+			checkACASDependenciesByContainerCode = null;
+		} else {
+			this.checkACASDependenciesByContainerCode = Boolean.parseBoolean(checkACASDependenciesByContainerCode);
+		}
+		;
 	}
-	
+
 	@Override
 	public Boolean getCheckACASDependenciesByContainerCode() {
 		return this.checkACASDependenciesByContainerCode;
 	}
-	
+
 	Boolean useExternalStandardizerConfig;
 
 	@Value("${client.cmpdreg.serverSettings.useExternalStandardizerConfig}")
 	public void setUseExternalStandardizerConfig(String useExternalStandardizerConfig) {
-		if (useExternalStandardizerConfig.startsWith("${")) {useExternalStandardizerConfig = null;} else {this.useExternalStandardizerConfig = Boolean.parseBoolean(useExternalStandardizerConfig);};
+		if (useExternalStandardizerConfig.startsWith("${")) {
+			useExternalStandardizerConfig = null;
+		} else {
+			this.useExternalStandardizerConfig = Boolean.parseBoolean(useExternalStandardizerConfig);
+		}
+		;
 	}
-	
+
 	@Override
 	public Boolean getUseExternalStandardizerConfig() {
 		return this.useExternalStandardizerConfig;
 	}
-	
+
 	String standardizerConfigFilePath;
-	
+
 	@Value("${client.cmpdreg.serverSettings.standardizerConfigFilePath}")
 	public void setStandardizerConfigFilePath(String standardizerConfigFilePath) {
 		this.standardizerConfigFilePath = standardizerConfigFilePath;
-		if (this.standardizerConfigFilePath.startsWith("${")) {standardizerConfigFilePath = null;} else {this.standardizerConfigFilePath = standardizerConfigFilePath;};
+		if (this.standardizerConfigFilePath.startsWith("${")) {
+			standardizerConfigFilePath = null;
+		} else {
+			this.standardizerConfigFilePath = standardizerConfigFilePath;
+		}
+		;
 	}
-	
+
 	@Override
 	public String getStandardizerConfigFilePath() {
 		return this.standardizerConfigFilePath;
 	}
-	
+
 	Boolean orderSelectLists;
 
 	@Value("${client.cmpdreg.serverSettings.orderSelectLists}")
 	public void setOrderSelectLists(String orderSelectLists) {
-		if (orderSelectLists.startsWith("${")) {orderSelectLists = null;} else {this.orderSelectLists = Boolean.parseBoolean(orderSelectLists);};
+		if (orderSelectLists.startsWith("${")) {
+			orderSelectLists = null;
+		} else {
+			this.orderSelectLists = Boolean.parseBoolean(orderSelectLists);
+		}
+		;
 	}
-	
+
 	@Override
 	public Boolean getOrderSelectLists() {
 		return this.orderSelectLists;
 	}
-	
+
 	Boolean registerNoStructureCompoundsAsUniqueParents;
 
 	@Value("${client.cmpdreg.serverSettings.registerNoStructureCompoundsAsUniqueParents}")
 	public void setRegisterNoStructureCompoundsAsUniqueParents(String registerNoStructureCompoundsAsUniqueParents) {
-		if (registerNoStructureCompoundsAsUniqueParents.startsWith("${")) {registerNoStructureCompoundsAsUniqueParents = null;} else {this.registerNoStructureCompoundsAsUniqueParents = Boolean.parseBoolean(registerNoStructureCompoundsAsUniqueParents);};
+		if (registerNoStructureCompoundsAsUniqueParents.startsWith("${")) {
+			registerNoStructureCompoundsAsUniqueParents = null;
+		} else {
+			this.registerNoStructureCompoundsAsUniqueParents = Boolean
+					.parseBoolean(registerNoStructureCompoundsAsUniqueParents);
+		}
+		;
 	}
-	
+
 	@Override
 	public Boolean getRegisterNoStructureCompoundsAsUniqueParents() {
 		return this.registerNoStructureCompoundsAsUniqueParents;
 	}
-	
+
 	Boolean useProjectRoles;
 
 	@Value("${client.cmpdreg.bulkLoadSettings.useProjectRoles}")
 	public void setUseProjectRoles(String useProjectRoles) {
-		if (useProjectRoles.startsWith("${")) {useProjectRoles = null;} else {this.useProjectRoles = Boolean.parseBoolean(useProjectRoles);};
+		if (useProjectRoles.startsWith("${")) {
+			useProjectRoles = null;
+		} else {
+			this.useProjectRoles = Boolean.parseBoolean(useProjectRoles);
+		}
+		;
 	}
-	
+
 	@Override
 	public Boolean getUseProjectRoles() {
 		return this.useProjectRoles;
 	}
-	
+
 	Collection<SimpleBulkLoadPropertyDTO> dbProperties;
-	
+
 	@Value("${client.cmpdreg.bulkLoadSettings.dbProperties}")
 	public void setDbProperties(String dbProperties) {
 		this.dbProperties = SimpleBulkLoadPropertyDTO.fromJsonArrayToSimpleBulkLoadProes(dbProperties);
 	}
-	
+
 	@Override
 	public Collection<SimpleBulkLoadPropertyDTO> getDbProperties() {
 		return this.dbProperties;
@@ -714,12 +851,12 @@ public Collection<SimpleBulkLoadPropertyDTO> getDbProperties() {
 
 	@Value("${client.cmpdreg.serverSettings.liveDesign.preprocessorSettings}")
 	public void setPreprocessorSettings(String preprocessorSettings) {
-	    this.preprocessorSettings = preprocessorSettings;
+		this.preprocessorSettings = preprocessorSettings;
 	}
 
 	@Override
 	public String getPreprocessorSettings() {
-	    return this.preprocessorSettings;
+		return this.preprocessorSettings;
 	}
 
 	int standardizationBatchSize;
@@ -730,12 +867,13 @@ public void setStandardizationBatchSize(String standardizationBatchSize) {
 			this.standardizationBatchSize = 1000;
 		} else {
 			this.standardizationBatchSize = Integer.parseInt(standardizationBatchSize);
-		};
+		}
+		;
 	}
 
 	@Override
 	public Integer getStandardizationBatchSize() {
-	    return this.standardizationBatchSize;
+		return this.standardizationBatchSize;
 	}
 
 	int externalStructureProcessingBatchSize;
@@ -746,13 +884,13 @@ public void setExternalStructureProcessingBatchSize(String externalStructureProc
 			this.externalStructureProcessingBatchSize = 100;
 		} else {
 			this.externalStructureProcessingBatchSize = Integer.parseInt(externalStructureProcessingBatchSize);
-		};
+		}
+		;
 	}
 
 	@Override
 	public Integer getExternalStructureProcessingBatchSize() {
-	    return this.externalStructureProcessingBatchSize;
+		return this.externalStructureProcessingBatchSize;
 	}
 
-	
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/utils/Request.java b/src/main/java/com/labsynch/labseer/utils/Request.java
index dfb4365a6..49c6aff31 100644
--- a/src/main/java/com/labsynch/labseer/utils/Request.java
+++ b/src/main/java/com/labsynch/labseer/utils/Request.java
@@ -14,28 +14,28 @@ public class Request implements Callable<Response> {
     private HttpURLConnection con;
     private URL obj;
     private String response;
-    
+
     private String url;
     private int id;
     private String json;
-    
+
     public Request(int id, String url, String json) {
         this.id = id;
         this.url = url;
         this.json = json;
     }
-    
+
     @Override
     public Response call() {
         try {
             obj = new URL(url);
             con = (HttpURLConnection) obj.openConnection();
-    		String charset = "UTF-8";
+            String charset = "UTF-8";
             con.setRequestMethod("POST");
             con.setDoOutput(true);
             con.setRequestProperty("Accept", "application/json");
             con.setRequestProperty("Accept-Charset", charset);
-            con.setRequestProperty("Content-Type", "application/json");		
+            con.setRequestProperty("Content-Type", "application/json");
             OutputStream output = con.getOutputStream();
             output.write(json.getBytes());
 
diff --git a/src/main/java/com/labsynch/labseer/utils/Response.java b/src/main/java/com/labsynch/labseer/utils/Response.java
index fb6f9d04b..333b8d55c 100644
--- a/src/main/java/com/labsynch/labseer/utils/Response.java
+++ b/src/main/java/com/labsynch/labseer/utils/Response.java
@@ -5,21 +5,21 @@ public class Response {
     private int id;
     private String responseBody;
     private int responseCode;
-    
-    public Response(int id,int responseCode, String responseBody) {
+
+    public Response(int id, int responseCode, String responseBody) {
         this.id = id;
         this.responseBody = responseBody;
         this.responseCode = responseCode;
     }
-    
+
     public int getId() {
         return id;
     }
-    
+
     public int getResponseCode() {
         return responseCode;
     }
-    
+
     public String getResponseBody() {
         return responseBody;
     }
diff --git a/src/main/java/com/labsynch/labseer/utils/SecurityUtil.java b/src/main/java/com/labsynch/labseer/utils/SecurityUtil.java
index eb88ca151..a01b634ab 100755
--- a/src/main/java/com/labsynch/labseer/utils/SecurityUtil.java
+++ b/src/main/java/com/labsynch/labseer/utils/SecurityUtil.java
@@ -17,25 +17,26 @@ public class SecurityUtil {
 
 	static Logger logger = LoggerFactory.getLogger(SecurityUtil.class);
 
-	public static Author getLoginUser(){
+	public static Author getLoginUser() {
 
 		String chemistName = "BLANK";
 		String userJson = null;
 		Author chemist;
 
 		try {
-			//			SecurityContext context = SecurityContextHolder.getContext();
-			//			logger.debug("context is " + context);
+			// SecurityContext context = SecurityContextHolder.getContext();
+			// logger.debug("context is " + context);
 			Authentication auth = SecurityContextHolder.getContext().getAuthentication();
 			logger.debug("authentication: " + auth);
 
-			if (auth != null){
+			if (auth != null) {
 				@SuppressWarnings("unchecked")
-				Collection<GrantedAuthority> auths = (Collection<GrantedAuthority>) SecurityContextHolder.getContext().getAuthentication().getAuthorities();
-				for (GrantedAuthority ga : auths){
+				Collection<GrantedAuthority> auths = (Collection<GrantedAuthority>) SecurityContextHolder.getContext()
+						.getAuthentication().getAuthorities();
+				for (GrantedAuthority ga : auths) {
 					logger.debug("granted auth: " + ga);
-				}	
-				
+				}
+
 				String userName = SecurityContextHolder.getContext().getAuthentication().getName();
 				Object details = SecurityContextHolder.getContext().getAuthentication().getDetails();
 				Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
@@ -43,8 +44,8 @@ public static Author getLoginUser(){
 				String principalUserName = null;
 				String userDN = null;
 				if (principal instanceof LdapUserDetails) {
-					principalUserName = ((LdapUserDetails)principal).getUsername();
-					userDN =  ((LdapUserDetails)principal).getDn();
+					principalUserName = ((LdapUserDetails) principal).getUsername();
+					userDN = ((LdapUserDetails) principal).getDn();
 				} else {
 					principalUserName = principal.toString();
 				}
@@ -54,7 +55,7 @@ public static Author getLoginUser(){
 				logger.debug("principal is " + principal);
 				logger.debug("details is " + details);
 
-				if (userName.equalsIgnoreCase("isoutsource3")){
+				if (userName.equalsIgnoreCase("isoutsource3")) {
 					chemistName = "cchemist";
 				} else {
 					chemistName = userName.toLowerCase();
@@ -65,7 +66,7 @@ public static Author getLoginUser(){
 			chemist = Author.findAuthorsByUserName(chemistName).getSingleResult();
 			userJson = chemist.toJson();
 
-		} catch (NoResultException e){
+		} catch (NoResultException e) {
 			logger.error("unable to find the user: " + chemistName);
 			chemist = new Author();
 		}
@@ -83,7 +84,7 @@ public static void updateUserInfo(String loginName) {
 			chemist = Author.findAuthorsByUserName(loginName).getSingleResult();
 			userJson = chemist.toJson();
 			logger.debug(userJson);
-		} catch (NoResultException e){
+		} catch (NoResultException e) {
 			logger.debug("did not find the new chemist. create the new entry");
 			chemist = createUser(loginName);
 		}
@@ -98,7 +99,7 @@ public static void updateUserInfo(String loginName, String fullName) {
 			chemist = Author.findAuthorsByUserName(loginName).getSingleResult();
 			userJson = chemist.toJson();
 			logger.debug(userJson);
-		} catch (NoResultException e){
+		} catch (NoResultException e) {
 			logger.debug("did not find the new chemist. create the new entry");
 			chemist = createUser(loginName, fullName);
 		}
diff --git a/src/main/java/com/labsynch/labseer/utils/SecurityUtils.java b/src/main/java/com/labsynch/labseer/utils/SecurityUtils.java
index bc9b84c97..6f0b926e0 100644
--- a/src/main/java/com/labsynch/labseer/utils/SecurityUtils.java
+++ b/src/main/java/com/labsynch/labseer/utils/SecurityUtils.java
@@ -24,15 +24,15 @@
 public class SecurityUtils {
 
 	static Logger logger = LoggerFactory.getLogger(SecurityUtils.class);
-	
+
 	@Autowired
-    private PropertiesUtilService propertiesUtilService;
-	
+	private PropertiesUtilService propertiesUtilService;
+
 	@Autowired
-    private AuthorRoleService authorRoleService;
-	
+	private AuthorRoleService authorRoleService;
+
 	@Autowired
-    private AuthorService authorService;
+	private AuthorService authorService;
 
 	@Transactional
 	public void updateAuthorInfo(Authentication authentication) {
@@ -41,39 +41,38 @@ public void updateAuthorInfo(Authentication authentication) {
 
 		List<Author> authors = Author.findAuthorsByUserName(userName).getResultList();
 		Author author;
-		if (authors.size() > 1){
+		if (authors.size() > 1) {
 			logger.error("ERROR. Found multiple authors with the same user name");
 			author = authors.get(0);
-		} else if (authors.size() == 1){
+		} else if (authors.size() == 1) {
 			author = authors.get(0);
 		} else {
 			author = createAuthor(authentication);
 		}
-		logger.debug("Updated author: "+author.getUserName());
-		if (propertiesUtilService.getSyncLdapAuthRoles()){
+		logger.debug("Updated author: " + author.getUserName());
+		if (propertiesUtilService.getSyncLdapAuthRoles()) {
 			Collection<? extends GrantedAuthority> auths = authentication.getAuthorities();
 			Collection<String> grantedAuths = new HashSet<String>();
-			for (GrantedAuthority auth : auths){
+			for (GrantedAuthority auth : auths) {
 				grantedAuths.add(auth.getAuthority());
 			}
-			try{
+			try {
 				author = authorRoleService.syncRoles(author, grantedAuths);
-			}catch (Exception e){
-				logger.error("Caught error trying to update author roles.",e);
+			} catch (Exception e) {
+				logger.error("Caught error trying to update author roles.", e);
 			}
-			logger.debug("Finished syncing roles for "+author.getUserName());
+			logger.debug("Finished syncing roles for " + author.getUserName());
 		}
-		
 
 	}
 
-    private Author createAuthor(Authentication authentication) {
+	private Author createAuthor(Authentication authentication) {
 
 		Object principal = authentication.getPrincipal();
 
 		String principalUserName = null;
 		String userDN = null;
-		
+
 		Author author = new Author();
 
 		if (principal instanceof InetOrgPerson) {
@@ -82,10 +81,11 @@ private Author createAuthor(Authentication authentication) {
 			logger.debug("username: " + principalUserName);
 			String fullName = inetOrgPerson.getCn()[0];
 			logger.debug("fullName: " + fullName);
-			String [] parts = fullName.split(" ", 2);
+			String[] parts = fullName.split(" ", 2);
 			if (parts.length != 2) {
-				logger.error("Could not get user first name and last name from cn '" + fullName + "'  Please provide a cn which can be split into first and last name by a space e.g. 'Test User'");
-			} 
+				logger.error("Could not get user first name and last name from cn '" + fullName
+						+ "'  Please provide a cn which can be split into first and last name by a space e.g. 'Test User'");
+			}
 			String firstName = parts[0];
 			String lastName = parts[1];
 			author.setUserName(principalUserName);
@@ -108,9 +108,10 @@ private Author createAuthor(Authentication authentication) {
 			int endIndex = dn.indexOf(",");
 			String fullName = dn.substring(beginIndex, endIndex);
 			logger.debug("fullName: " + fullName);
-			String [] parts = fullName.split(" ", 2);
+			String[] parts = fullName.split(" ", 2);
 			if (parts.length != 2) {
-				logger.error("Could not get user first name and last name from cn '" + fullName + "'  Please provide a cn which can be split into first and last name by a space e.g. 'Test User'");
+				logger.error("Could not get user first name and last name from cn '" + fullName
+						+ "'  Please provide a cn which can be split into first and last name by a space e.g. 'Test User'");
 			}
 			String firstName = parts[0];
 			String lastName = parts[1];
@@ -126,7 +127,7 @@ private Author createAuthor(Authentication authentication) {
 			author = authorService.saveAuthor(author);
 
 		} else {
-			principalUserName = ((User)principal).getUsername();
+			principalUserName = ((User) principal).getUsername();
 			logger.info("not LDAP user Name " + principalUserName);
 			author.setUserName(principalUserName);
 			author.setFirstName(principalUserName);
@@ -139,7 +140,6 @@ private Author createAuthor(Authentication authentication) {
 			author.setLsKind("default");
 			author = authorService.saveAuthor(author);
 		}
-		
 
 		logger.info("just created new user in the database: " + author.toJson());
 
diff --git a/src/main/java/com/labsynch/labseer/utils/SetupPropertiesUtils.java b/src/main/java/com/labsynch/labseer/utils/SetupPropertiesUtils.java
index fc1b3533c..0852729ed 100755
--- a/src/main/java/com/labsynch/labseer/utils/SetupPropertiesUtils.java
+++ b/src/main/java/com/labsynch/labseer/utils/SetupPropertiesUtils.java
@@ -12,12 +12,13 @@ public class SetupPropertiesUtils {
 	private static final Logger logger = LoggerFactory.getLogger(InitialSetup.class);
 
 	private static String setupPropertiesFileName = "initialsetup.properties";
-//	private static String setupPropertiesFileName = "node_config.js";
+	// private static String setupPropertiesFileName = "node_config.js";
 
 	public static String getProperties(String propertyName) throws IOException {
 		logger.debug("PROP Reader");
 		Properties properties = new Properties();
-		InputStream propertyStream = SetupPropertiesUtils.class.getClassLoader().getResourceAsStream(setupPropertiesFileName);
+		InputStream propertyStream = SetupPropertiesUtils.class.getClassLoader()
+				.getResourceAsStream(setupPropertiesFileName);
 
 		properties.load(propertyStream);
 		propertyStream.close();
diff --git a/src/main/java/com/labsynch/labseer/utils/SimpleUtil.java b/src/main/java/com/labsynch/labseer/utils/SimpleUtil.java
index 208af5574..011ee31b0 100644
--- a/src/main/java/com/labsynch/labseer/utils/SimpleUtil.java
+++ b/src/main/java/com/labsynch/labseer/utils/SimpleUtil.java
@@ -47,281 +47,306 @@
 import org.springframework.web.util.UriComponentsBuilder;
 
 public class SimpleUtil {
-	
+
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
-	
+
 	private static int PARAMETER_LIMIT = 999;
-	
+
 	public static boolean isNumeric(String str) {
 		for (char c : str.toCharArray()) {
-			if (!Character.isDigit(c)) return false;
+			if (!Character.isDigit(c))
+				return false;
 		}
 		return true;
 	}
-	
+
 	public static boolean isDecimalNumeric(String str) {
 		for (char c : str.toCharArray()) {
-			if (!Character.isDigit(c) && c != '-' && c!= '.') return false;
+			if (!Character.isDigit(c) && c != '-' && c != '.')
+				return false;
 		}
 		return true;
 	}
-	
+
 	public static int countLines(String filename) throws IOException {
-	    InputStream is = new BufferedInputStream(new FileInputStream(filename));
-	    try {
-	        byte[] c = new byte[1024];
-	        int count = 0;
-	        int readChars = 0;
-	        boolean empty = true;
-	        while ((readChars = is.read(c)) != -1) {
-	            empty = false;
-	            for (int i = 0; i < readChars; ++i) {
-	                if (c[i] == '\n') {
-	                    ++count;
-	                }
-	            }
-	        }
-	        return (count == 0 && !empty) ? 1 : count;
-	    } finally {
-	        is.close();
-	    }
+		InputStream is = new BufferedInputStream(new FileInputStream(filename));
+		try {
+			byte[] c = new byte[1024];
+			int count = 0;
+			int readChars = 0;
+			boolean empty = true;
+			while ((readChars = is.read(c)) != -1) {
+				empty = false;
+				for (int i = 0; i < readChars; ++i) {
+					if (c[i] == '\n') {
+						++count;
+					}
+				}
+			}
+			return (count == 0 && !empty) ? 1 : count;
+		} finally {
+			is.close();
+		}
 	}
-	
-	public static List<String> splitSearchString(String searchString){
+
+	public static List<String> splitSearchString(String searchString) {
 		List<String> list = new ArrayList<String>();
 		Matcher m = Pattern.compile("([^\"]\\S*|\".+?\")\\s*").matcher(searchString);
-		while (m.find()){
-			list.add(m.group(1).replace("\"",""));
+		while (m.find()) {
+			list.add(m.group(1).replace("\"", ""));
 		}
 		return list;
 	}
-	
-	public static String toAlphabetic(int i){
-		if( i<0 ) {
-	        return "-"+toAlphabetic(-i-1);
-	    }
-
-	    int quot = i/26;
-	    int rem = i%26;
-	    char letter = (char)((int)'A' + rem);
-	    if( quot == 0 ) {
-	        return ""+letter;
-	    } else {
-	        return toAlphabetic(quot-1) + letter;
-	    }
+
+	public static String toAlphabetic(int i) {
+		if (i < 0) {
+			return "-" + toAlphabetic(-i - 1);
+		}
+
+		int quot = i / 26;
+		int rem = i % 26;
+		char letter = (char) ((int) 'A' + rem);
+		if (quot == 0) {
+			return "" + letter;
+		} else {
+			return toAlphabetic(quot - 1) + letter;
+		}
 	}
-	
-	public static Collection<Query> splitHqlInClause(EntityManager em, String queryString, String attributeName, List<String> matchStrings){
+
+	public static Collection<Query> splitHqlInClause(EntityManager em, String queryString, String attributeName,
+			List<String> matchStrings) {
 		Map<String, Collection<String>> sqlCurveIdMap = new HashMap<String, Collection<String>>();
-    	List<String> allCodes = new ArrayList<String>();
-    	allCodes.addAll(matchStrings);
-    	int startIndex = 0;
-    	Collection<Query> allQueries = new ArrayList<Query>();
-    	while (startIndex < matchStrings.size()){
-    		int endIndex;
-    		if (startIndex+PARAMETER_LIMIT < matchStrings.size()) endIndex = startIndex+PARAMETER_LIMIT;
-    		else endIndex = matchStrings.size();
-    		List<String> nextCodes = allCodes.subList(startIndex, endIndex);
-    		String groupName = "strings"+startIndex;
-    		String sqlClause = " "+attributeName+" IN (:"+groupName+")";
-    		sqlCurveIdMap.put(sqlClause, nextCodes);
-    		startIndex=endIndex;
-    	}
-    	for (String sqlClause : sqlCurveIdMap.keySet()){
+		List<String> allCodes = new ArrayList<String>();
+		allCodes.addAll(matchStrings);
+		int startIndex = 0;
+		Collection<Query> allQueries = new ArrayList<Query>();
+		while (startIndex < matchStrings.size()) {
+			int endIndex;
+			if (startIndex + PARAMETER_LIMIT < matchStrings.size())
+				endIndex = startIndex + PARAMETER_LIMIT;
+			else
+				endIndex = matchStrings.size();
+			List<String> nextCodes = allCodes.subList(startIndex, endIndex);
+			String groupName = "strings" + startIndex;
+			String sqlClause = " " + attributeName + " IN (:" + groupName + ")";
+			sqlCurveIdMap.put(sqlClause, nextCodes);
+			startIndex = endIndex;
+		}
+		for (String sqlClause : sqlCurveIdMap.keySet()) {
 			String completeQueryString = queryString + sqlClause;
 			Query q = em.createQuery(completeQueryString);
-			String groupName = sqlClause.split(":")[1].replace(")","");
-        	q.setParameter(groupName, sqlCurveIdMap.get(sqlClause));
-        	allQueries.add(q);
-    	}
-    	return allQueries;
+			String groupName = sqlClause.split(":")[1].replace(")", "");
+			q.setParameter(groupName, sqlCurveIdMap.get(sqlClause));
+			allQueries.add(q);
+		}
+		return allQueries;
 	}
-	
-	public static Query addHqlInClause(EntityManager em, String queryString, String attributeName, List<String> matchStrings){
+
+	public static Query addHqlInClause(EntityManager em, String queryString, String attributeName,
+			List<String> matchStrings) {
 		Map<String, Collection<String>> sqlCurveIdMap = new HashMap<String, Collection<String>>();
-    	List<String> allCodes = new ArrayList<String>();
-    	allCodes.addAll(matchStrings);
-    	int startIndex = 0;
-    	while (startIndex < matchStrings.size()){
-    		int endIndex;
-    		if (startIndex+PARAMETER_LIMIT < matchStrings.size()) endIndex = startIndex+PARAMETER_LIMIT;
-    		else endIndex = matchStrings.size();
-    		List<String> nextCodes = allCodes.subList(startIndex, endIndex);
-    		String groupName = "strings"+startIndex;
-    		String sqlClause = " "+attributeName+" IN (:"+groupName+")";
-    		sqlCurveIdMap.put(sqlClause, nextCodes);
-    		startIndex=endIndex;
-    	}
-    	int numClause = 1;
-    	for (String sqlClause : sqlCurveIdMap.keySet()){
-    		if (numClause == 1){
-    			queryString = queryString + sqlClause;
-    		}else{
-    			queryString = queryString + " OR " + sqlClause;
-    		}
-    		numClause++;
-    	}
-    	Query q = em.createQuery(queryString);
-		for (String sqlClause : sqlCurveIdMap.keySet()){
-        	String groupName = sqlClause.split(":")[1].replace(")","");
-        	q.setParameter(groupName, sqlCurveIdMap.get(sqlClause));
-        }
-    	return q;
+		List<String> allCodes = new ArrayList<String>();
+		allCodes.addAll(matchStrings);
+		int startIndex = 0;
+		while (startIndex < matchStrings.size()) {
+			int endIndex;
+			if (startIndex + PARAMETER_LIMIT < matchStrings.size())
+				endIndex = startIndex + PARAMETER_LIMIT;
+			else
+				endIndex = matchStrings.size();
+			List<String> nextCodes = allCodes.subList(startIndex, endIndex);
+			String groupName = "strings" + startIndex;
+			String sqlClause = " " + attributeName + " IN (:" + groupName + ")";
+			sqlCurveIdMap.put(sqlClause, nextCodes);
+			startIndex = endIndex;
+		}
+		int numClause = 1;
+		for (String sqlClause : sqlCurveIdMap.keySet()) {
+			if (numClause == 1) {
+				queryString = queryString + sqlClause;
+			} else {
+				queryString = queryString + " OR " + sqlClause;
+			}
+			numClause++;
+		}
+		Query q = em.createQuery(queryString);
+		for (String sqlClause : sqlCurveIdMap.keySet()) {
+			String groupName = sqlClause.split(":")[1].replace(")", "");
+			q.setParameter(groupName, sqlCurveIdMap.get(sqlClause));
+		}
+		return q;
 	}
-	
-	public static Query addHqlInClauseNativeQuery(EntityManager em, String queryString, String attributeName, List<String> matchStrings){
+
+	public static Query addHqlInClauseNativeQuery(EntityManager em, String queryString, String attributeName,
+			List<String> matchStrings) {
 		Map<String, Collection<String>> sqlCurveIdMap = new HashMap<String, Collection<String>>();
-    	List<String> allCodes = new ArrayList<String>();
-    	allCodes.addAll(matchStrings);
-    	int startIndex = 0;
-    	while (startIndex < matchStrings.size()){
-    		int endIndex;
-    		if (startIndex+PARAMETER_LIMIT < matchStrings.size()) endIndex = startIndex+PARAMETER_LIMIT;
-    		else endIndex = matchStrings.size();
-    		List<String> nextCodes = allCodes.subList(startIndex, endIndex);
-    		String groupName = "strings"+startIndex;
-    		String sqlClause = " "+attributeName+" IN (:"+groupName+")";
-    		sqlCurveIdMap.put(sqlClause, nextCodes);
-    		startIndex=endIndex;
-    	}
-    	int numClause = 1;
-    	for (String sqlClause : sqlCurveIdMap.keySet()){
-    		if (numClause == 1){
-    			queryString = queryString + sqlClause;
-    		}else{
-    			queryString = queryString + " OR " + sqlClause;
-    		}
-    		numClause++;
-    	}
-    	queryString = queryString + " )";
-    	Query q = em.createNativeQuery(queryString);
-		for (String sqlClause : sqlCurveIdMap.keySet()){
-        	String groupName = sqlClause.split(":")[1].replace(")","");
-        	q.setParameter(groupName, sqlCurveIdMap.get(sqlClause));
-        }
-    	return q;
+		List<String> allCodes = new ArrayList<String>();
+		allCodes.addAll(matchStrings);
+		int startIndex = 0;
+		while (startIndex < matchStrings.size()) {
+			int endIndex;
+			if (startIndex + PARAMETER_LIMIT < matchStrings.size())
+				endIndex = startIndex + PARAMETER_LIMIT;
+			else
+				endIndex = matchStrings.size();
+			List<String> nextCodes = allCodes.subList(startIndex, endIndex);
+			String groupName = "strings" + startIndex;
+			String sqlClause = " " + attributeName + " IN (:" + groupName + ")";
+			sqlCurveIdMap.put(sqlClause, nextCodes);
+			startIndex = endIndex;
+		}
+		int numClause = 1;
+		for (String sqlClause : sqlCurveIdMap.keySet()) {
+			if (numClause == 1) {
+				queryString = queryString + sqlClause;
+			} else {
+				queryString = queryString + " OR " + sqlClause;
+			}
+			numClause++;
+		}
+		queryString = queryString + " )";
+		Query q = em.createNativeQuery(queryString);
+		for (String sqlClause : sqlCurveIdMap.keySet()) {
+			String groupName = sqlClause.split(":")[1].replace(")", "");
+			q.setParameter(groupName, sqlCurveIdMap.get(sqlClause));
+		}
+		return q;
 	}
-	
-	public static String makeLeftJoinHql(String table, String alias, String lsType, String lsKind){
-		String queryString = "left join "+table+" as "+alias+" with "+alias+".lsType='"+lsType+"' and "+alias+".lsKind='"+lsKind+"' and "+alias+".ignored <> true ";
+
+	public static String makeLeftJoinHql(String table, String alias, String lsType, String lsKind) {
+		String queryString = "left join " + table + " as " + alias + " with " + alias + ".lsType='" + lsType + "' and "
+				+ alias + ".lsKind='" + lsKind + "' and " + alias + ".ignored <> true ";
 		return queryString;
 	}
-	public static String makeInnerJoinHql(String table, String alias, String lsType, String lsKind){
-		String queryString = "inner join "+table+" as "+alias+" with "+alias+".lsType='"+lsType+"' and "+alias+".lsKind='"+lsKind+"' and "+alias+".ignored <> true ";
+
+	public static String makeInnerJoinHql(String table, String alias, String lsType, String lsKind) {
+		String queryString = "inner join " + table + " as " + alias + " with " + alias + ".lsType='" + lsType + "' and "
+				+ alias + ".lsKind='" + lsKind + "' and " + alias + ".ignored <> true ";
 		return queryString;
 	}
-	
-	public static String makeInnerJoinHql(String table, String alias, String lsType){
-		String queryString = "inner join "+table+" as "+alias+" with "+alias+".lsType='"+lsType+"' and "+alias+".ignored <> true ";
+
+	public static String makeInnerJoinHql(String table, String alias, String lsType) {
+		String queryString = "inner join " + table + " as " + alias + " with " + alias + ".lsType='" + lsType + "' and "
+				+ alias + ".ignored <> true ";
 		return queryString;
 	}
 
-	
 	public static Predicate buildInPredicate(CriteriaBuilder cb, Expression<String> property, List<String> values) {
 		Predicate predicate = null;
-        int listSize = values.size();
-        for (int i = 0; i < listSize; i += PARAMETER_LIMIT) {
-            List<String> subList;
-            if (listSize > i + PARAMETER_LIMIT) {
-                subList = values.subList(i, (i + PARAMETER_LIMIT));
-            } else {
-                subList = values.subList(i, listSize);
-            }
-            if (predicate != null) {
-            	predicate = cb.or(predicate, property.in(subList));
-            } else {
-            	predicate = property.in(subList);
-            }
-        }
-        return predicate;
-    }
-	
-	public static final List<Long> getIdsFromSequence(JdbcTemplate jdbcTemplate, String sequenceName, int numberOfIds){
+		int listSize = values.size();
+		for (int i = 0; i < listSize; i += PARAMETER_LIMIT) {
+			List<String> subList;
+			if (listSize > i + PARAMETER_LIMIT) {
+				subList = values.subList(i, (i + PARAMETER_LIMIT));
+			} else {
+				subList = values.subList(i, listSize);
+			}
+			if (predicate != null) {
+				predicate = cb.or(predicate, property.in(subList));
+			} else {
+				predicate = property.in(subList);
+			}
+		}
+		return predicate;
+	}
+
+	public static final List<Long> getIdsFromSequence(JdbcTemplate jdbcTemplate, String sequenceName, int numberOfIds) {
 		String databaseType = null;
-		try{
-			databaseType = (String) JdbcUtils.extractDatabaseMetaData(jdbcTemplate.getDataSource(), "getDatabaseProductName");
-		}catch (MetaDataAccessException e){}
+		try {
+			databaseType = (String) JdbcUtils.extractDatabaseMetaData(jdbcTemplate.getDataSource(),
+					"getDatabaseProductName");
+		} catch (MetaDataAccessException e) {
+		}
 		List<Long> idList = new ArrayList<Long>();
-		if (databaseType.equalsIgnoreCase("Oracle")){
-			String getIdsSql = "SELECT "+sequenceName+".nextval as id from dual connect by level <"+(numberOfIds+1);
-			idList = jdbcTemplate.query(getIdsSql, new RowMapper<Long>(){
-				public Long mapRow(ResultSet rs, int rowNum) throws SQLException{
+		if (databaseType.equalsIgnoreCase("Oracle")) {
+			String getIdsSql = "SELECT " + sequenceName + ".nextval as id from dual connect by level <"
+					+ (numberOfIds + 1);
+			idList = jdbcTemplate.query(getIdsSql, new RowMapper<Long>() {
+				public Long mapRow(ResultSet rs, int rowNum) throws SQLException {
 					return rs.getLong(1);
 				}
 			});
-		}
-		else{ 
-			String getIdsSql = "SELECT nextval('"+sequenceName+"') as id from generate_series(1,"+numberOfIds+")";
-			idList = jdbcTemplate.query(getIdsSql, new RowMapper<Long>(){
-				public Long mapRow(ResultSet rs, int rowNum) throws SQLException{
+		} else {
+			String getIdsSql = "SELECT nextval('" + sequenceName + "') as id from generate_series(1," + numberOfIds
+					+ ")";
+			idList = jdbcTemplate.query(getIdsSql, new RowMapper<Long>() {
+				public Long mapRow(ResultSet rs, int rowNum) throws SQLException {
 					return rs.getLong(1);
 				}
 			});
 		}
 		return idList;
 	}
-	
-	public static final List<LsThingValue> pluckValueByStateTypeKindAndValueTypeKind(LsThing lsThing, String stateType, String stateKind,
-			String valueType, String valueKind){
+
+	public static final List<LsThingValue> pluckValueByStateTypeKindAndValueTypeKind(LsThing lsThing, String stateType,
+			String stateKind,
+			String valueType, String valueKind) {
 		final String finalStateType = stateType;
 		final String finalStateKind = stateKind;
 		final String finalValueType = valueType;
 		final String finalValueKind = valueKind;
-		
-		final com.github.underscore.Predicate<LsThingState> statePredicate = new com.github.underscore.Predicate<LsThingState>(){
-			public Boolean apply(LsThingState lsState){
-				return lsState.getLsType().equals(finalStateType) && lsState.getLsKind().equals(finalStateKind) && !lsState.isIgnored();
+
+		final com.github.underscore.Predicate<LsThingState> statePredicate = new com.github.underscore.Predicate<LsThingState>() {
+			public Boolean apply(LsThingState lsState) {
+				return lsState.getLsType().equals(finalStateType) && lsState.getLsKind().equals(finalStateKind)
+						&& !lsState.isIgnored();
 			}
 		};
-		final com.github.underscore.Predicate<LsThingValue> valuePredicate = new com.github.underscore.Predicate<LsThingValue>(){
-			public Boolean apply(LsThingValue lsValue){
-				return lsValue.getLsType().equals(finalValueType) && lsValue.getLsKind().equals(finalValueKind) && !lsValue.isIgnored();
+		final com.github.underscore.Predicate<LsThingValue> valuePredicate = new com.github.underscore.Predicate<LsThingValue>() {
+			public Boolean apply(LsThingValue lsValue) {
+				return lsValue.getLsType().equals(finalValueType) && lsValue.getLsKind().equals(finalValueKind)
+						&& !lsValue.isIgnored();
 			}
 		};
-		Function1<LsThingState, List<LsThingValue>> filterValues = new Function1<LsThingState, List<LsThingValue>>(){
-			public List<LsThingValue> apply(LsThingState lsState){
+		Function1<LsThingState, List<LsThingValue>> filterValues = new Function1<LsThingState, List<LsThingValue>>() {
+			public List<LsThingValue> apply(LsThingState lsState) {
 				return $.filter(new ArrayList<LsThingValue>(lsState.getLsValues()), valuePredicate);
 			}
 		};
-		
-		List<LsThingValue> filteredValues = $.flatten($.map($.filter(new ArrayList<LsThingState>(lsThing.getLsStates()), statePredicate), filterValues));
+
+		List<LsThingValue> filteredValues = $.flatten(
+				$.map($.filter(new ArrayList<LsThingState>(lsThing.getLsStates()), statePredicate), filterValues));
 
 		return filteredValues;
 	}
-	
-	public static final List<LsThingValue> pluckValueByValueTypeKind(LsThing lsThing, String valueType, String valueKind){
+
+	public static final List<LsThingValue> pluckValueByValueTypeKind(LsThing lsThing, String valueType,
+			String valueKind) {
 		final String finalValueType = valueType;
 		final String finalValueKind = valueKind;
-		
-		final com.github.underscore.Predicate<LsThingState> statePredicate = new com.github.underscore.Predicate<LsThingState>(){
-			public Boolean apply(LsThingState lsState){
+
+		final com.github.underscore.Predicate<LsThingState> statePredicate = new com.github.underscore.Predicate<LsThingState>() {
+			public Boolean apply(LsThingState lsState) {
 				return !lsState.isIgnored();
 			}
 		};
-		
-		final com.github.underscore.Predicate<LsThingValue> valuePredicate = new com.github.underscore.Predicate<LsThingValue>(){
-			public Boolean apply(LsThingValue lsValue){
-				return lsValue.getLsType().equals(finalValueType) && lsValue.getLsKind().equals(finalValueKind) && !lsValue.isIgnored();
+
+		final com.github.underscore.Predicate<LsThingValue> valuePredicate = new com.github.underscore.Predicate<LsThingValue>() {
+			public Boolean apply(LsThingValue lsValue) {
+				return lsValue.getLsType().equals(finalValueType) && lsValue.getLsKind().equals(finalValueKind)
+						&& !lsValue.isIgnored();
 			}
 		};
-		Function1<LsThingState, List<LsThingValue>> filterValues = new Function1<LsThingState, List<LsThingValue>>(){
-			public List<LsThingValue> apply(LsThingState lsState){
+		Function1<LsThingState, List<LsThingValue>> filterValues = new Function1<LsThingState, List<LsThingValue>>() {
+			public List<LsThingValue> apply(LsThingState lsState) {
 				return $.filter(new ArrayList<LsThingValue>(lsState.getLsValues()), valuePredicate);
 			}
 		};
-		
-		List<LsThingValue> filteredValues = $.flatten($.map($.filter(new ArrayList<LsThingState>(lsThing.getLsStates()), statePredicate), filterValues));
+
+		List<LsThingValue> filteredValues = $.flatten(
+				$.map($.filter(new ArrayList<LsThingState>(lsThing.getLsStates()), statePredicate), filterValues));
 
 		return filteredValues;
 	}
 
 	public static String bitSetToString(BitSet bitSet) {
-		if(bitSet.length() == 0) return null;
+		if (bitSet.length() == 0)
+			return null;
 
 		final StringBuilder s = new StringBuilder();
-		for( int i = 0; i < bitSet.size();  i++ ) {
-			s.append( bitSet.get( i ) == true ? '1': '0' );
+		for (int i = 0; i < bitSet.size(); i++) {
+			s.append(bitSet.get(i) == true ? '1' : '0');
 		}
 		return s.toString();
 	}
@@ -336,23 +361,24 @@ public static BitSet stringToBitSet(String bitString) {
 		return bitset;
 	}
 
-	public static String postRequestToExternalServer(String url, String jsonContent, Logger logger) throws MalformedURLException, IOException {
+	public static String postRequestToExternalServer(String url, String jsonContent, Logger logger)
+			throws MalformedURLException, IOException {
 		String charset = "UTF-8";
 		HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
 		connection.setRequestMethod("POST");
 		connection.setDoOutput(true);
 		connection.setRequestProperty("Accept", "application/json");
 		connection.setRequestProperty("Accept-Charset", charset);
-		connection.setRequestProperty("Content-Type", "application/json");		
-		logger.debug("Sending request to: "+url);
-		logger.debug("with data: "+jsonContent);
-		try{
+		connection.setRequestProperty("Content-Type", "application/json");
+		logger.debug("Sending request to: " + url);
+		logger.debug("with data: " + jsonContent);
+		try {
 			OutputStream output = connection.getOutputStream();
 			output.write(jsonContent.getBytes());
-		}catch (Exception e){
-			logger.error("Error sending request to: "+url);
-			logger.error("with data: "+jsonContent);
-			logger.error("Error occurred in making HTTP Request to external server",e);
+		} catch (Exception e) {
+			logger.error("Error sending request to: " + url);
+			logger.error("with data: " + jsonContent);
+			logger.error("Error occurred in making HTTP Request to external server", e);
 		}
 		return getStringBody(connection);
 	}
@@ -369,53 +395,56 @@ public static String getStringBody(HttpURLConnection httpURLConnection) throws I
 		return body;
 	}
 
-	public static HttpURLConnection postRequest(String url, String jsonContent, Logger logger) throws MalformedURLException, IOException {
+	public static HttpURLConnection postRequest(String url, String jsonContent, Logger logger)
+			throws MalformedURLException, IOException {
 		String charset = "UTF-8";
 		HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
 		connection.setRequestMethod("POST");
 		connection.setDoOutput(true);
 		connection.setRequestProperty("Accept", "application/json");
 		connection.setRequestProperty("Accept-Charset", charset);
-		connection.setRequestProperty("Content-Type", "application/json");		
-		logger.debug("Sending request to: "+url);
-		logger.debug("with data: "+jsonContent);
-		try{
+		connection.setRequestProperty("Content-Type", "application/json");
+		logger.debug("Sending request to: " + url);
+		logger.debug("with data: " + jsonContent);
+		try {
 			OutputStream output = connection.getOutputStream();
 			output.write(jsonContent.getBytes());
-		}catch (Exception e){
-			logger.error("Error sending request to: "+url);
-			logger.error("with data: "+jsonContent);
-			logger.error("Error occurred in making HTTP Request to external server",e);
+		} catch (Exception e) {
+			logger.error("Error sending request to: " + url);
+			logger.error("with data: " + jsonContent);
+			logger.error("Error occurred in making HTTP Request to external server", e);
 		}
 		return connection;
 	}
 
-	public static byte[] postRequestToExternalServerBinaryResponse(String url, String jsonContent, Logger logger) throws MalformedURLException, IOException {
+	public static byte[] postRequestToExternalServerBinaryResponse(String url, String jsonContent, Logger logger)
+			throws MalformedURLException, IOException {
 		String charset = "UTF-8";
 		HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
 		connection.setRequestMethod("POST");
 		connection.setDoOutput(true);
 		connection.setRequestProperty("Accept", "application/json");
 		connection.setRequestProperty("Accept-Charset", charset);
-		connection.setRequestProperty("Content-Type", "application/json");		
-		logger.debug("Sending request to: "+url);
-		logger.debug("with data: "+jsonContent);
-		try{
+		connection.setRequestProperty("Content-Type", "application/json");
+		logger.debug("Sending request to: " + url);
+		logger.debug("with data: " + jsonContent);
+		try {
 			OutputStream output = connection.getOutputStream();
 			output.write(jsonContent.getBytes());
-		}catch (Exception e){
-			logger.error("Error sending request to: "+url);
-			logger.error("with data: "+jsonContent);
-			logger.error("Error occurred in making HTTP Request to external server",e);
+		} catch (Exception e) {
+			logger.error("Error sending request to: " + url);
+			logger.error("with data: " + jsonContent);
+			logger.error("Error occurred in making HTTP Request to external server", e);
 		}
 		InputStream input = connection.getInputStream();
 		return IOUtils.toByteArray(input);
 	}
-	
-	public static String getFromExternalServer(String url, Map<String, String> queryParams, Logger logger) throws MalformedURLException, IOException {
+
+	public static String getFromExternalServer(String url, Map<String, String> queryParams, Logger logger)
+			throws MalformedURLException, IOException {
 		String charset = "UTF-8";
 		UriComponentsBuilder ub = UriComponentsBuilder.fromHttpUrl(url);
-		if (queryParams != null){
+		if (queryParams != null) {
 			for (String param : queryParams.keySet()) {
 				ub.queryParam(param, URLEncoder.encode(queryParams.get(param), charset));
 			}
@@ -426,13 +455,13 @@ public static String getFromExternalServer(String url, Map<String, String> query
 		connection.setDoOutput(true);
 		connection.setRequestProperty("Accept", "application/json");
 		connection.setRequestProperty("Accept-Charset", charset);
-		logger.debug("Sending request to: "+fullUrl);
+		logger.debug("Sending request to: " + fullUrl);
 		int responseCode = connection.getResponseCode();
-		logger.debug("Response Code: "+responseCode);
+		logger.debug("Response Code: " + responseCode);
 		BufferedReader inStream = new BufferedReader(new InputStreamReader(connection.getInputStream()));
 		String inputLine;
 		StringBuffer response = new StringBuffer();
-		
+
 		while ((inputLine = inStream.readLine()) != null) {
 			response.append(inputLine);
 		}
@@ -440,53 +469,52 @@ public static String getFromExternalServer(String url, Map<String, String> query
 		return response.toString();
 	}
 
-
-
 	public static class PostResponse {
-	    private String json = null;
-	    private int status = -1;
+		private String json = null;
+		private int status = -1;
 
-	    public int getStatus() {
-	        return this.status;
-	    }
+		public int getStatus() {
+			return this.status;
+		}
 
-	    public void setStatus(int status) {
-	        this.status = status;
-	    }
+		public void setStatus(int status) {
+			this.status = status;
+		}
 
-	    public String getJson() {
-	        return this.json;
-	    }
+		public String getJson() {
+			return this.json;
+		}
 
-	    public void setJson(String json) {
-	        this.json = json;
-	    }
+		public void setJson(String json) {
+			this.json = json;
+		}
 
 	}
 
-	public static PostResponse postRequestToExternalServerReturnObject(String url, String jsonContent, Logger logger) throws MalformedURLException, IOException {
+	public static PostResponse postRequestToExternalServerReturnObject(String url, String jsonContent, Logger logger)
+			throws MalformedURLException, IOException {
 		String charset = "UTF-8";
 		HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
 		connection.setRequestMethod("POST");
 		connection.setDoOutput(true);
 		connection.setRequestProperty("Accept", "application/json");
 		connection.setRequestProperty("Accept-Charset", charset);
-		connection.setRequestProperty("Content-Type", "application/json");		
-		logger.debug("Sending request to: "+url);
-		logger.debug("with data: "+jsonContent);
-		try{
+		connection.setRequestProperty("Content-Type", "application/json");
+		logger.debug("Sending request to: " + url);
+		logger.debug("with data: " + jsonContent);
+		try {
 			OutputStream output = connection.getOutputStream();
 			output.write(jsonContent.getBytes());
-		} catch (Exception e){
-			logger.error("Error sending request to: "+url);
-			logger.error("with data: "+jsonContent);
-			logger.error("Error occurred in making HTTP Request to external server",e);
+		} catch (Exception e) {
+			logger.error("Error sending request to: " + url);
+			logger.error("with data: " + jsonContent);
+			logger.error("Error occurred in making HTTP Request to external server", e);
 		}
 		InputStream input;
 		if (connection.getResponseCode() < HttpURLConnection.HTTP_BAD_REQUEST) {
 			input = connection.getInputStream();
 		} else {
-		     /* error from server */
+			/* error from server */
 			input = connection.getErrorStream();
 		}
 		byte[] bytes = IOUtils.toByteArray(input);
@@ -497,15 +525,14 @@ public static PostResponse postRequestToExternalServerReturnObject(String url, S
 		return postResponse;
 	}
 
-
 	public enum DbType {
 		MY_SQL, ORACLE, POSTGRES, SQL_SERVER, HSQLDB, H2, UNKNOWN
 	}
 
 	public static DbType getDatabaseType(DatabaseMetaData metadata) {
-		try{
+		try {
 			String rawName = metadata.getDatabaseProductName();
-			if(rawName == "PostgreSQL") {
+			if (rawName == "PostgreSQL") {
 				return DbType.POSTGRES;
 			} else if (rawName == "MySQL") {
 				return DbType.MY_SQL;
@@ -533,22 +560,22 @@ public static List<List<Long>> splitArrayIntoGroups(List<Long> array, int groupS
 		int loopCount = 1;
 		for (Long l : array) {
 			group.add(l);
-			// Check to see if we are at the end of the group or if we are at the end of the array
+			// Check to see if we are at the end of the group or if we are at the end of the
+			// array
 			// if so, then add the group to the list of groups and start a new group
 			if (group.size() == groupSize || loopCount == array.size()) {
 				groups.add(group);
 				group = new ArrayList<Long>();
 			}
-			loopCount ++;
+			loopCount++;
 		}
 		return groups;
 	}
 
-
 	public static List<List<Long>> splitIntArrayIntoGroups(List<BigInteger> missingIds, int groupSize) {
 		List<Long> longs = missingIds.stream()
-        	.mapToLong(BigInteger::longValue)
-        	.boxed().collect(Collectors.toList());
+				.mapToLong(BigInteger::longValue)
+				.boxed().collect(Collectors.toList());
 
 		return splitArrayIntoGroups(longs, groupSize);
 	}
diff --git a/src/main/java/com/labsynch/labseer/utils/StatCalc.java b/src/main/java/com/labsynch/labseer/utils/StatCalc.java
index a6ada0cf6..f34963c36 100644
--- a/src/main/java/com/labsynch/labseer/utils/StatCalc.java
+++ b/src/main/java/com/labsynch/labseer/utils/StatCalc.java
@@ -1,9 +1,9 @@
 package com.labsynch.labseer.utils;
 
 public class StatCalc {
-	private int count;   // Number of numbers that have been entered.
-	private Double sum;  // The sum of all the items that have been entered.
-	private Double squareSum;  // The sum of the squares of all the items.
+	private int count; // Number of numbers that have been entered.
+	private Double sum; // The sum of all the items that have been entered.
+	private Double squareSum; // The sum of the squares of all the items.
 	private Double product; // The product of all the items
 
 	public StatCalc() {
@@ -12,15 +12,16 @@ public StatCalc() {
 		squareSum = 0.0;
 		product = 1.0;
 	}
+
 	public void add(double num) {
 		// Add the number to the dataset.
 		count++;
 		sum += num;
-		squareSum += num*num;
+		squareSum += num * num;
 		product *= num;
 	}
 
-	public int getCount() {   
+	public int getCount() {
 		// Return number of items that have been entered.
 		return count;
 	}
@@ -29,6 +30,7 @@ public Double getSum() {
 		// Return the sum of all the items that have been entered.
 		return sum;
 	}
+
 	public Double getProduct() {
 		// Return the product of all the items that have been entered.
 		return product;
@@ -37,22 +39,23 @@ public Double getProduct() {
 	public Double getArithmeticMean() {
 		// Return average of all the items that have been entered.
 		// Value is Double.NaN if count == 0.
-		return sum / count;  
+		return sum / count;
 	}
+
 	public Double getGeometricMean() {
 		// Return geometric mean of all the items that have been entered.
 		// Value is Double.NaN if count == 0.
-		return Math.pow(product,1/count);  
+		return Math.pow(product, 1 / count);
 	}
 
-	public Double getStandardDeviation() {  
+	public Double getStandardDeviation() {
 		// Return standard deviation of all the items that have been entered.
 		// Value will be Double.NaN if count == 0.
 		Double mean = getArithmeticMean();
-		Double stdDev = squareSum/count - mean*mean;
-		if(stdDev < 0.000000000001) {
+		Double stdDev = squareSum / count - mean * mean;
+		if (stdDev < 0.000000000001) {
 			stdDev = 0.0;
 		}
-		return Math.sqrt( stdDev );
+		return Math.sqrt(stdDev);
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/com/labsynch/labseer/web/ApplicationConversionServiceFactoryBean.java b/src/main/java/com/labsynch/labseer/web/ApplicationConversionServiceFactoryBean.java
index 8e660bd72..780c1f22a 100755
--- a/src/main/java/com/labsynch/labseer/web/ApplicationConversionServiceFactoryBean.java
+++ b/src/main/java/com/labsynch/labseer/web/ApplicationConversionServiceFactoryBean.java
@@ -10,23 +10,24 @@
 import org.springframework.format.support.FormattingConversionServiceFactoryBean;
 import org.springframework.transaction.annotation.Transactional;;
 
-
 @Configurable
 /**
- * A central place to register application converters and formatters. 
+ * A central place to register application converters and formatters.
  */
 @Transactional
 public class ApplicationConversionServiceFactoryBean extends FormattingConversionServiceFactoryBean {
 
-	public Converter<AnalysisGroup, String> getAnalysisGroupToStringConverter() {
+    public Converter<AnalysisGroup, String> getAnalysisGroupToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.AnalysisGroup, java.lang.String>() {
             public String convert(AnalysisGroup analysisGroup) {
-                return new StringBuilder().append(analysisGroup.getLsType()).append(' ').append(analysisGroup.getLsKind()).append(' ').append(analysisGroup.getLsTypeAndKind()).append(' ').append(analysisGroup.getCodeName()).toString();
+                return new StringBuilder().append(analysisGroup.getLsType()).append(' ')
+                        .append(analysisGroup.getLsKind()).append(' ').append(analysisGroup.getLsTypeAndKind())
+                        .append(' ').append(analysisGroup.getCodeName()).toString();
             }
         };
     }
 
-	public Converter<Long, AnalysisGroup> getIdToAnalysisGroupConverter() {
+    public Converter<Long, AnalysisGroup> getIdToAnalysisGroupConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.AnalysisGroup>() {
             public com.labsynch.labseer.domain.AnalysisGroup convert(java.lang.Long id) {
                 return AnalysisGroup.findAnalysisGroup(id);
@@ -34,7 +35,7 @@ public com.labsynch.labseer.domain.AnalysisGroup convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, AnalysisGroup> getStringToAnalysisGroupConverter() {
+    public Converter<String, AnalysisGroup> getStringToAnalysisGroupConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.AnalysisGroup>() {
             public com.labsynch.labseer.domain.AnalysisGroup convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), AnalysisGroup.class);
@@ -42,15 +43,18 @@ public com.labsynch.labseer.domain.AnalysisGroup convert(String id) {
         };
     }
 
-	public Converter<AnalysisGroupLabel, String> getAnalysisGroupLabelToStringConverter() {
+    public Converter<AnalysisGroupLabel, String> getAnalysisGroupLabelToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.AnalysisGroupLabel, java.lang.String>() {
             public String convert(AnalysisGroupLabel analysisGroupLabel) {
-                return new StringBuilder().append(analysisGroupLabel.getLabelText()).append(' ').append(analysisGroupLabel.getRecordedBy()).append(' ').append(analysisGroupLabel.getRecordedDate()).append(' ').append(analysisGroupLabel.getModifiedDate()).toString();
+                return new StringBuilder().append(analysisGroupLabel.getLabelText()).append(' ')
+                        .append(analysisGroupLabel.getRecordedBy()).append(' ')
+                        .append(analysisGroupLabel.getRecordedDate()).append(' ')
+                        .append(analysisGroupLabel.getModifiedDate()).toString();
             }
         };
     }
 
-	public Converter<Long, AnalysisGroupLabel> getIdToAnalysisGroupLabelConverter() {
+    public Converter<Long, AnalysisGroupLabel> getIdToAnalysisGroupLabelConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.AnalysisGroupLabel>() {
             public com.labsynch.labseer.domain.AnalysisGroupLabel convert(java.lang.Long id) {
                 return AnalysisGroupLabel.findAnalysisGroupLabel(id);
@@ -58,7 +62,7 @@ public com.labsynch.labseer.domain.AnalysisGroupLabel convert(java.lang.Long id)
         };
     }
 
-	public Converter<String, AnalysisGroupLabel> getStringToAnalysisGroupLabelConverter() {
+    public Converter<String, AnalysisGroupLabel> getStringToAnalysisGroupLabelConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.AnalysisGroupLabel>() {
             public com.labsynch.labseer.domain.AnalysisGroupLabel convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), AnalysisGroupLabel.class);
@@ -66,15 +70,18 @@ public com.labsynch.labseer.domain.AnalysisGroupLabel convert(String id) {
         };
     }
 
-	public Converter<AnalysisGroupState, String> getAnalysisGroupStateToStringConverter() {
+    public Converter<AnalysisGroupState, String> getAnalysisGroupStateToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.AnalysisGroupState, java.lang.String>() {
             public String convert(AnalysisGroupState analysisGroupState) {
-                return new StringBuilder().append(analysisGroupState.getRecordedBy()).append(' ').append(analysisGroupState.getRecordedDate()).append(' ').append(analysisGroupState.getModifiedBy()).append(' ').append(analysisGroupState.getModifiedDate()).toString();
+                return new StringBuilder().append(analysisGroupState.getRecordedBy()).append(' ')
+                        .append(analysisGroupState.getRecordedDate()).append(' ')
+                        .append(analysisGroupState.getModifiedBy()).append(' ')
+                        .append(analysisGroupState.getModifiedDate()).toString();
             }
         };
     }
 
-	public Converter<Long, AnalysisGroupState> getIdToAnalysisGroupStateConverter() {
+    public Converter<Long, AnalysisGroupState> getIdToAnalysisGroupStateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.AnalysisGroupState>() {
             public com.labsynch.labseer.domain.AnalysisGroupState convert(java.lang.Long id) {
                 return AnalysisGroupState.findAnalysisGroupState(id);
@@ -82,7 +89,7 @@ public com.labsynch.labseer.domain.AnalysisGroupState convert(java.lang.Long id)
         };
     }
 
-	public Converter<String, AnalysisGroupState> getStringToAnalysisGroupStateConverter() {
+    public Converter<String, AnalysisGroupState> getStringToAnalysisGroupStateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.AnalysisGroupState>() {
             public com.labsynch.labseer.domain.AnalysisGroupState convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), AnalysisGroupState.class);
@@ -90,15 +97,18 @@ public com.labsynch.labseer.domain.AnalysisGroupState convert(String id) {
         };
     }
 
-	public Converter<AnalysisGroupValue, String> getAnalysisGroupValueToStringConverter() {
+    public Converter<AnalysisGroupValue, String> getAnalysisGroupValueToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.AnalysisGroupValue, java.lang.String>() {
             public String convert(AnalysisGroupValue analysisGroupValue) {
-                return new StringBuilder().append(analysisGroupValue.getLsType()).append(' ').append(analysisGroupValue.getLsKind()).append(' ').append(analysisGroupValue.getLsTypeAndKind()).append(' ').append(analysisGroupValue.getStringValue()).toString();
+                return new StringBuilder().append(analysisGroupValue.getLsType()).append(' ')
+                        .append(analysisGroupValue.getLsKind()).append(' ')
+                        .append(analysisGroupValue.getLsTypeAndKind()).append(' ')
+                        .append(analysisGroupValue.getStringValue()).toString();
             }
         };
     }
 
-	public Converter<Long, AnalysisGroupValue> getIdToAnalysisGroupValueConverter() {
+    public Converter<Long, AnalysisGroupValue> getIdToAnalysisGroupValueConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.AnalysisGroupValue>() {
             public com.labsynch.labseer.domain.AnalysisGroupValue convert(java.lang.Long id) {
                 return AnalysisGroupValue.findAnalysisGroupValue(id);
@@ -106,7 +116,7 @@ public com.labsynch.labseer.domain.AnalysisGroupValue convert(java.lang.Long id)
         };
     }
 
-	public Converter<String, AnalysisGroupValue> getStringToAnalysisGroupValueConverter() {
+    public Converter<String, AnalysisGroupValue> getStringToAnalysisGroupValueConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.AnalysisGroupValue>() {
             public com.labsynch.labseer.domain.AnalysisGroupValue convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), AnalysisGroupValue.class);
@@ -114,15 +124,17 @@ public com.labsynch.labseer.domain.AnalysisGroupValue convert(String id) {
         };
     }
 
-	public Converter<ApplicationSetting, String> getApplicationSettingToStringConverter() {
+    public Converter<ApplicationSetting, String> getApplicationSettingToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ApplicationSetting, java.lang.String>() {
             public String convert(ApplicationSetting applicationSetting) {
-                return new StringBuilder().append(applicationSetting.getPropName()).append(' ').append(applicationSetting.getPropValue()).append(' ').append(applicationSetting.getComments()).append(' ').append(applicationSetting.getRecordedDate()).toString();
+                return new StringBuilder().append(applicationSetting.getPropName()).append(' ')
+                        .append(applicationSetting.getPropValue()).append(' ').append(applicationSetting.getComments())
+                        .append(' ').append(applicationSetting.getRecordedDate()).toString();
             }
         };
     }
 
-	public Converter<Long, ApplicationSetting> getIdToApplicationSettingConverter() {
+    public Converter<Long, ApplicationSetting> getIdToApplicationSettingConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ApplicationSetting>() {
             public com.labsynch.labseer.domain.ApplicationSetting convert(java.lang.Long id) {
                 return ApplicationSetting.findApplicationSetting(id);
@@ -130,7 +142,7 @@ public com.labsynch.labseer.domain.ApplicationSetting convert(java.lang.Long id)
         };
     }
 
-	public Converter<String, ApplicationSetting> getStringToApplicationSettingConverter() {
+    public Converter<String, ApplicationSetting> getStringToApplicationSettingConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ApplicationSetting>() {
             public com.labsynch.labseer.domain.ApplicationSetting convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ApplicationSetting.class);
@@ -138,8 +150,7 @@ public com.labsynch.labseer.domain.ApplicationSetting convert(String id) {
         };
     }
 
-
-	public Converter<Container, String> getContainerToStringConverter() {
+    public Converter<Container, String> getContainerToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.Container, java.lang.String>() {
             public String convert(Container container) {
                 return new StringBuilder().append(container.getId()).toString();
@@ -147,7 +158,7 @@ public String convert(Container container) {
         };
     }
 
-	public Converter<Long, Container> getIdToContainerConverter() {
+    public Converter<Long, Container> getIdToContainerConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.Container>() {
             public com.labsynch.labseer.domain.Container convert(java.lang.Long id) {
                 return Container.findContainer(id);
@@ -155,7 +166,7 @@ public com.labsynch.labseer.domain.Container convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, Container> getStringToContainerConverter() {
+    public Converter<String, Container> getStringToContainerConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.Container>() {
             public com.labsynch.labseer.domain.Container convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), Container.class);
@@ -163,15 +174,16 @@ public com.labsynch.labseer.domain.Container convert(String id) {
         };
     }
 
-	public Converter<ContainerKind, String> getContainerKindToStringConverter() {
+    public Converter<ContainerKind, String> getContainerKindToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ContainerKind, java.lang.String>() {
             public String convert(ContainerKind containerKind) {
-                return new StringBuilder().append(containerKind.getKindName()).append(' ').append(containerKind.getLsTypeAndKind()).toString();
+                return new StringBuilder().append(containerKind.getKindName()).append(' ')
+                        .append(containerKind.getLsTypeAndKind()).toString();
             }
         };
     }
 
-	public Converter<Long, ContainerKind> getIdToContainerKindConverter() {
+    public Converter<Long, ContainerKind> getIdToContainerKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ContainerKind>() {
             public com.labsynch.labseer.domain.ContainerKind convert(java.lang.Long id) {
                 return ContainerKind.findContainerKind(id);
@@ -179,7 +191,7 @@ public com.labsynch.labseer.domain.ContainerKind convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, ContainerKind> getStringToContainerKindConverter() {
+    public Converter<String, ContainerKind> getStringToContainerKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ContainerKind>() {
             public com.labsynch.labseer.domain.ContainerKind convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ContainerKind.class);
@@ -187,15 +199,17 @@ public com.labsynch.labseer.domain.ContainerKind convert(String id) {
         };
     }
 
-	public Converter<ContainerLabel, String> getContainerLabelToStringConverter() {
+    public Converter<ContainerLabel, String> getContainerLabelToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ContainerLabel, java.lang.String>() {
             public String convert(ContainerLabel containerLabel) {
-                return new StringBuilder().append(containerLabel.getLabelText()).append(' ').append(containerLabel.getRecordedBy()).append(' ').append(containerLabel.getRecordedDate()).append(' ').append(containerLabel.getModifiedDate()).toString();
+                return new StringBuilder().append(containerLabel.getLabelText()).append(' ')
+                        .append(containerLabel.getRecordedBy()).append(' ').append(containerLabel.getRecordedDate())
+                        .append(' ').append(containerLabel.getModifiedDate()).toString();
             }
         };
     }
 
-	public Converter<Long, ContainerLabel> getIdToContainerLabelConverter() {
+    public Converter<Long, ContainerLabel> getIdToContainerLabelConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ContainerLabel>() {
             public com.labsynch.labseer.domain.ContainerLabel convert(java.lang.Long id) {
                 return ContainerLabel.findContainerLabel(id);
@@ -203,7 +217,7 @@ public com.labsynch.labseer.domain.ContainerLabel convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, ContainerLabel> getStringToContainerLabelConverter() {
+    public Converter<String, ContainerLabel> getStringToContainerLabelConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ContainerLabel>() {
             public com.labsynch.labseer.domain.ContainerLabel convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ContainerLabel.class);
@@ -211,15 +225,17 @@ public com.labsynch.labseer.domain.ContainerLabel convert(String id) {
         };
     }
 
-	public Converter<ContainerState, String> getContainerStateToStringConverter() {
+    public Converter<ContainerState, String> getContainerStateToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ContainerState, java.lang.String>() {
             public String convert(ContainerState containerState) {
-                return new StringBuilder().append(containerState.getRecordedBy()).append(' ').append(containerState.getRecordedDate()).append(' ').append(containerState.getModifiedBy()).append(' ').append(containerState.getModifiedDate()).toString();
+                return new StringBuilder().append(containerState.getRecordedBy()).append(' ')
+                        .append(containerState.getRecordedDate()).append(' ').append(containerState.getModifiedBy())
+                        .append(' ').append(containerState.getModifiedDate()).toString();
             }
         };
     }
 
-	public Converter<Long, ContainerState> getIdToContainerStateConverter() {
+    public Converter<Long, ContainerState> getIdToContainerStateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ContainerState>() {
             public com.labsynch.labseer.domain.ContainerState convert(java.lang.Long id) {
                 return ContainerState.findContainerState(id);
@@ -227,7 +243,7 @@ public com.labsynch.labseer.domain.ContainerState convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, ContainerState> getStringToContainerStateConverter() {
+    public Converter<String, ContainerState> getStringToContainerStateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ContainerState>() {
             public com.labsynch.labseer.domain.ContainerState convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ContainerState.class);
@@ -235,7 +251,7 @@ public com.labsynch.labseer.domain.ContainerState convert(String id) {
         };
     }
 
-	public Converter<ContainerType, String> getContainerTypeToStringConverter() {
+    public Converter<ContainerType, String> getContainerTypeToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ContainerType, java.lang.String>() {
             public String convert(ContainerType containerType) {
                 return new StringBuilder().append(containerType.getTypeName()).toString();
@@ -243,7 +259,7 @@ public String convert(ContainerType containerType) {
         };
     }
 
-	public Converter<Long, ContainerType> getIdToContainerTypeConverter() {
+    public Converter<Long, ContainerType> getIdToContainerTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ContainerType>() {
             public com.labsynch.labseer.domain.ContainerType convert(java.lang.Long id) {
                 return ContainerType.findContainerType(id);
@@ -251,7 +267,7 @@ public com.labsynch.labseer.domain.ContainerType convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, ContainerType> getStringToContainerTypeConverter() {
+    public Converter<String, ContainerType> getStringToContainerTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ContainerType>() {
             public com.labsynch.labseer.domain.ContainerType convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ContainerType.class);
@@ -259,15 +275,17 @@ public com.labsynch.labseer.domain.ContainerType convert(String id) {
         };
     }
 
-	public Converter<ContainerValue, String> getContainerValueToStringConverter() {
+    public Converter<ContainerValue, String> getContainerValueToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ContainerValue, java.lang.String>() {
             public String convert(ContainerValue containerValue) {
-                return new StringBuilder().append(containerValue.getLsType()).append(' ').append(containerValue.getLsKind()).append(' ').append(containerValue.getLsTypeAndKind()).append(' ').append(containerValue.getStringValue()).toString();
+                return new StringBuilder().append(containerValue.getLsType()).append(' ')
+                        .append(containerValue.getLsKind()).append(' ').append(containerValue.getLsTypeAndKind())
+                        .append(' ').append(containerValue.getStringValue()).toString();
             }
         };
     }
 
-	public Converter<Long, ContainerValue> getIdToContainerValueConverter() {
+    public Converter<Long, ContainerValue> getIdToContainerValueConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ContainerValue>() {
             public com.labsynch.labseer.domain.ContainerValue convert(java.lang.Long id) {
                 return ContainerValue.findContainerValue(id);
@@ -275,7 +293,7 @@ public com.labsynch.labseer.domain.ContainerValue convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, ContainerValue> getStringToContainerValueConverter() {
+    public Converter<String, ContainerValue> getStringToContainerValueConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ContainerValue>() {
             public com.labsynch.labseer.domain.ContainerValue convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ContainerValue.class);
@@ -283,17 +301,19 @@ public com.labsynch.labseer.domain.ContainerValue convert(String id) {
         };
     }
 
-	@Transactional
-	public Converter<Experiment, String> getExperimentToStringConverter() {
+    @Transactional
+    public Converter<Experiment, String> getExperimentToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.Experiment, java.lang.String>() {
             public String convert(Experiment experiment) {
-                return new StringBuilder().append(experiment.getLsType()).append(' ').append(experiment.getLsKind()).append(' ').append(experiment.getLsTypeAndKind()).append(' ').append(experiment.getCodeName()).toString();
+                return new StringBuilder().append(experiment.getLsType()).append(' ').append(experiment.getLsKind())
+                        .append(' ').append(experiment.getLsTypeAndKind()).append(' ').append(experiment.getCodeName())
+                        .toString();
             }
         };
     }
 
-	@Transactional
-	public Converter<Long, Experiment> getIdToExperimentConverter() {
+    @Transactional
+    public Converter<Long, Experiment> getIdToExperimentConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.Experiment>() {
             public com.labsynch.labseer.domain.Experiment convert(java.lang.Long id) {
                 return Experiment.findExperiment(id);
@@ -301,8 +321,8 @@ public com.labsynch.labseer.domain.Experiment convert(java.lang.Long id) {
         };
     }
 
-	@Transactional
-	public Converter<String, Experiment> getStringToExperimentConverter() {
+    @Transactional
+    public Converter<String, Experiment> getStringToExperimentConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.Experiment>() {
             public com.labsynch.labseer.domain.Experiment convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), Experiment.class);
@@ -310,15 +330,16 @@ public com.labsynch.labseer.domain.Experiment convert(String id) {
         };
     }
 
-	public Converter<ExperimentKind, String> getExperimentKindToStringConverter() {
+    public Converter<ExperimentKind, String> getExperimentKindToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ExperimentKind, java.lang.String>() {
             public String convert(ExperimentKind experimentKind) {
-                return new StringBuilder().append(experimentKind.getKindName()).append(' ').append(experimentKind.getLsTypeAndKind()).toString();
+                return new StringBuilder().append(experimentKind.getKindName()).append(' ')
+                        .append(experimentKind.getLsTypeAndKind()).toString();
             }
         };
     }
 
-	public Converter<Long, ExperimentKind> getIdToExperimentKindConverter() {
+    public Converter<Long, ExperimentKind> getIdToExperimentKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ExperimentKind>() {
             public com.labsynch.labseer.domain.ExperimentKind convert(java.lang.Long id) {
                 return ExperimentKind.findExperimentKind(id);
@@ -326,7 +347,7 @@ public com.labsynch.labseer.domain.ExperimentKind convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, ExperimentKind> getStringToExperimentKindConverter() {
+    public Converter<String, ExperimentKind> getStringToExperimentKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ExperimentKind>() {
             public com.labsynch.labseer.domain.ExperimentKind convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ExperimentKind.class);
@@ -334,15 +355,17 @@ public com.labsynch.labseer.domain.ExperimentKind convert(String id) {
         };
     }
 
-	public Converter<ExperimentLabel, String> getExperimentLabelToStringConverter() {
+    public Converter<ExperimentLabel, String> getExperimentLabelToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ExperimentLabel, java.lang.String>() {
             public String convert(ExperimentLabel experimentLabel) {
-                return new StringBuilder().append(experimentLabel.getLabelText()).append(' ').append(experimentLabel.getRecordedBy()).append(' ').append(experimentLabel.getRecordedDate()).append(' ').append(experimentLabel.getModifiedDate()).toString();
+                return new StringBuilder().append(experimentLabel.getLabelText()).append(' ')
+                        .append(experimentLabel.getRecordedBy()).append(' ').append(experimentLabel.getRecordedDate())
+                        .append(' ').append(experimentLabel.getModifiedDate()).toString();
             }
         };
     }
 
-	public Converter<Long, ExperimentLabel> getIdToExperimentLabelConverter() {
+    public Converter<Long, ExperimentLabel> getIdToExperimentLabelConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ExperimentLabel>() {
             public com.labsynch.labseer.domain.ExperimentLabel convert(java.lang.Long id) {
                 return ExperimentLabel.findExperimentLabel(id);
@@ -350,7 +373,7 @@ public com.labsynch.labseer.domain.ExperimentLabel convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, ExperimentLabel> getStringToExperimentLabelConverter() {
+    public Converter<String, ExperimentLabel> getStringToExperimentLabelConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ExperimentLabel>() {
             public com.labsynch.labseer.domain.ExperimentLabel convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ExperimentLabel.class);
@@ -358,17 +381,19 @@ public com.labsynch.labseer.domain.ExperimentLabel convert(String id) {
         };
     }
 
-	@Transactional
-	public Converter<ExperimentState, String> getExperimentStateToStringConverter() {
+    @Transactional
+    public Converter<ExperimentState, String> getExperimentStateToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ExperimentState, java.lang.String>() {
             public String convert(ExperimentState experimentState) {
-                return new StringBuilder().append(experimentState.getRecordedBy()).append(' ').append(experimentState.getRecordedDate()).append(' ').append(experimentState.getModifiedBy()).append(' ').append(experimentState.getModifiedDate()).toString();
+                return new StringBuilder().append(experimentState.getRecordedBy()).append(' ')
+                        .append(experimentState.getRecordedDate()).append(' ').append(experimentState.getModifiedBy())
+                        .append(' ').append(experimentState.getModifiedDate()).toString();
             }
         };
     }
 
-	@Transactional
-	public Converter<Long, ExperimentState> getIdToExperimentStateConverter() {
+    @Transactional
+    public Converter<Long, ExperimentState> getIdToExperimentStateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ExperimentState>() {
             public com.labsynch.labseer.domain.ExperimentState convert(java.lang.Long id) {
                 return ExperimentState.findExperimentState(id);
@@ -376,8 +401,8 @@ public com.labsynch.labseer.domain.ExperimentState convert(java.lang.Long id) {
         };
     }
 
-	@Transactional
-	public Converter<String, ExperimentState> getStringToExperimentStateConverter() {
+    @Transactional
+    public Converter<String, ExperimentState> getStringToExperimentStateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ExperimentState>() {
             public com.labsynch.labseer.domain.ExperimentState convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ExperimentState.class);
@@ -385,7 +410,7 @@ public com.labsynch.labseer.domain.ExperimentState convert(String id) {
         };
     }
 
-	public Converter<ExperimentType, String> getExperimentTypeToStringConverter() {
+    public Converter<ExperimentType, String> getExperimentTypeToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ExperimentType, java.lang.String>() {
             public String convert(ExperimentType experimentType) {
                 return new StringBuilder().append(experimentType.getTypeName()).toString();
@@ -393,7 +418,7 @@ public String convert(ExperimentType experimentType) {
         };
     }
 
-	public Converter<Long, ExperimentType> getIdToExperimentTypeConverter() {
+    public Converter<Long, ExperimentType> getIdToExperimentTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ExperimentType>() {
             public com.labsynch.labseer.domain.ExperimentType convert(java.lang.Long id) {
                 return ExperimentType.findExperimentType(id);
@@ -401,7 +426,7 @@ public com.labsynch.labseer.domain.ExperimentType convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, ExperimentType> getStringToExperimentTypeConverter() {
+    public Converter<String, ExperimentType> getStringToExperimentTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ExperimentType>() {
             public com.labsynch.labseer.domain.ExperimentType convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ExperimentType.class);
@@ -409,15 +434,17 @@ public com.labsynch.labseer.domain.ExperimentType convert(String id) {
         };
     }
 
-	public Converter<ExperimentValue, String> getExperimentValueToStringConverter() {
+    public Converter<ExperimentValue, String> getExperimentValueToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ExperimentValue, java.lang.String>() {
             public String convert(ExperimentValue experimentValue) {
-                return new StringBuilder().append(experimentValue.getLsType()).append(' ').append(experimentValue.getLsKind()).append(' ').append(experimentValue.getLsTypeAndKind()).append(' ').append(experimentValue.getStringValue()).toString();
+                return new StringBuilder().append(experimentValue.getLsType()).append(' ')
+                        .append(experimentValue.getLsKind()).append(' ').append(experimentValue.getLsTypeAndKind())
+                        .append(' ').append(experimentValue.getStringValue()).toString();
             }
         };
     }
 
-	public Converter<Long, ExperimentValue> getIdToExperimentValueConverter() {
+    public Converter<Long, ExperimentValue> getIdToExperimentValueConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ExperimentValue>() {
             public com.labsynch.labseer.domain.ExperimentValue convert(java.lang.Long id) {
                 return ExperimentValue.findExperimentValue(id);
@@ -425,7 +452,7 @@ public com.labsynch.labseer.domain.ExperimentValue convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, ExperimentValue> getStringToExperimentValueConverter() {
+    public Converter<String, ExperimentValue> getStringToExperimentValueConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ExperimentValue>() {
             public com.labsynch.labseer.domain.ExperimentValue convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ExperimentValue.class);
@@ -433,15 +460,17 @@ public com.labsynch.labseer.domain.ExperimentValue convert(String id) {
         };
     }
 
-	public Converter<FileThing, String> getFileThingToStringConverter() {
+    public Converter<FileThing, String> getFileThingToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.FileThing, java.lang.String>() {
             public String convert(FileThing fileThing) {
-                return new StringBuilder().append(fileThing.getLsType()).append(' ').append(fileThing.getLsKind()).append(' ').append(fileThing.getLsTypeAndKind()).append(' ').append(fileThing.getCodeName()).toString();
+                return new StringBuilder().append(fileThing.getLsType()).append(' ').append(fileThing.getLsKind())
+                        .append(' ').append(fileThing.getLsTypeAndKind()).append(' ').append(fileThing.getCodeName())
+                        .toString();
             }
         };
     }
 
-	public Converter<Long, FileThing> getIdToFileThingConverter() {
+    public Converter<Long, FileThing> getIdToFileThingConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.FileThing>() {
             public com.labsynch.labseer.domain.FileThing convert(java.lang.Long id) {
                 return FileThing.findFileThing(id);
@@ -449,7 +478,7 @@ public com.labsynch.labseer.domain.FileThing convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, FileThing> getStringToFileThingConverter() {
+    public Converter<String, FileThing> getStringToFileThingConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.FileThing>() {
             public com.labsynch.labseer.domain.FileThing convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), FileThing.class);
@@ -457,15 +486,16 @@ public com.labsynch.labseer.domain.FileThing convert(String id) {
         };
     }
 
-	public Converter<InteractionKind, String> getInteractionKindToStringConverter() {
+    public Converter<InteractionKind, String> getInteractionKindToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.InteractionKind, java.lang.String>() {
             public String convert(InteractionKind interactionKind) {
-                return new StringBuilder().append(interactionKind.getKindName()).append(' ').append(interactionKind.getLsTypeAndKind()).toString();
+                return new StringBuilder().append(interactionKind.getKindName()).append(' ')
+                        .append(interactionKind.getLsTypeAndKind()).toString();
             }
         };
     }
 
-	public Converter<Long, InteractionKind> getIdToInteractionKindConverter() {
+    public Converter<Long, InteractionKind> getIdToInteractionKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.InteractionKind>() {
             public com.labsynch.labseer.domain.InteractionKind convert(java.lang.Long id) {
                 return InteractionKind.findInteractionKind(id);
@@ -473,7 +503,7 @@ public com.labsynch.labseer.domain.InteractionKind convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, InteractionKind> getStringToInteractionKindConverter() {
+    public Converter<String, InteractionKind> getStringToInteractionKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.InteractionKind>() {
             public com.labsynch.labseer.domain.InteractionKind convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), InteractionKind.class);
@@ -481,15 +511,16 @@ public com.labsynch.labseer.domain.InteractionKind convert(String id) {
         };
     }
 
-	public Converter<InteractionType, String> getInteractionTypeToStringConverter() {
+    public Converter<InteractionType, String> getInteractionTypeToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.InteractionType, java.lang.String>() {
             public String convert(InteractionType interactionType) {
-                return new StringBuilder().append(interactionType.getTypeName()).append(' ').append(interactionType.getTypeVerb()).toString();
+                return new StringBuilder().append(interactionType.getTypeName()).append(' ')
+                        .append(interactionType.getTypeVerb()).toString();
             }
         };
     }
 
-	public Converter<Long, InteractionType> getIdToInteractionTypeConverter() {
+    public Converter<Long, InteractionType> getIdToInteractionTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.InteractionType>() {
             public com.labsynch.labseer.domain.InteractionType convert(java.lang.Long id) {
                 return InteractionType.findInteractionType(id);
@@ -497,7 +528,7 @@ public com.labsynch.labseer.domain.InteractionType convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, InteractionType> getStringToInteractionTypeConverter() {
+    public Converter<String, InteractionType> getStringToInteractionTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.InteractionType>() {
             public com.labsynch.labseer.domain.InteractionType convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), InteractionType.class);
@@ -505,15 +536,18 @@ public com.labsynch.labseer.domain.InteractionType convert(String id) {
         };
     }
 
-	public Converter<ItxContainerContainer, String> getItxContainerContainerToStringConverter() {
+    public Converter<ItxContainerContainer, String> getItxContainerContainerToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxContainerContainer, java.lang.String>() {
             public String convert(ItxContainerContainer itxContainerContainer) {
-                return new StringBuilder().append(itxContainerContainer.getLsType()).append(' ').append(itxContainerContainer.getLsKind()).append(' ').append(itxContainerContainer.getLsTypeAndKind()).append(' ').append(itxContainerContainer.getCodeName()).toString();
+                return new StringBuilder().append(itxContainerContainer.getLsType()).append(' ')
+                        .append(itxContainerContainer.getLsKind()).append(' ')
+                        .append(itxContainerContainer.getLsTypeAndKind()).append(' ')
+                        .append(itxContainerContainer.getCodeName()).toString();
             }
         };
     }
 
-	public Converter<Long, ItxContainerContainer> getIdToItxContainerContainerConverter() {
+    public Converter<Long, ItxContainerContainer> getIdToItxContainerContainerConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxContainerContainer>() {
             public com.labsynch.labseer.domain.ItxContainerContainer convert(java.lang.Long id) {
                 return ItxContainerContainer.findItxContainerContainer(id);
@@ -521,7 +555,7 @@ public com.labsynch.labseer.domain.ItxContainerContainer convert(java.lang.Long
         };
     }
 
-	public Converter<String, ItxContainerContainer> getStringToItxContainerContainerConverter() {
+    public Converter<String, ItxContainerContainer> getStringToItxContainerContainerConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxContainerContainer>() {
             public com.labsynch.labseer.domain.ItxContainerContainer convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ItxContainerContainer.class);
@@ -529,15 +563,18 @@ public com.labsynch.labseer.domain.ItxContainerContainer convert(String id) {
         };
     }
 
-	public Converter<ItxContainerContainerState, String> getItxContainerContainerStateToStringConverter() {
+    public Converter<ItxContainerContainerState, String> getItxContainerContainerStateToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxContainerContainerState, java.lang.String>() {
             public String convert(ItxContainerContainerState itxContainerContainerState) {
-                return new StringBuilder().append(itxContainerContainerState.getRecordedBy()).append(' ').append(itxContainerContainerState.getRecordedDate()).append(' ').append(itxContainerContainerState.getModifiedBy()).append(' ').append(itxContainerContainerState.getModifiedDate()).toString();
+                return new StringBuilder().append(itxContainerContainerState.getRecordedBy()).append(' ')
+                        .append(itxContainerContainerState.getRecordedDate()).append(' ')
+                        .append(itxContainerContainerState.getModifiedBy()).append(' ')
+                        .append(itxContainerContainerState.getModifiedDate()).toString();
             }
         };
     }
 
-	public Converter<Long, ItxContainerContainerState> getIdToItxContainerContainerStateConverter() {
+    public Converter<Long, ItxContainerContainerState> getIdToItxContainerContainerStateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxContainerContainerState>() {
             public com.labsynch.labseer.domain.ItxContainerContainerState convert(java.lang.Long id) {
                 return ItxContainerContainerState.findItxContainerContainerState(id);
@@ -545,7 +582,7 @@ public com.labsynch.labseer.domain.ItxContainerContainerState convert(java.lang.
         };
     }
 
-	public Converter<String, ItxContainerContainerState> getStringToItxContainerContainerStateConverter() {
+    public Converter<String, ItxContainerContainerState> getStringToItxContainerContainerStateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxContainerContainerState>() {
             public com.labsynch.labseer.domain.ItxContainerContainerState convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ItxContainerContainerState.class);
@@ -553,15 +590,18 @@ public com.labsynch.labseer.domain.ItxContainerContainerState convert(String id)
         };
     }
 
-	public Converter<ItxContainerContainerValue, String> getItxContainerContainerValueToStringConverter() {
+    public Converter<ItxContainerContainerValue, String> getItxContainerContainerValueToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxContainerContainerValue, java.lang.String>() {
             public String convert(ItxContainerContainerValue itxContainerContainerValue) {
-                return new StringBuilder().append(itxContainerContainerValue.getLsType()).append(' ').append(itxContainerContainerValue.getLsKind()).append(' ').append(itxContainerContainerValue.getLsTypeAndKind()).append(' ').append(itxContainerContainerValue.getStringValue()).toString();
+                return new StringBuilder().append(itxContainerContainerValue.getLsType()).append(' ')
+                        .append(itxContainerContainerValue.getLsKind()).append(' ')
+                        .append(itxContainerContainerValue.getLsTypeAndKind()).append(' ')
+                        .append(itxContainerContainerValue.getStringValue()).toString();
             }
         };
     }
 
-	public Converter<Long, ItxContainerContainerValue> getIdToItxContainerContainerValueConverter() {
+    public Converter<Long, ItxContainerContainerValue> getIdToItxContainerContainerValueConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxContainerContainerValue>() {
             public com.labsynch.labseer.domain.ItxContainerContainerValue convert(java.lang.Long id) {
                 return ItxContainerContainerValue.findItxContainerContainerValue(id);
@@ -569,7 +609,7 @@ public com.labsynch.labseer.domain.ItxContainerContainerValue convert(java.lang.
         };
     }
 
-	public Converter<String, ItxContainerContainerValue> getStringToItxContainerContainerValueConverter() {
+    public Converter<String, ItxContainerContainerValue> getStringToItxContainerContainerValueConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxContainerContainerValue>() {
             public com.labsynch.labseer.domain.ItxContainerContainerValue convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ItxContainerContainerValue.class);
@@ -577,15 +617,18 @@ public com.labsynch.labseer.domain.ItxContainerContainerValue convert(String id)
         };
     }
 
-	public Converter<ItxSubjectContainer, String> getItxSubjectContainerToStringConverter() {
+    public Converter<ItxSubjectContainer, String> getItxSubjectContainerToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxSubjectContainer, java.lang.String>() {
             public String convert(ItxSubjectContainer itxSubjectContainer) {
-                return new StringBuilder().append(itxSubjectContainer.getLsType()).append(' ').append(itxSubjectContainer.getLsKind()).append(' ').append(itxSubjectContainer.getLsTypeAndKind()).append(' ').append(itxSubjectContainer.getCodeName()).toString();
+                return new StringBuilder().append(itxSubjectContainer.getLsType()).append(' ')
+                        .append(itxSubjectContainer.getLsKind()).append(' ')
+                        .append(itxSubjectContainer.getLsTypeAndKind()).append(' ')
+                        .append(itxSubjectContainer.getCodeName()).toString();
             }
         };
     }
 
-	public Converter<Long, ItxSubjectContainer> getIdToItxSubjectContainerConverter() {
+    public Converter<Long, ItxSubjectContainer> getIdToItxSubjectContainerConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxSubjectContainer>() {
             public com.labsynch.labseer.domain.ItxSubjectContainer convert(java.lang.Long id) {
                 return ItxSubjectContainer.findItxSubjectContainer(id);
@@ -593,7 +636,7 @@ public com.labsynch.labseer.domain.ItxSubjectContainer convert(java.lang.Long id
         };
     }
 
-	public Converter<String, ItxSubjectContainer> getStringToItxSubjectContainerConverter() {
+    public Converter<String, ItxSubjectContainer> getStringToItxSubjectContainerConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxSubjectContainer>() {
             public com.labsynch.labseer.domain.ItxSubjectContainer convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ItxSubjectContainer.class);
@@ -601,15 +644,18 @@ public com.labsynch.labseer.domain.ItxSubjectContainer convert(String id) {
         };
     }
 
-	public Converter<ItxSubjectContainerState, String> getItxSubjectContainerStateToStringConverter() {
+    public Converter<ItxSubjectContainerState, String> getItxSubjectContainerStateToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxSubjectContainerState, java.lang.String>() {
             public String convert(ItxSubjectContainerState itxSubjectContainerState) {
-                return new StringBuilder().append(itxSubjectContainerState.getRecordedBy()).append(' ').append(itxSubjectContainerState.getRecordedDate()).append(' ').append(itxSubjectContainerState.getModifiedBy()).append(' ').append(itxSubjectContainerState.getModifiedDate()).toString();
+                return new StringBuilder().append(itxSubjectContainerState.getRecordedBy()).append(' ')
+                        .append(itxSubjectContainerState.getRecordedDate()).append(' ')
+                        .append(itxSubjectContainerState.getModifiedBy()).append(' ')
+                        .append(itxSubjectContainerState.getModifiedDate()).toString();
             }
         };
     }
 
-	public Converter<Long, ItxSubjectContainerState> getIdToItxSubjectContainerStateConverter() {
+    public Converter<Long, ItxSubjectContainerState> getIdToItxSubjectContainerStateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxSubjectContainerState>() {
             public com.labsynch.labseer.domain.ItxSubjectContainerState convert(java.lang.Long id) {
                 return ItxSubjectContainerState.findItxSubjectContainerState(id);
@@ -617,7 +663,7 @@ public com.labsynch.labseer.domain.ItxSubjectContainerState convert(java.lang.Lo
         };
     }
 
-	public Converter<String, ItxSubjectContainerState> getStringToItxSubjectContainerStateConverter() {
+    public Converter<String, ItxSubjectContainerState> getStringToItxSubjectContainerStateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxSubjectContainerState>() {
             public com.labsynch.labseer.domain.ItxSubjectContainerState convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ItxSubjectContainerState.class);
@@ -625,15 +671,18 @@ public com.labsynch.labseer.domain.ItxSubjectContainerState convert(String id) {
         };
     }
 
-	public Converter<ItxSubjectContainerValue, String> getItxSubjectContainerValueToStringConverter() {
+    public Converter<ItxSubjectContainerValue, String> getItxSubjectContainerValueToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxSubjectContainerValue, java.lang.String>() {
             public String convert(ItxSubjectContainerValue itxSubjectContainerValue) {
-                return new StringBuilder().append(itxSubjectContainerValue.getLsType()).append(' ').append(itxSubjectContainerValue.getLsKind()).append(' ').append(itxSubjectContainerValue.getLsTypeAndKind()).append(' ').append(itxSubjectContainerValue.getStringValue()).toString();
+                return new StringBuilder().append(itxSubjectContainerValue.getLsType()).append(' ')
+                        .append(itxSubjectContainerValue.getLsKind()).append(' ')
+                        .append(itxSubjectContainerValue.getLsTypeAndKind()).append(' ')
+                        .append(itxSubjectContainerValue.getStringValue()).toString();
             }
         };
     }
 
-	public Converter<Long, ItxSubjectContainerValue> getIdToItxSubjectContainerValueConverter() {
+    public Converter<Long, ItxSubjectContainerValue> getIdToItxSubjectContainerValueConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxSubjectContainerValue>() {
             public com.labsynch.labseer.domain.ItxSubjectContainerValue convert(java.lang.Long id) {
                 return ItxSubjectContainerValue.findItxSubjectContainerValue(id);
@@ -641,7 +690,7 @@ public com.labsynch.labseer.domain.ItxSubjectContainerValue convert(java.lang.Lo
         };
     }
 
-	public Converter<String, ItxSubjectContainerValue> getStringToItxSubjectContainerValueConverter() {
+    public Converter<String, ItxSubjectContainerValue> getStringToItxSubjectContainerValueConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxSubjectContainerValue>() {
             public com.labsynch.labseer.domain.ItxSubjectContainerValue convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ItxSubjectContainerValue.class);
@@ -649,15 +698,16 @@ public com.labsynch.labseer.domain.ItxSubjectContainerValue convert(String id) {
         };
     }
 
-	public Converter<LabelKind, String> getLabelKindToStringConverter() {
+    public Converter<LabelKind, String> getLabelKindToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LabelKind, java.lang.String>() {
             public String convert(LabelKind labelKind) {
-                return new StringBuilder().append(labelKind.getKindName()).append(' ').append(labelKind.getLsTypeAndKind()).toString();
+                return new StringBuilder().append(labelKind.getKindName()).append(' ')
+                        .append(labelKind.getLsTypeAndKind()).toString();
             }
         };
     }
 
-	public Converter<Long, LabelKind> getIdToLabelKindConverter() {
+    public Converter<Long, LabelKind> getIdToLabelKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LabelKind>() {
             public com.labsynch.labseer.domain.LabelKind convert(java.lang.Long id) {
                 return LabelKind.findLabelKind(id);
@@ -665,7 +715,7 @@ public com.labsynch.labseer.domain.LabelKind convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, LabelKind> getStringToLabelKindConverter() {
+    public Converter<String, LabelKind> getStringToLabelKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LabelKind>() {
             public com.labsynch.labseer.domain.LabelKind convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), LabelKind.class);
@@ -673,15 +723,17 @@ public com.labsynch.labseer.domain.LabelKind convert(String id) {
         };
     }
 
-	public Converter<LabelSequence, String> getLabelSequenceToStringConverter() {
+    public Converter<LabelSequence, String> getLabelSequenceToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LabelSequence, java.lang.String>() {
             public String convert(LabelSequence labelSequence) {
-                return new StringBuilder().append(labelSequence.getThingTypeAndKind()).append(' ').append(labelSequence.getLabelTypeAndKind()).append(' ').append(labelSequence.getLabelPrefix()).append(' ').append(labelSequence.getLabelSeparator()).toString();
+                return new StringBuilder().append(labelSequence.getThingTypeAndKind()).append(' ')
+                        .append(labelSequence.getLabelTypeAndKind()).append(' ').append(labelSequence.getLabelPrefix())
+                        .append(' ').append(labelSequence.getLabelSeparator()).toString();
             }
         };
     }
 
-	public Converter<Long, LabelSequence> getIdToLabelSequenceConverter() {
+    public Converter<Long, LabelSequence> getIdToLabelSequenceConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LabelSequence>() {
             public com.labsynch.labseer.domain.LabelSequence convert(java.lang.Long id) {
                 return LabelSequence.findLabelSequence(id);
@@ -689,7 +741,7 @@ public com.labsynch.labseer.domain.LabelSequence convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, LabelSequence> getStringToLabelSequenceConverter() {
+    public Converter<String, LabelSequence> getStringToLabelSequenceConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LabelSequence>() {
             public com.labsynch.labseer.domain.LabelSequence convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), LabelSequence.class);
@@ -697,7 +749,7 @@ public com.labsynch.labseer.domain.LabelSequence convert(String id) {
         };
     }
 
-	public Converter<LabelType, String> getLabelTypeToStringConverter() {
+    public Converter<LabelType, String> getLabelTypeToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LabelType, java.lang.String>() {
             public String convert(LabelType labelType) {
                 return new StringBuilder().append(labelType.getTypeName()).toString();
@@ -705,7 +757,7 @@ public String convert(LabelType labelType) {
         };
     }
 
-	public Converter<Long, LabelType> getIdToLabelTypeConverter() {
+    public Converter<Long, LabelType> getIdToLabelTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LabelType>() {
             public com.labsynch.labseer.domain.LabelType convert(java.lang.Long id) {
                 return LabelType.findLabelType(id);
@@ -713,7 +765,7 @@ public com.labsynch.labseer.domain.LabelType convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, LabelType> getStringToLabelTypeConverter() {
+    public Converter<String, LabelType> getStringToLabelTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LabelType>() {
             public com.labsynch.labseer.domain.LabelType convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), LabelType.class);
@@ -721,15 +773,17 @@ public com.labsynch.labseer.domain.LabelType convert(String id) {
         };
     }
 
-	public Converter<LsInteraction, String> getLsInteractionToStringConverter() {
+    public Converter<LsInteraction, String> getLsInteractionToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsInteraction, java.lang.String>() {
             public String convert(LsInteraction lsInteraction) {
-                return new StringBuilder().append(lsInteraction.getLsType()).append(' ').append(lsInteraction.getLsKind()).append(' ').append(lsInteraction.getLsTypeAndKind()).append(' ').append(lsInteraction.getCodeName()).toString();
+                return new StringBuilder().append(lsInteraction.getLsType()).append(' ')
+                        .append(lsInteraction.getLsKind()).append(' ').append(lsInteraction.getLsTypeAndKind())
+                        .append(' ').append(lsInteraction.getCodeName()).toString();
             }
         };
     }
 
-	public Converter<Long, LsInteraction> getIdToLsInteractionConverter() {
+    public Converter<Long, LsInteraction> getIdToLsInteractionConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsInteraction>() {
             public com.labsynch.labseer.domain.LsInteraction convert(java.lang.Long id) {
                 return LsInteraction.findLsInteraction(id);
@@ -737,7 +791,7 @@ public com.labsynch.labseer.domain.LsInteraction convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, LsInteraction> getStringToLsInteractionConverter() {
+    public Converter<String, LsInteraction> getStringToLsInteractionConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsInteraction>() {
             public com.labsynch.labseer.domain.LsInteraction convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), LsInteraction.class);
@@ -745,15 +799,16 @@ public com.labsynch.labseer.domain.LsInteraction convert(String id) {
         };
     }
 
-	public Converter<LsTransaction, String> getLsTransactionToStringConverter() {
+    public Converter<LsTransaction, String> getLsTransactionToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsTransaction, java.lang.String>() {
             public String convert(LsTransaction lsTransaction) {
-                return new StringBuilder().append(lsTransaction.getComments()).append(' ').append(lsTransaction.getRecordedDate()).toString();
+                return new StringBuilder().append(lsTransaction.getComments()).append(' ')
+                        .append(lsTransaction.getRecordedDate()).toString();
             }
         };
     }
 
-	public Converter<Long, AuthorRole> getIdToAuthorRoleConverter() {
+    public Converter<Long, AuthorRole> getIdToAuthorRoleConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.AuthorRole>() {
             public com.labsynch.labseer.domain.AuthorRole convert(java.lang.Long id) {
                 return AuthorRole.findAuthorRole(id);
@@ -761,23 +816,28 @@ public com.labsynch.labseer.domain.AuthorRole convert(java.lang.Long id) {
         };
     }
 
-//	public Converter<String, AuthorRole> getStringToAuthorRoleConverter() {
-//        return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.AuthorRole>() {
-//            public com.labsynch.labseer.domain.AuthorRole convert(String id) {
-//                return getObject().convert(getObject().convert(id, Long.class), AuthorRole.class);
-//            }
-//        };
-//    }
-//	
-//	public Converter<Long, LsTransaction> getIdToLsTransactionConverter() {
-//        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsTransaction>() {
-//            public com.labsynch.labseer.domain.LsTransaction convert(java.lang.Long id) {
-//                return LsTransaction.findLsTransaction(id);
-//            }
-//        };
-//    }
-
-	public Converter<String, LsTransaction> getStringToLsTransactionConverter() {
+    // public Converter<String, AuthorRole> getStringToAuthorRoleConverter() {
+    // return new
+    // org.springframework.core.convert.converter.Converter<java.lang.String,
+    // com.labsynch.labseer.domain.AuthorRole>() {
+    // public com.labsynch.labseer.domain.AuthorRole convert(String id) {
+    // return getObject().convert(getObject().convert(id, Long.class),
+    // AuthorRole.class);
+    // }
+    // };
+    // }
+    //
+    // public Converter<Long, LsTransaction> getIdToLsTransactionConverter() {
+    // return new
+    // org.springframework.core.convert.converter.Converter<java.lang.Long,
+    // com.labsynch.labseer.domain.LsTransaction>() {
+    // public com.labsynch.labseer.domain.LsTransaction convert(java.lang.Long id) {
+    // return LsTransaction.findLsTransaction(id);
+    // }
+    // };
+    // }
+
+    public Converter<String, LsTransaction> getStringToLsTransactionConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsTransaction>() {
             public com.labsynch.labseer.domain.LsTransaction convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), LsTransaction.class);
@@ -785,15 +845,16 @@ public com.labsynch.labseer.domain.LsTransaction convert(String id) {
         };
     }
 
-	public Converter<OperatorKind, String> getOperatorKindToStringConverter() {
+    public Converter<OperatorKind, String> getOperatorKindToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.OperatorKind, java.lang.String>() {
             public String convert(OperatorKind operatorKind) {
-                return new StringBuilder().append(operatorKind.getKindName()).append(' ').append(operatorKind.getLsTypeAndKind()).toString();
+                return new StringBuilder().append(operatorKind.getKindName()).append(' ')
+                        .append(operatorKind.getLsTypeAndKind()).toString();
             }
         };
     }
 
-	public Converter<Long, OperatorKind> getIdToOperatorKindConverter() {
+    public Converter<Long, OperatorKind> getIdToOperatorKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.OperatorKind>() {
             public com.labsynch.labseer.domain.OperatorKind convert(java.lang.Long id) {
                 return OperatorKind.findOperatorKind(id);
@@ -801,7 +862,7 @@ public com.labsynch.labseer.domain.OperatorKind convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, OperatorKind> getStringToOperatorKindConverter() {
+    public Converter<String, OperatorKind> getStringToOperatorKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.OperatorKind>() {
             public com.labsynch.labseer.domain.OperatorKind convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), OperatorKind.class);
@@ -809,7 +870,7 @@ public com.labsynch.labseer.domain.OperatorKind convert(String id) {
         };
     }
 
-	public Converter<OperatorType, String> getOperatorTypeToStringConverter() {
+    public Converter<OperatorType, String> getOperatorTypeToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.OperatorType, java.lang.String>() {
             public String convert(OperatorType operatorType) {
                 return new StringBuilder().append(operatorType.getTypeName()).toString();
@@ -817,7 +878,7 @@ public String convert(OperatorType operatorType) {
         };
     }
 
-	public Converter<Long, OperatorType> getIdToOperatorTypeConverter() {
+    public Converter<Long, OperatorType> getIdToOperatorTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.OperatorType>() {
             public com.labsynch.labseer.domain.OperatorType convert(java.lang.Long id) {
                 return OperatorType.findOperatorType(id);
@@ -825,7 +886,7 @@ public com.labsynch.labseer.domain.OperatorType convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, OperatorType> getStringToOperatorTypeConverter() {
+    public Converter<String, OperatorType> getStringToOperatorTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.OperatorType>() {
             public com.labsynch.labseer.domain.OperatorType convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), OperatorType.class);
@@ -833,15 +894,17 @@ public com.labsynch.labseer.domain.OperatorType convert(String id) {
         };
     }
 
-	public Converter<Protocol, String> getProtocolToStringConverter() {
+    public Converter<Protocol, String> getProtocolToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.Protocol, java.lang.String>() {
             public String convert(Protocol protocol) {
-                return new StringBuilder().append(protocol.getLsType()).append(' ').append(protocol.getLsKind()).append(' ').append(protocol.getLsTypeAndKind()).append(' ').append(protocol.getCodeName()).toString();
+                return new StringBuilder().append(protocol.getLsType()).append(' ').append(protocol.getLsKind())
+                        .append(' ').append(protocol.getLsTypeAndKind()).append(' ').append(protocol.getCodeName())
+                        .toString();
             }
         };
     }
 
-	public Converter<Long, Protocol> getIdToProtocolConverter() {
+    public Converter<Long, Protocol> getIdToProtocolConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.Protocol>() {
             public com.labsynch.labseer.domain.Protocol convert(java.lang.Long id) {
                 return Protocol.findProtocol(id);
@@ -849,7 +912,7 @@ public com.labsynch.labseer.domain.Protocol convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, Protocol> getStringToProtocolConverter() {
+    public Converter<String, Protocol> getStringToProtocolConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.Protocol>() {
             public com.labsynch.labseer.domain.Protocol convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), Protocol.class);
@@ -857,15 +920,16 @@ public com.labsynch.labseer.domain.Protocol convert(String id) {
         };
     }
 
-	public Converter<ProtocolKind, String> getProtocolKindToStringConverter() {
+    public Converter<ProtocolKind, String> getProtocolKindToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ProtocolKind, java.lang.String>() {
             public String convert(ProtocolKind protocolKind) {
-                return new StringBuilder().append(protocolKind.getKindName()).append(' ').append(protocolKind.getLsTypeAndKind()).toString();
+                return new StringBuilder().append(protocolKind.getKindName()).append(' ')
+                        .append(protocolKind.getLsTypeAndKind()).toString();
             }
         };
     }
 
-	public Converter<Long, ProtocolKind> getIdToProtocolKindConverter() {
+    public Converter<Long, ProtocolKind> getIdToProtocolKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ProtocolKind>() {
             public com.labsynch.labseer.domain.ProtocolKind convert(java.lang.Long id) {
                 return ProtocolKind.findProtocolKind(id);
@@ -873,7 +937,7 @@ public com.labsynch.labseer.domain.ProtocolKind convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, ProtocolKind> getStringToProtocolKindConverter() {
+    public Converter<String, ProtocolKind> getStringToProtocolKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ProtocolKind>() {
             public com.labsynch.labseer.domain.ProtocolKind convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ProtocolKind.class);
@@ -881,15 +945,17 @@ public com.labsynch.labseer.domain.ProtocolKind convert(String id) {
         };
     }
 
-	public Converter<ProtocolLabel, String> getProtocolLabelToStringConverter() {
+    public Converter<ProtocolLabel, String> getProtocolLabelToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ProtocolLabel, java.lang.String>() {
             public String convert(ProtocolLabel protocolLabel) {
-                return new StringBuilder().append(protocolLabel.getLabelText()).append(' ').append(protocolLabel.getRecordedBy()).append(' ').append(protocolLabel.getRecordedDate()).append(' ').append(protocolLabel.getModifiedDate()).toString();
+                return new StringBuilder().append(protocolLabel.getLabelText()).append(' ')
+                        .append(protocolLabel.getRecordedBy()).append(' ').append(protocolLabel.getRecordedDate())
+                        .append(' ').append(protocolLabel.getModifiedDate()).toString();
             }
         };
     }
 
-	public Converter<Long, ProtocolLabel> getIdToProtocolLabelConverter() {
+    public Converter<Long, ProtocolLabel> getIdToProtocolLabelConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ProtocolLabel>() {
             public com.labsynch.labseer.domain.ProtocolLabel convert(java.lang.Long id) {
                 return ProtocolLabel.findProtocolLabel(id);
@@ -897,7 +963,7 @@ public com.labsynch.labseer.domain.ProtocolLabel convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, ProtocolLabel> getStringToProtocolLabelConverter() {
+    public Converter<String, ProtocolLabel> getStringToProtocolLabelConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ProtocolLabel>() {
             public com.labsynch.labseer.domain.ProtocolLabel convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ProtocolLabel.class);
@@ -905,15 +971,17 @@ public com.labsynch.labseer.domain.ProtocolLabel convert(String id) {
         };
     }
 
-	public Converter<ProtocolState, String> getProtocolStateToStringConverter() {
+    public Converter<ProtocolState, String> getProtocolStateToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ProtocolState, java.lang.String>() {
             public String convert(ProtocolState protocolState) {
-                return new StringBuilder().append(protocolState.getRecordedBy()).append(' ').append(protocolState.getRecordedDate()).append(' ').append(protocolState.getModifiedBy()).append(' ').append(protocolState.getModifiedDate()).toString();
+                return new StringBuilder().append(protocolState.getRecordedBy()).append(' ')
+                        .append(protocolState.getRecordedDate()).append(' ').append(protocolState.getModifiedBy())
+                        .append(' ').append(protocolState.getModifiedDate()).toString();
             }
         };
     }
 
-	public Converter<Long, ProtocolState> getIdToProtocolStateConverter() {
+    public Converter<Long, ProtocolState> getIdToProtocolStateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ProtocolState>() {
             public com.labsynch.labseer.domain.ProtocolState convert(java.lang.Long id) {
                 return ProtocolState.findProtocolState(id);
@@ -921,7 +989,7 @@ public com.labsynch.labseer.domain.ProtocolState convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, ProtocolState> getStringToProtocolStateConverter() {
+    public Converter<String, ProtocolState> getStringToProtocolStateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ProtocolState>() {
             public com.labsynch.labseer.domain.ProtocolState convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ProtocolState.class);
@@ -929,7 +997,7 @@ public com.labsynch.labseer.domain.ProtocolState convert(String id) {
         };
     }
 
-	public Converter<ProtocolType, String> getProtocolTypeToStringConverter() {
+    public Converter<ProtocolType, String> getProtocolTypeToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ProtocolType, java.lang.String>() {
             public String convert(ProtocolType protocolType) {
                 return new StringBuilder().append(protocolType.getTypeName()).toString();
@@ -937,7 +1005,7 @@ public String convert(ProtocolType protocolType) {
         };
     }
 
-	public Converter<Long, ProtocolType> getIdToProtocolTypeConverter() {
+    public Converter<Long, ProtocolType> getIdToProtocolTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ProtocolType>() {
             public com.labsynch.labseer.domain.ProtocolType convert(java.lang.Long id) {
                 return ProtocolType.findProtocolType(id);
@@ -945,7 +1013,7 @@ public com.labsynch.labseer.domain.ProtocolType convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, ProtocolType> getStringToProtocolTypeConverter() {
+    public Converter<String, ProtocolType> getStringToProtocolTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ProtocolType>() {
             public com.labsynch.labseer.domain.ProtocolType convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ProtocolType.class);
@@ -953,15 +1021,17 @@ public com.labsynch.labseer.domain.ProtocolType convert(String id) {
         };
     }
 
-	public Converter<ProtocolValue, String> getProtocolValueToStringConverter() {
+    public Converter<ProtocolValue, String> getProtocolValueToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ProtocolValue, java.lang.String>() {
             public String convert(ProtocolValue protocolValue) {
-                return new StringBuilder().append(protocolValue.getLsType()).append(' ').append(protocolValue.getLsKind()).append(' ').append(protocolValue.getLsTypeAndKind()).append(' ').append(protocolValue.getStringValue()).toString();
+                return new StringBuilder().append(protocolValue.getLsType()).append(' ')
+                        .append(protocolValue.getLsKind()).append(' ').append(protocolValue.getLsTypeAndKind())
+                        .append(' ').append(protocolValue.getStringValue()).toString();
             }
         };
     }
 
-	public Converter<Long, ProtocolValue> getIdToProtocolValueConverter() {
+    public Converter<Long, ProtocolValue> getIdToProtocolValueConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ProtocolValue>() {
             public com.labsynch.labseer.domain.ProtocolValue convert(java.lang.Long id) {
                 return ProtocolValue.findProtocolValue(id);
@@ -969,7 +1039,7 @@ public com.labsynch.labseer.domain.ProtocolValue convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, ProtocolValue> getStringToProtocolValueConverter() {
+    public Converter<String, ProtocolValue> getStringToProtocolValueConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ProtocolValue>() {
             public com.labsynch.labseer.domain.ProtocolValue convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ProtocolValue.class);
@@ -977,15 +1047,16 @@ public com.labsynch.labseer.domain.ProtocolValue convert(String id) {
         };
     }
 
-	public Converter<StateKind, String> getStateKindToStringConverter() {
+    public Converter<StateKind, String> getStateKindToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.StateKind, java.lang.String>() {
             public String convert(StateKind stateKind) {
-                return new StringBuilder().append(stateKind.getKindName()).append(' ').append(stateKind.getLsTypeAndKind()).toString();
+                return new StringBuilder().append(stateKind.getKindName()).append(' ')
+                        .append(stateKind.getLsTypeAndKind()).toString();
             }
         };
     }
 
-	public Converter<Long, StateKind> getIdToStateKindConverter() {
+    public Converter<Long, StateKind> getIdToStateKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.StateKind>() {
             public com.labsynch.labseer.domain.StateKind convert(java.lang.Long id) {
                 return StateKind.findStateKind(id);
@@ -993,7 +1064,7 @@ public com.labsynch.labseer.domain.StateKind convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, StateKind> getStringToStateKindConverter() {
+    public Converter<String, StateKind> getStringToStateKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.StateKind>() {
             public com.labsynch.labseer.domain.StateKind convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), StateKind.class);
@@ -1001,7 +1072,7 @@ public com.labsynch.labseer.domain.StateKind convert(String id) {
         };
     }
 
-	public Converter<StateType, String> getStateTypeToStringConverter() {
+    public Converter<StateType, String> getStateTypeToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.StateType, java.lang.String>() {
             public String convert(StateType stateType) {
                 return new StringBuilder().append(stateType.getTypeName()).toString();
@@ -1009,7 +1080,7 @@ public String convert(StateType stateType) {
         };
     }
 
-	public Converter<Long, StateType> getIdToStateTypeConverter() {
+    public Converter<Long, StateType> getIdToStateTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.StateType>() {
             public com.labsynch.labseer.domain.StateType convert(java.lang.Long id) {
                 return StateType.findStateType(id);
@@ -1017,7 +1088,7 @@ public com.labsynch.labseer.domain.StateType convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, StateType> getStringToStateTypeConverter() {
+    public Converter<String, StateType> getStringToStateTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.StateType>() {
             public com.labsynch.labseer.domain.StateType convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), StateType.class);
@@ -1025,15 +1096,17 @@ public com.labsynch.labseer.domain.StateType convert(String id) {
         };
     }
 
-	public Converter<Subject, String> getSubjectToStringConverter() {
+    public Converter<Subject, String> getSubjectToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.Subject, java.lang.String>() {
             public String convert(Subject subject) {
-                return new StringBuilder().append(subject.getLsType()).append(' ').append(subject.getLsKind()).append(' ').append(subject.getLsTypeAndKind()).append(' ').append(subject.getCodeName()).toString();
+                return new StringBuilder().append(subject.getLsType()).append(' ').append(subject.getLsKind())
+                        .append(' ').append(subject.getLsTypeAndKind()).append(' ').append(subject.getCodeName())
+                        .toString();
             }
         };
     }
 
-	public Converter<Long, Subject> getIdToSubjectConverter() {
+    public Converter<Long, Subject> getIdToSubjectConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.Subject>() {
             public com.labsynch.labseer.domain.Subject convert(java.lang.Long id) {
                 return Subject.findSubject(id);
@@ -1041,7 +1114,7 @@ public com.labsynch.labseer.domain.Subject convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, Subject> getStringToSubjectConverter() {
+    public Converter<String, Subject> getStringToSubjectConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.Subject>() {
             public com.labsynch.labseer.domain.Subject convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), Subject.class);
@@ -1049,15 +1122,17 @@ public com.labsynch.labseer.domain.Subject convert(String id) {
         };
     }
 
-	public Converter<SubjectLabel, String> getSubjectLabelToStringConverter() {
+    public Converter<SubjectLabel, String> getSubjectLabelToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.SubjectLabel, java.lang.String>() {
             public String convert(SubjectLabel subjectLabel) {
-                return new StringBuilder().append(subjectLabel.getLabelText()).append(' ').append(subjectLabel.getRecordedBy()).append(' ').append(subjectLabel.getRecordedDate()).append(' ').append(subjectLabel.getModifiedDate()).toString();
+                return new StringBuilder().append(subjectLabel.getLabelText()).append(' ')
+                        .append(subjectLabel.getRecordedBy()).append(' ').append(subjectLabel.getRecordedDate())
+                        .append(' ').append(subjectLabel.getModifiedDate()).toString();
             }
         };
     }
 
-	public Converter<Long, SubjectLabel> getIdToSubjectLabelConverter() {
+    public Converter<Long, SubjectLabel> getIdToSubjectLabelConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.SubjectLabel>() {
             public com.labsynch.labseer.domain.SubjectLabel convert(java.lang.Long id) {
                 return SubjectLabel.findSubjectLabel(id);
@@ -1065,7 +1140,7 @@ public com.labsynch.labseer.domain.SubjectLabel convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, SubjectLabel> getStringToSubjectLabelConverter() {
+    public Converter<String, SubjectLabel> getStringToSubjectLabelConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.SubjectLabel>() {
             public com.labsynch.labseer.domain.SubjectLabel convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), SubjectLabel.class);
@@ -1073,15 +1148,17 @@ public com.labsynch.labseer.domain.SubjectLabel convert(String id) {
         };
     }
 
-	public Converter<SubjectState, String> getSubjectStateToStringConverter() {
+    public Converter<SubjectState, String> getSubjectStateToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.SubjectState, java.lang.String>() {
             public String convert(SubjectState subjectState) {
-                return new StringBuilder().append(subjectState.getRecordedBy()).append(' ').append(subjectState.getRecordedDate()).append(' ').append(subjectState.getModifiedBy()).append(' ').append(subjectState.getModifiedDate()).toString();
+                return new StringBuilder().append(subjectState.getRecordedBy()).append(' ')
+                        .append(subjectState.getRecordedDate()).append(' ').append(subjectState.getModifiedBy())
+                        .append(' ').append(subjectState.getModifiedDate()).toString();
             }
         };
     }
 
-	public Converter<Long, SubjectState> getIdToSubjectStateConverter() {
+    public Converter<Long, SubjectState> getIdToSubjectStateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.SubjectState>() {
             public com.labsynch.labseer.domain.SubjectState convert(java.lang.Long id) {
                 return SubjectState.findSubjectState(id);
@@ -1089,7 +1166,7 @@ public com.labsynch.labseer.domain.SubjectState convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, SubjectState> getStringToSubjectStateConverter() {
+    public Converter<String, SubjectState> getStringToSubjectStateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.SubjectState>() {
             public com.labsynch.labseer.domain.SubjectState convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), SubjectState.class);
@@ -1097,15 +1174,17 @@ public com.labsynch.labseer.domain.SubjectState convert(String id) {
         };
     }
 
-	public Converter<SubjectValue, String> getSubjectValueToStringConverter() {
+    public Converter<SubjectValue, String> getSubjectValueToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.SubjectValue, java.lang.String>() {
             public String convert(SubjectValue subjectValue) {
-                return new StringBuilder().append(subjectValue.getLsType()).append(' ').append(subjectValue.getLsKind()).append(' ').append(subjectValue.getLsTypeAndKind()).append(' ').append(subjectValue.getStringValue()).toString();
+                return new StringBuilder().append(subjectValue.getLsType()).append(' ').append(subjectValue.getLsKind())
+                        .append(' ').append(subjectValue.getLsTypeAndKind()).append(' ')
+                        .append(subjectValue.getStringValue()).toString();
             }
         };
     }
 
-	public Converter<Long, SubjectValue> getIdToSubjectValueConverter() {
+    public Converter<Long, SubjectValue> getIdToSubjectValueConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.SubjectValue>() {
             public com.labsynch.labseer.domain.SubjectValue convert(java.lang.Long id) {
                 return SubjectValue.findSubjectValue(id);
@@ -1113,7 +1192,7 @@ public com.labsynch.labseer.domain.SubjectValue convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, SubjectValue> getStringToSubjectValueConverter() {
+    public Converter<String, SubjectValue> getStringToSubjectValueConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.SubjectValue>() {
             public com.labsynch.labseer.domain.SubjectValue convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), SubjectValue.class);
@@ -1121,15 +1200,16 @@ public com.labsynch.labseer.domain.SubjectValue convert(String id) {
         };
     }
 
-	public Converter<ThingKind, String> getThingKindToStringConverter() {
+    public Converter<ThingKind, String> getThingKindToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ThingKind, java.lang.String>() {
             public String convert(ThingKind thingKind) {
-                return new StringBuilder().append(thingKind.getKindName()).append(' ').append(thingKind.getLsTypeAndKind()).toString();
+                return new StringBuilder().append(thingKind.getKindName()).append(' ')
+                        .append(thingKind.getLsTypeAndKind()).toString();
             }
         };
     }
 
-	public Converter<Long, ThingKind> getIdToThingKindConverter() {
+    public Converter<Long, ThingKind> getIdToThingKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ThingKind>() {
             public com.labsynch.labseer.domain.ThingKind convert(java.lang.Long id) {
                 return ThingKind.findThingKind(id);
@@ -1137,7 +1217,7 @@ public com.labsynch.labseer.domain.ThingKind convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, ThingKind> getStringToThingKindConverter() {
+    public Converter<String, ThingKind> getStringToThingKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ThingKind>() {
             public com.labsynch.labseer.domain.ThingKind convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ThingKind.class);
@@ -1145,15 +1225,17 @@ public com.labsynch.labseer.domain.ThingKind convert(String id) {
         };
     }
 
-	public Converter<ThingPage, String> getThingPageToStringConverter() {
+    public Converter<ThingPage, String> getThingPageToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ThingPage, java.lang.String>() {
             public String convert(ThingPage thingPage) {
-                return new StringBuilder().append(thingPage.getPageName()).append(' ').append(thingPage.getRecordedBy()).append(' ').append(thingPage.getRecordedDate()).append(' ').append(thingPage.getPageContent()).toString();
+                return new StringBuilder().append(thingPage.getPageName()).append(' ').append(thingPage.getRecordedBy())
+                        .append(' ').append(thingPage.getRecordedDate()).append(' ').append(thingPage.getPageContent())
+                        .toString();
             }
         };
     }
 
-	public Converter<Long, ThingPage> getIdToThingPageConverter() {
+    public Converter<Long, ThingPage> getIdToThingPageConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ThingPage>() {
             public com.labsynch.labseer.domain.ThingPage convert(java.lang.Long id) {
                 return ThingPage.findThingPage(id);
@@ -1161,7 +1243,7 @@ public com.labsynch.labseer.domain.ThingPage convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, ThingPage> getStringToThingPageConverter() {
+    public Converter<String, ThingPage> getStringToThingPageConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ThingPage>() {
             public com.labsynch.labseer.domain.ThingPage convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ThingPage.class);
@@ -1169,15 +1251,17 @@ public com.labsynch.labseer.domain.ThingPage convert(String id) {
         };
     }
 
-	public Converter<ThingPageArchive, String> getThingPageArchiveToStringConverter() {
+    public Converter<ThingPageArchive, String> getThingPageArchiveToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ThingPageArchive, java.lang.String>() {
             public String convert(ThingPageArchive thingPageArchive) {
-                return new StringBuilder().append(thingPageArchive.getPageName()).append(' ').append(thingPageArchive.getRecordedBy()).append(' ').append(thingPageArchive.getRecordedDate()).append(' ').append(thingPageArchive.getPageContent()).toString();
+                return new StringBuilder().append(thingPageArchive.getPageName()).append(' ')
+                        .append(thingPageArchive.getRecordedBy()).append(' ').append(thingPageArchive.getRecordedDate())
+                        .append(' ').append(thingPageArchive.getPageContent()).toString();
             }
         };
     }
 
-	public Converter<Long, ThingPageArchive> getIdToThingPageArchiveConverter() {
+    public Converter<Long, ThingPageArchive> getIdToThingPageArchiveConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ThingPageArchive>() {
             public com.labsynch.labseer.domain.ThingPageArchive convert(java.lang.Long id) {
                 return ThingPageArchive.findThingPageArchive(id);
@@ -1185,7 +1269,7 @@ public com.labsynch.labseer.domain.ThingPageArchive convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, ThingPageArchive> getStringToThingPageArchiveConverter() {
+    public Converter<String, ThingPageArchive> getStringToThingPageArchiveConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ThingPageArchive>() {
             public com.labsynch.labseer.domain.ThingPageArchive convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ThingPageArchive.class);
@@ -1193,7 +1277,7 @@ public com.labsynch.labseer.domain.ThingPageArchive convert(String id) {
         };
     }
 
-	public Converter<ThingType, String> getThingTypeToStringConverter() {
+    public Converter<ThingType, String> getThingTypeToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ThingType, java.lang.String>() {
             public String convert(ThingType thingType) {
                 return new StringBuilder().append(thingType.getTypeName()).toString();
@@ -1201,7 +1285,7 @@ public String convert(ThingType thingType) {
         };
     }
 
-	public Converter<Long, ThingType> getIdToThingTypeConverter() {
+    public Converter<Long, ThingType> getIdToThingTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ThingType>() {
             public com.labsynch.labseer.domain.ThingType convert(java.lang.Long id) {
                 return ThingType.findThingType(id);
@@ -1209,7 +1293,7 @@ public com.labsynch.labseer.domain.ThingType convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, ThingType> getStringToThingTypeConverter() {
+    public Converter<String, ThingType> getStringToThingTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ThingType>() {
             public com.labsynch.labseer.domain.ThingType convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ThingType.class);
@@ -1217,15 +1301,17 @@ public com.labsynch.labseer.domain.ThingType convert(String id) {
         };
     }
 
-	public Converter<TreatmentGroup, String> getTreatmentGroupToStringConverter() {
+    public Converter<TreatmentGroup, String> getTreatmentGroupToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.TreatmentGroup, java.lang.String>() {
             public String convert(TreatmentGroup treatmentGroup) {
-                return new StringBuilder().append(treatmentGroup.getLsType()).append(' ').append(treatmentGroup.getLsKind()).append(' ').append(treatmentGroup.getLsTypeAndKind()).append(' ').append(treatmentGroup.getCodeName()).toString();
+                return new StringBuilder().append(treatmentGroup.getLsType()).append(' ')
+                        .append(treatmentGroup.getLsKind()).append(' ').append(treatmentGroup.getLsTypeAndKind())
+                        .append(' ').append(treatmentGroup.getCodeName()).toString();
             }
         };
     }
 
-	public Converter<Long, TreatmentGroup> getIdToTreatmentGroupConverter() {
+    public Converter<Long, TreatmentGroup> getIdToTreatmentGroupConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.TreatmentGroup>() {
             public com.labsynch.labseer.domain.TreatmentGroup convert(java.lang.Long id) {
                 return TreatmentGroup.findTreatmentGroup(id);
@@ -1233,7 +1319,7 @@ public com.labsynch.labseer.domain.TreatmentGroup convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, TreatmentGroup> getStringToTreatmentGroupConverter() {
+    public Converter<String, TreatmentGroup> getStringToTreatmentGroupConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.TreatmentGroup>() {
             public com.labsynch.labseer.domain.TreatmentGroup convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), TreatmentGroup.class);
@@ -1241,15 +1327,18 @@ public com.labsynch.labseer.domain.TreatmentGroup convert(String id) {
         };
     }
 
-	public Converter<TreatmentGroupLabel, String> getTreatmentGroupLabelToStringConverter() {
+    public Converter<TreatmentGroupLabel, String> getTreatmentGroupLabelToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.TreatmentGroupLabel, java.lang.String>() {
             public String convert(TreatmentGroupLabel treatmentGroupLabel) {
-                return new StringBuilder().append(treatmentGroupLabel.getLabelText()).append(' ').append(treatmentGroupLabel.getRecordedBy()).append(' ').append(treatmentGroupLabel.getRecordedDate()).append(' ').append(treatmentGroupLabel.getModifiedDate()).toString();
+                return new StringBuilder().append(treatmentGroupLabel.getLabelText()).append(' ')
+                        .append(treatmentGroupLabel.getRecordedBy()).append(' ')
+                        .append(treatmentGroupLabel.getRecordedDate()).append(' ')
+                        .append(treatmentGroupLabel.getModifiedDate()).toString();
             }
         };
     }
 
-	public Converter<Long, TreatmentGroupLabel> getIdToTreatmentGroupLabelConverter() {
+    public Converter<Long, TreatmentGroupLabel> getIdToTreatmentGroupLabelConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.TreatmentGroupLabel>() {
             public com.labsynch.labseer.domain.TreatmentGroupLabel convert(java.lang.Long id) {
                 return TreatmentGroupLabel.findTreatmentGroupLabel(id);
@@ -1257,7 +1346,7 @@ public com.labsynch.labseer.domain.TreatmentGroupLabel convert(java.lang.Long id
         };
     }
 
-	public Converter<String, TreatmentGroupLabel> getStringToTreatmentGroupLabelConverter() {
+    public Converter<String, TreatmentGroupLabel> getStringToTreatmentGroupLabelConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.TreatmentGroupLabel>() {
             public com.labsynch.labseer.domain.TreatmentGroupLabel convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), TreatmentGroupLabel.class);
@@ -1265,15 +1354,18 @@ public com.labsynch.labseer.domain.TreatmentGroupLabel convert(String id) {
         };
     }
 
-	public Converter<TreatmentGroupState, String> getTreatmentGroupStateToStringConverter() {
+    public Converter<TreatmentGroupState, String> getTreatmentGroupStateToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.TreatmentGroupState, java.lang.String>() {
             public String convert(TreatmentGroupState treatmentGroupState) {
-                return new StringBuilder().append(treatmentGroupState.getRecordedBy()).append(' ').append(treatmentGroupState.getRecordedDate()).append(' ').append(treatmentGroupState.getModifiedBy()).append(' ').append(treatmentGroupState.getModifiedDate()).toString();
+                return new StringBuilder().append(treatmentGroupState.getRecordedBy()).append(' ')
+                        .append(treatmentGroupState.getRecordedDate()).append(' ')
+                        .append(treatmentGroupState.getModifiedBy()).append(' ')
+                        .append(treatmentGroupState.getModifiedDate()).toString();
             }
         };
     }
 
-	public Converter<Long, TreatmentGroupState> getIdToTreatmentGroupStateConverter() {
+    public Converter<Long, TreatmentGroupState> getIdToTreatmentGroupStateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.TreatmentGroupState>() {
             public com.labsynch.labseer.domain.TreatmentGroupState convert(java.lang.Long id) {
                 return TreatmentGroupState.findTreatmentGroupState(id);
@@ -1281,7 +1373,7 @@ public com.labsynch.labseer.domain.TreatmentGroupState convert(java.lang.Long id
         };
     }
 
-	public Converter<String, TreatmentGroupState> getStringToTreatmentGroupStateConverter() {
+    public Converter<String, TreatmentGroupState> getStringToTreatmentGroupStateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.TreatmentGroupState>() {
             public com.labsynch.labseer.domain.TreatmentGroupState convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), TreatmentGroupState.class);
@@ -1289,15 +1381,18 @@ public com.labsynch.labseer.domain.TreatmentGroupState convert(String id) {
         };
     }
 
-	public Converter<TreatmentGroupValue, String> getTreatmentGroupValueToStringConverter() {
+    public Converter<TreatmentGroupValue, String> getTreatmentGroupValueToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.TreatmentGroupValue, java.lang.String>() {
             public String convert(TreatmentGroupValue treatmentGroupValue) {
-                return new StringBuilder().append(treatmentGroupValue.getLsType()).append(' ').append(treatmentGroupValue.getLsKind()).append(' ').append(treatmentGroupValue.getLsTypeAndKind()).append(' ').append(treatmentGroupValue.getStringValue()).toString();
+                return new StringBuilder().append(treatmentGroupValue.getLsType()).append(' ')
+                        .append(treatmentGroupValue.getLsKind()).append(' ')
+                        .append(treatmentGroupValue.getLsTypeAndKind()).append(' ')
+                        .append(treatmentGroupValue.getStringValue()).toString();
             }
         };
     }
 
-	public Converter<Long, TreatmentGroupValue> getIdToTreatmentGroupValueConverter() {
+    public Converter<Long, TreatmentGroupValue> getIdToTreatmentGroupValueConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.TreatmentGroupValue>() {
             public com.labsynch.labseer.domain.TreatmentGroupValue convert(java.lang.Long id) {
                 return TreatmentGroupValue.findTreatmentGroupValue(id);
@@ -1305,7 +1400,7 @@ public com.labsynch.labseer.domain.TreatmentGroupValue convert(java.lang.Long id
         };
     }
 
-	public Converter<String, TreatmentGroupValue> getStringToTreatmentGroupValueConverter() {
+    public Converter<String, TreatmentGroupValue> getStringToTreatmentGroupValueConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.TreatmentGroupValue>() {
             public com.labsynch.labseer.domain.TreatmentGroupValue convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), TreatmentGroupValue.class);
@@ -1313,7 +1408,7 @@ public com.labsynch.labseer.domain.TreatmentGroupValue convert(String id) {
         };
     }
 
-	public Converter<UncertaintyKind, String> getUncertaintyKindToStringConverter() {
+    public Converter<UncertaintyKind, String> getUncertaintyKindToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.UncertaintyKind, java.lang.String>() {
             public String convert(UncertaintyKind uncertaintyKind) {
                 return new StringBuilder().append(uncertaintyKind.getKindName()).toString();
@@ -1321,7 +1416,7 @@ public String convert(UncertaintyKind uncertaintyKind) {
         };
     }
 
-	public Converter<Long, UncertaintyKind> getIdToUncertaintyKindConverter() {
+    public Converter<Long, UncertaintyKind> getIdToUncertaintyKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.UncertaintyKind>() {
             public com.labsynch.labseer.domain.UncertaintyKind convert(java.lang.Long id) {
                 return UncertaintyKind.findUncertaintyKind(id);
@@ -1329,7 +1424,7 @@ public com.labsynch.labseer.domain.UncertaintyKind convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, UncertaintyKind> getStringToUncertaintyKindConverter() {
+    public Converter<String, UncertaintyKind> getStringToUncertaintyKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.UncertaintyKind>() {
             public com.labsynch.labseer.domain.UncertaintyKind convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), UncertaintyKind.class);
@@ -1337,15 +1432,16 @@ public com.labsynch.labseer.domain.UncertaintyKind convert(String id) {
         };
     }
 
-	public Converter<UnitKind, String> getUnitKindToStringConverter() {
+    public Converter<UnitKind, String> getUnitKindToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.UnitKind, java.lang.String>() {
             public String convert(UnitKind unitKind) {
-                return new StringBuilder().append(unitKind.getKindName()).append(' ').append(unitKind.getLsTypeAndKind()).toString();
+                return new StringBuilder().append(unitKind.getKindName()).append(' ')
+                        .append(unitKind.getLsTypeAndKind()).toString();
             }
         };
     }
 
-	public Converter<Long, UnitKind> getIdToUnitKindConverter() {
+    public Converter<Long, UnitKind> getIdToUnitKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.UnitKind>() {
             public com.labsynch.labseer.domain.UnitKind convert(java.lang.Long id) {
                 return UnitKind.findUnitKind(id);
@@ -1353,7 +1449,7 @@ public com.labsynch.labseer.domain.UnitKind convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, UnitKind> getStringToUnitKindConverter() {
+    public Converter<String, UnitKind> getStringToUnitKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.UnitKind>() {
             public com.labsynch.labseer.domain.UnitKind convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), UnitKind.class);
@@ -1361,7 +1457,7 @@ public com.labsynch.labseer.domain.UnitKind convert(String id) {
         };
     }
 
-	public Converter<UnitType, String> getUnitTypeToStringConverter() {
+    public Converter<UnitType, String> getUnitTypeToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.UnitType, java.lang.String>() {
             public String convert(UnitType unitType) {
                 return new StringBuilder().append(unitType.getTypeName()).toString();
@@ -1369,7 +1465,7 @@ public String convert(UnitType unitType) {
         };
     }
 
-	public Converter<Long, UnitType> getIdToUnitTypeConverter() {
+    public Converter<Long, UnitType> getIdToUnitTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.UnitType>() {
             public com.labsynch.labseer.domain.UnitType convert(java.lang.Long id) {
                 return UnitType.findUnitType(id);
@@ -1377,7 +1473,7 @@ public com.labsynch.labseer.domain.UnitType convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, UnitType> getStringToUnitTypeConverter() {
+    public Converter<String, UnitType> getStringToUnitTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.UnitType>() {
             public com.labsynch.labseer.domain.UnitType convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), UnitType.class);
@@ -1385,15 +1481,16 @@ public com.labsynch.labseer.domain.UnitType convert(String id) {
         };
     }
 
-	public Converter<ValueKind, String> getValueKindToStringConverter() {
+    public Converter<ValueKind, String> getValueKindToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ValueKind, java.lang.String>() {
             public String convert(ValueKind valueKind) {
-                return new StringBuilder().append(valueKind.getKindName()).append(' ').append(valueKind.getLsTypeAndKind()).toString();
+                return new StringBuilder().append(valueKind.getKindName()).append(' ')
+                        .append(valueKind.getLsTypeAndKind()).toString();
             }
         };
     }
 
-	public Converter<Long, ValueKind> getIdToValueKindConverter() {
+    public Converter<Long, ValueKind> getIdToValueKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ValueKind>() {
             public com.labsynch.labseer.domain.ValueKind convert(java.lang.Long id) {
                 return ValueKind.findValueKind(id);
@@ -1401,7 +1498,7 @@ public com.labsynch.labseer.domain.ValueKind convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, ValueKind> getStringToValueKindConverter() {
+    public Converter<String, ValueKind> getStringToValueKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ValueKind>() {
             public com.labsynch.labseer.domain.ValueKind convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ValueKind.class);
@@ -1409,7 +1506,7 @@ public com.labsynch.labseer.domain.ValueKind convert(String id) {
         };
     }
 
-	public Converter<ValueType, String> getValueTypeToStringConverter() {
+    public Converter<ValueType, String> getValueTypeToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ValueType, java.lang.String>() {
             public String convert(ValueType valueType) {
                 return new StringBuilder().append(valueType.getTypeName()).toString();
@@ -1417,7 +1514,7 @@ public String convert(ValueType valueType) {
         };
     }
 
-	public Converter<Long, ValueType> getIdToValueTypeConverter() {
+    public Converter<Long, ValueType> getIdToValueTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ValueType>() {
             public com.labsynch.labseer.domain.ValueType convert(java.lang.Long id) {
                 return ValueType.findValueType(id);
@@ -1425,7 +1522,7 @@ public com.labsynch.labseer.domain.ValueType convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, ValueType> getStringToValueTypeConverter() {
+    public Converter<String, ValueType> getStringToValueTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ValueType>() {
             public com.labsynch.labseer.domain.ValueType convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ValueType.class);
@@ -1436,12 +1533,14 @@ public com.labsynch.labseer.domain.ValueType convert(String id) {
     public Converter<CmpdRegAppSetting, String> getCmpdRegAppSettingToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.CmpdRegAppSetting, java.lang.String>() {
             public String convert(CmpdRegAppSetting cmpdRegAppSetting) {
-                return new StringBuilder().append(cmpdRegAppSetting.getPropName()).append(' ').append(cmpdRegAppSetting.getPropValue()).append(' ').append(cmpdRegAppSetting.getComments()).append(' ').append(cmpdRegAppSetting.getRecordedDate()).toString();
+                return new StringBuilder().append(cmpdRegAppSetting.getPropName()).append(' ')
+                        .append(cmpdRegAppSetting.getPropValue()).append(' ').append(cmpdRegAppSetting.getComments())
+                        .append(' ').append(cmpdRegAppSetting.getRecordedDate()).toString();
             }
         };
     }
 
-	public Converter<Long, CmpdRegAppSetting> getIdToCmpdRegAppSettingConverter() {
+    public Converter<Long, CmpdRegAppSetting> getIdToCmpdRegAppSettingConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.CmpdRegAppSetting>() {
             public com.labsynch.labseer.domain.CmpdRegAppSetting convert(java.lang.Long id) {
                 return CmpdRegAppSetting.findCmpdRegAppSetting(id);
@@ -1449,7 +1548,7 @@ public com.labsynch.labseer.domain.CmpdRegAppSetting convert(java.lang.Long id)
         };
     }
 
-	public Converter<String, CmpdRegAppSetting> getStringToCmpdRegAppSettingConverter() {
+    public Converter<String, CmpdRegAppSetting> getStringToCmpdRegAppSettingConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.CmpdRegAppSetting>() {
             public com.labsynch.labseer.domain.CmpdRegAppSetting convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), CmpdRegAppSetting.class);
@@ -1457,15 +1556,16 @@ public com.labsynch.labseer.domain.CmpdRegAppSetting convert(String id) {
         };
     }
 
-	public Converter<CorpName, String> getCorpNameToStringConverter() {
+    public Converter<CorpName, String> getCorpNameToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.CorpName, java.lang.String>() {
             public String convert(CorpName corpName) {
-                return new StringBuilder().append(corpName.getParentCorpName()).append(' ').append(corpName.getComment()).toString();
+                return new StringBuilder().append(corpName.getParentCorpName()).append(' ')
+                        .append(corpName.getComment()).toString();
             }
         };
     }
 
-	public Converter<Long, CorpName> getIdToCorpNameConverter() {
+    public Converter<Long, CorpName> getIdToCorpNameConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.CorpName>() {
             public com.labsynch.labseer.domain.CorpName convert(java.lang.Long id) {
                 return CorpName.findCorpName(id);
@@ -1473,7 +1573,7 @@ public com.labsynch.labseer.domain.CorpName convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, CorpName> getStringToCorpNameConverter() {
+    public Converter<String, CorpName> getStringToCorpNameConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.CorpName>() {
             public com.labsynch.labseer.domain.CorpName convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), CorpName.class);
@@ -1481,15 +1581,16 @@ public com.labsynch.labseer.domain.CorpName convert(String id) {
         };
     }
 
-	public Converter<FileList, String> getFileListToStringConverter() {
+    public Converter<FileList, String> getFileListToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.FileList, java.lang.String>() {
             public String convert(FileList fileList) {
-                return new StringBuilder().append(fileList.getFile()).append(' ').append(fileList.getDescription()).append(' ').append(fileList.getName()).append(' ').append(fileList.getType()).toString();
+                return new StringBuilder().append(fileList.getFile()).append(' ').append(fileList.getDescription())
+                        .append(' ').append(fileList.getName()).append(' ').append(fileList.getType()).toString();
             }
         };
     }
 
-	public Converter<Long, FileList> getIdToFileListConverter() {
+    public Converter<Long, FileList> getIdToFileListConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.FileList>() {
             public com.labsynch.labseer.domain.FileList convert(java.lang.Long id) {
                 return FileList.findFileList(id);
@@ -1497,15 +1598,15 @@ public com.labsynch.labseer.domain.FileList convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, FileList> getStringToFileListConverter() {
+    public Converter<String, FileList> getStringToFileListConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.FileList>() {
             public com.labsynch.labseer.domain.FileList convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), FileList.class);
             }
         };
     }
-	
-	public Converter<ParentAliasType, String> getParentAliasTypeToStringConverter() {
+
+    public Converter<ParentAliasType, String> getParentAliasTypeToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ParentAliasType, java.lang.String>() {
             public String convert(ParentAliasType parentAliasType) {
                 return new StringBuilder().append(parentAliasType.getTypeName()).toString();
@@ -1513,7 +1614,7 @@ public String convert(ParentAliasType parentAliasType) {
         };
     }
 
-	public Converter<FileType, String> getFileTypeToStringConverter() {
+    public Converter<FileType, String> getFileTypeToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.FileType, java.lang.String>() {
             public String convert(FileType fileType) {
                 return new StringBuilder().append(fileType.getName()).append(' ').append(fileType.getCode()).toString();
@@ -1521,7 +1622,7 @@ public String convert(FileType fileType) {
         };
     }
 
-	public Converter<Long, FileType> getIdToFileTypeConverter() {
+    public Converter<Long, FileType> getIdToFileTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.FileType>() {
             public com.labsynch.labseer.domain.FileType convert(java.lang.Long id) {
                 return FileType.findFileType(id);
@@ -1529,7 +1630,7 @@ public com.labsynch.labseer.domain.FileType convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, FileType> getStringToFileTypeConverter() {
+    public Converter<String, FileType> getStringToFileTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.FileType>() {
             public com.labsynch.labseer.domain.FileType convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), FileType.class);
@@ -1537,15 +1638,16 @@ public com.labsynch.labseer.domain.FileType convert(String id) {
         };
     }
 
-	public Converter<Isotope, String> getIsotopeToStringConverter() {
+    public Converter<Isotope, String> getIsotopeToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.Isotope, java.lang.String>() {
             public String convert(Isotope isotope) {
-                return new StringBuilder().append(isotope.getName()).append(' ').append(isotope.getAbbrev()).append(' ').append(isotope.getMassChange()).toString();
+                return new StringBuilder().append(isotope.getName()).append(' ').append(isotope.getAbbrev()).append(' ')
+                        .append(isotope.getMassChange()).toString();
             }
         };
     }
 
-	public Converter<Long, Isotope> getIdToIsotopeConverter() {
+    public Converter<Long, Isotope> getIdToIsotopeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.Isotope>() {
             public com.labsynch.labseer.domain.Isotope convert(java.lang.Long id) {
                 return Isotope.findIsotope(id);
@@ -1553,7 +1655,7 @@ public com.labsynch.labseer.domain.Isotope convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, Isotope> getStringToIsotopeConverter() {
+    public Converter<String, Isotope> getStringToIsotopeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.Isotope>() {
             public com.labsynch.labseer.domain.Isotope convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), Isotope.class);
@@ -1561,7 +1663,7 @@ public com.labsynch.labseer.domain.Isotope convert(String id) {
         };
     }
 
-	public Converter<Operator, String> getOperatorToStringConverter() {
+    public Converter<Operator, String> getOperatorToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.Operator, java.lang.String>() {
             public String convert(Operator operator) {
                 return new StringBuilder().append(operator.getName()).append(' ').append(operator.getCode()).toString();
@@ -1569,7 +1671,7 @@ public String convert(Operator operator) {
         };
     }
 
-	public Converter<Long, Operator> getIdToOperatorConverter() {
+    public Converter<Long, Operator> getIdToOperatorConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.Operator>() {
             public com.labsynch.labseer.domain.Operator convert(java.lang.Long id) {
                 return Operator.findOperator(id);
@@ -1577,7 +1679,7 @@ public com.labsynch.labseer.domain.Operator convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, Operator> getStringToOperatorConverter() {
+    public Converter<String, Operator> getStringToOperatorConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.Operator>() {
             public com.labsynch.labseer.domain.Operator convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), Operator.class);
@@ -1585,7 +1687,7 @@ public com.labsynch.labseer.domain.Operator convert(String id) {
         };
     }
 
-	public Converter<Parent, String> getParentToStringConverter() {
+    public Converter<Parent, String> getParentToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.Parent, java.lang.String>() {
             public String convert(Parent parent) {
                 return new StringBuilder().append(parent.getId()).toString();
@@ -1593,7 +1695,7 @@ public String convert(Parent parent) {
         };
     }
 
-	public Converter<Long, Parent> getIdToParentConverter() {
+    public Converter<Long, Parent> getIdToParentConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.Parent>() {
             public com.labsynch.labseer.domain.Parent convert(java.lang.Long id) {
                 return Parent.findParent(id);
@@ -1601,7 +1703,7 @@ public com.labsynch.labseer.domain.Parent convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, Parent> getStringToParentConverter() {
+    public Converter<String, Parent> getStringToParentConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.Parent>() {
             public com.labsynch.labseer.domain.Parent convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), Parent.class);
@@ -1609,15 +1711,16 @@ public com.labsynch.labseer.domain.Parent convert(String id) {
         };
     }
 
-	public Converter<PhysicalState, String> getPhysicalStateToStringConverter() {
+    public Converter<PhysicalState, String> getPhysicalStateToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.PhysicalState, java.lang.String>() {
             public String convert(PhysicalState physicalState) {
-                return new StringBuilder().append(physicalState.getName()).append(' ').append(physicalState.getCode()).toString();
+                return new StringBuilder().append(physicalState.getName()).append(' ').append(physicalState.getCode())
+                        .toString();
             }
         };
     }
 
-	public Converter<Long, PhysicalState> getIdToPhysicalStateConverter() {
+    public Converter<Long, PhysicalState> getIdToPhysicalStateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.PhysicalState>() {
             public com.labsynch.labseer.domain.PhysicalState convert(java.lang.Long id) {
                 return PhysicalState.findPhysicalState(id);
@@ -1625,7 +1728,7 @@ public com.labsynch.labseer.domain.PhysicalState convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, PhysicalState> getStringToPhysicalStateConverter() {
+    public Converter<String, PhysicalState> getStringToPhysicalStateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.PhysicalState>() {
             public com.labsynch.labseer.domain.PhysicalState convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), PhysicalState.class);
@@ -1633,15 +1736,17 @@ public com.labsynch.labseer.domain.PhysicalState convert(String id) {
         };
     }
 
-	public Converter<PreDef_CorpName, String> getPreDef_CorpNameToStringConverter() {
+    public Converter<PreDef_CorpName, String> getPreDef_CorpNameToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.PreDef_CorpName, java.lang.String>() {
             public String convert(PreDef_CorpName preDef_CorpName) {
-                return new StringBuilder().append(preDef_CorpName.getCorpNumber()).append(' ').append(preDef_CorpName.getCorpName()).append(' ').append(preDef_CorpName.getComment()).toString();
+                return new StringBuilder().append(preDef_CorpName.getCorpNumber()).append(' ')
+                        .append(preDef_CorpName.getCorpName()).append(' ').append(preDef_CorpName.getComment())
+                        .toString();
             }
         };
     }
 
-	public Converter<Long, PreDef_CorpName> getIdToPreDef_CorpNameConverter() {
+    public Converter<Long, PreDef_CorpName> getIdToPreDef_CorpNameConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.PreDef_CorpName>() {
             public com.labsynch.labseer.domain.PreDef_CorpName convert(java.lang.Long id) {
                 return PreDef_CorpName.findPreDef_CorpName(id);
@@ -1649,7 +1754,7 @@ public com.labsynch.labseer.domain.PreDef_CorpName convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, PreDef_CorpName> getStringToPreDef_CorpNameConverter() {
+    public Converter<String, PreDef_CorpName> getStringToPreDef_CorpNameConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.PreDef_CorpName>() {
             public com.labsynch.labseer.domain.PreDef_CorpName convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), PreDef_CorpName.class);
@@ -1657,15 +1762,16 @@ public com.labsynch.labseer.domain.PreDef_CorpName convert(String id) {
         };
     }
 
-	public Converter<PurityMeasuredBy, String> getPurityMeasuredByToStringConverter() {
+    public Converter<PurityMeasuredBy, String> getPurityMeasuredByToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.PurityMeasuredBy, java.lang.String>() {
             public String convert(PurityMeasuredBy purityMeasuredBy) {
-                return new StringBuilder().append(purityMeasuredBy.getName()).append(' ').append(purityMeasuredBy.getCode()).toString();
+                return new StringBuilder().append(purityMeasuredBy.getName()).append(' ')
+                        .append(purityMeasuredBy.getCode()).toString();
             }
         };
     }
 
-	public Converter<Long, PurityMeasuredBy> getIdToPurityMeasuredByConverter() {
+    public Converter<Long, PurityMeasuredBy> getIdToPurityMeasuredByConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.PurityMeasuredBy>() {
             public com.labsynch.labseer.domain.PurityMeasuredBy convert(java.lang.Long id) {
                 return PurityMeasuredBy.findPurityMeasuredBy(id);
@@ -1673,7 +1779,7 @@ public com.labsynch.labseer.domain.PurityMeasuredBy convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, PurityMeasuredBy> getStringToPurityMeasuredByConverter() {
+    public Converter<String, PurityMeasuredBy> getStringToPurityMeasuredByConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.PurityMeasuredBy>() {
             public com.labsynch.labseer.domain.PurityMeasuredBy convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), PurityMeasuredBy.class);
@@ -1681,15 +1787,16 @@ public com.labsynch.labseer.domain.PurityMeasuredBy convert(String id) {
         };
     }
 
-	public Converter<Salt, String> getSaltToStringConverter() {
+    public Converter<Salt, String> getSaltToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.Salt, java.lang.String>() {
             public String convert(Salt salt) {
-                return new StringBuilder().append(salt.getMolStructure()).append(' ').append(salt.getName()).append(' ').append(salt.getOriginalStructure()).append(' ').append(salt.getAbbrev()).toString();
+                return new StringBuilder().append(salt.getMolStructure()).append(' ').append(salt.getName()).append(' ')
+                        .append(salt.getOriginalStructure()).append(' ').append(salt.getAbbrev()).toString();
             }
         };
     }
 
-	public Converter<Long, Salt> getIdToSaltConverter() {
+    public Converter<Long, Salt> getIdToSaltConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.Salt>() {
             public com.labsynch.labseer.domain.Salt convert(java.lang.Long id) {
                 return Salt.findSalt(id);
@@ -1697,7 +1804,7 @@ public com.labsynch.labseer.domain.Salt convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, Salt> getStringToSaltConverter() {
+    public Converter<String, Salt> getStringToSaltConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.Salt>() {
             public com.labsynch.labseer.domain.Salt convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), Salt.class);
@@ -1705,7 +1812,7 @@ public com.labsynch.labseer.domain.Salt convert(String id) {
         };
     }
 
-	public Converter<SaltForm, String> getSaltFormToStringConverter() {
+    public Converter<SaltForm, String> getSaltFormToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.SaltForm, java.lang.String>() {
             public String convert(SaltForm saltForm) {
                 return new StringBuilder().append(saltForm.getId()).toString();
@@ -1713,7 +1820,7 @@ public String convert(SaltForm saltForm) {
         };
     }
 
-	public Converter<Long, SaltForm> getIdToSaltFormConverter() {
+    public Converter<Long, SaltForm> getIdToSaltFormConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.SaltForm>() {
             public com.labsynch.labseer.domain.SaltForm convert(java.lang.Long id) {
                 return SaltForm.findSaltForm(id);
@@ -1721,7 +1828,7 @@ public com.labsynch.labseer.domain.SaltForm convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, SaltForm> getStringToSaltFormConverter() {
+    public Converter<String, SaltForm> getStringToSaltFormConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.SaltForm>() {
             public com.labsynch.labseer.domain.SaltForm convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), SaltForm.class);
@@ -1729,15 +1836,16 @@ public com.labsynch.labseer.domain.SaltForm convert(String id) {
         };
     }
 
-	public Converter<SolutionUnit, String> getSolutionUnitToStringConverter() {
+    public Converter<SolutionUnit, String> getSolutionUnitToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.SolutionUnit, java.lang.String>() {
             public String convert(SolutionUnit solutionUnit) {
-                return new StringBuilder().append(solutionUnit.getName()).append(' ').append(solutionUnit.getCode()).toString();
+                return new StringBuilder().append(solutionUnit.getName()).append(' ').append(solutionUnit.getCode())
+                        .toString();
             }
         };
     }
 
-	public Converter<Long, SolutionUnit> getIdToSolutionUnitConverter() {
+    public Converter<Long, SolutionUnit> getIdToSolutionUnitConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.SolutionUnit>() {
             public com.labsynch.labseer.domain.SolutionUnit convert(java.lang.Long id) {
                 return SolutionUnit.findSolutionUnit(id);
@@ -1745,7 +1853,7 @@ public com.labsynch.labseer.domain.SolutionUnit convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, SolutionUnit> getStringToSolutionUnitConverter() {
+    public Converter<String, SolutionUnit> getStringToSolutionUnitConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.SolutionUnit>() {
             public com.labsynch.labseer.domain.SolutionUnit convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), SolutionUnit.class);
@@ -1753,15 +1861,16 @@ public com.labsynch.labseer.domain.SolutionUnit convert(String id) {
         };
     }
 
-	public Converter<StereoCategory, String> getStereoCategoryToStringConverter() {
+    public Converter<StereoCategory, String> getStereoCategoryToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.StereoCategory, java.lang.String>() {
             public String convert(StereoCategory stereoCategory) {
-                return new StringBuilder().append(stereoCategory.getName()).append(' ').append(stereoCategory.getCode()).toString();
+                return new StringBuilder().append(stereoCategory.getName()).append(' ').append(stereoCategory.getCode())
+                        .toString();
             }
         };
     }
 
-	public Converter<Long, StereoCategory> getIdToStereoCategoryConverter() {
+    public Converter<Long, StereoCategory> getIdToStereoCategoryConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.StereoCategory>() {
             public com.labsynch.labseer.domain.StereoCategory convert(java.lang.Long id) {
                 return StereoCategory.findStereoCategory(id);
@@ -1769,7 +1878,7 @@ public com.labsynch.labseer.domain.StereoCategory convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, StereoCategory> getStringToStereoCategoryConverter() {
+    public Converter<String, StereoCategory> getStringToStereoCategoryConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.StereoCategory>() {
             public com.labsynch.labseer.domain.StereoCategory convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), StereoCategory.class);
@@ -1777,7 +1886,7 @@ public com.labsynch.labseer.domain.StereoCategory convert(String id) {
         };
     }
 
-	public Converter<Unit, String> getUnitToStringConverter() {
+    public Converter<Unit, String> getUnitToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.Unit, java.lang.String>() {
             public String convert(Unit unit) {
                 return new StringBuilder().append(unit.getName()).append(' ').append(unit.getCode()).toString();
@@ -1785,7 +1894,7 @@ public String convert(Unit unit) {
         };
     }
 
-	public Converter<Long, Unit> getIdToUnitConverter() {
+    public Converter<Long, Unit> getIdToUnitConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.Unit>() {
             public com.labsynch.labseer.domain.Unit convert(java.lang.Long id) {
                 return Unit.findUnit(id);
@@ -1793,7 +1902,7 @@ public com.labsynch.labseer.domain.Unit convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, Unit> getStringToUnitConverter() {
+    public Converter<String, Unit> getStringToUnitConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.Unit>() {
             public com.labsynch.labseer.domain.Unit convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), Unit.class);
@@ -1801,7 +1910,7 @@ public com.labsynch.labseer.domain.Unit convert(String id) {
         };
     }
 
-	public Converter<Vendor, String> getVendorToStringConverter() {
+    public Converter<Vendor, String> getVendorToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.Vendor, java.lang.String>() {
             public String convert(Vendor vendor) {
                 return new StringBuilder().append(vendor.getName()).append(' ').append(vendor.getCode()).toString();
@@ -1809,7 +1918,7 @@ public String convert(Vendor vendor) {
         };
     }
 
-	public Converter<Long, Vendor> getIdToVendorConverter() {
+    public Converter<Long, Vendor> getIdToVendorConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.Vendor>() {
             public com.labsynch.labseer.domain.Vendor convert(java.lang.Long id) {
                 return Vendor.findVendor(id);
@@ -1817,7 +1926,7 @@ public com.labsynch.labseer.domain.Vendor convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, Vendor> getStringToVendorConverter() {
+    public Converter<String, Vendor> getStringToVendorConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.Vendor>() {
             public com.labsynch.labseer.domain.Vendor convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), Vendor.class);
@@ -1833,7 +1942,7 @@ public String convert(BulkLoadFile bulkLoadFile) {
         };
     }
 
-	public Converter<Long, BulkLoadFile> getIdToBulkLoadFileConverter() {
+    public Converter<Long, BulkLoadFile> getIdToBulkLoadFileConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.BulkLoadFile>() {
             public com.labsynch.labseer.domain.BulkLoadFile convert(java.lang.Long id) {
                 return BulkLoadFile.findBulkLoadFile(id);
@@ -1841,95 +1950,96 @@ public com.labsynch.labseer.domain.BulkLoadFile convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, BulkLoadFile> getStringToBulkLoadFileConverter() {
+    public Converter<String, BulkLoadFile> getStringToBulkLoadFileConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.BulkLoadFile>() {
             public com.labsynch.labseer.domain.BulkLoadFile convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), BulkLoadFile.class);
             }
         };
     }
-	
-//	@Transactional
-//	public Converter<String, Set<LsTag>> getStringToLsSetConverter() {
-//        return new Converter<String, Set<LsTag>>() {
-//            public Set<LsTag> convert(String id) {
-//                return getObject().convert(getObject().convert(id, Long.class), LsTag.class);
-//            }
-//        };
-//    }
-	
-//	@Transactional
-//    public Converter<Set<Object>, String> getObjectSetConverter() {
-//        return new Converter<Set<Object>, String>() {
-//            public String convert(Set<Object> objects) {
-//            	StringBuilder sb = new StringBuilder();
-//            	for (Object ob : objects){
-//            		sb.append(ob).append(' ');
-//            	}
-//                return sb.toString();
-//            }
-//        };
-//    }
-//	
-//	@Transactional
-//    public Converter<Set<LsTag>, String> getLsSetConverter() {
-//        return new Converter<Set<LsTag>, String>() {
-//            public String convert(Set<LsTag> lsTags) {
-//            	StringBuilder sb = new StringBuilder();
-//            	for (LsTag lt : lsTags){
-//            		sb.append(lt.getTagText()).append(' ');
-//            	}
-//                return sb.toString();
-//            }
-//        };
-//    }
-// 
-//	@Transactional
-//    public Converter<Set<AnalysisGroup>, String> getLsAnalysisGroupConverter() {
-//        return new Converter<Set<AnalysisGroup>, String>() {
-//            public String convert(Set<AnalysisGroup> lsTags) {
-//            	StringBuilder sb = new StringBuilder();
-//            	for (AnalysisGroup lt : lsTags){
-//            		sb.append(lt.getCodeName()).append(' ');
-//            	}
-//                return sb.toString();
-//            }
-//        };
-//    }
-	
-//	@Transactional
-//    public Converter<Set<Experiment>, String> getExperimentSetConverter() {
-//        return new Converter<Set<Experiment>, String>() {
-//            public String convert(Set<Experiment> experiments) {
-//            	StringBuilder sb = new StringBuilder();
-//            	for (Experiment exp : experiments){
-//            		sb.append(exp.getId().toString()).append(' ').append(exp.getCodeName()).append(' ');
-//            	}
-//                return sb.toString();
-//            }
-//        };
-//    }
-	
-//	@Transactional
-//    public Converter<Set<Protocol>, String> getProtocolSetConverter() {
-//        return new Converter<Set<Protocol>, String>() {
-//            public String convert(Set<Protocol> protocols) {
-//            	StringBuilder sb = new StringBuilder();
-//            	for (Protocol prot : protocols){
-//            		sb.append(prot.getId().toString()).append(' ').append(prot.getCodeName()).append(' ');
-//            	}
-//                return sb.toString();
-//            }
-//        };
-//    }	
-//	
-	
-	
-	public void installLabelConverters(FormatterRegistry registry) {
-//		registry.addConverter(getLsSetConverter());
-		registry.addConverter(getLsTagToStringConverter());
+
+    // @Transactional
+    // public Converter<String, Set<LsTag>> getStringToLsSetConverter() {
+    // return new Converter<String, Set<LsTag>>() {
+    // public Set<LsTag> convert(String id) {
+    // return getObject().convert(getObject().convert(id, Long.class), LsTag.class);
+    // }
+    // };
+    // }
+
+    // @Transactional
+    // public Converter<Set<Object>, String> getObjectSetConverter() {
+    // return new Converter<Set<Object>, String>() {
+    // public String convert(Set<Object> objects) {
+    // StringBuilder sb = new StringBuilder();
+    // for (Object ob : objects){
+    // sb.append(ob).append(' ');
+    // }
+    // return sb.toString();
+    // }
+    // };
+    // }
+    //
+    // @Transactional
+    // public Converter<Set<LsTag>, String> getLsSetConverter() {
+    // return new Converter<Set<LsTag>, String>() {
+    // public String convert(Set<LsTag> lsTags) {
+    // StringBuilder sb = new StringBuilder();
+    // for (LsTag lt : lsTags){
+    // sb.append(lt.getTagText()).append(' ');
+    // }
+    // return sb.toString();
+    // }
+    // };
+    // }
+    //
+    // @Transactional
+    // public Converter<Set<AnalysisGroup>, String> getLsAnalysisGroupConverter() {
+    // return new Converter<Set<AnalysisGroup>, String>() {
+    // public String convert(Set<AnalysisGroup> lsTags) {
+    // StringBuilder sb = new StringBuilder();
+    // for (AnalysisGroup lt : lsTags){
+    // sb.append(lt.getCodeName()).append(' ');
+    // }
+    // return sb.toString();
+    // }
+    // };
+    // }
+
+    // @Transactional
+    // public Converter<Set<Experiment>, String> getExperimentSetConverter() {
+    // return new Converter<Set<Experiment>, String>() {
+    // public String convert(Set<Experiment> experiments) {
+    // StringBuilder sb = new StringBuilder();
+    // for (Experiment exp : experiments){
+    // sb.append(exp.getId().toString()).append('
+    // ').append(exp.getCodeName()).append(' ');
+    // }
+    // return sb.toString();
+    // }
+    // };
+    // }
+
+    // @Transactional
+    // public Converter<Set<Protocol>, String> getProtocolSetConverter() {
+    // return new Converter<Set<Protocol>, String>() {
+    // public String convert(Set<Protocol> protocols) {
+    // StringBuilder sb = new StringBuilder();
+    // for (Protocol prot : protocols){
+    // sb.append(prot.getId().toString()).append('
+    // ').append(prot.getCodeName()).append(' ');
+    // }
+    // return sb.toString();
+    // }
+    // };
+    // }
+    //
+
+    public void installLabelConverters(FormatterRegistry registry) {
+        // registry.addConverter(getLsSetConverter());
+        registry.addConverter(getLsTagToStringConverter());
         registry.addConverter(getIdToLsTagConverter());
-		registry.addConverter(getAnalysisGroupToStringConverter());
+        registry.addConverter(getAnalysisGroupToStringConverter());
         registry.addConverter(getIdToAnalysisGroupConverter());
         registry.addConverter(getStringToAnalysisGroupConverter());
         registry.addConverter(getAnalysisGroupLabelToStringConverter());
@@ -2164,28 +2274,27 @@ public void installLabelConverters(FormatterRegistry registry) {
         registry.addConverter(getIdToBulkLoadFileConverter());
         registry.addConverter(getStringToBulkLoadFileConverter());
         registry.addConverter(getParentAliasTypeToStringConverter());
-        
-        
 
     }
 
-	public void afterPropertiesSet() {
+    public void afterPropertiesSet() {
         super.afterPropertiesSet();
         installLabelConverters(getObject());
     }
 
-	
-//	@Transactional
-//	public Converter<Long, AuthorRole> getIdToAuthorRoleConverter() {
-//        return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.AuthorRole>() {
-//            public com.labsynch.labseer.domain.AuthorRole convert(java.lang.Long id) {
-//                return AuthorRole.findAuthorRole(id);
-//            }
-//        };
-//    }
-//	
+    // @Transactional
+    // public Converter<Long, AuthorRole> getIdToAuthorRoleConverter() {
+    // return new
+    // org.springframework.core.convert.converter.Converter<java.lang.Long,
+    // com.labsynch.labseer.domain.AuthorRole>() {
+    // public com.labsynch.labseer.domain.AuthorRole convert(java.lang.Long id) {
+    // return AuthorRole.findAuthorRole(id);
+    // }
+    // };
+    // }
+    //
 
-	@Transactional
+    @Transactional
     public Converter<RoleType, String> getLsRoleTypeToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.RoleType, java.lang.String>() {
             public String convert(RoleType roleType) {
@@ -2193,8 +2302,7 @@ public String convert(RoleType roleType) {
             }
         };
     }
-	
-	
+
     public Converter<RoleKind, String> getRoleKindToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.RoleKind, java.lang.String>() {
             public String convert(RoleKind roleKind) {
@@ -2202,27 +2310,28 @@ public String convert(RoleKind roleKind) {
             }
         };
     }
-	
-	
-	@Transactional
+
+    @Transactional
     public Converter<LsRole, String> getLsRoleToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsRole, java.lang.String>() {
             public String convert(LsRole lsRole) {
-                return new StringBuilder().append(lsRole.getLsType()).append(' ').append(lsRole.getLsKind()).append(' ').append(lsRole.getRoleName()).toString();
+                return new StringBuilder().append(lsRole.getLsType()).append(' ').append(lsRole.getLsKind()).append(' ')
+                        .append(lsRole.getRoleName()).toString();
             }
         };
     }
-    
-	@Transactional
+
+    @Transactional
     public Converter<AuthorRole, String> getAuthorRoleToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.AuthorRole, java.lang.String>() {
             public String convert(AuthorRole authorRole) {
-                return new StringBuilder().append(authorRole.getUserEntry().getUserName()).append(' ').append(authorRole.getRoleEntry().getRoleName()).toString();
+                return new StringBuilder().append(authorRole.getUserEntry().getUserName()).append(' ')
+                        .append(authorRole.getRoleEntry().getRoleName()).toString();
             }
         };
     }
-	
-	@Transactional
+
+    @Transactional
     public Converter<String, AuthorRole> getStringToAuthorRoleConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.AuthorRole>() {
             public com.labsynch.labseer.domain.AuthorRole convert(String id) {
@@ -2230,9 +2339,8 @@ public com.labsynch.labseer.domain.AuthorRole convert(String id) {
             }
         };
     }
-    
-	
-	@Transactional
+
+    @Transactional
     public Converter<Author, String> getAuthorToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.Author, java.lang.String>() {
             public String convert(Author author) {
@@ -2240,8 +2348,8 @@ public String convert(Author author) {
             }
         };
     }
-    
-	@Transactional
+
+    @Transactional
     public Converter<String, Author> getStringToAuthorConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.Author>() {
             public com.labsynch.labseer.domain.Author convert(String id) {
@@ -2249,8 +2357,8 @@ public com.labsynch.labseer.domain.Author convert(String id) {
             }
         };
     }
-	
-	@Transactional
+
+    @Transactional
     public Converter<Long, Author> getIdToAuthorConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.Author>() {
             public com.labsynch.labseer.domain.Author convert(java.lang.Long id) {
@@ -2258,19 +2366,19 @@ public com.labsynch.labseer.domain.Author convert(java.lang.Long id) {
             }
         };
     }
-    
-	
-	@Transactional
-	public Converter<LsTag, String> getLsTagToStringConverter() {
+
+    @Transactional
+    public Converter<LsTag, String> getLsTagToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsTag, java.lang.String>() {
             public String convert(LsTag lsTag) {
-                return new StringBuilder().append(lsTag.getTagText()).append(' ').append(lsTag.getRecordedDate()).toString();
+                return new StringBuilder().append(lsTag.getTagText()).append(' ').append(lsTag.getRecordedDate())
+                        .toString();
             }
         };
     }
 
-	@Transactional
-	public Converter<Long, LsTag> getIdToLsTagConverter() {
+    @Transactional
+    public Converter<Long, LsTag> getIdToLsTagConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsTag>() {
             public com.labsynch.labseer.domain.LsTag convert(java.lang.Long id) {
                 return LsTag.findLsTag(id);
@@ -2278,8 +2386,8 @@ public com.labsynch.labseer.domain.LsTag convert(java.lang.Long id) {
         };
     }
 
-	@Transactional
-	public Converter<String, LsTag> getStringToLsTagConverter() {
+    @Transactional
+    public Converter<String, LsTag> getStringToLsTagConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsTag>() {
             public com.labsynch.labseer.domain.LsTag convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), LsTag.class);
@@ -2287,15 +2395,17 @@ public com.labsynch.labseer.domain.LsTag convert(String id) {
         };
     }
 
-	public Converter<UpdateLog, String> getUpdateLogToStringConverter() {
+    public Converter<UpdateLog, String> getUpdateLogToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.UpdateLog, java.lang.String>() {
             public String convert(UpdateLog updateLog) {
-                return new StringBuilder().append(updateLog.getThing()).append(' ').append(updateLog.getUpdateAction()).append(' ').append(updateLog.getComments()).append(' ').append(updateLog.getLsTransaction()).toString();
+                return new StringBuilder().append(updateLog.getThing()).append(' ').append(updateLog.getUpdateAction())
+                        .append(' ').append(updateLog.getComments()).append(' ').append(updateLog.getLsTransaction())
+                        .toString();
             }
         };
     }
 
-	public Converter<Long, UpdateLog> getIdToUpdateLogConverter() {
+    public Converter<Long, UpdateLog> getIdToUpdateLogConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.UpdateLog>() {
             public com.labsynch.labseer.domain.UpdateLog convert(java.lang.Long id) {
                 return UpdateLog.findUpdateLog(id);
@@ -2303,7 +2413,7 @@ public com.labsynch.labseer.domain.UpdateLog convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, UpdateLog> getStringToUpdateLogConverter() {
+    public Converter<String, UpdateLog> getStringToUpdateLogConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.UpdateLog>() {
             public com.labsynch.labseer.domain.UpdateLog convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), UpdateLog.class);
@@ -2311,15 +2421,16 @@ public com.labsynch.labseer.domain.UpdateLog convert(String id) {
         };
     }
 
-	public Converter<CodeKind, String> getCodeKindToStringConverter() {
+    public Converter<CodeKind, String> getCodeKindToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.CodeKind, java.lang.String>() {
             public String convert(CodeKind codeKind) {
-                return new StringBuilder().append(codeKind.getKindName()).append(' ').append(codeKind.getLsTypeAndKind()).toString();
+                return new StringBuilder().append(codeKind.getKindName()).append(' ')
+                        .append(codeKind.getLsTypeAndKind()).toString();
             }
         };
     }
 
-	public Converter<Long, CodeKind> getIdToCodeKindConverter() {
+    public Converter<Long, CodeKind> getIdToCodeKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.CodeKind>() {
             public com.labsynch.labseer.domain.CodeKind convert(java.lang.Long id) {
                 return CodeKind.findCodeKind(id);
@@ -2327,7 +2438,7 @@ public com.labsynch.labseer.domain.CodeKind convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, CodeKind> getStringToCodeKindConverter() {
+    public Converter<String, CodeKind> getStringToCodeKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.CodeKind>() {
             public com.labsynch.labseer.domain.CodeKind convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), CodeKind.class);
@@ -2335,7 +2446,7 @@ public com.labsynch.labseer.domain.CodeKind convert(String id) {
         };
     }
 
-	public Converter<CodeType, String> getCodeTypeToStringConverter() {
+    public Converter<CodeType, String> getCodeTypeToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.CodeType, java.lang.String>() {
             public String convert(CodeType codeType) {
                 return new StringBuilder().append(codeType.getTypeName()).toString();
@@ -2343,7 +2454,7 @@ public String convert(CodeType codeType) {
         };
     }
 
-	public Converter<Long, CodeType> getIdToCodeTypeConverter() {
+    public Converter<Long, CodeType> getIdToCodeTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.CodeType>() {
             public com.labsynch.labseer.domain.CodeType convert(java.lang.Long id) {
                 return CodeType.findCodeType(id);
@@ -2351,7 +2462,7 @@ public com.labsynch.labseer.domain.CodeType convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, CodeType> getStringToCodeTypeConverter() {
+    public Converter<String, CodeType> getStringToCodeTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.CodeType>() {
             public com.labsynch.labseer.domain.CodeType convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), CodeType.class);
@@ -2359,15 +2470,16 @@ public com.labsynch.labseer.domain.CodeType convert(String id) {
         };
     }
 
-	public Converter<DDictKind, String> getDDictKindToStringConverter() {
+    public Converter<DDictKind, String> getDDictKindToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.DDictKind, java.lang.String>() {
             public String convert(DDictKind dDictKind) {
-                return new StringBuilder().append(dDictKind.getLsType()).append('_').append(dDictKind.getName()).toString();
+                return new StringBuilder().append(dDictKind.getLsType()).append('_').append(dDictKind.getName())
+                        .toString();
             }
         };
     }
 
-	public Converter<Long, DDictKind> getIdToDDictKindConverter() {
+    public Converter<Long, DDictKind> getIdToDDictKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.DDictKind>() {
             public com.labsynch.labseer.domain.DDictKind convert(java.lang.Long id) {
                 return DDictKind.findDDictKind(id);
@@ -2375,7 +2487,7 @@ public com.labsynch.labseer.domain.DDictKind convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, DDictKind> getStringToDDictKindConverter() {
+    public Converter<String, DDictKind> getStringToDDictKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.DDictKind>() {
             public com.labsynch.labseer.domain.DDictKind convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), DDictKind.class);
@@ -2383,7 +2495,7 @@ public com.labsynch.labseer.domain.DDictKind convert(String id) {
         };
     }
 
-	public Converter<DDictType, String> getDDictTypeToStringConverter() {
+    public Converter<DDictType, String> getDDictTypeToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.DDictType, java.lang.String>() {
             public String convert(DDictType dDictType) {
                 return new StringBuilder().append(dDictType.getName()).toString();
@@ -2391,7 +2503,7 @@ public String convert(DDictType dDictType) {
         };
     }
 
-	public Converter<Long, DDictType> getIdToDDictTypeConverter() {
+    public Converter<Long, DDictType> getIdToDDictTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.DDictType>() {
             public com.labsynch.labseer.domain.DDictType convert(java.lang.Long id) {
                 return DDictType.findDDictType(id);
@@ -2399,7 +2511,7 @@ public com.labsynch.labseer.domain.DDictType convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, DDictType> getStringToDDictTypeConverter() {
+    public Converter<String, DDictType> getStringToDDictTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.DDictType>() {
             public com.labsynch.labseer.domain.DDictType convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), DDictType.class);
@@ -2407,15 +2519,17 @@ public com.labsynch.labseer.domain.DDictType convert(String id) {
         };
     }
 
-	public Converter<DDictValue, String> getDDictValueToStringConverter() {
+    public Converter<DDictValue, String> getDDictValueToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.DDictValue, java.lang.String>() {
             public String convert(DDictValue dDictValue) {
-                return new StringBuilder().append(dDictValue.getLsType()).append(' ').append(dDictValue.getLsKind()).append(' ').append(dDictValue.getLsTypeAndKind()).append(' ').append(dDictValue.getLabelText()).toString();
+                return new StringBuilder().append(dDictValue.getLsType()).append(' ').append(dDictValue.getLsKind())
+                        .append(' ').append(dDictValue.getLsTypeAndKind()).append(' ').append(dDictValue.getLabelText())
+                        .toString();
             }
         };
     }
 
-	public Converter<Long, DDictValue> getIdToDDictValueConverter() {
+    public Converter<Long, DDictValue> getIdToDDictValueConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.DDictValue>() {
             public com.labsynch.labseer.domain.DDictValue convert(java.lang.Long id) {
                 return DDictValue.findDDictValue(id);
@@ -2423,7 +2537,7 @@ public com.labsynch.labseer.domain.DDictValue convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, DDictValue> getStringToDDictValueConverter() {
+    public Converter<String, DDictValue> getStringToDDictValueConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.DDictValue>() {
             public com.labsynch.labseer.domain.DDictValue convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), DDictValue.class);
@@ -2431,15 +2545,18 @@ public com.labsynch.labseer.domain.DDictValue convert(String id) {
         };
     }
 
-	public Converter<ItxProtocolProtocol, String> getItxProtocolProtocolToStringConverter() {
+    public Converter<ItxProtocolProtocol, String> getItxProtocolProtocolToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxProtocolProtocol, java.lang.String>() {
             public String convert(ItxProtocolProtocol itxProtocolProtocol) {
-                return new StringBuilder().append(itxProtocolProtocol.getLsType()).append(' ').append(itxProtocolProtocol.getLsKind()).append(' ').append(itxProtocolProtocol.getLsTypeAndKind()).append(' ').append(itxProtocolProtocol.getCodeName()).toString();
+                return new StringBuilder().append(itxProtocolProtocol.getLsType()).append(' ')
+                        .append(itxProtocolProtocol.getLsKind()).append(' ')
+                        .append(itxProtocolProtocol.getLsTypeAndKind()).append(' ')
+                        .append(itxProtocolProtocol.getCodeName()).toString();
             }
         };
     }
 
-	public Converter<Long, ItxProtocolProtocol> getIdToItxProtocolProtocolConverter() {
+    public Converter<Long, ItxProtocolProtocol> getIdToItxProtocolProtocolConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxProtocolProtocol>() {
             public com.labsynch.labseer.domain.ItxProtocolProtocol convert(java.lang.Long id) {
                 return ItxProtocolProtocol.findItxProtocolProtocol(id);
@@ -2447,7 +2564,7 @@ public com.labsynch.labseer.domain.ItxProtocolProtocol convert(java.lang.Long id
         };
     }
 
-	public Converter<String, ItxProtocolProtocol> getStringToItxProtocolProtocolConverter() {
+    public Converter<String, ItxProtocolProtocol> getStringToItxProtocolProtocolConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxProtocolProtocol>() {
             public com.labsynch.labseer.domain.ItxProtocolProtocol convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ItxProtocolProtocol.class);
@@ -2455,15 +2572,18 @@ public com.labsynch.labseer.domain.ItxProtocolProtocol convert(String id) {
         };
     }
 
-	public Converter<ItxProtocolProtocolState, String> getItxProtocolProtocolStateToStringConverter() {
+    public Converter<ItxProtocolProtocolState, String> getItxProtocolProtocolStateToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxProtocolProtocolState, java.lang.String>() {
             public String convert(ItxProtocolProtocolState itxProtocolProtocolState) {
-                return new StringBuilder().append(itxProtocolProtocolState.getRecordedBy()).append(' ').append(itxProtocolProtocolState.getRecordedDate()).append(' ').append(itxProtocolProtocolState.getModifiedBy()).append(' ').append(itxProtocolProtocolState.getModifiedDate()).toString();
+                return new StringBuilder().append(itxProtocolProtocolState.getRecordedBy()).append(' ')
+                        .append(itxProtocolProtocolState.getRecordedDate()).append(' ')
+                        .append(itxProtocolProtocolState.getModifiedBy()).append(' ')
+                        .append(itxProtocolProtocolState.getModifiedDate()).toString();
             }
         };
     }
 
-	public Converter<Long, ItxProtocolProtocolState> getIdToItxProtocolProtocolStateConverter() {
+    public Converter<Long, ItxProtocolProtocolState> getIdToItxProtocolProtocolStateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxProtocolProtocolState>() {
             public com.labsynch.labseer.domain.ItxProtocolProtocolState convert(java.lang.Long id) {
                 return ItxProtocolProtocolState.findItxProtocolProtocolState(id);
@@ -2471,7 +2591,7 @@ public com.labsynch.labseer.domain.ItxProtocolProtocolState convert(java.lang.Lo
         };
     }
 
-	public Converter<String, ItxProtocolProtocolState> getStringToItxProtocolProtocolStateConverter() {
+    public Converter<String, ItxProtocolProtocolState> getStringToItxProtocolProtocolStateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxProtocolProtocolState>() {
             public com.labsynch.labseer.domain.ItxProtocolProtocolState convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ItxProtocolProtocolState.class);
@@ -2479,15 +2599,18 @@ public com.labsynch.labseer.domain.ItxProtocolProtocolState convert(String id) {
         };
     }
 
-	public Converter<ItxProtocolProtocolValue, String> getItxProtocolProtocolValueToStringConverter() {
+    public Converter<ItxProtocolProtocolValue, String> getItxProtocolProtocolValueToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxProtocolProtocolValue, java.lang.String>() {
             public String convert(ItxProtocolProtocolValue itxProtocolProtocolValue) {
-                return new StringBuilder().append(itxProtocolProtocolValue.getLsType()).append(' ').append(itxProtocolProtocolValue.getLsKind()).append(' ').append(itxProtocolProtocolValue.getLsTypeAndKind()).append(' ').append(itxProtocolProtocolValue.getCodeType()).toString();
+                return new StringBuilder().append(itxProtocolProtocolValue.getLsType()).append(' ')
+                        .append(itxProtocolProtocolValue.getLsKind()).append(' ')
+                        .append(itxProtocolProtocolValue.getLsTypeAndKind()).append(' ')
+                        .append(itxProtocolProtocolValue.getCodeType()).toString();
             }
         };
     }
 
-	public Converter<Long, ItxProtocolProtocolValue> getIdToItxProtocolProtocolValueConverter() {
+    public Converter<Long, ItxProtocolProtocolValue> getIdToItxProtocolProtocolValueConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxProtocolProtocolValue>() {
             public com.labsynch.labseer.domain.ItxProtocolProtocolValue convert(java.lang.Long id) {
                 return ItxProtocolProtocolValue.findItxProtocolProtocolValue(id);
@@ -2495,7 +2618,7 @@ public com.labsynch.labseer.domain.ItxProtocolProtocolValue convert(java.lang.Lo
         };
     }
 
-	public Converter<String, ItxProtocolProtocolValue> getStringToItxProtocolProtocolValueConverter() {
+    public Converter<String, ItxProtocolProtocolValue> getStringToItxProtocolProtocolValueConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxProtocolProtocolValue>() {
             public com.labsynch.labseer.domain.ItxProtocolProtocolValue convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ItxProtocolProtocolValue.class);
@@ -2503,7 +2626,7 @@ public com.labsynch.labseer.domain.ItxProtocolProtocolValue convert(String id) {
         };
     }
 
-	public Converter<Long, LsRole> getIdToLsRoleConverter() {
+    public Converter<Long, LsRole> getIdToLsRoleConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsRole>() {
             public com.labsynch.labseer.domain.LsRole convert(java.lang.Long id) {
                 return LsRole.findLsRole(id);
@@ -2511,7 +2634,7 @@ public com.labsynch.labseer.domain.LsRole convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, LsRole> getStringToLsRoleConverter() {
+    public Converter<String, LsRole> getStringToLsRoleConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsRole>() {
             public com.labsynch.labseer.domain.LsRole convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), LsRole.class);
@@ -2519,15 +2642,17 @@ public com.labsynch.labseer.domain.LsRole convert(String id) {
         };
     }
 
-	public Converter<LsThing, String> getLsThingToStringConverter() {
+    public Converter<LsThing, String> getLsThingToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsThing, java.lang.String>() {
             public String convert(LsThing lsThing) {
-                return new StringBuilder().append(lsThing.getLsType()).append(' ').append(lsThing.getLsKind()).append(' ').append(lsThing.getLsTypeAndKind()).append(' ').append(lsThing.getCodeName()).toString();
+                return new StringBuilder().append(lsThing.getLsType()).append(' ').append(lsThing.getLsKind())
+                        .append(' ').append(lsThing.getLsTypeAndKind()).append(' ').append(lsThing.getCodeName())
+                        .toString();
             }
         };
     }
 
-	public Converter<Long, LsThing> getIdToLsThingConverter() {
+    public Converter<Long, LsThing> getIdToLsThingConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsThing>() {
             public com.labsynch.labseer.domain.LsThing convert(java.lang.Long id) {
                 return LsThing.findLsThing(id);
@@ -2535,7 +2660,7 @@ public com.labsynch.labseer.domain.LsThing convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, LsThing> getStringToLsThingConverter() {
+    public Converter<String, LsThing> getStringToLsThingConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsThing>() {
             public com.labsynch.labseer.domain.LsThing convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), LsThing.class);
@@ -2543,15 +2668,17 @@ public com.labsynch.labseer.domain.LsThing convert(String id) {
         };
     }
 
-	public Converter<LsThingLabel, String> getLsThingLabelToStringConverter() {
+    public Converter<LsThingLabel, String> getLsThingLabelToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsThingLabel, java.lang.String>() {
             public String convert(LsThingLabel lsThingLabel) {
-                return new StringBuilder().append(lsThingLabel.getLabelText()).append(' ').append(lsThingLabel.getRecordedBy()).append(' ').append(lsThingLabel.getRecordedDate()).append(' ').append(lsThingLabel.getModifiedDate()).toString();
+                return new StringBuilder().append(lsThingLabel.getLabelText()).append(' ')
+                        .append(lsThingLabel.getRecordedBy()).append(' ').append(lsThingLabel.getRecordedDate())
+                        .append(' ').append(lsThingLabel.getModifiedDate()).toString();
             }
         };
     }
 
-	public Converter<Long, LsThingLabel> getIdToLsThingLabelConverter() {
+    public Converter<Long, LsThingLabel> getIdToLsThingLabelConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsThingLabel>() {
             public com.labsynch.labseer.domain.LsThingLabel convert(java.lang.Long id) {
                 return LsThingLabel.findLsThingLabel(id);
@@ -2559,7 +2686,7 @@ public com.labsynch.labseer.domain.LsThingLabel convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, LsThingLabel> getStringToLsThingLabelConverter() {
+    public Converter<String, LsThingLabel> getStringToLsThingLabelConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsThingLabel>() {
             public com.labsynch.labseer.domain.LsThingLabel convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), LsThingLabel.class);
@@ -2567,15 +2694,17 @@ public com.labsynch.labseer.domain.LsThingLabel convert(String id) {
         };
     }
 
-	public Converter<LsThingState, String> getLsThingStateToStringConverter() {
+    public Converter<LsThingState, String> getLsThingStateToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsThingState, java.lang.String>() {
             public String convert(LsThingState lsThingState) {
-                return new StringBuilder().append(lsThingState.getRecordedBy()).append(' ').append(lsThingState.getRecordedDate()).append(' ').append(lsThingState.getModifiedBy()).append(' ').append(lsThingState.getModifiedDate()).toString();
+                return new StringBuilder().append(lsThingState.getRecordedBy()).append(' ')
+                        .append(lsThingState.getRecordedDate()).append(' ').append(lsThingState.getModifiedBy())
+                        .append(' ').append(lsThingState.getModifiedDate()).toString();
             }
         };
     }
 
-	public Converter<Long, LsThingState> getIdToLsThingStateConverter() {
+    public Converter<Long, LsThingState> getIdToLsThingStateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsThingState>() {
             public com.labsynch.labseer.domain.LsThingState convert(java.lang.Long id) {
                 return LsThingState.findLsThingState(id);
@@ -2583,7 +2712,7 @@ public com.labsynch.labseer.domain.LsThingState convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, LsThingState> getStringToLsThingStateConverter() {
+    public Converter<String, LsThingState> getStringToLsThingStateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsThingState>() {
             public com.labsynch.labseer.domain.LsThingState convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), LsThingState.class);
@@ -2591,15 +2720,17 @@ public com.labsynch.labseer.domain.LsThingState convert(String id) {
         };
     }
 
-	public Converter<LsThingValue, String> getLsThingValueToStringConverter() {
+    public Converter<LsThingValue, String> getLsThingValueToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsThingValue, java.lang.String>() {
             public String convert(LsThingValue lsThingValue) {
-                return new StringBuilder().append(lsThingValue.getLsType()).append(' ').append(lsThingValue.getLsKind()).append(' ').append(lsThingValue.getLsTypeAndKind()).append(' ').append(lsThingValue.getCodeType()).toString();
+                return new StringBuilder().append(lsThingValue.getLsType()).append(' ').append(lsThingValue.getLsKind())
+                        .append(' ').append(lsThingValue.getLsTypeAndKind()).append(' ')
+                        .append(lsThingValue.getCodeType()).toString();
             }
         };
     }
 
-	public Converter<Long, LsThingValue> getIdToLsThingValueConverter() {
+    public Converter<Long, LsThingValue> getIdToLsThingValueConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsThingValue>() {
             public com.labsynch.labseer.domain.LsThingValue convert(java.lang.Long id) {
                 return LsThingValue.findLsThingValue(id);
@@ -2607,7 +2738,7 @@ public com.labsynch.labseer.domain.LsThingValue convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, LsThingValue> getStringToLsThingValueConverter() {
+    public Converter<String, LsThingValue> getStringToLsThingValueConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsThingValue>() {
             public com.labsynch.labseer.domain.LsThingValue convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), LsThingValue.class);
@@ -2615,14 +2746,14 @@ public com.labsynch.labseer.domain.LsThingValue convert(String id) {
         };
     }
 
-	public Converter<Long, LsTransaction> getIdToLsTransactionConverter() {
+    public Converter<Long, LsTransaction> getIdToLsTransactionConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsTransaction>() {
             public com.labsynch.labseer.domain.LsTransaction convert(java.lang.Long id) {
                 return LsTransaction.findLsTransaction(id);
             }
         };
     }
-    
+
     public Converter<CompoundType, String> getCompoundTypeToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.CompoundType, java.lang.String>() {
             public String convert(CompoundType compoundType) {
@@ -2631,7 +2762,7 @@ public String convert(CompoundType compoundType) {
         };
     }
 
-	public Converter<Long, CompoundType> getIdToCompoundTypeConverter() {
+    public Converter<Long, CompoundType> getIdToCompoundTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.CompoundType>() {
             public com.labsynch.labseer.domain.CompoundType convert(java.lang.Long id) {
                 return CompoundType.findCompoundType(id);
@@ -2639,7 +2770,7 @@ public com.labsynch.labseer.domain.CompoundType convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, CompoundType> getStringToCompoundTypeConverter() {
+    public Converter<String, CompoundType> getStringToCompoundTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.CompoundType>() {
             public com.labsynch.labseer.domain.CompoundType convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), CompoundType.class);
@@ -2647,15 +2778,16 @@ public com.labsynch.labseer.domain.CompoundType convert(String id) {
         };
     }
 
-	public Converter<LotAlias, String> getLotAliasToStringConverter() {
+    public Converter<LotAlias, String> getLotAliasToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LotAlias, java.lang.String>() {
             public String convert(LotAlias lotAlias) {
-                return new StringBuilder().append(lotAlias.getLsType()).append(' ').append(lotAlias.getLsKind()).append(' ').append(lotAlias.getAliasName()).toString();
+                return new StringBuilder().append(lotAlias.getLsType()).append(' ').append(lotAlias.getLsKind())
+                        .append(' ').append(lotAlias.getAliasName()).toString();
             }
         };
     }
 
-	public Converter<Long, LotAlias> getIdToLotAliasConverter() {
+    public Converter<Long, LotAlias> getIdToLotAliasConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LotAlias>() {
             public com.labsynch.labseer.domain.LotAlias convert(java.lang.Long id) {
                 return LotAlias.findLotAlias(id);
@@ -2663,7 +2795,7 @@ public com.labsynch.labseer.domain.LotAlias convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, LotAlias> getStringToLotAliasConverter() {
+    public Converter<String, LotAlias> getStringToLotAliasConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LotAlias>() {
             public com.labsynch.labseer.domain.LotAlias convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), LotAlias.class);
@@ -2671,7 +2803,7 @@ public com.labsynch.labseer.domain.LotAlias convert(String id) {
         };
     }
 
-	public Converter<LotAliasKind, String> getLotAliasKindToStringConverter() {
+    public Converter<LotAliasKind, String> getLotAliasKindToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LotAliasKind, java.lang.String>() {
             public String convert(LotAliasKind lotAliasKind) {
                 return new StringBuilder().append(lotAliasKind.getKindName()).toString();
@@ -2679,7 +2811,7 @@ public String convert(LotAliasKind lotAliasKind) {
         };
     }
 
-	public Converter<Long, LotAliasKind> getIdToLotAliasKindConverter() {
+    public Converter<Long, LotAliasKind> getIdToLotAliasKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LotAliasKind>() {
             public com.labsynch.labseer.domain.LotAliasKind convert(java.lang.Long id) {
                 return LotAliasKind.findLotAliasKind(id);
@@ -2687,7 +2819,7 @@ public com.labsynch.labseer.domain.LotAliasKind convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, LotAliasKind> getStringToLotAliasKindConverter() {
+    public Converter<String, LotAliasKind> getStringToLotAliasKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LotAliasKind>() {
             public com.labsynch.labseer.domain.LotAliasKind convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), LotAliasKind.class);
@@ -2695,7 +2827,7 @@ public com.labsynch.labseer.domain.LotAliasKind convert(String id) {
         };
     }
 
-	public Converter<LotAliasType, String> getLotAliasTypeToStringConverter() {
+    public Converter<LotAliasType, String> getLotAliasTypeToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LotAliasType, java.lang.String>() {
             public String convert(LotAliasType lotAliasType) {
                 return new StringBuilder().append(lotAliasType.getTypeName()).toString();
@@ -2703,7 +2835,7 @@ public String convert(LotAliasType lotAliasType) {
         };
     }
 
-	public Converter<Long, LotAliasType> getIdToLotAliasTypeConverter() {
+    public Converter<Long, LotAliasType> getIdToLotAliasTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LotAliasType>() {
             public com.labsynch.labseer.domain.LotAliasType convert(java.lang.Long id) {
                 return LotAliasType.findLotAliasType(id);
@@ -2711,7 +2843,7 @@ public com.labsynch.labseer.domain.LotAliasType convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, LotAliasType> getStringToLotAliasTypeConverter() {
+    public Converter<String, LotAliasType> getStringToLotAliasTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LotAliasType>() {
             public com.labsynch.labseer.domain.LotAliasType convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), LotAliasType.class);
@@ -2719,15 +2851,17 @@ public com.labsynch.labseer.domain.LotAliasType convert(String id) {
         };
     }
 
-	public Converter<ParentAlias, String> getParentAliasToStringConverter() {
+    public Converter<ParentAlias, String> getParentAliasToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ParentAlias, java.lang.String>() {
             public String convert(ParentAlias parentAlias) {
-                return new StringBuilder().append(parentAlias.getLsType()).append(' ').append(parentAlias.getLsKind()).append(' ').append(parentAlias.getAliasName()).append(' ').append(parentAlias.getSortId()).toString();
+                return new StringBuilder().append(parentAlias.getLsType()).append(' ').append(parentAlias.getLsKind())
+                        .append(' ').append(parentAlias.getAliasName()).append(' ').append(parentAlias.getSortId())
+                        .toString();
             }
         };
     }
 
-	public Converter<Long, ParentAlias> getIdToParentAliasConverter() {
+    public Converter<Long, ParentAlias> getIdToParentAliasConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ParentAlias>() {
             public com.labsynch.labseer.domain.ParentAlias convert(java.lang.Long id) {
                 return ParentAlias.findParentAlias(id);
@@ -2735,7 +2869,7 @@ public com.labsynch.labseer.domain.ParentAlias convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, ParentAlias> getStringToParentAliasConverter() {
+    public Converter<String, ParentAlias> getStringToParentAliasConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ParentAlias>() {
             public com.labsynch.labseer.domain.ParentAlias convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ParentAlias.class);
@@ -2743,7 +2877,7 @@ public com.labsynch.labseer.domain.ParentAlias convert(String id) {
         };
     }
 
-	public Converter<ParentAliasKind, String> getParentAliasKindToStringConverter() {
+    public Converter<ParentAliasKind, String> getParentAliasKindToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ParentAliasKind, java.lang.String>() {
             public String convert(ParentAliasKind parentAliasKind) {
                 return new StringBuilder().append(parentAliasKind.getKindName()).toString();
@@ -2751,7 +2885,7 @@ public String convert(ParentAliasKind parentAliasKind) {
         };
     }
 
-	public Converter<Long, ParentAliasKind> getIdToParentAliasKindConverter() {
+    public Converter<Long, ParentAliasKind> getIdToParentAliasKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ParentAliasKind>() {
             public com.labsynch.labseer.domain.ParentAliasKind convert(java.lang.Long id) {
                 return ParentAliasKind.findParentAliasKind(id);
@@ -2759,7 +2893,7 @@ public com.labsynch.labseer.domain.ParentAliasKind convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, ParentAliasKind> getStringToParentAliasKindConverter() {
+    public Converter<String, ParentAliasKind> getStringToParentAliasKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ParentAliasKind>() {
             public com.labsynch.labseer.domain.ParentAliasKind convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ParentAliasKind.class);
@@ -2767,7 +2901,7 @@ public com.labsynch.labseer.domain.ParentAliasKind convert(String id) {
         };
     }
 
-	public Converter<Long, ParentAliasType> getIdToParentAliasTypeConverter() {
+    public Converter<Long, ParentAliasType> getIdToParentAliasTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ParentAliasType>() {
             public com.labsynch.labseer.domain.ParentAliasType convert(java.lang.Long id) {
                 return ParentAliasType.findParentAliasType(id);
@@ -2775,7 +2909,7 @@ public com.labsynch.labseer.domain.ParentAliasType convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, ParentAliasType> getStringToParentAliasTypeConverter() {
+    public Converter<String, ParentAliasType> getStringToParentAliasTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ParentAliasType>() {
             public com.labsynch.labseer.domain.ParentAliasType convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ParentAliasType.class);
@@ -2783,15 +2917,17 @@ public com.labsynch.labseer.domain.ParentAliasType convert(String id) {
         };
     }
 
-	public Converter<ParentAnnotation, String> getParentAnnotationToStringConverter() {
+    public Converter<ParentAnnotation, String> getParentAnnotationToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ParentAnnotation, java.lang.String>() {
             public String convert(ParentAnnotation parentAnnotation) {
-                return new StringBuilder().append(parentAnnotation.getCode()).append(' ').append(parentAnnotation.getName()).append(' ').append(parentAnnotation.getDisplayOrder()).append(' ').append(parentAnnotation.getComment()).toString();
+                return new StringBuilder().append(parentAnnotation.getCode()).append(' ')
+                        .append(parentAnnotation.getName()).append(' ').append(parentAnnotation.getDisplayOrder())
+                        .append(' ').append(parentAnnotation.getComment()).toString();
             }
         };
     }
 
-	public Converter<Long, ParentAnnotation> getIdToParentAnnotationConverter() {
+    public Converter<Long, ParentAnnotation> getIdToParentAnnotationConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ParentAnnotation>() {
             public com.labsynch.labseer.domain.ParentAnnotation convert(java.lang.Long id) {
                 return ParentAnnotation.findParentAnnotation(id);
@@ -2799,7 +2935,7 @@ public com.labsynch.labseer.domain.ParentAnnotation convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, ParentAnnotation> getStringToParentAnnotationConverter() {
+    public Converter<String, ParentAnnotation> getStringToParentAnnotationConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ParentAnnotation>() {
             public com.labsynch.labseer.domain.ParentAnnotation convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ParentAnnotation.class);
@@ -2807,15 +2943,17 @@ public com.labsynch.labseer.domain.ParentAnnotation convert(String id) {
         };
     }
 
-	public Converter<AuthorLabel, String> getAuthorLabelToStringConverter() {
+    public Converter<AuthorLabel, String> getAuthorLabelToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.AuthorLabel, java.lang.String>() {
             public String convert(AuthorLabel authorLabel) {
-                return new StringBuilder().append(authorLabel.getLabelText()).append(' ').append(authorLabel.getRecordedBy()).append(' ').append(authorLabel.getRecordedDate()).append(' ').append(authorLabel.getModifiedDate()).toString();
+                return new StringBuilder().append(authorLabel.getLabelText()).append(' ')
+                        .append(authorLabel.getRecordedBy()).append(' ').append(authorLabel.getRecordedDate())
+                        .append(' ').append(authorLabel.getModifiedDate()).toString();
             }
         };
     }
 
-	public Converter<Long, AuthorLabel> getIdToAuthorLabelConverter() {
+    public Converter<Long, AuthorLabel> getIdToAuthorLabelConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.AuthorLabel>() {
             public com.labsynch.labseer.domain.AuthorLabel convert(java.lang.Long id) {
                 return AuthorLabel.findAuthorLabel(id);
@@ -2823,7 +2961,7 @@ public com.labsynch.labseer.domain.AuthorLabel convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, AuthorLabel> getStringToAuthorLabelConverter() {
+    public Converter<String, AuthorLabel> getStringToAuthorLabelConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.AuthorLabel>() {
             public com.labsynch.labseer.domain.AuthorLabel convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), AuthorLabel.class);
@@ -2831,15 +2969,17 @@ public com.labsynch.labseer.domain.AuthorLabel convert(String id) {
         };
     }
 
-	public Converter<AuthorState, String> getAuthorStateToStringConverter() {
+    public Converter<AuthorState, String> getAuthorStateToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.AuthorState, java.lang.String>() {
             public String convert(AuthorState authorState) {
-                return new StringBuilder().append(authorState.getRecordedBy()).append(' ').append(authorState.getRecordedDate()).append(' ').append(authorState.getModifiedBy()).append(' ').append(authorState.getModifiedDate()).toString();
+                return new StringBuilder().append(authorState.getRecordedBy()).append(' ')
+                        .append(authorState.getRecordedDate()).append(' ').append(authorState.getModifiedBy())
+                        .append(' ').append(authorState.getModifiedDate()).toString();
             }
         };
     }
 
-	public Converter<Long, AuthorState> getIdToAuthorStateConverter() {
+    public Converter<Long, AuthorState> getIdToAuthorStateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.AuthorState>() {
             public com.labsynch.labseer.domain.AuthorState convert(java.lang.Long id) {
                 return AuthorState.findAuthorState(id);
@@ -2847,7 +2987,7 @@ public com.labsynch.labseer.domain.AuthorState convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, AuthorState> getStringToAuthorStateConverter() {
+    public Converter<String, AuthorState> getStringToAuthorStateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.AuthorState>() {
             public com.labsynch.labseer.domain.AuthorState convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), AuthorState.class);
@@ -2855,15 +2995,17 @@ public com.labsynch.labseer.domain.AuthorState convert(String id) {
         };
     }
 
-	public Converter<AuthorValue, String> getAuthorValueToStringConverter() {
+    public Converter<AuthorValue, String> getAuthorValueToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.AuthorValue, java.lang.String>() {
             public String convert(AuthorValue authorValue) {
-                return new StringBuilder().append(authorValue.getLsType()).append(' ').append(authorValue.getLsKind()).append(' ').append(authorValue.getLsTypeAndKind()).append(' ').append(authorValue.getCodeOrigin()).toString();
+                return new StringBuilder().append(authorValue.getLsType()).append(' ').append(authorValue.getLsKind())
+                        .append(' ').append(authorValue.getLsTypeAndKind()).append(' ')
+                        .append(authorValue.getCodeOrigin()).toString();
             }
         };
     }
 
-	public Converter<Long, AuthorValue> getIdToAuthorValueConverter() {
+    public Converter<Long, AuthorValue> getIdToAuthorValueConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.AuthorValue>() {
             public com.labsynch.labseer.domain.AuthorValue convert(java.lang.Long id) {
                 return AuthorValue.findAuthorValue(id);
@@ -2871,7 +3013,7 @@ public com.labsynch.labseer.domain.AuthorValue convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, AuthorValue> getStringToAuthorValueConverter() {
+    public Converter<String, AuthorValue> getStringToAuthorValueConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.AuthorValue>() {
             public com.labsynch.labseer.domain.AuthorValue convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), AuthorValue.class);
@@ -2879,15 +3021,17 @@ public com.labsynch.labseer.domain.AuthorValue convert(String id) {
         };
     }
 
-	public Converter<BulkLoadTemplate, String> getBulkLoadTemplateToStringConverter() {
+    public Converter<BulkLoadTemplate, String> getBulkLoadTemplateToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.BulkLoadTemplate, java.lang.String>() {
             public String convert(BulkLoadTemplate bulkLoadTemplate) {
-                return new StringBuilder().append(bulkLoadTemplate.getTemplateName()).append(' ').append(bulkLoadTemplate.getJsonTemplate()).append(' ').append(bulkLoadTemplate.getRecordedBy()).toString();
+                return new StringBuilder().append(bulkLoadTemplate.getTemplateName()).append(' ')
+                        .append(bulkLoadTemplate.getJsonTemplate()).append(' ').append(bulkLoadTemplate.getRecordedBy())
+                        .toString();
             }
         };
     }
 
-	public Converter<Long, BulkLoadTemplate> getIdToBulkLoadTemplateConverter() {
+    public Converter<Long, BulkLoadTemplate> getIdToBulkLoadTemplateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.BulkLoadTemplate>() {
             public com.labsynch.labseer.domain.BulkLoadTemplate convert(java.lang.Long id) {
                 return BulkLoadTemplate.findBulkLoadTemplate(id);
@@ -2895,7 +3039,7 @@ public com.labsynch.labseer.domain.BulkLoadTemplate convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, BulkLoadTemplate> getStringToBulkLoadTemplateConverter() {
+    public Converter<String, BulkLoadTemplate> getStringToBulkLoadTemplateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.BulkLoadTemplate>() {
             public com.labsynch.labseer.domain.BulkLoadTemplate convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), BulkLoadTemplate.class);
@@ -2903,7 +3047,7 @@ public com.labsynch.labseer.domain.BulkLoadTemplate convert(String id) {
         };
     }
 
-	public Converter<CodeOrigin, String> getCodeOriginToStringConverter() {
+    public Converter<CodeOrigin, String> getCodeOriginToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.CodeOrigin, java.lang.String>() {
             public String convert(CodeOrigin codeOrigin) {
                 return new StringBuilder().append(codeOrigin.getName()).toString();
@@ -2911,7 +3055,7 @@ public String convert(CodeOrigin codeOrigin) {
         };
     }
 
-	public Converter<Long, CodeOrigin> getIdToCodeOriginConverter() {
+    public Converter<Long, CodeOrigin> getIdToCodeOriginConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.CodeOrigin>() {
             public com.labsynch.labseer.domain.CodeOrigin convert(java.lang.Long id) {
                 return CodeOrigin.findCodeOrigin(id);
@@ -2919,7 +3063,7 @@ public com.labsynch.labseer.domain.CodeOrigin convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, CodeOrigin> getStringToCodeOriginConverter() {
+    public Converter<String, CodeOrigin> getStringToCodeOriginConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.CodeOrigin>() {
             public com.labsynch.labseer.domain.CodeOrigin convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), CodeOrigin.class);
@@ -2927,15 +3071,17 @@ public com.labsynch.labseer.domain.CodeOrigin convert(String id) {
         };
     }
 
-	public Converter<Compound, String> getCompoundToStringConverter() {
+    public Converter<Compound, String> getCompoundToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.Compound, java.lang.String>() {
             public String convert(Compound compound) {
-                return new StringBuilder().append(compound.getCorpName()).append(' ').append(compound.getExternal_id()).append(' ').append(compound.getCdId()).append(' ').append(compound.getCreatedDate()).toString();
+                return new StringBuilder().append(compound.getCorpName()).append(' ').append(compound.getExternal_id())
+                        .append(' ').append(compound.getCdId()).append(' ').append(compound.getCreatedDate())
+                        .toString();
             }
         };
     }
 
-	public Converter<Long, Compound> getIdToCompoundConverter() {
+    public Converter<Long, Compound> getIdToCompoundConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.Compound>() {
             public com.labsynch.labseer.domain.Compound convert(java.lang.Long id) {
                 return Compound.findCompound(id);
@@ -2943,7 +3089,7 @@ public com.labsynch.labseer.domain.Compound convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, Compound> getStringToCompoundConverter() {
+    public Converter<String, Compound> getStringToCompoundConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.Compound>() {
             public com.labsynch.labseer.domain.Compound convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), Compound.class);
@@ -2951,15 +3097,17 @@ public com.labsynch.labseer.domain.Compound convert(String id) {
         };
     }
 
-	public Converter<CronJob, String> getCronJobToStringConverter() {
+    public Converter<CronJob, String> getCronJobToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.CronJob, java.lang.String>() {
             public String convert(CronJob cronJob) {
-                return new StringBuilder().append(cronJob.getSchedule()).append(' ').append(cronJob.getScriptType()).append(' ').append(cronJob.getScriptFile()).append(' ').append(cronJob.getFunctionName()).toString();
+                return new StringBuilder().append(cronJob.getSchedule()).append(' ').append(cronJob.getScriptType())
+                        .append(' ').append(cronJob.getScriptFile()).append(' ').append(cronJob.getFunctionName())
+                        .toString();
             }
         };
     }
 
-	public Converter<Long, CronJob> getIdToCronJobConverter() {
+    public Converter<Long, CronJob> getIdToCronJobConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.CronJob>() {
             public com.labsynch.labseer.domain.CronJob convert(java.lang.Long id) {
                 return CronJob.findCronJob(id);
@@ -2967,7 +3115,7 @@ public com.labsynch.labseer.domain.CronJob convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, CronJob> getStringToCronJobConverter() {
+    public Converter<String, CronJob> getStringToCronJobConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.CronJob>() {
             public com.labsynch.labseer.domain.CronJob convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), CronJob.class);
@@ -2975,15 +3123,16 @@ public com.labsynch.labseer.domain.CronJob convert(String id) {
         };
     }
 
-	public Converter<IsoSalt, String> getIsoSaltToStringConverter() {
+    public Converter<IsoSalt, String> getIsoSaltToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.IsoSalt, java.lang.String>() {
             public String convert(IsoSalt isoSalt) {
-                return new StringBuilder().append(isoSalt.getType()).append(' ').append(isoSalt.getEquivalents()).toString();
+                return new StringBuilder().append(isoSalt.getType()).append(' ').append(isoSalt.getEquivalents())
+                        .toString();
             }
         };
     }
 
-	public Converter<Long, IsoSalt> getIdToIsoSaltConverter() {
+    public Converter<Long, IsoSalt> getIdToIsoSaltConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.IsoSalt>() {
             public com.labsynch.labseer.domain.IsoSalt convert(java.lang.Long id) {
                 return IsoSalt.findIsoSalt(id);
@@ -2991,7 +3140,7 @@ public com.labsynch.labseer.domain.IsoSalt convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, IsoSalt> getStringToIsoSaltConverter() {
+    public Converter<String, IsoSalt> getStringToIsoSaltConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.IsoSalt>() {
             public com.labsynch.labseer.domain.IsoSalt convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), IsoSalt.class);
@@ -2999,15 +3148,18 @@ public com.labsynch.labseer.domain.IsoSalt convert(String id) {
         };
     }
 
-	public Converter<ItxExperimentExperiment, String> getItxExperimentExperimentToStringConverter() {
+    public Converter<ItxExperimentExperiment, String> getItxExperimentExperimentToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxExperimentExperiment, java.lang.String>() {
             public String convert(ItxExperimentExperiment itxExperimentExperiment) {
-                return new StringBuilder().append(itxExperimentExperiment.getLsType()).append(' ').append(itxExperimentExperiment.getLsKind()).append(' ').append(itxExperimentExperiment.getLsTypeAndKind()).append(' ').append(itxExperimentExperiment.getCodeName()).toString();
+                return new StringBuilder().append(itxExperimentExperiment.getLsType()).append(' ')
+                        .append(itxExperimentExperiment.getLsKind()).append(' ')
+                        .append(itxExperimentExperiment.getLsTypeAndKind()).append(' ')
+                        .append(itxExperimentExperiment.getCodeName()).toString();
             }
         };
     }
 
-	public Converter<Long, ItxExperimentExperiment> getIdToItxExperimentExperimentConverter() {
+    public Converter<Long, ItxExperimentExperiment> getIdToItxExperimentExperimentConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxExperimentExperiment>() {
             public com.labsynch.labseer.domain.ItxExperimentExperiment convert(java.lang.Long id) {
                 return ItxExperimentExperiment.findItxExperimentExperiment(id);
@@ -3015,7 +3167,7 @@ public com.labsynch.labseer.domain.ItxExperimentExperiment convert(java.lang.Lon
         };
     }
 
-	public Converter<String, ItxExperimentExperiment> getStringToItxExperimentExperimentConverter() {
+    public Converter<String, ItxExperimentExperiment> getStringToItxExperimentExperimentConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxExperimentExperiment>() {
             public com.labsynch.labseer.domain.ItxExperimentExperiment convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ItxExperimentExperiment.class);
@@ -3023,15 +3175,18 @@ public com.labsynch.labseer.domain.ItxExperimentExperiment convert(String id) {
         };
     }
 
-	public Converter<ItxExperimentExperimentState, String> getItxExperimentExperimentStateToStringConverter() {
+    public Converter<ItxExperimentExperimentState, String> getItxExperimentExperimentStateToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxExperimentExperimentState, java.lang.String>() {
             public String convert(ItxExperimentExperimentState itxExperimentExperimentState) {
-                return new StringBuilder().append(itxExperimentExperimentState.getRecordedBy()).append(' ').append(itxExperimentExperimentState.getRecordedDate()).append(' ').append(itxExperimentExperimentState.getModifiedBy()).append(' ').append(itxExperimentExperimentState.getModifiedDate()).toString();
+                return new StringBuilder().append(itxExperimentExperimentState.getRecordedBy()).append(' ')
+                        .append(itxExperimentExperimentState.getRecordedDate()).append(' ')
+                        .append(itxExperimentExperimentState.getModifiedBy()).append(' ')
+                        .append(itxExperimentExperimentState.getModifiedDate()).toString();
             }
         };
     }
 
-	public Converter<Long, ItxExperimentExperimentState> getIdToItxExperimentExperimentStateConverter() {
+    public Converter<Long, ItxExperimentExperimentState> getIdToItxExperimentExperimentStateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxExperimentExperimentState>() {
             public com.labsynch.labseer.domain.ItxExperimentExperimentState convert(java.lang.Long id) {
                 return ItxExperimentExperimentState.findItxExperimentExperimentState(id);
@@ -3039,7 +3194,7 @@ public com.labsynch.labseer.domain.ItxExperimentExperimentState convert(java.lan
         };
     }
 
-	public Converter<String, ItxExperimentExperimentState> getStringToItxExperimentExperimentStateConverter() {
+    public Converter<String, ItxExperimentExperimentState> getStringToItxExperimentExperimentStateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxExperimentExperimentState>() {
             public com.labsynch.labseer.domain.ItxExperimentExperimentState convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ItxExperimentExperimentState.class);
@@ -3047,15 +3202,18 @@ public com.labsynch.labseer.domain.ItxExperimentExperimentState convert(String i
         };
     }
 
-	public Converter<ItxExperimentExperimentValue, String> getItxExperimentExperimentValueToStringConverter() {
+    public Converter<ItxExperimentExperimentValue, String> getItxExperimentExperimentValueToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxExperimentExperimentValue, java.lang.String>() {
             public String convert(ItxExperimentExperimentValue itxExperimentExperimentValue) {
-                return new StringBuilder().append(itxExperimentExperimentValue.getLsType()).append(' ').append(itxExperimentExperimentValue.getLsKind()).append(' ').append(itxExperimentExperimentValue.getLsTypeAndKind()).append(' ').append(itxExperimentExperimentValue.getCodeOrigin()).toString();
+                return new StringBuilder().append(itxExperimentExperimentValue.getLsType()).append(' ')
+                        .append(itxExperimentExperimentValue.getLsKind()).append(' ')
+                        .append(itxExperimentExperimentValue.getLsTypeAndKind()).append(' ')
+                        .append(itxExperimentExperimentValue.getCodeOrigin()).toString();
             }
         };
     }
 
-	public Converter<Long, ItxExperimentExperimentValue> getIdToItxExperimentExperimentValueConverter() {
+    public Converter<Long, ItxExperimentExperimentValue> getIdToItxExperimentExperimentValueConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxExperimentExperimentValue>() {
             public com.labsynch.labseer.domain.ItxExperimentExperimentValue convert(java.lang.Long id) {
                 return ItxExperimentExperimentValue.findItxExperimentExperimentValue(id);
@@ -3063,7 +3221,7 @@ public com.labsynch.labseer.domain.ItxExperimentExperimentValue convert(java.lan
         };
     }
 
-	public Converter<String, ItxExperimentExperimentValue> getStringToItxExperimentExperimentValueConverter() {
+    public Converter<String, ItxExperimentExperimentValue> getStringToItxExperimentExperimentValueConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxExperimentExperimentValue>() {
             public com.labsynch.labseer.domain.ItxExperimentExperimentValue convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ItxExperimentExperimentValue.class);
@@ -3071,15 +3229,17 @@ public com.labsynch.labseer.domain.ItxExperimentExperimentValue convert(String i
         };
     }
 
-	public Converter<ItxLsThingLsThing, String> getItxLsThingLsThingToStringConverter() {
+    public Converter<ItxLsThingLsThing, String> getItxLsThingLsThingToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxLsThingLsThing, java.lang.String>() {
             public String convert(ItxLsThingLsThing itxLsThingLsThing) {
-                return new StringBuilder().append(itxLsThingLsThing.getLsType()).append(' ').append(itxLsThingLsThing.getLsKind()).append(' ').append(itxLsThingLsThing.getLsTypeAndKind()).append(' ').append(itxLsThingLsThing.getCodeName()).toString();
+                return new StringBuilder().append(itxLsThingLsThing.getLsType()).append(' ')
+                        .append(itxLsThingLsThing.getLsKind()).append(' ').append(itxLsThingLsThing.getLsTypeAndKind())
+                        .append(' ').append(itxLsThingLsThing.getCodeName()).toString();
             }
         };
     }
 
-	public Converter<Long, ItxLsThingLsThing> getIdToItxLsThingLsThingConverter() {
+    public Converter<Long, ItxLsThingLsThing> getIdToItxLsThingLsThingConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxLsThingLsThing>() {
             public com.labsynch.labseer.domain.ItxLsThingLsThing convert(java.lang.Long id) {
                 return ItxLsThingLsThing.findItxLsThingLsThing(id);
@@ -3087,7 +3247,7 @@ public com.labsynch.labseer.domain.ItxLsThingLsThing convert(java.lang.Long id)
         };
     }
 
-	public Converter<String, ItxLsThingLsThing> getStringToItxLsThingLsThingConverter() {
+    public Converter<String, ItxLsThingLsThing> getStringToItxLsThingLsThingConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxLsThingLsThing>() {
             public com.labsynch.labseer.domain.ItxLsThingLsThing convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ItxLsThingLsThing.class);
@@ -3095,15 +3255,18 @@ public com.labsynch.labseer.domain.ItxLsThingLsThing convert(String id) {
         };
     }
 
-	public Converter<ItxLsThingLsThingState, String> getItxLsThingLsThingStateToStringConverter() {
+    public Converter<ItxLsThingLsThingState, String> getItxLsThingLsThingStateToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxLsThingLsThingState, java.lang.String>() {
             public String convert(ItxLsThingLsThingState itxLsThingLsThingState) {
-                return new StringBuilder().append(itxLsThingLsThingState.getRecordedBy()).append(' ').append(itxLsThingLsThingState.getRecordedDate()).append(' ').append(itxLsThingLsThingState.getModifiedBy()).append(' ').append(itxLsThingLsThingState.getModifiedDate()).toString();
+                return new StringBuilder().append(itxLsThingLsThingState.getRecordedBy()).append(' ')
+                        .append(itxLsThingLsThingState.getRecordedDate()).append(' ')
+                        .append(itxLsThingLsThingState.getModifiedBy()).append(' ')
+                        .append(itxLsThingLsThingState.getModifiedDate()).toString();
             }
         };
     }
 
-	public Converter<Long, ItxLsThingLsThingState> getIdToItxLsThingLsThingStateConverter() {
+    public Converter<Long, ItxLsThingLsThingState> getIdToItxLsThingLsThingStateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxLsThingLsThingState>() {
             public com.labsynch.labseer.domain.ItxLsThingLsThingState convert(java.lang.Long id) {
                 return ItxLsThingLsThingState.findItxLsThingLsThingState(id);
@@ -3111,7 +3274,7 @@ public com.labsynch.labseer.domain.ItxLsThingLsThingState convert(java.lang.Long
         };
     }
 
-	public Converter<String, ItxLsThingLsThingState> getStringToItxLsThingLsThingStateConverter() {
+    public Converter<String, ItxLsThingLsThingState> getStringToItxLsThingLsThingStateConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxLsThingLsThingState>() {
             public com.labsynch.labseer.domain.ItxLsThingLsThingState convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ItxLsThingLsThingState.class);
@@ -3119,15 +3282,18 @@ public com.labsynch.labseer.domain.ItxLsThingLsThingState convert(String id) {
         };
     }
 
-	public Converter<ItxLsThingLsThingValue, String> getItxLsThingLsThingValueToStringConverter() {
+    public Converter<ItxLsThingLsThingValue, String> getItxLsThingLsThingValueToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.ItxLsThingLsThingValue, java.lang.String>() {
             public String convert(ItxLsThingLsThingValue itxLsThingLsThingValue) {
-                return new StringBuilder().append(itxLsThingLsThingValue.getLsType()).append(' ').append(itxLsThingLsThingValue.getLsKind()).append(' ').append(itxLsThingLsThingValue.getLsTypeAndKind()).append(' ').append(itxLsThingLsThingValue.getCodeOrigin()).toString();
+                return new StringBuilder().append(itxLsThingLsThingValue.getLsType()).append(' ')
+                        .append(itxLsThingLsThingValue.getLsKind()).append(' ')
+                        .append(itxLsThingLsThingValue.getLsTypeAndKind()).append(' ')
+                        .append(itxLsThingLsThingValue.getCodeOrigin()).toString();
             }
         };
     }
 
-	public Converter<Long, ItxLsThingLsThingValue> getIdToItxLsThingLsThingValueConverter() {
+    public Converter<Long, ItxLsThingLsThingValue> getIdToItxLsThingLsThingValueConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.ItxLsThingLsThingValue>() {
             public com.labsynch.labseer.domain.ItxLsThingLsThingValue convert(java.lang.Long id) {
                 return ItxLsThingLsThingValue.findItxLsThingLsThingValue(id);
@@ -3135,7 +3301,7 @@ public com.labsynch.labseer.domain.ItxLsThingLsThingValue convert(java.lang.Long
         };
     }
 
-	public Converter<String, ItxLsThingLsThingValue> getStringToItxLsThingLsThingValueConverter() {
+    public Converter<String, ItxLsThingLsThingValue> getStringToItxLsThingLsThingValueConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.ItxLsThingLsThingValue>() {
             public com.labsynch.labseer.domain.ItxLsThingLsThingValue convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), ItxLsThingLsThingValue.class);
@@ -3143,7 +3309,7 @@ public com.labsynch.labseer.domain.ItxLsThingLsThingValue convert(String id) {
         };
     }
 
-	public Converter<LabelSequenceRole, String> getLabelSequenceRoleToStringConverter() {
+    public Converter<LabelSequenceRole, String> getLabelSequenceRoleToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LabelSequenceRole, java.lang.String>() {
             public String convert(LabelSequenceRole labelSequenceRole) {
                 return "(no displayable fields)";
@@ -3151,7 +3317,7 @@ public String convert(LabelSequenceRole labelSequenceRole) {
         };
     }
 
-	public Converter<Long, LabelSequenceRole> getIdToLabelSequenceRoleConverter() {
+    public Converter<Long, LabelSequenceRole> getIdToLabelSequenceRoleConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LabelSequenceRole>() {
             public com.labsynch.labseer.domain.LabelSequenceRole convert(java.lang.Long id) {
                 return LabelSequenceRole.findLabelSequenceRole(id);
@@ -3159,7 +3325,7 @@ public com.labsynch.labseer.domain.LabelSequenceRole convert(java.lang.Long id)
         };
     }
 
-	public Converter<String, LabelSequenceRole> getStringToLabelSequenceRoleConverter() {
+    public Converter<String, LabelSequenceRole> getStringToLabelSequenceRoleConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LabelSequenceRole>() {
             public com.labsynch.labseer.domain.LabelSequenceRole convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), LabelSequenceRole.class);
@@ -3167,15 +3333,17 @@ public com.labsynch.labseer.domain.LabelSequenceRole convert(String id) {
         };
     }
 
-	public Converter<Lot, String> getLotToStringConverter() {
+    public Converter<Lot, String> getLotToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.Lot, java.lang.String>() {
             public String convert(Lot lot) {
-                return new StringBuilder().append(lot.getStorageLocation()).append(' ').append(lot.getBuid()).append(' ').append(lot.getAsDrawnStruct()).append(' ').append(lot.getLotAsDrawnCdId()).toString();
+                return new StringBuilder().append(lot.getStorageLocation()).append(' ').append(lot.getBuid())
+                        .append(' ').append(lot.getAsDrawnStruct()).append(' ').append(lot.getLotAsDrawnCdId())
+                        .toString();
             }
         };
     }
 
-	public Converter<Long, Lot> getIdToLotConverter() {
+    public Converter<Long, Lot> getIdToLotConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.Lot>() {
             public com.labsynch.labseer.domain.Lot convert(java.lang.Long id) {
                 return Lot.findLot(id);
@@ -3183,7 +3351,7 @@ public com.labsynch.labseer.domain.Lot convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, Lot> getStringToLotConverter() {
+    public Converter<String, Lot> getStringToLotConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.Lot>() {
             public com.labsynch.labseer.domain.Lot convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), Lot.class);
@@ -3191,7 +3359,7 @@ public com.labsynch.labseer.domain.Lot convert(String id) {
         };
     }
 
-	public Converter<LsSeqAnlGrp, String> getLsSeqAnlGrpToStringConverter() {
+    public Converter<LsSeqAnlGrp, String> getLsSeqAnlGrpToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqAnlGrp, java.lang.String>() {
             public String convert(LsSeqAnlGrp lsSeqAnlGrp) {
                 return "(no displayable fields)";
@@ -3199,7 +3367,7 @@ public String convert(LsSeqAnlGrp lsSeqAnlGrp) {
         };
     }
 
-	public Converter<Long, LsSeqAnlGrp> getIdToLsSeqAnlGrpConverter() {
+    public Converter<Long, LsSeqAnlGrp> getIdToLsSeqAnlGrpConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqAnlGrp>() {
             public com.labsynch.labseer.domain.LsSeqAnlGrp convert(java.lang.Long id) {
                 return LsSeqAnlGrp.findLsSeqAnlGrp(id);
@@ -3207,7 +3375,7 @@ public com.labsynch.labseer.domain.LsSeqAnlGrp convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, LsSeqAnlGrp> getStringToLsSeqAnlGrpConverter() {
+    public Converter<String, LsSeqAnlGrp> getStringToLsSeqAnlGrpConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqAnlGrp>() {
             public com.labsynch.labseer.domain.LsSeqAnlGrp convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), LsSeqAnlGrp.class);
@@ -3215,7 +3383,7 @@ public com.labsynch.labseer.domain.LsSeqAnlGrp convert(String id) {
         };
     }
 
-	public Converter<LsSeqContainer, String> getLsSeqContainerToStringConverter() {
+    public Converter<LsSeqContainer, String> getLsSeqContainerToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqContainer, java.lang.String>() {
             public String convert(LsSeqContainer lsSeqContainer) {
                 return "(no displayable fields)";
@@ -3223,7 +3391,7 @@ public String convert(LsSeqContainer lsSeqContainer) {
         };
     }
 
-	public Converter<Long, LsSeqContainer> getIdToLsSeqContainerConverter() {
+    public Converter<Long, LsSeqContainer> getIdToLsSeqContainerConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqContainer>() {
             public com.labsynch.labseer.domain.LsSeqContainer convert(java.lang.Long id) {
                 return LsSeqContainer.findLsSeqContainer(id);
@@ -3231,7 +3399,7 @@ public com.labsynch.labseer.domain.LsSeqContainer convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, LsSeqContainer> getStringToLsSeqContainerConverter() {
+    public Converter<String, LsSeqContainer> getStringToLsSeqContainerConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqContainer>() {
             public com.labsynch.labseer.domain.LsSeqContainer convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), LsSeqContainer.class);
@@ -3239,7 +3407,7 @@ public com.labsynch.labseer.domain.LsSeqContainer convert(String id) {
         };
     }
 
-	public Converter<LsSeqExpt, String> getLsSeqExptToStringConverter() {
+    public Converter<LsSeqExpt, String> getLsSeqExptToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqExpt, java.lang.String>() {
             public String convert(LsSeqExpt lsSeqExpt) {
                 return "(no displayable fields)";
@@ -3247,7 +3415,7 @@ public String convert(LsSeqExpt lsSeqExpt) {
         };
     }
 
-	public Converter<Long, LsSeqExpt> getIdToLsSeqExptConverter() {
+    public Converter<Long, LsSeqExpt> getIdToLsSeqExptConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqExpt>() {
             public com.labsynch.labseer.domain.LsSeqExpt convert(java.lang.Long id) {
                 return LsSeqExpt.findLsSeqExpt(id);
@@ -3255,7 +3423,7 @@ public com.labsynch.labseer.domain.LsSeqExpt convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, LsSeqExpt> getStringToLsSeqExptConverter() {
+    public Converter<String, LsSeqExpt> getStringToLsSeqExptConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqExpt>() {
             public com.labsynch.labseer.domain.LsSeqExpt convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), LsSeqExpt.class);
@@ -3263,7 +3431,7 @@ public com.labsynch.labseer.domain.LsSeqExpt convert(String id) {
         };
     }
 
-	public Converter<LsSeqItxCntrCntr, String> getLsSeqItxCntrCntrToStringConverter() {
+    public Converter<LsSeqItxCntrCntr, String> getLsSeqItxCntrCntrToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqItxCntrCntr, java.lang.String>() {
             public String convert(LsSeqItxCntrCntr lsSeqItxCntrCntr) {
                 return "(no displayable fields)";
@@ -3271,7 +3439,7 @@ public String convert(LsSeqItxCntrCntr lsSeqItxCntrCntr) {
         };
     }
 
-	public Converter<Long, LsSeqItxCntrCntr> getIdToLsSeqItxCntrCntrConverter() {
+    public Converter<Long, LsSeqItxCntrCntr> getIdToLsSeqItxCntrCntrConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqItxCntrCntr>() {
             public com.labsynch.labseer.domain.LsSeqItxCntrCntr convert(java.lang.Long id) {
                 return LsSeqItxCntrCntr.findLsSeqItxCntrCntr(id);
@@ -3279,7 +3447,7 @@ public com.labsynch.labseer.domain.LsSeqItxCntrCntr convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, LsSeqItxCntrCntr> getStringToLsSeqItxCntrCntrConverter() {
+    public Converter<String, LsSeqItxCntrCntr> getStringToLsSeqItxCntrCntrConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqItxCntrCntr>() {
             public com.labsynch.labseer.domain.LsSeqItxCntrCntr convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), LsSeqItxCntrCntr.class);
@@ -3287,7 +3455,7 @@ public com.labsynch.labseer.domain.LsSeqItxCntrCntr convert(String id) {
         };
     }
 
-	public Converter<LsSeqItxExperimentExperiment, String> getLsSeqItxExperimentExperimentToStringConverter() {
+    public Converter<LsSeqItxExperimentExperiment, String> getLsSeqItxExperimentExperimentToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqItxExperimentExperiment, java.lang.String>() {
             public String convert(LsSeqItxExperimentExperiment lsSeqItxExperimentExperiment) {
                 return "(no displayable fields)";
@@ -3295,7 +3463,7 @@ public String convert(LsSeqItxExperimentExperiment lsSeqItxExperimentExperiment)
         };
     }
 
-	public Converter<Long, LsSeqItxExperimentExperiment> getIdToLsSeqItxExperimentExperimentConverter() {
+    public Converter<Long, LsSeqItxExperimentExperiment> getIdToLsSeqItxExperimentExperimentConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqItxExperimentExperiment>() {
             public com.labsynch.labseer.domain.LsSeqItxExperimentExperiment convert(java.lang.Long id) {
                 return LsSeqItxExperimentExperiment.findLsSeqItxExperimentExperiment(id);
@@ -3303,7 +3471,7 @@ public com.labsynch.labseer.domain.LsSeqItxExperimentExperiment convert(java.lan
         };
     }
 
-	public Converter<String, LsSeqItxExperimentExperiment> getStringToLsSeqItxExperimentExperimentConverter() {
+    public Converter<String, LsSeqItxExperimentExperiment> getStringToLsSeqItxExperimentExperimentConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqItxExperimentExperiment>() {
             public com.labsynch.labseer.domain.LsSeqItxExperimentExperiment convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), LsSeqItxExperimentExperiment.class);
@@ -3311,7 +3479,7 @@ public com.labsynch.labseer.domain.LsSeqItxExperimentExperiment convert(String i
         };
     }
 
-	public Converter<LsSeqItxLsThingLsThing, String> getLsSeqItxLsThingLsThingToStringConverter() {
+    public Converter<LsSeqItxLsThingLsThing, String> getLsSeqItxLsThingLsThingToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqItxLsThingLsThing, java.lang.String>() {
             public String convert(LsSeqItxLsThingLsThing lsSeqItxLsThingLsThing) {
                 return "(no displayable fields)";
@@ -3319,7 +3487,7 @@ public String convert(LsSeqItxLsThingLsThing lsSeqItxLsThingLsThing) {
         };
     }
 
-	public Converter<Long, LsSeqItxLsThingLsThing> getIdToLsSeqItxLsThingLsThingConverter() {
+    public Converter<Long, LsSeqItxLsThingLsThing> getIdToLsSeqItxLsThingLsThingConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqItxLsThingLsThing>() {
             public com.labsynch.labseer.domain.LsSeqItxLsThingLsThing convert(java.lang.Long id) {
                 return LsSeqItxLsThingLsThing.findLsSeqItxLsThingLsThing(id);
@@ -3327,7 +3495,7 @@ public com.labsynch.labseer.domain.LsSeqItxLsThingLsThing convert(java.lang.Long
         };
     }
 
-	public Converter<String, LsSeqItxLsThingLsThing> getStringToLsSeqItxLsThingLsThingConverter() {
+    public Converter<String, LsSeqItxLsThingLsThing> getStringToLsSeqItxLsThingLsThingConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqItxLsThingLsThing>() {
             public com.labsynch.labseer.domain.LsSeqItxLsThingLsThing convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), LsSeqItxLsThingLsThing.class);
@@ -3335,7 +3503,7 @@ public com.labsynch.labseer.domain.LsSeqItxLsThingLsThing convert(String id) {
         };
     }
 
-	public Converter<LsSeqItxProtocolProtocol, String> getLsSeqItxProtocolProtocolToStringConverter() {
+    public Converter<LsSeqItxProtocolProtocol, String> getLsSeqItxProtocolProtocolToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqItxProtocolProtocol, java.lang.String>() {
             public String convert(LsSeqItxProtocolProtocol lsSeqItxProtocolProtocol) {
                 return "(no displayable fields)";
@@ -3343,7 +3511,7 @@ public String convert(LsSeqItxProtocolProtocol lsSeqItxProtocolProtocol) {
         };
     }
 
-	public Converter<Long, LsSeqItxProtocolProtocol> getIdToLsSeqItxProtocolProtocolConverter() {
+    public Converter<Long, LsSeqItxProtocolProtocol> getIdToLsSeqItxProtocolProtocolConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqItxProtocolProtocol>() {
             public com.labsynch.labseer.domain.LsSeqItxProtocolProtocol convert(java.lang.Long id) {
                 return LsSeqItxProtocolProtocol.findLsSeqItxProtocolProtocol(id);
@@ -3351,7 +3519,7 @@ public com.labsynch.labseer.domain.LsSeqItxProtocolProtocol convert(java.lang.Lo
         };
     }
 
-	public Converter<String, LsSeqItxProtocolProtocol> getStringToLsSeqItxProtocolProtocolConverter() {
+    public Converter<String, LsSeqItxProtocolProtocol> getStringToLsSeqItxProtocolProtocolConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqItxProtocolProtocol>() {
             public com.labsynch.labseer.domain.LsSeqItxProtocolProtocol convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), LsSeqItxProtocolProtocol.class);
@@ -3359,7 +3527,7 @@ public com.labsynch.labseer.domain.LsSeqItxProtocolProtocol convert(String id) {
         };
     }
 
-	public Converter<LsSeqItxSubjCntr, String> getLsSeqItxSubjCntrToStringConverter() {
+    public Converter<LsSeqItxSubjCntr, String> getLsSeqItxSubjCntrToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqItxSubjCntr, java.lang.String>() {
             public String convert(LsSeqItxSubjCntr lsSeqItxSubjCntr) {
                 return "(no displayable fields)";
@@ -3367,7 +3535,7 @@ public String convert(LsSeqItxSubjCntr lsSeqItxSubjCntr) {
         };
     }
 
-	public Converter<Long, LsSeqItxSubjCntr> getIdToLsSeqItxSubjCntrConverter() {
+    public Converter<Long, LsSeqItxSubjCntr> getIdToLsSeqItxSubjCntrConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqItxSubjCntr>() {
             public com.labsynch.labseer.domain.LsSeqItxSubjCntr convert(java.lang.Long id) {
                 return LsSeqItxSubjCntr.findLsSeqItxSubjCntr(id);
@@ -3375,7 +3543,7 @@ public com.labsynch.labseer.domain.LsSeqItxSubjCntr convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, LsSeqItxSubjCntr> getStringToLsSeqItxSubjCntrConverter() {
+    public Converter<String, LsSeqItxSubjCntr> getStringToLsSeqItxSubjCntrConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqItxSubjCntr>() {
             public com.labsynch.labseer.domain.LsSeqItxSubjCntr convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), LsSeqItxSubjCntr.class);
@@ -3383,7 +3551,7 @@ public com.labsynch.labseer.domain.LsSeqItxSubjCntr convert(String id) {
         };
     }
 
-	public Converter<LsSeqProtocol, String> getLsSeqProtocolToStringConverter() {
+    public Converter<LsSeqProtocol, String> getLsSeqProtocolToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqProtocol, java.lang.String>() {
             public String convert(LsSeqProtocol lsSeqProtocol) {
                 return "(no displayable fields)";
@@ -3391,7 +3559,7 @@ public String convert(LsSeqProtocol lsSeqProtocol) {
         };
     }
 
-	public Converter<Long, LsSeqProtocol> getIdToLsSeqProtocolConverter() {
+    public Converter<Long, LsSeqProtocol> getIdToLsSeqProtocolConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqProtocol>() {
             public com.labsynch.labseer.domain.LsSeqProtocol convert(java.lang.Long id) {
                 return LsSeqProtocol.findLsSeqProtocol(id);
@@ -3399,7 +3567,7 @@ public com.labsynch.labseer.domain.LsSeqProtocol convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, LsSeqProtocol> getStringToLsSeqProtocolConverter() {
+    public Converter<String, LsSeqProtocol> getStringToLsSeqProtocolConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqProtocol>() {
             public com.labsynch.labseer.domain.LsSeqProtocol convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), LsSeqProtocol.class);
@@ -3407,7 +3575,7 @@ public com.labsynch.labseer.domain.LsSeqProtocol convert(String id) {
         };
     }
 
-	public Converter<LsSeqSubject, String> getLsSeqSubjectToStringConverter() {
+    public Converter<LsSeqSubject, String> getLsSeqSubjectToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqSubject, java.lang.String>() {
             public String convert(LsSeqSubject lsSeqSubject) {
                 return "(no displayable fields)";
@@ -3415,7 +3583,7 @@ public String convert(LsSeqSubject lsSeqSubject) {
         };
     }
 
-	public Converter<Long, LsSeqSubject> getIdToLsSeqSubjectConverter() {
+    public Converter<Long, LsSeqSubject> getIdToLsSeqSubjectConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqSubject>() {
             public com.labsynch.labseer.domain.LsSeqSubject convert(java.lang.Long id) {
                 return LsSeqSubject.findLsSeqSubject(id);
@@ -3423,7 +3591,7 @@ public com.labsynch.labseer.domain.LsSeqSubject convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, LsSeqSubject> getStringToLsSeqSubjectConverter() {
+    public Converter<String, LsSeqSubject> getStringToLsSeqSubjectConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqSubject>() {
             public com.labsynch.labseer.domain.LsSeqSubject convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), LsSeqSubject.class);
@@ -3431,7 +3599,7 @@ public com.labsynch.labseer.domain.LsSeqSubject convert(String id) {
         };
     }
 
-	public Converter<LsSeqTrtGrp, String> getLsSeqTrtGrpToStringConverter() {
+    public Converter<LsSeqTrtGrp, String> getLsSeqTrtGrpToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.LsSeqTrtGrp, java.lang.String>() {
             public String convert(LsSeqTrtGrp lsSeqTrtGrp) {
                 return "(no displayable fields)";
@@ -3439,7 +3607,7 @@ public String convert(LsSeqTrtGrp lsSeqTrtGrp) {
         };
     }
 
-	public Converter<Long, LsSeqTrtGrp> getIdToLsSeqTrtGrpConverter() {
+    public Converter<Long, LsSeqTrtGrp> getIdToLsSeqTrtGrpConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.LsSeqTrtGrp>() {
             public com.labsynch.labseer.domain.LsSeqTrtGrp convert(java.lang.Long id) {
                 return LsSeqTrtGrp.findLsSeqTrtGrp(id);
@@ -3447,7 +3615,7 @@ public com.labsynch.labseer.domain.LsSeqTrtGrp convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, LsSeqTrtGrp> getStringToLsSeqTrtGrpConverter() {
+    public Converter<String, LsSeqTrtGrp> getStringToLsSeqTrtGrpConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.LsSeqTrtGrp>() {
             public com.labsynch.labseer.domain.LsSeqTrtGrp convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), LsSeqTrtGrp.class);
@@ -3455,7 +3623,7 @@ public com.labsynch.labseer.domain.LsSeqTrtGrp convert(String id) {
         };
     }
 
-	public Converter<Long, RoleKind> getIdToRoleKindConverter() {
+    public Converter<Long, RoleKind> getIdToRoleKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.RoleKind>() {
             public com.labsynch.labseer.domain.RoleKind convert(java.lang.Long id) {
                 return RoleKind.findRoleKind(id);
@@ -3463,7 +3631,7 @@ public com.labsynch.labseer.domain.RoleKind convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, RoleKind> getStringToRoleKindConverter() {
+    public Converter<String, RoleKind> getStringToRoleKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.RoleKind>() {
             public com.labsynch.labseer.domain.RoleKind convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), RoleKind.class);
@@ -3471,7 +3639,7 @@ public com.labsynch.labseer.domain.RoleKind convert(String id) {
         };
     }
 
-	public Converter<RoleType, String> getRoleTypeToStringConverter() {
+    public Converter<RoleType, String> getRoleTypeToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.RoleType, java.lang.String>() {
             public String convert(RoleType roleType) {
                 return new StringBuilder().append(roleType.getTypeName()).toString();
@@ -3479,7 +3647,7 @@ public String convert(RoleType roleType) {
         };
     }
 
-	public Converter<Long, RoleType> getIdToRoleTypeConverter() {
+    public Converter<Long, RoleType> getIdToRoleTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.RoleType>() {
             public com.labsynch.labseer.domain.RoleType convert(java.lang.Long id) {
                 return RoleType.findRoleType(id);
@@ -3487,7 +3655,7 @@ public com.labsynch.labseer.domain.RoleType convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, RoleType> getStringToRoleTypeConverter() {
+    public Converter<String, RoleType> getStringToRoleTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.RoleType>() {
             public com.labsynch.labseer.domain.RoleType convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), RoleType.class);
@@ -3495,15 +3663,16 @@ public com.labsynch.labseer.domain.RoleType convert(String id) {
         };
     }
 
-	public Converter<SaltFormAlias, String> getSaltFormAliasToStringConverter() {
+    public Converter<SaltFormAlias, String> getSaltFormAliasToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.SaltFormAlias, java.lang.String>() {
             public String convert(SaltFormAlias saltFormAlias) {
-                return new StringBuilder().append(saltFormAlias.getLsType()).append(' ').append(saltFormAlias.getLsKind()).append(' ').append(saltFormAlias.getAliasName()).toString();
+                return new StringBuilder().append(saltFormAlias.getLsType()).append(' ')
+                        .append(saltFormAlias.getLsKind()).append(' ').append(saltFormAlias.getAliasName()).toString();
             }
         };
     }
 
-	public Converter<Long, SaltFormAlias> getIdToSaltFormAliasConverter() {
+    public Converter<Long, SaltFormAlias> getIdToSaltFormAliasConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.SaltFormAlias>() {
             public com.labsynch.labseer.domain.SaltFormAlias convert(java.lang.Long id) {
                 return SaltFormAlias.findSaltFormAlias(id);
@@ -3511,7 +3680,7 @@ public com.labsynch.labseer.domain.SaltFormAlias convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, SaltFormAlias> getStringToSaltFormAliasConverter() {
+    public Converter<String, SaltFormAlias> getStringToSaltFormAliasConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.SaltFormAlias>() {
             public com.labsynch.labseer.domain.SaltFormAlias convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), SaltFormAlias.class);
@@ -3519,7 +3688,7 @@ public com.labsynch.labseer.domain.SaltFormAlias convert(String id) {
         };
     }
 
-	public Converter<SaltFormAliasKind, String> getSaltFormAliasKindToStringConverter() {
+    public Converter<SaltFormAliasKind, String> getSaltFormAliasKindToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.SaltFormAliasKind, java.lang.String>() {
             public String convert(SaltFormAliasKind saltFormAliasKind) {
                 return new StringBuilder().append(saltFormAliasKind.getKindName()).toString();
@@ -3527,7 +3696,7 @@ public String convert(SaltFormAliasKind saltFormAliasKind) {
         };
     }
 
-	public Converter<Long, SaltFormAliasKind> getIdToSaltFormAliasKindConverter() {
+    public Converter<Long, SaltFormAliasKind> getIdToSaltFormAliasKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.SaltFormAliasKind>() {
             public com.labsynch.labseer.domain.SaltFormAliasKind convert(java.lang.Long id) {
                 return SaltFormAliasKind.findSaltFormAliasKind(id);
@@ -3535,7 +3704,7 @@ public com.labsynch.labseer.domain.SaltFormAliasKind convert(java.lang.Long id)
         };
     }
 
-	public Converter<String, SaltFormAliasKind> getStringToSaltFormAliasKindConverter() {
+    public Converter<String, SaltFormAliasKind> getStringToSaltFormAliasKindConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.SaltFormAliasKind>() {
             public com.labsynch.labseer.domain.SaltFormAliasKind convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), SaltFormAliasKind.class);
@@ -3543,7 +3712,7 @@ public com.labsynch.labseer.domain.SaltFormAliasKind convert(String id) {
         };
     }
 
-	public Converter<SaltFormAliasType, String> getSaltFormAliasTypeToStringConverter() {
+    public Converter<SaltFormAliasType, String> getSaltFormAliasTypeToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.SaltFormAliasType, java.lang.String>() {
             public String convert(SaltFormAliasType saltFormAliasType) {
                 return new StringBuilder().append(saltFormAliasType.getTypeName()).toString();
@@ -3551,7 +3720,7 @@ public String convert(SaltFormAliasType saltFormAliasType) {
         };
     }
 
-	public Converter<Long, SaltFormAliasType> getIdToSaltFormAliasTypeConverter() {
+    public Converter<Long, SaltFormAliasType> getIdToSaltFormAliasTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.SaltFormAliasType>() {
             public com.labsynch.labseer.domain.SaltFormAliasType convert(java.lang.Long id) {
                 return SaltFormAliasType.findSaltFormAliasType(id);
@@ -3559,7 +3728,7 @@ public com.labsynch.labseer.domain.SaltFormAliasType convert(java.lang.Long id)
         };
     }
 
-	public Converter<String, SaltFormAliasType> getStringToSaltFormAliasTypeConverter() {
+    public Converter<String, SaltFormAliasType> getStringToSaltFormAliasTypeConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.SaltFormAliasType>() {
             public com.labsynch.labseer.domain.SaltFormAliasType convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), SaltFormAliasType.class);
@@ -3567,15 +3736,17 @@ public com.labsynch.labseer.domain.SaltFormAliasType convert(String id) {
         };
     }
 
-	public Converter<TempSelectTable, String> getTempSelectTableToStringConverter() {
+    public Converter<TempSelectTable, String> getTempSelectTableToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.domain.TempSelectTable, java.lang.String>() {
             public String convert(TempSelectTable tempSelectTable) {
-                return new StringBuilder().append(tempSelectTable.getNumberVar()).append(' ').append(tempSelectTable.getStringVar()).append(' ').append(tempSelectTable.getLsTransaction()).append(' ').append(tempSelectTable.getRecordedDate()).toString();
+                return new StringBuilder().append(tempSelectTable.getNumberVar()).append(' ')
+                        .append(tempSelectTable.getStringVar()).append(' ').append(tempSelectTable.getLsTransaction())
+                        .append(' ').append(tempSelectTable.getRecordedDate()).toString();
             }
         };
     }
 
-	public Converter<Long, TempSelectTable> getIdToTempSelectTableConverter() {
+    public Converter<Long, TempSelectTable> getIdToTempSelectTableConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.domain.TempSelectTable>() {
             public com.labsynch.labseer.domain.TempSelectTable convert(java.lang.Long id) {
                 return TempSelectTable.findTempSelectTable(id);
@@ -3583,7 +3754,7 @@ public com.labsynch.labseer.domain.TempSelectTable convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, TempSelectTable> getStringToTempSelectTableConverter() {
+    public Converter<String, TempSelectTable> getStringToTempSelectTableConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.domain.TempSelectTable>() {
             public com.labsynch.labseer.domain.TempSelectTable convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), TempSelectTable.class);
@@ -3591,15 +3762,17 @@ public com.labsynch.labseer.domain.TempSelectTable convert(String id) {
         };
     }
 
-	public Converter<SaltLoader, String> getSaltLoaderToStringConverter() {
+    public Converter<SaltLoader, String> getSaltLoaderToStringConverter() {
         return new org.springframework.core.convert.converter.Converter<com.labsynch.labseer.service.SaltLoader, java.lang.String>() {
             public String convert(SaltLoader saltLoader) {
-                return new StringBuilder().append(saltLoader.getName()).append(' ').append(saltLoader.getDescription()).append(' ').append(saltLoader.getNumberOfSalts()).append(' ').append(saltLoader.getSize()).toString();
+                return new StringBuilder().append(saltLoader.getName()).append(' ').append(saltLoader.getDescription())
+                        .append(' ').append(saltLoader.getNumberOfSalts()).append(' ').append(saltLoader.getSize())
+                        .toString();
             }
         };
     }
 
-	public Converter<Long, SaltLoader> getIdToSaltLoaderConverter() {
+    public Converter<Long, SaltLoader> getIdToSaltLoaderConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.Long, com.labsynch.labseer.service.SaltLoader>() {
             public com.labsynch.labseer.service.SaltLoader convert(java.lang.Long id) {
                 return SaltLoader.findSaltLoader(id);
@@ -3607,7 +3780,7 @@ public com.labsynch.labseer.service.SaltLoader convert(java.lang.Long id) {
         };
     }
 
-	public Converter<String, SaltLoader> getStringToSaltLoaderConverter() {
+    public Converter<String, SaltLoader> getStringToSaltLoaderConverter() {
         return new org.springframework.core.convert.converter.Converter<java.lang.String, com.labsynch.labseer.service.SaltLoader>() {
             public com.labsynch.labseer.service.SaltLoader convert(String id) {
                 return getObject().convert(getObject().convert(id, Long.class), SaltLoader.class);
diff --git a/src/main/resources/db/migration/jchem/postgres/V1_3_0_2__Add_standardization_jchem_tables.java b/src/main/resources/db/migration/jchem/postgres/V1_3_0_2__Add_standardization_jchem_tables.java
index 9f6473beb..398232462 100644
--- a/src/main/resources/db/migration/jchem/postgres/V1_3_0_2__Add_standardization_jchem_tables.java
+++ b/src/main/resources/db/migration/jchem/postgres/V1_3_0_2__Add_standardization_jchem_tables.java
@@ -17,7 +17,7 @@ public class V1_3_0_2__Add_standardization_jchem_tables implements JdbcMigration
 
 	Logger logger = LoggerFactory.getLogger(V1_3_0_2__Add_standardization_jchem_tables.class);
 
-	//create the jchem table to store the compounds
+	// create the jchem table to store the compounds
 
 	public void migrate(Connection conn) throws Exception {
 		logger.info("creating standardization_dry_run_structure table");
@@ -30,7 +30,7 @@ public void migrate(Connection conn) throws Exception {
 		conn.setAutoCommit(false);
 		logger.info("connection autocommit mode: " + conn.getAutoCommit());
 
-	}	
+	}
 
 	private boolean createJChemTable(Connection conn, String tableName, boolean tautomerDupe) {
 		ConnectionHandler ch = new ConnectionHandler();
@@ -41,18 +41,19 @@ private boolean createJChemTable(Connection conn, String tableName, boolean taut
 			e1.printStackTrace();
 		}
 
-		StructureTableOptions options = new StructureTableOptions(tableName, StructureTableOptions.TABLE_TYPE_MOLECULES);
+		StructureTableOptions options = new StructureTableOptions(tableName,
+				StructureTableOptions.TABLE_TYPE_MOLECULES);
 		options.setTautomerDuplicateChecking(tautomerDupe);
 
 		try {
 			String[] tables = UpdateHandler.getStructureTables(ch);
-			List<String> tableList = Arrays.asList(tables); 
-			if (!tableList.contains(tableName)){
-				UpdateHandler.createStructureTable(ch, options );
-				logger.info("created the Jchem structure table " + tableName );
+			List<String> tableList = Arrays.asList(tables);
+			if (!tableList.contains(tableName)) {
+				UpdateHandler.createStructureTable(ch, options);
+				logger.info("created the Jchem structure table " + tableName);
 			}
 		} catch (SQLException e) {
-			logger.error("SQL error. Unable to create the Jchem structure table " + tableName );
+			logger.error("SQL error. Unable to create the Jchem structure table " + tableName);
 			e.printStackTrace();
 		}
 
@@ -60,6 +61,4 @@ private boolean createJChemTable(Connection conn, String tableName, boolean taut
 
 	}
 
-
-
 }
\ No newline at end of file
diff --git a/src/test/java/com/labsynch/labseer/api/ApiAnalysisGroupControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiAnalysisGroupControllerTest.java
index cee91b18c..01b61fdc2 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiAnalysisGroupControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiAnalysisGroupControllerTest.java
@@ -1,6 +1,5 @@
 package com.labsynch.labseer.api;
 
-
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -32,59 +31,58 @@
 @ContextConfiguration(locations = {
 		"classpath:/META-INF/spring/applicationContext.xml",
 		"classpath:/META-INF/spring/applicationContext-security.xml",
-		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml"})
+		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml" })
 @Transactional
 public class ApiAnalysisGroupControllerTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(ApiAnalysisGroupControllerTest.class);
 
-	
 	@Autowired
-    private WebApplicationContext wac;
+	private WebApplicationContext wac;
+
+	private MockMvc mockMvc;
+
+	@Autowired
+	private AnalysisGroupService analysisGroupService;
+
+	@Before
+	public void setup() {
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	}
 
-    private MockMvc mockMvc;
-    
-    @Autowired
-    private AnalysisGroupService analysisGroupService;
+	@Test
+	public void parseAnalysisGroupsFromJSONTest() throws Exception {
+		String json = "[{\"id\":16752,\"lsKind\":\"default\",\"lsStates\":[{\"lsKind\":\"dose response\",\"lsTransaction\":65,\"lsType\":\"data\",\"lsValues\":[{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Min\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":17.1522,\"publicData\":true,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":\"efficacy\"},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"SSE\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":1640.4174,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"SST\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":30844.8291,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"rSquared\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":0.9468,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Rendering Hint\",\"lsTransaction\":65,\"lsType\":\"stringValue\",\"numericValue\":null,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":\"TRUE\",\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"category\",\"lsTransaction\":65,\"lsType\":\"stringValue\",\"numericValue\":null,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":\"sigmoid\",\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":\"\",\"lsKind\":\"algorithm flag status\",\"lsTransaction\":65,\"lsType\":\"codeValue\",\"numericValue\":null,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Max\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":91.5111,\"publicData\":true,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":\"efficacy\"},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Slope\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":1.2444,\"publicData\":true,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"EC50\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":0.5135,\"publicData\":true,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":\"uM\"},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"curve id\",\"lsTransaction\":65,\"lsType\":\"stringValue\",\"numericValue\":null,\"publicData\":true,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":\"AG-00000205_65\",\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Fitted Slope\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":-1.2444,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Fitted Min\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":17.1522,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":\"efficacy\"},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Fitted Max\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":91.5111,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":\"efficacy\"},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Fitted EC50\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":0.5135,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":\"uM\"}],\"recordedBy\":\"bob\",\"recordedDate\":1433969151000},{\"lsKind\":\"results\",\"lsTransaction\":65,\"lsType\":\"data\",\"lsValues\":[{\"clobValue\":null,\"codeValue\":\"CMPD-0000011-01A\",\"lsKind\":\"batch code\",\"lsTransaction\":65,\"lsType\":\"codeValue\",\"numericValue\":null,\"publicData\":true,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null}],\"recordedBy\":\"bob\",\"recordedDate\":1433969151000}],\"lsType\":\"default\",\"recordedBy\":\"bob\",\"recordedDate\":1433969152000}]";
+		try {
+			Collection<AnalysisGroup> analysisGroups = AnalysisGroup.fromJsonArrayToAnalysisGroups(json);
+		} catch (Exception e) {
+			logger.error(e.toString());
+		}
+	}
 
-    @Before
-    public void setup() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-    }
-    
-    @Test
-    public void parseAnalysisGroupsFromJSONTest() throws Exception {
-    	String json = "[{\"id\":16752,\"lsKind\":\"default\",\"lsStates\":[{\"lsKind\":\"dose response\",\"lsTransaction\":65,\"lsType\":\"data\",\"lsValues\":[{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Min\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":17.1522,\"publicData\":true,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":\"efficacy\"},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"SSE\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":1640.4174,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"SST\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":30844.8291,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"rSquared\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":0.9468,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Rendering Hint\",\"lsTransaction\":65,\"lsType\":\"stringValue\",\"numericValue\":null,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":\"TRUE\",\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"category\",\"lsTransaction\":65,\"lsType\":\"stringValue\",\"numericValue\":null,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":\"sigmoid\",\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":\"\",\"lsKind\":\"algorithm flag status\",\"lsTransaction\":65,\"lsType\":\"codeValue\",\"numericValue\":null,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Max\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":91.5111,\"publicData\":true,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":\"efficacy\"},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Slope\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":1.2444,\"publicData\":true,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"EC50\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":0.5135,\"publicData\":true,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":\"uM\"},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"curve id\",\"lsTransaction\":65,\"lsType\":\"stringValue\",\"numericValue\":null,\"publicData\":true,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":\"AG-00000205_65\",\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Fitted Slope\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":-1.2444,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Fitted Min\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":17.1522,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":\"efficacy\"},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Fitted Max\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":91.5111,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":\"efficacy\"},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Fitted EC50\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":0.5135,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":\"uM\"}],\"recordedBy\":\"bob\",\"recordedDate\":1433969151000},{\"lsKind\":\"results\",\"lsTransaction\":65,\"lsType\":\"data\",\"lsValues\":[{\"clobValue\":null,\"codeValue\":\"CMPD-0000011-01A\",\"lsKind\":\"batch code\",\"lsTransaction\":65,\"lsType\":\"codeValue\",\"numericValue\":null,\"publicData\":true,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null}],\"recordedBy\":\"bob\",\"recordedDate\":1433969151000}],\"lsType\":\"default\",\"recordedBy\":\"bob\",\"recordedDate\":1433969152000}]";
-    	try{
-    		Collection<AnalysisGroup> analysisGroups = AnalysisGroup.fromJsonArrayToAnalysisGroups(json);
-    	}catch (Exception e){
-    		logger.error(e.toString());
-    	}
-    }
-    
-    @Test
-    @Transactional
-    public void updateAnalysisGroupsFromJSONServiceTest() {
-    	String json = "[{\"id\":546,\"lsKind\":\"default\",\"lsStates\":[{\"lsKind\":\"dose response\",\"lsTransaction\":65,\"lsType\":\"data\",\"lsValues\":[{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Min\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":17.1522,\"publicData\":true,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":\"efficacy\"},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"SSE\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":1640.4174,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"SST\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":30844.8291,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"rSquared\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":0.9468,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Rendering Hint\",\"lsTransaction\":65,\"lsType\":\"stringValue\",\"numericValue\":null,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":\"TRUE\",\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"category\",\"lsTransaction\":65,\"lsType\":\"stringValue\",\"numericValue\":null,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":\"sigmoid\",\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":\"\",\"lsKind\":\"algorithm flag status\",\"lsTransaction\":65,\"lsType\":\"codeValue\",\"numericValue\":null,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Max\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":91.5111,\"publicData\":true,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":\"efficacy\"},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Slope\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":1.2444,\"publicData\":true,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"EC50\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":0.5135,\"publicData\":true,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":\"uM\"},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"curve id\",\"lsTransaction\":65,\"lsType\":\"stringValue\",\"numericValue\":null,\"publicData\":true,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":\"AG-00000205_65\",\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Fitted Slope\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":-1.2444,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Fitted Min\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":17.1522,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":\"efficacy\"},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Fitted Max\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":91.5111,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":\"efficacy\"},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Fitted EC50\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":0.5135,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":\"uM\"}],\"recordedBy\":\"bob\",\"recordedDate\":1433969151000},{\"lsKind\":\"results\",\"lsTransaction\":65,\"lsType\":\"data\",\"lsValues\":[{\"clobValue\":null,\"codeValue\":\"CMPD-0000011-01A\",\"lsKind\":\"batch code\",\"lsTransaction\":65,\"lsType\":\"codeValue\",\"numericValue\":null,\"publicData\":true,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null}],\"recordedBy\":\"bob\",\"recordedDate\":1433969151000}],\"lsType\":\"default\",\"recordedBy\":\"bob\",\"recordedDate\":1433969152000}]";
+	@Test
+	@Transactional
+	public void updateAnalysisGroupsFromJSONServiceTest() {
+		String json = "[{\"id\":546,\"lsKind\":\"default\",\"lsStates\":[{\"lsKind\":\"dose response\",\"lsTransaction\":65,\"lsType\":\"data\",\"lsValues\":[{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Min\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":17.1522,\"publicData\":true,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":\"efficacy\"},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"SSE\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":1640.4174,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"SST\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":30844.8291,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"rSquared\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":0.9468,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Rendering Hint\",\"lsTransaction\":65,\"lsType\":\"stringValue\",\"numericValue\":null,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":\"TRUE\",\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"category\",\"lsTransaction\":65,\"lsType\":\"stringValue\",\"numericValue\":null,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":\"sigmoid\",\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":\"\",\"lsKind\":\"algorithm flag status\",\"lsTransaction\":65,\"lsType\":\"codeValue\",\"numericValue\":null,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Max\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":91.5111,\"publicData\":true,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":\"efficacy\"},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Slope\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":1.2444,\"publicData\":true,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"EC50\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":0.5135,\"publicData\":true,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":\"uM\"},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"curve id\",\"lsTransaction\":65,\"lsType\":\"stringValue\",\"numericValue\":null,\"publicData\":true,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":\"AG-00000205_65\",\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Fitted Slope\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":-1.2444,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Fitted Min\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":17.1522,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":\"efficacy\"},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Fitted Max\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":91.5111,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":\"efficacy\"},{\"clobValue\":null,\"codeValue\":null,\"lsKind\":\"Fitted EC50\",\"lsTransaction\":65,\"lsType\":\"numericValue\",\"numericValue\":0.5135,\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":\"uM\"}],\"recordedBy\":\"bob\",\"recordedDate\":1433969151000},{\"lsKind\":\"results\",\"lsTransaction\":65,\"lsType\":\"data\",\"lsValues\":[{\"clobValue\":null,\"codeValue\":\"CMPD-0000011-01A\",\"lsKind\":\"batch code\",\"lsTransaction\":65,\"lsType\":\"codeValue\",\"numericValue\":null,\"publicData\":true,\"recordedBy\":\"bob\",\"recordedDate\":1433969151000,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null}],\"recordedBy\":\"bob\",\"recordedDate\":1433969151000}],\"lsType\":\"default\",\"recordedBy\":\"bob\",\"recordedDate\":1433969152000}]";
 		Collection<AnalysisGroup> analysisGroups = AnalysisGroup.fromJsonArrayToAnalysisGroups(json);
-		for (AnalysisGroup analysisGroup : analysisGroups){
+		for (AnalysisGroup analysisGroup : analysisGroups) {
 			analysisGroupService.updateLsAnalysisGroup(analysisGroup);
 		}
-    }
-    
-    //@Test
-    @Transactional
-    @Rollback(value=false)
-    public void updateAnalysisGroupsFromJSONTest() throws Exception {
-    	String json = "[{\"id\":3,\"lsStates\":[{\"lsKind\":\"dose response\",\"lsTransaction\":3,\"lsType\":\"data\",\"lsValues\":[{\"lsKind\":\"Min\",\"lsTransaction\":3,\"lsType\":\"numericValue\",\"numericValue\":17.1522,\"publicData\":true,\"recordedBy\":\"bob\",\"recordedDate\":1433979304000,\"unitKind\":\"efficacy\"}],\"recordedBy\":\"bob\",\"recordedDate\":1433979304000}]}]";
-    	MockHttpServletResponse response = this.mockMvc.perform(put("/api/v1/analysisgroups/jsonArray")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    }
+	}
+
+	// @Test
+	@Transactional
+	@Rollback(value = false)
+	public void updateAnalysisGroupsFromJSONTest() throws Exception {
+		String json = "[{\"id\":3,\"lsStates\":[{\"lsKind\":\"dose response\",\"lsTransaction\":3,\"lsType\":\"data\",\"lsValues\":[{\"lsKind\":\"Min\",\"lsTransaction\":3,\"lsType\":\"numericValue\",\"numericValue\":17.1522,\"publicData\":true,\"recordedBy\":\"bob\",\"recordedDate\":1433979304000,\"unitKind\":\"efficacy\"}],\"recordedBy\":\"bob\",\"recordedDate\":1433979304000}]}]";
+		MockHttpServletResponse response = this.mockMvc.perform(put("/api/v1/analysisgroups/jsonArray")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(json)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+	}
 }
diff --git a/src/test/java/com/labsynch/labseer/api/ApiAuthorControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiAuthorControllerTest.java
index 1d630d490..dca7e0b6a 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiAuthorControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiAuthorControllerTest.java
@@ -40,215 +40,215 @@
 @ContextConfiguration(locations = {
 		"classpath:/META-INF/spring/applicationContext.xml",
 		"classpath:/META-INF/spring/applicationContext-security.xml",
-		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml"})
+		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml" })
 @Transactional
 public class ApiAuthorControllerTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiAuthorControllerTest.class);
-	
-    @Autowired
-    private WebApplicationContext wac;
-
-    private MockMvc mockMvc;
-
-    @Before
-    public void setup() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-    }
-    
-    @Test
-    public void getAllAuthorsAsCodetable() throws Exception {
-    	String searchString = "bob";
-    	String format = "codeTable";
-    	String responseJson =  this.mockMvc.perform(get("/api/v1/authors/="+format)
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(responseJson.toString());
-
-    }
-    
-    @Test
-    public void getAllAuthorsAsJson() throws Exception {
-    	String searchString = "bob";
-    	String format = "json";
-    	String responseJson =  this.mockMvc.perform(get("/api/v1/authors/="+format)
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse().getContentAsString();
-    	Collection<Author> authors = Author.fromJsonArrayToAuthors(responseJson);
-    	logger.info(Author.toJsonArray(authors));
-
-    }
-    
-    @Test
-    public void getAuthorsByRoleTypeAndKindAndName() throws Exception {
-    	String roleType = "System";
-    	String roleKind = "ACAS";
-    	String roleName = "ROLE_ACAS-USERS";
-    	String responseJson =  this.mockMvc.perform(get("/api/v1/authors/findByRoleTypeKindAndName?roleType="+roleType+"&roleKind="+roleKind+"&roleName="+roleName)
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(responseJson.toString());
-    	Collection<Author> foundAuthors = Author.fromJsonArrayToAuthors(responseJson);
-    	Assert.assertEquals(1, foundAuthors.size());
-    	Author bob = foundAuthors.iterator().next();
-    	Assert.assertEquals("bob", bob.getUserName());
-    }
-    
-    @Test
-    public void getAuthorsByRoleTypeAndKindAndNameAsCodeTables() throws Exception {
-    	String roleType = "System";
-    	String roleKind = "ACAS";
-    	String roleName = "ROLE_ACAS-USERS";
-    	String format = "codetable";
-    	String url = "/api/v1/authors/findByRoleTypeKindAndName?"
-    			+ "format="+format+"&roleType="+roleType+"&roleKind="+roleKind+"&roleName="+roleName;
-    	logger.info(url);
-    	String responseJson =  this.mockMvc.perform(get(url)
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(responseJson.toString());
-    	Collection<CodeTableDTO> foundAuthors = CodeTableDTO.fromJsonArrayToCoes(responseJson);
-    	Assert.assertEquals(1, foundAuthors.size());
-    	logger.info(CodeTableDTO.toJsonArray(foundAuthors));
-    }
-    
-    @Test
-    @Rollback(value=true)
-    public void nestedSave() throws Exception{
-    	Author author = new Author();
-    	author.setRecordedBy("bob");
-    	author.setRecordedDate(new Date());
-    	author.setUserName("bob");
-    	author.setEmailAddress("bob@mcneilco.com");
-    	author.setFirstName("Bob");
-    	author.setLastName("Roberts");
-    	author.setPassword("password");
-    	author.setLsType("default");
-    	author.setLsKind("default");
-    	AuthorState authorState = new AuthorState();
-    	authorState.setRecordedBy("bob");
-    	authorState.setRecordedDate(new Date());
-    	authorState.setLsType("metadata");
-    	authorState.setLsKind("preferences");
-    	AuthorValue authorValue = new AuthorValue();
-    	authorValue.setLsType("clobValue");
-    	authorValue.setLsKind("example module preferences");
-    	authorValue.setRecordedBy("bob");
-    	author.setRecordedDate(new Date());
-    	authorValue.setClobValue("{\"testJson\":\"Test\"}");
-    	AuthorLabel authorLabel = new AuthorLabel();
-    	authorLabel.setLsType("name");
-    	authorLabel.setLsKind("nickname");
-    	authorLabel.setRecordedBy("bob");
-    	authorLabel.setRecordedDate(new Date());
-    	authorLabel.setLabelText("Bob");
-    	
-    	Set<AuthorState> states = new HashSet<AuthorState>();
-    	states.add(authorState);
-    	Set<AuthorValue> values = new HashSet<AuthorValue>();
-    	values.add(authorValue);
-    	Set<AuthorLabel> labels = new HashSet<AuthorLabel>();
-    	labels.add(authorLabel);
-    	author.setLsStates(states);
-    	authorState.setLsValues(values);
-    	author.setLsLabels(labels);
-    	
-    	String json = author.toJson();
-    	//add in password
-    	json = json.replaceFirst("[{]+", "{\"password\":\"secret\",");
-    	logger.info(json);
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/authors")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Author savedAuthor = Author.fromJsonToAuthor(responseJson);
-    }
-    
-    @Test
-    @Rollback(value=true)
-    public void nestedSave_fromJson() throws Exception{
-    	String json = "{  \"firstName\": \"Bob\",  \"lastName\": \"Roberts\",  \"userName\": \"bob\",  \"emailAddress\": \"bob@mcneilco.com\",  \"version\": 0,  \"enabled\": true,  \"locked\": false,  \"password\": \"5en6G6MezRroT3XKqkdPOmY/BfQ=\",  \"recordedBy\": \"bob\",  \"recordedDate\": 1457542406000,  \"lsType\":\"author\",  \"lsKind\":\"author\"}";
-    	logger.info(json);
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/authors")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Author savedAuthor = Author.fromJsonToAuthor(responseJson);
-    }
-    
-    @Test
-    @Rollback(value=true)
-    public void getOrCreate() throws Exception{
-    	Author author = new Author();
-    	author.setRecordedBy("bob");
-    	author.setRecordedDate(new Date());
-    	author.setUserName("bob");
-    	author.setEmailAddress("bob@mcneilco.com");
-    	author.setFirstName("Bob");
-    	author.setLastName("Roberts");
-    	AuthorState authorState = new AuthorState();
-    	authorState.setRecordedBy("bob");
-    	authorState.setRecordedDate(new Date());
-    	authorState.setLsType("metadata");
-    	authorState.setLsKind("preferences");
-    	AuthorValue authorValue = new AuthorValue();
-    	authorValue.setLsType("clobValue");
-    	authorValue.setLsKind("example module preferences");
-    	authorValue.setClobValue("{\"testJson\":\"Test\"}");
-    	AuthorLabel authorLabel = new AuthorLabel();
-    	authorLabel.setLsType("name");
-    	authorLabel.setLsKind("nickname");
-    	authorLabel.setRecordedBy("bob");
-    	authorLabel.setRecordedDate(new Date());
-    	authorLabel.setLabelText("Bob");
-    	
-    	Set<AuthorState> states = new HashSet<AuthorState>();
-    	states.add(authorState);
-    	Set<AuthorValue> values = new HashSet<AuthorValue>();
-    	values.add(authorValue);
-    	Set<AuthorLabel> labels = new HashSet<AuthorLabel>();
-    	labels.add(authorLabel);
-    	author.setLsStates(states);
-    	authorState.setLsValues(values);
-    	author.setLsLabels(labels);
-    	
-    	String json = author.toJson();
-    	logger.info(json);
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/authors")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Author savedAuthor = Author.fromJsonToAuthor(responseJson);
-    	Assert.assertNotSame(author.getRecordedDate(), savedAuthor.getRecordedDate());
-    }
-    
 
+	@Autowired
+	private WebApplicationContext wac;
+
+	private MockMvc mockMvc;
+
+	@Before
+	public void setup() {
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	}
+
+	@Test
+	public void getAllAuthorsAsCodetable() throws Exception {
+		String searchString = "bob";
+		String format = "codeTable";
+		String responseJson = this.mockMvc.perform(get("/api/v1/authors/=" + format)
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse().getContentAsString();
+		logger.info(responseJson.toString());
+
+	}
+
+	@Test
+	public void getAllAuthorsAsJson() throws Exception {
+		String searchString = "bob";
+		String format = "json";
+		String responseJson = this.mockMvc.perform(get("/api/v1/authors/=" + format)
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse().getContentAsString();
+		Collection<Author> authors = Author.fromJsonArrayToAuthors(responseJson);
+		logger.info(Author.toJsonArray(authors));
+
+	}
+
+	@Test
+	public void getAuthorsByRoleTypeAndKindAndName() throws Exception {
+		String roleType = "System";
+		String roleKind = "ACAS";
+		String roleName = "ROLE_ACAS-USERS";
+		String responseJson = this.mockMvc
+				.perform(get("/api/v1/authors/findByRoleTypeKindAndName?roleType=" + roleType + "&roleKind=" + roleKind
+						+ "&roleName=" + roleName)
+						.contentType(MediaType.APPLICATION_JSON)
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse().getContentAsString();
+		logger.info(responseJson.toString());
+		Collection<Author> foundAuthors = Author.fromJsonArrayToAuthors(responseJson);
+		Assert.assertEquals(1, foundAuthors.size());
+		Author bob = foundAuthors.iterator().next();
+		Assert.assertEquals("bob", bob.getUserName());
+	}
+
+	@Test
+	public void getAuthorsByRoleTypeAndKindAndNameAsCodeTables() throws Exception {
+		String roleType = "System";
+		String roleKind = "ACAS";
+		String roleName = "ROLE_ACAS-USERS";
+		String format = "codetable";
+		String url = "/api/v1/authors/findByRoleTypeKindAndName?"
+				+ "format=" + format + "&roleType=" + roleType + "&roleKind=" + roleKind + "&roleName=" + roleName;
+		logger.info(url);
+		String responseJson = this.mockMvc.perform(get(url)
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse().getContentAsString();
+		logger.info(responseJson.toString());
+		Collection<CodeTableDTO> foundAuthors = CodeTableDTO.fromJsonArrayToCoes(responseJson);
+		Assert.assertEquals(1, foundAuthors.size());
+		logger.info(CodeTableDTO.toJsonArray(foundAuthors));
+	}
+
+	@Test
+	@Rollback(value = true)
+	public void nestedSave() throws Exception {
+		Author author = new Author();
+		author.setRecordedBy("bob");
+		author.setRecordedDate(new Date());
+		author.setUserName("bob");
+		author.setEmailAddress("bob@mcneilco.com");
+		author.setFirstName("Bob");
+		author.setLastName("Roberts");
+		author.setPassword("password");
+		author.setLsType("default");
+		author.setLsKind("default");
+		AuthorState authorState = new AuthorState();
+		authorState.setRecordedBy("bob");
+		authorState.setRecordedDate(new Date());
+		authorState.setLsType("metadata");
+		authorState.setLsKind("preferences");
+		AuthorValue authorValue = new AuthorValue();
+		authorValue.setLsType("clobValue");
+		authorValue.setLsKind("example module preferences");
+		authorValue.setRecordedBy("bob");
+		author.setRecordedDate(new Date());
+		authorValue.setClobValue("{\"testJson\":\"Test\"}");
+		AuthorLabel authorLabel = new AuthorLabel();
+		authorLabel.setLsType("name");
+		authorLabel.setLsKind("nickname");
+		authorLabel.setRecordedBy("bob");
+		authorLabel.setRecordedDate(new Date());
+		authorLabel.setLabelText("Bob");
+
+		Set<AuthorState> states = new HashSet<AuthorState>();
+		states.add(authorState);
+		Set<AuthorValue> values = new HashSet<AuthorValue>();
+		values.add(authorValue);
+		Set<AuthorLabel> labels = new HashSet<AuthorLabel>();
+		labels.add(authorLabel);
+		author.setLsStates(states);
+		authorState.setLsValues(values);
+		author.setLsLabels(labels);
+
+		String json = author.toJson();
+		// add in password
+		json = json.replaceFirst("[{]+", "{\"password\":\"secret\",");
+		logger.info(json);
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/authors")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Author savedAuthor = Author.fromJsonToAuthor(responseJson);
+	}
+
+	@Test
+	@Rollback(value = true)
+	public void nestedSave_fromJson() throws Exception {
+		String json = "{  \"firstName\": \"Bob\",  \"lastName\": \"Roberts\",  \"userName\": \"bob\",  \"emailAddress\": \"bob@mcneilco.com\",  \"version\": 0,  \"enabled\": true,  \"locked\": false,  \"password\": \"5en6G6MezRroT3XKqkdPOmY/BfQ=\",  \"recordedBy\": \"bob\",  \"recordedDate\": 1457542406000,  \"lsType\":\"author\",  \"lsKind\":\"author\"}";
+		logger.info(json);
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/authors")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Author savedAuthor = Author.fromJsonToAuthor(responseJson);
+	}
+
+	@Test
+	@Rollback(value = true)
+	public void getOrCreate() throws Exception {
+		Author author = new Author();
+		author.setRecordedBy("bob");
+		author.setRecordedDate(new Date());
+		author.setUserName("bob");
+		author.setEmailAddress("bob@mcneilco.com");
+		author.setFirstName("Bob");
+		author.setLastName("Roberts");
+		AuthorState authorState = new AuthorState();
+		authorState.setRecordedBy("bob");
+		authorState.setRecordedDate(new Date());
+		authorState.setLsType("metadata");
+		authorState.setLsKind("preferences");
+		AuthorValue authorValue = new AuthorValue();
+		authorValue.setLsType("clobValue");
+		authorValue.setLsKind("example module preferences");
+		authorValue.setClobValue("{\"testJson\":\"Test\"}");
+		AuthorLabel authorLabel = new AuthorLabel();
+		authorLabel.setLsType("name");
+		authorLabel.setLsKind("nickname");
+		authorLabel.setRecordedBy("bob");
+		authorLabel.setRecordedDate(new Date());
+		authorLabel.setLabelText("Bob");
+
+		Set<AuthorState> states = new HashSet<AuthorState>();
+		states.add(authorState);
+		Set<AuthorValue> values = new HashSet<AuthorValue>();
+		values.add(authorValue);
+		Set<AuthorLabel> labels = new HashSet<AuthorLabel>();
+		labels.add(authorLabel);
+		author.setLsStates(states);
+		authorState.setLsValues(values);
+		author.setLsLabels(labels);
+
+		String json = author.toJson();
+		logger.info(json);
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/authors")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Author savedAuthor = Author.fromJsonToAuthor(responseJson);
+		Assert.assertNotSame(author.getRecordedDate(), savedAuthor.getRecordedDate());
+	}
 
 }
\ No newline at end of file
diff --git a/src/test/java/com/labsynch/labseer/api/ApiAuthorRoleControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiAuthorRoleControllerTest.java
index 250123e0e..574b1566b 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiAuthorRoleControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiAuthorRoleControllerTest.java
@@ -30,70 +30,66 @@
 @ContextConfiguration(locations = {
 		"classpath:/META-INF/spring/applicationContext.xml",
 		"classpath:/META-INF/spring/applicationContext-security.xml",
-		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml"})
+		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml" })
 @Transactional
 public class ApiAuthorRoleControllerTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiAuthorRoleControllerTest.class);
-	
-    @Autowired
-    private WebApplicationContext wac;
 
-    private MockMvc mockMvc;
+	@Autowired
+	private WebApplicationContext wac;
 
-    @Before
-    public void setup() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-    }
-    
-    @Test
-    @Transactional
-    @Rollback(value=true)
-    public void saveAuthorRolesViaDTO() throws Exception {
-    	String roleType = "System";
-    	String roleKind = "ACAS";
-    	String roleName = "ROLE_ACAS-USERS";
-    	String userName = "bob";
-    	AuthorRoleDTO dto = new AuthorRoleDTO();
-    	dto.setRoleType(roleType);
-    	dto.setRoleKind(roleKind);
-    	dto.setRoleName(roleName);
-    	dto.setUserName(userName);
-    	Collection<AuthorRoleDTO> authorRoles = new HashSet<AuthorRoleDTO>();
-    	authorRoles.add(dto);
-    	String json = AuthorRoleDTO.toJsonArray(authorRoles);
-    	ResultActions responseJson = this.mockMvc.perform(post("/api/v1/authorroles/saveRoles")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isCreated());
-    }
-    
-    @Test
-    @Transactional
-    @Rollback(value=true)
-    public void deleteAuthorRolesViaDTO() throws Exception {
-    	String roleType = "System";
-    	String roleKind = "ACAS";
-    	String roleName = "ROLE_ACAS-USERS";
-    	String userName = "bob";
-    	AuthorRoleDTO dto = new AuthorRoleDTO();
-    	dto.setRoleType(roleType);
-    	dto.setRoleKind(roleKind);
-    	dto.setRoleName(roleName);
-    	dto.setUserName(userName);
-    	Collection<AuthorRoleDTO> authorRoles = new HashSet<AuthorRoleDTO>();
-    	authorRoles.add(dto);
-    	String json = AuthorRoleDTO.toJsonArray(authorRoles);
-    	ResultActions responseJson = this.mockMvc.perform(post("/api/v1/authorroles/deleteRoles")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk());
-    }
-    
+	private MockMvc mockMvc;
 
-    
+	@Before
+	public void setup() {
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	}
 
+	@Test
+	@Transactional
+	@Rollback(value = true)
+	public void saveAuthorRolesViaDTO() throws Exception {
+		String roleType = "System";
+		String roleKind = "ACAS";
+		String roleName = "ROLE_ACAS-USERS";
+		String userName = "bob";
+		AuthorRoleDTO dto = new AuthorRoleDTO();
+		dto.setRoleType(roleType);
+		dto.setRoleKind(roleKind);
+		dto.setRoleName(roleName);
+		dto.setUserName(userName);
+		Collection<AuthorRoleDTO> authorRoles = new HashSet<AuthorRoleDTO>();
+		authorRoles.add(dto);
+		String json = AuthorRoleDTO.toJsonArray(authorRoles);
+		ResultActions responseJson = this.mockMvc.perform(post("/api/v1/authorroles/saveRoles")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(json)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isCreated());
+	}
+
+	@Test
+	@Transactional
+	@Rollback(value = true)
+	public void deleteAuthorRolesViaDTO() throws Exception {
+		String roleType = "System";
+		String roleKind = "ACAS";
+		String roleName = "ROLE_ACAS-USERS";
+		String userName = "bob";
+		AuthorRoleDTO dto = new AuthorRoleDTO();
+		dto.setRoleType(roleType);
+		dto.setRoleKind(roleKind);
+		dto.setRoleName(roleName);
+		dto.setUserName(userName);
+		Collection<AuthorRoleDTO> authorRoles = new HashSet<AuthorRoleDTO>();
+		authorRoles.add(dto);
+		String json = AuthorRoleDTO.toJsonArray(authorRoles);
+		ResultActions responseJson = this.mockMvc.perform(post("/api/v1/authorroles/deleteRoles")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(json)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk());
+	}
 
 }
\ No newline at end of file
diff --git a/src/test/java/com/labsynch/labseer/api/ApiCompoundsControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiCompoundsControllerTest.java
index 0e8655f0e..af1257c70 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiCompoundsControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiCompoundsControllerTest.java
@@ -32,50 +32,47 @@
 @ContextConfiguration(locations = {
 		"classpath:/META-INF/spring/applicationContext.xml",
 		"classpath:/META-INF/spring/applicationContext-security.xml",
-		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml"})
+		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml" })
 public class ApiCompoundsControllerTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiCompoundsControllerTest.class);
-	
-    @Autowired
-    private WebApplicationContext wac;
 
-    private MockMvc mockMvc;
+	@Autowired
+	private WebApplicationContext wac;
 
-    @Before
-    public void setup() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-    }
-    
-    
-    @Test
-    @Transactional
-    public void checkBatchCodeDependencies() throws Exception{
-    	Collection<String> batchCodes = new HashSet<String>();
+	private MockMvc mockMvc;
+
+	@Before
+	public void setup() {
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	}
+
+	@Test
+	@Transactional
+	public void checkBatchCodeDependencies() throws Exception {
+		Collection<String> batchCodes = new HashSet<String>();
 		batchCodes.add("CMPD-0000001-01A");
 		batchCodes.add("CMPD-0000002-01A");
 		batchCodes.add("CMPD-0000003-01A");
 		batchCodes.add("NOT-A-VALID-BATCH-CODE");
-		
+
 		CmpdRegBatchCodeDTO cmpdRegBatchCodeDTO = new CmpdRegBatchCodeDTO(batchCodes);
 		String json = cmpdRegBatchCodeDTO.toJson();
 		logger.info(json);
 		Assert.assertFalse(json.equals("{}"));
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/compounds/checkBatchDependencies")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	CmpdRegBatchCodeDTO result = CmpdRegBatchCodeDTO.fromJsonToCmpdRegBatchCodeDTO(responseJson);
-    	Assert.assertTrue(result.getLinkedDataExists());
-    	Assert.assertNotNull(result.getLinkedExperiments());
-    	Assert.assertFalse(result.getLinkedExperiments().isEmpty());
-    }
-    
-    
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/compounds/checkBatchDependencies")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		CmpdRegBatchCodeDTO result = CmpdRegBatchCodeDTO.fromJsonToCmpdRegBatchCodeDTO(responseJson);
+		Assert.assertTrue(result.getLinkedDataExists());
+		Assert.assertNotNull(result.getLinkedExperiments());
+		Assert.assertFalse(result.getLinkedExperiments().isEmpty());
+	}
 
 }
\ No newline at end of file
diff --git a/src/test/java/com/labsynch/labseer/api/ApiContainerControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiContainerControllerTest.java
index f54e9f5bf..7740a3b05 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiContainerControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiContainerControllerTest.java
@@ -75,286 +75,288 @@
 @ContextConfiguration(locations = {
 		"classpath:/META-INF/spring/applicationContext.xml",
 		"classpath:/META-INF/spring/applicationContext-security.xml",
-		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml"})
+		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml" })
 public class ApiContainerControllerTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiContainerControllerTest.class);
-	
-    @Autowired
-    private WebApplicationContext wac;
 
-    private MockMvc mockMvc;
-    
-    @Autowired
+	@Autowired
+	private WebApplicationContext wac;
+
+	private MockMvc mockMvc;
+
+	@Autowired
 	private ContainerService containerService;
 
-    @Before
-    public void setup() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-    }
-    
-//    @Test
-    @Transactional
-    public void getContainerByLsTypeAndLsKind() throws Exception{
-    	MockHttpServletResponse response;
-    	String responseJson;
-    	Collection<Container> foundContainers;
-    	//no type and kind
-    	response = this.mockMvc.perform(get("/api/v1/containers")
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	foundContainers = Container.fromJsonArrayToContainers(responseJson);
-    	Assert.assertFalse(foundContainers.isEmpty());
-    	//only type
-    	response = this.mockMvc.perform(get("/api/v1/containers?lsType=subject")
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	foundContainers = Container.fromJsonArrayToContainers(responseJson);
-    	Assert.assertFalse(foundContainers.isEmpty());
-    	//only kind
-    	response = this.mockMvc.perform(get("/api/v1/containers?lsKind=test subject")
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	foundContainers = Container.fromJsonArrayToContainers(responseJson);
-    	Assert.assertFalse(foundContainers.isEmpty());
-    	//type and kind
-    	response = this.mockMvc.perform(get("/api/v1/containers?lsType=subject&lsKind=test subject")
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	foundContainers = Container.fromJsonArrayToContainers(responseJson);
-    	Assert.assertFalse(foundContainers.isEmpty());
-    	//find no results
-    	response = this.mockMvc.perform(get("/api/v1/containers?lsType=nope&lsKind=")
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	foundContainers = Container.fromJsonArrayToContainers(responseJson);
-    	Assert.assertTrue(foundContainers.isEmpty());
-    }
-    
-    
-    @Test
-    @Transactional
-    public void getWellCodesByPlateBarcodes() throws Exception{
-    	List<String> plateBarcodes = new ArrayList<String>();
-    	TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate");
-    	query.setMaxResults(3);
-    	for (Container container : query.getResultList()){
-    		plateBarcodes.add("\""+container.getLsLabels().iterator().next().getLabelText()+"\"");	
-    	}
+	@Before
+	public void setup() {
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	}
+
+	// @Test
+	@Transactional
+	public void getContainerByLsTypeAndLsKind() throws Exception {
+		MockHttpServletResponse response;
+		String responseJson;
+		Collection<Container> foundContainers;
+		// no type and kind
+		response = this.mockMvc.perform(get("/api/v1/containers")
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		foundContainers = Container.fromJsonArrayToContainers(responseJson);
+		Assert.assertFalse(foundContainers.isEmpty());
+		// only type
+		response = this.mockMvc.perform(get("/api/v1/containers?lsType=subject")
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		foundContainers = Container.fromJsonArrayToContainers(responseJson);
+		Assert.assertFalse(foundContainers.isEmpty());
+		// only kind
+		response = this.mockMvc.perform(get("/api/v1/containers?lsKind=test subject")
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		foundContainers = Container.fromJsonArrayToContainers(responseJson);
+		Assert.assertFalse(foundContainers.isEmpty());
+		// type and kind
+		response = this.mockMvc.perform(get("/api/v1/containers?lsType=subject&lsKind=test subject")
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		foundContainers = Container.fromJsonArrayToContainers(responseJson);
+		Assert.assertFalse(foundContainers.isEmpty());
+		// find no results
+		response = this.mockMvc.perform(get("/api/v1/containers?lsType=nope&lsKind=")
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		foundContainers = Container.fromJsonArrayToContainers(responseJson);
+		Assert.assertTrue(foundContainers.isEmpty());
+	}
+
+	@Test
+	@Transactional
+	public void getWellCodesByPlateBarcodes() throws Exception {
+		List<String> plateBarcodes = new ArrayList<String>();
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate");
+		query.setMaxResults(3);
+		for (Container container : query.getResultList()) {
+			plateBarcodes.add("\"" + container.getLsLabels().iterator().next().getLabelText() + "\"");
+		}
 		String json = plateBarcodes.toString();
 		logger.info(json);
 		Assert.assertFalse(json.equals("{}"));
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getWellCodesByPlateBarcodes")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<PlateWellDTO> results = PlateWellDTO.fromJsonArrayToPlateWellDTO(responseJson);
-    	for (PlateWellDTO result : results){
-    		Assert.assertNotNull(result.getPlateBarcode());
-    		if (result.getPlateCodeName() != null){
-    			Assert.assertNotNull(result.getWellCodeName());
-    			Assert.assertNotNull(result.getWellLabel());
-    		}
-    	}
-    }
-    
-    @Test
-    @Transactional
-    public void getContainerCodesByLabels() throws Exception{
-    	List<String> plateBarcodes = new ArrayList<String>();
-    	TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate");
-    	query.setMaxResults(3);
-    	for (Container container : query.getResultList()){
-    		plateBarcodes.add("\""+container.getLsLabels().iterator().next().getLabelText()+"\"");	
-    	}
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getWellCodesByPlateBarcodes")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<PlateWellDTO> results = PlateWellDTO.fromJsonArrayToPlateWellDTO(responseJson);
+		for (PlateWellDTO result : results) {
+			Assert.assertNotNull(result.getPlateBarcode());
+			if (result.getPlateCodeName() != null) {
+				Assert.assertNotNull(result.getWellCodeName());
+				Assert.assertNotNull(result.getWellLabel());
+			}
+		}
+	}
+
+	@Test
+	@Transactional
+	public void getContainerCodesByLabels() throws Exception {
+		List<String> plateBarcodes = new ArrayList<String>();
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate");
+		query.setMaxResults(3);
+		for (Container container : query.getResultList()) {
+			plateBarcodes.add("\"" + container.getLsLabels().iterator().next().getLabelText() + "\"");
+		}
 		String json = plateBarcodes.toString();
 		logger.info(json);
 		Assert.assertFalse(json.equals("{}"));
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getContainerCodesByLabels")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<CodeLabelDTO> results = CodeLabelDTO.fromJsonArrayToCoes(responseJson);
-    	int i=0;
-    	for (CodeLabelDTO result : results){
-    		Assert.assertNotNull(result.getRequestLabel());
-    		Assert.assertFalse(result.getFoundCodeNames().isEmpty());
-    		Assert.assertEquals(plateBarcodes.get(i).replaceAll("\"", ""), result.getRequestLabel());
-    		i++;
-    	}
-    }
-    
-    @Test
-    @Transactional
-    public void getContainerCodesByLabels_with_noresult_entries() throws Exception{
-    	List<String> plateBarcodes = new ArrayList<String>();
-    	TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate");
-    	query.setMaxResults(3);
-    	for (Container container : query.getResultList()){
-    		plateBarcodes.add("\""+container.getLsLabels().iterator().next().getLabelText()+"\"");	
-    	}
-    	plateBarcodes.add(1, "\"BADBARCODE\"");
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getContainerCodesByLabels")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<CodeLabelDTO> results = CodeLabelDTO.fromJsonArrayToCoes(responseJson);
+		int i = 0;
+		for (CodeLabelDTO result : results) {
+			Assert.assertNotNull(result.getRequestLabel());
+			Assert.assertFalse(result.getFoundCodeNames().isEmpty());
+			Assert.assertEquals(plateBarcodes.get(i).replaceAll("\"", ""), result.getRequestLabel());
+			i++;
+		}
+	}
+
+	@Test
+	@Transactional
+	public void getContainerCodesByLabels_with_noresult_entries() throws Exception {
+		List<String> plateBarcodes = new ArrayList<String>();
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate");
+		query.setMaxResults(3);
+		for (Container container : query.getResultList()) {
+			plateBarcodes.add("\"" + container.getLsLabels().iterator().next().getLabelText() + "\"");
+		}
+		plateBarcodes.add(1, "\"BADBARCODE\"");
 		String json = plateBarcodes.toString();
 		logger.info(json);
 		Assert.assertFalse(json.equals("{}"));
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getContainerCodesByLabels")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<CodeLabelDTO> results = CodeLabelDTO.fromJsonArrayToCoes(responseJson);
-    	int i=0;
-    	for (CodeLabelDTO result : results){
-    		Assert.assertNotNull(result.getRequestLabel());
-//    		Assert.assertFalse(result.getFoundCodeNames().isEmpty());
-    		Assert.assertEquals(plateBarcodes.get(i).replaceAll("\"", ""), result.getRequestLabel());
-    		i++;
-    	}
-    }
-    
-    @Test
-    @Transactional
-    public void getContainerCodesByLabelsWithTypeKinds() throws Exception{
-    	List<String> plateBarcodes = new ArrayList<String>();
-    	TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate");
-    	query.setMaxResults(3);
-    	for (Container container : query.getResultList()){
-    		plateBarcodes.add("\""+container.getLsLabels().iterator().next().getLabelText()+"\"");	
-    	}	
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getContainerCodesByLabels")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<CodeLabelDTO> results = CodeLabelDTO.fromJsonArrayToCoes(responseJson);
+		int i = 0;
+		for (CodeLabelDTO result : results) {
+			Assert.assertNotNull(result.getRequestLabel());
+			// Assert.assertFalse(result.getFoundCodeNames().isEmpty());
+			Assert.assertEquals(plateBarcodes.get(i).replaceAll("\"", ""), result.getRequestLabel());
+			i++;
+		}
+	}
+
+	@Test
+	@Transactional
+	public void getContainerCodesByLabelsWithTypeKinds() throws Exception {
+		List<String> plateBarcodes = new ArrayList<String>();
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate");
+		query.setMaxResults(3);
+		for (Container container : query.getResultList()) {
+			plateBarcodes.add("\"" + container.getLsLabels().iterator().next().getLabelText() + "\"");
+		}
 		String json = plateBarcodes.toString();
 		logger.info(json);
 		Assert.assertFalse(json.equals("{}"));
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getContainerCodesByLabels"
-    			+ "?containerType=container&containerKind=plate&labelType=barcode&labelKind=barcode")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<CodeLabelDTO> results = CodeLabelDTO.fromJsonArrayToCoes(responseJson);
-    	int i=0;
-    	for (CodeLabelDTO result : results){
-    		Assert.assertNotNull(result.getRequestLabel());
-    		Assert.assertFalse(result.getFoundCodeNames().isEmpty());
-    		Assert.assertEquals(plateBarcodes.get(i).replaceAll("\"", ""), result.getRequestLabel());
-    		i++;
-    	}
-    }
-    
-    @Test
-    @Transactional
-    public void getContainerCodesByLabels_tooManyResults() throws Exception{
-    	List<String> plateBarcodes = new ArrayList<String>();
-    	TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate");
-    	query.setMaxResults(3);
-    	for (Container container : query.getResultList()){
-    		plateBarcodes.add("\""+container.getLsLabels().iterator().next().getLabelText()+"\"");	
-    	}
-    	Integer maxResults = 2;
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getContainerCodesByLabels"
+				+ "?containerType=container&containerKind=plate&labelType=barcode&labelKind=barcode")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<CodeLabelDTO> results = CodeLabelDTO.fromJsonArrayToCoes(responseJson);
+		int i = 0;
+		for (CodeLabelDTO result : results) {
+			Assert.assertNotNull(result.getRequestLabel());
+			Assert.assertFalse(result.getFoundCodeNames().isEmpty());
+			Assert.assertEquals(plateBarcodes.get(i).replaceAll("\"", ""), result.getRequestLabel());
+			i++;
+		}
+	}
+
+	@Test
+	@Transactional
+	public void getContainerCodesByLabels_tooManyResults() throws Exception {
+		List<String> plateBarcodes = new ArrayList<String>();
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate");
+		query.setMaxResults(3);
+		for (Container container : query.getResultList()) {
+			plateBarcodes.add("\"" + container.getLsLabels().iterator().next().getLabelText() + "\"");
+		}
+		Integer maxResults = 2;
 		String json = plateBarcodes.toString();
 		logger.info(json);
 		Assert.assertFalse(json.equals("{}"));
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getContainerCodesByLabels?maxResults="+maxResults.toString())
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	ContainerQueryResultDTO result = ContainerQueryResultDTO.fromJsonToContainerQueryResultDTO(responseJson);
-    	Assert.assertEquals(maxResults, result.getMaxResults());
-    	Assert.assertTrue((result.getNumberOfResults() > maxResults));
-    	Assert.assertNull(result.getResults());
-    }
-    
-    @Test
-    @Transactional
-    public void getWellContent() throws Exception{
-    	List<String> wellCodes = new ArrayList<String>();
-    	TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("well","default");
-    	query.setMaxResults(25);
-    	for (Container container : query.getResultList()){
-    		wellCodes.add("\""+container.getCodeName()+"\"");	
-    	}
+		MockHttpServletResponse response = this.mockMvc
+				.perform(post("/api/v1/containers/getContainerCodesByLabels?maxResults=" + maxResults.toString())
+						.contentType(MediaType.APPLICATION_JSON)
+						.accept(MediaType.APPLICATION_JSON)
+						.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		ContainerQueryResultDTO result = ContainerQueryResultDTO.fromJsonToContainerQueryResultDTO(responseJson);
+		Assert.assertEquals(maxResults, result.getMaxResults());
+		Assert.assertTrue((result.getNumberOfResults() > maxResults));
+		Assert.assertNull(result.getResults());
+	}
+
+	@Test
+	@Transactional
+	public void getWellContent() throws Exception {
+		List<String> wellCodes = new ArrayList<String>();
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("well", "default");
+		query.setMaxResults(25);
+		for (Container container : query.getResultList()) {
+			wellCodes.add("\"" + container.getCodeName() + "\"");
+		}
 		String json = wellCodes.toString();
 		logger.info(json);
 		Assert.assertFalse(json.equals("{}"));
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getWellContent")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<WellContentDTO> results = WellContentDTO.fromJsonArrayToWellCoes(responseJson);
-    	int i = 0;
-    	for (WellContentDTO result : results){
-    		Assert.assertNotNull(result.getContainerCodeName());
-    		Assert.assertEquals(wellCodes.get(i).replaceAll("\"",""), result.getContainerCodeName());
-    		if (result.getLevel() != null) Assert.assertNotNull(result.getWellName());
-    		i++;
-    	}
-    }
-    
-    @Test
-    @Transactional
-    public void containerDependencyCheck_Well() throws Exception{
-    	String codeName = Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate").getResultList().get(0).getCodeName();
-    	MockHttpServletResponse response = this.mockMvc.perform(get("/api/v1/containers/checkDependencies/"+codeName)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-//    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	DependencyCheckDTO results = DependencyCheckDTO.fromJsonToDependencyCheckDTO(responseJson);
-    	
-    }
-    
-    @Test
-    @Transactional
-    public void validateContainerUniqueName() throws Exception{
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getWellContent")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<WellContentDTO> results = WellContentDTO.fromJsonArrayToWellCoes(responseJson);
+		int i = 0;
+		for (WellContentDTO result : results) {
+			Assert.assertNotNull(result.getContainerCodeName());
+			Assert.assertEquals(wellCodes.get(i).replaceAll("\"", ""), result.getContainerCodeName());
+			if (result.getLevel() != null)
+				Assert.assertNotNull(result.getWellName());
+			i++;
+		}
+	}
+
+	@Test
+	@Transactional
+	public void containerDependencyCheck_Well() throws Exception {
+		String codeName = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate").getResultList()
+				.get(0).getCodeName();
+		MockHttpServletResponse response = this.mockMvc.perform(get("/api/v1/containers/checkDependencies/" + codeName)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				// .andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		DependencyCheckDTO results = DependencyCheckDTO.fromJsonToDependencyCheckDTO(responseJson);
+
+	}
+
+	@Test
+	@Transactional
+	public void validateContainerUniqueName() throws Exception {
 		String json = "{\"lsType\":\"subject\",\"lsKind\":\"test subject\",\"recordedBy\":\"bob\",\"recordedDate\":1452795015412,\"shortDescription\":\" \",\"lsLabels\":[{\"lsType\":\"name\",\"lsKind\":\"subject name\",\"labelText\":\"Test Cont 8\",\"ignored\":false,\"preferred\":true,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null},{\"lsType\":\"corpName\",\"lsKind\":\"ACAS LsContainer\",\"labelText\":\"TEST-00014\",\"ignored\":false,\"preferred\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null},{\"lsType\":\"barcode\",\"lsKind\":\"subject barcode\",\"labelText\":\"\",\"ignored\":false,\"preferred\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null}],\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"subject attributes\",\"lsValues\":[{\"lsType\":\"codeValue\",\"lsKind\":\"sex\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"codeKind\":\"sex\",\"codeType\":\"subject attributes\",\"codeOrigin\":\"ACAS DDICT\",\"codeValue\":\"male\",\"value\":\"male\"},{\"lsType\":\"codeValue\",\"lsKind\":\"species\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"codeKind\":\"species\",\"codeType\":\"subject attributes\",\"codeOrigin\":\"ACAS DDICT\",\"codeValue\":\"homo sapiens\",\"value\":\"homo sapiens\"}],\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\"},{\"lsType\":\"status\",\"lsKind\":\"current subject status\",\"lsValues\":[{\"lsType\":\"dateValue\",\"lsKind\":\"weight measured date\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"value\":1452643200000,\"dateValue\":1452643200000},{\"lsType\":\"codeValue\",\"lsKind\":\"weight measured by\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"value\":\"bob\",\"codeValue\":\"bob\"},{\"lsType\":\"numericValue\",\"lsKind\":\"current weight\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"value\":123,\"numericValue\":123}],\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\"}],\"cid\":\"c162\",\"_changing\":false,\"_previousAttributes\":{\"lsType\":\"container\",\"lsKind\":\"container\",\"corpName\":\"\",\"recordedBy\":\"bob\",\"recordedDate\":1452795007545,\"shortDescription\":\" \",\"lsLabels\":[{\"lsType\":\"name\",\"lsKind\":\"subject name\",\"labelText\":\"Test Cont 8\",\"ignored\":false,\"preferred\":true,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null},{\"lsType\":\"corpName\",\"lsKind\":\"ACAS LsContainer\",\"labelText\":\"TEST-00014\",\"ignored\":false,\"preferred\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null},{\"lsType\":\"barcode\",\"lsKind\":\"subject barcode\",\"labelText\":\"\",\"ignored\":false,\"preferred\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null}]},\"changed\":{\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"subject attributes\",\"lsValues\":[{\"lsType\":\"codeValue\",\"lsKind\":\"sex\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"codeKind\":\"sex\",\"codeType\":\"subject attributes\",\"codeOrigin\":\"ACAS DDICT\",\"codeValue\":\"male\",\"value\":\"male\"},{\"lsType\":\"codeValue\",\"lsKind\":\"species\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"codeKind\":\"species\",\"codeType\":\"subject attributes\",\"codeOrigin\":\"ACAS DDICT\",\"codeValue\":\"homo sapiens\",\"value\":\"homo sapiens\"}],\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\"},{\"lsType\":\"status\",\"lsKind\":\"current subject status\",\"lsValues\":[{\"lsType\":\"dateValue\",\"lsKind\":\"weight measured date\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"value\":1452643200000,\"dateValue\":1452643200000},{\"lsType\":\"codeValue\",\"lsKind\":\"weight measured by\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"value\":\"bob\",\"codeValue\":\"bob\"},{\"lsType\":\"numericValue\",\"lsKind\":\"current weight\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"value\":123,\"numericValue\":123}],\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\"}]},\"_pending\":false,\"urlRoot\":\"/api/containers/subject/test subject\",\"lsProperties\":{\"defaultLabels\":[{\"key\":\"subject name\",\"type\":\"name\",\"kind\":\"subject name\",\"preferred\":true},{\"key\":\"corpName\",\"type\":\"corpName\",\"kind\":\"ACAS LsContainer\",\"preferred\":false},{\"key\":\"subject barcode\",\"type\":\"barcode\",\"kind\":\"subject barcode\",\"preferred\":false}],\"defaultValues\":[{\"key\":\"sex\",\"stateType\":\"metadata\",\"stateKind\":\"subject attributes\",\"type\":\"codeValue\",\"kind\":\"sex\",\"codeType\":\"subject attributes\",\"codeKind\":\"sex\",\"codeOrigin\":\"ACAS DDICT\",\"value\":\"\"},{\"key\":\"species\",\"stateType\":\"metadata\",\"stateKind\":\"subject attributes\",\"type\":\"codeValue\",\"kind\":\"species\",\"codeType\":\"subject attributes\",\"codeKind\":\"species\",\"codeOrigin\":\"ACAS DDICT\",\"value\":\"\"},{\"key\":\"weight measured date\",\"stateType\":\"status\",\"stateKind\":\"current subject status\",\"type\":\"dateValue\",\"kind\":\"weight measured date\"},{\"key\":\"weight measured by\",\"stateType\":\"status\",\"stateKind\":\"current subject status\",\"type\":\"codeValue\",\"kind\":\"weight measured by\"},{\"key\":\"current weight\",\"stateType\":\"status\",\"stateKind\":\"current subject status\",\"type\":\"numericValue\",\"kind\":\"current weight\"}]},\"className\":\"Container\",\"validationError\":null,\"idAttribute\":\"id\"}";
 		Container jsonContainer = Container.fromJsonToContainer(json);
 		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/validate")
@@ -368,46 +370,49 @@ public void validateContainerUniqueName() throws Exception{
 		logger.info(responseJson);
 		Collection<ErrorMessage> errors = ErrorMessage.fromJsonArrayToErrorMessages(responseJson);
 		Assert.assertFalse(errors.isEmpty());
-    }
-    
-    @Test
-    @Transactional
-    public void getContainerById() throws Exception{
-    	Container container = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate").getResultList().get(0);
-    	String id = container.getId().toString();
-    	MockHttpServletResponse response = this.mockMvc.perform(get("/api/v1/containers/"+id)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Container result = Container.fromJsonToContainer(responseJson);
-    	Assert.assertNotNull(result.getCodeName());
-    }
-    
-    @Test
-    @Transactional
-    public void getContainerByCodeName() throws Exception{
-    	Container container = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate").getResultList().get(0);
-    	String codeName = container.getCodeName();
-    	MockHttpServletResponse response = this.mockMvc.perform(get("/api/v1/containers/"+codeName)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Container result = Container.fromJsonToContainer(responseJson);
-    	Assert.assertNotNull(result.getCodeName());
-    }
-    
-    @Test
-    @Transactional
-    public void getCodeNameFromNameRequest() throws Exception{
-    	Container container = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate").getResultList().get(0);
-    	String containerType = container.getLsType();
-    	String containerKind = container.getLsKind();
+	}
+
+	@Test
+	@Transactional
+	public void getContainerById() throws Exception {
+		Container container = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate")
+				.getResultList().get(0);
+		String id = container.getId().toString();
+		MockHttpServletResponse response = this.mockMvc.perform(get("/api/v1/containers/" + id)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Container result = Container.fromJsonToContainer(responseJson);
+		Assert.assertNotNull(result.getCodeName());
+	}
+
+	@Test
+	@Transactional
+	public void getContainerByCodeName() throws Exception {
+		Container container = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate")
+				.getResultList().get(0);
+		String codeName = container.getCodeName();
+		MockHttpServletResponse response = this.mockMvc.perform(get("/api/v1/containers/" + codeName)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Container result = Container.fromJsonToContainer(responseJson);
+		Assert.assertNotNull(result.getCodeName());
+	}
+
+	@Test
+	@Transactional
+	public void getCodeNameFromNameRequest() throws Exception {
+		Container container = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate")
+				.getResultList().get(0);
+		String containerType = container.getLsType();
+		String containerKind = container.getLsKind();
 		String label = container.getLsLabels().iterator().next().getLabelText();
 		PreferredNameDTO request = new PreferredNameDTO(label, null, null);
 		Collection<PreferredNameDTO> requests = new HashSet<PreferredNameDTO>();
@@ -416,113 +421,118 @@ public void getCodeNameFromNameRequest() throws Exception{
 		requestDTO.setRequests(requests);
 		String json = requestDTO.toJson();
 		Assert.assertFalse(json.equals("{}"));
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getCodeNameFromNameRequest"
-    			+ "?containerType="+containerType+"&containerKind="+containerKind)
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	PreferredNameResultsDTO results = PreferredNameResultsDTO.fromJsonToPreferredNameResultsDTO(responseJson);
-    	for (PreferredNameDTO result : results.getResults()){
-    		Assert.assertNotNull(result.getRequestName());
-    		Assert.assertNotNull(result.getReferenceName());
-    		Assert.assertNotNull(result.getPreferredName());
-    	}
-    }
-    @Test
-    @Transactional
-    public void getWellContentPartialSuccess() throws Exception{
-    	List<String> wellCodes = new ArrayList<String>();
-    	TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("well","default");
-    	query.setMaxResults(25);
-    	for (Container container : query.getResultList()){
-    		wellCodes.add("\""+container.getCodeName()+"\"");	
-    	}
-    	wellCodes.add("\"NOT-A-VALID-CODE\"");
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getCodeNameFromNameRequest"
+				+ "?containerType=" + containerType + "&containerKind=" + containerKind)
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		PreferredNameResultsDTO results = PreferredNameResultsDTO.fromJsonToPreferredNameResultsDTO(responseJson);
+		for (PreferredNameDTO result : results.getResults()) {
+			Assert.assertNotNull(result.getRequestName());
+			Assert.assertNotNull(result.getReferenceName());
+			Assert.assertNotNull(result.getPreferredName());
+		}
+	}
+
+	@Test
+	@Transactional
+	public void getWellContentPartialSuccess() throws Exception {
+		List<String> wellCodes = new ArrayList<String>();
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("well", "default");
+		query.setMaxResults(25);
+		for (Container container : query.getResultList()) {
+			wellCodes.add("\"" + container.getCodeName() + "\"");
+		}
+		wellCodes.add("\"NOT-A-VALID-CODE\"");
 		String json = wellCodes.toString();
 		logger.info(json);
 		Assert.assertFalse(json.equals("{}"));
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getWellContent")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isBadRequest())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<WellContentDTO> results = WellContentDTO.fromJsonArrayToWellCoes(responseJson);
-    	for (WellContentDTO result : results){
-    		Assert.assertNotNull(result.getContainerCodeName());
-    	}
-    }
-    
-    @Test
-    @Transactional
-    public void throwInTrash() throws Exception{
-    	//TODO: add query with containerCodeName modifiedBy and modifiedDate
-    	Collection<ContainerRequestDTO> containerCodeDTOs = new HashSet<ContainerRequestDTO>();
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getWellContent")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isBadRequest())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<WellContentDTO> results = WellContentDTO.fromJsonArrayToWellCoes(responseJson);
+		for (WellContentDTO result : results) {
+			Assert.assertNotNull(result.getContainerCodeName());
+		}
+	}
+
+	@Test
+	@Transactional
+	public void throwInTrash() throws Exception {
+		// TODO: add query with containerCodeName modifiedBy and modifiedDate
+		Collection<ContainerRequestDTO> containerCodeDTOs = new HashSet<ContainerRequestDTO>();
 		ContainerRequestDTO containerCodeDTO = new ContainerRequestDTO();
-		containerCodeDTO.setContainerCodeName(Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate").getResultList().get(0).getCodeName());
+		containerCodeDTO
+				.setContainerCodeName(Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate")
+						.getResultList().get(0).getCodeName());
 		containerCodeDTO.setModifiedBy("bfielder");
 		containerCodeDTO.setModifiedDate(new Date());
 		containerCodeDTOs.add(containerCodeDTO);
 		String json = ContainerRequestDTO.toJsonArray(containerCodeDTOs);
 		logger.info(json);
 		Assert.assertFalse(json.equals("[{}]"));
-    	ResultActions response = this.mockMvc.perform(post("/api/v1/containers/throwInTrash")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isNoContent());
-    }
-    
-    @Test
-    @Transactional
-    public void throwInTrash_InternalError() throws Exception{
+		ResultActions response = this.mockMvc.perform(post("/api/v1/containers/throwInTrash")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isNoContent());
+	}
+
+	@Test
+	@Transactional
+	public void throwInTrash_InternalError() throws Exception {
 		String json = "[{\"containerCodeName\":\"total-garbage\",\"modifiedDate\":\"not-a-date\"}]";
 		logger.info(json);
 		Assert.assertFalse(json.equals("[{}]"));
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/throwInTrash")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isInternalServerError())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();;
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/throwInTrash")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isInternalServerError())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		;
 		logger.info(response.getContentAsString());
 		Assert.assertTrue(response.getContentAsString().length() > 0);
-    }
-    
-    @Test
-    @Transactional
-    public void throwInTrash_PartialError() throws Exception{
+	}
+
+	@Test
+	@Transactional
+	public void throwInTrash_PartialError() throws Exception {
 		String json = "[{\"containerCodeName\":\"total-garbage\",\"modifiedDate\":1455057684000}]";
 		logger.info(json);
 		Assert.assertFalse(json.equals("[{}]"));
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/throwInTrash")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isBadRequest())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();;
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/throwInTrash")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isBadRequest())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		;
 		logger.info(response.getContentAsString());
 		Assert.assertTrue(response.getContentAsString().length() > 0);
 		Collection<ContainerErrorMessageDTO> errors = ContainerErrorMessageDTO.fromJsonArrayToContainerErroes(json);
 		Assert.assertFalse(errors.isEmpty());
-    }
-    
-    @Test
-    @Transactional
-    public void updateAmountInWell_success() throws Exception{
-    	Collection<ContainerRequestDTO> containerCodeDTOs = new HashSet<ContainerRequestDTO>();
+	}
+
+	@Test
+	@Transactional
+	public void updateAmountInWell_success() throws Exception {
+		Collection<ContainerRequestDTO> containerCodeDTOs = new HashSet<ContainerRequestDTO>();
 		ContainerRequestDTO containerCodeDTO = new ContainerRequestDTO();
-		TypedQuery<Container> wellQuery = Container.findContainersByLsTypeEqualsAndLsKindEquals("well","default");
+		TypedQuery<Container> wellQuery = Container.findContainersByLsTypeEqualsAndLsKindEquals("well", "default");
 		wellQuery.setMaxResults(1);
 		containerCodeDTO.setContainerCodeName(wellQuery.getSingleResult().getCodeName());
 		containerCodeDTO.setAmount(new BigDecimal(10));
@@ -533,49 +543,52 @@ public void updateAmountInWell_success() throws Exception{
 		String json = ContainerRequestDTO.toJsonArray(containerCodeDTOs);
 		logger.info(json);
 		Assert.assertFalse(json.equals("[{}]"));
-    	ResultActions response = this.mockMvc.perform(post("/api/v1/containers/updateAmountInWell")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isNoContent());
-    }
-    
-    @Test
-    @Transactional
-    public void getWellContentByPlateBarcode() throws Exception{
-    	TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate");
-    	query.setMaxResults(1);
-    	Container container = query.getSingleResult();
-    	String plateBarcode = container.getLsLabels().iterator().next().getLabelText();
+		ResultActions response = this.mockMvc.perform(post("/api/v1/containers/updateAmountInWell")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isNoContent());
+	}
+
+	@Test
+	@Transactional
+	public void getWellContentByPlateBarcode() throws Exception {
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate");
+		query.setMaxResults(1);
+		Container container = query.getSingleResult();
+		String plateBarcode = container.getLsLabels().iterator().next().getLabelText();
 		logger.info(plateBarcode);
-    	MockHttpServletResponse response = this.mockMvc.perform(get("/api/v1/containers/getWellContentByPlateBarcode/"+plateBarcode)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<WellContentDTO> results = WellContentDTO.fromJsonArrayToWellCoes(responseJson);
-    	for (WellContentDTO result : results){
-    		Assert.assertNotNull(result.getContainerCodeName());
-    		Assert.assertNotNull(result.getWellName());
-    		Assert.assertNotNull(result.getRowIndex());
-    		Assert.assertNotNull(result.getColumnIndex());
-    		Assert.assertNotNull(result.getRecordedBy());
-    		Assert.assertNotNull(result.getRecordedDate());
-    	}
-    }
-    
-    @Test
+		MockHttpServletResponse response = this.mockMvc
+				.perform(get("/api/v1/containers/getWellContentByPlateBarcode/" + plateBarcode)
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<WellContentDTO> results = WellContentDTO.fromJsonArrayToWellCoes(responseJson);
+		for (WellContentDTO result : results) {
+			Assert.assertNotNull(result.getContainerCodeName());
+			Assert.assertNotNull(result.getWellName());
+			Assert.assertNotNull(result.getRowIndex());
+			Assert.assertNotNull(result.getColumnIndex());
+			Assert.assertNotNull(result.getRecordedBy());
+			Assert.assertNotNull(result.getRecordedDate());
+		}
+	}
+
+	@Test
 	@Transactional
-	@Rollback(value=false)
-	public void createEmptyPlate() throws Exception{
-		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("definition container", "plate");
+	@Rollback(value = false)
+	public void createEmptyPlate() throws Exception {
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("definition container",
+				"plate");
 		query.setMaxResults(1);
-		try{
+		try {
 			Container definition = query.getSingleResult();
-		}catch (NoResultException e){
-			Container definition = Container.fromJsonToContainer("{\"codeName\":\"special-definition-code\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"plate\",\"lsLabels\":[{\"deleted\":false,\"id\":null,\"ignored\":false,\"labelText\":\"1536\",\"lsKind\":\"common\",\"lsType\":\"name\",\"lsTypeAndKind\":\"name_common\",\"physicallyLabled\":true,\"preferred\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"version\":null}],\"lsStates\":[{\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"format\",\"lsType\":\"constants\",\"lsTypeAndKind\":\"constants_format\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"columns\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_columns\",\"numericValue\":48,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"unitTypeAndKind\":\"null_null\",\"version\":null},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"rows\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_rows\",\"numericValue\":32,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"unitTypeAndKind\":\"null_null\",\"version\":null},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"wells\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_wells\",\"numericValue\":1536,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"unitTypeAndKind\":\"null_null\",\"version\":null},{\"codeTypeAndKind\":\"null_null\",\"codeValue\":\"A001\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"subcontainer naming convention\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_subcontainer naming convention\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"unitTypeAndKind\":\"null_null\",\"version\":null}],\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"version\":null}],\"lsType\":\"definition container\",\"lsTypeAndKind\":\"definition container_plate\",\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"version\":null}");
+		} catch (NoResultException e) {
+			Container definition = Container.fromJsonToContainer(
+					"{\"codeName\":\"special-definition-code\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"plate\",\"lsLabels\":[{\"deleted\":false,\"id\":null,\"ignored\":false,\"labelText\":\"1536\",\"lsKind\":\"common\",\"lsType\":\"name\",\"lsTypeAndKind\":\"name_common\",\"physicallyLabled\":true,\"preferred\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"version\":null}],\"lsStates\":[{\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"format\",\"lsType\":\"constants\",\"lsTypeAndKind\":\"constants_format\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"columns\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_columns\",\"numericValue\":48,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"unitTypeAndKind\":\"null_null\",\"version\":null},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"rows\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_rows\",\"numericValue\":32,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"unitTypeAndKind\":\"null_null\",\"version\":null},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"wells\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_wells\",\"numericValue\":1536,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"unitTypeAndKind\":\"null_null\",\"version\":null},{\"codeTypeAndKind\":\"null_null\",\"codeValue\":\"A001\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"subcontainer naming convention\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_subcontainer naming convention\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"unitTypeAndKind\":\"null_null\",\"version\":null}],\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"version\":null}],\"lsType\":\"definition container\",\"lsTypeAndKind\":\"definition container_plate\",\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"version\":null}");
 			containerService.saveLsContainer(definition);
 		}
 		Container definition = query.getSingleResult();
@@ -587,39 +600,41 @@ public void createEmptyPlate() throws Exception{
 		String json = plateRequest.toJson();
 		logger.info(json);
 		Assert.assertFalse(json.equals("{}"));
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/createPlate")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();;
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/createPlate")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		;
 		logger.info(response.getContentAsString());
 		PlateStubDTO result = PlateStubDTO.fromJsonToPlateStubDTO(response.getContentAsString());
-    	logger.info(result.toJson());
-    	Assert.assertEquals(1536, result.getWells().size());
-    	String[][] plateLayout = new String[32][48];
-    	for (WellStubDTO well : result.getWells()){
-    		logger.debug(well.getRowIndex().toString() + ", "+well.getColumnIndex().toString());
-    		plateLayout[well.getRowIndex()-1][well.getColumnIndex()-1] = well.getWellName();
-    	}
-    	logger.info(Arrays.deepToString(plateLayout));
-    	Container newPlate = Container.findContainerByCodeNameEquals(result.getCodeName());
-    	Assert.assertFalse(newPlate.getLsStates().isEmpty());
-    	Assert.assertEquals(1, newPlate.getLsStates().size());
-    	for (ContainerState state : newPlate.getLsStates()){
-    		Assert.assertFalse(state.getLsValues().isEmpty());
-    		Assert.assertEquals("metadata", state.getLsType());
-    		Assert.assertEquals("information", state.getLsKind());
-    		Assert.assertEquals(3, state.getLsValues().size());
-    	}
+		logger.info(result.toJson());
+		Assert.assertEquals(1536, result.getWells().size());
+		String[][] plateLayout = new String[32][48];
+		for (WellStubDTO well : result.getWells()) {
+			logger.debug(well.getRowIndex().toString() + ", " + well.getColumnIndex().toString());
+			plateLayout[well.getRowIndex() - 1][well.getColumnIndex() - 1] = well.getWellName();
+		}
+		logger.info(Arrays.deepToString(plateLayout));
+		Container newPlate = Container.findContainerByCodeNameEquals(result.getCodeName());
+		Assert.assertFalse(newPlate.getLsStates().isEmpty());
+		Assert.assertEquals(1, newPlate.getLsStates().size());
+		for (ContainerState state : newPlate.getLsStates()) {
+			Assert.assertFalse(state.getLsValues().isEmpty());
+			Assert.assertEquals("metadata", state.getLsType());
+			Assert.assertEquals("information", state.getLsKind());
+			Assert.assertEquals(3, state.getLsValues().size());
+		}
 	}
-	
+
 	@Test
 	@Transactional
-	@Rollback(value=true)
-	public void createPartiallyFilledPlate() throws Exception{
-		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("definition container", "plate");
+	@Rollback(value = true)
+	public void createPartiallyFilledPlate() throws Exception {
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("definition container",
+				"plate");
 		query.setMaxResults(1);
 		Container definition = query.getSingleResult();
 		CreatePlateRequestDTO plateRequest = new CreatePlateRequestDTO();
@@ -646,56 +661,66 @@ public void createPartiallyFilledPlate() throws Exception{
 		String json = plateRequest.toJson();
 		logger.info(json);
 		Assert.assertFalse(json.equals("[{}]"));
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/createPlate")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();;
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/createPlate")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		;
 		logger.info(response.getContentAsString());
 		PlateStubDTO result = PlateStubDTO.fromJsonToPlateStubDTO(response.getContentAsString());
-    	logger.info(result.toJson());
-    	Assert.assertEquals(1536, result.getWells().size());
-    	String[][] plateLayout = new String[32][48];
-//    	for (WellStubDTO well : result.getWells()){
-//    		plateLayout[well.getRowIndex()][well.getColumnIndex()] = well.getWellName();
-//    		if (well.getWellName().equals("A001")){
-//    			Collection<ContainerRequestDTO> checkWells = new ArrayList<ContainerRequestDTO>();
-//    			ContainerRequestDTO checkWell = new ContainerRequestDTO(well.getCodeName(), null, null);
-//    			checkWells.add(checkWell);
-//    			WellContentDTO checkResult = containerService.getWellContent(checkWells).iterator().next();
-//    			Assert.assertEquals(new BigDecimal(1), checkResult.getAmount());
-//    			logger.info("checked well A001");
-//    		}
-//    		if (well.getWellName().equals("B003")){
-//    			Collection<ContainerRequestDTO> checkWells = new ArrayList<ContainerRequestDTO>();
-//    			ContainerRequestDTO checkWell = new ContainerRequestDTO(well.getCodeName(), null, null);
-//    			checkWells.add(checkWell);
-//    			WellContentDTO checkResult = containerService.getWellContent(checkWells).iterator().next();
-//    			Assert.assertEquals(new BigDecimal(2), checkResult.getAmount());
-//    			logger.info("checked well B003");
-//
-//    		}
-//    		if (well.getWellName().equals("AA007")){
-//    			Collection<ContainerRequestDTO> checkWells = new ArrayList<ContainerRequestDTO>();
-//    			ContainerRequestDTO checkWell = new ContainerRequestDTO(well.getCodeName(), null, null);
-//    			checkWells.add(checkWell);
-//    			WellContentDTO checkResult = containerService.getWellContent(checkWells).iterator().next();
-//    			Assert.assertEquals(new BigDecimal(3), checkResult.getAmount());
-//    			logger.info("checked well AA007");
-//
-//    		}
-//    	}
-    	logger.info(Arrays.deepToString(plateLayout));
-    	
-    	
+		logger.info(result.toJson());
+		Assert.assertEquals(1536, result.getWells().size());
+		String[][] plateLayout = new String[32][48];
+		// for (WellStubDTO well : result.getWells()){
+		// plateLayout[well.getRowIndex()][well.getColumnIndex()] = well.getWellName();
+		// if (well.getWellName().equals("A001")){
+		// Collection<ContainerRequestDTO> checkWells = new
+		// ArrayList<ContainerRequestDTO>();
+		// ContainerRequestDTO checkWell = new ContainerRequestDTO(well.getCodeName(),
+		// null, null);
+		// checkWells.add(checkWell);
+		// WellContentDTO checkResult =
+		// containerService.getWellContent(checkWells).iterator().next();
+		// Assert.assertEquals(new BigDecimal(1), checkResult.getAmount());
+		// logger.info("checked well A001");
+		// }
+		// if (well.getWellName().equals("B003")){
+		// Collection<ContainerRequestDTO> checkWells = new
+		// ArrayList<ContainerRequestDTO>();
+		// ContainerRequestDTO checkWell = new ContainerRequestDTO(well.getCodeName(),
+		// null, null);
+		// checkWells.add(checkWell);
+		// WellContentDTO checkResult =
+		// containerService.getWellContent(checkWells).iterator().next();
+		// Assert.assertEquals(new BigDecimal(2), checkResult.getAmount());
+		// logger.info("checked well B003");
+		//
+		// }
+		// if (well.getWellName().equals("AA007")){
+		// Collection<ContainerRequestDTO> checkWells = new
+		// ArrayList<ContainerRequestDTO>();
+		// ContainerRequestDTO checkWell = new ContainerRequestDTO(well.getCodeName(),
+		// null, null);
+		// checkWells.add(checkWell);
+		// WellContentDTO checkResult =
+		// containerService.getWellContent(checkWells).iterator().next();
+		// Assert.assertEquals(new BigDecimal(3), checkResult.getAmount());
+		// logger.info("checked well AA007");
+		//
+		// }
+		// }
+		logger.info(Arrays.deepToString(plateLayout));
+
 	}
-	
+
 	@Test
-    @Transactional
-    public void createPlateAndGetContent() throws Exception{
-		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("definition container", "plate");
+	@Transactional
+	public void createPlateAndGetContent() throws Exception {
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("definition container",
+				"plate");
 		query.setMaxResults(1);
 		Container definition = query.getSingleResult();
 		CreatePlateRequestDTO plateRequest = new CreatePlateRequestDTO();
@@ -705,82 +730,88 @@ public void createPlateAndGetContent() throws Exception{
 		String json = plateRequest.toJson();
 		logger.info(json);
 		Assert.assertFalse(json.equals("{}"));
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/createPlate")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();;
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/createPlate")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		;
 		logger.info(response.getContentAsString());
 		PlateStubDTO result = PlateStubDTO.fromJsonToPlateStubDTO(response.getContentAsString());
-    	logger.info(result.toJson());
-    	Assert.assertEquals(1536, result.getWells().size());
-    	String[][] plateLayout = new String[32][48];
-    	for (WellStubDTO well : result.getWells()){
-    		logger.debug(well.getRowIndex().toString() + ", "+well.getColumnIndex().toString());
-    		plateLayout[well.getRowIndex()][well.getColumnIndex()] = well.getWellName();
-    	}
-    	
-    	String plateBarcode = result.getBarcode();
+		logger.info(result.toJson());
+		Assert.assertEquals(1536, result.getWells().size());
+		String[][] plateLayout = new String[32][48];
+		for (WellStubDTO well : result.getWells()) {
+			logger.debug(well.getRowIndex().toString() + ", " + well.getColumnIndex().toString());
+			plateLayout[well.getRowIndex()][well.getColumnIndex()] = well.getWellName();
+		}
+
+		String plateBarcode = result.getBarcode();
 		logger.info(plateBarcode);
-    	MockHttpServletResponse response2 = this.mockMvc.perform(get("/api/v1/containers/getWellContentByPlateBarcode/"+plateBarcode)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response2.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<WellContentDTO> results = WellContentDTO.fromJsonArrayToWellCoes(responseJson);
-    	for (WellContentDTO resultWell : results){
-    		Assert.assertNotNull(resultWell.getContainerCodeName());
-    		Assert.assertNotNull(resultWell.getWellName());
-    		Assert.assertNotNull(resultWell.getRowIndex());
-    		Assert.assertNotNull(resultWell.getColumnIndex());
-    		Assert.assertNotNull(resultWell.getRecordedBy());
-    		Assert.assertNotNull(resultWell.getRecordedDate());
-    	}
-    }
-	
+		MockHttpServletResponse response2 = this.mockMvc
+				.perform(get("/api/v1/containers/getWellContentByPlateBarcode/" + plateBarcode)
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response2.getContentAsString();
+		logger.info(responseJson);
+		Collection<WellContentDTO> results = WellContentDTO.fromJsonArrayToWellCoes(responseJson);
+		for (WellContentDTO resultWell : results) {
+			Assert.assertNotNull(resultWell.getContainerCodeName());
+			Assert.assertNotNull(resultWell.getWellName());
+			Assert.assertNotNull(resultWell.getRowIndex());
+			Assert.assertNotNull(resultWell.getColumnIndex());
+			Assert.assertNotNull(resultWell.getRecordedBy());
+			Assert.assertNotNull(resultWell.getRecordedDate());
+		}
+	}
+
 	@Test
-    @Transactional
-    public void getPlateTypeByPlateBarcode() throws Exception{
-//    	TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate");
-//    	query.setMaxResults(1);
-    	Container container = Container.findContainerByCodeNameEquals("CONT-5");
-    	String plateBarcode = container.getLsLabels().iterator().next().getLabelText();
+	@Transactional
+	public void getPlateTypeByPlateBarcode() throws Exception {
+		// TypedQuery<Container> query =
+		// Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate");
+		// query.setMaxResults(1);
+		Container container = Container.findContainerByCodeNameEquals("CONT-5");
+		String plateBarcode = container.getLsLabels().iterator().next().getLabelText();
 		logger.info(plateBarcode);
-    	MockHttpServletResponse response = this.mockMvc.perform(get("/api/v1/containers/getPlateTypeByPlateBarcode/"+plateBarcode)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	PlateStubDTO result = PlateStubDTO.fromJsonToPlateStubDTO(responseJson);
-    	Assert.assertNotNull(result.getCodeName());
-    	Assert.assertNotNull(result.getBarcode());
-    	Assert.assertNotNull(result.getPlateType());
-    }
-	
+		MockHttpServletResponse response = this.mockMvc
+				.perform(get("/api/v1/containers/getPlateTypeByPlateBarcode/" + plateBarcode)
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		PlateStubDTO result = PlateStubDTO.fromJsonToPlateStubDTO(responseJson);
+		Assert.assertNotNull(result.getCodeName());
+		Assert.assertNotNull(result.getBarcode());
+		Assert.assertNotNull(result.getPlateType());
+	}
+
 	@Test
-    @Transactional
-    public void getPlateTypeByPlateBarcode_notFound() throws Exception{
-    	String plateBarcode = "Not-A-Valid-Barcode123";
+	@Transactional
+	public void getPlateTypeByPlateBarcode_notFound() throws Exception {
+		String plateBarcode = "Not-A-Valid-Barcode123";
 		logger.info(plateBarcode);
-    	MockHttpServletResponse response = this.mockMvc.perform(get("/api/v1/containers/getPlateTypeByPlateBarcode/"+plateBarcode)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isNotFound())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    }
-	
+		MockHttpServletResponse response = this.mockMvc
+				.perform(get("/api/v1/containers/getPlateTypeByPlateBarcode/" + plateBarcode)
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isNotFound())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+	}
+
 	@Test
-    @Transactional
-    public void createPlateAndRejectDupe() throws Exception{
-		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("definition container", "plate");
+	@Transactional
+	public void createPlateAndRejectDupe() throws Exception {
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("definition container",
+				"plate");
 		query.setMaxResults(1);
 		Container definition = query.getSingleResult();
 		CreatePlateRequestDTO plateRequest = new CreatePlateRequestDTO();
@@ -790,168 +821,174 @@ public void createPlateAndRejectDupe() throws Exception{
 		String json = plateRequest.toJson();
 		logger.info(json);
 		Assert.assertFalse(json.equals("{}"));
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/createPlate")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/createPlate")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
 		logger.info(response.getContentAsString());
 		PlateStubDTO result = PlateStubDTO.fromJsonToPlateStubDTO(response.getContentAsString());
-    	logger.info(result.toJson());
-    	Assert.assertEquals(1536, result.getWells().size());
-    	
+		logger.info(result.toJson());
+		Assert.assertEquals(1536, result.getWells().size());
+
 		String dupeJson = plateRequest.toJson();
 		logger.info(dupeJson);
 		MockHttpServletResponse dupeResponse = this.mockMvc.perform(post("/api/v1/containers/createPlate")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isBadRequest())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isBadRequest())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
 		logger.info(dupeResponse.getContentAsString());
-    }
-	
-	@Test
-    @Transactional
-    public void getContainersByCodeNames() throws Exception{
-    	List<String> codeNames = new ArrayList<String>();
-    	TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("well","default");
-    	query.setMaxResults(25);
-    	for (Container container : query.getResultList()){
-    		codeNames.add("\""+container.getCodeName()+"\"");	
-    	}
-		String json = codeNames.toString();
-		logger.info(json);
-		Assert.assertFalse(json.equals("{}"));
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getContainersByCodeNames")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<ContainerErrorMessageDTO> results = ContainerErrorMessageDTO.fromJsonArrayToContainerErroes(responseJson);
-    	for (ContainerErrorMessageDTO result : results){
-    		Assert.assertNotNull(result);
-    		if (result.getLevel() == null){
-    			Assert.assertNotNull(result.getContainer());
-    			Assert.assertFalse(result.getContainer().getLsStates().isEmpty());
-    		}
-    		
-    	}
-    }
-	
-	@Test
-    @Transactional
-    public void getContainersByCodeNames_errors() throws Exception{
-    	List<String> codeNames = new ArrayList<String>();
-    	TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("well","default");
-    	query.setMaxResults(25);
-    	for (Container container : query.getResultList()){
-    		codeNames.add("\""+container.getCodeName()+"\"");	
-    	}
-    	codeNames.add("\"INVALID-CODENAME\"");
-		String json = codeNames.toString();
-		logger.info(json);
-		Assert.assertFalse(json.equals("{}"));
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getContainersByCodeNames")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isBadRequest())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<ContainerErrorMessageDTO> results = ContainerErrorMessageDTO.fromJsonArrayToContainerErroes(responseJson);
-    	for (ContainerErrorMessageDTO result : results){
-    		Assert.assertNotNull(result);
-    		if (result.getLevel() == null){
-    			Assert.assertNotNull(result.getContainer());
-    			Assert.assertFalse(result.getContainer().getLsStates().isEmpty());
-    		}
-    		else{
-    			Assert.assertNull(result.getContainer());
-    		}
-    		
-    	}
-    }
-	
+	}
+
 	@Test
-    @Transactional
-    public void getContainersByCodeNames_thousands() throws Exception{
-    	List<String> codeNames = new ArrayList<String>();
-    	TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("well","default");
-    	query.setMaxResults(1020);
-    	for (Container container : query.getResultList()){
-    		codeNames.add("\""+container.getCodeName()+"\"");	
-    	}
+	@Transactional
+	public void getContainersByCodeNames() throws Exception {
+		List<String> codeNames = new ArrayList<String>();
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("well", "default");
+		query.setMaxResults(25);
+		for (Container container : query.getResultList()) {
+			codeNames.add("\"" + container.getCodeName() + "\"");
+		}
 		String json = codeNames.toString();
 		logger.info(json);
 		Assert.assertFalse(json.equals("{}"));
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getContainersByCodeNames")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<ContainerErrorMessageDTO> results = ContainerErrorMessageDTO.fromJsonArrayToContainerErroes(responseJson);
-    	for (ContainerErrorMessageDTO result : results){
-    		Assert.assertNotNull(result);
-    		if (result.getLevel() == null){
-    			Assert.assertNotNull(result.getContainer());
-    			Assert.assertFalse(result.getContainer().getLsStates().isEmpty());
-    		}
-    		
-    	}
-    }
-	
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getContainersByCodeNames")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<ContainerErrorMessageDTO> results = ContainerErrorMessageDTO
+				.fromJsonArrayToContainerErroes(responseJson);
+		for (ContainerErrorMessageDTO result : results) {
+			Assert.assertNotNull(result);
+			if (result.getLevel() == null) {
+				Assert.assertNotNull(result.getContainer());
+				Assert.assertFalse(result.getContainer().getLsStates().isEmpty());
+			}
+
+		}
+	}
+
 	@Test
-    @Transactional
-    public void getDefinitionContainersByContainerCodeNames() throws Exception{
-    	List<String> codeNames = new ArrayList<String>();
-    	TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate");
-    	query.setMaxResults(1);
-    	for (Container container : query.getResultList()){
-    		codeNames.add("\""+container.getCodeName()+"\"");	
-    	}
+	@Transactional
+	public void getContainersByCodeNames_errors() throws Exception {
+		List<String> codeNames = new ArrayList<String>();
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("well", "default");
+		query.setMaxResults(25);
+		for (Container container : query.getResultList()) {
+			codeNames.add("\"" + container.getCodeName() + "\"");
+		}
+		codeNames.add("\"INVALID-CODENAME\"");
 		String json = codeNames.toString();
 		logger.info(json);
 		Assert.assertFalse(json.equals("{}"));
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getDefinitionContainersByContainerCodeNames")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<ContainerErrorMessageDTO> results = ContainerErrorMessageDTO.fromJsonArrayToContainerErroes(responseJson);
-    	for (ContainerErrorMessageDTO result : results){
-    		Assert.assertNotNull(result);
-    		if (result.getLevel() == null){
-    			Assert.assertNotNull(result.getDefinition());
-    			Assert.assertFalse(result.getDefinition().getLsStates().isEmpty());
-    		}
-    		Assert.assertNull(result.getContainer());
-    		
-    	}
-    }
-	
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getContainersByCodeNames")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isBadRequest())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<ContainerErrorMessageDTO> results = ContainerErrorMessageDTO
+				.fromJsonArrayToContainerErroes(responseJson);
+		for (ContainerErrorMessageDTO result : results) {
+			Assert.assertNotNull(result);
+			if (result.getLevel() == null) {
+				Assert.assertNotNull(result.getContainer());
+				Assert.assertFalse(result.getContainer().getLsStates().isEmpty());
+			} else {
+				Assert.assertNull(result.getContainer());
+			}
+
+		}
+	}
+
 	@Test
-    @Transactional
-    public void containerDependencyCheck_Fail() throws Exception{
-		Container plate = Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate").getResultList().get(0);
-		Container well = Container.findContainersByLsTypeEqualsAndLsKindEquals("well","default").getResultList().get(0);
+	@Transactional
+	public void getContainersByCodeNames_thousands() throws Exception {
+		List<String> codeNames = new ArrayList<String>();
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("well", "default");
+		query.setMaxResults(1020);
+		for (Container container : query.getResultList()) {
+			codeNames.add("\"" + container.getCodeName() + "\"");
+		}
+		String json = codeNames.toString();
+		logger.info(json);
+		Assert.assertFalse(json.equals("{}"));
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getContainersByCodeNames")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<ContainerErrorMessageDTO> results = ContainerErrorMessageDTO
+				.fromJsonArrayToContainerErroes(responseJson);
+		for (ContainerErrorMessageDTO result : results) {
+			Assert.assertNotNull(result);
+			if (result.getLevel() == null) {
+				Assert.assertNotNull(result.getContainer());
+				Assert.assertFalse(result.getContainer().getLsStates().isEmpty());
+			}
+
+		}
+	}
+
+	@Test
+	@Transactional
+	public void getDefinitionContainersByContainerCodeNames() throws Exception {
+		List<String> codeNames = new ArrayList<String>();
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate");
+		query.setMaxResults(1);
+		for (Container container : query.getResultList()) {
+			codeNames.add("\"" + container.getCodeName() + "\"");
+		}
+		String json = codeNames.toString();
+		logger.info(json);
+		Assert.assertFalse(json.equals("{}"));
+		MockHttpServletResponse response = this.mockMvc
+				.perform(post("/api/v1/containers/getDefinitionContainersByContainerCodeNames")
+						.contentType(MediaType.APPLICATION_JSON)
+						.accept(MediaType.APPLICATION_JSON)
+						.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<ContainerErrorMessageDTO> results = ContainerErrorMessageDTO
+				.fromJsonArrayToContainerErroes(responseJson);
+		for (ContainerErrorMessageDTO result : results) {
+			Assert.assertNotNull(result);
+			if (result.getLevel() == null) {
+				Assert.assertNotNull(result.getDefinition());
+				Assert.assertFalse(result.getDefinition().getLsStates().isEmpty());
+			}
+			Assert.assertNull(result.getContainer());
+
+		}
+	}
+
+	@Test
+	@Transactional
+	public void containerDependencyCheck_Fail() throws Exception {
+		Container plate = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate").getResultList()
+				.get(0);
+		Container well = Container.findContainersByLsTypeEqualsAndLsKindEquals("well", "default").getResultList()
+				.get(0);
 		Protocol testProtocol = new Protocol();
 		testProtocol.setCodeName("TEST-PRCL");
 		testProtocol.setRecordedBy("acas");
@@ -1006,7 +1043,7 @@ public void containerDependencyCheck_Fail() throws Exception{
 		testExpt.merge();
 		testAG.merge();
 		testTG.merge();
-		
+
 		ItxSubjectContainer itx = new ItxSubjectContainer();
 		itx.setCodeName("TEST-ITX");
 		itx.setRecordedBy("acas");
@@ -1019,214 +1056,224 @@ public void containerDependencyCheck_Fail() throws Exception{
 		well.getSubjects().add(itx);
 		well.merge();
 		Long before = (new Date()).getTime();
-    	ContainerDependencyCheckDTO result = containerService.checkDependencies(plate);
+		ContainerDependencyCheckDTO result = containerService.checkDependencies(plate);
 		Long after = (new Date()).getTime();
-		logger.info("ms elapsed: "+ String.valueOf(after-before));
+		logger.info("ms elapsed: " + String.valueOf(after - before));
 		logger.info(result.toJson());
 		Assert.assertTrue(result.isLinkedDataExists());
 		Assert.assertFalse(result.getLinkedExperiments().isEmpty());
-    	String codeName = plate.getCodeName();
-    	MockHttpServletResponse response = this.mockMvc.perform(get("/api/v1/containers/checkDependencies/"+codeName)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-//    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	DependencyCheckDTO results = DependencyCheckDTO.fromJsonToDependencyCheckDTO(responseJson);
-    	Assert.assertTrue(results.getLinkedDataExists());
-    	
-    }
+		String codeName = plate.getCodeName();
+		MockHttpServletResponse response = this.mockMvc.perform(get("/api/v1/containers/checkDependencies/" + codeName)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				// .andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		DependencyCheckDTO results = DependencyCheckDTO.fromJsonToDependencyCheckDTO(responseJson);
+		Assert.assertTrue(results.getLinkedDataExists());
+
+	}
 
 	@Test
-    @Transactional
-    public void logicalDeleteContainer() throws Exception{
-    	TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate");
-    	query.setMaxResults(1);
-    	Container container = query.getSingleResult();
-    	MockHttpServletResponse response = this.mockMvc.perform(delete("/api/v1/containers/"+container.getId()))
-    			.andExpect(status().isOk())
-    			.andReturn().getResponse();
-    	
-    	MockHttpServletResponse response2 = this.mockMvc.perform(delete("/api/v1/containers/"+container.getId()))
-    			.andExpect(status().isNotFound())
-    			.andReturn().getResponse();
-    }
-	
+	@Transactional
+	public void logicalDeleteContainer() throws Exception {
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate");
+		query.setMaxResults(1);
+		Container container = query.getSingleResult();
+		MockHttpServletResponse response = this.mockMvc.perform(delete("/api/v1/containers/" + container.getId()))
+				.andExpect(status().isOk())
+				.andReturn().getResponse();
+
+		MockHttpServletResponse response2 = this.mockMvc.perform(delete("/api/v1/containers/" + container.getId()))
+				.andExpect(status().isNotFound())
+				.andReturn().getResponse();
+	}
+
 	@Test
-    @Transactional
-    public void getWellCodesByContainerCodes() throws Exception{
-    	List<String> codeNames = new ArrayList<String>();
-    	TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate");
-    	query.setMaxResults(25);
-    	for (Container container : query.getResultList()){
-    		codeNames.add("\""+container.getCodeName()+"\"");	
-    	}
-    	codeNames.add("\"INVALID-CODENAME\"");
+	@Transactional
+	public void getWellCodesByContainerCodes() throws Exception {
+		List<String> codeNames = new ArrayList<String>();
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate");
+		query.setMaxResults(25);
+		for (Container container : query.getResultList()) {
+			codeNames.add("\"" + container.getCodeName() + "\"");
+		}
+		codeNames.add("\"INVALID-CODENAME\"");
 		String json = codeNames.toString();
 		logger.info(json);
 		Assert.assertFalse(json.equals("{}"));
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getWellCodesByContainerCodes")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<ContainerWellCodeDTO> results = ContainerWellCodeDTO.fromJsonArrayToContainerWellCoes(responseJson);
-    	for (ContainerWellCodeDTO result : results){
-    		Assert.assertNotNull(result);
-    		Assert.assertNotNull(result.getRequestCodeName());
-    		if (result.getRequestCodeName().equals("INVALID-CODENAME")) Assert.assertTrue(result.getWellCodeNames().isEmpty());
-    		else Assert.assertFalse(result.getWellCodeNames().isEmpty());
-    	}
-    }
-	
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getWellCodesByContainerCodes")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<ContainerWellCodeDTO> results = ContainerWellCodeDTO.fromJsonArrayToContainerWellCoes(responseJson);
+		for (ContainerWellCodeDTO result : results) {
+			Assert.assertNotNull(result);
+			Assert.assertNotNull(result.getRequestCodeName());
+			if (result.getRequestCodeName().equals("INVALID-CODENAME"))
+				Assert.assertTrue(result.getWellCodeNames().isEmpty());
+			else
+				Assert.assertFalse(result.getWellCodeNames().isEmpty());
+		}
+	}
+
 	@Test
-    @Transactional
-    public void getContainerCodesByLabels_thousands() throws Exception{
-    	List<String> plateBarcodes = new ArrayList<String>();
-//    	TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate");
-    	for (ContainerLabel containerLabel : ContainerLabel.findContainerLabelEntries(0, 4000)){
-    		plateBarcodes.add("\""+containerLabel.getLabelText()+"\"");	
-    	}
+	@Transactional
+	public void getContainerCodesByLabels_thousands() throws Exception {
+		List<String> plateBarcodes = new ArrayList<String>();
+		// TypedQuery<Container> query =
+		// Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate");
+		for (ContainerLabel containerLabel : ContainerLabel.findContainerLabelEntries(0, 4000)) {
+			plateBarcodes.add("\"" + containerLabel.getLabelText() + "\"");
+		}
 		String json = plateBarcodes.toString();
 		logger.info(json);
 		Assert.assertFalse(json.equals("{}"));
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getContainerCodesByLabels")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<CodeLabelDTO> results = CodeLabelDTO.fromJsonArrayToCoes(responseJson);
-    	int i=0;
-    	for (CodeLabelDTO result : results){
-    		Assert.assertNotNull(result.getRequestLabel());
-    		Assert.assertFalse(result.getFoundCodeNames().isEmpty());
-    		Assert.assertEquals(plateBarcodes.get(i).replaceAll("\"", ""), result.getRequestLabel());
-    		i++;
-    	}
-    }
-	
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getContainerCodesByLabels")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<CodeLabelDTO> results = CodeLabelDTO.fromJsonArrayToCoes(responseJson);
+		int i = 0;
+		for (CodeLabelDTO result : results) {
+			Assert.assertNotNull(result.getRequestLabel());
+			Assert.assertFalse(result.getFoundCodeNames().isEmpty());
+			Assert.assertEquals(plateBarcodes.get(i).replaceAll("\"", ""), result.getRequestLabel());
+			i++;
+		}
+	}
+
 	@Test
-    @Transactional
-    public void getWellContent_thousands() throws Exception{
-    	List<String> wellCodes = new ArrayList<String>();
-    	TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("well","default");
-    	query.setMaxResults(10000);
-    	for (Container container : query.getResultList()){
-    		wellCodes.add("\""+container.getCodeName()+"\"");	
-    	}
+	@Transactional
+	public void getWellContent_thousands() throws Exception {
+		List<String> wellCodes = new ArrayList<String>();
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("well", "default");
+		query.setMaxResults(10000);
+		for (Container container : query.getResultList()) {
+			wellCodes.add("\"" + container.getCodeName() + "\"");
+		}
 		String json = wellCodes.toString();
 		logger.info(json);
 		Long before = (new Date()).getTime();
 		Assert.assertFalse(json.equals("{}"));
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getWellContent")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getWellContent")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
 		Long after = (new Date()).getTime();
-		logger.info("ms elapsed: "+ String.valueOf(after-before));
-    	logger.info(responseJson);
-    	Collection<WellContentDTO> results = WellContentDTO.fromJsonArrayToWellCoes(responseJson);
-    	int i = 0;
-    	for (WellContentDTO result : results){
-    		Assert.assertNotNull(result.getContainerCodeName());
-    		Assert.assertEquals(wellCodes.get(i).replaceAll("\"",""), result.getContainerCodeName());
-    		if (result.getLevel() != null) Assert.assertNotNull(result.getWellName());
-    		i++;
-    	}
-    }
-	
+		logger.info("ms elapsed: " + String.valueOf(after - before));
+		logger.info(responseJson);
+		Collection<WellContentDTO> results = WellContentDTO.fromJsonArrayToWellCoes(responseJson);
+		int i = 0;
+		for (WellContentDTO result : results) {
+			Assert.assertNotNull(result.getContainerCodeName());
+			Assert.assertEquals(wellCodes.get(i).replaceAll("\"", ""), result.getContainerCodeName());
+			if (result.getLevel() != null)
+				Assert.assertNotNull(result.getWellName());
+			i++;
+		}
+	}
+
 	@Test
-    @Transactional
-    public void getDefinitionContainersByContainerCodeNames_thousands() throws Exception{
-    	List<String> codeNames = new ArrayList<String>();
-    	TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate");
-    	query.setMaxResults(1100);
-    	for (Container container : query.getResultList()){
-    		codeNames.add("\""+container.getCodeName()+"\"");	
-    	}
+	@Transactional
+	public void getDefinitionContainersByContainerCodeNames_thousands() throws Exception {
+		List<String> codeNames = new ArrayList<String>();
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate");
+		query.setMaxResults(1100);
+		for (Container container : query.getResultList()) {
+			codeNames.add("\"" + container.getCodeName() + "\"");
+		}
 		String json = codeNames.toString();
 		logger.info(json);
 		Assert.assertFalse(json.equals("{}"));
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getDefinitionContainersByContainerCodeNames")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<ContainerErrorMessageDTO> results = ContainerErrorMessageDTO.fromJsonArrayToContainerErroes(responseJson);
-    	for (ContainerErrorMessageDTO result : results){
-    		Assert.assertNotNull(result);
-    		if (result.getLevel() == null){
-    			Assert.assertNotNull(result.getDefinition());
-    			Assert.assertFalse(result.getDefinition().getLsStates().isEmpty());
-    		}
-    		Assert.assertNull(result.getContainer());
-    		
-    	}
-    }
-	
+		MockHttpServletResponse response = this.mockMvc
+				.perform(post("/api/v1/containers/getDefinitionContainersByContainerCodeNames")
+						.contentType(MediaType.APPLICATION_JSON)
+						.accept(MediaType.APPLICATION_JSON)
+						.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<ContainerErrorMessageDTO> results = ContainerErrorMessageDTO
+				.fromJsonArrayToContainerErroes(responseJson);
+		for (ContainerErrorMessageDTO result : results) {
+			Assert.assertNotNull(result);
+			if (result.getLevel() == null) {
+				Assert.assertNotNull(result.getDefinition());
+				Assert.assertFalse(result.getDefinition().getLsStates().isEmpty());
+			}
+			Assert.assertNull(result.getContainer());
+
+		}
+	}
+
 	@Test
-    @Transactional
-    public void getWellCodesByContainerCodes_thousands() throws Exception{
-    	List<String> codeNames = new ArrayList<String>();
-    	TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate");
-    	query.setMaxResults(1100);
-    	for (Container container : query.getResultList()){
-    		codeNames.add("\""+container.getCodeName()+"\"");	
-    	}
-    	codeNames.add("\"INVALID-CODENAME\"");
+	@Transactional
+	public void getWellCodesByContainerCodes_thousands() throws Exception {
+		List<String> codeNames = new ArrayList<String>();
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate");
+		query.setMaxResults(1100);
+		for (Container container : query.getResultList()) {
+			codeNames.add("\"" + container.getCodeName() + "\"");
+		}
+		codeNames.add("\"INVALID-CODENAME\"");
 		String json = codeNames.toString();
 		logger.info(json);
 		Assert.assertFalse(json.equals("{}"));
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getWellCodesByContainerCodes")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<ContainerWellCodeDTO> results = ContainerWellCodeDTO.fromJsonArrayToContainerWellCoes(responseJson);
-    	for (ContainerWellCodeDTO result : results){
-    		Assert.assertNotNull(result);
-    		Assert.assertNotNull(result.getRequestCodeName());
-    		if (result.getRequestCodeName().equals("INVALID-CODENAME")) Assert.assertTrue(result.getWellCodeNames().isEmpty());
-    		else Assert.assertFalse(result.getWellCodeNames().isEmpty());
-    	}
-    }
-	
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getWellCodesByContainerCodes")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<ContainerWellCodeDTO> results = ContainerWellCodeDTO.fromJsonArrayToContainerWellCoes(responseJson);
+		for (ContainerWellCodeDTO result : results) {
+			Assert.assertNotNull(result);
+			Assert.assertNotNull(result.getRequestCodeName());
+			if (result.getRequestCodeName().equals("INVALID-CODENAME"))
+				Assert.assertTrue(result.getWellCodeNames().isEmpty());
+			else
+				Assert.assertFalse(result.getWellCodeNames().isEmpty());
+		}
+	}
+
 	@Test
-    @Transactional
-    @Rollback(value=true)
-    public void changeLocation_success() throws Exception{
-    	Collection<ContainerLocationDTO> requests = new HashSet<ContainerLocationDTO>();
-		TypedQuery<Container> containerQuery = Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate");
+	@Transactional
+	@Rollback(value = true)
+	public void changeLocation_success() throws Exception {
+		Collection<ContainerLocationDTO> requests = new HashSet<ContainerLocationDTO>();
+		TypedQuery<Container> containerQuery = Container.findContainersByLsTypeEqualsAndLsKindEquals("container",
+				"plate");
 		containerQuery.setMaxResults(5);
 		List<Container> containers = containerQuery.getResultList();
 		Assert.assertEquals(5, containers.size());
-		TypedQuery<Container> locationQuery = Container.findContainersByLsTypeEqualsAndLsKindEquals("location","default");
+		TypedQuery<Container> locationQuery = Container.findContainersByLsTypeEqualsAndLsKindEquals("location",
+				"default");
 		locationQuery.setMaxResults(5);
 		List<Container> locations = locationQuery.getResultList();
 		Assert.assertEquals(5, locations.size());
 		int i = 0;
-		while (i<5){
+		while (i < 5) {
 			ContainerLocationDTO request = new ContainerLocationDTO();
 			request.setContainerCodeName(containers.get(i).getCodeName());
 			request.setLocationCodeName(locations.get(i).getCodeName());
@@ -1238,59 +1285,70 @@ public void changeLocation_success() throws Exception{
 		String json = ContainerLocationDTO.toJsonArray(requests);
 		logger.info(json);
 		Assert.assertFalse(json.equals("[{}]"));
-    	ResultActions response = this.mockMvc.perform(post("/api/v1/containers/moveToLocation")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isNoContent());
-    	List<String> containerCodeNames = new ArrayList<String>();
-    	List<String> locationCodeNames = new ArrayList<String>();
-    	for (ContainerLocationDTO request : requests){
-    		locationCodeNames.add("\""+request.getLocationCodeName()+"\"");
-    		containerCodeNames.add("\""+request.getContainerCodeName()+"\"");
-    	}
-    	MockHttpServletResponse checkResponse = this.mockMvc.perform(post("/api/v1/containers/getContainersInLocation")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(locationCodeNames.toString()))
-    			.andExpect(status().isOk())
-    			.andReturn().getResponse();
+		ResultActions response = this.mockMvc.perform(post("/api/v1/containers/moveToLocation")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isNoContent());
+		List<String> containerCodeNames = new ArrayList<String>();
+		List<String> locationCodeNames = new ArrayList<String>();
+		for (ContainerLocationDTO request : requests) {
+			locationCodeNames.add("\"" + request.getLocationCodeName() + "\"");
+			containerCodeNames.add("\"" + request.getContainerCodeName() + "\"");
+		}
+		MockHttpServletResponse checkResponse = this.mockMvc.perform(post("/api/v1/containers/getContainersInLocation")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(locationCodeNames.toString()))
+				.andExpect(status().isOk())
+				.andReturn().getResponse();
 		String responseJson = checkResponse.getContentAsString();
 		logger.info(responseJson);
-    	Collection<ContainerLocationDTO> checkResults = ContainerLocationDTO.fromJsonArrayToContainerLocatioes(responseJson);
-    	for (ContainerLocationDTO checkResult : checkResults){
-    		if (containerCodeNames.contains("\""+checkResult.getContainerCodeName()+"\"")){
-    			Assert.assertEquals(locationCodeNames.get(containerCodeNames.indexOf("\""+checkResult.getContainerCodeName()+"\"")).replaceAll("\"", ""), checkResult.getLocationCodeName());
-    			logger.info("container: "+checkResult.getContainerCodeName()+" location: "+checkResult.getLocationCodeName());
-    		}
-    	}
-    }
-	
+		Collection<ContainerLocationDTO> checkResults = ContainerLocationDTO
+				.fromJsonArrayToContainerLocatioes(responseJson);
+		for (ContainerLocationDTO checkResult : checkResults) {
+			if (containerCodeNames.contains("\"" + checkResult.getContainerCodeName() + "\"")) {
+				Assert.assertEquals(locationCodeNames
+						.get(containerCodeNames.indexOf("\"" + checkResult.getContainerCodeName() + "\""))
+						.replaceAll("\"", ""), checkResult.getLocationCodeName());
+				logger.info("container: " + checkResult.getContainerCodeName() + " location: "
+						+ checkResult.getLocationCodeName());
+			}
+		}
+	}
+
 	@Test
-    @Transactional
-    public void changeLocation_errors() throws Exception{
-    	Collection<ContainerLocationDTO> requests = new ArrayList<ContainerLocationDTO>();
-		TypedQuery<Container> containerQuery = Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate");
+	@Transactional
+	public void changeLocation_errors() throws Exception {
+		Collection<ContainerLocationDTO> requests = new ArrayList<ContainerLocationDTO>();
+		TypedQuery<Container> containerQuery = Container.findContainersByLsTypeEqualsAndLsKindEquals("container",
+				"plate");
 		containerQuery.setMaxResults(6);
 		List<Container> containers = containerQuery.getResultList();
 		Assert.assertEquals(6, containers.size());
-		TypedQuery<Container> locationQuery = Container.findContainersByLsTypeEqualsAndLsKindEquals("location","default");
+		TypedQuery<Container> locationQuery = Container.findContainersByLsTypeEqualsAndLsKindEquals("location",
+				"default");
 		locationQuery.setMaxResults(6);
 		List<Container> locations = locationQuery.getResultList();
 		Assert.assertEquals(6, locations.size());
 		int i = 0;
-		while (i<6){
+		while (i < 6) {
 			ContainerLocationDTO request = new ContainerLocationDTO();
 			request.setContainerCodeName(containers.get(i).getCodeName());
 			request.setLocationCodeName(locations.get(i).getCodeName());
 			request.setModifiedBy("bob");
 			request.setModifiedDate(new Date());
-			//now we add in errors
-			if (i==0) request.setContainerCodeName("BAD-CODENAME");
-			if (i==1) request.setLocationCodeName("BAD-CODENAME");
-			if (i==2) request.setLocationCodeName(containers.get(i).getCodeName());
-			if (i==3) request.setModifiedBy(null);
-			if (i==4) request.setModifiedDate(null);
+			// now we add in errors
+			if (i == 0)
+				request.setContainerCodeName("BAD-CODENAME");
+			if (i == 1)
+				request.setLocationCodeName("BAD-CODENAME");
+			if (i == 2)
+				request.setLocationCodeName(containers.get(i).getCodeName());
+			if (i == 3)
+				request.setModifiedBy(null);
+			if (i == 4)
+				request.setModifiedDate(null);
 			requests.add(request);
 			i++;
 		}
@@ -1298,415 +1356,430 @@ public void changeLocation_errors() throws Exception{
 		logger.info(json);
 		Assert.assertFalse(json.equals("[{}]"));
 		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/moveToLocation")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isBadRequest())
-    			.andReturn().getResponse();
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isBadRequest())
+				.andReturn().getResponse();
 		String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<ContainerLocationDTO> results = ContainerLocationDTO.fromJsonArrayToContainerLocatioes(responseJson);
-    	Assert.assertEquals(6, results.size());
-    	i=0;
-    	for (ContainerLocationDTO result : results){
-    		if (i!=5) Assert.assertEquals("error", result.getLevel());
-    		logger.error(result.getMessage());
-    		if (i==5) Assert.assertNull(result.getLevel());
-    		i++;
-    	}
-    }
-	
+		logger.info(responseJson);
+		Collection<ContainerLocationDTO> results = ContainerLocationDTO.fromJsonArrayToContainerLocatioes(responseJson);
+		Assert.assertEquals(6, results.size());
+		i = 0;
+		for (ContainerLocationDTO result : results) {
+			if (i != 5)
+				Assert.assertEquals("error", result.getLevel());
+			logger.error(result.getMessage());
+			if (i == 5)
+				Assert.assertNull(result.getLevel());
+			i++;
+		}
+	}
+
 	@Test
-    @Transactional
-    public void updateWellContent_speedTest() throws Exception{
-    	List<String> wellCodes = new ArrayList<String>();
-    	TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("well","default");
-    	query.setMaxResults(1200);
-    	for (Container container : query.getResultList()){
-    		wellCodes.add("\""+container.getCodeName()+"\"");	
-    	}
+	@Transactional
+	public void updateWellContent_speedTest() throws Exception {
+		List<String> wellCodes = new ArrayList<String>();
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("well", "default");
+		query.setMaxResults(1200);
+		for (Container container : query.getResultList()) {
+			wellCodes.add("\"" + container.getCodeName() + "\"");
+		}
 		String json = wellCodes.toString();
 		logger.info(json);
 		Long before = (new Date()).getTime();
 		Assert.assertFalse(json.equals("{}"));
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getWellContent")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getWellContent")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
 		Long after = (new Date()).getTime();
-		logger.info("ms elapsed: "+ String.valueOf(after-before));
-    	logger.info(responseJson);
-    	Collection<WellContentDTO> results = WellContentDTO.fromJsonArrayToWellCoes(responseJson);
-    	for (WellContentDTO result : results){
-    		result.setRecordedBy("bob");
-    		result.setRecordedDate(new Date());
-    		result.setAmount(new BigDecimal(10));
-    	}
-    	json = WellContentDTO.toJsonArray(results);
-    	MockHttpServletResponse response2 = this.mockMvc.perform(post("/api/v1/containers/updateWellContent")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    }
-	
+		logger.info("ms elapsed: " + String.valueOf(after - before));
+		logger.info(responseJson);
+		Collection<WellContentDTO> results = WellContentDTO.fromJsonArrayToWellCoes(responseJson);
+		for (WellContentDTO result : results) {
+			result.setRecordedBy("bob");
+			result.setRecordedDate(new Date());
+			result.setAmount(new BigDecimal(10));
+		}
+		json = WellContentDTO.toJsonArray(results);
+		MockHttpServletResponse response2 = this.mockMvc.perform(post("/api/v1/containers/updateWellContent")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+	}
+
 	@Test
-    @Transactional
-    public void searchContainers() throws Exception{
-    	MockHttpServletResponse response;
-    	String responseJson;
-    	Collection<Container> foundContainers;
-    	TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("definition container", "plate");
+	@Transactional
+	public void searchContainers() throws Exception {
+		MockHttpServletResponse response;
+		String responseJson;
+		Collection<Container> foundContainers;
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("definition container",
+				"plate");
 		query.setMaxResults(1);
 		Container definition = query.getSingleResult();
-    	ContainerSearchRequestDTO searchRequest = new ContainerSearchRequestDTO();
-    	searchRequest.setBarcode("TESTBARCODE");
-    	searchRequest.setDescription("test");
-    	searchRequest.setDefinition(definition.getCodeName());
-    	String json = searchRequest.toJson();
-    	logger.info(json);
-    	response = this.mockMvc.perform(post("/api/v1/containers/searchContainers")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	foundContainers = Container.fromJsonArrayToContainers(responseJson);
-    	Assert.assertFalse(foundContainers.isEmpty());
-    	for (Container result : foundContainers){
-    		Assert.assertNotNull(result);
-    	}
-    }
-	
-	    @Test
-	    @Transactional
-	    public void getContainerCodeTablesByTypeAndKind() throws Exception{
-	    	MockHttpServletResponse response;
-	    	String responseJson;
-	    	Collection<CodeTableDTO> foundContainers;
-//	    	//no type and kind
-//	    	response = this.mockMvc.perform(get("/api/v1/containers/codeTable")
-//	    			.accept(MediaType.APPLICATION_JSON))
-//	    			.andExpect(status().isOk())
-//	    			.andExpect(content().contentType("application/json;charset=utf-8"))
-//	    			.andReturn().getResponse();
-//	    	responseJson = response.getContentAsString();
-//	    	logger.info(responseJson);
-//	    	foundContainers = CodeTableDTO.fromJsonArrayToCoes(responseJson);
-//	    	Assert.assertFalse(foundContainers.isEmpty());
-	    	//only type
-	    	response = this.mockMvc.perform(get("/api/v1/containers/?format=codeTable&lsType=definition container")
-	    			.accept(MediaType.APPLICATION_JSON))
-	    			.andExpect(status().isOk())
-	    			.andExpect(content().contentType("application/json;charset=utf-8"))
-	    			.andReturn().getResponse();
-	    	responseJson = response.getContentAsString();
-	    	logger.info(responseJson);
-	    	foundContainers = CodeTableDTO.fromJsonArrayToCoes(responseJson);
-	    	Assert.assertFalse(foundContainers.isEmpty());
-	    	//only kind
-	    	response = this.mockMvc.perform(get("/api/v1/containers/?format=codeTable&lsKind=plate")
-	    			.accept(MediaType.APPLICATION_JSON))
-	    			.andExpect(status().isOk())
-	    			.andExpect(content().contentType("application/json;charset=utf-8"))
-	    			.andReturn().getResponse();
-	    	responseJson = response.getContentAsString();
-	    	logger.info(responseJson);
-	    	foundContainers = CodeTableDTO.fromJsonArrayToCoes(responseJson);
-	    	Assert.assertFalse(foundContainers.isEmpty());
-	    	//type and kind
-	    	response = this.mockMvc.perform(get("/api/v1/containers/?format=codeTable&lsType=definition container&lsKind=plate")
-	    			.accept(MediaType.APPLICATION_JSON))
-	    			.andExpect(status().isOk())
-	    			.andExpect(content().contentType("application/json;charset=utf-8"))
-	    			.andReturn().getResponse();
-	    	responseJson = response.getContentAsString();
-	    	logger.info(responseJson);
-	    	foundContainers = CodeTableDTO.fromJsonArrayToCoes(responseJson);
-	    	Assert.assertFalse(foundContainers.isEmpty());
-	    	//find no results
-	    	response = this.mockMvc.perform(get("/api/v1/containers/?format=codeTable&lsType=nope&lsKind=")
-	    			.accept(MediaType.APPLICATION_JSON))
-	    			.andExpect(status().isOk())
-	    			.andExpect(content().contentType("application/json;charset=utf-8"))
-	    			.andReturn().getResponse();
-	    	responseJson = response.getContentAsString();
-	    	logger.info(responseJson);
-	    	foundContainers = CodeTableDTO.fromJsonArrayToCoes(responseJson);
-	    	Assert.assertTrue(foundContainers.isEmpty());
-	    }
-	    
-	    @Test
-	    @Transactional
-	    @Rollback(value=false)
-	    public void saveAndSearchContainers() throws Exception{
-	    	TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("definition container", "plate");
-			query.setMaxResults(1);
-			try{
-				Container definition = query.getSingleResult();
-			}catch (NoResultException e){
-				Container definition = Container.fromJsonToContainer("{\"codeName\":\"special-definition-code\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"plate\",\"lsLabels\":[{\"deleted\":false,\"id\":null,\"ignored\":false,\"labelText\":\"1536\",\"lsKind\":\"common\",\"lsType\":\"name\",\"lsTypeAndKind\":\"name_common\",\"physicallyLabled\":true,\"preferred\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"version\":null}],\"lsStates\":[{\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"format\",\"lsType\":\"constants\",\"lsTypeAndKind\":\"constants_format\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"columns\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_columns\",\"numericValue\":48,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"unitTypeAndKind\":\"null_null\",\"version\":null},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"rows\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_rows\",\"numericValue\":32,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"unitTypeAndKind\":\"null_null\",\"version\":null},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"wells\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_wells\",\"numericValue\":1536,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"unitTypeAndKind\":\"null_null\",\"version\":null},{\"codeTypeAndKind\":\"null_null\",\"codeValue\":\"A001\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"subcontainer naming convention\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_subcontainer naming convention\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"unitTypeAndKind\":\"null_null\",\"version\":null}],\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"version\":null}],\"lsType\":\"definition container\",\"lsTypeAndKind\":\"definition container_plate\",\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"version\":null}");
-				containerService.saveLsContainer(definition);
-			}
-			Container definition = query.getSingleResult();
-			String barcode = "TESTBARCODE-130";
-			String createdUser = "bob";
-			String recordedBy = "acas";
-			CreatePlateRequestDTO plateRequest = new CreatePlateRequestDTO();
-			plateRequest.setDefinition(definition.getCodeName());
-			plateRequest.setBarcode(barcode);
-			plateRequest.setRecordedBy(recordedBy);
-			plateRequest.setDescription("test description");
-//			plateRequest.setCreatedDate(new Date(713232000000L));
-//			plateRequest.setCreatedUser(createdUser);
-			String json = plateRequest.toJson();
-			logger.info(json);
-			Assert.assertFalse(json.equals("{}"));
-	    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/createPlate")
-	    			.contentType(MediaType.APPLICATION_JSON)
-	    			.accept(MediaType.APPLICATION_JSON)
-	    			.content(json))
-	    			.andExpect(status().isOk())
-	    			.andExpect(content().contentType("application/json;charset=utf-8"))
-	    			.andReturn().getResponse();;
-			logger.info(response.getContentAsString());
-			PlateStubDTO result = PlateStubDTO.fromJsonToPlateStubDTO(response.getContentAsString());
-	    	logger.info(result.toJson());
-	    	Assert.assertEquals(1536, result.getWells().size());
-	    	String[][] plateLayout = new String[32][48];
-	    	for (WellStubDTO well : result.getWells()){
-	    		logger.debug(well.getRowIndex().toString() + ", "+well.getColumnIndex().toString());
-	    		plateLayout[well.getRowIndex()-1][well.getColumnIndex()-1] = well.getWellName();
-	    	}
-	    	logger.info(Arrays.deepToString(plateLayout));
-	    	Container newPlate = Container.findContainerByCodeNameEquals(result.getCodeName());
-	    	Assert.assertFalse(newPlate.getLsStates().isEmpty());
-	    	Assert.assertEquals(1, newPlate.getLsStates().size());
-	    	for (ContainerState state : newPlate.getLsStates()){
-	    		Assert.assertFalse(state.getLsValues().isEmpty());
-	    		Assert.assertEquals("metadata", state.getLsType());
-	    		Assert.assertEquals("information", state.getLsKind());
-	    		Assert.assertEquals(3, state.getLsValues().size());
-	    	}
-	    	
-	    	ContainerSearchRequestDTO searchRequest = new ContainerSearchRequestDTO();
-	    	searchRequest.setBarcode(barcode);
-//	    	searchRequest.setDescription("test");
-//	    	searchRequest.setDefinition(definition.getCodeName());
-//	    	searchRequest.setCreatedUser(createdUser);
-	    	json = searchRequest.toJson();
-	    	logger.info(json);
-	    	response = this.mockMvc.perform(post("/api/v1/containers/searchContainers")
-	    			.contentType(MediaType.APPLICATION_JSON)
-	    			.accept(MediaType.APPLICATION_JSON)
-	    			.content(json))
-	    			.andExpect(status().isOk())
-	    			.andExpect(content().contentType("application/json;charset=utf-8"))
-	    			.andReturn().getResponse();
-	    	String responseJson = response.getContentAsString();
-	    	logger.info(responseJson);
-	    	Collection<Container> foundContainers = Container.fromJsonArrayToContainers(responseJson);
-	    	Assert.assertFalse(foundContainers.isEmpty());
-	    	for (Container foundContainer : foundContainers){
-	    		Assert.assertNotNull(foundContainer);
-	    		for (ContainerState containerState : foundContainer.getLsStates()){
-	    			for (ContainerValue containerValue : containerState.getLsValues()){
-	    				if (containerValue.getLsKind().equals("created date")) logger.info(containerValue.getDateValue().toGMTString());
-	    			}
-	    		}
-	    	}
-	    }
-	    
-	    @Test
-	    @Transactional
-	    public void updateWellContent_doNotCopyPreviousValuesTest() throws Exception{
-	    	List<String> wellCodes = new ArrayList<String>();
-	    	TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("well","default");
-	    	query.setMaxResults(1200);
-	    	for (Container container : query.getResultList()){
-	    		wellCodes.add("\""+container.getCodeName()+"\"");	
-	    	}
-			String json = wellCodes.toString();
-			logger.info(json);
-			Long before = (new Date()).getTime();
-			Assert.assertFalse(json.equals("{}"));
-	    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getWellContent")
-	    			.contentType(MediaType.APPLICATION_JSON)
-	    			.accept(MediaType.APPLICATION_JSON)
-	    			.content(json))
-	    			.andExpect(status().isOk())
-	    			.andExpect(content().contentType("application/json;charset=utf-8"))
-	    			.andReturn().getResponse();
-	    	String responseJson = response.getContentAsString();
-			Long after = (new Date()).getTime();
-			logger.info("ms elapsed: "+ String.valueOf(after-before));
-	    	logger.info(responseJson);
-	    	Collection<WellContentDTO> results = WellContentDTO.fromJsonArrayToWellCoes(responseJson);
-	    	for (WellContentDTO result : results){
-	    		result.setRecordedBy("bob");
-	    		result.setRecordedDate(new Date());
-	    		result.setAmount(new BigDecimal(10));
-	    		result.setAmountUnits("mg");
-	    	}
-	    	json = WellContentDTO.toJsonArray(results);
-	    	MockHttpServletResponse response1 = this.mockMvc.perform(post("/api/v1/containers/updateWellContent")
-	    			.contentType(MediaType.APPLICATION_JSON)
-	    			.accept(MediaType.APPLICATION_JSON)
-	    			.content(json))
-	    			.andExpect(status().isNoContent())
-	    			.andReturn().getResponse();
-	    	response = this.mockMvc.perform(post("/api/v1/containers/getWellContent")
-	    			.contentType(MediaType.APPLICATION_JSON)
-	    			.accept(MediaType.APPLICATION_JSON)
-	    			.content(wellCodes.toString()))
-	    			.andExpect(status().isOk())
-	    			.andExpect(content().contentType("application/json;charset=utf-8"))
-	    			.andReturn().getResponse();
-	    	String checkJson1 = response.getContentAsString();
-	    	logger.info(checkJson1);
-	    	Collection<WellContentDTO> checkResults1 = WellContentDTO.fromJsonArrayToWellCoes(checkJson1);
-	    	for (WellContentDTO checkResult : checkResults1){
-	    		Assert.assertNotNull(checkResult.getAmount());
-	    		Assert.assertNotNull(checkResult.getAmountUnits());
-	    	}
-	    	Collection<WellContentDTO> emptyWells = new ArrayList<WellContentDTO>();
-	    	emptyWells.addAll(results);
-	    	for (WellContentDTO emptyWell : emptyWells){
-	    		emptyWell.setRecordedBy("bob");
-	    		emptyWell.setRecordedDate(new Date());
-	    		emptyWell.setAmount(null);
-	    		emptyWell.setAmountUnits(null);
-	    	}
-	    	String emptyWellsJson = WellContentDTO.toJsonArray(emptyWells);
-	    	MockHttpServletResponse response2 = this.mockMvc.perform(post("/api/v1/containers/updateWellContent?copyPreviousValues=false")
-	    			.contentType(MediaType.APPLICATION_JSON)
-	    			.accept(MediaType.APPLICATION_JSON)
-	    			.content(emptyWellsJson))
-	    			.andExpect(status().isNoContent())
-	    			.andReturn().getResponse();
-	    	response = this.mockMvc.perform(post("/api/v1/containers/getWellContent")
-	    			.contentType(MediaType.APPLICATION_JSON)
-	    			.accept(MediaType.APPLICATION_JSON)
-	    			.content(wellCodes.toString()))
-	    			.andExpect(status().isOk())
-	    			.andExpect(content().contentType("application/json;charset=utf-8"))
-	    			.andReturn().getResponse();
-	    	String checkJson = response.getContentAsString();
-	    	logger.info(checkJson);
-	    	Collection<WellContentDTO> checkResults = WellContentDTO.fromJsonArrayToWellCoes(checkJson);
-	    	for (WellContentDTO checkResult : checkResults){
-	    		Assert.assertNull(checkResult.getAmount());
-	    		Assert.assertNull(checkResult.getAmountUnits());
-	    	}
-	    }
-	    
-	    @Test
-	    @Transactional
-	    public void createPlateWithDefaultsAndGetContent() throws Exception{
-			TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("definition container", "plate");
-			query.setMaxResults(1);
+		ContainerSearchRequestDTO searchRequest = new ContainerSearchRequestDTO();
+		searchRequest.setBarcode("TESTBARCODE");
+		searchRequest.setDescription("test");
+		searchRequest.setDefinition(definition.getCodeName());
+		String json = searchRequest.toJson();
+		logger.info(json);
+		response = this.mockMvc.perform(post("/api/v1/containers/searchContainers")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		foundContainers = Container.fromJsonArrayToContainers(responseJson);
+		Assert.assertFalse(foundContainers.isEmpty());
+		for (Container result : foundContainers) {
+			Assert.assertNotNull(result);
+		}
+	}
+
+	@Test
+	@Transactional
+	public void getContainerCodeTablesByTypeAndKind() throws Exception {
+		MockHttpServletResponse response;
+		String responseJson;
+		Collection<CodeTableDTO> foundContainers;
+		// //no type and kind
+		// response = this.mockMvc.perform(get("/api/v1/containers/codeTable")
+		// .accept(MediaType.APPLICATION_JSON))
+		// .andExpect(status().isOk())
+		// .andExpect(content().contentType("application/json;charset=utf-8"))
+		// .andReturn().getResponse();
+		// responseJson = response.getContentAsString();
+		// logger.info(responseJson);
+		// foundContainers = CodeTableDTO.fromJsonArrayToCoes(responseJson);
+		// Assert.assertFalse(foundContainers.isEmpty());
+		// only type
+		response = this.mockMvc.perform(get("/api/v1/containers/?format=codeTable&lsType=definition container")
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		foundContainers = CodeTableDTO.fromJsonArrayToCoes(responseJson);
+		Assert.assertFalse(foundContainers.isEmpty());
+		// only kind
+		response = this.mockMvc.perform(get("/api/v1/containers/?format=codeTable&lsKind=plate")
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		foundContainers = CodeTableDTO.fromJsonArrayToCoes(responseJson);
+		Assert.assertFalse(foundContainers.isEmpty());
+		// type and kind
+		response = this.mockMvc
+				.perform(get("/api/v1/containers/?format=codeTable&lsType=definition container&lsKind=plate")
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		foundContainers = CodeTableDTO.fromJsonArrayToCoes(responseJson);
+		Assert.assertFalse(foundContainers.isEmpty());
+		// find no results
+		response = this.mockMvc.perform(get("/api/v1/containers/?format=codeTable&lsType=nope&lsKind=")
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		foundContainers = CodeTableDTO.fromJsonArrayToCoes(responseJson);
+		Assert.assertTrue(foundContainers.isEmpty());
+	}
+
+	@Test
+	@Transactional
+	@Rollback(value = false)
+	public void saveAndSearchContainers() throws Exception {
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("definition container",
+				"plate");
+		query.setMaxResults(1);
+		try {
 			Container definition = query.getSingleResult();
-			CreatePlateRequestDTO plateRequest = new CreatePlateRequestDTO();
-			plateRequest.setDefinition(definition.getCodeName());
-			plateRequest.setBarcode("TESTBARCODE-135");
-			plateRequest.setRecordedBy("acas");
-			plateRequest.setBatchConcentrationUnits("mM");
-			plateRequest.setPhysicalState("liquid");
-			String json = plateRequest.toJson();
-			logger.info(json);
-			Assert.assertFalse(json.equals("{}"));
-	    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/createPlate")
-	    			.contentType(MediaType.APPLICATION_JSON)
-	    			.accept(MediaType.APPLICATION_JSON)
-	    			.content(json))
-	    			.andExpect(status().isOk())
-	    			.andExpect(content().contentType("application/json;charset=utf-8"))
-	    			.andReturn().getResponse();;
-			logger.info(response.getContentAsString());
-			PlateStubDTO result = PlateStubDTO.fromJsonToPlateStubDTO(response.getContentAsString());
-	    	logger.info(result.toJson());
-	    	Assert.assertEquals(1536, result.getWells().size());
-	    	String plateBarcode = result.getBarcode();
-			logger.info(plateBarcode);
-	    	MockHttpServletResponse response2 = this.mockMvc.perform(get("/api/v1/containers/getWellContentByPlateBarcode/"+plateBarcode)
-	    			.accept(MediaType.APPLICATION_JSON))
-	    			.andExpect(status().isOk())
-	    			.andExpect(content().contentType("application/json;charset=utf-8"))
-	    			.andReturn().getResponse();
-	    	String responseJson = response2.getContentAsString();
-	    	logger.info(responseJson);
-	    	Collection<WellContentDTO> results = WellContentDTO.fromJsonArrayToWellCoes(responseJson);
-	    	for (WellContentDTO resultWell : results){
-	    		Assert.assertNotNull(resultWell.getContainerCodeName());
-	    		Assert.assertNotNull(resultWell.getWellName());
-	    		Assert.assertNotNull(resultWell.getRowIndex());
-	    		Assert.assertNotNull(resultWell.getColumnIndex());
-	    		Assert.assertNotNull(resultWell.getRecordedBy());
-	    		Assert.assertNotNull(resultWell.getRecordedDate());
-	    		Assert.assertEquals("liquid", resultWell.getPhysicalState());
-	    		Assert.assertEquals("mM", resultWell.getBatchConcUnits());
-	    	}
-	    }
-	    
-	    @Test
-	    @Transactional
-	    public void searchContainerCodesByContainerValue() throws Exception{
-	    	ContainerValueRequestDTO requestDTO = new ContainerValueRequestDTO();
-	    	requestDTO.setContainerType("container");
-	    	requestDTO.setContainerKind("plate");;
-	    	requestDTO.setStateType("metadata");
-	    	requestDTO.setStateKind("information");
-	    	requestDTO.setValueType("codeValue");
-	    	requestDTO.setValueKind("created user");
-	    	requestDTO.setValue("bob");
-	    	String json = requestDTO.toJson();
-	    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getContainerCodeNamesByContainerValue")
-	    			.contentType(MediaType.APPLICATION_JSON)
-	    			.accept(MediaType.APPLICATION_JSON)
-	    			.content(json))
-	    			.andExpect(status().isOk())
-	    			.andExpect(content().contentType("application/json;charset=utf-8"))
-	    			.andReturn().getResponse();
-			logger.info(response.getContentAsString());
-	    }
-	    
-	    @Test
-	    @Transactional
-	    public void searchContainerCodesByContainerValue_tooManyResults() throws Exception{
-	    	ContainerValueRequestDTO requestDTO = new ContainerValueRequestDTO();
-	    	requestDTO.setContainerType("container");
-	    	requestDTO.setContainerKind("plate");;
-	    	requestDTO.setStateType("metadata");
-	    	requestDTO.setStateKind("information");
-	    	requestDTO.setValueType("codeValue");
-	    	requestDTO.setValueKind("created user");
-	    	requestDTO.setValue("bob");
-	    	String json = requestDTO.toJson();
-	    	Integer maxResults = 2;
-	    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getContainerCodeNamesByContainerValue?maxResults="+maxResults.toString())
-	    			.contentType(MediaType.APPLICATION_JSON)
-	    			.accept(MediaType.APPLICATION_JSON)
-	    			.content(json))
-	    			.andExpect(status().isOk())
-	    			.andExpect(content().contentType("application/json;charset=utf-8"))
-	    			.andReturn().getResponse();
-			logger.info(response.getContentAsString());
-			String responseJson = response.getContentAsString();
-	    	logger.info(responseJson);
-	    	ContainerQueryResultDTO result = ContainerQueryResultDTO.fromJsonToContainerQueryResultDTO(responseJson);
-	    	Assert.assertEquals(maxResults, result.getMaxResults());
-	    	Assert.assertTrue((result.getNumberOfResults() > maxResults));
-	    	Assert.assertNull(result.getResults());
-	    }
-    
+		} catch (NoResultException e) {
+			Container definition = Container.fromJsonToContainer(
+					"{\"codeName\":\"special-definition-code\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"plate\",\"lsLabels\":[{\"deleted\":false,\"id\":null,\"ignored\":false,\"labelText\":\"1536\",\"lsKind\":\"common\",\"lsType\":\"name\",\"lsTypeAndKind\":\"name_common\",\"physicallyLabled\":true,\"preferred\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"version\":null}],\"lsStates\":[{\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"format\",\"lsType\":\"constants\",\"lsTypeAndKind\":\"constants_format\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"columns\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_columns\",\"numericValue\":48,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"unitTypeAndKind\":\"null_null\",\"version\":null},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"rows\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_rows\",\"numericValue\":32,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"unitTypeAndKind\":\"null_null\",\"version\":null},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"wells\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_wells\",\"numericValue\":1536,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"unitTypeAndKind\":\"null_null\",\"version\":null},{\"codeTypeAndKind\":\"null_null\",\"codeValue\":\"A001\",\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"subcontainer naming convention\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_subcontainer naming convention\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"unitTypeAndKind\":\"null_null\",\"version\":null}],\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"version\":null}],\"lsType\":\"definition container\",\"lsTypeAndKind\":\"definition container_plate\",\"recordedBy\":\"acas\",\"recordedDate\":1456208484968,\"version\":null}");
+			containerService.saveLsContainer(definition);
+		}
+		Container definition = query.getSingleResult();
+		String barcode = "TESTBARCODE-130";
+		String createdUser = "bob";
+		String recordedBy = "acas";
+		CreatePlateRequestDTO plateRequest = new CreatePlateRequestDTO();
+		plateRequest.setDefinition(definition.getCodeName());
+		plateRequest.setBarcode(barcode);
+		plateRequest.setRecordedBy(recordedBy);
+		plateRequest.setDescription("test description");
+		// plateRequest.setCreatedDate(new Date(713232000000L));
+		// plateRequest.setCreatedUser(createdUser);
+		String json = plateRequest.toJson();
+		logger.info(json);
+		Assert.assertFalse(json.equals("{}"));
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/createPlate")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		;
+		logger.info(response.getContentAsString());
+		PlateStubDTO result = PlateStubDTO.fromJsonToPlateStubDTO(response.getContentAsString());
+		logger.info(result.toJson());
+		Assert.assertEquals(1536, result.getWells().size());
+		String[][] plateLayout = new String[32][48];
+		for (WellStubDTO well : result.getWells()) {
+			logger.debug(well.getRowIndex().toString() + ", " + well.getColumnIndex().toString());
+			plateLayout[well.getRowIndex() - 1][well.getColumnIndex() - 1] = well.getWellName();
+		}
+		logger.info(Arrays.deepToString(plateLayout));
+		Container newPlate = Container.findContainerByCodeNameEquals(result.getCodeName());
+		Assert.assertFalse(newPlate.getLsStates().isEmpty());
+		Assert.assertEquals(1, newPlate.getLsStates().size());
+		for (ContainerState state : newPlate.getLsStates()) {
+			Assert.assertFalse(state.getLsValues().isEmpty());
+			Assert.assertEquals("metadata", state.getLsType());
+			Assert.assertEquals("information", state.getLsKind());
+			Assert.assertEquals(3, state.getLsValues().size());
+		}
+
+		ContainerSearchRequestDTO searchRequest = new ContainerSearchRequestDTO();
+		searchRequest.setBarcode(barcode);
+		// searchRequest.setDescription("test");
+		// searchRequest.setDefinition(definition.getCodeName());
+		// searchRequest.setCreatedUser(createdUser);
+		json = searchRequest.toJson();
+		logger.info(json);
+		response = this.mockMvc.perform(post("/api/v1/containers/searchContainers")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<Container> foundContainers = Container.fromJsonArrayToContainers(responseJson);
+		Assert.assertFalse(foundContainers.isEmpty());
+		for (Container foundContainer : foundContainers) {
+			Assert.assertNotNull(foundContainer);
+			for (ContainerState containerState : foundContainer.getLsStates()) {
+				for (ContainerValue containerValue : containerState.getLsValues()) {
+					if (containerValue.getLsKind().equals("created date"))
+						logger.info(containerValue.getDateValue().toGMTString());
+				}
+			}
+		}
+	}
+
+	@Test
+	@Transactional
+	public void updateWellContent_doNotCopyPreviousValuesTest() throws Exception {
+		List<String> wellCodes = new ArrayList<String>();
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("well", "default");
+		query.setMaxResults(1200);
+		for (Container container : query.getResultList()) {
+			wellCodes.add("\"" + container.getCodeName() + "\"");
+		}
+		String json = wellCodes.toString();
+		logger.info(json);
+		Long before = (new Date()).getTime();
+		Assert.assertFalse(json.equals("{}"));
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/getWellContent")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		Long after = (new Date()).getTime();
+		logger.info("ms elapsed: " + String.valueOf(after - before));
+		logger.info(responseJson);
+		Collection<WellContentDTO> results = WellContentDTO.fromJsonArrayToWellCoes(responseJson);
+		for (WellContentDTO result : results) {
+			result.setRecordedBy("bob");
+			result.setRecordedDate(new Date());
+			result.setAmount(new BigDecimal(10));
+			result.setAmountUnits("mg");
+		}
+		json = WellContentDTO.toJsonArray(results);
+		MockHttpServletResponse response1 = this.mockMvc.perform(post("/api/v1/containers/updateWellContent")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isNoContent())
+				.andReturn().getResponse();
+		response = this.mockMvc.perform(post("/api/v1/containers/getWellContent")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(wellCodes.toString()))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String checkJson1 = response.getContentAsString();
+		logger.info(checkJson1);
+		Collection<WellContentDTO> checkResults1 = WellContentDTO.fromJsonArrayToWellCoes(checkJson1);
+		for (WellContentDTO checkResult : checkResults1) {
+			Assert.assertNotNull(checkResult.getAmount());
+			Assert.assertNotNull(checkResult.getAmountUnits());
+		}
+		Collection<WellContentDTO> emptyWells = new ArrayList<WellContentDTO>();
+		emptyWells.addAll(results);
+		for (WellContentDTO emptyWell : emptyWells) {
+			emptyWell.setRecordedBy("bob");
+			emptyWell.setRecordedDate(new Date());
+			emptyWell.setAmount(null);
+			emptyWell.setAmountUnits(null);
+		}
+		String emptyWellsJson = WellContentDTO.toJsonArray(emptyWells);
+		MockHttpServletResponse response2 = this.mockMvc
+				.perform(post("/api/v1/containers/updateWellContent?copyPreviousValues=false")
+						.contentType(MediaType.APPLICATION_JSON)
+						.accept(MediaType.APPLICATION_JSON)
+						.content(emptyWellsJson))
+				.andExpect(status().isNoContent())
+				.andReturn().getResponse();
+		response = this.mockMvc.perform(post("/api/v1/containers/getWellContent")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(wellCodes.toString()))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String checkJson = response.getContentAsString();
+		logger.info(checkJson);
+		Collection<WellContentDTO> checkResults = WellContentDTO.fromJsonArrayToWellCoes(checkJson);
+		for (WellContentDTO checkResult : checkResults) {
+			Assert.assertNull(checkResult.getAmount());
+			Assert.assertNull(checkResult.getAmountUnits());
+		}
+	}
+
+	@Test
+	@Transactional
+	public void createPlateWithDefaultsAndGetContent() throws Exception {
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("definition container",
+				"plate");
+		query.setMaxResults(1);
+		Container definition = query.getSingleResult();
+		CreatePlateRequestDTO plateRequest = new CreatePlateRequestDTO();
+		plateRequest.setDefinition(definition.getCodeName());
+		plateRequest.setBarcode("TESTBARCODE-135");
+		plateRequest.setRecordedBy("acas");
+		plateRequest.setBatchConcentrationUnits("mM");
+		plateRequest.setPhysicalState("liquid");
+		String json = plateRequest.toJson();
+		logger.info(json);
+		Assert.assertFalse(json.equals("{}"));
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containers/createPlate")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		;
+		logger.info(response.getContentAsString());
+		PlateStubDTO result = PlateStubDTO.fromJsonToPlateStubDTO(response.getContentAsString());
+		logger.info(result.toJson());
+		Assert.assertEquals(1536, result.getWells().size());
+		String plateBarcode = result.getBarcode();
+		logger.info(plateBarcode);
+		MockHttpServletResponse response2 = this.mockMvc
+				.perform(get("/api/v1/containers/getWellContentByPlateBarcode/" + plateBarcode)
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response2.getContentAsString();
+		logger.info(responseJson);
+		Collection<WellContentDTO> results = WellContentDTO.fromJsonArrayToWellCoes(responseJson);
+		for (WellContentDTO resultWell : results) {
+			Assert.assertNotNull(resultWell.getContainerCodeName());
+			Assert.assertNotNull(resultWell.getWellName());
+			Assert.assertNotNull(resultWell.getRowIndex());
+			Assert.assertNotNull(resultWell.getColumnIndex());
+			Assert.assertNotNull(resultWell.getRecordedBy());
+			Assert.assertNotNull(resultWell.getRecordedDate());
+			Assert.assertEquals("liquid", resultWell.getPhysicalState());
+			Assert.assertEquals("mM", resultWell.getBatchConcUnits());
+		}
+	}
+
+	@Test
+	@Transactional
+	public void searchContainerCodesByContainerValue() throws Exception {
+		ContainerValueRequestDTO requestDTO = new ContainerValueRequestDTO();
+		requestDTO.setContainerType("container");
+		requestDTO.setContainerKind("plate");
+		;
+		requestDTO.setStateType("metadata");
+		requestDTO.setStateKind("information");
+		requestDTO.setValueType("codeValue");
+		requestDTO.setValueKind("created user");
+		requestDTO.setValue("bob");
+		String json = requestDTO.toJson();
+		MockHttpServletResponse response = this.mockMvc
+				.perform(post("/api/v1/containers/getContainerCodeNamesByContainerValue")
+						.contentType(MediaType.APPLICATION_JSON)
+						.accept(MediaType.APPLICATION_JSON)
+						.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		logger.info(response.getContentAsString());
+	}
+
+	@Test
+	@Transactional
+	public void searchContainerCodesByContainerValue_tooManyResults() throws Exception {
+		ContainerValueRequestDTO requestDTO = new ContainerValueRequestDTO();
+		requestDTO.setContainerType("container");
+		requestDTO.setContainerKind("plate");
+		;
+		requestDTO.setStateType("metadata");
+		requestDTO.setStateKind("information");
+		requestDTO.setValueType("codeValue");
+		requestDTO.setValueKind("created user");
+		requestDTO.setValue("bob");
+		String json = requestDTO.toJson();
+		Integer maxResults = 2;
+		MockHttpServletResponse response = this.mockMvc.perform(
+				post("/api/v1/containers/getContainerCodeNamesByContainerValue?maxResults=" + maxResults.toString())
+						.contentType(MediaType.APPLICATION_JSON)
+						.accept(MediaType.APPLICATION_JSON)
+						.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		logger.info(response.getContentAsString());
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		ContainerQueryResultDTO result = ContainerQueryResultDTO.fromJsonToContainerQueryResultDTO(responseJson);
+		Assert.assertEquals(maxResults, result.getMaxResults());
+		Assert.assertTrue((result.getNumberOfResults() > maxResults));
+		Assert.assertNull(result.getResults());
+	}
 
 }
\ No newline at end of file
diff --git a/src/test/java/com/labsynch/labseer/api/ApiContainerStateControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiContainerStateControllerTest.java
index 8ccb4e68a..7d5013375 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiContainerStateControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiContainerStateControllerTest.java
@@ -34,111 +34,110 @@
 @ContextConfiguration(locations = {
 		"classpath:/META-INF/spring/applicationContext.xml",
 		"classpath:/META-INF/spring/applicationContext-security.xml",
-		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml"})
+		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml" })
 public class ApiContainerStateControllerTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiContainerStateControllerTest.class);
-	
-    @Autowired
-    private WebApplicationContext wac;
 
-    private MockMvc mockMvc;
+	@Autowired
+	private WebApplicationContext wac;
 
-    @Before
-    public void setup() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-    }
-    
-    
-    @Test
-    @Transactional
-    public void findValidContainerStates() throws Exception{
-    	Collection<Container> allContainers = Container.findAllContainers();
-    	Collection<Container> someContainers = new HashSet<Container>();
-    	int count = 0;
-    	for (Container container : allContainers){
-    		if (count < 10){
-    			Container emptyContainer = new Container();
-    			emptyContainer.setId(container.getId());
-    			someContainers.add(emptyContainer);
-    			count++;
-    		}
-    	}
-    	Assert.assertFalse(someContainers.isEmpty());
-    	String json = Container.toJsonArray(someContainers);
+	private MockMvc mockMvc;
+
+	@Before
+	public void setup() {
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	}
+
+	@Test
+	@Transactional
+	public void findValidContainerStates() throws Exception {
+		Collection<Container> allContainers = Container.findAllContainers();
+		Collection<Container> someContainers = new HashSet<Container>();
+		int count = 0;
+		for (Container container : allContainers) {
+			if (count < 10) {
+				Container emptyContainer = new Container();
+				emptyContainer.setId(container.getId());
+				someContainers.add(emptyContainer);
+				count++;
+			}
+		}
+		Assert.assertFalse(someContainers.isEmpty());
+		String json = Container.toJsonArray(someContainers);
 		logger.info(json);
 		Assert.assertFalse(json.equals("{}"));
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containerstates/findValidContainerStates/jsonArray")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<ContainerState> validStates = ContainerState.fromJsonArrayToContainerStates(responseJson);
-    	Assert.assertFalse(validStates.isEmpty());
-    	for (ContainerState validState : validStates){
-    		Assert.assertFalse(validState.isIgnored());
-    	}
-    }
-    
-    @Test
-    @Transactional
-    public void findValidContainerStatesAndIgnore() throws Exception{
-    	Collection<Container> allContainers = Container.findAllContainers();
-    	Collection<Container> someContainers = new HashSet<Container>();
-    	int count = 0;
-    	for (Container container : allContainers){
-    		if (count < 10){
-    			Container emptyContainer = new Container();
-    			emptyContainer.setId(container.getId());
-    			someContainers.add(emptyContainer);
-    			count++;
-    		}
-    	}
-    	Assert.assertFalse(someContainers.isEmpty());
-    	String json = Container.toJsonArray(someContainers);
+		MockHttpServletResponse response = this.mockMvc
+				.perform(post("/api/v1/containerstates/findValidContainerStates/jsonArray")
+						.contentType(MediaType.APPLICATION_JSON)
+						.accept(MediaType.APPLICATION_JSON)
+						.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<ContainerState> validStates = ContainerState.fromJsonArrayToContainerStates(responseJson);
+		Assert.assertFalse(validStates.isEmpty());
+		for (ContainerState validState : validStates) {
+			Assert.assertFalse(validState.isIgnored());
+		}
+	}
+
+	@Test
+	@Transactional
+	public void findValidContainerStatesAndIgnore() throws Exception {
+		Collection<Container> allContainers = Container.findAllContainers();
+		Collection<Container> someContainers = new HashSet<Container>();
+		int count = 0;
+		for (Container container : allContainers) {
+			if (count < 10) {
+				Container emptyContainer = new Container();
+				emptyContainer.setId(container.getId());
+				someContainers.add(emptyContainer);
+				count++;
+			}
+		}
+		Assert.assertFalse(someContainers.isEmpty());
+		String json = Container.toJsonArray(someContainers);
 		logger.info(json);
 		Assert.assertFalse(json.equals("{}"));
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/containerstates/findValidContainerStates/jsonArray")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<ContainerState> validStates = ContainerState.fromJsonArrayToContainerStates(responseJson);
-    	Assert.assertFalse(validStates.isEmpty());
-    	for (ContainerState validState : validStates){
-    		Assert.assertFalse(validState.isIgnored());
-    	}
-    	
-    	Collection<ContainerState> statesToIgnore = new HashSet<ContainerState>();
-    	for (ContainerState validState : validStates){
-    		ContainerState stateToIgnore = new ContainerState();
-    		stateToIgnore.setId(validState.getId());
-    		statesToIgnore.add(stateToIgnore);
-    	}
-    	Assert.assertFalse(statesToIgnore.isEmpty());
-    	String jsonToIgnore = ContainerState.toJsonArray(statesToIgnore);
+		MockHttpServletResponse response = this.mockMvc
+				.perform(post("/api/v1/containerstates/findValidContainerStates/jsonArray")
+						.contentType(MediaType.APPLICATION_JSON)
+						.accept(MediaType.APPLICATION_JSON)
+						.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<ContainerState> validStates = ContainerState.fromJsonArrayToContainerStates(responseJson);
+		Assert.assertFalse(validStates.isEmpty());
+		for (ContainerState validState : validStates) {
+			Assert.assertFalse(validState.isIgnored());
+		}
+
+		Collection<ContainerState> statesToIgnore = new HashSet<ContainerState>();
+		for (ContainerState validState : validStates) {
+			ContainerState stateToIgnore = new ContainerState();
+			stateToIgnore.setId(validState.getId());
+			statesToIgnore.add(stateToIgnore);
+		}
+		Assert.assertFalse(statesToIgnore.isEmpty());
+		String jsonToIgnore = ContainerState.toJsonArray(statesToIgnore);
 		logger.info(jsonToIgnore);
 		Assert.assertFalse(jsonToIgnore.equals("{}"));
-    	MockHttpServletResponse response2 = this.mockMvc.perform(put("/api/v1/containerstates/ignore/jsonArray")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson2 = response2.getContentAsString();
-    	logger.info(responseJson2);
-    	Assert.assertEquals("[]", responseJson2);
-    }
-    
-    
+		MockHttpServletResponse response2 = this.mockMvc.perform(put("/api/v1/containerstates/ignore/jsonArray")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson2 = response2.getContentAsString();
+		logger.info(responseJson2);
+		Assert.assertEquals("[]", responseJson2);
+	}
 
 }
\ No newline at end of file
diff --git a/src/test/java/com/labsynch/labseer/api/ApiCurveFitControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiCurveFitControllerTest.java
index 1d60bc4c8..360ba8f42 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiCurveFitControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiCurveFitControllerTest.java
@@ -31,100 +31,97 @@
 @ContextConfiguration(locations = {
 		"classpath:/META-INF/spring/applicationContext.xml",
 		"classpath:/META-INF/spring/applicationContext-security.xml",
-		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml"})
+		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml" })
 public class ApiCurveFitControllerTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiCurveFitControllerTest.class);
-	
-    @Autowired
-    private WebApplicationContext wac;
-
-    private MockMvc mockMvc;
-
-    @Before
-    public void setup() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-    }
-    
-    //TODO: write the following tests. Need example data loaded into host5 to be able to set up a test suite.
-    //get fit data by curve id: dose response & Ki
-    //get raw data by curve id
-    //get tg data by curve id
-    //same as 4 above, but by experiment
-    //update fit data
-    //update ki fit data
-    //flag wells
-    
-    
-    @Test
-    @Transactional
-    public void getDisplayMinMaxByCurveId() throws Exception{
-    	String json = "AG-00441632_7080";
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/curvefit/displayminmax")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<ProtocolValue> results = ProtocolValue.fromJsonArrayToProtocolValues(responseJson);
-    	Assert.assertEquals(2, results.size());
-    }
-    
-    
-    //"AG-00442336_7271"
-    //brian [10:29 AM] this should "AG-00442336_7270"
-    
-    @Test
-    @Transactional
-    public void getFitDataByCurveIdWithMixedRenderingHintExistence() throws Exception{
-    	String json = "[\"AG-00442336_7271\",\"AG-00441632_7080\"]";
-
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/curvefit/fitdata")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    }
-    
-    @Test
-    @Transactional
-    public void getFitDataByCurveIdWithoutRenderingHint() throws Exception{
-    	String json = "[\"AG-00442336_7270\"]";
-
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/curvefit/fitdata")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    }
-    
-    @Test
-    @Transactional
-    public void getFitDataByCurveIdWithRenderingHint() throws Exception{
-    	String json = "[\"AG-00441632_7080\"]";
-
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/curvefit/fitdata")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    }
-    
-    
+
+	@Autowired
+	private WebApplicationContext wac;
+
+	private MockMvc mockMvc;
+
+	@Before
+	public void setup() {
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	}
+
+	// TODO: write the following tests. Need example data loaded into host5 to be
+	// able to set up a test suite.
+	// get fit data by curve id: dose response & Ki
+	// get raw data by curve id
+	// get tg data by curve id
+	// same as 4 above, but by experiment
+	// update fit data
+	// update ki fit data
+	// flag wells
+
+	@Test
+	@Transactional
+	public void getDisplayMinMaxByCurveId() throws Exception {
+		String json = "AG-00441632_7080";
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/curvefit/displayminmax")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<ProtocolValue> results = ProtocolValue.fromJsonArrayToProtocolValues(responseJson);
+		Assert.assertEquals(2, results.size());
+	}
+
+	// "AG-00442336_7271"
+	// brian [10:29 AM] this should "AG-00442336_7270"
+
+	@Test
+	@Transactional
+	public void getFitDataByCurveIdWithMixedRenderingHintExistence() throws Exception {
+		String json = "[\"AG-00442336_7271\",\"AG-00441632_7080\"]";
+
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/curvefit/fitdata")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+	}
+
+	@Test
+	@Transactional
+	public void getFitDataByCurveIdWithoutRenderingHint() throws Exception {
+		String json = "[\"AG-00442336_7270\"]";
+
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/curvefit/fitdata")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+	}
+
+	@Test
+	@Transactional
+	public void getFitDataByCurveIdWithRenderingHint() throws Exception {
+		String json = "[\"AG-00441632_7080\"]";
+
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/curvefit/fitdata")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+	}
 
 }
\ No newline at end of file
diff --git a/src/test/java/com/labsynch/labseer/api/ApiDDictValueControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiDDictValueControllerTest.java
index ef3fe9d2a..821724278 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiDDictValueControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiDDictValueControllerTest.java
@@ -1,6 +1,5 @@
 package com.labsynch.labseer.api;
 
-
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -33,98 +32,103 @@
 @ContextConfiguration(locations = {
 		"classpath:/META-INF/spring/applicationContext.xml",
 		"classpath:/META-INF/spring/applicationContext-security.xml",
-		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml"})
+		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml" })
 @Transactional
 public class ApiDDictValueControllerTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiDDictValueControllerTest.class);
-	
-    @Autowired
-    private WebApplicationContext wac;
 
-    private MockMvc mockMvc;
+	@Autowired
+	private WebApplicationContext wac;
+
+	private MockMvc mockMvc;
+
+	@Before
+	public void setup() {
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	}
+
+	@Test
+	public void getOrCreateSingleCodeTableExisting() throws Exception {
+		CodeTableDTO codeTable = new CodeTableDTO();
+		codeTable.setCodeType("dry run");
+		codeTable.setCodeKind("status");
+		codeTable.setCode("running");
+		String json = codeTable.toJson();
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/ddictvalues/codetable")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		CodeTableDTO savedCodeTable = CodeTableDTO.fromJsonToCodeTableDTO(responseJson);
+		logger.info(savedCodeTable.toJson());
+		Assert.assertEquals(codeTable.getCodeType(), savedCodeTable.getCodeType());
+		Assert.assertEquals(codeTable.getCodeKind(), savedCodeTable.getCodeKind());
+		Assert.assertEquals(codeTable.getCode(), savedCodeTable.getCode());
+	}
+
+	@Test
+	public void getOrCreateSingleCodeTableNew() throws Exception {
+		CodeTableDTO codeTable = new CodeTableDTO();
+		codeTable.setCodeType("test type");
+		codeTable.setCodeKind("test kind");
+		codeTable.setCode("test code");
+		String json = codeTable.toJson();
+		MockHttpServletResponse response = this.mockMvc
+				.perform(post("/api/v1/ddictvalues/codetable?createTypeKind=true")
+						.contentType(MediaType.APPLICATION_JSON)
+						.accept(MediaType.APPLICATION_JSON)
+						.content(json))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		CodeTableDTO savedCodeTable = CodeTableDTO.fromJsonToCodeTableDTO(responseJson);
+		logger.info(savedCodeTable.toJson());
+		Assert.assertEquals(codeTable.getCodeType(), savedCodeTable.getCodeType());
+		Assert.assertEquals(codeTable.getCodeKind(), savedCodeTable.getCodeKind());
+		Assert.assertEquals(codeTable.getCode(), savedCodeTable.getCode());
+	}
 
-    @Before
-    public void setup() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-    }
-    
-    @Test
-    public void getOrCreateSingleCodeTableExisting() throws Exception{
-    	CodeTableDTO codeTable = new CodeTableDTO();
-    	codeTable.setCodeType("dry run");
-    	codeTable.setCodeKind("status");
-    	codeTable.setCode("running");
-    	String json = codeTable.toJson();
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/ddictvalues/codetable")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	CodeTableDTO savedCodeTable = CodeTableDTO.fromJsonToCodeTableDTO(responseJson);
-    	logger.info(savedCodeTable.toJson());
-    	Assert.assertEquals(codeTable.getCodeType(), savedCodeTable.getCodeType());
-    	Assert.assertEquals(codeTable.getCodeKind(), savedCodeTable.getCodeKind());
-    	Assert.assertEquals(codeTable.getCode(), savedCodeTable.getCode());
-    }
-    
-    @Test
-    public void getOrCreateSingleCodeTableNew() throws Exception{
-    	CodeTableDTO codeTable = new CodeTableDTO();
-    	codeTable.setCodeType("test type");
-    	codeTable.setCodeKind("test kind");
-    	codeTable.setCode("test code");
-    	String json = codeTable.toJson();
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/ddictvalues/codetable?createTypeKind=true")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	CodeTableDTO savedCodeTable = CodeTableDTO.fromJsonToCodeTableDTO(responseJson);
-    	logger.info(savedCodeTable.toJson());
-    	Assert.assertEquals(codeTable.getCodeType(), savedCodeTable.getCodeType());
-    	Assert.assertEquals(codeTable.getCodeKind(), savedCodeTable.getCodeKind());
-    	Assert.assertEquals(codeTable.getCode(), savedCodeTable.getCode());
-    }
-    
-    @Test
-    public void getOrCreateCodeTableArray() throws Exception{
-    	CodeTableDTO codeTable = new CodeTableDTO();
-    	codeTable.setCodeType("dry run");
-    	codeTable.setCodeKind("status");
-    	codeTable.setCode("running");
-    	CodeTableDTO codeTable2 = new CodeTableDTO();
-    	codeTable2.setCodeType("test type");
-    	codeTable2.setCodeKind("test kind");
-    	codeTable2.setCode("test code");
-    	List<CodeTableDTO> codeTableArray = new ArrayList<CodeTableDTO>();
-    	codeTableArray.add(codeTable);
-    	codeTableArray.add(codeTable2);
-    	String json = CodeTableDTO.toJsonArray(codeTableArray);
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/ddictvalues/codetable/jsonArray?createTypeKind=true")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	logger.info(response.toString());
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<CodeTableDTO> savedCodeTables = CodeTableDTO.fromJsonArrayToCoes(responseJson);
-    	for (CodeTableDTO savedCodeTable : savedCodeTables){
-    		logger.info(savedCodeTable.toJson());
-        	Assert.assertTrue(codeTable.getCodeType().equals(savedCodeTable.getCodeType()) || codeTable2.getCodeType().equals(savedCodeTable.getCodeType()));
-        	Assert.assertTrue(codeTable.getCodeKind().equals(savedCodeTable.getCodeKind()) || codeTable2.getCodeKind().equals(savedCodeTable.getCodeKind()));
-        	Assert.assertTrue(codeTable.getCode().equals(savedCodeTable.getCode()) || codeTable2.getCode().equals(savedCodeTable.getCode()));
-    	}
-    }
+	@Test
+	public void getOrCreateCodeTableArray() throws Exception {
+		CodeTableDTO codeTable = new CodeTableDTO();
+		codeTable.setCodeType("dry run");
+		codeTable.setCodeKind("status");
+		codeTable.setCode("running");
+		CodeTableDTO codeTable2 = new CodeTableDTO();
+		codeTable2.setCodeType("test type");
+		codeTable2.setCodeKind("test kind");
+		codeTable2.setCode("test code");
+		List<CodeTableDTO> codeTableArray = new ArrayList<CodeTableDTO>();
+		codeTableArray.add(codeTable);
+		codeTableArray.add(codeTable2);
+		String json = CodeTableDTO.toJsonArray(codeTableArray);
+		MockHttpServletResponse response = this.mockMvc
+				.perform(post("/api/v1/ddictvalues/codetable/jsonArray?createTypeKind=true")
+						.contentType(MediaType.APPLICATION_JSON)
+						.accept(MediaType.APPLICATION_JSON)
+						.content(json))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		logger.info(response.toString());
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<CodeTableDTO> savedCodeTables = CodeTableDTO.fromJsonArrayToCoes(responseJson);
+		for (CodeTableDTO savedCodeTable : savedCodeTables) {
+			logger.info(savedCodeTable.toJson());
+			Assert.assertTrue(codeTable.getCodeType().equals(savedCodeTable.getCodeType())
+					|| codeTable2.getCodeType().equals(savedCodeTable.getCodeType()));
+			Assert.assertTrue(codeTable.getCodeKind().equals(savedCodeTable.getCodeKind())
+					|| codeTable2.getCodeKind().equals(savedCodeTable.getCodeKind()));
+			Assert.assertTrue(codeTable.getCode().equals(savedCodeTable.getCode())
+					|| codeTable2.getCode().equals(savedCodeTable.getCode()));
+		}
+	}
 }
diff --git a/src/test/java/com/labsynch/labseer/api/ApiExperimentControllerGetDataTest.java b/src/test/java/com/labsynch/labseer/api/ApiExperimentControllerGetDataTest.java
index eae67cd01..17d068683 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiExperimentControllerGetDataTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiExperimentControllerGetDataTest.java
@@ -27,45 +27,46 @@
 @ContextConfiguration(locations = {
 		"classpath:/META-INF/spring/applicationContext.xml",
 		"classpath:/META-INF/spring/applicationContext-security.xml",
-		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml"})
+		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml" })
 @Transactional
 public class ApiExperimentControllerGetDataTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiExperimentControllerGetDataTest.class);
-	
-    @Autowired
-    private WebApplicationContext wac;
 
-    private MockMvc mockMvc;
+	@Autowired
+	private WebApplicationContext wac;
 
-    @Before
-    public void setup() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-    }
-    
-    @Test
-    public void getAGValueData() throws Exception {
-    	String searchRequestJSON = "{\"advancedFilter\":null,\"advancedFilterSQL\":null,\"batchCodeList\":[],\"booleanFilter\":null,\"experimentCodeList\":[\"EXPT-00001844\"],\"searchFilters\":[]}";
-		ExperimentSearchRequestDTO searchRequest = ExperimentSearchRequestDTO.fromJsonToExperimentSearchRequestDTO(searchRequestJSON);
+	private MockMvc mockMvc;
 
-//    	ExperimentSearchRequestDTO searchRequest = new ExperimentSearchRequestDTO();
-//    	Set<String> experimentCodeList = new HashSet<String>();
-//    	experimentCodeList.add("EXPT-00001844");
-//		searchRequest.setExperimentCodeList(experimentCodeList);
+	@Before
+	public void setup() {
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	}
+
+	@Test
+	public void getAGValueData() throws Exception {
+		String searchRequestJSON = "{\"advancedFilter\":null,\"advancedFilterSQL\":null,\"batchCodeList\":[],\"booleanFilter\":null,\"experimentCodeList\":[\"EXPT-00001844\"],\"searchFilters\":[]}";
+		ExperimentSearchRequestDTO searchRequest = ExperimentSearchRequestDTO
+				.fromJsonToExperimentSearchRequestDTO(searchRequestJSON);
+
+		// ExperimentSearchRequestDTO searchRequest = new ExperimentSearchRequestDTO();
+		// Set<String> experimentCodeList = new HashSet<String>();
+		// experimentCodeList.add("EXPT-00001844");
+		// searchRequest.setExperimentCodeList(experimentCodeList);
 
 		logger.info("########## searchRequest JSON ############");
 		logger.info(searchRequest.toJson());
-    	
-    	MockHttpServletResponse response =  this.mockMvc.perform(post("/api/v1/experiments/agdata/batchcodelist/experimentcodelist")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(searchRequest.toJson()))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	logger.info(response.getContentAsString());
-    	
-    }
- 
+
+		MockHttpServletResponse response = this.mockMvc
+				.perform(post("/api/v1/experiments/agdata/batchcodelist/experimentcodelist")
+						.contentType(MediaType.APPLICATION_JSON)
+						.accept(MediaType.APPLICATION_JSON)
+						.content(searchRequest.toJson()))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		logger.info(response.getContentAsString());
+
+	}
 
 }
\ No newline at end of file
diff --git a/src/test/java/com/labsynch/labseer/api/ApiExperimentControllerSaveTest.java b/src/test/java/com/labsynch/labseer/api/ApiExperimentControllerSaveTest.java
index be1a49ebb..c8bab46ef 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiExperimentControllerSaveTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiExperimentControllerSaveTest.java
@@ -25,47 +25,48 @@
 @ContextConfiguration(locations = {
 		"classpath:/META-INF/spring/applicationContext.xml",
 		"classpath:/META-INF/spring/applicationContext-security.xml",
-		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml"})
+		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml" })
 @Transactional
 public class ApiExperimentControllerSaveTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiExperimentControllerSaveTest.class);
-	
-    @Autowired
-    private WebApplicationContext wac;
 
-    private MockMvc mockMvc;
+	@Autowired
+	private WebApplicationContext wac;
 
-    @Before
-    public void setup() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-    }
-    
-    @Test
-    public void saveAnalysisGroupsFromTsvFileTest() throws Exception {
-    	String json = "{\"analysisGroupCsvFilePath\":\"/opt/acas-dataexplorer/acas/privateUploads/csvUpload40427fc79ead.tsv\"}";
-    	logger.info("********" + json);
-    	
-    	MockHttpServletResponse response =  this.mockMvc.perform(post("/api/v1/experiments/analysisgroup/savefromtsv")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	logger.info(response.getContentAsString());
+	private MockMvc mockMvc;
 
-    }
-    
-//	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/authors")
-//			.contentType(MediaType.APPLICATION_JSON)
-//			.accept(MediaType.APPLICATION_JSON)
-//			.content(json))
-//			.andExpect(status().isCreated())
-//			.andExpect(content().contentType("application/json"))
-//			.andReturn().getResponse();
-//	String responseJson = response.getContentAsString();
-//	logger.info(responseJson);
-//	Author savedAuthor = Author.fromJsonToAuthor(responseJson);
+	@Before
+	public void setup() {
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	}
+
+	@Test
+	public void saveAnalysisGroupsFromTsvFileTest() throws Exception {
+		String json = "{\"analysisGroupCsvFilePath\":\"/opt/acas-dataexplorer/acas/privateUploads/csvUpload40427fc79ead.tsv\"}";
+		logger.info("********" + json);
+
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/experiments/analysisgroup/savefromtsv")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		logger.info(response.getContentAsString());
+
+	}
+
+	// MockHttpServletResponse response =
+	// this.mockMvc.perform(post("/api/v1/authors")
+	// .contentType(MediaType.APPLICATION_JSON)
+	// .accept(MediaType.APPLICATION_JSON)
+	// .content(json))
+	// .andExpect(status().isCreated())
+	// .andExpect(content().contentType("application/json"))
+	// .andReturn().getResponse();
+	// String responseJson = response.getContentAsString();
+	// logger.info(responseJson);
+	// Author savedAuthor = Author.fromJsonToAuthor(responseJson);
 
 }
\ No newline at end of file
diff --git a/src/test/java/com/labsynch/labseer/api/ApiExperimentControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiExperimentControllerTest.java
index 7c3fd6ff6..3f4d5f53f 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiExperimentControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiExperimentControllerTest.java
@@ -37,210 +37,212 @@
 @ContextConfiguration(locations = {
 		"classpath:/META-INF/spring/applicationContext.xml",
 		"classpath:/META-INF/spring/applicationContext-security.xml",
-		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml"})
+		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml" })
 @Transactional
 public class ApiExperimentControllerTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiExperimentControllerTest.class);
-	
-    @Autowired
-    private WebApplicationContext wac;
-
-    private MockMvc mockMvc;
-
-    @Before
-    public void setup() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-    }
-    
-  //  @Test
-    public void genericSearchByScientist() throws Exception {
-    	String searchString = "bob";
-    	String responseJson =  this.mockMvc.perform(get("/api/v1/experiments/search?q="+searchString)
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(responseJson.toString());
-    	Collection<Experiment> results = Experiment.fromJsonArrayToExperiments(responseJson);
-    	Assert.assertFalse(results.isEmpty());
-    }
-    
-  //  @Test
-    public void advancedGeneFilter() throws Exception {
-    	String json = "{\"experimentCodeList\":[\"EXPT-00000001\", \"PROT-00000001\"]}";
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/experiments/agdata/batchcodelist/experimentcodelist?format=csv&onlyPublicData=false")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-//    			.andExpect(status().isCreated())
-//    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    }
-    
-    @Test
-    public void getGeneCodeName() throws Exception {
-    	String json = "{\"requests\":[{\"requestName\":\"HYST2477\"},{\"requestName\":\"2\"}]}";
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/lsthings/getGeneCodeNameFromNameRequest")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-//    			.andExpect(status().isCreated())
-//    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    }
-    
-    @Test
-    public void genericSearchByProtocolCodeName() throws Exception {
-    	String searchString = "PROT-00000131";
-    	String responseJson =  this.mockMvc.perform(get("/api/v1/experiments/search?q="+searchString)
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(responseJson.toString());
-    	Collection<Experiment> results = Experiment.fromJsonArrayToExperiments(responseJson);
-    	Assert.assertFalse(results.isEmpty());
-    }
-    
-//    @Test
-    public void genericSearchByDate() throws Exception {
-    	String searchString = "2015-03-05";
-    	String responseJson =  this.mockMvc.perform(get("/api/v1/experiments/search?q="+searchString)
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(responseJson.toString());
-    	Collection<Experiment> results = Experiment.fromJsonArrayToExperiments(responseJson);
-    	Assert.assertFalse(results.isEmpty());
-    }
-    
-//    @Test
-    public void genericSearchByAnalysisStatus() throws Exception {
-    	String searchString = "Fiona approved";
-    	String responseJson =  this.mockMvc.perform(get("/api/v1/experiments/search?q="+searchString)
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(responseJson.toString());
-    	Collection<Experiment> results = Experiment.fromJsonArrayToExperiments(responseJson);
-    	Assert.assertFalse(results.isEmpty());
-    }
-    
-//    @Test
-    public void genericSearchByExperimentStatus() throws Exception {
-    	String searchString = "bob";
-    	String responseJson =  this.mockMvc.perform(get("/api/v1/experiments/search?q="+searchString)
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(responseJson.toString());
-    	Collection<Experiment> results = Experiment.fromJsonArrayToExperiments(responseJson);
-    	Assert.assertFalse(results.isEmpty());
-    }
-    
-    @Test
-    public void genericSearchForAllExperiments() throws Exception {
-    	String searchString = "fly";
-    	String responseJson =  this.mockMvc.perform(get("/api/v1/experiments/search?q="+searchString)
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isInternalServerError())
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(responseJson.toString());
-    	Assert.assertTrue(responseJson.contains("Too many"));
-    }
-    
-    @Test
-    public void getExperimentsByCodeName_StubWithProt() throws Exception {
-    	Collection<Experiment> experiments = Experiment.findAllExperiments();
-    	List<String> codeNames = new ArrayList<String>();
-    	for (Experiment experiment : experiments){
-    		codeNames.add("\""+experiment.getCodeName()+"\"");
-    	}
-    	String format = "stubWithProt";
-    	logger.info(codeNames.toString());
-    	String responseJson =  this.mockMvc.perform(post("/api/v1/experiments/codename/jsonArray?with="+format)
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(codeNames.toString())
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(responseJson.toString());
-    	Collection<ExperimentErrorMessageDTO> responses = ExperimentErrorMessageDTO.fromJsonArrayToExperimentErroes(responseJson);
-    	for (ExperimentErrorMessageDTO response : responses){
-    		Assert.assertNotNull(response.getExperimentCodeName());
-        	Assert.assertNotNull(response.getExperiment());
-        	Assert.assertNotNull(response.getExperiment().getLsStates());
-        	Assert.assertTrue(!response.getExperiment().getLsStates().isEmpty());
-        	Assert.assertNotNull(response.getExperiment().getLsLabels());
-        	Assert.assertTrue(!response.getExperiment().getLsLabels().isEmpty());
-        	Assert.assertNotNull(response.getExperiment().getProtocol());
-        	Assert.assertNotNull(response.getExperiment().getProtocol().getLsLabels());
-        	Assert.assertTrue(!response.getExperiment().getProtocol().getLsLabels().isEmpty());
-    	}
-    }
-    
-    @Test
-    public void getExperimentsAsCodeTables() throws Exception {
-    	String responseJson =  this.mockMvc.perform(get("/api/v1/experiments/codetables")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andReturn().getResponse().getContentAsString();
-    	Collection<CodeTableDTO> codetables = CodeTableDTO.fromJsonArrayToCoes(responseJson);
-    	Assert.assertFalse(codetables.isEmpty());
-    	logger.info(CodeTableDTO.toJsonArray(codetables));
-    	
-    	responseJson =  this.mockMvc.perform(get("/api/v1/experiments/codetables?lsType=default&lsKind=default")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andReturn().getResponse().getContentAsString();
-    	codetables = CodeTableDTO.fromJsonArrayToCoes(responseJson);
-    	Assert.assertFalse(codetables.isEmpty());
-    	logger.info(CodeTableDTO.toJsonArray(codetables));
-    	
-    	responseJson =  this.mockMvc.perform(get("/api/v1/experiments/codetables?lsType=invalidType")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andReturn().getResponse().getContentAsString();
-    	codetables = CodeTableDTO.fromJsonArrayToCoes(responseJson);
-    	Assert.assertTrue(codetables.isEmpty());
-    }
-    
-    @Test
-    public void getExperimentCodesByDateValueComparison() throws Exception {
-    	DateValueComparisonRequest request = new DateValueComparisonRequest();
+
+	@Autowired
+	private WebApplicationContext wac;
+
+	private MockMvc mockMvc;
+
+	@Before
+	public void setup() {
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	}
+
+	// @Test
+	public void genericSearchByScientist() throws Exception {
+		String searchString = "bob";
+		String responseJson = this.mockMvc.perform(get("/api/v1/experiments/search?q=" + searchString)
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+		logger.info(responseJson.toString());
+		Collection<Experiment> results = Experiment.fromJsonArrayToExperiments(responseJson);
+		Assert.assertFalse(results.isEmpty());
+	}
+
+	// @Test
+	public void advancedGeneFilter() throws Exception {
+		String json = "{\"experimentCodeList\":[\"EXPT-00000001\", \"PROT-00000001\"]}";
+		MockHttpServletResponse response = this.mockMvc.perform(
+				post("/api/v1/experiments/agdata/batchcodelist/experimentcodelist?format=csv&onlyPublicData=false")
+						.contentType(MediaType.APPLICATION_JSON)
+						.content(json)
+						.accept(MediaType.APPLICATION_JSON))
+				// .andExpect(status().isCreated())
+				// .andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+	}
+
+	@Test
+	public void getGeneCodeName() throws Exception {
+		String json = "{\"requests\":[{\"requestName\":\"HYST2477\"},{\"requestName\":\"2\"}]}";
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/lsthings/getGeneCodeNameFromNameRequest")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(json)
+				.accept(MediaType.APPLICATION_JSON))
+				// .andExpect(status().isCreated())
+				// .andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+	}
+
+	@Test
+	public void genericSearchByProtocolCodeName() throws Exception {
+		String searchString = "PROT-00000131";
+		String responseJson = this.mockMvc.perform(get("/api/v1/experiments/search?q=" + searchString)
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+		logger.info(responseJson.toString());
+		Collection<Experiment> results = Experiment.fromJsonArrayToExperiments(responseJson);
+		Assert.assertFalse(results.isEmpty());
+	}
+
+	// @Test
+	public void genericSearchByDate() throws Exception {
+		String searchString = "2015-03-05";
+		String responseJson = this.mockMvc.perform(get("/api/v1/experiments/search?q=" + searchString)
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+		logger.info(responseJson.toString());
+		Collection<Experiment> results = Experiment.fromJsonArrayToExperiments(responseJson);
+		Assert.assertFalse(results.isEmpty());
+	}
+
+	// @Test
+	public void genericSearchByAnalysisStatus() throws Exception {
+		String searchString = "Fiona approved";
+		String responseJson = this.mockMvc.perform(get("/api/v1/experiments/search?q=" + searchString)
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+		logger.info(responseJson.toString());
+		Collection<Experiment> results = Experiment.fromJsonArrayToExperiments(responseJson);
+		Assert.assertFalse(results.isEmpty());
+	}
+
+	// @Test
+	public void genericSearchByExperimentStatus() throws Exception {
+		String searchString = "bob";
+		String responseJson = this.mockMvc.perform(get("/api/v1/experiments/search?q=" + searchString)
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+		logger.info(responseJson.toString());
+		Collection<Experiment> results = Experiment.fromJsonArrayToExperiments(responseJson);
+		Assert.assertFalse(results.isEmpty());
+	}
+
+	@Test
+	public void genericSearchForAllExperiments() throws Exception {
+		String searchString = "fly";
+		String responseJson = this.mockMvc.perform(get("/api/v1/experiments/search?q=" + searchString)
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isInternalServerError())
+				.andReturn().getResponse().getContentAsString();
+		logger.info(responseJson.toString());
+		Assert.assertTrue(responseJson.contains("Too many"));
+	}
+
+	@Test
+	public void getExperimentsByCodeName_StubWithProt() throws Exception {
+		Collection<Experiment> experiments = Experiment.findAllExperiments();
+		List<String> codeNames = new ArrayList<String>();
+		for (Experiment experiment : experiments) {
+			codeNames.add("\"" + experiment.getCodeName() + "\"");
+		}
+		String format = "stubWithProt";
+		logger.info(codeNames.toString());
+		String responseJson = this.mockMvc.perform(post("/api/v1/experiments/codename/jsonArray?with=" + format)
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(codeNames.toString())
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andReturn().getResponse().getContentAsString();
+		logger.info(responseJson.toString());
+		Collection<ExperimentErrorMessageDTO> responses = ExperimentErrorMessageDTO
+				.fromJsonArrayToExperimentErroes(responseJson);
+		for (ExperimentErrorMessageDTO response : responses) {
+			Assert.assertNotNull(response.getExperimentCodeName());
+			Assert.assertNotNull(response.getExperiment());
+			Assert.assertNotNull(response.getExperiment().getLsStates());
+			Assert.assertTrue(!response.getExperiment().getLsStates().isEmpty());
+			Assert.assertNotNull(response.getExperiment().getLsLabels());
+			Assert.assertTrue(!response.getExperiment().getLsLabels().isEmpty());
+			Assert.assertNotNull(response.getExperiment().getProtocol());
+			Assert.assertNotNull(response.getExperiment().getProtocol().getLsLabels());
+			Assert.assertTrue(!response.getExperiment().getProtocol().getLsLabels().isEmpty());
+		}
+	}
+
+	@Test
+	public void getExperimentsAsCodeTables() throws Exception {
+		String responseJson = this.mockMvc.perform(get("/api/v1/experiments/codetables")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andReturn().getResponse().getContentAsString();
+		Collection<CodeTableDTO> codetables = CodeTableDTO.fromJsonArrayToCoes(responseJson);
+		Assert.assertFalse(codetables.isEmpty());
+		logger.info(CodeTableDTO.toJsonArray(codetables));
+
+		responseJson = this.mockMvc.perform(get("/api/v1/experiments/codetables?lsType=default&lsKind=default")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andReturn().getResponse().getContentAsString();
+		codetables = CodeTableDTO.fromJsonArrayToCoes(responseJson);
+		Assert.assertFalse(codetables.isEmpty());
+		logger.info(CodeTableDTO.toJsonArray(codetables));
+
+		responseJson = this.mockMvc.perform(get("/api/v1/experiments/codetables?lsType=invalidType")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andReturn().getResponse().getContentAsString();
+		codetables = CodeTableDTO.fromJsonArrayToCoes(responseJson);
+		Assert.assertTrue(codetables.isEmpty());
+	}
+
+	@Test
+	public void getExperimentCodesByDateValueComparison() throws Exception {
+		DateValueComparisonRequest request = new DateValueComparisonRequest();
 		request.setStateType("metadata");
 		request.setStateKind("experiment metadata");
 		request.setValueKind("completion date");
 		request.setSecondsDelta(60);
-		
+
 		String requestJson = request.toJson();
-		
+
 		logger.info(requestJson);
-    	String responseJson =  this.mockMvc.perform(post("/api/v1/experiments/getExperimentCodesByDateValueComparison")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(requestJson)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(responseJson.toString());
-		
-    }
+		String responseJson = this.mockMvc.perform(post("/api/v1/experiments/getExperimentCodesByDateValueComparison")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(requestJson)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andReturn().getResponse().getContentAsString();
+		logger.info(responseJson.toString());
+
+	}
 
 }
\ No newline at end of file
diff --git a/src/test/java/com/labsynch/labseer/api/ApiGeneThingsControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiGeneThingsControllerTest.java
index 8d9d2e575..fc5daf70e 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiGeneThingsControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiGeneThingsControllerTest.java
@@ -25,43 +25,45 @@
 @ContextConfiguration(locations = {
 		"classpath:/META-INF/spring/applicationContext.xml",
 		"classpath:/META-INF/spring/applicationContext-security.xml",
-		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml"})
+		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml" })
 @Transactional
 public class ApiGeneThingsControllerTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiGeneThingsControllerTest.class);
-	
-    @Autowired
-    private WebApplicationContext wac;
 
-    private MockMvc mockMvc;
+	@Autowired
+	private WebApplicationContext wac;
 
-    @Before
-    public void setup() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-    }
-    
-    @Transactional
-    @Test
-    public void getGeneExperimentDataTest() throws Exception {
-    	String json = "{\"experimentCodeList\":[\"EXPT-00000116\"],\"batchCodeList\":[],\"booleanFilter\":\"and\",\"advancedFilter\":\"\"}";
-    	logger.info("@@@@@@@@@@@@@@@@@     " + json + "        @@@@@@@@@@@@@@@@@");
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/experiments/agdata/batchcodelist/experimentcodelist?format=csv&onlyPublicData=true")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
+	private MockMvc mockMvc;
 
-    }
+	@Before
+	public void setup() {
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	}
+
+	@Transactional
+	@Test
+	public void getGeneExperimentDataTest() throws Exception {
+		String json = "{\"experimentCodeList\":[\"EXPT-00000116\"],\"batchCodeList\":[],\"booleanFilter\":\"and\",\"advancedFilter\":\"\"}";
+		logger.info("@@@@@@@@@@@@@@@@@     " + json + "        @@@@@@@@@@@@@@@@@");
+		MockHttpServletResponse response = this.mockMvc.perform(
+				post("/api/v1/experiments/agdata/batchcodelist/experimentcodelist?format=csv&onlyPublicData=true")
+						.contentType(MediaType.APPLICATION_JSON)
+						.content(json)
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+
+	}
+
+	// paste0(serverURL,
+	// "experiments/agdata/batchcodelist/experimentcodelist?format=csv&onlyPublicData=",
+	// onlyPublicData),
+	// customrequest='POST',
+	// httpheader=c('Content-Type'='application/json'),
+	// postfields=toJSON(searchParams))
 
-//	  paste0(serverURL, "experiments/agdata/batchcodelist/experimentcodelist?format=csv&onlyPublicData=", onlyPublicData),
-//	  customrequest='POST',
-//	  httpheader=c('Content-Type'='application/json'),
-//	  postfields=toJSON(searchParams))    
-    
-    
 }
\ No newline at end of file
diff --git a/src/test/java/com/labsynch/labseer/api/ApiItxExperimentExperimentControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiItxExperimentExperimentControllerTest.java
index 00002cfa4..8f5888868 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiItxExperimentExperimentControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiItxExperimentExperimentControllerTest.java
@@ -35,131 +35,135 @@
 @ContextConfiguration(locations = {
 		"classpath:/META-INF/spring/applicationContext.xml",
 		"classpath:/META-INF/spring/applicationContext-security.xml",
-		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml"})
+		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml" })
 public class ApiItxExperimentExperimentControllerTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiItxExperimentExperimentControllerTest.class);
-	
-    @Autowired
-    private WebApplicationContext wac;
-
-    private MockMvc mockMvc;
-
-    @Before
-    public void setup() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-    }
-    
-    @Test
-    @Transactional
-    public void createFromJson() throws Exception {
-    	Experiment firstExperiment = Experiment.findExperimentsByCodeNameEquals("EXPT-00000015").getSingleResult();
-    	Experiment secondExperiment = Experiment.findExperimentsByCodeNameEquals("EXPT-00000018").getSingleResult();
-    	ItxExperimentExperiment newItx = new ItxExperimentExperiment();
-    	newItx.setFirstExperiment(firstExperiment);
-    	newItx.setSecondExperiment(secondExperiment);
-    	newItx.setRecordedBy("test");
-    	newItx.setRecordedDate(new Date());
-    	String json = newItx.toJson();
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/itxexperimentexperiments/")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	ItxExperimentExperiment postedItx = ItxExperimentExperiment.fromJsonToItxExperimentExperiment(responseJson);
-    	logger.info(postedItx.toJson());
-    }
-    
-    @Test
-//    @Transactional
-    public void createFromJson2() throws Exception {
-        String json = "{\"deleted\":false,\"firstExperiment\":{\"codeName\":\"EXPT-00000015\",\"deleted\":false,\"id\":2165,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[{\"deleted\":false,\"id\":11053,\"ignored\":false,\"labelText\":\"Expt On2\",\"lsKind\":\"experiment name\",\"lsTransaction\":20,\"lsType\":\"name\",\"lsTypeAndKind\":\"name_experiment name\",\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"nouser\",\"recordedDate\":1396590049000,\"version\":0}],\"lsTransaction\":20,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"protocol\":{\"codeName\":\"PROT-00000010\",\"deleted\":false,\"id\":1599,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":15,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"recordedBy\":\"nouser\",\"recordedDate\":1396423362000,\"shortDescription\":\"protocol created by generic data parser\",\"version\":1},\"recordedBy\":\"nouser\",\"recordedDate\":1396590049000,\"shortDescription\":\"experiment created by generic data parser\",\"version\":1},\"id\":1466535,\"ignored\":false,\"lsTypeAndKind\":\"null_null\",\"recordedBy\":\"test\",\"recordedDate\":1426633674350,\"secondExperiment\":{\"codeName\":\"EXPT-00000018\",\"deleted\":false,\"id\":2183,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[{\"deleted\":false,\"id\":11056,\"ignored\":false,\"labelText\":\"Test Experiment 1\",\"lsKind\":\"experiment name\",\"lsTransaction\":23,\"lsType\":\"name\",\"lsTypeAndKind\":\"name_experiment name\",\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"nouser\",\"recordedDate\":1396930347000,\"version\":0}],\"lsTransaction\":23,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"protocol\":{\"codeName\":\"PROT-00000007\",\"deleted\":true,\"id\":1571,\"ignored\":true,\"lsKind\":\"default\",\"lsTransaction\":10,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1418201390481,\"recordedBy\":\"egao\",\"recordedDate\":1418201389855,\"shortDescription\":\"protocol created by generic data parser\",\"version\":4},\"recordedBy\":\"nouser\",\"recordedDate\":1396930347000,\"shortDescription\":\"experiment created by generic data parser\",\"version\":1},\"version\":0}";
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/itxexperimentexperiments/")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-//    			.andExpect(status().isCreated())
-//    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	ItxExperimentExperiment postedItx = ItxExperimentExperiment.fromJsonToItxExperimentExperiment(responseJson);
-    	logger.info(postedItx.toJson());
-    }
-    
-    @Test
-    @Transactional
-    public void findByFirstExperiment() throws Exception {
-    	Long firstExperimentId = 490L;
-    	Experiment firstExperiment = null;
-    	try{
-    		firstExperiment = Experiment.findExperiment(firstExperimentId);
-    	} catch(Exception e){
-    		logger.error("Error in findItxExperimentExperimentsByFirstExperiment: firstExperiment "+ firstExperimentId.toString()+" not found");
-    	}
-        Collection<ItxExperimentExperiment> itxExperimentExperiments = ItxExperimentExperiment.findItxExperimentExperimentsByFirstExperiment(firstExperiment).getResultList();
-        for (ItxExperimentExperiment itx : itxExperimentExperiments){
-        	logger.debug(itx.getCodeName() + " " + itx.getId().toString());
-        	logger.debug(itx.toJson());
-        }
-    	logger.info(ItxExperimentExperiment.toJsonArray(itxExperimentExperiments));
-    	
-    	
-    	String id = "490";
-    	MockHttpServletResponse response = this.mockMvc.perform(get("/api/v1/itxexperimentexperiments/findByFirstExperiment/"+id)
-        		.contentType(MediaType.APPLICATION_JSON)
-        		.accept(MediaType.APPLICATION_JSON))
-        		.andExpect(status().isOk())
-        		.andExpect(content().contentType("application/json"))
-        		.andReturn().getResponse();
-        
-        String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<ItxExperimentExperiment> foundItxs = ItxExperimentExperiment.fromJsonArrayToItxExperimentExperiments(responseJson);
-    	logger.info(ItxExperimentExperiment.toJsonArray(foundItxs));
-    }
-    
-    @Test
-    @Transactional
-    @Rollback(value=true)
-    public void createFromJsonArray() throws Exception {
-    	List<Experiment> experiments = Experiment.findExperimentEntries(0, 3);
-    	Experiment firstExperiment = experiments.get(0);
-    	Experiment secondExperiment = experiments.get(1);
-    	Experiment thirdExperiment = experiments.get(2);
-    	ItxExperimentExperiment newItx = new ItxExperimentExperiment();
-    	newItx.setFirstExperiment(firstExperiment);
-    	newItx.setSecondExperiment(secondExperiment);
-    	newItx.setLsType("has member");
-    	newItx.setLsKind("parent_child");
-    	newItx.setRecordedBy("test");
-    	newItx.setRecordedDate(new Date());
-    	ItxExperimentExperiment newItx2 = new ItxExperimentExperiment();
-    	newItx2.setFirstExperiment(firstExperiment);
-    	newItx2.setSecondExperiment(thirdExperiment);
-    	newItx2.setLsType("has member");
-    	newItx2.setLsKind("parent_child");
-    	newItx2.setRecordedBy("test");
-    	newItx2.setRecordedDate(new Date());
-    	Collection<ItxExperimentExperiment> itxExperimentExperiments = new ArrayList<ItxExperimentExperiment>();
-    	itxExperimentExperiments.add(newItx);
-    	itxExperimentExperiments.add(newItx2);
-    	String json = ItxExperimentExperiment.toJsonArray(itxExperimentExperiments);
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/itxexperimentexperiments/jsonArray")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<ItxExperimentExperiment> results = ItxExperimentExperiment.fromJsonArrayToItxExperimentExperiments(responseJson);
-    	logger.info(ItxExperimentExperiment.toJsonArray(results));
-    }
-    
+
+	@Autowired
+	private WebApplicationContext wac;
+
+	private MockMvc mockMvc;
+
+	@Before
+	public void setup() {
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	}
+
+	@Test
+	@Transactional
+	public void createFromJson() throws Exception {
+		Experiment firstExperiment = Experiment.findExperimentsByCodeNameEquals("EXPT-00000015").getSingleResult();
+		Experiment secondExperiment = Experiment.findExperimentsByCodeNameEquals("EXPT-00000018").getSingleResult();
+		ItxExperimentExperiment newItx = new ItxExperimentExperiment();
+		newItx.setFirstExperiment(firstExperiment);
+		newItx.setSecondExperiment(secondExperiment);
+		newItx.setRecordedBy("test");
+		newItx.setRecordedDate(new Date());
+		String json = newItx.toJson();
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/itxexperimentexperiments/")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(json)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		ItxExperimentExperiment postedItx = ItxExperimentExperiment.fromJsonToItxExperimentExperiment(responseJson);
+		logger.info(postedItx.toJson());
+	}
+
+	@Test
+	// @Transactional
+	public void createFromJson2() throws Exception {
+		String json = "{\"deleted\":false,\"firstExperiment\":{\"codeName\":\"EXPT-00000015\",\"deleted\":false,\"id\":2165,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[{\"deleted\":false,\"id\":11053,\"ignored\":false,\"labelText\":\"Expt On2\",\"lsKind\":\"experiment name\",\"lsTransaction\":20,\"lsType\":\"name\",\"lsTypeAndKind\":\"name_experiment name\",\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"nouser\",\"recordedDate\":1396590049000,\"version\":0}],\"lsTransaction\":20,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"protocol\":{\"codeName\":\"PROT-00000010\",\"deleted\":false,\"id\":1599,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":15,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"recordedBy\":\"nouser\",\"recordedDate\":1396423362000,\"shortDescription\":\"protocol created by generic data parser\",\"version\":1},\"recordedBy\":\"nouser\",\"recordedDate\":1396590049000,\"shortDescription\":\"experiment created by generic data parser\",\"version\":1},\"id\":1466535,\"ignored\":false,\"lsTypeAndKind\":\"null_null\",\"recordedBy\":\"test\",\"recordedDate\":1426633674350,\"secondExperiment\":{\"codeName\":\"EXPT-00000018\",\"deleted\":false,\"id\":2183,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[{\"deleted\":false,\"id\":11056,\"ignored\":false,\"labelText\":\"Test Experiment 1\",\"lsKind\":\"experiment name\",\"lsTransaction\":23,\"lsType\":\"name\",\"lsTypeAndKind\":\"name_experiment name\",\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"nouser\",\"recordedDate\":1396930347000,\"version\":0}],\"lsTransaction\":23,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"protocol\":{\"codeName\":\"PROT-00000007\",\"deleted\":true,\"id\":1571,\"ignored\":true,\"lsKind\":\"default\",\"lsTransaction\":10,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1418201390481,\"recordedBy\":\"egao\",\"recordedDate\":1418201389855,\"shortDescription\":\"protocol created by generic data parser\",\"version\":4},\"recordedBy\":\"nouser\",\"recordedDate\":1396930347000,\"shortDescription\":\"experiment created by generic data parser\",\"version\":1},\"version\":0}";
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/itxexperimentexperiments/")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(json)
+				.accept(MediaType.APPLICATION_JSON))
+				// .andExpect(status().isCreated())
+				// .andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		ItxExperimentExperiment postedItx = ItxExperimentExperiment.fromJsonToItxExperimentExperiment(responseJson);
+		logger.info(postedItx.toJson());
+	}
+
+	@Test
+	@Transactional
+	public void findByFirstExperiment() throws Exception {
+		Long firstExperimentId = 490L;
+		Experiment firstExperiment = null;
+		try {
+			firstExperiment = Experiment.findExperiment(firstExperimentId);
+		} catch (Exception e) {
+			logger.error("Error in findItxExperimentExperimentsByFirstExperiment: firstExperiment "
+					+ firstExperimentId.toString() + " not found");
+		}
+		Collection<ItxExperimentExperiment> itxExperimentExperiments = ItxExperimentExperiment
+				.findItxExperimentExperimentsByFirstExperiment(firstExperiment).getResultList();
+		for (ItxExperimentExperiment itx : itxExperimentExperiments) {
+			logger.debug(itx.getCodeName() + " " + itx.getId().toString());
+			logger.debug(itx.toJson());
+		}
+		logger.info(ItxExperimentExperiment.toJsonArray(itxExperimentExperiments));
+
+		String id = "490";
+		MockHttpServletResponse response = this.mockMvc
+				.perform(get("/api/v1/itxexperimentexperiments/findByFirstExperiment/" + id)
+						.contentType(MediaType.APPLICATION_JSON)
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<ItxExperimentExperiment> foundItxs = ItxExperimentExperiment
+				.fromJsonArrayToItxExperimentExperiments(responseJson);
+		logger.info(ItxExperimentExperiment.toJsonArray(foundItxs));
+	}
+
+	@Test
+	@Transactional
+	@Rollback(value = true)
+	public void createFromJsonArray() throws Exception {
+		List<Experiment> experiments = Experiment.findExperimentEntries(0, 3);
+		Experiment firstExperiment = experiments.get(0);
+		Experiment secondExperiment = experiments.get(1);
+		Experiment thirdExperiment = experiments.get(2);
+		ItxExperimentExperiment newItx = new ItxExperimentExperiment();
+		newItx.setFirstExperiment(firstExperiment);
+		newItx.setSecondExperiment(secondExperiment);
+		newItx.setLsType("has member");
+		newItx.setLsKind("parent_child");
+		newItx.setRecordedBy("test");
+		newItx.setRecordedDate(new Date());
+		ItxExperimentExperiment newItx2 = new ItxExperimentExperiment();
+		newItx2.setFirstExperiment(firstExperiment);
+		newItx2.setSecondExperiment(thirdExperiment);
+		newItx2.setLsType("has member");
+		newItx2.setLsKind("parent_child");
+		newItx2.setRecordedBy("test");
+		newItx2.setRecordedDate(new Date());
+		Collection<ItxExperimentExperiment> itxExperimentExperiments = new ArrayList<ItxExperimentExperiment>();
+		itxExperimentExperiments.add(newItx);
+		itxExperimentExperiments.add(newItx2);
+		String json = ItxExperimentExperiment.toJsonArray(itxExperimentExperiments);
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/itxexperimentexperiments/jsonArray")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(json)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<ItxExperimentExperiment> results = ItxExperimentExperiment
+				.fromJsonArrayToItxExperimentExperiments(responseJson);
+		logger.info(ItxExperimentExperiment.toJsonArray(results));
+	}
+
 }
\ No newline at end of file
diff --git a/src/test/java/com/labsynch/labseer/api/ApiItxProtocolProtocolControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiItxProtocolProtocolControllerTest.java
index 6310a645c..acfdd5430 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiItxProtocolProtocolControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiItxProtocolProtocolControllerTest.java
@@ -35,104 +35,106 @@
 @ContextConfiguration(locations = {
 		"classpath:/META-INF/spring/applicationContext.xml",
 		"classpath:/META-INF/spring/applicationContext-security.xml",
-		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml"})
+		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml" })
 public class ApiItxProtocolProtocolControllerTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiItxProtocolProtocolControllerTest.class);
-	
-    @Autowired
-    private WebApplicationContext wac;
 
-    private MockMvc mockMvc;
+	@Autowired
+	private WebApplicationContext wac;
+
+	private MockMvc mockMvc;
+
+	@Before
+	public void setup() {
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	}
+
+	@Test
+	@Transactional
+	@Rollback(value = true)
+	public void createFromJson() throws Exception {
+		List<Protocol> protocols = Protocol.findProtocolEntries(0, 2);
+		Protocol firstProtocol = protocols.get(0);
+		Protocol secondProtocol = protocols.get(1);
+		ItxProtocolProtocol newItx = new ItxProtocolProtocol();
+		newItx.setFirstProtocol(firstProtocol);
+		newItx.setSecondProtocol(secondProtocol);
+		newItx.setLsType("has member");
+		newItx.setLsKind("parent_child");
+		newItx.setRecordedBy("test");
+		newItx.setRecordedDate(new Date());
+		String json = newItx.toJson();
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/itxprotocolprotocols/")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(json)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		ItxProtocolProtocol postedItx = ItxProtocolProtocol.fromJsonToItxProtocolProtocol(responseJson);
+		logger.info(postedItx.toJson());
+	}
+
+	@Test
+	@Transactional
+	@Rollback(value = true)
+	public void createFromJsonArray() throws Exception {
+		List<Protocol> protocols = Protocol.findProtocolEntries(0, 3);
+		Protocol firstProtocol = protocols.get(0);
+		Protocol secondProtocol = protocols.get(1);
+		Protocol thirdProtocol = protocols.get(2);
+		ItxProtocolProtocol newItx = new ItxProtocolProtocol();
+		newItx.setFirstProtocol(firstProtocol);
+		newItx.setSecondProtocol(secondProtocol);
+		newItx.setLsType("has member");
+		newItx.setLsKind("parent_child");
+		newItx.setRecordedBy("test");
+		newItx.setRecordedDate(new Date());
+		ItxProtocolProtocol newItx2 = new ItxProtocolProtocol();
+		newItx2.setFirstProtocol(firstProtocol);
+		newItx2.setSecondProtocol(thirdProtocol);
+		newItx2.setLsType("has member");
+		newItx2.setLsKind("parent_child");
+		newItx2.setRecordedBy("test");
+		newItx2.setRecordedDate(new Date());
+		Collection<ItxProtocolProtocol> itxProtocolProtocols = new ArrayList<ItxProtocolProtocol>();
+		itxProtocolProtocols.add(newItx);
+		itxProtocolProtocols.add(newItx2);
+		String json = ItxProtocolProtocol.toJsonArray(itxProtocolProtocols);
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/itxprotocolprotocols/jsonArray")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(json)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<ItxProtocolProtocol> results = ItxProtocolProtocol.fromJsonArrayToItxProtocolProtocols(responseJson);
+		logger.info(ItxProtocolProtocol.toJsonArray(results));
+	}
+
+	@Test
+	@Transactional
+	@Rollback(value = true)
+	public void getByFirstProtocol() throws Exception {
+		ItxProtocolProtocol itx = (ItxProtocolProtocol) ItxProtocolProtocol.findAbstractThingEntries(0, 1).get(0);
+		Long firstProtocolId = itx.getFirstProtocol().getId();
+		MockHttpServletResponse response = this.mockMvc
+				.perform(get("/api/v1/itxprotocolprotocols/findByFirstProtocol/" + firstProtocolId)
+						.contentType(MediaType.APPLICATION_JSON)
+						.accept(MediaType.APPLICATION_JSON))
+				// .andExpect(status().isCreated())
+				// .andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<ItxProtocolProtocol> foundItxs = ItxProtocolProtocol
+				.fromJsonArrayToItxProtocolProtocols(responseJson);
+		logger.info(ItxProtocolProtocol.toJsonArray(foundItxs));
+	}
 
-    @Before
-    public void setup() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-    }
-    
-    @Test
-    @Transactional
-    @Rollback(value=true)
-    public void createFromJson() throws Exception {
-    	List<Protocol> protocols = Protocol.findProtocolEntries(0, 2);
-    	Protocol firstProtocol = protocols.get(0);
-    	Protocol secondProtocol = protocols.get(1);
-    	ItxProtocolProtocol newItx = new ItxProtocolProtocol();
-    	newItx.setFirstProtocol(firstProtocol);
-    	newItx.setSecondProtocol(secondProtocol);
-    	newItx.setLsType("has member");
-    	newItx.setLsKind("parent_child");
-    	newItx.setRecordedBy("test");
-    	newItx.setRecordedDate(new Date());
-    	String json = newItx.toJson();
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/itxprotocolprotocols/")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	ItxProtocolProtocol postedItx = ItxProtocolProtocol.fromJsonToItxProtocolProtocol(responseJson);
-    	logger.info(postedItx.toJson());
-    }
-    
-    @Test
-    @Transactional
-    @Rollback(value=true)
-    public void createFromJsonArray() throws Exception {
-    	List<Protocol> protocols = Protocol.findProtocolEntries(0, 3);
-    	Protocol firstProtocol = protocols.get(0);
-    	Protocol secondProtocol = protocols.get(1);
-    	Protocol thirdProtocol = protocols.get(2);
-    	ItxProtocolProtocol newItx = new ItxProtocolProtocol();
-    	newItx.setFirstProtocol(firstProtocol);
-    	newItx.setSecondProtocol(secondProtocol);
-    	newItx.setLsType("has member");
-    	newItx.setLsKind("parent_child");
-    	newItx.setRecordedBy("test");
-    	newItx.setRecordedDate(new Date());
-    	ItxProtocolProtocol newItx2 = new ItxProtocolProtocol();
-    	newItx2.setFirstProtocol(firstProtocol);
-    	newItx2.setSecondProtocol(thirdProtocol);
-    	newItx2.setLsType("has member");
-    	newItx2.setLsKind("parent_child");
-    	newItx2.setRecordedBy("test");
-    	newItx2.setRecordedDate(new Date());
-    	Collection<ItxProtocolProtocol> itxProtocolProtocols = new ArrayList<ItxProtocolProtocol>();
-    	itxProtocolProtocols.add(newItx);
-    	itxProtocolProtocols.add(newItx2);
-    	String json = ItxProtocolProtocol.toJsonArray(itxProtocolProtocols);
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/itxprotocolprotocols/jsonArray")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<ItxProtocolProtocol> results = ItxProtocolProtocol.fromJsonArrayToItxProtocolProtocols(responseJson);
-    	logger.info(ItxProtocolProtocol.toJsonArray(results));
-    }
-    
-    @Test
-    @Transactional
-    @Rollback(value=true)
-    public void getByFirstProtocol() throws Exception {
-    	ItxProtocolProtocol itx = (ItxProtocolProtocol) ItxProtocolProtocol.findAbstractThingEntries(0, 1).get(0);
-    	Long firstProtocolId = itx.getFirstProtocol().getId();
-    	MockHttpServletResponse response = this.mockMvc.perform(get("/api/v1/itxprotocolprotocols/findByFirstProtocol/"+firstProtocolId)
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON))
-//    			.andExpect(status().isCreated())
-//    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<ItxProtocolProtocol> foundItxs = ItxProtocolProtocol.fromJsonArrayToItxProtocolProtocols(responseJson);
-    	logger.info(ItxProtocolProtocol.toJsonArray(foundItxs));
-    }
-    
 }
\ No newline at end of file
diff --git a/src/test/java/com/labsynch/labseer/api/ApiItxSubjectContainerControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiItxSubjectContainerControllerTest.java
index 0d5228257..1bc946178 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiItxSubjectContainerControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiItxSubjectContainerControllerTest.java
@@ -27,37 +27,37 @@
 @ContextConfiguration(locations = {
 		"classpath:/META-INF/spring/applicationContext.xml",
 		"classpath:/META-INF/spring/applicationContext-security.xml",
-		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml"})
+		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml" })
 public class ApiItxSubjectContainerControllerTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiItxSubjectContainerControllerTest.class);
-	
-    @Autowired
-    private WebApplicationContext wac;
-
-    private MockMvc mockMvc;
-
-    @Before
-    public void setup() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-    }
-    
-    @Test
-    @Transactional
-    public void createFromJson() throws Exception {
+
+	@Autowired
+	private WebApplicationContext wac;
+
+	private MockMvc mockMvc;
+
+	@Before
+	public void setup() {
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	}
+
+	@Test
+	@Transactional
+	public void createFromJson() throws Exception {
 		String json = "[{\"subject\":{\"id\":6},\"container\":{\"id\":96},\"lsType\":\"default\",\"lsKind\":\"default\",\"recordedBy\":\"jmcneil\",\"recordedDate\":1455732120597,\"lsTransaction\":152}]";
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/itxsubjectcontainers/jsonArray")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-//    			.andExpect(status().isCreated())
-//    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<ItxSubjectContainer> postedItx = ItxSubjectContainer.fromJsonArrayToItxSubjectContainers(responseJson);
-    	logger.info(ItxSubjectContainer.toJsonArray(postedItx));
-    }
-    
-    
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/itxsubjectcontainers/jsonArray")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(json)
+				.accept(MediaType.APPLICATION_JSON))
+				// .andExpect(status().isCreated())
+				// .andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<ItxSubjectContainer> postedItx = ItxSubjectContainer
+				.fromJsonArrayToItxSubjectContainers(responseJson);
+		logger.info(ItxSubjectContainer.toJsonArray(postedItx));
+	}
+
 }
\ No newline at end of file
diff --git a/src/test/java/com/labsynch/labseer/api/ApiLabelSequenceControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiLabelSequenceControllerTest.java
index 56da3f1d9..8797d9fec 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiLabelSequenceControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiLabelSequenceControllerTest.java
@@ -30,39 +30,37 @@
 @ContextConfiguration(locations = {
 		"classpath:/META-INF/spring/applicationContext.xml",
 		"classpath:/META-INF/spring/applicationContext-security.xml",
-		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml"})
+		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml" })
 public class ApiLabelSequenceControllerTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiLabelSequenceControllerTest.class);
-	
-    @Autowired
-    private WebApplicationContext wac;
 
-    private MockMvc mockMvc;
+	@Autowired
+	private WebApplicationContext wac;
 
-    @Before
-    public void setup() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-    }
-    
-    @Test
-    public void getAllLabelSequences() throws Exception {
-    	MockHttpServletResponse response = this.mockMvc.perform(get("/api/v1/labelsequences")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<LabelSequence> labelSequences = LabelSequence.fromJsonArrayToLabelSequences(responseJson);
-    	Assert.assertEquals(false, labelSequences.isEmpty());
-    	LabelSequence firstLabelSequence = labelSequences.iterator().next();
-    	Assert.assertNotNull(firstLabelSequence.getLabelPrefix());
-    	Assert.assertNotNull(firstLabelSequence.getThingTypeAndKind());
-    	Assert.assertNotNull(firstLabelSequence.getLabelTypeAndKind());
-    }
-    
-    
+	private MockMvc mockMvc;
+
+	@Before
+	public void setup() {
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	}
+
+	@Test
+	public void getAllLabelSequences() throws Exception {
+		MockHttpServletResponse response = this.mockMvc.perform(get("/api/v1/labelsequences")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<LabelSequence> labelSequences = LabelSequence.fromJsonArrayToLabelSequences(responseJson);
+		Assert.assertEquals(false, labelSequences.isEmpty());
+		LabelSequence firstLabelSequence = labelSequences.iterator().next();
+		Assert.assertNotNull(firstLabelSequence.getLabelPrefix());
+		Assert.assertNotNull(firstLabelSequence.getThingTypeAndKind());
+		Assert.assertNotNull(firstLabelSequence.getLabelTypeAndKind());
+	}
 
 }
\ No newline at end of file
diff --git a/src/test/java/com/labsynch/labseer/api/ApiLsThingControllerPostTest.java b/src/test/java/com/labsynch/labseer/api/ApiLsThingControllerPostTest.java
index d74d57ef6..45de35662 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiLsThingControllerPostTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiLsThingControllerPostTest.java
@@ -32,56 +32,57 @@
 @ContextConfiguration(locations = {
 		"classpath:/META-INF/spring/applicationContext.xml",
 		"classpath:/META-INF/spring/applicationContext-security.xml",
-		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml"})
+		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml" })
 @Transactional
 public class ApiLsThingControllerPostTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiLsThingControllerPostTest.class);
-	
-    @Autowired
-    private WebApplicationContext wac;
 
-    private MockMvc mockMvc;
+	@Autowired
+	private WebApplicationContext wac;
+
+	private MockMvc mockMvc;
+
+	@Before
+	public void setup() {
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	}
 
-    @Before
-    public void setup() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-    }
-    
 	@Test
-    @Transactional
-    public void structureSearch() throws Exception {
-		String queryMol= "\n  Mrv1641110051619032D          \n\n  5  5  0  0  0  0            999 V2000\n   -0.0446    0.6125    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.7121    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.4572   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.3679   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.6228    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n  2  3  1  0  0  0  0\n  3  4  1  0  0  0  0\n  4  5  1  0  0  0  0\n  1  2  1  0  0  0  0\n  1  5  1  0  0  0  0\nM  END\n";
-		StructureSearchDTO query = new StructureSearchDTO(queryMol, "small molecule", "reagent", "SUBSTRUCTURE", 10, null);
+	@Transactional
+	public void structureSearch() throws Exception {
+		String queryMol = "\n  Mrv1641110051619032D          \n\n  5  5  0  0  0  0            999 V2000\n   -0.0446    0.6125    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.7121    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.4572   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.3679   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.6228    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n  2  3  1  0  0  0  0\n  3  4  1  0  0  0  0\n  4  5  1  0  0  0  0\n  1  2  1  0  0  0  0\n  1  5  1  0  0  0  0\nM  END\n";
+		StructureSearchDTO query = new StructureSearchDTO(queryMol, "small molecule", "reagent", "SUBSTRUCTURE", 10,
+				null);
 		String json = query.toJson();
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/lsthings/structureSearch")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-//    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.debug(responseJson);
-    	Collection<LsThing> searchResults = LsThing.fromJsonArrayToLsThings(responseJson);
-    	Assert.assertFalse(searchResults.isEmpty());
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/lsthings/structureSearch")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(json)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				// .andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.debug(responseJson);
+		Collection<LsThing> searchResults = LsThing.fromJsonArrayToLsThings(responseJson);
+		Assert.assertFalse(searchResults.isEmpty());
 		logger.debug(LsThing.toJsonArray(searchResults));
-    }
-	
-    @Test
-    public void registerReferenceThingTest() throws Exception {
-    	String json = "{\"lsType\":\"reference\",\"lsKind\":\"webpage\",\"corpName\":\"\",\"recordedBy\":\"egao\",\"recordedDate\":1436823212184,\"shortDescription\":\" \",\"lsLabels\":[],\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"reference metadata\",\"lsValues\":[{\"lsType\":\"urlValue\",\"lsKind\":\"external url\",\"ignored\":false,\"recordedDate\":1436823212188,\"recordedBy\":\"egao\",\"value\":\"http://www.google.com\",\"urlValue\":\"http://www.google.com\"}],\"ignored\":false,\"recordedDate\":1436823212185,\"recordedBy\":\"egao\"}],\"firstLsThings\":[],\"secondLsThings\":[],\"cid\":\"c38\",\"_changing\":false,\"_previousAttributes\":{\"lsType\":\"thing\",\"lsKind\":\"thing\",\"corpName\":\"\",\"recordedBy\":\"egao\",\"recordedDate\":1436823200318,\"shortDescription\":\" \",\"lsLabels\":[],\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"reference metadata\",\"lsValues\":[{\"lsType\":\"urlValue\",\"lsKind\":\"external url\",\"ignored\":false,\"recordedDate\":1436823212188,\"recordedBy\":\"egao\",\"value\":\"http://www.google.com\",\"urlValue\":\"http://www.google.com\"}],\"ignored\":false,\"recordedDate\":1436823212185,\"recordedBy\":\"egao\"}],\"firstLsThings\":[]},\"changed\":{\"secondLsThings\":[]},\"_pending\":false,\"urlRoot\":\"/api/things/reference/webpage\",\"className\":\"WebpageReference\",\"lsProperties\":{\"defaultLabels\":[],\"defaultValues\":[{\"key\":\"external url\",\"stateType\":\"metadata\",\"stateKind\":\"reference metadata\",\"type\":\"urlValue\",\"kind\":\"external url\"}],\"defaultFirstLsThingItx\":[],\"defaultSecondLsThingItx\":[]},\"validationError\":null,\"idAttribute\":\"id\"}";
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/lsthings/reference/webpage")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	LsThing postedLsThing = LsThing.fromJsonToLsThing(responseJson);
-    	logger.info(postedLsThing.toJson());
-    }
+	}
+
+	@Test
+	public void registerReferenceThingTest() throws Exception {
+		String json = "{\"lsType\":\"reference\",\"lsKind\":\"webpage\",\"corpName\":\"\",\"recordedBy\":\"egao\",\"recordedDate\":1436823212184,\"shortDescription\":\" \",\"lsLabels\":[],\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"reference metadata\",\"lsValues\":[{\"lsType\":\"urlValue\",\"lsKind\":\"external url\",\"ignored\":false,\"recordedDate\":1436823212188,\"recordedBy\":\"egao\",\"value\":\"http://www.google.com\",\"urlValue\":\"http://www.google.com\"}],\"ignored\":false,\"recordedDate\":1436823212185,\"recordedBy\":\"egao\"}],\"firstLsThings\":[],\"secondLsThings\":[],\"cid\":\"c38\",\"_changing\":false,\"_previousAttributes\":{\"lsType\":\"thing\",\"lsKind\":\"thing\",\"corpName\":\"\",\"recordedBy\":\"egao\",\"recordedDate\":1436823200318,\"shortDescription\":\" \",\"lsLabels\":[],\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"reference metadata\",\"lsValues\":[{\"lsType\":\"urlValue\",\"lsKind\":\"external url\",\"ignored\":false,\"recordedDate\":1436823212188,\"recordedBy\":\"egao\",\"value\":\"http://www.google.com\",\"urlValue\":\"http://www.google.com\"}],\"ignored\":false,\"recordedDate\":1436823212185,\"recordedBy\":\"egao\"}],\"firstLsThings\":[]},\"changed\":{\"secondLsThings\":[]},\"_pending\":false,\"urlRoot\":\"/api/things/reference/webpage\",\"className\":\"WebpageReference\",\"lsProperties\":{\"defaultLabels\":[],\"defaultValues\":[{\"key\":\"external url\",\"stateType\":\"metadata\",\"stateKind\":\"reference metadata\",\"type\":\"urlValue\",\"kind\":\"external url\"}],\"defaultFirstLsThingItx\":[],\"defaultSecondLsThingItx\":[]},\"validationError\":null,\"idAttribute\":\"id\"}";
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/lsthings/reference/webpage")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(json)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		LsThing postedLsThing = LsThing.fromJsonToLsThing(responseJson);
+		logger.info(postedLsThing.toJson());
+	}
 
 }
\ No newline at end of file
diff --git a/src/test/java/com/labsynch/labseer/api/ApiLsThingControllerSearchTest.java b/src/test/java/com/labsynch/labseer/api/ApiLsThingControllerSearchTest.java
index 5c10559ec..1a166ee97 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiLsThingControllerSearchTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiLsThingControllerSearchTest.java
@@ -34,52 +34,57 @@
 @ContextConfiguration(locations = {
 		"classpath:/META-INF/spring/applicationContext.xml",
 		"classpath:/META-INF/spring/applicationContext-security.xml",
-		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml"})
+		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml" })
 @Transactional
 public class ApiLsThingControllerSearchTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiLsThingControllerSearchTest.class);
-	
-    @Autowired
-    private WebApplicationContext wac;
-
-    private MockMvc mockMvc;
-
-    @Before
-    public void setup() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-    }
-    
-
-//	@Test
-    @Transactional
-    public void structureSearch() throws Exception {
-    	String json = "{\"queryMol\":\"Molecule from ChemDoodle Web Components\\n\\nhttp://www.ichemlabs.com\\n  5  5  0  0  0  0            999 V2000\\n    0.0000    0.7694    0.0000 C   0  0  0  0  0  0\\n    0.8090    0.1816    0.0000 C   0  0  0  0  0  0\\n    0.5000   -0.7694    0.0000 C   0  0  0  0  0  0\\n   -0.5000   -0.7694    0.0000 C   0  0  0  0  0  0\\n   -0.8090    0.1816    0.0000 C   0  0  0  0  0  0\\n  1  2  1  0     0  0\\n  2  3  1  0     0  0\\n  3  4  1  0     0  0\\n  4  5  1  0     0  0\\n  5  1  1  0     0  0\\nM  END\"}";
-		//String queryMol= "\n  Mrv1641110051619032D          \n\n  5  5  0  0  0  0            999 V2000\n   -0.0446    0.6125    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.7121    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.4572   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.3679   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.6228    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n  2  3  1  0  0  0  0\n  3  4  1  0  0  0  0\n  4  5  1  0  0  0  0\n  1  2  1  0  0  0  0\n  1  5  1  0  0  0  0\nM  END\n";
-		//StructureSearchDTO query = new StructureSearchDTO(queryMol, "", "", "SUBSTRUCTURE", 10, null);
+
+	@Autowired
+	private WebApplicationContext wac;
+
+	private MockMvc mockMvc;
+
+	@Before
+	public void setup() {
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	}
+
+	// @Test
+	@Transactional
+	public void structureSearch() throws Exception {
+		String json = "{\"queryMol\":\"Molecule from ChemDoodle Web Components\\n\\nhttp://www.ichemlabs.com\\n  5  5  0  0  0  0            999 V2000\\n    0.0000    0.7694    0.0000 C   0  0  0  0  0  0\\n    0.8090    0.1816    0.0000 C   0  0  0  0  0  0\\n    0.5000   -0.7694    0.0000 C   0  0  0  0  0  0\\n   -0.5000   -0.7694    0.0000 C   0  0  0  0  0  0\\n   -0.8090    0.1816    0.0000 C   0  0  0  0  0  0\\n  1  2  1  0     0  0\\n  2  3  1  0     0  0\\n  3  4  1  0     0  0\\n  4  5  1  0     0  0\\n  5  1  1  0     0  0\\nM  END\"}";
+		// String queryMol= "\n Mrv1641110051619032D \n\n 5 5 0 0 0 0 999 V2000\n
+		// -0.0446 0.6125 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0\n -0.7121 0.1274 0.0000 C 0 0
+		// 0 0 0 0 0 0 0 0 0 0\n -0.4572 -0.6572 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0\n
+		// 0.3679 -0.6572 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0\n 0.6228 0.1274 0.0000 C 0 0
+		// 0 0 0 0 0 0 0 0 0 0\n 2 3 1 0 0 0 0\n 3 4 1 0 0 0 0\n 4 5 1 0 0 0 0\n 1 2 1 0
+		// 0 0 0\n 1 5 1 0 0 0 0\nM END\n";
+		// StructureSearchDTO query = new StructureSearchDTO(queryMol, "", "",
+		// "SUBSTRUCTURE", 10, null);
 		StructureSearchDTO query = StructureSearchDTO.fromJsonToStructureSearchDTO(json);
 		query.setSearchType("SUBSTRUCTURE");
 		query.setMaxResults(10);
-		
+
 		String inputJson = query.toJson();
 		logger.info(query.toJson());
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/lsthings/structureSearch")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(inputJson)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-//    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.debug(responseJson);
-    	Collection<LsThing> searchResults = LsThing.fromJsonArrayToLsThings(responseJson);
-//    	Assert.assertTrue(searchResults.isEmpty());
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/lsthings/structureSearch")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(inputJson)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				// .andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.debug(responseJson);
+		Collection<LsThing> searchResults = LsThing.fromJsonArrayToLsThings(responseJson);
+		// Assert.assertTrue(searchResults.isEmpty());
 		logger.debug(LsThing.toJsonArray(searchResults));
-    }
-	
-//	@Test
-    @Transactional
-    public void thingMetadataSearch() throws Exception {
+	}
+
+	// @Test
+	@Transactional
+	public void thingMetadataSearch() throws Exception {
 		LsThingQueryDTO query = new LsThingQueryDTO();
 		query.setLsType("parent");
 		query.setLsKind("monomer");
@@ -88,31 +93,32 @@ public void thingMetadataSearch() throws Exception {
 		valueQuery.setStateKind("parent properties");
 		valueQuery.setValueType("codeValue");
 		valueQuery.setValueKind("structure");
-		//valueQuery.setValue("");
+		// valueQuery.setValue("");
 		Collection<ValueQueryDTO> values = new HashSet<ValueQueryDTO>();
 		values.add(valueQuery);
-		query.setValues(values);		
+		query.setValues(values);
 		String json = query.toJson();
 		logger.info(json);
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/lsthings/genericInteractionSearch")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-//    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info("########################");
-    	logger.info(responseJson);
-//    	Collection<LsThing> searchResults = LsThing.fromJsonArrayToLsThings(responseJson);
-//    	Assert.assertFalse(searchResults.isEmpty());
-//		logger.debug(LsThing.toJsonArray(searchResults));
-    }
-	
-	//@Test
-    @Transactional
-    public void thingMetadataStructureSearch() throws Exception {
-		StructureAndThingSearchDTO metaStructQuery = new StructureAndThingSearchDTO();		
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/lsthings/genericInteractionSearch")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(json)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				// .andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info("########################");
+		logger.info(responseJson);
+		// Collection<LsThing> searchResults =
+		// LsThing.fromJsonArrayToLsThings(responseJson);
+		// Assert.assertFalse(searchResults.isEmpty());
+		// logger.debug(LsThing.toJsonArray(searchResults));
+	}
+
+	// @Test
+	@Transactional
+	public void thingMetadataStructureSearch() throws Exception {
+		StructureAndThingSearchDTO metaStructQuery = new StructureAndThingSearchDTO();
 		LsThingQueryDTO thingQuery = new LsThingQueryDTO();
 		thingQuery.setLsType("parent");
 		thingQuery.setLsKind("monomer");
@@ -121,101 +127,111 @@ public void thingMetadataStructureSearch() throws Exception {
 		valueQuery.setStateKind("parent properties");
 		valueQuery.setValueType("codeValue");
 		valueQuery.setValueKind("structure");
-		//valueQuery.setValue("");
+		// valueQuery.setValue("");
 		Collection<ValueQueryDTO> values = new HashSet<ValueQueryDTO>();
 		values.add(valueQuery);
 		thingQuery.setValues(values);
 		Collection<LabelQueryDTO> labels = new HashSet<LabelQueryDTO>();
 		LabelQueryDTO label = new LabelQueryDTO();
 		label.setLabelType("name");
-		//label.setLabelKind("alias");
+		// label.setLabelKind("alias");
 		label.setLabelText("201");
 		label.setOperator("like");
 		labels.add(label);
-//		LabelQueryDTO label2 = new LabelQueryDTO();
-//		label2.setLabelType("name");
-//		//label2.setLabelKind("alias");
-//		label2.setLabelText("201");
-//		labels.add(label2);		
-		
+		// LabelQueryDTO label2 = new LabelQueryDTO();
+		// label2.setLabelType("name");
+		// //label2.setLabelKind("alias");
+		// label2.setLabelText("201");
+		// labels.add(label2);
+
 		thingQuery.setLabels(labels);
 		metaStructQuery.setLsThingQueryDTO(thingQuery);
-//		LsThingQueryDTO emptyThingQuery = new LsThingQueryDTO();
-//		metaStructQuery.setLsThingQueryDTO(emptyThingQuery);
-    	String queryMolJson = "{\"queryMol\":\"Molecule from ChemDoodle Web Components\\n\\nhttp://www.ichemlabs.com\\n  5  5  0  0  0  0            999 V2000\\n    0.0000    0.7694    0.0000 C   0  0  0  0  0  0\\n    0.8090    0.1816    0.0000 C   0  0  0  0  0  0\\n    0.5000   -0.7694    0.0000 C   0  0  0  0  0  0\\n   -0.5000   -0.7694    0.0000 C   0  0  0  0  0  0\\n   -0.8090    0.1816    0.0000 C   0  0  0  0  0  0\\n  1  2  1  0     0  0\\n  2  3  1  0     0  0\\n  3  4  1  0     0  0\\n  4  5  1  0     0  0\\n  5  1  1  0     0  0\\nM  END\"}";
+		// LsThingQueryDTO emptyThingQuery = new LsThingQueryDTO();
+		// metaStructQuery.setLsThingQueryDTO(emptyThingQuery);
+		String queryMolJson = "{\"queryMol\":\"Molecule from ChemDoodle Web Components\\n\\nhttp://www.ichemlabs.com\\n  5  5  0  0  0  0            999 V2000\\n    0.0000    0.7694    0.0000 C   0  0  0  0  0  0\\n    0.8090    0.1816    0.0000 C   0  0  0  0  0  0\\n    0.5000   -0.7694    0.0000 C   0  0  0  0  0  0\\n   -0.5000   -0.7694    0.0000 C   0  0  0  0  0  0\\n   -0.8090    0.1816    0.0000 C   0  0  0  0  0  0\\n  1  2  1  0     0  0\\n  2  3  1  0     0  0\\n  3  4  1  0     0  0\\n  4  5  1  0     0  0\\n  5  1  1  0     0  0\\nM  END\"}";
 		StructureSearchDTO query = StructureSearchDTO.fromJsonToStructureSearchDTO(queryMolJson);
 
-//		String queryMol= "\n  Mrv1641110051619032D          \n\n  5  5  0  0  0  0            999 V2000\n   -0.0446    0.6125    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.7121    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.4572   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.3679   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.6228    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n  2  3  1  0  0  0  0\n  3  4  1  0  0  0  0\n  4  5  1  0  0  0  0\n  1  2  1  0  0  0  0\n  1  5  1  0  0  0  0\nM  END\n";
+		// String queryMol= "\n Mrv1641110051619032D \n\n 5 5 0 0 0 0 999 V2000\n
+		// -0.0446 0.6125 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0\n -0.7121 0.1274 0.0000 C 0 0
+		// 0 0 0 0 0 0 0 0 0 0\n -0.4572 -0.6572 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0\n
+		// 0.3679 -0.6572 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0\n 0.6228 0.1274 0.0000 C 0 0
+		// 0 0 0 0 0 0 0 0 0 0\n 2 3 1 0 0 0 0\n 3 4 1 0 0 0 0\n 4 5 1 0 0 0 0\n 1 2 1 0
+		// 0 0 0\n 1 5 1 0 0 0 0\nM END\n";
 		metaStructQuery.setQueryMol(query.getQueryMol());
 		metaStructQuery.setSearchType("SUBSTRUCTURE");
 		metaStructQuery.setMaxResults(10);
-		
+
 		String json = metaStructQuery.toJson();
-		logger.info("############## -- metaStructQuery #################" );
+		logger.info("############## -- metaStructQuery #################");
 		logger.info(json);
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/lsthings/structureAndMetaSearch")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/lsthings/structureAndMetaSearch")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(json)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
 	}
-  
+
 	@Test
-    @Transactional
-    public void thingMetadataStructureSearch2() throws Exception {
-		StructureAndThingSearchDTO metaStructQuery = new StructureAndThingSearchDTO();		
+	@Transactional
+	public void thingMetadataStructureSearch2() throws Exception {
+		StructureAndThingSearchDTO metaStructQuery = new StructureAndThingSearchDTO();
 		LsThingQueryDTO thingQuery = new LsThingQueryDTO();
 		thingQuery.setLsType("parent");
 		thingQuery.setLsKind("small molecule");
-//		ValueQueryDTO valueQuery = new ValueQueryDTO();
-//		valueQuery.setStateType("properties");
-//		valueQuery.setStateKind("parent properties");
-//		valueQuery.setValueType("codeValue");
-//		valueQuery.setValueKind("structure");
-//		//valueQuery.setValue("");
-//		Collection<ValueQueryDTO> values = new HashSet<ValueQueryDTO>();
-//		values.add(valueQuery);
-//		thingQuery.setValues(values);
-//		Collection<LabelQueryDTO> labels = new HashSet<LabelQueryDTO>();
-//		LabelQueryDTO label = new LabelQueryDTO();
-//		label.setLabelType("name");
-//		//label.setLabelKind("alias");
-//		label.setLabelText("201");
-//		label.setOperator("like");
-//		labels.add(label);
-//		LabelQueryDTO label2 = new LabelQueryDTO();
-//		label2.setLabelType("name");
-//		//label2.setLabelKind("alias");
-//		label2.setLabelText("201");
-//		labels.add(label2);		
-		
-//		thingQuery.setLabels(labels);
+		// ValueQueryDTO valueQuery = new ValueQueryDTO();
+		// valueQuery.setStateType("properties");
+		// valueQuery.setStateKind("parent properties");
+		// valueQuery.setValueType("codeValue");
+		// valueQuery.setValueKind("structure");
+		// //valueQuery.setValue("");
+		// Collection<ValueQueryDTO> values = new HashSet<ValueQueryDTO>();
+		// values.add(valueQuery);
+		// thingQuery.setValues(values);
+		// Collection<LabelQueryDTO> labels = new HashSet<LabelQueryDTO>();
+		// LabelQueryDTO label = new LabelQueryDTO();
+		// label.setLabelType("name");
+		// //label.setLabelKind("alias");
+		// label.setLabelText("201");
+		// label.setOperator("like");
+		// labels.add(label);
+		// LabelQueryDTO label2 = new LabelQueryDTO();
+		// label2.setLabelType("name");
+		// //label2.setLabelKind("alias");
+		// label2.setLabelText("201");
+		// labels.add(label2);
+
+		// thingQuery.setLabels(labels);
 		metaStructQuery.setLsThingQueryDTO(thingQuery);
-//		LsThingQueryDTO emptyThingQuery = new LsThingQueryDTO();
-//		metaStructQuery.setLsThingQueryDTO(emptyThingQuery);
-//    	String queryMolJson = "{\"queryMol\":\"Molecule from ChemDoodle Web Components\n\nhttp://www.ichemlabs.com\n  6  6  0  0  0  0            999 V2000\n    0.0000    1.0000    0.0000 C   0  0  0  0  0  0\n    0.8660    0.5000    0.0000 C   0  0  0  0  0  0\n    0.8660   -0.5000    0.0000 C   0  0  0  0  0  0\n    0.0000   -1.0000    0.0000 C   0  0  0  0  0  0\n   -0.8660   -0.5000    0.0000 C   0  0  0  0  0  0\n   -0.8660    0.5000    0.0000 C   0  0  0  0  0  0\n  1  2  1  0     0  0\n  2  3  2  0     0  0\n  3  4  1  0     0  0\n  4  5  2  0     0  0\n  5  6  1  0     0  0\n  6  1  2  0     0  0\nM  END\",\"searchType\":\"SUBSTRUCTURE\",\"lsType\":\"chemistry\",\"lsKind\":\"reagent\",\"maxResults\":100,\"similarity\":null}";
-    	String queryMolJson = "{\"queryMol\":\"Molecule from ChemDoodle Web Components\\n\\nhttp://www.ichemlabs.com\\n  5  5  0  0  0  0            999 V2000\\n    0.0000    0.7694    0.0000 C   0  0  0  0  0  0\\n    0.8090    0.1816    0.0000 C   0  0  0  0  0  0\\n    0.5000   -0.7694    0.0000 C   0  0  0  0  0  0\\n   -0.5000   -0.7694    0.0000 C   0  0  0  0  0  0\\n   -0.8090    0.1816    0.0000 C   0  0  0  0  0  0\\n  1  2  1  0     0  0\\n  2  3  1  0     0  0\\n  3  4  1  0     0  0\\n  4  5  1  0     0  0\\n  5  1  1  0     0  0\\nM  END\"}";
-  	
-    	StructureSearchDTO query = StructureSearchDTO.fromJsonToStructureSearchDTO(queryMolJson);
+		// LsThingQueryDTO emptyThingQuery = new LsThingQueryDTO();
+		// metaStructQuery.setLsThingQueryDTO(emptyThingQuery);
+		// String queryMolJson = "{\"queryMol\":\"Molecule from ChemDoodle Web
+		// Components\n\nhttp://www.ichemlabs.com\n 6 6 0 0 0 0 999 V2000\n 0.0000
+		// 1.0000 0.0000 C 0 0 0 0 0 0\n 0.8660 0.5000 0.0000 C 0 0 0 0 0 0\n 0.8660
+		// -0.5000 0.0000 C 0 0 0 0 0 0\n 0.0000 -1.0000 0.0000 C 0 0 0 0 0 0\n -0.8660
+		// -0.5000 0.0000 C 0 0 0 0 0 0\n -0.8660 0.5000 0.0000 C 0 0 0 0 0 0\n 1 2 1 0
+		// 0 0\n 2 3 2 0 0 0\n 3 4 1 0 0 0\n 4 5 2 0 0 0\n 5 6 1 0 0 0\n 6 1 2 0 0 0\nM
+		// END\",\"searchType\":\"SUBSTRUCTURE\",\"lsType\":\"chemistry\",\"lsKind\":\"reagent\",\"maxResults\":100,\"similarity\":null}";
+		String queryMolJson = "{\"queryMol\":\"Molecule from ChemDoodle Web Components\\n\\nhttp://www.ichemlabs.com\\n  5  5  0  0  0  0            999 V2000\\n    0.0000    0.7694    0.0000 C   0  0  0  0  0  0\\n    0.8090    0.1816    0.0000 C   0  0  0  0  0  0\\n    0.5000   -0.7694    0.0000 C   0  0  0  0  0  0\\n   -0.5000   -0.7694    0.0000 C   0  0  0  0  0  0\\n   -0.8090    0.1816    0.0000 C   0  0  0  0  0  0\\n  1  2  1  0     0  0\\n  2  3  1  0     0  0\\n  3  4  1  0     0  0\\n  4  5  1  0     0  0\\n  5  1  1  0     0  0\\nM  END\"}";
+
+		StructureSearchDTO query = StructureSearchDTO.fromJsonToStructureSearchDTO(queryMolJson);
 		metaStructQuery.setQueryMol(query.getQueryMol());
 		metaStructQuery.setSearchType("SUBSTRUCTURE");
 		metaStructQuery.setMaxResults(10);
-		
+
 		String json = metaStructQuery.toJson();
-		logger.info("############## -- metaStructQuery #################" );
+		logger.info("############## -- metaStructQuery #################");
 		logger.info(json);
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/lsthings/structureAndMetaSearch")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/lsthings/structureAndMetaSearch")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(json)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
 	}
-    
-    
+
 }
\ No newline at end of file
diff --git a/src/test/java/com/labsynch/labseer/api/ApiLsThingControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiLsThingControllerTest.java
index f2a1a87bf..d9cd9143c 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiLsThingControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiLsThingControllerTest.java
@@ -39,553 +39,681 @@
 @ContextConfiguration(locations = {
 		"classpath:/META-INF/spring/applicationContext.xml",
 		"classpath:/META-INF/spring/applicationContext-security.xml",
-		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml"})
+		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml" })
 @Transactional
 public class ApiLsThingControllerTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiLsThingControllerTest.class);
-	
-    @Autowired
-    private WebApplicationContext wac;
-
-    private MockMvc mockMvc;
-
-    @Before
-    public void setup() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-    }
-    
-    @Test
-    public void registerComponentParentTest() throws Exception {
-    	String json = "{\"codeName\":null,\"ignored\":false,\"lsKind\":\"linker small molecule\",\"lsLabels\":[{\"ignored\":false,\"imageFile\":null,\"labelText\":\"LSM 2\",\"lsKind\":\"linker small molecule\",\"lsTransaction\":1,\"lsType\":\"name\",\"lsTypeAndKind\":\"name_linker small molecule\",\"modifiedDate\":null,\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"jane\",\"recordedDate\":1375141504000}],\"lsStates\":[{\"comments\":null,\"ignored\":false,\"lsKind\":\"linker small molecule parent\",\"lsTransaction\":1,\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_linker small molecule parent\",\"lsValues\":[{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":1342080000000,\"fileValue\":null,\"ignored\":false,\"lsTransaction\":128,\"modifiedDate\":null,\"numericValue\":null,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":null,\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"completion date\",\"valueOperator\":null,\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"valueUnit\":null},{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"fileValue\":null,\"ignored\":false,\"lsTransaction\":127,\"modifiedDate\":null,\"numericValue\":null,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":\"Notebook 1\",\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"notebook\",\"valueOperator\":null,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"valueUnit\":null},{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"fileValue\":null,\"ignored\":false,\"lsTransaction\":128,\"modifiedDate\":null,\"numericValue\":231,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":null,\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"molecular weight\",\"valueOperator\":null,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_molecular weight\",\"unitKind\":\"g/mol\",\"unitType\":\"molecular weight\",\"valueUnit\":null},{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"fileValue\":null,\"ignored\":false,\"lsTransaction\":128,\"modifiedDate\":null,\"numericValue\":0,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":null,\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"batch number\",\"valueOperator\":null,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_batch number\",\"unitKind\":null,\"unitType\":null,\"valueUnit\":null}],\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"jane\",\"recordedDate\":1375141460000}],\"lsTransaction\":1,\"lsType\":\"parent\",\"lsTypeAndKind\":\"parent_linker small molecule\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"jane\",\"recordedDate\":1375141508000,\"shortDescription\":\" \"}";
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/lsthings/parent/linker small molecule")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	LsThing postedLsThing = LsThing.fromJsonToLsThing(responseJson);
-    	logger.info(postedLsThing.toJson());
-    }
-    
-    @Test
-    public void searchLabelText() throws Exception {
-    	logger.info("starting the test");
-    	String json = "{\"requests\":[{\"requestName\":\"GENE-000002\"}]}";
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/lsthings/getCodeNameFromNameRequest?thingType=gene&thingKind=entrez gene")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info("test finished: responseJSON is:");
-    	logger.info(responseJson);
-    }
-    
-    @Test
-    public void registerComponentBatchTest() throws Exception {
-    	String json = "{\"codeName\":null,\"ignored\":false,\"lsKind\":\"linker small molecule\",\"lsStates\":[{\"comments\":null,\"id\":11,\"ignored\":false,\"lsKind\":\"linker small molecule batch\",\"lsTransaction\":1,\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_linker small molecule batch\",\"lsValues\":[{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":1342080000000,\"fileValue\":null,\"id\":12,\"ignored\":false,\"lsTransaction\":128,\"modifiedDate\":null,\"numericValue\":null,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":null,\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"completion date\",\"valueOperator\":null,\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"valueUnit\":null,\"version\":0},{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"fileValue\":null,\"id\":13,\"ignored\":false,\"lsTransaction\":127,\"modifiedDate\":null,\"numericValue\":null,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":\"Notebook 1\",\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"notebook\",\"valueOperator\":null,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"valueUnit\":null,\"version\":0}],\"recordedDate\":1363388477000,\"recordedBy\":\"jane\"},{\"comments\":null,\"id\":111,\"ignored\":false,\"lsKind\":\"inventory\",\"lsTransaction\":1,\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_inventory\",\"lsValues\":[{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"fileValue\":null,\"id\":14,\"ignored\":false,\"lsTransaction\":128,\"modifiedDate\":null,\"numericValue\":2.3,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":null,\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"amount\",\"valueOperator\":null,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_amount\",\"unitKind\":\"g\",\"unitType\":\"mass\",\"valueUnit\":null,\"version\":0},{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"fileValue\":null,\"id\":15,\"ignored\":false,\"lsTransaction\":127,\"modifiedDate\":null,\"numericValue\":null,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":\"Cabinet 1\",\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"location\",\"valueOperator\":null,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_location\",\"valueUnit\":null,\"version\":0}],\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"jane\",\"recordedDate\":1375141460000,\"version\":0}],\"lsTransaction\":1,\"lsType\":\"batch\",\"lsTypeAndKind\":\"batch_linker small molecule\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"jane\",\"recordedDate\":1375141508000,\"shortDescription\":\" \",\"version\":0}";
-    	String responseJson = this.mockMvc.perform(post("/api/v1/lsthings/batch/linker small molecule?parentIdOrCodeName=LSM000002")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(responseJson);
-    	LsThing postedLsThing = LsThing.fromJsonToLsThing(responseJson);
-    	logger.info(postedLsThing.toJson());
-    }
-    
-    @Test
-    public void updateComponentParentTest() throws Exception {
-    	String json = "{\"codeName\":\"LSM000001\",\"deleted\":false,\"id\":1191916,\"ignored\":false,\"lsKind\":\"linker small molecule\",\"lsLabels\":[{\"deleted\":false,\"id\":297063,\"ignored\":false,\"labelText\":\"LSM\",\"lsKind\":\"linker small molecule\",\"lsTransaction\":1,\"lsType\":\"name\",\"lsTypeAndKind\":\"name_linker small molecule\",\"physicallyLabeled\":false,\"preferred\":true,\"recordedBy\":\"jane\",\"recordedDate\":1375141504000,\"version\":0}],\"lsStates\":[{\"comments\":\"test state comment\",\"deleted\":false,\"id\":2170023,\"ignored\":false,\"lsKind\":\"linker small molecule parent\",\"lsTransaction\":1,\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_linker small molecule parent\",\"lsValues\":[{\"comments\":\"test value comment\",\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":4584944,\"ignored\":false,\"lsKind\":\"batch number\",\"lsTransaction\":128,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_batch number\",\"numericValue\":1,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"unitTypeAndKind\":\"null_null\",\"version\":1},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":4584942,\"ignored\":false,\"lsKind\":\"molecular weight\",\"lsTransaction\":128,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_molecular weight\",\"numericValue\":231,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"unitKind\":\"g/mol\",\"unitType\":\"molecular weight\",\"unitTypeAndKind\":\"molecular weight_g/mol\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":4584945,\"ignored\":false,\"lsKind\":\"notebook\",\"lsTransaction\":127,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"stringValue\":\"Notebook 1\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1342080000000,\"deleted\":false,\"id\":4584943,\"ignored\":false,\"lsKind\":\"completion date\",\"lsTransaction\":128,\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"unitTypeAndKind\":\"null_null\",\"version\":0}],\"recordedBy\":\"jane\",\"recordedDate\":1375141460000,\"version\":1}],\"lsTags\":[],\"lsTransaction\":1,\"lsType\":\"parent\",\"lsTypeAndKind\":\"parent_linker small molecule\",\"recordedBy\":\"jane\",\"recordedDate\":1375141508000,\"version\":1}";
-    	MockHttpServletResponse response = this.mockMvc.perform(put("/api/v1/lsthings/parent/linker small molecule/LSM000001")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	LsThing postedLsThing = LsThing.fromJsonToLsThing(responseJson);
-    	logger.info(postedLsThing.toJson());
-    }
-    
-    @Test
-    public void updateComponentBatchTest() throws Exception {
-    	String json = "{\"codeName\":\"LSM000001-1\",\"deleted\":false,\"id\":1191917,\"ignored\":false,\"lsKind\":\"linker small molecule\",\"lsLabels\":[],\"lsStates\":[{\"deleted\":false,\"id\":2170024,\"ignored\":false,\"lsKind\":\"linker small molecule batch\",\"lsTransaction\":1,\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_linker small molecule batch\",\"lsValues\":[{\"comments\":\"test notebook update comment\",\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":4584947,\"ignored\":false,\"lsKind\":\"notebook\",\"lsTransaction\":127,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"stringValue\":\"Notebook 1\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1342080000000,\"deleted\":false,\"id\":4584946,\"ignored\":false,\"lsKind\":\"completion date\",\"lsTransaction\":128,\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"unitTypeAndKind\":\"null_null\",\"version\":0}],\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"version\":1},{\"deleted\":false,\"id\":2170025,\"ignored\":false,\"lsKind\":\"inventory\",\"lsTransaction\":1,\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_inventory\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":4584949,\"ignored\":false,\"lsKind\":\"amount\",\"lsTransaction\":128,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_amount\",\"numericValue\":2.29999999999999982236431605997495353221893310546875,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"unitKind\":\"g\",\"unitType\":\"mass\",\"unitTypeAndKind\":\"mass_g\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":4584948,\"ignored\":false,\"lsKind\":\"location\",\"lsTransaction\":127,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_location\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"stringValue\":\"Cabinet 1\",\"unitTypeAndKind\":\"null_null\",\"version\":0}],\"recordedBy\":\"jane\",\"recordedDate\":1375141460000,\"version\":1}],\"lsTags\":[],\"lsTransaction\":1,\"lsType\":\"batch\",\"lsTypeAndKind\":\"batch_linker small molecule\",\"recordedBy\":\"jane\",\"recordedDate\":1375141508000,\"version\":1}";
-    	String responseJson = this.mockMvc.perform(put("/api/v1/lsthings/batch/linker small molecule/LSM000001-1")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(responseJson);
-    	LsThing postedLsThing = LsThing.fromJsonToLsThing(responseJson);
-    	logger.info(postedLsThing.toJson());
-    }
-    
-    @Test
-    @Rollback(value=false)
-    public void registerAssemblyParentTest() throws Exception {
-    	String json = "{\"lsType\":\"parent\",\"lsKind\":\"internalization agent\",\"corpName\":\"\",\"recordedBy\":\"bob\",\"recordedDate\":1428352474150,\"shortDescription\":\" \",\"lsLabels\":[{\"lsType\":\"name\",\"lsKind\":\"internalization agent\",\"labelText\":\"LSM10-peg5\",\"ignored\":false,\"preferred\":true,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null}],\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"internalization agent parent\",\"lsValues\":[{\"lsType\":\"codeValue\",\"lsKind\":\"scientist\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"codeOrigin\":\"ACAS authors\",\"codeValue\":\"egao\",\"value\":\"egao\"},{\"lsType\":\"dateValue\",\"lsKind\":\"completion date\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":1428303600000,\"dateValue\":1428303600000},{\"lsType\":\"stringValue\",\"lsKind\":\"notebook\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":\"test\",\"stringValue\":\"test\"},{\"lsType\":\"codeValue\",\"lsKind\":\"conjugation type\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"codeKind\":\"conjugation type\",\"codeType\":\"internalization agent\",\"codeOrigin\":\"ACAS DDICT\",\"codeValue\":\"cys\",\"value\":\"cys\"},{\"lsType\":\"stringValue\",\"lsKind\":\"conjugation site\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":\"\",\"stringValue\":\"\"},{\"lsType\":\"numericValue\",\"lsKind\":\"batch number\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"numericValue\":0,\"value\":0}],\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\"}],\"firstLsThings\":[],\"secondLsThings\":[{\"lsType\":\"incorporates\",\"lsKind\":\"assembly_component\",\"lsTypeAndKind\":\"incorporates_assembly_component\",\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"composition\",\"lsValues\":[{\"lsType\":\"numericValue\",\"lsKind\":\"order\",\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\",\"numericValue\":1}],\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\"}],\"recordedBy\":\"bob\",\"recordedDate\":1428352474145,\"secondLsThing\":{\"codeName\":\"LSM000010\",\"deleted\":false,\"id\":1442338,\"ignored\":false,\"lsKind\":\"linker small molecule\",\"lsLabels\":[{\"deleted\":false,\"id\":297426,\"ignored\":false,\"labelText\":\"LSM10\",\"lsKind\":\"linker small molecule\",\"lsType\":\"name\",\"lsTypeAndKind\":\"name_linker small molecule\",\"modifiedDate\":1426028499740,\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"bob\",\"recordedDate\":1426024482348,\"version\":3}],\"lsTags\":[],\"lsType\":\"parent\",\"lsTypeAndKind\":\"parent_linker small molecule\",\"modifiedDate\":1426028499738,\"recordedBy\":\"bob\",\"recordedDate\":1426028499321,\"version\":4},\"className\":\"ThingItx\",\"validationError\":null,\"idAttribute\":\"id\"},{\"lsType\":\"incorporates\",\"lsKind\":\"assembly_component\",\"lsTypeAndKind\":\"incorporates_assembly_component\",\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"composition\",\"lsValues\":[{\"lsType\":\"numericValue\",\"lsKind\":\"order\",\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\",\"numericValue\":2}],\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\"}],\"recordedBy\":\"bob\",\"recordedDate\":1428352474148,\"secondLsThing\":{\"codeName\":\"PEG000010\",\"deleted\":false,\"id\":1442920,\"ignored\":false,\"lsKind\":\"peg\",\"lsLabels\":[{\"deleted\":false,\"id\":297434,\"ignored\":false,\"labelText\":\"peg5\",\"lsKind\":\"peg\",\"lsType\":\"name\",\"lsTypeAndKind\":\"name_peg\",\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"bob\",\"recordedDate\":1426100246459,\"version\":0}],\"lsTags\":[],\"lsType\":\"parent\",\"lsTypeAndKind\":\"parent_peg\",\"recordedBy\":\"bob\",\"recordedDate\":1426100246459,\"version\":1},\"className\":\"ThingItx\",\"validationError\":null,\"idAttribute\":\"id\"}],\"cid\":\"c104\",\"_changing\":false,\"_previousAttributes\":{\"lsType\":\"thing\",\"lsKind\":\"thing\",\"corpName\":\"\",\"recordedBy\":\"bob\",\"recordedDate\":1428352432123,\"shortDescription\":\" \",\"lsLabels\":[{\"lsType\":\"name\",\"lsKind\":\"internalization agent\",\"labelText\":\"LSM10-peg5\",\"ignored\":false,\"preferred\":true,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null}],\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"internalization agent parent\",\"lsValues\":[{\"lsType\":\"codeValue\",\"lsKind\":\"scientist\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"codeOrigin\":\"ACAS authors\",\"codeValue\":\"egao\",\"value\":\"egao\"},{\"lsType\":\"dateValue\",\"lsKind\":\"completion date\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":1428303600000,\"dateValue\":1428303600000},{\"lsType\":\"stringValue\",\"lsKind\":\"notebook\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":\"test\",\"stringValue\":\"test\"},{\"lsType\":\"codeValue\",\"lsKind\":\"conjugation type\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"codeKind\":\"conjugation type\",\"codeType\":\"internalization agent\",\"codeOrigin\":\"ACAS DDICT\",\"codeValue\":\"cys\",\"value\":\"cys\"},{\"lsType\":\"stringValue\",\"lsKind\":\"conjugation site\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":\"\",\"stringValue\":\"\"},{\"lsType\":\"numericValue\",\"lsKind\":\"batch number\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"numericValue\":0,\"value\":0}],\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\"}],\"firstLsThings\":[]},\"changed\":{\"secondLsThings\":[]},\"_pending\":false,\"urlRoot\":\"/api/things/parent/internalization agent\",\"className\":\"InternalizationAgentParent\",\"lsProperties\":{\"defaultLabels\":[{\"key\":\"internalization agent name\",\"type\":\"name\",\"kind\":\"internalization agent\",\"preferred\":true}],\"defaultValues\":[{\"key\":\"scientist\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"codeValue\",\"kind\":\"scientist\",\"codeOrigin\":\"ACAS authors\",\"value\":\"unassigned\"},{\"key\":\"completion date\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"dateValue\",\"kind\":\"completion date\"},{\"key\":\"notebook\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"stringValue\",\"kind\":\"notebook\"},{\"key\":\"conjugation type\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"codeValue\",\"kind\":\"conjugation type\",\"codeType\":\"internalization agent\",\"codeKind\":\"conjugation type\",\"codeOrigin\":\"ACAS DDICT\",\"value\":\"unassigned\"},{\"key\":\"conjugation site\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"stringValue\",\"kind\":\"conjugation site\"},{\"key\":\"batch number\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"numericValue\",\"kind\":\"batch number\",\"value\":0}],\"defaultFirstLsThingItx\":[],\"defaultSecondLsThingItx\":[]},\"validationError\":null,\"idAttribute\":\"id\"}";
-    	String responseJson = this.mockMvc.perform(post("/api/v1/lsthings/parent/internalization agent")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(responseJson);
-    	LsThing postedLsThing = LsThing.fromJsonToLsThing(responseJson);
-    	logger.info(postedLsThing.toJson());
-    }
-    
-    //@Test
-    public void registerAssemblyBatchTest() throws Exception {
-    	String json = "";
-    	String responseJson = this.mockMvc.perform(post("/api/v1/lsthings/batch/internalization agent?parentIdOrCodeName=")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(responseJson);
-    	LsThing postedLsThing = LsThing.fromJsonToLsThing(responseJson);
-    	logger.info(postedLsThing.toJson());
-    }
-    
-    @Test
-    public void validateInvalidComponentNameTest() throws Exception {
-    	String json = "{\"codeName\": null,\"firstLsThings\": [{\"deleted\": false,\"firstLsThing\": {\"codeName\": \"PRTN-000013-1\",\"deleted\": false,\"ignored\": false,\"lsKind\": \"protein\",\"lsStates\":[{\"deleted\":false,\"ignored\":false,\"lsKind\":\"inventory\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_inventory\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"location\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_location\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729705505,\"stringValue\":\"123\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"amount made\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_amount made\",\"numericValue\":1123,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729706303,\"unitKind\":\"g\",\"unitType\":\"mass\",\"unitTypeAndKind\":\"mass_g\",\"version\":0}],\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"version\":1},{\"deleted\":false,\"ignored\":false,\"lsKind\":\"protein batch\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_protein batch\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"hplc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_hplc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeOrigin\":\"ACAS authors\",\"codeTypeAndKind\":\"null_null\",\"codeValue\":\"egao\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"scientist\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_scientist\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729702585,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"DeleteExperimentInstructions (6).pdf\",\"ignored\":false,\"lsKind\":\"gpc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_gpc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1424678400000,\"deleted\":false,\"ignored\":false,\"lsKind\":\"completion date\",\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729703242,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"ms\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_ms\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeKind\":\"source\",\"codeOrigin\":\"ACAS DDICT\",\"codeType\":\"component\",\"codeTypeAndKind\":\"component_source\",\"codeValue\":\"ACAS\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"source\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_source\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729672870,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"purity\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_purity\",\"numericValue\":129,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729708062,\"unitKind\":\"% purity\",\"unitType\":\"percentage\",\"unitTypeAndKind\":\"percentage_% purity\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"nmr\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_nmr\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"notebook\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729703953,\"stringValue\":\"test\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"source id\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_source id\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729702610,\"stringValue\":\"\",\"unitTypeAndKind\":\"null_null\",\"version\":0}],\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"version\":1}],\"lsType\": \"batch\",\"lsTypeAndKind\": \"batch_protein\",\"recordedBy\": \"jane\",\"recordedDate\": 1424730027913,\"version\": null},\"id\": null,\"ignored\": false,\"lsKind\": \"batch_parent\",\"lsType\": \"instantiates\",\"lsTypeAndKind\": \"instantiates_batch_parent\",\"recordedBy\": \"jane\",\"recordedDate\": 1424730027913,\"version\": null}],\"ignored\": false,\"lsKind\": \"protein\",\"lsLabels\": [{ \"ignored\": false,\"imageFile\": null,\"labelText\": \"testing2\",\"lsKind\": \"protein\",\"lsTransaction\": 9999,\"lsType\": \"name\",\"lsTypeAndKind\": \"name_protein\",\"modifiedDate\": null,\"physicallyLabled\": false,\"preferred\": true,\"recordedBy\": \"jane\",\"recordedDate\": 1375141504000}],\"lsStates\": [{ \"comments\": null,\"ignored\": false,\"lsKind\": \"protein parent\",\"lsTransaction\": 9999,\"lsType\": \"metadata\",\"lsTypeAndKind\": \"metadata_protein parent\",\"lsValues\": [{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": 1342080000000, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"completion date\", \"lsTransaction\": 9999, \"lsType\": \"dateValue\", \"lsTypeAndKind\": \"dateValue_completion date\", \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"notebook\", \"lsTransaction\": 9999, \"lsType\": \"stringValue\", \"lsTypeAndKind\": \"stringValue_notebook\", \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": \"Notebook 1\", \"uncertainty\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"molecular weight\", \"lsTransaction\": 9999, \"lsType\": \"numericValue\", \"lsTypeAndKind\": \"numericValue_molecular weight\", \"modifiedDate\": null, \"numericValue\": 231, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"unitKind\": \"g/mol\", \"unitType\": \"molecular weight\", \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"batch number\", \"lsTransaction\": 9999, \"lsType\": \"numericValue\", \"lsTypeAndKind\": \"numericValue_batch number\", \"modifiedDate\": null, \"numericValue\": 0, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"unitKind\": null, \"unitType\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null} ],\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\": 1375141460000}],\"lsTransaction\": 9999,\"lsType\": \"parent\",\"lsTypeAndKind\": \"parent_protein\",\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\": 1375141508000,\"shortDescription\": \" \"}";
-    	String response = this.mockMvc.perform(post("/api/v1/lsthings/validate?uniqueName=true")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isConflict())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(response);
-    }
-    
-    @Test
-    public void validateValidComponentNameTest() throws Exception {
-    	String json = "{\"codeName\": null,\"firstLsThings\": [{\"deleted\": false,\"firstLsThing\": {\"codeName\": \"PRTN-000013-1\",\"deleted\": false,\"ignored\": false,\"lsKind\": \"protein\",\"lsStates\":[{\"deleted\":false,\"ignored\":false,\"lsKind\":\"inventory\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_inventory\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"location\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_location\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729705505,\"stringValue\":\"123\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"amount made\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_amount made\",\"numericValue\":1123,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729706303,\"unitKind\":\"g\",\"unitType\":\"mass\",\"unitTypeAndKind\":\"mass_g\",\"version\":0}],\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"version\":1},{\"deleted\":false,\"ignored\":false,\"lsKind\":\"protein batch\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_protein batch\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"hplc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_hplc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeOrigin\":\"ACAS authors\",\"codeTypeAndKind\":\"null_null\",\"codeValue\":\"egao\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"scientist\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_scientist\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729702585,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"DeleteExperimentInstructions (6).pdf\",\"ignored\":false,\"lsKind\":\"gpc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_gpc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1424678400000,\"deleted\":false,\"ignored\":false,\"lsKind\":\"completion date\",\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729703242,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"ms\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_ms\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeKind\":\"source\",\"codeOrigin\":\"ACAS DDICT\",\"codeType\":\"component\",\"codeTypeAndKind\":\"component_source\",\"codeValue\":\"ACAS\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"source\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_source\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729672870,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"purity\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_purity\",\"numericValue\":129,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729708062,\"unitKind\":\"% purity\",\"unitType\":\"percentage\",\"unitTypeAndKind\":\"percentage_% purity\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"nmr\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_nmr\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"notebook\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729703953,\"stringValue\":\"test\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"source id\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_source id\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729702610,\"stringValue\":\"\",\"unitTypeAndKind\":\"null_null\",\"version\":0}],\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"version\":1}],\"lsType\": \"batch\",\"lsTypeAndKind\": \"batch_protein\",\"recordedBy\": \"jane\",\"recordedDate\": 1424730027913,\"version\": null},\"id\": null,\"ignored\": false,\"lsKind\": \"batch_parent\",\"lsType\": \"instantiates\",\"lsTypeAndKind\": \"instantiates_batch_parent\",\"recordedBy\": \"jane\",\"recordedDate\": 1424730027913,\"version\": null}],\"ignored\": false,\"lsKind\": \"protein\",\"lsLabels\": [{ \"ignored\": false,\"imageFile\": null,\"labelText\": \"Fielderase\",\"lsKind\": \"protein\",\"lsTransaction\": 9999,\"lsType\": \"name\",\"lsTypeAndKind\": \"name_protein\",\"modifiedDate\": null,\"physicallyLabled\": false,\"preferred\": true,\"recordedBy\": \"jane\",\"recordedDate\": 1375141504000}],\"lsStates\": [{ \"comments\": null,\"ignored\": false,\"lsKind\": \"protein parent\",\"lsTransaction\": 9999,\"lsType\": \"metadata\",\"lsTypeAndKind\": \"metadata_protein parent\",\"lsValues\": [{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": 1342080000000, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"completion date\", \"lsTransaction\": 9999, \"lsType\": \"dateValue\", \"lsTypeAndKind\": \"dateValue_completion date\", \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"notebook\", \"lsTransaction\": 9999, \"lsType\": \"stringValue\", \"lsTypeAndKind\": \"stringValue_notebook\", \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": \"Notebook 1\", \"uncertainty\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"molecular weight\", \"lsTransaction\": 9999, \"lsType\": \"numericValue\", \"lsTypeAndKind\": \"numericValue_molecular weight\", \"modifiedDate\": null, \"numericValue\": 231, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"unitKind\": \"g/mol\", \"unitType\": \"molecular weight\", \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"batch number\", \"lsTransaction\": 9999, \"lsType\": \"numericValue\", \"lsTypeAndKind\": \"numericValue_batch number\", \"modifiedDate\": null, \"numericValue\": 0, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"unitKind\": null, \"unitType\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null} ],\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\": 1375141460000}],\"lsTransaction\": 9999,\"lsType\": \"parent\",\"lsTypeAndKind\": \"parent_protein\",\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\": 1375141508000,\"shortDescription\": \" \"}";
-    	String response = this.mockMvc.perform(post("/api/v1/lsthings/validate?uniqueName=true")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isAccepted())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse().getContentAsString();
-    }
-    
-    //@Test
-    public void validateInvalidAssemblyTest() throws Exception {
-    	String componentNameList = "[\"CMPT-00001\", \"CMPT-00002\", \"CMPT-00003\"]";
-    	String response = this.mockMvc.perform(post("/api/v1/lsthings/validatename?lsKind=internalization agent")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(componentNameList)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(response);
-    	Assert.assertEquals(false, Boolean.parseBoolean(response)); 
-    }
-    
-    @Test
-    public void validateValidAssemblyTest() throws Exception {
-    	String json = "{\"lsType\":\"parent\",\"lsKind\":\"internalization agent\",\"corpName\":\"\",\"recordedBy\":\"bob\",\"recordedDate\":1428352474150,\"shortDescription\":\" \",\"lsLabels\":[{\"lsType\":\"name\",\"lsKind\":\"internalization agent\",\"labelText\":\"LSM10-peg5\",\"ignored\":false,\"preferred\":true,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null}],\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"internalization agent parent\",\"lsValues\":[{\"lsType\":\"codeValue\",\"lsKind\":\"scientist\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"codeOrigin\":\"ACAS authors\",\"codeValue\":\"egao\",\"value\":\"egao\"},{\"lsType\":\"dateValue\",\"lsKind\":\"completion date\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":1428303600000,\"dateValue\":1428303600000},{\"lsType\":\"stringValue\",\"lsKind\":\"notebook\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":\"test\",\"stringValue\":\"test\"},{\"lsType\":\"codeValue\",\"lsKind\":\"conjugation type\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"codeKind\":\"conjugation type\",\"codeType\":\"internalization agent\",\"codeOrigin\":\"ACAS DDICT\",\"codeValue\":\"cys\",\"value\":\"cys\"},{\"lsType\":\"stringValue\",\"lsKind\":\"conjugation site\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":\"\",\"stringValue\":\"\"},{\"lsType\":\"numericValue\",\"lsKind\":\"batch number\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"numericValue\":0,\"value\":0}],\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\"}],\"firstLsThings\":[],\"secondLsThings\":[{\"lsType\":\"incorporates\",\"lsKind\":\"assembly_component\",\"lsTypeAndKind\":\"incorporates_assembly_component\",\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"composition\",\"lsValues\":[{\"lsType\":\"numericValue\",\"lsKind\":\"order\",\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\",\"numericValue\":1}],\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\"}],\"recordedBy\":\"bob\",\"recordedDate\":1428352474145,\"secondLsThing\":{\"codeName\":\"LSM000010\",\"deleted\":false,\"id\":1442338,\"ignored\":false,\"lsKind\":\"linker small molecule\",\"lsLabels\":[{\"deleted\":false,\"id\":297426,\"ignored\":false,\"labelText\":\"LSM10\",\"lsKind\":\"linker small molecule\",\"lsType\":\"name\",\"lsTypeAndKind\":\"name_linker small molecule\",\"modifiedDate\":1426028499740,\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"bob\",\"recordedDate\":1426024482348,\"version\":3}],\"lsTags\":[],\"lsType\":\"parent\",\"lsTypeAndKind\":\"parent_linker small molecule\",\"modifiedDate\":1426028499738,\"recordedBy\":\"bob\",\"recordedDate\":1426028499321,\"version\":4},\"className\":\"ThingItx\",\"validationError\":null,\"idAttribute\":\"id\"},{\"lsType\":\"incorporates\",\"lsKind\":\"assembly_component\",\"lsTypeAndKind\":\"incorporates_assembly_component\",\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"composition\",\"lsValues\":[{\"lsType\":\"numericValue\",\"lsKind\":\"order\",\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\",\"numericValue\":2}],\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\"}],\"recordedBy\":\"bob\",\"recordedDate\":1428352474148,\"secondLsThing\":{\"codeName\":\"PEG000010\",\"deleted\":false,\"id\":1442920,\"ignored\":false,\"lsKind\":\"peg\",\"lsLabels\":[{\"deleted\":false,\"id\":297434,\"ignored\":false,\"labelText\":\"peg5\",\"lsKind\":\"peg\",\"lsType\":\"name\",\"lsTypeAndKind\":\"name_peg\",\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"bob\",\"recordedDate\":1426100246459,\"version\":0}],\"lsTags\":[],\"lsType\":\"parent\",\"lsTypeAndKind\":\"parent_peg\",\"recordedBy\":\"bob\",\"recordedDate\":1426100246459,\"version\":1},\"className\":\"ThingItx\",\"validationError\":null,\"idAttribute\":\"id\"}],\"cid\":\"c104\",\"_changing\":false,\"_previousAttributes\":{\"lsType\":\"thing\",\"lsKind\":\"thing\",\"corpName\":\"\",\"recordedBy\":\"bob\",\"recordedDate\":1428352432123,\"shortDescription\":\" \",\"lsLabels\":[{\"lsType\":\"name\",\"lsKind\":\"internalization agent\",\"labelText\":\"LSM10-peg5\",\"ignored\":false,\"preferred\":true,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null}],\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"internalization agent parent\",\"lsValues\":[{\"lsType\":\"codeValue\",\"lsKind\":\"scientist\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"codeOrigin\":\"ACAS authors\",\"codeValue\":\"egao\",\"value\":\"egao\"},{\"lsType\":\"dateValue\",\"lsKind\":\"completion date\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":1428303600000,\"dateValue\":1428303600000},{\"lsType\":\"stringValue\",\"lsKind\":\"notebook\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":\"test\",\"stringValue\":\"test\"},{\"lsType\":\"codeValue\",\"lsKind\":\"conjugation type\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"codeKind\":\"conjugation type\",\"codeType\":\"internalization agent\",\"codeOrigin\":\"ACAS DDICT\",\"codeValue\":\"cys\",\"value\":\"cys\"},{\"lsType\":\"stringValue\",\"lsKind\":\"conjugation site\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":\"\",\"stringValue\":\"\"},{\"lsType\":\"numericValue\",\"lsKind\":\"batch number\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"numericValue\":0,\"value\":0}],\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\"}],\"firstLsThings\":[]},\"changed\":{\"secondLsThings\":[]},\"_pending\":false,\"urlRoot\":\"/api/things/parent/internalization agent\",\"className\":\"InternalizationAgentParent\",\"lsProperties\":{\"defaultLabels\":[{\"key\":\"internalization agent name\",\"type\":\"name\",\"kind\":\"internalization agent\",\"preferred\":true}],\"defaultValues\":[{\"key\":\"scientist\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"codeValue\",\"kind\":\"scientist\",\"codeOrigin\":\"ACAS authors\",\"value\":\"unassigned\"},{\"key\":\"completion date\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"dateValue\",\"kind\":\"completion date\"},{\"key\":\"notebook\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"stringValue\",\"kind\":\"notebook\"},{\"key\":\"conjugation type\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"codeValue\",\"kind\":\"conjugation type\",\"codeType\":\"internalization agent\",\"codeKind\":\"conjugation type\",\"codeOrigin\":\"ACAS DDICT\",\"value\":\"unassigned\"},{\"key\":\"conjugation site\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"stringValue\",\"kind\":\"conjugation site\"},{\"key\":\"batch number\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"numericValue\",\"kind\":\"batch number\",\"value\":0}],\"defaultFirstLsThingItx\":[],\"defaultSecondLsThingItx\":[]},\"validationError\":null,\"idAttribute\":\"id\"}";
-    	String response = this.mockMvc.perform(post("/api/v1/lsthings/validate?uniqueName=true&orderMatters=true")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isAccepted())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(response);
-    }
-    
-    @Test
-    public void validateValidAssemblyTest2() throws Exception {
-    	String json = "{\"lsType\":\"parent\",\"lsKind\":\"internalization agent\",\"corpName\":\"\",\"recordedBy\":\"bob\",\"recordedDate\":1428352474150,\"shortDescription\":\" \",\"lsLabels\":[{\"lsType\":\"name\",\"lsKind\":\"internalization agent\",\"labelText\":\"LSM10-peg5\",\"ignored\":false,\"preferred\":true,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null}],\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"internalization agent parent\",\"lsValues\":[{\"lsType\":\"codeValue\",\"lsKind\":\"scientist\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"codeOrigin\":\"ACAS authors\",\"codeValue\":\"egao\",\"value\":\"egao\"},{\"lsType\":\"dateValue\",\"lsKind\":\"completion date\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":1428303600000,\"dateValue\":1428303600000},{\"lsType\":\"stringValue\",\"lsKind\":\"notebook\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":\"test\",\"stringValue\":\"test\"},{\"lsType\":\"codeValue\",\"lsKind\":\"conjugation type\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"codeKind\":\"conjugation type\",\"codeType\":\"internalization agent\",\"codeOrigin\":\"ACAS DDICT\",\"codeValue\":\"cys\",\"value\":\"cys\"},{\"lsType\":\"stringValue\",\"lsKind\":\"conjugation site\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":\"\",\"stringValue\":\"\"},{\"lsType\":\"numericValue\",\"lsKind\":\"batch number\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"numericValue\":0,\"value\":0}],\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\"}],\"firstLsThings\":[],\"secondLsThings\":[{\"lsType\":\"incorporates\",\"lsKind\":\"assembly_component\",\"lsTypeAndKind\":\"incorporates_assembly_component\",\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"composition\",\"lsValues\":[{\"lsType\":\"numericValue\",\"lsKind\":\"order\",\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\",\"numericValue\":1}],\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\"}],\"recordedBy\":\"bob\",\"recordedDate\":1428352474145,\"secondLsThing\":{\"codeName\":\"LSM000010\",\"deleted\":false,\"id\":1442338,\"ignored\":false,\"lsKind\":\"linker small molecule\",\"lsLabels\":[{\"deleted\":false,\"id\":297426,\"ignored\":false,\"labelText\":\"LSM10\",\"lsKind\":\"linker small molecule\",\"lsType\":\"name\",\"lsTypeAndKind\":\"name_linker small molecule\",\"modifiedDate\":1426028499740,\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"bob\",\"recordedDate\":1426024482348,\"version\":3}],\"lsTags\":[],\"lsType\":\"parent\",\"lsTypeAndKind\":\"parent_linker small molecule\",\"modifiedDate\":1426028499738,\"recordedBy\":\"bob\",\"recordedDate\":1426028499321,\"version\":4},\"className\":\"ThingItx\",\"validationError\":null,\"idAttribute\":\"id\"},{\"lsType\":\"incorporates\",\"lsKind\":\"assembly_component\",\"lsTypeAndKind\":\"incorporates_assembly_component\",\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"composition\",\"lsValues\":[{\"lsType\":\"numericValue\",\"lsKind\":\"order\",\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\",\"numericValue\":2}],\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\"}],\"recordedBy\":\"bob\",\"recordedDate\":1428352474148,\"secondLsThing\":{\"codeName\":\"PEG000010\",\"deleted\":false,\"id\":1442920,\"ignored\":false,\"lsKind\":\"peg\",\"lsLabels\":[{\"deleted\":false,\"id\":297434,\"ignored\":false,\"labelText\":\"peg5\",\"lsKind\":\"peg\",\"lsType\":\"name\",\"lsTypeAndKind\":\"name_peg\",\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"bob\",\"recordedDate\":1426100246459,\"version\":0}],\"lsTags\":[],\"lsType\":\"parent\",\"lsTypeAndKind\":\"parent_peg\",\"recordedBy\":\"bob\",\"recordedDate\":1426100246459,\"version\":1},\"className\":\"ThingItx\",\"validationError\":null,\"idAttribute\":\"id\"}],\"cid\":\"c104\",\"_changing\":false,\"_previousAttributes\":{\"lsType\":\"thing\",\"lsKind\":\"thing\",\"corpName\":\"\",\"recordedBy\":\"bob\",\"recordedDate\":1428352432123,\"shortDescription\":\" \",\"lsLabels\":[{\"lsType\":\"name\",\"lsKind\":\"internalization agent\",\"labelText\":\"LSM10-peg5\",\"ignored\":false,\"preferred\":true,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null}],\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"internalization agent parent\",\"lsValues\":[{\"lsType\":\"codeValue\",\"lsKind\":\"scientist\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"codeOrigin\":\"ACAS authors\",\"codeValue\":\"egao\",\"value\":\"egao\"},{\"lsType\":\"dateValue\",\"lsKind\":\"completion date\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":1428303600000,\"dateValue\":1428303600000},{\"lsType\":\"stringValue\",\"lsKind\":\"notebook\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":\"test\",\"stringValue\":\"test\"},{\"lsType\":\"codeValue\",\"lsKind\":\"conjugation type\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"codeKind\":\"conjugation type\",\"codeType\":\"internalization agent\",\"codeOrigin\":\"ACAS DDICT\",\"codeValue\":\"cys\",\"value\":\"cys\"},{\"lsType\":\"stringValue\",\"lsKind\":\"conjugation site\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":\"\",\"stringValue\":\"\"},{\"lsType\":\"numericValue\",\"lsKind\":\"batch number\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"numericValue\":0,\"value\":0}],\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\"}],\"firstLsThings\":[]},\"changed\":{\"secondLsThings\":[]},\"_pending\":false,\"urlRoot\":\"/api/things/parent/internalization agent\",\"className\":\"InternalizationAgentParent\",\"lsProperties\":{\"defaultLabels\":[{\"key\":\"internalization agent name\",\"type\":\"name\",\"kind\":\"internalization agent\",\"preferred\":true}],\"defaultValues\":[{\"key\":\"scientist\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"codeValue\",\"kind\":\"scientist\",\"codeOrigin\":\"ACAS authors\",\"value\":\"unassigned\"},{\"key\":\"completion date\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"dateValue\",\"kind\":\"completion date\"},{\"key\":\"notebook\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"stringValue\",\"kind\":\"notebook\"},{\"key\":\"conjugation type\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"codeValue\",\"kind\":\"conjugation type\",\"codeType\":\"internalization agent\",\"codeKind\":\"conjugation type\",\"codeOrigin\":\"ACAS DDICT\",\"value\":\"unassigned\"},{\"key\":\"conjugation site\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"stringValue\",\"kind\":\"conjugation site\"},{\"key\":\"batch number\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"numericValue\",\"kind\":\"batch number\",\"value\":0}],\"defaultFirstLsThingItx\":[],\"defaultSecondLsThingItx\":[]},\"validationError\":null,\"idAttribute\":\"id\"}";
-    	String response = this.mockMvc.perform(post("/api/v1/lsthings/validate?uniqueName=true&orderMatters=true&forwardAndReverseAreSame=true")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isAccepted())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(response);
-    }
-
-    @Test
-    public void getLsThing() throws Exception {
-        String json = this.mockMvc.perform(get("/api/v1/lsthings/parent/linker small molecule/LSM000001-1")
-        		.contentType(MediaType.APPLICATION_JSON)
-        		.accept(MediaType.APPLICATION_JSON))
-        		.andExpect(status().isOk())
-        		.andExpect(content().contentType("application/json"))
-        		.andReturn().getResponse().getContentAsString();
-        
-        logger.info(json);
-        LsThing lsThing = LsThing.fromJsonToLsThing(json);
-        logger.info(lsThing.toJson());
-    }
-    
-    @Test
-    public void getComponentBatches() throws Exception {
-        String json = this.mockMvc.perform(get("/api/v1/lsthings/parent/linker small molecule/getbatches/LSM000001")
-        		.contentType(MediaType.APPLICATION_JSON)
-        		.accept(MediaType.APPLICATION_JSON))
-        		.andExpect(status().isOk())
-        		.andExpect(content().contentType("application/json"))
-        		.andReturn().getResponse().getContentAsString();
-        
-        logger.info(json);
-        Collection<LsThing> lsThings = LsThing.fromJsonArrayToLsThings(json);
-        Assert.assertEquals(1, lsThings.size());
-        logger.info(LsThing.toJsonArray(lsThings));
-    }
-    
-    @Test
-    public void searchForComponentBatch() throws Exception {
-        String json = this.mockMvc.perform(get("/api/v1/lsthings/search?lsType=batch&q=LSM000001-1 2012-07-12")
-        		.contentType(MediaType.APPLICATION_JSON)
-        		.accept(MediaType.APPLICATION_JSON))
-        		.andExpect(status().isOk())
-        		.andExpect(content().contentType("application/json"))
-        		.andReturn().getResponse().getContentAsString();
-        
-        logger.info(json);
-        Collection<LsThing> lsThings = LsThing.fromJsonArrayToLsThings(json);
-        Assert.assertEquals(1, lsThings.size());
-        logger.info(LsThing.toJsonArray(lsThings));
-    }
-    
-    @Test
-    public void getCodeTableLsThings() throws Exception {
-    	String json = this.mockMvc.perform(get("/api/v1/lsthings/codetable?lsType=parent&lsKind=linker small molecule")
-        		.contentType(MediaType.APPLICATION_JSON)
-        		.accept(MediaType.APPLICATION_JSON))
-        		.andExpect(status().isOk())
-        		.andExpect(content().contentType("application/json;charset=utf-8"))
-        		.andReturn().getResponse().getContentAsString();
-    	logger.info(json);
-    }
-    
-    @Test
-    public void getCodeTableLsThings2() throws Exception {
-    	String json = this.mockMvc.perform(get("/api/v1/lsthings/codetable?lsType=term&lsKind=documentTerm")
-        		.contentType(MediaType.APPLICATION_JSON)
-        		.accept(MediaType.APPLICATION_JSON))
-        		.andExpect(status().isOk())
-        		.andExpect(content().contentType("application/json;charset=utf-8"))
-        		.andReturn().getResponse().getContentAsString();
-    	logger.info(json);
-    }
-    
-    @Test
-    public void searchByScientist() throws Exception {
-    	String searchString = "jane";
-        String json = this.mockMvc.perform(get("/api/v1/lsthings/search?q="+searchString)
-        		.contentType(MediaType.APPLICATION_JSON)
-        		.accept(MediaType.APPLICATION_JSON))
-        		.andExpect(status().isOk())
-        		.andExpect(content().contentType("application/json"))
-        		.andReturn().getResponse().getContentAsString();
-        
-        logger.info(json);
-        Collection<LsThing> lsThings = LsThing.fromJsonArrayToLsThings(json);
-        Assert.assertFalse(lsThings.isEmpty());
-        logger.info(LsThing.toJsonArray(lsThings));
-    }
-    
-    @Test
-    @Transactional
-    public void registerParentAndBatchTest() throws Exception {
-//    	String json = "{\"codeName\": null,\"firstLsThings\": [{\"deleted\": false,\"firstLsThing\": {\"codeName\": \"PRTN-000013-1\",\"deleted\": false,\"ignored\": false,\"lsKind\": \"protein\",\"lsType\": \"batch\",\"lsTypeAndKind\": \"batch_protein\",\"recordedBy\": \"jane\",\"recordedDate\": 1424730027913,\"version\": null},\"id\": null,\"ignored\": false,\"lsKind\": \"batch_parent\",\"lsType\": \"instantiates\",\"lsTypeAndKind\": \"instantiates_batch_parent\",\"recordedBy\": \"jane\",\"recordedDate\": 1424730027913,\"version\": null}],\"ignored\": false,\"lsKind\": \"protein\",\"lsLabels\": [{ \"ignored\": false,\"imageFile\": null,\"labelText\": \"Fielderase\",\"lsKind\": \"protein\",\"lsTransaction\": 9999,\"lsType\": \"name\",\"lsTypeAndKind\": \"name_protein\",\"modifiedDate\": null,\"physicallyLabled\": false,\"preferred\": true,\"recordedBy\": \"jane\",\"recordedDate\": 1375141504000}],\"lsStates\": [{ \"comments\": null,\"ignored\": false,\"lsKind\": \"protein parent\",\"lsTransaction\": 9999,\"lsType\": \"metadata\",\"lsTypeAndKind\": \"metadata_protein parent\",\"lsValues\": [{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": 1342080000000, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"completion date\", \"lsTransaction\": 9999, \"lsType\": \"dateValue\", \"lsTypeAndKind\": \"dateValue_completion date\", \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"notebook\", \"lsTransaction\": 9999, \"lsType\": \"stringValue\", \"lsTypeAndKind\": \"stringValue_notebook\", \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": \"Notebook 1\", \"uncertainty\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"molecular weight\", \"lsTransaction\": 9999, \"lsType\": \"numericValue\", \"lsTypeAndKind\": \"numericValue_molecular weight\", \"modifiedDate\": null, \"numericValue\": 231, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"unitKind\": \"g/mol\", \"unitType\": \"molecular weight\", \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"batch number\", \"lsTransaction\": 9999, \"lsType\": \"numericValue\", \"lsTypeAndKind\": \"numericValue_batch number\", \"modifiedDate\": null, \"numericValue\": 0, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"unitKind\": null, \"unitType\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null} ],\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\": 1375141460000}],\"lsTransaction\": 9999,\"lsType\": \"parent\",\"lsTypeAndKind\": \"parent_protein\",\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\": 1375141508000,\"shortDescription\": \" \"}";
-    	String json = "{\"codeName\": null,\"firstLsThings\": [{\"deleted\": false,\"firstLsThing\": {\"codeName\": \"PRTN-000013-1\",\"deleted\": false,\"ignored\": false,\"lsKind\": \"protein\",\"lsStates\":[{\"deleted\":false,\"ignored\":false,\"lsKind\":\"inventory\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_inventory\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"location\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_location\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729705505,\"stringValue\":\"123\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"amount made\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_amount made\",\"numericValue\":1123,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729706303,\"unitKind\":\"g\",\"unitType\":\"mass\",\"unitTypeAndKind\":\"mass_g\",\"version\":0}],\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"version\":1},{\"deleted\":false,\"ignored\":false,\"lsKind\":\"protein batch\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_protein batch\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"hplc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_hplc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeOrigin\":\"ACAS authors\",\"codeTypeAndKind\":\"null_null\",\"codeValue\":\"egao\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"scientist\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_scientist\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729702585,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"DeleteExperimentInstructions (6).pdf\",\"ignored\":false,\"lsKind\":\"gpc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_gpc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1424678400000,\"deleted\":false,\"ignored\":false,\"lsKind\":\"completion date\",\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729703242,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"ms\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_ms\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeKind\":\"source\",\"codeOrigin\":\"ACAS DDICT\",\"codeType\":\"component\",\"codeTypeAndKind\":\"component_source\",\"codeValue\":\"ACAS\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"source\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_source\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729672870,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"purity\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_purity\",\"numericValue\":129,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729708062,\"unitKind\":\"% purity\",\"unitType\":\"percentage\",\"unitTypeAndKind\":\"percentage_% purity\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"nmr\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_nmr\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"notebook\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729703953,\"stringValue\":\"test\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"source id\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_source id\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729702610,\"stringValue\":\"\",\"unitTypeAndKind\":\"null_null\",\"version\":0}],\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"version\":1}],\"lsType\": \"batch\",\"lsTypeAndKind\": \"batch_protein\",\"recordedBy\": \"jane\",\"recordedDate\": 1424730027913,\"version\": null},\"id\": null,\"ignored\": false,\"lsKind\": \"batch_parent\",\"lsType\": \"instantiates\",\"lsTypeAndKind\": \"instantiates_batch_parent\",\"recordedBy\": \"jane\",\"recordedDate\": 1424730027913,\"version\": null}],\"ignored\": false,\"lsKind\": \"protein\",\"lsLabels\": [{ \"ignored\": false,\"imageFile\": null,\"labelText\": \"Fielderase\",\"lsKind\": \"protein\",\"lsTransaction\": 9999,\"lsType\": \"name\",\"lsTypeAndKind\": \"name_protein\",\"modifiedDate\": null,\"physicallyLabled\": false,\"preferred\": true,\"recordedBy\": \"jane\",\"recordedDate\": 1375141504000}],\"lsStates\": [{ \"comments\": null,\"ignored\": false,\"lsKind\": \"protein parent\",\"lsTransaction\": 9999,\"lsType\": \"metadata\",\"lsTypeAndKind\": \"metadata_protein parent\",\"lsValues\": [{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": 1342080000000, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"completion date\", \"lsTransaction\": 9999, \"lsType\": \"dateValue\", \"lsTypeAndKind\": \"dateValue_completion date\", \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"notebook\", \"lsTransaction\": 9999, \"lsType\": \"stringValue\", \"lsTypeAndKind\": \"stringValue_notebook\", \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": \"Notebook 1\", \"uncertainty\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"molecular weight\", \"lsTransaction\": 9999, \"lsType\": \"numericValue\", \"lsTypeAndKind\": \"numericValue_molecular weight\", \"modifiedDate\": null, \"numericValue\": 231, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"unitKind\": \"g/mol\", \"unitType\": \"molecular weight\", \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"batch number\", \"lsTransaction\": 9999, \"lsType\": \"numericValue\", \"lsTypeAndKind\": \"numericValue_batch number\", \"modifiedDate\": null, \"numericValue\": 0, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"unitKind\": null, \"unitType\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null} ],\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\": 1375141460000}],\"lsTransaction\": 9999,\"lsType\": \"parent\",\"lsTypeAndKind\": \"parent_protein\",\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\": 1375141508000,\"shortDescription\": \" \"}";
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/lsthings/parent/protein?with=nested")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	LsThing postedLsThing = LsThing.fromJsonToLsThing(responseJson);
-    	logger.info(postedLsThing.toJson());
-    }
-    
-    @Test
-    @Transactional
-    public void updateParentAndBatchTest() throws Exception {
-    	String json = "{\"codeName\":\"PRTN000015\",\"deleted\":false,\"firstLsThings\":[{\"deleted\":false,\"firstLsThing\":{\"codeName\":\"PRTN000015-1\",\"deleted\":false,\"id\":1493852,\"ignored\":false,\"lsKind\":\"protein\",\"lsStates\":[{\"comments\":\"test comment 2\",\"deleted\":false,\"id\":2634316,\"ignored\":false,\"lsKind\":\"protein batch\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_protein batch\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"edited ms file value\",\"id\":5926370,\"ignored\":false,\"lsKind\":\"ms\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_ms\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"id\":5926365,\"ignored\":false,\"lsKind\":\"nmr\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_nmr\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"DeleteExperimentInstructions (6).pdf\",\"id\":5926369,\"ignored\":false,\"lsKind\":\"gpc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_gpc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1424678400000,\"deleted\":false,\"id\":5926368,\"ignored\":false,\"lsKind\":\"completion date\",\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729703242,\"unitTypeAndKind\":\"null_null\"},{\"codeKind\":\"source\",\"codeOrigin\":\"ACAS DDICT\",\"codeType\":\"component\",\"codeTypeAndKind\":\"component_source\",\"codeValue\":\"ACAS Edited\",\"deleted\":false,\"id\":5926373,\"ignored\":false,\"lsKind\":\"source\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_source\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729672870,\"unitTypeAndKind\":\"null_null\"},{\"codeOrigin\":\"ACAS authors\",\"codeTypeAndKind\":\"null_null\",\"codeValue\":\"egao\",\"deleted\":false,\"id\":5926367,\"ignored\":false,\"lsKind\":\"scientist\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_scientist\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729702585,\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926372,\"ignored\":false,\"lsKind\":\"purity\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_purity\",\"numericValue\":129,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729708062,\"unitKind\":\"% purity\",\"unitType\":\"percentage\",\"unitTypeAndKind\":\"percentage_% purity\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"id\":5926371,\"ignored\":false,\"lsKind\":\"hplc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_hplc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926364,\"ignored\":false,\"lsKind\":\"notebook\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729703953,\"stringValue\":\"test\",\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926366,\"ignored\":false,\"lsKind\":\"source id\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_source id\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729702610,\"stringValue\":\"test source id\",\"unitTypeAndKind\":\"null_null\"}],\"recordedBy\":\"jane\",\"recordedDate\":1424729720940},{\"deleted\":false,\"id\":2634315,\"ignored\":false,\"lsKind\":\"inventory\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_inventory\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926362,\"ignored\":false,\"lsKind\":\"location\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_location\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729705505,\"stringValue\":\"123\",\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926363,\"ignored\":false,\"lsKind\":\"amount made\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_amount made\",\"numericValue\":1123,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729706303,\"unitKind\":\"g\",\"unitType\":\"mass\",\"unitTypeAndKind\":\"mass_g\"}],\"recordedBy\":\"jane\",\"recordedDate\":1424729720940}],\"lsType\":\"batch\",\"lsTypeAndKind\":\"batch_protein\",\"recordedBy\":\"jane\",\"recordedDate\":1424730027913},\"id\":1493853,\"ignored\":false,\"lsKind\":\"batch_parent\",\"lsType\":\"instantiates\",\"lsTypeAndKind\":\"instantiates_batch_parent\",\"recordedBy\":\"jane\",\"recordedDate\":1424730027913}],\"id\":1493851,\"ignored\":false,\"lsKind\":\"protein\",\"lsLabels\":[{\"deleted\":false,\"id\":297595,\"ignored\":false,\"labelText\":\"Fielderase Z\",\"lsKind\":\"protein\",\"lsTransaction\":9999,\"lsType\":\"name\",\"lsTypeAndKind\":\"name_protein\",\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"jane\",\"recordedDate\":1375141504000}],\"lsStates\":[{\"deleted\":false,\"id\":2634314,\"ignored\":false,\"lsKind\":\"protein parent\",\"lsTransaction\":9999,\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_protein parent\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926359,\"ignored\":false,\"lsKind\":\"notebook\",\"lsTransaction\":9999,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"stringValue\":\"Notebook 1\",\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926361,\"ignored\":false,\"lsKind\":\"molecular weight\",\"lsTransaction\":9999,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_molecular weight\",\"numericValue\":890,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"unitKind\":\"g/mol\",\"unitType\":\"molecular weight\",\"unitTypeAndKind\":\"molecular weight_g/mol\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926360,\"ignored\":false,\"lsKind\":\"batch number\",\"lsTransaction\":9999,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_batch number\",\"numericValue\":0,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1342080000000,\"deleted\":false,\"id\":5926358,\"ignored\":false,\"lsKind\":\"completion date\",\"lsTransaction\":9999,\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"unitTypeAndKind\":\"null_null\"}],\"recordedBy\":\"jane\",\"recordedDate\":1375141460000}],\"lsTags\":[],\"lsTransaction\":9999,\"lsType\":\"parent\",\"lsTypeAndKind\":\"parent_protein\",\"recordedBy\":\"jane\",\"recordedDate\":1375141508000,\"secondLsThings\":[]}";
-    	MockHttpServletResponse response = this.mockMvc.perform(put("/api/v1/lsthings/parent/protein/PRTN000015?with=nested")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	LsThing postedLsThing = LsThing.fromJsonToLsThing(responseJson);
-    	logger.info(postedLsThing.toJson());
-    }
-    
-    @Test
-	@Rollback(value=true)
-	public void updateBatchInteractions() throws Exception{
-//		String json = "{\"lsType\":\"batch\",\"lsKind\":\"internalization agent\",\"corpName\":\"\",\"recordedBy\":\"bob\",\"recordedDate\":1428517111212,\"shortDescription\":\" \",\"lsLabels\":[],\"lsStates\":[{\"deleted\":false,\"id\":2649027,\"ignored\":false,\"lsKind\":\"internalization agent batch\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_internalization agent batch\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960432,\"ignored\":false,\"lsKind\":\"notebook\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"stringValue\":\"test\",\"unitTypeAndKind\":\"null_null\",\"version\":0,\"value\":\"test\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960435,\"ignored\":false,\"lsKind\":\"molecular weight\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_molecular weight\",\"numericValue\":123,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"unitKind\":\"kDa\",\"unitType\":\"molecular weight\",\"unitTypeAndKind\":\"molecular weight_kDa\",\"version\":0,\"value\":123},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960433,\"ignored\":true,\"lsKind\":\"purity\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_purity\",\"numericValue\":12,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"unitKind\":\"% purity\",\"unitType\":\"percentage\",\"unitTypeAndKind\":\"percentage_% purity\",\"version\":0,\"value\":121},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1428476400000,\"deleted\":false,\"id\":5960434,\"ignored\":false,\"lsKind\":\"completion date\",\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"unitTypeAndKind\":\"null_null\",\"version\":0,\"value\":1428476400000},{\"codeOrigin\":\"ACAS authors\",\"codeTypeAndKind\":\"null_null\",\"codeValue\":\"egao\",\"deleted\":false,\"id\":5960438,\"ignored\":false,\"lsKind\":\"scientist\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_scientist\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"unitTypeAndKind\":\"null_null\",\"version\":0,\"value\":\"egao\"},{\"codeTypeAndKind\":\"null_null\",\"comments\":\"Testing (46).pdf\",\"deleted\":false,\"fileValue\":\"entities/internalizationAgents/I000012-6/Testing (46).pdf\",\"id\":5960439,\"ignored\":false,\"lsKind\":\"gpc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_gpc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"unitTypeAndKind\":\"null_null\",\"version\":1},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960436,\"ignored\":false,\"lsKind\":\"source id\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_source id\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"stringValue\":\"\",\"unitTypeAndKind\":\"null_null\",\"version\":0,\"value\":\"\"},{\"codeKind\":\"source\",\"codeOrigin\":\"ACAS DDICT\",\"codeType\":\"component\",\"codeTypeAndKind\":\"component_source\",\"codeValue\":\"ACAS\",\"deleted\":false,\"id\":5960437,\"ignored\":false,\"lsKind\":\"source\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_source\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"unitTypeAndKind\":\"null_null\",\"version\":0,\"value\":\"ACAS\"},{\"lsType\":\"numericValue\",\"lsKind\":\"purity\",\"ignored\":false,\"recordedDate\":1428517111212,\"recordedBy\":\"bob\",\"numericValue\":121,\"value\":121}],\"modifiedDate\":1428517031912,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"version\":2},{\"deleted\":false,\"id\":2649026,\"ignored\":false,\"lsKind\":\"inventory\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_inventory\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960430,\"ignored\":false,\"lsKind\":\"location\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_location\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"stringValue\":\"13\",\"unitTypeAndKind\":\"null_null\",\"version\":0,\"value\":\"13\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960431,\"ignored\":false,\"lsKind\":\"amount made\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_amount made\",\"numericValue\":23,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"unitKind\":\"g\",\"unitType\":\"mass\",\"unitTypeAndKind\":\"mass_g\",\"version\":0,\"value\":23}],\"modifiedDate\":1428517031934,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"version\":2}],\"codeName\":\"I000012-6\",\"deleted\":false,\"id\":1508706,\"ignored\":false,\"lsTags\":[],\"lsTypeAndKind\":\"batch_internalization agent\",\"modifiedDate\":1428517031909,\"version\":3,\"cid\":\"c346\",\"_changing\":false,\"_previousAttributes\":{\"lsType\":\"thing\",\"lsKind\":\"thing\",\"corpName\":\"\",\"recordedBy\":\"bob\",\"recordedDate\":1428517037610,\"shortDescription\":\" \",\"lsLabels\":[],\"lsStates\":[],\"firstLsThings\":[]},\"changed\":{\"secondLsThings\":[]},\"_pending\":false,\"urlRoot\":\"/api/things/batch/internalization agent\",\"lsProperties\":{\"defaultLabels\":[],\"defaultValues\":[{\"key\":\"scientist\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent batch\",\"type\":\"codeValue\",\"kind\":\"scientist\",\"codeOrigin\":\"ACAS authors\",\"value\":\"unassigned\"},{\"key\":\"completion date\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent batch\",\"type\":\"dateValue\",\"kind\":\"completion date\"},{\"key\":\"notebook\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent batch\",\"type\":\"stringValue\",\"kind\":\"notebook\"},{\"key\":\"source\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent batch\",\"type\":\"codeValue\",\"kind\":\"source\",\"value\":\"ACAS\",\"codeType\":\"component\",\"codeKind\":\"source\",\"codeOrigin\":\"ACAS DDICT\"},{\"key\":\"source id\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent batch\",\"type\":\"stringValue\",\"kind\":\"source id\"},{\"key\":\"molecular weight\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent batch\",\"type\":\"numericValue\",\"kind\":\"molecular weight\",\"unitType\":\"molecular weight\",\"unitKind\":\"kDa\"},{\"key\":\"purity\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent batch\",\"type\":\"numericValue\",\"kind\":\"purity\",\"unitType\":\"percentage\",\"unitKind\":\"% purity\"},{\"key\":\"amount made\",\"stateType\":\"metadata\",\"stateKind\":\"inventory\",\"type\":\"numericValue\",\"kind\":\"amount made\",\"unitType\":\"mass\",\"unitKind\":\"g\"},{\"key\":\"location\",\"stateType\":\"metadata\",\"stateKind\":\"inventory\",\"type\":\"stringValue\",\"kind\":\"location\"}],\"defaultFirstLsThingItx\":[],\"defaultSecondLsThingItx\":[]},\"className\":\"Thing\",\"validationError\":null,\"idAttribute\":\"id\",\"firstLsThings\":[],\"secondLsThings\":[{\"lsType\":\"incorporates\",\"lsKind\":\"assembly_component\",\"lsTypeAndKind\":\"incorporates_assembly_component\",\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"composition\",\"lsValues\":[{\"lsType\":\"numericValue\",\"lsKind\":\"order\",\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\",\"numericValue\":1}],\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\"}],\"recordedBy\":\"bob\",\"recordedDate\":1428517111206,\"secondLsThing\":{\"codeName\":\"PEG000010-2\",\"deleted\":false,\"id\":1508673,\"ignored\":false,\"lsKind\":\"peg\",\"lsLabels\":[],\"lsStates\":[{\"deleted\":false,\"id\":2648998,\"ignored\":false,\"lsKind\":\"inventory\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_inventory\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960363,\"ignored\":false,\"lsKind\":\"location\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_location\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"stringValue\":\"lab23\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960364,\"ignored\":false,\"lsKind\":\"amount made\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_amount made\",\"numericValue\":123,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"unitKind\":\"g\",\"unitType\":\"mass\",\"unitTypeAndKind\":\"mass_g\",\"version\":0}],\"modifiedDate\":1428516368847,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"version\":7},{\"deleted\":false,\"id\":2648997,\"ignored\":false,\"lsKind\":\"peg batch\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_peg batch\",\"lsValues\":[{\"codeOrigin\":\"ACAS authors\",\"codeTypeAndKind\":\"null_null\",\"codeValue\":\"egao\",\"deleted\":false,\"id\":5960362,\"ignored\":false,\"lsKind\":\"scientist\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_scientist\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960361,\"ignored\":false,\"lsKind\":\"purity\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_purity\",\"numericValue\":123,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"unitKind\":\"% purity\",\"unitType\":\"percentage\",\"unitTypeAndKind\":\"percentage_% purity\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1428390000000,\"deleted\":false,\"id\":5960360,\"ignored\":false,\"lsKind\":\"completion date\",\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960358,\"ignored\":false,\"lsKind\":\"notebook\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"stringValue\":\"test\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960357,\"ignored\":false,\"lsKind\":\"source id\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_source id\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"stringValue\":\"\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeKind\":\"source\",\"codeOrigin\":\"ACAS DDICT\",\"codeType\":\"component\",\"codeTypeAndKind\":\"component_source\",\"codeValue\":\"ACAS\",\"deleted\":false,\"id\":5960359,\"ignored\":false,\"lsKind\":\"source\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_source\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"comments\":\"Testing (45).pdf\",\"deleted\":false,\"fileValue\":\"entities/pegs/PEG000010-2/Testing (45).pdf\",\"id\":5960356,\"ignored\":false,\"lsKind\":\"gpc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_gpc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"unitTypeAndKind\":\"null_null\",\"version\":1}],\"modifiedDate\":1428516368853,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"version\":7}],\"lsTags\":[],\"lsType\":\"batch\",\"lsTypeAndKind\":\"batch_peg\",\"modifiedDate\":1428516368844,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"version\":8},\"className\":\"SecondThingItx\",\"validationError\":null,\"idAttribute\":\"id\"},{\"lsType\":\"incorporates\",\"lsKind\":\"assembly_component\",\"lsTypeAndKind\":\"incorporates_assembly_component\",\"lsStates\":[{\"deleted\":false,\"id\":2649029,\"ignored\":false,\"lsKind\":\"composition\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_composition\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960441,\"ignored\":false,\"lsKind\":\"order\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_order\",\"numericValue\":1,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"\",\"recordedDate\":1428517031733,\"unitTypeAndKind\":\"null_null\",\"version\":0}],\"recordedBy\":\"\",\"recordedDate\":1428517031732,\"version\":1}],\"recordedBy\":\"bob\",\"recordedDate\":1428517031598,\"secondLsThing\":{\"codeName\":\"PEG000010-1\",\"deleted\":false,\"id\":1442921,\"ignored\":false,\"lsKind\":\"peg\",\"lsType\":\"batch\",\"lsTypeAndKind\":\"batch_peg\",\"modifiedDate\":1428516368872,\"recordedBy\":\"bob\",\"recordedDate\":1426100366796,\"version\":14},\"deleted\":false,\"id\":1508708,\"ignored\":true,\"version\":1,\"className\":\"SecondThingItx\",\"validationError\":null,\"idAttribute\":\"id\"}]}";
+
+	@Autowired
+	private WebApplicationContext wac;
+
+	private MockMvc mockMvc;
+
+	@Before
+	public void setup() {
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	}
+
+	@Test
+	public void registerComponentParentTest() throws Exception {
+		String json = "{\"codeName\":null,\"ignored\":false,\"lsKind\":\"linker small molecule\",\"lsLabels\":[{\"ignored\":false,\"imageFile\":null,\"labelText\":\"LSM 2\",\"lsKind\":\"linker small molecule\",\"lsTransaction\":1,\"lsType\":\"name\",\"lsTypeAndKind\":\"name_linker small molecule\",\"modifiedDate\":null,\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"jane\",\"recordedDate\":1375141504000}],\"lsStates\":[{\"comments\":null,\"ignored\":false,\"lsKind\":\"linker small molecule parent\",\"lsTransaction\":1,\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_linker small molecule parent\",\"lsValues\":[{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":1342080000000,\"fileValue\":null,\"ignored\":false,\"lsTransaction\":128,\"modifiedDate\":null,\"numericValue\":null,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":null,\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"completion date\",\"valueOperator\":null,\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"valueUnit\":null},{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"fileValue\":null,\"ignored\":false,\"lsTransaction\":127,\"modifiedDate\":null,\"numericValue\":null,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":\"Notebook 1\",\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"notebook\",\"valueOperator\":null,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"valueUnit\":null},{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"fileValue\":null,\"ignored\":false,\"lsTransaction\":128,\"modifiedDate\":null,\"numericValue\":231,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":null,\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"molecular weight\",\"valueOperator\":null,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_molecular weight\",\"unitKind\":\"g/mol\",\"unitType\":\"molecular weight\",\"valueUnit\":null},{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"fileValue\":null,\"ignored\":false,\"lsTransaction\":128,\"modifiedDate\":null,\"numericValue\":0,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":null,\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"batch number\",\"valueOperator\":null,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_batch number\",\"unitKind\":null,\"unitType\":null,\"valueUnit\":null}],\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"jane\",\"recordedDate\":1375141460000}],\"lsTransaction\":1,\"lsType\":\"parent\",\"lsTypeAndKind\":\"parent_linker small molecule\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"jane\",\"recordedDate\":1375141508000,\"shortDescription\":\" \"}";
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/lsthings/parent/linker small molecule")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(json)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		LsThing postedLsThing = LsThing.fromJsonToLsThing(responseJson);
+		logger.info(postedLsThing.toJson());
+	}
+
+	@Test
+	public void searchLabelText() throws Exception {
+		logger.info("starting the test");
+		String json = "{\"requests\":[{\"requestName\":\"GENE-000002\"}]}";
+		MockHttpServletResponse response = this.mockMvc
+				.perform(post("/api/v1/lsthings/getCodeNameFromNameRequest?thingType=gene&thingKind=entrez gene")
+						.contentType(MediaType.APPLICATION_JSON)
+						.content(json)
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info("test finished: responseJSON is:");
+		logger.info(responseJson);
+	}
+
+	@Test
+	public void registerComponentBatchTest() throws Exception {
+		String json = "{\"codeName\":null,\"ignored\":false,\"lsKind\":\"linker small molecule\",\"lsStates\":[{\"comments\":null,\"id\":11,\"ignored\":false,\"lsKind\":\"linker small molecule batch\",\"lsTransaction\":1,\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_linker small molecule batch\",\"lsValues\":[{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":1342080000000,\"fileValue\":null,\"id\":12,\"ignored\":false,\"lsTransaction\":128,\"modifiedDate\":null,\"numericValue\":null,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":null,\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"completion date\",\"valueOperator\":null,\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"valueUnit\":null,\"version\":0},{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"fileValue\":null,\"id\":13,\"ignored\":false,\"lsTransaction\":127,\"modifiedDate\":null,\"numericValue\":null,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":\"Notebook 1\",\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"notebook\",\"valueOperator\":null,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"valueUnit\":null,\"version\":0}],\"recordedDate\":1363388477000,\"recordedBy\":\"jane\"},{\"comments\":null,\"id\":111,\"ignored\":false,\"lsKind\":\"inventory\",\"lsTransaction\":1,\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_inventory\",\"lsValues\":[{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"fileValue\":null,\"id\":14,\"ignored\":false,\"lsTransaction\":128,\"modifiedDate\":null,\"numericValue\":2.3,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":null,\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"amount\",\"valueOperator\":null,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_amount\",\"unitKind\":\"g\",\"unitType\":\"mass\",\"valueUnit\":null,\"version\":0},{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"fileValue\":null,\"id\":15,\"ignored\":false,\"lsTransaction\":127,\"modifiedDate\":null,\"numericValue\":null,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":\"Cabinet 1\",\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"location\",\"valueOperator\":null,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_location\",\"valueUnit\":null,\"version\":0}],\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"jane\",\"recordedDate\":1375141460000,\"version\":0}],\"lsTransaction\":1,\"lsType\":\"batch\",\"lsTypeAndKind\":\"batch_linker small molecule\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"jane\",\"recordedDate\":1375141508000,\"shortDescription\":\" \",\"version\":0}";
+		String responseJson = this.mockMvc
+				.perform(post("/api/v1/lsthings/batch/linker small molecule?parentIdOrCodeName=LSM000002")
+						.contentType(MediaType.APPLICATION_JSON)
+						.content(json)
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+		logger.info(responseJson);
+		LsThing postedLsThing = LsThing.fromJsonToLsThing(responseJson);
+		logger.info(postedLsThing.toJson());
+	}
+
+	@Test
+	public void updateComponentParentTest() throws Exception {
+		String json = "{\"codeName\":\"LSM000001\",\"deleted\":false,\"id\":1191916,\"ignored\":false,\"lsKind\":\"linker small molecule\",\"lsLabels\":[{\"deleted\":false,\"id\":297063,\"ignored\":false,\"labelText\":\"LSM\",\"lsKind\":\"linker small molecule\",\"lsTransaction\":1,\"lsType\":\"name\",\"lsTypeAndKind\":\"name_linker small molecule\",\"physicallyLabeled\":false,\"preferred\":true,\"recordedBy\":\"jane\",\"recordedDate\":1375141504000,\"version\":0}],\"lsStates\":[{\"comments\":\"test state comment\",\"deleted\":false,\"id\":2170023,\"ignored\":false,\"lsKind\":\"linker small molecule parent\",\"lsTransaction\":1,\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_linker small molecule parent\",\"lsValues\":[{\"comments\":\"test value comment\",\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":4584944,\"ignored\":false,\"lsKind\":\"batch number\",\"lsTransaction\":128,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_batch number\",\"numericValue\":1,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"unitTypeAndKind\":\"null_null\",\"version\":1},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":4584942,\"ignored\":false,\"lsKind\":\"molecular weight\",\"lsTransaction\":128,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_molecular weight\",\"numericValue\":231,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"unitKind\":\"g/mol\",\"unitType\":\"molecular weight\",\"unitTypeAndKind\":\"molecular weight_g/mol\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":4584945,\"ignored\":false,\"lsKind\":\"notebook\",\"lsTransaction\":127,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"stringValue\":\"Notebook 1\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1342080000000,\"deleted\":false,\"id\":4584943,\"ignored\":false,\"lsKind\":\"completion date\",\"lsTransaction\":128,\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"unitTypeAndKind\":\"null_null\",\"version\":0}],\"recordedBy\":\"jane\",\"recordedDate\":1375141460000,\"version\":1}],\"lsTags\":[],\"lsTransaction\":1,\"lsType\":\"parent\",\"lsTypeAndKind\":\"parent_linker small molecule\",\"recordedBy\":\"jane\",\"recordedDate\":1375141508000,\"version\":1}";
+		MockHttpServletResponse response = this.mockMvc
+				.perform(put("/api/v1/lsthings/parent/linker small molecule/LSM000001")
+						.contentType(MediaType.APPLICATION_JSON)
+						.content(json)
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		LsThing postedLsThing = LsThing.fromJsonToLsThing(responseJson);
+		logger.info(postedLsThing.toJson());
+	}
+
+	@Test
+	public void updateComponentBatchTest() throws Exception {
+		String json = "{\"codeName\":\"LSM000001-1\",\"deleted\":false,\"id\":1191917,\"ignored\":false,\"lsKind\":\"linker small molecule\",\"lsLabels\":[],\"lsStates\":[{\"deleted\":false,\"id\":2170024,\"ignored\":false,\"lsKind\":\"linker small molecule batch\",\"lsTransaction\":1,\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_linker small molecule batch\",\"lsValues\":[{\"comments\":\"test notebook update comment\",\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":4584947,\"ignored\":false,\"lsKind\":\"notebook\",\"lsTransaction\":127,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"stringValue\":\"Notebook 1\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1342080000000,\"deleted\":false,\"id\":4584946,\"ignored\":false,\"lsKind\":\"completion date\",\"lsTransaction\":128,\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"unitTypeAndKind\":\"null_null\",\"version\":0}],\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"version\":1},{\"deleted\":false,\"id\":2170025,\"ignored\":false,\"lsKind\":\"inventory\",\"lsTransaction\":1,\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_inventory\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":4584949,\"ignored\":false,\"lsKind\":\"amount\",\"lsTransaction\":128,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_amount\",\"numericValue\":2.29999999999999982236431605997495353221893310546875,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"unitKind\":\"g\",\"unitType\":\"mass\",\"unitTypeAndKind\":\"mass_g\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":4584948,\"ignored\":false,\"lsKind\":\"location\",\"lsTransaction\":127,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_location\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"stringValue\":\"Cabinet 1\",\"unitTypeAndKind\":\"null_null\",\"version\":0}],\"recordedBy\":\"jane\",\"recordedDate\":1375141460000,\"version\":1}],\"lsTags\":[],\"lsTransaction\":1,\"lsType\":\"batch\",\"lsTypeAndKind\":\"batch_linker small molecule\",\"recordedBy\":\"jane\",\"recordedDate\":1375141508000,\"version\":1}";
+		String responseJson = this.mockMvc.perform(put("/api/v1/lsthings/batch/linker small molecule/LSM000001-1")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(json)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+		logger.info(responseJson);
+		LsThing postedLsThing = LsThing.fromJsonToLsThing(responseJson);
+		logger.info(postedLsThing.toJson());
+	}
+
+	@Test
+	@Rollback(value = false)
+	public void registerAssemblyParentTest() throws Exception {
+		String json = "{\"lsType\":\"parent\",\"lsKind\":\"internalization agent\",\"corpName\":\"\",\"recordedBy\":\"bob\",\"recordedDate\":1428352474150,\"shortDescription\":\" \",\"lsLabels\":[{\"lsType\":\"name\",\"lsKind\":\"internalization agent\",\"labelText\":\"LSM10-peg5\",\"ignored\":false,\"preferred\":true,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null}],\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"internalization agent parent\",\"lsValues\":[{\"lsType\":\"codeValue\",\"lsKind\":\"scientist\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"codeOrigin\":\"ACAS authors\",\"codeValue\":\"egao\",\"value\":\"egao\"},{\"lsType\":\"dateValue\",\"lsKind\":\"completion date\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":1428303600000,\"dateValue\":1428303600000},{\"lsType\":\"stringValue\",\"lsKind\":\"notebook\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":\"test\",\"stringValue\":\"test\"},{\"lsType\":\"codeValue\",\"lsKind\":\"conjugation type\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"codeKind\":\"conjugation type\",\"codeType\":\"internalization agent\",\"codeOrigin\":\"ACAS DDICT\",\"codeValue\":\"cys\",\"value\":\"cys\"},{\"lsType\":\"stringValue\",\"lsKind\":\"conjugation site\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":\"\",\"stringValue\":\"\"},{\"lsType\":\"numericValue\",\"lsKind\":\"batch number\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"numericValue\":0,\"value\":0}],\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\"}],\"firstLsThings\":[],\"secondLsThings\":[{\"lsType\":\"incorporates\",\"lsKind\":\"assembly_component\",\"lsTypeAndKind\":\"incorporates_assembly_component\",\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"composition\",\"lsValues\":[{\"lsType\":\"numericValue\",\"lsKind\":\"order\",\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\",\"numericValue\":1}],\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\"}],\"recordedBy\":\"bob\",\"recordedDate\":1428352474145,\"secondLsThing\":{\"codeName\":\"LSM000010\",\"deleted\":false,\"id\":1442338,\"ignored\":false,\"lsKind\":\"linker small molecule\",\"lsLabels\":[{\"deleted\":false,\"id\":297426,\"ignored\":false,\"labelText\":\"LSM10\",\"lsKind\":\"linker small molecule\",\"lsType\":\"name\",\"lsTypeAndKind\":\"name_linker small molecule\",\"modifiedDate\":1426028499740,\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"bob\",\"recordedDate\":1426024482348,\"version\":3}],\"lsTags\":[],\"lsType\":\"parent\",\"lsTypeAndKind\":\"parent_linker small molecule\",\"modifiedDate\":1426028499738,\"recordedBy\":\"bob\",\"recordedDate\":1426028499321,\"version\":4},\"className\":\"ThingItx\",\"validationError\":null,\"idAttribute\":\"id\"},{\"lsType\":\"incorporates\",\"lsKind\":\"assembly_component\",\"lsTypeAndKind\":\"incorporates_assembly_component\",\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"composition\",\"lsValues\":[{\"lsType\":\"numericValue\",\"lsKind\":\"order\",\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\",\"numericValue\":2}],\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\"}],\"recordedBy\":\"bob\",\"recordedDate\":1428352474148,\"secondLsThing\":{\"codeName\":\"PEG000010\",\"deleted\":false,\"id\":1442920,\"ignored\":false,\"lsKind\":\"peg\",\"lsLabels\":[{\"deleted\":false,\"id\":297434,\"ignored\":false,\"labelText\":\"peg5\",\"lsKind\":\"peg\",\"lsType\":\"name\",\"lsTypeAndKind\":\"name_peg\",\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"bob\",\"recordedDate\":1426100246459,\"version\":0}],\"lsTags\":[],\"lsType\":\"parent\",\"lsTypeAndKind\":\"parent_peg\",\"recordedBy\":\"bob\",\"recordedDate\":1426100246459,\"version\":1},\"className\":\"ThingItx\",\"validationError\":null,\"idAttribute\":\"id\"}],\"cid\":\"c104\",\"_changing\":false,\"_previousAttributes\":{\"lsType\":\"thing\",\"lsKind\":\"thing\",\"corpName\":\"\",\"recordedBy\":\"bob\",\"recordedDate\":1428352432123,\"shortDescription\":\" \",\"lsLabels\":[{\"lsType\":\"name\",\"lsKind\":\"internalization agent\",\"labelText\":\"LSM10-peg5\",\"ignored\":false,\"preferred\":true,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null}],\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"internalization agent parent\",\"lsValues\":[{\"lsType\":\"codeValue\",\"lsKind\":\"scientist\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"codeOrigin\":\"ACAS authors\",\"codeValue\":\"egao\",\"value\":\"egao\"},{\"lsType\":\"dateValue\",\"lsKind\":\"completion date\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":1428303600000,\"dateValue\":1428303600000},{\"lsType\":\"stringValue\",\"lsKind\":\"notebook\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":\"test\",\"stringValue\":\"test\"},{\"lsType\":\"codeValue\",\"lsKind\":\"conjugation type\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"codeKind\":\"conjugation type\",\"codeType\":\"internalization agent\",\"codeOrigin\":\"ACAS DDICT\",\"codeValue\":\"cys\",\"value\":\"cys\"},{\"lsType\":\"stringValue\",\"lsKind\":\"conjugation site\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":\"\",\"stringValue\":\"\"},{\"lsType\":\"numericValue\",\"lsKind\":\"batch number\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"numericValue\":0,\"value\":0}],\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\"}],\"firstLsThings\":[]},\"changed\":{\"secondLsThings\":[]},\"_pending\":false,\"urlRoot\":\"/api/things/parent/internalization agent\",\"className\":\"InternalizationAgentParent\",\"lsProperties\":{\"defaultLabels\":[{\"key\":\"internalization agent name\",\"type\":\"name\",\"kind\":\"internalization agent\",\"preferred\":true}],\"defaultValues\":[{\"key\":\"scientist\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"codeValue\",\"kind\":\"scientist\",\"codeOrigin\":\"ACAS authors\",\"value\":\"unassigned\"},{\"key\":\"completion date\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"dateValue\",\"kind\":\"completion date\"},{\"key\":\"notebook\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"stringValue\",\"kind\":\"notebook\"},{\"key\":\"conjugation type\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"codeValue\",\"kind\":\"conjugation type\",\"codeType\":\"internalization agent\",\"codeKind\":\"conjugation type\",\"codeOrigin\":\"ACAS DDICT\",\"value\":\"unassigned\"},{\"key\":\"conjugation site\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"stringValue\",\"kind\":\"conjugation site\"},{\"key\":\"batch number\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"numericValue\",\"kind\":\"batch number\",\"value\":0}],\"defaultFirstLsThingItx\":[],\"defaultSecondLsThingItx\":[]},\"validationError\":null,\"idAttribute\":\"id\"}";
+		String responseJson = this.mockMvc.perform(post("/api/v1/lsthings/parent/internalization agent")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(json)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+		logger.info(responseJson);
+		LsThing postedLsThing = LsThing.fromJsonToLsThing(responseJson);
+		logger.info(postedLsThing.toJson());
+	}
+
+	// @Test
+	public void registerAssemblyBatchTest() throws Exception {
+		String json = "";
+		String responseJson = this.mockMvc
+				.perform(post("/api/v1/lsthings/batch/internalization agent?parentIdOrCodeName=")
+						.contentType(MediaType.APPLICATION_JSON)
+						.content(json)
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+		logger.info(responseJson);
+		LsThing postedLsThing = LsThing.fromJsonToLsThing(responseJson);
+		logger.info(postedLsThing.toJson());
+	}
+
+	@Test
+	public void validateInvalidComponentNameTest() throws Exception {
+		String json = "{\"codeName\": null,\"firstLsThings\": [{\"deleted\": false,\"firstLsThing\": {\"codeName\": \"PRTN-000013-1\",\"deleted\": false,\"ignored\": false,\"lsKind\": \"protein\",\"lsStates\":[{\"deleted\":false,\"ignored\":false,\"lsKind\":\"inventory\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_inventory\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"location\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_location\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729705505,\"stringValue\":\"123\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"amount made\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_amount made\",\"numericValue\":1123,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729706303,\"unitKind\":\"g\",\"unitType\":\"mass\",\"unitTypeAndKind\":\"mass_g\",\"version\":0}],\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"version\":1},{\"deleted\":false,\"ignored\":false,\"lsKind\":\"protein batch\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_protein batch\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"hplc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_hplc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeOrigin\":\"ACAS authors\",\"codeTypeAndKind\":\"null_null\",\"codeValue\":\"egao\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"scientist\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_scientist\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729702585,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"DeleteExperimentInstructions (6).pdf\",\"ignored\":false,\"lsKind\":\"gpc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_gpc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1424678400000,\"deleted\":false,\"ignored\":false,\"lsKind\":\"completion date\",\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729703242,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"ms\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_ms\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeKind\":\"source\",\"codeOrigin\":\"ACAS DDICT\",\"codeType\":\"component\",\"codeTypeAndKind\":\"component_source\",\"codeValue\":\"ACAS\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"source\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_source\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729672870,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"purity\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_purity\",\"numericValue\":129,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729708062,\"unitKind\":\"% purity\",\"unitType\":\"percentage\",\"unitTypeAndKind\":\"percentage_% purity\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"nmr\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_nmr\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"notebook\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729703953,\"stringValue\":\"test\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"source id\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_source id\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729702610,\"stringValue\":\"\",\"unitTypeAndKind\":\"null_null\",\"version\":0}],\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"version\":1}],\"lsType\": \"batch\",\"lsTypeAndKind\": \"batch_protein\",\"recordedBy\": \"jane\",\"recordedDate\": 1424730027913,\"version\": null},\"id\": null,\"ignored\": false,\"lsKind\": \"batch_parent\",\"lsType\": \"instantiates\",\"lsTypeAndKind\": \"instantiates_batch_parent\",\"recordedBy\": \"jane\",\"recordedDate\": 1424730027913,\"version\": null}],\"ignored\": false,\"lsKind\": \"protein\",\"lsLabels\": [{ \"ignored\": false,\"imageFile\": null,\"labelText\": \"testing2\",\"lsKind\": \"protein\",\"lsTransaction\": 9999,\"lsType\": \"name\",\"lsTypeAndKind\": \"name_protein\",\"modifiedDate\": null,\"physicallyLabled\": false,\"preferred\": true,\"recordedBy\": \"jane\",\"recordedDate\": 1375141504000}],\"lsStates\": [{ \"comments\": null,\"ignored\": false,\"lsKind\": \"protein parent\",\"lsTransaction\": 9999,\"lsType\": \"metadata\",\"lsTypeAndKind\": \"metadata_protein parent\",\"lsValues\": [{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": 1342080000000, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"completion date\", \"lsTransaction\": 9999, \"lsType\": \"dateValue\", \"lsTypeAndKind\": \"dateValue_completion date\", \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"notebook\", \"lsTransaction\": 9999, \"lsType\": \"stringValue\", \"lsTypeAndKind\": \"stringValue_notebook\", \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": \"Notebook 1\", \"uncertainty\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"molecular weight\", \"lsTransaction\": 9999, \"lsType\": \"numericValue\", \"lsTypeAndKind\": \"numericValue_molecular weight\", \"modifiedDate\": null, \"numericValue\": 231, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"unitKind\": \"g/mol\", \"unitType\": \"molecular weight\", \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"batch number\", \"lsTransaction\": 9999, \"lsType\": \"numericValue\", \"lsTypeAndKind\": \"numericValue_batch number\", \"modifiedDate\": null, \"numericValue\": 0, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"unitKind\": null, \"unitType\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null} ],\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\": 1375141460000}],\"lsTransaction\": 9999,\"lsType\": \"parent\",\"lsTypeAndKind\": \"parent_protein\",\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\": 1375141508000,\"shortDescription\": \" \"}";
+		String response = this.mockMvc.perform(post("/api/v1/lsthings/validate?uniqueName=true")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(json)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isConflict())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse().getContentAsString();
+		logger.info(response);
+	}
+
+	@Test
+	public void validateValidComponentNameTest() throws Exception {
+		String json = "{\"codeName\": null,\"firstLsThings\": [{\"deleted\": false,\"firstLsThing\": {\"codeName\": \"PRTN-000013-1\",\"deleted\": false,\"ignored\": false,\"lsKind\": \"protein\",\"lsStates\":[{\"deleted\":false,\"ignored\":false,\"lsKind\":\"inventory\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_inventory\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"location\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_location\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729705505,\"stringValue\":\"123\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"amount made\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_amount made\",\"numericValue\":1123,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729706303,\"unitKind\":\"g\",\"unitType\":\"mass\",\"unitTypeAndKind\":\"mass_g\",\"version\":0}],\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"version\":1},{\"deleted\":false,\"ignored\":false,\"lsKind\":\"protein batch\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_protein batch\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"hplc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_hplc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeOrigin\":\"ACAS authors\",\"codeTypeAndKind\":\"null_null\",\"codeValue\":\"egao\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"scientist\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_scientist\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729702585,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"DeleteExperimentInstructions (6).pdf\",\"ignored\":false,\"lsKind\":\"gpc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_gpc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1424678400000,\"deleted\":false,\"ignored\":false,\"lsKind\":\"completion date\",\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729703242,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"ms\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_ms\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeKind\":\"source\",\"codeOrigin\":\"ACAS DDICT\",\"codeType\":\"component\",\"codeTypeAndKind\":\"component_source\",\"codeValue\":\"ACAS\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"source\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_source\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729672870,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"purity\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_purity\",\"numericValue\":129,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729708062,\"unitKind\":\"% purity\",\"unitType\":\"percentage\",\"unitTypeAndKind\":\"percentage_% purity\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"nmr\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_nmr\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"notebook\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729703953,\"stringValue\":\"test\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"source id\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_source id\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729702610,\"stringValue\":\"\",\"unitTypeAndKind\":\"null_null\",\"version\":0}],\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"version\":1}],\"lsType\": \"batch\",\"lsTypeAndKind\": \"batch_protein\",\"recordedBy\": \"jane\",\"recordedDate\": 1424730027913,\"version\": null},\"id\": null,\"ignored\": false,\"lsKind\": \"batch_parent\",\"lsType\": \"instantiates\",\"lsTypeAndKind\": \"instantiates_batch_parent\",\"recordedBy\": \"jane\",\"recordedDate\": 1424730027913,\"version\": null}],\"ignored\": false,\"lsKind\": \"protein\",\"lsLabels\": [{ \"ignored\": false,\"imageFile\": null,\"labelText\": \"Fielderase\",\"lsKind\": \"protein\",\"lsTransaction\": 9999,\"lsType\": \"name\",\"lsTypeAndKind\": \"name_protein\",\"modifiedDate\": null,\"physicallyLabled\": false,\"preferred\": true,\"recordedBy\": \"jane\",\"recordedDate\": 1375141504000}],\"lsStates\": [{ \"comments\": null,\"ignored\": false,\"lsKind\": \"protein parent\",\"lsTransaction\": 9999,\"lsType\": \"metadata\",\"lsTypeAndKind\": \"metadata_protein parent\",\"lsValues\": [{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": 1342080000000, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"completion date\", \"lsTransaction\": 9999, \"lsType\": \"dateValue\", \"lsTypeAndKind\": \"dateValue_completion date\", \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"notebook\", \"lsTransaction\": 9999, \"lsType\": \"stringValue\", \"lsTypeAndKind\": \"stringValue_notebook\", \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": \"Notebook 1\", \"uncertainty\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"molecular weight\", \"lsTransaction\": 9999, \"lsType\": \"numericValue\", \"lsTypeAndKind\": \"numericValue_molecular weight\", \"modifiedDate\": null, \"numericValue\": 231, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"unitKind\": \"g/mol\", \"unitType\": \"molecular weight\", \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"batch number\", \"lsTransaction\": 9999, \"lsType\": \"numericValue\", \"lsTypeAndKind\": \"numericValue_batch number\", \"modifiedDate\": null, \"numericValue\": 0, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"unitKind\": null, \"unitType\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null} ],\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\": 1375141460000}],\"lsTransaction\": 9999,\"lsType\": \"parent\",\"lsTypeAndKind\": \"parent_protein\",\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\": 1375141508000,\"shortDescription\": \" \"}";
+		String response = this.mockMvc.perform(post("/api/v1/lsthings/validate?uniqueName=true")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(json)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isAccepted())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse().getContentAsString();
+	}
+
+	// @Test
+	public void validateInvalidAssemblyTest() throws Exception {
+		String componentNameList = "[\"CMPT-00001\", \"CMPT-00002\", \"CMPT-00003\"]";
+		String response = this.mockMvc.perform(post("/api/v1/lsthings/validatename?lsKind=internalization agent")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(componentNameList)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse().getContentAsString();
+		logger.info(response);
+		Assert.assertEquals(false, Boolean.parseBoolean(response));
+	}
+
+	@Test
+	public void validateValidAssemblyTest() throws Exception {
+		String json = "{\"lsType\":\"parent\",\"lsKind\":\"internalization agent\",\"corpName\":\"\",\"recordedBy\":\"bob\",\"recordedDate\":1428352474150,\"shortDescription\":\" \",\"lsLabels\":[{\"lsType\":\"name\",\"lsKind\":\"internalization agent\",\"labelText\":\"LSM10-peg5\",\"ignored\":false,\"preferred\":true,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null}],\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"internalization agent parent\",\"lsValues\":[{\"lsType\":\"codeValue\",\"lsKind\":\"scientist\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"codeOrigin\":\"ACAS authors\",\"codeValue\":\"egao\",\"value\":\"egao\"},{\"lsType\":\"dateValue\",\"lsKind\":\"completion date\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":1428303600000,\"dateValue\":1428303600000},{\"lsType\":\"stringValue\",\"lsKind\":\"notebook\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":\"test\",\"stringValue\":\"test\"},{\"lsType\":\"codeValue\",\"lsKind\":\"conjugation type\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"codeKind\":\"conjugation type\",\"codeType\":\"internalization agent\",\"codeOrigin\":\"ACAS DDICT\",\"codeValue\":\"cys\",\"value\":\"cys\"},{\"lsType\":\"stringValue\",\"lsKind\":\"conjugation site\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":\"\",\"stringValue\":\"\"},{\"lsType\":\"numericValue\",\"lsKind\":\"batch number\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"numericValue\":0,\"value\":0}],\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\"}],\"firstLsThings\":[],\"secondLsThings\":[{\"lsType\":\"incorporates\",\"lsKind\":\"assembly_component\",\"lsTypeAndKind\":\"incorporates_assembly_component\",\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"composition\",\"lsValues\":[{\"lsType\":\"numericValue\",\"lsKind\":\"order\",\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\",\"numericValue\":1}],\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\"}],\"recordedBy\":\"bob\",\"recordedDate\":1428352474145,\"secondLsThing\":{\"codeName\":\"LSM000010\",\"deleted\":false,\"id\":1442338,\"ignored\":false,\"lsKind\":\"linker small molecule\",\"lsLabels\":[{\"deleted\":false,\"id\":297426,\"ignored\":false,\"labelText\":\"LSM10\",\"lsKind\":\"linker small molecule\",\"lsType\":\"name\",\"lsTypeAndKind\":\"name_linker small molecule\",\"modifiedDate\":1426028499740,\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"bob\",\"recordedDate\":1426024482348,\"version\":3}],\"lsTags\":[],\"lsType\":\"parent\",\"lsTypeAndKind\":\"parent_linker small molecule\",\"modifiedDate\":1426028499738,\"recordedBy\":\"bob\",\"recordedDate\":1426028499321,\"version\":4},\"className\":\"ThingItx\",\"validationError\":null,\"idAttribute\":\"id\"},{\"lsType\":\"incorporates\",\"lsKind\":\"assembly_component\",\"lsTypeAndKind\":\"incorporates_assembly_component\",\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"composition\",\"lsValues\":[{\"lsType\":\"numericValue\",\"lsKind\":\"order\",\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\",\"numericValue\":2}],\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\"}],\"recordedBy\":\"bob\",\"recordedDate\":1428352474148,\"secondLsThing\":{\"codeName\":\"PEG000010\",\"deleted\":false,\"id\":1442920,\"ignored\":false,\"lsKind\":\"peg\",\"lsLabels\":[{\"deleted\":false,\"id\":297434,\"ignored\":false,\"labelText\":\"peg5\",\"lsKind\":\"peg\",\"lsType\":\"name\",\"lsTypeAndKind\":\"name_peg\",\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"bob\",\"recordedDate\":1426100246459,\"version\":0}],\"lsTags\":[],\"lsType\":\"parent\",\"lsTypeAndKind\":\"parent_peg\",\"recordedBy\":\"bob\",\"recordedDate\":1426100246459,\"version\":1},\"className\":\"ThingItx\",\"validationError\":null,\"idAttribute\":\"id\"}],\"cid\":\"c104\",\"_changing\":false,\"_previousAttributes\":{\"lsType\":\"thing\",\"lsKind\":\"thing\",\"corpName\":\"\",\"recordedBy\":\"bob\",\"recordedDate\":1428352432123,\"shortDescription\":\" \",\"lsLabels\":[{\"lsType\":\"name\",\"lsKind\":\"internalization agent\",\"labelText\":\"LSM10-peg5\",\"ignored\":false,\"preferred\":true,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null}],\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"internalization agent parent\",\"lsValues\":[{\"lsType\":\"codeValue\",\"lsKind\":\"scientist\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"codeOrigin\":\"ACAS authors\",\"codeValue\":\"egao\",\"value\":\"egao\"},{\"lsType\":\"dateValue\",\"lsKind\":\"completion date\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":1428303600000,\"dateValue\":1428303600000},{\"lsType\":\"stringValue\",\"lsKind\":\"notebook\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":\"test\",\"stringValue\":\"test\"},{\"lsType\":\"codeValue\",\"lsKind\":\"conjugation type\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"codeKind\":\"conjugation type\",\"codeType\":\"internalization agent\",\"codeOrigin\":\"ACAS DDICT\",\"codeValue\":\"cys\",\"value\":\"cys\"},{\"lsType\":\"stringValue\",\"lsKind\":\"conjugation site\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":\"\",\"stringValue\":\"\"},{\"lsType\":\"numericValue\",\"lsKind\":\"batch number\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"numericValue\":0,\"value\":0}],\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\"}],\"firstLsThings\":[]},\"changed\":{\"secondLsThings\":[]},\"_pending\":false,\"urlRoot\":\"/api/things/parent/internalization agent\",\"className\":\"InternalizationAgentParent\",\"lsProperties\":{\"defaultLabels\":[{\"key\":\"internalization agent name\",\"type\":\"name\",\"kind\":\"internalization agent\",\"preferred\":true}],\"defaultValues\":[{\"key\":\"scientist\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"codeValue\",\"kind\":\"scientist\",\"codeOrigin\":\"ACAS authors\",\"value\":\"unassigned\"},{\"key\":\"completion date\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"dateValue\",\"kind\":\"completion date\"},{\"key\":\"notebook\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"stringValue\",\"kind\":\"notebook\"},{\"key\":\"conjugation type\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"codeValue\",\"kind\":\"conjugation type\",\"codeType\":\"internalization agent\",\"codeKind\":\"conjugation type\",\"codeOrigin\":\"ACAS DDICT\",\"value\":\"unassigned\"},{\"key\":\"conjugation site\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"stringValue\",\"kind\":\"conjugation site\"},{\"key\":\"batch number\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"numericValue\",\"kind\":\"batch number\",\"value\":0}],\"defaultFirstLsThingItx\":[],\"defaultSecondLsThingItx\":[]},\"validationError\":null,\"idAttribute\":\"id\"}";
+		String response = this.mockMvc.perform(post("/api/v1/lsthings/validate?uniqueName=true&orderMatters=true")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(json)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isAccepted())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse().getContentAsString();
+		logger.info(response);
+	}
+
+	@Test
+	public void validateValidAssemblyTest2() throws Exception {
+		String json = "{\"lsType\":\"parent\",\"lsKind\":\"internalization agent\",\"corpName\":\"\",\"recordedBy\":\"bob\",\"recordedDate\":1428352474150,\"shortDescription\":\" \",\"lsLabels\":[{\"lsType\":\"name\",\"lsKind\":\"internalization agent\",\"labelText\":\"LSM10-peg5\",\"ignored\":false,\"preferred\":true,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null}],\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"internalization agent parent\",\"lsValues\":[{\"lsType\":\"codeValue\",\"lsKind\":\"scientist\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"codeOrigin\":\"ACAS authors\",\"codeValue\":\"egao\",\"value\":\"egao\"},{\"lsType\":\"dateValue\",\"lsKind\":\"completion date\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":1428303600000,\"dateValue\":1428303600000},{\"lsType\":\"stringValue\",\"lsKind\":\"notebook\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":\"test\",\"stringValue\":\"test\"},{\"lsType\":\"codeValue\",\"lsKind\":\"conjugation type\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"codeKind\":\"conjugation type\",\"codeType\":\"internalization agent\",\"codeOrigin\":\"ACAS DDICT\",\"codeValue\":\"cys\",\"value\":\"cys\"},{\"lsType\":\"stringValue\",\"lsKind\":\"conjugation site\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":\"\",\"stringValue\":\"\"},{\"lsType\":\"numericValue\",\"lsKind\":\"batch number\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"numericValue\":0,\"value\":0}],\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\"}],\"firstLsThings\":[],\"secondLsThings\":[{\"lsType\":\"incorporates\",\"lsKind\":\"assembly_component\",\"lsTypeAndKind\":\"incorporates_assembly_component\",\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"composition\",\"lsValues\":[{\"lsType\":\"numericValue\",\"lsKind\":\"order\",\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\",\"numericValue\":1}],\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\"}],\"recordedBy\":\"bob\",\"recordedDate\":1428352474145,\"secondLsThing\":{\"codeName\":\"LSM000010\",\"deleted\":false,\"id\":1442338,\"ignored\":false,\"lsKind\":\"linker small molecule\",\"lsLabels\":[{\"deleted\":false,\"id\":297426,\"ignored\":false,\"labelText\":\"LSM10\",\"lsKind\":\"linker small molecule\",\"lsType\":\"name\",\"lsTypeAndKind\":\"name_linker small molecule\",\"modifiedDate\":1426028499740,\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"bob\",\"recordedDate\":1426024482348,\"version\":3}],\"lsTags\":[],\"lsType\":\"parent\",\"lsTypeAndKind\":\"parent_linker small molecule\",\"modifiedDate\":1426028499738,\"recordedBy\":\"bob\",\"recordedDate\":1426028499321,\"version\":4},\"className\":\"ThingItx\",\"validationError\":null,\"idAttribute\":\"id\"},{\"lsType\":\"incorporates\",\"lsKind\":\"assembly_component\",\"lsTypeAndKind\":\"incorporates_assembly_component\",\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"composition\",\"lsValues\":[{\"lsType\":\"numericValue\",\"lsKind\":\"order\",\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\",\"numericValue\":2}],\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\"}],\"recordedBy\":\"bob\",\"recordedDate\":1428352474148,\"secondLsThing\":{\"codeName\":\"PEG000010\",\"deleted\":false,\"id\":1442920,\"ignored\":false,\"lsKind\":\"peg\",\"lsLabels\":[{\"deleted\":false,\"id\":297434,\"ignored\":false,\"labelText\":\"peg5\",\"lsKind\":\"peg\",\"lsType\":\"name\",\"lsTypeAndKind\":\"name_peg\",\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"bob\",\"recordedDate\":1426100246459,\"version\":0}],\"lsTags\":[],\"lsType\":\"parent\",\"lsTypeAndKind\":\"parent_peg\",\"recordedBy\":\"bob\",\"recordedDate\":1426100246459,\"version\":1},\"className\":\"ThingItx\",\"validationError\":null,\"idAttribute\":\"id\"}],\"cid\":\"c104\",\"_changing\":false,\"_previousAttributes\":{\"lsType\":\"thing\",\"lsKind\":\"thing\",\"corpName\":\"\",\"recordedBy\":\"bob\",\"recordedDate\":1428352432123,\"shortDescription\":\" \",\"lsLabels\":[{\"lsType\":\"name\",\"lsKind\":\"internalization agent\",\"labelText\":\"LSM10-peg5\",\"ignored\":false,\"preferred\":true,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null}],\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"internalization agent parent\",\"lsValues\":[{\"lsType\":\"codeValue\",\"lsKind\":\"scientist\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"codeOrigin\":\"ACAS authors\",\"codeValue\":\"egao\",\"value\":\"egao\"},{\"lsType\":\"dateValue\",\"lsKind\":\"completion date\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":1428303600000,\"dateValue\":1428303600000},{\"lsType\":\"stringValue\",\"lsKind\":\"notebook\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":\"test\",\"stringValue\":\"test\"},{\"lsType\":\"codeValue\",\"lsKind\":\"conjugation type\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"codeKind\":\"conjugation type\",\"codeType\":\"internalization agent\",\"codeOrigin\":\"ACAS DDICT\",\"codeValue\":\"cys\",\"value\":\"cys\"},{\"lsType\":\"stringValue\",\"lsKind\":\"conjugation site\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"value\":\"\",\"stringValue\":\"\"},{\"lsType\":\"numericValue\",\"lsKind\":\"batch number\",\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\",\"numericValue\":0,\"value\":0}],\"ignored\":false,\"recordedDate\":1428352474150,\"recordedBy\":\"bob\"}],\"firstLsThings\":[]},\"changed\":{\"secondLsThings\":[]},\"_pending\":false,\"urlRoot\":\"/api/things/parent/internalization agent\",\"className\":\"InternalizationAgentParent\",\"lsProperties\":{\"defaultLabels\":[{\"key\":\"internalization agent name\",\"type\":\"name\",\"kind\":\"internalization agent\",\"preferred\":true}],\"defaultValues\":[{\"key\":\"scientist\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"codeValue\",\"kind\":\"scientist\",\"codeOrigin\":\"ACAS authors\",\"value\":\"unassigned\"},{\"key\":\"completion date\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"dateValue\",\"kind\":\"completion date\"},{\"key\":\"notebook\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"stringValue\",\"kind\":\"notebook\"},{\"key\":\"conjugation type\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"codeValue\",\"kind\":\"conjugation type\",\"codeType\":\"internalization agent\",\"codeKind\":\"conjugation type\",\"codeOrigin\":\"ACAS DDICT\",\"value\":\"unassigned\"},{\"key\":\"conjugation site\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"stringValue\",\"kind\":\"conjugation site\"},{\"key\":\"batch number\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent parent\",\"type\":\"numericValue\",\"kind\":\"batch number\",\"value\":0}],\"defaultFirstLsThingItx\":[],\"defaultSecondLsThingItx\":[]},\"validationError\":null,\"idAttribute\":\"id\"}";
+		String response = this.mockMvc.perform(
+				post("/api/v1/lsthings/validate?uniqueName=true&orderMatters=true&forwardAndReverseAreSame=true")
+						.contentType(MediaType.APPLICATION_JSON)
+						.content(json)
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isAccepted())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse().getContentAsString();
+		logger.info(response);
+	}
+
+	@Test
+	public void getLsThing() throws Exception {
+		String json = this.mockMvc.perform(get("/api/v1/lsthings/parent/linker small molecule/LSM000001-1")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+
+		logger.info(json);
+		LsThing lsThing = LsThing.fromJsonToLsThing(json);
+		logger.info(lsThing.toJson());
+	}
+
+	@Test
+	public void getComponentBatches() throws Exception {
+		String json = this.mockMvc.perform(get("/api/v1/lsthings/parent/linker small molecule/getbatches/LSM000001")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+
+		logger.info(json);
+		Collection<LsThing> lsThings = LsThing.fromJsonArrayToLsThings(json);
+		Assert.assertEquals(1, lsThings.size());
+		logger.info(LsThing.toJsonArray(lsThings));
+	}
+
+	@Test
+	public void searchForComponentBatch() throws Exception {
+		String json = this.mockMvc.perform(get("/api/v1/lsthings/search?lsType=batch&q=LSM000001-1 2012-07-12")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+
+		logger.info(json);
+		Collection<LsThing> lsThings = LsThing.fromJsonArrayToLsThings(json);
+		Assert.assertEquals(1, lsThings.size());
+		logger.info(LsThing.toJsonArray(lsThings));
+	}
+
+	@Test
+	public void getCodeTableLsThings() throws Exception {
+		String json = this.mockMvc.perform(get("/api/v1/lsthings/codetable?lsType=parent&lsKind=linker small molecule")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse().getContentAsString();
+		logger.info(json);
+	}
+
+	@Test
+	public void getCodeTableLsThings2() throws Exception {
+		String json = this.mockMvc.perform(get("/api/v1/lsthings/codetable?lsType=term&lsKind=documentTerm")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse().getContentAsString();
+		logger.info(json);
+	}
+
+	@Test
+	public void searchByScientist() throws Exception {
+		String searchString = "jane";
+		String json = this.mockMvc.perform(get("/api/v1/lsthings/search?q=" + searchString)
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+
+		logger.info(json);
+		Collection<LsThing> lsThings = LsThing.fromJsonArrayToLsThings(json);
+		Assert.assertFalse(lsThings.isEmpty());
+		logger.info(LsThing.toJsonArray(lsThings));
+	}
+
+	@Test
+	@Transactional
+	public void registerParentAndBatchTest() throws Exception {
+		// String json = "{\"codeName\": null,\"firstLsThings\": [{\"deleted\":
+		// false,\"firstLsThing\": {\"codeName\": \"PRTN-000013-1\",\"deleted\":
+		// false,\"ignored\": false,\"lsKind\": \"protein\",\"lsType\":
+		// \"batch\",\"lsTypeAndKind\": \"batch_protein\",\"recordedBy\":
+		// \"jane\",\"recordedDate\": 1424730027913,\"version\": null},\"id\":
+		// null,\"ignored\": false,\"lsKind\": \"batch_parent\",\"lsType\":
+		// \"instantiates\",\"lsTypeAndKind\":
+		// \"instantiates_batch_parent\",\"recordedBy\": \"jane\",\"recordedDate\":
+		// 1424730027913,\"version\": null}],\"ignored\": false,\"lsKind\":
+		// \"protein\",\"lsLabels\": [{ \"ignored\": false,\"imageFile\":
+		// null,\"labelText\": \"Fielderase\",\"lsKind\": \"protein\",\"lsTransaction\":
+		// 9999,\"lsType\": \"name\",\"lsTypeAndKind\":
+		// \"name_protein\",\"modifiedDate\": null,\"physicallyLabled\":
+		// false,\"preferred\": true,\"recordedBy\": \"jane\",\"recordedDate\":
+		// 1375141504000}],\"lsStates\": [{ \"comments\": null,\"ignored\":
+		// false,\"lsKind\": \"protein parent\",\"lsTransaction\": 9999,\"lsType\":
+		// \"metadata\",\"lsTypeAndKind\": \"metadata_protein parent\",\"lsValues\":
+		// [{\"clobValue\": null, \"codeValue\": null, \"comments\": null,
+		// \"dateValue\": 1342080000000, \"fileValue\": null, \"ignored\": false,
+		// \"lsKind\": \"completion date\", \"lsTransaction\": 9999, \"lsType\":
+		// \"dateValue\", \"lsTypeAndKind\": \"dateValue_completion date\",
+		// \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true,
+		// \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null,
+		// \"stringValue\": null, \"uncertainty\": null, \"urlValue\": null,
+		// \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null,
+		// \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\":
+		// null, \"ignored\": false, \"lsKind\": \"notebook\", \"lsTransaction\": 9999,
+		// \"lsType\": \"stringValue\", \"lsTypeAndKind\": \"stringValue_notebook\",
+		// \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true,
+		// \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null,
+		// \"stringValue\": \"Notebook 1\", \"uncertainty\": null, \"urlValue\": null,
+		// \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null,
+		// \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\":
+		// null, \"ignored\": false, \"lsKind\": \"molecular weight\",
+		// \"lsTransaction\": 9999, \"lsType\": \"numericValue\", \"lsTypeAndKind\":
+		// \"numericValue_molecular weight\", \"modifiedDate\": null, \"numericValue\":
+		// 231, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\":
+		// 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\":
+		// null, \"unitKind\": \"g/mol\", \"unitType\": \"molecular weight\",
+		// \"urlValue\": null, \"valueOperator\": null, \"valueUnit\":
+		// null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null,
+		// \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\":
+		// \"batch number\", \"lsTransaction\": 9999, \"lsType\": \"numericValue\",
+		// \"lsTypeAndKind\": \"numericValue_batch number\", \"modifiedDate\": null,
+		// \"numericValue\": 0, \"publicData\": true, \"recordedBy\": \"jane\",
+		// \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null,
+		// \"uncertainty\": null, \"unitKind\": null, \"unitType\": null, \"urlValue\":
+		// null, \"valueOperator\": null, \"valueUnit\": null} ],\"modifiedBy\":
+		// null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\":
+		// 1375141460000}],\"lsTransaction\": 9999,\"lsType\":
+		// \"parent\",\"lsTypeAndKind\": \"parent_protein\",\"modifiedBy\":
+		// null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\":
+		// 1375141508000,\"shortDescription\": \" \"}";
+		String json = "{\"codeName\": null,\"firstLsThings\": [{\"deleted\": false,\"firstLsThing\": {\"codeName\": \"PRTN-000013-1\",\"deleted\": false,\"ignored\": false,\"lsKind\": \"protein\",\"lsStates\":[{\"deleted\":false,\"ignored\":false,\"lsKind\":\"inventory\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_inventory\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"location\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_location\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729705505,\"stringValue\":\"123\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"amount made\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_amount made\",\"numericValue\":1123,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729706303,\"unitKind\":\"g\",\"unitType\":\"mass\",\"unitTypeAndKind\":\"mass_g\",\"version\":0}],\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"version\":1},{\"deleted\":false,\"ignored\":false,\"lsKind\":\"protein batch\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_protein batch\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"hplc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_hplc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeOrigin\":\"ACAS authors\",\"codeTypeAndKind\":\"null_null\",\"codeValue\":\"egao\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"scientist\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_scientist\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729702585,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"DeleteExperimentInstructions (6).pdf\",\"ignored\":false,\"lsKind\":\"gpc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_gpc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1424678400000,\"deleted\":false,\"ignored\":false,\"lsKind\":\"completion date\",\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729703242,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"ms\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_ms\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeKind\":\"source\",\"codeOrigin\":\"ACAS DDICT\",\"codeType\":\"component\",\"codeTypeAndKind\":\"component_source\",\"codeValue\":\"ACAS\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"source\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_source\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729672870,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"purity\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_purity\",\"numericValue\":129,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729708062,\"unitKind\":\"% purity\",\"unitType\":\"percentage\",\"unitTypeAndKind\":\"percentage_% purity\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"nmr\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_nmr\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"notebook\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729703953,\"stringValue\":\"test\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"source id\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_source id\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729702610,\"stringValue\":\"\",\"unitTypeAndKind\":\"null_null\",\"version\":0}],\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"version\":1}],\"lsType\": \"batch\",\"lsTypeAndKind\": \"batch_protein\",\"recordedBy\": \"jane\",\"recordedDate\": 1424730027913,\"version\": null},\"id\": null,\"ignored\": false,\"lsKind\": \"batch_parent\",\"lsType\": \"instantiates\",\"lsTypeAndKind\": \"instantiates_batch_parent\",\"recordedBy\": \"jane\",\"recordedDate\": 1424730027913,\"version\": null}],\"ignored\": false,\"lsKind\": \"protein\",\"lsLabels\": [{ \"ignored\": false,\"imageFile\": null,\"labelText\": \"Fielderase\",\"lsKind\": \"protein\",\"lsTransaction\": 9999,\"lsType\": \"name\",\"lsTypeAndKind\": \"name_protein\",\"modifiedDate\": null,\"physicallyLabled\": false,\"preferred\": true,\"recordedBy\": \"jane\",\"recordedDate\": 1375141504000}],\"lsStates\": [{ \"comments\": null,\"ignored\": false,\"lsKind\": \"protein parent\",\"lsTransaction\": 9999,\"lsType\": \"metadata\",\"lsTypeAndKind\": \"metadata_protein parent\",\"lsValues\": [{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": 1342080000000, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"completion date\", \"lsTransaction\": 9999, \"lsType\": \"dateValue\", \"lsTypeAndKind\": \"dateValue_completion date\", \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"notebook\", \"lsTransaction\": 9999, \"lsType\": \"stringValue\", \"lsTypeAndKind\": \"stringValue_notebook\", \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": \"Notebook 1\", \"uncertainty\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"molecular weight\", \"lsTransaction\": 9999, \"lsType\": \"numericValue\", \"lsTypeAndKind\": \"numericValue_molecular weight\", \"modifiedDate\": null, \"numericValue\": 231, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"unitKind\": \"g/mol\", \"unitType\": \"molecular weight\", \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"batch number\", \"lsTransaction\": 9999, \"lsType\": \"numericValue\", \"lsTypeAndKind\": \"numericValue_batch number\", \"modifiedDate\": null, \"numericValue\": 0, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"unitKind\": null, \"unitType\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null} ],\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\": 1375141460000}],\"lsTransaction\": 9999,\"lsType\": \"parent\",\"lsTypeAndKind\": \"parent_protein\",\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\": 1375141508000,\"shortDescription\": \" \"}";
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/lsthings/parent/protein?with=nested")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(json)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		LsThing postedLsThing = LsThing.fromJsonToLsThing(responseJson);
+		logger.info(postedLsThing.toJson());
+	}
+
+	@Test
+	@Transactional
+	public void updateParentAndBatchTest() throws Exception {
+		String json = "{\"codeName\":\"PRTN000015\",\"deleted\":false,\"firstLsThings\":[{\"deleted\":false,\"firstLsThing\":{\"codeName\":\"PRTN000015-1\",\"deleted\":false,\"id\":1493852,\"ignored\":false,\"lsKind\":\"protein\",\"lsStates\":[{\"comments\":\"test comment 2\",\"deleted\":false,\"id\":2634316,\"ignored\":false,\"lsKind\":\"protein batch\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_protein batch\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"edited ms file value\",\"id\":5926370,\"ignored\":false,\"lsKind\":\"ms\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_ms\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"id\":5926365,\"ignored\":false,\"lsKind\":\"nmr\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_nmr\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"DeleteExperimentInstructions (6).pdf\",\"id\":5926369,\"ignored\":false,\"lsKind\":\"gpc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_gpc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1424678400000,\"deleted\":false,\"id\":5926368,\"ignored\":false,\"lsKind\":\"completion date\",\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729703242,\"unitTypeAndKind\":\"null_null\"},{\"codeKind\":\"source\",\"codeOrigin\":\"ACAS DDICT\",\"codeType\":\"component\",\"codeTypeAndKind\":\"component_source\",\"codeValue\":\"ACAS Edited\",\"deleted\":false,\"id\":5926373,\"ignored\":false,\"lsKind\":\"source\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_source\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729672870,\"unitTypeAndKind\":\"null_null\"},{\"codeOrigin\":\"ACAS authors\",\"codeTypeAndKind\":\"null_null\",\"codeValue\":\"egao\",\"deleted\":false,\"id\":5926367,\"ignored\":false,\"lsKind\":\"scientist\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_scientist\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729702585,\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926372,\"ignored\":false,\"lsKind\":\"purity\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_purity\",\"numericValue\":129,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729708062,\"unitKind\":\"% purity\",\"unitType\":\"percentage\",\"unitTypeAndKind\":\"percentage_% purity\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"id\":5926371,\"ignored\":false,\"lsKind\":\"hplc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_hplc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926364,\"ignored\":false,\"lsKind\":\"notebook\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729703953,\"stringValue\":\"test\",\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926366,\"ignored\":false,\"lsKind\":\"source id\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_source id\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729702610,\"stringValue\":\"test source id\",\"unitTypeAndKind\":\"null_null\"}],\"recordedBy\":\"jane\",\"recordedDate\":1424729720940},{\"deleted\":false,\"id\":2634315,\"ignored\":false,\"lsKind\":\"inventory\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_inventory\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926362,\"ignored\":false,\"lsKind\":\"location\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_location\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729705505,\"stringValue\":\"123\",\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926363,\"ignored\":false,\"lsKind\":\"amount made\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_amount made\",\"numericValue\":1123,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729706303,\"unitKind\":\"g\",\"unitType\":\"mass\",\"unitTypeAndKind\":\"mass_g\"}],\"recordedBy\":\"jane\",\"recordedDate\":1424729720940}],\"lsType\":\"batch\",\"lsTypeAndKind\":\"batch_protein\",\"recordedBy\":\"jane\",\"recordedDate\":1424730027913},\"id\":1493853,\"ignored\":false,\"lsKind\":\"batch_parent\",\"lsType\":\"instantiates\",\"lsTypeAndKind\":\"instantiates_batch_parent\",\"recordedBy\":\"jane\",\"recordedDate\":1424730027913}],\"id\":1493851,\"ignored\":false,\"lsKind\":\"protein\",\"lsLabels\":[{\"deleted\":false,\"id\":297595,\"ignored\":false,\"labelText\":\"Fielderase Z\",\"lsKind\":\"protein\",\"lsTransaction\":9999,\"lsType\":\"name\",\"lsTypeAndKind\":\"name_protein\",\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"jane\",\"recordedDate\":1375141504000}],\"lsStates\":[{\"deleted\":false,\"id\":2634314,\"ignored\":false,\"lsKind\":\"protein parent\",\"lsTransaction\":9999,\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_protein parent\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926359,\"ignored\":false,\"lsKind\":\"notebook\",\"lsTransaction\":9999,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"stringValue\":\"Notebook 1\",\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926361,\"ignored\":false,\"lsKind\":\"molecular weight\",\"lsTransaction\":9999,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_molecular weight\",\"numericValue\":890,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"unitKind\":\"g/mol\",\"unitType\":\"molecular weight\",\"unitTypeAndKind\":\"molecular weight_g/mol\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926360,\"ignored\":false,\"lsKind\":\"batch number\",\"lsTransaction\":9999,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_batch number\",\"numericValue\":0,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1342080000000,\"deleted\":false,\"id\":5926358,\"ignored\":false,\"lsKind\":\"completion date\",\"lsTransaction\":9999,\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"unitTypeAndKind\":\"null_null\"}],\"recordedBy\":\"jane\",\"recordedDate\":1375141460000}],\"lsTags\":[],\"lsTransaction\":9999,\"lsType\":\"parent\",\"lsTypeAndKind\":\"parent_protein\",\"recordedBy\":\"jane\",\"recordedDate\":1375141508000,\"secondLsThings\":[]}";
+		MockHttpServletResponse response = this.mockMvc
+				.perform(put("/api/v1/lsthings/parent/protein/PRTN000015?with=nested")
+						.contentType(MediaType.APPLICATION_JSON)
+						.content(json)
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		LsThing postedLsThing = LsThing.fromJsonToLsThing(responseJson);
+		logger.info(postedLsThing.toJson());
+	}
+
+	@Test
+	@Rollback(value = true)
+	public void updateBatchInteractions() throws Exception {
+		// String json = "{\"lsType\":\"batch\",\"lsKind\":\"internalization
+		// agent\",\"corpName\":\"\",\"recordedBy\":\"bob\",\"recordedDate\":1428517111212,\"shortDescription\":\"
+		// \",\"lsLabels\":[],\"lsStates\":[{\"deleted\":false,\"id\":2649027,\"ignored\":false,\"lsKind\":\"internalization
+		// agent
+		// batch\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_internalization
+		// agent
+		// batch\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960432,\"ignored\":false,\"lsKind\":\"notebook\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"stringValue\":\"test\",\"unitTypeAndKind\":\"null_null\",\"version\":0,\"value\":\"test\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960435,\"ignored\":false,\"lsKind\":\"molecular
+		// weight\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_molecular
+		// weight\",\"numericValue\":123,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"unitKind\":\"kDa\",\"unitType\":\"molecular
+		// weight\",\"unitTypeAndKind\":\"molecular
+		// weight_kDa\",\"version\":0,\"value\":123},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960433,\"ignored\":true,\"lsKind\":\"purity\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_purity\",\"numericValue\":12,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"unitKind\":\"%
+		// purity\",\"unitType\":\"percentage\",\"unitTypeAndKind\":\"percentage_%
+		// purity\",\"version\":0,\"value\":121},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1428476400000,\"deleted\":false,\"id\":5960434,\"ignored\":false,\"lsKind\":\"completion
+		// date\",\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion
+		// date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"unitTypeAndKind\":\"null_null\",\"version\":0,\"value\":1428476400000},{\"codeOrigin\":\"ACAS
+		// authors\",\"codeTypeAndKind\":\"null_null\",\"codeValue\":\"egao\",\"deleted\":false,\"id\":5960438,\"ignored\":false,\"lsKind\":\"scientist\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_scientist\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"unitTypeAndKind\":\"null_null\",\"version\":0,\"value\":\"egao\"},{\"codeTypeAndKind\":\"null_null\",\"comments\":\"Testing
+		// (46).pdf\",\"deleted\":false,\"fileValue\":\"entities/internalizationAgents/I000012-6/Testing
+		// (46).pdf\",\"id\":5960439,\"ignored\":false,\"lsKind\":\"gpc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_gpc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"unitTypeAndKind\":\"null_null\",\"version\":1},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960436,\"ignored\":false,\"lsKind\":\"source
+		// id\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_source
+		// id\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"stringValue\":\"\",\"unitTypeAndKind\":\"null_null\",\"version\":0,\"value\":\"\"},{\"codeKind\":\"source\",\"codeOrigin\":\"ACAS
+		// DDICT\",\"codeType\":\"component\",\"codeTypeAndKind\":\"component_source\",\"codeValue\":\"ACAS\",\"deleted\":false,\"id\":5960437,\"ignored\":false,\"lsKind\":\"source\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_source\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"unitTypeAndKind\":\"null_null\",\"version\":0,\"value\":\"ACAS\"},{\"lsType\":\"numericValue\",\"lsKind\":\"purity\",\"ignored\":false,\"recordedDate\":1428517111212,\"recordedBy\":\"bob\",\"numericValue\":121,\"value\":121}],\"modifiedDate\":1428517031912,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"version\":2},{\"deleted\":false,\"id\":2649026,\"ignored\":false,\"lsKind\":\"inventory\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_inventory\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960430,\"ignored\":false,\"lsKind\":\"location\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_location\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"stringValue\":\"13\",\"unitTypeAndKind\":\"null_null\",\"version\":0,\"value\":\"13\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960431,\"ignored\":false,\"lsKind\":\"amount
+		// made\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_amount
+		// made\",\"numericValue\":23,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"unitKind\":\"g\",\"unitType\":\"mass\",\"unitTypeAndKind\":\"mass_g\",\"version\":0,\"value\":23}],\"modifiedDate\":1428517031934,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"version\":2}],\"codeName\":\"I000012-6\",\"deleted\":false,\"id\":1508706,\"ignored\":false,\"lsTags\":[],\"lsTypeAndKind\":\"batch_internalization
+		// agent\",\"modifiedDate\":1428517031909,\"version\":3,\"cid\":\"c346\",\"_changing\":false,\"_previousAttributes\":{\"lsType\":\"thing\",\"lsKind\":\"thing\",\"corpName\":\"\",\"recordedBy\":\"bob\",\"recordedDate\":1428517037610,\"shortDescription\":\"
+		// \",\"lsLabels\":[],\"lsStates\":[],\"firstLsThings\":[]},\"changed\":{\"secondLsThings\":[]},\"_pending\":false,\"urlRoot\":\"/api/things/batch/internalization
+		// agent\",\"lsProperties\":{\"defaultLabels\":[],\"defaultValues\":[{\"key\":\"scientist\",\"stateType\":\"metadata\",\"stateKind\":\"internalization
+		// agent
+		// batch\",\"type\":\"codeValue\",\"kind\":\"scientist\",\"codeOrigin\":\"ACAS
+		// authors\",\"value\":\"unassigned\"},{\"key\":\"completion
+		// date\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent
+		// batch\",\"type\":\"dateValue\",\"kind\":\"completion
+		// date\"},{\"key\":\"notebook\",\"stateType\":\"metadata\",\"stateKind\":\"internalization
+		// agent
+		// batch\",\"type\":\"stringValue\",\"kind\":\"notebook\"},{\"key\":\"source\",\"stateType\":\"metadata\",\"stateKind\":\"internalization
+		// agent
+		// batch\",\"type\":\"codeValue\",\"kind\":\"source\",\"value\":\"ACAS\",\"codeType\":\"component\",\"codeKind\":\"source\",\"codeOrigin\":\"ACAS
+		// DDICT\"},{\"key\":\"source
+		// id\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent
+		// batch\",\"type\":\"stringValue\",\"kind\":\"source id\"},{\"key\":\"molecular
+		// weight\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent
+		// batch\",\"type\":\"numericValue\",\"kind\":\"molecular
+		// weight\",\"unitType\":\"molecular
+		// weight\",\"unitKind\":\"kDa\"},{\"key\":\"purity\",\"stateType\":\"metadata\",\"stateKind\":\"internalization
+		// agent
+		// batch\",\"type\":\"numericValue\",\"kind\":\"purity\",\"unitType\":\"percentage\",\"unitKind\":\"%
+		// purity\"},{\"key\":\"amount
+		// made\",\"stateType\":\"metadata\",\"stateKind\":\"inventory\",\"type\":\"numericValue\",\"kind\":\"amount
+		// made\",\"unitType\":\"mass\",\"unitKind\":\"g\"},{\"key\":\"location\",\"stateType\":\"metadata\",\"stateKind\":\"inventory\",\"type\":\"stringValue\",\"kind\":\"location\"}],\"defaultFirstLsThingItx\":[],\"defaultSecondLsThingItx\":[]},\"className\":\"Thing\",\"validationError\":null,\"idAttribute\":\"id\",\"firstLsThings\":[],\"secondLsThings\":[{\"lsType\":\"incorporates\",\"lsKind\":\"assembly_component\",\"lsTypeAndKind\":\"incorporates_assembly_component\",\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"composition\",\"lsValues\":[{\"lsType\":\"numericValue\",\"lsKind\":\"order\",\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\",\"numericValue\":1}],\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\"}],\"recordedBy\":\"bob\",\"recordedDate\":1428517111206,\"secondLsThing\":{\"codeName\":\"PEG000010-2\",\"deleted\":false,\"id\":1508673,\"ignored\":false,\"lsKind\":\"peg\",\"lsLabels\":[],\"lsStates\":[{\"deleted\":false,\"id\":2648998,\"ignored\":false,\"lsKind\":\"inventory\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_inventory\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960363,\"ignored\":false,\"lsKind\":\"location\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_location\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"stringValue\":\"lab23\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960364,\"ignored\":false,\"lsKind\":\"amount
+		// made\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_amount
+		// made\",\"numericValue\":123,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"unitKind\":\"g\",\"unitType\":\"mass\",\"unitTypeAndKind\":\"mass_g\",\"version\":0}],\"modifiedDate\":1428516368847,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"version\":7},{\"deleted\":false,\"id\":2648997,\"ignored\":false,\"lsKind\":\"peg
+		// batch\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_peg
+		// batch\",\"lsValues\":[{\"codeOrigin\":\"ACAS
+		// authors\",\"codeTypeAndKind\":\"null_null\",\"codeValue\":\"egao\",\"deleted\":false,\"id\":5960362,\"ignored\":false,\"lsKind\":\"scientist\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_scientist\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960361,\"ignored\":false,\"lsKind\":\"purity\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_purity\",\"numericValue\":123,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"unitKind\":\"%
+		// purity\",\"unitType\":\"percentage\",\"unitTypeAndKind\":\"percentage_%
+		// purity\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1428390000000,\"deleted\":false,\"id\":5960360,\"ignored\":false,\"lsKind\":\"completion
+		// date\",\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion
+		// date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960358,\"ignored\":false,\"lsKind\":\"notebook\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"stringValue\":\"test\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960357,\"ignored\":false,\"lsKind\":\"source
+		// id\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_source
+		// id\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"stringValue\":\"\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeKind\":\"source\",\"codeOrigin\":\"ACAS
+		// DDICT\",\"codeType\":\"component\",\"codeTypeAndKind\":\"component_source\",\"codeValue\":\"ACAS\",\"deleted\":false,\"id\":5960359,\"ignored\":false,\"lsKind\":\"source\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_source\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"comments\":\"Testing
+		// (45).pdf\",\"deleted\":false,\"fileValue\":\"entities/pegs/PEG000010-2/Testing
+		// (45).pdf\",\"id\":5960356,\"ignored\":false,\"lsKind\":\"gpc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_gpc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"unitTypeAndKind\":\"null_null\",\"version\":1}],\"modifiedDate\":1428516368853,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"version\":7}],\"lsTags\":[],\"lsType\":\"batch\",\"lsTypeAndKind\":\"batch_peg\",\"modifiedDate\":1428516368844,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"version\":8},\"className\":\"SecondThingItx\",\"validationError\":null,\"idAttribute\":\"id\"},{\"lsType\":\"incorporates\",\"lsKind\":\"assembly_component\",\"lsTypeAndKind\":\"incorporates_assembly_component\",\"lsStates\":[{\"deleted\":false,\"id\":2649029,\"ignored\":false,\"lsKind\":\"composition\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_composition\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960441,\"ignored\":false,\"lsKind\":\"order\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_order\",\"numericValue\":1,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"\",\"recordedDate\":1428517031733,\"unitTypeAndKind\":\"null_null\",\"version\":0}],\"recordedBy\":\"\",\"recordedDate\":1428517031732,\"version\":1}],\"recordedBy\":\"bob\",\"recordedDate\":1428517031598,\"secondLsThing\":{\"codeName\":\"PEG000010-1\",\"deleted\":false,\"id\":1442921,\"ignored\":false,\"lsKind\":\"peg\",\"lsType\":\"batch\",\"lsTypeAndKind\":\"batch_peg\",\"modifiedDate\":1428516368872,\"recordedBy\":\"bob\",\"recordedDate\":1426100366796,\"version\":14},\"deleted\":false,\"id\":1508708,\"ignored\":true,\"version\":1,\"className\":\"SecondThingItx\",\"validationError\":null,\"idAttribute\":\"id\"}]}";
 		String json = "{\"codeName\":\"I000015-4\",\"deleted\":false,\"firstLsThings\":[],\"id\":1508776,\"ignored\":false,\"lsKind\":\"internalization agent\",\"lsLabels\":[],\"lsStates\":[{\"deleted\":false,\"id\":2649094,\"ignored\":false,\"lsKind\":\"internalization agent batch\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_internalization agent batch\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1428476400000,\"deleted\":false,\"id\":5960622,\"ignored\":false,\"lsKind\":\"completion date\",\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428526043830,\"unitTypeAndKind\":\"null_null\"},{\"codeOrigin\":\"ACAS authors\",\"codeTypeAndKind\":\"null_null\",\"codeValue\":\"egao\",\"deleted\":false,\"id\":5960620,\"ignored\":false,\"lsKind\":\"scientist\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_scientist\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428526043830,\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960625,\"ignored\":false,\"lsKind\":\"purity\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_purity\",\"numericValue\":132,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428526043830,\"unitKind\":\"% purity\",\"unitType\":\"percentage\",\"unitTypeAndKind\":\"percentage_% purity\"},{\"codeKind\":\"source\",\"codeOrigin\":\"ACAS DDICT\",\"codeType\":\"component\",\"codeTypeAndKind\":\"component_source\",\"codeValue\":\"ACAS\",\"deleted\":false,\"id\":5960623,\"ignored\":false,\"lsKind\":\"source\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_source\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428526043830,\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960618,\"ignored\":false,\"lsKind\":\"molecular weight\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_molecular weight\",\"numericValue\":123,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428526043830,\"unitKind\":\"kDa\",\"unitType\":\"molecular weight\",\"unitTypeAndKind\":\"molecular weight_kDa\"},{\"codeTypeAndKind\":\"null_null\",\"comments\":\"Testing (46).pdf\",\"deleted\":false,\"fileValue\":\"entities/internalizationAgents/I000015-4/Testing (46).pdf\",\"id\":5960624,\"ignored\":false,\"lsKind\":\"gpc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_gpc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428526043830,\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960619,\"ignored\":false,\"lsKind\":\"notebook\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428526043830,\"stringValue\":\"test\",\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960621,\"ignored\":false,\"lsKind\":\"source id\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_source id\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428526043830,\"stringValue\":\"\",\"unitTypeAndKind\":\"null_null\"}],\"modifiedDate\":1428526315002,\"recordedBy\":\"bob\",\"recordedDate\":1428526043830},{\"deleted\":false,\"id\":2649093,\"ignored\":false,\"lsKind\":\"inventory\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_inventory\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960617,\"ignored\":false,\"lsKind\":\"amount made\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_amount made\",\"numericValue\":132,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428526043830,\"unitKind\":\"g\",\"unitType\":\"mass\",\"unitTypeAndKind\":\"mass_g\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960616,\"ignored\":false,\"lsKind\":\"location\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_location\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428526043830,\"stringValue\":\"lab\",\"unitTypeAndKind\":\"null_null\"}],\"modifiedDate\":1428526314953,\"recordedBy\":\"bob\",\"recordedDate\":1428526043830}],\"lsTags\":[],\"lsType\":\"batch\",\"lsTypeAndKind\":\"batch_internalization agent\",\"modifiedDate\":1428526314898,\"recordedBy\":\"bob\",\"recordedDate\":1428526315031,\"secondLsThings\":[{\"deleted\":false,\"id\":1508779,\"ignored\":false,\"lsKind\":\"batch_parent\",\"lsStates\":[],\"lsType\":\"instantiates\",\"lsTypeAndKind\":\"instantiates_batch_parent\",\"recordedBy\":\"bob\",\"recordedDate\":1428526043830,\"secondLsThing\":{\"codeName\":\"I000015\",\"deleted\":false,\"id\":1508754,\"ignored\":false,\"lsKind\":\"internalization agent\",\"lsType\":\"parent\",\"lsTypeAndKind\":\"parent_internalization agent\",\"modifiedDate\":1428524476945,\"recordedBy\":\"bob\",\"recordedDate\":1428524477527}},{\"deleted\":false,\"id\":1508780,\"ignored\":false,\"lsKind\":\"assembly_component\",\"lsStates\":[{\"deleted\":false,\"id\":2649097,\"ignored\":false,\"lsKind\":\"composition\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_composition\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960628,\"ignored\":false,\"lsKind\":\"order\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_order\",\"numericValue\":2.000000000000000000,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"\",\"recordedDate\":1428526315511,\"unitTypeAndKind\":\"null_null\"}],\"recordedBy\":\"\",\"recordedDate\":1428526315509}],\"lsType\":\"incorporates\",\"lsTypeAndKind\":\"incorporates_assembly_component\",\"recordedBy\":\"bob\",\"recordedDate\":1428526315025,\"secondLsThing\":{\"codeName\":\"PEG000010-2\",\"deleted\":false,\"id\":1508673,\"ignored\":true,\"lsKind\":\"peg\",\"lsType\":\"batch\",\"lsTypeAndKind\":\"batch_peg\",\"modifiedDate\":1428502760820,\"recordedBy\":\"bob\",\"recordedDate\":1428421881473}},{\"deleted\":false,\"id\":1508778,\"ignored\":true,\"lsKind\":\"assembly_component\",\"lsStates\":[{\"deleted\":false,\"ignored\":false,\"lsKind\":\"composition\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_composition\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"order\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_order\",\"numericValue\":2.000000000000000000,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"\",\"recordedDate\":1428526315511,\"unitTypeAndKind\":\"null_null\"}],\"recordedBy\":\"\",\"recordedDate\":1428526315509}],\"lsType\":\"incorporates\",\"lsTypeAndKind\":\"incorporates_assembly_component\",\"modifiedDate\":1428526315175,\"recordedBy\":\"bob\",\"recordedDate\":1428526043829,\"secondLsThing\":{\"codeName\":\"PEG000010-1\",\"deleted\":false,\"id\":1442921,\"ignored\":false,\"lsKind\":\"peg\",\"lsType\":\"batch\",\"lsTypeAndKind\":\"batch_peg\",\"modifiedDate\":1428502763554,\"recordedBy\":\"bob\",\"recordedDate\":1426075166796}},{\"deleted\":false,\"id\":1508777,\"ignored\":false,\"lsKind\":\"assembly_component\",\"lsStates\":[{\"deleted\":false,\"ignored\":false,\"lsKind\":\"composition\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_composition\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"order\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_order\",\"numericValue\":1.000000000000000000,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"\",\"recordedDate\":1428526315511,\"unitTypeAndKind\":\"null_null\"}],\"recordedBy\":\"\",\"recordedDate\":1428526315509}],\"lsType\":\"incorporates\",\"lsTypeAndKind\":\"incorporates_assembly_component\",\"modifiedDate\":1428526315362,\"recordedBy\":\"bob\",\"recordedDate\":1428526043827,\"secondLsThing\":{\"codeName\":\"CB000078-1\",\"deleted\":false,\"id\":1386395,\"ignored\":false,\"lsKind\":\"cationic block\",\"lsType\":\"batch\",\"lsTypeAndKind\":\"batch_cationic block\",\"modifiedDate\":1428526397033,\"recordedBy\":\"bob\",\"recordedDate\":1424799163633}}]}";
-		MockHttpServletResponse response = this.mockMvc.perform(put("/api/v1/lsthings/batch/internalization agent/I000015-4?with=nestedfull")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-//    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	LsThing updatedLsThing = LsThing.fromJsonToLsThing(responseJson);
+		MockHttpServletResponse response = this.mockMvc
+				.perform(put("/api/v1/lsthings/batch/internalization agent/I000015-4?with=nestedfull")
+						.contentType(MediaType.APPLICATION_JSON)
+						.content(json)
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				// .andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		LsThing updatedLsThing = LsThing.fromJsonToLsThing(responseJson);
 		logger.info(updatedLsThing.toJsonWithNestedFull());
 		Assert.assertEquals(2, updatedLsThing.getSecondLsThings().size());
 		Assert.assertEquals(1, updatedLsThing.getSecondLsThings().iterator().next().getLsStates().size());
 	}
-    
-    @Test
-    @Transactional
-    public void documentManagerSearchTest1() throws Exception {
-    	String searchTerms=""
-    			+ "documentType=MTA"
-    			+ "&documentCode=MTA"
-    			+ "&titleContains=test"
-    			+ "&amountFrom=0"
-    			+ "&amountTo=190"
-    			+ "&createdDateFrom=1439704800000"
-    			+ "&createdDateTo=1440223200000"
-    			+ "&active=true"
-    			+ "&termType=TTYP-00000002"
-    			+ "&daysBeforeTerm=1"
-    			+ "&termDateFrom=1430309600000"
-    			+ "&termDateTo=1440828000000"
-    			+ "&nonSolicit=no"
-    			+ "&nonTransfer=yes"
-//    			+ "&restrictedMaterialsContains=restricted"
-    			+ "&project=PROJ-00000002"
-    			+ "&company=COMP-00000002"
-    			+ "&owner=OWNR-00000002"
-    			+ "&termType=TTYP-00000002"
-    			+ "&with=nestedFull"
-    			+ "";
-    	logger.info("GET on url: /api/v1/lsthings/documentmanagersearch?"+searchTerms);
-    	 String json = this.mockMvc.perform(get("/api/v1/lsthings/documentmanagersearch?"+searchTerms)
-         		.contentType(MediaType.APPLICATION_JSON)
-         		.accept(MediaType.APPLICATION_JSON))
-         		.andExpect(status().isOk())
-         		.andExpect(content().contentType("application/json"))
-         		.andReturn().getResponse().getContentAsString();
-         
-         logger.info(json);
-         Collection<LsThing> lsThings = LsThing.fromJsonArrayToLsThings(json);
-         Assert.assertEquals(1, lsThings.size());
-         logger.info(LsThing.toJsonArray(lsThings));
-    }
-    
-    @Test
-    public void getComponentBatchesAndCheckOrder() throws Exception {
-    	String parentCodeName = "CB000020";
-        String json = this.mockMvc.perform(get("/api/v1/lsthings/parent/linker small molecule/getbatches/"+parentCodeName)
-        		.contentType(MediaType.APPLICATION_JSON)
-        		.accept(MediaType.APPLICATION_JSON))
-        		.andExpect(status().isOk())
-        		.andExpect(content().contentType("application/json"))
-        		.andReturn().getResponse().getContentAsString();
-        
-        logger.info(json);
-        Collection<LsThing> lsThings = LsThing.fromJsonArrayToLsThings(json);
-        int batchNo = 1;
-        for (LsThing lsThing: lsThings){
-        	logger.info(lsThing.getCodeName());
-        	Assert.assertEquals(parentCodeName+"-"+batchNo, lsThing.getCodeName());
-        	batchNo++;
-        }
-    }
-    
-    @Test
-    public void deleteLsThing() throws Exception {
-    	String parentCodeName = "PROT000004";
-        String json = this.mockMvc.perform(MockMvcRequestBuilders.delete("/api/v1/lsthings/default/default/"+parentCodeName)
-        		.contentType(MediaType.APPLICATION_JSON))
-        		.andExpect(status().isOk())
-        		.andReturn().getResponse().getContentAsString();
-        Assert.assertEquals("",json);
-    }
-    
-    @Test
-    public void deleteLsThingFail() throws Exception {
-    	String parentCodeName = "alkdsfngakjdsgn23894273429";
-        String json = this.mockMvc.perform(MockMvcRequestBuilders.delete("/api/v1/lsthings/default/default/"+parentCodeName)
-        		.contentType(MediaType.APPLICATION_JSON))
-        		.andExpect(status().isNotFound())
-        		.andReturn().getResponse().getContentAsString();
-        Collection<ErrorMessage> errors = ErrorMessage.fromJsonArrayToErrorMessages(json);
-        Assert.assertEquals(1, errors.size());
-    }
-    
-    @Transactional
-	@Test
-	public void checkBatchDependencies() throws Exception{
-    	String codeName = "PEG000003-1";
-        String json = this.mockMvc.perform(get("/api/v1/lsthings/batch/peg/checkDependencies/"+codeName)
-        		.contentType(MediaType.APPLICATION_JSON)
-        		.accept(MediaType.APPLICATION_JSON))
-        		.andExpect(status().isOk())
-        		.andExpect(content().contentType("application/json"))
-        		.andReturn().getResponse().getContentAsString();
-        
+
+	@Test
+	@Transactional
+	public void documentManagerSearchTest1() throws Exception {
+		String searchTerms = ""
+				+ "documentType=MTA"
+				+ "&documentCode=MTA"
+				+ "&titleContains=test"
+				+ "&amountFrom=0"
+				+ "&amountTo=190"
+				+ "&createdDateFrom=1439704800000"
+				+ "&createdDateTo=1440223200000"
+				+ "&active=true"
+				+ "&termType=TTYP-00000002"
+				+ "&daysBeforeTerm=1"
+				+ "&termDateFrom=1430309600000"
+				+ "&termDateTo=1440828000000"
+				+ "&nonSolicit=no"
+				+ "&nonTransfer=yes"
+				// + "&restrictedMaterialsContains=restricted"
+				+ "&project=PROJ-00000002"
+				+ "&company=COMP-00000002"
+				+ "&owner=OWNR-00000002"
+				+ "&termType=TTYP-00000002"
+				+ "&with=nestedFull"
+				+ "";
+		logger.info("GET on url: /api/v1/lsthings/documentmanagersearch?" + searchTerms);
+		String json = this.mockMvc.perform(get("/api/v1/lsthings/documentmanagersearch?" + searchTerms)
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+
+		logger.info(json);
+		Collection<LsThing> lsThings = LsThing.fromJsonArrayToLsThings(json);
+		Assert.assertEquals(1, lsThings.size());
+		logger.info(LsThing.toJsonArray(lsThings));
+	}
+
+	@Test
+	public void getComponentBatchesAndCheckOrder() throws Exception {
+		String parentCodeName = "CB000020";
+		String json = this.mockMvc
+				.perform(get("/api/v1/lsthings/parent/linker small molecule/getbatches/" + parentCodeName)
+						.contentType(MediaType.APPLICATION_JSON)
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+
+		logger.info(json);
+		Collection<LsThing> lsThings = LsThing.fromJsonArrayToLsThings(json);
+		int batchNo = 1;
+		for (LsThing lsThing : lsThings) {
+			logger.info(lsThing.getCodeName());
+			Assert.assertEquals(parentCodeName + "-" + batchNo, lsThing.getCodeName());
+			batchNo++;
+		}
+	}
+
+	@Test
+	public void deleteLsThing() throws Exception {
+		String parentCodeName = "PROT000004";
+		String json = this.mockMvc
+				.perform(MockMvcRequestBuilders.delete("/api/v1/lsthings/default/default/" + parentCodeName)
+						.contentType(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andReturn().getResponse().getContentAsString();
+		Assert.assertEquals("", json);
+	}
+
+	@Test
+	public void deleteLsThingFail() throws Exception {
+		String parentCodeName = "alkdsfngakjdsgn23894273429";
+		String json = this.mockMvc
+				.perform(MockMvcRequestBuilders.delete("/api/v1/lsthings/default/default/" + parentCodeName)
+						.contentType(MediaType.APPLICATION_JSON))
+				.andExpect(status().isNotFound())
+				.andReturn().getResponse().getContentAsString();
+		Collection<ErrorMessage> errors = ErrorMessage.fromJsonArrayToErrorMessages(json);
+		Assert.assertEquals(1, errors.size());
+	}
+
+	@Transactional
+	@Test
+	public void checkBatchDependencies() throws Exception {
+		String codeName = "PEG000003-1";
+		String json = this.mockMvc.perform(get("/api/v1/lsthings/batch/peg/checkDependencies/" + codeName)
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+
 		DependencyCheckDTO result = DependencyCheckDTO.fromJsonToDependencyCheckDTO(json);
 		logger.info(result.toJson());
 		Assert.assertTrue(result.getLinkedDataExists());
 	}
-	
+
 	@Transactional
 	@Test
-	public void checkParentDependencies() throws Exception{
+	public void checkParentDependencies() throws Exception {
 		String codeName = "PEG000003";
-        String json = this.mockMvc.perform(get("/api/v1/lsthings/parent/peg/checkDependencies/"+codeName)
-        		.contentType(MediaType.APPLICATION_JSON)
-        		.accept(MediaType.APPLICATION_JSON))
-        		.andExpect(status().isOk())
-        		.andExpect(content().contentType("application/json"))
-        		.andReturn().getResponse().getContentAsString();
-        
+		String json = this.mockMvc.perform(get("/api/v1/lsthings/parent/peg/checkDependencies/" + codeName)
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+
 		DependencyCheckDTO result = DependencyCheckDTO.fromJsonToDependencyCheckDTO(json);
 		logger.info(result.toJson());
 		Assert.assertTrue(result.getLinkedDataExists());
 	}
-	
+
 	@Transactional
 	@Test
-	public void deleteBatch() throws Exception{
+	public void deleteBatch() throws Exception {
 		String codeName = "CB000004-6";
-        String json = this.mockMvc.perform(MockMvcRequestBuilders.delete("/api/v1/lsthings/batch/cationic block/deleteBatch/"+codeName)
-        		.contentType(MediaType.APPLICATION_JSON)
-        		.accept(MediaType.APPLICATION_JSON))
-        		.andExpect(status().isOk())
-        		.andExpect(content().contentType("application/json"))
-        		.andReturn().getResponse().getContentAsString();
-	}
-	
+		String json = this.mockMvc
+				.perform(MockMvcRequestBuilders.delete("/api/v1/lsthings/batch/cationic block/deleteBatch/" + codeName)
+						.contentType(MediaType.APPLICATION_JSON)
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+	}
+
 	@Transactional
 	@Test
-	public void deleteBatchError() throws Exception{
+	public void deleteBatchError() throws Exception {
 		String codeName = "CB000004-6";
-        String json = this.mockMvc.perform(MockMvcRequestBuilders.delete("/api/v1/lsthings/parent/cationic block/deleteBatch/"+codeName)
-        		.contentType(MediaType.APPLICATION_JSON)
-        		.accept(MediaType.APPLICATION_JSON))
-        		.andExpect(status().isInternalServerError())
-        		.andExpect(content().contentType("application/json"))
-        		.andReturn().getResponse().getContentAsString();
-        logger.info(json);
-	}
-	
+		String json = this.mockMvc
+				.perform(MockMvcRequestBuilders.delete("/api/v1/lsthings/parent/cationic block/deleteBatch/" + codeName)
+						.contentType(MediaType.APPLICATION_JSON)
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isInternalServerError())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+		logger.info(json);
+	}
+
 	@Transactional
 	@Test
-	public void deleteParent() throws Exception{
+	public void deleteParent() throws Exception {
 		String codeName = "CB000004";
-        String json = this.mockMvc.perform(MockMvcRequestBuilders.delete("/api/v1/lsthings/parent/cationic block/deleteParent/"+codeName)
-        		.contentType(MediaType.APPLICATION_JSON)
-        		.accept(MediaType.APPLICATION_JSON))
-        		.andExpect(status().isOk())
-        		.andExpect(content().contentType("application/json"))
-        		.andReturn().getResponse().getContentAsString();
-	}
-	
+		String json = this.mockMvc
+				.perform(
+						MockMvcRequestBuilders.delete("/api/v1/lsthings/parent/cationic block/deleteParent/" + codeName)
+								.contentType(MediaType.APPLICATION_JSON)
+								.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+	}
+
 	@Transactional
 	@Test
-	public void deleteParentError() throws Exception{
+	public void deleteParentError() throws Exception {
 		String codeName = "CB000004-6";
-        String json = this.mockMvc.perform(MockMvcRequestBuilders.delete("/api/v1/lsthings/batch/cationic block/deleteParent/"+codeName)
-        		.contentType(MediaType.APPLICATION_JSON)
-        		.accept(MediaType.APPLICATION_JSON))
-        		.andExpect(status().isInternalServerError())
-        		.andExpect(content().contentType("application/json"))
-        		.andReturn().getResponse().getContentAsString();
-        logger.info(json);
-	}
-	
-	@Test
-    @Transactional
-    public void structureSearch() throws Exception {
-		String queryMol= "\n  Mrv1641110051619032D          \n\n  5  5  0  0  0  0            999 V2000\n   -0.0446    0.6125    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.7121    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.4572   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.3679   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.6228    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n  2  3  1  0  0  0  0\n  3  4  1  0  0  0  0\n  4  5  1  0  0  0  0\n  1  2  1  0  0  0  0\n  1  5  1  0  0  0  0\nM  END\n";
+		String json = this.mockMvc
+				.perform(MockMvcRequestBuilders.delete("/api/v1/lsthings/batch/cationic block/deleteParent/" + codeName)
+						.contentType(MediaType.APPLICATION_JSON)
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isInternalServerError())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+		logger.info(json);
+	}
+
+	@Test
+	@Transactional
+	public void structureSearch() throws Exception {
+		String queryMol = "\n  Mrv1641110051619032D          \n\n  5  5  0  0  0  0            999 V2000\n   -0.0446    0.6125    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.7121    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.4572   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.3679   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.6228    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n  2  3  1  0  0  0  0\n  3  4  1  0  0  0  0\n  4  5  1  0  0  0  0\n  1  2  1  0  0  0  0\n  1  5  1  0  0  0  0\nM  END\n";
 		StructureSearchDTO query = new StructureSearchDTO(queryMol, "", "", "SUBSTRUCTURE", 10, null);
 		String json = query.toJson();
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/lsthings/structureSearch")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-//    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.debug(responseJson);
-    	Collection<LsThing> searchResults = LsThing.fromJsonArrayToLsThings(responseJson);
-    	Assert.assertFalse(searchResults.isEmpty());
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/lsthings/structureSearch")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(json)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				// .andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.debug(responseJson);
+		Collection<LsThing> searchResults = LsThing.fromJsonArrayToLsThings(responseJson);
+		Assert.assertFalse(searchResults.isEmpty());
 		logger.debug(LsThing.toJsonArray(searchResults));
-    }
-	
-	@Test
-    public void searchReturnWithFirstLsThings() throws Exception {
-        String json = this.mockMvc.perform(get("/api/v1/lsthings/search?lsType=batch&with=firstLsThings&q=LSMB000005")
-        		.contentType(MediaType.APPLICATION_JSON)
-        		.accept(MediaType.APPLICATION_JSON))
-        		.andExpect(status().isOk())
-        		.andExpect(content().contentType("application/json"))
-        		.andReturn().getResponse().getContentAsString();
-        
-        logger.info(json);
-        Collection<LsThing> lsThings = LsThing.fromJsonArrayToLsThings(json);
-        for (LsThing lsThing : lsThings){
-        	Assert.assertNotNull(lsThing.getFirstLsThings());
-        	Assert.assertTrue(!lsThing.getFirstLsThings().isEmpty());
-        	for (ItxLsThingLsThing firstItx : lsThing.getFirstLsThings()){
-        		Assert.assertNotNull(firstItx.getFirstLsThing());
-        	}
-        }
-    }
-	
-	@Test
-    public void searchReturnWithSecondLsThings() throws Exception {
-        String json = this.mockMvc.perform(get("/api/v1/lsthings/search?lsType=batch&with=secondLsThings&q=LSMB000005")
-        		.contentType(MediaType.APPLICATION_JSON)
-        		.accept(MediaType.APPLICATION_JSON))
-        		.andExpect(status().isOk())
-        		.andExpect(content().contentType("application/json"))
-        		.andReturn().getResponse().getContentAsString();
-        
-        logger.info(json);
-        Collection<LsThing> lsThings = LsThing.fromJsonArrayToLsThings(json);
-        for (LsThing lsThing : lsThings){
-        	Assert.assertNotNull(lsThing.getSecondLsThings());
-        	Assert.assertTrue(!lsThing.getSecondLsThings().isEmpty());
-        	for (ItxLsThingLsThing secondItx : lsThing.getSecondLsThings()){
-        		Assert.assertNotNull(secondItx.getSecondLsThing());
-        	}
-        }
-    }
+	}
+
+	@Test
+	public void searchReturnWithFirstLsThings() throws Exception {
+		String json = this.mockMvc.perform(get("/api/v1/lsthings/search?lsType=batch&with=firstLsThings&q=LSMB000005")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+
+		logger.info(json);
+		Collection<LsThing> lsThings = LsThing.fromJsonArrayToLsThings(json);
+		for (LsThing lsThing : lsThings) {
+			Assert.assertNotNull(lsThing.getFirstLsThings());
+			Assert.assertTrue(!lsThing.getFirstLsThings().isEmpty());
+			for (ItxLsThingLsThing firstItx : lsThing.getFirstLsThings()) {
+				Assert.assertNotNull(firstItx.getFirstLsThing());
+			}
+		}
+	}
+
+	@Test
+	public void searchReturnWithSecondLsThings() throws Exception {
+		String json = this.mockMvc.perform(get("/api/v1/lsthings/search?lsType=batch&with=secondLsThings&q=LSMB000005")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+
+		logger.info(json);
+		Collection<LsThing> lsThings = LsThing.fromJsonArrayToLsThings(json);
+		for (LsThing lsThing : lsThings) {
+			Assert.assertNotNull(lsThing.getSecondLsThings());
+			Assert.assertTrue(!lsThing.getSecondLsThings().isEmpty());
+			for (ItxLsThingLsThing secondItx : lsThing.getSecondLsThings()) {
+				Assert.assertNotNull(secondItx.getSecondLsThing());
+			}
+		}
+	}
 
 }
\ No newline at end of file
diff --git a/src/test/java/com/labsynch/labseer/api/ApiProtocolControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiProtocolControllerTest.java
index 43463e182..5a1f57a5a 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiProtocolControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiProtocolControllerTest.java
@@ -39,204 +39,211 @@
 @ContextConfiguration(locations = {
 		"classpath:/META-INF/spring/applicationContext.xml",
 		"classpath:/META-INF/spring/applicationContext-security.xml",
-		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml"})
+		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml" })
 public class ApiProtocolControllerTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiProtocolControllerTest.class);
-	
-    @Autowired
-    private WebApplicationContext wac;
-
-    private MockMvc mockMvc;
-
-    @Before
-    public void setup() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-    }
-    
-    @Test
-    public void genericSearchByScientist() throws Exception {
-    	String searchString = "bfielder";
-    	String responseJson =  this.mockMvc.perform(get("/api/v1/protocols/search?q="+searchString)
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(responseJson.toString());
-    	Collection<Protocol> results = Protocol.fromJsonArrayToProtocols(responseJson);
-    	Assert.assertFalse(results.isEmpty());
-    }
-    
-    @Test
-    public void genericSearchByDate() throws Exception {
-    	String searchString = "2015-03-06";
-    	String responseJson =  this.mockMvc.perform(get("/api/v1/protocols/search?q="+searchString)
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(responseJson.toString());
-    	Collection<Protocol> results = Protocol.fromJsonArrayToProtocols(responseJson);
-    	Assert.assertFalse(results.isEmpty());
-    }
-    
-    @Test
-    public void genericSearchWithProjectRoles() throws Exception {
-    	//see instructions on ProtocolServiceTest for setup to search by project roles
-    	//this test verifies the ApiProtocolController search route is using project roles
-    	String projectCode = ProtocolValue.findProtocolValuesByLsKindEqualsAndCodeValueLike("project", "*").getResultList().get(0).getCodeValue();
+
+	@Autowired
+	private WebApplicationContext wac;
+
+	private MockMvc mockMvc;
+
+	@Before
+	public void setup() {
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	}
+
+	@Test
+	public void genericSearchByScientist() throws Exception {
+		String searchString = "bfielder";
+		String responseJson = this.mockMvc.perform(get("/api/v1/protocols/search?q=" + searchString)
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+		logger.info(responseJson.toString());
+		Collection<Protocol> results = Protocol.fromJsonArrayToProtocols(responseJson);
+		Assert.assertFalse(results.isEmpty());
+	}
+
+	@Test
+	public void genericSearchByDate() throws Exception {
+		String searchString = "2015-03-06";
+		String responseJson = this.mockMvc.perform(get("/api/v1/protocols/search?q=" + searchString)
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+		logger.info(responseJson.toString());
+		Collection<Protocol> results = Protocol.fromJsonArrayToProtocols(responseJson);
+		Assert.assertFalse(results.isEmpty());
+	}
+
+	@Test
+	public void genericSearchWithProjectRoles() throws Exception {
+		// see instructions on ProtocolServiceTest for setup to search by project roles
+		// this test verifies the ApiProtocolController search route is using project
+		// roles
+		String projectCode = ProtocolValue.findProtocolValuesByLsKindEqualsAndCodeValueLike("project", "*")
+				.getResultList().get(0).getCodeValue();
 		logger.info(projectCode);
-		String userName = AuthorRole.findAuthorRolesByRoleEntry(LsRole.findLsRolesByLsTypeEqualsAndLsKindEquals("Project", projectCode).getResultList().get(0)).getResultList().get(0).getUserEntry().getUserName();
+		String userName = AuthorRole
+				.findAuthorRolesByRoleEntry(
+						LsRole.findLsRolesByLsTypeEqualsAndLsKindEquals("Project", projectCode).getResultList().get(0))
+				.getResultList().get(0).getUserEntry().getUserName();
 		String code = "PROT-00000006E";
 		String query = code;
-		logger.info("Searching with the query: "+ query + " with userName: "+userName);
-		
-		String responseJson =  this.mockMvc.perform(get("/api/v1/protocols/search?userName="+userName+"&q="+query)
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(responseJson.toString());
-    	Collection<Protocol> results = Protocol.fromJsonArrayToProtocols(responseJson);
-    	Assert.assertFalse(results.isEmpty());
-		
+		logger.info("Searching with the query: " + query + " with userName: " + userName);
+
+		String responseJson = this.mockMvc.perform(get("/api/v1/protocols/search?userName=" + userName + "&q=" + query)
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+		logger.info(responseJson.toString());
+		Collection<Protocol> results = Protocol.fromJsonArrayToProtocols(responseJson);
+		Assert.assertFalse(results.isEmpty());
+
 		userName = "bsplit";
-		logger.info("Searching with the query: "+ query + " with userName: "+userName);
-		
-		responseJson =  this.mockMvc.perform(get("/api/v1/protocols/search?userName="+userName+"&q="+query)
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(responseJson.toString());
-    	results = Protocol.fromJsonArrayToProtocols(responseJson);
-    	Assert.assertTrue(results.isEmpty());
-    }
-    
-    @Test
-    public void getProtocolsByCodeName_Stub() throws Exception {
-    	Collection<Protocol> experiments = Protocol.findAllProtocols();
-    	List<String> codeNames = new ArrayList<String>();
-    	for (Protocol experiment : experiments){
-    		codeNames.add("\""+experiment.getCodeName()+"\"");
-    	}
-    	String format = "stub";
-    	logger.info(codeNames.toString());
-    	String responseJson =  this.mockMvc.perform(post("/api/v1/protocols/codename/jsonArray?with="+format)
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(codeNames.toString())
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(responseJson.toString());
-    	Collection<ProtocolErrorMessageDTO> responses = ProtocolErrorMessageDTO.fromJsonArrayToProtocolErroes(responseJson);
-    	for (ProtocolErrorMessageDTO response : responses){
-    		Assert.assertNotNull(response.getProtocolCodeName());
-        	Assert.assertNotNull(response.getProtocol());
-        	Assert.assertTrue(response.getProtocol().getLsStates().isEmpty());
-        	Assert.assertNotNull(response.getProtocol().getLsLabels());
-        	Assert.assertTrue(!response.getProtocol().getLsLabels().isEmpty());
-    	}
-    }
-    
-    @Test
-    public void getProtocolsByCodeName_fullObject() throws Exception {
-    	Collection<Protocol> experiments = Protocol.findAllProtocols();
-    	List<String> codeNames = new ArrayList<String>();
-    	for (Protocol experiment : experiments){
-    		codeNames.add("\""+experiment.getCodeName()+"\"");
-    	}
-    	String format = "fullObject";
-    	logger.info(codeNames.toString());
-    	String responseJson =  this.mockMvc.perform(post("/api/v1/protocols/codename/jsonArray?with="+format)
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(codeNames.toString())
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(responseJson.toString());
-    	Collection<ProtocolErrorMessageDTO> responses = ProtocolErrorMessageDTO.fromJsonArrayToProtocolErroes(responseJson);
-    	for (ProtocolErrorMessageDTO response : responses){
-    		Assert.assertNotNull(response.getProtocolCodeName());
-        	Assert.assertNotNull(response.getProtocol());
-        	Assert.assertNotNull(response.getProtocol().getLsStates());
-        	Assert.assertTrue(!response.getProtocol().getLsStates().isEmpty());
-        	Assert.assertNotNull(response.getProtocol().getLsLabels());
-        	Assert.assertTrue(!response.getProtocol().getLsLabels().isEmpty());
-    	}
-    }
-    
-    @Test
-    public void getProtocolCodeTables() throws Exception {
-    	String responseJson =  this.mockMvc.perform(get("/api/v1/protocols/codetable")
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(responseJson.toString());
-    	Collection<CodeTableDTO> responses = CodeTableDTO.fromJsonArrayToCoes(responseJson);
-    	for (CodeTableDTO response : responses){
-    		Assert.assertNotNull(response.getCode());
-        	Assert.assertNotNull(response.getName());
-        	Assert.assertNotNull(response.getId());
-    	}
-    }
-    
-    @Test
-    public void getProtocolCodeTablesByLsKind() throws Exception {
-    	Protocol protocol = Protocol.findProtocolEntries(0, 1).get(0);
-    	String responseJson =  this.mockMvc.perform(get("/api/v1/protocols/codetable?lsKind="+protocol.getLsKind())
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(responseJson.toString());
-    	Collection<CodeTableDTO> responses = CodeTableDTO.fromJsonArrayToCoes(responseJson);
-    	for (CodeTableDTO response : responses){
-    		Assert.assertNotNull(response.getCode());
-        	Assert.assertNotNull(response.getName());
-        	Assert.assertNotNull(response.getId());
-    	}
-    }
-    
-    @Test
-    public void getProtocolCodeTablesByName() throws Exception {
-    	ProtocolLabel label = ProtocolLabel.findProtocolLabelEntries(0, 1).get(0);
-    	String responseJson =  this.mockMvc.perform(get("/api/v1/protocols/codetable?protocolName="+label.getLabelText())
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(responseJson.toString());
-    	Collection<CodeTableDTO> responses = CodeTableDTO.fromJsonArrayToCoes(responseJson);
-    	for (CodeTableDTO response : responses){
-    		Assert.assertNotNull(response.getCode());
-        	Assert.assertNotNull(response.getName());
-        	Assert.assertNotNull(response.getId());
-    	}
-    }
-    
-    @Test
-    public void getProtocolCodesByDateValueComparison() throws Exception {
-    	DateValueComparisonRequest request = new DateValueComparisonRequest();
+		logger.info("Searching with the query: " + query + " with userName: " + userName);
+
+		responseJson = this.mockMvc.perform(get("/api/v1/protocols/search?userName=" + userName + "&q=" + query)
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+		logger.info(responseJson.toString());
+		results = Protocol.fromJsonArrayToProtocols(responseJson);
+		Assert.assertTrue(results.isEmpty());
+	}
+
+	@Test
+	public void getProtocolsByCodeName_Stub() throws Exception {
+		Collection<Protocol> experiments = Protocol.findAllProtocols();
+		List<String> codeNames = new ArrayList<String>();
+		for (Protocol experiment : experiments) {
+			codeNames.add("\"" + experiment.getCodeName() + "\"");
+		}
+		String format = "stub";
+		logger.info(codeNames.toString());
+		String responseJson = this.mockMvc.perform(post("/api/v1/protocols/codename/jsonArray?with=" + format)
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(codeNames.toString())
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andReturn().getResponse().getContentAsString();
+		logger.info(responseJson.toString());
+		Collection<ProtocolErrorMessageDTO> responses = ProtocolErrorMessageDTO
+				.fromJsonArrayToProtocolErroes(responseJson);
+		for (ProtocolErrorMessageDTO response : responses) {
+			Assert.assertNotNull(response.getProtocolCodeName());
+			Assert.assertNotNull(response.getProtocol());
+			Assert.assertTrue(response.getProtocol().getLsStates().isEmpty());
+			Assert.assertNotNull(response.getProtocol().getLsLabels());
+			Assert.assertTrue(!response.getProtocol().getLsLabels().isEmpty());
+		}
+	}
+
+	@Test
+	public void getProtocolsByCodeName_fullObject() throws Exception {
+		Collection<Protocol> experiments = Protocol.findAllProtocols();
+		List<String> codeNames = new ArrayList<String>();
+		for (Protocol experiment : experiments) {
+			codeNames.add("\"" + experiment.getCodeName() + "\"");
+		}
+		String format = "fullObject";
+		logger.info(codeNames.toString());
+		String responseJson = this.mockMvc.perform(post("/api/v1/protocols/codename/jsonArray?with=" + format)
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(codeNames.toString())
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andReturn().getResponse().getContentAsString();
+		logger.info(responseJson.toString());
+		Collection<ProtocolErrorMessageDTO> responses = ProtocolErrorMessageDTO
+				.fromJsonArrayToProtocolErroes(responseJson);
+		for (ProtocolErrorMessageDTO response : responses) {
+			Assert.assertNotNull(response.getProtocolCodeName());
+			Assert.assertNotNull(response.getProtocol());
+			Assert.assertNotNull(response.getProtocol().getLsStates());
+			Assert.assertTrue(!response.getProtocol().getLsStates().isEmpty());
+			Assert.assertNotNull(response.getProtocol().getLsLabels());
+			Assert.assertTrue(!response.getProtocol().getLsLabels().isEmpty());
+		}
+	}
+
+	@Test
+	public void getProtocolCodeTables() throws Exception {
+		String responseJson = this.mockMvc.perform(get("/api/v1/protocols/codetable")
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andReturn().getResponse().getContentAsString();
+		logger.info(responseJson.toString());
+		Collection<CodeTableDTO> responses = CodeTableDTO.fromJsonArrayToCoes(responseJson);
+		for (CodeTableDTO response : responses) {
+			Assert.assertNotNull(response.getCode());
+			Assert.assertNotNull(response.getName());
+			Assert.assertNotNull(response.getId());
+		}
+	}
+
+	@Test
+	public void getProtocolCodeTablesByLsKind() throws Exception {
+		Protocol protocol = Protocol.findProtocolEntries(0, 1).get(0);
+		String responseJson = this.mockMvc.perform(get("/api/v1/protocols/codetable?lsKind=" + protocol.getLsKind())
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andReturn().getResponse().getContentAsString();
+		logger.info(responseJson.toString());
+		Collection<CodeTableDTO> responses = CodeTableDTO.fromJsonArrayToCoes(responseJson);
+		for (CodeTableDTO response : responses) {
+			Assert.assertNotNull(response.getCode());
+			Assert.assertNotNull(response.getName());
+			Assert.assertNotNull(response.getId());
+		}
+	}
+
+	@Test
+	public void getProtocolCodeTablesByName() throws Exception {
+		ProtocolLabel label = ProtocolLabel.findProtocolLabelEntries(0, 1).get(0);
+		String responseJson = this.mockMvc
+				.perform(get("/api/v1/protocols/codetable?protocolName=" + label.getLabelText())
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andReturn().getResponse().getContentAsString();
+		logger.info(responseJson.toString());
+		Collection<CodeTableDTO> responses = CodeTableDTO.fromJsonArrayToCoes(responseJson);
+		for (CodeTableDTO response : responses) {
+			Assert.assertNotNull(response.getCode());
+			Assert.assertNotNull(response.getName());
+			Assert.assertNotNull(response.getId());
+		}
+	}
+
+	@Test
+	public void getProtocolCodesByDateValueComparison() throws Exception {
+		DateValueComparisonRequest request = new DateValueComparisonRequest();
 		request.setStateType("metadata");
 		request.setStateKind("protocol metadata");
 		request.setValueKind("completion date");
 		request.setSecondsDelta(60);
-		
+
 		String requestJson = request.toJson();
-		
+
 		logger.info(requestJson);
-    	String responseJson =  this.mockMvc.perform(post("/api/v1/protocols/getProtocolCodesByDateValueComparison")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(requestJson)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(responseJson.toString());
-		
-    }
-    
+		String responseJson = this.mockMvc.perform(post("/api/v1/protocols/getProtocolCodesByDateValueComparison")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(requestJson)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andReturn().getResponse().getContentAsString();
+		logger.info(responseJson.toString());
+
+	}
 
 }
\ No newline at end of file
diff --git a/src/test/java/com/labsynch/labseer/api/ApiSetupControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiSetupControllerTest.java
index 13571d6e1..fd1fa6e1b 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiSetupControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiSetupControllerTest.java
@@ -55,379 +55,379 @@
 @ContextConfiguration(locations = {
 		"classpath:/META-INF/spring/applicationContext.xml",
 		"classpath:/META-INF/spring/applicationContext-security.xml",
-		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml"})
+		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml" })
 public class ApiSetupControllerTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiSetupControllerTest.class);
-	
-    @Autowired
-    private WebApplicationContext wac;
-
-    private MockMvc mockMvc;
-
-    @Before
-    public void setup() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-    }
-    
-    @Test
-    @Transactional
-    public void saveProtocolTypeAndKind() throws Exception{
-    	String typeJson = "[{\"typeName\":\"test\"},{\"typeName\":\"default\"}]";
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/setup/protocoltypes")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(typeJson))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<ProtocolType> resultTypes = ProtocolType.fromJsonArrayToProtocolTypes(responseJson);
-    	Assert.assertEquals(2, resultTypes.size());
-    	
-    	String kindJson = "[{\"typeName\":\"test\",\"kindName\":\"test\"},{\"typeName\":\"default\",\"kindName\":\"default\"}]";
+
+	@Autowired
+	private WebApplicationContext wac;
+
+	private MockMvc mockMvc;
+
+	@Before
+	public void setup() {
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	}
+
+	@Test
+	@Transactional
+	public void saveProtocolTypeAndKind() throws Exception {
+		String typeJson = "[{\"typeName\":\"test\"},{\"typeName\":\"default\"}]";
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/setup/protocoltypes")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(typeJson))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<ProtocolType> resultTypes = ProtocolType.fromJsonArrayToProtocolTypes(responseJson);
+		Assert.assertEquals(2, resultTypes.size());
+
+		String kindJson = "[{\"typeName\":\"test\",\"kindName\":\"test\"},{\"typeName\":\"default\",\"kindName\":\"default\"}]";
 		response = this.mockMvc.perform(post("/api/v1/setup/protocolkinds")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(kindJson))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<ProtocolKind> resultKinds = ProtocolKind.fromJsonArrayToProtocolKinds(responseJson);
-    	Assert.assertEquals(2, resultKinds.size());
-    }
-    
-    @Test
-    @Transactional
-    public void saveExperimentTypeAndKind() throws Exception{
-    	String typeJson = "[{\"typeName\":\"test\"},{\"typeName\":\"default\"}]";
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/setup/experimenttypes")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(typeJson))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<ExperimentType> resultTypes = ExperimentType.fromJsonArrayToExperimentTypes(responseJson);
-    	Assert.assertEquals(2, resultTypes.size());
-    	
-    	String kindJson = "[{\"typeName\":\"test\",\"kindName\":\"test\"},{\"typeName\":\"default\",\"kindName\":\"default\"}]";
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(kindJson))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<ProtocolKind> resultKinds = ProtocolKind.fromJsonArrayToProtocolKinds(responseJson);
+		Assert.assertEquals(2, resultKinds.size());
+	}
+
+	@Test
+	@Transactional
+	public void saveExperimentTypeAndKind() throws Exception {
+		String typeJson = "[{\"typeName\":\"test\"},{\"typeName\":\"default\"}]";
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/setup/experimenttypes")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(typeJson))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<ExperimentType> resultTypes = ExperimentType.fromJsonArrayToExperimentTypes(responseJson);
+		Assert.assertEquals(2, resultTypes.size());
+
+		String kindJson = "[{\"typeName\":\"test\",\"kindName\":\"test\"},{\"typeName\":\"default\",\"kindName\":\"default\"}]";
 		response = this.mockMvc.perform(post("/api/v1/setup/experimentkinds")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(kindJson))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<ExperimentKind> resultKinds = ExperimentKind.fromJsonArrayToExperimentKinds(responseJson);
-    	Assert.assertEquals(2, resultKinds.size());
-    }
-    
-    @Test
-    @Transactional
-    public void saveInteractionTypeAndKind() throws Exception{
-    	String typeJson = "[{\"typeName\":\"test\",\"typeVerb\":\"tests\"},{\"typeName\":\"default\",\"typeVerb\":\"refers to\"}]";
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/setup/interactiontypes")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(typeJson))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<InteractionType> resultTypes = InteractionType.fromJsonArrayToInteractionTypes(responseJson);
-    	Assert.assertEquals(2, resultTypes.size());
-    	
-    	String kindJson = "[{\"typeName\":\"test\",\"kindName\":\"test\"},{\"typeName\":\"default\",\"kindName\":\"default\"}]";
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(kindJson))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<ExperimentKind> resultKinds = ExperimentKind.fromJsonArrayToExperimentKinds(responseJson);
+		Assert.assertEquals(2, resultKinds.size());
+	}
+
+	@Test
+	@Transactional
+	public void saveInteractionTypeAndKind() throws Exception {
+		String typeJson = "[{\"typeName\":\"test\",\"typeVerb\":\"tests\"},{\"typeName\":\"default\",\"typeVerb\":\"refers to\"}]";
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/setup/interactiontypes")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(typeJson))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<InteractionType> resultTypes = InteractionType.fromJsonArrayToInteractionTypes(responseJson);
+		Assert.assertEquals(2, resultTypes.size());
+
+		String kindJson = "[{\"typeName\":\"test\",\"kindName\":\"test\"},{\"typeName\":\"default\",\"kindName\":\"default\"}]";
 		response = this.mockMvc.perform(post("/api/v1/setup/interactionkinds")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(kindJson))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<InteractionKind> resultKinds = InteractionKind.fromJsonArrayToInteractionKinds(responseJson);
-    	Assert.assertEquals(2, resultKinds.size());
-    }
-    
-    @Test
-    @Transactional
-    public void saveContainerTypeAndKind() throws Exception{
-    	String typeJson = "[{\"typeName\":\"test\"},{\"typeName\":\"default\"}]";
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/setup/containertypes")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(typeJson))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<ContainerType> resultTypes = ContainerType.fromJsonArrayToContainerTypes(responseJson);
-    	Assert.assertEquals(2, resultTypes.size());
-    	
-    	String kindJson = "[{\"typeName\":\"test\",\"kindName\":\"test\"},{\"typeName\":\"default\",\"kindName\":\"default\"}]";
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(kindJson))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<InteractionKind> resultKinds = InteractionKind.fromJsonArrayToInteractionKinds(responseJson);
+		Assert.assertEquals(2, resultKinds.size());
+	}
+
+	@Test
+	@Transactional
+	public void saveContainerTypeAndKind() throws Exception {
+		String typeJson = "[{\"typeName\":\"test\"},{\"typeName\":\"default\"}]";
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/setup/containertypes")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(typeJson))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<ContainerType> resultTypes = ContainerType.fromJsonArrayToContainerTypes(responseJson);
+		Assert.assertEquals(2, resultTypes.size());
+
+		String kindJson = "[{\"typeName\":\"test\",\"kindName\":\"test\"},{\"typeName\":\"default\",\"kindName\":\"default\"}]";
 		response = this.mockMvc.perform(post("/api/v1/setup/containerkinds")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(kindJson))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<ContainerKind> resultKinds = ContainerKind.fromJsonArrayToContainerKinds(responseJson);
-    	Assert.assertEquals(2, resultKinds.size());
-    }
-    
-    @Test
-    @Transactional
-    public void saveStateTypeAndKind() throws Exception{
-    	String typeJson = "[{\"typeName\":\"test\"},{\"typeName\":\"default\"}]";
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/setup/statetypes")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(typeJson))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<StateType> resultTypes = StateType.fromJsonArrayToStateTypes(responseJson);
-    	Assert.assertEquals(2, resultTypes.size());
-    	
-    	String kindJson = "[{\"typeName\":\"test\",\"kindName\":\"test\"},{\"typeName\":\"default\",\"kindName\":\"default\"}]";
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(kindJson))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<ContainerKind> resultKinds = ContainerKind.fromJsonArrayToContainerKinds(responseJson);
+		Assert.assertEquals(2, resultKinds.size());
+	}
+
+	@Test
+	@Transactional
+	public void saveStateTypeAndKind() throws Exception {
+		String typeJson = "[{\"typeName\":\"test\"},{\"typeName\":\"default\"}]";
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/setup/statetypes")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(typeJson))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<StateType> resultTypes = StateType.fromJsonArrayToStateTypes(responseJson);
+		Assert.assertEquals(2, resultTypes.size());
+
+		String kindJson = "[{\"typeName\":\"test\",\"kindName\":\"test\"},{\"typeName\":\"default\",\"kindName\":\"default\"}]";
 		response = this.mockMvc.perform(post("/api/v1/setup/statekinds")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(kindJson))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<StateKind> resultKinds = StateKind.fromJsonArrayToStateKinds(responseJson);
-    	Assert.assertEquals(2, resultKinds.size());
-    }
-    
-    @Test
-    @Transactional
-    public void saveValueTypeAndKind() throws Exception{
-    	String typeJson = "[{\"typeName\":\"test\"},{\"typeName\":\"default\"}]";
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/setup/valuetypes")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(typeJson))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<ValueType> resultTypes = ValueType.fromJsonArrayToValueTypes(responseJson);
-    	Assert.assertEquals(2, resultTypes.size());
-    	
-    	String kindJson = "[{\"typeName\":\"test\",\"kindName\":\"test\"},{\"typeName\":\"default\",\"kindName\":\"default\"}]";
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(kindJson))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<StateKind> resultKinds = StateKind.fromJsonArrayToStateKinds(responseJson);
+		Assert.assertEquals(2, resultKinds.size());
+	}
+
+	@Test
+	@Transactional
+	public void saveValueTypeAndKind() throws Exception {
+		String typeJson = "[{\"typeName\":\"test\"},{\"typeName\":\"default\"}]";
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/setup/valuetypes")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(typeJson))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<ValueType> resultTypes = ValueType.fromJsonArrayToValueTypes(responseJson);
+		Assert.assertEquals(2, resultTypes.size());
+
+		String kindJson = "[{\"typeName\":\"test\",\"kindName\":\"test\"},{\"typeName\":\"default\",\"kindName\":\"default\"}]";
 		response = this.mockMvc.perform(post("/api/v1/setup/valuekinds")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(kindJson))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<ValueKind> resultKinds = ValueKind.fromJsonArrayToValueKinds(responseJson);
-    	Assert.assertEquals(2, resultKinds.size());
-    }
-    
-    @Test
-    @Transactional
-    public void saveLabelTypeAndKind() throws Exception{
-    	String typeJson = "[{\"typeName\":\"test\"},{\"typeName\":\"default\"}]";
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/setup/labeltypes")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(typeJson))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<LabelType> resultTypes = LabelType.fromJsonArrayToLabelTypes(responseJson);
-    	Assert.assertEquals(2, resultTypes.size());
-    	
-    	String kindJson = "[{\"typeName\":\"test\",\"kindName\":\"test\"},{\"typeName\":\"default\",\"kindName\":\"default\"}]";
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(kindJson))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<ValueKind> resultKinds = ValueKind.fromJsonArrayToValueKinds(responseJson);
+		Assert.assertEquals(2, resultKinds.size());
+	}
+
+	@Test
+	@Transactional
+	public void saveLabelTypeAndKind() throws Exception {
+		String typeJson = "[{\"typeName\":\"test\"},{\"typeName\":\"default\"}]";
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/setup/labeltypes")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(typeJson))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<LabelType> resultTypes = LabelType.fromJsonArrayToLabelTypes(responseJson);
+		Assert.assertEquals(2, resultTypes.size());
+
+		String kindJson = "[{\"typeName\":\"test\",\"kindName\":\"test\"},{\"typeName\":\"default\",\"kindName\":\"default\"}]";
 		response = this.mockMvc.perform(post("/api/v1/setup/labelkinds")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(kindJson))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<LabelKind> resultKinds = LabelKind.fromJsonArrayToLabelKinds(responseJson);
-    	Assert.assertEquals(2, resultKinds.size());
-    }
-    
-    @Test
-    @Transactional
-    public void saveThingTypeAndKind() throws Exception{
-    	String typeJson = "[{\"typeName\":\"test\"},{\"typeName\":\"default\"}]";
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/setup/thingtypes")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(typeJson))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<ThingType> resultTypes = ThingType.fromJsonArrayToThingTypes(responseJson);
-    	Assert.assertEquals(2, resultTypes.size());
-    	
-    	String kindJson = "[{\"typeName\":\"test\",\"kindName\":\"test\"},{\"typeName\":\"default\",\"kindName\":\"default\"}]";
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(kindJson))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<LabelKind> resultKinds = LabelKind.fromJsonArrayToLabelKinds(responseJson);
+		Assert.assertEquals(2, resultKinds.size());
+	}
+
+	@Test
+	@Transactional
+	public void saveThingTypeAndKind() throws Exception {
+		String typeJson = "[{\"typeName\":\"test\"},{\"typeName\":\"default\"}]";
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/setup/thingtypes")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(typeJson))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<ThingType> resultTypes = ThingType.fromJsonArrayToThingTypes(responseJson);
+		Assert.assertEquals(2, resultTypes.size());
+
+		String kindJson = "[{\"typeName\":\"test\",\"kindName\":\"test\"},{\"typeName\":\"default\",\"kindName\":\"default\"}]";
 		response = this.mockMvc.perform(post("/api/v1/setup/thingkinds")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(kindJson))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<ThingKind> resultKinds = ThingKind.fromJsonArrayToThingKinds(responseJson);
-    	Assert.assertEquals(2, resultKinds.size());
-    }
-    
-    @Test
-    @Transactional
-    public void saveOperatorTypeAndKind() throws Exception{
-    	String typeJson = "[{\"typeName\":\"test\"},{\"typeName\":\"default\"}]";
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/setup/operatortypes")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(typeJson))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<OperatorType> resultTypes = OperatorType.fromJsonArrayToOperatorTypes(responseJson);
-    	Assert.assertEquals(2, resultTypes.size());
-    	
-    	String kindJson = "[{\"typeName\":\"test\",\"kindName\":\"test\"},{\"typeName\":\"default\",\"kindName\":\"default\"}]";
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(kindJson))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<ThingKind> resultKinds = ThingKind.fromJsonArrayToThingKinds(responseJson);
+		Assert.assertEquals(2, resultKinds.size());
+	}
+
+	@Test
+	@Transactional
+	public void saveOperatorTypeAndKind() throws Exception {
+		String typeJson = "[{\"typeName\":\"test\"},{\"typeName\":\"default\"}]";
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/setup/operatortypes")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(typeJson))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<OperatorType> resultTypes = OperatorType.fromJsonArrayToOperatorTypes(responseJson);
+		Assert.assertEquals(2, resultTypes.size());
+
+		String kindJson = "[{\"typeName\":\"test\",\"kindName\":\"test\"},{\"typeName\":\"default\",\"kindName\":\"default\"}]";
 		response = this.mockMvc.perform(post("/api/v1/setup/operatorkinds")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(kindJson))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<OperatorKind> resultKinds = OperatorKind.fromJsonArrayToOperatorKinds(responseJson);
-    	Assert.assertEquals(2, resultKinds.size());
-    }
-    
-    @Test
-    @Transactional
-    public void saveUnitTypeAndKind() throws Exception{
-    	String typeJson = "[{\"typeName\":\"test\"},{\"typeName\":\"default\"}]";
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/setup/unittypes")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(typeJson))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<UnitType> resultTypes = UnitType.fromJsonArrayToUnitTypes(responseJson);
-    	Assert.assertEquals(2, resultTypes.size());
-    	
-    	String kindJson = "[{\"typeName\":\"test\",\"kindName\":\"test\"},{\"typeName\":\"default\",\"kindName\":\"default\"}]";
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(kindJson))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<OperatorKind> resultKinds = OperatorKind.fromJsonArrayToOperatorKinds(responseJson);
+		Assert.assertEquals(2, resultKinds.size());
+	}
+
+	@Test
+	@Transactional
+	public void saveUnitTypeAndKind() throws Exception {
+		String typeJson = "[{\"typeName\":\"test\"},{\"typeName\":\"default\"}]";
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/setup/unittypes")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(typeJson))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<UnitType> resultTypes = UnitType.fromJsonArrayToUnitTypes(responseJson);
+		Assert.assertEquals(2, resultTypes.size());
+
+		String kindJson = "[{\"typeName\":\"test\",\"kindName\":\"test\"},{\"typeName\":\"default\",\"kindName\":\"default\"}]";
 		response = this.mockMvc.perform(post("/api/v1/setup/unitkinds")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(kindJson))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<UnitKind> resultKinds = UnitKind.fromJsonArrayToUnitKinds(responseJson);
-    	Assert.assertEquals(2, resultKinds.size());
-    }
-    
-    @Test
-    @Transactional
-    public void saveDDictTypeAndKindAndValues() throws Exception{
-    	String typeJson = "[{\"typeName\":\"test\"},{\"typeName\":\"default\"}]";
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/setup/ddicttypes")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(typeJson))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<DDictType> resultTypes = DDictType.fromJsonArrayToDDictTypes(responseJson);
-    	Assert.assertEquals(2, resultTypes.size());
-    	
-    	String kindJson = "[{\"typeName\":\"test\",\"kindName\":\"test\"},{\"typeName\":\"default\",\"kindName\":\"default\"}]";
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(kindJson))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<UnitKind> resultKinds = UnitKind.fromJsonArrayToUnitKinds(responseJson);
+		Assert.assertEquals(2, resultKinds.size());
+	}
+
+	@Test
+	@Transactional
+	public void saveDDictTypeAndKindAndValues() throws Exception {
+		String typeJson = "[{\"typeName\":\"test\"},{\"typeName\":\"default\"}]";
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/setup/ddicttypes")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(typeJson))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<DDictType> resultTypes = DDictType.fromJsonArrayToDDictTypes(responseJson);
+		Assert.assertEquals(2, resultTypes.size());
+
+		String kindJson = "[{\"typeName\":\"test\",\"kindName\":\"test\"},{\"typeName\":\"default\",\"kindName\":\"default\"}]";
 		response = this.mockMvc.perform(post("/api/v1/setup/ddictkinds")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(kindJson))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<DDictKind> resultKinds = DDictKind.fromJsonArrayToDDictKinds(responseJson);
-    	Assert.assertEquals(2, resultKinds.size());
-    	
-    	String valueJson="[{\"name\":\"Test\",\"codeType\":\"test\",\"codeKind\":\"test\",\"code\":\"test\",\"codeOrigin\":\"Testing\"}]";
-    	response = this.mockMvc.perform(post("/api/v1/setup/codetables")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(valueJson))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<DDictValue> resultCodeTables = DDictValue.fromJsonArrayToDDictValues(responseJson);
-    	Assert.assertEquals(1, resultCodeTables.size());
-    }
-    
-    @Test
-    @Transactional
-    public void saveLabelSequences() throws Exception{
-    	String json = "[{\"digits\":8,\"groupDigits\":false,\"labelPrefix\":\"PRCL\",\"labelSeparator\":\"-\",\"labelTypeAndKind\":\"id_codeName\",\"latestNumber\":1,\"thingTypeAndKind\":\"document_protocol\"},{\"digits\":8,\"groupDigits\":false, \"labelPrefix\":\"TEST\",\"labelSeparator\":\"-\",\"labelTypeAndKind\":\"id_codeName\",\"latestNumber\":1,\"thingTypeAndKind\":\"document_test\"}]";
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/setup/labelsequences")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<LabelSequence> resultTypes = LabelSequence.fromJsonArrayToLabelSequences(responseJson);
-    	Assert.assertEquals(2, resultTypes.size());
-    }
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(kindJson))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<DDictKind> resultKinds = DDictKind.fromJsonArrayToDDictKinds(responseJson);
+		Assert.assertEquals(2, resultKinds.size());
+
+		String valueJson = "[{\"name\":\"Test\",\"codeType\":\"test\",\"codeKind\":\"test\",\"code\":\"test\",\"codeOrigin\":\"Testing\"}]";
+		response = this.mockMvc.perform(post("/api/v1/setup/codetables")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(valueJson))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<DDictValue> resultCodeTables = DDictValue.fromJsonArrayToDDictValues(responseJson);
+		Assert.assertEquals(1, resultCodeTables.size());
+	}
+
+	@Test
+	@Transactional
+	public void saveLabelSequences() throws Exception {
+		String json = "[{\"digits\":8,\"groupDigits\":false,\"labelPrefix\":\"PRCL\",\"labelSeparator\":\"-\",\"labelTypeAndKind\":\"id_codeName\",\"latestNumber\":1,\"thingTypeAndKind\":\"document_protocol\"},{\"digits\":8,\"groupDigits\":false, \"labelPrefix\":\"TEST\",\"labelSeparator\":\"-\",\"labelTypeAndKind\":\"id_codeName\",\"latestNumber\":1,\"thingTypeAndKind\":\"document_test\"}]";
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/setup/labelsequences")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<LabelSequence> resultTypes = LabelSequence.fromJsonArrayToLabelSequences(responseJson);
+		Assert.assertEquals(2, resultTypes.size());
+	}
 
 }
\ No newline at end of file
diff --git a/src/test/java/com/labsynch/labseer/api/ApiStructureControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiStructureControllerTest.java
index 08b710434..ba71b810b 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiStructureControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiStructureControllerTest.java
@@ -30,103 +30,102 @@
 @ContextConfiguration(locations = {
 		"classpath:/META-INF/spring/applicationContext.xml",
 		"classpath:/META-INF/spring/applicationContext-security.xml",
-		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml"})
+		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml" })
 public class ApiStructureControllerTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiStructureControllerTest.class);
-	
-    @Autowired
-    private WebApplicationContext wac;
-
-    private MockMvc mockMvc;
-
-    @Before
-    public void setup() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-    }
-	    
-    //@Test
-    @Transactional
-    public void calculateMoleculeProperties() throws Exception{
-    	String json = "{\"molStructure\":\"\\n  Mrv1641110051619032D          \\n\\n  5  5  0  0  0  0            999 V2000\\n   -0.0446    0.6125    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0\\n   -0.7121    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\\n   -0.4572   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\\n    0.3679   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\\n    0.6228    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\\n  2  3  1  0  0  0  0\\n  3  4  1  0  0  0  0\\n  4  5  1  0  0  0  0\\n  1  2  1  0  0  0  0\\n  1  5  1  0  0  0  0\\nM  END\\n\"}";
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/structure/calculateMoleculeProperties")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
+
+	@Autowired
+	private WebApplicationContext wac;
+
+	private MockMvc mockMvc;
+
+	@Before
+	public void setup() {
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	}
+
+	// @Test
+	@Transactional
+	public void calculateMoleculeProperties() throws Exception {
+		String json = "{\"molStructure\":\"\\n  Mrv1641110051619032D          \\n\\n  5  5  0  0  0  0            999 V2000\\n   -0.0446    0.6125    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0\\n   -0.7121    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\\n   -0.4572   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\\n    0.3679   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\\n    0.6228    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\\n  2  3  1  0  0  0  0\\n  3  4  1  0  0  0  0\\n  4  5  1  0  0  0  0\\n  1  2  1  0  0  0  0\\n  1  5  1  0  0  0  0\\nM  END\\n\"}";
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/structure/calculateMoleculeProperties")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
 		logger.info(response.getContentAsString());
-		
+
 		MolPropertiesDTO result = MolPropertiesDTO.fromJsonToMolPropertiesDTO(response.getContentAsString());
-		Assert.assertEquals("C4H8O",result.getMolFormula());
-		Assert.assertTrue(result.getMolStructure().length()>0);
+		Assert.assertEquals("C4H8O", result.getMolFormula());
+		Assert.assertTrue(result.getMolStructure().length() > 0);
 		Assert.assertTrue(result.getMolWeight() - new Double(72.1059) < 0.001);
-    }
-
-    @Test
-    @Transactional
-    public void searchStructures() throws Exception{
-    	String json = "{\"queryMol\":\"Molecule from ChemDoodle Web Components\\n\\nhttp://www.ichemlabs.com\\n  5  5  0  0  0  0            999 V2000\\n    0.0000    0.7694    0.0000 C   0  0  0  0  0  0\\n    0.8090    0.1816    0.0000 C   0  0  0  0  0  0\\n    0.5000   -0.7694    0.0000 C   0  0  0  0  0  0\\n   -0.5000   -0.7694    0.0000 C   0  0  0  0  0  0\\n   -0.8090    0.1816    0.0000 C   0  0  0  0  0  0\\n  1  2  1  0     0  0\\n  2  3  1  0     0  0\\n  3  4  1  0     0  0\\n  4  5  1  0     0  0\\n  5  1  1  0     0  0\\nM  END\"}";
-    	StructureSearchDTO queryDTO = StructureSearchDTO.fromJsonToStructureSearchDTO(json);
-//    	queryDTO.setLsType("chemistry");
-//    	queryDTO.setLsKind("monomer");
-    	queryDTO.setMaxResults(100);
-    	queryDTO.setSearchType("exact");
-    	logger.info(queryDTO.toJson());
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/structure/searchStructures")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(queryDTO.toJson()))
-    			//.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
+	}
+
+	@Test
+	@Transactional
+	public void searchStructures() throws Exception {
+		String json = "{\"queryMol\":\"Molecule from ChemDoodle Web Components\\n\\nhttp://www.ichemlabs.com\\n  5  5  0  0  0  0            999 V2000\\n    0.0000    0.7694    0.0000 C   0  0  0  0  0  0\\n    0.8090    0.1816    0.0000 C   0  0  0  0  0  0\\n    0.5000   -0.7694    0.0000 C   0  0  0  0  0  0\\n   -0.5000   -0.7694    0.0000 C   0  0  0  0  0  0\\n   -0.8090    0.1816    0.0000 C   0  0  0  0  0  0\\n  1  2  1  0     0  0\\n  2  3  1  0     0  0\\n  3  4  1  0     0  0\\n  4  5  1  0     0  0\\n  5  1  1  0     0  0\\nM  END\"}";
+		StructureSearchDTO queryDTO = StructureSearchDTO.fromJsonToStructureSearchDTO(json);
+		// queryDTO.setLsType("chemistry");
+		// queryDTO.setLsKind("monomer");
+		queryDTO.setMaxResults(100);
+		queryDTO.setSearchType("exact");
+		logger.info(queryDTO.toJson());
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/structure/searchStructures")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(queryDTO.toJson()))
+				// .andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
 		logger.info(response.getContentAsString());
-		
-    }
-    
-   // @Test
-    @Transactional
-    public void searchStructuresAndMeta() throws Exception{
-    	String json = "{\"molStructure\":\"\\n  Mrv1641110051619032D          \\n\\n  5  5  0  0  0  0            999 V2000\\n   -0.0446    0.6125    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0\\n   -0.7121    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\\n   -0.4572   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\\n    0.3679   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\\n    0.6228    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\\n  2  3  1  0  0  0  0\\n  3  4  1  0  0  0  0\\n  4  5  1  0  0  0  0\\n  1  2  1  0  0  0  0\\n  1  5  1  0  0  0  0\\nM  END\\n\"}";
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/structure/structureAndMetaSearch")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
+
+	}
+
+	// @Test
+	@Transactional
+	public void searchStructuresAndMeta() throws Exception {
+		String json = "{\"molStructure\":\"\\n  Mrv1641110051619032D          \\n\\n  5  5  0  0  0  0            999 V2000\\n   -0.0446    0.6125    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0\\n   -0.7121    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\\n   -0.4572   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\\n    0.3679   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\\n    0.6228    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\\n  2  3  1  0  0  0  0\\n  3  4  1  0  0  0  0\\n  4  5  1  0  0  0  0\\n  1  2  1  0  0  0  0\\n  1  5  1  0  0  0  0\\nM  END\\n\"}";
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/structure/structureAndMetaSearch")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
 		logger.info(response.getContentAsString());
-		
-    }
-    
-    @Test
-	public void convertSmilesToMol() throws Exception{
+
+	}
+
+	@Test
+	public void convertSmilesToMol() throws Exception {
 		String smiles = "O=C1NC%91=NC2NC=NC=21.[*:1]%91 |$;;;;;;;;;;_R1$|";
-		//String smiles = "CCC>>CCN";
+		// String smiles = "CCC>>CCN";
 		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/structure/convertSmilesToMol")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(smiles))
-    			.andExpect(status().isOk())
-    			.andReturn().getResponse();
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(smiles))
+				.andExpect(status().isOk())
+				.andReturn().getResponse();
 		String molStructure = response.getContentAsString();
 		logger.info(molStructure);
 	}
-    
-    @Test
-	public void cleanMolStructure() throws Exception{
-    	String molStructure = "\n  Mrv1641110051619032D          \n\n  5  5  0  0  0  0            999 V2000\n   -0.0446    0.6125    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.7121    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.4572   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.3679   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.6228    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n  2  3  1  0  0  0  0\n  3  4  1  0  0  0  0\n  4  5  1  0  0  0  0\n  1  2  1  0  0  0  0\n  1  5  1  0  0  0  0\nM  END\n";
-		//String smiles = "CCC>>CCN";
+
+	@Test
+	public void cleanMolStructure() throws Exception {
+		String molStructure = "\n  Mrv1641110051619032D          \n\n  5  5  0  0  0  0            999 V2000\n   -0.0446    0.6125    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.7121    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.4572   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.3679   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.6228    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n  2  3  1  0  0  0  0\n  3  4  1  0  0  0  0\n  4  5  1  0  0  0  0\n  1  2  1  0  0  0  0\n  1  5  1  0  0  0  0\nM  END\n";
+		// String smiles = "CCC>>CCN";
 		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/structure/cleanMolStructure")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(molStructure))
-    			.andExpect(status().isOk())
-    			.andReturn().getResponse();
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(molStructure))
+				.andExpect(status().isOk())
+				.andReturn().getResponse();
 		String cleanedMolStructure = response.getContentAsString();
 		logger.info(cleanedMolStructure);
 	}
-    
 
 }
\ No newline at end of file
diff --git a/src/test/java/com/labsynch/labseer/api/ApiSubjectControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiSubjectControllerTest.java
index 2751755d3..115d5c1e6 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiSubjectControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiSubjectControllerTest.java
@@ -36,86 +36,88 @@
 @ContextConfiguration(locations = {
 		"classpath:/META-INF/spring/applicationContext.xml",
 		"classpath:/META-INF/spring/applicationContext-security.xml",
-		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml"})
+		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml" })
 public class ApiSubjectControllerTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiSubjectControllerTest.class);
-	
-    @Autowired
-    private WebApplicationContext wac;
 
-    private MockMvc mockMvc;
+	@Autowired
+	private WebApplicationContext wac;
 
-    @Before
-    public void setup() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-    }
-    
-    @Transactional
-    @Test
-    public void createFromJsonArray() throws Exception {
-    	String json = "[{\"treatmentGroups\":[{\"id\":1357818}],\"lsType\":\"default\",\"lsKind\":\"default\",\"codeName\":\"SUBJ-00825725\",\"recordedBy\":\"smeyer\",\"lsTransaction\":7311,\"ignored\":false,\"recordedDate\":1424106740000}]";
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/subjects/jsonArray")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	LsThing postedLsThing = LsThing.fromJsonToLsThing(responseJson);
-    	logger.info(postedLsThing.toJson());
-    }
-    
-    @Transactional
-    @Test
-    public void getByIdOrCodeName() throws Exception {
-    	Subject subject = Subject.findSubjectEntries(0, 1).get(0);
-    	MockHttpServletResponse response = this.mockMvc.perform(get("/api/v1/subjects/"+subject.getId())
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	MockHttpServletResponse response2 = this.mockMvc.perform(get("/api/v1/subjects/"+subject.getCodeName())
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson2 = response2.getContentAsString();
-    	logger.info(responseJson2);
-    	Assert.assertEquals(responseJson, responseJson2);
-    }
-    
-    @Transactional
-    @Test
-    public void getSubjectsByCodeNames() throws Exception {
-    	List<Subject> subjects = Subject.findSubjectEntries(0, 100);
-    	List<String> codeNames = new ArrayList<String>();
-    	for(Subject subject : subjects){
-    		codeNames.add("\""+subject.getCodeName()+"\"");
-    	}
-    	codeNames.add("\"BAD-CODENAME\"");
-    	String json = codeNames.toString();
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/subjects/getSubjectsByCodeNames")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	Collection<SubjectCodeNameDTO> results = SubjectCodeNameDTO.fromJsonArrayToSubjectCoes(responseJson);
-    	Assert.assertEquals(codeNames.size(), results.size());
-    	for (SubjectCodeNameDTO result : results){
-    		Assert.assertNotNull(result.getRequestCodeName());
-    		if (result.getRequestCodeName().equals("BAD-CODENAME")) Assert.assertNull(result.getSubject());
-    		else Assert.assertNotNull(result.getSubject());
-    	}
-    }
+	private MockMvc mockMvc;
+
+	@Before
+	public void setup() {
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	}
+
+	@Transactional
+	@Test
+	public void createFromJsonArray() throws Exception {
+		String json = "[{\"treatmentGroups\":[{\"id\":1357818}],\"lsType\":\"default\",\"lsKind\":\"default\",\"codeName\":\"SUBJ-00825725\",\"recordedBy\":\"smeyer\",\"lsTransaction\":7311,\"ignored\":false,\"recordedDate\":1424106740000}]";
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/subjects/jsonArray")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(json)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		LsThing postedLsThing = LsThing.fromJsonToLsThing(responseJson);
+		logger.info(postedLsThing.toJson());
+	}
+
+	@Transactional
+	@Test
+	public void getByIdOrCodeName() throws Exception {
+		Subject subject = Subject.findSubjectEntries(0, 1).get(0);
+		MockHttpServletResponse response = this.mockMvc.perform(get("/api/v1/subjects/" + subject.getId())
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		MockHttpServletResponse response2 = this.mockMvc.perform(get("/api/v1/subjects/" + subject.getCodeName())
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson2 = response2.getContentAsString();
+		logger.info(responseJson2);
+		Assert.assertEquals(responseJson, responseJson2);
+	}
+
+	@Transactional
+	@Test
+	public void getSubjectsByCodeNames() throws Exception {
+		List<Subject> subjects = Subject.findSubjectEntries(0, 100);
+		List<String> codeNames = new ArrayList<String>();
+		for (Subject subject : subjects) {
+			codeNames.add("\"" + subject.getCodeName() + "\"");
+		}
+		codeNames.add("\"BAD-CODENAME\"");
+		String json = codeNames.toString();
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/subjects/getSubjectsByCodeNames")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		Collection<SubjectCodeNameDTO> results = SubjectCodeNameDTO.fromJsonArrayToSubjectCoes(responseJson);
+		Assert.assertEquals(codeNames.size(), results.size());
+		for (SubjectCodeNameDTO result : results) {
+			Assert.assertNotNull(result.getRequestCodeName());
+			if (result.getRequestCodeName().equals("BAD-CODENAME"))
+				Assert.assertNull(result.getSubject());
+			else
+				Assert.assertNotNull(result.getSubject());
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/com/labsynch/labseer/api/ApiValueControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiValueControllerTest.java
index 3eddd2c49..f85176d1e 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiValueControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiValueControllerTest.java
@@ -41,190 +41,206 @@
 @ContextConfiguration(locations = {
 		"classpath:/META-INF/spring/applicationContext.xml",
 		"classpath:/META-INF/spring/applicationContext-security.xml",
-		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml"})
+		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml" })
 public class ApiValueControllerTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiValueControllerTest.class);
-	
-    @Autowired
-    private WebApplicationContext wac;
-
-    private MockMvc mockMvc;
-
-    @Before
-    public void setup() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-    }
-    
-    //@Test
-    public void getProtocolValue() throws Exception {
-    	String entity = "protocol";
-    	String idOrCodeName = "PROT-00000005";
-    	String stateType = "metadata";
-    	String stateKind = "protocol metadata";
-    	String valueType = "stringValue";
-    	String valueKind = "notebook";
-    	MockHttpServletResponse response = this.mockMvc.perform(get("/api/v1/values/"+entity+"/"+idOrCodeName+"/bystate/"+stateType+"/"+stateKind+"/byvalue/"+valueType+"/"+valueKind+"/")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	ProtocolValue value = ProtocolValue.fromJsonToProtocolValue(responseJson);
-    	Assert.assertNotNull(value.getId());
-    }
-    
-    //@Test
-    public void getExperimentValue() throws Exception {
-    	String entity = "experiment";
-    	String idOrCodeName = "EXPT-00000532";
-    	String stateType = "metadata";
-    	String stateKind = "experiment metadata";
-    	String valueType = "codeValue";
-    	String valueKind = "scientist";
-    	MockHttpServletResponse response = this.mockMvc.perform(get("/api/v1/values/"+entity+"/"+idOrCodeName+"/bystate/"+stateType+"/"+stateKind+"/byvalue/"+valueType+"/"+valueKind+"/")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	ExperimentValue value = ExperimentValue.fromJsonToExperimentValue(responseJson);
-    	Assert.assertNotNull(value.getId());
-    }
-    
-    //@Test
-    public void getAnalysisGroupValue() throws Exception {
-    	String entity = "analysisGroup";
-    	String idOrCodeName = "AG-00000099";
-    	String stateType = "data";
-    	String stateKind = "Generic";
-    	String valueType = "codeValue";
-    	String valueKind = "batch code";
-    	MockHttpServletResponse response = this.mockMvc.perform(get("/api/v1/values/"+entity+"/"+idOrCodeName+"/bystate/"+stateType+"/"+stateKind+"/byvalue/"+valueType+"/"+valueKind+"/")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	AnalysisGroupValue value = AnalysisGroupValue.fromJsonToAnalysisGroupValue(responseJson);
-    	Assert.assertNotNull(value.getId());
-    }
-    
-    //@Test
-    public void getTreatmentGroupValue() throws Exception {
-    	String entity = "treatmentGroup";
-    	String idOrCodeName = "TG-00033284";
-    	String stateType = "data";
-    	String stateKind = "results";
-    	String valueType = "numericValue";
-    	String valueKind = "Dose";
-    	MockHttpServletResponse response = this.mockMvc.perform(get("/api/v1/values/"+entity+"/"+idOrCodeName+"/bystate/"+stateType+"/"+stateKind+"/byvalue/"+valueType+"/"+valueKind+"/")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	TreatmentGroupValue value = TreatmentGroupValue.fromJsonToTreatmentGroupValue(responseJson);
-    	Assert.assertNotNull(value.getId());
-    }
-    
-    //@Test
-    public void getSubjectValue() throws Exception {
-    	String entity = "subject";
-    	String idOrCodeName = "SUBJ-00551063";
-    	String stateType = "data";
-    	String stateKind = "test compound treatment";
-    	String valueType = "numericValue";
-    	String valueKind = "concentration";
-    	MockHttpServletResponse response = this.mockMvc.perform(get("/api/v1/values/"+entity+"/"+idOrCodeName+"/bystate/"+stateType+"/"+stateKind+"/byvalue/"+valueType+"/"+valueKind+"/")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	SubjectValue value = SubjectValue.fromJsonToSubjectValue(responseJson);
-    	Assert.assertNotNull(value.getId());
-    }
-    
-    //@Test
-    public void getLsThingValue() throws Exception {
-    	String entity = "lsThing";
-    	String idOrCodeName = "PEG000010";
-    	String stateType = "metadata";
-    	String stateKind = "peg parent";
-    	String valueType = "numericValue";
-    	String valueKind = "molecular weight";
-    	MockHttpServletResponse response = this.mockMvc.perform(get("/api/v1/values/"+entity+"/"+idOrCodeName+"/bystate/"+stateType+"/"+stateKind+"/byvalue/"+valueType+"/"+valueKind+"/")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	LsThingValue value = LsThingValue.fromJsonToLsThingValue(responseJson);
-    	Assert.assertNotNull(value.getId());
-    }
-
-    
-    @Test
-    public void updateProtocolValue() throws Exception {
-    	String entity = "protocol";
-    	String idOrCodeName = "PROT-00000005";
-    	String stateType = "metadata";
-    	String stateKind = "protocol metadata";
-    	String valueType = "stringValue";
-    	String valueKind = "notebook";
-    	MockHttpServletResponse response = this.mockMvc.perform(put("/api/v1/values/"+entity+"/"+idOrCodeName+"/bystate/"+stateType+"/"+stateKind+"/byvalue/"+valueType+"/"+valueKind+"/")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content("test"))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	ProtocolValue value = ProtocolValue.fromJsonToProtocolValue(responseJson);
-    	Assert.assertTrue(value.getStringValue().equals("test"));
-    	responseJson = this.mockMvc.perform(get("/api/v1/values/"+entity+"/"+idOrCodeName+"/bystate/"+stateType+"/"+stateKind+"/byvalue/"+valueType+"/"+valueKind+"/")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse().getContentAsString();
-    	value = ProtocolValue.fromJsonToProtocolValue(responseJson);
-    	Assert.assertTrue(value.getStringValue().equals("test"));
-    }
-    
-    @Test
-    @Transactional
-    public void getAGValue() throws Exception {
-    	Set<Long> idList = new HashSet<Long>();
-    	idList.add(3202L);
-    	idList.add(3203L);
-    	idList.add(3209L);
-    	IdSetDTO idSet = new IdSetDTO();
-    	idSet.setIdSet(idList);
-    	logger.info("here is the ID list: " + idSet.toJson());
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/analysisgroupvalues/getValues/byIdList?onlyPublicData=false&format=tsv" )
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(idSet.toJson())
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-//    	LsThingValue value = LsThingValue.fromJsonToLsThingValue(responseJson);
-//    	Assert.assertNotNull(value.getId());
-    }
+
+	@Autowired
+	private WebApplicationContext wac;
+
+	private MockMvc mockMvc;
+
+	@Before
+	public void setup() {
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	}
+
+	// @Test
+	public void getProtocolValue() throws Exception {
+		String entity = "protocol";
+		String idOrCodeName = "PROT-00000005";
+		String stateType = "metadata";
+		String stateKind = "protocol metadata";
+		String valueType = "stringValue";
+		String valueKind = "notebook";
+		MockHttpServletResponse response = this.mockMvc
+				.perform(get("/api/v1/values/" + entity + "/" + idOrCodeName + "/bystate/" + stateType + "/" + stateKind
+						+ "/byvalue/" + valueType + "/" + valueKind + "/")
+						.contentType(MediaType.APPLICATION_JSON)
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		ProtocolValue value = ProtocolValue.fromJsonToProtocolValue(responseJson);
+		Assert.assertNotNull(value.getId());
+	}
+
+	// @Test
+	public void getExperimentValue() throws Exception {
+		String entity = "experiment";
+		String idOrCodeName = "EXPT-00000532";
+		String stateType = "metadata";
+		String stateKind = "experiment metadata";
+		String valueType = "codeValue";
+		String valueKind = "scientist";
+		MockHttpServletResponse response = this.mockMvc
+				.perform(get("/api/v1/values/" + entity + "/" + idOrCodeName + "/bystate/" + stateType + "/" + stateKind
+						+ "/byvalue/" + valueType + "/" + valueKind + "/")
+						.contentType(MediaType.APPLICATION_JSON)
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		ExperimentValue value = ExperimentValue.fromJsonToExperimentValue(responseJson);
+		Assert.assertNotNull(value.getId());
+	}
+
+	// @Test
+	public void getAnalysisGroupValue() throws Exception {
+		String entity = "analysisGroup";
+		String idOrCodeName = "AG-00000099";
+		String stateType = "data";
+		String stateKind = "Generic";
+		String valueType = "codeValue";
+		String valueKind = "batch code";
+		MockHttpServletResponse response = this.mockMvc
+				.perform(get("/api/v1/values/" + entity + "/" + idOrCodeName + "/bystate/" + stateType + "/" + stateKind
+						+ "/byvalue/" + valueType + "/" + valueKind + "/")
+						.contentType(MediaType.APPLICATION_JSON)
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		AnalysisGroupValue value = AnalysisGroupValue.fromJsonToAnalysisGroupValue(responseJson);
+		Assert.assertNotNull(value.getId());
+	}
+
+	// @Test
+	public void getTreatmentGroupValue() throws Exception {
+		String entity = "treatmentGroup";
+		String idOrCodeName = "TG-00033284";
+		String stateType = "data";
+		String stateKind = "results";
+		String valueType = "numericValue";
+		String valueKind = "Dose";
+		MockHttpServletResponse response = this.mockMvc
+				.perform(get("/api/v1/values/" + entity + "/" + idOrCodeName + "/bystate/" + stateType + "/" + stateKind
+						+ "/byvalue/" + valueType + "/" + valueKind + "/")
+						.contentType(MediaType.APPLICATION_JSON)
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		TreatmentGroupValue value = TreatmentGroupValue.fromJsonToTreatmentGroupValue(responseJson);
+		Assert.assertNotNull(value.getId());
+	}
+
+	// @Test
+	public void getSubjectValue() throws Exception {
+		String entity = "subject";
+		String idOrCodeName = "SUBJ-00551063";
+		String stateType = "data";
+		String stateKind = "test compound treatment";
+		String valueType = "numericValue";
+		String valueKind = "concentration";
+		MockHttpServletResponse response = this.mockMvc
+				.perform(get("/api/v1/values/" + entity + "/" + idOrCodeName + "/bystate/" + stateType + "/" + stateKind
+						+ "/byvalue/" + valueType + "/" + valueKind + "/")
+						.contentType(MediaType.APPLICATION_JSON)
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		SubjectValue value = SubjectValue.fromJsonToSubjectValue(responseJson);
+		Assert.assertNotNull(value.getId());
+	}
+
+	// @Test
+	public void getLsThingValue() throws Exception {
+		String entity = "lsThing";
+		String idOrCodeName = "PEG000010";
+		String stateType = "metadata";
+		String stateKind = "peg parent";
+		String valueType = "numericValue";
+		String valueKind = "molecular weight";
+		MockHttpServletResponse response = this.mockMvc
+				.perform(get("/api/v1/values/" + entity + "/" + idOrCodeName + "/bystate/" + stateType + "/" + stateKind
+						+ "/byvalue/" + valueType + "/" + valueKind + "/")
+						.contentType(MediaType.APPLICATION_JSON)
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		LsThingValue value = LsThingValue.fromJsonToLsThingValue(responseJson);
+		Assert.assertNotNull(value.getId());
+	}
+
+	@Test
+	public void updateProtocolValue() throws Exception {
+		String entity = "protocol";
+		String idOrCodeName = "PROT-00000005";
+		String stateType = "metadata";
+		String stateKind = "protocol metadata";
+		String valueType = "stringValue";
+		String valueKind = "notebook";
+		MockHttpServletResponse response = this.mockMvc
+				.perform(put("/api/v1/values/" + entity + "/" + idOrCodeName + "/bystate/" + stateType + "/" + stateKind
+						+ "/byvalue/" + valueType + "/" + valueKind + "/")
+						.contentType(MediaType.APPLICATION_JSON)
+						.accept(MediaType.APPLICATION_JSON)
+						.content("test"))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		ProtocolValue value = ProtocolValue.fromJsonToProtocolValue(responseJson);
+		Assert.assertTrue(value.getStringValue().equals("test"));
+		responseJson = this.mockMvc
+				.perform(get("/api/v1/values/" + entity + "/" + idOrCodeName + "/bystate/" + stateType + "/" + stateKind
+						+ "/byvalue/" + valueType + "/" + valueKind + "/")
+						.contentType(MediaType.APPLICATION_JSON)
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse().getContentAsString();
+		value = ProtocolValue.fromJsonToProtocolValue(responseJson);
+		Assert.assertTrue(value.getStringValue().equals("test"));
+	}
+
+	@Test
+	@Transactional
+	public void getAGValue() throws Exception {
+		Set<Long> idList = new HashSet<Long>();
+		idList.add(3202L);
+		idList.add(3203L);
+		idList.add(3209L);
+		IdSetDTO idSet = new IdSetDTO();
+		idSet.setIdSet(idList);
+		logger.info("here is the ID list: " + idSet.toJson());
+		MockHttpServletResponse response = this.mockMvc
+				.perform(post("/api/v1/analysisgroupvalues/getValues/byIdList?onlyPublicData=false&format=tsv")
+						.contentType(MediaType.APPLICATION_JSON)
+						.content(idSet.toJson())
+						.accept(MediaType.APPLICATION_JSON))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		// LsThingValue value = LsThingValue.fromJsonToLsThingValue(responseJson);
+		// Assert.assertNotNull(value.getId());
+	}
 
 }
\ No newline at end of file
diff --git a/src/test/java/com/labsynch/labseer/api/ApiValueKindControllerTest.java b/src/test/java/com/labsynch/labseer/api/ApiValueKindControllerTest.java
index ea8fdaae4..ad7c64e5d 100644
--- a/src/test/java/com/labsynch/labseer/api/ApiValueKindControllerTest.java
+++ b/src/test/java/com/labsynch/labseer/api/ApiValueKindControllerTest.java
@@ -33,51 +33,52 @@
 @ContextConfiguration(locations = {
 		"classpath:/META-INF/spring/applicationContext.xml",
 		"classpath:/META-INF/spring/applicationContext-security.xml",
-		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml"})
+		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml" })
 public class ApiValueKindControllerTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(ApiValueKindControllerTest.class);
-	
-    @Autowired
-    private WebApplicationContext wac;
 
-    private MockMvc mockMvc;
+	@Autowired
+	private WebApplicationContext wac;
 
-    @Before
-    public void setup() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-    }
-    
-    @Test
-    public void getOrCreateValueKinds() throws Exception {
-    	String json = "[{\"lsType\":\"test\",\"lsKind\":\"test\"}]";
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/valuekinds/getOrCreate/jsonArray")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isCreated())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	List<ValueKind> dtos = (List<ValueKind>) ValueKind.fromJsonArrayToValueKinds(responseJson);
-    	Assert.assertNotNull(dtos.get(0).getId());
-    }
-    
-    @Test
-    public void getValueKindsByDTO() throws Exception {
-    	String json = "[{\"lsType\":\"codeValue\",\"lsKind\":\"scientist\"}]";
-    	MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/valuekinds/get/jsonArray")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.accept(MediaType.APPLICATION_JSON)
-    			.content(json))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json;charset=utf-8"))
-    			.andReturn().getResponse();
-    	String responseJson = response.getContentAsString();
-    	logger.info(responseJson);
-    	List<ValueTypeKindDTO> dtos = (List<ValueTypeKindDTO>) ValueTypeKindDTO.fromJsonArrayToValueTypeKindDTO(responseJson);
-    	Assert.assertNotNull(dtos.get(0).getValueKind());
-    }
+	private MockMvc mockMvc;
+
+	@Before
+	public void setup() {
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	}
+
+	@Test
+	public void getOrCreateValueKinds() throws Exception {
+		String json = "[{\"lsType\":\"test\",\"lsKind\":\"test\"}]";
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/valuekinds/getOrCreate/jsonArray")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isCreated())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		List<ValueKind> dtos = (List<ValueKind>) ValueKind.fromJsonArrayToValueKinds(responseJson);
+		Assert.assertNotNull(dtos.get(0).getId());
+	}
+
+	@Test
+	public void getValueKindsByDTO() throws Exception {
+		String json = "[{\"lsType\":\"codeValue\",\"lsKind\":\"scientist\"}]";
+		MockHttpServletResponse response = this.mockMvc.perform(post("/api/v1/valuekinds/get/jsonArray")
+				.contentType(MediaType.APPLICATION_JSON)
+				.accept(MediaType.APPLICATION_JSON)
+				.content(json))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json;charset=utf-8"))
+				.andReturn().getResponse();
+		String responseJson = response.getContentAsString();
+		logger.info(responseJson);
+		List<ValueTypeKindDTO> dtos = (List<ValueTypeKindDTO>) ValueTypeKindDTO
+				.fromJsonArrayToValueTypeKindDTO(responseJson);
+		Assert.assertNotNull(dtos.get(0).getValueKind());
+	}
 
 }
\ No newline at end of file
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupDataOnDemand.java
index 4fbc43de7..b20d5a62c 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupDataOnDemand.java
@@ -19,11 +19,11 @@
 @Component
 public class AnalysisGroupDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<AnalysisGroup> data;
+    private List<AnalysisGroup> data;
 
-	public AnalysisGroup getNewTransientAnalysisGroup(int index) {
+    public AnalysisGroup getNewTransientAnalysisGroup(int index) {
         AnalysisGroup obj = new AnalysisGroup();
         setCodeName(obj, index);
         setDeleted(obj, index);
@@ -39,7 +39,7 @@ public AnalysisGroup getNewTransientAnalysisGroup(int index) {
         return obj;
     }
 
-	public void setCodeName(AnalysisGroup obj, int index) {
+    public void setCodeName(AnalysisGroup obj, int index) {
         String codeName = "codeName_" + index;
         if (codeName.length() > 255) {
             codeName = new Random().nextInt(10) + codeName.substring(1, 255);
@@ -47,17 +47,17 @@ public void setCodeName(AnalysisGroup obj, int index) {
         obj.setCodeName(codeName);
     }
 
-	public void setDeleted(AnalysisGroup obj, int index) {
+    public void setDeleted(AnalysisGroup obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setIgnored(AnalysisGroup obj, int index) {
+    public void setIgnored(AnalysisGroup obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setLsKind(AnalysisGroup obj, int index) {
+    public void setLsKind(AnalysisGroup obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -65,12 +65,12 @@ public void setLsKind(AnalysisGroup obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsTransaction(AnalysisGroup obj, int index) {
+    public void setLsTransaction(AnalysisGroup obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(AnalysisGroup obj, int index) {
+    public void setLsType(AnalysisGroup obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 255) {
             lsType = lsType.substring(0, 255);
@@ -78,7 +78,7 @@ public void setLsType(AnalysisGroup obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(AnalysisGroup obj, int index) {
+    public void setLsTypeAndKind(AnalysisGroup obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 255);
@@ -86,7 +86,7 @@ public void setLsTypeAndKind(AnalysisGroup obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedBy(AnalysisGroup obj, int index) {
+    public void setModifiedBy(AnalysisGroup obj, int index) {
         String modifiedBy = "modifiedBy_" + index;
         if (modifiedBy.length() > 255) {
             modifiedBy = modifiedBy.substring(0, 255);
@@ -94,12 +94,15 @@ public void setModifiedBy(AnalysisGroup obj, int index) {
         obj.setModifiedBy(modifiedBy);
     }
 
-	public void setModifiedDate(AnalysisGroup obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(AnalysisGroup obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setRecordedBy(AnalysisGroup obj, int index) {
+    public void setRecordedBy(AnalysisGroup obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -107,12 +110,15 @@ public void setRecordedBy(AnalysisGroup obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(AnalysisGroup obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(AnalysisGroup obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public AnalysisGroup getSpecificAnalysisGroup(int index) {
+    public AnalysisGroup getSpecificAnalysisGroup(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -125,18 +131,18 @@ public AnalysisGroup getSpecificAnalysisGroup(int index) {
         return AnalysisGroup.findAnalysisGroup(id);
     }
 
-	public AnalysisGroup getRandomAnalysisGroup() {
+    public AnalysisGroup getRandomAnalysisGroup() {
         init();
         AnalysisGroup obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return AnalysisGroup.findAnalysisGroup(id);
     }
 
-	public boolean modifyAnalysisGroup(AnalysisGroup obj) {
+    public boolean modifyAnalysisGroup(AnalysisGroup obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = AnalysisGroup.findAnalysisGroupEntries(from, to);
@@ -146,7 +152,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<AnalysisGroup>();
         for (int i = 0; i < 10; i++) {
             AnalysisGroup obj = getNewTransientAnalysisGroup(i);
@@ -156,7 +162,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupIntegrationTest.java
index 6427d762a..4409e1dbd 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupIntegrationTest.java
@@ -25,17 +25,18 @@ public class AnalysisGroupIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     AnalysisGroupDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountAnalysisGroups() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to initialize correctly", dod.getRandomAnalysisGroup());
+        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to initialize correctly",
+                dod.getRandomAnalysisGroup());
         long count = AnalysisGroup.countAnalysisGroups();
         Assert.assertTrue("Counter for 'AnalysisGroup' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindAnalysisGroup() {
         AnalysisGroup obj = dod.getRandomAnalysisGroup();
         Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindAnalysisGroup() {
         Assert.assertEquals("Find method for 'AnalysisGroup' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllAnalysisGroups() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to initialize correctly", dod.getRandomAnalysisGroup());
+        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to initialize correctly",
+                dod.getRandomAnalysisGroup());
         long count = AnalysisGroup.countAnalysisGroups();
-        Assert.assertTrue("Too expensive to perform a find all test for 'AnalysisGroup', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'AnalysisGroup', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<AnalysisGroup> result = AnalysisGroup.findAllAnalysisGroups();
         Assert.assertNotNull("Find all method for 'AnalysisGroup' illegally returned null", result);
         Assert.assertTrue("Find all method for 'AnalysisGroup' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindAnalysisGroupEntries() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to initialize correctly", dod.getRandomAnalysisGroup());
+        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to initialize correctly",
+                dod.getRandomAnalysisGroup());
         long count = AnalysisGroup.countAnalysisGroups();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<AnalysisGroup> result = AnalysisGroup.findAnalysisGroupEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'AnalysisGroup' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'AnalysisGroup' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'AnalysisGroup' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         AnalysisGroup obj = dod.getRandomAnalysisGroup();
         Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to provide an identifier", id);
         obj = AnalysisGroup.findAnalysisGroup(id);
         Assert.assertNotNull("Find method for 'AnalysisGroup' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyAnalysisGroup(obj);
+        boolean modified = dod.modifyAnalysisGroup(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'AnalysisGroup' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'AnalysisGroup' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         AnalysisGroup obj = dod.getRandomAnalysisGroup();
         Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to provide an identifier", id);
         obj = AnalysisGroup.findAnalysisGroup(id);
-        boolean modified =  dod.modifyAnalysisGroup(obj);
+        boolean modified = dod.modifyAnalysisGroup(obj);
         Integer currentVersion = obj.getVersion();
-        AnalysisGroup merged = (AnalysisGroup)obj.merge();
+        AnalysisGroup merged = (AnalysisGroup) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'AnalysisGroup' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'AnalysisGroup' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to initialize correctly", dod.getRandomAnalysisGroup());
+        Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to initialize correctly",
+                dod.getRandomAnalysisGroup());
         AnalysisGroup obj = dod.getNewTransientAnalysisGroup(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'AnalysisGroup' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'AnalysisGroup' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         AnalysisGroup obj = dod.getRandomAnalysisGroup();
         Assert.assertNotNull("Data on demand for 'AnalysisGroup' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = AnalysisGroup.findAnalysisGroup(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'AnalysisGroup' with identifier '" + id + "'", AnalysisGroup.findAnalysisGroup(id));
+        Assert.assertNull("Failed to remove 'AnalysisGroup' with identifier '" + id + "'",
+                AnalysisGroup.findAnalysisGroup(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelDataOnDemand.java
index 16be89155..f038537c8 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelDataOnDemand.java
@@ -20,14 +20,14 @@
 @Component
 public class AnalysisGroupLabelDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<AnalysisGroupLabel> data;
+    private List<AnalysisGroupLabel> data;
 
-	@Autowired
+    @Autowired
     AnalysisGroupDataOnDemand analysisGroupDataOnDemand;
 
-	public AnalysisGroupLabel getNewTransientAnalysisGroupLabel(int index) {
+    public AnalysisGroupLabel getNewTransientAnalysisGroupLabel(int index) {
         AnalysisGroupLabel obj = new AnalysisGroupLabel();
         setAnalysisGroup(obj, index);
         setDeleted(obj, index);
@@ -46,22 +46,22 @@ public AnalysisGroupLabel getNewTransientAnalysisGroupLabel(int index) {
         return obj;
     }
 
-	public void setAnalysisGroup(AnalysisGroupLabel obj, int index) {
+    public void setAnalysisGroup(AnalysisGroupLabel obj, int index) {
         AnalysisGroup analysisGroup = analysisGroupDataOnDemand.getRandomAnalysisGroup();
         obj.setAnalysisGroup(analysisGroup);
     }
 
-	public void setDeleted(AnalysisGroupLabel obj, int index) {
+    public void setDeleted(AnalysisGroupLabel obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setIgnored(AnalysisGroupLabel obj, int index) {
+    public void setIgnored(AnalysisGroupLabel obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setImageFile(AnalysisGroupLabel obj, int index) {
+    public void setImageFile(AnalysisGroupLabel obj, int index) {
         String imageFile = "imageFile_" + index;
         if (imageFile.length() > 255) {
             imageFile = imageFile.substring(0, 255);
@@ -69,7 +69,7 @@ public void setImageFile(AnalysisGroupLabel obj, int index) {
         obj.setImageFile(imageFile);
     }
 
-	public void setLabelText(AnalysisGroupLabel obj, int index) {
+    public void setLabelText(AnalysisGroupLabel obj, int index) {
         String labelText = "labelText_" + index;
         if (labelText.length() > 255) {
             labelText = labelText.substring(0, 255);
@@ -77,7 +77,7 @@ public void setLabelText(AnalysisGroupLabel obj, int index) {
         obj.setLabelText(labelText);
     }
 
-	public void setLsKind(AnalysisGroupLabel obj, int index) {
+    public void setLsKind(AnalysisGroupLabel obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -85,12 +85,12 @@ public void setLsKind(AnalysisGroupLabel obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsTransaction(AnalysisGroupLabel obj, int index) {
+    public void setLsTransaction(AnalysisGroupLabel obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(AnalysisGroupLabel obj, int index) {
+    public void setLsType(AnalysisGroupLabel obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 64) {
             lsType = lsType.substring(0, 64);
@@ -98,7 +98,7 @@ public void setLsType(AnalysisGroupLabel obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(AnalysisGroupLabel obj, int index) {
+    public void setLsTypeAndKind(AnalysisGroupLabel obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 255);
@@ -106,22 +106,25 @@ public void setLsTypeAndKind(AnalysisGroupLabel obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedDate(AnalysisGroupLabel obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(AnalysisGroupLabel obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setPhysicallyLabled(AnalysisGroupLabel obj, int index) {
+    public void setPhysicallyLabled(AnalysisGroupLabel obj, int index) {
         Boolean physicallyLabled = true;
         obj.setPhysicallyLabled(physicallyLabled);
     }
 
-	public void setPreferred(AnalysisGroupLabel obj, int index) {
+    public void setPreferred(AnalysisGroupLabel obj, int index) {
         Boolean preferred = true;
         obj.setPreferred(preferred);
     }
 
-	public void setRecordedBy(AnalysisGroupLabel obj, int index) {
+    public void setRecordedBy(AnalysisGroupLabel obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -129,12 +132,15 @@ public void setRecordedBy(AnalysisGroupLabel obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(AnalysisGroupLabel obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(AnalysisGroupLabel obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public AnalysisGroupLabel getSpecificAnalysisGroupLabel(int index) {
+    public AnalysisGroupLabel getSpecificAnalysisGroupLabel(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -147,28 +153,29 @@ public AnalysisGroupLabel getSpecificAnalysisGroupLabel(int index) {
         return AnalysisGroupLabel.findAnalysisGroupLabel(id);
     }
 
-	public AnalysisGroupLabel getRandomAnalysisGroupLabel() {
+    public AnalysisGroupLabel getRandomAnalysisGroupLabel() {
         init();
         AnalysisGroupLabel obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return AnalysisGroupLabel.findAnalysisGroupLabel(id);
     }
 
-	public boolean modifyAnalysisGroupLabel(AnalysisGroupLabel obj) {
+    public boolean modifyAnalysisGroupLabel(AnalysisGroupLabel obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = AnalysisGroupLabel.findAnalysisGroupLabelEntries(from, to);
         if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'AnalysisGroupLabel' illegally returned null");
+            throw new IllegalStateException(
+                    "Find entries implementation for 'AnalysisGroupLabel' illegally returned null");
         }
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<AnalysisGroupLabel>();
         for (int i = 0; i < 10; i++) {
             AnalysisGroupLabel obj = getNewTransientAnalysisGroupLabel(i);
@@ -178,7 +185,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelIntegrationTest.java
index 5808f4f53..def0ecb5e 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupLabelIntegrationTest.java
@@ -25,17 +25,18 @@ public class AnalysisGroupLabelIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     AnalysisGroupLabelDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountAnalysisGroupLabels() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to initialize correctly", dod.getRandomAnalysisGroupLabel());
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to initialize correctly",
+                dod.getRandomAnalysisGroupLabel());
         long count = AnalysisGroupLabel.countAnalysisGroupLabels();
         Assert.assertTrue("Counter for 'AnalysisGroupLabel' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindAnalysisGroupLabel() {
         AnalysisGroupLabel obj = dod.getRandomAnalysisGroupLabel();
         Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindAnalysisGroupLabel() {
         Assert.assertEquals("Find method for 'AnalysisGroupLabel' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllAnalysisGroupLabels() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to initialize correctly", dod.getRandomAnalysisGroupLabel());
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to initialize correctly",
+                dod.getRandomAnalysisGroupLabel());
         long count = AnalysisGroupLabel.countAnalysisGroupLabels();
-        Assert.assertTrue("Too expensive to perform a find all test for 'AnalysisGroupLabel', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'AnalysisGroupLabel', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<AnalysisGroupLabel> result = AnalysisGroupLabel.findAllAnalysisGroupLabels();
         Assert.assertNotNull("Find all method for 'AnalysisGroupLabel' illegally returned null", result);
         Assert.assertTrue("Find all method for 'AnalysisGroupLabel' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindAnalysisGroupLabelEntries() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to initialize correctly", dod.getRandomAnalysisGroupLabel());
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to initialize correctly",
+                dod.getRandomAnalysisGroupLabel());
         long count = AnalysisGroupLabel.countAnalysisGroupLabels();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<AnalysisGroupLabel> result = AnalysisGroupLabel.findAnalysisGroupLabelEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'AnalysisGroupLabel' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'AnalysisGroupLabel' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'AnalysisGroupLabel' returned an incorrect number of entries",
+                count, result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         AnalysisGroupLabel obj = dod.getRandomAnalysisGroupLabel();
         Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to provide an identifier", id);
         obj = AnalysisGroupLabel.findAnalysisGroupLabel(id);
         Assert.assertNotNull("Find method for 'AnalysisGroupLabel' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyAnalysisGroupLabel(obj);
+        boolean modified = dod.modifyAnalysisGroupLabel(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'AnalysisGroupLabel' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'AnalysisGroupLabel' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         AnalysisGroupLabel obj = dod.getRandomAnalysisGroupLabel();
         Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to provide an identifier", id);
         obj = AnalysisGroupLabel.findAnalysisGroupLabel(id);
-        boolean modified =  dod.modifyAnalysisGroupLabel(obj);
+        boolean modified = dod.modifyAnalysisGroupLabel(obj);
         Integer currentVersion = obj.getVersion();
-        AnalysisGroupLabel merged = (AnalysisGroupLabel)obj.merge();
+        AnalysisGroupLabel merged = (AnalysisGroupLabel) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'AnalysisGroupLabel' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'AnalysisGroupLabel' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to initialize correctly", dod.getRandomAnalysisGroupLabel());
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to initialize correctly",
+                dod.getRandomAnalysisGroupLabel());
         AnalysisGroupLabel obj = dod.getNewTransientAnalysisGroupLabel(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'AnalysisGroupLabel' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'AnalysisGroupLabel' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         AnalysisGroupLabel obj = dod.getRandomAnalysisGroupLabel();
         Assert.assertNotNull("Data on demand for 'AnalysisGroupLabel' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = AnalysisGroupLabel.findAnalysisGroupLabel(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'AnalysisGroupLabel' with identifier '" + id + "'", AnalysisGroupLabel.findAnalysisGroupLabel(id));
+        Assert.assertNull("Failed to remove 'AnalysisGroupLabel' with identifier '" + id + "'",
+                AnalysisGroupLabel.findAnalysisGroupLabel(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateDataOnDemand.java
index c360ec19b..392441ef8 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateDataOnDemand.java
@@ -20,14 +20,14 @@
 @Configurable
 public class AnalysisGroupStateDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<AnalysisGroupState> data;
+    private List<AnalysisGroupState> data;
 
-	@Autowired
+    @Autowired
     AnalysisGroupDataOnDemand analysisGroupDataOnDemand;
 
-	public AnalysisGroupState getNewTransientAnalysisGroupState(int index) {
+    public AnalysisGroupState getNewTransientAnalysisGroupState(int index) {
         AnalysisGroupState obj = new AnalysisGroupState();
         setAnalysisGroup(obj, index);
         setComments(obj, index);
@@ -44,12 +44,12 @@ public AnalysisGroupState getNewTransientAnalysisGroupState(int index) {
         return obj;
     }
 
-	public void setAnalysisGroup(AnalysisGroupState obj, int index) {
+    public void setAnalysisGroup(AnalysisGroupState obj, int index) {
         AnalysisGroup analysisGroup = analysisGroupDataOnDemand.getRandomAnalysisGroup();
         obj.setAnalysisGroup(analysisGroup);
     }
 
-	public void setComments(AnalysisGroupState obj, int index) {
+    public void setComments(AnalysisGroupState obj, int index) {
         String comments = "comments_" + index;
         if (comments.length() > 512) {
             comments = comments.substring(0, 512);
@@ -57,17 +57,17 @@ public void setComments(AnalysisGroupState obj, int index) {
         obj.setComments(comments);
     }
 
-	public void setDeleted(AnalysisGroupState obj, int index) {
+    public void setDeleted(AnalysisGroupState obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setIgnored(AnalysisGroupState obj, int index) {
+    public void setIgnored(AnalysisGroupState obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setLsKind(AnalysisGroupState obj, int index) {
+    public void setLsKind(AnalysisGroupState obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -75,12 +75,12 @@ public void setLsKind(AnalysisGroupState obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsTransaction(AnalysisGroupState obj, int index) {
+    public void setLsTransaction(AnalysisGroupState obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(AnalysisGroupState obj, int index) {
+    public void setLsType(AnalysisGroupState obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 64) {
             lsType = lsType.substring(0, 64);
@@ -88,7 +88,7 @@ public void setLsType(AnalysisGroupState obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(AnalysisGroupState obj, int index) {
+    public void setLsTypeAndKind(AnalysisGroupState obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 255);
@@ -96,7 +96,7 @@ public void setLsTypeAndKind(AnalysisGroupState obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedBy(AnalysisGroupState obj, int index) {
+    public void setModifiedBy(AnalysisGroupState obj, int index) {
         String modifiedBy = "modifiedBy_" + index;
         if (modifiedBy.length() > 255) {
             modifiedBy = modifiedBy.substring(0, 255);
@@ -104,12 +104,15 @@ public void setModifiedBy(AnalysisGroupState obj, int index) {
         obj.setModifiedBy(modifiedBy);
     }
 
-	public void setModifiedDate(AnalysisGroupState obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(AnalysisGroupState obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setRecordedBy(AnalysisGroupState obj, int index) {
+    public void setRecordedBy(AnalysisGroupState obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -117,12 +120,15 @@ public void setRecordedBy(AnalysisGroupState obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(AnalysisGroupState obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(AnalysisGroupState obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public AnalysisGroupState getSpecificAnalysisGroupState(int index) {
+    public AnalysisGroupState getSpecificAnalysisGroupState(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -135,28 +141,29 @@ public AnalysisGroupState getSpecificAnalysisGroupState(int index) {
         return AnalysisGroupState.findAnalysisGroupState(id);
     }
 
-	public AnalysisGroupState getRandomAnalysisGroupState() {
+    public AnalysisGroupState getRandomAnalysisGroupState() {
         init();
         AnalysisGroupState obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return AnalysisGroupState.findAnalysisGroupState(id);
     }
 
-	public boolean modifyAnalysisGroupState(AnalysisGroupState obj) {
+    public boolean modifyAnalysisGroupState(AnalysisGroupState obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = AnalysisGroupState.findAnalysisGroupStateEntries(from, to);
         if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'AnalysisGroupState' illegally returned null");
+            throw new IllegalStateException(
+                    "Find entries implementation for 'AnalysisGroupState' illegally returned null");
         }
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<AnalysisGroupState>();
         for (int i = 0; i < 10; i++) {
             AnalysisGroupState obj = getNewTransientAnalysisGroupState(i);
@@ -166,7 +173,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateIntegrationTest.java
index 16f39cbcb..506fecf25 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupStateIntegrationTest.java
@@ -25,17 +25,18 @@ public class AnalysisGroupStateIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     AnalysisGroupStateDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountAnalysisGroupStates() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to initialize correctly", dod.getRandomAnalysisGroupState());
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to initialize correctly",
+                dod.getRandomAnalysisGroupState());
         long count = AnalysisGroupState.countAnalysisGroupStates();
         Assert.assertTrue("Counter for 'AnalysisGroupState' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindAnalysisGroupState() {
         AnalysisGroupState obj = dod.getRandomAnalysisGroupState();
         Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindAnalysisGroupState() {
         Assert.assertEquals("Find method for 'AnalysisGroupState' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllAnalysisGroupStates() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to initialize correctly", dod.getRandomAnalysisGroupState());
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to initialize correctly",
+                dod.getRandomAnalysisGroupState());
         long count = AnalysisGroupState.countAnalysisGroupStates();
-        Assert.assertTrue("Too expensive to perform a find all test for 'AnalysisGroupState', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'AnalysisGroupState', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<AnalysisGroupState> result = AnalysisGroupState.findAllAnalysisGroupStates();
         Assert.assertNotNull("Find all method for 'AnalysisGroupState' illegally returned null", result);
         Assert.assertTrue("Find all method for 'AnalysisGroupState' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindAnalysisGroupStateEntries() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to initialize correctly", dod.getRandomAnalysisGroupState());
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to initialize correctly",
+                dod.getRandomAnalysisGroupState());
         long count = AnalysisGroupState.countAnalysisGroupStates();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<AnalysisGroupState> result = AnalysisGroupState.findAnalysisGroupStateEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'AnalysisGroupState' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'AnalysisGroupState' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'AnalysisGroupState' returned an incorrect number of entries",
+                count, result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         AnalysisGroupState obj = dod.getRandomAnalysisGroupState();
         Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to provide an identifier", id);
         obj = AnalysisGroupState.findAnalysisGroupState(id);
         Assert.assertNotNull("Find method for 'AnalysisGroupState' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyAnalysisGroupState(obj);
+        boolean modified = dod.modifyAnalysisGroupState(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'AnalysisGroupState' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'AnalysisGroupState' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         AnalysisGroupState obj = dod.getRandomAnalysisGroupState();
         Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to provide an identifier", id);
         obj = AnalysisGroupState.findAnalysisGroupState(id);
-        boolean modified =  dod.modifyAnalysisGroupState(obj);
+        boolean modified = dod.modifyAnalysisGroupState(obj);
         Integer currentVersion = obj.getVersion();
-        AnalysisGroupState merged = (AnalysisGroupState)obj.merge();
+        AnalysisGroupState merged = (AnalysisGroupState) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'AnalysisGroupState' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'AnalysisGroupState' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to initialize correctly", dod.getRandomAnalysisGroupState());
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to initialize correctly",
+                dod.getRandomAnalysisGroupState());
         AnalysisGroupState obj = dod.getNewTransientAnalysisGroupState(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'AnalysisGroupState' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'AnalysisGroupState' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         AnalysisGroupState obj = dod.getRandomAnalysisGroupState();
         Assert.assertNotNull("Data on demand for 'AnalysisGroupState' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = AnalysisGroupState.findAnalysisGroupState(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'AnalysisGroupState' with identifier '" + id + "'", AnalysisGroupState.findAnalysisGroupState(id));
+        Assert.assertNull("Failed to remove 'AnalysisGroupState' with identifier '" + id + "'",
+                AnalysisGroupState.findAnalysisGroupState(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueDataOnDemand.java
index efa036550..c957e7438 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueDataOnDemand.java
@@ -21,14 +21,14 @@
 @Component
 public class AnalysisGroupValueDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<AnalysisGroupValue> data;
+    private List<AnalysisGroupValue> data;
 
-	@Autowired
+    @Autowired
     AnalysisGroupStateDataOnDemand analysisGroupStateDataOnDemand;
 
-	public AnalysisGroupValue getNewTransientAnalysisGroupValue(int index) {
+    public AnalysisGroupValue getNewTransientAnalysisGroupValue(int index) {
         AnalysisGroupValue obj = new AnalysisGroupValue();
         setBlobValue(obj, index);
         setClobValue(obj, index);
@@ -70,17 +70,17 @@ public AnalysisGroupValue getNewTransientAnalysisGroupValue(int index) {
         return obj;
     }
 
-	public void setBlobValue(AnalysisGroupValue obj, int index) {
+    public void setBlobValue(AnalysisGroupValue obj, int index) {
         byte[] blobValue = String.valueOf(index).getBytes();
         obj.setBlobValue(blobValue);
     }
 
-	public void setClobValue(AnalysisGroupValue obj, int index) {
+    public void setClobValue(AnalysisGroupValue obj, int index) {
         String clobValue = "clobValue_" + index;
         obj.setClobValue(clobValue);
     }
 
-	public void setCodeKind(AnalysisGroupValue obj, int index) {
+    public void setCodeKind(AnalysisGroupValue obj, int index) {
         String codeKind = "codeKind_" + index;
         if (codeKind.length() > 255) {
             codeKind = codeKind.substring(0, 255);
@@ -88,7 +88,7 @@ public void setCodeKind(AnalysisGroupValue obj, int index) {
         obj.setCodeKind(codeKind);
     }
 
-	public void setCodeOrigin(AnalysisGroupValue obj, int index) {
+    public void setCodeOrigin(AnalysisGroupValue obj, int index) {
         String codeOrigin = "codeOrigin_" + index;
         if (codeOrigin.length() > 255) {
             codeOrigin = codeOrigin.substring(0, 255);
@@ -96,7 +96,7 @@ public void setCodeOrigin(AnalysisGroupValue obj, int index) {
         obj.setCodeOrigin(codeOrigin);
     }
 
-	public void setCodeType(AnalysisGroupValue obj, int index) {
+    public void setCodeType(AnalysisGroupValue obj, int index) {
         String codeType = "codeType_" + index;
         if (codeType.length() > 255) {
             codeType = codeType.substring(0, 255);
@@ -104,7 +104,7 @@ public void setCodeType(AnalysisGroupValue obj, int index) {
         obj.setCodeType(codeType);
     }
 
-	public void setCodeTypeAndKind(AnalysisGroupValue obj, int index) {
+    public void setCodeTypeAndKind(AnalysisGroupValue obj, int index) {
         String codeTypeAndKind = "codeTypeAndKind_" + index;
         if (codeTypeAndKind.length() > 350) {
             codeTypeAndKind = codeTypeAndKind.substring(0, 350);
@@ -112,7 +112,7 @@ public void setCodeTypeAndKind(AnalysisGroupValue obj, int index) {
         obj.setCodeTypeAndKind(codeTypeAndKind);
     }
 
-	public void setCodeValue(AnalysisGroupValue obj, int index) {
+    public void setCodeValue(AnalysisGroupValue obj, int index) {
         String codeValue = "codeValue_" + index;
         if (codeValue.length() > 255) {
             codeValue = codeValue.substring(0, 255);
@@ -120,7 +120,7 @@ public void setCodeValue(AnalysisGroupValue obj, int index) {
         obj.setCodeValue(codeValue);
     }
 
-	public void setComments(AnalysisGroupValue obj, int index) {
+    public void setComments(AnalysisGroupValue obj, int index) {
         String comments = "comments_" + index;
         if (comments.length() > 512) {
             comments = comments.substring(0, 512);
@@ -128,7 +128,7 @@ public void setComments(AnalysisGroupValue obj, int index) {
         obj.setComments(comments);
     }
 
-	public void setConcUnit(AnalysisGroupValue obj, int index) {
+    public void setConcUnit(AnalysisGroupValue obj, int index) {
         String concUnit = "concUnit_" + index;
         if (concUnit.length() > 25) {
             concUnit = concUnit.substring(0, 25);
@@ -136,22 +136,25 @@ public void setConcUnit(AnalysisGroupValue obj, int index) {
         obj.setConcUnit(concUnit);
     }
 
-	public void setConcentration(AnalysisGroupValue obj, int index) {
+    public void setConcentration(AnalysisGroupValue obj, int index) {
         Double concentration = new Integer(index).doubleValue();
         obj.setConcentration(concentration);
     }
 
-	public void setDateValue(AnalysisGroupValue obj, int index) {
-        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setDateValue(AnalysisGroupValue obj, int index) {
+        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setDateValue(dateValue);
     }
 
-	public void setDeleted(AnalysisGroupValue obj, int index) {
+    public void setDeleted(AnalysisGroupValue obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setFileValue(AnalysisGroupValue obj, int index) {
+    public void setFileValue(AnalysisGroupValue obj, int index) {
         String fileValue = "fileValue_" + index;
         if (fileValue.length() > 512) {
             fileValue = fileValue.substring(0, 512);
@@ -159,12 +162,12 @@ public void setFileValue(AnalysisGroupValue obj, int index) {
         obj.setFileValue(fileValue);
     }
 
-	public void setIgnored(AnalysisGroupValue obj, int index) {
+    public void setIgnored(AnalysisGroupValue obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setLsKind(AnalysisGroupValue obj, int index) {
+    public void setLsKind(AnalysisGroupValue obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -172,17 +175,17 @@ public void setLsKind(AnalysisGroupValue obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsState(AnalysisGroupValue obj, int index) {
+    public void setLsState(AnalysisGroupValue obj, int index) {
         AnalysisGroupState lsState = analysisGroupStateDataOnDemand.getRandomAnalysisGroupState();
         obj.setLsState(lsState);
     }
 
-	public void setLsTransaction(AnalysisGroupValue obj, int index) {
+    public void setLsTransaction(AnalysisGroupValue obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(AnalysisGroupValue obj, int index) {
+    public void setLsType(AnalysisGroupValue obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 64) {
             lsType = lsType.substring(0, 64);
@@ -190,7 +193,7 @@ public void setLsType(AnalysisGroupValue obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(AnalysisGroupValue obj, int index) {
+    public void setLsTypeAndKind(AnalysisGroupValue obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 350) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 350);
@@ -198,7 +201,7 @@ public void setLsTypeAndKind(AnalysisGroupValue obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedBy(AnalysisGroupValue obj, int index) {
+    public void setModifiedBy(AnalysisGroupValue obj, int index) {
         String modifiedBy = "modifiedBy_" + index;
         if (modifiedBy.length() > 255) {
             modifiedBy = modifiedBy.substring(0, 255);
@@ -206,17 +209,20 @@ public void setModifiedBy(AnalysisGroupValue obj, int index) {
         obj.setModifiedBy(modifiedBy);
     }
 
-	public void setModifiedDate(AnalysisGroupValue obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(AnalysisGroupValue obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setNumberOfReplicates(AnalysisGroupValue obj, int index) {
+    public void setNumberOfReplicates(AnalysisGroupValue obj, int index) {
         Integer numberOfReplicates = new Integer(index);
         obj.setNumberOfReplicates(numberOfReplicates);
     }
 
-	public void setNumericValue(AnalysisGroupValue obj, int index) {
+    public void setNumericValue(AnalysisGroupValue obj, int index) {
         BigDecimal numericValue = BigDecimal.valueOf(index);
         if (numericValue.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
             numericValue = new BigDecimal("99999999999999999999.999999999999999999");
@@ -224,7 +230,7 @@ public void setNumericValue(AnalysisGroupValue obj, int index) {
         obj.setNumericValue(numericValue);
     }
 
-	public void setOperatorKind(AnalysisGroupValue obj, int index) {
+    public void setOperatorKind(AnalysisGroupValue obj, int index) {
         String operatorKind = "operator_" + index;
         if (operatorKind.length() > 10) {
             operatorKind = operatorKind.substring(0, 10);
@@ -232,7 +238,7 @@ public void setOperatorKind(AnalysisGroupValue obj, int index) {
         obj.setOperatorKind(operatorKind);
     }
 
-	public void setOperatorType(AnalysisGroupValue obj, int index) {
+    public void setOperatorType(AnalysisGroupValue obj, int index) {
         String operatorType = "operatorType_" + index;
         if (operatorType.length() > 25) {
             operatorType = operatorType.substring(0, 25);
@@ -240,7 +246,7 @@ public void setOperatorType(AnalysisGroupValue obj, int index) {
         obj.setOperatorType(operatorType);
     }
 
-	public void setOperatorTypeAndKind(AnalysisGroupValue obj, int index) {
+    public void setOperatorTypeAndKind(AnalysisGroupValue obj, int index) {
         String operatorTypeAndKind = "operatorTypeAndKind_" + index;
         if (operatorTypeAndKind.length() > 50) {
             operatorTypeAndKind = operatorTypeAndKind.substring(0, 50);
@@ -248,12 +254,12 @@ public void setOperatorTypeAndKind(AnalysisGroupValue obj, int index) {
         obj.setOperatorTypeAndKind(operatorTypeAndKind);
     }
 
-	public void setPublicData(AnalysisGroupValue obj, int index) {
+    public void setPublicData(AnalysisGroupValue obj, int index) {
         Boolean publicData = true;
         obj.setPublicData(publicData);
     }
 
-	public void setRecordedBy(AnalysisGroupValue obj, int index) {
+    public void setRecordedBy(AnalysisGroupValue obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -261,17 +267,20 @@ public void setRecordedBy(AnalysisGroupValue obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(AnalysisGroupValue obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(AnalysisGroupValue obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public void setSigFigs(AnalysisGroupValue obj, int index) {
+    public void setSigFigs(AnalysisGroupValue obj, int index) {
         Integer sigFigs = new Integer(index);
         obj.setSigFigs(sigFigs);
     }
 
-	public void setStringValue(AnalysisGroupValue obj, int index) {
+    public void setStringValue(AnalysisGroupValue obj, int index) {
         String stringValue = "stringValue_" + index;
         if (stringValue.length() > 255) {
             stringValue = stringValue.substring(0, 255);
@@ -279,7 +288,7 @@ public void setStringValue(AnalysisGroupValue obj, int index) {
         obj.setStringValue(stringValue);
     }
 
-	public void setUncertainty(AnalysisGroupValue obj, int index) {
+    public void setUncertainty(AnalysisGroupValue obj, int index) {
         BigDecimal uncertainty = BigDecimal.valueOf(index);
         if (uncertainty.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
             uncertainty = new BigDecimal("99999999999999999999.999999999999999999");
@@ -287,7 +296,7 @@ public void setUncertainty(AnalysisGroupValue obj, int index) {
         obj.setUncertainty(uncertainty);
     }
 
-	public void setUncertaintyType(AnalysisGroupValue obj, int index) {
+    public void setUncertaintyType(AnalysisGroupValue obj, int index) {
         String uncertaintyType = "uncertaintyType_" + index;
         if (uncertaintyType.length() > 255) {
             uncertaintyType = uncertaintyType.substring(0, 255);
@@ -295,7 +304,7 @@ public void setUncertaintyType(AnalysisGroupValue obj, int index) {
         obj.setUncertaintyType(uncertaintyType);
     }
 
-	public void setUnitKind(AnalysisGroupValue obj, int index) {
+    public void setUnitKind(AnalysisGroupValue obj, int index) {
         String unitKind = "unitKind_" + index;
         if (unitKind.length() > 25) {
             unitKind = unitKind.substring(0, 25);
@@ -303,7 +312,7 @@ public void setUnitKind(AnalysisGroupValue obj, int index) {
         obj.setUnitKind(unitKind);
     }
 
-	public void setUnitType(AnalysisGroupValue obj, int index) {
+    public void setUnitType(AnalysisGroupValue obj, int index) {
         String unitType = "unitType_" + index;
         if (unitType.length() > 25) {
             unitType = unitType.substring(0, 25);
@@ -311,7 +320,7 @@ public void setUnitType(AnalysisGroupValue obj, int index) {
         obj.setUnitType(unitType);
     }
 
-	public void setUnitTypeAndKind(AnalysisGroupValue obj, int index) {
+    public void setUnitTypeAndKind(AnalysisGroupValue obj, int index) {
         String unitTypeAndKind = "unitTypeAndKind_" + index;
         if (unitTypeAndKind.length() > 55) {
             unitTypeAndKind = unitTypeAndKind.substring(0, 55);
@@ -319,7 +328,7 @@ public void setUnitTypeAndKind(AnalysisGroupValue obj, int index) {
         obj.setUnitTypeAndKind(unitTypeAndKind);
     }
 
-	public void setUrlValue(AnalysisGroupValue obj, int index) {
+    public void setUrlValue(AnalysisGroupValue obj, int index) {
         String urlValue = "urlValue_" + index;
         if (urlValue.length() > 2000) {
             urlValue = urlValue.substring(0, 2000);
@@ -327,7 +336,7 @@ public void setUrlValue(AnalysisGroupValue obj, int index) {
         obj.setUrlValue(urlValue);
     }
 
-	public AnalysisGroupValue getSpecificAnalysisGroupValue(int index) {
+    public AnalysisGroupValue getSpecificAnalysisGroupValue(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -340,28 +349,29 @@ public AnalysisGroupValue getSpecificAnalysisGroupValue(int index) {
         return AnalysisGroupValue.findAnalysisGroupValue(id);
     }
 
-	public AnalysisGroupValue getRandomAnalysisGroupValue() {
+    public AnalysisGroupValue getRandomAnalysisGroupValue() {
         init();
         AnalysisGroupValue obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return AnalysisGroupValue.findAnalysisGroupValue(id);
     }
 
-	public boolean modifyAnalysisGroupValue(AnalysisGroupValue obj) {
+    public boolean modifyAnalysisGroupValue(AnalysisGroupValue obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = AnalysisGroupValue.findAnalysisGroupValueEntries(from, to);
         if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'AnalysisGroupValue' illegally returned null");
+            throw new IllegalStateException(
+                    "Find entries implementation for 'AnalysisGroupValue' illegally returned null");
         }
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<AnalysisGroupValue>();
         for (int i = 0; i < 10; i++) {
             AnalysisGroupValue obj = getNewTransientAnalysisGroupValue(i);
@@ -371,7 +381,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueIntegrationTest.java
index 6522b9e3c..b583d42a3 100755
--- a/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/AnalysisGroupValueIntegrationTest.java
@@ -25,17 +25,18 @@ public class AnalysisGroupValueIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     AnalysisGroupValueDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountAnalysisGroupValues() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to initialize correctly", dod.getRandomAnalysisGroupValue());
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to initialize correctly",
+                dod.getRandomAnalysisGroupValue());
         long count = AnalysisGroupValue.countAnalysisGroupValues();
         Assert.assertTrue("Counter for 'AnalysisGroupValue' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindAnalysisGroupValue() {
         AnalysisGroupValue obj = dod.getRandomAnalysisGroupValue();
         Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindAnalysisGroupValue() {
         Assert.assertEquals("Find method for 'AnalysisGroupValue' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllAnalysisGroupValues() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to initialize correctly", dod.getRandomAnalysisGroupValue());
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to initialize correctly",
+                dod.getRandomAnalysisGroupValue());
         long count = AnalysisGroupValue.countAnalysisGroupValues();
-        Assert.assertTrue("Too expensive to perform a find all test for 'AnalysisGroupValue', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'AnalysisGroupValue', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<AnalysisGroupValue> result = AnalysisGroupValue.findAllAnalysisGroupValues();
         Assert.assertNotNull("Find all method for 'AnalysisGroupValue' illegally returned null", result);
         Assert.assertTrue("Find all method for 'AnalysisGroupValue' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindAnalysisGroupValueEntries() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to initialize correctly", dod.getRandomAnalysisGroupValue());
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to initialize correctly",
+                dod.getRandomAnalysisGroupValue());
         long count = AnalysisGroupValue.countAnalysisGroupValues();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<AnalysisGroupValue> result = AnalysisGroupValue.findAnalysisGroupValueEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'AnalysisGroupValue' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'AnalysisGroupValue' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'AnalysisGroupValue' returned an incorrect number of entries",
+                count, result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         AnalysisGroupValue obj = dod.getRandomAnalysisGroupValue();
         Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to provide an identifier", id);
         obj = AnalysisGroupValue.findAnalysisGroupValue(id);
         Assert.assertNotNull("Find method for 'AnalysisGroupValue' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyAnalysisGroupValue(obj);
+        boolean modified = dod.modifyAnalysisGroupValue(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'AnalysisGroupValue' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'AnalysisGroupValue' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         AnalysisGroupValue obj = dod.getRandomAnalysisGroupValue();
         Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to provide an identifier", id);
         obj = AnalysisGroupValue.findAnalysisGroupValue(id);
-        boolean modified =  dod.modifyAnalysisGroupValue(obj);
+        boolean modified = dod.modifyAnalysisGroupValue(obj);
         Integer currentVersion = obj.getVersion();
-        AnalysisGroupValue merged = (AnalysisGroupValue)obj.merge();
+        AnalysisGroupValue merged = (AnalysisGroupValue) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'AnalysisGroupValue' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'AnalysisGroupValue' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to initialize correctly", dod.getRandomAnalysisGroupValue());
+        Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to initialize correctly",
+                dod.getRandomAnalysisGroupValue());
         AnalysisGroupValue obj = dod.getNewTransientAnalysisGroupValue(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'AnalysisGroupValue' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'AnalysisGroupValue' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         AnalysisGroupValue obj = dod.getRandomAnalysisGroupValue();
         Assert.assertNotNull("Data on demand for 'AnalysisGroupValue' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = AnalysisGroupValue.findAnalysisGroupValue(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'AnalysisGroupValue' with identifier '" + id + "'", AnalysisGroupValue.findAnalysisGroupValue(id));
+        Assert.assertNull("Failed to remove 'AnalysisGroupValue' with identifier '" + id + "'",
+                AnalysisGroupValue.findAnalysisGroupValue(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/AuthorDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/AuthorDataOnDemand.java
index f510a6e52..864d54a84 100755
--- a/src/test/java/com/labsynch/labseer/domain/AuthorDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/AuthorDataOnDemand.java
@@ -19,11 +19,11 @@
 @Configurable
 public class AuthorDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<Author> data;
+    private List<Author> data;
 
-	public Author getNewTransientAuthor(int index) {
+    public Author getNewTransientAuthor(int index) {
         Author obj = new Author();
         setActivationDate(obj, index);
         setActivationKey(obj, index);
@@ -48,17 +48,20 @@ public Author getNewTransientAuthor(int index) {
         return obj;
     }
 
-	public void setActivationDate(Author obj, int index) {
-        Date activationDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setActivationDate(Author obj, int index) {
+        Date activationDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setActivationDate(activationDate);
     }
 
-	public void setActivationKey(Author obj, int index) {
+    public void setActivationKey(Author obj, int index) {
         String activationKey = "activationKey_" + index;
         obj.setActivationKey(activationKey);
     }
 
-	public void setCodeName(Author obj, int index) {
+    public void setCodeName(Author obj, int index) {
         String codeName = "codeName_" + index;
         if (codeName.length() > 255) {
             codeName = new Random().nextInt(10) + codeName.substring(1, 255);
@@ -66,12 +69,12 @@ public void setCodeName(Author obj, int index) {
         obj.setCodeName(codeName);
     }
 
-	public void setDeleted(Author obj, int index) {
+    public void setDeleted(Author obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setEmailAddress(Author obj, int index) {
+    public void setEmailAddress(Author obj, int index) {
         String emailAddress = "foo" + index + "@bar.com";
         if (emailAddress.length() > 255) {
             emailAddress = emailAddress.substring(0, 255);
@@ -79,12 +82,12 @@ public void setEmailAddress(Author obj, int index) {
         obj.setEmailAddress(emailAddress);
     }
 
-	public void setEnabled(Author obj, int index) {
+    public void setEnabled(Author obj, int index) {
         Boolean enabled = Boolean.TRUE;
         obj.setEnabled(enabled);
     }
 
-	public void setFirstName(Author obj, int index) {
+    public void setFirstName(Author obj, int index) {
         String firstName = "firstName_" + index;
         if (firstName.length() > 255) {
             firstName = firstName.substring(0, 255);
@@ -92,12 +95,12 @@ public void setFirstName(Author obj, int index) {
         obj.setFirstName(firstName);
     }
 
-	public void setIgnored(Author obj, int index) {
+    public void setIgnored(Author obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setLastName(Author obj, int index) {
+    public void setLastName(Author obj, int index) {
         String lastName = "lastName_" + index;
         if (lastName.length() > 255) {
             lastName = lastName.substring(0, 255);
@@ -105,12 +108,12 @@ public void setLastName(Author obj, int index) {
         obj.setLastName(lastName);
     }
 
-	public void setLocked(Author obj, int index) {
+    public void setLocked(Author obj, int index) {
         Boolean locked = Boolean.TRUE;
         obj.setLocked(locked);
     }
 
-	public void setLsKind(Author obj, int index) {
+    public void setLsKind(Author obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -118,12 +121,12 @@ public void setLsKind(Author obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsTransaction(Author obj, int index) {
+    public void setLsTransaction(Author obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(Author obj, int index) {
+    public void setLsType(Author obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 255) {
             lsType = lsType.substring(0, 255);
@@ -131,7 +134,7 @@ public void setLsType(Author obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(Author obj, int index) {
+    public void setLsTypeAndKind(Author obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 255);
@@ -139,7 +142,7 @@ public void setLsTypeAndKind(Author obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedBy(Author obj, int index) {
+    public void setModifiedBy(Author obj, int index) {
         String modifiedBy = "modifiedBy_" + index;
         if (modifiedBy.length() > 255) {
             modifiedBy = modifiedBy.substring(0, 255);
@@ -147,12 +150,15 @@ public void setModifiedBy(Author obj, int index) {
         obj.setModifiedBy(modifiedBy);
     }
 
-	public void setModifiedDate(Author obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(Author obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setPassword(Author obj, int index) {
+    public void setPassword(Author obj, int index) {
         String password = "password_" + index;
         if (password.length() > 255) {
             password = password.substring(0, 255);
@@ -160,7 +166,7 @@ public void setPassword(Author obj, int index) {
         obj.setPassword(password);
     }
 
-	public void setRecordedBy(Author obj, int index) {
+    public void setRecordedBy(Author obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -168,12 +174,15 @@ public void setRecordedBy(Author obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(Author obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(Author obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public void setUserName(Author obj, int index) {
+    public void setUserName(Author obj, int index) {
         String userName = "userName_" + index;
         if (userName.length() > 255) {
             userName = userName.substring(0, 255);
@@ -181,7 +190,7 @@ public void setUserName(Author obj, int index) {
         obj.setUserName(userName);
     }
 
-	public Author getSpecificAuthor(int index) {
+    public Author getSpecificAuthor(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -194,18 +203,18 @@ public Author getSpecificAuthor(int index) {
         return Author.findAuthor(id);
     }
 
-	public Author getRandomAuthor() {
+    public Author getRandomAuthor() {
         init();
         Author obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return Author.findAuthor(id);
     }
 
-	public boolean modifyAuthor(Author obj) {
+    public boolean modifyAuthor(Author obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = Author.findAuthorEntries(from, to);
@@ -215,7 +224,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<Author>();
         for (int i = 0; i < 10; i++) {
             Author obj = getNewTransientAuthor(i);
@@ -225,7 +234,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/AuthorIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/AuthorIntegrationTest.java
index ef16c1538..6d90a8aee 100755
--- a/src/test/java/com/labsynch/labseer/domain/AuthorIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/AuthorIntegrationTest.java
@@ -24,19 +24,18 @@ public class AuthorIntegrationTest {
     @Test
     public void testMarkerMethod() {
     }
-    
 
-	@Autowired
+    @Autowired
     AuthorDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountAuthors() {
         Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", dod.getRandomAuthor());
         long count = Author.countAuthors();
         Assert.assertTrue("Counter for 'Author' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindAuthor() {
         Author obj = dod.getRandomAuthor();
         Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", obj);
@@ -47,29 +46,33 @@ public void testFindAuthor() {
         Assert.assertEquals("Find method for 'Author' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllAuthors() {
         Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", dod.getRandomAuthor());
         long count = Author.countAuthors();
-        Assert.assertTrue("Too expensive to perform a find all test for 'Author', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'Author', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<Author> result = Author.findAllAuthors();
         Assert.assertNotNull("Find all method for 'Author' illegally returned null", result);
         Assert.assertTrue("Find all method for 'Author' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindAuthorEntries() {
         Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", dod.getRandomAuthor());
         long count = Author.countAuthors();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<Author> result = Author.findAuthorEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'Author' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'Author' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'Author' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         Author obj = dod.getRandomAuthor();
         Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", obj);
@@ -77,28 +80,31 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'Author' failed to provide an identifier", id);
         obj = Author.findAuthor(id);
         Assert.assertNotNull("Find method for 'Author' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyAuthor(obj);
+        boolean modified = dod.modifyAuthor(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'Author' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'Author' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         Author obj = dod.getRandomAuthor();
         Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'Author' failed to provide an identifier", id);
         obj = Author.findAuthor(id);
-        boolean modified =  dod.modifyAuthor(obj);
+        boolean modified = dod.modifyAuthor(obj);
         Integer currentVersion = obj.getVersion();
-        Author merged = (Author)obj.merge();
+        Author merged = (Author) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'Author' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'Author' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
         Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", dod.getRandomAuthor());
         Author obj = dod.getNewTransientAuthor(Integer.MAX_VALUE);
@@ -110,7 +116,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -118,7 +126,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'Author' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         Author obj = dod.getRandomAuthor();
         Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", obj);
diff --git a/src/test/java/com/labsynch/labseer/domain/AuthorTest.java b/src/test/java/com/labsynch/labseer/domain/AuthorTest.java
index bf637bfc8..1d2383e76 100755
--- a/src/test/java/com/labsynch/labseer/domain/AuthorTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/AuthorTest.java
@@ -22,32 +22,32 @@
 @Transactional
 @Configurable
 public class AuthorTest {
-	
-	private static final Logger logger = LoggerFactory.getLogger(AuthorTest.class);
 
-	@Test
-	public void CreateAuthor_Test001(){
-		Author auth = new Author();
-		auth.setFirstName("guytest");
-		auth.setLastName("oshiro");
-		auth.setUserName("goshirotest");
-		auth.setPassword("apple");
-		auth.setEmailAddress("guy@test.com");
-		auth.persist();
-		logger.info(auth.toJson());
-	}
+    private static final Logger logger = LoggerFactory.getLogger(AuthorTest.class);
 
-	@Autowired
+    @Test
+    public void CreateAuthor_Test001() {
+        Author auth = new Author();
+        auth.setFirstName("guytest");
+        auth.setLastName("oshiro");
+        auth.setUserName("goshirotest");
+        auth.setPassword("apple");
+        auth.setEmailAddress("guy@test.com");
+        auth.persist();
+        logger.info(auth.toJson());
+    }
+
+    @Autowired
     AuthorDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountAuthors() {
         Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", dod.getRandomAuthor());
         long count = Author.countAuthors();
         Assert.assertTrue("Counter for 'Author' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindAuthor() {
         Author obj = dod.getRandomAuthor();
         Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", obj);
@@ -58,29 +58,33 @@ public void testFindAuthor() {
         Assert.assertEquals("Find method for 'Author' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllAuthors() {
         Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", dod.getRandomAuthor());
         long count = Author.countAuthors();
-        Assert.assertTrue("Too expensive to perform a find all test for 'Author', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'Author', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<Author> result = Author.findAllAuthors();
         Assert.assertNotNull("Find all method for 'Author' illegally returned null", result);
         Assert.assertTrue("Find all method for 'Author' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindAuthorEntries() {
         Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", dod.getRandomAuthor());
         long count = Author.countAuthors();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<Author> result = Author.findAuthorEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'Author' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'Author' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'Author' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         Author obj = dod.getRandomAuthor();
         Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", obj);
@@ -88,28 +92,31 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'Author' failed to provide an identifier", id);
         obj = Author.findAuthor(id);
         Assert.assertNotNull("Find method for 'Author' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyAuthor(obj);
+        boolean modified = dod.modifyAuthor(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'Author' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'Author' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         Author obj = dod.getRandomAuthor();
         Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'Author' failed to provide an identifier", id);
         obj = Author.findAuthor(id);
-        boolean modified =  dod.modifyAuthor(obj);
+        boolean modified = dod.modifyAuthor(obj);
         Integer currentVersion = obj.getVersion();
-        Author merged = (Author)obj.merge();
+        Author merged = (Author) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'Author' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'Author' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
         Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", dod.getRandomAuthor());
         Author obj = dod.getNewTransientAuthor(Integer.MAX_VALUE);
@@ -121,7 +128,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -129,7 +138,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'Author' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         Author obj = dod.getRandomAuthor();
         Assert.assertNotNull("Data on demand for 'Author' failed to initialize correctly", obj);
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ContainerDataOnDemand.java
index c5c1c4f84..1c2b34ed6 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerDataOnDemand.java
@@ -19,11 +19,11 @@
 @Component
 public class ContainerDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<Container> data;
+    private List<Container> data;
 
-	public Container getNewTransientContainer(int index) {
+    public Container getNewTransientContainer(int index) {
         Container obj = new Container();
         setCodeName(obj, index);
         setColumnIndex(obj, index);
@@ -42,7 +42,7 @@ public Container getNewTransientContainer(int index) {
         return obj;
     }
 
-	public void setCodeName(Container obj, int index) {
+    public void setCodeName(Container obj, int index) {
         String codeName = "codeName_" + index;
         if (codeName.length() > 255) {
             codeName = new Random().nextInt(10) + codeName.substring(1, 255);
@@ -50,27 +50,27 @@ public void setCodeName(Container obj, int index) {
         obj.setCodeName(codeName);
     }
 
-	public void setColumnIndex(Container obj, int index) {
+    public void setColumnIndex(Container obj, int index) {
         Integer columnIndex = new Integer(index);
         obj.setColumnIndex(columnIndex);
     }
 
-	public void setDeleted(Container obj, int index) {
+    public void setDeleted(Container obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setIgnored(Container obj, int index) {
+    public void setIgnored(Container obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setLocationId(Container obj, int index) {
+    public void setLocationId(Container obj, int index) {
         Long locationId = new Integer(index).longValue();
         obj.setLocationId(locationId);
     }
 
-	public void setLsKind(Container obj, int index) {
+    public void setLsKind(Container obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -78,12 +78,12 @@ public void setLsKind(Container obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsTransaction(Container obj, int index) {
+    public void setLsTransaction(Container obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(Container obj, int index) {
+    public void setLsType(Container obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 255) {
             lsType = lsType.substring(0, 255);
@@ -91,7 +91,7 @@ public void setLsType(Container obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(Container obj, int index) {
+    public void setLsTypeAndKind(Container obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 255);
@@ -99,7 +99,7 @@ public void setLsTypeAndKind(Container obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedBy(Container obj, int index) {
+    public void setModifiedBy(Container obj, int index) {
         String modifiedBy = "modifiedBy_" + index;
         if (modifiedBy.length() > 255) {
             modifiedBy = modifiedBy.substring(0, 255);
@@ -107,12 +107,15 @@ public void setModifiedBy(Container obj, int index) {
         obj.setModifiedBy(modifiedBy);
     }
 
-	public void setModifiedDate(Container obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(Container obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setRecordedBy(Container obj, int index) {
+    public void setRecordedBy(Container obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -120,17 +123,20 @@ public void setRecordedBy(Container obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(Container obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(Container obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public void setRowIndex(Container obj, int index) {
+    public void setRowIndex(Container obj, int index) {
         Integer rowIndex = new Integer(index);
         obj.setRowIndex(rowIndex);
     }
 
-	public Container getSpecificContainer(int index) {
+    public Container getSpecificContainer(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -143,18 +149,18 @@ public Container getSpecificContainer(int index) {
         return Container.findContainer(id);
     }
 
-	public Container getRandomContainer() {
+    public Container getRandomContainer() {
         init();
         Container obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return Container.findContainer(id);
     }
 
-	public boolean modifyContainer(Container obj) {
+    public boolean modifyContainer(Container obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = Container.findContainerEntries(from, to);
@@ -164,7 +170,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<Container>();
         for (int i = 0; i < 10; i++) {
             Container obj = getNewTransientContainer(i);
@@ -174,7 +180,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ContainerIntegrationTest.java
index 5b4033aa7..9c55aa13f 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerIntegrationTest.java
@@ -25,17 +25,17 @@ public class ContainerIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ContainerDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountContainers() {
         Assert.assertNotNull("Data on demand for 'Container' failed to initialize correctly", dod.getRandomContainer());
         long count = Container.countContainers();
         Assert.assertTrue("Counter for 'Container' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindContainer() {
         Container obj = dod.getRandomContainer();
         Assert.assertNotNull("Data on demand for 'Container' failed to initialize correctly", obj);
@@ -46,29 +46,33 @@ public void testFindContainer() {
         Assert.assertEquals("Find method for 'Container' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllContainers() {
         Assert.assertNotNull("Data on demand for 'Container' failed to initialize correctly", dod.getRandomContainer());
         long count = Container.countContainers();
-        Assert.assertTrue("Too expensive to perform a find all test for 'Container', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'Container', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<Container> result = Container.findAllContainers();
         Assert.assertNotNull("Find all method for 'Container' illegally returned null", result);
         Assert.assertTrue("Find all method for 'Container' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindContainerEntries() {
         Assert.assertNotNull("Data on demand for 'Container' failed to initialize correctly", dod.getRandomContainer());
         long count = Container.countContainers();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<Container> result = Container.findContainerEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'Container' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'Container' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'Container' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         Container obj = dod.getRandomContainer();
         Assert.assertNotNull("Data on demand for 'Container' failed to initialize correctly", obj);
@@ -76,28 +80,31 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'Container' failed to provide an identifier", id);
         obj = Container.findContainer(id);
         Assert.assertNotNull("Find method for 'Container' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyContainer(obj);
+        boolean modified = dod.modifyContainer(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'Container' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'Container' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         Container obj = dod.getRandomContainer();
         Assert.assertNotNull("Data on demand for 'Container' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'Container' failed to provide an identifier", id);
         obj = Container.findContainer(id);
-        boolean modified =  dod.modifyContainer(obj);
+        boolean modified = dod.modifyContainer(obj);
         Integer currentVersion = obj.getVersion();
-        Container merged = (Container)obj.merge();
+        Container merged = (Container) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'Container' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'Container' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
         Assert.assertNotNull("Data on demand for 'Container' failed to initialize correctly", dod.getRandomContainer());
         Container obj = dod.getNewTransientContainer(Integer.MAX_VALUE);
@@ -109,7 +116,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +126,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'Container' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         Container obj = dod.getRandomContainer();
         Assert.assertNotNull("Data on demand for 'Container' failed to initialize correctly", obj);
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ContainerKindDataOnDemand.java
index 5d5c8807c..257b212c1 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerKindDataOnDemand.java
@@ -17,14 +17,14 @@
 @Configurable
 public class ContainerKindDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<ContainerKind> data;
+    private List<ContainerKind> data;
 
-	@Autowired
+    @Autowired
     ContainerTypeDataOnDemand containerTypeDataOnDemand;
 
-	public ContainerKind getNewTransientContainerKind(int index) {
+    public ContainerKind getNewTransientContainerKind(int index) {
         ContainerKind obj = new ContainerKind();
         setKindName(obj, index);
         setLsType(obj, index);
@@ -32,7 +32,7 @@ public ContainerKind getNewTransientContainerKind(int index) {
         return obj;
     }
 
-	public void setKindName(ContainerKind obj, int index) {
+    public void setKindName(ContainerKind obj, int index) {
         String kindName = "kindName_" + index;
         if (kindName.length() > 255) {
             kindName = kindName.substring(0, 255);
@@ -40,12 +40,12 @@ public void setKindName(ContainerKind obj, int index) {
         obj.setKindName(kindName);
     }
 
-	public void setLsType(ContainerKind obj, int index) {
+    public void setLsType(ContainerKind obj, int index) {
         ContainerType lsType = containerTypeDataOnDemand.getRandomContainerType();
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(ContainerKind obj, int index) {
+    public void setLsTypeAndKind(ContainerKind obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = new Random().nextInt(10) + lsTypeAndKind.substring(1, 255);
@@ -53,7 +53,7 @@ public void setLsTypeAndKind(ContainerKind obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public ContainerKind getSpecificContainerKind(int index) {
+    public ContainerKind getSpecificContainerKind(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -66,18 +66,18 @@ public ContainerKind getSpecificContainerKind(int index) {
         return ContainerKind.findContainerKind(id);
     }
 
-	public ContainerKind getRandomContainerKind() {
+    public ContainerKind getRandomContainerKind() {
         init();
         ContainerKind obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return ContainerKind.findContainerKind(id);
     }
 
-	public boolean modifyContainerKind(ContainerKind obj) {
+    public boolean modifyContainerKind(ContainerKind obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = ContainerKind.findContainerKindEntries(from, to);
@@ -87,7 +87,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<ContainerKind>();
         for (int i = 0; i < 10; i++) {
             ContainerKind obj = getNewTransientContainerKind(i);
@@ -97,7 +97,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ContainerKindIntegrationTest.java
index 21e700577..2faf5e7e8 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerKindIntegrationTest.java
@@ -25,17 +25,18 @@ public class ContainerKindIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ContainerKindDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountContainerKinds() {
-        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to initialize correctly", dod.getRandomContainerKind());
+        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to initialize correctly",
+                dod.getRandomContainerKind());
         long count = ContainerKind.countContainerKinds();
         Assert.assertTrue("Counter for 'ContainerKind' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindContainerKind() {
         ContainerKind obj = dod.getRandomContainerKind();
         Assert.assertNotNull("Data on demand for 'ContainerKind' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindContainerKind() {
         Assert.assertEquals("Find method for 'ContainerKind' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllContainerKinds() {
-        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to initialize correctly", dod.getRandomContainerKind());
+        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to initialize correctly",
+                dod.getRandomContainerKind());
         long count = ContainerKind.countContainerKinds();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ContainerKind', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'ContainerKind', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<ContainerKind> result = ContainerKind.findAllContainerKinds();
         Assert.assertNotNull("Find all method for 'ContainerKind' illegally returned null", result);
         Assert.assertTrue("Find all method for 'ContainerKind' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindContainerKindEntries() {
-        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to initialize correctly", dod.getRandomContainerKind());
+        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to initialize correctly",
+                dod.getRandomContainerKind());
         long count = ContainerKind.countContainerKinds();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<ContainerKind> result = ContainerKind.findContainerKindEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'ContainerKind' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ContainerKind' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'ContainerKind' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         ContainerKind obj = dod.getRandomContainerKind();
         Assert.assertNotNull("Data on demand for 'ContainerKind' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'ContainerKind' failed to provide an identifier", id);
         obj = ContainerKind.findContainerKind(id);
         Assert.assertNotNull("Find method for 'ContainerKind' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyContainerKind(obj);
+        boolean modified = dod.modifyContainerKind(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'ContainerKind' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'ContainerKind' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         ContainerKind obj = dod.getRandomContainerKind();
         Assert.assertNotNull("Data on demand for 'ContainerKind' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ContainerKind' failed to provide an identifier", id);
         obj = ContainerKind.findContainerKind(id);
-        boolean modified =  dod.modifyContainerKind(obj);
+        boolean modified = dod.modifyContainerKind(obj);
         Integer currentVersion = obj.getVersion();
         ContainerKind merged = obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ContainerKind' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'ContainerKind' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to initialize correctly", dod.getRandomContainerKind());
+        Assert.assertNotNull("Data on demand for 'ContainerKind' failed to initialize correctly",
+                dod.getRandomContainerKind());
         ContainerKind obj = dod.getNewTransientContainerKind(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'ContainerKind' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'ContainerKind' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'ContainerKind' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         ContainerKind obj = dod.getRandomContainerKind();
         Assert.assertNotNull("Data on demand for 'ContainerKind' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = ContainerKind.findContainerKind(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'ContainerKind' with identifier '" + id + "'", ContainerKind.findContainerKind(id));
+        Assert.assertNull("Failed to remove 'ContainerKind' with identifier '" + id + "'",
+                ContainerKind.findContainerKind(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerLabelDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ContainerLabelDataOnDemand.java
index 2dcf971a3..37f04a08d 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerLabelDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerLabelDataOnDemand.java
@@ -20,14 +20,14 @@
 @Component
 public class ContainerLabelDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<ContainerLabel> data;
+    private List<ContainerLabel> data;
 
-	@Autowired
+    @Autowired
     ContainerDataOnDemand containerDataOnDemand;
 
-	public ContainerLabel getNewTransientContainerLabel(int index) {
+    public ContainerLabel getNewTransientContainerLabel(int index) {
         ContainerLabel obj = new ContainerLabel();
         setContainer(obj, index);
         setDeleted(obj, index);
@@ -46,22 +46,22 @@ public ContainerLabel getNewTransientContainerLabel(int index) {
         return obj;
     }
 
-	public void setContainer(ContainerLabel obj, int index) {
+    public void setContainer(ContainerLabel obj, int index) {
         Container container = containerDataOnDemand.getRandomContainer();
         obj.setContainer(container);
     }
 
-	public void setDeleted(ContainerLabel obj, int index) {
+    public void setDeleted(ContainerLabel obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setIgnored(ContainerLabel obj, int index) {
+    public void setIgnored(ContainerLabel obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setImageFile(ContainerLabel obj, int index) {
+    public void setImageFile(ContainerLabel obj, int index) {
         String imageFile = "imageFile_" + index;
         if (imageFile.length() > 255) {
             imageFile = imageFile.substring(0, 255);
@@ -69,7 +69,7 @@ public void setImageFile(ContainerLabel obj, int index) {
         obj.setImageFile(imageFile);
     }
 
-	public void setLabelText(ContainerLabel obj, int index) {
+    public void setLabelText(ContainerLabel obj, int index) {
         String labelText = "labelText_" + index;
         if (labelText.length() > 255) {
             labelText = labelText.substring(0, 255);
@@ -77,7 +77,7 @@ public void setLabelText(ContainerLabel obj, int index) {
         obj.setLabelText(labelText);
     }
 
-	public void setLsKind(ContainerLabel obj, int index) {
+    public void setLsKind(ContainerLabel obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -85,12 +85,12 @@ public void setLsKind(ContainerLabel obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsTransaction(ContainerLabel obj, int index) {
+    public void setLsTransaction(ContainerLabel obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(ContainerLabel obj, int index) {
+    public void setLsType(ContainerLabel obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 64) {
             lsType = lsType.substring(0, 64);
@@ -98,7 +98,7 @@ public void setLsType(ContainerLabel obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(ContainerLabel obj, int index) {
+    public void setLsTypeAndKind(ContainerLabel obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 255);
@@ -106,22 +106,25 @@ public void setLsTypeAndKind(ContainerLabel obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedDate(ContainerLabel obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(ContainerLabel obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setPhysicallyLabled(ContainerLabel obj, int index) {
+    public void setPhysicallyLabled(ContainerLabel obj, int index) {
         Boolean physicallyLabled = true;
         obj.setPhysicallyLabled(physicallyLabled);
     }
 
-	public void setPreferred(ContainerLabel obj, int index) {
+    public void setPreferred(ContainerLabel obj, int index) {
         Boolean preferred = true;
         obj.setPreferred(preferred);
     }
 
-	public void setRecordedBy(ContainerLabel obj, int index) {
+    public void setRecordedBy(ContainerLabel obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -129,12 +132,15 @@ public void setRecordedBy(ContainerLabel obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(ContainerLabel obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(ContainerLabel obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public ContainerLabel getSpecificContainerLabel(int index) {
+    public ContainerLabel getSpecificContainerLabel(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -147,18 +153,18 @@ public ContainerLabel getSpecificContainerLabel(int index) {
         return ContainerLabel.findContainerLabel(id);
     }
 
-	public ContainerLabel getRandomContainerLabel() {
+    public ContainerLabel getRandomContainerLabel() {
         init();
         ContainerLabel obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return ContainerLabel.findContainerLabel(id);
     }
 
-	public boolean modifyContainerLabel(ContainerLabel obj) {
+    public boolean modifyContainerLabel(ContainerLabel obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = ContainerLabel.findContainerLabelEntries(from, to);
@@ -168,7 +174,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<ContainerLabel>();
         for (int i = 0; i < 10; i++) {
             ContainerLabel obj = getNewTransientContainerLabel(i);
@@ -178,7 +184,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerLabelIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ContainerLabelIntegrationTest.java
index 51a8d35a5..4e979ba5d 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerLabelIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerLabelIntegrationTest.java
@@ -25,17 +25,18 @@ public class ContainerLabelIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ContainerLabelDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountContainerLabels() {
-        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to initialize correctly", dod.getRandomContainerLabel());
+        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to initialize correctly",
+                dod.getRandomContainerLabel());
         long count = ContainerLabel.countContainerLabels();
         Assert.assertTrue("Counter for 'ContainerLabel' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindContainerLabel() {
         ContainerLabel obj = dod.getRandomContainerLabel();
         Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindContainerLabel() {
         Assert.assertEquals("Find method for 'ContainerLabel' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllContainerLabels() {
-        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to initialize correctly", dod.getRandomContainerLabel());
+        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to initialize correctly",
+                dod.getRandomContainerLabel());
         long count = ContainerLabel.countContainerLabels();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ContainerLabel', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'ContainerLabel', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<ContainerLabel> result = ContainerLabel.findAllContainerLabels();
         Assert.assertNotNull("Find all method for 'ContainerLabel' illegally returned null", result);
         Assert.assertTrue("Find all method for 'ContainerLabel' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindContainerLabelEntries() {
-        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to initialize correctly", dod.getRandomContainerLabel());
+        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to initialize correctly",
+                dod.getRandomContainerLabel());
         long count = ContainerLabel.countContainerLabels();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<ContainerLabel> result = ContainerLabel.findContainerLabelEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'ContainerLabel' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ContainerLabel' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'ContainerLabel' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         ContainerLabel obj = dod.getRandomContainerLabel();
         Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to provide an identifier", id);
         obj = ContainerLabel.findContainerLabel(id);
         Assert.assertNotNull("Find method for 'ContainerLabel' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyContainerLabel(obj);
+        boolean modified = dod.modifyContainerLabel(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'ContainerLabel' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'ContainerLabel' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         ContainerLabel obj = dod.getRandomContainerLabel();
         Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to provide an identifier", id);
         obj = ContainerLabel.findContainerLabel(id);
-        boolean modified =  dod.modifyContainerLabel(obj);
+        boolean modified = dod.modifyContainerLabel(obj);
         Integer currentVersion = obj.getVersion();
-        ContainerLabel merged = (ContainerLabel)obj.merge();
+        ContainerLabel merged = (ContainerLabel) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ContainerLabel' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'ContainerLabel' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to initialize correctly", dod.getRandomContainerLabel());
+        Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to initialize correctly",
+                dod.getRandomContainerLabel());
         ContainerLabel obj = dod.getNewTransientContainerLabel(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'ContainerLabel' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'ContainerLabel' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         ContainerLabel obj = dod.getRandomContainerLabel();
         Assert.assertNotNull("Data on demand for 'ContainerLabel' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = ContainerLabel.findContainerLabel(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'ContainerLabel' with identifier '" + id + "'", ContainerLabel.findContainerLabel(id));
+        Assert.assertNull("Failed to remove 'ContainerLabel' with identifier '" + id + "'",
+                ContainerLabel.findContainerLabel(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ContainerStateDataOnDemand.java
index 4e5c0dbcf..4b279971e 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerStateDataOnDemand.java
@@ -20,14 +20,14 @@
 @Configurable
 public class ContainerStateDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<ContainerState> data;
+    private List<ContainerState> data;
 
-	@Autowired
+    @Autowired
     ContainerDataOnDemand containerDataOnDemand;
 
-	public ContainerState getNewTransientContainerState(int index) {
+    public ContainerState getNewTransientContainerState(int index) {
         ContainerState obj = new ContainerState();
         setComments(obj, index);
         setContainer(obj, index);
@@ -44,7 +44,7 @@ public ContainerState getNewTransientContainerState(int index) {
         return obj;
     }
 
-	public void setComments(ContainerState obj, int index) {
+    public void setComments(ContainerState obj, int index) {
         String comments = "comments_" + index;
         if (comments.length() > 512) {
             comments = comments.substring(0, 512);
@@ -52,22 +52,22 @@ public void setComments(ContainerState obj, int index) {
         obj.setComments(comments);
     }
 
-	public void setContainer(ContainerState obj, int index) {
+    public void setContainer(ContainerState obj, int index) {
         Container container = containerDataOnDemand.getRandomContainer();
         obj.setContainer(container);
     }
 
-	public void setDeleted(ContainerState obj, int index) {
+    public void setDeleted(ContainerState obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setIgnored(ContainerState obj, int index) {
+    public void setIgnored(ContainerState obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setLsKind(ContainerState obj, int index) {
+    public void setLsKind(ContainerState obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -75,12 +75,12 @@ public void setLsKind(ContainerState obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsTransaction(ContainerState obj, int index) {
+    public void setLsTransaction(ContainerState obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(ContainerState obj, int index) {
+    public void setLsType(ContainerState obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 64) {
             lsType = lsType.substring(0, 64);
@@ -88,7 +88,7 @@ public void setLsType(ContainerState obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(ContainerState obj, int index) {
+    public void setLsTypeAndKind(ContainerState obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 255);
@@ -96,7 +96,7 @@ public void setLsTypeAndKind(ContainerState obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedBy(ContainerState obj, int index) {
+    public void setModifiedBy(ContainerState obj, int index) {
         String modifiedBy = "modifiedBy_" + index;
         if (modifiedBy.length() > 255) {
             modifiedBy = modifiedBy.substring(0, 255);
@@ -104,12 +104,15 @@ public void setModifiedBy(ContainerState obj, int index) {
         obj.setModifiedBy(modifiedBy);
     }
 
-	public void setModifiedDate(ContainerState obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(ContainerState obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setRecordedBy(ContainerState obj, int index) {
+    public void setRecordedBy(ContainerState obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -117,12 +120,15 @@ public void setRecordedBy(ContainerState obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(ContainerState obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(ContainerState obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public ContainerState getSpecificContainerState(int index) {
+    public ContainerState getSpecificContainerState(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -135,18 +141,18 @@ public ContainerState getSpecificContainerState(int index) {
         return ContainerState.findContainerState(id);
     }
 
-	public ContainerState getRandomContainerState() {
+    public ContainerState getRandomContainerState() {
         init();
         ContainerState obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return ContainerState.findContainerState(id);
     }
 
-	public boolean modifyContainerState(ContainerState obj) {
+    public boolean modifyContainerState(ContainerState obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = ContainerState.findContainerStateEntries(from, to);
@@ -156,7 +162,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<ContainerState>();
         for (int i = 0; i < 10; i++) {
             ContainerState obj = getNewTransientContainerState(i);
@@ -166,7 +172,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ContainerStateIntegrationTest.java
index bafb2b1e1..c63da5bfe 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerStateIntegrationTest.java
@@ -25,17 +25,18 @@ public class ContainerStateIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ContainerStateDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountContainerStates() {
-        Assert.assertNotNull("Data on demand for 'ContainerState' failed to initialize correctly", dod.getRandomContainerState());
+        Assert.assertNotNull("Data on demand for 'ContainerState' failed to initialize correctly",
+                dod.getRandomContainerState());
         long count = ContainerState.countContainerStates();
         Assert.assertTrue("Counter for 'ContainerState' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindContainerState() {
         ContainerState obj = dod.getRandomContainerState();
         Assert.assertNotNull("Data on demand for 'ContainerState' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindContainerState() {
         Assert.assertEquals("Find method for 'ContainerState' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllContainerStates() {
-        Assert.assertNotNull("Data on demand for 'ContainerState' failed to initialize correctly", dod.getRandomContainerState());
+        Assert.assertNotNull("Data on demand for 'ContainerState' failed to initialize correctly",
+                dod.getRandomContainerState());
         long count = ContainerState.countContainerStates();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ContainerState', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'ContainerState', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<ContainerState> result = ContainerState.findAllContainerStates();
         Assert.assertNotNull("Find all method for 'ContainerState' illegally returned null", result);
         Assert.assertTrue("Find all method for 'ContainerState' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindContainerStateEntries() {
-        Assert.assertNotNull("Data on demand for 'ContainerState' failed to initialize correctly", dod.getRandomContainerState());
+        Assert.assertNotNull("Data on demand for 'ContainerState' failed to initialize correctly",
+                dod.getRandomContainerState());
         long count = ContainerState.countContainerStates();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<ContainerState> result = ContainerState.findContainerStateEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'ContainerState' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ContainerState' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'ContainerState' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         ContainerState obj = dod.getRandomContainerState();
         Assert.assertNotNull("Data on demand for 'ContainerState' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'ContainerState' failed to provide an identifier", id);
         obj = ContainerState.findContainerState(id);
         Assert.assertNotNull("Find method for 'ContainerState' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyContainerState(obj);
+        boolean modified = dod.modifyContainerState(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'ContainerState' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'ContainerState' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         ContainerState obj = dod.getRandomContainerState();
         Assert.assertNotNull("Data on demand for 'ContainerState' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ContainerState' failed to provide an identifier", id);
         obj = ContainerState.findContainerState(id);
-        boolean modified =  dod.modifyContainerState(obj);
+        boolean modified = dod.modifyContainerState(obj);
         Integer currentVersion = obj.getVersion();
-        ContainerState merged = (ContainerState)obj.merge();
+        ContainerState merged = (ContainerState) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ContainerState' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'ContainerState' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'ContainerState' failed to initialize correctly", dod.getRandomContainerState());
+        Assert.assertNotNull("Data on demand for 'ContainerState' failed to initialize correctly",
+                dod.getRandomContainerState());
         ContainerState obj = dod.getNewTransientContainerState(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'ContainerState' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'ContainerState' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'ContainerState' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         ContainerState obj = dod.getRandomContainerState();
         Assert.assertNotNull("Data on demand for 'ContainerState' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = ContainerState.findContainerState(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'ContainerState' with identifier '" + id + "'", ContainerState.findContainerState(id));
+        Assert.assertNull("Failed to remove 'ContainerState' with identifier '" + id + "'",
+                ContainerState.findContainerState(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ContainerTypeDataOnDemand.java
index ef7d56cdd..b65085815 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerTypeDataOnDemand.java
@@ -16,17 +16,17 @@
 @Configurable
 public class ContainerTypeDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<ContainerType> data;
+    private List<ContainerType> data;
 
-	public ContainerType getNewTransientContainerType(int index) {
+    public ContainerType getNewTransientContainerType(int index) {
         ContainerType obj = new ContainerType();
         setTypeName(obj, index);
         return obj;
     }
 
-	public void setTypeName(ContainerType obj, int index) {
+    public void setTypeName(ContainerType obj, int index) {
         String typeName = "typeName_" + index;
         if (typeName.length() > 128) {
             typeName = new Random().nextInt(10) + typeName.substring(1, 128);
@@ -34,7 +34,7 @@ public void setTypeName(ContainerType obj, int index) {
         obj.setTypeName(typeName);
     }
 
-	public ContainerType getSpecificContainerType(int index) {
+    public ContainerType getSpecificContainerType(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -47,18 +47,18 @@ public ContainerType getSpecificContainerType(int index) {
         return ContainerType.findContainerType(id);
     }
 
-	public ContainerType getRandomContainerType() {
+    public ContainerType getRandomContainerType() {
         init();
         ContainerType obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return ContainerType.findContainerType(id);
     }
 
-	public boolean modifyContainerType(ContainerType obj) {
+    public boolean modifyContainerType(ContainerType obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = ContainerType.findContainerTypeEntries(from, to);
@@ -68,7 +68,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<ContainerType>();
         for (int i = 0; i < 10; i++) {
             ContainerType obj = getNewTransientContainerType(i);
@@ -78,7 +78,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ContainerTypeIntegrationTest.java
index bc2fbdc14..195d4226e 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerTypeIntegrationTest.java
@@ -25,17 +25,18 @@ public class ContainerTypeIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ContainerTypeDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountContainerTypes() {
-        Assert.assertNotNull("Data on demand for 'ContainerType' failed to initialize correctly", dod.getRandomContainerType());
+        Assert.assertNotNull("Data on demand for 'ContainerType' failed to initialize correctly",
+                dod.getRandomContainerType());
         long count = ContainerType.countContainerTypes();
         Assert.assertTrue("Counter for 'ContainerType' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindContainerType() {
         ContainerType obj = dod.getRandomContainerType();
         Assert.assertNotNull("Data on demand for 'ContainerType' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindContainerType() {
         Assert.assertEquals("Find method for 'ContainerType' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllContainerTypes() {
-        Assert.assertNotNull("Data on demand for 'ContainerType' failed to initialize correctly", dod.getRandomContainerType());
+        Assert.assertNotNull("Data on demand for 'ContainerType' failed to initialize correctly",
+                dod.getRandomContainerType());
         long count = ContainerType.countContainerTypes();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ContainerType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'ContainerType', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<ContainerType> result = ContainerType.findAllContainerTypes();
         Assert.assertNotNull("Find all method for 'ContainerType' illegally returned null", result);
         Assert.assertTrue("Find all method for 'ContainerType' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindContainerTypeEntries() {
-        Assert.assertNotNull("Data on demand for 'ContainerType' failed to initialize correctly", dod.getRandomContainerType());
+        Assert.assertNotNull("Data on demand for 'ContainerType' failed to initialize correctly",
+                dod.getRandomContainerType());
         long count = ContainerType.countContainerTypes();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<ContainerType> result = ContainerType.findContainerTypeEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'ContainerType' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ContainerType' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'ContainerType' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         ContainerType obj = dod.getRandomContainerType();
         Assert.assertNotNull("Data on demand for 'ContainerType' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'ContainerType' failed to provide an identifier", id);
         obj = ContainerType.findContainerType(id);
         Assert.assertNotNull("Find method for 'ContainerType' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyContainerType(obj);
+        boolean modified = dod.modifyContainerType(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'ContainerType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'ContainerType' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         ContainerType obj = dod.getRandomContainerType();
         Assert.assertNotNull("Data on demand for 'ContainerType' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ContainerType' failed to provide an identifier", id);
         obj = ContainerType.findContainerType(id);
-        boolean modified =  dod.modifyContainerType(obj);
+        boolean modified = dod.modifyContainerType(obj);
         Integer currentVersion = obj.getVersion();
         ContainerType merged = obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ContainerType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'ContainerType' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'ContainerType' failed to initialize correctly", dod.getRandomContainerType());
+        Assert.assertNotNull("Data on demand for 'ContainerType' failed to initialize correctly",
+                dod.getRandomContainerType());
         ContainerType obj = dod.getNewTransientContainerType(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'ContainerType' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'ContainerType' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'ContainerType' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         ContainerType obj = dod.getRandomContainerType();
         Assert.assertNotNull("Data on demand for 'ContainerType' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = ContainerType.findContainerType(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'ContainerType' with identifier '" + id + "'", ContainerType.findContainerType(id));
+        Assert.assertNull("Failed to remove 'ContainerType' with identifier '" + id + "'",
+                ContainerType.findContainerType(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ContainerValueDataOnDemand.java
index ac9e3010e..435c36c08 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerValueDataOnDemand.java
@@ -21,14 +21,14 @@
 @Configurable
 public class ContainerValueDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<ContainerValue> data;
+    private List<ContainerValue> data;
 
-	@Autowired
+    @Autowired
     ContainerStateDataOnDemand containerStateDataOnDemand;
 
-	public ContainerValue getNewTransientContainerValue(int index) {
+    public ContainerValue getNewTransientContainerValue(int index) {
         ContainerValue obj = new ContainerValue();
         setBlobValue(obj, index);
         setClobValue(obj, index);
@@ -70,17 +70,17 @@ public ContainerValue getNewTransientContainerValue(int index) {
         return obj;
     }
 
-	public void setBlobValue(ContainerValue obj, int index) {
+    public void setBlobValue(ContainerValue obj, int index) {
         byte[] blobValue = String.valueOf(index).getBytes();
         obj.setBlobValue(blobValue);
     }
 
-	public void setClobValue(ContainerValue obj, int index) {
+    public void setClobValue(ContainerValue obj, int index) {
         String clobValue = "clobValue_" + index;
         obj.setClobValue(clobValue);
     }
 
-	public void setCodeKind(ContainerValue obj, int index) {
+    public void setCodeKind(ContainerValue obj, int index) {
         String codeKind = "codeKind_" + index;
         if (codeKind.length() > 255) {
             codeKind = codeKind.substring(0, 255);
@@ -88,7 +88,7 @@ public void setCodeKind(ContainerValue obj, int index) {
         obj.setCodeKind(codeKind);
     }
 
-	public void setCodeOrigin(ContainerValue obj, int index) {
+    public void setCodeOrigin(ContainerValue obj, int index) {
         String codeOrigin = "codeOrigin_" + index;
         if (codeOrigin.length() > 255) {
             codeOrigin = codeOrigin.substring(0, 255);
@@ -96,7 +96,7 @@ public void setCodeOrigin(ContainerValue obj, int index) {
         obj.setCodeOrigin(codeOrigin);
     }
 
-	public void setCodeType(ContainerValue obj, int index) {
+    public void setCodeType(ContainerValue obj, int index) {
         String codeType = "codeType_" + index;
         if (codeType.length() > 255) {
             codeType = codeType.substring(0, 255);
@@ -104,7 +104,7 @@ public void setCodeType(ContainerValue obj, int index) {
         obj.setCodeType(codeType);
     }
 
-	public void setCodeTypeAndKind(ContainerValue obj, int index) {
+    public void setCodeTypeAndKind(ContainerValue obj, int index) {
         String codeTypeAndKind = "codeTypeAndKind_" + index;
         if (codeTypeAndKind.length() > 350) {
             codeTypeAndKind = codeTypeAndKind.substring(0, 350);
@@ -112,7 +112,7 @@ public void setCodeTypeAndKind(ContainerValue obj, int index) {
         obj.setCodeTypeAndKind(codeTypeAndKind);
     }
 
-	public void setCodeValue(ContainerValue obj, int index) {
+    public void setCodeValue(ContainerValue obj, int index) {
         String codeValue = "codeValue_" + index;
         if (codeValue.length() > 255) {
             codeValue = codeValue.substring(0, 255);
@@ -120,7 +120,7 @@ public void setCodeValue(ContainerValue obj, int index) {
         obj.setCodeValue(codeValue);
     }
 
-	public void setComments(ContainerValue obj, int index) {
+    public void setComments(ContainerValue obj, int index) {
         String comments = "comments_" + index;
         if (comments.length() > 512) {
             comments = comments.substring(0, 512);
@@ -128,7 +128,7 @@ public void setComments(ContainerValue obj, int index) {
         obj.setComments(comments);
     }
 
-	public void setConcUnit(ContainerValue obj, int index) {
+    public void setConcUnit(ContainerValue obj, int index) {
         String concUnit = "concUnit_" + index;
         if (concUnit.length() > 25) {
             concUnit = concUnit.substring(0, 25);
@@ -136,22 +136,25 @@ public void setConcUnit(ContainerValue obj, int index) {
         obj.setConcUnit(concUnit);
     }
 
-	public void setConcentration(ContainerValue obj, int index) {
+    public void setConcentration(ContainerValue obj, int index) {
         Double concentration = new Integer(index).doubleValue();
         obj.setConcentration(concentration);
     }
 
-	public void setDateValue(ContainerValue obj, int index) {
-        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setDateValue(ContainerValue obj, int index) {
+        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setDateValue(dateValue);
     }
 
-	public void setDeleted(ContainerValue obj, int index) {
+    public void setDeleted(ContainerValue obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setFileValue(ContainerValue obj, int index) {
+    public void setFileValue(ContainerValue obj, int index) {
         String fileValue = "fileValue_" + index;
         if (fileValue.length() > 512) {
             fileValue = fileValue.substring(0, 512);
@@ -159,12 +162,12 @@ public void setFileValue(ContainerValue obj, int index) {
         obj.setFileValue(fileValue);
     }
 
-	public void setIgnored(ContainerValue obj, int index) {
+    public void setIgnored(ContainerValue obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setLsKind(ContainerValue obj, int index) {
+    public void setLsKind(ContainerValue obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -172,17 +175,17 @@ public void setLsKind(ContainerValue obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsState(ContainerValue obj, int index) {
+    public void setLsState(ContainerValue obj, int index) {
         ContainerState lsState = containerStateDataOnDemand.getRandomContainerState();
         obj.setLsState(lsState);
     }
 
-	public void setLsTransaction(ContainerValue obj, int index) {
+    public void setLsTransaction(ContainerValue obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(ContainerValue obj, int index) {
+    public void setLsType(ContainerValue obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 64) {
             lsType = lsType.substring(0, 64);
@@ -190,7 +193,7 @@ public void setLsType(ContainerValue obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(ContainerValue obj, int index) {
+    public void setLsTypeAndKind(ContainerValue obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 350) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 350);
@@ -198,7 +201,7 @@ public void setLsTypeAndKind(ContainerValue obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedBy(ContainerValue obj, int index) {
+    public void setModifiedBy(ContainerValue obj, int index) {
         String modifiedBy = "modifiedBy_" + index;
         if (modifiedBy.length() > 255) {
             modifiedBy = modifiedBy.substring(0, 255);
@@ -206,17 +209,20 @@ public void setModifiedBy(ContainerValue obj, int index) {
         obj.setModifiedBy(modifiedBy);
     }
 
-	public void setModifiedDate(ContainerValue obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(ContainerValue obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setNumberOfReplicates(ContainerValue obj, int index) {
+    public void setNumberOfReplicates(ContainerValue obj, int index) {
         Integer numberOfReplicates = new Integer(index);
         obj.setNumberOfReplicates(numberOfReplicates);
     }
 
-	public void setNumericValue(ContainerValue obj, int index) {
+    public void setNumericValue(ContainerValue obj, int index) {
         BigDecimal numericValue = BigDecimal.valueOf(index);
         if (numericValue.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
             numericValue = new BigDecimal("99999999999999999999.999999999999999999");
@@ -224,7 +230,7 @@ public void setNumericValue(ContainerValue obj, int index) {
         obj.setNumericValue(numericValue);
     }
 
-	public void setOperatorKind(ContainerValue obj, int index) {
+    public void setOperatorKind(ContainerValue obj, int index) {
         String operatorKind = "operator_" + index;
         if (operatorKind.length() > 10) {
             operatorKind = operatorKind.substring(0, 10);
@@ -232,7 +238,7 @@ public void setOperatorKind(ContainerValue obj, int index) {
         obj.setOperatorKind(operatorKind);
     }
 
-	public void setOperatorType(ContainerValue obj, int index) {
+    public void setOperatorType(ContainerValue obj, int index) {
         String operatorType = "operatorType_" + index;
         if (operatorType.length() > 25) {
             operatorType = operatorType.substring(0, 25);
@@ -240,7 +246,7 @@ public void setOperatorType(ContainerValue obj, int index) {
         obj.setOperatorType(operatorType);
     }
 
-	public void setOperatorTypeAndKind(ContainerValue obj, int index) {
+    public void setOperatorTypeAndKind(ContainerValue obj, int index) {
         String operatorTypeAndKind = "operatorTypeAndKind_" + index;
         if (operatorTypeAndKind.length() > 50) {
             operatorTypeAndKind = operatorTypeAndKind.substring(0, 50);
@@ -248,12 +254,12 @@ public void setOperatorTypeAndKind(ContainerValue obj, int index) {
         obj.setOperatorTypeAndKind(operatorTypeAndKind);
     }
 
-	public void setPublicData(ContainerValue obj, int index) {
+    public void setPublicData(ContainerValue obj, int index) {
         Boolean publicData = true;
         obj.setPublicData(publicData);
     }
 
-	public void setRecordedBy(ContainerValue obj, int index) {
+    public void setRecordedBy(ContainerValue obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -261,17 +267,20 @@ public void setRecordedBy(ContainerValue obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(ContainerValue obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(ContainerValue obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public void setSigFigs(ContainerValue obj, int index) {
+    public void setSigFigs(ContainerValue obj, int index) {
         Integer sigFigs = new Integer(index);
         obj.setSigFigs(sigFigs);
     }
 
-	public void setStringValue(ContainerValue obj, int index) {
+    public void setStringValue(ContainerValue obj, int index) {
         String stringValue = "stringValue_" + index;
         if (stringValue.length() > 255) {
             stringValue = stringValue.substring(0, 255);
@@ -279,7 +288,7 @@ public void setStringValue(ContainerValue obj, int index) {
         obj.setStringValue(stringValue);
     }
 
-	public void setUncertainty(ContainerValue obj, int index) {
+    public void setUncertainty(ContainerValue obj, int index) {
         BigDecimal uncertainty = BigDecimal.valueOf(index);
         if (uncertainty.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
             uncertainty = new BigDecimal("99999999999999999999.999999999999999999");
@@ -287,7 +296,7 @@ public void setUncertainty(ContainerValue obj, int index) {
         obj.setUncertainty(uncertainty);
     }
 
-	public void setUncertaintyType(ContainerValue obj, int index) {
+    public void setUncertaintyType(ContainerValue obj, int index) {
         String uncertaintyType = "uncertaintyType_" + index;
         if (uncertaintyType.length() > 255) {
             uncertaintyType = uncertaintyType.substring(0, 255);
@@ -295,7 +304,7 @@ public void setUncertaintyType(ContainerValue obj, int index) {
         obj.setUncertaintyType(uncertaintyType);
     }
 
-	public void setUnitKind(ContainerValue obj, int index) {
+    public void setUnitKind(ContainerValue obj, int index) {
         String unitKind = "unitKind_" + index;
         if (unitKind.length() > 25) {
             unitKind = unitKind.substring(0, 25);
@@ -303,7 +312,7 @@ public void setUnitKind(ContainerValue obj, int index) {
         obj.setUnitKind(unitKind);
     }
 
-	public void setUnitType(ContainerValue obj, int index) {
+    public void setUnitType(ContainerValue obj, int index) {
         String unitType = "unitType_" + index;
         if (unitType.length() > 25) {
             unitType = unitType.substring(0, 25);
@@ -311,7 +320,7 @@ public void setUnitType(ContainerValue obj, int index) {
         obj.setUnitType(unitType);
     }
 
-	public void setUnitTypeAndKind(ContainerValue obj, int index) {
+    public void setUnitTypeAndKind(ContainerValue obj, int index) {
         String unitTypeAndKind = "unitTypeAndKind_" + index;
         if (unitTypeAndKind.length() > 55) {
             unitTypeAndKind = unitTypeAndKind.substring(0, 55);
@@ -319,7 +328,7 @@ public void setUnitTypeAndKind(ContainerValue obj, int index) {
         obj.setUnitTypeAndKind(unitTypeAndKind);
     }
 
-	public void setUrlValue(ContainerValue obj, int index) {
+    public void setUrlValue(ContainerValue obj, int index) {
         String urlValue = "urlValue_" + index;
         if (urlValue.length() > 2000) {
             urlValue = urlValue.substring(0, 2000);
@@ -327,7 +336,7 @@ public void setUrlValue(ContainerValue obj, int index) {
         obj.setUrlValue(urlValue);
     }
 
-	public ContainerValue getSpecificContainerValue(int index) {
+    public ContainerValue getSpecificContainerValue(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -340,18 +349,18 @@ public ContainerValue getSpecificContainerValue(int index) {
         return ContainerValue.findContainerValue(id);
     }
 
-	public ContainerValue getRandomContainerValue() {
+    public ContainerValue getRandomContainerValue() {
         init();
         ContainerValue obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return ContainerValue.findContainerValue(id);
     }
 
-	public boolean modifyContainerValue(ContainerValue obj) {
+    public boolean modifyContainerValue(ContainerValue obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = ContainerValue.findContainerValueEntries(from, to);
@@ -361,7 +370,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<ContainerValue>();
         for (int i = 0; i < 10; i++) {
             ContainerValue obj = getNewTransientContainerValue(i);
@@ -371,7 +380,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ContainerValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ContainerValueIntegrationTest.java
index 4228f785f..6af73651e 100755
--- a/src/test/java/com/labsynch/labseer/domain/ContainerValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ContainerValueIntegrationTest.java
@@ -25,17 +25,18 @@ public class ContainerValueIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ContainerValueDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountContainerValues() {
-        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to initialize correctly", dod.getRandomContainerValue());
+        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to initialize correctly",
+                dod.getRandomContainerValue());
         long count = ContainerValue.countContainerValues();
         Assert.assertTrue("Counter for 'ContainerValue' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindContainerValue() {
         ContainerValue obj = dod.getRandomContainerValue();
         Assert.assertNotNull("Data on demand for 'ContainerValue' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindContainerValue() {
         Assert.assertEquals("Find method for 'ContainerValue' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllContainerValues() {
-        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to initialize correctly", dod.getRandomContainerValue());
+        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to initialize correctly",
+                dod.getRandomContainerValue());
         long count = ContainerValue.countContainerValues();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ContainerValue', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'ContainerValue', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<ContainerValue> result = ContainerValue.findAllContainerValues();
         Assert.assertNotNull("Find all method for 'ContainerValue' illegally returned null", result);
         Assert.assertTrue("Find all method for 'ContainerValue' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindContainerValueEntries() {
-        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to initialize correctly", dod.getRandomContainerValue());
+        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to initialize correctly",
+                dod.getRandomContainerValue());
         long count = ContainerValue.countContainerValues();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<ContainerValue> result = ContainerValue.findContainerValueEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'ContainerValue' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ContainerValue' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'ContainerValue' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         ContainerValue obj = dod.getRandomContainerValue();
         Assert.assertNotNull("Data on demand for 'ContainerValue' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'ContainerValue' failed to provide an identifier", id);
         obj = ContainerValue.findContainerValue(id);
         Assert.assertNotNull("Find method for 'ContainerValue' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyContainerValue(obj);
+        boolean modified = dod.modifyContainerValue(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'ContainerValue' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'ContainerValue' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         ContainerValue obj = dod.getRandomContainerValue();
         Assert.assertNotNull("Data on demand for 'ContainerValue' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ContainerValue' failed to provide an identifier", id);
         obj = ContainerValue.findContainerValue(id);
-        boolean modified =  dod.modifyContainerValue(obj);
+        boolean modified = dod.modifyContainerValue(obj);
         Integer currentVersion = obj.getVersion();
-        ContainerValue merged = (ContainerValue)obj.merge();
+        ContainerValue merged = (ContainerValue) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ContainerValue' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'ContainerValue' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to initialize correctly", dod.getRandomContainerValue());
+        Assert.assertNotNull("Data on demand for 'ContainerValue' failed to initialize correctly",
+                dod.getRandomContainerValue());
         ContainerValue obj = dod.getNewTransientContainerValue(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'ContainerValue' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'ContainerValue' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'ContainerValue' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         ContainerValue obj = dod.getRandomContainerValue();
         Assert.assertNotNull("Data on demand for 'ContainerValue' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = ContainerValue.findContainerValue(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'ContainerValue' with identifier '" + id + "'", ContainerValue.findContainerValue(id));
+        Assert.assertNull("Failed to remove 'ContainerValue' with identifier '" + id + "'",
+                ContainerValue.findContainerValue(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ExperimentDataOnDemand.java
index 6130eaf5e..3df1bb5b9 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentDataOnDemand.java
@@ -20,14 +20,14 @@
 @Configurable
 public class ExperimentDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<Experiment> data;
+    private List<Experiment> data;
 
-	@Autowired
+    @Autowired
     ProtocolDataOnDemand protocolDataOnDemand;
 
-	public Experiment getNewTransientExperiment(int index) {
+    public Experiment getNewTransientExperiment(int index) {
         Experiment obj = new Experiment();
         setCodeName(obj, index);
         setDeleted(obj, index);
@@ -45,7 +45,7 @@ public Experiment getNewTransientExperiment(int index) {
         return obj;
     }
 
-	public void setCodeName(Experiment obj, int index) {
+    public void setCodeName(Experiment obj, int index) {
         String codeName = "codeName_" + index;
         if (codeName.length() > 255) {
             codeName = new Random().nextInt(10) + codeName.substring(1, 255);
@@ -53,17 +53,17 @@ public void setCodeName(Experiment obj, int index) {
         obj.setCodeName(codeName);
     }
 
-	public void setDeleted(Experiment obj, int index) {
+    public void setDeleted(Experiment obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setIgnored(Experiment obj, int index) {
+    public void setIgnored(Experiment obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setLsKind(Experiment obj, int index) {
+    public void setLsKind(Experiment obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -71,12 +71,12 @@ public void setLsKind(Experiment obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsTransaction(Experiment obj, int index) {
+    public void setLsTransaction(Experiment obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(Experiment obj, int index) {
+    public void setLsType(Experiment obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 255) {
             lsType = lsType.substring(0, 255);
@@ -84,7 +84,7 @@ public void setLsType(Experiment obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(Experiment obj, int index) {
+    public void setLsTypeAndKind(Experiment obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 255);
@@ -92,7 +92,7 @@ public void setLsTypeAndKind(Experiment obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedBy(Experiment obj, int index) {
+    public void setModifiedBy(Experiment obj, int index) {
         String modifiedBy = "modifiedBy_" + index;
         if (modifiedBy.length() > 255) {
             modifiedBy = modifiedBy.substring(0, 255);
@@ -100,17 +100,20 @@ public void setModifiedBy(Experiment obj, int index) {
         obj.setModifiedBy(modifiedBy);
     }
 
-	public void setModifiedDate(Experiment obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(Experiment obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setProtocol(Experiment obj, int index) {
+    public void setProtocol(Experiment obj, int index) {
         Protocol protocol = protocolDataOnDemand.getRandomProtocol();
         obj.setProtocol(protocol);
     }
 
-	public void setRecordedBy(Experiment obj, int index) {
+    public void setRecordedBy(Experiment obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -118,12 +121,15 @@ public void setRecordedBy(Experiment obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(Experiment obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(Experiment obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public void setShortDescription(Experiment obj, int index) {
+    public void setShortDescription(Experiment obj, int index) {
         String shortDescription = "shortDescription_" + index;
         if (shortDescription.length() > 1024) {
             shortDescription = shortDescription.substring(0, 1024);
@@ -131,7 +137,7 @@ public void setShortDescription(Experiment obj, int index) {
         obj.setShortDescription(shortDescription);
     }
 
-	public Experiment getSpecificExperiment(int index) {
+    public Experiment getSpecificExperiment(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -144,18 +150,18 @@ public Experiment getSpecificExperiment(int index) {
         return Experiment.findExperiment(id);
     }
 
-	public Experiment getRandomExperiment() {
+    public Experiment getRandomExperiment() {
         init();
         Experiment obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return Experiment.findExperiment(id);
     }
 
-	public boolean modifyExperiment(Experiment obj) {
+    public boolean modifyExperiment(Experiment obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = Experiment.findExperimentEntries(from, to);
@@ -165,7 +171,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<Experiment>();
         for (int i = 0; i < 10; i++) {
             Experiment obj = getNewTransientExperiment(i);
@@ -175,7 +181,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ExperimentIntegrationTest.java
index 793f9fbcc..9d2a8cb22 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentIntegrationTest.java
@@ -25,17 +25,18 @@ public class ExperimentIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ExperimentDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountExperiments() {
-        Assert.assertNotNull("Data on demand for 'Experiment' failed to initialize correctly", dod.getRandomExperiment());
+        Assert.assertNotNull("Data on demand for 'Experiment' failed to initialize correctly",
+                dod.getRandomExperiment());
         long count = Experiment.countExperiments();
         Assert.assertTrue("Counter for 'Experiment' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindExperiment() {
         Experiment obj = dod.getRandomExperiment();
         Assert.assertNotNull("Data on demand for 'Experiment' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindExperiment() {
         Assert.assertEquals("Find method for 'Experiment' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllExperiments() {
-        Assert.assertNotNull("Data on demand for 'Experiment' failed to initialize correctly", dod.getRandomExperiment());
+        Assert.assertNotNull("Data on demand for 'Experiment' failed to initialize correctly",
+                dod.getRandomExperiment());
         long count = Experiment.countExperiments();
-        Assert.assertTrue("Too expensive to perform a find all test for 'Experiment', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'Experiment', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<Experiment> result = Experiment.findAllExperiments();
         Assert.assertNotNull("Find all method for 'Experiment' illegally returned null", result);
         Assert.assertTrue("Find all method for 'Experiment' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindExperimentEntries() {
-        Assert.assertNotNull("Data on demand for 'Experiment' failed to initialize correctly", dod.getRandomExperiment());
+        Assert.assertNotNull("Data on demand for 'Experiment' failed to initialize correctly",
+                dod.getRandomExperiment());
         long count = Experiment.countExperiments();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<Experiment> result = Experiment.findExperimentEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'Experiment' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'Experiment' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'Experiment' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         Experiment obj = dod.getRandomExperiment();
         Assert.assertNotNull("Data on demand for 'Experiment' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'Experiment' failed to provide an identifier", id);
         obj = Experiment.findExperiment(id);
         Assert.assertNotNull("Find method for 'Experiment' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyExperiment(obj);
+        boolean modified = dod.modifyExperiment(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'Experiment' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'Experiment' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         Experiment obj = dod.getRandomExperiment();
         Assert.assertNotNull("Data on demand for 'Experiment' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'Experiment' failed to provide an identifier", id);
         obj = Experiment.findExperiment(id);
-        boolean modified =  dod.modifyExperiment(obj);
+        boolean modified = dod.modifyExperiment(obj);
         Integer currentVersion = obj.getVersion();
-        Experiment merged = (Experiment)obj.merge();
+        Experiment merged = (Experiment) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'Experiment' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'Experiment' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'Experiment' failed to initialize correctly", dod.getRandomExperiment());
+        Assert.assertNotNull("Data on demand for 'Experiment' failed to initialize correctly",
+                dod.getRandomExperiment());
         Experiment obj = dod.getNewTransientExperiment(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'Experiment' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'Experiment' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'Experiment' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         Experiment obj = dod.getRandomExperiment();
         Assert.assertNotNull("Data on demand for 'Experiment' failed to initialize correctly", obj);
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ExperimentKindDataOnDemand.java
index 2c8794b6f..9987fd3ed 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentKindDataOnDemand.java
@@ -17,14 +17,14 @@
 @Configurable
 public class ExperimentKindDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<ExperimentKind> data;
+    private List<ExperimentKind> data;
 
-	@Autowired
+    @Autowired
     ExperimentTypeDataOnDemand experimentTypeDataOnDemand;
 
-	public ExperimentKind getNewTransientExperimentKind(int index) {
+    public ExperimentKind getNewTransientExperimentKind(int index) {
         ExperimentKind obj = new ExperimentKind();
         setKindName(obj, index);
         setLsType(obj, index);
@@ -32,7 +32,7 @@ public ExperimentKind getNewTransientExperimentKind(int index) {
         return obj;
     }
 
-	public void setKindName(ExperimentKind obj, int index) {
+    public void setKindName(ExperimentKind obj, int index) {
         String kindName = "kindName_" + index;
         if (kindName.length() > 255) {
             kindName = kindName.substring(0, 255);
@@ -40,12 +40,12 @@ public void setKindName(ExperimentKind obj, int index) {
         obj.setKindName(kindName);
     }
 
-	public void setLsType(ExperimentKind obj, int index) {
+    public void setLsType(ExperimentKind obj, int index) {
         ExperimentType lsType = experimentTypeDataOnDemand.getRandomExperimentType();
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(ExperimentKind obj, int index) {
+    public void setLsTypeAndKind(ExperimentKind obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = new Random().nextInt(10) + lsTypeAndKind.substring(1, 255);
@@ -53,7 +53,7 @@ public void setLsTypeAndKind(ExperimentKind obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public ExperimentKind getSpecificExperimentKind(int index) {
+    public ExperimentKind getSpecificExperimentKind(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -66,18 +66,18 @@ public ExperimentKind getSpecificExperimentKind(int index) {
         return ExperimentKind.findExperimentKind(id);
     }
 
-	public ExperimentKind getRandomExperimentKind() {
+    public ExperimentKind getRandomExperimentKind() {
         init();
         ExperimentKind obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return ExperimentKind.findExperimentKind(id);
     }
 
-	public boolean modifyExperimentKind(ExperimentKind obj) {
+    public boolean modifyExperimentKind(ExperimentKind obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = ExperimentKind.findExperimentKindEntries(from, to);
@@ -87,7 +87,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<ExperimentKind>();
         for (int i = 0; i < 10; i++) {
             ExperimentKind obj = getNewTransientExperimentKind(i);
@@ -97,7 +97,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ExperimentKindIntegrationTest.java
index 8c1a96e51..bd403ae5d 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentKindIntegrationTest.java
@@ -25,17 +25,18 @@ public class ExperimentKindIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ExperimentKindDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountExperimentKinds() {
-        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to initialize correctly", dod.getRandomExperimentKind());
+        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to initialize correctly",
+                dod.getRandomExperimentKind());
         long count = ExperimentKind.countExperimentKinds();
         Assert.assertTrue("Counter for 'ExperimentKind' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindExperimentKind() {
         ExperimentKind obj = dod.getRandomExperimentKind();
         Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindExperimentKind() {
         Assert.assertEquals("Find method for 'ExperimentKind' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllExperimentKinds() {
-        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to initialize correctly", dod.getRandomExperimentKind());
+        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to initialize correctly",
+                dod.getRandomExperimentKind());
         long count = ExperimentKind.countExperimentKinds();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ExperimentKind', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'ExperimentKind', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<ExperimentKind> result = ExperimentKind.findAllExperimentKinds();
         Assert.assertNotNull("Find all method for 'ExperimentKind' illegally returned null", result);
         Assert.assertTrue("Find all method for 'ExperimentKind' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindExperimentKindEntries() {
-        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to initialize correctly", dod.getRandomExperimentKind());
+        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to initialize correctly",
+                dod.getRandomExperimentKind());
         long count = ExperimentKind.countExperimentKinds();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<ExperimentKind> result = ExperimentKind.findExperimentKindEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'ExperimentKind' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ExperimentKind' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'ExperimentKind' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         ExperimentKind obj = dod.getRandomExperimentKind();
         Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to provide an identifier", id);
         obj = ExperimentKind.findExperimentKind(id);
         Assert.assertNotNull("Find method for 'ExperimentKind' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyExperimentKind(obj);
+        boolean modified = dod.modifyExperimentKind(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'ExperimentKind' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'ExperimentKind' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         ExperimentKind obj = dod.getRandomExperimentKind();
         Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to provide an identifier", id);
         obj = ExperimentKind.findExperimentKind(id);
-        boolean modified =  dod.modifyExperimentKind(obj);
+        boolean modified = dod.modifyExperimentKind(obj);
         Integer currentVersion = obj.getVersion();
         ExperimentKind merged = obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ExperimentKind' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'ExperimentKind' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to initialize correctly", dod.getRandomExperimentKind());
+        Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to initialize correctly",
+                dod.getRandomExperimentKind());
         ExperimentKind obj = dod.getNewTransientExperimentKind(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'ExperimentKind' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'ExperimentKind' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         ExperimentKind obj = dod.getRandomExperimentKind();
         Assert.assertNotNull("Data on demand for 'ExperimentKind' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = ExperimentKind.findExperimentKind(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'ExperimentKind' with identifier '" + id + "'", ExperimentKind.findExperimentKind(id));
+        Assert.assertNull("Failed to remove 'ExperimentKind' with identifier '" + id + "'",
+                ExperimentKind.findExperimentKind(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentLabelDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ExperimentLabelDataOnDemand.java
index 897665196..f8f34c27a 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentLabelDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentLabelDataOnDemand.java
@@ -20,14 +20,14 @@
 @Configurable
 public class ExperimentLabelDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<ExperimentLabel> data;
+    private List<ExperimentLabel> data;
 
-	@Autowired
+    @Autowired
     ExperimentDataOnDemand experimentDataOnDemand;
 
-	public ExperimentLabel getNewTransientExperimentLabel(int index) {
+    public ExperimentLabel getNewTransientExperimentLabel(int index) {
         ExperimentLabel obj = new ExperimentLabel();
         setDeleted(obj, index);
         setExperiment(obj, index);
@@ -46,22 +46,22 @@ public ExperimentLabel getNewTransientExperimentLabel(int index) {
         return obj;
     }
 
-	public void setDeleted(ExperimentLabel obj, int index) {
+    public void setDeleted(ExperimentLabel obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setExperiment(ExperimentLabel obj, int index) {
+    public void setExperiment(ExperimentLabel obj, int index) {
         Experiment experiment = experimentDataOnDemand.getRandomExperiment();
         obj.setExperiment(experiment);
     }
 
-	public void setIgnored(ExperimentLabel obj, int index) {
+    public void setIgnored(ExperimentLabel obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setImageFile(ExperimentLabel obj, int index) {
+    public void setImageFile(ExperimentLabel obj, int index) {
         String imageFile = "imageFile_" + index;
         if (imageFile.length() > 255) {
             imageFile = imageFile.substring(0, 255);
@@ -69,7 +69,7 @@ public void setImageFile(ExperimentLabel obj, int index) {
         obj.setImageFile(imageFile);
     }
 
-	public void setLabelText(ExperimentLabel obj, int index) {
+    public void setLabelText(ExperimentLabel obj, int index) {
         String labelText = "labelText_" + index;
         if (labelText.length() > 255) {
             labelText = labelText.substring(0, 255);
@@ -77,7 +77,7 @@ public void setLabelText(ExperimentLabel obj, int index) {
         obj.setLabelText(labelText);
     }
 
-	public void setLsKind(ExperimentLabel obj, int index) {
+    public void setLsKind(ExperimentLabel obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -85,12 +85,12 @@ public void setLsKind(ExperimentLabel obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsTransaction(ExperimentLabel obj, int index) {
+    public void setLsTransaction(ExperimentLabel obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(ExperimentLabel obj, int index) {
+    public void setLsType(ExperimentLabel obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 64) {
             lsType = lsType.substring(0, 64);
@@ -98,7 +98,7 @@ public void setLsType(ExperimentLabel obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(ExperimentLabel obj, int index) {
+    public void setLsTypeAndKind(ExperimentLabel obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 255);
@@ -106,22 +106,25 @@ public void setLsTypeAndKind(ExperimentLabel obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedDate(ExperimentLabel obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(ExperimentLabel obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setPhysicallyLabled(ExperimentLabel obj, int index) {
+    public void setPhysicallyLabled(ExperimentLabel obj, int index) {
         Boolean physicallyLabled = true;
         obj.setPhysicallyLabled(physicallyLabled);
     }
 
-	public void setPreferred(ExperimentLabel obj, int index) {
+    public void setPreferred(ExperimentLabel obj, int index) {
         Boolean preferred = true;
         obj.setPreferred(preferred);
     }
 
-	public void setRecordedBy(ExperimentLabel obj, int index) {
+    public void setRecordedBy(ExperimentLabel obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -129,12 +132,15 @@ public void setRecordedBy(ExperimentLabel obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(ExperimentLabel obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(ExperimentLabel obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public ExperimentLabel getSpecificExperimentLabel(int index) {
+    public ExperimentLabel getSpecificExperimentLabel(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -147,28 +153,29 @@ public ExperimentLabel getSpecificExperimentLabel(int index) {
         return ExperimentLabel.findExperimentLabel(id);
     }
 
-	public ExperimentLabel getRandomExperimentLabel() {
+    public ExperimentLabel getRandomExperimentLabel() {
         init();
         ExperimentLabel obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return ExperimentLabel.findExperimentLabel(id);
     }
 
-	public boolean modifyExperimentLabel(ExperimentLabel obj) {
+    public boolean modifyExperimentLabel(ExperimentLabel obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = ExperimentLabel.findExperimentLabelEntries(from, to);
         if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ExperimentLabel' illegally returned null");
+            throw new IllegalStateException(
+                    "Find entries implementation for 'ExperimentLabel' illegally returned null");
         }
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<ExperimentLabel>();
         for (int i = 0; i < 10; i++) {
             ExperimentLabel obj = getNewTransientExperimentLabel(i);
@@ -178,7 +185,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentLabelIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ExperimentLabelIntegrationTest.java
index 05062f61b..11de3ac5d 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentLabelIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentLabelIntegrationTest.java
@@ -25,17 +25,18 @@ public class ExperimentLabelIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ExperimentLabelDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountExperimentLabels() {
-        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to initialize correctly", dod.getRandomExperimentLabel());
+        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to initialize correctly",
+                dod.getRandomExperimentLabel());
         long count = ExperimentLabel.countExperimentLabels();
         Assert.assertTrue("Counter for 'ExperimentLabel' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindExperimentLabel() {
         ExperimentLabel obj = dod.getRandomExperimentLabel();
         Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindExperimentLabel() {
         Assert.assertEquals("Find method for 'ExperimentLabel' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllExperimentLabels() {
-        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to initialize correctly", dod.getRandomExperimentLabel());
+        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to initialize correctly",
+                dod.getRandomExperimentLabel());
         long count = ExperimentLabel.countExperimentLabels();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ExperimentLabel', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'ExperimentLabel', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<ExperimentLabel> result = ExperimentLabel.findAllExperimentLabels();
         Assert.assertNotNull("Find all method for 'ExperimentLabel' illegally returned null", result);
         Assert.assertTrue("Find all method for 'ExperimentLabel' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindExperimentLabelEntries() {
-        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to initialize correctly", dod.getRandomExperimentLabel());
+        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to initialize correctly",
+                dod.getRandomExperimentLabel());
         long count = ExperimentLabel.countExperimentLabels();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<ExperimentLabel> result = ExperimentLabel.findExperimentLabelEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'ExperimentLabel' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ExperimentLabel' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'ExperimentLabel' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         ExperimentLabel obj = dod.getRandomExperimentLabel();
         Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to provide an identifier", id);
         obj = ExperimentLabel.findExperimentLabel(id);
         Assert.assertNotNull("Find method for 'ExperimentLabel' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyExperimentLabel(obj);
+        boolean modified = dod.modifyExperimentLabel(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'ExperimentLabel' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'ExperimentLabel' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         ExperimentLabel obj = dod.getRandomExperimentLabel();
         Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to provide an identifier", id);
         obj = ExperimentLabel.findExperimentLabel(id);
-        boolean modified =  dod.modifyExperimentLabel(obj);
+        boolean modified = dod.modifyExperimentLabel(obj);
         Integer currentVersion = obj.getVersion();
-        ExperimentLabel merged = (ExperimentLabel)obj.merge();
+        ExperimentLabel merged = (ExperimentLabel) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ExperimentLabel' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'ExperimentLabel' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to initialize correctly", dod.getRandomExperimentLabel());
+        Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to initialize correctly",
+                dod.getRandomExperimentLabel());
         ExperimentLabel obj = dod.getNewTransientExperimentLabel(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'ExperimentLabel' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'ExperimentLabel' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         ExperimentLabel obj = dod.getRandomExperimentLabel();
         Assert.assertNotNull("Data on demand for 'ExperimentLabel' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = ExperimentLabel.findExperimentLabel(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'ExperimentLabel' with identifier '" + id + "'", ExperimentLabel.findExperimentLabel(id));
+        Assert.assertNull("Failed to remove 'ExperimentLabel' with identifier '" + id + "'",
+                ExperimentLabel.findExperimentLabel(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ExperimentStateDataOnDemand.java
index 8a4825016..5c3fcb7df 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentStateDataOnDemand.java
@@ -20,14 +20,14 @@
 @Component
 public class ExperimentStateDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<ExperimentState> data;
+    private List<ExperimentState> data;
 
-	@Autowired
+    @Autowired
     ExperimentDataOnDemand experimentDataOnDemand;
 
-	public ExperimentState getNewTransientExperimentState(int index) {
+    public ExperimentState getNewTransientExperimentState(int index) {
         ExperimentState obj = new ExperimentState();
         setComments(obj, index);
         setDeleted(obj, index);
@@ -44,7 +44,7 @@ public ExperimentState getNewTransientExperimentState(int index) {
         return obj;
     }
 
-	public void setComments(ExperimentState obj, int index) {
+    public void setComments(ExperimentState obj, int index) {
         String comments = "comments_" + index;
         if (comments.length() > 512) {
             comments = comments.substring(0, 512);
@@ -52,22 +52,22 @@ public void setComments(ExperimentState obj, int index) {
         obj.setComments(comments);
     }
 
-	public void setDeleted(ExperimentState obj, int index) {
+    public void setDeleted(ExperimentState obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setExperiment(ExperimentState obj, int index) {
+    public void setExperiment(ExperimentState obj, int index) {
         Experiment experiment = experimentDataOnDemand.getRandomExperiment();
         obj.setExperiment(experiment);
     }
 
-	public void setIgnored(ExperimentState obj, int index) {
+    public void setIgnored(ExperimentState obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setLsKind(ExperimentState obj, int index) {
+    public void setLsKind(ExperimentState obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -75,12 +75,12 @@ public void setLsKind(ExperimentState obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsTransaction(ExperimentState obj, int index) {
+    public void setLsTransaction(ExperimentState obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(ExperimentState obj, int index) {
+    public void setLsType(ExperimentState obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 64) {
             lsType = lsType.substring(0, 64);
@@ -88,7 +88,7 @@ public void setLsType(ExperimentState obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(ExperimentState obj, int index) {
+    public void setLsTypeAndKind(ExperimentState obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 255);
@@ -96,7 +96,7 @@ public void setLsTypeAndKind(ExperimentState obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedBy(ExperimentState obj, int index) {
+    public void setModifiedBy(ExperimentState obj, int index) {
         String modifiedBy = "modifiedBy_" + index;
         if (modifiedBy.length() > 255) {
             modifiedBy = modifiedBy.substring(0, 255);
@@ -104,12 +104,15 @@ public void setModifiedBy(ExperimentState obj, int index) {
         obj.setModifiedBy(modifiedBy);
     }
 
-	public void setModifiedDate(ExperimentState obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(ExperimentState obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setRecordedBy(ExperimentState obj, int index) {
+    public void setRecordedBy(ExperimentState obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -117,12 +120,15 @@ public void setRecordedBy(ExperimentState obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(ExperimentState obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(ExperimentState obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public ExperimentState getSpecificExperimentState(int index) {
+    public ExperimentState getSpecificExperimentState(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -135,28 +141,29 @@ public ExperimentState getSpecificExperimentState(int index) {
         return ExperimentState.findExperimentState(id);
     }
 
-	public ExperimentState getRandomExperimentState() {
+    public ExperimentState getRandomExperimentState() {
         init();
         ExperimentState obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return ExperimentState.findExperimentState(id);
     }
 
-	public boolean modifyExperimentState(ExperimentState obj) {
+    public boolean modifyExperimentState(ExperimentState obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = ExperimentState.findExperimentStateEntries(from, to);
         if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ExperimentState' illegally returned null");
+            throw new IllegalStateException(
+                    "Find entries implementation for 'ExperimentState' illegally returned null");
         }
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<ExperimentState>();
         for (int i = 0; i < 10; i++) {
             ExperimentState obj = getNewTransientExperimentState(i);
@@ -166,7 +173,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ExperimentStateIntegrationTest.java
index 512a4fdcd..8fd9a9750 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentStateIntegrationTest.java
@@ -25,17 +25,18 @@ public class ExperimentStateIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ExperimentStateDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountExperimentStates() {
-        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to initialize correctly", dod.getRandomExperimentState());
+        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to initialize correctly",
+                dod.getRandomExperimentState());
         long count = ExperimentState.countExperimentStates();
         Assert.assertTrue("Counter for 'ExperimentState' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindExperimentState() {
         ExperimentState obj = dod.getRandomExperimentState();
         Assert.assertNotNull("Data on demand for 'ExperimentState' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindExperimentState() {
         Assert.assertEquals("Find method for 'ExperimentState' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllExperimentStates() {
-        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to initialize correctly", dod.getRandomExperimentState());
+        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to initialize correctly",
+                dod.getRandomExperimentState());
         long count = ExperimentState.countExperimentStates();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ExperimentState', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'ExperimentState', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<ExperimentState> result = ExperimentState.findAllExperimentStates();
         Assert.assertNotNull("Find all method for 'ExperimentState' illegally returned null", result);
         Assert.assertTrue("Find all method for 'ExperimentState' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindExperimentStateEntries() {
-        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to initialize correctly", dod.getRandomExperimentState());
+        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to initialize correctly",
+                dod.getRandomExperimentState());
         long count = ExperimentState.countExperimentStates();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<ExperimentState> result = ExperimentState.findExperimentStateEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'ExperimentState' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ExperimentState' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'ExperimentState' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         ExperimentState obj = dod.getRandomExperimentState();
         Assert.assertNotNull("Data on demand for 'ExperimentState' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'ExperimentState' failed to provide an identifier", id);
         obj = ExperimentState.findExperimentState(id);
         Assert.assertNotNull("Find method for 'ExperimentState' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyExperimentState(obj);
+        boolean modified = dod.modifyExperimentState(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'ExperimentState' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'ExperimentState' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         ExperimentState obj = dod.getRandomExperimentState();
         Assert.assertNotNull("Data on demand for 'ExperimentState' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ExperimentState' failed to provide an identifier", id);
         obj = ExperimentState.findExperimentState(id);
-        boolean modified =  dod.modifyExperimentState(obj);
+        boolean modified = dod.modifyExperimentState(obj);
         Integer currentVersion = obj.getVersion();
-        ExperimentState merged = (ExperimentState)obj.merge();
+        ExperimentState merged = (ExperimentState) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ExperimentState' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'ExperimentState' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to initialize correctly", dod.getRandomExperimentState());
+        Assert.assertNotNull("Data on demand for 'ExperimentState' failed to initialize correctly",
+                dod.getRandomExperimentState());
         ExperimentState obj = dod.getNewTransientExperimentState(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'ExperimentState' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'ExperimentState' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'ExperimentState' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         ExperimentState obj = dod.getRandomExperimentState();
         Assert.assertNotNull("Data on demand for 'ExperimentState' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = ExperimentState.findExperimentState(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'ExperimentState' with identifier '" + id + "'", ExperimentState.findExperimentState(id));
+        Assert.assertNull("Failed to remove 'ExperimentState' with identifier '" + id + "'",
+                ExperimentState.findExperimentState(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ExperimentTypeDataOnDemand.java
index 66b026a92..63c87d542 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentTypeDataOnDemand.java
@@ -16,17 +16,17 @@
 @Configurable
 public class ExperimentTypeDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<ExperimentType> data;
+    private List<ExperimentType> data;
 
-	public ExperimentType getNewTransientExperimentType(int index) {
+    public ExperimentType getNewTransientExperimentType(int index) {
         ExperimentType obj = new ExperimentType();
         setTypeName(obj, index);
         return obj;
     }
 
-	public void setTypeName(ExperimentType obj, int index) {
+    public void setTypeName(ExperimentType obj, int index) {
         String typeName = "typeName_" + index;
         if (typeName.length() > 128) {
             typeName = new Random().nextInt(10) + typeName.substring(1, 128);
@@ -34,7 +34,7 @@ public void setTypeName(ExperimentType obj, int index) {
         obj.setTypeName(typeName);
     }
 
-	public ExperimentType getSpecificExperimentType(int index) {
+    public ExperimentType getSpecificExperimentType(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -47,18 +47,18 @@ public ExperimentType getSpecificExperimentType(int index) {
         return ExperimentType.findExperimentType(id);
     }
 
-	public ExperimentType getRandomExperimentType() {
+    public ExperimentType getRandomExperimentType() {
         init();
         ExperimentType obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return ExperimentType.findExperimentType(id);
     }
 
-	public boolean modifyExperimentType(ExperimentType obj) {
+    public boolean modifyExperimentType(ExperimentType obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = ExperimentType.findExperimentTypeEntries(from, to);
@@ -68,7 +68,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<ExperimentType>();
         for (int i = 0; i < 10; i++) {
             ExperimentType obj = getNewTransientExperimentType(i);
@@ -78,7 +78,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ExperimentTypeIntegrationTest.java
index 492625c35..68b2beabd 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentTypeIntegrationTest.java
@@ -25,17 +25,18 @@ public class ExperimentTypeIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ExperimentTypeDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountExperimentTypes() {
-        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to initialize correctly", dod.getRandomExperimentType());
+        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to initialize correctly",
+                dod.getRandomExperimentType());
         long count = ExperimentType.countExperimentTypes();
         Assert.assertTrue("Counter for 'ExperimentType' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindExperimentType() {
         ExperimentType obj = dod.getRandomExperimentType();
         Assert.assertNotNull("Data on demand for 'ExperimentType' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindExperimentType() {
         Assert.assertEquals("Find method for 'ExperimentType' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllExperimentTypes() {
-        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to initialize correctly", dod.getRandomExperimentType());
+        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to initialize correctly",
+                dod.getRandomExperimentType());
         long count = ExperimentType.countExperimentTypes();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ExperimentType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'ExperimentType', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<ExperimentType> result = ExperimentType.findAllExperimentTypes();
         Assert.assertNotNull("Find all method for 'ExperimentType' illegally returned null", result);
         Assert.assertTrue("Find all method for 'ExperimentType' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindExperimentTypeEntries() {
-        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to initialize correctly", dod.getRandomExperimentType());
+        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to initialize correctly",
+                dod.getRandomExperimentType());
         long count = ExperimentType.countExperimentTypes();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<ExperimentType> result = ExperimentType.findExperimentTypeEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'ExperimentType' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ExperimentType' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'ExperimentType' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         ExperimentType obj = dod.getRandomExperimentType();
         Assert.assertNotNull("Data on demand for 'ExperimentType' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'ExperimentType' failed to provide an identifier", id);
         obj = ExperimentType.findExperimentType(id);
         Assert.assertNotNull("Find method for 'ExperimentType' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyExperimentType(obj);
+        boolean modified = dod.modifyExperimentType(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'ExperimentType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'ExperimentType' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         ExperimentType obj = dod.getRandomExperimentType();
         Assert.assertNotNull("Data on demand for 'ExperimentType' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ExperimentType' failed to provide an identifier", id);
         obj = ExperimentType.findExperimentType(id);
-        boolean modified =  dod.modifyExperimentType(obj);
+        boolean modified = dod.modifyExperimentType(obj);
         Integer currentVersion = obj.getVersion();
         ExperimentType merged = obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ExperimentType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'ExperimentType' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to initialize correctly", dod.getRandomExperimentType());
+        Assert.assertNotNull("Data on demand for 'ExperimentType' failed to initialize correctly",
+                dod.getRandomExperimentType());
         ExperimentType obj = dod.getNewTransientExperimentType(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'ExperimentType' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'ExperimentType' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'ExperimentType' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         ExperimentType obj = dod.getRandomExperimentType();
         Assert.assertNotNull("Data on demand for 'ExperimentType' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = ExperimentType.findExperimentType(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'ExperimentType' with identifier '" + id + "'", ExperimentType.findExperimentType(id));
+        Assert.assertNull("Failed to remove 'ExperimentType' with identifier '" + id + "'",
+                ExperimentType.findExperimentType(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ExperimentValueDataOnDemand.java
index 23a934a6a..3edac47c4 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentValueDataOnDemand.java
@@ -21,14 +21,14 @@
 @Configurable
 public class ExperimentValueDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<ExperimentValue> data;
+    private List<ExperimentValue> data;
 
-	@Autowired
+    @Autowired
     ExperimentStateDataOnDemand experimentStateDataOnDemand;
 
-	public ExperimentValue getNewTransientExperimentValue(int index) {
+    public ExperimentValue getNewTransientExperimentValue(int index) {
         ExperimentValue obj = new ExperimentValue();
         setBlobValue(obj, index);
         setClobValue(obj, index);
@@ -70,17 +70,17 @@ public ExperimentValue getNewTransientExperimentValue(int index) {
         return obj;
     }
 
-	public void setBlobValue(ExperimentValue obj, int index) {
+    public void setBlobValue(ExperimentValue obj, int index) {
         byte[] blobValue = String.valueOf(index).getBytes();
         obj.setBlobValue(blobValue);
     }
 
-	public void setClobValue(ExperimentValue obj, int index) {
+    public void setClobValue(ExperimentValue obj, int index) {
         String clobValue = "clobValue_" + index;
         obj.setClobValue(clobValue);
     }
 
-	public void setCodeKind(ExperimentValue obj, int index) {
+    public void setCodeKind(ExperimentValue obj, int index) {
         String codeKind = "codeKind_" + index;
         if (codeKind.length() > 255) {
             codeKind = codeKind.substring(0, 255);
@@ -88,7 +88,7 @@ public void setCodeKind(ExperimentValue obj, int index) {
         obj.setCodeKind(codeKind);
     }
 
-	public void setCodeOrigin(ExperimentValue obj, int index) {
+    public void setCodeOrigin(ExperimentValue obj, int index) {
         String codeOrigin = "codeOrigin_" + index;
         if (codeOrigin.length() > 255) {
             codeOrigin = codeOrigin.substring(0, 255);
@@ -96,7 +96,7 @@ public void setCodeOrigin(ExperimentValue obj, int index) {
         obj.setCodeOrigin(codeOrigin);
     }
 
-	public void setCodeType(ExperimentValue obj, int index) {
+    public void setCodeType(ExperimentValue obj, int index) {
         String codeType = "codeType_" + index;
         if (codeType.length() > 255) {
             codeType = codeType.substring(0, 255);
@@ -104,7 +104,7 @@ public void setCodeType(ExperimentValue obj, int index) {
         obj.setCodeType(codeType);
     }
 
-	public void setCodeTypeAndKind(ExperimentValue obj, int index) {
+    public void setCodeTypeAndKind(ExperimentValue obj, int index) {
         String codeTypeAndKind = "codeTypeAndKind_" + index;
         if (codeTypeAndKind.length() > 350) {
             codeTypeAndKind = codeTypeAndKind.substring(0, 350);
@@ -112,7 +112,7 @@ public void setCodeTypeAndKind(ExperimentValue obj, int index) {
         obj.setCodeTypeAndKind(codeTypeAndKind);
     }
 
-	public void setCodeValue(ExperimentValue obj, int index) {
+    public void setCodeValue(ExperimentValue obj, int index) {
         String codeValue = "codeValue_" + index;
         if (codeValue.length() > 255) {
             codeValue = codeValue.substring(0, 255);
@@ -120,7 +120,7 @@ public void setCodeValue(ExperimentValue obj, int index) {
         obj.setCodeValue(codeValue);
     }
 
-	public void setComments(ExperimentValue obj, int index) {
+    public void setComments(ExperimentValue obj, int index) {
         String comments = "comments_" + index;
         if (comments.length() > 512) {
             comments = comments.substring(0, 512);
@@ -128,7 +128,7 @@ public void setComments(ExperimentValue obj, int index) {
         obj.setComments(comments);
     }
 
-	public void setConcUnit(ExperimentValue obj, int index) {
+    public void setConcUnit(ExperimentValue obj, int index) {
         String concUnit = "concUnit_" + index;
         if (concUnit.length() > 25) {
             concUnit = concUnit.substring(0, 25);
@@ -136,22 +136,25 @@ public void setConcUnit(ExperimentValue obj, int index) {
         obj.setConcUnit(concUnit);
     }
 
-	public void setConcentration(ExperimentValue obj, int index) {
+    public void setConcentration(ExperimentValue obj, int index) {
         Double concentration = new Integer(index).doubleValue();
         obj.setConcentration(concentration);
     }
 
-	public void setDateValue(ExperimentValue obj, int index) {
-        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setDateValue(ExperimentValue obj, int index) {
+        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setDateValue(dateValue);
     }
 
-	public void setDeleted(ExperimentValue obj, int index) {
+    public void setDeleted(ExperimentValue obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setFileValue(ExperimentValue obj, int index) {
+    public void setFileValue(ExperimentValue obj, int index) {
         String fileValue = "fileValue_" + index;
         if (fileValue.length() > 512) {
             fileValue = fileValue.substring(0, 512);
@@ -159,12 +162,12 @@ public void setFileValue(ExperimentValue obj, int index) {
         obj.setFileValue(fileValue);
     }
 
-	public void setIgnored(ExperimentValue obj, int index) {
+    public void setIgnored(ExperimentValue obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setLsKind(ExperimentValue obj, int index) {
+    public void setLsKind(ExperimentValue obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -172,17 +175,17 @@ public void setLsKind(ExperimentValue obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsState(ExperimentValue obj, int index) {
+    public void setLsState(ExperimentValue obj, int index) {
         ExperimentState lsState = experimentStateDataOnDemand.getRandomExperimentState();
         obj.setLsState(lsState);
     }
 
-	public void setLsTransaction(ExperimentValue obj, int index) {
+    public void setLsTransaction(ExperimentValue obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(ExperimentValue obj, int index) {
+    public void setLsType(ExperimentValue obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 64) {
             lsType = lsType.substring(0, 64);
@@ -190,7 +193,7 @@ public void setLsType(ExperimentValue obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(ExperimentValue obj, int index) {
+    public void setLsTypeAndKind(ExperimentValue obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 350) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 350);
@@ -198,7 +201,7 @@ public void setLsTypeAndKind(ExperimentValue obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedBy(ExperimentValue obj, int index) {
+    public void setModifiedBy(ExperimentValue obj, int index) {
         String modifiedBy = "modifiedBy_" + index;
         if (modifiedBy.length() > 255) {
             modifiedBy = modifiedBy.substring(0, 255);
@@ -206,17 +209,20 @@ public void setModifiedBy(ExperimentValue obj, int index) {
         obj.setModifiedBy(modifiedBy);
     }
 
-	public void setModifiedDate(ExperimentValue obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(ExperimentValue obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setNumberOfReplicates(ExperimentValue obj, int index) {
+    public void setNumberOfReplicates(ExperimentValue obj, int index) {
         Integer numberOfReplicates = new Integer(index);
         obj.setNumberOfReplicates(numberOfReplicates);
     }
 
-	public void setNumericValue(ExperimentValue obj, int index) {
+    public void setNumericValue(ExperimentValue obj, int index) {
         BigDecimal numericValue = BigDecimal.valueOf(index);
         if (numericValue.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
             numericValue = new BigDecimal("99999999999999999999.999999999999999999");
@@ -224,7 +230,7 @@ public void setNumericValue(ExperimentValue obj, int index) {
         obj.setNumericValue(numericValue);
     }
 
-	public void setOperatorKind(ExperimentValue obj, int index) {
+    public void setOperatorKind(ExperimentValue obj, int index) {
         String operatorKind = "operator_" + index;
         if (operatorKind.length() > 10) {
             operatorKind = operatorKind.substring(0, 10);
@@ -232,7 +238,7 @@ public void setOperatorKind(ExperimentValue obj, int index) {
         obj.setOperatorKind(operatorKind);
     }
 
-	public void setOperatorType(ExperimentValue obj, int index) {
+    public void setOperatorType(ExperimentValue obj, int index) {
         String operatorType = "operatorType_" + index;
         if (operatorType.length() > 25) {
             operatorType = operatorType.substring(0, 25);
@@ -240,7 +246,7 @@ public void setOperatorType(ExperimentValue obj, int index) {
         obj.setOperatorType(operatorType);
     }
 
-	public void setOperatorTypeAndKind(ExperimentValue obj, int index) {
+    public void setOperatorTypeAndKind(ExperimentValue obj, int index) {
         String operatorTypeAndKind = "operatorTypeAndKind_" + index;
         if (operatorTypeAndKind.length() > 50) {
             operatorTypeAndKind = operatorTypeAndKind.substring(0, 50);
@@ -248,12 +254,12 @@ public void setOperatorTypeAndKind(ExperimentValue obj, int index) {
         obj.setOperatorTypeAndKind(operatorTypeAndKind);
     }
 
-	public void setPublicData(ExperimentValue obj, int index) {
+    public void setPublicData(ExperimentValue obj, int index) {
         Boolean publicData = true;
         obj.setPublicData(publicData);
     }
 
-	public void setRecordedBy(ExperimentValue obj, int index) {
+    public void setRecordedBy(ExperimentValue obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -261,17 +267,20 @@ public void setRecordedBy(ExperimentValue obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(ExperimentValue obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(ExperimentValue obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public void setSigFigs(ExperimentValue obj, int index) {
+    public void setSigFigs(ExperimentValue obj, int index) {
         Integer sigFigs = new Integer(index);
         obj.setSigFigs(sigFigs);
     }
 
-	public void setStringValue(ExperimentValue obj, int index) {
+    public void setStringValue(ExperimentValue obj, int index) {
         String stringValue = "stringValue_" + index;
         if (stringValue.length() > 255) {
             stringValue = stringValue.substring(0, 255);
@@ -279,7 +288,7 @@ public void setStringValue(ExperimentValue obj, int index) {
         obj.setStringValue(stringValue);
     }
 
-	public void setUncertainty(ExperimentValue obj, int index) {
+    public void setUncertainty(ExperimentValue obj, int index) {
         BigDecimal uncertainty = BigDecimal.valueOf(index);
         if (uncertainty.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
             uncertainty = new BigDecimal("99999999999999999999.999999999999999999");
@@ -287,7 +296,7 @@ public void setUncertainty(ExperimentValue obj, int index) {
         obj.setUncertainty(uncertainty);
     }
 
-	public void setUncertaintyType(ExperimentValue obj, int index) {
+    public void setUncertaintyType(ExperimentValue obj, int index) {
         String uncertaintyType = "uncertaintyType_" + index;
         if (uncertaintyType.length() > 255) {
             uncertaintyType = uncertaintyType.substring(0, 255);
@@ -295,7 +304,7 @@ public void setUncertaintyType(ExperimentValue obj, int index) {
         obj.setUncertaintyType(uncertaintyType);
     }
 
-	public void setUnitKind(ExperimentValue obj, int index) {
+    public void setUnitKind(ExperimentValue obj, int index) {
         String unitKind = "unitKind_" + index;
         if (unitKind.length() > 25) {
             unitKind = unitKind.substring(0, 25);
@@ -303,7 +312,7 @@ public void setUnitKind(ExperimentValue obj, int index) {
         obj.setUnitKind(unitKind);
     }
 
-	public void setUnitType(ExperimentValue obj, int index) {
+    public void setUnitType(ExperimentValue obj, int index) {
         String unitType = "unitType_" + index;
         if (unitType.length() > 25) {
             unitType = unitType.substring(0, 25);
@@ -311,7 +320,7 @@ public void setUnitType(ExperimentValue obj, int index) {
         obj.setUnitType(unitType);
     }
 
-	public void setUnitTypeAndKind(ExperimentValue obj, int index) {
+    public void setUnitTypeAndKind(ExperimentValue obj, int index) {
         String unitTypeAndKind = "unitTypeAndKind_" + index;
         if (unitTypeAndKind.length() > 55) {
             unitTypeAndKind = unitTypeAndKind.substring(0, 55);
@@ -319,7 +328,7 @@ public void setUnitTypeAndKind(ExperimentValue obj, int index) {
         obj.setUnitTypeAndKind(unitTypeAndKind);
     }
 
-	public void setUrlValue(ExperimentValue obj, int index) {
+    public void setUrlValue(ExperimentValue obj, int index) {
         String urlValue = "urlValue_" + index;
         if (urlValue.length() > 2000) {
             urlValue = urlValue.substring(0, 2000);
@@ -327,7 +336,7 @@ public void setUrlValue(ExperimentValue obj, int index) {
         obj.setUrlValue(urlValue);
     }
 
-	public ExperimentValue getSpecificExperimentValue(int index) {
+    public ExperimentValue getSpecificExperimentValue(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -340,28 +349,29 @@ public ExperimentValue getSpecificExperimentValue(int index) {
         return ExperimentValue.findExperimentValue(id);
     }
 
-	public ExperimentValue getRandomExperimentValue() {
+    public ExperimentValue getRandomExperimentValue() {
         init();
         ExperimentValue obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return ExperimentValue.findExperimentValue(id);
     }
 
-	public boolean modifyExperimentValue(ExperimentValue obj) {
+    public boolean modifyExperimentValue(ExperimentValue obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = ExperimentValue.findExperimentValueEntries(from, to);
         if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ExperimentValue' illegally returned null");
+            throw new IllegalStateException(
+                    "Find entries implementation for 'ExperimentValue' illegally returned null");
         }
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<ExperimentValue>();
         for (int i = 0; i < 10; i++) {
             ExperimentValue obj = getNewTransientExperimentValue(i);
@@ -371,7 +381,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ExperimentValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ExperimentValueIntegrationTest.java
index 8b3e5c58d..5ab21eac3 100755
--- a/src/test/java/com/labsynch/labseer/domain/ExperimentValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ExperimentValueIntegrationTest.java
@@ -25,17 +25,18 @@ public class ExperimentValueIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ExperimentValueDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountExperimentValues() {
-        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to initialize correctly", dod.getRandomExperimentValue());
+        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to initialize correctly",
+                dod.getRandomExperimentValue());
         long count = ExperimentValue.countExperimentValues();
         Assert.assertTrue("Counter for 'ExperimentValue' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindExperimentValue() {
         ExperimentValue obj = dod.getRandomExperimentValue();
         Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindExperimentValue() {
         Assert.assertEquals("Find method for 'ExperimentValue' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllExperimentValues() {
-        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to initialize correctly", dod.getRandomExperimentValue());
+        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to initialize correctly",
+                dod.getRandomExperimentValue());
         long count = ExperimentValue.countExperimentValues();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ExperimentValue', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'ExperimentValue', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<ExperimentValue> result = ExperimentValue.findAllExperimentValues();
         Assert.assertNotNull("Find all method for 'ExperimentValue' illegally returned null", result);
         Assert.assertTrue("Find all method for 'ExperimentValue' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindExperimentValueEntries() {
-        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to initialize correctly", dod.getRandomExperimentValue());
+        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to initialize correctly",
+                dod.getRandomExperimentValue());
         long count = ExperimentValue.countExperimentValues();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<ExperimentValue> result = ExperimentValue.findExperimentValueEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'ExperimentValue' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ExperimentValue' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'ExperimentValue' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         ExperimentValue obj = dod.getRandomExperimentValue();
         Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to provide an identifier", id);
         obj = ExperimentValue.findExperimentValue(id);
         Assert.assertNotNull("Find method for 'ExperimentValue' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyExperimentValue(obj);
+        boolean modified = dod.modifyExperimentValue(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'ExperimentValue' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'ExperimentValue' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         ExperimentValue obj = dod.getRandomExperimentValue();
         Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to provide an identifier", id);
         obj = ExperimentValue.findExperimentValue(id);
-        boolean modified =  dod.modifyExperimentValue(obj);
+        boolean modified = dod.modifyExperimentValue(obj);
         Integer currentVersion = obj.getVersion();
-        ExperimentValue merged = (ExperimentValue)obj.merge();
+        ExperimentValue merged = (ExperimentValue) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ExperimentValue' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'ExperimentValue' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to initialize correctly", dod.getRandomExperimentValue());
+        Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to initialize correctly",
+                dod.getRandomExperimentValue());
         ExperimentValue obj = dod.getNewTransientExperimentValue(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'ExperimentValue' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'ExperimentValue' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         ExperimentValue obj = dod.getRandomExperimentValue();
         Assert.assertNotNull("Data on demand for 'ExperimentValue' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = ExperimentValue.findExperimentValue(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'ExperimentValue' with identifier '" + id + "'", ExperimentValue.findExperimentValue(id));
+        Assert.assertNull("Failed to remove 'ExperimentValue' with identifier '" + id + "'",
+                ExperimentValue.findExperimentValue(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/InteractionKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/InteractionKindDataOnDemand.java
index 23285d140..8524b057c 100755
--- a/src/test/java/com/labsynch/labseer/domain/InteractionKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/InteractionKindDataOnDemand.java
@@ -17,14 +17,14 @@
 @Component
 public class InteractionKindDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<InteractionKind> data;
+    private List<InteractionKind> data;
 
-	@Autowired
+    @Autowired
     InteractionTypeDataOnDemand interactionTypeDataOnDemand;
 
-	public InteractionKind getNewTransientInteractionKind(int index) {
+    public InteractionKind getNewTransientInteractionKind(int index) {
         InteractionKind obj = new InteractionKind();
         setKindName(obj, index);
         setLsType(obj, index);
@@ -32,7 +32,7 @@ public InteractionKind getNewTransientInteractionKind(int index) {
         return obj;
     }
 
-	public void setKindName(InteractionKind obj, int index) {
+    public void setKindName(InteractionKind obj, int index) {
         String kindName = "kindName_" + index;
         if (kindName.length() > 255) {
             kindName = kindName.substring(0, 255);
@@ -40,12 +40,12 @@ public void setKindName(InteractionKind obj, int index) {
         obj.setKindName(kindName);
     }
 
-	public void setLsType(InteractionKind obj, int index) {
+    public void setLsType(InteractionKind obj, int index) {
         InteractionType lsType = interactionTypeDataOnDemand.getRandomInteractionType();
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(InteractionKind obj, int index) {
+    public void setLsTypeAndKind(InteractionKind obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = new Random().nextInt(10) + lsTypeAndKind.substring(1, 255);
@@ -53,7 +53,7 @@ public void setLsTypeAndKind(InteractionKind obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public InteractionKind getSpecificInteractionKind(int index) {
+    public InteractionKind getSpecificInteractionKind(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -66,28 +66,29 @@ public InteractionKind getSpecificInteractionKind(int index) {
         return InteractionKind.findInteractionKind(id);
     }
 
-	public InteractionKind getRandomInteractionKind() {
+    public InteractionKind getRandomInteractionKind() {
         init();
         InteractionKind obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return InteractionKind.findInteractionKind(id);
     }
 
-	public boolean modifyInteractionKind(InteractionKind obj) {
+    public boolean modifyInteractionKind(InteractionKind obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = InteractionKind.findInteractionKindEntries(from, to);
         if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'InteractionKind' illegally returned null");
+            throw new IllegalStateException(
+                    "Find entries implementation for 'InteractionKind' illegally returned null");
         }
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<InteractionKind>();
         for (int i = 0; i < 10; i++) {
             InteractionKind obj = getNewTransientInteractionKind(i);
@@ -97,7 +98,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/InteractionKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/InteractionKindIntegrationTest.java
index a487d033e..6febf46b0 100755
--- a/src/test/java/com/labsynch/labseer/domain/InteractionKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/InteractionKindIntegrationTest.java
@@ -25,17 +25,18 @@ public class InteractionKindIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     InteractionKindDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountInteractionKinds() {
-        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to initialize correctly", dod.getRandomInteractionKind());
+        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to initialize correctly",
+                dod.getRandomInteractionKind());
         long count = InteractionKind.countInteractionKinds();
         Assert.assertTrue("Counter for 'InteractionKind' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindInteractionKind() {
         InteractionKind obj = dod.getRandomInteractionKind();
         Assert.assertNotNull("Data on demand for 'InteractionKind' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindInteractionKind() {
         Assert.assertEquals("Find method for 'InteractionKind' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllInteractionKinds() {
-        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to initialize correctly", dod.getRandomInteractionKind());
+        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to initialize correctly",
+                dod.getRandomInteractionKind());
         long count = InteractionKind.countInteractionKinds();
-        Assert.assertTrue("Too expensive to perform a find all test for 'InteractionKind', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'InteractionKind', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<InteractionKind> result = InteractionKind.findAllInteractionKinds();
         Assert.assertNotNull("Find all method for 'InteractionKind' illegally returned null", result);
         Assert.assertTrue("Find all method for 'InteractionKind' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindInteractionKindEntries() {
-        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to initialize correctly", dod.getRandomInteractionKind());
+        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to initialize correctly",
+                dod.getRandomInteractionKind());
         long count = InteractionKind.countInteractionKinds();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<InteractionKind> result = InteractionKind.findInteractionKindEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'InteractionKind' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'InteractionKind' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'InteractionKind' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         InteractionKind obj = dod.getRandomInteractionKind();
         Assert.assertNotNull("Data on demand for 'InteractionKind' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'InteractionKind' failed to provide an identifier", id);
         obj = InteractionKind.findInteractionKind(id);
         Assert.assertNotNull("Find method for 'InteractionKind' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyInteractionKind(obj);
+        boolean modified = dod.modifyInteractionKind(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'InteractionKind' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'InteractionKind' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         InteractionKind obj = dod.getRandomInteractionKind();
         Assert.assertNotNull("Data on demand for 'InteractionKind' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'InteractionKind' failed to provide an identifier", id);
         obj = InteractionKind.findInteractionKind(id);
-        boolean modified =  dod.modifyInteractionKind(obj);
+        boolean modified = dod.modifyInteractionKind(obj);
         Integer currentVersion = obj.getVersion();
         InteractionKind merged = obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'InteractionKind' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'InteractionKind' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to initialize correctly", dod.getRandomInteractionKind());
+        Assert.assertNotNull("Data on demand for 'InteractionKind' failed to initialize correctly",
+                dod.getRandomInteractionKind());
         InteractionKind obj = dod.getNewTransientInteractionKind(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'InteractionKind' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'InteractionKind' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'InteractionKind' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         InteractionKind obj = dod.getRandomInteractionKind();
         Assert.assertNotNull("Data on demand for 'InteractionKind' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = InteractionKind.findInteractionKind(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'InteractionKind' with identifier '" + id + "'", InteractionKind.findInteractionKind(id));
+        Assert.assertNull("Failed to remove 'InteractionKind' with identifier '" + id + "'",
+                InteractionKind.findInteractionKind(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/InteractionTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/InteractionTypeDataOnDemand.java
index d760cef0d..12a3e50a1 100755
--- a/src/test/java/com/labsynch/labseer/domain/InteractionTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/InteractionTypeDataOnDemand.java
@@ -16,18 +16,18 @@
 @Component
 public class InteractionTypeDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<InteractionType> data;
+    private List<InteractionType> data;
 
-	public InteractionType getNewTransientInteractionType(int index) {
+    public InteractionType getNewTransientInteractionType(int index) {
         InteractionType obj = new InteractionType();
         setTypeName(obj, index);
         setTypeVerb(obj, index);
         return obj;
     }
 
-	public void setTypeName(InteractionType obj, int index) {
+    public void setTypeName(InteractionType obj, int index) {
         String typeName = "typeName_" + index;
         if (typeName.length() > 128) {
             typeName = new Random().nextInt(10) + typeName.substring(1, 128);
@@ -35,7 +35,7 @@ public void setTypeName(InteractionType obj, int index) {
         obj.setTypeName(typeName);
     }
 
-	public void setTypeVerb(InteractionType obj, int index) {
+    public void setTypeVerb(InteractionType obj, int index) {
         String typeVerb = "typeVerb_" + index;
         if (typeVerb.length() > 128) {
             typeVerb = typeVerb.substring(0, 128);
@@ -43,7 +43,7 @@ public void setTypeVerb(InteractionType obj, int index) {
         obj.setTypeVerb(typeVerb);
     }
 
-	public InteractionType getSpecificInteractionType(int index) {
+    public InteractionType getSpecificInteractionType(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -56,28 +56,29 @@ public InteractionType getSpecificInteractionType(int index) {
         return InteractionType.findInteractionType(id);
     }
 
-	public InteractionType getRandomInteractionType() {
+    public InteractionType getRandomInteractionType() {
         init();
         InteractionType obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return InteractionType.findInteractionType(id);
     }
 
-	public boolean modifyInteractionType(InteractionType obj) {
+    public boolean modifyInteractionType(InteractionType obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = InteractionType.findInteractionTypeEntries(from, to);
         if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'InteractionType' illegally returned null");
+            throw new IllegalStateException(
+                    "Find entries implementation for 'InteractionType' illegally returned null");
         }
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<InteractionType>();
         for (int i = 0; i < 10; i++) {
             InteractionType obj = getNewTransientInteractionType(i);
@@ -87,7 +88,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/InteractionTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/InteractionTypeIntegrationTest.java
index 822fef6df..ce2382743 100755
--- a/src/test/java/com/labsynch/labseer/domain/InteractionTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/InteractionTypeIntegrationTest.java
@@ -25,17 +25,18 @@ public class InteractionTypeIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     InteractionTypeDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountInteractionTypes() {
-        Assert.assertNotNull("Data on demand for 'InteractionType' failed to initialize correctly", dod.getRandomInteractionType());
+        Assert.assertNotNull("Data on demand for 'InteractionType' failed to initialize correctly",
+                dod.getRandomInteractionType());
         long count = InteractionType.countInteractionTypes();
         Assert.assertTrue("Counter for 'InteractionType' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindInteractionType() {
         InteractionType obj = dod.getRandomInteractionType();
         Assert.assertNotNull("Data on demand for 'InteractionType' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindInteractionType() {
         Assert.assertEquals("Find method for 'InteractionType' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllInteractionTypes() {
-        Assert.assertNotNull("Data on demand for 'InteractionType' failed to initialize correctly", dod.getRandomInteractionType());
+        Assert.assertNotNull("Data on demand for 'InteractionType' failed to initialize correctly",
+                dod.getRandomInteractionType());
         long count = InteractionType.countInteractionTypes();
-        Assert.assertTrue("Too expensive to perform a find all test for 'InteractionType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'InteractionType', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<InteractionType> result = InteractionType.findAllInteractionTypes();
         Assert.assertNotNull("Find all method for 'InteractionType' illegally returned null", result);
         Assert.assertTrue("Find all method for 'InteractionType' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindInteractionTypeEntries() {
-        Assert.assertNotNull("Data on demand for 'InteractionType' failed to initialize correctly", dod.getRandomInteractionType());
+        Assert.assertNotNull("Data on demand for 'InteractionType' failed to initialize correctly",
+                dod.getRandomInteractionType());
         long count = InteractionType.countInteractionTypes();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<InteractionType> result = InteractionType.findInteractionTypeEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'InteractionType' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'InteractionType' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'InteractionType' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         InteractionType obj = dod.getRandomInteractionType();
         Assert.assertNotNull("Data on demand for 'InteractionType' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'InteractionType' failed to provide an identifier", id);
         obj = InteractionType.findInteractionType(id);
         Assert.assertNotNull("Find method for 'InteractionType' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyInteractionType(obj);
+        boolean modified = dod.modifyInteractionType(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'InteractionType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'InteractionType' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         InteractionType obj = dod.getRandomInteractionType();
         Assert.assertNotNull("Data on demand for 'InteractionType' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'InteractionType' failed to provide an identifier", id);
         obj = InteractionType.findInteractionType(id);
-        boolean modified =  dod.modifyInteractionType(obj);
+        boolean modified = dod.modifyInteractionType(obj);
         Integer currentVersion = obj.getVersion();
         InteractionType merged = obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'InteractionType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'InteractionType' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'InteractionType' failed to initialize correctly", dod.getRandomInteractionType());
+        Assert.assertNotNull("Data on demand for 'InteractionType' failed to initialize correctly",
+                dod.getRandomInteractionType());
         InteractionType obj = dod.getNewTransientInteractionType(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'InteractionType' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'InteractionType' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'InteractionType' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         InteractionType obj = dod.getRandomInteractionType();
         Assert.assertNotNull("Data on demand for 'InteractionType' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = InteractionType.findInteractionType(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'InteractionType' with identifier '" + id + "'", InteractionType.findInteractionType(id));
+        Assert.assertNull("Failed to remove 'InteractionType' with identifier '" + id + "'",
+                InteractionType.findInteractionType(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerDataOnDemand.java
index 103f2a710..10fcb39e3 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerDataOnDemand.java
@@ -20,14 +20,14 @@
 @Component
 public class ItxContainerContainerDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<ItxContainerContainer> data;
+    private List<ItxContainerContainer> data;
 
-	@Autowired
+    @Autowired
     ContainerDataOnDemand containerDataOnDemand;
 
-	public ItxContainerContainer getNewTransientItxContainerContainer(int index) {
+    public ItxContainerContainer getNewTransientItxContainerContainer(int index) {
         ItxContainerContainer obj = new ItxContainerContainer();
         setCodeName(obj, index);
         setDeleted(obj, index);
@@ -45,7 +45,7 @@ public ItxContainerContainer getNewTransientItxContainerContainer(int index) {
         return obj;
     }
 
-	public void setCodeName(ItxContainerContainer obj, int index) {
+    public void setCodeName(ItxContainerContainer obj, int index) {
         String codeName = "codeName_" + index;
         if (codeName.length() > 255) {
             codeName = new Random().nextInt(10) + codeName.substring(1, 255);
@@ -53,22 +53,22 @@ public void setCodeName(ItxContainerContainer obj, int index) {
         obj.setCodeName(codeName);
     }
 
-	public void setDeleted(ItxContainerContainer obj, int index) {
+    public void setDeleted(ItxContainerContainer obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setFirstContainer(ItxContainerContainer obj, int index) {
+    public void setFirstContainer(ItxContainerContainer obj, int index) {
         Container firstContainer = containerDataOnDemand.getRandomContainer();
         obj.setFirstContainer(firstContainer);
     }
 
-	public void setIgnored(ItxContainerContainer obj, int index) {
+    public void setIgnored(ItxContainerContainer obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setLsKind(ItxContainerContainer obj, int index) {
+    public void setLsKind(ItxContainerContainer obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -76,12 +76,12 @@ public void setLsKind(ItxContainerContainer obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsTransaction(ItxContainerContainer obj, int index) {
+    public void setLsTransaction(ItxContainerContainer obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(ItxContainerContainer obj, int index) {
+    public void setLsType(ItxContainerContainer obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 255) {
             lsType = lsType.substring(0, 255);
@@ -89,7 +89,7 @@ public void setLsType(ItxContainerContainer obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(ItxContainerContainer obj, int index) {
+    public void setLsTypeAndKind(ItxContainerContainer obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 255);
@@ -97,7 +97,7 @@ public void setLsTypeAndKind(ItxContainerContainer obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedBy(ItxContainerContainer obj, int index) {
+    public void setModifiedBy(ItxContainerContainer obj, int index) {
         String modifiedBy = "modifiedBy_" + index;
         if (modifiedBy.length() > 255) {
             modifiedBy = modifiedBy.substring(0, 255);
@@ -105,12 +105,15 @@ public void setModifiedBy(ItxContainerContainer obj, int index) {
         obj.setModifiedBy(modifiedBy);
     }
 
-	public void setModifiedDate(ItxContainerContainer obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(ItxContainerContainer obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setRecordedBy(ItxContainerContainer obj, int index) {
+    public void setRecordedBy(ItxContainerContainer obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -118,17 +121,20 @@ public void setRecordedBy(ItxContainerContainer obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(ItxContainerContainer obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(ItxContainerContainer obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public void setSecondContainer(ItxContainerContainer obj, int index) {
+    public void setSecondContainer(ItxContainerContainer obj, int index) {
         Container secondContainer = containerDataOnDemand.getRandomContainer();
         obj.setSecondContainer(secondContainer);
     }
 
-	public ItxContainerContainer getSpecificItxContainerContainer(int index) {
+    public ItxContainerContainer getSpecificItxContainerContainer(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -141,28 +147,29 @@ public ItxContainerContainer getSpecificItxContainerContainer(int index) {
         return ItxContainerContainer.findItxContainerContainer(id);
     }
 
-	public ItxContainerContainer getRandomItxContainerContainer() {
+    public ItxContainerContainer getRandomItxContainerContainer() {
         init();
         ItxContainerContainer obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return ItxContainerContainer.findItxContainerContainer(id);
     }
 
-	public boolean modifyItxContainerContainer(ItxContainerContainer obj) {
+    public boolean modifyItxContainerContainer(ItxContainerContainer obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = ItxContainerContainer.findItxContainerContainerEntries(from, to);
         if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ItxContainerContainer' illegally returned null");
+            throw new IllegalStateException(
+                    "Find entries implementation for 'ItxContainerContainer' illegally returned null");
         }
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<ItxContainerContainer>();
         for (int i = 0; i < 10; i++) {
             ItxContainerContainer obj = getNewTransientItxContainerContainer(i);
@@ -172,7 +179,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerIntegrationTest.java
index 8fea5d0c2..fde9b8522 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerIntegrationTest.java
@@ -25,83 +25,99 @@ public class ItxContainerContainerIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ItxContainerContainerDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountItxContainerContainers() {
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to initialize correctly", dod.getRandomItxContainerContainer());
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to initialize correctly",
+                dod.getRandomItxContainerContainer());
         long count = ItxContainerContainer.countItxContainerContainers();
         Assert.assertTrue("Counter for 'ItxContainerContainer' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindItxContainerContainer() {
         ItxContainerContainer obj = dod.getRandomItxContainerContainer();
         Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to provide an identifier", id);
         obj = ItxContainerContainer.findItxContainerContainer(id);
-        Assert.assertNotNull("Find method for 'ItxContainerContainer' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ItxContainerContainer' returned the incorrect identifier", id, obj.getId());
+        Assert.assertNotNull("Find method for 'ItxContainerContainer' illegally returned null for id '" + id + "'",
+                obj);
+        Assert.assertEquals("Find method for 'ItxContainerContainer' returned the incorrect identifier", id,
+                obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllItxContainerContainers() {
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to initialize correctly", dod.getRandomItxContainerContainer());
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to initialize correctly",
+                dod.getRandomItxContainerContainer());
         long count = ItxContainerContainer.countItxContainerContainers();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ItxContainerContainer', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'ItxContainerContainer', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<ItxContainerContainer> result = ItxContainerContainer.findAllItxContainerContainers();
         Assert.assertNotNull("Find all method for 'ItxContainerContainer' illegally returned null", result);
         Assert.assertTrue("Find all method for 'ItxContainerContainer' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindItxContainerContainerEntries() {
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to initialize correctly", dod.getRandomItxContainerContainer());
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to initialize correctly",
+                dod.getRandomItxContainerContainer());
         long count = ItxContainerContainer.countItxContainerContainers();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
-        List<ItxContainerContainer> result = ItxContainerContainer.findItxContainerContainerEntries(firstResult, maxResults);
+        List<ItxContainerContainer> result = ItxContainerContainer.findItxContainerContainerEntries(firstResult,
+                maxResults);
         Assert.assertNotNull("Find entries method for 'ItxContainerContainer' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ItxContainerContainer' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'ItxContainerContainer' returned an incorrect number of entries",
+                count, result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         ItxContainerContainer obj = dod.getRandomItxContainerContainer();
         Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to provide an identifier", id);
         obj = ItxContainerContainer.findItxContainerContainer(id);
-        Assert.assertNotNull("Find method for 'ItxContainerContainer' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyItxContainerContainer(obj);
+        Assert.assertNotNull("Find method for 'ItxContainerContainer' illegally returned null for id '" + id + "'",
+                obj);
+        boolean modified = dod.modifyItxContainerContainer(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'ItxContainerContainer' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'ItxContainerContainer' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         ItxContainerContainer obj = dod.getRandomItxContainerContainer();
         Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to provide an identifier", id);
         obj = ItxContainerContainer.findItxContainerContainer(id);
-        boolean modified =  dod.modifyItxContainerContainer(obj);
+        boolean modified = dod.modifyItxContainerContainer(obj);
         Integer currentVersion = obj.getVersion();
-        ItxContainerContainer merged = (ItxContainerContainer)obj.merge();
+        ItxContainerContainer merged = (ItxContainerContainer) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ItxContainerContainer' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'ItxContainerContainer' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to initialize correctly", dod.getRandomItxContainerContainer());
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to initialize correctly",
+                dod.getRandomItxContainerContainer());
         ItxContainerContainer obj = dod.getNewTransientItxContainerContainer(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to provide a new transient entity", obj);
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to provide a new transient entity",
+                obj);
         Assert.assertNull("Expected 'ItxContainerContainer' identifier to be null", obj.getId());
         try {
             obj.persist();
@@ -109,7 +125,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +135,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'ItxContainerContainer' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         ItxContainerContainer obj = dod.getRandomItxContainerContainer();
         Assert.assertNotNull("Data on demand for 'ItxContainerContainer' failed to initialize correctly", obj);
@@ -126,6 +144,7 @@ public void testRemove() {
         obj = ItxContainerContainer.findItxContainerContainer(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'ItxContainerContainer' with identifier '" + id + "'", ItxContainerContainer.findItxContainerContainer(id));
+        Assert.assertNull("Failed to remove 'ItxContainerContainer' with identifier '" + id + "'",
+                ItxContainerContainer.findItxContainerContainer(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateDataOnDemand.java
index 82bb81c74..64be0edbb 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateDataOnDemand.java
@@ -20,14 +20,14 @@
 @Component
 public class ItxContainerContainerStateDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<ItxContainerContainerState> data;
+    private List<ItxContainerContainerState> data;
 
-	@Autowired
+    @Autowired
     ItxContainerContainerDataOnDemand itxContainerContainerDataOnDemand;
 
-	public ItxContainerContainerState getNewTransientItxContainerContainerState(int index) {
+    public ItxContainerContainerState getNewTransientItxContainerContainerState(int index) {
         ItxContainerContainerState obj = new ItxContainerContainerState();
         setComments(obj, index);
         setDeleted(obj, index);
@@ -43,7 +43,7 @@ public ItxContainerContainerState getNewTransientItxContainerContainerState(int
         return obj;
     }
 
-	public void setComments(ItxContainerContainerState obj, int index) {
+    public void setComments(ItxContainerContainerState obj, int index) {
         String comments = "comments_" + index;
         if (comments.length() > 512) {
             comments = comments.substring(0, 512);
@@ -51,17 +51,17 @@ public void setComments(ItxContainerContainerState obj, int index) {
         obj.setComments(comments);
     }
 
-	public void setDeleted(ItxContainerContainerState obj, int index) {
+    public void setDeleted(ItxContainerContainerState obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setIgnored(ItxContainerContainerState obj, int index) {
+    public void setIgnored(ItxContainerContainerState obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setLsKind(ItxContainerContainerState obj, int index) {
+    public void setLsKind(ItxContainerContainerState obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -69,12 +69,12 @@ public void setLsKind(ItxContainerContainerState obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsTransaction(ItxContainerContainerState obj, int index) {
+    public void setLsTransaction(ItxContainerContainerState obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(ItxContainerContainerState obj, int index) {
+    public void setLsType(ItxContainerContainerState obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 64) {
             lsType = lsType.substring(0, 64);
@@ -82,7 +82,7 @@ public void setLsType(ItxContainerContainerState obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(ItxContainerContainerState obj, int index) {
+    public void setLsTypeAndKind(ItxContainerContainerState obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 255);
@@ -90,7 +90,7 @@ public void setLsTypeAndKind(ItxContainerContainerState obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedBy(ItxContainerContainerState obj, int index) {
+    public void setModifiedBy(ItxContainerContainerState obj, int index) {
         String modifiedBy = "modifiedBy_" + index;
         if (modifiedBy.length() > 255) {
             modifiedBy = modifiedBy.substring(0, 255);
@@ -98,12 +98,15 @@ public void setModifiedBy(ItxContainerContainerState obj, int index) {
         obj.setModifiedBy(modifiedBy);
     }
 
-	public void setModifiedDate(ItxContainerContainerState obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(ItxContainerContainerState obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setRecordedBy(ItxContainerContainerState obj, int index) {
+    public void setRecordedBy(ItxContainerContainerState obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -111,12 +114,15 @@ public void setRecordedBy(ItxContainerContainerState obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(ItxContainerContainerState obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(ItxContainerContainerState obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public ItxContainerContainerState getSpecificItxContainerContainerState(int index) {
+    public ItxContainerContainerState getSpecificItxContainerContainerState(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -129,28 +135,29 @@ public ItxContainerContainerState getSpecificItxContainerContainerState(int inde
         return ItxContainerContainerState.findItxContainerContainerState(id);
     }
 
-	public ItxContainerContainerState getRandomItxContainerContainerState() {
+    public ItxContainerContainerState getRandomItxContainerContainerState() {
         init();
         ItxContainerContainerState obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return ItxContainerContainerState.findItxContainerContainerState(id);
     }
 
-	public boolean modifyItxContainerContainerState(ItxContainerContainerState obj) {
+    public boolean modifyItxContainerContainerState(ItxContainerContainerState obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = ItxContainerContainerState.findItxContainerContainerStateEntries(from, to);
         if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ItxContainerContainerState' illegally returned null");
+            throw new IllegalStateException(
+                    "Find entries implementation for 'ItxContainerContainerState' illegally returned null");
         }
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<ItxContainerContainerState>();
         for (int i = 0; i < 10; i++) {
             ItxContainerContainerState obj = getNewTransientItxContainerContainerState(i);
@@ -160,7 +167,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateIntegrationTest.java
index cc6e184e9..2273f35c4 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerStateIntegrationTest.java
@@ -25,83 +25,103 @@ public class ItxContainerContainerStateIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ItxContainerContainerStateDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountItxContainerContainerStates() {
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to initialize correctly", dod.getRandomItxContainerContainerState());
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to initialize correctly",
+                dod.getRandomItxContainerContainerState());
         long count = ItxContainerContainerState.countItxContainerContainerStates();
-        Assert.assertTrue("Counter for 'ItxContainerContainerState' incorrectly reported there were no entries", count > 0);
+        Assert.assertTrue("Counter for 'ItxContainerContainerState' incorrectly reported there were no entries",
+                count > 0);
     }
 
-	@Test
+    @Test
     public void testFindItxContainerContainerState() {
         ItxContainerContainerState obj = dod.getRandomItxContainerContainerState();
         Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to provide an identifier", id);
         obj = ItxContainerContainerState.findItxContainerContainerState(id);
-        Assert.assertNotNull("Find method for 'ItxContainerContainerState' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ItxContainerContainerState' returned the incorrect identifier", id, obj.getId());
+        Assert.assertNotNull("Find method for 'ItxContainerContainerState' illegally returned null for id '" + id + "'",
+                obj);
+        Assert.assertEquals("Find method for 'ItxContainerContainerState' returned the incorrect identifier", id,
+                obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllItxContainerContainerStates() {
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to initialize correctly", dod.getRandomItxContainerContainerState());
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to initialize correctly",
+                dod.getRandomItxContainerContainerState());
         long count = ItxContainerContainerState.countItxContainerContainerStates();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ItxContainerContainerState', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'ItxContainerContainerState', as there are "
+                + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<ItxContainerContainerState> result = ItxContainerContainerState.findAllItxContainerContainerStates();
         Assert.assertNotNull("Find all method for 'ItxContainerContainerState' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ItxContainerContainerState' failed to return any data", result.size() > 0);
+        Assert.assertTrue("Find all method for 'ItxContainerContainerState' failed to return any data",
+                result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindItxContainerContainerStateEntries() {
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to initialize correctly", dod.getRandomItxContainerContainerState());
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to initialize correctly",
+                dod.getRandomItxContainerContainerState());
         long count = ItxContainerContainerState.countItxContainerContainerStates();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
-        List<ItxContainerContainerState> result = ItxContainerContainerState.findItxContainerContainerStateEntries(firstResult, maxResults);
+        List<ItxContainerContainerState> result = ItxContainerContainerState
+                .findItxContainerContainerStateEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'ItxContainerContainerState' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ItxContainerContainerState' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals(
+                "Find entries method for 'ItxContainerContainerState' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         ItxContainerContainerState obj = dod.getRandomItxContainerContainerState();
         Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to provide an identifier", id);
         obj = ItxContainerContainerState.findItxContainerContainerState(id);
-        Assert.assertNotNull("Find method for 'ItxContainerContainerState' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyItxContainerContainerState(obj);
+        Assert.assertNotNull("Find method for 'ItxContainerContainerState' illegally returned null for id '" + id + "'",
+                obj);
+        boolean modified = dod.modifyItxContainerContainerState(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'ItxContainerContainerState' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'ItxContainerContainerState' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         ItxContainerContainerState obj = dod.getRandomItxContainerContainerState();
         Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to provide an identifier", id);
         obj = ItxContainerContainerState.findItxContainerContainerState(id);
-        boolean modified =  dod.modifyItxContainerContainerState(obj);
+        boolean modified = dod.modifyItxContainerContainerState(obj);
         Integer currentVersion = obj.getVersion();
-        ItxContainerContainerState merged = (ItxContainerContainerState)obj.merge();
+        ItxContainerContainerState merged = (ItxContainerContainerState) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ItxContainerContainerState' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'ItxContainerContainerState' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to initialize correctly", dod.getRandomItxContainerContainerState());
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to initialize correctly",
+                dod.getRandomItxContainerContainerState());
         ItxContainerContainerState obj = dod.getNewTransientItxContainerContainerState(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to provide a new transient entity", obj);
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to provide a new transient entity",
+                obj);
         Assert.assertNull("Expected 'ItxContainerContainerState' identifier to be null", obj.getId());
         try {
             obj.persist();
@@ -109,7 +129,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +139,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'ItxContainerContainerState' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         ItxContainerContainerState obj = dod.getRandomItxContainerContainerState();
         Assert.assertNotNull("Data on demand for 'ItxContainerContainerState' failed to initialize correctly", obj);
@@ -126,6 +148,7 @@ public void testRemove() {
         obj = ItxContainerContainerState.findItxContainerContainerState(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'ItxContainerContainerState' with identifier '" + id + "'", ItxContainerContainerState.findItxContainerContainerState(id));
+        Assert.assertNull("Failed to remove 'ItxContainerContainerState' with identifier '" + id + "'",
+                ItxContainerContainerState.findItxContainerContainerState(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueDataOnDemand.java
index d25e92935..adfccd99d 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueDataOnDemand.java
@@ -21,14 +21,14 @@
 @Configurable
 public class ItxContainerContainerValueDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<ItxContainerContainerValue> data;
+    private List<ItxContainerContainerValue> data;
 
-	@Autowired
+    @Autowired
     ItxContainerContainerStateDataOnDemand itxContainerContainerStateDataOnDemand;
 
-	public ItxContainerContainerValue getNewTransientItxContainerContainerValue(int index) {
+    public ItxContainerContainerValue getNewTransientItxContainerContainerValue(int index) {
         ItxContainerContainerValue obj = new ItxContainerContainerValue();
         setBlobValue(obj, index);
         setClobValue(obj, index);
@@ -69,17 +69,17 @@ public ItxContainerContainerValue getNewTransientItxContainerContainerValue(int
         return obj;
     }
 
-	public void setBlobValue(ItxContainerContainerValue obj, int index) {
+    public void setBlobValue(ItxContainerContainerValue obj, int index) {
         byte[] blobValue = String.valueOf(index).getBytes();
         obj.setBlobValue(blobValue);
     }
 
-	public void setClobValue(ItxContainerContainerValue obj, int index) {
+    public void setClobValue(ItxContainerContainerValue obj, int index) {
         String clobValue = "clobValue_" + index;
         obj.setClobValue(clobValue);
     }
 
-	public void setCodeKind(ItxContainerContainerValue obj, int index) {
+    public void setCodeKind(ItxContainerContainerValue obj, int index) {
         String codeKind = "codeKind_" + index;
         if (codeKind.length() > 255) {
             codeKind = codeKind.substring(0, 255);
@@ -87,7 +87,7 @@ public void setCodeKind(ItxContainerContainerValue obj, int index) {
         obj.setCodeKind(codeKind);
     }
 
-	public void setCodeOrigin(ItxContainerContainerValue obj, int index) {
+    public void setCodeOrigin(ItxContainerContainerValue obj, int index) {
         String codeOrigin = "codeOrigin_" + index;
         if (codeOrigin.length() > 255) {
             codeOrigin = codeOrigin.substring(0, 255);
@@ -95,7 +95,7 @@ public void setCodeOrigin(ItxContainerContainerValue obj, int index) {
         obj.setCodeOrigin(codeOrigin);
     }
 
-	public void setCodeType(ItxContainerContainerValue obj, int index) {
+    public void setCodeType(ItxContainerContainerValue obj, int index) {
         String codeType = "codeType_" + index;
         if (codeType.length() > 255) {
             codeType = codeType.substring(0, 255);
@@ -103,7 +103,7 @@ public void setCodeType(ItxContainerContainerValue obj, int index) {
         obj.setCodeType(codeType);
     }
 
-	public void setCodeTypeAndKind(ItxContainerContainerValue obj, int index) {
+    public void setCodeTypeAndKind(ItxContainerContainerValue obj, int index) {
         String codeTypeAndKind = "codeTypeAndKind_" + index;
         if (codeTypeAndKind.length() > 350) {
             codeTypeAndKind = codeTypeAndKind.substring(0, 350);
@@ -111,7 +111,7 @@ public void setCodeTypeAndKind(ItxContainerContainerValue obj, int index) {
         obj.setCodeTypeAndKind(codeTypeAndKind);
     }
 
-	public void setCodeValue(ItxContainerContainerValue obj, int index) {
+    public void setCodeValue(ItxContainerContainerValue obj, int index) {
         String codeValue = "codeValue_" + index;
         if (codeValue.length() > 255) {
             codeValue = codeValue.substring(0, 255);
@@ -119,7 +119,7 @@ public void setCodeValue(ItxContainerContainerValue obj, int index) {
         obj.setCodeValue(codeValue);
     }
 
-	public void setComments(ItxContainerContainerValue obj, int index) {
+    public void setComments(ItxContainerContainerValue obj, int index) {
         String comments = "comments_" + index;
         if (comments.length() > 512) {
             comments = comments.substring(0, 512);
@@ -127,7 +127,7 @@ public void setComments(ItxContainerContainerValue obj, int index) {
         obj.setComments(comments);
     }
 
-	public void setConcUnit(ItxContainerContainerValue obj, int index) {
+    public void setConcUnit(ItxContainerContainerValue obj, int index) {
         String concUnit = "concUnit_" + index;
         if (concUnit.length() > 25) {
             concUnit = concUnit.substring(0, 25);
@@ -135,22 +135,25 @@ public void setConcUnit(ItxContainerContainerValue obj, int index) {
         obj.setConcUnit(concUnit);
     }
 
-	public void setConcentration(ItxContainerContainerValue obj, int index) {
+    public void setConcentration(ItxContainerContainerValue obj, int index) {
         Double concentration = new Integer(index).doubleValue();
         obj.setConcentration(concentration);
     }
 
-	public void setDateValue(ItxContainerContainerValue obj, int index) {
-        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setDateValue(ItxContainerContainerValue obj, int index) {
+        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setDateValue(dateValue);
     }
 
-	public void setDeleted(ItxContainerContainerValue obj, int index) {
+    public void setDeleted(ItxContainerContainerValue obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setFileValue(ItxContainerContainerValue obj, int index) {
+    public void setFileValue(ItxContainerContainerValue obj, int index) {
         String fileValue = "fileValue_" + index;
         if (fileValue.length() > 512) {
             fileValue = fileValue.substring(0, 512);
@@ -158,12 +161,12 @@ public void setFileValue(ItxContainerContainerValue obj, int index) {
         obj.setFileValue(fileValue);
     }
 
-	public void setIgnored(ItxContainerContainerValue obj, int index) {
+    public void setIgnored(ItxContainerContainerValue obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setLsKind(ItxContainerContainerValue obj, int index) {
+    public void setLsKind(ItxContainerContainerValue obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -171,12 +174,12 @@ public void setLsKind(ItxContainerContainerValue obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsTransaction(ItxContainerContainerValue obj, int index) {
+    public void setLsTransaction(ItxContainerContainerValue obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(ItxContainerContainerValue obj, int index) {
+    public void setLsType(ItxContainerContainerValue obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 64) {
             lsType = lsType.substring(0, 64);
@@ -184,7 +187,7 @@ public void setLsType(ItxContainerContainerValue obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(ItxContainerContainerValue obj, int index) {
+    public void setLsTypeAndKind(ItxContainerContainerValue obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 350) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 350);
@@ -192,7 +195,7 @@ public void setLsTypeAndKind(ItxContainerContainerValue obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedBy(ItxContainerContainerValue obj, int index) {
+    public void setModifiedBy(ItxContainerContainerValue obj, int index) {
         String modifiedBy = "modifiedBy_" + index;
         if (modifiedBy.length() > 255) {
             modifiedBy = modifiedBy.substring(0, 255);
@@ -200,17 +203,20 @@ public void setModifiedBy(ItxContainerContainerValue obj, int index) {
         obj.setModifiedBy(modifiedBy);
     }
 
-	public void setModifiedDate(ItxContainerContainerValue obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(ItxContainerContainerValue obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setNumberOfReplicates(ItxContainerContainerValue obj, int index) {
+    public void setNumberOfReplicates(ItxContainerContainerValue obj, int index) {
         Integer numberOfReplicates = new Integer(index);
         obj.setNumberOfReplicates(numberOfReplicates);
     }
 
-	public void setNumericValue(ItxContainerContainerValue obj, int index) {
+    public void setNumericValue(ItxContainerContainerValue obj, int index) {
         BigDecimal numericValue = BigDecimal.valueOf(index);
         if (numericValue.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
             numericValue = new BigDecimal("99999999999999999999.999999999999999999");
@@ -218,7 +224,7 @@ public void setNumericValue(ItxContainerContainerValue obj, int index) {
         obj.setNumericValue(numericValue);
     }
 
-	public void setOperatorKind(ItxContainerContainerValue obj, int index) {
+    public void setOperatorKind(ItxContainerContainerValue obj, int index) {
         String operatorKind = "operator_" + index;
         if (operatorKind.length() > 10) {
             operatorKind = operatorKind.substring(0, 10);
@@ -226,7 +232,7 @@ public void setOperatorKind(ItxContainerContainerValue obj, int index) {
         obj.setOperatorKind(operatorKind);
     }
 
-	public void setOperatorType(ItxContainerContainerValue obj, int index) {
+    public void setOperatorType(ItxContainerContainerValue obj, int index) {
         String operatorType = "operatorType_" + index;
         if (operatorType.length() > 25) {
             operatorType = operatorType.substring(0, 25);
@@ -234,7 +240,7 @@ public void setOperatorType(ItxContainerContainerValue obj, int index) {
         obj.setOperatorType(operatorType);
     }
 
-	public void setOperatorTypeAndKind(ItxContainerContainerValue obj, int index) {
+    public void setOperatorTypeAndKind(ItxContainerContainerValue obj, int index) {
         String operatorTypeAndKind = "operatorTypeAndKind_" + index;
         if (operatorTypeAndKind.length() > 50) {
             operatorTypeAndKind = operatorTypeAndKind.substring(0, 50);
@@ -242,12 +248,12 @@ public void setOperatorTypeAndKind(ItxContainerContainerValue obj, int index) {
         obj.setOperatorTypeAndKind(operatorTypeAndKind);
     }
 
-	public void setPublicData(ItxContainerContainerValue obj, int index) {
+    public void setPublicData(ItxContainerContainerValue obj, int index) {
         Boolean publicData = true;
         obj.setPublicData(publicData);
     }
 
-	public void setRecordedBy(ItxContainerContainerValue obj, int index) {
+    public void setRecordedBy(ItxContainerContainerValue obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -255,17 +261,20 @@ public void setRecordedBy(ItxContainerContainerValue obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(ItxContainerContainerValue obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(ItxContainerContainerValue obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public void setSigFigs(ItxContainerContainerValue obj, int index) {
+    public void setSigFigs(ItxContainerContainerValue obj, int index) {
         Integer sigFigs = new Integer(index);
         obj.setSigFigs(sigFigs);
     }
 
-	public void setStringValue(ItxContainerContainerValue obj, int index) {
+    public void setStringValue(ItxContainerContainerValue obj, int index) {
         String stringValue = "stringValue_" + index;
         if (stringValue.length() > 255) {
             stringValue = stringValue.substring(0, 255);
@@ -273,7 +282,7 @@ public void setStringValue(ItxContainerContainerValue obj, int index) {
         obj.setStringValue(stringValue);
     }
 
-	public void setUncertainty(ItxContainerContainerValue obj, int index) {
+    public void setUncertainty(ItxContainerContainerValue obj, int index) {
         BigDecimal uncertainty = BigDecimal.valueOf(index);
         if (uncertainty.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
             uncertainty = new BigDecimal("99999999999999999999.999999999999999999");
@@ -281,7 +290,7 @@ public void setUncertainty(ItxContainerContainerValue obj, int index) {
         obj.setUncertainty(uncertainty);
     }
 
-	public void setUncertaintyType(ItxContainerContainerValue obj, int index) {
+    public void setUncertaintyType(ItxContainerContainerValue obj, int index) {
         String uncertaintyType = "uncertaintyType_" + index;
         if (uncertaintyType.length() > 255) {
             uncertaintyType = uncertaintyType.substring(0, 255);
@@ -289,7 +298,7 @@ public void setUncertaintyType(ItxContainerContainerValue obj, int index) {
         obj.setUncertaintyType(uncertaintyType);
     }
 
-	public void setUnitKind(ItxContainerContainerValue obj, int index) {
+    public void setUnitKind(ItxContainerContainerValue obj, int index) {
         String unitKind = "unitKind_" + index;
         if (unitKind.length() > 25) {
             unitKind = unitKind.substring(0, 25);
@@ -297,7 +306,7 @@ public void setUnitKind(ItxContainerContainerValue obj, int index) {
         obj.setUnitKind(unitKind);
     }
 
-	public void setUnitType(ItxContainerContainerValue obj, int index) {
+    public void setUnitType(ItxContainerContainerValue obj, int index) {
         String unitType = "unitType_" + index;
         if (unitType.length() > 25) {
             unitType = unitType.substring(0, 25);
@@ -305,7 +314,7 @@ public void setUnitType(ItxContainerContainerValue obj, int index) {
         obj.setUnitType(unitType);
     }
 
-	public void setUnitTypeAndKind(ItxContainerContainerValue obj, int index) {
+    public void setUnitTypeAndKind(ItxContainerContainerValue obj, int index) {
         String unitTypeAndKind = "unitTypeAndKind_" + index;
         if (unitTypeAndKind.length() > 55) {
             unitTypeAndKind = unitTypeAndKind.substring(0, 55);
@@ -313,7 +322,7 @@ public void setUnitTypeAndKind(ItxContainerContainerValue obj, int index) {
         obj.setUnitTypeAndKind(unitTypeAndKind);
     }
 
-	public void setUrlValue(ItxContainerContainerValue obj, int index) {
+    public void setUrlValue(ItxContainerContainerValue obj, int index) {
         String urlValue = "urlValue_" + index;
         if (urlValue.length() > 2000) {
             urlValue = urlValue.substring(0, 2000);
@@ -321,7 +330,7 @@ public void setUrlValue(ItxContainerContainerValue obj, int index) {
         obj.setUrlValue(urlValue);
     }
 
-	public ItxContainerContainerValue getSpecificItxContainerContainerValue(int index) {
+    public ItxContainerContainerValue getSpecificItxContainerContainerValue(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -334,28 +343,29 @@ public ItxContainerContainerValue getSpecificItxContainerContainerValue(int inde
         return ItxContainerContainerValue.findItxContainerContainerValue(id);
     }
 
-	public ItxContainerContainerValue getRandomItxContainerContainerValue() {
+    public ItxContainerContainerValue getRandomItxContainerContainerValue() {
         init();
         ItxContainerContainerValue obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return ItxContainerContainerValue.findItxContainerContainerValue(id);
     }
 
-	public boolean modifyItxContainerContainerValue(ItxContainerContainerValue obj) {
+    public boolean modifyItxContainerContainerValue(ItxContainerContainerValue obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = ItxContainerContainerValue.findItxContainerContainerValueEntries(from, to);
         if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ItxContainerContainerValue' illegally returned null");
+            throw new IllegalStateException(
+                    "Find entries implementation for 'ItxContainerContainerValue' illegally returned null");
         }
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<ItxContainerContainerValue>();
         for (int i = 0; i < 10; i++) {
             ItxContainerContainerValue obj = getNewTransientItxContainerContainerValue(i);
@@ -365,7 +375,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueIntegrationTest.java
index 0fd65d429..5bab681ba 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxContainerContainerValueIntegrationTest.java
@@ -25,83 +25,103 @@ public class ItxContainerContainerValueIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ItxContainerContainerValueDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountItxContainerContainerValues() {
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to initialize correctly", dod.getRandomItxContainerContainerValue());
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to initialize correctly",
+                dod.getRandomItxContainerContainerValue());
         long count = ItxContainerContainerValue.countItxContainerContainerValues();
-        Assert.assertTrue("Counter for 'ItxContainerContainerValue' incorrectly reported there were no entries", count > 0);
+        Assert.assertTrue("Counter for 'ItxContainerContainerValue' incorrectly reported there were no entries",
+                count > 0);
     }
 
-	@Test
+    @Test
     public void testFindItxContainerContainerValue() {
         ItxContainerContainerValue obj = dod.getRandomItxContainerContainerValue();
         Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to provide an identifier", id);
         obj = ItxContainerContainerValue.findItxContainerContainerValue(id);
-        Assert.assertNotNull("Find method for 'ItxContainerContainerValue' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ItxContainerContainerValue' returned the incorrect identifier", id, obj.getId());
+        Assert.assertNotNull("Find method for 'ItxContainerContainerValue' illegally returned null for id '" + id + "'",
+                obj);
+        Assert.assertEquals("Find method for 'ItxContainerContainerValue' returned the incorrect identifier", id,
+                obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllItxContainerContainerValues() {
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to initialize correctly", dod.getRandomItxContainerContainerValue());
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to initialize correctly",
+                dod.getRandomItxContainerContainerValue());
         long count = ItxContainerContainerValue.countItxContainerContainerValues();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ItxContainerContainerValue', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'ItxContainerContainerValue', as there are "
+                + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<ItxContainerContainerValue> result = ItxContainerContainerValue.findAllItxContainerContainerValues();
         Assert.assertNotNull("Find all method for 'ItxContainerContainerValue' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ItxContainerContainerValue' failed to return any data", result.size() > 0);
+        Assert.assertTrue("Find all method for 'ItxContainerContainerValue' failed to return any data",
+                result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindItxContainerContainerValueEntries() {
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to initialize correctly", dod.getRandomItxContainerContainerValue());
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to initialize correctly",
+                dod.getRandomItxContainerContainerValue());
         long count = ItxContainerContainerValue.countItxContainerContainerValues();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
-        List<ItxContainerContainerValue> result = ItxContainerContainerValue.findItxContainerContainerValueEntries(firstResult, maxResults);
+        List<ItxContainerContainerValue> result = ItxContainerContainerValue
+                .findItxContainerContainerValueEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'ItxContainerContainerValue' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ItxContainerContainerValue' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals(
+                "Find entries method for 'ItxContainerContainerValue' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         ItxContainerContainerValue obj = dod.getRandomItxContainerContainerValue();
         Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to provide an identifier", id);
         obj = ItxContainerContainerValue.findItxContainerContainerValue(id);
-        Assert.assertNotNull("Find method for 'ItxContainerContainerValue' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyItxContainerContainerValue(obj);
+        Assert.assertNotNull("Find method for 'ItxContainerContainerValue' illegally returned null for id '" + id + "'",
+                obj);
+        boolean modified = dod.modifyItxContainerContainerValue(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'ItxContainerContainerValue' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'ItxContainerContainerValue' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         ItxContainerContainerValue obj = dod.getRandomItxContainerContainerValue();
         Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to provide an identifier", id);
         obj = ItxContainerContainerValue.findItxContainerContainerValue(id);
-        boolean modified =  dod.modifyItxContainerContainerValue(obj);
+        boolean modified = dod.modifyItxContainerContainerValue(obj);
         Integer currentVersion = obj.getVersion();
-        ItxContainerContainerValue merged = (ItxContainerContainerValue)obj.merge();
+        ItxContainerContainerValue merged = (ItxContainerContainerValue) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ItxContainerContainerValue' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'ItxContainerContainerValue' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to initialize correctly", dod.getRandomItxContainerContainerValue());
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to initialize correctly",
+                dod.getRandomItxContainerContainerValue());
         ItxContainerContainerValue obj = dod.getNewTransientItxContainerContainerValue(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to provide a new transient entity", obj);
+        Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to provide a new transient entity",
+                obj);
         Assert.assertNull("Expected 'ItxContainerContainerValue' identifier to be null", obj.getId());
         try {
             obj.persist();
@@ -109,7 +129,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +139,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'ItxContainerContainerValue' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         ItxContainerContainerValue obj = dod.getRandomItxContainerContainerValue();
         Assert.assertNotNull("Data on demand for 'ItxContainerContainerValue' failed to initialize correctly", obj);
@@ -126,6 +148,7 @@ public void testRemove() {
         obj = ItxContainerContainerValue.findItxContainerContainerValue(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'ItxContainerContainerValue' with identifier '" + id + "'", ItxContainerContainerValue.findItxContainerContainerValue(id));
+        Assert.assertNull("Failed to remove 'ItxContainerContainerValue' with identifier '" + id + "'",
+                ItxContainerContainerValue.findItxContainerContainerValue(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerDataOnDemand.java
index a0b09da81..01df70e03 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerDataOnDemand.java
@@ -20,17 +20,17 @@
 @Component
 public class ItxSubjectContainerDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<ItxSubjectContainer> data;
+    private List<ItxSubjectContainer> data;
 
-	@Autowired
+    @Autowired
     ContainerDataOnDemand containerDataOnDemand;
 
-	@Autowired
+    @Autowired
     SubjectDataOnDemand subjectDataOnDemand;
 
-	public ItxSubjectContainer getNewTransientItxSubjectContainer(int index) {
+    public ItxSubjectContainer getNewTransientItxSubjectContainer(int index) {
         ItxSubjectContainer obj = new ItxSubjectContainer();
         setCodeName(obj, index);
         setContainer(obj, index);
@@ -48,7 +48,7 @@ public ItxSubjectContainer getNewTransientItxSubjectContainer(int index) {
         return obj;
     }
 
-	public void setCodeName(ItxSubjectContainer obj, int index) {
+    public void setCodeName(ItxSubjectContainer obj, int index) {
         String codeName = "codeName_" + index;
         if (codeName.length() > 255) {
             codeName = new Random().nextInt(10) + codeName.substring(1, 255);
@@ -56,22 +56,22 @@ public void setCodeName(ItxSubjectContainer obj, int index) {
         obj.setCodeName(codeName);
     }
 
-	public void setContainer(ItxSubjectContainer obj, int index) {
+    public void setContainer(ItxSubjectContainer obj, int index) {
         Container container = containerDataOnDemand.getRandomContainer();
         obj.setContainer(container);
     }
 
-	public void setDeleted(ItxSubjectContainer obj, int index) {
+    public void setDeleted(ItxSubjectContainer obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setIgnored(ItxSubjectContainer obj, int index) {
+    public void setIgnored(ItxSubjectContainer obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setLsKind(ItxSubjectContainer obj, int index) {
+    public void setLsKind(ItxSubjectContainer obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -79,12 +79,12 @@ public void setLsKind(ItxSubjectContainer obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsTransaction(ItxSubjectContainer obj, int index) {
+    public void setLsTransaction(ItxSubjectContainer obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(ItxSubjectContainer obj, int index) {
+    public void setLsType(ItxSubjectContainer obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 255) {
             lsType = lsType.substring(0, 255);
@@ -92,7 +92,7 @@ public void setLsType(ItxSubjectContainer obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(ItxSubjectContainer obj, int index) {
+    public void setLsTypeAndKind(ItxSubjectContainer obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 255);
@@ -100,7 +100,7 @@ public void setLsTypeAndKind(ItxSubjectContainer obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedBy(ItxSubjectContainer obj, int index) {
+    public void setModifiedBy(ItxSubjectContainer obj, int index) {
         String modifiedBy = "modifiedBy_" + index;
         if (modifiedBy.length() > 255) {
             modifiedBy = modifiedBy.substring(0, 255);
@@ -108,12 +108,15 @@ public void setModifiedBy(ItxSubjectContainer obj, int index) {
         obj.setModifiedBy(modifiedBy);
     }
 
-	public void setModifiedDate(ItxSubjectContainer obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(ItxSubjectContainer obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setRecordedBy(ItxSubjectContainer obj, int index) {
+    public void setRecordedBy(ItxSubjectContainer obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -121,17 +124,20 @@ public void setRecordedBy(ItxSubjectContainer obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(ItxSubjectContainer obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(ItxSubjectContainer obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public void setSubject(ItxSubjectContainer obj, int index) {
+    public void setSubject(ItxSubjectContainer obj, int index) {
         Subject subject = subjectDataOnDemand.getRandomSubject();
         obj.setSubject(subject);
     }
 
-	public ItxSubjectContainer getSpecificItxSubjectContainer(int index) {
+    public ItxSubjectContainer getSpecificItxSubjectContainer(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -144,28 +150,29 @@ public ItxSubjectContainer getSpecificItxSubjectContainer(int index) {
         return ItxSubjectContainer.findItxSubjectContainer(id);
     }
 
-	public ItxSubjectContainer getRandomItxSubjectContainer() {
+    public ItxSubjectContainer getRandomItxSubjectContainer() {
         init();
         ItxSubjectContainer obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return ItxSubjectContainer.findItxSubjectContainer(id);
     }
 
-	public boolean modifyItxSubjectContainer(ItxSubjectContainer obj) {
+    public boolean modifyItxSubjectContainer(ItxSubjectContainer obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = ItxSubjectContainer.findItxSubjectContainerEntries(from, to);
         if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ItxSubjectContainer' illegally returned null");
+            throw new IllegalStateException(
+                    "Find entries implementation for 'ItxSubjectContainer' illegally returned null");
         }
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<ItxSubjectContainer>();
         for (int i = 0; i < 10; i++) {
             ItxSubjectContainer obj = getNewTransientItxSubjectContainer(i);
@@ -175,7 +182,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerIntegrationTest.java
index c7f527804..c0ee75305 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerIntegrationTest.java
@@ -25,17 +25,18 @@ public class ItxSubjectContainerIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ItxSubjectContainerDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountItxSubjectContainers() {
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to initialize correctly", dod.getRandomItxSubjectContainer());
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to initialize correctly",
+                dod.getRandomItxSubjectContainer());
         long count = ItxSubjectContainer.countItxSubjectContainers();
         Assert.assertTrue("Counter for 'ItxSubjectContainer' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindItxSubjectContainer() {
         ItxSubjectContainer obj = dod.getRandomItxSubjectContainer();
         Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindItxSubjectContainer() {
         Assert.assertEquals("Find method for 'ItxSubjectContainer' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllItxSubjectContainers() {
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to initialize correctly", dod.getRandomItxSubjectContainer());
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to initialize correctly",
+                dod.getRandomItxSubjectContainer());
         long count = ItxSubjectContainer.countItxSubjectContainers();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ItxSubjectContainer', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'ItxSubjectContainer', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<ItxSubjectContainer> result = ItxSubjectContainer.findAllItxSubjectContainers();
         Assert.assertNotNull("Find all method for 'ItxSubjectContainer' illegally returned null", result);
         Assert.assertTrue("Find all method for 'ItxSubjectContainer' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindItxSubjectContainerEntries() {
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to initialize correctly", dod.getRandomItxSubjectContainer());
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to initialize correctly",
+                dod.getRandomItxSubjectContainer());
         long count = ItxSubjectContainer.countItxSubjectContainers();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<ItxSubjectContainer> result = ItxSubjectContainer.findItxSubjectContainerEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'ItxSubjectContainer' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ItxSubjectContainer' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'ItxSubjectContainer' returned an incorrect number of entries",
+                count, result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         ItxSubjectContainer obj = dod.getRandomItxSubjectContainer();
         Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to provide an identifier", id);
         obj = ItxSubjectContainer.findItxSubjectContainer(id);
         Assert.assertNotNull("Find method for 'ItxSubjectContainer' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyItxSubjectContainer(obj);
+        boolean modified = dod.modifyItxSubjectContainer(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'ItxSubjectContainer' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'ItxSubjectContainer' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         ItxSubjectContainer obj = dod.getRandomItxSubjectContainer();
         Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to provide an identifier", id);
         obj = ItxSubjectContainer.findItxSubjectContainer(id);
-        boolean modified =  dod.modifyItxSubjectContainer(obj);
+        boolean modified = dod.modifyItxSubjectContainer(obj);
         Integer currentVersion = obj.getVersion();
-        ItxSubjectContainer merged = (ItxSubjectContainer)obj.merge();
+        ItxSubjectContainer merged = (ItxSubjectContainer) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ItxSubjectContainer' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'ItxSubjectContainer' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to initialize correctly", dod.getRandomItxSubjectContainer());
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to initialize correctly",
+                dod.getRandomItxSubjectContainer());
         ItxSubjectContainer obj = dod.getNewTransientItxSubjectContainer(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'ItxSubjectContainer' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'ItxSubjectContainer' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         ItxSubjectContainer obj = dod.getRandomItxSubjectContainer();
         Assert.assertNotNull("Data on demand for 'ItxSubjectContainer' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = ItxSubjectContainer.findItxSubjectContainer(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'ItxSubjectContainer' with identifier '" + id + "'", ItxSubjectContainer.findItxSubjectContainer(id));
+        Assert.assertNull("Failed to remove 'ItxSubjectContainer' with identifier '" + id + "'",
+                ItxSubjectContainer.findItxSubjectContainer(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateDataOnDemand.java
index 59fdd7692..a350fdbfe 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateDataOnDemand.java
@@ -20,14 +20,14 @@
 @Configurable
 public class ItxSubjectContainerStateDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<ItxSubjectContainerState> data;
+    private List<ItxSubjectContainerState> data;
 
-	@Autowired
+    @Autowired
     ItxSubjectContainerDataOnDemand itxSubjectContainerDataOnDemand;
 
-	public ItxSubjectContainerState getNewTransientItxSubjectContainerState(int index) {
+    public ItxSubjectContainerState getNewTransientItxSubjectContainerState(int index) {
         ItxSubjectContainerState obj = new ItxSubjectContainerState();
         setComments(obj, index);
         setDeleted(obj, index);
@@ -43,7 +43,7 @@ public ItxSubjectContainerState getNewTransientItxSubjectContainerState(int inde
         return obj;
     }
 
-	public void setComments(ItxSubjectContainerState obj, int index) {
+    public void setComments(ItxSubjectContainerState obj, int index) {
         String comments = "comments_" + index;
         if (comments.length() > 512) {
             comments = comments.substring(0, 512);
@@ -51,17 +51,17 @@ public void setComments(ItxSubjectContainerState obj, int index) {
         obj.setComments(comments);
     }
 
-	public void setDeleted(ItxSubjectContainerState obj, int index) {
+    public void setDeleted(ItxSubjectContainerState obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setIgnored(ItxSubjectContainerState obj, int index) {
+    public void setIgnored(ItxSubjectContainerState obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setLsKind(ItxSubjectContainerState obj, int index) {
+    public void setLsKind(ItxSubjectContainerState obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -69,12 +69,12 @@ public void setLsKind(ItxSubjectContainerState obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsTransaction(ItxSubjectContainerState obj, int index) {
+    public void setLsTransaction(ItxSubjectContainerState obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(ItxSubjectContainerState obj, int index) {
+    public void setLsType(ItxSubjectContainerState obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 64) {
             lsType = lsType.substring(0, 64);
@@ -82,7 +82,7 @@ public void setLsType(ItxSubjectContainerState obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(ItxSubjectContainerState obj, int index) {
+    public void setLsTypeAndKind(ItxSubjectContainerState obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 255);
@@ -90,7 +90,7 @@ public void setLsTypeAndKind(ItxSubjectContainerState obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedBy(ItxSubjectContainerState obj, int index) {
+    public void setModifiedBy(ItxSubjectContainerState obj, int index) {
         String modifiedBy = "modifiedBy_" + index;
         if (modifiedBy.length() > 255) {
             modifiedBy = modifiedBy.substring(0, 255);
@@ -98,12 +98,15 @@ public void setModifiedBy(ItxSubjectContainerState obj, int index) {
         obj.setModifiedBy(modifiedBy);
     }
 
-	public void setModifiedDate(ItxSubjectContainerState obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(ItxSubjectContainerState obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setRecordedBy(ItxSubjectContainerState obj, int index) {
+    public void setRecordedBy(ItxSubjectContainerState obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -111,12 +114,15 @@ public void setRecordedBy(ItxSubjectContainerState obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(ItxSubjectContainerState obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(ItxSubjectContainerState obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public ItxSubjectContainerState getSpecificItxSubjectContainerState(int index) {
+    public ItxSubjectContainerState getSpecificItxSubjectContainerState(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -129,28 +135,29 @@ public ItxSubjectContainerState getSpecificItxSubjectContainerState(int index) {
         return ItxSubjectContainerState.findItxSubjectContainerState(id);
     }
 
-	public ItxSubjectContainerState getRandomItxSubjectContainerState() {
+    public ItxSubjectContainerState getRandomItxSubjectContainerState() {
         init();
         ItxSubjectContainerState obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return ItxSubjectContainerState.findItxSubjectContainerState(id);
     }
 
-	public boolean modifyItxSubjectContainerState(ItxSubjectContainerState obj) {
+    public boolean modifyItxSubjectContainerState(ItxSubjectContainerState obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = ItxSubjectContainerState.findItxSubjectContainerStateEntries(from, to);
         if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ItxSubjectContainerState' illegally returned null");
+            throw new IllegalStateException(
+                    "Find entries implementation for 'ItxSubjectContainerState' illegally returned null");
         }
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<ItxSubjectContainerState>();
         for (int i = 0; i < 10; i++) {
             ItxSubjectContainerState obj = getNewTransientItxSubjectContainerState(i);
@@ -160,7 +167,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateIntegrationTest.java
index 8bf932e4c..7f33a2357 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerStateIntegrationTest.java
@@ -25,83 +25,103 @@ public class ItxSubjectContainerStateIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ItxSubjectContainerStateDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountItxSubjectContainerStates() {
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to initialize correctly", dod.getRandomItxSubjectContainerState());
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to initialize correctly",
+                dod.getRandomItxSubjectContainerState());
         long count = ItxSubjectContainerState.countItxSubjectContainerStates();
-        Assert.assertTrue("Counter for 'ItxSubjectContainerState' incorrectly reported there were no entries", count > 0);
+        Assert.assertTrue("Counter for 'ItxSubjectContainerState' incorrectly reported there were no entries",
+                count > 0);
     }
 
-	@Test
+    @Test
     public void testFindItxSubjectContainerState() {
         ItxSubjectContainerState obj = dod.getRandomItxSubjectContainerState();
         Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to provide an identifier", id);
         obj = ItxSubjectContainerState.findItxSubjectContainerState(id);
-        Assert.assertNotNull("Find method for 'ItxSubjectContainerState' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ItxSubjectContainerState' returned the incorrect identifier", id, obj.getId());
+        Assert.assertNotNull("Find method for 'ItxSubjectContainerState' illegally returned null for id '" + id + "'",
+                obj);
+        Assert.assertEquals("Find method for 'ItxSubjectContainerState' returned the incorrect identifier", id,
+                obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllItxSubjectContainerStates() {
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to initialize correctly", dod.getRandomItxSubjectContainerState());
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to initialize correctly",
+                dod.getRandomItxSubjectContainerState());
         long count = ItxSubjectContainerState.countItxSubjectContainerStates();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ItxSubjectContainerState', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'ItxSubjectContainerState', as there are "
+                + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<ItxSubjectContainerState> result = ItxSubjectContainerState.findAllItxSubjectContainerStates();
         Assert.assertNotNull("Find all method for 'ItxSubjectContainerState' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ItxSubjectContainerState' failed to return any data", result.size() > 0);
+        Assert.assertTrue("Find all method for 'ItxSubjectContainerState' failed to return any data",
+                result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindItxSubjectContainerStateEntries() {
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to initialize correctly", dod.getRandomItxSubjectContainerState());
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to initialize correctly",
+                dod.getRandomItxSubjectContainerState());
         long count = ItxSubjectContainerState.countItxSubjectContainerStates();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
-        List<ItxSubjectContainerState> result = ItxSubjectContainerState.findItxSubjectContainerStateEntries(firstResult, maxResults);
+        List<ItxSubjectContainerState> result = ItxSubjectContainerState
+                .findItxSubjectContainerStateEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'ItxSubjectContainerState' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ItxSubjectContainerState' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals(
+                "Find entries method for 'ItxSubjectContainerState' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         ItxSubjectContainerState obj = dod.getRandomItxSubjectContainerState();
         Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to provide an identifier", id);
         obj = ItxSubjectContainerState.findItxSubjectContainerState(id);
-        Assert.assertNotNull("Find method for 'ItxSubjectContainerState' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyItxSubjectContainerState(obj);
+        Assert.assertNotNull("Find method for 'ItxSubjectContainerState' illegally returned null for id '" + id + "'",
+                obj);
+        boolean modified = dod.modifyItxSubjectContainerState(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'ItxSubjectContainerState' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'ItxSubjectContainerState' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         ItxSubjectContainerState obj = dod.getRandomItxSubjectContainerState();
         Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to provide an identifier", id);
         obj = ItxSubjectContainerState.findItxSubjectContainerState(id);
-        boolean modified =  dod.modifyItxSubjectContainerState(obj);
+        boolean modified = dod.modifyItxSubjectContainerState(obj);
         Integer currentVersion = obj.getVersion();
-        ItxSubjectContainerState merged = (ItxSubjectContainerState)obj.merge();
+        ItxSubjectContainerState merged = (ItxSubjectContainerState) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ItxSubjectContainerState' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'ItxSubjectContainerState' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to initialize correctly", dod.getRandomItxSubjectContainerState());
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to initialize correctly",
+                dod.getRandomItxSubjectContainerState());
         ItxSubjectContainerState obj = dod.getNewTransientItxSubjectContainerState(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to provide a new transient entity", obj);
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to provide a new transient entity",
+                obj);
         Assert.assertNull("Expected 'ItxSubjectContainerState' identifier to be null", obj.getId());
         try {
             obj.persist();
@@ -109,7 +129,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +139,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'ItxSubjectContainerState' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         ItxSubjectContainerState obj = dod.getRandomItxSubjectContainerState();
         Assert.assertNotNull("Data on demand for 'ItxSubjectContainerState' failed to initialize correctly", obj);
@@ -126,6 +148,7 @@ public void testRemove() {
         obj = ItxSubjectContainerState.findItxSubjectContainerState(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'ItxSubjectContainerState' with identifier '" + id + "'", ItxSubjectContainerState.findItxSubjectContainerState(id));
+        Assert.assertNull("Failed to remove 'ItxSubjectContainerState' with identifier '" + id + "'",
+                ItxSubjectContainerState.findItxSubjectContainerState(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueDataOnDemand.java
index 8988fde19..a2dbe505c 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueDataOnDemand.java
@@ -21,14 +21,14 @@
 @Configurable
 public class ItxSubjectContainerValueDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<ItxSubjectContainerValue> data;
+    private List<ItxSubjectContainerValue> data;
 
-	@Autowired
+    @Autowired
     ItxSubjectContainerStateDataOnDemand itxSubjectContainerStateDataOnDemand;
 
-	public ItxSubjectContainerValue getNewTransientItxSubjectContainerValue(int index) {
+    public ItxSubjectContainerValue getNewTransientItxSubjectContainerValue(int index) {
         ItxSubjectContainerValue obj = new ItxSubjectContainerValue();
         setBlobValue(obj, index);
         setClobValue(obj, index);
@@ -69,17 +69,17 @@ public ItxSubjectContainerValue getNewTransientItxSubjectContainerValue(int inde
         return obj;
     }
 
-	public void setBlobValue(ItxSubjectContainerValue obj, int index) {
+    public void setBlobValue(ItxSubjectContainerValue obj, int index) {
         byte[] blobValue = String.valueOf(index).getBytes();
         obj.setBlobValue(blobValue);
     }
 
-	public void setClobValue(ItxSubjectContainerValue obj, int index) {
+    public void setClobValue(ItxSubjectContainerValue obj, int index) {
         String clobValue = "clobValue_" + index;
         obj.setClobValue(clobValue);
     }
 
-	public void setCodeKind(ItxSubjectContainerValue obj, int index) {
+    public void setCodeKind(ItxSubjectContainerValue obj, int index) {
         String codeKind = "codeKind_" + index;
         if (codeKind.length() > 255) {
             codeKind = codeKind.substring(0, 255);
@@ -87,7 +87,7 @@ public void setCodeKind(ItxSubjectContainerValue obj, int index) {
         obj.setCodeKind(codeKind);
     }
 
-	public void setCodeOrigin(ItxSubjectContainerValue obj, int index) {
+    public void setCodeOrigin(ItxSubjectContainerValue obj, int index) {
         String codeOrigin = "codeOrigin_" + index;
         if (codeOrigin.length() > 255) {
             codeOrigin = codeOrigin.substring(0, 255);
@@ -95,7 +95,7 @@ public void setCodeOrigin(ItxSubjectContainerValue obj, int index) {
         obj.setCodeOrigin(codeOrigin);
     }
 
-	public void setCodeType(ItxSubjectContainerValue obj, int index) {
+    public void setCodeType(ItxSubjectContainerValue obj, int index) {
         String codeType = "codeType_" + index;
         if (codeType.length() > 255) {
             codeType = codeType.substring(0, 255);
@@ -103,7 +103,7 @@ public void setCodeType(ItxSubjectContainerValue obj, int index) {
         obj.setCodeType(codeType);
     }
 
-	public void setCodeTypeAndKind(ItxSubjectContainerValue obj, int index) {
+    public void setCodeTypeAndKind(ItxSubjectContainerValue obj, int index) {
         String codeTypeAndKind = "codeTypeAndKind_" + index;
         if (codeTypeAndKind.length() > 350) {
             codeTypeAndKind = codeTypeAndKind.substring(0, 350);
@@ -111,7 +111,7 @@ public void setCodeTypeAndKind(ItxSubjectContainerValue obj, int index) {
         obj.setCodeTypeAndKind(codeTypeAndKind);
     }
 
-	public void setCodeValue(ItxSubjectContainerValue obj, int index) {
+    public void setCodeValue(ItxSubjectContainerValue obj, int index) {
         String codeValue = "codeValue_" + index;
         if (codeValue.length() > 255) {
             codeValue = codeValue.substring(0, 255);
@@ -119,7 +119,7 @@ public void setCodeValue(ItxSubjectContainerValue obj, int index) {
         obj.setCodeValue(codeValue);
     }
 
-	public void setComments(ItxSubjectContainerValue obj, int index) {
+    public void setComments(ItxSubjectContainerValue obj, int index) {
         String comments = "comments_" + index;
         if (comments.length() > 512) {
             comments = comments.substring(0, 512);
@@ -127,7 +127,7 @@ public void setComments(ItxSubjectContainerValue obj, int index) {
         obj.setComments(comments);
     }
 
-	public void setConcUnit(ItxSubjectContainerValue obj, int index) {
+    public void setConcUnit(ItxSubjectContainerValue obj, int index) {
         String concUnit = "concUnit_" + index;
         if (concUnit.length() > 25) {
             concUnit = concUnit.substring(0, 25);
@@ -135,22 +135,25 @@ public void setConcUnit(ItxSubjectContainerValue obj, int index) {
         obj.setConcUnit(concUnit);
     }
 
-	public void setConcentration(ItxSubjectContainerValue obj, int index) {
+    public void setConcentration(ItxSubjectContainerValue obj, int index) {
         Double concentration = new Integer(index).doubleValue();
         obj.setConcentration(concentration);
     }
 
-	public void setDateValue(ItxSubjectContainerValue obj, int index) {
-        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setDateValue(ItxSubjectContainerValue obj, int index) {
+        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setDateValue(dateValue);
     }
 
-	public void setDeleted(ItxSubjectContainerValue obj, int index) {
+    public void setDeleted(ItxSubjectContainerValue obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setFileValue(ItxSubjectContainerValue obj, int index) {
+    public void setFileValue(ItxSubjectContainerValue obj, int index) {
         String fileValue = "fileValue_" + index;
         if (fileValue.length() > 512) {
             fileValue = fileValue.substring(0, 512);
@@ -158,12 +161,12 @@ public void setFileValue(ItxSubjectContainerValue obj, int index) {
         obj.setFileValue(fileValue);
     }
 
-	public void setIgnored(ItxSubjectContainerValue obj, int index) {
+    public void setIgnored(ItxSubjectContainerValue obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setLsKind(ItxSubjectContainerValue obj, int index) {
+    public void setLsKind(ItxSubjectContainerValue obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -171,12 +174,12 @@ public void setLsKind(ItxSubjectContainerValue obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsTransaction(ItxSubjectContainerValue obj, int index) {
+    public void setLsTransaction(ItxSubjectContainerValue obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(ItxSubjectContainerValue obj, int index) {
+    public void setLsType(ItxSubjectContainerValue obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 64) {
             lsType = lsType.substring(0, 64);
@@ -184,7 +187,7 @@ public void setLsType(ItxSubjectContainerValue obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(ItxSubjectContainerValue obj, int index) {
+    public void setLsTypeAndKind(ItxSubjectContainerValue obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 350) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 350);
@@ -192,7 +195,7 @@ public void setLsTypeAndKind(ItxSubjectContainerValue obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedBy(ItxSubjectContainerValue obj, int index) {
+    public void setModifiedBy(ItxSubjectContainerValue obj, int index) {
         String modifiedBy = "modifiedBy_" + index;
         if (modifiedBy.length() > 255) {
             modifiedBy = modifiedBy.substring(0, 255);
@@ -200,17 +203,20 @@ public void setModifiedBy(ItxSubjectContainerValue obj, int index) {
         obj.setModifiedBy(modifiedBy);
     }
 
-	public void setModifiedDate(ItxSubjectContainerValue obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(ItxSubjectContainerValue obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setNumberOfReplicates(ItxSubjectContainerValue obj, int index) {
+    public void setNumberOfReplicates(ItxSubjectContainerValue obj, int index) {
         Integer numberOfReplicates = new Integer(index);
         obj.setNumberOfReplicates(numberOfReplicates);
     }
 
-	public void setNumericValue(ItxSubjectContainerValue obj, int index) {
+    public void setNumericValue(ItxSubjectContainerValue obj, int index) {
         BigDecimal numericValue = BigDecimal.valueOf(index);
         if (numericValue.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
             numericValue = new BigDecimal("99999999999999999999.999999999999999999");
@@ -218,7 +224,7 @@ public void setNumericValue(ItxSubjectContainerValue obj, int index) {
         obj.setNumericValue(numericValue);
     }
 
-	public void setOperatorKind(ItxSubjectContainerValue obj, int index) {
+    public void setOperatorKind(ItxSubjectContainerValue obj, int index) {
         String operatorKind = "operator_" + index;
         if (operatorKind.length() > 10) {
             operatorKind = operatorKind.substring(0, 10);
@@ -226,7 +232,7 @@ public void setOperatorKind(ItxSubjectContainerValue obj, int index) {
         obj.setOperatorKind(operatorKind);
     }
 
-	public void setOperatorType(ItxSubjectContainerValue obj, int index) {
+    public void setOperatorType(ItxSubjectContainerValue obj, int index) {
         String operatorType = "operatorType_" + index;
         if (operatorType.length() > 25) {
             operatorType = operatorType.substring(0, 25);
@@ -234,7 +240,7 @@ public void setOperatorType(ItxSubjectContainerValue obj, int index) {
         obj.setOperatorType(operatorType);
     }
 
-	public void setOperatorTypeAndKind(ItxSubjectContainerValue obj, int index) {
+    public void setOperatorTypeAndKind(ItxSubjectContainerValue obj, int index) {
         String operatorTypeAndKind = "operatorTypeAndKind_" + index;
         if (operatorTypeAndKind.length() > 50) {
             operatorTypeAndKind = operatorTypeAndKind.substring(0, 50);
@@ -242,12 +248,12 @@ public void setOperatorTypeAndKind(ItxSubjectContainerValue obj, int index) {
         obj.setOperatorTypeAndKind(operatorTypeAndKind);
     }
 
-	public void setPublicData(ItxSubjectContainerValue obj, int index) {
+    public void setPublicData(ItxSubjectContainerValue obj, int index) {
         Boolean publicData = true;
         obj.setPublicData(publicData);
     }
 
-	public void setRecordedBy(ItxSubjectContainerValue obj, int index) {
+    public void setRecordedBy(ItxSubjectContainerValue obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -255,17 +261,20 @@ public void setRecordedBy(ItxSubjectContainerValue obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(ItxSubjectContainerValue obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(ItxSubjectContainerValue obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public void setSigFigs(ItxSubjectContainerValue obj, int index) {
+    public void setSigFigs(ItxSubjectContainerValue obj, int index) {
         Integer sigFigs = new Integer(index);
         obj.setSigFigs(sigFigs);
     }
 
-	public void setStringValue(ItxSubjectContainerValue obj, int index) {
+    public void setStringValue(ItxSubjectContainerValue obj, int index) {
         String stringValue = "stringValue_" + index;
         if (stringValue.length() > 255) {
             stringValue = stringValue.substring(0, 255);
@@ -273,7 +282,7 @@ public void setStringValue(ItxSubjectContainerValue obj, int index) {
         obj.setStringValue(stringValue);
     }
 
-	public void setUncertainty(ItxSubjectContainerValue obj, int index) {
+    public void setUncertainty(ItxSubjectContainerValue obj, int index) {
         BigDecimal uncertainty = BigDecimal.valueOf(index);
         if (uncertainty.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
             uncertainty = new BigDecimal("99999999999999999999.999999999999999999");
@@ -281,7 +290,7 @@ public void setUncertainty(ItxSubjectContainerValue obj, int index) {
         obj.setUncertainty(uncertainty);
     }
 
-	public void setUncertaintyType(ItxSubjectContainerValue obj, int index) {
+    public void setUncertaintyType(ItxSubjectContainerValue obj, int index) {
         String uncertaintyType = "uncertaintyType_" + index;
         if (uncertaintyType.length() > 255) {
             uncertaintyType = uncertaintyType.substring(0, 255);
@@ -289,7 +298,7 @@ public void setUncertaintyType(ItxSubjectContainerValue obj, int index) {
         obj.setUncertaintyType(uncertaintyType);
     }
 
-	public void setUnitKind(ItxSubjectContainerValue obj, int index) {
+    public void setUnitKind(ItxSubjectContainerValue obj, int index) {
         String unitKind = "unitKind_" + index;
         if (unitKind.length() > 25) {
             unitKind = unitKind.substring(0, 25);
@@ -297,7 +306,7 @@ public void setUnitKind(ItxSubjectContainerValue obj, int index) {
         obj.setUnitKind(unitKind);
     }
 
-	public void setUnitType(ItxSubjectContainerValue obj, int index) {
+    public void setUnitType(ItxSubjectContainerValue obj, int index) {
         String unitType = "unitType_" + index;
         if (unitType.length() > 25) {
             unitType = unitType.substring(0, 25);
@@ -305,7 +314,7 @@ public void setUnitType(ItxSubjectContainerValue obj, int index) {
         obj.setUnitType(unitType);
     }
 
-	public void setUnitTypeAndKind(ItxSubjectContainerValue obj, int index) {
+    public void setUnitTypeAndKind(ItxSubjectContainerValue obj, int index) {
         String unitTypeAndKind = "unitTypeAndKind_" + index;
         if (unitTypeAndKind.length() > 55) {
             unitTypeAndKind = unitTypeAndKind.substring(0, 55);
@@ -313,7 +322,7 @@ public void setUnitTypeAndKind(ItxSubjectContainerValue obj, int index) {
         obj.setUnitTypeAndKind(unitTypeAndKind);
     }
 
-	public void setUrlValue(ItxSubjectContainerValue obj, int index) {
+    public void setUrlValue(ItxSubjectContainerValue obj, int index) {
         String urlValue = "urlValue_" + index;
         if (urlValue.length() > 2000) {
             urlValue = urlValue.substring(0, 2000);
@@ -321,7 +330,7 @@ public void setUrlValue(ItxSubjectContainerValue obj, int index) {
         obj.setUrlValue(urlValue);
     }
 
-	public ItxSubjectContainerValue getSpecificItxSubjectContainerValue(int index) {
+    public ItxSubjectContainerValue getSpecificItxSubjectContainerValue(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -334,28 +343,29 @@ public ItxSubjectContainerValue getSpecificItxSubjectContainerValue(int index) {
         return ItxSubjectContainerValue.findItxSubjectContainerValue(id);
     }
 
-	public ItxSubjectContainerValue getRandomItxSubjectContainerValue() {
+    public ItxSubjectContainerValue getRandomItxSubjectContainerValue() {
         init();
         ItxSubjectContainerValue obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return ItxSubjectContainerValue.findItxSubjectContainerValue(id);
     }
 
-	public boolean modifyItxSubjectContainerValue(ItxSubjectContainerValue obj) {
+    public boolean modifyItxSubjectContainerValue(ItxSubjectContainerValue obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = ItxSubjectContainerValue.findItxSubjectContainerValueEntries(from, to);
         if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ItxSubjectContainerValue' illegally returned null");
+            throw new IllegalStateException(
+                    "Find entries implementation for 'ItxSubjectContainerValue' illegally returned null");
         }
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<ItxSubjectContainerValue>();
         for (int i = 0; i < 10; i++) {
             ItxSubjectContainerValue obj = getNewTransientItxSubjectContainerValue(i);
@@ -365,7 +375,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueIntegrationTest.java
index 252cb938f..0f0b906dc 100755
--- a/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ItxSubjectContainerValueIntegrationTest.java
@@ -25,83 +25,103 @@ public class ItxSubjectContainerValueIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ItxSubjectContainerValueDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountItxSubjectContainerValues() {
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to initialize correctly", dod.getRandomItxSubjectContainerValue());
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to initialize correctly",
+                dod.getRandomItxSubjectContainerValue());
         long count = ItxSubjectContainerValue.countItxSubjectContainerValues();
-        Assert.assertTrue("Counter for 'ItxSubjectContainerValue' incorrectly reported there were no entries", count > 0);
+        Assert.assertTrue("Counter for 'ItxSubjectContainerValue' incorrectly reported there were no entries",
+                count > 0);
     }
 
-	@Test
+    @Test
     public void testFindItxSubjectContainerValue() {
         ItxSubjectContainerValue obj = dod.getRandomItxSubjectContainerValue();
         Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to provide an identifier", id);
         obj = ItxSubjectContainerValue.findItxSubjectContainerValue(id);
-        Assert.assertNotNull("Find method for 'ItxSubjectContainerValue' illegally returned null for id '" + id + "'", obj);
-        Assert.assertEquals("Find method for 'ItxSubjectContainerValue' returned the incorrect identifier", id, obj.getId());
+        Assert.assertNotNull("Find method for 'ItxSubjectContainerValue' illegally returned null for id '" + id + "'",
+                obj);
+        Assert.assertEquals("Find method for 'ItxSubjectContainerValue' returned the incorrect identifier", id,
+                obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllItxSubjectContainerValues() {
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to initialize correctly", dod.getRandomItxSubjectContainerValue());
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to initialize correctly",
+                dod.getRandomItxSubjectContainerValue());
         long count = ItxSubjectContainerValue.countItxSubjectContainerValues();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ItxSubjectContainerValue', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'ItxSubjectContainerValue', as there are "
+                + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<ItxSubjectContainerValue> result = ItxSubjectContainerValue.findAllItxSubjectContainerValues();
         Assert.assertNotNull("Find all method for 'ItxSubjectContainerValue' illegally returned null", result);
-        Assert.assertTrue("Find all method for 'ItxSubjectContainerValue' failed to return any data", result.size() > 0);
+        Assert.assertTrue("Find all method for 'ItxSubjectContainerValue' failed to return any data",
+                result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindItxSubjectContainerValueEntries() {
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to initialize correctly", dod.getRandomItxSubjectContainerValue());
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to initialize correctly",
+                dod.getRandomItxSubjectContainerValue());
         long count = ItxSubjectContainerValue.countItxSubjectContainerValues();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
-        List<ItxSubjectContainerValue> result = ItxSubjectContainerValue.findItxSubjectContainerValueEntries(firstResult, maxResults);
+        List<ItxSubjectContainerValue> result = ItxSubjectContainerValue
+                .findItxSubjectContainerValueEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'ItxSubjectContainerValue' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ItxSubjectContainerValue' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals(
+                "Find entries method for 'ItxSubjectContainerValue' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         ItxSubjectContainerValue obj = dod.getRandomItxSubjectContainerValue();
         Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to provide an identifier", id);
         obj = ItxSubjectContainerValue.findItxSubjectContainerValue(id);
-        Assert.assertNotNull("Find method for 'ItxSubjectContainerValue' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyItxSubjectContainerValue(obj);
+        Assert.assertNotNull("Find method for 'ItxSubjectContainerValue' illegally returned null for id '" + id + "'",
+                obj);
+        boolean modified = dod.modifyItxSubjectContainerValue(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'ItxSubjectContainerValue' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'ItxSubjectContainerValue' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         ItxSubjectContainerValue obj = dod.getRandomItxSubjectContainerValue();
         Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to provide an identifier", id);
         obj = ItxSubjectContainerValue.findItxSubjectContainerValue(id);
-        boolean modified =  dod.modifyItxSubjectContainerValue(obj);
+        boolean modified = dod.modifyItxSubjectContainerValue(obj);
         Integer currentVersion = obj.getVersion();
-        ItxSubjectContainerValue merged = (ItxSubjectContainerValue)obj.merge();
+        ItxSubjectContainerValue merged = (ItxSubjectContainerValue) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ItxSubjectContainerValue' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'ItxSubjectContainerValue' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to initialize correctly", dod.getRandomItxSubjectContainerValue());
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to initialize correctly",
+                dod.getRandomItxSubjectContainerValue());
         ItxSubjectContainerValue obj = dod.getNewTransientItxSubjectContainerValue(Integer.MAX_VALUE);
-        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to provide a new transient entity", obj);
+        Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to provide a new transient entity",
+                obj);
         Assert.assertNull("Expected 'ItxSubjectContainerValue' identifier to be null", obj.getId());
         try {
             obj.persist();
@@ -109,7 +129,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +139,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'ItxSubjectContainerValue' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         ItxSubjectContainerValue obj = dod.getRandomItxSubjectContainerValue();
         Assert.assertNotNull("Data on demand for 'ItxSubjectContainerValue' failed to initialize correctly", obj);
@@ -126,6 +148,7 @@ public void testRemove() {
         obj = ItxSubjectContainerValue.findItxSubjectContainerValue(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'ItxSubjectContainerValue' with identifier '" + id + "'", ItxSubjectContainerValue.findItxSubjectContainerValue(id));
+        Assert.assertNull("Failed to remove 'ItxSubjectContainerValue' with identifier '" + id + "'",
+                ItxSubjectContainerValue.findItxSubjectContainerValue(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/LabelKindDataOnDemand.java
index a088d5e69..48098a43d 100755
--- a/src/test/java/com/labsynch/labseer/domain/LabelKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/LabelKindDataOnDemand.java
@@ -17,21 +17,21 @@
 @Component
 public class LabelKindDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<LabelKind> data;
+    private List<LabelKind> data;
 
-	@Autowired
+    @Autowired
     LabelTypeDataOnDemand labelTypeDataOnDemand;
 
-	public LabelKind getNewTransientLabelKind(int index) {
+    public LabelKind getNewTransientLabelKind(int index) {
         LabelKind obj = new LabelKind();
         setKindName(obj, index);
         setLsTypeAndKind(obj, index);
         return obj;
     }
 
-	public void setKindName(LabelKind obj, int index) {
+    public void setKindName(LabelKind obj, int index) {
         String kindName = "kindName_" + index;
         if (kindName.length() > 255) {
             kindName = kindName.substring(0, 255);
@@ -39,7 +39,7 @@ public void setKindName(LabelKind obj, int index) {
         obj.setKindName(kindName);
     }
 
-	public void setLsTypeAndKind(LabelKind obj, int index) {
+    public void setLsTypeAndKind(LabelKind obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = new Random().nextInt(10) + lsTypeAndKind.substring(1, 255);
@@ -47,7 +47,7 @@ public void setLsTypeAndKind(LabelKind obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public LabelKind getSpecificLabelKind(int index) {
+    public LabelKind getSpecificLabelKind(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -60,18 +60,18 @@ public LabelKind getSpecificLabelKind(int index) {
         return LabelKind.findLabelKind(id);
     }
 
-	public LabelKind getRandomLabelKind() {
+    public LabelKind getRandomLabelKind() {
         init();
         LabelKind obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return LabelKind.findLabelKind(id);
     }
 
-	public boolean modifyLabelKind(LabelKind obj) {
+    public boolean modifyLabelKind(LabelKind obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = LabelKind.findLabelKindEntries(from, to);
@@ -81,7 +81,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<LabelKind>();
         for (int i = 0; i < 10; i++) {
             LabelKind obj = getNewTransientLabelKind(i);
@@ -91,7 +91,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/LabelKindIntegrationTest.java
index b3aa428ae..e01fa0e5e 100755
--- a/src/test/java/com/labsynch/labseer/domain/LabelKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/LabelKindIntegrationTest.java
@@ -25,17 +25,17 @@ public class LabelKindIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     LabelKindDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountLabelKinds() {
         Assert.assertNotNull("Data on demand for 'LabelKind' failed to initialize correctly", dod.getRandomLabelKind());
         long count = LabelKind.countLabelKinds();
         Assert.assertTrue("Counter for 'LabelKind' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindLabelKind() {
         LabelKind obj = dod.getRandomLabelKind();
         Assert.assertNotNull("Data on demand for 'LabelKind' failed to initialize correctly", obj);
@@ -46,29 +46,33 @@ public void testFindLabelKind() {
         Assert.assertEquals("Find method for 'LabelKind' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllLabelKinds() {
         Assert.assertNotNull("Data on demand for 'LabelKind' failed to initialize correctly", dod.getRandomLabelKind());
         long count = LabelKind.countLabelKinds();
-        Assert.assertTrue("Too expensive to perform a find all test for 'LabelKind', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'LabelKind', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<LabelKind> result = LabelKind.findAllLabelKinds();
         Assert.assertNotNull("Find all method for 'LabelKind' illegally returned null", result);
         Assert.assertTrue("Find all method for 'LabelKind' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindLabelKindEntries() {
         Assert.assertNotNull("Data on demand for 'LabelKind' failed to initialize correctly", dod.getRandomLabelKind());
         long count = LabelKind.countLabelKinds();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<LabelKind> result = LabelKind.findLabelKindEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'LabelKind' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'LabelKind' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'LabelKind' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         LabelKind obj = dod.getRandomLabelKind();
         Assert.assertNotNull("Data on demand for 'LabelKind' failed to initialize correctly", obj);
@@ -76,28 +80,31 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'LabelKind' failed to provide an identifier", id);
         obj = LabelKind.findLabelKind(id);
         Assert.assertNotNull("Find method for 'LabelKind' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyLabelKind(obj);
+        boolean modified = dod.modifyLabelKind(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'LabelKind' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'LabelKind' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         LabelKind obj = dod.getRandomLabelKind();
         Assert.assertNotNull("Data on demand for 'LabelKind' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'LabelKind' failed to provide an identifier", id);
         obj = LabelKind.findLabelKind(id);
-        boolean modified =  dod.modifyLabelKind(obj);
+        boolean modified = dod.modifyLabelKind(obj);
         Integer currentVersion = obj.getVersion();
         LabelKind merged = obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'LabelKind' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'LabelKind' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
         Assert.assertNotNull("Data on demand for 'LabelKind' failed to initialize correctly", dod.getRandomLabelKind());
         LabelKind obj = dod.getNewTransientLabelKind(Integer.MAX_VALUE);
@@ -109,7 +116,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +126,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'LabelKind' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         LabelKind obj = dod.getRandomLabelKind();
         Assert.assertNotNull("Data on demand for 'LabelKind' failed to initialize correctly", obj);
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelSequenceDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/LabelSequenceDataOnDemand.java
index e492275ad..6f8d10cde 100755
--- a/src/test/java/com/labsynch/labseer/domain/LabelSequenceDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/LabelSequenceDataOnDemand.java
@@ -19,11 +19,11 @@
 @Configurable
 public class LabelSequenceDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<LabelSequence> data;
+    private List<LabelSequence> data;
 
-	public LabelSequence getNewTransientLabelSequence(int index) {
+    public LabelSequence getNewTransientLabelSequence(int index) {
         LabelSequence obj = new LabelSequence();
         setDbSequence(obj, index);
         setDigits(obj, index);
@@ -38,27 +38,27 @@ public LabelSequence getNewTransientLabelSequence(int index) {
         return obj;
     }
 
-	public void setDbSequence(LabelSequence obj, int index) {
+    public void setDbSequence(LabelSequence obj, int index) {
         String dbSequence = "dbSequence_" + index;
         obj.setDbSequence(dbSequence);
     }
 
-	public void setDigits(LabelSequence obj, int index) {
+    public void setDigits(LabelSequence obj, int index) {
         Integer digits = new Integer(index);
         obj.setDigits(digits);
     }
 
-	public void setGroupDigits(LabelSequence obj, int index) {
+    public void setGroupDigits(LabelSequence obj, int index) {
         Boolean groupDigits = true;
         obj.setGroupDigits(groupDigits);
     }
 
-	public void setIgnored(LabelSequence obj, int index) {
+    public void setIgnored(LabelSequence obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setLabelPrefix(LabelSequence obj, int index) {
+    public void setLabelPrefix(LabelSequence obj, int index) {
         String labelPrefix = "labelPrefix_" + index;
         if (labelPrefix.length() > 50) {
             labelPrefix = labelPrefix.substring(0, 50);
@@ -66,7 +66,7 @@ public void setLabelPrefix(LabelSequence obj, int index) {
         obj.setLabelPrefix(labelPrefix);
     }
 
-	public void setLabelSeparator(LabelSequence obj, int index) {
+    public void setLabelSeparator(LabelSequence obj, int index) {
         String labelSeparator = "labelSep_" + index;
         if (labelSeparator.length() > 10) {
             labelSeparator = labelSeparator.substring(0, 10);
@@ -74,7 +74,7 @@ public void setLabelSeparator(LabelSequence obj, int index) {
         obj.setLabelSeparator(labelSeparator);
     }
 
-	public void setLabelTypeAndKind(LabelSequence obj, int index) {
+    public void setLabelTypeAndKind(LabelSequence obj, int index) {
         String labelTypeAndKind = "labelTypeAndKind_" + index;
         if (labelTypeAndKind.length() > 255) {
             labelTypeAndKind = labelTypeAndKind.substring(0, 255);
@@ -82,17 +82,20 @@ public void setLabelTypeAndKind(LabelSequence obj, int index) {
         obj.setLabelTypeAndKind(labelTypeAndKind);
     }
 
-	public void setModifiedDate(LabelSequence obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(LabelSequence obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setStartingNumber(LabelSequence obj, int index) {
+    public void setStartingNumber(LabelSequence obj, int index) {
         Long startingNumber = new Integer(index).longValue();
         obj.setStartingNumber(startingNumber);
     }
 
-	public void setThingTypeAndKind(LabelSequence obj, int index) {
+    public void setThingTypeAndKind(LabelSequence obj, int index) {
         String thingTypeAndKind = "thingTypeAndKind_" + index;
         if (thingTypeAndKind.length() > 255) {
             thingTypeAndKind = thingTypeAndKind.substring(0, 255);
@@ -100,7 +103,7 @@ public void setThingTypeAndKind(LabelSequence obj, int index) {
         obj.setThingTypeAndKind(thingTypeAndKind);
     }
 
-	public LabelSequence getSpecificLabelSequence(int index) {
+    public LabelSequence getSpecificLabelSequence(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -113,18 +116,18 @@ public LabelSequence getSpecificLabelSequence(int index) {
         return LabelSequence.findLabelSequence(id);
     }
 
-	public LabelSequence getRandomLabelSequence() {
+    public LabelSequence getRandomLabelSequence() {
         init();
         LabelSequence obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return LabelSequence.findLabelSequence(id);
     }
 
-	public boolean modifyLabelSequence(LabelSequence obj) {
+    public boolean modifyLabelSequence(LabelSequence obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = LabelSequence.findLabelSequenceEntries(from, to);
@@ -134,7 +137,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<LabelSequence>();
         for (int i = 0; i < 10; i++) {
             LabelSequence obj = getNewTransientLabelSequence(i);
@@ -144,7 +147,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelSequenceIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/LabelSequenceIntegrationTest.java
index 563e54697..c9f65082a 100755
--- a/src/test/java/com/labsynch/labseer/domain/LabelSequenceIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/LabelSequenceIntegrationTest.java
@@ -25,17 +25,18 @@ public class LabelSequenceIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     LabelSequenceDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountLabelSequences() {
-        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to initialize correctly", dod.getRandomLabelSequence());
+        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to initialize correctly",
+                dod.getRandomLabelSequence());
         long count = LabelSequence.countLabelSequences();
         Assert.assertTrue("Counter for 'LabelSequence' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindLabelSequence() {
         LabelSequence obj = dod.getRandomLabelSequence();
         Assert.assertNotNull("Data on demand for 'LabelSequence' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindLabelSequence() {
         Assert.assertEquals("Find method for 'LabelSequence' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllLabelSequences() {
-        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to initialize correctly", dod.getRandomLabelSequence());
+        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to initialize correctly",
+                dod.getRandomLabelSequence());
         long count = LabelSequence.countLabelSequences();
-        Assert.assertTrue("Too expensive to perform a find all test for 'LabelSequence', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'LabelSequence', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<LabelSequence> result = LabelSequence.findAllLabelSequences();
         Assert.assertNotNull("Find all method for 'LabelSequence' illegally returned null", result);
         Assert.assertTrue("Find all method for 'LabelSequence' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindLabelSequenceEntries() {
-        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to initialize correctly", dod.getRandomLabelSequence());
+        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to initialize correctly",
+                dod.getRandomLabelSequence());
         long count = LabelSequence.countLabelSequences();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<LabelSequence> result = LabelSequence.findLabelSequenceEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'LabelSequence' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'LabelSequence' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'LabelSequence' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         LabelSequence obj = dod.getRandomLabelSequence();
         Assert.assertNotNull("Data on demand for 'LabelSequence' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'LabelSequence' failed to provide an identifier", id);
         obj = LabelSequence.findLabelSequence(id);
         Assert.assertNotNull("Find method for 'LabelSequence' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyLabelSequence(obj);
+        boolean modified = dod.modifyLabelSequence(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'LabelSequence' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'LabelSequence' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         LabelSequence obj = dod.getRandomLabelSequence();
         Assert.assertNotNull("Data on demand for 'LabelSequence' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'LabelSequence' failed to provide an identifier", id);
         obj = LabelSequence.findLabelSequence(id);
-        boolean modified =  dod.modifyLabelSequence(obj);
+        boolean modified = dod.modifyLabelSequence(obj);
         Integer currentVersion = obj.getVersion();
         LabelSequence merged = obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'LabelSequence' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'LabelSequence' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to initialize correctly", dod.getRandomLabelSequence());
+        Assert.assertNotNull("Data on demand for 'LabelSequence' failed to initialize correctly",
+                dod.getRandomLabelSequence());
         LabelSequence obj = dod.getNewTransientLabelSequence(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'LabelSequence' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'LabelSequence' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'LabelSequence' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         LabelSequence obj = dod.getRandomLabelSequence();
         Assert.assertNotNull("Data on demand for 'LabelSequence' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = LabelSequence.findLabelSequence(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'LabelSequence' with identifier '" + id + "'", LabelSequence.findLabelSequence(id));
+        Assert.assertNull("Failed to remove 'LabelSequence' with identifier '" + id + "'",
+                LabelSequence.findLabelSequence(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/LabelTypeDataOnDemand.java
index fa200bf70..54d59b1fd 100755
--- a/src/test/java/com/labsynch/labseer/domain/LabelTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/LabelTypeDataOnDemand.java
@@ -16,17 +16,17 @@
 @Component
 public class LabelTypeDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<LabelType> data;
+    private List<LabelType> data;
 
-	public LabelType getNewTransientLabelType(int index) {
+    public LabelType getNewTransientLabelType(int index) {
         LabelType obj = new LabelType();
         setTypeName(obj, index);
         return obj;
     }
 
-	public void setTypeName(LabelType obj, int index) {
+    public void setTypeName(LabelType obj, int index) {
         String typeName = "typeName_" + index;
         if (typeName.length() > 255) {
             typeName = new Random().nextInt(10) + typeName.substring(1, 255);
@@ -34,7 +34,7 @@ public void setTypeName(LabelType obj, int index) {
         obj.setTypeName(typeName);
     }
 
-	public LabelType getSpecificLabelType(int index) {
+    public LabelType getSpecificLabelType(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -47,18 +47,18 @@ public LabelType getSpecificLabelType(int index) {
         return LabelType.findLabelType(id);
     }
 
-	public LabelType getRandomLabelType() {
+    public LabelType getRandomLabelType() {
         init();
         LabelType obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return LabelType.findLabelType(id);
     }
 
-	public boolean modifyLabelType(LabelType obj) {
+    public boolean modifyLabelType(LabelType obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = LabelType.findLabelTypeEntries(from, to);
@@ -68,7 +68,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<LabelType>();
         for (int i = 0; i < 10; i++) {
             LabelType obj = getNewTransientLabelType(i);
@@ -78,7 +78,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/LabelTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/LabelTypeIntegrationTest.java
index e3fea7897..a29a04d61 100755
--- a/src/test/java/com/labsynch/labseer/domain/LabelTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/LabelTypeIntegrationTest.java
@@ -25,17 +25,17 @@ public class LabelTypeIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     LabelTypeDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountLabelTypes() {
         Assert.assertNotNull("Data on demand for 'LabelType' failed to initialize correctly", dod.getRandomLabelType());
         long count = LabelType.countLabelTypes();
         Assert.assertTrue("Counter for 'LabelType' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindLabelType() {
         LabelType obj = dod.getRandomLabelType();
         Assert.assertNotNull("Data on demand for 'LabelType' failed to initialize correctly", obj);
@@ -46,29 +46,33 @@ public void testFindLabelType() {
         Assert.assertEquals("Find method for 'LabelType' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllLabelTypes() {
         Assert.assertNotNull("Data on demand for 'LabelType' failed to initialize correctly", dod.getRandomLabelType());
         long count = LabelType.countLabelTypes();
-        Assert.assertTrue("Too expensive to perform a find all test for 'LabelType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'LabelType', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<LabelType> result = LabelType.findAllLabelTypes();
         Assert.assertNotNull("Find all method for 'LabelType' illegally returned null", result);
         Assert.assertTrue("Find all method for 'LabelType' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindLabelTypeEntries() {
         Assert.assertNotNull("Data on demand for 'LabelType' failed to initialize correctly", dod.getRandomLabelType());
         long count = LabelType.countLabelTypes();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<LabelType> result = LabelType.findLabelTypeEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'LabelType' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'LabelType' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'LabelType' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         LabelType obj = dod.getRandomLabelType();
         Assert.assertNotNull("Data on demand for 'LabelType' failed to initialize correctly", obj);
@@ -76,28 +80,31 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'LabelType' failed to provide an identifier", id);
         obj = LabelType.findLabelType(id);
         Assert.assertNotNull("Find method for 'LabelType' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyLabelType(obj);
+        boolean modified = dod.modifyLabelType(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'LabelType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'LabelType' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         LabelType obj = dod.getRandomLabelType();
         Assert.assertNotNull("Data on demand for 'LabelType' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'LabelType' failed to provide an identifier", id);
         obj = LabelType.findLabelType(id);
-        boolean modified =  dod.modifyLabelType(obj);
+        boolean modified = dod.modifyLabelType(obj);
         Integer currentVersion = obj.getVersion();
         LabelType merged = obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'LabelType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'LabelType' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
         Assert.assertNotNull("Data on demand for 'LabelType' failed to initialize correctly", dod.getRandomLabelType());
         LabelType obj = dod.getNewTransientLabelType(Integer.MAX_VALUE);
@@ -109,7 +116,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +126,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'LabelType' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         LabelType obj = dod.getRandomLabelType();
         Assert.assertNotNull("Data on demand for 'LabelType' failed to initialize correctly", obj);
diff --git a/src/test/java/com/labsynch/labseer/domain/LsInteractionDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/LsInteractionDataOnDemand.java
index ca8a2da41..5b1900377 100755
--- a/src/test/java/com/labsynch/labseer/domain/LsInteractionDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/LsInteractionDataOnDemand.java
@@ -19,11 +19,11 @@
 @Configurable
 public class LsInteractionDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<LsInteraction> data;
+    private List<LsInteraction> data;
 
-	public LsInteraction getNewTransientLsInteraction(int index) {
+    public LsInteraction getNewTransientLsInteraction(int index) {
         LsInteraction obj = new LsInteraction();
         setCodeName(obj, index);
         setDeleted(obj, index);
@@ -41,7 +41,7 @@ public LsInteraction getNewTransientLsInteraction(int index) {
         return obj;
     }
 
-	public void setCodeName(LsInteraction obj, int index) {
+    public void setCodeName(LsInteraction obj, int index) {
         String codeName = "codeName_" + index;
         if (codeName.length() > 255) {
             codeName = new Random().nextInt(10) + codeName.substring(1, 255);
@@ -49,22 +49,22 @@ public void setCodeName(LsInteraction obj, int index) {
         obj.setCodeName(codeName);
     }
 
-	public void setDeleted(LsInteraction obj, int index) {
+    public void setDeleted(LsInteraction obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setFirstThing(LsInteraction obj, int index) {
+    public void setFirstThing(LsInteraction obj, int index) {
         Long firstThing = new Integer(index).longValue();
         obj.setFirstThing(firstThing);
     }
 
-	public void setIgnored(LsInteraction obj, int index) {
+    public void setIgnored(LsInteraction obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setLsKind(LsInteraction obj, int index) {
+    public void setLsKind(LsInteraction obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -72,12 +72,12 @@ public void setLsKind(LsInteraction obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsTransaction(LsInteraction obj, int index) {
+    public void setLsTransaction(LsInteraction obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(LsInteraction obj, int index) {
+    public void setLsType(LsInteraction obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 255) {
             lsType = lsType.substring(0, 255);
@@ -85,7 +85,7 @@ public void setLsType(LsInteraction obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(LsInteraction obj, int index) {
+    public void setLsTypeAndKind(LsInteraction obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 255);
@@ -93,7 +93,7 @@ public void setLsTypeAndKind(LsInteraction obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedBy(LsInteraction obj, int index) {
+    public void setModifiedBy(LsInteraction obj, int index) {
         String modifiedBy = "modifiedBy_" + index;
         if (modifiedBy.length() > 255) {
             modifiedBy = modifiedBy.substring(0, 255);
@@ -101,12 +101,15 @@ public void setModifiedBy(LsInteraction obj, int index) {
         obj.setModifiedBy(modifiedBy);
     }
 
-	public void setModifiedDate(LsInteraction obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(LsInteraction obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setRecordedBy(LsInteraction obj, int index) {
+    public void setRecordedBy(LsInteraction obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -114,17 +117,20 @@ public void setRecordedBy(LsInteraction obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(LsInteraction obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(LsInteraction obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public void setSecondThing(LsInteraction obj, int index) {
+    public void setSecondThing(LsInteraction obj, int index) {
         Long secondThing = new Integer(index).longValue();
         obj.setSecondThing(secondThing);
     }
 
-	public LsInteraction getSpecificLsInteraction(int index) {
+    public LsInteraction getSpecificLsInteraction(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -137,18 +143,18 @@ public LsInteraction getSpecificLsInteraction(int index) {
         return LsInteraction.findLsInteraction(id);
     }
 
-	public LsInteraction getRandomLsInteraction() {
+    public LsInteraction getRandomLsInteraction() {
         init();
         LsInteraction obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return LsInteraction.findLsInteraction(id);
     }
 
-	public boolean modifyLsInteraction(LsInteraction obj) {
+    public boolean modifyLsInteraction(LsInteraction obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = LsInteraction.findLsInteractionEntries(from, to);
@@ -158,7 +164,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<LsInteraction>();
         for (int i = 0; i < 10; i++) {
             LsInteraction obj = getNewTransientLsInteraction(i);
@@ -168,7 +174,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/LsInteractionIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/LsInteractionIntegrationTest.java
index d850a6905..035fbbdd4 100755
--- a/src/test/java/com/labsynch/labseer/domain/LsInteractionIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/LsInteractionIntegrationTest.java
@@ -25,17 +25,18 @@ public class LsInteractionIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     LsInteractionDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountLsInteractions() {
-        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to initialize correctly", dod.getRandomLsInteraction());
+        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to initialize correctly",
+                dod.getRandomLsInteraction());
         long count = LsInteraction.countLsInteractions();
         Assert.assertTrue("Counter for 'LsInteraction' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindLsInteraction() {
         LsInteraction obj = dod.getRandomLsInteraction();
         Assert.assertNotNull("Data on demand for 'LsInteraction' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindLsInteraction() {
         Assert.assertEquals("Find method for 'LsInteraction' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllLsInteractions() {
-        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to initialize correctly", dod.getRandomLsInteraction());
+        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to initialize correctly",
+                dod.getRandomLsInteraction());
         long count = LsInteraction.countLsInteractions();
-        Assert.assertTrue("Too expensive to perform a find all test for 'LsInteraction', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'LsInteraction', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<LsInteraction> result = LsInteraction.findAllLsInteractions();
         Assert.assertNotNull("Find all method for 'LsInteraction' illegally returned null", result);
         Assert.assertTrue("Find all method for 'LsInteraction' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindLsInteractionEntries() {
-        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to initialize correctly", dod.getRandomLsInteraction());
+        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to initialize correctly",
+                dod.getRandomLsInteraction());
         long count = LsInteraction.countLsInteractions();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<LsInteraction> result = LsInteraction.findLsInteractionEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'LsInteraction' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'LsInteraction' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'LsInteraction' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         LsInteraction obj = dod.getRandomLsInteraction();
         Assert.assertNotNull("Data on demand for 'LsInteraction' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'LsInteraction' failed to provide an identifier", id);
         obj = LsInteraction.findLsInteraction(id);
         Assert.assertNotNull("Find method for 'LsInteraction' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyLsInteraction(obj);
+        boolean modified = dod.modifyLsInteraction(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'LsInteraction' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'LsInteraction' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         LsInteraction obj = dod.getRandomLsInteraction();
         Assert.assertNotNull("Data on demand for 'LsInteraction' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'LsInteraction' failed to provide an identifier", id);
         obj = LsInteraction.findLsInteraction(id);
-        boolean modified =  dod.modifyLsInteraction(obj);
+        boolean modified = dod.modifyLsInteraction(obj);
         Integer currentVersion = obj.getVersion();
-        LsInteraction merged = (LsInteraction)obj.merge();
+        LsInteraction merged = (LsInteraction) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'LsInteraction' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'LsInteraction' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to initialize correctly", dod.getRandomLsInteraction());
+        Assert.assertNotNull("Data on demand for 'LsInteraction' failed to initialize correctly",
+                dod.getRandomLsInteraction());
         LsInteraction obj = dod.getNewTransientLsInteraction(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'LsInteraction' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'LsInteraction' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'LsInteraction' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         LsInteraction obj = dod.getRandomLsInteraction();
         Assert.assertNotNull("Data on demand for 'LsInteraction' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = LsInteraction.findLsInteraction(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'LsInteraction' with identifier '" + id + "'", LsInteraction.findLsInteraction(id));
+        Assert.assertNull("Failed to remove 'LsInteraction' with identifier '" + id + "'",
+                LsInteraction.findLsInteraction(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/LsTransactionDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/LsTransactionDataOnDemand.java
index d9db92728..39e45a38d 100755
--- a/src/test/java/com/labsynch/labseer/domain/LsTransactionDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/LsTransactionDataOnDemand.java
@@ -19,11 +19,11 @@
 @Component
 public class LsTransactionDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<LsTransaction> data;
+    private List<LsTransaction> data;
 
-	public LsTransaction getNewTransientLsTransaction(int index) {
+    public LsTransaction getNewTransientLsTransaction(int index) {
         LsTransaction obj = new LsTransaction();
         setComments(obj, index);
         setRecordedBy(obj, index);
@@ -33,7 +33,7 @@ public LsTransaction getNewTransientLsTransaction(int index) {
         return obj;
     }
 
-	public void setComments(LsTransaction obj, int index) {
+    public void setComments(LsTransaction obj, int index) {
         String comments = "comments_" + index;
         if (comments.length() > 255) {
             comments = comments.substring(0, 255);
@@ -41,7 +41,7 @@ public void setComments(LsTransaction obj, int index) {
         obj.setComments(comments);
     }
 
-	public void setRecordedBy(LsTransaction obj, int index) {
+    public void setRecordedBy(LsTransaction obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -49,22 +49,25 @@ public void setRecordedBy(LsTransaction obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(LsTransaction obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(LsTransaction obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public void setStatus(LsTransaction obj, int index) {
+    public void setStatus(LsTransaction obj, int index) {
         LsTransactionStatus status = LsTransactionStatus.class.getEnumConstants()[0];
         obj.setStatus(status);
     }
 
-	public void setType(LsTransaction obj, int index) {
+    public void setType(LsTransaction obj, int index) {
         LsTransactionType type = LsTransactionType.class.getEnumConstants()[0];
         obj.setType(type);
     }
 
-	public LsTransaction getSpecificLsTransaction(int index) {
+    public LsTransaction getSpecificLsTransaction(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -77,18 +80,18 @@ public LsTransaction getSpecificLsTransaction(int index) {
         return LsTransaction.findLsTransaction(id);
     }
 
-	public LsTransaction getRandomLsTransaction() {
+    public LsTransaction getRandomLsTransaction() {
         init();
         LsTransaction obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return LsTransaction.findLsTransaction(id);
     }
 
-	public boolean modifyLsTransaction(LsTransaction obj) {
+    public boolean modifyLsTransaction(LsTransaction obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = LsTransaction.findLsTransactionEntries(from, to);
@@ -98,7 +101,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<LsTransaction>();
         for (int i = 0; i < 10; i++) {
             LsTransaction obj = getNewTransientLsTransaction(i);
@@ -108,7 +111,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/LsTransactionIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/LsTransactionIntegrationTest.java
index fc97dd075..ecab46f21 100755
--- a/src/test/java/com/labsynch/labseer/domain/LsTransactionIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/LsTransactionIntegrationTest.java
@@ -25,17 +25,18 @@ public class LsTransactionIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     LsTransactionDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountLsTransactions() {
-        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to initialize correctly", dod.getRandomLsTransaction());
+        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to initialize correctly",
+                dod.getRandomLsTransaction());
         long count = LsTransaction.countLsTransactions();
         Assert.assertTrue("Counter for 'LsTransaction' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindLsTransaction() {
         LsTransaction obj = dod.getRandomLsTransaction();
         Assert.assertNotNull("Data on demand for 'LsTransaction' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindLsTransaction() {
         Assert.assertEquals("Find method for 'LsTransaction' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllLsTransactions() {
-        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to initialize correctly", dod.getRandomLsTransaction());
+        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to initialize correctly",
+                dod.getRandomLsTransaction());
         long count = LsTransaction.countLsTransactions();
-        Assert.assertTrue("Too expensive to perform a find all test for 'LsTransaction', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'LsTransaction', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<LsTransaction> result = LsTransaction.findAllLsTransactions();
         Assert.assertNotNull("Find all method for 'LsTransaction' illegally returned null", result);
         Assert.assertTrue("Find all method for 'LsTransaction' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindLsTransactionEntries() {
-        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to initialize correctly", dod.getRandomLsTransaction());
+        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to initialize correctly",
+                dod.getRandomLsTransaction());
         long count = LsTransaction.countLsTransactions();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<LsTransaction> result = LsTransaction.findLsTransactionEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'LsTransaction' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'LsTransaction' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'LsTransaction' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         LsTransaction obj = dod.getRandomLsTransaction();
         Assert.assertNotNull("Data on demand for 'LsTransaction' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'LsTransaction' failed to provide an identifier", id);
         obj = LsTransaction.findLsTransaction(id);
         Assert.assertNotNull("Find method for 'LsTransaction' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyLsTransaction(obj);
+        boolean modified = dod.modifyLsTransaction(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'LsTransaction' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'LsTransaction' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         LsTransaction obj = dod.getRandomLsTransaction();
         Assert.assertNotNull("Data on demand for 'LsTransaction' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'LsTransaction' failed to provide an identifier", id);
         obj = LsTransaction.findLsTransaction(id);
-        boolean modified =  dod.modifyLsTransaction(obj);
+        boolean modified = dod.modifyLsTransaction(obj);
         Integer currentVersion = obj.getVersion();
         LsTransaction merged = obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'LsTransaction' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'LsTransaction' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to initialize correctly", dod.getRandomLsTransaction());
+        Assert.assertNotNull("Data on demand for 'LsTransaction' failed to initialize correctly",
+                dod.getRandomLsTransaction());
         LsTransaction obj = dod.getNewTransientLsTransaction(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'LsTransaction' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'LsTransaction' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'LsTransaction' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         LsTransaction obj = dod.getRandomLsTransaction();
         Assert.assertNotNull("Data on demand for 'LsTransaction' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = LsTransaction.findLsTransaction(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'LsTransaction' with identifier '" + id + "'", LsTransaction.findLsTransaction(id));
+        Assert.assertNull("Failed to remove 'LsTransaction' with identifier '" + id + "'",
+                LsTransaction.findLsTransaction(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/OperatorTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/OperatorTypeDataOnDemand.java
index a8bdfe3bb..5e2abb046 100755
--- a/src/test/java/com/labsynch/labseer/domain/OperatorTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/OperatorTypeDataOnDemand.java
@@ -16,17 +16,17 @@
 @Configurable
 public class OperatorTypeDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<OperatorType> data;
+    private List<OperatorType> data;
 
-	public OperatorType getNewTransientOperatorType(int index) {
+    public OperatorType getNewTransientOperatorType(int index) {
         OperatorType obj = new OperatorType();
         setTypeName(obj, index);
         return obj;
     }
 
-	public void setTypeName(OperatorType obj, int index) {
+    public void setTypeName(OperatorType obj, int index) {
         String typeName = "typeName_" + index;
         if (typeName.length() > 25) {
             typeName = new Random().nextInt(10) + typeName.substring(1, 25);
@@ -34,7 +34,7 @@ public void setTypeName(OperatorType obj, int index) {
         obj.setTypeName(typeName);
     }
 
-	public OperatorType getSpecificOperatorType(int index) {
+    public OperatorType getSpecificOperatorType(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -47,18 +47,18 @@ public OperatorType getSpecificOperatorType(int index) {
         return OperatorType.findOperatorType(id);
     }
 
-	public OperatorType getRandomOperatorType() {
+    public OperatorType getRandomOperatorType() {
         init();
         OperatorType obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return OperatorType.findOperatorType(id);
     }
 
-	public boolean modifyOperatorType(OperatorType obj) {
+    public boolean modifyOperatorType(OperatorType obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = OperatorType.findOperatorTypeEntries(from, to);
@@ -68,7 +68,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<OperatorType>();
         for (int i = 0; i < 10; i++) {
             OperatorType obj = getNewTransientOperatorType(i);
@@ -78,7 +78,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/OperatorTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/OperatorTypeIntegrationTest.java
index ed841577e..e4113d03a 100755
--- a/src/test/java/com/labsynch/labseer/domain/OperatorTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/OperatorTypeIntegrationTest.java
@@ -25,17 +25,18 @@ public class OperatorTypeIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     OperatorTypeDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountOperatorTypes() {
-        Assert.assertNotNull("Data on demand for 'OperatorType' failed to initialize correctly", dod.getRandomOperatorType());
+        Assert.assertNotNull("Data on demand for 'OperatorType' failed to initialize correctly",
+                dod.getRandomOperatorType());
         long count = OperatorType.countOperatorTypes();
         Assert.assertTrue("Counter for 'OperatorType' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindOperatorType() {
         OperatorType obj = dod.getRandomOperatorType();
         Assert.assertNotNull("Data on demand for 'OperatorType' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindOperatorType() {
         Assert.assertEquals("Find method for 'OperatorType' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllOperatorTypes() {
-        Assert.assertNotNull("Data on demand for 'OperatorType' failed to initialize correctly", dod.getRandomOperatorType());
+        Assert.assertNotNull("Data on demand for 'OperatorType' failed to initialize correctly",
+                dod.getRandomOperatorType());
         long count = OperatorType.countOperatorTypes();
-        Assert.assertTrue("Too expensive to perform a find all test for 'OperatorType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'OperatorType', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<OperatorType> result = OperatorType.findAllOperatorTypes();
         Assert.assertNotNull("Find all method for 'OperatorType' illegally returned null", result);
         Assert.assertTrue("Find all method for 'OperatorType' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindOperatorTypeEntries() {
-        Assert.assertNotNull("Data on demand for 'OperatorType' failed to initialize correctly", dod.getRandomOperatorType());
+        Assert.assertNotNull("Data on demand for 'OperatorType' failed to initialize correctly",
+                dod.getRandomOperatorType());
         long count = OperatorType.countOperatorTypes();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<OperatorType> result = OperatorType.findOperatorTypeEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'OperatorType' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'OperatorType' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'OperatorType' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         OperatorType obj = dod.getRandomOperatorType();
         Assert.assertNotNull("Data on demand for 'OperatorType' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'OperatorType' failed to provide an identifier", id);
         obj = OperatorType.findOperatorType(id);
         Assert.assertNotNull("Find method for 'OperatorType' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyOperatorType(obj);
+        boolean modified = dod.modifyOperatorType(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'OperatorType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'OperatorType' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         OperatorType obj = dod.getRandomOperatorType();
         Assert.assertNotNull("Data on demand for 'OperatorType' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'OperatorType' failed to provide an identifier", id);
         obj = OperatorType.findOperatorType(id);
-        boolean modified =  dod.modifyOperatorType(obj);
+        boolean modified = dod.modifyOperatorType(obj);
         Integer currentVersion = obj.getVersion();
         OperatorType merged = obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'OperatorType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'OperatorType' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'OperatorType' failed to initialize correctly", dod.getRandomOperatorType());
+        Assert.assertNotNull("Data on demand for 'OperatorType' failed to initialize correctly",
+                dod.getRandomOperatorType());
         OperatorType obj = dod.getNewTransientOperatorType(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'OperatorType' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'OperatorType' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'OperatorType' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         OperatorType obj = dod.getRandomOperatorType();
         Assert.assertNotNull("Data on demand for 'OperatorType' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = OperatorType.findOperatorType(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'OperatorType' with identifier '" + id + "'", OperatorType.findOperatorType(id));
+        Assert.assertNull("Failed to remove 'OperatorType' with identifier '" + id + "'",
+                OperatorType.findOperatorType(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ProtocolDataOnDemand.java
index 35cb00cc9..00b265cad 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolDataOnDemand.java
@@ -19,11 +19,11 @@
 @Component
 public class ProtocolDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<Protocol> data;
+    private List<Protocol> data;
 
-	public Protocol getNewTransientProtocol(int index) {
+    public Protocol getNewTransientProtocol(int index) {
         Protocol obj = new Protocol();
         setCodeName(obj, index);
         setDeleted(obj, index);
@@ -40,7 +40,7 @@ public Protocol getNewTransientProtocol(int index) {
         return obj;
     }
 
-	public void setCodeName(Protocol obj, int index) {
+    public void setCodeName(Protocol obj, int index) {
         String codeName = "codeName_" + index;
         if (codeName.length() > 255) {
             codeName = new Random().nextInt(10) + codeName.substring(1, 255);
@@ -48,17 +48,17 @@ public void setCodeName(Protocol obj, int index) {
         obj.setCodeName(codeName);
     }
 
-	public void setDeleted(Protocol obj, int index) {
+    public void setDeleted(Protocol obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setIgnored(Protocol obj, int index) {
+    public void setIgnored(Protocol obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setLsKind(Protocol obj, int index) {
+    public void setLsKind(Protocol obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -66,12 +66,12 @@ public void setLsKind(Protocol obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsTransaction(Protocol obj, int index) {
+    public void setLsTransaction(Protocol obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(Protocol obj, int index) {
+    public void setLsType(Protocol obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 255) {
             lsType = lsType.substring(0, 255);
@@ -79,7 +79,7 @@ public void setLsType(Protocol obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(Protocol obj, int index) {
+    public void setLsTypeAndKind(Protocol obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 255);
@@ -87,7 +87,7 @@ public void setLsTypeAndKind(Protocol obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedBy(Protocol obj, int index) {
+    public void setModifiedBy(Protocol obj, int index) {
         String modifiedBy = "modifiedBy_" + index;
         if (modifiedBy.length() > 255) {
             modifiedBy = modifiedBy.substring(0, 255);
@@ -95,12 +95,15 @@ public void setModifiedBy(Protocol obj, int index) {
         obj.setModifiedBy(modifiedBy);
     }
 
-	public void setModifiedDate(Protocol obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(Protocol obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setRecordedBy(Protocol obj, int index) {
+    public void setRecordedBy(Protocol obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -108,12 +111,15 @@ public void setRecordedBy(Protocol obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(Protocol obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(Protocol obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public void setShortDescription(Protocol obj, int index) {
+    public void setShortDescription(Protocol obj, int index) {
         String shortDescription = "shortDescription_" + index;
         if (shortDescription.length() > 1000) {
             shortDescription = shortDescription.substring(0, 1000);
@@ -121,7 +127,7 @@ public void setShortDescription(Protocol obj, int index) {
         obj.setShortDescription(shortDescription);
     }
 
-	public Protocol getSpecificProtocol(int index) {
+    public Protocol getSpecificProtocol(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -134,18 +140,18 @@ public Protocol getSpecificProtocol(int index) {
         return Protocol.findProtocol(id);
     }
 
-	public Protocol getRandomProtocol() {
+    public Protocol getRandomProtocol() {
         init();
         Protocol obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return Protocol.findProtocol(id);
     }
 
-	public boolean modifyProtocol(Protocol obj) {
+    public boolean modifyProtocol(Protocol obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = Protocol.findProtocolEntries(from, to);
@@ -155,7 +161,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<Protocol>();
         for (int i = 0; i < 10; i++) {
             Protocol obj = getNewTransientProtocol(i);
@@ -165,7 +171,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ProtocolIntegrationTest.java
index 9ba1e6c17..61bcc156b 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolIntegrationTest.java
@@ -25,17 +25,17 @@ public class ProtocolIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ProtocolDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountProtocols() {
         Assert.assertNotNull("Data on demand for 'Protocol' failed to initialize correctly", dod.getRandomProtocol());
         long count = Protocol.countProtocols();
         Assert.assertTrue("Counter for 'Protocol' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindProtocol() {
         Protocol obj = dod.getRandomProtocol();
         Assert.assertNotNull("Data on demand for 'Protocol' failed to initialize correctly", obj);
@@ -46,29 +46,33 @@ public void testFindProtocol() {
         Assert.assertEquals("Find method for 'Protocol' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllProtocols() {
         Assert.assertNotNull("Data on demand for 'Protocol' failed to initialize correctly", dod.getRandomProtocol());
         long count = Protocol.countProtocols();
-        Assert.assertTrue("Too expensive to perform a find all test for 'Protocol', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'Protocol', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<Protocol> result = Protocol.findAllProtocols();
         Assert.assertNotNull("Find all method for 'Protocol' illegally returned null", result);
         Assert.assertTrue("Find all method for 'Protocol' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindProtocolEntries() {
         Assert.assertNotNull("Data on demand for 'Protocol' failed to initialize correctly", dod.getRandomProtocol());
         long count = Protocol.countProtocols();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<Protocol> result = Protocol.findProtocolEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'Protocol' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'Protocol' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'Protocol' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         Protocol obj = dod.getRandomProtocol();
         Assert.assertNotNull("Data on demand for 'Protocol' failed to initialize correctly", obj);
@@ -76,28 +80,31 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'Protocol' failed to provide an identifier", id);
         obj = Protocol.findProtocol(id);
         Assert.assertNotNull("Find method for 'Protocol' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyProtocol(obj);
+        boolean modified = dod.modifyProtocol(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'Protocol' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'Protocol' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         Protocol obj = dod.getRandomProtocol();
         Assert.assertNotNull("Data on demand for 'Protocol' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'Protocol' failed to provide an identifier", id);
         obj = Protocol.findProtocol(id);
-        boolean modified =  dod.modifyProtocol(obj);
+        boolean modified = dod.modifyProtocol(obj);
         Integer currentVersion = obj.getVersion();
-        Protocol merged = (Protocol)obj.merge();
+        Protocol merged = (Protocol) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'Protocol' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'Protocol' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
         Assert.assertNotNull("Data on demand for 'Protocol' failed to initialize correctly", dod.getRandomProtocol());
         Protocol obj = dod.getNewTransientProtocol(Integer.MAX_VALUE);
@@ -109,7 +116,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +126,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'Protocol' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         Protocol obj = dod.getRandomProtocol();
         Assert.assertNotNull("Data on demand for 'Protocol' failed to initialize correctly", obj);
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ProtocolKindDataOnDemand.java
index c654b78d9..e3cbf5351 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolKindDataOnDemand.java
@@ -17,14 +17,14 @@
 @Configurable
 public class ProtocolKindDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<ProtocolKind> data;
+    private List<ProtocolKind> data;
 
-	@Autowired
+    @Autowired
     ProtocolTypeDataOnDemand protocolTypeDataOnDemand;
 
-	public ProtocolKind getNewTransientProtocolKind(int index) {
+    public ProtocolKind getNewTransientProtocolKind(int index) {
         ProtocolKind obj = new ProtocolKind();
         setKindName(obj, index);
         setLsType(obj, index);
@@ -32,7 +32,7 @@ public ProtocolKind getNewTransientProtocolKind(int index) {
         return obj;
     }
 
-	public void setKindName(ProtocolKind obj, int index) {
+    public void setKindName(ProtocolKind obj, int index) {
         String kindName = "kindName_" + index;
         if (kindName.length() > 255) {
             kindName = kindName.substring(0, 255);
@@ -40,12 +40,12 @@ public void setKindName(ProtocolKind obj, int index) {
         obj.setKindName(kindName);
     }
 
-	public void setLsType(ProtocolKind obj, int index) {
+    public void setLsType(ProtocolKind obj, int index) {
         ProtocolType lsType = protocolTypeDataOnDemand.getRandomProtocolType();
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(ProtocolKind obj, int index) {
+    public void setLsTypeAndKind(ProtocolKind obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = new Random().nextInt(10) + lsTypeAndKind.substring(1, 255);
@@ -53,7 +53,7 @@ public void setLsTypeAndKind(ProtocolKind obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public ProtocolKind getSpecificProtocolKind(int index) {
+    public ProtocolKind getSpecificProtocolKind(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -66,18 +66,18 @@ public ProtocolKind getSpecificProtocolKind(int index) {
         return ProtocolKind.findProtocolKind(id);
     }
 
-	public ProtocolKind getRandomProtocolKind() {
+    public ProtocolKind getRandomProtocolKind() {
         init();
         ProtocolKind obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return ProtocolKind.findProtocolKind(id);
     }
 
-	public boolean modifyProtocolKind(ProtocolKind obj) {
+    public boolean modifyProtocolKind(ProtocolKind obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = ProtocolKind.findProtocolKindEntries(from, to);
@@ -87,7 +87,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<ProtocolKind>();
         for (int i = 0; i < 10; i++) {
             ProtocolKind obj = getNewTransientProtocolKind(i);
@@ -97,7 +97,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ProtocolKindIntegrationTest.java
index 985efc806..6aa369145 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolKindIntegrationTest.java
@@ -25,17 +25,18 @@ public class ProtocolKindIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ProtocolKindDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountProtocolKinds() {
-        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to initialize correctly", dod.getRandomProtocolKind());
+        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to initialize correctly",
+                dod.getRandomProtocolKind());
         long count = ProtocolKind.countProtocolKinds();
         Assert.assertTrue("Counter for 'ProtocolKind' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindProtocolKind() {
         ProtocolKind obj = dod.getRandomProtocolKind();
         Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindProtocolKind() {
         Assert.assertEquals("Find method for 'ProtocolKind' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllProtocolKinds() {
-        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to initialize correctly", dod.getRandomProtocolKind());
+        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to initialize correctly",
+                dod.getRandomProtocolKind());
         long count = ProtocolKind.countProtocolKinds();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ProtocolKind', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'ProtocolKind', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<ProtocolKind> result = ProtocolKind.findAllProtocolKinds();
         Assert.assertNotNull("Find all method for 'ProtocolKind' illegally returned null", result);
         Assert.assertTrue("Find all method for 'ProtocolKind' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindProtocolKindEntries() {
-        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to initialize correctly", dod.getRandomProtocolKind());
+        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to initialize correctly",
+                dod.getRandomProtocolKind());
         long count = ProtocolKind.countProtocolKinds();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<ProtocolKind> result = ProtocolKind.findProtocolKindEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'ProtocolKind' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ProtocolKind' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'ProtocolKind' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         ProtocolKind obj = dod.getRandomProtocolKind();
         Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to provide an identifier", id);
         obj = ProtocolKind.findProtocolKind(id);
         Assert.assertNotNull("Find method for 'ProtocolKind' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyProtocolKind(obj);
+        boolean modified = dod.modifyProtocolKind(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'ProtocolKind' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'ProtocolKind' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         ProtocolKind obj = dod.getRandomProtocolKind();
         Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to provide an identifier", id);
         obj = ProtocolKind.findProtocolKind(id);
-        boolean modified =  dod.modifyProtocolKind(obj);
+        boolean modified = dod.modifyProtocolKind(obj);
         Integer currentVersion = obj.getVersion();
         ProtocolKind merged = obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ProtocolKind' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'ProtocolKind' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to initialize correctly", dod.getRandomProtocolKind());
+        Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to initialize correctly",
+                dod.getRandomProtocolKind());
         ProtocolKind obj = dod.getNewTransientProtocolKind(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'ProtocolKind' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'ProtocolKind' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         ProtocolKind obj = dod.getRandomProtocolKind();
         Assert.assertNotNull("Data on demand for 'ProtocolKind' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = ProtocolKind.findProtocolKind(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'ProtocolKind' with identifier '" + id + "'", ProtocolKind.findProtocolKind(id));
+        Assert.assertNull("Failed to remove 'ProtocolKind' with identifier '" + id + "'",
+                ProtocolKind.findProtocolKind(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolLabelDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ProtocolLabelDataOnDemand.java
index ade292bc5..69108f9e9 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolLabelDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolLabelDataOnDemand.java
@@ -20,14 +20,14 @@
 @Configurable
 public class ProtocolLabelDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<ProtocolLabel> data;
+    private List<ProtocolLabel> data;
 
-	@Autowired
+    @Autowired
     ProtocolDataOnDemand protocolDataOnDemand;
 
-	public ProtocolLabel getNewTransientProtocolLabel(int index) {
+    public ProtocolLabel getNewTransientProtocolLabel(int index) {
         ProtocolLabel obj = new ProtocolLabel();
         setDeleted(obj, index);
         setIgnored(obj, index);
@@ -46,17 +46,17 @@ public ProtocolLabel getNewTransientProtocolLabel(int index) {
         return obj;
     }
 
-	public void setDeleted(ProtocolLabel obj, int index) {
+    public void setDeleted(ProtocolLabel obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setIgnored(ProtocolLabel obj, int index) {
+    public void setIgnored(ProtocolLabel obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setImageFile(ProtocolLabel obj, int index) {
+    public void setImageFile(ProtocolLabel obj, int index) {
         String imageFile = "imageFile_" + index;
         if (imageFile.length() > 255) {
             imageFile = imageFile.substring(0, 255);
@@ -64,7 +64,7 @@ public void setImageFile(ProtocolLabel obj, int index) {
         obj.setImageFile(imageFile);
     }
 
-	public void setLabelText(ProtocolLabel obj, int index) {
+    public void setLabelText(ProtocolLabel obj, int index) {
         String labelText = "labelText_" + index;
         if (labelText.length() > 255) {
             labelText = labelText.substring(0, 255);
@@ -72,7 +72,7 @@ public void setLabelText(ProtocolLabel obj, int index) {
         obj.setLabelText(labelText);
     }
 
-	public void setLsKind(ProtocolLabel obj, int index) {
+    public void setLsKind(ProtocolLabel obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -80,12 +80,12 @@ public void setLsKind(ProtocolLabel obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsTransaction(ProtocolLabel obj, int index) {
+    public void setLsTransaction(ProtocolLabel obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(ProtocolLabel obj, int index) {
+    public void setLsType(ProtocolLabel obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 64) {
             lsType = lsType.substring(0, 64);
@@ -93,7 +93,7 @@ public void setLsType(ProtocolLabel obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(ProtocolLabel obj, int index) {
+    public void setLsTypeAndKind(ProtocolLabel obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 255);
@@ -101,27 +101,30 @@ public void setLsTypeAndKind(ProtocolLabel obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedDate(ProtocolLabel obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(ProtocolLabel obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setPhysicallyLabled(ProtocolLabel obj, int index) {
+    public void setPhysicallyLabled(ProtocolLabel obj, int index) {
         Boolean physicallyLabled = true;
         obj.setPhysicallyLabled(physicallyLabled);
     }
 
-	public void setPreferred(ProtocolLabel obj, int index) {
+    public void setPreferred(ProtocolLabel obj, int index) {
         Boolean preferred = true;
         obj.setPreferred(preferred);
     }
 
-	public void setProtocol(ProtocolLabel obj, int index) {
+    public void setProtocol(ProtocolLabel obj, int index) {
         Protocol protocol = protocolDataOnDemand.getRandomProtocol();
         obj.setProtocol(protocol);
     }
 
-	public void setRecordedBy(ProtocolLabel obj, int index) {
+    public void setRecordedBy(ProtocolLabel obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -129,12 +132,15 @@ public void setRecordedBy(ProtocolLabel obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(ProtocolLabel obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(ProtocolLabel obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public ProtocolLabel getSpecificProtocolLabel(int index) {
+    public ProtocolLabel getSpecificProtocolLabel(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -147,18 +153,18 @@ public ProtocolLabel getSpecificProtocolLabel(int index) {
         return ProtocolLabel.findProtocolLabel(id);
     }
 
-	public ProtocolLabel getRandomProtocolLabel() {
+    public ProtocolLabel getRandomProtocolLabel() {
         init();
         ProtocolLabel obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return ProtocolLabel.findProtocolLabel(id);
     }
 
-	public boolean modifyProtocolLabel(ProtocolLabel obj) {
+    public boolean modifyProtocolLabel(ProtocolLabel obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = ProtocolLabel.findProtocolLabelEntries(from, to);
@@ -168,7 +174,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<ProtocolLabel>();
         for (int i = 0; i < 10; i++) {
             ProtocolLabel obj = getNewTransientProtocolLabel(i);
@@ -178,7 +184,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolLabelIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ProtocolLabelIntegrationTest.java
index 540b414c7..475e715bd 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolLabelIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolLabelIntegrationTest.java
@@ -25,17 +25,18 @@ public class ProtocolLabelIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ProtocolLabelDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountProtocolLabels() {
-        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to initialize correctly", dod.getRandomProtocolLabel());
+        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to initialize correctly",
+                dod.getRandomProtocolLabel());
         long count = ProtocolLabel.countProtocolLabels();
         Assert.assertTrue("Counter for 'ProtocolLabel' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindProtocolLabel() {
         ProtocolLabel obj = dod.getRandomProtocolLabel();
         Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindProtocolLabel() {
         Assert.assertEquals("Find method for 'ProtocolLabel' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllProtocolLabels() {
-        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to initialize correctly", dod.getRandomProtocolLabel());
+        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to initialize correctly",
+                dod.getRandomProtocolLabel());
         long count = ProtocolLabel.countProtocolLabels();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ProtocolLabel', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'ProtocolLabel', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<ProtocolLabel> result = ProtocolLabel.findAllProtocolLabels();
         Assert.assertNotNull("Find all method for 'ProtocolLabel' illegally returned null", result);
         Assert.assertTrue("Find all method for 'ProtocolLabel' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindProtocolLabelEntries() {
-        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to initialize correctly", dod.getRandomProtocolLabel());
+        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to initialize correctly",
+                dod.getRandomProtocolLabel());
         long count = ProtocolLabel.countProtocolLabels();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<ProtocolLabel> result = ProtocolLabel.findProtocolLabelEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'ProtocolLabel' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ProtocolLabel' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'ProtocolLabel' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         ProtocolLabel obj = dod.getRandomProtocolLabel();
         Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to provide an identifier", id);
         obj = ProtocolLabel.findProtocolLabel(id);
         Assert.assertNotNull("Find method for 'ProtocolLabel' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyProtocolLabel(obj);
+        boolean modified = dod.modifyProtocolLabel(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'ProtocolLabel' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'ProtocolLabel' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         ProtocolLabel obj = dod.getRandomProtocolLabel();
         Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to provide an identifier", id);
         obj = ProtocolLabel.findProtocolLabel(id);
-        boolean modified =  dod.modifyProtocolLabel(obj);
+        boolean modified = dod.modifyProtocolLabel(obj);
         Integer currentVersion = obj.getVersion();
-        ProtocolLabel merged = (ProtocolLabel)obj.merge();
+        ProtocolLabel merged = (ProtocolLabel) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ProtocolLabel' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'ProtocolLabel' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to initialize correctly", dod.getRandomProtocolLabel());
+        Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to initialize correctly",
+                dod.getRandomProtocolLabel());
         ProtocolLabel obj = dod.getNewTransientProtocolLabel(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'ProtocolLabel' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'ProtocolLabel' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         ProtocolLabel obj = dod.getRandomProtocolLabel();
         Assert.assertNotNull("Data on demand for 'ProtocolLabel' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = ProtocolLabel.findProtocolLabel(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'ProtocolLabel' with identifier '" + id + "'", ProtocolLabel.findProtocolLabel(id));
+        Assert.assertNull("Failed to remove 'ProtocolLabel' with identifier '" + id + "'",
+                ProtocolLabel.findProtocolLabel(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ProtocolStateDataOnDemand.java
index c157f11b6..8eb1e6963 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolStateDataOnDemand.java
@@ -20,14 +20,14 @@
 @Component
 public class ProtocolStateDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<ProtocolState> data;
+    private List<ProtocolState> data;
 
-	@Autowired
+    @Autowired
     ProtocolDataOnDemand protocolDataOnDemand;
 
-	public ProtocolState getNewTransientProtocolState(int index) {
+    public ProtocolState getNewTransientProtocolState(int index) {
         ProtocolState obj = new ProtocolState();
         setComments(obj, index);
         setDeleted(obj, index);
@@ -44,7 +44,7 @@ public ProtocolState getNewTransientProtocolState(int index) {
         return obj;
     }
 
-	public void setComments(ProtocolState obj, int index) {
+    public void setComments(ProtocolState obj, int index) {
         String comments = "comments_" + index;
         if (comments.length() > 512) {
             comments = comments.substring(0, 512);
@@ -52,17 +52,17 @@ public void setComments(ProtocolState obj, int index) {
         obj.setComments(comments);
     }
 
-	public void setDeleted(ProtocolState obj, int index) {
+    public void setDeleted(ProtocolState obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setIgnored(ProtocolState obj, int index) {
+    public void setIgnored(ProtocolState obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setLsKind(ProtocolState obj, int index) {
+    public void setLsKind(ProtocolState obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -70,12 +70,12 @@ public void setLsKind(ProtocolState obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsTransaction(ProtocolState obj, int index) {
+    public void setLsTransaction(ProtocolState obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(ProtocolState obj, int index) {
+    public void setLsType(ProtocolState obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 64) {
             lsType = lsType.substring(0, 64);
@@ -83,7 +83,7 @@ public void setLsType(ProtocolState obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(ProtocolState obj, int index) {
+    public void setLsTypeAndKind(ProtocolState obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 255);
@@ -91,7 +91,7 @@ public void setLsTypeAndKind(ProtocolState obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedBy(ProtocolState obj, int index) {
+    public void setModifiedBy(ProtocolState obj, int index) {
         String modifiedBy = "modifiedBy_" + index;
         if (modifiedBy.length() > 255) {
             modifiedBy = modifiedBy.substring(0, 255);
@@ -99,17 +99,20 @@ public void setModifiedBy(ProtocolState obj, int index) {
         obj.setModifiedBy(modifiedBy);
     }
 
-	public void setModifiedDate(ProtocolState obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(ProtocolState obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setProtocol(ProtocolState obj, int index) {
+    public void setProtocol(ProtocolState obj, int index) {
         Protocol protocol = protocolDataOnDemand.getRandomProtocol();
         obj.setProtocol(protocol);
     }
 
-	public void setRecordedBy(ProtocolState obj, int index) {
+    public void setRecordedBy(ProtocolState obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -117,12 +120,15 @@ public void setRecordedBy(ProtocolState obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(ProtocolState obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(ProtocolState obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public ProtocolState getSpecificProtocolState(int index) {
+    public ProtocolState getSpecificProtocolState(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -135,18 +141,18 @@ public ProtocolState getSpecificProtocolState(int index) {
         return ProtocolState.findProtocolState(id);
     }
 
-	public ProtocolState getRandomProtocolState() {
+    public ProtocolState getRandomProtocolState() {
         init();
         ProtocolState obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return ProtocolState.findProtocolState(id);
     }
 
-	public boolean modifyProtocolState(ProtocolState obj) {
+    public boolean modifyProtocolState(ProtocolState obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = ProtocolState.findProtocolStateEntries(from, to);
@@ -156,7 +162,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<ProtocolState>();
         for (int i = 0; i < 10; i++) {
             ProtocolState obj = getNewTransientProtocolState(i);
@@ -166,7 +172,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ProtocolStateIntegrationTest.java
index 21912c292..53f8089e2 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolStateIntegrationTest.java
@@ -25,17 +25,18 @@ public class ProtocolStateIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ProtocolStateDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountProtocolStates() {
-        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to initialize correctly", dod.getRandomProtocolState());
+        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to initialize correctly",
+                dod.getRandomProtocolState());
         long count = ProtocolState.countProtocolStates();
         Assert.assertTrue("Counter for 'ProtocolState' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindProtocolState() {
         ProtocolState obj = dod.getRandomProtocolState();
         Assert.assertNotNull("Data on demand for 'ProtocolState' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindProtocolState() {
         Assert.assertEquals("Find method for 'ProtocolState' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllProtocolStates() {
-        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to initialize correctly", dod.getRandomProtocolState());
+        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to initialize correctly",
+                dod.getRandomProtocolState());
         long count = ProtocolState.countProtocolStates();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ProtocolState', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'ProtocolState', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<ProtocolState> result = ProtocolState.findAllProtocolStates();
         Assert.assertNotNull("Find all method for 'ProtocolState' illegally returned null", result);
         Assert.assertTrue("Find all method for 'ProtocolState' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindProtocolStateEntries() {
-        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to initialize correctly", dod.getRandomProtocolState());
+        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to initialize correctly",
+                dod.getRandomProtocolState());
         long count = ProtocolState.countProtocolStates();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<ProtocolState> result = ProtocolState.findProtocolStateEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'ProtocolState' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ProtocolState' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'ProtocolState' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         ProtocolState obj = dod.getRandomProtocolState();
         Assert.assertNotNull("Data on demand for 'ProtocolState' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'ProtocolState' failed to provide an identifier", id);
         obj = ProtocolState.findProtocolState(id);
         Assert.assertNotNull("Find method for 'ProtocolState' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyProtocolState(obj);
+        boolean modified = dod.modifyProtocolState(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'ProtocolState' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'ProtocolState' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         ProtocolState obj = dod.getRandomProtocolState();
         Assert.assertNotNull("Data on demand for 'ProtocolState' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ProtocolState' failed to provide an identifier", id);
         obj = ProtocolState.findProtocolState(id);
-        boolean modified =  dod.modifyProtocolState(obj);
+        boolean modified = dod.modifyProtocolState(obj);
         Integer currentVersion = obj.getVersion();
-        ProtocolState merged = (ProtocolState)obj.merge();
+        ProtocolState merged = (ProtocolState) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ProtocolState' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'ProtocolState' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to initialize correctly", dod.getRandomProtocolState());
+        Assert.assertNotNull("Data on demand for 'ProtocolState' failed to initialize correctly",
+                dod.getRandomProtocolState());
         ProtocolState obj = dod.getNewTransientProtocolState(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'ProtocolState' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'ProtocolState' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'ProtocolState' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         ProtocolState obj = dod.getRandomProtocolState();
         Assert.assertNotNull("Data on demand for 'ProtocolState' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = ProtocolState.findProtocolState(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'ProtocolState' with identifier '" + id + "'", ProtocolState.findProtocolState(id));
+        Assert.assertNull("Failed to remove 'ProtocolState' with identifier '" + id + "'",
+                ProtocolState.findProtocolState(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ProtocolTypeDataOnDemand.java
index 2826818b5..fd3f3d684 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolTypeDataOnDemand.java
@@ -16,17 +16,17 @@
 @Configurable
 public class ProtocolTypeDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<ProtocolType> data;
+    private List<ProtocolType> data;
 
-	public ProtocolType getNewTransientProtocolType(int index) {
+    public ProtocolType getNewTransientProtocolType(int index) {
         ProtocolType obj = new ProtocolType();
         setTypeName(obj, index);
         return obj;
     }
 
-	public void setTypeName(ProtocolType obj, int index) {
+    public void setTypeName(ProtocolType obj, int index) {
         String typeName = "typeName_" + index;
         if (typeName.length() > 128) {
             typeName = new Random().nextInt(10) + typeName.substring(1, 128);
@@ -34,7 +34,7 @@ public void setTypeName(ProtocolType obj, int index) {
         obj.setTypeName(typeName);
     }
 
-	public ProtocolType getSpecificProtocolType(int index) {
+    public ProtocolType getSpecificProtocolType(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -47,18 +47,18 @@ public ProtocolType getSpecificProtocolType(int index) {
         return ProtocolType.findProtocolType(id);
     }
 
-	public ProtocolType getRandomProtocolType() {
+    public ProtocolType getRandomProtocolType() {
         init();
         ProtocolType obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return ProtocolType.findProtocolType(id);
     }
 
-	public boolean modifyProtocolType(ProtocolType obj) {
+    public boolean modifyProtocolType(ProtocolType obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = ProtocolType.findProtocolTypeEntries(from, to);
@@ -68,7 +68,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<ProtocolType>();
         for (int i = 0; i < 10; i++) {
             ProtocolType obj = getNewTransientProtocolType(i);
@@ -78,7 +78,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ProtocolTypeIntegrationTest.java
index cb3215609..fbf5cdc48 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolTypeIntegrationTest.java
@@ -25,17 +25,18 @@ public class ProtocolTypeIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ProtocolTypeDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountProtocolTypes() {
-        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to initialize correctly", dod.getRandomProtocolType());
+        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to initialize correctly",
+                dod.getRandomProtocolType());
         long count = ProtocolType.countProtocolTypes();
         Assert.assertTrue("Counter for 'ProtocolType' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindProtocolType() {
         ProtocolType obj = dod.getRandomProtocolType();
         Assert.assertNotNull("Data on demand for 'ProtocolType' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindProtocolType() {
         Assert.assertEquals("Find method for 'ProtocolType' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllProtocolTypes() {
-        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to initialize correctly", dod.getRandomProtocolType());
+        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to initialize correctly",
+                dod.getRandomProtocolType());
         long count = ProtocolType.countProtocolTypes();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ProtocolType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'ProtocolType', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<ProtocolType> result = ProtocolType.findAllProtocolTypes();
         Assert.assertNotNull("Find all method for 'ProtocolType' illegally returned null", result);
         Assert.assertTrue("Find all method for 'ProtocolType' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindProtocolTypeEntries() {
-        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to initialize correctly", dod.getRandomProtocolType());
+        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to initialize correctly",
+                dod.getRandomProtocolType());
         long count = ProtocolType.countProtocolTypes();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<ProtocolType> result = ProtocolType.findProtocolTypeEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'ProtocolType' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ProtocolType' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'ProtocolType' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         ProtocolType obj = dod.getRandomProtocolType();
         Assert.assertNotNull("Data on demand for 'ProtocolType' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'ProtocolType' failed to provide an identifier", id);
         obj = ProtocolType.findProtocolType(id);
         Assert.assertNotNull("Find method for 'ProtocolType' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyProtocolType(obj);
+        boolean modified = dod.modifyProtocolType(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'ProtocolType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'ProtocolType' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         ProtocolType obj = dod.getRandomProtocolType();
         Assert.assertNotNull("Data on demand for 'ProtocolType' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ProtocolType' failed to provide an identifier", id);
         obj = ProtocolType.findProtocolType(id);
-        boolean modified =  dod.modifyProtocolType(obj);
+        boolean modified = dod.modifyProtocolType(obj);
         Integer currentVersion = obj.getVersion();
         ProtocolType merged = obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ProtocolType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'ProtocolType' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to initialize correctly", dod.getRandomProtocolType());
+        Assert.assertNotNull("Data on demand for 'ProtocolType' failed to initialize correctly",
+                dod.getRandomProtocolType());
         ProtocolType obj = dod.getNewTransientProtocolType(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'ProtocolType' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'ProtocolType' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'ProtocolType' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         ProtocolType obj = dod.getRandomProtocolType();
         Assert.assertNotNull("Data on demand for 'ProtocolType' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = ProtocolType.findProtocolType(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'ProtocolType' with identifier '" + id + "'", ProtocolType.findProtocolType(id));
+        Assert.assertNull("Failed to remove 'ProtocolType' with identifier '" + id + "'",
+                ProtocolType.findProtocolType(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ProtocolValueDataOnDemand.java
index 22a5a7346..31e2b4fb5 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolValueDataOnDemand.java
@@ -21,14 +21,14 @@
 @Configurable
 public class ProtocolValueDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<ProtocolValue> data;
+    private List<ProtocolValue> data;
 
-	@Autowired
+    @Autowired
     ProtocolStateDataOnDemand protocolStateDataOnDemand;
 
-	public ProtocolValue getNewTransientProtocolValue(int index) {
+    public ProtocolValue getNewTransientProtocolValue(int index) {
         ProtocolValue obj = new ProtocolValue();
         setBlobValue(obj, index);
         setClobValue(obj, index);
@@ -70,17 +70,17 @@ public ProtocolValue getNewTransientProtocolValue(int index) {
         return obj;
     }
 
-	public void setBlobValue(ProtocolValue obj, int index) {
+    public void setBlobValue(ProtocolValue obj, int index) {
         byte[] blobValue = String.valueOf(index).getBytes();
         obj.setBlobValue(blobValue);
     }
 
-	public void setClobValue(ProtocolValue obj, int index) {
+    public void setClobValue(ProtocolValue obj, int index) {
         String clobValue = "clobValue_" + index;
         obj.setClobValue(clobValue);
     }
 
-	public void setCodeKind(ProtocolValue obj, int index) {
+    public void setCodeKind(ProtocolValue obj, int index) {
         String codeKind = "codeKind_" + index;
         if (codeKind.length() > 255) {
             codeKind = codeKind.substring(0, 255);
@@ -88,7 +88,7 @@ public void setCodeKind(ProtocolValue obj, int index) {
         obj.setCodeKind(codeKind);
     }
 
-	public void setCodeOrigin(ProtocolValue obj, int index) {
+    public void setCodeOrigin(ProtocolValue obj, int index) {
         String codeOrigin = "codeOrigin_" + index;
         if (codeOrigin.length() > 255) {
             codeOrigin = codeOrigin.substring(0, 255);
@@ -96,7 +96,7 @@ public void setCodeOrigin(ProtocolValue obj, int index) {
         obj.setCodeOrigin(codeOrigin);
     }
 
-	public void setCodeType(ProtocolValue obj, int index) {
+    public void setCodeType(ProtocolValue obj, int index) {
         String codeType = "codeType_" + index;
         if (codeType.length() > 255) {
             codeType = codeType.substring(0, 255);
@@ -104,7 +104,7 @@ public void setCodeType(ProtocolValue obj, int index) {
         obj.setCodeType(codeType);
     }
 
-	public void setCodeTypeAndKind(ProtocolValue obj, int index) {
+    public void setCodeTypeAndKind(ProtocolValue obj, int index) {
         String codeTypeAndKind = "codeTypeAndKind_" + index;
         if (codeTypeAndKind.length() > 350) {
             codeTypeAndKind = codeTypeAndKind.substring(0, 350);
@@ -112,7 +112,7 @@ public void setCodeTypeAndKind(ProtocolValue obj, int index) {
         obj.setCodeTypeAndKind(codeTypeAndKind);
     }
 
-	public void setCodeValue(ProtocolValue obj, int index) {
+    public void setCodeValue(ProtocolValue obj, int index) {
         String codeValue = "codeValue_" + index;
         if (codeValue.length() > 255) {
             codeValue = codeValue.substring(0, 255);
@@ -120,7 +120,7 @@ public void setCodeValue(ProtocolValue obj, int index) {
         obj.setCodeValue(codeValue);
     }
 
-	public void setComments(ProtocolValue obj, int index) {
+    public void setComments(ProtocolValue obj, int index) {
         String comments = "comments_" + index;
         if (comments.length() > 512) {
             comments = comments.substring(0, 512);
@@ -128,7 +128,7 @@ public void setComments(ProtocolValue obj, int index) {
         obj.setComments(comments);
     }
 
-	public void setConcUnit(ProtocolValue obj, int index) {
+    public void setConcUnit(ProtocolValue obj, int index) {
         String concUnit = "concUnit_" + index;
         if (concUnit.length() > 25) {
             concUnit = concUnit.substring(0, 25);
@@ -136,22 +136,25 @@ public void setConcUnit(ProtocolValue obj, int index) {
         obj.setConcUnit(concUnit);
     }
 
-	public void setConcentration(ProtocolValue obj, int index) {
+    public void setConcentration(ProtocolValue obj, int index) {
         Double concentration = new Integer(index).doubleValue();
         obj.setConcentration(concentration);
     }
 
-	public void setDateValue(ProtocolValue obj, int index) {
-        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setDateValue(ProtocolValue obj, int index) {
+        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setDateValue(dateValue);
     }
 
-	public void setDeleted(ProtocolValue obj, int index) {
+    public void setDeleted(ProtocolValue obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setFileValue(ProtocolValue obj, int index) {
+    public void setFileValue(ProtocolValue obj, int index) {
         String fileValue = "fileValue_" + index;
         if (fileValue.length() > 512) {
             fileValue = fileValue.substring(0, 512);
@@ -159,12 +162,12 @@ public void setFileValue(ProtocolValue obj, int index) {
         obj.setFileValue(fileValue);
     }
 
-	public void setIgnored(ProtocolValue obj, int index) {
+    public void setIgnored(ProtocolValue obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setLsKind(ProtocolValue obj, int index) {
+    public void setLsKind(ProtocolValue obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -172,17 +175,17 @@ public void setLsKind(ProtocolValue obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsState(ProtocolValue obj, int index) {
+    public void setLsState(ProtocolValue obj, int index) {
         ProtocolState lsState = protocolStateDataOnDemand.getRandomProtocolState();
         obj.setLsState(lsState);
     }
 
-	public void setLsTransaction(ProtocolValue obj, int index) {
+    public void setLsTransaction(ProtocolValue obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(ProtocolValue obj, int index) {
+    public void setLsType(ProtocolValue obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 64) {
             lsType = lsType.substring(0, 64);
@@ -190,7 +193,7 @@ public void setLsType(ProtocolValue obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(ProtocolValue obj, int index) {
+    public void setLsTypeAndKind(ProtocolValue obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 350) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 350);
@@ -198,7 +201,7 @@ public void setLsTypeAndKind(ProtocolValue obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedBy(ProtocolValue obj, int index) {
+    public void setModifiedBy(ProtocolValue obj, int index) {
         String modifiedBy = "modifiedBy_" + index;
         if (modifiedBy.length() > 255) {
             modifiedBy = modifiedBy.substring(0, 255);
@@ -206,17 +209,20 @@ public void setModifiedBy(ProtocolValue obj, int index) {
         obj.setModifiedBy(modifiedBy);
     }
 
-	public void setModifiedDate(ProtocolValue obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(ProtocolValue obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setNumberOfReplicates(ProtocolValue obj, int index) {
+    public void setNumberOfReplicates(ProtocolValue obj, int index) {
         Integer numberOfReplicates = new Integer(index);
         obj.setNumberOfReplicates(numberOfReplicates);
     }
 
-	public void setNumericValue(ProtocolValue obj, int index) {
+    public void setNumericValue(ProtocolValue obj, int index) {
         BigDecimal numericValue = BigDecimal.valueOf(index);
         if (numericValue.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
             numericValue = new BigDecimal("99999999999999999999.999999999999999999");
@@ -224,7 +230,7 @@ public void setNumericValue(ProtocolValue obj, int index) {
         obj.setNumericValue(numericValue);
     }
 
-	public void setOperatorKind(ProtocolValue obj, int index) {
+    public void setOperatorKind(ProtocolValue obj, int index) {
         String operatorKind = "operator_" + index;
         if (operatorKind.length() > 10) {
             operatorKind = operatorKind.substring(0, 10);
@@ -232,7 +238,7 @@ public void setOperatorKind(ProtocolValue obj, int index) {
         obj.setOperatorKind(operatorKind);
     }
 
-	public void setOperatorType(ProtocolValue obj, int index) {
+    public void setOperatorType(ProtocolValue obj, int index) {
         String operatorType = "operatorType_" + index;
         if (operatorType.length() > 25) {
             operatorType = operatorType.substring(0, 25);
@@ -240,7 +246,7 @@ public void setOperatorType(ProtocolValue obj, int index) {
         obj.setOperatorType(operatorType);
     }
 
-	public void setOperatorTypeAndKind(ProtocolValue obj, int index) {
+    public void setOperatorTypeAndKind(ProtocolValue obj, int index) {
         String operatorTypeAndKind = "operatorTypeAndKind_" + index;
         if (operatorTypeAndKind.length() > 50) {
             operatorTypeAndKind = operatorTypeAndKind.substring(0, 50);
@@ -248,12 +254,12 @@ public void setOperatorTypeAndKind(ProtocolValue obj, int index) {
         obj.setOperatorTypeAndKind(operatorTypeAndKind);
     }
 
-	public void setPublicData(ProtocolValue obj, int index) {
+    public void setPublicData(ProtocolValue obj, int index) {
         Boolean publicData = true;
         obj.setPublicData(publicData);
     }
 
-	public void setRecordedBy(ProtocolValue obj, int index) {
+    public void setRecordedBy(ProtocolValue obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -261,17 +267,20 @@ public void setRecordedBy(ProtocolValue obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(ProtocolValue obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(ProtocolValue obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public void setSigFigs(ProtocolValue obj, int index) {
+    public void setSigFigs(ProtocolValue obj, int index) {
         Integer sigFigs = new Integer(index);
         obj.setSigFigs(sigFigs);
     }
 
-	public void setStringValue(ProtocolValue obj, int index) {
+    public void setStringValue(ProtocolValue obj, int index) {
         String stringValue = "stringValue_" + index;
         if (stringValue.length() > 255) {
             stringValue = stringValue.substring(0, 255);
@@ -279,7 +288,7 @@ public void setStringValue(ProtocolValue obj, int index) {
         obj.setStringValue(stringValue);
     }
 
-	public void setUncertainty(ProtocolValue obj, int index) {
+    public void setUncertainty(ProtocolValue obj, int index) {
         BigDecimal uncertainty = BigDecimal.valueOf(index);
         if (uncertainty.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
             uncertainty = new BigDecimal("99999999999999999999.999999999999999999");
@@ -287,7 +296,7 @@ public void setUncertainty(ProtocolValue obj, int index) {
         obj.setUncertainty(uncertainty);
     }
 
-	public void setUncertaintyType(ProtocolValue obj, int index) {
+    public void setUncertaintyType(ProtocolValue obj, int index) {
         String uncertaintyType = "uncertaintyType_" + index;
         if (uncertaintyType.length() > 255) {
             uncertaintyType = uncertaintyType.substring(0, 255);
@@ -295,7 +304,7 @@ public void setUncertaintyType(ProtocolValue obj, int index) {
         obj.setUncertaintyType(uncertaintyType);
     }
 
-	public void setUnitKind(ProtocolValue obj, int index) {
+    public void setUnitKind(ProtocolValue obj, int index) {
         String unitKind = "unitKind_" + index;
         if (unitKind.length() > 25) {
             unitKind = unitKind.substring(0, 25);
@@ -303,7 +312,7 @@ public void setUnitKind(ProtocolValue obj, int index) {
         obj.setUnitKind(unitKind);
     }
 
-	public void setUnitType(ProtocolValue obj, int index) {
+    public void setUnitType(ProtocolValue obj, int index) {
         String unitType = "unitType_" + index;
         if (unitType.length() > 25) {
             unitType = unitType.substring(0, 25);
@@ -311,7 +320,7 @@ public void setUnitType(ProtocolValue obj, int index) {
         obj.setUnitType(unitType);
     }
 
-	public void setUnitTypeAndKind(ProtocolValue obj, int index) {
+    public void setUnitTypeAndKind(ProtocolValue obj, int index) {
         String unitTypeAndKind = "unitTypeAndKind_" + index;
         if (unitTypeAndKind.length() > 55) {
             unitTypeAndKind = unitTypeAndKind.substring(0, 55);
@@ -319,7 +328,7 @@ public void setUnitTypeAndKind(ProtocolValue obj, int index) {
         obj.setUnitTypeAndKind(unitTypeAndKind);
     }
 
-	public void setUrlValue(ProtocolValue obj, int index) {
+    public void setUrlValue(ProtocolValue obj, int index) {
         String urlValue = "urlValue_" + index;
         if (urlValue.length() > 2000) {
             urlValue = urlValue.substring(0, 2000);
@@ -327,7 +336,7 @@ public void setUrlValue(ProtocolValue obj, int index) {
         obj.setUrlValue(urlValue);
     }
 
-	public ProtocolValue getSpecificProtocolValue(int index) {
+    public ProtocolValue getSpecificProtocolValue(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -340,18 +349,18 @@ public ProtocolValue getSpecificProtocolValue(int index) {
         return ProtocolValue.findProtocolValue(id);
     }
 
-	public ProtocolValue getRandomProtocolValue() {
+    public ProtocolValue getRandomProtocolValue() {
         init();
         ProtocolValue obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return ProtocolValue.findProtocolValue(id);
     }
 
-	public boolean modifyProtocolValue(ProtocolValue obj) {
+    public boolean modifyProtocolValue(ProtocolValue obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = ProtocolValue.findProtocolValueEntries(from, to);
@@ -361,7 +370,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<ProtocolValue>();
         for (int i = 0; i < 10; i++) {
             ProtocolValue obj = getNewTransientProtocolValue(i);
@@ -371,7 +380,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ProtocolValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ProtocolValueIntegrationTest.java
index ec13826f5..cc6d28432 100755
--- a/src/test/java/com/labsynch/labseer/domain/ProtocolValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ProtocolValueIntegrationTest.java
@@ -25,17 +25,18 @@ public class ProtocolValueIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ProtocolValueDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountProtocolValues() {
-        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to initialize correctly", dod.getRandomProtocolValue());
+        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to initialize correctly",
+                dod.getRandomProtocolValue());
         long count = ProtocolValue.countProtocolValues();
         Assert.assertTrue("Counter for 'ProtocolValue' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindProtocolValue() {
         ProtocolValue obj = dod.getRandomProtocolValue();
         Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindProtocolValue() {
         Assert.assertEquals("Find method for 'ProtocolValue' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllProtocolValues() {
-        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to initialize correctly", dod.getRandomProtocolValue());
+        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to initialize correctly",
+                dod.getRandomProtocolValue());
         long count = ProtocolValue.countProtocolValues();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ProtocolValue', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'ProtocolValue', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<ProtocolValue> result = ProtocolValue.findAllProtocolValues();
         Assert.assertNotNull("Find all method for 'ProtocolValue' illegally returned null", result);
         Assert.assertTrue("Find all method for 'ProtocolValue' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindProtocolValueEntries() {
-        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to initialize correctly", dod.getRandomProtocolValue());
+        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to initialize correctly",
+                dod.getRandomProtocolValue());
         long count = ProtocolValue.countProtocolValues();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<ProtocolValue> result = ProtocolValue.findProtocolValueEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'ProtocolValue' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ProtocolValue' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'ProtocolValue' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         ProtocolValue obj = dod.getRandomProtocolValue();
         Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to provide an identifier", id);
         obj = ProtocolValue.findProtocolValue(id);
         Assert.assertNotNull("Find method for 'ProtocolValue' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyProtocolValue(obj);
+        boolean modified = dod.modifyProtocolValue(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'ProtocolValue' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'ProtocolValue' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         ProtocolValue obj = dod.getRandomProtocolValue();
         Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to provide an identifier", id);
         obj = ProtocolValue.findProtocolValue(id);
-        boolean modified =  dod.modifyProtocolValue(obj);
+        boolean modified = dod.modifyProtocolValue(obj);
         Integer currentVersion = obj.getVersion();
-        ProtocolValue merged = (ProtocolValue)obj.merge();
+        ProtocolValue merged = (ProtocolValue) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ProtocolValue' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'ProtocolValue' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to initialize correctly", dod.getRandomProtocolValue());
+        Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to initialize correctly",
+                dod.getRandomProtocolValue());
         ProtocolValue obj = dod.getNewTransientProtocolValue(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'ProtocolValue' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'ProtocolValue' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         ProtocolValue obj = dod.getRandomProtocolValue();
         Assert.assertNotNull("Data on demand for 'ProtocolValue' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = ProtocolValue.findProtocolValue(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'ProtocolValue' with identifier '" + id + "'", ProtocolValue.findProtocolValue(id));
+        Assert.assertNull("Failed to remove 'ProtocolValue' with identifier '" + id + "'",
+                ProtocolValue.findProtocolValue(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/StateKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/StateKindDataOnDemand.java
index 33c9a542b..6d69494ad 100755
--- a/src/test/java/com/labsynch/labseer/domain/StateKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/StateKindDataOnDemand.java
@@ -17,14 +17,14 @@
 @Component
 public class StateKindDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<StateKind> data;
+    private List<StateKind> data;
 
-	@Autowired
+    @Autowired
     StateTypeDataOnDemand stateTypeDataOnDemand;
 
-	public StateKind getNewTransientStateKind(int index) {
+    public StateKind getNewTransientStateKind(int index) {
         StateKind obj = new StateKind();
         setKindName(obj, index);
         setLsType(obj, index);
@@ -32,7 +32,7 @@ public StateKind getNewTransientStateKind(int index) {
         return obj;
     }
 
-	public void setKindName(StateKind obj, int index) {
+    public void setKindName(StateKind obj, int index) {
         String kindName = "kindName_" + index;
         if (kindName.length() > 64) {
             kindName = kindName.substring(0, 64);
@@ -40,12 +40,12 @@ public void setKindName(StateKind obj, int index) {
         obj.setKindName(kindName);
     }
 
-	public void setLsType(StateKind obj, int index) {
+    public void setLsType(StateKind obj, int index) {
         StateType lsType = stateTypeDataOnDemand.getRandomStateType();
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(StateKind obj, int index) {
+    public void setLsTypeAndKind(StateKind obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = new Random().nextInt(10) + lsTypeAndKind.substring(1, 255);
@@ -53,7 +53,7 @@ public void setLsTypeAndKind(StateKind obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public StateKind getSpecificStateKind(int index) {
+    public StateKind getSpecificStateKind(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -66,18 +66,18 @@ public StateKind getSpecificStateKind(int index) {
         return StateKind.findStateKind(id);
     }
 
-	public StateKind getRandomStateKind() {
+    public StateKind getRandomStateKind() {
         init();
         StateKind obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return StateKind.findStateKind(id);
     }
 
-	public boolean modifyStateKind(StateKind obj) {
+    public boolean modifyStateKind(StateKind obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = StateKind.findStateKindEntries(from, to);
@@ -87,7 +87,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<StateKind>();
         for (int i = 0; i < 10; i++) {
             StateKind obj = getNewTransientStateKind(i);
@@ -97,7 +97,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/StateKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/StateKindIntegrationTest.java
index 023cff53e..69af8e850 100755
--- a/src/test/java/com/labsynch/labseer/domain/StateKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/StateKindIntegrationTest.java
@@ -25,17 +25,17 @@ public class StateKindIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     StateKindDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountStateKinds() {
         Assert.assertNotNull("Data on demand for 'StateKind' failed to initialize correctly", dod.getRandomStateKind());
         long count = StateKind.countStateKinds();
         Assert.assertTrue("Counter for 'StateKind' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindStateKind() {
         StateKind obj = dod.getRandomStateKind();
         Assert.assertNotNull("Data on demand for 'StateKind' failed to initialize correctly", obj);
@@ -46,29 +46,33 @@ public void testFindStateKind() {
         Assert.assertEquals("Find method for 'StateKind' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllStateKinds() {
         Assert.assertNotNull("Data on demand for 'StateKind' failed to initialize correctly", dod.getRandomStateKind());
         long count = StateKind.countStateKinds();
-        Assert.assertTrue("Too expensive to perform a find all test for 'StateKind', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'StateKind', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<StateKind> result = StateKind.findAllStateKinds();
         Assert.assertNotNull("Find all method for 'StateKind' illegally returned null", result);
         Assert.assertTrue("Find all method for 'StateKind' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindStateKindEntries() {
         Assert.assertNotNull("Data on demand for 'StateKind' failed to initialize correctly", dod.getRandomStateKind());
         long count = StateKind.countStateKinds();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<StateKind> result = StateKind.findStateKindEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'StateKind' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'StateKind' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'StateKind' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         StateKind obj = dod.getRandomStateKind();
         Assert.assertNotNull("Data on demand for 'StateKind' failed to initialize correctly", obj);
@@ -76,28 +80,31 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'StateKind' failed to provide an identifier", id);
         obj = StateKind.findStateKind(id);
         Assert.assertNotNull("Find method for 'StateKind' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyStateKind(obj);
+        boolean modified = dod.modifyStateKind(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'StateKind' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'StateKind' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         StateKind obj = dod.getRandomStateKind();
         Assert.assertNotNull("Data on demand for 'StateKind' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'StateKind' failed to provide an identifier", id);
         obj = StateKind.findStateKind(id);
-        boolean modified =  dod.modifyStateKind(obj);
+        boolean modified = dod.modifyStateKind(obj);
         Integer currentVersion = obj.getVersion();
         StateKind merged = obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'StateKind' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'StateKind' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
         Assert.assertNotNull("Data on demand for 'StateKind' failed to initialize correctly", dod.getRandomStateKind());
         StateKind obj = dod.getNewTransientStateKind(Integer.MAX_VALUE);
@@ -109,7 +116,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +126,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'StateKind' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         StateKind obj = dod.getRandomStateKind();
         Assert.assertNotNull("Data on demand for 'StateKind' failed to initialize correctly", obj);
diff --git a/src/test/java/com/labsynch/labseer/domain/StateTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/StateTypeDataOnDemand.java
index c06de5624..34c729588 100755
--- a/src/test/java/com/labsynch/labseer/domain/StateTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/StateTypeDataOnDemand.java
@@ -16,17 +16,17 @@
 @Component
 public class StateTypeDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<StateType> data;
+    private List<StateType> data;
 
-	public StateType getNewTransientStateType(int index) {
+    public StateType getNewTransientStateType(int index) {
         StateType obj = new StateType();
         setTypeName(obj, index);
         return obj;
     }
 
-	public void setTypeName(StateType obj, int index) {
+    public void setTypeName(StateType obj, int index) {
         String typeName = "typeName_" + index;
         if (typeName.length() > 64) {
             typeName = new Random().nextInt(10) + typeName.substring(1, 64);
@@ -34,7 +34,7 @@ public void setTypeName(StateType obj, int index) {
         obj.setTypeName(typeName);
     }
 
-	public StateType getSpecificStateType(int index) {
+    public StateType getSpecificStateType(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -47,18 +47,18 @@ public StateType getSpecificStateType(int index) {
         return StateType.findStateType(id);
     }
 
-	public StateType getRandomStateType() {
+    public StateType getRandomStateType() {
         init();
         StateType obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return StateType.findStateType(id);
     }
 
-	public boolean modifyStateType(StateType obj) {
+    public boolean modifyStateType(StateType obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = StateType.findStateTypeEntries(from, to);
@@ -68,7 +68,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<StateType>();
         for (int i = 0; i < 10; i++) {
             StateType obj = getNewTransientStateType(i);
@@ -78,7 +78,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/StateTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/StateTypeIntegrationTest.java
index 7765e5744..158e41dbb 100755
--- a/src/test/java/com/labsynch/labseer/domain/StateTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/StateTypeIntegrationTest.java
@@ -25,17 +25,17 @@ public class StateTypeIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     StateTypeDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountStateTypes() {
         Assert.assertNotNull("Data on demand for 'StateType' failed to initialize correctly", dod.getRandomStateType());
         long count = StateType.countStateTypes();
         Assert.assertTrue("Counter for 'StateType' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindStateType() {
         StateType obj = dod.getRandomStateType();
         Assert.assertNotNull("Data on demand for 'StateType' failed to initialize correctly", obj);
@@ -46,29 +46,33 @@ public void testFindStateType() {
         Assert.assertEquals("Find method for 'StateType' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllStateTypes() {
         Assert.assertNotNull("Data on demand for 'StateType' failed to initialize correctly", dod.getRandomStateType());
         long count = StateType.countStateTypes();
-        Assert.assertTrue("Too expensive to perform a find all test for 'StateType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'StateType', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<StateType> result = StateType.findAllStateTypes();
         Assert.assertNotNull("Find all method for 'StateType' illegally returned null", result);
         Assert.assertTrue("Find all method for 'StateType' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindStateTypeEntries() {
         Assert.assertNotNull("Data on demand for 'StateType' failed to initialize correctly", dod.getRandomStateType());
         long count = StateType.countStateTypes();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<StateType> result = StateType.findStateTypeEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'StateType' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'StateType' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'StateType' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         StateType obj = dod.getRandomStateType();
         Assert.assertNotNull("Data on demand for 'StateType' failed to initialize correctly", obj);
@@ -76,28 +80,31 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'StateType' failed to provide an identifier", id);
         obj = StateType.findStateType(id);
         Assert.assertNotNull("Find method for 'StateType' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyStateType(obj);
+        boolean modified = dod.modifyStateType(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'StateType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'StateType' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         StateType obj = dod.getRandomStateType();
         Assert.assertNotNull("Data on demand for 'StateType' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'StateType' failed to provide an identifier", id);
         obj = StateType.findStateType(id);
-        boolean modified =  dod.modifyStateType(obj);
+        boolean modified = dod.modifyStateType(obj);
         Integer currentVersion = obj.getVersion();
         StateType merged = obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'StateType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'StateType' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
         Assert.assertNotNull("Data on demand for 'StateType' failed to initialize correctly", dod.getRandomStateType());
         StateType obj = dod.getNewTransientStateType(Integer.MAX_VALUE);
@@ -109,7 +116,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +126,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'StateType' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         StateType obj = dod.getRandomStateType();
         Assert.assertNotNull("Data on demand for 'StateType' failed to initialize correctly", obj);
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/SubjectDataOnDemand.java
index b0eff0f8d..afac0b284 100755
--- a/src/test/java/com/labsynch/labseer/domain/SubjectDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/SubjectDataOnDemand.java
@@ -19,11 +19,11 @@
 @Configurable
 public class SubjectDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<Subject> data;
+    private List<Subject> data;
 
-	public Subject getNewTransientSubject(int index) {
+    public Subject getNewTransientSubject(int index) {
         Subject obj = new Subject();
         setCodeName(obj, index);
         setDeleted(obj, index);
@@ -39,7 +39,7 @@ public Subject getNewTransientSubject(int index) {
         return obj;
     }
 
-	public void setCodeName(Subject obj, int index) {
+    public void setCodeName(Subject obj, int index) {
         String codeName = "codeName_" + index;
         if (codeName.length() > 255) {
             codeName = new Random().nextInt(10) + codeName.substring(1, 255);
@@ -47,17 +47,17 @@ public void setCodeName(Subject obj, int index) {
         obj.setCodeName(codeName);
     }
 
-	public void setDeleted(Subject obj, int index) {
+    public void setDeleted(Subject obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setIgnored(Subject obj, int index) {
+    public void setIgnored(Subject obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setLsKind(Subject obj, int index) {
+    public void setLsKind(Subject obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -65,12 +65,12 @@ public void setLsKind(Subject obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsTransaction(Subject obj, int index) {
+    public void setLsTransaction(Subject obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(Subject obj, int index) {
+    public void setLsType(Subject obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 255) {
             lsType = lsType.substring(0, 255);
@@ -78,7 +78,7 @@ public void setLsType(Subject obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(Subject obj, int index) {
+    public void setLsTypeAndKind(Subject obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 255);
@@ -86,7 +86,7 @@ public void setLsTypeAndKind(Subject obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedBy(Subject obj, int index) {
+    public void setModifiedBy(Subject obj, int index) {
         String modifiedBy = "modifiedBy_" + index;
         if (modifiedBy.length() > 255) {
             modifiedBy = modifiedBy.substring(0, 255);
@@ -94,12 +94,15 @@ public void setModifiedBy(Subject obj, int index) {
         obj.setModifiedBy(modifiedBy);
     }
 
-	public void setModifiedDate(Subject obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(Subject obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setRecordedBy(Subject obj, int index) {
+    public void setRecordedBy(Subject obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -107,12 +110,15 @@ public void setRecordedBy(Subject obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(Subject obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(Subject obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public Subject getSpecificSubject(int index) {
+    public Subject getSpecificSubject(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -125,18 +131,18 @@ public Subject getSpecificSubject(int index) {
         return Subject.findSubject(id);
     }
 
-	public Subject getRandomSubject() {
+    public Subject getRandomSubject() {
         init();
         Subject obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return Subject.findSubject(id);
     }
 
-	public boolean modifySubject(Subject obj) {
+    public boolean modifySubject(Subject obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = Subject.findSubjectEntries(from, to);
@@ -146,7 +152,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<Subject>();
         for (int i = 0; i < 10; i++) {
             Subject obj = getNewTransientSubject(i);
@@ -156,7 +162,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/SubjectIntegrationTest.java
index b22c5476f..e41b12aa6 100755
--- a/src/test/java/com/labsynch/labseer/domain/SubjectIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/SubjectIntegrationTest.java
@@ -25,17 +25,17 @@ public class SubjectIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     SubjectDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountSubjects() {
         Assert.assertNotNull("Data on demand for 'Subject' failed to initialize correctly", dod.getRandomSubject());
         long count = Subject.countSubjects();
         Assert.assertTrue("Counter for 'Subject' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindSubject() {
         Subject obj = dod.getRandomSubject();
         Assert.assertNotNull("Data on demand for 'Subject' failed to initialize correctly", obj);
@@ -46,29 +46,33 @@ public void testFindSubject() {
         Assert.assertEquals("Find method for 'Subject' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllSubjects() {
         Assert.assertNotNull("Data on demand for 'Subject' failed to initialize correctly", dod.getRandomSubject());
         long count = Subject.countSubjects();
-        Assert.assertTrue("Too expensive to perform a find all test for 'Subject', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'Subject', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<Subject> result = Subject.findAllSubjects();
         Assert.assertNotNull("Find all method for 'Subject' illegally returned null", result);
         Assert.assertTrue("Find all method for 'Subject' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindSubjectEntries() {
         Assert.assertNotNull("Data on demand for 'Subject' failed to initialize correctly", dod.getRandomSubject());
         long count = Subject.countSubjects();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<Subject> result = Subject.findSubjectEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'Subject' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'Subject' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'Subject' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         Subject obj = dod.getRandomSubject();
         Assert.assertNotNull("Data on demand for 'Subject' failed to initialize correctly", obj);
@@ -76,28 +80,31 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'Subject' failed to provide an identifier", id);
         obj = Subject.findSubject(id);
         Assert.assertNotNull("Find method for 'Subject' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifySubject(obj);
+        boolean modified = dod.modifySubject(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'Subject' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'Subject' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         Subject obj = dod.getRandomSubject();
         Assert.assertNotNull("Data on demand for 'Subject' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'Subject' failed to provide an identifier", id);
         obj = Subject.findSubject(id);
-        boolean modified =  dod.modifySubject(obj);
+        boolean modified = dod.modifySubject(obj);
         Integer currentVersion = obj.getVersion();
-        Subject merged = (Subject)obj.merge();
+        Subject merged = (Subject) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'Subject' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'Subject' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
         Assert.assertNotNull("Data on demand for 'Subject' failed to initialize correctly", dod.getRandomSubject());
         Subject obj = dod.getNewTransientSubject(Integer.MAX_VALUE);
@@ -109,7 +116,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +126,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'Subject' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         Subject obj = dod.getRandomSubject();
         Assert.assertNotNull("Data on demand for 'Subject' failed to initialize correctly", obj);
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/SubjectStateDataOnDemand.java
index a6f36c9dd..6f4d8dba0 100755
--- a/src/test/java/com/labsynch/labseer/domain/SubjectStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/SubjectStateDataOnDemand.java
@@ -20,14 +20,14 @@
 @Configurable
 public class SubjectStateDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<SubjectState> data;
+    private List<SubjectState> data;
 
-	@Autowired
+    @Autowired
     SubjectDataOnDemand subjectDataOnDemand;
 
-	public SubjectState getNewTransientSubjectState(int index) {
+    public SubjectState getNewTransientSubjectState(int index) {
         SubjectState obj = new SubjectState();
         setComments(obj, index);
         setDeleted(obj, index);
@@ -44,7 +44,7 @@ public SubjectState getNewTransientSubjectState(int index) {
         return obj;
     }
 
-	public void setComments(SubjectState obj, int index) {
+    public void setComments(SubjectState obj, int index) {
         String comments = "comments_" + index;
         if (comments.length() > 512) {
             comments = comments.substring(0, 512);
@@ -52,17 +52,17 @@ public void setComments(SubjectState obj, int index) {
         obj.setComments(comments);
     }
 
-	public void setDeleted(SubjectState obj, int index) {
+    public void setDeleted(SubjectState obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setIgnored(SubjectState obj, int index) {
+    public void setIgnored(SubjectState obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setLsKind(SubjectState obj, int index) {
+    public void setLsKind(SubjectState obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -70,12 +70,12 @@ public void setLsKind(SubjectState obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsTransaction(SubjectState obj, int index) {
+    public void setLsTransaction(SubjectState obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(SubjectState obj, int index) {
+    public void setLsType(SubjectState obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 64) {
             lsType = lsType.substring(0, 64);
@@ -83,7 +83,7 @@ public void setLsType(SubjectState obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(SubjectState obj, int index) {
+    public void setLsTypeAndKind(SubjectState obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 255);
@@ -91,7 +91,7 @@ public void setLsTypeAndKind(SubjectState obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedBy(SubjectState obj, int index) {
+    public void setModifiedBy(SubjectState obj, int index) {
         String modifiedBy = "modifiedBy_" + index;
         if (modifiedBy.length() > 255) {
             modifiedBy = modifiedBy.substring(0, 255);
@@ -99,12 +99,15 @@ public void setModifiedBy(SubjectState obj, int index) {
         obj.setModifiedBy(modifiedBy);
     }
 
-	public void setModifiedDate(SubjectState obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(SubjectState obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setRecordedBy(SubjectState obj, int index) {
+    public void setRecordedBy(SubjectState obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -112,17 +115,20 @@ public void setRecordedBy(SubjectState obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(SubjectState obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(SubjectState obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public void setSubject(SubjectState obj, int index) {
+    public void setSubject(SubjectState obj, int index) {
         Subject subject = subjectDataOnDemand.getRandomSubject();
         obj.setSubject(subject);
     }
 
-	public SubjectState getSpecificSubjectState(int index) {
+    public SubjectState getSpecificSubjectState(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -135,18 +141,18 @@ public SubjectState getSpecificSubjectState(int index) {
         return SubjectState.findSubjectState(id);
     }
 
-	public SubjectState getRandomSubjectState() {
+    public SubjectState getRandomSubjectState() {
         init();
         SubjectState obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return SubjectState.findSubjectState(id);
     }
 
-	public boolean modifySubjectState(SubjectState obj) {
+    public boolean modifySubjectState(SubjectState obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = SubjectState.findSubjectStateEntries(from, to);
@@ -156,7 +162,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<SubjectState>();
         for (int i = 0; i < 10; i++) {
             SubjectState obj = getNewTransientSubjectState(i);
@@ -166,7 +172,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/SubjectStateIntegrationTest.java
index 52f0da078..b77e32b28 100755
--- a/src/test/java/com/labsynch/labseer/domain/SubjectStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/SubjectStateIntegrationTest.java
@@ -25,17 +25,18 @@ public class SubjectStateIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     SubjectStateDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountSubjectStates() {
-        Assert.assertNotNull("Data on demand for 'SubjectState' failed to initialize correctly", dod.getRandomSubjectState());
+        Assert.assertNotNull("Data on demand for 'SubjectState' failed to initialize correctly",
+                dod.getRandomSubjectState());
         long count = SubjectState.countSubjectStates();
         Assert.assertTrue("Counter for 'SubjectState' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindSubjectState() {
         SubjectState obj = dod.getRandomSubjectState();
         Assert.assertNotNull("Data on demand for 'SubjectState' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindSubjectState() {
         Assert.assertEquals("Find method for 'SubjectState' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllSubjectStates() {
-        Assert.assertNotNull("Data on demand for 'SubjectState' failed to initialize correctly", dod.getRandomSubjectState());
+        Assert.assertNotNull("Data on demand for 'SubjectState' failed to initialize correctly",
+                dod.getRandomSubjectState());
         long count = SubjectState.countSubjectStates();
-        Assert.assertTrue("Too expensive to perform a find all test for 'SubjectState', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'SubjectState', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<SubjectState> result = SubjectState.findAllSubjectStates();
         Assert.assertNotNull("Find all method for 'SubjectState' illegally returned null", result);
         Assert.assertTrue("Find all method for 'SubjectState' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindSubjectStateEntries() {
-        Assert.assertNotNull("Data on demand for 'SubjectState' failed to initialize correctly", dod.getRandomSubjectState());
+        Assert.assertNotNull("Data on demand for 'SubjectState' failed to initialize correctly",
+                dod.getRandomSubjectState());
         long count = SubjectState.countSubjectStates();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<SubjectState> result = SubjectState.findSubjectStateEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'SubjectState' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'SubjectState' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'SubjectState' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         SubjectState obj = dod.getRandomSubjectState();
         Assert.assertNotNull("Data on demand for 'SubjectState' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'SubjectState' failed to provide an identifier", id);
         obj = SubjectState.findSubjectState(id);
         Assert.assertNotNull("Find method for 'SubjectState' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifySubjectState(obj);
+        boolean modified = dod.modifySubjectState(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'SubjectState' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'SubjectState' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         SubjectState obj = dod.getRandomSubjectState();
         Assert.assertNotNull("Data on demand for 'SubjectState' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'SubjectState' failed to provide an identifier", id);
         obj = SubjectState.findSubjectState(id);
-        boolean modified =  dod.modifySubjectState(obj);
+        boolean modified = dod.modifySubjectState(obj);
         Integer currentVersion = obj.getVersion();
-        SubjectState merged = (SubjectState)obj.merge();
+        SubjectState merged = (SubjectState) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'SubjectState' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'SubjectState' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'SubjectState' failed to initialize correctly", dod.getRandomSubjectState());
+        Assert.assertNotNull("Data on demand for 'SubjectState' failed to initialize correctly",
+                dod.getRandomSubjectState());
         SubjectState obj = dod.getNewTransientSubjectState(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'SubjectState' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'SubjectState' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'SubjectState' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         SubjectState obj = dod.getRandomSubjectState();
         Assert.assertNotNull("Data on demand for 'SubjectState' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = SubjectState.findSubjectState(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'SubjectState' with identifier '" + id + "'", SubjectState.findSubjectState(id));
+        Assert.assertNull("Failed to remove 'SubjectState' with identifier '" + id + "'",
+                SubjectState.findSubjectState(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/SubjectValueDataOnDemand.java
index 058af569f..4cc77d9f4 100755
--- a/src/test/java/com/labsynch/labseer/domain/SubjectValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/SubjectValueDataOnDemand.java
@@ -21,14 +21,14 @@
 @Component
 public class SubjectValueDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<SubjectValue> data;
+    private List<SubjectValue> data;
 
-	@Autowired
+    @Autowired
     SubjectStateDataOnDemand subjectStateDataOnDemand;
 
-	public SubjectValue getNewTransientSubjectValue(int index) {
+    public SubjectValue getNewTransientSubjectValue(int index) {
         SubjectValue obj = new SubjectValue();
         setBlobValue(obj, index);
         setClobValue(obj, index);
@@ -70,17 +70,17 @@ public SubjectValue getNewTransientSubjectValue(int index) {
         return obj;
     }
 
-	public void setBlobValue(SubjectValue obj, int index) {
+    public void setBlobValue(SubjectValue obj, int index) {
         byte[] blobValue = String.valueOf(index).getBytes();
         obj.setBlobValue(blobValue);
     }
 
-	public void setClobValue(SubjectValue obj, int index) {
+    public void setClobValue(SubjectValue obj, int index) {
         String clobValue = "clobValue_" + index;
         obj.setClobValue(clobValue);
     }
 
-	public void setCodeKind(SubjectValue obj, int index) {
+    public void setCodeKind(SubjectValue obj, int index) {
         String codeKind = "codeKind_" + index;
         if (codeKind.length() > 255) {
             codeKind = codeKind.substring(0, 255);
@@ -88,7 +88,7 @@ public void setCodeKind(SubjectValue obj, int index) {
         obj.setCodeKind(codeKind);
     }
 
-	public void setCodeOrigin(SubjectValue obj, int index) {
+    public void setCodeOrigin(SubjectValue obj, int index) {
         String codeOrigin = "codeOrigin_" + index;
         if (codeOrigin.length() > 255) {
             codeOrigin = codeOrigin.substring(0, 255);
@@ -96,7 +96,7 @@ public void setCodeOrigin(SubjectValue obj, int index) {
         obj.setCodeOrigin(codeOrigin);
     }
 
-	public void setCodeType(SubjectValue obj, int index) {
+    public void setCodeType(SubjectValue obj, int index) {
         String codeType = "codeType_" + index;
         if (codeType.length() > 255) {
             codeType = codeType.substring(0, 255);
@@ -104,7 +104,7 @@ public void setCodeType(SubjectValue obj, int index) {
         obj.setCodeType(codeType);
     }
 
-	public void setCodeTypeAndKind(SubjectValue obj, int index) {
+    public void setCodeTypeAndKind(SubjectValue obj, int index) {
         String codeTypeAndKind = "codeTypeAndKind_" + index;
         if (codeTypeAndKind.length() > 350) {
             codeTypeAndKind = codeTypeAndKind.substring(0, 350);
@@ -112,7 +112,7 @@ public void setCodeTypeAndKind(SubjectValue obj, int index) {
         obj.setCodeTypeAndKind(codeTypeAndKind);
     }
 
-	public void setCodeValue(SubjectValue obj, int index) {
+    public void setCodeValue(SubjectValue obj, int index) {
         String codeValue = "codeValue_" + index;
         if (codeValue.length() > 255) {
             codeValue = codeValue.substring(0, 255);
@@ -120,7 +120,7 @@ public void setCodeValue(SubjectValue obj, int index) {
         obj.setCodeValue(codeValue);
     }
 
-	public void setComments(SubjectValue obj, int index) {
+    public void setComments(SubjectValue obj, int index) {
         String comments = "comments_" + index;
         if (comments.length() > 512) {
             comments = comments.substring(0, 512);
@@ -128,7 +128,7 @@ public void setComments(SubjectValue obj, int index) {
         obj.setComments(comments);
     }
 
-	public void setConcUnit(SubjectValue obj, int index) {
+    public void setConcUnit(SubjectValue obj, int index) {
         String concUnit = "concUnit_" + index;
         if (concUnit.length() > 25) {
             concUnit = concUnit.substring(0, 25);
@@ -136,22 +136,25 @@ public void setConcUnit(SubjectValue obj, int index) {
         obj.setConcUnit(concUnit);
     }
 
-	public void setConcentration(SubjectValue obj, int index) {
+    public void setConcentration(SubjectValue obj, int index) {
         Double concentration = new Integer(index).doubleValue();
         obj.setConcentration(concentration);
     }
 
-	public void setDateValue(SubjectValue obj, int index) {
-        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setDateValue(SubjectValue obj, int index) {
+        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setDateValue(dateValue);
     }
 
-	public void setDeleted(SubjectValue obj, int index) {
+    public void setDeleted(SubjectValue obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setFileValue(SubjectValue obj, int index) {
+    public void setFileValue(SubjectValue obj, int index) {
         String fileValue = "fileValue_" + index;
         if (fileValue.length() > 512) {
             fileValue = fileValue.substring(0, 512);
@@ -159,12 +162,12 @@ public void setFileValue(SubjectValue obj, int index) {
         obj.setFileValue(fileValue);
     }
 
-	public void setIgnored(SubjectValue obj, int index) {
+    public void setIgnored(SubjectValue obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setLsKind(SubjectValue obj, int index) {
+    public void setLsKind(SubjectValue obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -172,17 +175,17 @@ public void setLsKind(SubjectValue obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsState(SubjectValue obj, int index) {
+    public void setLsState(SubjectValue obj, int index) {
         SubjectState lsState = subjectStateDataOnDemand.getRandomSubjectState();
         obj.setLsState(lsState);
     }
 
-	public void setLsTransaction(SubjectValue obj, int index) {
+    public void setLsTransaction(SubjectValue obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(SubjectValue obj, int index) {
+    public void setLsType(SubjectValue obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 64) {
             lsType = lsType.substring(0, 64);
@@ -190,7 +193,7 @@ public void setLsType(SubjectValue obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(SubjectValue obj, int index) {
+    public void setLsTypeAndKind(SubjectValue obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 350) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 350);
@@ -198,7 +201,7 @@ public void setLsTypeAndKind(SubjectValue obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedBy(SubjectValue obj, int index) {
+    public void setModifiedBy(SubjectValue obj, int index) {
         String modifiedBy = "modifiedBy_" + index;
         if (modifiedBy.length() > 255) {
             modifiedBy = modifiedBy.substring(0, 255);
@@ -206,17 +209,20 @@ public void setModifiedBy(SubjectValue obj, int index) {
         obj.setModifiedBy(modifiedBy);
     }
 
-	public void setModifiedDate(SubjectValue obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(SubjectValue obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setNumberOfReplicates(SubjectValue obj, int index) {
+    public void setNumberOfReplicates(SubjectValue obj, int index) {
         Integer numberOfReplicates = new Integer(index);
         obj.setNumberOfReplicates(numberOfReplicates);
     }
 
-	public void setNumericValue(SubjectValue obj, int index) {
+    public void setNumericValue(SubjectValue obj, int index) {
         BigDecimal numericValue = BigDecimal.valueOf(index);
         if (numericValue.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
             numericValue = new BigDecimal("99999999999999999999.999999999999999999");
@@ -224,7 +230,7 @@ public void setNumericValue(SubjectValue obj, int index) {
         obj.setNumericValue(numericValue);
     }
 
-	public void setOperatorKind(SubjectValue obj, int index) {
+    public void setOperatorKind(SubjectValue obj, int index) {
         String operatorKind = "operator_" + index;
         if (operatorKind.length() > 10) {
             operatorKind = operatorKind.substring(0, 10);
@@ -232,7 +238,7 @@ public void setOperatorKind(SubjectValue obj, int index) {
         obj.setOperatorKind(operatorKind);
     }
 
-	public void setOperatorType(SubjectValue obj, int index) {
+    public void setOperatorType(SubjectValue obj, int index) {
         String operatorType = "operatorType_" + index;
         if (operatorType.length() > 25) {
             operatorType = operatorType.substring(0, 25);
@@ -240,7 +246,7 @@ public void setOperatorType(SubjectValue obj, int index) {
         obj.setOperatorType(operatorType);
     }
 
-	public void setOperatorTypeAndKind(SubjectValue obj, int index) {
+    public void setOperatorTypeAndKind(SubjectValue obj, int index) {
         String operatorTypeAndKind = "operatorTypeAndKind_" + index;
         if (operatorTypeAndKind.length() > 50) {
             operatorTypeAndKind = operatorTypeAndKind.substring(0, 50);
@@ -248,12 +254,12 @@ public void setOperatorTypeAndKind(SubjectValue obj, int index) {
         obj.setOperatorTypeAndKind(operatorTypeAndKind);
     }
 
-	public void setPublicData(SubjectValue obj, int index) {
+    public void setPublicData(SubjectValue obj, int index) {
         Boolean publicData = true;
         obj.setPublicData(publicData);
     }
 
-	public void setRecordedBy(SubjectValue obj, int index) {
+    public void setRecordedBy(SubjectValue obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -261,17 +267,20 @@ public void setRecordedBy(SubjectValue obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(SubjectValue obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(SubjectValue obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public void setSigFigs(SubjectValue obj, int index) {
+    public void setSigFigs(SubjectValue obj, int index) {
         Integer sigFigs = new Integer(index);
         obj.setSigFigs(sigFigs);
     }
 
-	public void setStringValue(SubjectValue obj, int index) {
+    public void setStringValue(SubjectValue obj, int index) {
         String stringValue = "stringValue_" + index;
         if (stringValue.length() > 255) {
             stringValue = stringValue.substring(0, 255);
@@ -279,7 +288,7 @@ public void setStringValue(SubjectValue obj, int index) {
         obj.setStringValue(stringValue);
     }
 
-	public void setUncertainty(SubjectValue obj, int index) {
+    public void setUncertainty(SubjectValue obj, int index) {
         BigDecimal uncertainty = BigDecimal.valueOf(index);
         if (uncertainty.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
             uncertainty = new BigDecimal("99999999999999999999.999999999999999999");
@@ -287,7 +296,7 @@ public void setUncertainty(SubjectValue obj, int index) {
         obj.setUncertainty(uncertainty);
     }
 
-	public void setUncertaintyType(SubjectValue obj, int index) {
+    public void setUncertaintyType(SubjectValue obj, int index) {
         String uncertaintyType = "uncertaintyType_" + index;
         if (uncertaintyType.length() > 255) {
             uncertaintyType = uncertaintyType.substring(0, 255);
@@ -295,7 +304,7 @@ public void setUncertaintyType(SubjectValue obj, int index) {
         obj.setUncertaintyType(uncertaintyType);
     }
 
-	public void setUnitKind(SubjectValue obj, int index) {
+    public void setUnitKind(SubjectValue obj, int index) {
         String unitKind = "unitKind_" + index;
         if (unitKind.length() > 25) {
             unitKind = unitKind.substring(0, 25);
@@ -303,7 +312,7 @@ public void setUnitKind(SubjectValue obj, int index) {
         obj.setUnitKind(unitKind);
     }
 
-	public void setUnitType(SubjectValue obj, int index) {
+    public void setUnitType(SubjectValue obj, int index) {
         String unitType = "unitType_" + index;
         if (unitType.length() > 25) {
             unitType = unitType.substring(0, 25);
@@ -311,7 +320,7 @@ public void setUnitType(SubjectValue obj, int index) {
         obj.setUnitType(unitType);
     }
 
-	public void setUnitTypeAndKind(SubjectValue obj, int index) {
+    public void setUnitTypeAndKind(SubjectValue obj, int index) {
         String unitTypeAndKind = "unitTypeAndKind_" + index;
         if (unitTypeAndKind.length() > 55) {
             unitTypeAndKind = unitTypeAndKind.substring(0, 55);
@@ -319,7 +328,7 @@ public void setUnitTypeAndKind(SubjectValue obj, int index) {
         obj.setUnitTypeAndKind(unitTypeAndKind);
     }
 
-	public void setUrlValue(SubjectValue obj, int index) {
+    public void setUrlValue(SubjectValue obj, int index) {
         String urlValue = "urlValue_" + index;
         if (urlValue.length() > 2000) {
             urlValue = urlValue.substring(0, 2000);
@@ -327,7 +336,7 @@ public void setUrlValue(SubjectValue obj, int index) {
         obj.setUrlValue(urlValue);
     }
 
-	public SubjectValue getSpecificSubjectValue(int index) {
+    public SubjectValue getSpecificSubjectValue(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -340,18 +349,18 @@ public SubjectValue getSpecificSubjectValue(int index) {
         return SubjectValue.findSubjectValue(id);
     }
 
-	public SubjectValue getRandomSubjectValue() {
+    public SubjectValue getRandomSubjectValue() {
         init();
         SubjectValue obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return SubjectValue.findSubjectValue(id);
     }
 
-	public boolean modifySubjectValue(SubjectValue obj) {
+    public boolean modifySubjectValue(SubjectValue obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = SubjectValue.findSubjectValueEntries(from, to);
@@ -361,7 +370,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<SubjectValue>();
         for (int i = 0; i < 10; i++) {
             SubjectValue obj = getNewTransientSubjectValue(i);
@@ -371,7 +380,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/SubjectValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/SubjectValueIntegrationTest.java
index 08c1bb1da..e8d588340 100755
--- a/src/test/java/com/labsynch/labseer/domain/SubjectValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/SubjectValueIntegrationTest.java
@@ -25,17 +25,18 @@ public class SubjectValueIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     SubjectValueDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountSubjectValues() {
-        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to initialize correctly", dod.getRandomSubjectValue());
+        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to initialize correctly",
+                dod.getRandomSubjectValue());
         long count = SubjectValue.countSubjectValues();
         Assert.assertTrue("Counter for 'SubjectValue' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindSubjectValue() {
         SubjectValue obj = dod.getRandomSubjectValue();
         Assert.assertNotNull("Data on demand for 'SubjectValue' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindSubjectValue() {
         Assert.assertEquals("Find method for 'SubjectValue' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllSubjectValues() {
-        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to initialize correctly", dod.getRandomSubjectValue());
+        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to initialize correctly",
+                dod.getRandomSubjectValue());
         long count = SubjectValue.countSubjectValues();
-        Assert.assertTrue("Too expensive to perform a find all test for 'SubjectValue', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'SubjectValue', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<SubjectValue> result = SubjectValue.findAllSubjectValues();
         Assert.assertNotNull("Find all method for 'SubjectValue' illegally returned null", result);
         Assert.assertTrue("Find all method for 'SubjectValue' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindSubjectValueEntries() {
-        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to initialize correctly", dod.getRandomSubjectValue());
+        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to initialize correctly",
+                dod.getRandomSubjectValue());
         long count = SubjectValue.countSubjectValues();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<SubjectValue> result = SubjectValue.findSubjectValueEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'SubjectValue' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'SubjectValue' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'SubjectValue' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         SubjectValue obj = dod.getRandomSubjectValue();
         Assert.assertNotNull("Data on demand for 'SubjectValue' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'SubjectValue' failed to provide an identifier", id);
         obj = SubjectValue.findSubjectValue(id);
         Assert.assertNotNull("Find method for 'SubjectValue' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifySubjectValue(obj);
+        boolean modified = dod.modifySubjectValue(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'SubjectValue' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'SubjectValue' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         SubjectValue obj = dod.getRandomSubjectValue();
         Assert.assertNotNull("Data on demand for 'SubjectValue' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'SubjectValue' failed to provide an identifier", id);
         obj = SubjectValue.findSubjectValue(id);
-        boolean modified =  dod.modifySubjectValue(obj);
+        boolean modified = dod.modifySubjectValue(obj);
         Integer currentVersion = obj.getVersion();
-        SubjectValue merged = (SubjectValue)obj.merge();
+        SubjectValue merged = (SubjectValue) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'SubjectValue' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'SubjectValue' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to initialize correctly", dod.getRandomSubjectValue());
+        Assert.assertNotNull("Data on demand for 'SubjectValue' failed to initialize correctly",
+                dod.getRandomSubjectValue());
         SubjectValue obj = dod.getNewTransientSubjectValue(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'SubjectValue' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'SubjectValue' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'SubjectValue' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         SubjectValue obj = dod.getRandomSubjectValue();
         Assert.assertNotNull("Data on demand for 'SubjectValue' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = SubjectValue.findSubjectValue(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'SubjectValue' with identifier '" + id + "'", SubjectValue.findSubjectValue(id));
+        Assert.assertNull("Failed to remove 'SubjectValue' with identifier '" + id + "'",
+                SubjectValue.findSubjectValue(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ThingKindDataOnDemand.java
index 70761e0ec..d3091f00f 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingKindDataOnDemand.java
@@ -17,14 +17,14 @@
 @Component
 public class ThingKindDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<ThingKind> data;
+    private List<ThingKind> data;
 
-	@Autowired
+    @Autowired
     ThingTypeDataOnDemand thingTypeDataOnDemand;
 
-	public ThingKind getNewTransientThingKind(int index) {
+    public ThingKind getNewTransientThingKind(int index) {
         ThingKind obj = new ThingKind();
         setKindName(obj, index);
         setLsType(obj, index);
@@ -32,7 +32,7 @@ public ThingKind getNewTransientThingKind(int index) {
         return obj;
     }
 
-	public void setKindName(ThingKind obj, int index) {
+    public void setKindName(ThingKind obj, int index) {
         String kindName = "kindName_" + index;
         if (kindName.length() > 255) {
             kindName = kindName.substring(0, 255);
@@ -40,12 +40,12 @@ public void setKindName(ThingKind obj, int index) {
         obj.setKindName(kindName);
     }
 
-	public void setLsType(ThingKind obj, int index) {
+    public void setLsType(ThingKind obj, int index) {
         ThingType lsType = thingTypeDataOnDemand.getRandomThingType();
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(ThingKind obj, int index) {
+    public void setLsTypeAndKind(ThingKind obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = new Random().nextInt(10) + lsTypeAndKind.substring(1, 255);
@@ -53,7 +53,7 @@ public void setLsTypeAndKind(ThingKind obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public ThingKind getSpecificThingKind(int index) {
+    public ThingKind getSpecificThingKind(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -66,18 +66,18 @@ public ThingKind getSpecificThingKind(int index) {
         return ThingKind.findThingKind(id);
     }
 
-	public ThingKind getRandomThingKind() {
+    public ThingKind getRandomThingKind() {
         init();
         ThingKind obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return ThingKind.findThingKind(id);
     }
 
-	public boolean modifyThingKind(ThingKind obj) {
+    public boolean modifyThingKind(ThingKind obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = ThingKind.findThingKindEntries(from, to);
@@ -87,7 +87,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<ThingKind>();
         for (int i = 0; i < 10; i++) {
             ThingKind obj = getNewTransientThingKind(i);
@@ -97,7 +97,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ThingKindIntegrationTest.java
index 5b466f3b0..929176b56 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingKindIntegrationTest.java
@@ -25,17 +25,17 @@ public class ThingKindIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ThingKindDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountThingKinds() {
         Assert.assertNotNull("Data on demand for 'ThingKind' failed to initialize correctly", dod.getRandomThingKind());
         long count = ThingKind.countThingKinds();
         Assert.assertTrue("Counter for 'ThingKind' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindThingKind() {
         ThingKind obj = dod.getRandomThingKind();
         Assert.assertNotNull("Data on demand for 'ThingKind' failed to initialize correctly", obj);
@@ -46,29 +46,33 @@ public void testFindThingKind() {
         Assert.assertEquals("Find method for 'ThingKind' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllThingKinds() {
         Assert.assertNotNull("Data on demand for 'ThingKind' failed to initialize correctly", dod.getRandomThingKind());
         long count = ThingKind.countThingKinds();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ThingKind', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'ThingKind', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<ThingKind> result = ThingKind.findAllThingKinds();
         Assert.assertNotNull("Find all method for 'ThingKind' illegally returned null", result);
         Assert.assertTrue("Find all method for 'ThingKind' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindThingKindEntries() {
         Assert.assertNotNull("Data on demand for 'ThingKind' failed to initialize correctly", dod.getRandomThingKind());
         long count = ThingKind.countThingKinds();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<ThingKind> result = ThingKind.findThingKindEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'ThingKind' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ThingKind' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'ThingKind' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         ThingKind obj = dod.getRandomThingKind();
         Assert.assertNotNull("Data on demand for 'ThingKind' failed to initialize correctly", obj);
@@ -76,28 +80,31 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'ThingKind' failed to provide an identifier", id);
         obj = ThingKind.findThingKind(id);
         Assert.assertNotNull("Find method for 'ThingKind' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyThingKind(obj);
+        boolean modified = dod.modifyThingKind(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'ThingKind' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'ThingKind' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         ThingKind obj = dod.getRandomThingKind();
         Assert.assertNotNull("Data on demand for 'ThingKind' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ThingKind' failed to provide an identifier", id);
         obj = ThingKind.findThingKind(id);
-        boolean modified =  dod.modifyThingKind(obj);
+        boolean modified = dod.modifyThingKind(obj);
         Integer currentVersion = obj.getVersion();
         ThingKind merged = obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ThingKind' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'ThingKind' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
         Assert.assertNotNull("Data on demand for 'ThingKind' failed to initialize correctly", dod.getRandomThingKind());
         ThingKind obj = dod.getNewTransientThingKind(Integer.MAX_VALUE);
@@ -109,7 +116,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +126,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'ThingKind' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         ThingKind obj = dod.getRandomThingKind();
         Assert.assertNotNull("Data on demand for 'ThingKind' failed to initialize correctly", obj);
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveDataOnDemand.java
index 2eecfc49d..077282ff5 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveDataOnDemand.java
@@ -19,11 +19,11 @@
 @Component
 public class ThingPageArchiveDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<ThingPageArchive> data;
+    private List<ThingPageArchive> data;
 
-	public ThingPageArchive getNewTransientThingPageArchive(int index) {
+    public ThingPageArchive getNewTransientThingPageArchive(int index) {
         ThingPageArchive obj = new ThingPageArchive();
         setArchived(obj, index);
         setCurrentEditor(obj, index);
@@ -40,12 +40,12 @@ public ThingPageArchive getNewTransientThingPageArchive(int index) {
         return obj;
     }
 
-	public void setArchived(ThingPageArchive obj, int index) {
+    public void setArchived(ThingPageArchive obj, int index) {
         Boolean archived = true;
         obj.setArchived(archived);
     }
 
-	public void setCurrentEditor(ThingPageArchive obj, int index) {
+    public void setCurrentEditor(ThingPageArchive obj, int index) {
         String currentEditor = "currentEditor_" + index;
         if (currentEditor.length() > 255) {
             currentEditor = currentEditor.substring(0, 255);
@@ -53,17 +53,17 @@ public void setCurrentEditor(ThingPageArchive obj, int index) {
         obj.setCurrentEditor(currentEditor);
     }
 
-	public void setIgnored(ThingPageArchive obj, int index) {
+    public void setIgnored(ThingPageArchive obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setLsTransaction(ThingPageArchive obj, int index) {
+    public void setLsTransaction(ThingPageArchive obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setModifiedBy(ThingPageArchive obj, int index) {
+    public void setModifiedBy(ThingPageArchive obj, int index) {
         String modifiedBy = "modifiedBy_" + index;
         if (modifiedBy.length() > 255) {
             modifiedBy = modifiedBy.substring(0, 255);
@@ -71,17 +71,20 @@ public void setModifiedBy(ThingPageArchive obj, int index) {
         obj.setModifiedBy(modifiedBy);
     }
 
-	public void setModifiedDate(ThingPageArchive obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(ThingPageArchive obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setPageContent(ThingPageArchive obj, int index) {
+    public void setPageContent(ThingPageArchive obj, int index) {
         String pageContent = "pageContent_" + index;
         obj.setPageContent(pageContent);
     }
 
-	public void setPageName(ThingPageArchive obj, int index) {
+    public void setPageName(ThingPageArchive obj, int index) {
         String pageName = "pageName_" + index;
         if (pageName.length() > 255) {
             pageName = pageName.substring(0, 255);
@@ -89,12 +92,12 @@ public void setPageName(ThingPageArchive obj, int index) {
         obj.setPageName(pageName);
     }
 
-	public void setPageVersion(ThingPageArchive obj, int index) {
+    public void setPageVersion(ThingPageArchive obj, int index) {
         Integer pageVersion = new Integer(index);
         obj.setPageVersion(pageVersion);
     }
 
-	public void setRecordedBy(ThingPageArchive obj, int index) {
+    public void setRecordedBy(ThingPageArchive obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -102,17 +105,20 @@ public void setRecordedBy(ThingPageArchive obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(ThingPageArchive obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(ThingPageArchive obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public void setThing(ThingPageArchive obj, int index) {
+    public void setThing(ThingPageArchive obj, int index) {
         Long thing = new Integer(index).longValue();
         obj.setThing(thing);
     }
 
-	public ThingPageArchive getSpecificThingPageArchive(int index) {
+    public ThingPageArchive getSpecificThingPageArchive(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -125,28 +131,29 @@ public ThingPageArchive getSpecificThingPageArchive(int index) {
         return ThingPageArchive.findThingPageArchive(id);
     }
 
-	public ThingPageArchive getRandomThingPageArchive() {
+    public ThingPageArchive getRandomThingPageArchive() {
         init();
         ThingPageArchive obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return ThingPageArchive.findThingPageArchive(id);
     }
 
-	public boolean modifyThingPageArchive(ThingPageArchive obj) {
+    public boolean modifyThingPageArchive(ThingPageArchive obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = ThingPageArchive.findThingPageArchiveEntries(from, to);
         if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'ThingPageArchive' illegally returned null");
+            throw new IllegalStateException(
+                    "Find entries implementation for 'ThingPageArchive' illegally returned null");
         }
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<ThingPageArchive>();
         for (int i = 0; i < 10; i++) {
             ThingPageArchive obj = getNewTransientThingPageArchive(i);
@@ -156,7 +163,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveIntegrationTest.java
index d2b5cddb8..5e1d002b4 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingPageArchiveIntegrationTest.java
@@ -25,17 +25,18 @@ public class ThingPageArchiveIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ThingPageArchiveDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountThingPageArchives() {
-        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to initialize correctly", dod.getRandomThingPageArchive());
+        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to initialize correctly",
+                dod.getRandomThingPageArchive());
         long count = ThingPageArchive.countThingPageArchives();
         Assert.assertTrue("Counter for 'ThingPageArchive' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindThingPageArchive() {
         ThingPageArchive obj = dod.getRandomThingPageArchive();
         Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindThingPageArchive() {
         Assert.assertEquals("Find method for 'ThingPageArchive' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllThingPageArchives() {
-        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to initialize correctly", dod.getRandomThingPageArchive());
+        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to initialize correctly",
+                dod.getRandomThingPageArchive());
         long count = ThingPageArchive.countThingPageArchives();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ThingPageArchive', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'ThingPageArchive', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<ThingPageArchive> result = ThingPageArchive.findAllThingPageArchives();
         Assert.assertNotNull("Find all method for 'ThingPageArchive' illegally returned null", result);
         Assert.assertTrue("Find all method for 'ThingPageArchive' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindThingPageArchiveEntries() {
-        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to initialize correctly", dod.getRandomThingPageArchive());
+        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to initialize correctly",
+                dod.getRandomThingPageArchive());
         long count = ThingPageArchive.countThingPageArchives();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<ThingPageArchive> result = ThingPageArchive.findThingPageArchiveEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'ThingPageArchive' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ThingPageArchive' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'ThingPageArchive' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         ThingPageArchive obj = dod.getRandomThingPageArchive();
         Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to provide an identifier", id);
         obj = ThingPageArchive.findThingPageArchive(id);
         Assert.assertNotNull("Find method for 'ThingPageArchive' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyThingPageArchive(obj);
+        boolean modified = dod.modifyThingPageArchive(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'ThingPageArchive' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'ThingPageArchive' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         ThingPageArchive obj = dod.getRandomThingPageArchive();
         Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to provide an identifier", id);
         obj = ThingPageArchive.findThingPageArchive(id);
-        boolean modified =  dod.modifyThingPageArchive(obj);
+        boolean modified = dod.modifyThingPageArchive(obj);
         Integer currentVersion = obj.getVersion();
         ThingPageArchive merged = obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ThingPageArchive' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'ThingPageArchive' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to initialize correctly", dod.getRandomThingPageArchive());
+        Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to initialize correctly",
+                dod.getRandomThingPageArchive());
         ThingPageArchive obj = dod.getNewTransientThingPageArchive(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'ThingPageArchive' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'ThingPageArchive' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         ThingPageArchive obj = dod.getRandomThingPageArchive();
         Assert.assertNotNull("Data on demand for 'ThingPageArchive' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = ThingPageArchive.findThingPageArchive(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'ThingPageArchive' with identifier '" + id + "'", ThingPageArchive.findThingPageArchive(id));
+        Assert.assertNull("Failed to remove 'ThingPageArchive' with identifier '" + id + "'",
+                ThingPageArchive.findThingPageArchive(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingPageDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ThingPageDataOnDemand.java
index cba602af4..90ee400d9 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingPageDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingPageDataOnDemand.java
@@ -20,14 +20,14 @@
 @Component
 public class ThingPageDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<ThingPage> data;
+    private List<ThingPage> data;
 
-	@Autowired
+    @Autowired
     LsTransactionDataOnDemand lsTransactionDataOnDemand;
 
-	public ThingPage getNewTransientThingPage(int index) {
+    public ThingPage getNewTransientThingPage(int index) {
         ThingPage obj = new ThingPage();
         setArchived(obj, index);
         setCurrentEditor(obj, index);
@@ -42,12 +42,12 @@ public ThingPage getNewTransientThingPage(int index) {
         return obj;
     }
 
-	public void setArchived(ThingPage obj, int index) {
+    public void setArchived(ThingPage obj, int index) {
         Boolean archived = true;
         obj.setArchived(archived);
     }
 
-	public void setCurrentEditor(ThingPage obj, int index) {
+    public void setCurrentEditor(ThingPage obj, int index) {
         String currentEditor = "currentEditor_" + index;
         if (currentEditor.length() > 255) {
             currentEditor = currentEditor.substring(0, 255);
@@ -55,12 +55,12 @@ public void setCurrentEditor(ThingPage obj, int index) {
         obj.setCurrentEditor(currentEditor);
     }
 
-	public void setIgnored(ThingPage obj, int index) {
+    public void setIgnored(ThingPage obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setModifiedBy(ThingPage obj, int index) {
+    public void setModifiedBy(ThingPage obj, int index) {
         String modifiedBy = "modifiedBy_" + index;
         if (modifiedBy.length() > 255) {
             modifiedBy = modifiedBy.substring(0, 255);
@@ -68,17 +68,20 @@ public void setModifiedBy(ThingPage obj, int index) {
         obj.setModifiedBy(modifiedBy);
     }
 
-	public void setModifiedDate(ThingPage obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(ThingPage obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setPageContent(ThingPage obj, int index) {
+    public void setPageContent(ThingPage obj, int index) {
         String pageContent = "pageContent_" + index;
         obj.setPageContent(pageContent);
     }
 
-	public void setPageName(ThingPage obj, int index) {
+    public void setPageName(ThingPage obj, int index) {
         String pageName = "pageName_" + index;
         if (pageName.length() > 255) {
             pageName = pageName.substring(0, 255);
@@ -86,7 +89,7 @@ public void setPageName(ThingPage obj, int index) {
         obj.setPageName(pageName);
     }
 
-	public void setRecordedBy(ThingPage obj, int index) {
+    public void setRecordedBy(ThingPage obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -94,17 +97,20 @@ public void setRecordedBy(ThingPage obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(ThingPage obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(ThingPage obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public void setThing(ThingPage obj, int index) {
+    public void setThing(ThingPage obj, int index) {
         AbstractThing thing = null;
         obj.setThing(thing);
     }
 
-	public ThingPage getSpecificThingPage(int index) {
+    public ThingPage getSpecificThingPage(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -117,18 +123,18 @@ public ThingPage getSpecificThingPage(int index) {
         return ThingPage.findThingPage(id);
     }
 
-	public ThingPage getRandomThingPage() {
+    public ThingPage getRandomThingPage() {
         init();
         ThingPage obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return ThingPage.findThingPage(id);
     }
 
-	public boolean modifyThingPage(ThingPage obj) {
+    public boolean modifyThingPage(ThingPage obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = ThingPage.findThingPageEntries(from, to);
@@ -138,7 +144,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<ThingPage>();
         for (int i = 0; i < 10; i++) {
             ThingPage obj = getNewTransientThingPage(i);
@@ -148,7 +154,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingPageIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ThingPageIntegrationTest.java
index fa2ec1299..2f516f841 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingPageIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingPageIntegrationTest.java
@@ -25,17 +25,17 @@ public class ThingPageIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ThingPageDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountThingPages() {
         Assert.assertNotNull("Data on demand for 'ThingPage' failed to initialize correctly", dod.getRandomThingPage());
         long count = ThingPage.countThingPages();
         Assert.assertTrue("Counter for 'ThingPage' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindThingPage() {
         ThingPage obj = dod.getRandomThingPage();
         Assert.assertNotNull("Data on demand for 'ThingPage' failed to initialize correctly", obj);
@@ -46,29 +46,33 @@ public void testFindThingPage() {
         Assert.assertEquals("Find method for 'ThingPage' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllThingPages() {
         Assert.assertNotNull("Data on demand for 'ThingPage' failed to initialize correctly", dod.getRandomThingPage());
         long count = ThingPage.countThingPages();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ThingPage', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'ThingPage', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<ThingPage> result = ThingPage.findAllThingPages();
         Assert.assertNotNull("Find all method for 'ThingPage' illegally returned null", result);
         Assert.assertTrue("Find all method for 'ThingPage' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindThingPageEntries() {
         Assert.assertNotNull("Data on demand for 'ThingPage' failed to initialize correctly", dod.getRandomThingPage());
         long count = ThingPage.countThingPages();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<ThingPage> result = ThingPage.findThingPageEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'ThingPage' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ThingPage' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'ThingPage' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         ThingPage obj = dod.getRandomThingPage();
         Assert.assertNotNull("Data on demand for 'ThingPage' failed to initialize correctly", obj);
@@ -76,28 +80,31 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'ThingPage' failed to provide an identifier", id);
         obj = ThingPage.findThingPage(id);
         Assert.assertNotNull("Find method for 'ThingPage' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyThingPage(obj);
+        boolean modified = dod.modifyThingPage(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'ThingPage' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'ThingPage' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         ThingPage obj = dod.getRandomThingPage();
         Assert.assertNotNull("Data on demand for 'ThingPage' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ThingPage' failed to provide an identifier", id);
         obj = ThingPage.findThingPage(id);
-        boolean modified =  dod.modifyThingPage(obj);
+        boolean modified = dod.modifyThingPage(obj);
         Integer currentVersion = obj.getVersion();
         ThingPage merged = obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ThingPage' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'ThingPage' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
         Assert.assertNotNull("Data on demand for 'ThingPage' failed to initialize correctly", dod.getRandomThingPage());
         ThingPage obj = dod.getNewTransientThingPage(Integer.MAX_VALUE);
@@ -109,7 +116,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +126,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'ThingPage' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         ThingPage obj = dod.getRandomThingPage();
         Assert.assertNotNull("Data on demand for 'ThingPage' failed to initialize correctly", obj);
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ThingTypeDataOnDemand.java
index 222ccafe4..361526383 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingTypeDataOnDemand.java
@@ -16,17 +16,17 @@
 @Configurable
 public class ThingTypeDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<ThingType> data;
+    private List<ThingType> data;
 
-	public ThingType getNewTransientThingType(int index) {
+    public ThingType getNewTransientThingType(int index) {
         ThingType obj = new ThingType();
         setTypeName(obj, index);
         return obj;
     }
 
-	public void setTypeName(ThingType obj, int index) {
+    public void setTypeName(ThingType obj, int index) {
         String typeName = "typeName_" + index;
         if (typeName.length() > 128) {
             typeName = new Random().nextInt(10) + typeName.substring(1, 128);
@@ -34,7 +34,7 @@ public void setTypeName(ThingType obj, int index) {
         obj.setTypeName(typeName);
     }
 
-	public ThingType getSpecificThingType(int index) {
+    public ThingType getSpecificThingType(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -47,18 +47,18 @@ public ThingType getSpecificThingType(int index) {
         return ThingType.findThingType(id);
     }
 
-	public ThingType getRandomThingType() {
+    public ThingType getRandomThingType() {
         init();
         ThingType obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return ThingType.findThingType(id);
     }
 
-	public boolean modifyThingType(ThingType obj) {
+    public boolean modifyThingType(ThingType obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = ThingType.findThingTypeEntries(from, to);
@@ -68,7 +68,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<ThingType>();
         for (int i = 0; i < 10; i++) {
             ThingType obj = getNewTransientThingType(i);
@@ -78,7 +78,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ThingTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ThingTypeIntegrationTest.java
index 57579ce81..70ffe3ed0 100755
--- a/src/test/java/com/labsynch/labseer/domain/ThingTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ThingTypeIntegrationTest.java
@@ -25,17 +25,17 @@ public class ThingTypeIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ThingTypeDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountThingTypes() {
         Assert.assertNotNull("Data on demand for 'ThingType' failed to initialize correctly", dod.getRandomThingType());
         long count = ThingType.countThingTypes();
         Assert.assertTrue("Counter for 'ThingType' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindThingType() {
         ThingType obj = dod.getRandomThingType();
         Assert.assertNotNull("Data on demand for 'ThingType' failed to initialize correctly", obj);
@@ -46,29 +46,33 @@ public void testFindThingType() {
         Assert.assertEquals("Find method for 'ThingType' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllThingTypes() {
         Assert.assertNotNull("Data on demand for 'ThingType' failed to initialize correctly", dod.getRandomThingType());
         long count = ThingType.countThingTypes();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ThingType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'ThingType', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<ThingType> result = ThingType.findAllThingTypes();
         Assert.assertNotNull("Find all method for 'ThingType' illegally returned null", result);
         Assert.assertTrue("Find all method for 'ThingType' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindThingTypeEntries() {
         Assert.assertNotNull("Data on demand for 'ThingType' failed to initialize correctly", dod.getRandomThingType());
         long count = ThingType.countThingTypes();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<ThingType> result = ThingType.findThingTypeEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'ThingType' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ThingType' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'ThingType' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         ThingType obj = dod.getRandomThingType();
         Assert.assertNotNull("Data on demand for 'ThingType' failed to initialize correctly", obj);
@@ -76,28 +80,31 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'ThingType' failed to provide an identifier", id);
         obj = ThingType.findThingType(id);
         Assert.assertNotNull("Find method for 'ThingType' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyThingType(obj);
+        boolean modified = dod.modifyThingType(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'ThingType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'ThingType' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         ThingType obj = dod.getRandomThingType();
         Assert.assertNotNull("Data on demand for 'ThingType' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ThingType' failed to provide an identifier", id);
         obj = ThingType.findThingType(id);
-        boolean modified =  dod.modifyThingType(obj);
+        boolean modified = dod.modifyThingType(obj);
         Integer currentVersion = obj.getVersion();
         ThingType merged = obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ThingType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'ThingType' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
         Assert.assertNotNull("Data on demand for 'ThingType' failed to initialize correctly", dod.getRandomThingType());
         ThingType obj = dod.getNewTransientThingType(Integer.MAX_VALUE);
@@ -109,7 +116,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +126,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'ThingType' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         ThingType obj = dod.getRandomThingType();
         Assert.assertNotNull("Data on demand for 'ThingType' failed to initialize correctly", obj);
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupDataOnDemand.java
index 4705bd212..7c8fb9d67 100755
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupDataOnDemand.java
@@ -19,11 +19,11 @@
 @Component
 public class TreatmentGroupDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<TreatmentGroup> data;
+    private List<TreatmentGroup> data;
 
-	public TreatmentGroup getNewTransientTreatmentGroup(int index) {
+    public TreatmentGroup getNewTransientTreatmentGroup(int index) {
         TreatmentGroup obj = new TreatmentGroup();
         setCodeName(obj, index);
         setDeleted(obj, index);
@@ -39,7 +39,7 @@ public TreatmentGroup getNewTransientTreatmentGroup(int index) {
         return obj;
     }
 
-	public void setCodeName(TreatmentGroup obj, int index) {
+    public void setCodeName(TreatmentGroup obj, int index) {
         String codeName = "codeName_" + index;
         if (codeName.length() > 255) {
             codeName = new Random().nextInt(10) + codeName.substring(1, 255);
@@ -47,17 +47,17 @@ public void setCodeName(TreatmentGroup obj, int index) {
         obj.setCodeName(codeName);
     }
 
-	public void setDeleted(TreatmentGroup obj, int index) {
+    public void setDeleted(TreatmentGroup obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setIgnored(TreatmentGroup obj, int index) {
+    public void setIgnored(TreatmentGroup obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setLsKind(TreatmentGroup obj, int index) {
+    public void setLsKind(TreatmentGroup obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -65,12 +65,12 @@ public void setLsKind(TreatmentGroup obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsTransaction(TreatmentGroup obj, int index) {
+    public void setLsTransaction(TreatmentGroup obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(TreatmentGroup obj, int index) {
+    public void setLsType(TreatmentGroup obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 255) {
             lsType = lsType.substring(0, 255);
@@ -78,7 +78,7 @@ public void setLsType(TreatmentGroup obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(TreatmentGroup obj, int index) {
+    public void setLsTypeAndKind(TreatmentGroup obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 255);
@@ -86,7 +86,7 @@ public void setLsTypeAndKind(TreatmentGroup obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedBy(TreatmentGroup obj, int index) {
+    public void setModifiedBy(TreatmentGroup obj, int index) {
         String modifiedBy = "modifiedBy_" + index;
         if (modifiedBy.length() > 255) {
             modifiedBy = modifiedBy.substring(0, 255);
@@ -94,12 +94,15 @@ public void setModifiedBy(TreatmentGroup obj, int index) {
         obj.setModifiedBy(modifiedBy);
     }
 
-	public void setModifiedDate(TreatmentGroup obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(TreatmentGroup obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setRecordedBy(TreatmentGroup obj, int index) {
+    public void setRecordedBy(TreatmentGroup obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -107,12 +110,15 @@ public void setRecordedBy(TreatmentGroup obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(TreatmentGroup obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(TreatmentGroup obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public TreatmentGroup getSpecificTreatmentGroup(int index) {
+    public TreatmentGroup getSpecificTreatmentGroup(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -125,18 +131,18 @@ public TreatmentGroup getSpecificTreatmentGroup(int index) {
         return TreatmentGroup.findTreatmentGroup(id);
     }
 
-	public TreatmentGroup getRandomTreatmentGroup() {
+    public TreatmentGroup getRandomTreatmentGroup() {
         init();
         TreatmentGroup obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return TreatmentGroup.findTreatmentGroup(id);
     }
 
-	public boolean modifyTreatmentGroup(TreatmentGroup obj) {
+    public boolean modifyTreatmentGroup(TreatmentGroup obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = TreatmentGroup.findTreatmentGroupEntries(from, to);
@@ -146,7 +152,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<TreatmentGroup>();
         for (int i = 0; i < 10; i++) {
             TreatmentGroup obj = getNewTransientTreatmentGroup(i);
@@ -156,7 +162,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupIntegrationTest.java
index 979203367..9f33f7f50 100755
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupIntegrationTest.java
@@ -25,17 +25,18 @@ public class TreatmentGroupIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     TreatmentGroupDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountTreatmentGroups() {
-        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to initialize correctly", dod.getRandomTreatmentGroup());
+        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to initialize correctly",
+                dod.getRandomTreatmentGroup());
         long count = TreatmentGroup.countTreatmentGroups();
         Assert.assertTrue("Counter for 'TreatmentGroup' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindTreatmentGroup() {
         TreatmentGroup obj = dod.getRandomTreatmentGroup();
         Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindTreatmentGroup() {
         Assert.assertEquals("Find method for 'TreatmentGroup' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllTreatmentGroups() {
-        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to initialize correctly", dod.getRandomTreatmentGroup());
+        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to initialize correctly",
+                dod.getRandomTreatmentGroup());
         long count = TreatmentGroup.countTreatmentGroups();
-        Assert.assertTrue("Too expensive to perform a find all test for 'TreatmentGroup', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'TreatmentGroup', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<TreatmentGroup> result = TreatmentGroup.findAllTreatmentGroups();
         Assert.assertNotNull("Find all method for 'TreatmentGroup' illegally returned null", result);
         Assert.assertTrue("Find all method for 'TreatmentGroup' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindTreatmentGroupEntries() {
-        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to initialize correctly", dod.getRandomTreatmentGroup());
+        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to initialize correctly",
+                dod.getRandomTreatmentGroup());
         long count = TreatmentGroup.countTreatmentGroups();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<TreatmentGroup> result = TreatmentGroup.findTreatmentGroupEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'TreatmentGroup' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'TreatmentGroup' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'TreatmentGroup' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         TreatmentGroup obj = dod.getRandomTreatmentGroup();
         Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to provide an identifier", id);
         obj = TreatmentGroup.findTreatmentGroup(id);
         Assert.assertNotNull("Find method for 'TreatmentGroup' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyTreatmentGroup(obj);
+        boolean modified = dod.modifyTreatmentGroup(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'TreatmentGroup' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'TreatmentGroup' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         TreatmentGroup obj = dod.getRandomTreatmentGroup();
         Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to provide an identifier", id);
         obj = TreatmentGroup.findTreatmentGroup(id);
-        boolean modified =  dod.modifyTreatmentGroup(obj);
+        boolean modified = dod.modifyTreatmentGroup(obj);
         Integer currentVersion = obj.getVersion();
-        TreatmentGroup merged = (TreatmentGroup)obj.merge();
+        TreatmentGroup merged = (TreatmentGroup) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'TreatmentGroup' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'TreatmentGroup' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to initialize correctly", dod.getRandomTreatmentGroup());
+        Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to initialize correctly",
+                dod.getRandomTreatmentGroup());
         TreatmentGroup obj = dod.getNewTransientTreatmentGroup(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'TreatmentGroup' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'TreatmentGroup' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         TreatmentGroup obj = dod.getRandomTreatmentGroup();
         Assert.assertNotNull("Data on demand for 'TreatmentGroup' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = TreatmentGroup.findTreatmentGroup(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'TreatmentGroup' with identifier '" + id + "'", TreatmentGroup.findTreatmentGroup(id));
+        Assert.assertNull("Failed to remove 'TreatmentGroup' with identifier '" + id + "'",
+                TreatmentGroup.findTreatmentGroup(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateDataOnDemand.java
index 2f3d11d95..cb2571d32 100755
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateDataOnDemand.java
@@ -20,14 +20,14 @@
 @Component
 public class TreatmentGroupStateDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<TreatmentGroupState> data;
+    private List<TreatmentGroupState> data;
 
-	@Autowired
+    @Autowired
     TreatmentGroupDataOnDemand treatmentGroupDataOnDemand;
 
-	public TreatmentGroupState getNewTransientTreatmentGroupState(int index) {
+    public TreatmentGroupState getNewTransientTreatmentGroupState(int index) {
         TreatmentGroupState obj = new TreatmentGroupState();
         setComments(obj, index);
         setDeleted(obj, index);
@@ -44,7 +44,7 @@ public TreatmentGroupState getNewTransientTreatmentGroupState(int index) {
         return obj;
     }
 
-	public void setComments(TreatmentGroupState obj, int index) {
+    public void setComments(TreatmentGroupState obj, int index) {
         String comments = "comments_" + index;
         if (comments.length() > 512) {
             comments = comments.substring(0, 512);
@@ -52,17 +52,17 @@ public void setComments(TreatmentGroupState obj, int index) {
         obj.setComments(comments);
     }
 
-	public void setDeleted(TreatmentGroupState obj, int index) {
+    public void setDeleted(TreatmentGroupState obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setIgnored(TreatmentGroupState obj, int index) {
+    public void setIgnored(TreatmentGroupState obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setLsKind(TreatmentGroupState obj, int index) {
+    public void setLsKind(TreatmentGroupState obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -70,12 +70,12 @@ public void setLsKind(TreatmentGroupState obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsTransaction(TreatmentGroupState obj, int index) {
+    public void setLsTransaction(TreatmentGroupState obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(TreatmentGroupState obj, int index) {
+    public void setLsType(TreatmentGroupState obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 64) {
             lsType = lsType.substring(0, 64);
@@ -83,7 +83,7 @@ public void setLsType(TreatmentGroupState obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(TreatmentGroupState obj, int index) {
+    public void setLsTypeAndKind(TreatmentGroupState obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 255);
@@ -91,7 +91,7 @@ public void setLsTypeAndKind(TreatmentGroupState obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedBy(TreatmentGroupState obj, int index) {
+    public void setModifiedBy(TreatmentGroupState obj, int index) {
         String modifiedBy = "modifiedBy_" + index;
         if (modifiedBy.length() > 255) {
             modifiedBy = modifiedBy.substring(0, 255);
@@ -99,12 +99,15 @@ public void setModifiedBy(TreatmentGroupState obj, int index) {
         obj.setModifiedBy(modifiedBy);
     }
 
-	public void setModifiedDate(TreatmentGroupState obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(TreatmentGroupState obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setRecordedBy(TreatmentGroupState obj, int index) {
+    public void setRecordedBy(TreatmentGroupState obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -112,17 +115,20 @@ public void setRecordedBy(TreatmentGroupState obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(TreatmentGroupState obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(TreatmentGroupState obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public void setTreatmentGroup(TreatmentGroupState obj, int index) {
+    public void setTreatmentGroup(TreatmentGroupState obj, int index) {
         TreatmentGroup treatmentGroup = treatmentGroupDataOnDemand.getRandomTreatmentGroup();
         obj.setTreatmentGroup(treatmentGroup);
     }
 
-	public TreatmentGroupState getSpecificTreatmentGroupState(int index) {
+    public TreatmentGroupState getSpecificTreatmentGroupState(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -135,28 +141,29 @@ public TreatmentGroupState getSpecificTreatmentGroupState(int index) {
         return TreatmentGroupState.findTreatmentGroupState(id);
     }
 
-	public TreatmentGroupState getRandomTreatmentGroupState() {
+    public TreatmentGroupState getRandomTreatmentGroupState() {
         init();
         TreatmentGroupState obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return TreatmentGroupState.findTreatmentGroupState(id);
     }
 
-	public boolean modifyTreatmentGroupState(TreatmentGroupState obj) {
+    public boolean modifyTreatmentGroupState(TreatmentGroupState obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = TreatmentGroupState.findTreatmentGroupStateEntries(from, to);
         if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'TreatmentGroupState' illegally returned null");
+            throw new IllegalStateException(
+                    "Find entries implementation for 'TreatmentGroupState' illegally returned null");
         }
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<TreatmentGroupState>();
         for (int i = 0; i < 10; i++) {
             TreatmentGroupState obj = getNewTransientTreatmentGroupState(i);
@@ -166,7 +173,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateIntegrationTest.java
index ece87353f..9013053c4 100755
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupStateIntegrationTest.java
@@ -25,17 +25,18 @@ public class TreatmentGroupStateIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     TreatmentGroupStateDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountTreatmentGroupStates() {
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to initialize correctly", dod.getRandomTreatmentGroupState());
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to initialize correctly",
+                dod.getRandomTreatmentGroupState());
         long count = TreatmentGroupState.countTreatmentGroupStates();
         Assert.assertTrue("Counter for 'TreatmentGroupState' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindTreatmentGroupState() {
         TreatmentGroupState obj = dod.getRandomTreatmentGroupState();
         Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindTreatmentGroupState() {
         Assert.assertEquals("Find method for 'TreatmentGroupState' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllTreatmentGroupStates() {
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to initialize correctly", dod.getRandomTreatmentGroupState());
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to initialize correctly",
+                dod.getRandomTreatmentGroupState());
         long count = TreatmentGroupState.countTreatmentGroupStates();
-        Assert.assertTrue("Too expensive to perform a find all test for 'TreatmentGroupState', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'TreatmentGroupState', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<TreatmentGroupState> result = TreatmentGroupState.findAllTreatmentGroupStates();
         Assert.assertNotNull("Find all method for 'TreatmentGroupState' illegally returned null", result);
         Assert.assertTrue("Find all method for 'TreatmentGroupState' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindTreatmentGroupStateEntries() {
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to initialize correctly", dod.getRandomTreatmentGroupState());
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to initialize correctly",
+                dod.getRandomTreatmentGroupState());
         long count = TreatmentGroupState.countTreatmentGroupStates();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<TreatmentGroupState> result = TreatmentGroupState.findTreatmentGroupStateEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'TreatmentGroupState' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'TreatmentGroupState' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'TreatmentGroupState' returned an incorrect number of entries",
+                count, result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         TreatmentGroupState obj = dod.getRandomTreatmentGroupState();
         Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to provide an identifier", id);
         obj = TreatmentGroupState.findTreatmentGroupState(id);
         Assert.assertNotNull("Find method for 'TreatmentGroupState' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyTreatmentGroupState(obj);
+        boolean modified = dod.modifyTreatmentGroupState(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'TreatmentGroupState' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'TreatmentGroupState' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         TreatmentGroupState obj = dod.getRandomTreatmentGroupState();
         Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to provide an identifier", id);
         obj = TreatmentGroupState.findTreatmentGroupState(id);
-        boolean modified =  dod.modifyTreatmentGroupState(obj);
+        boolean modified = dod.modifyTreatmentGroupState(obj);
         Integer currentVersion = obj.getVersion();
-        TreatmentGroupState merged = (TreatmentGroupState)obj.merge();
+        TreatmentGroupState merged = (TreatmentGroupState) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'TreatmentGroupState' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'TreatmentGroupState' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to initialize correctly", dod.getRandomTreatmentGroupState());
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to initialize correctly",
+                dod.getRandomTreatmentGroupState());
         TreatmentGroupState obj = dod.getNewTransientTreatmentGroupState(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'TreatmentGroupState' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'TreatmentGroupState' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         TreatmentGroupState obj = dod.getRandomTreatmentGroupState();
         Assert.assertNotNull("Data on demand for 'TreatmentGroupState' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = TreatmentGroupState.findTreatmentGroupState(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'TreatmentGroupState' with identifier '" + id + "'", TreatmentGroupState.findTreatmentGroupState(id));
+        Assert.assertNull("Failed to remove 'TreatmentGroupState' with identifier '" + id + "'",
+                TreatmentGroupState.findTreatmentGroupState(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueDataOnDemand.java
index e8bf9d5df..cef2ac27c 100755
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueDataOnDemand.java
@@ -21,14 +21,14 @@
 @Configurable
 public class TreatmentGroupValueDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<TreatmentGroupValue> data;
+    private List<TreatmentGroupValue> data;
 
-	@Autowired
+    @Autowired
     TreatmentGroupStateDataOnDemand treatmentGroupStateDataOnDemand;
 
-	public TreatmentGroupValue getNewTransientTreatmentGroupValue(int index) {
+    public TreatmentGroupValue getNewTransientTreatmentGroupValue(int index) {
         TreatmentGroupValue obj = new TreatmentGroupValue();
         setBlobValue(obj, index);
         setClobValue(obj, index);
@@ -70,17 +70,17 @@ public TreatmentGroupValue getNewTransientTreatmentGroupValue(int index) {
         return obj;
     }
 
-	public void setBlobValue(TreatmentGroupValue obj, int index) {
+    public void setBlobValue(TreatmentGroupValue obj, int index) {
         byte[] blobValue = String.valueOf(index).getBytes();
         obj.setBlobValue(blobValue);
     }
 
-	public void setClobValue(TreatmentGroupValue obj, int index) {
+    public void setClobValue(TreatmentGroupValue obj, int index) {
         String clobValue = "clobValue_" + index;
         obj.setClobValue(clobValue);
     }
 
-	public void setCodeKind(TreatmentGroupValue obj, int index) {
+    public void setCodeKind(TreatmentGroupValue obj, int index) {
         String codeKind = "codeKind_" + index;
         if (codeKind.length() > 255) {
             codeKind = codeKind.substring(0, 255);
@@ -88,7 +88,7 @@ public void setCodeKind(TreatmentGroupValue obj, int index) {
         obj.setCodeKind(codeKind);
     }
 
-	public void setCodeOrigin(TreatmentGroupValue obj, int index) {
+    public void setCodeOrigin(TreatmentGroupValue obj, int index) {
         String codeOrigin = "codeOrigin_" + index;
         if (codeOrigin.length() > 255) {
             codeOrigin = codeOrigin.substring(0, 255);
@@ -96,7 +96,7 @@ public void setCodeOrigin(TreatmentGroupValue obj, int index) {
         obj.setCodeOrigin(codeOrigin);
     }
 
-	public void setCodeType(TreatmentGroupValue obj, int index) {
+    public void setCodeType(TreatmentGroupValue obj, int index) {
         String codeType = "codeType_" + index;
         if (codeType.length() > 255) {
             codeType = codeType.substring(0, 255);
@@ -104,7 +104,7 @@ public void setCodeType(TreatmentGroupValue obj, int index) {
         obj.setCodeType(codeType);
     }
 
-	public void setCodeTypeAndKind(TreatmentGroupValue obj, int index) {
+    public void setCodeTypeAndKind(TreatmentGroupValue obj, int index) {
         String codeTypeAndKind = "codeTypeAndKind_" + index;
         if (codeTypeAndKind.length() > 350) {
             codeTypeAndKind = codeTypeAndKind.substring(0, 350);
@@ -112,7 +112,7 @@ public void setCodeTypeAndKind(TreatmentGroupValue obj, int index) {
         obj.setCodeTypeAndKind(codeTypeAndKind);
     }
 
-	public void setCodeValue(TreatmentGroupValue obj, int index) {
+    public void setCodeValue(TreatmentGroupValue obj, int index) {
         String codeValue = "codeValue_" + index;
         if (codeValue.length() > 255) {
             codeValue = codeValue.substring(0, 255);
@@ -120,7 +120,7 @@ public void setCodeValue(TreatmentGroupValue obj, int index) {
         obj.setCodeValue(codeValue);
     }
 
-	public void setComments(TreatmentGroupValue obj, int index) {
+    public void setComments(TreatmentGroupValue obj, int index) {
         String comments = "comments_" + index;
         if (comments.length() > 512) {
             comments = comments.substring(0, 512);
@@ -128,7 +128,7 @@ public void setComments(TreatmentGroupValue obj, int index) {
         obj.setComments(comments);
     }
 
-	public void setConcUnit(TreatmentGroupValue obj, int index) {
+    public void setConcUnit(TreatmentGroupValue obj, int index) {
         String concUnit = "concUnit_" + index;
         if (concUnit.length() > 25) {
             concUnit = concUnit.substring(0, 25);
@@ -136,22 +136,25 @@ public void setConcUnit(TreatmentGroupValue obj, int index) {
         obj.setConcUnit(concUnit);
     }
 
-	public void setConcentration(TreatmentGroupValue obj, int index) {
+    public void setConcentration(TreatmentGroupValue obj, int index) {
         Double concentration = new Integer(index).doubleValue();
         obj.setConcentration(concentration);
     }
 
-	public void setDateValue(TreatmentGroupValue obj, int index) {
-        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setDateValue(TreatmentGroupValue obj, int index) {
+        Date dateValue = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setDateValue(dateValue);
     }
 
-	public void setDeleted(TreatmentGroupValue obj, int index) {
+    public void setDeleted(TreatmentGroupValue obj, int index) {
         Boolean deleted = true;
         obj.setDeleted(deleted);
     }
 
-	public void setFileValue(TreatmentGroupValue obj, int index) {
+    public void setFileValue(TreatmentGroupValue obj, int index) {
         String fileValue = "fileValue_" + index;
         if (fileValue.length() > 512) {
             fileValue = fileValue.substring(0, 512);
@@ -159,12 +162,12 @@ public void setFileValue(TreatmentGroupValue obj, int index) {
         obj.setFileValue(fileValue);
     }
 
-	public void setIgnored(TreatmentGroupValue obj, int index) {
+    public void setIgnored(TreatmentGroupValue obj, int index) {
         Boolean ignored = true;
         obj.setIgnored(ignored);
     }
 
-	public void setLsKind(TreatmentGroupValue obj, int index) {
+    public void setLsKind(TreatmentGroupValue obj, int index) {
         String lsKind = "lsKind_" + index;
         if (lsKind.length() > 255) {
             lsKind = lsKind.substring(0, 255);
@@ -172,17 +175,17 @@ public void setLsKind(TreatmentGroupValue obj, int index) {
         obj.setLsKind(lsKind);
     }
 
-	public void setLsState(TreatmentGroupValue obj, int index) {
+    public void setLsState(TreatmentGroupValue obj, int index) {
         TreatmentGroupState lsState = treatmentGroupStateDataOnDemand.getRandomTreatmentGroupState();
         obj.setLsState(lsState);
     }
 
-	public void setLsTransaction(TreatmentGroupValue obj, int index) {
+    public void setLsTransaction(TreatmentGroupValue obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setLsType(TreatmentGroupValue obj, int index) {
+    public void setLsType(TreatmentGroupValue obj, int index) {
         String lsType = "lsType_" + index;
         if (lsType.length() > 64) {
             lsType = lsType.substring(0, 64);
@@ -190,7 +193,7 @@ public void setLsType(TreatmentGroupValue obj, int index) {
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(TreatmentGroupValue obj, int index) {
+    public void setLsTypeAndKind(TreatmentGroupValue obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 350) {
             lsTypeAndKind = lsTypeAndKind.substring(0, 350);
@@ -198,7 +201,7 @@ public void setLsTypeAndKind(TreatmentGroupValue obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public void setModifiedBy(TreatmentGroupValue obj, int index) {
+    public void setModifiedBy(TreatmentGroupValue obj, int index) {
         String modifiedBy = "modifiedBy_" + index;
         if (modifiedBy.length() > 255) {
             modifiedBy = modifiedBy.substring(0, 255);
@@ -206,17 +209,20 @@ public void setModifiedBy(TreatmentGroupValue obj, int index) {
         obj.setModifiedBy(modifiedBy);
     }
 
-	public void setModifiedDate(TreatmentGroupValue obj, int index) {
-        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setModifiedDate(TreatmentGroupValue obj, int index) {
+        Date modifiedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setModifiedDate(modifiedDate);
     }
 
-	public void setNumberOfReplicates(TreatmentGroupValue obj, int index) {
+    public void setNumberOfReplicates(TreatmentGroupValue obj, int index) {
         Integer numberOfReplicates = new Integer(index);
         obj.setNumberOfReplicates(numberOfReplicates);
     }
 
-	public void setNumericValue(TreatmentGroupValue obj, int index) {
+    public void setNumericValue(TreatmentGroupValue obj, int index) {
         BigDecimal numericValue = BigDecimal.valueOf(index);
         if (numericValue.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
             numericValue = new BigDecimal("99999999999999999999.999999999999999999");
@@ -224,7 +230,7 @@ public void setNumericValue(TreatmentGroupValue obj, int index) {
         obj.setNumericValue(numericValue);
     }
 
-	public void setOperatorKind(TreatmentGroupValue obj, int index) {
+    public void setOperatorKind(TreatmentGroupValue obj, int index) {
         String operatorKind = "operator_" + index;
         if (operatorKind.length() > 10) {
             operatorKind = operatorKind.substring(0, 10);
@@ -232,7 +238,7 @@ public void setOperatorKind(TreatmentGroupValue obj, int index) {
         obj.setOperatorKind(operatorKind);
     }
 
-	public void setOperatorType(TreatmentGroupValue obj, int index) {
+    public void setOperatorType(TreatmentGroupValue obj, int index) {
         String operatorType = "operatorType_" + index;
         if (operatorType.length() > 25) {
             operatorType = operatorType.substring(0, 25);
@@ -240,7 +246,7 @@ public void setOperatorType(TreatmentGroupValue obj, int index) {
         obj.setOperatorType(operatorType);
     }
 
-	public void setOperatorTypeAndKind(TreatmentGroupValue obj, int index) {
+    public void setOperatorTypeAndKind(TreatmentGroupValue obj, int index) {
         String operatorTypeAndKind = "operatorTypeAndKind_" + index;
         if (operatorTypeAndKind.length() > 50) {
             operatorTypeAndKind = operatorTypeAndKind.substring(0, 50);
@@ -248,12 +254,12 @@ public void setOperatorTypeAndKind(TreatmentGroupValue obj, int index) {
         obj.setOperatorTypeAndKind(operatorTypeAndKind);
     }
 
-	public void setPublicData(TreatmentGroupValue obj, int index) {
+    public void setPublicData(TreatmentGroupValue obj, int index) {
         Boolean publicData = true;
         obj.setPublicData(publicData);
     }
 
-	public void setRecordedBy(TreatmentGroupValue obj, int index) {
+    public void setRecordedBy(TreatmentGroupValue obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -261,17 +267,20 @@ public void setRecordedBy(TreatmentGroupValue obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(TreatmentGroupValue obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(TreatmentGroupValue obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public void setSigFigs(TreatmentGroupValue obj, int index) {
+    public void setSigFigs(TreatmentGroupValue obj, int index) {
         Integer sigFigs = new Integer(index);
         obj.setSigFigs(sigFigs);
     }
 
-	public void setStringValue(TreatmentGroupValue obj, int index) {
+    public void setStringValue(TreatmentGroupValue obj, int index) {
         String stringValue = "stringValue_" + index;
         if (stringValue.length() > 255) {
             stringValue = stringValue.substring(0, 255);
@@ -279,7 +288,7 @@ public void setStringValue(TreatmentGroupValue obj, int index) {
         obj.setStringValue(stringValue);
     }
 
-	public void setUncertainty(TreatmentGroupValue obj, int index) {
+    public void setUncertainty(TreatmentGroupValue obj, int index) {
         BigDecimal uncertainty = BigDecimal.valueOf(index);
         if (uncertainty.compareTo(new BigDecimal("99999999999999999999.999999999999999999")) == 1) {
             uncertainty = new BigDecimal("99999999999999999999.999999999999999999");
@@ -287,7 +296,7 @@ public void setUncertainty(TreatmentGroupValue obj, int index) {
         obj.setUncertainty(uncertainty);
     }
 
-	public void setUncertaintyType(TreatmentGroupValue obj, int index) {
+    public void setUncertaintyType(TreatmentGroupValue obj, int index) {
         String uncertaintyType = "uncertaintyType_" + index;
         if (uncertaintyType.length() > 255) {
             uncertaintyType = uncertaintyType.substring(0, 255);
@@ -295,7 +304,7 @@ public void setUncertaintyType(TreatmentGroupValue obj, int index) {
         obj.setUncertaintyType(uncertaintyType);
     }
 
-	public void setUnitKind(TreatmentGroupValue obj, int index) {
+    public void setUnitKind(TreatmentGroupValue obj, int index) {
         String unitKind = "unitKind_" + index;
         if (unitKind.length() > 25) {
             unitKind = unitKind.substring(0, 25);
@@ -303,7 +312,7 @@ public void setUnitKind(TreatmentGroupValue obj, int index) {
         obj.setUnitKind(unitKind);
     }
 
-	public void setUnitType(TreatmentGroupValue obj, int index) {
+    public void setUnitType(TreatmentGroupValue obj, int index) {
         String unitType = "unitType_" + index;
         if (unitType.length() > 25) {
             unitType = unitType.substring(0, 25);
@@ -311,7 +320,7 @@ public void setUnitType(TreatmentGroupValue obj, int index) {
         obj.setUnitType(unitType);
     }
 
-	public void setUnitTypeAndKind(TreatmentGroupValue obj, int index) {
+    public void setUnitTypeAndKind(TreatmentGroupValue obj, int index) {
         String unitTypeAndKind = "unitTypeAndKind_" + index;
         if (unitTypeAndKind.length() > 55) {
             unitTypeAndKind = unitTypeAndKind.substring(0, 55);
@@ -319,7 +328,7 @@ public void setUnitTypeAndKind(TreatmentGroupValue obj, int index) {
         obj.setUnitTypeAndKind(unitTypeAndKind);
     }
 
-	public void setUrlValue(TreatmentGroupValue obj, int index) {
+    public void setUrlValue(TreatmentGroupValue obj, int index) {
         String urlValue = "urlValue_" + index;
         if (urlValue.length() > 2000) {
             urlValue = urlValue.substring(0, 2000);
@@ -327,7 +336,7 @@ public void setUrlValue(TreatmentGroupValue obj, int index) {
         obj.setUrlValue(urlValue);
     }
 
-	public TreatmentGroupValue getSpecificTreatmentGroupValue(int index) {
+    public TreatmentGroupValue getSpecificTreatmentGroupValue(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -340,28 +349,29 @@ public TreatmentGroupValue getSpecificTreatmentGroupValue(int index) {
         return TreatmentGroupValue.findTreatmentGroupValue(id);
     }
 
-	public TreatmentGroupValue getRandomTreatmentGroupValue() {
+    public TreatmentGroupValue getRandomTreatmentGroupValue() {
         init();
         TreatmentGroupValue obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return TreatmentGroupValue.findTreatmentGroupValue(id);
     }
 
-	public boolean modifyTreatmentGroupValue(TreatmentGroupValue obj) {
+    public boolean modifyTreatmentGroupValue(TreatmentGroupValue obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = TreatmentGroupValue.findTreatmentGroupValueEntries(from, to);
         if (data == null) {
-            throw new IllegalStateException("Find entries implementation for 'TreatmentGroupValue' illegally returned null");
+            throw new IllegalStateException(
+                    "Find entries implementation for 'TreatmentGroupValue' illegally returned null");
         }
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<TreatmentGroupValue>();
         for (int i = 0; i < 10; i++) {
             TreatmentGroupValue obj = getNewTransientTreatmentGroupValue(i);
@@ -371,7 +381,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueIntegrationTest.java
index f4a8d058f..edc15376b 100755
--- a/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/TreatmentGroupValueIntegrationTest.java
@@ -25,17 +25,18 @@ public class TreatmentGroupValueIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     TreatmentGroupValueDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountTreatmentGroupValues() {
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to initialize correctly", dod.getRandomTreatmentGroupValue());
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to initialize correctly",
+                dod.getRandomTreatmentGroupValue());
         long count = TreatmentGroupValue.countTreatmentGroupValues();
         Assert.assertTrue("Counter for 'TreatmentGroupValue' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindTreatmentGroupValue() {
         TreatmentGroupValue obj = dod.getRandomTreatmentGroupValue();
         Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to initialize correctly", obj);
@@ -46,29 +47,35 @@ public void testFindTreatmentGroupValue() {
         Assert.assertEquals("Find method for 'TreatmentGroupValue' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllTreatmentGroupValues() {
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to initialize correctly", dod.getRandomTreatmentGroupValue());
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to initialize correctly",
+                dod.getRandomTreatmentGroupValue());
         long count = TreatmentGroupValue.countTreatmentGroupValues();
-        Assert.assertTrue("Too expensive to perform a find all test for 'TreatmentGroupValue', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'TreatmentGroupValue', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<TreatmentGroupValue> result = TreatmentGroupValue.findAllTreatmentGroupValues();
         Assert.assertNotNull("Find all method for 'TreatmentGroupValue' illegally returned null", result);
         Assert.assertTrue("Find all method for 'TreatmentGroupValue' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindTreatmentGroupValueEntries() {
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to initialize correctly", dod.getRandomTreatmentGroupValue());
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to initialize correctly",
+                dod.getRandomTreatmentGroupValue());
         long count = TreatmentGroupValue.countTreatmentGroupValues();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<TreatmentGroupValue> result = TreatmentGroupValue.findTreatmentGroupValueEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'TreatmentGroupValue' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'TreatmentGroupValue' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'TreatmentGroupValue' returned an incorrect number of entries",
+                count, result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         TreatmentGroupValue obj = dod.getRandomTreatmentGroupValue();
         Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to initialize correctly", obj);
@@ -76,30 +83,34 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to provide an identifier", id);
         obj = TreatmentGroupValue.findTreatmentGroupValue(id);
         Assert.assertNotNull("Find method for 'TreatmentGroupValue' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyTreatmentGroupValue(obj);
+        boolean modified = dod.modifyTreatmentGroupValue(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'TreatmentGroupValue' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'TreatmentGroupValue' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         TreatmentGroupValue obj = dod.getRandomTreatmentGroupValue();
         Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to provide an identifier", id);
         obj = TreatmentGroupValue.findTreatmentGroupValue(id);
-        boolean modified =  dod.modifyTreatmentGroupValue(obj);
+        boolean modified = dod.modifyTreatmentGroupValue(obj);
         Integer currentVersion = obj.getVersion();
-        TreatmentGroupValue merged = (TreatmentGroupValue)obj.merge();
+        TreatmentGroupValue merged = (TreatmentGroupValue) obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'TreatmentGroupValue' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'TreatmentGroupValue' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
-        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to initialize correctly", dod.getRandomTreatmentGroupValue());
+        Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to initialize correctly",
+                dod.getRandomTreatmentGroupValue());
         TreatmentGroupValue obj = dod.getNewTransientTreatmentGroupValue(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'TreatmentGroupValue' identifier to be null", obj.getId());
@@ -109,7 +120,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +130,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'TreatmentGroupValue' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         TreatmentGroupValue obj = dod.getRandomTreatmentGroupValue();
         Assert.assertNotNull("Data on demand for 'TreatmentGroupValue' failed to initialize correctly", obj);
@@ -126,6 +139,7 @@ public void testRemove() {
         obj = TreatmentGroupValue.findTreatmentGroupValue(id);
         obj.remove();
         obj.flush();
-        Assert.assertNull("Failed to remove 'TreatmentGroupValue' with identifier '" + id + "'", TreatmentGroupValue.findTreatmentGroupValue(id));
+        Assert.assertNull("Failed to remove 'TreatmentGroupValue' with identifier '" + id + "'",
+                TreatmentGroupValue.findTreatmentGroupValue(id));
     }
 }
diff --git a/src/test/java/com/labsynch/labseer/domain/UnitKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/UnitKindDataOnDemand.java
index f32d0cb94..167562300 100755
--- a/src/test/java/com/labsynch/labseer/domain/UnitKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/UnitKindDataOnDemand.java
@@ -17,14 +17,14 @@
 @Configurable
 public class UnitKindDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<UnitKind> data;
+    private List<UnitKind> data;
 
-	@Autowired
+    @Autowired
     UnitTypeDataOnDemand unitTypeDataOnDemand;
 
-	public UnitKind getNewTransientUnitKind(int index) {
+    public UnitKind getNewTransientUnitKind(int index) {
         UnitKind obj = new UnitKind();
         setKindName(obj, index);
         setLsType(obj, index);
@@ -32,7 +32,7 @@ public UnitKind getNewTransientUnitKind(int index) {
         return obj;
     }
 
-	public void setKindName(UnitKind obj, int index) {
+    public void setKindName(UnitKind obj, int index) {
         String kindName = "kindName_" + index;
         if (kindName.length() > 64) {
             kindName = kindName.substring(0, 64);
@@ -40,12 +40,12 @@ public void setKindName(UnitKind obj, int index) {
         obj.setKindName(kindName);
     }
 
-	public void setLsType(UnitKind obj, int index) {
+    public void setLsType(UnitKind obj, int index) {
         UnitType lsType = unitTypeDataOnDemand.getRandomUnitType();
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(UnitKind obj, int index) {
+    public void setLsTypeAndKind(UnitKind obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = new Random().nextInt(10) + lsTypeAndKind.substring(1, 255);
@@ -53,7 +53,7 @@ public void setLsTypeAndKind(UnitKind obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public UnitKind getSpecificUnitKind(int index) {
+    public UnitKind getSpecificUnitKind(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -66,18 +66,18 @@ public UnitKind getSpecificUnitKind(int index) {
         return UnitKind.findUnitKind(id);
     }
 
-	public UnitKind getRandomUnitKind() {
+    public UnitKind getRandomUnitKind() {
         init();
         UnitKind obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return UnitKind.findUnitKind(id);
     }
 
-	public boolean modifyUnitKind(UnitKind obj) {
+    public boolean modifyUnitKind(UnitKind obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = UnitKind.findUnitKindEntries(from, to);
@@ -87,7 +87,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<UnitKind>();
         for (int i = 0; i < 10; i++) {
             UnitKind obj = getNewTransientUnitKind(i);
@@ -97,7 +97,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/UnitKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/UnitKindIntegrationTest.java
index d6aafaa04..835ce163c 100755
--- a/src/test/java/com/labsynch/labseer/domain/UnitKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/UnitKindIntegrationTest.java
@@ -25,17 +25,17 @@ public class UnitKindIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     UnitKindDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountUnitKinds() {
         Assert.assertNotNull("Data on demand for 'UnitKind' failed to initialize correctly", dod.getRandomUnitKind());
         long count = UnitKind.countUnitKinds();
         Assert.assertTrue("Counter for 'UnitKind' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindUnitKind() {
         UnitKind obj = dod.getRandomUnitKind();
         Assert.assertNotNull("Data on demand for 'UnitKind' failed to initialize correctly", obj);
@@ -46,29 +46,33 @@ public void testFindUnitKind() {
         Assert.assertEquals("Find method for 'UnitKind' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllUnitKinds() {
         Assert.assertNotNull("Data on demand for 'UnitKind' failed to initialize correctly", dod.getRandomUnitKind());
         long count = UnitKind.countUnitKinds();
-        Assert.assertTrue("Too expensive to perform a find all test for 'UnitKind', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'UnitKind', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<UnitKind> result = UnitKind.findAllUnitKinds();
         Assert.assertNotNull("Find all method for 'UnitKind' illegally returned null", result);
         Assert.assertTrue("Find all method for 'UnitKind' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindUnitKindEntries() {
         Assert.assertNotNull("Data on demand for 'UnitKind' failed to initialize correctly", dod.getRandomUnitKind());
         long count = UnitKind.countUnitKinds();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<UnitKind> result = UnitKind.findUnitKindEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'UnitKind' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'UnitKind' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'UnitKind' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         UnitKind obj = dod.getRandomUnitKind();
         Assert.assertNotNull("Data on demand for 'UnitKind' failed to initialize correctly", obj);
@@ -76,28 +80,31 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'UnitKind' failed to provide an identifier", id);
         obj = UnitKind.findUnitKind(id);
         Assert.assertNotNull("Find method for 'UnitKind' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyUnitKind(obj);
+        boolean modified = dod.modifyUnitKind(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'UnitKind' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'UnitKind' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         UnitKind obj = dod.getRandomUnitKind();
         Assert.assertNotNull("Data on demand for 'UnitKind' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'UnitKind' failed to provide an identifier", id);
         obj = UnitKind.findUnitKind(id);
-        boolean modified =  dod.modifyUnitKind(obj);
+        boolean modified = dod.modifyUnitKind(obj);
         Integer currentVersion = obj.getVersion();
         UnitKind merged = obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'UnitKind' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'UnitKind' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
         Assert.assertNotNull("Data on demand for 'UnitKind' failed to initialize correctly", dod.getRandomUnitKind());
         UnitKind obj = dod.getNewTransientUnitKind(Integer.MAX_VALUE);
@@ -109,7 +116,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +126,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'UnitKind' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         UnitKind obj = dod.getRandomUnitKind();
         Assert.assertNotNull("Data on demand for 'UnitKind' failed to initialize correctly", obj);
diff --git a/src/test/java/com/labsynch/labseer/domain/UnitTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/UnitTypeDataOnDemand.java
index 044f773bd..fc2799bc2 100755
--- a/src/test/java/com/labsynch/labseer/domain/UnitTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/UnitTypeDataOnDemand.java
@@ -16,17 +16,17 @@
 @Component
 public class UnitTypeDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<UnitType> data;
+    private List<UnitType> data;
 
-	public UnitType getNewTransientUnitType(int index) {
+    public UnitType getNewTransientUnitType(int index) {
         UnitType obj = new UnitType();
         setTypeName(obj, index);
         return obj;
     }
 
-	public void setTypeName(UnitType obj, int index) {
+    public void setTypeName(UnitType obj, int index) {
         String typeName = "typeName_" + index;
         if (typeName.length() > 64) {
             typeName = new Random().nextInt(10) + typeName.substring(1, 64);
@@ -34,7 +34,7 @@ public void setTypeName(UnitType obj, int index) {
         obj.setTypeName(typeName);
     }
 
-	public UnitType getSpecificUnitType(int index) {
+    public UnitType getSpecificUnitType(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -47,18 +47,18 @@ public UnitType getSpecificUnitType(int index) {
         return UnitType.findUnitType(id);
     }
 
-	public UnitType getRandomUnitType() {
+    public UnitType getRandomUnitType() {
         init();
         UnitType obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return UnitType.findUnitType(id);
     }
 
-	public boolean modifyUnitType(UnitType obj) {
+    public boolean modifyUnitType(UnitType obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = UnitType.findUnitTypeEntries(from, to);
@@ -68,7 +68,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<UnitType>();
         for (int i = 0; i < 10; i++) {
             UnitType obj = getNewTransientUnitType(i);
@@ -78,7 +78,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/UnitTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/UnitTypeIntegrationTest.java
index 0f9b73ed5..174b21da0 100755
--- a/src/test/java/com/labsynch/labseer/domain/UnitTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/UnitTypeIntegrationTest.java
@@ -25,17 +25,17 @@ public class UnitTypeIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     UnitTypeDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountUnitTypes() {
         Assert.assertNotNull("Data on demand for 'UnitType' failed to initialize correctly", dod.getRandomUnitType());
         long count = UnitType.countUnitTypes();
         Assert.assertTrue("Counter for 'UnitType' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindUnitType() {
         UnitType obj = dod.getRandomUnitType();
         Assert.assertNotNull("Data on demand for 'UnitType' failed to initialize correctly", obj);
@@ -46,29 +46,33 @@ public void testFindUnitType() {
         Assert.assertEquals("Find method for 'UnitType' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllUnitTypes() {
         Assert.assertNotNull("Data on demand for 'UnitType' failed to initialize correctly", dod.getRandomUnitType());
         long count = UnitType.countUnitTypes();
-        Assert.assertTrue("Too expensive to perform a find all test for 'UnitType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'UnitType', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<UnitType> result = UnitType.findAllUnitTypes();
         Assert.assertNotNull("Find all method for 'UnitType' illegally returned null", result);
         Assert.assertTrue("Find all method for 'UnitType' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindUnitTypeEntries() {
         Assert.assertNotNull("Data on demand for 'UnitType' failed to initialize correctly", dod.getRandomUnitType());
         long count = UnitType.countUnitTypes();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<UnitType> result = UnitType.findUnitTypeEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'UnitType' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'UnitType' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'UnitType' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         UnitType obj = dod.getRandomUnitType();
         Assert.assertNotNull("Data on demand for 'UnitType' failed to initialize correctly", obj);
@@ -76,28 +80,31 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'UnitType' failed to provide an identifier", id);
         obj = UnitType.findUnitType(id);
         Assert.assertNotNull("Find method for 'UnitType' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyUnitType(obj);
+        boolean modified = dod.modifyUnitType(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'UnitType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'UnitType' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         UnitType obj = dod.getRandomUnitType();
         Assert.assertNotNull("Data on demand for 'UnitType' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'UnitType' failed to provide an identifier", id);
         obj = UnitType.findUnitType(id);
-        boolean modified =  dod.modifyUnitType(obj);
+        boolean modified = dod.modifyUnitType(obj);
         Integer currentVersion = obj.getVersion();
         UnitType merged = obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'UnitType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'UnitType' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
         Assert.assertNotNull("Data on demand for 'UnitType' failed to initialize correctly", dod.getRandomUnitType());
         UnitType obj = dod.getNewTransientUnitType(Integer.MAX_VALUE);
@@ -109,7 +116,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +126,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'UnitType' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         UnitType obj = dod.getRandomUnitType();
         Assert.assertNotNull("Data on demand for 'UnitType' failed to initialize correctly", obj);
diff --git a/src/test/java/com/labsynch/labseer/domain/UpdateLogDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/UpdateLogDataOnDemand.java
index e9a88c945..c3b7f8734 100755
--- a/src/test/java/com/labsynch/labseer/domain/UpdateLogDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/UpdateLogDataOnDemand.java
@@ -19,11 +19,11 @@
 @Component
 public class UpdateLogDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<UpdateLog> data;
+    private List<UpdateLog> data;
 
-	public UpdateLog getNewTransientUpdateLog(int index) {
+    public UpdateLog getNewTransientUpdateLog(int index) {
         UpdateLog obj = new UpdateLog();
         setComments(obj, index);
         setLsTransaction(obj, index);
@@ -34,7 +34,7 @@ public UpdateLog getNewTransientUpdateLog(int index) {
         return obj;
     }
 
-	public void setComments(UpdateLog obj, int index) {
+    public void setComments(UpdateLog obj, int index) {
         String comments = "comments_" + index;
         if (comments.length() > 512) {
             comments = comments.substring(0, 512);
@@ -42,12 +42,12 @@ public void setComments(UpdateLog obj, int index) {
         obj.setComments(comments);
     }
 
-	public void setLsTransaction(UpdateLog obj, int index) {
+    public void setLsTransaction(UpdateLog obj, int index) {
         Long lsTransaction = new Integer(index).longValue();
         obj.setLsTransaction(lsTransaction);
     }
 
-	public void setRecordedBy(UpdateLog obj, int index) {
+    public void setRecordedBy(UpdateLog obj, int index) {
         String recordedBy = "recordedBy_" + index;
         if (recordedBy.length() > 255) {
             recordedBy = recordedBy.substring(0, 255);
@@ -55,17 +55,20 @@ public void setRecordedBy(UpdateLog obj, int index) {
         obj.setRecordedBy(recordedBy);
     }
 
-	public void setRecordedDate(UpdateLog obj, int index) {
-        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH), Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE), Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
+    public void setRecordedDate(UpdateLog obj, int index) {
+        Date recordedDate = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
+                Calendar.getInstance().get(Calendar.HOUR_OF_DAY), Calendar.getInstance().get(Calendar.MINUTE),
+                Calendar.getInstance().get(Calendar.SECOND) + new Double(Math.random() * 1000).intValue()).getTime();
         obj.setRecordedDate(recordedDate);
     }
 
-	public void setThing(UpdateLog obj, int index) {
+    public void setThing(UpdateLog obj, int index) {
         Long thing = new Integer(index).longValue();
         obj.setThing(thing);
     }
 
-	public void setUpdateAction(UpdateLog obj, int index) {
+    public void setUpdateAction(UpdateLog obj, int index) {
         String updateAction = "updateAction_" + index;
         if (updateAction.length() > 255) {
             updateAction = updateAction.substring(0, 255);
@@ -73,7 +76,7 @@ public void setUpdateAction(UpdateLog obj, int index) {
         obj.setUpdateAction(updateAction);
     }
 
-	public UpdateLog getSpecificUpdateLog(int index) {
+    public UpdateLog getSpecificUpdateLog(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -86,18 +89,18 @@ public UpdateLog getSpecificUpdateLog(int index) {
         return UpdateLog.findUpdateLog(id);
     }
 
-	public UpdateLog getRandomUpdateLog() {
+    public UpdateLog getRandomUpdateLog() {
         init();
         UpdateLog obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return UpdateLog.findUpdateLog(id);
     }
 
-	public boolean modifyUpdateLog(UpdateLog obj) {
+    public boolean modifyUpdateLog(UpdateLog obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = UpdateLog.findUpdateLogEntries(from, to);
@@ -107,7 +110,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<UpdateLog>();
         for (int i = 0; i < 10; i++) {
             UpdateLog obj = getNewTransientUpdateLog(i);
@@ -117,7 +120,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/UpdateLogIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/UpdateLogIntegrationTest.java
index 09a6515ba..44b7225c5 100755
--- a/src/test/java/com/labsynch/labseer/domain/UpdateLogIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/UpdateLogIntegrationTest.java
@@ -25,17 +25,17 @@ public class UpdateLogIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     UpdateLogDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountUpdateLogs() {
         Assert.assertNotNull("Data on demand for 'UpdateLog' failed to initialize correctly", dod.getRandomUpdateLog());
         long count = UpdateLog.countUpdateLogs();
         Assert.assertTrue("Counter for 'UpdateLog' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindUpdateLog() {
         UpdateLog obj = dod.getRandomUpdateLog();
         Assert.assertNotNull("Data on demand for 'UpdateLog' failed to initialize correctly", obj);
@@ -46,29 +46,33 @@ public void testFindUpdateLog() {
         Assert.assertEquals("Find method for 'UpdateLog' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllUpdateLogs() {
         Assert.assertNotNull("Data on demand for 'UpdateLog' failed to initialize correctly", dod.getRandomUpdateLog());
         long count = UpdateLog.countUpdateLogs();
-        Assert.assertTrue("Too expensive to perform a find all test for 'UpdateLog', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'UpdateLog', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<UpdateLog> result = UpdateLog.findAllUpdateLogs();
         Assert.assertNotNull("Find all method for 'UpdateLog' illegally returned null", result);
         Assert.assertTrue("Find all method for 'UpdateLog' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindUpdateLogEntries() {
         Assert.assertNotNull("Data on demand for 'UpdateLog' failed to initialize correctly", dod.getRandomUpdateLog());
         long count = UpdateLog.countUpdateLogs();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<UpdateLog> result = UpdateLog.findUpdateLogEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'UpdateLog' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'UpdateLog' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'UpdateLog' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         UpdateLog obj = dod.getRandomUpdateLog();
         Assert.assertNotNull("Data on demand for 'UpdateLog' failed to initialize correctly", obj);
@@ -76,28 +80,31 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'UpdateLog' failed to provide an identifier", id);
         obj = UpdateLog.findUpdateLog(id);
         Assert.assertNotNull("Find method for 'UpdateLog' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyUpdateLog(obj);
+        boolean modified = dod.modifyUpdateLog(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'UpdateLog' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'UpdateLog' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         UpdateLog obj = dod.getRandomUpdateLog();
         Assert.assertNotNull("Data on demand for 'UpdateLog' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'UpdateLog' failed to provide an identifier", id);
         obj = UpdateLog.findUpdateLog(id);
-        boolean modified =  dod.modifyUpdateLog(obj);
+        boolean modified = dod.modifyUpdateLog(obj);
         Integer currentVersion = obj.getVersion();
         UpdateLog merged = obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'UpdateLog' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'UpdateLog' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
         Assert.assertNotNull("Data on demand for 'UpdateLog' failed to initialize correctly", dod.getRandomUpdateLog());
         UpdateLog obj = dod.getNewTransientUpdateLog(Integer.MAX_VALUE);
@@ -109,7 +116,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +126,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'UpdateLog' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         UpdateLog obj = dod.getRandomUpdateLog();
         Assert.assertNotNull("Data on demand for 'UpdateLog' failed to initialize correctly", obj);
diff --git a/src/test/java/com/labsynch/labseer/domain/ValueKindDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ValueKindDataOnDemand.java
index 44cd83207..12dbeaa29 100755
--- a/src/test/java/com/labsynch/labseer/domain/ValueKindDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ValueKindDataOnDemand.java
@@ -17,14 +17,14 @@
 @Component
 public class ValueKindDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<ValueKind> data;
+    private List<ValueKind> data;
 
-	@Autowired
+    @Autowired
     ValueTypeDataOnDemand valueTypeDataOnDemand;
 
-	public ValueKind getNewTransientValueKind(int index) {
+    public ValueKind getNewTransientValueKind(int index) {
         ValueKind obj = new ValueKind();
         setKindName(obj, index);
         setLsType(obj, index);
@@ -32,7 +32,7 @@ public ValueKind getNewTransientValueKind(int index) {
         return obj;
     }
 
-	public void setKindName(ValueKind obj, int index) {
+    public void setKindName(ValueKind obj, int index) {
         String kindName = "kindName_" + index;
         if (kindName.length() > 64) {
             kindName = kindName.substring(0, 64);
@@ -40,12 +40,12 @@ public void setKindName(ValueKind obj, int index) {
         obj.setKindName(kindName);
     }
 
-	public void setLsType(ValueKind obj, int index) {
+    public void setLsType(ValueKind obj, int index) {
         ValueType lsType = valueTypeDataOnDemand.getRandomValueType();
         obj.setLsType(lsType);
     }
 
-	public void setLsTypeAndKind(ValueKind obj, int index) {
+    public void setLsTypeAndKind(ValueKind obj, int index) {
         String lsTypeAndKind = "lsTypeAndKind_" + index;
         if (lsTypeAndKind.length() > 255) {
             lsTypeAndKind = new Random().nextInt(10) + lsTypeAndKind.substring(1, 255);
@@ -53,7 +53,7 @@ public void setLsTypeAndKind(ValueKind obj, int index) {
         obj.setLsTypeAndKind(lsTypeAndKind);
     }
 
-	public ValueKind getSpecificValueKind(int index) {
+    public ValueKind getSpecificValueKind(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -66,18 +66,18 @@ public ValueKind getSpecificValueKind(int index) {
         return ValueKind.findValueKind(id);
     }
 
-	public ValueKind getRandomValueKind() {
+    public ValueKind getRandomValueKind() {
         init();
         ValueKind obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return ValueKind.findValueKind(id);
     }
 
-	public boolean modifyValueKind(ValueKind obj) {
+    public boolean modifyValueKind(ValueKind obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = ValueKind.findValueKindEntries(from, to);
@@ -87,7 +87,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<ValueKind>();
         for (int i = 0; i < 10; i++) {
             ValueKind obj = getNewTransientValueKind(i);
@@ -97,7 +97,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ValueKindIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ValueKindIntegrationTest.java
index 8c6e63d71..d1d1b149f 100755
--- a/src/test/java/com/labsynch/labseer/domain/ValueKindIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ValueKindIntegrationTest.java
@@ -25,17 +25,17 @@ public class ValueKindIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ValueKindDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountValueKinds() {
         Assert.assertNotNull("Data on demand for 'ValueKind' failed to initialize correctly", dod.getRandomValueKind());
         long count = ValueKind.countValueKinds();
         Assert.assertTrue("Counter for 'ValueKind' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindValueKind() {
         ValueKind obj = dod.getRandomValueKind();
         Assert.assertNotNull("Data on demand for 'ValueKind' failed to initialize correctly", obj);
@@ -46,29 +46,33 @@ public void testFindValueKind() {
         Assert.assertEquals("Find method for 'ValueKind' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllValueKinds() {
         Assert.assertNotNull("Data on demand for 'ValueKind' failed to initialize correctly", dod.getRandomValueKind());
         long count = ValueKind.countValueKinds();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ValueKind', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'ValueKind', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<ValueKind> result = ValueKind.findAllValueKinds();
         Assert.assertNotNull("Find all method for 'ValueKind' illegally returned null", result);
         Assert.assertTrue("Find all method for 'ValueKind' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindValueKindEntries() {
         Assert.assertNotNull("Data on demand for 'ValueKind' failed to initialize correctly", dod.getRandomValueKind());
         long count = ValueKind.countValueKinds();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<ValueKind> result = ValueKind.findValueKindEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'ValueKind' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ValueKind' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'ValueKind' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         ValueKind obj = dod.getRandomValueKind();
         Assert.assertNotNull("Data on demand for 'ValueKind' failed to initialize correctly", obj);
@@ -76,28 +80,31 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'ValueKind' failed to provide an identifier", id);
         obj = ValueKind.findValueKind(id);
         Assert.assertNotNull("Find method for 'ValueKind' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyValueKind(obj);
+        boolean modified = dod.modifyValueKind(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'ValueKind' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'ValueKind' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         ValueKind obj = dod.getRandomValueKind();
         Assert.assertNotNull("Data on demand for 'ValueKind' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ValueKind' failed to provide an identifier", id);
         obj = ValueKind.findValueKind(id);
-        boolean modified =  dod.modifyValueKind(obj);
+        boolean modified = dod.modifyValueKind(obj);
         Integer currentVersion = obj.getVersion();
         ValueKind merged = obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ValueKind' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'ValueKind' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
         Assert.assertNotNull("Data on demand for 'ValueKind' failed to initialize correctly", dod.getRandomValueKind());
         ValueKind obj = dod.getNewTransientValueKind(Integer.MAX_VALUE);
@@ -109,7 +116,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +126,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'ValueKind' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         ValueKind obj = dod.getRandomValueKind();
         Assert.assertNotNull("Data on demand for 'ValueKind' failed to initialize correctly", obj);
diff --git a/src/test/java/com/labsynch/labseer/domain/ValueTypeDataOnDemand.java b/src/test/java/com/labsynch/labseer/domain/ValueTypeDataOnDemand.java
index 5efc11909..1a529bc59 100755
--- a/src/test/java/com/labsynch/labseer/domain/ValueTypeDataOnDemand.java
+++ b/src/test/java/com/labsynch/labseer/domain/ValueTypeDataOnDemand.java
@@ -16,17 +16,17 @@
 @Configurable
 public class ValueTypeDataOnDemand {
 
-	private Random rnd = new SecureRandom();
+    private Random rnd = new SecureRandom();
 
-	private List<ValueType> data;
+    private List<ValueType> data;
 
-	public ValueType getNewTransientValueType(int index) {
+    public ValueType getNewTransientValueType(int index) {
         ValueType obj = new ValueType();
         setTypeName(obj, index);
         return obj;
     }
 
-	public void setTypeName(ValueType obj, int index) {
+    public void setTypeName(ValueType obj, int index) {
         String typeName = "typeName_" + index;
         if (typeName.length() > 64) {
             typeName = new Random().nextInt(10) + typeName.substring(1, 64);
@@ -34,7 +34,7 @@ public void setTypeName(ValueType obj, int index) {
         obj.setTypeName(typeName);
     }
 
-	public ValueType getSpecificValueType(int index) {
+    public ValueType getSpecificValueType(int index) {
         init();
         if (index < 0) {
             index = 0;
@@ -47,18 +47,18 @@ public ValueType getSpecificValueType(int index) {
         return ValueType.findValueType(id);
     }
 
-	public ValueType getRandomValueType() {
+    public ValueType getRandomValueType() {
         init();
         ValueType obj = data.get(rnd.nextInt(data.size()));
         Long id = obj.getId();
         return ValueType.findValueType(id);
     }
 
-	public boolean modifyValueType(ValueType obj) {
+    public boolean modifyValueType(ValueType obj) {
         return false;
     }
 
-	public void init() {
+    public void init() {
         int from = 0;
         int to = 10;
         data = ValueType.findValueTypeEntries(from, to);
@@ -68,7 +68,7 @@ public void init() {
         if (!data.isEmpty()) {
             return;
         }
-        
+
         data = new ArrayList<ValueType>();
         for (int i = 0; i < 10; i++) {
             ValueType obj = getNewTransientValueType(i);
@@ -78,7 +78,9 @@ public void init() {
                 final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                     final ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".")
+                            .append(cv.getPropertyPath()).append(": ").append(cv.getMessage())
+                            .append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
                 throw new IllegalStateException(msg.toString(), e);
             }
diff --git a/src/test/java/com/labsynch/labseer/domain/ValueTypeIntegrationTest.java b/src/test/java/com/labsynch/labseer/domain/ValueTypeIntegrationTest.java
index 083525d24..4bd821982 100755
--- a/src/test/java/com/labsynch/labseer/domain/ValueTypeIntegrationTest.java
+++ b/src/test/java/com/labsynch/labseer/domain/ValueTypeIntegrationTest.java
@@ -25,17 +25,17 @@ public class ValueTypeIntegrationTest {
     public void testMarkerMethod() {
     }
 
-	@Autowired
+    @Autowired
     ValueTypeDataOnDemand dod;
 
-	@Test
+    @Test
     public void testCountValueTypes() {
         Assert.assertNotNull("Data on demand for 'ValueType' failed to initialize correctly", dod.getRandomValueType());
         long count = ValueType.countValueTypes();
         Assert.assertTrue("Counter for 'ValueType' incorrectly reported there were no entries", count > 0);
     }
 
-	@Test
+    @Test
     public void testFindValueType() {
         ValueType obj = dod.getRandomValueType();
         Assert.assertNotNull("Data on demand for 'ValueType' failed to initialize correctly", obj);
@@ -46,29 +46,33 @@ public void testFindValueType() {
         Assert.assertEquals("Find method for 'ValueType' returned the incorrect identifier", id, obj.getId());
     }
 
-	@Test
+    @Test
     public void testFindAllValueTypes() {
         Assert.assertNotNull("Data on demand for 'ValueType' failed to initialize correctly", dod.getRandomValueType());
         long count = ValueType.countValueTypes();
-        Assert.assertTrue("Too expensive to perform a find all test for 'ValueType', as there are " + count + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test", count < 250);
+        Assert.assertTrue("Too expensive to perform a find all test for 'ValueType', as there are " + count
+                + " entries; set the findAllMaximum to exceed this value or set findAll=false on the integration test annotation to disable the test",
+                count < 250);
         List<ValueType> result = ValueType.findAllValueTypes();
         Assert.assertNotNull("Find all method for 'ValueType' illegally returned null", result);
         Assert.assertTrue("Find all method for 'ValueType' failed to return any data", result.size() > 0);
     }
 
-	@Test
+    @Test
     public void testFindValueTypeEntries() {
         Assert.assertNotNull("Data on demand for 'ValueType' failed to initialize correctly", dod.getRandomValueType());
         long count = ValueType.countValueTypes();
-        if (count > 20) count = 20;
+        if (count > 20)
+            count = 20;
         int firstResult = 0;
         int maxResults = (int) count;
         List<ValueType> result = ValueType.findValueTypeEntries(firstResult, maxResults);
         Assert.assertNotNull("Find entries method for 'ValueType' illegally returned null", result);
-        Assert.assertEquals("Find entries method for 'ValueType' returned an incorrect number of entries", count, result.size());
+        Assert.assertEquals("Find entries method for 'ValueType' returned an incorrect number of entries", count,
+                result.size());
     }
 
-	@Test
+    @Test
     public void testFlush() {
         ValueType obj = dod.getRandomValueType();
         Assert.assertNotNull("Data on demand for 'ValueType' failed to initialize correctly", obj);
@@ -76,28 +80,31 @@ public void testFlush() {
         Assert.assertNotNull("Data on demand for 'ValueType' failed to provide an identifier", id);
         obj = ValueType.findValueType(id);
         Assert.assertNotNull("Find method for 'ValueType' illegally returned null for id '" + id + "'", obj);
-        boolean modified =  dod.modifyValueType(obj);
+        boolean modified = dod.modifyValueType(obj);
         Integer currentVersion = obj.getVersion();
         obj.flush();
-        Assert.assertTrue("Version for 'ValueType' failed to increment on flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertTrue("Version for 'ValueType' failed to increment on flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testMergeUpdate() {
         ValueType obj = dod.getRandomValueType();
         Assert.assertNotNull("Data on demand for 'ValueType' failed to initialize correctly", obj);
         Long id = obj.getId();
         Assert.assertNotNull("Data on demand for 'ValueType' failed to provide an identifier", id);
         obj = ValueType.findValueType(id);
-        boolean modified =  dod.modifyValueType(obj);
+        boolean modified = dod.modifyValueType(obj);
         Integer currentVersion = obj.getVersion();
         ValueType merged = obj.merge();
         obj.flush();
-        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(), id);
-        Assert.assertTrue("Version for 'ValueType' failed to increment on merge and flush directive", (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
+        Assert.assertEquals("Identifier of merged object not the same as identifier of original object", merged.getId(),
+                id);
+        Assert.assertTrue("Version for 'ValueType' failed to increment on merge and flush directive",
+                (currentVersion != null && obj.getVersion() > currentVersion) || !modified);
     }
 
-	@Test
+    @Test
     public void testPersist() {
         Assert.assertNotNull("Data on demand for 'ValueType' failed to initialize correctly", dod.getRandomValueType());
         ValueType obj = dod.getNewTransientValueType(Integer.MAX_VALUE);
@@ -109,7 +116,9 @@ public void testPersist() {
             final StringBuilder msg = new StringBuilder();
             for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
                 final ConstraintViolation<?> cv = iter.next();
-                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath())
+                        .append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue())
+                        .append(")").append("]");
             }
             throw new IllegalStateException(msg.toString(), e);
         }
@@ -117,7 +126,7 @@ public void testPersist() {
         Assert.assertNotNull("Expected 'ValueType' identifier to no longer be null", obj.getId());
     }
 
-	@Test
+    @Test
     public void testRemove() {
         ValueType obj = dod.getRandomValueType();
         Assert.assertNotNull("Data on demand for 'ValueType' failed to initialize correctly", obj);
diff --git a/src/test/java/com/labsynch/labseer/domainImpl/AnalysisGroupValueTest.java b/src/test/java/com/labsynch/labseer/domainImpl/AnalysisGroupValueTest.java
index 4e7a17e98..73526abf5 100644
--- a/src/test/java/com/labsynch/labseer/domainImpl/AnalysisGroupValueTest.java
+++ b/src/test/java/com/labsynch/labseer/domainImpl/AnalysisGroupValueTest.java
@@ -23,49 +23,53 @@
 import org.springframework.transaction.annotation.Transactional;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class AnalysisGroupValueTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(AnalysisGroupValueTest.class);
-	
-	//@Test
+
+	// @Test
 	@Transactional
-    public void getLsthingsByName() {
-    	String lsType = "gene";
+	public void getLsthingsByName() {
+		String lsType = "gene";
 		String lsKind = "entrez gene";
 		String labelType = "name";
 		String labelKind = "Entrez Gene ID";
 		String labelText = "47767";
-		List<LsThing> results = LsThing.findLsThingByLabelText(lsType, lsKind, labelType, labelKind, labelText).getResultList();
+		List<LsThing> results = LsThing.findLsThingByLabelText(lsType, lsKind, labelType, labelKind, labelText)
+				.getResultList();
 		logger.info("query labelText: " + labelText + " number of results: " + results.size());
-		if (results.size()>0){
-			for(LsThing result : results){
-				//12597
-				logger.info("attempting to output JSON: -----------------  " + result.getCodeName() + "  " + result.getId());
-//				LsThing newThing = LsThing.findLsThing(result.getId());
-//				Set<LsTag> tags = newThing.getLsTags();
-//				for (LsTag tag:tags){
-//					logger.info("tag here: " + tag.toJson());
-//				}
+		if (results.size() > 0) {
+			for (LsThing result : results) {
+				// 12597
+				logger.info("attempting to output JSON: -----------------  " + result.getCodeName() + "  "
+						+ result.getId());
+				// LsThing newThing = LsThing.findLsThing(result.getId());
+				// Set<LsTag> tags = newThing.getLsTags();
+				// for (LsTag tag:tags){
+				// logger.info("tag here: " + tag.toJson());
+				// }
 				logger.info(result.toJson());
 			}
 		}
 	}
-	
-		@Test
+
+	@Test
 	@Transactional
-	public void QueryAnalysisGroupValueByExpIdAndStateTypeKind(){
-			
+	public void QueryAnalysisGroupValueByExpIdAndStateTypeKind() {
+
 		Long experimentId = 9L;
 		String stateType = "data";
 		String stateKind = "Generic";
-		List<AnalysisGroupValue> results = AnalysisGroupValue.findAnalysisGroupValuesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getResultList();
+		List<AnalysisGroupValue> results = AnalysisGroupValue
+				.findAnalysisGroupValuesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getResultList();
 		logger.info(AnalysisGroupValue.toJsonArray(results));
-		assert(results.size() == 11);
+		assert (results.size() == 11);
 	}
-	
-	//@Test
+
+	// @Test
 	@Transactional
 	public void QueryAnalysisGroupValueByExpIdAndStateTypeKindWithBadData() {
 		Long experimentId = 9L;
@@ -73,14 +77,16 @@ public void QueryAnalysisGroupValueByExpIdAndStateTypeKindWithBadData() {
 		String stateKind = "experiment metadata";
 		List<AnalysisGroupValue> results = new ArrayList<AnalysisGroupValue>();
 		try {
-			results = AnalysisGroupValue.findAnalysisGroupValuesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getResultList();
-		} catch(IllegalArgumentException ex ) {
+			results = AnalysisGroupValue
+					.findAnalysisGroupValuesByExptIDAndStateTypeKind(experimentId, stateType, stateKind)
+					.getResultList();
+		} catch (IllegalArgumentException ex) {
 			logger.info(ex.getMessage());
 		}
-		assert(results.size() == 0);
+		assert (results.size() == 0);
 	}
-	
-	//@Test
+
+	// @Test
 	@Transactional
 	public void QueryAnalysisGroupValueByExpIdAndStateTypeKindWithCodeName() {
 		String experimentCodeName = "EXPT-00000003";
@@ -90,46 +96,54 @@ public void QueryAnalysisGroupValueByExpIdAndStateTypeKindWithCodeName() {
 		boolean didCatch = false;
 		try {
 			experiment = Experiment.findExperimentsByCodeNameEquals(experimentCodeName).getSingleResult();
-		} catch(NoResultException nre) {
+		} catch (NoResultException nre) {
 			logger.info(nre.getMessage());
 			didCatch = true;
 		}
 		List<AnalysisGroupValue> results = new ArrayList<AnalysisGroupValue>();
 		try {
-			results = AnalysisGroupValue.findAnalysisGroupValuesByExptIDAndStateTypeKind(experiment.getId(), stateType, stateKind).getResultList();
-		} catch(IllegalArgumentException ex ) {
+			results = AnalysisGroupValue
+					.findAnalysisGroupValuesByExptIDAndStateTypeKind(experiment.getId(), stateType, stateKind)
+					.getResultList();
+		} catch (IllegalArgumentException ex) {
 			logger.info(ex.getMessage());
-			assert(results.size() == 0);
+			assert (results.size() == 0);
 			didCatch = true;
 		}
-		if(!didCatch) assert(results.size() == 11);
+		if (!didCatch)
+			assert (results.size() == 11);
 	}
-	
-	//@Test
+
+	// @Test
 	@Transactional
-	public void QueryAnalysisGroupValueByExpIdAndStateTypeKindAndValueTypeKind(){
-			
+	public void QueryAnalysisGroupValueByExpIdAndStateTypeKindAndValueTypeKind() {
+
 		Long experimentId = 9L;
 		String stateType = "data";
 		String stateKind = "Generic";
 		String valueType = "numericValue";
 		String valueKind = "solubility";
-		List<AnalysisGroupValue> results = AnalysisGroupValue.findAnalysisGroupValuesByExptIDAndStateTypeKindAndValueTypeKind(experimentId, stateType, stateKind, valueType, valueKind).getResultList();
+		List<AnalysisGroupValue> results = AnalysisGroupValue
+				.findAnalysisGroupValuesByExptIDAndStateTypeKindAndValueTypeKind(experimentId, stateType, stateKind,
+						valueType, valueKind)
+				.getResultList();
 		logger.info(AnalysisGroupValue.toJsonArray(results));
-		assert(results.size() == 2);
+		assert (results.size() == 2);
 	}
-	
-	//@Test
+
+	// @Test
 	@Transactional
 	public void QueryAnalysisGroupValueByAnalysisGroupIdStateTypeAndKind() {
 		Long analysisGroupId = 10L;
 		String stateType = "data";
 		String stateKind = "Generic";
-		List<AnalysisGroupValue> analysisGroupValues = AnalysisGroupValue.findAnalysisGroupValuesByAnalysisGroupIDAndStateTypeKind(analysisGroupId, stateType, stateKind).getResultList();
+		List<AnalysisGroupValue> analysisGroupValues = AnalysisGroupValue
+				.findAnalysisGroupValuesByAnalysisGroupIDAndStateTypeKind(analysisGroupId, stateType, stateKind)
+				.getResultList();
 		logger.info(String.valueOf(analysisGroupValues.size()));
 	}
-	
-	//@Test
+
+	// @Test
 	@Transactional
 	public void QueryAnalysisGroupValueByAnalysisGroupIdStateTypeAndKindAndValueTypeKind() {
 		Long analysisGroupId = 10L;
@@ -137,10 +151,13 @@ public void QueryAnalysisGroupValueByAnalysisGroupIdStateTypeAndKindAndValueType
 		String stateKind = "Generic";
 		String valueType = "stringValue";
 		String valueKind = "Assay Comment";
-		List<AnalysisGroupValue> analysisGroupValues = AnalysisGroupValue.findAnalysisGroupValuesByAnalysisGroupIDAndStateTypeKindAndValueTypeKind(analysisGroupId, stateType, stateKind, valueType, valueKind).getResultList();
+		List<AnalysisGroupValue> analysisGroupValues = AnalysisGroupValue
+				.findAnalysisGroupValuesByAnalysisGroupIDAndStateTypeKindAndValueTypeKind(analysisGroupId, stateType,
+						stateKind, valueType, valueKind)
+				.getResultList();
 		logger.info(String.valueOf(analysisGroupValues.size()));
 	}
-	
+
 	@Test
 	@Transactional
 	public void queryAGDataTest() {
@@ -156,15 +173,14 @@ public void queryAGDataTest() {
 		searchRequest.setBatchCodeList(finalUniqueBatchCodes);
 		logger.info(searchRequest.toJson());
 		boolean onlyPublicData = true;
-		List<AnalysisGroupValueDTO> results = AnalysisGroupValue.findAnalysisGroupValueDTO(finalUniqueBatchCodes, searchRequest.getExperimentCodeList(), onlyPublicData);
+		List<AnalysisGroupValueDTO> results = AnalysisGroupValue.findAnalysisGroupValueDTO(finalUniqueBatchCodes,
+				searchRequest.getExperimentCodeList(), onlyPublicData);
 		logger.info("number of results found: " + results.size());
 		logger.info(AnalysisGroupValueDTO.toPrettyJsonArray(results));
-		
-//		Experiment experiment = Experiment.findExperiment(17151L);
-//		logger.info(experiment.toJson());
-		
+
+		// Experiment experiment = Experiment.findExperiment(17151L);
+		// logger.info(experiment.toJson());
+
 	}
 
-	
-	
 }
diff --git a/src/test/java/com/labsynch/labseer/domainImpl/ExperimentStateTest.java b/src/test/java/com/labsynch/labseer/domainImpl/ExperimentStateTest.java
index 5199aba04..95651e25c 100644
--- a/src/test/java/com/labsynch/labseer/domainImpl/ExperimentStateTest.java
+++ b/src/test/java/com/labsynch/labseer/domainImpl/ExperimentStateTest.java
@@ -18,24 +18,26 @@
 import org.springframework.transaction.annotation.Transactional;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class ExperimentStateTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(ExperimentStateTest.class);
-	
+
 	@Test
 	@Transactional
-	public void QueryExperimentStateByExpIdAndStateTypeKind(){
-			
+	public void QueryExperimentStateByExpIdAndStateTypeKind() {
+
 		Long experimentId = 9L;
 		String stateType = "metadata";
 		String stateKind = "experiment metadata";
-		List<ExperimentState> results = ExperimentState.findExperimentStatesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getResultList();
+		List<ExperimentState> results = ExperimentState
+				.findExperimentStatesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getResultList();
 		logger.info(ExperimentState.toJsonArray(results));
-		assert(results.size() == 5);
+		assert (results.size() == 5);
 	}
-	
+
 	@Test
 	@Transactional
 	public void QueryExperimentStateByExpIdAndStateTypeKindWithBadData() {
@@ -44,13 +46,14 @@ public void QueryExperimentStateByExpIdAndStateTypeKindWithBadData() {
 		String stateKind = "experiment metadata";
 		List<ExperimentState> results = new ArrayList<ExperimentState>();
 		try {
-			results = ExperimentState.findExperimentStatesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getResultList();
-		} catch(IllegalArgumentException ex ) {
+			results = ExperimentState.findExperimentStatesByExptIDAndStateTypeKind(experimentId, stateType, stateKind)
+					.getResultList();
+		} catch (IllegalArgumentException ex) {
 			logger.info(ex.getMessage());
 		}
-		assert(results.size() == 0);
+		assert (results.size() == 0);
 	}
-	
+
 	@Test
 	@Transactional
 	public void QueryExperimentStateByExpIdAndStateTypeKindWithCodeName() {
@@ -61,18 +64,21 @@ public void QueryExperimentStateByExpIdAndStateTypeKindWithCodeName() {
 		boolean didCatch = false;
 		try {
 			experiment = Experiment.findExperimentsByCodeNameEquals(experimentCodeName).getSingleResult();
-		} catch(NoResultException nre) {
+		} catch (NoResultException nre) {
 			logger.info(nre.getMessage());
 			didCatch = true;
 		}
 		List<ExperimentState> results = new ArrayList<ExperimentState>();
 		try {
-			results = ExperimentState.findExperimentStatesByExptIDAndStateTypeKind(experiment.getId(), stateType, stateKind).getResultList();
-		} catch(IllegalArgumentException ex ) {
+			results = ExperimentState
+					.findExperimentStatesByExptIDAndStateTypeKind(experiment.getId(), stateType, stateKind)
+					.getResultList();
+		} catch (IllegalArgumentException ex) {
 			logger.info(ex.getMessage());
-			assert(results.size() == 0);
+			assert (results.size() == 0);
 			didCatch = true;
 		}
-		if(!didCatch) assert(results.size() == 5);
+		if (!didCatch)
+			assert (results.size() == 5);
 	}
 }
diff --git a/src/test/java/com/labsynch/labseer/domainImpl/ExperimentTest.java b/src/test/java/com/labsynch/labseer/domainImpl/ExperimentTest.java
index 09642ae75..dc382161b 100644
--- a/src/test/java/com/labsynch/labseer/domainImpl/ExperimentTest.java
+++ b/src/test/java/com/labsynch/labseer/domainImpl/ExperimentTest.java
@@ -15,19 +15,21 @@
 import org.springframework.transaction.annotation.Transactional;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class ExperimentTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(ExperimentTest.class);
-	
+
 	@Test
 	@Transactional
-	public void QueryExperimentByProtocolTypeKindAndExperimentTypeKind() {			
+	public void QueryExperimentByProtocolTypeKindAndExperimentTypeKind() {
 		Protocol protocol = Protocol.findProtocol(13l);
-		List<Experiment> results = Experiment.findExperimentsByProtocolTypeAndKindAndExperimentTypeAndKind(protocol.getLsType(), protocol.getLsKind(), "default", "default").getResultList();
+		List<Experiment> results = Experiment.findExperimentsByProtocolTypeAndKindAndExperimentTypeAndKind(
+				protocol.getLsType(), protocol.getLsKind(), "default", "default").getResultList();
 		logger.info(Experiment.toJsonArray(results));
-		assert(results.size() == 1);
+		assert (results.size() == 1);
 	}
 
 }
diff --git a/src/test/java/com/labsynch/labseer/domainImpl/ExperimentValueTest.java b/src/test/java/com/labsynch/labseer/domainImpl/ExperimentValueTest.java
index 98026168a..8783da120 100644
--- a/src/test/java/com/labsynch/labseer/domainImpl/ExperimentValueTest.java
+++ b/src/test/java/com/labsynch/labseer/domainImpl/ExperimentValueTest.java
@@ -18,38 +18,41 @@
 import org.springframework.transaction.annotation.Transactional;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class ExperimentValueTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(ExperimentValueTest.class);
 
 	@Test
 	@Transactional
-	public void QueryExperimentValueByKinds(){
-		
+	public void QueryExperimentValueByKinds() {
+
 		Long experimentId = 9L;
 		String stateType = "metadata";
 		String stateKind = "experiment metadata";
 		String valueType = "stringValue";
 		String valueKind = "analysis status";
-		List<ExperimentValue> results = ExperimentValue.findExperimentValuesByExptIDAndStateTypeKindAndValueTypeKind(experimentId, stateType, stateKind, valueType, valueKind).getResultList();
+		List<ExperimentValue> results = ExperimentValue.findExperimentValuesByExptIDAndStateTypeKindAndValueTypeKind(
+				experimentId, stateType, stateKind, valueType, valueKind).getResultList();
 		logger.info(ExperimentValue.toJsonArray(results));
-		//do some asserts to validate the tests are correct
+		// do some asserts to validate the tests are correct
 	}
-	
+
 	@Test
 	@Transactional
-	public void QueryExperimentValueByExpIdAndStateTypeKind(){
-			
+	public void QueryExperimentValueByExpIdAndStateTypeKind() {
+
 		Long experimentId = 9L;
 		String stateType = "metadata";
 		String stateKind = "experiment metadata";
-		List<ExperimentValue> results = ExperimentValue.findExperimentValuesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getResultList();
+		List<ExperimentValue> results = ExperimentValue
+				.findExperimentValuesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getResultList();
 		logger.info(ExperimentValue.toJsonArray(results));
-		assert(results.size() == 8);
+		assert (results.size() == 8);
 	}
-	
+
 	@Test
 	@Transactional
 	public void QueryExperimentValueByExpIdAndStateTypeKindWithBadData() {
@@ -58,13 +61,14 @@ public void QueryExperimentValueByExpIdAndStateTypeKindWithBadData() {
 		String stateKind = "experiment metadata";
 		List<ExperimentValue> results = new ArrayList<ExperimentValue>();
 		try {
-			results = ExperimentValue.findExperimentValuesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getResultList();
-		} catch(IllegalArgumentException ex ) {
+			results = ExperimentValue.findExperimentValuesByExptIDAndStateTypeKind(experimentId, stateType, stateKind)
+					.getResultList();
+		} catch (IllegalArgumentException ex) {
 			logger.info(ex.getMessage());
 		}
-		assert(results.size() == 0);
+		assert (results.size() == 0);
 	}
-	
+
 	@Test
 	@Transactional
 	public void QueryExperimentValueByExpIdAndStateTypeKindWithCodeName() {
@@ -75,21 +79,24 @@ public void QueryExperimentValueByExpIdAndStateTypeKindWithCodeName() {
 		boolean didCatch = false;
 		try {
 			experiment = Experiment.findExperimentsByCodeNameEquals(experimentCodeName).getSingleResult();
-		} catch(NoResultException nre) {
+		} catch (NoResultException nre) {
 			logger.info(nre.getMessage());
 			didCatch = true;
 		}
 		List<ExperimentValue> results = new ArrayList<ExperimentValue>();
 		try {
-			results = ExperimentValue.findExperimentValuesByExptIDAndStateTypeKind(experiment.getId(), stateType, stateKind).getResultList();
-		} catch(IllegalArgumentException ex ) {
+			results = ExperimentValue
+					.findExperimentValuesByExptIDAndStateTypeKind(experiment.getId(), stateType, stateKind)
+					.getResultList();
+		} catch (IllegalArgumentException ex) {
 			logger.info(ex.getMessage());
-			assert(results.size() == 0);
+			assert (results.size() == 0);
 			didCatch = true;
 		}
-		if(!didCatch) assert(results.size() == 8);
+		if (!didCatch)
+			assert (results.size() == 8);
 	}
-	
+
 	@Test
 	@Transactional
 	public void updateExperimentValueTest() {
@@ -102,5 +109,5 @@ public void updateExperimentValueTest() {
 		ExperimentValue ev3 = ExperimentValue.findExperimentValue(experimentValue.getId());
 		logger.debug(ev3.toJson());
 	}
-	
+
 }
diff --git a/src/test/java/com/labsynch/labseer/domainImpl/ItxLsThingsTest.java b/src/test/java/com/labsynch/labseer/domainImpl/ItxLsThingsTest.java
index 4dab91529..7997c9f88 100644
--- a/src/test/java/com/labsynch/labseer/domainImpl/ItxLsThingsTest.java
+++ b/src/test/java/com/labsynch/labseer/domainImpl/ItxLsThingsTest.java
@@ -15,30 +15,34 @@
 import org.springframework.transaction.annotation.Transactional;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class ItxLsThingsTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(ItxLsThingsTest.class);
-	
+
 	@Test
 	@Transactional
-    public void getSingleItxLsThingTest1() {
+	public void getSingleItxLsThingTest1() {
 		Long itxId = 216082L;
 		ItxLsThingLsThing itxLs = ItxLsThingLsThing.findItxLsThingLsThing(itxId);
 		logger.info(itxLs.toJson());
-	
+
 	}
-	
+
 	@Test
 	@Transactional
-    public void getItxLsThingTest2() {
+	public void getItxLsThingTest2() {
 		Long thingId = 216221L;
 		LsThing lsThing = LsThing.findLsThing(thingId);
-		List<ItxLsThingLsThing> itxLsSet = ItxLsThingLsThing.findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndFirstLsThingEquals("supports", "reference_gene", lsThing).getResultList();
+		List<ItxLsThingLsThing> itxLsSet = ItxLsThingLsThing
+				.findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndFirstLsThingEquals("supports", "reference_gene",
+						lsThing)
+				.getResultList();
 		logger.info("############ Set of interactions ##########");
 		logger.info(ItxLsThingLsThing.toJsonArray(itxLsSet));
-	
+
 	}
-	
+
 }
diff --git a/src/test/java/com/labsynch/labseer/domainImpl/LsThingTest.java b/src/test/java/com/labsynch/labseer/domainImpl/LsThingTest.java
index 73e2d8b2c..37ad7ad42 100644
--- a/src/test/java/com/labsynch/labseer/domainImpl/LsThingTest.java
+++ b/src/test/java/com/labsynch/labseer/domainImpl/LsThingTest.java
@@ -21,13 +21,13 @@
 import org.springframework.transaction.annotation.Transactional;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class LsThingTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(LsThingTest.class);
 
-
 	@Test
 	@Transactional
 	public void getLsthingsByProjectName() {
@@ -36,15 +36,17 @@ public void getLsthingsByProjectName() {
 		String labelType = "name";
 		String labelKind = "project name";
 		String labelText = "Project 1";
-		List<LsThing> results = LsThing.findLsThingByLabelText(lsType, lsKind, labelType, labelKind, labelText).getResultList();
+		List<LsThing> results = LsThing.findLsThingByLabelText(lsType, lsKind, labelType, labelKind, labelText)
+				.getResultList();
 		logger.info("query labelText: " + labelText + " number of results: " + results.size());
-		if (results.size()>0){
-			for(LsThing result : results){
-				//12597
-				logger.info("attempting to output JSON: -----------------  " + result.getCodeName() + "  " + result.getId());
+		if (results.size() > 0) {
+			for (LsThing result : results) {
+				// 12597
+				logger.info("attempting to output JSON: -----------------  " + result.getCodeName() + "  "
+						+ result.getId());
 				LsThing newThing = LsThing.findLsThing(result.getId());
 				Set<LsTag> tags = newThing.getLsTags();
-				for (LsTag tag:tags){
+				for (LsTag tag : tags) {
 					logger.info("tag here: " + tag.toJson());
 				}
 				logger.info(newThing.toJson());
@@ -52,7 +54,7 @@ public void getLsthingsByProjectName() {
 		}
 	}
 
-	//@Test
+	// @Test
 	@Transactional
 	public void getLsthingsByName() {
 		String lsType = "gene";
@@ -60,15 +62,17 @@ public void getLsthingsByName() {
 		String labelType = "name";
 		String labelKind = "Entrez Gene ID";
 		String labelText = "47767";
-		List<LsThing> results = LsThing.findLsThingByLabelText(lsType, lsKind, labelType, labelKind, labelText).getResultList();
+		List<LsThing> results = LsThing.findLsThingByLabelText(lsType, lsKind, labelType, labelKind, labelText)
+				.getResultList();
 		logger.info("query labelText: " + labelText + " number of results: " + results.size());
-		if (results.size()>0){
-			for(LsThing result : results){
-				//12597
-				logger.info("attempting to output JSON: -----------------  " + result.getCodeName() + "  " + result.getId());
+		if (results.size() > 0) {
+			for (LsThing result : results) {
+				// 12597
+				logger.info("attempting to output JSON: -----------------  " + result.getCodeName() + "  "
+						+ result.getId());
 				LsThing newThing = LsThing.findLsThing(result.getId());
 				Set<LsTag> tags = newThing.getLsTags();
-				for (LsTag tag:tags){
+				for (LsTag tag : tags) {
 					logger.info("tag here: " + tag.toJson());
 				}
 				logger.info(newThing.toJson());
@@ -76,20 +80,20 @@ public void getLsthingsByName() {
 		}
 	}
 
-
-	//@Test
+	// @Test
 	@Transactional
-	public void QueryAnalysisGroupValueByExpIdAndStateTypeKind(){
+	public void QueryAnalysisGroupValueByExpIdAndStateTypeKind() {
 
 		Long experimentId = 9L;
 		String stateType = "data";
 		String stateKind = "Generic";
-		List<AnalysisGroupValue> results = AnalysisGroupValue.findAnalysisGroupValuesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getResultList();
+		List<AnalysisGroupValue> results = AnalysisGroupValue
+				.findAnalysisGroupValuesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getResultList();
 		logger.info(AnalysisGroupValue.toJsonArray(results));
-		assert(results.size() == 11);
+		assert (results.size() == 11);
 	}
 
-	//@Test
+	// @Test
 	@Transactional
 	public void QueryAnalysisGroupValueByExpIdAndStateTypeKindWithBadData() {
 		Long experimentId = 9L;
@@ -97,14 +101,16 @@ public void QueryAnalysisGroupValueByExpIdAndStateTypeKindWithBadData() {
 		String stateKind = "experiment metadata";
 		List<AnalysisGroupValue> results = new ArrayList<AnalysisGroupValue>();
 		try {
-			results = AnalysisGroupValue.findAnalysisGroupValuesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getResultList();
-		} catch(IllegalArgumentException ex ) {
+			results = AnalysisGroupValue
+					.findAnalysisGroupValuesByExptIDAndStateTypeKind(experimentId, stateType, stateKind)
+					.getResultList();
+		} catch (IllegalArgumentException ex) {
 			logger.info(ex.getMessage());
 		}
-		assert(results.size() == 0);
+		assert (results.size() == 0);
 	}
 
-	//@Test
+	// @Test
 	@Transactional
 	public void QueryAnalysisGroupValueByExpIdAndStateTypeKindWithCodeName() {
 		String experimentCodeName = "EXPT-00000003";
@@ -114,33 +120,39 @@ public void QueryAnalysisGroupValueByExpIdAndStateTypeKindWithCodeName() {
 		boolean didCatch = false;
 		try {
 			experiment = Experiment.findExperimentsByCodeNameEquals(experimentCodeName).getSingleResult();
-		} catch(NoResultException nre) {
+		} catch (NoResultException nre) {
 			logger.info(nre.getMessage());
 			didCatch = true;
 		}
 		List<AnalysisGroupValue> results = new ArrayList<AnalysisGroupValue>();
 		try {
-			results = AnalysisGroupValue.findAnalysisGroupValuesByExptIDAndStateTypeKind(experiment.getId(), stateType, stateKind).getResultList();
-		} catch(IllegalArgumentException ex ) {
+			results = AnalysisGroupValue
+					.findAnalysisGroupValuesByExptIDAndStateTypeKind(experiment.getId(), stateType, stateKind)
+					.getResultList();
+		} catch (IllegalArgumentException ex) {
 			logger.info(ex.getMessage());
-			assert(results.size() == 0);
+			assert (results.size() == 0);
 			didCatch = true;
 		}
-		if(!didCatch) assert(results.size() == 11);
+		if (!didCatch)
+			assert (results.size() == 11);
 	}
 
-	//@Test
+	// @Test
 	@Transactional
-	public void QueryAnalysisGroupValueByExpIdAndStateTypeKindAndValueTypeKind(){
+	public void QueryAnalysisGroupValueByExpIdAndStateTypeKindAndValueTypeKind() {
 
 		Long experimentId = 9L;
 		String stateType = "data";
 		String stateKind = "Generic";
 		String valueType = "numericValue";
 		String valueKind = "solubility";
-		List<AnalysisGroupValue> results = AnalysisGroupValue.findAnalysisGroupValuesByExptIDAndStateTypeKindAndValueTypeKind(experimentId, stateType, stateKind, valueType, valueKind).getResultList();
+		List<AnalysisGroupValue> results = AnalysisGroupValue
+				.findAnalysisGroupValuesByExptIDAndStateTypeKindAndValueTypeKind(experimentId, stateType, stateKind,
+						valueType, valueKind)
+				.getResultList();
 		logger.info(AnalysisGroupValue.toJsonArray(results));
-		assert(results.size() == 2);
+		assert (results.size() == 2);
 	}
 
 	@Test
@@ -149,7 +161,9 @@ public void QueryAnalysisGroupValueByAnalysisGroupIdStateTypeAndKind() {
 		Long analysisGroupId = 10L;
 		String stateType = "data";
 		String stateKind = "Generic";
-		List<AnalysisGroupValue> analysisGroupValues = AnalysisGroupValue.findAnalysisGroupValuesByAnalysisGroupIDAndStateTypeKind(analysisGroupId, stateType, stateKind).getResultList();
+		List<AnalysisGroupValue> analysisGroupValues = AnalysisGroupValue
+				.findAnalysisGroupValuesByAnalysisGroupIDAndStateTypeKind(analysisGroupId, stateType, stateKind)
+				.getResultList();
 		logger.info(String.valueOf(analysisGroupValues.size()));
 	}
 
@@ -161,9 +175,11 @@ public void QueryAnalysisGroupValueByAnalysisGroupIdStateTypeAndKindAndValueType
 		String stateKind = "Generic";
 		String valueType = "stringValue";
 		String valueKind = "Assay Comment";
-		List<AnalysisGroupValue> analysisGroupValues = AnalysisGroupValue.findAnalysisGroupValuesByAnalysisGroupIDAndStateTypeKindAndValueTypeKind(analysisGroupId, stateType, stateKind, valueType, valueKind).getResultList();
+		List<AnalysisGroupValue> analysisGroupValues = AnalysisGroupValue
+				.findAnalysisGroupValuesByAnalysisGroupIDAndStateTypeKindAndValueTypeKind(analysisGroupId, stateType,
+						stateKind, valueType, valueKind)
+				.getResultList();
 		logger.info(String.valueOf(analysisGroupValues.size()));
 	}
 
-
 }
diff --git a/src/test/java/com/labsynch/labseer/domainImpl/SubjectValueTest.java b/src/test/java/com/labsynch/labseer/domainImpl/SubjectValueTest.java
index 5a03e5e28..3b6db7b42 100644
--- a/src/test/java/com/labsynch/labseer/domainImpl/SubjectValueTest.java
+++ b/src/test/java/com/labsynch/labseer/domainImpl/SubjectValueTest.java
@@ -18,25 +18,27 @@
 import org.springframework.transaction.annotation.Transactional;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class SubjectValueTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(SubjectValueTest.class);
-	
-	//@Test
+
+	// @Test
 	@Transactional
-	public void QuerySubjectValueByExpIdAndStateTypeKind(){
-			
+	public void QuerySubjectValueByExpIdAndStateTypeKind() {
+
 		Long experimentId = 14L;
 		String stateType = "data";
 		String stateKind = "test compound treatment";
-		List<SubjectValue> results = SubjectValue.findSubjectValuesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getResultList();
+		List<SubjectValue> results = SubjectValue
+				.findSubjectValuesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getResultList();
 		logger.info(SubjectValue.toJsonArray(results));
-		assert(results.size() == 800);
+		assert (results.size() == 800);
 	}
-	
-	//@Test
+
+	// @Test
 	@Transactional
 	public void QuerySubjectValueByExpIdAndStateTypeKindWithBadData() {
 		Long experimentId = 14L;
@@ -44,14 +46,15 @@ public void QuerySubjectValueByExpIdAndStateTypeKindWithBadData() {
 		String stateKind = "experiment metadata";
 		List<SubjectValue> results = new ArrayList<SubjectValue>();
 		try {
-			results = SubjectValue.findSubjectValuesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getResultList();
-		} catch(IllegalArgumentException ex ) {
+			results = SubjectValue.findSubjectValuesByExptIDAndStateTypeKind(experimentId, stateType, stateKind)
+					.getResultList();
+		} catch (IllegalArgumentException ex) {
 			logger.info(ex.getMessage());
 		}
-		assert(results.size() == 0);
+		assert (results.size() == 0);
 	}
-	
-	//@Test
+
+	// @Test
 	@Transactional
 	public void QuerySubjectValueByExpIdAndStateTypeKindWithCodeName() {
 		String experimentCodeName = "EXPT-00000004";
@@ -61,42 +64,47 @@ public void QuerySubjectValueByExpIdAndStateTypeKindWithCodeName() {
 		boolean didCatch = false;
 		try {
 			experiment = Experiment.findExperimentsByCodeNameEquals(experimentCodeName).getSingleResult();
-		} catch(NoResultException nre) {
+		} catch (NoResultException nre) {
 			logger.info(nre.getMessage());
 			didCatch = true;
 		}
 		List<SubjectValue> results = new ArrayList<SubjectValue>();
 		try {
-			results = SubjectValue.findSubjectValuesByExptIDAndStateTypeKind(experiment.getId(), stateType, stateKind).getResultList();
-		} catch(IllegalArgumentException ex ) {
+			results = SubjectValue.findSubjectValuesByExptIDAndStateTypeKind(experiment.getId(), stateType, stateKind)
+					.getResultList();
+		} catch (IllegalArgumentException ex) {
 			logger.info(ex.getMessage());
-			assert(results.size() == 0);
+			assert (results.size() == 0);
 			didCatch = true;
 		}
-		if(!didCatch) assert(results.size() == 800);
+		if (!didCatch)
+			assert (results.size() == 800);
 	}
-	
-	//@Test
+
+	// @Test
 	@Transactional
-	public void QuerySubjectValueByExpIdAndStateTypeKindAndValueTypeKind(){
-			
+	public void QuerySubjectValueByExpIdAndStateTypeKindAndValueTypeKind() {
+
 		Long experimentId = 14L;
 		String stateType = "data";
 		String stateKind = "test compound treatment";
 		String valueType = "numericValue";
 		String valueKind = "Dose";
-		List<SubjectValue> results = SubjectValue.findSubjectValuesByExptIDAndStateTypeKindAndValueTypeKind(experimentId, stateType, stateKind, valueType, valueKind).getResultList();
+		List<SubjectValue> results = SubjectValue.findSubjectValuesByExptIDAndStateTypeKindAndValueTypeKind(
+				experimentId, stateType, stateKind, valueType, valueKind).getResultList();
 		logger.info(SubjectValue.toJsonArray(results));
-		assert(results.size() == 400);
+		assert (results.size() == 400);
 	}
-	
+
 	@Test
 	@Transactional
 	public void QuerySubjectValueByAnalysisGroupIdStateTypeAndKind() {
 		Long analysisGroupId = 15L;
 		String stateType = "data";
 		String stateKind = "results";
-		List<SubjectValue> subjectValues = SubjectValue.findSubjectValuesByAnalysisGroupIDAndStateTypeKind(analysisGroupId, stateType, stateKind).getResultList();
+		List<SubjectValue> subjectValues = SubjectValue
+				.findSubjectValuesByAnalysisGroupIDAndStateTypeKind(analysisGroupId, stateType, stateKind)
+				.getResultList();
 		logger.info(String.valueOf(subjectValues.size()));
 	}
 }
diff --git a/src/test/java/com/labsynch/labseer/domainImpl/TreatmentGroupValueTest.java b/src/test/java/com/labsynch/labseer/domainImpl/TreatmentGroupValueTest.java
index 9d88770a9..06baf1b52 100644
--- a/src/test/java/com/labsynch/labseer/domainImpl/TreatmentGroupValueTest.java
+++ b/src/test/java/com/labsynch/labseer/domainImpl/TreatmentGroupValueTest.java
@@ -18,25 +18,27 @@
 import org.springframework.transaction.annotation.Transactional;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class TreatmentGroupValueTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(TreatmentGroupValueTest.class);
-	
-	//@Test
+
+	// @Test
 	@Transactional
-	public void QueryTreatmentGroupValueByExpIdAndStateTypeKind(){
-			
+	public void QueryTreatmentGroupValueByExpIdAndStateTypeKind() {
+
 		Long experimentId = 14L;
 		String stateType = "data";
 		String stateKind = "test compound treatment";
-		List<TreatmentGroupValue> results = TreatmentGroupValue.findTreatmentGroupValuesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getResultList();
+		List<TreatmentGroupValue> results = TreatmentGroupValue
+				.findTreatmentGroupValuesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getResultList();
 		logger.info(TreatmentGroupValue.toJsonArray(results));
-		assert(results.size() == 120);
+		assert (results.size() == 120);
 	}
-	
-	//@Test
+
+	// @Test
 	@Transactional
 	public void QueryTreatmentGroupValueByExpIdAndStateTypeKindWithBadData() {
 		Long experimentId = 14L;
@@ -44,14 +46,16 @@ public void QueryTreatmentGroupValueByExpIdAndStateTypeKindWithBadData() {
 		String stateKind = "experiment metadata";
 		List<TreatmentGroupValue> results = new ArrayList<TreatmentGroupValue>();
 		try {
-			results = TreatmentGroupValue.findTreatmentGroupValuesByExptIDAndStateTypeKind(experimentId, stateType, stateKind).getResultList();
-		} catch(IllegalArgumentException ex ) {
+			results = TreatmentGroupValue
+					.findTreatmentGroupValuesByExptIDAndStateTypeKind(experimentId, stateType, stateKind)
+					.getResultList();
+		} catch (IllegalArgumentException ex) {
 			logger.info(ex.getMessage());
 		}
-		assert(results.size() == 0);
+		assert (results.size() == 0);
 	}
-	
-	//@Test
+
+	// @Test
 	@Transactional
 	public void QueryTreatmentGroupValueByExpIdAndStateTypeKindWithCodeName() {
 		String experimentCodeName = "EXPT-00000004";
@@ -61,42 +65,50 @@ public void QueryTreatmentGroupValueByExpIdAndStateTypeKindWithCodeName() {
 		boolean didCatch = false;
 		try {
 			experiment = Experiment.findExperimentsByCodeNameEquals(experimentCodeName).getSingleResult();
-		} catch(NoResultException nre) {
+		} catch (NoResultException nre) {
 			logger.info(nre.getMessage());
 			didCatch = true;
 		}
 		List<TreatmentGroupValue> results = new ArrayList<TreatmentGroupValue>();
 		try {
-			results = TreatmentGroupValue.findTreatmentGroupValuesByExptIDAndStateTypeKind(experiment.getId(), stateType, stateKind).getResultList();
-		} catch(IllegalArgumentException ex ) {
+			results = TreatmentGroupValue
+					.findTreatmentGroupValuesByExptIDAndStateTypeKind(experiment.getId(), stateType, stateKind)
+					.getResultList();
+		} catch (IllegalArgumentException ex) {
 			logger.info(ex.getMessage());
-			assert(results.size() == 0);
+			assert (results.size() == 0);
 			didCatch = true;
 		}
-		if(!didCatch) assert(results.size() == 120);
+		if (!didCatch)
+			assert (results.size() == 120);
 	}
-	
-	//@Test
+
+	// @Test
 	@Transactional
-	public void QueryTreatmentGroupValueByExpIdAndStateTypeKindAndValueTypeKind(){
-			
+	public void QueryTreatmentGroupValueByExpIdAndStateTypeKindAndValueTypeKind() {
+
 		Long experimentId = 14L;
 		String stateType = "data";
 		String stateKind = "test compound treatment";
 		String valueType = "numericValue";
 		String valueKind = "Dose";
-		List<TreatmentGroupValue> results = TreatmentGroupValue.findTreatmentGroupValuesByExptIDAndStateTypeKindAndValueTypeKind(experimentId, stateType, stateKind, valueType, valueKind).getResultList();
+		List<TreatmentGroupValue> results = TreatmentGroupValue
+				.findTreatmentGroupValuesByExptIDAndStateTypeKindAndValueTypeKind(experimentId, stateType, stateKind,
+						valueType, valueKind)
+				.getResultList();
 		logger.info(TreatmentGroupValue.toJsonArray(results));
-		assert(results.size() == 120);
+		assert (results.size() == 120);
 	}
-	
+
 	@Test
 	@Transactional
 	public void QueryTreatmentGroupValueByAnalysisGroupIdStateTypeAndKind() {
 		Long analysisGroupId = 15L;
 		String stateType = "data";
 		String stateKind = "test compound treatment";
-		List<TreatmentGroupValue> treatmentGroupValues = TreatmentGroupValue.findTreatmentGroupValuesByAnalysisGroupIDAndStateTypeKind(analysisGroupId, stateType, stateKind).getResultList();
+		List<TreatmentGroupValue> treatmentGroupValues = TreatmentGroupValue
+				.findTreatmentGroupValuesByAnalysisGroupIDAndStateTypeKind(analysisGroupId, stateType, stateKind)
+				.getResultList();
 		logger.info(String.valueOf(treatmentGroupValues.size()));
 	}
 }
diff --git a/src/test/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTOTest.java b/src/test/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTOTest.java
index 473e4adae..3eeb40b52 100644
--- a/src/test/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTOTest.java
+++ b/src/test/java/com/labsynch/labseer/dto/CmpdRegBatchCodeDTOTest.java
@@ -15,13 +15,13 @@
 
 import junit.framework.Assert;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 @Transactional
 public class CmpdRegBatchCodeDTOTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(CmpdRegBatchCodeDTOTest.class);
 
 	@Test
@@ -31,54 +31,54 @@ public void checkForDependentDataTest() {
 		batchCodes.add("CMPD-0000002-01A");
 		batchCodes.add("CMPD-0000003-01A");
 		batchCodes.add("NOT-A-VALID-BATCH-CODE");
-		
+
 		CmpdRegBatchCodeDTO cmpdRegBatchCodeDTO = new CmpdRegBatchCodeDTO(batchCodes);
 		cmpdRegBatchCodeDTO.checkForDependentData();
 		logger.info(cmpdRegBatchCodeDTO.toJson());
-		
-		//check for duplicate codes
+
+		// check for duplicate codes
 		ArrayList<String> codeList = new ArrayList<String>();
 		HashSet<String> codeSet = new HashSet<String>();
-		for (CodeTableDTO codeTable : cmpdRegBatchCodeDTO.getLinkedExperiments()){
+		for (CodeTableDTO codeTable : cmpdRegBatchCodeDTO.getLinkedExperiments()) {
 			codeList.add(codeTable.getCode());
 			codeSet.add(codeTable.getCode());
 		}
 		Assert.assertEquals(codeSet.size(), codeList.size());
-		
+
 		Assert.assertTrue(cmpdRegBatchCodeDTO.getLinkedDataExists());
 		Assert.assertFalse(cmpdRegBatchCodeDTO.getLinkedExperiments().isEmpty());
 	}
-	
+
 	@Test
 	public void checkForDependentDataTestNoData() {
 		Collection<String> batchCodes = new HashSet<String>();
 		batchCodes.add("NOT-A-VALID-BATCH-CODE");
-		
+
 		CmpdRegBatchCodeDTO cmpdRegBatchCodeDTO = new CmpdRegBatchCodeDTO(batchCodes);
 		cmpdRegBatchCodeDTO.checkForDependentData();
 		logger.info(cmpdRegBatchCodeDTO.toJson());
 		Assert.assertFalse(cmpdRegBatchCodeDTO.getLinkedDataExists());
 		Assert.assertTrue(cmpdRegBatchCodeDTO.getLinkedExperiments().isEmpty());
 	}
-	
+
 	@Test
-	public void toFromJsonTest(){
+	public void toFromJsonTest() {
 		Collection<String> batchCodes = new HashSet<String>();
 		batchCodes.add("CMPD-0000001-01A");
 		batchCodes.add("CMPD-0000002-01A");
 		batchCodes.add("CMPD-0000003-01A");
 		batchCodes.add("NOT-A-VALID-BATCH-CODE");
-		
+
 		CmpdRegBatchCodeDTO cmpdRegBatchCodeDTO = new CmpdRegBatchCodeDTO(batchCodes);
-		logger.info("starting json: "+cmpdRegBatchCodeDTO.toJson());
+		logger.info("starting json: " + cmpdRegBatchCodeDTO.toJson());
 		Assert.assertTrue(cmpdRegBatchCodeDTO.toJson().indexOf("linkedExperiments") == -1);
 		cmpdRegBatchCodeDTO.checkForDependentData();
-		logger.info("after check json: "+cmpdRegBatchCodeDTO.toJson());
+		logger.info("after check json: " + cmpdRegBatchCodeDTO.toJson());
 		Assert.assertFalse(cmpdRegBatchCodeDTO.toJson().indexOf("linkedExperiments") == -1);
 		CmpdRegBatchCodeDTO checkDTO = CmpdRegBatchCodeDTO.fromJsonToCmpdRegBatchCodeDTO(cmpdRegBatchCodeDTO.toJson());
-		logger.info("after to/from json: "+checkDTO.toJson());
+		logger.info("after to/from json: " + checkDTO.toJson());
 		Assert.assertFalse(cmpdRegBatchCodeDTO.toJson().indexOf("linkedExperiments") == -1);
 
 	}
-	
+
 }
diff --git a/src/test/java/com/labsynch/labseer/dto/CodeTableDTOTest.java b/src/test/java/com/labsynch/labseer/dto/CodeTableDTOTest.java
index 7124d9cfd..354ddf39f 100644
--- a/src/test/java/com/labsynch/labseer/dto/CodeTableDTOTest.java
+++ b/src/test/java/com/labsynch/labseer/dto/CodeTableDTOTest.java
@@ -13,12 +13,12 @@
 
 import junit.framework.Assert;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class CodeTableDTOTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(CodeTableDTOTest.class);
 
 	@Test
@@ -40,7 +40,7 @@ public void mergesortTest() {
 		b.setName("b");
 		CodeTableDTO c = new CodeTableDTO();
 		c.setName("c");
-		
+
 		unsorted.add(c);
 		unsorted.add(three);
 		unsorted.add(a);
@@ -48,20 +48,19 @@ public void mergesortTest() {
 		unsorted.add(two);
 		unsorted.add(b);
 		logger.info(unsorted.toString());
-		
+
 		sortedCheck.add(one);
 		sortedCheck.add(two);
 		sortedCheck.add(three);
 		sortedCheck.add(a);
 		sortedCheck.add(b);
 		sortedCheck.add(c);
-		
+
 		List<CodeTableDTO> mergeSorted = CodeTableDTO.sortCodeTables(unsorted);
 		logger.info(mergeSorted.toString());
-		for (int i=0; i<sortedCheck.size(); i++){
+		for (int i = 0; i < sortedCheck.size(); i++) {
 			Assert.assertEquals(sortedCheck.get(i), mergeSorted.get(i));
 		}
-		
-		
+
 	}
 }
diff --git a/src/test/java/com/labsynch/labseer/dto/CurveFitDTOTest.java b/src/test/java/com/labsynch/labseer/dto/CurveFitDTOTest.java
index 8cfcd7404..a5dd2ff3b 100644
--- a/src/test/java/com/labsynch/labseer/dto/CurveFitDTOTest.java
+++ b/src/test/java/com/labsynch/labseer/dto/CurveFitDTOTest.java
@@ -18,12 +18,13 @@
 import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class CurveFitDTOTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(CurveFitDTOTest.class);
-	
+
 	@Test
 	@Transactional
 	public void getFitDataTest() {
@@ -33,7 +34,7 @@ public void getFitDataTest() {
 		logger.debug(curveFitDTO.toJson());
 		Assert.assertNotNull(curveFitDTO.getRenderingHint());
 	}
-	
+
 	@Test
 	@Transactional
 	public void getFitDataThenSaveTest() {
@@ -51,12 +52,12 @@ public void getFitDataThenSaveTest() {
 		Collection<CurveFitDTO> curveFitDTOCollection = new ArrayList<CurveFitDTO>();
 		curveFitDTOCollection.add(curveFitDTO);
 		CurveFitDTO.updateFitData(curveFitDTOCollection);
-//		CurveFitDTO curveFitDTO2 = new CurveFitDTO(curveId);
-//		curveFitDTO2 = CurveFitDTO.getFitData(curveFitDTO2);
-//		Assert.assertEquals(curveFitDTO.toJson(), curveFitDTO2.toJson());
-		
+		// CurveFitDTO curveFitDTO2 = new CurveFitDTO(curveId);
+		// curveFitDTO2 = CurveFitDTO.getFitData(curveFitDTO2);
+		// Assert.assertEquals(curveFitDTO.toJson(), curveFitDTO2.toJson());
+
 	}
-	
+
 	@Test
 	@Transactional
 	public void getFitDataArrayTest() {
@@ -68,7 +69,7 @@ public void getFitDataArrayTest() {
 		Collection<CurveFitDTO> curveFitDTOs = CurveFitDTO.getFitData(curveIds);
 		logger.debug(CurveFitDTO.toJsonArray(curveFitDTOs));
 	}
-	
+
 	@Test
 	@Transactional
 	public void getFitDataFromCurveIdListTimingTest() {
@@ -92,7 +93,7 @@ public void getFitDataFromCurveIdListTimingTest() {
 		logger.debug("total number of curves: " + curveFitDTOs2.size());
 		logger.debug(CurveFitDTO.toJsonArray(curveFitDTOs2));
 	}
-	
+
 	@Test
 	@Transactional
 	public void getAllCurveIdsByExperimentTest() {
@@ -106,12 +107,12 @@ public void getAllCurveIdsByExperimentTest() {
 		logger.debug(results.toString());
 		Assert.assertTrue(!results.isEmpty());
 	}
-	
+
 	@Test
 	@Transactional
 	public void getAllCurveFitDataByExperimentTest() {
-//		String experimentCodeName = "EXPT-00001298"; //17 curves
-		String experimentCodeName = "EXPT-00000078"; //1000 curves
+		// String experimentCodeName = "EXPT-00001298"; //17 curves
+		String experimentCodeName = "EXPT-00000078"; // 1000 curves
 		long startTime = System.currentTimeMillis();
 		Collection<String> curveIds = CurveFitDTO.findAllCurveIdsByExperiment(experimentCodeName);
 		Collection<CurveFitDTO> results = CurveFitDTO.getFitData(curveIds);
@@ -121,14 +122,14 @@ public void getAllCurveFitDataByExperimentTest() {
 		logger.debug("total number of curves: " + results.size());
 		logger.debug(CurveFitDTO.toJsonArray(results));
 		Assert.assertTrue(!results.isEmpty());
-		for (CurveFitDTO curveFitDTO: results){
+		for (CurveFitDTO curveFitDTO : results) {
 			Assert.assertNotNull(curveFitDTO.getAnalysisGroupCode());
 			Assert.assertNotNull(curveFitDTO.getRecordedBy());
 			Assert.assertNotNull(curveFitDTO.getRecordedDate());
 			Assert.assertNotNull(curveFitDTO.getLsTransaction());
 		}
 	}
-	
+
 	@Test
 	@Transactional
 	public void getAllKiCurveFitDataByExperimentTest() {
@@ -142,7 +143,7 @@ public void getAllKiCurveFitDataByExperimentTest() {
 		logger.debug("total number of curves: " + results.size());
 		logger.debug(KiCurveFitDTO.toJsonArray(results));
 		Assert.assertTrue(!results.isEmpty());
-		for (KiCurveFitDTO kiCurveFitDTO: results){
+		for (KiCurveFitDTO kiCurveFitDTO : results) {
 			Assert.assertNotNull(kiCurveFitDTO.getAnalysisGroupCode());
 			Assert.assertNotNull(kiCurveFitDTO.getRecordedBy());
 			Assert.assertNotNull(kiCurveFitDTO.getRecordedDate());
@@ -150,7 +151,7 @@ public void getAllKiCurveFitDataByExperimentTest() {
 		}
 
 	}
-	
+
 	@Test
 	@Transactional
 	public void getDisplayMinMaxByCurveIdTest() {
diff --git a/src/test/java/com/labsynch/labseer/dto/FlagWellDTOTest.java b/src/test/java/com/labsynch/labseer/dto/FlagWellDTOTest.java
index 1f5a0bdb1..545b1a323 100644
--- a/src/test/java/com/labsynch/labseer/dto/FlagWellDTOTest.java
+++ b/src/test/java/com/labsynch/labseer/dto/FlagWellDTOTest.java
@@ -19,12 +19,13 @@
 import org.springframework.transaction.annotation.Transactional;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class FlagWellDTOTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(TgDataDTO.class);
-	
+
 	@Test
 	@Transactional
 	public void findResponseSubjectValuesByTreatmentGroup() {
@@ -43,7 +44,7 @@ public void findResponseSubjectValuesByTreatmentGroup() {
 				+ "AND resultsState.lsKind = :resultsStateKind "
 				+ "AND resultsValue.lsType = :resultsValueType "
 				+ "AND resultsValue.lsKind = :resultsValueKind ", SubjectValue.class);
-		
+
 		q.setParameter("resultsStateType", "data");
 		q.setParameter("resultsStateKind", "results");
 		q.setParameter("resultsValueType", "numericValue");
@@ -52,9 +53,9 @@ public void findResponseSubjectValuesByTreatmentGroup() {
 		q.setParameter("ignored", true);
 		Collection<SubjectValue> results = q.getResultList();
 		logger.debug(SubjectValue.toJsonArray(results));
-		
+
 	}
-	
+
 	@Test
 	@Transactional
 	public void findResponseSubjectValuesByTreatmentGroup_2() {
@@ -62,9 +63,9 @@ public void findResponseSubjectValuesByTreatmentGroup_2() {
 		TreatmentGroup treatmentGroup = TreatmentGroup.findTreatmentGroup(id);
 		Collection<SubjectValue> results = FlagWellDTO.findNotKONumericValueSubjectValues(treatmentGroup);
 		logger.info(SubjectValue.toJsonArray(results));
-		
+
 	}
-	
+
 	@Test
 	@Transactional
 	public void findRenderingHintTest() {
@@ -72,9 +73,9 @@ public void findRenderingHintTest() {
 		TreatmentGroup treatmentGroup = TreatmentGroup.findTreatmentGroup(id);
 		String renderingHint = CurveFitDTO.findRenderingHint(treatmentGroup);
 		logger.debug(renderingHint);
-		
+
 	}
-	
+
 	@Test
 	@Transactional
 	public void findBatchCodeSubjectValueTest() {
@@ -83,7 +84,7 @@ public void findBatchCodeSubjectValueTest() {
 		SubjectValue sv = FlagWellDTO.findBatchCodeSubjectValue(treatmentGroup);
 		logger.info(sv.toJson());
 	}
-	
+
 	@Test
 	@Transactional
 	public void updateWellFlagsTest() {
@@ -101,7 +102,7 @@ public void updateWellFlagsTest() {
 		Collection<FlagWellDTO> flagWellDTOs = new HashSet<FlagWellDTO>();
 		flagWellDTOs.add(flagWellDTO);
 		FlagWellDTO.updateWellFlags(flagWellDTOs);
-		
+
 	}
-	
+
 }
diff --git a/src/test/java/com/labsynch/labseer/dto/RawCurveDataDTOTest.java b/src/test/java/com/labsynch/labseer/dto/RawCurveDataDTOTest.java
index 1571cc655..7446d1979 100644
--- a/src/test/java/com/labsynch/labseer/dto/RawCurveDataDTOTest.java
+++ b/src/test/java/com/labsynch/labseer/dto/RawCurveDataDTOTest.java
@@ -16,12 +16,13 @@
 import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class RawCurveDataDTOTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(RawCurveDataDTOTest.class);
-	
+
 	@Test
 	@Transactional
 	public void getRawCurveDataTest() {
@@ -35,13 +36,13 @@ public void getRawCurveDataTest() {
 			Assert.assertNotNull(result.getCurveId());
 			Assert.assertNotNull(result.getResponseSubjectValueId());
 			Assert.assertNotNull(result.getResponse());
-//			Assert.assertNotNull(result.getResponseUnits());
+			// Assert.assertNotNull(result.getResponseUnits());
 			Assert.assertNotNull(result.getDose());
 			Assert.assertNotNull(result.getDoseUnits());
 		}
-		
+
 	}
-	
+
 	@Test
 	@Transactional
 	public void getAllRawCurveDataDataByExperimentTest() {
@@ -57,7 +58,7 @@ public void getAllRawCurveDataDataByExperimentTest() {
 			Assert.assertNotNull(result.getCurveId());
 			Assert.assertNotNull(result.getResponseSubjectValueId());
 			Assert.assertNotNull(result.getResponse());
-//			Assert.assertNotNull(result.getResponseUnits());
+			// Assert.assertNotNull(result.getResponseUnits());
 			Assert.assertNotNull(result.getDose());
 			Assert.assertNotNull(result.getDoseUnits());
 		}
diff --git a/src/test/java/com/labsynch/labseer/dto/TgDataDTOTest.java b/src/test/java/com/labsynch/labseer/dto/TgDataDTOTest.java
index 228d3b612..459d95986 100644
--- a/src/test/java/com/labsynch/labseer/dto/TgDataDTOTest.java
+++ b/src/test/java/com/labsynch/labseer/dto/TgDataDTOTest.java
@@ -15,12 +15,13 @@
 import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class TgDataDTOTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(TgDataDTO.class);
-	
+
 	@Test
 	@Transactional
 	public void getTgDataTest() {
@@ -39,9 +40,9 @@ public void getTgDataTest() {
 			Assert.assertNotNull(result.getUncertainty());
 			Assert.assertNotNull(result.getPublicData());
 		}
-		
+
 	}
-	
+
 	@Test
 	@Transactional
 	public void getAllTgDataDataByExperimentTest() {
@@ -52,7 +53,7 @@ public void getAllTgDataDataByExperimentTest() {
 		long totalTime = endTime - startTime;
 		logger.debug("total elapsed time = " + totalTime + " miliseconds.");
 		logger.debug("total number of TreatmentGroups: " + results.size());
-//		logger.debug(results.toString());
+		// logger.debug(results.toString());
 		Assert.assertTrue(!results.isEmpty());
 	}
 
diff --git a/src/test/java/com/labsynch/labseer/dto/ValueTypeKindDTOTest.java b/src/test/java/com/labsynch/labseer/dto/ValueTypeKindDTOTest.java
index e86e4a63d..c83cf81a9 100644
--- a/src/test/java/com/labsynch/labseer/dto/ValueTypeKindDTOTest.java
+++ b/src/test/java/com/labsynch/labseer/dto/ValueTypeKindDTOTest.java
@@ -11,18 +11,18 @@
 
 import junit.framework.Assert;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class ValueTypeKindDTOTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(ValueTypeKindDTOTest.class);
 
 	@Transactional
 	@Test
-	public void findValueKind(){
-		ValueTypeKindDTO dto = new ValueTypeKindDTO("codeValue","scientist");
+	public void findValueKind() {
+		ValueTypeKindDTO dto = new ValueTypeKindDTO("codeValue", "scientist");
 		Assert.assertNull(dto.getValueKind());
 		dto.findValueKind();
 		Assert.assertNotNull(dto.getValueKind());
diff --git a/src/test/java/com/labsynch/labseer/manytomany/AnalysisGroupTest.java b/src/test/java/com/labsynch/labseer/manytomany/AnalysisGroupTest.java
index e1d79f501..63a4136d2 100644
--- a/src/test/java/com/labsynch/labseer/manytomany/AnalysisGroupTest.java
+++ b/src/test/java/com/labsynch/labseer/manytomany/AnalysisGroupTest.java
@@ -29,22 +29,23 @@
 import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class AnalysisGroupTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(AnalysisGroupTest.class);
-	
+
 	@Autowired
 	private AnalysisGroupService analysisGroupService;
 
 	@Autowired
 	private ExperimentService experimentService;
-	
+
 	public HashMap<String, Long> makeTestStack() {
-		//each of these methods creates the full stack from protocol to subject.
+		// each of these methods creates the full stack from protocol to subject.
 		Date now = new Date();
-		//create 1 Protocol
+		// create 1 Protocol
 		Protocol protocol = new Protocol();
 		protocol.setRecordedBy("test user");
 		protocol.setRecordedDate(now);
@@ -52,50 +53,50 @@ public HashMap<String, Long> makeTestStack() {
 		protocol.setLsType("default");
 		protocol.setLsTransaction(98765L);
 		protocol.persist();
-		
-		//create 3 Experiments
+
+		// create 3 Experiments
 		Experiment e1 = new Experiment();
-        e1.setCodeName("T-EXPT-1111111");
-        Experiment e2 = new Experiment();
-        e2.setCodeName("T-EXPT-22222222");
-        Experiment e3 = new Experiment();
-        e3.setCodeName("T-EXPT-33333333");
-        Set<Experiment> allExperiments = new HashSet<Experiment>();
-        allExperiments.add(e1);
-        allExperiments.add(e2);
-        allExperiments.add(e3);
-        for (Experiment experiment: allExperiments) {
-        	experiment.setIgnored(false);
-        	experiment.setLsKind(protocol.getLsKind());
-        	experiment.setLsType(protocol.getLsType());
-        	experiment.setRecordedBy(protocol.getRecordedBy());
-        	experiment.setRecordedDate(protocol.getRecordedDate());
-            experiment.setLsTransaction(protocol.getLsTransaction());
-        	experiment.setProtocol(protocol);
-        }
-        
-		//create 3 AnalysisGroups
-        AnalysisGroup a1= new AnalysisGroup();
-        a1.setCodeName("T-AG-11111111");
-        AnalysisGroup a2= new AnalysisGroup();
-        a2.setCodeName("T-AG-22222222");
-        AnalysisGroup a3= new AnalysisGroup();
-        a3.setCodeName("T-AG-33333333");
-        Set<AnalysisGroup> allAnalysisGroups = new HashSet<AnalysisGroup>();
-        allAnalysisGroups.add(a1);
-        allAnalysisGroups.add(a2);
-        allAnalysisGroups.add(a3);
-        for (AnalysisGroup analysisGroup: allAnalysisGroups) {
-        	analysisGroup.setIgnored(e1.isIgnored());
-            analysisGroup.setLsKind(e1.getLsKind());
-            analysisGroup.setLsType(e1.getLsType());
-            analysisGroup.setRecordedBy(e1.getRecordedBy());
-            analysisGroup.setRecordedDate(e1.getRecordedDate());
-            analysisGroup.setLsTransaction(e1.getLsTransaction());
-        }
-        
-        //create 3 TreatmentGroups
-        TreatmentGroup t1 = new TreatmentGroup();
+		e1.setCodeName("T-EXPT-1111111");
+		Experiment e2 = new Experiment();
+		e2.setCodeName("T-EXPT-22222222");
+		Experiment e3 = new Experiment();
+		e3.setCodeName("T-EXPT-33333333");
+		Set<Experiment> allExperiments = new HashSet<Experiment>();
+		allExperiments.add(e1);
+		allExperiments.add(e2);
+		allExperiments.add(e3);
+		for (Experiment experiment : allExperiments) {
+			experiment.setIgnored(false);
+			experiment.setLsKind(protocol.getLsKind());
+			experiment.setLsType(protocol.getLsType());
+			experiment.setRecordedBy(protocol.getRecordedBy());
+			experiment.setRecordedDate(protocol.getRecordedDate());
+			experiment.setLsTransaction(protocol.getLsTransaction());
+			experiment.setProtocol(protocol);
+		}
+
+		// create 3 AnalysisGroups
+		AnalysisGroup a1 = new AnalysisGroup();
+		a1.setCodeName("T-AG-11111111");
+		AnalysisGroup a2 = new AnalysisGroup();
+		a2.setCodeName("T-AG-22222222");
+		AnalysisGroup a3 = new AnalysisGroup();
+		a3.setCodeName("T-AG-33333333");
+		Set<AnalysisGroup> allAnalysisGroups = new HashSet<AnalysisGroup>();
+		allAnalysisGroups.add(a1);
+		allAnalysisGroups.add(a2);
+		allAnalysisGroups.add(a3);
+		for (AnalysisGroup analysisGroup : allAnalysisGroups) {
+			analysisGroup.setIgnored(e1.isIgnored());
+			analysisGroup.setLsKind(e1.getLsKind());
+			analysisGroup.setLsType(e1.getLsType());
+			analysisGroup.setRecordedBy(e1.getRecordedBy());
+			analysisGroup.setRecordedDate(e1.getRecordedDate());
+			analysisGroup.setLsTransaction(e1.getLsTransaction());
+		}
+
+		// create 3 TreatmentGroups
+		TreatmentGroup t1 = new TreatmentGroup();
 		t1.setCodeName("T-TG-11111111");
 		TreatmentGroup t2 = new TreatmentGroup();
 		t2.setCodeName("T-TG-22222222");
@@ -105,16 +106,16 @@ public HashMap<String, Long> makeTestStack() {
 		allTreatmentGroups.add(t1);
 		allTreatmentGroups.add(t2);
 		allTreatmentGroups.add(t3);
-		for (TreatmentGroup treatmentGroup: allTreatmentGroups) {
+		for (TreatmentGroup treatmentGroup : allTreatmentGroups) {
 			treatmentGroup.setIgnored(a1.isIgnored());
 			treatmentGroup.setLsKind(a1.getLsKind());
 			treatmentGroup.setLsType(a1.getLsType());
 			treatmentGroup.setRecordedBy(a1.getRecordedBy());
-            treatmentGroup.setRecordedDate(a1.getRecordedDate());
+			treatmentGroup.setRecordedDate(a1.getRecordedDate());
 			treatmentGroup.setLsTransaction(a1.getLsTransaction());
 		}
-		
-		//create 3 Subjects
+
+		// create 3 Subjects
 		Subject s1 = new Subject();
 		s1.setCodeName("T-SUBJ-11111111");
 		Subject s2 = new Subject();
@@ -125,16 +126,16 @@ public HashMap<String, Long> makeTestStack() {
 		allSubjects.add(s1);
 		allSubjects.add(s2);
 		allSubjects.add(s3);
-		for (Subject subject: allSubjects) {
+		for (Subject subject : allSubjects) {
 			subject.setIgnored(t1.isIgnored());
 			subject.setLsKind(t1.getLsKind());
 			subject.setLsType(t1.getLsType());
 			subject.setRecordedBy(t1.getRecordedBy());
-            subject.setRecordedDate(t1.getRecordedDate());
+			subject.setRecordedDate(t1.getRecordedDate());
 			subject.setLsTransaction(t1.getLsTransaction());
 		}
-		
-		//Create the various Sets for mapping
+
+		// Create the various Sets for mapping
 		Set<AnalysisGroup> e1AnalysisGroups = new HashSet<AnalysisGroup>();
 		e1AnalysisGroups.add(a1);
 		e1AnalysisGroups.add(a3);
@@ -189,8 +190,8 @@ public HashMap<String, Long> makeTestStack() {
 		Set<TreatmentGroup> s3TreatmentGroups = new HashSet<TreatmentGroup>();
 		s3TreatmentGroups.add(t1);
 		s3TreatmentGroups.add(t3);
-		
-		//Then assign all the groups to their owners to create the mappings
+
+		// Then assign all the groups to their owners to create the mappings
 		e1.setAnalysisGroups(e1AnalysisGroups);
 		e2.setAnalysisGroups(e2AnalysisGroups);
 		e3.setAnalysisGroups(e3AnalysisGroups);
@@ -209,21 +210,21 @@ public HashMap<String, Long> makeTestStack() {
 		s1.setTreatmentGroups(s1TreatmentGroups);
 		s2.setTreatmentGroups(s2TreatmentGroups);
 		s3.setTreatmentGroups(s3TreatmentGroups);
-		
-		//Then persist and flush everything to the database
+
+		// Then persist and flush everything to the database
 		e1.persist();
-//		e2.persist();
-//		e3.persist();
-//		a1.persist();
-//		a2.persist();
-//		a3.persist();
-//		t1.persist();
-//		t2.persist();
-//		t3.persist();
-//		s1.persist();
-//		s2.persist();
-//		s3.persist();
-		
+		// e2.persist();
+		// e3.persist();
+		// a1.persist();
+		// a2.persist();
+		// a3.persist();
+		// t1.persist();
+		// t2.persist();
+		// t3.persist();
+		// s1.persist();
+		// s2.persist();
+		// s3.persist();
+
 		HashMap<String, Long> idMap = new HashMap<String, Long>();
 		idMap.put("e1", e1.getId());
 		idMap.put("e2", e2.getId());
@@ -237,14 +238,14 @@ public HashMap<String, Long> makeTestStack() {
 		idMap.put("s1", s1.getId());
 		idMap.put("s2", s2.getId());
 		idMap.put("s3", s3.getId());
-		
+
 		return idMap;
 	}
-	
+
 	private Protocol makeTestingProtocol() {
-		//initialize some entries to fill in the fields
+		// initialize some entries to fill in the fields
 		Date now = new Date();
-		//create protocol
+		// create protocol
 		Protocol protocol = new Protocol();
 		protocol.setRecordedBy("test user");
 		protocol.setRecordedDate(now);
@@ -254,38 +255,38 @@ private Protocol makeTestingProtocol() {
 		protocol.persist();
 		return protocol;
 	}
-	
+
 	private Experiment makeTestingExperiment() {
 		Protocol protocol = makeTestingProtocol();
 		Experiment experiment = new Experiment();
-        experiment.setCodeName("EXPT-12345678");
-        experiment.setIgnored(false);
-        experiment.setLsKind(protocol.getLsKind());
-        experiment.setLsType(protocol.getLsType());
-        experiment.setRecordedBy(protocol.getRecordedBy());
-        experiment.setRecordedDate(protocol.getRecordedDate());
-        experiment.setLsTransaction(protocol.getLsTransaction());
-        experiment.setProtocol(protocol);
-        experiment.persist();
-        return experiment;
+		experiment.setCodeName("EXPT-12345678");
+		experiment.setIgnored(false);
+		experiment.setLsKind(protocol.getLsKind());
+		experiment.setLsType(protocol.getLsType());
+		experiment.setRecordedBy(protocol.getRecordedBy());
+		experiment.setRecordedDate(protocol.getRecordedDate());
+		experiment.setLsTransaction(protocol.getLsTransaction());
+		experiment.setProtocol(protocol);
+		experiment.persist();
+		return experiment;
 	}
-	
+
 	private AnalysisGroup makeTestingAnalysisGroup() {
 		Experiment experiment = makeTestingExperiment();
-		AnalysisGroup analysisgroup= new AnalysisGroup();
-        analysisgroup.setCodeName("AG-12345678");
-        analysisgroup.setIgnored(experiment.isIgnored());
-        analysisgroup.setLsKind(experiment.getLsKind());
-        analysisgroup.setLsType(experiment.getLsType());
-        analysisgroup.setRecordedBy(experiment.getRecordedBy());
-        analysisgroup.setLsTransaction(experiment.getLsTransaction());
-        Set<Experiment> experimentSet = new HashSet<Experiment>();
-        experimentSet.add(experiment);
-        analysisgroup.setExperiments(experimentSet);
-        analysisgroup.persist();
-        return analysisgroup;
+		AnalysisGroup analysisgroup = new AnalysisGroup();
+		analysisgroup.setCodeName("AG-12345678");
+		analysisgroup.setIgnored(experiment.isIgnored());
+		analysisgroup.setLsKind(experiment.getLsKind());
+		analysisgroup.setLsType(experiment.getLsType());
+		analysisgroup.setRecordedBy(experiment.getRecordedBy());
+		analysisgroup.setLsTransaction(experiment.getLsTransaction());
+		Set<Experiment> experimentSet = new HashSet<Experiment>();
+		experimentSet.add(experiment);
+		analysisgroup.setExperiments(experimentSet);
+		analysisgroup.persist();
+		return analysisgroup;
 	}
-	
+
 	private TreatmentGroup makeTestingTreatmentGroup() {
 		AnalysisGroup analysisgroup = makeTestingAnalysisGroup();
 		TreatmentGroup treatmentgroup = new TreatmentGroup();
@@ -301,7 +302,7 @@ private TreatmentGroup makeTestingTreatmentGroup() {
 		treatmentgroup.persist();
 		return treatmentgroup;
 	}
-	
+
 	private Subject makeTestingSubject() {
 		TreatmentGroup treatmentgroup = makeTestingTreatmentGroup();
 		Subject subject = new Subject();
@@ -319,25 +320,24 @@ private Subject makeTestingSubject() {
 	}
 
 	@Transactional
-	//@Test
+	// @Test
 	public void Analysis_Group_Many_To_Many_Test() {
 		AnalysisGroup analysisGroup = AnalysisGroup.findAnalysisGroup(235L);
 		logger.debug(analysisGroup.toJson());
-		
+
 		int theSize = analysisGroup.getTreatmentGroups().size();
 		logger.debug(String.valueOf(theSize));
 		System.out.println("" + theSize);
-		
+
 		Assert.assertEquals(1, theSize);
 	}
 
-	
 	@Transactional
-	//@Test
+	// @Test
 	public void saveWithExistingTreatmentGroups() throws UniqueNameException, NotFoundException {
-		
+
 		Protocol protocol = Protocol.findProtocolEntries(0, 1).get(0);
-		
+
 		Experiment experiment = new Experiment();
 		experiment.setLsType("default");
 		experiment.setLsKind("default");
@@ -345,46 +345,47 @@ public void saveWithExistingTreatmentGroups() throws UniqueNameException, NotFou
 		experiment.setRecordedDate(new Date());
 		experiment.setProtocol(protocol);
 		Experiment savedExperiment = experimentService.saveLsExperiment(experiment);
-		
+
 		AnalysisGroup analysisGroup = new AnalysisGroup();
 		analysisGroup.setLsType("data");
 		analysisGroup.setLsKind("results");
 		analysisGroup.setRecordedBy("test user");
 		analysisGroup.setRecordedDate(new Date());
-		
+
 		Set<Experiment> experiments = new HashSet<Experiment>();
 		experiments.add(Experiment.findExperiment(savedExperiment.getId()));
 		analysisGroup.setExperiments(experiments);
-		
+
 		Set<TreatmentGroup> treatmentGroups = new HashSet<TreatmentGroup>();
 		treatmentGroups.add(TreatmentGroup.findTreatmentGroup(268L));
 		treatmentGroups.add(TreatmentGroup.findTreatmentGroup(276L));
 		analysisGroup.setTreatmentGroups(treatmentGroups);
-		
+
 		AnalysisGroup output = analysisGroupService.saveLsAnalysisGroup(analysisGroup);
 		output.flush();
-		//Assert.assertEquals("AG-00000238", output.getCodeName());
+		// Assert.assertEquals("AG-00000238", output.getCodeName());
 		Assert.assertEquals(2, analysisGroup.getTreatmentGroups().size());
 
-		logger.info(AnalysisGroup.findAnalysisGroup(output.getId()).toPrettyFullJson());		
+		logger.info(AnalysisGroup.findAnalysisGroup(output.getId()).toPrettyFullJson());
 	}
-	
+
 	@Transactional
 	@Test
 	public void findAnalysisGroupsByExperimentIdAndIgnoredTest() {
-		//generate the testing stack
+		// generate the testing stack
 		HashMap<String, Long> idMap = makeTestStack();
 		Long experiment1Id = idMap.get("e1");
 		Set<AnalysisGroup> expectedAnalysisGroups = new HashSet<AnalysisGroup>();
 		expectedAnalysisGroups.add(AnalysisGroup.findAnalysisGroup(idMap.get("a1")));
 		expectedAnalysisGroups.add(AnalysisGroup.findAnalysisGroup(idMap.get("a3")));
-        boolean ignored = AnalysisGroup.findAnalysisGroup(idMap.get("a1")).isIgnored();
-        //go get the analysisgroup by its ExperimentId and Ignored
-		List<AnalysisGroup> checkList = AnalysisGroup.findAnalysisGroupsByExperimentIdAndIgnored(experiment1Id, ignored).getResultList();
+		boolean ignored = AnalysisGroup.findAnalysisGroup(idMap.get("a1")).isIgnored();
+		// go get the analysisgroup by its ExperimentId and Ignored
+		List<AnalysisGroup> checkList = AnalysisGroup.findAnalysisGroupsByExperimentIdAndIgnored(experiment1Id, ignored)
+				.getResultList();
 		Assert.assertEquals(checkList.size(), 2);
 		Assert.assertEquals(checkList.get(0).toJson(), expectedAnalysisGroups.iterator().next().toJson());
 	}
-	
+
 	@Transactional
 	@Test
 	public void findAnalysisGroupsByExperimentsAndIgnoredNotTest() {
@@ -394,25 +395,26 @@ public void findAnalysisGroupsByExperimentsAndIgnoredNotTest() {
 		experiments.add(Experiment.findExperiment(idMap.get("e3")));
 		Set<AnalysisGroup> expectedAnalysisGroups = new HashSet<AnalysisGroup>();
 		expectedAnalysisGroups.add(AnalysisGroup.findAnalysisGroup(idMap.get("a2")));
-        boolean ignored = AnalysisGroup.findAnalysisGroup(idMap.get("a1")).isIgnored();
-        List<AnalysisGroup> checkList = AnalysisGroup.findAnalysisGroupsByExperimentsAndIgnoredNot(experiments, !ignored).getResultList();
-        Assert.assertEquals(1, checkList.size());
+		boolean ignored = AnalysisGroup.findAnalysisGroup(idMap.get("a1")).isIgnored();
+		List<AnalysisGroup> checkList = AnalysisGroup
+				.findAnalysisGroupsByExperimentsAndIgnoredNot(experiments, !ignored).getResultList();
+		Assert.assertEquals(1, checkList.size());
 		Assert.assertEquals(checkList.get(0).toJson(), expectedAnalysisGroups.iterator().next().toJson());
 	}
-	
+
 	@Transactional
 	@Test
 	public void findAnalysisGroupsByCodeNameEqualsTest() {
 		HashMap<String, Long> idMap = makeTestStack();
 		AnalysisGroup a2 = AnalysisGroup.findAnalysisGroup(idMap.get("a2"));
-        String codename = a2.getCodeName();
+		String codename = a2.getCodeName();
 		AnalysisGroup check = AnalysisGroup.findAnalysisGroupsByCodeNameEquals(codename).getSingleResult();
 		Assert.assertEquals(check.toJson(), a2.toJson());
 	}
-	
+
 	@Transactional
 	@Test
-	public void removeByExperimentIdManyToManyTest() {		
+	public void removeByExperimentIdManyToManyTest() {
 		HashMap<String, Long> idMap = makeTestStack();
 		Long experiment2Id = idMap.get("e2");
 		Long a1Id = idMap.get("a1");
@@ -420,12 +422,13 @@ public void removeByExperimentIdManyToManyTest() {
 		Set<AnalysisGroup> expectedAnalysisGroupsBefore = new HashSet<AnalysisGroup>();
 		expectedAnalysisGroupsBefore.add(AnalysisGroup.findAnalysisGroup(a1Id));
 		expectedAnalysisGroupsBefore.add(AnalysisGroup.findAnalysisGroup(a2Id));
-		List<AnalysisGroup> checkbefore = AnalysisGroup.findAnalysisGroupsByExperimentIdAndIgnored(experiment2Id, false).getResultList();
+		List<AnalysisGroup> checkbefore = AnalysisGroup.findAnalysisGroupsByExperimentIdAndIgnored(experiment2Id, false)
+				.getResultList();
 		Assert.assertEquals(checkbefore.size(), 2);
 		AnalysisGroup.removeByExperimentID(experiment2Id);
-		//check what's been removed
-//		TreatmentGroup t1 = TreatmentGroup.findTreatmentGroup(idMap.get("t1"));
-//		t1.getAnalysisGroups().clear();
+		// check what's been removed
+		// TreatmentGroup t1 = TreatmentGroup.findTreatmentGroup(idMap.get("t1"));
+		// t1.getAnalysisGroups().clear();
 		Experiment checke1 = Experiment.findExperiment(idMap.get("e1"));
 		Experiment checke2 = Experiment.findExperiment(idMap.get("e2"));
 		Experiment checke3 = Experiment.findExperiment(idMap.get("e3"));
@@ -433,20 +436,21 @@ public void removeByExperimentIdManyToManyTest() {
 		AnalysisGroup checka2 = AnalysisGroup.findAnalysisGroup(a2Id);
 		AnalysisGroup checka3 = AnalysisGroup.findAnalysisGroup(idMap.get("a3"));
 		TreatmentGroup checkt1 = TreatmentGroup.findTreatmentGroup(idMap.get("t1"));
-		//checkt1.getAnalysisGroups().clear();
+		// checkt1.getAnalysisGroups().clear();
 		TreatmentGroup checkt2 = TreatmentGroup.findTreatmentGroup(idMap.get("t2"));
-		//checkt2.getAnalysisGroups().clear();
+		// checkt2.getAnalysisGroups().clear();
 		TreatmentGroup checkt3 = TreatmentGroup.findTreatmentGroup(idMap.get("t3"));
-		//checkt3.getAnalysisGroups().clear();
+		// checkt3.getAnalysisGroups().clear();
 		Subject checks1 = Subject.findSubject(idMap.get("s1"));
 		Subject checks2 = Subject.findSubject(idMap.get("s2"));
 		Subject checks3 = Subject.findSubject(idMap.get("s3"));
 		AnalysisGroup t2ag = checkt2.getAnalysisGroups().iterator().next();
-		//try flush - breaks, tries to persist deleted object
-		//try clear - wipes out everything, not just the deleted ones
-		//try removing @Transactional - Can't delete the analysisgroups since they're still referenced by treatmentgroups
-		//Assert.assertNull(t1ag.getId());
-		//Assert.assertNull(AnalysisGroup.findAnalysisGroup(t1ag.getId()));
+		// try flush - breaks, tries to persist deleted object
+		// try clear - wipes out everything, not just the deleted ones
+		// try removing @Transactional - Can't delete the analysisgroups since they're
+		// still referenced by treatmentgroups
+		// Assert.assertNull(t1ag.getId());
+		// Assert.assertNull(AnalysisGroup.findAnalysisGroup(t1ag.getId()));
 		Assert.assertNull(checka1);
 		Assert.assertNull(checka2);
 		Assert.assertNotNull(checka3);
@@ -460,10 +464,10 @@ public void removeByExperimentIdManyToManyTest() {
 		Assert.assertNotNull(checks2);
 		Assert.assertNotNull(checks3);
 	}
-	
-	//TODO: fix this test. Method being tested works in test above
+
+	// TODO: fix this test. Method being tested works in test above
 	@Transactional
-	//@Test
+	// @Test
 	public void removeByExperimentIdSingleTest() {
 		AnalysisGroup analysisgroup = makeTestingAnalysisGroup();
 		TreatmentGroup treatmentgroup = makeTestingTreatmentGroup();
@@ -477,16 +481,16 @@ public void removeByExperimentIdSingleTest() {
 		Assert.assertEquals(analysisgroup.toJson(), checkbefore.toJson());
 		AnalysisGroup.removeByExperimentID(experimentId);
 		AnalysisGroup checkafter = AnalysisGroup.findAnalysisGroup(id);
-		Assert.assertEquals(null,checkafter);
+		Assert.assertEquals(null, checkafter);
 	}
-	
-	//@Test
-//	public void removeOrphansTest() {
-//		AnalysisGroup.removeOrphans();
-//	}
-	
+
+	// @Test
+	// public void removeOrphansTest() {
+	// AnalysisGroup.removeOrphans();
+	// }
+
 	@Transactional
-	//@Test
+	// @Test
 	public void deleteByExperimentIdTest() {
 		HashMap<String, Long> idMap = makeTestStack();
 		Long experiment2Id = idMap.get("e2");
@@ -495,7 +499,8 @@ public void deleteByExperimentIdTest() {
 		Set<AnalysisGroup> expectedAnalysisGroupsBefore = new HashSet<AnalysisGroup>();
 		expectedAnalysisGroupsBefore.add(AnalysisGroup.findAnalysisGroup(a1Id));
 		expectedAnalysisGroupsBefore.add(AnalysisGroup.findAnalysisGroup(a2Id));
-		List<AnalysisGroup> checkbefore = AnalysisGroup.findAnalysisGroupsByExperimentIdAndIgnored(experiment2Id, false).getResultList();
+		List<AnalysisGroup> checkbefore = AnalysisGroup.findAnalysisGroupsByExperimentIdAndIgnored(experiment2Id, false)
+				.getResultList();
 		Assert.assertEquals(checkbefore.size(), 2);
 		AnalysisGroup.deleteByExperimentID(experiment2Id);
 		AnalysisGroup check1After = AnalysisGroup.findAnalysisGroup(a1Id);
@@ -503,7 +508,7 @@ public void deleteByExperimentIdTest() {
 		Assert.assertNull(check1After);
 		Assert.assertNull(check2After);
 	}
-	
+
 	@Transactional
 	@Test
 	public void fromJsonToAnalysisGroupTest() {
@@ -513,20 +518,20 @@ public void fromJsonToAnalysisGroupTest() {
 		AnalysisGroup a1check = AnalysisGroup.fromJsonToAnalysisGroup(json);
 		Assert.assertEquals(a1.getCodeName(), a1check.getCodeName());
 	}
-	
+
 	@Transactional
 	@Test
-    public void removeTest() {
+	public void removeTest() {
 		AnalysisGroup analysisgroup = makeTestingAnalysisGroup();
-        //go get the analysisgroup by its ID
-        AnalysisGroup check = AnalysisGroup.findAnalysisGroup(analysisgroup.getId());
-        //logger.info(check.toPrettyFullJson());
-        //check that the original and the fetched analysisgroups are the same
-        Assert.assertEquals(check.toJson(),analysisgroup.toJson());
-        //remove the original
-        analysisgroup.remove();
-        //make sure the original doesn't matched the one fetched before the remove
-        Assert.assertEquals(check.toJson(), analysisgroup.toJson());
-        
-    }
+		// go get the analysisgroup by its ID
+		AnalysisGroup check = AnalysisGroup.findAnalysisGroup(analysisgroup.getId());
+		// logger.info(check.toPrettyFullJson());
+		// check that the original and the fetched analysisgroups are the same
+		Assert.assertEquals(check.toJson(), analysisgroup.toJson());
+		// remove the original
+		analysisgroup.remove();
+		// make sure the original doesn't matched the one fetched before the remove
+		Assert.assertEquals(check.toJson(), analysisgroup.toJson());
+
+	}
 }
diff --git a/src/test/java/com/labsynch/labseer/manytomany/ExperimentStatusTests.java b/src/test/java/com/labsynch/labseer/manytomany/ExperimentStatusTests.java
index 30bc4964d..0b36ac6ad 100644
--- a/src/test/java/com/labsynch/labseer/manytomany/ExperimentStatusTests.java
+++ b/src/test/java/com/labsynch/labseer/manytomany/ExperimentStatusTests.java
@@ -28,7 +28,8 @@
 import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class ExperimentStatusTests {
 
@@ -41,11 +42,11 @@ public class ExperimentStatusTests {
 	private ExperimentService experimentService;
 
 	@Transactional
-	//@Test
+	// @Test
 	public void CountExperimentsTest() {
 		List<Experiment> experiments = Experiment.findAllExperiments();
 		logger.info("number of experiments found -- " + experiments.size());
-		for (Experiment experiment : experiments){
+		for (Experiment experiment : experiments) {
 			logger.info("found experiment: " + experiment.getId());
 			logger.info("found experiment: " + experiment.toPrettyJson());
 		}
@@ -67,7 +68,7 @@ public void FindExperimentStatusTest() {
 		Set<Experiment> experiments = new HashSet<Experiment>();
 		experiments.add(experiment);
 		Set<AnalysisGroup> analysisGroups = experiment.getAnalysisGroups();
-		for (AnalysisGroup analysisGroup: analysisGroups) {
+		for (AnalysisGroup analysisGroup : analysisGroups) {
 			Set<TreatmentGroup> treatmentGroups = analysisGroup.getTreatmentGroups();
 			for (TreatmentGroup treatmentGroup : treatmentGroups) {
 				Set<Subject> subjects = treatmentGroup.getSubjects();
@@ -75,12 +76,12 @@ public void FindExperimentStatusTest() {
 					List<SubjectState> subjectStates = SubjectState
 							.findSubjectStatesByLsTypeEqualsAndLsKindEqualsAndSubject(
 									stateType, stateKind, subject)
-									.getResultList();
+							.getResultList();
 					for (SubjectState subjectState : subjectStates) {
 						List<SubjectValue> subjectValues = SubjectValue
 								.findSubjectValuesByLsStateAndLsTypeEqualsAndLsKindEquals(
 										subjectState, stateValueType, stateValueKind)
-										.getResultList();
+								.getResultList();
 						for (SubjectValue subjectValue : subjectValues) {
 							if (stateValueType.equalsIgnoreCase("stringValue")) {
 								values.add(subjectValue.getStringValue());
@@ -92,7 +93,7 @@ public void FindExperimentStatusTest() {
 				}
 			}
 		}
-		
+
 		KeyValueDTO transferDTO = new KeyValueDTO();
 		transferDTO.setKey("lsValue");
 		transferDTO.setValue(values.toString());
@@ -102,5 +103,4 @@ public void FindExperimentStatusTest() {
 
 	}
 
-
 }
diff --git a/src/test/java/com/labsynch/labseer/manytomany/ExperimentTest.java b/src/test/java/com/labsynch/labseer/manytomany/ExperimentTest.java
index 62dab7990..698836f7b 100644
--- a/src/test/java/com/labsynch/labseer/manytomany/ExperimentTest.java
+++ b/src/test/java/com/labsynch/labseer/manytomany/ExperimentTest.java
@@ -29,32 +29,33 @@
 import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class ExperimentTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(ExperimentTest.class);
-	
+
 	@Autowired
 	private ExperimentService experimentService;
 
 	@Transactional
-	//@Test
+	// @Test
 	public void Experiment_Many_To_Many_Test() {
 		Experiment theExperiment = Experiment.findExperiment(2165L);
 
-		//logger.debug(theExperiment.toJson());
-		
+		// logger.debug(theExperiment.toJson());
+
 		int theSize = theExperiment.getAnalysisGroups().size();
 		logger.debug(String.valueOf(theSize));
 		System.out.println("" + theSize);
 		Assert.assertEquals(7, theSize);
 	}
-	
+
 	public HashMap<String, Long> makeTestStack() {
-		//each of these methods creates the full stack from protocol to subject.
+		// each of these methods creates the full stack from protocol to subject.
 		Date now = new Date();
-		//create 1 Protocol
+		// create 1 Protocol
 		Protocol protocol = new Protocol();
 		protocol.setRecordedBy("test user");
 		protocol.setRecordedDate(now);
@@ -62,50 +63,50 @@ public HashMap<String, Long> makeTestStack() {
 		protocol.setLsType("default");
 		protocol.setLsTransaction(98765L);
 		protocol.persist();
-		
-		//create 3 Experiments
+
+		// create 3 Experiments
 		Experiment e1 = new Experiment();
-        e1.setCodeName("T-EXPT-1111111");
-        Experiment e2 = new Experiment();
-        e2.setCodeName("T-EXPT-22222222");
-        Experiment e3 = new Experiment();
-        e3.setCodeName("T-EXPT-33333333");
-        Set<Experiment> allExperiments = new HashSet<Experiment>();
-        allExperiments.add(e1);
-        allExperiments.add(e2);
-        allExperiments.add(e3);
-        for (Experiment experiment: allExperiments) {
-        	experiment.setIgnored(false);
-        	experiment.setLsKind(protocol.getLsKind());
-        	experiment.setLsType(protocol.getLsType());
-        	experiment.setRecordedBy(protocol.getRecordedBy());
-        	experiment.setRecordedDate(protocol.getRecordedDate());
-            experiment.setLsTransaction(protocol.getLsTransaction());
-        	experiment.setProtocol(protocol);
-        }
-        
-		//create 3 AnalysisGroups
-        AnalysisGroup a1= new AnalysisGroup();
-        a1.setCodeName("T-AG-11111111");
-        AnalysisGroup a2= new AnalysisGroup();
-        a2.setCodeName("T-AG-22222222");
-        AnalysisGroup a3= new AnalysisGroup();
-        a3.setCodeName("T-AG-33333333");
-        Set<AnalysisGroup> allAnalysisGroups = new HashSet<AnalysisGroup>();
-        allAnalysisGroups.add(a1);
-        allAnalysisGroups.add(a2);
-        allAnalysisGroups.add(a3);
-        for (AnalysisGroup analysisGroup: allAnalysisGroups) {
-        	analysisGroup.setIgnored(e1.isIgnored());
-            analysisGroup.setLsKind(e1.getLsKind());
-            analysisGroup.setLsType(e1.getLsType());
-            analysisGroup.setRecordedBy(e1.getRecordedBy());
-            analysisGroup.setRecordedDate(e1.getRecordedDate());
-            analysisGroup.setLsTransaction(e1.getLsTransaction());
-        }
-        
-        //create 3 TreatmentGroups
-        TreatmentGroup t1 = new TreatmentGroup();
+		e1.setCodeName("T-EXPT-1111111");
+		Experiment e2 = new Experiment();
+		e2.setCodeName("T-EXPT-22222222");
+		Experiment e3 = new Experiment();
+		e3.setCodeName("T-EXPT-33333333");
+		Set<Experiment> allExperiments = new HashSet<Experiment>();
+		allExperiments.add(e1);
+		allExperiments.add(e2);
+		allExperiments.add(e3);
+		for (Experiment experiment : allExperiments) {
+			experiment.setIgnored(false);
+			experiment.setLsKind(protocol.getLsKind());
+			experiment.setLsType(protocol.getLsType());
+			experiment.setRecordedBy(protocol.getRecordedBy());
+			experiment.setRecordedDate(protocol.getRecordedDate());
+			experiment.setLsTransaction(protocol.getLsTransaction());
+			experiment.setProtocol(protocol);
+		}
+
+		// create 3 AnalysisGroups
+		AnalysisGroup a1 = new AnalysisGroup();
+		a1.setCodeName("T-AG-11111111");
+		AnalysisGroup a2 = new AnalysisGroup();
+		a2.setCodeName("T-AG-22222222");
+		AnalysisGroup a3 = new AnalysisGroup();
+		a3.setCodeName("T-AG-33333333");
+		Set<AnalysisGroup> allAnalysisGroups = new HashSet<AnalysisGroup>();
+		allAnalysisGroups.add(a1);
+		allAnalysisGroups.add(a2);
+		allAnalysisGroups.add(a3);
+		for (AnalysisGroup analysisGroup : allAnalysisGroups) {
+			analysisGroup.setIgnored(e1.isIgnored());
+			analysisGroup.setLsKind(e1.getLsKind());
+			analysisGroup.setLsType(e1.getLsType());
+			analysisGroup.setRecordedBy(e1.getRecordedBy());
+			analysisGroup.setRecordedDate(e1.getRecordedDate());
+			analysisGroup.setLsTransaction(e1.getLsTransaction());
+		}
+
+		// create 3 TreatmentGroups
+		TreatmentGroup t1 = new TreatmentGroup();
 		t1.setCodeName("T-TG-11111111");
 		TreatmentGroup t2 = new TreatmentGroup();
 		t2.setCodeName("T-TG-22222222");
@@ -115,16 +116,16 @@ public HashMap<String, Long> makeTestStack() {
 		allTreatmentGroups.add(t1);
 		allTreatmentGroups.add(t2);
 		allTreatmentGroups.add(t3);
-		for (TreatmentGroup treatmentGroup: allTreatmentGroups) {
+		for (TreatmentGroup treatmentGroup : allTreatmentGroups) {
 			treatmentGroup.setIgnored(a1.isIgnored());
 			treatmentGroup.setLsKind(a1.getLsKind());
 			treatmentGroup.setLsType(a1.getLsType());
 			treatmentGroup.setRecordedBy(a1.getRecordedBy());
-            treatmentGroup.setRecordedDate(a1.getRecordedDate());
+			treatmentGroup.setRecordedDate(a1.getRecordedDate());
 			treatmentGroup.setLsTransaction(a1.getLsTransaction());
 		}
-		
-		//create 3 Subjects
+
+		// create 3 Subjects
 		Subject s1 = new Subject();
 		s1.setCodeName("T-SUBJ-11111111");
 		Subject s2 = new Subject();
@@ -135,16 +136,16 @@ public HashMap<String, Long> makeTestStack() {
 		allSubjects.add(s1);
 		allSubjects.add(s2);
 		allSubjects.add(s3);
-		for (Subject subject: allSubjects) {
+		for (Subject subject : allSubjects) {
 			subject.setIgnored(t1.isIgnored());
 			subject.setLsKind(t1.getLsKind());
 			subject.setLsType(t1.getLsType());
 			subject.setRecordedBy(t1.getRecordedBy());
-            subject.setRecordedDate(t1.getRecordedDate());
+			subject.setRecordedDate(t1.getRecordedDate());
 			subject.setLsTransaction(t1.getLsTransaction());
 		}
-		
-		//Create the various Sets for mapping
+
+		// Create the various Sets for mapping
 		Set<AnalysisGroup> e1AnalysisGroups = new HashSet<AnalysisGroup>();
 		e1AnalysisGroups.add(a1);
 		e1AnalysisGroups.add(a3);
@@ -199,8 +200,8 @@ public HashMap<String, Long> makeTestStack() {
 		Set<TreatmentGroup> s3TreatmentGroups = new HashSet<TreatmentGroup>();
 		s3TreatmentGroups.add(t1);
 		s3TreatmentGroups.add(t3);
-		
-		//Then assign all the groups to their owners to create the mappings
+
+		// Then assign all the groups to their owners to create the mappings
 		e1.setAnalysisGroups(e1AnalysisGroups);
 		e2.setAnalysisGroups(e2AnalysisGroups);
 		e3.setAnalysisGroups(e3AnalysisGroups);
@@ -219,21 +220,21 @@ public HashMap<String, Long> makeTestStack() {
 		s1.setTreatmentGroups(s1TreatmentGroups);
 		s2.setTreatmentGroups(s2TreatmentGroups);
 		s3.setTreatmentGroups(s3TreatmentGroups);
-		
-		//Then persist and flush everything to the database
+
+		// Then persist and flush everything to the database
 		e1.persist();
-//		e2.persist();
-//		e3.persist();
-//		a1.persist();
-//		a2.persist();
-//		a3.persist();
-//		t1.persist();
-//		t2.persist();
-//		t3.persist();
-//		s1.persist();
-//		s2.persist();
-//		s3.persist();
-		
+		// e2.persist();
+		// e3.persist();
+		// a1.persist();
+		// a2.persist();
+		// a3.persist();
+		// t1.persist();
+		// t2.persist();
+		// t3.persist();
+		// s1.persist();
+		// s2.persist();
+		// s3.persist();
+
 		HashMap<String, Long> idMap = new HashMap<String, Long>();
 		idMap.put("e1", e1.getId());
 		idMap.put("e2", e2.getId());
@@ -247,221 +248,229 @@ public HashMap<String, Long> makeTestStack() {
 		idMap.put("s1", s1.getId());
 		idMap.put("s2", s2.getId());
 		idMap.put("s3", s3.getId());
-		
+
 		return idMap;
 	}
-	
-	
-//	@Transactional
-//	//@Test
-//	public void CreateFullExperiment_Test() throws UniqueExperimentNameException {
-//		
-//		Protocol protocol = Protocol.findProtocolEntries(0, 1).get(0);
-//		Experiment experiment = new Experiment();
-//		experiment.setProtocol(protocol);
-//		String experimentCodeName = autoLabelService.getExperimentCodeName();
-//		logger.debug("experiment CodeName is: " + experimentCodeName);
-//		experiment.setCodeName(experimentCodeName);
-//		experiment.setRecordedBy("tester");
-//		experiment.setRecordedDate(new Date());
-//		experiment.setLsType("default");
-//		experiment.setLsKind("default");
-//		experiment.persist();
-//
-//		AnalysisGroup ag = new AnalysisGroup();
-//		String analysisGroupCodeName = autoLabelService.getAnalysisGroupCodeName();
-//		logger.debug("analysis Group CodeName is: " + analysisGroupCodeName);
-//		ag.setCodeName(analysisGroupCodeName);
-//		Set<Experiment> experiments = new HashSet<Experiment>();
-//		experiments.add(Experiment.findExperiment(experiment.getId()));
-//		ag.setExperiments(experiments);
-//		ag.setLsType("data");
-//		ag.setLsKind("results");
-//		ag.setRecordedBy("tester");
-//		ag.setRecordedDate(new Date());
-//		ag.persist();
-//		
-//		TreatmentGroup tg = new TreatmentGroup();
-//		String treatmentGroupCodeName = autoLabelService.getTreatmentGroupCodeName();
-//		logger.debug("TreatmentGroup CodeName is: " + treatmentGroupCodeName);
-//		tg.setCodeName(treatmentGroupCodeName);
-//		Set<AnalysisGroup> analysisGroups = new HashSet<AnalysisGroup>();
-//		analysisGroups.add(AnalysisGroup.findAnalysisGroup(ag.getId()));
-//		tg.setAnalysisGroups(analysisGroups);
-//		tg.getAnalysisGroups().add(ag);
-//		tg.setLsType("default");
-//		tg.setLsKind("default");
-//		tg.setRecordedBy("tester");
-//		tg.setRecordedDate(new Date());
-//		tg.persist();
-//		
-//		Subject subj = new Subject();
-//		String subjectCodeName = autoLabelService.getSubjectCodeName();
-//		logger.debug("Subject CodeName is: " + subjectCodeName);
-//		subj.setCodeName(subjectCodeName);
-//		Set<TreatmentGroup> treatmentGroups = new HashSet<TreatmentGroup>();
-//		treatmentGroups.add(TreatmentGroup.findTreatmentGroup(tg.getId()));
-//		subj.setTreatmentGroups(treatmentGroups);
-//		subj.getTreatmentGroups().add(tg);
-//		subj.setLsType("default");
-//		subj.setLsKind("default");
-//		subj.setRecordedBy("tester");
-//		subj.setRecordedDate(new Date());
-//		subj.persist();
-//		
-//		logger.debug("experiment json: " + Experiment.findExperiment(experiment.getId()).toPrettyJson());
-//		logger.debug("AnalysisGroup json: " + AnalysisGroup.findAnalysisGroup(ag.getId()).toPrettyFullJson());
-//		logger.debug("TreatmentGroup json: " + TreatmentGroup.findTreatmentGroup(tg.getId()).toJson());
-//		logger.debug("Subject json: " + Subject.findSubject(subj.getId()).toPrettyJson());
-//
-//		Subject retSubj = Subject.findSubject(subj.getId());
-//		TreatmentGroup retTg = TreatmentGroup.findTreatmentGroup(tg.getId());
-//		retTg.getSubjects().add(retSubj);
-//		AnalysisGroup retAg = AnalysisGroup.findAnalysisGroup(ag.getId());
-//		retAg.getTreatmentGroups().add(retTg);
-//		Experiment retExp = Experiment.findExperiment(experiment.getId());
-//		retExp.getAnalysisGroups().add(retAg);
-//		logger.debug("full ret experiment: " + retExp.toJson());
-//		
-////		String json = "{\"analysisGroups\":[{\"id\":null,\"ignored\":false,\"lsKind\":\"results\",\"lsLabels\":[],\"lsStates\":[],\"lsType\":\"data\",\"lsTypeAndKind\":\"data_results\",\"recordedBy\":\"tester\",\"recordedDate\":1403419760648,\"treatmentGroups\":[{\"id\":null,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsStates\":[],\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"recordedBy\":\"tester\",\"recordedDate\":1403419760694,\"subjects\":[{\"id\":null,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsStates\":[],\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"recordedBy\":\"tester\",\"recordedDate\":1403419760738,\"version\":0}],\"version\":0}],\"version\":0}],\"codeName\":null,\"id\":null,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsStates\":[],\"lsTags\":[],\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"protocol\":{\"codeName\":\"PROT-00000002\",\"id\":1,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":1,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"recordedBy\":\"smeyer\",\"recordedDate\":1402943976000,\"shortDescription\":\"confirmation screen\",\"version\":1},\"recordedBy\":\"tester\",\"recordedDate\":1403419760597,\"version\":0}";
-////		Experiment output = experimentService.saveLsExperiment(Experiment.fromJsonToExperiment(json));
-////		logger.debug("created experiment from json: " + output.toJson());
-//		
-//	}
+
+	// @Transactional
+	// //@Test
+	// public void CreateFullExperiment_Test() throws UniqueExperimentNameException
+	// {
+	//
+	// Protocol protocol = Protocol.findProtocolEntries(0, 1).get(0);
+	// Experiment experiment = new Experiment();
+	// experiment.setProtocol(protocol);
+	// String experimentCodeName = autoLabelService.getExperimentCodeName();
+	// logger.debug("experiment CodeName is: " + experimentCodeName);
+	// experiment.setCodeName(experimentCodeName);
+	// experiment.setRecordedBy("tester");
+	// experiment.setRecordedDate(new Date());
+	// experiment.setLsType("default");
+	// experiment.setLsKind("default");
+	// experiment.persist();
+	//
+	// AnalysisGroup ag = new AnalysisGroup();
+	// String analysisGroupCodeName = autoLabelService.getAnalysisGroupCodeName();
+	// logger.debug("analysis Group CodeName is: " + analysisGroupCodeName);
+	// ag.setCodeName(analysisGroupCodeName);
+	// Set<Experiment> experiments = new HashSet<Experiment>();
+	// experiments.add(Experiment.findExperiment(experiment.getId()));
+	// ag.setExperiments(experiments);
+	// ag.setLsType("data");
+	// ag.setLsKind("results");
+	// ag.setRecordedBy("tester");
+	// ag.setRecordedDate(new Date());
+	// ag.persist();
+	//
+	// TreatmentGroup tg = new TreatmentGroup();
+	// String treatmentGroupCodeName = autoLabelService.getTreatmentGroupCodeName();
+	// logger.debug("TreatmentGroup CodeName is: " + treatmentGroupCodeName);
+	// tg.setCodeName(treatmentGroupCodeName);
+	// Set<AnalysisGroup> analysisGroups = new HashSet<AnalysisGroup>();
+	// analysisGroups.add(AnalysisGroup.findAnalysisGroup(ag.getId()));
+	// tg.setAnalysisGroups(analysisGroups);
+	// tg.getAnalysisGroups().add(ag);
+	// tg.setLsType("default");
+	// tg.setLsKind("default");
+	// tg.setRecordedBy("tester");
+	// tg.setRecordedDate(new Date());
+	// tg.persist();
+	//
+	// Subject subj = new Subject();
+	// String subjectCodeName = autoLabelService.getSubjectCodeName();
+	// logger.debug("Subject CodeName is: " + subjectCodeName);
+	// subj.setCodeName(subjectCodeName);
+	// Set<TreatmentGroup> treatmentGroups = new HashSet<TreatmentGroup>();
+	// treatmentGroups.add(TreatmentGroup.findTreatmentGroup(tg.getId()));
+	// subj.setTreatmentGroups(treatmentGroups);
+	// subj.getTreatmentGroups().add(tg);
+	// subj.setLsType("default");
+	// subj.setLsKind("default");
+	// subj.setRecordedBy("tester");
+	// subj.setRecordedDate(new Date());
+	// subj.persist();
+	//
+	// logger.debug("experiment json: " +
+	// Experiment.findExperiment(experiment.getId()).toPrettyJson());
+	// logger.debug("AnalysisGroup json: " +
+	// AnalysisGroup.findAnalysisGroup(ag.getId()).toPrettyFullJson());
+	// logger.debug("TreatmentGroup json: " +
+	// TreatmentGroup.findTreatmentGroup(tg.getId()).toJson());
+	// logger.debug("Subject json: " +
+	// Subject.findSubject(subj.getId()).toPrettyJson());
+	//
+	// Subject retSubj = Subject.findSubject(subj.getId());
+	// TreatmentGroup retTg = TreatmentGroup.findTreatmentGroup(tg.getId());
+	// retTg.getSubjects().add(retSubj);
+	// AnalysisGroup retAg = AnalysisGroup.findAnalysisGroup(ag.getId());
+	// retAg.getTreatmentGroups().add(retTg);
+	// Experiment retExp = Experiment.findExperiment(experiment.getId());
+	// retExp.getAnalysisGroups().add(retAg);
+	// logger.debug("full ret experiment: " + retExp.toJson());
+	//
+	//// String json =
+	// "{\"analysisGroups\":[{\"id\":null,\"ignored\":false,\"lsKind\":\"results\",\"lsLabels\":[],\"lsStates\":[],\"lsType\":\"data\",\"lsTypeAndKind\":\"data_results\",\"recordedBy\":\"tester\",\"recordedDate\":1403419760648,\"treatmentGroups\":[{\"id\":null,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsStates\":[],\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"recordedBy\":\"tester\",\"recordedDate\":1403419760694,\"subjects\":[{\"id\":null,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsStates\":[],\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"recordedBy\":\"tester\",\"recordedDate\":1403419760738,\"version\":0}],\"version\":0}],\"version\":0}],\"codeName\":null,\"id\":null,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsStates\":[],\"lsTags\":[],\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"protocol\":{\"codeName\":\"PROT-00000002\",\"id\":1,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":1,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"recordedBy\":\"smeyer\",\"recordedDate\":1402943976000,\"shortDescription\":\"confirmation
+	// screen\",\"version\":1},\"recordedBy\":\"tester\",\"recordedDate\":1403419760597,\"version\":0}";
+	//// Experiment output =
+	// experimentService.saveLsExperiment(Experiment.fromJsonToExperiment(json));
+	//// logger.debug("created experiment from json: " + output.toJson());
+	//
+	// }
 
 	@Transactional
-	//@Test
+	// @Test
 	public void CreateFullExperimentFromJson1_Test() throws UniqueNameException, NotFoundException {
-		
+
 		String json = "{\"analysisGroups\":[{\"id\":null,\"ignored\":false,\"lsKind\":\"results\",\"lsLabels\":[],\"lsStates\":[],\"lsType\":\"data\",\"lsTypeAndKind\":\"data_results\",\"recordedBy\":\"tester\",\"recordedDate\":1403419760648,\"treatmentGroups\":[{\"id\":null,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsStates\":[],\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"recordedBy\":\"tester\",\"recordedDate\":1403419760694,\"subjects\":[{\"id\":null,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsStates\":[],\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"recordedBy\":\"tester\",\"recordedDate\":1403419760738,\"version\":0}],\"version\":0}],\"version\":0}],\"codeName\":null,\"id\":null,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsStates\":[],\"lsTags\":[],\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"protocol\":{\"codeName\":\"PROT-00000002\",\"id\":1,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":1,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"recordedBy\":\"smeyer\",\"recordedDate\":1402943976000,\"shortDescription\":\"confirmation screen\",\"version\":1},\"recordedBy\":\"tester\",\"recordedDate\":1403419760597,\"version\":0}";
 		Experiment output = experimentService.saveLsExperiment(Experiment.fromJsonToExperiment(json));
 		logger.debug("created experiment from just json: " + output.toJson());
 
 	}
-	
+
 	@Transactional
-	//@Test
+	// @Test
 	public void GetFullExperimentJson1_Test() {
-		
+
 		Experiment experiment = Experiment.findExperiment(242L);
 		logger.debug("Get full experiment json: " + experiment.toJson());
 		logger.debug("Get full experiment pretty json: " + experiment.toPrettyJson());
 		String testJson = "{\"analysisGroups\":[{\"codeName\":\"AG-00000030\",\"id\":243,\"ignored\":false,\"lsKind\":\"results\",\"lsLabels\":[],\"lsStates\":[],\"lsType\":\"data\",\"lsTypeAndKind\":\"data_results\",\"recordedBy\":\"tester\",\"recordedDate\":1403419760648,\"treatmentGroups\":[{\"id\":244,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsStates\":[],\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"recordedBy\":\"tester\",\"recordedDate\":1403419760694,\"subjects\":[{\"id\":245,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsStates\":[],\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"recordedBy\":\"tester\",\"recordedDate\":1403419760738,\"version\":0}],\"version\":0}],\"version\":0}],\"codeName\":\"EXPT-00000017\",\"id\":242,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsStates\":[],\"lsTags\":[],\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"protocol\":{\"codeName\":\"PROT-00000002\",\"id\":1,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":1,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"recordedBy\":\"smeyer\",\"recordedDate\":1402943976000,\"shortDescription\":\"confirmation screen\",\"version\":1},\"recordedBy\":\"tester\",\"recordedDate\":1403419760597,\"version\":1}";
 		Experiment testExperiment = Experiment.fromJsonToExperiment(testJson);
-		//Assert.assertEquals(testExperiment.toJson(), experiment.toJson());
+		// Assert.assertEquals(testExperiment.toJson(), experiment.toJson());
 		Assert.assertEquals(Experiment.findExperiment(testExperiment.getId()), experiment);
 
 	}
-	
-	//This method searches by Experiment Code Name
+
+	// This method searches by Experiment Code Name
 	@Transactional
 	@Test
-	public void findExperimentByNameTest () {
+	public void findExperimentByNameTest() {
 		String experimentCodeName = "EXPT-00000002";
 		Collection<Experiment> experiments = Experiment.findExperimentByName(experimentCodeName);
-		assert(!experiments.isEmpty());
+		assert (!experiments.isEmpty());
 	}
-	
-	//This method searches by Experiment Label Text
+
+	// This method searches by Experiment Label Text
 	@Transactional
 	@Test
-	public void findExperimentByExperimentNameTest () {
+	public void findExperimentByExperimentNameTest() {
 		String experimentLabelText = "Test Load 102";
 		List<Experiment> experiments = Experiment.findExperimentByExperimentName(experimentLabelText);
-		assert(experiments.get(0).getId() == 1007);
+		assert (experiments.get(0).getId() == 1007);
 	}
-	
+
 	@Transactional
 	@Test
-	public void findExperimentByExperimentNameAndProtocolIdTest () {
+	public void findExperimentByExperimentNameAndProtocolIdTest() {
 		String experimentName = "Test Load 102";
 		Long protocolId = 1006L;
-		List<Experiment> experiments = Experiment.findExperimentByExperimentNameAndProtocolId(experimentName, protocolId);
-		assert(experiments.get(0).getId() == 1007);
+		List<Experiment> experiments = Experiment.findExperimentByExperimentNameAndProtocolId(experimentName,
+				protocolId);
+		assert (experiments.get(0).getId() == 1007);
 	}
-	
+
 	@Transactional
 	@Test
-	public void findExperimentByExperimentNameAndProtocolIdAndIgnoredNotTest () {
+	public void findExperimentByExperimentNameAndProtocolIdAndIgnoredNotTest() {
 		String experimentName = "Test Load 102";
 		Long protocolId = 1006L;
-		List<Experiment> experiments = Experiment.findExperimentListByExperimentNameAndProtocolIdAndIgnoredNot(experimentName, protocolId);
-		assert(experiments.get(0).getId() == 1007);
+		List<Experiment> experiments = Experiment
+				.findExperimentListByExperimentNameAndProtocolIdAndIgnoredNot(experimentName, protocolId);
+		assert (experiments.get(0).getId() == 1007);
 	}
-	
+
 	@Transactional
 	@Test
-	public void findExperimentByNameAndProtocolIdTest () {
+	public void findExperimentByNameAndProtocolIdTest() {
 		String experimentLabelText = "Test Load 102";
 		Long protocolId = 1006L;
-		Collection<Experiment> experiments = Experiment.findExperimentByNameAndProtocolId(experimentLabelText, protocolId);
-		assert(!experiments.isEmpty());
+		Collection<Experiment> experiments = Experiment.findExperimentByNameAndProtocolId(experimentLabelText,
+				protocolId);
+		assert (!experiments.isEmpty());
 	}
-	
-	//Need to locate appropriate JSON string for new model
+
+	// Need to locate appropriate JSON string for new model
 	@Transactional
-	//@Test
-	public void fromJsonToExperimentTest (String json) {
+	// @Test
+	public void fromJsonToExperimentTest(String json) {
 
 	}
-	
+
 	@Transactional
 	@Test
 	public void removeExperimentTest() {
 		HashMap<String, Long> idMap = makeTestStack();
 		Long e1Id = idMap.get("e1");
-//		Long e2Id = idMap.get("e2");
+		// Long e2Id = idMap.get("e2");
 		Experiment e1 = Experiment.findExperiment(e1Id);
-//		Experiment e2 = Experiment.findExperiment(e2Id);
+		// Experiment e2 = Experiment.findExperiment(e2Id);
 		Experiment.removeExperimentCascadeAware(e1Id);
-//		e2.remove();
+		// e2.remove();
 		Assert.assertNull(Experiment.findExperiment(e1Id));
-//		Assert.assertNull(Experiment.findExperiment(e2Id));
+		// Assert.assertNull(Experiment.findExperiment(e2Id));
 	}
-	
+
 	@Transactional
-	//@Test
+	// @Test
 	public void removeExperimentPostTest() {
 		logger.debug("AG 1 experiments are: " + AnalysisGroup.findAnalysisGroup(626299L).getExperiments());
 	}
-	
-	
-	//Delete SQL query is now invalid
+
+	// Delete SQL query is now invalid
 	@Transactional
-	//@Test
-	public void deleteExperimentTest () {
+	// @Test
+	public void deleteExperimentTest() {
 		List<Experiment> experiment = Experiment.findExperimentByExperimentName("Test Load 102");
-		assert(experiment.size() == 1);
+		assert (experiment.size() == 1);
 		Experiment.deleteExperiment(experiment.get(0));
 		experiment = Experiment.findExperimentByExperimentName("Test Load 102");
-		assert(experiment.size() == 0);
+		assert (experiment.size() == 0);
 	}
-	
-	
+
 	@Transactional
 	@Test
 	public void findExperimentsByCodeNameEqualsTest() {
 		List<Experiment> experiment = Experiment.findExperimentsByCodeNameEquals("EXPT-00000002").getResultList();
-		assert(experiment.size() == 1);
+		assert (experiment.size() == 1);
 	}
-	
+
 	@Transactional
 	@Test
 	public void findExperimentsByLsTransaction() {
 		Long lsTransaction = 5L;
 		List<Experiment> experiment = Experiment.findExperimentsByLsTransaction(lsTransaction).getResultList();
-		assert(experiment.size() == 1);
+		assert (experiment.size() == 1);
 	}
-	
+
 	@Transactional
 	@Test
-	public void findExperimentsByProtocol()  {
+	public void findExperimentsByProtocol() {
 		Long protocolId = 1006L;
 		Protocol protocol = Protocol.findProtocol(protocolId);
 		List<Experiment> experiments = Experiment.findExperimentsByProtocol(protocol).getResultList();
-		assert(experiments.size() == 23);
+		assert (experiments.size() == 23);
 	}
-	
+
 	@Transactional
 	@Test
 	public void findExperimentsByProtocolTypeAndKindAndExperimentTypeAndKindTest() {
@@ -469,7 +478,8 @@ public void findExperimentsByProtocolTypeAndKindAndExperimentTypeAndKindTest() {
 		String protocolKind = "default";
 		String experimentType = "default";
 		String experimentKind = "default";
-		List<Experiment> experiments = Experiment.findExperimentsByProtocolTypeAndKindAndExperimentTypeAndKind(protocolType, protocolKind, experimentType, experimentKind).getResultList();
-		assert(experiments.size() == 70);
+		List<Experiment> experiments = Experiment.findExperimentsByProtocolTypeAndKindAndExperimentTypeAndKind(
+				protocolType, protocolKind, experimentType, experimentKind).getResultList();
+		assert (experiments.size() == 70);
 	}
 }
diff --git a/src/test/java/com/labsynch/labseer/manytomany/ItxTest.java b/src/test/java/com/labsynch/labseer/manytomany/ItxTest.java
index 5b89840a5..cd2b34274 100644
--- a/src/test/java/com/labsynch/labseer/manytomany/ItxTest.java
+++ b/src/test/java/com/labsynch/labseer/manytomany/ItxTest.java
@@ -28,16 +28,17 @@
 import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class ItxTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(ItxTest.class);
-	
+
 	public HashMap<String, Long> makeTestStack() {
-		//each of these methods creates the full stack from protocol to subject.
+		// each of these methods creates the full stack from protocol to subject.
 		Date now = new Date();
-		//create 2 Protocols
+		// create 2 Protocols
 		Protocol protocol = new Protocol();
 		protocol.setRecordedBy("test user");
 		protocol.setRecordedDate(now);
@@ -45,7 +46,7 @@ public HashMap<String, Long> makeTestStack() {
 		protocol.setLsType("default");
 		protocol.setLsTransaction(98765L);
 		protocol.persist();
-		
+
 		Protocol protocol2 = new Protocol();
 		protocol2.setRecordedBy("test user 2");
 		protocol2.setRecordedDate(now);
@@ -53,50 +54,50 @@ public HashMap<String, Long> makeTestStack() {
 		protocol2.setLsType("default");
 		protocol2.setLsTransaction(98765L);
 		protocol2.persist();
-		
-		//create 3 Experiments
+
+		// create 3 Experiments
 		Experiment e1 = new Experiment();
-        e1.setCodeName("T-EXPT-1111111");
-        Experiment e2 = new Experiment();
-        e2.setCodeName("T-EXPT-22222222");
-        Experiment e3 = new Experiment();
-        e3.setCodeName("T-EXPT-33333333");
-        Set<Experiment> allExperiments = new HashSet<Experiment>();
-        allExperiments.add(e1);
-        allExperiments.add(e2);
-        allExperiments.add(e3);
-        for (Experiment experiment: allExperiments) {
-        	experiment.setIgnored(false);
-        	experiment.setLsKind(protocol.getLsKind());
-        	experiment.setLsType(protocol.getLsType());
-        	experiment.setRecordedBy(protocol.getRecordedBy());
-        	experiment.setRecordedDate(protocol.getRecordedDate());
-            experiment.setLsTransaction(protocol.getLsTransaction());
-        	experiment.setProtocol(protocol);
-        }
-        
-		//create 3 AnalysisGroups
-        AnalysisGroup a1= new AnalysisGroup();
-        a1.setCodeName("T-AG-11111111");
-        AnalysisGroup a2= new AnalysisGroup();
-        a2.setCodeName("T-AG-22222222");
-        AnalysisGroup a3= new AnalysisGroup();
-        a3.setCodeName("T-AG-33333333");
-        Set<AnalysisGroup> allAnalysisGroups = new HashSet<AnalysisGroup>();
-        allAnalysisGroups.add(a1);
-        allAnalysisGroups.add(a2);
-        allAnalysisGroups.add(a3);
-        for (AnalysisGroup analysisGroup: allAnalysisGroups) {
-        	analysisGroup.setIgnored(e1.isIgnored());
-            analysisGroup.setLsKind(e1.getLsKind());
-            analysisGroup.setLsType(e1.getLsType());
-            analysisGroup.setRecordedBy(e1.getRecordedBy());
-            analysisGroup.setRecordedDate(e1.getRecordedDate());
-            analysisGroup.setLsTransaction(e1.getLsTransaction());
-        }
-        
-        //create 3 TreatmentGroups
-        TreatmentGroup t1 = new TreatmentGroup();
+		e1.setCodeName("T-EXPT-1111111");
+		Experiment e2 = new Experiment();
+		e2.setCodeName("T-EXPT-22222222");
+		Experiment e3 = new Experiment();
+		e3.setCodeName("T-EXPT-33333333");
+		Set<Experiment> allExperiments = new HashSet<Experiment>();
+		allExperiments.add(e1);
+		allExperiments.add(e2);
+		allExperiments.add(e3);
+		for (Experiment experiment : allExperiments) {
+			experiment.setIgnored(false);
+			experiment.setLsKind(protocol.getLsKind());
+			experiment.setLsType(protocol.getLsType());
+			experiment.setRecordedBy(protocol.getRecordedBy());
+			experiment.setRecordedDate(protocol.getRecordedDate());
+			experiment.setLsTransaction(protocol.getLsTransaction());
+			experiment.setProtocol(protocol);
+		}
+
+		// create 3 AnalysisGroups
+		AnalysisGroup a1 = new AnalysisGroup();
+		a1.setCodeName("T-AG-11111111");
+		AnalysisGroup a2 = new AnalysisGroup();
+		a2.setCodeName("T-AG-22222222");
+		AnalysisGroup a3 = new AnalysisGroup();
+		a3.setCodeName("T-AG-33333333");
+		Set<AnalysisGroup> allAnalysisGroups = new HashSet<AnalysisGroup>();
+		allAnalysisGroups.add(a1);
+		allAnalysisGroups.add(a2);
+		allAnalysisGroups.add(a3);
+		for (AnalysisGroup analysisGroup : allAnalysisGroups) {
+			analysisGroup.setIgnored(e1.isIgnored());
+			analysisGroup.setLsKind(e1.getLsKind());
+			analysisGroup.setLsType(e1.getLsType());
+			analysisGroup.setRecordedBy(e1.getRecordedBy());
+			analysisGroup.setRecordedDate(e1.getRecordedDate());
+			analysisGroup.setLsTransaction(e1.getLsTransaction());
+		}
+
+		// create 3 TreatmentGroups
+		TreatmentGroup t1 = new TreatmentGroup();
 		t1.setCodeName("T-TG-11111111");
 		TreatmentGroup t2 = new TreatmentGroup();
 		t2.setCodeName("T-TG-22222222");
@@ -106,16 +107,16 @@ public HashMap<String, Long> makeTestStack() {
 		allTreatmentGroups.add(t1);
 		allTreatmentGroups.add(t2);
 		allTreatmentGroups.add(t3);
-		for (TreatmentGroup treatmentGroup: allTreatmentGroups) {
+		for (TreatmentGroup treatmentGroup : allTreatmentGroups) {
 			treatmentGroup.setIgnored(a1.isIgnored());
 			treatmentGroup.setLsKind(a1.getLsKind());
 			treatmentGroup.setLsType(a1.getLsType());
 			treatmentGroup.setRecordedBy(a1.getRecordedBy());
-            treatmentGroup.setRecordedDate(a1.getRecordedDate());
+			treatmentGroup.setRecordedDate(a1.getRecordedDate());
 			treatmentGroup.setLsTransaction(a1.getLsTransaction());
 		}
-		
-		//create 3 Subjects
+
+		// create 3 Subjects
 		Subject s1 = new Subject();
 		s1.setCodeName("T-SUBJ-11111111");
 		Subject s2 = new Subject();
@@ -126,16 +127,16 @@ public HashMap<String, Long> makeTestStack() {
 		allSubjects.add(s1);
 		allSubjects.add(s2);
 		allSubjects.add(s3);
-		for (Subject subject: allSubjects) {
+		for (Subject subject : allSubjects) {
 			subject.setIgnored(t1.isIgnored());
 			subject.setLsKind(t1.getLsKind());
 			subject.setLsType(t1.getLsType());
 			subject.setRecordedBy(t1.getRecordedBy());
-            subject.setRecordedDate(t1.getRecordedDate());
+			subject.setRecordedDate(t1.getRecordedDate());
 			subject.setLsTransaction(t1.getLsTransaction());
 		}
-		
-		//Create 3 Containers
+
+		// Create 3 Containers
 		Container c1 = new Container();
 		c1.setCodeName("T-CONT-11111111");
 		Container c2 = new Container();
@@ -146,7 +147,7 @@ public HashMap<String, Long> makeTestStack() {
 		allContainers.add(c1);
 		allContainers.add(c2);
 		allContainers.add(c3);
-		for (Container container: allContainers) {
+		for (Container container : allContainers) {
 			container.setIgnored(s1.isIgnored());
 			container.setLsKind(s1.getLsKind());
 			container.setLsType(s1.getLsType());
@@ -154,9 +155,9 @@ public HashMap<String, Long> makeTestStack() {
 			container.setRecordedDate(s1.getRecordedDate());
 			container.setLsTransaction(s1.getLsTransaction());
 		}
-		
-		//Create Itx (interactions) objects
-		//ItxExperimentExperiment
+
+		// Create Itx (interactions) objects
+		// ItxExperimentExperiment
 		ItxExperimentExperiment itxe1e2 = new ItxExperimentExperiment();
 		itxe1e2.setFirstExperiment(e1);
 		itxe1e2.setSecondExperiment(e2);
@@ -170,14 +171,14 @@ public HashMap<String, Long> makeTestStack() {
 		allItxExperimentExperiments.add(itxe1e2);
 		allItxExperimentExperiments.add(itxe2e3);
 		allItxExperimentExperiments.add(itxe1e3);
-		for (ItxExperimentExperiment itxExperimentExperiment: allItxExperimentExperiments) {
+		for (ItxExperimentExperiment itxExperimentExperiment : allItxExperimentExperiments) {
 			itxExperimentExperiment.setLsKind(e1.getLsKind());
 			itxExperimentExperiment.setLsType(e1.getLsType());
 			itxExperimentExperiment.setRecordedBy(e1.getRecordedBy());
 			itxExperimentExperiment.setRecordedDate(e1.getRecordedDate());
 		}
-		
-		//ItxProtocolProtocol
+
+		// ItxProtocolProtocol
 		ItxProtocolProtocol itxp1p2 = new ItxProtocolProtocol();
 		itxp1p2.setFirstProtocol(protocol);
 		itxp1p2.setSecondProtocol(protocol2);
@@ -185,8 +186,8 @@ public HashMap<String, Long> makeTestStack() {
 		itxp1p2.setLsKind(protocol.getLsKind());
 		itxp1p2.setRecordedBy(protocol.getRecordedBy());
 		itxp1p2.setRecordedDate(protocol.getRecordedDate());
-		
-		//ItxContainerContainer
+
+		// ItxContainerContainer
 		ItxContainerContainer itxc1c2 = new ItxContainerContainer();
 		itxc1c2.setFirstContainer(c1);
 		itxc1c2.setSecondContainer(c2);
@@ -200,13 +201,13 @@ public HashMap<String, Long> makeTestStack() {
 		allItxContainerContainers.add(itxc1c2);
 		allItxContainerContainers.add(itxc2c3);
 		allItxContainerContainers.add(itxc1c3);
-		for (ItxContainerContainer itxContainerContainer: allItxContainerContainers) {
+		for (ItxContainerContainer itxContainerContainer : allItxContainerContainers) {
 			itxContainerContainer.setLsKind(c1.getLsKind());
 			itxContainerContainer.setLsType(c1.getLsType());
 			itxContainerContainer.setRecordedBy(c1.getRecordedBy());
 			itxContainerContainer.setRecordedDate(c1.getRecordedDate());
 		}
-		//ItxSubjectContainer
+		// ItxSubjectContainer
 		ItxSubjectContainer itxs1c2 = new ItxSubjectContainer();
 		itxs1c2.setSubject(s1);
 		itxs1c2.setContainer(c2);
@@ -224,14 +225,14 @@ public HashMap<String, Long> makeTestStack() {
 		allItxSubjectContainer.add(itxs2c3);
 		allItxSubjectContainer.add(itxs1c3);
 		allItxSubjectContainer.add(itxs3c1);
-		for (ItxSubjectContainer itxSubjectContainer: allItxSubjectContainer) {
+		for (ItxSubjectContainer itxSubjectContainer : allItxSubjectContainer) {
 			itxSubjectContainer.setLsKind(c1.getLsKind());
 			itxSubjectContainer.setLsType(c1.getLsType());
 			itxSubjectContainer.setRecordedBy(c1.getRecordedBy());
 			itxSubjectContainer.setRecordedDate(c1.getRecordedDate());
 		}
-		
-		//Create the various Sets for mapping
+
+		// Create the various Sets for mapping
 		Set<AnalysisGroup> e1AnalysisGroups = new HashSet<AnalysisGroup>();
 		e1AnalysisGroups.add(a1);
 		e1AnalysisGroups.add(a3);
@@ -286,8 +287,8 @@ public HashMap<String, Long> makeTestStack() {
 		Set<TreatmentGroup> s3TreatmentGroups = new HashSet<TreatmentGroup>();
 		s3TreatmentGroups.add(t1);
 		s3TreatmentGroups.add(t3);
-		
-		//Make groups of interactions
+
+		// Make groups of interactions
 		Set<ItxExperimentExperiment> e1FirstExperiments = new HashSet<ItxExperimentExperiment>();
 		e1FirstExperiments.add(itxe1e2);
 		e1FirstExperiments.add(itxe1e3);
@@ -298,12 +299,12 @@ public HashMap<String, Long> makeTestStack() {
 		Set<ItxExperimentExperiment> e3SecondExperiments = new HashSet<ItxExperimentExperiment>();
 		e3SecondExperiments.add(itxe1e3);
 		e3SecondExperiments.add(itxe2e3);
-		
+
 		Set<ItxProtocolProtocol> p1FirstProtocols = new HashSet<ItxProtocolProtocol>();
 		p1FirstProtocols.add(itxp1p2);
 		Set<ItxProtocolProtocol> p2SecondProtocols = new HashSet<ItxProtocolProtocol>();
 		p2SecondProtocols.add(itxp1p2);
-		
+
 		Set<ItxContainerContainer> c1FirstContainers = new HashSet<ItxContainerContainer>();
 		c1FirstContainers.add(itxc1c3);
 		c1FirstContainers.add(itxc1c2);
@@ -314,7 +315,7 @@ public HashMap<String, Long> makeTestStack() {
 		Set<ItxContainerContainer> c3SecondContainers = new HashSet<ItxContainerContainer>();
 		c3SecondContainers.add(itxc1c3);
 		c3SecondContainers.add(itxc2c3);
-		
+
 		Set<ItxSubjectContainer> s1Containers = new HashSet<ItxSubjectContainer>();
 		s1Containers.add(itxs1c3);
 		s1Containers.add(itxs1c2);
@@ -329,8 +330,8 @@ public HashMap<String, Long> makeTestStack() {
 		Set<ItxSubjectContainer> c3Subjects = new HashSet<ItxSubjectContainer>();
 		c3Subjects.add(itxs1c3);
 		c3Subjects.add(itxs2c3);
-		
-		//Then assign all the groups to their owners to create the mappings
+
+		// Then assign all the groups to their owners to create the mappings
 		e1.setAnalysisGroups(e1AnalysisGroups);
 		e2.setAnalysisGroups(e2AnalysisGroups);
 		e3.setAnalysisGroups(e3AnalysisGroups);
@@ -349,32 +350,32 @@ public HashMap<String, Long> makeTestStack() {
 		s1.setTreatmentGroups(s1TreatmentGroups);
 		s2.setTreatmentGroups(s2TreatmentGroups);
 		s3.setTreatmentGroups(s3TreatmentGroups);
-		
-		//Then assign interactions to their owners
+
+		// Then assign interactions to their owners
 		e1.setFirstExperiments(e1FirstExperiments);
 		e2.setFirstExperiments(e2FirstExperiments);
 		e2.setSecondExperiments(e2SecondExperiments);
 		e3.setSecondExperiments(e3SecondExperiments);
-		
+
 		protocol.setFirstProtocols(p1FirstProtocols);
 		protocol2.setSecondProtocols(p2SecondProtocols);
-		
+
 		c1.setFirstContainers(c1FirstContainers);
 		c2.setFirstContainers(c2FirstContainers);
 		c2.setSecondContainers(c2SecondContainers);
 		c3.setSecondContainers(c3SecondContainers);
-		
+
 		s1.setContainers(s1Containers);
 		s2.setContainers(s2Containers);
 		s3.setContainers(s3Containers);
 		c1.setSubjects(c1Subjects);
 		c2.setSubjects(c2Subjects);
 		c3.setSubjects(c3Subjects);
-		
-		//Then persist and flush everything to the database
+
+		// Then persist and flush everything to the database
 		e1.persist();
-		//all the other objects are taken care of by our CascadeType.PERSIST setting
-		
+		// all the other objects are taken care of by our CascadeType.PERSIST setting
+
 		HashMap<String, Long> idMap = new HashMap<String, Long>();
 		idMap.put("e1", e1.getId());
 		idMap.put("e2", e2.getId());
@@ -393,40 +394,44 @@ public HashMap<String, Long> makeTestStack() {
 		idMap.put("c1", c1.getId());
 		idMap.put("c2", c2.getId());
 		idMap.put("c3", c3.getId());
-		
+
 		return idMap;
 	}
-	
+
 	@Transactional
 	@Test
 	public void itxExperimentRemoveTest() {
 		HashMap<String, Long> idMap = makeTestStack();
 		Experiment e1 = Experiment.findExperiment(idMap.get("e1"));
 		Experiment e2 = Experiment.findExperiment(idMap.get("e2"));
-//		logger.debug("--------e2 first experiments:" + e2.getFirstExperiments().size());
-//		logger.debug("--------e2 second experiments:" + e2.getSecondExperiments().size());
-//		Experiment.removeExperimentItxAware(e1.getId());
+		// logger.debug("--------e2 first experiments:" +
+		// e2.getFirstExperiments().size());
+		// logger.debug("--------e2 second experiments:" +
+		// e2.getSecondExperiments().size());
+		// Experiment.removeExperimentItxAware(e1.getId());
 		e1.remove();
 		Experiment check = Experiment.findExperiment(idMap.get("e1"));
 		Assert.assertNull(check);
 	}
-	
+
 	@Test
 	@Transactional
 	public void runMakeTestStack() {
 		HashMap<String, Long> idMap = makeTestStack();
-//		Collection<Long> experimentIds = new HashSet<Long>();
-//		experimentIds.add(idMap.get("e1"));
-//		experimentIds.add(idMap.get("e2"));
-//		experimentIds.add(idMap.get("e3"));
-//		for (Long id: experimentIds) {
-//			Collection<Long> analysisGroups = Experiment.removeExperimentCascadeAware(id);
-//	        Collection<Long> treatmentGroups = AnalysisGroup.removeOrphans(analysisGroups);
-//	        Collection<Long> subjects = TreatmentGroup.removeOrphans(treatmentGroups);
-//	        Subject.removeOrphans(subjects);
-//		}
+		// Collection<Long> experimentIds = new HashSet<Long>();
+		// experimentIds.add(idMap.get("e1"));
+		// experimentIds.add(idMap.get("e2"));
+		// experimentIds.add(idMap.get("e3"));
+		// for (Long id: experimentIds) {
+		// Collection<Long> analysisGroups =
+		// Experiment.removeExperimentCascadeAware(id);
+		// Collection<Long> treatmentGroups =
+		// AnalysisGroup.removeOrphans(analysisGroups);
+		// Collection<Long> subjects = TreatmentGroup.removeOrphans(treatmentGroups);
+		// Subject.removeOrphans(subjects);
+		// }
 	}
-	
+
 	@Transactional
 	@Test
 	public void itxFullRemoveTest() {
@@ -448,7 +453,7 @@ public void itxFullRemoveTest() {
 		Container c1 = Container.findContainer(idMap.get("c1"));
 		Container c2 = Container.findContainer(idMap.get("c2"));
 		Container c3 = Container.findContainer(idMap.get("c3"));
-		
+
 		e1.remove();
 		e2.remove();
 		e3.remove();
@@ -466,7 +471,7 @@ public void itxFullRemoveTest() {
 		c1.remove();
 		c2.remove();
 		c3.remove();
-		
+
 		Experiment e1check = Experiment.findExperiment(idMap.get("e1"));
 		Experiment e2check = Experiment.findExperiment(idMap.get("e2"));
 		Experiment e3check = Experiment.findExperiment(idMap.get("e3"));
@@ -484,7 +489,7 @@ public void itxFullRemoveTest() {
 		Container c1check = Container.findContainer(idMap.get("c1"));
 		Container c2check = Container.findContainer(idMap.get("c2"));
 		Container c3check = Container.findContainer(idMap.get("c3"));
-		
+
 		Assert.assertNull(e1check);
 		Assert.assertNull(e2check);
 		Assert.assertNull(e3check);
@@ -503,6 +508,5 @@ public void itxFullRemoveTest() {
 		Assert.assertNull(c2check);
 		Assert.assertNull(c3check);
 	}
-	
-	
+
 }
diff --git a/src/test/java/com/labsynch/labseer/manytomany/SubjectTest.java b/src/test/java/com/labsynch/labseer/manytomany/SubjectTest.java
index 52df56dfa..e6048bc86 100644
--- a/src/test/java/com/labsynch/labseer/manytomany/SubjectTest.java
+++ b/src/test/java/com/labsynch/labseer/manytomany/SubjectTest.java
@@ -27,20 +27,21 @@
 import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 
 public class SubjectTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(SubjectTest.class);
 
 	@Autowired
 	private SubjectService subjectService;
-	
+
 	public HashMap<String, Long> makeTestStack() {
-		//each of these methods creates the full stack from protocol to subject.
+		// each of these methods creates the full stack from protocol to subject.
 		Date now = new Date();
-		//create 1 Protocol
+		// create 1 Protocol
 		Protocol protocol = new Protocol();
 		protocol.setRecordedBy("test user");
 		protocol.setRecordedDate(now);
@@ -48,50 +49,50 @@ public HashMap<String, Long> makeTestStack() {
 		protocol.setLsType("default");
 		protocol.setLsTransaction(98765L);
 		protocol.persist();
-		
-		//create 3 Experiments
+
+		// create 3 Experiments
 		Experiment e1 = new Experiment();
-        e1.setCodeName("T-EXPT-1111111");
-        Experiment e2 = new Experiment();
-        e2.setCodeName("T-EXPT-22222222");
-        Experiment e3 = new Experiment();
-        e3.setCodeName("T-EXPT-33333333");
-        Set<Experiment> allExperiments = new HashSet<Experiment>();
-        allExperiments.add(e1);
-        allExperiments.add(e2);
-        allExperiments.add(e3);
-        for (Experiment experiment: allExperiments) {
-        	experiment.setIgnored(false);
-        	experiment.setLsKind(protocol.getLsKind());
-        	experiment.setLsType(protocol.getLsType());
-        	experiment.setRecordedBy(protocol.getRecordedBy());
-        	experiment.setRecordedDate(protocol.getRecordedDate());
-            experiment.setLsTransaction(protocol.getLsTransaction());
-        	experiment.setProtocol(protocol);
-        }
-        
-		//create 3 AnalysisGroups
-        AnalysisGroup a1= new AnalysisGroup();
-        a1.setCodeName("T-AG-11111111");
-        AnalysisGroup a2= new AnalysisGroup();
-        a2.setCodeName("T-AG-22222222");
-        AnalysisGroup a3= new AnalysisGroup();
-        a3.setCodeName("T-AG-33333333");
-        Set<AnalysisGroup> allAnalysisGroups = new HashSet<AnalysisGroup>();
-        allAnalysisGroups.add(a1);
-        allAnalysisGroups.add(a2);
-        allAnalysisGroups.add(a3);
-        for (AnalysisGroup analysisGroup: allAnalysisGroups) {
-        	analysisGroup.setIgnored(e1.isIgnored());
-            analysisGroup.setLsKind(e1.getLsKind());
-            analysisGroup.setLsType(e1.getLsType());
-            analysisGroup.setRecordedBy(e1.getRecordedBy());
-            analysisGroup.setRecordedDate(e1.getRecordedDate());
-            analysisGroup.setLsTransaction(e1.getLsTransaction());
-        }
-        
-        //create 3 TreatmentGroups
-        TreatmentGroup t1 = new TreatmentGroup();
+		e1.setCodeName("T-EXPT-1111111");
+		Experiment e2 = new Experiment();
+		e2.setCodeName("T-EXPT-22222222");
+		Experiment e3 = new Experiment();
+		e3.setCodeName("T-EXPT-33333333");
+		Set<Experiment> allExperiments = new HashSet<Experiment>();
+		allExperiments.add(e1);
+		allExperiments.add(e2);
+		allExperiments.add(e3);
+		for (Experiment experiment : allExperiments) {
+			experiment.setIgnored(false);
+			experiment.setLsKind(protocol.getLsKind());
+			experiment.setLsType(protocol.getLsType());
+			experiment.setRecordedBy(protocol.getRecordedBy());
+			experiment.setRecordedDate(protocol.getRecordedDate());
+			experiment.setLsTransaction(protocol.getLsTransaction());
+			experiment.setProtocol(protocol);
+		}
+
+		// create 3 AnalysisGroups
+		AnalysisGroup a1 = new AnalysisGroup();
+		a1.setCodeName("T-AG-11111111");
+		AnalysisGroup a2 = new AnalysisGroup();
+		a2.setCodeName("T-AG-22222222");
+		AnalysisGroup a3 = new AnalysisGroup();
+		a3.setCodeName("T-AG-33333333");
+		Set<AnalysisGroup> allAnalysisGroups = new HashSet<AnalysisGroup>();
+		allAnalysisGroups.add(a1);
+		allAnalysisGroups.add(a2);
+		allAnalysisGroups.add(a3);
+		for (AnalysisGroup analysisGroup : allAnalysisGroups) {
+			analysisGroup.setIgnored(e1.isIgnored());
+			analysisGroup.setLsKind(e1.getLsKind());
+			analysisGroup.setLsType(e1.getLsType());
+			analysisGroup.setRecordedBy(e1.getRecordedBy());
+			analysisGroup.setRecordedDate(e1.getRecordedDate());
+			analysisGroup.setLsTransaction(e1.getLsTransaction());
+		}
+
+		// create 3 TreatmentGroups
+		TreatmentGroup t1 = new TreatmentGroup();
 		t1.setCodeName("T-TG-11111111");
 		TreatmentGroup t2 = new TreatmentGroup();
 		t2.setCodeName("T-TG-22222222");
@@ -101,16 +102,16 @@ public HashMap<String, Long> makeTestStack() {
 		allTreatmentGroups.add(t1);
 		allTreatmentGroups.add(t2);
 		allTreatmentGroups.add(t3);
-		for (TreatmentGroup treatmentGroup: allTreatmentGroups) {
+		for (TreatmentGroup treatmentGroup : allTreatmentGroups) {
 			treatmentGroup.setIgnored(a1.isIgnored());
 			treatmentGroup.setLsKind(a1.getLsKind());
 			treatmentGroup.setLsType(a1.getLsType());
 			treatmentGroup.setRecordedBy(a1.getRecordedBy());
-            treatmentGroup.setRecordedDate(a1.getRecordedDate());
+			treatmentGroup.setRecordedDate(a1.getRecordedDate());
 			treatmentGroup.setLsTransaction(a1.getLsTransaction());
 		}
-		
-		//create 3 Subjects
+
+		// create 3 Subjects
 		Subject s1 = new Subject();
 		s1.setCodeName("T-SUBJ-11111111");
 		Subject s2 = new Subject();
@@ -121,16 +122,16 @@ public HashMap<String, Long> makeTestStack() {
 		allSubjects.add(s1);
 		allSubjects.add(s2);
 		allSubjects.add(s3);
-		for (Subject subject: allSubjects) {
+		for (Subject subject : allSubjects) {
 			subject.setIgnored(t1.isIgnored());
 			subject.setLsKind(t1.getLsKind());
 			subject.setLsType(t1.getLsType());
 			subject.setRecordedBy(t1.getRecordedBy());
-            subject.setRecordedDate(t1.getRecordedDate());
+			subject.setRecordedDate(t1.getRecordedDate());
 			subject.setLsTransaction(t1.getLsTransaction());
 		}
-		
-		//Create the various Sets for mapping
+
+		// Create the various Sets for mapping
 		Set<AnalysisGroup> e1AnalysisGroups = new HashSet<AnalysisGroup>();
 		e1AnalysisGroups.add(a1);
 		e1AnalysisGroups.add(a3);
@@ -185,8 +186,8 @@ public HashMap<String, Long> makeTestStack() {
 		Set<TreatmentGroup> s3TreatmentGroups = new HashSet<TreatmentGroup>();
 		s3TreatmentGroups.add(t1);
 		s3TreatmentGroups.add(t3);
-		
-		//Then assign all the groups to their owners to create the mappings
+
+		// Then assign all the groups to their owners to create the mappings
 		e1.setAnalysisGroups(e1AnalysisGroups);
 		e2.setAnalysisGroups(e2AnalysisGroups);
 		e3.setAnalysisGroups(e3AnalysisGroups);
@@ -205,8 +206,8 @@ public HashMap<String, Long> makeTestStack() {
 		s1.setTreatmentGroups(s1TreatmentGroups);
 		s2.setTreatmentGroups(s2TreatmentGroups);
 		s3.setTreatmentGroups(s3TreatmentGroups);
-		
-		//Then persist and flush everything to the database
+
+		// Then persist and flush everything to the database
 		e1.persist();
 		e2.persist();
 		e3.persist();
@@ -219,7 +220,7 @@ public HashMap<String, Long> makeTestStack() {
 		s1.persist();
 		s2.persist();
 		s3.persist();
-		
+
 		HashMap<String, Long> idMap = new HashMap<String, Long>();
 		idMap.put("e1", e1.getId());
 		idMap.put("e2", e2.getId());
@@ -233,16 +234,15 @@ public HashMap<String, Long> makeTestStack() {
 		idMap.put("s1", s1.getId());
 		idMap.put("s2", s2.getId());
 		idMap.put("s3", s3.getId());
-		
+
 		return idMap;
-		
+
 	}
-	
-	
+
 	private Protocol makeTestingProtocol() {
-		//initialize some entries to fill in the fields
+		// initialize some entries to fill in the fields
 		Date now = new Date();
-		//create protocol
+		// create protocol
 		Protocol protocol = new Protocol();
 		protocol.setRecordedBy("test user");
 		protocol.setRecordedDate(now);
@@ -252,38 +252,38 @@ private Protocol makeTestingProtocol() {
 		protocol.persist();
 		return protocol;
 	}
-	
+
 	private Experiment makeTestingExperiment() {
 		Protocol protocol = makeTestingProtocol();
 		Experiment experiment = new Experiment();
-        experiment.setCodeName("EXPT-12345678");
-        experiment.setIgnored(false);
-        experiment.setLsKind(protocol.getLsKind());
-        experiment.setLsType(protocol.getLsType());
-        experiment.setRecordedBy(protocol.getRecordedBy());
-        experiment.setRecordedDate(protocol.getRecordedDate());
-        experiment.setLsTransaction(protocol.getLsTransaction());
-        experiment.setProtocol(protocol);
-        experiment.persist();
-        return experiment;
+		experiment.setCodeName("EXPT-12345678");
+		experiment.setIgnored(false);
+		experiment.setLsKind(protocol.getLsKind());
+		experiment.setLsType(protocol.getLsType());
+		experiment.setRecordedBy(protocol.getRecordedBy());
+		experiment.setRecordedDate(protocol.getRecordedDate());
+		experiment.setLsTransaction(protocol.getLsTransaction());
+		experiment.setProtocol(protocol);
+		experiment.persist();
+		return experiment;
 	}
-	
+
 	private AnalysisGroup makeTestingAnalysisGroup() {
 		Experiment experiment = makeTestingExperiment();
-		AnalysisGroup analysisgroup= new AnalysisGroup();
-        analysisgroup.setCodeName("AG-12345678");
-        analysisgroup.setIgnored(experiment.isIgnored());
-        analysisgroup.setLsKind(experiment.getLsKind());
-        analysisgroup.setLsType(experiment.getLsType());
-        analysisgroup.setRecordedBy(experiment.getRecordedBy());
-        analysisgroup.setLsTransaction(experiment.getLsTransaction());
-        Set<Experiment> experimentSet = new HashSet<Experiment>();
-        experimentSet.add(experiment);
-        analysisgroup.setExperiments(experimentSet);
-        analysisgroup.persist();
-        return analysisgroup;
+		AnalysisGroup analysisgroup = new AnalysisGroup();
+		analysisgroup.setCodeName("AG-12345678");
+		analysisgroup.setIgnored(experiment.isIgnored());
+		analysisgroup.setLsKind(experiment.getLsKind());
+		analysisgroup.setLsType(experiment.getLsType());
+		analysisgroup.setRecordedBy(experiment.getRecordedBy());
+		analysisgroup.setLsTransaction(experiment.getLsTransaction());
+		Set<Experiment> experimentSet = new HashSet<Experiment>();
+		experimentSet.add(experiment);
+		analysisgroup.setExperiments(experimentSet);
+		analysisgroup.persist();
+		return analysisgroup;
 	}
-	
+
 	private TreatmentGroup makeTestingTreatmentGroup() {
 		AnalysisGroup analysisgroup = makeTestingAnalysisGroup();
 		TreatmentGroup treatmentgroup = new TreatmentGroup();
@@ -299,7 +299,7 @@ private TreatmentGroup makeTestingTreatmentGroup() {
 		treatmentgroup.persist();
 		return treatmentgroup;
 	}
-	
+
 	private Subject makeTestingSubject() {
 		TreatmentGroup treatmentgroup = makeTestingTreatmentGroup();
 		Subject subject = new Subject();
@@ -315,9 +315,9 @@ private Subject makeTestingSubject() {
 		subject.persist();
 		return subject;
 	}
-	
+
 	@Transactional
-	//@Test
+	// @Test
 	public void updateTest() {
 	}
 
@@ -329,7 +329,7 @@ public void fromJsonToSampleTest() {
 		Subject check = Subject.fromJsonToSample(json);
 		Assert.assertEquals(subject.toJson(), check.toJson());
 	}
-	
+
 	@Transactional
 	@Test
 	public void toJsonArrayTest() {
@@ -342,7 +342,7 @@ public void toJsonArrayTest() {
 		String jsonArray = Subject.toJsonArray(subjectCollection);
 		Assert.assertNotNull(jsonArray);
 	}
-	
+
 	@Transactional
 	@Test
 	public void fromJsonToSubjectTest() {
@@ -371,10 +371,10 @@ public void fromJsonArrayToSubjectsStringTest() {
 	}
 
 	@Transactional
-	//@Test
+	// @Test
 	public void fromJsonArrayToSubjectsReaderTest() {
 	}
-	
+
 	@Transactional
 	@Test
 	public void findSubjectsByTreatmentGroupsManyTest() {
@@ -386,9 +386,9 @@ public void findSubjectsByTreatmentGroupsManyTest() {
 		Assert.assertEquals(checkList.size(), 1);
 		Assert.assertEquals(checkList.get(0).toJson(), Subject.findSubject(idMap.get("s1")).toJson());
 	}
-	
+
 	@Transactional
-	//@Test
+	// @Test
 	public void findSubjectsByTreatmentGroupsSingleTest() {
 		Subject subject = makeTestingSubject();
 		Set<TreatmentGroup> treatmentgroups = new HashSet<TreatmentGroup>();
@@ -396,7 +396,7 @@ public void findSubjectsByTreatmentGroupsSingleTest() {
 		Subject check = Subject.findSubjectsByTreatmentGroups(treatmentgroups).getSingleResult();
 		Assert.assertEquals(subject.toJson(), check.toJson());
 	}
-	
+
 	@Transactional
 	@Test
 	public void findSubjectsByLsTransactionEqualsManyTest() {
@@ -410,7 +410,7 @@ public void findSubjectsByLsTransactionEqualsManyTest() {
 		List<Subject> check = Subject.findSubjectsByLsTransactionEquals(lstransaction).getResultList();
 		Assert.assertEquals(3, check.size());
 	}
-	
+
 	@Transactional
 	@Test
 	public void findSubjectsByLsTransactionEqualsSingleTest() {
@@ -419,7 +419,7 @@ public void findSubjectsByLsTransactionEqualsSingleTest() {
 		Subject check = Subject.findSubjectsByLsTransactionEquals(lstransaction).getSingleResult();
 		Assert.assertEquals(subject.toJson(), check.toJson());
 	}
-	
+
 	@Transactional
 	@Test
 	public void findSubjectsByCodeNameEqualsTest() {
@@ -430,16 +430,18 @@ public void findSubjectsByCodeNameEqualsTest() {
 	}
 
 	@Transactional
-	//@Test
+	// @Test
 	public void deleteByExperimentIDTest() {
 		Subject subject = makeTestingSubject();
 		Long id = subject.getId();
-		Long experimentid = subject.getTreatmentGroups().iterator().next().getAnalysisGroups().iterator().next().getExperiments().iterator().next().getId();
+		Long experimentid = subject.getTreatmentGroups().iterator().next().getAnalysisGroups().iterator().next()
+				.getExperiments().iterator().next().getId();
 		Subject checkbefore = Subject.findSubject(id);
 		Assert.assertEquals(subject.toJson(), checkbefore.toJson());
 		Subject.deleteByExperimentID(experimentid);
 		Subject checkafter = Subject.findSubject(id);
-		Assert.assertEquals(true,checkafter == null);;
+		Assert.assertEquals(true, checkafter == null);
+		;
 	}
 
 }
diff --git a/src/test/java/com/labsynch/labseer/manytomany/TreatmentGroupTest.java b/src/test/java/com/labsynch/labseer/manytomany/TreatmentGroupTest.java
index 721a9e50f..45458eb4e 100755
--- a/src/test/java/com/labsynch/labseer/manytomany/TreatmentGroupTest.java
+++ b/src/test/java/com/labsynch/labseer/manytomany/TreatmentGroupTest.java
@@ -26,20 +26,20 @@
 import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class TreatmentGroupTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(TreatmentGroupTest.class);
 
 	@Autowired
 	private TreatmentGroupService treatmentGroupService;
-	
-	
+
 	private Protocol makeTestingProtocol() {
-		//initialize some entries to fill in the fields
+		// initialize some entries to fill in the fields
 		Date now = new Date();
-		//create protocol
+		// create protocol
 		Protocol protocol = new Protocol();
 		protocol.setRecordedBy("test user");
 		protocol.setRecordedDate(now);
@@ -49,38 +49,38 @@ private Protocol makeTestingProtocol() {
 		protocol.persist();
 		return protocol;
 	}
-	
+
 	private Experiment makeTestingExperiment() {
 		Protocol protocol = makeTestingProtocol();
 		Experiment experiment = new Experiment();
-        experiment.setCodeName("EXPT-12345678");
-        experiment.setIgnored(false);
-        experiment.setLsKind(protocol.getLsKind());
-        experiment.setLsType(protocol.getLsType());
-        experiment.setRecordedBy(protocol.getRecordedBy());
-        experiment.setRecordedDate(protocol.getRecordedDate());
-        experiment.setLsTransaction(protocol.getLsTransaction());
-        experiment.setProtocol(protocol);
-        experiment.persist();
-        return experiment;
+		experiment.setCodeName("EXPT-12345678");
+		experiment.setIgnored(false);
+		experiment.setLsKind(protocol.getLsKind());
+		experiment.setLsType(protocol.getLsType());
+		experiment.setRecordedBy(protocol.getRecordedBy());
+		experiment.setRecordedDate(protocol.getRecordedDate());
+		experiment.setLsTransaction(protocol.getLsTransaction());
+		experiment.setProtocol(protocol);
+		experiment.persist();
+		return experiment;
 	}
-	
+
 	private AnalysisGroup makeTestingAnalysisGroup() {
 		Experiment experiment = makeTestingExperiment();
-		AnalysisGroup analysisgroup= new AnalysisGroup();
-        analysisgroup.setCodeName("AG-12345678");
-        analysisgroup.setIgnored(experiment.isIgnored());
-        analysisgroup.setLsKind(experiment.getLsKind());
-        analysisgroup.setLsType(experiment.getLsType());
-        analysisgroup.setRecordedBy(experiment.getRecordedBy());
-        analysisgroup.setLsTransaction(experiment.getLsTransaction());
-        Set<Experiment> experimentSet = new HashSet<Experiment>();
-        experimentSet.add(experiment);
-        analysisgroup.setExperiments(experimentSet);
-        analysisgroup.persist();
-        return analysisgroup;
+		AnalysisGroup analysisgroup = new AnalysisGroup();
+		analysisgroup.setCodeName("AG-12345678");
+		analysisgroup.setIgnored(experiment.isIgnored());
+		analysisgroup.setLsKind(experiment.getLsKind());
+		analysisgroup.setLsType(experiment.getLsType());
+		analysisgroup.setRecordedBy(experiment.getRecordedBy());
+		analysisgroup.setLsTransaction(experiment.getLsTransaction());
+		Set<Experiment> experimentSet = new HashSet<Experiment>();
+		experimentSet.add(experiment);
+		analysisgroup.setExperiments(experimentSet);
+		analysisgroup.persist();
+		return analysisgroup;
 	}
-	
+
 	private TreatmentGroup makeTestingTreatmentGroup() {
 		AnalysisGroup analysisgroup = makeTestingAnalysisGroup();
 		TreatmentGroup treatmentgroup = new TreatmentGroup();
@@ -96,11 +96,11 @@ private TreatmentGroup makeTestingTreatmentGroup() {
 		treatmentgroup.persist();
 		return treatmentgroup;
 	}
-	
+
 	public HashMap<String, Long> makeTestStack() {
-		//each of these methods creates the full stack from protocol to subject.
+		// each of these methods creates the full stack from protocol to subject.
 		Date now = new Date();
-		//create 1 Protocol
+		// create 1 Protocol
 		Protocol protocol = new Protocol();
 		protocol.setRecordedBy("test user");
 		protocol.setRecordedDate(now);
@@ -108,50 +108,50 @@ public HashMap<String, Long> makeTestStack() {
 		protocol.setLsType("default");
 		protocol.setLsTransaction(98765L);
 		protocol.persist();
-		
-		//create 3 Experiments
+
+		// create 3 Experiments
 		Experiment e1 = new Experiment();
-        e1.setCodeName("T-EXPT-1111111");
-        Experiment e2 = new Experiment();
-        e2.setCodeName("T-EXPT-22222222");
-        Experiment e3 = new Experiment();
-        e3.setCodeName("T-EXPT-33333333");
-        Set<Experiment> allExperiments = new HashSet<Experiment>();
-        allExperiments.add(e1);
-        allExperiments.add(e2);
-        allExperiments.add(e3);
-        for (Experiment experiment: allExperiments) {
-        	experiment.setIgnored(false);
-        	experiment.setLsKind(protocol.getLsKind());
-        	experiment.setLsType(protocol.getLsType());
-        	experiment.setRecordedBy(protocol.getRecordedBy());
-        	experiment.setRecordedDate(protocol.getRecordedDate());
-            experiment.setLsTransaction(protocol.getLsTransaction());
-        	experiment.setProtocol(protocol);
-        }
-        
-		//create 3 AnalysisGroups
-        AnalysisGroup a1= new AnalysisGroup();
-        a1.setCodeName("T-AG-11111111");
-        AnalysisGroup a2= new AnalysisGroup();
-        a2.setCodeName("T-AG-22222222");
-        AnalysisGroup a3= new AnalysisGroup();
-        a3.setCodeName("T-AG-33333333");
-        Set<AnalysisGroup> allAnalysisGroups = new HashSet<AnalysisGroup>();
-        allAnalysisGroups.add(a1);
-        allAnalysisGroups.add(a2);
-        allAnalysisGroups.add(a3);
-        for (AnalysisGroup analysisGroup: allAnalysisGroups) {
-        	analysisGroup.setIgnored(e1.isIgnored());
-            analysisGroup.setLsKind(e1.getLsKind());
-            analysisGroup.setLsType(e1.getLsType());
-            analysisGroup.setRecordedBy(e1.getRecordedBy());
-            analysisGroup.setRecordedDate(e1.getRecordedDate());
-            analysisGroup.setLsTransaction(e1.getLsTransaction());
-        }
-        
-        //create 3 TreatmentGroups
-        TreatmentGroup t1 = new TreatmentGroup();
+		e1.setCodeName("T-EXPT-1111111");
+		Experiment e2 = new Experiment();
+		e2.setCodeName("T-EXPT-22222222");
+		Experiment e3 = new Experiment();
+		e3.setCodeName("T-EXPT-33333333");
+		Set<Experiment> allExperiments = new HashSet<Experiment>();
+		allExperiments.add(e1);
+		allExperiments.add(e2);
+		allExperiments.add(e3);
+		for (Experiment experiment : allExperiments) {
+			experiment.setIgnored(false);
+			experiment.setLsKind(protocol.getLsKind());
+			experiment.setLsType(protocol.getLsType());
+			experiment.setRecordedBy(protocol.getRecordedBy());
+			experiment.setRecordedDate(protocol.getRecordedDate());
+			experiment.setLsTransaction(protocol.getLsTransaction());
+			experiment.setProtocol(protocol);
+		}
+
+		// create 3 AnalysisGroups
+		AnalysisGroup a1 = new AnalysisGroup();
+		a1.setCodeName("T-AG-11111111");
+		AnalysisGroup a2 = new AnalysisGroup();
+		a2.setCodeName("T-AG-22222222");
+		AnalysisGroup a3 = new AnalysisGroup();
+		a3.setCodeName("T-AG-33333333");
+		Set<AnalysisGroup> allAnalysisGroups = new HashSet<AnalysisGroup>();
+		allAnalysisGroups.add(a1);
+		allAnalysisGroups.add(a2);
+		allAnalysisGroups.add(a3);
+		for (AnalysisGroup analysisGroup : allAnalysisGroups) {
+			analysisGroup.setIgnored(e1.isIgnored());
+			analysisGroup.setLsKind(e1.getLsKind());
+			analysisGroup.setLsType(e1.getLsType());
+			analysisGroup.setRecordedBy(e1.getRecordedBy());
+			analysisGroup.setRecordedDate(e1.getRecordedDate());
+			analysisGroup.setLsTransaction(e1.getLsTransaction());
+		}
+
+		// create 3 TreatmentGroups
+		TreatmentGroup t1 = new TreatmentGroup();
 		t1.setCodeName("T-TG-11111111");
 		TreatmentGroup t2 = new TreatmentGroup();
 		t2.setCodeName("T-TG-22222222");
@@ -161,16 +161,16 @@ public HashMap<String, Long> makeTestStack() {
 		allTreatmentGroups.add(t1);
 		allTreatmentGroups.add(t2);
 		allTreatmentGroups.add(t3);
-		for (TreatmentGroup treatmentGroup: allTreatmentGroups) {
+		for (TreatmentGroup treatmentGroup : allTreatmentGroups) {
 			treatmentGroup.setIgnored(a1.isIgnored());
 			treatmentGroup.setLsKind(a1.getLsKind());
 			treatmentGroup.setLsType(a1.getLsType());
 			treatmentGroup.setRecordedBy(a1.getRecordedBy());
-            treatmentGroup.setRecordedDate(a1.getRecordedDate());
+			treatmentGroup.setRecordedDate(a1.getRecordedDate());
 			treatmentGroup.setLsTransaction(a1.getLsTransaction());
 		}
-		
-		//create 3 Subjects
+
+		// create 3 Subjects
 		Subject s1 = new Subject();
 		s1.setCodeName("T-SUBJ-11111111");
 		Subject s2 = new Subject();
@@ -181,16 +181,16 @@ public HashMap<String, Long> makeTestStack() {
 		allSubjects.add(s1);
 		allSubjects.add(s2);
 		allSubjects.add(s3);
-		for (Subject subject: allSubjects) {
+		for (Subject subject : allSubjects) {
 			subject.setIgnored(t1.isIgnored());
 			subject.setLsKind(t1.getLsKind());
 			subject.setLsType(t1.getLsType());
 			subject.setRecordedBy(t1.getRecordedBy());
-            subject.setRecordedDate(t1.getRecordedDate());
+			subject.setRecordedDate(t1.getRecordedDate());
 			subject.setLsTransaction(t1.getLsTransaction());
 		}
-		
-		//Create the various Sets for mapping
+
+		// Create the various Sets for mapping
 		Set<AnalysisGroup> e1AnalysisGroups = new HashSet<AnalysisGroup>();
 		e1AnalysisGroups.add(a1);
 		e1AnalysisGroups.add(a3);
@@ -245,8 +245,8 @@ public HashMap<String, Long> makeTestStack() {
 		Set<TreatmentGroup> s3TreatmentGroups = new HashSet<TreatmentGroup>();
 		s3TreatmentGroups.add(t1);
 		s3TreatmentGroups.add(t3);
-		
-		//Then assign all the groups to their owners to create the mappings
+
+		// Then assign all the groups to their owners to create the mappings
 		e1.setAnalysisGroups(e1AnalysisGroups);
 		e2.setAnalysisGroups(e2AnalysisGroups);
 		e3.setAnalysisGroups(e3AnalysisGroups);
@@ -265,8 +265,8 @@ public HashMap<String, Long> makeTestStack() {
 		s1.setTreatmentGroups(s1TreatmentGroups);
 		s2.setTreatmentGroups(s2TreatmentGroups);
 		s3.setTreatmentGroups(s3TreatmentGroups);
-		
-		//Then persist and flush everything to the database
+
+		// Then persist and flush everything to the database
 		e1.persist();
 		e2.persist();
 		e3.persist();
@@ -279,7 +279,7 @@ public HashMap<String, Long> makeTestStack() {
 		s1.persist();
 		s2.persist();
 		s3.persist();
-		
+
 		HashMap<String, Long> idMap = new HashMap<String, Long>();
 		idMap.put("e1", e1.getId());
 		idMap.put("e2", e2.getId());
@@ -293,12 +293,11 @@ public HashMap<String, Long> makeTestStack() {
 		idMap.put("s1", s1.getId());
 		idMap.put("s2", s2.getId());
 		idMap.put("s3", s3.getId());
-		
+
 		return idMap;
-		
+
 	}
-	
-	
+
 	@Transactional
 	@Test
 	public void findTreatmentGroupsByAnalysisGroupsTest() {
@@ -306,17 +305,19 @@ public void findTreatmentGroupsByAnalysisGroupsTest() {
 		Set<AnalysisGroup> analysisGroups = new HashSet<AnalysisGroup>();
 		analysisGroups.add(AnalysisGroup.findAnalysisGroup(idMap.get("a2")));
 		analysisGroups.add(AnalysisGroup.findAnalysisGroup(idMap.get("a1")));
-		List<TreatmentGroup> checkList = TreatmentGroup.findTreatmentGroupsByAnalysisGroups(analysisGroups).getResultList();
+		List<TreatmentGroup> checkList = TreatmentGroup.findTreatmentGroupsByAnalysisGroups(analysisGroups)
+				.getResultList();
 		Assert.assertEquals(checkList.size(), 1);
 		Assert.assertEquals(checkList.get(0).toJson(), TreatmentGroup.findTreatmentGroup(idMap.get("t1")).toJson());
-		
-//		TreatmentGroup treatmentgroup = makeTestingTreatmentGroup();
-//		Set<AnalysisGroup> analysisgroups = new HashSet<AnalysisGroup>();
-//		analysisgroups = treatmentgroup.getAnalysisGroups();
-//		TreatmentGroup check = TreatmentGroup.findTreatmentGroupsByAnalysisGroups(analysisgroups).getSingleResult();
-//		assert(treatmentgroup.toJson() == check.toJson());
+
+		// TreatmentGroup treatmentgroup = makeTestingTreatmentGroup();
+		// Set<AnalysisGroup> analysisgroups = new HashSet<AnalysisGroup>();
+		// analysisgroups = treatmentgroup.getAnalysisGroups();
+		// TreatmentGroup check =
+		// TreatmentGroup.findTreatmentGroupsByAnalysisGroups(analysisgroups).getSingleResult();
+		// assert(treatmentgroup.toJson() == check.toJson());
 	}
-	
+
 	@Transactional
 	@Test
 	public void findTreatmentGroupsByLsTransactionEqualsTest() {
@@ -327,84 +328,84 @@ public void findTreatmentGroupsByLsTransactionEqualsTest() {
 		expected.add(TreatmentGroup.findTreatmentGroup(idMap.get("t1")));
 		expected.add(TreatmentGroup.findTreatmentGroup(idMap.get("t2")));
 		expected.add(TreatmentGroup.findTreatmentGroup(idMap.get("t3")));
-		List<TreatmentGroup> check = TreatmentGroup.findTreatmentGroupsByLsTransactionEquals(lstransaction).getResultList();
+		List<TreatmentGroup> check = TreatmentGroup.findTreatmentGroupsByLsTransactionEquals(lstransaction)
+				.getResultList();
 		Assert.assertEquals(3, check.size());
 	}
-	
+
 	@Transactional
-	//@Test
+	// @Test
 	public void deleteByExperimentIdTest() {
 		TreatmentGroup treatmentgroup = makeTestingTreatmentGroup();
 		Long id = treatmentgroup.getId();
-		Long experimentid = treatmentgroup.getAnalysisGroups().iterator().next().getExperiments().iterator().next().getId();
+		Long experimentid = treatmentgroup.getAnalysisGroups().iterator().next().getExperiments().iterator().next()
+				.getId();
 		TreatmentGroup checkbefore = TreatmentGroup.findTreatmentGroup(id);
 		Assert.assertEquals(checkbefore.toJson(), treatmentgroup.toJson());
 		TreatmentGroup.deleteByExperimentID(experimentid);
 		TreatmentGroup checkafter = TreatmentGroup.findTreatmentGroup(id);
 		Assert.assertEquals(true, checkafter == null);
 	}
-	
+
 	@Transactional
-	//@Test
+	// @Test
 	public void Treatment_Group_Many_To_Many_Test() {
 		TreatmentGroup treatmentGroup = TreatmentGroup.findTreatmentGroup(16L);
 		logger.debug(treatmentGroup.toJson());
-		
+
 		int theSize = treatmentGroup.getSubjects().size();
 		logger.debug(String.valueOf(theSize));
-		
+
 		Assert.assertEquals(4, theSize);
 	}
-	
+
 	@Transactional
-	//@Test
+	// @Test
 	public void SimpleTest2() {
 
 		TreatmentGroup treatmentGroup = new TreatmentGroup();
-		
+
 		treatmentGroup.getAnalysisGroups().add(new AnalysisGroup());
-		
+
 		logger.debug(treatmentGroup.toJson());
-		
-		
+
 	}
-	
+
 	@Transactional
-	//@Test
+	// @Test
 	public void SimpleTest3() {
 
 		TreatmentGroup treatmentGroup = new TreatmentGroup();
 		Set<AnalysisGroup> analysisGroups = new HashSet<AnalysisGroup>();
 		analysisGroups.add(new AnalysisGroup());
 		treatmentGroup.setAnalysisGroups(analysisGroups);
-		
+
 		logger.debug(treatmentGroup.toJson());
-		
-		
+
 	}
-	
+
 	@Transactional
-	//@Test
+	// @Test
 	public void SimpleTest4() {
 
 		String json = "{\"analysisGroups\":[{\"id\":290,\"version\":0}],\"lsType\":\"default\",\"lsKind\":\"default\",\"codeName\":\"TG-00000035\",\"subjects\":null,\"lsStates\":null,\"recordedBy\":\"dfenger\",\"comments\":\"\",\"lsTransaction\":20,\"ignored\":false,\"recordedDate\":1403543647000}";
 		TreatmentGroup inputTreatmentGroup = TreatmentGroup.fromJsonToTreatmentGroup(json);
 		Date recordedDate = null;
-		if (inputTreatmentGroup.getRecordedDate() != null){
+		if (inputTreatmentGroup.getRecordedDate() != null) {
 			recordedDate = inputTreatmentGroup.getRecordedDate();
 		} else {
 			recordedDate = new Date();
 		}
-		TreatmentGroup treatmentGroup = treatmentGroupService.saveLsTreatmentGroup(inputTreatmentGroup.getAnalysisGroups(), inputTreatmentGroup, recordedDate);
+		TreatmentGroup treatmentGroup = treatmentGroupService
+				.saveLsTreatmentGroup(inputTreatmentGroup.getAnalysisGroups(), inputTreatmentGroup, recordedDate);
 		logger.debug(treatmentGroup.toJson());
 	}
-	
+
 	@Transactional
 	@Test
 	public void updateTest() {
 		TreatmentGroup treatmentgroup = new TreatmentGroup();
-		
+
 	}
-	
 
 }
diff --git a/src/test/java/com/labsynch/labseer/service/AnalysisGroupServiceTests.java b/src/test/java/com/labsynch/labseer/service/AnalysisGroupServiceTests.java
index b8a97acb1..29da3c2ca 100755
--- a/src/test/java/com/labsynch/labseer/service/AnalysisGroupServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/AnalysisGroupServiceTests.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import java.io.BufferedReader;
@@ -30,53 +29,537 @@
 
 import junit.framework.Assert;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class AnalysisGroupServiceTests {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(AnalysisGroupServiceTests.class);
-	
-	
+
 	@Autowired
 	private AnalysisGroupService analysisGroupService;
 
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
-	
-	//@Test
+
+	// @Test
 	@Transactional
-	public void CreateAnalysisGroupsFromNestedJson() throws NotFoundException{
-		//String json = "{\"codeName\": \"AG-00000014\",\"experiment\": {\"analysisGroups\": [],\"codeName\": \"EXPT-000007\",\"experimentStates\": [],\"id\": 37,\"ignored\": false,\"lsTransaction\": {\"comments\": \"experiment 102 transactions\",\"id\": 22,\"recordedDate\": 1.3541e+12,\"version\":0 },\"modifiedBy\": null,\"modifiedDate\": null,\"protocol\": {\"codeName\": \"PROT-000006\",\"id\": 34,\"ignored\": false,\"lsTransaction\": {\"comments\": \"protocol 201 transactions\",\"id\": 19,\"recordedDate\": 1.3541e+12,\"version\":0 },\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"userName\",\"recordedDate\": 1.3541e+12,\"shortDescription\": \"protocol short description goes here\",\"version\":0 },\"recordedBy\": \"userName\",\"recordedDate\": null,\"shortDescription\": \"experiment short description\",\"version\":0 },\"recordedBy\": \"smeyer\",\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 },\"treatmentGroups\": [{\"codeName\": \"TG-000010\",\"subjects\": [{\"codeName\": \"SUBJ-000011\",\"subjectStates\": [{\"subjectValues\": [{\"valueType\": \"numericValue\",\"valueKind\": \"maximum\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": 226,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": \"counts\",\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 } },{\"valueType\": \"numericValue\",\"valueKind\": \"minimum\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": 173,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": \"counts\",\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 } },{\"valueType\": \"numericValue\",\"valueKind\": \"transformed\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": 0.30636,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": \"Eff\",\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 } },{\"valueType\": \"numericValue\",\"valueKind\": \"normalized\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": -0.0099332,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": \"Eff\",\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 } } ],\"recordedBy\": \"smeyer\",\"stateType\": \"data\",\"stateKind\": \"maxMinData\",\"comments\": \"\",\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 },\"ignored\": false,\"recordedDate\": 1.3541e+12 },{\"subjectValues\": [{\"valueType\": \"stringValue\",\"valueKind\": \"well\",\"stringValue\": \"A01\",\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 } },{\"valueType\": \"stringValue\",\"valueKind\": \"barcode\",\"stringValue\": \"FD-384-00399-C\",\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 } },{\"valueType\": \"batchCode\",\"valueKind\": \"NC\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": \"CMPD000001\",\"recordedDate\": 1.3541e+12,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 } },{\"valueType\": \"stringValue\",\"valueKind\": \"efficacyThreshold\",\"stringValue\": \"false\",\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 } } ],\"recordedBy\": \"smeyer\",\"stateType\": \"metadata\",\"stateKind\": \"assay plate info\",\"comments\": \"\",\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 },\"ignored\": false,\"recordedDate\": 1.3541e+12 } ],\"recordedBy\": \"smeyer\",\"comments\": \"\",\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 },\"ignored\": false,\"recordedDate\": 1.3541e+12 } ],\"treatmentGroupStates\": [{\"treatmentGroupValues\": [{\"valueType\": \"numericValue\",\"valueKind\": \"average\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": -0.0099332,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 } },{\"valueType\": \"numericValue\",\"valueKind\": \"standard deviation\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 } } ],\"recordedBy\": \"smeyer\",\"stateType\": \"data\",\"stateKind\": \"aggregated subject data\",\"comments\": \"\",\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 },\"ignored\": false,\"recordedDate\": 1.3541e+12 } ],\"recordedBy\": \"smeyer\",\"comments\": \"no comments\",\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 },\"ignored\": false,\"recordedDate\": 1.3541e+12 } ],\"analysisGroupStates\": null }cat(toJSON(exampleAnalysisGroup,digit=15)){\"codeName\": \"AG-00000014\",\"experiment\": {\"analysisGroups\": [],\"codeName\": \"EXPT-000007\",\"experimentStates\": [],\"id\": 36,\"ignored\": false,\"lsTransaction\": {\"comments\": \"experiment 102 transactions\",\"id\": 22,\"recordedDate\":1354065956000,\"version\":0 },\"modifiedBy\": null,\"modifiedDate\": null,\"protocol\": {\"codeName\": \"PROT-000006\",\"id\": 34,\"ignored\": false,\"lsTransaction\": {\"comments\": \"protocol 201 transactions\",\"id\": 19,\"recordedDate\":1354064630000,\"version\":0 },\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"userName\",\"recordedDate\":1354064630000,\"shortDescription\": \"protocol short description goes here\",\"version\":0 },\"recordedBy\": \"userName\",\"recordedDate\": null,\"shortDescription\": \"experiment short description\",\"version\":0 },\"recordedBy\": \"smeyer\",\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 },\"treatmentGroups\": [{\"codeName\": \"TG-000010\",\"subjects\": [{\"codeName\": \"SUBJ-000011\",\"subjectStates\": [{\"subjectValues\": [{\"valueType\": \"numericValue\",\"valueKind\": \"maximum\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": 226,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": \"counts\",\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\":1354066044000,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 } },{\"valueType\": \"numericValue\",\"valueKind\": \"minimum\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": 173,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": \"counts\",\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\":1354066044000,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 } },{\"valueType\": \"numericValue\",\"valueKind\": \"transformed\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": 0.30635838150289,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": \"Eff\",\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\":1354066044000,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 } },{\"valueType\": \"numericValue\",\"valueKind\": \"normalized\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": -0.00993319001154032,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": \"Eff\",\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\":1354066044000,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 } } ],\"recordedBy\": \"smeyer\",\"stateType\": \"data\",\"stateKind\": \"maxMinData\",\"comments\": \"\",\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 },\"ignored\": false,\"recordedDate\":1354066044000 },{\"subjectValues\": [{\"valueType\": \"stringValue\",\"valueKind\": \"well\",\"stringValue\": \"A01\",\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\":1354066044000,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 } },{\"valueType\": \"stringValue\",\"valueKind\": \"barcode\",\"stringValue\": \"FD-384-00399-C\",\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\":1354066044000,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 } },{\"valueType\": \"batchCode\",\"valueKind\": \"NC\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": \"CMPD000001\",\"recordedDate\":1354066044000,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 } },{\"valueType\": \"stringValue\",\"valueKind\": \"efficacyThreshold\",\"stringValue\": false,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\":1354066044000,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 } } ],\"recordedBy\": \"smeyer\",\"stateType\": \"metadata\",\"stateKind\": \"assay plate info\",\"comments\": \"\",\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 },\"ignored\": false,\"recordedDate\":1354066044000 } ],\"recordedBy\": \"smeyer\",\"comments\": \"\",\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 },\"ignored\": false,\"recordedDate\":1354066044000 } ],\"treatmentGroupStates\": [{\"treatmentGroupValues\": [{\"valueType\": \"numericValue\",\"valueKind\": \"average\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": -0.00993319001154032,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\":1354066044000,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 } },{\"valueType\": \"numericValue\",\"valueKind\": \"standard deviation\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\":1354066044000,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 } } ],\"recordedBy\": \"smeyer\",\"stateType\": \"data\",\"stateKind\": \"aggregated subject data\",\"comments\": \"\",\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 },\"ignored\": false,\"recordedDate\":1354066044000 } ],\"recordedBy\": \"smeyer\",\"comments\": \"no comments\",\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 },\"ignored\": false,\"recordedDate\":1354066044000 } ],\"analysisGroupStates\": null }";
+	public void CreateAnalysisGroupsFromNestedJson() throws NotFoundException {
+		// String json = "{\"codeName\": \"AG-00000014\",\"experiment\":
+		// {\"analysisGroups\": [],\"codeName\": \"EXPT-000007\",\"experimentStates\":
+		// [],\"id\": 37,\"ignored\": false,\"lsTransaction\": {\"comments\":
+		// \"experiment 102 transactions\",\"id\": 22,\"recordedDate\":
+		// 1.3541e+12,\"version\":0 },\"modifiedBy\": null,\"modifiedDate\":
+		// null,\"protocol\": {\"codeName\": \"PROT-000006\",\"id\": 34,\"ignored\":
+		// false,\"lsTransaction\": {\"comments\": \"protocol 201 transactions\",\"id\":
+		// 19,\"recordedDate\": 1.3541e+12,\"version\":0 },\"modifiedBy\":
+		// null,\"modifiedDate\": null,\"recordedBy\": \"userName\",\"recordedDate\":
+		// 1.3541e+12,\"shortDescription\": \"protocol short description goes
+		// here\",\"version\":0 },\"recordedBy\": \"userName\",\"recordedDate\":
+		// null,\"shortDescription\": \"experiment short description\",\"version\":0
+		// },\"recordedBy\": \"smeyer\",\"lsTransaction\": {\"comments\":
+		// \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0
+		// },\"treatmentGroups\": [{\"codeName\": \"TG-000010\",\"subjects\":
+		// [{\"codeName\": \"SUBJ-000011\",\"subjectStates\": [{\"subjectValues\":
+		// [{\"valueType\": \"numericValue\",\"valueKind\": \"maximum\",\"stringValue\":
+		// null,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": 226,\"sigFigs\": null,\"uncertainty\":
+		// null,\"valueUnit\": \"counts\",\"concValue\": null,\"concUnit\":
+		// \"\",\"comments\": null,\"ignored\": false,\"publicData\":
+		// true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":
+		// 1.3541e+12,\"version\":0 } },{\"valueType\": \"numericValue\",\"valueKind\":
+		// \"minimum\",\"stringValue\": null,\"fileValue\": null,\"urlValue\":
+		// null,\"dateValue\": null,\"clobValue\": null,\"blobValue\":
+		// null,\"valueOperator\": null,\"numericValue\": 173,\"sigFigs\":
+		// null,\"uncertainty\": null,\"valueUnit\": \"counts\",\"concValue\":
+		// null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\":
+		// true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":
+		// 1.3541e+12,\"version\":0 } },{\"valueType\": \"numericValue\",\"valueKind\":
+		// \"transformed\",\"stringValue\": null,\"fileValue\": null,\"urlValue\":
+		// null,\"dateValue\": null,\"clobValue\": null,\"blobValue\":
+		// null,\"valueOperator\": null,\"numericValue\": 0.30636,\"sigFigs\":
+		// null,\"uncertainty\": null,\"valueUnit\": \"Eff\",\"concValue\":
+		// null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\":
+		// true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":
+		// 1.3541e+12,\"version\":0 } },{\"valueType\": \"numericValue\",\"valueKind\":
+		// \"normalized\",\"stringValue\": null,\"fileValue\": null,\"urlValue\":
+		// null,\"dateValue\": null,\"clobValue\": null,\"blobValue\":
+		// null,\"valueOperator\": null,\"numericValue\": -0.0099332,\"sigFigs\":
+		// null,\"uncertainty\": null,\"valueUnit\": \"Eff\",\"concValue\":
+		// null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\":
+		// true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":
+		// 1.3541e+12,\"version\":0 } } ],\"recordedBy\": \"smeyer\",\"stateType\":
+		// \"data\",\"stateKind\": \"maxMinData\",\"comments\": \"\",\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":
+		// 1.3541e+12,\"version\":0 },\"ignored\": false,\"recordedDate\": 1.3541e+12
+		// },{\"subjectValues\": [{\"valueType\": \"stringValue\",\"valueKind\":
+		// \"well\",\"stringValue\": \"A01\",\"fileValue\": null,\"urlValue\":
+		// null,\"dateValue\": null,\"clobValue\": null,\"blobValue\":
+		// null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\":
+		// null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\":
+		// null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\":
+		// true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":
+		// 1.3541e+12,\"version\":0 } },{\"valueType\": \"stringValue\",\"valueKind\":
+		// \"barcode\",\"stringValue\": \"FD-384-00399-C\",\"fileValue\":
+		// null,\"urlValue\": null,\"dateValue\": null,\"clobValue\":
+		// null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\":
+		// null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\":
+		// null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\":
+		// false,\"publicData\": true,\"batchCode\": null,\"recordedDate\":
+		// 1.3541e+12,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\":
+		// 23,\"recordedDate\": 1.3541e+12,\"version\":0 } },{\"valueType\":
+		// \"batchCode\",\"valueKind\": \"NC\",\"stringValue\": null,\"fileValue\":
+		// null,\"urlValue\": null,\"dateValue\": null,\"clobValue\":
+		// null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\":
+		// null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\":
+		// null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\":
+		// false,\"publicData\": true,\"batchCode\": \"CMPD000001\",\"recordedDate\":
+		// 1.3541e+12,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\":
+		// 23,\"recordedDate\": 1.3541e+12,\"version\":0 } },{\"valueType\":
+		// \"stringValue\",\"valueKind\": \"efficacyThreshold\",\"stringValue\":
+		// \"false\",\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\":
+		// null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\":
+		// null,\"ignored\": false,\"publicData\": true,\"batchCode\":
+		// null,\"recordedDate\": 1.3541e+12,\"lsTransaction\": {\"comments\":
+		// \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 } }
+		// ],\"recordedBy\": \"smeyer\",\"stateType\": \"metadata\",\"stateKind\":
+		// \"assay plate info\",\"comments\": \"\",\"lsTransaction\": {\"comments\":
+		// \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0
+		// },\"ignored\": false,\"recordedDate\": 1.3541e+12 } ],\"recordedBy\":
+		// \"smeyer\",\"comments\": \"\",\"lsTransaction\": {\"comments\":
+		// \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0
+		// },\"ignored\": false,\"recordedDate\": 1.3541e+12 }
+		// ],\"treatmentGroupStates\": [{\"treatmentGroupValues\": [{\"valueType\":
+		// \"numericValue\",\"valueKind\": \"average\",\"stringValue\":
+		// null,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": -0.0099332,\"sigFigs\": null,\"uncertainty\":
+		// null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\":
+		// null,\"ignored\": false,\"publicData\": true,\"batchCode\":
+		// null,\"recordedDate\": 1.3541e+12,\"lsTransaction\": {\"comments\":
+		// \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 }
+		// },{\"valueType\": \"numericValue\",\"valueKind\": \"standard
+		// deviation\",\"stringValue\": null,\"fileValue\": null,\"urlValue\":
+		// null,\"dateValue\": null,\"clobValue\": null,\"blobValue\":
+		// null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\":
+		// null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\":
+		// null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\":
+		// true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":
+		// 1.3541e+12,\"version\":0 } } ],\"recordedBy\": \"smeyer\",\"stateType\":
+		// \"data\",\"stateKind\": \"aggregated subject data\",\"comments\":
+		// \"\",\"lsTransaction\": {\"comments\": \"samtest101\",\"id\":
+		// 23,\"recordedDate\": 1.3541e+12,\"version\":0 },\"ignored\":
+		// false,\"recordedDate\": 1.3541e+12 } ],\"recordedBy\":
+		// \"smeyer\",\"comments\": \"no comments\",\"lsTransaction\": {\"comments\":
+		// \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0
+		// },\"ignored\": false,\"recordedDate\": 1.3541e+12 }
+		// ],\"analysisGroupStates\": null
+		// }cat(toJSON(exampleAnalysisGroup,digit=15)){\"codeName\":
+		// \"AG-00000014\",\"experiment\": {\"analysisGroups\": [],\"codeName\":
+		// \"EXPT-000007\",\"experimentStates\": [],\"id\": 36,\"ignored\":
+		// false,\"lsTransaction\": {\"comments\": \"experiment 102
+		// transactions\",\"id\": 22,\"recordedDate\":1354065956000,\"version\":0
+		// },\"modifiedBy\": null,\"modifiedDate\": null,\"protocol\": {\"codeName\":
+		// \"PROT-000006\",\"id\": 34,\"ignored\": false,\"lsTransaction\":
+		// {\"comments\": \"protocol 201 transactions\",\"id\":
+		// 19,\"recordedDate\":1354064630000,\"version\":0 },\"modifiedBy\":
+		// null,\"modifiedDate\": null,\"recordedBy\":
+		// \"userName\",\"recordedDate\":1354064630000,\"shortDescription\": \"protocol
+		// short description goes here\",\"version\":0 },\"recordedBy\":
+		// \"userName\",\"recordedDate\": null,\"shortDescription\": \"experiment short
+		// description\",\"version\":0 },\"recordedBy\": \"smeyer\",\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\":
+		// 23,\"recordedDate\":1354066044000,\"version\":0 },\"treatmentGroups\":
+		// [{\"codeName\": \"TG-000010\",\"subjects\": [{\"codeName\":
+		// \"SUBJ-000011\",\"subjectStates\": [{\"subjectValues\": [{\"valueType\":
+		// \"numericValue\",\"valueKind\": \"maximum\",\"stringValue\":
+		// null,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": 226,\"sigFigs\": null,\"uncertainty\":
+		// null,\"valueUnit\": \"counts\",\"concValue\": null,\"concUnit\":
+		// \"\",\"comments\": null,\"ignored\": false,\"publicData\":
+		// true,\"batchCode\": null,\"recordedDate\":1354066044000,\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\":
+		// 23,\"recordedDate\":1354066044000,\"version\":0 } },{\"valueType\":
+		// \"numericValue\",\"valueKind\": \"minimum\",\"stringValue\":
+		// null,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": 173,\"sigFigs\": null,\"uncertainty\":
+		// null,\"valueUnit\": \"counts\",\"concValue\": null,\"concUnit\":
+		// \"\",\"comments\": null,\"ignored\": false,\"publicData\":
+		// true,\"batchCode\": null,\"recordedDate\":1354066044000,\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\":
+		// 23,\"recordedDate\":1354066044000,\"version\":0 } },{\"valueType\":
+		// \"numericValue\",\"valueKind\": \"transformed\",\"stringValue\":
+		// null,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": 0.30635838150289,\"sigFigs\": null,\"uncertainty\":
+		// null,\"valueUnit\": \"Eff\",\"concValue\": null,\"concUnit\":
+		// \"\",\"comments\": null,\"ignored\": false,\"publicData\":
+		// true,\"batchCode\": null,\"recordedDate\":1354066044000,\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\":
+		// 23,\"recordedDate\":1354066044000,\"version\":0 } },{\"valueType\":
+		// \"numericValue\",\"valueKind\": \"normalized\",\"stringValue\":
+		// null,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": -0.00993319001154032,\"sigFigs\":
+		// null,\"uncertainty\": null,\"valueUnit\": \"Eff\",\"concValue\":
+		// null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\":
+		// true,\"batchCode\": null,\"recordedDate\":1354066044000,\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\":
+		// 23,\"recordedDate\":1354066044000,\"version\":0 } } ],\"recordedBy\":
+		// \"smeyer\",\"stateType\": \"data\",\"stateKind\":
+		// \"maxMinData\",\"comments\": \"\",\"lsTransaction\": {\"comments\":
+		// \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0
+		// },\"ignored\": false,\"recordedDate\":1354066044000 },{\"subjectValues\":
+		// [{\"valueType\": \"stringValue\",\"valueKind\": \"well\",\"stringValue\":
+		// \"A01\",\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\":
+		// null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\":
+		// null,\"ignored\": false,\"publicData\": true,\"batchCode\":
+		// null,\"recordedDate\":1354066044000,\"lsTransaction\": {\"comments\":
+		// \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 }
+		// },{\"valueType\": \"stringValue\",\"valueKind\": \"barcode\",\"stringValue\":
+		// \"FD-384-00399-C\",\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\":
+		// null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\":
+		// null,\"ignored\": false,\"publicData\": true,\"batchCode\":
+		// null,\"recordedDate\":1354066044000,\"lsTransaction\": {\"comments\":
+		// \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 }
+		// },{\"valueType\": \"batchCode\",\"valueKind\": \"NC\",\"stringValue\":
+		// null,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\":
+		// null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\":
+		// null,\"ignored\": false,\"publicData\": true,\"batchCode\":
+		// \"CMPD000001\",\"recordedDate\":1354066044000,\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\":
+		// 23,\"recordedDate\":1354066044000,\"version\":0 } },{\"valueType\":
+		// \"stringValue\",\"valueKind\": \"efficacyThreshold\",\"stringValue\":
+		// false,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\":
+		// null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\":
+		// null,\"ignored\": false,\"publicData\": true,\"batchCode\":
+		// null,\"recordedDate\":1354066044000,\"lsTransaction\": {\"comments\":
+		// \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 } }
+		// ],\"recordedBy\": \"smeyer\",\"stateType\": \"metadata\",\"stateKind\":
+		// \"assay plate info\",\"comments\": \"\",\"lsTransaction\": {\"comments\":
+		// \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0
+		// },\"ignored\": false,\"recordedDate\":1354066044000 } ],\"recordedBy\":
+		// \"smeyer\",\"comments\": \"\",\"lsTransaction\": {\"comments\":
+		// \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0
+		// },\"ignored\": false,\"recordedDate\":1354066044000 }
+		// ],\"treatmentGroupStates\": [{\"treatmentGroupValues\": [{\"valueType\":
+		// \"numericValue\",\"valueKind\": \"average\",\"stringValue\":
+		// null,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": -0.00993319001154032,\"sigFigs\":
+		// null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\":
+		// null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\":
+		// true,\"batchCode\": null,\"recordedDate\":1354066044000,\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\":
+		// 23,\"recordedDate\":1354066044000,\"version\":0 } },{\"valueType\":
+		// \"numericValue\",\"valueKind\": \"standard deviation\",\"stringValue\":
+		// null,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\":
+		// null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\":
+		// null,\"ignored\": false,\"publicData\": true,\"batchCode\":
+		// null,\"recordedDate\":1354066044000,\"lsTransaction\": {\"comments\":
+		// \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 } }
+		// ],\"recordedBy\": \"smeyer\",\"stateType\": \"data\",\"stateKind\":
+		// \"aggregated subject data\",\"comments\": \"\",\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\":
+		// 23,\"recordedDate\":1354066044000,\"version\":0 },\"ignored\":
+		// false,\"recordedDate\":1354066044000 } ],\"recordedBy\":
+		// \"smeyer\",\"comments\": \"no comments\",\"lsTransaction\": {\"comments\":
+		// \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0
+		// },\"ignored\": false,\"recordedDate\":1354066044000 }
+		// ],\"analysisGroupStates\": null }";
 		String json1 = " { \"codeName\": \"AG-00000076test\",\"kind\": \"Dose Response\",\"experiment\":  { \"codeName\": \"EXPT-00000008\",\"id\": 97,\"ignored\": false,\"kind\": \"dose response\",\"lsTransaction\": { \"comments\": \"experiment 201 transactions\",\"id\": 10,\"recordedDate\":1362105852000,\"version\":0 },\"modifiedBy\": null,\"modifiedDate\": null,\"protocol\": { \"codeName\": \"PROT-00000003\",\"id\": 96,\"ignored\": false,\"kind\": null,\"lsTransaction\": { \"comments\": \"protocol 201 transactions\",\"id\":9,\"recordedDate\":1362105852000,\"version\":0 },\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"userName\",\"recordedDate\":1362105852000,\"shortDescription\": \"protocol short description goes here\",\"version\":0 },\"recordedBy\": \"userName\",\"recordedDate\": null,\"shortDescription\": \"experiment short description\",\"version\":0 } ,\"recordedBy\": \"userName\",\"lsTransaction\": null,\"treatmentGroups\": null,\"analysisGroupStates\": null }";
 		String json = "{     \"codeName\": \"AG-00000002test\",     \"experiment\": {         \"codeName\": \"EXPT-00000002\",         \"id\": 46693,         \"ignored\": false,         \"lsKind\": \"default\",         \"lsTransaction\": 3,         \"lsType\": \"default\",         \"lsTypeAndKind\": \"default_default\",         \"recordedBy\": \"goshiro\",         \"recordedDate\": 1398186174000,         \"shortDescription\": \"Protein abundance, WSN, 18h\",         \"version\": 1     },     \"ignored\": false,     \"lsKind\": \"Gene ID Data\",     \"lsTransaction\": 3,     \"lsType\": \"default\",     \"lsTypeAndKind\": \"default_Gene ID Data\",     \"recordedBy\": \"goshiro\",     \"version\": 0 }";
 		logger.info(AnalysisGroup.fromJsonToAnalysisGroup(json).toString());
 		AnalysisGroup output = analysisGroupService.saveLsAnalysisGroup(AnalysisGroup.fromJsonToAnalysisGroup(json));
 		logger.info(output.toJson());
 	}
-	
+
 	@Test
 	@Transactional
-	public void CreateAnalysisGroupsFromNestedJson2(){
+	public void CreateAnalysisGroupsFromNestedJson2() {
 		String json = "{ \"codeName\": \"AG-00000084\",\"kind\": \"Dose Response\",\"experiment\": { \"codeName\": \"EXPT-00000008\",\"id\":        97,\"ignored\": false,\"kind\": \"dose response\",\"lsTransaction\": { \"comments\": \"experiment 201 transactions\",\"id\":        10,\"recordedDate\":  1362077052000,\"version\":        0 },\"modifiedBy\": null,\"modifiedDate\": null,\"protocol\": { \"codeName\": \"PROT-00000003\",\"id\":        96,\"ignored\": false,\"kind\": null,\"lsTransaction\": { \"comments\": \"protocol 201 transactions\",\"id\":        9,\"recordedDate\":  1362077052000,\"version\":        0 },\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"userName\",\"recordedDate\":  1362077052000,\"shortDescription\": \"protocol short description goes here\",\"version\":        0 },\"recordedBy\": \"userName\",\"recordedDate\": null,\"shortDescription\": \"experiment short description\",\"version\":        0 },\"recordedBy\": \"userName\",\"lsTransaction\": null,\"treatmentGroups\": null,\"analysisGroupLabels\": null,\"analysisGroupStates\": [ { \"analysisGroupValues\": null,\"recordedBy\": \"userName\",\"stateType\": \"data\",\"stateKind\": \"inhibition\",\"comments\": \"\",\"lsTransaction\": { \"comments\": \"experiment 202 transactions\",\"id\":        37,\"recordedDate\":  1362113789000,\"version\":        0 },\"ignored\": false,\"recordedDate\":  1362116855000 } ],\"recordedDate\":  1362116856000,\"modifiedBy\": \"userName\",\"modifiedDate\":  1362116856000 }";
 		logger.info(AnalysisGroup.fromJsonToAnalysisGroup(json).toString());
-		//AnalysisGroup output = analysisGroupService.saveLsAnalysisGroup(AnalysisGroup.fromJsonToAnalysisGroup(json));
-		//logger.info(output.toJson());
+		// AnalysisGroup output =
+		// analysisGroupService.saveLsAnalysisGroup(AnalysisGroup.fromJsonToAnalysisGroup(json));
+		// logger.info(output.toJson());
 	}
-	
-	//@Test
-	//@Transactional
-	public void CreateAnalysisGroups() throws NotFoundException{
-		//String json = "{\"codeName\": \"AG-00000014\",\"experiment\": {\"analysisGroups\": [],\"codeName\": \"EXPT-000007\",\"experimentStates\": [],\"id\": 36,\"ignored\": false,\"lsTransaction\": {\"comments\": \"experiment 102 transactions\",\"id\": 22,\"recordedDate\": 1.3541e+12,\"version\":0 },\"modifiedBy\": null,\"modifiedDate\": null,\"protocol\": {\"codeName\": \"PROT-000006\",\"id\": 34,\"ignored\": false,\"lsTransaction\": {\"comments\": \"protocol 201 transactions\",\"id\": 19,\"recordedDate\": 1.3541e+12,\"version\":0 },\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"userName\",\"recordedDate\": 1.3541e+12,\"shortDescription\": \"protocol short description goes here\",\"version\":0 },\"recordedBy\": \"userName\",\"recordedDate\": null,\"shortDescription\": \"experiment short description\",\"version\":0 },\"recordedBy\": \"smeyer\",\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 },\"treatmentGroups\": [{\"codeName\": \"TG-000010\",\"subjects\": [{\"codeName\": \"SUBJ-000011\",\"subjectStates\": [{\"subjectValues\": [{\"valueType\": \"numericValue\",\"valueKind\": \"maximum\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": 226,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": \"counts\",\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 } },{\"valueType\": \"numericValue\",\"valueKind\": \"minimum\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": 173,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": \"counts\",\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 } },{\"valueType\": \"numericValue\",\"valueKind\": \"transformed\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": 0.30636,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": \"Eff\",\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 } },{\"valueType\": \"numericValue\",\"valueKind\": \"normalized\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": -0.0099332,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": \"Eff\",\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 } } ],\"recordedBy\": \"smeyer\",\"stateType\": \"data\",\"stateKind\": \"maxMinData\",\"comments\": \"\",\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 },\"ignored\": false,\"recordedDate\": 1.3541e+12 },{\"subjectValues\": [{\"valueType\": \"stringValue\",\"valueKind\": \"well\",\"stringValue\": \"A01\",\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 } },{\"valueType\": \"stringValue\",\"valueKind\": \"barcode\",\"stringValue\": \"FD-384-00399-C\",\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 } },{\"valueType\": \"batchCode\",\"valueKind\": \"NC\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": \"CMPD000001\",\"recordedDate\": 1.3541e+12,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 } },{\"valueType\": \"stringValue\",\"valueKind\": \"efficacyThreshold\",\"stringValue\": \"false\",\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 } } ],\"recordedBy\": \"smeyer\",\"stateType\": \"metadata\",\"stateKind\": \"assay plate info\",\"comments\": \"\",\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 },\"ignored\": false,\"recordedDate\": 1.3541e+12 } ],\"recordedBy\": \"smeyer\",\"comments\": \"\",\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 },\"ignored\": false,\"recordedDate\": 1.3541e+12 } ],\"treatmentGroupStates\": [{\"treatmentGroupValues\": [{\"valueType\": \"numericValue\",\"valueKind\": \"average\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": -0.0099332,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 } },{\"valueType\": \"numericValue\",\"valueKind\": \"standard deviation\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 } } ],\"recordedBy\": \"smeyer\",\"stateType\": \"data\",\"stateKind\": \"aggregated subject data\",\"comments\": \"\",\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 },\"ignored\": false,\"recordedDate\": 1.3541e+12 } ],\"recordedBy\": \"smeyer\",\"comments\": \"no comments\",\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 },\"ignored\": false,\"recordedDate\": 1.3541e+12 } ],\"analysisGroupStates\": null }cat(toJSON(exampleAnalysisGroup,digit=15)){\"codeName\": \"AG-00000014\",\"experiment\": {\"analysisGroups\": [],\"codeName\": \"EXPT-000007\",\"experimentStates\": [],\"id\": 36,\"ignored\": false,\"lsTransaction\": {\"comments\": \"experiment 102 transactions\",\"id\": 22,\"recordedDate\":1354065956000,\"version\":0 },\"modifiedBy\": null,\"modifiedDate\": null,\"protocol\": {\"codeName\": \"PROT-000006\",\"id\": 34,\"ignored\": false,\"lsTransaction\": {\"comments\": \"protocol 201 transactions\",\"id\": 19,\"recordedDate\":1354064630000,\"version\":0 },\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"userName\",\"recordedDate\":1354064630000,\"shortDescription\": \"protocol short description goes here\",\"version\":0 },\"recordedBy\": \"userName\",\"recordedDate\": null,\"shortDescription\": \"experiment short description\",\"version\":0 },\"recordedBy\": \"smeyer\",\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 },\"treatmentGroups\": [{\"codeName\": \"TG-000010\",\"subjects\": [{\"codeName\": \"SUBJ-000011\",\"subjectStates\": [{\"subjectValues\": [{\"valueType\": \"numericValue\",\"valueKind\": \"maximum\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": 226,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": \"counts\",\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\":1354066044000,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 } },{\"valueType\": \"numericValue\",\"valueKind\": \"minimum\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": 173,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": \"counts\",\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\":1354066044000,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 } },{\"valueType\": \"numericValue\",\"valueKind\": \"transformed\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": 0.30635838150289,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": \"Eff\",\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\":1354066044000,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 } },{\"valueType\": \"numericValue\",\"valueKind\": \"normalized\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": -0.00993319001154032,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": \"Eff\",\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\":1354066044000,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 } } ],\"recordedBy\": \"smeyer\",\"stateType\": \"data\",\"stateKind\": \"maxMinData\",\"comments\": \"\",\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 },\"ignored\": false,\"recordedDate\":1354066044000 },{\"subjectValues\": [{\"valueType\": \"stringValue\",\"valueKind\": \"well\",\"stringValue\": \"A01\",\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\":1354066044000,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 } },{\"valueType\": \"stringValue\",\"valueKind\": \"barcode\",\"stringValue\": \"FD-384-00399-C\",\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\":1354066044000,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 } },{\"valueType\": \"batchCode\",\"valueKind\": \"NC\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": \"CMPD000001\",\"recordedDate\":1354066044000,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 } },{\"valueType\": \"stringValue\",\"valueKind\": \"efficacyThreshold\",\"stringValue\": false,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\":1354066044000,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 } } ],\"recordedBy\": \"smeyer\",\"stateType\": \"metadata\",\"stateKind\": \"assay plate info\",\"comments\": \"\",\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 },\"ignored\": false,\"recordedDate\":1354066044000 } ],\"recordedBy\": \"smeyer\",\"comments\": \"\",\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 },\"ignored\": false,\"recordedDate\":1354066044000 } ],\"treatmentGroupStates\": [{\"treatmentGroupValues\": [{\"valueType\": \"numericValue\",\"valueKind\": \"average\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": -0.00993319001154032,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\":1354066044000,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 } },{\"valueType\": \"numericValue\",\"valueKind\": \"standard deviation\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"batchCode\": null,\"recordedDate\":1354066044000,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 } } ],\"recordedBy\": \"smeyer\",\"stateType\": \"data\",\"stateKind\": \"aggregated subject data\",\"comments\": \"\",\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 },\"ignored\": false,\"recordedDate\":1354066044000 } ],\"recordedBy\": \"smeyer\",\"comments\": \"no comments\",\"lsTransaction\": {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 },\"ignored\": false,\"recordedDate\":1354066044000 } ],\"analysisGroupStates\": null }";
-		String json = "{ 'codeName': 'AG-00000075', 'kind': 'Dose Response', 'experiment': [ { 'codeName': 'EXPT-00000008', 'id':    97, 'ignored': false, 'kind': 'dose response', 'lsTransaction': { 'comments': 'experiment 201 transactions', 'id':    10, 'recordedDate': 1362105852000, 'version':    0 }, 'modifiedBy': null, 'modifiedDate': null, 'protocol': { 'codeName': 'PROT-00000003', 'id':    96, 'ignored': false, 'kind': null, 'lsTransaction': { 'comments': 'protocol 201 transactions', 'id':    9, 'recordedDate': 1362105852000, 'version':    0 }, 'modifiedBy': null, 'modifiedDate': null, 'recordedBy': 'userName', 'recordedDate': 1362105852000, 'shortDescription': 'protocol short description goes here', 'version':    0 }, 'recordedBy': 'userName', 'recordedDate': null, 'shortDescription': 'experiment short description', 'version':    0 } ], 'recordedBy': 'userName', 'lsTransaction': null, 'treatmentGroups': null, 'analysisGroupStates': null }"; 
+
+	// @Test
+	// @Transactional
+	public void CreateAnalysisGroups() throws NotFoundException {
+		// String json = "{\"codeName\": \"AG-00000014\",\"experiment\":
+		// {\"analysisGroups\": [],\"codeName\": \"EXPT-000007\",\"experimentStates\":
+		// [],\"id\": 36,\"ignored\": false,\"lsTransaction\": {\"comments\":
+		// \"experiment 102 transactions\",\"id\": 22,\"recordedDate\":
+		// 1.3541e+12,\"version\":0 },\"modifiedBy\": null,\"modifiedDate\":
+		// null,\"protocol\": {\"codeName\": \"PROT-000006\",\"id\": 34,\"ignored\":
+		// false,\"lsTransaction\": {\"comments\": \"protocol 201 transactions\",\"id\":
+		// 19,\"recordedDate\": 1.3541e+12,\"version\":0 },\"modifiedBy\":
+		// null,\"modifiedDate\": null,\"recordedBy\": \"userName\",\"recordedDate\":
+		// 1.3541e+12,\"shortDescription\": \"protocol short description goes
+		// here\",\"version\":0 },\"recordedBy\": \"userName\",\"recordedDate\":
+		// null,\"shortDescription\": \"experiment short description\",\"version\":0
+		// },\"recordedBy\": \"smeyer\",\"lsTransaction\": {\"comments\":
+		// \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0
+		// },\"treatmentGroups\": [{\"codeName\": \"TG-000010\",\"subjects\":
+		// [{\"codeName\": \"SUBJ-000011\",\"subjectStates\": [{\"subjectValues\":
+		// [{\"valueType\": \"numericValue\",\"valueKind\": \"maximum\",\"stringValue\":
+		// null,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": 226,\"sigFigs\": null,\"uncertainty\":
+		// null,\"valueUnit\": \"counts\",\"concValue\": null,\"concUnit\":
+		// \"\",\"comments\": null,\"ignored\": false,\"publicData\":
+		// true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":
+		// 1.3541e+12,\"version\":0 } },{\"valueType\": \"numericValue\",\"valueKind\":
+		// \"minimum\",\"stringValue\": null,\"fileValue\": null,\"urlValue\":
+		// null,\"dateValue\": null,\"clobValue\": null,\"blobValue\":
+		// null,\"valueOperator\": null,\"numericValue\": 173,\"sigFigs\":
+		// null,\"uncertainty\": null,\"valueUnit\": \"counts\",\"concValue\":
+		// null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\":
+		// true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":
+		// 1.3541e+12,\"version\":0 } },{\"valueType\": \"numericValue\",\"valueKind\":
+		// \"transformed\",\"stringValue\": null,\"fileValue\": null,\"urlValue\":
+		// null,\"dateValue\": null,\"clobValue\": null,\"blobValue\":
+		// null,\"valueOperator\": null,\"numericValue\": 0.30636,\"sigFigs\":
+		// null,\"uncertainty\": null,\"valueUnit\": \"Eff\",\"concValue\":
+		// null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\":
+		// true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":
+		// 1.3541e+12,\"version\":0 } },{\"valueType\": \"numericValue\",\"valueKind\":
+		// \"normalized\",\"stringValue\": null,\"fileValue\": null,\"urlValue\":
+		// null,\"dateValue\": null,\"clobValue\": null,\"blobValue\":
+		// null,\"valueOperator\": null,\"numericValue\": -0.0099332,\"sigFigs\":
+		// null,\"uncertainty\": null,\"valueUnit\": \"Eff\",\"concValue\":
+		// null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\":
+		// true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":
+		// 1.3541e+12,\"version\":0 } } ],\"recordedBy\": \"smeyer\",\"stateType\":
+		// \"data\",\"stateKind\": \"maxMinData\",\"comments\": \"\",\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":
+		// 1.3541e+12,\"version\":0 },\"ignored\": false,\"recordedDate\": 1.3541e+12
+		// },{\"subjectValues\": [{\"valueType\": \"stringValue\",\"valueKind\":
+		// \"well\",\"stringValue\": \"A01\",\"fileValue\": null,\"urlValue\":
+		// null,\"dateValue\": null,\"clobValue\": null,\"blobValue\":
+		// null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\":
+		// null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\":
+		// null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\":
+		// true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":
+		// 1.3541e+12,\"version\":0 } },{\"valueType\": \"stringValue\",\"valueKind\":
+		// \"barcode\",\"stringValue\": \"FD-384-00399-C\",\"fileValue\":
+		// null,\"urlValue\": null,\"dateValue\": null,\"clobValue\":
+		// null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\":
+		// null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\":
+		// null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\":
+		// false,\"publicData\": true,\"batchCode\": null,\"recordedDate\":
+		// 1.3541e+12,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\":
+		// 23,\"recordedDate\": 1.3541e+12,\"version\":0 } },{\"valueType\":
+		// \"batchCode\",\"valueKind\": \"NC\",\"stringValue\": null,\"fileValue\":
+		// null,\"urlValue\": null,\"dateValue\": null,\"clobValue\":
+		// null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\":
+		// null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\":
+		// null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\":
+		// false,\"publicData\": true,\"batchCode\": \"CMPD000001\",\"recordedDate\":
+		// 1.3541e+12,\"lsTransaction\": {\"comments\": \"samtest101\",\"id\":
+		// 23,\"recordedDate\": 1.3541e+12,\"version\":0 } },{\"valueType\":
+		// \"stringValue\",\"valueKind\": \"efficacyThreshold\",\"stringValue\":
+		// \"false\",\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\":
+		// null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\":
+		// null,\"ignored\": false,\"publicData\": true,\"batchCode\":
+		// null,\"recordedDate\": 1.3541e+12,\"lsTransaction\": {\"comments\":
+		// \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 } }
+		// ],\"recordedBy\": \"smeyer\",\"stateType\": \"metadata\",\"stateKind\":
+		// \"assay plate info\",\"comments\": \"\",\"lsTransaction\": {\"comments\":
+		// \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0
+		// },\"ignored\": false,\"recordedDate\": 1.3541e+12 } ],\"recordedBy\":
+		// \"smeyer\",\"comments\": \"\",\"lsTransaction\": {\"comments\":
+		// \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0
+		// },\"ignored\": false,\"recordedDate\": 1.3541e+12 }
+		// ],\"treatmentGroupStates\": [{\"treatmentGroupValues\": [{\"valueType\":
+		// \"numericValue\",\"valueKind\": \"average\",\"stringValue\":
+		// null,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": -0.0099332,\"sigFigs\": null,\"uncertainty\":
+		// null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\":
+		// null,\"ignored\": false,\"publicData\": true,\"batchCode\":
+		// null,\"recordedDate\": 1.3541e+12,\"lsTransaction\": {\"comments\":
+		// \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0 }
+		// },{\"valueType\": \"numericValue\",\"valueKind\": \"standard
+		// deviation\",\"stringValue\": null,\"fileValue\": null,\"urlValue\":
+		// null,\"dateValue\": null,\"clobValue\": null,\"blobValue\":
+		// null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\":
+		// null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\":
+		// null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\":
+		// true,\"batchCode\": null,\"recordedDate\": 1.3541e+12,\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\": 23,\"recordedDate\":
+		// 1.3541e+12,\"version\":0 } } ],\"recordedBy\": \"smeyer\",\"stateType\":
+		// \"data\",\"stateKind\": \"aggregated subject data\",\"comments\":
+		// \"\",\"lsTransaction\": {\"comments\": \"samtest101\",\"id\":
+		// 23,\"recordedDate\": 1.3541e+12,\"version\":0 },\"ignored\":
+		// false,\"recordedDate\": 1.3541e+12 } ],\"recordedBy\":
+		// \"smeyer\",\"comments\": \"no comments\",\"lsTransaction\": {\"comments\":
+		// \"samtest101\",\"id\": 23,\"recordedDate\": 1.3541e+12,\"version\":0
+		// },\"ignored\": false,\"recordedDate\": 1.3541e+12 }
+		// ],\"analysisGroupStates\": null
+		// }cat(toJSON(exampleAnalysisGroup,digit=15)){\"codeName\":
+		// \"AG-00000014\",\"experiment\": {\"analysisGroups\": [],\"codeName\":
+		// \"EXPT-000007\",\"experimentStates\": [],\"id\": 36,\"ignored\":
+		// false,\"lsTransaction\": {\"comments\": \"experiment 102
+		// transactions\",\"id\": 22,\"recordedDate\":1354065956000,\"version\":0
+		// },\"modifiedBy\": null,\"modifiedDate\": null,\"protocol\": {\"codeName\":
+		// \"PROT-000006\",\"id\": 34,\"ignored\": false,\"lsTransaction\":
+		// {\"comments\": \"protocol 201 transactions\",\"id\":
+		// 19,\"recordedDate\":1354064630000,\"version\":0 },\"modifiedBy\":
+		// null,\"modifiedDate\": null,\"recordedBy\":
+		// \"userName\",\"recordedDate\":1354064630000,\"shortDescription\": \"protocol
+		// short description goes here\",\"version\":0 },\"recordedBy\":
+		// \"userName\",\"recordedDate\": null,\"shortDescription\": \"experiment short
+		// description\",\"version\":0 },\"recordedBy\": \"smeyer\",\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\":
+		// 23,\"recordedDate\":1354066044000,\"version\":0 },\"treatmentGroups\":
+		// [{\"codeName\": \"TG-000010\",\"subjects\": [{\"codeName\":
+		// \"SUBJ-000011\",\"subjectStates\": [{\"subjectValues\": [{\"valueType\":
+		// \"numericValue\",\"valueKind\": \"maximum\",\"stringValue\":
+		// null,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": 226,\"sigFigs\": null,\"uncertainty\":
+		// null,\"valueUnit\": \"counts\",\"concValue\": null,\"concUnit\":
+		// \"\",\"comments\": null,\"ignored\": false,\"publicData\":
+		// true,\"batchCode\": null,\"recordedDate\":1354066044000,\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\":
+		// 23,\"recordedDate\":1354066044000,\"version\":0 } },{\"valueType\":
+		// \"numericValue\",\"valueKind\": \"minimum\",\"stringValue\":
+		// null,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": 173,\"sigFigs\": null,\"uncertainty\":
+		// null,\"valueUnit\": \"counts\",\"concValue\": null,\"concUnit\":
+		// \"\",\"comments\": null,\"ignored\": false,\"publicData\":
+		// true,\"batchCode\": null,\"recordedDate\":1354066044000,\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\":
+		// 23,\"recordedDate\":1354066044000,\"version\":0 } },{\"valueType\":
+		// \"numericValue\",\"valueKind\": \"transformed\",\"stringValue\":
+		// null,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": 0.30635838150289,\"sigFigs\": null,\"uncertainty\":
+		// null,\"valueUnit\": \"Eff\",\"concValue\": null,\"concUnit\":
+		// \"\",\"comments\": null,\"ignored\": false,\"publicData\":
+		// true,\"batchCode\": null,\"recordedDate\":1354066044000,\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\":
+		// 23,\"recordedDate\":1354066044000,\"version\":0 } },{\"valueType\":
+		// \"numericValue\",\"valueKind\": \"normalized\",\"stringValue\":
+		// null,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": -0.00993319001154032,\"sigFigs\":
+		// null,\"uncertainty\": null,\"valueUnit\": \"Eff\",\"concValue\":
+		// null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\":
+		// true,\"batchCode\": null,\"recordedDate\":1354066044000,\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\":
+		// 23,\"recordedDate\":1354066044000,\"version\":0 } } ],\"recordedBy\":
+		// \"smeyer\",\"stateType\": \"data\",\"stateKind\":
+		// \"maxMinData\",\"comments\": \"\",\"lsTransaction\": {\"comments\":
+		// \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0
+		// },\"ignored\": false,\"recordedDate\":1354066044000 },{\"subjectValues\":
+		// [{\"valueType\": \"stringValue\",\"valueKind\": \"well\",\"stringValue\":
+		// \"A01\",\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\":
+		// null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\":
+		// null,\"ignored\": false,\"publicData\": true,\"batchCode\":
+		// null,\"recordedDate\":1354066044000,\"lsTransaction\": {\"comments\":
+		// \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 }
+		// },{\"valueType\": \"stringValue\",\"valueKind\": \"barcode\",\"stringValue\":
+		// \"FD-384-00399-C\",\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\":
+		// null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\":
+		// null,\"ignored\": false,\"publicData\": true,\"batchCode\":
+		// null,\"recordedDate\":1354066044000,\"lsTransaction\": {\"comments\":
+		// \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 }
+		// },{\"valueType\": \"batchCode\",\"valueKind\": \"NC\",\"stringValue\":
+		// null,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\":
+		// null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\":
+		// null,\"ignored\": false,\"publicData\": true,\"batchCode\":
+		// \"CMPD000001\",\"recordedDate\":1354066044000,\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\":
+		// 23,\"recordedDate\":1354066044000,\"version\":0 } },{\"valueType\":
+		// \"stringValue\",\"valueKind\": \"efficacyThreshold\",\"stringValue\":
+		// false,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\":
+		// null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\":
+		// null,\"ignored\": false,\"publicData\": true,\"batchCode\":
+		// null,\"recordedDate\":1354066044000,\"lsTransaction\": {\"comments\":
+		// \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 } }
+		// ],\"recordedBy\": \"smeyer\",\"stateType\": \"metadata\",\"stateKind\":
+		// \"assay plate info\",\"comments\": \"\",\"lsTransaction\": {\"comments\":
+		// \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0
+		// },\"ignored\": false,\"recordedDate\":1354066044000 } ],\"recordedBy\":
+		// \"smeyer\",\"comments\": \"\",\"lsTransaction\": {\"comments\":
+		// \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0
+		// },\"ignored\": false,\"recordedDate\":1354066044000 }
+		// ],\"treatmentGroupStates\": [{\"treatmentGroupValues\": [{\"valueType\":
+		// \"numericValue\",\"valueKind\": \"average\",\"stringValue\":
+		// null,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": -0.00993319001154032,\"sigFigs\":
+		// null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\":
+		// null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\":
+		// true,\"batchCode\": null,\"recordedDate\":1354066044000,\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\":
+		// 23,\"recordedDate\":1354066044000,\"version\":0 } },{\"valueType\":
+		// \"numericValue\",\"valueKind\": \"standard deviation\",\"stringValue\":
+		// null,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\":
+		// null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\":
+		// null,\"ignored\": false,\"publicData\": true,\"batchCode\":
+		// null,\"recordedDate\":1354066044000,\"lsTransaction\": {\"comments\":
+		// \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0 } }
+		// ],\"recordedBy\": \"smeyer\",\"stateType\": \"data\",\"stateKind\":
+		// \"aggregated subject data\",\"comments\": \"\",\"lsTransaction\":
+		// {\"comments\": \"samtest101\",\"id\":
+		// 23,\"recordedDate\":1354066044000,\"version\":0 },\"ignored\":
+		// false,\"recordedDate\":1354066044000 } ],\"recordedBy\":
+		// \"smeyer\",\"comments\": \"no comments\",\"lsTransaction\": {\"comments\":
+		// \"samtest101\",\"id\": 23,\"recordedDate\":1354066044000,\"version\":0
+		// },\"ignored\": false,\"recordedDate\":1354066044000 }
+		// ],\"analysisGroupStates\": null }";
+		String json = "{ 'codeName': 'AG-00000075', 'kind': 'Dose Response', 'experiment': [ { 'codeName': 'EXPT-00000008', 'id':    97, 'ignored': false, 'kind': 'dose response', 'lsTransaction': { 'comments': 'experiment 201 transactions', 'id':    10, 'recordedDate': 1362105852000, 'version':    0 }, 'modifiedBy': null, 'modifiedDate': null, 'protocol': { 'codeName': 'PROT-00000003', 'id':    96, 'ignored': false, 'kind': null, 'lsTransaction': { 'comments': 'protocol 201 transactions', 'id':    9, 'recordedDate': 1362105852000, 'version':    0 }, 'modifiedBy': null, 'modifiedDate': null, 'recordedBy': 'userName', 'recordedDate': 1362105852000, 'shortDescription': 'protocol short description goes here', 'version':    0 }, 'recordedBy': 'userName', 'recordedDate': null, 'shortDescription': 'experiment short description', 'version':    0 } ], 'recordedBy': 'userName', 'lsTransaction': null, 'treatmentGroups': null, 'analysisGroupStates': null }";
 		AnalysisGroup output = analysisGroupService.saveLsAnalysisGroup(AnalysisGroup.fromJsonToAnalysisGroup(json));
 		logger.info(output.toJson());
 	}
-	
-	//@Test
-	//@Transactional
-	public void CreateAnalysisGroupsFromNestedJson5(){
+
+	// @Test
+	// @Transactional
+	public void CreateAnalysisGroupsFromNestedJson5() {
 		String json = "[   {     \"codeName\": \"AG-00219240\",     \"lsType\": \"default\",     \"lsKind\": \"Generic\",     \"experiment\": {       \"id\": 206273,       \"version\": 1     },     \"recordedBy\": \"smeyer\",     \"lsTransaction\": 12426,     \"treatmentGroups\": null,     \"lsStates\": [       {         \"analysisGroup\": null,         \"lsValues\": [           {             \"lsState\": null,             \"lsType\": \"numericValue\",             \"lsKind\": \"%Control\",             \"stringValue\": null,             \"fileValue\": null,             \"urlValue\": null,             \"dateValue\": null,             \"clobValue\": null,             \"blobValue\": null,             \"operatorKind\": null,             \"operatorType\": \"comparison\",             \"numericValue\": 68.87,             \"sigFigs\": null,             \"uncertainty\": null,             \"uncertaintyType\": null,             \"numberOfReplicates\": null,             \"unitKind\": null,             \"comments\": null,             \"ignored\": false,             \"publicData\": true,             \"codeValue\": null,             \"recordedBy\": \"smeyer\",             \"recordedDate\": 1380132462000,             \"lsTransaction\": 12426           }         ],         \"recordedBy\": \"smeyer\",         \"lsType\": \"data\",         \"lsKind\": \"Generic\",         \"comments\": \"\",         \"lsTransaction\": 12426,         \"ignored\": false,         \"recordedDate\": 1380132462000       }     ],     \"recordedDate\": 1380132462000   } ]";
 
 		logger.info("------------------ MAGIC OUTPUT -----------------------------------------------");
@@ -84,23 +567,22 @@ public void CreateAnalysisGroupsFromNestedJson5(){
 		logger.info(AnalysisGroup.fromJsonArrayToAnalysisGroups(json).toString());
 		logger.info("-----------------------------------------------------------------");
 		logger.info("-----------------------------------------------------------------");
-		
-        Collection<AnalysisGroup> analysisGroups = AnalysisGroup.fromJsonArrayToAnalysisGroups(json);
-        Collection<AnalysisGroup> savedanalysisGroups = new ArrayList<AnalysisGroup>();
-        for (AnalysisGroup analysisGroup : analysisGroups) {
-        	logger.info(analysisGroup.toPrettyJson());
-//            savedanalysisGroups.add(analysisGroupService.saveLsAnalysisGroup(analysisGroup));
-        }
-//		AnalysisGroup output = analysisGroupService.saveLsAnalysisGroup(AnalysisGroup.fromJsonToAnalysisGroup(json));
-
-//        logger.info(AnalysisGroup.toJsonArray(savedanalysisGroups));
+
+		Collection<AnalysisGroup> analysisGroups = AnalysisGroup.fromJsonArrayToAnalysisGroups(json);
+		Collection<AnalysisGroup> savedanalysisGroups = new ArrayList<AnalysisGroup>();
+		for (AnalysisGroup analysisGroup : analysisGroups) {
+			logger.info(analysisGroup.toPrettyJson());
+			// savedanalysisGroups.add(analysisGroupService.saveLsAnalysisGroup(analysisGroup));
+		}
+		// AnalysisGroup output =
+		// analysisGroupService.saveLsAnalysisGroup(AnalysisGroup.fromJsonToAnalysisGroup(json));
+
+		// logger.info(AnalysisGroup.toJsonArray(savedanalysisGroups));
 	}
 
-	
-	
 	@Test
-	//@Transactional
-	public void CreateAnalysisGroupFromNestedJson8() throws NotFoundException{
+	// @Transactional
+	public void CreateAnalysisGroupFromNestedJson8() throws NotFoundException {
 		String json = "	{\"lsType\":\"data\",\"lsKind\":\"results\",\"experiments\":[{\"id\":55,\"version\":1}],\"recordedBy\":\"smeyer\",\"lsTransaction\":null,\"treatmentGroups\":null,\"lsStates\":null,\"recordedDate\":1403114845000}";
 		AnalysisGroup analysisGroup = AnalysisGroup.fromJsonToAnalysisGroup(json);
 		AnalysisGroup output = analysisGroupService.saveLsAnalysisGroup(analysisGroup);
@@ -108,24 +590,28 @@ public void CreateAnalysisGroupFromNestedJson8() throws NotFoundException{
 		Assert.assertFalse("experiment should exist", output.getExperiments().isEmpty());
 		Assert.assertTrue("found experiment", output.getExperiments().contains(Experiment.findExperiment(55L)));
 	}
-	
+
 	@Test
-//	@Transactional
-	public void CreateAnalysisGroupFromCSVTest() throws Exception{
-//		String analysisGroupFilePath = "src/test/resources/csvUploadAnalysisGroupDateValueTest.csv";
+	// @Transactional
+	public void CreateAnalysisGroupFromCSVTest() throws Exception {
+		// String analysisGroupFilePath =
+		// "src/test/resources/csvUploadAnalysisGroupDateValueTest.csv";
 
-//		String analysisGroupFilePath = "src/test/resources/csvUploadAnalysisGroup100curves.csv";
-//		String treatmentGroupFilePath = "src/test/resources/csvUploadTreatmentGroup100curves.csv";
-//		String subjectFilePath = "src/test/resources/csvUploadSubject100curves.csv";
+		// String analysisGroupFilePath =
+		// "src/test/resources/csvUploadAnalysisGroup100curves.csv";
+		// String treatmentGroupFilePath =
+		// "src/test/resources/csvUploadTreatmentGroup100curves.csv";
+		// String subjectFilePath = "src/test/resources/csvUploadSubject100curves.csv";
 		String analysisGroupFilePath = "src/test/resources/csvUploadAnalysisGroup.csv";
 		String treatmentGroupFilePath = "src/test/resources/csvUploadTreatmentGroup.csv";
 		String subjectFilePath = "src/test/resources/csvUploadSubject.csv";
-		
-//		String treatmentGroupFilePath = null;
-//		String subjectFilePath = null;
-		
+
+		// String treatmentGroupFilePath = null;
+		// String subjectFilePath = null;
+
 		long startTime = new Date().getTime();
-		TsvLoaderResponseDTO result = analysisGroupService.saveLsAnalysisGroupFromCsv(analysisGroupFilePath, treatmentGroupFilePath, subjectFilePath);
+		TsvLoaderResponseDTO result = analysisGroupService.saveLsAnalysisGroupFromCsv(analysisGroupFilePath,
+				treatmentGroupFilePath, subjectFilePath);
 		long endTime = new Date().getTime();
 		long totalTime = endTime - startTime;
 		logger.info("dataLoaded: " + "true" + "   total elapsed time: " + totalTime + " ms");
@@ -133,54 +619,54 @@ public void CreateAnalysisGroupFromCSVTest() throws Exception{
 		Assert.assertNotNull(result.getAnalysisGroups());
 		Assert.assertNotNull(result.getTreatmentGroups());
 		Assert.assertNotNull(result.getSubjects());
-		
-		//timing notes: running locally
-		//AG - 0.9 s
-		//TG - 6.0 s
-		//S - 17.5 s
-		//Total: 24.4 s
-		
-		//Change: removing extra linking statements (Experiment is already being linked to AnalysisGroup)
-		//AG - 0.86 s
-		//TG - 5.8 s
-		//S - 13.0 s
-		//Total: 19.7 s
-		
-		//Combining merges into a list to be merged at the end
-		//AG - 0.74 s
-		//TG - 2.3 s
-		//S - 9.7 s
-		//Total: 12.7 s
+
+		// timing notes: running locally
+		// AG - 0.9 s
+		// TG - 6.0 s
+		// S - 17.5 s
+		// Total: 24.4 s
+
+		// Change: removing extra linking statements (Experiment is already being linked
+		// to AnalysisGroup)
+		// AG - 0.86 s
+		// TG - 5.8 s
+		// S - 13.0 s
+		// Total: 19.7 s
+
+		// Combining merges into a list to be merged at the end
+		// AG - 0.74 s
+		// TG - 2.3 s
+		// S - 9.7 s
+		// Total: 12.7 s
 	}
-	
+
 	@Transactional
 	@Test
 	public void fromJsonArrayTest() {
 		String json = "[{\"codeName\":\"AG-00017601\",\"lsType\":\"default\",\"lsKind\":\"default\",\"experiments\":[{\"id\":661993,\"version\":1}],\"recordedBy\":\"smeyer\",\"lsTransaction\":1694,\"treatmentGroups\":null,\"lsStates\":[{\"analysisGroup\":null,\"lsValues\":[{\"lsState\":null,\"lsType\":\"fileValue\",\"lsKind\":\"report file\",\"stringValue\":null,\"fileValue\":\"experiments/EXPT-00000208/3_Panel Screen.pdf\",\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":\"Panel Screen - Exp3\",\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"codeOrigin\":null,\"codeType\":null,\"codeKind\":null,\"recordedBy\":\"username\",\"recordedDate\":1412967173000,\"lsTransaction\":1694},{\"lsState\":null,\"lsType\":\"codeValue\",\"lsKind\":\"batch code\",\"stringValue\":null,\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":\"CMPD-0000001-01\",\"codeOrigin\":null,\"codeType\":null,\"codeKind\":null,\"recordedBy\":\"username\",\"recordedDate\":1412967173000,\"lsTransaction\":1694}],\"recordedBy\":\"smeyer\",\"lsType\":\"metadata\",\"lsKind\":\"report locations\",\"comments\":\"\",\"lsTransaction\":1694,\"ignored\":false,\"recordedDate\":1412967173000}],\"recordedDate\":1412967173000}]";
-        List<IdCollectionDTO> idList = new ArrayList<IdCollectionDTO>();
-        IdCollectionDTO idDTO = null;
-        int i = 0;
-        BufferedReader br = null;
-        StringReader sr = null;
-        try {
-            sr = new StringReader(json);
-            br = new BufferedReader(sr);
-            for (AnalysisGroup analysisGroup : AnalysisGroup.fromJsonArrayToAnalysisGroups(br)) {
-                logger.debug("saving analysis group number: " + i);
-                AnalysisGroup saved = analysisGroupService.saveLsAnalysisGroup(analysisGroup);
-                idDTO = new IdCollectionDTO();
-                idDTO.setId(saved.getId());
-                idDTO.setVersion(saved.getVersion());
-                idList.add(idDTO);
-                i++;
-            }
-            logger.info("saved!");
-        }
-        catch(Exception e) {
-        	logger.info("Caught exception " + e);
-       }
+		List<IdCollectionDTO> idList = new ArrayList<IdCollectionDTO>();
+		IdCollectionDTO idDTO = null;
+		int i = 0;
+		BufferedReader br = null;
+		StringReader sr = null;
+		try {
+			sr = new StringReader(json);
+			br = new BufferedReader(sr);
+			for (AnalysisGroup analysisGroup : AnalysisGroup.fromJsonArrayToAnalysisGroups(br)) {
+				logger.debug("saving analysis group number: " + i);
+				AnalysisGroup saved = analysisGroupService.saveLsAnalysisGroup(analysisGroup);
+				idDTO = new IdCollectionDTO();
+				idDTO.setId(saved.getId());
+				idDTO.setVersion(saved.getVersion());
+				idList.add(idDTO);
+				i++;
+			}
+			logger.info("saved!");
+		} catch (Exception e) {
+			logger.info("Caught exception " + e);
+		}
 	}
-	
+
 	@Transactional
 	@Test
 	public void toJsonFromJsonTest() {
@@ -188,7 +674,7 @@ public void toJsonFromJsonTest() {
 		Set<AnalysisGroup> agSet = new HashSet<AnalysisGroup>();
 		agSet.add(ag);
 		Assert.assertNotNull(ag);
-		//Testing the toJson methods
+		// Testing the toJson methods
 		String fullJson = ag.toFullJson();
 		String prettyFullJson = ag.toPrettyFullJson();
 		String json = ag.toJson();
@@ -197,12 +683,12 @@ public void toJsonFromJsonTest() {
 		String prettyJson = ag.toPrettyJson();
 		String prettyJsonStub = ag.toPrettyJsonStub();
 		String jsonArray = AnalysisGroup.toJsonArray(agSet);
-		
-		//Testing the fromJson methods
+
+		// Testing the fromJson methods
 		BufferedReader br = null;
-        StringReader sr = null;
+		StringReader sr = null;
 		sr = new StringReader(json);
-        br = new BufferedReader(sr);
+		br = new BufferedReader(sr);
 		AnalysisGroup ag2 = AnalysisGroup.fromJsonToAnalysisGroup(json);
 		AnalysisGroup ag3 = AnalysisGroup.fromJsonToAnalysisGroup2(br);
 		sr = new StringReader(jsonArray);
diff --git a/src/test/java/com/labsynch/labseer/service/AnalysisGroupStateServiceTest.java b/src/test/java/com/labsynch/labseer/service/AnalysisGroupStateServiceTest.java
index 153541651..7c4a3fc2b 100755
--- a/src/test/java/com/labsynch/labseer/service/AnalysisGroupStateServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/AnalysisGroupStateServiceTest.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import java.util.Collection;
@@ -21,9 +20,9 @@
 
 import junit.framework.Assert;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class AnalysisGroupStateServiceTest {
 
@@ -32,31 +31,33 @@ public class AnalysisGroupStateServiceTest {
 	@Autowired
 	private AnalysisGroupStateService analysisGroupStateService;
 
-	//@Test
-	public void SimpleTest_1(){
+	// @Test
+	public void SimpleTest_1() {
 		AnalysisGroupState analysisGroupState = AnalysisGroupState.findAnalysisGroupState(5527L);
 		logger.info(analysisGroupState.toJson());
-		logger.info(AnalysisGroupValue.toJsonArray(AnalysisGroupValue.findAnalysisGroupValuesByLsState(analysisGroupState).getResultList()));
+		logger.info(AnalysisGroupValue
+				.toJsonArray(AnalysisGroupValue.findAnalysisGroupValuesByLsState(analysisGroupState).getResultList()));
 		Collection<AnalysisGroupState> analysisGroupStates = new HashSet<AnalysisGroupState>();
 		analysisGroupStates.add(analysisGroupState);
-		Collection<AnalysisGroupState> results = analysisGroupStateService.ignoreAllAnalysisGroupStates(analysisGroupStates);
+		Collection<AnalysisGroupState> results = analysisGroupStateService
+				.ignoreAllAnalysisGroupStates(analysisGroupStates);
 		logger.info(AnalysisGroupState.toJsonArray(results));
 	}
 
-	//@Test
-	public void SimpleTest_2(){
+	// @Test
+	public void SimpleTest_2() {
 
 		String json1 = "{\"id\":12250,\"ignored\":false,\"lsKind\":\"Dose Response\",\"lsTransaction\":98,\"lsType\":\"data\",\"lsTypeAndKind\":\"data_Dose Response\",\"lsValues\":[{\"id\":21090,\"ignored\":false,\"lsKind\":\"curve id\",\"lsTransaction\":98,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_curve id\",\"operatorType\":\"comparison\",\"operatorTypeAndKind\":\"comparison_null\",\"publicData\":true,\"recordedBy\":\"jmcneil\",\"recordedDate\":1378922450000,\"stringValue\":\"b_AG-00000504\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"id\":21094,\"ignored\":false,\"lsKind\":\"EC50\",\"lsTransaction\":98,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_EC50\",\"numericValue\":0.525047,\"operatorType\":\"comparison\",\"operatorTypeAndKind\":\"comparison_null\",\"publicData\":true,\"recordedBy\":\"jmcneil\",\"recordedDate\":1378922450000,\"unitKind\":\"uM\",\"unitTypeAndKind\":\"null_uM\",\"version\":0},{\"id\":21093,\"ignored\":false,\"lsKind\":\"Min\",\"lsTransaction\":98,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_Min\",\"numericValue\":0,\"operatorType\":\"comparison\",\"operatorTypeAndKind\":\"comparison_null\",\"publicData\":true,\"recordedBy\":\"jmcneil\",\"recordedDate\":1378922450000,\"unitKind\":\"efficacy\",\"unitTypeAndKind\":\"null_efficacy\",\"version\":0},{\"id\":21095,\"ignored\":false,\"lsKind\":\"Max\",\"lsTransaction\":98,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_Max\",\"numericValue\":100,\"operatorType\":\"comparison\",\"operatorTypeAndKind\":\"comparison_null\",\"publicData\":true,\"recordedBy\":\"jmcneil\",\"recordedDate\":1378922450000,\"unitKind\":\"efficacy\",\"unitTypeAndKind\":\"null_efficacy\",\"version\":0},{\"id\":21097,\"ignored\":false,\"lsKind\":\"Hill slope\",\"lsTransaction\":98,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_Hill slope\",\"numericValue\":0.986075,\"operatorType\":\"comparison\",\"operatorTypeAndKind\":\"comparison_null\",\"publicData\":true,\"recordedBy\":\"jmcneil\",\"recordedDate\":1378922450000,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"id\":21092,\"ignored\":false,\"lsKind\":\"Rendering Hint\",\"lsTransaction\":98,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_Rendering Hint\",\"operatorType\":\"comparison\",\"operatorTypeAndKind\":\"comparison_null\",\"publicData\":false,\"recordedBy\":\"jmcneil\",\"recordedDate\":1378922450000,\"stringValue\":\"4 parameter D-R\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeValue\":\"CMPD-0000001-02\",\"id\":21096,\"ignored\":false,\"lsKind\":\"batch code\",\"lsTransaction\":98,\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_batch code\",\"operatorType\":\"comparison\",\"operatorTypeAndKind\":\"comparison_null\",\"publicData\":false,\"recordedBy\":\"jmcneil\",\"recordedDate\":1378922450000,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"id\":21091,\"ignored\":false,\"lsKind\":\"category\",\"lsTransaction\":98,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_Category\",\"operatorType\":\"comparison\",\"operatorTypeAndKind\":\"comparison_null\",\"publicData\":true,\"recordedBy\":\"jmcneil\",\"recordedDate\":1378922450000,\"stringValue\":\"good\",\"unitTypeAndKind\":\"null_null\",\"version\":0}],\"recordedBy\":\"jmcneil\",\"recordedDate\":1378922450000,\"version\":null}";
 		String json = "{\"id\":12250,\"ignored\":false,\"lsKind\":\"Dose Response\",\"lsTransaction\":98,\"lsType\":\"data\",\"lsTypeAndKind\":\"data_Dose Response\",\"lsValues\":[],\"recordedBy\":\"jmcneil\",\"recordedDate\":1378897250000,\"version\":1,\"id\":669045,\"ignored\":false,\"lsKind\":\"Dose Response\",\"lsTransaction\":98,\"lsType\":\"data\",\"lsTypeAndKind\":\"data_Dose Response\",\"lsValues\":[{\"id\":21091,\"ignored\":false,\"lsKind\":\"category\",\"lsTransaction\":98,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_Category\",\"operatorType\":\"comparison\",\"operatorTypeAndKind\":\"comparison_null\",\"publicData\":true,\"recordedBy\":\"jmcneil\",\"recordedDate\":1378897250000,\"stringValue\":\"good\",\"unitTypeAndKind\":\"null_null\",\"version\":1},{\"id\":21093,\"ignored\":false,\"lsKind\":\"Min\",\"lsTransaction\":98,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_Min\",\"numericValue\":0,\"operatorType\":\"comparison\",\"operatorTypeAndKind\":\"comparison_null\",\"publicData\":true,\"recordedBy\":\"jmcneil\",\"recordedDate\":1378897250000,\"unitKind\":\"efficacy\",\"unitTypeAndKind\":\"null_efficacy\",\"version\":1},{\"id\":21095,\"ignored\":false,\"lsKind\":\"Max\",\"lsTransaction\":98,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_Max\",\"numericValue\":100,\"operatorType\":\"comparison\",\"operatorTypeAndKind\":\"comparison_null\",\"publicData\":true,\"recordedBy\":\"jmcneil\",\"recordedDate\":1378897250000,\"unitKind\":\"efficacy\",\"unitTypeAndKind\":\"null_efficacy\",\"version\":1},{\"id\":21090,\"ignored\":false,\"lsKind\":\"curve id\",\"lsTransaction\":98,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_curve id\",\"operatorType\":\"comparison\",\"operatorTypeAndKind\":\"comparison_null\",\"publicData\":true,\"recordedBy\":\"jmcneil\",\"recordedDate\":1378897250000,\"stringValue\":\"b_AG-00000504\",\"unitTypeAndKind\":\"null_null\",\"version\":1},{\"id\":21092,\"ignored\":false,\"lsKind\":\"Rendering Hint\",\"lsTransaction\":98,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_Rendering Hint\",\"operatorType\":\"comparison\",\"operatorTypeAndKind\":\"comparison_null\",\"publicData\":false,\"recordedBy\":\"jmcneil\",\"recordedDate\":1378897250000,\"stringValue\":\"4 parameter D-R\",\"unitTypeAndKind\":\"null_null\",\"version\":1},{\"codeValue\":\"CMPD-0000001-02\",\"id\":21096,\"ignored\":false,\"lsKind\":\"batch code\",\"lsTransaction\":98,\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_batch code\",\"operatorType\":\"comparison\",\"operatorTypeAndKind\":\"comparison_null\",\"publicData\":false,\"recordedBy\":\"jmcneil\",\"recordedDate\":1378897250000,\"unitTypeAndKind\":\"null_null\",\"version\":1},{\"id\":21094,\"ignored\":false,\"lsKind\":\"EC50\",\"lsTransaction\":98,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_EC50\",\"numericValue\":0.525047,\"operatorType\":\"comparison\",\"operatorTypeAndKind\":\"comparison_null\",\"publicData\":true,\"recordedBy\":\"jmcneil\",\"recordedDate\":1378897250000,\"unitKind\":\"uM\",\"unitTypeAndKind\":\"null_uM\",\"version\":1},{\"id\":21097,\"ignored\":false,\"lsKind\":\"Hill slope\",\"lsTransaction\":98,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_Hill slope\",\"numericValue\":0.986075,\"operatorType\":\"comparison\",\"operatorTypeAndKind\":\"comparison_null\",\"publicData\":true,\"recordedBy\":\"jmcneil\",\"recordedDate\":1378897250000,\"unitTypeAndKind\":\"null_null\",\"version\":1}],\"recordedBy\":\"jmcneil\",\"recordedDate\":1378897250000,\"version\":1}";
 
 		AnalysisGroupState analysisGroupState = AnalysisGroupState.fromJsonToAnalysisGroupState(json);
-		if (analysisGroupState.getAnalysisGroup() == null){
+		if (analysisGroupState.getAnalysisGroup() == null) {
 			AnalysisGroupState oldAGS = AnalysisGroupState.findAnalysisGroupState(analysisGroupState.getId());
 			AnalysisGroup ag = AnalysisGroup.findAnalysisGroup(oldAGS.getAnalysisGroup().getId());
-			analysisGroupState.setAnalysisGroup(ag);			
+			analysisGroupState.setAnalysisGroup(ag);
 		}
-		for (AnalysisGroupValue agv : analysisGroupState.getLsValues()){
-			if (agv.getLsState() == null){
+		for (AnalysisGroupValue agv : analysisGroupState.getLsValues()) {
+			if (agv.getLsState() == null) {
 				agv.setLsState(analysisGroupState);
 			}
 		}
@@ -71,41 +72,64 @@ public void SimpleTest_2(){
 	}
 
 	@Test
-	public void SimpleTest_POST_3(){
-
-		//String json = "[{\"analysisGroup\":{\"id\":485682,\"version\":0},\"lsValues\":[{\"lsState\":null,\"lsType\":\"numericValue\",\"lsKind\":\"Max\",\"stringValue\":null,\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":89.2453333333333,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":\"Standard Error\",\"numberOfReplicates\":null,\"unitKind\":\"efficacy\",\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"bbolt\",\"recordedDate\":1394138174000,\"lsTransaction\":347},{\"lsState\":null,\"lsType\":\"numericValue\",\"lsKind\":\"EC50\",\"stringValue\":null,\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":\">\",\"operatorType\":\"comparison\",\"numericValue\":20,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":\"Standard Error\",\"numberOfReplicates\":null,\"unitKind\":\"uM\",\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"bbolt\",\"recordedDate\":1394138174000,\"lsTransaction\":347},{\"lsState\":null,\"lsType\":\"codeValue\",\"lsKind\":\"batch code\",\"stringValue\":null,\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":\"Standard Error\",\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":\"CMPD-0000008-01\",\"recordedBy\":\"bbolt\",\"recordedDate\":1394138174000,\"lsTransaction\":347},{\"lsState\":null,\"lsType\":\"stringValue\",\"lsKind\":\"curve id\",\"stringValue\":\"AG-00000511_347\",\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":\"Standard Error\",\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"bbolt\",\"recordedDate\":1394138174000,\"lsTransaction\":347},{\"lsState\":null,\"lsType\":\"numericValue\",\"lsKind\":\"Fitted Slope\",\"stringValue\":null,\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":-0.424495356173893,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":\"Standard Error\",\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"bbolt\",\"recordedDate\":1394138174000,\"lsTransaction\":347},{\"lsState\":null,\"lsType\":\"numericValue\",\"lsKind\":\"Fitted Min\",\"stringValue\":null,\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":-66.4989493376197,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":\"Standard Error\",\"numberOfReplicates\":null,\"unitKind\":\"efficacy\",\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"bbolt\",\"recordedDate\":1394138174000,\"lsTransaction\":347},{\"lsState\":null,\"lsType\":\"numericValue\",\"lsKind\":\"Fitted Max\",\"stringValue\":null,\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":124.570888685824,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":\"Standard Error\",\"numberOfReplicates\":null,\"unitKind\":\"efficacy\",\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"bbolt\",\"recordedDate\":1394138174000,\"lsTransaction\":347},{\"lsState\":null,\"lsType\":\"numericValue\",\"lsKind\":\"Fitted EC50\",\"stringValue\":null,\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":0.467531341507942,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":\"Standard Error\",\"numberOfReplicates\":null,\"unitKind\":\"uM\",\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"bbolt\",\"recordedDate\":1394138174000,\"lsTransaction\":347},{\"lsState\":null,\"lsType\":\"numericValue\",\"lsKind\":\"SSE\",\"stringValue\":null,\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":1446.67303943487,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":\"Standard Error\",\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"bbolt\",\"recordedDate\":1394138174000,\"lsTransaction\":347},{\"lsState\":null,\"lsType\":\"numericValue\",\"lsKind\":\"SST\",\"stringValue\":null,\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":41819.4245830937,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":\"Standard Error\",\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"bbolt\",\"recordedDate\":1394138174000,\"lsTransaction\":347},{\"lsState\":null,\"lsType\":\"numericValue\",\"lsKind\":\"rSquared\",\"stringValue\":null,\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":0.965406672763744,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":\"Standard Error\",\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"bbolt\",\"recordedDate\":1394138174000,\"lsTransaction\":347},{\"lsState\":null,\"lsType\":\"stringValue\",\"lsKind\":\"category\",\"stringValue\":\"Inactive\",\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":\"Standard Error\",\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"bbolt\",\"recordedDate\":1394138174000,\"lsTransaction\":347},{\"lsState\":null,\"lsType\":\"stringValue\",\"lsKind\":\"flag\",\"stringValue\":\"algorithm\",\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":\"Standard Error\",\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"bbolt\",\"recordedDate\":1394138174000,\"lsTransaction\":347}],\"recordedBy\":\"bbolt\",\"lsType\":\"data\",\"lsKind\":\"Dose Response\",\"comments\":\"\",\"lsTransaction\":347,\"ignored\":false,\"recordedDate\":1394138890000}]";
+	public void SimpleTest_POST_3() {
+
+		// String json =
+		// "[{\"analysisGroup\":{\"id\":485682,\"version\":0},\"lsValues\":[{\"lsState\":null,\"lsType\":\"numericValue\",\"lsKind\":\"Max\",\"stringValue\":null,\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":89.2453333333333,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":\"Standard
+		// Error\",\"numberOfReplicates\":null,\"unitKind\":\"efficacy\",\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"bbolt\",\"recordedDate\":1394138174000,\"lsTransaction\":347},{\"lsState\":null,\"lsType\":\"numericValue\",\"lsKind\":\"EC50\",\"stringValue\":null,\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":\">\",\"operatorType\":\"comparison\",\"numericValue\":20,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":\"Standard
+		// Error\",\"numberOfReplicates\":null,\"unitKind\":\"uM\",\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"bbolt\",\"recordedDate\":1394138174000,\"lsTransaction\":347},{\"lsState\":null,\"lsType\":\"codeValue\",\"lsKind\":\"batch
+		// code\",\"stringValue\":null,\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":\"Standard
+		// Error\",\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":\"CMPD-0000008-01\",\"recordedBy\":\"bbolt\",\"recordedDate\":1394138174000,\"lsTransaction\":347},{\"lsState\":null,\"lsType\":\"stringValue\",\"lsKind\":\"curve
+		// id\",\"stringValue\":\"AG-00000511_347\",\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":\"Standard
+		// Error\",\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"bbolt\",\"recordedDate\":1394138174000,\"lsTransaction\":347},{\"lsState\":null,\"lsType\":\"numericValue\",\"lsKind\":\"Fitted
+		// Slope\",\"stringValue\":null,\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":-0.424495356173893,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":\"Standard
+		// Error\",\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"bbolt\",\"recordedDate\":1394138174000,\"lsTransaction\":347},{\"lsState\":null,\"lsType\":\"numericValue\",\"lsKind\":\"Fitted
+		// Min\",\"stringValue\":null,\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":-66.4989493376197,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":\"Standard
+		// Error\",\"numberOfReplicates\":null,\"unitKind\":\"efficacy\",\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"bbolt\",\"recordedDate\":1394138174000,\"lsTransaction\":347},{\"lsState\":null,\"lsType\":\"numericValue\",\"lsKind\":\"Fitted
+		// Max\",\"stringValue\":null,\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":124.570888685824,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":\"Standard
+		// Error\",\"numberOfReplicates\":null,\"unitKind\":\"efficacy\",\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"bbolt\",\"recordedDate\":1394138174000,\"lsTransaction\":347},{\"lsState\":null,\"lsType\":\"numericValue\",\"lsKind\":\"Fitted
+		// EC50\",\"stringValue\":null,\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":0.467531341507942,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":\"Standard
+		// Error\",\"numberOfReplicates\":null,\"unitKind\":\"uM\",\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"bbolt\",\"recordedDate\":1394138174000,\"lsTransaction\":347},{\"lsState\":null,\"lsType\":\"numericValue\",\"lsKind\":\"SSE\",\"stringValue\":null,\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":1446.67303943487,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":\"Standard
+		// Error\",\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"bbolt\",\"recordedDate\":1394138174000,\"lsTransaction\":347},{\"lsState\":null,\"lsType\":\"numericValue\",\"lsKind\":\"SST\",\"stringValue\":null,\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":41819.4245830937,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":\"Standard
+		// Error\",\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"bbolt\",\"recordedDate\":1394138174000,\"lsTransaction\":347},{\"lsState\":null,\"lsType\":\"numericValue\",\"lsKind\":\"rSquared\",\"stringValue\":null,\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":0.965406672763744,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":\"Standard
+		// Error\",\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"bbolt\",\"recordedDate\":1394138174000,\"lsTransaction\":347},{\"lsState\":null,\"lsType\":\"stringValue\",\"lsKind\":\"category\",\"stringValue\":\"Inactive\",\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":\"Standard
+		// Error\",\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"bbolt\",\"recordedDate\":1394138174000,\"lsTransaction\":347},{\"lsState\":null,\"lsType\":\"stringValue\",\"lsKind\":\"flag\",\"stringValue\":\"algorithm\",\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":\"Standard
+		// Error\",\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"bbolt\",\"recordedDate\":1394138174000,\"lsTransaction\":347}],\"recordedBy\":\"bbolt\",\"lsType\":\"data\",\"lsKind\":\"Dose
+		// Response\",\"comments\":\"\",\"lsTransaction\":347,\"ignored\":false,\"recordedDate\":1394138890000}]";
 		String json = "[{\"analysisGroup\":{\"id\":233,\"version\":0},\"lsValues\":null,\"recordedBy\":\"smeyer\",\"lsType\":\"data\",\"lsKind\":\"results\",\"lsTransaction\":71,\"ignored\":false,\"recordedDate\":1381939115000},{\"analysisGroup\":{\"id\":234,\"version\":0},\"lsValues\":null,\"recordedBy\":\"smeyer\",\"lsType\":\"data\",\"lsKind\":\"results\",\"lsTransaction\":71,\"ignored\":false,\"recordedDate\":1381939115000},{\"analysisGroup\":{\"id\":235,\"version\":0},\"lsValues\":null,\"recordedBy\":\"smeyer\",\"lsType\":\"data\",\"lsKind\":\"results\",\"lsTransaction\":71,\"ignored\":false,\"recordedDate\":1381939115000},{\"analysisGroup\":{\"id\":236,\"version\":0},\"lsValues\":null,\"recordedBy\":\"smeyer\",\"lsType\":\"data\",\"lsKind\":\"results\",\"lsTransaction\":71,\"ignored\":false,\"recordedDate\":1381939115000},{\"analysisGroup\":{\"id\":237,\"version\":0},\"lsValues\":null,\"recordedBy\":\"smeyer\",\"lsType\":\"data\",\"lsKind\":\"results\",\"lsTransaction\":71,\"ignored\":false,\"recordedDate\":1381939115000},{\"analysisGroup\":{\"id\":238,\"version\":0},\"lsValues\":null,\"recordedBy\":\"smeyer\",\"lsType\":\"data\",\"lsKind\":\"results\",\"lsTransaction\":71,\"ignored\":false,\"recordedDate\":1381939115000},{\"analysisGroup\":{\"id\":239,\"version\":0},\"lsValues\":null,\"recordedBy\":\"smeyer\",\"lsType\":\"data\",\"lsKind\":\"results\",\"lsTransaction\":71,\"ignored\":false,\"recordedDate\":1381939115000},{\"analysisGroup\":{\"id\":240,\"version\":0},\"lsValues\":null,\"recordedBy\":\"smeyer\",\"lsType\":\"data\",\"lsKind\":\"results\",\"lsTransaction\":71,\"ignored\":false,\"recordedDate\":1381939115000}]";
 
-		Collection<AnalysisGroupState> analysisGroupStates = AnalysisGroupState.fromJsonArrayToAnalysisGroupStates(json);
+		Collection<AnalysisGroupState> analysisGroupStates = AnalysisGroupState
+				.fromJsonArrayToAnalysisGroupStates(json);
 		logger.info(AnalysisGroupState.toJsonArray(analysisGroupStates));
-		for (AnalysisGroupState analysisGroupState : analysisGroupStates){
-			if (analysisGroupState.getAnalysisGroup() == null){
+		for (AnalysisGroupState analysisGroupState : analysisGroupStates) {
+			if (analysisGroupState.getAnalysisGroup() == null) {
 				logger.info("the analysis group is null");
 			}
-			if (analysisGroupState.getLsValues() != null){
+			if (analysisGroupState.getLsValues() != null) {
 				logger.error("the lsValues are null");
 				logger.info("number of stateValues: " + analysisGroupState.getLsValues().size());
-				for (AnalysisGroupValue agv : analysisGroupState.getLsValues()){
-					if (agv.getLsState() == null){
+				for (AnalysisGroupValue agv : analysisGroupState.getLsValues()) {
+					if (agv.getLsState() == null) {
 						logger.info("the analysis group state in values is null");
-						//						agv.setLsState(analysisGroupState);
+						// agv.setLsState(analysisGroupState);
 					}
-				}			
+				}
 			}
 
-			//analysisGroupState.persist();
+			// analysisGroupState.persist();
 			logger.info(analysisGroupState.toJson());
 		}
 
 	}
-	
+
 	@Test
 	@Transactional
 	public void createAnalysisGroupStateByAnalysisGroupIdAndStateTypeKindTest() {
 		Long analysisGroupId = 3L;
 		String lsType = "metadata";
 		String lsKind = "analysisGroup metadata";
-		AnalysisGroupState analysisGroupState = analysisGroupStateService.createAnalysisGroupStateByAnalysisGroupIdAndStateTypeKind(analysisGroupId, lsType, lsKind);
+		AnalysisGroupState analysisGroupState = analysisGroupStateService
+				.createAnalysisGroupStateByAnalysisGroupIdAndStateTypeKind(analysisGroupId, lsType, lsKind);
 		Assert.assertNotNull(analysisGroupState);
 		logger.info(analysisGroupState.toJson());
 	}
diff --git a/src/test/java/com/labsynch/labseer/service/AnalysisGroupValueServiceTest.java b/src/test/java/com/labsynch/labseer/service/AnalysisGroupValueServiceTest.java
index 4ce3da303..cb5ab68df 100755
--- a/src/test/java/com/labsynch/labseer/service/AnalysisGroupValueServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/AnalysisGroupValueServiceTest.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import java.io.BufferedReader;
@@ -44,25 +43,24 @@
 
 import flexjson.JSONTokener;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class AnalysisGroupValueServiceTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(AnalysisGroupValueServiceTest.class);
 
-
 	@Autowired
 	private LsThingService lsThingService;
-	
+
 	@Autowired
 	private AnalysisGroupValueService analysisGroupValueService;
 
-	//@Test
-	public void SimpleTest_1(){
+	// @Test
+	public void SimpleTest_1() {
 		AnalysisGroupState analysisGroupState = AnalysisGroupState.findAnalysisGroupState(5527L);
-		//		logger.info(analysisGroupState.toJson());
+		// logger.info(analysisGroupState.toJson());
 		String json = "{            \"lsState\": {\"id\":1324,\"version\":0},            \"lsType\": \"numericValue\",            \"lsKind\": \"B/P Ratio\",            \"stringValue\": null,            \"fileValue\": null,            \"urlValue\": null,            \"dateValue\": null,            \"clobValue\": null,            \"blobValue\": null,            \"operatorKind\": null,            \"operatorType\": \"comparison\",            \"numericValue\": 0.00398036849215413,            \"sigFigs\": null,            \"uncertainty\": null,            \"uncertaintyType\": null,            \"numberOfReplicates\": null,            \"unitKind\": null,            \"comments\": null,            \"ignored\": false,            \"publicData\": true,            \"codeValue\": null,            \"recordedBy\": \"smeyer\",            \"recordedDate\": 1379364052000,            \"lsTransaction\": 11564          } ";
 		logger.info("incoming json:" + json);
 		AnalysisGroupValue analysisGroupValue = AnalysisGroupValue.fromJsonToAnalysisGroupValue(json);
@@ -73,47 +71,47 @@ public void SimpleTest_1(){
 
 	}
 
-	//	@Test
-	public void SimpleTest_2(){
+	// @Test
+	public void SimpleTest_2() {
 		AnalysisGroupState analysisGroupState = AnalysisGroupState.findAnalysisGroupState(5527L);
-		//		logger.info(analysisGroupState.toJson());
+		// logger.info(analysisGroupState.toJson());
 		String json = "[{            \"lsState\": {\"id\":1324,\"version\":0},            \"lsType\": \"numericValue\",            \"lsKind\": \"B/P Ratio\",            \"stringValue\": null,            \"fileValue\": null,            \"urlValue\": null,            \"dateValue\": null,            \"clobValue\": null,            \"blobValue\": null,            \"operatorKind\": null,            \"operatorType\": \"comparison\",            \"numericValue\": 0.00398036849215413,            \"sigFigs\": null,            \"uncertainty\": null,            \"uncertaintyType\": null,            \"numberOfReplicates\": null,            \"unitKind\": null,            \"comments\": null,            \"ignored\": false,            \"publicData\": true,            \"codeValue\": null,            \"recordedBy\": \"smeyer\",            \"recordedDate\": 1379364052000,            \"lsTransaction\": 11564          } ]";
 		logger.info("incoming json:" + json);
-		Collection<AnalysisGroupValue> analysisGroupValues = AnalysisGroupValue.fromJsonArrayToAnalysisGroupValues(json);
-		for (AnalysisGroupValue analysisGroupValue : analysisGroupValues){
+		Collection<AnalysisGroupValue> analysisGroupValues = AnalysisGroupValue
+				.fromJsonArrayToAnalysisGroupValues(json);
+		for (AnalysisGroupValue analysisGroupValue : analysisGroupValues) {
 			logger.info("numericValue: " + analysisGroupValue.getNumericValue());
-			logger.info(analysisGroupValue.toPrettyJson());        	
+			logger.info(analysisGroupValue.toPrettyJson());
 		}
 
 	}
 
-	//@Test
-	public void SimpleTest_3(){
+	// @Test
+	public void SimpleTest_3() {
 		String json = "[   {     \"codeName\": \"AG-00219240\",     \"lsType\": \"default\",     \"lsKind\": \"Generic\",     \"experiment\": {       \"id\": 206273,       \"version\": 1     },     \"recordedBy\": \"smeyer\",     \"lsTransaction\": 12426,     \"treatmentGroups\": null,     \"lsStates\": [       {         \"analysisGroup\": null,         \"lsValues\": [           {             \"lsState\": null,             \"lsType\": \"numericValue\",             \"lsKind\": \"%Control\",             \"stringValue\": null,             \"fileValue\": null,             \"urlValue\": null,             \"dateValue\": null,             \"clobValue\": null,             \"blobValue\": null,             \"operatorKind\": null,             \"operatorType\": \"comparison\",             \"numericValue\": 68.87,             \"sigFigs\": null,             \"uncertainty\": null,             \"uncertaintyType\": null,             \"numberOfReplicates\": null,             \"unitKind\": null,             \"comments\": null,             \"ignored\": false,             \"publicData\": true,             \"codeValue\": null,             \"recordedBy\": \"smeyer\",             \"recordedDate\": 1380132462000,             \"lsTransaction\": 12426           }         ],         \"recordedBy\": \"smeyer\",         \"lsType\": \"data\",         \"lsKind\": \"Generic\",         \"comments\": \"\",         \"lsTransaction\": 12426,         \"ignored\": false,         \"recordedDate\": 1380132462000       }     ],     \"recordedDate\": 1380132462000   } ]";
 		logger.info("incoming json:" + json);
 		Collection<AnalysisGroup> analysisGroups = AnalysisGroup.fromJsonArrayToAnalysisGroups(json);
-		//		for (AnalysisGroup analysisGroup : analysisGroups){
-		//			logger.info("numericValue: " + analysisGroupValue.getNumericValue());
-		//			logger.info(analysisGroupValue.toPrettyJson());        	
-		//		}
+		// for (AnalysisGroup analysisGroup : analysisGroups){
+		// logger.info("numericValue: " + analysisGroupValue.getNumericValue());
+		// logger.info(analysisGroupValue.toPrettyJson());
+		// }
 
 	}
 
-	//@Test
+	// @Test
 	@Transactional
-	public void SaveAnalysisGroupValuesJackson() throws JsonParseException, IOException{
+	public void SaveAnalysisGroupValuesJackson() throws JsonParseException, IOException {
 
 		String fileName = "/Users/goshiro2014/Documents/McNeilco_2012/clients/Development/acas/agdata.json";
 
 		long startTime = System.currentTimeMillis();
 
 		int batchSize = 1000;
-		int i = 0;		
+		int i = 0;
 		BufferedReader br = new BufferedReader(new FileReader(fileName));
 
-
 		// Initialize 'stream', e.g.:
-		//		 InputStream stream = new FileInputStream(fileName);
+		// InputStream stream = new FileInputStream(fileName);
 
 		ObjectMapper mapper = new ObjectMapper();
 		JsonFactory jsonFactory = mapper.getFactory();
@@ -122,82 +120,82 @@ public void SaveAnalysisGroupValuesJackson() throws JsonParseException, IOExcept
 		long currentTime = System.currentTimeMillis();
 		while ((token = jp.nextToken()) != null) {
 			switch (token) {
-			case START_OBJECT:
-				JsonNode node = jp.readValueAsTree();
-				// ... do something with the object
-				AnalysisGroupValue analysisGroupValue = AnalysisGroupValue.fromJsonToAnalysisGroupValue(node.toString());
-				analysisGroupValue.setId(null);
-				analysisGroupValue.persist();
-				if ( i % batchSize == 0 ) { 
-					long loopTime = System.currentTimeMillis() - currentTime ;
-					logger.debug(i + "  " + loopTime + "  Read object: " + node.toString());
-					analysisGroupValue.flush();
-					analysisGroupValue.clear();
-					currentTime = System.currentTimeMillis();
-				}
-				i++;
-				break;
-			case END_ARRAY:
-				break;
-			case END_OBJECT:
-				break;
-			case FIELD_NAME:
-				break;
-			case NOT_AVAILABLE:
-				break;
-			case START_ARRAY:
-				break;
-			case VALUE_EMBEDDED_OBJECT:
-				break;
-			case VALUE_FALSE:
-				break;
-			case VALUE_NULL:
-				break;
-			case VALUE_NUMBER_FLOAT:
-				break;
-			case VALUE_NUMBER_INT:
-				break;
-			case VALUE_STRING:
-				break;
-			case VALUE_TRUE:
-				break;
-			default:
-				break;
+				case START_OBJECT:
+					JsonNode node = jp.readValueAsTree();
+					// ... do something with the object
+					AnalysisGroupValue analysisGroupValue = AnalysisGroupValue
+							.fromJsonToAnalysisGroupValue(node.toString());
+					analysisGroupValue.setId(null);
+					analysisGroupValue.persist();
+					if (i % batchSize == 0) {
+						long loopTime = System.currentTimeMillis() - currentTime;
+						logger.debug(i + "  " + loopTime + "  Read object: " + node.toString());
+						analysisGroupValue.flush();
+						analysisGroupValue.clear();
+						currentTime = System.currentTimeMillis();
+					}
+					i++;
+					break;
+				case END_ARRAY:
+					break;
+				case END_OBJECT:
+					break;
+				case FIELD_NAME:
+					break;
+				case NOT_AVAILABLE:
+					break;
+				case START_ARRAY:
+					break;
+				case VALUE_EMBEDDED_OBJECT:
+					break;
+				case VALUE_FALSE:
+					break;
+				case VALUE_NULL:
+					break;
+				case VALUE_NUMBER_FLOAT:
+					break;
+				case VALUE_NUMBER_INT:
+					break;
+				case VALUE_STRING:
+					break;
+				case VALUE_TRUE:
+					break;
+				default:
+					break;
 			}
 		}
 
-
-
 		long endTime = System.currentTimeMillis();
 		long totalTime = endTime - startTime;
 		logger.info("total elapsed time = " + totalTime + " miliseconds.");
 
 	}
 
-	//@Test
-	//@Transactional
-	public void SaveAnalysisGroupValues_3() throws FileNotFoundException{
+	// @Test
+	// @Transactional
+	public void SaveAnalysisGroupValues_3() throws FileNotFoundException {
 
 		String fileName = "/tmp/agdata.json";
 
 		long startTime = System.currentTimeMillis();
 
 		int batchSize = 50;
-		int i = 0;		
+		int i = 0;
 		BufferedReader br = new BufferedReader(new FileReader(fileName));
-		JSONTokener jsonTokens = new JSONTokener(br);		
+		JSONTokener jsonTokens = new JSONTokener(br);
 		Object token;
 		char delimiter;
 		char END_OF_ARRAY = ']';
-		while (jsonTokens.more()){
+		while (jsonTokens.more()) {
 			delimiter = jsonTokens.nextClean();
-			if (delimiter != END_OF_ARRAY){
+			if (delimiter != END_OF_ARRAY) {
 				token = jsonTokens.nextValue();
 				logger.debug(token.toString());
-				AnalysisGroupValue analysisGroupValue = AnalysisGroupValue.fromJsonToAnalysisGroupValue(token.toString());
+				AnalysisGroupValue analysisGroupValue = AnalysisGroupValue
+						.fromJsonToAnalysisGroupValue(token.toString());
 				analysisGroupValue.setId(null);
 				analysisGroupValue.persist();
-				if ( i % batchSize == 0 ) { 
+				if (i % batchSize == 0) {
 					analysisGroupValue.flush();
 					analysisGroupValue.clear();
 				}
@@ -211,67 +209,70 @@ public void SaveAnalysisGroupValues_3() throws FileNotFoundException{
 
 	}
 
-	//@Test
+	// @Test
 	@Transactional
-	public void GetAnalysisGroupByCodeValue_4(){
+	public void GetAnalysisGroupByCodeValue_4() {
 
 		String codeValue = "FL0029938-1-1";
-		//		List<AnalysisGroupValue> agValues = AnalysisGroupValue.findAnalysisGroupValuesByCodeValueEquals(codeValue).getResultList();
-		List<AnalysisGroupValueDTO> agValues = AnalysisGroupValue.findAnalysisGroupValueDTO(codeValue, true).getResultList();
+		// List<AnalysisGroupValue> agValues =
+		// AnalysisGroupValue.findAnalysisGroupValuesByCodeValueEquals(codeValue).getResultList();
+		List<AnalysisGroupValueDTO> agValues = AnalysisGroupValue.findAnalysisGroupValueDTO(codeValue, true)
+				.getResultList();
 
 		logger.info("number of agValues: " + agValues.size());
 
-		for (Object agValue : agValues){
+		for (Object agValue : agValues) {
 			logger.info(agValue.toString());
 
 		}
 
-		//		logger.info("AnalysisGroupValues: " + AnalysisGroupValue.toJsonArray(agValues));
-		//		
-		//		for (AnalysisGroupValue agValue : agValues){
-		//			Experiment experiment = Experiment.findExperiment(agValue.getLsState().getAnalysisGroup().getExperiment().getId());
-		//			Protocol protocol = Protocol.findProtocol(experiment.getProtocol().getId());
-		//			
-		//		}
-
+		// logger.info("AnalysisGroupValues: " +
+		// AnalysisGroupValue.toJsonArray(agValues));
+		//
+		// for (AnalysisGroupValue agValue : agValues){
+		// Experiment experiment =
+		// Experiment.findExperiment(agValue.getLsState().getAnalysisGroup().getExperiment().getId());
+		// Protocol protocol = Protocol.findProtocol(experiment.getProtocol().getId());
+		//
+		// }
 
 	}
 
-	//@Test
+	// @Test
 	@Transactional
-	public void GetPrefferedName_5(){
+	public void GetPrefferedName_5() {
 
 		String thingName = "FL0029938-1-1";
 
-		List<LsThingLabel> names = LsThingLabel.findLsThingLabelsByLabelTextEqualsAndIgnoredNot(thingName, true).getResultList();
+		List<LsThingLabel> names = LsThingLabel.findLsThingLabelsByLabelTextEqualsAndIgnoredNot(thingName, true)
+				.getResultList();
 
 		boolean foundPreferred = false;
 		String preferredName = null;
-		for (LsThingLabel name : names){
-			if (name.isPreferred()){
+		for (LsThingLabel name : names) {
+			if (name.isPreferred()) {
 				foundPreferred = true;
 				preferredName = name.getLabelText();
 			}
 		}
-		if (!foundPreferred){
+		if (!foundPreferred) {
 			logger.error("did not find the preferred name");
 		}
 
 		logger.info("the preferred name is " + preferredName);
 
-
 	}
 
-	//@Test
+	// @Test
 	@Transactional
-	public void GetCodeName_6(){
+	public void GetCodeName_6() {
 
 		String thingName = "Project 1";
 
 		List<LsThing> lsThings = LsThing.findLsThingByLabelText(thingName).getResultList();
 
 		logger.info("number of lsThings found " + lsThings.size());
-		for (LsThing lsThing : lsThings){
+		for (LsThing lsThing : lsThings) {
 
 			logger.info("lsThing codeName is : " + lsThing.getId() + "   " + lsThing.getCodeName());
 
@@ -284,7 +285,7 @@ public void GetCodeName_6(){
 		List<LsThing> lsThings2 = LsThing.findLsThingByLabelTextList(thingNameList).getResultList();
 
 		logger.info("number of lsThings2 found " + lsThings2.size());
-		for (LsThing lsThing : lsThings2){
+		for (LsThing lsThing : lsThings2) {
 
 			logger.info("lsThing codeName is : " + lsThing.getId() + "   " + lsThing.getCodeName());
 
@@ -299,28 +300,28 @@ public void GetCodeName_6(){
 		prefNamesCollection.add(prefName1);
 		prefNamesCollection.add(prefName2);
 
-
-
-		PreferredNameResultsDTO results = lsThingService.getGeneCodeNameFromName(PreferredNameDTO.toJsonArray(prefNamesCollection));
+		PreferredNameResultsDTO results = lsThingService
+				.getGeneCodeNameFromName(PreferredNameDTO.toJsonArray(prefNamesCollection));
 		String thingType = "gene";
 		String thingKind = "entrez gene";
 		String labelType = "name";
 		String labelKind = "Entrez Gene ID";
-		PreferredNameResultsDTO results2 = lsThingService.getPreferredNameFromName(thingType, thingKind, labelType, labelKind, PreferredNameDTO.toJsonArray(prefNamesCollection));
+		PreferredNameResultsDTO results2 = lsThingService.getPreferredNameFromName(thingType, thingKind, labelType,
+				labelKind, PreferredNameDTO.toJsonArray(prefNamesCollection));
 
 		logger.info(results.toJson());
 		logger.info("HERE IS RESULTS 2 ------------" + results2.toJson());
 
 		String labelText = "A2M";
-		List<LsThingLabel> ack = LsThingLabel.findLsThingPreferredName("gene", "entrez gene", labelText).getResultList();
+		List<LsThingLabel> ack = LsThingLabel.findLsThingPreferredName("gene", "entrez gene", labelText)
+				.getResultList();
 		logger.info(LsThingLabel.toJsonArray(ack));
 
-
 	}
 
-	//@Test
+	// @Test
 	@Transactional
-	public void GetGenedata_7(){
+	public void GetGenedata_7() {
 
 		String thingType = "gene";
 		String thingKind = "entrez gene";
@@ -328,39 +329,41 @@ public void GetGenedata_7(){
 		String labelKind = "Entrez Gene ID";
 		String labelText = "5";
 
-		List<LsThing> lsThings = LsThing.findLsThingByLabelText(thingType, thingKind, labelType, labelKind, labelText).getResultList();
+		List<LsThing> lsThings = LsThing.findLsThingByLabelText(thingType, thingKind, labelType, labelKind, labelText)
+				.getResultList();
 		LinkedHashSet<String> geneCodeHash = new LinkedHashSet<String>();
-		for (LsThing lsThing : lsThings){
+		for (LsThing lsThing : lsThings) {
 			geneCodeHash.add(lsThing.getCodeName());
 			logger.info("gene code name: " + lsThing.getCodeName());
 		}
 
 		Set<String> geneCodeList = new HashSet<String>();
-//		geneCodeList.addAll(geneCodeHash);
+		// geneCodeList.addAll(geneCodeHash);
 		geneCodeList.add("CMPD-0000123-01");
-		
-		List<AnalysisGroupValueDTO> agValues = AnalysisGroupValue.findAnalysisGroupValueDTO(geneCodeList).getResultList();
+
+		List<AnalysisGroupValueDTO> agValues = AnalysisGroupValue.findAnalysisGroupValueDTO(geneCodeList)
+				.getResultList();
 		logger.info(AnalysisGroupValueDTO.toJsonArray(agValues));
-		
-		for(AnalysisGroupValueDTO agvDTO : agValues){
+
+		for (AnalysisGroupValueDTO agvDTO : agValues) {
 			logger.info(agvDTO.toJson());
 		}
 
-
 	}
-	
+
 	@Test
 	@Transactional
-	public void QueryAnalysisGroupValueByExpIdAndStateTypeKind(){
-			
+	public void QueryAnalysisGroupValueByExpIdAndStateTypeKind() {
+
 		Long experimentId = 9L;
 		String stateType = "data";
 		String stateKind = "Generic";
-		List<AnalysisGroupValue> results = analysisGroupValueService.getAnalysisGroupValuesByExperimentIdAndStateTypeKind(experimentId, stateType, stateKind);
+		List<AnalysisGroupValue> results = analysisGroupValueService
+				.getAnalysisGroupValuesByExperimentIdAndStateTypeKind(experimentId, stateType, stateKind);
 		logger.info(AnalysisGroupValue.toJsonArray(results));
-		assert(results.size() == 11);
+		assert (results.size() == 11);
 	}
-	
+
 	@Test
 	@Transactional
 	public void QueryAnalysisGroupValueByExpIdAndStateTypeKindWithBadData() {
@@ -369,13 +372,14 @@ public void QueryAnalysisGroupValueByExpIdAndStateTypeKindWithBadData() {
 		String stateKind = "experiment metadata";
 		List<AnalysisGroupValue> results = new ArrayList<AnalysisGroupValue>();
 		try {
-			results = analysisGroupValueService.getAnalysisGroupValuesByExperimentIdAndStateTypeKind(experimentId, stateType, stateKind);
-		} catch(IllegalArgumentException ex ) {
+			results = analysisGroupValueService.getAnalysisGroupValuesByExperimentIdAndStateTypeKind(experimentId,
+					stateType, stateKind);
+		} catch (IllegalArgumentException ex) {
 			logger.info(ex.getMessage());
 		}
-		assert(results.size() == 0);
+		assert (results.size() == 0);
 	}
-	
+
 	@Test
 	@Transactional
 	public void QueryAnalysisGroupValueByExpIdAndStateTypeKindWithCodeName() {
@@ -386,56 +390,62 @@ public void QueryAnalysisGroupValueByExpIdAndStateTypeKindWithCodeName() {
 		boolean didCatch = false;
 		try {
 			experiment = Experiment.findExperimentsByCodeNameEquals(experimentCodeName).getSingleResult();
-		} catch(NoResultException nre) {
+		} catch (NoResultException nre) {
 			logger.info(nre.getMessage());
 			didCatch = true;
 		}
 		List<AnalysisGroupValue> results = new ArrayList<AnalysisGroupValue>();
 		try {
-			results = analysisGroupValueService.getAnalysisGroupValuesByExperimentIdAndStateTypeKind(experiment.getId(), stateType, stateKind);
-		} catch(IllegalArgumentException ex ) {
+			results = analysisGroupValueService.getAnalysisGroupValuesByExperimentIdAndStateTypeKind(experiment.getId(),
+					stateType, stateKind);
+		} catch (IllegalArgumentException ex) {
 			logger.info(ex.getMessage());
-			assert(results.size() == 0);
+			assert (results.size() == 0);
 			didCatch = true;
 		}
-		if(!didCatch) assert(results.size() == 11);
+		if (!didCatch)
+			assert (results.size() == 11);
 	}
-	
+
 	@Test
 	@Transactional
-	public void QueryAnalysisGroupValueByExpIdAndStateTypeKindAndValueTypeKind(){
-			
+	public void QueryAnalysisGroupValueByExpIdAndStateTypeKindAndValueTypeKind() {
+
 		Long experimentId = 9L;
 		String stateType = "data";
 		String stateKind = "Generic";
 		String valueType = "numericValue";
 		String valueKind = "solubility";
-		List<AnalysisGroupValue> results = analysisGroupValueService.getAnalysisGroupValuesByExperimentIdAndStateTypeKindAndValueTypeKind(experimentId, stateType, stateKind, valueType, valueKind);
+		List<AnalysisGroupValue> results = analysisGroupValueService
+				.getAnalysisGroupValuesByExperimentIdAndStateTypeKindAndValueTypeKind(experimentId, stateType,
+						stateKind, valueType, valueKind);
 		logger.info(AnalysisGroupValue.toJsonArray(results));
-		assert(results.size() == 2);
+		assert (results.size() == 2);
 	}
-	
-	//@Test
+
+	// @Test
 	@Transactional
 	public void AnalysisGroupValuesToCsv() {
-		List<AnalysisGroupValue> analysisGroupValues = analysisGroupValueService.getAnalysisGroupValuesByExperimentIdAndStateTypeKind(9l, "metadata", "experiment metadata");
+		List<AnalysisGroupValue> analysisGroupValues = analysisGroupValueService
+				.getAnalysisGroupValuesByExperimentIdAndStateTypeKind(9l, "metadata", "experiment metadata");
 		String csvString = analysisGroupValueService.getCsvList(analysisGroupValues);
-		assert(csvString != null && csvString.compareTo("") != 0);
+		assert (csvString != null && csvString.compareTo("") != 0);
 		logger.info(csvString);
 	}
-	
+
 	@Test
 	@Transactional
-	public void QueryAnalysisGroupValueByAnalysisGroupIdAndStateTypeKind(){
-			
+	public void QueryAnalysisGroupValueByAnalysisGroupIdAndStateTypeKind() {
+
 		Long analysisGroupId = 10L;
 		String stateType = "data";
 		String stateKind = "Generic";
-		List<AnalysisGroupValue> results = analysisGroupValueService.getAnalysisGroupValuesByAnalysisGroupIdAndStateTypeKind(analysisGroupId, stateType, stateKind);
+		List<AnalysisGroupValue> results = analysisGroupValueService
+				.getAnalysisGroupValuesByAnalysisGroupIdAndStateTypeKind(analysisGroupId, stateType, stateKind);
 		logger.info(AnalysisGroupValue.toJsonArray(results));
-		assert(results.size() == 11);
+		assert (results.size() == 11);
 	}
-	
+
 	@Test
 	@Transactional
 	public void QueryAnalysisGroupValueByAnalysisGroupIdAndStateTypeKindWithBadData() {
@@ -444,13 +454,14 @@ public void QueryAnalysisGroupValueByAnalysisGroupIdAndStateTypeKindWithBadData(
 		String stateKind = "experiment metadata";
 		List<AnalysisGroupValue> results = new ArrayList<AnalysisGroupValue>();
 		try {
-			results = analysisGroupValueService.getAnalysisGroupValuesByAnalysisGroupIdAndStateTypeKind(analysisGroupId, stateType, stateKind);
-		} catch(IllegalArgumentException ex ) {
+			results = analysisGroupValueService.getAnalysisGroupValuesByAnalysisGroupIdAndStateTypeKind(analysisGroupId,
+					stateType, stateKind);
+		} catch (IllegalArgumentException ex) {
 			logger.info(ex.getMessage());
 		}
-		assert(results.size() == 0);
+		assert (results.size() == 0);
 	}
-	
+
 	@Test
 	@Transactional
 	public void QueryAnalysisGroupValueByAnalysisGroupIdAndStateTypeKindWithCodeName() {
@@ -461,21 +472,23 @@ public void QueryAnalysisGroupValueByAnalysisGroupIdAndStateTypeKindWithCodeName
 		boolean didCatch = false;
 		try {
 			analysisGroup = AnalysisGroup.findAnalysisGroupsByCodeNameEquals(analysisGroupCodeName).getSingleResult();
-		} catch(NoResultException nre) {
+		} catch (NoResultException nre) {
 			logger.info(nre.getMessage());
 			didCatch = true;
 		}
 		List<AnalysisGroupValue> results = new ArrayList<AnalysisGroupValue>();
 		try {
-			results = analysisGroupValueService.getAnalysisGroupValuesByAnalysisGroupIdAndStateTypeKind(analysisGroup.getId(), stateType, stateKind);
-		} catch(IllegalArgumentException ex ) {
+			results = analysisGroupValueService.getAnalysisGroupValuesByAnalysisGroupIdAndStateTypeKind(
+					analysisGroup.getId(), stateType, stateKind);
+		} catch (IllegalArgumentException ex) {
 			logger.info(ex.getMessage());
-			assert(results.size() == 0);
+			assert (results.size() == 0);
 			didCatch = true;
 		}
-		if(!didCatch) assert(results.size() == 11);
+		if (!didCatch)
+			assert (results.size() == 11);
 	}
-	
+
 	@Test
 	@Transactional
 	public void updateAnalysisGroupValueTest() {
@@ -485,7 +498,8 @@ public void updateAnalysisGroupValueTest() {
 		String valueType = "stringValue";
 		String valueKind = "status";
 		String value = "Deleted";
-		AnalysisGroupValue analysisGroupValue = analysisGroupValueService.updateAnalysisGroupValue(idOrCodeName, stateType, stateKind, valueType, valueKind, value);
+		AnalysisGroupValue analysisGroupValue = analysisGroupValueService.updateAnalysisGroupValue(idOrCodeName,
+				stateType, stateKind, valueType, valueKind, value);
 		Assert.assertNotNull(analysisGroupValue);
 		logger.info(analysisGroupValue.toJson());
 	}
diff --git a/src/test/java/com/labsynch/labseer/service/AnalysisGroupValueServiceTest2.java b/src/test/java/com/labsynch/labseer/service/AnalysisGroupValueServiceTest2.java
index eb35f6602..8173db67d 100644
--- a/src/test/java/com/labsynch/labseer/service/AnalysisGroupValueServiceTest2.java
+++ b/src/test/java/com/labsynch/labseer/service/AnalysisGroupValueServiceTest2.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import java.util.HashSet;
@@ -18,55 +17,51 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class AnalysisGroupValueServiceTest2 {
 
-
 	@Autowired
 	private ExperimentService experimentService;
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(AnalysisGroupValueServiceTest2.class);
 
 	private static final int HashSet = 0;
 
-
 	@Autowired
 	private LsThingService lsThingService;
-	
+
 	@Autowired
 	private AnalysisGroupValueService analysisGroupValueService;
 
 	@Test
-	public void SimpleTest_1(){
-		
-		
-		
-//		String searchRequestJSON = "";
-//		ExperimentSearchRequestDTO searchRequest = ExperimentSearchRequestDTO.fromJsonToExperimentSearchRequestDTO(searchRequestJSON );
-		
+	public void SimpleTest_1() {
+
+		// String searchRequestJSON = "";
+		// ExperimentSearchRequestDTO searchRequest =
+		// ExperimentSearchRequestDTO.fromJsonToExperimentSearchRequestDTO(searchRequestJSON
+		// );
+
 		ExperimentSearchRequestDTO searchRequest = new ExperimentSearchRequestDTO();
 		Set<String> experimentCodeList = new HashSet<String>();
 		experimentCodeList.add("EXPT-00000005");
-		searchRequest.setExperimentCodeList(experimentCodeList );
-		
-        logger.debug("converted json: " + searchRequest.toJson());
-        List<AnalysisGroupValueDTO> agValues = null;
-        try {
-            Boolean publicData = false;
-			agValues = experimentService.getFilteredAGData(searchRequest, publicData );
-            logger.debug("number of agvalues found: " + agValues.size());
-            for(AnalysisGroupValueDTO ag : agValues){
-            	logger.info(ag.toPrettyJson());
-            }
-        } catch (Exception e) {
-            logger.error(e.toString());
-        }
+		searchRequest.setExperimentCodeList(experimentCodeList);
+
+		logger.debug("converted json: " + searchRequest.toJson());
+		List<AnalysisGroupValueDTO> agValues = null;
+		try {
+			Boolean publicData = false;
+			agValues = experimentService.getFilteredAGData(searchRequest, publicData);
+			logger.debug("number of agvalues found: " + agValues.size());
+			for (AnalysisGroupValueDTO ag : agValues) {
+				logger.info(ag.toPrettyJson());
+			}
+		} catch (Exception e) {
+			logger.error(e.toString());
+		}
 
 	}
 
-
-
 }
diff --git a/src/test/java/com/labsynch/labseer/service/AuthorServiceTests.java b/src/test/java/com/labsynch/labseer/service/AuthorServiceTests.java
index 7f7c50ae9..0a6ddfccb 100644
--- a/src/test/java/com/labsynch/labseer/service/AuthorServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/AuthorServiceTests.java
@@ -29,8 +29,7 @@ public class AuthorServiceTests {
 
 	@Autowired
 	private AuthorService authorService;
-	
-	
+
 	@Test
 	@Transactional
 	public void getAuthorsByRoleTest() {
@@ -41,7 +40,7 @@ public void getAuthorsByRoleTest() {
 		logger.info(Author.toJsonArray(authors));
 
 	}
-	
+
 	@Test
 	@Transactional
 	public void getAuthorProjectsTest() {
@@ -51,13 +50,12 @@ public void getAuthorProjectsTest() {
 		logger.info("------- Results from getAuthorProjectsTest ----------");
 
 		logger.info(LsThing.toJsonArrayStub(projects));
-		
+
 		Collection<CodeTableDTO> codeTableProjects = authorService.convertProjectsToCodeTables(projects);
 		logger.info(CodeTableDTO.toJsonArray(codeTableProjects));
-		
+
 	}
 
-	
 	@Test
 	@Transactional
 	public void getAuthorizeGroupsAndProjectTest() {
diff --git a/src/test/java/com/labsynch/labseer/service/AutoLabelServiceTest.java b/src/test/java/com/labsynch/labseer/service/AutoLabelServiceTest.java
index 7511c81f4..05f20ef64 100644
--- a/src/test/java/com/labsynch/labseer/service/AutoLabelServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/AutoLabelServiceTest.java
@@ -28,12 +28,13 @@
  */
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class AutoLabelServiceTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(DataDictionaryServiceImpl.class);
-	
+
 	@Autowired
 	private AutoLabelService autoLabelService;
 
@@ -46,20 +47,20 @@ public void testWithKnownParameters() {
 		String thingTypeAndKind = "document_experiment";
 		String labelTypeAndKind = "id_codeName";
 		Long numberOfLabels = 1L;
-		List<AutoLabelDTO> labels = autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels );
+		List<AutoLabelDTO> labels = autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels);
 		logger.debug("label 0: " + labels.get(0).toJson());
 	}
 
 	@Test
 	@Transactional
-	public void testWithUnknownThingKindParameters(){
+	public void testWithUnknownThingKindParameters() {
 		String thingTypeAndKind = "document_test";
 		String labelTypeAndKind = "id_codeName";
 		Long numberOfLabels = 1L;
 		List<AutoLabelDTO> labels;
 		try {
-			labels = autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels );
-		} catch(NoResultException ex) {
+			labels = autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels);
+		} catch (NoResultException ex) {
 			LabelSequence theSequence = new LabelSequence();
 			theSequence.setDigits(6);
 			theSequence.setGroupDigits(false);
@@ -72,25 +73,25 @@ public void testWithUnknownThingKindParameters(){
 			theSequence.setThingTypeAndKind("document_test");
 			theSequence.setVersion(0);
 			theSequence.persist();
-			
-			labels = autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels );
+
+			labels = autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels);
 		}
 		logger.debug("label 0: " + labels.get(0).toJson());
 	}
-	
+
 	@Test
 	@Transactional
 	public void testWithKnownParametersMultipleLabels() {
 		String thingTypeAndKind = "document_experiment";
 		String labelTypeAndKind = "id_codeName";
 		Long numberOfLabels = 3L;
-		List<AutoLabelDTO> labels = autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels );
+		List<AutoLabelDTO> labels = autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels);
 		logger.debug("label Count: " + labels.size());
 	}
-	
+
 	@Test
 	@Transactional
-	@Rollback(value=false)
+	@Rollback(value = false)
 	public void createNewSequence() {
 		LabelSequence newSeq = new LabelSequence();
 		newSeq.setLabelPrefix("TEST");
@@ -102,12 +103,14 @@ public void createNewSequence() {
 		newSeq.setDbSequence("test_creg_seq");
 		newSeq.save();
 	}
-	
+
 	@Test
 	@Transactional
-	@Rollback(value=false)
+	@Rollback(value = false)
 	public void incrementSequence() {
-		LabelSequence testSeq = LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals("compound_parent", "id_corpName").getSingleResult();
+		LabelSequence testSeq = LabelSequence
+				.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals("compound_parent", "id_corpName")
+				.getSingleResult();
 		AutoLabelDTO testLabel = testSeq.generateNextLabel();
 		logger.info(testLabel.getAutoLabel());
 		List<AutoLabelDTO> testLabels = testSeq.generateNextLabels(100L);
diff --git a/src/test/java/com/labsynch/labseer/service/ContainerLSServiceTests.java b/src/test/java/com/labsynch/labseer/service/ContainerLSServiceTests.java
index f45d83082..5974428ac 100755
--- a/src/test/java/com/labsynch/labseer/service/ContainerLSServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/ContainerLSServiceTests.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import java.io.BufferedReader;
@@ -78,9 +77,9 @@
 import flexjson.JSONTokener;
 import junit.framework.Assert;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class ContainerLSServiceTests {
 
@@ -88,45 +87,45 @@ public class ContainerLSServiceTests {
 
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
-	
+
 	@Autowired
 	private ContainerStateService csService;
 
 	@Autowired
 	private ContainerService containerService;
-	
+
 	@Autowired
 	private AutoLabelService autoLabelService;
-	
-	//@Test
-	//@Transactional
-	public void SaveContainerValues_3() throws FileNotFoundException{
+
+	// @Test
+	// @Transactional
+	public void SaveContainerValues_3() throws FileNotFoundException {
 
 		String fileName = "/tmp/roo/containerValuesBigJson.json";
 
 		long startTime = System.currentTimeMillis();
 
 		int batchSize = propertiesUtilService.getBatchSize();
-		int i = 0;		
+		int i = 0;
 		BufferedReader br = new BufferedReader(new FileReader(fileName));
-		JSONTokener jsonTokens = new JSONTokener(br);		
+		JSONTokener jsonTokens = new JSONTokener(br);
 		Object token;
 		char delimiter;
 		char END_OF_ARRAY = ']';
-		while (jsonTokens.more()){
+		while (jsonTokens.more()) {
 			delimiter = jsonTokens.nextClean();
-			if (delimiter != END_OF_ARRAY){
+			if (delimiter != END_OF_ARRAY) {
 				token = jsonTokens.nextValue();
 				ContainerValue containerValue = ContainerValue.fromJsonToContainerValue(token.toString());
 				containerValue.setId(null);
 				containerValue.persist();
-				if ( i % batchSize == 0 ) { 
+				if (i % batchSize == 0) {
 					containerValue.flush();
 					containerValue.clear();
 				}
 				i++;
 			}
-	    }
+		}
 
 		long endTime = System.currentTimeMillis();
 		long totalTime = endTime - startTime;
@@ -134,9 +133,9 @@ public void SaveContainerValues_3() throws FileNotFoundException{
 
 	}
 
-	//@Test
+	// @Test
 	@Transactional
-	public void SaveContainerStates_2(){
+	public void SaveContainerStates_2() {
 		Container container = new Container();
 		container.setRecordedBy("me");
 		container.setRecordedDate(new Date());
@@ -148,7 +147,7 @@ public void SaveContainerStates_2(){
 		Collection<ContainerState> savedContainerStates = new ArrayList<ContainerState>();
 
 		int counter = 0;
-		while (counter < 30000){
+		while (counter < 30000) {
 			ContainerState cs = new ContainerState();
 			cs.setRecordedBy("me");
 			cs.setRecordedDate(new Date());
@@ -167,17 +166,18 @@ public void SaveContainerStates_2(){
 		int batchSize = 50;
 		int i = 0;
 		Collection<ContainerStateMiniDTO> savedContainerStatesDTO = new ArrayList<ContainerStateMiniDTO>();
-		//Collection<ContainerState> savedContainerStatesDTO = new ArrayList<ContainerState>();
+		// Collection<ContainerState> savedContainerStatesDTO = new
+		// ArrayList<ContainerState>();
 
-		//savedJson = savedJson.replaceAll("\"\"", "null");
-		//logger.info(savedJson);
-		JSONTokener jsonTokens = new JSONTokener(savedJson);		
+		// savedJson = savedJson.replaceAll("\"\"", "null");
+		// logger.info(savedJson);
+		JSONTokener jsonTokens = new JSONTokener(savedJson);
 		Object token;
 		char delimiter;
 		char END_OF_ARRAY = ']';
-		while (jsonTokens.more()){
+		while (jsonTokens.more()) {
 			delimiter = jsonTokens.nextClean();
-			if (delimiter != END_OF_ARRAY){
+			if (delimiter != END_OF_ARRAY) {
 				token = jsonTokens.nextValue();
 				ContainerState containerState = ContainerState.fromJsonToContainerState(token.toString());
 				containerState.setId(null);
@@ -185,18 +185,19 @@ public void SaveContainerStates_2(){
 				ContainerStateMiniDTO stateDTO = new ContainerStateMiniDTO(containerState);
 				stateDTO.setId(containerState.getId());
 				stateDTO.setVersion(containerState.getVersion());
-				//				ContainerMiniDTO containerDTO = new ContainerMiniDTO(Container.findContainer(containerState.getContainer().getId()));
+				// ContainerMiniDTO containerDTO = new
+				// ContainerMiniDTO(Container.findContainer(containerState.getContainer().getId()));
 				ContainerMiniDTO containerDTO = new ContainerMiniDTO(containerState.getContainer());
 				stateDTO.setContainer(containerDTO);
 				savedContainerStatesDTO.add(stateDTO);
-				//				savedContainerStatesDTO.add(containerState);
-				if ( i % batchSize == 0 ) { 
+				// savedContainerStatesDTO.add(containerState);
+				if (i % batchSize == 0) {
 					containerState.flush();
 					containerState.clear();
 				}
 				i++;
 			}
-		}	
+		}
 
 		String output = ContainerStateMiniDTO.toJsonArray(savedContainerStatesDTO);
 		logger.info(output);
@@ -206,13 +207,11 @@ public void SaveContainerStates_2(){
 
 		logger.info("total elapsed time = " + totalTime + " miliseconds.");
 
-
-
 	}
 
-	//@Test
-	//@Transactional
-	public void CreateMetaContainerTest_1() throws IOException{
+	// @Test
+	// @Transactional
+	public void CreateMetaContainerTest_1() throws IOException {
 		Container container = new Container();
 		container.setRecordedBy("me");
 		container.setRecordedDate(new Date());
@@ -234,11 +233,11 @@ public void CreateMetaContainerTest_1() throws IOException{
 
 		Collection<ContainerValue> savedContainerValues = new ArrayList<ContainerValue>();
 
-		//		int batchSize = propertiesUtilService.getBatchSize();
+		// int batchSize = propertiesUtilService.getBatchSize();
 		int batchSize = 50;
 		int i = 0;
 		int numberOfValues = 30000;
-		while (i < numberOfValues){
+		while (i < numberOfValues) {
 			ContainerValue cv = new ContainerValue();
 			cv.setRecordedBy("me");
 			cv.setLsType("data");
@@ -247,7 +246,7 @@ public void CreateMetaContainerTest_1() throws IOException{
 			cv.setLsState(cs);
 			cv.persist();
 			savedContainerValues.add(cv);
-			if ( i % batchSize == 0 ) { // same as the JDBC batch size
+			if (i % batchSize == 0) { // same as the JDBC batch size
 				cv.flush();
 				cv.clear();
 			}
@@ -264,18 +263,19 @@ public void CreateMetaContainerTest_1() throws IOException{
 
 		String bigJsonString = ContainerValue.toJsonArray(savedContainerValues);
 		logger.info("size of big string: " + bigJsonString.length());
-//		Collection<ContainerValue> ack = ContainerValue.fromJsonArrayToContainerValues(bigJsonString);
+		// Collection<ContainerValue> ack =
+		// ContainerValue.fromJsonArrayToContainerValues(bigJsonString);
 
-//		logger.info("size of json array " + ack.size());
+		// logger.info("size of json array " + ack.size());
 		long endTime2 = System.currentTimeMillis();
 		long totalTime2 = endTime2 - startTime2;
 		logger.info("total elapsed time2 = " + totalTime2 + " miliseconds. ");
 
-		//logger.info(bigJsonString);
+		// logger.info(bigJsonString);
 
 		bigJsonString = bigJsonString.replaceAll("\"\"", "null");
 
-		//write file
+		// write file
 
 		File file = new File("/tmp/roo/containerValuesBigJson.json");
 
@@ -289,71 +289,73 @@ public void CreateMetaContainerTest_1() throws IOException{
 		bw.write(bigJsonString);
 		bw.close();
 
-		//		JSONTokener eek = new JSONTokener(bigJsonString);		
-		//		Object token;
-		//		char t1;
-		//		char END_OF_ARRAY = ']';
-		//		while (eek.more()){
-		//		//		while ((token = eek.next()) != null){
-		//			t1 = eek.next();
-		//			if (t1 != END_OF_ARRAY){
-		//				token = eek.nextValue();
-		//				logger.info("token is " + token.toString());				
-		//				ContainerValue ick = ContainerValue.fromJsonToContainerValue(token.toString());
-		//				logger.info(ick.toJson());
-		//			}
-		//			
-		////		    switch (token) {
-		////	        case START_OBJECT:
-		////	            JsonNode node = jp.readValueAsTree();
-		////	            // ... do something with the object
-		////	            System.out.println("Read object: " + node.toString());
-		////	            break;
-		//	    }
-
-
-
-
-		//		long startTime2 = System.currentTimeMillis();
-		//		
-		////		int batchSize = propertiesUtilService.getBatchSize();
-		//		batchSize = 50;
-		//		i = 0;
-		//		int fetchSize = 500;
-		//		ContainerState updatedCs = ContainerState.findContainerState(cs.getId());
-		////		ContainerState updatedCs = ContainerState.findContainerState(48L);
-		////		long totalCount = ContainerValue.countContainerValuesByLsState(updatedCs);
-		//		while (ContainerValue.countValidContainerValuesByLsState(updatedCs) > 0){
-		////			List<ContainerValue> containerValues = ContainerValue.findValidContainerValuesByLsState(updatedCs, fetchSize);
-		//			for ( ContainerValue containerValue : ContainerValue.findValidContainerValuesByLsState(updatedCs, fetchSize)){
-		//				containerValue.setIgnored(true);
-		//				containerValue.setModifiedDate(new Date());
-		//				containerValue.merge();
-		////				ContainerValue.update(containerValue);
-		//				if ( i % batchSize == 0 ) { // same as the JDBC batch size
-		//					containerValue.flush();
-		//					containerValue.clear();
-		//				}
-		//				i++;
-		//				
-		//				logger.info("current i: " + i);
-		//			}
-		////			containerValues = null;
-		//			
-		//		}
-		//
-		//		long endTime2 = System.currentTimeMillis();
-		//		long totalTime2 = endTime2 - startTime2;
+		// JSONTokener eek = new JSONTokener(bigJsonString);
+		// Object token;
+		// char t1;
+		// char END_OF_ARRAY = ']';
+		// while (eek.more()){
+		// // while ((token = eek.next()) != null){
+		// t1 = eek.next();
+		// if (t1 != END_OF_ARRAY){
+		// token = eek.nextValue();
+		// logger.info("token is " + token.toString());
+		// ContainerValue ick =
+		// ContainerValue.fromJsonToContainerValue(token.toString());
+		// logger.info(ick.toJson());
+		// }
 		//
-		//		logger.info("total elapsed time = " + totalTime2 + " miliseconds. Updated " + i + "  container values");
+		//// switch (token) {
+		//// case START_OBJECT:
+		//// JsonNode node = jp.readValueAsTree();
+		//// // ... do something with the object
+		//// System.out.println("Read object: " + node.toString());
+		//// break;
+		// }
 
+		// long startTime2 = System.currentTimeMillis();
+		//
+		//// int batchSize = propertiesUtilService.getBatchSize();
+		// batchSize = 50;
+		// i = 0;
+		// int fetchSize = 500;
+		// ContainerState updatedCs = ContainerState.findContainerState(cs.getId());
+		//// ContainerState updatedCs = ContainerState.findContainerState(48L);
+		//// long totalCount = ContainerValue.countContainerValuesByLsState(updatedCs);
+		// while (ContainerValue.countValidContainerValuesByLsState(updatedCs) > 0){
+		//// List<ContainerValue> containerValues =
+		// ContainerValue.findValidContainerValuesByLsState(updatedCs, fetchSize);
+		// for ( ContainerValue containerValue :
+		// ContainerValue.findValidContainerValuesByLsState(updatedCs, fetchSize)){
+		// containerValue.setIgnored(true);
+		// containerValue.setModifiedDate(new Date());
+		// containerValue.merge();
+		//// ContainerValue.update(containerValue);
+		// if ( i % batchSize == 0 ) { // same as the JDBC batch size
+		// containerValue.flush();
+		// containerValue.clear();
+		// }
+		// i++;
+		//
+		// logger.info("current i: " + i);
+		// }
+		//// containerValues = null;
+		//
+		// }
+		//
+		// long endTime2 = System.currentTimeMillis();
+		// long totalTime2 = endTime2 - startTime2;
+		//
+		// logger.info("total elapsed time = " + totalTime2 + " miliseconds. Updated " +
+		// i + " container values");
 
-		//		logger.info(container.toJson());
-		//		logger.info(cs.toJson());
-		//		logger.info(cv.toJson());
+		// logger.info(container.toJson());
+		// logger.info(cs.toJson());
+		// logger.info(cv.toJson());
 
-		//        Assert.assertNotNull("Find method for 'Protocol' illegally returned null for id '" + id + "'", id);
-		//        Assert.assertEquals("Find method for 'Author' returned the incorrect identifier", expectedId, id);		
+		// Assert.assertNotNull("Find method for 'Protocol' illegally returned null for
+		// id '" + id + "'", id);
+		// Assert.assertEquals("Find method for 'Author' returned the incorrect
+		// identifier", expectedId, id);
 
 		// 30,000 values = 10.301 seconds
 
@@ -361,16 +363,16 @@ public void CreateMetaContainerTest_1() throws IOException{
 
 	@Test
 	@Transactional
-	public void MarkStatesToIgnore_Test1() throws Exception{
+	public void MarkStatesToIgnore_Test1() throws Exception {
 
 		String json = "[{\"id\":8093}]";
 		String lsKind = "results";
-		LsTransaction uplogTransaction= csService.ignoreByContainer(json, lsKind);
+		LsTransaction uplogTransaction = csService.ignoreByContainer(json, lsKind);
 		logger.info(uplogTransaction.toJson());
-		
+
 	}
-	
-	public Container createTransientContainerStack(){
+
+	public Container createTransientContainerStack() {
 		Container container1 = new Container();
 		container1.setCodeName("CONT-01");
 		container1.setLsType("container");
@@ -379,7 +381,7 @@ public Container createTransientContainerStack(){
 		container1.setRecordedDate(new Date());
 		container1.setDeleted(false);
 		container1.setIgnored(false);
-		
+
 		Container container2 = new Container();
 		container2.setCodeName("CONT-02");
 		container2.setLsType("container");
@@ -388,7 +390,7 @@ public Container createTransientContainerStack(){
 		container2.setRecordedDate(new Date());
 		container2.setDeleted(false);
 		container2.setIgnored(false);
-		
+
 		ContainerState state1 = new ContainerState();
 		state1.setLsType("test");
 		state1.setLsKind("test");
@@ -397,7 +399,7 @@ public Container createTransientContainerStack(){
 		state1.setDeleted(false);
 		state1.setIgnored(false);
 		state1.setContainer(container1);
-		
+
 		ContainerValue value1 = new ContainerValue();
 		value1.setLsType("test");
 		value1.setLsKind("test");
@@ -406,22 +408,24 @@ public Container createTransientContainerStack(){
 		value1.setDeleted(false);
 		value1.setIgnored(false);
 		value1.setLsState(state1);
-		
+
 		Set<ContainerValue> values = new HashSet<ContainerValue>();
 		values.add(value1);
 		Set<ContainerState> states = new HashSet<ContainerState>();
 		states.add(state1);
 		state1.setLsValues(values);
 		container1.setLsStates(states);
-		
-		ItxContainerContainer inc12 = makeItxContainerContainer("ITXCONT-01", "incorporates", "container_container", container1, container2);
+
+		ItxContainerContainer inc12 = makeItxContainerContainer("ITXCONT-01", "incorporates", "container_container",
+				container1, container2);
 		container1.getSecondContainers().add(inc12);
-		
+
 		return container1;
-		
+
 	}
-	
-	public ItxContainerContainer makeItxContainerContainer(String codeName, String lsType, String lsKind, Container firstContainer, Container secondContainer){
+
+	public ItxContainerContainer makeItxContainerContainer(String codeName, String lsType, String lsKind,
+			Container firstContainer, Container secondContainer) {
 		ItxContainerContainer itx = new ItxContainerContainer();
 		itx.setCodeName(codeName);
 		itx.setLsType(lsType);
@@ -459,41 +463,45 @@ public ItxContainerContainer makeItxContainerContainer(String codeName, String l
 		itx.setLsStates(itxStates);
 		return itx;
 	}
-	
+
 	@Transactional
 	@Test
-	public void saveLsContainerWithNestedValues(){
+	public void saveLsContainerWithNestedValues() {
 		String json = "{\"lsType\":\"subject\",\"lsKind\":\"test subject\",\"recordedBy\":\"bob\",\"recordedDate\":1452795015412,\"shortDescription\":\" \",\"lsLabels\":[{\"lsType\":\"name\",\"lsKind\":\"subject name\",\"labelText\":\"Test Cont 8\",\"ignored\":false,\"preferred\":true,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null},{\"lsType\":\"corpName\",\"lsKind\":\"ACAS LsContainer\",\"labelText\":\"TEST-00014\",\"ignored\":false,\"preferred\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null},{\"lsType\":\"barcode\",\"lsKind\":\"subject barcode\",\"labelText\":\"\",\"ignored\":false,\"preferred\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null}],\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"subject attributes\",\"lsValues\":[{\"lsType\":\"codeValue\",\"lsKind\":\"sex\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"codeKind\":\"sex\",\"codeType\":\"subject attributes\",\"codeOrigin\":\"ACAS DDICT\",\"codeValue\":\"male\",\"value\":\"male\"},{\"lsType\":\"codeValue\",\"lsKind\":\"species\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"codeKind\":\"species\",\"codeType\":\"subject attributes\",\"codeOrigin\":\"ACAS DDICT\",\"codeValue\":\"homo sapiens\",\"value\":\"homo sapiens\"}],\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\"},{\"lsType\":\"status\",\"lsKind\":\"current subject status\",\"lsValues\":[{\"lsType\":\"dateValue\",\"lsKind\":\"weight measured date\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"value\":1452643200000,\"dateValue\":1452643200000},{\"lsType\":\"codeValue\",\"lsKind\":\"weight measured by\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"value\":\"bob\",\"codeValue\":\"bob\"},{\"lsType\":\"numericValue\",\"lsKind\":\"current weight\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"value\":123,\"numericValue\":123}],\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\"}],\"cid\":\"c162\",\"_changing\":false,\"_previousAttributes\":{\"lsType\":\"container\",\"lsKind\":\"container\",\"corpName\":\"\",\"recordedBy\":\"bob\",\"recordedDate\":1452795007545,\"shortDescription\":\" \",\"lsLabels\":[{\"lsType\":\"name\",\"lsKind\":\"subject name\",\"labelText\":\"Test Cont 8\",\"ignored\":false,\"preferred\":true,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null},{\"lsType\":\"corpName\",\"lsKind\":\"ACAS LsContainer\",\"labelText\":\"TEST-00014\",\"ignored\":false,\"preferred\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null},{\"lsType\":\"barcode\",\"lsKind\":\"subject barcode\",\"labelText\":\"\",\"ignored\":false,\"preferred\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null}]},\"changed\":{\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"subject attributes\",\"lsValues\":[{\"lsType\":\"codeValue\",\"lsKind\":\"sex\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"codeKind\":\"sex\",\"codeType\":\"subject attributes\",\"codeOrigin\":\"ACAS DDICT\",\"codeValue\":\"male\",\"value\":\"male\"},{\"lsType\":\"codeValue\",\"lsKind\":\"species\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"codeKind\":\"species\",\"codeType\":\"subject attributes\",\"codeOrigin\":\"ACAS DDICT\",\"codeValue\":\"homo sapiens\",\"value\":\"homo sapiens\"}],\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\"},{\"lsType\":\"status\",\"lsKind\":\"current subject status\",\"lsValues\":[{\"lsType\":\"dateValue\",\"lsKind\":\"weight measured date\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"value\":1452643200000,\"dateValue\":1452643200000},{\"lsType\":\"codeValue\",\"lsKind\":\"weight measured by\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"value\":\"bob\",\"codeValue\":\"bob\"},{\"lsType\":\"numericValue\",\"lsKind\":\"current weight\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"value\":123,\"numericValue\":123}],\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\"}]},\"_pending\":false,\"urlRoot\":\"/api/containers/subject/test subject\",\"lsProperties\":{\"defaultLabels\":[{\"key\":\"subject name\",\"type\":\"name\",\"kind\":\"subject name\",\"preferred\":true},{\"key\":\"corpName\",\"type\":\"corpName\",\"kind\":\"ACAS LsContainer\",\"preferred\":false},{\"key\":\"subject barcode\",\"type\":\"barcode\",\"kind\":\"subject barcode\",\"preferred\":false}],\"defaultValues\":[{\"key\":\"sex\",\"stateType\":\"metadata\",\"stateKind\":\"subject attributes\",\"type\":\"codeValue\",\"kind\":\"sex\",\"codeType\":\"subject attributes\",\"codeKind\":\"sex\",\"codeOrigin\":\"ACAS DDICT\",\"value\":\"\"},{\"key\":\"species\",\"stateType\":\"metadata\",\"stateKind\":\"subject attributes\",\"type\":\"codeValue\",\"kind\":\"species\",\"codeType\":\"subject attributes\",\"codeKind\":\"species\",\"codeOrigin\":\"ACAS DDICT\",\"value\":\"\"},{\"key\":\"weight measured date\",\"stateType\":\"status\",\"stateKind\":\"current subject status\",\"type\":\"dateValue\",\"kind\":\"weight measured date\"},{\"key\":\"weight measured by\",\"stateType\":\"status\",\"stateKind\":\"current subject status\",\"type\":\"codeValue\",\"kind\":\"weight measured by\"},{\"key\":\"current weight\",\"stateType\":\"status\",\"stateKind\":\"current subject status\",\"type\":\"numericValue\",\"kind\":\"current weight\"}]},\"className\":\"Container\",\"validationError\":null,\"idAttribute\":\"id\"}";
 		Container jsonContainer = Container.fromJsonToContainer(json);
 		Container newContainer = containerService.saveLsContainer(jsonContainer);
-		for (ContainerState state : newContainer.getLsStates()){
-			for (ContainerValue value : state.getLsValues()){
-				if (value.getLsType().equals("codeValue")) Assert.assertNotNull(value.getCodeValue());
-				if (value.getLsType().equals("dateValue")) Assert.assertNotNull(value.getDateValue());
-				if (value.getLsType().equals("numericValue")) Assert.assertNotNull(value.getNumericValue());
-				if (value.getLsType().equals("stringValue")) Assert.assertNotNull(value.getStringValue());
+		for (ContainerState state : newContainer.getLsStates()) {
+			for (ContainerValue value : state.getLsValues()) {
+				if (value.getLsType().equals("codeValue"))
+					Assert.assertNotNull(value.getCodeValue());
+				if (value.getLsType().equals("dateValue"))
+					Assert.assertNotNull(value.getDateValue());
+				if (value.getLsType().equals("numericValue"))
+					Assert.assertNotNull(value.getNumericValue());
+				if (value.getLsType().equals("stringValue"))
+					Assert.assertNotNull(value.getStringValue());
 			}
 		}
 	}
-	
+
 	@Transactional
 	@Test
-	public void saveNestedContainer(){
+	public void saveNestedContainer() {
 		Container container = createTransientContainerStack();
 		Container savedContainer = containerService.saveLsContainer(container);
 		logger.info(savedContainer.toJsonWithNestedFull());
 		Assert.assertNotNull(savedContainer.getLsStates());
 		Assert.assertFalse(savedContainer.getLsStates().isEmpty());
-		for (ContainerState state : savedContainer.getLsStates()){
+		for (ContainerState state : savedContainer.getLsStates()) {
 			Assert.assertNotNull(state.getLsValues());
 			Assert.assertFalse(state.getLsValues().isEmpty());
 		}
 		Assert.assertNotNull(savedContainer.getSecondContainers());
 		Assert.assertFalse(savedContainer.getSecondContainers().isEmpty());
-		for (ItxContainerContainer itx : savedContainer.getSecondContainers()){
+		for (ItxContainerContainer itx : savedContainer.getSecondContainers()) {
 			Assert.assertNotNull(itx.getLsStates());
 			Assert.assertFalse(itx.getLsStates().isEmpty());
-			for (ItxContainerContainerState state : itx.getLsStates()){
+			for (ItxContainerContainerState state : itx.getLsStates()) {
 				Assert.assertNotNull(state.getLsValues());
 				Assert.assertFalse(state.getLsValues().isEmpty());
 			}
@@ -502,47 +510,47 @@ public void saveNestedContainer(){
 		Container jsonParsedSavedContainer = Container.fromJsonToContainer(savedContainer.toJsonWithNestedFull());
 		Assert.assertNotNull(jsonParsedSavedContainer.getLsStates());
 		Assert.assertFalse(jsonParsedSavedContainer.getLsStates().isEmpty());
-		for (ContainerState state : jsonParsedSavedContainer.getLsStates()){
+		for (ContainerState state : jsonParsedSavedContainer.getLsStates()) {
 			Assert.assertNotNull(state.getLsValues());
 			Assert.assertFalse(state.getLsValues().isEmpty());
 		}
 		Assert.assertNotNull(jsonParsedSavedContainer.getSecondContainers());
 		Assert.assertFalse(jsonParsedSavedContainer.getSecondContainers().isEmpty());
-		for (ItxContainerContainer itx : jsonParsedSavedContainer.getSecondContainers()){
+		for (ItxContainerContainer itx : jsonParsedSavedContainer.getSecondContainers()) {
 			Assert.assertNotNull(itx.getLsStates());
 			Assert.assertFalse(itx.getLsStates().isEmpty());
-			for (ItxContainerContainerState state : itx.getLsStates()){
+			for (ItxContainerContainerState state : itx.getLsStates()) {
 				Assert.assertNotNull(state.getLsValues());
 				Assert.assertFalse(state.getLsValues().isEmpty());
 			}
 			Assert.assertNotNull(itx.getSecondContainer());
 		}
-		
+
 	}
-	
-	
-	
+
 	@Test
-//	@Transactional
-	public void createTestContainers(){
-		//physical/plate
+	// @Transactional
+	public void createTestContainers() {
+		// physical/plate
 		Container plate = new Container();
-		plate.setCodeName(autoLabelService.getAutoLabels("material_container", "id_codeName", 1L).get(0).getAutoLabel());
+		plate.setCodeName(
+				autoLabelService.getAutoLabels("material_container", "id_codeName", 1L).get(0).getAutoLabel());
 		plate.setLsType("physical");
 		plate.setLsKind("plate");
 		plate.setRecordedBy("acas admin");
 		plate.setRecordedDate(new Date());
-		//barcode/barcode
-		try{
+		// barcode/barcode
+		try {
 			LabelType labelType = LabelType.findLabelTypesByTypeNameEquals("barcode").getSingleResult();
-		}catch (NoResultException e){
+		} catch (NoResultException e) {
 			LabelType labelType = new LabelType();
 			labelType.setTypeName("barcode");
 			labelType.persist();
 		}
-		try{
-			LabelKind labelKind = LabelKind.findLabelKindsByKindNameEqualsAndLsType("barcode", LabelType.findLabelTypesByTypeNameEquals("barcode").getSingleResult()).getSingleResult();
-		}catch (NoResultException e){
+		try {
+			LabelKind labelKind = LabelKind.findLabelKindsByKindNameEqualsAndLsType("barcode",
+					LabelType.findLabelTypesByTypeNameEquals("barcode").getSingleResult()).getSingleResult();
+		} catch (NoResultException e) {
 			LabelKind labelKind = new LabelKind();
 			labelKind.setLsType(LabelType.findLabelTypesByTypeNameEquals("barcode").getSingleResult());
 			labelKind.setKindName("barcode");
@@ -557,43 +565,48 @@ public void createTestContainers(){
 		Set<ContainerLabel> labels = new HashSet<ContainerLabel>();
 		labels.add(plateBarcode);
 		plate.setLsLabels(labels);
-		//physical/racks
+		// physical/racks
 		Container racks = new Container();
-		racks.setCodeName(autoLabelService.getAutoLabels("material_container", "id_codeName", 1L).get(0).getAutoLabel());
+		racks.setCodeName(
+				autoLabelService.getAutoLabels("material_container", "id_codeName", 1L).get(0).getAutoLabel());
 		racks.setLsType("physical");
 		racks.setLsKind("racks");
 		racks.setRecordedBy("acas admin");
 		racks.setRecordedDate(new Date());
-		//moved to/plate container
-		try{
-			InteractionKind itxKind = InteractionKind.findInteractionKindsByKindNameEqualsAndLsType("plate container", InteractionType.findInteractionTypesByTypeNameEquals("moved to").getSingleResult()).getSingleResult();
-		}catch (NoResultException e){
+		// moved to/plate container
+		try {
+			InteractionKind itxKind = InteractionKind
+					.findInteractionKindsByKindNameEqualsAndLsType("plate container",
+							InteractionType.findInteractionTypesByTypeNameEquals("moved to").getSingleResult())
+					.getSingleResult();
+		} catch (NoResultException e) {
 			InteractionKind itxKind = new InteractionKind();
 			itxKind.setLsType(InteractionType.findInteractionTypesByTypeNameEquals("moved to").getSingleResult());
 			itxKind.setKindName("plate container");
 			itxKind.persist();
 		}
 		ItxContainerContainer movedToItx = new ItxContainerContainer();
-		movedToItx.setCodeName(autoLabelService.getAutoLabels("interaction_containerContainer", "id_codeName", 1L).get(0).getAutoLabel());
+		movedToItx.setCodeName(autoLabelService.getAutoLabels("interaction_containerContainer", "id_codeName", 1L)
+				.get(0).getAutoLabel());
 		movedToItx.setLsType("moved to");
 		movedToItx.setLsKind("plate container");
 		movedToItx.setRecordedBy("acas admin");
 		movedToItx.setRecordedDate(new Date());
-		
+
 		plate = containerService.saveLsContainer(plate);
 		racks = containerService.saveLsContainer(racks);
 		movedToItx.setFirstContainer(plate);
 		movedToItx.setSecondContainer(racks);
 		movedToItx.persist();
 	}
-	
+
 	@Test
 	@Transactional
-	public void getContainersByLocation(){
+	public void getContainersByLocation() {
 		List<String> locationCodeNameList = new ArrayList<String>();
-		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("location","default");
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("location", "default");
 		query.setMaxResults(100);
-		for (Container container : query.getResultList()){
+		for (Container container : query.getResultList()) {
 			locationCodeNameList.add(container.getCodeName());
 		}
 		logger.info(locationCodeNameList.toString());
@@ -601,182 +614,196 @@ public void getContainersByLocation(){
 		logger.info(ContainerLocationDTO.toJsonArray(result));
 		Assert.assertTrue(result.size() > 0);
 	}
-	
+
 	@Test
 	@Transactional
-	public void getContainersByLocationAndTypeKind(){
+	public void getContainersByLocationAndTypeKind() {
 		List<String> locationCodeNameList = new ArrayList<String>();
-		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("location","default");
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("location", "default");
 		query.setMaxResults(1);
 		Container container = query.getSingleResult();
 		locationCodeNameList.add(container.getCodeName());
-		Collection<ContainerLocationDTO> result = containerService.getContainersInLocation(locationCodeNameList, "physical", "plate");
+		Collection<ContainerLocationDTO> result = containerService.getContainersInLocation(locationCodeNameList,
+				"physical", "plate");
 		logger.info(ContainerLocationDTO.toJsonArray(result));
 		Assert.assertTrue(result.size() > 0);
 
 	}
-	
+
 	@Test
 	@Transactional
-	public void getWellCodesByPlateBarcodes(){
+	public void getWellCodesByPlateBarcodes() {
 		List<String> plateBarcodes = new ArrayList<String>();
-		plateBarcodes.add(Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate").getResultList().get(0).getLsLabels().iterator().next().getLabelText());
-		logger.info("querying with: "+plateBarcodes.toString());
+		plateBarcodes.add(Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate").getResultList()
+				.get(0).getLsLabels().iterator().next().getLabelText());
+		logger.info("querying with: " + plateBarcodes.toString());
 		Collection<PlateWellDTO> result = containerService.getWellCodesByPlateBarcodes(plateBarcodes);
 		logger.info(PlateWellDTO.toJsonArray(result));
 		Assert.assertTrue(result.size() > 0);
 	}
-	
+
 	@Test
 	@Transactional
-	public void getContainerCodesByLabels(){
+	public void getContainerCodesByLabels() {
 		List<String> plateBarcodes = new ArrayList<String>();
-		plateBarcodes.add(Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate").getResultList().get(0).getLsLabels().iterator().next().getLabelText());
-		logger.info("querying with: "+plateBarcodes.toString());
-		Collection<CodeLabelDTO> result = containerService.getContainerCodesByLabels(plateBarcodes, null, null, null, null, false, false);
+		plateBarcodes.add(Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate").getResultList()
+				.get(0).getLsLabels().iterator().next().getLabelText());
+		logger.info("querying with: " + plateBarcodes.toString());
+		Collection<CodeLabelDTO> result = containerService.getContainerCodesByLabels(plateBarcodes, null, null, null,
+				null, false, false);
 		logger.info(CodeLabelDTO.toJsonArray(result));
 		Assert.assertTrue(result.size() > 0);
 	}
-	
+
 	@Test
 	@Transactional
-	public void getContainerCodesByLabelsWithTypeKinds(){
+	public void getContainerCodesByLabelsWithTypeKinds() {
 		List<String> plateBarcodes = new ArrayList<String>();
-		plateBarcodes.add(Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate").getResultList().get(0).getLsLabels().iterator().next().getLabelText());
-		logger.info("querying with: "+plateBarcodes.toString());
-		Collection<CodeLabelDTO> result = containerService.getContainerCodesByLabels(plateBarcodes, "container", "plate", "barcode", "barcode", false, false);
+		plateBarcodes.add(Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate").getResultList()
+				.get(0).getLsLabels().iterator().next().getLabelText());
+		logger.info("querying with: " + plateBarcodes.toString());
+		Collection<CodeLabelDTO> result = containerService.getContainerCodesByLabels(plateBarcodes, "container",
+				"plate", "barcode", "barcode", false, false);
 		logger.info(CodeLabelDTO.toJsonArray(result));
 		Assert.assertTrue(result.size() > 0);
 	}
-	
+
 	@Test
 	@Transactional
-	public void getContainerCodesByLabelsWithConflictingTypeKinds(){
+	public void getContainerCodesByLabelsWithConflictingTypeKinds() {
 		List<String> plateBarcodes = new ArrayList<String>();
-		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate");
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate");
 		query.setMaxResults(1);
 		Container container = query.getSingleResult();
 		plateBarcodes.add(container.getLsLabels().iterator().next().getLabelText());
-		logger.info("querying with: "+plateBarcodes.toString());
-		Collection<CodeLabelDTO> result = containerService.getContainerCodesByLabels(plateBarcodes, "plate", "plate", "name", "barcode", false, false);
+		logger.info("querying with: " + plateBarcodes.toString());
+		Collection<CodeLabelDTO> result = containerService.getContainerCodesByLabels(plateBarcodes, "plate", "plate",
+				"name", "barcode", false, false);
 		logger.info(CodeLabelDTO.toJsonArray(result));
 		Assert.assertTrue(result.size() == 1);
-		for (CodeLabelDTO singleResult : result){
+		for (CodeLabelDTO singleResult : result) {
 			Assert.assertTrue(singleResult.getFoundCodeNames().size() == 0);
 		}
 	}
-	
+
 	@Test
 	@Transactional
-	public void getContainerCodesByLabels_like(){
+	public void getContainerCodesByLabels_like() {
 		List<String> plateBarcodes = new ArrayList<String>();
-		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate");
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate");
 		query.setMaxResults(1);
 		Container container = query.getSingleResult();
 		String plateBarcode = container.getLsLabels().iterator().next().getLabelText();
 		String trimmedPlateBarcode = plateBarcode.substring(1, plateBarcode.length() - 2);
 		plateBarcodes.add(trimmedPlateBarcode);
-		logger.info("querying with: "+plateBarcodes.toString());
-		Collection<CodeLabelDTO> result = containerService.getContainerCodesByLabels(plateBarcodes, null, null, null, null, true, false);
+		logger.info("querying with: " + plateBarcodes.toString());
+		Collection<CodeLabelDTO> result = containerService.getContainerCodesByLabels(plateBarcodes, null, null, null,
+				null, true, false);
 		logger.info(CodeLabelDTO.toJsonArray(result));
 		Assert.assertTrue(result.size() > 0);
 	}
-	
+
 	@Test
 	@Transactional
-	public void getContainerCodesByLabels_rightLike(){
+	public void getContainerCodesByLabels_rightLike() {
 		List<String> plateBarcodes = new ArrayList<String>();
-		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate");
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate");
 		query.setMaxResults(1);
 		Container container = query.getSingleResult();
 		String plateBarcode = container.getLsLabels().iterator().next().getLabelText();
 		String trimmedPlateBarcode = plateBarcode.substring(0, plateBarcode.length() - 2);
 		plateBarcodes.add(trimmedPlateBarcode);
-		logger.info("querying with: "+plateBarcodes.toString());
-		Collection<CodeLabelDTO> result = containerService.getContainerCodesByLabels(plateBarcodes, null, null, null, null, true, true);
+		logger.info("querying with: " + plateBarcodes.toString());
+		Collection<CodeLabelDTO> result = containerService.getContainerCodesByLabels(plateBarcodes, null, null, null,
+				null, true, true);
 		logger.info(CodeLabelDTO.toJsonArray(result));
 		Assert.assertTrue(result.size() > 0);
 	}
-	
+
 	@Test
 	@Transactional
-	public void getWellContent(){
+	public void getWellContent() {
 		List<String> wellCodes = new ArrayList<String>();
-    	TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("well","default");
-    	query.setMaxResults(25);
-    	for (Container container : query.getResultList()){
-    		wellCodes.add(container.getCodeName());	
-    	}
-		logger.info("querying with: "+wellCodes.toString());
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("well", "default");
+		query.setMaxResults(25);
+		for (Container container : query.getResultList()) {
+			wellCodes.add(container.getCodeName());
+		}
+		logger.info("querying with: " + wellCodes.toString());
 		Collection<WellContentDTO> result = containerService.getWellContent(wellCodes);
 		logger.info(WellContentDTO.toJsonArray(result));
 		Assert.assertTrue(result.size() > 0);
 	}
-	
+
 	@Test
 	@Transactional
-	public void getManyWellContent(){
+	public void getManyWellContent() {
 		List<String> wellCodes = new ArrayList<String>();
-    	TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("well","default");
-    	query.setMaxResults(2000);
-    	for (Container container : query.getResultList()){
-    		wellCodes.add(container.getCodeName());	
-    	}
-		logger.info("querying with: "+wellCodes.size() + " well codes");
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("well", "default");
+		query.setMaxResults(2000);
+		for (Container container : query.getResultList()) {
+			wellCodes.add(container.getCodeName());
+		}
+		logger.info("querying with: " + wellCodes.size() + " well codes");
 		Long before = (new Date()).getTime();
 		Collection<WellContentDTO> result = containerService.getWellContent(wellCodes);
 		logger.info(WellContentDTO.toJsonArray(result));
 		Long after = (new Date()).getTime();
-		logger.info("ms elapsed: "+ String.valueOf(after-before));
+		logger.info("ms elapsed: " + String.valueOf(after - before));
 		Assert.assertTrue(result.size() > 0);
 	}
-	
+
 	@Test
 	@Transactional
-	public void getContainerCodesWithoutBarcodes(){
+	public void getContainerCodesWithoutBarcodes() {
 		List<String> plateBarcodes = new ArrayList<String>();
 		plateBarcodes.add("hitpick master plate");
-		logger.info("querying with: "+plateBarcodes.toString());
-		Collection<CodeLabelDTO> result = containerService.getContainerCodesByLabels(plateBarcodes, null, null, null, null, false, false);
+		logger.info("querying with: " + plateBarcodes.toString());
+		Collection<CodeLabelDTO> result = containerService.getContainerCodesByLabels(plateBarcodes, null, null, null,
+				null, false, false);
 		logger.info(CodeLabelDTO.toJsonArray(result));
 		Assert.assertTrue(result.size() > 0);
 	}
-	
+
 	@Test
 	@Transactional
-	public void checkDependencies_pass(){
-    	String codeName = Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate").getResultList().get(0).getCodeName();
-    	Container container = Container.findContainerByCodeNameEquals(codeName);
-    	logger.info(container.toJson());
+	public void checkDependencies_pass() {
+		String codeName = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate").getResultList()
+				.get(0).getCodeName();
+		Container container = Container.findContainerByCodeNameEquals(codeName);
+		logger.info(container.toJson());
 		Long before = (new Date()).getTime();
-    	ContainerDependencyCheckDTO result = containerService.checkDependencies(container);
+		ContainerDependencyCheckDTO result = containerService.checkDependencies(container);
 		Long after = (new Date()).getTime();
-		logger.info("ms elapsed: "+ String.valueOf(after-before));
+		logger.info("ms elapsed: " + String.valueOf(after - before));
 		logger.info(result.toJson());
 		Assert.assertFalse(result.isLinkedDataExists());
 	}
-	
+
 	@Test
 	@Transactional
-	public void checkDependencies_fail_on_added_to(){
-//		String codeName = Container.findContainersByLsTypeEqualsAndLsKindEquals("location","default").getResultList().get(0).getCodeName();
+	public void checkDependencies_fail_on_added_to() {
+		// String codeName =
+		// Container.findContainersByLsTypeEqualsAndLsKindEquals("location","default").getResultList().get(0).getCodeName();
 		String codeName = "CONT-388802";
-    	Container container = Container.findContainerByCodeNameEquals(codeName);
-    	logger.info(container.toJson());
+		Container container = Container.findContainerByCodeNameEquals(codeName);
+		logger.info(container.toJson());
 		Long before = (new Date()).getTime();
-    	ContainerDependencyCheckDTO result = containerService.checkDependencies(container);
+		ContainerDependencyCheckDTO result = containerService.checkDependencies(container);
 		Long after = (new Date()).getTime();
-		logger.info("ms elapsed: "+ String.valueOf(after-before));
+		logger.info("ms elapsed: " + String.valueOf(after - before));
 		logger.info(result.toJson());
 		Assert.assertTrue(result.isLinkedDataExists());
 		Assert.assertFalse(result.getDependentCorpNames().isEmpty());
 	}
-	
+
 	@Test
 	@Transactional
-	public void checkDependencies_fail_on_subject_itx(){
-		Container plate = Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate").getResultList().get(0);
-		Container well = Container.findContainersByLsTypeEqualsAndLsKindEquals("well","default").getResultList().get(0);
+	public void checkDependencies_fail_on_subject_itx() {
+		Container plate = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate").getResultList()
+				.get(0);
+		Container well = Container.findContainersByLsTypeEqualsAndLsKindEquals("well", "default").getResultList()
+				.get(0);
 		Protocol testProtocol = new Protocol();
 		testProtocol.setCodeName("TEST-PRCL");
 		testProtocol.setRecordedBy("acas");
@@ -831,7 +858,7 @@ public void checkDependencies_fail_on_subject_itx(){
 		testExpt.merge();
 		testAG.merge();
 		testTG.merge();
-		
+
 		ItxSubjectContainer itx = new ItxSubjectContainer();
 		itx.setCodeName("TEST-ITX");
 		itx.setRecordedBy("acas");
@@ -844,19 +871,21 @@ public void checkDependencies_fail_on_subject_itx(){
 		well.getSubjects().add(itx);
 		well.merge();
 		Long before = (new Date()).getTime();
-    	ContainerDependencyCheckDTO result = containerService.checkDependencies(well);
+		ContainerDependencyCheckDTO result = containerService.checkDependencies(well);
 		Long after = (new Date()).getTime();
-		logger.info("ms elapsed: "+ String.valueOf(after-before));
+		logger.info("ms elapsed: " + String.valueOf(after - before));
 		logger.info(result.toJson());
 		Assert.assertTrue(result.isLinkedDataExists());
 		Assert.assertFalse(result.getLinkedExperiments().isEmpty());
 	}
-	
+
 	@Test
 	@Transactional
-	public void checkDependencies_fail_on_member_subject_itx(){
-		Container plate = Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate").getResultList().get(0);
-		Container well = Container.findContainersByLsTypeEqualsAndLsKindEquals("well","default").getResultList().get(0);
+	public void checkDependencies_fail_on_member_subject_itx() {
+		Container plate = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate").getResultList()
+				.get(0);
+		Container well = Container.findContainersByLsTypeEqualsAndLsKindEquals("well", "default").getResultList()
+				.get(0);
 		Protocol testProtocol = new Protocol();
 		testProtocol.setCodeName("TEST-PRCL");
 		testProtocol.setRecordedBy("acas");
@@ -911,7 +940,7 @@ public void checkDependencies_fail_on_member_subject_itx(){
 		testExpt.merge();
 		testAG.merge();
 		testTG.merge();
-		
+
 		ItxSubjectContainer itx = new ItxSubjectContainer();
 		itx.setCodeName("TEST-ITX");
 		itx.setRecordedBy("acas");
@@ -924,22 +953,22 @@ public void checkDependencies_fail_on_member_subject_itx(){
 		well.getSubjects().add(itx);
 		well.merge();
 		Long before = (new Date()).getTime();
-    	ContainerDependencyCheckDTO result = containerService.checkDependencies(plate);
+		ContainerDependencyCheckDTO result = containerService.checkDependencies(plate);
 		Long after = (new Date()).getTime();
-		logger.info("ms elapsed: "+ String.valueOf(after-before));
+		logger.info("ms elapsed: " + String.valueOf(after - before));
 		logger.info(result.toJson());
 		Assert.assertTrue(result.isLinkedDataExists());
 		Assert.assertFalse(result.getLinkedExperiments().isEmpty());
 	}
-	
+
 	@Test
 	@Transactional
-	@Rollback(value=false)
-	public void updateContainer(){
+	@Rollback(value = false)
+	public void updateContainer() {
 		String json = "{\"codeName\":\"CONT-3075\",\"deleted\":false,\"id\":6147,\"ignored\":false,\"lsKind\":\"CUSTOM_LOCATION\","
 				+ "\"lsLabels\":[{\"deleted\":false,\"id\":3075,\"ignored\":false,\"labelText\":\"screen system plate\",\"lsKind\":\"common\",\"lsTransaction\":1,\"lsType\":\"name\",\"lsTypeAndKind\":\"name_common\",\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"bob\",\"recordedDate\":1449581762000,\"version\":0}],"
 				+ "\"lsStates\":[{\"deleted\":false,\"id\":6151,\"ignored\":true,\"lsKind\":\"location information\",\"lsTransaction\":1,\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_location information\","
-					+ "\"lsValues\":[{\"codeKind\":\"screen system plate\",\"codeOrigin\":\"CMGLOCATION\",\"codeType\":\"screen system plate\",\"codeTypeAndKind\":\"screen system plate_screen system plate\",\"codeValue\":\"screen system plate\",\"deleted\":false,\"id\":24602,\"ignored\":false,\"lsKind\":\"CUSTOM_LOCATION\",\"lsTransaction\":1,\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_CUSTOM_LOCATION\",\"modifiedBy\":\"\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1449581762000,\"unitKind\":\"NA\",\"unitTypeAndKind\":\"null_NA\",\"version\":0}]"
+				+ "\"lsValues\":[{\"codeKind\":\"screen system plate\",\"codeOrigin\":\"CMGLOCATION\",\"codeType\":\"screen system plate\",\"codeTypeAndKind\":\"screen system plate_screen system plate\",\"codeValue\":\"screen system plate\",\"deleted\":false,\"id\":24602,\"ignored\":false,\"lsKind\":\"CUSTOM_LOCATION\",\"lsTransaction\":1,\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_CUSTOM_LOCATION\",\"modifiedBy\":\"\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1449581762000,\"unitKind\":\"NA\",\"unitTypeAndKind\":\"null_NA\",\"version\":0}]"
 				+ ",\"modifiedBy\":\"\",\"recordedBy\":\"bob\",\"recordedDate\":1449581762000,\"version\":0}]"
 				+ ",\"lsTransaction\":1,\"lsType\":\"storage\",\"lsTypeAndKind\":\"storage_CUSTOM_LOCATION\",\"modifiedBy\":\"\",\"recordedBy\":\"bob\",\"recordedDate\":1449581762000,\"version\":0}";
 		Container container = Container.fromJsonToContainer(json);
@@ -949,44 +978,47 @@ public void updateContainer(){
 		Container fetchedContainer = Container.findContainer(container.getId());
 		Assert.assertTrue(updatedContainer.getVersion() == fetchedContainer.getVersion());
 	}
-	
+
 	@Test
 	@Transactional
-	public void validateContainerUniqueName_Fail(){
+	public void validateContainerUniqueName_Fail() {
 		String json = "{\"lsType\":\"subject\",\"lsKind\":\"test subject\",\"recordedBy\":\"bob\",\"recordedDate\":1452795015412,\"shortDescription\":\" \",\"lsLabels\":[{\"lsType\":\"name\",\"lsKind\":\"subject name\",\"labelText\":\"Test Cont 8\",\"ignored\":false,\"preferred\":true,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null},{\"lsType\":\"corpName\",\"lsKind\":\"ACAS LsContainer\",\"labelText\":\"TEST-00014\",\"ignored\":false,\"preferred\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null},{\"lsType\":\"barcode\",\"lsKind\":\"subject barcode\",\"labelText\":\"\",\"ignored\":false,\"preferred\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null}],\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"subject attributes\",\"lsValues\":[{\"lsType\":\"codeValue\",\"lsKind\":\"sex\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"codeKind\":\"sex\",\"codeType\":\"subject attributes\",\"codeOrigin\":\"ACAS DDICT\",\"codeValue\":\"male\",\"value\":\"male\"},{\"lsType\":\"codeValue\",\"lsKind\":\"species\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"codeKind\":\"species\",\"codeType\":\"subject attributes\",\"codeOrigin\":\"ACAS DDICT\",\"codeValue\":\"homo sapiens\",\"value\":\"homo sapiens\"}],\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\"},{\"lsType\":\"status\",\"lsKind\":\"current subject status\",\"lsValues\":[{\"lsType\":\"dateValue\",\"lsKind\":\"weight measured date\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"value\":1452643200000,\"dateValue\":1452643200000},{\"lsType\":\"codeValue\",\"lsKind\":\"weight measured by\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"value\":\"bob\",\"codeValue\":\"bob\"},{\"lsType\":\"numericValue\",\"lsKind\":\"current weight\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"value\":123,\"numericValue\":123}],\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\"}],\"cid\":\"c162\",\"_changing\":false,\"_previousAttributes\":{\"lsType\":\"container\",\"lsKind\":\"container\",\"corpName\":\"\",\"recordedBy\":\"bob\",\"recordedDate\":1452795007545,\"shortDescription\":\" \",\"lsLabels\":[{\"lsType\":\"name\",\"lsKind\":\"subject name\",\"labelText\":\"Test Cont 8\",\"ignored\":false,\"preferred\":true,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null},{\"lsType\":\"corpName\",\"lsKind\":\"ACAS LsContainer\",\"labelText\":\"TEST-00014\",\"ignored\":false,\"preferred\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null},{\"lsType\":\"barcode\",\"lsKind\":\"subject barcode\",\"labelText\":\"\",\"ignored\":false,\"preferred\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"physicallyLabled\":false,\"imageFile\":null}]},\"changed\":{\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"subject attributes\",\"lsValues\":[{\"lsType\":\"codeValue\",\"lsKind\":\"sex\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"codeKind\":\"sex\",\"codeType\":\"subject attributes\",\"codeOrigin\":\"ACAS DDICT\",\"codeValue\":\"male\",\"value\":\"male\"},{\"lsType\":\"codeValue\",\"lsKind\":\"species\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"codeKind\":\"species\",\"codeType\":\"subject attributes\",\"codeOrigin\":\"ACAS DDICT\",\"codeValue\":\"homo sapiens\",\"value\":\"homo sapiens\"}],\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\"},{\"lsType\":\"status\",\"lsKind\":\"current subject status\",\"lsValues\":[{\"lsType\":\"dateValue\",\"lsKind\":\"weight measured date\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"value\":1452643200000,\"dateValue\":1452643200000},{\"lsType\":\"codeValue\",\"lsKind\":\"weight measured by\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"value\":\"bob\",\"codeValue\":\"bob\"},{\"lsType\":\"numericValue\",\"lsKind\":\"current weight\",\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\",\"value\":123,\"numericValue\":123}],\"ignored\":false,\"recordedDate\":1452795015412,\"recordedBy\":\"bob\"}]},\"_pending\":false,\"urlRoot\":\"/api/containers/subject/test subject\",\"lsProperties\":{\"defaultLabels\":[{\"key\":\"subject name\",\"type\":\"name\",\"kind\":\"subject name\",\"preferred\":true},{\"key\":\"corpName\",\"type\":\"corpName\",\"kind\":\"ACAS LsContainer\",\"preferred\":false},{\"key\":\"subject barcode\",\"type\":\"barcode\",\"kind\":\"subject barcode\",\"preferred\":false}],\"defaultValues\":[{\"key\":\"sex\",\"stateType\":\"metadata\",\"stateKind\":\"subject attributes\",\"type\":\"codeValue\",\"kind\":\"sex\",\"codeType\":\"subject attributes\",\"codeKind\":\"sex\",\"codeOrigin\":\"ACAS DDICT\",\"value\":\"\"},{\"key\":\"species\",\"stateType\":\"metadata\",\"stateKind\":\"subject attributes\",\"type\":\"codeValue\",\"kind\":\"species\",\"codeType\":\"subject attributes\",\"codeKind\":\"species\",\"codeOrigin\":\"ACAS DDICT\",\"value\":\"\"},{\"key\":\"weight measured date\",\"stateType\":\"status\",\"stateKind\":\"current subject status\",\"type\":\"dateValue\",\"kind\":\"weight measured date\"},{\"key\":\"weight measured by\",\"stateType\":\"status\",\"stateKind\":\"current subject status\",\"type\":\"codeValue\",\"kind\":\"weight measured by\"},{\"key\":\"current weight\",\"stateType\":\"status\",\"stateKind\":\"current subject status\",\"type\":\"numericValue\",\"kind\":\"current weight\"}]},\"className\":\"Container\",\"validationError\":null,\"idAttribute\":\"id\"}";
 		Container jsonContainer = Container.fromJsonToContainer(json);
 		ArrayList<ErrorMessage> errors = containerService.validateContainer(jsonContainer);
 		Assert.assertFalse(errors.isEmpty());
 	}
+
 	@Test
 	@Transactional
-	public void throwInTrash() throws Exception{
+	public void throwInTrash() throws Exception {
 		Collection<ContainerRequestDTO> containerCodeDTOs = new HashSet<ContainerRequestDTO>();
 		ContainerRequestDTO containerCodeDTO = new ContainerRequestDTO();
-		containerCodeDTO.setContainerCodeName(Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate").getResultList().get(0).getCodeName());
+		containerCodeDTO
+				.setContainerCodeName(Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate")
+						.getResultList().get(0).getCodeName());
 		containerCodeDTO.setModifiedBy("bfielder");
 		containerCodeDTO.setModifiedDate(new Date());
 		containerCodeDTOs.add(containerCodeDTO);
 		Collection<ContainerErrorMessageDTO> results = containerService.throwInTrash(containerCodeDTOs);
 		Assert.assertFalse(results.isEmpty());
 	}
-	
+
 	@Test
 	@Transactional
-	public void throwInTrash_tmp() throws Exception{
+	public void throwInTrash_tmp() throws Exception {
 		String json = "[{\"containerCodeName\":\"CONT-2265608\",\"modifiedBy\":\"acas\",\"modifiedDate\":1455057684000}]";
 		Collection<ContainerRequestDTO> containerCodeDTOs = ContainerRequestDTO.fromJsonArrayToCoes(json);
 		Collection<ContainerErrorMessageDTO> results = containerService.throwInTrash(containerCodeDTOs);
 		logger.info(ContainerErrorMessageDTO.toJsonArray(results));
 		Assert.assertFalse(results.isEmpty());
 	}
-	
+
 	@Test
 	@Transactional
-	public void updateAmountInWell_success() throws Exception{
+	public void updateAmountInWell_success() throws Exception {
 		Collection<ContainerRequestDTO> containerCodeDTOs = new HashSet<ContainerRequestDTO>();
 		ContainerRequestDTO containerCodeDTO = new ContainerRequestDTO();
-		TypedQuery<Container> wellQuery = Container.findContainersByLsTypeEqualsAndLsKindEquals("well","default");
+		TypedQuery<Container> wellQuery = Container.findContainersByLsTypeEqualsAndLsKindEquals("well", "default");
 		wellQuery.setMaxResults(1);
 		containerCodeDTO.setContainerCodeName(wellQuery.getSingleResult().getCodeName());
 		containerCodeDTO.setAmount(new BigDecimal(10));
@@ -998,45 +1030,47 @@ public void updateAmountInWell_success() throws Exception{
 		logger.info(ContainerErrorMessageDTO.toJsonArray(results));
 		Assert.assertFalse(results.isEmpty());
 	}
-	
-	
+
 	@Test
 	@Transactional
-	public void getCodeNameFromName(){
-		Container container = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate").getResultList().get(0);
-    	String containerType = container.getLsType();
-    	String containerKind = container.getLsKind();
+	public void getCodeNameFromName() {
+		Container container = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate")
+				.getResultList().get(0);
+		String containerType = container.getLsType();
+		String containerKind = container.getLsKind();
 		String label = container.getLsLabels().iterator().next().getLabelText();
 		PreferredNameDTO request = new PreferredNameDTO(label, null, null);
 		Collection<PreferredNameDTO> requests = new HashSet<PreferredNameDTO>();
 		requests.add(request);
 		PreferredNameRequestDTO requestDTO = new PreferredNameRequestDTO();
 		requestDTO.setRequests(requests);
-		PreferredNameResultsDTO results = containerService.getCodeNameFromName(containerType, containerKind, null, null, requestDTO);
+		PreferredNameResultsDTO results = containerService.getCodeNameFromName(containerType, containerKind, null, null,
+				requestDTO);
 		logger.info(results.toJson());
-		for (PreferredNameDTO result : results.getResults()){
-    		Assert.assertNotNull(result.getRequestName());
-    		Assert.assertNotNull(result.getReferenceName());
-    		Assert.assertNotNull(result.getPreferredName());
-    	}
+		for (PreferredNameDTO result : results.getResults()) {
+			Assert.assertNotNull(result.getRequestName());
+			Assert.assertNotNull(result.getReferenceName());
+			Assert.assertNotNull(result.getPreferredName());
+		}
 	}
-	
+
 	@Test
 	@Transactional
-	public void getAllWellsForPlate(){
+	public void getAllWellsForPlate() {
 		Container container = Container.findContainer(289095L);
-    	Collection<Container> wells = new ArrayList<Container>();
-    	for (ItxContainerContainer itx : container.getSecondContainers()){
-    		Container well = itx.getSecondContainer();
-    		wells.add(well);
-    	}
-    	logger.info(Container.toJsonArray(wells));
+		Collection<Container> wells = new ArrayList<Container>();
+		for (ItxContainerContainer itx : container.getSecondContainers()) {
+			Container well = itx.getSecondContainer();
+			wells.add(well);
+		}
+		logger.info(Container.toJsonArray(wells));
 	}
-	
+
 	@Test
 	@Transactional
-	public void createEmptyPlate() throws Exception{
-		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("definition container", "plate");
+	public void createEmptyPlate() throws Exception {
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("definition container",
+				"plate");
 		query.setMaxResults(1);
 		Container definition = query.getSingleResult();
 		CreatePlateRequestDTO plateRequest = new CreatePlateRequestDTO();
@@ -1044,29 +1078,32 @@ public void createEmptyPlate() throws Exception{
 		plateRequest.setBarcode("TESTBARCODE-123");
 		plateRequest.setRecordedBy("acas");
 		long start = System.currentTimeMillis() % 1000;
-	    	PlateStubDTO result = containerService.createPlate(plateRequest);
-	    	long end = System.currentTimeMillis() % 1000;
-	    	logger.info("Create plate time: "+(end-start));
-	    	try{
-	    		Container dupeContainer = Container.findContainerByLabelText("container", "plate", "name", "barcode", plateRequest.getBarcode()).getSingleResult();
-	    	}catch(NoResultException e){
-	    		logger.error("no result",e);
-	    	}
-	    	logger.info(result.toJson());
-	    	Assert.assertEquals(1536, result.getWells().size());
-	    	String[][] plateLayout = new String[32][48];
-	    	for (WellStubDTO well : result.getWells()){
-	    		logger.debug(well.getRowIndex().toString() + ", "+well.getColumnIndex().toString());
-	    		plateLayout[well.getRowIndex()][well.getColumnIndex()] = well.getWellName();
-	    	}
-	    	logger.info(Arrays.deepToString(plateLayout));
+		PlateStubDTO result = containerService.createPlate(plateRequest);
+		long end = System.currentTimeMillis() % 1000;
+		logger.info("Create plate time: " + (end - start));
+		try {
+			Container dupeContainer = Container
+					.findContainerByLabelText("container", "plate", "name", "barcode", plateRequest.getBarcode())
+					.getSingleResult();
+		} catch (NoResultException e) {
+			logger.error("no result", e);
+		}
+		logger.info(result.toJson());
+		Assert.assertEquals(1536, result.getWells().size());
+		String[][] plateLayout = new String[32][48];
+		for (WellStubDTO well : result.getWells()) {
+			logger.debug(well.getRowIndex().toString() + ", " + well.getColumnIndex().toString());
+			plateLayout[well.getRowIndex()][well.getColumnIndex()] = well.getWellName();
+		}
+		logger.info(Arrays.deepToString(plateLayout));
 	}
-	
+
 	@Test
 	@Transactional
-	@Rollback(value=true)
-	public void createPartiallyFilledPlate() throws Exception{
-		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("definition container", "plate");
+	@Rollback(value = true)
+	public void createPartiallyFilledPlate() throws Exception {
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("definition container",
+				"plate");
 		query.setMaxResults(1);
 		Container definition = query.getSingleResult();
 		CreatePlateRequestDTO plateRequest = new CreatePlateRequestDTO();
@@ -1090,48 +1127,49 @@ public void createPartiallyFilledPlate() throws Exception{
 		wellC7.setAmountUnits("µL");
 		wellsToPopulate.add(wellC7);
 		plateRequest.setWells(wellsToPopulate);
-	
-	    	PlateStubDTO result = containerService.createPlate(plateRequest);
-	    	Assert.assertEquals(1536, result.getWells().size());
-	    	String[][] plateLayout = new String[32][48];
-	    	for (WellStubDTO well : result.getWells()){
-	    		plateLayout[well.getRowIndex()][well.getColumnIndex()] = well.getWellName();
-	    		if (well.getWellName().equals("A001")){
-	    			List<String> checkWellCodes = new ArrayList<String>();
-	    			checkWellCodes.add(well.getCodeName());
-	    			WellContentDTO checkResult = containerService.getWellContent(checkWellCodes).iterator().next();
-	    			Assert.assertEquals(new BigDecimal(1), checkResult.getAmount());
-	    			Assert.assertEquals("µL", checkResult.getAmountUnits());
-	    			logger.info("checked well A001");
-	    		}
-	    		if (well.getWellName().equals("B003")){
-	    			List<String> checkWellCodes = new ArrayList<String>();
-	    			checkWellCodes.add(well.getCodeName());
-	    			WellContentDTO checkResult = containerService.getWellContent(checkWellCodes).iterator().next();
-	    			Assert.assertEquals(new BigDecimal(2), checkResult.getAmount());
-	    			Assert.assertEquals("µL", checkResult.getAmountUnits());
-	    			logger.info("checked well B003");
-	
-	    		}
-	    		if (well.getWellName().equals("AA007")){
-	    			List<String> checkWellCodes = new ArrayList<String>();
-	    			checkWellCodes.add(well.getCodeName());
-	    			WellContentDTO checkResult = containerService.getWellContent(checkWellCodes).iterator().next();
-	    			Assert.assertEquals(new BigDecimal(3), checkResult.getAmount());
-	    			Assert.assertEquals("µL", checkResult.getAmountUnits());
-	    			logger.info("checked well AA007");
-	
-	    		}
-	    	}
-	    	logger.info(Arrays.deepToString(plateLayout));
-	    	
+
+		PlateStubDTO result = containerService.createPlate(plateRequest);
+		Assert.assertEquals(1536, result.getWells().size());
+		String[][] plateLayout = new String[32][48];
+		for (WellStubDTO well : result.getWells()) {
+			plateLayout[well.getRowIndex()][well.getColumnIndex()] = well.getWellName();
+			if (well.getWellName().equals("A001")) {
+				List<String> checkWellCodes = new ArrayList<String>();
+				checkWellCodes.add(well.getCodeName());
+				WellContentDTO checkResult = containerService.getWellContent(checkWellCodes).iterator().next();
+				Assert.assertEquals(new BigDecimal(1), checkResult.getAmount());
+				Assert.assertEquals("µL", checkResult.getAmountUnits());
+				logger.info("checked well A001");
+			}
+			if (well.getWellName().equals("B003")) {
+				List<String> checkWellCodes = new ArrayList<String>();
+				checkWellCodes.add(well.getCodeName());
+				WellContentDTO checkResult = containerService.getWellContent(checkWellCodes).iterator().next();
+				Assert.assertEquals(new BigDecimal(2), checkResult.getAmount());
+				Assert.assertEquals("µL", checkResult.getAmountUnits());
+				logger.info("checked well B003");
+
+			}
+			if (well.getWellName().equals("AA007")) {
+				List<String> checkWellCodes = new ArrayList<String>();
+				checkWellCodes.add(well.getCodeName());
+				WellContentDTO checkResult = containerService.getWellContent(checkWellCodes).iterator().next();
+				Assert.assertEquals(new BigDecimal(3), checkResult.getAmount());
+				Assert.assertEquals("µL", checkResult.getAmountUnits());
+				logger.info("checked well AA007");
+
+			}
+		}
+		logger.info(Arrays.deepToString(plateLayout));
+
 	}
-	
+
 	@Test
 	@Transactional
-	@Rollback(value=true)
-	public void createPartiallyFilledPlates() throws Exception{
-		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("definition container", "plate");
+	@Rollback(value = true)
+	public void createPartiallyFilledPlates() throws Exception {
+		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("definition container",
+				"plate");
 		query.setMaxResults(1);
 		Container definition = query.getSingleResult();
 		CreatePlateRequestDTO plateRequest = new CreatePlateRequestDTO();
@@ -1163,61 +1201,62 @@ public void createPartiallyFilledPlates() throws Exception{
 		Collection<CreatePlateRequestDTO> plateRequests = new ArrayList<CreatePlateRequestDTO>();
 		plateRequests.add(plateRequest);
 		plateRequests.add(plateRequest2);
-    	Collection<PlateStubDTO> results = containerService.createPlates(plateRequests);
-    	for (PlateStubDTO result : results){
-    		Assert.assertEquals(1536, result.getWells().size());
-        	String[][] plateLayout = new String[32][48];
-        	for (WellStubDTO well : result.getWells()){
-        		plateLayout[well.getRowIndex()][well.getColumnIndex()] = well.getWellName();
-        		if (well.getWellName().equals("A001")){
-        			List<String> checkWellCodes = new ArrayList<String>();
-        			checkWellCodes.add(well.getCodeName());
-        			WellContentDTO checkResult = containerService.getWellContent(checkWellCodes).iterator().next();
-        			Assert.assertEquals(new BigDecimal(1), checkResult.getAmount());
-        			Assert.assertEquals("µL", checkResult.getAmountUnits());
-        			logger.info("checked well A001");
-        		}
-        		if (well.getWellName().equals("B003")){
-        			List<String> checkWellCodes = new ArrayList<String>();
-        			checkWellCodes.add(well.getCodeName());
-        			WellContentDTO checkResult = containerService.getWellContent(checkWellCodes).iterator().next();
-        			Assert.assertEquals(new BigDecimal(2), checkResult.getAmount());
-        			Assert.assertEquals("µL", checkResult.getAmountUnits());
-        			logger.info("checked well B003");
-
-        		}
-        		if (well.getWellName().equals("AA007")){
-        			List<String> checkWellCodes = new ArrayList<String>();
-        			checkWellCodes.add(well.getCodeName());
-        			WellContentDTO checkResult = containerService.getWellContent(checkWellCodes).iterator().next();
-        			Assert.assertEquals(new BigDecimal(3), checkResult.getAmount());
-        			Assert.assertEquals("µL", checkResult.getAmountUnits());
-        			logger.info("checked well AA007");
-
-        		}
-        	}
-        	logger.info(Arrays.deepToString(plateLayout));
-    	}
-    	
+		Collection<PlateStubDTO> results = containerService.createPlates(plateRequests);
+		for (PlateStubDTO result : results) {
+			Assert.assertEquals(1536, result.getWells().size());
+			String[][] plateLayout = new String[32][48];
+			for (WellStubDTO well : result.getWells()) {
+				plateLayout[well.getRowIndex()][well.getColumnIndex()] = well.getWellName();
+				if (well.getWellName().equals("A001")) {
+					List<String> checkWellCodes = new ArrayList<String>();
+					checkWellCodes.add(well.getCodeName());
+					WellContentDTO checkResult = containerService.getWellContent(checkWellCodes).iterator().next();
+					Assert.assertEquals(new BigDecimal(1), checkResult.getAmount());
+					Assert.assertEquals("µL", checkResult.getAmountUnits());
+					logger.info("checked well A001");
+				}
+				if (well.getWellName().equals("B003")) {
+					List<String> checkWellCodes = new ArrayList<String>();
+					checkWellCodes.add(well.getCodeName());
+					WellContentDTO checkResult = containerService.getWellContent(checkWellCodes).iterator().next();
+					Assert.assertEquals(new BigDecimal(2), checkResult.getAmount());
+					Assert.assertEquals("µL", checkResult.getAmountUnits());
+					logger.info("checked well B003");
+
+				}
+				if (well.getWellName().equals("AA007")) {
+					List<String> checkWellCodes = new ArrayList<String>();
+					checkWellCodes.add(well.getCodeName());
+					WellContentDTO checkResult = containerService.getWellContent(checkWellCodes).iterator().next();
+					Assert.assertEquals(new BigDecimal(3), checkResult.getAmount());
+					Assert.assertEquals("µL", checkResult.getAmountUnits());
+					logger.info("checked well AA007");
+
+				}
+			}
+			logger.info(Arrays.deepToString(plateLayout));
+		}
+
 	}
-	
+
 	@Test
 	@Transactional
-	public void updateWellContent() throws Exception{
+	public void updateWellContent() throws Exception {
 		TypedQuery<Container> query = Container.findContainersByLsTypeEqualsAndLsKindEquals("well", "default");
 		query.setMaxResults(1536);
 		Collection<Container> wells = query.getResultList();
 		Assert.assertEquals(1536, wells.size());
 		Collection<WellContentDTO> wellDTOs = new ArrayList<WellContentDTO>();
 		String recordedBy = "acas";
-		//values to set:
+		// values to set:
 		BigDecimal amount = new BigDecimal(10);
 		String amountUnits = "mg";
 		Double batchConcentration = new Double(1);
 		String batchConcUnits = "mM";
 		String physicalState = "liquid";
-		for(Container well : wells){
-			WellContentDTO wellDTO = new WellContentDTO(well.getCodeName(), null, null, null, recordedBy, null, null, amount, amountUnits, null, batchConcentration, batchConcUnits, null, physicalState);
+		for (Container well : wells) {
+			WellContentDTO wellDTO = new WellContentDTO(well.getCodeName(), null, null, null, recordedBy, null, null,
+					amount, amountUnits, null, batchConcentration, batchConcUnits, null, physicalState);
 			wellDTOs.add(wellDTO);
 		}
 		logger.info(WellContentDTO.toJsonArray(wellDTOs));
@@ -1226,122 +1265,129 @@ public void updateWellContent() throws Exception{
 		Assert.assertEquals(1536, results.size());
 		logger.info(ContainerErrorMessageDTO.toJsonArray(results));
 		List<String> checkWellCodes = new ArrayList<String>();
-    	for (ContainerErrorMessageDTO result : results){
-    		Assert.assertNull(result.getLevel());
-    		Assert.assertNotNull(result.getContainerCodeName());
-    		checkWellCodes.add(result.getContainerCodeName());
-    	}
-//    	Collection<WellContentDTO> checkResults = containerService.getWellContent(checkWellCodes);
-//    	for (WellContentDTO checkResult : checkResults){
-//    		Assert.assertEquals(amount, checkResult.getAmount());
-//    		Assert.assertEquals(amountUnits, checkResult.getAmountUnits());
-//    		Assert.assertEquals(batchConcentration, checkResult.getBatchConcentration());
-//    		Assert.assertEquals(batchConcUnits, checkResult.getBatchConcUnits());
-//    		Assert.assertEquals(physicalState, checkResult.getPhysicalState());
-//    		Assert.assertNotNull(checkResult.getBatchCode());
-//    	}
-    	
+		for (ContainerErrorMessageDTO result : results) {
+			Assert.assertNull(result.getLevel());
+			Assert.assertNotNull(result.getContainerCodeName());
+			checkWellCodes.add(result.getContainerCodeName());
+		}
+		// Collection<WellContentDTO> checkResults =
+		// containerService.getWellContent(checkWellCodes);
+		// for (WellContentDTO checkResult : checkResults){
+		// Assert.assertEquals(amount, checkResult.getAmount());
+		// Assert.assertEquals(amountUnits, checkResult.getAmountUnits());
+		// Assert.assertEquals(batchConcentration, checkResult.getBatchConcentration());
+		// Assert.assertEquals(batchConcUnits, checkResult.getBatchConcUnits());
+		// Assert.assertEquals(physicalState, checkResult.getPhysicalState());
+		// Assert.assertNotNull(checkResult.getBatchCode());
+		// }
+
 	}
-	
+
 	@Test
 	@Transactional
-	public void getWellContentByPlateBarcode(){
-		String plateBarcode = Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate").getResultList().get(0).getLsLabels().iterator().next().getLabelText();
-		logger.info("querying with: "+plateBarcode);
+	public void getWellContentByPlateBarcode() {
+		String plateBarcode = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate")
+				.getResultList().get(0).getLsLabels().iterator().next().getLabelText();
+		logger.info("querying with: " + plateBarcode);
 		Collection<WellContentDTO> results = containerService.getWellContentByPlateBarcode(plateBarcode);
 		logger.info(WellContentDTO.toJsonArray(results));
 		Assert.assertTrue(results.size() > 0);
-		for (WellContentDTO result : results){
+		for (WellContentDTO result : results) {
 			Assert.assertNull(result.getLevel());
 			Assert.assertNotNull(result.getContainerCodeName());
-    		Assert.assertNotNull(result.getWellName());
-    		Assert.assertNotNull(result.getRowIndex());
-    		Assert.assertNotNull(result.getColumnIndex());
-    		Assert.assertNotNull(result.getRecordedBy());
-    		Assert.assertNotNull(result.getRecordedDate());
+			Assert.assertNotNull(result.getWellName());
+			Assert.assertNotNull(result.getRowIndex());
+			Assert.assertNotNull(result.getColumnIndex());
+			Assert.assertNotNull(result.getRecordedBy());
+			Assert.assertNotNull(result.getRecordedDate());
 		}
 	}
-	
+
 	@Test
 	@Transactional
-	public void getPlateTypeByPlateBarcode(){
-		String plateBarcode = Container.findContainersByLsTypeEqualsAndLsKindEquals("container","plate").getResultList().get(0).getLsLabels().iterator().next().getLabelText();
-		logger.info("querying with: "+plateBarcode);
+	public void getPlateTypeByPlateBarcode() {
+		String plateBarcode = Container.findContainersByLsTypeEqualsAndLsKindEquals("container", "plate")
+				.getResultList().get(0).getLsLabels().iterator().next().getLabelText();
+		logger.info("querying with: " + plateBarcode);
 		PlateStubDTO result = containerService.getPlateTypeByPlateBarcode(plateBarcode);
 		logger.info(result.toJson());
-    	Assert.assertNotNull(result.getCodeName());
-    	Assert.assertNotNull(result.getBarcode());
-    	Assert.assertNotNull(result.getPlateType());
+		Assert.assertNotNull(result.getCodeName());
+		Assert.assertNotNull(result.getBarcode());
+		Assert.assertNotNull(result.getPlateType());
 	}
-	
+
 	@Test
 	@Transactional
-	public void moveToLocation_large(){
+	public void moveToLocation_large() {
 		String json = "[{\"containerCodeName\":\"CONT-38028563\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38028572\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38028618\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38028619\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38028624\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38028625\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38031884\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38031978\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38032519\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38032523\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38032526\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38032558\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38032578\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38033861\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38033875\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38033941\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38033980\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38034036\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38034085\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38034496\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38034945\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38035500\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38035504\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38035505\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38035848\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38036721\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38037207\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38037208\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38037679\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38038049\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38038333\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38039432\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38039433\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38039438\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38039461\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38040156\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38040168\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38040171\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38040880\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38041611\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38041612\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38041613\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38041618\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38041856\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38042330\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38042535\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38042768\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38042873\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38042877\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38042896\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38042897\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38043570\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38043572\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38043574\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38043577\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38043578\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38043844\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38043849\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38044121\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38044124\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38044127\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38044130\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38044136\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38044137\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38044152\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38044474\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38044539\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38044656\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38045304\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38045356\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38045418\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38045422\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38045438\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38045442\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38045704\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38045715\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38045716\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38045719\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38045726\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38045738\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38045763\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38045784\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38045804\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38045815\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38045816\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38046607\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38046657\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38046662\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38046665\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38046704\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38047415\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38047784\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38047787\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38047831\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38049455\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38050344\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38051352\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38052821\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38052936\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054074\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054075\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054076\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054079\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054080\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054081\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054082\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054083\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054084\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054085\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054087\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054088\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054106\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054108\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054109\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054111\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054112\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054115\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054118\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054131\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054133\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054135\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054137\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054139\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054140\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054141\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054167\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054168\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054173\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054174\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054177\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054178\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054507\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054509\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054523\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054525\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054527\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054530\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054581\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054588\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054591\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054599\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054601\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054607\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054609\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054611\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054612\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054614\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054622\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054633\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054635\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054637\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054645\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054646\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054651\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054652\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054653\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054736\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054741\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054757\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054758\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054762\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054763\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054764\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054765\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054800\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054801\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054802\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054824\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054829\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054839\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054841\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054842\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054843\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054844\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38054852\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38055030\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38055057\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38055058\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38055070\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38055104\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38055106\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38055207\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38055253\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38055257\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38055261\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38055263\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38055297\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38055523\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38055529\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38055531\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38055534\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38055536\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38055538\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38055621\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38055694\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38055697\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38055704\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38056141\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38056145\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38056146\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38056151\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38056152\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38056160\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38056166\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38056191\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38056222\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38056226\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38056227\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38056531\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38056532\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38056533\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38056534\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38056535\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38056536\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38056537\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38056539\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38056541\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38056719\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38056783\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38058230\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38058739\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38058740\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38058741\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38058742\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38059610\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38059612\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38059645\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38059991\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38060863\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38060864\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38060865\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38060866\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38060867\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38060868\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38060869\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38061890\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38061894\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38061895\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38061904\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38061912\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38061913\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38061921\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38061924\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38061926\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38061927\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38061930\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38061931\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38061932\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38061935\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38061939\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38061940\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38061972\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38061973\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38062068\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38062070\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38062072\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38062084\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38062085\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38062103\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38062107\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38062108\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38062109\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38062110\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38062116\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38062117\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38062118\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38062217\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38062490\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38062491\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38063487\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38063577\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38063579\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38063599\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38063600\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38063601\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38063649\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38063951\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38063952\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38064051\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38064058\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38064109\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38064112\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38064116\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38064121\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38064122\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38064147\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38064148\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38064154\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38064156\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38064176\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38064178\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38064315\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38064359\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38064360\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38064367\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38064662\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38067050\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38070223\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38073660\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38074529\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38077587\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38084980\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38084981\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38085835\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38085844\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38085846\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38085847\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38085863\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38085879\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38085888\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38085889\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38085892\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38085893\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38085895\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38085896\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38088538\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38088540\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38088608\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38099616\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38102932\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38107130\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38108433\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38108436\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38108439\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38108469\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38108481\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38108482\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38108483\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38108484\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38108486\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38108487\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38108827\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38108828\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38109100\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38109167\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38109691\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38109986\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38109989\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38109991\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38110005\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38110016\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38110025\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38111293\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38111294\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38111297\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38111323\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38111325\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38111327\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38111329\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38111331\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38111336\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38111337\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38111340\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38111365\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38111383\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38111617\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38111627\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38112087\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38112541\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38112543\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38112908\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38112914\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38112944\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38112957\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38112966\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38113094\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38113722\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38113724\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38113726\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38113727\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38113729\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38113732\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38113734\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38113737\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38113738\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38113742\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38113751\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38113783\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38113787\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38113792\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38114699\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38114700\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38115408\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38115410\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38115424\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38115433\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38115434\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38115436\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38115438\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38116211\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38116351\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38116460\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38215088\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38215156\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38215157\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38218395\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38218503\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38218505\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38219059\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38219861\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38220391\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38220399\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38220471\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38220488\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38220508\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38220564\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38220611\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38221025\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38221026\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38221809\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38222033\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38222038\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38223739\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38223740\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38224208\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38224583\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38224863\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38225531\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38225955\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38225970\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38226704\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38226708\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38227416\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38228146\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38228148\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38228153\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38228380\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38228387\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38229072\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38229301\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38229404\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38229410\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38229424\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38229425\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38229427\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38229430\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38229431\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38230099\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38230100\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38230102\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38230106\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38230158\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38230377\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38230383\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38230644\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38230651\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38230661\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38230663\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38230678\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38231019\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38231188\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38231219\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38231903\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38231954\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38231958\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38231970\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38231973\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38232241\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38232252\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38232253\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38232256\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38232263\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38232275\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38232299\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38232341\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38232352\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38232378\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38232379\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38233197\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38233235\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38233244\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38234314\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38235979\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38235988\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38236010\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38237962\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38239544\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240416\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240417\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240575\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240594\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240596\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240597\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240599\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240603\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240605\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240606\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240608\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240610\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240629\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240631\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240632\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240635\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240637\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240648\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240653\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240655\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240656\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240657\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240659\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240660\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240661\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240677\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240687\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240692\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240696\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240701\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38240702\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241022\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241024\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241025\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241028\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241030\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241039\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241040\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241044\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241045\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241046\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241047\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241099\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241103\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241107\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241113\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241120\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241122\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241125\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241126\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241127\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241128\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241129\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241130\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241131\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241139\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241148\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241152\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241157\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241164\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241165\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241167\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241169\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241171\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241251\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241274\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241275\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241279\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241321\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241335\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241340\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241346\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241357\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241358\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241361\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241362\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241363\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241369\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241371\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241563\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241571\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241575\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241588\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241590\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241591\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241593\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241611\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241617\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241619\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241621\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241633\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241638\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241667\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241668\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241702\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241717\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241722\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241725\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241737\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241740\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241745\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241774\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241782\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241783\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241785\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38241823\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38242038\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38242045\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38242046\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38242054\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38242060\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38242143\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38242148\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38242220\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38242688\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38242706\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38242747\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38242751\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38242778\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38243056\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38243057\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38243058\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38243059\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38243060\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38243061\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38243062\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38243069\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38243080\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38243081\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38243087\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38243249\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38243253\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38243309\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38243312\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38243313\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38243945\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38245276\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38245279\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38245280\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38245281\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38245282\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38245283\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38246094\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38246149\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38247399\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38247400\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38247401\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38247402\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38247403\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38248421\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38248422\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38248423\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38248425\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38248428\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38248447\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38248456\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38248460\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38248464\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38248469\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38248480\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38248498\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38248499\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38248506\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38248606\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38248641\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38248643\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38248654\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38248695\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38249019\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38249074\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38250025\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38250132\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38250139\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38250140\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38250141\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38250189\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38250487\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38250587\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38250589\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38250591\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38250647\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38250656\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38250657\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38250679\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38250681\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38250690\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38250698\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38250703\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38250713\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38250714\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38250870\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38250879\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38250883\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38250896\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38251185\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38253571\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38260204\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38260207\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38269580\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38271518\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38271677\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38272367\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38272371\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38272372\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38272380\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38272384\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38272385\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38272390\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38272391\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38272407\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38272413\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38272416\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38272417\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38272419\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38272420\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38272424\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38275081\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38275092\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38275153\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38279223\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38289458\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38289459\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38289460\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38293557\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38293663\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38293665\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38294955\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38294957\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38294963\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38294967\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38294968\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38295009\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38295010\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38295011\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38295013\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38295014\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38295015\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38295043\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38295354\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38295663\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38296516\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38296517\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38296521\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38296522\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38296532\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38296533\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38296552\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38296556\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38296575\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38297823\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38297828\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38297830\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38297831\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38297833\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38297854\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38297860\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38297862\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38297865\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38297866\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38297869\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38297870\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38297871\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38297872\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38297873\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38297875\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38297897\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38297906\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38297918\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38298160\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38298162\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38298165\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38298549\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38298633\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38299018\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38299266\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38299341\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38299442\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38299448\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38299474\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38299476\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38299485\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38299492\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38299498\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38299637\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38300252\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38300254\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38300258\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38300265\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38300270\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38300277\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38300305\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38300325\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38300326\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38300982\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38301204\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38301960\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38301961\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38301962\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38301963\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38302874\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38302980\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38401608\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38401618\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38401678\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38401679\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38404936\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38405024\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38405025\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38405066\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38405611\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38405628\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38405638\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38405639\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38406294\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38406920\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38406929\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38407039\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38407044\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38407095\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38407141\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38407546\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38407547\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38408292\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38408558\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38408562\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38408563\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38409768\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38409773\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38410632\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38411106\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38411384\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38412486\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38412522\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38412535\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38413234\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38413239\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38413951\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38414675\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38414676\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38414677\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38414678\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38414681\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38414682\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38414909\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38414914\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38414921\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38415598\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38415599\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38415822\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38415927\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38415940\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38415953\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38416393\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38416625\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38416629\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38416630\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38416634\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38416637\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38416638\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38416657\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38416909\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38416915\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38417007\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38417035\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38417174\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38417176\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38417179\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38417181\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38417194\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38417196\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38417197\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38417200\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38417203\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38417207\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38417211\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38417214\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38417217\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38417219\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38417288\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38417374\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38417724\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38418428\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38418429\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38418491\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38418494\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38418504\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38418507\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38418508\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38418775\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38418787\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38418789\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38418790\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38418797\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38418809\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38418833\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38418863\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38418875\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38418886\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38418912\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38419769\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38419777\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38419910\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38420495\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38420847\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38420850\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38421196\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38421376\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38421885\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38423039\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38423148\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38424171\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38426072\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427134\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427136\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427137\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427139\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427140\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427141\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427142\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427143\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427145\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427147\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427165\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427166\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427167\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427169\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427172\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427175\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427176\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427193\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427194\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427196\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427197\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427199\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427201\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427216\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427226\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427232\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427239\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427240\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427567\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427568\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427569\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427582\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427586\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427588\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427589\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427641\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427645\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427648\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427653\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427654\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427656\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427663\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427664\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427666\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427667\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427668\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427670\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427671\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427674\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427703\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427704\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427705\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427706\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427708\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427784\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427820\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427821\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427878\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427879\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427885\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427900\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427903\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427905\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427910\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38427923\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428081\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428087\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428101\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428110\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428111\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428126\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428129\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428162\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428163\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428177\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428206\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428220\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428222\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428253\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428263\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428264\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428268\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428278\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428320\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428352\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428569\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428584\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428585\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428586\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428587\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428592\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428594\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428595\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428597\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428616\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428618\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38428765\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38429225\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38429243\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38429261\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38429293\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38429318\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38429325\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38429579\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38429594\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38429595\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38429596\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38429597\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38429598\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38429599\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38429600\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38429605\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38429616\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38429619\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38429625\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38429787\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38429790\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38429796\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38429849\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38430489\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38431818\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38431820\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38431821\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38431822\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38431823\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38431824\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38432681\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38432684\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38433933\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38433934\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38433935\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38433937\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38433938\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38434114\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38434115\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38434947\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38434949\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38434970\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38434979\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38434986\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38434988\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38434994\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38434995\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38435001\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38435027\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38435033\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38435034\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38435035\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38435037\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38435128\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38435166\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38435170\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38435171\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38435172\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38435175\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38435176\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38435177\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38436543\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38436658\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38436659\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38436660\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38436706\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38437007\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38437008\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38437109\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38437112\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38437115\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38437118\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38437121\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38437169\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38437171\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38437172\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38437175\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38437177\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38437219\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38437232\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38437371\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38437372\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38437405\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38437422\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38443306\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38446726\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38447764\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38450652\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38456110\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38458889\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38458895\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38458897\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38458905\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38458908\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38458912\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38458913\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38458915\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38458916\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38458935\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38458944\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38458945\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38458946\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38458948\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38458950\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38458951\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38461596\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38461603\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38461617\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38472535\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38472669\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38472672\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38480175\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38480178\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38481335\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38481480\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38481482\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38481485\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38481493\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38481532\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38481533\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38481534\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38481535\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38481536\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38481537\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38481571\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38481985\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38482135\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38482756\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38483029\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38483034\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38483038\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38483041\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38483043\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38483052\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38483053\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38483054\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38483057\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38483076\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38483079\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38483096\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38484341\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38484342\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38484343\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38484348\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38484349\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38484355\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38484369\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38484374\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38484389\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38484390\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38484414\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38484417\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38484424\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38484433\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38484677\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38484678\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38484679\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38485061\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38485140\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38485540\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38485541\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38485545\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38485552\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38485678\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38485679\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38485974\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38486000\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38486006\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38486163\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38486789\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38486790\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38486792\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38486798\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38486799\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38486801\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38486803\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38486806\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38486807\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38486841\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38486842\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38486863\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38487703\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38487750\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38487755\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38488462\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38488463\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38488467\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38488488\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38588151\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38588206\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38588213\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38588214\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38589877\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38590106\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38590146\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38591551\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38591553\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38591592\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38592144\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38592159\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38592170\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38593441\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38593486\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38593548\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38593567\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38593572\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38593623\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38593625\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38593670\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38594063\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38594076\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38594866\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38595094\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38595096\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38595098\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38595099\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38595915\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38596296\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38596303\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38596304\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38596309\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38596635\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38596788\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38597253\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38597259\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38597893\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38597910\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38598997\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38599003\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38599038\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38599044\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38599048\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38599763\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38599768\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38600471\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38601204\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38601205\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38601206\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38601210\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38601211\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38601434\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38601449\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38602122\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38602349\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38602455\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38602475\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38602912\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38603158\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38603164\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38603166\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38603169\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38603438\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38603439\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38603462\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38603536\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38603708\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38603713\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38603719\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38603723\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38603729\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38603731\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38603732\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38603733\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38603741\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38604614\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38604619\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38605007\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38605016\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38605020\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38605028\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38605029\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38605032\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38605296\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38605308\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38605311\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38605331\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38605397\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38605430\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38605435\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38606300\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38606309\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38607381\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38609915\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38611565\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38611747\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38612413\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38612985\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38612986\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613649\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613656\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613665\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613666\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613670\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613671\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613672\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613674\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613675\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613676\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613677\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613678\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613680\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613682\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613702\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613703\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613704\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613705\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613708\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613709\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613730\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613731\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613732\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613734\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613735\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613737\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613739\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613752\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613764\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613773\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38613775\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614094\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614096\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614097\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614098\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614099\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614109\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614111\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614113\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614172\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614192\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614193\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614194\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614196\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614197\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614198\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614200\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614221\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614234\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614238\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614342\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614348\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614350\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614384\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614385\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614391\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614412\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614427\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614428\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614429\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614431\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614436\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614629\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614633\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614638\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614643\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614646\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614654\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614661\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614663\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614668\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614689\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614690\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614709\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614734\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614781\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614787\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614794\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614797\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614799\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614801\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614805\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614807\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614808\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614838\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614842\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614846\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614850\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614853\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614880\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38614917\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38615102\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38615114\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38615116\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38615124\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38615127\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38615162\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38615167\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38615219\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38615305\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38615590\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38615760\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38615767\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38615777\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38615821\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38615847\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38615853\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38616121\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38616122\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38616123\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38616124\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38616125\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38616126\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38616127\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38616145\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38616146\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38616154\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38616322\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38616325\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38616374\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38616380\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38617013\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38618315\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38618338\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38618339\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38618340\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38618341\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38618342\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38618344\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38618345\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38618346\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38618347\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38618385\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38618389\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38620464\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38620465\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38620466\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38620467\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38620468\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38620469\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38620470\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38620489\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38621502\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38621514\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38621520\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38621521\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38621528\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38621530\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38621531\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38621533\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38621534\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38621559\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38621561\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38621567\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38621568\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38621662\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38621669\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38621678\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38621697\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38621698\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38621702\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38621706\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38621707\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38621708\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38621710\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38621711\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38622081\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38622127\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38622879\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38623081\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38623196\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38623197\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38623198\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38623245\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38623543\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38623634\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38623641\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38623642\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38623692\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38623697\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38623710\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38623742\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38623746\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38623750\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38623752\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38623760\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38623761\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38623900\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38623923\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38623934\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38623936\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38623945\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38623955\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38625627\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38626637\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38626638\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38633232\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38635420\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38642618\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38642620\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38642621\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38644553\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38645397\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38645401\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38645402\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38645405\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38645412\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38645425\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38645443\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38645447\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38645448\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38645449\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38645451\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38648119\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38648120\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38652926\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38662500\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38665837\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38665839\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38666600\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38666708\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38666709\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38666710\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38667866\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38668012\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38668016\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38668017\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38668021\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38668055\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38668059\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38668061\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38668062\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38668063\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38668064\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38668065\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38668066\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38669279\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38669558\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38669559\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38669568\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38669569\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38669571\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38669580\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38669588\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38669599\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38669600\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38669611\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38669612\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38670865\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38670866\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38670867\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38670868\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38670869\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38670875\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38670879\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38670880\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38670889\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38670900\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38670914\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38670916\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38670918\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38670943\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38670958\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38671195\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38671198\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38671204\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38671585\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38671614\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38671615\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38671666\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38672060\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38672196\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38672262\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38672263\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38672490\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38672497\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38672502\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38672507\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38672522\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38672524\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38673306\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38673307\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38673310\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38673311\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38673313\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38673320\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38673322\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38673323\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38673324\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38673326\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38673359\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38673362\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38673366\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38673383\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38674268\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38675003\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38675009\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38675013\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38675022\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38676037\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38774669\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38774672\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38774737\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38775417\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38776631\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38778078\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38778079\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38778080\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38778635\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38778641\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38778665\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38779960\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38779961\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38779976\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38780089\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38780092\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38780144\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38780191\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38780596\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38781595\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38781612\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38781613\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38781614\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38781615\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38782442\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38782822\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38782829\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38782830\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38782833\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38782835\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38782836\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38783318\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38783788\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38783793\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38784168\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38785531\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38785532\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38785569\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38786286\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38786294\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38787007\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38787732\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38787733\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38787735\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38787737\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38787738\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38787974\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38788656\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38788658\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38788884\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38788989\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38788992\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38788995\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38789003\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38789004\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38789005\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38789693\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38789698\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38789699\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38789702\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38789706\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38789972\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38789973\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38790068\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38790255\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38790256\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38790277\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38790278\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38790625\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38790646\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38790732\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38790786\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38791217\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38791496\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38791557\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38791560\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38791561\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38791570\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38791573\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38791574\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38791812\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38791838\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38791851\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38791853\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38791854\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38791939\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38791972\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38792740\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38792831\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38792839\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38793912\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38793913\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38795565\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38796618\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800020\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800021\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800179\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800186\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800196\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800197\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800198\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800199\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800201\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800202\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800203\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800204\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800206\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800207\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800210\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800211\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800232\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800233\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800234\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800235\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800236\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800239\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800243\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800258\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800261\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800262\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800263\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800264\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800265\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800266\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800267\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800291\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800296\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800298\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800304\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800430\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800626\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800630\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800632\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800635\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800645\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800646\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800647\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800697\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800704\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800705\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800706\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800709\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800722\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800725\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800728\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800729\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800731\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800732\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800733\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800736\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800766\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800773\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800844\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800872\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800873\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800874\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800879\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800881\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800882\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800894\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800895\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800944\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800954\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800955\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800957\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800958\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800959\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38800965\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801155\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801167\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801168\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801174\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801182\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801186\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801189\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801191\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801216\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801232\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801233\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801237\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801269\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801284\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801288\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801332\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801335\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801365\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801371\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801373\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801375\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801377\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801383\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801631\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801635\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801648\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801649\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801651\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801653\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801657\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801658\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38801752\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38802282\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38802289\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38802297\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38802354\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38802355\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38802390\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38802656\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38802657\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38802658\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38802659\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38802660\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38802661\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38802683\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38802684\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38802685\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38802850\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38803539\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38804367\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38804762\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38804836\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38804863\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38804865\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38804866\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38804867\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38804869\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38804870\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38804871\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38804872\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38804873\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38804914\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38804916\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38805729\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38806026\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38806121\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38806734\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38806983\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38806984\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38806985\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38806986\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38806987\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38806988\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38807005\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38808030\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38808043\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38808044\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38808046\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38808047\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38808053\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38808054\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38808064\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38808082\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38808088\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38808089\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38808094\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38808195\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38808212\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38808219\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38808223\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38808224\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38808226\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38808229\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38808230\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38808231\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38808232\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38809590\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38809607\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38809719\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38809723\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38809725\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38809726\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38810075\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38810076\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38810165\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38810172\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38810173\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38810174\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38810175\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38810176\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38810178\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38810181\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38810233\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38810236\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38810241\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38810261\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38810265\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38810267\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38810275\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38810279\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38810280\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38810284\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38810292\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38810475\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38810479\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38810486\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38813167\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38819742\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38822148\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38830959\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38831936\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38831937\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38831948\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38831949\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38831956\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38831970\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38831975\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38831978\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38831985\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38833234\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38834660\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38834722\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38845583\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38845720\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38849024\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38849025\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38853116\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38853178\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38853234\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38853237\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38853238\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38854261\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38854407\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38854556\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38854557\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38854558\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38854559\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38854561\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38854562\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38854565\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38854597\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38854603\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38854605\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38854606\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38854607\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38854608\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38854609\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38854610\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38854944\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38856095\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38856096\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38856099\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38856100\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38856113\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38856116\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38856118\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38856121\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38856122\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38856138\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38856139\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38856148\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38856150\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38856589\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38857393\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38857394\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38857397\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38857398\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38857423\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38857431\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38857443\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38857444\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38857465\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38857469\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38857470\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38857474\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38857724\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38858179\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38858192\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38858592\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38858594\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38858600\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38858638\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38858640\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38858653\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38858726\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38858727\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38858793\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38858909\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38859034\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38859042\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38859050\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38859051\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38859070\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38859072\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38859838\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38859839\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38859841\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38859843\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38859845\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38859847\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38859850\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38859855\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38859856\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38859863\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38859866\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38859899\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38859900\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38859905\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38859914\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38860795\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38860797\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38861510\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38861541\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38861544\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38862573\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38961201\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38961207\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38961208\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38961214\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38961250\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38963163\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38964620\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38965220\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38965227\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38966492\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38966493\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38966507\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38966620\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38966623\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38966624\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38966629\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38966673\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38966674\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38968121\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38968140\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38969077\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38969353\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38969360\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38969367\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38969850\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38969859\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38970323\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38970328\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38970329\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38970708\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38972074\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38972075\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38972113\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38972823\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38972824\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38972831\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38974198\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38974260\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38974261\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38974265\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38974268\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38974499\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38975188\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38975410\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38975411\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38975513\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38975514\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38975517\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38975533\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38976219\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38976221\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38976231\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38976495\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38976496\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38976591\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38976757\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38976773\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38976775\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38976780\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38976790\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38976795\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38976796\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38977727\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38977741\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38978073\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38978077\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38978085\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38978086\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38978089\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38978361\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38978372\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38978373\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38978375\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38978396\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38978419\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38978461\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38978493\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38978582\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38979318\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38979348\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38979357\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38980434\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38980436\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38980437\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38982129\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38983768\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38985104\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38985228\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38985465\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986297\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986546\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986716\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986717\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986726\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986727\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986731\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986733\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986734\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986736\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986737\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986739\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986740\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986758\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986759\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986761\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986764\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986765\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986768\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986771\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986790\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986791\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986792\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986793\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986795\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986820\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986831\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986834\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38986835\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987161\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987162\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987164\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987168\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987176\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987180\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987227\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987228\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987234\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987238\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987239\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987246\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987252\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987256\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987257\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987258\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987259\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987260\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987262\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987264\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987269\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987279\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987281\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987287\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987295\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987297\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987300\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987302\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987371\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987372\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987412\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987425\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987445\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987449\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987461\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987467\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987471\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987474\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987475\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987484\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987485\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987487\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987488\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987490\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987493\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987678\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987689\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987691\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987692\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987714\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987717\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987719\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987767\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987805\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987843\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987846\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987861\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987864\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987865\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987867\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987871\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987897\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38987907\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38988164\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38988177\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38988179\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38988181\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38988182\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38988185\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38988186\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38988187\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38988191\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38988800\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38988808\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38988834\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38988877\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38988879\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38988880\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38988916\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38988918\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38989184\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38989185\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38989186\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38989187\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38989188\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38989189\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38989197\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38989378\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38989431\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38989436\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38990061\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38991398\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38991399\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38991400\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38991401\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38991402\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38991403\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38991405\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38991406\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38991448\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38992253\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38992319\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38992515\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38992651\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38993516\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38993518\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38993519\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38993520\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38993521\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38993522\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38993533\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38994570\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38994571\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38994572\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38994574\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38994575\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38994576\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38994577\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38994584\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38994613\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38994729\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38994745\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38994747\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38994754\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38994756\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38994758\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38994760\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38994761\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38996138\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38996254\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38996256\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38996257\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38996605\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38996606\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38996701\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38996703\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38996710\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38996756\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38996759\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38996760\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38996765\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38996769\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38996810\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38996811\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38996814\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38996819\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38996820\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38996821\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38996966\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38996991\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38997008\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38997011\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-38998694\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39002881\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39014959\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39015686\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39017630\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39018461\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39018462\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39018468\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39018469\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39018476\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39018478\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39018484\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39018485\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39018488\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39018494\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39018497\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39018501\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39018508\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39018516\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39018520\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39018521\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39018523\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39018524\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39019768\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39019775\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39021201\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39032108\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39032242\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39032246\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39035534\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39039694\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39039748\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39041035\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39041060\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39041063\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39041064\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39041066\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39041111\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39041112\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39041113\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39041114\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39041115\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39041116\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39041452\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39041453\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39041454\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39041711\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39042612\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39042618\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39042619\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39042620\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39042632\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39042635\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39042643\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39042644\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39042653\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39042661\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39042664\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39043822\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39043914\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39043916\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39043918\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39043922\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39043927\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39043947\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39043948\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39043963\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39043967\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39043988\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39043989\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39043990\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39044242\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39044243\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39044632\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39044701\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39044714\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39044716\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39045107\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39045112\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39045113\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39045152\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39045244\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39045354\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39045360\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39045542\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39045543\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39045571\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39045579\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39045581\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39045702\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39045740\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39046346\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39046348\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39046350\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39046354\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39046357\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39046360\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39046362\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39046363\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39046366\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39046367\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39046368\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39046410\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39046414\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39046415\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39046422\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39047255\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39047296\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39047307\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39047309\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39047311\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39047312\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39047314\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39047315\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39048030\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39048031\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39048061\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39048067\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39048910\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39049091\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39049133\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39147725\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39147787\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39149686\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39151136\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39151730\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39151751\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39151752\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39153030\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39153031\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39153158\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39153159\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39153162\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39153194\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39153211\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39153212\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39153259\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39153653\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39154079\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39154407\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39154453\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39154660\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39154676\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39154678\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39154681\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39155884\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39155885\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39155892\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39156379\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39156725\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39156847\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39156853\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39157235\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39158587\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39159331\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39160780\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39160781\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39160784\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39160785\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39160788\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39161017\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39161021\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39161024\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39161706\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39161926\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39161927\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39162027\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39162028\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39162036\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39162038\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39162047\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39162048\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39162731\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39162733\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39162736\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39162737\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39162739\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39162747\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39162793\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39163014\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39163275\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39163283\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39163284\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39163299\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39163303\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39163312\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39163315\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39163829\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39164534\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39164602\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39164603\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39164612\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39164615\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39164616\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39164888\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39164899\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39164902\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39164924\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39164947\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39164968\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39164989\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39165776\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39165779\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39165788\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39165832\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39165850\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39165880\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39165888\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39166018\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39166958\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39167001\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39169055\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173057\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173154\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173228\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173243\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173246\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173249\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173251\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173252\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173273\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173276\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173279\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173280\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173281\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173283\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173305\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173308\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173309\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173311\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173341\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173349\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173675\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173678\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173681\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173684\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173686\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173688\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173690\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173691\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173693\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173694\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173739\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173741\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173745\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173747\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173749\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173765\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173770\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173772\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173773\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173774\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173776\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173780\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173796\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173797\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173809\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173811\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173812\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173816\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173890\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173892\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173921\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173929\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173958\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173968\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39173993\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174005\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174006\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174007\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174008\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174014\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174201\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174210\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174214\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174215\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174222\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174224\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174227\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174231\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174241\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174275\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174277\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174293\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174320\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174321\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174336\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174378\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174382\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174390\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174391\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174394\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174422\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174423\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174425\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174430\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174431\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174434\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174466\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174684\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174702\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174703\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174704\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174705\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174714\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174731\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39174818\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39175324\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39175342\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39175352\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39175380\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39175409\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39175410\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39175411\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39175435\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39175436\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39175710\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39175711\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39175712\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39175713\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39175714\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39175715\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39175736\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39175907\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39175967\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39177922\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39177923\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39177924\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39177925\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39177926\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39177927\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39177928\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39177929\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39178759\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39178889\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39179074\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39179079\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39180040\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39180041\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39180042\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39180044\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39180063\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39181053\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39181069\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39181086\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39181090\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39181092\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39181093\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39181096\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39181102\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39181132\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39181133\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39181142\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39181143\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39181227\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39181229\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39181268\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39181269\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39181274\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39181276\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39181279\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39181646\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39182653\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39182771\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39182772\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39183211\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39183216\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39183218\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39183266\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39183277\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39183283\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39183306\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39183308\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39183310\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39183317\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39183318\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39183319\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39183330\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39183332\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39183333\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39183334\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39183520\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39191634\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39202209\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39205005\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39205008\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39205015\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39205016\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39205028\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39205037\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39205045\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39205048\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39205049\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39206304\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39207717\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39207731\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39207733\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39218547\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39218588\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39222066\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39225402\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39226216\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39226278\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39226279\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39227587\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39227588\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39227591\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39227636\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39227637\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39227638\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39227639\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39227641\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39227664\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39227981\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39227982\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39228099\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39228845\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39229145\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39229146\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39229147\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39229148\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39229157\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39229165\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39229174\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39229191\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39229194\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39229989\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39230361\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39230457\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39230460\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39230466\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39230467\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39230490\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39230496\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39230505\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39230508\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39230531\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39230532\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39230541\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39230543\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39230783\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39230784\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39230792\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39230793\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39231029\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39231166\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39231637\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39231642\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39231776\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39231779\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39231891\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39231894\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39231895\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39231936\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39231972\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39231973\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39232073\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39232075\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39232080\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39232113\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39232235\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39232881\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39232882\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39232894\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39232897\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39232898\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39232903\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39232939\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39232949\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39232953\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39233829\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39233849\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39233850\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39234592\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39234594\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39234595\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39334096\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39334247\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39334258\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39334260\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39334312\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39338225\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39338235\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39338275\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39338282\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39338303\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39338308\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39338931\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39339555\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39339682\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39339738\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39339757\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39339785\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39340174\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39340602\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39340982\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39341187\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39341203\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39342415\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39342416\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39342424\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39343379\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39343384\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39343763\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39345112\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39345115\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39345116\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39345121\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39345148\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39345859\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39347256\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39347324\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39347327\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39347556\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39348474\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39348475\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39348576\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39348596\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39348599\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39349024\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39349559\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39349824\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39349831\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39349833\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39349835\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39349843\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39349844\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39349848\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39349856\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39349861\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39349865\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39350258\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39351054\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39351077\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39351140\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39351144\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39351145\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39351154\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39351157\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39351437\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39351440\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39351462\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39351507\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39351529\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39351547\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39351562\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39351651\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39351652\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39352188\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39352369\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39352379\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39352416\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39352417\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39352425\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39352555\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39353503\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39353504\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39353505\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39353506\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39353507\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39353831\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39358520\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39358522\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39359352\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39359369\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39359591\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39359774\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39359778\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39359780\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39359782\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39359783\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39359784\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39359785\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39359786\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39359787\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39359807\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39359809\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39359815\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39359818\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39359835\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39359839\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39359840\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39359842\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39359843\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39359844\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39359873\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39359876\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39359882\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360220\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360227\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360276\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360280\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360292\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360298\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360299\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360300\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360303\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360304\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360305\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360306\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360311\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360341\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360343\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360344\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360418\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360421\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360457\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360461\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360475\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360502\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360503\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360524\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360539\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360541\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360543\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360550\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360759\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360764\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360767\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360772\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360775\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360802\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360804\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360805\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360816\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360819\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360821\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360848\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360867\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360871\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360877\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360902\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360906\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360907\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360908\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360917\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360919\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360920\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360922\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360923\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360951\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360958\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39360997\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39361026\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39361213\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39361227\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39361228\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39361230\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39361233\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39361236\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39361237\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39361238\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39361240\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39361241\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39361260\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39361262\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39361265\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39361855\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39361860\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39361883\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39361928\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39361931\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39361932\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39361963\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39361964\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39362234\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39362236\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39362237\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39362238\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39362239\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39362240\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39362242\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39362244\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39362251\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39362482\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39363120\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39364448\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39364449\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39364451\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39364452\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39364453\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39364454\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39364455\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39364456\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39365263\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39365309\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39365349\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39365605\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39366574\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39366576\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39366577\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39366578\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39366579\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39366596\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39366597\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39367587\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39367613\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39367615\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39367621\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39367623\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39367628\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39367631\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39367634\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39367635\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39367636\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39367638\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39367663\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39367666\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39367673\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39367674\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39367675\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39367765\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39367769\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39367772\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39367775\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39367784\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39367807\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39367809\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39367814\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39367815\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39367818\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39369194\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39369287\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39369309\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39369310\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39369311\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39369654\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39369655\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39369656\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39369747\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39369751\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39369754\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39369802\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39369813\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39369818\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39369836\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39369838\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39369846\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39369848\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39369856\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39369873\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39370037\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39370049\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39370054\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39371736\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39372727\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39375922\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39377743\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39391529\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39391532\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39391535\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39391539\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39391540\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39391541\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39391542\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39391544\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39391547\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39391553\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39391570\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39391576\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39394249\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39394258\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39394320\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39394322\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39405103\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39405104\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39405166\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39405301\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39408600\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39413962\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39414085\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39414088\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39414108\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39414116\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39414118\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39414121\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39414160\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39414161\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39414162\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39414164\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39414165\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39415357\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39415376\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39415659\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39415661\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39415666\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39415670\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39415681\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39415688\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39415693\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39415694\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39415696\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39415708\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39415716\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39415718\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39415725\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39416887\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39416978\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39416979\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39417012\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39417014\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39417023\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39417030\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39417050\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39417054\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39417056\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39417063\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39417068\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39417312\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39417316\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39417318\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39417689\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39417727\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39417777\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39417780\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39417784\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39417785\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39417833\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39418164\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39418168\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39418169\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39418230\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39418231\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39418306\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39418422\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39418424\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39418613\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39418632\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39418637\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39418640\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39419414\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39419415\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39419420\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39419421\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39419423\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39419428\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39419435\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39419442\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39419471\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39419479\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39419482\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39419485\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39419489\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39419698\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39421103\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39421119\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39421120\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39421127\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39421128\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39421129\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39422154\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39422198\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39520572\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39520774\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39520781\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39520837\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39522727\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39523238\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39523862\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39524196\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39524754\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39524826\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39526087\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39526210\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39526211\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39526266\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39526313\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39526703\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39527170\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39527511\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39527739\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39527741\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39528084\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39528368\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39528949\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39528958\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39529443\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39529912\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39529917\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39530297\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39531434\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39531649\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39531650\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39531681\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39531703\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39532390\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39533848\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39533849\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39533854\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39534083\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39534087\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39534089\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39535008\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39535108\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39535109\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39535110\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39535112\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39535117\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39535140\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39535814\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39535823\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39535826\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39535894\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39536083\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39536095\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39536106\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39536361\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39536362\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39536365\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39536369\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39536379\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39536380\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39536381\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39536385\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39536389\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39536398\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39536720\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39536745\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39536909\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39536943\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39537275\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39537555\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39537609\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39537675\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39537676\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39537678\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39537686\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39537689\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39537957\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39537969\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39537972\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39537980\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39538059\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39538092\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39538185\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39538901\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39538949\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39538950\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39539615\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39540043\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39540044\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39540047\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39540435\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39541726\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39541731\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39543609\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39544412\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39545639\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546310\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546312\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546314\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546317\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546318\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546319\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546320\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546321\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546324\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546343\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546344\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546347\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546349\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546373\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546375\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546378\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546379\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546382\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546404\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546405\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546413\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546414\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546546\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546740\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546747\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546757\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546759\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546807\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546810\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546811\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546816\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546834\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546837\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546838\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546841\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546860\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546872\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546873\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546877\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546950\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546955\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546957\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39546985\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547009\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547023\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547027\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547048\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547052\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547056\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547061\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547070\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547073\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547075\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547077\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547260\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547266\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547269\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547280\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547284\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547287\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547288\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547289\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547304\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547307\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547327\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547341\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547342\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547346\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547370\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547389\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547393\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547402\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547429\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547433\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547434\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547451\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547480\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547482\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547523\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547524\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547755\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547756\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547758\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547764\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39547784\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39548391\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39548399\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39548405\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39548411\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39548460\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39548462\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39548463\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39548492\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39548764\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39548765\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39548766\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39548767\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39548768\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39548769\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39548770\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39548772\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39548793\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39548962\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39549014\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39549019\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39549020\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39550968\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39550969\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39550970\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39550973\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39550976\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39550977\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39551871\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39552127\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39552887\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39553099\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39553100\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39553103\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39553121\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39553430\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39554133\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39554141\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39554142\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39554160\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39554164\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39554166\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39554168\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39554171\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39554201\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39554205\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39554208\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39554209\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39554210\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39554297\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39554306\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39554329\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39554331\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39554333\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39554335\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39554340\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39554346\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39555261\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39555715\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39555716\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39555799\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39555808\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39555829\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39555830\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39555831\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39555882\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39556174\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39556175\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39556274\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39556278\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39556332\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39556333\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39556336\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39556337\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39556340\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39556342\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39556369\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39556373\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39556380\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39556381\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39556389\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39556392\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39556394\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39556396\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39556397\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39556398\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39556399\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39556533\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39556555\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39556565\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39556578\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39556882\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39559250\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39562449\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39562450\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39564876\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39565905\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39578043\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39578045\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39578050\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39578059\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39578062\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39578063\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39578067\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39578073\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39578084\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39578085\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39578098\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39578099\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39580779\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39580786\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39580788\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39584619\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39591698\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39599235\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39599344\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39599345\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39600496\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39600645\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39600691\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39600692\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39600693\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39600694\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39600695\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39601386\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39601916\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39602204\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39602207\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39602209\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39602210\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39602211\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39602212\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39602232\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39602233\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39602237\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39602239\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39602240\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39602249\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39602252\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39602259\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39602261\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39603414\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39603515\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39603541\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39603543\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39603546\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39603556\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39603561\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39603585\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39603586\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39603587\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39603856\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39604225\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39604229\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39604231\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39604263\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39604272\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39604752\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39604769\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39604816\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39604839\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39605138\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39605141\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39605158\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39605161\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39605946\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39605949\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39605950\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39605961\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39605964\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39605967\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39606000\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39606003\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39606006\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39606016\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39606018\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39606922\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39606924\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39607635\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39607657\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39608499\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39608576\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39608684\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39608685\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39707297\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39707298\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39707307\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39707317\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39707330\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39707359\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39707364\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39707365\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39709258\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39709516\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39709718\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39711294\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39712616\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39712662\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39712741\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39712744\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39712749\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39712843\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39713231\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39713704\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39713831\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39714015\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39714031\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39714039\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39714270\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39714873\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39715477\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39715971\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39716435\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39716440\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39716470\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39716821\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39718188\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39718192\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39718219\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39718237\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39718932\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39720379\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39720380\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39720381\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39720382\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39720387\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39720615\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39721539\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39721647\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39721651\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39721655\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39721663\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39721673\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39721674\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39722341\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39722346\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39722349\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39722354\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39722417\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39722623\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39722635\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39722910\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39722914\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39722919\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39722920\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39722923\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39722931\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39722985\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39723087\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39724140\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39724204\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39724205\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39724214\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39724486\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39724497\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39724500\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39724508\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39724544\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39724584\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39724595\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39724619\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39724711\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39724858\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39725383\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39725430\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39725477\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39725478\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39725616\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39726839\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39726850\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39726957\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39727083\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39730728\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39731583\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39731584\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39731776\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39732836\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39732837\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39732842\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39732844\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39732845\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39732848\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39732849\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39732850\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39732853\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39732872\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39732875\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39732877\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39732879\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39732902\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39732904\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39732906\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39732907\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39732908\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39732931\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39732935\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39732938\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39732943\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733023\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733275\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733277\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733278\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733283\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733288\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733289\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733294\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733346\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733347\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733353\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733358\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733362\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733367\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733369\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733370\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733372\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733373\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733374\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733388\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733391\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733392\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733394\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733406\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733407\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733409\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733412\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733482\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733495\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733515\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733522\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733524\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733541\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733556\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733580\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733588\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733598\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733599\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733600\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733601\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733603\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733604\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733605\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733609\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733780\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733796\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733797\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733798\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733799\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733800\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733801\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733803\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733811\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733814\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733829\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733832\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733836\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733860\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733862\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733864\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733873\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733875\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733877\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733901\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733908\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733920\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733950\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733951\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733954\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733972\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39733977\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39734013\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39734015\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39734019\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39734020\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39734022\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39734023\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39734280\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39734282\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39734284\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39734285\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39734286\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39734288\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39734289\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39734291\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39734292\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39734309\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39734327\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39734384\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39734408\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39734906\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39734930\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39734987\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39734988\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39735010\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39735286\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39735287\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39735288\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39735289\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39735290\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39735291\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39735292\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39735294\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39735297\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39735299\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39735532\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39736171\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39737487\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39737493\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39737495\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39737496\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39737500\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39737501\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39738365\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39738372\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39738653\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39738658\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39738758\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39739626\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39739627\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39739631\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39739633\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39739634\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39740627\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39740640\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39740669\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39740671\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39740679\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39740680\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39740687\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39740690\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39740717\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39740728\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39740729\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39740821\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39740830\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39740834\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39740836\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39740907\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39742245\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39742350\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39742361\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39742362\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39742363\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39742709\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39742818\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39742860\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39742866\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39742873\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39742905\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39742908\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39742910\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39742914\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39742926\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39742929\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39742930\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39742934\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39743112\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39743113\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39745707\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39750837\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39751227\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39756327\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39760246\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39761558\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39763730\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39764571\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39764577\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39764586\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39764589\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39764591\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39764595\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39764600\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39764609\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39764615\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39764620\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39764622\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39767304\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39767373\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39773180\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39778365\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39785012\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39785879\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39786895\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39787034\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39787177\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39787182\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39787186\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39787228\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39787229\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39787230\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39787231\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39787232\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39787258\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39788741\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39788742\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39788744\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39788758\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39788759\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39788763\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39788769\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39788773\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39788779\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39788788\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39788793\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39788794\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39788799\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39789000\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39789244\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39789944\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39790039\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39790041\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39790046\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39790071\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39790074\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39790076\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39790080\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39790090\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39790113\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39790114\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39790115\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39790122\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39790128\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39790373\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39790385\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39790760\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39790797\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39790853\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39791235\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39791298\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39791370\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39791564\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39791657\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39791660\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39791663\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39791666\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39791668\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39791692\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39791858\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39792473\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39792474\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39792476\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39792479\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39792480\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39792481\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39792490\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39792492\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39792493\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39792496\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39792502\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39792533\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39792538\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39792546\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39792549\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39793446\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39793449\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39793451\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39794161\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39795101\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39795209\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39893822\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39893826\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39893832\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39893834\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39893852\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39893884\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39893889\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39893890\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39895788\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39896914\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39897806\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39897815\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39897821\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39897822\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39897870\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39897891\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39899143\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39899157\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39899163\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39899189\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39899267\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39899271\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39899273\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39899322\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39899324\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39899774\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39900229\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39900554\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39900555\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39900768\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39900787\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39900790\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39901030\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39901999\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39902493\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39902954\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39902959\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39903341\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39903617\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39904715\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39904750\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39904769\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39905431\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39906910\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39906911\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39906912\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39906914\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39906918\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39906921\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39907150\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39907154\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39907830\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39907831\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39908058\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39908161\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39908167\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39908171\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39908178\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39908188\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39908862\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39908868\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39908869\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39908875\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39908876\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39909138\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39909143\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39909233\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39909408\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39909415\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39909426\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39909433\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39909447\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39910362\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39910711\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39910731\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39910734\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39911013\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39911014\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39911029\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39911037\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39911073\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39911112\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39911124\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39911131\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39911146\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39911160\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39911384\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39911951\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39911965\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39911999\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39912137\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39912678\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39913096\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39913098\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39913408\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39914749\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39916158\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39917251\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39917258\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39918113\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39918115\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919178\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919361\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919365\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919367\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919368\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919370\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919371\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919373\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919375\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919395\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919396\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919397\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919398\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919400\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919403\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919406\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919420\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919428\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919430\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919431\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919432\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919459\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919462\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919463\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919467\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919797\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919808\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919809\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919810\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919812\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919814\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919860\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919865\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919869\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919871\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919872\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919881\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919885\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919886\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919887\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919888\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919889\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919890\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919891\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919892\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919893\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919894\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919926\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919927\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919928\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919930\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919931\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39919934\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920073\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920080\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920085\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920089\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920098\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920102\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920111\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920120\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920122\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920123\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920124\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920125\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920126\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920140\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920308\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920320\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920321\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920332\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920342\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920348\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920352\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920354\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920388\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920394\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920447\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920472\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920483\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920485\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920487\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920501\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920528\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920533\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920537\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920790\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920805\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920808\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920809\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920810\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920811\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920813\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920814\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920816\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920818\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39920917\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39921422\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39921429\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39921432\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39921447\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39921537\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39921795\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39921814\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39921815\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39921816\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39921817\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39921818\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39921819\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39921820\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39921822\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39921826\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39921827\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39921828\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39921829\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39921845\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39922694\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39924014\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39924015\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39924016\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39924020\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39924021\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39924891\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39925216\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39926149\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39926150\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39926152\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39926153\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39926154\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39926157\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39926158\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39926163\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39927167\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39927168\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39927178\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39927190\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39927202\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39927204\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39927207\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39927209\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39927243\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39927252\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39927256\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39927355\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39927357\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39927382\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39927383\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39927384\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39927388\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39927390\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39927394\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39928775\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39928792\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39928889\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39928890\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39928891\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39929236\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39929331\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39929343\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39929344\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39929388\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39929392\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39929397\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39929399\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39929400\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39929410\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39929433\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39929443\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39929445\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39929449\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39929451\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39929456\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39929457\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39929459\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39929630\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39929635\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39929637\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39929644\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39929647\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39935518\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39937407\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39938943\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39938948\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39939675\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39942136\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39951111\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39951117\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39951125\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39951134\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39951136\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39951137\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39951140\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39951142\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39951156\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39951158\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39951163\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39951165\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39952401\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39953825\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39953828\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39953829\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39953901\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39968202\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39968204\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39970765\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39973563\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39973711\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39973713\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39973716\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39973722\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39973763\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39973765\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39973766\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39973767\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39973768\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39974414\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39974457\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39974984\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39975266\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39975271\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39975272\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39975273\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39975274\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39975276\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39975277\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39975278\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39975288\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39975291\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39975301\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39975305\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39975308\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39976567\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39976568\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39976575\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39976590\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39976598\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39976604\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39976612\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39976615\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39976617\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39976639\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39976642\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39976649\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39976654\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39976658\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39976951\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39977321\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39977322\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39977762\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39977766\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39977893\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39978191\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39978193\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39978196\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39978198\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39978221\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39978375\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39978996\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39978999\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39979000\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39979003\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39979005\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39979012\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39979022\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39979052\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39979059\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39979061\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39979071\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39979924\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39979979\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39979980\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39980718\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39980720\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39981636\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-39981743\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40080203\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40080276\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40080372\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40080418\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40080423\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40080424\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40082273\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40082313\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40082570\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40084326\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40084329\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40084330\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40084383\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40084384\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40085063\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40085659\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40085673\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40085705\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40085748\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40085768\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40085785\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40085791\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40085841\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40085843\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40086245\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40086300\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40087075\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40087076\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40087290\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40088521\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40088526\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40089016\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40089491\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40089496\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40089868\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40090152\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40090408\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40091245\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40091254\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40091277\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40091942\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40091986\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40092714\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40093395\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40093435\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40093436\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40093437\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40093441\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40093443\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40093446\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40093673\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40093681\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40094347\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40094348\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40094573\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40094673\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40094675\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40094679\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40094685\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40094688\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40094692\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40094698\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40094699\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40095123\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40095373\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40095376\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40095377\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40095379\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40095380\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40095383\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40095658\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40095663\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40095926\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40095927\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40095930\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40095933\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40095939\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40095943\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40095946\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40095947\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40095963\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40095964\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40096354\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40097245\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40097249\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40097264\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40097279\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40097530\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40097531\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40097542\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40097545\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40097553\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40097630\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40097641\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40097663\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40098473\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40098482\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40098521\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40098658\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40099257\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40099314\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40099614\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40099615\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40100127\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40103246\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40103348\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40104168\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40104633\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105697\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105874\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105878\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105880\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105884\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105887\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105888\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105889\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105890\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105892\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105909\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105910\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105911\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105912\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105913\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105915\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105919\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105922\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105934\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105935\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105938\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105939\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105940\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105941\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105942\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105943\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105961\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105979\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40105982\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106309\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106313\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106323\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106326\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106331\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106384\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106386\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106388\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106389\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106390\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106392\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106408\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106410\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106412\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106413\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106414\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106415\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106418\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106429\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106449\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106520\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106559\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106596\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106613\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106616\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106636\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106638\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106639\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106640\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106641\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106642\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106832\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106839\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106841\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106844\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106845\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106861\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106863\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106878\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106905\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106907\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106916\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106958\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106960\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40106975\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40107001\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40107008\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40107015\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40107020\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40107021\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40107022\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40107023\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40107025\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40107057\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40107061\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40107106\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40107332\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40107334\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40107339\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40107340\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40107341\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40107378\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40107509\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40107639\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40107950\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40107968\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40107970\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40107985\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40108023\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40108026\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40108048\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40108062\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40108333\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40108334\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40108335\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40108336\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40108337\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40108339\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40108341\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40108342\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40108347\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40108348\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40108363\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40108364\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40108590\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40109225\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40110510\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40110539\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40110541\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40110544\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40110546\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40111410\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40111412\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40111413\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40111740\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40112670\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40112671\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40112672\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40112673\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40112675\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40112676\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40112677\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40113695\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40113715\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40113722\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40113730\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40113734\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40113740\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40113774\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40113775\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40113778\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40113779\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40113781\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40113876\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40113885\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40113886\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40113893\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40113911\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40113917\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40113920\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40115302\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40115397\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40115419\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40115420\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40115421\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40115869\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40115922\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40115926\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40115931\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40115954\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40115958\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40115971\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40115976\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40115981\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40116111\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40116140\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40116151\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40116463\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40118862\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40119564\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40125305\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40125462\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40125817\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40134632\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40136795\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40137642\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40137643\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40137647\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40137649\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40137657\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40137658\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40137661\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40137663\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40137673\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40137684\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40137685\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40137687\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40137691\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40137694\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40137695\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40140356\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40140357\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40140359\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40140365\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40140427\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40144206\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40158060\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40158876\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40158935\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40160083\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40160236\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40160238\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40160240\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40160275\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40160281\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40160282\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40160284\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40160310\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40160313\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40160342\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40160939\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40161807\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40161808\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40161809\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40161815\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40161833\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40161838\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40162046\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40163082\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40163083\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40163086\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40163089\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40163094\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40163108\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40163116\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40163123\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40163125\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40163129\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40163130\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40163132\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40163135\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40163160\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40163167\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40163178\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40163426\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40163429\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40163798\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40163800\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40163803\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40163836\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40164271\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40164334\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40164404\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40164703\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40164704\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40164706\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40164741\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40164891\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40164895\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40165507\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40165515\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40165516\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40165537\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40165564\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40165565\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40165571\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40165574\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40165575\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40165576\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40166487\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40167202\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40167220\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40167222\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40167225\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40167234\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40168149\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40266781\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40266813\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40266881\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40266887\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40266888\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40266889\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40266899\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40266947\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40266952\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40266953\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40269243\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40270305\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40270913\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40270936\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40271554\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40272189\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40272197\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40272271\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40272309\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40272364\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40272366\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40272827\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40272828\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40273564\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40273565\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40273602\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40273813\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40273834\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40274948\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40275055\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40275542\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40276015\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40276387\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40276665\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40277311\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40277764\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40277792\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40277812\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40278493\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40278504\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40278508\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40278513\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40279222\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40279231\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40279955\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40279956\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40279957\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40279960\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40279962\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40279964\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40280176\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40280192\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40280193\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40280198\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40280878\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40280879\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40281109\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40281185\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40281211\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40281221\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40281227\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40281233\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40281234\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40281918\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40281922\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40281926\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40281929\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40282187\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40282193\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40282198\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40282459\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40282462\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40282464\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40282467\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40282468\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40282479\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40282487\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40282491\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40282498\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40282555\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40283362\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40283766\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40283767\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40283770\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40284049\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40284050\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40284064\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40284071\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40284150\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40284161\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40284676\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40285001\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40285048\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40285769\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40286132\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40286399\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40288307\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40288840\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40289633\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40290307\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40291164\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40291236\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40291430\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40291980\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292229\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292408\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292415\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292417\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292420\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292422\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292423\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292442\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292443\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292444\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292446\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292447\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292448\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292450\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292464\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292468\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292471\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292473\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292474\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292475\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292476\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292477\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292487\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292501\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292502\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292504\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292506\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292512\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292840\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292845\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292857\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292859\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292862\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292913\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292916\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292923\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292930\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292932\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292938\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292939\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292940\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292942\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292943\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292944\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292945\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292946\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292950\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292963\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292968\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292978\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292979\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292981\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292983\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40292987\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293059\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293063\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293067\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293099\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293100\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293115\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293151\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293152\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293154\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293158\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293172\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293173\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293176\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293177\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293179\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293371\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293377\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293380\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293384\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293393\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293394\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293408\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293440\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293441\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293444\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293454\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293491\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293494\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293497\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293503\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293507\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293513\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293514\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293543\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293545\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293547\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293559\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293560\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293563\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293587\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293597\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293602\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293640\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293642\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293852\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293863\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293867\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293870\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293871\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293875\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293876\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293911\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293959\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40293961\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40294172\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40294477\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40294483\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40294487\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40294500\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40294505\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40294559\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40294560\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40294589\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40294869\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40294870\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40294871\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40294872\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40294873\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40294874\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40294875\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40294877\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40294880\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40294893\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40294900\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40295061\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40295067\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40295116\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40296973\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40297079\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40297083\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40297084\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40297085\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40297518\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40297911\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40297945\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40297980\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40298264\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40299202\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40299203\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40299205\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40299206\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40299208\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40299209\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40299227\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40300218\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40300243\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40300245\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40300247\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40300255\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40300256\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40300259\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40300262\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40300268\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40300298\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40300306\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40300308\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40300396\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40300399\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40300408\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40300409\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40300413\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40300414\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40300438\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40300446\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40300447\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40300449\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40301817\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40301905\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40301931\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40301932\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40301981\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40302281\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40302282\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40302283\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40302382\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40302383\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40302385\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40302387\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40302389\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40302436\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40302441\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40302445\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40302450\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40302451\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40302471\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40302475\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40302480\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40302505\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40302507\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40302509\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40302519\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40302640\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40302641\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40302664\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40302665\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40302675\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40302676\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40302687\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40302984\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40305383\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40308566\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40320649\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40320652\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40321379\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40323201\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40324162\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40324173\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40324181\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40324182\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40324186\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40324189\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40324192\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40324194\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40324209\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40324217\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40324219\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40324220\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40324224\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40324226\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40326872\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40326874\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40337956\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40340425\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40341250\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40345457\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40345459\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40346470\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40346749\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40346751\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40346755\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40346756\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40346759\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40346791\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40346797\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40346798\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40346799\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40346800\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40346801\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40346802\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40347141\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40348317\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40348328\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40348329\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40348333\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40348334\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40348354\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40348356\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40348364\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40348569\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40349613\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40349614\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40349615\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40349617\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40349619\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40349624\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40349625\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40349626\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40349640\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40349643\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40349646\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40349650\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40349652\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40349654\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40349659\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40349686\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40349691\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40349692\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40349707\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40349943\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40349947\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40349950\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40350334\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40350390\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40350414\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40350416\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40350803\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40350805\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40351052\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40351232\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40351234\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40351238\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40351264\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40351280\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40351293\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40351422\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40351427\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40352041\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40352043\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40352044\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40352045\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40352047\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40352050\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40352051\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40352056\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40352091\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40352097\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40352098\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40352101\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40352103\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40352105\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40352106\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40353015\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40353016\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40353018\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40353755\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40353757\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000},{\"containerCodeName\":\"CONT-40354676\",\"locationCodeName\":\"CONT-37539683\",\"modifiedBy\":\"acas\",\"modifiedDate\":1465847872000}]";
 		Collection<ContainerLocationDTO> requestDTOs = ContainerLocationDTO.fromJsonArrayToContainerLocatioes(json);
 		containerService.moveToLocation(requestDTOs);
 	}
+
 	@Test
-    @Transactional
-    public void searchContainerCodesByContainerValue() throws Exception{
-    	ContainerValueRequestDTO requestDTO = new ContainerValueRequestDTO();
-    	requestDTO.setContainerType("container");
-    	requestDTO.setContainerKind("plate");;
-    	requestDTO.setStateType("metadata");
-    	requestDTO.setStateKind("information");
-    	requestDTO.setValueType("codeValue");
-    	requestDTO.setValueKind("created user");
-    	requestDTO.setValue("bob");
-    	String json = requestDTO.toJson();
-    	Collection<String> results = containerService.getContainersByContainerValue(requestDTO, false, false);
-    	logger.info(results.toString());
-    	Assert.assertTrue(results.size() > 0);
+	@Transactional
+	public void searchContainerCodesByContainerValue() throws Exception {
+		ContainerValueRequestDTO requestDTO = new ContainerValueRequestDTO();
+		requestDTO.setContainerType("container");
+		requestDTO.setContainerKind("plate");
+		;
+		requestDTO.setStateType("metadata");
+		requestDTO.setStateKind("information");
+		requestDTO.setValueType("codeValue");
+		requestDTO.setValueKind("created user");
+		requestDTO.setValue("bob");
+		String json = requestDTO.toJson();
+		Collection<String> results = containerService.getContainersByContainerValue(requestDTO, false, false);
+		logger.info(results.toString());
+		Assert.assertTrue(results.size() > 0);
 	}
-	
+
 	@Test
-    @Transactional
-    public void searchContainerCodesByContainerValue_like() throws Exception{
-    	ContainerValueRequestDTO requestDTO = new ContainerValueRequestDTO();
-    	requestDTO.setContainerType("container");
-    	requestDTO.setContainerKind("plate");;
-    	requestDTO.setStateType("metadata");
-    	requestDTO.setStateKind("information");
-    	requestDTO.setValueType("codeValue");
-    	requestDTO.setValueKind("created user");
-    	requestDTO.setValue("o");
-    	String json = requestDTO.toJson();
-    	Collection<String> results = containerService.getContainersByContainerValue(requestDTO, true, false);
-    	logger.info(results.toString());
-    	Assert.assertTrue(results.size() > 0);
+	@Transactional
+	public void searchContainerCodesByContainerValue_like() throws Exception {
+		ContainerValueRequestDTO requestDTO = new ContainerValueRequestDTO();
+		requestDTO.setContainerType("container");
+		requestDTO.setContainerKind("plate");
+		;
+		requestDTO.setStateType("metadata");
+		requestDTO.setStateKind("information");
+		requestDTO.setValueType("codeValue");
+		requestDTO.setValueKind("created user");
+		requestDTO.setValue("o");
+		String json = requestDTO.toJson();
+		Collection<String> results = containerService.getContainersByContainerValue(requestDTO, true, false);
+		logger.info(results.toString());
+		Assert.assertTrue(results.size() > 0);
 	}
-	
+
 	@Test
-    @Transactional
-    public void searchContainerCodesByContainerValue_rightLike() throws Exception{
-    	ContainerValueRequestDTO requestDTO = new ContainerValueRequestDTO();
-    	requestDTO.setContainerType("container");
-    	requestDTO.setContainerKind("plate");;
-    	requestDTO.setStateType("metadata");
-    	requestDTO.setStateKind("information");
-    	requestDTO.setValueType("codeValue");
-    	requestDTO.setValueKind("created user");
-    	requestDTO.setValue("bo");
-    	String json = requestDTO.toJson();
-    	Collection<String> results = containerService.getContainersByContainerValue(requestDTO, true, true);
-    	logger.info(results.toString());
-    	Assert.assertTrue(results.size() > 0);
+	@Transactional
+	public void searchContainerCodesByContainerValue_rightLike() throws Exception {
+		ContainerValueRequestDTO requestDTO = new ContainerValueRequestDTO();
+		requestDTO.setContainerType("container");
+		requestDTO.setContainerKind("plate");
+		;
+		requestDTO.setStateType("metadata");
+		requestDTO.setStateKind("information");
+		requestDTO.setValueType("codeValue");
+		requestDTO.setValueKind("created user");
+		requestDTO.setValue("bo");
+		String json = requestDTO.toJson();
+		Collection<String> results = containerService.getContainersByContainerValue(requestDTO, true, true);
+		logger.info(results.toString());
+		Assert.assertTrue(results.size() > 0);
 	}
-	
+
 	@Test
 	@Transactional
-	@Rollback(value=false)
+	@Rollback(value = false)
 	public void bulkIgnoreItxContainerContainers() throws Exception {
 		List<ItxContainerContainer> itxContainerContainers = new ArrayList<ItxContainerContainer>();
 		ItxContainerContainer itx = ItxContainerContainer.findItxContainerContainer(107554422L);
 		itxContainerContainers.add(itx);
 		containerService.ignoreItxContainerContainers(itxContainerContainers);
 	}
-	
+
 	@Test
 	@Transactional
 	public void getItxIdsByContainerCodeNamesAndItxTypeKind() throws Exception {
@@ -1350,7 +1396,7 @@ public void getItxIdsByContainerCodeNamesAndItxTypeKind() throws Exception {
 		String itxKind = "container_location";
 		List<String> codeNames = new ArrayList<String>();
 		codeNames.add(codeName);
-//		if (codeNames.isEmpty()) return new ArrayList<Map<String, Long>>();
+		// if (codeNames.isEmpty()) return new ArrayList<Map<String, Long>>();
 		EntityManager em = Container.entityManager();
 		String queryString = "SELECT new Map(container.codeName, itx.id )"
 				+ " FROM Container container ";
@@ -1358,27 +1404,27 @@ public void getItxIdsByContainerCodeNamesAndItxTypeKind() throws Exception {
 		queryString += "where ( container.ignored <> true ) and ( ";
 		Collection<Query> queries = SimpleUtil.splitHqlInClause(em, queryString, "container.codeName", codeNames);
 		Collection<Map<String, Long>> results = new HashSet<Map<String, Long>>();
-		for (Query q : queries){
+		for (Query q : queries) {
 			results.addAll(q.getResultList());
 		}
 		logger.info(results.toString());
-//		return results;
+		// return results;
 	}
-	
+
 	@Test
 	@Transactional
-	@Rollback(value=false)
+	@Rollback(value = false)
 	public void getOrCreateTrash() throws Exception {
 		containerService.getOrCreateTrash("acas test");
 	}
-	
+
 	@Test
 	@Transactional
-	@Rollback(value=false)
+	@Rollback(value = false)
 	public void getOrCreateBench() throws Exception {
 		containerService.getOrCreateBench("bfrost", null);
 	}
-	
+
 	@Test
 	@Transactional
 	public void insertContainersSpeedTest() throws Exception {
@@ -1394,9 +1440,9 @@ public void insertContainersSpeedTest() throws Exception {
 			plate.setLsType("container");
 			plate.setLsKind("plate");
 			plate.setLsTransaction(9999L);
-			if (i< (max/2)) {
+			if (i < (max / 2)) {
 				containers1.add(plate);
-			}else {
+			} else {
 				containers2.add(plate);
 			}
 			i++;
@@ -1406,19 +1452,19 @@ public void insertContainersSpeedTest() throws Exception {
 		long endInsert = System.currentTimeMillis() % 1000;
 		int batch = 200;
 		int count = 0;
-		for (Container c: containers2) {
+		for (Container c : containers2) {
 			c.persist();
 			count++;
-			if (count > batch){
+			if (count > batch) {
 				c.flush();
-				count=0;
+				count = 0;
 			}
 		}
 		long endPersist = System.currentTimeMillis() % 1000;
-		logger.info("Time with insert: "+(endInsert-start));
-		logger.info("Time with persist: "+(endPersist-endInsert));
+		logger.info("Time with insert: " + (endInsert - start));
+		logger.info("Time with persist: " + (endPersist - endInsert));
 	}
-	
+
 	@Test
 	@Transactional
 	public void getLocationTreeDTO() throws Exception {
@@ -1453,5 +1499,4 @@ public void getLocationTreeDTO() throws Exception {
 		logger.info(ContainerLocationTreeDTO.toJsonArray(locationTreeDTOs));
 	}
 
-	
 }
diff --git a/src/test/java/com/labsynch/labseer/service/ContainerLabelJsonServiceTests.java b/src/test/java/com/labsynch/labseer/service/ContainerLabelJsonServiceTests.java
index 359e49c59..59267c1f3 100755
--- a/src/test/java/com/labsynch/labseer/service/ContainerLabelJsonServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/ContainerLabelJsonServiceTests.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import java.io.BufferedReader;
@@ -17,19 +16,16 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext.xml")
 @Configurable
 public class ContainerLabelJsonServiceTests {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(ContainerLabelJsonServiceTests.class);
-	
 
-	
-	//@Test
-	//@Transactional
-	public void CreateContainerLabelTest_1(){
+	// @Test
+	// @Transactional
+	public void CreateContainerLabelTest_1() {
 		Container container = Container.findContainer(264L);
 		ContainerLabel cl = new ContainerLabel();
 		cl.setContainer(container);
@@ -41,24 +37,24 @@ public void CreateContainerLabelTest_1(){
 		cl.setRecordedDate(new Date());
 		logger.info(cl.toJson());
 		cl.persist();
-		
-		
-//        Assert.assertNotNull("Find method for 'Protocol' illegally returned null for id '" + id + "'", id);
-//        Assert.assertEquals("Find method for 'Author' returned the incorrect identifier", expectedId, id);		
+
+		// Assert.assertNotNull("Find method for 'Protocol' illegally returned null for
+		// id '" + id + "'", id);
+		// Assert.assertEquals("Find method for 'Author' returned the incorrect
+		// identifier", expectedId, id);
 	}
-	
+
 	@Test
-	//@Transactional
-	public void CreateContainerLabelTest_2(){
+	// @Transactional
+	public void CreateContainerLabelTest_2() {
 		String json = "[{\"container\":{\"id\":233735,\"version\":0},\"recordedBy\":\"smeyer\",\"labelText\":\"JH test 46_1\",\"lsType\":\"name\",\"lsKind\":\"container name\",\"lsTransaction\":13726,\"preferred\":true,\"imageFile\":null,\"labelTypeAndKind\":null,\"physicallyLabeled\":false,\"ignored\":false,\"recordedDate\":1384473207000,\"modifiedDate\":null,\"version\":null},{\"container\":{\"id\":233736,\"version\":0},\"recordedBy\":\"smeyer\",\"labelText\":\"JH test 46_2\",\"lsType\":\"name\",\"lsKind\":\"container name\",\"lsTransaction\":13726,\"preferred\":true,\"imageFile\":null,\"labelTypeAndKind\":null,\"physicallyLabeled\":false,\"ignored\":false,\"recordedDate\":1384473207000,\"modifiedDate\":null,\"version\":null},{\"container\":{\"id\":233737,\"version\":0},\"recordedBy\":\"smeyer\",\"labelText\":\"JH test 46_3\",\"lsType\":\"name\",\"lsKind\":\"container name\",\"lsTransaction\":13726,\"preferred\":true,\"imageFile\":null,\"labelTypeAndKind\":null,\"physicallyLabeled\":false,\"ignored\":false,\"recordedDate\":1384473207000,\"modifiedDate\":null,\"version\":null}]";
 		StringReader sr = new StringReader(json);
 		BufferedReader br = new BufferedReader(sr);
-		
-		for( Container container : Container.fromJsonArrayToContainers(br)){
+
+		for (Container container : Container.fromJsonArrayToContainers(br)) {
 			logger.warn(container.toJson());
 			container.persist();
 		}
 	}
 
-
 }
diff --git a/src/test/java/com/labsynch/labseer/service/CreateAnalysisGroupsFromCSVFileTests.java b/src/test/java/com/labsynch/labseer/service/CreateAnalysisGroupsFromCSVFileTests.java
index ce4cb48f4..fd9899fd1 100644
--- a/src/test/java/com/labsynch/labseer/service/CreateAnalysisGroupsFromCSVFileTests.java
+++ b/src/test/java/com/labsynch/labseer/service/CreateAnalysisGroupsFromCSVFileTests.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import java.io.IOException;
@@ -18,7 +17,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext*.xml")
 @Configurable
@@ -31,58 +29,64 @@ public class CreateAnalysisGroupsFromCSVFileTests {
 
 	@Autowired
 	private AnalysisGroupService analysisGroupService;
-	
+
 	@Autowired
 	private TreatmentGroupService treatmentGroupService;
 
 	@Autowired
 	private SubjectService subjectService;
-	
+
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
 
+	// private String fieldDelimiter = ",";
 
-//	private String fieldDelimiter = ",";
-
-	
 	@Test
 	@Transactional
-	public void ReadCSVFile_Test11() throws IOException{
-		
-//		String analysisGroupFilePath = "/Users/goshiro2014/Documents/McNeilco_2012/clients/ACAS_ROO_GIT/git/acas-roo-server/src/test/resources/analysisGroupData_v3.csv";
-//		//String absoluteFilePath = "/Users/fairway/Documents/McNeilCo/acas-roo-server/src/test/resources/analysisGroupData_v3.csv";
-//		HashMap<String, TempThingDTO> output = analysisGroupService.createAnalysisGroupsFromCSV(analysisGroupFilePath );
-//		
-//		String treatmentGroupFilePath = "/Users/goshiro2014/Documents/McNeilco_2012/clients/ACAS_ROO_GIT/git/acas-roo-server/src/test/resources/treatmentGroupData_v3.csv";
-////		String treatmentGroupFilePath = "/Users/fairway/Documents/McNeilCo/acas-roo-server/src/test/resources/treatmentGroupData_v3.csv";
-//		HashMap<String, TempThingDTO> output2 = treatmentGroupService.createTreatmentGroupsFromCSV(treatmentGroupFilePath, output);
-//		
-//		String subjectFilePath = "/Users/goshiro2014/Documents/McNeilco_2012/clients/ACAS_ROO_GIT/git/acas-roo-server/src/test/resources/subjectData_v3.csv";
-////		String subjectFilePath = "/Users/fairway/Documents/McNeilCo/acas-roo-server/src/test/resources/subjectData_v3.csv";
-//		HashMap<String, TempThingDTO> output3 = subjectService.createSubjectsFromCSV(subjectFilePath, output2);
+	public void ReadCSVFile_Test11() throws IOException {
+
+		// String analysisGroupFilePath =
+		// "/Users/goshiro2014/Documents/McNeilco_2012/clients/ACAS_ROO_GIT/git/acas-roo-server/src/test/resources/analysisGroupData_v3.csv";
+		// //String absoluteFilePath =
+		// "/Users/fairway/Documents/McNeilCo/acas-roo-server/src/test/resources/analysisGroupData_v3.csv";
+		// HashMap<String, TempThingDTO> output =
+		// analysisGroupService.createAnalysisGroupsFromCSV(analysisGroupFilePath );
+		//
+		// String treatmentGroupFilePath =
+		// "/Users/goshiro2014/Documents/McNeilco_2012/clients/ACAS_ROO_GIT/git/acas-roo-server/src/test/resources/treatmentGroupData_v3.csv";
+		//// String treatmentGroupFilePath =
+		// "/Users/fairway/Documents/McNeilCo/acas-roo-server/src/test/resources/treatmentGroupData_v3.csv";
+		// HashMap<String, TempThingDTO> output2 =
+		// treatmentGroupService.createTreatmentGroupsFromCSV(treatmentGroupFilePath,
+		// output);
+		//
+		// String subjectFilePath =
+		// "/Users/goshiro2014/Documents/McNeilco_2012/clients/ACAS_ROO_GIT/git/acas-roo-server/src/test/resources/subjectData_v3.csv";
+		//// String subjectFilePath =
+		// "/Users/fairway/Documents/McNeilCo/acas-roo-server/src/test/resources/subjectData_v3.csv";
+		// HashMap<String, TempThingDTO> output3 =
+		// subjectService.createSubjectsFromCSV(subjectFilePath, output2);
 
 		String analysisGroupFilePath = "/Users/goshiro2014/Documents/McNeilco_2012/clients/ACAS_ROO_GIT/git/acas-roo-server/src/test/resources/analysisGroupData_v3.txt";
 		String treatmentGroupFilePath = "/Users/goshiro2014/Documents/McNeilco_2012/clients/ACAS_ROO_GIT/git/acas-roo-server/src/test/resources/treatmentGroupData_v3.txt";
 		String subjectFilePath = "/Users/goshiro2014/Documents/McNeilco_2012/clients/ACAS_ROO_GIT/git/acas-roo-server/src/test/resources/subjectData_v3.txt";
 
-//		String analysisGroupFilePath = "";
-//		String treatmentGroupFilePath = "";
-//		String subjectFilePath = "";
-		
-//		String analysisGroupFilePath = "/tmp/csvUpload4e1edfb5ea.txt";
-////		String treatmentGroupFilePath = "/tmp/csvUpload4e13f5d8bb5.txt";
-////		String subjectFilePath = "/tmp/csvUpload4e1167f3893.txt";
-		
-		
+		// String analysisGroupFilePath = "";
+		// String treatmentGroupFilePath = "";
+		// String subjectFilePath = "";
+
+		// String analysisGroupFilePath = "/tmp/csvUpload4e1edfb5ea.txt";
+		//// String treatmentGroupFilePath = "/tmp/csvUpload4e13f5d8bb5.txt";
+		//// String subjectFilePath = "/tmp/csvUpload4e1167f3893.txt";
+
 		long startTime = new Date().getTime();
-		TsvLoaderResponseDTO result = analysisGroupService.saveLsAnalysisGroupFromCsv(analysisGroupFilePath, treatmentGroupFilePath, subjectFilePath);
+		TsvLoaderResponseDTO result = analysisGroupService.saveLsAnalysisGroupFromCsv(analysisGroupFilePath,
+				treatmentGroupFilePath, subjectFilePath);
 		logger.info("loadValue: " + (result.getAnalysisGroups() != null));
 		long endTime = new Date().getTime();
 		long totalTime = endTime - startTime;
 		logger.info("total elapsed time: " + totalTime);
 
 	}
-	
-
 
 }
diff --git a/src/test/java/com/labsynch/labseer/service/CreateGeneIDsFromCSVFileTests.java b/src/test/java/com/labsynch/labseer/service/CreateGeneIDsFromCSVFileTests.java
index 414d89949..df6d12bb2 100755
--- a/src/test/java/com/labsynch/labseer/service/CreateGeneIDsFromCSVFileTests.java
+++ b/src/test/java/com/labsynch/labseer/service/CreateGeneIDsFromCSVFileTests.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import java.io.BufferedReader;
@@ -46,7 +45,6 @@
 import org.supercsv.io.ICsvBeanReader;
 import org.supercsv.prefs.CsvPreference;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext.xml")
 @Configurable
@@ -54,20 +52,19 @@ public class CreateGeneIDsFromCSVFileTests {
 
 	private static final Logger logger = LoggerFactory.getLogger(CreateGeneIDsFromCSVFileTests.class);
 
-    @Autowired
-    private AutoLabelService autoLabelService;
+	@Autowired
+	private AutoLabelService autoLabelService;
 
-	
 	private String fieldDelimiter = "\t";
 
 	@Test
-	//@Transactional
-	public void ReadCSVFile_Test1() throws IOException{
+	// @Transactional
+	public void ReadCSVFile_Test1() throws IOException {
 
 		logger.info("read tab delimited file");
 		String testFileName = "sample_genes.txt";
 		InputStream is = CreateGeneIDsFromCSVFileTests.class.getClassLoader().getResourceAsStream(testFileName);
-		InputStreamReader isr = new InputStreamReader(is);  
+		InputStreamReader isr = new InputStreamReader(is);
 		BufferedReader br = new BufferedReader(isr);
 
 		String nameMapping;
@@ -80,14 +77,13 @@ public void ReadCSVFile_Test1() throws IOException{
 			lsTransaction.persist();
 			beanReader = new CsvBeanReader(br, CsvPreference.TAB_PREFERENCE);
 			String[] headerText = beanReader.getHeader(true);
-			
-			
-			//set up gene type and kinds (check if already exists)			
+
+			// set up gene type and kinds (check if already exists)
 			String geneTypeString = "gene";
 			String geneKindString = "entrez gene";
 			ThingType geneType = ThingType.getOrCreate(geneTypeString);
 			ThingKind.getOrCreate(geneType, geneKindString);
-			
+
 			LabelType labelType = LabelType.findLabelTypesByTypeNameEquals("name").getSingleResult();
 			LabelKind.getOrCreate(labelType, "gene code name");
 			LabelKind.getOrCreate(labelType, "Entrez Gene ID");
@@ -97,11 +93,13 @@ public void ReadCSVFile_Test1() throws IOException{
 			LabelKind.getOrCreate(labelType, "authoritative gene name");
 			LabelKind.getOrCreate(labelType, "other designations");
 
-
 			String thingTypeAndKind = "gene_entrez gene";
 			String labelTypeAndKind = "name_gene code name";
-			List<LabelSequence> labelSeqs = LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(thingTypeAndKind, labelTypeAndKind).getResultList();
-			if (labelSeqs.size() == 0){
+			List<LabelSequence> labelSeqs = LabelSequence
+					.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(thingTypeAndKind,
+							labelTypeAndKind)
+					.getResultList();
+			if (labelSeqs.size() == 0) {
 				LabelSequence newLabelSeq = new LabelSequence();
 				newLabelSeq.setDigits(6);
 				newLabelSeq.setLabelPrefix("GENE");
@@ -110,8 +108,7 @@ public void ReadCSVFile_Test1() throws IOException{
 				newLabelSeq.setLabelTypeAndKind(labelTypeAndKind);
 				newLabelSeq.setThingTypeAndKind(thingTypeAndKind);
 				newLabelSeq.persist();
-			} 
-			
+			}
 
 			// map header text to standard bean names
 
@@ -134,20 +131,19 @@ public void ReadCSVFile_Test1() throws IOException{
 
 			List<String> headerList = new ArrayList<String>();
 			int position = 0;
-			for (String head : headerText){
+			for (String head : headerText) {
 				logger.info("header column: " + position + "  " + head);
-				if (geneBeanMap.get(head) != null){
-					headerList.add(geneBeanMap.get(head));   				
+				if (geneBeanMap.get(head) != null) {
+					headerList.add(geneBeanMap.get(head));
 				}
 				position++;
 			}
 
-
 			logger.info("size of header list  " + headerList.size());
 			String[] header = new String[headerList.size()];
 			headerList.toArray(header);
 
-			for (String head : header){
+			for (String head : header) {
 				logger.warn("header column array : " + position + "  " + head);
 				position++;
 			}
@@ -171,18 +167,19 @@ public void ReadCSVFile_Test1() throws IOException{
 
 			ValueType valueTypeDate = ValueType.getOrCreate("dateValue");
 			ValueKind.getOrCreate(valueTypeDate, "modification date");
-			
+
 			int numberOfRows = SimpleUtil.countLines(testFileName);
 
 			int i = 0;
 			int batchSize = 25;
-			while( (geneDTO = beanReader.read(EntrezDbGeneDTO.class, header, processors)) != null ) {
-				System.out.println(String.format("lineNo=%s, rowNo=%s, bulkData=%s", beanReader.getLineNumber(), beanReader.getRowNumber(), geneDTO));
+			while ((geneDTO = beanReader.read(EntrezDbGeneDTO.class, header, processors)) != null) {
+				System.out.println(String.format("lineNo=%s, rowNo=%s, bulkData=%s", beanReader.getLineNumber(),
+						beanReader.getRowNumber(), geneDTO));
 				logger.info("current gene: " + geneDTO.getGeneId());
-				
+
 				Long numberOfLabels = 1L;
-				List<AutoLabelDTO> thingCodes = autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels);			
-				
+				List<AutoLabelDTO> thingCodes = autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind,
+						numberOfLabels);
 
 				LsThing geneThing = new LsThing();
 				geneThing.setCodeName(thingCodes.get(0).getAutoLabel());
@@ -193,12 +190,18 @@ public void ReadCSVFile_Test1() throws IOException{
 				geneThing.persist();
 
 				String entrezSeparator = "\\|";
-				saveGeneLabel(lsTransaction, geneThing, "name", "Entrez Gene ID", true, geneDTO.getGeneId(), entrezSeparator);
-				saveGeneLabel(lsTransaction, geneThing, "name", "gene symbol", false, geneDTO.getSymbol(), entrezSeparator);
-				saveGeneLabel(lsTransaction, geneThing, "name", "gene synonym", false, geneDTO.getSynonyms(), entrezSeparator);
-				saveGeneLabel(lsTransaction, geneThing, "name", "authoritative gene name", false, geneDTO.getFullNameFromAuthority(), entrezSeparator);
-				saveGeneLabel(lsTransaction, geneThing, "name", "authoritative gene symbol", false, geneDTO.getSymbolFromAuthority(), entrezSeparator);
-				saveGeneLabel(lsTransaction, geneThing, "name", "other designations", false, geneDTO.getOtherDesignations(), entrezSeparator);
+				saveGeneLabel(lsTransaction, geneThing, "name", "Entrez Gene ID", true, geneDTO.getGeneId(),
+						entrezSeparator);
+				saveGeneLabel(lsTransaction, geneThing, "name", "gene symbol", false, geneDTO.getSymbol(),
+						entrezSeparator);
+				saveGeneLabel(lsTransaction, geneThing, "name", "gene synonym", false, geneDTO.getSynonyms(),
+						entrezSeparator);
+				saveGeneLabel(lsTransaction, geneThing, "name", "authoritative gene name", false,
+						geneDTO.getFullNameFromAuthority(), entrezSeparator);
+				saveGeneLabel(lsTransaction, geneThing, "name", "authoritative gene symbol", false,
+						geneDTO.getSymbolFromAuthority(), entrezSeparator);
+				saveGeneLabel(lsTransaction, geneThing, "name", "other designations", false,
+						geneDTO.getOtherDesignations(), entrezSeparator);
 
 				LsThingState geneState = new LsThingState();
 				geneState.setLsThing(geneThing);
@@ -208,47 +211,53 @@ public void ReadCSVFile_Test1() throws IOException{
 				geneState.setRecordedBy("acas admin");
 				geneState.persist();
 
-				saveGeneDescriptor(lsTransaction, geneState, "stringValue", "tax id", geneDTO.getTaxId(), entrezSeparator);
-				saveGeneDescriptor(lsTransaction, geneState, "stringValue", "locus tag", geneDTO.getLocusTag(), entrezSeparator);
-				saveGeneDescriptor(lsTransaction, geneState, "stringValue", "dbXrefs", geneDTO.getDbXrefs(), entrezSeparator);
-				saveGeneDescriptor(lsTransaction, geneState, "stringValue", "chromosome", geneDTO.getChromosome(), entrezSeparator);
-				saveGeneDescriptor(lsTransaction, geneState, "stringValue", "map location", geneDTO.getMapLocation(), entrezSeparator);
-				saveGeneDescriptor(lsTransaction, geneState, "stringValue", "description", geneDTO.getDescription(), entrezSeparator);
-				saveGeneDescriptor(lsTransaction, geneState, "stringValue", "type of gene", geneDTO.getTypeOfGene(), entrezSeparator);
-				saveGeneDescriptor(lsTransaction, geneState, "stringValue", "nomenclature status", geneDTO.getNomenclatureStatus(), entrezSeparator);
-				saveGeneDescriptor(lsTransaction, geneState, "dateValue", "modification date", geneDTO.getModificationDate());
-
-				if ( i % batchSize == 0 ) { // same as the JDBC batch size
+				saveGeneDescriptor(lsTransaction, geneState, "stringValue", "tax id", geneDTO.getTaxId(),
+						entrezSeparator);
+				saveGeneDescriptor(lsTransaction, geneState, "stringValue", "locus tag", geneDTO.getLocusTag(),
+						entrezSeparator);
+				saveGeneDescriptor(lsTransaction, geneState, "stringValue", "dbXrefs", geneDTO.getDbXrefs(),
+						entrezSeparator);
+				saveGeneDescriptor(lsTransaction, geneState, "stringValue", "chromosome", geneDTO.getChromosome(),
+						entrezSeparator);
+				saveGeneDescriptor(lsTransaction, geneState, "stringValue", "map location", geneDTO.getMapLocation(),
+						entrezSeparator);
+				saveGeneDescriptor(lsTransaction, geneState, "stringValue", "description", geneDTO.getDescription(),
+						entrezSeparator);
+				saveGeneDescriptor(lsTransaction, geneState, "stringValue", "type of gene", geneDTO.getTypeOfGene(),
+						entrezSeparator);
+				saveGeneDescriptor(lsTransaction, geneState, "stringValue", "nomenclature status",
+						geneDTO.getNomenclatureStatus(), entrezSeparator);
+				saveGeneDescriptor(lsTransaction, geneState, "dateValue", "modification date",
+						geneDTO.getModificationDate());
+
+				if (i % batchSize == 0) { // same as the JDBC batch size
 					geneThing.flush();
 					geneThing.clear();
 				}
 				i++;
 
 			}
-		}
-		finally {
-			if( beanReader != null ) {
+		} finally {
+			if (beanReader != null) {
 				beanReader.close();
 			}
 		}
 
-
-
-
 		logger.info("Registering samples");
 		Map<String, String> dataMapIn = new HashMap<String, String>();
 		StringWriter outFile = new StringWriter();
 		try {
-			//			String[] inputCSVheader = inputMapFile.getHeader(true);
-			//			writer.writeHeader(inputCSVheader);
-		} catch (Exception e){
+			// String[] inputCSVheader = inputMapFile.getHeader(true);
+			// writer.writeHeader(inputCSVheader);
+		} catch (Exception e) {
 			e.printStackTrace();
-		} 
+		}
 
 		logger.info(outFile.toString());
 	}
 
-	private void saveGeneDescriptor(LsTransaction lsTransaction, LsThingState geneState, String lsType, String lsKind, Date dateValue) {
+	private void saveGeneDescriptor(LsTransaction lsTransaction, LsThingState geneState, String lsType, String lsKind,
+			Date dateValue) {
 		LsThingValue lsValue = new LsThingValue();
 		lsValue.setLsState(geneState);
 		lsValue.setLsType(lsType);
@@ -261,10 +270,12 @@ private void saveGeneDescriptor(LsTransaction lsTransaction, LsThingState geneSt
 
 	}
 
-	private void saveGeneDescriptor(LsTransaction lsTransaction, LsThingState geneState, String lsType, String lsKind, String dataValues, String entrezSeparator) {
+	private void saveGeneDescriptor(LsTransaction lsTransaction, LsThingState geneState, String lsType, String lsKind,
+			String dataValues, String entrezSeparator) {
 		String[] valueList = dataValues.split(entrezSeparator);
-		for (String value : valueList){
-			List<LsThingValue> foundValues = LsThingValue.findLsThingValuesByLsKindEqualsAndStringValueLike(lsKind, value).getResultList();
+		for (String value : valueList) {
+			List<LsThingValue> foundValues = LsThingValue
+					.findLsThingValuesByLsKindEqualsAndStringValueLike(lsKind, value).getResultList();
 			LsThingValue lsValue = new LsThingValue();
 			lsValue.setLsState(geneState);
 			lsValue.setLsType(lsType);
@@ -274,12 +285,13 @@ private void saveGeneDescriptor(LsTransaction lsTransaction, LsThingState geneSt
 			lsValue.setRecordedBy("acas admin");
 			lsValue.persist();
 			logger.info("saving gene descriptor: " + value);
-		}			
+		}
 	}
 
-	private void saveGeneLabel(LsTransaction lsTransaction, LsThing geneThing, String labelType, String labelKind, boolean preferred, String labels, String entrezSeparator) {
+	private void saveGeneLabel(LsTransaction lsTransaction, LsThing geneThing, String labelType, String labelKind,
+			boolean preferred, String labels, String entrezSeparator) {
 		String[] labelList = labels.split(entrezSeparator);
-		for (String label : labelList){
+		for (String label : labelList) {
 			LsThingLabel lsLabel = new LsThingLabel();
 			lsLabel.setLsThing(geneThing);
 			lsLabel.setLsType(labelType);
@@ -290,30 +302,29 @@ private void saveGeneLabel(LsTransaction lsTransaction, LsThing geneThing, Strin
 			lsLabel.setRecordedBy("acas admin");
 			lsLabel.persist();
 			logger.info("saving gene label: " + label);
-		}		
+		}
 	}
 
-
-
 	private static CellProcessor[] getProcessors() {
 
-		//    	"dd/MM/yyyy" (parses a date formatted as "25/12/2011")
-		//    	"dd-MMM-yy" (parses a date formatted as "25-Dec-11")
-		//    	"yyyy.MM.dd.HH.mm.ss" (parses a date formatted as "2011.12.25.08.36.33"
-		//    	"E, dd MMM yyyy HH:mm:ss Z" (parses a date formatted as "Tue, 25 Dec 2011 08:36:33 -0500")
-
-		final CellProcessor[] processors = new CellProcessor[] { 
-				new Optional(),  // 
-				new Optional(),  // 
-				new Optional(),  // 
-				new Optional(),  // 
-				new Optional(),  // 
-				new Optional(),  // 
-				new Optional(),  // 
-				new Optional(),  // 
-				new Optional(), // 
-				new Optional(), // 
-				new Optional(), // 
+		// "dd/MM/yyyy" (parses a date formatted as "25/12/2011")
+		// "dd-MMM-yy" (parses a date formatted as "25-Dec-11")
+		// "yyyy.MM.dd.HH.mm.ss" (parses a date formatted as "2011.12.25.08.36.33"
+		// "E, dd MMM yyyy HH:mm:ss Z" (parses a date formatted as "Tue, 25 Dec 2011
+		// 08:36:33 -0500")
+
+		final CellProcessor[] processors = new CellProcessor[] {
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
 				new Optional(), //
 				new Optional(), //
 				new Optional(), //
@@ -323,5 +334,4 @@ private static CellProcessor[] getProcessors() {
 		return processors;
 	}
 
-
 }
diff --git a/src/test/java/com/labsynch/labseer/service/CreateProjectsTests.java b/src/test/java/com/labsynch/labseer/service/CreateProjectsTests.java
index fae92cdd9..6f53ce7df 100755
--- a/src/test/java/com/labsynch/labseer/service/CreateProjectsTests.java
+++ b/src/test/java/com/labsynch/labseer/service/CreateProjectsTests.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import java.io.IOException;
@@ -40,9 +39,9 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class CreateProjectsTests {
 
@@ -52,15 +51,15 @@ public class CreateProjectsTests {
 	private AutoLabelService autoLabelService;
 
 	@Test
-	//@Transactional
-	public void SaveProject_Test1() throws IOException{
+	// @Transactional
+	public void SaveProject_Test1() throws IOException {
 
 		LsTransaction lsTransaction = new LsTransaction();
 		lsTransaction.setComments("saving new project info");
 		lsTransaction.setRecordedDate(new Date());
 		lsTransaction.persist();
 
-		//set up project type and kinds (check if already exists)
+		// set up project type and kinds (check if already exists)
 		String thingTypeString = "project";
 		String thingKindString = "project";
 		ThingType geneType = ThingType.getOrCreate(thingTypeString);
@@ -83,18 +82,20 @@ public void SaveProject_Test1() throws IOException{
 
 		ValueType valueTypeString = ValueType.getOrCreate("stringValue");
 		ValueKind.getOrCreate(valueTypeString, "short description");
-		
+
 		TypeDTO roleType = new TypeDTO("Project");
 		List<TypeDTO> roleTypes = new ArrayList<TypeDTO>();
 		roleTypes.add(roleType);
 		TypeDTO.getOrCreateRoleTypes(roleTypes);
-		
+
 		List<TypeKindDTO> roleKinds = new ArrayList<TypeKindDTO>();
 
 		String thingTypeAndKind = "project_project";
 		String labelTypeAndKind = "name_project name";
-		List<LabelSequence> labelSeqs = LabelSequence.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(thingTypeAndKind, labelTypeAndKind).getResultList();
-		if (labelSeqs.size() == 0){
+		List<LabelSequence> labelSeqs = LabelSequence
+				.findLabelSequencesByThingTypeAndKindEqualsAndLabelTypeAndKindEquals(thingTypeAndKind, labelTypeAndKind)
+				.getResultList();
+		if (labelSeqs.size() == 0) {
 			LabelSequence newLabelSeq = new LabelSequence();
 			newLabelSeq.setDigits(4);
 			newLabelSeq.setLabelPrefix("PROJ");
@@ -103,13 +104,13 @@ public void SaveProject_Test1() throws IOException{
 			newLabelSeq.setLabelTypeAndKind(labelTypeAndKind);
 			newLabelSeq.setThingTypeAndKind(thingTypeAndKind);
 			newLabelSeq.persist();
-		} 
+		}
 
-		
 		////////////////////////////////
 
 		Long numberOfLabels = 1L;
-		List<AutoLabelDTO> thingCodes = autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels);			
+		List<AutoLabelDTO> thingCodes = autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind,
+				numberOfLabels);
 
 		LsThing lsThing = new LsThing();
 		lsThing.setCodeName(thingCodes.get(0).getAutoLabel());
@@ -131,24 +132,26 @@ public void SaveProject_Test1() throws IOException{
 		lsThingState.persist();
 		logger.info("thing state: " + lsThingState.toJson());
 
-		LsThingValue val1 = LsThingValue.saveLsThingValue(lsTransaction, lsThingState, "stringValue", "project status", "active");
+		LsThingValue val1 = LsThingValue.saveLsThingValue(lsTransaction, lsThingState, "stringValue", "project status",
+				"active");
 		val1.setRecordedBy("acas admin");
 		val1.persist();
-		LsThingValue val2 = LsThingValue.saveLsThingValue(lsTransaction, lsThingState, "dateValue", "creation date", new Date());
+		LsThingValue val2 = LsThingValue.saveLsThingValue(lsTransaction, lsThingState, "dateValue", "creation date",
+				new Date());
 		val2.setRecordedBy("acas admin");
 		val2.persist();
-		LsThingValue val3 = LsThingValue.saveLsThingValue(lsTransaction, lsThingState, "stringValue", "short description", "project short description");
+		LsThingValue val3 = LsThingValue.saveLsThingValue(lsTransaction, lsThingState, "stringValue",
+				"short description", "project short description");
 		val3.setRecordedBy("acas admin");
 		val3.persist();
-		
+
 		TypeKindDTO roleKind = new TypeKindDTO("Project", lsThing.getCodeName());
 		roleKinds.add(roleKind);
-		
-		////////////////////////////////
 
+		////////////////////////////////
 
 		numberOfLabels = 1L;
-		thingCodes = autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels);	
+		thingCodes = autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels);
 
 		lsThing = new LsThing();
 		lsThing.setCodeName(thingCodes.get(0).getAutoLabel());
@@ -176,17 +179,18 @@ public void SaveProject_Test1() throws IOException{
 		val2 = LsThingValue.saveLsThingValue(lsTransaction, lsThingState, "dateValue", "creation date", new Date());
 		val2.setRecordedBy("acas admin");
 		val2.persist();
-		val3 = LsThingValue.saveLsThingValue(lsTransaction, lsThingState, "stringValue", "short description", "project short description");
+		val3 = LsThingValue.saveLsThingValue(lsTransaction, lsThingState, "stringValue", "short description",
+				"project short description");
 		val3.setRecordedBy("acas admin");
-		val3.persist();		
-		
+		val3.persist();
+
 		roleKind = new TypeKindDTO("Project", lsThing.getCodeName());
 		roleKinds.add(roleKind);
-		
+
 		////////////////////////////////
 
 		numberOfLabels = 1L;
-		thingCodes = autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels);	
+		thingCodes = autoLabelService.getAutoLabels(thingTypeAndKind, labelTypeAndKind, numberOfLabels);
 
 		lsThing = new LsThing();
 		lsThing.setCodeName(thingCodes.get(0).getAutoLabel());
@@ -214,63 +218,69 @@ public void SaveProject_Test1() throws IOException{
 		val2 = LsThingValue.saveLsThingValue(lsTransaction, lsThingState, "dateValue", "creation date", new Date());
 		val2.setRecordedBy("acas admin");
 		val2.persist();
-		val3 = LsThingValue.saveLsThingValue(lsTransaction, lsThingState, "stringValue", "short description", "project short description");
+		val3 = LsThingValue.saveLsThingValue(lsTransaction, lsThingState, "stringValue", "short description",
+				"project short description");
 		val3.setRecordedBy("acas admin");
 		val3.persist();
-		
+
 		roleKind = new TypeKindDTO("Project", lsThing.getCodeName());
 		roleKinds.add(roleKind);
-		
+
 		//////////////////////////////////
 		TypeKindDTO.getOrCreateRoleKinds(roleKinds);
 	}
 
-	//@Test
+	// @Test
 	@Transactional
-	public void GetProject_Test5() throws IOException{
+	public void GetProject_Test5() throws IOException {
 
 		LsThing lsThing = LsThing.findLsThingsByCodeNameEquals("PROJ-000003").getSingleResult();
 		logger.info(lsThing.toPrettyJsonStub());
 
 	}
-	
+
 	@Test
-//	@Transactional
+	// @Transactional
 	public void createProjectRoles() {
-		//create users
+		// create users
 		Author jappleseed = null;
-		try{
+		try {
 			jappleseed = Author.findAuthorsByUserName("jappleseed").getSingleResult();
-		}catch (NoResultException e){
+		} catch (NoResultException e) {
 			jappleseed = new Author();
 			jappleseed.setFirstName("Johnny");
 			jappleseed.setLastName("Appleseed");
 			jappleseed.setUserName("jappleseed");
 			jappleseed.setEmailAddress("jappleseed@mcneilco.com");
 			jappleseed.setEnabled(true);
-			jappleseed.setPassword("0L4txCG+T80BcuWvzuo5cOLz2UA="); //apple
+			jappleseed.setPassword("0L4txCG+T80BcuWvzuo5cOLz2UA="); // apple
 			jappleseed.persist();
 		}
 		Author bsplit = null;
-		try{
+		try {
 			bsplit = Author.findAuthorsByUserName("bsplit").getSingleResult();
-		}catch (NoResultException e){
+		} catch (NoResultException e) {
 			bsplit = new Author();
 			bsplit.setFirstName("Banana");
 			bsplit.setLastName("Split");
 			bsplit.setUserName("bsplit");
 			bsplit.setEmailAddress("bsplit@mcneilco.com");
 			bsplit.setEnabled(true);
-			bsplit.setPassword("JQ538SpatpcqCJXSkMR5Lwoybqg="); //banana
+			bsplit.setPassword("JQ538SpatpcqCJXSkMR5Lwoybqg="); // banana
 			bsplit.persist();
 		}
-		//create roles based on existing projects
-		String appleCodeName = LsThingLabel.findLsThingLabelsByLabelTextEqualsAndIgnoredNot("Apple", true).getSingleResult().getLsThing().getCodeName();
-		String bananaCodeName = LsThingLabel.findLsThingLabelsByLabelTextEqualsAndIgnoredNot("Banana", true).getSingleResult().getLsThing().getCodeName();;
+		// create roles based on existing projects
+		String appleCodeName = LsThingLabel.findLsThingLabelsByLabelTextEqualsAndIgnoredNot("Apple", true)
+				.getSingleResult().getLsThing().getCodeName();
+		String bananaCodeName = LsThingLabel.findLsThingLabelsByLabelTextEqualsAndIgnoredNot("Banana", true)
+				.getSingleResult().getLsThing().getCodeName();
+		;
 		LsRole appleUser = null;
-		try{
-			appleUser = LsRole.findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals("Project", appleCodeName, "User").getSingleResult();
-		}catch(NoResultException e){
+		try {
+			appleUser = LsRole
+					.findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals("Project", appleCodeName, "User")
+					.getSingleResult();
+		} catch (NoResultException e) {
 			appleUser = new LsRole();
 			appleUser.setLsType("Project");
 			appleUser.setLsKind(appleCodeName);
@@ -278,9 +288,10 @@ public void createProjectRoles() {
 			appleUser.persist();
 		}
 		LsRole appleAdministrator = null;
-		try{
-			appleAdministrator = LsRole.findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals("Project", appleCodeName, "Administrator").getSingleResult();
-		}catch(NoResultException e){
+		try {
+			appleAdministrator = LsRole.findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals("Project",
+					appleCodeName, "Administrator").getSingleResult();
+		} catch (NoResultException e) {
 			appleAdministrator = new LsRole();
 			appleAdministrator.setLsType("Project");
 			appleAdministrator.setLsKind(appleCodeName);
@@ -288,9 +299,11 @@ public void createProjectRoles() {
 			appleAdministrator.persist();
 		}
 		LsRole bananaUser = null;
-		try{
-			bananaUser = LsRole.findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals("Project", bananaCodeName, "User").getSingleResult();
-		}catch(NoResultException e){
+		try {
+			bananaUser = LsRole
+					.findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals("Project", bananaCodeName, "User")
+					.getSingleResult();
+		} catch (NoResultException e) {
 			bananaUser = new LsRole();
 			bananaUser.setLsType("Project");
 			bananaUser.setLsKind(bananaCodeName);
@@ -298,38 +311,40 @@ public void createProjectRoles() {
 			bananaUser.persist();
 		}
 		LsRole bananaAdministrator = null;
-		try{
-			bananaAdministrator = LsRole.findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals("Project", bananaCodeName, "Administrator").getSingleResult();
-		}catch(NoResultException e){
+		try {
+			bananaAdministrator = LsRole.findLsRolesByLsTypeEqualsAndLsKindEqualsAndRoleNameEquals("Project",
+					bananaCodeName, "Administrator").getSingleResult();
+		} catch (NoResultException e) {
 			bananaAdministrator = new LsRole();
 			bananaAdministrator.setLsType("Project");
 			bananaAdministrator.setLsKind(bananaCodeName);
 			bananaAdministrator.setRoleName("Administrator");
 			bananaAdministrator.persist();
 		}
-		//create author roles
+		// create author roles
 		AuthorRole appleUserRole = null;
-		try{
+		try {
 			appleUserRole = AuthorRole.findAuthorRolesByRoleEntryAndUserEntry(appleUser, jappleseed).getSingleResult();
-		}catch (NoResultException e){
+		} catch (NoResultException e) {
 			appleUserRole = new AuthorRole();
 			appleUserRole.setRoleEntry(appleUser);
 			appleUserRole.setUserEntry(jappleseed);
 			appleUserRole.persist();
 		}
 		AuthorRole appleAdministratorRole = null;
-		try{
-			appleAdministratorRole = AuthorRole.findAuthorRolesByRoleEntryAndUserEntry(appleAdministrator, jappleseed).getSingleResult();
-		}catch (NoResultException e){
+		try {
+			appleAdministratorRole = AuthorRole.findAuthorRolesByRoleEntryAndUserEntry(appleAdministrator, jappleseed)
+					.getSingleResult();
+		} catch (NoResultException e) {
 			appleAdministratorRole = new AuthorRole();
 			appleAdministratorRole.setRoleEntry(appleAdministrator);
 			appleAdministratorRole.setUserEntry(jappleseed);
 			appleAdministratorRole.persist();
 		}
 		AuthorRole bananaUserRole = null;
-		try{
+		try {
 			bananaUserRole = AuthorRole.findAuthorRolesByRoleEntryAndUserEntry(bananaUser, bsplit).getSingleResult();
-		}catch (NoResultException e){
+		} catch (NoResultException e) {
 			bananaUserRole = new AuthorRole();
 			bananaUserRole.setRoleEntry(bananaUser);
 			bananaUserRole.setUserEntry(bsplit);
@@ -337,5 +352,4 @@ public void createProjectRoles() {
 		}
 	}
 
-
 }
diff --git a/src/test/java/com/labsynch/labseer/service/CronJobServiceTests.java b/src/test/java/com/labsynch/labseer/service/CronJobServiceTests.java
index 05edb0e8e..0f801cb1a 100644
--- a/src/test/java/com/labsynch/labseer/service/CronJobServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/CronJobServiceTests.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import com.labsynch.labseer.domain.CronJob;
@@ -15,25 +14,24 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class CronJobServiceTests {
 
 	private static final Logger logger = LoggerFactory.getLogger(CronJobServiceTests.class);
-	
+
 	@Autowired
 	private CronJobService cronJobService;
-	
+
 	@Test
 	@Transactional
-	@Rollback(value=true)
-	public void saveCronJob(){
+	@Rollback(value = true)
+	public void saveCronJob() {
 		String json = "{\"schedule\":\"00 * * * * *\",\"scriptType\":\"R\",\"scriptFile\":\"src/r/Test/test.R\",\"functionName\":\"testInventoryOperationETL\",\"scriptJSONData\":\"{}\",\"active\":true,\"ignored\":false,\"runUser\":\"acas\",\"lastDuration\":null,\"lastResultJSON\":null,\"lastStartTime\":null,\"numberOfExecutions\":0,\"version\":0}";
 		CronJob cronJob = CronJob.fromJsonToCronJob(json);
 		CronJob savedCronJob = cronJobService.saveCronJob(cronJob);
 	}
-	
-	
+
 }
diff --git a/src/test/java/com/labsynch/labseer/service/DataDictionaryCodeNameTest.java b/src/test/java/com/labsynch/labseer/service/DataDictionaryCodeNameTest.java
index 30920f0b9..86d1082d6 100644
--- a/src/test/java/com/labsynch/labseer/service/DataDictionaryCodeNameTest.java
+++ b/src/test/java/com/labsynch/labseer/service/DataDictionaryCodeNameTest.java
@@ -24,20 +24,20 @@
  */
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class DataDictionaryCodeNameTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(DataDictionaryCodeNameTest.class);
 
-	
 	@Autowired
 	private DataDictionaryService dataDictionaryService;
 
 	/**
 	 * Test method for {@link com.labsynch.labseer.domain.DDictValue#validate()}.
 	 */
-	//@Test
+	// @Test
 	@Transactional
 	public void testValidate() {
 		DDictValue theValue = new DDictValue();
@@ -49,11 +49,11 @@ public void testValidate() {
 		theValue.persist();
 	}
 
-//	@Test
+	// @Test
 	public void getValues() {
 		List<DDictValue> dDictValues = DDictValue.findAllDDictValues();
 		logger.info("---------------------" + DDictValue.toJsonArray(dDictValues));
-		
+
 		String output = dataDictionaryService.getCsvList(dDictValues);
 		logger.info("---------------------" + output);
 
@@ -65,11 +65,10 @@ public void saveValues() {
 
 		Collection<DDictValue> dDictValues = DDictValue.fromJsonArrayToDDictValues(json);
 		Boolean createTypeAndKind = true;
-		 List<DDictValue> output = dataDictionaryService.saveDataDictionaryValues(dDictValues, createTypeAndKind);
-		
+		List<DDictValue> output = dataDictionaryService.saveDataDictionaryValues(dDictValues, createTypeAndKind);
+
 		logger.info(DDictValue.toJsonArray(output));
 
 	}
 
-	
 }
diff --git a/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests.java b/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests.java
index b0d8d3301..9c1f44238 100755
--- a/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests.java
@@ -64,7 +64,7 @@ public class ExperimentServiceTests {
 
 	@Autowired
 	private ExperimentService experimentService;
-	
+
 	@Autowired
 	private ExperimentValueService experimentValueService;
 
@@ -87,7 +87,8 @@ public void CreateProtocolTest_1() {
 		long id = protocol.getId();
 		Assert.assertNotNull(
 				"Find method for 'Protocol' illegally returned null for id '"
-						+ id + "'", id);
+						+ id + "'",
+				id);
 	}
 
 	// @Test
@@ -205,8 +206,8 @@ public void UpdateExeprimentName_2() {
 		String json = "{    \"analysisGroups\": null,    \"codeName\": \"test experiment code name 105\",    \"id\": 3101,    \"ignored\": false,    \"lsKind\": \"default\",    \"lsLabels\": null,    \"lsStates\": null,    \"lsTransaction\": 311,    \"lsType\": \"default\",    \"lsTypeAndKind\": \"default_default\",    \"modifiedBy\": null,    \"modifiedDate\": null,    \"protocol\": {        \"codeName\": \"test protocol code name 105\",        \"id\": 3100,        \"ignored\": false,        \"lsKind\": \"default\",        \"lsTransaction\": 311,        \"lsType\": \"default\",        \"lsTypeAndKind\": \"default_default\",        \"modifiedBy\": null,        \"modifiedDate\": null,        \"recordedBy\": \"testUser\",        \"recordedDate\": 1379479721768,        \"shortDescription\": \"just a test\",        \"version\": 0    },    \"recordedBy\": \"testUser\",    \"recordedDate\": 1379479721768,    \"shortDescription\": \"some short description\",    \"version\": 0}";
 		try {
 			experimentService.updateExperiment(Experiment
-				.fromJsonToExperiment(json));
-		} catch (Exception e){
+					.fromJsonToExperiment(json));
+		} catch (Exception e) {
 			Assert.assertNull(e);
 		}
 	}
@@ -227,7 +228,35 @@ public void CreateProtocolFromSimpleJson_3()
 	public void CreateProtocolFromNestedJson()
 			throws UniqueNameException, NotFoundException {
 		// String json =
-		// "{ \"name\": \"\",\"shortDescription\": \"\",\"lsTransaction\": null,\"protocolStates\": [ { \"protocolValues\": [ { \"valueType\": \"stringValue\",\"valueKind\": \"reader instrument\",\"stringValue\": \"Molecular Dynamics FLIPR\",\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"lsTransaction\": null,\"thingIdValue\": null,\"sampleId\": null,\"sampleName\": \"\",\"publicData\": false,\"recordedDate\":    1353216427000 },{ \"valueType\": \"numericValue\",\"valueKind\": \"curve min\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\":                0,\"sigFigs\":                2,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"lsTransaction\": null,\"thingIdValue\": null,\"sampleId\": null,\"sampleName\": \"\",\"publicData\": false,\"recordedDate\":    1353216427000 },{ \"valueType\": \"numericValue\",\"valueKind\": \"curve max\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\":              100,\"sigFigs\":                2,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"lsTransaction\": null,\"thingIdValue\": null,\"sampleId\": null,\"sampleName\": \"\",\"publicData\": false,\"recordedDate\":    1353216427000 } ],\"recordedBy\": \"userName\",\"stateType\": \"metadata\",\"stateKind\": \"protocol parameters\",\"comments\": \"\",\"lsTransaction\": null,\"ignored\": false,\"recordedDate\":    1353216427000 } ] }";
+		// "{ \"name\": \"\",\"shortDescription\": \"\",\"lsTransaction\":
+		// null,\"protocolStates\": [ { \"protocolValues\": [ { \"valueType\":
+		// \"stringValue\",\"valueKind\": \"reader instrument\",\"stringValue\":
+		// \"Molecular Dynamics FLIPR\",\"fileValue\": null,\"urlValue\":
+		// null,\"dateValue\": null,\"clobValue\": null,\"blobValue\":
+		// null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\":
+		// null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\":
+		// null,\"concUnit\": \"\",\"comments\": null,\"ignored\":
+		// false,\"lsTransaction\": null,\"thingIdValue\": null,\"sampleId\":
+		// null,\"sampleName\": \"\",\"publicData\": false,\"recordedDate\":
+		// 1353216427000 },{ \"valueType\": \"numericValue\",\"valueKind\": \"curve
+		// min\",\"stringValue\": null,\"fileValue\": null,\"urlValue\":
+		// null,\"dateValue\": null,\"clobValue\": null,\"blobValue\":
+		// null,\"valueOperator\": null,\"numericValue\": 0,\"sigFigs\":
+		// 2,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\":
+		// \"\",\"comments\": null,\"ignored\": false,\"lsTransaction\":
+		// null,\"thingIdValue\": null,\"sampleId\": null,\"sampleName\":
+		// \"\",\"publicData\": false,\"recordedDate\": 1353216427000 },{ \"valueType\":
+		// \"numericValue\",\"valueKind\": \"curve max\",\"stringValue\":
+		// null,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": 100,\"sigFigs\": 2,\"uncertainty\":
+		// null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\":
+		// null,\"ignored\": false,\"lsTransaction\": null,\"thingIdValue\":
+		// null,\"sampleId\": null,\"sampleName\": \"\",\"publicData\":
+		// false,\"recordedDate\": 1353216427000 } ],\"recordedBy\":
+		// \"userName\",\"stateType\": \"metadata\",\"stateKind\": \"protocol
+		// parameters\",\"comments\": \"\",\"lsTransaction\": null,\"ignored\":
+		// false,\"recordedDate\": 1353216427000 } ] }";
 		String json = "{\"kind\":\"primary analysis\",\"recordedBy\":\"jmcneil\",\"recordedDate\":1363503600000,\"shortDescription\":\"primary 7:34\",\"description\":\"\", \"experimentLabels\":[{\"labelType\":\"name\",\"labelKind\":\"experiment name\",\"labelText\":\"john 7:34\",\"ignored\":false,\"preferred\":true,\"recordedDate\":1363503600000,\"recordedBy\":\"jmcneil\",\"physicallyLabled\":false,\"imageFile\":null}],\"experimentStates\":[], \"protocol\":{\"kind\":\"primary analysis\",\"recordedBy\":\"username\",\"shortDescription\":\"primary analysis\",\"description\":\"\", \"codeName\":\"PROT-00000003\",\"id\":96,\"ignored\":false,\"lsTransaction\":{\"comments\":\"primary analysis protocol transactions\",\"id\":87,\"recordedDate\":1363388477000,\"version\":0},\"modifiedBy\":null,\"modifiedDate\":null,\"recordedDate\":1363388477000,\"version\":1}}";
 		// TODO: fix json
 		Experiment experiment = experimentService.saveLsExperiment(Experiment
@@ -243,9 +272,10 @@ public void CreateProtocolFromNestedJson()
 
 	}
 
-	//@Test
+	// @Test
 	@Transactional
-	//TODO: fix this test to either test SEL delete route (real delete) or Browser delete route (soft delete via status)
+	// TODO: fix this test to either test SEL delete route (real delete) or Browser
+	// delete route (soft delete via status)
 	public void RemoveExperimentTest() {
 		Long id = 136951L;
 		Experiment experiment = Experiment.findExperiment(id);
@@ -362,7 +392,7 @@ public void deleteExperimentAnalysisGroups() {
 		// List<TreatmentGroup> treatmentGroups =
 		// TreatmentGroup.findTreatmentGroupsByAnalysisGroup(analysisGroup).getResultList();
 		// logger.debug("found number of treatment group per analyisGroup: " +
-		// analysisGroup.getId() + "  " + treatmentGroups.size());
+		// analysisGroup.getId() + " " + treatmentGroups.size());
 		// treamentGroupSet.addAll(treatmentGroups);
 		// }
 		// logger.debug("total number of treamentGroups: " +
@@ -373,7 +403,7 @@ public void deleteExperimentAnalysisGroups() {
 		// List<Subject> subjectGroups =
 		// Subject.findSubjectsByTreatmentGroup(treamentGroup).getResultList();
 		// logger.debug("found number of subject group per treamentGroup: " +
-		// treamentGroup.getId() + "  " + subjectGroups.size());
+		// treamentGroup.getId() + " " + subjectGroups.size());
 		// subjectSet.addAll(subjectGroups);
 		// }
 		// logger.debug("total number of subjectSet: " + subjectSet.size());
@@ -489,7 +519,7 @@ public void findAndSaveExperimentFromJson1() throws NotFoundException {
 		List<Experiment> check2 = Experiment.findExperimentListByExperimentNameAndIgnoredNot(experimentName);
 		Assert.assertFalse(check2.isEmpty());
 	}
-	
+
 	@Test
 	public void findAndSaveExperimentFromJson2() throws NotFoundException {
 		String experimentName = "Test Experiment Brian";
@@ -509,27 +539,27 @@ public void findAndSaveExperimentFromJson2() throws NotFoundException {
 		List<Experiment> check2 = Experiment.findExperimentListByExperimentNameAndIgnoredNot(experimentName);
 		Assert.assertEquals(1, check2.size());
 	}
-	
+
 	@Test
-//	@Transactional
+	// @Transactional
 	public void deleteExperimentByName() {
 		String experimentName = "Test Experiment Brian";
 		List<Experiment> check1 = Experiment.findExperimentListByExperimentNameAndIgnoredNot(experimentName);
 		Assert.assertEquals(1, check1.size());
-		for (Experiment experiment: check1) {
+		for (Experiment experiment : check1) {
 			experiment.logicalDelete();
 		}
 		List<Experiment> check2 = Experiment.findExperimentListByExperimentNameAndIgnoredNot(experimentName);
 		Assert.assertTrue(check2.isEmpty());
 	}
-	
+
 	@Test
 	public void verifyDeleted() {
 		String experimentName = "Test Experiment Brian";
 		List<Experiment> check1 = Experiment.findExperimentListByExperimentNameAndIgnoredNot(experimentName);
 		Assert.assertEquals(0, check1.size());
 	}
-	
+
 	@Transactional
 	@Test
 	public void experimentBrowserFilterTest() {
@@ -541,75 +571,78 @@ public void experimentBrowserFilterTest() {
 		String codeName = "EXPT-00000001";
 		String type = "default";
 		String kind = "default";
-		
+
 		Map<String, String> requestParams = new HashMap<String, String>();
 		requestParams.put("protocolName", protocolName);
-		
+
 		Set<Experiment> experiments = experimentService.findExperimentsByRequestMetadata(requestParams);
 		Assert.assertEquals(1, experiments.size());
 		experiments.clear();
-		
+
 		requestParams.put("protocolCodeName", protocolCodeName);
 		experiments = experimentService.findExperimentsByRequestMetadata(requestParams);
 		Assert.assertEquals(1, experiments.size());
 		experiments.clear();
-		
+
 		requestParams.put("protocolType", protocolType);
 		requestParams.put("protocolKind", protocolKind);
-		
+
 		experiments = experimentService.findExperimentsByRequestMetadata(requestParams);
 		Assert.assertEquals(1, experiments.size());
 		experiments.clear();
-		
+
 		requestParams.remove("protocolName");
 		experiments = experimentService.findExperimentsByRequestMetadata(requestParams);
 		Assert.assertEquals(1, experiments.size());
-		
+
 		requestParams.clear();
-		
+
 		requestParams.put("name", name);
-		
+
 		experiments = experimentService.findExperimentsByRequestMetadata(requestParams);
 		Assert.assertEquals(1, experiments.size());
 		experiments.clear();
-		
+
 		requestParams.put("codeName", codeName);
 		experiments = experimentService.findExperimentsByRequestMetadata(requestParams);
 		Assert.assertEquals(1, experiments.size());
 		experiments.clear();
-		
+
 		requestParams.put("type", type);
 		requestParams.put("kind", kind);
-		
+
 		experiments = experimentService.findExperimentsByRequestMetadata(requestParams);
 		Assert.assertEquals(1, experiments.size());
 		experiments.clear();
-		
+
 		requestParams.remove("name");
 		experiments = experimentService.findExperimentsByRequestMetadata(requestParams);
 		Assert.assertEquals(1, experiments.size());
 	}
-	
+
 	@Test
 	public void softDeletedTest() {
 		Long id = 14L;
 		Experiment experiment = Experiment.findExperiment(id);
 		Assert.assertFalse(experimentService.isSoftDeleted(experiment));
-		experimentValueService.updateExperimentValue(experiment.getCodeName(), "metadata", "experiment metadata", "stringValue", "status", "Deleted");
+		experimentValueService.updateExperimentValue(experiment.getCodeName(), "metadata", "experiment metadata",
+				"stringValue", "status", "Deleted");
 		experiment.setIgnored(true);
 		Assert.assertTrue(experimentService.isSoftDeleted(experiment));
-		experimentValueService.updateExperimentValue(experiment.getCodeName(), "metadata", "experiment metadata", "stringValue", "status", "Approved");
+		experimentValueService.updateExperimentValue(experiment.getCodeName(), "metadata", "experiment metadata",
+				"stringValue", "status", "Approved");
 		experiment.setIgnored(false);
 		Assert.assertFalse(experimentService.isSoftDeleted(experiment));
-		experimentValueService.updateExperimentValue(experiment.getCodeName(), "metadata", "experiment metadata", "stringValue", "status", "Deleted");
+		experimentValueService.updateExperimentValue(experiment.getCodeName(), "metadata", "experiment metadata",
+				"stringValue", "status", "Deleted");
 		experiment.setIgnored(true);
 		experiment.setDeleted(true);
 		Assert.assertFalse(experimentService.isSoftDeleted(experiment));
 
 	}
-	
+
 	@Test
-//	@Transactional
+	// @Transactional
 	public void browserFinderDeleteTest() throws TooManyResultsException {
 		Long id = 2123L;
 		String query = "EXPERIMENT 4 EXPT-00000006";
@@ -618,8 +651,9 @@ public void browserFinderDeleteTest() throws TooManyResultsException {
 		Assert.assertEquals(1, experiments.size());
 		Assert.assertEquals(experiment.getId(), experiments.iterator().next().getId());
 		experiments.clear();
-		
-		experimentValueService.updateExperimentValue(experiment.getCodeName(), "metadata", "experiment metadata", "stringValue", "status", "Deleted");
+
+		experimentValueService.updateExperimentValue(experiment.getCodeName(), "metadata", "experiment metadata",
+				"stringValue", "status", "Deleted");
 		experiment.setIgnored(true);
 		experiment.merge();
 		experiment.flush();
@@ -628,22 +662,23 @@ public void browserFinderDeleteTest() throws TooManyResultsException {
 		Assert.assertEquals(experiment.getId(), experiments.iterator().next().getId());
 		experiments.clear();
 	}
-	
+
 	@Test
-	public void browserFinderDeleteTest2() throws TooManyResultsException{
+	public void browserFinderDeleteTest2() throws TooManyResultsException {
 		Long id = 2123L;
 		String query = "EXPERIMENT 4 EXPT-00000006";
 		Experiment experiment = Experiment.findExperiment(id);
 		experiment.setDeleted(true);
-		experimentValueService.updateExperimentValue(experiment.getCodeName(), "metadata", "experiment metadata", "stringValue", "status", "Deleted");
+		experimentValueService.updateExperimentValue(experiment.getCodeName(), "metadata", "experiment metadata",
+				"stringValue", "status", "Deleted");
 		experiment.setIgnored(true);
 		experiment.merge();
 		experiment.flush();
 		Collection<Experiment> experiments = experimentService.findExperimentsByGenericMetaDataSearch(query);
 		Assert.assertEquals(0, experiments.size());
-		
+
 	}
-	
+
 	@Test
 	public void browserFinderDeleteTest3() {
 		Long id = 2123L;
@@ -653,136 +688,145 @@ public void browserFinderDeleteTest3() {
 		experiment.merge();
 		experiment.flush();
 	}
-	
+
 	@Test
 	@Transactional
-	public void uniqueNameExceptionTest() throws UniqueNameException, NotFoundException{
+	public void uniqueNameExceptionTest() throws UniqueNameException, NotFoundException {
 		String experimentName = "Test Load 102";
 		String json = "{\"codeName\":null,\"deleted\":false,\"id\":null,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[{\"deleted\":false,\"id\":null,\"ignored\":false,\"labelText\":\"Test Load 102\",\"lsKind\":\"experiment name\",\"lsTransaction\":5,\"lsType\":\"name\",\"lsTypeAndKind\":\"name_experiment name\",\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"nouser\",\"recordedDate\":1395708973000,\"version\":null}],\"lsStates\":[],\"lsTransaction\":5,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"protocol\":{\"codeName\":\"PROT-00000002\",\"deleted\":false,\"id\":1006,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":5,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"recordedBy\":\"nouser\",\"recordedDate\":1395708972000,\"shortDescription\":\"protocol created by generic data parser\",\"version\":null},\"recordedBy\":\"nouser\",\"recordedDate\":1395708973000,\"shortDescription\":\"NA\",\"version\":null}";
 		Experiment experiment = Experiment.fromJsonToExperiment(json);
 		try {
 			experimentService.saveLsExperiment(experiment);
-		} catch (UniqueNameException e){
+		} catch (UniqueNameException e) {
 			Assert.assertNotNull(e);
 		}
 	}
-	
+
 	@Transactional
 	@Test
-	public void searchTest2() throws TooManyResultsException{
+	public void searchTest2() throws TooManyResultsException {
 		String query = "EXPT-00000012";
 		Collection<Experiment> experiments = experimentService.findExperimentsByGenericMetaDataSearch(query);
-		logger.debug("RESULTS: "+"NUMBER OF EXPERIMENTS: "+experiments.size()+experiments.toString());
+		logger.debug("RESULTS: " + "NUMBER OF EXPERIMENTS: " + experiments.size() + experiments.toString());
 	}
-	
+
 	@Test
-//	@Transactional
+	// @Transactional
 	public void createExperimentStatusTest() {
 		Experiment experiment = Experiment.findExperiment(7585L);
-		ExperimentValue experimentValue = experimentValueService.updateExperimentValue(experiment.getCodeName(), "metadata", "experiment metadata", "codeValue", "experiment status", "created");
+		ExperimentValue experimentValue = experimentValueService.updateExperimentValue(experiment.getCodeName(),
+				"metadata", "experiment metadata", "codeValue", "experiment status", "created");
 		String createdExperimentStatus = experimentValue.getCodeValue();
-		Assert.assertEquals("created", createdExperimentStatus);		
+		Assert.assertEquals("created", createdExperimentStatus);
 	}
-	
+
 	@Test
 	@Transactional
 	public void updateExperimentStatusTest() {
 		Experiment experiment = Experiment.findExperiment(7585L);
-		ExperimentValue experimentValue = ExperimentValue.findExperimentValuesByExptIDAndStateTypeKindAndValueTypeKind(experiment.getId(), "metadata", "experiment metadata", "codeValue", "experiment status").getSingleResult();
+		ExperimentValue experimentValue = ExperimentValue
+				.findExperimentValuesByExptIDAndStateTypeKindAndValueTypeKind(experiment.getId(), "metadata",
+						"experiment metadata", "codeValue", "experiment status")
+				.getSingleResult();
 		String originalExperimentStatus = experimentValue.getCodeValue();
 		Assert.assertTrue(!originalExperimentStatus.equals("deleted"));
-		ExperimentValue experimentValue2 = experimentValueService.updateExperimentValue(experiment.getCodeName(), "metadata", "experiment metadata", "codeValue", "experiment status", "deleted");
+		ExperimentValue experimentValue2 = experimentValueService.updateExperimentValue(experiment.getCodeName(),
+				"metadata", "experiment metadata", "codeValue", "experiment status", "deleted");
 		experiment.setIgnored(true);
 		String deletedExperimentStatus = experimentValue2.getCodeValue();
-		ExperimentValue experimentValue3 = ExperimentValue.findExperimentValuesByExptIDAndStateTypeKindAndValueTypeKind(experiment.getId(), "metadata", "experiment metadata", "codeValue", "experiment status").getSingleResult();
+		ExperimentValue experimentValue3 = ExperimentValue
+				.findExperimentValuesByExptIDAndStateTypeKindAndValueTypeKind(experiment.getId(), "metadata",
+						"experiment metadata", "codeValue", "experiment status")
+				.getSingleResult();
 		String checkDeletedExperimentStatus = experimentValue3.getCodeValue();
 		Assert.assertEquals("deleted", deletedExperimentStatus);
 		Assert.assertEquals("deleted", checkDeletedExperimentStatus);
-		
+
 	}
-	
+
 	@Test
 	@Transactional
-	@Rollback(value=false)
+	@Rollback(value = false)
 	public void deleteChildren() {
 		Experiment experiment = Experiment.findExperiment(203528L);
 		long startTime = new Date().getTime();
 		experimentService.deleteAnalysisGroupsByExperiment(experiment);
 		long endTime = new Date().getTime();
 		long totalTime = endTime - startTime;
-		logger.info("Time to delete "+ totalTime +" ms");
-		
+		logger.info("Time to delete " + totalTime + " ms");
+
 	}
-	
+
 	@Test
 	@Transactional
-	@Rollback(value=false)
-	public void changeProtocol() throws Exception{
-		Experiment experiment  = Experiment.findExperiment(1007L);
+	@Rollback(value = false)
+	public void changeProtocol() throws Exception {
+		Experiment experiment = Experiment.findExperiment(1007L);
 		Protocol newProtocol = Protocol.findProtocol(708326L);
 		Assert.assertFalse(experiment.getProtocol().getId() == newProtocol.getId());
 		Assert.assertFalse(experiment.getProtocol().getCodeName().equals(newProtocol.getCodeName()));
-//		logger.info(newProtocol.toJson());
-//		logger.info(experiment.toJson());
+		// logger.info(newProtocol.toJson());
+		// logger.info(experiment.toJson());
 		experiment.setProtocol(newProtocol);
 		Experiment updatedExperiment = experimentService.updateExperiment(experiment);
-//		logger.info(updatedExperiment.toJson());
+		// logger.info(updatedExperiment.toJson());
 		Assert.assertTrue(updatedExperiment.getProtocol().getId() == newProtocol.getId());
 		Assert.assertTrue(updatedExperiment.getProtocol().getCodeName().equals(newProtocol.getCodeName()));
 	}
 
 	@Transactional
 	@Test
-	public void experimentBrowserSearchTest2() throws Exception{
+	public void experimentBrowserSearchTest2() throws Exception {
 		String query = "EXPERIMENT 5";
-		logger.info("Searching with the query: "+ query);
+		logger.info("Searching with the query: " + query);
 		Collection<Experiment> resultExperiments = experimentService.findExperimentsByGenericMetaDataSearch(query);
-		logger.info("Found: "+ resultExperiments.toString());
+		logger.info("Found: " + resultExperiments.toString());
 		Assert.assertTrue(resultExperiments.size() > 0);
 		query = "\"EXPERIMENT 5\"";
-		logger.info("Searching with the query: "+ query);
+		logger.info("Searching with the query: " + query);
 		Collection<Experiment> resultExperiments2 = experimentService.findExperimentsByGenericMetaDataSearch(query);
-		logger.info("Found: "+ resultExperiments2.toString());
+		logger.info("Found: " + resultExperiments2.toString());
 		Assert.assertTrue(resultExperiments2.size() > 0);
 		Assert.assertTrue(resultExperiments.size() != resultExperiments2.size());
-		
+
 		query = "EXPERIMENT 50";
-		logger.info("Searching with the query: "+ query);
+		logger.info("Searching with the query: " + query);
 		resultExperiments = experimentService.findExperimentsByGenericMetaDataSearch(query);
-		logger.info("Found: "+ resultExperiments.toString());
+		logger.info("Found: " + resultExperiments.toString());
 		Assert.assertTrue(resultExperiments.size() > 0);
 		query = "\"EXPERIMENT 50\"";
-		logger.info("Searching with the query: "+ query);
+		logger.info("Searching with the query: " + query);
 		resultExperiments2 = experimentService.findExperimentsByGenericMetaDataSearch(query);
-		logger.info("Found: "+ resultExperiments2.toString());
+		logger.info("Found: " + resultExperiments2.toString());
 		Assert.assertTrue(resultExperiments2.size() > 0);
-		Assert.assertEquals(resultExperiments.iterator().next().getCodeName(),resultExperiments2.iterator().next().getCodeName());
+		Assert.assertEquals(resultExperiments.iterator().next().getCodeName(),
+				resultExperiments2.iterator().next().getCodeName());
 	}
-	
+
 	@Transactional
 	@Test
-	public void experimentBrowser_dateSearch() throws Exception{
+	public void experimentBrowser_dateSearch() throws Exception {
 		String query = "2015-05-08";
-		logger.info("Searching with the query: "+ query);
+		logger.info("Searching with the query: " + query);
 		Collection<Experiment> resultExperiments = experimentService.findExperimentsByGenericMetaDataSearch(query);
-		logger.info("Found: "+ resultExperiments.toString());
+		logger.info("Found: " + resultExperiments.toString());
 		Assert.assertTrue(resultExperiments.size() > 0);
-		
+
 	}
-	
+
 	@Transactional
-	@Rollback(value=false)
+	@Rollback(value = false)
 	@Test
-	public void updateExperiment() throws UniqueNameException{
+	public void updateExperiment() throws UniqueNameException {
 		String json = "{\"id\":1035,\"codeName\":\"EXPT-00000061\",\"lsType\":\"default\",\"lsKind\":\"study\",\"protocol\":{\"codeName\":\"PROT-00000020\",\"deleted\":false,\"id\":1034,\"ignored\":false,\"lsKind\":\"study\",\"lsTransaction\":306,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_study\",\"modifiedDate\":1471906899841,\"recordedBy\":\"bob\",\"recordedDate\":1471906899636,\"shortDescription\":\" \",\"version\":1},\"recordedDate\":1471909718042,\"recordedBy\":\"bob\",\"lsStates\":[{\"ignored\":false,\"lsKind\":\"study steps\",\"lsType\":\"study tracking\",\"lsValues\":[{\"ignored\":false,\"lsKind\":\"step order\",\"lsType\":\"numericValue\",\"numericValue\":0,\"recordedBy\":\"bob\",\"recordedDate\":1471911582836,\"lsTransaction\":323},{\"ignored\":false,\"lsKind\":\"step category order\",\"lsType\":\"numericValue\",\"numericValue\":2,\"recordedBy\":\"bob\",\"recordedDate\":1471911582836,\"lsTransaction\":323},{\"ignored\":false,\"lsKind\":\"step category\",\"lsType\":\"stringValue\",\"recordedBy\":\"bob\",\"recordedDate\":1471911582836,\"stringValue\":\"Uncategorized\",\"lsTransaction\":323},{\"ignored\":false,\"lsKind\":\"step name\",\"lsType\":\"stringValue\",\"stringValue\":\"EXPT-00000068\",\"recordedBy\":\"bob\",\"recordedDate\":1471911582836,\"lsTransaction\":323}],\"recordedBy\":\"bob\",\"recordedDate\":1471911582836,\"lsTransaction\":323}],\"lsTransaction\":323}";
 		Experiment exptToUpdate = Experiment.fromJsonToExperiment(json);
 		Experiment updatedExperiment = experimentService.updateExperiment(exptToUpdate);
 		logger.info(updatedExperiment.toJson());
 	}
-	
+
 	@Transactional
 	@Test
-	public void getExperimentsAsCodeTables(){
+	public void getExperimentsAsCodeTables() {
 		List<CodeTableDTO> codeTables = experimentService.getExperimentsAsCodeTables(null, null);
 		Assert.assertFalse(codeTables.isEmpty());
 		logger.info(CodeTableDTO.toJsonArray(codeTables));
@@ -793,24 +837,24 @@ public void getExperimentsAsCodeTables(){
 		Assert.assertFalse(codeTables.isEmpty());
 		logger.info(CodeTableDTO.toJsonArray(codeTables));
 	}
-	
+
 	@Test
 	@Transactional
-	public void getExperimentsByDateValueComparison() throws Exception{
+	public void getExperimentsByDateValueComparison() throws Exception {
 		DateValueComparisonRequest request = new DateValueComparisonRequest();
 		request.setStateType("metadata");
 		request.setStateKind("experiment metadata");
 		request.setValueKind("completion date");
 		request.setSecondsDelta(60);
-		
+
 		Collection<String> results = experimentService.getExperimentCodesByDateValueComparison(request);
 		logger.info(results.toString());
-		Assert.assertTrue(results.size()>0);
-		
+		Assert.assertTrue(results.size() > 0);
+
 		request.setNewerThanModified(true);
 		Collection<String> noResults = experimentService.getExperimentCodesByDateValueComparison(request);
 		logger.info(noResults.toString());
-		Assert.assertFalse(noResults.size()>0);
+		Assert.assertFalse(noResults.size() > 0);
 	}
 
 }
diff --git a/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests2.java b/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests2.java
index f88e12f2e..5bda1fbf5 100755
--- a/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests2.java
+++ b/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests2.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import java.util.ArrayList;
@@ -31,9 +30,9 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class ExperimentServiceTests2 {
 
@@ -42,16 +41,16 @@ public class ExperimentServiceTests2 {
 	@Autowired
 	private ExperimentService experimentService;
 
-	//@Test
+	// @Test
 	@Transactional
-	public void GetExprerimentNodes_4(){
+	public void GetExprerimentNodes_4() {
 
 		Protocol protocol = Protocol.findProtocol(46684L);
 		logger.debug(protocol.toJson());
-		if (ItxProtocolProtocol.findItxProtocolProtocolsBySecondProtocol(protocol).getResultList().size() > 0){
+		if (ItxProtocolProtocol.findItxProtocolProtocolsBySecondProtocol(protocol).getResultList().size() > 0) {
 			List<String> protocolNodeList = new ArrayList<String>();
 			List<String> nodeList = lookupProtocolTree(protocol, protocolNodeList);
-			for (String node : nodeList){
+			for (String node : nodeList) {
 				logger.debug("here is the node: " + node);
 			}
 		} else {
@@ -59,14 +58,15 @@ public void GetExprerimentNodes_4(){
 		}
 	}
 
-	//a recursive function to walk up the protocol tree
+	// a recursive function to walk up the protocol tree
 	private List<String> lookupProtocolTree(Protocol protocol, List<String> protocolNodeList) {
-		List<ItxProtocolProtocol> ipps = ItxProtocolProtocol.findItxProtocolProtocolsBySecondProtocol(protocol).getResultList();
-		if (ipps.size() > 1){
+		List<ItxProtocolProtocol> ipps = ItxProtocolProtocol.findItxProtocolProtocolsBySecondProtocol(protocol)
+				.getResultList();
+		if (ipps.size() > 1) {
 			logger.error("ERROR: there is more than a single protocol interacation. " + ipps.size());
 		}
-		for (ItxProtocolProtocol ipp : ipps){
-			if (ipp.getFirstProtocol().getLsType().equalsIgnoreCase("protocolTree")){
+		for (ItxProtocolProtocol ipp : ipps) {
+			if (ipp.getFirstProtocol().getLsType().equalsIgnoreCase("protocolTree")) {
 				protocolNodeList.add(ipp.getFirstProtocol().getLsKind());
 				lookupProtocolTree(ipp.getFirstProtocol(), protocolNodeList);
 			}
@@ -74,9 +74,9 @@ private List<String> lookupProtocolTree(Protocol protocol, List<String> protocol
 		return protocolNodeList;
 	}
 
-	//@Test
+	// @Test
 	@Transactional
-	public void GetExprerimentNodes_3(){
+	public void GetExprerimentNodes_3() {
 
 		Collection<JSTreeNodeDTO> output = experimentService.getExperimentNodes(null);
 		logger.debug("here is the output: " + output);
@@ -84,15 +84,17 @@ public void GetExprerimentNodes_3(){
 	}
 
 	@SuppressWarnings({ "unchecked", "null" })
-//	@Test
+	// @Test
 	@Transactional
-	public void GetExprerimentsFilters_2(){
-
-		//	 converted json: {"advancedFilter":"","batchCodeList":["GENE-000013","GENE-000011","GENE-000002","GENE-000003"],"booleanFilter":"and","experimentCodeList":["EXPT-00000002","default","tags_EXPT-00000002","tags_EXPT-0013","tags_EXPT-0014","PROT-00000002","EXPT-0014","Root Node","EXPT-0013"],"searchFilters":[{"codeName":null,"experimentCode":"EXPT-0013","experimentId":null,"filterValue":"yes","lsKind":"24h hit","lsType":"stringValue","operator":"equals","queryId":null,"termName":"Q1"}]}
+	public void GetExprerimentsFilters_2() {
 
+		// converted json:
+		// {"advancedFilter":"","batchCodeList":["GENE-000013","GENE-000011","GENE-000002","GENE-000003"],"booleanFilter":"and","experimentCodeList":["EXPT-00000002","default","tags_EXPT-00000002","tags_EXPT-0013","tags_EXPT-0014","PROT-00000002","EXPT-0014","Root
+		// Node","EXPT-0013"],"searchFilters":[{"codeName":null,"experimentCode":"EXPT-0013","experimentId":null,"filterValue":"yes","lsKind":"24h
+		// hit","lsType":"stringValue","operator":"equals","queryId":null,"termName":"Q1"}]}
 
 		Set<ExperimentFilterSearchDTO> searchFilters = new HashSet<ExperimentFilterSearchDTO>();
-		ExperimentFilterSearchDTO searchFilter = new ExperimentFilterSearchDTO(); 
+		ExperimentFilterSearchDTO searchFilter = new ExperimentFilterSearchDTO();
 		searchFilter.setExperimentCode("EXPT-00000016");
 		searchFilter.setLsType("stringValue");
 		searchFilter.setLsKind("Gene Symbol");
@@ -101,86 +103,94 @@ public void GetExprerimentsFilters_2(){
 		logger.info(searchFilter.toJson());
 		searchFilters.add(searchFilter);
 
-//				ExperimentFilterSearchDTO searchFilter2 = new ExperimentFilterSearchDTO(); 
-//				searchFilter2.setExperimentCode("EXPT-00000002");
-//				searchFilter2.setLsType("numericValue");
-//				searchFilter2.setLsKind("18h Z-score diff.");
-//				searchFilter2.setOperator(">");
-//				searchFilter2.setFilterValue("2");
-//				logger.info(searchFilter2.toJson());
-//				searchFilters.add(searchFilter2);
-
+		// ExperimentFilterSearchDTO searchFilter2 = new ExperimentFilterSearchDTO();
+		// searchFilter2.setExperimentCode("EXPT-00000002");
+		// searchFilter2.setLsType("numericValue");
+		// searchFilter2.setLsKind("18h Z-score diff.");
+		// searchFilter2.setOperator(">");
+		// searchFilter2.setFilterValue("2");
+		// logger.info(searchFilter2.toJson());
+		// searchFilters.add(searchFilter2);
 
 		Set<String> batchCodeList = new HashSet<String>();
-//				batchCodeList.add("GENE-008126");
-//				batchCodeList.add("GENE-000008");
-//				batchCodeList.add("GENE-000018");		
-//				batchCodeList.add("GENE-000016");
-		//		batchCodeList.add("GENE-000002");
-		//		batchCodeList.add("GENE-000003");
+		// batchCodeList.add("GENE-008126");
+		// batchCodeList.add("GENE-000008");
+		// batchCodeList.add("GENE-000018");
+		// batchCodeList.add("GENE-000016");
+		// batchCodeList.add("GENE-000002");
+		// batchCodeList.add("GENE-000003");
 
 		Set<String> experimentCodeList = new HashSet<String>();
 		experimentCodeList.add("EXPT-00000016");
-//		experimentCodeList.add("EXPT-00003");
-//		experimentCodeList.add("EXPT-00004");
-		//		experimentCodeList.add("EXPT-00000316");
-		//		experimentCodeList.add("EXPT-00000441");
-
-
-		String booleanFilter = "AND"; //choices AND, OR, ADVANCED
-//		String advancedFilter = "((Q1 and Q2 and Q3) or (Q4 and Q5)) OR (Q6)"; //choices AND, OR, ADVANCED
-//		String advancedFilter = "(Q1 and Q2)"; //choices AND, OR, ADVANCED
-
-//		String advancedSQL = "select distinct tested_lot from api_experiment_results where numeric_value > 3";
-//		String advancedSQL = "select distinct tested_lot from ((select tested_lot from api_experiment_results where experiment_id = '46693' " +
-//							"and ls_kind = '18h Z-score diff.' and numeric_value > 1) intersect (select tested_lot from api_experiment_results where " +
-//							"ls_kind = 'Shapira hit' and numeric_value = 1)) temp";
+		// experimentCodeList.add("EXPT-00003");
+		// experimentCodeList.add("EXPT-00004");
+		// experimentCodeList.add("EXPT-00000316");
+		// experimentCodeList.add("EXPT-00000441");
+
+		String booleanFilter = "AND"; // choices AND, OR, ADVANCED
+		// String advancedFilter = "((Q1 and Q2 and Q3) or (Q4 and Q5)) OR (Q6)";
+		// //choices AND, OR, ADVANCED
+		// String advancedFilter = "(Q1 and Q2)"; //choices AND, OR, ADVANCED
+
+		// String advancedSQL = "select distinct tested_lot from api_experiment_results
+		// where numeric_value > 3";
+		// String advancedSQL = "select distinct tested_lot from ((select tested_lot
+		// from api_experiment_results where experiment_id = '46693' " +
+		// "and ls_kind = '18h Z-score diff.' and numeric_value > 1) intersect (select
+		// tested_lot from api_experiment_results where " +
+		// "ls_kind = 'Shapira hit' and numeric_value = 1)) temp";
 
 		ExperimentSearchRequestDTO searchRequest = new ExperimentSearchRequestDTO();
-//		searchRequest.setAdvancedFilter(advancedFilter);
-//		searchRequest.setAdvancedFilterSQL(advancedSQL);
+		// searchRequest.setAdvancedFilter(advancedFilter);
+		// searchRequest.setAdvancedFilterSQL(advancedSQL);
 		searchRequest.setBooleanFilter(booleanFilter);
 		searchRequest.setBatchCodeList(batchCodeList);
 		searchRequest.setExperimentCodeList(experimentCodeList);
 		searchRequest.setSearchFilters(searchFilters);
 		logger.info(searchRequest.toJson());
 
-		//		List<AnalysisGroupValueDTO> results = experimentService.getFilteredAGData(searchRequest);
-		//		logger.info("number of values found: " + results.size());
-		//logger.info(AnalysisGroupValueDTO.toPrettyJsonArray(results));
+		// List<AnalysisGroupValueDTO> results =
+		// experimentService.getFilteredAGData(searchRequest);
+		// logger.info("number of values found: " + results.size());
+		// logger.info(AnalysisGroupValueDTO.toPrettyJsonArray(results));
 
 		Set<String> uniqueBatchCodes = new HashSet<String>();
-		//        List<String> batchCodes = AnalysisGroupValue.findBatchCodeBySearchFilters(searchRequest.getBatchCodeList(), searchRequest.getExperimentCodeList(), searchRequest.getSearchFilters()).getResultList();
+		// List<String> batchCodes =
+		// AnalysisGroupValue.findBatchCodeBySearchFilters(searchRequest.getBatchCodeList(),
+		// searchRequest.getExperimentCodeList(),
+		// searchRequest.getSearchFilters()).getResultList();
 
 		List<String> batchCodes = null;
 		Collection<String> collectionOfCodes = null;
 
-
-		boolean firstPass = true;		
+		boolean firstPass = true;
 		Collection<BatchCodeDTO> collectionOfBatchCodes = null;
 
-		if (searchRequest.getBooleanFilter() != null && searchRequest.getBooleanFilter().equalsIgnoreCase("ADVANCED")){
-			//DO SQL substitutions for now. Try to do something more elegant later
-			collectionOfCodes = AnalysisGroupValue.findBatchCodeBySearchFilter(searchRequest.getAdvancedFilterSQL()).getResultList();
+		if (searchRequest.getBooleanFilter() != null && searchRequest.getBooleanFilter().equalsIgnoreCase("ADVANCED")) {
+			// DO SQL substitutions for now. Try to do something more elegant later
+			collectionOfCodes = AnalysisGroupValue.findBatchCodeBySearchFilter(searchRequest.getAdvancedFilterSQL())
+					.getResultList();
 			logger.info("advance search returned number of codes: " + collectionOfCodes.size());
-			//			collectionOfBatchCodes.removeAll(Collections.singleton(null));
-			//			for (BatchCodeDTO batch : collectionOfBatchCodes){
-			//				if (batch.getBatchCode() != null){
-			//					collectionOfCodes.add(batch.getBatchCode());
-			//				}
-			//			}
-		} else if (searchRequest.getBooleanFilter() != null){
-			for (ExperimentFilterSearchDTO singleSearchFilter : searchFilters){
-				if (firstPass){
-					collectionOfCodes = AnalysisGroupValue.findBatchCodeBySearchFilter(searchRequest.getBatchCodeList(), searchRequest.getExperimentCodeList(), singleSearchFilter, false).getResultList();
+			// collectionOfBatchCodes.removeAll(Collections.singleton(null));
+			// for (BatchCodeDTO batch : collectionOfBatchCodes){
+			// if (batch.getBatchCode() != null){
+			// collectionOfCodes.add(batch.getBatchCode());
+			// }
+			// }
+		} else if (searchRequest.getBooleanFilter() != null) {
+			for (ExperimentFilterSearchDTO singleSearchFilter : searchFilters) {
+				if (firstPass) {
+					collectionOfCodes = AnalysisGroupValue.findBatchCodeBySearchFilter(searchRequest.getBatchCodeList(),
+							searchRequest.getExperimentCodeList(), singleSearchFilter, false).getResultList();
 					logger.info("size of firstBatchCodes: " + collectionOfCodes.size());
 					firstPass = false;
 				} else {
-					batchCodes = AnalysisGroupValue.findBatchCodeBySearchFilter(searchRequest.getBatchCodeList(), searchRequest.getExperimentCodeList(), singleSearchFilter, false).getResultList();
+					batchCodes = AnalysisGroupValue.findBatchCodeBySearchFilter(searchRequest.getBatchCodeList(),
+							searchRequest.getExperimentCodeList(), singleSearchFilter, false).getResultList();
 					logger.info("size of firstBatchCodes: " + collectionOfCodes.size());
 					logger.info("size of secondBatchCodes: " + batchCodes.size());
 
-					if (booleanFilter.equalsIgnoreCase("AND")){
+					if (booleanFilter.equalsIgnoreCase("AND")) {
 						collectionOfCodes = CollectionUtils.intersection(collectionOfCodes, batchCodes);
 					} else {
 						collectionOfCodes = CollectionUtils.union(collectionOfCodes, batchCodes);
@@ -192,94 +202,104 @@ public void GetExprerimentsFilters_2(){
 			logger.info("the searchRequest is null");
 		}
 
-		
 		Set<String> finalUniqueBatchCodes = new HashSet<String>();
 
-
-		if (collectionOfCodes != null){
-			logger.debug("size of intersectCodes: " + collectionOfCodes.size());			
+		if (collectionOfCodes != null) {
+			logger.debug("size of intersectCodes: " + collectionOfCodes.size());
 			finalUniqueBatchCodes.addAll(collectionOfCodes);
 			logger.info("number of batchCodes found: " + finalUniqueBatchCodes.size());
 		}
 
-
-//		searchRequest.getBatchCodeList().removeAll(batchCodeList);
-//		searchRequest.getBatchCodeList().addAll(finalUniqueBatchCodes);
-//		searchRequest.getBatchCodeList().removeAll(Collections.singleton(null));
+		// searchRequest.getBatchCodeList().removeAll(batchCodeList);
+		// searchRequest.getBatchCodeList().addAll(finalUniqueBatchCodes);
+		// searchRequest.getBatchCodeList().removeAll(Collections.singleton(null));
 
 		logger.info("calling experiment service search: ");
 		List<AnalysisGroupValueDTO> agValues = experimentService.getFilteredAGData(searchRequest, true);
 
 		logger.info("number of agValues found: " + agValues.size());
-		for (AnalysisGroupValueDTO agValue : agValues){
+		for (AnalysisGroupValueDTO agValue : agValues) {
 			logger.debug(agValue.toJson());
 		}
 
-
-		//        for (String bc : batchCodes){
-		//        	logger.info(bc);
-		//        }
-		//        
-		//        
-		//        List<AnalysisGroupValueDTO> agValues;
-		//		if (uniqueBatchCodes.size() > 0){
-		//    		logger.debug("looking by experiment codes and batch codes in default AND block");
-		//            agValues = AnalysisGroupValue.findAnalysisGroupValueDTO(uniqueBatchCodes, searchRequest.getExperimentCodeList()).getResultList();
-		//        } else {
-		//    		logger.debug("looking by experiment codes only");
-		//            agValues = AnalysisGroupValue.findAnalysisGroupValueDTOByExperiments(searchRequest.getExperimentCodeList()).getResultList();	
-		//        }
-		//        logger.info("number of agValues found: " + agValues.size());
+		// for (String bc : batchCodes){
+		// logger.info(bc);
+		// }
+		//
+		//
+		// List<AnalysisGroupValueDTO> agValues;
+		// if (uniqueBatchCodes.size() > 0){
+		// logger.debug("looking by experiment codes and batch codes in default AND
+		// block");
+		// agValues = AnalysisGroupValue.findAnalysisGroupValueDTO(uniqueBatchCodes,
+		// searchRequest.getExperimentCodeList()).getResultList();
+		// } else {
+		// logger.debug("looking by experiment codes only");
+		// agValues =
+		// AnalysisGroupValue.findAnalysisGroupValueDTOByExperiments(searchRequest.getExperimentCodeList()).getResultList();
+		// }
+		// logger.info("number of agValues found: " + agValues.size());
 		//
-		//		
-		//		if (booleanFilter.equalsIgnoreCase("ADVANCED")){
-		//			// not implemented yet -- do same as AND for now
-		//			
-		//		} else if (booleanFilter.equalsIgnoreCase("OR")){
-		//			
-		//		} else {
-		//			//default is the AND
-		//			
-		//		}
-
-		//		List<String> batchCodes = AnalysisGroupValue.findBatchCodeBySearchFilters(batchCodeList, experimentCodeList, searchFilters).getResultList();
 		//
-		//		
-		////		List<String> batchCodes = AnalysisGroupValue.findBatchCodedBySearchFilter(searchFilters).getResultList();
-		//		logger.info("********** number of batches found:   " + batchCodes.size());
-		//		for(String batch : batchCodes){
-		//			//String codeValue = (String) batch.get(0);
-		//			logger.info("------------------------------------here is the codeValue: " + batch);
-		//		}
-		//		
-		//		List<String> batchCodesOR = AnalysisGroupValue.findBatchCodeBySearchFilter(batchCodeList, experimentCodeList, searchFilter).getResultList();
-		//		logger.info("********** number of batches found:   " + batchCodesOR.size());
-		//		for(String batch : batchCodesOR){
-		//			logger.info("------------------------------------here is the codeValue: " + batch);
-		//		}
-		//		
-		//		List<String> batchList = new ArrayList<String>();
-		//		batchList.addAll(batchCodeList);
-		//		
-		//		//List<AnalysisGroupValueDTO> agValues = AnalysisGroupValue.findAnalysisGroupValueDTO(batchList).getResultList();
-		//		List<AnalysisGroupValueDTO> agValues = AnalysisGroupValue.findAnalysisGroupValueDTO(batchCodeList, experimentCodeList).getResultList();
-		//		logger.info("********** number of AnalysisGroupValueDTO found:   " + agValues.size());
-		//		for(AnalysisGroupValueDTO agValue : agValues){
-		//			logger.info("------------------------------------here is the agValues: " + agValue);
-		//		}
+		// if (booleanFilter.equalsIgnoreCase("ADVANCED")){
+		// // not implemented yet -- do same as AND for now
+		//
+		// } else if (booleanFilter.equalsIgnoreCase("OR")){
+		//
+		// } else {
+		// //default is the AND
+		//
+		// }
 
+		// List<String> batchCodes =
+		// AnalysisGroupValue.findBatchCodeBySearchFilters(batchCodeList,
+		// experimentCodeList, searchFilters).getResultList();
+		//
+		//
+		//// List<String> batchCodes =
+		// AnalysisGroupValue.findBatchCodedBySearchFilter(searchFilters).getResultList();
+		// logger.info("********** number of batches found: " + batchCodes.size());
+		// for(String batch : batchCodes){
+		// //String codeValue = (String) batch.get(0);
+		// logger.info("------------------------------------here is the codeValue: " +
+		// batch);
+		// }
+		//
+		// List<String> batchCodesOR =
+		// AnalysisGroupValue.findBatchCodeBySearchFilter(batchCodeList,
+		// experimentCodeList, searchFilter).getResultList();
+		// logger.info("********** number of batches found: " + batchCodesOR.size());
+		// for(String batch : batchCodesOR){
+		// logger.info("------------------------------------here is the codeValue: " +
+		// batch);
+		// }
+		//
+		// List<String> batchList = new ArrayList<String>();
+		// batchList.addAll(batchCodeList);
+		//
+		// //List<AnalysisGroupValueDTO> agValues =
+		// AnalysisGroupValue.findAnalysisGroupValueDTO(batchList).getResultList();
+		// List<AnalysisGroupValueDTO> agValues =
+		// AnalysisGroupValue.findAnalysisGroupValueDTO(batchCodeList,
+		// experimentCodeList).getResultList();
+		// logger.info("********** number of AnalysisGroupValueDTO found: " +
+		// agValues.size());
+		// for(AnalysisGroupValueDTO agValue : agValues){
+		// logger.info("------------------------------------here is the agValues: " +
+		// agValue);
+		// }
 
 	}
 
-	//@Test
+	// @Test
 	@Transactional
-	public void GetExprerimentsFilters_1(){
+	public void GetExprerimentsFilters_1() {
 		Collection<String> codeValues = new HashSet<String>();
 		codeValues.add("EXPT-00000314");
 		codeValues.add("EXPT-00000002-testingPut-101");
 
 		Collection<CodeTableDTO> codeTables = new HashSet<CodeTableDTO>();
-		for (String code : codeValues){
+		for (String code : codeValues) {
 			CodeTableDTO ct = new CodeTableDTO();
 			ct.setCode(code);
 			ct.setName(code);
@@ -290,59 +310,61 @@ public void GetExprerimentsFilters_1(){
 
 		logger.info(ExperimentFilterDTO.toPrettyJsonArray(results));
 
-
 	}
 
 	@SuppressWarnings("unchecked")
-//	@Test
+	// @Test
 	@Transactional
-	public void GetExprerimentsWithBatchCodes_1(){
+	public void GetExprerimentsWithBatchCodes_1() {
 		Collection<String> codeValues = new HashSet<String>();
-		//		codeValues.add("CMPD-0000124-01");
-		//		codeValues.add("CMPD-0000125-01");
-		//		codeValues.add("GENE-000002");
-				codeValues.add("GENE-004000");
+		// codeValues.add("CMPD-0000124-01");
+		// codeValues.add("CMPD-0000125-01");
+		// codeValues.add("GENE-000002");
+		codeValues.add("GENE-004000");
 
 		Collection<JSTreeNodeDTO> results = experimentService.getExperimentNodes(codeValues);
 
 		logger.info(JSTreeNodeDTO.toPrettyJsonArray(results));
 	}
-	
+
 	@Test
-	//@Transactional
+	// @Transactional
 	public void geneIdQueryFromJson() {
 		String jsonOld = "{\"experimentCodeList\":[\"EXPT-00000552\",\"tags_EXPT-00000190\",\"PROT-00000160\"],\"batchCodeList\":[\"GENE-000029\",\"GENE-002764\",\"GENE-000011\"],\"searchFilters\":[{\"filterValue\":\"1000\",\"termName\":\"Q1\",\"experimentCode\":\"EXPT-00000552\",\"lsKind\":\"Whole_Blood\",\"lsType\":\"numericValue\",\"operator\":\">\"}],\"booleanFilter\":\"and\",\"advancedFilter\":\"\"}";
 		String jsonarray = "{\"experimentCodeList\":[\"EXPT-00000190\"],\"batchCodeList\":[],\"searchFilters\":[{\"experimentCode\":\"EXPT-00000190\",\"lsType\":\"numericValue\",\"lsKind\":\"Adipocyte\",\"operator\":\">\",\"filterValue\":\"1\",\"termName\":\"Q1\"}],\"booleanFilter\":\"or\",\"advancedFilter\":\"\"}";
 		String json = "{\"experimentCodeList\":[\"EXPT-00000227\"],\"batchCodeList\":[],\"searchFilters\":[{\"experimentCode\":\"EXPT-00000227\",\"lsType\":\"numericValue\",\"lsKind\":\"Hit\",\"operator\":\"=\",\"filterValue\":\"1\",\"termName\":\"Q1\"}],\"booleanFilter\":\"or\",\"advancedFilter\":\"\"}";
 		logger.debug("incoming json: " + json);
-	    ExperimentSearchRequestDTO searchRequest = ExperimentSearchRequestDTO.fromJsonToExperimentSearchRequestDTO(json);
-	    logger.debug("converted json: " + searchRequest.toJson());
-	    List<AnalysisGroupValueDTO> agValues = null;
-	    try {
-	        agValues = experimentService.getFilteredAGData(searchRequest, true);
-	        logger.debug("number of agvalues found: " + agValues.size());
-	    } catch (Exception e) {
-	        logger.error(e.toString());
-	    }
+		ExperimentSearchRequestDTO searchRequest = ExperimentSearchRequestDTO
+				.fromJsonToExperimentSearchRequestDTO(json);
+		logger.debug("converted json: " + searchRequest.toJson());
+		List<AnalysisGroupValueDTO> agValues = null;
+		try {
+			agValues = experimentService.getFilteredAGData(searchRequest, true);
+			logger.debug("number of agvalues found: " + agValues.size());
+		} catch (Exception e) {
+			logger.error(e.toString());
+		}
 	}
-	
+
 	@Test
 	@Transactional
-	public void getCompoundDataViaGeneIdQuery(){
+	public void getCompoundDataViaGeneIdQuery() {
 		String json = "{\"advancedFilter\":\"\",\"advancedFilterSQL\":null,\"batchCodeList\":[],\"booleanFilter\":\"and\",\"experimentCodeList\":[\"EXPT-00000806\"],\"searchFilters\":[]}";
-	    ExperimentSearchRequestDTO searchRequest = ExperimentSearchRequestDTO.fromJsonToExperimentSearchRequestDTO(json);
-//		Collection<AnalysisGroupValueDTO> dtos = AnalysisGroupValue.findAnalysisGroupValueDTO( searchRequest.getBatchCodeList(), searchRequest.getExperimentCodeList(), true).getResultList(); 
-	    List<AnalysisGroupValueDTO> agData = experimentService.getFilteredAGData(searchRequest,true);
+		ExperimentSearchRequestDTO searchRequest = ExperimentSearchRequestDTO
+				.fromJsonToExperimentSearchRequestDTO(json);
+		// Collection<AnalysisGroupValueDTO> dtos =
+		// AnalysisGroupValue.findAnalysisGroupValueDTO(
+		// searchRequest.getBatchCodeList(), searchRequest.getExperimentCodeList(),
+		// true).getResultList();
+		List<AnalysisGroupValueDTO> agData = experimentService.getFilteredAGData(searchRequest, true);
 		logger.info(AnalysisGroupValueDTO.toJsonArray(agData));
-		for (AnalysisGroupValueDTO dto : agData){
+		for (AnalysisGroupValueDTO dto : agData) {
 			Assert.assertTrue(dto.getProtocolId() != 0L);
 		}
 	}
-	
-
 
-	//@Test
-	public void hydrateJson_test(){
+	// @Test
+	public void hydrateJson_test() {
 		String josn = "{\"protocol\":{\"codeName\":\"PROT-00000026\",\"id\":484909,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[{\"id\":11714,\"ignored\":false,\"labelText\":\"APMS\",\"lsKind\":\"protocol name\",\"lsTransaction\":302,\"lsType\":\"name\",\"lsTypeAndKind\":\"name_protocol name\",\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"nouser\",\"recordedDate\":1393216025000,\"version\":0}],\"lsStates\":[],\"lsTags\":[],\"lsTransaction\":302,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"recordedBy\":\"nouser\",\"recordedDate\":1393216025000,\"shortDescription\":\"protocol created by generic data parser\",\"version\":1},\"codeName\":\"EXPT-00000389\",\"lsType\":\"default\",\"lsKind\":\"default\",\"shortDescription\":\"NA\",\"recordedBy\":\"nouser\",\"lsTransaction\":306,\"lsLabels\":[{\"experiment\":null,\"labelText\":\"Sample AMPS Expt 1001-V2\",\"recordedBy\":\"nouser\",\"lsType\":\"name\",\"lsKind\":\"experiment name\",\"preferred\":true,\"ignored\":false,\"lsTransaction\":306,\"recordedDate\":1393218563000}],\"lsStates\":[{\"experiment\":null,\"lsValues\":[{\"lsState\":null,\"lsType\":\"stringValue\",\"lsKind\":\"notebook\",\"stringValue\":\"JAM-000033\",\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"nouser\",\"recordedDate\":1393218563000,\"lsTransaction\":306},{\"lsState\":null,\"lsType\":\"stringValue\",\"lsKind\":\"notebook page\",\"stringValue\":\"6\",\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"nouser\",\"recordedDate\":1393218563000,\"lsTransaction\":306},{\"lsState\":null,\"lsType\":\"dateValue\",\"lsKind\":\"completion date\",\"stringValue\":null,\"fileValue\":null,\"urlValue\":null,\"dateValue\":1373270400000,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"nouser\",\"recordedDate\":1393218563000,\"lsTransaction\":306},{\"lsState\":null,\"lsType\":\"stringValue\",\"lsKind\":\"scientist\",\"stringValue\":\"jmcneil\",\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"nouser\",\"recordedDate\":1393218563000,\"lsTransaction\":306},{\"lsState\":null,\"lsType\":\"stringValue\",\"lsKind\":\"status\",\"stringValue\":\"Approved\",\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"nouser\",\"recordedDate\":1393218563000,\"lsTransaction\":306},{\"lsState\":null,\"lsType\":\"stringValue\",\"lsKind\":\"analysis status\",\"stringValue\":\"running\",\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"nouser\",\"recordedDate\":1393218563000,\"lsTransaction\":306},{\"lsState\":null,\"lsType\":\"clobValue\",\"lsKind\":\"analysis result html\",\"stringValue\":null,\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":\"<p>Analysis not yet completed</p>\",\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"recordedBy\":\"nouser\",\"recordedDate\":1393218563000,\"lsTransaction\":306},{\"lsState\":null,\"lsType\":\"codeValue\",\"lsKind\":\"project\",\"stringValue\":null,\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":\"Fluomics Project 3\",\"recordedBy\":\"nouser\",\"recordedDate\":1393218563000,\"lsTransaction\":306}],\"recordedBy\":\"nouser\",\"lsType\":\"metadata\",\"lsKind\":\"experiment metadata\",\"comments\":\"\",\"lsTransaction\":306,\"ignored\":false,\"recordedDate\":1393218563000}],\"lsTags\":[{\"tagText\":[\"apple\",\"banana\"],\"id\":null,\"version\":null,\"recordedDate\":1393218563000}],\"recordedDate\":1393218563000}";
 	}
 
diff --git a/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests3_Nodes.java b/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests3_Nodes.java
index 2f73e6893..f0cfd1142 100644
--- a/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests3_Nodes.java
+++ b/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests3_Nodes.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import java.util.HashSet;
@@ -19,9 +18,9 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class ExperimentServiceTests3_Nodes {
 
@@ -30,60 +29,62 @@ public class ExperimentServiceTests3_Nodes {
 	@Autowired
 	private ExperimentService experimentService;
 
-	//@Test
+	// @Test
 	@Transactional
-	public void GetExprerimentNodes_3(){
-		
+	public void GetExprerimentNodes_3() {
+
 		Long protocolId = 51004L;
-		List<ProtocolValue> protocolValues = ProtocolValue.findProtocolValuesByProtocolIDAndStateTypeKindAndValueTypeKind(protocolId, "metadata", "protocol metadata", "stringValue", "assay tree rule").getResultList();
+		List<ProtocolValue> protocolValues = ProtocolValue
+				.findProtocolValuesByProtocolIDAndStateTypeKindAndValueTypeKind(protocolId, "metadata",
+						"protocol metadata", "stringValue", "assay tree rule")
+				.getResultList();
 		String assayFolderRule = "";
-		for (ProtocolValue value : protocolValues){
-			if (!value.getStringValue().equalsIgnoreCase("")){
+		for (ProtocolValue value : protocolValues) {
+			if (!value.getStringValue().equalsIgnoreCase("")) {
 				assayFolderRule = value.getStringValue();
 			}
-		logger.info(value.toJson());
-		
-		String[] ruleSplit = assayFolderRule.split("/");
-		for (String assayFolder : ruleSplit){
-			if (!assayFolder.equalsIgnoreCase("")){
-				logger.info("assay folder: " + assayFolder);				
+			logger.info(value.toJson());
+
+			String[] ruleSplit = assayFolderRule.split("/");
+			for (String assayFolder : ruleSplit) {
+				if (!assayFolder.equalsIgnoreCase("")) {
+					logger.info("assay folder: " + assayFolder);
+				}
 			}
+
 		}
-		
-	}
-		
-//		Protocol protocol = Protocol.findProtocol(46686L);
-//		Set<ProtocolState> protocolStates = protocol.getLsStates();
-//		for (ProtocolState protocolState:protocolStates){
-//			logger.info(protocolState.toJson());
-//			ProtocolValue.findProtocolValuesByProtocolIDAndStateTypeKindAndValueTypeKind(protocolId, stateType, stateKind, valueType, valueKind)
-//			Set<ProtocolValue> protocolValues = protocolState.getLsValues();
-//			for (ProtocolValue value : protocolValues){
-//				logger.info(value.toJson());
-//			}
-//			
-//		}
-
-//		Collection<JSTreeNodeDTO> output = experimentService.getExperimentNodes(null);
-//		logger.debug("here is the output: " + output);
+
+		// Protocol protocol = Protocol.findProtocol(46686L);
+		// Set<ProtocolState> protocolStates = protocol.getLsStates();
+		// for (ProtocolState protocolState:protocolStates){
+		// logger.info(protocolState.toJson());
+		// ProtocolValue.findProtocolValuesByProtocolIDAndStateTypeKindAndValueTypeKind(protocolId,
+		// stateType, stateKind, valueType, valueKind)
+		// Set<ProtocolValue> protocolValues = protocolState.getLsValues();
+		// for (ProtocolValue value : protocolValues){
+		// logger.info(value.toJson());
+		// }
+		//
+		// }
+
+		// Collection<JSTreeNodeDTO> output =
+		// experimentService.getExperimentNodes(null);
+		// logger.debug("here is the output: " + output);
 
 	}
 
-	
 	@Test
 	@Transactional
-	public void GetExprerimentNodes_4(){
-		
+	public void GetExprerimentNodes_4() {
+
 		Set<String> batchCodes = new HashSet<String>();
 		String batchCode = "GENE-001144";
 		batchCodes.add(batchCode);
-		
+
 		boolean showOnlyPublicData = true;
 		List<ExperimentDataDTO> exptDataSet = experimentService.getExperimentData(batchCode, showOnlyPublicData);
 		logger.info("@@@@@@@@@@@@@@@@ printing the experiment metadata @@@@@@@@@@@@@");
 		logger.info(ExperimentDataDTO.toJsonArray(exptDataSet));
-		
-		
 
 	}
 
diff --git a/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests4_Save.java b/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests4_Save.java
index 72ceafe6e..b827987ca 100644
--- a/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests4_Save.java
+++ b/src/test/java/com/labsynch/labseer/service/ExperimentServiceTests4_Save.java
@@ -38,25 +38,22 @@ public class ExperimentServiceTests4_Save {
 
 	@Autowired
 	private ExperimentService experimentService;
-	
+
 	@Autowired
 	private ExperimentValueService experimentValueService;
 
 	@Autowired
 	private AnalysisGroupService analysisGroupService;
-	
-	
-//	@Test
+
+	// @Test
 	@Transactional
-	public void uniqueNameExceptionTest() throws UniqueNameException{
+	public void uniqueNameExceptionTest() throws UniqueNameException {
 		String json = "{\"lsKind\":\"gx depot\",\"lsLabels\":[{\"labelText\":\"Guy TEST DUPE 101\",\"lsKind\":\"experiment name\",\"lsType\":\"name\",\"preferred\":true,\"recordedBy\":\"goshiro\"}],\"lsTransaction\":8,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_gx depot\",\"protocol\":{\"codeName\":\"PROT-00000001\",\"deleted\":false,\"id\":1,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":5,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"recordedBy\":\"smeyer\",\"recordedDate\":1425511298000,\"shortDescription\":\"gx depot\",\"version\":1},\"recordedBy\":\"goshiro\",\"shortDescription\":\"test dupe experiments\"}";
 		Experiment experiment = Experiment.fromJsonToExperiment(json);
 		try {
 			Experiment savedExperiment = experimentService.saveLsExperiment(experiment);
-			
-			
-			
-		} catch (UniqueNameException e){
+
+		} catch (UniqueNameException e) {
 			logger.info(e.toString());
 			Assert.assertNotNull(e);
 		} catch (NotFoundException e) {
@@ -67,8 +64,8 @@ public void uniqueNameExceptionTest() throws UniqueNameException{
 
 	@Test
 	@Transactional
-//	@Rollback(value=false)
-	public void saveExperimentReuseAGTest() throws UniqueNameException{
+	// @Rollback(value=false)
+	public void saveExperimentReuseAGTest() throws UniqueNameException {
 		String json = "{\"protocol\":{\"codeName\":\"PROT-00000001\",\"deleted\":false,\"id\":1,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[{\"deleted\":false,\"id\":1,\"ignored\":false,\"labelText\":\"TEST\",\"lsKind\":\"protocol name\",\"lsTransaction\":5,\"lsType\":\"name\",\"lsTypeAndKind\":\"name_protocol name\",\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"smeyer\",\"recordedDate\":1425511298000,\"version\":0}],\"lsTags\":[],\"lsTransaction\":5,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"recordedBy\":\"smeyer\",\"recordedDate\":1425511298000,\"shortDescription\":\"gx depot\",\"version\":1},\"lsType\":\"default\",\"lsKind\":\"differential expression analysis\",\"shortDescription\":\"GUY TESTING 201\",\"lsTransaction\":3397,\"recordedBy\":\"cs_rest\",\"recordedDate\":1433364521000,\"modifiedBy\":\"cs_rest\",\"modifiedDate\":1433364521000,\"lsLabels\":[{\"experiment\":null,\"labelText\":\"GUY TESTING 201\",\"recordedBy\":\"goshiro\",\"lsType\":\"name\",\"lsKind\":\"experiment name\",\"preferred\":true,\"ignored\":false,\"lsTransaction\":3397,\"recordedDate\":1433364521000}],\"lsStates\":[{\"experiment\":null,\"lsValues\":[{\"lsState\":null,\"lsType\":\"codeValue\",\"lsKind\":\"project\",\"stringValue\":\"12291\",\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"concentration\":null,\"concUnit\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"codeOrigin\":null,\"codeType\":null,\"codeKind\":null,\"recordedBy\":\"cs_rest\",\"recordedDate\":1433364521000,\"lsTransaction\":3397},{\"lsState\":null,\"lsType\":\"stringValue\",\"lsKind\":\"experiment name\",\"stringValue\":\"NS1h_vs_all\",\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"concentration\":null,\"concUnit\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"codeOrigin\":null,\"codeType\":null,\"codeKind\":null,\"recordedBy\":\"cs_rest\",\"recordedDate\":1433364521000,\"lsTransaction\":3397},{\"lsState\":null,\"lsType\":\"stringValue\",\"lsKind\":\"parent experiment name\",\"stringValue\":\"RSC B without CI\",\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"concentration\":null,\"concUnit\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"codeOrigin\":null,\"codeType\":null,\"codeKind\":null,\"recordedBy\":\"cs_rest\",\"recordedDate\":1433364521000,\"lsTransaction\":3397},{\"lsState\":null,\"lsType\":\"stringValue\",\"lsKind\":\"master experiment name\",\"stringValue\":\"MINI Contextual Fear Conditioning B_3 -- retrosplenial cortex mouse n=4 v4\",\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"concentration\":null,\"concUnit\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"codeOrigin\":null,\"codeType\":null,\"codeKind\":null,\"recordedBy\":\"cs_rest\",\"recordedDate\":1433364521000,\"lsTransaction\":3397},{\"lsState\":null,\"lsType\":\"codeValue\",\"lsKind\":\"analysis program\",\"stringValue\":null,\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"concentration\":null,\"concUnit\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":\"DESeq2\",\"codeOrigin\":null,\"codeType\":null,\"codeKind\":null,\"recordedBy\":\"cs_rest\",\"recordedDate\":1433364521000,\"lsTransaction\":3397},{\"lsState\":null,\"lsType\":\"codeValue\",\"lsKind\":\"analysis type\",\"stringValue\":null,\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"concentration\":null,\"concUnit\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":\"differential expression\",\"codeOrigin\":null,\"codeType\":null,\"codeKind\":null,\"recordedBy\":\"cs_rest\",\"recordedDate\":1433364521000,\"lsTransaction\":3397},{\"lsState\":null,\"lsType\":\"stringValue\",\"lsKind\":\"experimental condition\",\"stringValue\":\"NS1h\",\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"concentration\":null,\"concUnit\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"codeOrigin\":null,\"codeType\":null,\"codeKind\":null,\"recordedBy\":\"cs_rest\",\"recordedDate\":1433364521000,\"lsTransaction\":3397},{\"lsState\":null,\"lsType\":\"stringValue\",\"lsKind\":\"control condition\",\"stringValue\":\"US3h\",\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"concentration\":null,\"concUnit\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"codeOrigin\":null,\"codeType\":null,\"codeKind\":null,\"recordedBy\":\"cs_rest\",\"recordedDate\":1433364521000,\"lsTransaction\":3397}],\"recordedBy\":\"cs_rest\",\"lsType\":\"metadata\",\"lsKind\":\"experiment metadata\",\"comments\":\"\",\"lsTransaction\":3397,\"ignored\":false,\"recordedDate\":1433364521000},{\"experiment\":null,\"lsValues\":[],\"recordedBy\":\"cs_rest\",\"lsType\":\"data\",\"lsKind\":\"results\",\"comments\":\"\",\"lsTransaction\":3397,\"ignored\":false,\"recordedDate\":1433364521000}],\"lsTags\":[],\"analysisGroups\":[{\"codeName\":\"AG-00004584\",\"deleted\":false,\"id\":12316,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346409,\"recordedBy\":\"userName\",\"recordedDate\":1433267698000},{\"codeName\":\"AG-00004598\",\"deleted\":false,\"id\":12330,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346977,\"recordedBy\":\"userName\",\"recordedDate\":1433267712000},{\"codeName\":\"AG-00004573\",\"deleted\":false,\"id\":12305,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346867,\"recordedBy\":\"userName\",\"recordedDate\":1433267687000},{\"codeName\":\"AG-00004561\",\"deleted\":false,\"id\":12293,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346491,\"recordedBy\":\"userName\",\"recordedDate\":1433267676000},{\"codeName\":\"AG-00004565\",\"deleted\":false,\"id\":12297,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346789,\"recordedBy\":\"userName\",\"recordedDate\":1433267680000},{\"codeName\":\"AG-00004566\",\"deleted\":false,\"id\":12298,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346352,\"recordedBy\":\"userName\",\"recordedDate\":1433267681000},{\"codeName\":\"AG-00004579\",\"deleted\":false,\"id\":12311,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346281,\"recordedBy\":\"userName\",\"recordedDate\":1433267693000},{\"codeName\":\"AG-00004581\",\"deleted\":false,\"id\":12313,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346316,\"recordedBy\":\"userName\",\"recordedDate\":1433267695000},{\"codeName\":\"AG-00004568\",\"deleted\":false,\"id\":12300,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346232,\"recordedBy\":\"userName\",\"recordedDate\":1433267683000},{\"codeName\":\"AG-00004589\",\"deleted\":false,\"id\":12321,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346691,\"recordedBy\":\"userName\",\"recordedDate\":1433267703000},{\"codeName\":\"AG-00004587\",\"deleted\":false,\"id\":12319,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346555,\"recordedBy\":\"userName\",\"recordedDate\":1433267701000},{\"codeName\":\"AG-00004591\",\"deleted\":false,\"id\":12323,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346370,\"recordedBy\":\"userName\",\"recordedDate\":1433267705000},{\"codeName\":\"AG-00004597\",\"deleted\":false,\"id\":12329,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346429,\"recordedBy\":\"userName\",\"recordedDate\":1433267711000},{\"codeName\":\"AG-00004594\",\"deleted\":false,\"id\":12326,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346599,\"recordedBy\":\"userName\",\"recordedDate\":1433267708000},{\"codeName\":\"AG-00004596\",\"deleted\":false,\"id\":12328,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346764,\"recordedBy\":\"userName\",\"recordedDate\":1433267710000},{\"codeName\":\"AG-00004578\",\"deleted\":false,\"id\":12310,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346513,\"recordedBy\":\"userName\",\"recordedDate\":1433267692000},{\"codeName\":\"AG-00004592\",\"deleted\":false,\"id\":12324,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346922,\"recordedBy\":\"userName\",\"recordedDate\":1433267706000},{\"codeName\":\"AG-00004574\",\"deleted\":false,\"id\":12306,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346715,\"recordedBy\":\"userName\",\"recordedDate\":1433267688000},{\"codeName\":\"AG-00004595\",\"deleted\":false,\"id\":12327,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346645,\"recordedBy\":\"userName\",\"recordedDate\":1433267709000},{\"codeName\":\"AG-00004600\",\"deleted\":false,\"id\":12332,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346469,\"recordedBy\":\"userName\",\"recordedDate\":1433267714000},{\"codeName\":\"AG-00004563\",\"deleted\":false,\"id\":12295,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346668,\"recordedBy\":\"userName\",\"recordedDate\":1433267678000},{\"codeName\":\"AG-00004583\",\"deleted\":false,\"id\":12315,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346949,\"recordedBy\":\"userName\",\"recordedDate\":1433267697000},{\"codeName\":\"AG-00004572\",\"deleted\":false,\"id\":12304,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346184,\"recordedBy\":\"userName\",\"recordedDate\":1433267686000},{\"codeName\":\"AG-00004576\",\"deleted\":false,\"id\":12308,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346739,\"recordedBy\":\"userName\",\"recordedDate\":1433267690000},{\"codeName\":\"AG-00004590\",\"deleted\":false,\"id\":12322,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346215,\"recordedBy\":\"userName\",\"recordedDate\":1433267704000},{\"codeName\":\"AG-00004569\",\"deleted\":false,\"id\":12301,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360347005,\"recordedBy\":\"userName\",\"recordedDate\":1433267684000},{\"codeName\":\"AG-00004575\",\"deleted\":false,\"id\":12307,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346577,\"recordedBy\":\"userName\",\"recordedDate\":1433267689000},{\"codeName\":\"AG-00004588\",\"deleted\":false,\"id\":12320,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346159,\"recordedBy\":\"userName\",\"recordedDate\":1433267702000},{\"codeName\":\"AG-00004586\",\"deleted\":false,\"id\":12318,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346816,\"recordedBy\":\"userName\",\"recordedDate\":1433267700000},{\"codeName\":\"AG-00004593\",\"deleted\":false,\"id\":12325,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346264,\"recordedBy\":\"userName\",\"recordedDate\":1433267707000},{\"codeName\":\"AG-00004571\",\"deleted\":false,\"id\":12303,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346449,\"recordedBy\":\"userName\",\"recordedDate\":1433267686000},{\"codeName\":\"AG-00004564\",\"deleted\":false,\"id\":12296,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346200,\"recordedBy\":\"userName\",\"recordedDate\":1433267679000},{\"codeName\":\"AG-00004567\",\"deleted\":false,\"id\":12299,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346895,\"recordedBy\":\"userName\",\"recordedDate\":1433267682000},{\"codeName\":\"AG-00004570\",\"deleted\":false,\"id\":12302,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346841,\"recordedBy\":\"userName\",\"recordedDate\":1433267685000},{\"codeName\":\"AG-00004577\",\"deleted\":false,\"id\":12309,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346298,\"recordedBy\":\"userName\",\"recordedDate\":1433267691000},{\"codeName\":\"AG-00004580\",\"deleted\":false,\"id\":12312,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346248,\"recordedBy\":\"userName\",\"recordedDate\":1433267694000},{\"codeName\":\"AG-00004582\",\"deleted\":false,\"id\":12314,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346334,\"recordedBy\":\"userName\",\"recordedDate\":1433267696000},{\"codeName\":\"AG-00004585\",\"deleted\":false,\"id\":12317,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346534,\"recordedBy\":\"userName\",\"recordedDate\":1433267699000},{\"codeName\":\"AG-00004562\",\"deleted\":false,\"id\":12294,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346389,\"recordedBy\":\"userName\",\"recordedDate\":1433267677000},{\"codeName\":\"AG-00004599\",\"deleted\":false,\"id\":12331,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsTransaction\":3211,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1433360346622,\"recordedBy\":\"userName\",\"recordedDate\":1433267713000}]}";
 		try {
 			test(2, json);
@@ -80,51 +77,50 @@ public void saveExperimentReuseAGTest() throws UniqueNameException{
 			e.printStackTrace();
 		}
 	}
-	
+
 	private void test(final int threadCount, final String json) throws InterruptedException, ExecutionException {
-	    Callable<Long> task = new Callable<Long>() {
-	        @Override
-	        public Long call() throws UniqueNameException, NotFoundException {
-	    		Experiment experiment = Experiment.fromJsonToExperiment(json);
+		Callable<Long> task = new Callable<Long>() {
+			@Override
+			public Long call() throws UniqueNameException, NotFoundException {
+				Experiment experiment = Experiment.fromJsonToExperiment(json);
 				Experiment savedExperiment = experimentService.saveLsExperiment(experiment);
-//				Set<AnalysisGroup> inputAnalysisGroups = new HashSet<AnalysisGroup>();
-				for(AnalysisGroup analysisGroup : experiment.getAnalysisGroups()){
-//					inputAnalysisGroups.add(AnalysisGroup.findAnalysisGroup(analysisGroup.getId()));
+				// Set<AnalysisGroup> inputAnalysisGroups = new HashSet<AnalysisGroup>();
+				for (AnalysisGroup analysisGroup : experiment.getAnalysisGroups()) {
+					// inputAnalysisGroups.add(AnalysisGroup.findAnalysisGroup(analysisGroup.getId()));
 					logger.info("Saving AG in hash: " + analysisGroup.getId());
 					analysisGroup.getExperiments().add(savedExperiment);
 					AnalysisGroup updatedAnlysisGroup = analysisGroupService.saveLsAnalysisGroup(analysisGroup);
 				}
-				
-				
-//				for(AnalysisGroup analysisGroup : inputAnalysisGroups){
-//					analysisGroup.getExperiments().add(savedExperiment);
-//					try {
-//						logger.info("Attempting to save: " + analysisGroup.getId());
-//						analysisGroupService.saveLsAnalysisGroup(analysisGroup);
-//					} catch (Exception e){
-//						logger.error(e.toString());
-//					}
-//				}
 
-	            return null;
-		}
-	    };
-	    List<Callable<Long>> tasks = Collections.nCopies(threadCount, task);
-	    ExecutorService executorService = Executors.newFixedThreadPool(threadCount);
-	    List<Future<Long>> futures = executorService.invokeAll(tasks);
-	    List<Long> resultList = new ArrayList<Long>(futures.size());
-	    // Check for exceptions
-//	    for (Future<Long> future : futures) {
-//	        // Throws an exception if an exception was thrown by the task.
-//	        resultList.add(future.get());
-//	    }
-	    // Validate the IDs
-//	    Assert.assertEquals(threadCount, futures.size());
-//	    List<Long> expectedList = new ArrayList<Long>(threadCount);
-//	    for (long i = 1; i <= threadCount; i++) {
-//	        expectedList.add(i);
-//	    }
-//	    Collections.sort(resultList);
-//	    Assert.assertEquals(expectedList, resultList);
+				// for(AnalysisGroup analysisGroup : inputAnalysisGroups){
+				// analysisGroup.getExperiments().add(savedExperiment);
+				// try {
+				// logger.info("Attempting to save: " + analysisGroup.getId());
+				// analysisGroupService.saveLsAnalysisGroup(analysisGroup);
+				// } catch (Exception e){
+				// logger.error(e.toString());
+				// }
+				// }
+
+				return null;
+			}
+		};
+		List<Callable<Long>> tasks = Collections.nCopies(threadCount, task);
+		ExecutorService executorService = Executors.newFixedThreadPool(threadCount);
+		List<Future<Long>> futures = executorService.invokeAll(tasks);
+		List<Long> resultList = new ArrayList<Long>(futures.size());
+		// Check for exceptions
+		// for (Future<Long> future : futures) {
+		// // Throws an exception if an exception was thrown by the task.
+		// resultList.add(future.get());
+		// }
+		// Validate the IDs
+		// Assert.assertEquals(threadCount, futures.size());
+		// List<Long> expectedList = new ArrayList<Long>(threadCount);
+		// for (long i = 1; i <= threadCount; i++) {
+		// expectedList.add(i);
+		// }
+		// Collections.sort(resultList);
+		// Assert.assertEquals(expectedList, resultList);
 	}
 }
diff --git a/src/test/java/com/labsynch/labseer/service/ExperimentStateServiceTests.java b/src/test/java/com/labsynch/labseer/service/ExperimentStateServiceTests.java
index 8b7fa37e7..76ab844c7 100644
--- a/src/test/java/com/labsynch/labseer/service/ExperimentStateServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/ExperimentStateServiceTests.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import java.util.ArrayList;
@@ -24,30 +23,31 @@
 
 import junit.framework.Assert;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class ExperimentStateServiceTests {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(ExperimentStateServiceTests.class);
-	
+
 	@Autowired
 	private ExperimentStateService experimentStateService;
-	
-//	@Test
+
+	// @Test
 	@Transactional
-	public void QueryExperimentStateByExpIdAndStateTypeKind(){
-			
+	public void QueryExperimentStateByExpIdAndStateTypeKind() {
+
 		Long experimentId = 9L;
 		String stateType = "metadata";
 		String stateKind = "experiment metadata";
-		List<ExperimentState> results = experimentStateService.getExperimentStatesByExperimentIdAndStateTypeKind(experimentId, stateType, stateKind);
+		List<ExperimentState> results = experimentStateService
+				.getExperimentStatesByExperimentIdAndStateTypeKind(experimentId, stateType, stateKind);
 		logger.info(ExperimentState.toJsonArray(results));
-		assert(results.size() == 5);
+		assert (results.size() == 5);
 	}
-	
-//	@Test
+
+	// @Test
 	@Transactional
 	public void QueryExperimentStateByExpIdAndStateTypeKindWithBadData() {
 		Long experimentId = 9L;
@@ -55,14 +55,15 @@ public void QueryExperimentStateByExpIdAndStateTypeKindWithBadData() {
 		String stateKind = "experiment metadata";
 		List<ExperimentState> results = new ArrayList<ExperimentState>();
 		try {
-			results = experimentStateService.getExperimentStatesByExperimentIdAndStateTypeKind(experimentId, stateType, stateKind);
-		} catch(IllegalArgumentException ex ) {
+			results = experimentStateService.getExperimentStatesByExperimentIdAndStateTypeKind(experimentId, stateType,
+					stateKind);
+		} catch (IllegalArgumentException ex) {
 			logger.info(ex.getMessage());
 		}
-		assert(results.size() == 0);
+		assert (results.size() == 0);
 	}
-	
-//	@Test
+
+	// @Test
 	@Transactional
 	public void QueryExperimentStateByExpIdAndStateTypeKindWithCodeName() {
 		String experimentCodeName = "EXPT-00000003";
@@ -72,32 +73,35 @@ public void QueryExperimentStateByExpIdAndStateTypeKindWithCodeName() {
 		boolean didCatch = false;
 		try {
 			experiment = Experiment.findExperimentsByCodeNameEquals(experimentCodeName).getSingleResult();
-		} catch(NoResultException nre) {
+		} catch (NoResultException nre) {
 			logger.info(nre.getMessage());
 			didCatch = true;
 		}
 		List<ExperimentState> results = new ArrayList<ExperimentState>();
 		try {
-			results = experimentStateService.getExperimentStatesByExperimentIdAndStateTypeKind(experiment.getId(), stateType, stateKind);
-		} catch(IllegalArgumentException ex ) {
+			results = experimentStateService.getExperimentStatesByExperimentIdAndStateTypeKind(experiment.getId(),
+					stateType, stateKind);
+		} catch (IllegalArgumentException ex) {
 			logger.info(ex.getMessage());
-			assert(results.size() == 0);
+			assert (results.size() == 0);
 			didCatch = true;
 		}
-		if(!didCatch) assert(results.size() == 5);
+		if (!didCatch)
+			assert (results.size() == 5);
 	}
-	
-//	@Test
+
+	// @Test
 	@Transactional
 	public void createExperimentStateByExperimentIdAndStateTypeKindTest() {
 		Long experimentId = 2L;
 		String lsType = "metadata";
 		String lsKind = "experiment metadata";
-		ExperimentState exptState = experimentStateService.createExperimentStateByExperimentIdAndStateTypeKind(experimentId, lsType, lsKind);
+		ExperimentState exptState = experimentStateService
+				.createExperimentStateByExperimentIdAndStateTypeKind(experimentId, lsType, lsKind);
 		Assert.assertNotNull(exptState);
 		logger.info(exptState.toJson());
 	}
-	
+
 	@Test
 	@Transactional
 	public void createExperimentStatesFromJson() {
@@ -107,23 +111,23 @@ public void createExperimentStatesFromJson() {
 		Assert.assertNotNull(exptStates);
 		logger.info(ExperimentState.toJsonArray(exptStates));
 	}
-	
+
 	@Test
 	public void deleteExperimentStates() {
 		String codeName = "EXPT-";
 		List<Experiment> experiments = Experiment.findExperimentsByCodeNameLike(codeName).getResultList();
-		for (Experiment experiment : experiments){
-			for (ExperimentState es : ExperimentState.findExperimentStatesByExperiment(experiment).getResultList()){
-				if (es.getLsType().equalsIgnoreCase("metadata") && es.getLsKind().equalsIgnoreCase("data column order")){
-					for (ExperimentValue ev : ExperimentValue.findExperimentValuesByLsState(es).getResultList()){
+		for (Experiment experiment : experiments) {
+			for (ExperimentState es : ExperimentState.findExperimentStatesByExperiment(experiment).getResultList()) {
+				if (es.getLsType().equalsIgnoreCase("metadata")
+						&& es.getLsKind().equalsIgnoreCase("data column order")) {
+					for (ExperimentValue ev : ExperimentValue.findExperimentValuesByLsState(es).getResultList()) {
 						ev.remove();
 					}
 					es.remove();
 				}
 			}
 		}
-		
-		
+
 	}
-	
+
 }
diff --git a/src/test/java/com/labsynch/labseer/service/ExperimentValueServiceTests.java b/src/test/java/com/labsynch/labseer/service/ExperimentValueServiceTests.java
index 3db6f29cd..268170040 100755
--- a/src/test/java/com/labsynch/labseer/service/ExperimentValueServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/ExperimentValueServiceTests.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import java.util.ArrayList;
@@ -20,142 +19,149 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class ExperimentValueServiceTests {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(ExperimentValueServiceTests.class);
-	
+
 	@Autowired
 	private ExperimentService experimentService;
-	
+
 	@Autowired
 	private ExperimentValueService experimentValueService;
-	
-//	@Test
-//	//@Transactional
-//	public void ExperimentValueTest_1(){
-//		
-//		List<ExperimentValue> values = ExperimentValue.findExperimentValueEntries(0, 3);
-//		for (ExperimentValue ev : values){
-//			logger.info(ev.toJson());
-//		}
-//
-//		ExperimentValue value = ExperimentValue.findExperimentValue(5010L);
-//		value.setIgnored(false);
-//		value.setComments("testing update of value 103");
-//		ExperimentValue updateValue = ExperimentValue.update(value);
-//		logger.info("#############################################");
-//
-//		logger.info(updateValue.toJson());
-//		
-//	}
-	
-//	@Test
+
+	// @Test
+	// //@Transactional
+	// public void ExperimentValueTest_1(){
+	//
+	// List<ExperimentValue> values = ExperimentValue.findExperimentValueEntries(0,
+	// 3);
+	// for (ExperimentValue ev : values){
+	// logger.info(ev.toJson());
+	// }
+	//
+	// ExperimentValue value = ExperimentValue.findExperimentValue(5010L);
+	// value.setIgnored(false);
+	// value.setComments("testing update of value 103");
+	// ExperimentValue updateValue = ExperimentValue.update(value);
+	// logger.info("#############################################");
+	//
+	// logger.info(updateValue.toJson());
+	//
+	// }
+
+	// @Test
 	public void getExperimentValueByIdTest() {
 		List<ExperimentValue> experimentValues = experimentValueService.getExperimentValuesByExperimentId(9l);
-		assert(experimentValues != null);
-		assert(!experimentValues.isEmpty());
+		assert (experimentValues != null);
+		assert (!experimentValues.isEmpty());
 	}
-	
-//	@Test
-//	public void getExperimentValueByCodeTest() {
-//		Long id = ApiExperimentController.retrieveExperimentIdFromCodeName("EXPT-00000003");
-//		List<ExperimentValue> experimentValues = experimentValueService.getExperimentValuesById(id);
-//		assert(experimentValues != null);
-//		assert(!experimentValues.isEmpty());
-//	}
-	
-//	@Test
+
+	// @Test
+	// public void getExperimentValueByCodeTest() {
+	// Long id =
+	// ApiExperimentController.retrieveExperimentIdFromCodeName("EXPT-00000003");
+	// List<ExperimentValue> experimentValues =
+	// experimentValueService.getExperimentValuesById(id);
+	// assert(experimentValues != null);
+	// assert(!experimentValues.isEmpty());
+	// }
+
+	// @Test
 	public void updateExperimentValueByIdTest() {
 		List<ExperimentValue> experimentValues = experimentValueService.getExperimentValuesByExperimentId(9l);
-		
-		assert(experimentValues != null);
-		assert(!experimentValues.isEmpty());
+
+		assert (experimentValues != null);
+		assert (!experimentValues.isEmpty());
 		ExperimentValue experimentValue = experimentValues.get(0);
 		experimentValue.setRecordedBy("Test2");
 		experimentValue.toJson();
-		//ExperimentValue experimentValue2 = experimentValueService.updateExperimentValue(ExperimentValue.from)
+		// ExperimentValue experimentValue2 =
+		// experimentValueService.updateExperimentValue(ExperimentValue.from)
 	}
 
-	//@Test
-	public void updateExperimentValueExistingTest(){
-		
+	// @Test
+	public void updateExperimentValueExistingTest() {
+
 		ExperimentValue testOutput = ExperimentValue.findExperimentValue(30l);
-		//logger.info(testOutput.toJson());
+		// logger.info(testOutput.toJson());
 		String json = "{\"clobValue\":null,\"codeKind\":null,\"codeType\":null,\"codeTypeAndKind\":\"null_null\",\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"fileValue\":null,\"id\":30,\"ignored\":false,\"lsKind\":\"status\",\"lsState\":{\"comments\":null,\"experiment\":{\"codeName\":\"EXPT-00000003\",\"id\":9,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":2,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"protocol\":{\"codeName\":\"PROT-00000002\",\"id\":1,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":1,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"jmcneil\",\"recordedDate\":1401363350000,\"shortDescription\":\"protocol created by generic data parser\",\"version\":1},\"recordedBy\":\"jmcneil\",\"recordedDate\":1401365250000,\"shortDescription\":\"experiment created by generic data parser\",\"version\":1},\"id\":10,\"ignored\":false,\"lsKind\":\"experiment metadata\",\"lsTransaction\":2,\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_experiment metadata\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"jmcneil\",\"recordedDate\":1401365250000,\"version\":1},\"lsTransaction\":2,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_status\",\"modifiedBy\":null,\"modifiedDate\":null,\"numberOfReplicates\":null,\"numericValue\":null,\"operatorKind\":null,\"operatorType\":null,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jmcneil\",\"recordedDate\":1401365250000,\"sigFigs\":null,\"stringValue\":\"Approved\",\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null,\"unitType\":null,\"unitTypeAndKind\":\"null_null\",\"urlValue\":null,\"version\":0}";
-		ExperimentValue experimentValue = ExperimentValue.create(json); 
+		ExperimentValue experimentValue = ExperimentValue.create(json);
 		experimentValue.setRecordedBy("just testing");
 		experimentValue.merge();
 		logger.info("-----------" + experimentValue.toJson());
 
-		
 	}
-	
-	//@Test
-	public void updateExperimentValueNullStateTest(){
-		
+
+	// @Test
+	public void updateExperimentValueNullStateTest() {
+
 		ExperimentValue testOutput = ExperimentValue.findExperimentValue(30l);
 		String json = "{\"clobValue\":null,\"codeKind\":null,\"codeType\":null,\"codeTypeAndKind\":\"null_null\",\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"fileValue\":null,\"id\":30,\"ignored\":false,\"lsKind\":\"status\",\"lsState\":{\"comments\":null,\"experiment\":{\"codeName\":\"EXPT-00000003\",\"id\":9,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":2,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"protocol\":{\"codeName\":\"PROT-00000002\",\"id\":1,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":1,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"jmcneil\",\"recordedDate\":1401363350000,\"shortDescription\":\"protocol created by generic data parser\",\"version\":1},\"recordedBy\":\"jmcneil\",\"recordedDate\":1401365250000,\"shortDescription\":\"experiment created by generic data parser\",\"version\":1},\"id\":null,\"ignored\":false,\"lsKind\":\"experiment metadata\",\"lsTransaction\":2,\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_experiment metadata\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"jmcneil\",\"recordedDate\":1401365250000,\"version\":1},\"lsTransaction\":2,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_status\",\"modifiedBy\":null,\"modifiedDate\":null,\"numberOfReplicates\":null,\"numericValue\":null,\"operatorKind\":null,\"operatorType\":null,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jmcneil\",\"recordedDate\":1401365250000,\"sigFigs\":null,\"stringValue\":\"Approved\",\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null,\"unitType\":null,\"unitTypeAndKind\":\"null_null\",\"urlValue\":null,\"version\":1}";
-		ExperimentValue experimentValue = ExperimentValue.create(json); 
+		ExperimentValue experimentValue = ExperimentValue.create(json);
 		experimentValue.setRecordedBy("just testing");
 		logger.info("-----------" + experimentValue.toJson());
-		
-		if (experimentValue.getLsState().getId() == null){
-			//create the state and persist
+
+		if (experimentValue.getLsState().getId() == null) {
+			// create the state and persist
 			ExperimentState experimentState = new ExperimentState(experimentValue.getLsState());
 			logger.info("here is the experiment id: " + experimentValue.getLsState().getExperiment().getId());
-			experimentState.setExperiment(Experiment.findExperiment(experimentValue.getLsState().getExperiment().getId()));
+			experimentState
+					.setExperiment(Experiment.findExperiment(experimentValue.getLsState().getExperiment().getId()));
 			experimentState.persist();
-			experimentValue.setLsState(experimentState); 
+			experimentValue.setLsState(experimentState);
 		}
-		
-		experimentValue.merge();		
+
+		experimentValue.merge();
 	}
-	
-	//@Test
+
+	// @Test
 	public void saveEvperimentValueTest() {
 		String json = "{\"clobValue\":null,\"codeKind\":null,\"codeType\":null,\"codeTypeAndKind\":\"null_null\",\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"fileValue\":\"experiments/EXPT-00000003/1A_Generic.xlsx\",\"id\":null,\"ignored\":false,\"lsKind\":\"source file\",\"lsState\":{\"comments\":\"\",\"experiment\":{\"codeName\":\"EXPT-00000003\",\"id\":9,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":2,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"protocol\":{\"codeName\":\"PROT-00000002\",\"id\":1,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":1,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"jmcneil\",\"recordedDate\":1401363350000,\"shortDescription\":\"protocol created by generic data parser\",\"version\":1},\"recordedBy\":\"jmcneil\",\"recordedDate\":1401365250000,\"shortDescription\":\"experiment created by generic data parser\",\"version\":1},\"id\":11,\"ignored\":false,\"lsKind\":\"raw results locations\",\"lsTransaction\":2,\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_raw results locations\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"jmcneil\",\"recordedDate\":1401365250000,\"version\":0},\"lsTransaction\":2,\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_source file\",\"modifiedBy\":null,\"modifiedDate\":null,\"numberOfReplicates\":null,\"numericValue\":null,\"operatorKind\":null,\"operatorType\":null,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"API_POST\",\"recordedDate\":1401365251000,\"sigFigs\":null,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null,\"unitType\":null,\"unitTypeAndKind\":\"null_null\",\"urlValue\":null,\"version\":0}";
 		ExperimentValue experimentValue = ExperimentValue.create(json);
 		experimentValue = experimentValueService.saveExperimentValue(experimentValue);
 	}
-	
-	//@Test
+
+	// @Test
 	public void updateEvperimentValueTest() {
 		String json = "{\"clobValue\":null,\"codeKind\":null,\"codeType\":null,\"codeTypeAndKind\":\"null_null\",\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"fileValue\":\"experiments/EXPT-00000003/1A_Generic.xlsx\",\"id\":37,\"ignored\":false,\"lsKind\":\"source file\",\"lsState\":{\"comments\":\"\",\"experiment\":{\"codeName\":\"EXPT-00000003\",\"id\":9,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":2,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"protocol\":{\"codeName\":\"PROT-00000002\",\"id\":1,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":1,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"jmcneil\",\"recordedDate\":1401363350000,\"shortDescription\":\"protocol created by generic data parser\",\"version\":1},\"recordedBy\":\"jmcneil\",\"recordedDate\":1401365250000,\"shortDescription\":\"experiment created by generic data parser\",\"version\":1},\"id\":11,\"ignored\":false,\"lsKind\":\"raw results locations\",\"lsTransaction\":2,\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_raw results locations\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"jmcneil\",\"recordedDate\":1401365250000,\"version\":0},\"lsTransaction\":2,\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_source file\",\"modifiedBy\":null,\"modifiedDate\":null,\"numberOfReplicates\":null,\"numericValue\":null,\"operatorKind\":null,\"operatorType\":null,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"TEST_PUT\",\"recordedDate\":1401365251000,\"sigFigs\":null,\"stringValue\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":null,\"unitType\":null,\"unitTypeAndKind\":\"null_null\",\"urlValue\":null,\"version\":1}";
-	    ExperimentValue experimentValue = ExperimentValue.create(json);
+		ExperimentValue experimentValue = ExperimentValue.create(json);
 		experimentValue = experimentValueService.updateExperimentValue(experimentValue);
 	}
-	
-	//@Test
+
+	// @Test
 	@Transactional
-	public void QueryExperimentValueByKinds(){
-		
+	public void QueryExperimentValueByKinds() {
+
 		Long experimentId = 9L;
 		String stateType = "metadata";
 		String stateKind = "experiment metadata";
 		String valueType = "stringValue";
 		String valueKind = "analysis status";
-		List<ExperimentValue> results = experimentValueService.getExperimentValuesByExperimentIdAndStateTypeKindAndValueTypeKind(experimentId, stateType, stateKind, valueType, valueKind);
+		List<ExperimentValue> results = experimentValueService
+				.getExperimentValuesByExperimentIdAndStateTypeKindAndValueTypeKind(experimentId, stateType, stateKind,
+						valueType, valueKind);
 		logger.info(ExperimentValue.toJsonArray(results));
-		
+
 	}
-	
-	//@Test
+
+	// @Test
 	@Transactional
-	public void QueryExperimentValueByExpIdAndStateTypeKind(){
-		
+	public void QueryExperimentValueByExpIdAndStateTypeKind() {
+
 		Long experimentId = 9L;
 		String stateType = "metadata";
 		String stateKind = "experiment metadata";
-		List<ExperimentValue> results = experimentValueService.getExperimentValuesByExperimentIdAndStateTypeKind(experimentId, stateType, stateKind);
+		List<ExperimentValue> results = experimentValueService
+				.getExperimentValuesByExperimentIdAndStateTypeKind(experimentId, stateType, stateKind);
 		logger.info(ExperimentValue.toJsonArray(results));
-		assert(results.size() == 8);
+		assert (results.size() == 8);
 	}
-	
-	//@Test
+
+	// @Test
 	@Transactional
 	public void QueryExperimentValueByExpIdAndStateTypeKindWithBadData() {
 		Long experimentId = 9L;
@@ -163,14 +169,15 @@ public void QueryExperimentValueByExpIdAndStateTypeKindWithBadData() {
 		String stateKind = "experiment metadata";
 		List<ExperimentValue> results = new ArrayList<ExperimentValue>();
 		try {
-			results = experimentValueService.getExperimentValuesByExperimentIdAndStateTypeKind(experimentId, stateType, stateKind);
-		} catch(IllegalArgumentException ex ) {
+			results = experimentValueService.getExperimentValuesByExperimentIdAndStateTypeKind(experimentId, stateType,
+					stateKind);
+		} catch (IllegalArgumentException ex) {
 			logger.info(ex.getMessage());
 		}
-		assert(results.size() == 0);
+		assert (results.size() == 0);
 	}
-	
-	//@Test
+
+	// @Test
 	@Transactional
 	public void QueryExperimentValueByExpIdAndStateTypeKindWithCodeName() {
 		String experimentCodeName = "EXPT-00000003";
@@ -180,30 +187,32 @@ public void QueryExperimentValueByExpIdAndStateTypeKindWithCodeName() {
 		boolean didCatch = false;
 		try {
 			experiment = Experiment.findExperimentsByCodeNameEquals(experimentCodeName).getSingleResult();
-		} catch(Exception nre) {
+		} catch (Exception nre) {
 			logger.info(nre.getMessage());
 			didCatch = true;
 		}
 		List<ExperimentValue> results = new ArrayList<ExperimentValue>();
 		try {
-			results = experimentValueService.getExperimentValuesByExperimentIdAndStateTypeKind(experiment.getId(), stateType, stateKind);
-		} catch(IllegalArgumentException ex ) {
+			results = experimentValueService.getExperimentValuesByExperimentIdAndStateTypeKind(experiment.getId(),
+					stateType, stateKind);
+		} catch (IllegalArgumentException ex) {
 			logger.info(ex.getMessage());
-			assert(results.size() == 0);
+			assert (results.size() == 0);
 			didCatch = true;
 		}
-		if(!didCatch) assert(results.size() == 8);
+		if (!didCatch)
+			assert (results.size() == 8);
 	}
-	
+
 	@Test
 	@Transactional
 	public void ExperimentValuesToCodeName() {
 		List<ExperimentValue> experimentValues = experimentValueService.getExperimentValuesByExperimentId(97418l);
 		String csvString = experimentValueService.getCsvList(experimentValues);
-		assert(csvString != null && csvString.compareTo("") != 0);
+		assert (csvString != null && csvString.compareTo("") != 0);
 		logger.info(csvString);
 	}
-	
+
 	@Test
 	@Transactional
 	public void updateExperimentValueTest() {
@@ -213,11 +222,12 @@ public void updateExperimentValueTest() {
 		String valueType = "stringValue";
 		String valueKind = "status";
 		String value = "Created";
-		ExperimentValue experimentValue = experimentValueService.updateExperimentValue(idOrCodeName, stateType, stateKind, valueType, valueKind, value);
+		ExperimentValue experimentValue = experimentValueService.updateExperimentValue(idOrCodeName, stateType,
+				stateKind, valueType, valueKind, value);
 		Assert.assertNotNull(experimentValue);
 		logger.info(experimentValue.toJson());
 	}
-	
+
 	@Test
 	@Transactional
 	public void updateExperimentValueTest2() {
@@ -227,11 +237,12 @@ public void updateExperimentValueTest2() {
 		String valueType = "clobValue";
 		String valueKind = "analysis result html";
 		String value = "<p>Upload completed.</p> <h4>Summary</h4><p>Information:</p> <ul> <li>Transaction Id: 1618</li><li>Format: Dose Response</li><li>Protocol: Dose Response Protocol</li><li>Experiment: John test 8-29-14a</li><li>Scientist: jam</li><li>Notebook: 911</li><li>Page: 12</li><li>Assay Date: 2012-11-07</li><li>Rows of Data: 17</li><li>Columns of Data: 7</li><li>Unique Corporate Batch ID's: 11</li><li>Raw Results Data Points: 1324</li><li>Flagged Data Points: 2</li><li>Experiment Code Name: EXPT-00000532</li> </ul><a href=/\"http://host4.labsynch.com:9080/seurat/runseurat?cmd=newjob&AssayName=Dose%20Response%20Protocol&AssayProtocol=EXPT-00000532%3a%3aJohn%20test%208-29-14a/\" target=/\"_blank/\" class=/\"btn/\">Open Seurat Report*</a> <a href=/\"mailto:?subject=Seurat Live Report for Dose Response Protocol: John test 8-29-14a&body=Click the following link to run Live Report: http%3a%2f%2fhost4.labsynch.com%3a9080%2fseurat%2frunseurat%3fcmd%3dnewjob%26AssayName%3dDose%2520Response%2520Protocol%26AssayProtocol%3dEXPT-00000532%253a%253aJohn%2520test%25208-29-14a/\" class=/\"btn/\">Email Link to Seurat Report</a> <p>*Note: there may be a delay before data is visible in Seurat</p>";
-		ExperimentValue experimentValue = experimentValueService.updateExperimentValue(idOrCodeName, stateType, stateKind, valueType, valueKind, value);
+		ExperimentValue experimentValue = experimentValueService.updateExperimentValue(idOrCodeName, stateType,
+				stateKind, valueType, valueKind, value);
 		Assert.assertNotNull(experimentValue);
 		logger.info(experimentValue.toJson());
 	}
-	
+
 	@Test
 	@Transactional
 	public void updateExperimentValueTest3() {
@@ -241,13 +252,14 @@ public void updateExperimentValueTest3() {
 		String valueType = "codeValue";
 		String valueKind = "previous experiment code";
 		String value = "EXPT-00000009";
-		ExperimentValue experimentValue = experimentValueService.updateExperimentValue(idOrCodeName, stateType, stateKind, valueType, valueKind, value);
+		ExperimentValue experimentValue = experimentValueService.updateExperimentValue(idOrCodeName, stateType,
+				stateKind, valueType, valueKind, value);
 		Assert.assertNotNull(experimentValue);
 		logger.info(experimentValue.toJson());
 	}
-	
+
 	@Test
-//	@Transactional
+	// @Transactional
 	public void updateExperimentValueTest4() {
 		String idOrCodeName = "EXPT-00000002";
 		String stateType = "metadata";
@@ -255,11 +267,12 @@ public void updateExperimentValueTest4() {
 		String valueType = "dateValue";
 		String valueKind = "completion date";
 		String value = "1398344800000";
-		ExperimentValue experimentValue = experimentValueService.updateExperimentValue(idOrCodeName, stateType, stateKind, valueType, valueKind, value);
+		ExperimentValue experimentValue = experimentValueService.updateExperimentValue(idOrCodeName, stateType,
+				stateKind, valueType, valueKind, value);
 		Assert.assertNotNull(experimentValue);
 		logger.info(experimentValue.toJson());
 	}
-	
+
 	@Test
 	@Transactional
 	public void updateExperimentValueTest_NewKinds() {
@@ -269,12 +282,10 @@ public void updateExperimentValueTest_NewKinds() {
 		String valueType = "stringValue";
 		String valueKind = "brian comment";
 		String value = "Hooray!";
-		ExperimentValue experimentValue = experimentValueService.updateExperimentValue(idOrCodeName, stateType, stateKind, valueType, valueKind, value);
+		ExperimentValue experimentValue = experimentValueService.updateExperimentValue(idOrCodeName, stateType,
+				stateKind, valueType, valueKind, value);
 		Assert.assertNotNull(experimentValue);
 		logger.info(experimentValue.toJson());
 	}
-	
-	
-	
-	
+
 }
diff --git a/src/test/java/com/labsynch/labseer/service/GeneDataServiceTests.java b/src/test/java/com/labsynch/labseer/service/GeneDataServiceTests.java
index 6a8b032bb..04dc75f1c 100644
--- a/src/test/java/com/labsynch/labseer/service/GeneDataServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/GeneDataServiceTests.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import java.io.IOException;
@@ -23,34 +22,31 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext*.xml")
 @Configurable
 public class GeneDataServiceTests {
 
 	private static final Logger logger = LoggerFactory.getLogger(GeneDataServiceTests.class);
-	
-    @Autowired
-    private LsThingService lsThingService;
+
+	@Autowired
+	private LsThingService lsThingService;
 
 	@Autowired
 	private GeneThingService geneThingService;
-	
 
 	@Autowired
 	private ExperimentService experimentService;
 
-
 	// user enters an Entrez Gene ID to fetch all experiment data
 	// service return an annotated DTO for display in Gene Page
 	// return data as a long form
-	
+
 	// input: gene ID = 5
-	// 
-	
+	//
+
 	@Test
-	public void Test_1() throws IOException{
+	public void Test_1() throws IOException {
 		String geneId = "30970";
 		PreferredNameRequestDTO requestDTO = new PreferredNameRequestDTO();
 		Collection<PreferredNameDTO> requests = new ArrayList<PreferredNameDTO>();
@@ -59,19 +55,19 @@ public void Test_1() throws IOException{
 		requests.add(nameDTO);
 		requestDTO.setRequests(requests);
 		PreferredNameResultsDTO resultNames = lsThingService.getGeneCodeNameFromName(requestDTO.toJson());
-		
+
 		Set<String> geneCodeList = new HashSet<String>();
 
 		Collection<PreferredNameDTO> preferredNames = resultNames.getResults();
-		for (PreferredNameDTO preferredName : preferredNames){
-			logger.info(preferredName.toJson());		
+		for (PreferredNameDTO preferredName : preferredNames) {
+			logger.info(preferredName.toJson());
 			geneCodeList.add(preferredName.getReferenceName());
 		}
-		
+
 		Boolean publicData = true;
 		Collection<AnalysisGroupValueDTO> agValues = null;
 		try {
-			if (publicData){
+			if (publicData) {
 				agValues = AnalysisGroupValue.findAnalysisGroupValueDTO(geneCodeList, publicData).getResultList();
 			} else {
 				agValues = AnalysisGroupValue.findAnalysisGroupValueDTO(geneCodeList).getResultList();
@@ -79,12 +75,9 @@ public void Test_1() throws IOException{
 		} catch (Exception e) {
 			logger.error(e.toString());
 		}
-		
+
 		logger.info(AnalysisGroupValueDTO.toJsonArray(agValues));
-		
-		
-	}
-	
 
+	}
 
 }
diff --git a/src/test/java/com/labsynch/labseer/service/GeneThingServiceTests.java b/src/test/java/com/labsynch/labseer/service/GeneThingServiceTests.java
index f107a1fb1..048645128 100755
--- a/src/test/java/com/labsynch/labseer/service/GeneThingServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/GeneThingServiceTests.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import java.io.IOException;
@@ -22,7 +21,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext*.xml")
 @Configurable
@@ -33,53 +31,50 @@ public class GeneThingServiceTests {
 	@Autowired
 	private GeneThingService geneThingService;
 
-	//@Test
-	public void Test_1() throws IOException{
+	// @Test
+	public void Test_1() throws IOException {
 		String testFileName = "/tmp/sample_genes.txt";
 		logger.info("testing loading genes: " + testFileName);
 		geneThingService.RegisterGeneThingsFromCSV(testFileName);
 
-		
 	}
-	
-	//@Test
-	public void Test_2() throws IOException{
+
+	// @Test
+	public void Test_2() throws IOException {
 		String geneTypeString = "gene";
 		String geneKindString = "entrez gene";
-		List<LsThingLabel> geneIdList = LsThingLabel.findLsThingName(geneTypeString, geneKindString, "name", "Entrez Gene ID", "1").getResultList();
+		List<LsThingLabel> geneIdList = LsThingLabel
+				.findLsThingName(geneTypeString, geneKindString, "name", "Entrez Gene ID", "1").getResultList();
 		logger.info("gene count is " + geneIdList.size());
-		
+
 	}
 
-	//@Test
-	public void Test_3() throws IOException{
-		
-//		BatchCodeDTO ack = new BatchCodeDTO();
-//		ack.setBatchCode("apple");
-//		logger.info(ack.toJson());
-
-		
-		
-		
-//		String json = "{\"batchCode\":\"apple\"}";
-//		BatchCodeDTO ack = BatchCodeDTO.fromJsonToBatchCodeDTO(json);
-//		logger.info(ack.toJson());
+	// @Test
+	public void Test_3() throws IOException {
+
+		// BatchCodeDTO ack = new BatchCodeDTO();
+		// ack.setBatchCode("apple");
+		// logger.info(ack.toJson());
+
+		// String json = "{\"batchCode\":\"apple\"}";
+		// BatchCodeDTO ack = BatchCodeDTO.fromJsonToBatchCodeDTO(json);
+		// logger.info(ack.toJson());
 		String json = "[{\"gid\":\"1\"}]";
 		Collection<GeneIdDTO> batchCodes = GeneIdDTO.fromJsonArrayToGeneIdDTO(json);
-		for (GeneIdDTO bc : batchCodes){
+		for (GeneIdDTO bc : batchCodes) {
 			logger.info("bc: " + bc.getGid());
 		}
 
 	}
-	
+
 	@Transactional
 	@Test
-	public void Test_4() throws IOException{
+	public void Test_4() throws IOException {
 		Experiment expt = Experiment.findExperimentsByCodeNameEquals("EXPT-00000210").getSingleResult();
-		for (ExperimentState exptState : expt.getLsStates()){
-			if (exptState.getLsType().equalsIgnoreCase("metadata") 
-					&& exptState.getLsKind().equalsIgnoreCase("data column order")){
-				for (ExperimentValue value : exptState.getLsValues()){
+		for (ExperimentState exptState : expt.getLsStates()) {
+			if (exptState.getLsType().equalsIgnoreCase("metadata")
+					&& exptState.getLsKind().equalsIgnoreCase("data column order")) {
+				for (ExperimentValue value : exptState.getLsValues()) {
 					value.remove();
 					logger.debug("removed value: " + value.toJson());
 				}
diff --git a/src/test/java/com/labsynch/labseer/service/ItxLsThingLsThingServiceTests.java b/src/test/java/com/labsynch/labseer/service/ItxLsThingLsThingServiceTests.java
index 11147d2f5..1a5f41f5e 100644
--- a/src/test/java/com/labsynch/labseer/service/ItxLsThingLsThingServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/ItxLsThingLsThingServiceTests.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import java.util.Set;
@@ -22,9 +21,9 @@
 
 import junit.framework.Assert;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class ItxLsThingLsThingServiceTests {
 
@@ -32,93 +31,130 @@ public class ItxLsThingLsThingServiceTests {
 
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
-	
+
 	@Autowired
 	private ItxLsThingLsThingService itxLsThingLsThingService;
-	
-	
+
 	@Test
 	@Transactional
-	@Rollback(value=false)
+	@Rollback(value = false)
 	public void simple_update_itx_in_place() {
 
-		
 		String json = "{\"deleted\":false,\"firstLsThing\":{\"codeName\":\"REFF-000006\",\"deleted\":false,\"id\":287906,\"ignored\":false,\"lsKind\":\"file\",\"lsTransaction\":628,\"lsType\":\"reference\",\"lsTypeAndKind\":\"reference_file\",\"modifiedDate\":1439399721668,\"recordedBy\":\"egao\",\"recordedDate\":1439399728664,\"version\":21},\"id\":667115,\"ignored\":true,\"lsKind\":\"reference_gene\",\"lsStates\":[],\"lsType\":\"supports\",\"lsTypeAndKind\":\"supports_reference_gene\",\"modifiedDate\":1440611855937,\"recordedBy\":\"egao\",\"recordedDate\":1440432694364,\"secondLsThing\":{\"codeName\":\"GENE-000005\",\"deleted\":false,\"id\":4,\"ignored\":false,\"lsKind\":\"entrez gene\",\"lsTransaction\":696,\"lsType\":\"gene\",\"lsTypeAndKind\":\"gene_entrez gene\",\"modifiedDate\":1440539263211,\"recordedBy\":\"acas admin\",\"recordedDate\":1440539262284,\"version\":34}}";
-		
+
 		ItxLsThingLsThing jsonItxLsThingLsThing = ItxLsThingLsThing.fromJsonToItxLsThingLsThing(json);
-		
-//		logger.info("here is ignore value before the update: " + jsonItxLsThingLsThing.isIgnored());
-//		Assert.assertEquals(true, jsonItxLsThingLsThing.isIgnored());
-		
-		ItxLsThingLsThing updatedItxLsThingLsThing = itxLsThingLsThingService.updateItxLsThingLsThing(jsonItxLsThingLsThing);
-//		logger.info("here is ignore value after the update: " + updatedItxLsThingLsThing.isIgnored());
-//
+
+		// logger.info("here is ignore value before the update: " +
+		// jsonItxLsThingLsThing.isIgnored());
+		// Assert.assertEquals(true, jsonItxLsThingLsThing.isIgnored());
+
+		ItxLsThingLsThing updatedItxLsThingLsThing = itxLsThingLsThingService
+				.updateItxLsThingLsThing(jsonItxLsThingLsThing);
+		// logger.info("here is ignore value after the update: " +
+		// updatedItxLsThingLsThing.isIgnored());
+		//
 		Assert.assertEquals(true, updatedItxLsThingLsThing.isIgnored());
-//		logger.info(updatedItxLsThingLsThing.toJson());
-//		updatedItxLsThingLsThing.flush();
-//		updatedItxLsThingLsThing.clear();
+		// logger.info(updatedItxLsThingLsThing.toJson());
+		// updatedItxLsThingLsThing.flush();
+		// updatedItxLsThingLsThing.clear();
 
-//		logger.info(ItxLsThingLsThing.findItxLsThingLsThing(updatedItxLsThingLsThing.getId()).toJson());
+		// logger.info(ItxLsThingLsThing.findItxLsThingLsThing(updatedItxLsThingLsThing.getId()).toJson());
 	}
-	
+
 	@Test
 	@Transactional
-	@Rollback(value=false)
+	@Rollback(value = false)
 	public void update_itx_in_place() {
 
-		//String json = "{\"lsType\":\"supports\",\"lsKind\":\"reference_gene\",\"lsTypeAndKind\":\"supports_reference_gene\",\"lsStates\":[{\"deleted\":false,\"id\":288343,\"ignored\":false,\"lsKind\":\"in vivo default\",\"lsType\":\"evidence\",\"lsTypeAndKind\":\"evidence_in vivo default\",\"lsValues\":[{\"clobValue\":\"test 2 e\",\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":2351553,\"ignored\":false,\"lsKind\":\"excerpt\",\"lsType\":\"clobValue\",\"lsTypeAndKind\":\"clobValue_excerpt\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"acas admin\",\"recordedDate\":1438883499520,\"unitTypeAndKind\":\"null_null\",\"value\":\"test 2 e\"},{\"clobValue\":\"test 2 c\",\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":2351554,\"ignored\":false,\"lsKind\":\"conclusion\",\"lsType\":\"clobValue\",\"lsTypeAndKind\":\"clobValue_conclusion\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"acas admin\",\"recordedDate\":1438883499520,\"unitTypeAndKind\":\"null_null\",\"value\":\"test 2 c\"}],\"recordedBy\":\"acas admin\",\"recordedDate\":1438883499520}],\"recordedBy\":\"egao\",\"recordedDate\":1438883481884,\"firstLsThing\":{\"id\":252891},\"secondLsThing\":{\"id\":6},\"deleted\":false,\"id\":287855,\"ignored\":false,\"cid\":\"c166\"}";
-
-		//String json = "{\"lsType\":\"supports\",\"lsKind\":\"reference_gene\",\"lsTypeAndKind\":\"supports_reference_gene\",\"lsStates\":[{\"deleted\":false,\"id\":674034,\"ignored\":false,\"lsKind\":\"in vitro default\",\"lsType\":\"evidence\",\"lsTypeAndKind\":\"evidence_in vitro default\",\"lsValues\":[{\"clobValue\":\"test in vitro aug 21 conclusion no thumbnail\",\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":4457531,\"ignored\":true,\"lsKind\":\"conclusion\",\"lsType\":\"clobValue\",\"lsTypeAndKind\":\"clobValue_conclusion\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"egao\",\"recordedDate\":1440206102356,\"unitTypeAndKind\":\"null_null\",\"version\":0,\"value\":\"test in vitro aug 21 conclusion no thumbnail e\"},{\"clobValue\":\"test in vitro aug 21 excerpt no thumbnail\",\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":4457530,\"ignored\":false,\"lsKind\":\"excerpt\",\"lsType\":\"clobValue\",\"lsTypeAndKind\":\"clobValue_excerpt\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"egao\",\"recordedDate\":1440206102356,\"unitTypeAndKind\":\"null_null\",\"version\":0,\"value\":\"test in vitro aug 21 excerpt no thumbnail\"},{\"lsType\":\"clobValue\",\"lsKind\":\"conclusion\",\"ignored\":false,\"recordedDate\":1440432694365,\"recordedBy\":\"egao\",\"clobValue\":\"test in vitro aug 21 conclusion no thumbnail EDIT\",\"value\":\"test in vitro aug 21 conclusion no thumbnail EDIT\"}],\"recordedBy\":\"egao\",\"recordedDate\":1440206102356,\"version\":1}],\"recordedBy\":\"egao\",\"recordedDate\":1440432694364,\"deleted\":false,\"id\":667115,\"ignored\":false,\"version\":1,\"cid\":\"c221\",\"_changing\":false,\"_previousAttributes\":{\"lsType\":\"supports\",\"lsKind\":\"reference_gene\",\"lsTypeAndKind\":\"supports_reference_gene\",\"lsStates\":[],\"recordedBy\":\"egao\",\"recordedDate\":1440432675289,\"firstLsThing\":{}},\"changed\":{\"evidenceClass\":\"general\"},\"_pending\":false,\"className\":\"BaseEvidence\",\"lsProperties\":{\"defaultValues\":[{\"key\":\"thumbnail\",\"type\":\"fileValue\",\"kind\":\"thumbnail\"},{\"key\":\"excerpt\",\"type\":\"clobValue\",\"kind\":\"excerpt\"},{\"key\":\"conclusion\",\"type\":\"clobValue\",\"kind\":\"conclusion\"}]},\"validationError\":null,\"idAttribute\":\"id\",\"secondLsThing\":{\"id\":4},\"firstLsThing\":{\"id\":287906}}";
+		// String json =
+		// "{\"lsType\":\"supports\",\"lsKind\":\"reference_gene\",\"lsTypeAndKind\":\"supports_reference_gene\",\"lsStates\":[{\"deleted\":false,\"id\":288343,\"ignored\":false,\"lsKind\":\"in
+		// vivo default\",\"lsType\":\"evidence\",\"lsTypeAndKind\":\"evidence_in vivo
+		// default\",\"lsValues\":[{\"clobValue\":\"test 2
+		// e\",\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":2351553,\"ignored\":false,\"lsKind\":\"excerpt\",\"lsType\":\"clobValue\",\"lsTypeAndKind\":\"clobValue_excerpt\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"acas
+		// admin\",\"recordedDate\":1438883499520,\"unitTypeAndKind\":\"null_null\",\"value\":\"test
+		// 2 e\"},{\"clobValue\":\"test 2
+		// c\",\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":2351554,\"ignored\":false,\"lsKind\":\"conclusion\",\"lsType\":\"clobValue\",\"lsTypeAndKind\":\"clobValue_conclusion\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"acas
+		// admin\",\"recordedDate\":1438883499520,\"unitTypeAndKind\":\"null_null\",\"value\":\"test
+		// 2 c\"}],\"recordedBy\":\"acas
+		// admin\",\"recordedDate\":1438883499520}],\"recordedBy\":\"egao\",\"recordedDate\":1438883481884,\"firstLsThing\":{\"id\":252891},\"secondLsThing\":{\"id\":6},\"deleted\":false,\"id\":287855,\"ignored\":false,\"cid\":\"c166\"}";
+
+		// String json =
+		// "{\"lsType\":\"supports\",\"lsKind\":\"reference_gene\",\"lsTypeAndKind\":\"supports_reference_gene\",\"lsStates\":[{\"deleted\":false,\"id\":674034,\"ignored\":false,\"lsKind\":\"in
+		// vitro default\",\"lsType\":\"evidence\",\"lsTypeAndKind\":\"evidence_in vitro
+		// default\",\"lsValues\":[{\"clobValue\":\"test in vitro aug 21 conclusion no
+		// thumbnail\",\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":4457531,\"ignored\":true,\"lsKind\":\"conclusion\",\"lsType\":\"clobValue\",\"lsTypeAndKind\":\"clobValue_conclusion\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"egao\",\"recordedDate\":1440206102356,\"unitTypeAndKind\":\"null_null\",\"version\":0,\"value\":\"test
+		// in vitro aug 21 conclusion no thumbnail e\"},{\"clobValue\":\"test in vitro
+		// aug 21 excerpt no
+		// thumbnail\",\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":4457530,\"ignored\":false,\"lsKind\":\"excerpt\",\"lsType\":\"clobValue\",\"lsTypeAndKind\":\"clobValue_excerpt\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"egao\",\"recordedDate\":1440206102356,\"unitTypeAndKind\":\"null_null\",\"version\":0,\"value\":\"test
+		// in vitro aug 21 excerpt no
+		// thumbnail\"},{\"lsType\":\"clobValue\",\"lsKind\":\"conclusion\",\"ignored\":false,\"recordedDate\":1440432694365,\"recordedBy\":\"egao\",\"clobValue\":\"test
+		// in vitro aug 21 conclusion no thumbnail EDIT\",\"value\":\"test in vitro aug
+		// 21 conclusion no thumbnail
+		// EDIT\"}],\"recordedBy\":\"egao\",\"recordedDate\":1440206102356,\"version\":1}],\"recordedBy\":\"egao\",\"recordedDate\":1440432694364,\"deleted\":false,\"id\":667115,\"ignored\":false,\"version\":1,\"cid\":\"c221\",\"_changing\":false,\"_previousAttributes\":{\"lsType\":\"supports\",\"lsKind\":\"reference_gene\",\"lsTypeAndKind\":\"supports_reference_gene\",\"lsStates\":[],\"recordedBy\":\"egao\",\"recordedDate\":1440432675289,\"firstLsThing\":{}},\"changed\":{\"evidenceClass\":\"general\"},\"_pending\":false,\"className\":\"BaseEvidence\",\"lsProperties\":{\"defaultValues\":[{\"key\":\"thumbnail\",\"type\":\"fileValue\",\"kind\":\"thumbnail\"},{\"key\":\"excerpt\",\"type\":\"clobValue\",\"kind\":\"excerpt\"},{\"key\":\"conclusion\",\"type\":\"clobValue\",\"kind\":\"conclusion\"}]},\"validationError\":null,\"idAttribute\":\"id\",\"secondLsThing\":{\"id\":4},\"firstLsThing\":{\"id\":287906}}";
+
+		// String json =
+		// "{\"lsType\":\"supports\",\"lsKind\":\"reference_gene\",\"lsTypeAndKind\":\"supports_reference_gene\",\"lsStates\":[{\"deleted\":false,\"id\":674034,\"ignored\":false,\"lsKind\":\"in
+		// vitro default\",\"lsType\":\"evidence\",\"lsTypeAndKind\":\"evidence_in vitro
+		// default\",\"lsValues\":[{\"clobValue\":\"test in vitro aug 21 conclusion no
+		// thumbnail\",\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":4457531,\"ignored\":true,\"lsKind\":\"conclusion\",\"lsType\":\"clobValue\",\"lsTypeAndKind\":\"clobValue_conclusion\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"egao\",\"recordedDate\":1440206102356,\"unitTypeAndKind\":\"null_null\",\"version\":null,\"value\":\"test
+		// in vitro aug 21 conclusion no thumbnail e\"},{\"clobValue\":\"test in vitro
+		// aug 21 excerpt no
+		// thumbnail\",\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":4457530,\"ignored\":false,\"lsKind\":\"excerpt\",\"lsType\":\"clobValue\",\"lsTypeAndKind\":\"clobValue_excerpt\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"egao\",\"recordedDate\":1440206102356,\"unitTypeAndKind\":\"null_null\",\"version\":null,\"value\":\"test
+		// in vitro aug 21 excerpt no
+		// thumbnail\"},{\"lsType\":\"clobValue\",\"lsKind\":\"conclusion\",\"ignored\":false,\"recordedDate\":1440432694365,\"recordedBy\":\"egao\",\"clobValue\":\"test
+		// in vitro aug 21 conclusion no thumbnail EDIT Version1\",\"value\":\"test in
+		// vitro aug 21 conclusion no thumbnail EDIT
+		// Version2\"}],\"recordedBy\":\"egao\",\"recordedDate\":1440206102356,\"version\":null}],\"recordedBy\":\"egao\",\"recordedDate\":1440432694364,\"deleted\":false,\"id\":667115,\"ignored\":false,\"version\":null,\"cid\":\"c221\",\"_changing\":false,\"_previousAttributes\":{\"lsType\":\"supports\",\"lsKind\":\"reference_gene\",\"lsTypeAndKind\":\"supports_reference_gene\",\"lsStates\":[],\"recordedBy\":\"egao\",\"recordedDate\":1440432675289,\"firstLsThing\":{}},\"changed\":{\"evidenceClass\":\"general\"},\"_pending\":false,\"className\":\"BaseEvidence\",\"lsProperties\":{\"defaultValues\":[{\"key\":\"thumbnail\",\"type\":\"fileValue\",\"kind\":\"thumbnail\"},{\"key\":\"excerpt\",\"type\":\"clobValue\",\"kind\":\"excerpt\"},{\"key\":\"conclusion\",\"type\":\"clobValue\",\"kind\":\"conclusion\"}]},\"validationError\":null,\"idAttribute\":\"id\",\"secondLsThing\":{\"id\":4},\"firstLsThing\":{\"id\":287906}}";
 
-//		String json = "{\"lsType\":\"supports\",\"lsKind\":\"reference_gene\",\"lsTypeAndKind\":\"supports_reference_gene\",\"lsStates\":[{\"deleted\":false,\"id\":674034,\"ignored\":false,\"lsKind\":\"in vitro default\",\"lsType\":\"evidence\",\"lsTypeAndKind\":\"evidence_in vitro default\",\"lsValues\":[{\"clobValue\":\"test in vitro aug 21 conclusion no thumbnail\",\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":4457531,\"ignored\":true,\"lsKind\":\"conclusion\",\"lsType\":\"clobValue\",\"lsTypeAndKind\":\"clobValue_conclusion\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"egao\",\"recordedDate\":1440206102356,\"unitTypeAndKind\":\"null_null\",\"version\":null,\"value\":\"test in vitro aug 21 conclusion no thumbnail e\"},{\"clobValue\":\"test in vitro aug 21 excerpt no thumbnail\",\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":4457530,\"ignored\":false,\"lsKind\":\"excerpt\",\"lsType\":\"clobValue\",\"lsTypeAndKind\":\"clobValue_excerpt\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"egao\",\"recordedDate\":1440206102356,\"unitTypeAndKind\":\"null_null\",\"version\":null,\"value\":\"test in vitro aug 21 excerpt no thumbnail\"},{\"lsType\":\"clobValue\",\"lsKind\":\"conclusion\",\"ignored\":false,\"recordedDate\":1440432694365,\"recordedBy\":\"egao\",\"clobValue\":\"test in vitro aug 21 conclusion no thumbnail EDIT Version1\",\"value\":\"test in vitro aug 21 conclusion no thumbnail EDIT Version2\"}],\"recordedBy\":\"egao\",\"recordedDate\":1440206102356,\"version\":null}],\"recordedBy\":\"egao\",\"recordedDate\":1440432694364,\"deleted\":false,\"id\":667115,\"ignored\":false,\"version\":null,\"cid\":\"c221\",\"_changing\":false,\"_previousAttributes\":{\"lsType\":\"supports\",\"lsKind\":\"reference_gene\",\"lsTypeAndKind\":\"supports_reference_gene\",\"lsStates\":[],\"recordedBy\":\"egao\",\"recordedDate\":1440432675289,\"firstLsThing\":{}},\"changed\":{\"evidenceClass\":\"general\"},\"_pending\":false,\"className\":\"BaseEvidence\",\"lsProperties\":{\"defaultValues\":[{\"key\":\"thumbnail\",\"type\":\"fileValue\",\"kind\":\"thumbnail\"},{\"key\":\"excerpt\",\"type\":\"clobValue\",\"kind\":\"excerpt\"},{\"key\":\"conclusion\",\"type\":\"clobValue\",\"kind\":\"conclusion\"}]},\"validationError\":null,\"idAttribute\":\"id\",\"secondLsThing\":{\"id\":4},\"firstLsThing\":{\"id\":287906}}";
-		
 		String json = "{\"lsType\":\"supports\",\"lsKind\":\"reference_gene\",\"lsTypeAndKind\":\"supports_reference_gene\",\"lsStates\":[{\"deleted\":false,\"id\":674034,\"ignored\":false,\"lsKind\":\"in vitro default\",\"lsType\":\"evidence\",\"lsTypeAndKind\":\"evidence_in vitro default\",\"lsValues\":[{\"clobValue\":\"test in vitro aug 21 conclusion no thumbnail\",\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":4457531,\"ignored\":true,\"lsKind\":\"conclusion\",\"lsType\":\"clobValue\",\"lsTypeAndKind\":\"clobValue_conclusion\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"egao\",\"recordedDate\":1440206102356,\"unitTypeAndKind\":\"null_null\",\"version\":null,\"value\":\"test in vitro aug 21 conclusion no thumbnail e\"},{\"clobValue\":\"test in vitro aug 21 excerpt no thumbnail\",\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":4457530,\"ignored\":false,\"lsKind\":\"excerpt\",\"lsType\":\"clobValue\",\"lsTypeAndKind\":\"clobValue_excerpt\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"egao\",\"recordedDate\":1440206102356,\"unitTypeAndKind\":\"null_null\",\"version\":null,\"value\":\"test in vitro aug 21 excerpt no thumbnail\"},{\"lsType\":\"clobValue\",\"lsKind\":\"conclusion\",\"ignored\":false,\"recordedDate\":1440432694365,\"recordedBy\":\"egao\",\"clobValue\":\"test in vitro aug 21 conclusion no thumbnail EDIT Version1\",\"value\":\"test in vitro aug 21 conclusion no thumbnail EDIT Version2\"}],\"recordedBy\":\"egao\",\"recordedDate\":1440206102356,\"version\":null}],\"recordedBy\":\"egao\",\"recordedDate\":1440432694364,\"deleted\":false,\"id\":667115,\"ignored\":true,\"version\":null,\"cid\":\"c221\",\"_changing\":false,\"_previousAttributes\":{\"lsType\":\"supports\",\"lsKind\":\"reference_gene\",\"lsTypeAndKind\":\"supports_reference_gene\",\"lsStates\":[],\"recordedBy\":\"egao\",\"recordedDate\":1440432675289,\"firstLsThing\":{}},\"changed\":{\"evidenceClass\":\"general\"},\"_pending\":false,\"className\":\"BaseEvidence\",\"lsProperties\":{\"defaultValues\":[{\"key\":\"thumbnail\",\"type\":\"fileValue\",\"kind\":\"thumbnail\"},{\"key\":\"excerpt\",\"type\":\"clobValue\",\"kind\":\"excerpt\"},{\"key\":\"conclusion\",\"type\":\"clobValue\",\"kind\":\"conclusion\"}]},\"validationError\":null,\"idAttribute\":\"id\",\"secondLsThing\":{\"id\":4},\"firstLsThing\":{\"id\":287906}}";
-		
+
 		ItxLsThingLsThing jsonItxLsThingLsThing = ItxLsThingLsThing.fromJsonToItxLsThingLsThing(json);
-		
-//		logger.info("here is ignore value before the update: " + jsonItxLsThingLsThing.isIgnored());
-//		Assert.assertEquals(true, jsonItxLsThingLsThing.isIgnored());
-		
-		ItxLsThingLsThing updatedItxLsThingLsThing = itxLsThingLsThingService.updateItxLsThingLsThing(jsonItxLsThingLsThing);
-//		logger.info("here is ignore value after the update: " + updatedItxLsThingLsThing.isIgnored());
-//
-//		Assert.assertEquals(true, updatedItxLsThingLsThing.isIgnored());
-//		logger.info(updatedItxLsThingLsThing.toJson());
-//		updatedItxLsThingLsThing.flush();
-//		updatedItxLsThingLsThing.clear();
-
-//		logger.info(ItxLsThingLsThing.findItxLsThingLsThing(updatedItxLsThingLsThing.getId()).toJson());
+
+		// logger.info("here is ignore value before the update: " +
+		// jsonItxLsThingLsThing.isIgnored());
+		// Assert.assertEquals(true, jsonItxLsThingLsThing.isIgnored());
+
+		ItxLsThingLsThing updatedItxLsThingLsThing = itxLsThingLsThingService
+				.updateItxLsThingLsThing(jsonItxLsThingLsThing);
+		// logger.info("here is ignore value after the update: " +
+		// updatedItxLsThingLsThing.isIgnored());
+		//
+		// Assert.assertEquals(true, updatedItxLsThingLsThing.isIgnored());
+		// logger.info(updatedItxLsThingLsThing.toJson());
+		// updatedItxLsThingLsThing.flush();
+		// updatedItxLsThingLsThing.clear();
+
+		// logger.info(ItxLsThingLsThing.findItxLsThingLsThing(updatedItxLsThingLsThing.getId()).toJson());
 	}
-	
-	//@Test
+
+	// @Test
 	@Transactional
-	public void checkItx(){
+	public void checkItx() {
 
 		logger.info(ItxLsThingLsThing.findItxLsThingLsThing(667115L).toJson());
-		
+
 		Assert.assertEquals(true, ItxLsThingLsThing.findItxLsThingLsThing(667115L).isIgnored());
 
-		
 		Set<ItxLsThingLsThingState> states = ItxLsThingLsThing.findItxLsThingLsThing(667115L).getLsStates();
 		logger.info("------------ number of states found: " + states.size() + "  -----------------");
-		for (ItxLsThingLsThingState state : states){
+		for (ItxLsThingLsThingState state : states) {
 			logger.info(state.toJson());
 			Set<ItxLsThingLsThingValue> values = state.getLsValues();
 			logger.info("------------ number of values found: " + values.size() + "  -----------------");
 
-			for (ItxLsThingLsThingValue value : values){
+			for (ItxLsThingLsThingValue value : values) {
 				logger.info(value.toJson());
 			}
 		}
 	}
-	
-	
-//	@Test
+
+	// @Test
 	@Transactional
 	public void save_itx() {
 		String json = "{\"lsType\":\"supports\",\"lsKind\":\"reference_gene\",\"lsTypeAndKind\":\"supports_reference_gene\",\"lsStates\":[{\"lsType\":\"evidence\",\"lsKind\":\"in vitro default\",\"lsValues\":[{\"lsType\":\"clobValue\",\"lsKind\":\"excerpt\",\"ignored\":false,\"recordedDate\":1440111005789,\"recordedBy\":\"egao\",\"value\":\"test aug 20 excerpt\",\"clobValue\":\"test aug 20 excerpt\"},{\"lsType\":\"clobValue\",\"lsKind\":\"conclusion\",\"ignored\":false,\"recordedDate\":1440111005790,\"recordedBy\":\"egao\",\"value\":\"test aug20 conclusion\",\"clobValue\":\"test aug20 conclusion\"}],\"ignored\":false,\"recordedDate\":1440111005789,\"recordedBy\":\"egao\"}],\"recordedBy\":\"egao\",\"recordedDate\":1440111005789,\"firstLsThing\":{\"id\":667047},\"cid\":\"c1263\",\"_changing\":false,\"_previousAttributes\":{\"lsType\":\"supports\",\"lsKind\":\"reference_gene\",\"lsTypeAndKind\":\"supports_reference_gene\",\"lsStates\":[{\"lsType\":\"evidence\",\"lsKind\":\"in vitro default\",\"lsValues\":[{\"lsType\":\"clobValue\",\"lsKind\":\"excerpt\",\"ignored\":false,\"recordedDate\":1440111005789,\"recordedBy\":\"egao\",\"value\":\"test aug 20 excerpt\",\"clobValue\":\"test aug 20 excerpt\"},{\"lsType\":\"clobValue\",\"lsKind\":\"conclusion\",\"ignored\":false,\"recordedDate\":1440111005790,\"recordedBy\":\"egao\",\"value\":\"test aug20 conclusion\",\"clobValue\":\"test aug20 conclusion\"}],\"ignored\":false,\"recordedDate\":1440111005789,\"recordedBy\":\"egao\"}],\"recordedBy\":\"egao\",\"recordedDate\":1440110988652,\"firstLsThing\":{}},\"changed\":{\"evidenceClass\":\"general\"},\"_pending\":false,\"className\":\"BaseEvidence\",\"lsProperties\":{\"defaultValues\":[{\"key\":\"thumbnail\",\"type\":\"fileValue\",\"kind\":\"thumbnail\"},{\"key\":\"excerpt\",\"type\":\"clobValue\",\"kind\":\"excerpt\"},{\"key\":\"conclusion\",\"type\":\"clobValue\",\"kind\":\"conclusion\"}]},\"validationError\":null,\"idAttribute\":\"id\",\"secondLsThing\":{\"id\":4}}";
 		ItxLsThingLsThing jsonItxLsThingLsThing = ItxLsThingLsThing.fromJsonToItxLsThingLsThing(json);
-		ItxLsThingLsThing updatedItxLsThingLsThing = itxLsThingLsThingService.saveItxLsThingLsThing(jsonItxLsThingLsThing);
+		ItxLsThingLsThing updatedItxLsThingLsThing = itxLsThingLsThingService
+				.saveItxLsThingLsThing(jsonItxLsThingLsThing);
 		logger.info(updatedItxLsThingLsThing.toJson());
 		updatedItxLsThingLsThing.flush();
 		updatedItxLsThingLsThing.clear();
diff --git a/src/test/java/com/labsynch/labseer/service/ItxSubjectContainerServiceTest.java b/src/test/java/com/labsynch/labseer/service/ItxSubjectContainerServiceTest.java
index f38a84bff..082ee942a 100644
--- a/src/test/java/com/labsynch/labseer/service/ItxSubjectContainerServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/ItxSubjectContainerServiceTest.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import com.labsynch.labseer.domain.ItxSubjectContainer;
@@ -15,25 +14,24 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class ItxSubjectContainerServiceTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(ItxSubjectContainerServiceTest.class);
-	
+
 	@Autowired
 	private ItxSubjectContainerService itxSubjectContainerService;
-	
+
 	@Test
 	@Transactional
-	@Rollback(value=false)
-	public void saveItxSubjectContainer(){
+	@Rollback(value = false)
+	public void saveItxSubjectContainer() {
 		String json = "{\"subject\":{\"id\":6},\"container\":{\"id\":96},\"lsType\":\"default\",\"lsKind\":\"default\",\"recordedBy\":\"jmcneil\",\"recordedDate\":1455732120597,\"lsTransaction\":152}";
 		ItxSubjectContainer itxSubjectContainer = ItxSubjectContainer.fromJsonToItxSubjectContainer(json);
-        itxSubjectContainerService.saveLsItxSubjectContainer(itxSubjectContainer);
+		itxSubjectContainerService.saveLsItxSubjectContainer(itxSubjectContainer);
 	}
-	
-	
+
 }
diff --git a/src/test/java/com/labsynch/labseer/service/LsThingGeneServiceTests.java b/src/test/java/com/labsynch/labseer/service/LsThingGeneServiceTests.java
index 0e82ac2e1..8a002bb64 100644
--- a/src/test/java/com/labsynch/labseer/service/LsThingGeneServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/LsThingGeneServiceTests.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
@@ -37,99 +36,96 @@
 
 import flexjson.JSONDeserializer;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
 @ContextConfiguration(locations = {
-		"classpath:/META-INF/spring/applicationContext.xml", 
+		"classpath:/META-INF/spring/applicationContext.xml",
 		"classpath:/META-INF/spring/applicationContext-security.xml",
-		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml"})
+		"file:src/main/webapp/WEB-INF/spring/webmvc-config-test.xml" })
 @Configurable
 @Transactional
 public class LsThingGeneServiceTests {
 
 	private static final Logger logger = LoggerFactory.getLogger(LsThingGeneServiceTests.class);
-	
+
 	@Autowired
 	private ExperimentService experimentService;
-	
-    @Autowired
-    private WebApplicationContext wac;
 
-    private MockMvc mockMvc;
+	@Autowired
+	private WebApplicationContext wac;
 
-    @Before
-    public void setup() {
-        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-    }
-    
+	private MockMvc mockMvc;
+
+	@Before
+	public void setup() {
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	}
 
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
-	
+
 	@Autowired
 	private LsThingService lsThingService;
-	
 
-	//@Test
-	public void Test_1(){
-		
+	// @Test
+	public void Test_1() {
+
 		String json = "{\"requests\":[{\"requestName\":\"CRA-025995-1\"},{\"requestName\":\"CMPD-0000052-01\"}]}";
-		PreferredNameDTO request = PreferredNameDTO.fromJsonToPreferredNameDTO(json);	
+		PreferredNameDTO request = PreferredNameDTO.fromJsonToPreferredNameDTO(json);
 
 		logger.info("#############################################");
 
-		
 	}
-	
-	//@Test
-	public void Test_2(){
-		
+
+	// @Test
+	public void Test_2() {
+
 		String json = "{\"requests\":[{\"requestName\":\"CRA-025995-1\"},{\"requestName\":\"9\"}]}";
 
 		PreferredNameResultsDTO results = lsThingService.getGeneCodeNameFromName(json);
 		logger.info("#############################################");
 		logger.info("results: " + results.toJson());
 
-		
 	}
-	
-	//@Test
-	public void Test_3(){
-		
+
+	// @Test
+	public void Test_3() {
+
 		String json = "{\"requests\":[{\"requestName\":\"31248\"}, {\"requestName\":\"2\"}, {\"requestName\":\"15\"}, {\"requestName\":\"blah\"}]}";
 
-        String thingType = "gene";
-        String thingKind = "entrez gene";
-        String labelType = "name";
-        String labelKind = "Entrez Gene ID";
-        logger.info("getGeneCodeNameFromNameRequest incoming json: " + json);
-        PreferredNameResultsDTO results = lsThingService.getPreferredNameFromName(thingType, thingKind, labelType, labelKind, json);
+		String thingType = "gene";
+		String thingKind = "entrez gene";
+		String labelType = "name";
+		String labelKind = "Entrez Gene ID";
+		logger.info("getGeneCodeNameFromNameRequest incoming json: " + json);
+		PreferredNameResultsDTO results = lsThingService.getPreferredNameFromName(thingType, thingKind, labelType,
+				labelKind, json);
 		logger.info("#############################################");
 		logger.info("results: " + results.toJson());
 
-		
 	}
 
-   // @Test
-    public void getGeneCodeDataTest() throws Exception {
-    	String json = "[\"GENE-202547\"]";
-    	String responseJson = this.mockMvc.perform(post("/api/v1/analysisgroupvalues/geneCodeData?format=csv&onlyPublicData=true")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(responseJson);
-    }
-
-   // @Test
-    public void getGeneCodeDataFullTest() {
-    	String json = "[\"GENE-202547\"]";
-    	String onlyPublicData = "true";
+	// @Test
+	public void getGeneCodeDataTest() throws Exception {
+		String json = "[\"GENE-202547\"]";
+		String responseJson = this.mockMvc
+				.perform(post("/api/v1/analysisgroupvalues/geneCodeData?format=csv&onlyPublicData=true")
+						.contentType(MediaType.APPLICATION_JSON)
+						.content(json)
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+		logger.info(responseJson);
+	}
+
+	// @Test
+	public void getGeneCodeDataFullTest() {
+		String json = "[\"GENE-202547\"]";
+		String onlyPublicData = "true";
 		logger.debug("incoming json: " + json);
-		Collection<String> batchCodes = new JSONDeserializer<List<String>>().use(null, ArrayList.class).use("values", String.class).deserialize(json);
+		Collection<String> batchCodes = new JSONDeserializer<List<String>>().use(null, ArrayList.class)
+				.use("values", String.class).deserialize(json);
 		for (String bc : batchCodes) {
 			logger.debug("batch code: " + bc);
 		}
@@ -137,13 +133,13 @@ public void getGeneCodeDataFullTest() {
 		geneCodeList.addAll(batchCodes);
 
 		Boolean publicData = false;
-		if (onlyPublicData != null && onlyPublicData.equalsIgnoreCase("true")){
+		if (onlyPublicData != null && onlyPublicData.equalsIgnoreCase("true")) {
 			publicData = true;
 		}
 
 		List<AnalysisGroupValueDTO> agValues = null;
 		try {
-			if (publicData){
+			if (publicData) {
 				agValues = AnalysisGroupValue.findAnalysisGroupValueDTO(geneCodeList, publicData).getResultList();
 			} else {
 				agValues = AnalysisGroupValue.findAnalysisGroupValueDTO(geneCodeList).getResultList();
@@ -151,51 +147,55 @@ public void getGeneCodeDataFullTest() {
 		} catch (Exception e) {
 			logger.error(e.toString());
 		}
-		
+
 		logger.info("publicData is " + publicData);
 		logger.info("number of values: " + agValues.size());
 		logger.info(AnalysisGroupValueDTO.toJsonArray(agValues));
 
-    }
-    
-    @Test
-    public void getGeneDataTest2(){
-//    	String json = "{\"experimentCodeList\":[\"EXPT-00000039\"],\"batchCodeList\":[\"GENE-202547\"],\"booleanFilter\":\"and\",\"advancedFilter\":\"\",\"advancedFilterSQL\":\"\"}";
-//    	String json = "{\"experimentCodeList\":[\"EXPT-00000521\"],\"batchCodeList\":[\"GENE-202547\"],\"booleanFilter\":\"and\",\"advancedFilter\":\"\",\"advancedFilterSQL\":\"\"}";
-    	String json = "{\"experimentCodeList\":[\"PROT-00000333\",\"EXPT-00000333\",\"tags_EXPT-00000333\",\"PROT-00000283\",\"EXPT-00000283\",\"tags_EXPT-00000283\",\"PROT-00000299\",\"EXPT-00000299\",\"tags_EXPT-00000299\",\"PROT-00000308\",\"EXPT-00000308\",\"tags_EXPT-00000308\",\"PROT-00000302\",\"EXPT-00000302\",\"tags_EXPT-00000302\"],\"batchCodeList\":[],\"searchFilters\":[{\"experimentCode\":\"EXPT-00000283\",\"lsType\":\"numericValue\",\"lsKind\":\"Hit\",\"operator\":\"!=\",\"filterValue\":\"0\",\"termName\":\"Q1\"},{\"experimentCode\":\"EXPT-00000308\",\"lsType\":\"numericValue\",\"lsKind\":\"Hit\",\"operator\":\"!=\",\"filterValue\":\"0\",\"termName\":\"Q2\"},{\"experimentCode\":\"EXPT-00000333\",\"lsType\":\"numericValue\",\"lsKind\":\"Hit\",\"operator\":\"!=\",\"filterValue\":\"0\",\"termName\":\"Q3\"},{\"experimentCode\":\"EXPT-00000299\",\"lsType\":\"numericValue\",\"lsKind\":\"Hit\",\"operator\":\"!=\",\"filterValue\":\"0\",\"termName\":\"Q4\"},{\"experimentCode\":\"EXPT-00000302\",\"lsType\":\"numericValue\",\"lsKind\":\"Hit\",\"operator\":\"!=\",\"filterValue\":\"0\",\"termName\":\"Q5\"}],\"booleanFilter\":\"or\",\"advancedFilter\":\"\"}";
-    	String onlyPublicData = "true";
+	}
+
+	@Test
+	public void getGeneDataTest2() {
+		// String json =
+		// "{\"experimentCodeList\":[\"EXPT-00000039\"],\"batchCodeList\":[\"GENE-202547\"],\"booleanFilter\":\"and\",\"advancedFilter\":\"\",\"advancedFilterSQL\":\"\"}";
+		// String json =
+		// "{\"experimentCodeList\":[\"EXPT-00000521\"],\"batchCodeList\":[\"GENE-202547\"],\"booleanFilter\":\"and\",\"advancedFilter\":\"\",\"advancedFilterSQL\":\"\"}";
+		String json = "{\"experimentCodeList\":[\"PROT-00000333\",\"EXPT-00000333\",\"tags_EXPT-00000333\",\"PROT-00000283\",\"EXPT-00000283\",\"tags_EXPT-00000283\",\"PROT-00000299\",\"EXPT-00000299\",\"tags_EXPT-00000299\",\"PROT-00000308\",\"EXPT-00000308\",\"tags_EXPT-00000308\",\"PROT-00000302\",\"EXPT-00000302\",\"tags_EXPT-00000302\"],\"batchCodeList\":[],\"searchFilters\":[{\"experimentCode\":\"EXPT-00000283\",\"lsType\":\"numericValue\",\"lsKind\":\"Hit\",\"operator\":\"!=\",\"filterValue\":\"0\",\"termName\":\"Q1\"},{\"experimentCode\":\"EXPT-00000308\",\"lsType\":\"numericValue\",\"lsKind\":\"Hit\",\"operator\":\"!=\",\"filterValue\":\"0\",\"termName\":\"Q2\"},{\"experimentCode\":\"EXPT-00000333\",\"lsType\":\"numericValue\",\"lsKind\":\"Hit\",\"operator\":\"!=\",\"filterValue\":\"0\",\"termName\":\"Q3\"},{\"experimentCode\":\"EXPT-00000299\",\"lsType\":\"numericValue\",\"lsKind\":\"Hit\",\"operator\":\"!=\",\"filterValue\":\"0\",\"termName\":\"Q4\"},{\"experimentCode\":\"EXPT-00000302\",\"lsType\":\"numericValue\",\"lsKind\":\"Hit\",\"operator\":\"!=\",\"filterValue\":\"0\",\"termName\":\"Q5\"}],\"booleanFilter\":\"or\",\"advancedFilter\":\"\"}";
+		String onlyPublicData = "true";
 		Boolean publicData = false;
-		if (onlyPublicData != null && onlyPublicData.equalsIgnoreCase("true")){
+		if (onlyPublicData != null && onlyPublicData.equalsIgnoreCase("true")) {
 			publicData = true;
 		}
 
-        try {
-    		logger.info("here is the json: " + json);
-    		ExperimentSearchRequestDTO searchRequest = ExperimentSearchRequestDTO.fromJsonToExperimentSearchRequestDTO(json);
-            logger.debug("converted json: " + searchRequest.toJson());
-            List<AnalysisGroupValueDTO> agValues = null;
-            agValues = experimentService.getFilteredAGData(searchRequest, publicData);
-            logger.debug("number of agvalues found: " + agValues.size());
-            
-//            for (AnalysisGroupValueDTO agValue : agValues){
-//            	logger.debug(agValue.toJson());
-//            }
-            
-        } catch (Exception e) {
-            logger.error(e.toString());
-        }
-    }
-    
-   // @Test
-    public void getFilteredGeneDataTest() throws Exception {
-    	String json = "{\"experimentCodeList\":[\"EXPT-00000039\"],\"batchCodeList\":[\"GENE-202547\"],\"booleanFilter\":\"and\",\"advancedFilter\":\"\"}";
-    	String responseJson = this.mockMvc.perform(post("/api/v1/experiments/agdata/batchcodelist/experimentcodelist?format=csv&onlyPublicData=true")
-    			.contentType(MediaType.APPLICATION_JSON)
-    			.content(json)
-    			.accept(MediaType.APPLICATION_JSON))
-    			.andExpect(status().isOk())
-    			.andExpect(content().contentType("application/json"))
-    			.andReturn().getResponse().getContentAsString();
-    	logger.info(responseJson);
-    }
+		try {
+			logger.info("here is the json: " + json);
+			ExperimentSearchRequestDTO searchRequest = ExperimentSearchRequestDTO
+					.fromJsonToExperimentSearchRequestDTO(json);
+			logger.debug("converted json: " + searchRequest.toJson());
+			List<AnalysisGroupValueDTO> agValues = null;
+			agValues = experimentService.getFilteredAGData(searchRequest, publicData);
+			logger.debug("number of agvalues found: " + agValues.size());
+
+			// for (AnalysisGroupValueDTO agValue : agValues){
+			// logger.debug(agValue.toJson());
+			// }
+
+		} catch (Exception e) {
+			logger.error(e.toString());
+		}
+	}
+
+	// @Test
+	public void getFilteredGeneDataTest() throws Exception {
+		String json = "{\"experimentCodeList\":[\"EXPT-00000039\"],\"batchCodeList\":[\"GENE-202547\"],\"booleanFilter\":\"and\",\"advancedFilter\":\"\"}";
+		String responseJson = this.mockMvc.perform(
+				post("/api/v1/experiments/agdata/batchcodelist/experimentcodelist?format=csv&onlyPublicData=true")
+						.contentType(MediaType.APPLICATION_JSON)
+						.content(json)
+						.accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(content().contentType("application/json"))
+				.andReturn().getResponse().getContentAsString();
+		logger.info(responseJson);
+	}
 }
diff --git a/src/test/java/com/labsynch/labseer/service/LsThingPreferredIdServiceTests.java b/src/test/java/com/labsynch/labseer/service/LsThingPreferredIdServiceTests.java
index c1ca51e52..3e71a41e2 100644
--- a/src/test/java/com/labsynch/labseer/service/LsThingPreferredIdServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/LsThingPreferredIdServiceTests.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import java.util.ArrayList;
@@ -20,9 +19,9 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class LsThingPreferredIdServiceTests {
 
@@ -30,103 +29,104 @@ public class LsThingPreferredIdServiceTests {
 
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
-	
+
 	@Autowired
 	private LsThingService lsThingService;
-	
 
-	//@Test
-	public void Test_1(){
-				
+	// @Test
+	public void Test_1() {
+
 		PreferredNameRequestDTO inputData = new PreferredNameRequestDTO();
 		List<PreferredNameDTO> requests = new ArrayList<PreferredNameDTO>();
-		String[] inputNames = {"1", "2", "2","2", "27", "380653"};
-		for (String name : inputNames){
+		String[] inputNames = { "1", "2", "2", "2", "27", "380653" };
+		for (String name : inputNames) {
 			PreferredNameDTO requestName = new PreferredNameDTO();
 			requestName.setRequestName(name);
 			requests.add(requestName);
 		}
 		inputData.setRequests(requests);
-		
+
 		logger.info("here is the input requests: " + inputData.toJson());
-		
-    	PreferredNameRequestDTO requestDTO = PreferredNameRequestDTO.fromJsonToPreferredNameRequestDTO(inputData.toJson());
-        String thingType = "gene";
-        String thingKind = "entrez gene";
-        String labelType = "name";
-        String labelKind = "Entrez Gene ID";
-        logger.info("getGeneCodeNameFromNameRequest incoming json: " + requestDTO.toJson());
-        PreferredNameResultsDTO results = lsThingService.getPreferredNameFromName(thingType, thingKind, labelType, labelKind, inputData);
-   
+
+		PreferredNameRequestDTO requestDTO = PreferredNameRequestDTO
+				.fromJsonToPreferredNameRequestDTO(inputData.toJson());
+		String thingType = "gene";
+		String thingKind = "entrez gene";
+		String labelType = "name";
+		String labelKind = "Entrez Gene ID";
+		logger.info("getGeneCodeNameFromNameRequest incoming json: " + requestDTO.toJson());
+		PreferredNameResultsDTO results = lsThingService.getPreferredNameFromName(thingType, thingKind, labelType,
+				labelKind, inputData);
+
 		Assert.assertEquals(6, results.getResults().size());
 
 		logger.info("#############################################");
 		logger.info(results.toJson());
 
-		
 	}
-	
-//	@Test
-	public void Test_2(){
-				
+
+	// @Test
+	public void Test_2() {
+
 		PreferredNameRequestDTO inputData = new PreferredNameRequestDTO();
 		List<PreferredNameDTO> requests = new ArrayList<PreferredNameDTO>();
-		for (int i = 0; i < 2500; i++){
+		for (int i = 0; i < 2500; i++) {
 			PreferredNameDTO requestName = new PreferredNameDTO();
 			requestName.setRequestName(Integer.toString(i));
 			requests.add(requestName);
 		}
 		inputData.setRequests(requests);
-		
+
 		logger.info("here is the input requests: " + inputData.toJson());
-		
-    	PreferredNameRequestDTO requestDTO = PreferredNameRequestDTO.fromJsonToPreferredNameRequestDTO(inputData.toJson());
-        String thingType = "gene";
-        String thingKind = "entrez gene";
-        String labelType = "name";
-        String labelKind = "Entrez Gene ID";
-        logger.info("getGeneCodeNameFromNameRequest incoming json: " + requestDTO.toJson());
-        PreferredNameResultsDTO results = lsThingService.getPreferredNameFromName(thingType, thingKind, labelType, labelKind, inputData);
-   
-		Assert.assertEquals(2500, results.getResults().size());
 
+		PreferredNameRequestDTO requestDTO = PreferredNameRequestDTO
+				.fromJsonToPreferredNameRequestDTO(inputData.toJson());
+		String thingType = "gene";
+		String thingKind = "entrez gene";
+		String labelType = "name";
+		String labelKind = "Entrez Gene ID";
+		logger.info("getGeneCodeNameFromNameRequest incoming json: " + requestDTO.toJson());
+		PreferredNameResultsDTO results = lsThingService.getPreferredNameFromName(thingType, thingKind, labelType,
+				labelKind, inputData);
+
+		Assert.assertEquals(2500, results.getResults().size());
 
 		logger.info("#############################################");
 		logger.info(results.toJson());
 
-		
 	}
 
 	@Test
-	public void Test_3(){
-				
+	public void Test_3() {
+
 		PreferredNameRequestDTO inputData = new PreferredNameRequestDTO();
 		List<PreferredNameDTO> requests = new ArrayList<PreferredNameDTO>();
-		String[] inputNames = {"11797", "77616", "633417", "78190", "102633673", "72971", "101056086", "100132941", "100288144"};
-		for (String name : inputNames){
+		String[] inputNames = { "11797", "77616", "633417", "78190", "102633673", "72971", "101056086", "100132941",
+				"100288144" };
+		for (String name : inputNames) {
 			PreferredNameDTO requestName = new PreferredNameDTO();
 			requestName.setRequestName(name);
 			requests.add(requestName);
 		}
 		inputData.setRequests(requests);
-		
+
 		logger.info("here is the input requests: " + inputData.toJson());
-		
-    	PreferredNameRequestDTO requestDTO = PreferredNameRequestDTO.fromJsonToPreferredNameRequestDTO(inputData.toJson());
-        String thingType = "gene";
-        String thingKind = "entrez gene";
-        String labelType = "name";
-        String labelKind = "Entrez Gene ID";
-        logger.info("getGeneCodeNameFromNameRequest incoming json: " + requestDTO.toJson());
-        PreferredNameResultsDTO results = lsThingService.getPreferredNameFromName(thingType, thingKind, labelType, labelKind, inputData);
-   
+
+		PreferredNameRequestDTO requestDTO = PreferredNameRequestDTO
+				.fromJsonToPreferredNameRequestDTO(inputData.toJson());
+		String thingType = "gene";
+		String thingKind = "entrez gene";
+		String labelType = "name";
+		String labelKind = "Entrez Gene ID";
+		logger.info("getGeneCodeNameFromNameRequest incoming json: " + requestDTO.toJson());
+		PreferredNameResultsDTO results = lsThingService.getPreferredNameFromName(thingType, thingKind, labelType,
+				labelKind, inputData);
+
 		Assert.assertEquals(9, results.getResults().size());
 
 		logger.info("#############################################");
 		logger.info(results.toJson());
 
-		
 	}
-	
-	
+
 }
diff --git a/src/test/java/com/labsynch/labseer/service/LsThingServicePutTests.java b/src/test/java/com/labsynch/labseer/service/LsThingServicePutTests.java
index b7a08f359..d98b56c5d 100644
--- a/src/test/java/com/labsynch/labseer/service/LsThingServicePutTests.java
+++ b/src/test/java/com/labsynch/labseer/service/LsThingServicePutTests.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import java.util.HashSet;
@@ -19,9 +18,9 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class LsThingServicePutTests {
 
@@ -29,50 +28,50 @@ public class LsThingServicePutTests {
 
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
-	
+
 	@Autowired
 	private LsThingService lsThingService;
-	
+
 	@Transactional
 	@Test
 	public void lsThingNestedPutTest2() {
-		
+
 		LsThing queryThing = LsThing.findLsThing(8L);
 
 		LsThing results = lsThingService.updateLsThing(queryThing);
-		
+
 		logger.info(results.toJsonWithNestedFull());
 
 	}
-	
+
 	@Transactional
-//	@Test
+	// @Test
 	public void getThingsTest() {
-		
+
 		LsThing queryThing = LsThing.findLsThing(8L);
 
 		Set<ItxLsThingLsThing> firstLsThings = new HashSet<ItxLsThingLsThing>();
 		firstLsThings.addAll(ItxLsThingLsThing.findItxLsThingLsThingsByFirstLsThing(queryThing).getResultList());
 		logger.debug("found number of first interactions: " + firstLsThings.size());
-		
+
 		Set<ItxLsThingLsThing> secondLsThings = new HashSet<ItxLsThingLsThing>();
 		secondLsThings.addAll(ItxLsThingLsThing.findItxLsThingLsThingsBySecondLsThing(queryThing).getResultList());
 		logger.debug("found number of second interactions: " + secondLsThings.size());
 
 	}
-	
+
 	@Transactional
-//	@Test
+	// @Test
 	public void getThingsItxTest() {
-		
+
 		LsThing queryThing = LsThing.findLsThing(8L);
 
 		Set<ItxLsThingLsThing> firstLsThings = queryThing.getFirstLsThings();
 		logger.debug("found number of first interactions: " + firstLsThings.size());
-		
+
 		Set<ItxLsThingLsThing> secondLsThings = queryThing.getSecondLsThings();
 		logger.debug("found number of second interactions: " + secondLsThings.size());
 
 	}
-	
+
 }
diff --git a/src/test/java/com/labsynch/labseer/service/LsThingServiceTests.java b/src/test/java/com/labsynch/labseer/service/LsThingServiceTests.java
index 3b9e61579..660225a7a 100755
--- a/src/test/java/com/labsynch/labseer/service/LsThingServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/LsThingServiceTests.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import java.math.BigDecimal;
@@ -46,9 +45,9 @@
 
 import flexjson.JSONSerializer;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class LsThingServiceTests {
 
@@ -56,17 +55,17 @@ public class LsThingServiceTests {
 
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
-	
+
 	@Autowired
 	private LsThingService lsThingService;
-	
+
 	@Autowired
 	private AutoLabelService autoLabelService;
-	
+
 	@Transactional
-	@Rollback(value=false)
-	public LsThing createLsThingStack(){
-		//register types and kinds
+	@Rollback(value = false)
+	public LsThing createLsThingStack() {
+		// register types and kinds
 		ThingType thingType1 = new ThingType();
 		thingType1.setTypeName("thing");
 		thingType1.persist();
@@ -74,7 +73,7 @@ public LsThing createLsThingStack(){
 		thingKind1.setLsType(thingType1);
 		thingKind1.setKindName("test thing");
 		thingKind1.persist();
-		
+
 		LsThing thing1 = new LsThing();
 		thing1.setCodeName("THING-01");
 		thing1.setLsType("thing");
@@ -84,7 +83,7 @@ public LsThing createLsThingStack(){
 		thing1.setDeleted(false);
 		thing1.setIgnored(false);
 		thing1.persist();
-		
+
 		LsThing thing2 = new LsThing();
 		thing2.setCodeName("THING-02");
 		thing2.setLsType("thing");
@@ -94,7 +93,7 @@ public LsThing createLsThingStack(){
 		thing2.setDeleted(false);
 		thing2.setIgnored(false);
 		thing2.persist();
-		
+
 		LsThing thing3 = new LsThing();
 		thing3.setCodeName("THING-03");
 		thing3.setLsType("thing");
@@ -104,17 +103,18 @@ public LsThing createLsThingStack(){
 		thing3.setDeleted(false);
 		thing3.setIgnored(false);
 		thing3.persist();
-		
-		ItxLsThingLsThing inc12 = makeItxLsThingLsThing("ITXTHING-01", "incorporates", "assembly_component", thing1, thing2);
+
+		ItxLsThingLsThing inc12 = makeItxLsThingLsThing("ITXTHING-01", "incorporates", "assembly_component", thing1,
+				thing2);
 		thing1.getSecondLsThings().add(inc12);
 		inc12.persist();
 		thing1.merge();
-		
+
 		return thing1;
-		
+
 	}
-	
-	public LsThing createTransientLsThingStack(){
+
+	public LsThing createTransientLsThingStack() {
 		LsThing thing1 = new LsThing();
 		thing1.setCodeName("THING-01");
 		thing1.setLsType("thing");
@@ -123,7 +123,7 @@ public LsThing createTransientLsThingStack(){
 		thing1.setRecordedDate(new Date());
 		thing1.setDeleted(false);
 		thing1.setIgnored(false);
-		
+
 		LsThing thing2 = new LsThing();
 		thing2.setCodeName("THING-02");
 		thing2.setLsType("thing");
@@ -132,7 +132,7 @@ public LsThing createTransientLsThingStack(){
 		thing2.setRecordedDate(new Date());
 		thing2.setDeleted(false);
 		thing2.setIgnored(false);
-		
+
 		LsThing thing3 = new LsThing();
 		thing3.setCodeName("THING-03");
 		thing3.setLsType("thing");
@@ -141,15 +141,17 @@ public LsThing createTransientLsThingStack(){
 		thing3.setRecordedDate(new Date());
 		thing3.setDeleted(false);
 		thing3.setIgnored(false);
-		
-		ItxLsThingLsThing inc12 = makeItxLsThingLsThing("ITXTHING-01", "incorporates", "assembly_component", thing1, thing2);
+
+		ItxLsThingLsThing inc12 = makeItxLsThingLsThing("ITXTHING-01", "incorporates", "assembly_component", thing1,
+				thing2);
 		thing1.getSecondLsThings().add(inc12);
-		
+
 		return thing1;
-		
+
 	}
-	
-	public ItxLsThingLsThing makeItxLsThingLsThing(String codeName, String lsType, String lsKind, LsThing firstLsThing, LsThing secondLsThing){
+
+	public ItxLsThingLsThing makeItxLsThingLsThing(String codeName, String lsType, String lsKind, LsThing firstLsThing,
+			LsThing secondLsThing) {
 		ItxLsThingLsThing itx = new ItxLsThingLsThing();
 		itx.setCodeName(codeName);
 		itx.setLsType(lsType);
@@ -187,169 +189,179 @@ public ItxLsThingLsThing makeItxLsThingLsThing(String codeName, String lsType, S
 		itx.setLsStates(itxStates);
 		return itx;
 	}
-	
+
 	@Transactional
-	@Rollback(value=false)
-	public void deleteLsThingStack(){
-		try{
-			ItxLsThingLsThing inc12 = ItxLsThingLsThing.findItxLsThingLsThingsByCodeNameEquals("ITXTHING-01").getSingleResult();
-			for (ItxLsThingLsThingState state : inc12.getLsStates()){
-				for (ItxLsThingLsThingValue value: state.getLsValues()){
+	@Rollback(value = false)
+	public void deleteLsThingStack() {
+		try {
+			ItxLsThingLsThing inc12 = ItxLsThingLsThing.findItxLsThingLsThingsByCodeNameEquals("ITXTHING-01")
+					.getSingleResult();
+			for (ItxLsThingLsThingState state : inc12.getLsStates()) {
+				for (ItxLsThingLsThingValue value : state.getLsValues()) {
 					value.remove();
 				}
 				state.remove();
 			}
 			inc12.remove();
-		}catch (Exception e){}
-		
-		try{
-			ItxLsThingLsThing inc13 = ItxLsThingLsThing.findItxLsThingLsThingsByCodeNameEquals("ITXTHING-02").getSingleResult();
-			for (ItxLsThingLsThingState state : inc13.getLsStates()){
-				for (ItxLsThingLsThingValue value: state.getLsValues()){
+		} catch (Exception e) {
+		}
+
+		try {
+			ItxLsThingLsThing inc13 = ItxLsThingLsThing.findItxLsThingLsThingsByCodeNameEquals("ITXTHING-02")
+					.getSingleResult();
+			for (ItxLsThingLsThingState state : inc13.getLsStates()) {
+				for (ItxLsThingLsThingValue value : state.getLsValues()) {
 					value.remove();
 				}
 				state.remove();
 			}
 			inc13.remove();
-		} catch (Exception e){}
-		try{
+		} catch (Exception e) {
+		}
+		try {
 			LsThing thing1 = LsThing.findLsThingsByCodeNameEquals("THING-01").getSingleResult();
 			thing1.remove();
-		}catch (Exception e){}
-		try{
+		} catch (Exception e) {
+		}
+		try {
 			LsThing thing2 = LsThing.findLsThingsByCodeNameEquals("THING-02").getSingleResult();
 			thing2.remove();
-		}catch (Exception e){}
-		try{
+		} catch (Exception e) {
+		}
+		try {
 			LsThing thing3 = LsThing.findLsThingsByCodeNameEquals("THING-03").getSingleResult();
 			thing3.remove();
-		}catch (Exception e){}
-		try{
+		} catch (Exception e) {
+		}
+		try {
 			ThingKind thingKind1 = ThingKind.findThingKindsByLsTypeAndKindEquals("thing_test thing").getSingleResult();
 			thingKind1.remove();
-		}catch (Exception e){}
-		try{
+		} catch (Exception e) {
+		}
+		try {
 			ThingType thingType1 = ThingType.findThingTypesByTypeNameEquals("thing").getSingleResult();
 			thingType1.remove();
-		}catch (Exception e){}
-//		try{
-//		}catch (Exception e){}
-
+		} catch (Exception e) {
+		}
+		// try{
+		// }catch (Exception e){}
 
 	}
-	
+
 	@Test
-	public void buildAndRemoveLsThingStack(){
-		try{
+	public void buildAndRemoveLsThingStack() {
+		try {
 			LsThing thing1 = createLsThingStack();
-		}catch (Exception e){
+		} catch (Exception e) {
 			deleteLsThingStack();
 		}
 		deleteLsThingStack();
 	}
-	
+
 	@Test
 	@Transactional
-	@Rollback(value=false)
-	public void updateInteraction(){
+	@Rollback(value = false)
+	public void updateInteraction() {
 		LsThing thing1 = createLsThingStack();
 		LsThing thing2 = LsThing.findLsThingsByCodeNameEquals("THING-02").getSingleResult();
 		LsThing thing3 = LsThing.findLsThingsByCodeNameEquals("THING-03").getSingleResult();
-		ItxLsThingLsThing inc12 = ItxLsThingLsThing.findItxLsThingLsThingsByCodeNameEquals("ITXTHING-01").getSingleResult();
-		ItxLsThingLsThing inc13 = makeItxLsThingLsThing("ITXTHING-02", "incorporates", "assembly_component", thing1, thing3);
+		ItxLsThingLsThing inc12 = ItxLsThingLsThing.findItxLsThingLsThingsByCodeNameEquals("ITXTHING-01")
+				.getSingleResult();
+		ItxLsThingLsThing inc13 = makeItxLsThingLsThing("ITXTHING-02", "incorporates", "assembly_component", thing1,
+				thing3);
 		inc12.setIgnored(true);
 		thing1.getSecondLsThings().add(inc13);
 		Assert.assertEquals(2, thing1.getSecondLsThings().size());
-		for (ItxLsThingLsThing itx : thing1.getSecondLsThings()){
+		for (ItxLsThingLsThing itx : thing1.getSecondLsThings()) {
 			logger.info(itx.getCodeName());
-			if (itx.getId() != null) logger.info("id: "+itx.getId().toString());
-			else logger.info("id is null");
+			if (itx.getId() != null)
+				logger.info("id: " + itx.getId().toString());
+			else
+				logger.info("id is null");
 		}
 		LsThing updatedThing1 = lsThingService.updateLsThing(thing1);
 		logger.info(updatedThing1.toJsonWithNestedFull());
 		Assert.assertEquals(2, updatedThing1.getSecondLsThings().size());
-		for (ItxLsThingLsThing itx : updatedThing1.getSecondLsThings()){
+		for (ItxLsThingLsThing itx : updatedThing1.getSecondLsThings()) {
 			Assert.assertEquals(1, itx.getLsStates().size());
 		}
-		
-//		deleteLsThingStack();
+
+		// deleteLsThingStack();
 	}
 
-	//@Test
-	public void Test_1(){
-		
+	// @Test
+	public void Test_1() {
+
 		String json = "{\"requests\":[{\"requestName\":\"CRA-025995-1\"},{\"requestName\":\"CMPD-0000052-01\"}]}";
-		PreferredNameDTO request = PreferredNameDTO.fromJsonToPreferredNameDTO(json);	
+		PreferredNameDTO request = PreferredNameDTO.fromJsonToPreferredNameDTO(json);
 
 		logger.info("#############################################");
 
-		
 	}
-	
-	//@Test
-	public void Test_2(){
-		
+
+	// @Test
+	public void Test_2() {
+
 		String json = "{\"requests\":[{\"requestName\":\"CRA-025995-1\"},{\"requestName\":\"9\"}]}";
 
 		PreferredNameResultsDTO results = lsThingService.getGeneCodeNameFromName(json);
 		logger.info("#############################################");
 		logger.info("results: " + results.toJson());
 
-		
 	}
-	
+
 	@Test
-	public void Test_3(){
-		
+	public void Test_3() {
+
 		String json = "{\"requests\":[{\"requestName\":\"1\"}, {\"requestName\":\"2\"}, {\"requestName\":\"15\"}, {\"requestName\":\"blah\"}]}";
 
-        String thingType = "gene";
-        String thingKind = "entrez gene";
-        String labelType = "name";
-        String labelKind = "Entrez Gene ID";
-        logger.info("getGeneCodeNameFromNameRequest incoming json: " + json);
-        PreferredNameResultsDTO results = lsThingService.getPreferredNameFromName(thingType, thingKind, labelType, labelKind, json);
+		String thingType = "gene";
+		String thingKind = "entrez gene";
+		String labelType = "name";
+		String labelKind = "Entrez Gene ID";
+		logger.info("getGeneCodeNameFromNameRequest incoming json: " + json);
+		PreferredNameResultsDTO results = lsThingService.getPreferredNameFromName(thingType, thingKind, labelType,
+				labelKind, json);
 		logger.info("#############################################");
 		logger.info("results: " + results.toJson());
 
-		
 	}
-	
+
 	@Test
 	@Transactional
-	public void findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndFirstLsThingEquals(){
-		//TODO
+	public void findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndFirstLsThingEquals() {
+		// TODO
 	}
-	
+
 	@Test
 	@Transactional
-	public void findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndSecondLsThingEquals(){
-		//TODO
+	public void findItxLsThingLsThingsByLsTypeEqualsAndLsKindEqualsAndSecondLsThingEquals() {
+		// TODO
 	}
-	
+
 	@Test
 	@Transactional
-	public void retrieveOrder(){
-		//TODO
+	public void retrieveOrder() {
+		// TODO
 	}
-	
+
 	@Test
 	@Transactional
-	public void validateComponent(){
-		//TODO
+	public void validateComponent() {
+		// TODO
 	}
-	
+
 	@Test
 	@Transactional
-	@Rollback(value=false)
-	public void buildLsThingStack(){
+	@Rollback(value = false)
+	public void buildLsThingStack() {
 		createLsThingStack();
 	}
-	
+
 	@Test
 	@Transactional
-	@Rollback(value=false)
-	public void validateAssembly(){
+	@Rollback(value = false)
+	public void validateAssembly() {
 		LsThing thing2 = createTransientLsThingStack();
 		ValuePathDTO pathDTO = new ValuePathDTO();
 		pathDTO.setEntity("ItxLsThingLsThing");
@@ -374,45 +386,61 @@ public void validateAssembly(){
 		ArrayList<LsThingValidationErrorMessage> errorMessages = lsThingService.validateLsThing(validationDTO);
 		Assert.assertTrue(errorMessages.isEmpty());
 	}
-	
+
 	@Test
-	public void saveLSMParent() throws UniqueNameException{
-    	String json = "{\"codeName\":\"LSM000001\",\"ignored\":false,\"lsKind\":\"linker small molecule\",\"lsLabels\":[{\"ignored\":false,\"imageFile\":null,\"labelText\":\"LSM\",\"lsKind\":\"linker small molecule\",\"lsTransaction\":1,\"lsType\":\"name\",\"lsTypeAndKind\":\"name_linker small molecule\",\"modifiedDate\":null,\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"jane\",\"recordedDate\":1375141504000}],\"lsStates\":[{\"comments\":null,\"ignored\":false,\"lsKind\":\"linker small molecule parent\",\"lsTransaction\":1,\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_linker small molecule parent\",\"lsValues\":[{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":1342080000000,\"fileValue\":null,\"ignored\":false,\"lsTransaction\":128,\"modifiedDate\":null,\"numericValue\":null,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":null,\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"completion date\",\"valueOperator\":null,\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"valueUnit\":null},{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"fileValue\":null,\"ignored\":false,\"lsTransaction\":127,\"modifiedDate\":null,\"numericValue\":null,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":\"Notebook 1\",\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"notebook\",\"valueOperator\":null,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"valueUnit\":null},{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"fileValue\":null,\"ignored\":false,\"lsTransaction\":128,\"modifiedDate\":null,\"numericValue\":231,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":null,\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"molecular weight\",\"valueOperator\":null,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_molecular weight\",\"unitKind\":\"g/mol\",\"unitType\":\"molecular weight\",\"valueUnit\":null},{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"fileValue\":null,\"ignored\":false,\"lsTransaction\":128,\"modifiedDate\":null,\"numericValue\":0,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":null,\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"batch number\",\"valueOperator\":null,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_batch number\",\"unitKind\":null,\"unitType\":null,\"valueUnit\":null}],\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"jane\",\"recordedDate\":1375141460000}],\"lsTransaction\":1,\"lsType\":\"parent\",\"lsTypeAndKind\":\"parent_linker small molecule\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"jane\",\"recordedDate\":1375141508000,\"shortDescription\":\" \"}";
+	public void saveLSMParent() throws UniqueNameException {
+		String json = "{\"codeName\":\"LSM000001\",\"ignored\":false,\"lsKind\":\"linker small molecule\",\"lsLabels\":[{\"ignored\":false,\"imageFile\":null,\"labelText\":\"LSM\",\"lsKind\":\"linker small molecule\",\"lsTransaction\":1,\"lsType\":\"name\",\"lsTypeAndKind\":\"name_linker small molecule\",\"modifiedDate\":null,\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"jane\",\"recordedDate\":1375141504000}],\"lsStates\":[{\"comments\":null,\"ignored\":false,\"lsKind\":\"linker small molecule parent\",\"lsTransaction\":1,\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_linker small molecule parent\",\"lsValues\":[{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":1342080000000,\"fileValue\":null,\"ignored\":false,\"lsTransaction\":128,\"modifiedDate\":null,\"numericValue\":null,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":null,\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"completion date\",\"valueOperator\":null,\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"valueUnit\":null},{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"fileValue\":null,\"ignored\":false,\"lsTransaction\":127,\"modifiedDate\":null,\"numericValue\":null,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":\"Notebook 1\",\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"notebook\",\"valueOperator\":null,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"valueUnit\":null},{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"fileValue\":null,\"ignored\":false,\"lsTransaction\":128,\"modifiedDate\":null,\"numericValue\":231,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":null,\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"molecular weight\",\"valueOperator\":null,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_molecular weight\",\"unitKind\":\"g/mol\",\"unitType\":\"molecular weight\",\"valueUnit\":null},{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"fileValue\":null,\"ignored\":false,\"lsTransaction\":128,\"modifiedDate\":null,\"numericValue\":0,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":null,\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"batch number\",\"valueOperator\":null,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_batch number\",\"unitKind\":null,\"unitType\":null,\"valueUnit\":null}],\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"jane\",\"recordedDate\":1375141460000}],\"lsTransaction\":1,\"lsType\":\"parent\",\"lsTypeAndKind\":\"parent_linker small molecule\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"jane\",\"recordedDate\":1375141508000,\"shortDescription\":\" \"}";
 		LsThing lsThing = LsThing.fromJsonToLsThing(json);
 		lsThing = lsThingService.saveLsThing(lsThing, false);
 	}
-	
-//	@Test
-//	@Transactional
-//	public void generateBatchCodeName(){
-//		LsThing parent = LsThing.findLsThingsByCodeNameEquals("LSM000001").getSingleResult();
-//		String batchCodeName = lsThingService.generateBatchCodeName(parent);
-//		Assert.assertEquals("LSM000001-1", batchCodeName);
-//	}
-//	
-//	@Test
-//	public void saveLSMBatch() throws UniqueNameException{
-//    	String json = "{\"codeName\":null,\"id\":11,\"ignored\":false,\"lsKind\":\"linker small molecule\",\"lsStates\":[{\"comments\":null,\"id\":11,\"ignored\":false,\"lsKind\":\"linker small molecule batch\",\"lsTransaction\":1,\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_linker small molecule batch\",\"lsValues\":[{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":1342080000000,\"fileValue\":null,\"id\":12,\"ignored\":false,\"lsTransaction\":128,\"modifiedDate\":null,\"numericValue\":null,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":null,\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"completion date\",\"valueOperator\":null,\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"valueUnit\":null,\"version\":0},{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"fileValue\":null,\"id\":13,\"ignored\":false,\"lsTransaction\":127,\"modifiedDate\":null,\"numericValue\":null,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":\"Notebook 1\",\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"notebook\",\"valueOperator\":null,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"valueUnit\":null,\"version\":0}],\"recordedDate\":1363388477000,\"recordedBy\":\"jane\"},{\"comments\":null,\"id\":111,\"ignored\":false,\"lsKind\":\"inventory\",\"lsTransaction\":1,\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_inventory\",\"lsValues\":[{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"fileValue\":null,\"id\":14,\"ignored\":false,\"lsTransaction\":128,\"modifiedDate\":null,\"numericValue\":2.3,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":null,\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"amount\",\"valueOperator\":null,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_amount\",\"unitKind\":\"g\",\"unitType\":\"mass\",\"valueUnit\":null,\"version\":0},{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"fileValue\":null,\"id\":15,\"ignored\":false,\"lsTransaction\":127,\"modifiedDate\":null,\"numericValue\":null,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":\"Cabinet 1\",\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"location\",\"valueOperator\":null,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_location\",\"valueUnit\":null,\"version\":0}],\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"jane\",\"recordedDate\":1375141460000,\"version\":0}],\"lsTransaction\":1,\"lsType\":\"batch\",\"lsTypeAndKind\":\"batch_linker small molecule\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"jane\",\"recordedDate\":1375141508000,\"shortDescription\":\" \",\"version\":0}";
-//		LsThing lsThing = LsThing.fromJsonToLsThing(json);
-//    	LsThing parent = LsThing.findLsThingsByCodeNameEquals("LSM000001").getSingleResult();
-//    	lsThing.setCodeName(lsThingService.generateBatchCodeName(parent));
-//		lsThing = lsThingService.saveLsThing(lsThing, false, true, parent.getId());
-//	}
-	
+
+	// @Test
+	// @Transactional
+	// public void generateBatchCodeName(){
+	// LsThing parent =
+	// LsThing.findLsThingsByCodeNameEquals("LSM000001").getSingleResult();
+	// String batchCodeName = lsThingService.generateBatchCodeName(parent);
+	// Assert.assertEquals("LSM000001-1", batchCodeName);
+	// }
+	//
+	// @Test
+	// public void saveLSMBatch() throws UniqueNameException{
+	// String json =
+	// "{\"codeName\":null,\"id\":11,\"ignored\":false,\"lsKind\":\"linker small
+	// molecule\",\"lsStates\":[{\"comments\":null,\"id\":11,\"ignored\":false,\"lsKind\":\"linker
+	// small molecule
+	// batch\",\"lsTransaction\":1,\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_linker
+	// small molecule
+	// batch\",\"lsValues\":[{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":1342080000000,\"fileValue\":null,\"id\":12,\"ignored\":false,\"lsTransaction\":128,\"modifiedDate\":null,\"numericValue\":null,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":null,\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"completion
+	// date\",\"valueOperator\":null,\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion
+	// date\",\"valueUnit\":null,\"version\":0},{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"fileValue\":null,\"id\":13,\"ignored\":false,\"lsTransaction\":127,\"modifiedDate\":null,\"numericValue\":null,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":\"Notebook
+	// 1\",\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"notebook\",\"valueOperator\":null,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"valueUnit\":null,\"version\":0}],\"recordedDate\":1363388477000,\"recordedBy\":\"jane\"},{\"comments\":null,\"id\":111,\"ignored\":false,\"lsKind\":\"inventory\",\"lsTransaction\":1,\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_inventory\",\"lsValues\":[{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"fileValue\":null,\"id\":14,\"ignored\":false,\"lsTransaction\":128,\"modifiedDate\":null,\"numericValue\":2.3,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":null,\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"amount\",\"valueOperator\":null,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_amount\",\"unitKind\":\"g\",\"unitType\":\"mass\",\"valueUnit\":null,\"version\":0},{\"clobValue\":null,\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"fileValue\":null,\"id\":15,\"ignored\":false,\"lsTransaction\":127,\"modifiedDate\":null,\"numericValue\":null,\"publicData\":true,\"recordedDate\":1363388477000,\"recordedBy\":\"jane\",\"sigFigs\":null,\"stringValue\":\"Cabinet
+	// 1\",\"uncertainty\":null,\"urlValue\":null,\"lsKind\":\"location\",\"valueOperator\":null,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_location\",\"valueUnit\":null,\"version\":0}],\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"jane\",\"recordedDate\":1375141460000,\"version\":0}],\"lsTransaction\":1,\"lsType\":\"batch\",\"lsTypeAndKind\":\"batch_linker
+	// small
+	// molecule\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"jane\",\"recordedDate\":1375141508000,\"shortDescription\":\"
+	// \",\"version\":0}";
+	// LsThing lsThing = LsThing.fromJsonToLsThing(json);
+	// LsThing parent =
+	// LsThing.findLsThingsByCodeNameEquals("LSM000001").getSingleResult();
+	// lsThing.setCodeName(lsThingService.generateBatchCodeName(parent));
+	// lsThing = lsThingService.saveLsThing(lsThing, false, true, parent.getId());
+	// }
+
 	@Test
 	public void getComponentBatches() {
-    	LsThing parent = LsThing.findLsThingsByCodeNameEquals("LSM000001").getSingleResult();
+		LsThing parent = LsThing.findLsThingsByCodeNameEquals("LSM000001").getSingleResult();
 		Collection<LsThing> batches = lsThingService.findBatchesByParentEquals(parent);
 		Assert.assertEquals(1, batches.size());
 	}
-	
+
 	@Test
 	public void findLsThingLabels() {
-		String queryString ="linker";
-		Collection<LsThingLabel> lsThingLabels = LsThingLabel.findLsThingLabelsByLabelTextLike(queryString).getResultList();
+		String queryString = "linker";
+		Collection<LsThingLabel> lsThingLabels = LsThingLabel.findLsThingLabelsByLabelTextLike(queryString)
+				.getResultList();
 		logger.info(LsThingLabel.toJsonArray(lsThingLabels));
 	}
-	
+
 	@Test
 	public void findLsThingsByLsTypeAndKindEquals() {
 		String lsTypeAndKind = "term_documentTerm";
@@ -423,68 +451,119 @@ public void findLsThingsByLsTypeAndKindEquals() {
 		logger.info(lsThing.getCodeName());
 		logger.info(LsThing.toJsonArray(results));
 	}
-	
+
 	@Transactional
 	@Test
-	public void toFullJson(){
+	public void toFullJson() {
 		LsThing lsThing = LsThing.findLsThingsByCodeNameEquals("PROT000006").getSingleResult();
-		
-		
-		String json1 = new JSONSerializer().
-					exclude("*.class","lsStates.lsThing","lsLabels.lsThing"
-							,"firstLsThings.secondLsThing","secondLsThings.firstLsThing"
-//							,"firstLsThings.firstLsThing.firstLsThings", "firstLsThings.firstLsThing.secondLsThings"
-							)
-					.include("lsLabels", "lsStates.lsValues"
-							,"secondLsThings","firstLsThings"
-//							,"firstLsThings.firstLsThing"
-							)
-					.transform(new ExcludeNulls(), void.class)
-					.serialize(lsThing);
+
+		String json1 = new JSONSerializer().exclude("*.class", "lsStates.lsThing", "lsLabels.lsThing",
+				"firstLsThings.secondLsThing", "secondLsThings.firstLsThing"
+		// ,"firstLsThings.firstLsThing.firstLsThings",
+		// "firstLsThings.firstLsThing.secondLsThings"
+		)
+				.include("lsLabels", "lsStates.lsValues", "secondLsThings", "firstLsThings"
+				// ,"firstLsThings.firstLsThing"
+				)
+				.transform(new ExcludeNulls(), void.class)
+				.serialize(lsThing);
 		logger.info(json1);
-		
-//		logger.info(lsThing.toFullJson());
+
+		// logger.info(lsThing.toFullJson());
 	}
-	
+
 	@Test
 	@Transactional
-    public void toJsonTest() {
+	public void toJsonTest() {
 		LsThing lsThing = LsThing.findLsThingsByCodeNameEquals("PROT000006-1").getSingleResult();
-		
-        String json = new JSONSerializer().
-        		exclude("*.class").
-        		include("lsTags", "lsLabels", "lsStates.lsValues", "firstLsThings","secondLsThings").
-        		transform(new ExcludeNulls(), void.class).
-        		serialize(lsThing);
-        
-        logger.info(json);
-    }
-	
-//	public String toFullJson() {
-//        return new JSONSerializer().
-//        		exclude("*.class", "lsStates.analysisGroup", "lsLabels.analysisGroup", "treatmentGroups.analysisGroup", "experiment.protocol")
-//        		.include("lsLabels", "lsStates.lsValues", "treatmentGroups.lsStates.lsValues", "treatmentGroups.lsLabels", "treatmentGroups.subjects.lsStates.lsValues", "treatmentGroups.subjects.lsLabels")
-//        		.transform(new ExcludeNulls(), void.class).serialize(this);
-//    }
-	
+
+		String json = new JSONSerializer().exclude("*.class")
+				.include("lsTags", "lsLabels", "lsStates.lsValues", "firstLsThings", "secondLsThings")
+				.transform(new ExcludeNulls(), void.class).serialize(lsThing);
+
+		logger.info(json);
+	}
+
+	// public String toFullJson() {
+	// return new JSONSerializer().
+	// exclude("*.class", "lsStates.analysisGroup", "lsLabels.analysisGroup",
+	// "treatmentGroups.analysisGroup", "experiment.protocol")
+	// .include("lsLabels", "lsStates.lsValues",
+	// "treatmentGroups.lsStates.lsValues", "treatmentGroups.lsLabels",
+	// "treatmentGroups.subjects.lsStates.lsValues",
+	// "treatmentGroups.subjects.lsLabels")
+	// .transform(new ExcludeNulls(), void.class).serialize(this);
+	// }
+
 	@Test
 	@Transactional
 	public void saveParentAndBatch() {
-//		String json = "{\"codeName\": null,\"firstLsThings\": [{\"deleted\": false,\"firstLsThing\": {\"codeName\": \"PRTN-000012-1\",\"deleted\": false,\"ignored\": false,\"lsKind\": \"protein\",\"lsType\": \"batch\",\"lsTypeAndKind\": \"batch_protein\",\"recordedBy\": \"bob\",\"recordedDate\": 1424730027913,\"version\": null},\"id\": null,\"ignored\": false,\"lsKind\": \"batch_parent\",\"lsType\": \"instantiates\",\"lsTypeAndKind\": \"instantiates_batch_parent\",\"recordedBy\": \"bob\",\"recordedDate\": 1424730027913,\"version\": null}],\"ignored\": false,\"lsKind\": \"protein\",\"lsLabels\": [{ \"ignored\": false,\"imageFile\": null,\"labelText\": \"Fielderase\",\"lsKind\": \"protein\",\"lsTransaction\": 1,\"lsType\": \"name\",\"lsTypeAndKind\": \"name_protein\",\"modifiedDate\": null,\"physicallyLabled\": false,\"preferred\": true,\"recordedBy\": \"jane\",\"recordedDate\": 1375141504000}],\"lsStates\": [{ \"comments\": null,\"ignored\": false,\"lsKind\": \"protein parent\",\"lsTransaction\": 1,\"lsType\": \"metadata\",\"lsTypeAndKind\": \"metadata_protein parent\",\"lsValues\": [{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": 1342080000000, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"completion date\", \"lsTransaction\": 128, \"lsType\": \"dateValue\", \"lsTypeAndKind\": \"dateValue_completion date\", \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"notebook\", \"lsTransaction\": 127, \"lsType\": \"stringValue\", \"lsTypeAndKind\": \"stringValue_notebook\", \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": \"Notebook 1\", \"uncertainty\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"molecular weight\", \"lsTransaction\": 128, \"lsType\": \"numericValue\", \"lsTypeAndKind\": \"numericValue_molecular weight\", \"modifiedDate\": null, \"numericValue\": 231, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"unitKind\": \"g/mol\", \"unitType\": \"molecular weight\", \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"batch number\", \"lsTransaction\": 128, \"lsType\": \"numericValue\", \"lsTypeAndKind\": \"numericValue_batch number\", \"modifiedDate\": null, \"numericValue\": 0, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"unitKind\": null, \"unitType\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null} ],\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\": 1375141460000}],\"lsTransaction\": 1,\"lsType\": \"parent\",\"lsTypeAndKind\": \"parent_protein\",\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\": 1375141508000,\"shortDescription\": \" \"}";
-    	String json = "{\"codeName\": null,\"firstLsThings\": [{\"deleted\": false,\"firstLsThing\": {\"codeName\": \"PRTN-000013-1\",\"deleted\": false,\"ignored\": false,\"lsKind\": \"protein\",\"lsStates\":[{\"deleted\":false,\"ignored\":false,\"lsKind\":\"inventory\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_inventory\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"location\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_location\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729705505,\"stringValue\":\"123\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"amount made\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_amount made\",\"numericValue\":1123,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729706303,\"unitKind\":\"g\",\"unitType\":\"mass\",\"unitTypeAndKind\":\"mass_g\",\"version\":0}],\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"version\":1},{\"deleted\":false,\"ignored\":false,\"lsKind\":\"protein batch\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_protein batch\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"hplc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_hplc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeOrigin\":\"ACAS authors\",\"codeTypeAndKind\":\"null_null\",\"codeValue\":\"egao\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"scientist\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_scientist\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729702585,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"DeleteExperimentInstructions (6).pdf\",\"ignored\":false,\"lsKind\":\"gpc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_gpc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1424678400000,\"deleted\":false,\"ignored\":false,\"lsKind\":\"completion date\",\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729703242,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"ms\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_ms\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeKind\":\"source\",\"codeOrigin\":\"ACAS DDICT\",\"codeType\":\"component\",\"codeTypeAndKind\":\"component_source\",\"codeValue\":\"ACAS\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"source\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_source\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729672870,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"purity\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_purity\",\"numericValue\":129,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729708062,\"unitKind\":\"% purity\",\"unitType\":\"percentage\",\"unitTypeAndKind\":\"percentage_% purity\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"nmr\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_nmr\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"notebook\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729703953,\"stringValue\":\"test\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"source id\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_source id\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729702610,\"stringValue\":\"\",\"unitTypeAndKind\":\"null_null\",\"version\":0}],\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"version\":1}],\"lsType\": \"batch\",\"lsTypeAndKind\": \"batch_protein\",\"recordedBy\": \"jane\",\"recordedDate\": 1424730027913,\"version\": null},\"id\": null,\"ignored\": false,\"lsKind\": \"batch_parent\",\"lsType\": \"instantiates\",\"lsTypeAndKind\": \"instantiates_batch_parent\",\"recordedBy\": \"jane\",\"recordedDate\": 1424730027913,\"version\": null}],\"ignored\": false,\"lsKind\": \"protein\",\"lsLabels\": [{ \"ignored\": false,\"imageFile\": null,\"labelText\": \"Fielderase\",\"lsKind\": \"protein\",\"lsTransaction\": 9999,\"lsType\": \"name\",\"lsTypeAndKind\": \"name_protein\",\"modifiedDate\": null,\"physicallyLabled\": false,\"preferred\": true,\"recordedBy\": \"jane\",\"recordedDate\": 1375141504000}],\"lsStates\": [{ \"comments\": null,\"ignored\": false,\"lsKind\": \"protein parent\",\"lsTransaction\": 9999,\"lsType\": \"metadata\",\"lsTypeAndKind\": \"metadata_protein parent\",\"lsValues\": [{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": 1342080000000, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"completion date\", \"lsTransaction\": 9999, \"lsType\": \"dateValue\", \"lsTypeAndKind\": \"dateValue_completion date\", \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"notebook\", \"lsTransaction\": 9999, \"lsType\": \"stringValue\", \"lsTypeAndKind\": \"stringValue_notebook\", \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": \"Notebook 1\", \"uncertainty\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"molecular weight\", \"lsTransaction\": 9999, \"lsType\": \"numericValue\", \"lsTypeAndKind\": \"numericValue_molecular weight\", \"modifiedDate\": null, \"numericValue\": 231, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"unitKind\": \"g/mol\", \"unitType\": \"molecular weight\", \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"batch number\", \"lsTransaction\": 9999, \"lsType\": \"numericValue\", \"lsTypeAndKind\": \"numericValue_batch number\", \"modifiedDate\": null, \"numericValue\": 0, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"unitKind\": null, \"unitType\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null} ],\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\": 1375141460000}],\"lsTransaction\": 9999,\"lsType\": \"parent\",\"lsTypeAndKind\": \"parent_protein\",\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\": 1375141508000,\"shortDescription\": \" \"}";
+		// String json = "{\"codeName\": null,\"firstLsThings\": [{\"deleted\":
+		// false,\"firstLsThing\": {\"codeName\": \"PRTN-000012-1\",\"deleted\":
+		// false,\"ignored\": false,\"lsKind\": \"protein\",\"lsType\":
+		// \"batch\",\"lsTypeAndKind\": \"batch_protein\",\"recordedBy\":
+		// \"bob\",\"recordedDate\": 1424730027913,\"version\": null},\"id\":
+		// null,\"ignored\": false,\"lsKind\": \"batch_parent\",\"lsType\":
+		// \"instantiates\",\"lsTypeAndKind\":
+		// \"instantiates_batch_parent\",\"recordedBy\": \"bob\",\"recordedDate\":
+		// 1424730027913,\"version\": null}],\"ignored\": false,\"lsKind\":
+		// \"protein\",\"lsLabels\": [{ \"ignored\": false,\"imageFile\":
+		// null,\"labelText\": \"Fielderase\",\"lsKind\": \"protein\",\"lsTransaction\":
+		// 1,\"lsType\": \"name\",\"lsTypeAndKind\": \"name_protein\",\"modifiedDate\":
+		// null,\"physicallyLabled\": false,\"preferred\": true,\"recordedBy\":
+		// \"jane\",\"recordedDate\": 1375141504000}],\"lsStates\": [{ \"comments\":
+		// null,\"ignored\": false,\"lsKind\": \"protein parent\",\"lsTransaction\":
+		// 1,\"lsType\": \"metadata\",\"lsTypeAndKind\": \"metadata_protein
+		// parent\",\"lsValues\": [{\"clobValue\": null, \"codeValue\": null,
+		// \"comments\": null, \"dateValue\": 1342080000000, \"fileValue\": null,
+		// \"ignored\": false, \"lsKind\": \"completion date\", \"lsTransaction\": 128,
+		// \"lsType\": \"dateValue\", \"lsTypeAndKind\": \"dateValue_completion date\",
+		// \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true,
+		// \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null,
+		// \"stringValue\": null, \"uncertainty\": null, \"urlValue\": null,
+		// \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null,
+		// \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\":
+		// null, \"ignored\": false, \"lsKind\": \"notebook\", \"lsTransaction\": 127,
+		// \"lsType\": \"stringValue\", \"lsTypeAndKind\": \"stringValue_notebook\",
+		// \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true,
+		// \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null,
+		// \"stringValue\": \"Notebook 1\", \"uncertainty\": null, \"urlValue\": null,
+		// \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null,
+		// \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\":
+		// null, \"ignored\": false, \"lsKind\": \"molecular weight\",
+		// \"lsTransaction\": 128, \"lsType\": \"numericValue\", \"lsTypeAndKind\":
+		// \"numericValue_molecular weight\", \"modifiedDate\": null, \"numericValue\":
+		// 231, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\":
+		// 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\":
+		// null, \"unitKind\": \"g/mol\", \"unitType\": \"molecular weight\",
+		// \"urlValue\": null, \"valueOperator\": null, \"valueUnit\":
+		// null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null,
+		// \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\":
+		// \"batch number\", \"lsTransaction\": 128, \"lsType\": \"numericValue\",
+		// \"lsTypeAndKind\": \"numericValue_batch number\", \"modifiedDate\": null,
+		// \"numericValue\": 0, \"publicData\": true, \"recordedBy\": \"jane\",
+		// \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null,
+		// \"uncertainty\": null, \"unitKind\": null, \"unitType\": null, \"urlValue\":
+		// null, \"valueOperator\": null, \"valueUnit\": null} ],\"modifiedBy\":
+		// null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\":
+		// 1375141460000}],\"lsTransaction\": 1,\"lsType\":
+		// \"parent\",\"lsTypeAndKind\": \"parent_protein\",\"modifiedBy\":
+		// null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\":
+		// 1375141508000,\"shortDescription\": \" \"}";
+		String json = "{\"codeName\": null,\"firstLsThings\": [{\"deleted\": false,\"firstLsThing\": {\"codeName\": \"PRTN-000013-1\",\"deleted\": false,\"ignored\": false,\"lsKind\": \"protein\",\"lsStates\":[{\"deleted\":false,\"ignored\":false,\"lsKind\":\"inventory\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_inventory\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"location\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_location\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729705505,\"stringValue\":\"123\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"amount made\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_amount made\",\"numericValue\":1123,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729706303,\"unitKind\":\"g\",\"unitType\":\"mass\",\"unitTypeAndKind\":\"mass_g\",\"version\":0}],\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"version\":1},{\"deleted\":false,\"ignored\":false,\"lsKind\":\"protein batch\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_protein batch\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"hplc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_hplc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeOrigin\":\"ACAS authors\",\"codeTypeAndKind\":\"null_null\",\"codeValue\":\"egao\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"scientist\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_scientist\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729702585,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"DeleteExperimentInstructions (6).pdf\",\"ignored\":false,\"lsKind\":\"gpc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_gpc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1424678400000,\"deleted\":false,\"ignored\":false,\"lsKind\":\"completion date\",\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729703242,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"ms\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_ms\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeKind\":\"source\",\"codeOrigin\":\"ACAS DDICT\",\"codeType\":\"component\",\"codeTypeAndKind\":\"component_source\",\"codeValue\":\"ACAS\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"source\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_source\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729672870,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"purity\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_purity\",\"numericValue\":129,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729708062,\"unitKind\":\"% purity\",\"unitType\":\"percentage\",\"unitTypeAndKind\":\"percentage_% purity\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"nmr\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_nmr\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"notebook\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729703953,\"stringValue\":\"test\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"source id\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_source id\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729702610,\"stringValue\":\"\",\"unitTypeAndKind\":\"null_null\",\"version\":0}],\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"version\":1}],\"lsType\": \"batch\",\"lsTypeAndKind\": \"batch_protein\",\"recordedBy\": \"jane\",\"recordedDate\": 1424730027913,\"version\": null},\"id\": null,\"ignored\": false,\"lsKind\": \"batch_parent\",\"lsType\": \"instantiates\",\"lsTypeAndKind\": \"instantiates_batch_parent\",\"recordedBy\": \"jane\",\"recordedDate\": 1424730027913,\"version\": null}],\"ignored\": false,\"lsKind\": \"protein\",\"lsLabels\": [{ \"ignored\": false,\"imageFile\": null,\"labelText\": \"Fielderase\",\"lsKind\": \"protein\",\"lsTransaction\": 9999,\"lsType\": \"name\",\"lsTypeAndKind\": \"name_protein\",\"modifiedDate\": null,\"physicallyLabled\": false,\"preferred\": true,\"recordedBy\": \"jane\",\"recordedDate\": 1375141504000}],\"lsStates\": [{ \"comments\": null,\"ignored\": false,\"lsKind\": \"protein parent\",\"lsTransaction\": 9999,\"lsType\": \"metadata\",\"lsTypeAndKind\": \"metadata_protein parent\",\"lsValues\": [{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": 1342080000000, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"completion date\", \"lsTransaction\": 9999, \"lsType\": \"dateValue\", \"lsTypeAndKind\": \"dateValue_completion date\", \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"notebook\", \"lsTransaction\": 9999, \"lsType\": \"stringValue\", \"lsTypeAndKind\": \"stringValue_notebook\", \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": \"Notebook 1\", \"uncertainty\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"molecular weight\", \"lsTransaction\": 9999, \"lsType\": \"numericValue\", \"lsTypeAndKind\": \"numericValue_molecular weight\", \"modifiedDate\": null, \"numericValue\": 231, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"unitKind\": \"g/mol\", \"unitType\": \"molecular weight\", \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"batch number\", \"lsTransaction\": 9999, \"lsType\": \"numericValue\", \"lsTypeAndKind\": \"numericValue_batch number\", \"modifiedDate\": null, \"numericValue\": 0, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"unitKind\": null, \"unitType\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null} ],\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\": 1375141460000}],\"lsTransaction\": 9999,\"lsType\": \"parent\",\"lsTypeAndKind\": \"parent_protein\",\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\": 1375141508000,\"shortDescription\": \" \"}";
 		LsThing lsThing = LsThing.fromJsonToLsThing(json);
-    	try{
-    		LsThing savedLsThing = lsThingService.saveLsThing(lsThing);
-    		logger.info(savedLsThing.toJsonWithNestedFull());
-    	} catch (UniqueNameException e){
-    		logger.error("unique name exception");
-    	}
+		try {
+			LsThing savedLsThing = lsThingService.saveLsThing(lsThing);
+			logger.info(savedLsThing.toJsonWithNestedFull());
+		} catch (UniqueNameException e) {
+			logger.error("unique name exception");
+		}
 	}
-	
+
 	@Test
 	@Transactional
 	public void updateParentAndBatch() {
-    	String json = "{\"codeName\":\"PRTN000015\",\"deleted\":false,\"firstLsThings\":[{\"deleted\":false,\"firstLsThing\":{\"codeName\":\"PRTN000015-1\",\"deleted\":false,\"id\":1493852,\"ignored\":false,\"lsKind\":\"protein\",\"lsStates\":[{\"comments\":\"test comment 2\",\"deleted\":false,\"id\":2634316,\"ignored\":false,\"lsKind\":\"protein batch\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_protein batch\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"edited ms file value\",\"id\":5926370,\"ignored\":false,\"lsKind\":\"ms\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_ms\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"id\":5926365,\"ignored\":false,\"lsKind\":\"nmr\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_nmr\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"DeleteExperimentInstructions (6).pdf\",\"id\":5926369,\"ignored\":false,\"lsKind\":\"gpc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_gpc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1424678400000,\"deleted\":false,\"id\":5926368,\"ignored\":false,\"lsKind\":\"completion date\",\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729703242,\"unitTypeAndKind\":\"null_null\"},{\"codeKind\":\"source\",\"codeOrigin\":\"ACAS DDICT\",\"codeType\":\"component\",\"codeTypeAndKind\":\"component_source\",\"codeValue\":\"ACAS Edited\",\"deleted\":false,\"id\":5926373,\"ignored\":false,\"lsKind\":\"source\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_source\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729672870,\"unitTypeAndKind\":\"null_null\"},{\"codeOrigin\":\"ACAS authors\",\"codeTypeAndKind\":\"null_null\",\"codeValue\":\"egao\",\"deleted\":false,\"id\":5926367,\"ignored\":false,\"lsKind\":\"scientist\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_scientist\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729702585,\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926372,\"ignored\":false,\"lsKind\":\"purity\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_purity\",\"numericValue\":129,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729708062,\"unitKind\":\"% purity\",\"unitType\":\"percentage\",\"unitTypeAndKind\":\"percentage_% purity\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"id\":5926371,\"ignored\":false,\"lsKind\":\"hplc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_hplc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926364,\"ignored\":false,\"lsKind\":\"notebook\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729703953,\"stringValue\":\"test\",\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926366,\"ignored\":false,\"lsKind\":\"source id\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_source id\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729702610,\"stringValue\":\"test source id\",\"unitTypeAndKind\":\"null_null\"}],\"recordedBy\":\"jane\",\"recordedDate\":1424729720940},{\"deleted\":false,\"id\":2634315,\"ignored\":false,\"lsKind\":\"inventory\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_inventory\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926362,\"ignored\":false,\"lsKind\":\"location\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_location\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729705505,\"stringValue\":\"123\",\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926363,\"ignored\":false,\"lsKind\":\"amount made\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_amount made\",\"numericValue\":1123,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729706303,\"unitKind\":\"g\",\"unitType\":\"mass\",\"unitTypeAndKind\":\"mass_g\"}],\"recordedBy\":\"jane\",\"recordedDate\":1424729720940}],\"lsType\":\"batch\",\"lsTypeAndKind\":\"batch_protein\",\"recordedBy\":\"jane\",\"recordedDate\":1424730027913},\"id\":1493853,\"ignored\":false,\"lsKind\":\"batch_parent\",\"lsType\":\"instantiates\",\"lsTypeAndKind\":\"instantiates_batch_parent\",\"recordedBy\":\"jane\",\"recordedDate\":1424730027913}],\"id\":1493851,\"ignored\":false,\"lsKind\":\"protein\",\"lsLabels\":[{\"deleted\":false,\"id\":297595,\"ignored\":false,\"labelText\":\"Fielderase Z\",\"lsKind\":\"protein\",\"lsTransaction\":9999,\"lsType\":\"name\",\"lsTypeAndKind\":\"name_protein\",\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"jane\",\"recordedDate\":1375141504000}],\"lsStates\":[{\"deleted\":false,\"id\":2634314,\"ignored\":false,\"lsKind\":\"protein parent\",\"lsTransaction\":9999,\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_protein parent\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926359,\"ignored\":false,\"lsKind\":\"notebook\",\"lsTransaction\":9999,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"stringValue\":\"Notebook 1\",\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926361,\"ignored\":false,\"lsKind\":\"molecular weight\",\"lsTransaction\":9999,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_molecular weight\",\"numericValue\":890,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"unitKind\":\"g/mol\",\"unitType\":\"molecular weight\",\"unitTypeAndKind\":\"molecular weight_g/mol\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926360,\"ignored\":false,\"lsKind\":\"batch number\",\"lsTransaction\":9999,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_batch number\",\"numericValue\":0,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1342080000000,\"deleted\":false,\"id\":5926358,\"ignored\":false,\"lsKind\":\"completion date\",\"lsTransaction\":9999,\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"unitTypeAndKind\":\"null_null\"}],\"recordedBy\":\"jane\",\"recordedDate\":1375141460000}],\"lsTags\":[],\"lsTransaction\":9999,\"lsType\":\"parent\",\"lsTypeAndKind\":\"parent_protein\",\"recordedBy\":\"jane\",\"recordedDate\":1375141508000,\"secondLsThings\":[]}";
+		String json = "{\"codeName\":\"PRTN000015\",\"deleted\":false,\"firstLsThings\":[{\"deleted\":false,\"firstLsThing\":{\"codeName\":\"PRTN000015-1\",\"deleted\":false,\"id\":1493852,\"ignored\":false,\"lsKind\":\"protein\",\"lsStates\":[{\"comments\":\"test comment 2\",\"deleted\":false,\"id\":2634316,\"ignored\":false,\"lsKind\":\"protein batch\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_protein batch\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"edited ms file value\",\"id\":5926370,\"ignored\":false,\"lsKind\":\"ms\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_ms\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"id\":5926365,\"ignored\":false,\"lsKind\":\"nmr\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_nmr\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"DeleteExperimentInstructions (6).pdf\",\"id\":5926369,\"ignored\":false,\"lsKind\":\"gpc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_gpc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1424678400000,\"deleted\":false,\"id\":5926368,\"ignored\":false,\"lsKind\":\"completion date\",\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729703242,\"unitTypeAndKind\":\"null_null\"},{\"codeKind\":\"source\",\"codeOrigin\":\"ACAS DDICT\",\"codeType\":\"component\",\"codeTypeAndKind\":\"component_source\",\"codeValue\":\"ACAS Edited\",\"deleted\":false,\"id\":5926373,\"ignored\":false,\"lsKind\":\"source\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_source\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729672870,\"unitTypeAndKind\":\"null_null\"},{\"codeOrigin\":\"ACAS authors\",\"codeTypeAndKind\":\"null_null\",\"codeValue\":\"egao\",\"deleted\":false,\"id\":5926367,\"ignored\":false,\"lsKind\":\"scientist\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_scientist\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729702585,\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926372,\"ignored\":false,\"lsKind\":\"purity\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_purity\",\"numericValue\":129,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729708062,\"unitKind\":\"% purity\",\"unitType\":\"percentage\",\"unitTypeAndKind\":\"percentage_% purity\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"id\":5926371,\"ignored\":false,\"lsKind\":\"hplc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_hplc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926364,\"ignored\":false,\"lsKind\":\"notebook\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729703953,\"stringValue\":\"test\",\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926366,\"ignored\":false,\"lsKind\":\"source id\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_source id\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729702610,\"stringValue\":\"test source id\",\"unitTypeAndKind\":\"null_null\"}],\"recordedBy\":\"jane\",\"recordedDate\":1424729720940},{\"deleted\":false,\"id\":2634315,\"ignored\":false,\"lsKind\":\"inventory\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_inventory\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926362,\"ignored\":false,\"lsKind\":\"location\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_location\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729705505,\"stringValue\":\"123\",\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926363,\"ignored\":false,\"lsKind\":\"amount made\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_amount made\",\"numericValue\":1123,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729706303,\"unitKind\":\"g\",\"unitType\":\"mass\",\"unitTypeAndKind\":\"mass_g\"}],\"recordedBy\":\"jane\",\"recordedDate\":1424729720940}],\"lsType\":\"batch\",\"lsTypeAndKind\":\"batch_protein\",\"recordedBy\":\"jane\",\"recordedDate\":1424730027913},\"id\":1493853,\"ignored\":false,\"lsKind\":\"batch_parent\",\"lsType\":\"instantiates\",\"lsTypeAndKind\":\"instantiates_batch_parent\",\"recordedBy\":\"jane\",\"recordedDate\":1424730027913}],\"id\":1493851,\"ignored\":false,\"lsKind\":\"protein\",\"lsLabels\":[{\"deleted\":false,\"id\":297595,\"ignored\":false,\"labelText\":\"Fielderase Z\",\"lsKind\":\"protein\",\"lsTransaction\":9999,\"lsType\":\"name\",\"lsTypeAndKind\":\"name_protein\",\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"jane\",\"recordedDate\":1375141504000}],\"lsStates\":[{\"deleted\":false,\"id\":2634314,\"ignored\":false,\"lsKind\":\"protein parent\",\"lsTransaction\":9999,\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_protein parent\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926359,\"ignored\":false,\"lsKind\":\"notebook\",\"lsTransaction\":9999,\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"stringValue\":\"Notebook 1\",\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926361,\"ignored\":false,\"lsKind\":\"molecular weight\",\"lsTransaction\":9999,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_molecular weight\",\"numericValue\":890,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"unitKind\":\"g/mol\",\"unitType\":\"molecular weight\",\"unitTypeAndKind\":\"molecular weight_g/mol\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5926360,\"ignored\":false,\"lsKind\":\"batch number\",\"lsTransaction\":9999,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_batch number\",\"numericValue\":0,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"unitTypeAndKind\":\"null_null\"},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1342080000000,\"deleted\":false,\"id\":5926358,\"ignored\":false,\"lsKind\":\"completion date\",\"lsTransaction\":9999,\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"jane\",\"recordedDate\":1363388477000,\"unitTypeAndKind\":\"null_null\"}],\"recordedBy\":\"jane\",\"recordedDate\":1375141460000}],\"lsTags\":[],\"lsTransaction\":9999,\"lsType\":\"parent\",\"lsTypeAndKind\":\"parent_protein\",\"recordedBy\":\"jane\",\"recordedDate\":1375141508000,\"secondLsThings\":[]}";
 		LsThing lsThing = LsThing.fromJsonToLsThing(json);
 		LsThing savedLsThing = lsThingService.updateLsThing(lsThing);
 		logger.info(savedLsThing.toJsonWithNestedFull());
@@ -493,18 +572,69 @@ public void updateParentAndBatch() {
 	@Test
 	@Transactional
 	public void toJsonWithNested() {
-//		String json = "{\"codeName\": null,\"firstLsThings\": [{\"deleted\": false,\"firstLsThing\": {\"codeName\": \"PRTN-000012-1\",\"deleted\": false,\"ignored\": false,\"lsKind\": \"protein\",\"lsType\": \"batch\",\"lsTypeAndKind\": \"batch_protein\",\"recordedBy\": \"bob\",\"recordedDate\": 1424730027913,\"version\": null},\"id\": null,\"ignored\": false,\"lsKind\": \"batch_parent\",\"lsType\": \"instantiates\",\"lsTypeAndKind\": \"instantiates_batch_parent\",\"recordedBy\": \"bob\",\"recordedDate\": 1424730027913,\"version\": null}],\"ignored\": false,\"lsKind\": \"protein\",\"lsLabels\": [{ \"ignored\": false,\"imageFile\": null,\"labelText\": \"Fielderase\",\"lsKind\": \"protein\",\"lsTransaction\": 1,\"lsType\": \"name\",\"lsTypeAndKind\": \"name_protein\",\"modifiedDate\": null,\"physicallyLabled\": false,\"preferred\": true,\"recordedBy\": \"jane\",\"recordedDate\": 1375141504000}],\"lsStates\": [{ \"comments\": null,\"ignored\": false,\"lsKind\": \"protein parent\",\"lsTransaction\": 1,\"lsType\": \"metadata\",\"lsTypeAndKind\": \"metadata_protein parent\",\"lsValues\": [{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": 1342080000000, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"completion date\", \"lsTransaction\": 128, \"lsType\": \"dateValue\", \"lsTypeAndKind\": \"dateValue_completion date\", \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"notebook\", \"lsTransaction\": 127, \"lsType\": \"stringValue\", \"lsTypeAndKind\": \"stringValue_notebook\", \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": \"Notebook 1\", \"uncertainty\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"molecular weight\", \"lsTransaction\": 128, \"lsType\": \"numericValue\", \"lsTypeAndKind\": \"numericValue_molecular weight\", \"modifiedDate\": null, \"numericValue\": 231, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"unitKind\": \"g/mol\", \"unitType\": \"molecular weight\", \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"batch number\", \"lsTransaction\": 128, \"lsType\": \"numericValue\", \"lsTypeAndKind\": \"numericValue_batch number\", \"modifiedDate\": null, \"numericValue\": 0, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"unitKind\": null, \"unitType\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null} ],\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\": 1375141460000}],\"lsTransaction\": 1,\"lsType\": \"parent\",\"lsTypeAndKind\": \"parent_protein\",\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\": 1375141508000,\"shortDescription\": \" \"}";
-    	String json = "{\"codeName\": null,\"firstLsThings\": [{\"deleted\": false,\"firstLsThing\": {\"codeName\": \"PRTN-000013-1\",\"deleted\": false,\"ignored\": false,\"lsKind\": \"protein\",\"lsStates\":[{\"deleted\":false,\"ignored\":false,\"lsKind\":\"inventory\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_inventory\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"location\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_location\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729705505,\"stringValue\":\"123\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"amount made\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_amount made\",\"numericValue\":1123,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729706303,\"unitKind\":\"g\",\"unitType\":\"mass\",\"unitTypeAndKind\":\"mass_g\",\"version\":0}],\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"version\":1},{\"deleted\":false,\"ignored\":false,\"lsKind\":\"protein batch\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_protein batch\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"hplc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_hplc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeOrigin\":\"ACAS authors\",\"codeTypeAndKind\":\"null_null\",\"codeValue\":\"egao\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"scientist\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_scientist\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729702585,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"DeleteExperimentInstructions (6).pdf\",\"ignored\":false,\"lsKind\":\"gpc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_gpc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1424678400000,\"deleted\":false,\"ignored\":false,\"lsKind\":\"completion date\",\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729703242,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"ms\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_ms\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeKind\":\"source\",\"codeOrigin\":\"ACAS DDICT\",\"codeType\":\"component\",\"codeTypeAndKind\":\"component_source\",\"codeValue\":\"ACAS\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"source\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_source\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729672870,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"purity\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_purity\",\"numericValue\":129,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729708062,\"unitKind\":\"% purity\",\"unitType\":\"percentage\",\"unitTypeAndKind\":\"percentage_% purity\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"nmr\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_nmr\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"notebook\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729703953,\"stringValue\":\"test\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"source id\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_source id\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729702610,\"stringValue\":\"\",\"unitTypeAndKind\":\"null_null\",\"version\":0}],\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"version\":1}],\"lsType\": \"batch\",\"lsTypeAndKind\": \"batch_protein\",\"recordedBy\": \"jane\",\"recordedDate\": 1424730027913,\"version\": null},\"id\": null,\"ignored\": false,\"lsKind\": \"batch_parent\",\"lsType\": \"instantiates\",\"lsTypeAndKind\": \"instantiates_batch_parent\",\"recordedBy\": \"jane\",\"recordedDate\": 1424730027913,\"version\": null}],\"ignored\": false,\"lsKind\": \"protein\",\"lsLabels\": [{ \"ignored\": false,\"imageFile\": null,\"labelText\": \"Fielderase\",\"lsKind\": \"protein\",\"lsTransaction\": 9999,\"lsType\": \"name\",\"lsTypeAndKind\": \"name_protein\",\"modifiedDate\": null,\"physicallyLabled\": false,\"preferred\": true,\"recordedBy\": \"jane\",\"recordedDate\": 1375141504000}],\"lsStates\": [{ \"comments\": null,\"ignored\": false,\"lsKind\": \"protein parent\",\"lsTransaction\": 9999,\"lsType\": \"metadata\",\"lsTypeAndKind\": \"metadata_protein parent\",\"lsValues\": [{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": 1342080000000, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"completion date\", \"lsTransaction\": 9999, \"lsType\": \"dateValue\", \"lsTypeAndKind\": \"dateValue_completion date\", \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"notebook\", \"lsTransaction\": 9999, \"lsType\": \"stringValue\", \"lsTypeAndKind\": \"stringValue_notebook\", \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": \"Notebook 1\", \"uncertainty\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"molecular weight\", \"lsTransaction\": 9999, \"lsType\": \"numericValue\", \"lsTypeAndKind\": \"numericValue_molecular weight\", \"modifiedDate\": null, \"numericValue\": 231, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"unitKind\": \"g/mol\", \"unitType\": \"molecular weight\", \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"batch number\", \"lsTransaction\": 9999, \"lsType\": \"numericValue\", \"lsTypeAndKind\": \"numericValue_batch number\", \"modifiedDate\": null, \"numericValue\": 0, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"unitKind\": null, \"unitType\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null} ],\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\": 1375141460000}],\"lsTransaction\": 9999,\"lsType\": \"parent\",\"lsTypeAndKind\": \"parent_protein\",\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\": 1375141508000,\"shortDescription\": \" \"}";
+		// String json = "{\"codeName\": null,\"firstLsThings\": [{\"deleted\":
+		// false,\"firstLsThing\": {\"codeName\": \"PRTN-000012-1\",\"deleted\":
+		// false,\"ignored\": false,\"lsKind\": \"protein\",\"lsType\":
+		// \"batch\",\"lsTypeAndKind\": \"batch_protein\",\"recordedBy\":
+		// \"bob\",\"recordedDate\": 1424730027913,\"version\": null},\"id\":
+		// null,\"ignored\": false,\"lsKind\": \"batch_parent\",\"lsType\":
+		// \"instantiates\",\"lsTypeAndKind\":
+		// \"instantiates_batch_parent\",\"recordedBy\": \"bob\",\"recordedDate\":
+		// 1424730027913,\"version\": null}],\"ignored\": false,\"lsKind\":
+		// \"protein\",\"lsLabels\": [{ \"ignored\": false,\"imageFile\":
+		// null,\"labelText\": \"Fielderase\",\"lsKind\": \"protein\",\"lsTransaction\":
+		// 1,\"lsType\": \"name\",\"lsTypeAndKind\": \"name_protein\",\"modifiedDate\":
+		// null,\"physicallyLabled\": false,\"preferred\": true,\"recordedBy\":
+		// \"jane\",\"recordedDate\": 1375141504000}],\"lsStates\": [{ \"comments\":
+		// null,\"ignored\": false,\"lsKind\": \"protein parent\",\"lsTransaction\":
+		// 1,\"lsType\": \"metadata\",\"lsTypeAndKind\": \"metadata_protein
+		// parent\",\"lsValues\": [{\"clobValue\": null, \"codeValue\": null,
+		// \"comments\": null, \"dateValue\": 1342080000000, \"fileValue\": null,
+		// \"ignored\": false, \"lsKind\": \"completion date\", \"lsTransaction\": 128,
+		// \"lsType\": \"dateValue\", \"lsTypeAndKind\": \"dateValue_completion date\",
+		// \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true,
+		// \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null,
+		// \"stringValue\": null, \"uncertainty\": null, \"urlValue\": null,
+		// \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null,
+		// \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\":
+		// null, \"ignored\": false, \"lsKind\": \"notebook\", \"lsTransaction\": 127,
+		// \"lsType\": \"stringValue\", \"lsTypeAndKind\": \"stringValue_notebook\",
+		// \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true,
+		// \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null,
+		// \"stringValue\": \"Notebook 1\", \"uncertainty\": null, \"urlValue\": null,
+		// \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null,
+		// \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\":
+		// null, \"ignored\": false, \"lsKind\": \"molecular weight\",
+		// \"lsTransaction\": 128, \"lsType\": \"numericValue\", \"lsTypeAndKind\":
+		// \"numericValue_molecular weight\", \"modifiedDate\": null, \"numericValue\":
+		// 231, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\":
+		// 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\":
+		// null, \"unitKind\": \"g/mol\", \"unitType\": \"molecular weight\",
+		// \"urlValue\": null, \"valueOperator\": null, \"valueUnit\":
+		// null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null,
+		// \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\":
+		// \"batch number\", \"lsTransaction\": 128, \"lsType\": \"numericValue\",
+		// \"lsTypeAndKind\": \"numericValue_batch number\", \"modifiedDate\": null,
+		// \"numericValue\": 0, \"publicData\": true, \"recordedBy\": \"jane\",
+		// \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null,
+		// \"uncertainty\": null, \"unitKind\": null, \"unitType\": null, \"urlValue\":
+		// null, \"valueOperator\": null, \"valueUnit\": null} ],\"modifiedBy\":
+		// null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\":
+		// 1375141460000}],\"lsTransaction\": 1,\"lsType\":
+		// \"parent\",\"lsTypeAndKind\": \"parent_protein\",\"modifiedBy\":
+		// null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\":
+		// 1375141508000,\"shortDescription\": \" \"}";
+		String json = "{\"codeName\": null,\"firstLsThings\": [{\"deleted\": false,\"firstLsThing\": {\"codeName\": \"PRTN-000013-1\",\"deleted\": false,\"ignored\": false,\"lsKind\": \"protein\",\"lsStates\":[{\"deleted\":false,\"ignored\":false,\"lsKind\":\"inventory\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_inventory\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"location\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_location\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729705505,\"stringValue\":\"123\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"amount made\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_amount made\",\"numericValue\":1123,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729706303,\"unitKind\":\"g\",\"unitType\":\"mass\",\"unitTypeAndKind\":\"mass_g\",\"version\":0}],\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"version\":1},{\"deleted\":false,\"ignored\":false,\"lsKind\":\"protein batch\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_protein batch\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"hplc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_hplc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeOrigin\":\"ACAS authors\",\"codeTypeAndKind\":\"null_null\",\"codeValue\":\"egao\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"scientist\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_scientist\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729702585,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"DeleteExperimentInstructions (6).pdf\",\"ignored\":false,\"lsKind\":\"gpc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_gpc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1424678400000,\"deleted\":false,\"ignored\":false,\"lsKind\":\"completion date\",\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729703242,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"ms\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_ms\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeKind\":\"source\",\"codeOrigin\":\"ACAS DDICT\",\"codeType\":\"component\",\"codeTypeAndKind\":\"component_source\",\"codeValue\":\"ACAS\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"source\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_source\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729672870,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"purity\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_purity\",\"numericValue\":129,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729708062,\"unitKind\":\"% purity\",\"unitType\":\"percentage\",\"unitTypeAndKind\":\"percentage_% purity\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"fileValue\":\"\",\"ignored\":false,\"lsKind\":\"nmr\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_nmr\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"notebook\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729703953,\"stringValue\":\"test\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"ignored\":false,\"lsKind\":\"source id\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_source id\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"jane\",\"recordedDate\":1424729702610,\"stringValue\":\"\",\"unitTypeAndKind\":\"null_null\",\"version\":0}],\"recordedBy\":\"jane\",\"recordedDate\":1424729720940,\"version\":1}],\"lsType\": \"batch\",\"lsTypeAndKind\": \"batch_protein\",\"recordedBy\": \"jane\",\"recordedDate\": 1424730027913,\"version\": null},\"id\": null,\"ignored\": false,\"lsKind\": \"batch_parent\",\"lsType\": \"instantiates\",\"lsTypeAndKind\": \"instantiates_batch_parent\",\"recordedBy\": \"jane\",\"recordedDate\": 1424730027913,\"version\": null}],\"ignored\": false,\"lsKind\": \"protein\",\"lsLabels\": [{ \"ignored\": false,\"imageFile\": null,\"labelText\": \"Fielderase\",\"lsKind\": \"protein\",\"lsTransaction\": 9999,\"lsType\": \"name\",\"lsTypeAndKind\": \"name_protein\",\"modifiedDate\": null,\"physicallyLabled\": false,\"preferred\": true,\"recordedBy\": \"jane\",\"recordedDate\": 1375141504000}],\"lsStates\": [{ \"comments\": null,\"ignored\": false,\"lsKind\": \"protein parent\",\"lsTransaction\": 9999,\"lsType\": \"metadata\",\"lsTypeAndKind\": \"metadata_protein parent\",\"lsValues\": [{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": 1342080000000, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"completion date\", \"lsTransaction\": 9999, \"lsType\": \"dateValue\", \"lsTypeAndKind\": \"dateValue_completion date\", \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"notebook\", \"lsTransaction\": 9999, \"lsType\": \"stringValue\", \"lsTypeAndKind\": \"stringValue_notebook\", \"modifiedDate\": null, \"numericValue\": null, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": \"Notebook 1\", \"uncertainty\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"molecular weight\", \"lsTransaction\": 9999, \"lsType\": \"numericValue\", \"lsTypeAndKind\": \"numericValue_molecular weight\", \"modifiedDate\": null, \"numericValue\": 231, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"unitKind\": \"g/mol\", \"unitType\": \"molecular weight\", \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null},{\"clobValue\": null, \"codeValue\": null, \"comments\": null, \"dateValue\": null, \"fileValue\": null, \"ignored\": false, \"lsKind\": \"batch number\", \"lsTransaction\": 9999, \"lsType\": \"numericValue\", \"lsTypeAndKind\": \"numericValue_batch number\", \"modifiedDate\": null, \"numericValue\": 0, \"publicData\": true, \"recordedBy\": \"jane\", \"recordedDate\": 1363388477000, \"sigFigs\": null, \"stringValue\": null, \"uncertainty\": null, \"unitKind\": null, \"unitType\": null, \"urlValue\": null, \"valueOperator\": null, \"valueUnit\": null} ],\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\": 1375141460000}],\"lsTransaction\": 9999,\"lsType\": \"parent\",\"lsTypeAndKind\": \"parent_protein\",\"modifiedBy\": null,\"modifiedDate\": null,\"recordedBy\": \"jane\",\"recordedDate\": 1375141508000,\"shortDescription\": \" \"}";
 		LsThing lsThing = LsThing.fromJsonToLsThing(json);
-		logger.info("JSON: "+lsThing.toJson());
-		logger.info("JSON Stub: "+lsThing.toJsonStub());
-		logger.info("JSON Nested with Stubs: "+lsThing.toJsonWithNestedStubs());
-		logger.info("JSON Nested with Full: "+lsThing.toJsonWithNestedFull());
+		logger.info("JSON: " + lsThing.toJson());
+		logger.info("JSON Stub: " + lsThing.toJsonStub());
+		logger.info("JSON Nested with Stubs: " + lsThing.toJsonWithNestedStubs());
+		logger.info("JSON Nested with Full: " + lsThing.toJsonWithNestedFull());
 	}
-	
+
 	@Test
 	@Transactional
-	public void updateBatchInteractions(){
+	public void updateBatchInteractions() {
 		String json = "{\"lsType\":\"batch\",\"lsKind\":\"internalization agent\",\"corpName\":\"\",\"recordedBy\":\"bob\",\"recordedDate\":1428517111212,\"shortDescription\":\" \",\"lsLabels\":[],\"lsStates\":[{\"deleted\":false,\"id\":2649027,\"ignored\":false,\"lsKind\":\"internalization agent batch\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_internalization agent batch\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960432,\"ignored\":false,\"lsKind\":\"notebook\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"stringValue\":\"test\",\"unitTypeAndKind\":\"null_null\",\"version\":0,\"value\":\"test\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960435,\"ignored\":false,\"lsKind\":\"molecular weight\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_molecular weight\",\"numericValue\":123,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"unitKind\":\"kDa\",\"unitType\":\"molecular weight\",\"unitTypeAndKind\":\"molecular weight_kDa\",\"version\":0,\"value\":123},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960433,\"ignored\":true,\"lsKind\":\"purity\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_purity\",\"numericValue\":12,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"unitKind\":\"% purity\",\"unitType\":\"percentage\",\"unitTypeAndKind\":\"percentage_% purity\",\"version\":0,\"value\":121},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1428476400000,\"deleted\":false,\"id\":5960434,\"ignored\":false,\"lsKind\":\"completion date\",\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"unitTypeAndKind\":\"null_null\",\"version\":0,\"value\":1428476400000},{\"codeOrigin\":\"ACAS authors\",\"codeTypeAndKind\":\"null_null\",\"codeValue\":\"egao\",\"deleted\":false,\"id\":5960438,\"ignored\":false,\"lsKind\":\"scientist\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_scientist\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"unitTypeAndKind\":\"null_null\",\"version\":0,\"value\":\"egao\"},{\"codeTypeAndKind\":\"null_null\",\"comments\":\"Testing (46).pdf\",\"deleted\":false,\"fileValue\":\"entities/internalizationAgents/I000012-6/Testing (46).pdf\",\"id\":5960439,\"ignored\":false,\"lsKind\":\"gpc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_gpc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"unitTypeAndKind\":\"null_null\",\"version\":1},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960436,\"ignored\":false,\"lsKind\":\"source id\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_source id\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"stringValue\":\"\",\"unitTypeAndKind\":\"null_null\",\"version\":0,\"value\":\"\"},{\"codeKind\":\"source\",\"codeOrigin\":\"ACAS DDICT\",\"codeType\":\"component\",\"codeTypeAndKind\":\"component_source\",\"codeValue\":\"ACAS\",\"deleted\":false,\"id\":5960437,\"ignored\":false,\"lsKind\":\"source\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_source\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"unitTypeAndKind\":\"null_null\",\"version\":0,\"value\":\"ACAS\"},{\"lsType\":\"numericValue\",\"lsKind\":\"purity\",\"ignored\":false,\"recordedDate\":1428517111212,\"recordedBy\":\"bob\",\"numericValue\":121,\"value\":121}],\"modifiedDate\":1428517031912,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"version\":2},{\"deleted\":false,\"id\":2649026,\"ignored\":false,\"lsKind\":\"inventory\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_inventory\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960430,\"ignored\":false,\"lsKind\":\"location\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_location\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"stringValue\":\"13\",\"unitTypeAndKind\":\"null_null\",\"version\":0,\"value\":\"13\"},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960431,\"ignored\":false,\"lsKind\":\"amount made\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_amount made\",\"numericValue\":23,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"unitKind\":\"g\",\"unitType\":\"mass\",\"unitTypeAndKind\":\"mass_g\",\"version\":0,\"value\":23}],\"modifiedDate\":1428517031934,\"recordedBy\":\"bob\",\"recordedDate\":1428517031603,\"version\":2}],\"codeName\":\"I000012-6\",\"deleted\":false,\"id\":1508706,\"ignored\":false,\"lsTags\":[],\"lsTypeAndKind\":\"batch_internalization agent\",\"modifiedDate\":1428517031909,\"version\":3,\"cid\":\"c346\",\"_changing\":false,\"_previousAttributes\":{\"lsType\":\"thing\",\"lsKind\":\"thing\",\"corpName\":\"\",\"recordedBy\":\"bob\",\"recordedDate\":1428517037610,\"shortDescription\":\" \",\"lsLabels\":[],\"lsStates\":[],\"firstLsThings\":[]},\"changed\":{\"secondLsThings\":[]},\"_pending\":false,\"urlRoot\":\"/api/things/batch/internalization agent\",\"lsProperties\":{\"defaultLabels\":[],\"defaultValues\":[{\"key\":\"scientist\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent batch\",\"type\":\"codeValue\",\"kind\":\"scientist\",\"codeOrigin\":\"ACAS authors\",\"value\":\"unassigned\"},{\"key\":\"completion date\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent batch\",\"type\":\"dateValue\",\"kind\":\"completion date\"},{\"key\":\"notebook\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent batch\",\"type\":\"stringValue\",\"kind\":\"notebook\"},{\"key\":\"source\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent batch\",\"type\":\"codeValue\",\"kind\":\"source\",\"value\":\"ACAS\",\"codeType\":\"component\",\"codeKind\":\"source\",\"codeOrigin\":\"ACAS DDICT\"},{\"key\":\"source id\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent batch\",\"type\":\"stringValue\",\"kind\":\"source id\"},{\"key\":\"molecular weight\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent batch\",\"type\":\"numericValue\",\"kind\":\"molecular weight\",\"unitType\":\"molecular weight\",\"unitKind\":\"kDa\"},{\"key\":\"purity\",\"stateType\":\"metadata\",\"stateKind\":\"internalization agent batch\",\"type\":\"numericValue\",\"kind\":\"purity\",\"unitType\":\"percentage\",\"unitKind\":\"% purity\"},{\"key\":\"amount made\",\"stateType\":\"metadata\",\"stateKind\":\"inventory\",\"type\":\"numericValue\",\"kind\":\"amount made\",\"unitType\":\"mass\",\"unitKind\":\"g\"},{\"key\":\"location\",\"stateType\":\"metadata\",\"stateKind\":\"inventory\",\"type\":\"stringValue\",\"kind\":\"location\"}],\"defaultFirstLsThingItx\":[],\"defaultSecondLsThingItx\":[]},\"className\":\"Thing\",\"validationError\":null,\"idAttribute\":\"id\",\"firstLsThings\":[],\"secondLsThings\":[{\"lsType\":\"incorporates\",\"lsKind\":\"assembly_component\",\"lsTypeAndKind\":\"incorporates_assembly_component\",\"lsStates\":[{\"lsType\":\"metadata\",\"lsKind\":\"composition\",\"lsValues\":[{\"lsType\":\"numericValue\",\"lsKind\":\"order\",\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\",\"numericValue\":1}],\"ignored\":false,\"recordedDate\":null,\"recordedBy\":\"\"}],\"recordedBy\":\"bob\",\"recordedDate\":1428517111206,\"secondLsThing\":{\"codeName\":\"PEG000010-2\",\"deleted\":false,\"id\":1508673,\"ignored\":false,\"lsKind\":\"peg\",\"lsLabels\":[],\"lsStates\":[{\"deleted\":false,\"id\":2648998,\"ignored\":false,\"lsKind\":\"inventory\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_inventory\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960363,\"ignored\":false,\"lsKind\":\"location\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_location\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"stringValue\":\"lab23\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960364,\"ignored\":false,\"lsKind\":\"amount made\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_amount made\",\"numericValue\":123,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"unitKind\":\"g\",\"unitType\":\"mass\",\"unitTypeAndKind\":\"mass_g\",\"version\":0}],\"modifiedDate\":1428516368847,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"version\":7},{\"deleted\":false,\"id\":2648997,\"ignored\":false,\"lsKind\":\"peg batch\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_peg batch\",\"lsValues\":[{\"codeOrigin\":\"ACAS authors\",\"codeTypeAndKind\":\"null_null\",\"codeValue\":\"egao\",\"deleted\":false,\"id\":5960362,\"ignored\":false,\"lsKind\":\"scientist\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_scientist\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960361,\"ignored\":false,\"lsKind\":\"purity\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_purity\",\"numericValue\":123,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"unitKind\":\"% purity\",\"unitType\":\"percentage\",\"unitTypeAndKind\":\"percentage_% purity\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1428390000000,\"deleted\":false,\"id\":5960360,\"ignored\":false,\"lsKind\":\"completion date\",\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960358,\"ignored\":false,\"lsKind\":\"notebook\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"stringValue\":\"test\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960357,\"ignored\":false,\"lsKind\":\"source id\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_source id\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"stringValue\":\"\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeKind\":\"source\",\"codeOrigin\":\"ACAS DDICT\",\"codeType\":\"component\",\"codeTypeAndKind\":\"component_source\",\"codeValue\":\"ACAS\",\"deleted\":false,\"id\":5960359,\"ignored\":false,\"lsKind\":\"source\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_source\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeTypeAndKind\":\"null_null\",\"comments\":\"Testing (45).pdf\",\"deleted\":false,\"fileValue\":\"entities/pegs/PEG000010-2/Testing (45).pdf\",\"id\":5960356,\"ignored\":false,\"lsKind\":\"gpc\",\"lsType\":\"fileValue\",\"lsTypeAndKind\":\"fileValue_gpc\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"unitTypeAndKind\":\"null_null\",\"version\":1}],\"modifiedDate\":1428516368853,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"version\":7}],\"lsTags\":[],\"lsType\":\"batch\",\"lsTypeAndKind\":\"batch_peg\",\"modifiedDate\":1428516368844,\"recordedBy\":\"bob\",\"recordedDate\":1428447081473,\"version\":8},\"className\":\"SecondThingItx\",\"validationError\":null,\"idAttribute\":\"id\"},{\"lsType\":\"incorporates\",\"lsKind\":\"assembly_component\",\"lsTypeAndKind\":\"incorporates_assembly_component\",\"lsStates\":[{\"deleted\":false,\"id\":2649029,\"ignored\":false,\"lsKind\":\"composition\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_composition\",\"lsValues\":[{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":5960441,\"ignored\":false,\"lsKind\":\"order\",\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_order\",\"numericValue\":1,\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"\",\"recordedDate\":1428517031733,\"unitTypeAndKind\":\"null_null\",\"version\":0}],\"recordedBy\":\"\",\"recordedDate\":1428517031732,\"version\":1}],\"recordedBy\":\"bob\",\"recordedDate\":1428517031598,\"secondLsThing\":{\"codeName\":\"PEG000010-1\",\"deleted\":false,\"id\":1442921,\"ignored\":false,\"lsKind\":\"peg\",\"lsType\":\"batch\",\"lsTypeAndKind\":\"batch_peg\",\"modifiedDate\":1428516368872,\"recordedBy\":\"bob\",\"recordedDate\":1426100366796,\"version\":14},\"deleted\":false,\"id\":1508708,\"ignored\":true,\"version\":1,\"className\":\"SecondThingItx\",\"validationError\":null,\"idAttribute\":\"id\"}]}";
 		LsThing lsThing = LsThing.fromJsonToLsThing(json);
 		LsThing updatedLsThing = lsThingService.updateLsThing(lsThing);
@@ -512,15 +642,15 @@ public void updateBatchInteractions(){
 		Assert.assertEquals(2, updatedLsThing.getSecondLsThings().size());
 		Assert.assertEquals(1, updatedLsThing.getSecondLsThings().iterator().next().getLsStates().size());
 	}
-	
+
 	@Test
 	@Transactional
-	public void sortLsThingsByCodeName(){
+	public void sortLsThingsByCodeName() {
 		createLsThingStack();
 		LsThing thing1 = LsThing.findLsThingsByCodeNameEquals("THING-01").getSingleResult();
 		LsThing thing2 = LsThing.findLsThingsByCodeNameEquals("THING-02").getSingleResult();
 		LsThing thing3 = LsThing.findLsThingsByCodeNameEquals("THING-03").getSingleResult();
-		
+
 		List<LsThing> lsThings = new ArrayList<LsThing>();
 		lsThings.add(thing2);
 		lsThings.add(thing3);
@@ -529,20 +659,20 @@ public void sortLsThingsByCodeName(){
 		lsThingService.sortLsThingsByCodeName(lsThings);
 		logger.info(LsThing.toJsonArrayStub(lsThings));
 		int num = 1;
-		for (LsThing lsThing : lsThings){
-			Assert.assertEquals("THING-0"+num, lsThing.getCodeName());
+		for (LsThing lsThing : lsThings) {
+			Assert.assertEquals("THING-0" + num, lsThing.getCodeName());
 			num++;
 		}
 	}
-	
+
 	@Test
 	@Transactional
-	public void sortLsThingsByBatchNumber(){
+	public void sortLsThingsByBatchNumber() {
 		createLsThingStack();
 		LsThing thing1 = LsThing.findLsThingsByCodeNameEquals("THING-01").getSingleResult();
 		LsThing thing2 = LsThing.findLsThingsByCodeNameEquals("THING-02").getSingleResult();
 		LsThing thing3 = LsThing.findLsThingsByCodeNameEquals("THING-03").getSingleResult();
-		
+
 		Collection<LsThing> lsThings = new ArrayList<LsThing>();
 		lsThings.add(thing2);
 		lsThings.add(thing3);
@@ -551,101 +681,103 @@ public void sortLsThingsByBatchNumber(){
 		lsThings = lsThingService.sortBatches(lsThings);
 		logger.info(LsThing.toJsonArrayStub(lsThings));
 		int num = 1;
-		for (LsThing lsThing : lsThings){
-			Assert.assertEquals("THING-0"+num, lsThing.getCodeName());
+		for (LsThing lsThing : lsThings) {
+			Assert.assertEquals("THING-0" + num, lsThing.getCodeName());
 			num++;
 		}
 	}
-	
+
 	@Transactional
 	@Test
 	public void lsThingBrowserSearchTestWithQuotes() {
 		String query = "Ad 2";
-		logger.info("Searching with the query: "+ query);
+		logger.info("Searching with the query: " + query);
 		Collection<LsThing> resultLsThings = lsThingService.findLsThingsByGenericMetaDataSearch(query);
-//		logger.info("Found: "+ resultLsThings.toString());
-		logger.info("Number of results: "+resultLsThings.size());
+		// logger.info("Found: "+ resultLsThings.toString());
+		logger.info("Number of results: " + resultLsThings.size());
 		Assert.assertTrue(resultLsThings.size() > 1);
 		query = "\"LSM 2\"";
-		logger.info("Searching with the query: "+ query);
+		logger.info("Searching with the query: " + query);
 		Collection<LsThing> resultLsThings2 = lsThingService.findLsThingsByGenericMetaDataSearch(query);
-//		logger.info("Found: "+ resultLsThings.toString());
-		logger.info("Number of results: "+resultLsThings2.size());
+		// logger.info("Found: "+ resultLsThings.toString());
+		logger.info("Number of results: " + resultLsThings2.size());
 		Assert.assertTrue(resultLsThings2.size() < resultLsThings.size());
 	}
-	
+
 	@Transactional
 	@Test
 	public void lsThingBrowserSearchByName() {
-		//testing partial match and case sensitivity
+		// testing partial match and case sensitivity
 		String query = "CDAP(PEG2k)20";
-		logger.info("Searching with the query: "+ query);
+		logger.info("Searching with the query: " + query);
 		Collection<LsThing> resultLsThings = lsThingService.findLsThingsByGenericMetaDataSearch(query);
-//		logger.info("Found: "+ resultLsThings.toString());
-		logger.info("Number of results: "+resultLsThings.size());
+		// logger.info("Found: "+ resultLsThings.toString());
+		logger.info("Number of results: " + resultLsThings.size());
 		Assert.assertTrue(resultLsThings.size() > 1);
 		query = "CDAP";
-		logger.info("Searching with the query: "+ query);
+		logger.info("Searching with the query: " + query);
 		resultLsThings = lsThingService.findLsThingsByGenericMetaDataSearch(query);
-//		logger.info("Found: "+ resultLsThings.toString());
-		logger.info("Number of results: "+resultLsThings.size());
+		// logger.info("Found: "+ resultLsThings.toString());
+		logger.info("Number of results: " + resultLsThings.size());
 		Assert.assertTrue(resultLsThings.size() > 1);
 		query = "cdap(peg2k)20";
-		logger.info("Searching with the query: "+ query);
+		logger.info("Searching with the query: " + query);
 		resultLsThings = lsThingService.findLsThingsByGenericMetaDataSearch(query);
-//		logger.info("Found: "+ resultLsThings.toString());
-		logger.info("Number of results: "+resultLsThings.size());
+		// logger.info("Found: "+ resultLsThings.toString());
+		logger.info("Number of results: " + resultLsThings.size());
 		Assert.assertTrue(resultLsThings.size() > 1);
 		query = "cdap";
-		logger.info("Searching with the query: "+ query);
+		logger.info("Searching with the query: " + query);
 		resultLsThings = lsThingService.findLsThingsByGenericMetaDataSearch(query);
-//		logger.info("Found: "+ resultLsThings.toString());
-		logger.info("Number of results: "+resultLsThings.size());
+		// logger.info("Found: "+ resultLsThings.toString());
+		logger.info("Number of results: " + resultLsThings.size());
 		Assert.assertTrue(resultLsThings.size() > 1);
 	}
-	
+
 	@Test
 	public void getCodeNameFromCodeNameRequest() {
 		PreferredNameRequestDTO requestDTO = new PreferredNameRequestDTO();
 		Collection<PreferredNameDTO> requests = new HashSet<PreferredNameDTO>();
-		String codeName="LSM000001";
+		String codeName = "LSM000001";
 		requests.add(new PreferredNameDTO(codeName, null, null));
 		requests.add(new PreferredNameDTO("NOT-A-CODE-NAME", null, null));
 		requestDTO.setRequests(requests);
-        PreferredNameResultsDTO results = lsThingService.getCodeNameFromName("parent", "linker small molecule", "codeName", "codeName", requestDTO);
-        Assert.assertEquals(2, results.getResults().size());
-        for (PreferredNameDTO result : results.getResults()){
-        	if (result.getRequestName().equals(codeName)){
-        		Assert.assertEquals(codeName, result.getPreferredName());
-        		Assert.assertEquals(codeName, result.getReferenceName());
-        	}else {
-        		Assert.assertEquals("", result.getPreferredName());
-        		Assert.assertEquals("", result.getReferenceName());
-        	}
-        }
-	}
-	
+		PreferredNameResultsDTO results = lsThingService.getCodeNameFromName("parent", "linker small molecule",
+				"codeName", "codeName", requestDTO);
+		Assert.assertEquals(2, results.getResults().size());
+		for (PreferredNameDTO result : results.getResults()) {
+			if (result.getRequestName().equals(codeName)) {
+				Assert.assertEquals(codeName, result.getPreferredName());
+				Assert.assertEquals(codeName, result.getReferenceName());
+			} else {
+				Assert.assertEquals("", result.getPreferredName());
+				Assert.assertEquals("", result.getReferenceName());
+			}
+		}
+	}
+
 	@Test
 	public void getCodeNameFromCodeNameRequestNoLabelTypeKind() {
 		PreferredNameRequestDTO requestDTO = new PreferredNameRequestDTO();
 		Collection<PreferredNameDTO> requests = new HashSet<PreferredNameDTO>();
-		String codeName="LSM000001";
+		String codeName = "LSM000001";
 		requests.add(new PreferredNameDTO(codeName, null, null));
 		requests.add(new PreferredNameDTO("NOT-A-CODE-NAME", null, null));
 		requestDTO.setRequests(requests);
-        PreferredNameResultsDTO results = lsThingService.getCodeNameFromName("parent", "linker small molecule", null, null, requestDTO);
-        Assert.assertEquals(2, results.getResults().size());
-        for (PreferredNameDTO result : results.getResults()){
-        	if (result.getRequestName().equals(codeName)){
-        		Assert.assertEquals(codeName, result.getPreferredName());
-        		Assert.assertEquals(codeName, result.getReferenceName());
-        	}else {
-        		Assert.assertEquals("", result.getPreferredName());
-        		Assert.assertEquals("", result.getReferenceName());
-        	}
-        }
+		PreferredNameResultsDTO results = lsThingService.getCodeNameFromName("parent", "linker small molecule", null,
+				null, requestDTO);
+		Assert.assertEquals(2, results.getResults().size());
+		for (PreferredNameDTO result : results.getResults()) {
+			if (result.getRequestName().equals(codeName)) {
+				Assert.assertEquals(codeName, result.getPreferredName());
+				Assert.assertEquals(codeName, result.getReferenceName());
+			} else {
+				Assert.assertEquals("", result.getPreferredName());
+				Assert.assertEquals("", result.getReferenceName());
+			}
+		}
 	}
-	
+
 	@Test
 	@Transactional
 	public void lsThingValueValidationTest_rna() {
@@ -655,7 +787,7 @@ public void lsThingValueValidationTest_rna() {
 		Assert.assertFalse(errorMessages.isEmpty());
 		logger.info(LsThingValidationErrorMessage.toJsonArray(errorMessages));
 	}
-	
+
 	@Test
 	@Transactional
 	public void lsThingValueValidationTest_formulation() {
@@ -665,7 +797,7 @@ public void lsThingValueValidationTest_formulation() {
 		Assert.assertFalse(errorMessages.isEmpty());
 		logger.info(LsThingValidationErrorMessage.toJsonArray(errorMessages));
 	}
-	
+
 	@Test
 	@Transactional
 	public void lsThingValueValidationTest_formulation_accept() {
@@ -674,7 +806,7 @@ public void lsThingValueValidationTest_formulation_accept() {
 		Collection<LsThingValidationErrorMessage> errorMessages = lsThingService.validateLsThing(validationDTO);
 		Assert.assertTrue(errorMessages.isEmpty());
 	}
-	
+
 	@Test
 	@Transactional
 	public void lsThingValueValidationTest_formulation_unique() {
@@ -683,7 +815,7 @@ public void lsThingValueValidationTest_formulation_unique() {
 		Collection<LsThingValidationErrorMessage> errorMessages = lsThingService.validateLsThing(validationDTO);
 		Assert.assertTrue(errorMessages.isEmpty());
 	}
-	
+
 	@Test
 	@Transactional
 	public void lsThingValueValidationTest_formulation_order_reverse_duplicate() {
@@ -693,7 +825,7 @@ public void lsThingValueValidationTest_formulation_order_reverse_duplicate() {
 		Assert.assertFalse(errorMessages.isEmpty());
 		logger.info(LsThingValidationErrorMessage.toJsonArray(errorMessages));
 	}
-	
+
 	@Test
 	@Transactional
 	public void lsThingValueValidationTest_same_order_itx_subset_accept() {
@@ -702,7 +834,7 @@ public void lsThingValueValidationTest_same_order_itx_subset_accept() {
 		Collection<LsThingValidationErrorMessage> errorMessages = lsThingService.validateLsThing(validationDTO);
 		Assert.assertTrue(errorMessages.isEmpty());
 	}
-	
+
 	@Test
 	@Transactional
 	public void lsThingValidationFail() {
@@ -712,53 +844,55 @@ public void lsThingValidationFail() {
 		Assert.assertFalse(errorMessages.isEmpty());
 		logger.info(LsThingValidationErrorMessage.toJsonArray(errorMessages));
 	}
-	
+
 	@Transactional
-	@Rollback(value=false)
-	public LsThing createParentBatchStack(){
-		LsThing componentParent = makeLsThing("COMPONENT-01","parent","test component");
+	@Rollback(value = false)
+	public LsThing createParentBatchStack() {
+		LsThing componentParent = makeLsThing("COMPONENT-01", "parent", "test component");
 		componentParent = addLsThingLabel("COMPONENT-01", "corpName", "ACAS LsThing", true, componentParent);
 		componentParent.persist();
-		
-		LsThing assemblyParent = makeLsThing("ASSEMBLY-01","parent","test assembly");
+
+		LsThing assemblyParent = makeLsThing("ASSEMBLY-01", "parent", "test assembly");
 		assemblyParent = addLsThingLabel("ASSEMBLY-01", "corpName", "ACAS LsThing", true, assemblyParent);
 		assemblyParent.persist();
-		
-		LsThing componentBatch = makeLsThing("COMPONENT-01-1","batch","test component");
+
+		LsThing componentBatch = makeLsThing("COMPONENT-01-1", "batch", "test component");
 		componentBatch = addLsThingLabel("COMPONENT-01-1", "corpName", "ACAS LsThing", true, componentBatch);
 		componentBatch.persist();
-		
-		LsThing assemblyBatch = makeLsThing("ASSEMBLY-01-1","batch","test assembly");
+
+		LsThing assemblyBatch = makeLsThing("ASSEMBLY-01-1", "batch", "test assembly");
 		assemblyBatch = addLsThingLabel("ASSEMBLY-01-1", "corpName", "ACAS LsThing", true, assemblyBatch);
 		assemblyBatch.persist();
-		
-		ItxLsThingLsThing parentInc = makeItxLsThingLsThing("ITXTHING-01", "incorporates", "assembly_component", assemblyParent, componentParent);
+
+		ItxLsThingLsThing parentInc = makeItxLsThingLsThing("ITXTHING-01", "incorporates", "assembly_component",
+				assemblyParent, componentParent);
 		assemblyParent.getSecondLsThings().add(parentInc);
 		componentParent.getFirstLsThings().add(parentInc);
 
-		ItxLsThingLsThing batchInc = makeItxLsThingLsThing("ITXTHING-02", "incorporates", "assembly_component", assemblyBatch, componentBatch);
+		ItxLsThingLsThing batchInc = makeItxLsThingLsThing("ITXTHING-02", "incorporates", "assembly_component",
+				assemblyBatch, componentBatch);
 		assemblyBatch.getSecondLsThings().add(batchInc);
 		componentBatch.getFirstLsThings().add(batchInc);
 
-		
-		ItxLsThingLsThing componentParentBatch = makeItxLsThingLsThing("ITXTHING-01", "instantiates", "batch_parent", componentBatch, componentParent);
+		ItxLsThingLsThing componentParentBatch = makeItxLsThingLsThing("ITXTHING-01", "instantiates", "batch_parent",
+				componentBatch, componentParent);
 		componentBatch.getSecondLsThings().add(componentParentBatch);
 		componentParent.getFirstLsThings().add(componentParentBatch);
 
-		
-		ItxLsThingLsThing assemblyParentBatch = makeItxLsThingLsThing("ITXTHING-01", "instantiates", "batch_parent", assemblyBatch, assemblyParent);
+		ItxLsThingLsThing assemblyParentBatch = makeItxLsThingLsThing("ITXTHING-01", "instantiates", "batch_parent",
+				assemblyBatch, assemblyParent);
 		assemblyBatch.getSecondLsThings().add(assemblyParentBatch);
 		assemblyParent.getFirstLsThings().add(assemblyParentBatch);
-		
+
 		assemblyBatch.merge();
 		assemblyParent.merge();
 		componentBatch.merge();
 		componentParent.merge();
-		
+
 		return componentParent;
 	}
-	
-	private LsThing makeLsThing(String codeName, String lsType, String lsKind){
+
+	private LsThing makeLsThing(String codeName, String lsType, String lsKind) {
 		LsThing lsThing = new LsThing();
 		lsThing.setCodeName(codeName);
 		lsThing.setLsType(lsType);
@@ -769,10 +903,13 @@ private LsThing makeLsThing(String codeName, String lsType, String lsKind){
 		lsThing.setIgnored(false);
 		return lsThing;
 	}
-	
-	private LsThing addLsThingLabel(String labelText, String lsType, String lsKind, Boolean preferred, LsThing lsThing){
+
+	private LsThing addLsThingLabel(String labelText, String lsType, String lsKind, Boolean preferred,
+			LsThing lsThing) {
 		LsThingLabel label = new LsThingLabel();
-		//(id, label_text, ls_kind, ls_type, ls_type_and_kind, preferred, physically_labled, ignored, deleted, recorded_by, recorded_date, version, lsthing_id)
+		// (id, label_text, ls_kind, ls_type, ls_type_and_kind, preferred,
+		// physically_labled, ignored, deleted, recorded_by, recorded_date, version,
+		// lsthing_id)
 		label.setLabelText(labelText);
 		label.setLsType(lsType);
 		label.setLsKind(lsKind);
@@ -786,67 +923,68 @@ private LsThing addLsThingLabel(String labelText, String lsType, String lsKind,
 		lsThing.getLsLabels().add(label);
 		return lsThing;
 	}
-	
-	public LsThing createTransientParentBatchStack(){
-		
-		
-		LsThing componentParent = makeLsThing("COMPONENT-01","parent","test component");		
-		LsThing assemblyParent = makeLsThing("ASSEMBLY-01","parent","test assembly");
-		LsThing componentBatch = makeLsThing("COMPONENT-01-1","batch","test component");
-		LsThing assemblyBatch = makeLsThing("ASSEMBLY-01-1","batch","test assembly");
-		
-		ItxLsThingLsThing parentInc = makeItxLsThingLsThing("ITXTHING-01", "incorporates", "assembly_component", assemblyParent, componentParent);
+
+	public LsThing createTransientParentBatchStack() {
+
+		LsThing componentParent = makeLsThing("COMPONENT-01", "parent", "test component");
+		LsThing assemblyParent = makeLsThing("ASSEMBLY-01", "parent", "test assembly");
+		LsThing componentBatch = makeLsThing("COMPONENT-01-1", "batch", "test component");
+		LsThing assemblyBatch = makeLsThing("ASSEMBLY-01-1", "batch", "test assembly");
+
+		ItxLsThingLsThing parentInc = makeItxLsThingLsThing("ITXTHING-01", "incorporates", "assembly_component",
+				assemblyParent, componentParent);
 		assemblyParent.getSecondLsThings().add(parentInc);
 		componentParent.getFirstLsThings().add(parentInc);
 
-		ItxLsThingLsThing batchInc = makeItxLsThingLsThing("ITXTHING-02", "incorporates", "assembly_component", assemblyBatch, componentBatch);
+		ItxLsThingLsThing batchInc = makeItxLsThingLsThing("ITXTHING-02", "incorporates", "assembly_component",
+				assemblyBatch, componentBatch);
 		assemblyBatch.getSecondLsThings().add(batchInc);
 		componentBatch.getFirstLsThings().add(batchInc);
 
-		
-		ItxLsThingLsThing componentParentBatch = makeItxLsThingLsThing("ITXTHING-01", "instantiates", "batch_parent", componentBatch, componentParent);
+		ItxLsThingLsThing componentParentBatch = makeItxLsThingLsThing("ITXTHING-01", "instantiates", "batch_parent",
+				componentBatch, componentParent);
 		componentBatch.getSecondLsThings().add(componentParentBatch);
 		componentParent.getFirstLsThings().add(componentParentBatch);
 
-		
-		ItxLsThingLsThing assemblyParentBatch = makeItxLsThingLsThing("ITXTHING-01", "instantiates", "batch_parent", assemblyBatch, assemblyParent);
+		ItxLsThingLsThing assemblyParentBatch = makeItxLsThingLsThing("ITXTHING-01", "instantiates", "batch_parent",
+				assemblyBatch, assemblyParent);
 		assemblyBatch.getSecondLsThings().add(assemblyParentBatch);
 		assemblyParent.getFirstLsThings().add(assemblyParentBatch);
-		
+
 		return componentParent;
 	}
-	
+
 	@Test
-	public void buildBatchParentLsThingStack(){
+	public void buildBatchParentLsThingStack() {
 		LsThing thing1 = createParentBatchStack();
 	}
-	
+
 	@Transactional
 	@Test
-	public void checkBatchDependencies(){
-//		LsThing componentParent = createParentBatchStack();
-//		logger.info(componentParent.toJsonWithNestedFull());
+	public void checkBatchDependencies() {
+		// LsThing componentParent = createParentBatchStack();
+		// logger.info(componentParent.toJsonWithNestedFull());
 		LsThing batch = LsThing.findLsThingsByCodeNameEquals("PEG000003-1").getSingleResult();
 		logger.info(batch.toJsonWithNestedFull());
 		DependencyCheckDTO result = lsThingService.checkBatchDependencies(batch);
 		logger.info(result.toJson());
 		Assert.assertTrue(result.getLinkedDataExists());
 	}
-	
+
 	@Transactional
 	@Test
-	public void checkParentDependencies(){
-//		LsThing componentParent = createParentBatchStack();
-//		logger.info(componentParent.toJsonWithNestedFull());
+	public void checkParentDependencies() {
+		// LsThing componentParent = createParentBatchStack();
+		// logger.info(componentParent.toJsonWithNestedFull());
 		LsThing parent = LsThing.findLsThingsByCodeNameEquals("PEG000003").getSingleResult();
 		DependencyCheckDTO result = lsThingService.checkParentDependencies(parent);
 		logger.info(result.toJson());
 		Assert.assertTrue(result.getLinkedDataExists());
 	}
-	
+
 	@Transactional
 	@Test
-	public void deleteBatch(){
+	public void deleteBatch() {
 		LsThing batch = LsThing.findLsThingsByCodeNameEquals("CB000004-6").getSingleResult();
 		LsThing parent = LsThing.findLsThingsByCodeNameEquals("CB000004").getSingleResult();
 		int lastBatchNumber = lsThingService.getBatchNumber(parent);
@@ -857,58 +995,60 @@ public void deleteBatch(){
 		logger.info(checkBatch.toJsonWithNestedFull());
 		Assert.assertTrue(checkBatch.isIgnored());
 		Assert.assertTrue(checkBatch.isDeleted());
-		for (ItxLsThingLsThing itxLsThingLsThing : checkBatch.getFirstLsThings()){
+		for (ItxLsThingLsThing itxLsThingLsThing : checkBatch.getFirstLsThings()) {
 			Assert.assertTrue(itxLsThingLsThing.isIgnored());
 			Assert.assertTrue(itxLsThingLsThing.isDeleted());
 		}
-		for (ItxLsThingLsThing itxLsThingLsThing : checkBatch.getSecondLsThings()){
+		for (ItxLsThingLsThing itxLsThingLsThing : checkBatch.getSecondLsThings()) {
 			Assert.assertTrue(itxLsThingLsThing.isIgnored());
 			Assert.assertTrue(itxLsThingLsThing.isDeleted());
 		}
-		logger.info("Old lastBatchNumber: "+lastBatchNumber+" newLastBatchNumber: "+newLastBatchNumber);
+		logger.info("Old lastBatchNumber: " + lastBatchNumber + " newLastBatchNumber: " + newLastBatchNumber);
 		Assert.assertTrue(newLastBatchNumber == lastBatchNumber - 1);
 	}
-	
+
 	@Transactional
 	@Test
-	public void deleteParent(){
+	public void deleteParent() {
 		LsThing parent = LsThing.findLsThingsByCodeNameEquals("PEG000003").getSingleResult();
 		logger.info(parent.toJsonWithNestedFull());
-		String lastCorpName = autoLabelService.getLastLabel(parent.getLsTypeAndKind(), "corpName_ACAS LsThing").getAutoLabel();
+		String lastCorpName = autoLabelService.getLastLabel(parent.getLsTypeAndKind(), "corpName_ACAS LsThing")
+				.getAutoLabel();
 		lsThingService.deleteParent(parent);
 		LsThing checkParent = LsThing.findLsThingsByCodeNameEquals("PEG000003").getSingleResult();
 		logger.info(checkParent.toJsonWithNestedFull());
 		Assert.assertTrue(checkParent.isIgnored());
 		Assert.assertTrue(checkParent.isDeleted());
-		for (ItxLsThingLsThing itxLsThingLsThing : checkParent.getFirstLsThings()){
+		for (ItxLsThingLsThing itxLsThingLsThing : checkParent.getFirstLsThings()) {
 			Assert.assertTrue(itxLsThingLsThing.isIgnored());
 			Assert.assertTrue(itxLsThingLsThing.isDeleted());
-			if (itxLsThingLsThing.getLsType().equals("instantiates")){
+			if (itxLsThingLsThing.getLsType().equals("instantiates")) {
 				LsThing checkBatch = itxLsThingLsThing.getFirstLsThing();
 				Assert.assertTrue(checkBatch.isIgnored());
 				Assert.assertTrue(checkBatch.isDeleted());
-				for (ItxLsThingLsThing batchItxLsThingLsThing : checkBatch.getFirstLsThings()){
+				for (ItxLsThingLsThing batchItxLsThingLsThing : checkBatch.getFirstLsThings()) {
 					Assert.assertTrue(itxLsThingLsThing.isIgnored());
 					Assert.assertTrue(itxLsThingLsThing.isDeleted());
 				}
-				for (ItxLsThingLsThing batchItxLsThingLsThing : checkBatch.getSecondLsThings()){
+				for (ItxLsThingLsThing batchItxLsThingLsThing : checkBatch.getSecondLsThings()) {
 					Assert.assertTrue(itxLsThingLsThing.isIgnored());
 					Assert.assertTrue(itxLsThingLsThing.isDeleted());
 				}
 			}
 		}
-		for (ItxLsThingLsThing itxLsThingLsThing : checkParent.getSecondLsThings()){
+		for (ItxLsThingLsThing itxLsThingLsThing : checkParent.getSecondLsThings()) {
 			Assert.assertTrue(itxLsThingLsThing.isIgnored());
 			Assert.assertTrue(itxLsThingLsThing.isDeleted());
 		}
-		String newLastCorpName = autoLabelService.getLastLabel(parent.getLsTypeAndKind(), "corpName_ACAS LsThing").getAutoLabel();
-		logger.info("Old lastCorpName: "+lastCorpName+" New lastCorpName: "+newLastCorpName);
+		String newLastCorpName = autoLabelService.getLastLabel(parent.getLsTypeAndKind(), "corpName_ACAS LsThing")
+				.getAutoLabel();
+		logger.info("Old lastCorpName: " + lastCorpName + " New lastCorpName: " + newLastCorpName);
 		Assert.assertFalse(lastCorpName.equals(newLastCorpName));
 	}
-	
+
 	@Transactional
 	@Test
-	public void getStoichiometryProperties(){
+	public void getStoichiometryProperties() {
 		String codeName = "CMPD-00000002";
 		String lsType = "parent";
 		String lsKind = "small molecule";
@@ -921,15 +1061,16 @@ public void getStoichiometryProperties(){
 		Assert.assertFalse(result.isHasWarning());
 		Assert.assertTrue(result.getResults().size() > 0);
 	}
-	
+
 	@Test
 	@Transactional
-	public void substructureSearch(){
-		String queryMol= "\n  Mrv1641110051619032D          \n\n  5  5  0  0  0  0            999 V2000\n   -0.0446    0.6125    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.7121    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.4572   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.3679   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.6228    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n  2  3  1  0  0  0  0\n  3  4  1  0  0  0  0\n  4  5  1  0  0  0  0\n  1  2  1  0  0  0  0\n  1  5  1  0  0  0  0\nM  END\n";
-		Collection<LsThing> searchResults = lsThingService.structureSearch(queryMol, "", "", SearchType.SUBSTRUCTURE, 10, null);
+	public void substructureSearch() {
+		String queryMol = "\n  Mrv1641110051619032D          \n\n  5  5  0  0  0  0            999 V2000\n   -0.0446    0.6125    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.7121    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.4572   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.3679   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.6228    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n  2  3  1  0  0  0  0\n  3  4  1  0  0  0  0\n  4  5  1  0  0  0  0\n  1  2  1  0  0  0  0\n  1  5  1  0  0  0  0\nM  END\n";
+		Collection<LsThing> searchResults = lsThingService.structureSearch(queryMol, "", "", SearchType.SUBSTRUCTURE,
+				10, null);
 		Assert.assertFalse(searchResults.isEmpty());
 		logger.debug(LsThing.toJsonArray(searchResults));
-		
+
 		queryMol = "\n  MJ160418                      \n\n 20 23  0  0  0  0  0  0  0  0999 V2000\n   -0.9620   -1.3787    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -1.2169   -2.1634    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -2.0419   -2.1634    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -2.2968   -1.3787    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -1.6294   -0.8938    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -1.6294   -0.0688    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -0.9620    0.4160    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -1.2169    1.2006    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -2.0419    1.2006    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -2.2968    0.4160    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -0.1773    0.1611    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n    0.4900    0.6460    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n    1.1574    0.1611    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n    0.9025   -0.6235    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n    0.0775   -0.6235    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n    0.4900    1.4710    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -0.1773    1.9559    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n    0.0775    2.7405    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n    0.9025    2.7405    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n    1.1574    1.9559    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n 18 19  1  0  0  0  0\n 17 18  1  0  0  0  0\n 16 17  1  0  0  0  0\n 19 20  1  0  0  0  0\n 16 20  1  0  0  0  0\n 12 16  1  0  0  0  0\n 11 12  1  0  0  0  0\n  7 11  1  0  0  0  0\n  7  8  1  0  0  0  0\n  8  9  1  0  0  0  0\n  9 10  1  0  0  0  0\n  6  7  1  0  0  0  0\n  6 10  1  0  0  0  0\n  5  6  1  0  0  0  0\n  4  5  1  0  0  0  0\n  3  4  1  0  0  0  0\n  2  3  1  0  0  0  0\n  1  5  1  0  0  0  0\n  1  2  1  0  0  0  0\n 11 15  1  0  0  0  0\n 14 15  1  0  0  0  0\n 12 13  1  0  0  0  0\n 13 14  1  0  0  0  0\nM  END\n";
 		searchResults = lsThingService.structureSearch(queryMol, "", "", SearchType.SUBSTRUCTURE, 10, null);
 		Assert.assertTrue(searchResults.isEmpty());
diff --git a/src/test/java/com/labsynch/labseer/service/LsThingStateServiceTest.java b/src/test/java/com/labsynch/labseer/service/LsThingStateServiceTest.java
index ee0bd71b6..f9edd3ead 100644
--- a/src/test/java/com/labsynch/labseer/service/LsThingStateServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/LsThingStateServiceTest.java
@@ -15,22 +15,24 @@
 import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class LsThingStateServiceTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(LsThingStateServiceTest.class);
 
 	@Autowired
 	private LsThingStateService lsThingStateService;
-	
+
 	@Test
 	@Transactional
 	public void createLsThingStateByLsThingIdAndStateTypeKindTest() {
 		Long lsThingId = 18311L;
 		String lsType = "metadata";
 		String lsKind = "gene metadata";
-		LsThingState lsThingState = lsThingStateService.createLsThingStateByLsThingIdAndStateTypeKind(lsThingId, lsType, lsKind);
+		LsThingState lsThingState = lsThingStateService.createLsThingStateByLsThingIdAndStateTypeKind(lsThingId, lsType,
+				lsKind);
 		Assert.assertNotNull(lsThingState);
 		logger.info(lsThingState.toJson());
 	}
diff --git a/src/test/java/com/labsynch/labseer/service/LsThingValueServiceTest.java b/src/test/java/com/labsynch/labseer/service/LsThingValueServiceTest.java
index 02a9410a8..fe2be2ca8 100644
--- a/src/test/java/com/labsynch/labseer/service/LsThingValueServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/LsThingValueServiceTest.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import com.labsynch.labseer.domain.LsThingValue;
@@ -16,9 +15,9 @@
 
 import junit.framework.Assert;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class LsThingValueServiceTest {
 
@@ -27,18 +26,18 @@ public class LsThingValueServiceTest {
 	@Autowired
 	private LsThingValueService lsThingValueService;
 
-	
 	@Test
 	@Transactional
 	public void updateLsThingValueTest() {
-//		String idOrCodeName = "18311";
+		// String idOrCodeName = "18311";
 		String idOrCodeName = "GENE-000002";
 		String stateType = "metadata";
 		String stateKind = "gene metadata";
 		String valueType = "stringValue";
 		String valueKind = "status";
 		String value = "Deleted";
-		LsThingValue lsThingValue = lsThingValueService.updateLsThingValue(idOrCodeName, stateType, stateKind, valueType, valueKind, value);
+		LsThingValue lsThingValue = lsThingValueService.updateLsThingValue(idOrCodeName, stateType, stateKind,
+				valueType, valueKind, value);
 		Assert.assertNotNull(lsThingValue);
 		logger.info(lsThingValue.toJson());
 	}
diff --git a/src/test/java/com/labsynch/labseer/service/PreferredNameTest.java b/src/test/java/com/labsynch/labseer/service/PreferredNameTest.java
index a5b001ce2..f32eeb301 100755
--- a/src/test/java/com/labsynch/labseer/service/PreferredNameTest.java
+++ b/src/test/java/com/labsynch/labseer/service/PreferredNameTest.java
@@ -14,17 +14,16 @@
 @ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext.xml")
 @Configurable
 public class PreferredNameTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(PreferredNameTest.class);
-	
+
 	@Test
-	public void Test_1(){
-		
+	public void Test_1() {
+
 		String json = "{\"requests\":[{\"requestName\":\"CRA-025995-1\"},{\"requestName\":\"CMPD-0000052-01\"}]}";
-		PreferredNameDTO request = PreferredNameDTO.fromJsonToPreferredNameDTO(json);	
+		PreferredNameDTO request = PreferredNameDTO.fromJsonToPreferredNameDTO(json);
 
 		logger.info("#############################################");
 
-		
 	}
 }
diff --git a/src/test/java/com/labsynch/labseer/service/ProtocolServiceTest.java b/src/test/java/com/labsynch/labseer/service/ProtocolServiceTest.java
index f76e37f06..a3fb87f73 100755
--- a/src/test/java/com/labsynch/labseer/service/ProtocolServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/ProtocolServiceTest.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import java.util.Collection;
@@ -31,32 +30,32 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class ProtocolServiceTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(ProtocolServiceTest.class);
-	
+
 	@Autowired
 	private ProtocolService protocolService;
-	
+
 	@Autowired
-    private ProtocolValueService protocolValueService;
-	
-	//@Test
-	public void FindProtocolByName_Test10(){
+	private ProtocolValueService protocolValueService;
+
+	// @Test
+	public void FindProtocolByName_Test10() {
 		List<Protocol> protocols = Protocol.findProtocolByProtocolName("test");
 		logger.info("Found number of protocols: " + protocols.size());
-		for (Protocol protocol : protocols){
+		for (Protocol protocol : protocols) {
 			logger.info(protocol.toJson());
 		}
-		
+
 	}
-	
-	//@Test
-	public void CreateProtocolTest_1(){
+
+	// @Test
+	public void CreateProtocolTest_1() {
 		Protocol protocol = new Protocol();
 		protocol.setLsType("test protocol type");
 		protocol.setLsKind("test protocol kind");
@@ -71,39 +70,130 @@ public void CreateProtocolTest_1(){
 		logger.info("just persisted a protocol");
 		logger.info(protocol.toJson());
 		long id = protocol.getId();
-//		long expectedId = 6l;
-        Assert.assertNotNull("Find method for 'Protocol' illegally returned null for id '" + id + "'", id);
-        //Assert.assertEquals("Find method for 'Protocol' returned the incorrect identifier", expectedId, id);		
+		// long expectedId = 6l;
+		Assert.assertNotNull("Find method for 'Protocol' illegally returned null for id '" + id + "'", id);
+		// Assert.assertEquals("Find method for 'Protocol' returned the incorrect
+		// identifier", expectedId, id);
 	}
-	
-	//@Test
+
+	// @Test
 	@Transactional
-	public void CreateProtocolsFromJson(){
-		//String json = "[ { \"name\": \"PROT-101\",\"shortDescription\": \"Just a simple test\",\"lsTransaction\": null,\"protocolStates\": [ { \"protocolValues\": [ { \"valueType\": \"stringValue\",\"valueKind\": \"reader instrument\",\"stringValue\": \"Molecular Dynamics FLIPR\",\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"lsTransaction\": null,\"thingIdValue\": null,\"sampleId\": null,\"sampleName\": \"\",\"publicData\": false,\"recordedDate\":    1353267278000 },{ \"valueType\": \"numericValue\",\"valueKind\": \"curve min\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\":                0,\"sigFigs\":                2,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"lsTransaction\": null,\"thingIdValue\": null,\"sampleId\": null,\"sampleName\": \"\",\"publicData\": false,\"recordedDate\":    1353267278000 },{ \"valueType\": \"numericValue\",\"valueKind\": \"curve max\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\":              100,\"sigFigs\":                2,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"lsTransaction\": null,\"thingIdValue\": null,\"sampleId\": null,\"sampleName\": \"\",\"publicData\": false,\"recordedDate\":    1353267278000 } ],\"recordedBy\": \"userName\",\"stateType\": \"metadata\",\"stateKind\": \"protocol parameters\",\"comments\": \"\",\"lsTransaction\": null,\"ignored\": false,\"recordedDate\":    1353267278000 } ] } ]";
+	public void CreateProtocolsFromJson() {
+		// String json = "[ { \"name\": \"PROT-101\",\"shortDescription\": \"Just a
+		// simple test\",\"lsTransaction\": null,\"protocolStates\": [ {
+		// \"protocolValues\": [ { \"valueType\": \"stringValue\",\"valueKind\":
+		// \"reader instrument\",\"stringValue\": \"Molecular Dynamics
+		// FLIPR\",\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\":
+		// null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\":
+		// null,\"ignored\": false,\"lsTransaction\": null,\"thingIdValue\":
+		// null,\"sampleId\": null,\"sampleName\": \"\",\"publicData\":
+		// false,\"recordedDate\": 1353267278000 },{ \"valueType\":
+		// \"numericValue\",\"valueKind\": \"curve min\",\"stringValue\":
+		// null,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": 0,\"sigFigs\": 2,\"uncertainty\": null,\"valueUnit\":
+		// null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\":
+		// false,\"lsTransaction\": null,\"thingIdValue\": null,\"sampleId\":
+		// null,\"sampleName\": \"\",\"publicData\": false,\"recordedDate\":
+		// 1353267278000 },{ \"valueType\": \"numericValue\",\"valueKind\": \"curve
+		// max\",\"stringValue\": null,\"fileValue\": null,\"urlValue\":
+		// null,\"dateValue\": null,\"clobValue\": null,\"blobValue\":
+		// null,\"valueOperator\": null,\"numericValue\": 100,\"sigFigs\":
+		// 2,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\":
+		// \"\",\"comments\": null,\"ignored\": false,\"lsTransaction\":
+		// null,\"thingIdValue\": null,\"sampleId\": null,\"sampleName\":
+		// \"\",\"publicData\": false,\"recordedDate\": 1353267278000 }
+		// ],\"recordedBy\": \"userName\",\"stateType\": \"metadata\",\"stateKind\":
+		// \"protocol parameters\",\"comments\": \"\",\"lsTransaction\":
+		// null,\"ignored\": false,\"recordedDate\": 1353267278000 } ] } ]";
 		String json = "{ \"codeName\": \"protocolName\",\"shortDescription\": \"protocol short description\",\"lsTransaction\": { \"comments\": \"protocol 102 transactions\",\"id\":      1,\"recordedDate\": 1.354e+12,\"version\":      0 },\"recordedBy\": \"userName\",\"recordedDate\": 1.354e+12,\"protocolStates\": [ { \"protocolValues\": [ { \"valueType\": \"stringValue\",\"valueKind\": \"reader instrument\",\"stringValue\": \"Molecular Dynamics FLIPR\",\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"lsTransaction\": { \"comments\": \"protocol 102 transactions\",\"id\":      1,\"recordedDate\": 1.354e+12,\"version\":      0 },\"batchCode\": null,\"recordedDate\": 1.354e+12 },{ \"valueType\": \"numericValue\",\"valueKind\": \"curve min\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\":      0,\"sigFigs\":      2,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"lsTransaction\": { \"comments\": \"protocol 102 transactions\",\"id\":      1,\"recordedDate\": 1.354e+12,\"version\":      0 },\"batchCode\": null,\"recordedDate\": 1.354e+12 },{ \"valueType\": \"numericValue\",\"valueKind\": \"curve max\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\":    100,\"sigFigs\":      2,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"lsTransaction\": { \"comments\": \"protocol 102 transactions\",\"id\":      1,\"recordedDate\": 1.354e+12,\"version\":      0 },\"batchCode\": null,\"recordedDate\": 1.354e+12 } ],\"recordedBy\": \"userName\",\"stateType\": \"metadata\",\"stateKind\": \"protocol analysis parameters\",\"comments\": \"\",\"lsTransaction\": { \"comments\": \"protocol 102 transactions\",\"id\":      1,\"recordedDate\": 1.354e+12,\"version\":      0 },\"ignored\": false,\"recordedDate\": 1.354e+12 } ] }";
 
-		Collection<Protocol> protocols = Protocol.fromJsonArrayToProtocols(json)	;
-		for (Protocol protocol:protocols){
+		Collection<Protocol> protocols = Protocol.fromJsonArrayToProtocols(json);
+		for (Protocol protocol : protocols) {
 			logger.info("initial json protocol " + protocol.toJson());
 			protocol.persist();
 			logger.info(protocol.toJson());
 		}
 	}
-	
+
 	@Test
-	//@Transactional
-	public void CreateProtocolFromNestedJson(){
+	// @Transactional
+	public void CreateProtocolFromNestedJson() {
 		LsTransaction lsTransaction = new LsTransaction();
 		lsTransaction.setComments("protocol 102 transactions");
 		lsTransaction.setRecordedDate(new Date());
 		lsTransaction.persist();
-		
-		//String json = "{ \"name\": \"\",\"shortDescription\": \"\",\"lsTransaction\": null,\"protocolStates\": [ { \"protocolValues\": [ { \"valueType\": \"stringValue\",\"valueKind\": \"reader instrument\",\"stringValue\": \"Molecular Dynamics FLIPR\",\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"lsTransaction\": null,\"thingIdValue\": null,\"sampleId\": null,\"sampleName\": \"\",\"publicData\": false,\"recordedDate\":    1353216427000 },{ \"valueType\": \"numericValue\",\"valueKind\": \"curve min\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\":                0,\"sigFigs\":                2,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"lsTransaction\": null,\"thingIdValue\": null,\"sampleId\": null,\"sampleName\": \"\",\"publicData\": false,\"recordedDate\":    1353216427000 },{ \"valueType\": \"numericValue\",\"valueKind\": \"curve max\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\":              100,\"sigFigs\":                2,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"lsTransaction\": null,\"thingIdValue\": null,\"sampleId\": null,\"sampleName\": \"\",\"publicData\": false,\"recordedDate\":    1353216427000 } ],\"recordedBy\": \"userName\",\"stateType\": \"metadata\",\"stateKind\": \"protocol parameters\",\"comments\": \"\",\"lsTransaction\": null,\"ignored\": false,\"recordedDate\":    1353216427000 } ] }";
-		//String json = "{ \"codeName\": \"protocolName101\",\"shortDescription\": \"protocol short description\",\"lsTransaction\": { \"comments\": \"protocol 102 transactions\",\"id\":      1,\"recordedDate\": 1.354e+12,\"version\":      0 },\"recordedBy\": \"userName\",\"recordedDate\": 1.354e+12,\"protocolStates\": [ { \"protocolValues\": [ { \"valueType\": \"stringValue\",\"valueKind\": \"reader instrument\",\"stringValue\": \"Molecular Dynamics FLIPR\",\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"lsTransaction\": { \"comments\": \"protocol 102 transactions\",\"id\":      1,\"recordedDate\": 1.354e+12,\"version\":      0 },\"batchCode\": null,\"recordedDate\": 1.354e+12 },{ \"valueType\": \"numericValue\",\"valueKind\": \"curve min\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\":      0,\"sigFigs\":      2,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"lsTransaction\": { \"comments\": \"protocol 102 transactions\",\"id\":      1,\"recordedDate\": 1.354e+12,\"version\":      0 },\"batchCode\": null,\"recordedDate\": 1.354e+12 },{ \"valueType\": \"numericValue\",\"valueKind\": \"curve max\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\":    100,\"sigFigs\":      2,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"lsTransaction\": { \"comments\": \"protocol 102 transactions\",\"id\":      1,\"recordedDate\": 1.354e+12,\"version\":      0 },\"batchCode\": null,\"recordedDate\": 1.354e+12 } ],\"recordedBy\": \"userName\",\"stateType\": \"metadata\",\"stateKind\": \"protocol analysis parameters\",\"comments\": \"\",\"lsTransaction\": { \"comments\": \"protocol 102 transactions\",\"id\":      1,\"recordedDate\": 1.354e+12,\"version\":      0 },\"ignored\": false,\"recordedDate\": 1.354e+12 } ] }";
+
+		// String json = "{ \"name\": \"\",\"shortDescription\": \"\",\"lsTransaction\":
+		// null,\"protocolStates\": [ { \"protocolValues\": [ { \"valueType\":
+		// \"stringValue\",\"valueKind\": \"reader instrument\",\"stringValue\":
+		// \"Molecular Dynamics FLIPR\",\"fileValue\": null,\"urlValue\":
+		// null,\"dateValue\": null,\"clobValue\": null,\"blobValue\":
+		// null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\":
+		// null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\":
+		// null,\"concUnit\": \"\",\"comments\": null,\"ignored\":
+		// false,\"lsTransaction\": null,\"thingIdValue\": null,\"sampleId\":
+		// null,\"sampleName\": \"\",\"publicData\": false,\"recordedDate\":
+		// 1353216427000 },{ \"valueType\": \"numericValue\",\"valueKind\": \"curve
+		// min\",\"stringValue\": null,\"fileValue\": null,\"urlValue\":
+		// null,\"dateValue\": null,\"clobValue\": null,\"blobValue\":
+		// null,\"valueOperator\": null,\"numericValue\": 0,\"sigFigs\":
+		// 2,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\":
+		// \"\",\"comments\": null,\"ignored\": false,\"lsTransaction\":
+		// null,\"thingIdValue\": null,\"sampleId\": null,\"sampleName\":
+		// \"\",\"publicData\": false,\"recordedDate\": 1353216427000 },{ \"valueType\":
+		// \"numericValue\",\"valueKind\": \"curve max\",\"stringValue\":
+		// null,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": 100,\"sigFigs\": 2,\"uncertainty\":
+		// null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\":
+		// null,\"ignored\": false,\"lsTransaction\": null,\"thingIdValue\":
+		// null,\"sampleId\": null,\"sampleName\": \"\",\"publicData\":
+		// false,\"recordedDate\": 1353216427000 } ],\"recordedBy\":
+		// \"userName\",\"stateType\": \"metadata\",\"stateKind\": \"protocol
+		// parameters\",\"comments\": \"\",\"lsTransaction\": null,\"ignored\":
+		// false,\"recordedDate\": 1353216427000 } ] }";
+		// String json = "{ \"codeName\": \"protocolName101\",\"shortDescription\":
+		// \"protocol short description\",\"lsTransaction\": { \"comments\": \"protocol
+		// 102 transactions\",\"id\": 1,\"recordedDate\": 1.354e+12,\"version\": 0
+		// },\"recordedBy\": \"userName\",\"recordedDate\":
+		// 1.354e+12,\"protocolStates\": [ { \"protocolValues\": [ { \"valueType\":
+		// \"stringValue\",\"valueKind\": \"reader instrument\",\"stringValue\":
+		// \"Molecular Dynamics FLIPR\",\"fileValue\": null,\"urlValue\":
+		// null,\"dateValue\": null,\"clobValue\": null,\"blobValue\":
+		// null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\":
+		// null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\":
+		// null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\":
+		// true,\"lsTransaction\": { \"comments\": \"protocol 102 transactions\",\"id\":
+		// 1,\"recordedDate\": 1.354e+12,\"version\": 0 },\"batchCode\":
+		// null,\"recordedDate\": 1.354e+12 },{ \"valueType\":
+		// \"numericValue\",\"valueKind\": \"curve min\",\"stringValue\":
+		// null,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": 0,\"sigFigs\": 2,\"uncertainty\": null,\"valueUnit\":
+		// null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\":
+		// false,\"publicData\": true,\"lsTransaction\": { \"comments\": \"protocol 102
+		// transactions\",\"id\": 1,\"recordedDate\": 1.354e+12,\"version\": 0
+		// },\"batchCode\": null,\"recordedDate\": 1.354e+12 },{ \"valueType\":
+		// \"numericValue\",\"valueKind\": \"curve max\",\"stringValue\":
+		// null,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": 100,\"sigFigs\": 2,\"uncertainty\":
+		// null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\":
+		// null,\"ignored\": false,\"publicData\": true,\"lsTransaction\": {
+		// \"comments\": \"protocol 102 transactions\",\"id\": 1,\"recordedDate\":
+		// 1.354e+12,\"version\": 0 },\"batchCode\": null,\"recordedDate\": 1.354e+12 }
+		// ],\"recordedBy\": \"userName\",\"stateType\": \"metadata\",\"stateKind\":
+		// \"protocol analysis parameters\",\"comments\": \"\",\"lsTransaction\": {
+		// \"comments\": \"protocol 102 transactions\",\"id\": 1,\"recordedDate\":
+		// 1.354e+12,\"version\": 0 },\"ignored\": false,\"recordedDate\": 1.354e+12 } ]
+		// }";
 		String json = "{\"codeName\":\"PROT-00000006E\",\"lsType\":\"default\",\"lsKind\":\"default\",\"shortDescription\":\"protocol created by generic data parser\",\"lsTransaction\":7,\"recordedBy\":\"mcneilco\",\"recordedDate\":1398908476000,\"lsLabels\":[{\"protocol\":null,\"labelText\":\"Target Y binding\",\"recordedBy\":\"mcneilco\",\"lsType\":\"name\",\"lsKind\":\"protocol name\",\"preferred\":true,\"ignored\":false,\"lsTransaction\":7,\"recordedDate\":1398908476000}],\"lsStates\":[]}";
 		Protocol protocol = Protocol.fromJsonToProtocol(json);
 		logger.info("initial json values: " + protocol.toJson());
-		
+
 		Protocol output;
 		try {
 			output = protocolService.saveLsProtocol(protocol);
@@ -112,25 +202,54 @@ public void CreateProtocolFromNestedJson(){
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		
 
-//		output = protocolService.saveLsProtocol(Protocol.fromJsonToProtocol(json));
-//		logger.info(output.toJson());
+		// output = protocolService.saveLsProtocol(Protocol.fromJsonToProtocol(json));
+		// logger.info(output.toJson());
 
-//		protocol.persist();
-//		logger.info(protocol.toJson());
+		// protocol.persist();
+		// logger.info(protocol.toJson());
 
 	}
-	
-	//@Test
+
+	// @Test
 	@Transactional
-	public void CreateProtocolFromNestedJson_5(){
-		//String json = "{\"experiments\":[],\"fullDescription\":\"\",\"ignored\":false,\"lsTransaction\":null,\"modifiedBy\":\"\",\"modifiedDate\":null,\"name\":\"asdf\",\"protocolStates\":[{\"recordedBy\":\"guy\",\"recordedDate\":1353225600000, \"lsTransaction\":null}],\"recordedBy\":\"guy\",\"recordedDate\":1353225600000,\"shortDescription\":\"asd\"}";
-		
-		//String json = "{ \"name\": \"PROT-101\",\"shortDescription\": \"Just a simple test\",\"lsTransaction\": null,\"protocolStates\": [ { \"protocolValues\": [ { \"valueType\": \"stringValue\",\"valueKind\": \"reader instrument\",\"stringValue\": \"Molecular Dynamics FLIPR\",\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"lsTransaction\": null,\"thingIdValue\": null,\"sampleId\": null,\"sampleName\": \"\",\"publicData\": false,\"recordedDate\":    1353267278000 },{ \"valueType\": \"numericValue\",\"valueKind\": \"curve min\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\":                0,\"sigFigs\":                2,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"lsTransaction\": null,\"thingIdValue\": null,\"sampleId\": null,\"sampleName\": \"\",\"publicData\": false,\"recordedDate\":    1353267278000 },{ \"valueType\": \"numericValue\",\"valueKind\": \"curve max\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\":              100,\"sigFigs\":                2,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"lsTransaction\": null,\"thingIdValue\": null,\"sampleId\": null,\"sampleName\": \"\",\"publicData\": false,\"recordedDate\":    1353267278000 } ],\"recordedBy\": \"userName\",\"stateType\": \"metadata\",\"stateKind\": \"protocol parameters\",\"comments\": \"\",\"lsTransaction\": null,\"ignored\": false,\"recordedDate\":    1353267278000 } ] }";
-		
+	public void CreateProtocolFromNestedJson_5() {
+		// String json =
+		// "{\"experiments\":[],\"fullDescription\":\"\",\"ignored\":false,\"lsTransaction\":null,\"modifiedBy\":\"\",\"modifiedDate\":null,\"name\":\"asdf\",\"protocolStates\":[{\"recordedBy\":\"guy\",\"recordedDate\":1353225600000,
+		// \"lsTransaction\":null}],\"recordedBy\":\"guy\",\"recordedDate\":1353225600000,\"shortDescription\":\"asd\"}";
+
+		// String json = "{ \"name\": \"PROT-101\",\"shortDescription\": \"Just a simple
+		// test\",\"lsTransaction\": null,\"protocolStates\": [ { \"protocolValues\": [
+		// { \"valueType\": \"stringValue\",\"valueKind\": \"reader
+		// instrument\",\"stringValue\": \"Molecular Dynamics FLIPR\",\"fileValue\":
+		// null,\"urlValue\": null,\"dateValue\": null,\"clobValue\":
+		// null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\":
+		// null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\":
+		// null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\":
+		// false,\"lsTransaction\": null,\"thingIdValue\": null,\"sampleId\":
+		// null,\"sampleName\": \"\",\"publicData\": false,\"recordedDate\":
+		// 1353267278000 },{ \"valueType\": \"numericValue\",\"valueKind\": \"curve
+		// min\",\"stringValue\": null,\"fileValue\": null,\"urlValue\":
+		// null,\"dateValue\": null,\"clobValue\": null,\"blobValue\":
+		// null,\"valueOperator\": null,\"numericValue\": 0,\"sigFigs\":
+		// 2,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\":
+		// \"\",\"comments\": null,\"ignored\": false,\"lsTransaction\":
+		// null,\"thingIdValue\": null,\"sampleId\": null,\"sampleName\":
+		// \"\",\"publicData\": false,\"recordedDate\": 1353267278000 },{ \"valueType\":
+		// \"numericValue\",\"valueKind\": \"curve max\",\"stringValue\":
+		// null,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": 100,\"sigFigs\": 2,\"uncertainty\":
+		// null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\":
+		// null,\"ignored\": false,\"lsTransaction\": null,\"thingIdValue\":
+		// null,\"sampleId\": null,\"sampleName\": \"\",\"publicData\":
+		// false,\"recordedDate\": 1353267278000 } ],\"recordedBy\":
+		// \"userName\",\"stateType\": \"metadata\",\"stateKind\": \"protocol
+		// parameters\",\"comments\": \"\",\"lsTransaction\": null,\"ignored\":
+		// false,\"recordedDate\": 1353267278000 } ] }";
+
 		String json = "{ \"name\": \"protocolName\",\"shortDescription\": \"protocol short description\",\"lsTransaction\": null,\"recordedBy\": \"userName\",\"recordedDate\":1353292248000,\"protocolStates\": [ { \"protocolValues\": [ { \"valueType\": \"stringValue\",\"valueKind\": \"reader instrument\",\"stringValue\": \"Molecular Dynamics FLIPR\",\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"lsTransaction\": null,\"thingIdValue\": null,\"sampleId\": null,\"sampleName\": \"\",\"publicData\": false,\"recordedDate\":1353292248000 },{ \"valueType\": \"numericValue\",\"valueKind\": \"curve min\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\":0,\"sigFigs\":2,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"lsTransaction\": null,\"thingIdValue\": null,\"sampleId\": null,\"sampleName\": \"\",\"publicData\": false,\"recordedDate\":1353292248000 },{ \"valueType\": \"numericValue\",\"valueKind\": \"curve max\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\":100,\"sigFigs\":2,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"lsTransaction\": null,\"thingIdValue\": null,\"sampleId\": null,\"sampleName\": \"\",\"publicData\": false,\"recordedDate\":1353292248000 } ],\"recordedBy\": \"userName\",\"stateType\": \"metadata\",\"stateKind\": \"protocol parameters\",\"comments\": \"\",\"lsTransaction\": null,\"ignored\": false,\"recordedDate\":1353292248000 } ] }";
-		
+
 		Protocol protocol = Protocol.fromJsonToProtocol(json);
 		logger.info("initial json values: " + protocol.toJson());
 		Protocol output;
@@ -141,14 +260,13 @@ public void CreateProtocolFromNestedJson_5(){
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		
 
 	}
 
 	@Test
 	@Transactional
-	public void UpdateProtocol_6() throws UniqueNameException{
-		
+	public void UpdateProtocol_6() throws UniqueNameException {
+
 		String protocolCodeName = "PROT-00000108";
 		Protocol fetchProtocol = Protocol.findProtocolsByCodeNameEquals(protocolCodeName).getSingleResult();
 		fetchProtocol.setShortDescription("some new short description");
@@ -157,49 +275,49 @@ public void UpdateProtocol_6() throws UniqueNameException{
 
 	}
 
-	//@Test
+	// @Test
 	@Transactional
-	public void ProtocolCodetable_7(){
-		
+	public void ProtocolCodetable_7() {
+
 		List<CodeTableDTO> output = Protocol.getProtocolCodeTable();
 		logger.info(CodeTableDTO.toJsonArray(output));
 
 	}
-	
-	//@Test
+
+	// @Test
 	@Transactional
-	public void ProtocolCodetable_8(){
+	public void ProtocolCodetable_8() {
 		String protocolNameLike = "MetStab";
 		List<CodeTableDTO> output = Protocol.getProtocolCodeTableByNameLike(protocolNameLike);
 		logger.info(CodeTableDTO.toJsonArray(output));
 
 	}
-	
+
 	@Transactional
 	@Test
-	public void ProtocolToJsonTest(){
+	public void ProtocolToJsonTest() {
 		Protocol protocol = Protocol.findProtocol(1575L);
 		protocol.toJson();
 	}
 
-	//Testing protocol browser search
-	//TODO: make this test pass!
-	//Fields that can be searched for:
-	//Protocol Name
-	//Code
-	//Kind
-	//Assay Tree Rule
-	//Scientist
-	//Date
-	//Notebook
-	//Key Words (Tags)
-	//Assay Activity
-	//Molecular Target
-	//Target Origin
-	//Assay Type
-	//Assay Technology/Kit Name
-	//Cell Line
-	//Assay Stage
+	// Testing protocol browser search
+	// TODO: make this test pass!
+	// Fields that can be searched for:
+	// Protocol Name
+	// Code
+	// Kind
+	// Assay Tree Rule
+	// Scientist
+	// Date
+	// Notebook
+	// Key Words (Tags)
+	// Assay Activity
+	// Molecular Target
+	// Target Origin
+	// Assay Type
+	// Assay Technology/Kit Name
+	// Cell Line
+	// Assay Stage
 	@Transactional
 	@Test
 	public void protocolBrowserSearchTest() {
@@ -217,96 +335,94 @@ public void protocolBrowserSearchTest() {
 		String assayTech;
 		String cellLine;
 		String assayStage;
-		String query = name + " " + code + " " + kind  + " " + notebook;
-		logger.info("Searching with the query: "+ query);
+		String query = name + " " + code + " " + kind + " " + notebook;
+		logger.info("Searching with the query: " + query);
 		Collection<Protocol> resultProtocols = protocolService.findProtocolsByGenericMetaDataSearch(query);
-		logger.info("Found: "+ resultProtocols.toString());
+		logger.info("Found: " + resultProtocols.toString());
 		Assert.assertNotNull(resultProtocols);
 		code = "PROT-";
 		query = code;
-		logger.info("Searching with the query: "+ query);
+		logger.info("Searching with the query: " + query);
 		resultProtocols = protocolService.findProtocolsByGenericMetaDataSearch(query);
-		logger.info("Found: "+ resultProtocols.toString());
+		logger.info("Found: " + resultProtocols.toString());
 		Assert.assertNotNull(resultProtocols);
 		name = "\"FLIPR target A biochemical\"";
 		query = name;
-		logger.info("Searching with the query: "+ query);
+		logger.info("Searching with the query: " + query);
 		resultProtocols = protocolService.findProtocolsByGenericMetaDataSearch(query);
-		logger.info("Found: "+ resultProtocols.toString());
+		logger.info("Found: " + resultProtocols.toString());
 		Assert.assertNotNull(resultProtocols);
 	}
-	
+
 	@Transactional
 	@Test
 	public void protocolBrowserSearchByDate() {
 		String date = "2016-08-15";
 		String query = date;
-		logger.info("Searching with the query: "+ query);
+		logger.info("Searching with the query: " + query);
 		Collection<Protocol> resultProtocols = protocolService.findProtocolsByGenericMetaDataSearch(query);
-		logger.info("Found: "+ resultProtocols.toString());
+		logger.info("Found: " + resultProtocols.toString());
 		Assert.assertNotNull(resultProtocols);
 	}
-	
+
 	@Transactional
 	@Test
 	public void protocolBrowserSearchTestWithQuotes() {
 		String query = "Target Y binding";
-		logger.info("Searching with the query: "+ query);
+		logger.info("Searching with the query: " + query);
 		Collection<Protocol> resultProtocols = protocolService.findProtocolsByGenericMetaDataSearch(query);
-		logger.info("Found: "+ resultProtocols.toString());
+		logger.info("Found: " + resultProtocols.toString());
 		Assert.assertTrue(resultProtocols.size() > 1);
 		query = "\"Target Y binding\"";
-		logger.info("Searching with the query: "+ query);
+		logger.info("Searching with the query: " + query);
 		resultProtocols = protocolService.findProtocolsByGenericMetaDataSearch(query);
-		logger.info("Found: "+ resultProtocols.toString());
+		logger.info("Found: " + resultProtocols.toString());
 		Assert.assertTrue(resultProtocols.size() == 1);
 	}
-	
+
 	@Transactional
 	@Test
-	public void protocolUpdate2() throws UniqueNameException{
+	public void protocolUpdate2() throws UniqueNameException {
 		String json = "{\"codeName\":\"PROT-00000002\",\"deleted\":false,\"experiments\":[],\"id\":46686,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[{\"deleted\":false,\"id\":291587,\"ignored\":true,\"labelText\":\"published data\",\"lsKind\":\"protocol name\",\"lsTransaction\":4,\"lsType\":\"name\",\"lsTypeAndKind\":\"name_protocol name\",\"modifiedDate\":1416777131198,\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"goshiro\",\"recordedDate\":1398461251000,\"version\":6},{\"deleted\":false,\"id\":291596,\"ignored\":false,\"labelText\":\"published data\",\"lsKind\":\"protocol name\",\"lsType\":\"name\",\"lsTypeAndKind\":\"name_protocol name\",\"physicallyLabled\":false,\"preferred\":true,\"recordedBy\":\"xxl7932\",\"recordedDate\":1416777131158,\"version\":0}],\"lsStates\":[{\"deleted\":false,\"id\":50733,\"ignored\":false,\"lsKind\":\"protocol metadata\",\"lsType\":\"metadata\",\"lsTypeAndKind\":\"metadata_protocol metadata\",\"lsValues\":[{\"clobValue\":\"\",\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":430507,\"ignored\":false,\"lsKind\":\"assay principle\",\"lsType\":\"clobValue\",\"lsTypeAndKind\":\"clobValue_assay principle\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"goshiro\",\"recordedDate\":1416600516194,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"clobValue\":\"\",\"codeKind\":\"\",\"codeOrigin\":\"\",\"codeType\":\"\",\"codeTypeAndKind\":\"null_null\",\"codeValue\":\"\",\"comments\":\"\",\"deleted\":false,\"fileValue\":\"\",\"id\":430508,\"ignored\":false,\"lsKind\":\"assay tree rule\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_assay tree rule\",\"modifiedBy\":\"\",\"operatorKind\":\"\",\"operatorType\":\"\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"goshiro\",\"recordedDate\":1416600516000,\"stringValue\":\"/ebola/cDNA/special assay/ex vivo/next\",\"uncertaintyType\":\"\",\"unitKind\":\"\",\"unitType\":\"\",\"unitTypeAndKind\":\"null_null\",\"urlValue\":\"\",\"version\":5},{\"codeTypeAndKind\":\"null_null\",\"dateValue\":1416643200000,\"deleted\":false,\"id\":430509,\"ignored\":false,\"lsKind\":\"completion date\",\"lsType\":\"dateValue\",\"lsTypeAndKind\":\"dateValue_completion date\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"goshiro\",\"recordedDate\":1416600516194,\"unitTypeAndKind\":\"null_null\",\"version\":1},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":430505,\"ignored\":false,\"lsKind\":\"notebook\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_notebook\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"goshiro\",\"recordedDate\":1416600516194,\"stringValue\":\"JMCO-0001-002\",\"unitTypeAndKind\":\"null_null\",\"version\":1},{\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":430506,\"ignored\":false,\"lsKind\":\"status\",\"lsType\":\"stringValue\",\"lsTypeAndKind\":\"stringValue_status\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"goshiro\",\"recordedDate\":1416600516194,\"stringValue\":\"created\",\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"clobValue\":\"\",\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":430512,\"ignored\":false,\"lsKind\":\"description\",\"lsType\":\"clobValue\",\"lsTypeAndKind\":\"clobValue_description\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"goshiro\",\"recordedDate\":1416600516194,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"clobValue\":\"\",\"codeTypeAndKind\":\"null_null\",\"deleted\":false,\"id\":430511,\"ignored\":false,\"lsKind\":\"comments\",\"lsType\":\"clobValue\",\"lsTypeAndKind\":\"clobValue_comments\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"goshiro\",\"recordedDate\":1416600516194,\"unitTypeAndKind\":\"null_null\",\"version\":0},{\"codeKind\":\"assay stage\",\"codeOrigin\":\"acas ddict\",\"codeType\":\"protocolMetadata\",\"codeTypeAndKind\":\"protocolMetadata_assay stage\",\"codeValue\":\"unassigned\",\"deleted\":false,\"id\":430510,\"ignored\":false,\"lsKind\":\"assay stage\",\"lsType\":\"codeValue\",\"lsTypeAndKind\":\"codeValue_assay stage\",\"operatorTypeAndKind\":\"null_null\",\"publicData\":false,\"recordedBy\":\"goshiro\",\"recordedDate\":1416600516194,\"unitTypeAndKind\":\"null_null\",\"version\":0}],\"modifiedDate\":1416777131203,\"recordedBy\":\"goshiro\",\"recordedDate\":1416600516194,\"version\":4}],\"lsTags\":[{\"tagText\":\"pineapple\"},{\"tagText\":\"gene\"},{\"tagText\":\"tag\"},{\"tagText\":\"guava\"},{\"tagText\":\"key\"},{\"tagText\":\"lobster\"}],\"lsTransaction\":4,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedDate\":1416777131188,\"recordedBy\":\"xxl7932\",\"recordedDate\":1416960127895,\"shortDescription\":\"protocol created by generic data parser\",\"version\":11}";
 		Protocol protocol = Protocol.fromJsonToProtocol(json);
 		protocolService.updateProtocol(protocol);
-				
+
 	}
-	
-	
-	//@Transactional
+
+	// @Transactional
 	@Test
 	public void protocolBrowserFilterTest() {
 		String name = "PAMPA Buffer A";
 		String codeName = "PROT-00000001";
 		String type = "default";
 		String kind = "default";
-		
-		
+
 		Map<String, String> requestParams = new HashMap<String, String>();
 		requestParams.put("name", name);
-		
+
 		Set<Protocol> protocols = protocolService.findProtocolsByRequestMetadata(requestParams);
 		Assert.assertEquals(1, protocols.size());
 		protocols.clear();
-		
+
 		requestParams.put("codeName", codeName);
 		protocols = protocolService.findProtocolsByRequestMetadata(requestParams);
 		Assert.assertEquals(1, protocols.size());
 		protocols.clear();
-		
+
 		requestParams.put("type", type);
 		requestParams.put("kind", kind);
-		
+
 		protocols = protocolService.findProtocolsByRequestMetadata(requestParams);
 		Assert.assertEquals(1, protocols.size());
 		protocols.clear();
-		
+
 		requestParams.remove("name");
 		protocols = protocolService.findProtocolsByRequestMetadata(requestParams);
 		Assert.assertEquals(1, protocols.size());
-		
+
 	}
-	
-	//@Test
+
+	// @Test
 	@Transactional
 	public void uniqueProtocolNameExceptionTest() throws UniqueNameException {
 		String name = "APMS";
@@ -318,50 +434,117 @@ public void uniqueProtocolNameExceptionTest() throws UniqueNameException {
 			Assert.assertNotNull(e);
 		}
 	}
-	
+
 	@Test
-//	@Transactional
+	// @Transactional
 	public void createProtocolStatusTest() {
 		Protocol protocol = Protocol.findProtocol(702987L);
-		ProtocolValue protocolValue = protocolValueService.updateProtocolValue(protocol.getCodeName(), "metadata", "protocol metadata", "codeValue", "protocol status", "created");
+		ProtocolValue protocolValue = protocolValueService.updateProtocolValue(protocol.getCodeName(), "metadata",
+				"protocol metadata", "codeValue", "protocol status", "created");
 		String createdProtocolStatus = protocolValue.getCodeValue();
-		Assert.assertEquals("created", createdProtocolStatus);		
+		Assert.assertEquals("created", createdProtocolStatus);
 	}
-	
+
 	@Test
 	@Transactional
 	public void updateProtocolStatusTest() {
 		Protocol protocol = Protocol.findProtocol(702987L);
-		ProtocolValue protocolValue = ProtocolValue.findProtocolValuesByProtocolIDAndStateTypeKindAndValueTypeKind(702987L, "metadata", "protocol metadata", "codeValue", "protocol status").getSingleResult();
+		ProtocolValue protocolValue = ProtocolValue.findProtocolValuesByProtocolIDAndStateTypeKindAndValueTypeKind(
+				702987L, "metadata", "protocol metadata", "codeValue", "protocol status").getSingleResult();
 		String originalProtocolStatus = protocolValue.getCodeValue();
 		Assert.assertTrue(!originalProtocolStatus.equals("deleted"));
-		ProtocolValue protocolValue2 = protocolValueService.updateProtocolValue(protocol.getCodeName(), "metadata", "protocol metadata", "codeValue", "protocol status", "deleted");
+		ProtocolValue protocolValue2 = protocolValueService.updateProtocolValue(protocol.getCodeName(), "metadata",
+				"protocol metadata", "codeValue", "protocol status", "deleted");
 		protocol.setIgnored(true);
 		String deletedProtocolStatus = protocolValue2.getCodeValue();
-		ProtocolValue protocolValue3 = ProtocolValue.findProtocolValuesByProtocolIDAndStateTypeKindAndValueTypeKind(702987L, "metadata", "protocol metadata", "codeValue", "protocol status").getSingleResult();
+		ProtocolValue protocolValue3 = ProtocolValue.findProtocolValuesByProtocolIDAndStateTypeKindAndValueTypeKind(
+				702987L, "metadata", "protocol metadata", "codeValue", "protocol status").getSingleResult();
 		String checkDeletedProtocolStatus = protocolValue3.getCodeValue();
 		Assert.assertEquals("deleted", deletedProtocolStatus);
 		Assert.assertEquals("deleted", checkDeletedProtocolStatus);
-		
+
 	}
-	
+
 	@Test
 	@Transactional
 	public void findScientistProtocolValue() {
-		Collection<ProtocolValue> protocolValues  = ProtocolValue.findProtocolValuesByLsKindEqualsAndStringValueLike("scientist", "*").getResultList();
+		Collection<ProtocolValue> protocolValues = ProtocolValue
+				.findProtocolValuesByLsKindEqualsAndStringValueLike("scientist", "*").getResultList();
 		logger.info(ProtocolValue.toJsonArray(protocolValues));
 	}
-	
+
 	@Test
-	//@Transactional
-	public void CreateProtocolFromNestedJson_withProject(){
+	// @Transactional
+	public void CreateProtocolFromNestedJson_withProject() {
 		LsTransaction lsTransaction = new LsTransaction();
 		lsTransaction.setComments("protocol 102 transactions");
 		lsTransaction.setRecordedDate(new Date());
 		lsTransaction.persist();
-		
-		//String json = "{ \"name\": \"\",\"shortDescription\": \"\",\"lsTransaction\": null,\"protocolStates\": [ { \"protocolValues\": [ { \"valueType\": \"stringValue\",\"valueKind\": \"reader instrument\",\"stringValue\": \"Molecular Dynamics FLIPR\",\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"lsTransaction\": null,\"thingIdValue\": null,\"sampleId\": null,\"sampleName\": \"\",\"publicData\": false,\"recordedDate\":    1353216427000 },{ \"valueType\": \"numericValue\",\"valueKind\": \"curve min\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\":                0,\"sigFigs\":                2,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"lsTransaction\": null,\"thingIdValue\": null,\"sampleId\": null,\"sampleName\": \"\",\"publicData\": false,\"recordedDate\":    1353216427000 },{ \"valueType\": \"numericValue\",\"valueKind\": \"curve max\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\":              100,\"sigFigs\":                2,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"lsTransaction\": null,\"thingIdValue\": null,\"sampleId\": null,\"sampleName\": \"\",\"publicData\": false,\"recordedDate\":    1353216427000 } ],\"recordedBy\": \"userName\",\"stateType\": \"metadata\",\"stateKind\": \"protocol parameters\",\"comments\": \"\",\"lsTransaction\": null,\"ignored\": false,\"recordedDate\":    1353216427000 } ] }";
-		//String json = "{ \"codeName\": \"protocolName101\",\"shortDescription\": \"protocol short description\",\"lsTransaction\": { \"comments\": \"protocol 102 transactions\",\"id\":      1,\"recordedDate\": 1.354e+12,\"version\":      0 },\"recordedBy\": \"userName\",\"recordedDate\": 1.354e+12,\"protocolStates\": [ { \"protocolValues\": [ { \"valueType\": \"stringValue\",\"valueKind\": \"reader instrument\",\"stringValue\": \"Molecular Dynamics FLIPR\",\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\": null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"lsTransaction\": { \"comments\": \"protocol 102 transactions\",\"id\":      1,\"recordedDate\": 1.354e+12,\"version\":      0 },\"batchCode\": null,\"recordedDate\": 1.354e+12 },{ \"valueType\": \"numericValue\",\"valueKind\": \"curve min\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\":      0,\"sigFigs\":      2,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"lsTransaction\": { \"comments\": \"protocol 102 transactions\",\"id\":      1,\"recordedDate\": 1.354e+12,\"version\":      0 },\"batchCode\": null,\"recordedDate\": 1.354e+12 },{ \"valueType\": \"numericValue\",\"valueKind\": \"curve max\",\"stringValue\": null,\"fileValue\": null,\"urlValue\": null,\"dateValue\": null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\": null,\"numericValue\":    100,\"sigFigs\":      2,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\": true,\"lsTransaction\": { \"comments\": \"protocol 102 transactions\",\"id\":      1,\"recordedDate\": 1.354e+12,\"version\":      0 },\"batchCode\": null,\"recordedDate\": 1.354e+12 } ],\"recordedBy\": \"userName\",\"stateType\": \"metadata\",\"stateKind\": \"protocol analysis parameters\",\"comments\": \"\",\"lsTransaction\": { \"comments\": \"protocol 102 transactions\",\"id\":      1,\"recordedDate\": 1.354e+12,\"version\":      0 },\"ignored\": false,\"recordedDate\": 1.354e+12 } ] }";
+
+		// String json = "{ \"name\": \"\",\"shortDescription\": \"\",\"lsTransaction\":
+		// null,\"protocolStates\": [ { \"protocolValues\": [ { \"valueType\":
+		// \"stringValue\",\"valueKind\": \"reader instrument\",\"stringValue\":
+		// \"Molecular Dynamics FLIPR\",\"fileValue\": null,\"urlValue\":
+		// null,\"dateValue\": null,\"clobValue\": null,\"blobValue\":
+		// null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\":
+		// null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\":
+		// null,\"concUnit\": \"\",\"comments\": null,\"ignored\":
+		// false,\"lsTransaction\": null,\"thingIdValue\": null,\"sampleId\":
+		// null,\"sampleName\": \"\",\"publicData\": false,\"recordedDate\":
+		// 1353216427000 },{ \"valueType\": \"numericValue\",\"valueKind\": \"curve
+		// min\",\"stringValue\": null,\"fileValue\": null,\"urlValue\":
+		// null,\"dateValue\": null,\"clobValue\": null,\"blobValue\":
+		// null,\"valueOperator\": null,\"numericValue\": 0,\"sigFigs\":
+		// 2,\"uncertainty\": null,\"valueUnit\": null,\"concValue\": null,\"concUnit\":
+		// \"\",\"comments\": null,\"ignored\": false,\"lsTransaction\":
+		// null,\"thingIdValue\": null,\"sampleId\": null,\"sampleName\":
+		// \"\",\"publicData\": false,\"recordedDate\": 1353216427000 },{ \"valueType\":
+		// \"numericValue\",\"valueKind\": \"curve max\",\"stringValue\":
+		// null,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": 100,\"sigFigs\": 2,\"uncertainty\":
+		// null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\":
+		// null,\"ignored\": false,\"lsTransaction\": null,\"thingIdValue\":
+		// null,\"sampleId\": null,\"sampleName\": \"\",\"publicData\":
+		// false,\"recordedDate\": 1353216427000 } ],\"recordedBy\":
+		// \"userName\",\"stateType\": \"metadata\",\"stateKind\": \"protocol
+		// parameters\",\"comments\": \"\",\"lsTransaction\": null,\"ignored\":
+		// false,\"recordedDate\": 1353216427000 } ] }";
+		// String json = "{ \"codeName\": \"protocolName101\",\"shortDescription\":
+		// \"protocol short description\",\"lsTransaction\": { \"comments\": \"protocol
+		// 102 transactions\",\"id\": 1,\"recordedDate\": 1.354e+12,\"version\": 0
+		// },\"recordedBy\": \"userName\",\"recordedDate\":
+		// 1.354e+12,\"protocolStates\": [ { \"protocolValues\": [ { \"valueType\":
+		// \"stringValue\",\"valueKind\": \"reader instrument\",\"stringValue\":
+		// \"Molecular Dynamics FLIPR\",\"fileValue\": null,\"urlValue\":
+		// null,\"dateValue\": null,\"clobValue\": null,\"blobValue\":
+		// null,\"valueOperator\": null,\"numericValue\": null,\"sigFigs\":
+		// null,\"uncertainty\": null,\"valueUnit\": null,\"concValue\":
+		// null,\"concUnit\": \"\",\"comments\": null,\"ignored\": false,\"publicData\":
+		// true,\"lsTransaction\": { \"comments\": \"protocol 102 transactions\",\"id\":
+		// 1,\"recordedDate\": 1.354e+12,\"version\": 0 },\"batchCode\":
+		// null,\"recordedDate\": 1.354e+12 },{ \"valueType\":
+		// \"numericValue\",\"valueKind\": \"curve min\",\"stringValue\":
+		// null,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": 0,\"sigFigs\": 2,\"uncertainty\": null,\"valueUnit\":
+		// null,\"concValue\": null,\"concUnit\": \"\",\"comments\": null,\"ignored\":
+		// false,\"publicData\": true,\"lsTransaction\": { \"comments\": \"protocol 102
+		// transactions\",\"id\": 1,\"recordedDate\": 1.354e+12,\"version\": 0
+		// },\"batchCode\": null,\"recordedDate\": 1.354e+12 },{ \"valueType\":
+		// \"numericValue\",\"valueKind\": \"curve max\",\"stringValue\":
+		// null,\"fileValue\": null,\"urlValue\": null,\"dateValue\":
+		// null,\"clobValue\": null,\"blobValue\": null,\"valueOperator\":
+		// null,\"numericValue\": 100,\"sigFigs\": 2,\"uncertainty\":
+		// null,\"valueUnit\": null,\"concValue\": null,\"concUnit\": \"\",\"comments\":
+		// null,\"ignored\": false,\"publicData\": true,\"lsTransaction\": {
+		// \"comments\": \"protocol 102 transactions\",\"id\": 1,\"recordedDate\":
+		// 1.354e+12,\"version\": 0 },\"batchCode\": null,\"recordedDate\": 1.354e+12 }
+		// ],\"recordedBy\": \"userName\",\"stateType\": \"metadata\",\"stateKind\":
+		// \"protocol analysis parameters\",\"comments\": \"\",\"lsTransaction\": {
+		// \"comments\": \"protocol 102 transactions\",\"id\": 1,\"recordedDate\":
+		// 1.354e+12,\"version\": 0 },\"ignored\": false,\"recordedDate\": 1.354e+12 } ]
+		// }";
 		String json = "{\"codeName\":\"PROT-00000006E\",\"lsType\":\"default\",\"lsKind\":\"default\",\"shortDescription\":\"protocol created by generic data parser\",\"lsTransaction\":7,\"recordedBy\":\"mcneilco\",\"recordedDate\":1398908476000,\"lsLabels\":[{\"protocol\":null,\"labelText\":\"Target Y binding\",\"recordedBy\":\"mcneilco\",\"lsType\":\"name\",\"lsKind\":\"protocol name\",\"preferred\":true,\"ignored\":false,\"lsTransaction\":7,\"recordedDate\":1398908476000}],\"lsStates\":[]}";
 		Protocol protocol = Protocol.fromJsonToProtocol(json);
 		ProtocolState metadata = new ProtocolState();
@@ -378,10 +561,9 @@ public void CreateProtocolFromNestedJson_withProject(){
 		projectValue.setRecordedDate(protocol.getRecordedDate());
 		metadata.getLsValues().add(projectValue);
 		protocol.getLsStates().add(metadata);
-		
+
 		logger.info("initial json values: " + protocol.toJson());
 
-		
 		Protocol output;
 		try {
 			output = protocolService.saveLsProtocol(protocol);
@@ -391,30 +573,37 @@ public void CreateProtocolFromNestedJson_withProject(){
 			e.printStackTrace();
 		}
 	}
-	
+
 	@Transactional
 	@Test
 	public void protocolBrowserSearchTest_projectRestrictions() {
-		//to run this test from an empty database:
-		//first start up ACAS to populate default types/kinds
-		//then run all tests in CreateProjectsTests sequentially to create three projects, two users, lsroles, and author roles
-		//then run CreateProtocolFromNestedJson_withProject (above) to create a test protocol tagged with one of the projects
-		//then run this test. The first user should have access to the project, the second should not
-		String projectCode = ProtocolValue.findProtocolValuesByLsKindEqualsAndCodeValueLike("project", "*").getResultList().get(0).getCodeValue();
+		// to run this test from an empty database:
+		// first start up ACAS to populate default types/kinds
+		// then run all tests in CreateProjectsTests sequentially to create three
+		// projects, two users, lsroles, and author roles
+		// then run CreateProtocolFromNestedJson_withProject (above) to create a test
+		// protocol tagged with one of the projects
+		// then run this test. The first user should have access to the project, the
+		// second should not
+		String projectCode = ProtocolValue.findProtocolValuesByLsKindEqualsAndCodeValueLike("project", "*")
+				.getResultList().get(0).getCodeValue();
 		logger.info(projectCode);
-		String userName = AuthorRole.findAuthorRolesByRoleEntry(LsRole.findLsRolesByLsTypeEqualsAndLsKindEquals("Project", projectCode).getResultList().get(0)).getResultList().get(0).getUserEntry().getUserName();
+		String userName = AuthorRole
+				.findAuthorRolesByRoleEntry(
+						LsRole.findLsRolesByLsTypeEqualsAndLsKindEquals("Project", projectCode).getResultList().get(0))
+				.getResultList().get(0).getUserEntry().getUserName();
 		String code = "PROT-00000006E";
 		String query = code;
-		logger.info("Searching with the query: "+ query + " with userName: "+userName);
-		
+		logger.info("Searching with the query: " + query + " with userName: " + userName);
+
 		Collection<Protocol> resultProtocols = protocolService.findProtocolsByGenericMetaDataSearch(query, userName);
-		logger.info("Found: "+ resultProtocols.toString());
+		logger.info("Found: " + resultProtocols.toString());
 		Assert.assertFalse(resultProtocols.isEmpty());
-		
+
 		userName = "bsplit";
-		logger.info("Searching with the query: "+ query + " with userName: "+userName);
+		logger.info("Searching with the query: " + query + " with userName: " + userName);
 		resultProtocols = protocolService.findProtocolsByGenericMetaDataSearch(query, userName);
-		logger.info("Found: "+ resultProtocols.toString());
+		logger.info("Found: " + resultProtocols.toString());
 		Assert.assertTrue(resultProtocols.isEmpty());
 	}
 }
diff --git a/src/test/java/com/labsynch/labseer/service/ReadBulkTrasnferPart1CSVServiceTests.java b/src/test/java/com/labsynch/labseer/service/ReadBulkTrasnferPart1CSVServiceTests.java
index 283bf5134..72880ff13 100755
--- a/src/test/java/com/labsynch/labseer/service/ReadBulkTrasnferPart1CSVServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/ReadBulkTrasnferPart1CSVServiceTests.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import java.io.BufferedReader;
@@ -31,246 +30,244 @@
 import org.supercsv.io.ICsvBeanReader;
 import org.supercsv.prefs.CsvPreference;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext.xml")
 @Configurable
 public class ReadBulkTrasnferPart1CSVServiceTests {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(ReadBulkTrasnferPart1CSVServiceTests.class);
 	private String fieldDelimiter = ",";
-	
+
 	@Test
-	//@Transactional
-	public void ReadCSVFile_Test1() throws IOException{
-		
+	// @Transactional
+	public void ReadCSVFile_Test1() throws IOException {
+
 		logger.info("read csv file");
 		String testFileName = "Primary Screen Part 1 Transfer Log 20130820_110701.csv";
 		InputStream is = ReadBulkTrasnferPart1CSVServiceTests.class.getClassLoader().getResourceAsStream(testFileName);
-//		InputStream is = IOUtils.toInputStream(inputFile);
-
-//	    BufferedReader reader = new BufferedReader(new InputStreamReader(is));
-//	    logger.debug(IOUtils.toString(is));
-//	    String csvFile = IOUtils.toString(is, "UTF-8");	    
-//	    logger.info(csvFile);
-	    
-		InputStreamReader isr = new InputStreamReader(is);  
+		// InputStream is = IOUtils.toInputStream(inputFile);
+
+		// BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+		// logger.debug(IOUtils.toString(is));
+		// String csvFile = IOUtils.toString(is, "UTF-8");
+		// logger.info(csvFile);
+
+		InputStreamReader isr = new InputStreamReader(is);
 		BufferedReader br = new BufferedReader(isr);
-//		String headerLine = br.readLine();
-//		logger.debug("HeaderLine: " + headerLine);
-//
-//		StringWriter csvFileOut = new StringWriter();
-//		ICsvMapWriter writer = new CsvMapWriter(csvFileOut, CsvPreference.EXCEL_PREFERENCE);
-//		
-		
+		// String headerLine = br.readLine();
+		// logger.debug("HeaderLine: " + headerLine);
+		//
+		// StringWriter csvFileOut = new StringWriter();
+		// ICsvMapWriter writer = new CsvMapWriter(csvFileOut,
+		// CsvPreference.EXCEL_PREFERENCE);
+		//
+
 		String nameMapping;
 		BulkTransferPart1DTO bb = new BulkTransferPart1DTO();
-//		beanReader.read(Experiment, nameMapping)
-		
-        
-       // final CellProcessor[] processors = getProcessors();
-
-//		BulkTransferPart1DTO clazz = new BulkTransferPart1DTO();
-//		BulkTransferPart1DTO ick = beanReader.read(BulkTransferPart1DTO.class, header, processors);
-		
-        ICsvBeanReader beanReader = null;
-        try {
-        	LsTransaction lsTranscation = new LsTransaction();
-    		beanReader = new CsvBeanReader(br, CsvPreference.EXCEL_PREFERENCE);
-    		String[] headerText = beanReader.getHeader(true);
-    		
-    		for (String head : headerText){
-    			logger.warn("header column: " + head);
-    		}
-
-                
-                // the header elements are used to map the values to the bean (names must match)
-                //final String[] header = beanReader.getHeader(true);
-    		
-            	final String[] header = new String[] { "sourceBarcode", "sourceWell", "destinationBarcode", "destinationPlateSize", "destinationWell", 
-    				 "amountTransferred", "amountUnits", "finalConcentration", "concUnits", "finalVolume",
-    				"volumeUnits", "liquidType", "dateTime", "transferProtocol", "isNewPlate", "possibleTransferError"};
-            
-                final CellProcessor[] processors = getProcessors();
-                
-                BulkTransferPart1DTO bulkData;
-                while( (bulkData = beanReader.read(BulkTransferPart1DTO.class, header, processors)) != null ) {
-                        System.out.println(String.format("lineNo=%s, rowNo=%s, bulkData=%s", beanReader.getLineNumber(), beanReader.getRowNumber(), bulkData));
-                        
-                	
-                		Container destinationPlate = getPlate(bulkData.getDestinationBarcode(), bulkData.getDestinationPlateSize());
-                		Container sourcePlate = getPlate(bulkData.getDestinationBarcode(), bulkData.getDestinationPlateSize());
-                        
-                        
-                }
-                
-        }
-        finally {
-                if( beanReader != null ) {
-                        beanReader.close();
-                }
-        }
-		
-		
-
-		//beanReader.read(asd, nameMapping);
-
-//		String inputLine = null;
-//		while( (inputLine = br.readLine()) != null) {
-//			//break delimiter separated line using fieldDelimiter
-//			String[] tempString = inputLine.split(fieldDelimiter);
-//		}
-	    
-  
-	   
-		
-//	    Source Barcode,Source Well,Destination Barcode,Destination Plate Size,
-//	    Destination Well,Amount Transferred,Amount Units,Final Concentration,
-//	    Concentration Units,Final Volume,Final Volume Units,Liquid Type,Date Time,
-//	    Protocol,Is New Plate,Possible Transfer Error
-	    
+		// beanReader.read(Experiment, nameMapping)
+
+		// final CellProcessor[] processors = getProcessors();
+
+		// BulkTransferPart1DTO clazz = new BulkTransferPart1DTO();
+		// BulkTransferPart1DTO ick = beanReader.read(BulkTransferPart1DTO.class,
+		// header, processors);
+
+		ICsvBeanReader beanReader = null;
+		try {
+			LsTransaction lsTranscation = new LsTransaction();
+			beanReader = new CsvBeanReader(br, CsvPreference.EXCEL_PREFERENCE);
+			String[] headerText = beanReader.getHeader(true);
+
+			for (String head : headerText) {
+				logger.warn("header column: " + head);
+			}
+
+			// the header elements are used to map the values to the bean (names must match)
+			// final String[] header = beanReader.getHeader(true);
+
+			final String[] header = new String[] { "sourceBarcode", "sourceWell", "destinationBarcode",
+					"destinationPlateSize", "destinationWell",
+					"amountTransferred", "amountUnits", "finalConcentration", "concUnits", "finalVolume",
+					"volumeUnits", "liquidType", "dateTime", "transferProtocol", "isNewPlate",
+					"possibleTransferError" };
+
+			final CellProcessor[] processors = getProcessors();
+
+			BulkTransferPart1DTO bulkData;
+			while ((bulkData = beanReader.read(BulkTransferPart1DTO.class, header, processors)) != null) {
+				System.out.println(String.format("lineNo=%s, rowNo=%s, bulkData=%s", beanReader.getLineNumber(),
+						beanReader.getRowNumber(), bulkData));
+
+				Container destinationPlate = getPlate(bulkData.getDestinationBarcode(),
+						bulkData.getDestinationPlateSize());
+				Container sourcePlate = getPlate(bulkData.getDestinationBarcode(), bulkData.getDestinationPlateSize());
+
+			}
+
+		} finally {
+			if (beanReader != null) {
+				beanReader.close();
+			}
+		}
+
+		// beanReader.read(asd, nameMapping);
+
+		// String inputLine = null;
+		// while( (inputLine = br.readLine()) != null) {
+		// //break delimiter separated line using fieldDelimiter
+		// String[] tempString = inputLine.split(fieldDelimiter);
+		// }
+
+		// Source Barcode,Source Well,Destination Barcode,Destination Plate Size,
+		// Destination Well,Amount Transferred,Amount Units,Final Concentration,
+		// Concentration Units,Final Volume,Final Volume Units,Liquid Type,Date Time,
+		// Protocol,Is New Plate,Possible Transfer Error
+
 		logger.info("Registering samples");
-	//	ICsvMapReader inputMapFile = new CsvMapReader(new StringReader(csvFile), CsvPreference.EXCEL_PREFERENCE);
+		// ICsvMapReader inputMapFile = new CsvMapReader(new StringReader(csvFile),
+		// CsvPreference.EXCEL_PREFERENCE);
 		Map<String, String> dataMapIn = new HashMap<String, String>();
 		StringWriter outFile = new StringWriter();
-		//ICsvMapWriter writer = new CsvMapWriter(outFile, CsvPreference.EXCEL_PREFERENCE);
-        try {
-//			String[] inputCSVheader = inputMapFile.getHeader(true);
-//			writer.writeHeader(inputCSVheader);
-        } catch (Exception e){
-        	e.printStackTrace();
-		} 
-	    
+		// ICsvMapWriter writer = new CsvMapWriter(outFile,
+		// CsvPreference.EXCEL_PREFERENCE);
+		try {
+			// String[] inputCSVheader = inputMapFile.getHeader(true);
+			// writer.writeHeader(inputCSVheader);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
 		logger.info(outFile.toString());
 	}
-	
-    private Container getPlate(String destinationBarcode,
+
+	private Container getPlate(String destinationBarcode,
 			String destinationPlateSize) {
-    	Container plate;
-    	
-        // check if plate exists
-        List<Container> foundContainer = Container.findContainerByContainerLabel(destinationBarcode);
-        if (foundContainer.size() == 0){
-        	logger.warn("did not find the container");
+		Container plate;
+
+		// check if plate exists
+		List<Container> foundContainer = Container.findContainerByContainerLabel(destinationBarcode);
+		if (foundContainer.size() == 0) {
+			logger.warn("did not find the container");
 			plate = createPlate(destinationBarcode, destinationPlateSize);
-        } else {
-        	logger.warn("found the container" + destinationBarcode + "  number of containers: " + foundContainer.size());
-        	plate = foundContainer.get(0);
-        }
-        
+		} else {
+			logger.warn(
+					"found the container" + destinationBarcode + "  number of containers: " + foundContainer.size());
+			plate = foundContainer.get(0);
+		}
+
 		return plate;
 	}
 
-
 	private Container createPlate(String barcode, String plateSize) {
-    	Container plate = new Container();
-    	String codeName = "to be assigned";
-    	plate.setCodeName(codeName);
-    	plate.setLsType("plate");
-    	plate.setLsKind("384 well compound plate");
-    	plate.persist();
-    	
-    	ContainerState cs = new ContainerState();
-    	cs.setLsType("constants");
-    	cs.setLsKind("plate format");
-    	cs.setContainer(plate);
-    	cs.persist();
-    	
+		Container plate = new Container();
+		String codeName = "to be assigned";
+		plate.setCodeName(codeName);
+		plate.setLsType("plate");
+		plate.setLsKind("384 well compound plate");
+		plate.persist();
+
+		ContainerState cs = new ContainerState();
+		cs.setLsType("constants");
+		cs.setLsKind("plate format");
+		cs.setContainer(plate);
+		cs.persist();
+
 		return plate;
 	}
 
-	
-//	  plateCodeNameList <- getAutoLabels(thingTypeAndKind="material_container",
-//              labelTypeAndKind="id_codeName", 
-//              numberOfLabels=length(barcodes))
-//	  return(createContainer(
-//			    codeName = codeName[[1]],
-//			    lsType = "plate", 
-//			    lsKind = "384 well compound plate", 
-//			    recordedBy = recordedBy,
-//			    lsTransaction = lsTransaction,
-//			    containerLabels = list(createContainerLabel(
-//			      labelText = barcode,
-//			      recordedBy = recordedBy,
-//			      lsType = "barcode",
-//			      lsKind = "plate barcode",
-//			      lsTransaction = lsTransaction)),
-//			    containerStates = list(createContainerState(
-//			      lsType="constants",
-//			      lsKind="plate format",
-//			      recordedBy=recordedBy,
-//			      lsTransaction=lsTransaction,
-//			      containerValues= list(
-//			        createStateValue(
-//			          lsType="numericValue",
-//			          lsKind="rows",
-//			          numericValue=16,
-//			          lsTransaction=lsTransaction),
-//			        createStateValue(
-//			          lsType="numericValue",
-//			          lsKind="columns",
-//			          numericValue=24,
-//			          lsTransaction=lsTransaction),
-//			        createStateValue(
-//			          lsType="numericValue",
-//			          lsKind="wells",
-//			          numericValue=384,
-//			          lsTransaction=lsTransaction)
-//			      )
-//			    ), createContainerState(
-//			      lsType="metadata",
-//			      lsKind="plate information",
-//			      recordedBy=recordedBy,
-//			      lsTransaction=lsTransaction,
-//			      containerValues= list(
-//			        createStateValue(
-//			          lsType="fileValue",
-//			          lsKind="source file",
-//			          fileValue=sourceFile,
-//			          lsTransaction=lsTransaction,
-//			          recordedBy= recordedBy))
-//			    ))
-//			  ))
-//			}	
-	
-	
+	// plateCodeNameList <- getAutoLabels(thingTypeAndKind="material_container",
+	// labelTypeAndKind="id_codeName",
+	// numberOfLabels=length(barcodes))
+	// return(createContainer(
+	// codeName = codeName[[1]],
+	// lsType = "plate",
+	// lsKind = "384 well compound plate",
+	// recordedBy = recordedBy,
+	// lsTransaction = lsTransaction,
+	// containerLabels = list(createContainerLabel(
+	// labelText = barcode,
+	// recordedBy = recordedBy,
+	// lsType = "barcode",
+	// lsKind = "plate barcode",
+	// lsTransaction = lsTransaction)),
+	// containerStates = list(createContainerState(
+	// lsType="constants",
+	// lsKind="plate format",
+	// recordedBy=recordedBy,
+	// lsTransaction=lsTransaction,
+	// containerValues= list(
+	// createStateValue(
+	// lsType="numericValue",
+	// lsKind="rows",
+	// numericValue=16,
+	// lsTransaction=lsTransaction),
+	// createStateValue(
+	// lsType="numericValue",
+	// lsKind="columns",
+	// numericValue=24,
+	// lsTransaction=lsTransaction),
+	// createStateValue(
+	// lsType="numericValue",
+	// lsKind="wells",
+	// numericValue=384,
+	// lsTransaction=lsTransaction)
+	// )
+	// ), createContainerState(
+	// lsType="metadata",
+	// lsKind="plate information",
+	// recordedBy=recordedBy,
+	// lsTransaction=lsTransaction,
+	// containerValues= list(
+	// createStateValue(
+	// lsType="fileValue",
+	// lsKind="source file",
+	// fileValue=sourceFile,
+	// lsTransaction=lsTransaction,
+	// recordedBy= recordedBy))
+	// ))
+	// ))
+	// }
+
 	private static CellProcessor[] getProcessors() {
-    	
-//	    Source Barcode,Source Well,Destination Barcode,Destination Plate Size,
-//	    Destination Well,Amount Transferred,Amount Units,Final Concentration,
-//	    Concentration Units,Final Volume,Final Volume Units,Liquid Type,Date Time,
-//	    Protocol,Is New Plate,Possible Transfer Error 16 cols
-    	
-//    	final String[] header = new String[] { "sourceBarcode", "sourceWell", "destinationBarcode", "destinationWell", 
-//			"destinationPlateSize", "amountTransferred", "amountUnits", "finalConcentration", "concUnits", "finalVolume",
-//			"volumeUnits", "liquidType", "dateTime", "transferProtocol", "isNewPlate", "possibleTransferError"};
-    	
-//    	"dd/MM/yyyy" (parses a date formatted as "25/12/2011")
-//    	"dd-MMM-yy" (parses a date formatted as "25-Dec-11")
-//    	"yyyy.MM.dd.HH.mm.ss" (parses a date formatted as "2011.12.25.08.36.33"
-//    	"E, dd MMM yyyy HH:mm:ss Z" (parses a date formatted as "Tue, 25 Dec 2011 08:36:33 -0500")
-    	
-        final CellProcessor[] processors = new CellProcessor[] { 
-                new Optional(),  // sourceBarcode
-                new Optional(),  // 
-                new Optional(),  // 
-                new Optional(),  // 
-                new Optional(),  // 
-                new Optional(),  // 
-                new Optional(),  // 
-                new Optional(),  // 
-                new Optional(), // 
-                new Optional(), // 
-                new Optional(), // 
-                new Optional(), // 
-                new Optional(new ParseDate("yyyy-MM-dd HH:mm")), // dateTime
-                new Optional(), // transferProtocol
-                new Optional(new ParseBool()), //isNewPlate 
-                new Optional()   // 
-        };
-        
-        return processors;
-}
-	
+
+		// Source Barcode,Source Well,Destination Barcode,Destination Plate Size,
+		// Destination Well,Amount Transferred,Amount Units,Final Concentration,
+		// Concentration Units,Final Volume,Final Volume Units,Liquid Type,Date Time,
+		// Protocol,Is New Plate,Possible Transfer Error 16 cols
+
+		// final String[] header = new String[] { "sourceBarcode", "sourceWell",
+		// "destinationBarcode", "destinationWell",
+		// "destinationPlateSize", "amountTransferred", "amountUnits",
+		// "finalConcentration", "concUnits", "finalVolume",
+		// "volumeUnits", "liquidType", "dateTime", "transferProtocol", "isNewPlate",
+		// "possibleTransferError"};
+
+		// "dd/MM/yyyy" (parses a date formatted as "25/12/2011")
+		// "dd-MMM-yy" (parses a date formatted as "25-Dec-11")
+		// "yyyy.MM.dd.HH.mm.ss" (parses a date formatted as "2011.12.25.08.36.33"
+		// "E, dd MMM yyyy HH:mm:ss Z" (parses a date formatted as "Tue, 25 Dec 2011
+		// 08:36:33 -0500")
+
+		final CellProcessor[] processors = new CellProcessor[] {
+				new Optional(), // sourceBarcode
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
+				new Optional(), //
+				new Optional(new ParseDate("yyyy-MM-dd HH:mm")), // dateTime
+				new Optional(), // transferProtocol
+				new Optional(new ParseBool()), // isNewPlate
+				new Optional() //
+		};
+
+		return processors;
+	}
 
 }
diff --git a/src/test/java/com/labsynch/labseer/service/StructureServiceTests.java b/src/test/java/com/labsynch/labseer/service/StructureServiceTests.java
index e5d2019da..a28fb939d 100644
--- a/src/test/java/com/labsynch/labseer/service/StructureServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/StructureServiceTests.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import java.io.IOException;
@@ -22,9 +21,9 @@
 
 import junit.framework.Assert;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class StructureServiceTests {
 
@@ -33,97 +32,101 @@ public class StructureServiceTests {
 	@Autowired
 	private StructureService structureService;
 
-//	@Test
+	// @Test
 	@Transactional
-	public void substructureSearch(){
-		String queryMol= "\n  Mrv1641110051619032D          \n\n  5  5  0  0  0  0            999 V2000\n   -0.0446    0.6125    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.7121    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.4572   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.3679   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.6228    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n  2  3  1  0  0  0  0\n  3  4  1  0  0  0  0\n  4  5  1  0  0  0  0\n  1  2  1  0  0  0  0\n  1  5  1  0  0  0  0\nM  END\n";
-		Collection<ChemStructure> searchResults = structureService.searchStructures(queryMol, SearchType.SUBSTRUCTURE, 10, null);
+	public void substructureSearch() {
+		String queryMol = "\n  Mrv1641110051619032D          \n\n  5  5  0  0  0  0            999 V2000\n   -0.0446    0.6125    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.7121    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.4572   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.3679   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.6228    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n  2  3  1  0  0  0  0\n  3  4  1  0  0  0  0\n  4  5  1  0  0  0  0\n  1  2  1  0  0  0  0\n  1  5  1  0  0  0  0\nM  END\n";
+		Collection<ChemStructure> searchResults = structureService.searchStructures(queryMol, SearchType.SUBSTRUCTURE,
+				10, null);
 		Assert.assertFalse(searchResults.isEmpty());
 		logger.debug(ChemStructure.toJsonArray(searchResults));
-		
+
 		queryMol = "\n  MJ160418                      \n\n 20 23  0  0  0  0  0  0  0  0999 V2000\n   -0.9620   -1.3787    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -1.2169   -2.1634    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -2.0419   -2.1634    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -2.2968   -1.3787    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -1.6294   -0.8938    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -1.6294   -0.0688    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -0.9620    0.4160    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -1.2169    1.2006    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -2.0419    1.2006    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -2.2968    0.4160    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -0.1773    0.1611    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n    0.4900    0.6460    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n    1.1574    0.1611    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n    0.9025   -0.6235    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n    0.0775   -0.6235    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n    0.4900    1.4710    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -0.1773    1.9559    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n    0.0775    2.7405    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n    0.9025    2.7405    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n    1.1574    1.9559    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n 18 19  1  0  0  0  0\n 17 18  1  0  0  0  0\n 16 17  1  0  0  0  0\n 19 20  1  0  0  0  0\n 16 20  1  0  0  0  0\n 12 16  1  0  0  0  0\n 11 12  1  0  0  0  0\n  7 11  1  0  0  0  0\n  7  8  1  0  0  0  0\n  8  9  1  0  0  0  0\n  9 10  1  0  0  0  0\n  6  7  1  0  0  0  0\n  6 10  1  0  0  0  0\n  5  6  1  0  0  0  0\n  4  5  1  0  0  0  0\n  3  4  1  0  0  0  0\n  2  3  1  0  0  0  0\n  1  5  1  0  0  0  0\n  1  2  1  0  0  0  0\n 11 15  1  0  0  0  0\n 14 15  1  0  0  0  0\n 12 13  1  0  0  0  0\n 13 14  1  0  0  0  0\nM  END\n";
 		searchResults = structureService.searchStructures(queryMol, SearchType.SUBSTRUCTURE, 10, null);
-		//Assert.assertTrue(searchResults.isEmpty());
+		// Assert.assertTrue(searchResults.isEmpty());
 	}
-	
-//	@Test
+
+	// @Test
 	@Transactional
-	public void similaritySearch(){
-		//same - pass
+	public void similaritySearch() {
+		// same - pass
 		String sameStructure = "\n  Mrv1641110051619032D          \n\n  5  5  0  0  0  0            999 V2000\n   -0.0446    0.6125    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.7121    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.4572   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.3679   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.6228    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n  2  3  1  0  0  0  0\n  3  4  1  0  0  0  0\n  4  5  1  0  0  0  0\n  1  2  1  0  0  0  0\n  1  5  1  0  0  0  0\nM  END\n";
 		Float similarity = new Float("0.90");
-		Collection<ChemStructure> searchResults = structureService.searchStructures(sameStructure, SearchType.SIMILARITY, null, similarity);
+		Collection<ChemStructure> searchResults = structureService.searchStructures(sameStructure,
+				SearchType.SIMILARITY, null, similarity);
 		Assert.assertFalse(searchResults.isEmpty());
 		logger.debug(ChemStructure.toJsonArray(searchResults));
-		//similar structure - high similarity threshold - fail
+		// similar structure - high similarity threshold - fail
 		String similarStructure = "\n  MJ160418                      \n\n  5  4  0  0  0  0  0  0  0  0999 V2000\n    0.1116    1.9740    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.5557    1.4890    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.3008    0.7044    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.5241    0.7044    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.8596    1.4581    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n  2  3  1  0  0  0  0\n  3  4  1  0  0  0  0\n  1  2  1  0  0  0  0\n  4  5  1  0  0  0  0\nM  END\n";
 		similarity = new Float("0.90");
 		searchResults = structureService.searchStructures(similarStructure, SearchType.SIMILARITY, null, similarity);
 		Assert.assertTrue(searchResults.isEmpty());
-		//lower threshold - pass
+		// lower threshold - pass
 		similarity = new Float("0.70");
 		searchResults = structureService.searchStructures(similarStructure, SearchType.SIMILARITY, null, similarity);
-		//Assert.assertFalse(searchResults.isEmpty());
+		// Assert.assertFalse(searchResults.isEmpty());
 		logger.debug(ChemStructure.toJsonArray(searchResults));
 	}
-	
-//	@Test
+
+	// @Test
 	@Transactional
-	public void exactSearch(){
+	public void exactSearch() {
 		String sameStructure = "\n  Mrv1641110051619032D          \n\n  5  5  0  0  0  0            999 V2000\n   -0.0446    0.6125    0.0000 O   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.7121    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n   -0.4572   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.3679   -0.6572    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n    0.6228    0.1274    0.0000 C   0  0  0  0  0  0  0  0  0  0  0  0\n  2  3  1  0  0  0  0\n  3  4  1  0  0  0  0\n  4  5  1  0  0  0  0\n  1  2  1  0  0  0  0\n  1  5  1  0  0  0  0\nM  END\n";
-		Collection<ChemStructure> searchResults = structureService.searchStructures(sameStructure, SearchType.EXACT, 10, null);
-		//Assert.assertFalse(searchResults.isEmpty());
+		Collection<ChemStructure> searchResults = structureService.searchStructures(sameStructure, SearchType.EXACT, 10,
+				null);
+		// Assert.assertFalse(searchResults.isEmpty());
 		logger.debug(ChemStructure.toJsonArray(searchResults));
 	}
 
-//	@Test
+	// @Test
 	@Transactional
-	public void substructureCodeSearch() throws IOException, CDKException{
-		
+	public void substructureCodeSearch() throws IOException, CDKException {
+
 		String queryMol = "\n  MJ160418                      \n\n 20 23  0  0  0  0  0  0  0  0999 V2000\n   -0.9620   -1.3787    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -1.2169   -2.1634    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -2.0419   -2.1634    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -2.2968   -1.3787    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -1.6294   -0.8938    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -1.6294   -0.0688    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -0.9620    0.4160    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -1.2169    1.2006    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -2.0419    1.2006    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -2.2968    0.4160    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -0.1773    0.1611    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n    0.4900    0.6460    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n    1.1574    0.1611    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n    0.9025   -0.6235    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n    0.0775   -0.6235    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n    0.4900    1.4710    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n   -0.1773    1.9559    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n    0.0775    2.7405    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n    0.9025    2.7405    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n    1.1574    1.9559    0.0000 Si  0  0  0  0  0  0  0  0  0  0  0  0\n 18 19  1  0  0  0  0\n 17 18  1  0  0  0  0\n 16 17  1  0  0  0  0\n 19 20  1  0  0  0  0\n 16 20  1  0  0  0  0\n 12 16  1  0  0  0  0\n 11 12  1  0  0  0  0\n  7 11  1  0  0  0  0\n  7  8  1  0  0  0  0\n  8  9  1  0  0  0  0\n  9 10  1  0  0  0  0\n  6  7  1  0  0  0  0\n  6 10  1  0  0  0  0\n  5  6  1  0  0  0  0\n  4  5  1  0  0  0  0\n  3  4  1  0  0  0  0\n  2  3  1  0  0  0  0\n  1  5  1  0  0  0  0\n  1  2  1  0  0  0  0\n 11 15  1  0  0  0  0\n 14 15  1  0  0  0  0\n 12 13  1  0  0  0  0\n 13 14  1  0  0  0  0\nM  END\n";
 		ChemStructure structure = new ChemStructure();
 		structure.setMolStructure(queryMol);
 		structure.setRecordedBy("acas_admin");
 		structure.setRecordedDate(new Date());
 		structureService.saveStructure(structure);
-		Collection<String> searchCodes = structureService.searchStructuresCodes(queryMol, SearchType.SUBSTRUCTURE, 10, null);
-		for (String searchCode : searchCodes){
+		Collection<String> searchCodes = structureService.searchStructuresCodes(queryMol, SearchType.SUBSTRUCTURE, 10,
+				null);
+		for (String searchCode : searchCodes) {
 			logger.info(searchCode);
 		}
-		
+
 		logger.info("##############");
 		logger.info("number of structures found: " + searchCodes.size());
-		//Assert.assertTrue(searchResults.isEmpty());
+		// Assert.assertTrue(searchResults.isEmpty());
 	}
-	
+
 	@Test
 	@Transactional
-	public void monomerStructureSearch() throws IOException, CDKException{
-		
+	public void monomerStructureSearch() throws IOException, CDKException {
+
 		String queryMol = "\nMolecule from ChemDoodle Web Components\n\nhttp://www.ichemlabs.com\n  5  5  0  0  0  0            999 V2000\n    0.0000    0.7694    0.0000 C   0  0  0  0  0  0\n    0.8090    0.1816    0.0000 C   0  0  0  0  0  0\n    0.5000   -0.7694    0.0000 C   0  0  0  0  0  0\n   -0.5000   -0.7694    0.0000 C   0  0  0  0  0  0\n   -0.8090    0.1816    0.0000 C   0  0  0  0  0  0\n  1  2  1  0     0  0\n  2  3  1  0     0  0\n  3  4  1  0     0  0\n  4  5  1  0     0  0\n  5  1  1  0     0  0\nM  END";
 		ChemStructure structure = new ChemStructure();
 		structure.setMolStructure(queryMol);
 		structure.setRecordedBy("acas_admin");
 		structure.setRecordedDate(new Date());
 		structureService.saveStructure(structure);
-		Collection<ChemStructure> structures = structureService.searchStructures(queryMol, SearchType.SUBSTRUCTURE, 10, null);
+		Collection<ChemStructure> structures = structureService.searchStructures(queryMol, SearchType.SUBSTRUCTURE, 10,
+				null);
 
-		
 		logger.info("##############");
 		logger.info("number of structures found: " + structures.size());
-		//Assert.assertTrue(searchResults.isEmpty());
+		// Assert.assertTrue(searchResults.isEmpty());
 	}
-	
+
 	@Test
-	public void convertSmilesToMol() throws Exception{
+	public void convertSmilesToMol() throws Exception {
 		String smiles = "O=C1NC%91=NC2NC=NC=21.[*:1]%91 |$;;;;;;;;;;_R1$|";
-		//String smiles = "CCC>>CCN";
+		// String smiles = "CCC>>CCN";
 		String molStructure = structureService.convertSmilesToMol(smiles);
 		logger.info(molStructure);
 	}
-	
+
 	@Test
-	public void cleanMol() throws Exception{
+	public void cleanMol() throws Exception {
 		String queryMol = "Molecule from ChemDoodle Web Components\n\nhttp://www.ichemlabs.com\n  5  5  0  0  0  0            999 V2000\n    0.0000    0.7694    0.0000 C   0  0  0  0  0  0\n    0.8090    0.1816    0.0000 C   0  0  0  0  0  0\n    0.5000   -0.7694    0.0000 C   0  0  0  0  0  0\n   -0.5000   -0.7694    0.0000 C   0  0  0  0  0  0\n   -0.8090    0.1816    0.0000 C   0  0  0  0  0  0\n  1  2  1  0     0  0\n  2  3  1  0     0  0\n  3  4  1  0     0  0\n  4  5  1  0     0  0\n  5  1  1  0     0  0\nM  END";
 		String molStructure = structureService.cleanMolStructure(queryMol);
 		logger.info(molStructure);
diff --git a/src/test/java/com/labsynch/labseer/service/SubjectServiceTest.java b/src/test/java/com/labsynch/labseer/service/SubjectServiceTest.java
index 69b296f3a..268e1028a 100755
--- a/src/test/java/com/labsynch/labseer/service/SubjectServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/SubjectServiceTest.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import java.util.Collection;
@@ -26,50 +25,50 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class SubjectServiceTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(SubjectServiceTest.class);
-	
+
 	@Autowired
 	private SubjectService subjectService;
-	
-	
-//	@Test
-	public void FindSubjectTest_1(){
-		Long subjectId = 3860L; //3860L; //3484
+
+	// @Test
+	public void FindSubjectTest_1() {
+		Long subjectId = 3860L; // 3860L; //3484
 		Subject subj = Subject.findSubject(subjectId);
 		logger.info(subj.toJson());
-		
+
 		SubjectDTO subjectDTO = new SubjectDTO(subj);
 
 		List<SubjectLabel> subjectLabels = SubjectLabel.findSubjectLabelsBySubject(subj).getResultList();
 		Set<SubjectLabelDTO> subjectLabelDTOs = new HashSet<SubjectLabelDTO>();
-		for (SubjectLabel subjectLabel : subjectLabels){
+		for (SubjectLabel subjectLabel : subjectLabels) {
 			SubjectLabelDTO subjectLabelDTO = new SubjectLabelDTO(subjectLabel);
 			subjectLabelDTOs.add(subjectLabelDTO);
 		}
 		subjectDTO.setLsLabels(subjectLabelDTOs);
-		
+
 		List<SubjectState> subjectStates = SubjectState.findSubjectStatesBySubject(subj).getResultList();
 		Set<SubjectStateDTO> subjectStateDTOs = new HashSet<SubjectStateDTO>();
-		for (SubjectState ss:subjectStates ){
+		for (SubjectState ss : subjectStates) {
 			SubjectStateDTO ssDTO = new SubjectStateDTO(ss);
-			Set<SubjectValue> subjectValues = new HashSet<SubjectValue>(SubjectValue.findSubjectValuesByLsState(ss).getResultList());
+			Set<SubjectValue> subjectValues = new HashSet<SubjectValue>(
+					SubjectValue.findSubjectValuesByLsState(ss).getResultList());
 			ssDTO.setSubjectValues(subjectValues);
 			subjectStateDTOs.add(ssDTO);
 		}
 		subjectDTO.setLsStates(subjectStateDTOs);
-		
+
 		logger.info(subjectDTO.toJson());
-		
+
 	}
-	
-//	@Test
-	public void FindSubjectTest_2(){
+
+	// @Test
+	public void FindSubjectTest_2() {
 		Subject subject1 = new Subject();
 		subject1.setId(75186L);
 		Subject subject2 = new Subject();
@@ -81,63 +80,63 @@ public void FindSubjectTest_2(){
 		subjectList.add(subject1);
 		subjectList.add(subject2);
 		subjectList.add(subject3);
-		
+
 		logger.info(Subject.toJsonArray(subjectList));
 
 		String stateTypeKind = "data_results";
 		Set<SubjectDTO> output = subjectService.getSubjectsWithStateTypeAndKind(subjectList, stateTypeKind);
 		logger.info(SubjectDTO.toJsonArray(output));
-		
+
 	}
 
-	//@Test
-	public void FindSubjectTest_3(){
+	// @Test
+	public void FindSubjectTest_3() {
 		String json = "[{\"id\":75186}, {\"id\":75187}, {\"id\":75190}]";
 		String stateTypeAndKind = "data_results";
-    	logger.info("incoming json: " + json);
-    	logger.info("incoming stateTypeAndKind: " + stateTypeAndKind);
-    	Collection<Subject> querySubjects = Subject.fromJsonArrayToSubjects(json);
+		logger.info("incoming json: " + json);
+		logger.info("incoming stateTypeAndKind: " + stateTypeAndKind);
+		Collection<Subject> querySubjects = Subject.fromJsonArrayToSubjects(json);
 		Set<Subject> subjectList = new HashSet<Subject>();
-		for (Subject query : querySubjects){
+		for (Subject query : querySubjects) {
 			logger.info("current subject: " + query.toJson());
 			Subject newSubject = new Subject();
 			newSubject.setId(query.getId());
 			subjectList.add(newSubject);
 		}
-    	Set<SubjectDTO> subjects = subjectService.getSubjectsWithStateTypeAndKind(subjectList, stateTypeAndKind);
-    	logger.info(SubjectDTO.toJsonArray(subjects));
+		Set<SubjectDTO> subjects = subjectService.getSubjectsWithStateTypeAndKind(subjectList, stateTypeAndKind);
+		logger.info(SubjectDTO.toJsonArray(subjects));
 	}
-	
-//	@Test
-	public void IgnoreSubjectTest_4(){
+
+	// @Test
+	public void IgnoreSubjectTest_4() {
 		String json = "[{\"id\":75186}, {\"id\":75187}, {\"id\":75190}]";
-    	logger.info("incoming json: " + json);
-    	Collection<Subject> querySubjects = Subject.fromJsonArrayToSubjects(json);
+		logger.info("incoming json: " + json);
+		Collection<Subject> querySubjects = Subject.fromJsonArrayToSubjects(json);
 		Set<Subject> subjectList = new HashSet<Subject>();
-		for (Subject query : querySubjects){
+		for (Subject query : querySubjects) {
 			logger.info("current subject: " + query.toJson());
 			Subject newSubject = new Subject();
 			newSubject.setId(query.getId());
 			subjectList.add(newSubject);
 		}
-    	Set<Subject> subjects = subjectService.ignoreAllSubjectStates(subjectList);
-    	logger.info(Subject.toJsonArray(subjects));
+		Set<Subject> subjects = subjectService.ignoreAllSubjectStates(subjectList);
+		logger.info(Subject.toJsonArray(subjects));
 	}
-	
+
 	@Test
-	public void SimpleTest_5(){
+	public void SimpleTest_5() {
 		Subject subject = Subject.findSubject(499834L);
 		logger.info(SubjectLabel.toJsonArray(SubjectLabel.findSubjectLabelsBySubject(subject).getResultList()));
 		logger.info(subject.toJson());
 	}
-	
+
 	@Test
 	@Transactional
-	@Rollback(value=false)
-	public void saveSubjectWithStates(){
+	@Rollback(value = false)
+	public void saveSubjectWithStates() {
 		String json = "{\"lsType\":\"default\",\"lsKind\":\"default\",\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193599,\"lsTransaction\":138,\"treatmentGroups\":[{\"id\":216}],\"lsStates\":[{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193599,\"lsTransaction\":138,\"lsType\":\"meta\",\"lsKind\":\"test settings\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193599,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193603,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193603,\"lsTransaction\":138,\"lsType\":\"meta\",\"lsKind\":\"test setup\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193603,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193605,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"user log\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193605,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193611,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193611,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193612,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193612,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193612,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"trial\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193612,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193613,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"user log\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193613,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193617,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193618,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193618,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193618,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"trial\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193618,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193619,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"user log\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193619,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193622,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193623,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193623,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193623,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"trial\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193623,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193624,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"user log\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193624,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193627,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193629,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193629,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193629,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"trial\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193629,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193630,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"user log\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193630,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193647,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193649,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193649,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193649,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"trial\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193649,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193651,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"user log\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193651,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193656,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193657,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193657,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193657,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"trial\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193657,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193659,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"user log\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193659,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193663,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193663,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193664,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193664,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193664,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"trial\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193664,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193665,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"user log\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193665,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193671,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193672,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193672,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193672,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"trial\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193672,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193673,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"user log\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193673,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193678,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval change\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193678,\"lsTransaction\":138,\"lsType\":\"results\",\"lsKind\":\"interval\",\"lsValues\":[]},{\"recordedBy\":\"jmcneil\",\"recordedDate\":1455728193678,\"lsTransaction\":138,\"lsType\":\"meta\",\"lsKind\":\"test exit\",\"lsValues\":[]}]}";
 		Subject subject = Subject.fromJsonToSubject(json);
 		subjectService.saveSubject(subject);
 	}
-	
+
 }
diff --git a/src/test/java/com/labsynch/labseer/service/SubjectStateServiceTest.java b/src/test/java/com/labsynch/labseer/service/SubjectStateServiceTest.java
index f178acdd7..36a03aa72 100755
--- a/src/test/java/com/labsynch/labseer/service/SubjectStateServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/SubjectStateServiceTest.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import com.labsynch.labseer.domain.SubjectState;
@@ -17,35 +16,34 @@
 
 import junit.framework.Assert;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class SubjectStateServiceTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(SubjectStateServiceTest.class);
-	
+
 	@Autowired
 	private SubjectStateService subjectStateService;
-	
-	
-	
+
 	@Test
-	public void SimpleTest_1(){
+	public void SimpleTest_1() {
 		SubjectState subjectState = SubjectState.findSubjectState(1203L);
 		logger.info(subjectState.toJson());
 		logger.info(SubjectValue.toJsonArray(SubjectValue.findSubjectValuesByLsState(subjectState).getResultList()));
-		
+
 		logger.info(subjectState.toString());
 	}
-	
+
 	@Test
 	@Transactional
 	public void createSubjectStateBySubjectIdAndStateTypeKindTest() {
 		Long subjectId = 155L;
 		String lsType = "metadata";
 		String lsKind = "subject metadata";
-		SubjectState subjectState = subjectStateService.createSubjectStateBySubjectIdAndStateTypeKind(subjectId, lsType, lsKind);
+		SubjectState subjectState = subjectStateService.createSubjectStateBySubjectIdAndStateTypeKind(subjectId, lsType,
+				lsKind);
 		Assert.assertNotNull(subjectState);
 		logger.info(subjectState.toJson());
 	}
diff --git a/src/test/java/com/labsynch/labseer/service/SubjectValueServiceTest.java b/src/test/java/com/labsynch/labseer/service/SubjectValueServiceTest.java
index 31a6e59a3..72d7fc330 100755
--- a/src/test/java/com/labsynch/labseer/service/SubjectValueServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/SubjectValueServiceTest.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import java.io.BufferedReader;
@@ -28,30 +27,30 @@
 
 import junit.framework.Assert;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class SubjectValueServiceTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(SubjectValueServiceTest.class);
-	
+
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
-	
+
 	@Autowired
 	private SubjectValueService subjectValueService;
-		
-	//@Test
+
+	// @Test
 	@Transactional
-	public void SimpleTest_1(){
+	public void SimpleTest_1() {
 		SubjectState subjectState = SubjectState.findSubjectState(1072L);
 		logger.info(subjectState.toJson());
 		logger.info(SubjectValue.toJsonArray(SubjectValue.findSubjectValuesByLsState(subjectState).getResultList()));
 	}
 
-	//@Test
-	public void SimpleTest_2(){
+	// @Test
+	public void SimpleTest_2() {
 		SubjectState subjectState = SubjectState.findSubjectState(17580L);
 		SubjectValue subjectValue = new SubjectValue();
 		subjectValue.setLsState(subjectState);
@@ -63,32 +62,33 @@ public void SimpleTest_2(){
 		subjectValue.persist();
 		logger.info(subjectValue.toJson());
 	}
-	
-//	@Test
-	public void SimpleTest_3(){
+
+	// @Test
+	public void SimpleTest_3() {
 		SubjectState subjectState = SubjectState.findSubjectState(17580L);
 		List<SubjectValue> subjectValues = SubjectValue.findSubjectValuesByLsState(subjectState).getResultList();
 		logger.info("number of subject values found: " + subjectValues.size());
-		for (SubjectValue subjectValue : subjectValues){
+		for (SubjectValue subjectValue : subjectValues) {
 			subjectValue.remove();
-//			SubjectValue queryVal = SubjectValue.findSubjectValue(subjectValue.getId());
-//			queryVal.getLsState().getLsValues().remove(queryVal);
-//			queryVal.remove();
-			//			logger.info("attempt to remove subjectValue: " + queryVal.getId());
-//	        Assert.assertNotNull("'SubjectValue' failed to initialize correctly", queryVal);
-//	        SubjectValue.delete(subjectValue);
+			// SubjectValue queryVal = SubjectValue.findSubjectValue(subjectValue.getId());
+			// queryVal.getLsState().getLsValues().remove(queryVal);
+			// queryVal.remove();
+			// logger.info("attempt to remove subjectValue: " + queryVal.getId());
+			// Assert.assertNotNull("'SubjectValue' failed to initialize correctly",
+			// queryVal);
+			// SubjectValue.delete(subjectValue);
 		}
 		logger.debug("removed all subject values");
 	}
-	
-//	@Test
+
+	// @Test
 	@Transactional
-	public void SimpleTest_4(){
+	public void SimpleTest_4() {
 		long startTime = new Date().getTime();
 		SubjectState subjectState = SubjectState.findSubjectState(17580L);
 		List<SubjectValue> subjectValues = new ArrayList<SubjectValue>();
 		// create 100 subject values
-		for ( int i=0; i < 102; i++ ) {
+		for (int i = 0; i < 102; i++) {
 			SubjectValue subjectValue = new SubjectValue();
 			subjectValue.setLsState(subjectState);
 			subjectValue.setLsType("stringValue");
@@ -98,45 +98,45 @@ public void SimpleTest_4(){
 			subjectValue.setRecordedDate(new Date());
 			subjectValues.add(subjectValue);
 			subjectValue.persist();
-		    if ( i % 50 == 0 ) { //50, same as the JDBC batch size
-		    	subjectValue.flush();
-		    	subjectValue.clear();
-		    }
+			if (i % 50 == 0) { // 50, same as the JDBC batch size
+				subjectValue.flush();
+				subjectValue.clear();
+			}
 		}
-//		SubjectValue.saveList(subjectValues);
+		// SubjectValue.saveList(subjectValues);
 		logger.debug("saved all subject values " + subjectValues.size());
 		long endTime = new Date().getTime();
-		logger.info("elapsed time = " + (endTime-startTime));
+		logger.info("elapsed time = " + (endTime - startTime));
 	}
-	
-	//@Test
+
+	// @Test
 	@Transactional
-	public void SimpleTest_5() throws IOException{
-		
+	public void SimpleTest_5() throws IOException {
+
 		String fileName = "/tmp/valuesJSON.json";
 
 		long startTime = System.currentTimeMillis();
 		int batchSize = propertiesUtilService.getBatchSize();
-		int i = 0;		
-		
+		int i = 0;
+
 		BufferedReader br = new BufferedReader(new FileReader(fileName));
-		
-		for (SubjectValue subjectValue : SubjectValue.fromJsonArrayToSubjectValues(br)){
+
+		for (SubjectValue subjectValue : SubjectValue.fromJsonArrayToSubjectValues(br)) {
 			logger.warn(subjectValue.toJson());
-//			subjectValue.persist();
-//		    if ( i % batchSize == 0 ) { //50, same as the JDBC batch size
-//		    	subjectValue.flush();
-//		    	subjectValue.clear();
-//		    }
-		    i++;
+			// subjectValue.persist();
+			// if ( i % batchSize == 0 ) { //50, same as the JDBC batch size
+			// subjectValue.flush();
+			// subjectValue.clear();
+			// }
+			i++;
 		}
 
 		logger.warn("total number of values in the array: " + i);
-//		logger.debug(json);
+		// logger.debug(json);
 		long endTime = new Date().getTime();
-		logger.info("elapsed time = " + (endTime-startTime));
+		logger.info("elapsed time = " + (endTime - startTime));
 	}
-	
+
 	@Test
 	@Transactional
 	public void testSubjectServiceSave() {
@@ -144,19 +144,20 @@ public void testSubjectServiceSave() {
 		SubjectValue subjectValue = SubjectValue.fromJsonToSubjectValue(json);
 		subjectValueService.saveSubjectValue(subjectValue);
 	}
-	
+
 	@Test
 	@Transactional
-	public void QuerySubjectValueByExpIdAndStateTypeKind(){
-			
+	public void QuerySubjectValueByExpIdAndStateTypeKind() {
+
 		Long experimentId = 14L;
 		String stateType = "data";
 		String stateKind = "test compound treatment";
-		List<SubjectValue> results = subjectValueService.getSubjectValuesByExperimentIdAndStateTypeKind(experimentId, stateType, stateKind);
+		List<SubjectValue> results = subjectValueService.getSubjectValuesByExperimentIdAndStateTypeKind(experimentId,
+				stateType, stateKind);
 		logger.info(SubjectValue.toJsonArray(results));
-		assert(results.size() == 800);
+		assert (results.size() == 800);
 	}
-	
+
 	@Test
 	@Transactional
 	public void QuerySubjectValueByExpIdAndStateTypeKindWithBadData() {
@@ -165,13 +166,14 @@ public void QuerySubjectValueByExpIdAndStateTypeKindWithBadData() {
 		String stateKind = "experiment metadata";
 		List<SubjectValue> results = new ArrayList<SubjectValue>();
 		try {
-			results = subjectValueService.getSubjectValuesByExperimentIdAndStateTypeKind(experimentId, stateType, stateKind);
-		} catch(IllegalArgumentException ex ) {
+			results = subjectValueService.getSubjectValuesByExperimentIdAndStateTypeKind(experimentId, stateType,
+					stateKind);
+		} catch (IllegalArgumentException ex) {
 			logger.info(ex.getMessage());
 		}
-		assert(results.size() == 0);
+		assert (results.size() == 0);
 	}
-	
+
 	@Test
 	@Transactional
 	public void QuerySubjectValueByExpIdAndStateTypeKindWithCodeName() {
@@ -182,53 +184,58 @@ public void QuerySubjectValueByExpIdAndStateTypeKindWithCodeName() {
 		boolean didCatch = false;
 		try {
 			experiment = Experiment.findExperimentsByCodeNameEquals(experimentCodeName).getSingleResult();
-		} catch(NoResultException nre) {
+		} catch (NoResultException nre) {
 			logger.info(nre.getMessage());
 			didCatch = true;
 		}
 		List<SubjectValue> results = new ArrayList<SubjectValue>();
 		try {
-			results = subjectValueService.getSubjectValuesByExperimentIdAndStateTypeKind(experiment.getId(), stateType, stateKind);
-		} catch(IllegalArgumentException ex ) {
+			results = subjectValueService.getSubjectValuesByExperimentIdAndStateTypeKind(experiment.getId(), stateType,
+					stateKind);
+		} catch (IllegalArgumentException ex) {
 			logger.info(ex.getMessage());
-			assert(results.size() == 0);
+			assert (results.size() == 0);
 			didCatch = true;
 		}
-		if(!didCatch) assert(results.size() == 800);
+		if (!didCatch)
+			assert (results.size() == 800);
 	}
-	
+
 	@Test
 	@Transactional
-	public void QuerySubjectValueByExpIdAndStateTypeKindAndValueTypeKind(){
-			
+	public void QuerySubjectValueByExpIdAndStateTypeKindAndValueTypeKind() {
+
 		Long experimentId = 14L;
 		String stateType = "data";
 		String stateKind = "test compound treatment";
 		String valueType = "codeValue";
 		String valueKind = "batch code";
-		List<SubjectValue> results = subjectValueService.getSubjectValuesByExperimentIdAndStateTypeKindAndValueTypeKind(experimentId, stateType, stateKind, valueType, valueKind);
+		List<SubjectValue> results = subjectValueService.getSubjectValuesByExperimentIdAndStateTypeKindAndValueTypeKind(
+				experimentId, stateType, stateKind, valueType, valueKind);
 		logger.info(SubjectValue.toJsonArray(results));
-		assert(results.size() == 400);
+		assert (results.size() == 400);
 	}
-	
+
 	@Test
 	@Transactional
 	public void SubjectValuesToCsv() {
 		List<SubjectValue> subjectValues = subjectValueService.getSubjectValuesBySubjectId(685408L);
 		String csvString = subjectValueService.getCsvList(subjectValues);
-		assert(csvString != null && csvString.compareTo("") != 0);
+		assert (csvString != null && csvString.compareTo("") != 0);
 		logger.info(csvString);
 	}
-	
+
 	@Test
 	@Transactional
 	public void SubjectValuesToCsvForCurveFit() {
-		List<SubjectValue> subjectValues = subjectValueService.getSubjectValuesByExperimentIdAndStateTypeKindAndValueTypeKind(54375L, "data", "results", "numericValue", "Response");
+		List<SubjectValue> subjectValues = subjectValueService
+				.getSubjectValuesByExperimentIdAndStateTypeKindAndValueTypeKind(54375L, "data", "results",
+						"numericValue", "Response");
 		String csvString = subjectValueService.getCsvList(subjectValues);
 		Assert.assertNotNull(csvString);
 		logger.info(csvString);
 	}
-	
+
 	@Test
 	@Transactional
 	public void updateSubjectValueTest() {
@@ -238,7 +245,8 @@ public void updateSubjectValueTest() {
 		String valueType = "stringValue";
 		String valueKind = "status";
 		String value = "Deleted";
-		SubjectValue subjectValue = subjectValueService.updateSubjectValue(idOrCodeName, stateType, stateKind, valueType, valueKind, value);
+		SubjectValue subjectValue = subjectValueService.updateSubjectValue(idOrCodeName, stateType, stateKind,
+				valueType, valueKind, value);
 		Assert.assertNotNull(subjectValue);
 		logger.info(subjectValue.toJson());
 	}
diff --git a/src/test/java/com/labsynch/labseer/service/TreatmentGroupStateServiceTest.java b/src/test/java/com/labsynch/labseer/service/TreatmentGroupStateServiceTest.java
index b9b6402d6..9a2b9ea9b 100644
--- a/src/test/java/com/labsynch/labseer/service/TreatmentGroupStateServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/TreatmentGroupStateServiceTest.java
@@ -17,26 +17,28 @@
 import junit.framework.Assert;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class TreatmentGroupStateServiceTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(TreatmentGroupStateServiceTest.class);
 
 	@Autowired
 	private TreatmentGroupStateService treatmentGroupStateService;
-	
+
 	@Test
 	@Transactional
 	public void createTreatmentGroupStateByTreatmentGroupIdAndStateTypeKindTest() {
 		Long treatmentGroupId = 35L;
 		String lsType = "metadata";
 		String lsKind = "treatmentGroup metadata";
-		TreatmentGroupState treatmentGroupState = treatmentGroupStateService.createTreatmentGroupStateByTreatmentGroupIdAndStateTypeKind(treatmentGroupId, lsType, lsKind);
+		TreatmentGroupState treatmentGroupState = treatmentGroupStateService
+				.createTreatmentGroupStateByTreatmentGroupIdAndStateTypeKind(treatmentGroupId, lsType, lsKind);
 		Assert.assertNotNull(treatmentGroupState);
 		logger.info(treatmentGroupState.toJson());
 	}
-	
+
 	@Test
 	@Transactional
 	public void saveTreatmentGroupStateFromJson() {
@@ -45,14 +47,15 @@ public void saveTreatmentGroupStateFromJson() {
 		treatmentGroupState = treatmentGroupStateService.saveTreatmentGroupState(treatmentGroupState);
 		Assert.assertNotNull(treatmentGroupState.getId());
 	}
-	
+
 	@Test
 	@Transactional
 	public void saveTreatmentGroupStatesFromJson() {
 		String json = "[{\"treatmentGroup\":{\"analysisGroups\":[{\"codeName\":\"AG-00342416\",\"deleted\":false,\"id\":499698,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":1368,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142896894,\"version\":0}],\"codeName\":\"TG-00076401\",\"deleted\":false,\"id\":499710,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsStates\":[{\"comments\":null,\"deleted\":false,\"id\":685925,\"ignored\":false,\"lsKind\":\"test compound treatment\",\"lsTransaction\":1368,\"lsType\":\"data\",\"lsTypeAndKind\":\"data_test compound treatment\",\"lsValues\":[{\"analysisGroupId\":0,\"clobValue\":null,\"codeKind\":null,\"codeOrigin\":null,\"codeType\":null,\"codeTypeAndKind\":\"null_null\",\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"deleted\":false,\"fileValue\":null,\"id\":2284749,\"ignored\":false,\"lsKind\":\"Dose\",\"lsTransaction\":1368,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_Dose\",\"modifiedBy\":null,\"modifiedDate\":null,\"numberOfReplicates\":null,\"numericValue\":20,\"operatorKind\":null,\"operatorType\":null,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142898184,\"sigFigs\":null,\"stateId\":685925,\"stateKind\":\"test compound treatment\",\"stateType\":\"data\",\"stringValue\":null,\"treatmentGroupId\":499710,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":\"uM\",\"unitType\":null,\"unitTypeAndKind\":\"null_uM\",\"urlValue\":null,\"version\":0}],\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142898182,\"version\":0},{\"comments\":null,\"deleted\":false,\"id\":685926,\"ignored\":false,\"lsKind\":\"results\",\"lsTransaction\":1368,\"lsType\":\"data\",\"lsTypeAndKind\":\"data_results\",\"lsValues\":[{\"analysisGroupId\":0,\"clobValue\":null,\"codeKind\":null,\"codeOrigin\":null,\"codeType\":null,\"codeTypeAndKind\":\"null_null\",\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"deleted\":false,\"fileValue\":null,\"id\":2284750,\"ignored\":false,\"lsKind\":\"Response\",\"lsTransaction\":1368,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_Response\",\"modifiedBy\":null,\"modifiedDate\":null,\"numberOfReplicates\":null,\"numericValue\":93.85875,\"operatorKind\":null,\"operatorType\":null,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142898187,\"sigFigs\":null,\"stateId\":685926,\"stateKind\":\"results\",\"stateType\":\"data\",\"stringValue\":null,\"treatmentGroupId\":499710,\"uncertainty\":3.59397712615611,\"uncertaintyType\":\"standard deviation\",\"unitKind\":\"efficacy\",\"unitType\":null,\"unitTypeAndKind\":\"null_efficacy\",\"urlValue\":null,\"version\":0}],\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142898186,\"version\":0}],\"lsTransaction\":1368,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142898181,\"subjects\":[{\"codeName\":\"SUBJ-00236004\",\"deleted\":false,\"id\":499830,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":1368,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142900029,\"version\":0},{\"codeName\":\"SUBJ-00236024\",\"deleted\":false,\"id\":499850,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":1368,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142900482,\"version\":0},{\"codeName\":\"SUBJ-00236014\",\"deleted\":false,\"id\":499840,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":1368,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142900255,\"version\":0},{\"codeName\":\"SUBJ-00236034\",\"deleted\":false,\"id\":499860,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":1368,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142900674,\"version\":0}],\"version\":0},\"lsValues\":null,\"recordedBy\":\"userName\",\"lsType\":\"data\",\"lsKind\":\"results\",\"comments\":\"\",\"lsTransaction\":3067,\"ignored\":false,\"recordedDate\":1415752381000},{\"treatmentGroup\":{\"analysisGroups\":[{\"codeName\":\"AG-00342416\",\"deleted\":false,\"id\":499698,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":1368,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142896894,\"version\":0}],\"codeName\":\"TG-00076401\",\"deleted\":false,\"id\":499710,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsStates\":[{\"comments\":null,\"deleted\":false,\"id\":685925,\"ignored\":false,\"lsKind\":\"test compound treatment\",\"lsTransaction\":1368,\"lsType\":\"data\",\"lsTypeAndKind\":\"data_test compound treatment\",\"lsValues\":[{\"analysisGroupId\":0,\"clobValue\":null,\"codeKind\":null,\"codeOrigin\":null,\"codeType\":null,\"codeTypeAndKind\":\"null_null\",\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"deleted\":false,\"fileValue\":null,\"id\":2284749,\"ignored\":false,\"lsKind\":\"Dose\",\"lsTransaction\":1368,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_Dose\",\"modifiedBy\":null,\"modifiedDate\":null,\"numberOfReplicates\":null,\"numericValue\":20,\"operatorKind\":null,\"operatorType\":null,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142898184,\"sigFigs\":null,\"stateId\":685925,\"stateKind\":\"test compound treatment\",\"stateType\":\"data\",\"stringValue\":null,\"treatmentGroupId\":499710,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":\"uM\",\"unitType\":null,\"unitTypeAndKind\":\"null_uM\",\"urlValue\":null,\"version\":0}],\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142898182,\"version\":0},{\"comments\":null,\"deleted\":false,\"id\":685926,\"ignored\":false,\"lsKind\":\"results\",\"lsTransaction\":1368,\"lsType\":\"data\",\"lsTypeAndKind\":\"data_results\",\"lsValues\":[{\"analysisGroupId\":0,\"clobValue\":null,\"codeKind\":null,\"codeOrigin\":null,\"codeType\":null,\"codeTypeAndKind\":\"null_null\",\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"deleted\":false,\"fileValue\":null,\"id\":2284750,\"ignored\":false,\"lsKind\":\"Response\",\"lsTransaction\":1368,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_Response\",\"modifiedBy\":null,\"modifiedDate\":null,\"numberOfReplicates\":null,\"numericValue\":93.85875,\"operatorKind\":null,\"operatorType\":null,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142898187,\"sigFigs\":null,\"stateId\":685926,\"stateKind\":\"results\",\"stateType\":\"data\",\"stringValue\":null,\"treatmentGroupId\":499710,\"uncertainty\":3.59397712615611,\"uncertaintyType\":\"standard deviation\",\"unitKind\":\"efficacy\",\"unitType\":null,\"unitTypeAndKind\":\"null_efficacy\",\"urlValue\":null,\"version\":0}],\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142898186,\"version\":0}],\"lsTransaction\":1368,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142898181,\"subjects\":[{\"codeName\":\"SUBJ-00236004\",\"deleted\":false,\"id\":499830,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":1368,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142900029,\"version\":0},{\"codeName\":\"SUBJ-00236024\",\"deleted\":false,\"id\":499850,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":1368,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142900482,\"version\":0},{\"codeName\":\"SUBJ-00236014\",\"deleted\":false,\"id\":499840,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":1368,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142900255,\"version\":0},{\"codeName\":\"SUBJ-00236034\",\"deleted\":false,\"id\":499860,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":1368,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142900674,\"version\":0}],\"version\":0},\"lsValues\":null,\"recordedBy\":\"userName\",\"lsType\":\"data\",\"lsKind\":\"results\",\"comments\":\"\",\"lsTransaction\":3067,\"ignored\":false,\"recordedDate\":1415752381000},{\"treatmentGroup\":{\"analysisGroups\":[{\"codeName\":\"AG-00342416\",\"deleted\":false,\"id\":499698,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":1368,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142896894,\"version\":0}],\"codeName\":\"TG-00076401\",\"deleted\":false,\"id\":499710,\"ignored\":false,\"lsKind\":\"default\",\"lsLabels\":[],\"lsStates\":[{\"comments\":null,\"deleted\":false,\"id\":685925,\"ignored\":false,\"lsKind\":\"test compound treatment\",\"lsTransaction\":1368,\"lsType\":\"data\",\"lsTypeAndKind\":\"data_test compound treatment\",\"lsValues\":[{\"analysisGroupId\":0,\"clobValue\":null,\"codeKind\":null,\"codeOrigin\":null,\"codeType\":null,\"codeTypeAndKind\":\"null_null\",\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"deleted\":false,\"fileValue\":null,\"id\":2284749,\"ignored\":false,\"lsKind\":\"Dose\",\"lsTransaction\":1368,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_Dose\",\"modifiedBy\":null,\"modifiedDate\":null,\"numberOfReplicates\":null,\"numericValue\":20,\"operatorKind\":null,\"operatorType\":null,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142898184,\"sigFigs\":null,\"stateId\":685925,\"stateKind\":\"test compound treatment\",\"stateType\":\"data\",\"stringValue\":null,\"treatmentGroupId\":499710,\"uncertainty\":null,\"uncertaintyType\":null,\"unitKind\":\"uM\",\"unitType\":null,\"unitTypeAndKind\":\"null_uM\",\"urlValue\":null,\"version\":0}],\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142898182,\"version\":0},{\"comments\":null,\"deleted\":false,\"id\":685926,\"ignored\":false,\"lsKind\":\"results\",\"lsTransaction\":1368,\"lsType\":\"data\",\"lsTypeAndKind\":\"data_results\",\"lsValues\":[{\"analysisGroupId\":0,\"clobValue\":null,\"codeKind\":null,\"codeOrigin\":null,\"codeType\":null,\"codeTypeAndKind\":\"null_null\",\"codeValue\":null,\"comments\":null,\"dateValue\":null,\"deleted\":false,\"fileValue\":null,\"id\":2284750,\"ignored\":false,\"lsKind\":\"Response\",\"lsTransaction\":1368,\"lsType\":\"numericValue\",\"lsTypeAndKind\":\"numericValue_Response\",\"modifiedBy\":null,\"modifiedDate\":null,\"numberOfReplicates\":null,\"numericValue\":93.85875,\"operatorKind\":null,\"operatorType\":null,\"operatorTypeAndKind\":\"null_null\",\"publicData\":true,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142898187,\"sigFigs\":null,\"stateId\":685926,\"stateKind\":\"results\",\"stateType\":\"data\",\"stringValue\":null,\"treatmentGroupId\":499710,\"uncertainty\":3.59397712615611,\"uncertaintyType\":\"standard deviation\",\"unitKind\":\"efficacy\",\"unitType\":null,\"unitTypeAndKind\":\"null_efficacy\",\"urlValue\":null,\"version\":0}],\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142898186,\"version\":0}],\"lsTransaction\":1368,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142898181,\"subjects\":[{\"codeName\":\"SUBJ-00236004\",\"deleted\":false,\"id\":499830,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":1368,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142900029,\"version\":0},{\"codeName\":\"SUBJ-00236024\",\"deleted\":false,\"id\":499850,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":1368,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142900482,\"version\":0},{\"codeName\":\"SUBJ-00236014\",\"deleted\":false,\"id\":499840,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":1368,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142900255,\"version\":0},{\"codeName\":\"SUBJ-00236034\",\"deleted\":false,\"id\":499860,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":1368,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"smeyer\",\"recordedDate\":1408142900674,\"version\":0}],\"version\":0},\"lsValues\":null,\"recordedBy\":\"userName\",\"lsType\":\"data\",\"lsKind\":\"results\",\"comments\":\"\",\"lsTransaction\":3067,\"ignored\":false,\"recordedDate\":1415752381000}]";
-		Collection<TreatmentGroupState> treatmentGroupStates = TreatmentGroupState.fromJsonArrayToTreatmentGroupStates(json);
+		Collection<TreatmentGroupState> treatmentGroupStates = TreatmentGroupState
+				.fromJsonArrayToTreatmentGroupStates(json);
 		treatmentGroupStates = treatmentGroupStateService.saveTreatmentGroupStates(treatmentGroupStates);
-		for (TreatmentGroupState treatmentGroupState: treatmentGroupStates) {
+		for (TreatmentGroupState treatmentGroupState : treatmentGroupStates) {
 			Assert.assertNotNull(treatmentGroupState.getId());
 		}
 	}
diff --git a/src/test/java/com/labsynch/labseer/service/TreatmentGroupValueServiceTest.java b/src/test/java/com/labsynch/labseer/service/TreatmentGroupValueServiceTest.java
index 359f7e58d..e354c2f1f 100644
--- a/src/test/java/com/labsynch/labseer/service/TreatmentGroupValueServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/TreatmentGroupValueServiceTest.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import java.util.ArrayList;
@@ -23,9 +22,9 @@
 
 import junit.framework.Assert;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class TreatmentGroupValueServiceTest {
 
@@ -36,16 +35,17 @@ public class TreatmentGroupValueServiceTest {
 
 	@Test
 	@Transactional
-	public void QueryTreatmentGroupValueByExpIdAndStateTypeKind(){
-			
+	public void QueryTreatmentGroupValueByExpIdAndStateTypeKind() {
+
 		Long experimentId = 14L;
 		String stateType = "data";
 		String stateKind = "test compound treatment";
-		List<TreatmentGroupValue> results = treatmentGroupValueService.getTreatmentGroupValuesByExperimentIdAndStateTypeKind(experimentId, stateType, stateKind);
+		List<TreatmentGroupValue> results = treatmentGroupValueService
+				.getTreatmentGroupValuesByExperimentIdAndStateTypeKind(experimentId, stateType, stateKind);
 		logger.info(TreatmentGroupValue.toJsonArray(results));
-		assert(results.size() == 120);
+		assert (results.size() == 120);
 	}
-	
+
 	@Test
 	@Transactional
 	public void QueryTreatmentGroupValueByExpIdAndStateTypeKindWithBadData() {
@@ -54,13 +54,14 @@ public void QueryTreatmentGroupValueByExpIdAndStateTypeKindWithBadData() {
 		String stateKind = "experiment metadata";
 		List<TreatmentGroupValue> results = new ArrayList<TreatmentGroupValue>();
 		try {
-			results = treatmentGroupValueService.getTreatmentGroupValuesByExperimentIdAndStateTypeKind(experimentId, stateType, stateKind);
-		} catch(IllegalArgumentException ex ) {
+			results = treatmentGroupValueService.getTreatmentGroupValuesByExperimentIdAndStateTypeKind(experimentId,
+					stateType, stateKind);
+		} catch (IllegalArgumentException ex) {
 			logger.info(ex.getMessage());
 		}
-		assert(results.size() == 0);
+		assert (results.size() == 0);
 	}
-	
+
 	@Test
 	@Transactional
 	public void QueryTreatmentGroupValueByExpIdAndStateTypeKindWithCodeName() {
@@ -71,53 +72,60 @@ public void QueryTreatmentGroupValueByExpIdAndStateTypeKindWithCodeName() {
 		boolean didCatch = false;
 		try {
 			experiment = Experiment.findExperimentsByCodeNameEquals(experimentCodeName).getSingleResult();
-		} catch(NoResultException nre) {
+		} catch (NoResultException nre) {
 			logger.info(nre.getMessage());
 			didCatch = true;
 		}
 		List<TreatmentGroupValue> results = new ArrayList<TreatmentGroupValue>();
 		try {
-			results = treatmentGroupValueService.getTreatmentGroupValuesByExperimentIdAndStateTypeKind(experiment.getId(), stateType, stateKind);
-		} catch(IllegalArgumentException ex ) {
+			results = treatmentGroupValueService
+					.getTreatmentGroupValuesByExperimentIdAndStateTypeKind(experiment.getId(), stateType, stateKind);
+		} catch (IllegalArgumentException ex) {
 			logger.info(ex.getMessage());
-			assert(results.size() == 0);
+			assert (results.size() == 0);
 			didCatch = true;
 		}
-		if(!didCatch) assert(results.size() == 120);
+		if (!didCatch)
+			assert (results.size() == 120);
 	}
-	
+
 	@Test
 	@Transactional
-	public void QueryTreatmentGroupValueByExpIdAndStateTypeKindAndValueTypeKind(){
-			
+	public void QueryTreatmentGroupValueByExpIdAndStateTypeKindAndValueTypeKind() {
+
 		Long experimentId = 14L;
 		String stateType = "data";
 		String stateKind = "test compound treatment";
 		String valueType = "numericValue";
 		String valueKind = "Dose";
-		List<TreatmentGroupValue> results = treatmentGroupValueService.getTreatmentGroupValuesByExperimentIdAndStateTypeKindAndValueTypeKind(experimentId, stateType, stateKind, valueType, valueKind);
+		List<TreatmentGroupValue> results = treatmentGroupValueService
+				.getTreatmentGroupValuesByExperimentIdAndStateTypeKindAndValueTypeKind(experimentId, stateType,
+						stateKind, valueType, valueKind);
 		logger.info(TreatmentGroupValue.toJsonArray(results));
-		assert(results.size() == 120);
+		assert (results.size() == 120);
 	}
-	
+
 	@Test
 	@Transactional
 	public void TreatmentGroupValuesToCsv() {
-		List<TreatmentGroupValue> treatmentGroupValues = treatmentGroupValueService.getTreatmentGroupValuesByExperimentIdAndStateTypeKind(9l, "metadata", "experiment metadata");
+		List<TreatmentGroupValue> treatmentGroupValues = treatmentGroupValueService
+				.getTreatmentGroupValuesByExperimentIdAndStateTypeKind(9l, "metadata", "experiment metadata");
 		String csvString = treatmentGroupValueService.getCsvList(treatmentGroupValues);
-		assert(csvString != null && csvString.compareTo("") != 0);
+		assert (csvString != null && csvString.compareTo("") != 0);
 		logger.info(csvString);
 	}
-	
+
 	@Test
 	@Transactional
 	public void TreatmentGroupValuesToCsvForCurveFit() {
-		List<TreatmentGroupValue> treatmentGroupValues = treatmentGroupValueService.getTreatmentGroupValuesByExperimentIdAndStateTypeKindAndValueTypeKind(54375L, "data", "results", "numericValue", "Response");
+		List<TreatmentGroupValue> treatmentGroupValues = treatmentGroupValueService
+				.getTreatmentGroupValuesByExperimentIdAndStateTypeKindAndValueTypeKind(54375L, "data", "results",
+						"numericValue", "Response");
 		String csvString = treatmentGroupValueService.getCsvList(treatmentGroupValues);
 		Assert.assertNotNull(csvString);
 		logger.info(csvString);
 	}
-	
+
 	@Test
 	@Transactional
 	public void updateTreatmentGroupValueTest() {
@@ -127,11 +135,12 @@ public void updateTreatmentGroupValueTest() {
 		String valueType = "stringValue";
 		String valueKind = "status";
 		String value = "Deleted";
-		TreatmentGroupValue treatmentGroupValue = treatmentGroupValueService.updateTreatmentGroupValue(idOrCodeName, stateType, stateKind, valueType, valueKind, value);
+		TreatmentGroupValue treatmentGroupValue = treatmentGroupValueService.updateTreatmentGroupValue(idOrCodeName,
+				stateType, stateKind, valueType, valueKind, value);
 		Assert.assertNotNull(treatmentGroupValue);
 		logger.info(treatmentGroupValue.toJson());
 	}
-	
+
 	@Test
 	@Transactional
 	public void saveTreatmentGroupValueFromJson() {
@@ -140,14 +149,15 @@ public void saveTreatmentGroupValueFromJson() {
 		treatmentGroupValue = treatmentGroupValueService.saveTreatmentGroupValue(treatmentGroupValue);
 		Assert.assertNotNull(treatmentGroupValue.getId());
 	}
-	
+
 	@Test
 	@Transactional
 	public void saveTreatmentGroupValuesFromJson() {
 		String json = "[{\"lsState\":{\"deleted\":false,\"id\":1074932,\"ignored\":false,\"lsKind\":\"results\",\"lsTransaction\":1928,\"lsType\":\"data\",\"lsTypeAndKind\":\"data_results\",\"recordedBy\":\"bob\",\"recordedDate\":1412716394689,\"treatmentGroup\":{\"codeName\":\"TG-00108073\",\"deleted\":false,\"id\":703067,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":1928,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"recordedBy\":\"bob\",\"recordedDate\":1412716394686,\"version\":0},\"version\":0},\"lsType\":\"stringValue\",\"lsKind\":\"analysis status\",\"stringValue\":\"now\",\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"codeOrigin\":null,\"codeType\":null,\"codeKind\":null,\"recordedBy\":\"username\",\"recordedDate\":1415752566000,\"lsTransaction\":3068},{\"lsState\":{\"deleted\":false,\"id\":1074932,\"ignored\":false,\"lsKind\":\"results\",\"lsTransaction\":1928,\"lsType\":\"data\",\"lsTypeAndKind\":\"data_results\",\"recordedBy\":\"bob\",\"recordedDate\":1412716394689,\"treatmentGroup\":{\"codeName\":\"TG-00108073\",\"deleted\":false,\"id\":703067,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":1928,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"recordedBy\":\"bob\",\"recordedDate\":1412716394686,\"version\":0},\"version\":0},\"lsType\":\"stringValue\",\"lsKind\":\"analysis status\",\"stringValue\":\"now\",\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"codeOrigin\":null,\"codeType\":null,\"codeKind\":null,\"recordedBy\":\"username\",\"recordedDate\":1415752566000,\"lsTransaction\":3068},{\"lsState\":{\"deleted\":false,\"id\":1074932,\"ignored\":false,\"lsKind\":\"results\",\"lsTransaction\":1928,\"lsType\":\"data\",\"lsTypeAndKind\":\"data_results\",\"recordedBy\":\"bob\",\"recordedDate\":1412716394689,\"treatmentGroup\":{\"codeName\":\"TG-00108073\",\"deleted\":false,\"id\":703067,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":1928,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"recordedBy\":\"bob\",\"recordedDate\":1412716394686,\"version\":0},\"version\":0},\"lsType\":\"stringValue\",\"lsKind\":\"analysis status\",\"stringValue\":\"now\",\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"codeOrigin\":null,\"codeType\":null,\"codeKind\":null,\"recordedBy\":\"username\",\"recordedDate\":1415752566000,\"lsTransaction\":3068},{\"lsState\":{\"deleted\":false,\"id\":1074932,\"ignored\":false,\"lsKind\":\"results\",\"lsTransaction\":1928,\"lsType\":\"data\",\"lsTypeAndKind\":\"data_results\",\"recordedBy\":\"bob\",\"recordedDate\":1412716394689,\"treatmentGroup\":{\"codeName\":\"TG-00108073\",\"deleted\":false,\"id\":703067,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":1928,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"recordedBy\":\"bob\",\"recordedDate\":1412716394686,\"version\":0},\"version\":0},\"lsType\":\"stringValue\",\"lsKind\":\"analysis status\",\"stringValue\":\"now\",\"fileValue\":null,\"urlValue\":null,\"dateValue\":null,\"clobValue\":null,\"blobValue\":null,\"operatorKind\":null,\"operatorType\":null,\"numericValue\":null,\"sigFigs\":null,\"uncertainty\":null,\"uncertaintyType\":null,\"numberOfReplicates\":null,\"unitKind\":null,\"comments\":null,\"ignored\":false,\"publicData\":true,\"codeValue\":null,\"codeOrigin\":null,\"codeType\":null,\"codeKind\":null,\"recordedBy\":\"username\",\"recordedDate\":1415752566000,\"lsTransaction\":3068}]";
-		Collection<TreatmentGroupValue> treatmentGroupValues = TreatmentGroupValue.fromJsonArrayToTreatmentGroupValues(json);
+		Collection<TreatmentGroupValue> treatmentGroupValues = TreatmentGroupValue
+				.fromJsonArrayToTreatmentGroupValues(json);
 		treatmentGroupValues = treatmentGroupValueService.saveTreatmentGroupValues(treatmentGroupValues);
-		for (TreatmentGroupValue treatmentGroupValue: treatmentGroupValues) {
+		for (TreatmentGroupValue treatmentGroupValue : treatmentGroupValues) {
 			Assert.assertNotNull(treatmentGroupValue.getId());
 		}
 	}
diff --git a/src/test/java/com/labsynch/labseer/service/UpdateLogServiceTest.java b/src/test/java/com/labsynch/labseer/service/UpdateLogServiceTest.java
index 76c807efa..39f685355 100755
--- a/src/test/java/com/labsynch/labseer/service/UpdateLogServiceTest.java
+++ b/src/test/java/com/labsynch/labseer/service/UpdateLogServiceTest.java
@@ -1,5 +1,4 @@
 
-
 package com.labsynch.labseer.service;
 
 import java.util.Collection;
@@ -18,43 +17,41 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext.xml")
 @Configurable
 public class UpdateLogServiceTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(UpdateLogServiceTest.class);
-		
+
 	@Test
 	@Transactional
-	public void SimpleTest_1(){
+	public void SimpleTest_1() {
 		String json = "[{\"id\":60722},{\"id\":60721}]";
-    	Collection<ContainerState> containerStates = ContainerState.fromJsonArrayToContainerStates(json);
-    	logger.info("initial container states: " + ContainerState.toJsonArray(containerStates));
-    	LsTransaction lst = new LsTransaction();
-    	lst.setComments("mark states to ignore");
-    	lst.setRecordedDate(new Date());
-    	lst.persist();
-    	
-    	for (ContainerState cs : containerStates){
-        	UpdateLog uplog = new UpdateLog();
-        	uplog.setThing(cs.getId());
-        	uplog.setLsTransaction(lst.getId());
-        	uplog.setUpdateAction("ignore");
-        	uplog.setComments("mark states to ignore");
-        	uplog.setRecordedDate(new Date());
-        	uplog.persist();
-    	}
-
-    	int results = ContainerState.ignoreStates(lst.getId());
-    	logger.info("results int is " + results);
-    	
-    	for (ContainerState cs : containerStates){
-        	logger.info(ContainerState.findContainerState(cs.getId()).toJsonStub());    		
-    	}
-		
-	}
+		Collection<ContainerState> containerStates = ContainerState.fromJsonArrayToContainerStates(json);
+		logger.info("initial container states: " + ContainerState.toJsonArray(containerStates));
+		LsTransaction lst = new LsTransaction();
+		lst.setComments("mark states to ignore");
+		lst.setRecordedDate(new Date());
+		lst.persist();
+
+		for (ContainerState cs : containerStates) {
+			UpdateLog uplog = new UpdateLog();
+			uplog.setThing(cs.getId());
+			uplog.setLsTransaction(lst.getId());
+			uplog.setUpdateAction("ignore");
+			uplog.setComments("mark states to ignore");
+			uplog.setRecordedDate(new Date());
+			uplog.persist();
+		}
+
+		int results = ContainerState.ignoreStates(lst.getId());
+		logger.info("results int is " + results);
+
+		for (ContainerState cs : containerStates) {
+			logger.info(ContainerState.findContainerState(cs.getId()).toJsonStub());
+		}
 
+	}
 
 }
diff --git a/src/test/java/com/labsynch/labseer/utils/InitialSetupTest.java b/src/test/java/com/labsynch/labseer/utils/InitialSetupTest.java
index 0addf75c4..75d7c13c0 100755
--- a/src/test/java/com/labsynch/labseer/utils/InitialSetupTest.java
+++ b/src/test/java/com/labsynch/labseer/utils/InitialSetupTest.java
@@ -23,38 +23,39 @@ public class InitialSetupTest {
 	private static final Logger logger = LoggerFactory.getLogger(InitialSetupTest.class);
 
 	@Test
-	public void Setup_Test_1() throws IOException{
+	public void Setup_Test_1() throws IOException {
 		logger.debug("run initial setup");
 		InitialSetup.setupFixtures();
 	}
 
-	//@Test
-	public void Setup_Test_2() throws IOException{
+	// @Test
+	public void Setup_Test_2() throws IOException {
 		logger.debug("run initial setup");
-		//thingTypes
-		if (ThingType.countThingTypes() < 1){
-			//logger.info("Setting new thing types");
+		// thingTypes
+		if (ThingType.countThingTypes() < 1) {
+			// logger.info("Setting new thing types");
 			String propertyName = "thingTypes";
 			String json = SetupPropertiesUtils.getProperties(propertyName);
-			//logger.info("input json " + json);
+			// logger.info("input json " + json);
 
 			Collection<ThingType> thingTypes = ThingType.fromJsonArrayToThingTypes(json);
-			for (ThingType thingType : thingTypes){
+			for (ThingType thingType : thingTypes) {
 				thingType.persist();
-				//logger.info(thingType.toJson());
+				// logger.info(thingType.toJson());
 			}
 		}
-		
-		if (ThingKind.countThingKinds() < 1){
+
+		if (ThingKind.countThingKinds() < 1) {
 			String propertyName = "thingKinds";
 			String json = SetupPropertiesUtils.getProperties(propertyName);
-			//logger.info("input json " + json);
+			// logger.info("input json " + json);
 
 			Collection<ThingKind> thingKinds = ThingKind.fromJsonArrayToThingKinds(json);
-			for (ThingKind thingKind : thingKinds){
+			for (ThingKind thingKind : thingKinds) {
 				logger.info(thingKind.toJson());
-				List<ThingType> dbLsTypes = ThingType.findThingTypesByTypeNameEquals(thingKind.getLsType().getTypeName()).getResultList();
-				if (dbLsTypes.size() == 1){
+				List<ThingType> dbLsTypes = ThingType
+						.findThingTypesByTypeNameEquals(thingKind.getLsType().getTypeName()).getResultList();
+				if (dbLsTypes.size() == 1) {
 					thingKind.setLsType(dbLsTypes.get(0));
 					thingKind.persist();
 					logger.info(thingKind.toJson());
@@ -62,11 +63,9 @@ public void Setup_Test_2() throws IOException{
 					logger.error("did not get expected results: " + dbLsTypes.size());
 				}
 			}
-			
-		}
-		
-	}
 
+		}
 
+	}
 
 }
diff --git a/src/test/java/com/labsynch/labseer/utils/LicenseCheckTest.java b/src/test/java/com/labsynch/labseer/utils/LicenseCheckTest.java
index be35e5b9f..16a3c1409 100644
--- a/src/test/java/com/labsynch/labseer/utils/LicenseCheckTest.java
+++ b/src/test/java/com/labsynch/labseer/utils/LicenseCheckTest.java
@@ -29,14 +29,11 @@ public class LicenseCheckTest {
 	@Autowired
 	private LicenseService licenseService;
 
-
 	@Test
-	public void licenseCheckServiceTest() throws IOException, PGPException, URISyntaxException{
+	public void licenseCheckServiceTest() throws IOException, PGPException, URISyntaxException {
 		LicenseDTO results = licenseService.getLicenseInfo();
 		logger.info(results.toJson());
 
 	}
 
-
-
 }
diff --git a/src/test/java/com/labsynch/labseer/utils/ReadPropsTest.java b/src/test/java/com/labsynch/labseer/utils/ReadPropsTest.java
index 4f3ef872a..826190246 100755
--- a/src/test/java/com/labsynch/labseer/utils/ReadPropsTest.java
+++ b/src/test/java/com/labsynch/labseer/utils/ReadPropsTest.java
@@ -30,10 +30,11 @@
 import flexjson.JSONDeserializer;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class ReadPropsTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(ReadPropsTest.class);
 
 	@Autowired
@@ -41,24 +42,23 @@ public class ReadPropsTest {
 
 	@Autowired
 	private ExperimentService experimentService;
-	
-    @Autowired
-    private transient MailSender mailSender;
 
-    private transient SimpleMailMessage simpleMailMessage;
-	
-	
+	@Autowired
+	private transient MailSender mailSender;
+
+	private transient SimpleMailMessage simpleMailMessage;
+
 	@Test
 	public void Read_Test_2() {
 		logger.info("here is the current fetch size: " + propertiesUtilService.getFetchSize());
 	}
-	
+
 	@Test
 	public void Read_Test_3() {
 		logger.info("here is the current batch size: " + propertiesUtilService.getBatchSize());
 	}
-	
-	//@Test
+
+	// @Test
 	public void Author_Test4() {
 		Author auth = new Author();
 		auth.setFirstName("guytest");
@@ -68,27 +68,29 @@ public void Author_Test4() {
 		auth.setEmailAddress("guy@test.com");
 		auth.persist();
 		logger.info(auth.toJson());
-		
+
 	}
-	
-	//@Test
+
+	// @Test
 	public void Author_Test5() {
-        SimpleMailMessage mail = new SimpleMailMessage();
+		SimpleMailMessage mail = new SimpleMailMessage();
 		mail.setTo("guy@mcneilco.com");
 		mail.setSubject("User Activaton");
-		
+
 		mail.setText("Hi -- testing the email send function");
-		if(propertiesUtilService.getEmailFromAddress() != null && !propertiesUtilService.getEmailFromAddress().equals("") ) mail.setFrom(propertiesUtilService.getEmailFromAddress());
+		if (propertiesUtilService.getEmailFromAddress() != null
+				&& !propertiesUtilService.getEmailFromAddress().equals(""))
+			mail.setFrom(propertiesUtilService.getEmailFromAddress());
+
+		mailSender.send(mail);
 
-        mailSender.send(mail);
-		
 	}
-	
-	//@Test
+
+	// @Test
 	public void AuthorRole_Test6() {
 		List<Author> authors = Author.findAllAuthors();
 		List<LsRole> lsRoles = LsRole.findAllLsRoles();
-		if (authors.size() > 0 && lsRoles.size() > 0){
+		if (authors.size() > 0 && lsRoles.size() > 0) {
 			Author author = Author.findAllAuthors().get(0);
 			LsRole lsRole = LsRole.findAllLsRoles().get(0);
 			AuthorRole authorRole = new AuthorRole();
@@ -98,47 +100,52 @@ public void AuthorRole_Test6() {
 			logger.info("persisted the authorRole: " + authorRole.toJson());
 		}
 	}
-	
-	//@Test
+
+	// @Test
 	public void basic_Test7() {
-		
+
 		String valueType = "codeValue";
-		String valueKind = "batch code";		
+		String valueKind = "batch code";
 		String stateType = "data";
 		String stateKind = "Dose Response";
 		String experimentCode = "EXPT-00000037";
-//		List<AnalysisGroupValueBaseDTO> agvs = AnalysisGroupValue.findAnalysisGroupValueByLsTypeKindAndExptCodeAll(lsType, lsKind, experimentCode).getResultList();
-		List<AnalysisGroupValueBaseDTO> agvs = AnalysisGroupValue.findAnalysisGroupValueExptCodeAndStateTypeKindAndValueTypeKind(experimentCode, stateType, stateKind, valueType, valueKind).getResultList();
+		// List<AnalysisGroupValueBaseDTO> agvs =
+		// AnalysisGroupValue.findAnalysisGroupValueByLsTypeKindAndExptCodeAll(lsType,
+		// lsKind, experimentCode).getResultList();
+		List<AnalysisGroupValueBaseDTO> agvs = AnalysisGroupValue
+				.findAnalysisGroupValueExptCodeAndStateTypeKindAndValueTypeKind(experimentCode, stateType, stateKind,
+						valueType, valueKind)
+				.getResultList();
 		logger.info("number of agvs found: " + agvs.size());
-		for (AnalysisGroupValueBaseDTO ag : agvs){
+		for (AnalysisGroupValueBaseDTO ag : agvs) {
 			logger.info(ag.toJson());
 		}
 	}
-	
-	//@Test
+
+	// @Test
 	@Transactional
-	public void getExperiments_test8(){
+	public void getExperiments_test8() {
 		String json = "[{\"batchCode\":\"GENE-000002\"},{\"batchCode\":\"GENE-000003\"},{\"batchCode\":\"GENE-000011\"}]";
-        Collection<BatchCodeDTO> batchCodes = BatchCodeDTO.fromJsonArrayToBatchCoes(json);
+		Collection<BatchCodeDTO> batchCodes = BatchCodeDTO.fromJsonArrayToBatchCoes(json);
 		Collection<String> codeValues = new HashSet<String>();
-        for (BatchCodeDTO batchCode : batchCodes){
-        	codeValues.add(batchCode.getBatchCode());
-        	logger.info("current batchCode: " + batchCode.getBatchCode());
-        }
-        
-        Collection<JSTreeNodeDTO> results = experimentService.getExperimentNodes(codeValues);
-        logger.info(JSTreeNodeDTO.toJsonArray(results));
+		for (BatchCodeDTO batchCode : batchCodes) {
+			codeValues.add(batchCode.getBatchCode());
+			logger.info("current batchCode: " + batchCode.getBatchCode());
+		}
+
+		Collection<JSTreeNodeDTO> results = experimentService.getExperimentNodes(codeValues);
+		logger.info(JSTreeNodeDTO.toJsonArray(results));
 	}
-	
+
 	@Test
 	@Transactional
-	public void getExperimentFilters_test9(){
+	public void getExperimentFilters_test9() {
 		String json = "[\"EXPT-00000003\"]";
-        Collection<String> experimentCodes = new JSONDeserializer<List<String>>().use(null, ArrayList.class).use("values", String.class).deserialize(json);
-        Collection<ExperimentFilterDTO> results = experimentService.getExperimentFilters(experimentCodes);
-        logger.info(ExperimentFilterDTO.toJsonArray(results));
+		Collection<String> experimentCodes = new JSONDeserializer<List<String>>().use(null, ArrayList.class)
+				.use("values", String.class).deserialize(json);
+		Collection<ExperimentFilterDTO> results = experimentService.getExperimentFilters(experimentCodes);
+		logger.info(ExperimentFilterDTO.toJsonArray(results));
 
-		
 	}
-	
+
 }
diff --git a/src/test/java/com/labsynch/labseer/utils/ReadResourceFileTest.java b/src/test/java/com/labsynch/labseer/utils/ReadResourceFileTest.java
index 8b911d46c..46216c3cc 100755
--- a/src/test/java/com/labsynch/labseer/utils/ReadResourceFileTest.java
+++ b/src/test/java/com/labsynch/labseer/utils/ReadResourceFileTest.java
@@ -19,50 +19,66 @@
 @ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext.xml")
 @Configurable
 public class ReadResourceFileTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(ReadResourceFileTest.class);
-	
-	//@Test
+
+	// @Test
 	@Transactional
-	public void Read_Test_1() throws IOException{
+	public void Read_Test_1() throws IOException {
 		logger.debug("run initial setup");
 		String testFileName = "1500subjectstates.json";
 		InputStream is = ReadResourceFileTest.class.getClassLoader().getResourceAsStream(testFileName);
-//	    BufferedReader reader = new BufferedReader(new InputStreamReader(is));
-//	    logger.debug(IOUtils.toString(is));
-	    String json = IOUtils.toString(is, "UTF-8");
-	    
-//	    String json = "[{\"comments\":null,\"id\":null,\"ignored\":false,\"lsKind\":\"test compound treatment\",\"lsTransaction\":119,\"lsType\":\"data\",\"lsTypeAndKind\":\"data_test compound treatment\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"\",\"recordedDate\":1376612488000,\"subject\":{\"codeName\":\"SUBJ-00000316\",\"id\":534,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":119,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"\",\"recordedDate\":1376612488000,\"treatmentGroup\":{\"analysisGroup\":{\"codeName\":\"AG-00000238\",\"experiment\":{\"codeName\":\"EXPT-00000032\",\"id\":525,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":119,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"protocol\":{\"codeName\":\"PROT-00000004\",\"id\":48,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":11,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"\",\"recordedDate\":1376546949000,\"shortDescription\":\"protocol created by generic data parser\",\"version\":1},\"recordedBy\":\"\",\"recordedDate\":1376612486000,\"shortDescription\":\"experiment created by generic data parser\",\"version\":1},\"id\":526,\"ignored\":false,\"lsKind\":\"Dose Response\",\"lsTransaction\":119,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_Dose Response\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"\",\"recordedDate\":1376612488000,\"version\":0},\"codeName\":\"TG-00000202\",\"id\":533,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":119,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"\",\"recordedDate\":1376612488000,\"version\":0},\"version\":0},\"version\":0},{\"comments\":null,\"id\":null,\"ignored\":false,\"lsKind\":\"results\",\"lsTransaction\":119,\"lsType\":\"data\",\"lsTypeAndKind\":\"data_results\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"\",\"recordedDate\":1376612488000,\"subject\":{\"codeName\":\"SUBJ-00000316\",\"id\":534,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":119,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"\",\"recordedDate\":1376612488000,\"treatmentGroup\":{\"analysisGroup\":{\"codeName\":\"AG-00000238\",\"experiment\":{\"codeName\":\"EXPT-00000032\",\"id\":525,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":119,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"protocol\":{\"codeName\":\"PROT-00000004\",\"id\":48,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":11,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"\",\"recordedDate\":1376546949000,\"shortDescription\":\"protocol created by generic data parser\",\"version\":1},\"recordedBy\":\"\",\"recordedDate\":1376612486000,\"shortDescription\":\"experiment created by generic data parser\",\"version\":1},\"id\":526,\"ignored\":false,\"lsKind\":\"Dose Response\",\"lsTransaction\":119,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_Dose Response\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"\",\"recordedDate\":1376612488000,\"version\":0},\"codeName\":\"TG-00000202\",\"id\":533,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":119,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"\",\"recordedDate\":1376612488000,\"version\":0},\"version\":0},\"version\":0}]";
-	    
-	    Collection<SubjectState> subjectStates = SubjectState.fromJsonArrayToSubjectStates(json);
-	    logger.debug("number of subject states: " + subjectStates.size());
-	    
-	    long startTime = System.currentTimeMillis();
-	    
-	    int batchSize = 100;
-	    int i = 0;
-	    for (SubjectState s : subjectStates){
-		    logger.debug(s.toJson());
-		    s.persist();
-		    if ( i % batchSize == 0 ) { // same as the JDBC batch size
-		    	s.flush();
-		    	s.clear();
-		    }
-		    i++;
-	    }
-	    
-	    long endTime = System.currentTimeMillis();
-	    long runTime = endTime - startTime;
-	    logger.debug("total run time: " + runTime);  //20,550 for 250; 114252 for 1500
-	    
-//	    Subject subject = Subject.findSubject(534L);
-//	    Collection<SubjectState> subjectStates = SubjectState.findSubjectStatesBySubject(subject).getResultList();
-//	    logger.debug("Number of all subject States is: " + SubjectState.countSubjectStates());
-//	    logger.debug("Number of only subject States is: " + subjectStates.size());
-//	    logger.debug(SubjectState.toJsonArray(subjectStates));
+		// BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+		// logger.debug(IOUtils.toString(is));
+		String json = IOUtils.toString(is, "UTF-8");
 
+		// String json =
+		// "[{\"comments\":null,\"id\":null,\"ignored\":false,\"lsKind\":\"test compound
+		// treatment\",\"lsTransaction\":119,\"lsType\":\"data\",\"lsTypeAndKind\":\"data_test
+		// compound
+		// treatment\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"\",\"recordedDate\":1376612488000,\"subject\":{\"codeName\":\"SUBJ-00000316\",\"id\":534,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":119,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"\",\"recordedDate\":1376612488000,\"treatmentGroup\":{\"analysisGroup\":{\"codeName\":\"AG-00000238\",\"experiment\":{\"codeName\":\"EXPT-00000032\",\"id\":525,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":119,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"protocol\":{\"codeName\":\"PROT-00000004\",\"id\":48,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":11,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"\",\"recordedDate\":1376546949000,\"shortDescription\":\"protocol
+		// created by generic data
+		// parser\",\"version\":1},\"recordedBy\":\"\",\"recordedDate\":1376612486000,\"shortDescription\":\"experiment
+		// created by generic data
+		// parser\",\"version\":1},\"id\":526,\"ignored\":false,\"lsKind\":\"Dose
+		// Response\",\"lsTransaction\":119,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_Dose
+		// Response\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"\",\"recordedDate\":1376612488000,\"version\":0},\"codeName\":\"TG-00000202\",\"id\":533,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":119,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"\",\"recordedDate\":1376612488000,\"version\":0},\"version\":0},\"version\":0},{\"comments\":null,\"id\":null,\"ignored\":false,\"lsKind\":\"results\",\"lsTransaction\":119,\"lsType\":\"data\",\"lsTypeAndKind\":\"data_results\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"\",\"recordedDate\":1376612488000,\"subject\":{\"codeName\":\"SUBJ-00000316\",\"id\":534,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":119,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"\",\"recordedDate\":1376612488000,\"treatmentGroup\":{\"analysisGroup\":{\"codeName\":\"AG-00000238\",\"experiment\":{\"codeName\":\"EXPT-00000032\",\"id\":525,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":119,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"protocol\":{\"codeName\":\"PROT-00000004\",\"id\":48,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":11,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"\",\"recordedDate\":1376546949000,\"shortDescription\":\"protocol
+		// created by generic data
+		// parser\",\"version\":1},\"recordedBy\":\"\",\"recordedDate\":1376612486000,\"shortDescription\":\"experiment
+		// created by generic data
+		// parser\",\"version\":1},\"id\":526,\"ignored\":false,\"lsKind\":\"Dose
+		// Response\",\"lsTransaction\":119,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_Dose
+		// Response\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"\",\"recordedDate\":1376612488000,\"version\":0},\"codeName\":\"TG-00000202\",\"id\":533,\"ignored\":false,\"lsKind\":\"default\",\"lsTransaction\":119,\"lsType\":\"default\",\"lsTypeAndKind\":\"default_default\",\"modifiedBy\":null,\"modifiedDate\":null,\"recordedBy\":\"\",\"recordedDate\":1376612488000,\"version\":0},\"version\":0},\"version\":0}]";
 
-	}
+		Collection<SubjectState> subjectStates = SubjectState.fromJsonArrayToSubjectStates(json);
+		logger.debug("number of subject states: " + subjectStates.size());
+
+		long startTime = System.currentTimeMillis();
 
+		int batchSize = 100;
+		int i = 0;
+		for (SubjectState s : subjectStates) {
+			logger.debug(s.toJson());
+			s.persist();
+			if (i % batchSize == 0) { // same as the JDBC batch size
+				s.flush();
+				s.clear();
+			}
+			i++;
+		}
+
+		long endTime = System.currentTimeMillis();
+		long runTime = endTime - startTime;
+		logger.debug("total run time: " + runTime); // 20,550 for 250; 114252 for 1500
+
+		// Subject subject = Subject.findSubject(534L);
+		// Collection<SubjectState> subjectStates =
+		// SubjectState.findSubjectStatesBySubject(subject).getResultList();
+		// logger.debug("Number of all subject States is: " +
+		// SubjectState.countSubjectStates());
+		// logger.debug("Number of only subject States is: " + subjectStates.size());
+		// logger.debug(SubjectState.toJsonArray(subjectStates));
+
+	}
 
 }
diff --git a/src/test/java/com/labsynch/labseer/utils/ReadSetupPropertiesTest.java b/src/test/java/com/labsynch/labseer/utils/ReadSetupPropertiesTest.java
index 05fc489e4..0c6656ba8 100755
--- a/src/test/java/com/labsynch/labseer/utils/ReadSetupPropertiesTest.java
+++ b/src/test/java/com/labsynch/labseer/utils/ReadSetupPropertiesTest.java
@@ -11,19 +11,20 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class ReadSetupPropertiesTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(ReadSetupPropertiesTest.class);
-	
+
 	@Test
-	public void Setup_Test_1() throws IOException{
+	public void Setup_Test_1() throws IOException {
 		logger.debug("run initial setup");
 		String propertyName = "thingTypes";
-//		String propertyName = "exports.serverConfigurationParams.configuration.username";		
+		// String propertyName =
+		// "exports.serverConfigurationParams.configuration.username";
 		logger.info("TESTING property " + SetupPropertiesUtils.getProperties(propertyName));
 	}
 
-
 }
diff --git a/src/test/java/com/labsynch/labseer/utils/ReadSeuratUsersFileTest.java b/src/test/java/com/labsynch/labseer/utils/ReadSeuratUsersFileTest.java
index a54d5a9c3..9b63e417b 100755
--- a/src/test/java/com/labsynch/labseer/utils/ReadSeuratUsersFileTest.java
+++ b/src/test/java/com/labsynch/labseer/utils/ReadSeuratUsersFileTest.java
@@ -16,54 +16,52 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/META-INF/spring/applicationContext.xml", "classpath:/META-INF/spring/applicationContext-security.xml"})
+@ContextConfiguration(locations = { "classpath:/META-INF/spring/applicationContext.xml",
+		"classpath:/META-INF/spring/applicationContext-security.xml" })
 @Configurable
 public class ReadSeuratUsersFileTest {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(ReadSeuratUsersFileTest.class);
 
 	@Autowired
 	private PropertiesUtilService propertiesUtilService;
 
-	
 	@Test
 	public void Read_Test_1() {
 		logger.info("here is the current authStrategy: " + propertiesUtilService.getAuthStrategy());
 	}
-	
+
 	@Test
 	public void Read_Test_3() throws IOException {
-		logger.info("here is the current path to the security properties file: " + propertiesUtilService.getSecurityProperties());
+		logger.info("here is the current path to the security properties file: "
+				+ propertiesUtilService.getSecurityProperties());
 
 		Properties properties = new Properties();
-		FileInputStream propertyStream = new FileInputStream(propertiesUtilService.getSecurityProperties()); 
+		FileInputStream propertyStream = new FileInputStream(propertiesUtilService.getSecurityProperties());
 
 		properties.load(propertyStream);
 		propertyStream.close();
-		
+
 		logger.info(properties.getProperty("bob"));
 		logger.info(properties.getProperty("mcneilco"));
 		logger.info(properties.getProperty("huang"));
-		
+
 		String passwordString = properties.getProperty("huang");
 		List<String> passwordList = new ArrayList<String>();
 		String[] parsedEntry = passwordString.split("\\{SHA\\}|,");
-		for (String word : parsedEntry){
+		for (String word : parsedEntry) {
 			logger.info("parsed word: " + word);
 			passwordList.add(word);
 		}
-		
-		if (passwordString.contains("{SHA}")){
+
+		if (passwordString.contains("{SHA}")) {
 			logger.info("the entry starts with {SHA}");
 			logger.info("here is the encrypted password: " + passwordList.get(1));
 		} else {
 			logger.info("the entry is a simple password");
 			logger.info("here is the simple password: " + passwordList.get(0));
 		}
-				
-	}
-	
 
+	}
 
-	
 }
diff --git a/src/test/java/com/labsynch/labseer/utils/SimpleJsonDateTest.java b/src/test/java/com/labsynch/labseer/utils/SimpleJsonDateTest.java
index 04bcba624..0f4e071a7 100644
--- a/src/test/java/com/labsynch/labseer/utils/SimpleJsonDateTest.java
+++ b/src/test/java/com/labsynch/labseer/utils/SimpleJsonDateTest.java
@@ -16,25 +16,24 @@
 @Configurable
 public class SimpleJsonDateTest {
 
-	private static final Logger logger = LoggerFactory.getLogger(SimpleJsonDateTest.class);
-	
+    private static final Logger logger = LoggerFactory.getLogger(SimpleJsonDateTest.class);
+
     @Test
-    public void parseContainerValueDate() throws Exception{
+    public void parseContainerValueDate() throws Exception {
         String json = "{\"dateValue\":-68400000}";
         ContainerValue value = ContainerValue.fromJsonToContainerValue(json);
         logger.info("here is the date value: " + value.getDateValue());
     }
 
-    //@Test
-    public void parseContainerValueIsoDate() throws Exception{
+    // @Test
+    public void parseContainerValueIsoDate() throws Exception {
         String json = "{\"dateValue\":\"2007-04-05T14:30Z\"}";
         ContainerValue value = ContainerValue.fromJsonToContainerValue(json);
         logger.info("here is the date value: " + value.getDateValue());
     }
-    
-    
+
     @Test
-    public void parseExperimentValueDate() throws Exception{
+    public void parseExperimentValueDate() throws Exception {
         String json = "{\"dateValue\":-68400000, \"numericValue\":123.456789}";
         ExperimentValue value = ExperimentValue.fromJsonToExperimentValue(json);
         logger.info("here is the date value: " + value.getDateValue());
diff --git a/src/test/java/com/labsynch/labseer/utils/SimpleUtilTest.java b/src/test/java/com/labsynch/labseer/utils/SimpleUtilTest.java
index aea73137e..deb0dd925 100644
--- a/src/test/java/com/labsynch/labseer/utils/SimpleUtilTest.java
+++ b/src/test/java/com/labsynch/labseer/utils/SimpleUtilTest.java
@@ -19,9 +19,9 @@
 public class SimpleUtilTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(SimpleUtilTest.class);
-	
+
 	@Test
-	public void splitStringTest(){
+	public void splitStringTest() {
 		String searchString = "\"Fiona Test Experiment 1\" completed";
 		List<String> expectedResults = new ArrayList<String>();
 		expectedResults.add("Fiona Test Experiment 1");

From e1450a22ac5974d1827aea056401e038269de6c8 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Fri, 29 Apr 2022 13:44:10 -0700
Subject: [PATCH 63/73] Fix application context security double ;; issue

---
 .../labseer/web/ApplicationConversionServiceFactoryBean.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/labsynch/labseer/web/ApplicationConversionServiceFactoryBean.java b/src/main/java/com/labsynch/labseer/web/ApplicationConversionServiceFactoryBean.java
index 8e660bd72..302bfc12d 100755
--- a/src/main/java/com/labsynch/labseer/web/ApplicationConversionServiceFactoryBean.java
+++ b/src/main/java/com/labsynch/labseer/web/ApplicationConversionServiceFactoryBean.java
@@ -8,7 +8,7 @@
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.format.FormatterRegistry;
 import org.springframework.format.support.FormattingConversionServiceFactoryBean;
-import org.springframework.transaction.annotation.Transactional;;
+import org.springframework.transaction.annotation.Transactional;
 
 
 @Configurable

From b224620e16ea20d28deb8cd6959a21f03a1242d7 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Fri, 29 Apr 2022 18:35:49 -0700
Subject: [PATCH 64/73] Update pom.xml dependencies in acas-roo-server-oss
 Fixes #315

---
 pom.xml                                       | 325 ++++++------------
 .../V2_0_7_1__Recalculate_exact_mass.java     |   7 +-
 ...0_6__url_encode_cmpdreg_filelist_urls.java |   5 +-
 .../labsynch/labseer/dto/MetalotReturn.java   |   2 +-
 .../service/StandardizationServiceImpl.java   |  26 +-
 5 files changed, 117 insertions(+), 248 deletions(-)

diff --git a/pom.xml b/pom.xml
index 127f66b88..9c63ea5f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,25 +32,25 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 	<version>1.13-BUILD-SNAPSHOT</version>
 	<description>ACAS Java persistence layer</description>
 	<properties>
-		<aspectj.version>1.9.2</aspectj.version>
+		<aspectj.version>1.9.7</aspectj.version>
 		<java.version>1.8</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.build.timestamp.format>yyyyMMdd_HHmm</maven.build.timestamp.format>
 		<date>${maven.build.timestamp}</date>
 		<slf4j.version>1.7.5</slf4j.version>
 		<log4j.version>2.17.2</log4j.version>
-		<spring.version>5.3.18</spring.version>
+		<spring.version>5.3.19</spring.version>
 		<querydsl.version>3.4.3</querydsl.version>
-		<spring-security.version>5.6.2</spring-security.version>
+		<spring-security.version>5.6.3</spring-security.version>
 		<cdk.version>1.5.13</cdk.version>
 		<jchem.version>16.4.25.0</jchem.version>
 		<rdkit.version>2021.03.5-release</rdkit.version>
 		<indigo.version>1.6.1</indigo.version>
 		<git-sha-1>${buildNumber}</git-sha-1>
 		<BuildScmBranch>${scmBranch}</BuildScmBranch>
-		<tomcat.version>7.0.63</tomcat.version>
+		<tomcat.version>9.0.58</tomcat.version>
 		<hibernate.version>5.6.1.Final</hibernate.version>
-		<spring-ldap-core.version>2.3.6.RELEASE</spring-ldap-core.version>
+		<maven-plugins.version>3.3.0</maven-plugins.version>
     </properties>
 	<scm>
 		<connection>scm:git:git://github.com/mcneilco/acas-roo-server.git</connection>
@@ -131,11 +131,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 					<artifactId>indigo-renderer</artifactId>
 					<version>${indigo.version}</version>
 				</dependency>
-				<dependency>
-					<groupId>com.epam.indigo</groupId>
-					<artifactId>indigo-inchi</artifactId>
-					<version>${indigo.version}</version>
-				</dependency>
 			</dependencies>	
 			<properties>
 				<exclude.chemistry.packageA>com/labsynch/labseer/chemclasses/bbchem/**</exclude.chemistry.packageA>
@@ -146,16 +141,22 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		</profile>
 	</profiles>
 	<dependencies>
-		<!-- General dependencies for standard applications -->
+		<!-- License jars, only including bouncycastl because its required by license3j, we don't currently use the license feature -->
 		<dependency>
 			<groupId>com.verhas</groupId>
 			<artifactId>license3j</artifactId>
 			<version>1.0.7</version>
 		</dependency>
+		<dependency>
+			<groupId>org.bouncycastle</groupId>
+			<artifactId>bcpg-jdk15on</artifactId>
+			<version>1.52</version>
+		</dependency>
+		<!-- Used in web.xml at runtime -->
 		<dependency>
 			<groupId>com.thetransactioncompany</groupId>
 			<artifactId>cors-filter</artifactId>
-			<version>1.3.2</version>
+			<version>2.10</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sf.supercsv</groupId>
@@ -165,9 +166,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.11</version>
+			<version>4.12</version>
 			<scope>test</scope>
 		</dependency>
+		<!-- Dependencies to get logging to work using log4j -->
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-api</artifactId>
@@ -193,6 +195,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 			<artifactId>log4j-slf4j-impl</artifactId>
 			<version>${log4j.version}</version>
 		</dependency>
+		<!-- End logging dependencies -->
+		<!-- We removed .aj files but these are still needed to inject entity manager into the persistence context -->
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjrt</artifactId>
@@ -203,10 +207,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 			<artifactId>aspectjweaver</artifactId>
 			<version>${aspectj.version}</version>
 		</dependency>
+		<!-- End aj dependencies -->
 		<dependency>
 			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>4.0.1</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -214,6 +219,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 			<artifactId>flexjson</artifactId>
 			<version>3.1</version>
 		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>2.13.2</version>
+		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
@@ -227,7 +237,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>2.4</version>
+			<version>2.11.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.flywaydb</groupId>
@@ -253,18 +263,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
+			<artifactId>spring-tx</artifactId>
 			<version>${spring.version}</version>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
+			<artifactId>spring-test</artifactId>
 			<version>${spring.version}</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-aop</artifactId>
+			<artifactId>spring-context</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
@@ -279,38 +289,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		</dependency>
 		<dependency>
 			<groupId>com.vladmihalcea</groupId>
-			<artifactId>hibernate-types-52</artifactId>
+			<artifactId>hibernate-types-55</artifactId>
 			<version>2.14.0</version>
 		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-entitymanager</artifactId>
-			<version>${hibernate.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>cglib</groupId>
-					<artifactId>cglib</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>dom4j</groupId>
-					<artifactId>dom4j</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate.javax.persistence</groupId>
-			<artifactId>hibernate-jpa-2.1-api</artifactId>
-			<version>1.0.0.Final</version>
-		</dependency>
 		<dependency>
 			<groupId>commons-collections</groupId>
 			<artifactId>commons-collections</artifactId>
 			<version>3.2.2</version>
 		</dependency>
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>org.hibernate.validator</groupId>
 			<artifactId>hibernate-validator</artifactId>
-			<version>6.0.15.Final</version>
+			<version>6.0.23.Final</version>
 			<exclusions>
 				<exclusion>
 					<groupId>javax.xml.bind</groupId>
@@ -322,20 +312,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<!-- <dependency>
+		<dependency>
 			<groupId>javax.validation</groupId>
 			<artifactId>validation-api</artifactId>
-			<version>1.1.0.Final</version>
-		</dependency> -->
-		<dependency>
-			<groupId>cglib</groupId>
-			<artifactId>cglib-nodep</artifactId>
-			<version>2.2.2</version>
+			<version>2.0.1.Final</version>
 		</dependency>
 		<dependency>
-			<groupId>javax.transaction</groupId>
-			<artifactId>jta</artifactId>
-			<version>1.1</version>
+			<groupId>javax.persistence</groupId>
+			<artifactId>javax.persistence-api</artifactId>
+			<version>2.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -352,11 +337,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 			<artifactId>spring-beans</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>commons-pool</groupId>
-			<artifactId>commons-pool</artifactId>
-			<version>1.5.6</version>
-		</dependency>
 		<dependency>
 			<groupId>commons-dbcp</groupId>
 			<artifactId>commons-dbcp</artifactId>
@@ -377,75 +357,26 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 			<artifactId>spring-webmvc</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.webflow</groupId>
-			<artifactId>spring-js-resources</artifactId>
-			<version>2.2.1.RELEASE</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-digester</groupId>
-			<artifactId>commons-digester</artifactId>
-			<version>2.1</version>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
+		<!-- This is required by org.springframework.web.multipart.commons.CommonsMultipartResolver -->
 		<dependency>
 			<groupId>commons-fileupload</groupId>
 			<artifactId>commons-fileupload</artifactId>
-			<version>1.2.2</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet.jsp.jstl</groupId>
-			<artifactId>jstl-api</artifactId>
-			<version>1.2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.web</groupId>
-			<artifactId>jstl-impl</artifactId>
-			<version>1.2</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.el</groupId>
-			<artifactId>el-api</artifactId>
-			<version>2.2</version>
-			<scope>provided</scope>
+			<version>1.4</version>
 		</dependency>
 		<dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>
 			<version>1.6</version>
 		</dependency>
-		<dependency>
-			<groupId>javax.servlet.jsp</groupId>
-			<artifactId>jsp-api</artifactId>
-			<version>2.1</version>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.5</version>
-		</dependency>
-		<dependency>
-			<groupId>com.mysema.querydsl</groupId>
-			<artifactId>querydsl-spatial</artifactId>
-			<version>${querydsl.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.geolatte</groupId>
-					<artifactId>geolatte-geom</artifactId>
-				</exclusion>
-			</exclusions>
+			<version>1.15</version>
 		</dependency>
 		<dependency>
 			<groupId>com.mysema.querydsl</groupId>
-			<artifactId>querydsl-apt</artifactId>
+			<artifactId>querydsl-core</artifactId>
 			<version>${querydsl.version}</version>
-			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.mysema.querydsl</groupId>
@@ -453,25 +384,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 			<version>${querydsl.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.tanesha.recaptcha4j</groupId>
-			<artifactId>recaptcha4j</artifactId>
-			<version>0.0.7</version>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-crypto</artifactId>
+			<version>${spring-security.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-ldap</artifactId>
 			<version>${spring-security.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.ldap</groupId>
-			<artifactId>spring-ldap-core</artifactId>
-			<version>${spring-ldap-core.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.ldap</groupId>
-			<artifactId>spring-ldap-core-tiger</artifactId>
-			<version>${spring-ldap-core.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-core</artifactId>
@@ -499,11 +420,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 			<artifactId>spring-security-web</artifactId>
 			<version>${spring-security.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-taglibs</artifactId>
-			<version>${spring-security.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context-support</artifactId>
@@ -514,26 +430,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 			<artifactId>mail</artifactId>
 			<version>1.4.1</version>
 		</dependency>
-		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>activation</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.annotation</groupId>
-			<artifactId>javax.annotation-api</artifactId>
-			<version>1.3.1</version>
-		</dependency>
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
-			<version>9.4.1212.jre7</version>
-		</dependency>
-		<!-- http://mvnrepository.com/artifact/net.sourceforge.jtds/jtds -->
-		<dependency>
-			<groupId>net.sourceforge.jtds</groupId>
-			<artifactId>jtds</artifactId>
-			<version>1.3.1</version>
+			<version>42.3.3</version>
 		</dependency>
 		<!-- JCHEM 16 requires dom4j 1.3. This depdendency can be removed when we upgrade jchem to jchem > 17 -->
 		<dependency>
@@ -541,17 +441,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 			<artifactId>dom4j</artifactId>
 			<version>1.3</version>
 		</dependency>
-		<dependency>
-			<groupId>com.beust</groupId>
-			<artifactId>jcommander</artifactId>
-			<version>1.7</version>
-		</dependency>
 		<!-- https://mvnrepository.com/artifact/net.sf.trove4j/trove4j -->
-		<dependency>
-			<groupId>net.sf.trove4j</groupId>
-			<artifactId>trove4j</artifactId>
-			<version>3.0.3</version>
-		</dependency>
 		<dependency>
     		<groupId>com.github.javadev</groupId>
     		<artifactId>underscore</artifactId>
@@ -559,34 +449,48 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
   		</dependency>
 		<dependency>
     		<groupId>org.openscience.cdk</groupId>
-    		<artifactId>cdk-formula</artifactId>
+    		<artifactId>cdk-core</artifactId>
     		<version>${cdk.version}</version>
 		</dependency>
 		<dependency>
     		<groupId>org.openscience.cdk</groupId>
-    		<artifactId>cdk-io</artifactId>
+    		<artifactId>cdk-sdg</artifactId>
     		<version>${cdk.version}</version>
 		</dependency>
 		<dependency>
     		<groupId>org.openscience.cdk</groupId>
-    		<artifactId>cdk-interfaces</artifactId>
+    		<artifactId>cdk-silent</artifactId>
     		<version>${cdk.version}</version>
 		</dependency>
 		<dependency>
     		<groupId>org.openscience.cdk</groupId>
-    		<artifactId>cdk-depict</artifactId>
+    		<artifactId>cdk-standard</artifactId>
+    		<version>${cdk.version}</version>
+		</dependency>
+		  <dependency>
+    		<groupId>org.openscience.cdk</groupId>
+    		<artifactId>cdk-smiles</artifactId>
     		<version>${cdk.version}</version>
 		</dependency>
 		<dependency>
     		<groupId>org.openscience.cdk</groupId>
-    		<artifactId>cdk-inchi</artifactId>
+    		<artifactId>cdk-formula</artifactId>
+    		<version>${cdk.version}</version>
+		</dependency>
+		<dependency>
+    		<groupId>org.openscience.cdk</groupId>
+    		<artifactId>cdk-io</artifactId>
+    		<version>${cdk.version}</version>
+		</dependency>
+		<dependency>
+    		<groupId>org.openscience.cdk</groupId>
+    		<artifactId>cdk-interfaces</artifactId>
+    		<version>${cdk.version}</version>
+		</dependency>
+		<dependency>
+    		<groupId>org.openscience.cdk</groupId>
+    		<artifactId>cdk-depict</artifactId>
     		<version>${cdk.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>log4j</groupId>
-					<artifactId>log4j</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 	</dependencies>
 	<build>
@@ -611,7 +515,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>buildnumber-maven-plugin</artifactId>
-				<version>1.3</version>
+				<version>3.0.0</version>
 				<executions>
 					<execution>
 						<phase>validate</phase>
@@ -702,20 +606,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 					<encoding>${project.build.sourceEncoding}</encoding>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.12</version>
-				<configuration>
-					<printSummary>false</printSummary>
-					<redirectTestOutputToFile>true</redirectTestOutputToFile>
-					<skipTests>true</skipTests>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.3</version>
+				<version>${maven-plugins.version}</version>
 				<configuration>
 					<descriptorRefs>
 						<descriptorRef>jar-with-dependencies</descriptorRef>
@@ -724,45 +618,34 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.7</version>
-			</plugin>
-			<!-- IDE -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-eclipse-plugin</artifactId>
-				<version>2.10</version>
-				<!-- Note 2.8 does not work with AspectJ aspect path -->
-				<configuration>
-					<downloadSources>true</downloadSources>
-					<downloadJavadocs>false</downloadJavadocs>
-					<wtpversion>2.0</wtpversion>
-					<additionalBuildcommands>
-						<buildCommand>
-							<name>org.eclipse.ajdt.core.ajbuilder</name>
-							<arguments>
-								<aspectPath>org.springframework.aspects</aspectPath>
-							</arguments>
-						</buildCommand>
-						<buildCommand>
-							<name>org.springframework.ide.eclipse.core.springbuilder</name>
-						</buildCommand>
-					</additionalBuildcommands>
-					<additionalProjectnatures>
-						<projectnature>org.eclipse.ajdt.ui.ajnature</projectnature>
-						<projectnature>org.springframework.ide.eclipse.core.springnature</projectnature>
-					</additionalProjectnatures>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-idea-plugin</artifactId>
-				<version>2.2</version>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>${maven-plugins.version}</version>
 				<configuration>
-					<downloadSources>true</downloadSources>
-					<dependenciesAsLibraries>true</dependenciesAsLibraries>
+					<usedDependencies>
+						<!-- Required at runtime in web.xml com.thetransactioncompany.cors.CORSFilter-->
+						<dependency>com.thetransactioncompany:cors-filter</dependency>
+						<!-- Required at runtime by spring mail org.springframework.mail.javamail.JavaMailSender-->
+						<depdenency>javax.mail:mail</depdenency>
+						<!-- We use javax.validation which comes with org.hibernate.validator:hibernate-validator-->
+						<dependency>org.hibernate.validator:hibernate-validator</dependency>
+						<!-- Required at runtime by org.apache.commons.dbcp.BasicDataSource -->
+						<dependency>commons-dbcp:commons-dbcp</dependency>
+						<!-- Required at runtime in applicationContext-security.xml -->
+						<depdenency>org.springframework.security:spring-security-config</depdenency>
+						<!-- Required at runtime by org.springframework.web.multipart.commons.CommonsMultipartResolver -->
+						<dependency>commons-fileupload:commons-fileupload</dependency>
+						<!-- Required at runtime to inject entity manager -->
+						<depdendency>org.aspectj:aspectjrt</depdendency>
+						<!-- Required at runtime logging dependencies -->
+						<depdendency>org.apache.logging.log4j:log4j-core</depdendency>
+						<!-- <depdendency>dom4j:dom4j:jar:1.3:compile</depdendency> -->
+						<depdendency>org.slf4j:jcl-over-slf4j</depdendency>
+						<depdendency>org.apache.logging.log4j:log4j-api</depdendency>
+						<depdendency>org.apache.logging.log4j:log4j-slf4j-impl</depdendency>
+					</usedDependencies>
 				</configuration>
 			</plugin>
+			
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>tomcat-maven-plugin</artifactId>
@@ -770,7 +653,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 			</plugin>
 			<plugin>
                 <groupId>org.apache.tomcat.maven</groupId>
-                <artifactId>tomcat8-maven-plugin</artifactId>
+                <artifactId>tomcat7-maven-plugin</artifactId>
                 <version>2.2</version>
                 <configuration>
                     <excludes>
@@ -872,16 +755,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
                         <version>${tomcat.version}</version>
                     </dependency>
                 </dependencies>
-            </plugin>
-			<plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>jetty-maven-plugin</artifactId>
-                <version>8.1.4.v20120524</version>
-                <configuration>
-				<webAppConfig>
-					<contextPath>/${project.name}</contextPath>
-				</webAppConfig>
-			</configuration>
             </plugin>
 		</plugins>
 		<resources>
diff --git a/src/main/java/com/labsynch/labseer/db/migration/postgres/V2_0_7_1__Recalculate_exact_mass.java b/src/main/java/com/labsynch/labseer/db/migration/postgres/V2_0_7_1__Recalculate_exact_mass.java
index 405775aaa..623befe6b 100644
--- a/src/main/java/com/labsynch/labseer/db/migration/postgres/V2_0_7_1__Recalculate_exact_mass.java
+++ b/src/main/java/com/labsynch/labseer/db/migration/postgres/V2_0_7_1__Recalculate_exact_mass.java
@@ -4,7 +4,8 @@
 import java.sql.SQLException;
 import java.util.List;
 
-import javax.transaction.Transactional;
+import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
+import com.labsynch.labseer.chemclasses.CmpdRegMoleculeFactory;
 
 import org.flywaydb.core.api.migration.spring.SpringJdbcMigration;
 import org.slf4j.Logger;
@@ -12,9 +13,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
-
-import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
-import com.labsynch.labseer.chemclasses.CmpdRegMoleculeFactory;
+import org.springframework.transaction.annotation.Transactional;
 
 public class V2_0_7_1__Recalculate_exact_mass implements SpringJdbcMigration {
 
diff --git a/src/main/java/com/labsynch/labseer/db/migration/postgres/V2_3_0_6__url_encode_cmpdreg_filelist_urls.java b/src/main/java/com/labsynch/labseer/db/migration/postgres/V2_3_0_6__url_encode_cmpdreg_filelist_urls.java
index 66396de7a..7fd88391a 100644
--- a/src/main/java/com/labsynch/labseer/db/migration/postgres/V2_3_0_6__url_encode_cmpdreg_filelist_urls.java
+++ b/src/main/java/com/labsynch/labseer/db/migration/postgres/V2_3_0_6__url_encode_cmpdreg_filelist_urls.java
@@ -1,17 +1,16 @@
 package com.labsynch.labseer.db.migration.postgres;
 
+import java.net.URLEncoder;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
-import java.net.URLEncoder;
-
-import javax.transaction.Transactional;
 
 import org.flywaydb.core.api.migration.spring.SpringJdbcMigration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
+import org.springframework.transaction.annotation.Transactional;
 
 public class V2_3_0_6__url_encode_cmpdreg_filelist_urls implements SpringJdbcMigration {
 
diff --git a/src/main/java/com/labsynch/labseer/dto/MetalotReturn.java b/src/main/java/com/labsynch/labseer/dto/MetalotReturn.java
index 4c7f59498..7133fae0f 100755
--- a/src/main/java/com/labsynch/labseer/dto/MetalotReturn.java
+++ b/src/main/java/com/labsynch/labseer/dto/MetalotReturn.java
@@ -5,7 +5,7 @@
 import java.util.Date;
 import java.util.List;
 
-import javax.transaction.Transactional;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.labsynch.labseer.service.ErrorMessage;
 
diff --git a/src/main/java/com/labsynch/labseer/service/StandardizationServiceImpl.java b/src/main/java/com/labsynch/labseer/service/StandardizationServiceImpl.java
index dc663d7c8..0bbc19f1e 100644
--- a/src/main/java/com/labsynch/labseer/service/StandardizationServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/StandardizationServiceImpl.java
@@ -3,33 +3,20 @@
 import java.io.File;
 import java.io.IOException;
 import java.text.DecimalFormat;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 
-import javax.annotation.PostConstruct;
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
-import org.apache.commons.lang3.StringUtils;
-import org.hibernate.Session;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.event.ContextRefreshedEvent;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.labsynch.labseer.chemclasses.CmpdRegMolecule;
+import com.labsynch.labseer.chemclasses.CmpdRegMolecule.RegistrationStatus;
 import com.labsynch.labseer.chemclasses.CmpdRegMoleculeFactory;
 import com.labsynch.labseer.chemclasses.CmpdRegSDFWriter;
 import com.labsynch.labseer.chemclasses.CmpdRegSDFWriterFactory;
-import com.labsynch.labseer.chemclasses.CmpdRegMolecule.RegistrationStatus;
 import com.labsynch.labseer.domain.Lot;
 import com.labsynch.labseer.domain.Parent;
 import com.labsynch.labseer.domain.ParentAlias;
@@ -47,6 +34,17 @@
 import com.labsynch.labseer.utils.PropertiesUtilService;
 import com.labsynch.labseer.utils.SimpleUtil;
 
+import org.apache.commons.lang3.StringUtils;
+import org.hibernate.Session;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 @Service
 public class StandardizationServiceImpl implements StandardizationService, ApplicationListener<ContextRefreshedEvent> {
 

From 116cdcf2c50bbdd4d5b0cffc3b7bb6686f087f9f Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Fri, 29 Apr 2022 18:43:18 -0700
Subject: [PATCH 65/73] Run format on pom.xml

---
 pom.xml | 316 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 158 insertions(+), 158 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9c63ea5f7..0b31f220b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-		<licenses>
+	<licenses>
 		<license>
 			<name>&gt;GNU General Public License (GPL), Version 3.0</name>
 			<url>https://www.gnu.org/licenses/gpl-3.0.html</url>
 			<distribution>repo</distribution>
 			<comments>
-<![CDATA[
+				<![CDATA[
 Copyright 2011-2018 John McNeil & Co., Inc.
 http://www.mcneilco.com
 info@mcneilco.com
@@ -23,11 +23,11 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
-</comments>
+			</comments>
 		</license>
 	</licenses>
 	<groupId>com.labsynch.labseer</groupId>
-<artifactId>acas</artifactId>
+	<artifactId>acas</artifactId>
 	<packaging>war</packaging>
 	<version>1.13-BUILD-SNAPSHOT</version>
 	<description>ACAS Java persistence layer</description>
@@ -51,7 +51,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		<tomcat.version>9.0.58</tomcat.version>
 		<hibernate.version>5.6.1.Final</hibernate.version>
 		<maven-plugins.version>3.3.0</maven-plugins.version>
-    </properties>
+	</properties>
 	<scm>
 		<connection>scm:git:git://github.com/mcneilco/acas-roo-server.git</connection>
 		<developerConnection>scm:git:git:@github.com:mcneilco/acas-roo-server.git</developerConnection>
@@ -87,8 +87,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		<profile>
 			<id>bbchem</id>
 			<activation>
-            	<activeByDefault>true</activeByDefault>
-        	</activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
 			<properties>
 				<exclude.chemistry.packageA>com/labsynch/labseer/chemclasses/indigo/**</exclude.chemistry.packageA>
 				<exclude.chemistry.migrationsA>com/labsynch/labseer/db/migration/*/indigo/**</exclude.chemistry.migrationsA>
@@ -99,15 +99,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		<profile>
 			<id>jchem</id>
 			<activation>
-            	<activeByDefault>false</activeByDefault>
-        	</activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
 			<dependencies>
 				<dependency>
 					<groupId>com.chemaxon</groupId>
 					<artifactId>jchem</artifactId>
 					<version>${jchem.version}</version>
 				</dependency>
-			</dependencies>	
+			</dependencies>
 			<properties>
 				<exclude.chemistry.packageA>com/labsynch/labseer/chemclasses/indigo/**</exclude.chemistry.packageA>
 				<exclude.chemistry.migrationsA>com/labsynch/labseer/db/migration/*/indigo/**</exclude.chemistry.migrationsA>
@@ -118,8 +118,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		<profile>
 			<id>indigo</id>
 			<activation>
-            	<activeByDefault>false</activeByDefault>
-        	</activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
 			<dependencies>
 				<dependency>
 					<groupId>com.epam.indigo</groupId>
@@ -131,7 +131,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 					<artifactId>indigo-renderer</artifactId>
 					<version>${indigo.version}</version>
 				</dependency>
-			</dependencies>	
+			</dependencies>
 			<properties>
 				<exclude.chemistry.packageA>com/labsynch/labseer/chemclasses/bbchem/**</exclude.chemistry.packageA>
 				<exclude.chemistry.migrationsA>com/labsynch/labseer/db/migration/*/bbchem/**</exclude.chemistry.migrationsA>
@@ -174,12 +174,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-api</artifactId>
 			<version>${log4j.version}</version>
-		  </dependency>
-		  <dependency>
+		</dependency>
+		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>
 			<version>${log4j.version}</version>
-		  </dependency>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
@@ -443,54 +443,54 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/net.sf.trove4j/trove4j -->
 		<dependency>
-    		<groupId>com.github.javadev</groupId>
-    		<artifactId>underscore</artifactId>
-    		<version>1.19</version>
-  		</dependency>
+			<groupId>com.github.javadev</groupId>
+			<artifactId>underscore</artifactId>
+			<version>1.19</version>
+		</dependency>
 		<dependency>
-    		<groupId>org.openscience.cdk</groupId>
-    		<artifactId>cdk-core</artifactId>
-    		<version>${cdk.version}</version>
+			<groupId>org.openscience.cdk</groupId>
+			<artifactId>cdk-core</artifactId>
+			<version>${cdk.version}</version>
 		</dependency>
 		<dependency>
-    		<groupId>org.openscience.cdk</groupId>
-    		<artifactId>cdk-sdg</artifactId>
-    		<version>${cdk.version}</version>
+			<groupId>org.openscience.cdk</groupId>
+			<artifactId>cdk-sdg</artifactId>
+			<version>${cdk.version}</version>
 		</dependency>
 		<dependency>
-    		<groupId>org.openscience.cdk</groupId>
-    		<artifactId>cdk-silent</artifactId>
-    		<version>${cdk.version}</version>
+			<groupId>org.openscience.cdk</groupId>
+			<artifactId>cdk-silent</artifactId>
+			<version>${cdk.version}</version>
 		</dependency>
 		<dependency>
-    		<groupId>org.openscience.cdk</groupId>
-    		<artifactId>cdk-standard</artifactId>
-    		<version>${cdk.version}</version>
+			<groupId>org.openscience.cdk</groupId>
+			<artifactId>cdk-standard</artifactId>
+			<version>${cdk.version}</version>
 		</dependency>
-		  <dependency>
-    		<groupId>org.openscience.cdk</groupId>
-    		<artifactId>cdk-smiles</artifactId>
-    		<version>${cdk.version}</version>
+		<dependency>
+			<groupId>org.openscience.cdk</groupId>
+			<artifactId>cdk-smiles</artifactId>
+			<version>${cdk.version}</version>
 		</dependency>
 		<dependency>
-    		<groupId>org.openscience.cdk</groupId>
-    		<artifactId>cdk-formula</artifactId>
-    		<version>${cdk.version}</version>
+			<groupId>org.openscience.cdk</groupId>
+			<artifactId>cdk-formula</artifactId>
+			<version>${cdk.version}</version>
 		</dependency>
 		<dependency>
-    		<groupId>org.openscience.cdk</groupId>
-    		<artifactId>cdk-io</artifactId>
-    		<version>${cdk.version}</version>
+			<groupId>org.openscience.cdk</groupId>
+			<artifactId>cdk-io</artifactId>
+			<version>${cdk.version}</version>
 		</dependency>
 		<dependency>
-    		<groupId>org.openscience.cdk</groupId>
-    		<artifactId>cdk-interfaces</artifactId>
-    		<version>${cdk.version}</version>
+			<groupId>org.openscience.cdk</groupId>
+			<artifactId>cdk-interfaces</artifactId>
+			<version>${cdk.version}</version>
 		</dependency>
 		<dependency>
-    		<groupId>org.openscience.cdk</groupId>
-    		<artifactId>cdk-depict</artifactId>
-    		<version>${cdk.version}</version>
+			<groupId>org.openscience.cdk</groupId>
+			<artifactId>cdk-depict</artifactId>
+			<version>${cdk.version}</version>
 		</dependency>
 	</dependencies>
 	<build>
@@ -591,10 +591,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 						the test-compile goal if weaveWithAspectsInMainSourceFolder is set to true -->
 					<weaveWithAspectsInMainSourceFolder>false</weaveWithAspectsInMainSourceFolder>
 					<excludes>
-							<exclude>${exclude.chemistry.packageA}</exclude>
-							<exclude>${exclude.chemistry.migrationsA}</exclude>
-							<exclude>${exclude.chemistry.packageB}</exclude>
-							<exclude>${exclude.chemistry.migrationsB}</exclude>
+						<exclude>${exclude.chemistry.packageA}</exclude>
+						<exclude>${exclude.chemistry.migrationsA}</exclude>
+						<exclude>${exclude.chemistry.packageB}</exclude>
+						<exclude>${exclude.chemistry.migrationsB}</exclude>
 					</excludes>
 				</configuration>
 			</plugin>
@@ -645,117 +645,117 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 					</usedDependencies>
 				</configuration>
 			</plugin>
-			
+
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>tomcat-maven-plugin</artifactId>
 				<version>1.1</version>
 			</plugin>
 			<plugin>
-                <groupId>org.apache.tomcat.maven</groupId>
-                <artifactId>tomcat7-maven-plugin</artifactId>
-                <version>2.2</version>
-                <configuration>
-                    <excludes>
-                        <exclude>${exclude.chemistry.packageA}</exclude>
-                        <exclude>${exclude.chemistry.migrationsA}</exclude>
-                        <exclude>${exclude.chemistry.packageB}</exclude>
-                        <exclude>${exclude.chemistry.migrationsB}</exclude>
-                    </excludes>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.tomcat.embed</groupId>
-                        <artifactId>tomcat-embed-core</artifactId>
-                        <version>${tomcat.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.tomcat</groupId>
-                        <artifactId>tomcat-util</artifactId>
-                        <version>${tomcat.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.tomcat</groupId>
-                        <artifactId>tomcat-coyote</artifactId>
-                        <version>${tomcat.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.tomcat</groupId>
-                        <artifactId>tomcat-api</artifactId>
-                        <version>${tomcat.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.tomcat</groupId>
-                        <artifactId>tomcat-jdbc</artifactId>
-                        <version>${tomcat.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.tomcat</groupId>
-                        <artifactId>tomcat-dbcp</artifactId>
-                        <version>${tomcat.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.tomcat</groupId>
-                        <artifactId>tomcat-servlet-api</artifactId>
-                        <version>${tomcat.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.tomcat</groupId>
-                        <artifactId>tomcat-jsp-api</artifactId>
-                        <version>${tomcat.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.tomcat</groupId>
-                        <artifactId>tomcat-jasper</artifactId>
-                        <version>${tomcat.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.tomcat</groupId>
-                        <artifactId>tomcat-jasper-el</artifactId>
-                        <version>${tomcat.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.tomcat</groupId>
-                        <artifactId>tomcat-el-api</artifactId>
-                        <version>${tomcat.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.tomcat</groupId>
-                        <artifactId>tomcat-catalina</artifactId>
-                        <version>${tomcat.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.tomcat</groupId>
-                        <artifactId>tomcat-tribes</artifactId>
-                        <version>${tomcat.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.tomcat</groupId>
-                        <artifactId>tomcat-catalina-ha</artifactId>
-                        <version>${tomcat.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.tomcat</groupId>
-                        <artifactId>tomcat-annotations-api</artifactId>
-                        <version>${tomcat.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.tomcat</groupId>
-                        <artifactId>tomcat-juli</artifactId>
-                        <version>${tomcat.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.tomcat.embed</groupId>
-                        <artifactId>tomcat-embed-logging-juli</artifactId>
-                        <version>${tomcat.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.tomcat.embed</groupId>
-                        <artifactId>tomcat-embed-logging-log4j</artifactId>
-                        <version>${tomcat.version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
+				<groupId>org.apache.tomcat.maven</groupId>
+				<artifactId>tomcat7-maven-plugin</artifactId>
+				<version>2.2</version>
+				<configuration>
+					<excludes>
+						<exclude>${exclude.chemistry.packageA}</exclude>
+						<exclude>${exclude.chemistry.migrationsA}</exclude>
+						<exclude>${exclude.chemistry.packageB}</exclude>
+						<exclude>${exclude.chemistry.migrationsB}</exclude>
+					</excludes>
+				</configuration>
+				<dependencies>
+					<dependency>
+						<groupId>org.apache.tomcat.embed</groupId>
+						<artifactId>tomcat-embed-core</artifactId>
+						<version>${tomcat.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.apache.tomcat</groupId>
+						<artifactId>tomcat-util</artifactId>
+						<version>${tomcat.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.apache.tomcat</groupId>
+						<artifactId>tomcat-coyote</artifactId>
+						<version>${tomcat.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.apache.tomcat</groupId>
+						<artifactId>tomcat-api</artifactId>
+						<version>${tomcat.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.apache.tomcat</groupId>
+						<artifactId>tomcat-jdbc</artifactId>
+						<version>${tomcat.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.apache.tomcat</groupId>
+						<artifactId>tomcat-dbcp</artifactId>
+						<version>${tomcat.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.apache.tomcat</groupId>
+						<artifactId>tomcat-servlet-api</artifactId>
+						<version>${tomcat.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.apache.tomcat</groupId>
+						<artifactId>tomcat-jsp-api</artifactId>
+						<version>${tomcat.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.apache.tomcat</groupId>
+						<artifactId>tomcat-jasper</artifactId>
+						<version>${tomcat.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.apache.tomcat</groupId>
+						<artifactId>tomcat-jasper-el</artifactId>
+						<version>${tomcat.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.apache.tomcat</groupId>
+						<artifactId>tomcat-el-api</artifactId>
+						<version>${tomcat.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.apache.tomcat</groupId>
+						<artifactId>tomcat-catalina</artifactId>
+						<version>${tomcat.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.apache.tomcat</groupId>
+						<artifactId>tomcat-tribes</artifactId>
+						<version>${tomcat.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.apache.tomcat</groupId>
+						<artifactId>tomcat-catalina-ha</artifactId>
+						<version>${tomcat.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.apache.tomcat</groupId>
+						<artifactId>tomcat-annotations-api</artifactId>
+						<version>${tomcat.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.apache.tomcat</groupId>
+						<artifactId>tomcat-juli</artifactId>
+						<version>${tomcat.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.apache.tomcat.embed</groupId>
+						<artifactId>tomcat-embed-logging-juli</artifactId>
+						<version>${tomcat.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.apache.tomcat.embed</groupId>
+						<artifactId>tomcat-embed-logging-log4j</artifactId>
+						<version>${tomcat.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
 		</plugins>
 		<resources>
 			<resource>
@@ -766,4 +766,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		</resources>
 	</build>
 	<name>acas</name>
-</project>
+</project>
\ No newline at end of file

From 90b4add3bc8a0f502f306e4f06b24a7de7b87c1c Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Mon, 2 May 2022 07:40:32 -0700
Subject: [PATCH 66/73] Added a few notes around depdendencies

---
 pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0b31f220b..6b90fb553 100644
--- a/pom.xml
+++ b/pom.xml
@@ -287,6 +287,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 			<artifactId>hibernate-core</artifactId>
 			<version>${hibernate.version}</version>
 		</dependency>
+		<!-- com.vladmihalcea hibernate-types is used for bit type addition to hibernate which is used in bbchem structure searches -->
 		<dependency>
 			<groupId>com.vladmihalcea</groupId>
 			<artifactId>hibernate-types-55</artifactId>
@@ -357,7 +358,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 			<artifactId>spring-webmvc</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
-		<!-- This is required by org.springframework.web.multipart.commons.CommonsMultipartResolver -->
+		<!-- commons-fileupload is required by org.springframework.web.multipart.commons.CommonsMultipartResolver -->
 		<dependency>
 			<groupId>commons-fileupload</groupId>
 			<artifactId>commons-fileupload</artifactId>
@@ -447,6 +448,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 			<artifactId>underscore</artifactId>
 			<version>1.19</version>
 		</dependency>
+		<!-- cdk is used for Chem ELN functionality on LS thing is and is independent of the chemistry package used for CmpdReg -->
 		<dependency>
 			<groupId>org.openscience.cdk</groupId>
 			<artifactId>cdk-core</artifactId>

From a5412225030c6f202d27f0bea2c249521daae067 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Mon, 2 May 2022 09:02:41 -0700
Subject: [PATCH 67/73] Only include dom4j and trove4j in jchem builds where
 they are required

---
 pom.xml | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6b90fb553..35784c3d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		<profile>
 			<id>bbchem</id>
 			<activation>
-				<activeByDefault>true</activeByDefault>
+				<activeByDefault>false</activeByDefault>
 			</activation>
 			<properties>
 				<exclude.chemistry.packageA>com/labsynch/labseer/chemclasses/indigo/**</exclude.chemistry.packageA>
@@ -99,7 +99,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		<profile>
 			<id>jchem</id>
 			<activation>
-				<activeByDefault>false</activeByDefault>
+				<activeByDefault>true</activeByDefault>
 			</activation>
 			<dependencies>
 				<dependency>
@@ -107,6 +107,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 					<artifactId>jchem</artifactId>
 					<version>${jchem.version}</version>
 				</dependency>
+				<!-- JCHEM 16 requires dom4j 1.3. This depdendency can be removed when we upgrade jchem to jchem > 17 -->
+				<dependency>
+					<groupId>dom4j</groupId>
+					<artifactId>dom4j</artifactId>
+					<version>1.3</version>
+				</dependency>
+				<!-- JHEM 16 requires trove4j https://mvnrepository.com/artifact/net.sf.trove4j/trove4j -->
+				<dependency>
+					<groupId>net.sf.trove4j</groupId>
+					<artifactId>trove4j</artifactId>
+					<version>3.0.3</version>
+				</dependency>
 			</dependencies>
 			<properties>
 				<exclude.chemistry.packageA>com/labsynch/labseer/chemclasses/indigo/**</exclude.chemistry.packageA>
@@ -436,13 +448,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 			<artifactId>postgresql</artifactId>
 			<version>42.3.3</version>
 		</dependency>
-		<!-- JCHEM 16 requires dom4j 1.3. This depdendency can be removed when we upgrade jchem to jchem > 17 -->
-		<dependency>
-			<groupId>dom4j</groupId>
-			<artifactId>dom4j</artifactId>
-			<version>1.3</version>
-		</dependency>
-		<!-- https://mvnrepository.com/artifact/net.sf.trove4j/trove4j -->
 		<dependency>
 			<groupId>com.github.javadev</groupId>
 			<artifactId>underscore</artifactId>

From 91f6f0c7ccaf19a49d7fb6c2103f43d8a73b45aa Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Mon, 2 May 2022 09:09:43 -0700
Subject: [PATCH 68/73] Note about log4j settings

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 35784c3d5..00b71d677 100644
--- a/pom.xml
+++ b/pom.xml
@@ -645,7 +645,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 						<depdendency>org.aspectj:aspectjrt</depdendency>
 						<!-- Required at runtime logging dependencies -->
 						<depdendency>org.apache.logging.log4j:log4j-core</depdendency>
-						<!-- <depdendency>dom4j:dom4j:jar:1.3:compile</depdendency> -->
+						<!-- logging depedencies which force spring to use log4j -->
 						<depdendency>org.slf4j:jcl-over-slf4j</depdendency>
 						<depdendency>org.apache.logging.log4j:log4j-api</depdendency>
 						<depdendency>org.apache.logging.log4j:log4j-slf4j-impl</depdendency>

From 896292813284a174e9609e1e92a3188fc2e33a58 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Tue, 3 May 2022 14:58:06 -0700
Subject: [PATCH 69/73] Bump tomcat version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 00b71d677..65cfa0158 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		<indigo.version>1.6.1</indigo.version>
 		<git-sha-1>${buildNumber}</git-sha-1>
 		<BuildScmBranch>${scmBranch}</BuildScmBranch>
-		<tomcat.version>9.0.58</tomcat.version>
+		<tomcat.version>9.0.62</tomcat.version>
 		<hibernate.version>5.6.1.Final</hibernate.version>
 		<maven-plugins.version>3.3.0</maven-plugins.version>
 	</properties>

From 7c08b1a503247d7ce23becc96ba2814afeac7d3a Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Tue, 3 May 2022 15:04:03 -0700
Subject: [PATCH 70/73] Hibernate bump to 5.6.1.Final

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 65cfa0158..fddc36002 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.]]>
 		<git-sha-1>${buildNumber}</git-sha-1>
 		<BuildScmBranch>${scmBranch}</BuildScmBranch>
 		<tomcat.version>9.0.62</tomcat.version>
-		<hibernate.version>5.6.1.Final</hibernate.version>
+		<hibernate.version>5.6.7.Final</hibernate.version>
 		<maven-plugins.version>3.3.0</maven-plugins.version>
 	</properties>
 	<scm>

From 4491b52587cdaf94767b4d4d26469d4e5b6a72cf Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Tue, 3 May 2022 16:30:27 -0700
Subject: [PATCH 71/73] Fixing uses of splitHqlInClause

---
 .../labsynch/labseer/service/ContainerServiceImpl.java    | 8 ++++----
 .../labsynch/labseer/service/ExperimentServiceImpl.java   | 2 +-
 .../com/labsynch/labseer/service/ProtocolServiceImpl.java | 2 +-
 .../labsynch/labseer/service/ContainerLSServiceTests.java | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/labsynch/labseer/service/ContainerServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ContainerServiceImpl.java
index befcc127a..19a1d8525 100755
--- a/src/main/java/com/labsynch/labseer/service/ContainerServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ContainerServiceImpl.java
@@ -2130,7 +2130,7 @@ public Collection<ContainerErrorMessageDTO> getContainersByCodeNames(List<String
 		EntityManager em = Container.entityManager();
 		String queryString = "SELECT new com.labsynch.labseer.dto.ContainerErrorMessageDTO( " + "container.codeName, "
 				+ "container )" + " FROM Container container ";
-		queryString += "where ( container.ignored <> true ) and ( ";
+		queryString += "where ( container.ignored <> true ) and ";
 		Collection<Query> queries = SimpleUtil.splitHqlInClause(em, queryString, "container.codeName", codeNames);
 		Collection<ContainerErrorMessageDTO> results = new HashSet<ContainerErrorMessageDTO>();
 		for (Query q : queries) {
@@ -2168,7 +2168,7 @@ public Collection<ContainerErrorMessageDTO> getDefinitionContainersByContainerCo
 		queryString += SimpleUtil.makeInnerJoinHql("container.firstContainers", "itx", "defines",
 				"definition container_container");
 		queryString += SimpleUtil.makeInnerJoinHql("itx.firstContainer", "definition", "definition container");
-		queryString += "where ( container.ignored <> true ) and ( ";
+		queryString += "where ( container.ignored <> true ) and ";
 		Collection<Query> queries = SimpleUtil.splitHqlInClause(em, queryString, "container.codeName", codeNames);
 		Collection<ContainerErrorMessageDTO> results = new HashSet<ContainerErrorMessageDTO>();
 		for (Query q : queries) {
@@ -2205,7 +2205,7 @@ public Collection<Map<String, Long>> getItxIdsByContainerCodeNamesAndItxTypeAndK
 		String queryString = "SELECT new map(container.codeName as containerCodeName, itx.id as itxId)"
 				+ " FROM Container container ";
 		queryString += SimpleUtil.makeInnerJoinHql("container.secondContainers", "itx", itxType, itxKind);
-		queryString += "where ( container.ignored <> true ) and ( ";
+		queryString += "where ( container.ignored <> true ) and ";
 		Collection<Query> queries = SimpleUtil.splitHqlInClause(em, queryString, "container.codeName", codeNames);
 		Collection<Map<String, Long>> results = new HashSet<Map<String, Long>>();
 		for (Query q : queries) {
@@ -2230,7 +2230,7 @@ public Collection<ContainerWellCodeDTO> getWellCodesByContainerCodes(List<String
 				+ "well.codeName as wellCodeName )" + " FROM Container container ";
 		queryString += SimpleUtil.makeInnerJoinHql("container.secondContainers", "itx", "has member");
 		queryString += SimpleUtil.makeInnerJoinHql("itx.secondContainer", "well", "well");
-		queryString += "where ( container.ignored <> true ) and ( well.ignored <> true) and ( ";
+		queryString += "where ( container.ignored <> true ) and ( well.ignored <> true) and ";
 		Collection<Query> queries = SimpleUtil.splitHqlInClause(em, queryString, "container.codeName", codeNames);
 		Collection<Map<String, String>> results = new HashSet<Map<String, String>>();
 		for (Query q : queries) {
diff --git a/src/main/java/com/labsynch/labseer/service/ExperimentServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ExperimentServiceImpl.java
index 09281a343..40a79eb44 100755
--- a/src/main/java/com/labsynch/labseer/service/ExperimentServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ExperimentServiceImpl.java
@@ -1684,7 +1684,7 @@ public Collection<ExperimentErrorMessageDTO> findExperimentsByCodeNames(List<Str
 				+ "experiment.codeName, "
 				+ "experiment )"
 				+ " FROM Experiment experiment ";
-		queryString += "where ( experiment.ignored <> true ) and ( ";
+		queryString += "where ( experiment.ignored <> true ) and ";
 		Collection<Query> queries = SimpleUtil.splitHqlInClause(em, queryString, "experiment.codeName", codeNames);
 		Collection<ExperimentErrorMessageDTO> results = new HashSet<ExperimentErrorMessageDTO>();
 		for (Query q : queries) {
diff --git a/src/main/java/com/labsynch/labseer/service/ProtocolServiceImpl.java b/src/main/java/com/labsynch/labseer/service/ProtocolServiceImpl.java
index a9028f005..1b4bd8cc4 100755
--- a/src/main/java/com/labsynch/labseer/service/ProtocolServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/ProtocolServiceImpl.java
@@ -632,7 +632,7 @@ public Collection<ProtocolErrorMessageDTO> findProtocolsByCodeNames(List<String>
 				+ "protocol.codeName, "
 				+ "protocol )"
 				+ " FROM Protocol protocol ";
-		queryString += "where ( protocol.ignored <> true ) and ( ";
+		queryString += "where ( protocol.ignored <> true ) and ";
 		Collection<Query> queries = SimpleUtil.splitHqlInClause(em, queryString, "protocol.codeName", codeNames);
 		Collection<ProtocolErrorMessageDTO> results = new HashSet<ProtocolErrorMessageDTO>();
 		for (Query q : queries) {
diff --git a/src/test/java/com/labsynch/labseer/service/ContainerLSServiceTests.java b/src/test/java/com/labsynch/labseer/service/ContainerLSServiceTests.java
index 5974428ac..886739658 100755
--- a/src/test/java/com/labsynch/labseer/service/ContainerLSServiceTests.java
+++ b/src/test/java/com/labsynch/labseer/service/ContainerLSServiceTests.java
@@ -1401,7 +1401,7 @@ public void getItxIdsByContainerCodeNamesAndItxTypeKind() throws Exception {
 		String queryString = "SELECT new Map(container.codeName, itx.id )"
 				+ " FROM Container container ";
 		queryString += SimpleUtil.makeInnerJoinHql("container.secondContainers", "itx", itxType, itxKind);
-		queryString += "where ( container.ignored <> true ) and ( ";
+		queryString += "where ( container.ignored <> true ) and ";
 		Collection<Query> queries = SimpleUtil.splitHqlInClause(em, queryString, "container.codeName", codeNames);
 		Collection<Map<String, Long>> results = new HashSet<Map<String, Long>>();
 		for (Query q : queries) {

From bf8b8e150338b44600f92efebd65d0c6f39a0d07 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Tue, 3 May 2022 16:47:49 -0700
Subject: [PATCH 72/73] Fixing uses of addHqlInClause

---
 .../java/com/labsynch/labseer/service/SubjectServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/labsynch/labseer/service/SubjectServiceImpl.java b/src/main/java/com/labsynch/labseer/service/SubjectServiceImpl.java
index f8e8b8ad3..c10e8cb47 100755
--- a/src/main/java/com/labsynch/labseer/service/SubjectServiceImpl.java
+++ b/src/main/java/com/labsynch/labseer/service/SubjectServiceImpl.java
@@ -674,7 +674,7 @@ public Collection<SubjectCodeNameDTO> getSubjectsByCodeNames(
 				+ "subject.codeName, "
 				+ "subject )"
 				+ " FROM Subject subject ";
-		queryString += "where ( subject.ignored <> true ) and ( ";
+		queryString += "where ( subject.ignored <> true ) and ";
 		Query q = SimpleUtil.addHqlInClause(em, queryString, "subject.codeName", codeNames);
 
 		// if (logger.isDebugEnabled())

From 76a16647a72263712e916057bcacc860e7384403 Mon Sep 17 00:00:00 2001
From: Brian Bolt <brian.bolt@schrodinger.com>
Date: Tue, 3 May 2022 18:01:54 -0700
Subject: [PATCH 73/73] Switch to
 org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy

---
 .../utils/PhysicalNamingStrategyImpl.java     | 31 -------------------
 src/main/resources/META-INF/persistence.xml   |  2 +-
 2 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100644 src/main/java/com/labsynch/labseer/utils/PhysicalNamingStrategyImpl.java

diff --git a/src/main/java/com/labsynch/labseer/utils/PhysicalNamingStrategyImpl.java b/src/main/java/com/labsynch/labseer/utils/PhysicalNamingStrategyImpl.java
deleted file mode 100644
index b6ef55ad0..000000000
--- a/src/main/java/com/labsynch/labseer/utils/PhysicalNamingStrategyImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.labsynch.labseer.utils;
-
-import java.util.Locale;
-
-import org.hibernate.boot.model.naming.Identifier;
-import org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl;
-import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
-
-public class PhysicalNamingStrategyImpl extends PhysicalNamingStrategyStandardImpl {
-    @Override
-    public Identifier toPhysicalTableName(Identifier name, JdbcEnvironment context) {
-        return new Identifier(addUnderscores(name.getText()), name.isQuoted());
-    }
-
-    @Override
-    public Identifier toPhysicalColumnName(Identifier name, JdbcEnvironment context) {
-        return new Identifier(addUnderscores(name.getText()), name.isQuoted());
-    }
-
-    protected static String addUnderscores(String name) {
-        final StringBuilder buf = new StringBuilder(name.replace('.', '_'));
-        for (int i = 1; i < buf.length() - 1; i++) {
-            if (Character.isLowerCase(buf.charAt(i - 1)) &&
-                    Character.isUpperCase(buf.charAt(i)) &&
-                    Character.isLowerCase(buf.charAt(i + 1))) {
-                buf.insert(i++, '_');
-            }
-        }
-        return buf.toString().toLowerCase(Locale.ROOT);
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index c66a08125..a61a2d05c 100755
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -15,7 +15,7 @@
  <!--		<property name="hibernate.hbm2ddl.auto" value="${acas.databaseMode}" /> 
  -->
 		    <property name="hibernate.hbm2ddl.auto" value="update" /> 
-			<property name="hibernate.physical_naming_strategy" value="com.labsynch.labseer.utils.PhysicalNamingStrategyImpl"/>
+			<property name="hibernate.physical_naming_strategy" value="org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy"/>
 			<property name="hibernate.id.new_generator_mappings" value="false" />
 			<property name="hibernate.connection.charSet" value="UTF-8" />
 			<property name="hibernate.connection.autocommit" value="false" />